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-09-21 09:06+0300\n"
"PO-Revision-Date: \n"
"Last-Translator: Alejandro López <alejandro.lopez@free.fr>\n"
"Language-Team: \n"
"Content-Transfer-Encoding: 8bit\n"
"Language: \n"
-#: src/livewp-settings.c:33 src/livewp-settings.c:469
+#: src/livewp-settings.c:34 src/livewp-settings.c:510
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
+#: src/livewp-settings.c:229 src/livewp-settings.c:283
+#: src/livewp-settings.c:301 src/livewp-settings.c:814
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
+msgstr "Accel"
+
+#: src/livewp-settings.c:219 src/livewp-settings.c:280
+#: src/livewp-settings.c:289 src/livewp-settings.c:808
msgid "Berlin"
msgstr "Berlín"
-#: src/livewp-settings.c:358
+#: src/livewp-settings.c:365
msgid "Category"
msgstr "Categoría"
-#: src/livewp-settings.c:419
+#: src/livewp-settings.c:427
msgid "Enable"
msgstr "Activar"
-#: src/livewp-config.c:34 src/livewp-config.c:86 src/livewp-config.c:151
+#: src/livewp-config.c:34 src/livewp-config.c:94 src/livewp-config.c:158
+#: src/livewp-config.c:177 src/livewp-config.c:199 src/livewp-config.c:257
#, c-format
msgid "Failed to initialize GConf. Quitting.\n"
msgstr "Falló la inicialización de GConf. Terminando.\n"
-#: src/livewp-settings.c:443
+#: src/livewp-settings.c:495
msgid "Live Wallpaper Settings"
msgstr "Configuración de Live Wallpaper"
-#: src/livewp-settings.c:37
-#, fuzzy
+#: src/livewp-settings.c:38
+#, fuzzy, c-format
msgid ""
-<<<<<<< HEAD
-"Live Wallpaper Version 0.8.5 \n"
-=======
-"Live Wallpaper Version 0.8.2 \n"
->>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
+"Live Wallpaper Version %s \n"
" Copyright(c) 2010\n"
" 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"
+" Copyright(c) 2010 for design themes Matrix, Fifteen \n"
+"and for icons Andrew Zhilin\n"
" Translators:\n"
" Finnish - Marko Vertainen\n"
" Spain - Alejandro López\n"
+" Italian - Emanuele Cassioli\n"
+" Dutch - Roland van Tilburg (aka ROLAN900D) \n"
" Russian - Tanya Makova \n"
" Vlad Vasiliev\n"
msgstr ""
-"Live Wallpaper Versión 0.8 \n"
+"Live Wallpaper Versión %s \n"
" Copyright(c) 2010\n"
" Tanya Makova\n"
" Vlad Vasiliev\n"
-" Copyright(c) 2010 del diseño de los temas Berlín, Moderno y Acel, Vasya "
+" Copyright(c) 2010 del diseño de los temas Berlín, Moderno y Accel, Vasya "
"Bobrikov\n"
-" Copyright(c) 2010 del diseño del tema Matrix, Andrew Zhilin\n"
+" Copyright(c) 2010 del diseño de los temas Matrix y Quince, y de los íconos, "
+"Andrew Zhilin\n"
" Traductores:\n"
" Castellano - Alejandro López\n"
" Finlandés - Marko Vertainen\n"
+" Italiano - Emanuele Cassioli\n"
" Ruso - Tanya Makova \n"
" Vlad Vasiliev\n"
-<<<<<<< HEAD
-#: src/livewp-settings.c:557
-=======
-#: src/livewp-settings.c:558
->>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
+#: src/livewp-settings.c:547
+msgid "Livewallpaper is reloading..."
+msgstr "Cargando escena de Livewalpaper..."
+
+#: src/livewp-main.c:319
+msgid "Loading Livewallpaper scene ..."
+msgstr "Cargando escena de Livewalpaper..."
+
+#: src/livewp-settings.c:634
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
+#: src/livewp-settings.c:225 src/livewp-settings.c:282
+#: src/livewp-settings.c:297 src/livewp-settings.c:812
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
+#: src/livewp-settings.c:222 src/livewp-settings.c:281
+#: src/livewp-settings.c:293 src/livewp-settings.c:810
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:498
+msgid "One theme in all views"
+msgstr "Un tema en todas las vistas"
-#: src/livewp-settings.c:547 src/livewp-settings.c:550
->>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
+#: src/livewp-settings.c:623 src/livewp-settings.c:626
msgid "Play file"
msgstr "Ejecutar fichero"
-#: src/livewp-settings.c:531
+#: src/livewp-settings.c:646
+msgid "Press me for"
+msgstr ""
+
+#: src/livewp-settings.c:596
msgid "Rich Animation"
msgstr "Animación rica"
-<<<<<<< HEAD
-#: src/livewp-settings.c:643
+#: src/livewp-settings.c:746
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"
+#: src/livewp-settings.c:640
+msgid "Smoothing (Need more memory)"
msgstr ""
-#: src/livewp-settings.c:340
+#: src/livewp-settings.c:347
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:670
+#, c-format
+msgid "Theme %s has already been selected"
+msgstr ""
-#: src/livewp-settings.c:595
-=======
-#: src/livewp-settings.c:298 src/livewp-settings.c:679
+#: src/livewp-settings.c:232 src/livewp-settings.c:284
+#: src/livewp-settings.c:305 src/livewp-settings.c:816
msgid "Video"
msgstr "Video"
-#: src/livewp-settings.c:593
->>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
+#: src/livewp-settings.c:698
msgid "View Settings"
msgstr "Configuración de Vista"
# Is this a package name?
-<<<<<<< HEAD
-#: src/livewp-settings.c:653
+#: src/livewp-settings.c:757
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
+#: src/livewp-settings.c:843 src/livewp-settings.c:846
+#, fuzzy, c-format
msgid ""
-"You haven't got the installed package 'Sherman's Aquarium'. Please install "
-"it via using Application Manager"
+"You haven't got the installed package %s. Do you want to install it via "
+"using Application Manager?"
msgstr ""
-"No tiene instalado el paquete Xsnow. Por favor utilice el Administrador de "
+"No tiene instalado el paquete %s. Por favor utilice el Administrador de "
"Aplicaciones para instarlo."
-#: src/livewp-settings.c:249
-#, fuzzy
+#: src/livewp-settings.c:662
+#, c-format
msgid ""
-"You haven't got the installed package Xscreensaver. Please install it via "
-"using Application Manager"
+"You haven't got the installed package %s. Please install it via using "
+"Application Manager"
msgstr ""
-"No tiene instalado el paquete Xsnow. Por favor utilice el Administrador de "
+"No tiene instalado el paquete %s. 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"
+#: src/livewp-settings.c:646
+msgid "download more video"
msgstr ""
-"No tiene instalado el paquete Xsnow. Por favor utilice el Administrador de "
-"Aplicaciones para instarlo."
+
+#~ msgid "Sound"
+#~ msgstr "Sonido"
+
+#, fuzzy
+#~ msgid ""
+#~ "You haven't got the installed package 'Sherman's Aquarium'. Please "
+#~ "install it via using Application Manager"
+#~ msgstr ""
+#~ "No tiene instalado el paquete Xsnow. Por favor utilice el Administrador "
+#~ "de Aplicaciones para instarlo."
+
+#, fuzzy
+#~ msgid ""
+#~ "You haven't got the installed package Xscreensaver. Please install it via "
+#~ "using Application Manager"
+#~ msgstr ""
+#~ "No tiene instalado el paquete Xsnow. Por favor utilice el Administrador "
+#~ "de Aplicaciones para instarlo."
projects / livewp / blobdiff