fixed translation

diff --git a/applet/po/es_ES.po b/applet/po/es_ES.po
index 50d35af..2ad935e 100644 (file)
--- a/applet/po/es_ES.po
+++ b/applet/po/es_ES.po
@@ -2,11 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \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
+"POT-Creation-Date: 2010-08-23 08:01+0300\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Alejandro López <alejandro.lopez@free.fr>\n"
 "Language-Team: \n"
@@ -20,20 +16,12 @@ msgid "About"
 msgstr "Acerca de"
 
 #: 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 "Acel"
 
 #: 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 "Berlín"
 
@@ -57,11 +45,7 @@ msgstr "Configuración de Live Wallpaper"
 #: src/livewp-settings.c:37
 #, fuzzy
 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"
@@ -87,37 +71,21 @@ msgstr ""
 " Ruso - Tanya Makova \n"
 "        Vlad Vasiliev\n"
 
-<<<<<<< HEAD
 #: src/livewp-settings.c:557
-=======
-#: src/livewp-settings.c:558
->>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
 msgid "Loop"
 msgstr "Bucle"
 
 #: 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 "Matrix"
 
 #: src/livewp-settings.c:214 src/livewp-settings.c:274
-<<<<<<< HEAD
 #: src/livewp-settings.c:286 src/livewp-settings.c:675
 msgid "Modern"
 msgstr "Moderno"
 
 #: src/livewp-settings.c:546 src/livewp-settings.c:549
-=======
-#: src/livewp-settings.c:286 src/livewp-settings.c:673
-msgid "Modern"
-msgstr "Moderno"
-
-#: src/livewp-settings.c:547 src/livewp-settings.c:550
->>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
 msgid "Play file"
 msgstr "Ejecutar fichero"
 
@@ -125,19 +93,11 @@ msgstr "Ejecutar fichero"
 msgid "Rich Animation"
 msgstr "Animación rica"
 
-<<<<<<< HEAD
 #: src/livewp-settings.c:643
 msgid "Save"
 msgstr "Guardar"
 
 #: src/livewp-settings.c:565
-=======
-#: src/livewp-settings.c:641
-msgid "Save"
-msgstr "Guardar"
-
-#: src/livewp-settings.c:563
->>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
 msgid "Sound"
 msgstr ""
 
@@ -146,36 +106,20 @@ msgid "Theme"
 msgstr "Tema"
 
 #: src/livewp-settings.c:224 src/livewp-settings.c:277
-<<<<<<< HEAD
 #: src/livewp-settings.c:298 src/livewp-settings.c:681
 msgid "Video"
 msgstr "Video"
 
 #: src/livewp-settings.c:595
-=======
-#: src/livewp-settings.c:298 src/livewp-settings.c:679
-msgid "Video"
-msgstr "Video"
-
-#: src/livewp-settings.c:593
->>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
 msgid "View Settings"
 msgstr "Configuración de Vista"
 
 # Is this a package name?
-<<<<<<< HEAD
 #: src/livewp-settings.c:653
 msgid "Xsnow"
 msgstr "Xsnow"
 
 #: src/livewp-settings.c:665
-=======
-#: src/livewp-settings.c:651
-msgid "Xsnow"
-msgstr "Xsnow"
-
-#: src/livewp-settings.c:663
->>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
 #, fuzzy
 msgid ""
 "You haven't got the installed package 'Sherman's Aquarium'. Please install "
@@ -193,11 +137,7 @@ msgstr ""
 "No tiene instalado el paquete Xsnow. Por favor utiliza el Administrador de "
 "Aplicaciones para instarlo."
 
-<<<<<<< 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"

diff --git a/applet/po/es_MX.po b/applet/po/es_MX.po
index 7ca5675..7a0ebaa 100644 (file)
--- a/applet/po/es_MX.po
+++ b/applet/po/es_MX.po
@@ -2,11 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \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
+"POT-Creation-Date: 2010-08-23 08:01+0300\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Alejandro López <alejandro.lopez@free.fr>\n"
 "Language-Team: \n"
@@ -20,20 +16,12 @@ msgid "About"
 msgstr "Acerca de"
 
 #: 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 "Acel"
 
 #: 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 "Berlín"
 
@@ -57,11 +45,7 @@ msgstr "Configuración de Live Wallpaper"
 #: src/livewp-settings.c:37
 #, fuzzy
 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"
