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

[livewp] / applet / po / fi_FI.po

diff --git a/applet/po/fi_FI.po b/applet/po/fi_FI.po
index 5171026..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"
 
@@ -49,7 +62,11 @@ msgstr "Elävän taustakuvan asetukset"
 
 #: 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"
@@ -74,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"
 
@@ -96,11 +129,19 @@ 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 "Ääni"
 
@@ -109,6 +150,22 @@ 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"
+
+#: src/livewp-settings.c:595
+msgid "View Settings"
+msgstr "Näkymän asetukset"
+
+#: src/livewp-settings.c:653
+msgid "Xsnow"
+msgstr "Xsnow"
+
+#: src/livewp-settings.c:665
+#, fuzzy
+=======
 #: src/livewp-settings.c:298 src/livewp-settings.c:679
 msgid "Video"
 msgstr "Video"
@@ -122,6 +179,7 @@ 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"
@@ -130,13 +188,21 @@ msgstr ""
 "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 "
 "Application Manager"