- langpacks/english: update;

- langpacks/russian: update; 



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

13 files changed, 104 insertions, 137 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index aa1274b1cf..426bae5208 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -215,20 +215,6 @@
 [&Invisible\tCtrl+7]

 [On the &phone\tCtrl+8]

 [Out to &lunch\tCtrl+9]

-[Tray]

-[&Hide/Show]

-[Nowhere]

-[&New group]

-[&Hide offline users]

-[Hide &offline users out here]

-[Hide &empty groups]

-[Disable &groups]

-[Hide Miranda]

-[Group]

-[&New subgroup]

-[&Hide offline users in here]

-[&Rename group]

-[&Delete group]

 ;file \src\core\stdfile\res\resource.rc

 [Send file(s)]

 [Cancel]

@@ -623,6 +609,20 @@
 [Locale:]

 [Reload langpack]

 [Download more language packs]

+[Tray]

+[&Hide/Show]

+[Nowhere]

+[&New group]

+[&Hide offline users]

+[Hide &offline users out here]

+[Hide &empty groups]

+[Disable &groups]

+[Hide Miranda]

+[Group]

+[&New subgroup]

+[&Hide offline users in here]

+[&Rename group]

+[&Delete group]

 [&Reset to default]

 [find/add]

 [&Add to list]

@@ -1074,17 +1074,11 @@
 [The topic is '%s']

 [The topic is '%s' (set by %s)]

 ;file \src\mir_app\src\clcitems.cpp

-;file \src\mir_app\src\clistmenus.cpp

-[Custom status]

-[%s (locked)]

-[Status menu]

-[Main menu]

 ;file \src\mir_app\src\clistmod.cpp

 [Connecting]

 [Connecting (attempt %d)]

 ;file \src\mir_app\src\clistsettings.cpp

 [(Unknown contact)]

-;file \src\mir_app\src\clisttray.cpp

 ;file \src\mir_app\src\clui.cpp

 [This contact is on an instant messaging system which stores its contact list on a central server. The contact will be removed from the server and from your contact list when you next connect to that network.]

 [De&lete]

@@ -1158,10 +1152,6 @@
 [Headers]

 [Generic text]

 [Small text]

-;file \src\mir_app\src\genmenu.cpp

-[Menu icons]

-;file \src\mir_app\src\genmenuopt.cpp

-[Menus]

 ;file \src\mir_app\src\groups.cpp

 [New group]

 [Are you sure you want to delete group '%s'? This operation cannot be undone.]

@@ -1214,6 +1204,25 @@
 [Unknown]

 [built-in]

 [Languages]

+;file \src\mir_app\src\menu_clist.cpp

+[Custom status]

+[%s (locked)]

+[Status menu]

+[Main menu]

+;file \src\mir_app\src\menu_frames.cpp

+[Frame menu]

+;file \src\mir_app\src\menu_groups.cpp

+[Group menu]

+[Subgroup menu]

+;file \src\mir_app\src\menu_options.cpp

+[Menus]

+;file \src\mir_app\src\menu_tray.cpp

+[Tray menu]

+[&Hide/show]

+[&Options...]

+[&About]

+;file \src\mir_app\src\menu_utils.cpp

+[Menu icons]

 ;file \src\mir_app\src\metacontacts.h

 [You are going to remove all the contacts associated with this metacontact.\nThis will delete the metacontact.\n\nProceed anyway?]

 ;file \src\mir_app\src\meta_addto.cpp

@@ -1301,7 +1310,6 @@
 [Loading... %d%%]

 [%s options]

 [Miranda NG options]

-[&Options...]

 ;file \src\mir_app\src\options_ei.cpp

 [Extra icons]

 ;file \src\mir_app\src\path.cpp

@@ -1402,6 +1410,7 @@
 [Running core plugin]

 [Non-loadable plugin]

 [Frames]

+[Add group]

 [Request authorization]

 [Grant authorization]

 [Revoke authorization]

diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt
index bed09c6c17..66f4bd3e0d 100644
--- a/langpacks/english/Plugins/Clist_modern.txt
+++ b/langpacks/english/Plugins/Clist_modern.txt
@@ -299,20 +299,30 @@
 [&Invisible\tCtrl+7]

 [On the &phone\tCtrl+8]

 [Out to &lunch\tCtrl+9]

-[Tray]

-[&Hide/Show]

-[Nowhere]

-[&New group]

-[&Hide offline users]

-[Hide &offline users out here]

-[Hide &empty groups]

