- langpacks/english: update;

- langpacks/russian: update;

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

4 files changed, 38 insertions, 32 deletions

diff --git a/langpacks/english/Plugins/Import.txt b/langpacks/english/Plugins/Import.txt
index 8e0a62c7da..7abda7081e 100644
--- a/langpacks/english/Plugins/Import.txt
+++ b/langpacks/english/Plugins/Import.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Import.dll

 ;  Plugin: Import contacts and messages

-;  Version: 0.95.3.4

+;  Version: 0.95.4.1

 ;  Authors: Miranda team

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

 [Imports contacts and messages from another Miranda profile or from an external program.]

@@ -25,11 +25,13 @@
 [&Next >]

 [Cancel]

 [< &Back]

+[Import all settings, contacts and all messages]

+[Makes precise copy of the original profile]

 [Import all contacts and all messages]

-[Only import contacts]

-[Custom import]

 [Select this if you want to import as much data as possible. This is the recommended option.]

+[Only import contacts]

 [Select this if you want to import contacts but don't want to import any message history.]

+[Custom import]

 [Select this if you want to customize what to import.]

 [New contacts && groups]

 [System history]

diff --git a/langpacks/english/Plugins/SeenPlugin.txt b/langpacks/english/Plugins/SeenPlugin.txt
index d71e8faf56..e3e6751342 100644
--- a/langpacks/english/Plugins/SeenPlugin.txt
+++ b/langpacks/english/Plugins/SeenPlugin.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: SeenPlugin.dll

 ;  Plugin: Last seen

-;  Version: 5.0.5.1

+;  Version: 5.0.5.2

 ;  Authors: Heiko Schillinger, YB

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

 [Logs when a user was last seen online and which users were online while you were away.]

@@ -54,14 +54,6 @@
 [<unknown>]

 [<none>]

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

-[Last Seen Variables]

-[Contacts]

-[Last seen]

-[Popups]

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

-[%n is %s (%u)]

-[%i(%r)%bWas %o]

-[Name:%t%N%bStatus:%t%s%bDay:%t%d.%m.%Y%bTime:%t%H:%M:%S%bPrevious Status:%t%o%b%b%P ID:%t%u%bExternal IP:%t%i%bInternal IP:%t%r%bClient ID: %t%C%b%bStatus Message:%t%T]

 [-- Date --]

 [year (4 digits)]

 [year (2 digits)]

@@ -97,6 +89,14 @@
 [Use]

 [for empty string]

 [instead of]

+[Last Seen Variables]

+[Contacts]

+[Last seen]

+[Popups]

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

+[%n is %s (%u)]

+[%i(%r)%bWas %o]

+[Name:%t%N%bStatus:%t%s%bDay:%t%d.%m.%Y%bTime:%t%H:%M:%S%bPrevious Status:%t%o%b%b%P ID:%t%u%bExternal IP:%t%i%bInternal IP:%t%r%bClient ID: %t%C%b%bStatus Message:%t%T]

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

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

 [Sunday]

diff --git a/langpacks/russian/Plugins/Import.txt b/langpacks/russian/Plugins/Import.txt
index c248d78ca3..983d2b2563 100644
--- a/langpacks/russian/Plugins/Import.txt
+++ b/langpacks/russian/Plugins/Import.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Import.dll

 ;  Plugin: Import contacts and messages

-;  Version: 0.95.3.4

+;  Version: 0.95.4.1

 ;  Authors: Miranda team

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

 [Imports contacts and messages from another Miranda profile or from an external program.]

@@ -43,16 +43,20 @@ Miranda нашла следующие профили. Выберите проф�
 Отмена

 [< &Back]

 < &Назад

+[Import all settings, contacts and all messages]

+Импортировать все настройки, контакты и сообщения

+[Makes precise copy of the original profile]

+Создаёт точную копию оригинального профиля

 [Import all contacts and all messages]

 Импортировать все контакты и сообщения

-[Only import contacts]

-Импортировать только контакты

-[Custom import]

-Импорт вручную

 [Select this if you want to import as much data as possible. This is the recommended option.]

 Выберите эту опцию, чтобы импортировать как можно больше данных (рекомендуется).

+[Only import contacts]

+Импортировать только контакты

 [Select this if you want to import contacts but don't want to import any message history.]

 Выберите эту опцию, чтобы импортировать только контакты (без истории сообщений).

+[Custom import]

+Импорт вручную

 [Select this if you want to customize what to import.]

 Выберите эту опцию, чтобы указать, что именно импортировать

 [New contacts && groups]

diff --git a/langpacks/russian/Plugins/SeenPlugin.txt b/langpacks/russian/Plugins/SeenPlugin.txt
index 231a6b5f3b..522df8cab4 100644
--- a/langpacks/russian/Plugins/SeenPlugin.txt
+++ b/langpacks/russian/Plugins/SeenPlugin.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: SeenPlugin.dll

 ;  Plugin: Last seen

-;  Version: 5.0.5.1

+;  Version: 5.0.5.2

 ;  Authors: Heiko Schillinger, YB

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

 [Logs when a user was last seen online and which users were online while you were away.]

@@ -93,20 +93,6 @@
 <неизвестно>

 [<none>]

 <нет>

-[Last Seen Variables]

-Переменные

-[Contacts]

-Контакты

-[Last seen]

-Последнее появление

-[Popups]

-Всплывающие окна

-[%n is %s (%u)]

-%n %s (%u)

-[%i(%r)%bWas %o]

-%i(%r)%bбыл %o

-[Name:%t%N%bStatus:%t%s%bDay:%t%d.%m.%Y%bTime:%t%H:%M:%S%bPrevious Status:%t%o%b%b%P ID:%t%u%bExternal IP:%t%i%bInternal IP:%t%r%bClient ID: %t%C%b%bStatus Message:%t%T]

-Имя:%t%N%bСтатус:%t%s%bДата:%t%d.%m.%Y%bВремя:%t%H:%M:%S%bПредыдущий статус:%t%o%b%b%P ID:%t%u%bВнешний IP:%t%i%bВнутренний IP:%t%r%bКлиент: %t%C%b%bСообщение статуса:%t%T

 [-- Date --]

 -- Дата --

 [year (4 digits)]

@@ -177,6 +163,20 @@
 для пустой строки

 [instead of]

 вместо

+[Last Seen Variables]

+Переменные

+[Contacts]

+Контакты

+[Last seen]

+Последнее появление

+[Popups]

+Всплывающие окна

+[%n is %s (%u)]

+%n %s (%u)

+[%i(%r)%bWas %o]

+%i(%r)%bбыл %o

+[Name:%t%N%bStatus:%t%s%bDay:%t%d.%m.%Y%bTime:%t%H:%M:%S%bPrevious Status:%t%o%b%b%P ID:%t%u%bExternal IP:%t%i%bInternal IP:%t%r%bClient ID: %t%C%b%bStatus Message:%t%T]

+Имя:%t%N%bСтатус:%t%s%bДата:%t%d.%m.%Y%bВремя:%t%H:%M:%S%bПредыдущий статус:%t%o%b%b%P ID:%t%u%bВнешний IP:%t%i%bВнутренний IP:%t%r%bКлиент: %t%C%b%bСообщение статуса:%t%T

 [Sunday]

 Воскресенье

 [Monday]