- langpacks/english: update

- langpacks/russian: update

git-svn-id: http://svn.miranda-ng.org/main/trunk@15402 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

14 files changed, 30 insertions, 31 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 351ae552d6..753ac61236 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -103,7 +103,7 @@
 [No]

 [Yes]

 [Hide from list only, in order to keep their history and ignore/visibility settings]

-[Use Options->Contacts->Ignore to unhide contacts.]

+[Use Options -> Contacts -> Ignore to unhide contacts.]

 [Are you sure you want to delete %s?]

 [This will erase all history and settings for this contact!]

 [Hide offline users]

@@ -949,7 +949,7 @@
 [Message from %s]

 [%s is typing a message]

 [Typing notification]

-[Miranda could not load the built-in message module, Msftedit.dll is missing. Press 'Yes' to continue loading Miranda.]

+[Miranda could not load the built-in message module, msftedit.dll is missing. Press 'Yes' to continue loading Miranda.]

 [Instant messages]

 [Incoming (focused window)]

 [Incoming (unfocused window)]

@@ -975,7 +975,7 @@
 [Delete history]

 [View &history]

 ;file \src\core\stduserinfo\src\contactinfo.cpp

-[Edit E-Mail address]

+[Edit e-mail address]

 [Edit phone number]

 [The phone number should start with a + and consist of numbers, spaces, brackets and hyphens only.]

 [Invalid phone number]

@@ -1279,7 +1279,7 @@
 [&Move to group]

 [<Root group>]

 ;file \src\mir_app\src\netliblog.cpp

-[Standard netlib log]

+[Standard Netlib log]

 [No times]

 [Standard hh:mm:ss times]

 [Times in milliseconds]

diff --git a/langpacks/english/Plugins/Clist_blind.txt b/langpacks/english/Plugins/Clist_blind.txt
index d3622a6810..b8eec5ce83 100644
--- a/langpacks/english/Plugins/Clist_blind.txt
+++ b/langpacks/english/Plugins/Clist_blind.txt
@@ -13,7 +13,7 @@
 [Yes]

 [No]

 [Hide from list only, in order to keep their history and ignore/visibility settings]

-[Use Options->Contacts->Ignore to unhide contacts.]

+[Use Options -> Contacts -> Ignore to unhide contacts.]

 [Hotkeys]

 [Show/Hide:]

 [Read message:]

diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt
index 66f4bd3e0d..081339ebae 100644
--- a/langpacks/english/Plugins/Clist_modern.txt
+++ b/langpacks/english/Plugins/Clist_modern.txt
@@ -77,7 +77,7 @@
 [Horizontal align]

 [Multiline status bar:]

 [Accounts per line]

-[* To increase status bar height:\nset in Main menu: Frames->Status Bar->Show title then pull appeared title of status bar up or down.]

+[* To increase status bar height:\nset in Main menu: Frames -> Status Bar -> Show title then pull appeared title of status bar up or down.]

 [Hold [Shift] to inverse [Right Click] behavior.]

 [[Ctrl]+[Left Click] to filter only protocol. Click on empty space to show all.]

 [Set options per account]

@@ -100,7 +100,7 @@
 [No]

 [Yes]

 [Hide from list only, in order to keep their history and ignore/visibility settings]

-[Use Options->Contacts->Ignore to unhide contacts.]

+[Use Options -> Contacts -> Ignore to unhide contacts.]

 [Are you sure you want to delete %s?]

 [This will erase all history and settings for this contact!]

 [Hide offline users]

diff --git a/langpacks/english/Plugins/Clist_nicer.txt b/langpacks/english/Plugins/Clist_nicer.txt
index f729a4083d..2655de5c30 100644
--- a/langpacks/english/Plugins/Clist_nicer.txt
+++ b/langpacks/english/Plugins/Clist_nicer.txt
@@ -21,7 +21,7 @@
 [No]

 [Yes]

 [Hide from list only, in order to keep their history and ignore/visibility settings]

-[Use Options->Contacts->Ignore to unhide contacts.]

+[Use Options -> Contacts -> Ignore to unhide contacts.]

 [Are you sure you want to delete %s?]

 [This will erase all history and settings for this contact!]

 [Contact list]