-[Disable &groups]

-[Hide Miranda]

-[&New subgroup]

-[&Hide offline users in here]

+;file \plugins\Clist_modern\src\cluiframes.cpp

+[&Visible]

+[&Show title]

+[&Locked]

+[&Expanded]

+[&Floating mode]

+[&Border]

+[&Align]

+[&Top]

+[&Client]

+[&Bottom]

+[&Position]

+[&Up]

+[&Down]

+[Show all frames]

+[Show all title bars]

+[Hide all title bars]

+[Lock frame]

+;file \plugins\Clist_modern\src\groupmenu.cpp

+[&Hide/show]

+[&Find/add contacts...]

+[&Options...]

+[&About]

 [&Show offline users in here]

-[&Rename group]

-[&Delete group]

 ;file \plugins\Clist_modern\src\modern_clc.cpp

 [Do you want contact '%s' to be converted to metacontact and '%s' be added to it?]

 [Converting to metacontact]

@@ -392,6 +402,7 @@
 [Behind left edge]

 [Behind right edge]

 [General]

+[Tray]

 [List]

 [Window]

 ;file \plugins\Clist_modern\src\modern_clistevents.cpp

@@ -421,12 +432,6 @@
 [Row design]

 ;file \plugins\Clist_modern\src\modern_clistsettings.cpp

 [(Unknown contact)]

-;file \plugins\Clist_modern\src\modern_clisttray.cpp

-[Tray menu]

-[&Hide/show]

-[&Find/add contacts...]

-[&Options...]

-[&About]

 ;file \plugins\Clist_modern\src\modern_clui.cpp

 [Show avatar]

 [Hide avatar]

@@ -514,27 +519,3 @@
 [Reset view mode]

 [View mode background]

 [View modes]

-;file \plugins\Clist_modern\src\CLUIFrames\cluiframes.cpp

-[&Visible]

-[&Show title]

-[&Locked]

-[&Expanded]

-[&Floating mode]

-[&Border]

-[&Align]

-[&Top]

-[&Client]

-[&Bottom]

-[&Position]

-[&Up]

-[&Down]

-[Show all frames]

-[Show all title bars]

-[Hide all title bars]

-[Lock frame]

-;file \plugins\Clist_modern\src\CLUIFrames\framesmenu.cpp

-[Frame menu]

-;file \plugins\Clist_modern\src\CLUIFrames\groupmenu.cpp

-[New group]

-[Group menu]

-[Subgroup menu]

diff --git a/langpacks/english/Plugins/Clist_nicer.txt b/langpacks/english/Plugins/Clist_nicer.txt
index 67bec20baf..e90d3dfa7e 100644
--- a/langpacks/english/Plugins/Clist_nicer.txt
+++ b/langpacks/english/Plugins/Clist_nicer.txt
@@ -235,24 +235,6 @@
 [&Invisible\tCtrl+7]

 [On the &phone\tCtrl+8]

 [Out to &lunch\tCtrl+9]

-[Tray]

-[&Hide/Show]

-[Nowhere]

-[&New group]

-[&Hide offline users]

-[Hide &offline users out here]

-[Hide &empty groups]

-[Disable &groups]

-[Hide Miranda]

-[&New subgroup]

-[&Hide offline users in here]

-[&Rename group]

-[&Delete group]

-[Move marked contacts to this group]

-[Appearance]

-[Show metacontact protocol icons]

-[Show additional buttons]

-[Draw sunken frame]

 ;file \plugins\Clist_nicer\skineditor\res\skinedit.rc

 [Skin items]

 [General]

@@ -386,6 +368,31 @@
 [Hottrack text]

 [Quicksearch text]

 [Embedded frames border]

+;file \plugins\Clist_nicer\src\cluiframes.cpp

+[&FrameTitle]

+[&Visible]

+[&Show title bar]

+[&Locked]

+[&Collapsed]

+[&Floating mode]

+[&Border]

+[&Skinned frame]

+[&Align]

+[&Top]

+[&Client]

+[&Bottom]

+[&Position]

+[&Up]

+[&Down]

+[Frames]

+[Show all frames]

+[Show all title bars]

+[Hide all title bars]

+[Lock frame]

+[Visible]

+[Show title bar]

+[Skinned frame]

+[Floating]

 ;file \plugins\Clist_nicer\src\cluiopts.cpp

 [Title bar]

 [Tool Window]

@@ -396,6 +403,15 @@
 [Contact list docking]

 ;file \plugins\Clist_nicer\src\extBackg.cpp

 [Load and apply]

