Fix merge conflict.

po/pl.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-20 18:53+0000\n"
+"POT-Creation-Date: 2010-06-23 06:09+0000\n"
 "PO-Revision-Date: 2010-06-11 21:59+0200\n"
 "Last-Translator: Łukasz Jernaś <deejay1@srem.org>\n"
 "Language-Team: Polish <gnomepl@aviary.pl>\n"
@@ -44,30 +44,94 @@ msgstr "Zostanie wyświetlone powiadomienie w momencie zakończenia."
 msgid "Dismiss"
 msgstr "Porzuć"
 
-#: ../SparkleShare/SparkleDialog.cs:156
+#: ../SparkleShare/SparkleDialog.cs:157
 #, csharp-format
 msgid "Something went wrong while syncing ‘{0}’"
 msgstr "Wystąpił błąd w trakcie synchronizowania „{0}”"
 
-#: ../SparkleShare/SparkleDialog.cs:166
+#: ../SparkleShare/SparkleDialog.cs:167
 msgid "Try Again…"
 msgstr "Spróbuj ponownie…"
 
-#: ../SparkleShare/SparkleDialog.cs:196
+#: ../SparkleShare/SparkleDialog.cs:197
 #, csharp-format
 msgid "Successfully synced folder ‘{0}’"
 msgstr "Poprawnie zsynchronizowano katalog „{0}”"
 
-#: ../SparkleShare/SparkleDialog.cs:197
+#: ../SparkleShare/SparkleDialog.cs:198
 msgid "Now make great stuff happen!"
 msgstr "Teraz możesz zacząć czynić wielkie rzeczy!"
 
 #. Add a button to open the folder where the changed file is
-#: ../SparkleShare/SparkleDialog.cs:199 ../SparkleShare/SparkleRepo.cs:316
+#: ../SparkleShare/SparkleDialog.cs:200 ../SparkleShare/SparkleRepo.cs:319
 #: ../SparkleShare/SparkleWindow.cs:62
 msgid "Open Folder"
 msgstr "Otwórz katalog"
 
+#: ../SparkleShare/SparkleHelpers.cs:159
+#, csharp-format
+msgid "a second ago"
+msgid_plural "{0} seconds ago"
+msgstr[0] "sekundę temu"
+msgstr[1] "{0} sekundy temu"
+msgstr[2] "{0} sekund temu"
+
+#: ../SparkleShare/SparkleHelpers.cs:165
+#, csharp-format
+msgid "a minute ago"
+msgid_plural "about {0} minutes ago"
+msgstr[0] "minutę temu"
+msgstr[1] "około {0} minuty temu"
+msgstr[2] "około {0} minut temu"
+
+#: ../SparkleShare/SparkleHelpers.cs:171
+#, csharp-format
+msgid "about an hour ago"
+msgid_plural "about {0} minutes ago"
+msgstr[0] "około godzinę temu"
+msgstr[1] "około {0} godziny temu"
+msgstr[2] "około {0} godzin temu"
+
+#: ../SparkleShare/SparkleHelpers.cs:177
+#, csharp-format
+msgid "yesterday"
+msgid_plural "{0} days ago"
+msgstr[0] "wczoraj"
+msgstr[1] "{0} dni temu"
+msgstr[2] "{0} dni temu"
+
+#: ../SparkleShare/SparkleHelpers.cs:183 ../SparkleShare/SparkleHelpers.cs:189
+#, csharp-format
+msgid "a month ago"
+msgid_plural "{0} months ago"
+msgstr[0] "miesiąc temu"
+msgstr[1] "{0} miesiące temu"
+msgstr[2] "{0} miesięcy temu"
+
+#: ../SparkleShare/SparkleHelpers.cs:194
+#, csharp-format
+msgid "a year ago"
+msgid_plural "{0} years ago"
+msgstr[0] "rok temu"
+msgstr[1] "{0} lata temu"
+msgstr[2] "{0} lat temu"
+
+#: ../SparkleShare/SparkleHelpers.cs:203
+msgid "Hold your ponies!"
+msgstr "Wstrzymaj konie!"
+
+#: ../SparkleShare/SparkleHelpers.cs:204
+msgid ""
+"SparkleShare is known to be insanely fast with \n"
+"pictures of unicorns. Please make sure your internets\n"
+"are upgraded to the latest version to avoid problems."
+msgstr ""
+"Program SparkleShare jest znany z niesamowitej szybkośc\n"
+"\r\n"
+"przy wysyłaniu obrazków z jednorożcami.\n"
+"\r\n"
+"Dopilnuj, by Twój internet był w najnowszej wersji, aby uniknąć problemów."
+
 #: ../SparkleShare/SparkleShare.cs:50
 msgid "Git wasn't found."
 msgstr "Nie znaleziono programu Git."
@@ -118,7 +182,7 @@ msgstr "Parametry:"
 
 #: ../SparkleShare/SparkleShare.cs:99
 msgid "\t -d, --disable-gui\tDon't show the notification icon."
-msgstr "\t -d, --disable-gui\tWyłączenie wyświetlania ikony w obszarze powiadamiania."
+msgstr "\t -d, --disable-gui\tWyłącza wyświetlanie ikony w obszarze powiadamiania."
 
 #: ../SparkleShare/SparkleShare.cs:100
 msgid "\t -h, --help\t\tDisplay this help text."