- langpacks/english: update

- langpacks/russian: update

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

7 files changed, 13 insertions, 8 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 3e273180c8..7ca2d3a4f3 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -1127,7 +1127,7 @@
 [<Root group>]

 ;file \src\modules\database\database.cpp

 [Miranda is trying to upgrade your profile structure.\nIt cannot move profile %s to the new location %s\nBecause profile with this name already exists. Please resolve the issue manually.]

-[Miranda is trying to upgrade your profile structure.\nIt cannot move profile %s to the new location %s automatically\nMost likely due to insufficient privileges. Please move profile manually.]

+[Miranda is trying to upgrade your profile structure.\nIt cannot move profile %s to the new location %s automatically\nMost likely this is due to insufficient privileges. Please move profile manually.]

 [Profile cannot be placed into Miranda root folder.\nPlease move Miranda profile to some other location.]

 [Miranda is unable to open '%s' because you do not have any profile plugins installed.\nYou need to install dbx_mmap.dll]

 [No profile support installed!]

diff --git a/langpacks/english/Plugins/Dbx_mmap.txt b/langpacks/english/Plugins/Dbx_mmap.txt
index 54395a8524..74f0e94d26 100644
--- a/langpacks/english/Plugins/Dbx_mmap.txt
+++ b/langpacks/english/Plugins/Dbx_mmap.txt
@@ -19,7 +19,7 @@
 [Database encryption mode]

 [Standard]

 [Total]

-[Only critical data are encrypted (passwords, security tokens, etc). All another settings and history remains unencrypted. Fast and effective, suitable for the most cases]

+[Only critical data are encrypted (passwords, security tokens, etc). All other settings and history remains unencrypted. Fast and effective, suitable for the most cases]

 [All string settings and all events in histories are encrypted. It also makes Miranda much slower and creates a risk of losing everything you've stored in a profile in case of losing password. Recommended only for paranoid users]

 [Set password]

 ;file \plugins\Db3x_mmap\src\database.cpp

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

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

 [Supports New_GPG plugin for Miranda NG]

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

+[Blocks packets from other users/groupchats 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/NewAwaySys.txt b/langpacks/english/Plugins/NewAwaySys.txt
index c72a009710..8f602ca810 100644
--- a/langpacks/english/Plugins/NewAwaySys.txt
+++ b/langpacks/english/Plugins/NewAwaySys.txt
@@ -104,7 +104,7 @@
 [Create new message]

 [Create new category]

 [Open Variables help dialog]

-[Your most recent status messages are placed in this category. It's not recommended to put your messages manually here, as they'll be replaced by your recent messages.]

+[Your most recent status messages are placed in this category. It's not recommended that you put your messages manually here, as they'll be replaced by your recent messages.]

 [You can put your frequently used and favorite messages in this category.]

 [When this checkbox is ticked, NewAwaySys counts "send times" starting from the last status message change, even if status mode didn't change.\nWhen the checkbox isn't ticked, "send times" are counted from last status mode change (i.e., disabled state is more restrictive).]

 [Message]

diff --git a/langpacks/english/Plugins/New_GPG.txt b/langpacks/english/Plugins/New_GPG.txt
index 7440c09f2f..a31a59fae3 100644
--- a/langpacks/english/Plugins/New_GPG.txt
+++ b/langpacks/english/Plugins/New_GPG.txt
@@ -109,11 +109,11 @@
 [Failed to allocate memory]

 [Failed to lock memory with error %d]

 [Failed write to clipboard with error %d]

-[GPG binary found in Miranda folder, but English locale does not exist.\nIt's highly recommended to place \\gnupg.nls\\en@quot.mo in GnuPG folder under Miranda root.\nWithout this file you may experience many problems with GPG output on non-English systems\nand plugin may completely not work.\nYou have been warned.]

+[GPG binary found in Miranda folder, but English locale does not exist.\nIt's highly recommended that you place \\gnupg.nls\\en@quot.mo in GnuPG folder under Miranda root.\nWithout this file you may experience many problems with GPG output on non-English systems\nand plugin may completely not work.\nYou have been warned.]

 [Warning]

 [Wrong GPG binary location found in system.\nPlease choose another location]

-[This is not GnuPG binary!\nIt is recommended to use GnuPG v1.x.x with this plugin.]

-[Unsupported GnuPG version found, use at you own risk!\nIt is recommended to use GnuPG v1.x.x with this plugin.]

+[This is not GnuPG binary!\nIt is recommended that you use GnuPG v1.x.x with this plugin.]

+[Unsupported GnuPG version found, use at you own risk!\nIt is recommended that you use GnuPG v1.x.x with this plugin.]

 ["GPG" directory found in Miranda root.\nAssuming it's GPG home directory.\nGPG home directory set.]

 [Info]

 [Your GPG version is supported. The language file was found.\nGPG plugin should work fine.\nPress OK to continue.]

diff --git a/langpacks/english/Plugins/SecureIM.txt b/langpacks/english/Plugins/SecureIM.txt
index 79f596c9df..47eabfe62b 100644
--- a/langpacks/english/Plugins/SecureIM.txt
+++ b/langpacks/english/Plugins/SecureIM.txt
@@ -155,7 +155,7 @@
 [SecureIM status (disabled)]

 [SecureIM status (enabled)]

 [SecureIM status (always try)]

-[SecureIM: Sorry, unable to decrypt this message due you have no PGP/GPG installed. Visit www.pgp.com or www.gnupg.org for more info.]

+[SecureIM: Sorry, unable to decrypt this message because you have no PGP/GPG installed. Visit www.pgp.com or www.gnupg.org for more info.]

 [SecureIM received unencrypted message:\n]

 [SecureIM received encrypted message:\n]

 [Session closed by receiving incorrect message type]

diff --git a/langpacks/english/Plugins/SkypeWeb.txt b/langpacks/english/Plugins/SkypeWeb.txt
index 3d9ef3d248..fcecabf853 100644
--- a/langpacks/english/Plugins/SkypeWeb.txt
+++ b/langpacks/english/Plugins/SkypeWeb.txt
@@ -24,7 +24,11 @@
 [Cancel]

 [Enter the password to continue.]

 ;file \protocols\SkypeWeb\src\skype_chatrooms.cpp

+[User]

+[Admin]

 [Groupchat]

+;file \protocols\SkypeWeb\src\skype_history_sync.cpp

+[Edited at]

 ;file \protocols\SkypeWeb\src\skype_icons.cpp

 [Protocol icon]

 [Protocols]

@@ -32,6 +36,7 @@
 [Request authorization]

 [Grant authorization]

 [Get server history]

+;file \protocols\SkypeWeb\src\skype_messages.cpp

 ;file \protocols\SkypeWeb\src\skype_options.cpp

 [Network]

 ;file \protocols\SkypeWeb\src\skype_proto.cpp