+;file \plugins\Clist_nicer\src\groupmenu.cpp

+[Show metacontact protocol icons]

+[Show additional buttons]

+[Draw sunken frame]

+[&Hide/show]

+[&Find/add contacts...]

+[Appearance]

+[&Options...]

+[&About the contact list...]

 ;file \plugins\Clist_nicer\src\viewmodes.cpp

 [Ungrouped contacts]

 [And]

@@ -418,38 +434,3 @@
 [Select a view mode]

 [Clear view mode and return to default display]

 [View modes]

-;file \plugins\Clist_nicer\src\CLUIFrames\cluiframes.cpp

-[&FrameTitle]

-[&Visible]

-[&Show title bar]

-[&Locked]

-[&Collapsed]

-[&Floating mode]

-[&Border]

-[&Skinned frame]

-[&Align]

-[&Top]

-[&Client]

-[&Bottom]

-[&Position]

-[&Up]

-[&Down]

-[Frames]

-[Show all frames]

-[Show all title bars]

-[Hide all title bars]

-[Lock frame]

-[Visible]

-[Show title bar]

-[Skinned frame]

-[Floating]

-;file \plugins\Clist_nicer\src\CLUIFrames\framesmenu.cpp

-[Frame menu]

-;file \plugins\Clist_nicer\src\CLUIFrames\groupmenu.cpp

-[New group]

-[Group menu]

-[&Hide/show]

-[&Find/add contacts...]

-[&Options...]

-[&About the contact list...]

-[Subgroup menu]

diff --git a/langpacks/english/Plugins/DbEditorPP.txt b/langpacks/english/Plugins/DbEditorPP.txt
index 9268862f94..baf2ea9784 100644
--- a/langpacks/english/Plugins/DbEditorPP.txt
+++ b/langpacks/english/Plugins/DbEditorPP.txt
@@ -149,6 +149,7 @@
 [Handle]

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

 [Open Database Editor]

+[Database]

 [Open user tree in DBE++]

 [<UNKNOWN>]

 [[UNLOADED]]

@@ -164,7 +165,6 @@
 [Loading modules...]

 [Contacts]

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

-[Database]

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

 [Add module to "%s"]

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

diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index 0138ef683c..415e58fd67 100644
--- a/langpacks/english/Plugins/Facebook.txt
+++ b/langpacks/english/Plugins/Facebook.txt
@@ -186,6 +186,5 @@
 [Deny friendship request]

 [Services...]

 [Refresh Buddy List]

-[Services]

 [Check Friends Requests]

 [Check Newsfeeds]

diff --git a/langpacks/english/Plugins/HTTPServer.txt b/langpacks/english/Plugins/HTTPServer.txt
index f3a5d55ed2..4402f744f8 100644
--- a/langpacks/english/Plugins/HTTPServer.txt
+++ b/langpacks/english/Plugins/HTTPServer.txt
@@ -73,10 +73,7 @@
 [You need to restart Miranda to change the main menu]

 [HTTP Server]

 [Network]

-[Failed to CreateServiceFunction MS_SHARE_NEW_FILE]

-[Failed to CreateServiceFunction MS_SHOW_STATISTICS_VIEW]

 [HTTP Share new file]

-[Failed to add contact menu item]

 ;file \plugins\HTTPServer\src\HttpUser.cpp

 [Share removed]

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

diff --git a/langpacks/english/Plugins/MirLua.txt b/langpacks/english/Plugins/MirLua.txt
index f78a2edd09..9281c837b6 100644
--- a/langpacks/english/Plugins/MirLua.txt
+++ b/langpacks/english/Plugins/MirLua.txt
@@ -2,10 +2,10 @@
 ;============================================================

 ;  File: MirLua.dll

 ;  Plugin: MirLua

-;  Version: 0.11.0.1

+;  Version: 0.11.3.1

 ;  Authors: Miranda NG team

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

-[Extends Miranda NG functionality with lua scripts.]

+[Extends Miranda NG functionality with Lua scripts.]

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

 [Reload all]

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

diff --git a/langpacks/english/Plugins/MirandaG15.txt b/langpacks/english/Plugins/MirandaG15.txt
index 6d58b58fc4..f130d53dbf 100644
--- a/langpacks/english/Plugins/MirandaG15.txt
+++ b/langpacks/english/Plugins/MirandaG15.txt
@@ -7,9 +7,9 @@
 ;============================================================

 [Provides an interface to use Miranda from the LCD of various Logitech devices.]

 ;file \plugins\MirandaG15\res\MirandaG15.rc

