Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-30 09:56:14 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
10,399 Commits 63 Branches 22 Tags 196 MiB
96b4a1b2d8
Commit Graph

231 Commits

Author SHA1 Message Date
thunder2
758b5d0079 Updated languages from Transifex 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6875 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-23 11:07:17 +00:00
defnax
3ba5a72787 added the toaster files 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6871 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-22 12:04:11 +00:00
defnax
41e22a1b21 update voip strings 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6863 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-21 12:45:20 +00:00
defnax
06f6f1949d changed the voip icons, disable the voip buttons when friend is offline. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6857 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-20 16:59:29 +00:00
thunder2
41ba665813 Code maintenance for Qt 5: 
- LinksCloud
- VOIP
- FeedReader


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6853 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-20 00:56:34 +00:00
thunder2
30103ef5f2 Added display of Qt version in AboutDialog. 
Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6844 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-18 22:12:31 +00:00
thunder2
135a5e579a Code maintenance for Qt 5: 
- Replaced Qt::WFlags with Qt::WindowFlags.
- Removed path "QtCore/" and "QtGui/" from the includes.
- Replaced "QString::toAscii()" with "QString::toLatin1()".

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6843 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-18 21:10:33 +00:00
defnax
8f6f7b50d6 added some icons 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6840 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-17 14:56:53 +00:00
thunder2
a50c899ff3 Moved help browser from MainPage to a new base class named FloatingHelpBrowser for global usage. 
Added FloatingHelpBrowser to the option window (help text not including).
The help text can be specified for the ConfigPages in the method "helpText".

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6818 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-09 09:31:40 +00:00
thunder2
b49ba8b98f Changed the additional buttons of ChatLobbyDialog and AudioPopupChatDialog to QToolButton. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6798 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-04 12:13:09 +00:00
defnax
9ca0775933 added some sound files 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6797 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-03 22:50:36 +00:00
defnax
a4524485ad changed the voip icons and the tooltips 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6796 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-03 22:00:16 +00:00
drbob
90b4a20e5d updated VoIP to use new Fast packet sending. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6792 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-03 13:15:10 +00:00
thunder2
0d41814aef Updated languages from Transifex ;-) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6726 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-10 20:55:59 +00:00
thunder2
570d8db1d5 Updated languages from transiflex. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6577 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-14 05:23:35 +00:00
csoler
dc2521cf71 Merged branch v0.5-GenericTunneling into trunk (Rev. 6284 to 6410). 
- adds turtle router as a generic tunneling service
- made ftServer a client of the service. Now turtle file items are handled in ftServer
- added new client: p3MsgService to send/recv pgp-encrypted distant messages
- added new client: p3ChatService to perform private (AES-encrypted) distant chat through tunnels.
- The GUI is disabled for now, since it needs some polishing before being fully usable.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6411 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-06 19:58:30 +00:00
thunder2
d44d3055c7 Added new languages - Greek and Dutch. 
Update languages from transiflex.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6402 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-04 23:39:07 +00:00
csoler
cb9f174efa added tunnel state light to distant chat popup dialog. Added proper peer name. Changed method for adding widgets in the chat bar 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6337 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-23 22:43:19 +00:00
thunder2
4866c5585b Updated languages from transiflex. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6217 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-12 22:14:42 +00:00
thunder2
7f06b1e9b8 Removed special settings for win32 from VOIP.pro. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6192 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-06 00:01:05 +00:00
csoler
99c5633a63 patch from Henry Morgan to unify compilation settings for VOIP 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6185 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-04 12:34:45 +00:00
thunder2
e66a9117e2 Added patch from Henry 
- fixed typo in FeedReader
Updated english translation.
Updated languages from transiflex.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6028 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-22 15:47:12 +00:00
thunder2
a28267a8e7 Updated translations from transiflex. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5981 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-14 00:29:10 +00:00
thunder2
8596b2ca9e Added patch from Henry 
- enable italian language
Updated languages from transiflex.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5947 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-06 14:31:40 +00:00
defnax
7339af3a21 corrected string 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5933 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-03 15:55:01 +00:00
defnax
9721b5a924 renamed translation string 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5932 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-03 14:21:22 +00:00
defnax
980b789809 update Swedish translation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5912 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-30 16:45:13 +00:00
defnax
df7229af91 update danish translation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5911 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-30 15:43:11 +00:00
thunder2
2231dccc1b Updated languages from transiflex. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5869 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-21 22:10:39 +00:00
csoler
9c1d702128 patch to allow compilation on BSD 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5842 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-18 16:22:58 +00:00
thunder2
2147ea63d2 Added hungarian language files. 
Added missing language files to the plugins.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5801 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-11 00:55:15 +00:00
thunder2
232af8e71e Changed SoundManger to allow the plugins to play sounds. 
Added example to VOIP (commented out).

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5709 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-21 21:38:55 +00:00
csoler
7078cc1c8e updated revision numbers in VOIP and LinksCloud plugins 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5695 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-20 13:09:16 +00:00
defnax
50351b6b27 Added to display tooltip's for the Voip button's 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5687 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-17 12:08:30 +00:00
thunder2
8fda24ef64 Added some new string to the translation in VOIP. 
Updated german and english translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5671 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-13 17:43:36 +00:00
thunder2
a0162ced8f Changed the path for the external translations to "data dir/translations". 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5670 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-12 18:44:02 +00:00
thunder2
8c5fd1d124 Added and modified patch from waseihou 
Added support for external translation files for the main application and the plugins LinksCloud and VOIP.
The following files are loaded from the directory <executable dir>/translations
- retroshare_*.qm
- LinksCloud_*.qm
- VOIP_*.qm

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5664 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-11 23:46:54 +00:00
thunder2
839cf43f99 Fixed translation of the plugins on Linux. 
Renamed the language resource files of the plugins.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5634 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-03 22:59:28 +00:00
thunder2
ee8aac48a5 Updated english translation file of RetroShare and added the english translation files of VOIP and LinksCloud for Transiflex. 
It is not needed for RetroShare.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5626 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-30 16:56:32 +00:00
thunder2
e7ff4bbab8 Plugin LinksCloud: 
- Fixed crash when clicking on the link.
- Fixed process of https links.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5623 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-30 13:16:51 +00:00
thunder2
9aa6478910 VOIP: Fixed some compiler warnings and removed unnecessary translations. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5622 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-30 09:38:13 +00:00
defnax
1f868e5ae3 Added turkish voip translation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5620 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-30 00:49:39 +00:00
defnax
584a5dc757 Added Brazilian Portuguese VOIP translation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5614 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-27 11:42:55 +00:00
defnax
29e44ddafa added Spanish translation file for the VOIP plugin 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5604 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-25 23:20:48 +00:00
thunder2
e6db506cb2 Fixed crash and memory leak in the AudioWizard of the VOIP plugin. 
Please use at least Qt 4.6.4 when compiling RetrosShare with the VOIP plugin because of the fix of the bug QTBUG-11883.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5603 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-25 23:08:46 +00:00
defnax
54f0c208df Removed html code on some QLabels 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5601 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-25 12:58:30 +00:00
defnax
7eb60e0d6a update french translation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5600 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-25 11:39:24 +00:00
defnax
6427c35afa Enable Translations for Voip plugin 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5599 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-24 23:41:32 +00:00
defnax
d353cc375f fixed some spelling errors 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5598 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-24 22:37:14 +00:00
csoler
c5a5c1654f fixed small issues. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5596 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-24 19:53:53 +00:00
csoler
24a3fb58d4 Improved plugin system: 
- the user is asked at start wether to load or deny unregistered plugins, but can make it mind later in config->plugins
- added API and SVN numbers into required external plugin symbols
- user-defined plugin rules are dropped when a plugin changes (hash changes) or when the main executable changes.
- added new status flags (Plugin denied, missing API/SVN numbers)
- modified saveList()/loadList() to allow saving a list of rejected plugins as well.
- added methods in notifyBase and inherited classes to ask for plugin confirmation.

