langpacks/english: update, Various update

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

6 files changed, 36 insertions, 30 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 323c6ef391..dbaef8ccee 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -1117,6 +1117,8 @@
 [This change is known to be potentially hazardous.]

 [This change is not known to be safe.]

 [Invalid setting type for '%s'. The first character of every value must be b, w, d, l, s, e, u, g, h or n.]

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

+[Authorization request from %s%s: %s]

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

 [The profile '%s' already exists. Do you want to move it to the Recycle Bin?\n\nWARNING: The profile will be deleted if Recycle Bin is disabled.\nWARNING: A profile may contain confidential information and should be properly deleted.]

 [The profile already exists]

diff --git a/langpacks/english/Plugins/FlashAvatars.txt b/langpacks/english/Plugins/FlashAvatars.txt
index a1d9816448..7b5f0f249c 100644
--- a/langpacks/english/Plugins/FlashAvatars.txt
+++ b/langpacks/english/Plugins/FlashAvatars.txt
@@ -5,11 +5,11 @@
 ;  Version: 0.0.1.14

 ;  Authors: Big Muscle

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

-[Loads and displays flash avatars.]

+[Loads and displays Flash avatars.]

 ;file \plugins\FlashAvatars\src\cflash.cpp

 [Flash.ocx not registered!]

-[You don't have installed ShockwaveFlash interface in your system.]

+[You don't have installed Shockwave Flash interface in your system.]

 [Bugged Flash detected!]

 [You have installed Flash 8.\r\nThis version of Flash contains a bug which can causes random crashes.\r\nIt is recommended to upgrade or downgrade your Flash library]

-[Flash Avatars]

+[Flash avatars]

 [Avatars]

diff --git a/langpacks/english/Plugins/SmileyAdd.txt b/langpacks/english/Plugins/SmileyAdd.txt
index 0781f84832..8af5356df7 100644
--- a/langpacks/english/Plugins/SmileyAdd.txt
+++ b/langpacks/english/Plugins/SmileyAdd.txt
@@ -7,39 +7,39 @@
 ;============================================================

 [Smiley support for Miranda NG.]

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

-[Smiley Categories]

-[Specify Smiley Pack for each category]

+[Smiley categories]

+[Specify smiley pack for each category]

 [Name:]

 [Author:]

 [Version:]

 [Preview]

 [Display]

 [Replace only smileys surrounded by spaces]

-[Scale smiley to textheight]

+[Scale smiley to text height]

 [Disable custom smileys]

-[High Quality smiley scaling]

+[High quality smiley scaling]

 [Animate]

-[Max "Custom Smiley" height]

-[Min smiley height]

-[Smiley Selector]

+[Maximum 'Custom smiley' height]

+[Minimum smiley height]

+[Smiley selector]

 [Surround inserted smiley with spaces]

 [Use first smiley for selection size]

 [IEView style window]

-[Input Area]

-[Enable Smileys]

+[Input area]

+[Enable smileys]

 [Don't replace at cursor]

-[Built-In Message Dialog Support]

+[Built-in message dialog support]

 [Disable]

-[Smiley Button]

+[Smiley button]

 ;file \plugins\SmileyAdd\src\dlgboxsubclass.cpp

-[Show Smiley Selection Window]

+[Show smiley selection window]

 ;file \plugins\SmileyAdd\src\download.cpp

 [SmileyAdd]

-[Smiley Cache]

+[Smiley cache]

 [SmileyAdd HTTP connections]

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

-[Button Smiley]

-[Assign Smiley Category]

+[Button smiley]

+[Assign smiley category]

 [Only one instance of SmileyAdd could be executed.\nRemove duplicate instances from 'Plugins' directory]

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

 [Smileys]

@@ -47,16 +47,16 @@
 [Off]

 [Top]

 [Bottom]

-[Smiley Packs]

-[All Files]

+[Smiley packs]

+[All files]

 ;file \plugins\SmileyAdd\src\services.cpp

 [Protocol specific]

 ;file \plugins\SmileyAdd\src\smileys.cpp

-[Smiley Pack %s not found.\nSelect correct Smiley Pack in the Miranda Options | Customize | Smileys.]

-[There were problems loading smiley pack (it should be corrected).\nSee Network Log for details.]

-[Smiley #%u in file %s for Smiley Pack %s not found.]

+[Smiley pack %s not found.\nSelect correct smiley pack in the Options -> Customize -> Smileys.]

+[There were problems loading smiley pack (it should be corrected).\nSee network log for details.]

+[Smiley #%u in file %s for smiley pack %s not found.]

 [Standard]

-[Regular Expression "%s" in smiley pack "%s" could produce "empty matches".]

-[Regular Expression "%s" in smiley pack "%s" malformed.]

+[Regular expression "%s" in smiley pack "%s" could produce "empty matches".]

+[Regular expression "%s" in smiley pack "%s" malformed.]

 ;file \plugins\SmileyAdd\src\smltool.cpp

 [d'Oh!]

diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index d2b0119ea7..9f5e3c27dd 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -839,7 +839,7 @@
 ;file \plugins\TabSRMM\src\translator.cpp

 [Message window tweaks]

 [Error feedback]

-[Show skinnable tooltip in chat (tipper plugin required)]

+[Show skinnable tooltip in chat (Tipper plugin required)]

 [Enable typing sounds]

 [Disable animated GIF avatars (will not affect already open message windows)]

 [Close current tab on send]

diff --git a/langpacks/russian/=CORE=.txt b/langpacks/russian/=CORE=.txt
index bf96d60b63..4b95ced857 100644
--- a/langpacks/russian/=CORE=.txt
+++ b/langpacks/russian/=CORE=.txt
@@ -2921,7 +2921,4 @@ ANSI плагин
 Замбия

 [Zimbabwe]

 Зимбабве

-[ContactMenu]

-Меню контакта

-[MainMenu]

-Главное меню
\ No newline at end of file
+

diff --git a/langpacks/russian/Plugins/_Various.txt b/langpacks/russian/Plugins/_Various.txt
index 93e26783c4..b0158e01b9 100644
--- a/langpacks/russian/Plugins/_Various.txt
+++ b/langpacks/russian/Plugins/_Various.txt
@@ -2,6 +2,13 @@
 ;  This file is for lines that jpgen.js doesn't add to english templates but nevertheless must be translated.

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

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

+;  =CORE=

+;==============================================================================

+[ContactMenu]

+Меню контакта

+[MainMenu]

+Главное меню

+;==============================================================================

 ;  Clist_modern

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

 [TrayMenu]