@@ -87,37 +71,21 @@ msgstr ""
 " Ruso - Tanya Makova \n"
 "        Vlad Vasiliev\n"
 
-<<<<<<< HEAD
 #: src/livewp-settings.c:557
-=======
-#: src/livewp-settings.c:558
->>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
 msgid "Loop"
 msgstr "Bucle"
 
 #: 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 "Matrix"
 
 #: src/livewp-settings.c:214 src/livewp-settings.c:274
-<<<<<<< HEAD
 #: src/livewp-settings.c:286 src/livewp-settings.c:675
 msgid "Modern"
 msgstr "Moderno"
 
 #: src/livewp-settings.c:546 src/livewp-settings.c:549
-=======
-#: src/livewp-settings.c:286 src/livewp-settings.c:673
-msgid "Modern"
-msgstr "Moderno"
-
-#: src/livewp-settings.c:547 src/livewp-settings.c:550
->>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
 msgid "Play file"
 msgstr "Ejecutar fichero"
 
@@ -125,19 +93,11 @@ msgstr "Ejecutar fichero"
 msgid "Rich Animation"
 msgstr "Animación rica"
 
-<<<<<<< HEAD
 #: src/livewp-settings.c:643
 msgid "Save"
 msgstr "Guardar"
 
 #: src/livewp-settings.c:565
-=======
-#: src/livewp-settings.c:641
-msgid "Save"
-msgstr "Guardar"
-
-#: src/livewp-settings.c:563
->>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
 msgid "Sound"
 msgstr ""
 
@@ -146,36 +106,20 @@ msgid "Theme"
 msgstr "Tema"
 
 #: src/livewp-settings.c:224 src/livewp-settings.c:277
-<<<<<<< HEAD
 #: src/livewp-settings.c:298 src/livewp-settings.c:681
 msgid "Video"
 msgstr "Video"
 
 #: src/livewp-settings.c:595
-=======
-#: src/livewp-settings.c:298 src/livewp-settings.c:679
-msgid "Video"
-msgstr "Video"
-
-#: src/livewp-settings.c:593
->>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
 msgid "View Settings"
 msgstr "Configuración de Vista"
 
 # Is this a package name?
-<<<<<<< HEAD
 #: src/livewp-settings.c:653
 msgid "Xsnow"
 msgstr "Xsnow"
 
 #: src/livewp-settings.c:665
-=======
-#: src/livewp-settings.c:651
-msgid "Xsnow"
-msgstr "Xsnow"
-
-#: src/livewp-settings.c:663
->>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
 #, fuzzy
 msgid ""
 "You haven't got the installed package 'Sherman's Aquarium'. Please install "
@@ -193,11 +137,7 @@ msgstr ""
 "No tiene instalado el paquete Xsnow. Por favor utilice el Administrador de "
 "Aplicaciones para instarlo."
 
-<<<<<<< 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"

diff --git a/applet/po/fi_FI.po b/applet/po/fi_FI.po
index 425a1fa..f05259e 100644 (file)
--- a/applet/po/fi_FI.po
+++ b/applet/po/fi_FI.po
@@ -7,13 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2010-08-23 07:05+0300\n"
+"POT-Creation-Date: 2010-08-23 08:01+0300\n"
 "PO-Revision-Date: 2010-08-16 16:00+0200\n"
-=======
-"POT-Creation-Date: 2010-08-22 10:47+0300\n"
-"PO-Revision-Date: 2010-08-21 09:12+0200\n"
->>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
 "Last-Translator: Marko Vertainen <marko.vertainen@iki.fi>\n"
 "Language-Team: fi_FI <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,20 +21,12 @@ msgid "About"
 msgstr "Tietoja"
 
 #: 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 "Kiihtyvyys"
 
 #: 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 "Berliini"
 
@@ -62,11 +49,7 @@ msgstr "Elävän taustakuvan asetukset"
 
 #: 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"
@@ -79,7 +62,7 @@ msgid ""
 " Russian - Tanya Makova \n"
 "           Vlad Vasiliev\n"
 msgstr ""
-"Live Wallpaper Versio 0.8.2 \n"
+"Live Wallpaper Versio 0.8.5 \n"
 " Copyright(c) 2010\n"
 " Tanya Makova\n"
 " Vlad Vasiliev\n"
@@ -91,37 +74,21 @@ msgstr ""
 " Venäjä - Tanya Makova \n"
 "          Vlad Vasiliev\n"
 
