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

[livewp] / applet / po / pl_PL.po

diff --git a/applet/po/pl_PL.po b/applet/po/pl_PL.po
index 53d5be9..601d7a7 100644 (file)
--- a/applet/po/pl_PL.po
+++ b/applet/po/pl_PL.po
@@ -8,7 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE 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: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,12 +26,20 @@ msgid "About"
 msgstr ""
 
 #: 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 ""
 
 #: 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 ""
 
@@ -50,7 +62,11 @@ msgstr ""
 
 #: 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"
@@ -64,21 +80,37 @@ msgid ""
 "           Vlad Vasiliev\n"
 msgstr ""
 
+<<<<<<< HEAD
 #: src/livewp-settings.c:557
+=======
+#: src/livewp-settings.c:558
+>>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
 msgid "Loop"
 msgstr ""
 
 #: 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 ""
 
 #: src/livewp-settings.c:214 src/livewp-settings.c:274
+<<<<<<< HEAD
 #: src/livewp-settings.c:286 src/livewp-settings.c:675
 msgid "Modern"
 msgstr ""
 
 #: src/livewp-settings.c:546 src/livewp-settings.c:549
+=======
+#: src/livewp-settings.c:286 src/livewp-settings.c:673
+msgid "Modern"
+msgstr ""
+
+#: src/livewp-settings.c:547 src/livewp-settings.c:550
+>>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
 msgid "Play file"
 msgstr ""
 
@@ -86,11 +118,19 @@ msgstr ""
 msgid "Rich Animation"
 msgstr ""
 
+<<<<<<< HEAD
 #: src/livewp-settings.c:643
 msgid "Save"
 msgstr ""
 
 #: src/livewp-settings.c:565
+=======
+#: src/livewp-settings.c:641
+msgid "Save"
+msgstr ""
+
+#: src/livewp-settings.c:563
+>>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
 msgid "Sound"
 msgstr ""
 
@@ -99,6 +139,7 @@ msgid "Theme"
 msgstr ""
 
 #: src/livewp-settings.c:224 src/livewp-settings.c:277
+<<<<<<< HEAD
 #: src/livewp-settings.c:298 src/livewp-settings.c:681
 msgid "Video"
 msgstr ""
@@ -112,6 +153,21 @@ msgid "Xsnow"
 msgstr ""
 
 #: src/livewp-settings.c:665
+=======
+#: src/livewp-settings.c:298 src/livewp-settings.c:679
+msgid "Video"
+msgstr ""
+
+#: src/livewp-settings.c:593
+msgid "View Settings"
+msgstr ""
+
+#: src/livewp-settings.c:651
+msgid "Xsnow"
+msgstr ""
+
+#: src/livewp-settings.c:663
+>>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
 msgid ""
 "You haven't got the installed package 'Sherman's Aquarium'. Please install "
 "it via using Application Manager"
@@ -123,7 +179,11 @@ msgid ""
 "using Application Manager"
 msgstr ""
 
+<<<<<<< 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"