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

Conflicts:
	applet/debian/changelog
	applet/po/es_ES.po
	applet/po/es_MX.po
	applet/po/fi_FI.po
	applet/po/pl_PL.po
	applet/po/ru_RU.po
	applet/src/livewp-settings.c

diff --git a/applet/debian/changelog b/applet/debian/changelog
index d3fc649..51c77a9 100644 (file)
--- a/applet/debian/changelog
+++ b/applet/debian/changelog
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 live-wallpaper (0.8.5) unstable; urgency=low
 
   * Fixed number version in dialog "About" 
@@ -16,6 +17,8 @@ live-wallpaper (0.8.3) unstable; urgency=low
 
  -- Vlad Vasiliev <vlad@gas.by>  Sun, 22 Aug 2010 18:39:10 +0200
 
+=======
+>>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
 live-wallpaper (0.8.2) unstable; urgency=low
 
   * Updated Finish and Russian translation

diff --git a/applet/po/es_ES.po b/applet/po/es_ES.po
index 078a43a..50d35af 100644 (file)
--- a/applet/po/es_ES.po
+++ b/applet/po/es_ES.po
@@ -2,7 +2,11 @@ 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
 "PO-Revision-Date: \n"
 "Last-Translator: Alejandro López <alejandro.lopez@free.fr>\n"
 "Language-Team: \n"
@@ -16,12 +20,20 @@ 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"
 
@@ -45,7 +57,11 @@ 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"
@@ -71,21 +87,37 @@ 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"
 
@@ -93,11 +125,19 @@ 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 ""
 
@@ -106,20 +146,36 @@ 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 "
@@ -137,7 +193,11 @@ 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 40ac3ef..7ca5675 100644 (file)
--- a/applet/po/es_MX.po
+++ b/applet/po/es_MX.po
@@ -2,7 +2,11 @@ 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
 "PO-Revision-Date: \n"
 "Last-Translator: Alejandro López <alejandro.lopez@free.fr>\n"
 "Language-Team: \n"
@@ -16,12 +20,20 @@ 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"
 
@@ -45,7 +57,11 @@ 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"
@@ -71,21 +87,37 @@ 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"
 
@@ -93,11 +125,19 @@ 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 ""
 
@@ -106,20 +146,36 @@ 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 "
@@ -137,7 +193,11 @@ 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 a085223..425a1fa 100644 (file)
--- a/applet/po/fi_FI.po
+++ b/applet/po/fi_FI.po
@@ -7,8 +7,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.4\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-08-23 07:05+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"
@@ -21,12 +26,20 @@ 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"
 
@@ -48,9 +61,12 @@ msgid "Live Wallpaper Settings"
 msgstr "Elävän taustakuvan asetukset"
 
 #: 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"
@@ -63,7 +79,7 @@ msgid ""
 " Russian - Tanya Makova \n"
 "           Vlad Vasiliev\n"
 msgstr ""
-"Live Wallpaper Versio 0.8 \n"
+"Live Wallpaper Versio 0.8.2 \n"
 " Copyright(c) 2010\n"
 " Tanya Makova\n"
 " Vlad Vasiliev\n"
@@ -75,21 +91,37 @@ 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"
 
@@ -97,19 +129,28 @@ 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 ""
+msgstr "Ääni"
 
 #: 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"
@@ -124,21 +165,44 @@ 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 ""
-"Et ole asentanut Xsnow pakettia. Voit asentaa sen Sovellusten hallinnalla."
+" 'Sherman's Aquarium' pakettia ei ole asennettu. 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 ""
-"Et ole asentanut Xsnow pakettia. Voit asentaa sen Sovellusten hallinnalla."
+"Xsnow pakettia ei ole asennettu. 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 53d5be9..601d7a7 100644 (file)
--- a/applet/po/pl_PL.po
+++ b/applet/po/pl_PL.po
@@ -8,7 +8,11 @@ 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
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,12 +26,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 ""
 
@@ -50,7 +62,11 @@ 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"
@@ -64,21 +80,37 @@ 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 ""
 
@@ -86,11 +118,19 @@ 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 ""
 
@@ -99,6 +139,7 @@ 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 ""
@@ -112,6 +153,21 @@ 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"
@@ -123,7 +179,11 @@ 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 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"

diff --git a/applet/src/livewp-settings.c b/applet/src/livewp-settings.c
index 93e88af..bcede27 100644 (file)
--- a/applet/src/livewp-settings.c
+++ b/applet/src/livewp-settings.c
@@ -34,7 +34,11 @@ void lw_about(void){
     gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
     gtk_window_set_modal(GTK_WINDOW(window), TRUE);
     vbox = gtk_vbox_new (FALSE, 5);
+<<<<<<< HEAD
     label_about = gtk_label_new (_("Live Wallpaper Version 0.8.5 \n Copyright(c) 2010\n \
+=======
+    label_about = gtk_label_new (_("Live Wallpaper Version 0.8.2 \n Copyright(c) 2010\n \
+>>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
 Tanya Makova\n Vlad Vasiliev\n \
 Copyright(c) 2010 for design themes Berlin, Modern and Accel Vasya Bobrikov\n \
 Copyright(c) 2010 for design theme Matrix and icons Andrew Zhilin\n \