- langpacks/english: update;

- langpacks/russian: update;


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

7 files changed, 21 insertions, 13 deletions

diff --git a/langpacks/russian/Plugins/SMS.txt b/langpacks/russian/Plugins/SMS.txt
index a7f175c812..4889070e3d 100644
--- a/langpacks/russian/Plugins/SMS.txt
+++ b/langpacks/russian/Plugins/SMS.txt
@@ -71,6 +71,8 @@ ID сообщения:
 Оператор:

 [From %s:\r\n\r\n]

 От %s:\r\n\r\n

+[Events]

+События

 [SMS Message from %s]

 SMS от %s

 [SMS Confirmation from %s]

@@ -89,6 +91,8 @@ SMS подтверждение от %s
 Показывает, сколько знаков набрано

 [The SMS message send to %s timed out.]

 Истекло время посылки SMS к %s,

+[The phone number should start with a + and consist of numbers, spaces, brackets and hyphens only.]

+Телефон должен начинаться с + и состоять только из цифр, пробелов, скобок и тире.

 [Invalid Phone Number]

 Неверный номер телефона

 [Message is too long, press OK to continue.]

@@ -99,10 +103,16 @@ SMS подтверждение от %s
 В списке должны быть номера.

 [No Numbers]

 Нет номеров

+[Valid phone numbers are of the form '+(country code)(phone number)'. The contents of the phone number portion is dependent on the national layout of phone numbers, but often omits the leading zero.]

+Правильные номера телефонов должны быть в форме '+(код страны)(номер телефона)'. содержимое части 'номер телефона' зависит от национальных стандартов, но часто первый ноль опускается.

 [Invalid phone number]

 Неверный номер телефона

 [<< Single]

 <<Одному

+[Send &SMS...]

+Послать SMS

+[&SMS Message]

+Сообщение SMS

 [Incoming SMS Message]

 Входящее SMS сообщение

 [Incoming SMS Confirmation]

diff --git a/langpacks/russian/Plugins/Tlen.txt b/langpacks/russian/Plugins/Tlen.txt
index 2a8afb18b1..69ec4d4055 100644
--- a/langpacks/russian/Plugins/Tlen.txt
+++ b/langpacks/russian/Plugins/Tlen.txt
@@ -191,8 +191,6 @@ Tlen чаты
 Авторизовать

 [%d Files]

 %d файлов

-[Authentication failed for]

-Аутентификация не пройдена для

 [Tlen Authentication]

 Аутентификация Tlen

 [You have been kicked. Reason: %s ]

@@ -253,8 +251,6 @@ Tlen чаты
 (Последнее сообщение)

 [Forwarding]

 Перенаправление

-[Enter password for]

-Введите пароль для

 [Windows]

 Windows

 [%s Web Messages]

diff --git a/langpacks/russian/Plugins/XFire.txt b/langpacks/russian/Plugins/XFire.txt
index 570b7c833c..ac173f7a2f 100644
--- a/langpacks/russian/Plugins/XFire.txt
+++ b/langpacks/russian/Plugins/XFire.txt
@@ -153,6 +153,8 @@ exe игры:
 Дайте же человеку поговорить по телефону.

 [Mmm... food.]

 Ммм... поесть бы.

+[XFire Protocol]

+Протокол XFire

 [Protocol icon]

 Значок протокола

 [The protocol version is too old. Changed current version from %d to %d. You can reconnect now.]

@@ -183,6 +185,8 @@ exe игры:
 &Пересканировать мои игры...

 [Set &Nickname]

 &Псевдоним...

+[Protocols]

+Протоколы

 [XFire game icon]

 Значок игры XFire

 [XFire voice icon]

diff --git a/langpacks/russian/Untranslated/QuickSearch.txt b/langpacks/russian/Untranslated/QuickSearch.txt
index bee7d97e6c..2772320d08 100644
--- a/langpacks/russian/Untranslated/QuickSearch.txt
+++ b/langpacks/russian/Untranslated/QuickSearch.txt
@@ -1,5 +1,4 @@
-[E-mail]

-[Contact add time]

+[Contact add time]

 [IP]

 [Attach to &Tab container]

 [Column content is simple database setting.]

diff --git a/langpacks/russian/Untranslated/SMS.txt b/langpacks/russian/Untranslated/SMS.txt
index 9593a6ffa7..6d7d228fda 100644
--- a/langpacks/russian/Untranslated/SMS.txt
+++ b/langpacks/russian/Untranslated/SMS.txt
@@ -2,5 +2,4 @@
 [%d/160]

 [&OK]

 [SMS message didn't send by %S to %s because: %S]

-[The phone szPhone should start with a + and consist of numbers, spaces, brackets and hyphens only.]

-[Valid phone numbers are of the form '+(country code)(phone szPhone)'. The contents of the phone szPhone portion is dependent on the national layout of phone numbers, but often omits the leading zero.]

+[SMS]

diff --git a/langpacks/russian/Untranslated/Tlen.txt b/langpacks/russian/Untranslated/Tlen.txt
index fe8c530812..e6c0ca9556 100644
--- a/langpacks/russian/Untranslated/Tlen.txt
+++ b/langpacks/russian/Untranslated/Tlen.txt
@@ -9,10 +9,11 @@
 [Send picture]

 [Cannot create avatars cache directory. ERROR: %d: %s\n%s]

 [Can not save new avatar file "%s" Error:\n\t%s (Error: %d)]

-[Error while setting popup on Tlen account (no response)]

-[Error while setting popup on Tlen account (invalid response)]

-[Error while setting popup on Tlen account]

+[Error while setting avatar on Tlen account (no response)]

+[Error while setting avatar on Tlen account (invalid response)]

+[Error while setting avatar on Tlen account]

 [1 File]

+[Authentication failed for %s@%s.]

 [Accept all images]

 [Ignore images from unauthorized contacts]

 [Ignore all images]

@@ -23,6 +24,7 @@
 [Image received file://%s]

 [Tlen login]

 [You need to be connected to Tlen account to set avatar.]

+[Enter password for %s]

 [Tlen Connection Error]

 [Windows Server 2003]

 [Windows XP]

diff --git a/langpacks/russian/Untranslated/Xfire.txt b/langpacks/russian/Untranslated/Xfire.txt
index a5f4828d77..a52f76175f 100644
--- a/langpacks/russian/Untranslated/Xfire.txt
+++ b/langpacks/russian/Untranslated/Xfire.txt
@@ -28,7 +28,6 @@
 [Supported Games]

 [Custom game]

 [Well, I would talk to you if Miranda ICQ supported chat]

-[XFire Protocol]

 [The xfire_games.ini was updated.]

 [Error during xfire_games.ini update.]

 [There is a new Icons.dll online, do you want to update now?]

@@ -53,7 +52,6 @@
 [It seems that is the first time you use this plugin. Do you want to automatically download the latest available xfire_games.ini and icons.dll?\r\nWithout the xfire_games.ini Xfire can't detect any games on your computer.]

 [Away from Keyboard]

 [&Activity Report]

-[Protocols]

 [XFire does not support offline messaging!]

 [No Password is set!]

 [Last game: %s playtime: %.2d:%.2d:%.2d]