@@ -215,7 +215,7 @@
 [Appear always offline (block contact)]

 [Other]

 [Hide this contact from the list]

-[To show a previously hidden contact, navigate to Options->Events->Ignore, search the contact in the list and tick the checkbox next to its name.]

+[To show a previously hidden contact, navigate to Options -> Events -> Ignore, search the contact in the list and tick the checkbox next to its name.]

 [Display options]

 [Show contact with priority]

 [Show avatar:]

diff --git a/langpacks/english/Plugins/Fingerprint.txt b/langpacks/english/Plugins/Fingerprint.txt
index 70fed7dfaa..3bcd9ce156 100644
--- a/langpacks/english/Plugins/Fingerprint.txt
+++ b/langpacks/english/Plugins/Fingerprint.txt
@@ -3,7 +3,7 @@
 ;  File: Fingerprint.dll

 ;  Plugin: Fingerprint NG

 ;  Version: 0.1.0.0

-;  Authors: faith_healer, ghazan, mataes

+;  Authors: faith_healer, ghazan, Mataes

 ;============================================================

 [Fingerprint NG (client version) icons module for Miranda NG.]

 ;file \plugins\FingerprintNG\res\resource.rc

diff --git a/langpacks/english/Plugins/GG.txt b/langpacks/english/Plugins/GG.txt
index e008656860..146d7eb791 100644
--- a/langpacks/english/Plugins/GG.txt
+++ b/langpacks/english/Plugins/GG.txt
@@ -88,7 +88,7 @@
 [Miranda was unable to make a connection with a server. It is likely that the server is down, in which case you should wait for a while and try again later.]

 [Received invalid server response.]

 [The connection with the server was abortively closed during the connection attempt. You may have lost your local network connection.]

-[Your Gadu-Gadu number and password combination was rejected by the Gadu-Gadu server. Please check login details at M->Options->Network->Gadu-Gadu and try again.]

+[Your Gadu-Gadu number and password combination was rejected by the Gadu-Gadu server. Please check login details at Options -> Network -> Gadu-Gadu and try again.]

 [Connecting to Gadu-Gadu hub failed.]

 [Cannot establish secure connection.]

 [Server disconnected asking you for changing your e-mail.]

@@ -229,7 +229,7 @@
 ;file \protocols\Gadu-Gadu\src\userutils.cpp

 [Cannot register new account because of error:\n\t%s]

 [Registration rejected]

-[You have registered new account.\nPlease fill up your personal details in "M->View/Change My Details..."]

+[You have registered new account.\nPlease fill up your personal details in "M -> View/Change My Details..."]

 [Your account cannot be removed because of error:\n\t%s]

 [Bad number or password]

 [Your account has been removed.]

diff --git a/langpacks/english/Plugins/ICQ.txt b/langpacks/english/Plugins/ICQ.txt
index 56ea83f93d..0f77c4da31 100644
--- a/langpacks/english/Plugins/ICQ.txt
+++ b/langpacks/english/Plugins/ICQ.txt
@@ -781,11 +781,11 @@
 [%s server connection]

 [%s client-to-client connections]

 [User ID]

-[You have not entered an ICQ number.\nConfigure this in Options->Network->ICQ and try again.]

+[You have not entered an ICQ number.\nConfigure this in Options -> Network -> ICQ and try again.]

 ;file \protocols\IcqOscarJ\src\icq_server.cpp

 [Unable to connect to ICQ login server, SSL could not be negotiated]

 [Unable to connect to ICQ login server]

-[Miranda was unable to allocate a port to listen for direct peer-to-peer connections between clients. You will be able to use most of the ICQ network without problems but you may be unable to send or receive files.\n\nIf you have a firewall this may be blocking Miranda, in which case you should configure your firewall to leave some ports open and tell Miranda which ports to use in M->Options->ICQ->Network.]

