- Popup: translation fix

- langpacks/english: update;
- langpacks/russian: update;


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

7 files changed, 9 insertions, 8 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index cf10373873..085227a07b 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -1102,7 +1102,7 @@
 [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.]

 [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 or equivalent.]

+[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!]

 [Miranda was unable to open '%s', it's in an unknown format.\nThis profile might also be damaged, please run DbChecker which should be installed.]

 [Miranda can't understand that profile]

diff --git a/langpacks/english/Plugins/DbEditorPP.txt b/langpacks/english/Plugins/DbEditorPP.txt
index 0d0f65f87c..b4b94cf94c 100644
--- a/langpacks/english/Plugins/DbEditorPP.txt
+++ b/langpacks/english/Plugins/DbEditorPP.txt
@@ -47,7 +47,7 @@
 [Import]

 [Insert &CR/LF]

 [Paste the Settings to import here.]

-[DBEditor++]

+[Database Editor++]

 [&Main]

 [&Refresh Modules]

 [Refresh &Settings]

@@ -136,7 +136,7 @@
 [Couldn't open file for writing]

 [Import from files]

 ;file \plugins\DbEditorPP\src\findwindow.cpp

-[Enter a string to search the DB for]

+[Enter a string to search the database for]

 [Stop]

 [Replaced with]

 [Deleted]

@@ -157,7 +157,6 @@
 [Unknown Contact]

 [Known Contact]

 ;file \plugins\DbEditorPP\src\main.cpp

-[Database Editor++]

 [Open Database Editor]

 [Open user tree in DBE++]

 ;file \plugins\DbEditorPP\src\main_window.cpp

diff --git a/langpacks/english/Plugins/Db_autobackups.txt b/langpacks/english/Plugins/Db_autobackups.txt
index 42c4750780..a23a185055 100644
--- a/langpacks/english/Plugins/Db_autobackups.txt
+++ b/langpacks/english/Plugins/Db_autobackups.txt
@@ -5,7 +5,7 @@
 ;  Version: 0.0.0.10

 ;  Authors: chaos.persei, sje, Kildor, Billy_Bons

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

-[Db autobackuper plugin.]

+[Database autobackuper plugin.]

 ;file \plugins\Db_autobackups\res\db_autobackups.rc

 [Backup progress]

 [Cancel]

diff --git a/langpacks/english/Plugins/HistorySweeperLight.txt b/langpacks/english/Plugins/HistorySweeperLight.txt
index b6c065ab75..2a253c8155 100644
--- a/langpacks/english/Plugins/HistorySweeperLight.txt
+++ b/langpacks/english/Plugins/HistorySweeperLight.txt
@@ -13,7 +13,7 @@
 [Action 2]

 [Sweep on closing message window]

 [Clicking on the icon in the status bar will change settings]

-[Use UNSAFE mode (sweep fastest as possible, but dangerous for DB)]

+[Use UNSAFE mode (sweep fastest as possible, but dangerous for database)]

 ;file \plugins\HistorySweeperLight\src\main.cpp

 [Keep all events]

 [Delete all events]

diff --git a/langpacks/english/Plugins/Msg_Export.txt b/langpacks/english/Plugins/Msg_Export.txt
index 97d3be3295..05a0f2ca0e 100644
--- a/langpacks/english/Plugins/Msg_Export.txt
+++ b/langpacks/english/Plugins/Msg_Export.txt
@@ -89,7 +89,7 @@
 ;file \plugins\Msg_Export\src\utils.cpp

 [No_Nick]

 [No_Group]

-[DB: Attempt to get wrong type of value, string]

+[Database: Attempt to get wrong type of value, string]

 [(Unknown Contact)]

 [File name for the user "%s" has changed!\n\nfrom:\t%s\nto:\t%s\n\nDo you wish to rename file?]

 [Failed to rename file\n\nfrom:\t%s\nto:\t%s\n\nFailed with error: %s]

diff --git a/langpacks/english/Plugins/Popup.txt b/langpacks/english/Plugins/Popup.txt
index 98932428cc..850a97876e 100644
--- a/langpacks/english/Plugins/Popup.txt
+++ b/langpacks/english/Plugins/Popup.txt
@@ -159,6 +159,8 @@
 [Disable Popups]

 [Popup Plus]

 [Error: I could not register the Popup Window class.\r\nThe plugin will not operate.]

+;file \plugins\Popup\src\notifications.cpp

+[%s (colors only)]

 ;file \plugins\Popup\src\opt_adv.cpp

 [No effect]

 [Fade in/out]

diff --git a/langpacks/english/Plugins/SpellChecker.txt b/langpacks/english/Plugins/SpellChecker.txt
index f58600f8a2..154009ab92 100644
--- a/langpacks/english/Plugins/SpellChecker.txt
+++ b/langpacks/english/Plugins/SpellChecker.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: SpellChecker.dll

 ;  Plugin: Spell checker

-;  Version: 0.2.6.0

+;  Version: 0.2.6.1

 ;  Authors: Ricardo Pescuma Domenecci, FREAK_THEMIGHTY

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

 [Spell checker for the message windows. Uses Hunspell to do the checking.]