- langpacks/english: update;

- langpacks/russian: update;

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

6 files changed, 136 insertions, 140 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 6fd01a3356..3ba13f8c28 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -967,6 +967,9 @@
 [Contact stopped typing]

 ;file \src\core\stdmsg\src\msgtimedout.cpp

 [An unknown error has occurred.]

+;file \src\core\stdssl\src\netlibssl.cpp

+[Client cannot decode host message. Possible causes: host does not support SSL or requires not existing security package]

+[Host we are connecting to is not the one certificate was issued for]

 ;file \src\core\stduihist\src\history.cpp

 [Invalid message]

 [Outgoing message]

@@ -1289,9 +1292,6 @@
 [<mixed>]

 [<All connections>]

 [Network]

-;file \src\modules\netlib\netlibssl.cpp

-[Client cannot decode host message. Possible causes: host does not support SSL or requires not existing security package]

-[Host we are connecting to is not the one certificate was issued for]

 ;file \src\modules\options\options.cpp

 [<all modules>]

 [<core modules>]

@@ -1300,11 +1300,11 @@
 [Miranda NG options]

 [&Options...]

 ;file \src\modules\plugins\newplugins.cpp

-[Core plugin '%s' cannot be loaded or missing. Miranda will exit now]

-[Fatal error]

 [No messaging plugins loaded. Please install/enable one of the messaging plugins, for instance, "StdMsg.dll"]

 ['%s' is disabled, re-enable?]

 [Re-enable Miranda plugin?]

+[Core plugin '%s' cannot be loaded or missing. Miranda will exit now]