+[Miranda was unable to allocate a port to listen for direct peer-to-peer connections between clients. You will be able to use most of the ICQ network without problems but you may be unable to send or receive files.\n\nIf you have a firewall this may be blocking Miranda, in which case you should configure your firewall to leave some ports open and tell Miranda which ports to use in Options -> ICQ -> Network.]

 [Connection failed.\nLogin sequence failed for unknown reason.\nTry again later.]

 [Your connection with the ICQ server was abortively closed]

 ;file \protocols\IcqOscarJ\src\icq_servlist.cpp

@@ -914,10 +914,10 @@
 [ICQ Fatal]

 [The server did not respond to the connection attempt within a reasonable time, it may be temporarily down. Try again later.]

 [The connection with the server was abortively closed during the connection attempt. You may have lost your local network connection.]

-[Miranda was unable to resolve the name of a server to its numeric address. This is most likely caused by a catastrophic loss of your network connection (for example, your modem has disconnected), but if you are behind a proxy, you may need to use the 'Resolve hostnames through proxy' option in M->Options->Network.]

+[Miranda was unable to resolve the name of a server to its numeric address. This is most likely caused by a catastrophic loss of your network connection (for example, your modem has disconnected), but if you are behind a proxy, you may need to use the 'Resolve hostnames through proxy' option in Options -> Network.]

 [Miranda was unable to make a connection with a server. It is likely that the server is down, in which case you should wait for a while and try again later.]

-[Your proxy rejected the user name and password that you provided. Please check them in M->Options->Network.]

-[The server to which you are trying to connect does not exist. Check your spelling in M->Options->Network->ICQ.]

+[Your proxy rejected the user name and password that you provided. Please check them in Options -> Network.]

+[The server to which you are trying to connect does not exist. Check your spelling in Options -> Network -> ICQ.]

 [error]

 ;file \protocols\IcqOscarJ\src\loginpassword.cpp

 [Enter a password for UIN %u:]

diff --git a/langpacks/english/Plugins/ICQCorp.txt b/langpacks/english/Plugins/ICQCorp.txt
index 3fc14aaedb..730036b7e0 100644
--- a/langpacks/english/Plugins/ICQCorp.txt
+++ b/langpacks/english/Plugins/ICQCorp.txt
@@ -24,7 +24,7 @@
 ;file \protocols\ICQCorp\src\protocol.cpp

 [ICQ Corporate plugin used only WinSock v2.2 or later.]

 [You need specify ICQ Corporate login server.]

-[Your ICQ Corp number and password combination was rejected by the ICQ Corporate server. Please go to M->Options->ICQCorp and try again.]

+[Your ICQ Corp number and password combination was rejected by the ICQ Corporate server. Please go to Options -> Network -> ICQCorp and try again.]

 ;file \protocols\ICQCorp\src\services.cpp

 [ICQ number:]

 [%d file]

diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index e39c6ef826..b6b0d9738e 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -262,7 +262,7 @@
 [Supports SecureIM plugin for Miranda NG]

 [Supports OTR (Off-the-Record Messaging)]

 [Supports New_GPG plugin for Miranda NG]

-[Blocks packets from other users/groupchats using Privacy lists]

+[Blocks packets from other users/group chats using Privacy lists]

 [Supports Message Receipts]

 [Can report information about the music to which a user is listening]

 [Receives information about the music to which a user is listening]

diff --git a/langpacks/english/Plugins/KeyboardNotify.txt b/langpacks/english/Plugins/KeyboardNotify.txt
index 9ea3afe811..0ad58cbfc3 100644
--- a/langpacks/english/Plugins/KeyboardNotify.txt
+++ b/langpacks/english/Plugins/KeyboardNotify.txt
@@ -96,9 +96,9 @@
 [** All contacts **]

 [** Unknown contacts **]

 ;file \plugins\KeyboardNotify\src\options.cpp

-[left->right]

-[right->left]

-[left<->right]

+[left -> right]

+[right -> left]

+[left <-> right]

 [Keyboard Flash]

 [Events]

 [Accounts]

diff --git a/langpacks/english/Plugins/Ping.txt b/langpacks/english/Plugins/Ping.txt
index 4599315b94..02ff112b28 100644
--- a/langpacks/english/Plugins/Ping.txt
+++ b/langpacks/english/Plugins/Ping.txt
@@ -21,7 +21,7 @@
 [Browse...]

 [Interface]

 [Do not change icon when testing]

