- langpacks/english: update;

- langpacks/russian: update; 



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

24 files changed, 11 insertions, 32 deletions

diff --git a/langpacks/english/Plugins/AdvancedAutoAway.txt b/langpacks/english/Plugins/AdvancedAutoAway.txt
index d8d6bcf7b7..e9e74b5e19 100644
--- a/langpacks/english/Plugins/AdvancedAutoAway.txt
+++ b/langpacks/english/Plugins/AdvancedAutoAway.txt
@@ -36,7 +36,6 @@
 [Reset status on return]

 [Confirm resetting status]

 [Only set if current status is]

-[Command line]

 [Copy to clipboard]

 [Command line:]

 [Create shortcut]

diff --git a/langpacks/english/Plugins/BossKey.txt b/langpacks/english/Plugins/BossKey.txt
index 53b30e02d4..4db712cfdf 100644
--- a/langpacks/english/Plugins/BossKey.txt
+++ b/langpacks/english/Plugins/BossKey.txt
@@ -7,7 +7,6 @@
 ;============================================================

 [Anti-Boss plugin. Makes your Miranda NG hidden or password-protected.]

 ;file \plugins\BossKeyPlus\res\BossKey.rc

-[BossKey]

 [Go to Customize -> Hotkeys to change the hotkey]

 [When I press the hotkey:]

 [Change status to]

@@ -37,6 +36,7 @@
 [Hide Miranda NG]

 [Hide]

 [Hide/Show Miranda]

+[BossKey]

 [get the BossKey name]

 ;file \plugins\BossKeyPlus\src\Options.cpp

 [Events]

diff --git a/langpacks/english/Plugins/Exchange.txt b/langpacks/english/Plugins/Exchange.txt
index 8a5a6cc797..9b1edfa6cf 100644
--- a/langpacks/english/Plugins/Exchange.txt
+++ b/langpacks/english/Plugins/Exchange.txt
@@ -10,7 +10,6 @@
 [Unread emails]

 [Close]

 [Mark as read]

-[Dialog]

 [Connection]

 [Username:]

 [Password:]

diff --git a/langpacks/english/Plugins/Folders.txt b/langpacks/english/Plugins/Folders.txt
index 11b09bd52b..cfebb926d0 100644
--- a/langpacks/english/Plugins/Folders.txt
+++ b/langpacks/english/Plugins/Folders.txt
@@ -7,7 +7,6 @@
 ;============================================================

 [Allows plugins to save their data to user selected folders; supports variables.]

 ;file \plugins\Folders\res\folders.rc

-[Dialog]

 [Custom folders]

 [Preview]

 [Edit]

diff --git a/langpacks/english/Plugins/KeepStatus.txt b/langpacks/english/Plugins/KeepStatus.txt
index e2c728d80a..8fa4cb31c5 100644
--- a/langpacks/english/Plugins/KeepStatus.txt
+++ b/langpacks/english/Plugins/KeepStatus.txt
@@ -36,7 +36,6 @@
 [Reset status on return]

 [Confirm resetting status]

 [Only set if current status is]

-[Command line]

 [Copy to clipboard]

 [Command line:]

 [Create shortcut]

diff --git a/langpacks/english/Plugins/NimContact.txt b/langpacks/english/Plugins/NimContact.txt
index 90aaecbf8a..a968e9ef7d 100644
--- a/langpacks/english/Plugins/NimContact.txt
+++ b/langpacks/english/Plugins/NimContact.txt
@@ -34,7 +34,6 @@
 [Contact is always visible]

 [Unless Non-IM Contacts protocol is OFFLINE]

 [Timer Intervals.  ]

-[Dialog]

 [Away as another status]

 [Disable timer]

 [Timer interval (in seconds)]

diff --git a/langpacks/english/Plugins/NotesReminders.txt b/langpacks/english/Plugins/NotesReminders.txt
index 899d14471b..bcd3207f5e 100644
--- a/langpacks/english/Plugins/NotesReminders.txt
+++ b/langpacks/english/Plugins/NotesReminders.txt
@@ -7,7 +7,6 @@
 ;============================================================

 [Sticky Notes & Reminders Implementation for Miranda NG.]

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

-[Sticky Notes Options]

 [Default Note Size]

 [Width (Pixels)]

 [Height (Pixels)]

diff --git a/langpacks/english/Plugins/NotifyAnything.txt b/langpacks/english/Plugins/NotifyAnything.txt
index 6078a2735d..259d7a7f4a 100644
--- a/langpacks/english/Plugins/NotifyAnything.txt
+++ b/langpacks/english/Plugins/NotifyAnything.txt
@@ -7,7 +7,6 @@
 ;============================================================

 [Displays popups for custom events, triggered by UDP packages.]

 ;file \plugins\NotifyAnything\res\NotifyAnything.rc

-[Property Page]

 [Security]

 [Only listen to localhost]

 [Port:]