-[Fonts]

 [General settings]

 [Show softkey labels]

+[Fonts]

 [Event log:]

 [Sample]

 [Message log:]

@@ -32,7 +32,6 @@
 [If the screensaver is active:]

 [Lock the screen]

 [Skip driver missing notification]

-[Notifications]

 [Notification screen title]

 [Hide it]

 [Show the plugin name]

@@ -69,7 +68,6 @@
 [Don't skip when replying]

 [Exceptions:]

 [Cut off channel names after]

-[Contact list]

 [Show the contacts protocols]

 [Hide offline users]

 [Use ignore settings]

@@ -86,7 +84,6 @@
 [Expand all groups]

 [Use two columns]

 [Fade out selection rectangle]

-[Chat]

 [Typing notifications]

 [Show typing notifications]

 [Send typing notifications]

@@ -111,5 +108,7 @@
 ;file \plugins\MirandaG15\src\CConfig.cpp

 [MirandaG15]

 [Appearance]

+[Notifications]

 [Chat sessions]

+[Contact list]

 [No device attached]

diff --git a/langpacks/english/Plugins/SeenPlugin.txt b/langpacks/english/Plugins/SeenPlugin.txt
index e3e6751342..8e702802ac 100644
--- a/langpacks/english/Plugins/SeenPlugin.txt
+++ b/langpacks/english/Plugins/SeenPlugin.txt
@@ -52,7 +52,7 @@
 [User Logged In]

 ;file \plugins\SeenPlugin\src\menu.cpp

 [<unknown>]

-[<none>]

+[Last seen]

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

 [-- Date --]

 [year (4 digits)]

@@ -91,7 +91,6 @@
 [instead of]

 [Last Seen Variables]

 [Contacts]

-[Last seen]

 [Popups]

 ;file \plugins\SeenPlugin\src\seen.h

 [%n is %s (%u)]

diff --git a/langpacks/english/Plugins/SmileyAdd.txt b/langpacks/english/Plugins/SmileyAdd.txt
index 8149ceec9d..1b5604ab55 100644
--- a/langpacks/english/Plugins/SmileyAdd.txt
+++ b/langpacks/english/Plugins/SmileyAdd.txt
@@ -53,7 +53,7 @@
 ;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 Options -> Customize -> Smileys.]

+[Smiley pack %s for category "%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.]

 [%s global smiley pack]

diff --git a/langpacks/english/Plugins/Steam.txt b/langpacks/english/Plugins/Steam.txt
index 75ab16089d..08ffde0851 100644
--- a/langpacks/english/Plugins/Steam.txt
+++ b/langpacks/english/Plugins/Steam.txt
@@ -36,7 +36,6 @@
 ;file \protocols\Steam\src\steam_dialogs.cpp

 [Fatal error, image services not found. Avatar services will be disabled.]

 [Avatar Service]

-[Name]

 ;file \protocols\Steam\src\steam_events.cpp

 [Network]

 [Blocked contacts]

@@ -48,6 +47,8 @@
 [Join to game]

 ;file \protocols\Steam\src\steam_messages.cpp

 [Unknown error]

+;file \protocols\Steam\src\steam_options.cpp

+[Name]

 ;file \protocols\Steam\src\steam_proto.cpp

 [Protocols]

 [Protocol icon]

diff --git a/langpacks/english/Plugins/Twitter.txt b/langpacks/english/Plugins/Twitter.txt
index 05981d30d0..fb3286df1d 100644
--- a/langpacks/english/Plugins/Twitter.txt
+++ b/langpacks/english/Plugins/Twitter.txt
@@ -52,6 +52,7 @@
 [%s avatar connection]

 [Twitter (avatars)]

 [%s Protocol]

+[Don't be crazy! Everyone knows the max tweet size is 140, and you're trying to fit %d chars in there?]

 ;file \protocols\Twitter\src\theme.cpp

 [Twitter Icon]

 [Tweet]

diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt
index f320e40ff8..69a10dc829 100644
--- a/langpacks/english/Plugins/VKontakte.txt
+++ b/langpacks/english/Plugins/VKontakte.txt
@@ -90,7 +90,7 @@
 [Mark users you want to invite to a new chat]

 [New chat's title:]

 [Share]

-[Url:]

+[URL:]

 [Only for friends]

 [Attention]

 ;file \protocols\VKontakte\src\misc.cpp