From 0de7c55f7cd15b36b2ed0ecae1b0d96b179b0edd Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Thu, 17 Oct 2013 20:37:29 +0000 Subject: - langpacks/english: updated git-svn-id: http://svn.miranda-ng.org/main/trunk@6513 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- langpacks/english/Plugins/BasicHistory.txt | 4 +-- langpacks/english/Plugins/DbEditorPP.txt | 8 ----- langpacks/english/Plugins/FileAsMessage.txt | 2 +- langpacks/english/Plugins/ICQ.txt | 2 +- langpacks/english/Plugins/Msg_Export.txt | 8 ++--- langpacks/english/Plugins/MyDetails.txt | 1 - langpacks/english/Plugins/New_GPG.txt | 2 +- langpacks/english/Plugins/Omegle.txt | 1 - langpacks/english/Plugins/Scriver.txt | 1 + langpacks/english/Plugins/SecureIM.txt | 24 ++++++------- langpacks/english/Plugins/SeenPlugin.txt | 2 +- langpacks/english/Plugins/Spamotron.txt | 54 ++++++++++++++--------------- langpacks/english/Plugins/TabSRMM.txt | 1 + langpacks/english/Plugins/Xfire.txt | 11 ++---- langpacks/english/Plugins/wbOSD.txt | 30 ++++++++-------- 15 files changed, 70 insertions(+), 81 deletions(-) (limited to 'langpacks') diff --git a/langpacks/english/Plugins/BasicHistory.txt b/langpacks/english/Plugins/BasicHistory.txt index d6d1e554e6..9149577a1e 100644 --- a/langpacks/english/Plugins/BasicHistory.txt +++ b/langpacks/english/Plugins/BasicHistory.txt @@ -36,7 +36,7 @@ [Search forward in message window] [Match Case] [Match Whole Word] -[Only Incomming Messages] +[Only Incoming Messages] [Only Outgoing Messages] [Only Selected Group] [All Contacts] @@ -162,7 +162,7 @@ [Switch Match Case] [Switch Match Whole Word] [Show/Hide Contacts] -[Switch Only Incomming Messages] +[Switch Only Incoming Messages] [Switch Only Outgoing Messages] [Switch Only Selected Group] [Switch All Contacts] diff --git a/langpacks/english/Plugins/DbEditorPP.txt b/langpacks/english/Plugins/DbEditorPP.txt index edc86c0a05..0d0f65f87c 100644 --- a/langpacks/english/Plugins/DbEditorPP.txt +++ b/langpacks/english/Plugins/DbEditorPP.txt @@ -24,16 +24,11 @@ [Entirely] [Restore last opened position] [Automatically expand "settings" when Database Editor ++ starts] -[Use known modules list] [Warn when deleting modules] ["Open user tree in DBE++" menu item] [Use popups when watched settings change values] -[Modules to ALWAYS mark as known (e.g core modules)] -[Put a space or comma between each module name] -[Changes to this list will take effect next time miranda starts] [Popup timeout (0 for infinite)] [Background color] -[If the module name has a space in it, put a \\ before the space. eg "aaa\\ bbb"] [Add a module to contact] [Add a module named] [Add to all contacts (Includes Settings)] @@ -99,7 +94,6 @@ [&Rename] [Copy To Contact] [Export Module] -[Add To Known Modules] [&Clone] [Export Contact] [Import Settings] @@ -159,8 +153,6 @@ ;file \plugins\DbEditorPP\src\icons.cpp [Closed Known Module] [Open Known Module] -[Closed Unknown Module] -[Open Unknown Module] [Contacts Group] [Unknown Contact] [Known Contact] diff --git a/langpacks/english/Plugins/FileAsMessage.txt b/langpacks/english/Plugins/FileAsMessage.txt index 8be44417ca..ff0a54c8c4 100644 --- a/langpacks/english/Plugins/FileAsMessage.txt +++ b/langpacks/english/Plugins/FileAsMessage.txt @@ -36,7 +36,7 @@ [Incoming file request. Do you want to proceed?] [Canceled by remote user] [New incoming file request. Do you want to proceed?] -[Paused, because connection dropped] +[File transfer is paused because of dropped connection] [Failed on file initialization] [Paused...] [Synchronizing...] diff --git a/langpacks/english/Plugins/ICQ.txt b/langpacks/english/Plugins/ICQ.txt index 4328177e53..13e78909d6 100644 --- a/langpacks/english/Plugins/ICQ.txt +++ b/langpacks/english/Plugins/ICQ.txt @@ -737,7 +737,7 @@ [Deleting group "%s"...] [All operations complete] [Close] -[You have to be online to sychronize the server-list !] +[You have to be online to sychronize the server-list!] [** All contacts **] ;file \protocols\IcqOscarJ\src\icq_xstatus.cpp [Angry] diff --git a/langpacks/english/Plugins/Msg_Export.txt b/langpacks/english/Plugins/Msg_Export.txt index e921c8d173..863c719780 100644 --- a/langpacks/english/Plugins/Msg_Export.txt +++ b/langpacks/english/Plugins/Msg_Export.txt @@ -41,15 +41,15 @@ [Copy] ;file \plugins\Msg_Export\src\FileViewer.cpp [Failed to write to the RichEdit the buffer was to small.] -[Error: Optimal buffer size decrecied to a to low size !!] -[Internal error !! (lExtraRead >= 0)] +[Error: Optimal buffer size decrecied to a to low size!] +[Internal error! (lExtraRead >= 0)] [Faile to execute external file view] [Failed to load Rich Edit ( RICHED32.DLL )] [Failed to get handle to RichEdit!] [Failed to open file\r\n%s\r\n\r\nContact handle is invalid] [Failed to open file\r\n%s\r\n\r\nMiranda database contains %d events] [With scroll to bottom %d\n] -[Search string was not found !] +[Search string was not found!] [Save as RTF] [Color...] [Font...] @@ -75,7 +75,7 @@ [Nick] [Proto] [UIN] -[You have unapplyed changes do you wish to apply these first?] +[You have not applied the changes, do you wish to apply them first?] [Executable files] [All files] [Failed to get the shells allocator!] diff --git a/langpacks/english/Plugins/MyDetails.txt b/langpacks/english/Plugins/MyDetails.txt index 575a4559f0..829e22ee9a 100644 --- a/langpacks/english/Plugins/MyDetails.txt +++ b/langpacks/english/Plugins/MyDetails.txt @@ -83,6 +83,5 @@ [Next protocol] [Set My Nickname for %s] [Set My Status Message for %s] -[Show next protocol] [Contact List] ;file \plugins\MyDetails\src\options.cpp diff --git a/langpacks/english/Plugins/New_GPG.txt b/langpacks/english/Plugins/New_GPG.txt index add17710f8..e080988f61 100644 --- a/langpacks/english/Plugins/New_GPG.txt +++ b/langpacks/english/Plugins/New_GPG.txt @@ -117,7 +117,7 @@ [Info] [Your GPG version is supported. The language file was found.\nGPG plugin should work fine.\nPress OK to continue.] [GPG binary does not exist.\nPlease choose another location] -[please choose gpg binary location] +[Please choose GPG binary location] [please set keyring's home directory] [There is existing key for contact, would you like to replace it with new key?] [New public key was received, do you want to import it?] diff --git a/langpacks/english/Plugins/Omegle.txt b/langpacks/english/Plugins/Omegle.txt index d153508312..185edf404f 100644 --- a/langpacks/english/Plugins/Omegle.txt +++ b/langpacks/english/Plugins/Omegle.txt @@ -19,7 +19,6 @@ [Automatically connect to another stranger when current disconnects] [Don't clear chat before connecting to new stranger] [Load count of users on actual server after connection] -[Enable logging for debugging purposes] [Meet strangers with common interests] [Your interests (separated by commas):] ;file \protocols\Omegle\src\chat.cpp diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt index 83c2485a62..088c1aa3a2 100644 --- a/langpacks/english/Plugins/Scriver.txt +++ b/langpacks/english/Plugins/Scriver.txt @@ -440,6 +440,7 @@ [path to current miranda profile] [name of current miranda profile (filename, without extension)] [will return parsed string %miranda_profile%\\Profiles\\%miranda_profilename%] +[will return parsed string %miranda_userdata%\\Logs] [same as environment variable %APPDATA% for currently logged-on Windows user] [username for currently logged-on Windows user] ["My Documents" folder for currently logged-on Windows user] diff --git a/langpacks/english/Plugins/SecureIM.txt b/langpacks/english/Plugins/SecureIM.txt index b4b871dfe4..2b057881d8 100644 --- a/langpacks/english/Plugins/SecureIM.txt +++ b/langpacks/english/Plugins/SecureIM.txt @@ -99,23 +99,23 @@ [Sent back message received...] [Sending back secure message...] [SecureIM disabled...] -[Sending Key...] -[Key Received...] -[Sending Message...] -[Message Received...] -[Encrypting File:] -[Decrypting File:] +[Sending key...] +[Key received...] +[Sending message...] +[Message received...] +[Encrypting file:] +[Decrypting file:] [Bad key received...] [SecureIM: Error while decrypting the message.] [SecureIM: Error while decrypting the message, bad message length.] [SecureIM: Error while decrypting the message, bad message CRC.] -[User has not answered to key exchange !\nYour messages are still in SecureIM queue, do you want to send them Unencrypted now?] -[SecureIM not enabled! You Must Enable SecureIM with this user...] -[Can't Send Encrypted Message !\nUser is offline now and his secure key has been expired, Do you want to send your message ?\nIt will be unencrypted !] -[SecureIM won't be loaded because cryptopp.dll is missing or wrong version !] +[User has not answered to key exchange!\nYour messages are still in SecureIM queue, do you want to send them unencrypted now?] +[SecureIM not enabled! You must enable SecureIM with this user...] +[Can't send encrypted message!\nUser is offline now and his secure key has been expired. Do you want to send your message?\nIt will be unencrypted!] +[SecureIM won't be loaded because cryptopp.dll is missing or wrong version!] [SecureIM can't load PGP/GPG key! Check PGP/GPG settings!] [SecureIM can't encrypt message! Check trust of PGP/GPG key!] -[Can't Send Encrypted Message !\nDo you want to send your message ?\nIt will be unencrypted !] +[Can't send encrypted message!\nDo you want to send your message?\nIt will be unencrypted!] [Can't change mode! Secure connection established!] [Can't export RSA private key!] [Can't import RSA private key!] @@ -135,7 +135,7 @@ [(none)] [Private key loaded.] [Private key not loaded!] -[The new settings will become valid when you restart MirandaNG!] +[The new settings will become valid when you restart Miranda NG!] [Keyrings disabled!] [Native] [Disabled] diff --git a/langpacks/english/Plugins/SeenPlugin.txt b/langpacks/english/Plugins/SeenPlugin.txt index 100decc4b4..d474ba1bd0 100644 --- a/langpacks/english/Plugins/SeenPlugin.txt +++ b/langpacks/english/Plugins/SeenPlugin.txt @@ -52,13 +52,13 @@ [Changed to Online] [User Logged Off] [User Logged In] -[Last seen] ;file \plugins\SeenPlugin\src\menu.cpp [] [] ;file \plugins\SeenPlugin\src\options.cpp [Last Seen Variables] [Contacts] +[Last seen] [Popups] ;file \plugins\SeenPlugin\src\seen.h [%n is %s (%u)] diff --git a/langpacks/english/Plugins/Spamotron.txt b/langpacks/english/Plugins/Spamotron.txt index be1f657b91..6e354584e7 100644 --- a/langpacks/english/Plugins/Spamotron.txt +++ b/langpacks/english/Plugins/Spamotron.txt @@ -7,59 +7,59 @@ ;============================================================ [Anti-spam plugin with captcha and Bayes filtering.] ;file \plugins\Spamotron\res\spamotron.rc -[Do not send challenge request if message score above] -[Auto-learn messages from approved contacts as ham] +[Enabled] +[Learned ham messages:] +[Learned spam messages:] [Filtering options] +[Do not send challenge request if message score above] +[Auto approve contact if message score below] +[and learn as ham] +[Do not enable any of these options until Spam-o-tron has learned at least 20 of ham and 50 of spam messages.] [Learning options] +[Auto-learn messages from approved contacts as ham] +[Auto-learn messages from contacts if not approved in] +[days as spam] [Auto-learn outgoing messages as ham] +[Learn message:] [Spam] [Ham] -[Learn message:] -[Auto approve contact if message score below] -[Do not enable any of these options until Spam-o-tron have learned at least 20 of ham and 50 of spam messages.] -[Learned ham messages:] -[Learned spam messages:] [Analyze] -[Auto-learn messages from contacts if not approved in] -[days as spam] -[Enabled] -[and learn as ham] -[Enabled accounts:] -[Do not reply to messages with words in this list:] -[Do not reply to the same message more than] -[Flood protection] -[Do not send more than] -[messages to one contact per day] -[times a day] [Settings] +[Enabled accounts:] +[Auto approve on:] [Outgoing message] [Incoming message with any word from list:] -[Auto approve on:] [Hide contact until verified] [Add permanently to list on verified] [Log actions to system history] +[Flood protection] +[Do not send more than] +[messages to one contact per day] +[Do not reply to the same message more than] +[times a day] +[Do not reply to messages with words in this list:] [Mode:] -[Responses: (saved in %response%, %response-n% variables)] +[Case-sensitive] [will be saved in %mathexpr%] -[Reset to defaults] +[Send challenge on incoming message:] +[Responses: (saved in %response%, %response-n% variables)] [Reply on success:] [Send challenge on authorization request:] [Keep blocked messages in contact history] -[Case-sensitive] -[Send challenge on incoming message:] [and mark them unread after approval] +[Reset to defaults] [Enable popup notifications] -[Contact blocked] -[Contact approved] [Appearance] [Foreground] [Background] [Timeout] +[Contact blocked] +[Contact approved] +[Challenge sent] [Default colors] +[Windows colors] [Default timeout] [Preview] -[Windows colors] -[Challenge sent] ;file \plugins\Spamotron\src\bayes.cpp [Bayes database path] ;file \plugins\Spamotron\src\common.h diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt index 07e9635f40..2004990092 100644 --- a/langpacks/english/Plugins/TabSRMM.txt +++ b/langpacks/english/Plugins/TabSRMM.txt @@ -1109,6 +1109,7 @@ [path to current miranda profile] [name of current miranda profile (filename, without extension)] [will return parsed string %miranda_profile%\\Profiles\\%miranda_profilename%] +[will return parsed string %miranda_userdata%\\Logs] [same as environment variable %APPDATA% for currently logged-on Windows user] [username for currently logged-on Windows user] ["My Documents" folder for currently logged-on Windows user] diff --git a/langpacks/english/Plugins/Xfire.txt b/langpacks/english/Plugins/Xfire.txt index 2f434c6f74..86e1c270b0 100644 --- a/langpacks/english/Plugins/Xfire.txt +++ b/langpacks/english/Plugins/Xfire.txt @@ -6,9 +6,9 @@ ; Authors: dufte ;============================================================ [Xfire protocol support for Miranda NG.] -;file \protocols\Xfire\res\Kopie von resource.rc +;file \protocols\Xfire\res\resource.rc [Password:] -[Loginname:] +[Login name:] [XFire] [Nick:] [Current Protocolversion:] @@ -27,8 +27,6 @@ [Show friends of my friends] [Options] [More options] -[Gameicon:] -[Voiceicon:] [Display Error and Infomessage:] [Main group for clan groups:] [Automatically scan for games:] @@ -65,11 +63,9 @@ [Game] [Voicechat] [Name:] -[Unreal Tournament 2004] [IP:] [Port:] [Userdetails] -[dufte] [Copy] [Enter Password] [Join] @@ -93,7 +89,6 @@ [Parameter:] [Add a new game] [Searching games ...] -;file \protocols\Xfire\res\resource.rc ;file \protocols\Xfire\src\addgamedialog.cpp [All Files] [Please wait, gameini will be currently parsed ...] @@ -164,7 +159,7 @@ [XFire does not support offline messaging!] [Username] [Unable to connect to XFire.] -[No Loginname is set!] +[No Login name is set!] [No Password is set!] [Last game: %s playtime: %.2d:%.2d:%.2d] [%s is playing %s.] diff --git a/langpacks/english/Plugins/wbOSD.txt b/langpacks/english/Plugins/wbOSD.txt index 6edebd76a3..bf95f96245 100644 --- a/langpacks/english/Plugins/wbOSD.txt +++ b/langpacks/english/Plugins/wbOSD.txt @@ -7,33 +7,35 @@ ;============================================================ [Shows new message/status change info using on-screen display.] ;file \plugins\wbOSD\res\wbOSD.rc -[Dialog] +[General] +[Align] [Select font] -[Text color] -[Background color] -[Transparent] +[Shadow] +[Show drop shadow] +[Shadow align] [Shadow color] [Alternative shadow] -[Shadow align] -[General] -[Shadow] -[Align] [Shadow distance:] [Other] +[Background color] +[Transparent] [Alpha:] -[Announce] +[Static] [Timeout (ms):] -[Show] -[Show events] -[Status changes] [Show testing OSD] +[Announce] +[Status changes] [Show my status changes] -[Show message window after click] -[Static] +[Text color] +[Show events] [Format:] +[Show message window after click] [Show when my status is:] ;file \plugins\wbOSD\src\events.cpp [%s is %s] ;file \plugins\wbOSD\src\options.cpp +[Variables:\n %n : Nick\n %m : Message\n %l : New line] +[Help] +[Miranda NG is great and this is a long message.] [Plugins] [OSD] -- cgit v1.2.3