diff --git a/langpacks/english/Plugins/SkypeWeb.txt b/langpacks/english/Plugins/SkypeWeb.txt
index 30ec58ad35..76ffae2514 100644
--- a/langpacks/english/Plugins/SkypeWeb.txt
+++ b/langpacks/english/Plugins/SkypeWeb.txt
@@ -76,5 +76,7 @@
 [Action]

 [Incoming call sound]

 [Incoming call canceled sound]

+[Calls]

+[Notifications]

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

 [Incoming call from %s]

diff --git a/langpacks/english/Plugins/StartupStatus.txt b/langpacks/english/Plugins/StartupStatus.txt
index f49acca813..ec643bf3b7 100644
--- a/langpacks/english/Plugins/StartupStatus.txt
+++ b/langpacks/english/Plugins/StartupStatus.txt
@@ -36,7 +36,6 @@
 [Reset status on return]

 [Confirm resetting status]

 [Only set if current status is]

-[Command line]

 [Copy to clipboard]

 [Command line:]

 [Create shortcut]

diff --git a/langpacks/english/Plugins/WebView.txt b/langpacks/english/Plugins/WebView.txt
index f9aca12232..038804882c 100644
--- a/langpacks/english/Plugins/WebView.txt
+++ b/langpacks/english/Plugins/WebView.txt
@@ -52,7 +52,6 @@
 [&Find next]

 [Find what:]

 [Search was completed.]

-[Alert options]

 [Events and alerts]

 [Enable alerts]

 [Always log to file]

@@ -130,6 +129,7 @@
 [Loaded from cache]

 ;file \plugins\WebView\src\webview_datawnd.cpp

 [ERROR: You have two or more Webview contacts with the same URL and contact name.]

+[Alert options]

 [Stop processing]

 [Click here to open this URL in a browser window.]

 [Stick to the front]

diff --git a/langpacks/english/Plugins/YahooGroups.txt b/langpacks/english/Plugins/YahooGroups.txt
index c213ecfebf..ac8633f5c6 100644
--- a/langpacks/english/Plugins/YahooGroups.txt
+++ b/langpacks/english/Plugins/YahooGroups.txt
@@ -7,7 +7,6 @@
 ;============================================================

 [This plugin imports and creates the Yahoo groups defined in Yahoo Messenger.]

 ;file \plugins\YahooGroups\res\YahooGroups.rc

-[Dialog]

 [Move Yahoo contacts to groups now]

 [Move Yahoo contacts automatically on startup]

 ;file \plugins\YahooGroups\src\hooked_events.cpp

diff --git a/langpacks/russian/Plugins/AdvancedAutoAway.txt b/langpacks/russian/Plugins/AdvancedAutoAway.txt
index 417ec08293..05c5e82719 100644
--- a/langpacks/russian/Plugins/AdvancedAutoAway.txt
+++ b/langpacks/russian/Plugins/AdvancedAutoAway.txt
@@ -65,8 +65,6 @@
 Подтвердить сброс статуса

 [Only set if current status is]

 Только если статус:

-[Command line]

-Ком. строка

 [Copy to clipboard]

 Копировать в буфер обмена

 [Command line:]

diff --git a/langpacks/russian/Plugins/BossKey.txt b/langpacks/russian/Plugins/BossKey.txt
index 8d425350ee..ad8f2057ed 100644
--- a/langpacks/russian/Plugins/BossKey.txt
+++ b/langpacks/russian/Plugins/BossKey.txt
@@ -7,8 +7,6 @@
 ;============================================================

 [Anti-Boss plugin. Makes your Miranda NG hidden or password-protected.]

 Позволяет по нажатию "горячей клавиши" прятать Miranda NG от посторонних глаз.

-[BossKey]

-АнтиБосс

 [Go to Customize -> Hotkeys to change the hotkey]

 Настройка в Тонкая настройка -> Горячие клавиши

 [When I press the hotkey:]

@@ -65,6 +63,8 @@ Windows не активен
 Скрыть

 [Hide/Show Miranda]

 Скрыть/Показать Miranda NG

+[BossKey]

+АнтиБосс

 [get the BossKey name]

 Получить клавишу блокировки из АнтиБосс+

 [Events]

diff --git a/langpacks/russian/Plugins/Exchange.txt b/langpacks/russian/Plugins/Exchange.txt
index b2d1b5eb1f..19824e1f9a 100644
--- a/langpacks/russian/Plugins/Exchange.txt
+++ b/langpacks/russian/Plugins/Exchange.txt
@@ -13,8 +13,6 @@
 Закрыть

 [Mark as read]

 Прочитанное

-[Dialog]

-Диалог

 [Connection]

 Подключение

 [Username:]

diff --git a/langpacks/russian/Plugins/Folders.txt b/langpacks/russian/Plugins/Folders.txt
index 9157b6af6c..a3f933b54f 100644
--- a/langpacks/russian/Plugins/Folders.txt
+++ b/langpacks/russian/Plugins/Folders.txt
@@ -7,8 +7,6 @@
 ;============================================================

 [Allows plugins to save their data to user selected folders; supports variables.]

 Позволяет другим плагинам сохранять свои данные в произвольных папках. Поддерживаются переменные.

-[Dialog]

-Диалог

 [Custom folders]

 Папки

 [Preview]