-[Use the Customize/Fonts options to change text size and color.]

+[Use the Customize -> Fonts options to change text size and color.]

 [Indent:]

 [Row height:]

 [Repeats for success/failure:]

diff --git a/langpacks/english/Plugins/SendSS.txt b/langpacks/english/Plugins/SendSS.txt
index a8a672884e..76de5546d8 100644
--- a/langpacks/english/Plugins/SendSS.txt
+++ b/langpacks/english/Plugins/SendSS.txt
@@ -146,8 +146,7 @@
 [Couldn't take a screenshot]

 [Select a file]

 [Select a target window.]

-[Screenshot ]

-[for Client area ]

-[of "]

-[" Window]

+[Screenshot of "%s"]

+[Screenshot for client area of "%s" window]

+[Screenshot of "%s" window]

 [Send screenshot?]

diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index 95c5265ff8..931990107d 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -314,7 +314,7 @@
 [RTL is default text direction]

 [Log status changes (in open message windows only)]

 [Revert to global options]

-[You can set private message log options for this contact here. Filled boxes are inherited from the global settings which can be found on Message sessions->Message log]

+[You can set private message log options for this contact here. Filled boxes are inherited from the global settings which can be found on Message sessions -> Message log]

 [Use normal templates (uncheck to use simple templates)]

 [Queued send jobs]

 [Queued jobs]

@@ -522,7 +522,7 @@
 ;file \plugins\TabSRMM\src\generic_msghandlers.cpp

 [Rich Edit file]

 [No status message]

-[Configuration issue|The unattended send feature is disabled. The \\b1 send later\\b0  and \\b1 send to multiple contacts\\b0  features depend on it.\n\nYou must enable it under \\b1Options->Message sessions->Advanced tweaks\\b0. Changing this option requires a restart.]

+[Configuration issue|The unattended send feature is disabled. The \\b1 send later\\b0  and \\b1 send to multiple contacts\\b0  features depend on it.\n\nYou must enable it under \\b1Options -> Message sessions -> Advanced tweaks\\b0. Changing this option requires a restart.]

 [You cannot edit user notes when there are unsent messages]

 [Version]

 [%s is typing a message...]

@@ -914,7 +914,7 @@
 [Missing component|The icon pack is missing. Please install it to the default icons folder.\n\nNo icons will be available]

 [Aero peek warning|You have enabled Aero Peek features and loaded a custom container window skin\n\nThis can result in minor visual anomalies in the live preview feature.]

 [File transfer problem|Sending the image by file transfer failed.\n\nPossible reasons: File transfers not supported, either you or the target contact is offline, or you are invisible and the target contact is not on your visibility list.]

-[Settings problem|The option \\b1 History->Imitate IEView API\\b0  is enabled and the History++ plugin is active. This can cause problems when using IEView as message log viewer.\n\nShould I correct the option (a restart is required)?]

+[Settings problem|The option \\b1 History -> Imitate IEView API\\b0  is enabled and the History++ plugin is active. This can cause problems when using IEView as message log viewer.\n\nShould I correct the option (a restart is required)?]

 [Closing Window|You are about to close a window with multiple tabs open.\n\nProceed?]

 [Closing options dialog|To reflect the changes done by importing a theme in the options dialog, the dialog must be closed after loading a theme \\b1 and unsaved changes might be lost\\b0 .\n\nDo you want to continue?]

 [Loading a theme|Loading a color and font theme can overwrite the settings defined by your skin.\n\nDo you want to continue?]

diff --git a/langpacks/english/Plugins/Toaster.txt b/langpacks/english/Plugins/Toaster.txt
index a79b1420d4..b232e55ffc 100644
--- a/langpacks/english/Plugins/Toaster.txt
+++ b/langpacks/english/Plugins/Toaster.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Toaster.dll

 ;  Plugin: Toaster

-;  Version: 0.11.1.1

+;  Version: 0.11.2.0

 ;  Authors: Miranda NG team

 ;============================================================

 [Provides popup services based on Windows toast notification for different plugins.]