- adapted VOIP plugin to follow these new rules (API+SVN numbers). Other plugins should be adapted as well by addign the 
 missing symbols (RETROSHARE_PLUGIN_api and RETROSHARE_PLUGIN_revision).



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5529 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-09 13:59:21 +00:00
csoler
f7da165b86 added help window to VOIP plugin 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5511 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-04 21:57:10 +00:00
csoler
a782291552 removed debug info 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5489 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-30 16:52:00 +00:00
csoler
afca515165 removed debug msgs and compilation warnings. Added missing include 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5488 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-30 16:14:55 +00:00
defnax
f90c7742cc Enabled the Icon for the Voip Plugin 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5425 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-15 13:54:00 +00:00
thunder2
15c032468a Enabled translation (system default language) of the message box before the login to a profile. 
Fixed german translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5304 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-15 21:37:35 +00:00
thunder2
33f4d4f2b8 Removed some std::ostringstream. 
To be continued.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5105 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-16 17:47:53 +00:00
thunder2
e090d0a443 Fixed compile of VOIP on Windows with Qt >4.7. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5037 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-18 21:07:37 +00:00
thunder2
fedba02d18 Fixed display of the friend status in chat window. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5014 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-11 00:22:25 +00:00
thunder2
96199fabc5 Fixed linking of the VOIP plugin on Windows. 
Exports all symbols from RetroShare.exe and import it in the plugins.
Removed the direct linking of the libretroshare and libbitdht from the plugins.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5003 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-28 21:59:01 +00:00
thunder2
30564fe6ad Fixed utf8 characters in the transfer tab name of plugins. 
Added Q_OBJECT to the VoipStatistics classes.
Removed compiler warnings.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5002 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-28 18:25:57 +00:00
csoler
c843a047ff patch from thunder to fixed compilation on windows 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5000 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-27 09:02:34 +00:00
csoler
cbad3a0a1e patch e9d7d4e from joss. Sets default sound capture values 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4997 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-26 20:54:34 +00:00
csoler
e9b53f0a12 patch 1d83f7b from joss to VOIP plugin 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4996 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-26 20:31:16 +00:00
csoler
1ee48b68a6 fixed bug in having two different service ids in VOIP 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4995 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-26 17:13:54 +00:00
csoler
af1b90707a patch from joss to correct some bugs in VOIP plugin 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4994 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-26 16:10:27 +00:00
csoler
b748f1a3f1 added logic for handling invitations 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4993 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-26 15:49:07 +00:00
csoler
a4320d785f moved RS_SERVICE_TYPE_VOIP into plugin 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4992 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-26 15:36:07 +00:00
csoler
528e822d8e added transmission of data from voip service to audio popup chat dialog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4991 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-25 21:03:06 +00:00
csoler
db07053214 added communitation between service and GUI part of VOIP plugin. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4990 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-25 18:15:36 +00:00
csoler
12b3ed02f1 added special VOIP buttons to chat dialog through plugin 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4989 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-25 12:18:40 +00:00
csoler
e8f93f1569 added load/save config values to VOIP plugin. Added methods for ringin/accepting calls 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4980 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-22 20:43:27 +00:00
csoler
826e8f3728 - added ability to plugins to add a tab in transfers dialog 
- improved VOIP plugin to add RTT statistics tab to RS gui.
- added comments in rsplugins.h
- added big tooltip in transfers that would be stuck in checking... mode



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4979 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-21 21:53:25 +00:00
csoler
48a34ba7a5 added needed rsItems, and serial methods to VOIP plugin 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4969 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-19 21:13:20 +00:00
csoler
2f38506763 merged existing p3VoRS service with VOIP plugin 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4965 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-19 15:07:47 +00:00
csoler
0d4feb89b4 cleaned directory structure 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4962 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-19 08:32:47 +00:00
csoler
4fb02f9f67 improved VOIP plugin code. Plugin loads, has a config tab. Next step: merge service with existing p3VoRS service 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4961 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-18 20:30:10 +00:00
csoler
fbce07eab0 saved current work on VOIP plugin. Not working yet. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4959 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-18 16:15:37 +00:00
csoler
c78b45b755 saved current work on VOIP plugin. Not working yet. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4958 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-18 15:56:37 +00:00
csoler
1fea734862 added missing file 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4946 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-15 21:18:21 +00:00
csoler
fc15899f0f started conversion of VOIP code (from Joss) into a plugin. Unfinished! 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4945 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-15 21:17:18 +00:00