From 8d33d9426264f7600eb2eb48ed1e3eb6578d975d Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Thu, 4 Mar 2004 15:58:31 +0000
Subject: merge

---
 po/ru.po | 51 ++++++++++++++++++++++++++++-----------------------
 1 file changed, 28 insertions(+), 23 deletions(-)

(limited to 'po/ru.po')

diff --git a/po/ru.po b/po/ru.po
index bb0e8b1d..49991c28 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-03 17:51+0100\n"
+"POT-Creation-Date: 2004-03-04 16:55+0100\n"
 "PO-Revision-Date: 2004-03-01 17:08+0200\n"
 "Last-Translator: Alice Lafox <alice@lafox.net>\n"
 "Language-Team: Russian <cooker-i18n@linux-mandrake.com>\n"
@@ -73,76 +73,76 @@ msgstr "Настроить сеть"
 msgid "Configure Now!"
 msgstr "Настроить"
 
-#: ../mdkapplet:121
+#: ../mdkapplet:123
 msgid "Mandrake Updates Applet"
 msgstr "Аплет Mandrake Updates"
 
-#: ../mdkapplet:128
+#: ../mdkapplet:130
 msgid "Actions"
 msgstr "Действия"
 
-#: ../mdkapplet:130
+#: ../mdkapplet:132
 msgid "Install updates"
 msgstr "Установить обновления"
 
-#: ../mdkapplet:131
+#: ../mdkapplet:133
 msgid "Configure"
 msgstr "Настроить"
 
-#: ../mdkapplet:132
+#: ../mdkapplet:134
 msgid "Check updates"
 msgstr "Проверить обновления"
 
-#: ../mdkapplet:133
+#: ../mdkapplet:135
 msgid "See logs"
 msgstr "Просмотр журнала"
 
-#: ../mdkapplet:136
+#: ../mdkapplet:138
 msgid "Status"
 msgstr "Статус"
 
-#: ../mdkapplet:139
+#: ../mdkapplet:141
 msgid "Network Connection: "
 msgstr "Сетевое соединение: "
 
-#: ../mdkapplet:140
+#: ../mdkapplet:142
 msgid "Down"
 msgstr "Вниз"
 
-#: ../mdkapplet:140
+#: ../mdkapplet:142
 msgid "Up"
 msgstr "Вверх"
 
-#: ../mdkapplet:143
+#: ../mdkapplet:145
 msgid "New Updates: "
 msgstr "Свежие обновления: "
 
-#: ../mdkapplet:144
+#: ../mdkapplet:146
 msgid "Available"
 msgstr "Доступны"
 
-#: ../mdkapplet:144
+#: ../mdkapplet:146
 msgid "Not Available"
 msgstr "Недоступны"
 
-#: ../mdkapplet:147
+#: ../mdkapplet:149
 msgid "Last check: "
 msgstr "Последняя проверка: "
 
-#: ../mdkapplet:153
+#: ../mdkapplet:155
 msgid "Close"
 msgstr "Закрыть"
 
-#: ../mdkapplet:220
+#: ../mdkapplet:222
 #, fuzzy
 msgid "No check"
 msgstr "Последняя проверка: "
 
-#: ../mdkapplet:280
+#: ../mdkapplet:287
 msgid "About.."
 msgstr "О программе..."
 
-#: ../mdkapplet:281
+#: ../mdkapplet:288
 msgid "Quit"
 msgstr "Выход"
 
@@ -211,6 +211,11 @@ msgstr "Введите свой MandrakeOnline логин, пароль и им
 msgid "Machine name:"
 msgstr "Имя машины:"
 
+#: ../mdkonline:138
+#, fuzzy
+msgid "Send Configuration"
+msgstr "Настройка"
+
 #: ../mdkonline:139
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
@@ -248,6 +253,10 @@ msgstr ""
 "И, наконец, вам будет предоставлен почтовый ящик с вашим именем\n"
 " на @mandrakeonline.net."
 
+#: ../mdkonline:144 ../mdkonline:247 ../mdkonline:275
+msgid "Finish"
+msgstr "Завершить"
+
 #: ../mdkonline:145
 msgid ""
 "From now you will receive on security and updates \n"
@@ -353,10 +362,6 @@ msgstr "Недействительный почтовый адрес!\n"
 msgid "Sending configuration..."
 msgstr "Посылаются настройки..."
 
-#: ../mdkonline:247 ../mdkonline:275
-msgid "Finish"
-msgstr "Завершить"
-
 #: ../mdkonline:251 ../mdkonline:326 ../mdkupdate:77
 msgid "Connection problem"
 msgstr "Проблема соединения"
-- 
cgit v1.2.1