-<<<<<<< HEAD
 #: src/livewp-settings.c:557
-=======
-#: src/livewp-settings.c:558
->>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
 msgid "Loop"
 msgstr "Uudelleen toisto"
 
 #: 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 "Matrix"
 
 #: src/livewp-settings.c:214 src/livewp-settings.c:274
-<<<<<<< HEAD
 #: src/livewp-settings.c:286 src/livewp-settings.c:675
 msgid "Modern"
 msgstr "Moderni"
 
 #: src/livewp-settings.c:546 src/livewp-settings.c:549
-=======
-#: src/livewp-settings.c:286 src/livewp-settings.c:673
-msgid "Modern"
-msgstr "Moderni"
-
-#: src/livewp-settings.c:547 src/livewp-settings.c:550
->>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
 msgid "Play file"
 msgstr "Valitse videoleike"
 
@@ -129,28 +96,19 @@ msgstr "Valitse videoleike"
 msgid "Rich Animation"
 msgstr "Rikas animaatio"
 
-<<<<<<< HEAD
 #: src/livewp-settings.c:643
 msgid "Save"
 msgstr "Tallenna"
 
 #: src/livewp-settings.c:565
-=======
-#: src/livewp-settings.c:641
-msgid "Save"
-msgstr "Tallenna"
-
-#: src/livewp-settings.c:563
->>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
 msgid "Sound"
-msgstr "Ääni"
+msgstr ""
 
 #: src/livewp-settings.c:340
 msgid "Theme"
 msgstr "Teema"
 
 #: src/livewp-settings.c:224 src/livewp-settings.c:277
-<<<<<<< HEAD
 #: src/livewp-settings.c:298 src/livewp-settings.c:681
 msgid "Video"
 msgstr "Video"
@@ -165,44 +123,21 @@ msgstr "Xsnow"
 
 #: src/livewp-settings.c:665
 #, fuzzy
-=======
-#: src/livewp-settings.c:298 src/livewp-settings.c:679
-msgid "Video"
-msgstr "Video"
-
-#: src/livewp-settings.c:593
-msgid "View Settings"
-msgstr "Näkymän asetukset"
-
-#: src/livewp-settings.c:651
-msgid "Xsnow"
-msgstr "Xsnow"
-
-#: 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 ""
-" 'Sherman's Aquarium' pakettia ei ole asennettu. Voit asentaa sen "
-"Sovellusten hallinnalla."
+"Et ole asentanut Xsnow pakettia. Voit asentaa sen Sovellusten hallinnalla."
 
 #: src/livewp-settings.c:249
-<<<<<<< HEAD
 #, fuzzy
-=======
->>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
 msgid ""
 "You haven't got the installed package Xscreensaver. Please install it via "
 "using Application Manager"
 msgstr ""
-"Xsnow pakettia ei ole asennettu. Voit asentaa sen Sovellusten hallinnalla."
+"Et ole asentanut Xsnow pakettia. Voit asentaa sen Sovellusten hallinnalla."
 
-<<<<<<< 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"

diff --git a/applet/po/pl_PL.po b/applet/po/pl_PL.po
index 601d7a7..383a80c 100644 (file)
--- a/applet/po/pl_PL.po
+++ b/applet/po/pl_PL.po
@@ -8,11 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\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
+"POT-Creation-Date: 2010-08-23 08:01+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,20 +22,12 @@ 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 ""
 
@@ -62,11 +50,7 @@ msgstr ""
 
 #: 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"
@@ -80,37 +64,21 @@ msgid ""
 "           Vlad Vasiliev\n"
 msgstr ""
 
-<<<<<<< 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 ""
 
@@ -118,19 +86,11 @@ 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 ""
 
@@ -139,7 +99,6 @@ 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 ""
@@ -153,21 +112,6 @@ 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"
@@ -179,11 +123,7 @@ msgid ""
 "using Application Manager"
 msgstr ""
 
-<<<<<<< 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"

diff --git a/applet/po/ru_RU.po b/applet/po/ru_RU.po
index 0049f09..8693ab1 100644 (file)
--- a/applet/po/ru_RU.po
+++ b/applet/po/ru_RU.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-23 07:05+0300\n"
+"POT-Creation-Date: 2010-08-23 08:01+0300\n"
 "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 +21,12 @@ msgid "About"
 msgstr "О программе"
 
 #: src/livewp-settings.c:221 src/livewp-settings.c:276
