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"
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"
#: 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"
" 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"
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 ""
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 "
"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"