added Italian translation

[livewp] / applet / po / pl_PL.po

diff --git a/applet/po/pl_PL.po b/applet/po/pl_PL.po
index 601d7a7..c7badbb 100644 (file)
--- a/applet/po/pl_PL.po
+++ b/applet/po/pl_PL.po
@@ -8,11 +8,7 @@ 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
+"POT-Creation-Date: 2010-08-27 07:54+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,52 +17,40 @@ 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: src/livewp-settings.c:358
+#: src/livewp-settings.c:357
 msgid "Category"
 msgstr ""
 
-#: src/livewp-settings.c:419
+#: src/livewp-settings.c:418
 msgid "Enable"
 msgstr ""
 
-#: 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 ""
 
-#: src/livewp-settings.c:443
+#: src/livewp-settings.c:442
 msgid "Live Wallpaper Settings"
 msgstr ""
 
 #: src/livewp-settings.c:37
 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"
@@ -76,115 +60,61 @@ msgid ""
 " Translators:\n"
 " Finnish - Marko Vertainen\n"
 " Spain  - Alejandro López\n"
+" Italian  - Emanuele Cassioli\n"
 " Russian - Tanya Makova \n"
 "           Vlad Vasiliev\n"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/livewp-settings.c:557
-=======
-#: src/livewp-settings.c:558
->>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
+#: src/livewp-settings.c:556
 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
+#: src/livewp-settings.c:217 src/livewp-settings.c:274
+#: src/livewp-settings.c:289 src/livewp-settings.c:705
 msgid "Matrix"
 msgstr ""
 
-#: 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 ""
 
-#: 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
+#: src/livewp-settings.c:545 src/livewp-settings.c:548
 msgid "Play file"
 msgstr ""
 
-#: src/livewp-settings.c:531
+#: src/livewp-settings.c:530
 msgid "Rich Animation"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/livewp-settings.c:643
-msgid "Save"
-msgstr ""
-
-#: src/livewp-settings.c:565
-=======
-#: src/livewp-settings.c:641
+#: src/livewp-settings.c:649
 msgid "Save"
 msgstr ""
 
-#: 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 ""
 
-#: src/livewp-settings.c:224 src/livewp-settings.c:277
-<<<<<<< HEAD
-#: src/livewp-settings.c:298 src/livewp-settings.c:681
-msgid "Video"
-msgstr ""
-
-#: src/livewp-settings.c:595
-msgid "View Settings"
-msgstr ""
-
-#: src/livewp-settings.c:653
-msgid "Xsnow"
-msgstr ""
-
-#: src/livewp-settings.c:665
-=======
-#: src/livewp-settings.c:298 src/livewp-settings.c:679
+#: src/livewp-settings.c:224 src/livewp-settings.c:276
+#: src/livewp-settings.c:297 src/livewp-settings.c:709
 msgid "Video"
 msgstr ""
 
-#: src/livewp-settings.c:593
+#: src/livewp-settings.c:601
 msgid "View Settings"
 msgstr ""
 
-#: src/livewp-settings.c:651
+#: src/livewp-settings.c:659
 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"
-msgstr ""
-
-#: src/livewp-settings.c:249
-msgid ""
-"You haven't got the installed package Xscreensaver. Please install it via "
-"using Application Manager"
-msgstr ""
-
-<<<<<<< HEAD
-#: src/livewp-settings.c:656
-=======
-#: src/livewp-settings.c:654
->>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
+#: src/livewp-settings.c:578
+#, c-format
 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 ""