-#: src/livewp-settings.c:294 src/livewp-settings.c:677
+#: src/livewp-settings.c:294 src/livewp-settings.c:679
 msgid "Accel"
 msgstr "Акселерометр"
 
 #: src/livewp-settings.c:211 src/livewp-settings.c:273
-#: src/livewp-settings.c:282 src/livewp-settings.c:671
+#: src/livewp-settings.c:282 src/livewp-settings.c:673
 msgid "Berlin"
 msgstr "Берлин"
 
@@ -48,6 +48,7 @@ msgid "Live Wallpaper Settings"
 msgstr "Настройка Live Wallpaper"
 
 #: src/livewp-settings.c:37
+#, fuzzy
 msgid ""
 "Live Wallpaper Version 0.8.5 \n"
 " Copyright(c) 2010\n"
@@ -62,36 +63,34 @@ msgid ""
 " Russian - Tanya Makova \n"
 "           Vlad Vasiliev\n"
 msgstr ""
-"Живые обои Версия 0.8.5 \n"
+"Живые обои Версия 0.8 \n"
 " Copyright(c) 2010\n"
 " Татьяна Макова\n"
 " Влад Васильев\n"
 " Copyright(c) 2010 для дизайна тем Берлин, Модерн и Акселерометр\n"
 " Василий Бобриков\n"
-" Copyright(c) 2010 для дизайна темы Матрица и иконок Андрей Жилин\n"
+" Copyright(c) 2010 для дизайна темы Матрица Андрей Жилин\n"
 " Переводы:\n"
 " Финский - Marko Vertainen\n"
 " Испанский  - Alejandro López\n"
 " Русский - Таня Макова \n"
 "           Влад Васильев\n"
 
-#: src/livewp-settings.c:558
+#: src/livewp-settings.c:557
 msgid "Loop"
 msgstr "По кругу"
 
+#: src/livewp-settings.c:217 src/livewp-settings.c:275
 #: src/livewp-settings.c:290 src/livewp-settings.c:677
 msgid "Matrix"
 msgstr "Матрица"
 
+#: src/livewp-settings.c:214 src/livewp-settings.c:274
 #: src/livewp-settings.c:286 src/livewp-settings.c:675
 msgid "Modern"
 msgstr "Модерн"
 
-#: src/livewp-settings.c:286 src/livewp-settings.c:673
-msgid "Modern"
-msgstr "Модерн"
-
-#: src/livewp-settings.c:547 src/livewp-settings.c:550
+#: src/livewp-settings.c:546 src/livewp-settings.c:549
 msgid "Play file"
 msgstr "Играть файл"
 
@@ -99,19 +98,20 @@ msgstr "Играть файл"
 msgid "Rich Animation"
 msgstr "Полная Анимация"
 
-#: src/livewp-settings.c:641
+#: src/livewp-settings.c:643
 msgid "Save"
 msgstr "Сохранить"
 
-#: src/livewp-settings.c:563
+#: src/livewp-settings.c:565
 msgid "Sound"
-msgstr "Звук"
+msgstr ""
 
 #: src/livewp-settings.c:340
 msgid "Theme"
 msgstr "Тема"
 
 #: src/livewp-settings.c:224 src/livewp-settings.c:277
+#: src/livewp-settings.c:298 src/livewp-settings.c:681
 msgid "Video"
 msgstr "Видео"
 
@@ -123,32 +123,22 @@ msgstr "Настройки вида"
 msgid "Xsnow"
 msgstr "Снег"
 
-#: 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
+#: src/livewp-settings.c:665
+#, fuzzy
 msgid ""
 "You haven't got the installed package 'Sherman's Aquarium'. Please install "
 "it via using Application Manager"
 msgstr ""
-"У Вас не установлен пакет 'Sherman's Aquarium'. Пожалуйста установите его используя "
+"У Вас не установлен пакет Xsnow. Пожалуйста установите его используя "
 "Диспетчер Приложений"
 
 #: src/livewp-settings.c:249
+#, fuzzy
 msgid ""
 "You haven't got the installed package Xscreensaver. Please install it via "
 "using Application Manager"
 msgstr ""
-"У Вас не установлен пакет Xscreensaver. Пожалуйста установите его используя "
+"У Вас не установлен пакет Xsnow. Пожалуйста установите его используя "
 "Диспетчер Приложений"
 
 #: src/livewp-settings.c:656