Merge branch 'master' of https://vcs.maemo.org/git/livewp

[livewp] / applet / po / ru_RU.po

diff --git a/applet/po/ru_RU.po b/applet/po/ru_RU.po
index af32b2b..58d7b42 100644 (file)
--- a/applet/po/ru_RU.po
+++ b/applet/po/ru_RU.po
@@ -7,7 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-08-23 07:05+0300\n"
+=======
+"POT-Creation-Date: 2010-08-22 10:47+0300\n"
+>>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Vlad Vasiliev <vlad@gas.by>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,12 +25,20 @@ msgid "About"
 msgstr "О программе"
 
 #: src/livewp-settings.c:221 src/livewp-settings.c:276
+<<<<<<< HEAD
 #: src/livewp-settings.c:294 src/livewp-settings.c:679
+=======
+#: src/livewp-settings.c:294 src/livewp-settings.c:677
+>>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
 msgid "Accel"
 msgstr "Акселерометр"
 
 #: src/livewp-settings.c:211 src/livewp-settings.c:273
+<<<<<<< HEAD
 #: src/livewp-settings.c:282 src/livewp-settings.c:673
+=======
+#: src/livewp-settings.c:282 src/livewp-settings.c:671
+>>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
 msgid "Berlin"
 msgstr "Берлин"
 
@@ -49,7 +61,11 @@ msgstr "Настройка Live Wallpaper"
 
 #: src/livewp-settings.c:37
 msgid ""
+<<<<<<< HEAD
 "Live Wallpaper Version 0.8.5 \n"
+=======
+"Live Wallpaper Version 0.8.2 \n"
+>>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
 " Copyright(c) 2010\n"
 " Tanya Makova\n"
 " Vlad Vasiliev\n"
@@ -62,34 +78,58 @@ msgid ""
 " Russian - Tanya Makova \n"
 "           Vlad Vasiliev\n"
 msgstr ""
+<<<<<<< HEAD
 "Живые обои Версия 0.8.5 \n"
+=======
+"Живые обои Версия 0.8.2 \n"
+>>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
 " Copyright(c) 2010\n"
 " Татьяна Макова\n"
 " Влад Васильев\n"
 " Copyright(c) 2010 для дизайна тем Берлин, Модерн и Акселерометр\n"
 " Василий Бобриков\n"
+<<<<<<< HEAD
 " Copyright(c) 2010 для дизайна темы Матрица и иконок Андрей Жилин\n"
+=======
+" Copyright(c) 2010 для дизайна темы Матрица иконок Андрей Жилин\n"
+>>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
 " Переводы:\n"
 " Финский - Marko Vertainen\n"
 " Испанский  - Alejandro López\n"
 " Русский - Таня Макова \n"
 "           Влад Васильев\n"
 
+<<<<<<< HEAD
 #: src/livewp-settings.c:557
+=======
+#: src/livewp-settings.c:558
+>>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
 msgid "Loop"
 msgstr "По кругу"
 
 #: src/livewp-settings.c:217 src/livewp-settings.c:275
+<<<<<<< HEAD
 #: src/livewp-settings.c:290 src/livewp-settings.c:677
+=======
+#: src/livewp-settings.c:290 src/livewp-settings.c:675
+>>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
 msgid "Matrix"
 msgstr "Матрица"
 
 #: src/livewp-settings.c:214 src/livewp-settings.c:274
+<<<<<<< HEAD
 #: src/livewp-settings.c:286 src/livewp-settings.c:675
 msgid "Modern"
 msgstr "Модерн"
 
 #: src/livewp-settings.c:546 src/livewp-settings.c:549
+=======
+#: src/livewp-settings.c:286 src/livewp-settings.c:673
+msgid "Modern"
+msgstr "Модерн"
+
+#: src/livewp-settings.c:547 src/livewp-settings.c:550
+>>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
 msgid "Play file"
 msgstr "Играть файл"
 
@@ -97,19 +137,28 @@ msgstr "Играть файл"
 msgid "Rich Animation"
 msgstr "Полная Анимация"
 
+<<<<<<< HEAD
 #: src/livewp-settings.c:643
 msgid "Save"
 msgstr "Сохранить"
 
 #: src/livewp-settings.c:565
+=======
+#: src/livewp-settings.c:641
+msgid "Save"
+msgstr "Сохранить"
+
+#: src/livewp-settings.c:563
+>>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
 msgid "Sound"
-msgstr ""
+msgstr "Звук"
 
 #: src/livewp-settings.c:340
 msgid "Theme"
 msgstr "Тема"
 
 #: src/livewp-settings.c:224 src/livewp-settings.c:277
+<<<<<<< HEAD
 #: src/livewp-settings.c:298 src/livewp-settings.c:681
 msgid "Video"
 msgstr "Видео"
@@ -123,11 +172,30 @@ msgid "Xsnow"
 msgstr "Снег"
 
 #: src/livewp-settings.c:665
+=======
+#: src/livewp-settings.c:298 src/livewp-settings.c:679
+msgid "Video"
+msgstr "Видео"
+
+#: src/livewp-settings.c:593
+msgid "View Settings"
+msgstr "Настройки вида"
+
+#: src/livewp-settings.c:651
+msgid "Xsnow"
+msgstr "Снег"
+
+#: src/livewp-settings.c:663
+>>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
 msgid ""
 "You haven't got the installed package 'Sherman's Aquarium'. Please install "
 "it via using Application Manager"
 msgstr ""
+<<<<<<< HEAD
 "У Вас не установлен пакет Sherman's Aquarium. Пожалуйста установите его используя "
+=======
+"У Вас не установлен пакет 'Sherman's Aquarium'. Пожалуйста установите его используя "
+>>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
 "Диспетчер Приложений"
 
 #: src/livewp-settings.c:249
@@ -138,7 +206,11 @@ msgstr ""
 "У Вас не установлен пакет Xscreensaver. Пожалуйста установите его используя "
 "Диспетчер Приложений"
 
+<<<<<<< HEAD
 #: src/livewp-settings.c:656
+=======
+#: src/livewp-settings.c:654
+>>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
 msgid ""
 "You haven't got the installed package Xsnow. Please install it via using "
 "Application Manager"