From f56ef4f165a70af48229b360a67f44f0967b29d3 Mon Sep 17 00:00:00 2001 From: thunder2 Date: Tue, 12 Mar 2013 00:08:28 +0000 Subject: [PATCH] Updated english translation. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6215 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- plugins/FeedReader/lang/FeedReader_en.ts | 20 +- retroshare-gui/src/lang/retroshare_en.ts | 510 ++++++++++++++++++----- 2 files changed, 417 insertions(+), 113 deletions(-) diff --git a/plugins/FeedReader/lang/FeedReader_en.ts b/plugins/FeedReader/lang/FeedReader_en.ts index 029383773..79c4484f8 100644 --- a/plugins/FeedReader/lang/FeedReader_en.ts +++ b/plugins/FeedReader/lang/FeedReader_en.ts @@ -547,52 +547,52 @@ - + The messages will be added to the forum - + No name - + Mark as read - + Mark as unread - + Mark all as read - + Copy link - + Remove - + Retransform - + Hide - + Expand diff --git a/retroshare-gui/src/lang/retroshare_en.ts b/retroshare-gui/src/lang/retroshare_en.ts index 2387516bd..4189abae6 100644 --- a/retroshare-gui/src/lang/retroshare_en.ts +++ b/retroshare-gui/src/lang/retroshare_en.ts @@ -449,6 +449,10 @@ p, li { white-space: pre-wrap; } But Remember: Any data here *WILL* be lost when we upgrade the protocols. + + GxsChannels + + AttachFileItem @@ -1047,6 +1051,13 @@ p, li { white-space: pre-wrap; } + + ChannelDialog + + GxsChannels + + + ChannelFeed @@ -2935,14 +2946,6 @@ Do you want to save your changes? Paste RetroShare Link - - Channel security policy prevents you from posting files that you don't have. If you have these files, you need to share them before, or attach them explicitly: - - - - You can only post files that you do have - - Drop file error. @@ -2985,6 +2988,14 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><img src=":/images/feedback_arrow.png" /><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;"> Copy/Paste RetroShare links from your shares</span></p></body></html> + + You are about to add files you're not actually sharing. Do you still want this to happen? + + + + About to post un-owned files to a channel. + + CreateForum @@ -3151,6 +3162,115 @@ p, li { white-space: pre-wrap; } + + CreateGxsChannelMsg + + New Channel Post + + + + Channel Post + + + + Channel Post to: + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt; font-weight:600;">Attachments:</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><img src=":/images/feedback_arrow.png" /><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;"> Use Drag and Drop / Add Files button, to Hash new files.</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><img src=":/images/feedback_arrow.png" /><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;"> Copy/Paste RetroShare links from your shares</span></p></body></html> + + + + Add File to Attach + + + + Add Channel Thumbnail + + + + Message + + + + Subject : + + + + Attachments + + + + Allow channels to get frame for message thumbnail from movie media attachments or not + + + + Auto Thumbnail + + + + Drag and Drop Files from Search Results + + + + New GxsChannel Post + + + + Paste RetroShare Links + + + + Paste RetroShare Link + + + + GxsChannel security policy prevents you from posting files that you don't have. If you have these files, you need to share them before, or attach them explicitly: + + + + You can only post files that you do have + + + + Drop file error. + + + + Directory can't be dropped, only files are accepted. + + + + File not found or file name not accepted. + + + + Add Extra File + + + + RetroShare + + + + File already Added and Hashed + + + + Please add a Subject + + + + Load thumbnail picture + + + CreateGxsForumMsg @@ -5761,6 +5881,257 @@ p, li { white-space: pre-wrap; } + + GxsChannelDialog + + Channels + + + + refresh + + + + Display + + + + Create Channel + + + + Loading + + + + Post to Channel + + + + Set all as read + + + + Enable Auto-Download + + + + My Channels + + + + Subscribed Channels + + + + Popular Channels + + + + Other Channels + + + + Subscribe to Channel + + + + Unsubscribe to Channel + + + + Disable Auto-Download + + + + Show Channel Details + + + + Restore Publish Rights for Channel + + + + Edit Channel Details + + + + Share Channel + + + + Copy RetroShare Link + + + + Publish rights restored. + + + + Publish rights have been restored for this channel. + + + + Publish not restored. + + + + Publish rights can't be restored for this channel.<br/>You're not the creator of this channel. + + + + No Channel Selected + + + + + GxsChannelGroupDialog + + Create New Channel + + + + Channel + + + + Edit Channel + + + + + GxsChannelPostItem + + Toggle Message Read Status + + + + New + + + + Download + + + + Play + + + + Copy RetroShare Link + + + + Unsubscribe From Channel + + + + Expand + + + + Set as read and remove item + + + + Remove Item + + + + Channel Feed + + + + Files + + + + Warning! You have less than %1 hours and %2 minute before this file is deleted Consider saving it. + + + + Hide + + + + + GxsCommentContainer + + Comment Container + + + + Comments + + + + + GxsCommentDialog + + Form + + + + 1 + + + + /\ + + + + score + + + + \/ + + + + Title this is a very very very very loooooooooooooooonnnnnnnnnnnnnnnnng title dont you think? yes it is and should wrap around I hope + + + + Date + + + + From + + + + Site + + + + Hot + + + + New + + + + Top + + + + Refresh + + + + Comment + + + + Author + + + + Points + + + GxsCommentTreeWidget @@ -5776,6 +6147,21 @@ p, li { white-space: pre-wrap; } + + GxsCreateCommentDialog + + Make Comment + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-weight:600;">Comment</span></p></body></html> + + + GxsForumGroupDialog @@ -6742,10 +7128,6 @@ p, li { white-space: pre-wrap; } Friends - - Transfers - - Messages @@ -6914,6 +7296,10 @@ p, li { white-space: pre-wrap; } Chat Lobbies + + File sharing + + MessageComposer @@ -8963,88 +9349,6 @@ malicious behavior of crafted plugins. - - PostedComments - - Form - - - - Hot - - - - New - - - - Top - - - - Refresh - - - - 1 - - - - /\ - - - - score - - - - \/ - - - - Title this is a very very very very loooooooooooooooonnnnnnnnnnnnnnnnng title dont you think? yes it is and should wrap around I hope - - - - Date - - - - From - - - - Site - - - - Comment - - - - Author - - - - Points - - - - - PostedCreateCommentDialog - - Make Comment - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-weight:600;">Comment</span></p></body></html> - - - PostedCreatePostDialog @@ -9075,15 +9379,7 @@ p, li { white-space: pre-wrap; } PostedDialog - Posted Links - - - - List - - - - Comments + Posted @@ -9101,6 +9397,14 @@ p, li { white-space: pre-wrap; } Edit Posted Topic + + Add Topic Admins + + + + Select Topic Admins + + PostedItem