X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=applet%2Fpo%2Fes_MX.po;h=9034f770b7bacfc06f61d83dfa7638cd86025e58;hb=94adac731c40b8205fdcb056fa7f9c1a17dcc319;hp=7ca56752a034c6e3d572d378c680707f616876f0;hpb=6140b2c93aff8ade097deb5a3d632ac591bdb996;p=livewp diff --git a/applet/po/es_MX.po b/applet/po/es_MX.po index 7ca5675..9034f77 100644 --- 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-27 07:54+0300\n" "PO-Revision-Date: \n" "Last-Translator: Alejandro López \n" "Language-Team: \n" @@ -15,53 +11,41 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: \n" -#: src/livewp-settings.c:33 src/livewp-settings.c:469 +#: src/livewp-settings.c:33 src/livewp-settings.c:468 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:221 src/livewp-settings.c:275 +#: src/livewp-settings.c:293 src/livewp-settings.c:707 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 +#: src/livewp-settings.c:211 src/livewp-settings.c:272 +#: src/livewp-settings.c:281 src/livewp-settings.c:701 msgid "Berlin" msgstr "Berlín" -#: src/livewp-settings.c:358 +#: src/livewp-settings.c:357 msgid "Category" msgstr "Categoría" -#: src/livewp-settings.c:419 +#: src/livewp-settings.c:418 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:91 src/livewp-config.c:156 #, 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:442 msgid "Live Wallpaper Settings" 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 +"Live Wallpaper Version 0.9 \n" " Copyright(c) 2010\n" " Tanya Makova\n" " Vlad Vasiliev\n" @@ -71,6 +55,7 @@ msgid "" " Translators:\n" " Finnish - Marko Vertainen\n" " Spain - Alejandro López\n" +" Italian - Emanuele Cassioli\n" " Russian - Tanya Makova \n" " Vlad Vasiliev\n" msgstr "" @@ -87,120 +72,75 @@ msgstr "" " Ruso - Tanya Makova \n" " Vlad Vasiliev\n" -<<<<<<< HEAD -#: src/livewp-settings.c:557 -======= -#: src/livewp-settings.c:558 ->>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5 +#: src/livewp-settings.c:556 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:217 src/livewp-settings.c:274 +#: src/livewp-settings.c:289 src/livewp-settings.c:705 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:214 src/livewp-settings.c:273 +#: src/livewp-settings.c:285 src/livewp-settings.c:703 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 +#: src/livewp-settings.c:545 src/livewp-settings.c:548 msgid "Play file" msgstr "Ejecutar fichero" -#: src/livewp-settings.c:531 +#: src/livewp-settings.c:530 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 +#: src/livewp-settings.c:649 msgid "Save" msgstr "Guardar" -#: src/livewp-settings.c:563 ->>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5 +#: src/livewp-settings.c:564 msgid "Sound" msgstr "" -#: src/livewp-settings.c:340 +#: src/livewp-settings.c:339 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 +#: src/livewp-settings.c:224 src/livewp-settings.c:276 +#: src/livewp-settings.c:297 src/livewp-settings.c:709 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 +#: src/livewp-settings.c:601 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 +#: src/livewp-settings.c:659 msgid "Xsnow" msgstr "Xsnow" -#: src/livewp-settings.c:663 ->>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5 -#, fuzzy +#: src/livewp-settings.c:578 +#, 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. Please install it via using " +"Application Manager" msgstr "" "No tiene instalado el paquete Xsnow. Por favor utilice el Administrador de " "Aplicaciones para instarlo." -#: src/livewp-settings.c:249 #, 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." +#~ 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." -<<<<<<< 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" -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."