diff --git a/langpacks/russian/Plugins/KeepStatus.txt b/langpacks/russian/Plugins/KeepStatus.txt
index 926b56aeb4..1ca82ff44a 100644
--- a/langpacks/russian/Plugins/KeepStatus.txt
+++ b/langpacks/russian/Plugins/KeepStatus.txt
@@ -65,8 +65,6 @@
 Подтвердить сброс статуса

 [Only set if current status is]

 Только если статус:

-[Command line]

-Ком. строка

 [Copy to clipboard]

 Копировать в буфер обмена

 [Command line:]

diff --git a/langpacks/russian/Plugins/NimContact.txt b/langpacks/russian/Plugins/NimContact.txt
index a61e7a0c4a..a8c020169b 100644
--- a/langpacks/russian/Plugins/NimContact.txt
+++ b/langpacks/russian/Plugins/NimContact.txt
@@ -57,8 +57,6 @@
 Контакт всегда видим

 [Unless Non-IM Contacts protocol is OFFLINE]

 скрыть, если не-IM протокол не в сети

-[Dialog]

-Диалог

 [Away as another status]

 Отсутствую, как другой статус

 [Disable timer]

diff --git a/langpacks/russian/Plugins/NotesReminders.txt b/langpacks/russian/Plugins/NotesReminders.txt
index 44e306bedf..fde87e2c31 100644
--- a/langpacks/russian/Plugins/NotesReminders.txt
+++ b/langpacks/russian/Plugins/NotesReminders.txt
@@ -7,8 +7,6 @@
 ;============================================================

 [Sticky Notes & Reminders Implementation for Miranda NG.]

 Заметки и напоминания для Miranda NG.

-[Sticky Notes Options]

-Настройки заметок

 [Default Note Size]

 Размер заметки

 [Width (Pixels)]

diff --git a/langpacks/russian/Plugins/NotifyAnything.txt b/langpacks/russian/Plugins/NotifyAnything.txt
index f7e2108a94..cb80a2d84d 100644
--- a/langpacks/russian/Plugins/NotifyAnything.txt
+++ b/langpacks/russian/Plugins/NotifyAnything.txt
@@ -7,8 +7,6 @@
 ;============================================================

 [Displays popups for custom events, triggered by UDP packages.]

 Уведомления о различных событиях, инициируемых получением UDP-пакета.

-[Property Page]

-Страница свойств

 [Security]

 Безопасность

 [Only listen to localhost]

diff --git a/langpacks/russian/Plugins/SkypeWeb.txt b/langpacks/russian/Plugins/SkypeWeb.txt
index c81bee83a6..fb7eaaa8ee 100644
--- a/langpacks/russian/Plugins/SkypeWeb.txt
+++ b/langpacks/russian/Plugins/SkypeWeb.txt
@@ -127,5 +127,9 @@
 Звук входящего звонка

 [Incoming call canceled sound]

 Звук отмены входящего звонка

+[Calls]

+Звонки

+[Notifications]

+Уведомления

 [Incoming call from %s]

 Входящий звонок от %s

diff --git a/langpacks/russian/Plugins/StartupStatus.txt b/langpacks/russian/Plugins/StartupStatus.txt
index d57d9cf30c..d4d410d767 100644
--- a/langpacks/russian/Plugins/StartupStatus.txt
+++ b/langpacks/russian/Plugins/StartupStatus.txt
@@ -65,8 +65,6 @@
 Подтвердить сброс статуса

 [Only set if current status is]

 Только если статус:

-[Command line]

-Ком. строка

 [Copy to clipboard]

 Копировать в буфер обмена

 [Command line:]

diff --git a/langpacks/russian/Plugins/YahooGroups.txt b/langpacks/russian/Plugins/YahooGroups.txt
index 1551b2bbda..113e433795 100644
--- a/langpacks/russian/Plugins/YahooGroups.txt
+++ b/langpacks/russian/Plugins/YahooGroups.txt
@@ -7,8 +7,6 @@
 ;============================================================

 [This plugin imports and creates the Yahoo groups defined in Yahoo Messenger.]

 Импортирует и создает группы Yahoo, существующие в Yahoo Messenger.

-[Dialog]

-Диалог

 [Move Yahoo contacts to groups now]

 Переместить контакты в группы

 [Move Yahoo contacts automatically on startup]

diff --git a/langpacks/russian/Untranslated/WebView.txt b/langpacks/russian/Untranslated/WebView.txt
index 74dcbb7661..3bc1433215 100644
--- a/langpacks/russian/Untranslated/WebView.txt
+++ b/langpacks/russian/Untranslated/WebView.txt
@@ -16,7 +16,6 @@
 [Copy strings to alerts]

 [Double click action]

 [Opens web page]

-[Alert options]

 [Events and alerts]

 [Enable alerts]

 [Always log to file]

@@ -53,6 +52,7 @@
 [Specific part of the web page has changed.]

 [Cannot read from cache file]

 [ERROR: You have two or more Webview contacts with the same URL and contact name.]

+[Alert options]

 [Click here to open this URL in a browser window.]

 [URL not supplied]

 [The server replied with a failure code]