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"
+"POT-Creation-Date: 2010-09-04 17:46+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"
"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:512
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
+#: src/livewp-settings.c:232 src/livewp-settings.c:286
+#: src/livewp-settings.c:304 src/livewp-settings.c:764
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
+#: src/livewp-settings.c:222 src/livewp-settings.c:283
+#: src/livewp-settings.c:292 src/livewp-settings.c:758
msgid "Berlin"
msgstr "Berliini"
-#: src/livewp-settings.c:358
+#: src/livewp-settings.c:368
msgid "Category"
msgstr "Kategoria"
-#: src/livewp-settings.c:419
+#: src/livewp-settings.c:429
msgid "Enable"
msgstr "Ota käyttöön"
-#: src/livewp-config.c:34 src/livewp-config.c:86 src/livewp-config.c:151
+#: src/livewp-config.c:34 src/livewp-config.c:90 src/livewp-config.c:154
+#: src/livewp-config.c:173 src/livewp-config.c:195
#, c-format
msgid "Failed to initialize GConf. Quitting.\n"
msgstr "GConf asetus epäonnistui. Lopetetaan.\n"
-#: src/livewp-settings.c:443
+#: src/livewp-settings.c:497
msgid "Live Wallpaper Settings"
msgstr "Elävän taustakuvan asetukset"
-#: src/livewp-settings.c:37
+#: 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 and for icons Andrew "
+"Zhilin\n"
" Translators:\n"
" Finnish - Marko Vertainen\n"
" Spain - Alejandro López\n"
+" Italian - Emanuele Cassioli\n"
" Russian - Tanya Makova \n"
" Vlad Vasiliev\n"
msgstr ""
-"Live Wallpaper Versio 0.8.2 \n"
+"Live Wallpaper Versio %s \n"
" Copyright(c) 2010\n"
" Tanya Makova\n"
" Vlad Vasiliev\n"
" Venäjä - Tanya Makova \n"
" Vlad Vasiliev\n"
-<<<<<<< HEAD
-#: src/livewp-settings.c:557
-=======
-#: src/livewp-settings.c:558
->>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
+#: src/livewp-main.c:291
+msgid "Loading Livewallpaper scene ..."
+msgstr ""
+
+#: src/livewp-settings.c:613
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
+#: src/livewp-settings.c:228 src/livewp-settings.c:285
+#: src/livewp-settings.c:300 src/livewp-settings.c:762
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:225 src/livewp-settings.c:284
+#: src/livewp-settings.c:296 src/livewp-settings.c:760
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:500
+msgid "One theme in all views"
+msgstr ""
-#: src/livewp-settings.c:547 src/livewp-settings.c:550
->>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
+#: src/livewp-settings.c:602 src/livewp-settings.c:605
msgid "Play file"
msgstr "Valitse videoleike"
-#: src/livewp-settings.c:531
+#: src/livewp-settings.c:587
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
+#: src/livewp-settings.c:706
msgid "Save"
msgstr "Tallenna"
-#: src/livewp-settings.c:563
->>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
+#: src/livewp-settings.c:621
msgid "Sound"
msgstr "Ääni"
-#: src/livewp-settings.c:340
+#: src/livewp-settings.c:350
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
+#: src/livewp-settings.c:235 src/livewp-settings.c:287
+#: src/livewp-settings.c:308 src/livewp-settings.c:766
msgid "Video"
msgstr "Video"
-#: src/livewp-settings.c:595
+#: src/livewp-settings.c:658
msgid "View Settings"
msgstr "Näkymän asetukset"
-#: src/livewp-settings.c:653
+#: src/livewp-settings.c:716
msgid "Xsnow"
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
+#: src/livewp-settings.c:635
+#, fuzzy, c-format
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."
-
-#: 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."
-
-<<<<<<< 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 "
+"You haven't got the installed package %s. Please install it via using "
"Application Manager"
msgstr ""
"Et ole asentanut Xsnow pakettia. Voit asentaa sen Sovellusten hallinnalla."
+
+#~ 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."
+
+#~ msgid ""
+#~ "You haven't got the installed package Xscreensaver. Please install it via "
+#~ "using Application Manager"
+#~ msgstr ""
+#~ "Xscreensaver pakettia ei ole asennettu. Voit asentaa sen Sovellusten "
+#~ "hallinnalla."
projects / livewp / blobdiff