Merge translation files from master branch.

1 files changed, 18 insertions, 24 deletions

diff --git a/po/sr@Latn/kipiplugin_flickrexport.po b/po/sr@Latn/kipiplugin_flickrexport.po
index f60215c..37b8af8 100644
--- a/po/sr@Latn/kipiplugin_flickrexport.po
+++ b/po/sr@Latn/kipiplugin_flickrexport.po
@@ -4,24 +4,25 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kipiplugin_flickrexport\n"
-"POT-Creation-Date: 2008-09-15 08:37+0200\n"
+"POT-Creation-Date: 2019-03-19 18:32+0100\n"
 "PO-Revision-Date: 2007-07-18 12:38+0200\n"
 "Last-Translator: Slobodan Simic <[email protected]>\n"
 "Language-Team: Serbian <[email protected]>\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>"
-"=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Slobodan Simić"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -37,11 +38,11 @@ msgstr "Proveravam da li je prethodno obeležje još važeće"
 
 #: flickrtalker.cpp:203
 msgid ""
-"Please Follow through the instructions in the browser window and return back to "
-"press ok if you are authenticated or press No"
+"Please Follow through the instructions in the browser window and return back "
+"to press ok if you are authenticated or press No"
 msgstr ""
-"Pratite uputstva u prozoru pregledača pa se vratite i pritisnite U redu ako ste "
-"se autentifikovali ili pritisnite Ne"
+"Pratite uputstva u prozoru pregledača pa se vratite i pritisnite U redu ako "
+"ste se autentifikovali ili pritisnite Ne"
 
 #: flickrtalker.cpp:205
 #, fuzzy
@@ -151,8 +152,7 @@ msgid ""
 msgstr "brisanje"
 
 #: flickrtalker.cpp:720
-msgid ""
-"Your token is invalid. Would you like to get a new token to proceed ?\n"
+msgid "Your token is invalid. Would you like to get a new token to proceed ?\n"
 msgstr ""
 "Vaše obeležje nije ispravno. Želite li da dobijete novo da biste nastavili?\n"
 
@@ -170,9 +170,8 @@ msgstr "Neuspeo upit za podacima slike"
 
 #: flickrwidget.cpp:78
 msgid ""
-"<qt><b>"
-"<h2><a href='http://www.flickr.com'><font color=\"#0065DE\">flick</font>"
-"<font color=\"#FF0084\">r</font></a> Export</h2></b></qt>"
+"<qt><b><h2><a href='http://www.flickr.com'><font color=\"#0065DE\">flick</"
+"font><font color=\"#FF0084\">r</font></a> Export</h2></b></qt>"
 msgstr ""
 
 #: flickrwidget.cpp:95
@@ -319,32 +318,27 @@ msgstr "Lozinka:"
 msgid "Export to Flickr..."
 msgstr "Izvezi u Flickr..."
 
-#. i18n: file flickralbumdialog.ui line 16
-#: rc.cpp:3
+#: flickralbumdialog.ui:16
 #, no-c-format
 msgid "New PhotoSet"
 msgstr "Novi komplet slika"
 
-#. i18n: file flickralbumdialog.ui line 36
-#: rc.cpp:6
+#: flickralbumdialog.ui:36
 #, no-c-format
 msgid "<h3>Create New PhotoSet </h3>"
 msgstr "<h3>Napravi novi komplet slika </h3>"
 
-#. i18n: file flickralbumdialog.ui line 66
-#: rc.cpp:9
+#: flickralbumdialog.ui:66
 #, no-c-format
 msgid "Title (optional):"
 msgstr "Naslov (opciono):"
 
-#. i18n: file flickralbumdialog.ui line 74
-#: rc.cpp:12
+#: flickralbumdialog.ui:74
 #, no-c-format
 msgid "Name (optional):"
 msgstr "Ime (opciono):"
 
-#. i18n: file flickralbumdialog.ui line 82
-#: rc.cpp:15
+#: flickralbumdialog.ui:82
 #, no-c-format
 msgid "Caption (optional):"
 msgstr "Natpis (opciono):"