+[Fatal error]

 [Unable to load plugin in service mode!]

 [Unable to start any of the installed contact list plugins, I even ignored your preferences for which contact list couldn't load any.]

 [Can't find a contact list plugin! You need StdClist or any other contact list plugin.]

diff --git a/langpacks/english/Plugins/IRC.txt b/langpacks/english/Plugins/IRC.txt
index 8247c8551c..b5b4e7b559 100644
--- a/langpacks/english/Plugins/IRC.txt
+++ b/langpacks/english/Plugins/IRC.txt
@@ -69,8 +69,8 @@
 [Server code page:]

 [Enable UTF8 autodetection]

 [Add server]

-[On]

 [Auto]

+[On]

 [Off]

 [Host address]

 [Server description]

diff --git a/langpacks/english/Plugins/MirOTR.txt b/langpacks/english/Plugins/MirOTR.txt
index 0a6a19e0c0..f447fcdb77 100644
--- a/langpacks/english/Plugins/MirOTR.txt
+++ b/langpacks/english/Plugins/MirOTR.txt
@@ -80,6 +80,7 @@
 [OTR private]

 [OTR not secure]

 [OTR]

+[Refresh]

 [Generating new private key for protocol '%s'.\nPlease Wait...]

 [General]

 [Protocols]

diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index 53465a3a65..073f3ce1e5 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -41,7 +41,7 @@
 [Default settings for known event types]

 [Show when filter is active]

 [Log to file]

-[Show Popup]

+[Show popup]

 [Notify in tray]

 [Suppress tray notifications for focused channel windows]

 [Do not show popups when the channel window is not open]

@@ -89,8 +89,8 @@
 [Scope of settings]

 [Use global or private panel height]

 [Set size to]

-[Compact (1 Line)]

-[Normal (2 Lines)]

+[Compact (1 line)]

+[Normal (2 lines)]

 [Large]

 [Tip: To use a custom size you can always drag the bottom edge of the panel]

 [Other options]

@@ -109,7 +109,7 @@
 [Limit message preview to]

 [characters]

 [Only show event notifications when my status is...]

-[Popup Options]

+[Popup options]

 [Text]

 [Background]

 [Timeout (seconds, 0 = default, -1 = no timeout)]

@@ -126,9 +126,9 @@
 [Message log view mode (does not affect open windows)]

 [Select how to display the message log. This setting can be ignored when one of the listed plugins is not installed.]

 [Send text formatting method]

-[You can override the global setting for text formatting here. Use "Force Off" to never send formatting info for this contact.]

+[You can override the global setting for text formatting here. Use "Force off" to never send formatting info for this contact.]

 [ANSI codepage]

-[Codepage for ANSI encoding/decoding when sending or receiving non-unicode messages.]

+[Codepage for ANSI encoding/decoding when sending or receiving non-Unicode messages.]

 [Info panel mode]

 [Show avatar in message window]

 [Use private splitter position]

@@ -199,13 +199,13 @@
 [Template sets]

 [Standard templates...]

 [RTL templates...]

-[Load History Events]

+[Load history events]

 [Load unread events only]

 [Load number of previous events]

 [Load previous events less than]

 [minutes old]

 [Global message log display]

-[Typing Notification]

+[Typing notification]

 [Send typing notifications to the following users when you are typing a message to them:]

 [        Show typing notifications in the message window]

 [Flash window once on typing events (only if flashing enabled)]

@@ -231,7 +231,7 @@
 [Show in chat rooms]

 [Gap between buttons:]

 [Hide if there isn't enough space]

-[Insert Separator]

+[Insert separator]

 [To set container options, please use the container settings dialog. It is available by:\n1. choosing "container settings" from the system menu of a container.\n2. right clicking the tab or the button bar in any message window.]

 [Tabs should be used in the following way]

 [Use contact list groups for organizing tabs (one window per group)]

@@ -264,14 +264,14 @@
 [Popups timeout]

 [Templates]

 [Edit template]

-[Double click a template to edit it. Select a template from the list box and click "Update Preview" to show a preview message.]

+[Double click a template to edit it. Select a template from the list box and click "Update preview" to show a preview message.]

 [Get more help on variables]

 [Define up to 5 colors which you can use with some variables]

 [Close]

-[Update Preview]

-[Save Template]

+[Update preview]

+[Save template]

 [Forget]

-[Revert to Default]

+[Revert to default]

 [Reset all templates...]

 [Default width for fixed (single row) tabs]

 [Tab text label padding vertical]

@@ -312,12 +312,12 @@
 [Indent message body]

 [Display grid lines]

 [Message grouping]

-[Support BBCODE]

+[Support BBCode]

 [Misc]

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

@@ -351,63 +351,61 @@
 [Send message on Ctrl+Enter (always enabled)]

 [&Copy]

 [&Quote]

-[Co&py All]

-[Select &All]

-[Clear Log]

-[Freeze Log]

+[Select &all]

+[Clear log]

+[Freeze log]

 [Open in &new window]

 [&Open in existing window]

 [Editor]

-[Paste formatted Text]

-[Paste and Send immediately]

+[Paste formatted text]

+[Paste and send immediately]

 [Copy all]

-[Show Message Length Indicator]

-[Close Tab]

-[Close Other Tabs]

-[Leave Chat Room]

-[Save Tab Position]

-[Clear saved Tab Position]

-[Attach to Container...]

+[Show message length indicator]

+[Close tab]

+[Close other tabs]

+[Leave chat room]

+[Save tab position]

+[Clear saved tab position]

+[Attach to container...]

 [Container options...]

-[Close Container]

-[Show Contact Picture]

+[Close container]

+[Show contact picture]

 [Default]

-[Hidden for this Contact]

-[Visible for this Contact]

-[Contact Picture Settings...]

+[Hidden for this contact]

+[Visible for this contact]

+[Contact picture settings...]

 [Always keep the button bar at full width]

-[Save this Picture As...]

-[&Message Log Settings]

+[Save this picture as...]

+[&Message log settings]

 [&Global...]

-[&For this Contact...]

-[Send &Default]

-[Send to &multiple Users]

-[Send to &Container]

-[Send &Later]

+[&For this contact...]

+[Send &default]

+[Send to &multiple users]

+[Send to &container]

+[Send &later]

 [Force &ANSI]

-[Send unsafe (ignore Timeouts)]

-[Send Nudge]

-[Splitter Position]

+[Send unsafe (ignore timeouts)]

+[Send nudge]

+[Splitter position]

 [Global]

 [Private]

-[Send Text Formatting]

+[Send text formatting]

 [BBCode]

 [Off]

-[This Contact]

-[Global Setting]

-[Force Off]

-[Unread Menu]

-[Recent Sessions]

+[This contact]

+[Global setting]

+[Force off]

+[Recent sessions]

 [Favorites]

-[Show the Tray Icon]

-[Disable All Event Notifications]

-[Don't create Windows automatically]

-[Hide all Message Containers]

-[Restore all Message Containers]

-[Don't play Sounds]

-[Be "Super Quiet"]

+[Show the tray icon]

+[Disable all event notifications]

+[Don't create windows automatically]

+[Hide all message containers]

+[Restore all message containers]

+[Don't play sounds]

+[Be "super quiet"]

 [Font]

-[Default Color]

+[Default color]

 [Red]

 [Green]

 [Blue]

@@ -416,55 +414,54 @@
 [Cyan]

 [Black]

 [White]

-[Clear all Formatting]

+[Clear all formatting]

 [Dummy]

-[No Message Sessions opened]

-[Add Contact to Favorites]

-[Remove Contact from Favorites]

+[No message sessions opened]

+[Add contact to favorites]

+[Remove contact from favorites]

 [dummy]

-[Set Position for this Session]

-[Set and Save for all Sessions]

-[Set and Save for this Contact only]

-[Revert to old Position]

+[Set position for this session]

+[Set and save for all sessions]

+[Set and save for this contact only]

+[Revert to old position]

 [Queue manager]

-[Mark Selected for Removal]

-[Reset Selected]

-[Hold Selected]

-[Resume Selected]

-[Cancel all Multisend Jobs]

-[Copy Message to Clipboard]

+[Mark selected for removal]

+[Reset selected]

+[Hold selected]

+[Resume selected]

+[Cancel all multisend jobs]

+[Copy message to clipboard]

 [&File]

-[Save Message Log As...]

-[Close Message Session\tCtrl-W]

-[Close Container\tAlt-F4]

+[Save message log as...]

+[Close message session\tCtrl-W]

+[Close container\tAlt-F4]

 [&View]

-[Show Menu Bar]

-[Show Status Bar]

-[Info Panel...]

+[Show menu bar]

+[Show status bar]

+[Info panel...]

 [Toolbar]

 [Show toolbar]

 [Place toolbar at bottom]

-[Title Bar]

+[Title bar]

 [Tabs at the bottom]

-[Window Flashing]

-[Use default Value]

-[Show Multisend Contact List]

-[Stay on Top]

-[Message &Log]

+[Window flashing]

+[Use default value]

+[Show multisend contact list]

+[Stay on top]

+[Message &log]

 [&Container]

-[Event Popups]

-[Disable all Event Popups]

-[Show Popups if Window is minimized]

-[Show Popups if Window is unfocused]

-[Show Popups if Window is focused]

-[Show Popups for all inactive sessions]

-[Save current Window Position as Default]

+[Disable all event popups]

+[Show popups if window is minimized]

+[Show popups if window is unfocused]

+[Show popups if window is focused]

+[Show popups for all inactive sessions]

+[Save current window position as default]

 [Help]

 [About TabSRMM...]

 ;file \plugins\TabSRMM\src\buttonsbar.cpp

-[Protocol Button]

+[Protocol button]

 [Info button]

-[Insert Emoticon]

+[Insert emoticon]

 [Bold text]

 [Italic text]

 [Underlined text]

@@ -473,8 +470,8 @@
 [Send message\nClick dropdown arrow for sending options]

 [Close session]

 [Quote last message OR selected text]

-[Message Log Options]

-[View User's History]

+[Message log options]

+[View user's history]

 [Edit user notes]

 [Change background color]

 [Toggle nick list]

@@ -482,7 +479,7 @@
 [Channel manager]

 [<Separator>]

 ;file \plugins\TabSRMM\src\container.cpp

-[Message Session...]

+[Message session...]

 [Default container]

 [Attach to]

 ;file \plugins\TabSRMM\src\containeroptions.cpp

@@ -493,7 +490,6 @@
 [Notifications]

 [Select, when you want to see event notifications (popups) for this window. The settings apply to all tabs within this window.]

 [Flashing]

-[Title bar]

 [Window size and theme]

 [You can select a private theme (.tabsrmm file) for this container which will then override the default message log theme. You will have to close and re-open all message windows after changing this option.]

 [Transparency]

@@ -520,7 +516,7 @@
 [Session list.\nClick left for a list of open sessions.\nClick right to access favorites and quickly configure message window behavior]

 [There are %d pending send jobs. Message length: %d bytes, message length limit: %d bytes\n\n%d messages are queued for later delivery]

 ;file \plugins\TabSRMM\src\eventpopups.cpp

-[One of your popup actions is set to DISMISS EVENT.\nNote that this options may have unwanted side effects as it REMOVES the event from the unread queue.\nThis may lead to events not showing up as "new". If you don't want this behavior, please review the Event Notifications settings page.]

+[One of your popup actions is set to DISMISS EVENT.\nNote that this options may have unwanted side effects as it REMOVES the event from the unread queue.\nThis may lead to events not showing up as "new". If you don't want this behavior, please review the 'Event notifications' settings page.]

 [TabSRMM warning message]

 [Incoming file]

 [No description given]

@@ -531,7 +527,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...]

@@ -539,20 +535,20 @@
 [%s has entered text.]

 [%s is typing a message]

 [Auto scrolling is disabled, %d message(s) queued (press F12 to enable it)]

-[UID: %s (SHIFT click -> copy to clipboard)\nClick for User's Details\nRight click for metacontact control\nClick dropdown to add or remove user from your favorites.]

+[UID: %s (SHIFT click -> copy to clipboard)\nClick for user's details\nRight click for metacontact control\nClick dropdown to add or remove user from your favorites.]

 [No UID]

-[UID: %s (SHIFT click -> copy to clipboard)\nClick for User's Details\nClick dropdown to change this contact's favorite status.]

+[UID: %s (SHIFT click -> copy to clipboard)\nClick for user's details\nClick dropdown to change this contact's favorite status.]

 ;file \plugins\TabSRMM\src\globals.cpp

 [Instant messages]

-[Incoming (Focused Window)]

-[Incoming (Unfocused Window)]

-[Incoming (New Session)]

+[Incoming (focused window)]

+[Incoming (unfocused window)]

+[Incoming (new session)]

 [Outgoing]

 [Message send error]

 [Other]

-[TabSRMM: Typing]

+[TabSRMM: typing]

 [TabSRMM session list]

-[TabSRMM Menu]

+[TabSRMM menu]

 [&Messaging settings...]

 [&Send later job list...]

 [Message from %s]

@@ -562,8 +558,7 @@
 ;file \plugins\TabSRMM\src\hotkeyhandler.cpp

 [Most recent unread session]

 [Paste and send]

-[Contact's messaging prefs]

-[Send nudge]

+[Contact's messaging preferences]

 [Send a file]

 [Quote message]

 [Toggle send later]

@@ -586,17 +581,16 @@
 [  Client not cached yet]

 [Topic is: %s]

 [no topic set.]

-[Open User Details...]

-[Open History...]

-[Messaging Settings...]

-[Room Settings...]

-[Close Session]

-[Copy To Clipboard]

+[Open user details...]

+[Open history...]

+[Messaging settings...]

+[Room settings...]

+[Copy to clipboard]

 [\\ul\\b Status message:\\ul0\\b0 \\par %s]

 [\\par\\par\\ul\\b Extended status information:\\ul0\\b0 \\par ]

 [\\par\\par\\ul\\b Listening to:\\ul0\\b0 \\par %s]

 [\\par\\par\\ul\\b Client:\\ul0\\b0  %s]

-[TabSRMM Information]

+[TabSRMM information]

 [Set panel visibility for this %s]

 [chat room]

 [contact]

@@ -607,7 +601,7 @@
 [Always on]

 [Use default size]

 [Use private size]

-[Use Global Setting]

+[Use global setting]

 [Show always (if present)]

 [Never show it at all]

 ;file \plugins\TabSRMM\src\mim.cpp

@@ -623,7 +617,7 @@
 [Add this contact permanently to your contact list]

 [Do not add this contact permanently]

 [Expand or collapse the side bar]

-[Character Encoding]

+[Character encoding]

 [Contact not on list. You may add it...]

 [A message failed to send successfully.]

 [WARNING: The message you are trying to paste exceeds the message size limit for the active protocol. It will be sent in chunks of max %d characters]

@@ -643,10 +637,10 @@
 [Save contact picture]

 [Image files]

 [The file exists. Do you want to overwrite it?]

-[Set Your Avatar...]

-[The 'paste and send' feature is disabled. You can enable it on the 'General' options page in the 'Sending Messages' section]

+[Set your avatar...]

+[The 'paste and send' feature is disabled. You can enable it on the 'General' options page in the 'Sending messages' section]

 [Either the nudge plugin is not installed or the contact's protocol does not support sending a nudge event.]

-['(Unknown Contact)']

+['(Unknown contact)']

 [JPEG-compressed images]

 ;file \plugins\TabSRMM\src\msglog.cpp

 [Thai]

@@ -704,7 +698,7 @@
 [Normal - close tab, if last tab is closed also close the window]

 [Minimize the window to the task bar]

 [Close or hide window, depends on the close button setting above]

-[Message Sessions]

+[Message sessions]

 [General]

 [Tabs and layout]

 [Containers]

@@ -720,6 +714,7 @@
 [Highlighting]

 [Choose status modes]

 ;file \plugins\TabSRMM\src\msgs.cpp

+[Message Log Options]

 [Image tag]

 [Quote text]

 [Save and close]

@@ -749,6 +744,7 @@
 [Frame 2]

 [Frame 3]

 [Frame 4]

+[Message Sessions]

 [Message Log]

 [Animated Tray]

 [Clock symbol (for the info panel clock)]

@@ -800,7 +796,7 @@
 [This version of TabSRMM requires Windows 2000 or later.]

 [TabSRMM Message (%s)]

 ;file \plugins\TabSRMM\src\taskbar.cpp

-[Previews not availble when using History++ plugin for message log display.]

+[Previews not available when using History++ plugin for message log display.]

 [%d Unread]

 [Chat room %s]

 [%d User(s)]

@@ -906,9 +902,7 @@
 [Contact started typing]

 [Contact stopped typing]

 ;file \plugins\TabSRMM\src\userprefs.cpp

-[Always On]

-[Always Off]

-[Force Default Message Log]

+[Force default message log]

 [Force History++]

 [Force IEView]

 [Set messaging options for %s]

@@ -918,7 +912,7 @@
 [Edit user notes|You are editing the user notes. Click the button again or use the hotkey (default: Alt-N) to save the notes and return to normal messaging mode]

 [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 visibilty list.]

+[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)?]

 [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?]

diff --git a/langpacks/english/Plugins/Tox.txt b/langpacks/english/Plugins/Tox.txt
index bab48b82ea..72b34156b7 100644
--- a/langpacks/english/Plugins/Tox.txt
+++ b/langpacks/english/Plugins/Tox.txt
@@ -1,7 +1,7 @@
 #muuid {00272a3e-f5fa-4090-8b67-3e62ac1ee0b4}

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

 ;  File: Tox.dll

-;  Plugin: Tox Protocol

+;  Plugin: Tox protocol

 ;  Version: 0.11.0.4

 ;  Authors: ForNeVeR, Mataes, unsane

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

diff --git a/langpacks/english/Plugins/UInfoEx.txt b/langpacks/english/Plugins/UInfoEx.txt
index 6afe71afa9..24d2ce31cc 100644
--- a/langpacks/english/Plugins/UInfoEx.txt
+++ b/langpacks/english/Plugins/UInfoEx.txt
@@ -576,17 +576,18 @@
 ;file \plugins\UserInfoEx\src\svc_reminder.cpp

 [%s has %s today.]

 [an anniversary]

-[He]

-[She]

-[He/She]

-[%s has the following anniversaries:\0]

-[%d. %s today\0]

-[%d. %s tomorrow\0]

-[%d. %s in %d days\0]

+[He/she has the following anniversaries:]

+[He has the following anniversaries:]

+[She has the following anniversaries:]

+[%d. %s today]

+[%d. %s tomorrow]

+[%d. %s in %d days]

 [%s has birthday today.]

 [%s has birthday tomorrow.]

 [%s has birthday in %d days.]

-[\n%s becomes %d years old.]

+[\nHe/she becomes %d years old.]

+[\nHe becomes %d years old.]

+[\nShe becomes %d years old.]

 [No anniversaries to remind of]

 [Backing up and syncing all birthdays complete!]

 [Birthday reminder]