[frogr] Refreshed .pot files after the removal of intltool



commit a6c738165a2d74b70e876107923db9a9b02909f0
Author: Mario Sanchez Prada <msanchez gnome org>
Date:   Fri Aug 12 13:13:21 2016 +0100

    Refreshed .pot files after the removal of intltool

 po/bs.po       |  594 +++++++++++++++++--------------------
 po/ca.po       |  517 +++++++++++++-------------------
 po/cs.po       |  575 ++++++++++++++++--------------------
 po/da.po       |  650 +++++++++++++++++++++--------------------
 po/de.po       |  575 ++++++++++++++++--------------------
 po/el.po       |  613 ++++++++++++++++++--------------------
 po/en_GB.po    |  813 +++++++++++++++++++++++++++++++++++---------------
 po/es.po       |  577 ++++++++++++++++--------------------
 po/fi.po       |  582 ++++++++++++++++---------------------
 po/fr.po       |  585 ++++++++++++++++--------------------
 po/gl.po       |  627 ++++++++++++++++++---------------------
 po/hu.po       |  582 ++++++++++++++++---------------------
 po/id.po       |  592 +++++++++++++++++--------------------
 po/it.po       |  903 +++++++++++++++++++++++++++++++++++++++-----------------
 po/ja.po       |  667 +++++++++++++++++++++--------------------
 po/lv.po       |  696 +++++++++++++++++++++-----------------------
 po/nb.po       |  768 +++++++++++++++++++++++++++--------------------
 po/nn.po       |  774 ++++++++++++++++++++++++++++--------------------
 po/oc.po       |  589 ++++++++++++++++---------------------
 po/pl.po       |  574 ++++++++++++++++--------------------
 po/pt.po       |  577 ++++++++++++++++--------------------
 po/pt_BR.po    |  573 ++++++++++++++++--------------------
 po/ro.po       |  842 +++++++++++++++++++++++++++++++++++++---------------
 po/ru.po       |  730 ++++++++++++++++++++++------------------------
 po/sl.po       |  590 ++++++++++++++++---------------------
 po/sr.po       |  580 ++++++++++++++++---------------------
 po/sr latin po |  585 ++++++++++++++++---------------------
 po/sv.po       |  575 ++++++++++++++++--------------------
 po/te.po       |  607 ++++++++++++++++++--------------------
 po/tr.po       |  587 ++++++++++++++++---------------------
 po/uk.po       |  856 ++++++++++++++++++++++++++++++++++--------------------
 po/zh_CN.po    |  624 ++++++++++++++++++---------------------
 32 files changed, 10298 insertions(+), 10281 deletions(-)
---
diff --git a/po/bs.po b/po/bs.po
index 64f7b68..d151cae 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bosnianuniversetranslation\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=frogr&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-02-27 05:46+0000\n"
+"Report-Msgid-Bugs-To: msanchez gnome org\n"
+"POT-Creation-Date: 2016-08-12 13:09+0100\n"
 "PO-Revision-Date: 2015-01-10 11:57+0100\n"
 "Last-Translator: Samir Ribic <samir ribic etf unsa ba>\n"
 "Language-Team: Bosnian <bs li org>\n"
@@ -16,20 +15,32 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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"
 "X-Generator: Launchpad (build 17341)\n"
 "X-Launchpad-Export-Date: 2015-02-15 06:14+0000\n"
 
-#: ../data/frogr.appdata.xml.in.h:1
+#: data/frogr.appdata.xml.in:5 data/frogr.desktop.in.in:5
+#: data/frogr.desktop.in.in:14
+#, fuzzy
+msgid "frogr"
+msgstr "Frogr"
+
+#: data/frogr.appdata.xml.in:6 data/frogr.desktop.in.in:6
+#, fuzzy
+msgid "frogr: a Flickr Remote Organizer for GNOME"
+msgstr "Frogr: Flickr remote organizator za GNOME"
+
+#: data/frogr.appdata.xml.in:8
+#, fuzzy
 msgid ""
-"Frogr is a small application for the GNOME desktop that allows users to "
+"frogr is a small application for the GNOME desktop that allows users to "
 "manage their accounts in the Flickr image hosting website."
 msgstr ""
 "Frogr je mala aplikacija za GNOME desktop koja omogućuje korisnicima da "
 "upravljaju svojim nalozima na Flickr sistemu za čuvanje slika."
 
-#: ../data/frogr.appdata.xml.in.h:2
+#: data/frogr.appdata.xml.in:13
 msgid ""
 "It supports all the basic Flickr features, including uploading pictures, "
 "adding descriptions, setting tags and managing sets and groups pools."
@@ -37,76 +48,76 @@ msgstr ""
 "Podržava osnovne Flickr mogućnosti, uključujući slanje slika, dodavanje "
 "opisa, postavljanje oznaka i upravljanje skupovima i grupama."
 
-#: ../data/frogr.desktop.in.in.h:1
-msgid "Frogr"
-msgstr "Frogr"
+#: data/frogr.appdata.xml.in:24
+#, fuzzy
+msgid "Screenshot of frogr"
+msgstr "Slika ekrana"
 
-#: ../data/frogr.desktop.in.in.h:2
-msgid "Frogr: a Flickr Remote Organizer for GNOME"
-msgstr "Frogr: Flickr remote organizator za GNOME"
+#: data/frogr.appdata.xml.in:29
+msgid "Mario Sanchez Prada"
+msgstr ""
 
-#: ../data/frogr.desktop.in.in.h:3
+#: data/frogr.desktop.in.in:7
 msgid "Upload and organize photos in Flickr accounts"
 msgstr "Šalji i organiziraj fotografije u  Flickr nalozima"
 
-#: ../data/frogr.desktop.in.in.h:4
+#: data/frogr.desktop.in.in:8
 msgid "Flickr;Image;Picture;Photo;Video;Uploader;"
 msgstr "Flickr;Slika;Slika;Fotografija;Video;Uploader;"
 
-#: ../src/frogr-about-dialog.c:43
-msgid "A Flickr remote organizer for GNOME\n"
+#: src/frogr-about-dialog.c:43
+#, fuzzy
+msgid "A Flickr Remote Organizer for GNOME\n"
 msgstr "Flickr remote organizator za GNOME\n"
 
-#: ../src/frogr-about-dialog.c:72
+#: src/frogr-about-dialog.c:72
 msgid "translator-credits"
 msgstr ""
 "   Eldar Granulo https://launchpad.net/~egranulo2\n";
 "  Samir Ribić https://launchpad.net/~megaribi";
 
-#: ../src/frogr-add-tags-dialog.c:198 ../src/frogr-add-to-group-dialog.c:552
-#: ../src/frogr-add-to-set-dialog.c:553 ../src/frogr-auth-dialog.c:153
-#: ../src/frogr-create-new-set-dialog.c:329 ../src/frogr-details-dialog.c:1195
-#: ../src/frogr-main-view.c:457 ../src/frogr-main-view.c:1612
-#: ../src/frogr-main-view.c:1691 ../src/frogr-main-view.c:1743
-#: ../src/frogr-settings-dialog.c:961
+#: src/frogr-add-tags-dialog.c:191 src/frogr-add-to-group-dialog.c:528
+#: src/frogr-add-to-set-dialog.c:529 src/frogr-auth-dialog.c:153
+#: src/frogr-create-new-set-dialog.c:310 src/frogr-details-dialog.c:1168
+#: src/frogr-main-view.c:1543 src/frogr-main-view.c:1618
+#: src/frogr-main-view.c:1670 src/frogr-settings-dialog.c:930
 msgid "_Cancel"
 msgstr "_Otkaži"
 
-#: ../src/frogr-add-tags-dialog.c:200 ../src/frogr-add-to-group-dialog.c:554
-#: ../src/frogr-add-to-set-dialog.c:555
-#: ../src/frogr-create-new-set-dialog.c:331
+#: src/frogr-add-tags-dialog.c:193 src/frogr-add-to-group-dialog.c:530
+#: src/frogr-add-to-set-dialog.c:531 src/frogr-create-new-set-dialog.c:312
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: ../src/frogr-add-tags-dialog.c:209
+#: src/frogr-add-tags-dialog.c:202
 msgid "Enter a spaces separated list of tags:"
 msgstr "Unesite listu oznaka razdvojenu razmacima:"
 
-#: ../src/frogr-add-tags-dialog.c:235
+#: src/frogr-add-tags-dialog.c:228
 msgid "Add Tags"
 msgstr "Dodaj oznake"
 
-#: ../src/frogr-add-to-group-dialog.c:154
+#: src/frogr-add-to-group-dialog.c:147
 msgid "Name"
 msgstr "Ime"
 
-#: ../src/frogr-add-to-group-dialog.c:169 ../src/frogr-add-to-set-dialog.c:170
+#: src/frogr-add-to-group-dialog.c:162 src/frogr-add-to-set-dialog.c:163
 msgid "Elements"
 msgstr "Elementi"
 
-#: ../src/frogr-add-to-group-dialog.c:605
+#: src/frogr-add-to-group-dialog.c:581
 msgid "Add to Groups"
 msgstr "Dodaj u grupe"
 
-#: ../src/frogr-add-to-set-dialog.c:155
+#: src/frogr-add-to-set-dialog.c:148
 msgid "Title"
 msgstr "Naslov"
 
-#: ../src/frogr-add-to-set-dialog.c:606
+#: src/frogr-add-to-set-dialog.c:582
 msgid "Add to Sets"
 msgstr "Dodaj u skupove"
 
-#: ../src/frogr-auth-dialog.c:59
+#: src/frogr-auth-dialog.c:59
 #, c-format
 msgid ""
 "Please press the button to authorize %s and then come back to complete the "
@@ -115,29 +126,29 @@ msgstr ""
 "Molim vas pritisnite dugme da odobrite %s i onda se vratite da završite "
 "proces."
 
-#: ../src/frogr-auth-dialog.c:63 ../src/frogr-auth-dialog.c:149
+#: src/frogr-auth-dialog.c:63 src/frogr-auth-dialog.c:149
+#: src/frogr-controller.c:2286
 #, c-format
 msgid "Authorize %s"
 msgstr "Odobrite %s"
 
-#: ../src/frogr-auth-dialog.c:155 ../src/frogr-settings-dialog.c:963
+#: src/frogr-auth-dialog.c:155 src/frogr-settings-dialog.c:932
 msgid "_Close"
 msgstr "_Zatvori"
 
-#. Description label
-#: ../src/frogr-auth-dialog.c:167
+#: src/frogr-auth-dialog.c:167
 msgid "Enter verification code:"
 msgstr "Unesite kod za verifikaciju:"
 
-#: ../src/frogr-auth-dialog.c:221
+#: src/frogr-auth-dialog.c:221
 msgid "Invalid verification code"
 msgstr "Pogrešan verifikacijski kod"
 
-#: ../src/frogr-controller.c:597
+#: src/frogr-controller.c:581
 msgid "Process cancelled"
 msgstr "Proces otkazan"
 
-#: ../src/frogr-controller.c:602
+#: src/frogr-controller.c:586
 msgid ""
 "Connection error:\n"
 "Network not available"
@@ -145,7 +156,7 @@ msgstr ""
 "Greška u povezivanju\n"
 "Mreža nije dostupna"
 
-#: ../src/frogr-controller.c:606
+#: src/frogr-controller.c:590
 msgid ""
 "Connection error:\n"
 "Bad request"
@@ -153,7 +164,7 @@ msgstr ""
 "Greška u povezivanju\n"
 "Loš zahtjev"
 
-#: ../src/frogr-controller.c:610
+#: src/frogr-controller.c:594
 msgid ""
 "Connection error:\n"
 "Server-side error"
@@ -161,7 +172,7 @@ msgstr ""
 "Greška u povezivanju:\n"
 "Greška od strane servera"
 
-#: ../src/frogr-controller.c:614
+#: src/frogr-controller.c:598
 msgid ""
 "Error uploading:\n"
 "File invalid"
@@ -169,7 +180,7 @@ msgstr ""
 "Greška u postavljanju:\n"
 "Datoteka nije validna"
 
-#: ../src/frogr-controller.c:618
+#: src/frogr-controller.c:602
 msgid ""
 "Error uploading picture:\n"
 "Quota exceeded"
@@ -177,7 +188,7 @@ msgstr ""
 "Greška u postavljanju slike:\n"
 "Kvota prevršena"
 
-#: ../src/frogr-controller.c:623
+#: src/frogr-controller.c:607
 #, c-format
 msgid "Quota exceeded (limit: %d video per month)"
 msgid_plural "Quota exceeded (limit: %d videos per month)"
@@ -185,7 +196,7 @@ msgstr[0] "Kvota prevršena(ograničenje: %d snimak mjesečno)"
 msgstr[1] "Kvota prevršena(ograničenje %d snimka mjesečno)"
 msgstr[2] "Kvota prevršena(ograničenje %d snimaka mjesečno)"
 
-#: ../src/frogr-controller.c:627
+#: src/frogr-controller.c:611
 msgid ""
 "Error uploading video:\n"
 "You can't upload more videos with this account"
@@ -193,7 +204,7 @@ msgstr ""
 "Greška pri postavljanju snimka:\n"
 "Ne možete postaviti više snimaka sa ovim nalogom."
 
-#: ../src/frogr-controller.c:633
+#: src/frogr-controller.c:617
 msgid ""
 "Error:\n"
 "Photo not found"
@@ -201,7 +212,7 @@ msgstr ""
 "Greška:\n"
 "Fotografija nije pronađena."
 
-#: ../src/frogr-controller.c:637
+#: src/frogr-controller.c:621
 msgid ""
 "Error:\n"
 "Photo already in photoset"
@@ -209,7 +220,7 @@ msgstr ""
 "Greška:\n"
 "Fotografija već u skupu fotografija."
 
-#: ../src/frogr-controller.c:641
+#: src/frogr-controller.c:625
 msgid ""
 "Error:\n"
 "Photo already in group"
@@ -217,7 +228,7 @@ msgstr ""
 "Greška:\n"
 "Fotografija već  u grupi"
 
-#: ../src/frogr-controller.c:645
+#: src/frogr-controller.c:629
 msgid ""
 "Error:\n"
 "Photo already in the maximum number of groups possible"
@@ -225,7 +236,7 @@ msgstr ""
 "Greška:\n"
 "Fotografija je već u maksimalnom mogućem broju grupa"
 
-#: ../src/frogr-controller.c:649
+#: src/frogr-controller.c:633
 msgid ""
 "Error:\n"
 "Group limit already reached"
@@ -233,7 +244,7 @@ msgstr ""
 "Grešla:\n"
 "Već je dostignut limit grupa"
 
-#: ../src/frogr-controller.c:653
+#: src/frogr-controller.c:637
 msgid ""
 "Error:\n"
 "Photo added to group's queue"
@@ -241,7 +252,7 @@ msgstr ""
 "Greška:\n"
 "Fotografija dodata u red grupe"
 
-#: ../src/frogr-controller.c:657
+#: src/frogr-controller.c:641
 msgid ""
 "Error:\n"
 "Photo already added to group's queue"
@@ -249,7 +260,7 @@ msgstr ""
 "Greška:\n"
 "Fotografija već dodata u red grupe"
 
-#: ../src/frogr-controller.c:661
+#: src/frogr-controller.c:645
 msgid ""
 "Error:\n"
 "Content not allowed for this group"
@@ -257,8 +268,7 @@ msgstr ""
 "Greška:\n"
 "Sadržaj nije dozvoljen u ovoj grupi"
 
-#: ../src/frogr-controller.c:665
-#, c-format
+#: src/frogr-controller.c:649
 msgid ""
 "Authorization failed.\n"
 "Please try again"
@@ -266,7 +276,7 @@ msgstr ""
 "Autorizacija nije uspjela.\n"
 "Molim pokušajte ponovo"
 
-#: ../src/frogr-controller.c:671
+#: src/frogr-controller.c:655
 #, c-format
 msgid ""
 "Error\n"
@@ -277,8 +287,7 @@ msgstr ""
 "%s nema odgovarajuće odobrenje za postavljanje slika na Flickr.\n"
 "Molimo ponovo odobrite"
 
-#: ../src/frogr-controller.c:676
-#, c-format
+#: src/frogr-controller.c:660
 msgid ""
 "Unable to authenticate in Flickr\n"
 "Please try again."
@@ -286,7 +295,7 @@ msgstr ""
 "Nemoguće provesti provjeru na Flickru.\n"
 "Molim pokušajte ponovo."
 
-#: ../src/frogr-controller.c:680
+#: src/frogr-controller.c:664
 #, c-format
 msgid ""
 "You have not properly authorized %s yet.\n"
@@ -295,8 +304,7 @@ msgstr ""
 "Niste još uvijek pravilno autorizovali %s.\n"
 "Molim pokušajte ponovo."
 
-#: ../src/frogr-controller.c:685
-#, c-format
+#: src/frogr-controller.c:669
 msgid ""
 "Invalid verification code.\n"
 "Please try again."
@@ -304,8 +312,7 @@ msgstr ""
 "Verifikacijski kod nije validan.\n"
 "Molim pokušajte ponovo."
 
-#: ../src/frogr-controller.c:689
-#, c-format
+#: src/frogr-controller.c:673
 msgid ""
 "Error:\n"
 "Service not available"
@@ -313,59 +320,63 @@ msgstr ""
 "Greška:\n"
 "Usluga nije dostupna."
 
-#. General error: just dump the raw error description
-#: ../src/frogr-controller.c:694
+#: src/frogr-controller.c:678
 #, c-format
 msgid "An error happened: %s."
 msgstr "Desila se greška: %s."
 
-#: ../src/frogr-controller.c:910
+#: src/frogr-controller.c:883
 msgid "Authorization failed (timed out)"
 msgstr "Autorizacija nije uspjela(vrijeme isteklo)"
 
-#: ../src/frogr-controller.c:962
+#: src/frogr-controller.c:931
 #, c-format
 msgid "Retrying Upload (attempt %d/%d)…"
 msgstr "Pokušavam ponovno postavljanje(pokušaj %d/%d)"
 
-#: ../src/frogr-controller.c:967
+#: src/frogr-controller.c:936
 #, c-format
 msgid "Uploading '%s'…"
 msgstr "Postavljam %s"
 
-#: ../src/frogr-controller.c:2329
+#: src/frogr-controller.c:2242
 msgid "Updating credentials…"
 msgstr "Ažuriram akreditive…"
 
-#: ../src/frogr-controller.c:2334
+#: src/frogr-controller.c:2247
 msgid "Retrieving data for authorization…"
 msgstr "Preuzimam podatke za autorizaciju"
 
-#: ../src/frogr-controller.c:2339
+#: src/frogr-controller.c:2252
 msgid "Finishing authorization…"
 msgstr "Završavam autorizaciju…"
 
-#: ../src/frogr-controller.c:2344
+#: src/frogr-controller.c:2257
 msgid "Retrieving list of sets…"
 msgstr "Preuzimam listu skupova…"
 
-#: ../src/frogr-controller.c:2349
+#: src/frogr-controller.c:2262
 msgid "Retrieving list of groups…"
 msgstr "Preuzimam listu grupa…"
 
-#: ../src/frogr-controller.c:2354
+#: src/frogr-controller.c:2267
 msgid "Retrieving list of tags…"
 msgstr "Preuzimam listu oznaka…"
 
-#: ../src/frogr-controller.c:2471
+#: src/frogr-controller.c:2292
+#, fuzzy
+msgid "Fetching information"
+msgstr "Postavite informacije o geografskoj _lokaciji"
+
+#: src/frogr-controller.c:2398
 msgid "No sets found"
 msgstr "Nije pronađen nijedan skup"
 
-#: ../src/frogr-controller.c:2498
+#: src/frogr-controller.c:2423
 msgid "No groups found"
 msgstr "Nije pronađena nijedna grupa"
 
-#: ../src/frogr-controller.c:3142
+#: src/frogr-controller.c:2984
 #, c-format
 msgid ""
 "You need to properly authorize %s before uploading any pictures to Flickr.\n"
@@ -375,159 +386,160 @@ msgstr ""
 "Flickr.\n"
 "Molim ponovo provedite autorizaciju."
 
-#: ../src/frogr-controller.c:3152
-#, c-format
+#: src/frogr-controller.c:2994
 msgid "You need to be connected before uploading any pictures to Flickr."
 msgstr "Morate biti konektovani prije postavljanja fotografija na Flickr."
 
-#: ../src/frogr-controller.c:3224
-#, c-format
+#: src/frogr-controller.c:3012
+#, fuzzy
+msgid "Uploading Pictures"
+msgstr "Postavljam %s"
+
+#: src/frogr-controller.c:3057
 msgid "Error opening project file"
 msgstr "Greška pri otvaranju datoteke projekta."
 
-#. This shows a dialog notifying the problem to the user
-#: ../src/frogr-create-new-set-dialog.c:156 ../src/frogr-details-dialog.c:1022
+#: src/frogr-create-new-set-dialog.c:143 src/frogr-details-dialog.c:1001
 msgid "Missing data required"
 msgstr "Potrebni su podaci koji nedostaju"
 
-#: ../src/frogr-create-new-set-dialog.c:345
+#: src/frogr-create-new-set-dialog.c:326
 msgid "Title:"
 msgstr "Naslov:"
 
-#: ../src/frogr-create-new-set-dialog.c:354
+#: src/frogr-create-new-set-dialog.c:335
 msgid "Description:"
 msgstr "Opis:"
 
-#: ../src/frogr-create-new-set-dialog.c:375
+#: src/frogr-create-new-set-dialog.c:356
 msgid "Fill Pictures Details with Title and Description"
 msgstr "Ispunite Detalje Fotografije sa naslovom i opisom"
 
-#: ../src/frogr-create-new-set-dialog.c:400
+#: src/frogr-create-new-set-dialog.c:381
 msgid "Create New Set"
 msgstr "Kreirajte novi skup"
 
-#: ../src/frogr-details-dialog.c:91 ../src/frogr-settings-dialog.c:99
+#: src/frogr-details-dialog.c:89 src/frogr-settings-dialog.c:97
 msgid "Default (as specified in Flickr)"
 msgstr "Osnovno(kao navedeno u Flickr)"
 
-#: ../src/frogr-details-dialog.c:92 ../src/frogr-settings-dialog.c:100
+#: src/frogr-details-dialog.c:90 src/frogr-settings-dialog.c:98
 msgid "All rights reserved"
 msgstr "Sva prava pridržana"
 
-#: ../src/frogr-details-dialog.c:93 ../src/frogr-settings-dialog.c:101
+#: src/frogr-details-dialog.c:91 src/frogr-settings-dialog.c:99
 msgid "CC Attribution-NonCommercial-ShareAlike"
 msgstr "CC Autorstvo-Nekomercijalno-Dijeliti pod istim uslovima"
 
-#: ../src/frogr-details-dialog.c:94 ../src/frogr-settings-dialog.c:102
+#: src/frogr-details-dialog.c:92 src/frogr-settings-dialog.c:100
 msgid "CC Attribution-NonCommercial"
 msgstr "CC Autorstvo-Nekomercijalno"
 
-#: ../src/frogr-details-dialog.c:95 ../src/frogr-settings-dialog.c:103
+#: src/frogr-details-dialog.c:93 src/frogr-settings-dialog.c:101
 msgid "CC Attribution-NonCommercial-NoDerivs"
 msgstr "CC Autorstvo-Nekomercijalno-Bez prerada"
 
-#: ../src/frogr-details-dialog.c:96 ../src/frogr-settings-dialog.c:104
+#: src/frogr-details-dialog.c:94 src/frogr-settings-dialog.c:102
 msgid "CC Attribution"
 msgstr "CC Autorstvo"
 
-#: ../src/frogr-details-dialog.c:97 ../src/frogr-settings-dialog.c:105
+#: src/frogr-details-dialog.c:95 src/frogr-settings-dialog.c:103
 msgid "CC Attribution-ShareAlike"
 msgstr "CC Autorstvo-Dijeliti pod istim uslovima"
 
-#: ../src/frogr-details-dialog.c:98 ../src/frogr-settings-dialog.c:106
+#: src/frogr-details-dialog.c:96 src/frogr-settings-dialog.c:104
 msgid "CC Attribution-NoDerivs"
 msgstr "CC Autorstvo-Bez prerada"
 
-#: ../src/frogr-details-dialog.c:178
+#: src/frogr-details-dialog.c:172
 msgid "Open with image viewer"
 msgstr "Otvorite sa preglednikom slika"
 
-#: ../src/frogr-details-dialog.c:196
+#: src/frogr-details-dialog.c:190
 msgid "_Title:"
 msgstr "_Naslov:"
 
-#: ../src/frogr-details-dialog.c:206
+#: src/frogr-details-dialog.c:200
 msgid "_Description:"
 msgstr "_Opis:"
 
-#: ../src/frogr-details-dialog.c:230
+#: src/frogr-details-dialog.c:224
 msgid "Ta_gs:"
 msgstr "_Oznake:"
 
-#: ../src/frogr-details-dialog.c:253
+#: src/frogr-details-dialog.c:247
 msgid "Visibility"
 msgstr "Vidljivost"
 
-#: ../src/frogr-details-dialog.c:263 ../src/frogr-settings-dialog.c:201
+#: src/frogr-details-dialog.c:257 src/frogr-settings-dialog.c:196
 msgid "_Private"
 msgstr "_Lično"
 
-#: ../src/frogr-details-dialog.c:267 ../src/frogr-settings-dialog.c:204
+#: src/frogr-details-dialog.c:261 src/frogr-settings-dialog.c:199
 msgid "P_ublic"
 msgstr "_Javno"
 
-#: ../src/frogr-details-dialog.c:276 ../src/frogr-settings-dialog.c:212
+#: src/frogr-details-dialog.c:270 src/frogr-settings-dialog.c:207
 msgid "_Family"
 msgstr "_Porodica"
 
-#: ../src/frogr-details-dialog.c:280 ../src/frogr-settings-dialog.c:214
+#: src/frogr-details-dialog.c:274 src/frogr-settings-dialog.c:209
 msgid "F_riends"
 msgstr "P_rijatelji"
 
-#: ../src/frogr-details-dialog.c:294
+#: src/frogr-details-dialog.c:288
 msgid "Content Type"
 msgstr "Tip sadržaja"
 
-#: ../src/frogr-details-dialog.c:302 ../src/frogr-settings-dialog.c:239
+#: src/frogr-details-dialog.c:296 src/frogr-settings-dialog.c:234
 msgid "P_hoto"
 msgstr "F_otografija"
 
-#: ../src/frogr-details-dialog.c:306 ../src/frogr-settings-dialog.c:241
+#: src/frogr-details-dialog.c:300 src/frogr-settings-dialog.c:236
 msgid "Scree_nshot"
 msgstr "Slika ekrana"
 
-#: ../src/frogr-details-dialog.c:310 ../src/frogr-settings-dialog.c:243
+#: src/frogr-details-dialog.c:304 src/frogr-settings-dialog.c:238
 msgid "Oth_er"
 msgstr "Dru_go"
 
-#: ../src/frogr-details-dialog.c:323
+#: src/frogr-details-dialog.c:317
 msgid "Safety Level"
 msgstr "Nivo sigurnosti"
 
-#: ../src/frogr-details-dialog.c:331 ../src/frogr-settings-dialog.c:265
+#: src/frogr-details-dialog.c:325 src/frogr-settings-dialog.c:260
 msgid "S_afe"
 msgstr "S_igurno"
 
-#: ../src/frogr-details-dialog.c:335 ../src/frogr-settings-dialog.c:267
+#: src/frogr-details-dialog.c:329 src/frogr-settings-dialog.c:262
 msgid "_Moderate"
 msgstr "_Srednje"
 
-#: ../src/frogr-details-dialog.c:339 ../src/frogr-settings-dialog.c:269
+#: src/frogr-details-dialog.c:333 src/frogr-settings-dialog.c:264
 msgid "Restr_icted"
 msgstr "Ograniče_no"
 
-#: ../src/frogr-details-dialog.c:351
+#: src/frogr-details-dialog.c:345
 msgid "License Type"
 msgstr "Tip licence"
 
-#: ../src/frogr-details-dialog.c:373
+#: src/frogr-details-dialog.c:367
 msgid "Other Properties"
 msgstr "Ostala svojstva"
 
-#: ../src/frogr-details-dialog.c:381
+#: src/frogr-details-dialog.c:375
 msgid "_Show Up in Global Search Results"
 msgstr "_Prikaži u globalnim rezultatima pretrage"
 
-#: ../src/frogr-details-dialog.c:385
+#: src/frogr-details-dialog.c:379
 msgid "Set Geo_location Information"
 msgstr "Postavite informacije o geografskoj _lokaciji"
 
-#: ../src/frogr-details-dialog.c:389
+#: src/frogr-details-dialog.c:383
 msgid "Replace 'Date Posted' with 'Date Taken'"
 msgstr "Zamijeni Datum postavljanja sa Datumom slikanja"
 
-#. Visually indicate how many pictures are being edited
-#: ../src/frogr-details-dialog.c:484
+#: src/frogr-details-dialog.c:475
 #, c-format
 msgid "(%d Picture)"
 msgid_plural "(%d Pictures)"
@@ -535,25 +547,24 @@ msgstr[0] "(%d Slika)"
 msgstr[1] "(%d Slike)"
 msgstr[2] "(%d Slika)"
 
-#: ../src/frogr-details-dialog.c:558
+#: src/frogr-details-dialog.c:548
 msgid "An error happened trying to load the picture"
 msgstr "Dogodila se greška pri prikazivanju slike"
 
-#: ../src/frogr-details-dialog.c:1196
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:8
+#: src/frogr-details-dialog.c:1169
 msgid "_Edit"
 msgstr "_Izmijeni"
 
-#: ../src/frogr-details-dialog.c:1224
+#: src/frogr-details-dialog.c:1197
 msgid "Edit Picture Details"
 msgstr "Uredite detalje fotografije"
 
-#: ../src/frogr-file-loader.c:148
+#: src/frogr-file-loader.c:142
 #, c-format
 msgid "Loading files %d / %d"
 msgstr "Učitavanje datoteka %d/%d"
 
-#: ../src/frogr-file-loader.c:382
+#: src/frogr-file-loader.c:369
 #, c-format
 msgid ""
 "Unable to load picture %s:\n"
@@ -562,7 +573,7 @@ msgstr ""
 "Nije moguće učitati sliku %s:\n"
 "%s"
 
-#: ../src/frogr-file-loader.c:413
+#: src/frogr-file-loader.c:400
 #, c-format
 msgid ""
 "Unable to load video %s\n"
@@ -571,10 +582,7 @@ msgstr ""
 "Nije moguće učitati snimak %s:\n"
 "Molim provjerite imate li instaliran pravi kodek"
 
-#. First %s is the title of the picture (filename of the file by
-#. default). Second %s is the max allowed size for a picture to bje
-#. uploaded to flickr (different for free and PRO accounts).
-#: ../src/frogr-file-loader.c:654
+#: src/frogr-file-loader.c:636
 #, c-format
 msgid ""
 "Can't load file %s:\n"
@@ -583,150 +591,135 @@ msgstr ""
 "Ne može se učitati datoteka %s:\n"
 "Veličina datoteke je veća nego maksimalna dozvoljena za ovaj nalog(%s)"
 
-#. First create the lift side buttons
-#: ../src/frogr-main-view.c:654 ../src/frogr-main-view.c:756
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
 msgid "Open"
 msgstr "Otvori"
 
-#: ../src/frogr-main-view.c:654 ../src/frogr-main-view.c:756
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
 msgid "Open Existing Project"
 msgstr "Otvori postojeći projekat"
 
-#: ../src/frogr-main-view.c:655 ../src/frogr-main-view.c:759
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
 msgid "Add"
 msgstr "Dodaj"
 
-#: ../src/frogr-main-view.c:655 ../src/frogr-main-view.c:759
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
 msgid "Add Elements"
 msgstr "Dodaj elemente"
 
-#: ../src/frogr-main-view.c:656 ../src/frogr-main-view.c:760
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
 msgid "Remove"
 msgstr "Ukloni"
 
-#: ../src/frogr-main-view.c:656 ../src/frogr-main-view.c:760
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
 msgid "Remove Elements"
 msgstr "Ukloni elemente"
 
-#: ../src/frogr-main-view.c:657 ../src/frogr-main-view.c:762
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
 msgid "Upload"
 msgstr "Okači"
 
-#: ../src/frogr-main-view.c:657 ../src/frogr-main-view.c:762
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
 msgid "Upload All"
 msgstr "Postavi sve"
 
-#. Savije project item
-#: ../src/frogr-main-view.c:690 ../src/frogr-main-view.c:757
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
 msgid "Save"
 msgstr "Snimi"
 
-#: ../src/frogr-main-view.c:690 ../src/frogr-main-view.c:757
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
 msgid "Save Current Project"
 msgstr "Sačuvaj tekući projekat"
 
-#: ../src/frogr-main-view.c:1062 ../data/gtkbuilder/frogr-app-menu.xml.h:4
+#: src/frogr-main-view.c:1016
 msgid "_About"
 msgstr "_O programu"
 
-#: ../src/frogr-main-view.c:1066 ../data/gtkbuilder/frogr-app-menu.xml.h:5
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:17
+#: src/frogr-main-view.c:1020
 msgid "_Quit"
 msgstr "_Izlaz"
 
-#. Create the submenu and insert it in the right section
-#: ../src/frogr-main-view.c:1119
+#: src/frogr-main-view.c:1070
 msgid "Accounts"
 msgstr "Nalozi"
 
-#. String showind the date and time a picture was taken
-#: ../src/frogr-main-view.c:1471
+#: src/frogr-main-view.c:1410
 #, c-format
 msgid "Taken: %s"
 msgstr "Uslikano: %s"
 
-#: ../src/frogr-main-view.c:1476
+#: src/frogr-main-view.c:1415
 #, c-format
 msgid "File size: %s"
 msgstr "Veličina datoteke: %s"
 
-#: ../src/frogr-main-view.c:1609
+#: src/frogr-main-view.c:1540
 msgid "Select File"
 msgstr "Odaberite datoteku"
 
-#: ../src/frogr-main-view.c:1613 ../src/frogr-main-view.c:1744
+#: src/frogr-main-view.c:1544 src/frogr-main-view.c:1671
 msgid "_Open"
 msgstr "_Otvori"
 
-#: ../src/frogr-main-view.c:1622
+#: src/frogr-main-view.c:1553
 msgid "Frogr Project Files"
 msgstr "Projektne datoteke Frogr - a"
 
-#: ../src/frogr-main-view.c:1688
+#: src/frogr-main-view.c:1615
 msgid "Select Destination"
 msgstr "Izaberite odredište"
 
-#: ../src/frogr-main-view.c:1692 ../data/gtkbuilder/frogr-menu-bar.xml.h:3
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:1
+#: src/frogr-main-view.c:1619
 msgid "_Save"
 msgstr "_Spasi"
 
-#: ../src/frogr-main-view.c:1695
+#: src/frogr-main-view.c:1622
 msgid "Untitled Project.frogr"
 msgstr "Nenaslovljeni projekt.frogr"
 
-#: ../src/frogr-main-view.c:1740
+#: src/frogr-main-view.c:1667
 msgid "Select a Picture"
 msgstr "Odaberite sliku"
 
-#: ../src/frogr-main-view.c:1767
+#: src/frogr-main-view.c:1694
 msgid "All Files"
 msgstr "Sve Datoteke"
 
-#: ../src/frogr-main-view.c:1770
+#: src/frogr-main-view.c:1697
 msgid "Image Files"
 msgstr "Datoteke slika"
 
-#: ../src/frogr-main-view.c:1774
+#: src/frogr-main-view.c:1701
 msgid "Video Files"
 msgstr "Video datoteke"
 
-#: ../src/frogr-main-view.c:1798
+#: src/frogr-main-view.c:1723
 msgid "You don't have any picture added yet"
 msgstr "Niste još dodali nijednu sliku"
 
-#: ../src/frogr-main-view.c:1813
+#: src/frogr-main-view.c:1736
 msgid "You need to select some pictures first"
 msgstr "Morate prvo odabrati neke slike"
 
-#: ../src/frogr-main-view.c:2277
+#: src/frogr-main-view.c:2108
 msgid "Not connected to Flickr"
 msgstr "Nije spojeno na Flickr"
 
-#. Login string, showing the user is PRO (second '%s') if so.
-#: ../src/frogr-main-view.c:2287
+#: src/frogr-main-view.c:2118
 #, c-format
 msgid "Connected as %s%s"
 msgstr "Spojen kao %s%s"
 
-#: ../src/frogr-main-view.c:2288
+#: src/frogr-main-view.c:2119
 msgid " (PRO account)"
 msgstr " (PRO nalog)"
 
-#. Will show in the status bar the amount of data (in KB, MB
-#. or GB) the user is currently allowed to upload to flicker
-#. till the end of the month, in a CURRENT / MAX fashion.
-#. The '-' at the beginning is just a separator, sinci more
-#. blocks of text will bje shown in the status bar too.
-#: ../src/frogr-main-view.c:2312
+#: src/frogr-main-view.c:2143
 #, c-format
 msgid " - %s / %s remaining"
 msgstr " -%s/%s preostalo"
 
-#. Will show in the status bar the amount of pictures and data
-#. (in KB, MB or GB) that would bje uploaded as the sum of the
-#. sizes for every picture loaded in the application
-#: ../src/frogr-main-view.c:2338
+#: src/frogr-main-view.c:2169
 #, c-format
 msgid " - %d file to upload (%s)"
 msgid_plural " - %d files to upload (%s)"
@@ -734,217 +727,166 @@ msgstr[0] " - %d datoteka za postavljanje(%s)"
 msgstr[1] " - %d datoteke za postavljanje(%s)"
 msgstr[2] " - %d datoteka za postavljanje(%s)"
 
-#: ../src/frogr-settings-dialog.c:190
+#: src/frogr-settings-dialog.c:185
 msgid "Default Visibility"
 msgstr "Unaprijed zadana vidljivost"
 
-#: ../src/frogr-settings-dialog.c:229
+#: src/frogr-settings-dialog.c:224
 msgid "Default Content Type"
 msgstr "Unaprijed zadani tip sadržaja"
 
-#: ../src/frogr-settings-dialog.c:255
+#: src/frogr-settings-dialog.c:250
 msgid "Default Safety Level"
 msgstr "Unaprijed zadani nivo sigurnosti"
 
-#: ../src/frogr-settings-dialog.c:281
+#: src/frogr-settings-dialog.c:276
 msgid "Default License"
 msgstr "Osnovna licenca"
 
-#: ../src/frogr-settings-dialog.c:307
+#: src/frogr-settings-dialog.c:302
 msgid "Other Defaults"
 msgstr "Ostalo unaprijed zadano"
 
-#: ../src/frogr-settings-dialog.c:317
+#: src/frogr-settings-dialog.c:312
 msgid "_Show Pictures in Global Search Results"
 msgstr "_Prikažite slike u globalnim rezultatima pretrage"
 
-#: ../src/frogr-settings-dialog.c:320
+#: src/frogr-settings-dialog.c:315
 msgid "Set Geo_location Information for Pictures"
 msgstr "Postavite geografsku lokaciju za fotografije"
 
-#: ../src/frogr-settings-dialog.c:323
+#: src/frogr-settings-dialog.c:318
 msgid "Replace 'Date Posted' with 'Date Taken' for Pictures"
 msgstr "Zamijeni Datum postavljanja sa Datumom slikanja za slike"
 
-#: ../src/frogr-settings-dialog.c:329
+#: src/frogr-settings-dialog.c:324
 msgid "_General"
 msgstr "_Opće"
 
-#: ../src/frogr-settings-dialog.c:352
+#: src/frogr-settings-dialog.c:344
 msgid "Proxy Settings"
 msgstr "Postavke mrežnog posrednika"
 
-#. Enable proxy
-#: ../src/frogr-settings-dialog.c:361
+#: src/frogr-settings-dialog.c:353
 msgid "_Enable HTTP Proxy"
 msgstr "_Omogućite HTTP posrednika"
 
-#: ../src/frogr-settings-dialog.c:371
+#: src/frogr-settings-dialog.c:363
 msgid "_Host:"
 msgstr "_Računar:"
 
-#. Proxy port
-#: ../src/frogr-settings-dialog.c:384
+#: src/frogr-settings-dialog.c:376
 msgid "_Port:"
 msgstr "_Port:"
 
-#. Proxy username
-#: ../src/frogr-settings-dialog.c:397
+#: src/frogr-settings-dialog.c:389
 msgid "U_sername:"
 msgstr "_Korisničko ime:"
 
-#. Proxy password
-#: ../src/frogr-settings-dialog.c:410
+#: src/frogr-settings-dialog.c:402
 msgid "Pass_word:"
 msgstr "Lozi_nka:"
 
-#: ../src/frogr-settings-dialog.c:434
+#: src/frogr-settings-dialog.c:426
 msgid "Connec_tion"
 msgstr "Ve_za"
 
-#: ../src/frogr-settings-dialog.c:455
+#: src/frogr-settings-dialog.c:444
 msgid "Other options"
 msgstr "Ostale opcije"
 
-#: ../src/frogr-settings-dialog.c:465
+#: src/frogr-settings-dialog.c:454
 msgid "Ena_ble Tags Auto-Completion"
 msgstr "_Omogući automatsko dovršavanje oznaka"
 
-#: ../src/frogr-settings-dialog.c:468
+#: src/frogr-settings-dialog.c:457
 msgid "_Import Tags from Pictures Metadata"
 msgstr "_Uvezi oznake iz metapodataka slike"
 
-#: ../src/frogr-settings-dialog.c:472
+#: src/frogr-settings-dialog.c:461
 msgid "Use _Dark GTK Theme"
 msgstr "Koristi _Tamnu GTK temu"
 
-#: ../src/frogr-settings-dialog.c:476
+#: src/frogr-settings-dialog.c:465
 msgid "_Keep File Extensions in Titles when Loading"
 msgstr "_Zadrži datotečni ekstenzije u naslovima pri učitavanju"
 
-#: ../src/frogr-settings-dialog.c:482
+#: src/frogr-settings-dialog.c:471
 msgid "_Misc"
 msgstr "_Razno"
 
-#: ../src/frogr-settings-dialog.c:1003
+#: src/frogr-settings-dialog.c:972
 msgid "Preferences"
 msgstr "Postavke"
 
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:1
-msgid "Aut_horize Account…"
-msgstr "Odo_brite nalog"
-
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:2
-msgid "_Preferences…"
-msgstr "_Podešavanja"
-
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:3
-msgid "_Help"
-msgstr "_Pomoć"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:1
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:9
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:3
-msgid "_Edit Details…"
-msgstr "_Uređivanje detalja"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:2
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:10
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:4
-msgid "Add _Tags…"
-msgstr "Dodaj _Oznake"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:3
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:11
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:5
-msgid "Add to _Group…"
-msgstr "Dodaj u _grupu"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:4
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:12
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:6
-msgid "Add to _Photoset"
-msgstr "Dodaj u _skup fotografija"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:5
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:13
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:7
-msgid "_Add to Existing Photoset…"
-msgstr "_dodaj u postojeći skup fotografija"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:6
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:14
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:8
-msgid "_Create New Photoset…"
-msgstr "_kreiraj novi set fotografija"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:7
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:15
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:16
-msgid "_Open in External Viewer"
-msgstr "_otvori u vanjskom pregledniku"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:8
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:6
-msgid "_Remove Elements"
-msgstr "_ukloni elemente"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:1
-msgid "_File"
-msgstr "_Datoteka"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:2
-msgid "_Open…"
-msgstr "_Otvori…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:4
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:2
-msgid "Save _As…"
-msgstr "Spasi _Kao"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:5
-msgid "A_dd Elements…"
-msgstr "D_odaj elemente"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:7
-msgid "_Upload All"
-msgstr "_Postavi sve"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:16
-msgid "_View"
-msgstr "Pre_gled"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:17
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:9
-msgid "_Sort Elements"
-msgstr "_Sortiraj elemente"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:18
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:10
-msgid "As _Loaded"
-msgstr "Kao _prikazano"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:19
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:11
-msgid "By _Date Taken"
-msgstr "Po _datumu slikanja"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:20
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:12
-msgid "By _Title"
-msgstr "Po _nazivu"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:21
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:13
-msgid "By _Size"
-msgstr "Po _veličini"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:22
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:14
-msgid "_Reversed Order"
-msgstr "_Obrnuti redoslijed"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:23
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:15
-msgid "Enable _Tooltips"
-msgstr "Omogući _naputke"
+#~ msgid "Aut_horize Account…"
+#~ msgstr "Odo_brite nalog"
+
+#~ msgid "_Preferences…"
+#~ msgstr "_Podešavanja"
+
+#~ msgid "_Help"
+#~ msgstr "_Pomoć"
+
+#~ msgid "_Edit Details…"
+#~ msgstr "_Uređivanje detalja"
+
+#~ msgid "Add _Tags…"
+#~ msgstr "Dodaj _Oznake"
+
+#~ msgid "Add to _Group…"
+#~ msgstr "Dodaj u _grupu"
+
+#~ msgid "Add to _Photoset"
+#~ msgstr "Dodaj u _skup fotografija"
+
+#~ msgid "_Add to Existing Photoset…"
+#~ msgstr "_dodaj u postojeći skup fotografija"
+
+#~ msgid "_Create New Photoset…"
+#~ msgstr "_kreiraj novi set fotografija"
+
+#~ msgid "_Open in External Viewer"
+#~ msgstr "_otvori u vanjskom pregledniku"
+
+#~ msgid "_Remove Elements"
+#~ msgstr "_ukloni elemente"
+
+#~ msgid "_File"
+#~ msgstr "_Datoteka"
+
+#~ msgid "_Open…"
+#~ msgstr "_Otvori…"
+
+#~ msgid "Save _As…"
+#~ msgstr "Spasi _Kao"
+
+#~ msgid "A_dd Elements…"
+#~ msgstr "D_odaj elemente"
+
+#~ msgid "_Upload All"
+#~ msgstr "_Postavi sve"
+
+#~ msgid "_View"
+#~ msgstr "Pre_gled"
+
+#~ msgid "_Sort Elements"
+#~ msgstr "_Sortiraj elemente"
+
+#~ msgid "As _Loaded"
+#~ msgstr "Kao _prikazano"
+
+#~ msgid "By _Date Taken"
+#~ msgstr "Po _datumu slikanja"
+
+#~ msgid "By _Title"
+#~ msgstr "Po _nazivu"
+
+#~ msgid "By _Size"
+#~ msgstr "Po _veličini"
+
+#~ msgid "_Reversed Order"
+#~ msgstr "_Obrnuti redoslijed"
+
+#~ msgid "Enable _Tooltips"
+#~ msgstr "Omogući _naputke"
diff --git a/po/ca.po b/po/ca.po
index ed3b83b..7e44e0c 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,9 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: frogr\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=frogr&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-10-11 15:43+0000\n"
+"Report-Msgid-Bugs-To: msanchez gnome org\n"
+"POT-Creation-Date: 2016-08-12 13:09+0100\n"
 "PO-Revision-Date: 2013-04-19 22:53+0200\n"
 "Last-Translator: Gil Forcada <gilforcada guifi net>\n"
 "Language-Team: Catalan <tradgnome softcatala org>\n"
@@ -20,215 +19,222 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Gtranslator 2.91.6\n"
 
-#: ../data/frogr.appdata.xml.in.h:1
+#: data/frogr.appdata.xml.in:5 data/frogr.desktop.in.in:5
+#: data/frogr.desktop.in.in:14
+#, fuzzy
+msgid "frogr"
+msgstr "Frogr"
+
+#: data/frogr.appdata.xml.in:6 data/frogr.desktop.in.in:6
+msgid "frogr: a Flickr Remote Organizer for GNOME"
+msgstr ""
+
+#: data/frogr.appdata.xml.in:8
 msgid ""
-"Frogr is a small application for the GNOME desktop that allows users to "
+"frogr is a small application for the GNOME desktop that allows users to "
 "manage their accounts in the Flickr image hosting website."
 msgstr ""
 
-#: ../data/frogr.appdata.xml.in.h:2
+#: data/frogr.appdata.xml.in:13
 msgid ""
 "It supports all the basic Flickr features, including uploading pictures, "
 "adding descriptions, setting tags and managing sets and groups pools."
 msgstr ""
 
-#: ../data/frogr.desktop.in.in.h:1
-msgid "Frogr"
-msgstr "Frogr"
+#: data/frogr.appdata.xml.in:24
+msgid "Screenshot of frogr"
+msgstr ""
 
-#: ../data/frogr.desktop.in.in.h:2
-msgid "Frogr: a Flickr Remote Organizer for GNOME"
+#: data/frogr.appdata.xml.in:29
+msgid "Mario Sanchez Prada"
 msgstr ""
 
-#: ../data/frogr.desktop.in.in.h:3
+#: data/frogr.desktop.in.in:7
 msgid "Upload and organize photos in Flickr accounts"
 msgstr ""
 
-#: ../data/frogr.desktop.in.in.h:4
+#: data/frogr.desktop.in.in:8
 msgid "Flickr;Image;Picture;Photo;Video;Uploader;"
 msgstr ""
 
-#: ../src/frogr-about-dialog.c:43
-msgid "A Flickr remote organizer for GNOME\n"
+#: src/frogr-about-dialog.c:43
+msgid "A Flickr Remote Organizer for GNOME\n"
 msgstr ""
 
-#: ../src/frogr-about-dialog.c:72
+#: src/frogr-about-dialog.c:72
 msgid "translator-credits"
 msgstr ""
 "Jordi Mas i Hernàndez <jmas softcatala org>\n"
 "Gil Forcada <gilforcada guifi net>"
 
-#: ../src/frogr-add-tags-dialog.c:198 ../src/frogr-add-to-set-dialog.c:553
-#: ../src/frogr-add-to-group-dialog.c:552
-#: ../src/frogr-create-new-set-dialog.c:329 ../src/frogr-details-dialog.c:1195
-#: ../src/frogr-main-view.c:446 ../src/frogr-main-view.c:1509
-#: ../src/frogr-main-view.c:1586 ../src/frogr-main-view.c:1636
-#: ../src/frogr-settings-dialog.c:961
+#: src/frogr-add-tags-dialog.c:191 src/frogr-add-to-group-dialog.c:528
+#: src/frogr-add-to-set-dialog.c:529 src/frogr-auth-dialog.c:153
+#: src/frogr-create-new-set-dialog.c:310 src/frogr-details-dialog.c:1168
+#: src/frogr-main-view.c:1543 src/frogr-main-view.c:1618
+#: src/frogr-main-view.c:1670 src/frogr-settings-dialog.c:930
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/frogr-add-tags-dialog.c:200 ../src/frogr-add-to-set-dialog.c:555
-#: ../src/frogr-add-to-group-dialog.c:554
-#: ../src/frogr-create-new-set-dialog.c:331
+#: src/frogr-add-tags-dialog.c:193 src/frogr-add-to-group-dialog.c:530
+#: src/frogr-add-to-set-dialog.c:531 src/frogr-create-new-set-dialog.c:312
 msgid "_Add"
 msgstr ""
 
-#: ../src/frogr-add-tags-dialog.c:209
+#: src/frogr-add-tags-dialog.c:202
 msgid "Enter a spaces separated list of tags:"
 msgstr ""
 
-#: ../src/frogr-add-tags-dialog.c:233
+#: src/frogr-add-tags-dialog.c:228
 msgid "Add Tags"
 msgstr "Afegeix etiquetes"
 
-#: ../src/frogr-add-to-set-dialog.c:155
-msgid "Title"
-msgstr "Títol"
+#: src/frogr-add-to-group-dialog.c:147
+msgid "Name"
+msgstr "Nom"
 
-#: ../src/frogr-add-to-set-dialog.c:170 ../src/frogr-add-to-group-dialog.c:169
+#: src/frogr-add-to-group-dialog.c:162 src/frogr-add-to-set-dialog.c:163
 msgid "Elements"
 msgstr "Elements"
 
-#: ../src/frogr-add-to-set-dialog.c:604
-msgid "Add to Sets"
+#: src/frogr-add-to-group-dialog.c:581
+msgid "Add to Groups"
 msgstr ""
 
-#: ../src/frogr-add-to-group-dialog.c:154
-msgid "Name"
-msgstr "Nom"
+#: src/frogr-add-to-set-dialog.c:148
+msgid "Title"
+msgstr "Títol"
 
-#: ../src/frogr-add-to-group-dialog.c:603
-msgid "Add to Groups"
+#: src/frogr-add-to-set-dialog.c:582
+msgid "Add to Sets"
 msgstr ""
 
-#: ../src/frogr-auth-dialog.c:52
+#: src/frogr-auth-dialog.c:59
 #, c-format
 msgid ""
 "Please press the button to authorize %s and then come back to complete the "
 "process."
 msgstr ""
 
-#: ../src/frogr-auth-dialog.c:56 ../src/frogr-auth-dialog.c:141
+#: src/frogr-auth-dialog.c:63 src/frogr-auth-dialog.c:149
+#: src/frogr-controller.c:2286
 #, c-format
 msgid "Authorize %s"
 msgstr ""
 
-#: ../src/frogr-auth-dialog.c:145 ../src/frogr-settings-dialog.c:963
+#: src/frogr-auth-dialog.c:155 src/frogr-settings-dialog.c:932
 msgid "_Close"
 msgstr ""
 
-#. Description label
-#: ../src/frogr-auth-dialog.c:157
+#: src/frogr-auth-dialog.c:167
 msgid "Enter verification code:"
 msgstr ""
 
-#: ../src/frogr-auth-dialog.c:209
+#: src/frogr-auth-dialog.c:221
 msgid "Invalid verification code"
 msgstr ""
 
-#: ../src/frogr-controller.c:597
+#: src/frogr-controller.c:581
 msgid "Process cancelled"
 msgstr ""
 
-#: ../src/frogr-controller.c:602
+#: src/frogr-controller.c:586
 msgid ""
 "Connection error:\n"
 "Network not available"
 msgstr ""
 
-#: ../src/frogr-controller.c:606
+#: src/frogr-controller.c:590
 msgid ""
 "Connection error:\n"
 "Bad request"
 msgstr ""
 
-#: ../src/frogr-controller.c:610
+#: src/frogr-controller.c:594
 msgid ""
 "Connection error:\n"
 "Server-side error"
 msgstr ""
 
-#: ../src/frogr-controller.c:614
+#: src/frogr-controller.c:598
 msgid ""
 "Error uploading:\n"
 "File invalid"
 msgstr ""
 
-#: ../src/frogr-controller.c:618
+#: src/frogr-controller.c:602
 msgid ""
 "Error uploading picture:\n"
 "Quota exceeded"
 msgstr ""
 
-#: ../src/frogr-controller.c:623
+#: src/frogr-controller.c:607
 #, c-format
 msgid "Quota exceeded (limit: %d video per month)"
 msgid_plural "Quota exceeded (limit: %d videos per month)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/frogr-controller.c:627
+#: src/frogr-controller.c:611
 msgid ""
 "Error uploading video:\n"
 "You can't upload more videos with this account"
 msgstr ""
 
-#: ../src/frogr-controller.c:633
+#: src/frogr-controller.c:617
 msgid ""
 "Error:\n"
 "Photo not found"
 msgstr ""
 
-#: ../src/frogr-controller.c:637
+#: src/frogr-controller.c:621
 msgid ""
 "Error:\n"
 "Photo already in photoset"
 msgstr ""
 
-#: ../src/frogr-controller.c:641
+#: src/frogr-controller.c:625
 msgid ""
 "Error:\n"
 "Photo already in group"
 msgstr ""
 
-#: ../src/frogr-controller.c:645
+#: src/frogr-controller.c:629
 msgid ""
 "Error:\n"
 "Photo already in the maximum number of groups possible"
 msgstr ""
 
-#: ../src/frogr-controller.c:649
+#: src/frogr-controller.c:633
 msgid ""
 "Error:\n"
 "Group limit already reached"
 msgstr ""
 
-#: ../src/frogr-controller.c:653
+#: src/frogr-controller.c:637
 msgid ""
 "Error:\n"
 "Photo added to group's queue"
 msgstr ""
 
-#: ../src/frogr-controller.c:657
+#: src/frogr-controller.c:641
 msgid ""
 "Error:\n"
 "Photo already added to group's queue"
 msgstr ""
 
-#: ../src/frogr-controller.c:661
+#: src/frogr-controller.c:645
 msgid ""
 "Error:\n"
 "Content not allowed for this group"
 msgstr ""
 
-#: ../src/frogr-controller.c:665
-#, c-format
+#: src/frogr-controller.c:649
 msgid ""
 "Authorization failed.\n"
 "Please try again"
 msgstr ""
 
-#: ../src/frogr-controller.c:671
+#: src/frogr-controller.c:655
 #, c-format
 msgid ""
 "Error\n"
@@ -236,640 +242,539 @@ msgid ""
 "Please re-authorize it"
 msgstr ""
 
-#: ../src/frogr-controller.c:676
-#, c-format
+#: src/frogr-controller.c:660
 msgid ""
 "Unable to authenticate in Flickr\n"
 "Please try again."
 msgstr ""
 
-#: ../src/frogr-controller.c:680
+#: src/frogr-controller.c:664
 #, c-format
 msgid ""
 "You have not properly authorized %s yet.\n"
 "Please try again."
 msgstr ""
 
-#: ../src/frogr-controller.c:685
-#, c-format
+#: src/frogr-controller.c:669
 msgid ""
 "Invalid verification code.\n"
 "Please try again."
 msgstr ""
 
-#: ../src/frogr-controller.c:689
-#, c-format
+#: src/frogr-controller.c:673
 msgid ""
 "Error:\n"
 "Service not available"
 msgstr ""
 
-#. General error: just dump the raw error description
-#: ../src/frogr-controller.c:694
+#: src/frogr-controller.c:678
 #, c-format
 msgid "An error happened: %s."
 msgstr ""
 
-#: ../src/frogr-controller.c:910
+#: src/frogr-controller.c:883
 msgid "Authorization failed (timed out)"
 msgstr ""
 
-#: ../src/frogr-controller.c:962
+#: src/frogr-controller.c:931
 #, c-format
 msgid "Retrying Upload (attempt %d/%d)…"
 msgstr ""
 
-#: ../src/frogr-controller.c:967
+#: src/frogr-controller.c:936
 #, c-format
 msgid "Uploading '%s'…"
 msgstr ""
 
-#: ../src/frogr-controller.c:2329
+#: src/frogr-controller.c:2242
 msgid "Updating credentials…"
 msgstr ""
 
-#: ../src/frogr-controller.c:2334
+#: src/frogr-controller.c:2247
 msgid "Retrieving data for authorization…"
 msgstr ""
 
-#: ../src/frogr-controller.c:2339
+#: src/frogr-controller.c:2252
 msgid "Finishing authorization…"
 msgstr ""
 
-#: ../src/frogr-controller.c:2344
+#: src/frogr-controller.c:2257
 msgid "Retrieving list of sets…"
 msgstr ""
 
-#: ../src/frogr-controller.c:2349
+#: src/frogr-controller.c:2262
 msgid "Retrieving list of groups…"
 msgstr ""
 
-#: ../src/frogr-controller.c:2354
+#: src/frogr-controller.c:2267
 msgid "Retrieving list of tags…"
 msgstr ""
 
-#: ../src/frogr-controller.c:2471
+#: src/frogr-controller.c:2292
+msgid "Fetching information"
+msgstr ""
+
+#: src/frogr-controller.c:2398
 msgid "No sets found"
 msgstr ""
 
-#: ../src/frogr-controller.c:2498
+#: src/frogr-controller.c:2423
 msgid "No groups found"
 msgstr ""
 
-#: ../src/frogr-controller.c:3142
+#: src/frogr-controller.c:2984
 #, c-format
 msgid ""
 "You need to properly authorize %s before uploading any pictures to Flickr.\n"
 "Please re-authorize it."
 msgstr ""
 
-#: ../src/frogr-controller.c:3152
-#, c-format
+#: src/frogr-controller.c:2994
 msgid "You need to be connected before uploading any pictures to Flickr."
 msgstr ""
 
-#: ../src/frogr-controller.c:3224
-#, c-format
+#: src/frogr-controller.c:3012
+#, fuzzy
+msgid "Uploading Pictures"
+msgstr "(%d foto)"
+
+#: src/frogr-controller.c:3057
 msgid "Error opening project file"
 msgstr ""
 
-#. This shows a dialog notifying the problem to the user
-#: ../src/frogr-create-new-set-dialog.c:156 ../src/frogr-details-dialog.c:1022
+#: src/frogr-create-new-set-dialog.c:143 src/frogr-details-dialog.c:1001
 msgid "Missing data required"
 msgstr ""
 
-#: ../src/frogr-create-new-set-dialog.c:345
+#: src/frogr-create-new-set-dialog.c:326
 msgid "Title:"
 msgstr "Títol:"
 
-#: ../src/frogr-create-new-set-dialog.c:354
+#: src/frogr-create-new-set-dialog.c:335
 msgid "Description:"
 msgstr "Descripció:"
 
-#: ../src/frogr-create-new-set-dialog.c:375
+#: src/frogr-create-new-set-dialog.c:356
 msgid "Fill Pictures Details with Title and Description"
 msgstr ""
 
-#: ../src/frogr-create-new-set-dialog.c:398
+#: src/frogr-create-new-set-dialog.c:381
 msgid "Create New Set"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:91 ../src/frogr-settings-dialog.c:99
+#: src/frogr-details-dialog.c:89 src/frogr-settings-dialog.c:97
 msgid "Default (as specified in Flickr)"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:92 ../src/frogr-settings-dialog.c:100
+#: src/frogr-details-dialog.c:90 src/frogr-settings-dialog.c:98
 msgid "All rights reserved"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:93 ../src/frogr-settings-dialog.c:101
+#: src/frogr-details-dialog.c:91 src/frogr-settings-dialog.c:99
 msgid "CC Attribution-NonCommercial-ShareAlike"
 msgstr "CC Reconeixement-NoComercial-CompartirIgual"
 
-#: ../src/frogr-details-dialog.c:94 ../src/frogr-settings-dialog.c:102
+#: src/frogr-details-dialog.c:92 src/frogr-settings-dialog.c:100
 msgid "CC Attribution-NonCommercial"
 msgstr "CC Reconeixement-NoComercial"
 
-#: ../src/frogr-details-dialog.c:95 ../src/frogr-settings-dialog.c:103
+#: src/frogr-details-dialog.c:93 src/frogr-settings-dialog.c:101
 msgid "CC Attribution-NonCommercial-NoDerivs"
 msgstr "CC Reconeixement-NoComercial-SenseObraDerivada"
 
-#: ../src/frogr-details-dialog.c:96 ../src/frogr-settings-dialog.c:104
+#: src/frogr-details-dialog.c:94 src/frogr-settings-dialog.c:102
 msgid "CC Attribution"
 msgstr "Reconeixement CC"
 
-#: ../src/frogr-details-dialog.c:97 ../src/frogr-settings-dialog.c:105
+#: src/frogr-details-dialog.c:95 src/frogr-settings-dialog.c:103
 msgid "CC Attribution-ShareAlike"
 msgstr "CC Reconeixement-CompartirIgual"
 
-#: ../src/frogr-details-dialog.c:98 ../src/frogr-settings-dialog.c:106
+#: src/frogr-details-dialog.c:96 src/frogr-settings-dialog.c:104
 msgid "CC Attribution-NoDerivs"
 msgstr "CC Reconeixement-SenseObraDerivada"
 
-#: ../src/frogr-details-dialog.c:178
+#: src/frogr-details-dialog.c:172
 msgid "Open with image viewer"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:196
+#: src/frogr-details-dialog.c:190
 msgid "_Title:"
 msgstr "_Títol:"
 
-#: ../src/frogr-details-dialog.c:206
+#: src/frogr-details-dialog.c:200
 msgid "_Description:"
 msgstr "_Descripció:"
 
-#: ../src/frogr-details-dialog.c:230
+#: src/frogr-details-dialog.c:224
 msgid "Ta_gs:"
 msgstr "_Etiquetes:"
 
-#: ../src/frogr-details-dialog.c:253
+#: src/frogr-details-dialog.c:247
 msgid "Visibility"
 msgstr "Visibilitat"
 
-#: ../src/frogr-details-dialog.c:263 ../src/frogr-settings-dialog.c:201
+#: src/frogr-details-dialog.c:257 src/frogr-settings-dialog.c:196
 msgid "_Private"
 msgstr "_Privat"
 
-#: ../src/frogr-details-dialog.c:267 ../src/frogr-settings-dialog.c:204
+#: src/frogr-details-dialog.c:261 src/frogr-settings-dialog.c:199
 msgid "P_ublic"
 msgstr "_Públic"
 
-#: ../src/frogr-details-dialog.c:276 ../src/frogr-settings-dialog.c:212
+#: src/frogr-details-dialog.c:270 src/frogr-settings-dialog.c:207
 msgid "_Family"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:280 ../src/frogr-settings-dialog.c:214
+#: src/frogr-details-dialog.c:274 src/frogr-settings-dialog.c:209
 msgid "F_riends"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:294
+#: src/frogr-details-dialog.c:288
 msgid "Content Type"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:302 ../src/frogr-settings-dialog.c:239
+#: src/frogr-details-dialog.c:296 src/frogr-settings-dialog.c:234
 msgid "P_hoto"
 msgstr "_Foto"
 
-#: ../src/frogr-details-dialog.c:306 ../src/frogr-settings-dialog.c:241
+#: src/frogr-details-dialog.c:300 src/frogr-settings-dialog.c:236
 msgid "Scree_nshot"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:310 ../src/frogr-settings-dialog.c:243
+#: src/frogr-details-dialog.c:304 src/frogr-settings-dialog.c:238
 msgid "Oth_er"
 msgstr "_Altres"
 
-#: ../src/frogr-details-dialog.c:323
+#: src/frogr-details-dialog.c:317
 msgid "Safety Level"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:331 ../src/frogr-settings-dialog.c:265
+#: src/frogr-details-dialog.c:325 src/frogr-settings-dialog.c:260
 msgid "S_afe"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:335 ../src/frogr-settings-dialog.c:267
+#: src/frogr-details-dialog.c:329 src/frogr-settings-dialog.c:262
 msgid "_Moderate"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:339 ../src/frogr-settings-dialog.c:269
+#: src/frogr-details-dialog.c:333 src/frogr-settings-dialog.c:264
 msgid "Restr_icted"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:351
+#: src/frogr-details-dialog.c:345
 msgid "License Type"
 msgstr "Tipus de llicència"
 
-#: ../src/frogr-details-dialog.c:373
+#: src/frogr-details-dialog.c:367
 msgid "Other Properties"
 msgstr "Altres propietats"
 
-#: ../src/frogr-details-dialog.c:381
+#: src/frogr-details-dialog.c:375
 msgid "_Show Up in Global Search Results"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:385
+#: src/frogr-details-dialog.c:379
 msgid "Set Geo_location Information"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:389
+#: src/frogr-details-dialog.c:383
 msgid "Replace 'Date Posted' with 'Date Taken'"
 msgstr ""
 
-#. Visually indicate how many pictures are being edited
-#: ../src/frogr-details-dialog.c:484
+#: src/frogr-details-dialog.c:475
 #, c-format
 msgid "(%d Picture)"
 msgid_plural "(%d Pictures)"
 msgstr[0] "(%d foto)"
 msgstr[1] "(%d fotos)"
 
-#: ../src/frogr-details-dialog.c:558
+#: src/frogr-details-dialog.c:548
 msgid "An error happened trying to load the picture"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:1196
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:8
+#: src/frogr-details-dialog.c:1169
 msgid "_Edit"
 msgstr "_Edita"
 
-#: ../src/frogr-details-dialog.c:1225
+#: src/frogr-details-dialog.c:1197
 msgid "Edit Picture Details"
 msgstr ""
 
-#: ../src/frogr-file-loader.c:148
+#: src/frogr-file-loader.c:142
 #, c-format
 msgid "Loading files %d / %d"
 msgstr ""
 
-#: ../src/frogr-file-loader.c:382
+#: src/frogr-file-loader.c:369
 #, c-format
 msgid ""
 "Unable to load picture %s:\n"
 "%s"
 msgstr ""
 
-#: ../src/frogr-file-loader.c:413
+#: src/frogr-file-loader.c:400
 #, c-format
 msgid ""
 "Unable to load video %s\n"
 "Please check that you have the right codec installed"
 msgstr ""
 
-#. First %s is the title of the picture (filename of the file by
-#. default). Second %s is the max allowed size for a picture to be
-#. uploaded to flickr (different for free and PRO accounts).
-#: ../src/frogr-file-loader.c:654
+#: src/frogr-file-loader.c:636
 #, c-format
 msgid ""
 "Can't load file %s:\n"
 "Size of file is bigger than the maximum allowed for this account (%s)"
 msgstr ""
 
-#. First create the left side buttons
-#: ../src/frogr-main-view.c:572 ../src/frogr-main-view.c:652
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
 msgid "Open"
 msgstr "Obre"
 
-#: ../src/frogr-main-view.c:572 ../src/frogr-main-view.c:652
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
 msgid "Open Existing Project"
 msgstr ""
 
-#: ../src/frogr-main-view.c:574 ../src/frogr-main-view.c:655
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
 msgid "Add"
 msgstr "Afegeix"
 
-#: ../src/frogr-main-view.c:574 ../src/frogr-main-view.c:655
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
 msgid "Add Elements"
 msgstr "Afegeix elements"
 
-#: ../src/frogr-main-view.c:576 ../src/frogr-main-view.c:656
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
 msgid "Remove"
 msgstr "Suprimeix"
 
-#: ../src/frogr-main-view.c:576 ../src/frogr-main-view.c:656
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
 msgid "Remove Elements"
 msgstr "Suprimeix elements"
 
-#: ../src/frogr-main-view.c:578 ../src/frogr-main-view.c:658
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
 msgid "Upload"
 msgstr "Penja"
 
-#: ../src/frogr-main-view.c:578 ../src/frogr-main-view.c:658
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
 msgid "Upload All"
 msgstr "Penja-ho tot"
 
-#. Save project item to the right side
-#: ../src/frogr-main-view.c:583 ../src/frogr-main-view.c:653
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
 msgid "Save"
 msgstr "Desa"
 
-#: ../src/frogr-main-view.c:583 ../src/frogr-main-view.c:653
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
 msgid "Save Current Project"
 msgstr "Desa el projecte actual"
 
-#: ../src/frogr-main-view.c:956 ../data/gtkbuilder/frogr-app-menu.xml.h:4
+#: src/frogr-main-view.c:1016
 msgid "_About"
 msgstr "_Quant a"
 
-#: ../src/frogr-main-view.c:960 ../data/gtkbuilder/frogr-app-menu.xml.h:5
+#: src/frogr-main-view.c:1020
 msgid "_Quit"
 msgstr "_Surt"
 
-#. Create the submenu and insert it in the right section
-#: ../src/frogr-main-view.c:1016
+#: src/frogr-main-view.c:1070
 msgid "Accounts"
 msgstr "Comptes"
 
-#. String showind the date and time a picture was taken
-#: ../src/frogr-main-view.c:1368
+#: src/frogr-main-view.c:1410
 #, c-format
 msgid "Taken: %s"
 msgstr "Feta el: %s"
 
-#: ../src/frogr-main-view.c:1373
+#: src/frogr-main-view.c:1415
 #, c-format
 msgid "File size: %s"
 msgstr "Mida del fitxer: %s"
 
-#: ../src/frogr-main-view.c:1506
+#: src/frogr-main-view.c:1540
 msgid "Select File"
 msgstr "Seleccioneu el fitxer"
 
-#: ../src/frogr-main-view.c:1510 ../src/frogr-main-view.c:1637
+#: src/frogr-main-view.c:1544 src/frogr-main-view.c:1671
 #, fuzzy
-#| msgid "Open"
 msgid "_Open"
 msgstr "Obre"
 
-#: ../src/frogr-main-view.c:1519
+#: src/frogr-main-view.c:1553
 msgid "Frogr Project Files"
 msgstr ""
 
-#: ../src/frogr-main-view.c:1583
+#: src/frogr-main-view.c:1615
 msgid "Select Destination"
 msgstr "Seleccioneu la destinació"
 
-#: ../src/frogr-main-view.c:1587 ../data/gtkbuilder/frogr-menu-bar.xml.h:3
+#: src/frogr-main-view.c:1619
 msgid "_Save"
 msgstr "_Desa"
 
-#: ../src/frogr-main-view.c:1590
+#: src/frogr-main-view.c:1622
 msgid "Untitled Project.frogr"
 msgstr ""
 
-#: ../src/frogr-main-view.c:1633
+#: src/frogr-main-view.c:1667
 msgid "Select a Picture"
 msgstr ""
 
-#: ../src/frogr-main-view.c:1660
+#: src/frogr-main-view.c:1694
 msgid "All Files"
 msgstr "Tots els fitxers"
 
-#: ../src/frogr-main-view.c:1663
+#: src/frogr-main-view.c:1697
 msgid "Image Files"
 msgstr "Fitxers d'imatge"
 
-#: ../src/frogr-main-view.c:1667
+#: src/frogr-main-view.c:1701
 msgid "Video Files"
 msgstr "Fitxers de vídeo"
 
-#: ../src/frogr-main-view.c:1689
+#: src/frogr-main-view.c:1723
 msgid "You don't have any picture added yet"
 msgstr ""
 
-#: ../src/frogr-main-view.c:1704
+#: src/frogr-main-view.c:1736
 msgid "You need to select some pictures first"
 msgstr ""
 
-#: ../src/frogr-main-view.c:2168
+#: src/frogr-main-view.c:2108
 msgid "Not connected to Flickr"
 msgstr ""
 
-#. Login string, showing the user is PRO (second '%s') if so.
-#: ../src/frogr-main-view.c:2178
+#: src/frogr-main-view.c:2118
 #, c-format
 msgid "Connected as %s%s"
 msgstr ""
 
-#: ../src/frogr-main-view.c:2179
+#: src/frogr-main-view.c:2119
 msgid " (PRO account)"
 msgstr ""
 
-#. Will show in the status bar the amount of data (in KB, MB
-#. or GB) the user is currently allowed to upload to flicker
-#. till the end of the month, in a CURRENT / MAX fashion.
-#. The '-' at the beginning is just a separator, since more
-#. blocks of text will be shown in the status bar too.
-#: ../src/frogr-main-view.c:2203
+#: src/frogr-main-view.c:2143
 #, c-format
 msgid " - %s / %s remaining"
 msgstr ""
 
-#. Will show in the status bar the amount of pictures and data
-#. (in KB, MB or GB) that would be uploaded as the sum of the
-#. sizes for every picture loaded in the application
-#: ../src/frogr-main-view.c:2229
+#: src/frogr-main-view.c:2169
 #, c-format
 msgid " - %d file to upload (%s)"
 msgid_plural " - %d files to upload (%s)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/frogr-settings-dialog.c:190
+#: src/frogr-settings-dialog.c:185
 msgid "Default Visibility"
 msgstr ""
 
-#: ../src/frogr-settings-dialog.c:229
+#: src/frogr-settings-dialog.c:224
 msgid "Default Content Type"
 msgstr ""
 
-#: ../src/frogr-settings-dialog.c:255
+#: src/frogr-settings-dialog.c:250
 msgid "Default Safety Level"
 msgstr ""
 
-#: ../src/frogr-settings-dialog.c:281
+#: src/frogr-settings-dialog.c:276
 msgid "Default License"
 msgstr ""
 
-#: ../src/frogr-settings-dialog.c:307
+#: src/frogr-settings-dialog.c:302
 msgid "Other Defaults"
 msgstr ""
 
-#: ../src/frogr-settings-dialog.c:317
+#: src/frogr-settings-dialog.c:312
 msgid "_Show Pictures in Global Search Results"
 msgstr ""
 
-#: ../src/frogr-settings-dialog.c:320
+#: src/frogr-settings-dialog.c:315
 msgid "Set Geo_location Information for Pictures"
 msgstr ""
 
-#: ../src/frogr-settings-dialog.c:323
+#: src/frogr-settings-dialog.c:318
 msgid "Replace 'Date Posted' with 'Date Taken' for Pictures"
 msgstr ""
 
-#: ../src/frogr-settings-dialog.c:329
+#: src/frogr-settings-dialog.c:324
 msgid "_General"
 msgstr "_General"
 
-#: ../src/frogr-settings-dialog.c:352
+#: src/frogr-settings-dialog.c:344
 msgid "Proxy Settings"
 msgstr "Paràmetres del servidor intermediari"
 
-#. Enable proxy
-#: ../src/frogr-settings-dialog.c:361
+#: src/frogr-settings-dialog.c:353
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: ../src/frogr-settings-dialog.c:371
+#: src/frogr-settings-dialog.c:363
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#. Proxy port
-#: ../src/frogr-settings-dialog.c:384
+#: src/frogr-settings-dialog.c:376
 msgid "_Port:"
 msgstr "_Port:"
 
-#. Proxy username
-#: ../src/frogr-settings-dialog.c:397
+#: src/frogr-settings-dialog.c:389
 msgid "U_sername:"
 msgstr "_Nom d'usuari:"
 
-#. Proxy password
-#: ../src/frogr-settings-dialog.c:410
+#: src/frogr-settings-dialog.c:402
 msgid "Pass_word:"
 msgstr "Contrasen_ya:"
 
-#: ../src/frogr-settings-dialog.c:434
+#: src/frogr-settings-dialog.c:426
 msgid "Connec_tion"
 msgstr "_Connexió"
 
-#: ../src/frogr-settings-dialog.c:455
+#: src/frogr-settings-dialog.c:444
 msgid "Other options"
 msgstr "Altres opcions"
 
-#: ../src/frogr-settings-dialog.c:465
+#: src/frogr-settings-dialog.c:454
 msgid "Ena_ble Tags Auto-Completion"
 msgstr ""
 
-#: ../src/frogr-settings-dialog.c:468
+#: src/frogr-settings-dialog.c:457
 msgid "_Import Tags from Pictures Metadata"
 msgstr ""
 
-#: ../src/frogr-settings-dialog.c:472
+#: src/frogr-settings-dialog.c:461
 msgid "Use _Dark GTK Theme"
 msgstr ""
 
-#: ../src/frogr-settings-dialog.c:476
+#: src/frogr-settings-dialog.c:465
 msgid "_Keep File Extensions in Titles when Loading"
 msgstr ""
 
-#: ../src/frogr-settings-dialog.c:482
+#: src/frogr-settings-dialog.c:471
 msgid "_Misc"
 msgstr "_Varis"
 
-#: ../src/frogr-settings-dialog.c:1004
+#: src/frogr-settings-dialog.c:972
 msgid "Preferences"
 msgstr "Preferències"
 
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:1
-msgid "Aut_horize Account…"
-msgstr ""
+#~ msgid "_Preferences…"
+#~ msgstr "_Preferències…"
 
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:2
-msgid "_Preferences…"
-msgstr "_Preferències…"
+#~ msgid "_Help"
+#~ msgstr "A_juda"
 
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:3
-msgid "_Help"
-msgstr "A_juda"
+#~ msgid "_File"
+#~ msgstr "_Fitxer"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:1
-msgid "_File"
-msgstr "_Fitxer"
+#~ msgid "_Open…"
+#~ msgstr "_Obre…"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:2
-msgid "_Open…"
-msgstr "_Obre…"
+#~ msgid "Save _As…"
+#~ msgstr "_Anomena i desa…"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:4
-msgid "Save _As…"
-msgstr "_Anomena i desa…"
+#~ msgid "_Upload All"
+#~ msgstr "Penja-ho _tot"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:5
-msgid "A_dd Elements…"
-msgstr ""
+#~ msgid "_View"
+#~ msgstr "_Visualitza"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:6
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:8
-msgid "_Remove Elements"
-msgstr ""
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:7
-msgid "_Upload All"
-msgstr "Penja-ho _tot"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:9
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:1
-msgid "_Edit Details…"
-msgstr ""
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:10
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:2
-msgid "Add _Tags…"
-msgstr ""
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:11
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:3
-msgid "Add to _Group…"
-msgstr ""
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:12
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:4
-msgid "Add to _Photoset"
-msgstr ""
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:13
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:5
-msgid "_Add to Existing Photoset…"
-msgstr ""
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:14
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:6
-msgid "_Create New Photoset…"
-msgstr ""
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:15
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:7
-msgid "_Open in External Viewer"
-msgstr ""
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:16
-msgid "_View"
-msgstr "_Visualitza"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:17
-msgid "_Sort Elements"
-msgstr ""
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:18
-msgid "As _Loaded"
-msgstr ""
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:19
-msgid "By _Date Taken"
-msgstr ""
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:20
-msgid "By _Title"
-msgstr ""
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:21
-msgid "By _Size"
-msgstr "Per _mida"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:22
-msgid "_Reversed Order"
-msgstr ""
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:23
-msgid "Enable _Tooltips"
-msgstr ""
+#~ msgid "By _Size"
+#~ msgstr "Per _mida"
diff --git a/po/cs.po b/po/cs.po
index bd9ccb2..f1fa2cf 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: frogr master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=frogr&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-01-22 18:06+0000\n"
+"Report-Msgid-Bugs-To: msanchez gnome org\n"
+"POT-Creation-Date: 2016-08-12 13:09+0100\n"
 "PO-Revision-Date: 2016-02-28 12:54+0100\n"
 "Last-Translator: Marek Černocký <marek manet cz>\n"
 "Language-Team: Czech <gnome-cs-list gnome org>\n"
@@ -19,7 +18,16 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Gtranslator 2.91.6\n"
 
-#: ../data/frogr.appdata.xml.in.h:1
+#: data/frogr.appdata.xml.in:5 data/frogr.desktop.in.in:5
+#: data/frogr.desktop.in.in:14
+msgid "frogr"
+msgstr "frogr"
+
+#: data/frogr.appdata.xml.in:6 data/frogr.desktop.in.in:6
+msgid "frogr: a Flickr Remote Organizer for GNOME"
+msgstr "Vzdálený správu služeb Flickr pro GNOME"
+
+#: data/frogr.appdata.xml.in:8
 msgid ""
 "frogr is a small application for the GNOME desktop that allows users to "
 "manage their accounts in the Flickr image hosting website."
@@ -27,7 +35,7 @@ msgstr ""
 "frogr je malá aplikace pro pracovní prostředí GNOME, pomocí které mohou "
 "uživatelé spravovat své účty u služby pro hostování obrázků Flickr."
 
-#: ../data/frogr.appdata.xml.in.h:2
+#: data/frogr.appdata.xml.in:13
 msgid ""
 "It supports all the basic Flickr features, including uploading pictures, "
 "adding descriptions, setting tags and managing sets and groups pools."
@@ -35,77 +43,72 @@ msgstr ""
 "Podporuje všechny základní funkce služby Flickr, včetně nahrávání obrázků, "
 "přidávání popisů, nastavování štítků a správy nastavení a skupin."
 
-#: ../data/frogr.appdata.xml.in.h:3
+#: data/frogr.appdata.xml.in:24
 msgid "Screenshot of frogr"
 msgstr "Snímek obrazovky s aplikací frogr"
 
-#: ../data/frogr.desktop.in.in.h:1
-msgid "frogr"
-msgstr "frogr"
-
-#: ../data/frogr.desktop.in.in.h:2
-msgid "frogr: a Flickr Remote Organizer for GNOME"
-msgstr "Vzdálený správu služeb Flickr pro GNOME"
+#: data/frogr.appdata.xml.in:29
+msgid "Mario Sanchez Prada"
+msgstr ""
 
-#: ../data/frogr.desktop.in.in.h:3
+#: data/frogr.desktop.in.in:7
 msgid "Upload and organize photos in Flickr accounts"
 msgstr "Nahrávejte a uspořádavejte si fotky v účtech na službě Flickr"
 
-#: ../data/frogr.desktop.in.in.h:4
+#: data/frogr.desktop.in.in:8
 msgid "Flickr;Image;Picture;Photo;Video;Uploader;"
 msgstr "Flickr;obrázek;fotografie;fotka;video;nahrávání;odesílání;"
 
-#: ../src/frogr-about-dialog.c:43
+#: src/frogr-about-dialog.c:43
 msgid "A Flickr Remote Organizer for GNOME\n"
 msgstr "Vzdálená správa služeb Flickr pro GNOME\n"
 
-#: ../src/frogr-about-dialog.c:72
+#: src/frogr-about-dialog.c:72
 msgid "translator-credits"
 msgstr "Marek Černocký <marek manet cz>"
 
-#: ../src/frogr-add-tags-dialog.c:191 ../src/frogr-add-to-group-dialog.c:528
-#: ../src/frogr-add-to-set-dialog.c:529 ../src/frogr-auth-dialog.c:153
-#: ../src/frogr-create-new-set-dialog.c:310 ../src/frogr-details-dialog.c:1168
-#: ../src/frogr-main-view.c:1543 ../src/frogr-main-view.c:1618
-#: ../src/frogr-main-view.c:1670 ../src/frogr-settings-dialog.c:930
+#: src/frogr-add-tags-dialog.c:191 src/frogr-add-to-group-dialog.c:528
+#: src/frogr-add-to-set-dialog.c:529 src/frogr-auth-dialog.c:153
+#: src/frogr-create-new-set-dialog.c:310 src/frogr-details-dialog.c:1168
+#: src/frogr-main-view.c:1543 src/frogr-main-view.c:1618
+#: src/frogr-main-view.c:1670 src/frogr-settings-dialog.c:930
 msgid "_Cancel"
 msgstr "_Zrušit"
 
-#: ../src/frogr-add-tags-dialog.c:193 ../src/frogr-add-to-group-dialog.c:530
-#: ../src/frogr-add-to-set-dialog.c:531
-#: ../src/frogr-create-new-set-dialog.c:312
+#: src/frogr-add-tags-dialog.c:193 src/frogr-add-to-group-dialog.c:530
+#: src/frogr-add-to-set-dialog.c:531 src/frogr-create-new-set-dialog.c:312
 msgid "_Add"
 msgstr "Přid_at"
 
-#: ../src/frogr-add-tags-dialog.c:202
+#: src/frogr-add-tags-dialog.c:202
 msgid "Enter a spaces separated list of tags:"
 msgstr "Zadejte mezerami oddělovaný seznam štítků:"
 
-#: ../src/frogr-add-tags-dialog.c:228
+#: src/frogr-add-tags-dialog.c:228
 msgid "Add Tags"
 msgstr "Přidání štítků"
 
-#: ../src/frogr-add-to-group-dialog.c:147
+#: src/frogr-add-to-group-dialog.c:147
 msgid "Name"
 msgstr "Název"
 
-#: ../src/frogr-add-to-group-dialog.c:162 ../src/frogr-add-to-set-dialog.c:163
+#: src/frogr-add-to-group-dialog.c:162 src/frogr-add-to-set-dialog.c:163
 msgid "Elements"
 msgstr "Objekty"
 
-#: ../src/frogr-add-to-group-dialog.c:581
+#: src/frogr-add-to-group-dialog.c:581
 msgid "Add to Groups"
 msgstr "Přidání do skupin"
 
-#: ../src/frogr-add-to-set-dialog.c:148
+#: src/frogr-add-to-set-dialog.c:148
 msgid "Title"
 msgstr "Název"
 
-#: ../src/frogr-add-to-set-dialog.c:582
+#: src/frogr-add-to-set-dialog.c:582
 msgid "Add to Sets"
 msgstr "Přidání do sad"
 
-#: ../src/frogr-auth-dialog.c:59
+#: src/frogr-auth-dialog.c:59
 #, c-format
 msgid ""
 "Please press the button to authorize %s and then come back to complete the "
@@ -114,30 +117,29 @@ msgstr ""
 "Pro autorizaci aplikace %s zmáčkněte prosím tlačítko. Po provedení se vraťte "
 "sem a proces dokončete."
 
-#: ../src/frogr-auth-dialog.c:63 ../src/frogr-auth-dialog.c:149
-#: ../src/frogr-controller.c:2286
+#: src/frogr-auth-dialog.c:63 src/frogr-auth-dialog.c:149
+#: src/frogr-controller.c:2286
 #, c-format
 msgid "Authorize %s"
 msgstr "Autorizace aplikace %s"
 
-#: ../src/frogr-auth-dialog.c:155 ../src/frogr-settings-dialog.c:932
+#: src/frogr-auth-dialog.c:155 src/frogr-settings-dialog.c:932
 msgid "_Close"
 msgstr "_Zavřít"
 
-#. Description label
-#: ../src/frogr-auth-dialog.c:167
+#: src/frogr-auth-dialog.c:167
 msgid "Enter verification code:"
 msgstr "Zadejte ověřovací kód:"
 
-#: ../src/frogr-auth-dialog.c:221
+#: src/frogr-auth-dialog.c:221
 msgid "Invalid verification code"
 msgstr "Neplatný ověřovací kód"
 
-#: ../src/frogr-controller.c:581
+#: src/frogr-controller.c:581
 msgid "Process cancelled"
 msgstr "Proces zrušen"
 
-#: ../src/frogr-controller.c:586
+#: src/frogr-controller.c:586
 msgid ""
 "Connection error:\n"
 "Network not available"
@@ -145,7 +147,7 @@ msgstr ""
 "Chyba připojení:\n"
 "Síť není dostupná"
 
-#: ../src/frogr-controller.c:590
+#: src/frogr-controller.c:590
 msgid ""
 "Connection error:\n"
 "Bad request"
@@ -153,7 +155,7 @@ msgstr ""
 "Chyba připojení:\n"
 "Chybný požadavek"
 
-#: ../src/frogr-controller.c:594
+#: src/frogr-controller.c:594
 msgid ""
 "Connection error:\n"
 "Server-side error"
@@ -161,7 +163,7 @@ msgstr ""
 "Chyba připojení:\n"
 "Chyba na straně serveru"
 
-#: ../src/frogr-controller.c:598
+#: src/frogr-controller.c:598
 msgid ""
 "Error uploading:\n"
 "File invalid"
@@ -169,7 +171,7 @@ msgstr ""
 "Chyba nahrávání:\n"
 "Neplatný soubor"
 
-#: ../src/frogr-controller.c:602
+#: src/frogr-controller.c:602
 msgid ""
 "Error uploading picture:\n"
 "Quota exceeded"
@@ -177,7 +179,7 @@ msgstr ""
 "Chyba nahrávání obrázku:\n"
 "Překročena kvóta"
 
-#: ../src/frogr-controller.c:607
+#: src/frogr-controller.c:607
 #, c-format
 msgid "Quota exceeded (limit: %d video per month)"
 msgid_plural "Quota exceeded (limit: %d videos per month)"
@@ -185,7 +187,7 @@ msgstr[0] "Překročena kvóta (omezení: %d video měsíčně)"
 msgstr[1] "Překročena kvóta (omezení: %d videa měsíčně)"
 msgstr[2] "Překročena kvóta (omezení: %d videí měsíčně)"
 
-#: ../src/frogr-controller.c:611
+#: src/frogr-controller.c:611
 msgid ""
 "Error uploading video:\n"
 "You can't upload more videos with this account"
@@ -193,7 +195,7 @@ msgstr ""
 "Chyba nahrávání videa:\n"
 "Pod tímto účtem nemůžete nahrát další videa"
 
-#: ../src/frogr-controller.c:617
+#: src/frogr-controller.c:617
 msgid ""
 "Error:\n"
 "Photo not found"
@@ -201,7 +203,7 @@ msgstr ""
 "Chyba:\n"
 "Fotka nenalezena"
 
-#: ../src/frogr-controller.c:621
+#: src/frogr-controller.c:621
 msgid ""
 "Error:\n"
 "Photo already in photoset"
@@ -209,7 +211,7 @@ msgstr ""
 "Chyba:\n"
 "Fotka již v sadě fotek je"
 
-#: ../src/frogr-controller.c:625
+#: src/frogr-controller.c:625
 msgid ""
 "Error:\n"
 "Photo already in group"
@@ -217,7 +219,7 @@ msgstr ""
 "Chyba:\n"
 "Fotka již ve skupině je"
 
-#: ../src/frogr-controller.c:629
+#: src/frogr-controller.c:629
 msgid ""
 "Error:\n"
 "Photo already in the maximum number of groups possible"
@@ -225,7 +227,7 @@ msgstr ""
 "Chyba:\n"
 "Fotka je již v maximálním možném počtu skupin"
 
-#: ../src/frogr-controller.c:633
+#: src/frogr-controller.c:633
 msgid ""
 "Error:\n"
 "Group limit already reached"
@@ -233,7 +235,7 @@ msgstr ""
 "Chyba:\n"
 "Již bylo dosaženo omezení skupiny"
 
-#: ../src/frogr-controller.c:637
+#: src/frogr-controller.c:637
 msgid ""
 "Error:\n"
 "Photo added to group's queue"
@@ -241,7 +243,7 @@ msgstr ""
 "Chyba:\n"
 "Fotka přidána do fronty skupiny"
 
-#: ../src/frogr-controller.c:641
+#: src/frogr-controller.c:641
 msgid ""
 "Error:\n"
 "Photo already added to group's queue"
@@ -249,7 +251,7 @@ msgstr ""
 "Chyba:\n"
 "Fotka je již přidána do fronty skupiny"
 
-#: ../src/frogr-controller.c:645
+#: src/frogr-controller.c:645
 msgid ""
 "Error:\n"
 "Content not allowed for this group"
@@ -257,8 +259,7 @@ msgstr ""
 "Chyba:\n"
 "Obsah není pro tuto skupinu povolen"
 
-#: ../src/frogr-controller.c:649
-#, c-format
+#: src/frogr-controller.c:649
 msgid ""
 "Authorization failed.\n"
 "Please try again"
@@ -266,7 +267,7 @@ msgstr ""
 "Autorizace selhala.\n"
 "Zkuste to prosím znovu"
 
-#: ../src/frogr-controller.c:655
+#: src/frogr-controller.c:655
 #, c-format
 msgid ""
 "Error\n"
@@ -277,8 +278,7 @@ msgstr ""
 "Aplikace %s není správně autorizována k nahrávání obrázků na Flickr.\n"
 "Proveďte prosím autorizaci znovu"
 
-#: ../src/frogr-controller.c:660
-#, c-format
+#: src/frogr-controller.c:660
 msgid ""
 "Unable to authenticate in Flickr\n"
 "Please try again."
@@ -286,7 +286,7 @@ msgstr ""
 "Nelze se autentizovat ke službě Flickr.\n"
 "Zkuste to prosím znovu."
 
-#: ../src/frogr-controller.c:664
+#: src/frogr-controller.c:664
 #, c-format
 msgid ""
 "You have not properly authorized %s yet.\n"
@@ -295,8 +295,7 @@ msgstr ""
 "Aplikaci %s nemáte dosud správně autorizovanou.\n"
 "Zkuste to prosím znovu."
 
-#: ../src/frogr-controller.c:669
-#, c-format
+#: src/frogr-controller.c:669
 msgid ""
 "Invalid verification code.\n"
 "Please try again."
@@ -304,8 +303,7 @@ msgstr ""
 "Neplatný ověřovací kód.\n"
 "Zkuste to prosím znovu"
 
-#: ../src/frogr-controller.c:673
-#, c-format
+#: src/frogr-controller.c:673
 msgid ""
 "Error:\n"
 "Service not available"
@@ -313,64 +311,62 @@ msgstr ""
 "Chyba:\n"
 "Služba není dostupná"
 
-#. General error: just dump the raw error description
-#: ../src/frogr-controller.c:678
+#: src/frogr-controller.c:678
 #, c-format
 msgid "An error happened: %s."
 msgstr "Vyskytla se chyba: %s."
 
-#: ../src/frogr-controller.c:883
+#: src/frogr-controller.c:883
 msgid "Authorization failed (timed out)"
 msgstr "Autorizace selhala (vypršel čas)"
 
-#: ../src/frogr-controller.c:931
+#: src/frogr-controller.c:931
 #, c-format
 msgid "Retrying Upload (attempt %d/%d)…"
 msgstr "Zkouší se znovu nahrát (pokus %d/%d)…"
 
-#: ../src/frogr-controller.c:936
+#: src/frogr-controller.c:936
 #, c-format
 msgid "Uploading '%s'…"
 msgstr "Nahrává se „%s“…"
 
-#: ../src/frogr-controller.c:2242
+#: src/frogr-controller.c:2242
 msgid "Updating credentials…"
 msgstr "Aktualizuje se pověření…"
 
-#: ../src/frogr-controller.c:2247
+#: src/frogr-controller.c:2247
 msgid "Retrieving data for authorization…"
 msgstr "Získávají se údaje pro autorizaci…"
 
-#: ../src/frogr-controller.c:2252
+#: src/frogr-controller.c:2252
 msgid "Finishing authorization…"
 msgstr "Dokončuje se autorizace…"
 
-#: ../src/frogr-controller.c:2257
+#: src/frogr-controller.c:2257
 msgid "Retrieving list of sets…"
 msgstr "Získává se seznam sad…"
 
-#: ../src/frogr-controller.c:2262
+#: src/frogr-controller.c:2262
 msgid "Retrieving list of groups…"
 msgstr "Získává se seznam skupin…"
 
-#: ../src/frogr-controller.c:2267
+#: src/frogr-controller.c:2267
 msgid "Retrieving list of tags…"
 msgstr "Získává se seznam štítků…"
 
-#: ../src/frogr-controller.c:2292
-#, c-format
+#: src/frogr-controller.c:2292
 msgid "Fetching information"
 msgstr "Získávají se informace"
 
-#: ../src/frogr-controller.c:2398
+#: src/frogr-controller.c:2398
 msgid "No sets found"
 msgstr "Nenalezeny žádné sady"
 
-#: ../src/frogr-controller.c:2423
+#: src/frogr-controller.c:2423
 msgid "No groups found"
 msgstr "Nenalezena žádná skupina"
 
-#: ../src/frogr-controller.c:2984
+#: src/frogr-controller.c:2984
 #, c-format
 msgid ""
 "You need to properly authorize %s before uploading any pictures to Flickr.\n"
@@ -380,163 +376,159 @@ msgstr ""
 "autorizovat.\n"
 "Autorizujte ji prosím znovu."
 
-#: ../src/frogr-controller.c:2994
-#, c-format
+#: src/frogr-controller.c:2994
 msgid "You need to be connected before uploading any pictures to Flickr."
 msgstr "Než můžete nahrávat obrázky na Flickr, musíte být připojeni."
 
-#: ../src/frogr-controller.c:3012
+#: src/frogr-controller.c:3012
 msgid "Uploading Pictures"
 msgstr "Nahrávají se obrázky"
 
-#: ../src/frogr-controller.c:3057
-#, c-format
+#: src/frogr-controller.c:3057
 msgid "Error opening project file"
 msgstr "Chyba při otevírání projektového souboru"
 
-#. This shows a dialog notifying the problem to the user
-#: ../src/frogr-create-new-set-dialog.c:143 ../src/frogr-details-dialog.c:1001
+#: src/frogr-create-new-set-dialog.c:143 src/frogr-details-dialog.c:1001
 msgid "Missing data required"
 msgstr "Schází požadovaná data"
 
-#: ../src/frogr-create-new-set-dialog.c:326
+#: src/frogr-create-new-set-dialog.c:326
 msgid "Title:"
 msgstr "Název:"
 
-#: ../src/frogr-create-new-set-dialog.c:335
+#: src/frogr-create-new-set-dialog.c:335
 msgid "Description:"
 msgstr "Popis:"
 
-#: ../src/frogr-create-new-set-dialog.c:356
+#: src/frogr-create-new-set-dialog.c:356
 msgid "Fill Pictures Details with Title and Description"
 msgstr "Vyplnit údaje o obrázku podle názvu a popisu"
 
-#: ../src/frogr-create-new-set-dialog.c:381
+#: src/frogr-create-new-set-dialog.c:381
 msgid "Create New Set"
 msgstr "Vytvoření nové sady"
 
-#: ../src/frogr-details-dialog.c:89 ../src/frogr-settings-dialog.c:97
+#: src/frogr-details-dialog.c:89 src/frogr-settings-dialog.c:97
 msgid "Default (as specified in Flickr)"
 msgstr "Výchozí (jak je definována na webu Flickr)"
 
-#: ../src/frogr-details-dialog.c:90 ../src/frogr-settings-dialog.c:98
+#: src/frogr-details-dialog.c:90 src/frogr-settings-dialog.c:98
 msgid "All rights reserved"
 msgstr "Všechna práva vyhrazena"
 
-#: ../src/frogr-details-dialog.c:91 ../src/frogr-settings-dialog.c:99
+#: src/frogr-details-dialog.c:91 src/frogr-settings-dialog.c:99
 msgid "CC Attribution-NonCommercial-ShareAlike"
 msgstr "CC Attribution-NonCommercial-ShareAlike"
 
-#: ../src/frogr-details-dialog.c:92 ../src/frogr-settings-dialog.c:100
+#: src/frogr-details-dialog.c:92 src/frogr-settings-dialog.c:100
 msgid "CC Attribution-NonCommercial"
 msgstr "CC Attribution-NonCommercial"
 
-#: ../src/frogr-details-dialog.c:93 ../src/frogr-settings-dialog.c:101
+#: src/frogr-details-dialog.c:93 src/frogr-settings-dialog.c:101
 msgid "CC Attribution-NonCommercial-NoDerivs"
 msgstr "CC Attribution-NonCommercial-NoDerivs"
 
-#: ../src/frogr-details-dialog.c:94 ../src/frogr-settings-dialog.c:102
+#: src/frogr-details-dialog.c:94 src/frogr-settings-dialog.c:102
 msgid "CC Attribution"
 msgstr "CC Attribution"
 
-#: ../src/frogr-details-dialog.c:95 ../src/frogr-settings-dialog.c:103
+#: src/frogr-details-dialog.c:95 src/frogr-settings-dialog.c:103
 msgid "CC Attribution-ShareAlike"
 msgstr "CC Attribution-ShareAlike"
 
-#: ../src/frogr-details-dialog.c:96 ../src/frogr-settings-dialog.c:104
+#: src/frogr-details-dialog.c:96 src/frogr-settings-dialog.c:104
 msgid "CC Attribution-NoDerivs"
 msgstr "CC Attribution-NoDerivs"
 
-#: ../src/frogr-details-dialog.c:172
+#: src/frogr-details-dialog.c:172
 msgid "Open with image viewer"
 msgstr "Otevřít v prohlížeči obrázků"
 
-#: ../src/frogr-details-dialog.c:190
+#: src/frogr-details-dialog.c:190
 msgid "_Title:"
 msgstr "Náze_v:"
 
-#: ../src/frogr-details-dialog.c:200
+#: src/frogr-details-dialog.c:200
 msgid "_Description:"
 msgstr "Popi_s:"
 
-#: ../src/frogr-details-dialog.c:224
+#: src/frogr-details-dialog.c:224
 msgid "Ta_gs:"
 msgstr "Š_títky:"
 
-#: ../src/frogr-details-dialog.c:247
+#: src/frogr-details-dialog.c:247
 msgid "Visibility"
 msgstr "Viditelnost"
 
-#: ../src/frogr-details-dialog.c:257 ../src/frogr-settings-dialog.c:196
+#: src/frogr-details-dialog.c:257 src/frogr-settings-dialog.c:196
 msgid "_Private"
 msgstr "_Soukromé"
 
-#: ../src/frogr-details-dialog.c:261 ../src/frogr-settings-dialog.c:199
+#: src/frogr-details-dialog.c:261 src/frogr-settings-dialog.c:199
 msgid "P_ublic"
 msgstr "_Veřejné"
 
-#: ../src/frogr-details-dialog.c:270 ../src/frogr-settings-dialog.c:207
+#: src/frogr-details-dialog.c:270 src/frogr-settings-dialog.c:207
 msgid "_Family"
 msgstr "_Rodina"
 
-#: ../src/frogr-details-dialog.c:274 ../src/frogr-settings-dialog.c:209
+#: src/frogr-details-dialog.c:274 src/frogr-settings-dialog.c:209
 msgid "F_riends"
 msgstr "Přáte_lé"
 
-#: ../src/frogr-details-dialog.c:288
+#: src/frogr-details-dialog.c:288
 msgid "Content Type"
 msgstr "Typ obsahu"
 
-#: ../src/frogr-details-dialog.c:296 ../src/frogr-settings-dialog.c:234
+#: src/frogr-details-dialog.c:296 src/frogr-settings-dialog.c:234
 msgid "P_hoto"
 msgstr "_Fotka"
 
-#: ../src/frogr-details-dialog.c:300 ../src/frogr-settings-dialog.c:236
+#: src/frogr-details-dialog.c:300 src/frogr-settings-dialog.c:236
 msgid "Scree_nshot"
 msgstr "S_nímek obrazovky"
 
-#: ../src/frogr-details-dialog.c:304 ../src/frogr-settings-dialog.c:238
+#: src/frogr-details-dialog.c:304 src/frogr-settings-dialog.c:238
 msgid "Oth_er"
 msgstr "_Jiný"
 
-#: ../src/frogr-details-dialog.c:317
+#: src/frogr-details-dialog.c:317
 msgid "Safety Level"
 msgstr "Úroveň zabezpečení"
 
-#: ../src/frogr-details-dialog.c:325 ../src/frogr-settings-dialog.c:260
+#: src/frogr-details-dialog.c:325 src/frogr-settings-dialog.c:260
 msgid "S_afe"
 msgstr "_Bezpečné"
 
-#: ../src/frogr-details-dialog.c:329 ../src/frogr-settings-dialog.c:262
+#: src/frogr-details-dialog.c:329 src/frogr-settings-dialog.c:262
 msgid "_Moderate"
 msgstr "S_třední"
 
-#: ../src/frogr-details-dialog.c:333 ../src/frogr-settings-dialog.c:264
+#: src/frogr-details-dialog.c:333 src/frogr-settings-dialog.c:264
 msgid "Restr_icted"
 msgstr "O_mezeno"
 
-#: ../src/frogr-details-dialog.c:345
+#: src/frogr-details-dialog.c:345
 msgid "License Type"
 msgstr "Typ licence "
 
-#: ../src/frogr-details-dialog.c:367
+#: src/frogr-details-dialog.c:367
 msgid "Other Properties"
 msgstr "Ostatní vlastnosti"
 
-#: ../src/frogr-details-dialog.c:375
+#: src/frogr-details-dialog.c:375
 msgid "_Show Up in Global Search Results"
 msgstr "Zobrazovat v globálních vý_sledcích hledání"
 
-#: ../src/frogr-details-dialog.c:379
+#: src/frogr-details-dialog.c:379
 msgid "Set Geo_location Information"
 msgstr "Nastavit zeměpisnou polohu obrázku"
 
-#: ../src/frogr-details-dialog.c:383
+#: src/frogr-details-dialog.c:383
 msgid "Replace 'Date Posted' with 'Date Taken'"
 msgstr "Nahradit „Datum zveřejnění“ pomocí „Data pořízení“"
 
-#. Visually indicate how many pictures are being edited
-#: ../src/frogr-details-dialog.c:475
+#: src/frogr-details-dialog.c:475
 #, c-format
 msgid "(%d Picture)"
 msgid_plural "(%d Pictures)"
@@ -544,24 +536,24 @@ msgstr[0] "(%d obrázek)"
 msgstr[1] "(%d obrázky)"
 msgstr[2] "(%d obrázků)"
 
-#: ../src/frogr-details-dialog.c:548
+#: src/frogr-details-dialog.c:548
 msgid "An error happened trying to load the picture"
 msgstr "Vyskytla se chyba při načítání obrázku"
 
-#: ../src/frogr-details-dialog.c:1169 ../data/gtkbuilder/frogr-menu-bar.xml.h:8
+#: src/frogr-details-dialog.c:1169
 msgid "_Edit"
 msgstr "_Upravit"
 
-#: ../src/frogr-details-dialog.c:1197
+#: src/frogr-details-dialog.c:1197
 msgid "Edit Picture Details"
 msgstr "Úprava údajů o obrázku"
 
-#: ../src/frogr-file-loader.c:142
+#: src/frogr-file-loader.c:142
 #, c-format
 msgid "Loading files %d / %d"
 msgstr "Načítají se soubory %d/%d"
 
-#: ../src/frogr-file-loader.c:369
+#: src/frogr-file-loader.c:369
 #, c-format
 msgid ""
 "Unable to load picture %s:\n"
@@ -570,7 +562,7 @@ msgstr ""
 "Nelze načíst obrázek %s:\n"
 "%s"
 
-#: ../src/frogr-file-loader.c:400
+#: src/frogr-file-loader.c:400
 #, c-format
 msgid ""
 "Unable to load video %s\n"
@@ -579,10 +571,7 @@ msgstr ""
 "Nelze načíst video %s\n"
 "Zkontrolujte, jestli máte nainstalovaný správný kodek"
 
-#. First %s is the title of the picture (filename of the file by
-#. default). Second %s is the max allowed size for a picture to be
-#. uploaded to flickr (different for free and PRO accounts).
-#: ../src/frogr-file-loader.c:636
+#: src/frogr-file-loader.c:636
 #, c-format
 msgid ""
 "Can't load file %s:\n"
@@ -591,150 +580,135 @@ msgstr ""
 "Nelze načíst soubor %s:\n"
 "Velikost souboru je větší než povolené maximum pro tento účet (%s)"
 
-#. First create the left side buttons
-#: ../src/frogr-main-view.c:630 ../src/frogr-main-view.c:726
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
 msgid "Open"
 msgstr "Otevřít"
 
-#: ../src/frogr-main-view.c:630 ../src/frogr-main-view.c:726
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
 msgid "Open Existing Project"
 msgstr "Otevřít existující projekt"
 
-#: ../src/frogr-main-view.c:631 ../src/frogr-main-view.c:729
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
 msgid "Add"
 msgstr "Přidat"
 
-#: ../src/frogr-main-view.c:631 ../src/frogr-main-view.c:729
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
 msgid "Add Elements"
 msgstr "Přidat objekty"
 
-#: ../src/frogr-main-view.c:632 ../src/frogr-main-view.c:730
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
 msgid "Remove"
 msgstr "Odebrat"
 
-#: ../src/frogr-main-view.c:632 ../src/frogr-main-view.c:730
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
 msgid "Remove Elements"
 msgstr "Odebrat objekty"
 
-#: ../src/frogr-main-view.c:633 ../src/frogr-main-view.c:732
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
 msgid "Upload"
 msgstr "Nahrát"
 
-#: ../src/frogr-main-view.c:633 ../src/frogr-main-view.c:732
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
 msgid "Upload All"
 msgstr "Nahrát vše"
 
-#. Save project item
-#: ../src/frogr-main-view.c:666 ../src/frogr-main-view.c:727
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
 msgid "Save"
 msgstr "Uložit"
 
-#: ../src/frogr-main-view.c:666 ../src/frogr-main-view.c:727
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
 msgid "Save Current Project"
 msgstr "Uložit současný projekt"
 
-#: ../src/frogr-main-view.c:1016 ../data/gtkbuilder/frogr-app-menu.xml.h:4
+#: src/frogr-main-view.c:1016
 msgid "_About"
 msgstr "O _aplikaci"
 
-#: ../src/frogr-main-view.c:1020 ../data/gtkbuilder/frogr-app-menu.xml.h:5
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:17
+#: src/frogr-main-view.c:1020
 msgid "_Quit"
 msgstr "U_končit"
 
-#. Create the submenu and insert it in the right section
-#: ../src/frogr-main-view.c:1070
+#: src/frogr-main-view.c:1070
 msgid "Accounts"
 msgstr "Účty"
 
-#. String showind the date and time a picture was taken
-#: ../src/frogr-main-view.c:1410
+#: src/frogr-main-view.c:1410
 #, c-format
 msgid "Taken: %s"
 msgstr "Pořízen: %s"
 
-#: ../src/frogr-main-view.c:1415
+#: src/frogr-main-view.c:1415
 #, c-format
 msgid "File size: %s"
 msgstr "Velikost souboru: %s"
 
-#: ../src/frogr-main-view.c:1540
+#: src/frogr-main-view.c:1540
 msgid "Select File"
 msgstr "Výběr souboru"
 
-#: ../src/frogr-main-view.c:1544 ../src/frogr-main-view.c:1671
+#: src/frogr-main-view.c:1544 src/frogr-main-view.c:1671
 msgid "_Open"
 msgstr "_Otevřít"
 
-#: ../src/frogr-main-view.c:1553
+#: src/frogr-main-view.c:1553
 msgid "Frogr Project Files"
 msgstr "Projektové soubory Frogr"
 
-#: ../src/frogr-main-view.c:1615
+#: src/frogr-main-view.c:1615
 msgid "Select Destination"
 msgstr "Výběr cíle"
 
-#: ../src/frogr-main-view.c:1619 ../data/gtkbuilder/frogr-menu-bar.xml.h:3
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:1
+#: src/frogr-main-view.c:1619
 msgid "_Save"
 msgstr "_Uložit"
 
-#: ../src/frogr-main-view.c:1622
+#: src/frogr-main-view.c:1622
 msgid "Untitled Project.frogr"
 msgstr "Nepojmenovaný projekt.frogr"
 
-#: ../src/frogr-main-view.c:1667
+#: src/frogr-main-view.c:1667
 msgid "Select a Picture"
 msgstr "Výběr obrázku"
 
-#: ../src/frogr-main-view.c:1694
+#: src/frogr-main-view.c:1694
 msgid "All Files"
 msgstr "Všechny soubory"
 
-#: ../src/frogr-main-view.c:1697
+#: src/frogr-main-view.c:1697
 msgid "Image Files"
 msgstr "Obrázky"
 
-#: ../src/frogr-main-view.c:1701
+#: src/frogr-main-view.c:1701
 msgid "Video Files"
 msgstr "Videa"
 
-#: ../src/frogr-main-view.c:1723
+#: src/frogr-main-view.c:1723
 msgid "You don't have any picture added yet"
 msgstr "Zatím nemáte přidaný žádný obrázek"
 
-#: ../src/frogr-main-view.c:1736
+#: src/frogr-main-view.c:1736
 msgid "You need to select some pictures first"
 msgstr "Nejdříve musíte vybrat nějaké obrázky"
 
-#: ../src/frogr-main-view.c:2108
+#: src/frogr-main-view.c:2108
 msgid "Not connected to Flickr"
 msgstr "Nepřipojeno na Flickr"
 
-#. Login string, showing the user is PRO (second '%s') if so.
-#: ../src/frogr-main-view.c:2118
+#: src/frogr-main-view.c:2118
 #, c-format
 msgid "Connected as %s%s"
 msgstr "Připojen jako %s%s"
 
-#: ../src/frogr-main-view.c:2119
+#: src/frogr-main-view.c:2119
 msgid " (PRO account)"
 msgstr "(účet PRO)"
 
-#. Will show in the status bar the amount of data (in KB, MB
-#. or GB) the user is currently allowed to upload to flicker
-#. till the end of the month, in a CURRENT / MAX fashion.
-#. The '-' at the beginning is just a separator, since more
-#. blocks of text will be shown in the status bar too.
-#: ../src/frogr-main-view.c:2143
+#: src/frogr-main-view.c:2143
 #, c-format
 msgid " - %s / %s remaining"
 msgstr " – %s / %s zbývá"
 
-#. Will show in the status bar the amount of pictures and data
-#. (in KB, MB or GB) that would be uploaded as the sum of the
-#. sizes for every picture loaded in the application
-#: ../src/frogr-main-view.c:2169
+#: src/frogr-main-view.c:2169
 #, c-format
 msgid " - %d file to upload (%s)"
 msgid_plural " - %d files to upload (%s)"
@@ -742,217 +716,166 @@ msgstr[0] " – bude nahrán %d soubor (%s)"
 msgstr[1] " – budou nahrány %d soubory (%s)"
 msgstr[2] " – bude nahráno %d souborů (%s)"
 
-#: ../src/frogr-settings-dialog.c:185
+#: src/frogr-settings-dialog.c:185
 msgid "Default Visibility"
 msgstr "Výchozí viditelnost"
 
-#: ../src/frogr-settings-dialog.c:224
+#: src/frogr-settings-dialog.c:224
 msgid "Default Content Type"
 msgstr "Výchozí typ obsahu"
 
-#: ../src/frogr-settings-dialog.c:250
+#: src/frogr-settings-dialog.c:250
 msgid "Default Safety Level"
 msgstr "Výchozí úroveň bezpečnosti"
 
-#: ../src/frogr-settings-dialog.c:276
+#: src/frogr-settings-dialog.c:276
 msgid "Default License"
 msgstr "Výchozí licence"
 
-#: ../src/frogr-settings-dialog.c:302
+#: src/frogr-settings-dialog.c:302
 msgid "Other Defaults"
 msgstr "Ostatní výchozí údaje"
 
-#: ../src/frogr-settings-dialog.c:312
+#: src/frogr-settings-dialog.c:312
 msgid "_Show Pictures in Global Search Results"
 msgstr "Zobrazovat v globálních vý_sledcích hledání"
 
-#: ../src/frogr-settings-dialog.c:315
+#: src/frogr-settings-dialog.c:315
 msgid "Set Geo_location Information for Pictures"
 msgstr "Nastavit ze_měpisnou polohu obrázku"
 
-#: ../src/frogr-settings-dialog.c:318
+#: src/frogr-settings-dialog.c:318
 msgid "Replace 'Date Posted' with 'Date Taken' for Pictures"
 msgstr "U obrázků nahradit „Datum zveřejnění“ pomocí „Data pořízení“"
 
-#: ../src/frogr-settings-dialog.c:324
+#: src/frogr-settings-dialog.c:324
 msgid "_General"
 msgstr "Obe_cné"
 
-#: ../src/frogr-settings-dialog.c:344
+#: src/frogr-settings-dialog.c:344
 msgid "Proxy Settings"
 msgstr "Nastavení proxy"
 
-#. Enable proxy
-#: ../src/frogr-settings-dialog.c:353
+#: src/frogr-settings-dialog.c:353
 msgid "_Enable HTTP Proxy"
 msgstr "Zapnout pro_xy HTTP"
 
-#: ../src/frogr-settings-dialog.c:363
+#: src/frogr-settings-dialog.c:363
 msgid "_Host:"
 msgstr "Počít_ač:"
 
-#. Proxy port
-#: ../src/frogr-settings-dialog.c:376
+#: src/frogr-settings-dialog.c:376
 msgid "_Port:"
 msgstr "_Port:"
 
-#. Proxy username
-#: ../src/frogr-settings-dialog.c:389
+#: src/frogr-settings-dialog.c:389
 msgid "U_sername:"
 msgstr "Uživatel_ské jméno:"
 
-#. Proxy password
-#: ../src/frogr-settings-dialog.c:402
+#: src/frogr-settings-dialog.c:402
 msgid "Pass_word:"
 msgstr "_Heslo:"
 
-#: ../src/frogr-settings-dialog.c:426
+#: src/frogr-settings-dialog.c:426
 msgid "Connec_tion"
 msgstr "Připoj_ení"
 
-#: ../src/frogr-settings-dialog.c:444
+#: src/frogr-settings-dialog.c:444
 msgid "Other options"
 msgstr "Ostatní volby"
 
-#: ../src/frogr-settings-dialog.c:454
+#: src/frogr-settings-dialog.c:454
 msgid "Ena_ble Tags Auto-Completion"
 msgstr "Zapnout automatické _dokončování štítků"
 
-#: ../src/frogr-settings-dialog.c:457
+#: src/frogr-settings-dialog.c:457
 msgid "_Import Tags from Pictures Metadata"
 msgstr "_Importovat štítky z metadat obrázků"
 
-#: ../src/frogr-settings-dialog.c:461
+#: src/frogr-settings-dialog.c:461
 msgid "Use _Dark GTK Theme"
 msgstr "Používat motiv GTK _Dark"
 
-#: ../src/frogr-settings-dialog.c:465
+#: src/frogr-settings-dialog.c:465
 msgid "_Keep File Extensions in Titles when Loading"
 msgstr "Z_achovat přípony souborů v názvech načítaných obrázků"
 
-#: ../src/frogr-settings-dialog.c:471
+#: src/frogr-settings-dialog.c:471
 msgid "_Misc"
 msgstr "Růz_né"
 
-#: ../src/frogr-settings-dialog.c:972
+#: src/frogr-settings-dialog.c:972
 msgid "Preferences"
 msgstr "Předvolby"
 
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:1
-msgid "Aut_horize Account…"
-msgstr "A_utorizovat se k účtu…"
-
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:2
-msgid "_Preferences…"
-msgstr "_Předvolby…"
-
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:3
-msgid "_Help"
-msgstr "_Nápověda"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:1
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:9
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:3
-msgid "_Edit Details…"
-msgstr "Upravit po_drobnosti…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:2
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:10
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:4
-msgid "Add _Tags…"
-msgstr "Přidat š_títky…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:3
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:11
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:5
-msgid "Add to _Group…"
-msgstr "Přidat do sk_upiny…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:4
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:12
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:6
-msgid "Add to _Photoset"
-msgstr "_Přidat do sady"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:5
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:13
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:7
-msgid "_Add to Existing Photoset…"
-msgstr "Přid_at do existující sady…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:6
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:14
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:8
-msgid "_Create New Photoset…"
-msgstr "_Vytvořit novou sadu…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:7
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:15
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:16
-msgid "_Open in External Viewer"
-msgstr "_Otevřít v externím prohlížeči"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:8
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:6
-msgid "_Remove Elements"
-msgstr "Odeb_rat objekty"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:1
-msgid "_File"
-msgstr "_Soubor"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:2
-msgid "_Open…"
-msgstr "_Otevřít…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:4
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:2
-msgid "Save _As…"
-msgstr "Uložit j_ako…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:5
-msgid "A_dd Elements…"
-msgstr "Při_dat objekty…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:7
-msgid "_Upload All"
-msgstr "Nahrát _vše"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:16
-msgid "_View"
-msgstr "_Zobrazit"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:17
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:9
-msgid "_Sort Elements"
-msgstr "_Seřadit objekty"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:18
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:10
-msgid "As _Loaded"
-msgstr "Jak by_ly načteny"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:19
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:11
-msgid "By _Date Taken"
-msgstr "Podle _data pořízení"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:20
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:12
-msgid "By _Title"
-msgstr "Podle _názvu"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:21
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:13
-msgid "By _Size"
-msgstr "Podle veliko_sti"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:22
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:14
-msgid "_Reversed Order"
-msgstr "_Opačné pořadí"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:23
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:15
-msgid "Enable _Tooltips"
-msgstr "Zapnout vysvě_tlivky"
+#~ msgid "Aut_horize Account…"
+#~ msgstr "A_utorizovat se k účtu…"
+
+#~ msgid "_Preferences…"
+#~ msgstr "_Předvolby…"
+
+#~ msgid "_Help"
+#~ msgstr "_Nápověda"
+
+#~ msgid "_Edit Details…"
+#~ msgstr "Upravit po_drobnosti…"
+
+#~ msgid "Add _Tags…"
+#~ msgstr "Přidat š_títky…"
+
+#~ msgid "Add to _Group…"
+#~ msgstr "Přidat do sk_upiny…"
+
+#~ msgid "Add to _Photoset"
+#~ msgstr "_Přidat do sady"
+
+#~ msgid "_Add to Existing Photoset…"
+#~ msgstr "Přid_at do existující sady…"
+
+#~ msgid "_Create New Photoset…"
+#~ msgstr "_Vytvořit novou sadu…"
+
+#~ msgid "_Open in External Viewer"
+#~ msgstr "_Otevřít v externím prohlížeči"
+
+#~ msgid "_Remove Elements"
+#~ msgstr "Odeb_rat objekty"
+
+#~ msgid "_File"
+#~ msgstr "_Soubor"
+
+#~ msgid "_Open…"
+#~ msgstr "_Otevřít…"
+
+#~ msgid "Save _As…"
+#~ msgstr "Uložit j_ako…"
+
+#~ msgid "A_dd Elements…"
+#~ msgstr "Při_dat objekty…"
+
+#~ msgid "_Upload All"
+#~ msgstr "Nahrát _vše"
+
+#~ msgid "_View"
+#~ msgstr "_Zobrazit"
+
+#~ msgid "_Sort Elements"
+#~ msgstr "_Seřadit objekty"
+
+#~ msgid "As _Loaded"
+#~ msgstr "Jak by_ly načteny"
+
+#~ msgid "By _Date Taken"
+#~ msgstr "Podle _data pořízení"
+
+#~ msgid "By _Title"
+#~ msgstr "Podle _názvu"
+
+#~ msgid "By _Size"
+#~ msgstr "Podle veliko_sti"
+
+#~ msgid "_Reversed Order"
+#~ msgstr "_Opačné pořadí"
+
+#~ msgid "Enable _Tooltips"
+#~ msgstr "Zapnout vysvě_tlivky"
diff --git a/po/da.po b/po/da.po
index 01a37c1..2bcfc26 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: frogr master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-06 11:08+0200\n"
+"Report-Msgid-Bugs-To: msanchez gnome org\n"
+"POT-Creation-Date: 2016-08-12 13:09+0100\n"
 "PO-Revision-Date: 2013-03-28 12:12+0000\n"
 "Last-Translator: Joe Hansen <joedalton2 yahoo dk>\n"
 "Language-Team: Danish <dansk dansk-gruppen dk>\n"
@@ -19,23 +19,52 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/frogr.desktop.in.in.h:1
-msgid "Frogr"
+#: data/frogr.appdata.xml.in:5 data/frogr.desktop.in.in:5
+#: data/frogr.desktop.in.in:14
+#, fuzzy
+msgid "frogr"
 msgstr "Frogr"
 
-#: ../data/frogr.desktop.in.in.h:2
-msgid "Frogr: a Flickr Remote Organizer for GNOME"
+#: data/frogr.appdata.xml.in:6 data/frogr.desktop.in.in:6
+#, fuzzy
+msgid "frogr: a Flickr Remote Organizer for GNOME"
 msgstr "Frogr: En ekstern organisator til Flickr for GNOME"
 
-#: ../data/frogr.desktop.in.in.h:3
+#: data/frogr.appdata.xml.in:8
+msgid ""
+"frogr is a small application for the GNOME desktop that allows users to "
+"manage their accounts in the Flickr image hosting website."
+msgstr ""
+
+#: data/frogr.appdata.xml.in:13
+msgid ""
+"It supports all the basic Flickr features, including uploading pictures, "
+"adding descriptions, setting tags and managing sets and groups pools."
+msgstr ""
+
+#: data/frogr.appdata.xml.in:24
+#, fuzzy
+msgid "Screenshot of frogr"
+msgstr "_Skærmbillede"
+
+#: data/frogr.appdata.xml.in:29
+msgid "Mario Sanchez Prada"
+msgstr ""
+
+#: data/frogr.desktop.in.in:7
 msgid "Upload and organize photos in Flickr accounts"
 msgstr "Overfør og organiser billeder i Flickr-konti"
 
-#: ../src/frogr-about-dialog.c:43
-msgid "A Flickr remote organizer for GNOME\n"
+#: data/frogr.desktop.in.in:8
+msgid "Flickr;Image;Picture;Photo;Video;Uploader;"
+msgstr ""
+
+#: src/frogr-about-dialog.c:43
+#, fuzzy
+msgid "A Flickr Remote Organizer for GNOME\n"
 msgstr "En ekstern organisator til Flickr for GNOME\n"
 
-#: ../src/frogr-about-dialog.c:72
+#: src/frogr-about-dialog.c:72
 msgid "translator-credits"
 msgstr ""
 "Joe Hansen, 2011, 2012, 2013.\n"
@@ -43,35 +72,48 @@ msgstr ""
 "Dansk-gruppen <dansk dansk-gruppen dk>\n"
 "Mere info: http://www.dansk-gruppen.dk";
 
-#: ../src/frogr-add-tags-dialog.c:207
+#: src/frogr-add-tags-dialog.c:191 src/frogr-add-to-group-dialog.c:528
+#: src/frogr-add-to-set-dialog.c:529 src/frogr-auth-dialog.c:153
+#: src/frogr-create-new-set-dialog.c:310 src/frogr-details-dialog.c:1168
+#: src/frogr-main-view.c:1543 src/frogr-main-view.c:1618
+#: src/frogr-main-view.c:1670 src/frogr-settings-dialog.c:930
+msgid "_Cancel"
+msgstr ""
+
+#: src/frogr-add-tags-dialog.c:193 src/frogr-add-to-group-dialog.c:530
+#: src/frogr-add-to-set-dialog.c:531 src/frogr-create-new-set-dialog.c:312
+msgid "_Add"
+msgstr ""
+
+#: src/frogr-add-tags-dialog.c:202
 msgid "Enter a spaces separated list of tags:"
 msgstr "Indtast en mellemrumsadskilt liste af mærker:"
 
-#: ../src/frogr-add-tags-dialog.c:230
+#: src/frogr-add-tags-dialog.c:228
 msgid "Add Tags"
 msgstr "Tilføj mærker"
 
-#: ../src/frogr-add-to-set-dialog.c:155
-msgid "Title"
+#: src/frogr-add-to-group-dialog.c:147
+msgid "Name"
 msgstr "Navn"
 
-#: ../src/frogr-add-to-set-dialog.c:170 ../src/frogr-add-to-group-dialog.c:169
+#: src/frogr-add-to-group-dialog.c:162 src/frogr-add-to-set-dialog.c:163
 msgid "Elements"
 msgstr "Elementer"
 
-#: ../src/frogr-add-to-set-dialog.c:602
-msgid "Add to Sets"
-msgstr "Tilføj til sæt"
+#: src/frogr-add-to-group-dialog.c:581
+msgid "Add to Groups"
+msgstr "Tilføj til grupper"
 
-#: ../src/frogr-add-to-group-dialog.c:154
-msgid "Name"
+#: src/frogr-add-to-set-dialog.c:148
+msgid "Title"
 msgstr "Navn"
 
-#: ../src/frogr-add-to-group-dialog.c:601
-msgid "Add to Groups"
-msgstr "Tilføj til grupper"
+#: src/frogr-add-to-set-dialog.c:582
+msgid "Add to Sets"
+msgstr "Tilføj til sæt"
 
-#: ../src/frogr-auth-dialog.c:52
+#: src/frogr-auth-dialog.c:59
 #, c-format
 msgid ""
 "Please press the button to authorize %s and then come back to complete the "
@@ -80,25 +122,29 @@ msgstr ""
 "Tryk venligst på knappen for at godkende %s og kom så tilbage for at "
 "færdigbehandle processen."
 
-#: ../src/frogr-auth-dialog.c:56 ../src/frogr-auth-dialog.c:141
+#: src/frogr-auth-dialog.c:63 src/frogr-auth-dialog.c:149
+#: src/frogr-controller.c:2286
 #, c-format
 msgid "Authorize %s"
 msgstr "Godkend %s"
 
-#. Description label
-#: ../src/frogr-auth-dialog.c:158
+#: src/frogr-auth-dialog.c:155 src/frogr-settings-dialog.c:932
+msgid "_Close"
+msgstr ""
+
+#: src/frogr-auth-dialog.c:167
 msgid "Enter verification code:"
 msgstr "Indtast verificeringskode:"
 
-#: ../src/frogr-auth-dialog.c:209
+#: src/frogr-auth-dialog.c:221
 msgid "Invalid verification code"
 msgstr "Ugyldig verificeringskode"
 
-#: ../src/frogr-controller.c:593
+#: src/frogr-controller.c:581
 msgid "Process cancelled"
 msgstr "Proces afbrudt"
 
-#: ../src/frogr-controller.c:598
+#: src/frogr-controller.c:586
 msgid ""
 "Connection error:\n"
 "Network not available"
@@ -106,7 +152,7 @@ msgstr ""
 "Forbindelsesfejl:\n"
 "Netværk er ikke tilgængeligt"
 
-#: ../src/frogr-controller.c:602
+#: src/frogr-controller.c:590
 msgid ""
 "Connection error:\n"
 "Bad request"
@@ -114,7 +160,7 @@ msgstr ""
 "Forbindelsesfejl:\n"
 "Ugyldig forespørgsel"
 
-#: ../src/frogr-controller.c:606
+#: src/frogr-controller.c:594
 msgid ""
 "Connection error:\n"
 "Server-side error"
@@ -122,7 +168,7 @@ msgstr ""
 "Forbindelsesfejl:\n"
 "Fejl på serverside"
 
-#: ../src/frogr-controller.c:610
+#: src/frogr-controller.c:598
 msgid ""
 "Error uploading:\n"
 "File invalid"
@@ -130,7 +176,7 @@ msgstr ""
 "Fejl under overførsel:\n"
 "Fil er ugyldig"
 
-#: ../src/frogr-controller.c:614
+#: src/frogr-controller.c:602
 msgid ""
 "Error uploading picture:\n"
 "Quota exceeded"
@@ -138,14 +184,14 @@ msgstr ""
 "Fejl under overførsel af billede:\n"
 "Kvote er overskredet"
 
-#: ../src/frogr-controller.c:619
+#: src/frogr-controller.c:607
 #, c-format
 msgid "Quota exceeded (limit: %d video per month)"
 msgid_plural "Quota exceeded (limit: %d videos per month)"
 msgstr[0] "Kvote overskredet (begrænsning: %d video per måned)"
 msgstr[1] "Kvote overskredet (begrænsning: %d videoer per måned)"
 
-#: ../src/frogr-controller.c:623
+#: src/frogr-controller.c:611
 msgid ""
 "Error uploading video:\n"
 "You can't upload more videos with this account"
@@ -153,7 +199,7 @@ msgstr ""
 "Fejl under overførsel af video:\n"
 "Du kan ikke overføre flere videoer med denne konto"
 
-#: ../src/frogr-controller.c:629
+#: src/frogr-controller.c:617
 msgid ""
 "Error:\n"
 "Photo not found"
@@ -161,7 +207,7 @@ msgstr ""
 "Fejl:\n"
 "Billede blev ikke fundet"
 
-#: ../src/frogr-controller.c:633
+#: src/frogr-controller.c:621
 msgid ""
 "Error:\n"
 "Photo already in photoset"
@@ -169,7 +215,7 @@ msgstr ""
 "Fejl:\n"
 "Billede er allerede i billedsættet"
 
-#: ../src/frogr-controller.c:637
+#: src/frogr-controller.c:625
 msgid ""
 "Error:\n"
 "Photo already in group"
@@ -177,7 +223,7 @@ msgstr ""
 "Fejl:\n"
 "Billede er allerede i gruppen"
 
-#: ../src/frogr-controller.c:641
+#: src/frogr-controller.c:629
 msgid ""
 "Error:\n"
 "Photo already in the maximum number of groups possible"
@@ -185,7 +231,7 @@ msgstr ""
 "Fejl:\n"
 "Billede er allerede i det maksimale antal grupper"
 
-#: ../src/frogr-controller.c:645
+#: src/frogr-controller.c:633
 msgid ""
 "Error:\n"
 "Group limit already reached"
@@ -193,7 +239,7 @@ msgstr ""
 "Fejl:\n"
 "Gruppebegrænsning er allerede nået"
 
-#: ../src/frogr-controller.c:649
+#: src/frogr-controller.c:637
 msgid ""
 "Error:\n"
 "Photo added to group's queue"
@@ -201,7 +247,7 @@ msgstr ""
 "Fejl:\n"
 "Billede er tilføjet gruppens kø"
 
-#: ../src/frogr-controller.c:653
+#: src/frogr-controller.c:641
 msgid ""
 "Error:\n"
 "Photo already added to group's queue"
@@ -209,7 +255,7 @@ msgstr ""
 "Fejl:\n"
 "Billede er allerede tilføjet gruppens kø"
 
-#: ../src/frogr-controller.c:657
+#: src/frogr-controller.c:645
 msgid ""
 "Error:\n"
 "Content not allowed for this group"
@@ -217,8 +263,7 @@ msgstr ""
 "Fejl:\n"
 "Indhold er ikke tilladt for denne gruppe"
 
-#: ../src/frogr-controller.c:661
-#, c-format
+#: src/frogr-controller.c:649
 msgid ""
 "Authorization failed.\n"
 "Please try again"
@@ -226,7 +271,7 @@ msgstr ""
 "Godkendelse mislykkedes.\n"
 "Prøv venligst igen"
 
-#: ../src/frogr-controller.c:667
+#: src/frogr-controller.c:655
 #, c-format
 msgid ""
 "Error\n"
@@ -237,8 +282,7 @@ msgstr ""
 "%s er ikke korrekt godkendt til at overføre billeder til Flickr.\n"
 "Godkend venligst igen"
 
-#: ../src/frogr-controller.c:672
-#, c-format
+#: src/frogr-controller.c:660
 msgid ""
 "Unable to authenticate in Flickr\n"
 "Please try again."
@@ -246,7 +290,7 @@ msgstr ""
 "Kunne ikke godkende i Flickr\n"
 "Prøv venligst igen."
 
-#: ../src/frogr-controller.c:676
+#: src/frogr-controller.c:664
 #, c-format
 msgid ""
 "You have not properly authorized %s yet.\n"
@@ -255,8 +299,7 @@ msgstr ""
 "Du har endnu ikke godkendt %s på korrekt vis.\n"
 "Prøv venligst igen."
 
-#: ../src/frogr-controller.c:681
-#, c-format
+#: src/frogr-controller.c:669
 msgid ""
 "Invalid verification code.\n"
 "Please try again."
@@ -264,8 +307,7 @@ msgstr ""
 "Ugyldig verificeringskode.\n"
 "Prøv venligst igen"
 
-#: ../src/frogr-controller.c:685
-#, c-format
+#: src/frogr-controller.c:673
 msgid ""
 "Error:\n"
 "Service not available"
@@ -273,59 +315,63 @@ msgstr ""
 "Fejl:\n"
 "Tjeneste er ikke tilgængelig"
 
-#. General error: just dump the raw error description
-#: ../src/frogr-controller.c:690
+#: src/frogr-controller.c:678
 #, c-format
 msgid "An error happened: %s."
 msgstr "Der opstod en fejl: %s."
 
-#: ../src/frogr-controller.c:906
+#: src/frogr-controller.c:883
 msgid "Authorization failed (timed out)"
 msgstr "Godkendelse mislykkedes (tidsudløb)"
 
-#: ../src/frogr-controller.c:958
+#: src/frogr-controller.c:931
 #, c-format
 msgid "Retrying Upload (attempt %d/%d)…"
 msgstr "Prøver at overføre igen (forsøg %d/%d) …"
 
-#: ../src/frogr-controller.c:963
+#: src/frogr-controller.c:936
 #, c-format
 msgid "Uploading '%s'…"
 msgstr "Overfører \"%s\"…"
 
-#: ../src/frogr-controller.c:2221
+#: src/frogr-controller.c:2242
 msgid "Updating credentials…"
 msgstr "Opdaterer akkreditiver …"
 
-#: ../src/frogr-controller.c:2226
+#: src/frogr-controller.c:2247
 msgid "Retrieving data for authorization…"
 msgstr "Henter data for godkendelse …"
 
-#: ../src/frogr-controller.c:2231
+#: src/frogr-controller.c:2252
 msgid "Finishing authorization…"
 msgstr "Afslutter godkendelse …"
 
-#: ../src/frogr-controller.c:2236
+#: src/frogr-controller.c:2257
 msgid "Retrieving list of sets…"
 msgstr "Henter liste af sæt …"
 
-#: ../src/frogr-controller.c:2241
+#: src/frogr-controller.c:2262
 msgid "Retrieving list of groups…"
 msgstr "Henter liste af grupper …"
 
-#: ../src/frogr-controller.c:2246
+#: src/frogr-controller.c:2267
 msgid "Retrieving list of tags…"
 msgstr "Henter liste af mærker …"
 
-#: ../src/frogr-controller.c:2363
+#: src/frogr-controller.c:2292
+#, fuzzy
+msgid "Fetching information"
+msgstr "Angiv information om geografisk placering"
+
+#: src/frogr-controller.c:2398
 msgid "No sets found"
 msgstr "Ingen sæt fundet"
 
-#: ../src/frogr-controller.c:2390
+#: src/frogr-controller.c:2423
 msgid "No groups found"
 msgstr "Ingen grupper fundet"
 
-#: ../src/frogr-controller.c:3031
+#: src/frogr-controller.c:2984
 #, c-format
 msgid ""
 "You need to properly authorize %s before uploading any pictures to Flickr.\n"
@@ -334,175 +380,184 @@ msgstr ""
 "Du skal på passende vis godkende %s, før du overfører billeder til Flickr.\n"
 "Godkend venligst igen."
 
-#: ../src/frogr-controller.c:3041
-#, c-format
+#: src/frogr-controller.c:2994
 msgid "You need to be connected before uploading any pictures to Flickr."
 msgstr "Du skal være tilsluttet før du overfører billeder til Flickr."
 
-#: ../src/frogr-controller.c:3113
-#, c-format
+#: src/frogr-controller.c:3012
+#, fuzzy
+msgid "Uploading Pictures"
+msgstr "Overfører \"%s\"…"
+
+#: src/frogr-controller.c:3057
 msgid "Error opening project file"
 msgstr "Der opstod en fejl under åbning af projektfil"
 
-#. This shows a dialog notifying the problem to the user
-#: ../src/frogr-create-new-set-dialog.c:156 ../src/frogr-details-dialog.c:1020
+#: src/frogr-create-new-set-dialog.c:143 src/frogr-details-dialog.c:1001
 msgid "Missing data required"
 msgstr "Manglende data krævet"
 
-#: ../src/frogr-create-new-set-dialog.c:342
+#: src/frogr-create-new-set-dialog.c:326
 msgid "Title:"
 msgstr "Navn:"
 
-#: ../src/frogr-create-new-set-dialog.c:351
+#: src/frogr-create-new-set-dialog.c:335
 msgid "Description:"
 msgstr "Beskrivelse:"
 
-#: ../src/frogr-create-new-set-dialog.c:372
+#: src/frogr-create-new-set-dialog.c:356
 msgid "Fill Pictures Details with Title and Description"
 msgstr "Udfyld billeddetaljer med navn og beskrivelse"
 
-#: ../src/frogr-create-new-set-dialog.c:393
+#: src/frogr-create-new-set-dialog.c:381
 msgid "Create New Set"
 msgstr "Opret nyt sæt"
 
-#: ../src/frogr-details-dialog.c:90 ../src/frogr-settings-dialog.c:100
+#: src/frogr-details-dialog.c:89 src/frogr-settings-dialog.c:97
 msgid "Default (as specified in Flickr)"
 msgstr "Standard (som angivet i Flickr)"
 
-#: ../src/frogr-details-dialog.c:91 ../src/frogr-settings-dialog.c:101
+#: src/frogr-details-dialog.c:90 src/frogr-settings-dialog.c:98
 msgid "All rights reserved"
 msgstr "Alle rettigheder forbeholdes"
 
-#: ../src/frogr-details-dialog.c:92 ../src/frogr-settings-dialog.c:102
+#: src/frogr-details-dialog.c:91 src/frogr-settings-dialog.c:99
 msgid "CC Attribution-NonCommercial-ShareAlike"
 msgstr "CC Attribution-NonCommercial-ShareAlike"
 
-#: ../src/frogr-details-dialog.c:93 ../src/frogr-settings-dialog.c:103
+#: src/frogr-details-dialog.c:92 src/frogr-settings-dialog.c:100
 msgid "CC Attribution-NonCommercial"
 msgstr "CC Attribution-NonCommercial"
 
-#: ../src/frogr-details-dialog.c:94 ../src/frogr-settings-dialog.c:104
+#: src/frogr-details-dialog.c:93 src/frogr-settings-dialog.c:101
 msgid "CC Attribution-NonCommercial-NoDerivs"
 msgstr "CC Attribution-NonCommercial-NoDerivs"
 
-#: ../src/frogr-details-dialog.c:95 ../src/frogr-settings-dialog.c:105
+#: src/frogr-details-dialog.c:94 src/frogr-settings-dialog.c:102
 msgid "CC Attribution"
 msgstr "CC Attribution"
 
-#: ../src/frogr-details-dialog.c:96 ../src/frogr-settings-dialog.c:106
+#: src/frogr-details-dialog.c:95 src/frogr-settings-dialog.c:103
 msgid "CC Attribution-ShareAlike"
 msgstr "CC Attribution-ShareAlike"
 
-#: ../src/frogr-details-dialog.c:97 ../src/frogr-settings-dialog.c:107
+#: src/frogr-details-dialog.c:96 src/frogr-settings-dialog.c:104
 msgid "CC Attribution-NoDerivs"
 msgstr "CC Attribution-NoDerivs"
 
-#: ../src/frogr-details-dialog.c:176
+#: src/frogr-details-dialog.c:172
 msgid "Open with image viewer"
 msgstr "Åbn med billedfremviser"
 
-#: ../src/frogr-details-dialog.c:201
+#: src/frogr-details-dialog.c:190
+msgid "_Title:"
+msgstr "_Navn:"
+
+#: src/frogr-details-dialog.c:200
+msgid "_Description:"
+msgstr "_Beskrivelse:"
+
+#: src/frogr-details-dialog.c:224
+msgid "Ta_gs:"
+msgstr "_Mærker:"
+
+#: src/frogr-details-dialog.c:247
 msgid "Visibility"
 msgstr "Synlighed"
 
-#: ../src/frogr-details-dialog.c:213 ../src/frogr-settings-dialog.c:202
+#: src/frogr-details-dialog.c:257 src/frogr-settings-dialog.c:196
 msgid "_Private"
 msgstr "_Privat"
 
-#: ../src/frogr-details-dialog.c:217 ../src/frogr-settings-dialog.c:204
+#: src/frogr-details-dialog.c:261 src/frogr-settings-dialog.c:199
 msgid "P_ublic"
 msgstr "_Offentlig"
 
-#: ../src/frogr-details-dialog.c:226 ../src/frogr-settings-dialog.c:212
-msgid "Visible to _Family"
-msgstr "Synlig for _familie"
+#: src/frogr-details-dialog.c:270 src/frogr-settings-dialog.c:207
+msgid "_Family"
+msgstr ""
 
-#: ../src/frogr-details-dialog.c:230 ../src/frogr-settings-dialog.c:214
-msgid "Visible to F_riends"
-msgstr "Synlig for _venner"
+#: src/frogr-details-dialog.c:274 src/frogr-settings-dialog.c:209
+msgid "F_riends"
+msgstr ""
 
-#: ../src/frogr-details-dialog.c:256
+#: src/frogr-details-dialog.c:288
 msgid "Content Type"
 msgstr "Indholdstype"
 
-#: ../src/frogr-details-dialog.c:265 ../src/frogr-settings-dialog.c:241
+#: src/frogr-details-dialog.c:296 src/frogr-settings-dialog.c:234
 msgid "P_hoto"
 msgstr "_Billede"
 
-#: ../src/frogr-details-dialog.c:269 ../src/frogr-settings-dialog.c:243
+#: src/frogr-details-dialog.c:300 src/frogr-settings-dialog.c:236
 msgid "Scree_nshot"
 msgstr "_Skærmbillede"
 
-#: ../src/frogr-details-dialog.c:273 ../src/frogr-settings-dialog.c:245
+#: src/frogr-details-dialog.c:304 src/frogr-settings-dialog.c:238
 msgid "Oth_er"
 msgstr "_Andet"
 
-#: ../src/frogr-details-dialog.c:289
+#: src/frogr-details-dialog.c:317
 msgid "Safety Level"
 msgstr "Sikkerhedsniveau"
 
-#: ../src/frogr-details-dialog.c:298 ../src/frogr-settings-dialog.c:266
+#: src/frogr-details-dialog.c:325 src/frogr-settings-dialog.c:260
 msgid "S_afe"
 msgstr "_Sikker"
 
-#: ../src/frogr-details-dialog.c:302 ../src/frogr-settings-dialog.c:268
+#: src/frogr-details-dialog.c:329 src/frogr-settings-dialog.c:262
 msgid "_Moderate"
 msgstr "_Moderat"
 
-#: ../src/frogr-details-dialog.c:306 ../src/frogr-settings-dialog.c:270
+#: src/frogr-details-dialog.c:333 src/frogr-settings-dialog.c:264
 msgid "Restr_icted"
 msgstr "_Begrænset"
 
-#: ../src/frogr-details-dialog.c:320
+#: src/frogr-details-dialog.c:345
 msgid "License Type"
 msgstr "Licenstype"
 
-#: ../src/frogr-details-dialog.c:344
+#: src/frogr-details-dialog.c:367
 msgid "Other Properties"
 msgstr "Andre egenskaber"
 
-#: ../src/frogr-details-dialog.c:353
-msgid "Set Geo_location Information"
-msgstr "Angiv information om geografisk placering"
-
-#: ../src/frogr-details-dialog.c:357
+#: src/frogr-details-dialog.c:375
 msgid "_Show Up in Global Search Results"
 msgstr "_Vis i globale søgeresultater"
 
-#: ../src/frogr-details-dialog.c:371
-msgid "_Title:"
-msgstr "_Navn:"
-
-#: ../src/frogr-details-dialog.c:381
-msgid "_Description:"
-msgstr "_Beskrivelse:"
+#: src/frogr-details-dialog.c:379
+msgid "Set Geo_location Information"
+msgstr "Angiv information om geografisk placering"
 
-#: ../src/frogr-details-dialog.c:405
-msgid "Ta_gs:"
-msgstr "_Mærker:"
+#: src/frogr-details-dialog.c:383
+msgid "Replace 'Date Posted' with 'Date Taken'"
+msgstr ""
 
-#. Visually indicate how many pictures are being edited
-#: ../src/frogr-details-dialog.c:500
+#: src/frogr-details-dialog.c:475
 #, c-format
 msgid "(%d Picture)"
 msgid_plural "(%d Pictures)"
 msgstr[0] "(%d billede)"
 msgstr[1] "(%d billeder)"
 
-#: ../src/frogr-details-dialog.c:574
+#: src/frogr-details-dialog.c:548
 msgid "An error happened trying to load the picture"
 msgstr "Der opstod en fejl under forsøg på at indlæse billedet"
 
-#: ../src/frogr-details-dialog.c:1223
+#: src/frogr-details-dialog.c:1169
+msgid "_Edit"
+msgstr "_Rediger"
+
+#: src/frogr-details-dialog.c:1197
 msgid "Edit Picture Details"
 msgstr "Rediger billeddetaljer"
 
-#: ../src/frogr-file-loader.c:147
+#: src/frogr-file-loader.c:142
 #, c-format
 msgid "Loading files %d / %d"
 msgstr "Indlæser filer %d / %d"
 
-#: ../src/frogr-file-loader.c:381
+#: src/frogr-file-loader.c:369
 #, c-format
 msgid ""
 "Unable to load picture %s:\n"
@@ -511,7 +566,7 @@ msgstr ""
 "Kan ikke indlæse billede %s:\n"
 "%s"
 
-#: ../src/frogr-file-loader.c:412
+#: src/frogr-file-loader.c:400
 #, c-format
 msgid ""
 "Unable to load video %s\n"
@@ -520,10 +575,7 @@ msgstr ""
 "Kan ikke indlæse video %s:\n"
 "Kontroller at du har den korrekte codec installeret"
 
-#. First %s is the title of the picture (filename of the file by
-#. default). Second %s is the max allowed size for a picture to be
-#. uploaded to flickr (different for free and PRO accounts).
-#: ../src/frogr-file-loader.c:652
+#: src/frogr-file-loader.c:636
 #, c-format
 msgid ""
 "Can't load file %s:\n"
@@ -532,345 +584,309 @@ msgstr ""
 "Kan ikke indlæse fil %s:\n"
 "Filens størrelse er større end det tilladte maksimum for denne konto (%s)"
 
-#: ../src/frogr-main-view.c:822 ../data/gtkbuilder/frogr-app-menu.xml.h:4
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
+msgid "Open"
+msgstr "Åbn"
+
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
+msgid "Open Existing Project"
+msgstr "Åbn eksisterende projekt"
+
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
+msgid "Add"
+msgstr "Tilføj"
+
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
+msgid "Add Elements"
+msgstr "Tilføj elementer"
+
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
+msgid "Remove"
+msgstr "Fjern"
+
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
+msgid "Remove Elements"
+msgstr "Fjern elementer"
+
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
+msgid "Upload"
+msgstr "Overfør"
+
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
+msgid "Upload All"
+msgstr "Overfør alle"
+
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
+msgid "Save"
+msgstr "Gem"
+
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
+msgid "Save Current Project"
+msgstr "Gem aktuelt projekt"
+
+#: src/frogr-main-view.c:1016
 msgid "_About"
 msgstr "_Om"
 
-#: ../src/frogr-main-view.c:826 ../data/gtkbuilder/frogr-app-menu.xml.h:5
+#: src/frogr-main-view.c:1020
 msgid "_Quit"
 msgstr "_Afslut"
 
-#. Create the submenu and insert it in the right section
-#: ../src/frogr-main-view.c:882
+#: src/frogr-main-view.c:1070
 msgid "Accounts"
 msgstr "Konti"
 
-#. String showind the date and time a picture was taken
-#: ../src/frogr-main-view.c:1116
+#: src/frogr-main-view.c:1410
 #, c-format
 msgid "Taken: %s"
 msgstr "Optagelsestidspunkt: %s"
 
-#: ../src/frogr-main-view.c:1121
+#: src/frogr-main-view.c:1415
 #, c-format
 msgid "File size: %s"
 msgstr "Filstørrelse: %s"
 
-#: ../src/frogr-main-view.c:1244
+#: src/frogr-main-view.c:1540
 msgid "Select File"
 msgstr "Vælg fil"
 
-#: ../src/frogr-main-view.c:1257
+#: src/frogr-main-view.c:1544 src/frogr-main-view.c:1671
+#, fuzzy
+msgid "_Open"
+msgstr "Åbn"
+
+#: src/frogr-main-view.c:1553
 msgid "Frogr Project Files"
 msgstr "Frogr-projektfiler"
 
-#: ../src/frogr-main-view.c:1321
+#: src/frogr-main-view.c:1615
 msgid "Select Destination"
 msgstr "Vælg destination"
 
-#: ../src/frogr-main-view.c:1328
+#: src/frogr-main-view.c:1619
+msgid "_Save"
+msgstr "_Gem"
+
+#: src/frogr-main-view.c:1622
 msgid "Untitled Project.frogr"
 msgstr "Unavngivet Project.frogr"
 
-#: ../src/frogr-main-view.c:1369
+#: src/frogr-main-view.c:1667
 msgid "Select a Picture"
 msgstr "Vælg et billede"
 
-#: ../src/frogr-main-view.c:1392
+#: src/frogr-main-view.c:1694
 msgid "All Files"
 msgstr "Alle filer"
 
-#: ../src/frogr-main-view.c:1395
+#: src/frogr-main-view.c:1697
 msgid "Image Files"
 msgstr "Billedfiler"
 
-#: ../src/frogr-main-view.c:1398
+#: src/frogr-main-view.c:1701
 msgid "Video Files"
 msgstr "Videofiler"
 
-#: ../src/frogr-main-view.c:1419
+#: src/frogr-main-view.c:1723
 msgid "You don't have any picture added yet"
 msgstr "Du har endnu ikke tilføjet billeder"
 
-#: ../src/frogr-main-view.c:1434
+#: src/frogr-main-view.c:1736
 msgid "You need to select some pictures first"
 msgstr "Du skal vælge nogle billeder først"
 
-#: ../src/frogr-main-view.c:1894
+#: src/frogr-main-view.c:2108
 msgid "Not connected to Flickr"
 msgstr "Ikke forbundet til Flickr"
 
-#. Login string, showing the user is PRO (second '%s') if so.
-#: ../src/frogr-main-view.c:1904
+#: src/frogr-main-view.c:2118
 #, c-format
 msgid "Connected as %s%s"
 msgstr "Forbundet som %s%s"
 
-#: ../src/frogr-main-view.c:1905
+#: src/frogr-main-view.c:2119
 msgid " (PRO account)"
 msgstr " (PRO-konto)"
 
-#. Will show in the status bar the amount of data (in KB, MB
-#. or GB) the user is currently allowed to upload to flicker
-#. till the end of the month, in a CURRENT / MAX fashion.
-#. The '-' at the beginning is just a separator, since more
-#. blocks of text will be shown in the status bar too.
-#: ../src/frogr-main-view.c:1929
+#: src/frogr-main-view.c:2143
 #, c-format
 msgid " - %s / %s remaining"
 msgstr " - %s / %s tilbage"
 
-#. Will show in the status bar the amount of pictures and data
-#. (in KB, MB or GB) that would be uploaded as the sum of the
-#. sizes for every picture loaded in the application
-#: ../src/frogr-main-view.c:1955
+#: src/frogr-main-view.c:2169
 #, c-format
 msgid " - %d file to upload (%s)"
 msgid_plural " - %d files to upload (%s)"
 msgstr[0] " - %d fil der skal overføres (%s)"
 msgstr[1] " - %d filer der skal overføres (%s)"
 
-#: ../src/frogr-settings-dialog.c:189
+#: src/frogr-settings-dialog.c:185
 msgid "Default Visibility"
 msgstr "Standardsynlighed"
 
-#: ../src/frogr-settings-dialog.c:229
+#: src/frogr-settings-dialog.c:224
 msgid "Default Content Type"
 msgstr "Standardindholdstype"
 
-#: ../src/frogr-settings-dialog.c:254
+#: src/frogr-settings-dialog.c:250
 msgid "Default Safety Level"
 msgstr "Standardsikkerhedsniveau"
 
-#: ../src/frogr-settings-dialog.c:279
+#: src/frogr-settings-dialog.c:276
 msgid "Default License"
 msgstr "Standardlicens"
 
-#: ../src/frogr-settings-dialog.c:303
+#: src/frogr-settings-dialog.c:302
 msgid "Other Defaults"
 msgstr "Andre standardindstillinger"
 
-#: ../src/frogr-settings-dialog.c:315
+#: src/frogr-settings-dialog.c:312
+msgid "_Show Pictures in Global Search Results"
+msgstr "_Vis billeder i globale søgeresultater"
+
+#: src/frogr-settings-dialog.c:315
 msgid "Set Geo_location Information for Pictures"
 msgstr "Angiv information om geografisk placering for billeder"
 
-#: ../src/frogr-settings-dialog.c:318
-msgid "_Show Pictures in Global Search Results"
-msgstr "_Vis billeder i globale søgeresultater"
+#: src/frogr-settings-dialog.c:318
+msgid "Replace 'Date Posted' with 'Date Taken' for Pictures"
+msgstr ""
 
-#: ../src/frogr-settings-dialog.c:324
+#: src/frogr-settings-dialog.c:324
 msgid "_General"
 msgstr "_Generelt"
 
-#: ../src/frogr-settings-dialog.c:349
+#: src/frogr-settings-dialog.c:344
 msgid "Proxy Settings"
 msgstr "Proxy-opsætning"
 
-#. Enable proxy
-#: ../src/frogr-settings-dialog.c:359
+#: src/frogr-settings-dialog.c:353
 msgid "_Enable HTTP Proxy"
 msgstr "_Aktiver HTTP-proxy"
 
-#: ../src/frogr-settings-dialog.c:371
+#: src/frogr-settings-dialog.c:363
 msgid "_Host:"
 msgstr "_Vært:"
 
-#. Proxy port
-#: ../src/frogr-settings-dialog.c:384
+#: src/frogr-settings-dialog.c:376
 msgid "_Port:"
 msgstr "_Port:"
 
-#. Proxy username
-#: ../src/frogr-settings-dialog.c:397
+#: src/frogr-settings-dialog.c:389
 msgid "U_sername:"
 msgstr "_Brugernavn:"
 
-#. Proxy password
-#: ../src/frogr-settings-dialog.c:410
+#: src/frogr-settings-dialog.c:402
 msgid "Pass_word:"
 msgstr "_Adgangskode:"
 
-#: ../src/frogr-settings-dialog.c:450
+#: src/frogr-settings-dialog.c:426
 msgid "Connec_tion"
 msgstr "_Forbindelse"
 
-#: ../src/frogr-settings-dialog.c:473
+#: src/frogr-settings-dialog.c:444
 msgid "Other options"
 msgstr "Andre indstillinger"
 
-#: ../src/frogr-settings-dialog.c:485
+#: src/frogr-settings-dialog.c:454
 msgid "Ena_ble Tags Auto-Completion"
 msgstr "_Aktiver automatisk færdiggørelse af mærker"
 
-#: ../src/frogr-settings-dialog.c:488
+#: src/frogr-settings-dialog.c:457
 msgid "_Import Tags from Pictures Metadata"
 msgstr "_Importer mærker fra billedernes metadata"
 
-#: ../src/frogr-settings-dialog.c:492
+#: src/frogr-settings-dialog.c:461
 msgid "Use _Dark GTK Theme"
 msgstr "Brug GTK-temaet _Dark"
 
-#: ../src/frogr-settings-dialog.c:496
+#: src/frogr-settings-dialog.c:465
 msgid "_Keep File Extensions in Titles when Loading"
 msgstr "_Bevar filendelser i navne når der indlæses billeder"
 
-#: ../src/frogr-settings-dialog.c:502
+#: src/frogr-settings-dialog.c:471
 msgid "_Misc"
 msgstr "_Diverse"
 
-#: ../src/frogr-settings-dialog.c:1038
+#: src/frogr-settings-dialog.c:972
 msgid "Preferences"
 msgstr "Præferencer"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:1
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:9
-msgid "_Edit Details…"
-msgstr "_Rediger detaljer …"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:2
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:10
-msgid "Add _Tags…"
-msgstr "Tilføj _mærker…"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:3
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:11
-msgid "Add to _Group…"
-msgstr "Tilføj til _gruppe…"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:4
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:12
-msgid "Add to _Photoset"
-msgstr "Tilføj til _billedsæt"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:5
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:13
-msgid "_Add to Existing Photoset…"
-msgstr "_Tilføj til eksisterende billedsæt …"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:6
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:14
-msgid "_Create New Photoset…"
-msgstr "_Opret nyt billedsæt …"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:7
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:15
-msgid "_Open in External Viewer"
-msgstr "_Åbn i ekstern fremviser"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:8
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:6
-msgid "_Remove Elements"
-msgstr "_Fjern elementer"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:9
-msgid "Open Existing Project"
-msgstr "Åbn eksisterende projekt"
+#~ msgid "Visible to _Family"
+#~ msgstr "Synlig for _familie"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:10
-msgid "Open"
-msgstr "Åbn"
+#~ msgid "Visible to F_riends"
+#~ msgstr "Synlig for _venner"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:11
-msgid "Save Current Project"
-msgstr "Gem aktuelt projekt"
+#~ msgid "_Edit Details…"
+#~ msgstr "_Rediger detaljer …"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:12
-msgid "Save"
-msgstr "Gem"
+#~ msgid "Add _Tags…"
+#~ msgstr "Tilføj _mærker…"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:13
-msgid "Add Elements"
-msgstr "Tilføj elementer"
+#~ msgid "Add to _Group…"
+#~ msgstr "Tilføj til _gruppe…"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:14
-msgid "Add"
-msgstr "Tilføj"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:15
-msgid "Remove Elements"
-msgstr "Fjern elementer"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:16
-msgid "Remove"
-msgstr "Fjern"
+#~ msgid "Add to _Photoset"
+#~ msgstr "Tilføj til _billedsæt"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:17
-msgid "Upload All"
-msgstr "Overfør alle"
+#~ msgid "_Add to Existing Photoset…"
+#~ msgstr "_Tilføj til eksisterende billedsæt …"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:18
-msgid "Upload"
-msgstr "Overfør"
+#~ msgid "_Create New Photoset…"
+#~ msgstr "_Opret nyt billedsæt …"
 
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:1
-msgid "Aut_horize Account…"
-msgstr "_Godkend konto …"
+#~ msgid "_Open in External Viewer"
+#~ msgstr "_Åbn i ekstern fremviser"
 
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:2
-msgid "_Preferences…"
-msgstr "_Indstillinger…"
+#~ msgid "_Remove Elements"
+#~ msgstr "_Fjern elementer"
 
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:3
-msgid "_Help"
-msgstr "_Hjælp"
+#~ msgid "Aut_horize Account…"
+#~ msgstr "_Godkend konto …"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:1
-msgid "_File"
-msgstr "_Fil"
+#~ msgid "_Preferences…"
+#~ msgstr "_Indstillinger…"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:2
-msgid "_Open…"
-msgstr "_Åbn …"
+#~ msgid "_Help"
+#~ msgstr "_Hjælp"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:3
-msgid "_Save"
-msgstr "_Gem"
+#~ msgid "_File"
+#~ msgstr "_Fil"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:4
-msgid "Save _As…"
-msgstr "Gem _som …"
+#~ msgid "_Open…"
+#~ msgstr "_Åbn …"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:5
-msgid "A_dd Elements…"
-msgstr "_Tilføj elementer …"
+#~ msgid "Save _As…"
+#~ msgstr "Gem _som …"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:7
-msgid "_Upload All"
-msgstr "_Overfør alle"
+#~ msgid "A_dd Elements…"
+#~ msgstr "_Tilføj elementer …"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:8
-msgid "_Edit"
-msgstr "_Rediger"
+#~ msgid "_Upload All"
+#~ msgstr "_Overfør alle"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:16
-msgid "_View"
-msgstr "_Vis"
+#~ msgid "_View"
+#~ msgstr "_Vis"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:17
-msgid "_Sort Elements"
-msgstr "_Sorter elementer"
+#~ msgid "_Sort Elements"
+#~ msgstr "_Sorter elementer"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:18
-msgid "As _Loaded"
-msgstr "Som _indlæst"
+#~ msgid "As _Loaded"
+#~ msgstr "Som _indlæst"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:19
-msgid "By _Date Taken"
-msgstr "Efter _optagelsestidspunkt"
+#~ msgid "By _Date Taken"
+#~ msgstr "Efter _optagelsestidspunkt"
 
 # titel eller navn
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:20
-msgid "By _Title"
-msgstr "Efter _navn"
+#~ msgid "By _Title"
+#~ msgstr "Efter _navn"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:21
-msgid "By _Size"
-msgstr "Efter _størrelse"
+#~ msgid "By _Size"
+#~ msgstr "Efter _størrelse"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:22
-msgid "_Reversed Order"
-msgstr "_Omvendt rækkefølge"
+#~ msgid "_Reversed Order"
+#~ msgstr "_Omvendt rækkefølge"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:23
-msgid "Enable _Tooltips"
-msgstr "Aktiver _værktøjsfif"
+#~ msgid "Enable _Tooltips"
+#~ msgstr "Aktiver _værktøjsfif"
diff --git a/po/de.po b/po/de.po
index 17baad4..cbc27b8 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,9 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: frogr master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=frogr&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-01-22 18:06+0000\n"
+"Report-Msgid-Bugs-To: msanchez gnome org\n"
+"POT-Creation-Date: 2016-08-12 13:09+0100\n"
 "PO-Revision-Date: 2016-01-25 13:46+0100\n"
 "Last-Translator: Mario Blättermann <mario blaettermann gmail com>\n"
 "Language-Team: German <gnome-de gnome org>\n"
@@ -22,7 +21,16 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.8.6\n"
 
-#: ../data/frogr.appdata.xml.in.h:1
+#: data/frogr.appdata.xml.in:5 data/frogr.desktop.in.in:5
+#: data/frogr.desktop.in.in:14
+msgid "frogr"
+msgstr "frogr"
+
+#: data/frogr.appdata.xml.in:6 data/frogr.desktop.in.in:6
+msgid "frogr: a Flickr Remote Organizer for GNOME"
+msgstr "frogr: Eine GNOME-Anwendung zum entfernten Verwalten von Flickr"
+
+#: data/frogr.appdata.xml.in:8
 msgid ""
 "frogr is a small application for the GNOME desktop that allows users to "
 "manage their accounts in the Flickr image hosting website."
@@ -30,7 +38,7 @@ msgstr ""
 "frogr ist eine kleine Anwendung für die GNOME-Arbeitsumgebung, die es "
 "Benutzern ermöglicht, ihre Konten der Flickr Bilddienst-Website zu verwalten."
 
-#: ../data/frogr.appdata.xml.in.h:2
+#: data/frogr.appdata.xml.in:13
 msgid ""
 "It supports all the basic Flickr features, including uploading pictures, "
 "adding descriptions, setting tags and managing sets and groups pools."
@@ -39,79 +47,74 @@ msgstr ""
 "Hochladen von Bildern, Hinzufügen von Beschreibungen, Festlegen von "
 "Metainformationen und die Verwaltung von Sätzen und Gruppenpools."
 
-#: ../data/frogr.appdata.xml.in.h:3
+#: data/frogr.appdata.xml.in:24
 msgid "Screenshot of frogr"
 msgstr "Bildschirmfoto von Frogr"
 
-#: ../data/frogr.desktop.in.in.h:1
-msgid "frogr"
-msgstr "frogr"
-
-#: ../data/frogr.desktop.in.in.h:2
-msgid "frogr: a Flickr Remote Organizer for GNOME"
-msgstr "frogr: Eine GNOME-Anwendung zum entfernten Verwalten von Flickr"
+#: data/frogr.appdata.xml.in:29
+msgid "Mario Sanchez Prada"
+msgstr ""
 
-#: ../data/frogr.desktop.in.in.h:3
+#: data/frogr.desktop.in.in:7
 msgid "Upload and organize photos in Flickr accounts"
 msgstr "Fotos zu Flickr-Konten übertragen und verwalten"
 
-#: ../data/frogr.desktop.in.in.h:4
+#: data/frogr.desktop.in.in:8
 msgid "Flickr;Image;Picture;Photo;Video;Uploader;"
 msgstr "Flickr;Bild;Foto;Photo;Video;Hochladen;"
 
-#: ../src/frogr-about-dialog.c:43
+#: src/frogr-about-dialog.c:43
 msgid "A Flickr Remote Organizer for GNOME\n"
 msgstr "Eine GNOME-Anwendung zum entfernten Verwalten von Flickr\n"
 
-#: ../src/frogr-about-dialog.c:72
+#: src/frogr-about-dialog.c:72
 msgid "translator-credits"
 msgstr ""
 "Mario Blättermann <mario blaettermann gmail com>\n"
 "Christian Kirbach <christian kirbach gmail com>"
 
-#: ../src/frogr-add-tags-dialog.c:191 ../src/frogr-add-to-group-dialog.c:528
-#: ../src/frogr-add-to-set-dialog.c:529 ../src/frogr-auth-dialog.c:153
-#: ../src/frogr-create-new-set-dialog.c:310 ../src/frogr-details-dialog.c:1168
-#: ../src/frogr-main-view.c:1543 ../src/frogr-main-view.c:1618
-#: ../src/frogr-main-view.c:1670 ../src/frogr-settings-dialog.c:930
+#: src/frogr-add-tags-dialog.c:191 src/frogr-add-to-group-dialog.c:528
+#: src/frogr-add-to-set-dialog.c:529 src/frogr-auth-dialog.c:153
+#: src/frogr-create-new-set-dialog.c:310 src/frogr-details-dialog.c:1168
+#: src/frogr-main-view.c:1543 src/frogr-main-view.c:1618
+#: src/frogr-main-view.c:1670 src/frogr-settings-dialog.c:930
 msgid "_Cancel"
 msgstr "A_bbrechen"
 
-#: ../src/frogr-add-tags-dialog.c:193 ../src/frogr-add-to-group-dialog.c:530
-#: ../src/frogr-add-to-set-dialog.c:531
-#: ../src/frogr-create-new-set-dialog.c:312
+#: src/frogr-add-tags-dialog.c:193 src/frogr-add-to-group-dialog.c:530
+#: src/frogr-add-to-set-dialog.c:531 src/frogr-create-new-set-dialog.c:312
 msgid "_Add"
 msgstr "_Hinzufügen"
 
-#: ../src/frogr-add-tags-dialog.c:202
+#: src/frogr-add-tags-dialog.c:202
 msgid "Enter a spaces separated list of tags:"
 msgstr "Geben Sie eine durch Leerzeichen getrennte Liste von Markierungen an:"
 
-#: ../src/frogr-add-tags-dialog.c:228
+#: src/frogr-add-tags-dialog.c:228
 msgid "Add Tags"
 msgstr "Markierungen hinzufügen"
 
-#: ../src/frogr-add-to-group-dialog.c:147
+#: src/frogr-add-to-group-dialog.c:147
 msgid "Name"
 msgstr "Name"
 
-#: ../src/frogr-add-to-group-dialog.c:162 ../src/frogr-add-to-set-dialog.c:163
+#: src/frogr-add-to-group-dialog.c:162 src/frogr-add-to-set-dialog.c:163
 msgid "Elements"
 msgstr "Elemente"
 
-#: ../src/frogr-add-to-group-dialog.c:581
+#: src/frogr-add-to-group-dialog.c:581
 msgid "Add to Groups"
 msgstr "Zu Gruppen hinzufügen"
 
-#: ../src/frogr-add-to-set-dialog.c:148
+#: src/frogr-add-to-set-dialog.c:148
 msgid "Title"
 msgstr "Titel"
 
-#: ../src/frogr-add-to-set-dialog.c:582
+#: src/frogr-add-to-set-dialog.c:582
 msgid "Add to Sets"
 msgstr "Zu Alben hinzufügen"
 
-#: ../src/frogr-auth-dialog.c:59
+#: src/frogr-auth-dialog.c:59
 #, c-format
 msgid ""
 "Please press the button to authorize %s and then come back to complete the "
@@ -120,30 +123,29 @@ msgstr ""
 "Bitte klicken Sie den Knopf, um %s zu legitimieren. Kehren Sie dann zu "
 "diesem Fenster zurück, um den Vorgang abzuschließen."
 
-#: ../src/frogr-auth-dialog.c:63 ../src/frogr-auth-dialog.c:149
-#: ../src/frogr-controller.c:2286
+#: src/frogr-auth-dialog.c:63 src/frogr-auth-dialog.c:149
+#: src/frogr-controller.c:2286
 #, c-format
 msgid "Authorize %s"
 msgstr "%s legitimieren"
 
-#: ../src/frogr-auth-dialog.c:155 ../src/frogr-settings-dialog.c:932
+#: src/frogr-auth-dialog.c:155 src/frogr-settings-dialog.c:932
 msgid "_Close"
 msgstr "S_chließen"
 
-#. Description label
-#: ../src/frogr-auth-dialog.c:167
+#: src/frogr-auth-dialog.c:167
 msgid "Enter verification code:"
 msgstr "Prüfcode eingeben"
 
-#: ../src/frogr-auth-dialog.c:221
+#: src/frogr-auth-dialog.c:221
 msgid "Invalid verification code"
 msgstr "Ungültiger Prüfcode"
 
-#: ../src/frogr-controller.c:581
+#: src/frogr-controller.c:581
 msgid "Process cancelled"
 msgstr "Vorgang abgebrochen"
 
-#: ../src/frogr-controller.c:586
+#: src/frogr-controller.c:586
 msgid ""
 "Connection error:\n"
 "Network not available"
@@ -151,7 +153,7 @@ msgstr ""
 "Verbindungsfehler:\n"
 "Netzwerk nicht verfügbar"
 
-#: ../src/frogr-controller.c:590
+#: src/frogr-controller.c:590
 msgid ""
 "Connection error:\n"
 "Bad request"
@@ -159,7 +161,7 @@ msgstr ""
 "Verbindungsfehler:\n"
 "Falsche Anfrage"
 
-#: ../src/frogr-controller.c:594
+#: src/frogr-controller.c:594
 msgid ""
 "Connection error:\n"
 "Server-side error"
@@ -167,7 +169,7 @@ msgstr ""
 "Verbindungsfehler:\n"
 "Serverfehler"
 
-#: ../src/frogr-controller.c:598
+#: src/frogr-controller.c:598
 msgid ""
 "Error uploading:\n"
 "File invalid"
@@ -175,7 +177,7 @@ msgstr ""
 "Fehler beim Hochladen:\n"
 "Datei ist ungültig"
 
-#: ../src/frogr-controller.c:602
+#: src/frogr-controller.c:602
 msgid ""
 "Error uploading picture:\n"
 "Quota exceeded"
@@ -183,14 +185,14 @@ msgstr ""
 "Fehler beim Hochladen des Bildes:\n"
 "Kontingent wurde erreicht"
 
-#: ../src/frogr-controller.c:607
+#: src/frogr-controller.c:607
 #, c-format
 msgid "Quota exceeded (limit: %d video per month)"
 msgid_plural "Quota exceeded (limit: %d videos per month)"
 msgstr[0] "Kontingent überschritten (Grenze: %d Video pro Monat)"
 msgstr[1] "Kontingent überschritten (Grenze: %d Videos pro Monat)"
 
-#: ../src/frogr-controller.c:611
+#: src/frogr-controller.c:611
 msgid ""
 "Error uploading video:\n"
 "You can't upload more videos with this account"
@@ -198,7 +200,7 @@ msgstr ""
 "Fehler beim Hochladen des Videos:\n"
 "Sie können keine weiteren Videos mit diesem Konto hochladen"
 
-#: ../src/frogr-controller.c:617
+#: src/frogr-controller.c:617
 msgid ""
 "Error:\n"
 "Photo not found"
@@ -206,7 +208,7 @@ msgstr ""
 "Fehler:\n"
 "Foto nicht gefunden"
 
-#: ../src/frogr-controller.c:621
+#: src/frogr-controller.c:621
 msgid ""
 "Error:\n"
 "Photo already in photoset"
@@ -214,7 +216,7 @@ msgstr ""
 "Fehler:\n"
 "Foto ist bereits im Album vorhanden"
 
-#: ../src/frogr-controller.c:625
+#: src/frogr-controller.c:625
 msgid ""
 "Error:\n"
 "Photo already in group"
@@ -222,7 +224,7 @@ msgstr ""
 "Fehler:\n"
 "Foto ist bereits in Gruppe vorhanden"
 
-#: ../src/frogr-controller.c:629
+#: src/frogr-controller.c:629
 msgid ""
 "Error:\n"
 "Photo already in the maximum number of groups possible"
@@ -230,7 +232,7 @@ msgstr ""
 "Fehler:\n"
 "Foto ist bereits in der maximalen Gruppenanzahl enthalten"
 
-#: ../src/frogr-controller.c:633
+#: src/frogr-controller.c:633
 msgid ""
 "Error:\n"
 "Group limit already reached"
@@ -238,7 +240,7 @@ msgstr ""
 "Fehler:\n"
 "Gruppenlimit wurde bereits erreicht"
 
-#: ../src/frogr-controller.c:637
+#: src/frogr-controller.c:637
 msgid ""
 "Error:\n"
 "Photo added to group's queue"
@@ -246,7 +248,7 @@ msgstr ""
 "Fehler:\n"
 "Foto wurde zur Warteschlange der Gruppe hinzugefügt"
 
-#: ../src/frogr-controller.c:641
+#: src/frogr-controller.c:641
 msgid ""
 "Error:\n"
 "Photo already added to group's queue"
@@ -254,7 +256,7 @@ msgstr ""
 "Fehler:\n"
 "Foto wurde bereits zur Warteschlange der Gruppe hinzugefügt"
 
-#: ../src/frogr-controller.c:645
+#: src/frogr-controller.c:645
 msgid ""
 "Error:\n"
 "Content not allowed for this group"
@@ -262,8 +264,7 @@ msgstr ""
 "Fehler:\n"
 "Inhalt ist für diese Gruppe nicht erlaubt"
 
-#: ../src/frogr-controller.c:649
-#, c-format
+#: src/frogr-controller.c:649
 msgid ""
 "Authorization failed.\n"
 "Please try again"
@@ -271,7 +272,7 @@ msgstr ""
 "Legitimierung ist fehlgeschlagen.\n"
 "Bitte versuchen Sie es erneut"
 
-#: ../src/frogr-controller.c:655
+#: src/frogr-controller.c:655
 #, c-format
 msgid ""
 "Error\n"
@@ -282,8 +283,7 @@ msgstr ""
 "%s ist nicht ausreichend legitimiert, um Bilder zu Flickr hochzuladen.\n"
 "Bitte legitimieren Sie erneut"
 
-#: ../src/frogr-controller.c:660
-#, c-format
+#: src/frogr-controller.c:660
 msgid ""
 "Unable to authenticate in Flickr\n"
 "Please try again."
@@ -291,7 +291,7 @@ msgstr ""
 "Legitimierung bei Flickr ist fehlgeschlagen.\n"
 "Bitte versuchen Sie es erneut"
 
-#: ../src/frogr-controller.c:664
+#: src/frogr-controller.c:664
 #, c-format
 msgid ""
 "You have not properly authorized %s yet.\n"
@@ -300,8 +300,7 @@ msgstr ""
 "Sie haben %s noch nicht korrekt legitimiert.\n"
 "Bitte versuchen Sie es erneut."
 
-#: ../src/frogr-controller.c:669
-#, c-format
+#: src/frogr-controller.c:669
 msgid ""
 "Invalid verification code.\n"
 "Please try again."
@@ -309,8 +308,7 @@ msgstr ""
 "Ungültiger Prüfcode.\n"
 "Bitte versuchen Sie es erneut"
 
-#: ../src/frogr-controller.c:673
-#, c-format
+#: src/frogr-controller.c:673
 msgid ""
 "Error:\n"
 "Service not available"
@@ -318,64 +316,62 @@ msgstr ""
 "Fehler:\n"
 "Dienst ist nicht verfügbar"
 
-#. General error: just dump the raw error description
-#: ../src/frogr-controller.c:678
+#: src/frogr-controller.c:678
 #, c-format
 msgid "An error happened: %s."
 msgstr "Ein Fehler ist aufgetreten: %s."
 
-#: ../src/frogr-controller.c:883
+#: src/frogr-controller.c:883
 msgid "Authorization failed (timed out)"
 msgstr "Legitimierung ist fehlgeschlagen (Zeitüberschreitung)"
 
-#: ../src/frogr-controller.c:931
+#: src/frogr-controller.c:931
 #, c-format
 msgid "Retrying Upload (attempt %d/%d)…"
 msgstr "Hochladen wird erneut versucht (Versuch %d/%d) …"
 
-#: ../src/frogr-controller.c:936
+#: src/frogr-controller.c:936
 #, c-format
 msgid "Uploading '%s'…"
 msgstr "»%s« wird hochgeladen …"
 
-#: ../src/frogr-controller.c:2242
+#: src/frogr-controller.c:2242
 msgid "Updating credentials…"
 msgstr "Anmeldedaten werden aktualisiert …"
 
-#: ../src/frogr-controller.c:2247
+#: src/frogr-controller.c:2247
 msgid "Retrieving data for authorization…"
 msgstr "Legitimierungsdaten werden geholt …"
 
-#: ../src/frogr-controller.c:2252
+#: src/frogr-controller.c:2252
 msgid "Finishing authorization…"
 msgstr "Legitimierung wird abgeschlossen …"
 
-#: ../src/frogr-controller.c:2257
+#: src/frogr-controller.c:2257
 msgid "Retrieving list of sets…"
 msgstr "Albenliste wird geholt …"
 
-#: ../src/frogr-controller.c:2262
+#: src/frogr-controller.c:2262
 msgid "Retrieving list of groups…"
 msgstr "Gruppenliste wird geholt …"
 
-#: ../src/frogr-controller.c:2267
+#: src/frogr-controller.c:2267
 msgid "Retrieving list of tags…"
 msgstr "Markierungsliste wird geholt …"
 
-#: ../src/frogr-controller.c:2292
-#, c-format
+#: src/frogr-controller.c:2292
 msgid "Fetching information"
 msgstr "Informationen werden geholt"
 
-#: ../src/frogr-controller.c:2398
+#: src/frogr-controller.c:2398
 msgid "No sets found"
 msgstr "Keine Alben gefunden"
 
-#: ../src/frogr-controller.c:2423
+#: src/frogr-controller.c:2423
 msgid "No groups found"
 msgstr "Keine Gruppen gefunden"
 
-#: ../src/frogr-controller.c:2984
+#: src/frogr-controller.c:2984
 #, c-format
 msgid ""
 "You need to properly authorize %s before uploading any pictures to Flickr.\n"
@@ -385,187 +381,183 @@ msgstr ""
 "werden können.\n"
 "Bitte nehmen Sie die Legitimierung erneut vor."
 
-#: ../src/frogr-controller.c:2994
-#, c-format
+#: src/frogr-controller.c:2994
 msgid "You need to be connected before uploading any pictures to Flickr."
 msgstr "Vor dem Hochladen von Bildern zu Flickr müssen Sie verbunden sein."
 
-#: ../src/frogr-controller.c:3012
+#: src/frogr-controller.c:3012
 msgid "Uploading Pictures"
 msgstr "Bilder hochladen"
 
-#: ../src/frogr-controller.c:3057
-#, c-format
+#: src/frogr-controller.c:3057
 msgid "Error opening project file"
 msgstr "Fehler beim Öffnen der Projektdatei"
 
-#. This shows a dialog notifying the problem to the user
-#: ../src/frogr-create-new-set-dialog.c:143 ../src/frogr-details-dialog.c:1001
+#: src/frogr-create-new-set-dialog.c:143 src/frogr-details-dialog.c:1001
 msgid "Missing data required"
 msgstr "Benötigte Daten fehlen"
 
-#: ../src/frogr-create-new-set-dialog.c:326
+#: src/frogr-create-new-set-dialog.c:326
 msgid "Title:"
 msgstr "Titel:"
 
-#: ../src/frogr-create-new-set-dialog.c:335
+#: src/frogr-create-new-set-dialog.c:335
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: ../src/frogr-create-new-set-dialog.c:356
+#: src/frogr-create-new-set-dialog.c:356
 msgid "Fill Pictures Details with Title and Description"
 msgstr "Titel und Beschreibung zu Bilddetails hinzufügen"
 
-#: ../src/frogr-create-new-set-dialog.c:381
+#: src/frogr-create-new-set-dialog.c:381
 msgid "Create New Set"
 msgstr "Neues Album anlegen"
 
-#: ../src/frogr-details-dialog.c:89 ../src/frogr-settings-dialog.c:97
+#: src/frogr-details-dialog.c:89 src/frogr-settings-dialog.c:97
 msgid "Default (as specified in Flickr)"
 msgstr "Vorgabe (wie in Flickr festgelegt)"
 
-#: ../src/frogr-details-dialog.c:90 ../src/frogr-settings-dialog.c:98
+#: src/frogr-details-dialog.c:90 src/frogr-settings-dialog.c:98
 msgid "All rights reserved"
 msgstr "Alle Rechte vorbehalten"
 
-#: ../src/frogr-details-dialog.c:91 ../src/frogr-settings-dialog.c:99
+#: src/frogr-details-dialog.c:91 src/frogr-settings-dialog.c:99
 msgid "CC Attribution-NonCommercial-ShareAlike"
 msgstr "CC Attribution-NonCommercial-ShareAlike"
 
-#: ../src/frogr-details-dialog.c:92 ../src/frogr-settings-dialog.c:100
+#: src/frogr-details-dialog.c:92 src/frogr-settings-dialog.c:100
 msgid "CC Attribution-NonCommercial"
 msgstr "CC Attribution-NonCommercial"
 
-#: ../src/frogr-details-dialog.c:93 ../src/frogr-settings-dialog.c:101
+#: src/frogr-details-dialog.c:93 src/frogr-settings-dialog.c:101
 msgid "CC Attribution-NonCommercial-NoDerivs"
 msgstr "CC Attribution-NonCommercial-NoDerivs"
 
-#: ../src/frogr-details-dialog.c:94 ../src/frogr-settings-dialog.c:102
+#: src/frogr-details-dialog.c:94 src/frogr-settings-dialog.c:102
 msgid "CC Attribution"
 msgstr "CC Attribution"
 
-#: ../src/frogr-details-dialog.c:95 ../src/frogr-settings-dialog.c:103
+#: src/frogr-details-dialog.c:95 src/frogr-settings-dialog.c:103
 msgid "CC Attribution-ShareAlike"
 msgstr "CC Attribution-ShareAlike"
 
-#: ../src/frogr-details-dialog.c:96 ../src/frogr-settings-dialog.c:104
+#: src/frogr-details-dialog.c:96 src/frogr-settings-dialog.c:104
 msgid "CC Attribution-NoDerivs"
 msgstr "CC Attribution-NoDerivs"
 
-#: ../src/frogr-details-dialog.c:172
+#: src/frogr-details-dialog.c:172
 msgid "Open with image viewer"
 msgstr "Mit Bildbetrachter öffnen"
 
-#: ../src/frogr-details-dialog.c:190
+#: src/frogr-details-dialog.c:190
 msgid "_Title:"
 msgstr "_Titel:"
 
-#: ../src/frogr-details-dialog.c:200
+#: src/frogr-details-dialog.c:200
 msgid "_Description:"
 msgstr "_Beschreibung:"
 
-#: ../src/frogr-details-dialog.c:224
+#: src/frogr-details-dialog.c:224
 msgid "Ta_gs:"
 msgstr "Ma_rkierungen:"
 
-#: ../src/frogr-details-dialog.c:247
+#: src/frogr-details-dialog.c:247
 msgid "Visibility"
 msgstr "Sichtbarkeit"
 
-#: ../src/frogr-details-dialog.c:257 ../src/frogr-settings-dialog.c:196
+#: src/frogr-details-dialog.c:257 src/frogr-settings-dialog.c:196
 msgid "_Private"
 msgstr "_Privat"
 
-#: ../src/frogr-details-dialog.c:261 ../src/frogr-settings-dialog.c:199
+#: src/frogr-details-dialog.c:261 src/frogr-settings-dialog.c:199
 msgid "P_ublic"
 msgstr "_Öffentlich"
 
-#: ../src/frogr-details-dialog.c:270 ../src/frogr-settings-dialog.c:207
+#: src/frogr-details-dialog.c:270 src/frogr-settings-dialog.c:207
 msgid "_Family"
 msgstr "_Familie"
 
-#: ../src/frogr-details-dialog.c:274 ../src/frogr-settings-dialog.c:209
+#: src/frogr-details-dialog.c:274 src/frogr-settings-dialog.c:209
 msgid "F_riends"
 msgstr "F_reunde"
 
-#: ../src/frogr-details-dialog.c:288
+#: src/frogr-details-dialog.c:288
 msgid "Content Type"
 msgstr "Inhaltstyp"
 
-#: ../src/frogr-details-dialog.c:296 ../src/frogr-settings-dialog.c:234
+#: src/frogr-details-dialog.c:296 src/frogr-settings-dialog.c:234
 msgid "P_hoto"
 msgstr "_Foto"
 
-#: ../src/frogr-details-dialog.c:300 ../src/frogr-settings-dialog.c:236
+#: src/frogr-details-dialog.c:300 src/frogr-settings-dialog.c:236
 msgid "Scree_nshot"
 msgstr "_Bildschirmfoto"
 
-#: ../src/frogr-details-dialog.c:304 ../src/frogr-settings-dialog.c:238
+#: src/frogr-details-dialog.c:304 src/frogr-settings-dialog.c:238
 msgid "Oth_er"
 msgstr "And_ere"
 
-#: ../src/frogr-details-dialog.c:317
+#: src/frogr-details-dialog.c:317
 msgid "Safety Level"
 msgstr "Sicherheitsstufe"
 
-#: ../src/frogr-details-dialog.c:325 ../src/frogr-settings-dialog.c:260
+#: src/frogr-details-dialog.c:325 src/frogr-settings-dialog.c:260
 msgid "S_afe"
 msgstr "_Sicher"
 
-#: ../src/frogr-details-dialog.c:329 ../src/frogr-settings-dialog.c:262
+#: src/frogr-details-dialog.c:329 src/frogr-settings-dialog.c:262
 msgid "_Moderate"
 msgstr "_Mittel"
 
-#: ../src/frogr-details-dialog.c:333 ../src/frogr-settings-dialog.c:264
+#: src/frogr-details-dialog.c:333 src/frogr-settings-dialog.c:264
 msgid "Restr_icted"
 msgstr "E_ingeschränkt"
 
-#: ../src/frogr-details-dialog.c:345
+#: src/frogr-details-dialog.c:345
 msgid "License Type"
 msgstr "Lizenztyp"
 
-#: ../src/frogr-details-dialog.c:367
+#: src/frogr-details-dialog.c:367
 msgid "Other Properties"
 msgstr "Weitere Eigenschaften"
 
-#: ../src/frogr-details-dialog.c:375
+#: src/frogr-details-dialog.c:375
 msgid "_Show Up in Global Search Results"
 msgstr "In globalen _Suchergebnissen anzeigen"
 
-#: ../src/frogr-details-dialog.c:379
+#: src/frogr-details-dialog.c:379
 msgid "Set Geo_location Information"
 msgstr "Geo_position festlegen"
 
-#: ../src/frogr-details-dialog.c:383
+#: src/frogr-details-dialog.c:383
 msgid "Replace 'Date Posted' with 'Date Taken'"
 msgstr "Bekanntgabedatum mit Aufnahmedatum ersetzen"
 
-#. Visually indicate how many pictures are being edited
-#: ../src/frogr-details-dialog.c:475
+#: src/frogr-details-dialog.c:475
 #, c-format
 msgid "(%d Picture)"
 msgid_plural "(%d Pictures)"
 msgstr[0] "(%d Bild)"
 msgstr[1] "(%d Bilder)"
 
-#: ../src/frogr-details-dialog.c:548
+#: src/frogr-details-dialog.c:548
 msgid "An error happened trying to load the picture"
 msgstr "Ein Fehler trat beim Versuch auf, ein Bild hochzuladen"
 
-#: ../src/frogr-details-dialog.c:1169 ../data/gtkbuilder/frogr-menu-bar.xml.h:8
+#: src/frogr-details-dialog.c:1169
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: ../src/frogr-details-dialog.c:1197
+#: src/frogr-details-dialog.c:1197
 msgid "Edit Picture Details"
 msgstr "Bilddetails bearbeiten"
 
-#: ../src/frogr-file-loader.c:142
+#: src/frogr-file-loader.c:142
 #, c-format
 msgid "Loading files %d / %d"
 msgstr "Dateien werden geladen %d / %d"
 
-#: ../src/frogr-file-loader.c:369
+#: src/frogr-file-loader.c:369
 #, c-format
 msgid ""
 "Unable to load picture %s:\n"
@@ -574,7 +566,7 @@ msgstr ""
 "Bild %s kann nicht geladen werden:\n"
 "%s"
 
-#: ../src/frogr-file-loader.c:400
+#: src/frogr-file-loader.c:400
 #, c-format
 msgid ""
 "Unable to load video %s\n"
@@ -583,10 +575,7 @@ msgstr ""
 "Video %s kann nicht geladen werden\n"
 "Bitte prüfen Sie, ob der richtige Codec installiert ist"
 
-#. First %s is the title of the picture (filename of the file by
-#. default). Second %s is the max allowed size for a picture to be
-#. uploaded to flickr (different for free and PRO accounts).
-#: ../src/frogr-file-loader.c:636
+#: src/frogr-file-loader.c:636
 #, c-format
 msgid ""
 "Can't load file %s:\n"
@@ -595,370 +584,304 @@ msgstr ""
 "Datei %s kann nicht geladen werden:\n"
 "Datei ist größer als das für dieses Konto zulässige Maximum (%s)"
 
-#. First create the left side buttons
-#: ../src/frogr-main-view.c:630 ../src/frogr-main-view.c:726
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
 msgid "Open"
 msgstr "Öffnen"
 
-#: ../src/frogr-main-view.c:630 ../src/frogr-main-view.c:726
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
 msgid "Open Existing Project"
 msgstr "Bestehendes Projekt öffnen"
 
-#: ../src/frogr-main-view.c:631 ../src/frogr-main-view.c:729
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: ../src/frogr-main-view.c:631 ../src/frogr-main-view.c:729
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
 msgid "Add Elements"
 msgstr "Elemente hinzufügen"
 
-#: ../src/frogr-main-view.c:632 ../src/frogr-main-view.c:730
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
 msgid "Remove"
 msgstr "Entfernen"
 
-#: ../src/frogr-main-view.c:632 ../src/frogr-main-view.c:730
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
 msgid "Remove Elements"
 msgstr "Elemente entfernen"
 
-#: ../src/frogr-main-view.c:633 ../src/frogr-main-view.c:732
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
 msgid "Upload"
 msgstr "Hochladen"
 
-#: ../src/frogr-main-view.c:633 ../src/frogr-main-view.c:732
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
 msgid "Upload All"
 msgstr "Alle hochladen"
 
-#. Save project item
-#: ../src/frogr-main-view.c:666 ../src/frogr-main-view.c:727
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
 msgid "Save"
 msgstr "Speichern"
 
-#: ../src/frogr-main-view.c:666 ../src/frogr-main-view.c:727
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
 msgid "Save Current Project"
 msgstr "Aktuelles Projekt speichern"
 
-#: ../src/frogr-main-view.c:1016 ../data/gtkbuilder/frogr-app-menu.xml.h:4
+#: src/frogr-main-view.c:1016
 msgid "_About"
 msgstr "_Info"
 
-#: ../src/frogr-main-view.c:1020 ../data/gtkbuilder/frogr-app-menu.xml.h:5
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:17
+#: src/frogr-main-view.c:1020
 msgid "_Quit"
 msgstr "_Beenden"
 
-#. Create the submenu and insert it in the right section
-#: ../src/frogr-main-view.c:1070
+#: src/frogr-main-view.c:1070
 msgid "Accounts"
 msgstr "Konten"
 
-#. String showind the date and time a picture was taken
-#: ../src/frogr-main-view.c:1410
+#: src/frogr-main-view.c:1410
 #, c-format
 msgid "Taken: %s"
 msgstr "Aufnahmedatum: %s"
 
-#: ../src/frogr-main-view.c:1415
+#: src/frogr-main-view.c:1415
 #, c-format
 msgid "File size: %s"
 msgstr "Dateigröße: %s"
 
-#: ../src/frogr-main-view.c:1540
+#: src/frogr-main-view.c:1540
 msgid "Select File"
 msgstr "Datei auswählen"
 
-#: ../src/frogr-main-view.c:1544 ../src/frogr-main-view.c:1671
+#: src/frogr-main-view.c:1544 src/frogr-main-view.c:1671
 msgid "_Open"
 msgstr "Ö_ffnen"
 
-#: ../src/frogr-main-view.c:1553
+#: src/frogr-main-view.c:1553
 msgid "Frogr Project Files"
 msgstr "Frogr Projektdateien"
 
-#: ../src/frogr-main-view.c:1615
+#: src/frogr-main-view.c:1615
 msgid "Select Destination"
 msgstr "Wählen Sie das Ziel"
 
-#: ../src/frogr-main-view.c:1619 ../data/gtkbuilder/frogr-menu-bar.xml.h:3
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:1
+#: src/frogr-main-view.c:1619
 msgid "_Save"
 msgstr "_Speichern"
 
-#: ../src/frogr-main-view.c:1622
+#: src/frogr-main-view.c:1622
 msgid "Untitled Project.frogr"
 msgstr "Unbenanntes Projekt.frogr"
 
-#: ../src/frogr-main-view.c:1667
+#: src/frogr-main-view.c:1667
 msgid "Select a Picture"
 msgstr "Ein Bild auswählen"
 
-#: ../src/frogr-main-view.c:1694
+#: src/frogr-main-view.c:1694
 msgid "All Files"
 msgstr "Alle Dateien"
 
-#: ../src/frogr-main-view.c:1697
+#: src/frogr-main-view.c:1697
 msgid "Image Files"
 msgstr "Bilddateien"
 
-#: ../src/frogr-main-view.c:1701
+#: src/frogr-main-view.c:1701
 msgid "Video Files"
 msgstr "Video-Dateien"
 
-#: ../src/frogr-main-view.c:1723
+#: src/frogr-main-view.c:1723
 msgid "You don't have any picture added yet"
 msgstr "Sie haben noch kein Bild hinzugefügt"
 
-#: ../src/frogr-main-view.c:1736
+#: src/frogr-main-view.c:1736
 msgid "You need to select some pictures first"
 msgstr "Sie müssen zunächst einige Bilder auswählen"
 
-#: ../src/frogr-main-view.c:2108
+#: src/frogr-main-view.c:2108
 msgid "Not connected to Flickr"
 msgstr "Nicht mit Flickr verbunden"
 
-#. Login string, showing the user is PRO (second '%s') if so.
-#: ../src/frogr-main-view.c:2118
+#: src/frogr-main-view.c:2118
 #, c-format
 msgid "Connected as %s%s"
 msgstr "Verbunden als %s%s"
 
-#: ../src/frogr-main-view.c:2119
+#: src/frogr-main-view.c:2119
 msgid " (PRO account)"
 msgstr " (PRO-Konto)"
 
-#. Will show in the status bar the amount of data (in KB, MB
-#. or GB) the user is currently allowed to upload to flicker
-#. till the end of the month, in a CURRENT / MAX fashion.
-#. The '-' at the beginning is just a separator, since more
-#. blocks of text will be shown in the status bar too.
-#: ../src/frogr-main-view.c:2143
+#: src/frogr-main-view.c:2143
 #, c-format
 msgid " - %s / %s remaining"
 msgstr " - %s / %s verbleibend"
 
-#. Will show in the status bar the amount of pictures and data
-#. (in KB, MB or GB) that would be uploaded as the sum of the
-#. sizes for every picture loaded in the application
-#: ../src/frogr-main-view.c:2169
+#: src/frogr-main-view.c:2169
 #, c-format
 msgid " - %d file to upload (%s)"
 msgid_plural " - %d files to upload (%s)"
 msgstr[0] " - %d Bild hochzuladen (%s)"
 msgstr[1] " - %d Bilder hochzuladen (%s)"
 
-#: ../src/frogr-settings-dialog.c:185
+#: src/frogr-settings-dialog.c:185
 msgid "Default Visibility"
 msgstr "Vorgegebene Sichtbarkeit"
 
-#: ../src/frogr-settings-dialog.c:224
+#: src/frogr-settings-dialog.c:224
 msgid "Default Content Type"
 msgstr "Vorgegebener Inhaltstyp"
 
-#: ../src/frogr-settings-dialog.c:250
+#: src/frogr-settings-dialog.c:250
 msgid "Default Safety Level"
 msgstr "Vorgegebene Sicherheitsstufe"
 
-#: ../src/frogr-settings-dialog.c:276
+#: src/frogr-settings-dialog.c:276
 msgid "Default License"
 msgstr "Vorgabelizenz"
 
-#: ../src/frogr-settings-dialog.c:302
+#: src/frogr-settings-dialog.c:302
 msgid "Other Defaults"
 msgstr "Weitere Vorgaben"
 
-#: ../src/frogr-settings-dialog.c:312
+#: src/frogr-settings-dialog.c:312
 msgid "_Show Pictures in Global Search Results"
 msgstr "Bilder in globalen _Suchergebnissen anzeigen"
 
-#: ../src/frogr-settings-dialog.c:315
+#: src/frogr-settings-dialog.c:315
 msgid "Set Geo_location Information for Pictures"
 msgstr "Geo_position der Bilder festlegen"
 
-#: ../src/frogr-settings-dialog.c:318
+#: src/frogr-settings-dialog.c:318
 msgid "Replace 'Date Posted' with 'Date Taken' for Pictures"
 msgstr "Bekanntgabedatum mit Aufnahmedatum von Bildern ersetzen"
 
-#: ../src/frogr-settings-dialog.c:324
+#: src/frogr-settings-dialog.c:324
 msgid "_General"
 msgstr "All_gemein"
 
-#: ../src/frogr-settings-dialog.c:344
+#: src/frogr-settings-dialog.c:344
 msgid "Proxy Settings"
 msgstr "Proxy-Einstellungen"
 
-#. Enable proxy
-#: ../src/frogr-settings-dialog.c:353
+#: src/frogr-settings-dialog.c:353
 msgid "_Enable HTTP Proxy"
 msgstr "HTTP-Proxy aktivi_eren"
 
-#: ../src/frogr-settings-dialog.c:363
+#: src/frogr-settings-dialog.c:363
 msgid "_Host:"
 msgstr "_Rechner:"
 
-#. Proxy port
-#: ../src/frogr-settings-dialog.c:376
+#: src/frogr-settings-dialog.c:376
 msgid "_Port:"
 msgstr "_Port:"
 
-#. Proxy username
-#: ../src/frogr-settings-dialog.c:389
+#: src/frogr-settings-dialog.c:389
 msgid "U_sername:"
 msgstr "_Benutzername:"
 
-#. Proxy password
-#: ../src/frogr-settings-dialog.c:402
+#: src/frogr-settings-dialog.c:402
 msgid "Pass_word:"
 msgstr "_Passwort:"
 
-#: ../src/frogr-settings-dialog.c:426
+#: src/frogr-settings-dialog.c:426
 msgid "Connec_tion"
 msgstr "_Verbindung"
 
-#: ../src/frogr-settings-dialog.c:444
+#: src/frogr-settings-dialog.c:444
 msgid "Other options"
 msgstr "Weitere Optionen"
 
-#: ../src/frogr-settings-dialog.c:454
+#: src/frogr-settings-dialog.c:454
 msgid "Ena_ble Tags Auto-Completion"
 msgstr "Automatische Vervollständigung der Markierungen _aktivieren"
 
-#: ../src/frogr-settings-dialog.c:457
+#: src/frogr-settings-dialog.c:457
 msgid "_Import Tags from Pictures Metadata"
 msgstr "Markierungen aus den Metadaten von Bildern _importieren"
 
-#: ../src/frogr-settings-dialog.c:461
+#: src/frogr-settings-dialog.c:461
 msgid "Use _Dark GTK Theme"
 msgstr "_Dunkles GTK-Thema verwenden"
 
-#: ../src/frogr-settings-dialog.c:465
+#: src/frogr-settings-dialog.c:465
 msgid "_Keep File Extensions in Titles when Loading"
 msgstr "Dateinamenerweiterungen der Bildnamen beim Laden von Bildern _behalten"
 
-#: ../src/frogr-settings-dialog.c:471
+#: src/frogr-settings-dialog.c:471
 msgid "_Misc"
 msgstr "_Verschiedenes"
 
-#: ../src/frogr-settings-dialog.c:972
+#: src/frogr-settings-dialog.c:972
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:1
-msgid "Aut_horize Account…"
-msgstr "Konto _legitimieren …"
-
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:2
-msgid "_Preferences…"
-msgstr "_Einstellungen …"
-
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:3
-msgid "_Help"
-msgstr "_Hilfe"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:1
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:9
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:3
-msgid "_Edit Details…"
-msgstr "_Details bearbeiten …"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:2
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:10
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:4
-msgid "Add _Tags…"
-msgstr "_Markierungen hinzufügen …"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:3
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:11
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:5
-msgid "Add to _Group…"
-msgstr "Zu _Gruppe hinzufügen …"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:4
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:12
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:6
-msgid "Add to _Photoset"
-msgstr "Zu _Album hinzufügen"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:5
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:13
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:7
-msgid "_Add to Existing Photoset…"
-msgstr "Zu _vorhandenem Album hinzufügen …"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:6
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:14
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:8
-msgid "_Create New Photoset…"
-msgstr "Neues Album _erstellen …"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:7
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:15
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:16
-msgid "_Open in External Viewer"
-msgstr "In e_xternem Betrachter öffnen"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:8
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:6
-msgid "_Remove Elements"
-msgstr "Elemente _entfernen"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:1
-msgid "_File"
-msgstr "_Datei"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:2
-msgid "_Open…"
-msgstr "Ö_ffnen …"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:4
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:2
-msgid "Save _As…"
-msgstr "Speichern _unter …"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:5
-msgid "A_dd Elements…"
-msgstr "Elemente _hinzufügen …"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:7
-msgid "_Upload All"
-msgstr "_Alle hochladen"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:16
-msgid "_View"
-msgstr "_Ansicht"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:17
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:9
-msgid "_Sort Elements"
-msgstr "Elemente _sortieren"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:18
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:10
-msgid "As _Loaded"
-msgstr "Wie ge_laden"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:19
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:11
-msgid "By _Date Taken"
-msgstr "Nach Aufnahme_datum"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:20
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:12
-msgid "By _Title"
-msgstr "Nach _Titel"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:21
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:13
-msgid "By _Size"
-msgstr "Nach _Größe"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:22
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:14
-msgid "_Reversed Order"
-msgstr "Reihenfolge umkeh_ren"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:23
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:15
-msgid "Enable _Tooltips"
-msgstr "Minihilfen ak_tivieren"
+#~ msgid "Aut_horize Account…"
+#~ msgstr "Konto _legitimieren …"
+
+#~ msgid "_Preferences…"
+#~ msgstr "_Einstellungen …"
+
+#~ msgid "_Help"
+#~ msgstr "_Hilfe"
+
+#~ msgid "_Edit Details…"
+#~ msgstr "_Details bearbeiten …"
+
+#~ msgid "Add _Tags…"
+#~ msgstr "_Markierungen hinzufügen …"
+
+#~ msgid "Add to _Group…"
+#~ msgstr "Zu _Gruppe hinzufügen …"
+
+#~ msgid "Add to _Photoset"
+#~ msgstr "Zu _Album hinzufügen"
+
+#~ msgid "_Add to Existing Photoset…"
+#~ msgstr "Zu _vorhandenem Album hinzufügen …"
+
+#~ msgid "_Create New Photoset…"
+#~ msgstr "Neues Album _erstellen …"
+
+#~ msgid "_Open in External Viewer"
+#~ msgstr "In e_xternem Betrachter öffnen"
+
+#~ msgid "_Remove Elements"
+#~ msgstr "Elemente _entfernen"
+
+#~ msgid "_File"
+#~ msgstr "_Datei"
+
+#~ msgid "_Open…"
+#~ msgstr "Ö_ffnen …"
+
+#~ msgid "Save _As…"
+#~ msgstr "Speichern _unter …"
+
+#~ msgid "A_dd Elements…"
+#~ msgstr "Elemente _hinzufügen …"
+
+#~ msgid "_Upload All"
+#~ msgstr "_Alle hochladen"
+
+#~ msgid "_View"
+#~ msgstr "_Ansicht"
+
+#~ msgid "_Sort Elements"
+#~ msgstr "Elemente _sortieren"
+
+#~ msgid "As _Loaded"
+#~ msgstr "Wie ge_laden"
+
+#~ msgid "By _Date Taken"
+#~ msgstr "Nach Aufnahme_datum"
+
+#~ msgid "By _Title"
+#~ msgstr "Nach _Titel"
+
+#~ msgid "By _Size"
+#~ msgstr "Nach _Größe"
+
+#~ msgid "_Reversed Order"
+#~ msgstr "Reihenfolge umkeh_ren"
+
+#~ msgid "Enable _Tooltips"
+#~ msgstr "Minihilfen ak_tivieren"
 
 #~ msgid "Frogr"
 #~ msgstr "Frogr"
diff --git a/po/el.po b/po/el.po
index 7761b9c..1b1dadc 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8,9 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: frogr master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=frogr&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-12-19 22:37+0000\n"
+"Report-Msgid-Bugs-To: msanchez gnome org\n"
+"POT-Creation-Date: 2016-08-12 13:09+0100\n"
 "PO-Revision-Date: 2014-04-24 18:51+0200\n"
 "Last-Translator: Tom Tryfonidis <tomtryf gmail com>\n"
 "Language-Team: team gnome gr\n"
@@ -22,19 +21,27 @@ msgstr ""
 "X-Generator: Poedit 1.6.4\n"
 "X-Project-Style: gnome\n"
 
-#: ../data/frogr.appdata.xml.in.h:1 ../data/frogr.desktop.in.in.h:2
-msgid "Frogr: a Flickr Remote Organizer for GNOME"
+#: data/frogr.appdata.xml.in:5 data/frogr.desktop.in.in:5
+#: data/frogr.desktop.in.in:14
+#, fuzzy
+msgid "frogr"
+msgstr "Frogr"
+
+#: data/frogr.appdata.xml.in:6 data/frogr.desktop.in.in:6
+#, fuzzy
+msgid "frogr: a Flickr Remote Organizer for GNOME"
 msgstr "Frogr: Πρόγραμμα απομακρυσμένης οργάνωσης του Flickr για GNOME"
 
-#: ../data/frogr.appdata.xml.in.h:2
+#: data/frogr.appdata.xml.in:8
+#, fuzzy
 msgid ""
-"Frogr is a small application for the GNOME desktop that allows users to "
+"frogr is a small application for the GNOME desktop that allows users to "
 "manage their accounts in the Flickr image hosting website."
 msgstr ""
 "Το Frogr είναι μια μικρή εφαρμογή του GNOME που επιτρέπει στους χρήστες της "
 "να διαχειριστούν τους λογαριασμούς τους στο Flickr."
 
-#: ../data/frogr.appdata.xml.in.h:3
+#: data/frogr.appdata.xml.in:13
 msgid ""
 "It supports all the basic Flickr features, including uploading pictures, "
 "adding descriptions, setting tags and managing sets and groups pools."
@@ -43,25 +50,31 @@ msgstr ""
 "ανεβάσματος εικόνων, προσθήκης περιγραφών, ορισμό ετικετών και διαχείριση "
 "συλλογών και ομάδων."
 
-#: ../data/frogr.desktop.in.in.h:1
-msgid "Frogr"
-msgstr "Frogr"
+#: data/frogr.appdata.xml.in:24
+#, fuzzy
+msgid "Screenshot of frogr"
+msgstr "Στιγμ_ιότυπο οθόνης"
+
+#: data/frogr.appdata.xml.in:29
+msgid "Mario Sanchez Prada"
+msgstr ""
 
-#: ../data/frogr.desktop.in.in.h:3
+#: data/frogr.desktop.in.in:7
 msgid "Upload and organize photos in Flickr accounts"
 msgstr "Ανέβασμα και οργάνωση φωτογραφιών σε λογαριασμούς Flickr"
 
-#: ../data/frogr.desktop.in.in.h:4
+#: data/frogr.desktop.in.in:8
 msgid "Flickr;Image;Picture;Photo;Video;Uploader;"
 msgstr ""
 "Flickr;Εικόνα;Απεικόνιση;Φωτογραφία;Βίντεο;μεταφορτωτής;Image;Picture;Photo;"
 "Video;Uploader;"
 
-#: ../src/frogr-about-dialog.c:43
-msgid "A Flickr remote organizer for GNOME\n"
+#: src/frogr-about-dialog.c:43
+#, fuzzy
+msgid "A Flickr Remote Organizer for GNOME\n"
 msgstr "Πρόγραμμα απομακρυσμένης οργάνωσης Flickr για GNOME\n"
 
-#: ../src/frogr-about-dialog.c:72
+#: src/frogr-about-dialog.c:72
 msgid "translator-credits"
 msgstr ""
 "Ελληνική μεταφραστική ομάδα GNOME\n"
@@ -69,50 +82,48 @@ msgstr ""
 " Mel Argyropoulou <bunnydee93 gmail com>\n"
 "Για περισσότερες πληροφορίες: http://gnome.gr";
 
-#: ../src/frogr-add-tags-dialog.c:198 ../src/frogr-add-to-set-dialog.c:551
-#: ../src/frogr-add-to-group-dialog.c:550
-#: ../src/frogr-create-new-set-dialog.c:328 ../src/frogr-details-dialog.c:1194
-#: ../src/frogr-main-view.c:463 ../src/frogr-main-view.c:1371
-#: ../src/frogr-main-view.c:1448 ../src/frogr-main-view.c:1498
-#: ../src/frogr-settings-dialog.c:992
+#: src/frogr-add-tags-dialog.c:191 src/frogr-add-to-group-dialog.c:528
+#: src/frogr-add-to-set-dialog.c:529 src/frogr-auth-dialog.c:153
+#: src/frogr-create-new-set-dialog.c:310 src/frogr-details-dialog.c:1168
+#: src/frogr-main-view.c:1543 src/frogr-main-view.c:1618
+#: src/frogr-main-view.c:1670 src/frogr-settings-dialog.c:930
 msgid "_Cancel"
 msgstr "A_κύρωση"
 
-#: ../src/frogr-add-tags-dialog.c:200 ../src/frogr-add-to-set-dialog.c:553
-#: ../src/frogr-add-to-group-dialog.c:552
-#: ../src/frogr-create-new-set-dialog.c:330
+#: src/frogr-add-tags-dialog.c:193 src/frogr-add-to-group-dialog.c:530
+#: src/frogr-add-to-set-dialog.c:531 src/frogr-create-new-set-dialog.c:312
 msgid "_Add"
 msgstr "_Προσθήκη"
 
-#: ../src/frogr-add-tags-dialog.c:207
+#: src/frogr-add-tags-dialog.c:202
 msgid "Enter a spaces separated list of tags:"
 msgstr "Εισάγετε λίστα ετικετών διαχωρισμένες με κενό διάστημα:"
 
-#: ../src/frogr-add-tags-dialog.c:230
+#: src/frogr-add-tags-dialog.c:228
 msgid "Add Tags"
 msgstr "Προσθήκη ετικετών"
 
-#: ../src/frogr-add-to-set-dialog.c:155
-msgid "Title"
-msgstr "Τίτλος"
+#: src/frogr-add-to-group-dialog.c:147
+msgid "Name"
+msgstr "Όνομα"
 
-#: ../src/frogr-add-to-set-dialog.c:170 ../src/frogr-add-to-group-dialog.c:169
+#: src/frogr-add-to-group-dialog.c:162 src/frogr-add-to-set-dialog.c:163
 msgid "Elements"
 msgstr "Στοιχεία"
 
-#: ../src/frogr-add-to-set-dialog.c:602
-msgid "Add to Sets"
-msgstr "Προσθήκη σε συλλογές"
-
-#: ../src/frogr-add-to-group-dialog.c:154
-msgid "Name"
-msgstr "Όνομα"
-
-#: ../src/frogr-add-to-group-dialog.c:601
+#: src/frogr-add-to-group-dialog.c:581
 msgid "Add to Groups"
 msgstr "Προσθήκη σε ομάδες"
 
-#: ../src/frogr-auth-dialog.c:52
+#: src/frogr-add-to-set-dialog.c:148
+msgid "Title"
+msgstr "Τίτλος"
+
+#: src/frogr-add-to-set-dialog.c:582
+msgid "Add to Sets"
+msgstr "Προσθήκη σε συλλογές"
+
+#: src/frogr-auth-dialog.c:59
 #, c-format
 msgid ""
 "Please press the button to authorize %s and then come back to complete the "
@@ -121,29 +132,29 @@ msgstr ""
 "Παρακαλώ πατήστε το κουμπί για να εξουσιοδοτήσετε το %s και μετά επιστρέψτε "
 "για να ολοκληρώσετε τη διεργασία."
 
-#: ../src/frogr-auth-dialog.c:56 ../src/frogr-auth-dialog.c:141
+#: src/frogr-auth-dialog.c:63 src/frogr-auth-dialog.c:149
+#: src/frogr-controller.c:2286
 #, c-format
 msgid "Authorize %s"
 msgstr "Εξουσιοδότηση %s"
 
-#: ../src/frogr-auth-dialog.c:145 ../src/frogr-settings-dialog.c:994
+#: src/frogr-auth-dialog.c:155 src/frogr-settings-dialog.c:932
 msgid "_Close"
 msgstr "Κλεί_σιμο"
 
-#. Description label
-#: ../src/frogr-auth-dialog.c:158
+#: src/frogr-auth-dialog.c:167
 msgid "Enter verification code:"
 msgstr "Εισάγετε κωδικό επιβεβαίωσης:"
 
-#: ../src/frogr-auth-dialog.c:209
+#: src/frogr-auth-dialog.c:221
 msgid "Invalid verification code"
 msgstr "Άκυρος κωδικός επιβεβαίωσης"
 
-#: ../src/frogr-controller.c:593
+#: src/frogr-controller.c:581
 msgid "Process cancelled"
 msgstr "Ακύρωση διεργασίας"
 
-#: ../src/frogr-controller.c:598
+#: src/frogr-controller.c:586
 msgid ""
 "Connection error:\n"
 "Network not available"
@@ -151,7 +162,7 @@ msgstr ""
 "Σφάλμα σύνδεσης:\n"
 "Μη διαθέσιμο δίκτυο"
 
-#: ../src/frogr-controller.c:602
+#: src/frogr-controller.c:590
 msgid ""
 "Connection error:\n"
 "Bad request"
@@ -159,7 +170,7 @@ msgstr ""
 "Σφάλμα σύνδεσης:\n"
 "Εσφαλμένο αίτημα"
 
-#: ../src/frogr-controller.c:606
+#: src/frogr-controller.c:594
 msgid ""
 "Connection error:\n"
 "Server-side error"
@@ -167,7 +178,7 @@ msgstr ""
 "Σφάλμα σύνδεσης:\n"
 "Σφάλμα διακομιστή"
 
-#: ../src/frogr-controller.c:610
+#: src/frogr-controller.c:598
 msgid ""
 "Error uploading:\n"
 "File invalid"
@@ -175,7 +186,7 @@ msgstr ""
 "Σφάλμα κατά το ανέβασμα:\n"
 "Άκυρο αρχείο"
 
-#: ../src/frogr-controller.c:614
+#: src/frogr-controller.c:602
 msgid ""
 "Error uploading picture:\n"
 "Quota exceeded"
@@ -183,14 +194,14 @@ msgstr ""
 "Σφάλμα κατά το ανέβασμα της εικόνας:\n"
 "Η ποσόστωση έχει ξεπεραστεί"
 
-#: ../src/frogr-controller.c:619
+#: src/frogr-controller.c:607
 #, c-format
 msgid "Quota exceeded (limit: %d video per month)"
 msgid_plural "Quota exceeded (limit: %d videos per month)"
 msgstr[0] "Υπέρβαση ποσόστωσης (όριο: %d βίντεο ανά μήνα)"
 msgstr[1] "Υπέρβαση ποσόστωσης (όριο: %d βίντεο ανά μήνα)"
 
-#: ../src/frogr-controller.c:623
+#: src/frogr-controller.c:611
 msgid ""
 "Error uploading video:\n"
 "You can't upload more videos with this account"
@@ -198,7 +209,7 @@ msgstr ""
 "Σφάλμα κατά το ανέβασμα βίντεο:\n"
 "Δεν μπορείτε να ανεβάσετε περισσότερα βίντεο με αυτόν τον λογαριασμό"
 
-#: ../src/frogr-controller.c:629
+#: src/frogr-controller.c:617
 msgid ""
 "Error:\n"
 "Photo not found"
@@ -206,7 +217,7 @@ msgstr ""
 "Σφάλμα:\n"
 "Δε βρέθηκε φωτογραφία"
 
-#: ../src/frogr-controller.c:633
+#: src/frogr-controller.c:621
 msgid ""
 "Error:\n"
 "Photo already in photoset"
@@ -214,7 +225,7 @@ msgstr ""
 "Σφάλμα:\n"
 "Η φωτογραφία βρίσκεται ήδη σε σύνολο φωτογραφιών"
 
-#: ../src/frogr-controller.c:637
+#: src/frogr-controller.c:625
 msgid ""
 "Error:\n"
 "Photo already in group"
@@ -222,7 +233,7 @@ msgstr ""
 "Σφάλμα:\n"
 "Η φωτογραφία ανήκει ήδη σε ομάδα"
 
-#: ../src/frogr-controller.c:641
+#: src/frogr-controller.c:629
 msgid ""
 "Error:\n"
 "Photo already in the maximum number of groups possible"
@@ -230,7 +241,7 @@ msgstr ""
 "Σφάλμα:\n"
 "Η φωτογραφία βρίσκεται ήδη στο μέγιστο επιτρεπόμενο αριθμό ομάδων"
 
-#: ../src/frogr-controller.c:645
+#: src/frogr-controller.c:633
 msgid ""
 "Error:\n"
 "Group limit already reached"
@@ -238,7 +249,7 @@ msgstr ""
 "Σφάλμα:\n"
 "Εξαντλήθηκε το όριο ομάδων"
 
-#: ../src/frogr-controller.c:649
+#: src/frogr-controller.c:637
 msgid ""
 "Error:\n"
 "Photo added to group's queue"
@@ -246,7 +257,7 @@ msgstr ""
 "Σφάλμα:\n"
 "Η φωτογραφία προστέθηκε στην αναμονή της ομάδας"
 
-#: ../src/frogr-controller.c:653
+#: src/frogr-controller.c:641
 msgid ""
 "Error:\n"
 "Photo already added to group's queue"
@@ -254,7 +265,7 @@ msgstr ""
 "Σφάλμα:\n"
 "Η φωτογραφία προστέθηκε ήδη στην αναμονή της ομάδας"
 
-#: ../src/frogr-controller.c:657
+#: src/frogr-controller.c:645
 msgid ""
 "Error:\n"
 "Content not allowed for this group"
@@ -262,8 +273,7 @@ msgstr ""
 "Σφάλμα:\n"
 "Το περιεχόμενο δεν επιτρέπεται για αυτήν την ομάδα"
 
-#: ../src/frogr-controller.c:661
-#, c-format
+#: src/frogr-controller.c:649
 msgid ""
 "Authorization failed.\n"
 "Please try again"
@@ -271,7 +281,7 @@ msgstr ""
 "Αποτυχία εξουσιοδότησης.\n"
 "Παρακαλούμε προσπαθήστε ξανά"
 
-#: ../src/frogr-controller.c:667
+#: src/frogr-controller.c:655
 #, c-format
 msgid ""
 "Error\n"
@@ -283,8 +293,7 @@ msgstr ""
 "Flickr.\n"
 "Παρακαλούμε εξουσιοδοτήστε το ξανά"
 
-#: ../src/frogr-controller.c:672
-#, c-format
+#: src/frogr-controller.c:660
 msgid ""
 "Unable to authenticate in Flickr\n"
 "Please try again."
@@ -292,7 +301,7 @@ msgstr ""
 "Αποτυχία πιστοποίησης στο Flickr.\n"
 "Παρακαλούμε προσπαθήστε ξανά."
 
-#: ../src/frogr-controller.c:676
+#: src/frogr-controller.c:664
 #, c-format
 msgid ""
 "You have not properly authorized %s yet.\n"
@@ -301,8 +310,7 @@ msgstr ""
 "Δεν έχετε εξουσιοδοτήσει κατάλληλα το %s ακόμα.\n"
 "Παρακαλούμε δοκιμάστε το ξανά."
 
-#: ../src/frogr-controller.c:681
-#, c-format
+#: src/frogr-controller.c:669
 msgid ""
 "Invalid verification code.\n"
 "Please try again."
@@ -310,8 +318,7 @@ msgstr ""
 "Αποτυχία κώδικα επιβεβαίωσης.\n"
 "Παρακαλούμε προσπαθήστε ξανά."
 
-#: ../src/frogr-controller.c:685
-#, c-format
+#: src/frogr-controller.c:673
 msgid ""
 "Error:\n"
 "Service not available"
@@ -319,59 +326,63 @@ msgstr ""
 "Σφάλμα:\n"
 "Η υπηρεσία δεν είναι διαθέσιμη"
 
-#. General error: just dump the raw error description
-#: ../src/frogr-controller.c:690
+#: src/frogr-controller.c:678
 #, c-format
 msgid "An error happened: %s."
 msgstr "Συνέβη ένα σφάλμα: %s."
 
-#: ../src/frogr-controller.c:906
+#: src/frogr-controller.c:883
 msgid "Authorization failed (timed out)"
 msgstr "Αποτυχία εξουσιοδότησης (λήξη χρόνου)"
 
-#: ../src/frogr-controller.c:958
+#: src/frogr-controller.c:931
 #, c-format
 msgid "Retrying Upload (attempt %d/%d)…"
 msgstr "Νέα απόπειρα ανεβάσματος (προσπάθεια %d/%d)…"
 
-#: ../src/frogr-controller.c:963
+#: src/frogr-controller.c:936
 #, c-format
 msgid "Uploading '%s'…"
 msgstr "Ανεβαίνει το '%s'…"
 
-#: ../src/frogr-controller.c:2221
+#: src/frogr-controller.c:2242
 msgid "Updating credentials…"
 msgstr "Ενημερώνονται τα διαπιστευτήρια…"
 
-#: ../src/frogr-controller.c:2226
+#: src/frogr-controller.c:2247
 msgid "Retrieving data for authorization…"
 msgstr "Ανάκτηση δεδομένων για εξουσιοδότηση…"
 
-#: ../src/frogr-controller.c:2231
+#: src/frogr-controller.c:2252
 msgid "Finishing authorization…"
 msgstr "Ολοκληρώνεται η εξουσιοδότηση…"
 
-#: ../src/frogr-controller.c:2236
+#: src/frogr-controller.c:2257
 msgid "Retrieving list of sets…"
 msgstr "Ανάκτηση λιστών συλλογών…"
 
-#: ../src/frogr-controller.c:2241
+#: src/frogr-controller.c:2262
 msgid "Retrieving list of groups…"
 msgstr "Ανάκτηση λίστας ομάδων…"
 
-#: ../src/frogr-controller.c:2246
+#: src/frogr-controller.c:2267
 msgid "Retrieving list of tags…"
 msgstr "Ανάκτηση λίστας ετικετών…"
 
-#: ../src/frogr-controller.c:2363
+#: src/frogr-controller.c:2292
+#, fuzzy
+msgid "Fetching information"
+msgstr "Ορισμός πληροφοριών γεω_τοποθεσίας"
+
+#: src/frogr-controller.c:2398
 msgid "No sets found"
 msgstr "Δε βρέθηκαν συλλογές"
 
-#: ../src/frogr-controller.c:2390
+#: src/frogr-controller.c:2423
 msgid "No groups found"
 msgstr "Δε βρέθηκαν ομάδες"
 
-#: ../src/frogr-controller.c:3031
+#: src/frogr-controller.c:2984
 #, c-format
 msgid ""
 "You need to properly authorize %s before uploading any pictures to Flickr.\n"
@@ -381,180 +392,184 @@ msgstr ""
 "Flickr.\n"
 "Παρακαλώ εξουσιοδοτήστε το ξανά."
 
-#: ../src/frogr-controller.c:3041
-#, c-format
+#: src/frogr-controller.c:2994
 msgid "You need to be connected before uploading any pictures to Flickr."
 msgstr "Πρέπει να συνδεθείτε πριν να ανεβάσετε φωτογραφίες στο Flickr."
 
-#: ../src/frogr-controller.c:3113
-#, c-format
+#: src/frogr-controller.c:3012
+#, fuzzy
+msgid "Uploading Pictures"
+msgstr "_Προσθήκη φωτογραφιών"
+
+#: src/frogr-controller.c:3057
 msgid "Error opening project file"
 msgstr "Σφάλμα κατά το άνοιγμα αρχείου έργου"
 
-#. This shows a dialog notifying the problem to the user
-#: ../src/frogr-create-new-set-dialog.c:156 ../src/frogr-details-dialog.c:1021
+#: src/frogr-create-new-set-dialog.c:143 src/frogr-details-dialog.c:1001
 msgid "Missing data required"
 msgstr "Λείπουν απαραίτητα δεδομένα"
 
-#: ../src/frogr-create-new-set-dialog.c:342
+#: src/frogr-create-new-set-dialog.c:326
 msgid "Title:"
 msgstr "Τίτλος:"
 
-#: ../src/frogr-create-new-set-dialog.c:351
+#: src/frogr-create-new-set-dialog.c:335
 msgid "Description:"
 msgstr "Περιγραφή:"
 
-#: ../src/frogr-create-new-set-dialog.c:372
+#: src/frogr-create-new-set-dialog.c:356
 msgid "Fill Pictures Details with Title and Description"
 msgstr "Συμπληρώστε τις λεπτομέρειες των εικόνων με τίτλο και περιγραφή"
 
-#: ../src/frogr-create-new-set-dialog.c:393
+#: src/frogr-create-new-set-dialog.c:381
 msgid "Create New Set"
 msgstr "Δημιουργία νέας συλλογής"
 
-#: ../src/frogr-details-dialog.c:90 ../src/frogr-settings-dialog.c:100
+#: src/frogr-details-dialog.c:89 src/frogr-settings-dialog.c:97
 msgid "Default (as specified in Flickr)"
 msgstr "Προεπιλογή (όπως ορίστηκε στο Flickr)"
 
-#: ../src/frogr-details-dialog.c:91 ../src/frogr-settings-dialog.c:101
+#: src/frogr-details-dialog.c:90 src/frogr-settings-dialog.c:98
 msgid "All rights reserved"
 msgstr "Με επιφύλαξη παντός δικαιώματος"
 
-#: ../src/frogr-details-dialog.c:92 ../src/frogr-settings-dialog.c:102
+#: src/frogr-details-dialog.c:91 src/frogr-settings-dialog.c:99
 msgid "CC Attribution-NonCommercial-ShareAlike"
 msgstr "Αντίγραφο Απόδοση-Μη εμπορικό-Ίδια διανομή"
 
-#: ../src/frogr-details-dialog.c:93 ../src/frogr-settings-dialog.c:103
+#: src/frogr-details-dialog.c:92 src/frogr-settings-dialog.c:100
 msgid "CC Attribution-NonCommercial"
 msgstr "Αντίγραφο Απόδοση-Μη εμπορικό"
 
-#: ../src/frogr-details-dialog.c:94 ../src/frogr-settings-dialog.c:104
+#: src/frogr-details-dialog.c:93 src/frogr-settings-dialog.c:101
 msgid "CC Attribution-NonCommercial-NoDerivs"
 msgstr "Αντίγραφο Απόδοση-Μη εμπορικό-Όχι παράγωγα"
 
-#: ../src/frogr-details-dialog.c:95 ../src/frogr-settings-dialog.c:105
+#: src/frogr-details-dialog.c:94 src/frogr-settings-dialog.c:102
 msgid "CC Attribution"
 msgstr "Αντίγραφο Απόδοση"
 
-#: ../src/frogr-details-dialog.c:96 ../src/frogr-settings-dialog.c:106
+#: src/frogr-details-dialog.c:95 src/frogr-settings-dialog.c:103
 msgid "CC Attribution-ShareAlike"
 msgstr "Αντίγραφο Απόδοση-Ίδια διανομή"
 
-#: ../src/frogr-details-dialog.c:97 ../src/frogr-settings-dialog.c:107
+#: src/frogr-details-dialog.c:96 src/frogr-settings-dialog.c:104
 msgid "CC Attribution-NoDerivs"
 msgstr "Αντίγραφο Απόδοση-Όχι παράγωγα"
 
-#: ../src/frogr-details-dialog.c:180
+#: src/frogr-details-dialog.c:172
 msgid "Open with image viewer"
 msgstr "Άνοιγμα με προβολή εικόνας"
 
-#: ../src/frogr-details-dialog.c:194
+#: src/frogr-details-dialog.c:190
 msgid "_Title:"
 msgstr "_Τίτλος:"
 
-#: ../src/frogr-details-dialog.c:204
+#: src/frogr-details-dialog.c:200
 msgid "_Description:"
 msgstr "_Περιγραφή:"
 
-#: ../src/frogr-details-dialog.c:228
+#: src/frogr-details-dialog.c:224
 msgid "Ta_gs:"
 msgstr "Ετ_ικέτες:"
 
-#: ../src/frogr-details-dialog.c:254
+#: src/frogr-details-dialog.c:247
 msgid "Visibility"
 msgstr "Ορατότητα"
 
-#: ../src/frogr-details-dialog.c:266 ../src/frogr-settings-dialog.c:209
+#: src/frogr-details-dialog.c:257 src/frogr-settings-dialog.c:196
 msgid "_Private"
 msgstr "_Ιδιωτικό"
 
-#: ../src/frogr-details-dialog.c:270 ../src/frogr-settings-dialog.c:203
+#: src/frogr-details-dialog.c:261 src/frogr-settings-dialog.c:199
 msgid "P_ublic"
 msgstr "Δ_ημόσιο"
 
-#: ../src/frogr-details-dialog.c:279 ../src/frogr-settings-dialog.c:212
+#: src/frogr-details-dialog.c:270 src/frogr-settings-dialog.c:207
 msgid "_Family"
 msgstr "_Οικογένεια:"
 
-#: ../src/frogr-details-dialog.c:283 ../src/frogr-settings-dialog.c:214
+#: src/frogr-details-dialog.c:274 src/frogr-settings-dialog.c:209
 msgid "F_riends"
 msgstr "_Φίλοι"
 
-#: ../src/frogr-details-dialog.c:309
+#: src/frogr-details-dialog.c:288
 msgid "Content Type"
 msgstr "Τύπος περιεχομένου"
 
-#: ../src/frogr-details-dialog.c:318 ../src/frogr-settings-dialog.c:238
+#: src/frogr-details-dialog.c:296 src/frogr-settings-dialog.c:234
 msgid "P_hoto"
 msgstr "Φ_ωτογραφία"
 
-#: ../src/frogr-details-dialog.c:322 ../src/frogr-settings-dialog.c:240
+#: src/frogr-details-dialog.c:300 src/frogr-settings-dialog.c:236
 msgid "Scree_nshot"
 msgstr "Στιγμ_ιότυπο οθόνης"
 
-#: ../src/frogr-details-dialog.c:326 ../src/frogr-settings-dialog.c:242
+#: src/frogr-details-dialog.c:304 src/frogr-settings-dialog.c:238
 msgid "Oth_er"
 msgstr "Ά_λλο"
 
-#: ../src/frogr-details-dialog.c:342
+#: src/frogr-details-dialog.c:317
 msgid "Safety Level"
 msgstr "Επίπεδο ασφάλειας"
 
-#: ../src/frogr-details-dialog.c:351 ../src/frogr-settings-dialog.c:263
+#: src/frogr-details-dialog.c:325 src/frogr-settings-dialog.c:260
 msgid "S_afe"
 msgstr "Α_σφαλές"
 
-#: ../src/frogr-details-dialog.c:355 ../src/frogr-settings-dialog.c:265
+#: src/frogr-details-dialog.c:329 src/frogr-settings-dialog.c:262
 msgid "_Moderate"
 msgstr "_Μέτριο"
 
-#: ../src/frogr-details-dialog.c:359 ../src/frogr-settings-dialog.c:267
+#: src/frogr-details-dialog.c:333 src/frogr-settings-dialog.c:264
 msgid "Restr_icted"
 msgstr "Με πε_ριορισμούς"
 
-#: ../src/frogr-details-dialog.c:373
+#: src/frogr-details-dialog.c:345
 msgid "License Type"
 msgstr "Τύπος άδειας"
 
-#: ../src/frogr-details-dialog.c:397
+#: src/frogr-details-dialog.c:367
 msgid "Other Properties"
 msgstr "Άλλες ιδιότητες"
 
-#: ../src/frogr-details-dialog.c:406
+#: src/frogr-details-dialog.c:375
+msgid "_Show Up in Global Search Results"
+msgstr "_Εμφάνιση σε καθολικά αποτελέσματα αναζήτησης"
+
+#: src/frogr-details-dialog.c:379
 msgid "Set Geo_location Information"
 msgstr "Ορισμός πληροφοριών γεω_τοποθεσίας"
 
-#: ../src/frogr-details-dialog.c:410
-msgid "_Show Up in Global Search Results"
-msgstr "_Εμφάνιση σε καθολικά αποτελέσματα αναζήτησης"
+#: src/frogr-details-dialog.c:383
+msgid "Replace 'Date Posted' with 'Date Taken'"
+msgstr ""
 
-#. Visually indicate how many pictures are being edited
-#: ../src/frogr-details-dialog.c:501
+#: src/frogr-details-dialog.c:475
 #, c-format
 msgid "(%d Picture)"
 msgid_plural "(%d Pictures)"
 msgstr[0] "(%d Φωτογραφία)"
 msgstr[1] "(%d Φωτογραφίες)"
 
-#: ../src/frogr-details-dialog.c:575
+#: src/frogr-details-dialog.c:548
 msgid "An error happened trying to load the picture"
 msgstr "Σφάλμα κατά το ανέβασμα της φωτογραφίας"
 
-#: ../src/frogr-details-dialog.c:1195
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:8
+#: src/frogr-details-dialog.c:1169
 msgid "_Edit"
 msgstr "_Επεξεργασία"
 
-#: ../src/frogr-details-dialog.c:1224
+#: src/frogr-details-dialog.c:1197
 msgid "Edit Picture Details"
 msgstr "Επεξεργασία λεπτομερειών φωτογραφίας"
 
-#: ../src/frogr-file-loader.c:147
+#: src/frogr-file-loader.c:142
 #, c-format
 msgid "Loading files %d / %d"
 msgstr "Φόρτωση εικόνων %d / %d"
 
-#: ../src/frogr-file-loader.c:381
+#: src/frogr-file-loader.c:369
 #, c-format
 msgid ""
 "Unable to load picture %s:\n"
@@ -563,7 +578,7 @@ msgstr ""
 "Αδύνατη η φόρτωση εικόνας %s:\n"
 "%s"
 
-#: ../src/frogr-file-loader.c:412
+#: src/frogr-file-loader.c:400
 #, c-format
 msgid ""
 "Unable to load video %s\n"
@@ -573,10 +588,7 @@ msgstr ""
 "Παρακαλούμε ελέγξετε ότι έχετε εγκαταστήσει τον σωστό κωδικοποιητή-"
 "αποκωδικοποιητή"
 
-#. First %s is the title of the picture (filename of the file by
-#. default). Second %s is the max allowed size for a picture to be
-#. uploaded to flickr (different for free and PRO accounts).
-#: ../src/frogr-file-loader.c:652
+#: src/frogr-file-loader.c:636
 #, c-format
 msgid ""
 "Can't load file %s:\n"
@@ -586,348 +598,304 @@ msgstr ""
 "Το μέγεθος του αρχείου είναι μεγαλύτερο από το μέγιστο επιτρεπόμενο για "
 "αυτόν τον λογαριασμό (%s)"
 
-#: ../src/frogr-main-view.c:395
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
 msgid "Open"
 msgstr "Άνοιγμα"
 
-#: ../src/frogr-main-view.c:395
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
 msgid "Open Existing Project"
 msgstr "Άνοιγμα υπάρχοντος έργου"
 
-#: ../src/frogr-main-view.c:397
-msgid "Save"
-msgstr "Αποθήκευση"
-
-#: ../src/frogr-main-view.c:397
-msgid "Save Current Project"
-msgstr "Αποθήκευση τρέχοντος έργου"
-
-#: ../src/frogr-main-view.c:401
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
 msgid "Add"
 msgstr "Προσθήκη"
 
-#: ../src/frogr-main-view.c:401
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
 msgid "Add Elements"
 msgstr "Προσθήκη στοιχείων"
 
-#: ../src/frogr-main-view.c:403
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
 msgid "Remove"
 msgstr "Απομάκρυνση"
 
-#: ../src/frogr-main-view.c:403
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
 msgid "Remove Elements"
 msgstr "Απομάκρυνση στοιχείων"
 
-#: ../src/frogr-main-view.c:407
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
 msgid "Upload"
 msgstr "Ανέβασμα"
 
-#: ../src/frogr-main-view.c:407
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
 msgid "Upload All"
 msgstr "Ανέβασμα όλων"
 
-#: ../src/frogr-main-view.c:821 ../data/gtkbuilder/frogr-app-menu.xml.h:4
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
+msgid "Save"
+msgstr "Αποθήκευση"
+
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
+msgid "Save Current Project"
+msgstr "Αποθήκευση τρέχοντος έργου"
+
+#: src/frogr-main-view.c:1016
 msgid "_About"
 msgstr "_Περί"
 
-#: ../src/frogr-main-view.c:825 ../data/gtkbuilder/frogr-app-menu.xml.h:5
+#: src/frogr-main-view.c:1020
 msgid "_Quit"
 msgstr "Έ_ξοδος"
 
-#. Create the submenu and insert it in the right section
-#: ../src/frogr-main-view.c:881
+#: src/frogr-main-view.c:1070
 msgid "Accounts"
 msgstr "Λογαριασμοί"
 
-#. String showind the date and time a picture was taken
-#: ../src/frogr-main-view.c:1231
+#: src/frogr-main-view.c:1410
 #, c-format
 msgid "Taken: %s"
 msgstr "Λήψη: %s"
 
-#: ../src/frogr-main-view.c:1236
+#: src/frogr-main-view.c:1415
 #, c-format
 msgid "File size: %s"
 msgstr "Μέγεθος αρχείου: %s"
 
-#: ../src/frogr-main-view.c:1368
+#: src/frogr-main-view.c:1540
 msgid "Select File"
 msgstr "Επιλογή αρχείου"
 
-#: ../src/frogr-main-view.c:1372 ../src/frogr-main-view.c:1499
-#| msgid "Open"
+#: src/frogr-main-view.c:1544 src/frogr-main-view.c:1671
 msgid "_Open"
 msgstr "Ά_νοιγμα"
 
-#: ../src/frogr-main-view.c:1381
+#: src/frogr-main-view.c:1553
 msgid "Frogr Project Files"
 msgstr "Αρχεία έργου Frogr"
 
-#: ../src/frogr-main-view.c:1445
+#: src/frogr-main-view.c:1615
 msgid "Select Destination"
 msgstr "Επιλογή προορισμού"
 
-#: ../src/frogr-main-view.c:1449 ../data/gtkbuilder/frogr-menu-bar.xml.h:3
+#: src/frogr-main-view.c:1619
 msgid "_Save"
 msgstr "_Αποθήκευση"
 
-#: ../src/frogr-main-view.c:1452
+#: src/frogr-main-view.c:1622
 msgid "Untitled Project.frogr"
 msgstr "Ανώνυμο έργο.frogr"
 
-#: ../src/frogr-main-view.c:1495
+#: src/frogr-main-view.c:1667
 msgid "Select a Picture"
 msgstr "Επιλογή εικόνας"
 
-#: ../src/frogr-main-view.c:1522
+#: src/frogr-main-view.c:1694
 msgid "All Files"
 msgstr "Όλα τα αρχεία"
 
-#: ../src/frogr-main-view.c:1525
+#: src/frogr-main-view.c:1697
 msgid "Image Files"
 msgstr "Αρχεία εικόνων"
 
-#: ../src/frogr-main-view.c:1529
+#: src/frogr-main-view.c:1701
 msgid "Video Files"
 msgstr "Αρχεία βίντεο"
 
-#: ../src/frogr-main-view.c:1551
+#: src/frogr-main-view.c:1723
 msgid "You don't have any picture added yet"
 msgstr "Δεν έχετε προσθέσει καμία εικόνα ακόμα"
 
-#: ../src/frogr-main-view.c:1566
+#: src/frogr-main-view.c:1736
 msgid "You need to select some pictures first"
 msgstr "Πρέπει να επιλέξετε κάποιες εικόνες πρώτα"
 
-#: ../src/frogr-main-view.c:2026
+#: src/frogr-main-view.c:2108
 msgid "Not connected to Flickr"
 msgstr "Δεν έχει γίνει σύνδεση στο Flickr"
 
-#. Login string, showing the user is PRO (second '%s') if so.
-#: ../src/frogr-main-view.c:2036
+#: src/frogr-main-view.c:2118
 #, c-format
 msgid "Connected as %s%s"
 msgstr "Σύνδεση ως %s%s"
 
-#: ../src/frogr-main-view.c:2037
+#: src/frogr-main-view.c:2119
 msgid " (PRO account)"
 msgstr " (Λογαριασμός PRO)"
 
-#. Will show in the status bar the amount of data (in KB, MB
-#. or GB) the user is currently allowed to upload to flicker
-#. till the end of the month, in a CURRENT / MAX fashion.
-#. The '-' at the beginning is just a separator, since more
-#. blocks of text will be shown in the status bar too.
-#: ../src/frogr-main-view.c:2061
+#: src/frogr-main-view.c:2143
 #, c-format
 msgid " - %s / %s remaining"
 msgstr " - %s / %s απομένουν"
 
-#. Will show in the status bar the amount of pictures and data
-#. (in KB, MB or GB) that would be uploaded as the sum of the
-#. sizes for every picture loaded in the application
-#: ../src/frogr-main-view.c:2087
+#: src/frogr-main-view.c:2169
 #, c-format
 msgid " - %d file to upload (%s)"
 msgid_plural " - %d files to upload (%s)"
 msgstr[0] " - %d αρχείο για ανέβασμα (%s)"
 msgstr[1] " - %d αρχεία για ανέβασμα (%s)"
 
-#: ../src/frogr-settings-dialog.c:189
+#: src/frogr-settings-dialog.c:185
 msgid "Default Visibility"
 msgstr "Προεπιλεγμένη ορατότητα"
 
-#: ../src/frogr-settings-dialog.c:226
+#: src/frogr-settings-dialog.c:224
 msgid "Default Content Type"
 msgstr "Προεπιλεγμένος τύπος περιεχομένου"
 
-#: ../src/frogr-settings-dialog.c:251
+#: src/frogr-settings-dialog.c:250
 msgid "Default Safety Level"
 msgstr "Προεπιλεγμένο επίπεδο ασφάλειας"
 
-#: ../src/frogr-settings-dialog.c:276
+#: src/frogr-settings-dialog.c:276
 msgid "Default License"
 msgstr "Προεπιλεγμένη άδεια"
 
-#: ../src/frogr-settings-dialog.c:300
+#: src/frogr-settings-dialog.c:302
 msgid "Other Defaults"
 msgstr "Άλλες προεπιλογές"
 
-#: ../src/frogr-settings-dialog.c:312
+#: src/frogr-settings-dialog.c:312
+msgid "_Show Pictures in Global Search Results"
+msgstr "_Εμφάνιση εικόνων σε γενικά αποτελέσματα αναζήτησης"
+
+#: src/frogr-settings-dialog.c:315
 msgid "Set Geo_location Information for Pictures"
 msgstr "Ορισμός πληροφοριών γεω_τοποθεσίας για εικόνες"
 
-#: ../src/frogr-settings-dialog.c:315
-msgid "_Show Pictures in Global Search Results"
-msgstr "_Εμφάνιση εικόνων σε γενικά αποτελέσματα αναζήτησης"
+#: src/frogr-settings-dialog.c:318
+msgid "Replace 'Date Posted' with 'Date Taken' for Pictures"
+msgstr ""
 
-#: ../src/frogr-settings-dialog.c:321
+#: src/frogr-settings-dialog.c:324
 msgid "_General"
 msgstr "_Γενικά"
 
-#: ../src/frogr-settings-dialog.c:346
+#: src/frogr-settings-dialog.c:344
 msgid "Proxy Settings"
 msgstr "Ρυθμίσεις μεσολαβητή"
 
-#. Enable proxy
-#: ../src/frogr-settings-dialog.c:356
+#: src/frogr-settings-dialog.c:353
 msgid "_Enable HTTP Proxy"
 msgstr "_Ενεργοποίηση μεσολαβητή HTTP"
 
-#: ../src/frogr-settings-dialog.c:368
+#: src/frogr-settings-dialog.c:363
 msgid "_Host:"
 msgstr "_Οικοδεσπότης:"
 
-#. Proxy port
-#: ../src/frogr-settings-dialog.c:381
+#: src/frogr-settings-dialog.c:376
 msgid "_Port:"
 msgstr "_Θύρα:"
 
-#. Proxy username
-#: ../src/frogr-settings-dialog.c:394
+#: src/frogr-settings-dialog.c:389
 msgid "U_sername:"
 msgstr "Ό_νομα χρήστη:"
 
-#. Proxy password
-#: ../src/frogr-settings-dialog.c:407
+#: src/frogr-settings-dialog.c:402
 msgid "Pass_word:"
 msgstr "Κ_ωδικός πρόσβασης:"
 
-#: ../src/frogr-settings-dialog.c:447
+#: src/frogr-settings-dialog.c:426
 msgid "Connec_tion"
 msgstr "Σύνδεσ_η"
 
-#: ../src/frogr-settings-dialog.c:470
+#: src/frogr-settings-dialog.c:444
 msgid "Other options"
 msgstr "Λοιπές επιλογές"
 
-#: ../src/frogr-settings-dialog.c:482
+#: src/frogr-settings-dialog.c:454
 msgid "Ena_ble Tags Auto-Completion"
 msgstr "Ε_νεργοποίηση αυτόματης συμπλήρωσης ετικετών"
 
-#: ../src/frogr-settings-dialog.c:485
+#: src/frogr-settings-dialog.c:457
 msgid "_Import Tags from Pictures Metadata"
 msgstr "Ε_ισαγωγή ετικετών από μεταδεδομένα εικόνων"
 
-#: ../src/frogr-settings-dialog.c:489
+#: src/frogr-settings-dialog.c:461
 msgid "Use _Dark GTK Theme"
 msgstr "Χρήση _σκούρου θέματος GTK"
 
-#: ../src/frogr-settings-dialog.c:493
+#: src/frogr-settings-dialog.c:465
 msgid "_Keep File Extensions in Titles when Loading"
 msgstr "_Διατήρηση επεκτάσεων αρχείων στους τίτλους κατά τη φόρτωση"
 
-#: ../src/frogr-settings-dialog.c:499
+#: src/frogr-settings-dialog.c:471
 msgid "_Misc"
 msgstr "_Ποικίλα"
 
-#: ../src/frogr-settings-dialog.c:1035
+#: src/frogr-settings-dialog.c:972
 msgid "Preferences"
 msgstr "Προτιμήσεις"
 
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:1
-msgid "Aut_horize Account…"
-msgstr "Ε_ξουσιοδότηση λογαριασμού…"
-
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:2
-msgid "_Preferences…"
-msgstr "_Προτιμήσεις…"
-
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:3
-msgid "_Help"
-msgstr "_Βοήθεια"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:1
-msgid "_File"
-msgstr "_Αρχείο"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:2
-msgid "_Open…"
-msgstr "Ά_νοιγμα…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:4
-msgid "Save _As…"
-msgstr "Αποθήκευση _ως…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:5
-msgid "A_dd Elements…"
-msgstr "_Προσθήκη στοιχείων…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:6
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:8
-msgid "_Remove Elements"
-msgstr "_Απομάκρυνση στοιχείων"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:7
-msgid "_Upload All"
-msgstr "_Ανέβασμα όλων"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:9
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:1
-msgid "_Edit Details…"
-msgstr "_Επεξεργασία λεπτομερειών…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:10
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:2
-msgid "Add _Tags…"
-msgstr "Προσθήκη _ετικετών…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:11
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:3
-msgid "Add to _Group…"
-msgstr "Προσθήκη σε _ομάδα…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:12
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:4
-msgid "Add to _Photoset"
-msgstr "Προσθήκη σε _συλλογή"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:13
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:5
-msgid "_Add to Existing Photoset…"
-msgstr "_Προσθήκη σε υπάρχουσα συλλογή…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:14
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:6
-msgid "_Create New Photoset…"
-msgstr "_Δημιουργία νέας συλλογής…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:15
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:7
-msgid "_Open in External Viewer"
-msgstr "Ά_νοιγμα σε εξωτερική προβολή"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:16
-msgid "_View"
-msgstr "_Προβολή"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:17
-msgid "_Sort Elements"
-msgstr "_Ταξινόμηση στοιχείων"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:18
-msgid "As _Loaded"
-msgstr "Όπως _φορτώθηκαν"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:19
-msgid "By _Date Taken"
-msgstr "Κατά _ημερομηνία λήψης"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:20
-msgid "By _Title"
-msgstr "Κατά _τίτλο"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:21
-msgid "By _Size"
-msgstr "Κατά _μέγεθος"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:22
-msgid "_Reversed Order"
-msgstr "_Αντίστροφη σειρά"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:23
-msgid "Enable _Tooltips"
-msgstr "Ενεργοποίηση _συμβουλών οθόνης"
+#~ msgid "Aut_horize Account…"
+#~ msgstr "Ε_ξουσιοδότηση λογαριασμού…"
+
+#~ msgid "_Preferences…"
+#~ msgstr "_Προτιμήσεις…"
+
+#~ msgid "_Help"
+#~ msgstr "_Βοήθεια"
+
+#~ msgid "_File"
+#~ msgstr "_Αρχείο"
+
+#~ msgid "_Open…"
+#~ msgstr "Ά_νοιγμα…"
+
+#~ msgid "Save _As…"
+#~ msgstr "Αποθήκευση _ως…"
+
+#~ msgid "A_dd Elements…"
+#~ msgstr "_Προσθήκη στοιχείων…"
+
+#~ msgid "_Remove Elements"
+#~ msgstr "_Απομάκρυνση στοιχείων"
+
+#~ msgid "_Upload All"
+#~ msgstr "_Ανέβασμα όλων"
+
+#~ msgid "_Edit Details…"
+#~ msgstr "_Επεξεργασία λεπτομερειών…"
+
+#~ msgid "Add _Tags…"
+#~ msgstr "Προσθήκη _ετικετών…"
+
+#~ msgid "Add to _Group…"
+#~ msgstr "Προσθήκη σε _ομάδα…"
+
+#~ msgid "Add to _Photoset"
+#~ msgstr "Προσθήκη σε _συλλογή"
+
+#~ msgid "_Add to Existing Photoset…"
+#~ msgstr "_Προσθήκη σε υπάρχουσα συλλογή…"
+
+#~ msgid "_Create New Photoset…"
+#~ msgstr "_Δημιουργία νέας συλλογής…"
+
+#~ msgid "_Open in External Viewer"
+#~ msgstr "Ά_νοιγμα σε εξωτερική προβολή"
+
+#~ msgid "_View"
+#~ msgstr "_Προβολή"
+
+#~ msgid "_Sort Elements"
+#~ msgstr "_Ταξινόμηση στοιχείων"
+
+#~ msgid "As _Loaded"
+#~ msgstr "Όπως _φορτώθηκαν"
+
+#~ msgid "By _Date Taken"
+#~ msgstr "Κατά _ημερομηνία λήψης"
+
+#~ msgid "By _Title"
+#~ msgstr "Κατά _τίτλο"
+
+#~ msgid "By _Size"
+#~ msgstr "Κατά _μέγεθος"
+
+#~ msgid "_Reversed Order"
+#~ msgstr "_Αντίστροφη σειρά"
+
+#~ msgid "Enable _Tooltips"
+#~ msgstr "Ενεργοποίηση _συμβουλών οθόνης"
 
 #~ msgid "Visible to _Family"
 #~ msgstr "Ορατό στην _οικογένεια"
@@ -957,9 +925,6 @@ msgstr "Ενεργοποίηση _συμβουλών οθόνης"
 #~ msgid "Set's title:"
 #~ msgstr "Τίτλος συλλογής:"
 
-#~ msgid "_Add Pictures"
-#~ msgstr "_Προσθήκη φωτογραφιών"
-
 #~ msgid "_Remove Pictures"
 #~ msgstr "_Αφαίρεση φωτογραφιών"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 57e1ceb..31199c6 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: frogr 0.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-19 02:15+0100\n"
+"Report-Msgid-Bugs-To: msanchez gnome org\n"
+"POT-Creation-Date: 2016-08-12 13:09+0100\n"
 "PO-Revision-Date: 2010-12-24 17:07+0000\n"
 "Last-Translator: Philip Withnall <philip tecnocode co uk>\n"
 "Language-Team: British English <en li org>\n"
@@ -16,69 +16,131 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/frogr-about-dialog.c:44
-msgid "A Flickr remote organizer for GNOME\n"
+#: data/frogr.appdata.xml.in:5 data/frogr.desktop.in.in:5
+#: data/frogr.desktop.in.in:14
+msgid "frogr"
+msgstr "frogr"
+
+#: data/frogr.appdata.xml.in:6 data/frogr.desktop.in.in:6
+#, fuzzy
+msgid "frogr: a Flickr Remote Organizer for GNOME"
+msgstr "A Flickr remote organiser for GNOME\n"
+
+#: data/frogr.appdata.xml.in:8
+msgid ""
+"frogr is a small application for the GNOME desktop that allows users to "
+"manage their accounts in the Flickr image hosting website."
+msgstr ""
+
+#: data/frogr.appdata.xml.in:13
+msgid ""
+"It supports all the basic Flickr features, including uploading pictures, "
+"adding descriptions, setting tags and managing sets and groups pools."
+msgstr ""
+
+#: data/frogr.appdata.xml.in:24
+msgid "Screenshot of frogr"
+msgstr ""
+
+#: data/frogr.appdata.xml.in:29
+msgid "Mario Sanchez Prada"
+msgstr ""
+
+#: data/frogr.desktop.in.in:7
+msgid "Upload and organize photos in Flickr accounts"
+msgstr ""
+
+#: data/frogr.desktop.in.in:8
+msgid "Flickr;Image;Picture;Photo;Video;Uploader;"
+msgstr ""
+
+#: src/frogr-about-dialog.c:43
+#, fuzzy
+msgid "A Flickr Remote Organizer for GNOME\n"
 msgstr "A Flickr remote organiser for GNOME\n"
 
-#: ../src/frogr-about-dialog.c:107
+#: src/frogr-about-dialog.c:72
 msgid "translator-credits"
 msgstr "Philip Withnall <philip tecnocode co uk>"
 
-#: ../src/frogr-add-tags-dialog.c:342
+#: src/frogr-add-tags-dialog.c:191 src/frogr-add-to-group-dialog.c:528
+#: src/frogr-add-to-set-dialog.c:529 src/frogr-auth-dialog.c:153
+#: src/frogr-create-new-set-dialog.c:310 src/frogr-details-dialog.c:1168
+#: src/frogr-main-view.c:1543 src/frogr-main-view.c:1618
+#: src/frogr-main-view.c:1670 src/frogr-settings-dialog.c:930
+msgid "_Cancel"
+msgstr ""
+
+#: src/frogr-add-tags-dialog.c:193 src/frogr-add-to-group-dialog.c:530
+#: src/frogr-add-to-set-dialog.c:531 src/frogr-create-new-set-dialog.c:312
+msgid "_Add"
+msgstr ""
+
+#: src/frogr-add-tags-dialog.c:202
 msgid "Enter a spaces separated list of tags:"
 msgstr ""
 
-#: ../src/frogr-add-tags-dialog.c:383
+#: src/frogr-add-tags-dialog.c:228
 msgid "Add Tags"
 msgstr "Add Tags"
 
-#: ../src/frogr-add-to-set-dialog.c:133
-#, fuzzy
-msgid "Title"
-msgstr "Title:"
+#: src/frogr-add-to-group-dialog.c:147
+msgid "Name"
+msgstr ""
 
-#: ../src/frogr-add-to-set-dialog.c:148 ../src/frogr-add-to-group-dialog.c:148
+#: src/frogr-add-to-group-dialog.c:162 src/frogr-add-to-set-dialog.c:163
 msgid "Elements"
 msgstr ""
 
-#: ../src/frogr-add-to-set-dialog.c:577
+#: src/frogr-add-to-group-dialog.c:581
 #, fuzzy
-msgid "Add to Sets"
-msgstr "Add to Sets"
+msgid "Add to Groups"
+msgstr "Add to Groups"
 
-#: ../src/frogr-add-to-group-dialog.c:133
-msgid "Name"
-msgstr ""
+#: src/frogr-add-to-set-dialog.c:148
+#, fuzzy
+msgid "Title"
+msgstr "Title:"
 
-#: ../src/frogr-add-to-group-dialog.c:577
+#: src/frogr-add-to-set-dialog.c:582
 #, fuzzy
-msgid "Add to Groups"
-msgstr "Add to Groups"
+msgid "Add to Sets"
+msgstr "Add to Sets"
 
-#: ../src/frogr-auth-dialog.c:31
+#: src/frogr-auth-dialog.c:59
 #, fuzzy, c-format
 msgid ""
-"Please press the button to authorize %s and then come back to this screen to "
-"complete the process."
+"Please press the button to authorize %s and then come back to complete the "
+"process."
 msgstr ""
 "You have not properly authorised %s in flickr.\n"
 "Please press the button to authorise %s and then come back to this screen to "
 "complete the process."
 
-#: ../src/frogr-auth-dialog.c:35
-#, c-format
-msgid ""
-"Press the button to start using %s once you've authorized it in your flickr "
-"account."
+#: src/frogr-auth-dialog.c:63 src/frogr-auth-dialog.c:149
+#: src/frogr-controller.c:2286
+#, fuzzy, c-format
+msgid "Authorize %s"
+msgstr "Authorise _frogr"
+
+#: src/frogr-auth-dialog.c:155 src/frogr-settings-dialog.c:932
+msgid "_Close"
+msgstr ""
+
+#: src/frogr-auth-dialog.c:167
+msgid "Enter verification code:"
+msgstr ""
+
+#: src/frogr-auth-dialog.c:221
+msgid "Invalid verification code"
 msgstr ""
-"Press the button to start using %s once you've authorised it in your flickr "
-"account."
 
-#: ../src/frogr-controller.c:241
-msgid "Process cancelled by the user"
+#: src/frogr-controller.c:581
+#, fuzzy
+msgid "Process cancelled"
 msgstr "Process cancelled by the user"
 
-#: ../src/frogr-controller.c:246
+#: src/frogr-controller.c:586
 msgid ""
 "Connection error:\n"
 "Network not available"
@@ -86,7 +148,7 @@ msgstr ""
 "Connection error:\n"
 "Network not available"
 
-#: ../src/frogr-controller.c:251
+#: src/frogr-controller.c:590
 msgid ""
 "Connection error:\n"
 "Bad request"
@@ -94,7 +156,7 @@ msgstr ""
 "Connection error:\n"
 "Bad request"
 
-#: ../src/frogr-controller.c:256
+#: src/frogr-controller.c:594
 msgid ""
 "Connection error:\n"
 "Server-side error"
@@ -102,15 +164,16 @@ msgstr ""
 "Connection error:\n"
 "Server-side error"
 
-#: ../src/frogr-controller.c:261
+#: src/frogr-controller.c:598
+#, fuzzy
 msgid ""
-"Error uploading picture:\n"
+"Error uploading:\n"
 "File invalid"
 msgstr ""
 "Error uploading picture:\n"
 "File invalid"
 
-#: ../src/frogr-controller.c:266
+#: src/frogr-controller.c:602
 msgid ""
 "Error uploading picture:\n"
 "Quota exceeded"
@@ -118,7 +181,20 @@ msgstr ""
 "Error uploading picture:\n"
 "Quota exceeded"
 
-#: ../src/frogr-controller.c:271
+#: src/frogr-controller.c:607
+#, c-format
+msgid "Quota exceeded (limit: %d video per month)"
+msgid_plural "Quota exceeded (limit: %d videos per month)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/frogr-controller.c:611
+msgid ""
+"Error uploading video:\n"
+"You can't upload more videos with this account"
+msgstr ""
+
+#: src/frogr-controller.c:617
 msgid ""
 "Error:\n"
 "Photo not found"
@@ -126,7 +202,7 @@ msgstr ""
 "Error:\n"
 "Photo not found"
 
-#: ../src/frogr-controller.c:276
+#: src/frogr-controller.c:621
 msgid ""
 "Error:\n"
 "Photo already in photoset"
@@ -134,7 +210,7 @@ msgstr ""
 "Error:\n"
 "Photo already in photoset"
 
-#: ../src/frogr-controller.c:281
+#: src/frogr-controller.c:625
 #, fuzzy
 msgid ""
 "Error:\n"
@@ -143,7 +219,7 @@ msgstr ""
 "Error:\n"
 "Photo already in photoset"
 
-#: ../src/frogr-controller.c:286
+#: src/frogr-controller.c:629
 #, fuzzy
 msgid ""
 "Error:\n"
@@ -152,13 +228,13 @@ msgstr ""
 "Error:\n"
 "Photo already in photoset"
 
-#: ../src/frogr-controller.c:291
+#: src/frogr-controller.c:633
 msgid ""
 "Error:\n"
 "Group limit already reached"
 msgstr ""
 
-#: ../src/frogr-controller.c:296
+#: src/frogr-controller.c:637
 #, fuzzy
 msgid ""
 "Error:\n"
@@ -167,7 +243,7 @@ msgstr ""
 "Error:\n"
 "Photo already in photoset"
 
-#: ../src/frogr-controller.c:301
+#: src/frogr-controller.c:641
 #, fuzzy
 msgid ""
 "Error:\n"
@@ -176,14 +252,13 @@ msgstr ""
 "Error:\n"
 "Photo already in photoset"
 
-#: ../src/frogr-controller.c:306
+#: src/frogr-controller.c:645
 msgid ""
 "Error:\n"
 "Content not allowed for this group"
 msgstr ""
 
-#: ../src/frogr-controller.c:311
-#, c-format
+#: src/frogr-controller.c:649
 msgid ""
 "Authorization failed.\n"
 "Please try again"
@@ -191,19 +266,45 @@ msgstr ""
 "Authorisation failed.\n"
 "Please try again"
 
-#: ../src/frogr-controller.c:317
-#, c-format
+#: src/frogr-controller.c:655
+#, fuzzy, c-format
 msgid ""
 "Error\n"
-"%s is not properly authorized to upload pictures to flickr.\n"
+"%s is not properly authorized to upload pictures to Flickr.\n"
 "Please re-authorize it"
 msgstr ""
 "Error\n"
 "%s is not properly authorised to upload pictures to flickr.\n"
 "Please re-authorise it"
 
-#: ../src/frogr-controller.c:323
-#, c-format
+#: src/frogr-controller.c:660
+#, fuzzy
+msgid ""
+"Unable to authenticate in Flickr\n"
+"Please try again."
+msgstr ""
+"Authorisation failed.\n"
+"Please try again"
+
+#: src/frogr-controller.c:664
+#, fuzzy, c-format
+msgid ""
+"You have not properly authorized %s yet.\n"
+"Please try again."
+msgstr ""
+"You need to properly authorise %s before uploading any pictures to flickr.\n"
+"Please re-authorise it."
+
+#: src/frogr-controller.c:669
+#, fuzzy
+msgid ""
+"Invalid verification code.\n"
+"Please try again."
+msgstr ""
+"Authorisation failed.\n"
+"Please try again"
+
+#: src/frogr-controller.c:673
 msgid ""
 "Error:\n"
 "Service not available"
@@ -211,352 +312,586 @@ msgstr ""
 "Error:\n"
 "Service not available"
 
-#. General error: just dump the raw error description
-#: ../src/frogr-controller.c:329
-#, c-format
-msgid "An error happened while uploading a picture: %s."
+#: src/frogr-controller.c:678
+#, fuzzy, c-format
+msgid "An error happened: %s."
 msgstr "An error happened while uploading a picture: %s."
 
-#: ../src/frogr-controller.c:455
-msgid "Authorization successfully completed!"
-msgstr "Authorisation successfully completed!"
+#: src/frogr-controller.c:883
+#, fuzzy
+msgid "Authorization failed (timed out)"
+msgstr ""
+"Authorisation failed.\n"
+"Please try again"
 
-#: ../src/frogr-controller.c:859
-msgid "Creating new photoset…"
+#: src/frogr-controller.c:931
+#, c-format
+msgid "Retrying Upload (attempt %d/%d)…"
 msgstr ""
 
-#: ../src/frogr-controller.c:884
-#, fuzzy
-msgid "Adding picture to photoset…"
-msgstr "Uploading pictures…"
+#: src/frogr-controller.c:936
+#, c-format
+msgid "Uploading '%s'…"
+msgstr "Uploading '%s'…"
 
-#: ../src/frogr-controller.c:907
-#, fuzzy
-msgid "Adding picture to group…"
-msgstr "Uploading pictures…"
+#: src/frogr-controller.c:2242
+msgid "Updating credentials…"
+msgstr ""
 
-#: ../src/frogr-controller.c:972
-msgid "Operation successfully completed!"
-msgstr "Operation successfully completed!"
+#: src/frogr-controller.c:2247
+msgid "Retrieving data for authorization…"
+msgstr ""
 
-#: ../src/frogr-controller.c:1429 ../src/frogr-controller.c:1462
-msgid "Retrieving list of tags…"
+#: src/frogr-controller.c:2252
+msgid "Finishing authorization…"
 msgstr ""
 
-#: ../src/frogr-controller.c:1495 ../src/frogr-controller.c:1527
+#: src/frogr-controller.c:2257
 msgid "Retrieving list of sets…"
 msgstr ""
 
-#: ../src/frogr-controller.c:1540
-msgid "No sets found"
+#: src/frogr-controller.c:2262
+msgid "Retrieving list of groups…"
 msgstr ""
 
-#: ../src/frogr-controller.c:1562
-msgid "Retrieving list of groups…"
+#: src/frogr-controller.c:2267
+msgid "Retrieving list of tags…"
+msgstr ""
+
+#: src/frogr-controller.c:2292
+msgid "Fetching information"
 msgstr ""
 
-#: ../src/frogr-controller.c:1575
+#: src/frogr-controller.c:2398
+msgid "No sets found"
+msgstr ""
+
+#: src/frogr-controller.c:2423
 msgid "No groups found"
 msgstr ""
 
-#: ../src/frogr-controller.c:2165
-#, c-format
+#: src/frogr-controller.c:2984
+#, fuzzy, c-format
 msgid ""
-"You need to properly authorize %s before uploading any pictures to flickr.\n"
+"You need to properly authorize %s before uploading any pictures to Flickr.\n"
 "Please re-authorize it."
 msgstr ""
 "You need to properly authorise %s before uploading any pictures to flickr.\n"
 "Please re-authorise it."
 
-#. This shows a dialog notifying the problem to the user
-#: ../src/frogr-create-new-set-dialog.c:120 ../src/frogr-details-dialog.c:894
+#: src/frogr-controller.c:2994
+#, fuzzy
+msgid "You need to be connected before uploading any pictures to Flickr."
+msgstr ""
+"You need to properly authorise %s before uploading any pictures to flickr.\n"
+"Please re-authorise it."
+
+#: src/frogr-controller.c:3012
+#, fuzzy
+msgid "Uploading Pictures"
+msgstr "Loading pictures %d / %d"
+
+#: src/frogr-controller.c:3057
+msgid "Error opening project file"
+msgstr ""
+
+#: src/frogr-create-new-set-dialog.c:143 src/frogr-details-dialog.c:1001
 msgid "Missing data required"
 msgstr "Missing data required"
 
-#: ../src/frogr-create-new-set-dialog.c:304
+#: src/frogr-create-new-set-dialog.c:326
+#, fuzzy
+msgid "Title:"
+msgstr "Title:"
+
+#: src/frogr-create-new-set-dialog.c:335
 #, fuzzy
-msgid "Set's title:"
-msgstr "Set Title"
+msgid "Description:"
+msgstr "Description:"
+
+#: src/frogr-create-new-set-dialog.c:356
+msgid "Fill Pictures Details with Title and Description"
+msgstr ""
+
+#: src/frogr-create-new-set-dialog.c:381
+msgid "Create New Set"
+msgstr ""
+
+#: src/frogr-details-dialog.c:89 src/frogr-settings-dialog.c:97
+msgid "Default (as specified in Flickr)"
+msgstr ""
+
+#: src/frogr-details-dialog.c:90 src/frogr-settings-dialog.c:98
+msgid "All rights reserved"
+msgstr ""
+
+#: src/frogr-details-dialog.c:91 src/frogr-settings-dialog.c:99
+msgid "CC Attribution-NonCommercial-ShareAlike"
+msgstr ""
+
+#: src/frogr-details-dialog.c:92 src/frogr-settings-dialog.c:100
+msgid "CC Attribution-NonCommercial"
+msgstr ""
+
+#: src/frogr-details-dialog.c:93 src/frogr-settings-dialog.c:101
+msgid "CC Attribution-NonCommercial-NoDerivs"
+msgstr ""
+
+#: src/frogr-details-dialog.c:94 src/frogr-settings-dialog.c:102
+msgid "CC Attribution"
+msgstr ""
+
+#: src/frogr-details-dialog.c:95 src/frogr-settings-dialog.c:103
+msgid "CC Attribution-ShareAlike"
+msgstr ""
+
+#: src/frogr-details-dialog.c:96 src/frogr-settings-dialog.c:104
+msgid "CC Attribution-NoDerivs"
+msgstr ""
+
+#: src/frogr-details-dialog.c:172
+msgid "Open with image viewer"
+msgstr ""
+
+#: src/frogr-details-dialog.c:190
+#, fuzzy
+msgid "_Title:"
+msgstr "Title:"
 
-#: ../src/frogr-create-new-set-dialog.c:317
+#: src/frogr-details-dialog.c:200
 #, fuzzy
-msgid "Set's description:"
+msgid "_Description:"
 msgstr "Description:"
 
-#: ../src/frogr-create-new-set-dialog.c:356
-msgid "Create new Set"
+#: src/frogr-details-dialog.c:224
+msgid "Ta_gs:"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:160
+#: src/frogr-details-dialog.c:247
 #, fuzzy
 msgid "Visibility"
 msgstr "Default Visibility"
 
-#: ../src/frogr-details-dialog.c:171 ../src/frogr-settings-dialog.c:143
+#: src/frogr-details-dialog.c:257 src/frogr-settings-dialog.c:196
 #, fuzzy
 msgid "_Private"
 msgstr "Private"
 
-#: ../src/frogr-details-dialog.c:175 ../src/frogr-settings-dialog.c:147
+#: src/frogr-details-dialog.c:261 src/frogr-settings-dialog.c:199
 #, fuzzy
 msgid "P_ublic"
 msgstr "Public"
 
-#: ../src/frogr-details-dialog.c:183 ../src/frogr-settings-dialog.c:155
-#, fuzzy
-msgid "Visible to _Family"
-msgstr "Visible to family"
-
-#: ../src/frogr-details-dialog.c:187 ../src/frogr-settings-dialog.c:159
-#, fuzzy
-msgid "Visible to F_riends"
-msgstr "Visible to friends"
+#: src/frogr-details-dialog.c:270 src/frogr-settings-dialog.c:207
+msgid "_Family"
+msgstr ""
 
-#: ../src/frogr-details-dialog.c:200 ../src/frogr-settings-dialog.c:167
-msgid "_Show up in Global Search Results"
+#: src/frogr-details-dialog.c:274 src/frogr-settings-dialog.c:209
+msgid "F_riends"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:213
-msgid "Content type"
+#: src/frogr-details-dialog.c:288
+msgid "Content Type"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:222 ../src/frogr-settings-dialog.c:204
+#: src/frogr-details-dialog.c:296 src/frogr-settings-dialog.c:234
 #, fuzzy
 msgid "P_hoto"
 msgstr "Photos"
 
-#: ../src/frogr-details-dialog.c:226 ../src/frogr-settings-dialog.c:208
+#: src/frogr-details-dialog.c:300 src/frogr-settings-dialog.c:236
 msgid "Scree_nshot"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:230 ../src/frogr-settings-dialog.c:212
+#: src/frogr-details-dialog.c:304 src/frogr-settings-dialog.c:238
 msgid "Oth_er"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:244
-msgid "Safety level"
+#: src/frogr-details-dialog.c:317
+msgid "Safety Level"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:253 ../src/frogr-settings-dialog.c:245
+#: src/frogr-details-dialog.c:325 src/frogr-settings-dialog.c:260
 msgid "S_afe"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:257 ../src/frogr-settings-dialog.c:249
+#: src/frogr-details-dialog.c:329 src/frogr-settings-dialog.c:262
 msgid "_Moderate"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:261 ../src/frogr-settings-dialog.c:253
+#: src/frogr-details-dialog.c:333 src/frogr-settings-dialog.c:264
 msgid "Restr_icted"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:275
-#, fuzzy
-msgid "_Title:"
-msgstr "Title:"
+#: src/frogr-details-dialog.c:345
+msgid "License Type"
+msgstr ""
+
+#: src/frogr-details-dialog.c:367
+msgid "Other Properties"
+msgstr ""
+
+#: src/frogr-details-dialog.c:375
+msgid "_Show Up in Global Search Results"
+msgstr ""
+
+#: src/frogr-details-dialog.c:379
+msgid "Set Geo_location Information"
+msgstr ""
+
+#: src/frogr-details-dialog.c:383
+msgid "Replace 'Date Posted' with 'Date Taken'"
+msgstr ""
+
+#: src/frogr-details-dialog.c:475
+#, fuzzy, c-format
+msgid "(%d Picture)"
+msgid_plural "(%d Pictures)"
+msgstr[0] "_Add Pictures"
+msgstr[1] "_Add Pictures"
 
-#: ../src/frogr-details-dialog.c:287
+#: src/frogr-details-dialog.c:548
 #, fuzzy
-msgid "_Description:"
-msgstr "Description:"
+msgid "An error happened trying to load the picture"
+msgstr "An error happened while uploading a picture: %s."
 
-#: ../src/frogr-details-dialog.c:313
-msgid "Ta_gs:"
+#: src/frogr-details-dialog.c:1169
+msgid "_Edit"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:1075 ../src/frogr-details-dialog.c:1080
+#: src/frogr-details-dialog.c:1197
 msgid "Edit Picture Details"
 msgstr "Edit Picture Details"
 
-#. File menu
-#: ../src/frogr-main-view.c:228
-msgid "_File"
-msgstr "_File"
+#: src/frogr-file-loader.c:142
+#, fuzzy, c-format
+msgid "Loading files %d / %d"
+msgstr "Loading pictures %d / %d"
 
-#: ../src/frogr-main-view.c:234
-msgid "_Add Pictures"
-msgstr "_Add Pictures"
+#: src/frogr-file-loader.c:369
+#, c-format
+msgid ""
+"Unable to load picture %s:\n"
+"%s"
+msgstr ""
 
-#. Remove
-#: ../src/frogr-main-view.c:241 ../src/frogr-main-view.c:442
-msgid "_Remove Pictures"
-msgstr "_Remove Pictures"
+#: src/frogr-file-loader.c:400
+#, c-format
+msgid ""
+"Unable to load video %s\n"
+"Please check that you have the right codec installed"
+msgstr ""
 
-#. Accounts menu item and submenu
-#: ../src/frogr-main-view.c:251
-msgid "Accou_nts"
+#: src/frogr-file-loader.c:636
+#, c-format
+msgid ""
+"Can't load file %s:\n"
+"Size of file is bigger than the maximum allowed for this account (%s)"
 msgstr ""
 
-#. Authorize menu item
-#: ../src/frogr-main-view.c:257
-msgid "Authorize _frogr"
-msgstr "Authorise _frogr"
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
+msgid "Open"
+msgstr ""
+
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
+msgid "Open Existing Project"
+msgstr ""
 
-#: ../src/frogr-main-view.c:266
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
+msgid "Add"
+msgstr "Add"
+
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
 #, fuzzy
-msgid "_Preferences…"
-msgstr "_Preferences…"
+msgid "Add Elements"
+msgstr "Add to Sets"
+
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
+msgid "Remove"
+msgstr "Remove"
+
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
+msgid "Remove Elements"
+msgstr ""
+
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
+msgid "Upload"
+msgstr "Upload"
+
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
+#, fuzzy
+msgid "Upload All"
+msgstr "_Upload All"
+
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
+msgid "Save"
+msgstr ""
+
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
+msgid "Save Current Project"
+msgstr ""
 
-#: ../src/frogr-main-view.c:274
+#: src/frogr-main-view.c:1016
+msgid "_About"
+msgstr "_About"
+
+#: src/frogr-main-view.c:1020
 msgid "_Quit"
 msgstr "_Quit"
 
-#. Actions menu
-#: ../src/frogr-main-view.c:280
-msgid "A_ctions"
-msgstr "A_ctions"
+#: src/frogr-main-view.c:1070
+msgid "Accounts"
+msgstr ""
 
-#. Edit details
-#: ../src/frogr-main-view.c:286 ../src/frogr-main-view.c:400
-msgid "Edit _Details…"
-msgstr "Edit _Details…"
+#: src/frogr-main-view.c:1410
+#, c-format
+msgid "Taken: %s"
+msgstr ""
 
-#. Add Tags
-#: ../src/frogr-main-view.c:293 ../src/frogr-main-view.c:407
-msgid "Add _Tags…"
-msgstr "Add _Tags…"
+#: src/frogr-main-view.c:1415
+#, c-format
+msgid "File size: %s"
+msgstr ""
 
-#. Add to group
-#: ../src/frogr-main-view.c:300 ../src/frogr-main-view.c:414
+#: src/frogr-main-view.c:1540
 #, fuzzy
-msgid "Add to _Group…"
-msgstr "Add to Al_bum…"
+msgid "Select File"
+msgstr "Select a Picture"
 
-#. Add to set
-#: ../src/frogr-main-view.c:307 ../src/frogr-main-view.c:421
-#, fuzzy
-msgid "Add to _Set"
-msgstr "Add to Sets"
+#: src/frogr-main-view.c:1544 src/frogr-main-view.c:1671
+msgid "_Open"
+msgstr ""
 
-#: ../src/frogr-main-view.c:314 ../src/frogr-main-view.c:427
-msgid "_Create New Set…"
+#: src/frogr-main-view.c:1553
+msgid "Frogr Project Files"
 msgstr ""
 
-#: ../src/frogr-main-view.c:321 ../src/frogr-main-view.c:433
+#: src/frogr-main-view.c:1615
 #, fuzzy
-msgid "Add to _Existing Set…"
-msgstr "Add to Set…"
-
-#: ../src/frogr-main-view.c:330
-msgid "_Upload All"
-msgstr "_Upload All"
+msgid "Select Destination"
+msgstr "Description:"
 
-#. Help menu
-#: ../src/frogr-main-view.c:338
-msgid "_Help"
-msgstr "_Help"
+#: src/frogr-main-view.c:1619
+msgid "_Save"
+msgstr ""
 
-#: ../src/frogr-main-view.c:344
-msgid "_About"
-msgstr "_About"
+#: src/frogr-main-view.c:1622
+msgid "Untitled Project.frogr"
+msgstr ""
 
-#: ../src/frogr-main-view.c:897
+#: src/frogr-main-view.c:1667
 msgid "Select a Picture"
 msgstr "Select a Picture"
 
-#: ../src/frogr-main-view.c:930
-msgid "You need to select some pictures first"
-msgstr "You need to select some pictures first"
+#: src/frogr-main-view.c:1694
+msgid "All Files"
+msgstr ""
+
+#: src/frogr-main-view.c:1697
+msgid "Image Files"
+msgstr ""
 
-#: ../src/frogr-main-view.c:1147
-msgid "Not connected to flickr"
+#: src/frogr-main-view.c:1701
+msgid "Video Files"
 msgstr ""
 
-#: ../src/frogr-main-view.c:1176
-msgid "remaining for the current month"
+#: src/frogr-main-view.c:1723
+msgid "You don't have any picture added yet"
 msgstr ""
 
-#: ../src/frogr-main-view.c:1184
-msgid "Connected as"
+#: src/frogr-main-view.c:1736
+msgid "You need to select some pictures first"
+msgstr "You need to select some pictures first"
+
+#: src/frogr-main-view.c:2108
+msgid "Not connected to Flickr"
 msgstr ""
 
-#: ../src/frogr-main-view.c:1185
+#: src/frogr-main-view.c:2118
+#, c-format
+msgid "Connected as %s%s"
+msgstr ""
+
+#: src/frogr-main-view.c:2119
 msgid " (PRO account)"
 msgstr ""
 
-#: ../src/frogr-picture-loader.c:91
+#: src/frogr-main-view.c:2143
 #, c-format
-msgid "Loading pictures %d / %d"
-msgstr "Loading pictures %d / %d"
+msgid " - %s / %s remaining"
+msgstr ""
 
-#. Update progress
-#: ../src/frogr-picture-uploader.c:85
+#: src/frogr-main-view.c:2169
 #, c-format
-msgid "Uploading '%s'…"
-msgstr "Uploading '%s'…"
+msgid " - %d file to upload (%s)"
+msgid_plural " - %d files to upload (%s)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../src/frogr-settings-dialog.c:132
+#: src/frogr-settings-dialog.c:185
 msgid "Default Visibility"
 msgstr "Default Visibility"
 
-#: ../src/frogr-settings-dialog.c:194
+#: src/frogr-settings-dialog.c:224
 msgid "Default Content Type"
 msgstr ""
 
-#: ../src/frogr-settings-dialog.c:235
+#: src/frogr-settings-dialog.c:250
 msgid "Default Safety Level"
 msgstr ""
 
-#: ../src/frogr-settings-dialog.c:276
-msgid "Default Actions"
+#: src/frogr-settings-dialog.c:276
+#, fuzzy
+msgid "Default License"
 msgstr "Default Actions"
 
-#: ../src/frogr-settings-dialog.c:284
-#, fuzzy
-msgid "Open _Browser after Uploading Pictures"
-msgstr "Open browser after uploading pictures"
+#: src/frogr-settings-dialog.c:302
+msgid "Other Defaults"
+msgstr ""
 
-#: ../src/frogr-settings-dialog.c:293
+#: src/frogr-settings-dialog.c:312
+msgid "_Show Pictures in Global Search Results"
+msgstr ""
+
+#: src/frogr-settings-dialog.c:315
+msgid "Set Geo_location Information for Pictures"
+msgstr ""
+
+#: src/frogr-settings-dialog.c:318
+msgid "Replace 'Date Posted' with 'Date Taken' for Pictures"
+msgstr ""
+
+#: src/frogr-settings-dialog.c:324
 #, fuzzy
 msgid "_General"
 msgstr "General"
 
-#. Proxy settings
-#: ../src/frogr-settings-dialog.c:312
-msgid "_Use HTTP Proxy"
+#: src/frogr-settings-dialog.c:344
+msgid "Proxy Settings"
+msgstr ""
+
+#: src/frogr-settings-dialog.c:353
+msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: ../src/frogr-settings-dialog.c:323
+#: src/frogr-settings-dialog.c:363
 msgid "_Host:"
 msgstr ""
 
-#. Proxy port
-#: ../src/frogr-settings-dialog.c:341
+#: src/frogr-settings-dialog.c:376
 msgid "_Port:"
 msgstr ""
 
-#. Proxy username
-#: ../src/frogr-settings-dialog.c:359
+#: src/frogr-settings-dialog.c:389
 msgid "U_sername:"
 msgstr ""
 
-#. Proxy password
-#: ../src/frogr-settings-dialog.c:377
+#: src/frogr-settings-dialog.c:402
 msgid "Pass_word:"
 msgstr ""
 
-#: ../src/frogr-settings-dialog.c:404
+#: src/frogr-settings-dialog.c:426
 msgid "Connec_tion"
 msgstr ""
 
-#: ../src/frogr-settings-dialog.c:832
+#: src/frogr-settings-dialog.c:444
+msgid "Other options"
+msgstr ""
+
+#: src/frogr-settings-dialog.c:454
+msgid "Ena_ble Tags Auto-Completion"
+msgstr ""
+
+#: src/frogr-settings-dialog.c:457
+msgid "_Import Tags from Pictures Metadata"
+msgstr ""
+
+#: src/frogr-settings-dialog.c:461
+msgid "Use _Dark GTK Theme"
+msgstr ""
+
+#: src/frogr-settings-dialog.c:465
+msgid "_Keep File Extensions in Titles when Loading"
+msgstr ""
+
+#: src/frogr-settings-dialog.c:471
+msgid "_Misc"
+msgstr ""
+
+#: src/frogr-settings-dialog.c:972
 msgid "Preferences"
 msgstr "Preferences"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:1
-msgid "Add"
-msgstr "Add"
+#~ msgid ""
+#~ "Press the button to start using %s once you've authorized it in your "
+#~ "flickr account."
+#~ msgstr ""
+#~ "Press the button to start using %s once you've authorised it in your "
+#~ "flickr account."
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:2
-msgid "Remove"
-msgstr "Remove"
+#~ msgid "Authorization successfully completed!"
+#~ msgstr "Authorisation successfully completed!"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:3
-msgid "Upload"
-msgstr "Upload"
+#, fuzzy
+#~ msgid "Adding picture to photoset…"
+#~ msgstr "Uploading pictures…"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:4
-msgid "frogr"
-msgstr "frogr"
+#, fuzzy
+#~ msgid "Adding picture to group…"
+#~ msgstr "Uploading pictures…"
+
+#~ msgid "Operation successfully completed!"
+#~ msgstr "Operation successfully completed!"
+
+#, fuzzy
+#~ msgid "Set's title:"
+#~ msgstr "Set Title"
+
+#, fuzzy
+#~ msgid "Visible to _Family"
+#~ msgstr "Visible to family"
+
+#, fuzzy
+#~ msgid "Visible to F_riends"
+#~ msgstr "Visible to friends"
+
+#~ msgid "_File"
+#~ msgstr "_File"
+
+#~ msgid "_Remove Pictures"
+#~ msgstr "_Remove Pictures"
+
+#, fuzzy
+#~ msgid "_Preferences…"
+#~ msgstr "_Preferences…"
+
+#~ msgid "A_ctions"
+#~ msgstr "A_ctions"
+
+#~ msgid "Edit _Details…"
+#~ msgstr "Edit _Details…"
+
+#~ msgid "Add _Tags…"
+#~ msgstr "Add _Tags…"
+
+#, fuzzy
+#~ msgid "Add to _Group…"
+#~ msgstr "Add to Al_bum…"
+
+#, fuzzy
+#~ msgid "Add to _Set"
+#~ msgstr "Add to Sets"
+
+#, fuzzy
+#~ msgid "Add to _Existing Set…"
+#~ msgstr "Add to Set…"
+
+#~ msgid "_Help"
+#~ msgstr "_Help"
+
+#, fuzzy
+#~ msgid "Open _Browser after Uploading Pictures"
+#~ msgstr "Open browser after uploading pictures"
 
 #, fuzzy
 #~ msgid "_Remove"
diff --git a/po/es.po b/po/es.po
index 9eb7b04..73df2bf 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,9 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: frogr.master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=frogr&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-01-22 18:06+0000\n"
+"Report-Msgid-Bugs-To: msanchez gnome org\n"
+"POT-Creation-Date: 2016-08-12 13:09+0100\n"
 "PO-Revision-Date: 2016-02-01 15:47+0100\n"
 "Last-Translator: Daniel Mustieles <daniel mustieles gmail com>\n"
 "Language-Team: Español; Castellano <gnome-es-list gnome org>\n"
@@ -22,7 +21,16 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Gtranslator 2.91.6\n"
 
-#: ../data/frogr.appdata.xml.in.h:1
+#: data/frogr.appdata.xml.in:5 data/frogr.desktop.in.in:5
+#: data/frogr.desktop.in.in:14
+msgid "frogr"
+msgstr "frogr"
+
+#: data/frogr.appdata.xml.in:6 data/frogr.desktop.in.in:6
+msgid "frogr: a Flickr Remote Organizer for GNOME"
+msgstr "frogr: un organizador remoto de Flickr para GNOME"
+
+#: data/frogr.appdata.xml.in:8
 msgid ""
 "frogr is a small application for the GNOME desktop that allows users to "
 "manage their accounts in the Flickr image hosting website."
@@ -31,7 +39,7 @@ msgstr ""
 "usuarios gestionar sus cuentas en el sitio web de alojamiento de imágenes "
 "Flickr."
 
-#: ../data/frogr.appdata.xml.in.h:2
+#: data/frogr.appdata.xml.in:13
 msgid ""
 "It supports all the basic Flickr features, including uploading pictures, "
 "adding descriptions, setting tags and managing sets and groups pools."
@@ -39,32 +47,27 @@ msgstr ""
 "Soporta todas las características básicas de Flickr, incluyendo subir "
 "imágenes, añadir descripciones, establecer etiquetas y gestionar grupos."
 
-#: ../data/frogr.appdata.xml.in.h:3
-#| msgid "Scree_nshot"
+#: data/frogr.appdata.xml.in:24
 msgid "Screenshot of frogr"
 msgstr "Captura de pantalla de frogr"
 
-#: ../data/frogr.desktop.in.in.h:1
-msgid "frogr"
-msgstr "frogr"
-
-#: ../data/frogr.desktop.in.in.h:2
-msgid "frogr: a Flickr Remote Organizer for GNOME"
-msgstr "frogr: un organizador remoto de Flickr para GNOME"
+#: data/frogr.appdata.xml.in:29
+msgid "Mario Sanchez Prada"
+msgstr ""
 
-#: ../data/frogr.desktop.in.in.h:3
+#: data/frogr.desktop.in.in:7
 msgid "Upload and organize photos in Flickr accounts"
 msgstr "Subir y organizar fotos en cuentas de Flickr"
 
-#: ../data/frogr.desktop.in.in.h:4
+#: data/frogr.desktop.in.in:8
 msgid "Flickr;Image;Picture;Photo;Video;Uploader;"
 msgstr "Flickr;Imagen;Foto;Vídeo;Organizador;"
 
-#: ../src/frogr-about-dialog.c:43
+#: src/frogr-about-dialog.c:43
 msgid "A Flickr Remote Organizer for GNOME\n"
 msgstr "Un organizador remoto de Flickr para GNOME\n"
 
-#: ../src/frogr-about-dialog.c:72
+#: src/frogr-about-dialog.c:72
 msgid "translator-credits"
 msgstr ""
 "Daniel Mustieles <daniel mustieles gmail com>, 2011 - 2016\n"
@@ -72,79 +75,77 @@ msgstr ""
 "Mario Sanchez Prada <msanchez gnome org>, 2010\n"
 "Alejandro Pinheiro <apinheiro igalia com>, 2009"
 
-#: ../src/frogr-add-tags-dialog.c:191 ../src/frogr-add-to-group-dialog.c:528
-#: ../src/frogr-add-to-set-dialog.c:529 ../src/frogr-auth-dialog.c:153
-#: ../src/frogr-create-new-set-dialog.c:310 ../src/frogr-details-dialog.c:1168
-#: ../src/frogr-main-view.c:1543 ../src/frogr-main-view.c:1618
-#: ../src/frogr-main-view.c:1670 ../src/frogr-settings-dialog.c:930
+#: src/frogr-add-tags-dialog.c:191 src/frogr-add-to-group-dialog.c:528
+#: src/frogr-add-to-set-dialog.c:529 src/frogr-auth-dialog.c:153
+#: src/frogr-create-new-set-dialog.c:310 src/frogr-details-dialog.c:1168
+#: src/frogr-main-view.c:1543 src/frogr-main-view.c:1618
+#: src/frogr-main-view.c:1670 src/frogr-settings-dialog.c:930
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../src/frogr-add-tags-dialog.c:193 ../src/frogr-add-to-group-dialog.c:530
-#: ../src/frogr-add-to-set-dialog.c:531
-#: ../src/frogr-create-new-set-dialog.c:312
+#: src/frogr-add-tags-dialog.c:193 src/frogr-add-to-group-dialog.c:530
+#: src/frogr-add-to-set-dialog.c:531 src/frogr-create-new-set-dialog.c:312
 msgid "_Add"
 msgstr "_Añadir"
 
-#: ../src/frogr-add-tags-dialog.c:202
+#: src/frogr-add-tags-dialog.c:202
 msgid "Enter a spaces separated list of tags:"
 msgstr "Introducir una lista de etiquetas separada por espacios:"
 
-#: ../src/frogr-add-tags-dialog.c:228
+#: src/frogr-add-tags-dialog.c:228
 msgid "Add Tags"
 msgstr "Añadir etiquetas"
 
-#: ../src/frogr-add-to-group-dialog.c:147
+#: src/frogr-add-to-group-dialog.c:147
 msgid "Name"
 msgstr "Nombre"
 
-#: ../src/frogr-add-to-group-dialog.c:162 ../src/frogr-add-to-set-dialog.c:163
+#: src/frogr-add-to-group-dialog.c:162 src/frogr-add-to-set-dialog.c:163
 msgid "Elements"
 msgstr "Elementos"
 
-#: ../src/frogr-add-to-group-dialog.c:581
+#: src/frogr-add-to-group-dialog.c:581
 msgid "Add to Groups"
 msgstr "Añadir a grupos"
 
-#: ../src/frogr-add-to-set-dialog.c:148
+#: src/frogr-add-to-set-dialog.c:148
 msgid "Title"
 msgstr "Título"
 
-#: ../src/frogr-add-to-set-dialog.c:582
+#: src/frogr-add-to-set-dialog.c:582
 msgid "Add to Sets"
 msgstr "Añadir a álbumes"
 
-#: ../src/frogr-auth-dialog.c:59
+#: src/frogr-auth-dialog.c:59
 #, c-format
 msgid ""
 "Please press the button to authorize %s and then come back to complete the "
 "process."
 msgstr "Pulse el botón para autorizar a %s y vuelva para completar el proceso."
 
-#: ../src/frogr-auth-dialog.c:63 ../src/frogr-auth-dialog.c:149
-#: ../src/frogr-controller.c:2286
+#: src/frogr-auth-dialog.c:63 src/frogr-auth-dialog.c:149
+#: src/frogr-controller.c:2286
 #, c-format
 msgid "Authorize %s"
 msgstr "Autorizar %s"
 
-#: ../src/frogr-auth-dialog.c:155 ../src/frogr-settings-dialog.c:932
+#: src/frogr-auth-dialog.c:155 src/frogr-settings-dialog.c:932
 msgid "_Close"
 msgstr "_Cerrar"
 
-#. Description label
-#: ../src/frogr-auth-dialog.c:167
+#: src/frogr-auth-dialog.c:167
 msgid "Enter verification code:"
 msgstr "Introduzca el código de verificación:"
 
-#: ../src/frogr-auth-dialog.c:221
+#: src/frogr-auth-dialog.c:221
 msgid "Invalid verification code"
 msgstr "Código de verificación no válido"
 
-#: ../src/frogr-controller.c:581
+#: src/frogr-controller.c:581
 msgid "Process cancelled"
 msgstr "Proceso cancelado"
 
-#: ../src/frogr-controller.c:586
+#: src/frogr-controller.c:586
 msgid ""
 "Connection error:\n"
 "Network not available"
@@ -152,7 +153,7 @@ msgstr ""
 "Error de conexión:\n"
 "La red no está disponible"
 
-#: ../src/frogr-controller.c:590
+#: src/frogr-controller.c:590
 msgid ""
 "Connection error:\n"
 "Bad request"
@@ -160,7 +161,7 @@ msgstr ""
 "Error de conexión:\n"
 "Petición no válida"
 
-#: ../src/frogr-controller.c:594
+#: src/frogr-controller.c:594
 msgid ""
 "Connection error:\n"
 "Server-side error"
@@ -168,7 +169,7 @@ msgstr ""
 "Error de conexión:\n"
 "Ocurrió un problema en el servidor"
 
-#: ../src/frogr-controller.c:598
+#: src/frogr-controller.c:598
 msgid ""
 "Error uploading:\n"
 "File invalid"
@@ -176,7 +177,7 @@ msgstr ""
 "Error al subir:\n"
 "Archivo no válido"
 
-#: ../src/frogr-controller.c:602
+#: src/frogr-controller.c:602
 msgid ""
 "Error uploading picture:\n"
 "Quota exceeded"
@@ -184,14 +185,14 @@ msgstr ""
 "Error al subir la imagen:\n"
 "Límite de cuota excedido"
 
-#: ../src/frogr-controller.c:607
+#: src/frogr-controller.c:607
 #, c-format
 msgid "Quota exceeded (limit: %d video per month)"
 msgid_plural "Quota exceeded (limit: %d videos per month)"
 msgstr[0] "Se ha superado la cuota (límite: %d vídeo al mes)"
 msgstr[1] "Se ha superado la cuota (límite: %d vídeos al mes)"
 
-#: ../src/frogr-controller.c:611
+#: src/frogr-controller.c:611
 msgid ""
 "Error uploading video:\n"
 "You can't upload more videos with this account"
@@ -199,7 +200,7 @@ msgstr ""
 "Error al subir el vídeo:\n"
 "No puede subir más vídeos con esta cuenta"
 
-#: ../src/frogr-controller.c:617
+#: src/frogr-controller.c:617
 msgid ""
 "Error:\n"
 "Photo not found"
@@ -207,7 +208,7 @@ msgstr ""
 "Error:\n"
 "No se encontró la foto"
 
-#: ../src/frogr-controller.c:621
+#: src/frogr-controller.c:621
 msgid ""
 "Error:\n"
 "Photo already in photoset"
@@ -215,7 +216,7 @@ msgstr ""
 "Error:\n"
 "La foto ya está incluida en el álbum de fotos"
 
-#: ../src/frogr-controller.c:625
+#: src/frogr-controller.c:625
 msgid ""
 "Error:\n"
 "Photo already in group"
@@ -223,7 +224,7 @@ msgstr ""
 "Error:\n"
 "La foto ya está incluida en el grupo"
 
-#: ../src/frogr-controller.c:629
+#: src/frogr-controller.c:629
 msgid ""
 "Error:\n"
 "Photo already in the maximum number of groups possible"
@@ -231,7 +232,7 @@ msgstr ""
 "Error:\n"
 "La foto ya está en el máximo número posible de grupos"
 
-#: ../src/frogr-controller.c:633
+#: src/frogr-controller.c:633
 msgid ""
 "Error:\n"
 "Group limit already reached"
@@ -239,7 +240,7 @@ msgstr ""
 "Error:\n"
 "Ya se alcanzó el límite de grupos"
 
-#: ../src/frogr-controller.c:637
+#: src/frogr-controller.c:637
 msgid ""
 "Error:\n"
 "Photo added to group's queue"
@@ -247,7 +248,7 @@ msgstr ""
 "Error:\n"
 "La foto se añadió a la cola del grupo"
 
-#: ../src/frogr-controller.c:641
+#: src/frogr-controller.c:641
 msgid ""
 "Error:\n"
 "Photo already added to group's queue"
@@ -255,7 +256,7 @@ msgstr ""
 "Error:\n"
 "La foto ya estaba añadida a la cola del grupo"
 
-#: ../src/frogr-controller.c:645
+#: src/frogr-controller.c:645
 msgid ""
 "Error:\n"
 "Content not allowed for this group"
@@ -263,8 +264,7 @@ msgstr ""
 "Error:\n"
 "El grupo no permite este contenido"
 
-#: ../src/frogr-controller.c:649
-#, c-format
+#: src/frogr-controller.c:649
 msgid ""
 "Authorization failed.\n"
 "Please try again"
@@ -272,7 +272,7 @@ msgstr ""
 "Falló la autorización.\n"
 "Inténtelo de nuevo"
 
-#: ../src/frogr-controller.c:655
+#: src/frogr-controller.c:655
 #, c-format
 msgid ""
 "Error\n"
@@ -283,8 +283,7 @@ msgstr ""
 "%s no está adecuadamente autorizado para subir imágenes a Flickr.\n"
 "Autorícelo de nuevo."
 
-#: ../src/frogr-controller.c:660
-#, c-format
+#: src/frogr-controller.c:660
 msgid ""
 "Unable to authenticate in Flickr\n"
 "Please try again."
@@ -292,7 +291,7 @@ msgstr ""
 "No se pudo autenticar en Flickr\n"
 "Inténtelo de nuevo."
 
-#: ../src/frogr-controller.c:664
+#: src/frogr-controller.c:664
 #, c-format
 msgid ""
 "You have not properly authorized %s yet.\n"
@@ -301,8 +300,7 @@ msgstr ""
 "Todavía no ha autorizado a %s.\n"
 "Inténtelo de nuevo."
 
-#: ../src/frogr-controller.c:669
-#, c-format
+#: src/frogr-controller.c:669
 msgid ""
 "Invalid verification code.\n"
 "Please try again."
@@ -310,8 +308,7 @@ msgstr ""
 "Código de verificación no válido.\n"
 "Inténtelo de nuevo."
 
-#: ../src/frogr-controller.c:673
-#, c-format
+#: src/frogr-controller.c:673
 msgid ""
 "Error:\n"
 "Service not available"
@@ -319,64 +316,62 @@ msgstr ""
 "Error:\n"
 "El servicio no está disponible"
 
-#. General error: just dump the raw error description
-#: ../src/frogr-controller.c:678
+#: src/frogr-controller.c:678
 #, c-format
 msgid "An error happened: %s."
 msgstr "Ocurrió un error: %s."
 
-#: ../src/frogr-controller.c:883
+#: src/frogr-controller.c:883
 msgid "Authorization failed (timed out)"
 msgstr "Falló la autorización (expiró el tiempo)"
 
-#: ../src/frogr-controller.c:931
+#: src/frogr-controller.c:931
 #, c-format
 msgid "Retrying Upload (attempt %d/%d)…"
 msgstr "Reintentando la subida (intento %d/%d)…"
 
-#: ../src/frogr-controller.c:936
+#: src/frogr-controller.c:936
 #, c-format
 msgid "Uploading '%s'…"
 msgstr "Subiendo «%s»…"
 
-#: ../src/frogr-controller.c:2242
+#: src/frogr-controller.c:2242
 msgid "Updating credentials…"
 msgstr "Actualizando credenciales…"
 
-#: ../src/frogr-controller.c:2247
+#: src/frogr-controller.c:2247
 msgid "Retrieving data for authorization…"
 msgstr "Obteniendo datos para la autorización…"
 
-#: ../src/frogr-controller.c:2252
+#: src/frogr-controller.c:2252
 msgid "Finishing authorization…"
 msgstr "Terminando autorización…"
 
-#: ../src/frogr-controller.c:2257
+#: src/frogr-controller.c:2257
 msgid "Retrieving list of sets…"
 msgstr "Obteniendo lista de álbumes…"
 
-#: ../src/frogr-controller.c:2262
+#: src/frogr-controller.c:2262
 msgid "Retrieving list of groups…"
 msgstr "Obteniendo lista de grupos…"
 
-#: ../src/frogr-controller.c:2267
+#: src/frogr-controller.c:2267
 msgid "Retrieving list of tags…"
 msgstr "Obteniendo lista de etiquetas…"
 
-#: ../src/frogr-controller.c:2292
-#, c-format
+#: src/frogr-controller.c:2292
 msgid "Fetching information"
 msgstr "Recuperando información"
 
-#: ../src/frogr-controller.c:2398
+#: src/frogr-controller.c:2398
 msgid "No sets found"
 msgstr "No se encontró ningún álbum"
 
-#: ../src/frogr-controller.c:2423
+#: src/frogr-controller.c:2423
 msgid "No groups found"
 msgstr "No se encontró ningún grupo"
 
-#: ../src/frogr-controller.c:2984
+#: src/frogr-controller.c:2984
 #, c-format
 msgid ""
 "You need to properly authorize %s before uploading any pictures to Flickr.\n"
@@ -385,188 +380,183 @@ msgstr ""
 "Debe autorizar a %s debidamente antes de poder subir imágenes a Flickr.\n"
 "Vuelva a autorizarlo."
 
-#: ../src/frogr-controller.c:2994
-#, c-format
+#: src/frogr-controller.c:2994
 msgid "You need to be connected before uploading any pictures to Flickr."
 msgstr "Debe estar conectado antes de subir imágenes a Flickr."
 
-#: ../src/frogr-controller.c:3012
+#: src/frogr-controller.c:3012
 msgid "Uploading Pictures"
 msgstr "Subiendo imágenes"
 
-#: ../src/frogr-controller.c:3057
-#, c-format
+#: src/frogr-controller.c:3057
 msgid "Error opening project file"
 msgstr "Error al abrir el archivo del proyecto"
 
-#. This shows a dialog notifying the problem to the user
-#: ../src/frogr-create-new-set-dialog.c:143 ../src/frogr-details-dialog.c:1001
+#: src/frogr-create-new-set-dialog.c:143 src/frogr-details-dialog.c:1001
 msgid "Missing data required"
 msgstr "Falta información necesaria"
 
-#: ../src/frogr-create-new-set-dialog.c:326
+#: src/frogr-create-new-set-dialog.c:326
 msgid "Title:"
 msgstr "Título:"
 
-#: ../src/frogr-create-new-set-dialog.c:335
+#: src/frogr-create-new-set-dialog.c:335
 msgid "Description:"
 msgstr "Descripción:"
 
-#: ../src/frogr-create-new-set-dialog.c:356
+#: src/frogr-create-new-set-dialog.c:356
 msgid "Fill Pictures Details with Title and Description"
 msgstr "Rellenar los detalles de la imagen con el título y la descripción"
 
-#: ../src/frogr-create-new-set-dialog.c:381
+#: src/frogr-create-new-set-dialog.c:381
 msgid "Create New Set"
 msgstr "Crear un álbum nuevo"
 
-#: ../src/frogr-details-dialog.c:89 ../src/frogr-settings-dialog.c:97
+#: src/frogr-details-dialog.c:89 src/frogr-settings-dialog.c:97
 msgid "Default (as specified in Flickr)"
 msgstr "Predeterminada (la especificada en Flickr)"
 
-#: ../src/frogr-details-dialog.c:90 ../src/frogr-settings-dialog.c:98
+#: src/frogr-details-dialog.c:90 src/frogr-settings-dialog.c:98
 msgid "All rights reserved"
 msgstr "Todos los derechos reservados"
 
-#: ../src/frogr-details-dialog.c:91 ../src/frogr-settings-dialog.c:99
+#: src/frogr-details-dialog.c:91 src/frogr-settings-dialog.c:99
 msgid "CC Attribution-NonCommercial-ShareAlike"
 msgstr "CC de Atribución-Compartir Igual-No comercial"
 
-#: ../src/frogr-details-dialog.c:92 ../src/frogr-settings-dialog.c:100
+#: src/frogr-details-dialog.c:92 src/frogr-settings-dialog.c:100
 msgid "CC Attribution-NonCommercial"
 msgstr "CC de Atribución-No comercial"
 
-#: ../src/frogr-details-dialog.c:93 ../src/frogr-settings-dialog.c:101
+#: src/frogr-details-dialog.c:93 src/frogr-settings-dialog.c:101
 msgid "CC Attribution-NonCommercial-NoDerivs"
 msgstr "CC de Atribución-No comercial-No derivada"
 
-#: ../src/frogr-details-dialog.c:94 ../src/frogr-settings-dialog.c:102
+#: src/frogr-details-dialog.c:94 src/frogr-settings-dialog.c:102
 msgid "CC Attribution"
 msgstr "CC de Atribución"
 
-#: ../src/frogr-details-dialog.c:95 ../src/frogr-settings-dialog.c:103
+#: src/frogr-details-dialog.c:95 src/frogr-settings-dialog.c:103
 msgid "CC Attribution-ShareAlike"
 msgstr "CC de Atribución-Compartir Igual"
 
-#: ../src/frogr-details-dialog.c:96 ../src/frogr-settings-dialog.c:104
+#: src/frogr-details-dialog.c:96 src/frogr-settings-dialog.c:104
 msgid "CC Attribution-NoDerivs"
 msgstr "CC de Atribución-No derivada"
 
-#: ../src/frogr-details-dialog.c:172
+#: src/frogr-details-dialog.c:172
 msgid "Open with image viewer"
 msgstr "Abrir con el visor de imágenes"
 
-#: ../src/frogr-details-dialog.c:190
+#: src/frogr-details-dialog.c:190
 msgid "_Title:"
 msgstr "_Título:"
 
-#: ../src/frogr-details-dialog.c:200
+#: src/frogr-details-dialog.c:200
 msgid "_Description:"
 msgstr "_Descripción:"
 
-#: ../src/frogr-details-dialog.c:224
+#: src/frogr-details-dialog.c:224
 msgid "Ta_gs:"
 msgstr "_Etiquetas:"
 
-#: ../src/frogr-details-dialog.c:247
+#: src/frogr-details-dialog.c:247
 msgid "Visibility"
 msgstr "Visibilidad"
 
-#: ../src/frogr-details-dialog.c:257 ../src/frogr-settings-dialog.c:196
+#: src/frogr-details-dialog.c:257 src/frogr-settings-dialog.c:196
 msgid "_Private"
 msgstr "_Privado"
 
-#: ../src/frogr-details-dialog.c:261 ../src/frogr-settings-dialog.c:199
+#: src/frogr-details-dialog.c:261 src/frogr-settings-dialog.c:199
 msgid "P_ublic"
 msgstr "Pú_blico"
 
-#: ../src/frogr-details-dialog.c:270 ../src/frogr-settings-dialog.c:207
+#: src/frogr-details-dialog.c:270 src/frogr-settings-dialog.c:207
 msgid "_Family"
 msgstr "_Familia"
 
-#: ../src/frogr-details-dialog.c:274 ../src/frogr-settings-dialog.c:209
+#: src/frogr-details-dialog.c:274 src/frogr-settings-dialog.c:209
 msgid "F_riends"
 msgstr "A_migos"
 
-#: ../src/frogr-details-dialog.c:288
+#: src/frogr-details-dialog.c:288
 msgid "Content Type"
 msgstr "Tipo de contenido"
 
-#: ../src/frogr-details-dialog.c:296 ../src/frogr-settings-dialog.c:234
+#: src/frogr-details-dialog.c:296 src/frogr-settings-dialog.c:234
 msgid "P_hoto"
 msgstr "_Foto"
 
-#: ../src/frogr-details-dialog.c:300 ../src/frogr-settings-dialog.c:236
+#: src/frogr-details-dialog.c:300 src/frogr-settings-dialog.c:236
 msgid "Scree_nshot"
 msgstr "Captura de pa_ntalla"
 
-#: ../src/frogr-details-dialog.c:304 ../src/frogr-settings-dialog.c:238
+#: src/frogr-details-dialog.c:304 src/frogr-settings-dialog.c:238
 msgid "Oth_er"
 msgstr "_Otro"
 
-#: ../src/frogr-details-dialog.c:317
+#: src/frogr-details-dialog.c:317
 msgid "Safety Level"
 msgstr "Nivel de seguridad"
 
-#: ../src/frogr-details-dialog.c:325 ../src/frogr-settings-dialog.c:260
+#: src/frogr-details-dialog.c:325 src/frogr-settings-dialog.c:260
 msgid "S_afe"
 msgstr "_Seguro"
 
-#: ../src/frogr-details-dialog.c:329 ../src/frogr-settings-dialog.c:262
+#: src/frogr-details-dialog.c:329 src/frogr-settings-dialog.c:262
 msgid "_Moderate"
 msgstr "_Moderado"
 
-#: ../src/frogr-details-dialog.c:333 ../src/frogr-settings-dialog.c:264
+#: src/frogr-details-dialog.c:333 src/frogr-settings-dialog.c:264
 msgid "Restr_icted"
 msgstr "_Restringido"
 
-#: ../src/frogr-details-dialog.c:345
+#: src/frogr-details-dialog.c:345
 msgid "License Type"
 msgstr "Tipo de licencia"
 
-#: ../src/frogr-details-dialog.c:367
+#: src/frogr-details-dialog.c:367
 msgid "Other Properties"
 msgstr "Otras propiedades"
 
-#: ../src/frogr-details-dialog.c:375
+#: src/frogr-details-dialog.c:375
 msgid "_Show Up in Global Search Results"
 msgstr "M_ostrar en los resultados de búsqueda globales"
 
-#: ../src/frogr-details-dialog.c:379
+#: src/frogr-details-dialog.c:379
 msgid "Set Geo_location Information"
 msgstr "Establecer información de geo_localización"
 
-#: ../src/frogr-details-dialog.c:383
+#: src/frogr-details-dialog.c:383
 msgid "Replace 'Date Posted' with 'Date Taken'"
 msgstr "Reemplazar la «Fecha de publicación» con la «Fecha de captura»"
 
-#. Visually indicate how many pictures are being edited
-#: ../src/frogr-details-dialog.c:475
+#: src/frogr-details-dialog.c:475
 #, c-format
 msgid "(%d Picture)"
 msgid_plural "(%d Pictures)"
 msgstr[0] "(%d imagen)"
 msgstr[1] "(%d imágenes)"
 
-#: ../src/frogr-details-dialog.c:548
+#: src/frogr-details-dialog.c:548
 msgid "An error happened trying to load the picture"
 msgstr "Ocurrió un error al cargar la imagen"
 
-#: ../src/frogr-details-dialog.c:1169
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:8
+#: src/frogr-details-dialog.c:1169
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../src/frogr-details-dialog.c:1197
+#: src/frogr-details-dialog.c:1197
 msgid "Edit Picture Details"
 msgstr "Editar detalles de la imagen"
 
-#: ../src/frogr-file-loader.c:142
+#: src/frogr-file-loader.c:142
 #, c-format
 msgid "Loading files %d / %d"
 msgstr "Cargando archivos %d / %d"
 
-#: ../src/frogr-file-loader.c:369
+#: src/frogr-file-loader.c:369
 #, c-format
 msgid ""
 "Unable to load picture %s:\n"
@@ -575,7 +565,7 @@ msgstr ""
 "No se pudo cargar la imagen %s:\n"
 "%s"
 
-#: ../src/frogr-file-loader.c:400
+#: src/frogr-file-loader.c:400
 #, c-format
 msgid ""
 "Unable to load video %s\n"
@@ -584,10 +574,7 @@ msgstr ""
 "No se pudo cargar el vídeo %s\n"
 "Compruebe que tiene instalado el «códec» correcto"
 
-#. First %s is the title of the picture (filename of the file by
-#. default). Second %s is the max allowed size for a picture to be
-#. uploaded to flickr (different for free and PRO accounts).
-#: ../src/frogr-file-loader.c:636
+#: src/frogr-file-loader.c:636
 #, c-format
 msgid ""
 "Can't load file %s:\n"
@@ -597,372 +584,306 @@ msgstr ""
 "El tamaño del archivo es superior al tamaño máximo permitido para esta "
 "cuenta (%s)"
 
-#. First create the left side buttons
-#: ../src/frogr-main-view.c:630 ../src/frogr-main-view.c:726
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
 msgid "Open"
 msgstr "Abrir"
 
-#: ../src/frogr-main-view.c:630 ../src/frogr-main-view.c:726
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
 msgid "Open Existing Project"
 msgstr "Abrir proyecto existente"
 
-#: ../src/frogr-main-view.c:631 ../src/frogr-main-view.c:729
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
 msgid "Add"
 msgstr "Añadir"
 
-#: ../src/frogr-main-view.c:631 ../src/frogr-main-view.c:729
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
 msgid "Add Elements"
 msgstr "Añadir elementos"
 
-#: ../src/frogr-main-view.c:632 ../src/frogr-main-view.c:730
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
 msgid "Remove"
 msgstr "Quitar"
 
-#: ../src/frogr-main-view.c:632 ../src/frogr-main-view.c:730
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
 msgid "Remove Elements"
 msgstr "Quitar elementos"
 
-#: ../src/frogr-main-view.c:633 ../src/frogr-main-view.c:732
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
 msgid "Upload"
 msgstr "Subir"
 
-#: ../src/frogr-main-view.c:633 ../src/frogr-main-view.c:732
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
 msgid "Upload All"
 msgstr "Subir todo"
 
-#. Save project item
-#: ../src/frogr-main-view.c:666 ../src/frogr-main-view.c:727
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
 msgid "Save"
 msgstr "Guardar"
 
-#: ../src/frogr-main-view.c:666 ../src/frogr-main-view.c:727
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
 msgid "Save Current Project"
 msgstr "Guardar proyecto actual"
 
-#: ../src/frogr-main-view.c:1016 ../data/gtkbuilder/frogr-app-menu.xml.h:4
+#: src/frogr-main-view.c:1016
 msgid "_About"
 msgstr "Acerca _de"
 
-#: ../src/frogr-main-view.c:1020 ../data/gtkbuilder/frogr-app-menu.xml.h:5
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:17
+#: src/frogr-main-view.c:1020
 msgid "_Quit"
 msgstr "_Salir"
 
-#. Create the submenu and insert it in the right section
-#: ../src/frogr-main-view.c:1070
+#: src/frogr-main-view.c:1070
 msgid "Accounts"
 msgstr "Cuentas"
 
-#. String showind the date and time a picture was taken
-#: ../src/frogr-main-view.c:1410
+#: src/frogr-main-view.c:1410
 #, c-format
 msgid "Taken: %s"
 msgstr "Capturada: %s"
 
-#: ../src/frogr-main-view.c:1415
+#: src/frogr-main-view.c:1415
 #, c-format
 msgid "File size: %s"
 msgstr "Tamaño del archivo: %s"
 
-#: ../src/frogr-main-view.c:1540
+#: src/frogr-main-view.c:1540
 msgid "Select File"
 msgstr "Seleccionar un archivo"
 
-#: ../src/frogr-main-view.c:1544 ../src/frogr-main-view.c:1671
+#: src/frogr-main-view.c:1544 src/frogr-main-view.c:1671
 msgid "_Open"
 msgstr "_Abrir"
 
-#: ../src/frogr-main-view.c:1553
+#: src/frogr-main-view.c:1553
 msgid "Frogr Project Files"
 msgstr "Archivos de proyecto de Frogr"
 
-#: ../src/frogr-main-view.c:1615
+#: src/frogr-main-view.c:1615
 msgid "Select Destination"
 msgstr "Seleccionar el destino"
 
-#: ../src/frogr-main-view.c:1619 ../data/gtkbuilder/frogr-menu-bar.xml.h:3
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:1
+#: src/frogr-main-view.c:1619
 msgid "_Save"
 msgstr "_Guardar"
 
-#: ../src/frogr-main-view.c:1622
+#: src/frogr-main-view.c:1622
 msgid "Untitled Project.frogr"
 msgstr "Proyecto sin título.frogr"
 
-#: ../src/frogr-main-view.c:1667
+#: src/frogr-main-view.c:1667
 msgid "Select a Picture"
 msgstr "Seleccionar una Imagen"
 
-#: ../src/frogr-main-view.c:1694
+#: src/frogr-main-view.c:1694
 msgid "All Files"
 msgstr "Todos los archivos"
 
-#: ../src/frogr-main-view.c:1697
+#: src/frogr-main-view.c:1697
 msgid "Image Files"
 msgstr "Archivos de imágenes"
 
-#: ../src/frogr-main-view.c:1701
+#: src/frogr-main-view.c:1701
 msgid "Video Files"
 msgstr "Archivos de vídeo"
 
-#: ../src/frogr-main-view.c:1723
+#: src/frogr-main-view.c:1723
 msgid "You don't have any picture added yet"
 msgstr "Todavía no ha añadido ninguna imagen"
 
-#: ../src/frogr-main-view.c:1736
+#: src/frogr-main-view.c:1736
 msgid "You need to select some pictures first"
 msgstr "Debe seleccionar alguna imagen primero"
 
-#: ../src/frogr-main-view.c:2108
+#: src/frogr-main-view.c:2108
 msgid "Not connected to Flickr"
 msgstr "No está conectado a Flickr"
 
-#. Login string, showing the user is PRO (second '%s') if so.
-#: ../src/frogr-main-view.c:2118
+#: src/frogr-main-view.c:2118
 #, c-format
 msgid "Connected as %s%s"
 msgstr "Conectado como %s%s"
 
-#: ../src/frogr-main-view.c:2119
+#: src/frogr-main-view.c:2119
 msgid " (PRO account)"
 msgstr " (cuenta PRO)"
 
-#. Will show in the status bar the amount of data (in KB, MB
-#. or GB) the user is currently allowed to upload to flicker
-#. till the end of the month, in a CURRENT / MAX fashion.
-#. The '-' at the beginning is just a separator, since more
-#. blocks of text will be shown in the status bar too.
-#: ../src/frogr-main-view.c:2143
+#: src/frogr-main-view.c:2143
 #, c-format
 msgid " - %s / %s remaining"
 msgstr " - %s / %s restantes"
 
-#. Will show in the status bar the amount of pictures and data
-#. (in KB, MB or GB) that would be uploaded as the sum of the
-#. sizes for every picture loaded in the application
-#: ../src/frogr-main-view.c:2169
+#: src/frogr-main-view.c:2169
 #, c-format
 msgid " - %d file to upload (%s)"
 msgid_plural " - %d files to upload (%s)"
 msgstr[0] " - %d archivo que subir (%s)"
 msgstr[1] " - %d archivos que subir (%s)"
 
-#: ../src/frogr-settings-dialog.c:185
+#: src/frogr-settings-dialog.c:185
 msgid "Default Visibility"
 msgstr "Visibilidad predeterminada"
 
-#: ../src/frogr-settings-dialog.c:224
+#: src/frogr-settings-dialog.c:224
 msgid "Default Content Type"
 msgstr "Tipo de contenido predeterminado"
 
-#: ../src/frogr-settings-dialog.c:250
+#: src/frogr-settings-dialog.c:250
 msgid "Default Safety Level"
 msgstr "Nivel de seguridad predeterminado"
 
-#: ../src/frogr-settings-dialog.c:276
+#: src/frogr-settings-dialog.c:276
 msgid "Default License"
 msgstr "Licencia predeterminada"
 
-#: ../src/frogr-settings-dialog.c:302
+#: src/frogr-settings-dialog.c:302
 msgid "Other Defaults"
 msgstr "Otros valores predeterminados"
 
-#: ../src/frogr-settings-dialog.c:312
+#: src/frogr-settings-dialog.c:312
 msgid "_Show Pictures in Global Search Results"
 msgstr "M_ostrar imágenes en los resultados de búsqueda globales"
 
-#: ../src/frogr-settings-dialog.c:315
+#: src/frogr-settings-dialog.c:315
 msgid "Set Geo_location Information for Pictures"
 msgstr "Establecer información de geo_localización para las imágenes"
 
-#: ../src/frogr-settings-dialog.c:318
+#: src/frogr-settings-dialog.c:318
 msgid "Replace 'Date Posted' with 'Date Taken' for Pictures"
 msgstr ""
 "Reemplazar la «Fecha de publicación» con la «Fecha de captura» para las "
 "imágenes"
 
-#: ../src/frogr-settings-dialog.c:324
+#: src/frogr-settings-dialog.c:324
 msgid "_General"
 msgstr "_General"
 
-#: ../src/frogr-settings-dialog.c:344
+#: src/frogr-settings-dialog.c:344
 msgid "Proxy Settings"
 msgstr "Ajustes del proxy"
 
-#. Enable proxy
-#: ../src/frogr-settings-dialog.c:353
+#: src/frogr-settings-dialog.c:353
 msgid "_Enable HTTP Proxy"
 msgstr "_Activar proxy HTTP"
 
-#: ../src/frogr-settings-dialog.c:363
+#: src/frogr-settings-dialog.c:363
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#. Proxy port
-#: ../src/frogr-settings-dialog.c:376
+#: src/frogr-settings-dialog.c:376
 msgid "_Port:"
 msgstr "_Puerto:"
 
-#. Proxy username
-#: ../src/frogr-settings-dialog.c:389
+#: src/frogr-settings-dialog.c:389
 msgid "U_sername:"
 msgstr "_Usuario:"
 
-#. Proxy password
-#: ../src/frogr-settings-dialog.c:402
+#: src/frogr-settings-dialog.c:402
 msgid "Pass_word:"
 msgstr "Contrase_ña:"
 
-#: ../src/frogr-settings-dialog.c:426
+#: src/frogr-settings-dialog.c:426
 msgid "Connec_tion"
 msgstr "Cone_xión"
 
-#: ../src/frogr-settings-dialog.c:444
+#: src/frogr-settings-dialog.c:444
 msgid "Other options"
 msgstr "Otras opciones"
 
-#: ../src/frogr-settings-dialog.c:454
+#: src/frogr-settings-dialog.c:454
 msgid "Ena_ble Tags Auto-Completion"
 msgstr "Acti_var autocompletado de etiquetas"
 
-#: ../src/frogr-settings-dialog.c:457
+#: src/frogr-settings-dialog.c:457
 msgid "_Import Tags from Pictures Metadata"
 msgstr "_Importar etiquetas de los metadatos de las imágenes"
 
-#: ../src/frogr-settings-dialog.c:461
+#: src/frogr-settings-dialog.c:461
 msgid "Use _Dark GTK Theme"
 msgstr "Usar tema de GTK _oscuro"
 
-#: ../src/frogr-settings-dialog.c:465
+#: src/frogr-settings-dialog.c:465
 msgid "_Keep File Extensions in Titles when Loading"
 msgstr "_Mantener extensiones de los archivos en los títulos al cargar"
 
-#: ../src/frogr-settings-dialog.c:471
+#: src/frogr-settings-dialog.c:471
 msgid "_Misc"
 msgstr "_Varios"
 
-#: ../src/frogr-settings-dialog.c:972
+#: src/frogr-settings-dialog.c:972
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:1
-msgid "Aut_horize Account…"
-msgstr "Au_torizar cuenta…"
-
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:2
-msgid "_Preferences…"
-msgstr "Prefere_ncias…"
-
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:3
-msgid "_Help"
-msgstr "Ay_uda"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:1
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:9
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:3
-msgid "_Edit Details…"
-msgstr "_Editar Detalles…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:2
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:10
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:4
-msgid "Add _Tags…"
-msgstr "Añadir _etiquetas…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:3
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:11
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:5
-msgid "Add to _Group…"
-msgstr "Añadir al grupo…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:4
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:12
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:6
-msgid "Add to _Photoset"
-msgstr "_Añadir al álbum"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:5
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:13
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:7
-msgid "_Add to Existing Photoset…"
-msgstr "Añadir a un álbum _existente…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:6
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:14
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:8
-msgid "_Create New Photoset…"
-msgstr "_Crear álbum nuevo…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:7
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:15
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:16
-msgid "_Open in External Viewer"
-msgstr "Abrir en visor e_xterno"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:8
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:6
-msgid "_Remove Elements"
-msgstr "_Quitar elementos"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:1
-msgid "_File"
-msgstr "_Archivo"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:2
-msgid "_Open…"
-msgstr "_Abrir…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:4
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:2
-msgid "Save _As…"
-msgstr "Guardar _como…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:5
-msgid "A_dd Elements…"
-msgstr "Aña_dir elementos…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:7
-msgid "_Upload All"
-msgstr "_Subir todo"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:16
-msgid "_View"
-msgstr "_Ver"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:17
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:9
-msgid "_Sort Elements"
-msgstr "_Ordenar elementos"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:18
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:10
-msgid "As _Loaded"
-msgstr "_Por carga"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:19
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:11
-msgid "By _Date Taken"
-msgstr "Por _fecha de captura"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:20
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:12
-msgid "By _Title"
-msgstr "Por _título"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:21
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:13
-msgid "By _Size"
-msgstr "Por _tamaño"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:22
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:14
-msgid "_Reversed Order"
-msgstr "Orden _inverso"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:23
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:15
-msgid "Enable _Tooltips"
-msgstr "Ac_tivar consejos"
+#~ msgid "Aut_horize Account…"
+#~ msgstr "Au_torizar cuenta…"
+
+#~ msgid "_Preferences…"
+#~ msgstr "Prefere_ncias…"
+
+#~ msgid "_Help"
+#~ msgstr "Ay_uda"
+
+#~ msgid "_Edit Details…"
+#~ msgstr "_Editar Detalles…"
+
+#~ msgid "Add _Tags…"
+#~ msgstr "Añadir _etiquetas…"
+
+#~ msgid "Add to _Group…"
+#~ msgstr "Añadir al grupo…"
+
+#~ msgid "Add to _Photoset"
+#~ msgstr "_Añadir al álbum"
+
+#~ msgid "_Add to Existing Photoset…"
+#~ msgstr "Añadir a un álbum _existente…"
+
+#~ msgid "_Create New Photoset…"
+#~ msgstr "_Crear álbum nuevo…"
+
+#~ msgid "_Open in External Viewer"
+#~ msgstr "Abrir en visor e_xterno"
+
+#~ msgid "_Remove Elements"
+#~ msgstr "_Quitar elementos"
+
+#~ msgid "_File"
+#~ msgstr "_Archivo"
+
+#~ msgid "_Open…"
+#~ msgstr "_Abrir…"
+
+#~ msgid "Save _As…"
+#~ msgstr "Guardar _como…"
+
+#~ msgid "A_dd Elements…"
+#~ msgstr "Aña_dir elementos…"
+
+#~ msgid "_Upload All"
+#~ msgstr "_Subir todo"
+
+#~ msgid "_View"
+#~ msgstr "_Ver"
+
+#~ msgid "_Sort Elements"
+#~ msgstr "_Ordenar elementos"
+
+#~ msgid "As _Loaded"
+#~ msgstr "_Por carga"
+
+#~ msgid "By _Date Taken"
+#~ msgstr "Por _fecha de captura"
+
+#~ msgid "By _Title"
+#~ msgstr "Por _título"
+
+#~ msgid "By _Size"
+#~ msgstr "Por _tamaño"
+
+#~ msgid "_Reversed Order"
+#~ msgstr "Orden _inverso"
+
+#~ msgid "Enable _Tooltips"
+#~ msgstr "Ac_tivar consejos"
 
 #~ msgid "Frogr"
 #~ msgstr "Frogr"
diff --git a/po/fi.po b/po/fi.po
index cef1b27..7271d03 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,9 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: frogr master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=frogr&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-01-22 18:06+0000\n"
+"Report-Msgid-Bugs-To: msanchez gnome org\n"
+"POT-Creation-Date: 2016-08-12 13:09+0100\n"
 "PO-Revision-Date: 2016-03-13 19:22+0200\n"
 "Last-Translator: Jiri Grönroos <jiri gronroos+l10n iki fi>\n"
 "Language-Team: suomi <gnome-fi-laatu lists sourceforge net>\n"
@@ -20,10 +19,16 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Gtranslator 2.91.7\n"
 
-#: ../data/frogr.appdata.xml.in.h:1
-#| msgid ""
-#| "Frogr is a small application for the GNOME desktop that allows users to "
-#| "manage their accounts in the Flickr image hosting website."
+#: data/frogr.appdata.xml.in:5 data/frogr.desktop.in.in:5
+#: data/frogr.desktop.in.in:14
+msgid "frogr"
+msgstr "frogr"
+
+#: data/frogr.appdata.xml.in:6 data/frogr.desktop.in.in:6
+msgid "frogr: a Flickr Remote Organizer for GNOME"
+msgstr "frogr: Flickrin etähallinta Gnome-työpöydälle"
+
+#: data/frogr.appdata.xml.in:8
 msgid ""
 "frogr is a small application for the GNOME desktop that allows users to "
 "manage their accounts in the Flickr image hosting website."
@@ -31,7 +36,7 @@ msgstr ""
 "Frogr on pieni sovellus, joka mahdollistaa käyttäjien hallita tilejään "
 "Flickr-kuvapalvelussa."
 
-#: ../data/frogr.appdata.xml.in.h:2
+#: data/frogr.appdata.xml.in:13
 msgid ""
 "It supports all the basic Flickr features, including uploading pictures, "
 "adding descriptions, setting tags and managing sets and groups pools."
@@ -40,81 +45,72 @@ msgstr ""
 "kuvauksien lisäystä, tunnisteiden asettamista sekä joukkojen ja ryhmien "
 "hallintaa."
 
-#: ../data/frogr.appdata.xml.in.h:3
-#| msgid "Scree_nshot"
+#: data/frogr.appdata.xml.in:24
 msgid "Screenshot of frogr"
 msgstr "Kuvakaappaus frogrista"
 
-#: ../data/frogr.desktop.in.in.h:1
-#| msgid "Frogr"
-msgid "frogr"
-msgstr "frogr"
-
-#: ../data/frogr.desktop.in.in.h:2
-#| msgid "Frogr: a Flickr Remote Organizer for GNOME"
-msgid "frogr: a Flickr Remote Organizer for GNOME"
-msgstr "frogr: Flickrin etähallinta Gnome-työpöydälle"
+#: data/frogr.appdata.xml.in:29
+msgid "Mario Sanchez Prada"
+msgstr ""
 
-#: ../data/frogr.desktop.in.in.h:3
+#: data/frogr.desktop.in.in:7
 msgid "Upload and organize photos in Flickr accounts"
 msgstr "Lähetä ja hallitse kuvia Flickr-tileillä"
 
-#: ../data/frogr.desktop.in.in.h:4
+#: data/frogr.desktop.in.in:8
 msgid "Flickr;Image;Picture;Photo;Video;Uploader;"
 msgstr "Flickr;Image;Picture;Photo;Video;Uploader;kuva;valokuva;lähetys;"
 
-#: ../src/frogr-about-dialog.c:43
-#| msgid "A Flickr remote organizer for GNOME\n"
+#: src/frogr-about-dialog.c:43
 msgid "A Flickr Remote Organizer for GNOME\n"
 msgstr "Flickrin etähallinta Gnome-työpöydälle\n"
 
-#: ../src/frogr-about-dialog.c:72
+#: src/frogr-about-dialog.c:72
 msgid "translator-credits"
 msgstr "Jiri Grönroos"
 
-#: ../src/frogr-add-tags-dialog.c:191 ../src/frogr-add-to-group-dialog.c:528
-#: ../src/frogr-add-to-set-dialog.c:529 ../src/frogr-auth-dialog.c:153
-#: ../src/frogr-create-new-set-dialog.c:310 ../src/frogr-details-dialog.c:1168
-#: ../src/frogr-main-view.c:1543 ../src/frogr-main-view.c:1618
-#: ../src/frogr-main-view.c:1670 ../src/frogr-settings-dialog.c:930
+#: src/frogr-add-tags-dialog.c:191 src/frogr-add-to-group-dialog.c:528
+#: src/frogr-add-to-set-dialog.c:529 src/frogr-auth-dialog.c:153
+#: src/frogr-create-new-set-dialog.c:310 src/frogr-details-dialog.c:1168
+#: src/frogr-main-view.c:1543 src/frogr-main-view.c:1618
+#: src/frogr-main-view.c:1670 src/frogr-settings-dialog.c:930
 msgid "_Cancel"
 msgstr "_Peru"
 
-#: ../src/frogr-add-tags-dialog.c:193 ../src/frogr-add-to-group-dialog.c:530
-#: ../src/frogr-add-to-set-dialog.c:531
-#: ../src/frogr-create-new-set-dialog.c:312
+#: src/frogr-add-tags-dialog.c:193 src/frogr-add-to-group-dialog.c:530
+#: src/frogr-add-to-set-dialog.c:531 src/frogr-create-new-set-dialog.c:312
 msgid "_Add"
 msgstr "_Lisää"
 
-#: ../src/frogr-add-tags-dialog.c:202
+#: src/frogr-add-tags-dialog.c:202
 msgid "Enter a spaces separated list of tags:"
 msgstr "Kirjoita välilyönnein erotettu lista tunnisteita:"
 
-#: ../src/frogr-add-tags-dialog.c:228
+#: src/frogr-add-tags-dialog.c:228
 msgid "Add Tags"
 msgstr "Lisää tunnisteita"
 
-#: ../src/frogr-add-to-group-dialog.c:147
+#: src/frogr-add-to-group-dialog.c:147
 msgid "Name"
 msgstr "Nimi"
 
-#: ../src/frogr-add-to-group-dialog.c:162 ../src/frogr-add-to-set-dialog.c:163
+#: src/frogr-add-to-group-dialog.c:162 src/frogr-add-to-set-dialog.c:163
 msgid "Elements"
 msgstr "Elementit"
 
-#: ../src/frogr-add-to-group-dialog.c:581
+#: src/frogr-add-to-group-dialog.c:581
 msgid "Add to Groups"
 msgstr "Lisää ryhmiin"
 
-#: ../src/frogr-add-to-set-dialog.c:148
+#: src/frogr-add-to-set-dialog.c:148
 msgid "Title"
 msgstr "Nimi"
 
-#: ../src/frogr-add-to-set-dialog.c:582
+#: src/frogr-add-to-set-dialog.c:582
 msgid "Add to Sets"
 msgstr "Lisää joukkoihin"
 
-#: ../src/frogr-auth-dialog.c:59
+#: src/frogr-auth-dialog.c:59
 #, c-format
 msgid ""
 "Please press the button to authorize %s and then come back to complete the "
@@ -123,30 +119,29 @@ msgstr ""
 "Napsauta painiketta valtuuttaksesi %sin ja palaa sitten takaisin "
 "viimeistelläksesi toiminnon."
 
-#: ../src/frogr-auth-dialog.c:63 ../src/frogr-auth-dialog.c:149
-#: ../src/frogr-controller.c:2286
+#: src/frogr-auth-dialog.c:63 src/frogr-auth-dialog.c:149
+#: src/frogr-controller.c:2286
 #, c-format
 msgid "Authorize %s"
 msgstr "Valtuuta %s"
 
-#: ../src/frogr-auth-dialog.c:155 ../src/frogr-settings-dialog.c:932
+#: src/frogr-auth-dialog.c:155 src/frogr-settings-dialog.c:932
 msgid "_Close"
 msgstr "_Sulje"
 
-#. Description label
-#: ../src/frogr-auth-dialog.c:167
+#: src/frogr-auth-dialog.c:167
 msgid "Enter verification code:"
 msgstr "Anna vahvistuskoodi:"
 
-#: ../src/frogr-auth-dialog.c:221
+#: src/frogr-auth-dialog.c:221
 msgid "Invalid verification code"
 msgstr "Virheellinen vahvistuskoodi"
 
-#: ../src/frogr-controller.c:581
+#: src/frogr-controller.c:581
 msgid "Process cancelled"
 msgstr "Toiminto peruttiin"
 
-#: ../src/frogr-controller.c:586
+#: src/frogr-controller.c:586
 msgid ""
 "Connection error:\n"
 "Network not available"
@@ -154,7 +149,7 @@ msgstr ""
 "Yhteysvirhe:\n"
 "Ei verkkoyhteyttä"
 
-#: ../src/frogr-controller.c:590
+#: src/frogr-controller.c:590
 msgid ""
 "Connection error:\n"
 "Bad request"
@@ -162,7 +157,7 @@ msgstr ""
 "Yhteysvirhe:\n"
 "Virheellinen pyyntö"
 
-#: ../src/frogr-controller.c:594
+#: src/frogr-controller.c:594
 msgid ""
 "Connection error:\n"
 "Server-side error"
@@ -170,7 +165,7 @@ msgstr ""
 "Yhteysvirhe:\n"
 "Palvelinpään virhe"
 
-#: ../src/frogr-controller.c:598
+#: src/frogr-controller.c:598
 msgid ""
 "Error uploading:\n"
 "File invalid"
@@ -178,7 +173,7 @@ msgstr ""
 "Virhe lähettäessä:\n"
 "Virheellinen tiedosto"
 
-#: ../src/frogr-controller.c:602
+#: src/frogr-controller.c:602
 msgid ""
 "Error uploading picture:\n"
 "Quota exceeded"
@@ -186,14 +181,14 @@ msgstr ""
 "Virhe kuvaa lähettäessä:\n"
 "Kiintiö ylitetty"
 
-#: ../src/frogr-controller.c:607
+#: src/frogr-controller.c:607
 #, c-format
 msgid "Quota exceeded (limit: %d video per month)"
 msgid_plural "Quota exceeded (limit: %d videos per month)"
 msgstr[0] "Kiintiö ylitetty (raja: %d video kuukaudessa)"
 msgstr[1] "Kiintiö ylitetty (raja: %d videota kuukaudessa)"
 
-#: ../src/frogr-controller.c:611
+#: src/frogr-controller.c:611
 msgid ""
 "Error uploading video:\n"
 "You can't upload more videos with this account"
@@ -201,7 +196,7 @@ msgstr ""
 "Virhe videota lähettäessä:\n"
 "Et voi lähettää enempää videoita tällä tilillä"
 
-#: ../src/frogr-controller.c:617
+#: src/frogr-controller.c:617
 msgid ""
 "Error:\n"
 "Photo not found"
@@ -209,7 +204,7 @@ msgstr ""
 "Virhe:\n"
 "Kuvaa ei löytynyt"
 
-#: ../src/frogr-controller.c:621
+#: src/frogr-controller.c:621
 msgid ""
 "Error:\n"
 "Photo already in photoset"
@@ -217,7 +212,7 @@ msgstr ""
 "Virhe:\n"
 "Kuva on jo kuvajoukossa"
 
-#: ../src/frogr-controller.c:625
+#: src/frogr-controller.c:625
 msgid ""
 "Error:\n"
 "Photo already in group"
@@ -225,7 +220,7 @@ msgstr ""
 "Virhe:\n"
 "Kuva kuuluu jo ryhmään"
 
-#: ../src/frogr-controller.c:629
+#: src/frogr-controller.c:629
 msgid ""
 "Error:\n"
 "Photo already in the maximum number of groups possible"
@@ -233,7 +228,7 @@ msgstr ""
 "Virhe:\n"
 "Kuva kuuluu jo niin moneen ryhmään kuin mahdollista"
 
-#: ../src/frogr-controller.c:633
+#: src/frogr-controller.c:633
 msgid ""
 "Error:\n"
 "Group limit already reached"
@@ -241,7 +236,7 @@ msgstr ""
 "Virhe:\n"
 "Ryhmän raja on jo tullut täyteen"
 
-#: ../src/frogr-controller.c:637
+#: src/frogr-controller.c:637
 msgid ""
 "Error:\n"
 "Photo added to group's queue"
@@ -249,7 +244,7 @@ msgstr ""
 "Virhe:\n"
 "Kuva lisätty ryhmän jonoon"
 
-#: ../src/frogr-controller.c:641
+#: src/frogr-controller.c:641
 msgid ""
 "Error:\n"
 "Photo already added to group's queue"
@@ -257,7 +252,7 @@ msgstr ""
 "Virhe:\n"
 "Kuva on jo lisätty ryhmän jonoon"
 
-#: ../src/frogr-controller.c:645
+#: src/frogr-controller.c:645
 msgid ""
 "Error:\n"
 "Content not allowed for this group"
@@ -265,8 +260,7 @@ msgstr ""
 "Virhe:\n"
 "Sisältö ei ole sallittu tässä ryhmässä"
 
-#: ../src/frogr-controller.c:649
-#, c-format
+#: src/frogr-controller.c:649
 msgid ""
 "Authorization failed.\n"
 "Please try again"
@@ -274,7 +268,7 @@ msgstr ""
 "Valtuutus epäonnistui.\n"
 "Yritä uudelleen"
 
-#: ../src/frogr-controller.c:655
+#: src/frogr-controller.c:655
 #, c-format
 msgid ""
 "Error\n"
@@ -285,8 +279,7 @@ msgstr ""
 "%sia ei ole valtuutettu kelvollisesti kuvien lähettämiseksi Flickriin.\n"
 "Valtuuta sovellus uudelleen."
 
-#: ../src/frogr-controller.c:660
-#, c-format
+#: src/frogr-controller.c:660
 msgid ""
 "Unable to authenticate in Flickr\n"
 "Please try again."
@@ -294,7 +287,7 @@ msgstr ""
 "Tunnistautuminen Flickriin epäonnistui\n"
 "Yritä uudelleen."
 
-#: ../src/frogr-controller.c:664
+#: src/frogr-controller.c:664
 #, c-format
 msgid ""
 "You have not properly authorized %s yet.\n"
@@ -303,8 +296,7 @@ msgstr ""
 "Et ole valtuuttanut %sia vielä kelvollisesti.\n"
 "Yritä uudelleen."
 
-#: ../src/frogr-controller.c:669
-#, c-format
+#: src/frogr-controller.c:669
 msgid ""
 "Invalid verification code.\n"
 "Please try again."
@@ -312,8 +304,7 @@ msgstr ""
 "Virheellinen vahvistuskoodi.\n"
 "Yritä uudelleen"
 
-#: ../src/frogr-controller.c:673
-#, c-format
+#: src/frogr-controller.c:673
 msgid ""
 "Error:\n"
 "Service not available"
@@ -321,253 +312,247 @@ msgstr ""
 "Virhe:\n"
 "Palvelu ei ole käytettävissä"
 
-#. General error: just dump the raw error description
-#: ../src/frogr-controller.c:678
+#: src/frogr-controller.c:678
 #, c-format
 msgid "An error happened: %s."
 msgstr "Tapahtui virhe: %s."
 
-#: ../src/frogr-controller.c:883
+#: src/frogr-controller.c:883
 msgid "Authorization failed (timed out)"
 msgstr "Valtuutus epäonnistui (aikakatkaistu)"
 
-#: ../src/frogr-controller.c:931
+#: src/frogr-controller.c:931
 #, c-format
 msgid "Retrying Upload (attempt %d/%d)…"
 msgstr "Yritetään lähetystä uudelleen (yritys %d/%d)…"
 
-#: ../src/frogr-controller.c:936
+#: src/frogr-controller.c:936
 #, c-format
 msgid "Uploading '%s'…"
 msgstr "Lähetetään '%s'…"
 
-#: ../src/frogr-controller.c:2242
+#: src/frogr-controller.c:2242
 msgid "Updating credentials…"
 msgstr "Päivitetään tilitietoja…"
 
-#: ../src/frogr-controller.c:2247
+#: src/frogr-controller.c:2247
 msgid "Retrieving data for authorization…"
 msgstr "Vastaanotetaan tietoja valtuutusta varten…"
 
-#: ../src/frogr-controller.c:2252
+#: src/frogr-controller.c:2252
 msgid "Finishing authorization…"
 msgstr "Viimeistellään valtuutusta…"
 
-#: ../src/frogr-controller.c:2257
+#: src/frogr-controller.c:2257
 msgid "Retrieving list of sets…"
 msgstr "Vastaanotetaan listaa joukoista…"
 
-#: ../src/frogr-controller.c:2262
+#: src/frogr-controller.c:2262
 msgid "Retrieving list of groups…"
 msgstr "Vastaanotetaan listaa ryhmistä…"
 
-#: ../src/frogr-controller.c:2267
+#: src/frogr-controller.c:2267
 msgid "Retrieving list of tags…"
 msgstr "Vastaanotetaan listaa tunnisteista…"
 
-#: ../src/frogr-controller.c:2292
-#, c-format
+#: src/frogr-controller.c:2292
 msgid "Fetching information"
 msgstr "Noudetaan tietoja"
 
-#: ../src/frogr-controller.c:2398
+#: src/frogr-controller.c:2398
 msgid "No sets found"
 msgstr "Joukkoja ei löytynyt"
 
-#: ../src/frogr-controller.c:2423
+#: src/frogr-controller.c:2423
 msgid "No groups found"
 msgstr "Ryhmiä ei löytynyt"
 
-#: ../src/frogr-controller.c:2984
+#: src/frogr-controller.c:2984
 #, c-format
 msgid ""
 "You need to properly authorize %s before uploading any pictures to Flickr.\n"
 "Please re-authorize it."
 msgstr "Valtuuta %s uudelleen, ennen kuin lähetät kuvia Flickriin."
 
-#: ../src/frogr-controller.c:2994
-#, c-format
+#: src/frogr-controller.c:2994
 msgid "You need to be connected before uploading any pictures to Flickr."
 msgstr "Ennen kuvien lähetystä Flickriin tulee yhteyden olla muodostettu."
 
-#: ../src/frogr-controller.c:3012
+#: src/frogr-controller.c:3012
 msgid "Uploading Pictures"
 msgstr "Lähetetään kuvia"
 
-#: ../src/frogr-controller.c:3057
-#, c-format
+#: src/frogr-controller.c:3057
 msgid "Error opening project file"
 msgstr "Virhe projektitiedostoa avattaessa"
 
-#. This shows a dialog notifying the problem to the user
-#: ../src/frogr-create-new-set-dialog.c:143 ../src/frogr-details-dialog.c:1001
+#: src/frogr-create-new-set-dialog.c:143 src/frogr-details-dialog.c:1001
 msgid "Missing data required"
 msgstr "Vaadittu tieto puuttuu"
 
-#: ../src/frogr-create-new-set-dialog.c:326
+#: src/frogr-create-new-set-dialog.c:326
 msgid "Title:"
 msgstr "Nimi:"
 
-#: ../src/frogr-create-new-set-dialog.c:335
+#: src/frogr-create-new-set-dialog.c:335
 msgid "Description:"
 msgstr "Kuvaus:"
 
-#: ../src/frogr-create-new-set-dialog.c:356
+#: src/frogr-create-new-set-dialog.c:356
 msgid "Fill Pictures Details with Title and Description"
 msgstr "Täytä kuvan tiedot nimellä ja kuvauksella"
 
-#: ../src/frogr-create-new-set-dialog.c:381
+#: src/frogr-create-new-set-dialog.c:381
 msgid "Create New Set"
 msgstr "Luo uusi joukko"
 
-#: ../src/frogr-details-dialog.c:89 ../src/frogr-settings-dialog.c:97
+#: src/frogr-details-dialog.c:89 src/frogr-settings-dialog.c:97
 msgid "Default (as specified in Flickr)"
 msgstr "Oletus (Flickrin määrittelemä)"
 
-#: ../src/frogr-details-dialog.c:90 ../src/frogr-settings-dialog.c:98
+#: src/frogr-details-dialog.c:90 src/frogr-settings-dialog.c:98
 msgid "All rights reserved"
 msgstr "Kaikki oikeudet pidätetään"
 
-#: ../src/frogr-details-dialog.c:91 ../src/frogr-settings-dialog.c:99
+#: src/frogr-details-dialog.c:91 src/frogr-settings-dialog.c:99
 msgid "CC Attribution-NonCommercial-ShareAlike"
 msgstr ""
 "CC Attribution-NonCommercial-ShareAlike (Nimeä-EiKaupallinen-JaaSamoin)"
 
-#: ../src/frogr-details-dialog.c:92 ../src/frogr-settings-dialog.c:100
+#: src/frogr-details-dialog.c:92 src/frogr-settings-dialog.c:100
 msgid "CC Attribution-NonCommercial"
 msgstr "CC Attribution-NonCommercial (Nimeä-EiKaupallinen)"
 
-#: ../src/frogr-details-dialog.c:93 ../src/frogr-settings-dialog.c:101
+#: src/frogr-details-dialog.c:93 src/frogr-settings-dialog.c:101
 msgid "CC Attribution-NonCommercial-NoDerivs"
 msgstr ""
 "CC Attribution-NonCommercial-NoDerivs (Nimeä-EiKaupallinen-EiMuutoksia)"
 
-#: ../src/frogr-details-dialog.c:94 ../src/frogr-settings-dialog.c:102
+#: src/frogr-details-dialog.c:94 src/frogr-settings-dialog.c:102
 msgid "CC Attribution"
 msgstr "CC Attribution (Nimeä)"
 
-#: ../src/frogr-details-dialog.c:95 ../src/frogr-settings-dialog.c:103
+#: src/frogr-details-dialog.c:95 src/frogr-settings-dialog.c:103
 msgid "CC Attribution-ShareAlike"
 msgstr "CC Attribution-ShareAlike (Nimeä-JaaSamoin)"
 
-#: ../src/frogr-details-dialog.c:96 ../src/frogr-settings-dialog.c:104
+#: src/frogr-details-dialog.c:96 src/frogr-settings-dialog.c:104
 msgid "CC Attribution-NoDerivs"
 msgstr "CC Attribution-NoDerivs (Nimeä-EiMuutoksia)"
 
-#: ../src/frogr-details-dialog.c:172
+#: src/frogr-details-dialog.c:172
 msgid "Open with image viewer"
 msgstr "Avaa kuvakatselimella"
 
-#: ../src/frogr-details-dialog.c:190
+#: src/frogr-details-dialog.c:190
 msgid "_Title:"
 msgstr "_Nimi:"
 
-#: ../src/frogr-details-dialog.c:200
+#: src/frogr-details-dialog.c:200
 msgid "_Description:"
 msgstr "_Kuvaus:"
 
-#: ../src/frogr-details-dialog.c:224
+#: src/frogr-details-dialog.c:224
 msgid "Ta_gs:"
 msgstr "_Tunnisteet:"
 
-#: ../src/frogr-details-dialog.c:247
+#: src/frogr-details-dialog.c:247
 msgid "Visibility"
 msgstr "Näkyvyys"
 
-#: ../src/frogr-details-dialog.c:257 ../src/frogr-settings-dialog.c:196
+#: src/frogr-details-dialog.c:257 src/frogr-settings-dialog.c:196
 msgid "_Private"
 msgstr "_Yksityinen"
 
-#: ../src/frogr-details-dialog.c:261 ../src/frogr-settings-dialog.c:199
+#: src/frogr-details-dialog.c:261 src/frogr-settings-dialog.c:199
 msgid "P_ublic"
 msgstr "_Julkinen"
 
-#: ../src/frogr-details-dialog.c:270 ../src/frogr-settings-dialog.c:207
+#: src/frogr-details-dialog.c:270 src/frogr-settings-dialog.c:207
 msgid "_Family"
 msgstr "_Perhe"
 
-#: ../src/frogr-details-dialog.c:274 ../src/frogr-settings-dialog.c:209
+#: src/frogr-details-dialog.c:274 src/frogr-settings-dialog.c:209
 msgid "F_riends"
 msgstr "Kaver_it"
 
-#: ../src/frogr-details-dialog.c:288
+#: src/frogr-details-dialog.c:288
 msgid "Content Type"
 msgstr "Sisällön tyyppi"
 
-#: ../src/frogr-details-dialog.c:296 ../src/frogr-settings-dialog.c:234
+#: src/frogr-details-dialog.c:296 src/frogr-settings-dialog.c:234
 msgid "P_hoto"
 msgstr "_Valokuva"
 
-#: ../src/frogr-details-dialog.c:300 ../src/frogr-settings-dialog.c:236
+#: src/frogr-details-dialog.c:300 src/frogr-settings-dialog.c:236
 msgid "Scree_nshot"
 msgstr "_Kuvakaappaus"
 
-#: ../src/frogr-details-dialog.c:304 ../src/frogr-settings-dialog.c:238
+#: src/frogr-details-dialog.c:304 src/frogr-settings-dialog.c:238
 msgid "Oth_er"
 msgstr "_Muu"
 
-#: ../src/frogr-details-dialog.c:317
+#: src/frogr-details-dialog.c:317
 msgid "Safety Level"
 msgstr "Turvallisuustaso"
 
-#: ../src/frogr-details-dialog.c:325 ../src/frogr-settings-dialog.c:260
+#: src/frogr-details-dialog.c:325 src/frogr-settings-dialog.c:260
 msgid "S_afe"
 msgstr "Tu_rvallinen"
 
-#: ../src/frogr-details-dialog.c:329 ../src/frogr-settings-dialog.c:262
+#: src/frogr-details-dialog.c:329 src/frogr-settings-dialog.c:262
 msgid "_Moderate"
 msgstr "_Keskinkertainen"
 
-#: ../src/frogr-details-dialog.c:333 ../src/frogr-settings-dialog.c:264
+#: src/frogr-details-dialog.c:333 src/frogr-settings-dialog.c:264
 msgid "Restr_icted"
 msgstr "R_ajoitettu"
 
-#: ../src/frogr-details-dialog.c:345
+#: src/frogr-details-dialog.c:345
 msgid "License Type"
 msgstr "Lisenssin tyyppi"
 
-#: ../src/frogr-details-dialog.c:367
+#: src/frogr-details-dialog.c:367
 msgid "Other Properties"
 msgstr "Muut ominaisuudet"
 
-#: ../src/frogr-details-dialog.c:375
+#: src/frogr-details-dialog.c:375
 msgid "_Show Up in Global Search Results"
 msgstr "_Näytä julkisissa hakutuloksissa"
 
-#: ../src/frogr-details-dialog.c:379
+#: src/frogr-details-dialog.c:379
 msgid "Set Geo_location Information"
 msgstr "_Aseta paikkatiedot"
 
-#: ../src/frogr-details-dialog.c:383
+#: src/frogr-details-dialog.c:383
 msgid "Replace 'Date Posted' with 'Date Taken'"
 msgstr "Korvaa tietue \"Lähetyspäivä\" tietueella \"Ottopäivä\""
 
-#. Visually indicate how many pictures are being edited
-#: ../src/frogr-details-dialog.c:475
+#: src/frogr-details-dialog.c:475
 #, c-format
 msgid "(%d Picture)"
 msgid_plural "(%d Pictures)"
 msgstr[0] "(%d kuva)"
 msgstr[1] "(%d kuvaa)"
 
-#: ../src/frogr-details-dialog.c:548
+#: src/frogr-details-dialog.c:548
 msgid "An error happened trying to load the picture"
 msgstr "Kuvaa ladattaessa tapahtui virhe"
 
-#: ../src/frogr-details-dialog.c:1169 ../data/gtkbuilder/frogr-menu-bar.xml.h:8
+#: src/frogr-details-dialog.c:1169
 msgid "_Edit"
 msgstr "_Muokkaa"
 
-#: ../src/frogr-details-dialog.c:1197
+#: src/frogr-details-dialog.c:1197
 msgid "Edit Picture Details"
 msgstr "Muokkaa kuvan tietoja"
 
-#: ../src/frogr-file-loader.c:142
+#: src/frogr-file-loader.c:142
 #, c-format
 msgid "Loading files %d / %d"
 msgstr "Ladataan tiedostoja %d / %d"
 
-#: ../src/frogr-file-loader.c:369
+#: src/frogr-file-loader.c:369
 #, c-format
 msgid ""
 "Unable to load picture %s:\n"
@@ -576,7 +561,7 @@ msgstr ""
 "Kuvan %s lataaminen epäonnistui:\n"
 "%s"
 
-#: ../src/frogr-file-loader.c:400
+#: src/frogr-file-loader.c:400
 #, c-format
 msgid ""
 "Unable to load video %s\n"
@@ -585,10 +570,7 @@ msgstr ""
 "Videon %s lataaminen epäonnistui\n"
 "Varmista, että järjestelmääsi on asennettu oikea koodekki"
 
-#. First %s is the title of the picture (filename of the file by
-#. default). Second %s is the max allowed size for a picture to be
-#. uploaded to flickr (different for free and PRO accounts).
-#: ../src/frogr-file-loader.c:636
+#: src/frogr-file-loader.c:636
 #, c-format
 msgid ""
 "Can't load file %s:\n"
@@ -597,367 +579,301 @@ msgstr ""
 "Tiedoston %s lataaminen ei onnistu:\n"
 "Tiedoston koko on suurempi kuin tämän tilin enimmäisraja (%s)"
 
-#. First create the left side buttons
-#: ../src/frogr-main-view.c:630 ../src/frogr-main-view.c:726
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
 msgid "Open"
 msgstr "Avaa"
 
-#: ../src/frogr-main-view.c:630 ../src/frogr-main-view.c:726
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
 msgid "Open Existing Project"
 msgstr "Avaa olemassa oleva projekti"
 
-#: ../src/frogr-main-view.c:631 ../src/frogr-main-view.c:729
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
 msgid "Add"
 msgstr "Lisää"
 
-#: ../src/frogr-main-view.c:631 ../src/frogr-main-view.c:729
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
 msgid "Add Elements"
 msgstr "Lisää elementtejä"
 
-#: ../src/frogr-main-view.c:632 ../src/frogr-main-view.c:730
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
 msgid "Remove"
 msgstr "Poista"
 
-#: ../src/frogr-main-view.c:632 ../src/frogr-main-view.c:730
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
 msgid "Remove Elements"
 msgstr "Poista elementtejä"
 
-#: ../src/frogr-main-view.c:633 ../src/frogr-main-view.c:732
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
 msgid "Upload"
 msgstr "Lähetä"
 
-#: ../src/frogr-main-view.c:633 ../src/frogr-main-view.c:732
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
 msgid "Upload All"
 msgstr "Lähetä kaikki"
 
-#. Save project item
-#: ../src/frogr-main-view.c:666 ../src/frogr-main-view.c:727
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
 msgid "Save"
 msgstr "Tallenna"
 
-#: ../src/frogr-main-view.c:666 ../src/frogr-main-view.c:727
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
 msgid "Save Current Project"
 msgstr "Tallenna nykyinen projekti"
 
-#: ../src/frogr-main-view.c:1016 ../data/gtkbuilder/frogr-app-menu.xml.h:4
+#: src/frogr-main-view.c:1016
 msgid "_About"
 msgstr "_Tietoja"
 
-#: ../src/frogr-main-view.c:1020 ../data/gtkbuilder/frogr-app-menu.xml.h:5
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:17
+#: src/frogr-main-view.c:1020
 msgid "_Quit"
 msgstr "_Lopeta"
 
-#. Create the submenu and insert it in the right section
-#: ../src/frogr-main-view.c:1070
+#: src/frogr-main-view.c:1070
 msgid "Accounts"
 msgstr "Tilit"
 
-#. String showind the date and time a picture was taken
-#: ../src/frogr-main-view.c:1410
+#: src/frogr-main-view.c:1410
 #, c-format
 msgid "Taken: %s"
 msgstr "Otettu: %s"
 
-#: ../src/frogr-main-view.c:1415
+#: src/frogr-main-view.c:1415
 #, c-format
 msgid "File size: %s"
 msgstr "Tiedoston koko: %s"
 
-#: ../src/frogr-main-view.c:1540
+#: src/frogr-main-view.c:1540
 msgid "Select File"
 msgstr "Valitse tiedosto"
 
-#: ../src/frogr-main-view.c:1544 ../src/frogr-main-view.c:1671
+#: src/frogr-main-view.c:1544 src/frogr-main-view.c:1671
 msgid "_Open"
 msgstr "_Avaa"
 
-#: ../src/frogr-main-view.c:1553
+#: src/frogr-main-view.c:1553
 msgid "Frogr Project Files"
 msgstr "Frogr-projektitiedostot"
 
-#: ../src/frogr-main-view.c:1615
+#: src/frogr-main-view.c:1615
 msgid "Select Destination"
 msgstr "Valitse kohde"
 
-#: ../src/frogr-main-view.c:1619 ../data/gtkbuilder/frogr-menu-bar.xml.h:3
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:1
+#: src/frogr-main-view.c:1619
 msgid "_Save"
 msgstr "_Tallenna"
 
-#: ../src/frogr-main-view.c:1622
+#: src/frogr-main-view.c:1622
 msgid "Untitled Project.frogr"
 msgstr "Nimetön projekti.frogr"
 
-#: ../src/frogr-main-view.c:1667
+#: src/frogr-main-view.c:1667
 msgid "Select a Picture"
 msgstr "Valitse kuva"
 
-#: ../src/frogr-main-view.c:1694
+#: src/frogr-main-view.c:1694
 msgid "All Files"
 msgstr "Kaikki tiedostot"
 
-#: ../src/frogr-main-view.c:1697
+#: src/frogr-main-view.c:1697
 msgid "Image Files"
 msgstr "Kuvatiedostot"
 
-#: ../src/frogr-main-view.c:1701
+#: src/frogr-main-view.c:1701
 msgid "Video Files"
 msgstr "Videotiedostot"
 
-#: ../src/frogr-main-view.c:1723
+#: src/frogr-main-view.c:1723
 msgid "You don't have any picture added yet"
 msgstr "Et ole lisännyt vielä yhtäkään kuvaa"
 
-#: ../src/frogr-main-view.c:1736
+#: src/frogr-main-view.c:1736
 msgid "You need to select some pictures first"
 msgstr "Valitse ensin joitakin kuvia"
 
-#: ../src/frogr-main-view.c:2108
+#: src/frogr-main-view.c:2108
 msgid "Not connected to Flickr"
 msgstr "Ei yhteyttä Flickriin"
 
-#. Login string, showing the user is PRO (second '%s') if so.
-#: ../src/frogr-main-view.c:2118
+#: src/frogr-main-view.c:2118
 #, c-format
 msgid "Connected as %s%s"
 msgstr "Yhdistetty tilillä %s%s"
 
-#: ../src/frogr-main-view.c:2119
+#: src/frogr-main-view.c:2119
 msgid " (PRO account)"
 msgstr " (PRO-tili)"
 
-#. Will show in the status bar the amount of data (in KB, MB
-#. or GB) the user is currently allowed to upload to flicker
-#. till the end of the month, in a CURRENT / MAX fashion.
-#. The '-' at the beginning is just a separator, since more
-#. blocks of text will be shown in the status bar too.
-#: ../src/frogr-main-view.c:2143
+#: src/frogr-main-view.c:2143
 #, c-format
 msgid " - %s / %s remaining"
 msgstr " - %s / %s jäljellä"
 
-#. Will show in the status bar the amount of pictures and data
-#. (in KB, MB or GB) that would be uploaded as the sum of the
-#. sizes for every picture loaded in the application
-#: ../src/frogr-main-view.c:2169
+#: src/frogr-main-view.c:2169
 #, c-format
 msgid " - %d file to upload (%s)"
 msgid_plural " - %d files to upload (%s)"
 msgstr[0] " - %d kuva lähetettäväksi (%s)"
 msgstr[1] " - %d kuvaa lähetettäväksi (%s)"
 
-#: ../src/frogr-settings-dialog.c:185
+#: src/frogr-settings-dialog.c:185
 msgid "Default Visibility"
 msgstr "Oletusnäkyvyys"
 
-#: ../src/frogr-settings-dialog.c:224
+#: src/frogr-settings-dialog.c:224
 msgid "Default Content Type"
 msgstr "Sisällön oletustyyppi"
 
-#: ../src/frogr-settings-dialog.c:250
+#: src/frogr-settings-dialog.c:250
 msgid "Default Safety Level"
 msgstr "Oletusturvallisuustaso"
 
-#: ../src/frogr-settings-dialog.c:276
+#: src/frogr-settings-dialog.c:276
 msgid "Default License"
 msgstr "Oletuslisenssi"
 
-#: ../src/frogr-settings-dialog.c:302
+#: src/frogr-settings-dialog.c:302
 msgid "Other Defaults"
 msgstr "Muut oletukset"
 
-#: ../src/frogr-settings-dialog.c:312
+#: src/frogr-settings-dialog.c:312
 msgid "_Show Pictures in Global Search Results"
 msgstr "Näytä _kuvat julkisissa hakutuloksissa"
 
-#: ../src/frogr-settings-dialog.c:315
+#: src/frogr-settings-dialog.c:315
 msgid "Set Geo_location Information for Pictures"
 msgstr "_Aseta paikkatiedot kuville"
 
-#: ../src/frogr-settings-dialog.c:318
+#: src/frogr-settings-dialog.c:318
 msgid "Replace 'Date Posted' with 'Date Taken' for Pictures"
 msgstr "Korvaa kuvien \"Lähetyspäivä\" tietueella \"Ottopäivä\""
 
-#: ../src/frogr-settings-dialog.c:324
+#: src/frogr-settings-dialog.c:324
 msgid "_General"
 msgstr "_Yleiset"
 
-#: ../src/frogr-settings-dialog.c:344
+#: src/frogr-settings-dialog.c:344
 msgid "Proxy Settings"
 msgstr "Välityspalvelimen asetukset"
 
-#. Enable proxy
-#: ../src/frogr-settings-dialog.c:353
+#: src/frogr-settings-dialog.c:353
 msgid "_Enable HTTP Proxy"
 msgstr "_Käytä HTTP-välityspalvelinta"
 
-#: ../src/frogr-settings-dialog.c:363
+#: src/frogr-settings-dialog.c:363
 msgid "_Host:"
 msgstr "_Osoite:"
 
-#. Proxy port
-#: ../src/frogr-settings-dialog.c:376
+#: src/frogr-settings-dialog.c:376
 msgid "_Port:"
 msgstr "_Portti:"
 
-#. Proxy username
-#: ../src/frogr-settings-dialog.c:389
+#: src/frogr-settings-dialog.c:389
 msgid "U_sername:"
 msgstr "K_äyttäjätunnus:"
 
-#. Proxy password
-#: ../src/frogr-settings-dialog.c:402
+#: src/frogr-settings-dialog.c:402
 msgid "Pass_word:"
 msgstr "_Salasana:"
 
-#: ../src/frogr-settings-dialog.c:426
+#: src/frogr-settings-dialog.c:426
 msgid "Connec_tion"
 msgstr "Y_hteys"
 
-#: ../src/frogr-settings-dialog.c:444
+#: src/frogr-settings-dialog.c:444
 msgid "Other options"
 msgstr "Muut valinnat"
 
-#: ../src/frogr-settings-dialog.c:454
+#: src/frogr-settings-dialog.c:454
 msgid "Ena_ble Tags Auto-Completion"
 msgstr "Käytä tunnisteiden _automaattista täydennystä"
 
-#: ../src/frogr-settings-dialog.c:457
+#: src/frogr-settings-dialog.c:457
 msgid "_Import Tags from Pictures Metadata"
 msgstr "_Tuo tunnisteet kuvien metadatasta"
 
-#: ../src/frogr-settings-dialog.c:461
+#: src/frogr-settings-dialog.c:461
 msgid "Use _Dark GTK Theme"
 msgstr "Käytä tummaa _GTK-teemaa"
 
-#: ../src/frogr-settings-dialog.c:465
+#: src/frogr-settings-dialog.c:465
 msgid "_Keep File Extensions in Titles when Loading"
 msgstr "_Säilytä tiedostopääte nimessä lähettäessä"
 
-#: ../src/frogr-settings-dialog.c:471
+#: src/frogr-settings-dialog.c:471
 msgid "_Misc"
 msgstr "_Muut"
 
-#: ../src/frogr-settings-dialog.c:972
+#: src/frogr-settings-dialog.c:972
 msgid "Preferences"
 msgstr "Asetukset"
 
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:1
-msgid "Aut_horize Account…"
-msgstr "_Valtuuta tili…"
-
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:2
-msgid "_Preferences…"
-msgstr "_Asetukset…"
-
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:3
-msgid "_Help"
-msgstr "_Ohje"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:1
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:9
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:3
-msgid "_Edit Details…"
-msgstr "_Muokkaa tietoja…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:2
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:10
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:4
-msgid "Add _Tags…"
-msgstr "_Lisää tunnisteita…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:3
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:11
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:5
-msgid "Add to _Group…"
-msgstr "Lisää _ryhmään…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:4
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:12
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:6
-msgid "Add to _Photoset"
-msgstr "Lisää _kuvajoukkoon"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:5
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:13
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:7
-msgid "_Add to Existing Photoset…"
-msgstr "Li_sää olemassa olevaan kuvajoukkoon…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:6
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:14
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:8
-msgid "_Create New Photoset…"
-msgstr "_Luo uusi kuvajoukko…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:7
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:15
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:16
-msgid "_Open in External Viewer"
-msgstr "_Avaa erillisessä katselimessa"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:8
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:6
-msgid "_Remove Elements"
-msgstr "_Poista elementit"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:1
-msgid "_File"
-msgstr "_Tiedosto"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:2
-msgid "_Open…"
-msgstr "_Avaa…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:4
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:2
-msgid "Save _As…"
-msgstr "_Tallenna nimellä…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:5
-msgid "A_dd Elements…"
-msgstr "Lisää ele_menttejä…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:7
-msgid "_Upload All"
-msgstr "L_ähetä kaikki"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:16
-msgid "_View"
-msgstr "_Näytä"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:17
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:9
-msgid "_Sort Elements"
-msgstr "Järjestä _elementit"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:18
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:10
-msgid "As _Loaded"
-msgstr "_Latauksen mukaan"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:19
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:11
-msgid "By _Date Taken"
-msgstr "_Ottopäivän mukaan"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:20
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:12
-msgid "By _Title"
-msgstr "_Nimen mukaan"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:21
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:13
-msgid "By _Size"
-msgstr "_Koon mukaan"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:22
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:14
-msgid "_Reversed Order"
-msgstr "K_äänteinen järjestys"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:23
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:15
-msgid "Enable _Tooltips"
-msgstr "Kä_ytä työkaluvihjeitä"
+#~ msgid "Aut_horize Account…"
+#~ msgstr "_Valtuuta tili…"
+
+#~ msgid "_Preferences…"
+#~ msgstr "_Asetukset…"
+
+#~ msgid "_Help"
+#~ msgstr "_Ohje"
+
+#~ msgid "_Edit Details…"
+#~ msgstr "_Muokkaa tietoja…"
+
+#~ msgid "Add _Tags…"
+#~ msgstr "_Lisää tunnisteita…"
+
+#~ msgid "Add to _Group…"
+#~ msgstr "Lisää _ryhmään…"
+
+#~ msgid "Add to _Photoset"
+#~ msgstr "Lisää _kuvajoukkoon"
+
+#~ msgid "_Add to Existing Photoset…"
+#~ msgstr "Li_sää olemassa olevaan kuvajoukkoon…"
+
+#~ msgid "_Create New Photoset…"
+#~ msgstr "_Luo uusi kuvajoukko…"
+
+#~ msgid "_Open in External Viewer"
+#~ msgstr "_Avaa erillisessä katselimessa"
+
+#~ msgid "_Remove Elements"
+#~ msgstr "_Poista elementit"
+
+#~ msgid "_File"
+#~ msgstr "_Tiedosto"
+
+#~ msgid "_Open…"
+#~ msgstr "_Avaa…"
+
+#~ msgid "Save _As…"
+#~ msgstr "_Tallenna nimellä…"
+
+#~ msgid "A_dd Elements…"
+#~ msgstr "Lisää ele_menttejä…"
+
+#~ msgid "_Upload All"
+#~ msgstr "L_ähetä kaikki"
+
+#~ msgid "_View"
+#~ msgstr "_Näytä"
+
+#~ msgid "_Sort Elements"
+#~ msgstr "Järjestä _elementit"
+
+#~ msgid "As _Loaded"
+#~ msgstr "_Latauksen mukaan"
+
+#~ msgid "By _Date Taken"
+#~ msgstr "_Ottopäivän mukaan"
+
+#~ msgid "By _Title"
+#~ msgstr "_Nimen mukaan"
+
+#~ msgid "By _Size"
+#~ msgstr "_Koon mukaan"
+
+#~ msgid "_Reversed Order"
+#~ msgstr "K_äänteinen järjestys"
+
+#~ msgid "Enable _Tooltips"
+#~ msgstr "Kä_ytä työkaluvihjeitä"
diff --git a/po/fr.po b/po/fr.po
index 307aed1..29b167f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,9 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: frogr master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=frogr&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-12-15 07:02+0000\n"
+"Report-Msgid-Bugs-To: msanchez gnome org\n"
+"POT-Creation-Date: 2016-08-12 13:09+0100\n"
 "PO-Revision-Date: 2015-12-30 10:02+0100\n"
 "Last-Translator: Alexandre Franke <alexandre franke gmail com>\n"
 "Language-Team: GNOME French Team <gnomefr traduc org>\n"
@@ -21,90 +20,102 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../data/frogr.appdata.xml.in.h:1
+#: data/frogr.appdata.xml.in:5 data/frogr.desktop.in.in:5
+#: data/frogr.desktop.in.in:14
+msgid "frogr"
+msgstr "frogr"
+
+#: data/frogr.appdata.xml.in:6 data/frogr.desktop.in.in:6
+msgid "frogr: a Flickr Remote Organizer for GNOME"
+msgstr "frogr : un gestionnaire Flickr à distance pour GNOME"
+
+#: data/frogr.appdata.xml.in:8
 msgid ""
 "frogr is a small application for the GNOME desktop that allows users to "
 "manage their accounts in the Flickr image hosting website."
 msgstr ""
-"frogr est une petite application pour l'environnement de bureau GNOME qui permet de gérer les comptes du 
site d'hébergement d'images Flickr"
+"frogr est une petite application pour l'environnement de bureau GNOME qui "
+"permet de gérer les comptes du site d'hébergement d'images Flickr"
 
-#: ../data/frogr.appdata.xml.in.h:2
+#: data/frogr.appdata.xml.in:13
 msgid ""
 "It supports all the basic Flickr features, including uploading pictures, "
 "adding descriptions, setting tags and managing sets and groups pools."
 msgstr ""
-"Elle prend en charge toutes les fonctionnalités basiques de Flickr, comme l'envoi d'images, l'ajout de 
descriptions, la définition d'étiquettes et la gestion des albums ou des groupes."
+"Elle prend en charge toutes les fonctionnalités basiques de Flickr, comme "
+"l'envoi d'images, l'ajout de descriptions, la définition d'étiquettes et la "
+"gestion des albums ou des groupes."
 
-#: ../data/frogr.desktop.in.in.h:1
-msgid "frogr"
-msgstr "frogr"
+#: data/frogr.appdata.xml.in:24
+#, fuzzy
+msgid "Screenshot of frogr"
+msgstr "_Capture"
 
-#: ../data/frogr.desktop.in.in.h:2
-msgid "frogr: a Flickr Remote Organizer for GNOME"
-msgstr "frogr : un gestionnaire Flickr à distance pour GNOME"
+#: data/frogr.appdata.xml.in:29
+msgid "Mario Sanchez Prada"
+msgstr ""
 
-#: ../data/frogr.desktop.in.in.h:3
+#: data/frogr.desktop.in.in:7
 msgid "Upload and organize photos in Flickr accounts"
 msgstr "Envoyer et organiser des photos sur des comptes Flickr"
 
-#: ../data/frogr.desktop.in.in.h:4
+#: data/frogr.desktop.in.in:8
 msgid "Flickr;Image;Picture;Photo;Video;Uploader;"
 msgstr "Flickr;Image;Photographie;Vidéo;Envoi;Envoyer;Téléverser;"
 
-#: ../src/frogr-about-dialog.c:43
+#: src/frogr-about-dialog.c:43
 msgid "A Flickr Remote Organizer for GNOME\n"
 msgstr "Un gestionnaire Flickr à distance pour GNOME\n"
 
-#: ../src/frogr-about-dialog.c:72
+#: src/frogr-about-dialog.c:72
 msgid "translator-credits"
 msgstr ""
 "Alexandre Franke <alexandre franke gmail com>\n"
 "Claude Paroz <claude 2xlibre net>\n"
 "Alain Lojewski <allomervan gmail com>"
 
-#: ../src/frogr-add-tags-dialog.c:191 ../src/frogr-add-to-group-dialog.c:528
-#: ../src/frogr-add-to-set-dialog.c:529 ../src/frogr-auth-dialog.c:153
-#: ../src/frogr-create-new-set-dialog.c:310 ../src/frogr-details-dialog.c:1168
-#: ../src/frogr-main-view.c:1546 ../src/frogr-main-view.c:1621
-#: ../src/frogr-main-view.c:1673 ../src/frogr-settings-dialog.c:930
+#: src/frogr-add-tags-dialog.c:191 src/frogr-add-to-group-dialog.c:528
+#: src/frogr-add-to-set-dialog.c:529 src/frogr-auth-dialog.c:153
+#: src/frogr-create-new-set-dialog.c:310 src/frogr-details-dialog.c:1168
+#: src/frogr-main-view.c:1543 src/frogr-main-view.c:1618
+#: src/frogr-main-view.c:1670 src/frogr-settings-dialog.c:930
 msgid "_Cancel"
 msgstr "A_nnuler"
 
-#: ../src/frogr-add-tags-dialog.c:193 ../src/frogr-add-to-group-dialog.c:530
-#: ../src/frogr-add-to-set-dialog.c:531
-#: ../src/frogr-create-new-set-dialog.c:312
+#: src/frogr-add-tags-dialog.c:193 src/frogr-add-to-group-dialog.c:530
+#: src/frogr-add-to-set-dialog.c:531 src/frogr-create-new-set-dialog.c:312
 msgid "_Add"
 msgstr "_Ajouter"
 
-#: ../src/frogr-add-tags-dialog.c:202
+#: src/frogr-add-tags-dialog.c:202
 msgid "Enter a spaces separated list of tags:"
 msgstr "Saisissez une liste d'étiquettes séparées par des espaces :"
 
-#: ../src/frogr-add-tags-dialog.c:228
+#: src/frogr-add-tags-dialog.c:228
 msgid "Add Tags"
 msgstr "Ajouter des étiquettes"
 
-#: ../src/frogr-add-to-group-dialog.c:147
+#: src/frogr-add-to-group-dialog.c:147
 msgid "Name"
 msgstr "Nom"
 
-#: ../src/frogr-add-to-group-dialog.c:162 ../src/frogr-add-to-set-dialog.c:163
+#: src/frogr-add-to-group-dialog.c:162 src/frogr-add-to-set-dialog.c:163
 msgid "Elements"
 msgstr "Éléments"
 
-#: ../src/frogr-add-to-group-dialog.c:581
+#: src/frogr-add-to-group-dialog.c:581
 msgid "Add to Groups"
 msgstr "Ajouter aux groupes"
 
-#: ../src/frogr-add-to-set-dialog.c:148
+#: src/frogr-add-to-set-dialog.c:148
 msgid "Title"
 msgstr "Titre"
 
-#: ../src/frogr-add-to-set-dialog.c:582
+#: src/frogr-add-to-set-dialog.c:582
 msgid "Add to Sets"
 msgstr "Ajouter aux albums"
 
-#: ../src/frogr-auth-dialog.c:59
+#: src/frogr-auth-dialog.c:59
 #, c-format
 msgid ""
 "Please press the button to authorize %s and then come back to complete the "
@@ -113,30 +124,29 @@ msgstr ""
 "Veuillez appuyer sur le bouton pour autoriser %s, puis revenez terminer le "
 "processus."
 
-#: ../src/frogr-auth-dialog.c:63 ../src/frogr-auth-dialog.c:149
-#: ../src/frogr-controller.c:2286
+#: src/frogr-auth-dialog.c:63 src/frogr-auth-dialog.c:149
+#: src/frogr-controller.c:2286
 #, c-format
 msgid "Authorize %s"
 msgstr "Autoriser %s"
 
-#: ../src/frogr-auth-dialog.c:155 ../src/frogr-settings-dialog.c:932
+#: src/frogr-auth-dialog.c:155 src/frogr-settings-dialog.c:932
 msgid "_Close"
 msgstr "_Fermer"
 
-#. Description label
-#: ../src/frogr-auth-dialog.c:167
+#: src/frogr-auth-dialog.c:167
 msgid "Enter verification code:"
 msgstr "Saisissez le code de vérification :"
 
-#: ../src/frogr-auth-dialog.c:221
+#: src/frogr-auth-dialog.c:221
 msgid "Invalid verification code"
 msgstr "Code de vérification non valide"
 
-#: ../src/frogr-controller.c:581
+#: src/frogr-controller.c:581
 msgid "Process cancelled"
 msgstr "Processus annulé"
 
-#: ../src/frogr-controller.c:586
+#: src/frogr-controller.c:586
 msgid ""
 "Connection error:\n"
 "Network not available"
@@ -144,7 +154,7 @@ msgstr ""
 "Erreur de connexion :\n"
 "Réseau indisponible"
 
-#: ../src/frogr-controller.c:590
+#: src/frogr-controller.c:590
 msgid ""
 "Connection error:\n"
 "Bad request"
@@ -152,7 +162,7 @@ msgstr ""
 "Erreur de connexion :\n"
 "Mauvaise requête"
 
-#: ../src/frogr-controller.c:594
+#: src/frogr-controller.c:594
 msgid ""
 "Connection error:\n"
 "Server-side error"
@@ -160,7 +170,7 @@ msgstr ""
 "Erreur de connexion :\n"
 "Erreur côté serveur"
 
-#: ../src/frogr-controller.c:598
+#: src/frogr-controller.c:598
 msgid ""
 "Error uploading:\n"
 "File invalid"
@@ -168,7 +178,7 @@ msgstr ""
 "Erreur pendant l'envoi :\n"
 "Fichier non valide"
 
-#: ../src/frogr-controller.c:602
+#: src/frogr-controller.c:602
 msgid ""
 "Error uploading picture:\n"
 "Quota exceeded"
@@ -176,14 +186,14 @@ msgstr ""
 "Erreur pendant l'envoi de l'image :\n"
 "Quota dépassé"
 
-#: ../src/frogr-controller.c:607
+#: src/frogr-controller.c:607
 #, c-format
 msgid "Quota exceeded (limit: %d video per month)"
 msgid_plural "Quota exceeded (limit: %d videos per month)"
 msgstr[0] "Quota dépassé (limite : %d vidéo par mois)"
 msgstr[1] "Quota dépassé (limite : %d vidéos par mois)"
 
-#: ../src/frogr-controller.c:611
+#: src/frogr-controller.c:611
 msgid ""
 "Error uploading video:\n"
 "You can't upload more videos with this account"
@@ -191,7 +201,7 @@ msgstr ""
 "Erreur d'envoi de la vidéo :\n"
 "Vous ne pouvez plus envoyer de vidéos avec ce compte"
 
-#: ../src/frogr-controller.c:617
+#: src/frogr-controller.c:617
 msgid ""
 "Error:\n"
 "Photo not found"
@@ -199,7 +209,7 @@ msgstr ""
 "Erreur :\n"
 "Photo introuvable"
 
-#: ../src/frogr-controller.c:621
+#: src/frogr-controller.c:621
 msgid ""
 "Error:\n"
 "Photo already in photoset"
@@ -207,7 +217,7 @@ msgstr ""
 "Erreur :\n"
 "Photo déjà présente dans l'album"
 
-#: ../src/frogr-controller.c:625
+#: src/frogr-controller.c:625
 msgid ""
 "Error:\n"
 "Photo already in group"
@@ -215,7 +225,7 @@ msgstr ""
 "Erreur :\n"
 "Photo déjà dans le groupe"
 
-#: ../src/frogr-controller.c:629
+#: src/frogr-controller.c:629
 msgid ""
 "Error:\n"
 "Photo already in the maximum number of groups possible"
@@ -223,7 +233,7 @@ msgstr ""
 "Erreur :\n"
 "Photo déjà dans le nombre maximum de groupes possible"
 
-#: ../src/frogr-controller.c:633
+#: src/frogr-controller.c:633
 msgid ""
 "Error:\n"
 "Group limit already reached"
@@ -231,7 +241,7 @@ msgstr ""
 "Erreur :\n"
 "Limite du groupe déjà atteinte"
 
-#: ../src/frogr-controller.c:637
+#: src/frogr-controller.c:637
 msgid ""
 "Error:\n"
 "Photo added to group's queue"
@@ -239,7 +249,7 @@ msgstr ""
 "Erreur :\n"
 "Photo ajoutée à la file d'attente du groupe"
 
-#: ../src/frogr-controller.c:641
+#: src/frogr-controller.c:641
 msgid ""
 "Error:\n"
 "Photo already added to group's queue"
@@ -247,7 +257,7 @@ msgstr ""
 "Erreur :\n"
 "Photo déjà ajoutée à la file d'attente du groupe"
 
-#: ../src/frogr-controller.c:645
+#: src/frogr-controller.c:645
 msgid ""
 "Error:\n"
 "Content not allowed for this group"
@@ -255,8 +265,7 @@ msgstr ""
 "Erreur :\n"
 "Contenu non autorisé pour ce groupe"
 
-#: ../src/frogr-controller.c:649
-#, c-format
+#: src/frogr-controller.c:649
 msgid ""
 "Authorization failed.\n"
 "Please try again"
@@ -264,7 +273,7 @@ msgstr ""
 "Échec de l'autorisation.\n"
 "Veuillez réessayer"
 
-#: ../src/frogr-controller.c:655
+#: src/frogr-controller.c:655
 #, c-format
 msgid ""
 "Error\n"
@@ -275,8 +284,7 @@ msgstr ""
 "%s n'est pas autorisé à envoyer des images vers Flickr.\n"
 "Veuillez l'autoriser à nouveau"
 
-#: ../src/frogr-controller.c:660
-#, c-format
+#: src/frogr-controller.c:660
 msgid ""
 "Unable to authenticate in Flickr\n"
 "Please try again."
@@ -284,7 +292,7 @@ msgstr ""
 "Impossible de s'authentifier dans Flickr\n"
 "Veuillez réessayer."
 
-#: ../src/frogr-controller.c:664
+#: src/frogr-controller.c:664
 #, c-format
 msgid ""
 "You have not properly authorized %s yet.\n"
@@ -293,8 +301,7 @@ msgstr ""
 "Vous n'avez pas encore correctement autorisé %s.\n"
 "Veuillez réessayer."
 
-#: ../src/frogr-controller.c:669
-#, c-format
+#: src/frogr-controller.c:669
 msgid ""
 "Invalid verification code.\n"
 "Please try again."
@@ -302,8 +309,7 @@ msgstr ""
 "Code de vérification non valide.\n"
 "Veuillez réessayer."
 
-#: ../src/frogr-controller.c:673
-#, c-format
+#: src/frogr-controller.c:673
 msgid ""
 "Error:\n"
 "Service not available"
@@ -311,64 +317,62 @@ msgstr ""
 "Erreur :\n"
 "Service indisponible"
 
-#. General error: just dump the raw error description
-#: ../src/frogr-controller.c:678
+#: src/frogr-controller.c:678
 #, c-format
 msgid "An error happened: %s."
 msgstr "Une erreur est survenue : %s."
 
-#: ../src/frogr-controller.c:883
+#: src/frogr-controller.c:883
 msgid "Authorization failed (timed out)"
 msgstr "Échec de l'autorisation (délai expiré)"
 
-#: ../src/frogr-controller.c:931
+#: src/frogr-controller.c:931
 #, c-format
 msgid "Retrying Upload (attempt %d/%d)…"
 msgstr "Nouvel essai d'envoi (tentative %d/%d)…"
 
-#: ../src/frogr-controller.c:936
+#: src/frogr-controller.c:936
 #, c-format
 msgid "Uploading '%s'…"
 msgstr "Envoi de « %s »…"
 
-#: ../src/frogr-controller.c:2242
+#: src/frogr-controller.c:2242
 msgid "Updating credentials…"
 msgstr "Mise à jour des informations d'identification…"
 
-#: ../src/frogr-controller.c:2247
+#: src/frogr-controller.c:2247
 msgid "Retrieving data for authorization…"
 msgstr "Récupération des données pour l'autorisation…"
 
-#: ../src/frogr-controller.c:2252
+#: src/frogr-controller.c:2252
 msgid "Finishing authorization…"
 msgstr "Fin de l'autorisation…"
 
-#: ../src/frogr-controller.c:2257
+#: src/frogr-controller.c:2257
 msgid "Retrieving list of sets…"
 msgstr "Récupération de la liste des albums…"
 
-#: ../src/frogr-controller.c:2262
+#: src/frogr-controller.c:2262
 msgid "Retrieving list of groups…"
 msgstr "Récupération de la liste des groupes…"
 
-#: ../src/frogr-controller.c:2267
+#: src/frogr-controller.c:2267
 msgid "Retrieving list of tags…"
 msgstr "Récupération de la liste des étiquettes…"
 
-#: ../src/frogr-controller.c:2292
-#, c-format
+#: src/frogr-controller.c:2292
 msgid "Fetching information"
 msgstr "Récupération des informations"
 
-#: ../src/frogr-controller.c:2398
+#: src/frogr-controller.c:2398
 msgid "No sets found"
 msgstr "Aucun album trouvé"
 
-#: ../src/frogr-controller.c:2423
+#: src/frogr-controller.c:2423
 msgid "No groups found"
 msgstr "Aucun groupe trouvé"
 
-#: ../src/frogr-controller.c:2984
+#: src/frogr-controller.c:2984
 #, c-format
 msgid ""
 "You need to properly authorize %s before uploading any pictures to Flickr.\n"
@@ -377,187 +381,183 @@ msgstr ""
 "Vous devez donner l'autorisation à %s avant l'envoi d'images vers Flickr.\n"
 "Veuillez l'autoriser à nouveau."
 
-#: ../src/frogr-controller.c:2994
-#, c-format
+#: src/frogr-controller.c:2994
 msgid "You need to be connected before uploading any pictures to Flickr."
 msgstr "Vous devez être connecté avant l'envoi d'images vers Flickr."
 
-#: ../src/frogr-controller.c:3012
+#: src/frogr-controller.c:3012
 msgid "Uploading Pictures"
 msgstr "Envoi des images"
 
-#: ../src/frogr-controller.c:3057
-#, c-format
+#: src/frogr-controller.c:3057
 msgid "Error opening project file"
 msgstr "Erreur pendant l'ouverture du fichier projet"
 
-#. This shows a dialog notifying the problem to the user
-#: ../src/frogr-create-new-set-dialog.c:143 ../src/frogr-details-dialog.c:1001
+#: src/frogr-create-new-set-dialog.c:143 src/frogr-details-dialog.c:1001
 msgid "Missing data required"
 msgstr "Données manquantes requises"
 
-#: ../src/frogr-create-new-set-dialog.c:326
+#: src/frogr-create-new-set-dialog.c:326
 msgid "Title:"
 msgstr "Titre :"
 
-#: ../src/frogr-create-new-set-dialog.c:335
+#: src/frogr-create-new-set-dialog.c:335
 msgid "Description:"
 msgstr "Description :"
 
-#: ../src/frogr-create-new-set-dialog.c:356
+#: src/frogr-create-new-set-dialog.c:356
 msgid "Fill Pictures Details with Title and Description"
 msgstr "Compléter les informations d'images avec le titre et la description"
 
-#: ../src/frogr-create-new-set-dialog.c:381
+#: src/frogr-create-new-set-dialog.c:381
 msgid "Create New Set"
 msgstr "Créer un nouvel album"
 
-#: ../src/frogr-details-dialog.c:89 ../src/frogr-settings-dialog.c:97
+#: src/frogr-details-dialog.c:89 src/frogr-settings-dialog.c:97
 msgid "Default (as specified in Flickr)"
 msgstr "Par défaut (comme défini dans Flickr)"
 
-#: ../src/frogr-details-dialog.c:90 ../src/frogr-settings-dialog.c:98
+#: src/frogr-details-dialog.c:90 src/frogr-settings-dialog.c:98
 msgid "All rights reserved"
 msgstr "Tous droits réservés"
 
-#: ../src/frogr-details-dialog.c:91 ../src/frogr-settings-dialog.c:99
+#: src/frogr-details-dialog.c:91 src/frogr-settings-dialog.c:99
 msgid "CC Attribution-NonCommercial-ShareAlike"
 msgstr "CC Paternité-Pas d'utilisation commerciale-Partage à l'identique"
 
-#: ../src/frogr-details-dialog.c:92 ../src/frogr-settings-dialog.c:100
+#: src/frogr-details-dialog.c:92 src/frogr-settings-dialog.c:100
 msgid "CC Attribution-NonCommercial"
 msgstr "CC Paternité-Pas d'utilisation commerciale"
 
-#: ../src/frogr-details-dialog.c:93 ../src/frogr-settings-dialog.c:101
+#: src/frogr-details-dialog.c:93 src/frogr-settings-dialog.c:101
 msgid "CC Attribution-NonCommercial-NoDerivs"
 msgstr "CC Paternité-Pas d'utilisation commerciale-Pas de modification"
 
-#: ../src/frogr-details-dialog.c:94 ../src/frogr-settings-dialog.c:102
+#: src/frogr-details-dialog.c:94 src/frogr-settings-dialog.c:102
 msgid "CC Attribution"
 msgstr "CC Paternité"
 
-#: ../src/frogr-details-dialog.c:95 ../src/frogr-settings-dialog.c:103
+#: src/frogr-details-dialog.c:95 src/frogr-settings-dialog.c:103
 msgid "CC Attribution-ShareAlike"
 msgstr "CC Paternité-Partage à l'identique"
 
-#: ../src/frogr-details-dialog.c:96 ../src/frogr-settings-dialog.c:104
+#: src/frogr-details-dialog.c:96 src/frogr-settings-dialog.c:104
 msgid "CC Attribution-NoDerivs"
 msgstr "CC Paternité-Pas de modification"
 
-#: ../src/frogr-details-dialog.c:172
+#: src/frogr-details-dialog.c:172
 msgid "Open with image viewer"
 msgstr "Ouvrir avec le visionneur d'image"
 
-#: ../src/frogr-details-dialog.c:190
+#: src/frogr-details-dialog.c:190
 msgid "_Title:"
 msgstr "_Titre :"
 
-#: ../src/frogr-details-dialog.c:200
+#: src/frogr-details-dialog.c:200
 msgid "_Description:"
 msgstr "_Description :"
 
-#: ../src/frogr-details-dialog.c:224
+#: src/frogr-details-dialog.c:224
 msgid "Ta_gs:"
 msgstr "Éti_quettes :"
 
-#: ../src/frogr-details-dialog.c:247
+#: src/frogr-details-dialog.c:247
 msgid "Visibility"
 msgstr "Visibilité"
 
-#: ../src/frogr-details-dialog.c:257 ../src/frogr-settings-dialog.c:196
+#: src/frogr-details-dialog.c:257 src/frogr-settings-dialog.c:196
 msgid "_Private"
 msgstr "_Privé"
 
-#: ../src/frogr-details-dialog.c:261 ../src/frogr-settings-dialog.c:199
+#: src/frogr-details-dialog.c:261 src/frogr-settings-dialog.c:199
 msgid "P_ublic"
 msgstr "P_ublic"
 
-#: ../src/frogr-details-dialog.c:270 ../src/frogr-settings-dialog.c:207
+#: src/frogr-details-dialog.c:270 src/frogr-settings-dialog.c:207
 msgid "_Family"
 msgstr "Fa_mille"
 
-#: ../src/frogr-details-dialog.c:274 ../src/frogr-settings-dialog.c:209
+#: src/frogr-details-dialog.c:274 src/frogr-settings-dialog.c:209
 msgid "F_riends"
 msgstr "Am_is"
 
-#: ../src/frogr-details-dialog.c:288
+#: src/frogr-details-dialog.c:288
 msgid "Content Type"
 msgstr "Type de contenu"
 
-#: ../src/frogr-details-dialog.c:296 ../src/frogr-settings-dialog.c:234
+#: src/frogr-details-dialog.c:296 src/frogr-settings-dialog.c:234
 msgid "P_hoto"
 msgstr "P_hoto"
 
-#: ../src/frogr-details-dialog.c:300 ../src/frogr-settings-dialog.c:236
+#: src/frogr-details-dialog.c:300 src/frogr-settings-dialog.c:236
 msgid "Scree_nshot"
 msgstr "_Capture"
 
-#: ../src/frogr-details-dialog.c:304 ../src/frogr-settings-dialog.c:238
+#: src/frogr-details-dialog.c:304 src/frogr-settings-dialog.c:238
 msgid "Oth_er"
 msgstr "_Autre"
 
-#: ../src/frogr-details-dialog.c:317
+#: src/frogr-details-dialog.c:317
 msgid "Safety Level"
 msgstr "Niveau de sécurité"
 
-#: ../src/frogr-details-dialog.c:325 ../src/frogr-settings-dialog.c:260
+#: src/frogr-details-dialog.c:325 src/frogr-settings-dialog.c:260
 msgid "S_afe"
 msgstr "_Sécurisé"
 
-#: ../src/frogr-details-dialog.c:329 ../src/frogr-settings-dialog.c:262
+#: src/frogr-details-dialog.c:329 src/frogr-settings-dialog.c:262
 msgid "_Moderate"
 msgstr "_Modéré"
 
-#: ../src/frogr-details-dialog.c:333 ../src/frogr-settings-dialog.c:264
+#: src/frogr-details-dialog.c:333 src/frogr-settings-dialog.c:264
 msgid "Restr_icted"
 msgstr "_Restreint"
 
-#: ../src/frogr-details-dialog.c:345
+#: src/frogr-details-dialog.c:345
 msgid "License Type"
 msgstr "Type de licence"
 
-#: ../src/frogr-details-dialog.c:367
+#: src/frogr-details-dialog.c:367
 msgid "Other Properties"
 msgstr "Autres propriétés"
 
-#: ../src/frogr-details-dialog.c:375
+#: src/frogr-details-dialog.c:375
 msgid "_Show Up in Global Search Results"
 msgstr "_Montrer dans les résultats de recherche globaux"
 
-#: ../src/frogr-details-dialog.c:379
+#: src/frogr-details-dialog.c:379
 msgid "Set Geo_location Information"
 msgstr "Définir les informations de géo_localisation"
 
-#: ../src/frogr-details-dialog.c:383
+#: src/frogr-details-dialog.c:383
 msgid "Replace 'Date Posted' with 'Date Taken'"
 msgstr "Remplacer la « date de publication » par la « date de prise de vue »"
 
-#. Visually indicate how many pictures are being edited
-#: ../src/frogr-details-dialog.c:475
+#: src/frogr-details-dialog.c:475
 #, c-format
 msgid "(%d Picture)"
 msgid_plural "(%d Pictures)"
 msgstr[0] "(%d image)"
 msgstr[1] "(%d images)"
 
-#: ../src/frogr-details-dialog.c:548
+#: src/frogr-details-dialog.c:548
 msgid "An error happened trying to load the picture"
 msgstr "Une erreur est survenue lors du chargement de l'image"
 
-#: ../src/frogr-details-dialog.c:1169 ../data/gtkbuilder/frogr-menu-bar.xml.h:8
+#: src/frogr-details-dialog.c:1169
 msgid "_Edit"
 msgstr "_Édition"
 
-#: ../src/frogr-details-dialog.c:1197
+#: src/frogr-details-dialog.c:1197
 msgid "Edit Picture Details"
 msgstr "Modifier les informations d'une image"
 
-#: ../src/frogr-file-loader.c:142
+#: src/frogr-file-loader.c:142
 #, c-format
 msgid "Loading files %d / %d"
 msgstr "Chargement des fichiers %d / %d"
 
-#: ../src/frogr-file-loader.c:369
+#: src/frogr-file-loader.c:369
 #, c-format
 msgid ""
 "Unable to load picture %s:\n"
@@ -566,7 +566,7 @@ msgstr ""
 "Impossible de charger l'image %s :\n"
 "%s"
 
-#: ../src/frogr-file-loader.c:400
+#: src/frogr-file-loader.c:400
 #, c-format
 msgid ""
 "Unable to load video %s\n"
@@ -575,10 +575,7 @@ msgstr ""
 "Impossible de charger la vidéo %s\n"
 "Veuillez vérifier que vous avez les bons codecs installés"
 
-#. First %s is the title of the picture (filename of the file by
-#. default). Second %s is the max allowed size for a picture to be
-#. uploaded to flickr (different for free and PRO accounts).
-#: ../src/frogr-file-loader.c:636
+#: src/frogr-file-loader.c:636
 #, c-format
 msgid ""
 "Can't load file %s:\n"
@@ -587,371 +584,307 @@ msgstr ""
 "Impossible de charger le fichier %s :\n"
 "la taille du fichier est supérieure au maximum autorisé pour ce compte (%s)"
 
-#. First create the left side buttons
-#: ../src/frogr-main-view.c:633 ../src/frogr-main-view.c:729
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
 msgid "Open"
 msgstr "Ouvrir"
 
-#: ../src/frogr-main-view.c:633 ../src/frogr-main-view.c:729
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
 msgid "Open Existing Project"
 msgstr "Ouvrir un projet existant"
 
-#: ../src/frogr-main-view.c:634 ../src/frogr-main-view.c:732
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
 msgid "Add"
 msgstr "Ajouter"
 
-#: ../src/frogr-main-view.c:634 ../src/frogr-main-view.c:732
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
 msgid "Add Elements"
 msgstr "Ajouter des éléments"
 
-#: ../src/frogr-main-view.c:635 ../src/frogr-main-view.c:733
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
 msgid "Remove"
 msgstr "Supprimer"
 
-#: ../src/frogr-main-view.c:635 ../src/frogr-main-view.c:733
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
 msgid "Remove Elements"
 msgstr "Supprime des éléments"
 
-#: ../src/frogr-main-view.c:636 ../src/frogr-main-view.c:735
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
 msgid "Upload"
 msgstr "Envoyer"
 
-#: ../src/frogr-main-view.c:636 ../src/frogr-main-view.c:735
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
 msgid "Upload All"
 msgstr "Tout envoyer"
 
-#. Save project item
-#: ../src/frogr-main-view.c:669 ../src/frogr-main-view.c:730
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
 msgid "Save"
 msgstr "Enregistrer"
 
-#: ../src/frogr-main-view.c:669 ../src/frogr-main-view.c:730
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
 msgid "Save Current Project"
 msgstr "Enregistrer le projet actuel"
 
-#: ../src/frogr-main-view.c:1019 ../data/gtkbuilder/frogr-app-menu.xml.h:4
+#: src/frogr-main-view.c:1016
 msgid "_About"
 msgstr "À _propos"
 
-#: ../src/frogr-main-view.c:1023 ../data/gtkbuilder/frogr-app-menu.xml.h:5
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:17
+#: src/frogr-main-view.c:1020
 msgid "_Quit"
 msgstr "_Quitter"
 
-#. Create the submenu and insert it in the right section
-#: ../src/frogr-main-view.c:1073
+#: src/frogr-main-view.c:1070
 msgid "Accounts"
 msgstr "Comptes"
 
-#. String showind the date and time a picture was taken
-#: ../src/frogr-main-view.c:1413
+#: src/frogr-main-view.c:1410
 #, c-format
 msgid "Taken: %s"
 msgstr "Prise le : %s"
 
-#: ../src/frogr-main-view.c:1418
+#: src/frogr-main-view.c:1415
 #, c-format
 msgid "File size: %s"
 msgstr "Taille du fichier : %s"
 
-#: ../src/frogr-main-view.c:1543
+#: src/frogr-main-view.c:1540
 msgid "Select File"
 msgstr "Sélectionner un fichier"
 
-#: ../src/frogr-main-view.c:1547 ../src/frogr-main-view.c:1674
+#: src/frogr-main-view.c:1544 src/frogr-main-view.c:1671
 msgid "_Open"
 msgstr "_Ouvrir"
 
-#: ../src/frogr-main-view.c:1556
+#: src/frogr-main-view.c:1553
 msgid "Frogr Project Files"
 msgstr "Fichier projet Frogr"
 
-#: ../src/frogr-main-view.c:1618
+#: src/frogr-main-view.c:1615
 msgid "Select Destination"
 msgstr "Sélectionner une destination"
 
-#: ../src/frogr-main-view.c:1622 ../data/gtkbuilder/frogr-menu-bar.xml.h:3
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:1
+#: src/frogr-main-view.c:1619
 msgid "_Save"
 msgstr "_Enregistrer"
 
-#: ../src/frogr-main-view.c:1625
+#: src/frogr-main-view.c:1622
 msgid "Untitled Project.frogr"
 msgstr "Projet sans titre.frogr"
 
-#: ../src/frogr-main-view.c:1670
+#: src/frogr-main-view.c:1667
 msgid "Select a Picture"
 msgstr "Sélectionner une image"
 
-#: ../src/frogr-main-view.c:1697
+#: src/frogr-main-view.c:1694
 msgid "All Files"
 msgstr "Tous les fichiers"
 
-#: ../src/frogr-main-view.c:1700
+#: src/frogr-main-view.c:1697
 msgid "Image Files"
 msgstr "Fichiers images"
 
-#: ../src/frogr-main-view.c:1704
+#: src/frogr-main-view.c:1701
 msgid "Video Files"
 msgstr "Fichiers vidéos"
 
-#: ../src/frogr-main-view.c:1726
+#: src/frogr-main-view.c:1723
 msgid "You don't have any picture added yet"
 msgstr "Vous n'avez pas encore ajouté d'image"
 
-#: ../src/frogr-main-view.c:1739
+#: src/frogr-main-view.c:1736
 msgid "You need to select some pictures first"
 msgstr "Vous devez d'abord sélectionner des images"
 
-#: ../src/frogr-main-view.c:2174
+#: src/frogr-main-view.c:2108
 msgid "Not connected to Flickr"
 msgstr "Non connecté à Flickr"
 
-#. Login string, showing the user is PRO (second '%s') if so.
-#: ../src/frogr-main-view.c:2184
+#: src/frogr-main-view.c:2118
 #, c-format
 msgid "Connected as %s%s"
 msgstr "Connecté en tant que %s%s"
 
-#: ../src/frogr-main-view.c:2185
+#: src/frogr-main-view.c:2119
 msgid " (PRO account)"
 msgstr "(compte PRO)"
 
-#. Will show in the status bar the amount of data (in KB, MB
-#. or GB) the user is currently allowed to upload to flicker
-#. till the end of the month, in a CURRENT / MAX fashion.
-#. The '-' at the beginning is just a separator, since more
-#. blocks of text will be shown in the status bar too.
-#: ../src/frogr-main-view.c:2209
+#: src/frogr-main-view.c:2143
 #, c-format
 msgid " - %s / %s remaining"
 msgstr " - %s / %s restant"
 
-#. Will show in the status bar the amount of pictures and data
-#. (in KB, MB or GB) that would be uploaded as the sum of the
-#. sizes for every picture loaded in the application
-#: ../src/frogr-main-view.c:2235
+#: src/frogr-main-view.c:2169
 #, c-format
 msgid " - %d file to upload (%s)"
 msgid_plural " - %d files to upload (%s)"
 msgstr[0] " - %d fichier à envoyer (%s)"
 msgstr[1] " - %d fichiers à envoyer (%s)"
 
-#: ../src/frogr-settings-dialog.c:185
+#: src/frogr-settings-dialog.c:185
 msgid "Default Visibility"
 msgstr "Visibilité par défaut"
 
-#: ../src/frogr-settings-dialog.c:224
+#: src/frogr-settings-dialog.c:224
 msgid "Default Content Type"
 msgstr "Type de contenu par défaut"
 
-#: ../src/frogr-settings-dialog.c:250
+#: src/frogr-settings-dialog.c:250
 msgid "Default Safety Level"
 msgstr "Niveau de sécurité par défaut"
 
-#: ../src/frogr-settings-dialog.c:276
+#: src/frogr-settings-dialog.c:276
 msgid "Default License"
 msgstr "Licence par défaut"
 
-#: ../src/frogr-settings-dialog.c:302
+#: src/frogr-settings-dialog.c:302
 msgid "Other Defaults"
 msgstr "Autres paramètres par défaut"
 
-#: ../src/frogr-settings-dialog.c:312
+#: src/frogr-settings-dialog.c:312
 msgid "_Show Pictures in Global Search Results"
 msgstr "_Montrer les images dans les résultats de recherche globaux"
 
-#: ../src/frogr-settings-dialog.c:315
+#: src/frogr-settings-dialog.c:315
 msgid "Set Geo_location Information for Pictures"
 msgstr "Définir les informations de géo_localisation des images…"
 
-#: ../src/frogr-settings-dialog.c:318
+#: src/frogr-settings-dialog.c:318
 msgid "Replace 'Date Posted' with 'Date Taken' for Pictures"
-msgstr "Remplacer la « date de publication » par la « date de prise de vue » pour les images"
+msgstr ""
+"Remplacer la « date de publication » par la « date de prise de vue » pour "
+"les images"
 
-#: ../src/frogr-settings-dialog.c:324
+#: src/frogr-settings-dialog.c:324
 msgid "_General"
 msgstr "_Général"
 
-#: ../src/frogr-settings-dialog.c:344
+#: src/frogr-settings-dialog.c:344
 msgid "Proxy Settings"
 msgstr "Paramètres du serveur mandataire"
 
-#. Enable proxy
-#: ../src/frogr-settings-dialog.c:353
+#: src/frogr-settings-dialog.c:353
 msgid "_Enable HTTP Proxy"
 msgstr "_Activer le serveur mandataire HTTP"
 
-#: ../src/frogr-settings-dialog.c:363
+#: src/frogr-settings-dialog.c:363
 msgid "_Host:"
 msgstr "_Hôte :"
 
-#. Proxy port
-#: ../src/frogr-settings-dialog.c:376
+#: src/frogr-settings-dialog.c:376
 msgid "_Port:"
 msgstr "_Port :"
 
-#. Proxy username
-#: ../src/frogr-settings-dialog.c:389
+#: src/frogr-settings-dialog.c:389
 msgid "U_sername:"
 msgstr "Nom d'_utilisateur :"
 
-#. Proxy password
-#: ../src/frogr-settings-dialog.c:402
+#: src/frogr-settings-dialog.c:402
 msgid "Pass_word:"
 msgstr "Mot _de passe :"
 
-#: ../src/frogr-settings-dialog.c:426
+#: src/frogr-settings-dialog.c:426
 msgid "Connec_tion"
 msgstr "Conne_xion"
 
-#: ../src/frogr-settings-dialog.c:444
+#: src/frogr-settings-dialog.c:444
 msgid "Other options"
 msgstr "Autres options"
 
-#: ../src/frogr-settings-dialog.c:454
+#: src/frogr-settings-dialog.c:454
 msgid "Ena_ble Tags Auto-Completion"
 msgstr "Ac_tiver l'autocomplétion des étiquettes"
 
-#: ../src/frogr-settings-dialog.c:457
+#: src/frogr-settings-dialog.c:457
 msgid "_Import Tags from Pictures Metadata"
 msgstr "_Importer les étiquettes à partir des métadonnées des images"
 
-#: ../src/frogr-settings-dialog.c:461
+#: src/frogr-settings-dialog.c:461
 msgid "Use _Dark GTK Theme"
 msgstr "Utiliser le thème _Dark de GTK"
 
-#: ../src/frogr-settings-dialog.c:465
+#: src/frogr-settings-dialog.c:465
 msgid "_Keep File Extensions in Titles when Loading"
 msgstr ""
 "_Conserver les extensions de fichiers dans les titres lors du chargement"
 
-#: ../src/frogr-settings-dialog.c:471
+#: src/frogr-settings-dialog.c:471
 msgid "_Misc"
 msgstr "_Divers"
 
-#: ../src/frogr-settings-dialog.c:972
+#: src/frogr-settings-dialog.c:972
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:1
-msgid "Aut_horize Account…"
-msgstr "Auto_riser le compte…"
-
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:2
-msgid "_Preferences…"
-msgstr "_Paramètres…"
-
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:3
-msgid "_Help"
-msgstr "Aid_e"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:1
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:9
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:3
-msgid "_Edit Details…"
-msgstr "Modifier les _informations…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:2
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:10
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:4
-msgid "Add _Tags…"
-msgstr "A_jouter des étiquettes…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:3
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:11
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:5
-msgid "Add to _Group…"
-msgstr "Ajouter au _groupe…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:4
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:12
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:6
-msgid "Add to _Photoset"
-msgstr "Ajouter à l'a_lbum"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:5
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:13
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:7
-msgid "_Add to Existing Photoset…"
-msgstr "Ajouter à un album _existant…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:6
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:14
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:8
-msgid "_Create New Photoset…"
-msgstr "Créer un _nouvel album…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:7
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:15
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:16
-msgid "_Open in External Viewer"
-msgstr "Ouvrir dans un afficheur e_xterne"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:8
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:6
-msgid "_Remove Elements"
-msgstr "_Supprimer des éléments"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:1
-msgid "_File"
-msgstr "_Fichier"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:2
-msgid "_Open…"
-msgstr "_Ouvrir"
+#~ msgid "Aut_horize Account…"
+#~ msgstr "Auto_riser le compte…"
+
+#~ msgid "_Preferences…"
+#~ msgstr "_Paramètres…"
+
+#~ msgid "_Help"
+#~ msgstr "Aid_e"
+
+#~ msgid "_Edit Details…"
+#~ msgstr "Modifier les _informations…"
+
+#~ msgid "Add _Tags…"
+#~ msgstr "A_jouter des étiquettes…"
+
+#~ msgid "Add to _Group…"
+#~ msgstr "Ajouter au _groupe…"
+
+#~ msgid "Add to _Photoset"
+#~ msgstr "Ajouter à l'a_lbum"
+
+#~ msgid "_Add to Existing Photoset…"
+#~ msgstr "Ajouter à un album _existant…"
+
+#~ msgid "_Create New Photoset…"
+#~ msgstr "Créer un _nouvel album…"
+
+#~ msgid "_Open in External Viewer"
+#~ msgstr "Ouvrir dans un afficheur e_xterne"
+
+#~ msgid "_Remove Elements"
+#~ msgstr "_Supprimer des éléments"
+
+#~ msgid "_File"
+#~ msgstr "_Fichier"
+
+#~ msgid "_Open…"
+#~ msgstr "_Ouvrir"
+
+#~ msgid "Save _As…"
+#~ msgstr "Enregistrer _sous…"
+
+#~ msgid "A_dd Elements…"
+#~ msgstr "Aj_outer les éléments…"
+
+#~ msgid "_Upload All"
+#~ msgstr "Tout _envoyer"
+
+#~ msgid "_View"
+#~ msgstr "_Affichage"
+
+#~ msgid "_Sort Elements"
+#~ msgstr "_Trier les éléments"
+
+#~ msgid "As _Loaded"
+#~ msgstr "Par _ordre de chargement"
+
+#~ msgid "By _Date Taken"
+#~ msgstr "Par _date de prise"
+
+#~ msgid "By _Title"
+#~ msgstr "Par _titre"
+
+#~ msgid "By _Size"
+#~ msgstr "Par t_aille"
+
+#~ msgid "_Reversed Order"
+#~ msgstr "Ordre _inverse"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:4
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:2
-msgid "Save _As…"
-msgstr "Enregistrer _sous…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:5
-msgid "A_dd Elements…"
-msgstr "Aj_outer les éléments…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:7
-msgid "_Upload All"
-msgstr "Tout _envoyer"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:16
-msgid "_View"
-msgstr "_Affichage"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:17
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:9
-msgid "_Sort Elements"
-msgstr "_Trier les éléments"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:18
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:10
-msgid "As _Loaded"
-msgstr "Par _ordre de chargement"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:19
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:11
-msgid "By _Date Taken"
-msgstr "Par _date de prise"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:20
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:12
-msgid "By _Title"
-msgstr "Par _titre"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:21
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:13
-msgid "By _Size"
-msgstr "Par t_aille"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:22
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:14
-msgid "_Reversed Order"
-msgstr "Ordre _inverse"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:23
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:15
-msgid "Enable _Tooltips"
-msgstr "Activer les info_bulles"
+#~ msgid "Enable _Tooltips"
+#~ msgstr "Activer les info_bulles"
 
 #~ msgid "Visible to _Family"
 #~ msgstr "Visible pour la _famille"
diff --git a/po/gl.po b/po/gl.po
index c223857..ecc9673 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: frogr 0.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-03 02:23+0100\n"
+"Report-Msgid-Bugs-To: msanchez gnome org\n"
+"POT-Creation-Date: 2016-08-12 13:09+0100\n"
 "PO-Revision-Date: 2014-01-03 02:25+0200\n"
 "Last-Translator: Fran Dieguez <frandieguez gnome org>\n"
 "Language-Team: gnome-l10n-gl gnome org\n"
@@ -18,20 +18,26 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Virtaal 0.7.1\n"
 
-#: ../data/frogr.appdata.xml.in.h:1 ../data/frogr.desktop.in.in.h:2
-msgid "Frogr: a Flickr Remote Organizer for GNOME"
+#: data/frogr.appdata.xml.in:5 data/frogr.desktop.in.in:5
+#: data/frogr.desktop.in.in:14
+msgid "frogr"
+msgstr "frogr"
+
+#: data/frogr.appdata.xml.in:6 data/frogr.desktop.in.in:6
+#, fuzzy
+msgid "frogr: a Flickr Remote Organizer for GNOME"
 msgstr "Frogr: Un organizador remoto de Flickr para GNOME"
 
-#: ../data/frogr.appdata.xml.in.h:2
+#: data/frogr.appdata.xml.in:8
+#, fuzzy
 msgid ""
-"Frogr is a small application for the GNOME desktop that allows users to "
+"frogr is a small application for the GNOME desktop that allows users to "
 "manage their accounts in the Flickr image hosting website."
 msgstr ""
 "Frogr é un pequeno aplicativo para o escritorio GNOME que lle permite aos "
-"usuarios xestionar as súas contas do sitio de almacenamento de imaxes "
-"Flickr."
+"usuarios xestionar as súas contas do sitio de almacenamento de imaxes Flickr."
 
-#: ../data/frogr.appdata.xml.in.h:3
+#: data/frogr.appdata.xml.in:13
 msgid ""
 "It supports all the basic Flickr features, including uploading pictures, "
 "adding descriptions, setting tags and managing sets and groups pools."
@@ -40,99 +46,103 @@ msgstr ""
 "subida de imaxes, engadir descricións, estabelecer etiquetas e xestionar "
 "lotes de conxuntos ou grupos."
 
-#: ../data/frogr.desktop.in.in.h:1
-msgid "Frogr"
-msgstr "Frogr"
+#: data/frogr.appdata.xml.in:24
+#, fuzzy
+msgid "Screenshot of frogr"
+msgstr "Captura de _pantalla"
 
-#: ../data/frogr.desktop.in.in.h:3
+#: data/frogr.appdata.xml.in:29
+msgid "Mario Sanchez Prada"
+msgstr ""
+
+#: data/frogr.desktop.in.in:7
 msgid "Upload and organize photos in Flickr accounts"
 msgstr "Suba e organice as fotos das súas contas de Flickr"
 
-#: ../data/frogr.desktop.in.in.h:4
+#: data/frogr.desktop.in.in:8
 msgid "Flickr;Image;Picture;Photo;Video;Uploader;"
 msgstr "Flickr;Imaxe;Fotografía;Foto;Vídeo;Cargador;"
 
-#: ../src/frogr-about-dialog.c:43
-msgid "A Flickr remote organizer for GNOME\n"
+#: src/frogr-about-dialog.c:43
+#, fuzzy
+msgid "A Flickr Remote Organizer for GNOME\n"
 msgstr "Un organizador remoto de Flickr para GNOME\n"
 
-#: ../src/frogr-about-dialog.c:72
+#: src/frogr-about-dialog.c:72
 msgid "translator-credits"
 msgstr "Fran Diéguez <frandieguez ubuntu com>"
 
-#: ../src/frogr-add-tags-dialog.c:198 ../src/frogr-add-to-set-dialog.c:553
-#: ../src/frogr-add-to-group-dialog.c:552
-#: ../src/frogr-create-new-set-dialog.c:328 ../src/frogr-details-dialog.c:1194
-#: ../src/frogr-main-view.c:469 ../src/frogr-main-view.c:1378
-#: ../src/frogr-main-view.c:1455 ../src/frogr-main-view.c:1505
-#: ../src/frogr-settings-dialog.c:1002
+#: src/frogr-add-tags-dialog.c:191 src/frogr-add-to-group-dialog.c:528
+#: src/frogr-add-to-set-dialog.c:529 src/frogr-auth-dialog.c:153
+#: src/frogr-create-new-set-dialog.c:310 src/frogr-details-dialog.c:1168
+#: src/frogr-main-view.c:1543 src/frogr-main-view.c:1618
+#: src/frogr-main-view.c:1670 src/frogr-settings-dialog.c:930
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../src/frogr-add-tags-dialog.c:200 ../src/frogr-add-to-set-dialog.c:555
-#: ../src/frogr-add-to-group-dialog.c:554
-#: ../src/frogr-create-new-set-dialog.c:330
+#: src/frogr-add-tags-dialog.c:193 src/frogr-add-to-group-dialog.c:530
+#: src/frogr-add-to-set-dialog.c:531 src/frogr-create-new-set-dialog.c:312
 msgid "_Add"
 msgstr "_Engadir"
 
-#: ../src/frogr-add-tags-dialog.c:207
+#: src/frogr-add-tags-dialog.c:202
 msgid "Enter a spaces separated list of tags:"
 msgstr "Escriba unha lista de etiquetas separadas por espacios:"
 
-#: ../src/frogr-add-tags-dialog.c:230
+#: src/frogr-add-tags-dialog.c:228
 msgid "Add Tags"
 msgstr "Engadir etiquetas"
 
-#: ../src/frogr-add-to-set-dialog.c:155
-msgid "Title"
-msgstr "Título"
+#: src/frogr-add-to-group-dialog.c:147
+msgid "Name"
+msgstr "Nome"
 
-#: ../src/frogr-add-to-set-dialog.c:170 ../src/frogr-add-to-group-dialog.c:169
+#: src/frogr-add-to-group-dialog.c:162 src/frogr-add-to-set-dialog.c:163
 msgid "Elements"
 msgstr "Elementos"
 
-#: ../src/frogr-add-to-set-dialog.c:604
-msgid "Add to Sets"
-msgstr "Engadir aos álbums"
-
-#: ../src/frogr-add-to-group-dialog.c:154
-msgid "Name"
-msgstr "Nome"
-
-#: ../src/frogr-add-to-group-dialog.c:603
+#: src/frogr-add-to-group-dialog.c:581
 msgid "Add to Groups"
 msgstr "Engadir aos grupos"
 
-#: ../src/frogr-auth-dialog.c:52
+#: src/frogr-add-to-set-dialog.c:148
+msgid "Title"
+msgstr "Título"
+
+#: src/frogr-add-to-set-dialog.c:582
+msgid "Add to Sets"
+msgstr "Engadir aos álbums"
+
+#: src/frogr-auth-dialog.c:59
 #, c-format
 msgid ""
 "Please press the button to authorize %s and then come back to complete the "
 "process."
 msgstr "Prema o botón autorizar %s e logo volva para completar o proceso."
 
-#: ../src/frogr-auth-dialog.c:56 ../src/frogr-auth-dialog.c:141
+#: src/frogr-auth-dialog.c:63 src/frogr-auth-dialog.c:149
+#: src/frogr-controller.c:2286
 #, c-format
 msgid "Authorize %s"
 msgstr "Autorizar %s"
 
-#: ../src/frogr-auth-dialog.c:145 ../src/frogr-settings-dialog.c:1004
+#: src/frogr-auth-dialog.c:155 src/frogr-settings-dialog.c:932
 msgid "_Close"
 msgstr "_Pechar"
 
-#. Description label
-#: ../src/frogr-auth-dialog.c:158
+#: src/frogr-auth-dialog.c:167
 msgid "Enter verification code:"
 msgstr "Escriba o código de verificación:"
 
-#: ../src/frogr-auth-dialog.c:209
+#: src/frogr-auth-dialog.c:221
 msgid "Invalid verification code"
 msgstr "Código de verificación non válido"
 
-#: ../src/frogr-controller.c:593
+#: src/frogr-controller.c:581
 msgid "Process cancelled"
 msgstr "Proceso cancelado"
 
-#: ../src/frogr-controller.c:598
+#: src/frogr-controller.c:586
 msgid ""
 "Connection error:\n"
 "Network not available"
@@ -140,7 +150,7 @@ msgstr ""
 "Erro de conexión:\n"
 "A rede non dispoñíbel"
 
-#: ../src/frogr-controller.c:602
+#: src/frogr-controller.c:590
 msgid ""
 "Connection error:\n"
 "Bad request"
@@ -148,7 +158,7 @@ msgstr ""
 "Erro de conexión:\n"
 "A solicitude non é válida"
 
-#: ../src/frogr-controller.c:606
+#: src/frogr-controller.c:594
 msgid ""
 "Connection error:\n"
 "Server-side error"
@@ -156,7 +166,7 @@ msgstr ""
 "Erro de conexión:\n"
 "Produciuse un problema no servidor remoto"
 
-#: ../src/frogr-controller.c:610
+#: src/frogr-controller.c:598
 msgid ""
 "Error uploading:\n"
 "File invalid"
@@ -164,7 +174,7 @@ msgstr ""
 "Erro na subida:\n"
 "O ficheiro non é válido"
 
-#: ../src/frogr-controller.c:614
+#: src/frogr-controller.c:602
 msgid ""
 "Error uploading picture:\n"
 "Quota exceeded"
@@ -172,14 +182,14 @@ msgstr ""
 "Erro ao subir a imaxe:\n"
 "Vostede excedeu a cota de espazo"
 
-#: ../src/frogr-controller.c:619
+#: src/frogr-controller.c:607
 #, c-format
 msgid "Quota exceeded (limit: %d video per month)"
 msgid_plural "Quota exceeded (limit: %d videos per month)"
 msgstr[0] "Cota excedida (límite: %d vídeo por mes)"
 msgstr[1] "Cota excedida (límite: %d vídeos por mes)"
 
-#: ../src/frogr-controller.c:623
+#: src/frogr-controller.c:611
 msgid ""
 "Error uploading video:\n"
 "You can't upload more videos with this account"
@@ -187,7 +197,7 @@ msgstr ""
 "Erro ao subir o vídeo:\n"
 "Non pode subir máis vídeos con esta conta"
 
-#: ../src/frogr-controller.c:629
+#: src/frogr-controller.c:617
 msgid ""
 "Error:\n"
 "Photo not found"
@@ -195,7 +205,7 @@ msgstr ""
 "Erro:\n"
 "A foto non se encontrou"
 
-#: ../src/frogr-controller.c:633
+#: src/frogr-controller.c:621
 msgid ""
 "Error:\n"
 "Photo already in photoset"
@@ -203,7 +213,7 @@ msgstr ""
 "Erro:\n"
 "A foto xa está no álbum de fotos"
 
-#: ../src/frogr-controller.c:637
+#: src/frogr-controller.c:625
 msgid ""
 "Error:\n"
 "Photo already in group"
@@ -211,7 +221,7 @@ msgstr ""
 "Erro:\n"
 "A foto xa está no grupo"
 
-#: ../src/frogr-controller.c:641
+#: src/frogr-controller.c:629
 msgid ""
 "Error:\n"
 "Photo already in the maximum number of groups possible"
@@ -219,7 +229,7 @@ msgstr ""
 "Erro:\n"
 "A foto xa está no número máximo de grupos posíbeis"
 
-#: ../src/frogr-controller.c:645
+#: src/frogr-controller.c:633
 msgid ""
 "Error:\n"
 "Group limit already reached"
@@ -227,7 +237,7 @@ msgstr ""
 "Erro:\n"
 "Xa se alcanzou o límite de grupos"
 
-#: ../src/frogr-controller.c:649
+#: src/frogr-controller.c:637
 msgid ""
 "Error:\n"
 "Photo added to group's queue"
@@ -235,7 +245,7 @@ msgstr ""
 "Erro:\n"
 "A foto xa se engadiu á cola de grupos"
 
-#: ../src/frogr-controller.c:653
+#: src/frogr-controller.c:641
 msgid ""
 "Error:\n"
 "Photo already added to group's queue"
@@ -243,7 +253,7 @@ msgstr ""
 "Erro:\n"
 "A foto xa foi engadida á cola de grupos."
 
-#: ../src/frogr-controller.c:657
+#: src/frogr-controller.c:645
 msgid ""
 "Error:\n"
 "Content not allowed for this group"
@@ -251,8 +261,7 @@ msgstr ""
 "Erro:\n"
 "Contido non permitido neste grupo"
 
-#: ../src/frogr-controller.c:661
-#, c-format
+#: src/frogr-controller.c:649
 msgid ""
 "Authorization failed.\n"
 "Please try again"
@@ -260,7 +269,7 @@ msgstr ""
 "Produciuse un fallo na autorización.\n"
 "Ténteo de novo"
 
-#: ../src/frogr-controller.c:667
+#: src/frogr-controller.c:655
 #, c-format
 msgid ""
 "Error\n"
@@ -271,8 +280,7 @@ msgstr ""
 "%s non está autorizado por Flickr para subir vídeos de forma correcta.\n"
 "Tente facer a autorización de novo."
 
-#: ../src/frogr-controller.c:672
-#, c-format
+#: src/frogr-controller.c:660
 msgid ""
 "Unable to authenticate in Flickr\n"
 "Please try again."
@@ -280,7 +288,7 @@ msgstr ""
 "Produciuse un fallo ao autenticarse en flickr.\n"
 "Ténteo de novo."
 
-#: ../src/frogr-controller.c:676
+#: src/frogr-controller.c:664
 #, c-format
 msgid ""
 "You have not properly authorized %s yet.\n"
@@ -289,8 +297,7 @@ msgstr ""
 "Non foi autorizado de forma correcta en %s.\n"
 "Ténteo de novo."
 
-#: ../src/frogr-controller.c:681
-#, c-format
+#: src/frogr-controller.c:669
 msgid ""
 "Invalid verification code.\n"
 "Please try again."
@@ -298,8 +305,7 @@ msgstr ""
 "Código de verificación non válido.\n"
 "Ténteo de novo."
 
-#: ../src/frogr-controller.c:685
-#, c-format
+#: src/frogr-controller.c:673
 msgid ""
 "Error:\n"
 "Service not available"
@@ -307,59 +313,63 @@ msgstr ""
 "Erro:\n"
 "O servizo non esa dispoñíbel"
 
-#. General error: just dump the raw error description
-#: ../src/frogr-controller.c:690
+#: src/frogr-controller.c:678
 #, c-format
 msgid "An error happened: %s."
 msgstr "Produciuse un erro: %s"
 
-#: ../src/frogr-controller.c:906
+#: src/frogr-controller.c:883
 msgid "Authorization failed (timed out)"
 msgstr "Produciuse un fallo na autorización (tempo de espera máximo alcanzado)"
 
-#: ../src/frogr-controller.c:958
+#: src/frogr-controller.c:931
 #, c-format
 msgid "Retrying Upload (attempt %d/%d)…"
 msgstr "Retentando a subida (intento %d/%d)…"
 
-#: ../src/frogr-controller.c:963
+#: src/frogr-controller.c:936
 #, c-format
 msgid "Uploading '%s'…"
 msgstr "Subindo «%s»…"
 
-#: ../src/frogr-controller.c:2221
+#: src/frogr-controller.c:2242
 msgid "Updating credentials…"
 msgstr "Anovando credenciais…"
 
-#: ../src/frogr-controller.c:2226
+#: src/frogr-controller.c:2247
 msgid "Retrieving data for authorization…"
 msgstr "Obtendo datos para a autorización…"
 
-#: ../src/frogr-controller.c:2231
+#: src/frogr-controller.c:2252
 msgid "Finishing authorization…"
 msgstr "Rematando autorización…"
 
-#: ../src/frogr-controller.c:2236
+#: src/frogr-controller.c:2257
 msgid "Retrieving list of sets…"
 msgstr "Obtendo a lista de álbums…"
 
-#: ../src/frogr-controller.c:2241
+#: src/frogr-controller.c:2262
 msgid "Retrieving list of groups…"
 msgstr "Obtendo a lista de grupos…"
 
-#: ../src/frogr-controller.c:2246
+#: src/frogr-controller.c:2267
 msgid "Retrieving list of tags…"
 msgstr "Obtendo a lista de etiquetas…"
 
-#: ../src/frogr-controller.c:2363
+#: src/frogr-controller.c:2292
+#, fuzzy
+msgid "Fetching information"
+msgstr "Estabelecer a información de xeolocalización"
+
+#: src/frogr-controller.c:2398
 msgid "No sets found"
 msgstr "Non se encontrou ningún álbum"
 
-#: ../src/frogr-controller.c:2390
+#: src/frogr-controller.c:2423
 msgid "No groups found"
 msgstr "Non se encontrou ningún grupo"
 
-#: ../src/frogr-controller.c:3026
+#: src/frogr-controller.c:2984
 #, c-format
 msgid ""
 "You need to properly authorize %s before uploading any pictures to Flickr.\n"
@@ -368,180 +378,184 @@ msgstr ""
 "É preciso autorizar %s para poder subir imaxes a Flickr.\n"
 "Por favor autorícelo de novo."
 
-#: ../src/frogr-controller.c:3036
-#, c-format
+#: src/frogr-controller.c:2994
 msgid "You need to be connected before uploading any pictures to Flickr."
 msgstr "Debe conectarse antes de poder subir imaxes a Flickr."
 
-#: ../src/frogr-controller.c:3108
-#, c-format
+#: src/frogr-controller.c:3012
+#, fuzzy
+msgid "Uploading Pictures"
+msgstr "_Cargar imaxes…"
+
+#: src/frogr-controller.c:3057
 msgid "Error opening project file"
 msgstr "Produciuse un erro ao abrir o ficheiro do proxecto"
 
-#. This shows a dialog notifying the problem to the user
-#: ../src/frogr-create-new-set-dialog.c:156 ../src/frogr-details-dialog.c:1021
+#: src/frogr-create-new-set-dialog.c:143 src/frogr-details-dialog.c:1001
 msgid "Missing data required"
 msgstr "Falta información necesaria"
 
-#: ../src/frogr-create-new-set-dialog.c:342
+#: src/frogr-create-new-set-dialog.c:326
 msgid "Title:"
 msgstr "Título:"
 
-#: ../src/frogr-create-new-set-dialog.c:351
+#: src/frogr-create-new-set-dialog.c:335
 msgid "Description:"
 msgstr "Descrición:"
 
-#: ../src/frogr-create-new-set-dialog.c:372
+#: src/frogr-create-new-set-dialog.c:356
 msgid "Fill Pictures Details with Title and Description"
 msgstr "Completar a información das imaxes co título e descrición"
 
-#: ../src/frogr-create-new-set-dialog.c:393
+#: src/frogr-create-new-set-dialog.c:381
 msgid "Create New Set"
 msgstr "Crear novo álbum"
 
-#: ../src/frogr-details-dialog.c:90 ../src/frogr-settings-dialog.c:100
+#: src/frogr-details-dialog.c:89 src/frogr-settings-dialog.c:97
 msgid "Default (as specified in Flickr)"
 msgstr "Predeterminada (a especificada en Flickr)"
 
-#: ../src/frogr-details-dialog.c:91 ../src/frogr-settings-dialog.c:101
+#: src/frogr-details-dialog.c:90 src/frogr-settings-dialog.c:98
 msgid "All rights reserved"
 msgstr "Todos os dereitos reservados"
 
-#: ../src/frogr-details-dialog.c:92 ../src/frogr-settings-dialog.c:102
+#: src/frogr-details-dialog.c:91 src/frogr-settings-dialog.c:99
 msgid "CC Attribution-NonCommercial-ShareAlike"
 msgstr "CC de Atribución-Compartir Igual-Non comercial"
 
-#: ../src/frogr-details-dialog.c:93 ../src/frogr-settings-dialog.c:103
+#: src/frogr-details-dialog.c:92 src/frogr-settings-dialog.c:100
 msgid "CC Attribution-NonCommercial"
 msgstr "CC de Atribución-Non comercial"
 
-#: ../src/frogr-details-dialog.c:94 ../src/frogr-settings-dialog.c:104
+#: src/frogr-details-dialog.c:93 src/frogr-settings-dialog.c:101
 msgid "CC Attribution-NonCommercial-NoDerivs"
 msgstr "CC de Atribución-Non comercial-Non derivada"
 
-#: ../src/frogr-details-dialog.c:95 ../src/frogr-settings-dialog.c:105
+#: src/frogr-details-dialog.c:94 src/frogr-settings-dialog.c:102
 msgid "CC Attribution"
 msgstr "CC de Atribución"
 
-#: ../src/frogr-details-dialog.c:96 ../src/frogr-settings-dialog.c:106
+#: src/frogr-details-dialog.c:95 src/frogr-settings-dialog.c:103
 msgid "CC Attribution-ShareAlike"
 msgstr "CC de Atribución-Compartir Igual"
 
-#: ../src/frogr-details-dialog.c:97 ../src/frogr-settings-dialog.c:107
+#: src/frogr-details-dialog.c:96 src/frogr-settings-dialog.c:104
 msgid "CC Attribution-NoDerivs"
 msgstr "CC de Atribución-Non derivada"
 
-#: ../src/frogr-details-dialog.c:180
+#: src/frogr-details-dialog.c:172
 msgid "Open with image viewer"
 msgstr "Abrir co visor de imaxes"
 
-#: ../src/frogr-details-dialog.c:194
+#: src/frogr-details-dialog.c:190
 msgid "_Title:"
 msgstr "_Título:"
 
-#: ../src/frogr-details-dialog.c:204
+#: src/frogr-details-dialog.c:200
 msgid "_Description:"
 msgstr "_Descrición:"
 
-#: ../src/frogr-details-dialog.c:228
+#: src/frogr-details-dialog.c:224
 msgid "Ta_gs:"
 msgstr "Eti_quetas:"
 
-#: ../src/frogr-details-dialog.c:254
+#: src/frogr-details-dialog.c:247
 msgid "Visibility"
 msgstr "Visibilidade"
 
-#: ../src/frogr-details-dialog.c:266 ../src/frogr-settings-dialog.c:207
+#: src/frogr-details-dialog.c:257 src/frogr-settings-dialog.c:196
 msgid "_Private"
 msgstr "_Privado"
 
-#: ../src/frogr-details-dialog.c:270 ../src/frogr-settings-dialog.c:210
+#: src/frogr-details-dialog.c:261 src/frogr-settings-dialog.c:199
 msgid "P_ublic"
 msgstr "P_úblico"
 
-#: ../src/frogr-details-dialog.c:279 ../src/frogr-settings-dialog.c:221
+#: src/frogr-details-dialog.c:270 src/frogr-settings-dialog.c:207
 msgid "_Family"
 msgstr "_Familia"
 
-#: ../src/frogr-details-dialog.c:283 ../src/frogr-settings-dialog.c:223
+#: src/frogr-details-dialog.c:274 src/frogr-settings-dialog.c:209
 msgid "F_riends"
 msgstr "A_migos"
 
-#: ../src/frogr-details-dialog.c:309
+#: src/frogr-details-dialog.c:288
 msgid "Content Type"
 msgstr "Tipo de contido"
 
-#: ../src/frogr-details-dialog.c:318 ../src/frogr-settings-dialog.c:248
+#: src/frogr-details-dialog.c:296 src/frogr-settings-dialog.c:234
 msgid "P_hoto"
 msgstr "F_oto"
 
-#: ../src/frogr-details-dialog.c:322 ../src/frogr-settings-dialog.c:250
+#: src/frogr-details-dialog.c:300 src/frogr-settings-dialog.c:236
 msgid "Scree_nshot"
 msgstr "Captura de _pantalla"
 
-#: ../src/frogr-details-dialog.c:326 ../src/frogr-settings-dialog.c:252
+#: src/frogr-details-dialog.c:304 src/frogr-settings-dialog.c:238
 msgid "Oth_er"
 msgstr "Outr_o"
 
-#: ../src/frogr-details-dialog.c:342
+#: src/frogr-details-dialog.c:317
 msgid "Safety Level"
 msgstr "Nivel de seguridade"
 
-#: ../src/frogr-details-dialog.c:351 ../src/frogr-settings-dialog.c:273
+#: src/frogr-details-dialog.c:325 src/frogr-settings-dialog.c:260
 msgid "S_afe"
 msgstr "S_eguro"
 
-#: ../src/frogr-details-dialog.c:355 ../src/frogr-settings-dialog.c:275
+#: src/frogr-details-dialog.c:329 src/frogr-settings-dialog.c:262
 msgid "_Moderate"
 msgstr "_Moderado"
 
-#: ../src/frogr-details-dialog.c:359 ../src/frogr-settings-dialog.c:277
+#: src/frogr-details-dialog.c:333 src/frogr-settings-dialog.c:264
 msgid "Restr_icted"
 msgstr "Restrin_xido"
 
-#: ../src/frogr-details-dialog.c:373
+#: src/frogr-details-dialog.c:345
 msgid "License Type"
 msgstr "Tipo de licenza"
 
-#: ../src/frogr-details-dialog.c:397
+#: src/frogr-details-dialog.c:367
 msgid "Other Properties"
 msgstr "Outras propiedades"
 
-#: ../src/frogr-details-dialog.c:406
+#: src/frogr-details-dialog.c:375
+msgid "_Show Up in Global Search Results"
+msgstr "_Mostrar nos resultados das buscas globais"
+
+#: src/frogr-details-dialog.c:379
 msgid "Set Geo_location Information"
 msgstr "Estabelecer a información de xeolocalización"
 
-#: ../src/frogr-details-dialog.c:410
-msgid "_Show Up in Global Search Results"
-msgstr "_Mostrar nos resultados das buscas globais"
+#: src/frogr-details-dialog.c:383
+msgid "Replace 'Date Posted' with 'Date Taken'"
+msgstr ""
 
-#. Visually indicate how many pictures are being edited
-#: ../src/frogr-details-dialog.c:501
+#: src/frogr-details-dialog.c:475
 #, c-format
 msgid "(%d Picture)"
 msgid_plural "(%d Pictures)"
 msgstr[0] "(%d imaxe)"
 msgstr[1] "(%d imaxes)"
 
-#: ../src/frogr-details-dialog.c:575
+#: src/frogr-details-dialog.c:548
 msgid "An error happened trying to load the picture"
 msgstr "Produciuse un erro ao cargar a imaxe"
 
-#: ../src/frogr-details-dialog.c:1195
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:8
+#: src/frogr-details-dialog.c:1169
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../src/frogr-details-dialog.c:1224
+#: src/frogr-details-dialog.c:1197
 msgid "Edit Picture Details"
 msgstr "Editar os detalles da imaxe"
 
-#: ../src/frogr-file-loader.c:147
+#: src/frogr-file-loader.c:142
 #, c-format
 msgid "Loading files %d / %d"
 msgstr "Cargando imaxe %d / %d"
 
-#: ../src/frogr-file-loader.c:381
+#: src/frogr-file-loader.c:369
 #, c-format
 msgid ""
 "Unable to load picture %s:\n"
@@ -550,7 +564,7 @@ msgstr ""
 "Non é posíbel cargar a imaxe %s:\n"
 "%s"
 
-#: ../src/frogr-file-loader.c:412
+#: src/frogr-file-loader.c:400
 #, c-format
 msgid ""
 "Unable to load video %s\n"
@@ -560,10 +574,7 @@ msgstr ""
 "Comprobe que ten os códecs correctos\n"
 "instalados"
 
-#. First %s is the title of the picture (filename of the file by
-#. default). Second %s is the max allowed size for a picture to be
-#. uploaded to flickr (different for free and PRO accounts).
-#: ../src/frogr-file-loader.c:652
+#: src/frogr-file-loader.c:636
 #, c-format
 msgid ""
 "Can't load file %s:\n"
@@ -573,352 +584,310 @@ msgstr ""
 "O tamaño do ficheiro é superior ao tamaño máximo permitido para esta conta: "
 "(%s)"
 
-#: ../src/frogr-main-view.c:401
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
 msgid "Open"
 msgstr "Abrir"
 
-#: ../src/frogr-main-view.c:401
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
 msgid "Open Existing Project"
 msgstr "Abrir proxecto existente"
 
-#: ../src/frogr-main-view.c:403
-msgid "Save"
-msgstr "Gardar"
-
-#: ../src/frogr-main-view.c:403
-msgid "Save Current Project"
-msgstr "Gardar proxecto actual"
-
-#: ../src/frogr-main-view.c:407
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
 msgid "Add"
 msgstr "Engadir"
 
-#: ../src/frogr-main-view.c:407
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
 msgid "Add Elements"
 msgstr "Engadir elementos"
 
-#: ../src/frogr-main-view.c:409
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
 msgid "Remove"
 msgstr "Eliminar"
 
-#: ../src/frogr-main-view.c:409
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
 msgid "Remove Elements"
 msgstr "Quitar elementos"
 
-#: ../src/frogr-main-view.c:413
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
 msgid "Upload"
 msgstr "Subir"
 
-#: ../src/frogr-main-view.c:413
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
 msgid "Upload All"
 msgstr "Subir todo"
 
-#: ../src/frogr-main-view.c:827 ../data/gtkbuilder/frogr-app-menu.xml.h:4
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
+msgid "Save"
+msgstr "Gardar"
+
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
+msgid "Save Current Project"
+msgstr "Gardar proxecto actual"
+
+#: src/frogr-main-view.c:1016
 msgid "_About"
 msgstr "_Sobre"
 
-#: ../src/frogr-main-view.c:831 ../data/gtkbuilder/frogr-app-menu.xml.h:5
+#: src/frogr-main-view.c:1020
 msgid "_Quit"
 msgstr "_Saír"
 
-#. Create the submenu and insert it in the right section
-#: ../src/frogr-main-view.c:887
+#: src/frogr-main-view.c:1070
 msgid "Accounts"
 msgstr "Contas"
 
-#. String showind the date and time a picture was taken
-#: ../src/frogr-main-view.c:1237
+#: src/frogr-main-view.c:1410
 #, c-format
 msgid "Taken: %s"
 msgstr "Capturada: %s"
 
-#: ../src/frogr-main-view.c:1242
+#: src/frogr-main-view.c:1415
 #, c-format
 msgid "File size: %s"
 msgstr "Tamaño do ficheiro: %s"
 
-#: ../src/frogr-main-view.c:1375
+#: src/frogr-main-view.c:1540
 msgid "Select File"
 msgstr "Seleccione un ficheiro"
 
-#: ../src/frogr-main-view.c:1379 ../src/frogr-main-view.c:1506
+#: src/frogr-main-view.c:1544 src/frogr-main-view.c:1671
 msgid "_Open"
 msgstr "_Abrir"
 
-#: ../src/frogr-main-view.c:1388
+#: src/frogr-main-view.c:1553
 msgid "Frogr Project Files"
 msgstr "Ficheiros de proxecto de Frogr"
 
-#: ../src/frogr-main-view.c:1452
+#: src/frogr-main-view.c:1615
 msgid "Select Destination"
 msgstr "Seleccionar o destino"
 
-#: ../src/frogr-main-view.c:1456 ../data/gtkbuilder/frogr-menu-bar.xml.h:3
+#: src/frogr-main-view.c:1619
 msgid "_Save"
 msgstr "_Gardar"
 
-#: ../src/frogr-main-view.c:1459
+#: src/frogr-main-view.c:1622
 msgid "Untitled Project.frogr"
 msgstr "Proxecto sen título.frogr"
 
-#: ../src/frogr-main-view.c:1502
+#: src/frogr-main-view.c:1667
 msgid "Select a Picture"
 msgstr "Seleccione una imaxe"
 
-#: ../src/frogr-main-view.c:1529
+#: src/frogr-main-view.c:1694
 msgid "All Files"
 msgstr "Todos os ficheiros"
 
-#: ../src/frogr-main-view.c:1532
+#: src/frogr-main-view.c:1697
 msgid "Image Files"
 msgstr "Ficheiros de imaxe"
 
-#: ../src/frogr-main-view.c:1536
+#: src/frogr-main-view.c:1701
 msgid "Video Files"
 msgstr "Ficheiros de vídeo"
 
-#: ../src/frogr-main-view.c:1558
+#: src/frogr-main-view.c:1723
 msgid "You don't have any picture added yet"
 msgstr "Aínda non ten ningunha imaxe engadida"
 
-#: ../src/frogr-main-view.c:1573
+#: src/frogr-main-view.c:1736
 msgid "You need to select some pictures first"
 msgstr "Primeiro debe seleccionar algunhas imaxes"
 
-#: ../src/frogr-main-view.c:2037
+#: src/frogr-main-view.c:2108
 msgid "Not connected to Flickr"
 msgstr "Non conectado a Flickr"
 
-#. Login string, showing the user is PRO (second '%s') if so.
-#: ../src/frogr-main-view.c:2047
+#: src/frogr-main-view.c:2118
 #, c-format
 msgid "Connected as %s%s"
 msgstr "Conectado como %s%s"
 
-#: ../src/frogr-main-view.c:2048
+#: src/frogr-main-view.c:2119
 msgid " (PRO account)"
 msgstr " (conta PRO)"
 
-#. Will show in the status bar the amount of data (in KB, MB
-#. or GB) the user is currently allowed to upload to flicker
-#. till the end of the month, in a CURRENT / MAX fashion.
-#. The '-' at the beginning is just a separator, since more
-#. blocks of text will be shown in the status bar too.
-#: ../src/frogr-main-view.c:2072
+#: src/frogr-main-view.c:2143
 #, c-format
 msgid " - %s / %s remaining"
 msgstr " - %s / %s restantes"
 
-#. Will show in the status bar the amount of pictures and data
-#. (in KB, MB or GB) that would be uploaded as the sum of the
-#. sizes for every picture loaded in the application
-#: ../src/frogr-main-view.c:2098
+#: src/frogr-main-view.c:2169
 #, c-format
 msgid " - %d file to upload (%s)"
 msgid_plural " - %d files to upload (%s)"
 msgstr[0] " - %d ficheiro que subir (%s)"
 msgstr[1] " - %d ficheiros que subir (%s)"
 
-#: ../src/frogr-settings-dialog.c:190
+#: src/frogr-settings-dialog.c:185
 msgid "Default Visibility"
 msgstr "Visibilidade por omisión"
 
-#: ../src/frogr-settings-dialog.c:236
+#: src/frogr-settings-dialog.c:224
 msgid "Default Content Type"
 msgstr "Tipo de contido por omisión"
 
-#: ../src/frogr-settings-dialog.c:261
+#: src/frogr-settings-dialog.c:250
 msgid "Default Safety Level"
 msgstr "Nivel de seguridade por omisión"
 
-#: ../src/frogr-settings-dialog.c:286
+#: src/frogr-settings-dialog.c:276
 msgid "Default License"
 msgstr "Licenza predeterminada"
 
-#: ../src/frogr-settings-dialog.c:310
+#: src/frogr-settings-dialog.c:302
 msgid "Other Defaults"
 msgstr "Outros valores por omisión"
 
-#: ../src/frogr-settings-dialog.c:322
+#: src/frogr-settings-dialog.c:312
+msgid "_Show Pictures in Global Search Results"
+msgstr "_Mostrar imaes nos resultados de busca globais"
+
+#: src/frogr-settings-dialog.c:315
 msgid "Set Geo_location Information for Pictures"
 msgstr "Estabeler información de _xeolocalización para as imaxes"
 
-#: ../src/frogr-settings-dialog.c:325
-msgid "_Show Pictures in Global Search Results"
-msgstr "_Mostrar imaes nos resultados de busca globais"
+#: src/frogr-settings-dialog.c:318
+msgid "Replace 'Date Posted' with 'Date Taken' for Pictures"
+msgstr ""
 
-#: ../src/frogr-settings-dialog.c:331
+#: src/frogr-settings-dialog.c:324
 msgid "_General"
 msgstr "_Xeral"
 
-#: ../src/frogr-settings-dialog.c:356
+#: src/frogr-settings-dialog.c:344
 msgid "Proxy Settings"
 msgstr "Configuración do proxy"
 
-#. Enable proxy
-#: ../src/frogr-settings-dialog.c:366
+#: src/frogr-settings-dialog.c:353
 msgid "_Enable HTTP Proxy"
 msgstr "_Activar proxy HTTP"
 
-#: ../src/frogr-settings-dialog.c:378
+#: src/frogr-settings-dialog.c:363
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#. Proxy port
-#: ../src/frogr-settings-dialog.c:391
+#: src/frogr-settings-dialog.c:376
 msgid "_Port:"
 msgstr "_Porto:"
 
-#. Proxy username
-#: ../src/frogr-settings-dialog.c:404
+#: src/frogr-settings-dialog.c:389
 msgid "U_sername:"
 msgstr "Nome de _usuario:"
 
-#. Proxy password
-#: ../src/frogr-settings-dialog.c:417
+#: src/frogr-settings-dialog.c:402
 msgid "Pass_word:"
 msgstr "_Contrasinal:"
 
-#. Use GNOME General Proxy Settings
-#: ../src/frogr-settings-dialog.c:433
-msgid "_Use GNOME General Proxy Settings"
-msgstr "_Usar a configuración xeral do proxy de GNOME"
-
-#: ../src/frogr-settings-dialog.c:457
+#: src/frogr-settings-dialog.c:426
 msgid "Connec_tion"
 msgstr "Conex_ión:"
 
-#: ../src/frogr-settings-dialog.c:480
+#: src/frogr-settings-dialog.c:444
 msgid "Other options"
 msgstr "Outras opcións"
 
-#: ../src/frogr-settings-dialog.c:492
+#: src/frogr-settings-dialog.c:454
 msgid "Ena_ble Tags Auto-Completion"
 msgstr "Acti_var autocompletado de etiquetas"
 
-#: ../src/frogr-settings-dialog.c:495
+#: src/frogr-settings-dialog.c:457
 msgid "_Import Tags from Pictures Metadata"
 msgstr "_Importar etiquetas dos metadatos das imaxes"
 
-#: ../src/frogr-settings-dialog.c:499
+#: src/frogr-settings-dialog.c:461
 msgid "Use _Dark GTK Theme"
 msgstr "Usar tema GTK _escuro"
 
-#: ../src/frogr-settings-dialog.c:503
+#: src/frogr-settings-dialog.c:465
 msgid "_Keep File Extensions in Titles when Loading"
 msgstr "_Manter extensións dos ficheiros nos títulos ao descargalas"
 
-#: ../src/frogr-settings-dialog.c:509
+#: src/frogr-settings-dialog.c:471
 msgid "_Misc"
 msgstr "_Varios"
 
-#: ../src/frogr-settings-dialog.c:1045
+#: src/frogr-settings-dialog.c:972
 msgid "Preferences"
 msgstr "Configuracións"
 
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:1
-msgid "Aut_horize Account…"
-msgstr "Aut_orizar conta…"
-
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:2
-msgid "_Preferences…"
-msgstr "_Configuracións…"
-
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:3
-msgid "_Help"
-msgstr "Ax_uda"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:1
-msgid "_File"
-msgstr "_Ficheiro"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:2
-msgid "_Open…"
-msgstr "_Abrir…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:4
-msgid "Save _As…"
-msgstr "_Gardar como…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:5
-msgid "A_dd Elements…"
-msgstr "Eng_adir elementos…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:6
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:8
-msgid "_Remove Elements"
-msgstr "_Quitar elementos"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:7
-msgid "_Upload All"
-msgstr "S_ubir todo"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:9
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:1
-msgid "_Edit Details…"
-msgstr "_Editar Detalles…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:10
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:2
-msgid "Add _Tags…"
-msgstr "Engadir  _etiquetas…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:11
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:3
-msgid "Add to _Group…"
-msgstr "Engadir ao _grupo…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:12
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:4
-msgid "Add to _Photoset"
-msgstr "Engadir ao _álbum"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:13
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:5
-msgid "_Add to Existing Photoset…"
-msgstr "_Engadir a un álbum existente…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:14
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:6
-msgid "_Create New Photoset…"
-msgstr "_Crear novo álbum…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:15
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:7
-msgid "_Open in External Viewer"
-msgstr "Abrir no visor e_xterno"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:16
-msgid "_View"
-msgstr "_Ver"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:17
-msgid "_Sort Elements"
-msgstr "O_rdenar Elementos"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:18
-msgid "As _Loaded"
-msgstr "_Por carga"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:19
-msgid "By _Date Taken"
-msgstr "Por _data de captura"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:20
-msgid "By _Title"
-msgstr "Por _título"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:21
-msgid "By _Size"
-msgstr "Por _tamaño"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:22
-msgid "_Reversed Order"
-msgstr "Orde _inverso"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:23
-msgid "Enable _Tooltips"
-msgstr "A_ctivar consellos…"
+#~ msgid "Frogr"
+#~ msgstr "Frogr"
+
+#~ msgid "_Use GNOME General Proxy Settings"
+#~ msgstr "_Usar a configuración xeral do proxy de GNOME"
+
+#~ msgid "Aut_horize Account…"
+#~ msgstr "Aut_orizar conta…"
+
+#~ msgid "_Preferences…"
+#~ msgstr "_Configuracións…"
+
+#~ msgid "_Help"
+#~ msgstr "Ax_uda"
+
+#~ msgid "_File"
+#~ msgstr "_Ficheiro"
+
+#~ msgid "_Open…"
+#~ msgstr "_Abrir…"
+
+#~ msgid "Save _As…"
+#~ msgstr "_Gardar como…"
+
+#~ msgid "A_dd Elements…"
+#~ msgstr "Eng_adir elementos…"
+
+#~ msgid "_Remove Elements"
+#~ msgstr "_Quitar elementos"
+
+#~ msgid "_Upload All"
+#~ msgstr "S_ubir todo"
+
+#~ msgid "_Edit Details…"
+#~ msgstr "_Editar Detalles…"
+
+#~ msgid "Add _Tags…"
+#~ msgstr "Engadir  _etiquetas…"
+
+#~ msgid "Add to _Group…"
+#~ msgstr "Engadir ao _grupo…"
+
+#~ msgid "Add to _Photoset"
+#~ msgstr "Engadir ao _álbum"
+
+#~ msgid "_Add to Existing Photoset…"
+#~ msgstr "_Engadir a un álbum existente…"
+
+#~ msgid "_Create New Photoset…"
+#~ msgstr "_Crear novo álbum…"
+
+#~ msgid "_Open in External Viewer"
+#~ msgstr "Abrir no visor e_xterno"
+
+#~ msgid "_View"
+#~ msgstr "_Ver"
+
+#~ msgid "_Sort Elements"
+#~ msgstr "O_rdenar Elementos"
+
+#~ msgid "As _Loaded"
+#~ msgstr "_Por carga"
+
+#~ msgid "By _Date Taken"
+#~ msgstr "Por _data de captura"
+
+#~ msgid "By _Title"
+#~ msgstr "Por _título"
+
+#~ msgid "By _Size"
+#~ msgstr "Por _tamaño"
+
+#~ msgid "_Reversed Order"
+#~ msgstr "Orde _inverso"
+
+#~ msgid "Enable _Tooltips"
+#~ msgstr "A_ctivar consellos…"
 
 #~ msgid "Visible to _Family"
 #~ msgstr "Visíbel por familiares"
@@ -947,15 +916,9 @@ msgstr "A_ctivar consellos…"
 #~ msgid "_Save Project"
 #~ msgstr "_Gardar proxecto"
 
-#~ msgid "_Load Pictures…"
-#~ msgstr "_Cargar imaxes…"
-
 #~ msgid "Edit _Details…"
 #~ msgstr "Editar _detalles…"
 
-#~ msgid "frogr"
-#~ msgstr "frogr"
-
 #~ msgid "Load Project"
 #~ msgstr "Cargar proxecto"
 
diff --git a/po/hu.po b/po/hu.po
index 9c86334..562260f 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -9,9 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: frogr master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=frogr&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-01-22 18:06+0000\n"
+"Report-Msgid-Bugs-To: msanchez gnome org\n"
+"POT-Creation-Date: 2016-08-12 13:09+0100\n"
 "PO-Revision-Date: 2016-03-04 22:25+0100\n"
 "Last-Translator: Balázs Úr <urbalazs gmail com>\n"
 "Language-Team: Hungarian <openscope at gmail dot com>\n"
@@ -22,10 +21,16 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 1.2\n"
 
-#: ../data/frogr.appdata.xml.in.h:1
-#| msgid ""
-#| "Frogr is a small application for the GNOME desktop that allows users to "
-#| "manage their accounts in the Flickr image hosting website."
+#: data/frogr.appdata.xml.in:5 data/frogr.desktop.in.in:5
+#: data/frogr.desktop.in.in:14
+msgid "frogr"
+msgstr "frogr"
+
+#: data/frogr.appdata.xml.in:6 data/frogr.desktop.in.in:6
+msgid "frogr: a Flickr Remote Organizer for GNOME"
+msgstr "frogr: egy távoli Flickr szervező a GNOME-hoz"
+
+#: data/frogr.appdata.xml.in:8
 msgid ""
 "frogr is a small application for the GNOME desktop that allows users to "
 "manage their accounts in the Flickr image hosting website."
@@ -33,7 +38,7 @@ msgstr ""
 "A frogr egy pici alkalmazás a GNOME asztali környezethez, mely lehetővé "
 "teszi a felhasználói fiókok kezelését a Flickr képmegosztó weboldalon."
 
-#: ../data/frogr.appdata.xml.in.h:2
+#: data/frogr.appdata.xml.in:13
 msgid ""
 "It supports all the basic Flickr features, including uploading pictures, "
 "adding descriptions, setting tags and managing sets and groups pools."
@@ -41,84 +46,75 @@ msgstr ""
 "Az összes alapvető Flickr funkció támogatott, például képfájlok feltöltése, "
 "leírások hozzáadása, címkék beállítása és csoportgyűjtemények kezelése."
 
-#: ../data/frogr.appdata.xml.in.h:3
-#| msgid "Scree_nshot"
+#: data/frogr.appdata.xml.in:24
 msgid "Screenshot of frogr"
 msgstr "A frogr képernyőképe"
 
-#: ../data/frogr.desktop.in.in.h:1
-#| msgid "Frogr"
-msgid "frogr"
-msgstr "frogr"
-
-#: ../data/frogr.desktop.in.in.h:2
-#| msgid "Frogr: a Flickr Remote Organizer for GNOME"
-msgid "frogr: a Flickr Remote Organizer for GNOME"
-msgstr "frogr: egy távoli Flickr szervező a GNOME-hoz"
+#: data/frogr.appdata.xml.in:29
+msgid "Mario Sanchez Prada"
+msgstr ""
 
-#: ../data/frogr.desktop.in.in.h:3
+#: data/frogr.desktop.in.in:7
 msgid "Upload and organize photos in Flickr accounts"
 msgstr "Fényképek feltöltése és rendszerezése a Flickr fiókjában"
 
-#: ../data/frogr.desktop.in.in.h:4
+#: data/frogr.desktop.in.in:8
 msgid "Flickr;Image;Picture;Photo;Video;Uploader;"
 msgstr "Flickr;kép;fénykép;fotó;videó;video;feltöltő;"
 
-#: ../src/frogr-about-dialog.c:43
-#| msgid "A Flickr remote organizer for GNOME\n"
+#: src/frogr-about-dialog.c:43
 msgid "A Flickr Remote Organizer for GNOME\n"
 msgstr "Egy távoli Flickr szervező a GNOME-hoz\n"
 
-#: ../src/frogr-about-dialog.c:72
+#: src/frogr-about-dialog.c:72
 msgid "translator-credits"
 msgstr ""
 "Hammer Attila <hammera at pickup dot hu>\n"
 "paradigma <mezi.zoltan at gmail dot com>\n"
 "Úr Balázs <urbalazs at gmail dot com>"
 
-#: ../src/frogr-add-tags-dialog.c:191 ../src/frogr-add-to-group-dialog.c:528
-#: ../src/frogr-add-to-set-dialog.c:529 ../src/frogr-auth-dialog.c:153
-#: ../src/frogr-create-new-set-dialog.c:310 ../src/frogr-details-dialog.c:1168
-#: ../src/frogr-main-view.c:1543 ../src/frogr-main-view.c:1618
-#: ../src/frogr-main-view.c:1670 ../src/frogr-settings-dialog.c:930
+#: src/frogr-add-tags-dialog.c:191 src/frogr-add-to-group-dialog.c:528
+#: src/frogr-add-to-set-dialog.c:529 src/frogr-auth-dialog.c:153
+#: src/frogr-create-new-set-dialog.c:310 src/frogr-details-dialog.c:1168
+#: src/frogr-main-view.c:1543 src/frogr-main-view.c:1618
+#: src/frogr-main-view.c:1670 src/frogr-settings-dialog.c:930
 msgid "_Cancel"
 msgstr "Mé_gse"
 
-#: ../src/frogr-add-tags-dialog.c:193 ../src/frogr-add-to-group-dialog.c:530
-#: ../src/frogr-add-to-set-dialog.c:531
-#: ../src/frogr-create-new-set-dialog.c:312
+#: src/frogr-add-tags-dialog.c:193 src/frogr-add-to-group-dialog.c:530
+#: src/frogr-add-to-set-dialog.c:531 src/frogr-create-new-set-dialog.c:312
 msgid "_Add"
 msgstr "Hozzá_adás"
 
-#: ../src/frogr-add-tags-dialog.c:202
+#: src/frogr-add-tags-dialog.c:202
 msgid "Enter a spaces separated list of tags:"
 msgstr "Adja meg szóközökkel elválasztott címkék listáját:"
 
-#: ../src/frogr-add-tags-dialog.c:228
+#: src/frogr-add-tags-dialog.c:228
 msgid "Add Tags"
 msgstr "Címkék hozzáadása"
 
-#: ../src/frogr-add-to-group-dialog.c:147
+#: src/frogr-add-to-group-dialog.c:147
 msgid "Name"
 msgstr "Név"
 
-#: ../src/frogr-add-to-group-dialog.c:162 ../src/frogr-add-to-set-dialog.c:163
+#: src/frogr-add-to-group-dialog.c:162 src/frogr-add-to-set-dialog.c:163
 msgid "Elements"
 msgstr "Elemek"
 
-#: ../src/frogr-add-to-group-dialog.c:581
+#: src/frogr-add-to-group-dialog.c:581
 msgid "Add to Groups"
 msgstr "Hozzáadás a csoportokhoz"
 
-#: ../src/frogr-add-to-set-dialog.c:148
+#: src/frogr-add-to-set-dialog.c:148
 msgid "Title"
 msgstr "Cím"
 
-#: ../src/frogr-add-to-set-dialog.c:582
+#: src/frogr-add-to-set-dialog.c:582
 msgid "Add to Sets"
 msgstr "Hozzáadás az albumhoz"
 
-#: ../src/frogr-auth-dialog.c:59
+#: src/frogr-auth-dialog.c:59
 #, c-format
 msgid ""
 "Please press the button to authorize %s and then come back to complete the "
@@ -127,30 +123,29 @@ msgstr ""
 "A(z) %s felhatalmazásához nyomja meg a megfelelő gombot, majd jöjjön vissza "
 "és fejezze be a folyamatot."
 
-#: ../src/frogr-auth-dialog.c:63 ../src/frogr-auth-dialog.c:149
-#: ../src/frogr-controller.c:2286
+#: src/frogr-auth-dialog.c:63 src/frogr-auth-dialog.c:149
+#: src/frogr-controller.c:2286
 #, c-format
 msgid "Authorize %s"
 msgstr "%s felhatalmazása"
 
-#: ../src/frogr-auth-dialog.c:155 ../src/frogr-settings-dialog.c:932
+#: src/frogr-auth-dialog.c:155 src/frogr-settings-dialog.c:932
 msgid "_Close"
 msgstr "_Bezárás"
 
-#. Description label
-#: ../src/frogr-auth-dialog.c:167
+#: src/frogr-auth-dialog.c:167
 msgid "Enter verification code:"
 msgstr "Írja be az ellenőrző kódot:"
 
-#: ../src/frogr-auth-dialog.c:221
+#: src/frogr-auth-dialog.c:221
 msgid "Invalid verification code"
 msgstr "Érvénytelen ellenőrző kód"
 
-#: ../src/frogr-controller.c:581
+#: src/frogr-controller.c:581
 msgid "Process cancelled"
 msgstr "Folyamat megszakítva"
 
-#: ../src/frogr-controller.c:586
+#: src/frogr-controller.c:586
 msgid ""
 "Connection error:\n"
 "Network not available"
@@ -158,7 +153,7 @@ msgstr ""
 "Csatlakozási hiba:\n"
 "A hálózat nem érhető el"
 
-#: ../src/frogr-controller.c:590
+#: src/frogr-controller.c:590
 msgid ""
 "Connection error:\n"
 "Bad request"
@@ -166,7 +161,7 @@ msgstr ""
 "Csatlakozási hiba:\n"
 "Hibás kérés"
 
-#: ../src/frogr-controller.c:594
+#: src/frogr-controller.c:594
 msgid ""
 "Connection error:\n"
 "Server-side error"
@@ -174,7 +169,7 @@ msgstr ""
 "Csatlakozási hiba:\n"
 "Kiszolgáló-oldali hiba"
 
-#: ../src/frogr-controller.c:598
+#: src/frogr-controller.c:598
 msgid ""
 "Error uploading:\n"
 "File invalid"
@@ -182,7 +177,7 @@ msgstr ""
 "Hiba a feltöltéskor:\n"
 "A fájl érvénytelen"
 
-#: ../src/frogr-controller.c:602
+#: src/frogr-controller.c:602
 msgid ""
 "Error uploading picture:\n"
 "Quota exceeded"
@@ -190,14 +185,14 @@ msgstr ""
 "Hiba a kép feltöltése közben:\n"
 "A kvóta elérve"
 
-#: ../src/frogr-controller.c:607
+#: src/frogr-controller.c:607
 #, c-format
 msgid "Quota exceeded (limit: %d video per month)"
 msgid_plural "Quota exceeded (limit: %d videos per month)"
 msgstr[0] "A kvótát túllépte: %d videó/hónap"
 msgstr[1] "A kvótát túllépte: %d videó/hónap"
 
-#: ../src/frogr-controller.c:611
+#: src/frogr-controller.c:611
 msgid ""
 "Error uploading video:\n"
 "You can't upload more videos with this account"
@@ -205,7 +200,7 @@ msgstr ""
 "Hiba a videó feltöltésekor:\n"
 "Több videó feltöltése ezzel a fiókkal nem lehetséges"
 
-#: ../src/frogr-controller.c:617
+#: src/frogr-controller.c:617
 msgid ""
 "Error:\n"
 "Photo not found"
@@ -213,7 +208,7 @@ msgstr ""
 "Hiba:\n"
 "A fénykép nem található"
 
-#: ../src/frogr-controller.c:621
+#: src/frogr-controller.c:621
 msgid ""
 "Error:\n"
 "Photo already in photoset"
@@ -221,7 +216,7 @@ msgstr ""
 "Hiba:\n"
 "A fénykép már az albumban van"
 
-#: ../src/frogr-controller.c:625
+#: src/frogr-controller.c:625
 msgid ""
 "Error:\n"
 "Photo already in group"
@@ -229,7 +224,7 @@ msgstr ""
 "Hiba:\n"
 "A fénykép már a csoportban van"
 
-#: ../src/frogr-controller.c:629
+#: src/frogr-controller.c:629
 msgid ""
 "Error:\n"
 "Photo already in the maximum number of groups possible"
@@ -237,7 +232,7 @@ msgstr ""
 "Hiba:\n"
 "A fénykép már a lehetséges maximális számú csoportban van"
 
-#: ../src/frogr-controller.c:633
+#: src/frogr-controller.c:633
 msgid ""
 "Error:\n"
 "Group limit already reached"
@@ -245,7 +240,7 @@ msgstr ""
 "Hiba:\n"
 "A csoport határa már elérve"
 
-#: ../src/frogr-controller.c:637
+#: src/frogr-controller.c:637
 msgid ""
 "Error:\n"
 "Photo added to group's queue"
@@ -253,7 +248,7 @@ msgstr ""
 "Hiba:\n"
 "A fénykép hozzáadva a csoport várólistájához"
 
-#: ../src/frogr-controller.c:641
+#: src/frogr-controller.c:641
 msgid ""
 "Error:\n"
 "Photo already added to group's queue"
@@ -261,7 +256,7 @@ msgstr ""
 "Hiba:\n"
 "A fénykép már hozzá van adva a csoport várólistájához"
 
-#: ../src/frogr-controller.c:645
+#: src/frogr-controller.c:645
 msgid ""
 "Error:\n"
 "Content not allowed for this group"
@@ -269,8 +264,7 @@ msgstr ""
 "Hiba:\n"
 "A tartalom nem engedélyezett ebben a csoportban"
 
-#: ../src/frogr-controller.c:649
-#, c-format
+#: src/frogr-controller.c:649
 msgid ""
 "Authorization failed.\n"
 "Please try again"
@@ -278,7 +272,7 @@ msgstr ""
 "A hitelesítés meghiúsult.\n"
 "Kérjük próbálja újra"
 
-#: ../src/frogr-controller.c:655
+#: src/frogr-controller.c:655
 #, c-format
 msgid ""
 "Error\n"
@@ -290,8 +284,7 @@ msgstr ""
 "történő feltöltéséhez.\n"
 "Próbálja meg újra felhatalmazni."
 
-#: ../src/frogr-controller.c:660
-#, c-format
+#: src/frogr-controller.c:660
 msgid ""
 "Unable to authenticate in Flickr\n"
 "Please try again."
@@ -299,7 +292,7 @@ msgstr ""
 "A Flickr oldalon nem lehetséges a hitelesítés\n"
 "Próbálja meg újra."
 
-#: ../src/frogr-controller.c:664
+#: src/frogr-controller.c:664
 #, c-format
 msgid ""
 "You have not properly authorized %s yet.\n"
@@ -308,8 +301,7 @@ msgstr ""
 "Még nem hatalmazta fel megfelelően ezt: %s.\n"
 "Próbálja meg újra."
 
-#: ../src/frogr-controller.c:669
-#, c-format
+#: src/frogr-controller.c:669
 msgid ""
 "Invalid verification code.\n"
 "Please try again."
@@ -317,8 +309,7 @@ msgstr ""
 "Érvénytelen ellenőrző kód.\n"
 "Próbálja újra."
 
-#: ../src/frogr-controller.c:673
-#, c-format
+#: src/frogr-controller.c:673
 msgid ""
 "Error:\n"
 "Service not available"
@@ -326,64 +317,62 @@ msgstr ""
 "Hiba:\n"
 "A szolgáltatás nem érhető el"
 
-#. General error: just dump the raw error description
-#: ../src/frogr-controller.c:678
+#: src/frogr-controller.c:678
 #, c-format
 msgid "An error happened: %s."
 msgstr "Hiba történt: %s."
 
-#: ../src/frogr-controller.c:883
+#: src/frogr-controller.c:883
 msgid "Authorization failed (timed out)"
 msgstr "A hitelesítés meghiúsult (időtúllépés)"
 
-#: ../src/frogr-controller.c:931
+#: src/frogr-controller.c:931
 #, c-format
 msgid "Retrying Upload (attempt %d/%d)…"
 msgstr "Feltöltés újrapróbálása (%d/%d kísérlet)…"
 
-#: ../src/frogr-controller.c:936
+#: src/frogr-controller.c:936
 #, c-format
 msgid "Uploading '%s'…"
 msgstr "„%s” feltöltése…"
 
-#: ../src/frogr-controller.c:2242
+#: src/frogr-controller.c:2242
 msgid "Updating credentials…"
 msgstr "Hitelesítési adatok frissítése…"
 
-#: ../src/frogr-controller.c:2247
+#: src/frogr-controller.c:2247
 msgid "Retrieving data for authorization…"
 msgstr "Adatok letöltése a hitelesítéshez…"
 
-#: ../src/frogr-controller.c:2252
+#: src/frogr-controller.c:2252
 msgid "Finishing authorization…"
 msgstr "Hitelesítés befejezése…"
 
-#: ../src/frogr-controller.c:2257
+#: src/frogr-controller.c:2257
 msgid "Retrieving list of sets…"
 msgstr "Albumok listájának lekérése…"
 
-#: ../src/frogr-controller.c:2262
+#: src/frogr-controller.c:2262
 msgid "Retrieving list of groups…"
 msgstr "Csoportok listájának lekérése…"
 
-#: ../src/frogr-controller.c:2267
+#: src/frogr-controller.c:2267
 msgid "Retrieving list of tags…"
 msgstr "Címkék listájának lekérése…"
 
-#: ../src/frogr-controller.c:2292
-#, c-format
+#: src/frogr-controller.c:2292
 msgid "Fetching information"
 msgstr "Információk lekérése"
 
-#: ../src/frogr-controller.c:2398
+#: src/frogr-controller.c:2398
 msgid "No sets found"
 msgstr "Nem találhatók albumok"
 
-#: ../src/frogr-controller.c:2423
+#: src/frogr-controller.c:2423
 msgid "No groups found"
 msgstr "Nem találhatók csoportok"
 
-#: ../src/frogr-controller.c:2984
+#: src/frogr-controller.c:2984
 #, c-format
 msgid ""
 "You need to properly authorize %s before uploading any pictures to Flickr.\n"
@@ -393,187 +382,183 @@ msgstr ""
 "szükséges.\n"
 "Próbálja meg újra felhatalmazni."
 
-#: ../src/frogr-controller.c:2994
-#, c-format
+#: src/frogr-controller.c:2994
 msgid "You need to be connected before uploading any pictures to Flickr."
 msgstr "Csatlakoznia kell, mielőtt bármilyen képet töltene fel a Flickr-be."
 
-#: ../src/frogr-controller.c:3012
+#: src/frogr-controller.c:3012
 msgid "Uploading Pictures"
 msgstr "Képek feltöltése"
 
-#: ../src/frogr-controller.c:3057
-#, c-format
+#: src/frogr-controller.c:3057
 msgid "Error opening project file"
 msgstr "Hiba a projektfájl megnyitásakor"
 
-#. This shows a dialog notifying the problem to the user
-#: ../src/frogr-create-new-set-dialog.c:143 ../src/frogr-details-dialog.c:1001
+#: src/frogr-create-new-set-dialog.c:143 src/frogr-details-dialog.c:1001
 msgid "Missing data required"
 msgstr "Hiányoznak a szükséges adatok"
 
-#: ../src/frogr-create-new-set-dialog.c:326
+#: src/frogr-create-new-set-dialog.c:326
 msgid "Title:"
 msgstr "Cím:"
 
-#: ../src/frogr-create-new-set-dialog.c:335
+#: src/frogr-create-new-set-dialog.c:335
 msgid "Description:"
 msgstr "Leírás:"
 
-#: ../src/frogr-create-new-set-dialog.c:356
+#: src/frogr-create-new-set-dialog.c:356
 msgid "Fill Pictures Details with Title and Description"
 msgstr "Képek részleteinek kitöltése címmel és leírással"
 
-#: ../src/frogr-create-new-set-dialog.c:381
+#: src/frogr-create-new-set-dialog.c:381
 msgid "Create New Set"
 msgstr "Új album létrehozása"
 
-#: ../src/frogr-details-dialog.c:89 ../src/frogr-settings-dialog.c:97
+#: src/frogr-details-dialog.c:89 src/frogr-settings-dialog.c:97
 msgid "Default (as specified in Flickr)"
 msgstr "Alapértelmezett (a Flickr szerint megadott)"
 
-#: ../src/frogr-details-dialog.c:90 ../src/frogr-settings-dialog.c:98
+#: src/frogr-details-dialog.c:90 src/frogr-settings-dialog.c:98
 msgid "All rights reserved"
 msgstr "Minden jog fenntartva"
 
-#: ../src/frogr-details-dialog.c:91 ../src/frogr-settings-dialog.c:99
+#: src/frogr-details-dialog.c:91 src/frogr-settings-dialog.c:99
 msgid "CC Attribution-NonCommercial-ShareAlike"
 msgstr "CC Nevezd meg! - Ne add el! - Így add tovább!"
 
-#: ../src/frogr-details-dialog.c:92 ../src/frogr-settings-dialog.c:100
+#: src/frogr-details-dialog.c:92 src/frogr-settings-dialog.c:100
 msgid "CC Attribution-NonCommercial"
 msgstr "CC Nevezd meg! - Ne add el!"
 
-#: ../src/frogr-details-dialog.c:93 ../src/frogr-settings-dialog.c:101
+#: src/frogr-details-dialog.c:93 src/frogr-settings-dialog.c:101
 msgid "CC Attribution-NonCommercial-NoDerivs"
 msgstr "CC Nevezd meg! - Ne add el! - Ne változtasd!"
 
-#: ../src/frogr-details-dialog.c:94 ../src/frogr-settings-dialog.c:102
+#: src/frogr-details-dialog.c:94 src/frogr-settings-dialog.c:102
 msgid "CC Attribution"
 msgstr "CC Nevezd meg!"
 
-#: ../src/frogr-details-dialog.c:95 ../src/frogr-settings-dialog.c:103
+#: src/frogr-details-dialog.c:95 src/frogr-settings-dialog.c:103
 msgid "CC Attribution-ShareAlike"
 msgstr "CC Nevezd meg! - Így add tovább!"
 
-#: ../src/frogr-details-dialog.c:96 ../src/frogr-settings-dialog.c:104
+#: src/frogr-details-dialog.c:96 src/frogr-settings-dialog.c:104
 msgid "CC Attribution-NoDerivs"
 msgstr "CC Nevezd meg! - Ne változtasd!"
 
-#: ../src/frogr-details-dialog.c:172
+#: src/frogr-details-dialog.c:172
 msgid "Open with image viewer"
 msgstr "Megnyitás a képnézegetővel"
 
-#: ../src/frogr-details-dialog.c:190
+#: src/frogr-details-dialog.c:190
 msgid "_Title:"
 msgstr "_Cím:"
 
-#: ../src/frogr-details-dialog.c:200
+#: src/frogr-details-dialog.c:200
 msgid "_Description:"
 msgstr "_Leírás:"
 
-#: ../src/frogr-details-dialog.c:224
+#: src/frogr-details-dialog.c:224
 msgid "Ta_gs:"
 msgstr "Cí_mkék:"
 
-#: ../src/frogr-details-dialog.c:247
+#: src/frogr-details-dialog.c:247
 msgid "Visibility"
 msgstr "Láthatóság"
 
-#: ../src/frogr-details-dialog.c:257 ../src/frogr-settings-dialog.c:196
+#: src/frogr-details-dialog.c:257 src/frogr-settings-dialog.c:196
 msgid "_Private"
 msgstr "_Magánjellegű"
 
-#: ../src/frogr-details-dialog.c:261 ../src/frogr-settings-dialog.c:199
+#: src/frogr-details-dialog.c:261 src/frogr-settings-dialog.c:199
 msgid "P_ublic"
 msgstr "_Nyilvános"
 
-#: ../src/frogr-details-dialog.c:270 ../src/frogr-settings-dialog.c:207
+#: src/frogr-details-dialog.c:270 src/frogr-settings-dialog.c:207
 msgid "_Family"
 msgstr "_Család"
 
-#: ../src/frogr-details-dialog.c:274 ../src/frogr-settings-dialog.c:209
+#: src/frogr-details-dialog.c:274 src/frogr-settings-dialog.c:209
 msgid "F_riends"
 msgstr "_Barátok"
 
-#: ../src/frogr-details-dialog.c:288
+#: src/frogr-details-dialog.c:288
 msgid "Content Type"
 msgstr "Tartalom típusa"
 
-#: ../src/frogr-details-dialog.c:296 ../src/frogr-settings-dialog.c:234
+#: src/frogr-details-dialog.c:296 src/frogr-settings-dialog.c:234
 msgid "P_hoto"
 msgstr "_Fénykép"
 
-#: ../src/frogr-details-dialog.c:300 ../src/frogr-settings-dialog.c:236
+#: src/frogr-details-dialog.c:300 src/frogr-settings-dialog.c:236
 msgid "Scree_nshot"
 msgstr "_Képernyőkép"
 
-#: ../src/frogr-details-dialog.c:304 ../src/frogr-settings-dialog.c:238
+#: src/frogr-details-dialog.c:304 src/frogr-settings-dialog.c:238
 msgid "Oth_er"
 msgstr "_Egyéb"
 
-#: ../src/frogr-details-dialog.c:317
+#: src/frogr-details-dialog.c:317
 msgid "Safety Level"
 msgstr "Biztonsági szint"
 
-#: ../src/frogr-details-dialog.c:325 ../src/frogr-settings-dialog.c:260
+#: src/frogr-details-dialog.c:325 src/frogr-settings-dialog.c:260
 msgid "S_afe"
 msgstr "_Biztonságos"
 
-#: ../src/frogr-details-dialog.c:329 ../src/frogr-settings-dialog.c:262
+#: src/frogr-details-dialog.c:329 src/frogr-settings-dialog.c:262
 msgid "_Moderate"
 msgstr "_Mérsékelt"
 
-#: ../src/frogr-details-dialog.c:333 ../src/frogr-settings-dialog.c:264
+#: src/frogr-details-dialog.c:333 src/frogr-settings-dialog.c:264
 msgid "Restr_icted"
 msgstr "_Korlátozott"
 
-#: ../src/frogr-details-dialog.c:345
+#: src/frogr-details-dialog.c:345
 msgid "License Type"
 msgstr "Licenctípus"
 
-#: ../src/frogr-details-dialog.c:367
+#: src/frogr-details-dialog.c:367
 msgid "Other Properties"
 msgstr "Egyéb tulajdonságok"
 
-#: ../src/frogr-details-dialog.c:375
+#: src/frogr-details-dialog.c:375
 msgid "_Show Up in Global Search Results"
 msgstr "_Megjelenítés a globális keresési eredményekben"
 
-#: ../src/frogr-details-dialog.c:379
+#: src/frogr-details-dialog.c:379
 msgid "Set Geo_location Information"
 msgstr "_Földrajzi helyzet információk beállítása"
 
-#: ../src/frogr-details-dialog.c:383
+#: src/frogr-details-dialog.c:383
 msgid "Replace 'Date Posted' with 'Date Taken'"
 msgstr "A „Feltöltési dátum” cseréje a „Készítés dátumával”"
 
-#. Visually indicate how many pictures are being edited
-#: ../src/frogr-details-dialog.c:475
+#: src/frogr-details-dialog.c:475
 #, c-format
 msgid "(%d Picture)"
 msgid_plural "(%d Pictures)"
 msgstr[0] "(%d kép)"
 msgstr[1] "(%d kép)"
 
-#: ../src/frogr-details-dialog.c:548
+#: src/frogr-details-dialog.c:548
 msgid "An error happened trying to load the picture"
 msgstr "Hiba történt a kép betöltésének kísérlete közben"
 
-#: ../src/frogr-details-dialog.c:1169 ../data/gtkbuilder/frogr-menu-bar.xml.h:8
+#: src/frogr-details-dialog.c:1169
 msgid "_Edit"
 msgstr "S_zerkesztés"
 
-#: ../src/frogr-details-dialog.c:1197
+#: src/frogr-details-dialog.c:1197
 msgid "Edit Picture Details"
 msgstr "Kép részleteinek szerkesztése"
 
-#: ../src/frogr-file-loader.c:142
+#: src/frogr-file-loader.c:142
 #, c-format
 msgid "Loading files %d / %d"
 msgstr "Fájlok betöltése (%d / %d)"
 
-#: ../src/frogr-file-loader.c:369
+#: src/frogr-file-loader.c:369
 #, c-format
 msgid ""
 "Unable to load picture %s:\n"
@@ -582,7 +567,7 @@ msgstr ""
 "A(z) %s kép nem tölthető be:\n"
 "%s"
 
-#: ../src/frogr-file-loader.c:400
+#: src/frogr-file-loader.c:400
 #, c-format
 msgid ""
 "Unable to load video %s\n"
@@ -591,10 +576,7 @@ msgstr ""
 "A(z) %s videó nem tölthető be\n"
 "Kérjük ellenőrizze, hogy a megfelelő kodek telepítve van-e"
 
-#. First %s is the title of the picture (filename of the file by
-#. default). Second %s is the max allowed size for a picture to be
-#. uploaded to flickr (different for free and PRO accounts).
-#: ../src/frogr-file-loader.c:636
+#: src/frogr-file-loader.c:636
 #, c-format
 msgid ""
 "Can't load file %s:\n"
@@ -603,370 +585,304 @@ msgstr ""
 "Nem tölthető be a(z) %s fájl:\n"
 "A fájl mérete nagyobb, mint amelyet ez a fiók maximálisan megenged (%s)"
 
-#. First create the left side buttons
-#: ../src/frogr-main-view.c:630 ../src/frogr-main-view.c:726
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
 msgid "Open"
 msgstr "Megnyitás"
 
-#: ../src/frogr-main-view.c:630 ../src/frogr-main-view.c:726
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
 msgid "Open Existing Project"
 msgstr "Létező projekt megnyitása"
 
-#: ../src/frogr-main-view.c:631 ../src/frogr-main-view.c:729
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
 msgid "Add"
 msgstr "Hozzáadás"
 
-#: ../src/frogr-main-view.c:631 ../src/frogr-main-view.c:729
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
 msgid "Add Elements"
 msgstr "Elemek hozzáadása"
 
-#: ../src/frogr-main-view.c:632 ../src/frogr-main-view.c:730
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
 msgid "Remove"
 msgstr "Eltávolítás"
 
-#: ../src/frogr-main-view.c:632 ../src/frogr-main-view.c:730
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
 msgid "Remove Elements"
 msgstr "Elemek eltávolítása"
 
-#: ../src/frogr-main-view.c:633 ../src/frogr-main-view.c:732
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
 msgid "Upload"
 msgstr "Feltöltés"
 
-#: ../src/frogr-main-view.c:633 ../src/frogr-main-view.c:732
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
 msgid "Upload All"
 msgstr "Összes feltöltése"
 
-#. Save project item
-#: ../src/frogr-main-view.c:666 ../src/frogr-main-view.c:727
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
 msgid "Save"
 msgstr "Mentés"
 
-#: ../src/frogr-main-view.c:666 ../src/frogr-main-view.c:727
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
 msgid "Save Current Project"
 msgstr "Jelenlegi projekt mentése"
 
-#: ../src/frogr-main-view.c:1016 ../data/gtkbuilder/frogr-app-menu.xml.h:4
+#: src/frogr-main-view.c:1016
 msgid "_About"
 msgstr "_Névjegy"
 
-#: ../src/frogr-main-view.c:1020 ../data/gtkbuilder/frogr-app-menu.xml.h:5
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:17
+#: src/frogr-main-view.c:1020
 msgid "_Quit"
 msgstr "_Kilépés"
 
-#. Create the submenu and insert it in the right section
-#: ../src/frogr-main-view.c:1070
+#: src/frogr-main-view.c:1070
 msgid "Accounts"
 msgstr "Fiókok"
 
-#. String showind the date and time a picture was taken
-#: ../src/frogr-main-view.c:1410
+#: src/frogr-main-view.c:1410
 #, c-format
 msgid "Taken: %s"
 msgstr "Átvett: %s"
 
-#: ../src/frogr-main-view.c:1415
+#: src/frogr-main-view.c:1415
 #, c-format
 msgid "File size: %s"
 msgstr "Fájl mérete: %s"
 
-#: ../src/frogr-main-view.c:1540
+#: src/frogr-main-view.c:1540
 msgid "Select File"
 msgstr "Fájl kiválasztása"
 
-#: ../src/frogr-main-view.c:1544 ../src/frogr-main-view.c:1671
+#: src/frogr-main-view.c:1544 src/frogr-main-view.c:1671
 msgid "_Open"
 msgstr "_Megnyitás"
 
-#: ../src/frogr-main-view.c:1553
+#: src/frogr-main-view.c:1553
 msgid "Frogr Project Files"
 msgstr "Frogr projektfájlok"
 
-#: ../src/frogr-main-view.c:1615
+#: src/frogr-main-view.c:1615
 msgid "Select Destination"
 msgstr "Cél kiválasztása"
 
-#: ../src/frogr-main-view.c:1619 ../data/gtkbuilder/frogr-menu-bar.xml.h:3
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:1
+#: src/frogr-main-view.c:1619
 msgid "_Save"
 msgstr "M_entés"
 
-#: ../src/frogr-main-view.c:1622
+#: src/frogr-main-view.c:1622
 msgid "Untitled Project.frogr"
 msgstr "Névtelen projekt.frogr"
 
-#: ../src/frogr-main-view.c:1667
+#: src/frogr-main-view.c:1667
 msgid "Select a Picture"
 msgstr "Válasszon egy képet"
 
-#: ../src/frogr-main-view.c:1694
+#: src/frogr-main-view.c:1694
 msgid "All Files"
 msgstr "Minden fájl"
 
-#: ../src/frogr-main-view.c:1697
+#: src/frogr-main-view.c:1697
 msgid "Image Files"
 msgstr "Képfájlok"
 
-#: ../src/frogr-main-view.c:1701
+#: src/frogr-main-view.c:1701
 msgid "Video Files"
 msgstr "Videofájlok"
 
-#: ../src/frogr-main-view.c:1723
+#: src/frogr-main-view.c:1723
 msgid "You don't have any picture added yet"
 msgstr "Még nem adott hozzá egyetlen képet sem"
 
-#: ../src/frogr-main-view.c:1736
+#: src/frogr-main-view.c:1736
 msgid "You need to select some pictures first"
 msgstr "Először ki kell választania néhány képet"
 
-#: ../src/frogr-main-view.c:2108
+#: src/frogr-main-view.c:2108
 msgid "Not connected to Flickr"
 msgstr "Nincs kapcsolódva a Flickr-hez"
 
-#. Login string, showing the user is PRO (second '%s') if so.
-#: ../src/frogr-main-view.c:2118
+#: src/frogr-main-view.c:2118
 #, c-format
 msgid "Connected as %s%s"
 msgstr "Kapcsolódva mint %s%s"
 
-#: ../src/frogr-main-view.c:2119
+#: src/frogr-main-view.c:2119
 msgid " (PRO account)"
 msgstr " (PRO fiók)"
 
-#. Will show in the status bar the amount of data (in KB, MB
-#. or GB) the user is currently allowed to upload to flicker
-#. till the end of the month, in a CURRENT / MAX fashion.
-#. The '-' at the beginning is just a separator, since more
-#. blocks of text will be shown in the status bar too.
-#: ../src/frogr-main-view.c:2143
+#: src/frogr-main-view.c:2143
 #, c-format
 msgid " - %s / %s remaining"
 msgstr " - %s / %s van hátra"
 
-#. Will show in the status bar the amount of pictures and data
-#. (in KB, MB or GB) that would be uploaded as the sum of the
-#. sizes for every picture loaded in the application
-#: ../src/frogr-main-view.c:2169
+#: src/frogr-main-view.c:2169
 #, c-format
 msgid " - %d file to upload (%s)"
 msgid_plural " - %d files to upload (%s)"
 msgstr[0] " - %d feltöltendő fájl (%s)"
 msgstr[1] " - %d feltöltendő fájl (%s)"
 
-#: ../src/frogr-settings-dialog.c:185
+#: src/frogr-settings-dialog.c:185
 msgid "Default Visibility"
 msgstr "Alapértelmezett láthatóság"
 
-#: ../src/frogr-settings-dialog.c:224
+#: src/frogr-settings-dialog.c:224
 msgid "Default Content Type"
 msgstr "Alapértelmezett tartalom típus"
 
-#: ../src/frogr-settings-dialog.c:250
+#: src/frogr-settings-dialog.c:250
 msgid "Default Safety Level"
 msgstr "Alapértelmezett biztonsági szint"
 
-#: ../src/frogr-settings-dialog.c:276
+#: src/frogr-settings-dialog.c:276
 msgid "Default License"
 msgstr "Alapértelmezett licenc"
 
-#: ../src/frogr-settings-dialog.c:302
+#: src/frogr-settings-dialog.c:302
 msgid "Other Defaults"
 msgstr "Egyéb alapértékek"
 
-#: ../src/frogr-settings-dialog.c:312
+#: src/frogr-settings-dialog.c:312
 msgid "_Show Pictures in Global Search Results"
 msgstr "Képek _megjelenítése a globális keresési eredményekben"
 
-#: ../src/frogr-settings-dialog.c:315
+#: src/frogr-settings-dialog.c:315
 msgid "Set Geo_location Information for Pictures"
 msgstr "_Földrajzi helyzet információk megadása a képekhez"
 
-#: ../src/frogr-settings-dialog.c:318
+#: src/frogr-settings-dialog.c:318
 msgid "Replace 'Date Posted' with 'Date Taken' for Pictures"
 msgstr "A „Feltöltési dátum” cseréje a „Készítés dátumával” a fényképeknél"
 
-#: ../src/frogr-settings-dialog.c:324
+#: src/frogr-settings-dialog.c:324
 msgid "_General"
 msgstr "Á_ltalános"
 
-#: ../src/frogr-settings-dialog.c:344
+#: src/frogr-settings-dialog.c:344
 msgid "Proxy Settings"
 msgstr "Proxy beállítások"
 
-#. Enable proxy
-#: ../src/frogr-settings-dialog.c:353
+#: src/frogr-settings-dialog.c:353
 msgid "_Enable HTTP Proxy"
 msgstr "HTTP Proxy _engedélyezése"
 
-#: ../src/frogr-settings-dialog.c:363
+#: src/frogr-settings-dialog.c:363
 msgid "_Host:"
 msgstr "_Gép:"
 
-#. Proxy port
-#: ../src/frogr-settings-dialog.c:376
+#: src/frogr-settings-dialog.c:376
 msgid "_Port:"
 msgstr "_Port:"
 
-#. Proxy username
-#: ../src/frogr-settings-dialog.c:389
+#: src/frogr-settings-dialog.c:389
 msgid "U_sername:"
 msgstr "_Felhasználónév:"
 
-#. Proxy password
-#: ../src/frogr-settings-dialog.c:402
+#: src/frogr-settings-dialog.c:402
 msgid "Pass_word:"
 msgstr "_Jelszó:"
 
-#: ../src/frogr-settings-dialog.c:426
+#: src/frogr-settings-dialog.c:426
 msgid "Connec_tion"
 msgstr "_Kapcsolódás"
 
-#: ../src/frogr-settings-dialog.c:444
+#: src/frogr-settings-dialog.c:444
 msgid "Other options"
 msgstr "Egyéb beállítások"
 
-#: ../src/frogr-settings-dialog.c:454
+#: src/frogr-settings-dialog.c:454
 msgid "Ena_ble Tags Auto-Completion"
 msgstr "Címkék _automatikus kiegészítésének engedélyezése"
 
-#: ../src/frogr-settings-dialog.c:457
+#: src/frogr-settings-dialog.c:457
 msgid "_Import Tags from Pictures Metadata"
 msgstr "Címkék _importálása a képek metaadatából"
 
-#: ../src/frogr-settings-dialog.c:461
+#: src/frogr-settings-dialog.c:461
 msgid "Use _Dark GTK Theme"
 msgstr "_Sötét GTK téma használata"
 
-#: ../src/frogr-settings-dialog.c:465
+#: src/frogr-settings-dialog.c:465
 msgid "_Keep File Extensions in Titles when Loading"
 msgstr "Fájlkiterjesztések m_egtartása a címekben betöltéskor"
 
-#: ../src/frogr-settings-dialog.c:471
+#: src/frogr-settings-dialog.c:471
 msgid "_Misc"
 msgstr "_Egyebek"
 
-#: ../src/frogr-settings-dialog.c:972
+#: src/frogr-settings-dialog.c:972
 msgid "Preferences"
 msgstr "Beállítások"
 
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:1
-msgid "Aut_horize Account…"
-msgstr "Fiók _engedélyezése…"
-
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:2
-msgid "_Preferences…"
-msgstr "_Beállítások…"
-
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:3
-msgid "_Help"
-msgstr "_Súgó"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:1
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:9
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:3
-msgid "_Edit Details…"
-msgstr "_Részletek szerkesztése…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:2
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:10
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:4
-msgid "Add _Tags…"
-msgstr "_Címkék hozzáadása…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:3
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:11
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:5
-msgid "Add to _Group…"
-msgstr "Hozzáadás a c_soporthoz…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:4
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:12
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:6
-msgid "Add to _Photoset"
-msgstr "Hozzáadása az _albumhoz"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:5
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:13
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:7
-msgid "_Add to Existing Photoset…"
-msgstr "Hozzáadás _létező albumhoz…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:6
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:14
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:8
-msgid "_Create New Photoset…"
-msgstr "Új album létre_hozása…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:7
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:15
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:16
-msgid "_Open in External Viewer"
-msgstr "_Megnyitás külső megjelenítőben"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:8
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:6
-msgid "_Remove Elements"
-msgstr "_Elemek eltávolítása"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:1
-msgid "_File"
-msgstr "_Fájl"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:2
-msgid "_Open…"
-msgstr "_Megnyitás…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:4
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:2
-msgid "Save _As…"
-msgstr "Men_tés másként…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:5
-msgid "A_dd Elements…"
-msgstr "Elemek h_ozzáadása…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:7
-msgid "_Upload All"
-msgstr "Ö_sszes feltöltése"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:16
-msgid "_View"
-msgstr "_Nézet"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:17
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:9
-msgid "_Sort Elements"
-msgstr "Elemek _rendezése"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:18
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:10
-msgid "As _Loaded"
-msgstr "_Betöltés szerint"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:19
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:11
-msgid "By _Date Taken"
-msgstr "Készítés _dátuma szerint"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:20
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:12
-msgid "By _Title"
-msgstr "_Cím szerint"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:21
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:13
-msgid "By _Size"
-msgstr "_Méret szerint"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:22
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:14
-msgid "_Reversed Order"
-msgstr "_Fordított sorrend"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:23
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:15
-msgid "Enable _Tooltips"
-msgstr "_Buboréksúgó engedélyezése"
+#~ msgid "Aut_horize Account…"
+#~ msgstr "Fiók _engedélyezése…"
+
+#~ msgid "_Preferences…"
+#~ msgstr "_Beállítások…"
+
+#~ msgid "_Help"
+#~ msgstr "_Súgó"
+
+#~ msgid "_Edit Details…"
+#~ msgstr "_Részletek szerkesztése…"
+
+#~ msgid "Add _Tags…"
+#~ msgstr "_Címkék hozzáadása…"
+
+#~ msgid "Add to _Group…"
+#~ msgstr "Hozzáadás a c_soporthoz…"
+
+#~ msgid "Add to _Photoset"
+#~ msgstr "Hozzáadása az _albumhoz"
+
+#~ msgid "_Add to Existing Photoset…"
+#~ msgstr "Hozzáadás _létező albumhoz…"
+
+#~ msgid "_Create New Photoset…"
+#~ msgstr "Új album létre_hozása…"
+
+#~ msgid "_Open in External Viewer"
+#~ msgstr "_Megnyitás külső megjelenítőben"
+
+#~ msgid "_Remove Elements"
+#~ msgstr "_Elemek eltávolítása"
+
+#~ msgid "_File"
+#~ msgstr "_Fájl"
+
+#~ msgid "_Open…"
+#~ msgstr "_Megnyitás…"
+
+#~ msgid "Save _As…"
+#~ msgstr "Men_tés másként…"
+
+#~ msgid "A_dd Elements…"
+#~ msgstr "Elemek h_ozzáadása…"
+
+#~ msgid "_Upload All"
+#~ msgstr "Ö_sszes feltöltése"
+
+#~ msgid "_View"
+#~ msgstr "_Nézet"
+
+#~ msgid "_Sort Elements"
+#~ msgstr "Elemek _rendezése"
+
+#~ msgid "As _Loaded"
+#~ msgstr "_Betöltés szerint"
+
+#~ msgid "By _Date Taken"
+#~ msgstr "Készítés _dátuma szerint"
+
+#~ msgid "By _Title"
+#~ msgstr "_Cím szerint"
+
+#~ msgid "By _Size"
+#~ msgstr "_Méret szerint"
+
+#~ msgid "_Reversed Order"
+#~ msgstr "_Fordított sorrend"
+
+#~ msgid "Enable _Tooltips"
+#~ msgstr "_Buboréksúgó engedélyezése"
 
 #~ msgid "Set 'Taken Date' as 'Posted Date'"
 #~ msgstr "A „Készítés dátumának” beállítása „Feltöltési dátumként”"
diff --git a/po/id.po b/po/id.po
index 50e6c57..2b0ed3e 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: frogr master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=frogr&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-10-11 15:43+0000\n"
+"Report-Msgid-Bugs-To: msanchez gnome org\n"
+"POT-Creation-Date: 2016-08-12 13:09+0100\n"
 "PO-Revision-Date: 2014-10-16 19:51+0700\n"
 "Last-Translator: Andika Triwidada <andika gmail com>\n"
 "Language-Team: Indonesian <gnome i15n org>\n"
@@ -19,15 +18,27 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 1.5.7\n"
 
-#: ../data/frogr.appdata.xml.in.h:1
+#: data/frogr.appdata.xml.in:5 data/frogr.desktop.in.in:5
+#: data/frogr.desktop.in.in:14
+#, fuzzy
+msgid "frogr"
+msgstr "Frogr"
+
+#: data/frogr.appdata.xml.in:6 data/frogr.desktop.in.in:6
+#, fuzzy
+msgid "frogr: a Flickr Remote Organizer for GNOME"
+msgstr "Frogr: Pengelola Remote Flickr bagi GNOME"
+
+#: data/frogr.appdata.xml.in:8
+#, fuzzy
 msgid ""
-"Frogr is a small application for the GNOME desktop that allows users to "
+"frogr is a small application for the GNOME desktop that allows users to "
 "manage their accounts in the Flickr image hosting website."
 msgstr ""
 "Frogr adalah aplikasi kecil bagi desktop GNOME yang memungkinkan pengguna "
 "mengelola akun mereka dalam situs web hosting citra Flickr."
 
-#: ../data/frogr.appdata.xml.in.h:2
+#: data/frogr.appdata.xml.in:13
 msgid ""
 "It supports all the basic Flickr features, including uploading pictures, "
 "adding descriptions, setting tags and managing sets and groups pools."
@@ -35,74 +46,74 @@ msgstr ""
 "Ini mendukung semua fitur Flickr dasar, termasuk mengunggah gambar, menambah "
 "deskripsi, menata tag, dan mengelola pool set dan grup."
 
-#: ../data/frogr.desktop.in.in.h:1
-msgid "Frogr"
-msgstr "Frogr"
+#: data/frogr.appdata.xml.in:24
+#, fuzzy
+msgid "Screenshot of frogr"
+msgstr "Cuplika_n Layar"
 
-#: ../data/frogr.desktop.in.in.h:2
-msgid "Frogr: a Flickr Remote Organizer for GNOME"
-msgstr "Frogr: Pengelola Remote Flickr bagi GNOME"
+#: data/frogr.appdata.xml.in:29
+msgid "Mario Sanchez Prada"
+msgstr ""
 
-#: ../data/frogr.desktop.in.in.h:3
+#: data/frogr.desktop.in.in:7
 msgid "Upload and organize photos in Flickr accounts"
 msgstr "Unggah dan kelola foto dalam akun Flickr"
 
-#: ../data/frogr.desktop.in.in.h:4
+#: data/frogr.desktop.in.in:8
 msgid "Flickr;Image;Picture;Photo;Video;Uploader;"
 msgstr "Flickr;Citra;Gambar;Foto;Video;Pengunggah;"
 
-#: ../src/frogr-about-dialog.c:43
-msgid "A Flickr remote organizer for GNOME\n"
+#: src/frogr-about-dialog.c:43
+#, fuzzy
+msgid "A Flickr Remote Organizer for GNOME\n"
 msgstr "Suatu pengelola remote Flickr bagi GNOME\n"
 
-#: ../src/frogr-about-dialog.c:72
+#: src/frogr-about-dialog.c:72
 msgid "translator-credits"
 msgstr "Andika Triwidada <andika gmail com>, 2012, 2014"
 
-#: ../src/frogr-add-tags-dialog.c:198 ../src/frogr-add-to-set-dialog.c:553
-#: ../src/frogr-add-to-group-dialog.c:552
-#: ../src/frogr-create-new-set-dialog.c:329 ../src/frogr-details-dialog.c:1195
-#: ../src/frogr-main-view.c:446 ../src/frogr-main-view.c:1509
-#: ../src/frogr-main-view.c:1586 ../src/frogr-main-view.c:1636
-#: ../src/frogr-settings-dialog.c:961
+#: src/frogr-add-tags-dialog.c:191 src/frogr-add-to-group-dialog.c:528
+#: src/frogr-add-to-set-dialog.c:529 src/frogr-auth-dialog.c:153
+#: src/frogr-create-new-set-dialog.c:310 src/frogr-details-dialog.c:1168
+#: src/frogr-main-view.c:1543 src/frogr-main-view.c:1618
+#: src/frogr-main-view.c:1670 src/frogr-settings-dialog.c:930
 msgid "_Cancel"
 msgstr "_Batal"
 
-#: ../src/frogr-add-tags-dialog.c:200 ../src/frogr-add-to-set-dialog.c:555
-#: ../src/frogr-add-to-group-dialog.c:554
-#: ../src/frogr-create-new-set-dialog.c:331
+#: src/frogr-add-tags-dialog.c:193 src/frogr-add-to-group-dialog.c:530
+#: src/frogr-add-to-set-dialog.c:531 src/frogr-create-new-set-dialog.c:312
 msgid "_Add"
 msgstr "T_ambah"
 
-#: ../src/frogr-add-tags-dialog.c:209
+#: src/frogr-add-tags-dialog.c:202
 msgid "Enter a spaces separated list of tags:"
 msgstr "Masukkan daftar tag yang dipisah spasi:"
 
-#: ../src/frogr-add-tags-dialog.c:233
+#: src/frogr-add-tags-dialog.c:228
 msgid "Add Tags"
 msgstr "Tambah Tag"
 
-#: ../src/frogr-add-to-set-dialog.c:155
-msgid "Title"
-msgstr "Judul"
+#: src/frogr-add-to-group-dialog.c:147
+msgid "Name"
+msgstr "Nama"
 
-#: ../src/frogr-add-to-set-dialog.c:170 ../src/frogr-add-to-group-dialog.c:169
+#: src/frogr-add-to-group-dialog.c:162 src/frogr-add-to-set-dialog.c:163
 msgid "Elements"
 msgstr "Elemen"
 
-#: ../src/frogr-add-to-set-dialog.c:604
-msgid "Add to Sets"
-msgstr "Tambah ke Set"
-
-#: ../src/frogr-add-to-group-dialog.c:154
-msgid "Name"
-msgstr "Nama"
-
-#: ../src/frogr-add-to-group-dialog.c:603
+#: src/frogr-add-to-group-dialog.c:581
 msgid "Add to Groups"
 msgstr "Tambah ke Grup"
 
-#: ../src/frogr-auth-dialog.c:52
+#: src/frogr-add-to-set-dialog.c:148
+msgid "Title"
+msgstr "Judul"
+
+#: src/frogr-add-to-set-dialog.c:582
+msgid "Add to Sets"
+msgstr "Tambah ke Set"
+
+#: src/frogr-auth-dialog.c:59
 #, c-format
 msgid ""
 "Please press the button to authorize %s and then come back to complete the "
@@ -111,29 +122,29 @@ msgstr ""
 "Harap tekan tombol untuk mengotorisasi %s lalu kembalilah untuk "
 "menyelesaikan proses."
 
-#: ../src/frogr-auth-dialog.c:56 ../src/frogr-auth-dialog.c:141
+#: src/frogr-auth-dialog.c:63 src/frogr-auth-dialog.c:149
+#: src/frogr-controller.c:2286
 #, c-format
 msgid "Authorize %s"
 msgstr "Otorisasikan %s"
 
-#: ../src/frogr-auth-dialog.c:145 ../src/frogr-settings-dialog.c:963
+#: src/frogr-auth-dialog.c:155 src/frogr-settings-dialog.c:932
 msgid "_Close"
 msgstr "_Tutup"
 
-#. Description label
-#: ../src/frogr-auth-dialog.c:157
+#: src/frogr-auth-dialog.c:167
 msgid "Enter verification code:"
 msgstr "Masukkan kode verifikasi:"
 
-#: ../src/frogr-auth-dialog.c:209
+#: src/frogr-auth-dialog.c:221
 msgid "Invalid verification code"
 msgstr "Kode verifikasi tak valid"
 
-#: ../src/frogr-controller.c:597
+#: src/frogr-controller.c:581
 msgid "Process cancelled"
 msgstr "Proses dibatalkan"
 
-#: ../src/frogr-controller.c:602
+#: src/frogr-controller.c:586
 msgid ""
 "Connection error:\n"
 "Network not available"
@@ -141,7 +152,7 @@ msgstr ""
 "Galat koneksi:\n"
 "Jaringan tak tersedia"
 
-#: ../src/frogr-controller.c:606
+#: src/frogr-controller.c:590
 msgid ""
 "Connection error:\n"
 "Bad request"
@@ -149,7 +160,7 @@ msgstr ""
 "Galat koneksi:\n"
 "Permintaan buruk"
 
-#: ../src/frogr-controller.c:610
+#: src/frogr-controller.c:594
 msgid ""
 "Connection error:\n"
 "Server-side error"
@@ -157,7 +168,7 @@ msgstr ""
 "Galat koneksi:\n"
 "Galat sisi server"
 
-#: ../src/frogr-controller.c:614
+#: src/frogr-controller.c:598
 msgid ""
 "Error uploading:\n"
 "File invalid"
@@ -165,7 +176,7 @@ msgstr ""
 "Galat saat mengunggah:\n"
 "Berkas tak valid"
 
-#: ../src/frogr-controller.c:618
+#: src/frogr-controller.c:602
 msgid ""
 "Error uploading picture:\n"
 "Quota exceeded"
@@ -173,13 +184,13 @@ msgstr ""
 "Galat saat mengunggah gambar:\n"
 "Kuota terlampaui"
 
-#: ../src/frogr-controller.c:623
+#: src/frogr-controller.c:607
 #, c-format
 msgid "Quota exceeded (limit: %d video per month)"
 msgid_plural "Quota exceeded (limit: %d videos per month)"
 msgstr[0] "Kuota terlampaui (batas: %d video per bulan)"
 
-#: ../src/frogr-controller.c:627
+#: src/frogr-controller.c:611
 msgid ""
 "Error uploading video:\n"
 "You can't upload more videos with this account"
@@ -187,7 +198,7 @@ msgstr ""
 "Galat saat mengunggah video:\n"
 "Anda tak bisa mengunggah video lagi dengan akun ini"
 
-#: ../src/frogr-controller.c:633
+#: src/frogr-controller.c:617
 msgid ""
 "Error:\n"
 "Photo not found"
@@ -195,7 +206,7 @@ msgstr ""
 "Galat:\n"
 "Foto tak ditemukan"
 
-#: ../src/frogr-controller.c:637
+#: src/frogr-controller.c:621
 msgid ""
 "Error:\n"
 "Photo already in photoset"
@@ -203,7 +214,7 @@ msgstr ""
 "Galat:\n"
 "Foto sudah dalam set foto"
 
-#: ../src/frogr-controller.c:641
+#: src/frogr-controller.c:625
 msgid ""
 "Error:\n"
 "Photo already in group"
@@ -211,7 +222,7 @@ msgstr ""
 "Galat:\n"
 "Foto sudah dalam grup"
 
-#: ../src/frogr-controller.c:645
+#: src/frogr-controller.c:629
 msgid ""
 "Error:\n"
 "Photo already in the maximum number of groups possible"
@@ -219,7 +230,7 @@ msgstr ""
 "Galat:\n"
 "Foto sudah berada dalam cacah maksimum grup yang mungkin"
 
-#: ../src/frogr-controller.c:649
+#: src/frogr-controller.c:633
 msgid ""
 "Error:\n"
 "Group limit already reached"
@@ -227,7 +238,7 @@ msgstr ""
 "Galat:\n"
 "Batas grup telah tercapai"
 
-#: ../src/frogr-controller.c:653
+#: src/frogr-controller.c:637
 msgid ""
 "Error:\n"
 "Photo added to group's queue"
@@ -235,7 +246,7 @@ msgstr ""
 "Galat:\n"
 "Foto ditambahkan ke antrian grup"
 
-#: ../src/frogr-controller.c:657
+#: src/frogr-controller.c:641
 msgid ""
 "Error:\n"
 "Photo already added to group's queue"
@@ -243,7 +254,7 @@ msgstr ""
 "Galat:\n"
 "Foto sudah pernah ditambahkan ke antrian grup"
 
-#: ../src/frogr-controller.c:661
+#: src/frogr-controller.c:645
 msgid ""
 "Error:\n"
 "Content not allowed for this group"
@@ -251,8 +262,7 @@ msgstr ""
 "Galat:\n"
 "Isi tak diijinkan bagi grup ini"
 
-#: ../src/frogr-controller.c:665
-#, c-format
+#: src/frogr-controller.c:649
 msgid ""
 "Authorization failed.\n"
 "Please try again"
@@ -260,7 +270,7 @@ msgstr ""
 "Otorisasi gagal.\n"
 "Harap coba lagi"
 
-#: ../src/frogr-controller.c:671
+#: src/frogr-controller.c:655
 #, c-format
 msgid ""
 "Error\n"
@@ -271,8 +281,7 @@ msgstr ""
 "%s tak terotorisasi secara benar untuk mengunggah gambar ke Flickr.\n"
 "Harap otorisasi ulang"
 
-#: ../src/frogr-controller.c:676
-#, c-format
+#: src/frogr-controller.c:660
 msgid ""
 "Unable to authenticate in Flickr\n"
 "Please try again."
@@ -280,7 +289,7 @@ msgstr ""
 "Tak bisa mengotentikasi dalam Flickr\n"
 "Harap coba lagi."
 
-#: ../src/frogr-controller.c:680
+#: src/frogr-controller.c:664
 #, c-format
 msgid ""
 "You have not properly authorized %s yet.\n"
@@ -289,8 +298,7 @@ msgstr ""
 "Anda belum mengotorisasikan %s dengan benar.\n"
 "Harap coba lagi."
 
-#: ../src/frogr-controller.c:685
-#, c-format
+#: src/frogr-controller.c:669
 msgid ""
 "Invalid verification code.\n"
 "Please try again."
@@ -298,8 +306,7 @@ msgstr ""
 "Kode verifikasi tak valid.\n"
 "Harap coba lagi."
 
-#: ../src/frogr-controller.c:689
-#, c-format
+#: src/frogr-controller.c:673
 msgid ""
 "Error:\n"
 "Service not available"
@@ -307,59 +314,63 @@ msgstr ""
 "Galat:\n"
 "Layanan tak tersedia"
 
-#. General error: just dump the raw error description
-#: ../src/frogr-controller.c:694
+#: src/frogr-controller.c:678
 #, c-format
 msgid "An error happened: %s."
 msgstr "Terjadi galat: %s."
 
-#: ../src/frogr-controller.c:910
+#: src/frogr-controller.c:883
 msgid "Authorization failed (timed out)"
 msgstr "Otorisasi gagal (habis waktu)"
 
-#: ../src/frogr-controller.c:962
+#: src/frogr-controller.c:931
 #, c-format
 msgid "Retrying Upload (attempt %d/%d)…"
 msgstr "Mencoba Ulang Unggah (percobaan %d/%d)…"
 
-#: ../src/frogr-controller.c:967
+#: src/frogr-controller.c:936
 #, c-format
 msgid "Uploading '%s'…"
 msgstr "Mengunggah '%s'…"
 
-#: ../src/frogr-controller.c:2329
+#: src/frogr-controller.c:2242
 msgid "Updating credentials…"
 msgstr "Memutakhirkan kredensial…"
 
-#: ../src/frogr-controller.c:2334
+#: src/frogr-controller.c:2247
 msgid "Retrieving data for authorization…"
 msgstr "Mengambil data untuk otorisasi…"
 
-#: ../src/frogr-controller.c:2339
+#: src/frogr-controller.c:2252
 msgid "Finishing authorization…"
 msgstr "Menyelesaikan otorisasi…"
 
-#: ../src/frogr-controller.c:2344
+#: src/frogr-controller.c:2257
 msgid "Retrieving list of sets…"
 msgstr "Mengambil daftar set…"
 
-#: ../src/frogr-controller.c:2349
+#: src/frogr-controller.c:2262
 msgid "Retrieving list of groups…"
 msgstr "Mengambil daftar grup…"
 
-#: ../src/frogr-controller.c:2354
+#: src/frogr-controller.c:2267
 msgid "Retrieving list of tags…"
 msgstr "Mengambil daftar tag…"
 
-#: ../src/frogr-controller.c:2471
+#: src/frogr-controller.c:2292
+#, fuzzy
+msgid "Fetching information"
+msgstr "Tata Informasi Geo_lokasi"
+
+#: src/frogr-controller.c:2398
 msgid "No sets found"
 msgstr "Tak ada set yang ditemukan"
 
-#: ../src/frogr-controller.c:2498
+#: src/frogr-controller.c:2423
 msgid "No groups found"
 msgstr "Tak ada grup yang ditemukan"
 
-#: ../src/frogr-controller.c:3142
+#: src/frogr-controller.c:2984
 #, c-format
 msgid ""
 "You need to properly authorize %s before uploading any pictures to Flickr.\n"
@@ -369,183 +380,183 @@ msgstr ""
 "gambar ke Flickr.\n"
 "Harap otorisasi ulang."
 
-#: ../src/frogr-controller.c:3152
-#, c-format
+#: src/frogr-controller.c:2994
 msgid "You need to be connected before uploading any pictures to Flickr."
 msgstr "Anda perlu tersambung sebelum mengunggah sebarang gambar ke Flickr."
 
-#: ../src/frogr-controller.c:3224
-#, c-format
+#: src/frogr-controller.c:3012
+#, fuzzy
+msgid "Uploading Pictures"
+msgstr "Mengunggah '%s'…"
+
+#: src/frogr-controller.c:3057
 msgid "Error opening project file"
 msgstr "Galat saat membuka berkas projek"
 
-#. This shows a dialog notifying the problem to the user
-#: ../src/frogr-create-new-set-dialog.c:156 ../src/frogr-details-dialog.c:1022
+#: src/frogr-create-new-set-dialog.c:143 src/frogr-details-dialog.c:1001
 msgid "Missing data required"
 msgstr "Kurang data yang dibutuhkan"
 
-#: ../src/frogr-create-new-set-dialog.c:345
+#: src/frogr-create-new-set-dialog.c:326
 msgid "Title:"
 msgstr "Judul:"
 
-#: ../src/frogr-create-new-set-dialog.c:354
+#: src/frogr-create-new-set-dialog.c:335
 msgid "Description:"
 msgstr "Deskripsi:"
 
-#: ../src/frogr-create-new-set-dialog.c:375
+#: src/frogr-create-new-set-dialog.c:356
 msgid "Fill Pictures Details with Title and Description"
 msgstr "Isi Rincian Gambar dengan Judul dan Deskripsi"
 
-#: ../src/frogr-create-new-set-dialog.c:398
+#: src/frogr-create-new-set-dialog.c:381
 msgid "Create New Set"
 msgstr "Buat Set Baru"
 
-#: ../src/frogr-details-dialog.c:91 ../src/frogr-settings-dialog.c:99
+#: src/frogr-details-dialog.c:89 src/frogr-settings-dialog.c:97
 msgid "Default (as specified in Flickr)"
 msgstr "Baku (seperti dinyatakan dalam Flickr)"
 
-#: ../src/frogr-details-dialog.c:92 ../src/frogr-settings-dialog.c:100
+#: src/frogr-details-dialog.c:90 src/frogr-settings-dialog.c:98
 msgid "All rights reserved"
 msgstr "Semua hak dilindungi"
 
-#: ../src/frogr-details-dialog.c:93 ../src/frogr-settings-dialog.c:101
+#: src/frogr-details-dialog.c:91 src/frogr-settings-dialog.c:99
 msgid "CC Attribution-NonCommercial-ShareAlike"
 msgstr "CC Attribution-NonCommercial-ShareAlike"
 
-#: ../src/frogr-details-dialog.c:94 ../src/frogr-settings-dialog.c:102
+#: src/frogr-details-dialog.c:92 src/frogr-settings-dialog.c:100
 msgid "CC Attribution-NonCommercial"
 msgstr "CC Attribution-NonCommercial"
 
-#: ../src/frogr-details-dialog.c:95 ../src/frogr-settings-dialog.c:103
+#: src/frogr-details-dialog.c:93 src/frogr-settings-dialog.c:101
 msgid "CC Attribution-NonCommercial-NoDerivs"
 msgstr "CC Attribution-NonCommercial-NoDerivs"
 
-#: ../src/frogr-details-dialog.c:96 ../src/frogr-settings-dialog.c:104
+#: src/frogr-details-dialog.c:94 src/frogr-settings-dialog.c:102
 msgid "CC Attribution"
 msgstr "CC Attribution"
 
-#: ../src/frogr-details-dialog.c:97 ../src/frogr-settings-dialog.c:105
+#: src/frogr-details-dialog.c:95 src/frogr-settings-dialog.c:103
 msgid "CC Attribution-ShareAlike"
 msgstr "CC Attribution-ShareAlike"
 
-#: ../src/frogr-details-dialog.c:98 ../src/frogr-settings-dialog.c:106
+#: src/frogr-details-dialog.c:96 src/frogr-settings-dialog.c:104
 msgid "CC Attribution-NoDerivs"
 msgstr "CC Attribution-NoDerivs"
 
-#: ../src/frogr-details-dialog.c:178
+#: src/frogr-details-dialog.c:172
 msgid "Open with image viewer"
 msgstr "Buka dengan penampil gambar"
 
-#: ../src/frogr-details-dialog.c:196
+#: src/frogr-details-dialog.c:190
 msgid "_Title:"
 msgstr "_Judul:"
 
-#: ../src/frogr-details-dialog.c:206
+#: src/frogr-details-dialog.c:200
 msgid "_Description:"
 msgstr "_Deskripsi:"
 
-#: ../src/frogr-details-dialog.c:230
+#: src/frogr-details-dialog.c:224
 msgid "Ta_gs:"
 msgstr "Ta_g:"
 
-#: ../src/frogr-details-dialog.c:253
+#: src/frogr-details-dialog.c:247
 msgid "Visibility"
 msgstr "Kenampakan"
 
-#: ../src/frogr-details-dialog.c:263 ../src/frogr-settings-dialog.c:201
+#: src/frogr-details-dialog.c:257 src/frogr-settings-dialog.c:196
 msgid "_Private"
 msgstr "_Pribadi"
 
-#: ../src/frogr-details-dialog.c:267 ../src/frogr-settings-dialog.c:204
+#: src/frogr-details-dialog.c:261 src/frogr-settings-dialog.c:199
 msgid "P_ublic"
 msgstr "P_ublik"
 
-#: ../src/frogr-details-dialog.c:276 ../src/frogr-settings-dialog.c:212
+#: src/frogr-details-dialog.c:270 src/frogr-settings-dialog.c:207
 msgid "_Family"
 msgstr "_Keluarga"
 
-#: ../src/frogr-details-dialog.c:280 ../src/frogr-settings-dialog.c:214
+#: src/frogr-details-dialog.c:274 src/frogr-settings-dialog.c:209
 msgid "F_riends"
 msgstr "T_eman"
 
-#: ../src/frogr-details-dialog.c:294
+#: src/frogr-details-dialog.c:288
 msgid "Content Type"
 msgstr "Tipe Isi"
 
-#: ../src/frogr-details-dialog.c:302 ../src/frogr-settings-dialog.c:239
+#: src/frogr-details-dialog.c:296 src/frogr-settings-dialog.c:234
 msgid "P_hoto"
 msgstr "_Foto"
 
-#: ../src/frogr-details-dialog.c:306 ../src/frogr-settings-dialog.c:241
+#: src/frogr-details-dialog.c:300 src/frogr-settings-dialog.c:236
 msgid "Scree_nshot"
 msgstr "Cuplika_n Layar"
 
-#: ../src/frogr-details-dialog.c:310 ../src/frogr-settings-dialog.c:243
+#: src/frogr-details-dialog.c:304 src/frogr-settings-dialog.c:238
 msgid "Oth_er"
 msgstr "_Lainnya"
 
-#: ../src/frogr-details-dialog.c:323
+#: src/frogr-details-dialog.c:317
 msgid "Safety Level"
 msgstr "Tingkat Keamanan"
 
-#: ../src/frogr-details-dialog.c:331 ../src/frogr-settings-dialog.c:265
+#: src/frogr-details-dialog.c:325 src/frogr-settings-dialog.c:260
 msgid "S_afe"
 msgstr "_Aman"
 
-#: ../src/frogr-details-dialog.c:335 ../src/frogr-settings-dialog.c:267
+#: src/frogr-details-dialog.c:329 src/frogr-settings-dialog.c:262
 msgid "_Moderate"
 msgstr "_Sedang"
 
-#: ../src/frogr-details-dialog.c:339 ../src/frogr-settings-dialog.c:269
+#: src/frogr-details-dialog.c:333 src/frogr-settings-dialog.c:264
 msgid "Restr_icted"
 msgstr "_Terbatas"
 
-#: ../src/frogr-details-dialog.c:351
+#: src/frogr-details-dialog.c:345
 msgid "License Type"
 msgstr "Tipe Lisensi"
 
-#: ../src/frogr-details-dialog.c:373
+#: src/frogr-details-dialog.c:367
 msgid "Other Properties"
 msgstr "Properti Lain"
 
-#: ../src/frogr-details-dialog.c:381
+#: src/frogr-details-dialog.c:375
 msgid "_Show Up in Global Search Results"
 msgstr "Munculkan di Ha_sil Pencarian Global"
 
-#: ../src/frogr-details-dialog.c:385
+#: src/frogr-details-dialog.c:379
 msgid "Set Geo_location Information"
 msgstr "Tata Informasi Geo_lokasi"
 
-#: ../src/frogr-details-dialog.c:389
+#: src/frogr-details-dialog.c:383
 msgid "Replace 'Date Posted' with 'Date Taken'"
 msgstr "Mengganti 'Tanggal Dikirim' dengan 'Tanggal Diambil'"
 
-#. Visually indicate how many pictures are being edited
-#: ../src/frogr-details-dialog.c:484
+#: src/frogr-details-dialog.c:475
 #, c-format
 msgid "(%d Picture)"
 msgid_plural "(%d Pictures)"
 msgstr[0] "(%d Gambar)"
 
-#: ../src/frogr-details-dialog.c:558
+#: src/frogr-details-dialog.c:548
 msgid "An error happened trying to load the picture"
 msgstr "Terjadi galat saat mencoba memuat gambar"
 
-#: ../src/frogr-details-dialog.c:1196
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:8
+#: src/frogr-details-dialog.c:1169
 msgid "_Edit"
 msgstr "_Sunting"
 
-#: ../src/frogr-details-dialog.c:1225
+#: src/frogr-details-dialog.c:1197
 msgid "Edit Picture Details"
 msgstr "Sunting Rincian Gambar"
 
-#: ../src/frogr-file-loader.c:148
+#: src/frogr-file-loader.c:142
 #, c-format
 msgid "Loading files %d / %d"
 msgstr "Memuat berkas %d / %d"
 
-#: ../src/frogr-file-loader.c:382
+#: src/frogr-file-loader.c:369
 #, c-format
 msgid ""
 "Unable to load picture %s:\n"
@@ -554,7 +565,7 @@ msgstr ""
 "Tak bisa memuat gambar %s:\n"
 "%s"
 
-#: ../src/frogr-file-loader.c:413
+#: src/frogr-file-loader.c:400
 #, c-format
 msgid ""
 "Unable to load video %s\n"
@@ -563,10 +574,7 @@ msgstr ""
 "Tak bisa memuat video %s\n"
 "Harap periksa bahwa Anda telah memasang kodek yang benar"
 
-#. First %s is the title of the picture (filename of the file by
-#. default). Second %s is the max allowed size for a picture to be
-#. uploaded to flickr (different for free and PRO accounts).
-#: ../src/frogr-file-loader.c:654
+#: src/frogr-file-loader.c:636
 #, c-format
 msgid ""
 "Can't load file %s:\n"
@@ -575,350 +583,300 @@ msgstr ""
 "Tak bisa memuat berkas %s:\n"
 "Ukuran berkas lebih dari maksimum yang diijinkan bagi akun ini (%s)"
 
-#. First create the left side buttons
-#: ../src/frogr-main-view.c:572 ../src/frogr-main-view.c:652
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
 msgid "Open"
 msgstr "Buka"
 
-#: ../src/frogr-main-view.c:572 ../src/frogr-main-view.c:652
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
 msgid "Open Existing Project"
 msgstr "Buka Projek Yang Ada"
 
-#: ../src/frogr-main-view.c:574 ../src/frogr-main-view.c:655
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
 msgid "Add"
 msgstr "Tambah"
 
-#: ../src/frogr-main-view.c:574 ../src/frogr-main-view.c:655
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
 msgid "Add Elements"
 msgstr "Tambah Elemen"
 
-#: ../src/frogr-main-view.c:576 ../src/frogr-main-view.c:656
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
 msgid "Remove"
 msgstr "Hapus"
 
-#: ../src/frogr-main-view.c:576 ../src/frogr-main-view.c:656
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
 msgid "Remove Elements"
 msgstr "Hapus Elemen"
 
-#: ../src/frogr-main-view.c:578 ../src/frogr-main-view.c:658
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
 msgid "Upload"
 msgstr "Unggah"
 
-#: ../src/frogr-main-view.c:578 ../src/frogr-main-view.c:658
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
 msgid "Upload All"
 msgstr "Unggah Semua"
 
-#. Save project item to the right side
-#: ../src/frogr-main-view.c:583 ../src/frogr-main-view.c:653
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
 msgid "Save"
 msgstr "Simpan"
 
-#: ../src/frogr-main-view.c:583 ../src/frogr-main-view.c:653
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
 msgid "Save Current Project"
 msgstr "Simpan Projek Kini"
 
-#: ../src/frogr-main-view.c:956 ../data/gtkbuilder/frogr-app-menu.xml.h:4
+#: src/frogr-main-view.c:1016
 msgid "_About"
 msgstr "Tent_ang"
 
-#: ../src/frogr-main-view.c:960 ../data/gtkbuilder/frogr-app-menu.xml.h:5
+#: src/frogr-main-view.c:1020
 msgid "_Quit"
 msgstr "_Keluar"
 
-#. Create the submenu and insert it in the right section
-#: ../src/frogr-main-view.c:1016
+#: src/frogr-main-view.c:1070
 msgid "Accounts"
 msgstr "Akun"
 
-#. String showind the date and time a picture was taken
-#: ../src/frogr-main-view.c:1368
+#: src/frogr-main-view.c:1410
 #, c-format
 msgid "Taken: %s"
 msgstr "Diambil: %s"
 
-#: ../src/frogr-main-view.c:1373
+#: src/frogr-main-view.c:1415
 #, c-format
 msgid "File size: %s"
 msgstr "Ukuran berkas: %s"
 
-#: ../src/frogr-main-view.c:1506
+#: src/frogr-main-view.c:1540
 msgid "Select File"
 msgstr "Pilih Berkas"
 
-#: ../src/frogr-main-view.c:1510 ../src/frogr-main-view.c:1637
+#: src/frogr-main-view.c:1544 src/frogr-main-view.c:1671
 msgid "_Open"
 msgstr "_Buka"
 
-#: ../src/frogr-main-view.c:1519
+#: src/frogr-main-view.c:1553
 msgid "Frogr Project Files"
 msgstr "Berkas Projek Frogr"
 
-#: ../src/frogr-main-view.c:1583
+#: src/frogr-main-view.c:1615
 msgid "Select Destination"
 msgstr "Pilih Tujuan"
 
-#: ../src/frogr-main-view.c:1587 ../data/gtkbuilder/frogr-menu-bar.xml.h:3
+#: src/frogr-main-view.c:1619
 msgid "_Save"
 msgstr "_Simpan"
 
-#: ../src/frogr-main-view.c:1590
+#: src/frogr-main-view.c:1622
 msgid "Untitled Project.frogr"
 msgstr "Projek Tanpa Judul.frogr"
 
-#: ../src/frogr-main-view.c:1633
+#: src/frogr-main-view.c:1667
 msgid "Select a Picture"
 msgstr "Pilih Gambar"
 
-#: ../src/frogr-main-view.c:1660
+#: src/frogr-main-view.c:1694
 msgid "All Files"
 msgstr "Semua Berkas"
 
-#: ../src/frogr-main-view.c:1663
+#: src/frogr-main-view.c:1697
 msgid "Image Files"
 msgstr "Berkas Gambar"
 
-#: ../src/frogr-main-view.c:1667
+#: src/frogr-main-view.c:1701
 msgid "Video Files"
 msgstr "Berkas Video"
 
-#: ../src/frogr-main-view.c:1689
+#: src/frogr-main-view.c:1723
 msgid "You don't have any picture added yet"
 msgstr "Anda belum memiliki gambar apapun"
 
-#: ../src/frogr-main-view.c:1704
+#: src/frogr-main-view.c:1736
 msgid "You need to select some pictures first"
 msgstr "Anda perlu memilih beberapa gambar terlebih dahulu"
 
-#: ../src/frogr-main-view.c:2168
+#: src/frogr-main-view.c:2108
 msgid "Not connected to Flickr"
 msgstr "Tak tersambung ke Flickr"
 
-#. Login string, showing the user is PRO (second '%s') if so.
-#: ../src/frogr-main-view.c:2178
+#: src/frogr-main-view.c:2118
 #, c-format
 msgid "Connected as %s%s"
 msgstr "Tersambung sebagai %s%s"
 
-#: ../src/frogr-main-view.c:2179
+#: src/frogr-main-view.c:2119
 msgid " (PRO account)"
 msgstr " (akun PRO)"
 
-#. Will show in the status bar the amount of data (in KB, MB
-#. or GB) the user is currently allowed to upload to flicker
-#. till the end of the month, in a CURRENT / MAX fashion.
-#. The '-' at the beginning is just a separator, since more
-#. blocks of text will be shown in the status bar too.
-#: ../src/frogr-main-view.c:2203
+#: src/frogr-main-view.c:2143
 #, c-format
 msgid " - %s / %s remaining"
 msgstr " - %s / %s tersisa"
 
-#. Will show in the status bar the amount of pictures and data
-#. (in KB, MB or GB) that would be uploaded as the sum of the
-#. sizes for every picture loaded in the application
-#: ../src/frogr-main-view.c:2229
+#: src/frogr-main-view.c:2169
 #, c-format
 msgid " - %d file to upload (%s)"
 msgid_plural " - %d files to upload (%s)"
 msgstr[0] " - %d berkas untuk diunggah (%s)"
 
-#: ../src/frogr-settings-dialog.c:190
+#: src/frogr-settings-dialog.c:185
 msgid "Default Visibility"
 msgstr "Kenampakan Baku"
 
-#: ../src/frogr-settings-dialog.c:229
+#: src/frogr-settings-dialog.c:224
 msgid "Default Content Type"
 msgstr "Tipe Isi Baku"
 
-#: ../src/frogr-settings-dialog.c:255
+#: src/frogr-settings-dialog.c:250
 msgid "Default Safety Level"
 msgstr "Tingkat Keamanan Baku"
 
-#: ../src/frogr-settings-dialog.c:281
+#: src/frogr-settings-dialog.c:276
 msgid "Default License"
 msgstr "Lisensi Baku"
 
-#: ../src/frogr-settings-dialog.c:307
+#: src/frogr-settings-dialog.c:302
 msgid "Other Defaults"
 msgstr "Baku Lainnya"
 
-#: ../src/frogr-settings-dialog.c:317
+#: src/frogr-settings-dialog.c:312
 msgid "_Show Pictures in Global Search Results"
 msgstr "Munculkan Gambar dalam Ha_sil Pencarian Global"
 
-#: ../src/frogr-settings-dialog.c:320
+#: src/frogr-settings-dialog.c:315
 msgid "Set Geo_location Information for Pictures"
 msgstr "Tata Informasi Geo_lokasi bagi Gambar"
 
-#: ../src/frogr-settings-dialog.c:323
+#: src/frogr-settings-dialog.c:318
 msgid "Replace 'Date Posted' with 'Date Taken' for Pictures"
-msgstr ""
-"Mengganti 'Tanggal Dikirim' dengan 'Tanggal Diambil' bagi Gambar"
+msgstr "Mengganti 'Tanggal Dikirim' dengan 'Tanggal Diambil' bagi Gambar"
 
-#: ../src/frogr-settings-dialog.c:329
+#: src/frogr-settings-dialog.c:324
 msgid "_General"
 msgstr "_Umum"
 
-#: ../src/frogr-settings-dialog.c:352
+#: src/frogr-settings-dialog.c:344
 msgid "Proxy Settings"
 msgstr "Pengaturan Proksi"
 
-#. Enable proxy
-#: ../src/frogr-settings-dialog.c:361
+#: src/frogr-settings-dialog.c:353
 msgid "_Enable HTTP Proxy"
 msgstr "_Fungsikan Proksi HTTP"
 
-#: ../src/frogr-settings-dialog.c:371
+#: src/frogr-settings-dialog.c:363
 msgid "_Host:"
 msgstr "_Host:"
 
-#. Proxy port
-#: ../src/frogr-settings-dialog.c:384
+#: src/frogr-settings-dialog.c:376
 msgid "_Port:"
 msgstr "_Porta:"
 
-#. Proxy username
-#: ../src/frogr-settings-dialog.c:397
+#: src/frogr-settings-dialog.c:389
 msgid "U_sername:"
 msgstr "Nama _Pengguna:"
 
-#. Proxy password
-#: ../src/frogr-settings-dialog.c:410
+#: src/frogr-settings-dialog.c:402
 msgid "Pass_word:"
 msgstr "Sa_ndi:"
 
-#: ../src/frogr-settings-dialog.c:434
+#: src/frogr-settings-dialog.c:426
 msgid "Connec_tion"
 msgstr "Konek_si:"
 
-#: ../src/frogr-settings-dialog.c:455
+#: src/frogr-settings-dialog.c:444
 msgid "Other options"
 msgstr "Opsi lain"
 
-#: ../src/frogr-settings-dialog.c:465
+#: src/frogr-settings-dialog.c:454
 msgid "Ena_ble Tags Auto-Completion"
 msgstr "_Fungsikan Pelengkapan Otomatis Tag"
 
-#: ../src/frogr-settings-dialog.c:468
+#: src/frogr-settings-dialog.c:457
 msgid "_Import Tags from Pictures Metadata"
 msgstr "_Impor Tag dari Metadata Gambar"
 
-#: ../src/frogr-settings-dialog.c:472
+#: src/frogr-settings-dialog.c:461
 msgid "Use _Dark GTK Theme"
 msgstr "Gunakan Tema GTK _Gelap"
 
-#: ../src/frogr-settings-dialog.c:476
+#: src/frogr-settings-dialog.c:465
 msgid "_Keep File Extensions in Titles when Loading"
 msgstr "Pertahankan E_kstensi Berkas dalam Judul ketika Memuat"
 
-#: ../src/frogr-settings-dialog.c:482
+#: src/frogr-settings-dialog.c:471
 msgid "_Misc"
 msgstr "_Rupa-rupa"
 
-#: ../src/frogr-settings-dialog.c:1004
+#: src/frogr-settings-dialog.c:972
 msgid "Preferences"
 msgstr "Preferensi"
 
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:1
-msgid "Aut_horize Account…"
-msgstr "_Otorisasikan Akun…"
-
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:2
-msgid "_Preferences…"
-msgstr "_Preferensi…"
-
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:3
-msgid "_Help"
-msgstr "_Bantuan"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:1
-msgid "_File"
-msgstr "_Berkas"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:2
-msgid "_Open…"
-msgstr "_Buka…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:4
-msgid "Save _As…"
-msgstr "Simpan Seb_agai…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:5
-msgid "A_dd Elements…"
-msgstr "Tam_bah Elemen…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:6
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:8
-msgid "_Remove Elements"
-msgstr "_Hapus Elemen…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:7
-msgid "_Upload All"
-msgstr "_Unggah Semua"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:9
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:1
-msgid "_Edit Details…"
-msgstr "Sunting _Rincian…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:10
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:2
-msgid "Add _Tags…"
-msgstr "_Tambah Tag…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:11
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:3
-msgid "Add to _Group…"
-msgstr "Tambah ke _Grup…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:12
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:4
-msgid "Add to _Photoset"
-msgstr "Tambah ke _Set Foto"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:13
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:5
-msgid "_Add to Existing Photoset…"
-msgstr "T_ambah ke Set Foto Yang Ada…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:14
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:6
-msgid "_Create New Photoset…"
-msgstr "_Buat Set Foto Baru…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:15
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:7
-msgid "_Open in External Viewer"
-msgstr "Buka di Penampil E_ksternal"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:16
-msgid "_View"
-msgstr "_Tilik"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:17
-msgid "_Sort Elements"
-msgstr "_Urutkan Elemen"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:18
-msgid "As _Loaded"
-msgstr "Seperti _Dimuat"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:19
-msgid "By _Date Taken"
-msgstr "Menurut Tanggal _Diambil"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:20
-msgid "By _Title"
-msgstr "Menurut _Judul"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:21
-msgid "By _Size"
-msgstr "Menurut _Ukuran"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:22
-msgid "_Reversed Order"
-msgstr "Balik U_rutan"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:23
-msgid "Enable _Tooltips"
-msgstr "Fungsikan _Tooltips"
+#~ msgid "Aut_horize Account…"
+#~ msgstr "_Otorisasikan Akun…"
+
+#~ msgid "_Preferences…"
+#~ msgstr "_Preferensi…"
+
+#~ msgid "_Help"
+#~ msgstr "_Bantuan"
+
+#~ msgid "_File"
+#~ msgstr "_Berkas"
+
+#~ msgid "_Open…"
+#~ msgstr "_Buka…"
+
+#~ msgid "Save _As…"
+#~ msgstr "Simpan Seb_agai…"
+
+#~ msgid "A_dd Elements…"
+#~ msgstr "Tam_bah Elemen…"
+
+#~ msgid "_Remove Elements"
+#~ msgstr "_Hapus Elemen…"
+
+#~ msgid "_Upload All"
+#~ msgstr "_Unggah Semua"
+
+#~ msgid "_Edit Details…"
+#~ msgstr "Sunting _Rincian…"
+
+#~ msgid "Add _Tags…"
+#~ msgstr "_Tambah Tag…"
+
+#~ msgid "Add to _Group…"
+#~ msgstr "Tambah ke _Grup…"
+
+#~ msgid "Add to _Photoset"
+#~ msgstr "Tambah ke _Set Foto"
+
+#~ msgid "_Add to Existing Photoset…"
+#~ msgstr "T_ambah ke Set Foto Yang Ada…"
+
+#~ msgid "_Create New Photoset…"
+#~ msgstr "_Buat Set Foto Baru…"
+
+#~ msgid "_Open in External Viewer"
+#~ msgstr "Buka di Penampil E_ksternal"
+
+#~ msgid "_View"
+#~ msgstr "_Tilik"
+
+#~ msgid "_Sort Elements"
+#~ msgstr "_Urutkan Elemen"
+
+#~ msgid "As _Loaded"
+#~ msgstr "Seperti _Dimuat"
+
+#~ msgid "By _Date Taken"
+#~ msgstr "Menurut Tanggal _Diambil"
+
+#~ msgid "By _Title"
+#~ msgstr "Menurut _Judul"
+
+#~ msgid "By _Size"
+#~ msgstr "Menurut _Ukuran"
+
+#~ msgid "_Reversed Order"
+#~ msgstr "Balik U_rutan"
+
+#~ msgid "Enable _Tooltips"
+#~ msgstr "Fungsikan _Tooltips"
diff --git a/po/it.po b/po/it.po
index a016b2b..be0a0a1 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: frogr 0.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-19 14:14+0100\n"
+"Report-Msgid-Bugs-To: msanchez gnome org\n"
+"POT-Creation-Date: 2016-08-12 13:09+0100\n"
 "PO-Revision-Date: 2011-01-19 14:34+0100\n"
 "Last-Translator: Cristian Marchi <cri penta gmail com>\n"
 "Language-Team: Italian\n"
@@ -17,58 +17,128 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../src/frogr-about-dialog.c:44
-msgid "A Flickr remote organizer for GNOME\n"
+#: data/frogr.appdata.xml.in:5 data/frogr.desktop.in.in:5
+#: data/frogr.desktop.in.in:14
+msgid "frogr"
+msgstr "frogr"
+
+#: data/frogr.appdata.xml.in:6 data/frogr.desktop.in.in:6
+#, fuzzy
+msgid "frogr: a Flickr Remote Organizer for GNOME"
+msgstr "Un programma per GNOME di gestione remota di Flickr\n"
+
+#: data/frogr.appdata.xml.in:8
+msgid ""
+"frogr is a small application for the GNOME desktop that allows users to "
+"manage their accounts in the Flickr image hosting website."
+msgstr ""
+
+#: data/frogr.appdata.xml.in:13
+msgid ""
+"It supports all the basic Flickr features, including uploading pictures, "
+"adding descriptions, setting tags and managing sets and groups pools."
+msgstr ""
+
+#: data/frogr.appdata.xml.in:24
+#, fuzzy
+msgid "Screenshot of frogr"
+msgstr "Scr_eenshot"
+
+#: data/frogr.appdata.xml.in:29
+msgid "Mario Sanchez Prada"
+msgstr ""
+
+#: data/frogr.desktop.in.in:7
+msgid "Upload and organize photos in Flickr accounts"
+msgstr ""
+
+#: data/frogr.desktop.in.in:8
+msgid "Flickr;Image;Picture;Photo;Video;Uploader;"
+msgstr ""
+
+#: src/frogr-about-dialog.c:43
+#, fuzzy
+msgid "A Flickr Remote Organizer for GNOME\n"
 msgstr "Un programma per GNOME di gestione remota di Flickr\n"
 
-#: ../src/frogr-about-dialog.c:107
+#: src/frogr-about-dialog.c:72
 msgid "translator-credits"
 msgstr "Cristian Marchi <cri penta gmail com>"
 
-#: ../src/frogr-add-tags-dialog.c:342
+#: src/frogr-add-tags-dialog.c:191 src/frogr-add-to-group-dialog.c:528
+#: src/frogr-add-to-set-dialog.c:529 src/frogr-auth-dialog.c:153
+#: src/frogr-create-new-set-dialog.c:310 src/frogr-details-dialog.c:1168
+#: src/frogr-main-view.c:1543 src/frogr-main-view.c:1618
+#: src/frogr-main-view.c:1670 src/frogr-settings-dialog.c:930
+msgid "_Cancel"
+msgstr ""
+
+#: src/frogr-add-tags-dialog.c:193 src/frogr-add-to-group-dialog.c:530
+#: src/frogr-add-to-set-dialog.c:531 src/frogr-create-new-set-dialog.c:312
+msgid "_Add"
+msgstr ""
+
+#: src/frogr-add-tags-dialog.c:202
 msgid "Enter a spaces separated list of tags:"
 msgstr "Inserire un elenco di tag separati da spazi:"
 
-#: ../src/frogr-add-tags-dialog.c:383
+#: src/frogr-add-tags-dialog.c:228
 msgid "Add Tags"
 msgstr "Aggiungi tag"
 
-#: ../src/frogr-add-to-set-dialog.c:133
-msgid "Title"
-msgstr "Titolo"
+#: src/frogr-add-to-group-dialog.c:147
+msgid "Name"
+msgstr "Nome"
 
-#: ../src/frogr-add-to-set-dialog.c:148
-#: ../src/frogr-add-to-group-dialog.c:148
+#: src/frogr-add-to-group-dialog.c:162 src/frogr-add-to-set-dialog.c:163
 msgid "Elements"
 msgstr "Elementi"
 
-#: ../src/frogr-add-to-set-dialog.c:577
+#: src/frogr-add-to-group-dialog.c:581
+msgid "Add to Groups"
+msgstr "Aggiungi ai gruppi"
+
+#: src/frogr-add-to-set-dialog.c:148
+msgid "Title"
+msgstr "Titolo"
+
+#: src/frogr-add-to-set-dialog.c:582
 msgid "Add to Sets"
 msgstr "Aggiungi ai set"
 
-#: ../src/frogr-add-to-group-dialog.c:133
-msgid "Name"
-msgstr "Nome"
+#: src/frogr-auth-dialog.c:59
+#, fuzzy, c-format
+msgid ""
+"Please press the button to authorize %s and then come back to complete the "
+"process."
+msgstr ""
+"Premere il pulsante per autorizzare %s e tornare poi a questa schermata per "
+"completare il processo."
 
-#: ../src/frogr-add-to-group-dialog.c:577
-msgid "Add to Groups"
-msgstr "Aggiungi ai gruppi"
+#: src/frogr-auth-dialog.c:63 src/frogr-auth-dialog.c:149
+#: src/frogr-controller.c:2286
+#, fuzzy, c-format
+msgid "Authorize %s"
+msgstr "Autorizza _frogr"
 
-#: ../src/frogr-auth-dialog.c:31
-#, c-format
-msgid "Please press the button to authorize %s and then come back to this screen to complete the process."
-msgstr "Premere il pulsante per autorizzare %s e tornare poi a questa schermata per completare il processo."
+#: src/frogr-auth-dialog.c:155 src/frogr-settings-dialog.c:932
+msgid "_Close"
+msgstr ""
 
-#: ../src/frogr-auth-dialog.c:35
-#, c-format
-msgid "Press the button to start using %s once you've authorized it in your flickr account."
-msgstr "Premere il pulsante per iniziare a usare %s dopo averlo autorizzato nel proprio account Flickr"
+#: src/frogr-auth-dialog.c:167
+msgid "Enter verification code:"
+msgstr ""
+
+#: src/frogr-auth-dialog.c:221
+msgid "Invalid verification code"
+msgstr ""
 
-#: ../src/frogr-controller.c:241
-msgid "Process cancelled by the user"
+#: src/frogr-controller.c:581
+#, fuzzy
+msgid "Process cancelled"
 msgstr "Processo annullata dall'utente"
 
-#: ../src/frogr-controller.c:246
+#: src/frogr-controller.c:586
 msgid ""
 "Connection error:\n"
 "Network not available"
@@ -76,7 +146,7 @@ msgstr ""
 "Errore di connessione:\n"
 "rete non disponibile"
 
-#: ../src/frogr-controller.c:251
+#: src/frogr-controller.c:590
 msgid ""
 "Connection error:\n"
 "Bad request"
@@ -84,7 +154,7 @@ msgstr ""
 "Errore di connessione:\n"
 "richiesta errata"
 
-#: ../src/frogr-controller.c:256
+#: src/frogr-controller.c:594
 msgid ""
 "Connection error:\n"
 "Server-side error"
@@ -92,15 +162,16 @@ msgstr ""
 "Errore di connessione:\n"
 "lato server"
 
-#: ../src/frogr-controller.c:261
+#: src/frogr-controller.c:598
+#, fuzzy
 msgid ""
-"Error uploading picture:\n"
+"Error uploading:\n"
 "File invalid"
 msgstr ""
 "Errore di invio delle immagini:\n"
 "file non valido"
 
-#: ../src/frogr-controller.c:266
+#: src/frogr-controller.c:602
 msgid ""
 "Error uploading picture:\n"
 "Quota exceeded"
@@ -108,7 +179,20 @@ msgstr ""
 "Errore di invio delle immagini:\n"
 "quota superata"
 
-#: ../src/frogr-controller.c:271
+#: src/frogr-controller.c:607
+#, c-format
+msgid "Quota exceeded (limit: %d video per month)"
+msgid_plural "Quota exceeded (limit: %d videos per month)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/frogr-controller.c:611
+msgid ""
+"Error uploading video:\n"
+"You can't upload more videos with this account"
+msgstr ""
+
+#: src/frogr-controller.c:617
 msgid ""
 "Error:\n"
 "Photo not found"
@@ -116,7 +200,7 @@ msgstr ""
 "Errore:\n"
 "fotografia non trovata"
 
-#: ../src/frogr-controller.c:276
+#: src/frogr-controller.c:621
 msgid ""
 "Error:\n"
 "Photo already in photoset"
@@ -124,7 +208,7 @@ msgstr ""
 "Errore:\n"
 "fotografia già presente nel set"
 
-#: ../src/frogr-controller.c:281
+#: src/frogr-controller.c:625
 msgid ""
 "Error:\n"
 "Photo already in group"
@@ -132,7 +216,7 @@ msgstr ""
 "Errore:\n"
 "fotografia già presente nel gruppo"
 
-#: ../src/frogr-controller.c:286
+#: src/frogr-controller.c:629
 msgid ""
 "Error:\n"
 "Photo already in the maximum number of groups possible"
@@ -140,15 +224,16 @@ msgstr ""
 "Errore:\n"
 "fotografia già presente nel numero massimo di gruppi"
 
-#: ../src/frogr-controller.c:291
+#: src/frogr-controller.c:633
+#, fuzzy
 msgid ""
 "Error:\n"
-"Group limit alrady reached"
+"Group limit already reached"
 msgstr ""
 "Errore:\n"
 "limite del gruppo raggiunto"
 
-#: ../src/frogr-controller.c:296
+#: src/frogr-controller.c:637
 msgid ""
 "Error:\n"
 "Photo added to group's queue"
@@ -156,7 +241,7 @@ msgstr ""
 "Errore:\n"
 "fotografia aggiunta alla coda del gruppo"
 
-#: ../src/frogr-controller.c:301
+#: src/frogr-controller.c:641
 msgid ""
 "Error:\n"
 "Photo already added to group's queue"
@@ -164,7 +249,7 @@ msgstr ""
 "Errore:\n"
 "fotografia già aggiunta alla coda del gruppo"
 
-#: ../src/frogr-controller.c:306
+#: src/frogr-controller.c:645
 msgid ""
 "Error:\n"
 "Content not allowed for this group"
@@ -172,8 +257,7 @@ msgstr ""
 "Errore:\n"
 "contenuto non permesso per questo gruppo"
 
-#: ../src/frogr-controller.c:311
-#, c-format
+#: src/frogr-controller.c:649
 msgid ""
 "Authorization failed.\n"
 "Please try again"
@@ -181,19 +265,46 @@ msgstr ""
 "Autorizzazione non riuscita.\n"
 "Provare di nuovo"
 
-#: ../src/frogr-controller.c:317
-#, c-format
+#: src/frogr-controller.c:655
+#, fuzzy, c-format
 msgid ""
 "Error\n"
-"%s is not properly authorized to upload pictures to flickr.\n"
+"%s is not properly authorized to upload pictures to Flickr.\n"
 "Please re-authorize it"
 msgstr ""
 "Errore\n"
 "%s non è autorizzato correttamente per inviare le foto a Flickr.\n"
 "Autorizzarlo di nuovo"
 
-#: ../src/frogr-controller.c:323
-#, c-format
+#: src/frogr-controller.c:660
+#, fuzzy
+msgid ""
+"Unable to authenticate in Flickr\n"
+"Please try again."
+msgstr ""
+"Autorizzazione non riuscita.\n"
+"Provare di nuovo"
+
+#: src/frogr-controller.c:664
+#, fuzzy, c-format
+msgid ""
+"You have not properly authorized %s yet.\n"
+"Please try again."
+msgstr ""
+"È necessario autorizzare correttamente %s prima di inviare qualsiasi "
+"immagine su flickr.\n"
+"Autorizzarlo di nuovo"
+
+#: src/frogr-controller.c:669
+#, fuzzy
+msgid ""
+"Invalid verification code.\n"
+"Please try again."
+msgstr ""
+"Autorizzazione non riuscita.\n"
+"Provare di nuovo"
+
+#: src/frogr-controller.c:673
 msgid ""
 "Error:\n"
 "Service not available"
@@ -201,397 +312,641 @@ msgstr ""
 "Errore:\n"
 "servizio non disponibile"
 
-#. General error: just dump the raw error description
-#: ../src/frogr-controller.c:329
-#, c-format
-msgid "An error happened while uploading a picture: %s."
+#: src/frogr-controller.c:678
+#, fuzzy, c-format
+msgid "An error happened: %s."
 msgstr "Si è verificato un errore inviando un'immagine: %s."
 
-#: ../src/frogr-controller.c:455
-msgid "Authorization successfully completed!"
-msgstr "Autorizzazione completata con successo!"
-
-#: ../src/frogr-controller.c:859
-msgid "Creating new photoset…"
-msgstr "Creazione del nuovo set..."
+#: src/frogr-controller.c:883
+#, fuzzy
+msgid "Authorization failed (timed out)"
+msgstr ""
+"Autorizzazione non riuscita.\n"
+"Provare di nuovo"
 
-#: ../src/frogr-controller.c:884
-msgid "Adding picture to photoset…"
-msgstr "Aggiunta delle immagini al set..."
+#: src/frogr-controller.c:931
+#, c-format
+msgid "Retrying Upload (attempt %d/%d)…"
+msgstr ""
 
-#: ../src/frogr-controller.c:907
-msgid "Adding picture to group…"
-msgstr "Aggiunta delle immagini al gruppo..."
+#: src/frogr-controller.c:936
+#, c-format
+msgid "Uploading '%s'…"
+msgstr "Caricamento di «%s»..."
 
-#: ../src/frogr-controller.c:972
-msgid "Operation successfully completed!"
-msgstr "Operazione completata con successo!"
+#: src/frogr-controller.c:2242
+msgid "Updating credentials…"
+msgstr ""
 
-#: ../src/frogr-controller.c:1429
-#: ../src/frogr-controller.c:1462
-msgid "Retrieving list of tags…"
+#: src/frogr-controller.c:2247
+#, fuzzy
+msgid "Retrieving data for authorization…"
 msgstr "Recupero dell'elenco dei tag..."
 
-#: ../src/frogr-controller.c:1495
-#: ../src/frogr-controller.c:1527
+#: src/frogr-controller.c:2252
+msgid "Finishing authorization…"
+msgstr ""
+
+#: src/frogr-controller.c:2257
 msgid "Retrieving list of sets…"
 msgstr "Recupero dell'elenco dei set..."
 
-#: ../src/frogr-controller.c:1540
-msgid "No sets found"
-msgstr "Nessun set trovato"
-
-#: ../src/frogr-controller.c:1562
+#: src/frogr-controller.c:2262
 msgid "Retrieving list of groups…"
 msgstr "Recupero dell'elenco dei gruppi..."
 
-#: ../src/frogr-controller.c:1575
+#: src/frogr-controller.c:2267
+msgid "Retrieving list of tags…"
+msgstr "Recupero dell'elenco dei tag..."
+
+#: src/frogr-controller.c:2292
+msgid "Fetching information"
+msgstr ""
+
+#: src/frogr-controller.c:2398
+msgid "No sets found"
+msgstr "Nessun set trovato"
+
+#: src/frogr-controller.c:2423
 msgid "No groups found"
 msgstr "Nessun gruppo trovato"
 
-#: ../src/frogr-controller.c:2165
-#, c-format
+#: src/frogr-controller.c:2984
+#, fuzzy, c-format
 msgid ""
-"You need to properly authorize %s before uploading any pictures to flickr.\n"
+"You need to properly authorize %s before uploading any pictures to Flickr.\n"
 "Please re-authorize it."
 msgstr ""
-"È necessario autorizzare correttamente %s prima di inviare qualsiasi immagine su flickr.\n"
+"È necessario autorizzare correttamente %s prima di inviare qualsiasi "
+"immagine su flickr.\n"
+"Autorizzarlo di nuovo"
+
+#: src/frogr-controller.c:2994
+#, fuzzy
+msgid "You need to be connected before uploading any pictures to Flickr."
+msgstr ""
+"È necessario autorizzare correttamente %s prima di inviare qualsiasi "
+"immagine su flickr.\n"
 "Autorizzarlo di nuovo"
 
-#. This shows a dialog notifying the problem to the user
-#: ../src/frogr-create-new-set-dialog.c:120
-#: ../src/frogr-details-dialog.c:894
+#: src/frogr-controller.c:3012
+#, fuzzy
+msgid "Uploading Pictures"
+msgstr "Caricamento immagini in corso..."
+
+#: src/frogr-controller.c:3057
+msgid "Error opening project file"
+msgstr ""
+
+#: src/frogr-create-new-set-dialog.c:143 src/frogr-details-dialog.c:1001
 msgid "Missing data required"
 msgstr "Mancano dei dati richiesti"
 
-#: ../src/frogr-create-new-set-dialog.c:304
-msgid "Set's title:"
-msgstr "Titolo del set:"
+#: src/frogr-create-new-set-dialog.c:326
+#, fuzzy
+msgid "Title:"
+msgstr "_Titolo:"
 
-#: ../src/frogr-create-new-set-dialog.c:317
-msgid "Set's description:"
-msgstr "Descrizione del set:"
+#: src/frogr-create-new-set-dialog.c:335
+#, fuzzy
+msgid "Description:"
+msgstr "_Descrizione:"
+
+#: src/frogr-create-new-set-dialog.c:356
+msgid "Fill Pictures Details with Title and Description"
+msgstr ""
 
-#: ../src/frogr-create-new-set-dialog.c:356
-msgid "Create new Set"
+#: src/frogr-create-new-set-dialog.c:381
+#, fuzzy
+msgid "Create New Set"
 msgstr "Crea nuovo set"
 
-#: ../src/frogr-details-dialog.c:160
+#: src/frogr-details-dialog.c:89 src/frogr-settings-dialog.c:97
+msgid "Default (as specified in Flickr)"
+msgstr ""
+
+#: src/frogr-details-dialog.c:90 src/frogr-settings-dialog.c:98
+msgid "All rights reserved"
+msgstr ""
+
+#: src/frogr-details-dialog.c:91 src/frogr-settings-dialog.c:99
+msgid "CC Attribution-NonCommercial-ShareAlike"
+msgstr ""
+
+#: src/frogr-details-dialog.c:92 src/frogr-settings-dialog.c:100
+msgid "CC Attribution-NonCommercial"
+msgstr ""
+
+#: src/frogr-details-dialog.c:93 src/frogr-settings-dialog.c:101
+msgid "CC Attribution-NonCommercial-NoDerivs"
+msgstr ""
+
+#: src/frogr-details-dialog.c:94 src/frogr-settings-dialog.c:102
+msgid "CC Attribution"
+msgstr ""
+
+#: src/frogr-details-dialog.c:95 src/frogr-settings-dialog.c:103
+msgid "CC Attribution-ShareAlike"
+msgstr ""
+
+#: src/frogr-details-dialog.c:96 src/frogr-settings-dialog.c:104
+msgid "CC Attribution-NoDerivs"
+msgstr ""
+
+#: src/frogr-details-dialog.c:172
+msgid "Open with image viewer"
+msgstr ""
+
+#: src/frogr-details-dialog.c:190
+msgid "_Title:"
+msgstr "_Titolo:"
+
+#: src/frogr-details-dialog.c:200
+msgid "_Description:"
+msgstr "_Descrizione:"
+
+#: src/frogr-details-dialog.c:224
+msgid "Ta_gs:"
+msgstr "Ta_g:"
+
+#: src/frogr-details-dialog.c:247
 msgid "Visibility"
 msgstr "Visibilità"
 
-#: ../src/frogr-details-dialog.c:171
-#: ../src/frogr-settings-dialog.c:143
+#: src/frogr-details-dialog.c:257 src/frogr-settings-dialog.c:196
 msgid "_Private"
 msgstr "_Privato"
 
-#: ../src/frogr-details-dialog.c:175
-#: ../src/frogr-settings-dialog.c:147
+#: src/frogr-details-dialog.c:261 src/frogr-settings-dialog.c:199
 msgid "P_ublic"
 msgstr "P_ubblico"
 
-#: ../src/frogr-details-dialog.c:183
-#: ../src/frogr-settings-dialog.c:155
-msgid "Visible to _Family"
-msgstr "Visibile ai _famigliari"
+#: src/frogr-details-dialog.c:270 src/frogr-settings-dialog.c:207
+#, fuzzy
+msgid "_Family"
+msgstr "Famiglia"
 
-#: ../src/frogr-details-dialog.c:187
-#: ../src/frogr-settings-dialog.c:159
-msgid "Visible to F_riends"
-msgstr "Visibile agli _amici"
+#: src/frogr-details-dialog.c:274 src/frogr-settings-dialog.c:209
+#, fuzzy
+msgid "F_riends"
+msgstr "Amici"
 
-#: ../src/frogr-details-dialog.c:200
-#: ../src/frogr-settings-dialog.c:167
-msgid "_Show up in Global Search Results"
-msgstr "Includi nelle _ricerche pubbliche"
-
-#: ../src/frogr-details-dialog.c:213
-msgid "Content type"
+#: src/frogr-details-dialog.c:288
+#, fuzzy
+msgid "Content Type"
 msgstr "Tipo di contenuto"
 
-#: ../src/frogr-details-dialog.c:222
-#: ../src/frogr-settings-dialog.c:204
+#: src/frogr-details-dialog.c:296 src/frogr-settings-dialog.c:234
 msgid "P_hoto"
 msgstr "F_otografie"
 
-#: ../src/frogr-details-dialog.c:226
-#: ../src/frogr-settings-dialog.c:208
+#: src/frogr-details-dialog.c:300 src/frogr-settings-dialog.c:236
 msgid "Scree_nshot"
 msgstr "Scr_eenshot"
 
-#: ../src/frogr-details-dialog.c:230
-#: ../src/frogr-settings-dialog.c:212
+#: src/frogr-details-dialog.c:304 src/frogr-settings-dialog.c:238
 msgid "Oth_er"
 msgstr "A_ltro"
 
-#: ../src/frogr-details-dialog.c:244
-msgid "Safety level"
+#: src/frogr-details-dialog.c:317
+#, fuzzy
+msgid "Safety Level"
 msgstr "Livello di sicurezza"
 
-#: ../src/frogr-details-dialog.c:253
-#: ../src/frogr-settings-dialog.c:245
+#: src/frogr-details-dialog.c:325 src/frogr-settings-dialog.c:260
 msgid "S_afe"
 msgstr "_Sicura"
 
-#: ../src/frogr-details-dialog.c:257
-#: ../src/frogr-settings-dialog.c:249
+#: src/frogr-details-dialog.c:329 src/frogr-settings-dialog.c:262
 msgid "_Moderate"
 msgstr "_Moderata"
 
-#: ../src/frogr-details-dialog.c:261
-#: ../src/frogr-settings-dialog.c:253
+#: src/frogr-details-dialog.c:333 src/frogr-settings-dialog.c:264
 msgid "Restr_icted"
 msgstr "L_imitata"
 
-#: ../src/frogr-details-dialog.c:275
-msgid "_Title:"
-msgstr "_Titolo:"
+#: src/frogr-details-dialog.c:345
+msgid "License Type"
+msgstr ""
 
-#: ../src/frogr-details-dialog.c:287
-msgid "_Description:"
-msgstr "_Descrizione:"
+#: src/frogr-details-dialog.c:367
+msgid "Other Properties"
+msgstr ""
 
-#: ../src/frogr-details-dialog.c:313
-msgid "Ta_gs:"
-msgstr "Ta_g:"
+#: src/frogr-details-dialog.c:375
+#, fuzzy
+msgid "_Show Up in Global Search Results"
+msgstr "Includi nelle _ricerche pubbliche"
+
+#: src/frogr-details-dialog.c:379
+msgid "Set Geo_location Information"
+msgstr ""
+
+#: src/frogr-details-dialog.c:383
+msgid "Replace 'Date Posted' with 'Date Taken'"
+msgstr ""
+
+#: src/frogr-details-dialog.c:475
+#, fuzzy, c-format
+msgid "(%d Picture)"
+msgid_plural "(%d Pictures)"
+msgstr[0] "_Aggiungi immagine"
+msgstr[1] "_Aggiungi immagine"
+
+#: src/frogr-details-dialog.c:548
+#, fuzzy
+msgid "An error happened trying to load the picture"
+msgstr "Si è verificato un errore inviando un'immagine: %s."
 
-#: ../src/frogr-details-dialog.c:1075
-#: ../src/frogr-details-dialog.c:1080
+#: src/frogr-details-dialog.c:1169
+msgid "_Edit"
+msgstr ""
+
+#: src/frogr-details-dialog.c:1197
 msgid "Edit Picture Details"
 msgstr "Modifica dei dettagli dell'immagine"
 
-#. File menu
-#: ../src/frogr-main-view.c:228
-msgid "_File"
-msgstr "_File"
+#: src/frogr-file-loader.c:142
+#, fuzzy, c-format
+msgid "Loading files %d / %d"
+msgstr "Caricamento dell'immagine %d su %d"
+
+#: src/frogr-file-loader.c:369
+#, c-format
+msgid ""
+"Unable to load picture %s:\n"
+"%s"
+msgstr ""
+
+#: src/frogr-file-loader.c:400
+#, c-format
+msgid ""
+"Unable to load video %s\n"
+"Please check that you have the right codec installed"
+msgstr ""
+
+#: src/frogr-file-loader.c:636
+#, c-format
+msgid ""
+"Can't load file %s:\n"
+"Size of file is bigger than the maximum allowed for this account (%s)"
+msgstr ""
 
-#: ../src/frogr-main-view.c:234
-msgid "_Add Pictures"
-msgstr "_Aggiungi immagine"
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
+msgid "Open"
+msgstr ""
 
-#. Remove
-#: ../src/frogr-main-view.c:241
-#: ../src/frogr-main-view.c:442
-msgid "_Remove Pictures"
-msgstr "Rimuovi _immagine"
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
+msgid "Open Existing Project"
+msgstr ""
 
-#. Accounts menu item and submenu
-#: ../src/frogr-main-view.c:251
-msgid "Accou_nts"
-msgstr "Accou_nt"
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
+msgid "Add"
+msgstr "Aggiungi"
 
-#. Authorize menu item
-#: ../src/frogr-main-view.c:257
-msgid "Authorize _frogr"
-msgstr "Autorizza _frogr"
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
+#, fuzzy
+msgid "Add Elements"
+msgstr "Elementi"
 
-#: ../src/frogr-main-view.c:266
-msgid "_Preferences…"
-msgstr "_Preferenze..."
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
+msgid "Remove"
+msgstr "Elimina"
 
-#: ../src/frogr-main-view.c:274
-msgid "_Quit"
-msgstr "_Esci"
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
+#, fuzzy
+msgid "Remove Elements"
+msgstr "Elementi"
 
-#. Actions menu
-#: ../src/frogr-main-view.c:280
-msgid "A_ctions"
-msgstr "A_zioni"
-
-#. Edit details
-#: ../src/frogr-main-view.c:286
-#: ../src/frogr-main-view.c:400
-msgid "Edit _Details…"
-msgstr "Modifica _dettagli..."
-
-#. Add Tags
-#: ../src/frogr-main-view.c:293
-#: ../src/frogr-main-view.c:407
-msgid "Add _Tags…"
-msgstr "Aggiungi _tag..."
-
-#. Add to group
-#: ../src/frogr-main-view.c:300
-#: ../src/frogr-main-view.c:414
-msgid "Add to _Group…"
-msgstr "Aggiungi al gr_uppo..."
-
-#. Add to set
-#: ../src/frogr-main-view.c:307
-#: ../src/frogr-main-view.c:421
-msgid "Add to _Set"
-msgstr "Aggiungi al _set"
-
-#: ../src/frogr-main-view.c:314
-#: ../src/frogr-main-view.c:427
-msgid "_Create New Set…"
-msgstr "_Crea nuovo set..."
-
-#: ../src/frogr-main-view.c:321
-#: ../src/frogr-main-view.c:433
-msgid "Add to _Existing Set…"
-msgstr "Aggiungi al set _esistente..."
-
-#: ../src/frogr-main-view.c:330
-msgid "_Upload All"
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
+msgid "Upload"
+msgstr "Invia"
+
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
+#, fuzzy
+msgid "Upload All"
 msgstr "_Invia tutto"
 
-#. Help menu
-#: ../src/frogr-main-view.c:338
-msgid "_Help"
-msgstr "A_iuto"
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
+msgid "Save"
+msgstr ""
 
-#: ../src/frogr-main-view.c:344
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
+msgid "Save Current Project"
+msgstr ""
+
+#: src/frogr-main-view.c:1016
 msgid "_About"
 msgstr "I_nformazioni"
 
-#: ../src/frogr-main-view.c:897
+#: src/frogr-main-view.c:1020
+msgid "_Quit"
+msgstr "_Esci"
+
+#: src/frogr-main-view.c:1070
+#, fuzzy
+msgid "Accounts"
+msgstr "Accou_nt"
+
+#: src/frogr-main-view.c:1410
+#, c-format
+msgid "Taken: %s"
+msgstr ""
+
+#: src/frogr-main-view.c:1415
+#, c-format
+msgid "File size: %s"
+msgstr ""
+
+#: src/frogr-main-view.c:1540
+#, fuzzy
+msgid "Select File"
+msgstr "Selezionare un'immagine"
+
+#: src/frogr-main-view.c:1544 src/frogr-main-view.c:1671
+msgid "_Open"
+msgstr ""
+
+#: src/frogr-main-view.c:1553
+msgid "Frogr Project Files"
+msgstr ""
+
+#: src/frogr-main-view.c:1615
+#, fuzzy
+msgid "Select Destination"
+msgstr "Descrizione del set:"
+
+#: src/frogr-main-view.c:1619
+msgid "_Save"
+msgstr ""
+
+#: src/frogr-main-view.c:1622
+msgid "Untitled Project.frogr"
+msgstr ""
+
+#: src/frogr-main-view.c:1667
 msgid "Select a Picture"
 msgstr "Selezionare un'immagine"
 
-#: ../src/frogr-main-view.c:930
+#: src/frogr-main-view.c:1694
+msgid "All Files"
+msgstr ""
+
+#: src/frogr-main-view.c:1697
+msgid "Image Files"
+msgstr ""
+
+#: src/frogr-main-view.c:1701
+msgid "Video Files"
+msgstr ""
+
+#: src/frogr-main-view.c:1723
+msgid "You don't have any picture added yet"
+msgstr ""
+
+#: src/frogr-main-view.c:1736
 msgid "You need to select some pictures first"
 msgstr "Prima è necessario selezionare alcune fotografie"
 
-#: ../src/frogr-main-view.c:1147
-msgid "Not connected to flickr"
+#: src/frogr-main-view.c:2108
+#, fuzzy
+msgid "Not connected to Flickr"
 msgstr "Non connesso a flickr"
 
-#: ../src/frogr-main-view.c:1176
-msgid "remaining for the current month"
-msgstr "restanti per il mese corrente"
-
-#: ../src/frogr-main-view.c:1184
-msgid "Connected as"
+#: src/frogr-main-view.c:2118
+#, fuzzy, c-format
+msgid "Connected as %s%s"
 msgstr "Connesso come"
 
-#: ../src/frogr-main-view.c:1185
+#: src/frogr-main-view.c:2119
 msgid " (PRO account)"
 msgstr "(account PRO)"
 
-#: ../src/frogr-picture-loader.c:91
+#: src/frogr-main-view.c:2143
 #, c-format
-msgid "Loading pictures %d / %d"
-msgstr "Caricamento dell'immagine %d su %d"
+msgid " - %s / %s remaining"
+msgstr ""
 
-#. Update progress
-#: ../src/frogr-picture-uploader.c:85
+#: src/frogr-main-view.c:2169
 #, c-format
-msgid "Uploading '%s'…"
-msgstr "Caricamento di «%s»..."
+msgid " - %d file to upload (%s)"
+msgid_plural " - %d files to upload (%s)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../src/frogr-settings-dialog.c:132
+#: src/frogr-settings-dialog.c:185
 msgid "Default Visibility"
 msgstr "Visibilità predifinita"
 
-#: ../src/frogr-settings-dialog.c:194
+#: src/frogr-settings-dialog.c:224
 msgid "Default Content Type"
 msgstr "Tipo di contenuto predefinito"
 
-#: ../src/frogr-settings-dialog.c:235
+#: src/frogr-settings-dialog.c:250
 msgid "Default Safety Level"
 msgstr "Livello di sicurezza predefinito"
 
-#: ../src/frogr-settings-dialog.c:276
-msgid "Default Actions"
+#: src/frogr-settings-dialog.c:276
+#, fuzzy
+msgid "Default License"
 msgstr "Azioni predefinite"
 
-#: ../src/frogr-settings-dialog.c:284
-msgid "Open _Browser after Uploading Pictures"
-msgstr "Apri il _browser web dopo aver caricato le immagini"
+#: src/frogr-settings-dialog.c:302
+msgid "Other Defaults"
+msgstr ""
+
+#: src/frogr-settings-dialog.c:312
+#, fuzzy
+msgid "_Show Pictures in Global Search Results"
+msgstr "Includi nelle _ricerche pubbliche"
+
+#: src/frogr-settings-dialog.c:315
+msgid "Set Geo_location Information for Pictures"
+msgstr ""
+
+#: src/frogr-settings-dialog.c:318
+msgid "Replace 'Date Posted' with 'Date Taken' for Pictures"
+msgstr ""
 
-#: ../src/frogr-settings-dialog.c:293
+#: src/frogr-settings-dialog.c:324
 msgid "_General"
 msgstr "_Generali"
 
-#. Proxy settings
-#: ../src/frogr-settings-dialog.c:312
-msgid "_Use HTTP Proxy"
+#: src/frogr-settings-dialog.c:344
+#, fuzzy
+msgid "Proxy Settings"
+msgstr "Impostazioni"
+
+#: src/frogr-settings-dialog.c:353
+#, fuzzy
+msgid "_Enable HTTP Proxy"
 msgstr "_Usa un proxy HTTP"
 
-#: ../src/frogr-settings-dialog.c:323
+#: src/frogr-settings-dialog.c:363
 msgid "_Host:"
 msgstr "_Host:"
 
-#. Proxy port
-#: ../src/frogr-settings-dialog.c:341
+#: src/frogr-settings-dialog.c:376
 msgid "_Port:"
 msgstr "_Porta:"
 
-#. Proxy username
-#: ../src/frogr-settings-dialog.c:359
+#: src/frogr-settings-dialog.c:389
 msgid "U_sername:"
 msgstr "Nome _utente:"
 
-#. Proxy password
-#: ../src/frogr-settings-dialog.c:377
+#: src/frogr-settings-dialog.c:402
 msgid "Pass_word:"
 msgstr "Pass_word:"
 
-#: ../src/frogr-settings-dialog.c:404
+#: src/frogr-settings-dialog.c:426
 msgid "Connec_tion"
 msgstr "Conne_ssione"
 
-#: ../src/frogr-settings-dialog.c:832
+#: src/frogr-settings-dialog.c:444
+msgid "Other options"
+msgstr ""
+
+#: src/frogr-settings-dialog.c:454
+msgid "Ena_ble Tags Auto-Completion"
+msgstr ""
+
+#: src/frogr-settings-dialog.c:457
+msgid "_Import Tags from Pictures Metadata"
+msgstr ""
+
+#: src/frogr-settings-dialog.c:461
+msgid "Use _Dark GTK Theme"
+msgstr ""
+
+#: src/frogr-settings-dialog.c:465
+msgid "_Keep File Extensions in Titles when Loading"
+msgstr ""
+
+#: src/frogr-settings-dialog.c:471
+msgid "_Misc"
+msgstr ""
+
+#: src/frogr-settings-dialog.c:972
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:1
-msgid "Add"
-msgstr "Aggiungi"
+#~ msgid ""
+#~ "Press the button to start using %s once you've authorized it in your "
+#~ "flickr account."
+#~ msgstr ""
+#~ "Premere il pulsante per iniziare a usare %s dopo averlo autorizzato nel "
+#~ "proprio account Flickr"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:2
-msgid "Remove"
-msgstr "Elimina"
+#~ msgid "Authorization successfully completed!"
+#~ msgstr "Autorizzazione completata con successo!"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:3
-msgid "Upload"
-msgstr "Invia"
+#~ msgid "Creating new photoset…"
+#~ msgstr "Creazione del nuovo set..."
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:4
-msgid "frogr"
-msgstr "frogr"
+#~ msgid "Adding picture to photoset…"
+#~ msgstr "Aggiunta delle immagini al set..."
+
+#~ msgid "Adding picture to group…"
+#~ msgstr "Aggiunta delle immagini al gruppo..."
+
+#~ msgid "Operation successfully completed!"
+#~ msgstr "Operazione completata con successo!"
+
+#~ msgid "Set's title:"
+#~ msgstr "Titolo del set:"
+
+#~ msgid "Visible to _Family"
+#~ msgstr "Visibile ai _famigliari"
+
+#~ msgid "Visible to F_riends"
+#~ msgstr "Visibile agli _amici"
+
+#~ msgid "_File"
+#~ msgstr "_File"
+
+#~ msgid "_Remove Pictures"
+#~ msgstr "Rimuovi _immagine"
+
+#~ msgid "_Preferences…"
+#~ msgstr "_Preferenze..."
+
+#~ msgid "A_ctions"
+#~ msgstr "A_zioni"
+
+#~ msgid "Edit _Details…"
+#~ msgstr "Modifica _dettagli..."
+
+#~ msgid "Add _Tags…"
+#~ msgstr "Aggiungi _tag..."
+
+#~ msgid "Add to _Group…"
+#~ msgstr "Aggiungi al gr_uppo..."
+
+#~ msgid "Add to _Set"
+#~ msgstr "Aggiungi al _set"
+
+#~ msgid "_Create New Set…"
+#~ msgstr "_Crea nuovo set..."
+
+#~ msgid "Add to _Existing Set…"
+#~ msgstr "Aggiungi al set _esistente..."
+
+#~ msgid "_Help"
+#~ msgstr "A_iuto"
+
+#~ msgid "remaining for the current month"
+#~ msgstr "restanti per il mese corrente"
+
+#~ msgid "Open _Browser after Uploading Pictures"
+#~ msgstr "Apri il _browser web dopo aver caricato le immagini"
 
 #~ msgid "Spanish"
 #~ msgstr "Spagnolo"
+
 #~ msgid "British English"
 #~ msgstr "Inglese"
+
 #~ msgid "French"
 #~ msgstr "Francese"
+
 #~ msgid "Album Title"
 #~ msgstr "Titolo dell'album"
+
 #~ msgid "Group Name"
 #~ msgstr "Nome del gruppo"
+
 #~ msgid "Retrieving list of albums…"
 #~ msgstr "Recupero dell'elenco degli album..."
+
 #~ msgid "(Editing %d pictures)"
 #~ msgstr "(Modifica di %d immagini) "
+
 #~ msgid "Settings…"
 #~ msgstr "Impostazioni..."
+
 #~ msgid "Edit Details…"
 #~ msgstr "Modifica dettagli..."
+
 #~ msgid "Add Tags…"
 #~ msgstr "Aggiungi tag..."
+
 #~ msgid "Add to Group…"
 #~ msgstr "Aggiungi al gruppo..."
+
 #~ msgid "Proxy address:"
 #~ msgstr "Indirizzo proxy:"
-#~ msgid "Settings"
-#~ msgstr "Impostazioni"
+
 #~ msgid "Tags:"
 #~ msgstr "Tag:"
+
 #~ msgid "Add _tags..."
 #~ msgstr "Aggiungi _tag..."
+
 #~ msgid "Add to al_bum..."
 #~ msgstr "_Aggiungi all'album"
+
 #~ msgid "Add tags..."
 #~ msgstr "Aggiungi tag..."
+
 #~ msgid "Add to album..."
 #~ msgstr "Aggiungi all'album..."
-#~ msgid "Uploading pictures..."
-#~ msgstr "Caricamento immagini in corso..."
-#~ msgid "Family"
-#~ msgstr "Famiglia"
-#~ msgid "Friend"
-#~ msgstr "Amici"
-
diff --git a/po/ja.po b/po/ja.po
index fac53f7..d75449d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: frogr master\n"
-"Report-Msgid-Bugs-To: 
http://bugzilla.gnome.org/enter_bug.cgi?product=frogr&keywords=I18N+L10N&component=general\n";
-"POT-Creation-Date: 2013-05-14 09:34+0000\n"
+"Report-Msgid-Bugs-To: msanchez gnome org\n"
+"POT-Creation-Date: 2016-08-12 13:09+0100\n"
 "PO-Revision-Date: 2013-04-19 20:54+0000\n"
 "Last-Translator: Jiro Matsuzawa <jmatsuzawa gnome org>\n"
 "Language-Team: Japanese <gnome-translation gnome gr jp>\n"
@@ -17,82 +17,130 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/frogr.desktop.in.in.h:1
-msgid "Frogr"
+#: data/frogr.appdata.xml.in:5 data/frogr.desktop.in.in:5
+#: data/frogr.desktop.in.in:14
+#, fuzzy
+msgid "frogr"
 msgstr "Frogr"
 
-#: ../data/frogr.desktop.in.in.h:2
-msgid "Frogr: a Flickr Remote Organizer for GNOME"
+#: data/frogr.appdata.xml.in:6 data/frogr.desktop.in.in:6
+#, fuzzy
+msgid "frogr: a Flickr Remote Organizer for GNOME"
 msgstr "Frogr: GNOME 向け Flickr リモートオーガナイザー"
 
-#: ../data/frogr.desktop.in.in.h:3
+#: data/frogr.appdata.xml.in:8
+msgid ""
+"frogr is a small application for the GNOME desktop that allows users to "
+"manage their accounts in the Flickr image hosting website."
+msgstr ""
+
+#: data/frogr.appdata.xml.in:13
+msgid ""
+"It supports all the basic Flickr features, including uploading pictures, "
+"adding descriptions, setting tags and managing sets and groups pools."
+msgstr ""
+
+#: data/frogr.appdata.xml.in:24
+#, fuzzy
+msgid "Screenshot of frogr"
+msgstr "スクリーンショット(_N)"
+
+#: data/frogr.appdata.xml.in:29
+msgid "Mario Sanchez Prada"
+msgstr ""
+
+#: data/frogr.desktop.in.in:7
 msgid "Upload and organize photos in Flickr accounts"
 msgstr "Flickr へ画像のアップロードやオーガナイズを行います"
 
-#: ../data/frogr.desktop.in.in.h:4
+#: data/frogr.desktop.in.in:8
 msgid "Flickr;Image;Picture;Photo;Video;Uploader;"
-msgstr "Flickr;Image;Picture;Photo;Video;Uploader;画像;ピクチャ;写真;フォト;動画;ビデオ;アップローダー;"
+msgstr ""
+"Flickr;Image;Picture;Photo;Video;Uploader;画像;ピクチャ;写真;フォト;動画;ビデ"
+"オ;アップローダー;"
 
-#: ../src/frogr-about-dialog.c:43
-msgid "A Flickr remote organizer for GNOME\n"
+#: src/frogr-about-dialog.c:43
+#, fuzzy
+msgid "A Flickr Remote Organizer for GNOME\n"
 msgstr "GNOME 向け Flickr リモートオーガナイザー\n"
 
-#: ../src/frogr-about-dialog.c:72
+#: src/frogr-about-dialog.c:72
 msgid "translator-credits"
 msgstr "松澤 二郎 <jmatsuzawa gnome org>"
 
-#: ../src/frogr-add-tags-dialog.c:207
+#: src/frogr-add-tags-dialog.c:191 src/frogr-add-to-group-dialog.c:528
+#: src/frogr-add-to-set-dialog.c:529 src/frogr-auth-dialog.c:153
+#: src/frogr-create-new-set-dialog.c:310 src/frogr-details-dialog.c:1168
+#: src/frogr-main-view.c:1543 src/frogr-main-view.c:1618
+#: src/frogr-main-view.c:1670 src/frogr-settings-dialog.c:930
+msgid "_Cancel"
+msgstr ""
+
+#: src/frogr-add-tags-dialog.c:193 src/frogr-add-to-group-dialog.c:530
+#: src/frogr-add-to-set-dialog.c:531 src/frogr-create-new-set-dialog.c:312
+msgid "_Add"
+msgstr ""
+
+#: src/frogr-add-tags-dialog.c:202
 msgid "Enter a spaces separated list of tags:"
 msgstr "タグのリストをスペース区切りで入力してください:"
 
-#: ../src/frogr-add-tags-dialog.c:230
+#: src/frogr-add-tags-dialog.c:228
 msgid "Add Tags"
 msgstr "タグの追加"
 
-#: ../src/frogr-add-to-set-dialog.c:155
-msgid "Title"
-msgstr "タイトル"
+#: src/frogr-add-to-group-dialog.c:147
+msgid "Name"
+msgstr "名前"
 
-#: ../src/frogr-add-to-set-dialog.c:170 ../src/frogr-add-to-group-dialog.c:169
+#: src/frogr-add-to-group-dialog.c:162 src/frogr-add-to-set-dialog.c:163
 msgid "Elements"
 msgstr "アイテム数"
 
-#: ../src/frogr-add-to-set-dialog.c:602
-msgid "Add to Sets"
-msgstr "セットに追加"
-
-#: ../src/frogr-add-to-group-dialog.c:154
-msgid "Name"
-msgstr "名前"
-
-#: ../src/frogr-add-to-group-dialog.c:601
+#: src/frogr-add-to-group-dialog.c:581
 msgid "Add to Groups"
 msgstr "グループに追加"
 
-#: ../src/frogr-auth-dialog.c:52
+#: src/frogr-add-to-set-dialog.c:148
+msgid "Title"
+msgstr "タイトル"
+
+#: src/frogr-add-to-set-dialog.c:582
+msgid "Add to Sets"
+msgstr "セットに追加"
+
+#: src/frogr-auth-dialog.c:59
 #, c-format
-msgid "Please press the button to authorize %s and then come back to complete the process."
-msgstr "ボタンを押して %s によるアクセスを許可してください。そのあとアプリケーションに戻り、アクセス許可処理を完了させてください。"
+msgid ""
+"Please press the button to authorize %s and then come back to complete the "
+"process."
+msgstr ""
+"ボタンを押して %s によるアクセスを許可してください。そのあとアプリケーション"
+"に戻り、アクセス許可処理を完了させてください。"
 
-#: ../src/frogr-auth-dialog.c:56 ../src/frogr-auth-dialog.c:141
+#: src/frogr-auth-dialog.c:63 src/frogr-auth-dialog.c:149
+#: src/frogr-controller.c:2286
 #, c-format
 msgid "Authorize %s"
 msgstr "%s のアクセス許可"
 
-#. Description label
-#: ../src/frogr-auth-dialog.c:158
+#: src/frogr-auth-dialog.c:155 src/frogr-settings-dialog.c:932
+msgid "_Close"
+msgstr ""
+
+#: src/frogr-auth-dialog.c:167
 msgid "Enter verification code:"
 msgstr "認証コードを入力:"
 
-#: ../src/frogr-auth-dialog.c:209
+#: src/frogr-auth-dialog.c:221
 msgid "Invalid verification code"
 msgstr "不正な認証コード"
 
-#: ../src/frogr-controller.c:593
+#: src/frogr-controller.c:581
 msgid "Process cancelled"
 msgstr "処理をキャンセルしました"
 
-#: ../src/frogr-controller.c:598
+#: src/frogr-controller.c:586
 msgid ""
 "Connection error:\n"
 "Network not available"
@@ -100,7 +148,7 @@ msgstr ""
 "接続エラー:\n"
 "ネットワーク利用不可"
 
-#: ../src/frogr-controller.c:602
+#: src/frogr-controller.c:590
 msgid ""
 "Connection error:\n"
 "Bad request"
@@ -108,7 +156,7 @@ msgstr ""
 "接続エラー:\n"
 "不正なリクエスト"
 
-#: ../src/frogr-controller.c:606
+#: src/frogr-controller.c:594
 msgid ""
 "Connection error:\n"
 "Server-side error"
@@ -116,7 +164,7 @@ msgstr ""
 "接続エラー:\n"
 "サーバーサイドエラー"
 
-#: ../src/frogr-controller.c:610
+#: src/frogr-controller.c:598
 msgid ""
 "Error uploading:\n"
 "File invalid"
@@ -124,7 +172,7 @@ msgstr ""
 "アップロード時にエラー:\n"
 "不正なファイル"
 
-#: ../src/frogr-controller.c:614
+#: src/frogr-controller.c:602
 msgid ""
 "Error uploading picture:\n"
 "Quota exceeded"
@@ -132,13 +180,13 @@ msgstr ""
 "画像アップロード時にエラー:\n"
 "割り当て量超過"
 
-#: ../src/frogr-controller.c:619
+#: src/frogr-controller.c:607
 #, c-format
 msgid "Quota exceeded (limit: %d video per month)"
 msgid_plural "Quota exceeded (limit: %d videos per month)"
 msgstr[0] "割り当て量超過 (限度: 毎月 %d 件の動画)"
 
-#: ../src/frogr-controller.c:623
+#: src/frogr-controller.c:611
 msgid ""
 "Error uploading video:\n"
 "You can't upload more videos with this account"
@@ -146,7 +194,7 @@ msgstr ""
 "動画アップロード時にエラー:\n"
 "このアカウントではこれ以上動画をアップロードできません"
 
-#: ../src/frogr-controller.c:629
+#: src/frogr-controller.c:617
 msgid ""
 "Error:\n"
 "Photo not found"
@@ -154,7 +202,7 @@ msgstr ""
 "エラー:\n"
 "画像が見つかりません"
 
-#: ../src/frogr-controller.c:633
+#: src/frogr-controller.c:621
 msgid ""
 "Error:\n"
 "Photo already in photoset"
@@ -162,7 +210,7 @@ msgstr ""
 "エラー:\n"
 "既に画像がフォトセットに存在します"
 
-#: ../src/frogr-controller.c:637
+#: src/frogr-controller.c:625
 msgid ""
 "Error:\n"
 "Photo already in group"
@@ -170,7 +218,7 @@ msgstr ""
 "エラー:\n"
 "既に画像がグループに存在します"
 
-#: ../src/frogr-controller.c:641
+#: src/frogr-controller.c:629
 msgid ""
 "Error:\n"
 "Photo already in the maximum number of groups possible"
@@ -178,7 +226,7 @@ msgstr ""
 "エラー:\n"
 "既に利用可能な最大グループに達しています。"
 
-#: ../src/frogr-controller.c:645
+#: src/frogr-controller.c:633
 msgid ""
 "Error:\n"
 "Group limit already reached"
@@ -186,7 +234,7 @@ msgstr ""
 "エラー:\n"
 "既にグループの制限値に達しています"
 
-#: ../src/frogr-controller.c:649
+#: src/frogr-controller.c:637
 msgid ""
 "Error:\n"
 "Photo added to group's queue"
@@ -194,7 +242,7 @@ msgstr ""
 "エラー:\n"
 "画像がグループのキューに追加されました"
 
-#: ../src/frogr-controller.c:653
+#: src/frogr-controller.c:641
 msgid ""
 "Error:\n"
 "Photo already added to group's queue"
@@ -202,7 +250,7 @@ msgstr ""
 "エラー:\n"
 "既に画像がグループのキューに追加されています"
 
-#: ../src/frogr-controller.c:657
+#: src/frogr-controller.c:645
 msgid ""
 "Error:\n"
 "Content not allowed for this group"
@@ -210,8 +258,7 @@ msgstr ""
 "エラー:\n"
 "このグループで許可されていないコンテンツです"
 
-#: ../src/frogr-controller.c:661
-#, c-format
+#: src/frogr-controller.c:649
 msgid ""
 "Authorization failed.\n"
 "Please try again"
@@ -219,7 +266,7 @@ msgstr ""
 "アクセス許可に失敗しました。\n"
 "もう一度行ってください。"
 
-#: ../src/frogr-controller.c:667
+#: src/frogr-controller.c:655
 #, c-format
 msgid ""
 "Error\n"
@@ -230,8 +277,7 @@ msgstr ""
 "%s は、Flickr への画像アップロードを適切に許可されていません\n"
 "アクセス許可処理をもう一度行ってください。"
 
-#: ../src/frogr-controller.c:672
-#, c-format
+#: src/frogr-controller.c:660
 msgid ""
 "Unable to authenticate in Flickr\n"
 "Please try again."
@@ -239,7 +285,7 @@ msgstr ""
 "Flickr での認証に失敗しました。\n"
 "もう一度行ってください。"
 
-#: ../src/frogr-controller.c:676
+#: src/frogr-controller.c:664
 #, c-format
 msgid ""
 "You have not properly authorized %s yet.\n"
@@ -248,8 +294,7 @@ msgstr ""
 "まだ %s のアクセス許可処理が適切に行われていません。\n"
 "もう一度行ってください。"
 
-#: ../src/frogr-controller.c:681
-#, c-format
+#: src/frogr-controller.c:669
 msgid ""
 "Invalid verification code.\n"
 "Please try again."
@@ -257,8 +302,7 @@ msgstr ""
 "不正な認証コードです。\n"
 "もう一度行ってください。"
 
-#: ../src/frogr-controller.c:685
-#, c-format
+#: src/frogr-controller.c:673
 msgid ""
 "Error:\n"
 "Service not available"
@@ -266,238 +310,252 @@ msgstr ""
 "エラー:\n"
 "サービス利用不可"
 
-#. General error: just dump the raw error description
-#: ../src/frogr-controller.c:690
+#: src/frogr-controller.c:678
 #, c-format
 msgid "An error happened: %s."
 msgstr "エラー発生: %s"
 
-#: ../src/frogr-controller.c:906
+#: src/frogr-controller.c:883
 msgid "Authorization failed (timed out)"
 msgstr "アクセス許可失敗 (タイムアウト)"
 
-#: ../src/frogr-controller.c:958
+#: src/frogr-controller.c:931
 #, c-format
 msgid "Retrying Upload (attempt %d/%d)…"
 msgstr "アップロードをリトライしています (回数 %d/%d)…"
 
-#: ../src/frogr-controller.c:963
+#: src/frogr-controller.c:936
 #, c-format
 msgid "Uploading '%s'…"
 msgstr "'%s' をアップロードしています…"
 
-#: ../src/frogr-controller.c:2221
+#: src/frogr-controller.c:2242
 msgid "Updating credentials…"
 msgstr "クレデンシャルを更新しています…"
 
-#: ../src/frogr-controller.c:2226
+#: src/frogr-controller.c:2247
 msgid "Retrieving data for authorization…"
 msgstr "アクセス許可用のデータを取得しています…"
 
-#: ../src/frogr-controller.c:2231
+#: src/frogr-controller.c:2252
 msgid "Finishing authorization…"
 msgstr "アクセス許可処理を終了しています…"
 
-#: ../src/frogr-controller.c:2236
+#: src/frogr-controller.c:2257
 msgid "Retrieving list of sets…"
 msgstr "セットのリストを取得しています…"
 
-#: ../src/frogr-controller.c:2241
+#: src/frogr-controller.c:2262
 msgid "Retrieving list of groups…"
 msgstr "グループのリストを取得しています…"
 
-#: ../src/frogr-controller.c:2246
+#: src/frogr-controller.c:2267
 msgid "Retrieving list of tags…"
 msgstr "タグのリストを取得しています…"
 
-#: ../src/frogr-controller.c:2363
+#: src/frogr-controller.c:2292
+#, fuzzy
+msgid "Fetching information"
+msgstr "地理位置情報を設定する(_L)"
+
+#: src/frogr-controller.c:2398
 msgid "No sets found"
 msgstr "セットが見つかりません"
 
-#: ../src/frogr-controller.c:2390
+#: src/frogr-controller.c:2423
 msgid "No groups found"
 msgstr "グループが見つかりません"
 
-#: ../src/frogr-controller.c:3031
+#: src/frogr-controller.c:2984
 #, c-format
 msgid ""
 "You need to properly authorize %s before uploading any pictures to Flickr.\n"
 "Please re-authorize it."
 msgstr ""
-"Flickr に画像をアップロードするには、%s のアクセス許可を適切に行う必要があります。\n"
+"Flickr に画像をアップロードするには、%s のアクセス許可を適切に行う必要があり"
+"ます。\n"
 "あらためてアクセス許可処理を行なってください。"
 
-#: ../src/frogr-controller.c:3041
-#, c-format
+#: src/frogr-controller.c:2994
 msgid "You need to be connected before uploading any pictures to Flickr."
 msgstr "画像をアップロードするには、Flickr に接続する必要があります。"
 
-#: ../src/frogr-controller.c:3113
-#, c-format
+#: src/frogr-controller.c:3012
+#, fuzzy
+msgid "Uploading Pictures"
+msgstr "'%s' をアップロードしています…"
+
+#: src/frogr-controller.c:3057
 msgid "Error opening project file"
 msgstr "プロジェクトファイルを開く際にエラー"
 
-#. This shows a dialog notifying the problem to the user
-#: ../src/frogr-create-new-set-dialog.c:156 ../src/frogr-details-dialog.c:1020
+#: src/frogr-create-new-set-dialog.c:143 src/frogr-details-dialog.c:1001
 msgid "Missing data required"
 msgstr "必須項目が入力されていません"
 
-#: ../src/frogr-create-new-set-dialog.c:342
+#: src/frogr-create-new-set-dialog.c:326
 msgid "Title:"
 msgstr "タイトル:"
 
-#: ../src/frogr-create-new-set-dialog.c:351
+#: src/frogr-create-new-set-dialog.c:335
 msgid "Description:"
 msgstr "説明:"
 
-#: ../src/frogr-create-new-set-dialog.c:372
+#: src/frogr-create-new-set-dialog.c:356
 msgid "Fill Pictures Details with Title and Description"
 msgstr "画像の詳細情報にタイトルと説明を付与する"
 
-#: ../src/frogr-create-new-set-dialog.c:393
+#: src/frogr-create-new-set-dialog.c:381
 msgid "Create New Set"
 msgstr "新規セットの作成"
 
-#: ../src/frogr-details-dialog.c:90 ../src/frogr-settings-dialog.c:100
+#: src/frogr-details-dialog.c:89 src/frogr-settings-dialog.c:97
 msgid "Default (as specified in Flickr)"
 msgstr "デフォルト (Flickr で指定)"
 
-#: ../src/frogr-details-dialog.c:91 ../src/frogr-settings-dialog.c:101
+#: src/frogr-details-dialog.c:90 src/frogr-settings-dialog.c:98
 msgid "All rights reserved"
 msgstr "All rights reserved"
 
-#: ../src/frogr-details-dialog.c:92 ../src/frogr-settings-dialog.c:102
+#: src/frogr-details-dialog.c:91 src/frogr-settings-dialog.c:99
 msgid "CC Attribution-NonCommercial-ShareAlike"
 msgstr "CC Attribution-NonCommercial-ShareAlike"
 
-#: ../src/frogr-details-dialog.c:93 ../src/frogr-settings-dialog.c:103
+#: src/frogr-details-dialog.c:92 src/frogr-settings-dialog.c:100
 msgid "CC Attribution-NonCommercial"
 msgstr "CC Attribution-NonCommercial"
 
-#: ../src/frogr-details-dialog.c:94 ../src/frogr-settings-dialog.c:104
+#: src/frogr-details-dialog.c:93 src/frogr-settings-dialog.c:101
 msgid "CC Attribution-NonCommercial-NoDerivs"
 msgstr "CC Attribution-NonCommercial-NoDerivs"
 
-#: ../src/frogr-details-dialog.c:95 ../src/frogr-settings-dialog.c:105
+#: src/frogr-details-dialog.c:94 src/frogr-settings-dialog.c:102
 msgid "CC Attribution"
 msgstr "CC Attribution"
 
-#: ../src/frogr-details-dialog.c:96 ../src/frogr-settings-dialog.c:106
+#: src/frogr-details-dialog.c:95 src/frogr-settings-dialog.c:103
 msgid "CC Attribution-ShareAlike"
 msgstr "CC Attribution-ShareAlike"
 
-#: ../src/frogr-details-dialog.c:97 ../src/frogr-settings-dialog.c:107
+#: src/frogr-details-dialog.c:96 src/frogr-settings-dialog.c:104
 msgid "CC Attribution-NoDerivs"
 msgstr "CC Attribution-NoDerivs"
 
-#: ../src/frogr-details-dialog.c:176
+#: src/frogr-details-dialog.c:172
 msgid "Open with image viewer"
 msgstr "画像ビューアーで開きます"
 
-#: ../src/frogr-details-dialog.c:201
+#: src/frogr-details-dialog.c:190
+msgid "_Title:"
+msgstr "タイトル(_T):"
+
+#: src/frogr-details-dialog.c:200
+msgid "_Description:"
+msgstr "詳細(_D):"
+
+#: src/frogr-details-dialog.c:224
+msgid "Ta_gs:"
+msgstr "タグ(_G):"
+
+#: src/frogr-details-dialog.c:247
 msgid "Visibility"
 msgstr "公開範囲"
 
-#: ../src/frogr-details-dialog.c:213 ../src/frogr-settings-dialog.c:202
+#: src/frogr-details-dialog.c:257 src/frogr-settings-dialog.c:196
 msgid "_Private"
 msgstr "プライベート(_P)"
 
-#: ../src/frogr-details-dialog.c:217 ../src/frogr-settings-dialog.c:204
+#: src/frogr-details-dialog.c:261 src/frogr-settings-dialog.c:199
 msgid "P_ublic"
 msgstr "一般公開(_U)"
 
-#: ../src/frogr-details-dialog.c:226 ../src/frogr-settings-dialog.c:212
-msgid "Visible to _Family"
-msgstr "家族に見せる(_F)"
+#: src/frogr-details-dialog.c:270 src/frogr-settings-dialog.c:207
+msgid "_Family"
+msgstr ""
 
-#: ../src/frogr-details-dialog.c:230 ../src/frogr-settings-dialog.c:214
-msgid "Visible to F_riends"
-msgstr "友達に見せる(_R)"
+#: src/frogr-details-dialog.c:274 src/frogr-settings-dialog.c:209
+msgid "F_riends"
+msgstr ""
 
-#: ../src/frogr-details-dialog.c:256
+#: src/frogr-details-dialog.c:288
 msgid "Content Type"
 msgstr "コンテンツタイプ"
 
-#: ../src/frogr-details-dialog.c:265 ../src/frogr-settings-dialog.c:241
+#: src/frogr-details-dialog.c:296 src/frogr-settings-dialog.c:234
 msgid "P_hoto"
 msgstr "写真(_H)"
 
-#: ../src/frogr-details-dialog.c:269 ../src/frogr-settings-dialog.c:243
+#: src/frogr-details-dialog.c:300 src/frogr-settings-dialog.c:236
 msgid "Scree_nshot"
 msgstr "スクリーンショット(_N)"
 
-#: ../src/frogr-details-dialog.c:273 ../src/frogr-settings-dialog.c:245
+#: src/frogr-details-dialog.c:304 src/frogr-settings-dialog.c:238
 msgid "Oth_er"
 msgstr "その他(_E)"
 
-#: ../src/frogr-details-dialog.c:289
+#: src/frogr-details-dialog.c:317
 msgid "Safety Level"
 msgstr "セーフティレベル"
 
 # TODO: 良い訳語が思いつかないのでとりあえず原文のままとする
-#: ../src/frogr-details-dialog.c:298 ../src/frogr-settings-dialog.c:266
+#: src/frogr-details-dialog.c:325 src/frogr-settings-dialog.c:260
 msgid "S_afe"
 msgstr "Safe(_A)"
 
 # TODO: 良い訳語が思いつかないのでとりあえず原文のままとする
-#: ../src/frogr-details-dialog.c:302 ../src/frogr-settings-dialog.c:268
+#: src/frogr-details-dialog.c:329 src/frogr-settings-dialog.c:262
 msgid "_Moderate"
 msgstr "Moderate(_M)"
 
 # TODO: 良い訳語が思いつかないのでとりあえず原文のままとする
-#: ../src/frogr-details-dialog.c:306 ../src/frogr-settings-dialog.c:270
+#: src/frogr-details-dialog.c:333 src/frogr-settings-dialog.c:264
 msgid "Restr_icted"
 msgstr "Restricted(_I)"
 
-#: ../src/frogr-details-dialog.c:320
+#: src/frogr-details-dialog.c:345
 msgid "License Type"
 msgstr "ライセンスの種類"
 
-#: ../src/frogr-details-dialog.c:344
+#: src/frogr-details-dialog.c:367
 msgid "Other Properties"
 msgstr "その他のプロパティ"
 
-#: ../src/frogr-details-dialog.c:353
-msgid "Set Geo_location Information"
-msgstr "地理位置情報を設定する(_L)"
-
-#: ../src/frogr-details-dialog.c:357
+#: src/frogr-details-dialog.c:375
 msgid "_Show Up in Global Search Results"
 msgstr "グローバル検索結果に表示させる(_S)"
 
-#: ../src/frogr-details-dialog.c:371
-msgid "_Title:"
-msgstr "タイトル(_T):"
-
-#: ../src/frogr-details-dialog.c:381
-msgid "_Description:"
-msgstr "詳細(_D):"
+#: src/frogr-details-dialog.c:379
+msgid "Set Geo_location Information"
+msgstr "地理位置情報を設定する(_L)"
 
-#: ../src/frogr-details-dialog.c:405
-msgid "Ta_gs:"
-msgstr "タグ(_G):"
+#: src/frogr-details-dialog.c:383
+msgid "Replace 'Date Posted' with 'Date Taken'"
+msgstr ""
 
-#. Visually indicate how many pictures are being edited
-#: ../src/frogr-details-dialog.c:500
+#: src/frogr-details-dialog.c:475
 #, c-format
 msgid "(%d Picture)"
 msgid_plural "(%d Pictures)"
 msgstr[0] "(%d 件の画像)"
 
-#: ../src/frogr-details-dialog.c:574
+#: src/frogr-details-dialog.c:548
 msgid "An error happened trying to load the picture"
 msgstr "画像の読み込み時にエラーが発生しました"
 
-#: ../src/frogr-details-dialog.c:1223
+#: src/frogr-details-dialog.c:1169
+msgid "_Edit"
+msgstr "編集(_E)"
+
+#: src/frogr-details-dialog.c:1197
 msgid "Edit Picture Details"
 msgstr "画像の詳細情報の編集"
 
-#: ../src/frogr-file-loader.c:147
+#: src/frogr-file-loader.c:142
 #, c-format
 msgid "Loading files %d / %d"
 msgstr "ファイルを読み込んでいます %d / %d"
 
-#: ../src/frogr-file-loader.c:381
+#: src/frogr-file-loader.c:369
 #, c-format
 msgid ""
 "Unable to load picture %s:\n"
@@ -506,7 +564,7 @@ msgstr ""
 "画像 %s を読み込めません:\n"
 "%s"
 
-#: ../src/frogr-file-loader.c:412
+#: src/frogr-file-loader.c:400
 #, c-format
 msgid ""
 "Unable to load video %s\n"
@@ -515,10 +573,7 @@ msgstr ""
 "動画 %s を読み込めません\n"
 "適切なコーデックがインストールされているか確認してください"
 
-#. First %s is the title of the picture (filename of the file by
-#. default). Second %s is the max allowed size for a picture to be
-#. uploaded to flickr (different for free and PRO accounts).
-#: ../src/frogr-file-loader.c:652
+#: src/frogr-file-loader.c:636
 #, c-format
 msgid ""
 "Can't load file %s:\n"
@@ -527,343 +582,307 @@ msgstr ""
 "ファイル %s を読み込めません:\n"
 "このアカウントでアップロード可能な最大ファイルサイズ (%s) を超えています"
 
-#: ../src/frogr-main-view.c:822 ../data/gtkbuilder/frogr-app-menu.xml.h:4
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
+msgid "Open"
+msgstr "開く"
+
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
+msgid "Open Existing Project"
+msgstr "既存のプロジェクトを開く"
+
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
+msgid "Add"
+msgstr "追加"
+
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
+msgid "Add Elements"
+msgstr "アイテムを追加する"
+
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
+msgid "Remove"
+msgstr "削除"
+
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
+msgid "Remove Elements"
+msgstr "アイテムを削除する"
+
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
+msgid "Upload"
+msgstr "アップロード"
+
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
+msgid "Upload All"
+msgstr "すべてアップロードする"
+
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
+msgid "Save"
+msgstr "保存する"
+
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
+msgid "Save Current Project"
+msgstr "現在のプロジェクトを保存する"
+
+#: src/frogr-main-view.c:1016
 msgid "_About"
 msgstr "このアプリケーションについて(_A)"
 
-#: ../src/frogr-main-view.c:826 ../data/gtkbuilder/frogr-app-menu.xml.h:5
+#: src/frogr-main-view.c:1020
 msgid "_Quit"
 msgstr "終了(_Q)"
 
-#. Create the submenu and insert it in the right section
-#: ../src/frogr-main-view.c:882
+#: src/frogr-main-view.c:1070
 msgid "Accounts"
 msgstr "アカウント"
 
-#. String showind the date and time a picture was taken
-#: ../src/frogr-main-view.c:1116
+#: src/frogr-main-view.c:1410
 #, c-format
 msgid "Taken: %s"
 msgstr "撮影日時: %s"
 
-#: ../src/frogr-main-view.c:1121
+#: src/frogr-main-view.c:1415
 #, c-format
 msgid "File size: %s"
 msgstr "ファイルサイズ: %s"
 
-#: ../src/frogr-main-view.c:1244
+#: src/frogr-main-view.c:1540
 msgid "Select File"
 msgstr "ファイルの選択"
 
-#: ../src/frogr-main-view.c:1257
+#: src/frogr-main-view.c:1544 src/frogr-main-view.c:1671
+#, fuzzy
+msgid "_Open"
+msgstr "開く"
+
+#: src/frogr-main-view.c:1553
 msgid "Frogr Project Files"
 msgstr "Frogr プロジェクトファイル"
 
-#: ../src/frogr-main-view.c:1321
+#: src/frogr-main-view.c:1615
 msgid "Select Destination"
 msgstr "保存先の選択"
 
-#: ../src/frogr-main-view.c:1328
+#: src/frogr-main-view.c:1619
+msgid "_Save"
+msgstr "保存(_S)"
+
+#: src/frogr-main-view.c:1622
 msgid "Untitled Project.frogr"
 msgstr "無題のプロジェクト.frogr"
 
-#: ../src/frogr-main-view.c:1369
+#: src/frogr-main-view.c:1667
 msgid "Select a Picture"
 msgstr "画像の選択"
 
-#: ../src/frogr-main-view.c:1392
+#: src/frogr-main-view.c:1694
 msgid "All Files"
 msgstr "すべてのファイル"
 
-#: ../src/frogr-main-view.c:1395
+#: src/frogr-main-view.c:1697
 msgid "Image Files"
 msgstr "画像ファイル"
 
-#: ../src/frogr-main-view.c:1398
+#: src/frogr-main-view.c:1701
 msgid "Video Files"
 msgstr "動画ファイル"
 
-#: ../src/frogr-main-view.c:1419
+#: src/frogr-main-view.c:1723
 msgid "You don't have any picture added yet"
 msgstr "まだ画像を追加していません"
 
-#: ../src/frogr-main-view.c:1434
+#: src/frogr-main-view.c:1736
 msgid "You need to select some pictures first"
 msgstr "まず画像を選択する必要があります"
 
-#: ../src/frogr-main-view.c:1894
+#: src/frogr-main-view.c:2108
 msgid "Not connected to Flickr"
 msgstr "Flickr に接続していません"
 
-#. Login string, showing the user is PRO (second '%s') if so.
-#: ../src/frogr-main-view.c:1904
+#: src/frogr-main-view.c:2118
 #, c-format
 msgid "Connected as %s%s"
 msgstr "%s%s として接続済み"
 
-#: ../src/frogr-main-view.c:1905
+#: src/frogr-main-view.c:2119
 msgid " (PRO account)"
 msgstr " (PRO アカウント)"
 
-#. Will show in the status bar the amount of data (in KB, MB
-#. or GB) the user is currently allowed to upload to flicker
-#. till the end of the month, in a CURRENT / MAX fashion.
-#. The '-' at the beginning is just a separator, since more
-#. blocks of text will be shown in the status bar too.
-#: ../src/frogr-main-view.c:1929
+#: src/frogr-main-view.c:2143
 #, c-format
 msgid " - %s / %s remaining"
 msgstr " - %s / %s の空き容量"
 
-#. Will show in the status bar the amount of pictures and data
-#. (in KB, MB or GB) that would be uploaded as the sum of the
-#. sizes for every picture loaded in the application
-#: ../src/frogr-main-view.c:1955
+#: src/frogr-main-view.c:2169
 #, c-format
 msgid " - %d file to upload (%s)"
 msgid_plural " - %d files to upload (%s)"
 msgstr[0] " - アップロード対象 %d ファイル (%s)"
 
-#: ../src/frogr-settings-dialog.c:189
+#: src/frogr-settings-dialog.c:185
 msgid "Default Visibility"
 msgstr "デフォルトの公開範囲"
 
-#: ../src/frogr-settings-dialog.c:229
+#: src/frogr-settings-dialog.c:224
 msgid "Default Content Type"
 msgstr "デフォルトのコンテンツタイプ"
 
-#: ../src/frogr-settings-dialog.c:254
+#: src/frogr-settings-dialog.c:250
 msgid "Default Safety Level"
 msgstr "デフォルトのセーフティレベル"
 
-#: ../src/frogr-settings-dialog.c:279
+#: src/frogr-settings-dialog.c:276
 msgid "Default License"
 msgstr "デフォルトのライセンス"
 
-#: ../src/frogr-settings-dialog.c:303
+#: src/frogr-settings-dialog.c:302
 msgid "Other Defaults"
 msgstr "その他のデフォルト設定"
 
-#: ../src/frogr-settings-dialog.c:315
+#: src/frogr-settings-dialog.c:312
+msgid "_Show Pictures in Global Search Results"
+msgstr "画像をグローバル検索結果に表示させる(_S)"
+
+#: src/frogr-settings-dialog.c:315
 msgid "Set Geo_location Information for Pictures"
 msgstr "画像に地理位置情報を設定する(_L)"
 
-#: ../src/frogr-settings-dialog.c:318
-msgid "_Show Pictures in Global Search Results"
-msgstr "画像をグローバル検索結果に表示させる(_S)"
+#: src/frogr-settings-dialog.c:318
+msgid "Replace 'Date Posted' with 'Date Taken' for Pictures"
+msgstr ""
 
-#: ../src/frogr-settings-dialog.c:324
+#: src/frogr-settings-dialog.c:324
 msgid "_General"
 msgstr "一般(_G)"
 
-#: ../src/frogr-settings-dialog.c:349
+#: src/frogr-settings-dialog.c:344
 msgid "Proxy Settings"
 msgstr "プロキシ設定"
 
-#. Enable proxy
-#: ../src/frogr-settings-dialog.c:359
+#: src/frogr-settings-dialog.c:353
 msgid "_Enable HTTP Proxy"
 msgstr "HTTP プロキシを有効にする(_E)"
 
-#: ../src/frogr-settings-dialog.c:371
+#: src/frogr-settings-dialog.c:363
 msgid "_Host:"
 msgstr "ホスト(_H):"
 
-#. Proxy port
-#: ../src/frogr-settings-dialog.c:384
+#: src/frogr-settings-dialog.c:376
 msgid "_Port:"
 msgstr "ポート(_P):"
 
-#. Proxy username
-#: ../src/frogr-settings-dialog.c:397
+#: src/frogr-settings-dialog.c:389
 msgid "U_sername:"
 msgstr "ユーザー名(_S):"
 
-#. Proxy password
-#: ../src/frogr-settings-dialog.c:410
+#: src/frogr-settings-dialog.c:402
 msgid "Pass_word:"
 msgstr "パスワード(_W):"
 
-#: ../src/frogr-settings-dialog.c:450
+#: src/frogr-settings-dialog.c:426
 msgid "Connec_tion"
 msgstr "接続(_T)"
 
-#: ../src/frogr-settings-dialog.c:473
+#: src/frogr-settings-dialog.c:444
 msgid "Other options"
 msgstr "その他のオプション"
 
-#: ../src/frogr-settings-dialog.c:485
+#: src/frogr-settings-dialog.c:454
 msgid "Ena_ble Tags Auto-Completion"
 msgstr "タグの自動補完を有効にする(_B)"
 
-#: ../src/frogr-settings-dialog.c:488
+#: src/frogr-settings-dialog.c:457
 msgid "_Import Tags from Pictures Metadata"
 msgstr "画像のメタデータからタグを取り込む(_I)"
 
-#: ../src/frogr-settings-dialog.c:492
+#: src/frogr-settings-dialog.c:461
 msgid "Use _Dark GTK Theme"
 msgstr "GTK のダークテーマを使用する(_D)"
 
-#: ../src/frogr-settings-dialog.c:496
+#: src/frogr-settings-dialog.c:465
 msgid "_Keep File Extensions in Titles when Loading"
 msgstr "ファイル読み込み時に拡張子をタイトルに含める(_K)"
 
-#: ../src/frogr-settings-dialog.c:502
+#: src/frogr-settings-dialog.c:471
 msgid "_Misc"
 msgstr "その他(_M)"
 
-#: ../src/frogr-settings-dialog.c:1038
+#: src/frogr-settings-dialog.c:972
 msgid "Preferences"
 msgstr "設定"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:1
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:9
-msgid "_Edit Details…"
-msgstr "詳細情報を編集(_E)…"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:2
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:10
-msgid "Add _Tags…"
-msgstr "タグを追加(_T)…"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:3
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:11
-msgid "Add to _Group…"
-msgstr "グループに追加(_G)…"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:4
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:12
-msgid "Add to _Photoset"
-msgstr "フォトセットに追加(_P)"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:5
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:13
-msgid "_Add to Existing Photoset…"
-msgstr "既存のフォトセットに追加(_A)…"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:6
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:14
-msgid "_Create New Photoset…"
-msgstr "新しいフォトセットを作成(_C)…"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:7
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:15
-msgid "_Open in External Viewer"
-msgstr "外部ビューアーで開く(_O)"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:8
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:6
-msgid "_Remove Elements"
-msgstr "アイテムを削除する(_R)"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:9
-msgid "Open Existing Project"
-msgstr "既存のプロジェクトを開く"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:10
-msgid "Open"
-msgstr "開く"
+#~ msgid "Visible to _Family"
+#~ msgstr "家族に見せる(_F)"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:11
-msgid "Save Current Project"
-msgstr "現在のプロジェクトを保存する"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:12
-msgid "Save"
-msgstr "保存する"
+#~ msgid "Visible to F_riends"
+#~ msgstr "友達に見せる(_R)"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:13
-msgid "Add Elements"
-msgstr "アイテムを追加する"
+#~ msgid "_Edit Details…"
+#~ msgstr "詳細情報を編集(_E)…"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:14
-msgid "Add"
-msgstr "追加"
+#~ msgid "Add _Tags…"
+#~ msgstr "タグを追加(_T)…"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:15
-msgid "Remove Elements"
-msgstr "アイテムを削除する"
+#~ msgid "Add to _Group…"
+#~ msgstr "グループに追加(_G)…"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:16
-msgid "Remove"
-msgstr "削除"
+#~ msgid "Add to _Photoset"
+#~ msgstr "フォトセットに追加(_P)"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:17
-msgid "Upload All"
-msgstr "すべてアップロードする"
+#~ msgid "_Add to Existing Photoset…"
+#~ msgstr "既存のフォトセットに追加(_A)…"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:18
-msgid "Upload"
-msgstr "アップロード"
+#~ msgid "_Create New Photoset…"
+#~ msgstr "新しいフォトセットを作成(_C)…"
 
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:1
-msgid "Aut_horize Account…"
-msgstr "アカウントへのアクセス許可(_H)…"
+#~ msgid "_Open in External Viewer"
+#~ msgstr "外部ビューアーで開く(_O)"
 
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:2
-msgid "_Preferences…"
-msgstr "設定(_P)…"
+#~ msgid "_Remove Elements"
+#~ msgstr "アイテムを削除する(_R)"
 
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:3
-msgid "_Help"
-msgstr "ヘルプ(_H)"
+#~ msgid "Aut_horize Account…"
+#~ msgstr "アカウントへのアクセス許可(_H)…"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:1
-msgid "_File"
-msgstr "ファイル(_F)"
+#~ msgid "_Preferences…"
+#~ msgstr "設定(_P)…"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:2
-msgid "_Open…"
-msgstr "開く(_O)…"
+#~ msgid "_Help"
+#~ msgstr "ヘルプ(_H)"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:3
-msgid "_Save"
-msgstr "保存(_S)"
+#~ msgid "_File"
+#~ msgstr "ファイル(_F)"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:4
-msgid "Save _As…"
-msgstr "名前を付けて保存(_A)…"
+#~ msgid "_Open…"
+#~ msgstr "開く(_O)…"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:5
-msgid "A_dd Elements…"
-msgstr "アイテムを追加する(_D)…"
+#~ msgid "Save _As…"
+#~ msgstr "名前を付けて保存(_A)…"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:7
-msgid "_Upload All"
-msgstr "すべてアップロード(_U)"
+#~ msgid "A_dd Elements…"
+#~ msgstr "アイテムを追加する(_D)…"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:8
-msgid "_Edit"
-msgstr "編集(_E)"
+#~ msgid "_Upload All"
+#~ msgstr "すべてアップロード(_U)"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:16
-msgid "_View"
-msgstr "表示(_V)"
+#~ msgid "_View"
+#~ msgstr "表示(_V)"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:17
-msgid "_Sort Elements"
-msgstr "アイテムを並べ替える(_S)"
+#~ msgid "_Sort Elements"
+#~ msgstr "アイテムを並べ替える(_S)"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:18
-msgid "As _Loaded"
-msgstr "読み込み順(_L)"
+#~ msgid "As _Loaded"
+#~ msgstr "読み込み順(_L)"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:19
-msgid "By _Date Taken"
-msgstr "撮影日時順(_D)"
+#~ msgid "By _Date Taken"
+#~ msgstr "撮影日時順(_D)"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:20
-msgid "By _Title"
-msgstr "タイトル順(_T)"
+#~ msgid "By _Title"
+#~ msgstr "タイトル順(_T)"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:21
-msgid "By _Size"
-msgstr "サイズ順(_S)"
+#~ msgid "By _Size"
+#~ msgstr "サイズ順(_S)"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:22
-msgid "_Reversed Order"
-msgstr "逆順にする(_R)"
+#~ msgid "_Reversed Order"
+#~ msgstr "逆順にする(_R)"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:23
-msgid "Enable _Tooltips"
-msgstr "ツールチップを有効にする(_T)"
+#~ msgid "Enable _Tooltips"
+#~ msgstr "ツールチップを有効にする(_T)"
diff --git a/po/lv.po b/po/lv.po
index b392b0d..a05944b 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -9,9 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: frogr master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=frogr&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-08-08 22:02+0000\n"
+"Report-Msgid-Bugs-To: msanchez gnome org\n"
+"POT-Creation-Date: 2016-08-12 13:09+0100\n"
 "PO-Revision-Date: 2013-10-03 15:29+0300\n"
 "Last-Translator: Rūdolfs Mazurs <rudolfs mazurs gmail com>\n"
 "Language-Team: Latvian <lata-l10n googlegroups com>\n"
@@ -23,60 +22,96 @@ msgstr ""
 "2);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: ../data/frogr.desktop.in.in.h:1
-#| msgid "_Frogr"
-msgid "Frogr"
-msgstr "Frogr"
+#: data/frogr.appdata.xml.in:5 data/frogr.desktop.in.in:5
+#: data/frogr.desktop.in.in:14
+msgid "frogr"
+msgstr "frogr"
 
-#: ../data/frogr.desktop.in.in.h:2
-msgid "Frogr: a Flickr Remote Organizer for GNOME"
+#: data/frogr.appdata.xml.in:6 data/frogr.desktop.in.in:6
+#, fuzzy
+msgid "frogr: a Flickr Remote Organizer for GNOME"
 msgstr "Frogr — Flickr attālinātais organizētājs GNOME darbvirsmai"
 
-#: ../data/frogr.desktop.in.in.h:3
+#: data/frogr.appdata.xml.in:8
+msgid ""
+"frogr is a small application for the GNOME desktop that allows users to "
+"manage their accounts in the Flickr image hosting website."
+msgstr ""
+
+#: data/frogr.appdata.xml.in:13
+msgid ""
+"It supports all the basic Flickr features, including uploading pictures, "
+"adding descriptions, setting tags and managing sets and groups pools."
+msgstr ""
+
+#: data/frogr.appdata.xml.in:24
+#, fuzzy
+msgid "Screenshot of frogr"
+msgstr "Ekrānuzņē_mums"
+
+#: data/frogr.appdata.xml.in:29
+msgid "Mario Sanchez Prada"
+msgstr ""
+
+#: data/frogr.desktop.in.in:7
 msgid "Upload and organize photos in Flickr accounts"
 msgstr "Augšupielādēt un organizēt fotogrāfijas Flickr kontos"
 
-#: ../data/frogr.desktop.in.in.h:4
+#: data/frogr.desktop.in.in:8
 msgid "Flickr;Image;Picture;Photo;Video;Uploader;"
 msgstr "Flickr;Attēls;Bilde;Fotogrāfija;Video;Augšupielādētājs;"
 
-#: ../src/frogr-about-dialog.c:43
-msgid "A Flickr remote organizer for GNOME\n"
+#: src/frogr-about-dialog.c:43
+#, fuzzy
+msgid "A Flickr Remote Organizer for GNOME\n"
 msgstr "Flickr attālinātais organizētājs GNOME darbvirsmai\n"
 
-#: ../src/frogr-about-dialog.c:72
+#: src/frogr-about-dialog.c:72
 msgid "translator-credits"
 msgstr "Arvis Lācis"
 
-#: ../src/frogr-add-tags-dialog.c:207
+#: src/frogr-add-tags-dialog.c:191 src/frogr-add-to-group-dialog.c:528
+#: src/frogr-add-to-set-dialog.c:529 src/frogr-auth-dialog.c:153
+#: src/frogr-create-new-set-dialog.c:310 src/frogr-details-dialog.c:1168
+#: src/frogr-main-view.c:1543 src/frogr-main-view.c:1618
+#: src/frogr-main-view.c:1670 src/frogr-settings-dialog.c:930
+msgid "_Cancel"
+msgstr ""
+
+#: src/frogr-add-tags-dialog.c:193 src/frogr-add-to-group-dialog.c:530
+#: src/frogr-add-to-set-dialog.c:531 src/frogr-create-new-set-dialog.c:312
+msgid "_Add"
+msgstr ""
+
+#: src/frogr-add-tags-dialog.c:202
 msgid "Enter a spaces separated list of tags:"
 msgstr "Ievadiet ar atstarpi atdalītu birku sarakstu:"
 
-#: ../src/frogr-add-tags-dialog.c:230
+#: src/frogr-add-tags-dialog.c:228
 msgid "Add Tags"
 msgstr "Pievienot birkas"
 
-#: ../src/frogr-add-to-set-dialog.c:155
-msgid "Title"
+#: src/frogr-add-to-group-dialog.c:147
+msgid "Name"
 msgstr "Nosaukums"
 
-#: ../src/frogr-add-to-set-dialog.c:170 ../src/frogr-add-to-group-dialog.c:169
+#: src/frogr-add-to-group-dialog.c:162 src/frogr-add-to-set-dialog.c:163
 msgid "Elements"
 msgstr "Elementi"
 
-#: ../src/frogr-add-to-set-dialog.c:602
-msgid "Add to Sets"
-msgstr "Pievienot kolekcijām"
+#: src/frogr-add-to-group-dialog.c:581
+msgid "Add to Groups"
+msgstr "Pievienot grupām"
 
-#: ../src/frogr-add-to-group-dialog.c:154
-msgid "Name"
+#: src/frogr-add-to-set-dialog.c:148
+msgid "Title"
 msgstr "Nosaukums"
 
-#: ../src/frogr-add-to-group-dialog.c:601
-msgid "Add to Groups"
-msgstr "Pievienot grupām"
+#: src/frogr-add-to-set-dialog.c:582
+msgid "Add to Sets"
+msgstr "Pievienot kolekcijām"
 
-#: ../src/frogr-auth-dialog.c:52
+#: src/frogr-auth-dialog.c:59
 #, c-format
 msgid ""
 "Please press the button to authorize %s and then come back to complete the "
@@ -85,25 +120,29 @@ msgstr ""
 "Lūdzu, nospiediet pogu, lai pilnvarotu %s, un tad atgriezieties, lai "
 "pabeigtu procesu."
 
-#: ../src/frogr-auth-dialog.c:56 ../src/frogr-auth-dialog.c:141
+#: src/frogr-auth-dialog.c:63 src/frogr-auth-dialog.c:149
+#: src/frogr-controller.c:2286
 #, c-format
 msgid "Authorize %s"
 msgstr "Pilnvarot %s"
 
-#. Description label
-#: ../src/frogr-auth-dialog.c:158
+#: src/frogr-auth-dialog.c:155 src/frogr-settings-dialog.c:932
+msgid "_Close"
+msgstr ""
+
+#: src/frogr-auth-dialog.c:167
 msgid "Enter verification code:"
 msgstr "Ievadiet verifikācijas kodu:"
 
-#: ../src/frogr-auth-dialog.c:209
+#: src/frogr-auth-dialog.c:221
 msgid "Invalid verification code"
 msgstr "Nederīgs verifikācijas kods"
 
-#: ../src/frogr-controller.c:593
+#: src/frogr-controller.c:581
 msgid "Process cancelled"
 msgstr "Process atcelts"
 
-#: ../src/frogr-controller.c:598
+#: src/frogr-controller.c:586
 msgid ""
 "Connection error:\n"
 "Network not available"
@@ -111,7 +150,7 @@ msgstr ""
 "Savienojuma kļūda —\n"
 "Tīkls nav pieejams"
 
-#: ../src/frogr-controller.c:602
+#: src/frogr-controller.c:590
 msgid ""
 "Connection error:\n"
 "Bad request"
@@ -119,7 +158,7 @@ msgstr ""
 "Savienojuma kļūda —\n"
 "Nederīgs pieprasījums"
 
-#: ../src/frogr-controller.c:606
+#: src/frogr-controller.c:594
 msgid ""
 "Connection error:\n"
 "Server-side error"
@@ -127,10 +166,7 @@ msgstr ""
 "Savienojuma kļūda —\n"
 "Servera puses kļūda"
 
-#: ../src/frogr-controller.c:610
-#| msgid ""
-#| "Error uploading picture:\n"
-#| "File invalid"
+#: src/frogr-controller.c:598
 msgid ""
 "Error uploading:\n"
 "File invalid"
@@ -138,7 +174,7 @@ msgstr ""
 "Kļūda, augšupielādējot:\n"
 "Nederīga datne"
 
-#: ../src/frogr-controller.c:614
+#: src/frogr-controller.c:602
 msgid ""
 "Error uploading picture:\n"
 "Quota exceeded"
@@ -146,7 +182,7 @@ msgstr ""
 "Kļūda, augšupielādējot attēlu:\n"
 "Pārsniegta kvota"
 
-#: ../src/frogr-controller.c:619
+#: src/frogr-controller.c:607
 #, c-format
 msgid "Quota exceeded (limit: %d video per month)"
 msgid_plural "Quota exceeded (limit: %d videos per month)"
@@ -154,7 +190,7 @@ msgstr[0] "Pārsniegta kvota (limits — %d video mēnesī)"
 msgstr[1] "Pārsniegta kvota (limits — %d video mēnesī)"
 msgstr[2] "Pārsniegta kvota (limits — %d video mēnesī)"
 
-#: ../src/frogr-controller.c:623
+#: src/frogr-controller.c:611
 msgid ""
 "Error uploading video:\n"
 "You can't upload more videos with this account"
@@ -162,7 +198,7 @@ msgstr ""
 "Kļūda, augšupielādējot video:\n"
 "Ar šo kontu nevar augšupielādēt vairāk video"
 
-#: ../src/frogr-controller.c:629
+#: src/frogr-controller.c:617
 msgid ""
 "Error:\n"
 "Photo not found"
@@ -170,7 +206,7 @@ msgstr ""
 "Kļūda:\n"
 "Fotogrāfija nav atrasta"
 
-#: ../src/frogr-controller.c:633
+#: src/frogr-controller.c:621
 msgid ""
 "Error:\n"
 "Photo already in photoset"
@@ -178,7 +214,7 @@ msgstr ""
 "Kļūda:\n"
 "Fotogrāfija jau ir kolekcijā"
 
-#: ../src/frogr-controller.c:637
+#: src/frogr-controller.c:625
 msgid ""
 "Error:\n"
 "Photo already in group"
@@ -186,7 +222,7 @@ msgstr ""
 "Kļūda:\n"
 "Fotogrāfija jau ir grupā"
 
-#: ../src/frogr-controller.c:641
+#: src/frogr-controller.c:629
 msgid ""
 "Error:\n"
 "Photo already in the maximum number of groups possible"
@@ -194,7 +230,7 @@ msgstr ""
 "Kļūda:\n"
 "Fotogrāfija jau ir maksimāli pieļaujamajā skaitā grupu"
 
-#: ../src/frogr-controller.c:645
+#: src/frogr-controller.c:633
 msgid ""
 "Error:\n"
 "Group limit already reached"
@@ -202,7 +238,7 @@ msgstr ""
 "Kļūda:\n"
 "Jau sasniegts grupas limits"
 
-#: ../src/frogr-controller.c:649
+#: src/frogr-controller.c:637
 msgid ""
 "Error:\n"
 "Photo added to group's queue"
@@ -210,7 +246,7 @@ msgstr ""
 "Kļūda:\n"
 "Fotogrāfija pievienota grupas rindai"
 
-#: ../src/frogr-controller.c:653
+#: src/frogr-controller.c:641
 msgid ""
 "Error:\n"
 "Photo already added to group's queue"
@@ -218,7 +254,7 @@ msgstr ""
 "Kļūda:\n"
 "Fotogrāfija jau ir pievienota grupas rindai"
 
-#: ../src/frogr-controller.c:657
+#: src/frogr-controller.c:645
 msgid ""
 "Error:\n"
 "Content not allowed for this group"
@@ -226,8 +262,7 @@ msgstr ""
 "Kļūda:\n"
 "Saturs nav atļauts šai grupai"
 
-#: ../src/frogr-controller.c:661
-#, c-format
+#: src/frogr-controller.c:649
 msgid ""
 "Authorization failed.\n"
 "Please try again"
@@ -235,12 +270,8 @@ msgstr ""
 "Pilnvarošana neizdevās.\n"
 "Lūdzu, mēģiniet vēlreiz"
 
-#: ../src/frogr-controller.c:667
+#: src/frogr-controller.c:655
 #, c-format
-#| msgid ""
-#| "Error\n"
-#| "%s is not properly authorized to upload pictures to flickr.\n"
-#| "Please re-authorize it"
 msgid ""
 "Error\n"
 "%s is not properly authorized to upload pictures to Flickr.\n"
@@ -250,11 +281,7 @@ msgstr ""
 "%s nav pareizi pilnvarots, lai augšupielādētu attēlus Flickr.\n"
 "Lūdzu, atkārtoti pilnvarojiet to"
 
-#: ../src/frogr-controller.c:672
-#, c-format
-#| msgid ""
-#| "Unable to authenticate in flickr\n"
-#| "Please try again."
+#: src/frogr-controller.c:660
 msgid ""
 "Unable to authenticate in Flickr\n"
 "Please try again."
@@ -262,7 +289,7 @@ msgstr ""
 "Neizdevās pilnvaroties Flickr\n"
 "Lūdzu, mēģiniet vēlreiz."
 
-#: ../src/frogr-controller.c:676
+#: src/frogr-controller.c:664
 #, c-format
 msgid ""
 "You have not properly authorized %s yet.\n"
@@ -271,8 +298,7 @@ msgstr ""
 "%s vēl nav pareizi pilnvarots.\n"
 "Lūdzu, mēģiniet vēlreiz."
 
-#: ../src/frogr-controller.c:681
-#, c-format
+#: src/frogr-controller.c:669
 msgid ""
 "Invalid verification code.\n"
 "Please try again."
@@ -280,8 +306,7 @@ msgstr ""
 "Nederīgs verifikācijas kods.\n"
 "Lūdzu, mēģiniet vēlreiz."
 
-#: ../src/frogr-controller.c:685
-#, c-format
+#: src/frogr-controller.c:673
 msgid ""
 "Error:\n"
 "Service not available"
@@ -289,64 +314,64 @@ msgstr ""
 "Kļūda —\n"
 "Pakalpojums nav pieejams"
 
-#. General error: just dump the raw error description
-#: ../src/frogr-controller.c:690
+#: src/frogr-controller.c:678
 #, c-format
 msgid "An error happened: %s."
 msgstr "Gadījās kļūda — %s."
 
-#: ../src/frogr-controller.c:906
+#: src/frogr-controller.c:883
 msgid "Authorization failed (timed out)"
 msgstr "Pilnvarošana neizdevās (iestājās noildze)"
 
-#: ../src/frogr-controller.c:958
+#: src/frogr-controller.c:931
 #, c-format
 msgid "Retrying Upload (attempt %d/%d)…"
 msgstr "Atkal mēģina augšupielādēt (mēģinājums %d/%d)…"
 
-#: ../src/frogr-controller.c:963
+#: src/frogr-controller.c:936
 #, c-format
 msgid "Uploading '%s'…"
 msgstr "Augšupielādē “%s”…"
 
-#: ../src/frogr-controller.c:2221
+#: src/frogr-controller.c:2242
 msgid "Updating credentials…"
 msgstr "Atjaunina pieteikšanās datus…"
 
-#: ../src/frogr-controller.c:2226
+#: src/frogr-controller.c:2247
 msgid "Retrieving data for authorization…"
 msgstr "Saņem pilnvarošanas datus…"
 
-#: ../src/frogr-controller.c:2231
+#: src/frogr-controller.c:2252
 msgid "Finishing authorization…"
 msgstr "Pabeidz pilnvarošanu…"
 
-#: ../src/frogr-controller.c:2236
+#: src/frogr-controller.c:2257
 msgid "Retrieving list of sets…"
 msgstr "Saņem kolekciju sarakstu…"
 
-#: ../src/frogr-controller.c:2241
+#: src/frogr-controller.c:2262
 msgid "Retrieving list of groups…"
 msgstr "Saņem grupu sarakstu…"
 
-#: ../src/frogr-controller.c:2246
+#: src/frogr-controller.c:2267
 msgid "Retrieving list of tags…"
 msgstr "Saņem birku sarakstu…"
 
-#: ../src/frogr-controller.c:2363
+#: src/frogr-controller.c:2292
+#, fuzzy
+msgid "Fetching information"
+msgstr "Iestatīt ģeo_lokācijas informāciju"
+
+#: src/frogr-controller.c:2398
 msgid "No sets found"
 msgstr "Kolekcijas nav atrastas"
 
-#: ../src/frogr-controller.c:2390
+#: src/frogr-controller.c:2423
 msgid "No groups found"
 msgstr "Grupas nav atrastas"
 
-#: ../src/frogr-controller.c:3031
+#: src/frogr-controller.c:2984
 #, c-format
-#| msgid ""
-#| "You need to properly authorize %s before uploading any pictures to "
-#| "flickr.\n"
-#| "Please re-authorize it."
 msgid ""
 "You need to properly authorize %s before uploading any pictures to Flickr.\n"
 "Please re-authorize it."
@@ -354,160 +379,160 @@ msgstr ""
 "Jums ir pareizi jāpilnvaro %s, lai varētu augšupielādēt attēlus Flickr.\n"
 "Lūdzu, atkārtoti pilnvarojiet to."
 
-#: ../src/frogr-controller.c:3041
-#, c-format
-#| msgid ""
-#| "You need to properly authorize %s before uploading any pictures to "
-#| "flickr.\n"
-#| "Please re-authorize it."
+#: src/frogr-controller.c:2994
 msgid "You need to be connected before uploading any pictures to Flickr."
 msgstr "Jums ir jāsavienojas, pirms augšupielādēt attēlus uz Flickr."
 
-#: ../src/frogr-controller.c:3113
-#, c-format
+#: src/frogr-controller.c:3012
+#, fuzzy
+msgid "Uploading Pictures"
+msgstr "Ie_lādēt attēlus..."
+
+#: src/frogr-controller.c:3057
 msgid "Error opening project file"
 msgstr "Kļūda, atverot projekta datni"
 
-#. This shows a dialog notifying the problem to the user
-#: ../src/frogr-create-new-set-dialog.c:156 ../src/frogr-details-dialog.c:1026
+#: src/frogr-create-new-set-dialog.c:143 src/frogr-details-dialog.c:1001
 msgid "Missing data required"
 msgstr "Trūkst nepieciešamo datu"
 
-#: ../src/frogr-create-new-set-dialog.c:342
+#: src/frogr-create-new-set-dialog.c:326
 msgid "Title:"
 msgstr "Nosaukums:"
 
-#: ../src/frogr-create-new-set-dialog.c:351
+#: src/frogr-create-new-set-dialog.c:335
 msgid "Description:"
 msgstr "Apraksts:"
 
-#: ../src/frogr-create-new-set-dialog.c:372
+#: src/frogr-create-new-set-dialog.c:356
 msgid "Fill Pictures Details with Title and Description"
 msgstr "Aizpildīt attēlu informāciju ar nosaukumu un aprakstu"
 
-#: ../src/frogr-create-new-set-dialog.c:393
+#: src/frogr-create-new-set-dialog.c:381
 msgid "Create New Set"
 msgstr "Izveidot jaunu kolekciju"
 
-#: ../src/frogr-details-dialog.c:90 ../src/frogr-settings-dialog.c:100
-#| msgid "Default (as specified in flickr)"
+#: src/frogr-details-dialog.c:89 src/frogr-settings-dialog.c:97
 msgid "Default (as specified in Flickr)"
 msgstr "Noklusējums (kā norādīts Flickr)"
 
-#: ../src/frogr-details-dialog.c:91 ../src/frogr-settings-dialog.c:101
+#: src/frogr-details-dialog.c:90 src/frogr-settings-dialog.c:98
 msgid "All rights reserved"
 msgstr "Visas tiesības aizsargātas"
 
-#: ../src/frogr-details-dialog.c:92 ../src/frogr-settings-dialog.c:102
+#: src/frogr-details-dialog.c:91 src/frogr-settings-dialog.c:99
 msgid "CC Attribution-NonCommercial-ShareAlike"
 msgstr "CC Attribution-NonCommercial-ShareAlike"
 
-#: ../src/frogr-details-dialog.c:93 ../src/frogr-settings-dialog.c:103
+#: src/frogr-details-dialog.c:92 src/frogr-settings-dialog.c:100
 msgid "CC Attribution-NonCommercial"
 msgstr "CC Attribution-NonCommercial"
 
-#: ../src/frogr-details-dialog.c:94 ../src/frogr-settings-dialog.c:104
+#: src/frogr-details-dialog.c:93 src/frogr-settings-dialog.c:101
 msgid "CC Attribution-NonCommercial-NoDerivs"
 msgstr "CC Attribution-NonCommercial-NoDerivs"
 
-#: ../src/frogr-details-dialog.c:95 ../src/frogr-settings-dialog.c:105
+#: src/frogr-details-dialog.c:94 src/frogr-settings-dialog.c:102
 msgid "CC Attribution"
 msgstr "CC Attribution"
 
-#: ../src/frogr-details-dialog.c:96 ../src/frogr-settings-dialog.c:106
+#: src/frogr-details-dialog.c:95 src/frogr-settings-dialog.c:103
 msgid "CC Attribution-ShareAlike"
 msgstr "CC Attribution-ShareAlike"
 
-#: ../src/frogr-details-dialog.c:97 ../src/frogr-settings-dialog.c:107
+#: src/frogr-details-dialog.c:96 src/frogr-settings-dialog.c:104
 msgid "CC Attribution-NoDerivs"
 msgstr "CC Attribution-NoDerivs"
 
-#: ../src/frogr-details-dialog.c:180
+#: src/frogr-details-dialog.c:172
 msgid "Open with image viewer"
 msgstr "Atvērt ar attēlu skatītāju"
 
-#: ../src/frogr-details-dialog.c:199
+#: src/frogr-details-dialog.c:190
 msgid "_Title:"
 msgstr "_Nosaukums:"
 
-#: ../src/frogr-details-dialog.c:209
+#: src/frogr-details-dialog.c:200
 msgid "_Description:"
 msgstr "_Apraksts:"
 
-#: ../src/frogr-details-dialog.c:233
+#: src/frogr-details-dialog.c:224
 msgid "Ta_gs:"
 msgstr "Bir_kas:"
 
-#: ../src/frogr-details-dialog.c:259
+#: src/frogr-details-dialog.c:247
 msgid "Visibility"
 msgstr "Redzamība"
 
-#: ../src/frogr-details-dialog.c:271 ../src/frogr-settings-dialog.c:203
-msgid "P_ublic"
-msgstr "P_ublisks"
-
-#: ../src/frogr-details-dialog.c:280 ../src/frogr-settings-dialog.c:209
+#: src/frogr-details-dialog.c:257 src/frogr-settings-dialog.c:196
 msgid "_Private"
 msgstr "_Privāts"
 
-#: ../src/frogr-details-dialog.c:284 ../src/frogr-settings-dialog.c:212
+#: src/frogr-details-dialog.c:261 src/frogr-settings-dialog.c:199
+msgid "P_ublic"
+msgstr "P_ublisks"
+
+#: src/frogr-details-dialog.c:270 src/frogr-settings-dialog.c:207
 msgid "_Family"
 msgstr "Ģ_imene"
 
-#: ../src/frogr-details-dialog.c:288 ../src/frogr-settings-dialog.c:214
+#: src/frogr-details-dialog.c:274 src/frogr-settings-dialog.c:209
 msgid "F_riends"
 msgstr "D_raugi"
 
-#: ../src/frogr-details-dialog.c:314
+#: src/frogr-details-dialog.c:288
 msgid "Content Type"
 msgstr "Satura veids"
 
-#: ../src/frogr-details-dialog.c:323 ../src/frogr-settings-dialog.c:238
+#: src/frogr-details-dialog.c:296 src/frogr-settings-dialog.c:234
 msgid "P_hoto"
 msgstr "_Fotogrāfija"
 
-#: ../src/frogr-details-dialog.c:327 ../src/frogr-settings-dialog.c:240
+#: src/frogr-details-dialog.c:300 src/frogr-settings-dialog.c:236
 msgid "Scree_nshot"
 msgstr "Ekrānuzņē_mums"
 
-#: ../src/frogr-details-dialog.c:331 ../src/frogr-settings-dialog.c:242
+#: src/frogr-details-dialog.c:304 src/frogr-settings-dialog.c:238
 msgid "Oth_er"
 msgstr "_Cits"
 
-#: ../src/frogr-details-dialog.c:347
+#: src/frogr-details-dialog.c:317
 msgid "Safety Level"
 msgstr "Drošuma līmenis"
 
-#: ../src/frogr-details-dialog.c:356 ../src/frogr-settings-dialog.c:263
+#: src/frogr-details-dialog.c:325 src/frogr-settings-dialog.c:260
 msgid "S_afe"
 msgstr "_Drošs"
 
-#: ../src/frogr-details-dialog.c:360 ../src/frogr-settings-dialog.c:265
+#: src/frogr-details-dialog.c:329 src/frogr-settings-dialog.c:262
 msgid "_Moderate"
 msgstr "_Mērens"
 
-#: ../src/frogr-details-dialog.c:364 ../src/frogr-settings-dialog.c:267
+#: src/frogr-details-dialog.c:333 src/frogr-settings-dialog.c:264
 msgid "Restr_icted"
 msgstr "_Ierobežots"
 
-#: ../src/frogr-details-dialog.c:378
+#: src/frogr-details-dialog.c:345
 msgid "License Type"
 msgstr "Licences veids"
 
-#: ../src/frogr-details-dialog.c:402
+#: src/frogr-details-dialog.c:367
 msgid "Other Properties"
 msgstr "Citas īpašības"
 
-#: ../src/frogr-details-dialog.c:411
+#: src/frogr-details-dialog.c:375
+msgid "_Show Up in Global Search Results"
+msgstr "Rādīt globālajo_s meklēšanas rezultātos"
+
+#: src/frogr-details-dialog.c:379
 msgid "Set Geo_location Information"
 msgstr "Iestatīt ģeo_lokācijas informāciju"
 
-#: ../src/frogr-details-dialog.c:415
-msgid "_Show Up in Global Search Results"
-msgstr "Rādīt globālajo_s meklēšanas rezultātos"
+#: src/frogr-details-dialog.c:383
+msgid "Replace 'Date Posted' with 'Date Taken'"
+msgstr ""
 
-#. Visually indicate how many pictures are being edited
-#: ../src/frogr-details-dialog.c:506
+#: src/frogr-details-dialog.c:475
 #, c-format
 msgid "(%d Picture)"
 msgid_plural "(%d Pictures)"
@@ -515,21 +540,24 @@ msgstr[0] "(%d attēls)"
 msgstr[1] "(%d attēli)"
 msgstr[2] "(%d attēlu)"
 
-#: ../src/frogr-details-dialog.c:580
+#: src/frogr-details-dialog.c:548
 msgid "An error happened trying to load the picture"
 msgstr "Gadījās kļūda, mēģinot ielādēt attēlu"
 
-#: ../src/frogr-details-dialog.c:1229
+#: src/frogr-details-dialog.c:1169
+msgid "_Edit"
+msgstr "R_ediģēt"
+
+#: src/frogr-details-dialog.c:1197
 msgid "Edit Picture Details"
 msgstr "Rediģēt attēla informāciju"
 
-#: ../src/frogr-file-loader.c:147
+#: src/frogr-file-loader.c:142
 #, c-format
-#| msgid "Loading pictures %d / %d"
 msgid "Loading files %d / %d"
 msgstr "Ielādē datnes %d / %d"
 
-#: ../src/frogr-file-loader.c:381
+#: src/frogr-file-loader.c:369
 #, c-format
 msgid ""
 "Unable to load picture %s:\n"
@@ -538,7 +566,7 @@ msgstr ""
 "Neizdevās ielādēt attēlu %s:\n"
 "%s"
 
-#: ../src/frogr-file-loader.c:412
+#: src/frogr-file-loader.c:400
 #, c-format
 msgid ""
 "Unable to load video %s\n"
@@ -547,385 +575,331 @@ msgstr ""
 "Nevar ielādēt video %s\n"
 "Lūdzu, pārliecinieties, ka ir uzinstalēts pareizais kodeks"
 
-#. First %s is the title of the picture (filename of the file by
-#. default). Second %s is the max allowed size for a picture to be
-#. uploaded to flickr (different for free and PRO accounts).
-#: ../src/frogr-file-loader.c:652
+#: src/frogr-file-loader.c:636
 #, c-format
-#| msgid ""
-#| "Can't load picture %s: size of file is bigger than the maximum allowed "
-#| "for this account (%s)"
 msgid ""
 "Can't load file %s:\n"
 "Size of file is bigger than the maximum allowed for this account (%s)"
 msgstr ""
 "Nevar ielādēt datni %s:\n"
-"Datnes izmērs ir lielāks nekā maksimāli atļautais "
-"šim kontam (%s)"
+"Datnes izmērs ir lielāks nekā maksimāli atļautais šim kontam (%s)"
+
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
+msgid "Open"
+msgstr "Atvērt"
+
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
+msgid "Open Existing Project"
+msgstr "Atvērt esošu projektu"
+
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
+msgid "Add"
+msgstr "Pievienot"
 
-#: ../src/frogr-main-view.c:822 ../data/gtkbuilder/frogr-app-menu.xml.h:4
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
+msgid "Add Elements"
+msgstr "Pievienot elementus"
+
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
+msgid "Remove"
+msgstr "Izņemt"
+
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
+msgid "Remove Elements"
+msgstr "Izņemt elementus"
+
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
+msgid "Upload"
+msgstr "Augšupielādēt"
+
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
+msgid "Upload All"
+msgstr "Augšupielādēt visus"
+
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
+msgid "Save"
+msgstr "Saglabāt"
+
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
+msgid "Save Current Project"
+msgstr "Saglabāt šo projektu"
+
+#: src/frogr-main-view.c:1016
 msgid "_About"
 msgstr "P_ar"
 
-#: ../src/frogr-main-view.c:826 ../data/gtkbuilder/frogr-app-menu.xml.h:5
+#: src/frogr-main-view.c:1020
 msgid "_Quit"
 msgstr "_Iziet"
 
-#. Create the submenu and insert it in the right section
-#: ../src/frogr-main-view.c:882
-#| msgid "Accou_nts"
+#: src/frogr-main-view.c:1070
 msgid "Accounts"
 msgstr "Konti"
 
-#. String showind the date and time a picture was taken
-#: ../src/frogr-main-view.c:1111
+#: src/frogr-main-view.c:1410
 #, c-format
 msgid "Taken: %s"
 msgstr "Uzņemts: %s"
 
-#: ../src/frogr-main-view.c:1116
+#: src/frogr-main-view.c:1415
 #, c-format
 msgid "File size: %s"
 msgstr "Datnes izmērs: %s"
 
-#: ../src/frogr-main-view.c:1239
-#| msgid "Select a Picture"
+#: src/frogr-main-view.c:1540
 msgid "Select File"
 msgstr "Izvēlieties datni"
 
-#: ../src/frogr-main-view.c:1252
+#: src/frogr-main-view.c:1544 src/frogr-main-view.c:1671
+#, fuzzy
+msgid "_Open"
+msgstr "Atvērt"
+
+#: src/frogr-main-view.c:1553
 msgid "Frogr Project Files"
 msgstr "Frogr projekta datnes"
 
-#: ../src/frogr-main-view.c:1316
+#: src/frogr-main-view.c:1615
 msgid "Select Destination"
 msgstr "Izvēlieties mērķi"
 
-#: ../src/frogr-main-view.c:1323
+#: src/frogr-main-view.c:1619
+msgid "_Save"
+msgstr "_Saglabāt"
+
+#: src/frogr-main-view.c:1622
 msgid "Untitled Project.frogr"
 msgstr "Nenosaukts projekts.frogr"
 
-#: ../src/frogr-main-view.c:1364
+#: src/frogr-main-view.c:1667
 msgid "Select a Picture"
 msgstr "Izvēlieties attēlu"
 
-#: ../src/frogr-main-view.c:1387
+#: src/frogr-main-view.c:1694
 msgid "All Files"
 msgstr "Visas datnes"
 
-#: ../src/frogr-main-view.c:1390
+#: src/frogr-main-view.c:1697
 msgid "Image Files"
 msgstr "Attēlu datnes"
 
-#: ../src/frogr-main-view.c:1393
+#: src/frogr-main-view.c:1701
 msgid "Video Files"
 msgstr "Video datnes"
 
-#: ../src/frogr-main-view.c:1414
+#: src/frogr-main-view.c:1723
 msgid "You don't have any picture added yet"
 msgstr "Vēl nav pievienota neviena bilde"
 
-#: ../src/frogr-main-view.c:1429
+#: src/frogr-main-view.c:1736
 msgid "You need to select some pictures first"
 msgstr "Vispirms jāizvēlas attēli"
 
-#: ../src/frogr-main-view.c:1889
-#| msgid "Not connected to flickr"
+#: src/frogr-main-view.c:2108
 msgid "Not connected to Flickr"
 msgstr "Nav savienots ar Flickr"
 
-#. Login string, showing the user is PRO (second '%s') if so.
-#: ../src/frogr-main-view.c:1899
+#: src/frogr-main-view.c:2118
 #, c-format
 msgid "Connected as %s%s"
 msgstr "Savienojies kā %s%s"
 
-#: ../src/frogr-main-view.c:1900
+#: src/frogr-main-view.c:2119
 msgid " (PRO account)"
 msgstr "(PRO konts)"
 
-#. Will show in the status bar the amount of data (in KB, MB
-#. or GB) the user is currently allowed to upload to flicker
-#. till the end of the month, in a CURRENT / MAX fashion.
-#. The '-' at the beginning is just a separator, since more
-#. blocks of text will be shown in the status bar too.
-#: ../src/frogr-main-view.c:1924
+#: src/frogr-main-view.c:2143
 #, c-format
 msgid " - %s / %s remaining"
 msgstr " — %s / %s atlikuši"
 
-#. Will show in the status bar the amount of pictures and data
-#. (in KB, MB or GB) that would be uploaded as the sum of the
-#. sizes for every picture loaded in the application
-#: ../src/frogr-main-view.c:1950
+#: src/frogr-main-view.c:2169
 #, c-format
-#| msgid " - %d picture to upload (%s)"
 msgid " - %d file to upload (%s)"
 msgid_plural " - %d files to upload (%s)"
 msgstr[0] " — %d datne, ko augšupielādēt (%s)"
 msgstr[1] " — %d datnes, ko augšupielādēt (%s)"
 msgstr[2] " — %d datņu, ko augšupielādēt (%s)"
 
-#: ../src/frogr-settings-dialog.c:189
+#: src/frogr-settings-dialog.c:185
 msgid "Default Visibility"
 msgstr "Noklusējuma redzamība"
 
-#: ../src/frogr-settings-dialog.c:226
+#: src/frogr-settings-dialog.c:224
 msgid "Default Content Type"
 msgstr "Noklusējuma satura veids"
 
-#: ../src/frogr-settings-dialog.c:251
+#: src/frogr-settings-dialog.c:250
 msgid "Default Safety Level"
 msgstr "Noklusējuma drošības līmenis"
 
-#: ../src/frogr-settings-dialog.c:276
+#: src/frogr-settings-dialog.c:276
 msgid "Default License"
 msgstr "Noklusējuma licence"
 
-#: ../src/frogr-settings-dialog.c:300
+#: src/frogr-settings-dialog.c:302
 msgid "Other Defaults"
 msgstr "Citi noklusējumi"
 
-#: ../src/frogr-settings-dialog.c:312
+#: src/frogr-settings-dialog.c:312
+msgid "_Show Pictures in Global Search Results"
+msgstr "Rādīt attēlu_s globālajos meklēšanas rezultātos"
+
+#: src/frogr-settings-dialog.c:315
 msgid "Set Geo_location Information for Pictures"
 msgstr "Iestatīt ģeo_lokācijas informāciju attēliem"
 
-#: ../src/frogr-settings-dialog.c:315
-msgid "_Show Pictures in Global Search Results"
-msgstr "Rādīt attēlu_s globālajos meklēšanas rezultātos"
+#: src/frogr-settings-dialog.c:318
+msgid "Replace 'Date Posted' with 'Date Taken' for Pictures"
+msgstr ""
 
-#: ../src/frogr-settings-dialog.c:321
+#: src/frogr-settings-dialog.c:324
 msgid "_General"
 msgstr "_Vispārīgi"
 
-#: ../src/frogr-settings-dialog.c:346
+#: src/frogr-settings-dialog.c:344
 msgid "Proxy Settings"
 msgstr "Starpniekservera iestatījumi"
 
-#. Enable proxy
-#: ../src/frogr-settings-dialog.c:356
+#: src/frogr-settings-dialog.c:353
 msgid "_Enable HTTP Proxy"
 msgstr "Aktivēt HTTP starpni_ekserveri"
 
-#: ../src/frogr-settings-dialog.c:368
+#: src/frogr-settings-dialog.c:363
 msgid "_Host:"
 msgstr "_Serveris:"
 
-#. Proxy port
-#: ../src/frogr-settings-dialog.c:381
+#: src/frogr-settings-dialog.c:376
 msgid "_Port:"
 msgstr "_Ports:"
 
-#. Proxy username
-#: ../src/frogr-settings-dialog.c:394
+#: src/frogr-settings-dialog.c:389
 msgid "U_sername:"
 msgstr "_Lietotājvārds:"
 
-#. Proxy password
-#: ../src/frogr-settings-dialog.c:407
+#: src/frogr-settings-dialog.c:402
 msgid "Pass_word:"
 msgstr "Pa_role:"
 
-#. Use GNOME General Proxy Settings
-#: ../src/frogr-settings-dialog.c:423
-msgid "_Use GNOME General Proxy Settings"
-msgstr "Izmantot GNOME vispārīgos starpniekservera iestatījum_us"
-
-#: ../src/frogr-settings-dialog.c:447
+#: src/frogr-settings-dialog.c:426
 msgid "Connec_tion"
 msgstr "Savieno_jums"
 
-#: ../src/frogr-settings-dialog.c:470
+#: src/frogr-settings-dialog.c:444
 msgid "Other options"
 msgstr "Citas opcijas"
 
-#: ../src/frogr-settings-dialog.c:482
+#: src/frogr-settings-dialog.c:454
 msgid "Ena_ble Tags Auto-Completion"
 msgstr "Aktivēt _birku automātisku pabeigšanu"
 
-#: ../src/frogr-settings-dialog.c:485
+#: src/frogr-settings-dialog.c:457
 msgid "_Import Tags from Pictures Metadata"
 msgstr "_Importēt birkas no attēlu metadatiem"
 
-#: ../src/frogr-settings-dialog.c:489
+#: src/frogr-settings-dialog.c:461
 msgid "Use _Dark GTK Theme"
 msgstr "Izmantot _tumšo GTK motīvu"
 
-#: ../src/frogr-settings-dialog.c:493
+#: src/frogr-settings-dialog.c:465
 msgid "_Keep File Extensions in Titles when Loading"
 msgstr "Saglabāt datņu paplašinājumus nosau_kumos, kad ielādē"
 
-#: ../src/frogr-settings-dialog.c:499
+#: src/frogr-settings-dialog.c:471
 msgid "_Misc"
 msgstr "_Citi"
 
-#: ../src/frogr-settings-dialog.c:1035
+#: src/frogr-settings-dialog.c:972
 msgid "Preferences"
 msgstr "Iestatījumi"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:1
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:9
-#| msgid "Edit _Details…"
-msgid "_Edit Details…"
-msgstr "R_ediģēt informāciju…"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:2
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:10
-msgid "Add _Tags…"
-msgstr "Pievieno_t birkas…"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:3
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:11
-msgid "Add to _Group…"
-msgstr "Pievienot _grupai…"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:4
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:12
-#| msgid "Add to _Set"
-msgid "Add to _Photoset"
-msgstr "Pievienot _foto kolekcijai"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:5
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:13
-#| msgid "Add to _Existing Set…"
-msgid "_Add to Existing Photoset…"
-msgstr "Pievienot esoš_ai foto kolekcijai…"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:6
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:14
-#| msgid "_Create New Set…"
-msgid "_Create New Photoset…"
-msgstr "Izveidot jaunu foto kolek_ciju…"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:7
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:15
-#| msgid "Open in E_xternal Viewer"
-msgid "_Open in External Viewer"
-msgstr "Atvērt ārē_jā skatītājā"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:8
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:6
-#| msgid "Elements"
-msgid "_Remove Elements"
-msgstr "_Izņemt elementus"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:9
-msgid "Open Existing Project"
-msgstr "Atvērt esošu projektu"
+#~| msgid "_Frogr"
+#~ msgid "Frogr"
+#~ msgstr "Frogr"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:10
-msgid "Open"
-msgstr "Atvērt"
+#~ msgid "_Use GNOME General Proxy Settings"
+#~ msgstr "Izmantot GNOME vispārīgos starpniekservera iestatījum_us"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:11
-msgid "Save Current Project"
-msgstr "Saglabāt šo projektu"
+#~| msgid "Edit _Details…"
+#~ msgid "_Edit Details…"
+#~ msgstr "R_ediģēt informāciju…"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:12
-msgid "Save"
-msgstr "Saglabāt"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:13
-#| msgid "Elements"
-msgid "Add Elements"
-msgstr "Pievienot elementus"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:14
-msgid "Add"
-msgstr "Pievienot"
+#~ msgid "Add _Tags…"
+#~ msgstr "Pievieno_t birkas…"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:15
-#| msgid "Elements"
-msgid "Remove Elements"
-msgstr "Izņemt elementus"
+#~ msgid "Add to _Group…"
+#~ msgstr "Pievienot _grupai…"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:16
-msgid "Remove"
-msgstr "Izņemt"
+#~| msgid "Add to _Set"
+#~ msgid "Add to _Photoset"
+#~ msgstr "Pievienot _foto kolekcijai"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:17
-#| msgid "_Upload All"
-msgid "Upload All"
-msgstr "Augšupielādēt visus"
+#~| msgid "Add to _Existing Set…"
+#~ msgid "_Add to Existing Photoset…"
+#~ msgstr "Pievienot esoš_ai foto kolekcijai…"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:18
-msgid "Upload"
-msgstr "Augšupielādēt"
+#~| msgid "_Create New Set…"
+#~ msgid "_Create New Photoset…"
+#~ msgstr "Izveidot jaunu foto kolek_ciju…"
 
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:1
-msgid "Aut_horize Account…"
-msgstr "Piln_varot kontu..."
+#~| msgid "Open in E_xternal Viewer"
+#~ msgid "_Open in External Viewer"
+#~ msgstr "Atvērt ārē_jā skatītājā"
 
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:2
-msgid "_Preferences…"
-msgstr "_Iestatījumi..."
+#~| msgid "Elements"
+#~ msgid "_Remove Elements"
+#~ msgstr "_Izņemt elementus"
 
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:3
-msgid "_Help"
-msgstr "_Palīdzība"
+#~ msgid "Aut_horize Account…"
+#~ msgstr "Piln_varot kontu..."
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:1
-msgid "_File"
-msgstr "_Datne"
+#~ msgid "_Preferences…"
+#~ msgstr "_Iestatījumi..."
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:2
-msgid "_Open…"
-msgstr "Atvērt…"
+#~ msgid "_Help"
+#~ msgstr "_Palīdzība"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:3
-msgid "_Save"
-msgstr "_Saglabāt"
+#~ msgid "_File"
+#~ msgstr "_Datne"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:4
-msgid "Save _As…"
-msgstr "S_aglabāt kā..."
+#~ msgid "_Open…"
+#~ msgstr "Atvērt…"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:5
-#| msgid "Elements"
-msgid "A_dd Elements…"
-msgstr "Pie_vienot elementus…"
+#~ msgid "Save _As…"
+#~ msgstr "S_aglabāt kā..."
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:7
-msgid "_Upload All"
-msgstr "A_ugšupielādet visus"
+#~| msgid "Elements"
+#~ msgid "A_dd Elements…"
+#~ msgstr "Pie_vienot elementus…"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:8
-msgid "_Edit"
-msgstr "R_ediģēt"
+#~ msgid "_Upload All"
+#~ msgstr "A_ugšupielādet visus"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:16
-msgid "_View"
-msgstr "_Skats"
+#~ msgid "_View"
+#~ msgstr "_Skats"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:17
-#| msgid "Elements"
-msgid "_Sort Elements"
-msgstr "Kārtot elementu_s"
+#~| msgid "Elements"
+#~ msgid "_Sort Elements"
+#~ msgstr "Kārtot elementu_s"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:18
-msgid "As _Loaded"
-msgstr "Ie_lādes secībā"
+#~ msgid "As _Loaded"
+#~ msgstr "Ie_lādes secībā"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:19
-msgid "By _Date Taken"
-msgstr "Pēc uzņemšanas _datuma"
+#~ msgid "By _Date Taken"
+#~ msgstr "Pēc uzņemšanas _datuma"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:20
-msgid "By _Title"
-msgstr "Pēc _nosaukuma"
+#~ msgid "By _Title"
+#~ msgstr "Pēc _nosaukuma"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:21
-#| msgid "By _Title"
-msgid "By _Size"
-msgstr "Pēc _izmēra"
+#~| msgid "By _Title"
+#~ msgid "By _Size"
+#~ msgstr "Pēc _izmēra"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:22
-msgid "_Reversed Order"
-msgstr "Apg_rieztā secībā"
+#~ msgid "_Reversed Order"
+#~ msgstr "Apg_rieztā secībā"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:23
-msgid "Enable _Tooltips"
-msgstr "Aktivē_t paskaidres"
+#~ msgid "Enable _Tooltips"
+#~ msgstr "Aktivē_t paskaidres"
 
 #~ msgid "Flickr Remote Organizer"
 #~ msgstr "Flickr attālinātais organizētājs"
@@ -957,15 +931,9 @@ msgstr "Aktivē_t paskaidres"
 #~ msgid " - %d pictures to upload (%s)"
 #~ msgstr " — %d attēli jāaugšupielādē (%s)"
 
-#~ msgid "_Load Pictures…"
-#~ msgstr "Ie_lādēt attēlus..."
-
 #~ msgid "_Remove Pictures"
 #~ msgstr "_Izņemt attēlus"
 
-#~ msgid "frogr"
-#~ msgstr "frogr"
-
 #~ msgid "A_ctions"
 #~ msgstr "Dar_bības"
 
diff --git a/po/nb.po b/po/nb.po
index 247aafe..72c5c89 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: frogr 0.6\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-12 09:31+0200\n"
+"Report-Msgid-Bugs-To: msanchez gnome org\n"
+"POT-Creation-Date: 2016-08-12 13:09+0100\n"
 "PO-Revision-Date: 2012-04-12 09:39+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb lister ping uio no>\n"
@@ -18,111 +18,171 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/frogr.desktop.in.in.h:1
-msgid "Flickr Remote Organizer"
-msgstr "Flickr organisering"
+#: data/frogr.appdata.xml.in:5 data/frogr.desktop.in.in:5
+#: data/frogr.desktop.in.in:14
+msgid "frogr"
+msgstr "frogr"
 
-#: ../data/frogr.desktop.in.in.h:2
-msgid "Frogr: a Flickr Remote Organizer for GNOME"
+#: data/frogr.appdata.xml.in:6 data/frogr.desktop.in.in:6
+#, fuzzy
+msgid "frogr: a Flickr Remote Organizer for GNOME"
 msgstr "Frogr: program for å organisere Flickr for GNOME"
 
-#: ../data/frogr.desktop.in.in.h:3
+#: data/frogr.appdata.xml.in:8
+msgid ""
+"frogr is a small application for the GNOME desktop that allows users to "
+"manage their accounts in the Flickr image hosting website."
+msgstr ""
+
+#: data/frogr.appdata.xml.in:13
+msgid ""
+"It supports all the basic Flickr features, including uploading pictures, "
+"adding descriptions, setting tags and managing sets and groups pools."
+msgstr ""
+
+#: data/frogr.appdata.xml.in:24
+#, fuzzy
+msgid "Screenshot of frogr"
+msgstr "Skjermdu_mp"
+
+#: data/frogr.appdata.xml.in:29
+msgid "Mario Sanchez Prada"
+msgstr ""
+
+#: data/frogr.desktop.in.in:7
 msgid "Upload and organize photos in Flickr accounts"
 msgstr "Last opp og organiser bilder i Flickr-kontoer"
 
-#: ../src/frogr-about-dialog.c:43
-msgid "A Flickr remote organizer for GNOME\n"
+#: data/frogr.desktop.in.in:8
+msgid "Flickr;Image;Picture;Photo;Video;Uploader;"
+msgstr ""
+
+#: src/frogr-about-dialog.c:43
+#, fuzzy
+msgid "A Flickr Remote Organizer for GNOME\n"
 msgstr "Eksternt organiseringspforgram for Flickr og GNOME\n"
 
-#: ../src/frogr-about-dialog.c:115
+#: src/frogr-about-dialog.c:72
 msgid "translator-credits"
 msgstr ""
 "Kjartan Maraas <kmaraas gnome org>\n"
 "Torstein Adolf Winterseth <kvikende fsfe org>"
 
-#: ../src/frogr-add-tags-dialog.c:201
+#: src/frogr-add-tags-dialog.c:191 src/frogr-add-to-group-dialog.c:528
+#: src/frogr-add-to-set-dialog.c:529 src/frogr-auth-dialog.c:153
+#: src/frogr-create-new-set-dialog.c:310 src/frogr-details-dialog.c:1168
+#: src/frogr-main-view.c:1543 src/frogr-main-view.c:1618
+#: src/frogr-main-view.c:1670 src/frogr-settings-dialog.c:930
+msgid "_Cancel"
+msgstr ""
+
+#: src/frogr-add-tags-dialog.c:193 src/frogr-add-to-group-dialog.c:530
+#: src/frogr-add-to-set-dialog.c:531 src/frogr-create-new-set-dialog.c:312
+msgid "_Add"
+msgstr ""
+
+#: src/frogr-add-tags-dialog.c:202
 msgid "Enter a spaces separated list of tags:"
 msgstr "Oppgi en liste med merkelapper delt med mellomrom:"
 
-#: ../src/frogr-add-tags-dialog.c:224
+#: src/frogr-add-tags-dialog.c:228
 msgid "Add Tags"
 msgstr "Legg til merkelapper"
 
-#: ../src/frogr-add-to-set-dialog.c:131
-msgid "Title"
-msgstr "Tittel"
+#: src/frogr-add-to-group-dialog.c:147
+msgid "Name"
+msgstr "Navn"
 
-#: ../src/frogr-add-to-set-dialog.c:146 ../src/frogr-add-to-group-dialog.c:146
+#: src/frogr-add-to-group-dialog.c:162 src/frogr-add-to-set-dialog.c:163
 msgid "Elements"
 msgstr "Elementer"
 
-#: ../src/frogr-add-to-set-dialog.c:563
-msgid "Add to Sets"
-msgstr ""
-
-#: ../src/frogr-add-to-group-dialog.c:131
-msgid "Name"
-msgstr "Navn"
-
-#: ../src/frogr-add-to-group-dialog.c:563
+#: src/frogr-add-to-group-dialog.c:581
 msgid "Add to Groups"
 msgstr "Legg til i grupper"
 
-#: ../src/frogr-auth-dialog.c:32
+#: src/frogr-add-to-set-dialog.c:148
+msgid "Title"
+msgstr "Tittel"
+
+#: src/frogr-add-to-set-dialog.c:582
+msgid "Add to Sets"
+msgstr ""
+
+#: src/frogr-auth-dialog.c:59
 #, c-format
 msgid ""
 "Please press the button to authorize %s and then come back to complete the "
 "process."
 msgstr ""
 
-#: ../src/frogr-auth-dialog.c:36
-msgid "Enter verification code."
-msgstr "Oppgi kode for verifisering."
-
-#: ../src/frogr-auth-dialog.c:63 ../src/frogr-auth-dialog.c:147
+#: src/frogr-auth-dialog.c:63 src/frogr-auth-dialog.c:149
+#: src/frogr-controller.c:2286
 #, c-format
 msgid "Authorize %s"
 msgstr "Autoriser %s"
 
-#: ../src/frogr-auth-dialog.c:214
+#: src/frogr-auth-dialog.c:155 src/frogr-settings-dialog.c:932
+msgid "_Close"
+msgstr ""
+
+#: src/frogr-auth-dialog.c:167
+#, fuzzy
+msgid "Enter verification code:"
+msgstr "Oppgi kode for verifisering."
+
+#: src/frogr-auth-dialog.c:221
 msgid "Invalid verification code"
 msgstr ""
 
-#: ../src/frogr-controller.c:277
+#: src/frogr-controller.c:581
 msgid "Process cancelled"
 msgstr ""
 
-#: ../src/frogr-controller.c:282
+#: src/frogr-controller.c:586
 msgid ""
 "Connection error:\n"
 "Network not available"
 msgstr ""
 
-#: ../src/frogr-controller.c:287
+#: src/frogr-controller.c:590
 msgid ""
 "Connection error:\n"
 "Bad request"
 msgstr ""
 
-#: ../src/frogr-controller.c:292
+#: src/frogr-controller.c:594
 msgid ""
 "Connection error:\n"
 "Server-side error"
 msgstr ""
 
-#: ../src/frogr-controller.c:297
+#: src/frogr-controller.c:598
 msgid ""
-"Error uploading picture:\n"
+"Error uploading:\n"
 "File invalid"
 msgstr ""
 
-#: ../src/frogr-controller.c:302
+#: src/frogr-controller.c:602
 msgid ""
 "Error uploading picture:\n"
 "Quota exceeded"
 msgstr ""
 
-#: ../src/frogr-controller.c:307
+#: src/frogr-controller.c:607
+#, c-format
+msgid "Quota exceeded (limit: %d video per month)"
+msgid_plural "Quota exceeded (limit: %d videos per month)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/frogr-controller.c:611
+msgid ""
+"Error uploading video:\n"
+"You can't upload more videos with this account"
+msgstr ""
+
+#: src/frogr-controller.c:617
 msgid ""
 "Error:\n"
 "Photo not found"
@@ -130,7 +190,7 @@ msgstr ""
 "Feil:\n"
 "Bilde ikke funnet"
 
-#: ../src/frogr-controller.c:312
+#: src/frogr-controller.c:621
 msgid ""
 "Error:\n"
 "Photo already in photoset"
@@ -138,7 +198,7 @@ msgstr ""
 "Feil:\n"
 "Bilde finnes allerede i bildesett"
 
-#: ../src/frogr-controller.c:317
+#: src/frogr-controller.c:625
 msgid ""
 "Error:\n"
 "Photo already in group"
@@ -146,585 +206,641 @@ msgstr ""
 "Feil:\n"
 "Bilde finnes allerede i gruppen"
 
-#: ../src/frogr-controller.c:322
+#: src/frogr-controller.c:629
 msgid ""
 "Error:\n"
 "Photo already in the maximum number of groups possible"
 msgstr ""
 
-#: ../src/frogr-controller.c:327
+#: src/frogr-controller.c:633
 msgid ""
 "Error:\n"
 "Group limit already reached"
 msgstr ""
 
-#: ../src/frogr-controller.c:332
+#: src/frogr-controller.c:637
 msgid ""
 "Error:\n"
 "Photo added to group's queue"
 msgstr ""
 
-#: ../src/frogr-controller.c:337
+#: src/frogr-controller.c:641
 msgid ""
 "Error:\n"
 "Photo already added to group's queue"
 msgstr ""
 
-#: ../src/frogr-controller.c:342
+#: src/frogr-controller.c:645
 msgid ""
 "Error:\n"
 "Content not allowed for this group"
 msgstr ""
 
-#: ../src/frogr-controller.c:347
-#, c-format
+#: src/frogr-controller.c:649
 msgid ""
 "Authorization failed.\n"
 "Please try again"
 msgstr ""
 
-#: ../src/frogr-controller.c:353
+#: src/frogr-controller.c:655
 #, c-format
 msgid ""
 "Error\n"
-"%s is not properly authorized to upload pictures to flickr.\n"
+"%s is not properly authorized to upload pictures to Flickr.\n"
 "Please re-authorize it"
 msgstr ""
 
-#: ../src/frogr-controller.c:359
-#, c-format
+#: src/frogr-controller.c:660
 msgid ""
-"Unable to authenticate in flickr\n"
+"Unable to authenticate in Flickr\n"
 "Please try again."
 msgstr ""
 
-#: ../src/frogr-controller.c:364
+#: src/frogr-controller.c:664
 #, c-format
 msgid ""
 "You have not properly authorized %s yet.\n"
 "Please try again."
 msgstr ""
 
-#: ../src/frogr-controller.c:370
-#, c-format
+#: src/frogr-controller.c:669
 msgid ""
 "Invalid verification code.\n"
 "Please try again."
 msgstr ""
 
-#: ../src/frogr-controller.c:375
-#, c-format
+#: src/frogr-controller.c:673
 msgid ""
 "Error:\n"
 "Service not available"
 msgstr ""
 
-#. General error: just dump the raw error description
-#: ../src/frogr-controller.c:381
+#: src/frogr-controller.c:678
 #, c-format
 msgid "An error happened: %s."
 msgstr "En feil oppsto: %s."
 
-#: ../src/frogr-controller.c:591
+#: src/frogr-controller.c:883
 msgid "Authorization failed (timed out)"
 msgstr ""
 
-#: ../src/frogr-controller.c:1159
-msgid "Setting license for picture…"
-msgstr ""
-
-#: ../src/frogr-controller.c:1180
-msgid "Setting geolocation for picture…"
+#: src/frogr-controller.c:931
+#, c-format
+msgid "Retrying Upload (attempt %d/%d)…"
 msgstr ""
 
-#: ../src/frogr-controller.c:1206
-msgid "Creating new photosets…"
-msgstr "Lager nye bildesett …"
-
-#: ../src/frogr-controller.c:1230
-msgid "Adding picture to photosets…"
-msgstr "Legger til bilde i bildesett …"
-
-#: ../src/frogr-controller.c:1252
-msgid "Adding picture to groups…"
-msgstr "Legger til bilde i grupper …"
-
-#. First %s is the title of the picture (filename of the file by
-#. default). Second %s is the max allowed size for a picture to be
-#. uploaded to flickr (different for free and PRO accounts).
-#: ../src/frogr-controller.c:1292
+#: src/frogr-controller.c:936
 #, c-format
-msgid ""
-"Can't load picture %s: size of file is bigger than the maximum allowed for "
-"this account (%s)"
-msgstr ""
+msgid "Uploading '%s'…"
+msgstr "Laster opp «%s» …"
 
-#: ../src/frogr-controller.c:1766
+#: src/frogr-controller.c:2242
 msgid "Updating credentials…"
 msgstr "Oppdaterer påloggingsinformasjon …"
 
-#: ../src/frogr-controller.c:1771
+#: src/frogr-controller.c:2247
 msgid "Retrieving data for authorization…"
 msgstr ""
 
-#: ../src/frogr-controller.c:1776
+#: src/frogr-controller.c:2252
 msgid "Finishing authorization…"
 msgstr ""
 
-#: ../src/frogr-controller.c:1781
+#: src/frogr-controller.c:2257
 msgid "Retrieving list of sets…"
 msgstr "Henter liste med sett …"
 
-#: ../src/frogr-controller.c:1786
+#: src/frogr-controller.c:2262
 msgid "Retrieving list of groups…"
 msgstr "Henter liste med grupper …"
 
-#: ../src/frogr-controller.c:1791
+#: src/frogr-controller.c:2267
 msgid "Retrieving list of tags…"
 msgstr "Henter liste med merkelapper …"
 
-#: ../src/frogr-controller.c:1927
+#: src/frogr-controller.c:2292
+msgid "Fetching information"
+msgstr ""
+
+#: src/frogr-controller.c:2398
 msgid "No sets found"
 msgstr "Ingen sett funnet"
 
-#: ../src/frogr-controller.c:1959
+#: src/frogr-controller.c:2423
 msgid "No groups found"
 msgstr "Ingen grupper funnet"
 
-#: ../src/frogr-controller.c:2676
+#: src/frogr-controller.c:2984
 #, c-format
 msgid ""
-"You need to properly authorize %s before uploading any pictures to flickr.\n"
+"You need to properly authorize %s before uploading any pictures to Flickr.\n"
 "Please re-authorize it."
 msgstr ""
 
-#. This shows a dialog notifying the problem to the user
-#: ../src/frogr-create-new-set-dialog.c:134 ../src/frogr-details-dialog.c:1007
+#: src/frogr-controller.c:2994
+#, fuzzy
+msgid "You need to be connected before uploading any pictures to Flickr."
+msgstr "Du må velge noen bilder først"
+
+#: src/frogr-controller.c:3012
+#, fuzzy
+msgid "Uploading Pictures"
+msgstr "_Legg til bilder"
+
+#: src/frogr-controller.c:3057
+msgid "Error opening project file"
+msgstr ""
+
+#: src/frogr-create-new-set-dialog.c:143 src/frogr-details-dialog.c:1001
 msgid "Missing data required"
 msgstr ""
 
-#: ../src/frogr-create-new-set-dialog.c:321
-msgid "Set's title:"
-msgstr "Tittel for sett:"
+#: src/frogr-create-new-set-dialog.c:326
+#, fuzzy
+msgid "Title:"
+msgstr "_Tittel:"
 
-#: ../src/frogr-create-new-set-dialog.c:334
+#: src/frogr-create-new-set-dialog.c:335
 #, fuzzy
-msgid "Set's description:"
-msgstr "Beskrivelse:"
+msgid "Description:"
+msgstr "_Beskrivelse:"
 
-#: ../src/frogr-create-new-set-dialog.c:357
-msgid "Fill pictures details with title and description"
+#: src/frogr-create-new-set-dialog.c:356
+msgid "Fill Pictures Details with Title and Description"
 msgstr ""
 
-#: ../src/frogr-create-new-set-dialog.c:378
-msgid "Create new Set"
+#: src/frogr-create-new-set-dialog.c:381
+msgid "Create New Set"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:91 ../src/frogr-settings-dialog.c:105
-msgid "Default (as specified in flickr)"
+#: src/frogr-details-dialog.c:89 src/frogr-settings-dialog.c:97
+msgid "Default (as specified in Flickr)"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:92 ../src/frogr-settings-dialog.c:106
+#: src/frogr-details-dialog.c:90 src/frogr-settings-dialog.c:98
 msgid "All rights reserved"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:93 ../src/frogr-settings-dialog.c:107
+#: src/frogr-details-dialog.c:91 src/frogr-settings-dialog.c:99
 msgid "CC Attribution-NonCommercial-ShareAlike"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:94 ../src/frogr-settings-dialog.c:108
+#: src/frogr-details-dialog.c:92 src/frogr-settings-dialog.c:100
 msgid "CC Attribution-NonCommercial"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:95 ../src/frogr-settings-dialog.c:109
+#: src/frogr-details-dialog.c:93 src/frogr-settings-dialog.c:101
 msgid "CC Attribution-NonCommercial-NoDerivs"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:96 ../src/frogr-settings-dialog.c:110
+#: src/frogr-details-dialog.c:94 src/frogr-settings-dialog.c:102
 msgid "CC Attribution"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:97 ../src/frogr-settings-dialog.c:111
+#: src/frogr-details-dialog.c:95 src/frogr-settings-dialog.c:103
 msgid "CC Attribution-ShareAlike"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:98 ../src/frogr-settings-dialog.c:112
+#: src/frogr-details-dialog.c:96 src/frogr-settings-dialog.c:104
 msgid "CC Attribution-NoDerivs"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:166
+#: src/frogr-details-dialog.c:172
 msgid "Open with image viewer"
 msgstr "Åpne med bildevisning"
 
-#: ../src/frogr-details-dialog.c:189
+#: src/frogr-details-dialog.c:190
+msgid "_Title:"
+msgstr "_Tittel:"
+
+#: src/frogr-details-dialog.c:200
+msgid "_Description:"
+msgstr "_Beskrivelse:"
+
+#: src/frogr-details-dialog.c:224
+msgid "Ta_gs:"
+msgstr "Mer_kelapper:"
+
+#: src/frogr-details-dialog.c:247
 msgid "Visibility"
 msgstr "Synlighet"
 
-#: ../src/frogr-details-dialog.c:200 ../src/frogr-settings-dialog.c:204
+#: src/frogr-details-dialog.c:257 src/frogr-settings-dialog.c:196
 msgid "_Private"
 msgstr "_Privat"
 
-#: ../src/frogr-details-dialog.c:204 ../src/frogr-settings-dialog.c:206
+#: src/frogr-details-dialog.c:261 src/frogr-settings-dialog.c:199
 msgid "P_ublic"
 msgstr "_Offentlig"
 
-#: ../src/frogr-details-dialog.c:212 ../src/frogr-settings-dialog.c:213
-msgid "Visible to _Family"
-msgstr "Synlig for _familien"
+#: src/frogr-details-dialog.c:270 src/frogr-settings-dialog.c:207
+msgid "_Family"
+msgstr ""
 
-#: ../src/frogr-details-dialog.c:216 ../src/frogr-settings-dialog.c:215
-msgid "Visible to F_riends"
-msgstr "Synlig for venne_r"
+#: src/frogr-details-dialog.c:274 src/frogr-settings-dialog.c:209
+msgid "F_riends"
+msgstr ""
 
-#: ../src/frogr-details-dialog.c:238
-msgid "Content type"
+#: src/frogr-details-dialog.c:288
+#, fuzzy
+msgid "Content Type"
 msgstr "Innholdstype"
 
-#: ../src/frogr-details-dialog.c:247 ../src/frogr-settings-dialog.c:240
+#: src/frogr-details-dialog.c:296 src/frogr-settings-dialog.c:234
 msgid "P_hoto"
 msgstr "_Foto"
 
-#: ../src/frogr-details-dialog.c:251 ../src/frogr-settings-dialog.c:242
+#: src/frogr-details-dialog.c:300 src/frogr-settings-dialog.c:236
 msgid "Scree_nshot"
 msgstr "Skjermdu_mp"
 
-#: ../src/frogr-details-dialog.c:255 ../src/frogr-settings-dialog.c:244
+#: src/frogr-details-dialog.c:304 src/frogr-settings-dialog.c:238
 msgid "Oth_er"
 msgstr "Ann_et"
 
-#: ../src/frogr-details-dialog.c:269
-msgid "Safety level"
+#: src/frogr-details-dialog.c:317
+#, fuzzy
+msgid "Safety Level"
 msgstr "Sikkerhetsnivå"
 
-#: ../src/frogr-details-dialog.c:278 ../src/frogr-settings-dialog.c:264
+#: src/frogr-details-dialog.c:325 src/frogr-settings-dialog.c:260
 msgid "S_afe"
 msgstr "Tr_ygg"
 
-#: ../src/frogr-details-dialog.c:282 ../src/frogr-settings-dialog.c:266
+#: src/frogr-details-dialog.c:329 src/frogr-settings-dialog.c:262
 msgid "_Moderate"
 msgstr "_Moderat"
 
-#: ../src/frogr-details-dialog.c:286 ../src/frogr-settings-dialog.c:268
+#: src/frogr-details-dialog.c:333 src/frogr-settings-dialog.c:264
 msgid "Restr_icted"
 msgstr "Begr_enset"
 
-#: ../src/frogr-details-dialog.c:299
-msgid "License type"
+#: src/frogr-details-dialog.c:345
+#, fuzzy
+msgid "License Type"
 msgstr "Type lisens"
 
-#: ../src/frogr-details-dialog.c:322
-msgid "Other properties"
+#: src/frogr-details-dialog.c:367
+#, fuzzy
+msgid "Other Properties"
 msgstr "Andre egenskaper"
 
-#: ../src/frogr-details-dialog.c:331
-msgid "Set geo_location data if available"
+#: src/frogr-details-dialog.c:375
+msgid "_Show Up in Global Search Results"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:335
-msgid "_Show up in Global Search Results"
+#: src/frogr-details-dialog.c:379
+msgid "Set Geo_location Information"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:347
-msgid "_Title:"
-msgstr "_Tittel:"
-
-#: ../src/frogr-details-dialog.c:359
-msgid "_Description:"
-msgstr "_Beskrivelse:"
-
-#: ../src/frogr-details-dialog.c:385
-msgid "Ta_gs:"
-msgstr "Mer_kelapper:"
+#: src/frogr-details-dialog.c:383
+msgid "Replace 'Date Posted' with 'Date Taken'"
+msgstr ""
 
-#. Visually indicate how many pictures are being edited
-#: ../src/frogr-details-dialog.c:482
+#: src/frogr-details-dialog.c:475
 #, c-format
 msgid "(%d Picture)"
 msgid_plural "(%d Pictures)"
 msgstr[0] "(%d bilde)"
 msgstr[1] "(%d bilder)"
 
-#: ../src/frogr-details-dialog.c:560
+#: src/frogr-details-dialog.c:548
 msgid "An error happened trying to load the picture"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:1227
+#: src/frogr-details-dialog.c:1169
+msgid "_Edit"
+msgstr ""
+
+#: src/frogr-details-dialog.c:1197
 msgid "Edit Picture Details"
 msgstr "Rediger detaljer for bilde"
 
-#. String showind the date and time a picture was taken
-#: ../src/frogr-main-view.c:748
+#: src/frogr-file-loader.c:142
+#, fuzzy, c-format
+msgid "Loading files %d / %d"
+msgstr "Laster bilder %d / %d"
+
+#: src/frogr-file-loader.c:369
+#, c-format
+msgid ""
+"Unable to load picture %s:\n"
+"%s"
+msgstr ""
+
+#: src/frogr-file-loader.c:400
+#, c-format
+msgid ""
+"Unable to load video %s\n"
+"Please check that you have the right codec installed"
+msgstr ""
+
+#: src/frogr-file-loader.c:636
+#, c-format
+msgid ""
+"Can't load file %s:\n"
+"Size of file is bigger than the maximum allowed for this account (%s)"
+msgstr ""
+
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
+msgid "Open"
+msgstr ""
+
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
+msgid "Open Existing Project"
+msgstr ""
+
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
+msgid "Add"
+msgstr "Legg til"
+
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
+#, fuzzy
+msgid "Add Elements"
+msgstr "Elementer"
+
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
+msgid "Remove"
+msgstr "Fjern"
+
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
+#, fuzzy
+msgid "Remove Elements"
+msgstr "Elementer"
+
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
+msgid "Upload"
+msgstr "Last opp"
+
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
+#, fuzzy
+msgid "Upload All"
+msgstr "Last opp"
+
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
+msgid "Save"
+msgstr ""
+
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
+msgid "Save Current Project"
+msgstr ""
+
+#: src/frogr-main-view.c:1016
+msgid "_About"
+msgstr "_Om"
+
+#: src/frogr-main-view.c:1020
+msgid "_Quit"
+msgstr "A_vslutt"
+
+#: src/frogr-main-view.c:1070
+#, fuzzy
+msgid "Accounts"
+msgstr "Ko_ntoer"
+
+#: src/frogr-main-view.c:1410
 #, c-format
 msgid "Taken: %s"
 msgstr "Tatt: %s"
 
-#: ../src/frogr-main-view.c:753
+#: src/frogr-main-view.c:1415
 #, c-format
 msgid "File size: %s"
 msgstr "Filstørrelse: %s"
 
-#: ../src/frogr-main-view.c:941
+#: src/frogr-main-view.c:1540
+#, fuzzy
+msgid "Select File"
+msgstr "Velg et bilde"
+
+#: src/frogr-main-view.c:1544 src/frogr-main-view.c:1671
+msgid "_Open"
+msgstr ""
+
+#: src/frogr-main-view.c:1553
+msgid "Frogr Project Files"
+msgstr ""
+
+#: src/frogr-main-view.c:1615
+#, fuzzy
+msgid "Select Destination"
+msgstr "Beskrivelse:"
+
+#: src/frogr-main-view.c:1619
+msgid "_Save"
+msgstr ""
+
+#: src/frogr-main-view.c:1622
+msgid "Untitled Project.frogr"
+msgstr ""
+
+#: src/frogr-main-view.c:1667
 msgid "Select a Picture"
 msgstr "Velg et bilde"
 
-#: ../src/frogr-main-view.c:967
-msgid "images"
-msgstr "bilder"
+#: src/frogr-main-view.c:1694
+msgid "All Files"
+msgstr ""
+
+#: src/frogr-main-view.c:1697
+msgid "Image Files"
+msgstr ""
+
+#: src/frogr-main-view.c:1701
+msgid "Video Files"
+msgstr ""
+
+#: src/frogr-main-view.c:1723
+msgid "You don't have any picture added yet"
+msgstr ""
 
-#: ../src/frogr-main-view.c:988
+#: src/frogr-main-view.c:1736
 msgid "You need to select some pictures first"
 msgstr "Du må velge noen bilder først"
 
-#: ../src/frogr-main-view.c:1334
-msgid "Not connected to flickr"
+#: src/frogr-main-view.c:2108
+#, fuzzy
+msgid "Not connected to Flickr"
 msgstr "Ikke tilkoblet flickr"
 
-#. Login string, showing the user is PRO (second '%s') if so.
-#: ../src/frogr-main-view.c:1344
+#: src/frogr-main-view.c:2118
 #, c-format
 msgid "Connected as %s%s"
 msgstr "Tilkoblet som %s%s"
 
-#: ../src/frogr-main-view.c:1345
+#: src/frogr-main-view.c:2119
 msgid " (PRO account)"
 msgstr ""
 
-#. Will show in the status bar the amount of data (in KB, MB
-#. or GB) the user is currently allowed to upload to flicker
-#. till the end of the month, in a CURRENT / MAX fashion.
-#. The '-' at the beginning is just a separator, since more
-#. blocks of text will be shown in the status bar too.
-#: ../src/frogr-main-view.c:1369
+#: src/frogr-main-view.c:2143
 #, c-format
 msgid " - %s / %s remaining"
 msgstr " - %s / %s gjenstår"
 
-#: ../src/frogr-main-view.c:1396
-#, c-format
-msgid " - %d pictures to upload (%s)"
-msgstr " - %d bilder å laste opp (%s)"
+#: src/frogr-main-view.c:2169
+#, fuzzy, c-format
+msgid " - %d file to upload (%s)"
+msgid_plural " - %d files to upload (%s)"
+msgstr[0] " - %d bilde å laste opp (%s)"
+msgstr[1] " - %d bilde å laste opp (%s)"
 
-#: ../src/frogr-main-view.c:1397
-#, c-format
-msgid " - %d picture to upload (%s)"
-msgstr " - %d bilde å laste opp (%s)"
-
-#: ../src/frogr-picture-loader.c:122
-#, c-format
-msgid "Loading pictures %d / %d"
-msgstr "Laster bilder %d / %d"
-
-#. Update progress
-#: ../src/frogr-picture-uploader.c:84
-#, c-format
-msgid "Uploading '%s'…"
-msgstr "Laster opp «%s» …"
-
-#: ../src/frogr-settings-dialog.c:193
+#: src/frogr-settings-dialog.c:185
 msgid "Default Visibility"
 msgstr "Forvalgt synlighet"
 
-#: ../src/frogr-settings-dialog.c:229
+#: src/frogr-settings-dialog.c:224
 msgid "Default Content Type"
 msgstr "Forvalgt innholdstype"
 
-#: ../src/frogr-settings-dialog.c:253
+#: src/frogr-settings-dialog.c:250
 msgid "Default Safety Level"
 msgstr "Forvalgt sikkerhetsnivå"
 
-#: ../src/frogr-settings-dialog.c:277
+#: src/frogr-settings-dialog.c:276
 msgid "Default License"
 msgstr "Forvalgt lisens"
 
-#: ../src/frogr-settings-dialog.c:301
+#: src/frogr-settings-dialog.c:302
 msgid "Other Defaults"
 msgstr "Andre forvalg"
 
-#: ../src/frogr-settings-dialog.c:312
-msgid "Send Geo_location Data for Pictures"
+#: src/frogr-settings-dialog.c:312
+msgid "_Show Pictures in Global Search Results"
 msgstr ""
 
-#: ../src/frogr-settings-dialog.c:315
-msgid "_Show Pictures in Global Search Results"
+#: src/frogr-settings-dialog.c:315
+msgid "Set Geo_location Information for Pictures"
 msgstr ""
 
-#: ../src/frogr-settings-dialog.c:321
+#: src/frogr-settings-dialog.c:318
+msgid "Replace 'Date Posted' with 'Date Taken' for Pictures"
+msgstr ""
+
+#: src/frogr-settings-dialog.c:324
 msgid "_General"
 msgstr "_Generelt"
 
-#: ../src/frogr-settings-dialog.c:345
+#: src/frogr-settings-dialog.c:344
 msgid "Proxy Settings"
 msgstr "Innstillinger for proxy"
 
-#. Enable proxy
-#: ../src/frogr-settings-dialog.c:355
+#: src/frogr-settings-dialog.c:353
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: ../src/frogr-settings-dialog.c:365
+#: src/frogr-settings-dialog.c:363
 msgid "_Host:"
 msgstr "_Vert:"
 
-#. Proxy port
-#: ../src/frogr-settings-dialog.c:383
+#: src/frogr-settings-dialog.c:376
 msgid "_Port:"
 msgstr "_Port:"
 
-#. Proxy username
-#: ../src/frogr-settings-dialog.c:401
+#: src/frogr-settings-dialog.c:389
 msgid "U_sername:"
 msgstr "Br_ukernavn:"
 
-#. Proxy password
-#: ../src/frogr-settings-dialog.c:419
+#: src/frogr-settings-dialog.c:402
 msgid "Pass_word:"
 msgstr "Pass_ord:"
 
-#: ../src/frogr-settings-dialog.c:466
+#: src/frogr-settings-dialog.c:426
 msgid "Connec_tion"
 msgstr "_Tilkobling"
 
-#: ../src/frogr-settings-dialog.c:488
+#: src/frogr-settings-dialog.c:444
 msgid "Other options"
 msgstr "Andre alternativer"
 
-#: ../src/frogr-settings-dialog.c:499
+#: src/frogr-settings-dialog.c:454
 msgid "Ena_ble Tags Auto-Completion"
 msgstr ""
 
-#: ../src/frogr-settings-dialog.c:502
+#: src/frogr-settings-dialog.c:457
 msgid "_Import Tags from Pictures Metadata"
 msgstr ""
 
-#: ../src/frogr-settings-dialog.c:507
-msgid "Use _Dark Theme (if available)"
+#: src/frogr-settings-dialog.c:461
+msgid "Use _Dark GTK Theme"
 msgstr ""
 
-#: ../src/frogr-settings-dialog.c:512
-msgid "_Keep File Extensions in Titles when Loading Pictures"
+#: src/frogr-settings-dialog.c:465
+msgid "_Keep File Extensions in Titles when Loading"
 msgstr ""
 
-#: ../src/frogr-settings-dialog.c:518
+#: src/frogr-settings-dialog.c:471
 msgid "_Misc"
 msgstr "_Forskjellig"
 
-#: ../src/frogr-settings-dialog.c:1068
+#: src/frogr-settings-dialog.c:972
 msgid "Preferences"
 msgstr "Brukervalg"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:1
-msgid "_About"
-msgstr "_Om"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:2
-#, fuzzy
-msgid "_Load Pictures…"
-msgstr "_Legg til bilder"
+#~ msgid "Flickr Remote Organizer"
+#~ msgstr "Flickr organisering"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:3
-msgid "Add _Tags…"
-msgstr ""
+#~ msgid "Creating new photosets…"
+#~ msgstr "Lager nye bildesett …"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:4
-msgid "Add to _Group…"
-msgstr "Legg til i _gruppe …"
+#~ msgid "Adding picture to photosets…"
+#~ msgstr "Legger til bilde i bildesett …"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:5
-msgid "_Create New Set…"
-msgstr ""
+#~ msgid "Adding picture to groups…"
+#~ msgstr "Legger til bilde i grupper …"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:6
-msgid "Add to _Existing Set…"
-msgstr ""
+#~ msgid "Set's title:"
+#~ msgstr "Tittel for sett:"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:7
-msgid "Aut_horize account…"
-msgstr ""
+#~ msgid "Visible to _Family"
+#~ msgstr "Synlig for _familien"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:8
-msgid "Enable _Tooltips"
-msgstr ""
+#~ msgid "Visible to F_riends"
+#~ msgstr "Synlig for venne_r"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:9
-msgid "Edit _Details…"
-msgstr "Rediger detaljer …"
+#~ msgid "images"
+#~ msgstr "bilder"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:10
-msgid "_Help"
-msgstr "_Hjelp"
+#~ msgid " - %d pictures to upload (%s)"
+#~ msgstr " - %d bilder å laste opp (%s)"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:11
-msgid "Open in E_xternal Viewer"
-msgstr "Åpne i e_ksternt visningsprogram"
+#~ msgid "Add to _Group…"
+#~ msgstr "Legg til i _gruppe …"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:12
-msgid "_Preferences…"
-msgstr "_Brukervalg …"
+#~ msgid "Edit _Details…"
+#~ msgstr "Rediger detaljer …"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:13
-msgid "_Quit"
-msgstr "A_vslutt"
+#~ msgid "_Help"
+#~ msgstr "_Hjelp"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:14
-msgid "_Remove Pictures"
-msgstr "Fje_rn bilder"
+#~ msgid "Open in E_xternal Viewer"
+#~ msgstr "Åpne i e_ksternt visningsprogram"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:15
-msgid "_Reversed Order"
-msgstr "Omvendt _rekkefølge"
+#~ msgid "_Preferences…"
+#~ msgstr "_Brukervalg …"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:16
-msgid "As _Loaded"
-msgstr "Som _lastet"
+#~ msgid "_Remove Pictures"
+#~ msgstr "Fje_rn bilder"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:17
-msgid "By _Date Taken"
-msgstr ""
+#~ msgid "_Reversed Order"
+#~ msgstr "Omvendt _rekkefølge"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:18
-msgid "By _Title"
-msgstr "Etter _tittel"
+#~ msgid "As _Loaded"
+#~ msgstr "Som _lastet"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:19
-msgid "_Upload All"
-msgstr ""
+#~ msgid "By _Title"
+#~ msgstr "Etter _tittel"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:20
-msgid "Add to _Set"
-msgstr "Legg til i _sett"
+#~ msgid "Add to _Set"
+#~ msgstr "Legg til i _sett"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:21
-msgid "frogr"
-msgstr "frogr"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:22
-msgid "Add"
-msgstr "Legg til"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:23
-msgid "Remove"
-msgstr "Fjern"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:24
-msgid "Upload"
-msgstr "Last opp"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:25
-msgid "_Frogr"
-msgstr "_Frogr"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:26
-msgid "Accou_nts"
-msgstr "Ko_ntoer"
+#~ msgid "_Frogr"
+#~ msgstr "_Frogr"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:27
-msgid "A_ctions"
-msgstr "_Handlinger"
+#~ msgid "A_ctions"
+#~ msgstr "_Handlinger"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:28
-msgid "_View"
-msgstr "_Vis"
+#~ msgid "_View"
+#~ msgstr "_Vis"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:29
-msgid "_Sort Pictures"
-msgstr "_Sorter bilder"
+#~ msgid "_Sort Pictures"
+#~ msgstr "_Sorter bilder"
diff --git a/po/nn.po b/po/nn.po
index 7ea03f8..06ae3c8 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: frogr master\n"
-"Report-Msgid-Bugs-To: 
http://bugzilla.gnome.org/enter_bug.cgi?product=frogr&keywords=I18N+L10N&component=general\n";
-"POT-Creation-Date: 2012-01-25 02:17+0000\n"
+"Report-Msgid-Bugs-To: msanchez gnome org\n"
+"POT-Creation-Date: 2016-08-12 13:09+0100\n"
 "PO-Revision-Date: 2012-02-25 11:52+0100\n"
 "Last-Translator: Kevin Brubeck Unhammer <javkalas mm st>\n"
 "Language-Team: Norwegian <i18n-no lister ping uio no>\n"
@@ -17,73 +17,125 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/frogr.desktop.in.in.h:1
-msgid "Flickr Remote Organizer"
+#: data/frogr.appdata.xml.in:5 data/frogr.desktop.in.in:5
+#: data/frogr.desktop.in.in:14
+msgid "frogr"
+msgstr "frogr"
+
+#: data/frogr.appdata.xml.in:6 data/frogr.desktop.in.in:6
+msgid "frogr: a Flickr Remote Organizer for GNOME"
+msgstr ""
+
+#: data/frogr.appdata.xml.in:8
+msgid ""
+"frogr is a small application for the GNOME desktop that allows users to "
+"manage their accounts in the Flickr image hosting website."
+msgstr ""
+
+#: data/frogr.appdata.xml.in:13
+msgid ""
+"It supports all the basic Flickr features, including uploading pictures, "
+"adding descriptions, setting tags and managing sets and groups pools."
 msgstr ""
 
-#: ../data/frogr.desktop.in.in.h:2
-msgid "Frogr: a Flickr Remote Organizer for GNOME"
+#: data/frogr.appdata.xml.in:24
+#, fuzzy
+msgid "Screenshot of frogr"
+msgstr "Skjermdu_mp"
+
+#: data/frogr.appdata.xml.in:29
+msgid "Mario Sanchez Prada"
 msgstr ""
 
-#: ../data/frogr.desktop.in.in.h:3
+#: data/frogr.desktop.in.in:7
 msgid "Upload and organize photos in Flickr accounts"
 msgstr "Last opp og organiser bilete i Flickr-kontoar"
 
-#: ../src/frogr-about-dialog.c:43
-msgid "A Flickr remote organizer for GNOME\n"
+#: data/frogr.desktop.in.in:8
+msgid "Flickr;Image;Picture;Photo;Video;Uploader;"
 msgstr ""
 
-#: ../src/frogr-about-dialog.c:115
+#: src/frogr-about-dialog.c:43
+msgid "A Flickr Remote Organizer for GNOME\n"
+msgstr ""
+
+#: src/frogr-about-dialog.c:72
 msgid "translator-credits"
 msgstr ""
 
-#: ../src/frogr-add-tags-dialog.c:191
+#: src/frogr-add-tags-dialog.c:191 src/frogr-add-to-group-dialog.c:528
+#: src/frogr-add-to-set-dialog.c:529 src/frogr-auth-dialog.c:153
+#: src/frogr-create-new-set-dialog.c:310 src/frogr-details-dialog.c:1168
+#: src/frogr-main-view.c:1543 src/frogr-main-view.c:1618
+#: src/frogr-main-view.c:1670 src/frogr-settings-dialog.c:930
+msgid "_Cancel"
+msgstr ""
+
+#: src/frogr-add-tags-dialog.c:193 src/frogr-add-to-group-dialog.c:530
+#: src/frogr-add-to-set-dialog.c:531 src/frogr-create-new-set-dialog.c:312
+msgid "_Add"
+msgstr ""
+
+#: src/frogr-add-tags-dialog.c:202
 msgid "Enter a spaces separated list of tags:"
 msgstr "Skriv inn merkelappar, skilt med mellomrom:"
 
-#: ../src/frogr-add-tags-dialog.c:214
+#: src/frogr-add-tags-dialog.c:228
 msgid "Add Tags"
 msgstr "Legg til merkelappar"
 
-#: ../src/frogr-add-to-set-dialog.c:131
-msgid "Title"
-msgstr "Tittel"
+#: src/frogr-add-to-group-dialog.c:147
+msgid "Name"
+msgstr "Namn"
 
-#: ../src/frogr-add-to-set-dialog.c:146 ../src/frogr-add-to-group-dialog.c:146
+#: src/frogr-add-to-group-dialog.c:162 src/frogr-add-to-set-dialog.c:163
 msgid "Elements"
 msgstr "Element"
 
-#: ../src/frogr-add-to-set-dialog.c:563
-msgid "Add to Sets"
-msgstr "Legg til sett"
-
-#: ../src/frogr-add-to-group-dialog.c:131
-msgid "Name"
-msgstr "Namn"
-
-#: ../src/frogr-add-to-group-dialog.c:563
+#: src/frogr-add-to-group-dialog.c:581
 msgid "Add to Groups"
 msgstr "Legg til i grupper"
 
-#: ../src/frogr-auth-dialog.c:30
-#, c-format
+#: src/frogr-add-to-set-dialog.c:148
+msgid "Title"
+msgstr "Tittel"
+
+#: src/frogr-add-to-set-dialog.c:582
+msgid "Add to Sets"
+msgstr "Legg til sett"
+
+#: src/frogr-auth-dialog.c:59
+#, fuzzy, c-format
 msgid ""
-"Please press the button to authorize %s and then come back to this screen to "
-"complete the process."
-msgstr "Ver venleg og klikk knappen for å godkjenna %s, og returner så til dette vindauget for å fullføra 
prosessen."
+"Please press the button to authorize %s and then come back to complete the "
+"process."
+msgstr ""
+"Ver venleg og klikk knappen for å godkjenna %s, og returner så til dette "
+"vindauget for å fullføra prosessen."
 
-#: ../src/frogr-auth-dialog.c:34
+#: src/frogr-auth-dialog.c:63 src/frogr-auth-dialog.c:149
+#: src/frogr-controller.c:2286
 #, c-format
-msgid ""
-"Press the button to start using %s once you've authorized it in your flickr "
-"account."
-msgstr "Klikk knappen for å byrja å bruka %s når du har godkjent i Flickr-kontoen."
+msgid "Authorize %s"
+msgstr ""
+
+#: src/frogr-auth-dialog.c:155 src/frogr-settings-dialog.c:932
+msgid "_Close"
+msgstr ""
+
+#: src/frogr-auth-dialog.c:167
+msgid "Enter verification code:"
+msgstr ""
+
+#: src/frogr-auth-dialog.c:221
+msgid "Invalid verification code"
+msgstr ""
 
-#: ../src/frogr-controller.c:274
+#: src/frogr-controller.c:581
 msgid "Process cancelled"
 msgstr "Prosess avbroten"
 
-#: ../src/frogr-controller.c:279
+#: src/frogr-controller.c:586
 msgid ""
 "Connection error:\n"
 "Network not available"
@@ -91,7 +143,7 @@ msgstr ""
 "Tilkoplingsfeil:\n"
 "Nettverk utilgjengeleg"
 
-#: ../src/frogr-controller.c:284
+#: src/frogr-controller.c:590
 msgid ""
 "Connection error:\n"
 "Bad request"
@@ -99,7 +151,7 @@ msgstr ""
 "Tilkoplingsfeil:\n"
 "Ugyldig førespurnad"
 
-#: ../src/frogr-controller.c:289
+#: src/frogr-controller.c:594
 msgid ""
 "Connection error:\n"
 "Server-side error"
@@ -107,573 +159,659 @@ msgstr ""
 "Tilkoplingsfeil:\n"
 "Tenarfeil"
 
-#: ../src/frogr-controller.c:294
+#: src/frogr-controller.c:598
+#, fuzzy
 msgid ""
-"Error uploading picture:\n"
+"Error uploading:\n"
 "File invalid"
 msgstr ""
 "Feil ved biletopplasting:\n"
 "Ugyldig fil"
 
-#: ../src/frogr-controller.c:299
+#: src/frogr-controller.c:602
 msgid ""
 "Error uploading picture:\n"
 "Quota exceeded"
 msgstr ""
 
-#: ../src/frogr-controller.c:304
+#: src/frogr-controller.c:607
+#, c-format
+msgid "Quota exceeded (limit: %d video per month)"
+msgid_plural "Quota exceeded (limit: %d videos per month)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/frogr-controller.c:611
+msgid ""
+"Error uploading video:\n"
+"You can't upload more videos with this account"
+msgstr ""
+
+#: src/frogr-controller.c:617
 msgid ""
 "Error:\n"
 "Photo not found"
 msgstr ""
 
-#: ../src/frogr-controller.c:309
+#: src/frogr-controller.c:621
 msgid ""
 "Error:\n"
 "Photo already in photoset"
 msgstr ""
 
-#: ../src/frogr-controller.c:314
+#: src/frogr-controller.c:625
 msgid ""
 "Error:\n"
 "Photo already in group"
 msgstr ""
 
-#: ../src/frogr-controller.c:319
+#: src/frogr-controller.c:629
 msgid ""
 "Error:\n"
 "Photo already in the maximum number of groups possible"
 msgstr ""
 
-#: ../src/frogr-controller.c:324
+#: src/frogr-controller.c:633
 msgid ""
 "Error:\n"
 "Group limit already reached"
 msgstr ""
 
-#: ../src/frogr-controller.c:329
+#: src/frogr-controller.c:637
 msgid ""
 "Error:\n"
 "Photo added to group's queue"
 msgstr ""
 
-#: ../src/frogr-controller.c:334
+#: src/frogr-controller.c:641
 msgid ""
 "Error:\n"
 "Photo already added to group's queue"
 msgstr ""
 
-#: ../src/frogr-controller.c:339
+#: src/frogr-controller.c:645
 msgid ""
 "Error:\n"
 "Content not allowed for this group"
 msgstr ""
 
-#: ../src/frogr-controller.c:344
-#, c-format
+#: src/frogr-controller.c:649
 msgid ""
 "Authorization failed.\n"
 "Please try again"
 msgstr ""
 
-#: ../src/frogr-controller.c:350
+#: src/frogr-controller.c:655
 #, c-format
 msgid ""
 "Error\n"
-"%s is not properly authorized to upload pictures to flickr.\n"
+"%s is not properly authorized to upload pictures to Flickr.\n"
 "Please re-authorize it"
 msgstr ""
 
-#: ../src/frogr-controller.c:356
-#, c-format
+#: src/frogr-controller.c:660
 msgid ""
-"Error:\n"
-"Service not available"
+"Unable to authenticate in Flickr\n"
+"Please try again."
 msgstr ""
 
-#. General error: just dump the raw error description
-#: ../src/frogr-controller.c:362
+#: src/frogr-controller.c:664
 #, c-format
-msgid "An error happened while uploading a picture: %s."
+msgid ""
+"You have not properly authorized %s yet.\n"
+"Please try again."
 msgstr ""
 
-#: ../src/frogr-controller.c:523
-msgid "Authorization failed (timed out)"
+#: src/frogr-controller.c:669
+msgid ""
+"Invalid verification code.\n"
+"Please try again."
 msgstr ""
 
-#: ../src/frogr-controller.c:1091
-msgid "Setting license for picture…"
+#: src/frogr-controller.c:673
+msgid ""
+"Error:\n"
+"Service not available"
 msgstr ""
 
-#: ../src/frogr-controller.c:1112
-msgid "Setting geolocation for picture…"
+#: src/frogr-controller.c:678
+#, c-format
+msgid "An error happened: %s."
 msgstr ""
 
-#: ../src/frogr-controller.c:1138
-msgid "Creating new photosets…"
+#: src/frogr-controller.c:883
+msgid "Authorization failed (timed out)"
 msgstr ""
 
-#: ../src/frogr-controller.c:1162
-msgid "Adding picture to photosets…"
+#: src/frogr-controller.c:931
+#, c-format
+msgid "Retrying Upload (attempt %d/%d)…"
 msgstr ""
 
-#: ../src/frogr-controller.c:1184
-msgid "Adding picture to groups…"
+#: src/frogr-controller.c:936
+#, c-format
+msgid "Uploading '%s'…"
 msgstr ""
 
-#. First %s is the title of the picture (filename of the file by
-#. default). Second %s is the max allowed size for a picture to be
-#. uploaded to flickr (different for free and PRO accounts).
-#: ../src/frogr-controller.c:1224
-#, c-format
-msgid ""
-"Can't load picture %s: size of file is bigger than the maximum allowed for "
-"this account (%s)"
+#: src/frogr-controller.c:2242
+msgid "Updating credentials…"
 msgstr ""
 
-#: ../src/frogr-controller.c:1713
+#: src/frogr-controller.c:2247
 msgid "Retrieving data for authorization…"
 msgstr ""
 
-#: ../src/frogr-controller.c:1718
+#: src/frogr-controller.c:2252
 msgid "Finishing authorization…"
 msgstr ""
 
-#: ../src/frogr-controller.c:1723
+#: src/frogr-controller.c:2257
 msgid "Retrieving list of sets…"
 msgstr ""
 
-#: ../src/frogr-controller.c:1728
+#: src/frogr-controller.c:2262
 msgid "Retrieving list of groups…"
 msgstr ""
 
-#: ../src/frogr-controller.c:1733
+#: src/frogr-controller.c:2267
 msgid "Retrieving list of tags…"
 msgstr ""
 
-#: ../src/frogr-controller.c:1869
+#: src/frogr-controller.c:2292
+msgid "Fetching information"
+msgstr ""
+
+#: src/frogr-controller.c:2398
 msgid "No sets found"
 msgstr ""
 
-#: ../src/frogr-controller.c:1901
+#: src/frogr-controller.c:2423
 msgid "No groups found"
 msgstr ""
 
-#: ../src/frogr-controller.c:2575
+#: src/frogr-controller.c:2984
 #, c-format
 msgid ""
-"You need to properly authorize %s before uploading any pictures to flickr.\n"
+"You need to properly authorize %s before uploading any pictures to Flickr.\n"
 "Please re-authorize it."
 msgstr ""
 
-#. This shows a dialog notifying the problem to the user
-#: ../src/frogr-create-new-set-dialog.c:134 ../src/frogr-details-dialog.c:1021
-msgid "Missing data required"
+#: src/frogr-controller.c:2994
+msgid "You need to be connected before uploading any pictures to Flickr."
 msgstr ""
 
-#: ../src/frogr-create-new-set-dialog.c:321
-msgid "Set's title:"
+#: src/frogr-controller.c:3012
+#, fuzzy
+msgid "Uploading Pictures"
+msgstr "_Legg til bilete"
+
+#: src/frogr-controller.c:3057
+msgid "Error opening project file"
 msgstr ""
 
-#: ../src/frogr-create-new-set-dialog.c:334
-msgid "Set's description:"
+#: src/frogr-create-new-set-dialog.c:143 src/frogr-details-dialog.c:1001
+msgid "Missing data required"
 msgstr ""
 
-#: ../src/frogr-create-new-set-dialog.c:357
-msgid "Fill pictures details with title and description"
+#: src/frogr-create-new-set-dialog.c:326
+#, fuzzy
+msgid "Title:"
+msgstr "_Tittel:"
+
+#: src/frogr-create-new-set-dialog.c:335
+#, fuzzy
+msgid "Description:"
+msgstr "_Skildring:"
+
+#: src/frogr-create-new-set-dialog.c:356
+msgid "Fill Pictures Details with Title and Description"
 msgstr ""
 
-#: ../src/frogr-create-new-set-dialog.c:378
-msgid "Create new Set"
+#: src/frogr-create-new-set-dialog.c:381
+msgid "Create New Set"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:88 ../src/frogr-settings-dialog.c:97
-msgid "Default (as specified in flickr)"
+#: src/frogr-details-dialog.c:89 src/frogr-settings-dialog.c:97
+msgid "Default (as specified in Flickr)"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:89 ../src/frogr-settings-dialog.c:98
+#: src/frogr-details-dialog.c:90 src/frogr-settings-dialog.c:98
 msgid "All rights reserved"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:90 ../src/frogr-settings-dialog.c:99
+#: src/frogr-details-dialog.c:91 src/frogr-settings-dialog.c:99
 msgid "CC Attribution-NonCommercial-ShareAlike"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:91 ../src/frogr-settings-dialog.c:100
+#: src/frogr-details-dialog.c:92 src/frogr-settings-dialog.c:100
 msgid "CC Attribution-NonCommercial"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:92 ../src/frogr-settings-dialog.c:101
+#: src/frogr-details-dialog.c:93 src/frogr-settings-dialog.c:101
 msgid "CC Attribution-NonCommercial-NoDerivs"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:93 ../src/frogr-settings-dialog.c:102
+#: src/frogr-details-dialog.c:94 src/frogr-settings-dialog.c:102
 msgid "CC Attribution"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:94 ../src/frogr-settings-dialog.c:103
+#: src/frogr-details-dialog.c:95 src/frogr-settings-dialog.c:103
 msgid "CC Attribution-ShareAlike"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:95 ../src/frogr-settings-dialog.c:104
+#: src/frogr-details-dialog.c:96 src/frogr-settings-dialog.c:104
 msgid "CC Attribution-NoDerivs"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:167
+#: src/frogr-details-dialog.c:172
 msgid "Open with image viewer"
 msgstr "Opna med biletvisar"
 
-#: ../src/frogr-details-dialog.c:195
+#: src/frogr-details-dialog.c:190
+msgid "_Title:"
+msgstr "_Tittel:"
+
+#: src/frogr-details-dialog.c:200
+msgid "_Description:"
+msgstr "_Skildring:"
+
+#: src/frogr-details-dialog.c:224
+msgid "Ta_gs:"
+msgstr ""
+
+#: src/frogr-details-dialog.c:247
 msgid "Visibility"
 msgstr "Synlegheit"
 
-#: ../src/frogr-details-dialog.c:210 ../src/frogr-settings-dialog.c:205
+#: src/frogr-details-dialog.c:257 src/frogr-settings-dialog.c:196
 msgid "_Private"
 msgstr "_Privat"
 
-#: ../src/frogr-details-dialog.c:214 ../src/frogr-settings-dialog.c:207
+#: src/frogr-details-dialog.c:261 src/frogr-settings-dialog.c:199
 msgid "P_ublic"
 msgstr "_Offentleg"
 
-#: ../src/frogr-details-dialog.c:226 ../src/frogr-settings-dialog.c:218
-msgid "Visible to _Family"
-msgstr "Synleg for _familien"
-
-#: ../src/frogr-details-dialog.c:230 ../src/frogr-settings-dialog.c:220
-msgid "Visible to F_riends"
-msgstr "Synleg for venne_r"
-
-#: ../src/frogr-details-dialog.c:252 ../src/frogr-settings-dialog.c:232
-msgid "Send picture _location if available"
+#: src/frogr-details-dialog.c:270 src/frogr-settings-dialog.c:207
+msgid "_Family"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:256 ../src/frogr-settings-dialog.c:235
-msgid "_Show up in Global Search Results"
+#: src/frogr-details-dialog.c:274 src/frogr-settings-dialog.c:209
+msgid "F_riends"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:273
-msgid "Content type"
+#: src/frogr-details-dialog.c:288
+#, fuzzy
+msgid "Content Type"
 msgstr "Innhaldstype"
 
-#: ../src/frogr-details-dialog.c:282 ../src/frogr-settings-dialog.c:260
+#: src/frogr-details-dialog.c:296 src/frogr-settings-dialog.c:234
 msgid "P_hoto"
 msgstr "_Foto"
 
-#: ../src/frogr-details-dialog.c:286 ../src/frogr-settings-dialog.c:262
+#: src/frogr-details-dialog.c:300 src/frogr-settings-dialog.c:236
 msgid "Scree_nshot"
 msgstr "Skjermdu_mp"
 
-#: ../src/frogr-details-dialog.c:290 ../src/frogr-settings-dialog.c:264
+#: src/frogr-details-dialog.c:304 src/frogr-settings-dialog.c:238
 msgid "Oth_er"
 msgstr "Ann_a"
 
-#: ../src/frogr-details-dialog.c:309
-msgid "Safety level"
+#: src/frogr-details-dialog.c:317
+#, fuzzy
+msgid "Safety Level"
 msgstr "Tryggleiksnivå"
 
-#: ../src/frogr-details-dialog.c:318 ../src/frogr-settings-dialog.c:288
+#: src/frogr-details-dialog.c:325 src/frogr-settings-dialog.c:260
 msgid "S_afe"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:322 ../src/frogr-settings-dialog.c:290
+#: src/frogr-details-dialog.c:329 src/frogr-settings-dialog.c:262
 msgid "_Moderate"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:326 ../src/frogr-settings-dialog.c:292
+#: src/frogr-details-dialog.c:333 src/frogr-settings-dialog.c:264
 msgid "Restr_icted"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:343
-msgid "License type"
+#: src/frogr-details-dialog.c:345
+msgid "License Type"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:372
-msgid "_Title:"
-msgstr "_Tittel:"
+#: src/frogr-details-dialog.c:367
+#, fuzzy
+msgid "Other Properties"
+msgstr "Andre alternativ"
 
-#: ../src/frogr-details-dialog.c:384
-msgid "_Description:"
-msgstr "_Skildring:"
+#: src/frogr-details-dialog.c:375
+msgid "_Show Up in Global Search Results"
+msgstr ""
 
-#: ../src/frogr-details-dialog.c:410
-msgid "Ta_gs:"
+#: src/frogr-details-dialog.c:379
+msgid "Set Geo_location Information"
 msgstr ""
 
-#. Visually indicate how many pictures are being edited
-#: ../src/frogr-details-dialog.c:507
+#: src/frogr-details-dialog.c:383
+msgid "Replace 'Date Posted' with 'Date Taken'"
+msgstr ""
+
+#: src/frogr-details-dialog.c:475
 #, c-format
 msgid "(%d Picture)"
 msgid_plural "(%d Pictures)"
 msgstr[0] "(%d bilete)"
 msgstr[1] "(%d bilete)"
 
-#: ../src/frogr-details-dialog.c:585
+#: src/frogr-details-dialog.c:548
 msgid "An error happened trying to load the picture"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:1241
+#: src/frogr-details-dialog.c:1169
+msgid "_Edit"
+msgstr ""
+
+#: src/frogr-details-dialog.c:1197
 msgid "Edit Picture Details"
 msgstr ""
 
-#. String showind the date and time a picture was taken
-#: ../src/frogr-main-view.c:669
+#: src/frogr-file-loader.c:142
+#, c-format
+msgid "Loading files %d / %d"
+msgstr ""
+
+#: src/frogr-file-loader.c:369
+#, c-format
+msgid ""
+"Unable to load picture %s:\n"
+"%s"
+msgstr ""
+
+#: src/frogr-file-loader.c:400
+#, c-format
+msgid ""
+"Unable to load video %s\n"
+"Please check that you have the right codec installed"
+msgstr ""
+
+#: src/frogr-file-loader.c:636
+#, c-format
+msgid ""
+"Can't load file %s:\n"
+"Size of file is bigger than the maximum allowed for this account (%s)"
+msgstr ""
+
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
+msgid "Open"
+msgstr ""
+
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
+msgid "Open Existing Project"
+msgstr ""
+
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
+msgid "Add"
+msgstr "Legg til"
+
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
+#, fuzzy
+msgid "Add Elements"
+msgstr "Element"
+
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
+msgid "Remove"
+msgstr "Fjern"
+
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
+#, fuzzy
+msgid "Remove Elements"
+msgstr "Element"
+
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
+msgid "Upload"
+msgstr "Last opp"
+
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
+#, fuzzy
+msgid "Upload All"
+msgstr "Last opp"
+
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
+msgid "Save"
+msgstr ""
+
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
+msgid "Save Current Project"
+msgstr ""
+
+#: src/frogr-main-view.c:1016
+msgid "_About"
+msgstr "_Om"
+
+#: src/frogr-main-view.c:1020
+msgid "_Quit"
+msgstr "A_vslutt"
+
+#: src/frogr-main-view.c:1070
+#, fuzzy
+msgid "Accounts"
+msgstr "Ko_ntoar"
+
+#: src/frogr-main-view.c:1410
 #, c-format
 msgid "Taken: %s"
 msgstr "Teke: %s"
 
-#: ../src/frogr-main-view.c:674
+#: src/frogr-main-view.c:1415
 #, c-format
 msgid "File size: %s"
 msgstr "Filstorleik: %s"
 
-#: ../src/frogr-main-view.c:861
+#: src/frogr-main-view.c:1540
+#, fuzzy
+msgid "Select File"
+msgstr "Vel eit bilete"
+
+#: src/frogr-main-view.c:1544 src/frogr-main-view.c:1671
+msgid "_Open"
+msgstr ""
+
+#: src/frogr-main-view.c:1553
+msgid "Frogr Project Files"
+msgstr ""
+
+#: src/frogr-main-view.c:1615
+msgid "Select Destination"
+msgstr ""
+
+#: src/frogr-main-view.c:1619
+msgid "_Save"
+msgstr ""
+
+#: src/frogr-main-view.c:1622
+msgid "Untitled Project.frogr"
+msgstr ""
+
+#: src/frogr-main-view.c:1667
 msgid "Select a Picture"
 msgstr "Vel eit bilete"
 
-#: ../src/frogr-main-view.c:887
-msgid "images"
-msgstr "bilete"
+#: src/frogr-main-view.c:1694
+msgid "All Files"
+msgstr ""
 
-#: ../src/frogr-main-view.c:908
-msgid "You need to select some pictures first"
+#: src/frogr-main-view.c:1697
+msgid "Image Files"
 msgstr ""
 
-#: ../src/frogr-main-view.c:1253
-msgid "Not connected to flickr"
+#: src/frogr-main-view.c:1701
+msgid "Video Files"
 msgstr ""
 
-#. Login string, showing the user is PRO (second '%s') if so.
-#: ../src/frogr-main-view.c:1263
-#, c-format
-msgid "Connected as %s%s"
+#: src/frogr-main-view.c:1723
+msgid "You don't have any picture added yet"
 msgstr ""
 
-#: ../src/frogr-main-view.c:1264
-msgid " (PRO account)"
+#: src/frogr-main-view.c:1736
+msgid "You need to select some pictures first"
 msgstr ""
 
-#. Will show in the status bar the amount of data (in KB, MB
-#. or GB) the user is currently allowed to upload to flicker
-#. till the end of the month, in a CURRENT / MAX fashion.
-#. The '-' at the beginning is just a separator, since more
-#. blocks of text will be shown in the status bar too.
-#: ../src/frogr-main-view.c:1288
-#, c-format
-msgid " - %s / %s remaining for the current month"
+#: src/frogr-main-view.c:2108
+msgid "Not connected to Flickr"
 msgstr ""
 
-#. Will show in the status bar the amount of data (in KB, MB or
-#. GB) that would be uploaded as the sum of the sizes for every
-#. picture currently loadad in the application
-#: ../src/frogr-main-view.c:1313
+#: src/frogr-main-view.c:2118
 #, c-format
-msgid " - %s to be uploaded"
+msgid "Connected as %s%s"
 msgstr ""
 
-#: ../src/frogr-picture-loader.c:122
-#, c-format
-msgid "Loading pictures %d / %d"
+#: src/frogr-main-view.c:2119
+msgid " (PRO account)"
 msgstr ""
 
-#. Update progress
-#: ../src/frogr-picture-uploader.c:84
+#: src/frogr-main-view.c:2143
 #, c-format
-msgid "Uploading '%s'…"
+msgid " - %s / %s remaining"
 msgstr ""
 
-#: ../src/frogr-settings-dialog.c:189
+#: src/frogr-main-view.c:2169
+#, c-format
+msgid " - %d file to upload (%s)"
+msgid_plural " - %d files to upload (%s)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/frogr-settings-dialog.c:185
 msgid "Default Visibility"
 msgstr ""
 
-#: ../src/frogr-settings-dialog.c:245
+#: src/frogr-settings-dialog.c:224
 msgid "Default Content Type"
 msgstr ""
 
-#: ../src/frogr-settings-dialog.c:273
+#: src/frogr-settings-dialog.c:250
 msgid "Default Safety Level"
 msgstr ""
 
-#: ../src/frogr-settings-dialog.c:301
+#: src/frogr-settings-dialog.c:276
 msgid "Default License"
 msgstr ""
 
-#: ../src/frogr-settings-dialog.c:326
+#: src/frogr-settings-dialog.c:302
+msgid "Other Defaults"
+msgstr ""
+
+#: src/frogr-settings-dialog.c:312
+msgid "_Show Pictures in Global Search Results"
+msgstr ""
+
+#: src/frogr-settings-dialog.c:315
+msgid "Set Geo_location Information for Pictures"
+msgstr ""
+
+#: src/frogr-settings-dialog.c:318
+msgid "Replace 'Date Posted' with 'Date Taken' for Pictures"
+msgstr ""
+
+#: src/frogr-settings-dialog.c:324
 msgid "_General"
 msgstr "_Generelt"
 
-#: ../src/frogr-settings-dialog.c:354
+#: src/frogr-settings-dialog.c:344
 msgid "Proxy Settings"
 msgstr ""
 
-#. Enable proxy
-#: ../src/frogr-settings-dialog.c:364
+#: src/frogr-settings-dialog.c:353
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: ../src/frogr-settings-dialog.c:374
+#: src/frogr-settings-dialog.c:363
 msgid "_Host:"
 msgstr ""
 
-#. Proxy port
-#: ../src/frogr-settings-dialog.c:392
+#: src/frogr-settings-dialog.c:376
 msgid "_Port:"
 msgstr ""
 
-#. Proxy username
-#: ../src/frogr-settings-dialog.c:410
+#: src/frogr-settings-dialog.c:389
 msgid "U_sername:"
 msgstr ""
 
-#. Proxy password
-#: ../src/frogr-settings-dialog.c:428
+#: src/frogr-settings-dialog.c:402
 msgid "Pass_word:"
 msgstr ""
 
-#. Use GNOME General Proxy Settings
-#: ../src/frogr-settings-dialog.c:449
-msgid "_Use GNOME General Proxy Settings"
-msgstr ""
-
-#: ../src/frogr-settings-dialog.c:475
+#: src/frogr-settings-dialog.c:426
 msgid "Connec_tion"
 msgstr "_Tilkopling"
 
-#: ../src/frogr-settings-dialog.c:501
+#: src/frogr-settings-dialog.c:444
 msgid "Other options"
 msgstr "Andre alternativ"
 
-#: ../src/frogr-settings-dialog.c:516
-msgid "Disa_ble Tags Auto-Completion"
+#: src/frogr-settings-dialog.c:454
+msgid "Ena_ble Tags Auto-Completion"
+msgstr ""
+
+#: src/frogr-settings-dialog.c:457
+msgid "_Import Tags from Pictures Metadata"
 msgstr ""
 
-#: ../src/frogr-settings-dialog.c:519
-msgid "_Keep File Extensions in Titles when Loading Pictures"
+#: src/frogr-settings-dialog.c:461
+msgid "Use _Dark GTK Theme"
 msgstr ""
 
-#: ../src/frogr-settings-dialog.c:522
-msgid "Don't _Import Tags from Pictures Metadata"
+#: src/frogr-settings-dialog.c:465
+msgid "_Keep File Extensions in Titles when Loading"
 msgstr ""
 
-#: ../src/frogr-settings-dialog.c:528
+#: src/frogr-settings-dialog.c:471
 msgid "_Misc"
 msgstr "_Ymse"
 
-#: ../src/frogr-settings-dialog.c:1047
+#: src/frogr-settings-dialog.c:972
 msgid "Preferences"
 msgstr "Brukarval"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:1
-msgid "A_ctions"
-msgstr "_Handlingar"
+#~ msgid ""
+#~ "Press the button to start using %s once you've authorized it in your "
+#~ "flickr account."
+#~ msgstr ""
+#~ "Klikk knappen for å byrja å bruka %s når du har godkjent i Flickr-kontoen."
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:2
-msgid "Accou_nts"
-msgstr "Ko_ntoar"
+#~ msgid "Visible to _Family"
+#~ msgstr "Synleg for _familien"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:3
-msgid "Add"
-msgstr "Legg til"
+#~ msgid "Visible to F_riends"
+#~ msgstr "Synleg for venne_r"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:4
-msgid "Add _Tags…"
-msgstr ""
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:5
-msgid "Add to _Existing Set…"
-msgstr ""
+#~ msgid "images"
+#~ msgstr "bilete"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:6
-msgid "Add to _Group…"
-msgstr ""
+#~ msgid "A_ctions"
+#~ msgstr "_Handlingar"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:7
-msgid "Add to _Set"
-msgstr ""
+#~ msgid "By _Title"
+#~ msgstr "Etter _tittel"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:8
-msgid "As _Loaded"
-msgstr ""
+#~ msgid "Edit _Details…"
+#~ msgstr "Rediger _detaljar …"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:9
-msgid "Authorize _frogr"
-msgstr ""
+#~ msgid "_File"
+#~ msgstr "_Fil"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:10
-msgid "By _Date Taken"
-msgstr ""
+#~ msgid "_Help"
+#~ msgstr "_Hjelp"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:11
-msgid "By _Title"
-msgstr "Etter _tittel"
+#~ msgid "_Preferences…"
+#~ msgstr "_Innstillingar …"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:12
-msgid "Disable _Tooltips"
-msgstr ""
+#~ msgid "_Remove Pictures"
+#~ msgstr "Fje_rn bilete"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:13
-msgid "Edit _Details…"
-msgstr "Rediger _detaljar …"
+#~ msgid "_Reversed Order"
+#~ msgstr "Omvendt _rekkjefølgje"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:14
-msgid "Open in E_xternal Viewer"
-msgstr ""
+#~ msgid "_Sort Pictures"
+#~ msgstr "_Sorter bilete"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:15
-msgid "Remove"
-msgstr "Fjern"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:16
-msgid "Upload"
-msgstr "Last opp"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:17
-msgid "_About"
-msgstr "_Om"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:18
-msgid "_Add Pictures"
-msgstr "_Legg til bilete"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:19
-msgid "_Create New Set…"
-msgstr ""
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:20
-msgid "_File"
-msgstr "_Fil"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:21
-msgid "_Help"
-msgstr "_Hjelp"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:22
-msgid "_Preferences…"
-msgstr "_Innstillingar …"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:23
-msgid "_Quit"
-msgstr "A_vslutt"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:24
-msgid "_Remove Pictures"
-msgstr "Fje_rn bilete"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:25
-msgid "_Reversed Order"
-msgstr "Omvendt _rekkjefølgje"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:26
-msgid "_Sort Pictures"
-msgstr "_Sorter bilete"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:27
-msgid "_Upload All"
-msgstr ""
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:28
-msgid "_View"
-msgstr "_Vis"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:29
-msgid "frogr"
-msgstr "frogr"
+#~ msgid "_View"
+#~ msgstr "_Vis"
diff --git a/po/oc.po b/po/oc.po
index 1e72bfe..9d03eba 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -5,9 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: frogr master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=frogr&k";
-"eywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-01-22 18:06+0000\n"
+"Report-Msgid-Bugs-To: msanchez gnome org\n"
+"POT-Creation-Date: 2016-08-12 13:09+0100\n"
 "PO-Revision-Date: 2016-03-13 12:15+0200\n"
 "Last-Translator: Cédric Valmary (totenoc.eu) <cvalmary yahoo fr>\n"
 "Language-Team: Tot En Òc\n"
@@ -19,7 +18,16 @@ msgstr ""
 "X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"
 
-#: ../data/frogr.appdata.xml.in.h:1
+#: data/frogr.appdata.xml.in:5 data/frogr.desktop.in.in:5
+#: data/frogr.desktop.in.in:14
+msgid "frogr"
+msgstr "frogr"
+
+#: data/frogr.appdata.xml.in:6 data/frogr.desktop.in.in:6
+msgid "frogr: a Flickr Remote Organizer for GNOME"
+msgstr "frogr : un gestionari Flickr a distància per GNOME"
+
+#: data/frogr.appdata.xml.in:8
 msgid ""
 "frogr is a small application for the GNOME desktop that allows users to "
 "manage their accounts in the Flickr image hosting website."
@@ -27,7 +35,7 @@ msgstr ""
 "frogr es una pichona aplicacion per l'environament de burèu GNOME que permet "
 "de gerir los comptes del site d'albergament d'imatges Flickr"
 
-#: ../data/frogr.appdata.xml.in.h:2
+#: data/frogr.appdata.xml.in:13
 msgid ""
 "It supports all the basic Flickr features, including uploading pictures, "
 "adding descriptions, setting tags and managing sets and groups pools."
@@ -36,110 +44,103 @@ msgstr ""
 "d'imatges, l'apondon de descripcions, la definicion d'etiquetas e la gestion "
 "dels albums o dels gropes."
 
-#: ../data/frogr.appdata.xml.in.h:3
-#| msgid "Scree_nshot"
+#: data/frogr.appdata.xml.in:24
 msgid "Screenshot of frogr"
 msgstr "Captura d'ecran de frogr"
 
-#: ../data/frogr.desktop.in.in.h:1
-msgid "frogr"
-msgstr "frogr"
-
-#: ../data/frogr.desktop.in.in.h:2
-msgid "frogr: a Flickr Remote Organizer for GNOME"
-msgstr "frogr : un gestionari Flickr a distància per GNOME"
+#: data/frogr.appdata.xml.in:29
+msgid "Mario Sanchez Prada"
+msgstr ""
 
-#: ../data/frogr.desktop.in.in.h:3
-msgid "Upload and organize fòtos in Flickr accounts"
+#: data/frogr.desktop.in.in:7
+#, fuzzy
+msgid "Upload and organize photos in Flickr accounts"
 msgstr "Mandar e organizar de fòtos sus de comptes Flickr"
 
-#: ../data/frogr.desktop.in.in.h:4
+#: data/frogr.desktop.in.in:8
 msgid "Flickr;Image;Picture;Photo;Video;Uploader;"
 msgstr "Flickr;Imatge;Fotografia;Vidèo;Mandadís;Mandar;Cargar;"
 
-#: ../src/frogr-about-dialog.c:43
+#: src/frogr-about-dialog.c:43
 msgid "A Flickr Remote Organizer for GNOME\n"
 msgstr "Un gestionari Flickr a distància per GNOME\n"
 
-#: ../src/frogr-about-dialog.c:72
+#: src/frogr-about-dialog.c:72
 msgid "translator-credits"
 msgstr "Cédric Valmary <cvalmary yahoo fr>"
 
-#: ../src/frogr-add-tags-dialog.c:191 ../src/frogr-add-to-group-dialog.c:528
-#: ../src/frogr-add-to-set-dialog.c:529 ../src/frogr-auth-dialog.c:153
-#: ../src/frogr-create-new-set-dialog.c:310 ../src/frogr-details-dialog.c:1168
-#: ../src/frogr-main-view.c:1543 ../src/frogr-main-view.c:1618
-#: ../src/frogr-main-view.c:1670 ../src/frogr-settings-dialog.c:930
+#: src/frogr-add-tags-dialog.c:191 src/frogr-add-to-group-dialog.c:528
+#: src/frogr-add-to-set-dialog.c:529 src/frogr-auth-dialog.c:153
+#: src/frogr-create-new-set-dialog.c:310 src/frogr-details-dialog.c:1168
+#: src/frogr-main-view.c:1543 src/frogr-main-view.c:1618
+#: src/frogr-main-view.c:1670 src/frogr-settings-dialog.c:930
 msgid "_Cancel"
 msgstr "A_nullar"
 
-#: ../src/frogr-add-tags-dialog.c:193 ../src/frogr-add-to-group-dialog.c:530
-#: ../src/frogr-add-to-set-dialog.c:531
-#: ../src/frogr-create-new-set-dialog.c:312
+#: src/frogr-add-tags-dialog.c:193 src/frogr-add-to-group-dialog.c:530
+#: src/frogr-add-to-set-dialog.c:531 src/frogr-create-new-set-dialog.c:312
 msgid "_Add"
 msgstr "_Apondre"
 
-#: ../src/frogr-add-tags-dialog.c:202
+#: src/frogr-add-tags-dialog.c:202
 msgid "Enter a spaces separated list of tags:"
 msgstr "Sasissètz una lista d'etiquetas separadas per d'espacis :"
 
-#: ../src/frogr-add-tags-dialog.c:228
+#: src/frogr-add-tags-dialog.c:228
 msgid "Add Tags"
 msgstr "Apondre d'etiquetas"
 
-#: ../src/frogr-add-to-group-dialog.c:147
+#: src/frogr-add-to-group-dialog.c:147
 msgid "Name"
 msgstr "Nom"
 
-#: ../src/frogr-add-to-group-dialog.c:162 ../src/frogr-add-to-set-dialog.c:163
+#: src/frogr-add-to-group-dialog.c:162 src/frogr-add-to-set-dialog.c:163
 msgid "Elements"
 msgstr "Elements"
 
-#: ../src/frogr-add-to-group-dialog.c:581
+#: src/frogr-add-to-group-dialog.c:581
 msgid "Add to Groups"
 msgstr "Apondre als gropes"
 
-#: ../src/frogr-add-to-set-dialog.c:148
+#: src/frogr-add-to-set-dialog.c:148
 msgid "Title"
 msgstr "Títol"
 
-#: ../src/frogr-add-to-set-dialog.c:582
+#: src/frogr-add-to-set-dialog.c:582
 msgid "Add to Sets"
 msgstr "Apondre als albums"
 
-#: ../src/frogr-auth-dialog.c:59
+#: src/frogr-auth-dialog.c:59
 #, c-format
 msgid ""
 "Please press the button to authorize %s and then come back to complete the "
 "process."
 msgstr ""
-"Quichatz sul boton per autorizar %s, puèi tornatz per acabar lo "
-"processus."
+"Quichatz sul boton per autorizar %s, puèi tornatz per acabar lo processus."
 
-#: ../src/frogr-auth-dialog.c:63 ../src/frogr-auth-dialog.c:149
-#: ../src/frogr-controller.c:2286
+#: src/frogr-auth-dialog.c:63 src/frogr-auth-dialog.c:149
+#: src/frogr-controller.c:2286
 #, c-format
 msgid "Authorize %s"
 msgstr "Autorizar %s"
 
-#: ../src/frogr-auth-dialog.c:155 ../src/frogr-settings-dialog.c:932
+#: src/frogr-auth-dialog.c:155 src/frogr-settings-dialog.c:932
 msgid "_Close"
 msgstr "_Tampar"
 
-#. Description label
-#: ../src/frogr-auth-dialog.c:167
+#: src/frogr-auth-dialog.c:167
 msgid "Enter verification code:"
 msgstr "Sasissètz lo còde de verificacion :"
 
-#: ../src/frogr-auth-dialog.c:221
+#: src/frogr-auth-dialog.c:221
 msgid "Invalid verification code"
 msgstr "Còde de verificacion invalid"
 
-#: ../src/frogr-controller.c:581
+#: src/frogr-controller.c:581
 msgid "Process cancelled"
 msgstr "Processus anullat"
 
-#: ../src/frogr-controller.c:586
+#: src/frogr-controller.c:586
 msgid ""
 "Connection error:\n"
 "Network not available"
@@ -147,7 +148,7 @@ msgstr ""
 "Error de connexion :\n"
 "Ret indisponibla"
 
-#: ../src/frogr-controller.c:590
+#: src/frogr-controller.c:590
 msgid ""
 "Connection error:\n"
 "Bad request"
@@ -155,7 +156,7 @@ msgstr ""
 "Error de connexion :\n"
 "Marrida requèsta"
 
-#: ../src/frogr-controller.c:594
+#: src/frogr-controller.c:594
 msgid ""
 "Connection error:\n"
 "Server-side error"
@@ -163,7 +164,7 @@ msgstr ""
 "Error de connexion :\n"
 "Error costat servidor"
 
-#: ../src/frogr-controller.c:598
+#: src/frogr-controller.c:598
 msgid ""
 "Error uploading:\n"
 "File invalid"
@@ -171,7 +172,7 @@ msgstr ""
 "Error pendent lo mandadís :\n"
 "Fichièr invalid"
 
-#: ../src/frogr-controller.c:602
+#: src/frogr-controller.c:602
 msgid ""
 "Error uploading picture:\n"
 "Quota exceeded"
@@ -179,14 +180,14 @@ msgstr ""
 "Error pendent lo mandadís de l'imatge :\n"
 "Quota depassat"
 
-#: ../src/frogr-controller.c:607
+#: src/frogr-controller.c:607
 #, c-format
 msgid "Quota exceeded (limit: %d video per month)"
 msgid_plural "Quota exceeded (limit: %d videos per month)"
 msgstr[0] "Quota depassat (limit : %d vidèo per mes)"
 msgstr[1] "Quota depassat (limit : %d vidèos per mes)"
 
-#: ../src/frogr-controller.c:611
+#: src/frogr-controller.c:611
 msgid ""
 "Error uploading video:\n"
 "You can't upload more videos with this account"
@@ -194,7 +195,7 @@ msgstr ""
 "Error de mandadís de la vidèo :\n"
 "Podètz pas mai mandar de vidèos amb aqueste compte"
 
-#: ../src/frogr-controller.c:617
+#: src/frogr-controller.c:617
 msgid ""
 "Error:\n"
 "Photo not found"
@@ -202,15 +203,16 @@ msgstr ""
 "Error :\n"
 "Fòto introbabla"
 
-#: ../src/frogr-controller.c:621
+#: src/frogr-controller.c:621
+#, fuzzy
 msgid ""
 "Error:\n"
-"Photo already in fòtoset"
+"Photo already in photoset"
 msgstr ""
 "Error :\n"
 "Fòto ja presenta dins l'album"
 
-#: ../src/frogr-controller.c:625
+#: src/frogr-controller.c:625
 msgid ""
 "Error:\n"
 "Photo already in group"
@@ -218,7 +220,7 @@ msgstr ""
 "Error :\n"
 "Fòto ja dins lo grop"
 
-#: ../src/frogr-controller.c:629
+#: src/frogr-controller.c:629
 msgid ""
 "Error:\n"
 "Photo already in the maximum number of groups possible"
@@ -226,7 +228,7 @@ msgstr ""
 "Error :\n"
 "Fòto ja dins lo nombre maximum de gropes possible"
 
-#: ../src/frogr-controller.c:633
+#: src/frogr-controller.c:633
 msgid ""
 "Error:\n"
 "Group limit already reached"
@@ -234,7 +236,7 @@ msgstr ""
 "Error :\n"
 "Limit del grop ja atencha"
 
-#: ../src/frogr-controller.c:637
+#: src/frogr-controller.c:637
 msgid ""
 "Error:\n"
 "Photo added to group's queue"
@@ -242,7 +244,7 @@ msgstr ""
 "Error :\n"
 "Fòto aponduda a la fila d'espèra del grop"
 
-#: ../src/frogr-controller.c:641
+#: src/frogr-controller.c:641
 msgid ""
 "Error:\n"
 "Photo already added to group's queue"
@@ -250,7 +252,7 @@ msgstr ""
 "Error :\n"
 "Fòto ja aponduda a la fila d'espèra del grop"
 
-#: ../src/frogr-controller.c:645
+#: src/frogr-controller.c:645
 msgid ""
 "Error:\n"
 "Content not allowed for this group"
@@ -258,8 +260,7 @@ msgstr ""
 "Error :\n"
 "Contengut non autorizat per aqueste grop"
 
-#: ../src/frogr-controller.c:649
-#, c-format
+#: src/frogr-controller.c:649
 msgid ""
 "Authorization failed.\n"
 "Please try again"
@@ -267,7 +268,7 @@ msgstr ""
 "Fracàs de l'autorizacion.\n"
 "Ensajatz tornamai"
 
-#: ../src/frogr-controller.c:655
+#: src/frogr-controller.c:655
 #, c-format
 msgid ""
 "Error\n"
@@ -278,8 +279,7 @@ msgstr ""
 "%s es pas autorizat de mandar d'imatges cap a Flickr.\n"
 "Veuillez l'autorizar tornamai"
 
-#: ../src/frogr-controller.c:660
-#, c-format
+#: src/frogr-controller.c:660
 msgid ""
 "Unable to authenticate in Flickr\n"
 "Please try again."
@@ -287,7 +287,7 @@ msgstr ""
 "Impossible de s'autentificar dins Flickr\n"
 "Ensajatz tornamai."
 
-#: ../src/frogr-controller.c:664
+#: src/frogr-controller.c:664
 #, c-format
 msgid ""
 "You have not properly authorized %s yet.\n"
@@ -296,8 +296,7 @@ msgstr ""
 "Avètz pas encara corrèctament autorizat %s.\n"
 "Ensajatz tornamai."
 
-#: ../src/frogr-controller.c:669
-#, c-format
+#: src/frogr-controller.c:669
 msgid ""
 "Invalid verification code.\n"
 "Please try again."
@@ -305,8 +304,7 @@ msgstr ""
 "Code de verificacion invalid.\n"
 "Ensajatz tornamai."
 
-#: ../src/frogr-controller.c:673
-#, c-format
+#: src/frogr-controller.c:673
 msgid ""
 "Error:\n"
 "Service not available"
@@ -314,253 +312,248 @@ msgstr ""
 "Error :\n"
 "Servici indisponible"
 
-#. General error: just dump the raw error description
-#: ../src/frogr-controller.c:678
+#: src/frogr-controller.c:678
 #, c-format
 msgid "An error happened: %s."
 msgstr "Una error s'es producha : %s."
 
-#: ../src/frogr-controller.c:883
+#: src/frogr-controller.c:883
 msgid "Authorization failed (timed out)"
 msgstr "Fracàs de l'autorizacion (relambi expirat)"
 
-#: ../src/frogr-controller.c:931
+#: src/frogr-controller.c:931
 #, c-format
 msgid "Retrying Upload (attempt %d/%d)…"
 msgstr "Novèl essai de mandadís (temptativa %d/%d)…"
 
-#: ../src/frogr-controller.c:936
+#: src/frogr-controller.c:936
 #, c-format
 msgid "Uploading '%s'…"
 msgstr "Mandadís de « %s »…"
 
-#: ../src/frogr-controller.c:2242
+#: src/frogr-controller.c:2242
 msgid "Updating credentials…"
 msgstr "Mesa a jorn de las informacions d'identificacion…"
 
-#: ../src/frogr-controller.c:2247
+#: src/frogr-controller.c:2247
 msgid "Retrieving data for authorization…"
 msgstr "Recuperacion dels donadas per l'autorizacion…"
 
-#: ../src/frogr-controller.c:2252
+#: src/frogr-controller.c:2252
 msgid "Finishing authorization…"
 msgstr "Fin de l'autorizacion…"
 
-#: ../src/frogr-controller.c:2257
+#: src/frogr-controller.c:2257
 msgid "Retrieving list of sets…"
 msgstr "Recuperacion de la lista dels albums…"
 
-#: ../src/frogr-controller.c:2262
+#: src/frogr-controller.c:2262
 msgid "Retrieving list of groups…"
 msgstr "Recuperacion de la lista dels gropes…"
 
-#: ../src/frogr-controller.c:2267
+#: src/frogr-controller.c:2267
 msgid "Retrieving list of tags…"
 msgstr "Recuperacion de la lista de las etiquetas…"
 
-#: ../src/frogr-controller.c:2292
-#, c-format
+#: src/frogr-controller.c:2292
 msgid "Fetching information"
 msgstr "Recuperacion dels informacions"
 
-#: ../src/frogr-controller.c:2398
+#: src/frogr-controller.c:2398
 msgid "No sets found"
 msgstr "Aucun album trobat"
 
-#: ../src/frogr-controller.c:2423
+#: src/frogr-controller.c:2423
 msgid "No groups found"
 msgstr "Aucun grop trobat"
 
-#: ../src/frogr-controller.c:2984
+#: src/frogr-controller.c:2984
 #, c-format
 msgid ""
 "You need to properly authorize %s before uploading any pictures to Flickr.\n"
 "Please re-authorize it."
 msgstr ""
-"Vos cal donner l'autorizacion a %s avant lo mandadís d'imatges cap a Flickr.\n"
+"Vos cal donner l'autorizacion a %s avant lo mandadís d'imatges cap a "
+"Flickr.\n"
 "Veuillez l'autorizar tornamai."
 
-#: ../src/frogr-controller.c:2994
-#, c-format
+#: src/frogr-controller.c:2994
 msgid "You need to be connected before uploading any pictures to Flickr."
 msgstr "Vos cal èsser connectat avant lo mandadís d'imatges cap a Flickr."
 
-#: ../src/frogr-controller.c:3012
+#: src/frogr-controller.c:3012
 msgid "Uploading Pictures"
 msgstr "Mandadís dels imatges"
 
-#: ../src/frogr-controller.c:3057
-#, c-format
+#: src/frogr-controller.c:3057
 msgid "Error opening project file"
 msgstr "Error pendent la dobertura del fichièr projècte"
 
-#. This shows a dialog notifying the problem to the user
-#: ../src/frogr-create-new-set-dialog.c:143 ../src/frogr-details-dialog.c:1001
+#: src/frogr-create-new-set-dialog.c:143 src/frogr-details-dialog.c:1001
 msgid "Missing data required"
 msgstr "Donadas mancantas requesidas"
 
-#: ../src/frogr-create-new-set-dialog.c:326
+#: src/frogr-create-new-set-dialog.c:326
 msgid "Title:"
 msgstr "Títol :"
 
-#: ../src/frogr-create-new-set-dialog.c:335
+#: src/frogr-create-new-set-dialog.c:335
 msgid "Description:"
 msgstr "Descripcion :"
 
-#: ../src/frogr-create-new-set-dialog.c:356
+#: src/frogr-create-new-set-dialog.c:356
 msgid "Fill Pictures Details with Title and Description"
 msgstr "Completar las informacions d'imatges amb lo títol e la descripcion"
 
-#: ../src/frogr-create-new-set-dialog.c:381
+#: src/frogr-create-new-set-dialog.c:381
 msgid "Create New Set"
 msgstr "Crear un novèl album"
 
-#: ../src/frogr-details-dialog.c:89 ../src/frogr-settings-dialog.c:97
+#: src/frogr-details-dialog.c:89 src/frogr-settings-dialog.c:97
 msgid "Default (as specified in Flickr)"
 msgstr "Per defaut (coma definít dins Flickr)"
 
-#: ../src/frogr-details-dialog.c:90 ../src/frogr-settings-dialog.c:98
+#: src/frogr-details-dialog.c:90 src/frogr-settings-dialog.c:98
 msgid "All rights reserved"
 msgstr "Totes dreches réservés"
 
-#: ../src/frogr-details-dialog.c:91 ../src/frogr-settings-dialog.c:99
+#: src/frogr-details-dialog.c:91 src/frogr-settings-dialog.c:99
 msgid "CC Attribution-NonCommercial-ShareAlike"
 msgstr "CC Paternitat-Pas d'utilizacion comerciala-Partiment a l'identic"
 
-#: ../src/frogr-details-dialog.c:92 ../src/frogr-settings-dialog.c:100
+#: src/frogr-details-dialog.c:92 src/frogr-settings-dialog.c:100
 msgid "CC Attribution-NonCommercial"
 msgstr "CC Paternitat-Pas d'utilizacion comerciala"
 
-#: ../src/frogr-details-dialog.c:93 ../src/frogr-settings-dialog.c:101
+#: src/frogr-details-dialog.c:93 src/frogr-settings-dialog.c:101
 msgid "CC Attribution-NonCommercial-NoDerivs"
 msgstr "CC Paternitat-Pas d'utilizacion comerciala-Pas de modificacion"
 
-#: ../src/frogr-details-dialog.c:94 ../src/frogr-settings-dialog.c:102
+#: src/frogr-details-dialog.c:94 src/frogr-settings-dialog.c:102
 msgid "CC Attribution"
 msgstr "CC Paternitat"
 
-#: ../src/frogr-details-dialog.c:95 ../src/frogr-settings-dialog.c:103
+#: src/frogr-details-dialog.c:95 src/frogr-settings-dialog.c:103
 msgid "CC Attribution-ShareAlike"
 msgstr "CC Paternitat-Partiment a l'identic"
 
-#: ../src/frogr-details-dialog.c:96 ../src/frogr-settings-dialog.c:104
+#: src/frogr-details-dialog.c:96 src/frogr-settings-dialog.c:104
 msgid "CC Attribution-NoDerivs"
 msgstr "CC Paternitat-Pas de modificacion"
 
-#: ../src/frogr-details-dialog.c:172
+#: src/frogr-details-dialog.c:172
 msgid "Open with image viewer"
 msgstr "Dobrir amb lo visionador d'imatge"
 
-#: ../src/frogr-details-dialog.c:190
+#: src/frogr-details-dialog.c:190
 msgid "_Title:"
 msgstr "_Títol :"
 
-#: ../src/frogr-details-dialog.c:200
+#: src/frogr-details-dialog.c:200
 msgid "_Description:"
 msgstr "_Descripcion :"
 
-#: ../src/frogr-details-dialog.c:224
+#: src/frogr-details-dialog.c:224
 msgid "Ta_gs:"
 msgstr "Eti_quetas :"
 
-#: ../src/frogr-details-dialog.c:247
+#: src/frogr-details-dialog.c:247
 msgid "Visibility"
 msgstr "Visibilitat"
 
-#: ../src/frogr-details-dialog.c:257 ../src/frogr-settings-dialog.c:196
+#: src/frogr-details-dialog.c:257 src/frogr-settings-dialog.c:196
 msgid "_Private"
 msgstr "_Privat"
 
-#: ../src/frogr-details-dialog.c:261 ../src/frogr-settings-dialog.c:199
+#: src/frogr-details-dialog.c:261 src/frogr-settings-dialog.c:199
 msgid "P_ublic"
 msgstr "P_ublic"
 
-#: ../src/frogr-details-dialog.c:270 ../src/frogr-settings-dialog.c:207
+#: src/frogr-details-dialog.c:270 src/frogr-settings-dialog.c:207
 msgid "_Family"
 msgstr "Fa_milha"
 
-#: ../src/frogr-details-dialog.c:274 ../src/frogr-settings-dialog.c:209
+#: src/frogr-details-dialog.c:274 src/frogr-settings-dialog.c:209
 msgid "F_riends"
 msgstr "Am_ics"
 
-#: ../src/frogr-details-dialog.c:288
+#: src/frogr-details-dialog.c:288
 msgid "Content Type"
 msgstr "Tipe de contengut"
 
-#: ../src/frogr-details-dialog.c:296 ../src/frogr-settings-dialog.c:234
+#: src/frogr-details-dialog.c:296 src/frogr-settings-dialog.c:234
 msgid "P_hoto"
 msgstr "_Fòto"
 
-#: ../src/frogr-details-dialog.c:300 ../src/frogr-settings-dialog.c:236
+#: src/frogr-details-dialog.c:300 src/frogr-settings-dialog.c:236
 msgid "Scree_nshot"
 msgstr "_Captura"
 
-#: ../src/frogr-details-dialog.c:304 ../src/frogr-settings-dialog.c:238
+#: src/frogr-details-dialog.c:304 src/frogr-settings-dialog.c:238
 msgid "Oth_er"
 msgstr "_Autre"
 
-#: ../src/frogr-details-dialog.c:317
+#: src/frogr-details-dialog.c:317
 msgid "Safety Level"
 msgstr "Nivèl de seguretat"
 
-#: ../src/frogr-details-dialog.c:325 ../src/frogr-settings-dialog.c:260
+#: src/frogr-details-dialog.c:325 src/frogr-settings-dialog.c:260
 msgid "S_afe"
 msgstr "_Securizat"
 
-#: ../src/frogr-details-dialog.c:329 ../src/frogr-settings-dialog.c:262
+#: src/frogr-details-dialog.c:329 src/frogr-settings-dialog.c:262
 msgid "_Moderate"
 msgstr "_Moderat"
 
-#: ../src/frogr-details-dialog.c:333 ../src/frogr-settings-dialog.c:264
+#: src/frogr-details-dialog.c:333 src/frogr-settings-dialog.c:264
 msgid "Restr_icted"
 msgstr "_Restrench"
 
-#: ../src/frogr-details-dialog.c:345
+#: src/frogr-details-dialog.c:345
 msgid "License Type"
 msgstr "Tipe de licéncia"
 
-#: ../src/frogr-details-dialog.c:367
+#: src/frogr-details-dialog.c:367
 msgid "Other Properties"
 msgstr "Autres proprietats"
 
-#: ../src/frogr-details-dialog.c:375
+#: src/frogr-details-dialog.c:375
 msgid "_Show Up in Global Search Results"
 msgstr "_Mostrar dins los resultats de recèrca globals"
 
-#: ../src/frogr-details-dialog.c:379
+#: src/frogr-details-dialog.c:379
 msgid "Set Geo_location Information"
 msgstr "Definir las informacions de geo_localizacion"
 
-#: ../src/frogr-details-dialog.c:383
+#: src/frogr-details-dialog.c:383
 msgid "Replace 'Date Posted' with 'Date Taken'"
 msgstr "Remplaçar la « data de publicacion » per la « data de presa de vista »"
 
-#. Visually indicate how many pictures are being edited
-#: ../src/frogr-details-dialog.c:475
+#: src/frogr-details-dialog.c:475
 #, c-format
 msgid "(%d Picture)"
 msgid_plural "(%d Pictures)"
 msgstr[0] "(%d imatge)"
 msgstr[1] "(%d imatges)"
 
-#: ../src/frogr-details-dialog.c:548
+#: src/frogr-details-dialog.c:548
 msgid "An error happened trying to load the picture"
 msgstr "Una error s'es producha al moment del cargament de l'imatge"
 
-#: ../src/frogr-details-dialog.c:1169 ../data/gtkbuilder/frogr-menu-bar.xml.h:8
+#: src/frogr-details-dialog.c:1169
 msgid "_Edit"
 msgstr "_Edicion"
 
-#: ../src/frogr-details-dialog.c:1197
+#: src/frogr-details-dialog.c:1197
 msgid "Edit Picture Details"
 msgstr "Modificar las informacions d'un imatge"
 
-#: ../src/frogr-file-loader.c:142
+#: src/frogr-file-loader.c:142
 #, c-format
 msgid "Loading files %d / %d"
 msgstr "Cargament dels fichièrs %d / %d"
 
-#: ../src/frogr-file-loader.c:369
+#: src/frogr-file-loader.c:369
 #, c-format
 msgid ""
 "Unable to load picture %s:\n"
@@ -569,7 +562,7 @@ msgstr ""
 "Impossible de cargar l'imatge %s :\n"
 "%s"
 
-#: ../src/frogr-file-loader.c:400
+#: src/frogr-file-loader.c:400
 #, c-format
 msgid ""
 "Unable to load video %s\n"
@@ -578,385 +571,317 @@ msgstr ""
 "Impossible de cargar la vidèo %s\n"
 "Verificatz qu'avètz los bons codecs installats"
 
-#. First %s is the title of the picture (filename of the file by
-#. default). Second %s is the max allowed size for a picture to be
-#. uploaded to flickr (different for free and PRO accounts).
-#: ../src/frogr-file-loader.c:636
+#: src/frogr-file-loader.c:636
 #, c-format
 msgid ""
 "Can't load file %s:\n"
 "Size of file is bigger than the maximum allowed for this account (%s)"
 msgstr ""
 "Impossible de cargar lo fichièr %s :\n"
-"la talha del fichièr es superiora al maximum autorizat per aqueste compte (%s)"
+"la talha del fichièr es superiora al maximum autorizat per aqueste compte "
+"(%s)"
 
-#. First create the left side buttons
-#: ../src/frogr-main-view.c:630 ../src/frogr-main-view.c:726
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
 msgid "Open"
 msgstr "Dobrir"
 
-#: ../src/frogr-main-view.c:630 ../src/frogr-main-view.c:726
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
 msgid "Open Existing Project"
 msgstr "Dobrir un projècte existent"
 
-#: ../src/frogr-main-view.c:631 ../src/frogr-main-view.c:729
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
 msgid "Add"
 msgstr "Apondre"
 
-#: ../src/frogr-main-view.c:631 ../src/frogr-main-view.c:729
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
 msgid "Add Elements"
 msgstr "Apondre d'elements"
 
-#: ../src/frogr-main-view.c:632 ../src/frogr-main-view.c:730
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
 msgid "Remove"
 msgstr "Suprimir"
 
-#: ../src/frogr-main-view.c:632 ../src/frogr-main-view.c:730
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
 msgid "Remove Elements"
 msgstr "Suprimís d'elements"
 
-#: ../src/frogr-main-view.c:633 ../src/frogr-main-view.c:732
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
 msgid "Upload"
 msgstr "Mandar"
 
-#: ../src/frogr-main-view.c:633 ../src/frogr-main-view.c:732
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
 msgid "Upload All"
 msgstr "Tot mandar"
 
-#. Save project item
-#: ../src/frogr-main-view.c:666 ../src/frogr-main-view.c:727
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
 msgid "Save"
 msgstr "Enregistrar"
 
-#: ../src/frogr-main-view.c:666 ../src/frogr-main-view.c:727
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
 msgid "Save Current Project"
 msgstr "Enregistrar lo projècte actual"
 
-#: ../src/frogr-main-view.c:1016 ../data/gtkbuilder/frogr-app-menu.xml.h:4
+#: src/frogr-main-view.c:1016
 msgid "_About"
 msgstr "A _prepaus"
 
-#: ../src/frogr-main-view.c:1020 ../data/gtkbuilder/frogr-app-menu.xml.h:5
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:17
+#: src/frogr-main-view.c:1020
 msgid "_Quit"
 msgstr "_Quitar"
 
-#. Create the submenu and insert it in the right section
-#: ../src/frogr-main-view.c:1070
+#: src/frogr-main-view.c:1070
 msgid "Accounts"
 msgstr "Comptes"
 
-#. String showind the date and time a picture was taken
-#: ../src/frogr-main-view.c:1410
+#: src/frogr-main-view.c:1410
 #, c-format
 msgid "Taken: %s"
 msgstr "Prise lo : %s"
 
-#: ../src/frogr-main-view.c:1415
+#: src/frogr-main-view.c:1415
 #, c-format
 msgid "File size: %s"
 msgstr "Talha del fichièr : %s"
 
-#: ../src/frogr-main-view.c:1540
+#: src/frogr-main-view.c:1540
 msgid "Select File"
 msgstr "Seleccionar un fichièr"
 
-#: ../src/frogr-main-view.c:1544 ../src/frogr-main-view.c:1671
+#: src/frogr-main-view.c:1544 src/frogr-main-view.c:1671
 msgid "_Open"
 msgstr "_Dobrir"
 
-#: ../src/frogr-main-view.c:1553
+#: src/frogr-main-view.c:1553
 msgid "Frogr Project Files"
 msgstr "Fichièr projècte Frogr"
 
-#: ../src/frogr-main-view.c:1615
+#: src/frogr-main-view.c:1615
 msgid "Select Destination"
 msgstr "Seleccionar una destinacion"
 
-#: ../src/frogr-main-view.c:1619 ../data/gtkbuilder/frogr-menu-bar.xml.h:3
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:1
+#: src/frogr-main-view.c:1619
 msgid "_Save"
 msgstr "_Enregistrar"
 
-#: ../src/frogr-main-view.c:1622
+#: src/frogr-main-view.c:1622
 msgid "Untitled Project.frogr"
 msgstr "Projècte sens títol.frogr"
 
-#: ../src/frogr-main-view.c:1667
+#: src/frogr-main-view.c:1667
 msgid "Select a Picture"
 msgstr "Seleccionar un imatge"
 
-#: ../src/frogr-main-view.c:1694
+#: src/frogr-main-view.c:1694
 msgid "All Files"
 msgstr "Totes los fichièrs"
 
-#: ../src/frogr-main-view.c:1697
+#: src/frogr-main-view.c:1697
 msgid "Image Files"
 msgstr "Fichièrs imatges"
 
-#: ../src/frogr-main-view.c:1701
+#: src/frogr-main-view.c:1701
 msgid "Video Files"
 msgstr "Fichièrs vidèos"
 
-#: ../src/frogr-main-view.c:1723
+#: src/frogr-main-view.c:1723
 msgid "You don't have any picture added yet"
 msgstr "Avètz pas encara apondut d'imatge"
 
-#: ../src/frogr-main-view.c:1736
+#: src/frogr-main-view.c:1736
 msgid "You need to select some pictures first"
 msgstr "Vos cal d'en primièr seleccionar d'imatges"
 
-#: ../src/frogr-main-view.c:2108
+#: src/frogr-main-view.c:2108
 msgid "Not connected to Flickr"
 msgstr "Pas connectat a Flickr"
 
-#. Login string, showing the user is PRO (second '%s') if so.
-#: ../src/frogr-main-view.c:2118
+#: src/frogr-main-view.c:2118
 #, c-format
 msgid "Connected as %s%s"
 msgstr "Connectat en tant que %s%s"
 
-#: ../src/frogr-main-view.c:2119
+#: src/frogr-main-view.c:2119
 msgid " (PRO account)"
 msgstr "(compte PRO)"
 
-#. Will show in the status bar the amount of data (in KB, MB
-#. or GB) the user is currently allowed to upload to flicker
-#. till the end of the month, in a CURRENT / MAX fashion.
-#. The '-' at the beginning is just a separator, since more
-#. blocks of text will be shown in the status bar too.
-#: ../src/frogr-main-view.c:2143
+#: src/frogr-main-view.c:2143
 #, c-format
 msgid " - %s / %s remaining"
 msgstr " - %s / %s restant"
 
-#. Will show in the status bar the amount of pictures and data
-#. (in KB, MB or GB) that would be uploaded as the sum of the
-#. sizes for every picture loaded in the application
-#: ../src/frogr-main-view.c:2169
+#: src/frogr-main-view.c:2169
 #, c-format
 msgid " - %d file to upload (%s)"
 msgid_plural " - %d files to upload (%s)"
 msgstr[0] " - %d fichièr de mandar (%s)"
 msgstr[1] " - %d fichièrs de mandar (%s)"
 
-#: ../src/frogr-settings-dialog.c:185
+#: src/frogr-settings-dialog.c:185
 msgid "Default Visibility"
 msgstr "Visibilitat per defaut"
 
-#: ../src/frogr-settings-dialog.c:224
+#: src/frogr-settings-dialog.c:224
 msgid "Default Content Type"
 msgstr "Tipe de contengut per defaut"
 
-#: ../src/frogr-settings-dialog.c:250
+#: src/frogr-settings-dialog.c:250
 msgid "Default Safety Level"
 msgstr "Nivèl de seguretat per defaut"
 
-#: ../src/frogr-settings-dialog.c:276
+#: src/frogr-settings-dialog.c:276
 msgid "Default License"
 msgstr "Licéncia per defaut"
 
-#: ../src/frogr-settings-dialog.c:302
+#: src/frogr-settings-dialog.c:302
 msgid "Other Defaults"
 msgstr "Autres paramètres per defaut"
 
-#: ../src/frogr-settings-dialog.c:312
+#: src/frogr-settings-dialog.c:312
 msgid "_Show Pictures in Global Search Results"
 msgstr "_Mostrar los imatges dins los resultats de recèrca globals"
 
-#: ../src/frogr-settings-dialog.c:315
+#: src/frogr-settings-dialog.c:315
 msgid "Set Geo_location Information for Pictures"
 msgstr "Definir las informacions de geo_localizacion dels imatges…"
 
-#: ../src/frogr-settings-dialog.c:318
+#: src/frogr-settings-dialog.c:318
 msgid "Replace 'Date Posted' with 'Date Taken' for Pictures"
 msgstr ""
 "Remplaçar la « data de publicacion » per la « data de presa de vista » pels "
 "imatges"
 
-#: ../src/frogr-settings-dialog.c:324
+#: src/frogr-settings-dialog.c:324
 msgid "_General"
 msgstr "_General"
 
-#: ../src/frogr-settings-dialog.c:344
+#: src/frogr-settings-dialog.c:344
 msgid "Proxy Settings"
 msgstr "Paramètres del servidor mandatari"
 
-#. Enable proxy
-#: ../src/frogr-settings-dialog.c:353
+#: src/frogr-settings-dialog.c:353
 msgid "_Enable HTTP Proxy"
 msgstr "_Activar lo servidor mandatari HTTP"
 
-#: ../src/frogr-settings-dialog.c:363
+#: src/frogr-settings-dialog.c:363
 msgid "_Host:"
 msgstr "_Òste :"
 
-#. Proxy port
-#: ../src/frogr-settings-dialog.c:376
+#: src/frogr-settings-dialog.c:376
 msgid "_Port:"
 msgstr "_Pòrt :"
 
-#. Proxy username
-#: ../src/frogr-settings-dialog.c:389
+#: src/frogr-settings-dialog.c:389
 msgid "U_sername:"
 msgstr "Nom d'_utilizaire :"
 
-#. Proxy password
-#: ../src/frogr-settings-dialog.c:402
+#: src/frogr-settings-dialog.c:402
 msgid "Pass_word:"
 msgstr "Sen_hal :"
 
-#: ../src/frogr-settings-dialog.c:426
+#: src/frogr-settings-dialog.c:426
 msgid "Connec_tion"
 msgstr "Conne_xion"
 
-#: ../src/frogr-settings-dialog.c:444
+#: src/frogr-settings-dialog.c:444
 msgid "Other options"
 msgstr "Autras opcions"
 
-#: ../src/frogr-settings-dialog.c:454
+#: src/frogr-settings-dialog.c:454
 msgid "Ena_ble Tags Auto-Completion"
 msgstr "Ac_tivar l'autocomplecion de las etiquetas"
 
-#: ../src/frogr-settings-dialog.c:457
+#: src/frogr-settings-dialog.c:457
 msgid "_Import Tags from Pictures Metadata"
 msgstr "_Importar las etiquetas a partir de las metadonadas dels imatges"
 
-#: ../src/frogr-settings-dialog.c:461
+#: src/frogr-settings-dialog.c:461
 msgid "Use _Dark GTK Theme"
 msgstr "Utilizar lo tèma _Dark de GTK"
 
-#: ../src/frogr-settings-dialog.c:465
+#: src/frogr-settings-dialog.c:465
 msgid "_Keep File Extensions in Titles when Loading"
 msgstr ""
 "_Conservar las extensions de fichièrs dins los títols al moment del cargament"
 
-#: ../src/frogr-settings-dialog.c:471
+#: src/frogr-settings-dialog.c:471
 msgid "_Misc"
 msgstr "_Divèrs"
 
-#: ../src/frogr-settings-dialog.c:972
+#: src/frogr-settings-dialog.c:972
 msgid "Preferences"
 msgstr "Preferéncias"
 
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:1
-msgid "Aut_horize Account…"
-msgstr "Auto_rizar lo compte…"
-
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:2
-msgid "_Preferences…"
-msgstr "_Paramètres…"
-
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:3
-msgid "_Help"
-msgstr "A_juda"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:1
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:9
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:3
-msgid "_Edit Details…"
-msgstr "Modificar las _informacions…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:2
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:10
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:4
-msgid "Add _Tags…"
-msgstr "A_pondre d'etiquetas…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:3
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:11
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:5
-msgid "Add to _Group…"
-msgstr "Apondre al _grop…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:4
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:12
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:6
-msgid "Add to _Photoset"
-msgstr "Apondre a l'a_lbum"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:5
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:13
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:7
-msgid "_Add to Existing Photoset…"
-msgstr "Apondre a un album _existant…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:6
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:14
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:8
-msgid "_Create New Photoset…"
-msgstr "Crear un _novèl album…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:7
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:15
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:16
-msgid "_Open in External Viewer"
-msgstr "Dobrir dins un afichador e_xtèrne"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:8
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:6
-msgid "_Remove Elements"
-msgstr "_Suprimir d'elements"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:1
-msgid "_File"
-msgstr "_Fichièr"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:2
-msgid "_Open…"
-msgstr "_Dobrir"
+#~ msgid "Aut_horize Account…"
+#~ msgstr "Auto_rizar lo compte…"
+
+#~ msgid "_Preferences…"
+#~ msgstr "_Paramètres…"
+
+#~ msgid "_Help"
+#~ msgstr "A_juda"
+
+#~ msgid "_Edit Details…"
+#~ msgstr "Modificar las _informacions…"
+
+#~ msgid "Add _Tags…"
+#~ msgstr "A_pondre d'etiquetas…"
+
+#~ msgid "Add to _Group…"
+#~ msgstr "Apondre al _grop…"
+
+#~ msgid "Add to _Photoset"
+#~ msgstr "Apondre a l'a_lbum"
+
+#~ msgid "_Add to Existing Photoset…"
+#~ msgstr "Apondre a un album _existant…"
+
+#~ msgid "_Create New Photoset…"
+#~ msgstr "Crear un _novèl album…"
+
+#~ msgid "_Open in External Viewer"
+#~ msgstr "Dobrir dins un afichador e_xtèrne"
+
+#~ msgid "_Remove Elements"
+#~ msgstr "_Suprimir d'elements"
+
+#~ msgid "_File"
+#~ msgstr "_Fichièr"
+
+#~ msgid "_Open…"
+#~ msgstr "_Dobrir"
+
+#~ msgid "Save _As…"
+#~ msgstr "Enregistrar _jos…"
+
+#~ msgid "A_dd Elements…"
+#~ msgstr "Aj_outer los elements…"
+
+#~ msgid "_Upload All"
+#~ msgstr "_Mandar tot"
+
+#~ msgid "_View"
+#~ msgstr "_Afichatge"
+
+#~ msgid "_Sort Elements"
+#~ msgstr "_Triar los elements"
+
+#~ msgid "As _Loaded"
+#~ msgstr "Per _òrdre de cargament"
+
+#~ msgid "By _Date Taken"
+#~ msgstr "Per _date de prise"
+
+#~ msgid "By _Title"
+#~ msgstr "Per _títol"
+
+#~ msgid "By _Size"
+#~ msgstr "Per t_alha"
+
+#~ msgid "_Reversed Order"
+#~ msgstr "Òrdre _invèrse"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:4
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:2
-msgid "Save _As…"
-msgstr "Enregistrar _jos…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:5
-msgid "A_dd Elements…"
-msgstr "Aj_outer los elements…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:7
-msgid "_Upload All"
-msgstr "_Mandar tot"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:16
-msgid "_View"
-msgstr "_Afichatge"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:17
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:9
-msgid "_Sort Elements"
-msgstr "_Triar los elements"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:18
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:10
-msgid "As _Loaded"
-msgstr "Per _òrdre de cargament"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:19
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:11
-msgid "By _Date Taken"
-msgstr "Per _date de prise"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:20
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:12
-msgid "By _Title"
-msgstr "Per _títol"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:21
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:13
-msgid "By _Size"
-msgstr "Per t_alha"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:22
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:14
-msgid "_Reversed Order"
-msgstr "Òrdre _invèrse"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:23
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:15
-msgid "Enable _Tooltips"
-msgstr "Activar las info_bullas"
+#~ msgid "Enable _Tooltips"
+#~ msgstr "Activar las info_bullas"
 
 #~ msgid "Visible to _Family"
 #~ msgstr "Visible per la _familha"
diff --git a/po/pl.po b/po/pl.po
index fb31eaa..e414fd7 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -11,8 +11,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: frogr\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-23 17:44+0100\n"
+"Report-Msgid-Bugs-To: msanchez gnome org\n"
+"POT-Creation-Date: 2016-08-12 13:09+0100\n"
 "PO-Revision-Date: 2016-01-23 17:45+0100\n"
 "Last-Translator: Piotr Drąg <piotrdrag gmail com>\n"
 "Language-Team: Polish <gnomepl aviary pl>\n"
@@ -25,7 +25,16 @@ msgstr ""
 "X-Poedit-Language: Polish\n"
 "X-Poedit-Country: Poland\n"
 
-#: ../data/frogr.appdata.xml.in.h:1
+#: data/frogr.appdata.xml.in:5 data/frogr.desktop.in.in:5
+#: data/frogr.desktop.in.in:14
+msgid "frogr"
+msgstr "frogr"
+
+#: data/frogr.appdata.xml.in:6 data/frogr.desktop.in.in:6
+msgid "frogr: a Flickr Remote Organizer for GNOME"
+msgstr "frogr: zdalny organizator zdjęć w serwisie Flickr dla środowiska GNOME"
+
+#: data/frogr.appdata.xml.in:8
 msgid ""
 "frogr is a small application for the GNOME desktop that allows users to "
 "manage their accounts in the Flickr image hosting website."
@@ -33,7 +42,7 @@ msgstr ""
 "frogr to mały program dla środowiska GNOME, umożliwiający użytkownikom "
 "zarządzanie swoimi kontami w serwisie zdjęć Flickr."
 
-#: ../data/frogr.appdata.xml.in.h:2
+#: data/frogr.appdata.xml.in:13
 msgid ""
 "It supports all the basic Flickr features, including uploading pictures, "
 "adding descriptions, setting tags and managing sets and groups pools."
@@ -42,32 +51,28 @@ msgstr ""
 "zdjęć, dodawanie opisów, ustawianie etykiet oraz zarządzanie zestawami i "
 "grupami."
 
-#: ../data/frogr.appdata.xml.in.h:3
+#: data/frogr.appdata.xml.in:24
 msgid "Screenshot of frogr"
 msgstr "Zrzut ekranu programu frogr"
 
-#: ../data/frogr.desktop.in.in.h:1
-msgid "frogr"
-msgstr "frogr"
-
-#: ../data/frogr.desktop.in.in.h:2
-msgid "frogr: a Flickr Remote Organizer for GNOME"
-msgstr "frogr: zdalny organizator zdjęć w serwisie Flickr dla środowiska GNOME"
+#: data/frogr.appdata.xml.in:29
+msgid "Mario Sanchez Prada"
+msgstr ""
 
-#: ../data/frogr.desktop.in.in.h:3
+#: data/frogr.desktop.in.in:7
 msgid "Upload and organize photos in Flickr accounts"
 msgstr "Organizowanie i przesyłanie zdjęć w serwisie Flickr"
 
-#: ../data/frogr.desktop.in.in.h:4
+#: data/frogr.desktop.in.in:8
 msgid "Flickr;Image;Picture;Photo;Video;Uploader;"
 msgstr ""
 "Flickr;Obraz;Obrazek;Zdjęcie;Film;Filmik;Wideo;Video;Wysyłanie;Przesyłanie;"
 
-#: ../src/frogr-about-dialog.c:43
+#: src/frogr-about-dialog.c:43
 msgid "A Flickr Remote Organizer for GNOME\n"
 msgstr "Zdalny organizator zdjęć w serwisie Flickr dla środowiska GNOME\n"
 
-#: ../src/frogr-about-dialog.c:72
+#: src/frogr-about-dialog.c:72
 msgid "translator-credits"
 msgstr ""
 "Łukasz Jernaś <deejay1 srem org>, 2011\n"
@@ -75,49 +80,48 @@ msgstr ""
 "Piotr Drąg <piotrdrag gmail com>, 2012-2016\n"
 "Aviary.pl <gnomepl aviary pl>, 2011-2016"
 
-#: ../src/frogr-add-tags-dialog.c:191 ../src/frogr-add-to-group-dialog.c:528
-#: ../src/frogr-add-to-set-dialog.c:529 ../src/frogr-auth-dialog.c:153
-#: ../src/frogr-create-new-set-dialog.c:310 ../src/frogr-details-dialog.c:1168
-#: ../src/frogr-main-view.c:1543 ../src/frogr-main-view.c:1618
-#: ../src/frogr-main-view.c:1670 ../src/frogr-settings-dialog.c:930
+#: src/frogr-add-tags-dialog.c:191 src/frogr-add-to-group-dialog.c:528
+#: src/frogr-add-to-set-dialog.c:529 src/frogr-auth-dialog.c:153
+#: src/frogr-create-new-set-dialog.c:310 src/frogr-details-dialog.c:1168
+#: src/frogr-main-view.c:1543 src/frogr-main-view.c:1618
+#: src/frogr-main-view.c:1670 src/frogr-settings-dialog.c:930
 msgid "_Cancel"
 msgstr "_Anuluj"
 
-#: ../src/frogr-add-tags-dialog.c:193 ../src/frogr-add-to-group-dialog.c:530
-#: ../src/frogr-add-to-set-dialog.c:531
-#: ../src/frogr-create-new-set-dialog.c:312
+#: src/frogr-add-tags-dialog.c:193 src/frogr-add-to-group-dialog.c:530
+#: src/frogr-add-to-set-dialog.c:531 src/frogr-create-new-set-dialog.c:312
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: ../src/frogr-add-tags-dialog.c:202
+#: src/frogr-add-tags-dialog.c:202
 msgid "Enter a spaces separated list of tags:"
 msgstr "Lista etykiet oddzielonych spacjami:"
 
-#: ../src/frogr-add-tags-dialog.c:228
+#: src/frogr-add-tags-dialog.c:228
 msgid "Add Tags"
 msgstr "Dodawanie etykiet"
 
-#: ../src/frogr-add-to-group-dialog.c:147
+#: src/frogr-add-to-group-dialog.c:147
 msgid "Name"
 msgstr "Nazwa"
 
-#: ../src/frogr-add-to-group-dialog.c:162 ../src/frogr-add-to-set-dialog.c:163
+#: src/frogr-add-to-group-dialog.c:162 src/frogr-add-to-set-dialog.c:163
 msgid "Elements"
 msgstr "Elementy"
 
-#: ../src/frogr-add-to-group-dialog.c:581
+#: src/frogr-add-to-group-dialog.c:581
 msgid "Add to Groups"
 msgstr "Dodawanie do grup"
 
-#: ../src/frogr-add-to-set-dialog.c:148
+#: src/frogr-add-to-set-dialog.c:148
 msgid "Title"
 msgstr "Tytuł"
 
-#: ../src/frogr-add-to-set-dialog.c:582
+#: src/frogr-add-to-set-dialog.c:582
 msgid "Add to Sets"
 msgstr "Dodawanie do zestawów"
 
-#: ../src/frogr-auth-dialog.c:59
+#: src/frogr-auth-dialog.c:59
 #, c-format
 msgid ""
 "Please press the button to authorize %s and then come back to complete the "
@@ -126,30 +130,29 @@ msgstr ""
 "Proszę nacisnąć przycisk, aby upoważnić %s, a następnie powrócić w celu "
 "ukończenia procesu."
 
-#: ../src/frogr-auth-dialog.c:63 ../src/frogr-auth-dialog.c:149
-#: ../src/frogr-controller.c:2286
+#: src/frogr-auth-dialog.c:63 src/frogr-auth-dialog.c:149
+#: src/frogr-controller.c:2286
 #, c-format
 msgid "Authorize %s"
 msgstr "Upoważnij %s"
 
-#: ../src/frogr-auth-dialog.c:155 ../src/frogr-settings-dialog.c:932
+#: src/frogr-auth-dialog.c:155 src/frogr-settings-dialog.c:932
 msgid "_Close"
 msgstr "Za_mknij"
 
-#. Description label
-#: ../src/frogr-auth-dialog.c:167
+#: src/frogr-auth-dialog.c:167
 msgid "Enter verification code:"
 msgstr "Proszę wprowadzić kod weryfikacyjny:"
 
-#: ../src/frogr-auth-dialog.c:221
+#: src/frogr-auth-dialog.c:221
 msgid "Invalid verification code"
 msgstr "Nieprawidłowy kod weryfikacyjny"
 
-#: ../src/frogr-controller.c:581
+#: src/frogr-controller.c:581
 msgid "Process cancelled"
 msgstr "Anulowano proces"
 
-#: ../src/frogr-controller.c:586
+#: src/frogr-controller.c:586
 msgid ""
 "Connection error:\n"
 "Network not available"
@@ -157,7 +160,7 @@ msgstr ""
 "Błąd połączenia:\n"
 "Sieć nie jest dostępna"
 
-#: ../src/frogr-controller.c:590
+#: src/frogr-controller.c:590
 msgid ""
 "Connection error:\n"
 "Bad request"
@@ -165,7 +168,7 @@ msgstr ""
 "Błąd połączenia:\n"
 "Błędne żądanie"
 
-#: ../src/frogr-controller.c:594
+#: src/frogr-controller.c:594
 msgid ""
 "Connection error:\n"
 "Server-side error"
@@ -173,7 +176,7 @@ msgstr ""
 "Błąd połączenia:\n"
 "Błąd serwera"
 
-#: ../src/frogr-controller.c:598
+#: src/frogr-controller.c:598
 msgid ""
 "Error uploading:\n"
 "File invalid"
@@ -181,7 +184,7 @@ msgstr ""
 "Błąd podczas wysyłania obrazu:\n"
 "Plik jest nieprawidłowy"
 
-#: ../src/frogr-controller.c:602
+#: src/frogr-controller.c:602
 msgid ""
 "Error uploading picture:\n"
 "Quota exceeded"
@@ -189,7 +192,7 @@ msgstr ""
 "Błąd podczas wysyłania obrazu:\n"
 "Przekroczono limit dyskowy"
 
-#: ../src/frogr-controller.c:607
+#: src/frogr-controller.c:607
 #, c-format
 msgid "Quota exceeded (limit: %d video per month)"
 msgid_plural "Quota exceeded (limit: %d videos per month)"
@@ -197,7 +200,7 @@ msgstr[0] "Przekroczono ograniczenie (limit: %d wideo na miesiąc)"
 msgstr[1] "Przekroczono ograniczenie (limit: %d wideo na miesiąc)"
 msgstr[2] "Przekroczono ograniczenie (limit: %d wideo na miesiąc)"
 
-#: ../src/frogr-controller.c:611
+#: src/frogr-controller.c:611
 msgid ""
 "Error uploading video:\n"
 "You can't upload more videos with this account"
@@ -205,7 +208,7 @@ msgstr ""
 "Błąd podczas wysyłania wideo:\n"
 "Nie można wysłać więcej wideo z tego konta"
 
-#: ../src/frogr-controller.c:617
+#: src/frogr-controller.c:617
 msgid ""
 "Error:\n"
 "Photo not found"
@@ -213,7 +216,7 @@ msgstr ""
 "Błąd:\n"
 "Nie odnaleziono obrazu"
 
-#: ../src/frogr-controller.c:621
+#: src/frogr-controller.c:621
 msgid ""
 "Error:\n"
 "Photo already in photoset"
@@ -221,7 +224,7 @@ msgstr ""
 "Błąd:\n"
 "Obraz jest już częścią zestawu"
 
-#: ../src/frogr-controller.c:625
+#: src/frogr-controller.c:625
 msgid ""
 "Error:\n"
 "Photo already in group"
@@ -229,7 +232,7 @@ msgstr ""
 "Błąd:\n"
 "Obraz jest już częścią grupy"
 
-#: ../src/frogr-controller.c:629
+#: src/frogr-controller.c:629
 msgid ""
 "Error:\n"
 "Photo already in the maximum number of groups possible"
@@ -237,7 +240,7 @@ msgstr ""
 "Błąd:\n"
 "Obraz znajduje się już w maksymalnej ilości grup"
 
-#: ../src/frogr-controller.c:633
+#: src/frogr-controller.c:633
 msgid ""
 "Error:\n"
 "Group limit already reached"
@@ -245,7 +248,7 @@ msgstr ""
 "Błąd:\n"
 "Ograniczenie ilości grup zostało już osiągnięte"
 
-#: ../src/frogr-controller.c:637
+#: src/frogr-controller.c:637
 msgid ""
 "Error:\n"
 "Photo added to group's queue"
@@ -253,7 +256,7 @@ msgstr ""
 "Błąd:\n"
 "Obraz został dodany do kolejki grupy"
 
-#: ../src/frogr-controller.c:641
+#: src/frogr-controller.c:641
 msgid ""
 "Error:\n"
 "Photo already added to group's queue"
@@ -261,7 +264,7 @@ msgstr ""
 "Błąd:\n"
 "Obraz już został dodany do kolejki grupy"
 
-#: ../src/frogr-controller.c:645
+#: src/frogr-controller.c:645
 msgid ""
 "Error:\n"
 "Content not allowed for this group"
@@ -269,8 +272,7 @@ msgstr ""
 "Błąd:\n"
 "Ten typ zawartości nie jest dozwolony dla tej grupy"
 
-#: ../src/frogr-controller.c:649
-#, c-format
+#: src/frogr-controller.c:649
 msgid ""
 "Authorization failed.\n"
 "Please try again"
@@ -278,7 +280,7 @@ msgstr ""
 "Upoważnienie programu się nie powiodło.\n"
 "Proszę spróbować ponownie"
 
-#: ../src/frogr-controller.c:655
+#: src/frogr-controller.c:655
 #, c-format
 msgid ""
 "Error\n"
@@ -289,8 +291,7 @@ msgstr ""
 "%s nie jest poprawnie upoważniony do wysyłania obrazów do serwisu Flickr.\n"
 "Proszę dokonać ponownego upoważnienia"
 
-#: ../src/frogr-controller.c:660
-#, c-format
+#: src/frogr-controller.c:660
 msgid ""
 "Unable to authenticate in Flickr\n"
 "Please try again."
@@ -298,7 +299,7 @@ msgstr ""
 "Nie można upoważnić w serwisie Flickr.\n"
 "Proszę spróbować ponownie."
 
-#: ../src/frogr-controller.c:664
+#: src/frogr-controller.c:664
 #, c-format
 msgid ""
 "You have not properly authorized %s yet.\n"
@@ -307,8 +308,7 @@ msgstr ""
 "Jeszcze nie upoważniono poprawnie %s.\n"
 "Proszę spróbować ponownie."
 
-#: ../src/frogr-controller.c:669
-#, c-format
+#: src/frogr-controller.c:669
 msgid ""
 "Invalid verification code.\n"
 "Please try again."
@@ -316,8 +316,7 @@ msgstr ""
 "Nieprawidłowy kod weryfikacyjny.\n"
 "Proszę spróbować ponownie."
 
-#: ../src/frogr-controller.c:673
-#, c-format
+#: src/frogr-controller.c:673
 msgid ""
 "Error:\n"
 "Service not available"
@@ -325,64 +324,62 @@ msgstr ""
 "Błąd:\n"
 "Usługa nie jest dostępna"
 
-#. General error: just dump the raw error description
-#: ../src/frogr-controller.c:678
+#: src/frogr-controller.c:678
 #, c-format
 msgid "An error happened: %s."
 msgstr "Wystąpił błąd: %s."
 
-#: ../src/frogr-controller.c:883
+#: src/frogr-controller.c:883
 msgid "Authorization failed (timed out)"
 msgstr "Upoważnienie się nie powiodło (przekroczono czas oczekiwania)"
 
-#: ../src/frogr-controller.c:931
+#: src/frogr-controller.c:931
 #, c-format
 msgid "Retrying Upload (attempt %d/%d)…"
 msgstr "Ponawianie wysyłania (próba %d/%d)…"
 
-#: ../src/frogr-controller.c:936
+#: src/frogr-controller.c:936
 #, c-format
 msgid "Uploading '%s'…"
 msgstr "Wysyłanie „%s”…"
 
-#: ../src/frogr-controller.c:2242
+#: src/frogr-controller.c:2242
 msgid "Updating credentials…"
 msgstr "Aktualizowanie poświadczeń…"
 
-#: ../src/frogr-controller.c:2247
+#: src/frogr-controller.c:2247
 msgid "Retrieving data for authorization…"
 msgstr "Pobieranie danych do upoważnienia…"
 
-#: ../src/frogr-controller.c:2252
+#: src/frogr-controller.c:2252
 msgid "Finishing authorization…"
 msgstr "Kończenie upoważniania…"
 
-#: ../src/frogr-controller.c:2257
+#: src/frogr-controller.c:2257
 msgid "Retrieving list of sets…"
 msgstr "Pobieranie listy zestawów…"
 
-#: ../src/frogr-controller.c:2262
+#: src/frogr-controller.c:2262
 msgid "Retrieving list of groups…"
 msgstr "Pobieranie listy grup…"
 
-#: ../src/frogr-controller.c:2267
+#: src/frogr-controller.c:2267
 msgid "Retrieving list of tags…"
 msgstr "Pobieranie listy etykiet…"
 
-#: ../src/frogr-controller.c:2292
-#, c-format
+#: src/frogr-controller.c:2292
 msgid "Fetching information"
 msgstr "Pobieranie informacji"
 
-#: ../src/frogr-controller.c:2398
+#: src/frogr-controller.c:2398
 msgid "No sets found"
 msgstr "Nie odnaleziono żadnych zestawów"
 
-#: ../src/frogr-controller.c:2423
+#: src/frogr-controller.c:2423
 msgid "No groups found"
 msgstr "Nie odnaleziono żadnych grup"
 
-#: ../src/frogr-controller.c:2984
+#: src/frogr-controller.c:2984
 #, c-format
 msgid ""
 "You need to properly authorize %s before uploading any pictures to Flickr.\n"
@@ -392,165 +389,161 @@ msgstr ""
 "serwisu Flickr.\n"
 "Proszę dokonać ponownego upoważnienia."
 
-#: ../src/frogr-controller.c:2994
-#, c-format
+#: src/frogr-controller.c:2994
 msgid "You need to be connected before uploading any pictures to Flickr."
 msgstr ""
 "Należy się połączyć przed przesłaniem jakichkolwiek obrazów do serwisu "
 "Flickr."
 
-#: ../src/frogr-controller.c:3012
+#: src/frogr-controller.c:3012
 msgid "Uploading Pictures"
 msgstr "Wysyłanie zdjęć"
 
-#: ../src/frogr-controller.c:3057
-#, c-format
+#: src/frogr-controller.c:3057
 msgid "Error opening project file"
 msgstr "Błąd podczas otwierania pliku projektu"
 
-#. This shows a dialog notifying the problem to the user
-#: ../src/frogr-create-new-set-dialog.c:143 ../src/frogr-details-dialog.c:1001
+#: src/frogr-create-new-set-dialog.c:143 src/frogr-details-dialog.c:1001
 msgid "Missing data required"
 msgstr "Brak wymaganych danych"
 
-#: ../src/frogr-create-new-set-dialog.c:326
+#: src/frogr-create-new-set-dialog.c:326
 msgid "Title:"
 msgstr "Tytuł:"
 
-#: ../src/frogr-create-new-set-dialog.c:335
+#: src/frogr-create-new-set-dialog.c:335
 msgid "Description:"
 msgstr "Opis:"
 
-#: ../src/frogr-create-new-set-dialog.c:356
+#: src/frogr-create-new-set-dialog.c:356
 msgid "Fill Pictures Details with Title and Description"
 msgstr "Wypełnienie szczegółów obrazów jako tytuł i opis"
 
-#: ../src/frogr-create-new-set-dialog.c:381
+#: src/frogr-create-new-set-dialog.c:381
 msgid "Create New Set"
 msgstr "Tworzenie nowego zestawu"
 
-#: ../src/frogr-details-dialog.c:89 ../src/frogr-settings-dialog.c:97
+#: src/frogr-details-dialog.c:89 src/frogr-settings-dialog.c:97
 msgid "Default (as specified in Flickr)"
 msgstr "Domyślnie (tak jak w serwisie Flickr)"
 
-#: ../src/frogr-details-dialog.c:90 ../src/frogr-settings-dialog.c:98
+#: src/frogr-details-dialog.c:90 src/frogr-settings-dialog.c:98
 msgid "All rights reserved"
 msgstr "Wszelkie prawa zastrzeżone"
 
-#: ../src/frogr-details-dialog.c:91 ../src/frogr-settings-dialog.c:99
+#: src/frogr-details-dialog.c:91 src/frogr-settings-dialog.c:99
 msgid "CC Attribution-NonCommercial-ShareAlike"
 msgstr "CC Uznanie autorstwa-Użycie niekomercyjne-Na tych samych warunkach"
 
-#: ../src/frogr-details-dialog.c:92 ../src/frogr-settings-dialog.c:100
+#: src/frogr-details-dialog.c:92 src/frogr-settings-dialog.c:100
 msgid "CC Attribution-NonCommercial"
 msgstr "CC Uznanie autorstwa-Użycie niekomercyjne"
 
-#: ../src/frogr-details-dialog.c:93 ../src/frogr-settings-dialog.c:101
+#: src/frogr-details-dialog.c:93 src/frogr-settings-dialog.c:101
 msgid "CC Attribution-NonCommercial-NoDerivs"
 msgstr "CC Uznanie autorstwa-Użycie niekomercyjne-Bez utworów zależnych"
 
-#: ../src/frogr-details-dialog.c:94 ../src/frogr-settings-dialog.c:102
+#: src/frogr-details-dialog.c:94 src/frogr-settings-dialog.c:102
 msgid "CC Attribution"
 msgstr "CC Uznanie autorstwa"
 
-#: ../src/frogr-details-dialog.c:95 ../src/frogr-settings-dialog.c:103
+#: src/frogr-details-dialog.c:95 src/frogr-settings-dialog.c:103
 msgid "CC Attribution-ShareAlike"
 msgstr "CC Uznanie autorstwa-Na tych samych warunkach"
 
-#: ../src/frogr-details-dialog.c:96 ../src/frogr-settings-dialog.c:104
+#: src/frogr-details-dialog.c:96 src/frogr-settings-dialog.c:104
 msgid "CC Attribution-NoDerivs"
 msgstr "CC Uznanie autorstwa-Bez utworów zależnych"
 
-#: ../src/frogr-details-dialog.c:172
+#: src/frogr-details-dialog.c:172
 msgid "Open with image viewer"
 msgstr "Otwórz za pomocą przeglądarki obrazów"
 
-#: ../src/frogr-details-dialog.c:190
+#: src/frogr-details-dialog.c:190
 msgid "_Title:"
 msgstr "_Tytuł:"
 
-#: ../src/frogr-details-dialog.c:200
+#: src/frogr-details-dialog.c:200
 msgid "_Description:"
 msgstr "_Opis:"
 
-#: ../src/frogr-details-dialog.c:224
+#: src/frogr-details-dialog.c:224
 msgid "Ta_gs:"
 msgstr "_Etykiety:"
 
-#: ../src/frogr-details-dialog.c:247
+#: src/frogr-details-dialog.c:247
 msgid "Visibility"
 msgstr "Widoczność"
 
-#: ../src/frogr-details-dialog.c:257 ../src/frogr-settings-dialog.c:196
+#: src/frogr-details-dialog.c:257 src/frogr-settings-dialog.c:196
 msgid "_Private"
 msgstr "_Prywatny"
 
-#: ../src/frogr-details-dialog.c:261 ../src/frogr-settings-dialog.c:199
+#: src/frogr-details-dialog.c:261 src/frogr-settings-dialog.c:199
 msgid "P_ublic"
 msgstr "P_ubliczny"
 
-#: ../src/frogr-details-dialog.c:270 ../src/frogr-settings-dialog.c:207
+#: src/frogr-details-dialog.c:270 src/frogr-settings-dialog.c:207
 msgid "_Family"
 msgstr "_Rodzina"
 
-#: ../src/frogr-details-dialog.c:274 ../src/frogr-settings-dialog.c:209
+#: src/frogr-details-dialog.c:274 src/frogr-settings-dialog.c:209
 msgid "F_riends"
 msgstr "P_rzyjaciele"
 
-#: ../src/frogr-details-dialog.c:288
+#: src/frogr-details-dialog.c:288
 msgid "Content Type"
 msgstr "Typ zawartości"
 
-#: ../src/frogr-details-dialog.c:296 ../src/frogr-settings-dialog.c:234
+#: src/frogr-details-dialog.c:296 src/frogr-settings-dialog.c:234
 msgid "P_hoto"
 msgstr "Z_djęcie"
 
-#: ../src/frogr-details-dialog.c:300 ../src/frogr-settings-dialog.c:236
+#: src/frogr-details-dialog.c:300 src/frogr-settings-dialog.c:236
 msgid "Scree_nshot"
 msgstr "Zrzut ekra_nu"
 
-#: ../src/frogr-details-dialog.c:304 ../src/frogr-settings-dialog.c:238
+#: src/frogr-details-dialog.c:304 src/frogr-settings-dialog.c:238
 msgid "Oth_er"
 msgstr "Inn_e"
 
-#: ../src/frogr-details-dialog.c:317
+#: src/frogr-details-dialog.c:317
 msgid "Safety Level"
 msgstr "Poziom bezpieczeństwa"
 
-#: ../src/frogr-details-dialog.c:325 ../src/frogr-settings-dialog.c:260
+#: src/frogr-details-dialog.c:325 src/frogr-settings-dialog.c:260
 msgid "S_afe"
 msgstr "_Bezpieczny"
 
-#: ../src/frogr-details-dialog.c:329 ../src/frogr-settings-dialog.c:262
+#: src/frogr-details-dialog.c:329 src/frogr-settings-dialog.c:262
 msgid "_Moderate"
 msgstr "Średn_i"
 
-#: ../src/frogr-details-dialog.c:333 ../src/frogr-settings-dialog.c:264
+#: src/frogr-details-dialog.c:333 src/frogr-settings-dialog.c:264
 msgid "Restr_icted"
 msgstr "O_graniczony"
 
-#: ../src/frogr-details-dialog.c:345
+#: src/frogr-details-dialog.c:345
 msgid "License Type"
 msgstr "Typ licencji"
 
-#: ../src/frogr-details-dialog.c:367
+#: src/frogr-details-dialog.c:367
 msgid "Other Properties"
 msgstr "Pozostałe właściwości"
 
-#: ../src/frogr-details-dialog.c:375
+#: src/frogr-details-dialog.c:375
 msgid "_Show Up in Global Search Results"
 msgstr "_Wyświetlanie w globalnych wynikach wyszukiwania"
 
-#: ../src/frogr-details-dialog.c:379
+#: src/frogr-details-dialog.c:379
 msgid "Set Geo_location Information"
 msgstr "Ustawianie informacji geo_lokalizacji"
 
-#: ../src/frogr-details-dialog.c:383
+#: src/frogr-details-dialog.c:383
 msgid "Replace 'Date Posted' with 'Date Taken'"
 msgstr "Zastępowanie „Daty opublikowania” „Datą wykonania”"
 
-#. Visually indicate how many pictures are being edited
-#: ../src/frogr-details-dialog.c:475
+#: src/frogr-details-dialog.c:475
 #, c-format
 msgid "(%d Picture)"
 msgid_plural "(%d Pictures)"
@@ -558,24 +551,24 @@ msgstr[0] "(%d obraz)"
 msgstr[1] "(%d obrazy)"
 msgstr[2] "(%d obrazów)"
 
-#: ../src/frogr-details-dialog.c:548
+#: src/frogr-details-dialog.c:548
 msgid "An error happened trying to load the picture"
 msgstr "Wystąpił błąd podczas wczytywania obrazu"
 
-#: ../src/frogr-details-dialog.c:1169 ../data/gtkbuilder/frogr-menu-bar.xml.h:8
+#: src/frogr-details-dialog.c:1169
 msgid "_Edit"
 msgstr "_Edycja"
 
-#: ../src/frogr-details-dialog.c:1197
+#: src/frogr-details-dialog.c:1197
 msgid "Edit Picture Details"
 msgstr "Modyfikowanie szczegółów obrazu"
 
-#: ../src/frogr-file-loader.c:142
+#: src/frogr-file-loader.c:142
 #, c-format
 msgid "Loading files %d / %d"
 msgstr "Wczytywanie obrazów %d/%d"
 
-#: ../src/frogr-file-loader.c:369
+#: src/frogr-file-loader.c:369
 #, c-format
 msgid ""
 "Unable to load picture %s:\n"
@@ -584,7 +577,7 @@ msgstr ""
 "Nie można wczytać obrazu %s:\n"
 "%s"
 
-#: ../src/frogr-file-loader.c:400
+#: src/frogr-file-loader.c:400
 #, c-format
 msgid ""
 "Unable to load video %s\n"
@@ -593,10 +586,7 @@ msgstr ""
 "Nie można wczytać wideo %s\n"
 "Proszę sprawdzić, czy zainstalowano właściwy kodek"
 
-#. First %s is the title of the picture (filename of the file by
-#. default). Second %s is the max allowed size for a picture to be
-#. uploaded to flickr (different for free and PRO accounts).
-#: ../src/frogr-file-loader.c:636
+#: src/frogr-file-loader.c:636
 #, c-format
 msgid ""
 "Can't load file %s:\n"
@@ -605,150 +595,135 @@ msgstr ""
 "Nie można wczytać pliku %s:\n"
 "Rozmiar pliku przekracza dozwolone maksimum dla tego konta (%s)"
 
-#. First create the left side buttons
-#: ../src/frogr-main-view.c:630 ../src/frogr-main-view.c:726
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
 msgid "Open"
 msgstr "Otwórz"
 
-#: ../src/frogr-main-view.c:630 ../src/frogr-main-view.c:726
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
 msgid "Open Existing Project"
 msgstr "Otwarcie istniejącego projektu"
 
-#: ../src/frogr-main-view.c:631 ../src/frogr-main-view.c:729
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
 msgid "Add"
 msgstr "Dodaj"
 
-#: ../src/frogr-main-view.c:631 ../src/frogr-main-view.c:729
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
 msgid "Add Elements"
 msgstr "Dodanie elementów"
 
-#: ../src/frogr-main-view.c:632 ../src/frogr-main-view.c:730
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
 msgid "Remove"
 msgstr "Usuń"
 
-#: ../src/frogr-main-view.c:632 ../src/frogr-main-view.c:730
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
 msgid "Remove Elements"
 msgstr "Usunięcie elementów"
 
-#: ../src/frogr-main-view.c:633 ../src/frogr-main-view.c:732
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
 msgid "Upload"
 msgstr "Wyślij"
 
-#: ../src/frogr-main-view.c:633 ../src/frogr-main-view.c:732
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
 msgid "Upload All"
 msgstr "Wysłanie wszystkiego"
 
-#. Save project item
-#: ../src/frogr-main-view.c:666 ../src/frogr-main-view.c:727
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
 msgid "Save"
 msgstr "Zapisz"
 
-#: ../src/frogr-main-view.c:666 ../src/frogr-main-view.c:727
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
 msgid "Save Current Project"
 msgstr "Zapis bieżącego projektu"
 
-#: ../src/frogr-main-view.c:1016 ../data/gtkbuilder/frogr-app-menu.xml.h:4
+#: src/frogr-main-view.c:1016
 msgid "_About"
 msgstr "_O programie"
 
-#: ../src/frogr-main-view.c:1020 ../data/gtkbuilder/frogr-app-menu.xml.h:5
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:17
+#: src/frogr-main-view.c:1020
 msgid "_Quit"
 msgstr "Za_kończ"
 
-#. Create the submenu and insert it in the right section
-#: ../src/frogr-main-view.c:1070
+#: src/frogr-main-view.c:1070
 msgid "Accounts"
 msgstr "Konta"
 
-#. String showind the date and time a picture was taken
-#: ../src/frogr-main-view.c:1410
+#: src/frogr-main-view.c:1410
 #, c-format
 msgid "Taken: %s"
 msgstr "Utworzono: %s"
 
-#: ../src/frogr-main-view.c:1415
+#: src/frogr-main-view.c:1415
 #, c-format
 msgid "File size: %s"
 msgstr "Rozmiar pliku: %s"
 
-#: ../src/frogr-main-view.c:1540
+#: src/frogr-main-view.c:1540
 msgid "Select File"
 msgstr "Wybór pliku"
 
-#: ../src/frogr-main-view.c:1544 ../src/frogr-main-view.c:1671
+#: src/frogr-main-view.c:1544 src/frogr-main-view.c:1671
 msgid "_Open"
 msgstr "_Otwórz"
 
-#: ../src/frogr-main-view.c:1553
+#: src/frogr-main-view.c:1553
 msgid "Frogr Project Files"
 msgstr "Pliki projektu programu Frogr"
 
-#: ../src/frogr-main-view.c:1615
+#: src/frogr-main-view.c:1615
 msgid "Select Destination"
 msgstr "Wybór miejsca docelowego"
 
-#: ../src/frogr-main-view.c:1619 ../data/gtkbuilder/frogr-menu-bar.xml.h:3
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:1
+#: src/frogr-main-view.c:1619
 msgid "_Save"
 msgstr "_Zapisz"
 
-#: ../src/frogr-main-view.c:1622
+#: src/frogr-main-view.c:1622
 msgid "Untitled Project.frogr"
 msgstr "Projekt bez tytułu.frogr"
 
-#: ../src/frogr-main-view.c:1667
+#: src/frogr-main-view.c:1667
 msgid "Select a Picture"
 msgstr "Wybór obrazów"
 
-#: ../src/frogr-main-view.c:1694
+#: src/frogr-main-view.c:1694
 msgid "All Files"
 msgstr "Wszystkie pliki"
 
-#: ../src/frogr-main-view.c:1697
+#: src/frogr-main-view.c:1697
 msgid "Image Files"
 msgstr "Pliki obrazów"
 
-#: ../src/frogr-main-view.c:1701
+#: src/frogr-main-view.c:1701
 msgid "Video Files"
 msgstr "Pliki wideo"
 
-#: ../src/frogr-main-view.c:1723
+#: src/frogr-main-view.c:1723
 msgid "You don't have any picture added yet"
 msgstr "Nie dodano jeszcze żadnych zdjęć"
 
-#: ../src/frogr-main-view.c:1736
+#: src/frogr-main-view.c:1736
 msgid "You need to select some pictures first"
 msgstr "Należy najpierw wybrać jakieś obrazy"
 
-#: ../src/frogr-main-view.c:2108
+#: src/frogr-main-view.c:2108
 msgid "Not connected to Flickr"
 msgstr "Nie połączono z serwisem Flickr"
 
-#. Login string, showing the user is PRO (second '%s') if so.
-#: ../src/frogr-main-view.c:2118
+#: src/frogr-main-view.c:2118
 #, c-format
 msgid "Connected as %s%s"
 msgstr "Połączono jako %s%s"
 
-#: ../src/frogr-main-view.c:2119
+#: src/frogr-main-view.c:2119
 msgid " (PRO account)"
 msgstr " (konto typu PRO)"
 
-#. Will show in the status bar the amount of data (in KB, MB
-#. or GB) the user is currently allowed to upload to flicker
-#. till the end of the month, in a CURRENT / MAX fashion.
-#. The '-' at the beginning is just a separator, since more
-#. blocks of text will be shown in the status bar too.
-#: ../src/frogr-main-view.c:2143
+#: src/frogr-main-view.c:2143
 #, c-format
 msgid " - %s / %s remaining"
 msgstr " — pozostało %s/%s"
 
-#. Will show in the status bar the amount of pictures and data
-#. (in KB, MB or GB) that would be uploaded as the sum of the
-#. sizes for every picture loaded in the application
-#: ../src/frogr-main-view.c:2169
+#: src/frogr-main-view.c:2169
 #, c-format
 msgid " - %d file to upload (%s)"
 msgid_plural " - %d files to upload (%s)"
@@ -756,217 +731,166 @@ msgstr[0] " — %d plik do wysłania (%s)"
 msgstr[1] " — %d pliki do wysłania (%s)"
 msgstr[2] " — %d plików do wysłania (%s)"
 
-#: ../src/frogr-settings-dialog.c:185
+#: src/frogr-settings-dialog.c:185
 msgid "Default Visibility"
 msgstr "Domyślna widoczność"
 
-#: ../src/frogr-settings-dialog.c:224
+#: src/frogr-settings-dialog.c:224
 msgid "Default Content Type"
 msgstr "Domyślny typ zawartości"
 
-#: ../src/frogr-settings-dialog.c:250
+#: src/frogr-settings-dialog.c:250
 msgid "Default Safety Level"
 msgstr "Domyślny poziom bezpieczeństwa"
 
-#: ../src/frogr-settings-dialog.c:276
+#: src/frogr-settings-dialog.c:276
 msgid "Default License"
 msgstr "Domyślna licencja"
 
-#: ../src/frogr-settings-dialog.c:302
+#: src/frogr-settings-dialog.c:302
 msgid "Other Defaults"
 msgstr "Inne domyślne"
 
-#: ../src/frogr-settings-dialog.c:312
+#: src/frogr-settings-dialog.c:312
 msgid "_Show Pictures in Global Search Results"
 msgstr "_Wyświetlanie obrazów w globalnych wynikach wyszukiwania"
 
-#: ../src/frogr-settings-dialog.c:315
+#: src/frogr-settings-dialog.c:315
 msgid "Set Geo_location Information for Pictures"
 msgstr "Ustawianie informacji geo_lokalizacji dla zdjęć"
 
-#: ../src/frogr-settings-dialog.c:318
+#: src/frogr-settings-dialog.c:318
 msgid "Replace 'Date Posted' with 'Date Taken' for Pictures"
 msgstr "Zastępowanie „Daty opublikowania” „Datą wykonania” dla zdjęć"
 
-#: ../src/frogr-settings-dialog.c:324
+#: src/frogr-settings-dialog.c:324
 msgid "_General"
 msgstr "_Ogólne"
 
-#: ../src/frogr-settings-dialog.c:344
+#: src/frogr-settings-dialog.c:344
 msgid "Proxy Settings"
 msgstr "Ustawienia pośrednika"
 
-#. Enable proxy
-#: ../src/frogr-settings-dialog.c:353
+#: src/frogr-settings-dialog.c:353
 msgid "_Enable HTTP Proxy"
 msgstr "_Pośrednik HTTP"
 
-#: ../src/frogr-settings-dialog.c:363
+#: src/frogr-settings-dialog.c:363
 msgid "_Host:"
 msgstr "_Serwer:"
 
-#. Proxy port
-#: ../src/frogr-settings-dialog.c:376
+#: src/frogr-settings-dialog.c:376
 msgid "_Port:"
 msgstr "_Port:"
 
-#. Proxy username
-#: ../src/frogr-settings-dialog.c:389
+#: src/frogr-settings-dialog.c:389
 msgid "U_sername:"
 msgstr "Nazwa _użytkownika:"
 
-#. Proxy password
-#: ../src/frogr-settings-dialog.c:402
+#: src/frogr-settings-dialog.c:402
 msgid "Pass_word:"
 msgstr "_Hasło:"
 
-#: ../src/frogr-settings-dialog.c:426
+#: src/frogr-settings-dialog.c:426
 msgid "Connec_tion"
 msgstr "Połą_czenie"
 
-#: ../src/frogr-settings-dialog.c:444
+#: src/frogr-settings-dialog.c:444
 msgid "Other options"
 msgstr "Pozostałe opcje"
 
-#: ../src/frogr-settings-dialog.c:454
+#: src/frogr-settings-dialog.c:454
 msgid "Ena_ble Tags Auto-Completion"
 msgstr "Auto_matyczne uzupełnianie etykiet"
 
-#: ../src/frogr-settings-dialog.c:457
+#: src/frogr-settings-dialog.c:457
 msgid "_Import Tags from Pictures Metadata"
 msgstr "_Importowanie etykiet z metadanych obrazów"
 
-#: ../src/frogr-settings-dialog.c:461
+#: src/frogr-settings-dialog.c:461
 msgid "Use _Dark GTK Theme"
 msgstr "_Ciemny motyw GTK+"
 
-#: ../src/frogr-settings-dialog.c:465
+#: src/frogr-settings-dialog.c:465
 msgid "_Keep File Extensions in Titles when Loading"
 msgstr "Z_achowanie rozszerzeń plików w tytułach podczas wczytywania"
 
-#: ../src/frogr-settings-dialog.c:471
+#: src/frogr-settings-dialog.c:471
 msgid "_Misc"
 msgstr "Róż_ne"
 
-#: ../src/frogr-settings-dialog.c:972
+#: src/frogr-settings-dialog.c:972
 msgid "Preferences"
 msgstr "Preferencje"
 
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:1
-msgid "Aut_horize Account…"
-msgstr "_Upoważnij konto…"
-
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:2
-msgid "_Preferences…"
-msgstr "_Preferencje…"
-
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:3
-msgid "_Help"
-msgstr "Pomo_c"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:1
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:9
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:3
-msgid "_Edit Details…"
-msgstr "Modyfikuj _szczegóły…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:2
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:10
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:4
-msgid "Add _Tags…"
-msgstr "Dodaj _etykiety…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:3
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:11
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:5
-msgid "Add to _Group…"
-msgstr "Dodaj do gr_upy…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:4
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:12
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:6
-msgid "Add to _Photoset"
-msgstr "Dodaj do ze_stawu zdjęć"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:5
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:13
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:7
-msgid "_Add to Existing Photoset…"
-msgstr "_Dodaj do istniejącego zestawu zdjęć…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:6
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:14
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:8
-msgid "_Create New Photoset…"
-msgstr "_Utwórz nowy zestaw zdjęć…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:7
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:15
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:16
-msgid "_Open in External Viewer"
-msgstr "Otwórz w _zewnętrznej przeglądarce"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:8
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:6
-msgid "_Remove Elements"
-msgstr "_Usuń elementy"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:1
-msgid "_File"
-msgstr "_Plik"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:2
-msgid "_Open…"
-msgstr "_Otwórz…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:4
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:2
-msgid "Save _As…"
-msgstr "Z_apisz jako…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:5
-msgid "A_dd Elements…"
-msgstr "_Dodaj elementy…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:7
-msgid "_Upload All"
-msgstr "_Wyślij wszystko"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:16
-msgid "_View"
-msgstr "_Widok"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:17
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:9
-msgid "_Sort Elements"
-msgstr "Up_orządkuj elementy"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:18
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:10
-msgid "As _Loaded"
-msgstr "Tak, jak _wczytano"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:19
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:11
-msgid "By _Date Taken"
-msgstr "Według _daty utworzenia"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:20
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:12
-msgid "By _Title"
-msgstr "Według _tytułu"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:21
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:13
-msgid "By _Size"
-msgstr "Według _rozmiaru"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:22
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:14
-msgid "_Reversed Order"
-msgstr "_Odwrócona kolejność"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:23
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:15
-msgid "Enable _Tooltips"
-msgstr "Włączenie p_odpowiedzi"
+#~ msgid "Aut_horize Account…"
+#~ msgstr "_Upoważnij konto…"
+
+#~ msgid "_Preferences…"
+#~ msgstr "_Preferencje…"
+
+#~ msgid "_Help"
+#~ msgstr "Pomo_c"
+
+#~ msgid "_Edit Details…"
+#~ msgstr "Modyfikuj _szczegóły…"
+
+#~ msgid "Add _Tags…"
+#~ msgstr "Dodaj _etykiety…"
+
+#~ msgid "Add to _Group…"
+#~ msgstr "Dodaj do gr_upy…"
+
+#~ msgid "Add to _Photoset"
+#~ msgstr "Dodaj do ze_stawu zdjęć"
+
+#~ msgid "_Add to Existing Photoset…"
+#~ msgstr "_Dodaj do istniejącego zestawu zdjęć…"
+
+#~ msgid "_Create New Photoset…"
+#~ msgstr "_Utwórz nowy zestaw zdjęć…"
+
+#~ msgid "_Open in External Viewer"
+#~ msgstr "Otwórz w _zewnętrznej przeglądarce"
+
+#~ msgid "_Remove Elements"
+#~ msgstr "_Usuń elementy"
+
+#~ msgid "_File"
+#~ msgstr "_Plik"
+
+#~ msgid "_Open…"
+#~ msgstr "_Otwórz…"
+
+#~ msgid "Save _As…"
+#~ msgstr "Z_apisz jako…"
+
+#~ msgid "A_dd Elements…"
+#~ msgstr "_Dodaj elementy…"
+
+#~ msgid "_Upload All"
+#~ msgstr "_Wyślij wszystko"
+
+#~ msgid "_View"
+#~ msgstr "_Widok"
+
+#~ msgid "_Sort Elements"
+#~ msgstr "Up_orządkuj elementy"
+
+#~ msgid "As _Loaded"
+#~ msgstr "Tak, jak _wczytano"
+
+#~ msgid "By _Date Taken"
+#~ msgstr "Według _daty utworzenia"
+
+#~ msgid "By _Title"
+#~ msgstr "Według _tytułu"
+
+#~ msgid "By _Size"
+#~ msgstr "Według _rozmiaru"
+
+#~ msgid "_Reversed Order"
+#~ msgstr "_Odwrócona kolejność"
+
+#~ msgid "Enable _Tooltips"
+#~ msgstr "Włączenie p_odpowiedzi"
diff --git a/po/pt.po b/po/pt.po
index 58b1534..c4076f7 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,9 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Frogr\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=frogr&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-01-22 18:06+0000\n"
+"Report-Msgid-Bugs-To: msanchez gnome org\n"
+"POT-Creation-Date: 2016-08-12 13:09+0100\n"
 "PO-Revision-Date: 2016-05-04 19:53+0100\n"
 "Last-Translator: Tiago Santos <tiagofsantos81 sapo pt>\n"
 "Language-Team: Português <happyguy_pt hotmail com>\n"
@@ -21,7 +20,16 @@ msgstr ""
 "X-Generator: Poedit 1.5.4\n"
 "X-Project-Style: gnome\n"
 
-#: ../data/frogr.appdata.xml.in.h:1
+#: data/frogr.appdata.xml.in:5 data/frogr.desktop.in.in:5
+#: data/frogr.desktop.in.in:14
+msgid "frogr"
+msgstr "Frogr"
+
+#: data/frogr.appdata.xml.in:6 data/frogr.desktop.in.in:6
+msgid "frogr: a Flickr Remote Organizer for GNOME"
+msgstr "Frogr: um organizador remoto do Flickr para o GNOME"
+
+#: data/frogr.appdata.xml.in:8
 msgid ""
 "frogr is a small application for the GNOME desktop that allows users to "
 "manage their accounts in the Flickr image hosting website."
@@ -30,7 +38,7 @@ msgstr ""
 "permite aos utilizadores gerir as suas contas no Flickr, página anfitriã de "
 "imagens."
 
-#: ../data/frogr.appdata.xml.in.h:2
+#: data/frogr.appdata.xml.in:13
 msgid ""
 "It supports all the basic Flickr features, including uploading pictures, "
 "adding descriptions, setting tags and managing sets and groups pools."
@@ -38,80 +46,74 @@ msgstr ""
 "Suporta todas as funcionalidades básicas do Flickr, incluindo o envio de "
 "imagens, adicionar descrições, definir etiquetas e gerir cenários e grupos."
 
-#: ../data/frogr.appdata.xml.in.h:3
-#| msgid "Scree_nshot"
+#: data/frogr.appdata.xml.in:24
 msgid "Screenshot of frogr"
 msgstr "Captura de ecrã do frogr"
 
-#: ../data/frogr.desktop.in.in.h:1
-msgid "frogr"
-msgstr "Frogr"
-
-#: ../data/frogr.desktop.in.in.h:2
-msgid "frogr: a Flickr Remote Organizer for GNOME"
-msgstr "Frogr: um organizador remoto do Flickr para o GNOME"
+#: data/frogr.appdata.xml.in:29
+msgid "Mario Sanchez Prada"
+msgstr ""
 
-#: ../data/frogr.desktop.in.in.h:3
+#: data/frogr.desktop.in.in:7
 msgid "Upload and organize photos in Flickr accounts"
 msgstr "Envie e organize fotografias em contas Flickr"
 
-#: ../data/frogr.desktop.in.in.h:4
+#: data/frogr.desktop.in.in:8
 msgid "Flickr;Image;Picture;Photo;Video;Uploader;"
 msgstr "Flickr;Imagem;Fotografia;Vídeo;Remetente;"
 
-#: ../src/frogr-about-dialog.c:43
+#: src/frogr-about-dialog.c:43
 msgid "A Flickr Remote Organizer for GNOME\n"
 msgstr "Um organizador remoto do Flickr para o GNOME\n"
 
-#: ../src/frogr-about-dialog.c:72
+#: src/frogr-about-dialog.c:72
 msgid "translator-credits"
 msgstr ""
 "Pedro Albuquerque <palbuquerque73 gmail com>, 2015Tiago Santos "
 "<tiagofsantos81 sapo pt>, 2015, 2016"
 
-#: ../src/frogr-add-tags-dialog.c:191 ../src/frogr-add-to-group-dialog.c:528
-#: ../src/frogr-add-to-set-dialog.c:529 ../src/frogr-auth-dialog.c:153
-#: ../src/frogr-create-new-set-dialog.c:310 ../src/frogr-details-dialog.c:1168
-#: ../src/frogr-main-view.c:1543 ../src/frogr-main-view.c:1618
-#: ../src/frogr-main-view.c:1670 ../src/frogr-settings-dialog.c:930
+#: src/frogr-add-tags-dialog.c:191 src/frogr-add-to-group-dialog.c:528
+#: src/frogr-add-to-set-dialog.c:529 src/frogr-auth-dialog.c:153
+#: src/frogr-create-new-set-dialog.c:310 src/frogr-details-dialog.c:1168
+#: src/frogr-main-view.c:1543 src/frogr-main-view.c:1618
+#: src/frogr-main-view.c:1670 src/frogr-settings-dialog.c:930
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../src/frogr-add-tags-dialog.c:193 ../src/frogr-add-to-group-dialog.c:530
-#: ../src/frogr-add-to-set-dialog.c:531
-#: ../src/frogr-create-new-set-dialog.c:312
+#: src/frogr-add-tags-dialog.c:193 src/frogr-add-to-group-dialog.c:530
+#: src/frogr-add-to-set-dialog.c:531 src/frogr-create-new-set-dialog.c:312
 msgid "_Add"
 msgstr "_Adicionar"
 
-#: ../src/frogr-add-tags-dialog.c:202
+#: src/frogr-add-tags-dialog.c:202
 msgid "Enter a spaces separated list of tags:"
 msgstr "Insira uma lista de etiquetas separadas por espaços:"
 
-#: ../src/frogr-add-tags-dialog.c:228
+#: src/frogr-add-tags-dialog.c:228
 msgid "Add Tags"
 msgstr "Adicionar etiquetas"
 
-#: ../src/frogr-add-to-group-dialog.c:147
+#: src/frogr-add-to-group-dialog.c:147
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/frogr-add-to-group-dialog.c:162 ../src/frogr-add-to-set-dialog.c:163
+#: src/frogr-add-to-group-dialog.c:162 src/frogr-add-to-set-dialog.c:163
 msgid "Elements"
 msgstr "Elementos"
 
-#: ../src/frogr-add-to-group-dialog.c:581
+#: src/frogr-add-to-group-dialog.c:581
 msgid "Add to Groups"
 msgstr "Adicionar a grupos"
 
-#: ../src/frogr-add-to-set-dialog.c:148
+#: src/frogr-add-to-set-dialog.c:148
 msgid "Title"
 msgstr "Título"
 
-#: ../src/frogr-add-to-set-dialog.c:582
+#: src/frogr-add-to-set-dialog.c:582
 msgid "Add to Sets"
 msgstr "Adicionar a cenários"
 
-#: ../src/frogr-auth-dialog.c:59
+#: src/frogr-auth-dialog.c:59
 #, c-format
 msgid ""
 "Please press the button to authorize %s and then come back to complete the "
@@ -120,30 +122,29 @@ msgstr ""
 "Por favor, clique no botão para autorizar %s e voltar para concluir o "
 "processo."
 
-#: ../src/frogr-auth-dialog.c:63 ../src/frogr-auth-dialog.c:149
-#: ../src/frogr-controller.c:2286
+#: src/frogr-auth-dialog.c:63 src/frogr-auth-dialog.c:149
+#: src/frogr-controller.c:2286
 #, c-format
 msgid "Authorize %s"
 msgstr "Autorizar %s"
 
-#: ../src/frogr-auth-dialog.c:155 ../src/frogr-settings-dialog.c:932
+#: src/frogr-auth-dialog.c:155 src/frogr-settings-dialog.c:932
 msgid "_Close"
 msgstr "_Fechar"
 
-#. Description label
-#: ../src/frogr-auth-dialog.c:167
+#: src/frogr-auth-dialog.c:167
 msgid "Enter verification code:"
 msgstr "Insira o código de verificação:"
 
-#: ../src/frogr-auth-dialog.c:221
+#: src/frogr-auth-dialog.c:221
 msgid "Invalid verification code"
 msgstr "Código de verificação inválido"
 
-#: ../src/frogr-controller.c:581
+#: src/frogr-controller.c:581
 msgid "Process cancelled"
 msgstr "Processo cancelado"
 
-#: ../src/frogr-controller.c:586
+#: src/frogr-controller.c:586
 msgid ""
 "Connection error:\n"
 "Network not available"
@@ -151,7 +152,7 @@ msgstr ""
 "Erro de ligação:\n"
 "rede indisponível"
 
-#: ../src/frogr-controller.c:590
+#: src/frogr-controller.c:590
 msgid ""
 "Connection error:\n"
 "Bad request"
@@ -159,7 +160,7 @@ msgstr ""
 "Erro de ligação:\n"
 "pedido incorreto"
 
-#: ../src/frogr-controller.c:594
+#: src/frogr-controller.c:594
 msgid ""
 "Connection error:\n"
 "Server-side error"
@@ -167,7 +168,7 @@ msgstr ""
 "Erro de ligação:\n"
 "erro no servidor"
 
-#: ../src/frogr-controller.c:598
+#: src/frogr-controller.c:598
 msgid ""
 "Error uploading:\n"
 "File invalid"
@@ -175,7 +176,7 @@ msgstr ""
 "Erro de envio:\n"
 "ficheiro inválido"
 
-#: ../src/frogr-controller.c:602
+#: src/frogr-controller.c:602
 msgid ""
 "Error uploading picture:\n"
 "Quota exceeded"
@@ -183,14 +184,14 @@ msgstr ""
 "Erro de envio de imagem:\n"
 "cota excedida"
 
-#: ../src/frogr-controller.c:607
+#: src/frogr-controller.c:607
 #, c-format
 msgid "Quota exceeded (limit: %d video per month)"
 msgid_plural "Quota exceeded (limit: %d videos per month)"
 msgstr[0] "Cota excedida (limite: %d vídeo por mês)"
 msgstr[1] "Cota excedida (limite: %d vídeos por mês)"
 
-#: ../src/frogr-controller.c:611
+#: src/frogr-controller.c:611
 msgid ""
 "Error uploading video:\n"
 "You can't upload more videos with this account"
@@ -198,7 +199,7 @@ msgstr ""
 "Erro de envio de vídeo:\n"
 "não pode enviar mais vídeos com esta conta"
 
-#: ../src/frogr-controller.c:617
+#: src/frogr-controller.c:617
 msgid ""
 "Error:\n"
 "Photo not found"
@@ -206,7 +207,7 @@ msgstr ""
 "Erro:\n"
 "fotografia não encontrada"
 
-#: ../src/frogr-controller.c:621
+#: src/frogr-controller.c:621
 msgid ""
 "Error:\n"
 "Photo already in photoset"
@@ -214,7 +215,7 @@ msgstr ""
 "Erro:\n"
 "fotografia já no cenário"
 
-#: ../src/frogr-controller.c:625
+#: src/frogr-controller.c:625
 msgid ""
 "Error:\n"
 "Photo already in group"
@@ -222,7 +223,7 @@ msgstr ""
 "Erro:\n"
 "fotografia já no grupo"
 
-#: ../src/frogr-controller.c:629
+#: src/frogr-controller.c:629
 msgid ""
 "Error:\n"
 "Photo already in the maximum number of groups possible"
@@ -230,7 +231,7 @@ msgstr ""
 "Erro:\n"
 "fotografia já no máximo número de grupos possível"
 
-#: ../src/frogr-controller.c:633
+#: src/frogr-controller.c:633
 msgid ""
 "Error:\n"
 "Group limit already reached"
@@ -238,7 +239,7 @@ msgstr ""
 "Erro:\n"
 "limite do grupo já atingido"
 
-#: ../src/frogr-controller.c:637
+#: src/frogr-controller.c:637
 msgid ""
 "Error:\n"
 "Photo added to group's queue"
@@ -246,7 +247,7 @@ msgstr ""
 "Erro:\n"
 "fotografia adicionada à fila do grupo"
 
-#: ../src/frogr-controller.c:641
+#: src/frogr-controller.c:641
 msgid ""
 "Error:\n"
 "Photo already added to group's queue"
@@ -254,7 +255,7 @@ msgstr ""
 "Erro:\n"
 "fotografia já adicionada à fila do grupo"
 
-#: ../src/frogr-controller.c:645
+#: src/frogr-controller.c:645
 msgid ""
 "Error:\n"
 "Content not allowed for this group"
@@ -262,8 +263,7 @@ msgstr ""
 "Erro:\n"
 "conteúdo não permitido neste grupo"
 
-#: ../src/frogr-controller.c:649
-#, c-format
+#: src/frogr-controller.c:649
 msgid ""
 "Authorization failed.\n"
 "Please try again"
@@ -271,7 +271,7 @@ msgstr ""
 "Autorização falhou.\n"
 "Por favor, tente novamente"
 
-#: ../src/frogr-controller.c:655
+#: src/frogr-controller.c:655
 #, c-format
 msgid ""
 "Error\n"
@@ -282,8 +282,7 @@ msgstr ""
 "%s não tem as autorizações devidas para enviar imagens para o Flickr.\n"
 "Por favor, renove as autorizações"
 
-#: ../src/frogr-controller.c:660
-#, c-format
+#: src/frogr-controller.c:660
 msgid ""
 "Unable to authenticate in Flickr\n"
 "Please try again."
@@ -291,7 +290,7 @@ msgstr ""
 "Impossível autenticar no Flickr.\n"
 "Por favor, tente novamente."
 
-#: ../src/frogr-controller.c:664
+#: src/frogr-controller.c:664
 #, c-format
 msgid ""
 "You have not properly authorized %s yet.\n"
@@ -300,8 +299,7 @@ msgstr ""
 "Ainda não autorizou %s corretamente.\n"
 "Por favor, tente novamente."
 
-#: ../src/frogr-controller.c:669
-#, c-format
+#: src/frogr-controller.c:669
 msgid ""
 "Invalid verification code.\n"
 "Please try again."
@@ -309,8 +307,7 @@ msgstr ""
 "Código de verificação inválido.\n"
 "Por favor, tente novamente."
 
-#: ../src/frogr-controller.c:673
-#, c-format
+#: src/frogr-controller.c:673
 msgid ""
 "Error:\n"
 "Service not available"
@@ -318,64 +315,62 @@ msgstr ""
 "Erro:\n"
 "serviço indisponível"
 
-#. General error: just dump the raw error description
-#: ../src/frogr-controller.c:678
+#: src/frogr-controller.c:678
 #, c-format
 msgid "An error happened: %s."
 msgstr "Ocorreu um erro: %s."
 
-#: ../src/frogr-controller.c:883
+#: src/frogr-controller.c:883
 msgid "Authorization failed (timed out)"
 msgstr "Autorização falhou (expirou)"
 
-#: ../src/frogr-controller.c:931
+#: src/frogr-controller.c:931
 #, c-format
 msgid "Retrying Upload (attempt %d/%d)…"
 msgstr "A tentar envio de novo (tentativa %d/%d)…"
 
-#: ../src/frogr-controller.c:936
+#: src/frogr-controller.c:936
 #, c-format
 msgid "Uploading '%s'…"
 msgstr "A enviar \"%s\"…"
 
-#: ../src/frogr-controller.c:2242
+#: src/frogr-controller.c:2242
 msgid "Updating credentials…"
 msgstr "A atualizar credenciais…"
 
-#: ../src/frogr-controller.c:2247
+#: src/frogr-controller.c:2247
 msgid "Retrieving data for authorization…"
 msgstr "A obter dados para autorização…"
 
-#: ../src/frogr-controller.c:2252
+#: src/frogr-controller.c:2252
 msgid "Finishing authorization…"
 msgstr "A terminar autorização…"
 
-#: ../src/frogr-controller.c:2257
+#: src/frogr-controller.c:2257
 msgid "Retrieving list of sets…"
 msgstr "A obter lista de cenários…"
 
-#: ../src/frogr-controller.c:2262
+#: src/frogr-controller.c:2262
 msgid "Retrieving list of groups…"
 msgstr "A obter lista de grupos…"
 
-#: ../src/frogr-controller.c:2267
+#: src/frogr-controller.c:2267
 msgid "Retrieving list of tags…"
 msgstr "A obter lista de etiquetas…"
 
-#: ../src/frogr-controller.c:2292
-#, c-format
+#: src/frogr-controller.c:2292
 msgid "Fetching information"
 msgstr "A obter informação"
 
-#: ../src/frogr-controller.c:2398
+#: src/frogr-controller.c:2398
 msgid "No sets found"
 msgstr "Sem cenários"
 
-#: ../src/frogr-controller.c:2423
+#: src/frogr-controller.c:2423
 msgid "No groups found"
 msgstr "Sem grupos"
 
-#: ../src/frogr-controller.c:2984
+#: src/frogr-controller.c:2984
 #, c-format
 msgid ""
 "You need to properly authorize %s before uploading any pictures to Flickr.\n"
@@ -384,188 +379,183 @@ msgstr ""
 "Tem de autorizar %s corretamente antes de enviar fotografias para o Flickr.\n"
 "Por favor, renove as autorizações."
 
-#: ../src/frogr-controller.c:2994
-#, c-format
+#: src/frogr-controller.c:2994
 msgid "You need to be connected before uploading any pictures to Flickr."
 msgstr "Tem de estar ligado antes de enviar imagens para o Flickr."
 
-#: ../src/frogr-controller.c:3012
+#: src/frogr-controller.c:3012
 msgid "Uploading Pictures"
 msgstr "A enviar imagens"
 
-#: ../src/frogr-controller.c:3057
-#, c-format
+#: src/frogr-controller.c:3057
 msgid "Error opening project file"
 msgstr "Erro ao abrir o ficheiro de projeto"
 
-#. This shows a dialog notifying the problem to the user
-#: ../src/frogr-create-new-set-dialog.c:143 ../src/frogr-details-dialog.c:1001
+#: src/frogr-create-new-set-dialog.c:143 src/frogr-details-dialog.c:1001
 msgid "Missing data required"
 msgstr "Dados em falta necessários"
 
-#: ../src/frogr-create-new-set-dialog.c:326
+#: src/frogr-create-new-set-dialog.c:326
 msgid "Title:"
 msgstr "Título:"
 
-#: ../src/frogr-create-new-set-dialog.c:335
+#: src/frogr-create-new-set-dialog.c:335
 msgid "Description:"
 msgstr "Descrição:"
 
-#: ../src/frogr-create-new-set-dialog.c:356
+#: src/frogr-create-new-set-dialog.c:356
 msgid "Fill Pictures Details with Title and Description"
 msgstr "Preencha os detalhes da imagem com título e descrição"
 
-#: ../src/frogr-create-new-set-dialog.c:381
+#: src/frogr-create-new-set-dialog.c:381
 msgid "Create New Set"
 msgstr "Criar novo cenário"
 
-#: ../src/frogr-details-dialog.c:89 ../src/frogr-settings-dialog.c:97
+#: src/frogr-details-dialog.c:89 src/frogr-settings-dialog.c:97
 msgid "Default (as specified in Flickr)"
 msgstr "Predefinição (como especificado no Flickr)"
 
-#: ../src/frogr-details-dialog.c:90 ../src/frogr-settings-dialog.c:98
+#: src/frogr-details-dialog.c:90 src/frogr-settings-dialog.c:98
 msgid "All rights reserved"
 msgstr "Todos os direitos reservados"
 
-#: ../src/frogr-details-dialog.c:91 ../src/frogr-settings-dialog.c:99
+#: src/frogr-details-dialog.c:91 src/frogr-settings-dialog.c:99
 msgid "CC Attribution-NonCommercial-ShareAlike"
 msgstr "CC Attribution-NonCommercial-ShareAlike"
 
-#: ../src/frogr-details-dialog.c:92 ../src/frogr-settings-dialog.c:100
+#: src/frogr-details-dialog.c:92 src/frogr-settings-dialog.c:100
 msgid "CC Attribution-NonCommercial"
 msgstr "CC Attribution-NonCommercial"
 
-#: ../src/frogr-details-dialog.c:93 ../src/frogr-settings-dialog.c:101
+#: src/frogr-details-dialog.c:93 src/frogr-settings-dialog.c:101
 msgid "CC Attribution-NonCommercial-NoDerivs"
 msgstr "CC Attribution-NonCommercial-NoDerivs"
 
-#: ../src/frogr-details-dialog.c:94 ../src/frogr-settings-dialog.c:102
+#: src/frogr-details-dialog.c:94 src/frogr-settings-dialog.c:102
 msgid "CC Attribution"
 msgstr "CC Attribution"
 
-#: ../src/frogr-details-dialog.c:95 ../src/frogr-settings-dialog.c:103
+#: src/frogr-details-dialog.c:95 src/frogr-settings-dialog.c:103
 msgid "CC Attribution-ShareAlike"
 msgstr "CC Attribution-ShareAlike"
 
-#: ../src/frogr-details-dialog.c:96 ../src/frogr-settings-dialog.c:104
+#: src/frogr-details-dialog.c:96 src/frogr-settings-dialog.c:104
 msgid "CC Attribution-NoDerivs"
 msgstr "CC Attribution-NoDerivs"
 
-#: ../src/frogr-details-dialog.c:172
+#: src/frogr-details-dialog.c:172
 msgid "Open with image viewer"
 msgstr "Abrir com o visualizador de imagens"
 
-#: ../src/frogr-details-dialog.c:190
+#: src/frogr-details-dialog.c:190
 msgid "_Title:"
 msgstr "_Título:"
 
-#: ../src/frogr-details-dialog.c:200
+#: src/frogr-details-dialog.c:200
 msgid "_Description:"
 msgstr "_Descrição:"
 
-#: ../src/frogr-details-dialog.c:224
+#: src/frogr-details-dialog.c:224
 msgid "Ta_gs:"
 msgstr "_Etiquetas:"
 
-#: ../src/frogr-details-dialog.c:247
+#: src/frogr-details-dialog.c:247
 msgid "Visibility"
 msgstr "Visibilidade"
 
-#: ../src/frogr-details-dialog.c:257 ../src/frogr-settings-dialog.c:196
+#: src/frogr-details-dialog.c:257 src/frogr-settings-dialog.c:196
 msgid "_Private"
 msgstr "_Privado"
 
-#: ../src/frogr-details-dialog.c:261 ../src/frogr-settings-dialog.c:199
+#: src/frogr-details-dialog.c:261 src/frogr-settings-dialog.c:199
 msgid "P_ublic"
 msgstr "Pú_Blico"
 
-#: ../src/frogr-details-dialog.c:270 ../src/frogr-settings-dialog.c:207
+#: src/frogr-details-dialog.c:270 src/frogr-settings-dialog.c:207
 msgid "_Family"
 msgstr "_Família"
 
-#: ../src/frogr-details-dialog.c:274 ../src/frogr-settings-dialog.c:209
+#: src/frogr-details-dialog.c:274 src/frogr-settings-dialog.c:209
 msgid "F_riends"
 msgstr "_Amigos"
 
-#: ../src/frogr-details-dialog.c:288
+#: src/frogr-details-dialog.c:288
 msgid "Content Type"
 msgstr "Tipo de conteúdo"
 
-#: ../src/frogr-details-dialog.c:296 ../src/frogr-settings-dialog.c:234
+#: src/frogr-details-dialog.c:296 src/frogr-settings-dialog.c:234
 msgid "P_hoto"
 msgstr "_Fotografia"
 
-#: ../src/frogr-details-dialog.c:300 ../src/frogr-settings-dialog.c:236
+#: src/frogr-details-dialog.c:300 src/frogr-settings-dialog.c:236
 msgid "Scree_nshot"
 msgstr "_Captura de ecrã"
 
-#: ../src/frogr-details-dialog.c:304 ../src/frogr-settings-dialog.c:238
+#: src/frogr-details-dialog.c:304 src/frogr-settings-dialog.c:238
 msgid "Oth_er"
 msgstr "_Outro"
 
-#: ../src/frogr-details-dialog.c:317
+#: src/frogr-details-dialog.c:317
 msgid "Safety Level"
 msgstr "Nível de segurança"
 
-#: ../src/frogr-details-dialog.c:325 ../src/frogr-settings-dialog.c:260
+#: src/frogr-details-dialog.c:325 src/frogr-settings-dialog.c:260
 msgid "S_afe"
 msgstr "_Seguro"
 
-#: ../src/frogr-details-dialog.c:329 ../src/frogr-settings-dialog.c:262
+#: src/frogr-details-dialog.c:329 src/frogr-settings-dialog.c:262
 msgid "_Moderate"
 msgstr "_Moderado"
 
-#: ../src/frogr-details-dialog.c:333 ../src/frogr-settings-dialog.c:264
+#: src/frogr-details-dialog.c:333 src/frogr-settings-dialog.c:264
 msgid "Restr_icted"
 msgstr "_Restrito"
 
-#: ../src/frogr-details-dialog.c:345
+#: src/frogr-details-dialog.c:345
 msgid "License Type"
 msgstr "Tipo de licença"
 
-#: ../src/frogr-details-dialog.c:367
+#: src/frogr-details-dialog.c:367
 msgid "Other Properties"
 msgstr "Outras propriedades"
 
-#: ../src/frogr-details-dialog.c:375
+#: src/frogr-details-dialog.c:375
 msgid "_Show Up in Global Search Results"
 msgstr "_Mostrar nos resultados globais de procura"
 
-#: ../src/frogr-details-dialog.c:379
+#: src/frogr-details-dialog.c:379
 msgid "Set Geo_location Information"
 msgstr "Definir informação de localização geográfica"
 
-#: ../src/frogr-details-dialog.c:383
+#: src/frogr-details-dialog.c:383
 msgid "Replace 'Date Posted' with 'Date Taken'"
 msgstr "Substituir \"Data de publicação\" por \"Data tirada\""
 
-#. Visually indicate how many pictures are being edited
-#: ../src/frogr-details-dialog.c:475
+#: src/frogr-details-dialog.c:475
 #, c-format
 msgid "(%d Picture)"
 msgid_plural "(%d Pictures)"
 msgstr[0] "(%d imagem)"
 msgstr[1] "(%d imagens)"
 
-#: ../src/frogr-details-dialog.c:548
+#: src/frogr-details-dialog.c:548
 msgid "An error happened trying to load the picture"
 msgstr "Ocorreu um erro ao tentar carregar a imagem"
 
-#: ../src/frogr-details-dialog.c:1169
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:8
+#: src/frogr-details-dialog.c:1169
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../src/frogr-details-dialog.c:1197
+#: src/frogr-details-dialog.c:1197
 msgid "Edit Picture Details"
 msgstr "Editar detalhes da imagem"
 
-#: ../src/frogr-file-loader.c:142
+#: src/frogr-file-loader.c:142
 #, c-format
 msgid "Loading files %d / %d"
 msgstr "A carregar ficheiros %d/%d"
 
-#: ../src/frogr-file-loader.c:369
+#: src/frogr-file-loader.c:369
 #, c-format
 msgid ""
 "Unable to load picture %s:\n"
@@ -574,7 +564,7 @@ msgstr ""
 "Impossível carregar a imagem %s:\n"
 "%s"
 
-#: ../src/frogr-file-loader.c:400
+#: src/frogr-file-loader.c:400
 #, c-format
 msgid ""
 "Unable to load video %s\n"
@@ -583,10 +573,7 @@ msgstr ""
 "Impossível carregar o vídeo %s\n"
 "Por favor, verifique se tem o codec apropriado instalado"
 
-#. First %s is the title of the picture (filename of the file by
-#. default). Second %s is the max allowed size for a picture to be
-#. uploaded to flickr (different for free and PRO accounts).
-#: ../src/frogr-file-loader.c:636
+#: src/frogr-file-loader.c:636
 #, c-format
 msgid ""
 "Can't load file %s:\n"
@@ -595,367 +582,301 @@ msgstr ""
 "Impossível carregar o ficheiro %s:\n"
 "O tamanho do ficheiro é maior que o máximo permitido nesta conta (%s)"
 
-#. First create the left side buttons
-#: ../src/frogr-main-view.c:630 ../src/frogr-main-view.c:726
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
 msgid "Open"
 msgstr "Abrir"
 
-#: ../src/frogr-main-view.c:630 ../src/frogr-main-view.c:726
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
 msgid "Open Existing Project"
 msgstr "Abrir projeto existente"
 
-#: ../src/frogr-main-view.c:631 ../src/frogr-main-view.c:729
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
 msgid "Add"
 msgstr "Adicionar"
 
-#: ../src/frogr-main-view.c:631 ../src/frogr-main-view.c:729
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
 msgid "Add Elements"
 msgstr "Adicionar elementos"
 
-#: ../src/frogr-main-view.c:632 ../src/frogr-main-view.c:730
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
 msgid "Remove"
 msgstr "Remover"
 
-#: ../src/frogr-main-view.c:632 ../src/frogr-main-view.c:730
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
 msgid "Remove Elements"
 msgstr "Remover elementos"
 
-#: ../src/frogr-main-view.c:633 ../src/frogr-main-view.c:732
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
 msgid "Upload"
 msgstr "Enviar"
 
-#: ../src/frogr-main-view.c:633 ../src/frogr-main-view.c:732
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
 msgid "Upload All"
 msgstr "Enviar tudo"
 
-#. Save project item
-#: ../src/frogr-main-view.c:666 ../src/frogr-main-view.c:727
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
 msgid "Save"
 msgstr "Gravar"
 
-#: ../src/frogr-main-view.c:666 ../src/frogr-main-view.c:727
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
 msgid "Save Current Project"
 msgstr "Gravar o projeto atual"
 
-#: ../src/frogr-main-view.c:1016 ../data/gtkbuilder/frogr-app-menu.xml.h:4
+#: src/frogr-main-view.c:1016
 msgid "_About"
 msgstr "_Sobre"
 
-#: ../src/frogr-main-view.c:1020 ../data/gtkbuilder/frogr-app-menu.xml.h:5
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:17
+#: src/frogr-main-view.c:1020
 msgid "_Quit"
 msgstr "_Sair"
 
-#. Create the submenu and insert it in the right section
-#: ../src/frogr-main-view.c:1070
+#: src/frogr-main-view.c:1070
 msgid "Accounts"
 msgstr "Contas"
 
-#. String showind the date and time a picture was taken
-#: ../src/frogr-main-view.c:1410
+#: src/frogr-main-view.c:1410
 #, c-format
 msgid "Taken: %s"
 msgstr "Tirada: %s"
 
-#: ../src/frogr-main-view.c:1415
+#: src/frogr-main-view.c:1415
 #, c-format
 msgid "File size: %s"
 msgstr "Tamanho: %s"
 
-#: ../src/frogr-main-view.c:1540
+#: src/frogr-main-view.c:1540
 msgid "Select File"
 msgstr "Selecionar ficheiro"
 
-#: ../src/frogr-main-view.c:1544 ../src/frogr-main-view.c:1671
+#: src/frogr-main-view.c:1544 src/frogr-main-view.c:1671
 msgid "_Open"
 msgstr "_Abrir"
 
-#: ../src/frogr-main-view.c:1553
+#: src/frogr-main-view.c:1553
 msgid "Frogr Project Files"
 msgstr "Ficheiros de projeto Frogr"
 
-#: ../src/frogr-main-view.c:1615
+#: src/frogr-main-view.c:1615
 msgid "Select Destination"
 msgstr "Selecionar destino"
 
-#: ../src/frogr-main-view.c:1619 ../data/gtkbuilder/frogr-menu-bar.xml.h:3
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:1
+#: src/frogr-main-view.c:1619
 msgid "_Save"
 msgstr "_Gravar"
 
-#: ../src/frogr-main-view.c:1622
+#: src/frogr-main-view.c:1622
 msgid "Untitled Project.frogr"
 msgstr "Projeto sem título.frogr"
 
-#: ../src/frogr-main-view.c:1667
+#: src/frogr-main-view.c:1667
 msgid "Select a Picture"
 msgstr "Selecionar uma imagem"
 
-#: ../src/frogr-main-view.c:1694
+#: src/frogr-main-view.c:1694
 msgid "All Files"
 msgstr "Todos os ficheiros"
 
-#: ../src/frogr-main-view.c:1697
+#: src/frogr-main-view.c:1697
 msgid "Image Files"
 msgstr "Ficheiros de imagem"
 
-#: ../src/frogr-main-view.c:1701
+#: src/frogr-main-view.c:1701
 msgid "Video Files"
 msgstr "Ficheiros de vídeo"
 
-#: ../src/frogr-main-view.c:1723
+#: src/frogr-main-view.c:1723
 msgid "You don't have any picture added yet"
 msgstr "Ainda não adicionou nenhuma fotografia"
 
-#: ../src/frogr-main-view.c:1736
+#: src/frogr-main-view.c:1736
 msgid "You need to select some pictures first"
 msgstr "Tem de selecionar algumas fotografias primeiro"
 
-#: ../src/frogr-main-view.c:2108
+#: src/frogr-main-view.c:2108
 msgid "Not connected to Flickr"
 msgstr "Não há ligação ao Flickr"
 
-#. Login string, showing the user is PRO (second '%s') if so.
-#: ../src/frogr-main-view.c:2118
+#: src/frogr-main-view.c:2118
 #, c-format
 msgid "Connected as %s%s"
 msgstr "Ligação como %s%s"
 
-#: ../src/frogr-main-view.c:2119
+#: src/frogr-main-view.c:2119
 msgid " (PRO account)"
 msgstr "(conta PRO)"
 
-#. Will show in the status bar the amount of data (in KB, MB
-#. or GB) the user is currently allowed to upload to flicker
-#. till the end of the month, in a CURRENT / MAX fashion.
-#. The '-' at the beginning is just a separator, since more
-#. blocks of text will be shown in the status bar too.
-#: ../src/frogr-main-view.c:2143
+#: src/frogr-main-view.c:2143
 #, c-format
 msgid " - %s / %s remaining"
 msgstr " - %s/%s restantes"
 
-#. Will show in the status bar the amount of pictures and data
-#. (in KB, MB or GB) that would be uploaded as the sum of the
-#. sizes for every picture loaded in the application
-#: ../src/frogr-main-view.c:2169
+#: src/frogr-main-view.c:2169
 #, c-format
 msgid " - %d file to upload (%s)"
 msgid_plural " - %d files to upload (%s)"
 msgstr[0] " - %d ficheiro a enviar (%s)"
 msgstr[1] " - %d ficheiros a enviar (%s)"
 
-#: ../src/frogr-settings-dialog.c:185
+#: src/frogr-settings-dialog.c:185
 msgid "Default Visibility"
 msgstr "Visibilidade predefinida"
 
-#: ../src/frogr-settings-dialog.c:224
+#: src/frogr-settings-dialog.c:224
 msgid "Default Content Type"
 msgstr "Tipo de conteúdo predefinido"
 
-#: ../src/frogr-settings-dialog.c:250
+#: src/frogr-settings-dialog.c:250
 msgid "Default Safety Level"
 msgstr "Nível de segurança predefinido"
 
-#: ../src/frogr-settings-dialog.c:276
+#: src/frogr-settings-dialog.c:276
 msgid "Default License"
 msgstr "Licença predefinida"
 
-#: ../src/frogr-settings-dialog.c:302
+#: src/frogr-settings-dialog.c:302
 msgid "Other Defaults"
 msgstr "Outras predefinições"
 
-#: ../src/frogr-settings-dialog.c:312
+#: src/frogr-settings-dialog.c:312
 msgid "_Show Pictures in Global Search Results"
 msgstr "_Mostrar imagens nos resultados globais de procura"
 
-#: ../src/frogr-settings-dialog.c:315
+#: src/frogr-settings-dialog.c:315
 msgid "Set Geo_location Information for Pictures"
 msgstr "Definir informação de localização geográfica nas imagens"
 
-#: ../src/frogr-settings-dialog.c:318
+#: src/frogr-settings-dialog.c:318
 msgid "Replace 'Date Posted' with 'Date Taken' for Pictures"
 msgstr "Substituir \"Data de publicação\" por \"Data tirada\" nas imagens"
 
-#: ../src/frogr-settings-dialog.c:324
+#: src/frogr-settings-dialog.c:324
 msgid "_General"
 msgstr "_Geral"
 
-#: ../src/frogr-settings-dialog.c:344
+#: src/frogr-settings-dialog.c:344
 msgid "Proxy Settings"
 msgstr "Definições de proxy"
 
-#. Enable proxy
-#: ../src/frogr-settings-dialog.c:353
+#: src/frogr-settings-dialog.c:353
 msgid "_Enable HTTP Proxy"
 msgstr "_Ativar proxy HTTP"
 
-#: ../src/frogr-settings-dialog.c:363
+#: src/frogr-settings-dialog.c:363
 msgid "_Host:"
 msgstr "_Máquina:"
 
-#. Proxy port
-#: ../src/frogr-settings-dialog.c:376
+#: src/frogr-settings-dialog.c:376
 msgid "_Port:"
 msgstr "_Porta:"
 
-#. Proxy username
-#: ../src/frogr-settings-dialog.c:389
+#: src/frogr-settings-dialog.c:389
 msgid "U_sername:"
 msgstr "_Utilizador"
 
-#. Proxy password
-#: ../src/frogr-settings-dialog.c:402
+#: src/frogr-settings-dialog.c:402
 msgid "Pass_word:"
 msgstr "_Senha:"
 
-#: ../src/frogr-settings-dialog.c:426
+#: src/frogr-settings-dialog.c:426
 msgid "Connec_tion"
 msgstr "_Ligação"
 
-#: ../src/frogr-settings-dialog.c:444
+#: src/frogr-settings-dialog.c:444
 msgid "Other options"
 msgstr "Outras opções"
 
-#: ../src/frogr-settings-dialog.c:454
+#: src/frogr-settings-dialog.c:454
 msgid "Ena_ble Tags Auto-Completion"
 msgstr "_Ativar conclusão automática de etiquetas"
 
-#: ../src/frogr-settings-dialog.c:457
+#: src/frogr-settings-dialog.c:457
 msgid "_Import Tags from Pictures Metadata"
 msgstr "_Importar etiquetas dos metadados da imagem"
 
-#: ../src/frogr-settings-dialog.c:461
+#: src/frogr-settings-dialog.c:461
 msgid "Use _Dark GTK Theme"
 msgstr "Usar tema _Dark do GTK"
 
-#: ../src/frogr-settings-dialog.c:465
+#: src/frogr-settings-dialog.c:465
 msgid "_Keep File Extensions in Titles when Loading"
 msgstr "_Manter extensões de ficheiros nos títulos ao carregar"
 
-#: ../src/frogr-settings-dialog.c:471
+#: src/frogr-settings-dialog.c:471
 msgid "_Misc"
 msgstr "_Diversos"
 
-#: ../src/frogr-settings-dialog.c:972
+#: src/frogr-settings-dialog.c:972
 msgid "Preferences"
 msgstr "Preferências"
 
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:1
-msgid "Aut_horize Account…"
-msgstr "Autorizar _Conta…"
-
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:2
-msgid "_Preferences…"
-msgstr "_Preferências…"
-
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:3
-msgid "_Help"
-msgstr "A_Juda"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:1
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:9
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:3
-msgid "_Edit Details…"
-msgstr "_Editar detalhes…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:2
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:10
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:4
-msgid "Add _Tags…"
-msgstr "Adicionar _Etiquetas"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:3
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:11
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:5
-msgid "Add to _Group…"
-msgstr "Adicionar a _Grupo…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:4
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:12
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:6
-msgid "Add to _Photoset"
-msgstr "Adicionar a _Cenário…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:5
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:13
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:7
-msgid "_Add to Existing Photoset…"
-msgstr "_Adicionar a cenário existente…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:6
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:14
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:8
-msgid "_Create New Photoset…"
-msgstr "_Criar novo cenário…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:7
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:15
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:16
-msgid "_Open in External Viewer"
-msgstr "_Abrir em visualizador externo"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:8
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:6
-msgid "_Remove Elements"
-msgstr "_Remover elementos"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:1
-msgid "_File"
-msgstr "_Ficheiro"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:2
-msgid "_Open…"
-msgstr ":Abrir…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:4
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:2
-msgid "Save _As…"
-msgstr "Gravar _Como"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:5
-msgid "A_dd Elements…"
-msgstr "A_Dicionar elementos"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:7
-msgid "_Upload All"
-msgstr "_Enviar tudo"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:16
-msgid "_View"
-msgstr "_Ver"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:17
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:9
-msgid "_Sort Elements"
-msgstr "_Ordenar elementos"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:18
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:10
-msgid "As _Loaded"
-msgstr "_Como carregados"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:19
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:11
-msgid "By _Date Taken"
-msgstr "Por _Data tirada"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:20
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:12
-msgid "By _Title"
-msgstr "Por _Título"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:21
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:13
-msgid "By _Size"
-msgstr "Por t_Amanho"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:22
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:14
-msgid "_Reversed Order"
-msgstr "Ordem _Inversa"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:23
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:15
-msgid "Enable _Tooltips"
-msgstr "Ativar _Sugestões"
+#~ msgid "Aut_horize Account…"
+#~ msgstr "Autorizar _Conta…"
+
+#~ msgid "_Preferences…"
+#~ msgstr "_Preferências…"
+
+#~ msgid "_Help"
+#~ msgstr "A_Juda"
+
+#~ msgid "_Edit Details…"
+#~ msgstr "_Editar detalhes…"
+
+#~ msgid "Add _Tags…"
+#~ msgstr "Adicionar _Etiquetas"
+
+#~ msgid "Add to _Group…"
+#~ msgstr "Adicionar a _Grupo…"
+
+#~ msgid "Add to _Photoset"
+#~ msgstr "Adicionar a _Cenário…"
+
+#~ msgid "_Add to Existing Photoset…"
+#~ msgstr "_Adicionar a cenário existente…"
+
+#~ msgid "_Create New Photoset…"
+#~ msgstr "_Criar novo cenário…"
+
+#~ msgid "_Open in External Viewer"
+#~ msgstr "_Abrir em visualizador externo"
+
+#~ msgid "_Remove Elements"
+#~ msgstr "_Remover elementos"
+
+#~ msgid "_File"
+#~ msgstr "_Ficheiro"
+
+#~ msgid "_Open…"
+#~ msgstr ":Abrir…"
+
+#~ msgid "Save _As…"
+#~ msgstr "Gravar _Como"
+
+#~ msgid "A_dd Elements…"
+#~ msgstr "A_Dicionar elementos"
+
+#~ msgid "_Upload All"
+#~ msgstr "_Enviar tudo"
+
+#~ msgid "_View"
+#~ msgstr "_Ver"
+
+#~ msgid "_Sort Elements"
+#~ msgstr "_Ordenar elementos"
+
+#~ msgid "As _Loaded"
+#~ msgstr "_Como carregados"
+
+#~ msgid "By _Date Taken"
+#~ msgstr "Por _Data tirada"
+
+#~ msgid "By _Title"
+#~ msgstr "Por _Título"
+
+#~ msgid "By _Size"
+#~ msgstr "Por t_Amanho"
+
+#~ msgid "_Reversed Order"
+#~ msgstr "Ordem _Inversa"
+
+#~ msgid "Enable _Tooltips"
+#~ msgstr "Ativar _Sugestões"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 8bd4ae4..328f3f2 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -10,9 +10,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: frogr\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=frogr&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-01-22 18:06+0000\n"
+"Report-Msgid-Bugs-To: msanchez gnome org\n"
+"POT-Creation-Date: 2016-08-12 13:09+0100\n"
 "PO-Revision-Date: 2016-02-29 06:48-0300\n"
 "Last-Translator: Rafael Fontenelle <rffontenelle gmail com>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list gnome org>\n"
@@ -24,7 +23,16 @@ msgstr ""
 "X-Generator: Poedit 1.8.7\n"
 "X-Project-Style: gnome\n"
 
-#: ../data/frogr.appdata.xml.in.h:1
+#: data/frogr.appdata.xml.in:5 data/frogr.desktop.in.in:5
+#: data/frogr.desktop.in.in:14
+msgid "frogr"
+msgstr "frogr"
+
+#: data/frogr.appdata.xml.in:6 data/frogr.desktop.in.in:6
+msgid "frogr: a Flickr Remote Organizer for GNOME"
+msgstr "frogr: um organizador remoto do Flickr para o GNOME"
+
+#: data/frogr.appdata.xml.in:8
 msgid ""
 "frogr is a small application for the GNOME desktop that allows users to "
 "manage their accounts in the Flickr image hosting website."
@@ -32,7 +40,7 @@ msgstr ""
 "Frogr é um pequeno aplicativo para o ambiente do GNOME que permite que "
 "usuários gerenciem suas contas no site de hospedagem de imagens Flickr."
 
-#: ../data/frogr.appdata.xml.in.h:2
+#: data/frogr.appdata.xml.in:13
 msgid ""
 "It supports all the basic Flickr features, including uploading pictures, "
 "adding descriptions, setting tags and managing sets and groups pools."
@@ -41,31 +49,27 @@ msgstr ""
 "envio de imagens, adição de descrições, definição de tags e gerenciamento de "
 "conjuntos e grupos."
 
-#: ../data/frogr.appdata.xml.in.h:3
+#: data/frogr.appdata.xml.in:24
 msgid "Screenshot of frogr"
 msgstr "Captura de tela do frogr"
 
-#: ../data/frogr.desktop.in.in.h:1
-msgid "frogr"
-msgstr "frogr"
-
-#: ../data/frogr.desktop.in.in.h:2
-msgid "frogr: a Flickr Remote Organizer for GNOME"
-msgstr "frogr: um organizador remoto do Flickr para o GNOME"
+#: data/frogr.appdata.xml.in:29
+msgid "Mario Sanchez Prada"
+msgstr ""
 
-#: ../data/frogr.desktop.in.in.h:3
+#: data/frogr.desktop.in.in:7
 msgid "Upload and organize photos in Flickr accounts"
 msgstr "Envie e organize fotos em contas do Flickr"
 
-#: ../data/frogr.desktop.in.in.h:4
+#: data/frogr.desktop.in.in:8
 msgid "Flickr;Image;Picture;Photo;Video;Uploader;"
 msgstr "Flickr;Imagem;Image;Picture;Foto;Photo;Vídeo;Video;Enviar;Uploader;"
 
-#: ../src/frogr-about-dialog.c:43
+#: src/frogr-about-dialog.c:43
 msgid "A Flickr Remote Organizer for GNOME\n"
 msgstr "Um organizador remoto do Flickr para GNOME\n"
 
-#: ../src/frogr-about-dialog.c:72
+#: src/frogr-about-dialog.c:72
 msgid "translator-credits"
 msgstr ""
 "Mateus Zenaide <matzenh gmail com>\n"
@@ -73,49 +77,48 @@ msgstr ""
 "Gabriel F. Vilar <cogumm gmail com>\n"
 "Rafael Ferreira <rafael f f1 gmail com>"
 
-#: ../src/frogr-add-tags-dialog.c:191 ../src/frogr-add-to-group-dialog.c:528
-#: ../src/frogr-add-to-set-dialog.c:529 ../src/frogr-auth-dialog.c:153
-#: ../src/frogr-create-new-set-dialog.c:310 ../src/frogr-details-dialog.c:1168
-#: ../src/frogr-main-view.c:1543 ../src/frogr-main-view.c:1618
-#: ../src/frogr-main-view.c:1670 ../src/frogr-settings-dialog.c:930
+#: src/frogr-add-tags-dialog.c:191 src/frogr-add-to-group-dialog.c:528
+#: src/frogr-add-to-set-dialog.c:529 src/frogr-auth-dialog.c:153
+#: src/frogr-create-new-set-dialog.c:310 src/frogr-details-dialog.c:1168
+#: src/frogr-main-view.c:1543 src/frogr-main-view.c:1618
+#: src/frogr-main-view.c:1670 src/frogr-settings-dialog.c:930
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../src/frogr-add-tags-dialog.c:193 ../src/frogr-add-to-group-dialog.c:530
-#: ../src/frogr-add-to-set-dialog.c:531
-#: ../src/frogr-create-new-set-dialog.c:312
+#: src/frogr-add-tags-dialog.c:193 src/frogr-add-to-group-dialog.c:530
+#: src/frogr-add-to-set-dialog.c:531 src/frogr-create-new-set-dialog.c:312
 msgid "_Add"
 msgstr "_Adicionar"
 
-#: ../src/frogr-add-tags-dialog.c:202
+#: src/frogr-add-tags-dialog.c:202
 msgid "Enter a spaces separated list of tags:"
 msgstr "Digite uma lista de tags separadas por espaços:"
 
-#: ../src/frogr-add-tags-dialog.c:228
+#: src/frogr-add-tags-dialog.c:228
 msgid "Add Tags"
 msgstr "Adicionar tags"
 
-#: ../src/frogr-add-to-group-dialog.c:147
+#: src/frogr-add-to-group-dialog.c:147
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/frogr-add-to-group-dialog.c:162 ../src/frogr-add-to-set-dialog.c:163
+#: src/frogr-add-to-group-dialog.c:162 src/frogr-add-to-set-dialog.c:163
 msgid "Elements"
 msgstr "Elementos"
 
-#: ../src/frogr-add-to-group-dialog.c:581
+#: src/frogr-add-to-group-dialog.c:581
 msgid "Add to Groups"
 msgstr "Adicionar aos grupos"
 
-#: ../src/frogr-add-to-set-dialog.c:148
+#: src/frogr-add-to-set-dialog.c:148
 msgid "Title"
 msgstr "Título"
 
-#: ../src/frogr-add-to-set-dialog.c:582
+#: src/frogr-add-to-set-dialog.c:582
 msgid "Add to Sets"
 msgstr "Adicionar aos conjuntos"
 
-#: ../src/frogr-auth-dialog.c:59
+#: src/frogr-auth-dialog.c:59
 #, c-format
 msgid ""
 "Please press the button to authorize %s and then come back to complete the "
@@ -124,30 +127,29 @@ msgstr ""
 "Por favor, pressione o botão para autorizar o %s e, então, volte para esta "
 "tela para concluir o processo."
 
-#: ../src/frogr-auth-dialog.c:63 ../src/frogr-auth-dialog.c:149
-#: ../src/frogr-controller.c:2286
+#: src/frogr-auth-dialog.c:63 src/frogr-auth-dialog.c:149
+#: src/frogr-controller.c:2286
 #, c-format
 msgid "Authorize %s"
 msgstr "Autorizar o %s"
 
-#: ../src/frogr-auth-dialog.c:155 ../src/frogr-settings-dialog.c:932
+#: src/frogr-auth-dialog.c:155 src/frogr-settings-dialog.c:932
 msgid "_Close"
 msgstr "Fe_char"
 
-#. Description label
-#: ../src/frogr-auth-dialog.c:167
+#: src/frogr-auth-dialog.c:167
 msgid "Enter verification code:"
 msgstr "Digite o código de verificação:"
 
-#: ../src/frogr-auth-dialog.c:221
+#: src/frogr-auth-dialog.c:221
 msgid "Invalid verification code"
 msgstr "Código de verificação inválido"
 
-#: ../src/frogr-controller.c:581
+#: src/frogr-controller.c:581
 msgid "Process cancelled"
 msgstr "Processo cancelado"
 
-#: ../src/frogr-controller.c:586
+#: src/frogr-controller.c:586
 msgid ""
 "Connection error:\n"
 "Network not available"
@@ -155,7 +157,7 @@ msgstr ""
 "Erro de conexão:\n"
 "Rede não disponível"
 
-#: ../src/frogr-controller.c:590
+#: src/frogr-controller.c:590
 msgid ""
 "Connection error:\n"
 "Bad request"
@@ -163,7 +165,7 @@ msgstr ""
 "Erro de conexão:\n"
 "Requisição inválida"
 
-#: ../src/frogr-controller.c:594
+#: src/frogr-controller.c:594
 msgid ""
 "Connection error:\n"
 "Server-side error"
@@ -171,7 +173,7 @@ msgstr ""
 "Erro de conexão:\n"
 "Erro do lado do servidor"
 
-#: ../src/frogr-controller.c:598
+#: src/frogr-controller.c:598
 msgid ""
 "Error uploading:\n"
 "File invalid"
@@ -179,7 +181,7 @@ msgstr ""
 "Erro ao enviar:\n"
 "Arquivo inválido"
 
-#: ../src/frogr-controller.c:602
+#: src/frogr-controller.c:602
 msgid ""
 "Error uploading picture:\n"
 "Quota exceeded"
@@ -187,14 +189,14 @@ msgstr ""
 "Erro ao enviar imagem:\n"
 "Cota excedida"
 
-#: ../src/frogr-controller.c:607
+#: src/frogr-controller.c:607
 #, c-format
 msgid "Quota exceeded (limit: %d video per month)"
 msgid_plural "Quota exceeded (limit: %d videos per month)"
 msgstr[0] "Cota foi excedida (limite: %d vídeo por mês)"
 msgstr[1] "Cota foi excedida (limite: %d vídeos por mês)"
 
-#: ../src/frogr-controller.c:611
+#: src/frogr-controller.c:611
 msgid ""
 "Error uploading video:\n"
 "You can't upload more videos with this account"
@@ -202,7 +204,7 @@ msgstr ""
 "Erro ao enviar de vídeo:\n"
 "Você não pode enviar mais vídeos com esta conta"
 
-#: ../src/frogr-controller.c:617
+#: src/frogr-controller.c:617
 msgid ""
 "Error:\n"
 "Photo not found"
@@ -210,7 +212,7 @@ msgstr ""
 "Erro:\n"
 "Foto não encontrada"
 
-#: ../src/frogr-controller.c:621
+#: src/frogr-controller.c:621
 msgid ""
 "Error:\n"
 "Photo already in photoset"
@@ -218,7 +220,7 @@ msgstr ""
 "Erro:\n"
 "Foto já existe no conjunto de fotos"
 
-#: ../src/frogr-controller.c:625
+#: src/frogr-controller.c:625
 msgid ""
 "Error:\n"
 "Photo already in group"
@@ -226,7 +228,7 @@ msgstr ""
 "Erro:\n"
 "Foto já existe no grupo"
 
-#: ../src/frogr-controller.c:629
+#: src/frogr-controller.c:629
 msgid ""
 "Error:\n"
 "Photo already in the maximum number of groups possible"
@@ -234,7 +236,7 @@ msgstr ""
 "Erro:\n"
 "A foto já alcançou o número máximo de grupos possíveis"
 
-#: ../src/frogr-controller.c:633
+#: src/frogr-controller.c:633
 msgid ""
 "Error:\n"
 "Group limit already reached"
@@ -242,7 +244,7 @@ msgstr ""
 "Erro:\n"
 "Alcançado o limite do grupo"
 
-#: ../src/frogr-controller.c:637
+#: src/frogr-controller.c:637
 msgid ""
 "Error:\n"
 "Photo added to group's queue"
@@ -250,7 +252,7 @@ msgstr ""
 "Erro:\n"
 "Foto adicionada à fila do grupo"
 
-#: ../src/frogr-controller.c:641
+#: src/frogr-controller.c:641
 msgid ""
 "Error:\n"
 "Photo already added to group's queue"
@@ -258,7 +260,7 @@ msgstr ""
 "Erro:\n"
 "Foto já adicionada à fila do grupo"
 
-#: ../src/frogr-controller.c:645
+#: src/frogr-controller.c:645
 msgid ""
 "Error:\n"
 "Content not allowed for this group"
@@ -266,8 +268,7 @@ msgstr ""
 "Erro:\n"
 "Conteúdo não permitido para este grupo"
 
-#: ../src/frogr-controller.c:649
-#, c-format
+#: src/frogr-controller.c:649
 msgid ""
 "Authorization failed.\n"
 "Please try again"
@@ -275,7 +276,7 @@ msgstr ""
 "Falha na autorização.\n"
 "Por favor, tente novamente"
 
-#: ../src/frogr-controller.c:655
+#: src/frogr-controller.c:655
 #, c-format
 msgid ""
 "Error\n"
@@ -286,8 +287,7 @@ msgstr ""
 "%s não está devidamente autorizado a enviar imagens para o Flickr.\n"
 "Por favor, reautorize-o."
 
-#: ../src/frogr-controller.c:660
-#, c-format
+#: src/frogr-controller.c:660
 msgid ""
 "Unable to authenticate in Flickr\n"
 "Please try again."
@@ -295,7 +295,7 @@ msgstr ""
 "Falha na autorização com o Flickr\n"
 "Por favor, tente novamente."
 
-#: ../src/frogr-controller.c:664
+#: src/frogr-controller.c:664
 #, c-format
 msgid ""
 "You have not properly authorized %s yet.\n"
@@ -304,8 +304,7 @@ msgstr ""
 "Você ainda não autorizou de forma apropriada %s.\n"
 "Por favor, tente novamente."
 
-#: ../src/frogr-controller.c:669
-#, c-format
+#: src/frogr-controller.c:669
 msgid ""
 "Invalid verification code.\n"
 "Please try again."
@@ -313,8 +312,7 @@ msgstr ""
 "Código de verificação inválido.\n"
 "Por favor, tente novamente."
 
-#: ../src/frogr-controller.c:673
-#, c-format
+#: src/frogr-controller.c:673
 msgid ""
 "Error:\n"
 "Service not available"
@@ -322,64 +320,62 @@ msgstr ""
 "Erro:\n"
 "Serviço não disponível"
 
-#. General error: just dump the raw error description
-#: ../src/frogr-controller.c:678
+#: src/frogr-controller.c:678
 #, c-format
 msgid "An error happened: %s."
 msgstr "Um erro ocorreu: %s."
 
-#: ../src/frogr-controller.c:883
+#: src/frogr-controller.c:883
 msgid "Authorization failed (timed out)"
 msgstr "Falha ao autorizar (tempo expirado)"
 
-#: ../src/frogr-controller.c:931
+#: src/frogr-controller.c:931
 #, c-format
 msgid "Retrying Upload (attempt %d/%d)…"
 msgstr "Tentando enviar novamente (tentativa %d/%d)…"
 
-#: ../src/frogr-controller.c:936
+#: src/frogr-controller.c:936
 #, c-format
 msgid "Uploading '%s'…"
 msgstr "Enviando \"%s\"…"
 
-#: ../src/frogr-controller.c:2242
+#: src/frogr-controller.c:2242
 msgid "Updating credentials…"
 msgstr "Atualizando credenciais..."
 
-#: ../src/frogr-controller.c:2247
+#: src/frogr-controller.c:2247
 msgid "Retrieving data for authorization…"
 msgstr "Obtendo dados para autorização…"
 
-#: ../src/frogr-controller.c:2252
+#: src/frogr-controller.c:2252
 msgid "Finishing authorization…"
 msgstr "Finalizando autorização…"
 
-#: ../src/frogr-controller.c:2257
+#: src/frogr-controller.c:2257
 msgid "Retrieving list of sets…"
 msgstr "Obtendo lista de conjuntos…"
 
-#: ../src/frogr-controller.c:2262
+#: src/frogr-controller.c:2262
 msgid "Retrieving list of groups…"
 msgstr "Obtendo lista dos grupos…"
 
-#: ../src/frogr-controller.c:2267
+#: src/frogr-controller.c:2267
 msgid "Retrieving list of tags…"
 msgstr "Obtendo lista de tags…"
 
-#: ../src/frogr-controller.c:2292
-#, c-format
+#: src/frogr-controller.c:2292
 msgid "Fetching information"
 msgstr "Obtendo informações"
 
-#: ../src/frogr-controller.c:2398
+#: src/frogr-controller.c:2398
 msgid "No sets found"
 msgstr "Sem conjuntos encontrados"
 
-#: ../src/frogr-controller.c:2423
+#: src/frogr-controller.c:2423
 msgid "No groups found"
 msgstr "Sem grupos encontrados"
 
-#: ../src/frogr-controller.c:2984
+#: src/frogr-controller.c:2984
 #, c-format
 msgid ""
 "You need to properly authorize %s before uploading any pictures to Flickr.\n"
@@ -389,188 +385,184 @@ msgstr ""
 "para o Flickr.\n"
 "Por favor, autorize-o novamente."
 
-#: ../src/frogr-controller.c:2994
-#, c-format
+#: src/frogr-controller.c:2994
 msgid "You need to be connected before uploading any pictures to Flickr."
 msgstr ""
 "Você precisa estar conectado antes do envio de qualquer imagem para o Flickr."
 
-#: ../src/frogr-controller.c:3012
+#: src/frogr-controller.c:3012
 msgid "Uploading Pictures"
 msgstr "Enviando fotos"
 
-#: ../src/frogr-controller.c:3057
-#, c-format
+#: src/frogr-controller.c:3057
 msgid "Error opening project file"
 msgstr "Erro ao abrir arquivo de projeto"
 
-#. This shows a dialog notifying the problem to the user
-#: ../src/frogr-create-new-set-dialog.c:143 ../src/frogr-details-dialog.c:1001
+#: src/frogr-create-new-set-dialog.c:143 src/frogr-details-dialog.c:1001
 msgid "Missing data required"
 msgstr "Faltando dados necessários"
 
-#: ../src/frogr-create-new-set-dialog.c:326
+#: src/frogr-create-new-set-dialog.c:326
 msgid "Title:"
 msgstr "Título:"
 
-#: ../src/frogr-create-new-set-dialog.c:335
+#: src/frogr-create-new-set-dialog.c:335
 msgid "Description:"
 msgstr "Descrição:"
 
-#: ../src/frogr-create-new-set-dialog.c:356
+#: src/frogr-create-new-set-dialog.c:356
 msgid "Fill Pictures Details with Title and Description"
 msgstr "Preencher detalhes das imagens com título e descrição"
 
-#: ../src/frogr-create-new-set-dialog.c:381
+#: src/frogr-create-new-set-dialog.c:381
 msgid "Create New Set"
 msgstr "Criar um novo conjunto"
 
-#: ../src/frogr-details-dialog.c:89 ../src/frogr-settings-dialog.c:97
+#: src/frogr-details-dialog.c:89 src/frogr-settings-dialog.c:97
 msgid "Default (as specified in Flickr)"
 msgstr "Padrão (como especificado no Flickr)"
 
-#: ../src/frogr-details-dialog.c:90 ../src/frogr-settings-dialog.c:98
+#: src/frogr-details-dialog.c:90 src/frogr-settings-dialog.c:98
 msgid "All rights reserved"
 msgstr "Todos os direitos reservados"
 
-#: ../src/frogr-details-dialog.c:91 ../src/frogr-settings-dialog.c:99
+#: src/frogr-details-dialog.c:91 src/frogr-settings-dialog.c:99
 msgid "CC Attribution-NonCommercial-ShareAlike"
 msgstr "CC Atribuição-NãoComercial-Compartilhamento pela mesma licença"
 
-#: ../src/frogr-details-dialog.c:92 ../src/frogr-settings-dialog.c:100
+#: src/frogr-details-dialog.c:92 src/frogr-settings-dialog.c:100
 msgid "CC Attribution-NonCommercial"
 msgstr "CC Atribuição-NãoComercial"
 
-#: ../src/frogr-details-dialog.c:93 ../src/frogr-settings-dialog.c:101
+#: src/frogr-details-dialog.c:93 src/frogr-settings-dialog.c:101
 msgid "CC Attribution-NonCommercial-NoDerivs"
 msgstr "CC Atribuição-NãoComercial-NãoDerivados"
 
-#: ../src/frogr-details-dialog.c:94 ../src/frogr-settings-dialog.c:102
+#: src/frogr-details-dialog.c:94 src/frogr-settings-dialog.c:102
 msgid "CC Attribution"
 msgstr "Atribuição CC"
 
-#: ../src/frogr-details-dialog.c:95 ../src/frogr-settings-dialog.c:103
+#: src/frogr-details-dialog.c:95 src/frogr-settings-dialog.c:103
 msgid "CC Attribution-ShareAlike"
 msgstr "CC Atribuição-Compartilhamento pela mesma licença"
 
-#: ../src/frogr-details-dialog.c:96 ../src/frogr-settings-dialog.c:104
+#: src/frogr-details-dialog.c:96 src/frogr-settings-dialog.c:104
 msgid "CC Attribution-NoDerivs"
 msgstr "CC Atribuição-NãoDerivados"
 
-#: ../src/frogr-details-dialog.c:172
+#: src/frogr-details-dialog.c:172
 msgid "Open with image viewer"
 msgstr "Abrir com o visualizador de imagem"
 
-#: ../src/frogr-details-dialog.c:190
+#: src/frogr-details-dialog.c:190
 msgid "_Title:"
 msgstr "_Título:"
 
-#: ../src/frogr-details-dialog.c:200
+#: src/frogr-details-dialog.c:200
 msgid "_Description:"
 msgstr "_Descrição:"
 
-#: ../src/frogr-details-dialog.c:224
+#: src/frogr-details-dialog.c:224
 msgid "Ta_gs:"
 msgstr "Ta_gs:"
 
-#: ../src/frogr-details-dialog.c:247
+#: src/frogr-details-dialog.c:247
 msgid "Visibility"
 msgstr "Visibilidade"
 
-#: ../src/frogr-details-dialog.c:257 ../src/frogr-settings-dialog.c:196
+#: src/frogr-details-dialog.c:257 src/frogr-settings-dialog.c:196
 msgid "_Private"
 msgstr "Pr_ivado"
 
-#: ../src/frogr-details-dialog.c:261 ../src/frogr-settings-dialog.c:199
+#: src/frogr-details-dialog.c:261 src/frogr-settings-dialog.c:199
 msgid "P_ublic"
 msgstr "_Público"
 
-#: ../src/frogr-details-dialog.c:270 ../src/frogr-settings-dialog.c:207
+#: src/frogr-details-dialog.c:270 src/frogr-settings-dialog.c:207
 msgid "_Family"
 msgstr "_Família"
 
-#: ../src/frogr-details-dialog.c:274 ../src/frogr-settings-dialog.c:209
+#: src/frogr-details-dialog.c:274 src/frogr-settings-dialog.c:209
 msgid "F_riends"
 msgstr "A_migos"
 
-#: ../src/frogr-details-dialog.c:288
+#: src/frogr-details-dialog.c:288
 msgid "Content Type"
 msgstr "Tipo de conteúdo"
 
-#: ../src/frogr-details-dialog.c:296 ../src/frogr-settings-dialog.c:234
+#: src/frogr-details-dialog.c:296 src/frogr-settings-dialog.c:234
 msgid "P_hoto"
 msgstr "_Foto"
 
-#: ../src/frogr-details-dialog.c:300 ../src/frogr-settings-dialog.c:236
+#: src/frogr-details-dialog.c:300 src/frogr-settings-dialog.c:236
 msgid "Scree_nshot"
 msgstr "_Captura de tela"
 
-#: ../src/frogr-details-dialog.c:304 ../src/frogr-settings-dialog.c:238
+#: src/frogr-details-dialog.c:304 src/frogr-settings-dialog.c:238
 msgid "Oth_er"
 msgstr "_Outro"
 
-#: ../src/frogr-details-dialog.c:317
+#: src/frogr-details-dialog.c:317
 msgid "Safety Level"
 msgstr "Nível de segurança"
 
-#: ../src/frogr-details-dialog.c:325 ../src/frogr-settings-dialog.c:260
+#: src/frogr-details-dialog.c:325 src/frogr-settings-dialog.c:260
 msgid "S_afe"
 msgstr "_Seguro"
 
-#: ../src/frogr-details-dialog.c:329 ../src/frogr-settings-dialog.c:262
+#: src/frogr-details-dialog.c:329 src/frogr-settings-dialog.c:262
 msgid "_Moderate"
 msgstr "_Moderado"
 
-#: ../src/frogr-details-dialog.c:333 ../src/frogr-settings-dialog.c:264
+#: src/frogr-details-dialog.c:333 src/frogr-settings-dialog.c:264
 msgid "Restr_icted"
 msgstr "_Restrito"
 
-#: ../src/frogr-details-dialog.c:345
+#: src/frogr-details-dialog.c:345
 msgid "License Type"
 msgstr "Tipo de licença"
 
-#: ../src/frogr-details-dialog.c:367
+#: src/frogr-details-dialog.c:367
 msgid "Other Properties"
 msgstr "Outras propriedades"
 
-#: ../src/frogr-details-dialog.c:375
+#: src/frogr-details-dialog.c:375
 msgid "_Show Up in Global Search Results"
 msgstr "_Exibir nos resultados da pesquisa global"
 
-#: ../src/frogr-details-dialog.c:379
+#: src/frogr-details-dialog.c:379
 msgid "Set Geo_location Information"
 msgstr "Definir informações de geo_localização"
 
-#: ../src/frogr-details-dialog.c:383
+#: src/frogr-details-dialog.c:383
 msgid "Replace 'Date Posted' with 'Date Taken'"
 msgstr "Substituir \"Data postada\" com \"Data tirada\""
 
-#. Visually indicate how many pictures are being edited
-#: ../src/frogr-details-dialog.c:475
+#: src/frogr-details-dialog.c:475
 #, c-format
 msgid "(%d Picture)"
 msgid_plural "(%d Pictures)"
 msgstr[0] "(%d imagem)"
 msgstr[1] "(%d imagens)"
 
-#: ../src/frogr-details-dialog.c:548
+#: src/frogr-details-dialog.c:548
 msgid "An error happened trying to load the picture"
 msgstr "Um erro ocorreu ao tentar carregar a imagem"
 
-#: ../src/frogr-details-dialog.c:1169 ../data/gtkbuilder/frogr-menu-bar.xml.h:8
+#: src/frogr-details-dialog.c:1169
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../src/frogr-details-dialog.c:1197
+#: src/frogr-details-dialog.c:1197
 msgid "Edit Picture Details"
 msgstr "Editar detalhes da imagem"
 
-#: ../src/frogr-file-loader.c:142
+#: src/frogr-file-loader.c:142
 #, c-format
 msgid "Loading files %d / %d"
 msgstr "Carregando imagens %d / %d"
 
-#: ../src/frogr-file-loader.c:369
+#: src/frogr-file-loader.c:369
 #, c-format
 msgid ""
 "Unable to load picture %s:\n"
@@ -579,7 +571,7 @@ msgstr ""
 "Não foi possível carregar imagem %s:\n"
 "%s"
 
-#: ../src/frogr-file-loader.c:400
+#: src/frogr-file-loader.c:400
 #, c-format
 msgid ""
 "Unable to load video %s\n"
@@ -588,10 +580,7 @@ msgstr ""
 "Não foi possível carregar vídeo %s\n"
 "Por favor, verifique se você tem o codec correto instalado"
 
-#. First %s is the title of the picture (filename of the file by
-#. default). Second %s is the max allowed size for a picture to be
-#. uploaded to flickr (different for free and PRO accounts).
-#: ../src/frogr-file-loader.c:636
+#: src/frogr-file-loader.c:636
 #, c-format
 msgid ""
 "Can't load file %s:\n"
@@ -600,370 +589,304 @@ msgstr ""
 "Não foi possível carregar arquivo %s:\n"
 "Tamanho do arquivo é maior que o máximo permitido por esta conta (%s)"
 
-#. First create the left side buttons
-#: ../src/frogr-main-view.c:630 ../src/frogr-main-view.c:726
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
 msgid "Open"
 msgstr "Abrir"
 
-#: ../src/frogr-main-view.c:630 ../src/frogr-main-view.c:726
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
 msgid "Open Existing Project"
 msgstr "Abre um projeto existente"
 
-#: ../src/frogr-main-view.c:631 ../src/frogr-main-view.c:729
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
 msgid "Add"
 msgstr "Adicionar"
 
-#: ../src/frogr-main-view.c:631 ../src/frogr-main-view.c:729
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
 msgid "Add Elements"
 msgstr "Adicionar elementos"
 
-#: ../src/frogr-main-view.c:632 ../src/frogr-main-view.c:730
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
 msgid "Remove"
 msgstr "Remover"
 
-#: ../src/frogr-main-view.c:632 ../src/frogr-main-view.c:730
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
 msgid "Remove Elements"
 msgstr "Remover elementos"
 
-#: ../src/frogr-main-view.c:633 ../src/frogr-main-view.c:732
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
 msgid "Upload"
 msgstr "Enviar"
 
-#: ../src/frogr-main-view.c:633 ../src/frogr-main-view.c:732
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
 msgid "Upload All"
 msgstr "_Enviar todos"
 
-#. Save project item
-#: ../src/frogr-main-view.c:666 ../src/frogr-main-view.c:727
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
 msgid "Save"
 msgstr "Salvar"
 
-#: ../src/frogr-main-view.c:666 ../src/frogr-main-view.c:727
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
 msgid "Save Current Project"
 msgstr "Salva o projeto atual"
 
-#: ../src/frogr-main-view.c:1016 ../data/gtkbuilder/frogr-app-menu.xml.h:4
+#: src/frogr-main-view.c:1016
 msgid "_About"
 msgstr "_Sobre"
 
-#: ../src/frogr-main-view.c:1020 ../data/gtkbuilder/frogr-app-menu.xml.h:5
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:17
+#: src/frogr-main-view.c:1020
 msgid "_Quit"
 msgstr "_Sair"
 
-#. Create the submenu and insert it in the right section
-#: ../src/frogr-main-view.c:1070
+#: src/frogr-main-view.c:1070
 msgid "Accounts"
 msgstr "Contas"
 
-#. String showind the date and time a picture was taken
-#: ../src/frogr-main-view.c:1410
+#: src/frogr-main-view.c:1410
 #, c-format
 msgid "Taken: %s"
 msgstr "Tirada em: %s"
 
-#: ../src/frogr-main-view.c:1415
+#: src/frogr-main-view.c:1415
 #, c-format
 msgid "File size: %s"
 msgstr "Tamanho do arquivo: %s"
 
-#: ../src/frogr-main-view.c:1540
+#: src/frogr-main-view.c:1540
 msgid "Select File"
 msgstr "Selecionar um arquivo"
 
-#: ../src/frogr-main-view.c:1544 ../src/frogr-main-view.c:1671
+#: src/frogr-main-view.c:1544 src/frogr-main-view.c:1671
 msgid "_Open"
 msgstr "_Abrir"
 
-#: ../src/frogr-main-view.c:1553
+#: src/frogr-main-view.c:1553
 msgid "Frogr Project Files"
 msgstr "Arquivos de projeto do Frogr"
 
-#: ../src/frogr-main-view.c:1615
+#: src/frogr-main-view.c:1615
 msgid "Select Destination"
 msgstr "Descrição um destino"
 
-#: ../src/frogr-main-view.c:1619 ../data/gtkbuilder/frogr-menu-bar.xml.h:3
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:1
+#: src/frogr-main-view.c:1619
 msgid "_Save"
 msgstr "_Salvar"
 
-#: ../src/frogr-main-view.c:1622
+#: src/frogr-main-view.c:1622
 msgid "Untitled Project.frogr"
 msgstr "Projeto sem nome.frogr"
 
-#: ../src/frogr-main-view.c:1667
+#: src/frogr-main-view.c:1667
 msgid "Select a Picture"
 msgstr "Selecionar uma imagem"
 
-#: ../src/frogr-main-view.c:1694
+#: src/frogr-main-view.c:1694
 msgid "All Files"
 msgstr "Todos os arquivos"
 
-#: ../src/frogr-main-view.c:1697
+#: src/frogr-main-view.c:1697
 msgid "Image Files"
 msgstr "Arquivos de imagens"
 
-#: ../src/frogr-main-view.c:1701
+#: src/frogr-main-view.c:1701
 msgid "Video Files"
 msgstr "Arquivos de vídeos"
 
-#: ../src/frogr-main-view.c:1723
+#: src/frogr-main-view.c:1723
 msgid "You don't have any picture added yet"
 msgstr "Você adicionou nenhuma imagem ainda"
 
-#: ../src/frogr-main-view.c:1736
+#: src/frogr-main-view.c:1736
 msgid "You need to select some pictures first"
 msgstr "Você precisa selecionar algumas imagens primeiro"
 
-#: ../src/frogr-main-view.c:2108
+#: src/frogr-main-view.c:2108
 msgid "Not connected to Flickr"
 msgstr "Não conectado ao Flickr"
 
-#. Login string, showing the user is PRO (second '%s') if so.
-#: ../src/frogr-main-view.c:2118
+#: src/frogr-main-view.c:2118
 #, c-format
 msgid "Connected as %s%s"
 msgstr "Conectado como %s%s"
 
-#: ../src/frogr-main-view.c:2119
+#: src/frogr-main-view.c:2119
 msgid " (PRO account)"
 msgstr "(conta PRO)"
 
-#. Will show in the status bar the amount of data (in KB, MB
-#. or GB) the user is currently allowed to upload to flicker
-#. till the end of the month, in a CURRENT / MAX fashion.
-#. The '-' at the beginning is just a separator, since more
-#. blocks of text will be shown in the status bar too.
-#: ../src/frogr-main-view.c:2143
+#: src/frogr-main-view.c:2143
 #, c-format
 msgid " - %s / %s remaining"
 msgstr " - %s / %s restante"
 
-#. Will show in the status bar the amount of pictures and data
-#. (in KB, MB or GB) that would be uploaded as the sum of the
-#. sizes for every picture loaded in the application
-#: ../src/frogr-main-view.c:2169
+#: src/frogr-main-view.c:2169
 #, c-format
 msgid " - %d file to upload (%s)"
 msgid_plural " - %d files to upload (%s)"
 msgstr[0] " - %d arquivo a ser enviado (%s)"
 msgstr[1] " - %d arquivos a serem enviados (%s)"
 
-#: ../src/frogr-settings-dialog.c:185
+#: src/frogr-settings-dialog.c:185
 msgid "Default Visibility"
 msgstr "Visibilidade padrão"
 
-#: ../src/frogr-settings-dialog.c:224
+#: src/frogr-settings-dialog.c:224
 msgid "Default Content Type"
 msgstr "Tipo de conteúdo padrão"
 
-#: ../src/frogr-settings-dialog.c:250
+#: src/frogr-settings-dialog.c:250
 msgid "Default Safety Level"
 msgstr "Nível de segurança padrão"
 
-#: ../src/frogr-settings-dialog.c:276
+#: src/frogr-settings-dialog.c:276
 msgid "Default License"
 msgstr "Licença padrão"
 
-#: ../src/frogr-settings-dialog.c:302
+#: src/frogr-settings-dialog.c:302
 msgid "Other Defaults"
 msgstr "Outros padrões"
 
-#: ../src/frogr-settings-dialog.c:312
+#: src/frogr-settings-dialog.c:312
 msgid "_Show Pictures in Global Search Results"
 msgstr "_Exibir imagens nos resultados da pesquisa global"
 
-#: ../src/frogr-settings-dialog.c:315
+#: src/frogr-settings-dialog.c:315
 msgid "Set Geo_location Information for Pictures"
 msgstr "Definir informações de geo_localização das imagens"
 
-#: ../src/frogr-settings-dialog.c:318
+#: src/frogr-settings-dialog.c:318
 msgid "Replace 'Date Posted' with 'Date Taken' for Pictures"
 msgstr "Substitui \"Data postada\" com \"Data tirada\" nas imagens"
 
-#: ../src/frogr-settings-dialog.c:324
+#: src/frogr-settings-dialog.c:324
 msgid "_General"
 msgstr "_Geral"
 
-#: ../src/frogr-settings-dialog.c:344
+#: src/frogr-settings-dialog.c:344
 msgid "Proxy Settings"
 msgstr "Configurações de proxy"
 
-#. Enable proxy
-#: ../src/frogr-settings-dialog.c:353
+#: src/frogr-settings-dialog.c:353
 msgid "_Enable HTTP Proxy"
 msgstr "_Habilitar proxy HTTP"
 
-#: ../src/frogr-settings-dialog.c:363
+#: src/frogr-settings-dialog.c:363
 msgid "_Host:"
 msgstr "_Máquina:"
 
-#. Proxy port
-#: ../src/frogr-settings-dialog.c:376
+#: src/frogr-settings-dialog.c:376
 msgid "_Port:"
 msgstr "_Porta:"
 
-#. Proxy username
-#: ../src/frogr-settings-dialog.c:389
+#: src/frogr-settings-dialog.c:389
 msgid "U_sername:"
 msgstr "_Nome de usuário:"
 
-#. Proxy password
-#: ../src/frogr-settings-dialog.c:402
+#: src/frogr-settings-dialog.c:402
 msgid "Pass_word:"
 msgstr "_Senha:"
 
-#: ../src/frogr-settings-dialog.c:426
+#: src/frogr-settings-dialog.c:426
 msgid "Connec_tion"
 msgstr "_Conexão"
 
-#: ../src/frogr-settings-dialog.c:444
+#: src/frogr-settings-dialog.c:444
 msgid "Other options"
 msgstr "Outras opções"
 
-#: ../src/frogr-settings-dialog.c:454
+#: src/frogr-settings-dialog.c:454
 msgid "Ena_ble Tags Auto-Completion"
 msgstr "Ha_bilitar tags de complemento automático"
 
-#: ../src/frogr-settings-dialog.c:457
+#: src/frogr-settings-dialog.c:457
 msgid "_Import Tags from Pictures Metadata"
 msgstr "_Importar as tags dos metadados das imagens"
 
-#: ../src/frogr-settings-dialog.c:461
+#: src/frogr-settings-dialog.c:461
 msgid "Use _Dark GTK Theme"
 msgstr "Usar o tema _escuro do GTK"
 
-#: ../src/frogr-settings-dialog.c:465
+#: src/frogr-settings-dialog.c:465
 msgid "_Keep File Extensions in Titles when Loading"
 msgstr "_Manter extensões do arquivo nos títulos enquanto carrega"
 
-#: ../src/frogr-settings-dialog.c:471
+#: src/frogr-settings-dialog.c:471
 msgid "_Misc"
 msgstr "_Misc"
 
-#: ../src/frogr-settings-dialog.c:972
+#: src/frogr-settings-dialog.c:972
 msgid "Preferences"
 msgstr "Preferências"
 
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:1
-msgid "Aut_horize Account…"
-msgstr "Aut_orizar uma conta…"
-
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:2
-msgid "_Preferences…"
-msgstr "_Preferências…"
-
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:3
-msgid "_Help"
-msgstr "Aj_uda"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:1
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:9
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:3
-msgid "_Edit Details…"
-msgstr "Editar _detalhes…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:2
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:10
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:4
-msgid "Add _Tags…"
-msgstr "Adicionar _tags…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:3
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:11
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:5
-msgid "Add to _Group…"
-msgstr "Adicionar ao _grupo…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:4
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:12
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:6
-msgid "Add to _Photoset"
-msgstr "Adicionar ao _conjunto de fotos"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:5
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:13
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:7
-msgid "_Add to Existing Photoset…"
-msgstr "Adicionar ao conjunto de fotos _existente…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:6
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:14
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:8
-msgid "_Create New Photoset…"
-msgstr "_Criar novo conjunto de fotos…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:7
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:15
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:16
-msgid "_Open in External Viewer"
-msgstr "Abrir em um visualizador e_xterno"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:8
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:6
-msgid "_Remove Elements"
-msgstr "_Remover elementos"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:1
-msgid "_File"
-msgstr "_Arquivo"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:2
-msgid "_Open…"
-msgstr "_Abrir..."
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:4
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:2
-msgid "Save _As…"
-msgstr "Salvar _como..."
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:5
-msgid "A_dd Elements…"
-msgstr "A_dicionar elementos..."
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:7
-msgid "_Upload All"
-msgstr "_Enviar todos"
+#~ msgid "Aut_horize Account…"
+#~ msgstr "Aut_orizar uma conta…"
+
+#~ msgid "_Preferences…"
+#~ msgstr "_Preferências…"
+
+#~ msgid "_Help"
+#~ msgstr "Aj_uda"
+
+#~ msgid "_Edit Details…"
+#~ msgstr "Editar _detalhes…"
+
+#~ msgid "Add _Tags…"
+#~ msgstr "Adicionar _tags…"
+
+#~ msgid "Add to _Group…"
+#~ msgstr "Adicionar ao _grupo…"
+
+#~ msgid "Add to _Photoset"
+#~ msgstr "Adicionar ao _conjunto de fotos"
+
+#~ msgid "_Add to Existing Photoset…"
+#~ msgstr "Adicionar ao conjunto de fotos _existente…"
+
+#~ msgid "_Create New Photoset…"
+#~ msgstr "_Criar novo conjunto de fotos…"
+
+#~ msgid "_Open in External Viewer"
+#~ msgstr "Abrir em um visualizador e_xterno"
+
+#~ msgid "_Remove Elements"
+#~ msgstr "_Remover elementos"
+
+#~ msgid "_File"
+#~ msgstr "_Arquivo"
+
+#~ msgid "_Open…"
+#~ msgstr "_Abrir..."
+
+#~ msgid "Save _As…"
+#~ msgstr "Salvar _como..."
+
+#~ msgid "A_dd Elements…"
+#~ msgstr "A_dicionar elementos..."
+
+#~ msgid "_Upload All"
+#~ msgstr "_Enviar todos"
+
+#~ msgid "_View"
+#~ msgstr "_Ver"
+
+#~ msgid "_Sort Elements"
+#~ msgstr "_Organizar elementos"
+
+#~ msgid "As _Loaded"
+#~ msgstr "Como _carregadas"
+
+#~ msgid "By _Date Taken"
+#~ msgstr "Pela _data de captura"
+
+#~ msgid "By _Title"
+#~ msgstr "Pelo _título"
+
+#~ msgid "By _Size"
+#~ msgstr "Por _tamanho:"
+
+#~ msgid "_Reversed Order"
+#~ msgstr "_Ordem inversa"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:16
-msgid "_View"
-msgstr "_Ver"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:17
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:9
-msgid "_Sort Elements"
-msgstr "_Organizar elementos"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:18
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:10
-msgid "As _Loaded"
-msgstr "Como _carregadas"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:19
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:11
-msgid "By _Date Taken"
-msgstr "Pela _data de captura"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:20
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:12
-msgid "By _Title"
-msgstr "Pelo _título"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:21
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:13
-msgid "By _Size"
-msgstr "Por _tamanho:"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:22
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:14
-msgid "_Reversed Order"
-msgstr "_Ordem inversa"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:23
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:15
-msgid "Enable _Tooltips"
-msgstr "Habilitar _dicas"
+#~ msgid "Enable _Tooltips"
+#~ msgstr "Habilitar _dicas"
 
 #~ msgid "_Use GNOME General Proxy Settings"
 #~ msgstr "_Usar configurações de proxy do GNOME"
diff --git a/po/ro.po b/po/ro.po
index 030b7dc..8548424 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: frogr master\n"
-"Report-Msgid-Bugs-To: "
-"http://bugzilla.gnome.org/enter_bug.cgi?product=frogr&component=general\n";
-"POT-Creation-Date: 2011-01-22 19:33+0000\n"
+"Report-Msgid-Bugs-To: msanchez gnome org\n"
+"POT-Creation-Date: 2016-08-12 13:09+0100\n"
 "PO-Revision-Date: 2014-12-08 20:11+0200\n"
 "Last-Translator: Daniel Șerbănescu <daniel [at] serbanescu [dot] dk>\n"
 "Language-Team: Gnome Romanian Translation Team\n"
@@ -21,77 +20,128 @@ msgstr ""
 "X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"
 
-#: ../data/frogr.desktop.in.in.h:1
-msgid "Flickr Remote Organizer"
-msgstr "Organizator Flickr la distanță"
+#: data/frogr.appdata.xml.in:5 data/frogr.desktop.in.in:5
+#: data/frogr.desktop.in.in:14
+msgid "frogr"
+msgstr "frogr"
 
-#: ../data/frogr.desktop.in.in.h:2
-msgid "Frogr: a Flickr Remote Organizer for GNOME"
+#: data/frogr.appdata.xml.in:6 data/frogr.desktop.in.in:6
+#, fuzzy
+msgid "frogr: a Flickr Remote Organizer for GNOME"
 msgstr "Frogr: un organizator Flickr la distanță pentru GNOME"
 
-#: ../data/frogr.desktop.in.in.h:3
+#: data/frogr.appdata.xml.in:8
+msgid ""
+"frogr is a small application for the GNOME desktop that allows users to "
+"manage their accounts in the Flickr image hosting website."
+msgstr ""
+
+#: data/frogr.appdata.xml.in:13
+msgid ""
+"It supports all the basic Flickr features, including uploading pictures, "
+"adding descriptions, setting tags and managing sets and groups pools."
+msgstr ""
+
+#: data/frogr.appdata.xml.in:24
+#, fuzzy
+msgid "Screenshot of frogr"
+msgstr "Captură de ecra_n"
+
+#: data/frogr.appdata.xml.in:29
+msgid "Mario Sanchez Prada"
+msgstr ""
+
+#: data/frogr.desktop.in.in:7
 msgid "Upload and organize photos in Flickr accounts"
 msgstr "Încarcă și organizează fotografiile în conturile Flickr"
 
-#: ../src/frogr-about-dialog.c:44
-msgid "A Flickr remote organizer for GNOME\n"
+#: data/frogr.desktop.in.in:8
+msgid "Flickr;Image;Picture;Photo;Video;Uploader;"
+msgstr ""
+
+#: src/frogr-about-dialog.c:43
+#, fuzzy
+msgid "A Flickr Remote Organizer for GNOME\n"
 msgstr "Un organizator de Flickr la distanță pentru GNOME\n"
 
-#: ../src/frogr-about-dialog.c:107
+#: src/frogr-about-dialog.c:72
 msgid "translator-credits"
 msgstr "Daniel Șerbănescu <daniel [at] serbanescu [dot] dk>"
 
-#: ../src/frogr-add-tags-dialog.c:342
+#: src/frogr-add-tags-dialog.c:191 src/frogr-add-to-group-dialog.c:528
+#: src/frogr-add-to-set-dialog.c:529 src/frogr-auth-dialog.c:153
+#: src/frogr-create-new-set-dialog.c:310 src/frogr-details-dialog.c:1168
+#: src/frogr-main-view.c:1543 src/frogr-main-view.c:1618
+#: src/frogr-main-view.c:1670 src/frogr-settings-dialog.c:930
+msgid "_Cancel"
+msgstr ""
+
+#: src/frogr-add-tags-dialog.c:193 src/frogr-add-to-group-dialog.c:530
+#: src/frogr-add-to-set-dialog.c:531 src/frogr-create-new-set-dialog.c:312
+msgid "_Add"
+msgstr ""
+
+#: src/frogr-add-tags-dialog.c:202
 msgid "Enter a spaces separated list of tags:"
 msgstr "Introduceți o listă de etichete separate prin spații:"
 
-#: ../src/frogr-add-tags-dialog.c:383
+#: src/frogr-add-tags-dialog.c:228
 msgid "Add Tags"
 msgstr "Adaugă etichete"
 
-#: ../src/frogr-add-to-set-dialog.c:133
-msgid "Title"
-msgstr "Titlu"
+#: src/frogr-add-to-group-dialog.c:147
+msgid "Name"
+msgstr "Nume"
 
-#: ../src/frogr-add-to-set-dialog.c:148 ../src/frogr-add-to-group-dialog.c:148
+#: src/frogr-add-to-group-dialog.c:162 src/frogr-add-to-set-dialog.c:163
 msgid "Elements"
 msgstr "Elemente"
 
-#: ../src/frogr-add-to-set-dialog.c:573
-msgid "Add to Sets"
-msgstr "Adaugă la seturi"
-
-#: ../src/frogr-add-to-group-dialog.c:133
-msgid "Name"
-msgstr "Nume"
-
-#: ../src/frogr-add-to-group-dialog.c:573
+#: src/frogr-add-to-group-dialog.c:581
 msgid "Add to Groups"
 msgstr "Adaugă în grupuri"
 
-#: ../src/frogr-auth-dialog.c:32
-#, c-format
+#: src/frogr-add-to-set-dialog.c:148
+msgid "Title"
+msgstr "Titlu"
+
+#: src/frogr-add-to-set-dialog.c:582
+msgid "Add to Sets"
+msgstr "Adaugă la seturi"
+
+#: src/frogr-auth-dialog.c:59
+#, fuzzy, c-format
 msgid ""
-"Please press the button to authorize %s and then come back to this screen to "
-"complete the process."
+"Please press the button to authorize %s and then come back to complete the "
+"process."
 msgstr ""
 "Apăsați butonul pentru a autoriza %s și apoi reveniți la acest ecran pentru "
 "a completa procesul."
 
-#: ../src/frogr-auth-dialog.c:36
-#, c-format
-msgid ""
-"Press the button to start using %s once you've authorized it in your flickr "
-"account."
+#: src/frogr-auth-dialog.c:63 src/frogr-auth-dialog.c:149
+#: src/frogr-controller.c:2286
+#, fuzzy, c-format
+msgid "Authorize %s"
+msgstr "Autorizează _frogr"
+
+#: src/frogr-auth-dialog.c:155 src/frogr-settings-dialog.c:932
+msgid "_Close"
+msgstr ""
+
+#: src/frogr-auth-dialog.c:167
+msgid "Enter verification code:"
+msgstr ""
+
+#: src/frogr-auth-dialog.c:221
+msgid "Invalid verification code"
 msgstr ""
-"Apăsați butonul pentru a începe să folosiți %s imediat ce l-ați autorizat în "
-"contul dumneavoastră flickr."
 
-#: ../src/frogr-controller.c:241
-msgid "Process cancelled by the user"
+#: src/frogr-controller.c:581
+#, fuzzy
+msgid "Process cancelled"
 msgstr "Proces anulat de utilizator"
 
-#: ../src/frogr-controller.c:246
+#: src/frogr-controller.c:586
 msgid ""
 "Connection error:\n"
 "Network not available"
@@ -99,7 +149,7 @@ msgstr ""
 "Eroare de conexiune:\n"
 "Rețeaua nu este disponibilă"
 
-#: ../src/frogr-controller.c:251
+#: src/frogr-controller.c:590
 msgid ""
 "Connection error:\n"
 "Bad request"
@@ -107,7 +157,7 @@ msgstr ""
 "Eroare de conexiune:\n"
 "Cerere greșită"
 
-#: ../src/frogr-controller.c:256
+#: src/frogr-controller.c:594
 #, fuzzy
 msgid ""
 "Connection error:\n"
@@ -116,15 +166,16 @@ msgstr ""
 "Eroare de conexiune:\n"
 "Eroare din partea serverului"
 
-#: ../src/frogr-controller.c:261
+#: src/frogr-controller.c:598
+#, fuzzy
 msgid ""
-"Error uploading picture:\n"
+"Error uploading:\n"
 "File invalid"
 msgstr ""
 "Eroare la încărcarea imaginii:\n"
 "Fișier nevalid"
 
-#: ../src/frogr-controller.c:266
+#: src/frogr-controller.c:602
 msgid ""
 "Error uploading picture:\n"
 "Quota exceeded"
@@ -132,7 +183,21 @@ msgstr ""
 "Eroare la încărcarea imaginii:\n"
 "Cota a fost depășită"
 
-#: ../src/frogr-controller.c:271
+#: src/frogr-controller.c:607
+#, c-format
+msgid "Quota exceeded (limit: %d video per month)"
+msgid_plural "Quota exceeded (limit: %d videos per month)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/frogr-controller.c:611
+msgid ""
+"Error uploading video:\n"
+"You can't upload more videos with this account"
+msgstr ""
+
+#: src/frogr-controller.c:617
 msgid ""
 "Error:\n"
 "Photo not found"
@@ -140,7 +205,7 @@ msgstr ""
 "Eroare:\n"
 "Fotografia nu a fost găsită"
 
-#: ../src/frogr-controller.c:276
+#: src/frogr-controller.c:621
 msgid ""
 "Error:\n"
 "Photo already in photoset"
@@ -148,7 +213,7 @@ msgstr ""
 "Eroare:\n"
 "Fotografia există deja în setul de fotografii"
 
-#: ../src/frogr-controller.c:281
+#: src/frogr-controller.c:625
 msgid ""
 "Error:\n"
 "Photo already in group"
@@ -156,7 +221,7 @@ msgstr ""
 "Eroare:\n"
 "Fotografia există deja în grup"
 
-#: ../src/frogr-controller.c:286
+#: src/frogr-controller.c:629
 msgid ""
 "Error:\n"
 "Photo already in the maximum number of groups possible"
@@ -164,7 +229,7 @@ msgstr ""
 "Eroare:\n"
 "Fotografia există deja în numărul maxim de grupuri posibile"
 
-#: ../src/frogr-controller.c:291
+#: src/frogr-controller.c:633
 msgid ""
 "Error:\n"
 "Group limit already reached"
@@ -172,7 +237,7 @@ msgstr ""
 "Eroare:\n"
 "Limita grupului a fost atinsă deja"
 
-#: ../src/frogr-controller.c:296
+#: src/frogr-controller.c:637
 msgid ""
 "Error:\n"
 "Photo added to group's queue"
@@ -180,7 +245,7 @@ msgstr ""
 "Eroare:\n"
 "Fotografia a fost adăugată la coada grupului"
 
-#: ../src/frogr-controller.c:301
+#: src/frogr-controller.c:641
 msgid ""
 "Error:\n"
 "Photo already added to group's queue"
@@ -188,7 +253,7 @@ msgstr ""
 "Eroare:\n"
 "Fotografia a fost adăugată deja la coada grupului"
 
-#: ../src/frogr-controller.c:306
+#: src/frogr-controller.c:645
 msgid ""
 "Error:\n"
 "Content not allowed for this group"
@@ -196,8 +261,7 @@ msgstr ""
 "Eroare:\n"
 "Conținutul nu este permis pentru acest grup"
 
-#: ../src/frogr-controller.c:311
-#, c-format
+#: src/frogr-controller.c:649
 msgid ""
 "Authorization failed.\n"
 "Please try again"
@@ -205,19 +269,46 @@ msgstr ""
 "Autorizarea a eșuat.\n"
 "Reîncercați"
 
-#: ../src/frogr-controller.c:317
-#, c-format
+#: src/frogr-controller.c:655
+#, fuzzy, c-format
 msgid ""
 "Error\n"
-"%s is not properly authorized to upload pictures to flickr.\n"
+"%s is not properly authorized to upload pictures to Flickr.\n"
 "Please re-authorize it"
 msgstr ""
 "Eroare\n"
 "%s nu este autorizat corespunzător pentru a încărca imagini la flickr.\n"
 "Re-autorizați-l"
 
-#: ../src/frogr-controller.c:323
-#, c-format
+#: src/frogr-controller.c:660
+#, fuzzy
+msgid ""
+"Unable to authenticate in Flickr\n"
+"Please try again."
+msgstr ""
+"Autorizarea a eșuat.\n"
+"Reîncercați"
+
+#: src/frogr-controller.c:664
+#, fuzzy, c-format
+msgid ""
+"You have not properly authorized %s yet.\n"
+"Please try again."
+msgstr ""
+"Trebuie să autorizați %s în mod corespunzător înainte să încărcați "
+"fotografii la flickr.\n"
+"Re-autorizați-l."
+
+#: src/frogr-controller.c:669
+#, fuzzy
+msgid ""
+"Invalid verification code.\n"
+"Please try again."
+msgstr ""
+"Autorizarea a eșuat.\n"
+"Reîncercați"
+
+#: src/frogr-controller.c:673
 msgid ""
 "Error:\n"
 "Service not available"
@@ -225,316 +316,583 @@ msgstr ""
 "Eroare:\n"
 "Serviciul nu este disponibil"
 
-#. General error: just dump the raw error description
-#: ../src/frogr-controller.c:329
-#, c-format
-msgid "An error happened while uploading a picture: %s."
+#: src/frogr-controller.c:678
+#, fuzzy, c-format
+msgid "An error happened: %s."
 msgstr "S-a produs o eroare în timpul încărcării unei imagini: %s."
 
-#: ../src/frogr-controller.c:874
-msgid "Creating new photosets…"
-msgstr "Se creează noi seturi de fotografii…"
-
-#: ../src/frogr-controller.c:898
-msgid "Adding picture to photosets…"
-msgstr "Se adaugă o imagine seturilor de fotografii…"
+#: src/frogr-controller.c:883
+#, fuzzy
+msgid "Authorization failed (timed out)"
+msgstr ""
+"Autorizarea a eșuat.\n"
+"Reîncercați"
 
-#: ../src/frogr-controller.c:920
-msgid "Adding picture to groups…"
-msgstr "Se adaugă o imagine grupurilor…"
+#: src/frogr-controller.c:931
+#, c-format
+msgid "Retrying Upload (attempt %d/%d)…"
+msgstr ""
 
-#: ../src/frogr-controller.c:1496
-msgid "No sets found"
-msgstr "Nu au fost găsite seturi"
+#: src/frogr-controller.c:936
+#, c-format
+msgid "Uploading '%s'…"
+msgstr "Se încarcă „%s”…"
 
-#: ../src/frogr-controller.c:1530
-msgid "No groups found"
-msgstr "Nu au fost găsite grupuri"
+#: src/frogr-controller.c:2242
+msgid "Updating credentials…"
+msgstr ""
 
-#: ../src/frogr-controller.c:1964 ../src/frogr-controller.c:1987
-msgid "Retrieving list of tags…"
+#: src/frogr-controller.c:2247
+#, fuzzy
+msgid "Retrieving data for authorization…"
 msgstr "Se preia lista etichetelor…"
 
-#: ../src/frogr-controller.c:2010 ../src/frogr-controller.c:2033
+#: src/frogr-controller.c:2252
+msgid "Finishing authorization…"
+msgstr ""
+
+#: src/frogr-controller.c:2257
 msgid "Retrieving list of sets…"
 msgstr "Se preia lista seturilor…"
 
-#: ../src/frogr-controller.c:2056
+#: src/frogr-controller.c:2262
 msgid "Retrieving list of groups…"
 msgstr "Se preia lista grupurilor…"
 
-#: ../src/frogr-controller.c:2135
-#, c-format
+#: src/frogr-controller.c:2267
+msgid "Retrieving list of tags…"
+msgstr "Se preia lista etichetelor…"
+
+#: src/frogr-controller.c:2292
+msgid "Fetching information"
+msgstr ""
+
+#: src/frogr-controller.c:2398
+msgid "No sets found"
+msgstr "Nu au fost găsite seturi"
+
+#: src/frogr-controller.c:2423
+msgid "No groups found"
+msgstr "Nu au fost găsite grupuri"
+
+#: src/frogr-controller.c:2984
+#, fuzzy, c-format
 msgid ""
-"You need to properly authorize %s before uploading any pictures to flickr.\n"
+"You need to properly authorize %s before uploading any pictures to Flickr.\n"
 "Please re-authorize it."
 msgstr ""
 "Trebuie să autorizați %s în mod corespunzător înainte să încărcați "
 "fotografii la flickr.\n"
 "Re-autorizați-l."
 
-#. This shows a dialog notifying the problem to the user
-#: ../src/frogr-create-new-set-dialog.c:120 ../src/frogr-details-dialog.c:893
+#: src/frogr-controller.c:2994
+#, fuzzy
+msgid "You need to be connected before uploading any pictures to Flickr."
+msgstr ""
+"Trebuie să autorizați %s în mod corespunzător înainte să încărcați "
+"fotografii la flickr.\n"
+"Re-autorizați-l."
+
+#: src/frogr-controller.c:3012
+#, fuzzy
+msgid "Uploading Pictures"
+msgstr "Se încarcă imaginile %d / %d"
+
+#: src/frogr-controller.c:3057
+msgid "Error opening project file"
+msgstr ""
+
+#: src/frogr-create-new-set-dialog.c:143 src/frogr-details-dialog.c:1001
 msgid "Missing data required"
 msgstr "Sunt necesare datele lipsă"
 
-#: ../src/frogr-create-new-set-dialog.c:300
-msgid "Set's title:"
-msgstr "Titlul setului:"
+#: src/frogr-create-new-set-dialog.c:326
+#, fuzzy
+msgid "Title:"
+msgstr "_Titlu:"
 
-#: ../src/frogr-create-new-set-dialog.c:313
-msgid "Set's description:"
-msgstr "Descrierea setului:"
+#: src/frogr-create-new-set-dialog.c:335
+#, fuzzy
+msgid "Description:"
+msgstr "_Descriere:"
 
-#: ../src/frogr-create-new-set-dialog.c:352
-msgid "Create new Set"
+#: src/frogr-create-new-set-dialog.c:356
+msgid "Fill Pictures Details with Title and Description"
+msgstr ""
+
+#: src/frogr-create-new-set-dialog.c:381
+#, fuzzy
+msgid "Create New Set"
 msgstr "Creează un set nou"
 
-#: ../src/frogr-details-dialog.c:156
+#: src/frogr-details-dialog.c:89 src/frogr-settings-dialog.c:97
+msgid "Default (as specified in Flickr)"
+msgstr ""
+
+#: src/frogr-details-dialog.c:90 src/frogr-settings-dialog.c:98
+msgid "All rights reserved"
+msgstr ""
+
+#: src/frogr-details-dialog.c:91 src/frogr-settings-dialog.c:99
+msgid "CC Attribution-NonCommercial-ShareAlike"
+msgstr ""
+
+#: src/frogr-details-dialog.c:92 src/frogr-settings-dialog.c:100
+msgid "CC Attribution-NonCommercial"
+msgstr ""
+
+#: src/frogr-details-dialog.c:93 src/frogr-settings-dialog.c:101
+msgid "CC Attribution-NonCommercial-NoDerivs"
+msgstr ""
+
+#: src/frogr-details-dialog.c:94 src/frogr-settings-dialog.c:102
+msgid "CC Attribution"
+msgstr ""
+
+#: src/frogr-details-dialog.c:95 src/frogr-settings-dialog.c:103
+msgid "CC Attribution-ShareAlike"
+msgstr ""
+
+#: src/frogr-details-dialog.c:96 src/frogr-settings-dialog.c:104
+msgid "CC Attribution-NoDerivs"
+msgstr ""
+
+#: src/frogr-details-dialog.c:172
+msgid "Open with image viewer"
+msgstr ""
+
+#: src/frogr-details-dialog.c:190
+msgid "_Title:"
+msgstr "_Titlu:"
+
+#: src/frogr-details-dialog.c:200
+msgid "_Description:"
+msgstr "_Descriere:"
+
+#: src/frogr-details-dialog.c:224
+msgid "Ta_gs:"
+msgstr "Etic_hete:"
+
+#: src/frogr-details-dialog.c:247
 msgid "Visibility"
 msgstr "Vizibilitate"
 
-#: ../src/frogr-details-dialog.c:167 ../src/frogr-settings-dialog.c:142
+#: src/frogr-details-dialog.c:257 src/frogr-settings-dialog.c:196
 msgid "_Private"
 msgstr "_Privat"
 
-#: ../src/frogr-details-dialog.c:171 ../src/frogr-settings-dialog.c:146
+#: src/frogr-details-dialog.c:261 src/frogr-settings-dialog.c:199
 msgid "P_ublic"
 msgstr "P_ublic"
 
-#: ../src/frogr-details-dialog.c:179 ../src/frogr-settings-dialog.c:154
-msgid "Visible to _Family"
-msgstr "Vizibil pentru _familie"
-
-#: ../src/frogr-details-dialog.c:183 ../src/frogr-settings-dialog.c:158
-msgid "Visible to F_riends"
-msgstr "Vizibil pentru p_rieteni"
+#: src/frogr-details-dialog.c:270 src/frogr-settings-dialog.c:207
+msgid "_Family"
+msgstr ""
 
-#: ../src/frogr-details-dialog.c:196 ../src/frogr-settings-dialog.c:166
-msgid "_Show up in Global Search Results"
-msgstr "Afișea_ză în rezultatele căutării globale"
+#: src/frogr-details-dialog.c:274 src/frogr-settings-dialog.c:209
+msgid "F_riends"
+msgstr ""
 
-#: ../src/frogr-details-dialog.c:209
-msgid "Content type"
+#: src/frogr-details-dialog.c:288
+#, fuzzy
+msgid "Content Type"
 msgstr "Tipul conținutului"
 
-#: ../src/frogr-details-dialog.c:218 ../src/frogr-settings-dialog.c:203
+#: src/frogr-details-dialog.c:296 src/frogr-settings-dialog.c:234
 msgid "P_hoto"
 msgstr "_Fotografie"
 
-#: ../src/frogr-details-dialog.c:222 ../src/frogr-settings-dialog.c:207
+#: src/frogr-details-dialog.c:300 src/frogr-settings-dialog.c:236
 msgid "Scree_nshot"
 msgstr "Captură de ecra_n"
 
-#: ../src/frogr-details-dialog.c:226 ../src/frogr-settings-dialog.c:211
+#: src/frogr-details-dialog.c:304 src/frogr-settings-dialog.c:238
 msgid "Oth_er"
 msgstr "Altele"
 
-#: ../src/frogr-details-dialog.c:240
-msgid "Safety level"
+#: src/frogr-details-dialog.c:317
+#, fuzzy
+msgid "Safety Level"
 msgstr "Nivel de siguranță"
 
-#: ../src/frogr-details-dialog.c:249 ../src/frogr-settings-dialog.c:244
+#: src/frogr-details-dialog.c:325 src/frogr-settings-dialog.c:260
 msgid "S_afe"
 msgstr "S_igur"
 
-#: ../src/frogr-details-dialog.c:253 ../src/frogr-settings-dialog.c:248
+#: src/frogr-details-dialog.c:329 src/frogr-settings-dialog.c:262
 msgid "_Moderate"
 msgstr "_Moderat"
 
-#: ../src/frogr-details-dialog.c:257 ../src/frogr-settings-dialog.c:252
+#: src/frogr-details-dialog.c:333 src/frogr-settings-dialog.c:264
 msgid "Restr_icted"
 msgstr "Restr_icționat"
 
-#: ../src/frogr-details-dialog.c:271
-msgid "_Title:"
-msgstr "_Titlu:"
+#: src/frogr-details-dialog.c:345
+msgid "License Type"
+msgstr ""
 
-#: ../src/frogr-details-dialog.c:283
-msgid "_Description:"
-msgstr "_Descriere:"
+#: src/frogr-details-dialog.c:367
+msgid "Other Properties"
+msgstr ""
 
-#: ../src/frogr-details-dialog.c:309
-msgid "Ta_gs:"
-msgstr "Etic_hete:"
+#: src/frogr-details-dialog.c:375
+#, fuzzy
+msgid "_Show Up in Global Search Results"
+msgstr "Afișea_ză în rezultatele căutării globale"
+
+#: src/frogr-details-dialog.c:379
+msgid "Set Geo_location Information"
+msgstr ""
 
-#: ../src/frogr-details-dialog.c:1074 ../src/frogr-details-dialog.c:1079
+#: src/frogr-details-dialog.c:383
+msgid "Replace 'Date Posted' with 'Date Taken'"
+msgstr ""
+
+#: src/frogr-details-dialog.c:475
+#, fuzzy, c-format
+msgid "(%d Picture)"
+msgid_plural "(%d Pictures)"
+msgstr[0] "_Adaugă imaginile"
+msgstr[1] "_Adaugă imaginile"
+msgstr[2] "_Adaugă imaginile"
+
+#: src/frogr-details-dialog.c:548
+#, fuzzy
+msgid "An error happened trying to load the picture"
+msgstr "S-a produs o eroare în timpul încărcării unei imagini: %s."
+
+#: src/frogr-details-dialog.c:1169
+msgid "_Edit"
+msgstr ""
+
+#: src/frogr-details-dialog.c:1197
 msgid "Edit Picture Details"
 msgstr "Modifică detaliile imaginii"
 
-#. File menu
-#: ../src/frogr-main-view.c:229
-msgid "_File"
-msgstr "_Fișier"
+#: src/frogr-file-loader.c:142
+#, fuzzy, c-format
+msgid "Loading files %d / %d"
+msgstr "Se încarcă imaginile %d / %d"
 
-#: ../src/frogr-main-view.c:235
-msgid "_Add Pictures"
-msgstr "_Adaugă imaginile"
+#: src/frogr-file-loader.c:369
+#, c-format
+msgid ""
+"Unable to load picture %s:\n"
+"%s"
+msgstr ""
 
-#. Remove
-#: ../src/frogr-main-view.c:242 ../src/frogr-main-view.c:443
-msgid "_Remove Pictures"
-msgstr "_Elimină imaginile"
+#: src/frogr-file-loader.c:400
+#, c-format
+msgid ""
+"Unable to load video %s\n"
+"Please check that you have the right codec installed"
+msgstr ""
 
-#. Accounts menu item and submenu
-#: ../src/frogr-main-view.c:252
-msgid "Accou_nts"
-msgstr "Co_nturi"
+#: src/frogr-file-loader.c:636
+#, c-format
+msgid ""
+"Can't load file %s:\n"
+"Size of file is bigger than the maximum allowed for this account (%s)"
+msgstr ""
 
-#. Authorize menu item
-#: ../src/frogr-main-view.c:258
-msgid "Authorize _frogr"
-msgstr "Autorizează _frogr"
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
+msgid "Open"
+msgstr ""
 
-#: ../src/frogr-main-view.c:267
-msgid "_Preferences…"
-msgstr "_Preferințe…"
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
+msgid "Open Existing Project"
+msgstr ""
 
-#: ../src/frogr-main-view.c:275
-msgid "_Quit"
-msgstr "_Ieșire"
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
+msgid "Add"
+msgstr "Adaugă"
+
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
+#, fuzzy
+msgid "Add Elements"
+msgstr "Elemente"
+
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
+msgid "Remove"
+msgstr "Elimină"
+
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
+#, fuzzy
+msgid "Remove Elements"
+msgstr "Elemente"
+
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
+msgid "Upload"
+msgstr "Încarcă"
 
-#. Actions menu
-#: ../src/frogr-main-view.c:281
-msgid "A_ctions"
-msgstr "A_cțiuni"
-
-#. Edit details
-#: ../src/frogr-main-view.c:287 ../src/frogr-main-view.c:401
-msgid "Edit _Details…"
-msgstr "Modifică _detalii…"
-
-#. Add Tags
-#: ../src/frogr-main-view.c:294 ../src/frogr-main-view.c:408
-msgid "Add _Tags…"
-msgstr "Adaugă e_tichete…"
-
-#. Add to group
-#: ../src/frogr-main-view.c:301 ../src/frogr-main-view.c:415
-msgid "Add to _Group…"
-msgstr "Adaugă _grupului…"
-
-#. Add to set
-#: ../src/frogr-main-view.c:308 ../src/frogr-main-view.c:422
-msgid "Add to _Set"
-msgstr "Adaugă _setului"
-
-#: ../src/frogr-main-view.c:315 ../src/frogr-main-view.c:428
-msgid "_Create New Set…"
-msgstr "_Creează un set nou…"
-
-#: ../src/frogr-main-view.c:322 ../src/frogr-main-view.c:434
-msgid "Add to _Existing Set…"
-msgstr "Adaugă setului _existent…"
-
-#: ../src/frogr-main-view.c:331
-msgid "_Upload All"
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
+#, fuzzy
+msgid "Upload All"
 msgstr "Încarcă _tot"
 
-#. Help menu
-#: ../src/frogr-main-view.c:339
-msgid "_Help"
-msgstr "_Ajutor"
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
+msgid "Save"
+msgstr ""
 
-#: ../src/frogr-main-view.c:345
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
+msgid "Save Current Project"
+msgstr ""
+
+#: src/frogr-main-view.c:1016
 msgid "_About"
 msgstr "_Despre"
 
-#: ../src/frogr-main-view.c:890
+#: src/frogr-main-view.c:1020
+msgid "_Quit"
+msgstr "_Ieșire"
+
+#: src/frogr-main-view.c:1070
+#, fuzzy
+msgid "Accounts"
+msgstr "Co_nturi"
+
+#: src/frogr-main-view.c:1410
+#, c-format
+msgid "Taken: %s"
+msgstr ""
+
+#: src/frogr-main-view.c:1415
+#, c-format
+msgid "File size: %s"
+msgstr ""
+
+#: src/frogr-main-view.c:1540
+#, fuzzy
+msgid "Select File"
+msgstr "Selectează o imagine"
+
+#: src/frogr-main-view.c:1544 src/frogr-main-view.c:1671
+msgid "_Open"
+msgstr ""
+
+#: src/frogr-main-view.c:1553
+msgid "Frogr Project Files"
+msgstr ""
+
+#: src/frogr-main-view.c:1615
+#, fuzzy
+msgid "Select Destination"
+msgstr "Descrierea setului:"
+
+#: src/frogr-main-view.c:1619
+msgid "_Save"
+msgstr ""
+
+#: src/frogr-main-view.c:1622
+msgid "Untitled Project.frogr"
+msgstr ""
+
+#: src/frogr-main-view.c:1667
 msgid "Select a Picture"
 msgstr "Selectează o imagine"
 
-#: ../src/frogr-main-view.c:923
+#: src/frogr-main-view.c:1694
+msgid "All Files"
+msgstr ""
+
+#: src/frogr-main-view.c:1697
+msgid "Image Files"
+msgstr ""
+
+#: src/frogr-main-view.c:1701
+msgid "Video Files"
+msgstr ""
+
+#: src/frogr-main-view.c:1723
+msgid "You don't have any picture added yet"
+msgstr ""
+
+#: src/frogr-main-view.c:1736
 msgid "You need to select some pictures first"
 msgstr "Trebuie să selectați câteva imagini mai întâi"
 
-#: ../src/frogr-main-view.c:1141
-msgid "Not connected to flickr"
+#: src/frogr-main-view.c:2108
+#, fuzzy
+msgid "Not connected to Flickr"
 msgstr "Nu sunteți conectat la flickr"
 
-#: ../src/frogr-main-view.c:1170
-msgid "remaining for the current month"
-msgstr "rămas pentru luna curentă"
-
-#: ../src/frogr-main-view.c:1178
-msgid "Connected as"
+#: src/frogr-main-view.c:2118
+#, fuzzy, c-format
+msgid "Connected as %s%s"
 msgstr "Conectat ca"
 
-#: ../src/frogr-main-view.c:1179
+#: src/frogr-main-view.c:2119
 msgid " (PRO account)"
 msgstr " (cont PRO)"
 
-#: ../src/frogr-picture-loader.c:92
+#: src/frogr-main-view.c:2143
 #, c-format
-msgid "Loading pictures %d / %d"
-msgstr "Se încarcă imaginile %d / %d"
+msgid " - %s / %s remaining"
+msgstr ""
 
-#. Update progress
-#: ../src/frogr-picture-uploader.c:85
+#: src/frogr-main-view.c:2169
 #, c-format
-msgid "Uploading '%s'…"
-msgstr "Se încarcă „%s”…"
+msgid " - %d file to upload (%s)"
+msgid_plural " - %d files to upload (%s)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../src/frogr-settings-dialog.c:131
+#: src/frogr-settings-dialog.c:185
 msgid "Default Visibility"
 msgstr "Vizibilitate implicită"
 
-#: ../src/frogr-settings-dialog.c:193
+#: src/frogr-settings-dialog.c:224
 msgid "Default Content Type"
 msgstr "Tip de conexiune implicit"
 
-#: ../src/frogr-settings-dialog.c:234
+#: src/frogr-settings-dialog.c:250
 msgid "Default Safety Level"
 msgstr "Nivel de securitate implicit"
 
-#: ../src/frogr-settings-dialog.c:271
+#: src/frogr-settings-dialog.c:276
+#, fuzzy
+msgid "Default License"
+msgstr "Tip de conexiune implicit"
+
+#: src/frogr-settings-dialog.c:302
+msgid "Other Defaults"
+msgstr ""
+
+#: src/frogr-settings-dialog.c:312
+#, fuzzy
+msgid "_Show Pictures in Global Search Results"
+msgstr "Afișea_ză în rezultatele căutării globale"
+
+#: src/frogr-settings-dialog.c:315
+msgid "Set Geo_location Information for Pictures"
+msgstr ""
+
+#: src/frogr-settings-dialog.c:318
+msgid "Replace 'Date Posted' with 'Date Taken' for Pictures"
+msgstr ""
+
+#: src/frogr-settings-dialog.c:324
 msgid "_General"
 msgstr "_Generale"
 
-#. Proxy settings
-#: ../src/frogr-settings-dialog.c:290
-msgid "_Use HTTP Proxy"
+#: src/frogr-settings-dialog.c:344
+msgid "Proxy Settings"
+msgstr ""
+
+#: src/frogr-settings-dialog.c:353
+#, fuzzy
+msgid "_Enable HTTP Proxy"
 msgstr "_Utilizează proxy HTTP"
 
-#: ../src/frogr-settings-dialog.c:301
+#: src/frogr-settings-dialog.c:363
 msgid "_Host:"
 msgstr "_Gazdă:"
 
-#. Proxy port
-#: ../src/frogr-settings-dialog.c:319
+#: src/frogr-settings-dialog.c:376
 msgid "_Port:"
 msgstr "_Port:"
 
-#. Proxy username
-#: ../src/frogr-settings-dialog.c:337
+#: src/frogr-settings-dialog.c:389
 msgid "U_sername:"
 msgstr "_Utilizator:"
 
-#. Proxy password
-#: ../src/frogr-settings-dialog.c:355
+#: src/frogr-settings-dialog.c:402
 msgid "Pass_word:"
 msgstr "Paro_lă:"
 
-#: ../src/frogr-settings-dialog.c:382
+#: src/frogr-settings-dialog.c:426
 msgid "Connec_tion"
 msgstr "Cone_xiune"
 
-#: ../src/frogr-settings-dialog.c:794
+#: src/frogr-settings-dialog.c:444
+msgid "Other options"
+msgstr ""
+
+#: src/frogr-settings-dialog.c:454
+msgid "Ena_ble Tags Auto-Completion"
+msgstr ""
+
+#: src/frogr-settings-dialog.c:457
+msgid "_Import Tags from Pictures Metadata"
+msgstr ""
+
+#: src/frogr-settings-dialog.c:461
+msgid "Use _Dark GTK Theme"
+msgstr ""
+
+#: src/frogr-settings-dialog.c:465
+msgid "_Keep File Extensions in Titles when Loading"
+msgstr ""
+
+#: src/frogr-settings-dialog.c:471
+msgid "_Misc"
+msgstr ""
+
+#: src/frogr-settings-dialog.c:972
 msgid "Preferences"
 msgstr "Preferințe"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:1
-msgid "Add"
-msgstr "Adaugă"
+#~ msgid "Flickr Remote Organizer"
+#~ msgstr "Organizator Flickr la distanță"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:2
-msgid "Remove"
-msgstr "Elimină"
+#~ msgid ""
+#~ "Press the button to start using %s once you've authorized it in your "
+#~ "flickr account."
+#~ msgstr ""
+#~ "Apăsați butonul pentru a începe să folosiți %s imediat ce l-ați autorizat "
+#~ "în contul dumneavoastră flickr."
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:3
-msgid "Upload"
-msgstr "Încarcă"
+#~ msgid "Creating new photosets…"
+#~ msgstr "Se creează noi seturi de fotografii…"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:4
-msgid "frogr"
-msgstr "frogr"
+#~ msgid "Adding picture to photosets…"
+#~ msgstr "Se adaugă o imagine seturilor de fotografii…"
+
+#~ msgid "Adding picture to groups…"
+#~ msgstr "Se adaugă o imagine grupurilor…"
+
+#~ msgid "Set's title:"
+#~ msgstr "Titlul setului:"
+
+#~ msgid "Visible to _Family"
+#~ msgstr "Vizibil pentru _familie"
+
+#~ msgid "Visible to F_riends"
+#~ msgstr "Vizibil pentru p_rieteni"
+
+#~ msgid "_File"
+#~ msgstr "_Fișier"
+
+#~ msgid "_Remove Pictures"
+#~ msgstr "_Elimină imaginile"
+
+#~ msgid "_Preferences…"
+#~ msgstr "_Preferințe…"
+
+#~ msgid "A_ctions"
+#~ msgstr "A_cțiuni"
+
+#~ msgid "Edit _Details…"
+#~ msgstr "Modifică _detalii…"
+
+#~ msgid "Add _Tags…"
+#~ msgstr "Adaugă e_tichete…"
+
+#~ msgid "Add to _Group…"
+#~ msgstr "Adaugă _grupului…"
+
+#~ msgid "Add to _Set"
+#~ msgstr "Adaugă _setului"
+
+#~ msgid "_Create New Set…"
+#~ msgstr "_Creează un set nou…"
+
+#~ msgid "Add to _Existing Set…"
+#~ msgstr "Adaugă setului _existent…"
+
+#~ msgid "_Help"
+#~ msgstr "_Ajutor"
+
+#~ msgid "remaining for the current month"
+#~ msgstr "rămas pentru luna curentă"
diff --git a/po/ru.po b/po/ru.po
index 4854b7a..7ecbac5 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: frogr master\n"
-"Report-Msgid-Bugs-To: 
http://bugzilla.gnome.org/enter_bug.cgi?product=frogr&keywords=I18N+L10N&component=general\n";
-"POT-Creation-Date: 2012-12-16 15:44+0000\n"
+"Report-Msgid-Bugs-To: msanchez gnome org\n"
+"POT-Creation-Date: 2016-08-12 13:09+0100\n"
 "PO-Revision-Date: 2012-12-24 12:12+0300\n"
 "Last-Translator: Yuri Myasoedov <omerta13 yandex ru>\n"
 "Language-Team: русский <gnome-cyr gnome org>\n"
@@ -15,86 +15,133 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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"
 
-#: ../data/frogr.desktop.in.in.h:1
-msgid "Frogr"
+#: data/frogr.appdata.xml.in:5 data/frogr.desktop.in.in:5
+#: data/frogr.desktop.in.in:14
+#, fuzzy
+msgid "frogr"
 msgstr "Frogr"
 
-#: ../data/frogr.desktop.in.in.h:2
-msgid "Frogr: a Flickr Remote Organizer for GNOME"
+#: data/frogr.appdata.xml.in:6 data/frogr.desktop.in.in:6
+#, fuzzy
+msgid "frogr: a Flickr Remote Organizer for GNOME"
 msgstr "Frogr — инструмент GNOME для удалённого управления Flickr"
 
-#: ../data/frogr.desktop.in.in.h:3
+#: data/frogr.appdata.xml.in:8
+msgid ""
+"frogr is a small application for the GNOME desktop that allows users to "
+"manage their accounts in the Flickr image hosting website."
+msgstr ""
+
+#: data/frogr.appdata.xml.in:13
+msgid ""
+"It supports all the basic Flickr features, including uploading pictures, "
+"adding descriptions, setting tags and managing sets and groups pools."
+msgstr ""
+
+#: data/frogr.appdata.xml.in:24
+#, fuzzy
+msgid "Screenshot of frogr"
+msgstr "_Снимок экрана"
+
+#: data/frogr.appdata.xml.in:29
+msgid "Mario Sanchez Prada"
+msgstr ""
+
+#: data/frogr.desktop.in.in:7
 msgid "Upload and organize photos in Flickr accounts"
 msgstr "Загружайте и управляйте фотоснимками во Flickr"
 
-#: ../src/frogr-about-dialog.c:43
-msgid "A Flickr remote organizer for GNOME\n"
+#: data/frogr.desktop.in.in:8
+msgid "Flickr;Image;Picture;Photo;Video;Uploader;"
+msgstr ""
+
+#: src/frogr-about-dialog.c:43
+#, fuzzy
+msgid "A Flickr Remote Organizer for GNOME\n"
 msgstr "Инструмент удалённого управления Flickr для GNOME\n"
 
-#: ../src/frogr-about-dialog.c:72
+#: src/frogr-about-dialog.c:72
 msgid "translator-credits"
 msgstr ""
 "Yuri Myasoedov <omerta13 yandex ru>, 2011\n"
 "Urmas <davian818 gmail com>, 2011"
 
-#: ../src/frogr-add-tags-dialog.c:207
+#: src/frogr-add-tags-dialog.c:191 src/frogr-add-to-group-dialog.c:528
+#: src/frogr-add-to-set-dialog.c:529 src/frogr-auth-dialog.c:153
+#: src/frogr-create-new-set-dialog.c:310 src/frogr-details-dialog.c:1168
+#: src/frogr-main-view.c:1543 src/frogr-main-view.c:1618
+#: src/frogr-main-view.c:1670 src/frogr-settings-dialog.c:930
+msgid "_Cancel"
+msgstr ""
+
+#: src/frogr-add-tags-dialog.c:193 src/frogr-add-to-group-dialog.c:530
+#: src/frogr-add-to-set-dialog.c:531 src/frogr-create-new-set-dialog.c:312
+msgid "_Add"
+msgstr ""
+
+#: src/frogr-add-tags-dialog.c:202
 msgid "Enter a spaces separated list of tags:"
 msgstr "Введите список меток, разделённых пробелами:"
 
-#: ../src/frogr-add-tags-dialog.c:230
+#: src/frogr-add-tags-dialog.c:228
 msgid "Add Tags"
 msgstr "Добавить метки"
 
-#: ../src/frogr-add-to-set-dialog.c:155
-msgid "Title"
+#: src/frogr-add-to-group-dialog.c:147
+msgid "Name"
 msgstr "Название"
 
-#: ../src/frogr-add-to-set-dialog.c:170
-#: ../src/frogr-add-to-group-dialog.c:169
+#: src/frogr-add-to-group-dialog.c:162 src/frogr-add-to-set-dialog.c:163
 msgid "Elements"
 msgstr "Элементы"
 
-#: ../src/frogr-add-to-set-dialog.c:602
-msgid "Add to Sets"
-msgstr "Добавить в альбомы"
+#: src/frogr-add-to-group-dialog.c:581
+msgid "Add to Groups"
+msgstr "Добавить в группы"
 
-#: ../src/frogr-add-to-group-dialog.c:154
-msgid "Name"
+#: src/frogr-add-to-set-dialog.c:148
+msgid "Title"
 msgstr "Название"
 
-#: ../src/frogr-add-to-group-dialog.c:601
-msgid "Add to Groups"
-msgstr "Добавить в группы"
+#: src/frogr-add-to-set-dialog.c:582
+msgid "Add to Sets"
+msgstr "Добавить в альбомы"
 
-#: ../src/frogr-auth-dialog.c:31
+#: src/frogr-auth-dialog.c:59
 #, c-format
-#| msgid ""
-#| "Please press the button to authorize %s and then come back to this screen "
-#| "to complete the process."
-msgid "Please press the button to authorize %s and then come back to complete the process."
-msgstr "Нажмите кнопку, чтобы авторизовать %s, затем вернитесь к этому экрану, чтобы завершить процесс."
-
-#: ../src/frogr-auth-dialog.c:35
-msgid "Enter verification code:"
-msgstr "Введите код подтверждения:"
+msgid ""
+"Please press the button to authorize %s and then come back to complete the "
+"process."
+msgstr ""
+"Нажмите кнопку, чтобы авторизовать %s, затем вернитесь к этому экрану, чтобы "
+"завершить процесс."
 
-#: ../src/frogr-auth-dialog.c:62
-#: ../src/frogr-auth-dialog.c:147
+#: src/frogr-auth-dialog.c:63 src/frogr-auth-dialog.c:149
+#: src/frogr-controller.c:2286
 #, c-format
 msgid "Authorize %s"
 msgstr "Авторизовать %s"
 
-#: ../src/frogr-auth-dialog.c:215
+#: src/frogr-auth-dialog.c:155 src/frogr-settings-dialog.c:932
+msgid "_Close"
+msgstr ""
+
+#: src/frogr-auth-dialog.c:167
+msgid "Enter verification code:"
+msgstr "Введите код подтверждения:"
+
+#: src/frogr-auth-dialog.c:221
 msgid "Invalid verification code"
 msgstr "Неверный код подтверждения"
 
-#: ../src/frogr-controller.c:515
+#: src/frogr-controller.c:581
 msgid "Process cancelled"
 msgstr "Процесс отменён"
 
-#: ../src/frogr-controller.c:520
+#: src/frogr-controller.c:586
 msgid ""
 "Connection error:\n"
 "Network not available"
@@ -102,7 +149,7 @@ msgstr ""
 "Ошибка соединения:\n"
 "сеть недоступна"
 
-#: ../src/frogr-controller.c:524
+#: src/frogr-controller.c:590
 msgid ""
 "Connection error:\n"
 "Bad request"
@@ -110,7 +157,7 @@ msgstr ""
 "Ошибка соединения:\n"
 "неверный запрос"
 
-#: ../src/frogr-controller.c:528
+#: src/frogr-controller.c:594
 msgid ""
 "Connection error:\n"
 "Server-side error"
@@ -118,7 +165,7 @@ msgstr ""
 "Ошибка соединения:\n"
 "ошибка на стороне сервера"
 
-#: ../src/frogr-controller.c:532
+#: src/frogr-controller.c:598
 msgid ""
 "Error uploading:\n"
 "File invalid"
@@ -126,7 +173,7 @@ msgstr ""
 "Ошибка загрузки:\n"
 "неверный файл"
 
-#: ../src/frogr-controller.c:536
+#: src/frogr-controller.c:602
 msgid ""
 "Error uploading picture:\n"
 "Quota exceeded"
@@ -134,7 +181,7 @@ msgstr ""
 "Ошибка загрузки изображения:\n"
 "превышение квоты"
 
-#: ../src/frogr-controller.c:541
+#: src/frogr-controller.c:607
 #, c-format
 msgid "Quota exceeded (limit: %d video per month)"
 msgid_plural "Quota exceeded (limit: %d videos per month)"
@@ -142,7 +189,7 @@ msgstr[0] "Квота превышена (лимит: %d в месяц)"
 msgstr[1] "Квота превышена (лимит: %d в месяц)"
 msgstr[2] "Квота превышена (лимит: %d в месяц)"
 
-#: ../src/frogr-controller.c:545
+#: src/frogr-controller.c:611
 msgid ""
 "Error uploading video:\n"
 "You can't upload more videos with this account"
@@ -150,7 +197,7 @@ msgstr ""
 "Ошибка выгрузки видео:\n"
 "для этой учётной записи нельзя больше выгружать видео"
 
-#: ../src/frogr-controller.c:551
+#: src/frogr-controller.c:617
 msgid ""
 "Error:\n"
 "Photo not found"
@@ -158,7 +205,7 @@ msgstr ""
 "Ошибка:\n"
 "фотоснимок не найден"
 
-#: ../src/frogr-controller.c:555
+#: src/frogr-controller.c:621
 msgid ""
 "Error:\n"
 "Photo already in photoset"
@@ -166,7 +213,7 @@ msgstr ""
 "Ошибка:\n"
 "фотоснимок уже есть в альбоме"
 
-#: ../src/frogr-controller.c:559
+#: src/frogr-controller.c:625
 msgid ""
 "Error:\n"
 "Photo already in group"
@@ -174,7 +221,7 @@ msgstr ""
 "Ошибка:\n"
 "фотоснимок уже есть в группе"
 
-#: ../src/frogr-controller.c:563
+#: src/frogr-controller.c:629
 msgid ""
 "Error:\n"
 "Photo already in the maximum number of groups possible"
@@ -182,7 +229,7 @@ msgstr ""
 "Ошибка:\n"
 "фотоснимок находится уже в максимально возможном количестве групп"
 
-#: ../src/frogr-controller.c:567
+#: src/frogr-controller.c:633
 msgid ""
 "Error:\n"
 "Group limit already reached"
@@ -190,7 +237,7 @@ msgstr ""
 "Ошибка:\n"
 "предел для групп уже превышен"
 
-#: ../src/frogr-controller.c:571
+#: src/frogr-controller.c:637
 msgid ""
 "Error:\n"
 "Photo added to group's queue"
@@ -198,7 +245,7 @@ msgstr ""
 "Ошибка:\n"
 "фотоснимок добавлен в очередь группы"
 
-#: ../src/frogr-controller.c:575
+#: src/frogr-controller.c:641
 msgid ""
 "Error:\n"
 "Photo already added to group's queue"
@@ -206,7 +253,7 @@ msgstr ""
 "Ошибка:\n"
 "фотоснимок уже добавлен в очередь группы"
 
-#: ../src/frogr-controller.c:579
+#: src/frogr-controller.c:645
 msgid ""
 "Error:\n"
 "Content not allowed for this group"
@@ -214,8 +261,7 @@ msgstr ""
 "Ошибка:\n"
 "содержимое запрещено для этой группы"
 
-#: ../src/frogr-controller.c:583
-#, c-format
+#: src/frogr-controller.c:649
 msgid ""
 "Authorization failed.\n"
 "Please try again"
@@ -223,12 +269,8 @@ msgstr ""
 "Сбой авторизации.\n"
 "Повторите попытку"
 
-#: ../src/frogr-controller.c:589
+#: src/frogr-controller.c:655
 #, c-format
-#| msgid ""
-#| "Error\n"
-#| "%s is not properly authorized to upload pictures to flickr.\n"
-#| "Please re-authorize it"
 msgid ""
 "Error\n"
 "%s is not properly authorized to upload pictures to Flickr.\n"
@@ -238,11 +280,7 @@ msgstr ""
 "Пользователь %s не авторизован и не может загружать изображения.\n"
 "Выполните повторную авторизацию"
 
-#: ../src/frogr-controller.c:594
-#, c-format
-#| msgid ""
-#| "Authorization failed.\n"
-#| "Please try again"
+#: src/frogr-controller.c:660
 msgid ""
 "Unable to authenticate in Flickr\n"
 "Please try again."
@@ -250,12 +288,8 @@ msgstr ""
 "Сбой авторизации на Flickr.\n"
 "Повторите попытку."
 
-#: ../src/frogr-controller.c:598
+#: src/frogr-controller.c:664
 #, fuzzy, c-format
-#| msgid ""
-#| "You need to properly authorize %s before uploading any pictures to "
-#| "flickr.\n"
-#| "Please re-authorize it."
 msgid ""
 "You have not properly authorized %s yet.\n"
 "Please try again."
@@ -263,8 +297,7 @@ msgstr ""
 "Вы ещё не авторизовались %s.\n"
 "Повторите попытку."
 
-#: ../src/frogr-controller.c:603
-#, c-format
+#: src/frogr-controller.c:669
 msgid ""
 "Invalid verification code.\n"
 "Please try again."
@@ -272,8 +305,7 @@ msgstr ""
 "Неверный проверочный код.\n"
 "Попробуйте ещё раз."
 
-#: ../src/frogr-controller.c:607
-#, c-format
+#: src/frogr-controller.c:673
 msgid ""
 "Error:\n"
 "Service not available"
@@ -281,64 +313,64 @@ msgstr ""
 "Ошибка:\n"
 "служба недоступна"
 
-#. General error: just dump the raw error description
-#: ../src/frogr-controller.c:612
+#: src/frogr-controller.c:678
 #, c-format
 msgid "An error happened: %s."
 msgstr "Произошла ошибка: %s."
 
-#: ../src/frogr-controller.c:811
+#: src/frogr-controller.c:883
 msgid "Authorization failed (timed out)"
 msgstr "Сбой авторизации (превышен лимит времени)"
 
-#: ../src/frogr-controller.c:852
+#: src/frogr-controller.c:931
 #, c-format
 msgid "Retrying Upload (attempt %d/%d)…"
 msgstr "Повторная попытка выгрузки (попытка %d/%d)..."
 
-#: ../src/frogr-controller.c:857
+#: src/frogr-controller.c:936
 #, c-format
 msgid "Uploading '%s'…"
 msgstr "Загрузка «%s»…"
 
-#: ../src/frogr-controller.c:2045
+#: src/frogr-controller.c:2242
 msgid "Updating credentials…"
 msgstr "Обновление учётных данных…"
 
-#: ../src/frogr-controller.c:2050
+#: src/frogr-controller.c:2247
 msgid "Retrieving data for authorization…"
 msgstr "Получение данных для авторизации…"
 
-#: ../src/frogr-controller.c:2055
+#: src/frogr-controller.c:2252
 msgid "Finishing authorization…"
 msgstr "Завершение авторизации..."
 
-#: ../src/frogr-controller.c:2060
+#: src/frogr-controller.c:2257
 msgid "Retrieving list of sets…"
 msgstr "Получение списка альбомов…"
 
-#: ../src/frogr-controller.c:2065
+#: src/frogr-controller.c:2262
 msgid "Retrieving list of groups…"
 msgstr "Получение списка групп…"
 
-#: ../src/frogr-controller.c:2070
+#: src/frogr-controller.c:2267
 msgid "Retrieving list of tags…"
 msgstr "Получение списка меток…"
 
-#: ../src/frogr-controller.c:2187
+#: src/frogr-controller.c:2292
+#, fuzzy
+msgid "Fetching information"
+msgstr "Установить данные о _геолокации"
+
+#: src/frogr-controller.c:2398
 msgid "No sets found"
 msgstr "Альбомы не найдены"
 
-#: ../src/frogr-controller.c:2214
+#: src/frogr-controller.c:2423
 msgid "No groups found"
 msgstr "Группы не найдены"
 
-#: ../src/frogr-controller.c:2894
+#: src/frogr-controller.c:2984
 #, fuzzy, c-format
-#| msgid ""
-#| "You need to properly authorize %s before uploading any pictures to "
-#| "flickr.\n"
-#| "Please re-authorize it."
 msgid ""
 "You need to properly authorize %s before uploading any pictures to Flickr.\n"
 "Please re-authorize it."
@@ -346,179 +378,160 @@ msgstr ""
 "Перед загрузкой каких-либо изображений нужно авторизовать %s.\n"
 "Выполните авторизацию ещё раз."
 
-#: ../src/frogr-controller.c:2904
-#, c-format
-#| msgid ""
-#| "You need to properly authorize %s before uploading any pictures to "
-#| "flickr.\n"
-#| "Please re-authorize it."
+#: src/frogr-controller.c:2994
 msgid "You need to be connected before uploading any pictures to Flickr."
 msgstr "Перед загрузкой изображений необходимо подключиться к Flickr."
 
-#: ../src/frogr-controller.c:2975
-#, c-format
+#: src/frogr-controller.c:3012
+#, fuzzy
+msgid "Uploading Pictures"
+msgstr "_Добавить изображения"
+
+#: src/frogr-controller.c:3057
 msgid "Error opening project file"
 msgstr "Ошибка при открытии файла проекта"
 
-#. This shows a dialog notifying the problem to the user
-#: ../src/frogr-create-new-set-dialog.c:156
-#: ../src/frogr-details-dialog.c:1020
+#: src/frogr-create-new-set-dialog.c:143 src/frogr-details-dialog.c:1001
 msgid "Missing data required"
 msgstr "Отсутствуют необходимые данные"
 
-#: ../src/frogr-create-new-set-dialog.c:342
+#: src/frogr-create-new-set-dialog.c:326
 msgid "Title:"
 msgstr "Название:"
 
-#: ../src/frogr-create-new-set-dialog.c:351
+#: src/frogr-create-new-set-dialog.c:335
 msgid "Description:"
 msgstr "Описание:"
 
-#: ../src/frogr-create-new-set-dialog.c:372
+#: src/frogr-create-new-set-dialog.c:356
 msgid "Fill Pictures Details with Title and Description"
 msgstr "Укажите название и описание"
 
-#: ../src/frogr-create-new-set-dialog.c:393
+#: src/frogr-create-new-set-dialog.c:381
 msgid "Create New Set"
 msgstr "Создать новый альбом"
 
-#: ../src/frogr-details-dialog.c:90
-#: ../src/frogr-settings-dialog.c:100
+#: src/frogr-details-dialog.c:89 src/frogr-settings-dialog.c:97
 msgid "Default (as specified in Flickr)"
 msgstr "По умолчанию (как указано в Flickr)"
 
-#: ../src/frogr-details-dialog.c:91
-#: ../src/frogr-settings-dialog.c:101
+#: src/frogr-details-dialog.c:90 src/frogr-settings-dialog.c:98
 msgid "All rights reserved"
 msgstr "Все права защищены"
 
-#: ../src/frogr-details-dialog.c:92
-#: ../src/frogr-settings-dialog.c:102
+#: src/frogr-details-dialog.c:91 src/frogr-settings-dialog.c:99
 msgid "CC Attribution-NonCommercial-ShareAlike"
 msgstr "CC Attribution-NonCommercial-ShareAlike"
 
-#: ../src/frogr-details-dialog.c:93
-#: ../src/frogr-settings-dialog.c:103
+#: src/frogr-details-dialog.c:92 src/frogr-settings-dialog.c:100
 msgid "CC Attribution-NonCommercial"
 msgstr "CC Attribution-NonCommercial"
 
-#: ../src/frogr-details-dialog.c:94
-#: ../src/frogr-settings-dialog.c:104
+#: src/frogr-details-dialog.c:93 src/frogr-settings-dialog.c:101
 msgid "CC Attribution-NonCommercial-NoDerivs"
 msgstr "CC Attribution-NonCommercial-NoDerivs"
 
-#: ../src/frogr-details-dialog.c:95
-#: ../src/frogr-settings-dialog.c:105
+#: src/frogr-details-dialog.c:94 src/frogr-settings-dialog.c:102
 msgid "CC Attribution"
 msgstr "CC Attribution"
 
-#: ../src/frogr-details-dialog.c:96
-#: ../src/frogr-settings-dialog.c:106
+#: src/frogr-details-dialog.c:95 src/frogr-settings-dialog.c:103
 msgid "CC Attribution-ShareAlike"
 msgstr "CC Attribution-ShareAlike"
 
-#: ../src/frogr-details-dialog.c:97
-#: ../src/frogr-settings-dialog.c:107
+#: src/frogr-details-dialog.c:96 src/frogr-settings-dialog.c:104
 msgid "CC Attribution-NoDerivs"
 msgstr "CC Attribution-NoDerivs"
 
-#: ../src/frogr-details-dialog.c:176
+#: src/frogr-details-dialog.c:172
 msgid "Open with image viewer"
 msgstr "Открыть с помощью просмотрщика"
 
-#: ../src/frogr-details-dialog.c:201
+#: src/frogr-details-dialog.c:190
+msgid "_Title:"
+msgstr "_Название:"
+
+#: src/frogr-details-dialog.c:200
+msgid "_Description:"
+msgstr "_Описание:"
+
+#: src/frogr-details-dialog.c:224
+msgid "Ta_gs:"
+msgstr "_Метки:"
+
+#: src/frogr-details-dialog.c:247
 msgid "Visibility"
 msgstr "Доступность"
 
-#: ../src/frogr-details-dialog.c:213
-#: ../src/frogr-settings-dialog.c:202
+#: src/frogr-details-dialog.c:257 src/frogr-settings-dialog.c:196
 msgid "_Private"
 msgstr "_Личное"
 
-#: ../src/frogr-details-dialog.c:217
-#: ../src/frogr-settings-dialog.c:204
+#: src/frogr-details-dialog.c:261 src/frogr-settings-dialog.c:199
 msgid "P_ublic"
 msgstr "_Общедоступное"
 
-#: ../src/frogr-details-dialog.c:226
-#: ../src/frogr-settings-dialog.c:212
-msgid "Visible to _Family"
-msgstr "Доступно для _членов семьи"
+#: src/frogr-details-dialog.c:270 src/frogr-settings-dialog.c:207
+msgid "_Family"
+msgstr ""
 
-#: ../src/frogr-details-dialog.c:230
-#: ../src/frogr-settings-dialog.c:214
-msgid "Visible to F_riends"
-msgstr "Доступно для _друзей"
+#: src/frogr-details-dialog.c:274 src/frogr-settings-dialog.c:209
+msgid "F_riends"
+msgstr ""
 
-#: ../src/frogr-details-dialog.c:256
+#: src/frogr-details-dialog.c:288
 msgid "Content Type"
 msgstr "Тип содержимого"
 
-#: ../src/frogr-details-dialog.c:265
-#: ../src/frogr-settings-dialog.c:241
+#: src/frogr-details-dialog.c:296 src/frogr-settings-dialog.c:234
 msgid "P_hoto"
 msgstr "_Фотоснимок"
 
-#: ../src/frogr-details-dialog.c:269
-#: ../src/frogr-settings-dialog.c:243
+#: src/frogr-details-dialog.c:300 src/frogr-settings-dialog.c:236
 msgid "Scree_nshot"
 msgstr "_Снимок экрана"
 
-#: ../src/frogr-details-dialog.c:273
-#: ../src/frogr-settings-dialog.c:245
+#: src/frogr-details-dialog.c:304 src/frogr-settings-dialog.c:238
 msgid "Oth_er"
 msgstr "_Другое"
 
-#: ../src/frogr-details-dialog.c:289
+#: src/frogr-details-dialog.c:317
 msgid "Safety Level"
 msgstr "Уровень безопасности"
 
-#: ../src/frogr-details-dialog.c:298
-#: ../src/frogr-settings-dialog.c:266
+#: src/frogr-details-dialog.c:325 src/frogr-settings-dialog.c:260
 msgid "S_afe"
 msgstr "_Безопасный"
 
-#: ../src/frogr-details-dialog.c:302
-#: ../src/frogr-settings-dialog.c:268
+#: src/frogr-details-dialog.c:329 src/frogr-settings-dialog.c:262
 msgid "_Moderate"
 msgstr "_Умеренный"
 
-#: ../src/frogr-details-dialog.c:306
-#: ../src/frogr-settings-dialog.c:270
+#: src/frogr-details-dialog.c:333 src/frogr-settings-dialog.c:264
 msgid "Restr_icted"
 msgstr "_Конфиденциальный"
 
-#: ../src/frogr-details-dialog.c:320
+#: src/frogr-details-dialog.c:345
 msgid "License Type"
 msgstr "Тип лицензии"
 
-#: ../src/frogr-details-dialog.c:344
+#: src/frogr-details-dialog.c:367
 msgid "Other Properties"
 msgstr "Другие свойства"
 
-#: ../src/frogr-details-dialog.c:353
-msgid "Set Geo_location Information"
-msgstr "Установить данные о _геолокации"
-
-#: ../src/frogr-details-dialog.c:357
-#| msgid "_Show up in Global Search Results"
+#: src/frogr-details-dialog.c:375
 msgid "_Show Up in Global Search Results"
 msgstr "_Показывать в общих результатах поиска"
 
-#: ../src/frogr-details-dialog.c:371
-msgid "_Title:"
-msgstr "_Название:"
-
-#: ../src/frogr-details-dialog.c:381
-msgid "_Description:"
-msgstr "_Описание:"
+#: src/frogr-details-dialog.c:379
+msgid "Set Geo_location Information"
+msgstr "Установить данные о _геолокации"
 
-#: ../src/frogr-details-dialog.c:405
-msgid "Ta_gs:"
-msgstr "_Метки:"
+#: src/frogr-details-dialog.c:383
+msgid "Replace 'Date Posted' with 'Date Taken'"
+msgstr ""
 
-#. Visually indicate how many pictures are being edited
-#: ../src/frogr-details-dialog.c:500
+#: src/frogr-details-dialog.c:475
 #, c-format
 msgid "(%d Picture)"
 msgid_plural "(%d Pictures)"
@@ -526,21 +539,24 @@ msgstr[0] "(%d изображение)"
 msgstr[1] "(%d изображения)"
 msgstr[2] "(%d изображений)"
 
-#: ../src/frogr-details-dialog.c:574
-#| msgid "An error happened while uploading a picture: %s."
+#: src/frogr-details-dialog.c:548
 msgid "An error happened trying to load the picture"
 msgstr "При загрузке изображения возникла ошибка"
 
-#: ../src/frogr-details-dialog.c:1223
+#: src/frogr-details-dialog.c:1169
+msgid "_Edit"
+msgstr "_Правка"
+
+#: src/frogr-details-dialog.c:1197
 msgid "Edit Picture Details"
 msgstr "Изменить данные об изображении"
 
-#: ../src/frogr-file-loader.c:147
+#: src/frogr-file-loader.c:142
 #, c-format
 msgid "Loading files %d / %d"
 msgstr "Загрузка файлов %d / %d"
 
-#: ../src/frogr-file-loader.c:564
+#: src/frogr-file-loader.c:369
 #, c-format
 msgid ""
 "Unable to load picture %s:\n"
@@ -549,7 +565,7 @@ msgstr ""
 "Не удалось загрузить изображение %s:\n"
 "%s"
 
-#: ../src/frogr-file-loader.c:595
+#: src/frogr-file-loader.c:400
 #, c-format
 msgid ""
 "Unable to load video %s\n"
@@ -558,366 +574,323 @@ msgstr ""
 "Не удалось загрузить видео %s\n"
 "Проверьте, установлен ли нужный кодек"
 
-#. First %s is the title of the picture (filename of the file by
-#. default). Second %s is the max allowed size for a picture to be
-#. uploaded to flickr (different for free and PRO accounts).
-#: ../src/frogr-file-loader.c:835
+#: src/frogr-file-loader.c:636
 #, c-format
 msgid ""
 "Can't load file %s:\n"
 "Size of file is bigger than the maximum allowed for this account (%s)"
 msgstr ""
 "Не удалось загрузить файл %s:\n"
-"размер файла больше максимально допустимого размера для этой учётной записи (%s)"
+"размер файла больше максимально допустимого размера для этой учётной записи "
+"(%s)"
 
-#: ../src/frogr-main-view.c:832
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:4
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
+msgid "Open"
+msgstr "Открыть"
+
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
+msgid "Open Existing Project"
+msgstr "Открыть существующий проект"
+
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
+msgid "Add"
+msgstr "Добавить"
+
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
+msgid "Add Elements"
+msgstr "Добавить элементы"
+
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
+msgid "Remove"
+msgstr "Удалить"
+
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
+msgid "Remove Elements"
+msgstr "Удалить элементы"
+
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
+msgid "Upload"
+msgstr "Загрузить"
+
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
+msgid "Upload All"
+msgstr "Выгрузить всё"
+
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
+msgid "Save"
+msgstr "Сохранить"
+
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
+msgid "Save Current Project"
+msgstr "Сохранить текущий проект"
+
+#: src/frogr-main-view.c:1016
 msgid "_About"
 msgstr "_О программе"
 
-#. Create the submenu and insert it in the right section
-#: ../src/frogr-main-view.c:888
+#: src/frogr-main-view.c:1020
+msgid "_Quit"
+msgstr "_Закончить"
+
+#: src/frogr-main-view.c:1070
 msgid "Accounts"
 msgstr "Учётные записи"
 
-#. String showind the date and time a picture was taken
-#: ../src/frogr-main-view.c:1122
+#: src/frogr-main-view.c:1410
 #, c-format
 msgid "Taken: %s"
 msgstr "Дата съёмки: %s"
 
-#: ../src/frogr-main-view.c:1127
+#: src/frogr-main-view.c:1415
 #, c-format
 msgid "File size: %s"
 msgstr "Размер файла: %s"
 
-#: ../src/frogr-main-view.c:1250
+#: src/frogr-main-view.c:1540
 msgid "Select File"
 msgstr "Выберите файл"
 
-#: ../src/frogr-main-view.c:1263
-#| msgid "Error opening project file"
+#: src/frogr-main-view.c:1544 src/frogr-main-view.c:1671
+#, fuzzy
+msgid "_Open"
+msgstr "Открыть"
+
+#: src/frogr-main-view.c:1553
 msgid "Frogr Project Files"
 msgstr "Файлы проекта"
 
-#: ../src/frogr-main-view.c:1323
+#: src/frogr-main-view.c:1615
 msgid "Select Destination"
 msgstr "Выберите назначение"
 
-#: ../src/frogr-main-view.c:1330
+#: src/frogr-main-view.c:1619
+msgid "_Save"
+msgstr "_Сохранить"
+
+#: src/frogr-main-view.c:1622
 msgid "Untitled Project.frogr"
 msgstr "Безымянный проект.frogr"
 
-#: ../src/frogr-main-view.c:1376
+#: src/frogr-main-view.c:1667
 msgid "Select a Picture"
 msgstr "Выберите изображение"
 
-#: ../src/frogr-main-view.c:1417
+#: src/frogr-main-view.c:1694
 msgid "All Files"
 msgstr "Все файлы"
 
-#: ../src/frogr-main-view.c:1420
+#: src/frogr-main-view.c:1697
 msgid "Image Files"
 msgstr "Изображения"
 
-#: ../src/frogr-main-view.c:1423
+#: src/frogr-main-view.c:1701
 msgid "Video Files"
 msgstr "Видео"
 
-#: ../src/frogr-main-view.c:1444
+#: src/frogr-main-view.c:1723
 msgid "You don't have any picture added yet"
 msgstr "Изображения ещё не добавлены"
 
-#: ../src/frogr-main-view.c:1459
+#: src/frogr-main-view.c:1736
 msgid "You need to select some pictures first"
 msgstr "Сначала необходимо выбрать изображения"
 
-#: ../src/frogr-main-view.c:1919
+#: src/frogr-main-view.c:2108
 msgid "Not connected to Flickr"
 msgstr "Не подключено к Flickr"
 
-#. Login string, showing the user is PRO (second '%s') if so.
-#: ../src/frogr-main-view.c:1929
+#: src/frogr-main-view.c:2118
 #, c-format
 msgid "Connected as %s%s"
 msgstr "Подключён как %s%s"
 
-#: ../src/frogr-main-view.c:1930
+#: src/frogr-main-view.c:2119
 msgid " (PRO account)"
 msgstr " (учётная запись PRO)"
 
-#. Will show in the status bar the amount of data (in KB, MB
-#. or GB) the user is currently allowed to upload to flicker
-#. till the end of the month, in a CURRENT / MAX fashion.
-#. The '-' at the beginning is just a separator, since more
-#. blocks of text will be shown in the status bar too.
-#: ../src/frogr-main-view.c:1954
+#: src/frogr-main-view.c:2143
 #, c-format
-#| msgid " - %s / %s remaining for the current month"
 msgid " - %s / %s remaining"
 msgstr " — осталось %s / %s"
 
-#. Will show in the status bar the amount of pictures and data
-#. (in KB, MB or GB) that would be uploaded as the sum of the
-#. sizes for every picture loaded in the application
-#: ../src/frogr-main-view.c:1980
+#: src/frogr-main-view.c:2169
 #, c-format
-#| msgid " - %s to be uploaded"
 msgid " - %d file to upload (%s)"
 msgid_plural " - %d files to upload (%s)"
 msgstr[0] " — %d файл будет загружен (%s)"
 msgstr[1] " — %d файла будет загружено (%s)"
 msgstr[2] " — %d файлов будет загружено (%s)"
 
-#: ../src/frogr-settings-dialog.c:189
+#: src/frogr-settings-dialog.c:185
 msgid "Default Visibility"
 msgstr "Доступность по умолчанию"
 
-#: ../src/frogr-settings-dialog.c:229
+#: src/frogr-settings-dialog.c:224
 msgid "Default Content Type"
 msgstr "Тип содержимого по умолчанию"
 
-#: ../src/frogr-settings-dialog.c:254
+#: src/frogr-settings-dialog.c:250
 msgid "Default Safety Level"
 msgstr "Уровень безопасности по умолчанию"
 
-#: ../src/frogr-settings-dialog.c:279
+#: src/frogr-settings-dialog.c:276
 msgid "Default License"
 msgstr "Лицензия по умолчанию"
 
-#: ../src/frogr-settings-dialog.c:303
+#: src/frogr-settings-dialog.c:302
 msgid "Other Defaults"
 msgstr "Другие параметры"
 
-#: ../src/frogr-settings-dialog.c:315
+#: src/frogr-settings-dialog.c:312
+msgid "_Show Pictures in Global Search Results"
+msgstr "_Показывать в общих результатах поиска"
+
+#: src/frogr-settings-dialog.c:315
 msgid "Set Geo_location Information for Pictures"
 msgstr "_Установить данные о геолокации"
 
-#: ../src/frogr-settings-dialog.c:318
-msgid "_Show Pictures in Global Search Results"
-msgstr "_Показывать в общих результатах поиска"
+#: src/frogr-settings-dialog.c:318
+msgid "Replace 'Date Posted' with 'Date Taken' for Pictures"
+msgstr ""
 
-#: ../src/frogr-settings-dialog.c:324
+#: src/frogr-settings-dialog.c:324
 msgid "_General"
 msgstr "_Основное"
 
-#: ../src/frogr-settings-dialog.c:349
+#: src/frogr-settings-dialog.c:344
 msgid "Proxy Settings"
 msgstr "Параметры прокси"
 
-#. Enable proxy
-#: ../src/frogr-settings-dialog.c:359
+#: src/frogr-settings-dialog.c:353
 msgid "_Enable HTTP Proxy"
 msgstr "_Использовать HTTP-прокси"
 
-#: ../src/frogr-settings-dialog.c:371
+#: src/frogr-settings-dialog.c:363
 msgid "_Host:"
 msgstr "_Узел:"
 
-#. Proxy port
-#: ../src/frogr-settings-dialog.c:384
+#: src/frogr-settings-dialog.c:376
 msgid "_Port:"
 msgstr "_Порт:"
 
-#. Proxy username
-#: ../src/frogr-settings-dialog.c:397
+#: src/frogr-settings-dialog.c:389
 msgid "U_sername:"
 msgstr "И_мя пользователя:"
 
-#. Proxy password
-#: ../src/frogr-settings-dialog.c:410
+#: src/frogr-settings-dialog.c:402
 msgid "Pass_word:"
 msgstr "Па_роль:"
 
-#: ../src/frogr-settings-dialog.c:450
+#: src/frogr-settings-dialog.c:426
 msgid "Connec_tion"
 msgstr "_Соединение"
 
-#: ../src/frogr-settings-dialog.c:473
+#: src/frogr-settings-dialog.c:444
 msgid "Other options"
 msgstr "Другие параметры"
 
-#: ../src/frogr-settings-dialog.c:485
-#| msgid "Disa_ble Tags Auto-Completion"
+#: src/frogr-settings-dialog.c:454
 msgid "Ena_ble Tags Auto-Completion"
 msgstr "Включить _автодополнение меток"
 
-#: ../src/frogr-settings-dialog.c:488
+#: src/frogr-settings-dialog.c:457
 msgid "_Import Tags from Pictures Metadata"
 msgstr "_Импортировать тэги из метаданных"
 
-#: ../src/frogr-settings-dialog.c:492
+#: src/frogr-settings-dialog.c:461
 msgid "Use _Dark GTK Theme"
 msgstr "Использовать _тёмную тему GTK"
 
-#: ../src/frogr-settings-dialog.c:496
+#: src/frogr-settings-dialog.c:465
 msgid "_Keep File Extensions in Titles when Loading"
 msgstr "_Не удалять расширение файлов из заголовков при загрузке"
 
-#: ../src/frogr-settings-dialog.c:502
+#: src/frogr-settings-dialog.c:471
 msgid "_Misc"
 msgstr "_Разное"
 
-#: ../src/frogr-settings-dialog.c:1038
+#: src/frogr-settings-dialog.c:972
 msgid "Preferences"
 msgstr "Настройки"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:1
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:9
-#| msgid "Edit _Details…"
-msgid "_Edit Details…"
-msgstr "Изменить _подробности…"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:2
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:10
-msgid "Add _Tags…"
-msgstr "Добавить _метки…"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:3
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:11
-msgid "Add to _Group…"
-msgstr "Добавить в _группу…"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:4
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:12
-msgid "Add to _Photoset"
-msgstr "Добавить в _альбом"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:5
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:13
-msgid "_Add to Existing Photoset…"
-msgstr "Добавить в существующий _альбом…"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:6
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:14
-msgid "_Create New Photoset…"
-msgstr "_Создать новый альбом…"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:7
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:15
-msgid "_Open in External Viewer"
-msgstr "_Открыть внешним приложением"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:8
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:6
-msgid "_Remove Elements"
-msgstr "_Удалить элементы"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:9
-msgid "Open Existing Project"
-msgstr "Открыть существующий проект"
+#~ msgid "Visible to _Family"
+#~ msgstr "Доступно для _членов семьи"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:10
-msgid "Open"
-msgstr "Открыть"
+#~ msgid "Visible to F_riends"
+#~ msgstr "Доступно для _друзей"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:11
-msgid "Save Current Project"
-msgstr "Сохранить текущий проект"
+#~| msgid "Edit _Details…"
+#~ msgid "_Edit Details…"
+#~ msgstr "Изменить _подробности…"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:12
-msgid "Save"
-msgstr "Сохранить"
+#~ msgid "Add _Tags…"
+#~ msgstr "Добавить _метки…"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:13
-msgid "Add Elements"
-msgstr "Добавить элементы"
+#~ msgid "Add to _Group…"
+#~ msgstr "Добавить в _группу…"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:14
-msgid "Add"
-msgstr "Добавить"
+#~ msgid "Add to _Photoset"
+#~ msgstr "Добавить в _альбом"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:15
-msgid "Remove Elements"
-msgstr "Удалить элементы"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:16
-msgid "Remove"
-msgstr "Удалить"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:17
-msgid "Upload All"
-msgstr "Выгрузить всё"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:18
-msgid "Upload"
-msgstr "Загрузить"
+#~ msgid "_Add to Existing Photoset…"
+#~ msgstr "Добавить в существующий _альбом…"
 
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:1
-msgid "Aut_horize Account…"
-msgstr "_Авторизовать учётную запись…"
+#~ msgid "_Create New Photoset…"
+#~ msgstr "_Создать новый альбом…"
 
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:2
-msgid "_Preferences…"
-msgstr "_Настройки…"
+#~ msgid "_Open in External Viewer"
+#~ msgstr "_Открыть внешним приложением"
 
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:3
-msgid "_Help"
-msgstr "_Справка"
+#~ msgid "_Remove Elements"
+#~ msgstr "_Удалить элементы"
 
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:5
-msgid "_Quit"
-msgstr "_Закончить"
+#~ msgid "Aut_horize Account…"
+#~ msgstr "_Авторизовать учётную запись…"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:1
-msgid "_File"
-msgstr "_Файл"
+#~ msgid "_Preferences…"
+#~ msgstr "_Настройки…"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:2
-msgid "_Open…"
-msgstr "_Открыть..."
+#~ msgid "_Help"
+#~ msgstr "_Справка"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:3
-msgid "_Save"
-msgstr "_Сохранить"
+#~ msgid "_File"
+#~ msgstr "_Файл"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:4
-msgid "Save _As…"
-msgstr "Сохранить _как..."
+#~ msgid "_Open…"
+#~ msgstr "_Открыть..."
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:5
-msgid "A_dd Elements…"
-msgstr "_Добавить элементы..."
+#~ msgid "Save _As…"
+#~ msgstr "Сохранить _как..."
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:7
-msgid "_Upload All"
-msgstr "_Загрузить все"
+#~ msgid "A_dd Elements…"
+#~ msgstr "_Добавить элементы..."
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:8
-msgid "_Edit"
-msgstr "_Правка"
+#~ msgid "_Upload All"
+#~ msgstr "_Загрузить все"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:16
-msgid "_View"
-msgstr "_Вид"
+#~ msgid "_View"
+#~ msgstr "_Вид"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:17
-msgid "_Sort Elements"
-msgstr "_Упорядочить элементы"
+#~ msgid "_Sort Elements"
+#~ msgstr "_Упорядочить элементы"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:18
-msgid "As _Loaded"
-msgstr "По _загрузке"
+#~ msgid "As _Loaded"
+#~ msgstr "По _загрузке"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:19
-msgid "By _Date Taken"
-msgstr "По _дате"
+#~ msgid "By _Date Taken"
+#~ msgstr "По _дате"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:20
-msgid "By _Title"
-msgstr "По _названию"
+#~ msgid "By _Title"
+#~ msgstr "По _названию"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:21
-msgid "By _Size"
-msgstr "По _размеру"
+#~ msgid "By _Size"
+#~ msgstr "По _размеру"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:22
-msgid "_Reversed Order"
-msgstr "_В обратном порядке"
+#~ msgid "_Reversed Order"
+#~ msgstr "_В обратном порядке"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:23
-msgid "Enable _Tooltips"
-msgstr "Разрешить _всплывающие подсказки"
+#~ msgid "Enable _Tooltips"
+#~ msgstr "Разрешить _всплывающие подсказки"
 
 #~ msgid "Text Files"
 #~ msgstr "Текстовые файлы"
@@ -944,9 +917,6 @@ msgstr "Разрешить _всплывающие подсказки"
 #~ msgid "Set's title:"
 #~ msgstr "Название альбома:"
 
-#~ msgid "_Add Pictures"
-#~ msgstr "_Добавить изображения"
-
 #~ msgid "_Remove Pictures"
 #~ msgstr "_Удалить изображения"
 
diff --git a/po/sl.po b/po/sl.po
index e917ed8..716a741 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -8,9 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: frogr master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=frogr&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-07-08 17:01+0000\n"
+"Report-Msgid-Bugs-To: msanchez gnome org\n"
+"POT-Creation-Date: 2016-08-12 13:09+0100\n"
 "PO-Revision-Date: 2015-07-08 21:30+0100\n"
 "Last-Translator: Matej Urbančič <mateju svn gnome org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si googlegroups com>\n"
@@ -23,15 +22,26 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Generator: Poedit 1.7.5\n"
 
-#: ../data/frogr.appdata.xml.in.h:1
+#: data/frogr.appdata.xml.in:5 data/frogr.desktop.in.in:5
+#: data/frogr.desktop.in.in:14
+msgid "frogr"
+msgstr "frogr"
+
+#: data/frogr.appdata.xml.in:6 data/frogr.desktop.in.in:6
+#, fuzzy
+msgid "frogr: a Flickr Remote Organizer for GNOME"
+msgstr "Frogr: oddaljeni organizator slik za GNOME Flickr"
+
+#: data/frogr.appdata.xml.in:8
+#, fuzzy
 msgid ""
-"Frogr is a small application for the GNOME desktop that allows users to "
+"frogr is a small application for the GNOME desktop that allows users to "
 "manage their accounts in the Flickr image hosting website."
 msgstr ""
 "Frogr je program namizja Gnome, ki omogoča urejanje uporabniških računov "
 "spletišča Flickr."
 
-#: ../data/frogr.appdata.xml.in.h:2
+#: data/frogr.appdata.xml.in:13
 msgid ""
 "It supports all the basic Flickr features, including uploading pictures, "
 "adding descriptions, setting tags and managing sets and groups pools."
@@ -39,73 +49,74 @@ msgstr ""
 "Podpira vse osnovne zmožnosti spletišča Flickr, vključno s pošiljanjem slik, "
 "dodajanjem opisa, nastavljanje oznak in urejanje skupin."
 
-#: ../data/frogr.desktop.in.in.h:1
-msgid "Frogr"
-msgstr "Frogr"
+#: data/frogr.appdata.xml.in:24
+#, fuzzy
+msgid "Screenshot of frogr"
+msgstr "_Zaslonska slika"
 
-#: ../data/frogr.desktop.in.in.h:2
-msgid "Frogr: a Flickr Remote Organizer for GNOME"
-msgstr "Frogr: oddaljeni organizator slik za GNOME Flickr"
+#: data/frogr.appdata.xml.in:29
+msgid "Mario Sanchez Prada"
+msgstr ""
 
-#: ../data/frogr.desktop.in.in.h:3
+#: data/frogr.desktop.in.in:7
 msgid "Upload and organize photos in Flickr accounts"
 msgstr "Pošiljanje in organiziranje slik na računih Flickr"
 
-#: ../data/frogr.desktop.in.in.h:4
+#: data/frogr.desktop.in.in:8
 msgid "Flickr;Image;Picture;Photo;Video;Uploader;"
 msgstr "Flickr;slika;fotografija;foto;video;pošiljalnik;"
 
-#: ../src/frogr-about-dialog.c:43
-msgid "A Flickr remote organizer for GNOME\n"
+#: src/frogr-about-dialog.c:43
+#, fuzzy
+msgid "A Flickr Remote Organizer for GNOME\n"
 msgstr "Oddaljeni organizator slik GNOME Flickr\n"
 
-#: ../src/frogr-about-dialog.c:72
+#: src/frogr-about-dialog.c:72
 msgid "translator-credits"
 msgstr "Saša Batistič <sasa batistic gmail com>"
 
-#: ../src/frogr-add-tags-dialog.c:198 ../src/frogr-add-to-group-dialog.c:552
-#: ../src/frogr-add-to-set-dialog.c:553 ../src/frogr-auth-dialog.c:153
-#: ../src/frogr-create-new-set-dialog.c:329 ../src/frogr-details-dialog.c:1195
-#: ../src/frogr-main-view.c:1600 ../src/frogr-main-view.c:1679
-#: ../src/frogr-main-view.c:1731 ../src/frogr-settings-dialog.c:961
+#: src/frogr-add-tags-dialog.c:191 src/frogr-add-to-group-dialog.c:528
+#: src/frogr-add-to-set-dialog.c:529 src/frogr-auth-dialog.c:153
+#: src/frogr-create-new-set-dialog.c:310 src/frogr-details-dialog.c:1168
+#: src/frogr-main-view.c:1543 src/frogr-main-view.c:1618
+#: src/frogr-main-view.c:1670 src/frogr-settings-dialog.c:930
 msgid "_Cancel"
 msgstr "_Prekliči"
 
-#: ../src/frogr-add-tags-dialog.c:200 ../src/frogr-add-to-group-dialog.c:554
-#: ../src/frogr-add-to-set-dialog.c:555
-#: ../src/frogr-create-new-set-dialog.c:331
+#: src/frogr-add-tags-dialog.c:193 src/frogr-add-to-group-dialog.c:530
+#: src/frogr-add-to-set-dialog.c:531 src/frogr-create-new-set-dialog.c:312
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: ../src/frogr-add-tags-dialog.c:209
+#: src/frogr-add-tags-dialog.c:202
 msgid "Enter a spaces separated list of tags:"
 msgstr "Vnesite oznake ločene s presledki:"
 
-#: ../src/frogr-add-tags-dialog.c:235
+#: src/frogr-add-tags-dialog.c:228
 msgid "Add Tags"
 msgstr "Dodaj oznako"
 
-#: ../src/frogr-add-to-group-dialog.c:154
+#: src/frogr-add-to-group-dialog.c:147
 msgid "Name"
 msgstr "Ime"
 
-#: ../src/frogr-add-to-group-dialog.c:169 ../src/frogr-add-to-set-dialog.c:170
+#: src/frogr-add-to-group-dialog.c:162 src/frogr-add-to-set-dialog.c:163
 msgid "Elements"
 msgstr "Predmeti"
 
-#: ../src/frogr-add-to-group-dialog.c:605
+#: src/frogr-add-to-group-dialog.c:581
 msgid "Add to Groups"
 msgstr "Dodaj skupinam"
 
-#: ../src/frogr-add-to-set-dialog.c:155
+#: src/frogr-add-to-set-dialog.c:148
 msgid "Title"
 msgstr "Naslov"
 
-#: ../src/frogr-add-to-set-dialog.c:606
+#: src/frogr-add-to-set-dialog.c:582
 msgid "Add to Sets"
 msgstr "Dodaj naborom"
 
-#: ../src/frogr-auth-dialog.c:59
+#: src/frogr-auth-dialog.c:59
 #, c-format
 msgid ""
 "Please press the button to authorize %s and then come back to complete the "
@@ -114,30 +125,29 @@ msgstr ""
 "Pritisnite gumb za overitev %s in se vrnite na to okno za dokončanje "
 "opravila."
 
-#: ../src/frogr-auth-dialog.c:63 ../src/frogr-auth-dialog.c:149
-#: ../src/frogr-controller.c:2373
+#: src/frogr-auth-dialog.c:63 src/frogr-auth-dialog.c:149
+#: src/frogr-controller.c:2286
 #, c-format
 msgid "Authorize %s"
 msgstr "Pooblasti %s"
 
-#: ../src/frogr-auth-dialog.c:155 ../src/frogr-settings-dialog.c:963
+#: src/frogr-auth-dialog.c:155 src/frogr-settings-dialog.c:932
 msgid "_Close"
 msgstr "_Zapri"
 
-#. Description label
-#: ../src/frogr-auth-dialog.c:167
+#: src/frogr-auth-dialog.c:167
 msgid "Enter verification code:"
 msgstr "Vnos kode za overitev:"
 
-#: ../src/frogr-auth-dialog.c:221
+#: src/frogr-auth-dialog.c:221
 msgid "Invalid verification code"
 msgstr "Neveljavna overitvena koda "
 
-#: ../src/frogr-controller.c:597
+#: src/frogr-controller.c:581
 msgid "Process cancelled"
 msgstr "Opravilo je bilo prekinjeno"
 
-#: ../src/frogr-controller.c:602
+#: src/frogr-controller.c:586
 msgid ""
 "Connection error:\n"
 "Network not available"
@@ -145,7 +155,7 @@ msgstr ""
 "Napaka povezave:\n"
 "omrežje ni na voljo"
 
-#: ../src/frogr-controller.c:606
+#: src/frogr-controller.c:590
 msgid ""
 "Connection error:\n"
 "Bad request"
@@ -153,7 +163,7 @@ msgstr ""
 "Napaka povezave:\n"
 "slaba zahteva"
 
-#: ../src/frogr-controller.c:610
+#: src/frogr-controller.c:594
 msgid ""
 "Connection error:\n"
 "Server-side error"
@@ -161,7 +171,7 @@ msgstr ""
 "Napaka povezave:\n"
 "napaka s strani strežnika"
 
-#: ../src/frogr-controller.c:614
+#: src/frogr-controller.c:598
 msgid ""
 "Error uploading:\n"
 "File invalid"
@@ -169,7 +179,7 @@ msgstr ""
 "Napaka med pošiljanjem:\n"
 "neveljavna datoteka."
 
-#: ../src/frogr-controller.c:618
+#: src/frogr-controller.c:602
 msgid ""
 "Error uploading picture:\n"
 "Quota exceeded"
@@ -177,7 +187,7 @@ msgstr ""
 "Napaka med pošiljanjem slike:\n"
 "količinska omejitev je presežena."
 
-#: ../src/frogr-controller.c:623
+#: src/frogr-controller.c:607
 #, c-format
 msgid "Quota exceeded (limit: %d video per month)"
 msgid_plural "Quota exceeded (limit: %d videos per month)"
@@ -186,7 +196,7 @@ msgstr[1] "Presežena je omejitev (omejitev: %d posnetek na mesec)"
 msgstr[2] "Presežena je omejitev (omejitev: %d posnetka na mesec)"
 msgstr[3] "Presežena je omejitev (omejitev: %d posnetki na mesec)"
 
-#: ../src/frogr-controller.c:627
+#: src/frogr-controller.c:611
 msgid ""
 "Error uploading video:\n"
 "You can't upload more videos with this account"
@@ -194,7 +204,7 @@ msgstr ""
 "Napaka pošiljanja videa:\n"
 "S tem računom ni več mogoče pošiljati posnetkov"
 
-#: ../src/frogr-controller.c:633
+#: src/frogr-controller.c:617
 msgid ""
 "Error:\n"
 "Photo not found"
@@ -202,7 +212,7 @@ msgstr ""
 "Napaka:\n"
 "fotografije ni mogoče najti"
 
-#: ../src/frogr-controller.c:637
+#: src/frogr-controller.c:621
 msgid ""
 "Error:\n"
 "Photo already in photoset"
@@ -210,7 +220,7 @@ msgstr ""
 "Napaka:\n"
 "fotografija je že v naboru fotografij"
 
-#: ../src/frogr-controller.c:641
+#: src/frogr-controller.c:625
 msgid ""
 "Error:\n"
 "Photo already in group"
@@ -218,7 +228,7 @@ msgstr ""
 "Napaka:\n"
 "fotografija je že v skupini"
 
-#: ../src/frogr-controller.c:645
+#: src/frogr-controller.c:629
 msgid ""
 "Error:\n"
 "Photo already in the maximum number of groups possible"
@@ -226,7 +236,7 @@ msgstr ""
 "Napaka:\n"
 "fotografija je že v največ dovoljenih skupinah "
 
-#: ../src/frogr-controller.c:649
+#: src/frogr-controller.c:633
 msgid ""
 "Error:\n"
 "Group limit already reached"
@@ -234,7 +244,7 @@ msgstr ""
 "Napaka:\n"
 "omejitev skupine je že dosežena."
 
-#: ../src/frogr-controller.c:653
+#: src/frogr-controller.c:637
 msgid ""
 "Error:\n"
 "Photo added to group's queue"
@@ -242,7 +252,7 @@ msgstr ""
 "Napaka:\n"
 "fotografija je dodana v čakalno vrsto skupine"
 
-#: ../src/frogr-controller.c:657
+#: src/frogr-controller.c:641
 msgid ""
 "Error:\n"
 "Photo already added to group's queue"
@@ -250,7 +260,7 @@ msgstr ""
 "Napaka:\n"
 "fotografija je že dodana v čakalno vrsto skupine"
 
-#: ../src/frogr-controller.c:661
+#: src/frogr-controller.c:645
 msgid ""
 "Error:\n"
 "Content not allowed for this group"
@@ -258,8 +268,7 @@ msgstr ""
 "Napaka:\n"
 "vsebina ni dovoljena za to skupino"
 
-#: ../src/frogr-controller.c:665
-#, c-format
+#: src/frogr-controller.c:649
 msgid ""
 "Authorization failed.\n"
 "Please try again"
@@ -267,7 +276,7 @@ msgstr ""
 "Pooblastitev je spodletela.\n"
 "poskusite znova"
 
-#: ../src/frogr-controller.c:671
+#: src/frogr-controller.c:655
 #, c-format
 msgid ""
 "Error\n"
@@ -278,8 +287,7 @@ msgstr ""
 "%s ni pravilno odobren za pošiljanje slik na Flickr.\n"
 "Treba je znova odobriti."
 
-#: ../src/frogr-controller.c:676
-#, c-format
+#: src/frogr-controller.c:660
 msgid ""
 "Unable to authenticate in Flickr\n"
 "Please try again."
@@ -287,7 +295,7 @@ msgstr ""
 "Ni mogoče overiti v sistemu Flickr.\n"
 "Poskusite znova."
 
-#: ../src/frogr-controller.c:680
+#: src/frogr-controller.c:664
 #, c-format
 msgid ""
 "You have not properly authorized %s yet.\n"
@@ -296,8 +304,7 @@ msgstr ""
 "%s je treba pred pošiljanjem slik na na flickr pravilno odobriti.\n"
 "Poskusite znova."
 
-#: ../src/frogr-controller.c:685
-#, c-format
+#: src/frogr-controller.c:669
 msgid ""
 "Invalid verification code.\n"
 "Please try again."
@@ -305,8 +312,7 @@ msgstr ""
 "Neveljavna koda za pooblastitev.\n"
 "Poskusite znova."
 
-#: ../src/frogr-controller.c:689
-#, c-format
+#: src/frogr-controller.c:673
 msgid ""
 "Error:\n"
 "Service not available"
@@ -314,64 +320,62 @@ msgstr ""
 "Napaka:\n"
 "storitev ni na voljo."
 
-#. General error: just dump the raw error description
-#: ../src/frogr-controller.c:694
+#: src/frogr-controller.c:678
 #, c-format
 msgid "An error happened: %s."
 msgstr "Prišlo je do napake: %s."
 
-#: ../src/frogr-controller.c:910
+#: src/frogr-controller.c:883
 msgid "Authorization failed (timed out)"
 msgstr "Overitev je spodletela (zakasnela)"
 
-#: ../src/frogr-controller.c:962
+#: src/frogr-controller.c:931
 #, c-format
 msgid "Retrying Upload (attempt %d/%d)…"
 msgstr "Ponovno prejemanje (poskus %d/%d) ..."
 
-#: ../src/frogr-controller.c:967
+#: src/frogr-controller.c:936
 #, c-format
 msgid "Uploading '%s'…"
 msgstr "Pošiljanje '%s'..."
 
-#: ../src/frogr-controller.c:2329
+#: src/frogr-controller.c:2242
 msgid "Updating credentials…"
 msgstr "Posodabljanje poveril ..."
 
-#: ../src/frogr-controller.c:2334
+#: src/frogr-controller.c:2247
 msgid "Retrieving data for authorization…"
 msgstr "Pridobivanje podatkov za overitev ..."
 
-#: ../src/frogr-controller.c:2339
+#: src/frogr-controller.c:2252
 msgid "Finishing authorization…"
 msgstr "Zaključevanje overitve ..."
 
-#: ../src/frogr-controller.c:2344
+#: src/frogr-controller.c:2257
 msgid "Retrieving list of sets…"
 msgstr "Pridobivanje seznama naborov ..."
 
-#: ../src/frogr-controller.c:2349
+#: src/frogr-controller.c:2262
 msgid "Retrieving list of groups…"
 msgstr "Pridobivanje seznama skupin ..."
 
-#: ../src/frogr-controller.c:2354
+#: src/frogr-controller.c:2267
 msgid "Retrieving list of tags…"
 msgstr "Pridobivanje seznama oznak ..."
 
-#: ../src/frogr-controller.c:2379
-#, c-format
+#: src/frogr-controller.c:2292
 msgid "Fetching information"
 msgstr "Pridobivanje podrobnosti"
 
-#: ../src/frogr-controller.c:2493
+#: src/frogr-controller.c:2398
 msgid "No sets found"
 msgstr "Ni najdenih naborov"
 
-#: ../src/frogr-controller.c:2520
+#: src/frogr-controller.c:2423
 msgid "No groups found"
 msgstr "Ni najdenih skupin"
 
-#: ../src/frogr-controller.c:3164
+#: src/frogr-controller.c:2984
 #, c-format
 msgid ""
 "You need to properly authorize %s before uploading any pictures to Flickr.\n"
@@ -380,166 +384,162 @@ msgstr ""
 "%s mora biti pred pošiljanjem na Flickr overjen.\n"
 "Treba je znova odobriti."
 
-#: ../src/frogr-controller.c:3174
-#, c-format
+#: src/frogr-controller.c:2994
 msgid "You need to be connected before uploading any pictures to Flickr."
 msgstr "Pred pošiljanjem slik na Flickr mora biti račun overjen."
 
-#: ../src/frogr-controller.c:3192
+#: src/frogr-controller.c:3012
 msgid "Uploading Pictures"
 msgstr "Pošiljanje slik"
 
-#: ../src/frogr-controller.c:3246
-#, c-format
+#: src/frogr-controller.c:3057
 msgid "Error opening project file"
 msgstr "Napaka med odpiranjem datoteke projekta"
 
-#. This shows a dialog notifying the problem to the user
-#: ../src/frogr-create-new-set-dialog.c:156 ../src/frogr-details-dialog.c:1022
+#: src/frogr-create-new-set-dialog.c:143 src/frogr-details-dialog.c:1001
 msgid "Missing data required"
 msgstr "Zahtevani so manjkajoči podatki"
 
-#: ../src/frogr-create-new-set-dialog.c:345
+#: src/frogr-create-new-set-dialog.c:326
 msgid "Title:"
 msgstr "Naslov:"
 
-#: ../src/frogr-create-new-set-dialog.c:354
+#: src/frogr-create-new-set-dialog.c:335
 msgid "Description:"
 msgstr "Opis:"
 
-#: ../src/frogr-create-new-set-dialog.c:375
+#: src/frogr-create-new-set-dialog.c:356
 msgid "Fill Pictures Details with Title and Description"
 msgstr "Izpolni podrobnosti slike s podatki naslova in opisa"
 
-#: ../src/frogr-create-new-set-dialog.c:400
+#: src/frogr-create-new-set-dialog.c:381
 msgid "Create New Set"
 msgstr "Ustvari nov nabor"
 
-#: ../src/frogr-details-dialog.c:91 ../src/frogr-settings-dialog.c:99
+#: src/frogr-details-dialog.c:89 src/frogr-settings-dialog.c:97
 msgid "Default (as specified in Flickr)"
 msgstr "Privzeto (kot je določeno na spletišču Flickr)"
 
-#: ../src/frogr-details-dialog.c:92 ../src/frogr-settings-dialog.c:100
+#: src/frogr-details-dialog.c:90 src/frogr-settings-dialog.c:98
 msgid "All rights reserved"
 msgstr "Vse pravice pridržane"
 
-#: ../src/frogr-details-dialog.c:93 ../src/frogr-settings-dialog.c:101
+#: src/frogr-details-dialog.c:91 src/frogr-settings-dialog.c:99
 msgid "CC Attribution-NonCommercial-ShareAlike"
 msgstr "Dovoljenje CC - nekomercialno - deljenje pod istimi pogoji"
 
-#: ../src/frogr-details-dialog.c:94 ../src/frogr-settings-dialog.c:102
+#: src/frogr-details-dialog.c:92 src/frogr-settings-dialog.c:100
 msgid "CC Attribution-NonCommercial"
 msgstr "Dovoljenje CC - nekomercialno "
 
-#: ../src/frogr-details-dialog.c:95 ../src/frogr-settings-dialog.c:103
+#: src/frogr-details-dialog.c:93 src/frogr-settings-dialog.c:101
 msgid "CC Attribution-NonCommercial-NoDerivs"
 msgstr "Dovoljenje CC - nekomercialno - brez predelav"
 
 # Nekomercialno (Noncommercial)
 # Brez predelav (No Derivative Works)
 # Deljenje pod istimi pogoji (Share Alike)
-#: ../src/frogr-details-dialog.c:96 ../src/frogr-settings-dialog.c:104
+#: src/frogr-details-dialog.c:94 src/frogr-settings-dialog.c:102
 msgid "CC Attribution"
 msgstr "Dovoljenje CC"
 
-#: ../src/frogr-details-dialog.c:97 ../src/frogr-settings-dialog.c:105
+#: src/frogr-details-dialog.c:95 src/frogr-settings-dialog.c:103
 msgid "CC Attribution-ShareAlike"
 msgstr "Dovoljenje CC - deljenje pod istimi pogoji"
 
-#: ../src/frogr-details-dialog.c:98 ../src/frogr-settings-dialog.c:106
+#: src/frogr-details-dialog.c:96 src/frogr-settings-dialog.c:104
 msgid "CC Attribution-NoDerivs"
 msgstr "Dovoljenje CC - brez predelav"
 
-#: ../src/frogr-details-dialog.c:178
+#: src/frogr-details-dialog.c:172
 msgid "Open with image viewer"
 msgstr "Odpri s pregledovalnikom slik"
 
-#: ../src/frogr-details-dialog.c:196
+#: src/frogr-details-dialog.c:190
 msgid "_Title:"
 msgstr "_Naslov:"
 
-#: ../src/frogr-details-dialog.c:206
+#: src/frogr-details-dialog.c:200
 msgid "_Description:"
 msgstr "_Opis:"
 
-#: ../src/frogr-details-dialog.c:230
+#: src/frogr-details-dialog.c:224
 msgid "Ta_gs:"
 msgstr "Ozna_ke:"
 
-#: ../src/frogr-details-dialog.c:253
+#: src/frogr-details-dialog.c:247
 msgid "Visibility"
 msgstr "Vidnost"
 
-#: ../src/frogr-details-dialog.c:263 ../src/frogr-settings-dialog.c:201
+#: src/frogr-details-dialog.c:257 src/frogr-settings-dialog.c:196
 msgid "_Private"
 msgstr "_Zasebno"
 
-#: ../src/frogr-details-dialog.c:267 ../src/frogr-settings-dialog.c:204
+#: src/frogr-details-dialog.c:261 src/frogr-settings-dialog.c:199
 msgid "P_ublic"
 msgstr "_Javno"
 
-#: ../src/frogr-details-dialog.c:276 ../src/frogr-settings-dialog.c:212
+#: src/frogr-details-dialog.c:270 src/frogr-settings-dialog.c:207
 msgid "_Family"
 msgstr "_Družina"
 
-#: ../src/frogr-details-dialog.c:280 ../src/frogr-settings-dialog.c:214
+#: src/frogr-details-dialog.c:274 src/frogr-settings-dialog.c:209
 msgid "F_riends"
 msgstr "_Prijatelji"
 
-#: ../src/frogr-details-dialog.c:294
+#: src/frogr-details-dialog.c:288
 msgid "Content Type"
 msgstr "Vrsta vsebine"
 
-#: ../src/frogr-details-dialog.c:302 ../src/frogr-settings-dialog.c:239
+#: src/frogr-details-dialog.c:296 src/frogr-settings-dialog.c:234
 msgid "P_hoto"
 msgstr "_Fotografija"
 
-#: ../src/frogr-details-dialog.c:306 ../src/frogr-settings-dialog.c:241
+#: src/frogr-details-dialog.c:300 src/frogr-settings-dialog.c:236
 msgid "Scree_nshot"
 msgstr "_Zaslonska slika"
 
-#: ../src/frogr-details-dialog.c:310 ../src/frogr-settings-dialog.c:243
+#: src/frogr-details-dialog.c:304 src/frogr-settings-dialog.c:238
 msgid "Oth_er"
 msgstr "Dru_go"
 
-#: ../src/frogr-details-dialog.c:323
+#: src/frogr-details-dialog.c:317
 msgid "Safety Level"
 msgstr "Raven varnosti"
 
-#: ../src/frogr-details-dialog.c:331 ../src/frogr-settings-dialog.c:265
+#: src/frogr-details-dialog.c:325 src/frogr-settings-dialog.c:260
 msgid "S_afe"
 msgstr "_Varno"
 
-#: ../src/frogr-details-dialog.c:335 ../src/frogr-settings-dialog.c:267
+#: src/frogr-details-dialog.c:329 src/frogr-settings-dialog.c:262
 msgid "_Moderate"
 msgstr "Zme_rno"
 
-#: ../src/frogr-details-dialog.c:339 ../src/frogr-settings-dialog.c:269
+#: src/frogr-details-dialog.c:333 src/frogr-settings-dialog.c:264
 msgid "Restr_icted"
 msgstr "_Omejeno"
 
-#: ../src/frogr-details-dialog.c:351
+#: src/frogr-details-dialog.c:345
 msgid "License Type"
 msgstr "Vrsta dovoljenja"
 
-#: ../src/frogr-details-dialog.c:373
+#: src/frogr-details-dialog.c:367
 msgid "Other Properties"
 msgstr "Druge lastnosti"
 
-#: ../src/frogr-details-dialog.c:381
+#: src/frogr-details-dialog.c:375
 msgid "_Show Up in Global Search Results"
 msgstr "_Pokaži v splošnih rezultatih iskanja"
 
-#: ../src/frogr-details-dialog.c:385
+#: src/frogr-details-dialog.c:379
 msgid "Set Geo_location Information"
 msgstr "Pošlji _geolokacijske podatke"
 
-#: ../src/frogr-details-dialog.c:389
+#: src/frogr-details-dialog.c:383
 msgid "Replace 'Date Posted' with 'Date Taken'"
 msgstr "Zamenjaj 'datum objave' z datumom 'prevzema'"
 
-#. Visually indicate how many pictures are being edited
-#: ../src/frogr-details-dialog.c:484
+#: src/frogr-details-dialog.c:475
 #, c-format
 msgid "(%d Picture)"
 msgid_plural "(%d Pictures)"
@@ -548,25 +548,24 @@ msgstr[1] "(%d slika)"
 msgstr[2] "(%d sliki)"
 msgstr[3] "(%d slike)"
 
-#: ../src/frogr-details-dialog.c:558
+#: src/frogr-details-dialog.c:548
 msgid "An error happened trying to load the picture"
 msgstr "Prišlo je do napake med nalaganjem slike"
 
-#: ../src/frogr-details-dialog.c:1196
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:8
+#: src/frogr-details-dialog.c:1169
 msgid "_Edit"
 msgstr "_Uredi"
 
-#: ../src/frogr-details-dialog.c:1224
+#: src/frogr-details-dialog.c:1197
 msgid "Edit Picture Details"
 msgstr "Urejanje podrobnosti slike"
 
-#: ../src/frogr-file-loader.c:148
+#: src/frogr-file-loader.c:142
 #, c-format
 msgid "Loading files %d / %d"
 msgstr "Nalaganje datotek %d / %d"
 
-#: ../src/frogr-file-loader.c:382
+#: src/frogr-file-loader.c:369
 #, c-format
 msgid ""
 "Unable to load picture %s:\n"
@@ -575,7 +574,7 @@ msgstr ""
 "Ni mogoče naložiti slike %s:\n"
 "%s"
 
-#: ../src/frogr-file-loader.c:413
+#: src/frogr-file-loader.c:400
 #, c-format
 msgid ""
 "Unable to load video %s\n"
@@ -584,10 +583,7 @@ msgstr ""
 "Ni mogoče naložiti videa %s.\n"
 "Preverite, ali je nameščen ustrezen kodek za dekodiranje."
 
-#. First %s is the title of the picture (filename of the file by
-#. default). Second %s is the max allowed size for a picture to be
-#. uploaded to flickr (different for free and PRO accounts).
-#: ../src/frogr-file-loader.c:654
+#: src/frogr-file-loader.c:636
 #, c-format
 msgid ""
 "Can't load file %s:\n"
@@ -596,150 +592,135 @@ msgstr ""
 "Datoteke %s ni mogoče naložiti:\n"
 "Velikost datoteke je večja kot največja dovoljena velikost za ta račun (%s)."
 
-#. First create the left side buttons
-#: ../src/frogr-main-view.c:642 ../src/frogr-main-view.c:744
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
 msgid "Open"
 msgstr "Odpri"
 
-#: ../src/frogr-main-view.c:642 ../src/frogr-main-view.c:744
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
 msgid "Open Existing Project"
 msgstr "Odpri obstoječi projekt"
 
-#: ../src/frogr-main-view.c:643 ../src/frogr-main-view.c:747
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
 msgid "Add"
 msgstr "Dodaj"
 
-#: ../src/frogr-main-view.c:643 ../src/frogr-main-view.c:747
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
 msgid "Add Elements"
 msgstr "Dodajanje predmetov"
 
-#: ../src/frogr-main-view.c:644 ../src/frogr-main-view.c:748
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
 msgid "Remove"
 msgstr "Odstrani"
 
-#: ../src/frogr-main-view.c:644 ../src/frogr-main-view.c:748
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
 msgid "Remove Elements"
 msgstr "Odstranjevanje predmetov"
 
-#: ../src/frogr-main-view.c:645 ../src/frogr-main-view.c:750
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
 msgid "Upload"
 msgstr "Pošlji"
 
-#: ../src/frogr-main-view.c:645 ../src/frogr-main-view.c:750
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
 msgid "Upload All"
 msgstr "Pošlji vse"
 
-#. Save project item
-#: ../src/frogr-main-view.c:678 ../src/frogr-main-view.c:745
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
 msgid "Save"
 msgstr "Shrani"
 
-#: ../src/frogr-main-view.c:678 ../src/frogr-main-view.c:745
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
 msgid "Save Current Project"
 msgstr "Shrani trenutni projekt"
 
-#: ../src/frogr-main-view.c:1050 ../data/gtkbuilder/frogr-app-menu.xml.h:4
+#: src/frogr-main-view.c:1016
 msgid "_About"
 msgstr "_O programu"
 
-#: ../src/frogr-main-view.c:1054 ../data/gtkbuilder/frogr-app-menu.xml.h:5
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:17
+#: src/frogr-main-view.c:1020
 msgid "_Quit"
 msgstr "_Končaj"
 
-#. Create the submenu and insert it in the right section
-#: ../src/frogr-main-view.c:1107
+#: src/frogr-main-view.c:1070
 msgid "Accounts"
 msgstr "Računi"
 
-#. String showind the date and time a picture was taken
-#: ../src/frogr-main-view.c:1459
+#: src/frogr-main-view.c:1410
 #, c-format
 msgid "Taken: %s"
 msgstr "Posneto: %s"
 
-#: ../src/frogr-main-view.c:1464
+#: src/frogr-main-view.c:1415
 #, c-format
 msgid "File size: %s"
 msgstr "Velikost datoteke: %s"
 
-#: ../src/frogr-main-view.c:1597
+#: src/frogr-main-view.c:1540
 msgid "Select File"
 msgstr "Izbor datoteke"
 
-#: ../src/frogr-main-view.c:1601 ../src/frogr-main-view.c:1732
+#: src/frogr-main-view.c:1544 src/frogr-main-view.c:1671
 msgid "_Open"
 msgstr "_Odpri"
 
-#: ../src/frogr-main-view.c:1610
+#: src/frogr-main-view.c:1553
 msgid "Frogr Project Files"
 msgstr "Datoteke projekta Frogr"
 
-#: ../src/frogr-main-view.c:1676
+#: src/frogr-main-view.c:1615
 msgid "Select Destination"
 msgstr "Izbor cilja"
 
-#: ../src/frogr-main-view.c:1680 ../data/gtkbuilder/frogr-menu-bar.xml.h:3
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:1
+#: src/frogr-main-view.c:1619
 msgid "_Save"
 msgstr "_Shrani"
 
-#: ../src/frogr-main-view.c:1683
+#: src/frogr-main-view.c:1622
 msgid "Untitled Project.frogr"
 msgstr "neimenovan projekt.frogr"
 
-#: ../src/frogr-main-view.c:1728
+#: src/frogr-main-view.c:1667
 msgid "Select a Picture"
 msgstr "Izberi sliko"
 
-#: ../src/frogr-main-view.c:1755
+#: src/frogr-main-view.c:1694
 msgid "All Files"
 msgstr "Vse datoteke"
 
-#: ../src/frogr-main-view.c:1758
+#: src/frogr-main-view.c:1697
 msgid "Image Files"
 msgstr "Slikovne datoteke"
 
-#: ../src/frogr-main-view.c:1762
+#: src/frogr-main-view.c:1701
 msgid "Video Files"
 msgstr "Video datoteke"
 
-#: ../src/frogr-main-view.c:1786
+#: src/frogr-main-view.c:1723
 msgid "You don't have any picture added yet"
 msgstr "Ni še dodanih slik"
 
-#: ../src/frogr-main-view.c:1801
+#: src/frogr-main-view.c:1736
 msgid "You need to select some pictures first"
 msgstr "Najprej je treba izbrati nekaj slik"
 
-#: ../src/frogr-main-view.c:2265
+#: src/frogr-main-view.c:2108
 msgid "Not connected to Flickr"
 msgstr "Ni povezave s spletiščem Flickr"
 
-#. Login string, showing the user is PRO (second '%s') if so.
-#: ../src/frogr-main-view.c:2275
+#: src/frogr-main-view.c:2118
 #, c-format
 msgid "Connected as %s%s"
 msgstr "Povezanva ustvarjena za %s%s"
 
-#: ../src/frogr-main-view.c:2276
+#: src/frogr-main-view.c:2119
 msgid " (PRO account)"
 msgstr "(PRO račun)"
 
-#. Will show in the status bar the amount of data (in KB, MB
-#. or GB) the user is currently allowed to upload to flicker
-#. till the end of the month, in a CURRENT / MAX fashion.
-#. The '-' at the beginning is just a separator, since more
-#. blocks of text will be shown in the status bar too.
-#: ../src/frogr-main-view.c:2300
+#: src/frogr-main-view.c:2143
 #, c-format
 msgid " - %s / %s remaining"
 msgstr " - še %s / %s"
 
-#. Will show in the status bar the amount of pictures and data
-#. (in KB, MB or GB) that would be uploaded as the sum of the
-#. sizes for every picture loaded in the application
-#: ../src/frogr-main-view.c:2326
+#: src/frogr-main-view.c:2169
 #, c-format
 msgid " - %d file to upload (%s)"
 msgid_plural " - %d files to upload (%s)"
@@ -748,220 +729,172 @@ msgstr[1] " - %d datoteka za pošiljanje (%s)"
 msgstr[2] " - %d datoteki za pošiljanje (%s)"
 msgstr[3] " - %d datoteke za pošiljanje (%s)"
 
-#: ../src/frogr-settings-dialog.c:190
+#: src/frogr-settings-dialog.c:185
 msgid "Default Visibility"
 msgstr "Privzeta vidljivost"
 
-#: ../src/frogr-settings-dialog.c:229
+#: src/frogr-settings-dialog.c:224
 msgid "Default Content Type"
 msgstr "Privzeta vrsta vsebine"
 
-#: ../src/frogr-settings-dialog.c:255
+#: src/frogr-settings-dialog.c:250
 msgid "Default Safety Level"
 msgstr "P_rivzeta varnostna raven"
 
-#: ../src/frogr-settings-dialog.c:281
+#: src/frogr-settings-dialog.c:276
 msgid "Default License"
 msgstr "Privzeto dovoljenje"
 
-#: ../src/frogr-settings-dialog.c:307
+#: src/frogr-settings-dialog.c:302
 msgid "Other Defaults"
 msgstr "Drugo privzeto"
 
-#: ../src/frogr-settings-dialog.c:317
+#: src/frogr-settings-dialog.c:312
 msgid "_Show Pictures in Global Search Results"
 msgstr "_Pokaži slike v splošnih rezultatih iskanja"
 
-#: ../src/frogr-settings-dialog.c:320
+#: src/frogr-settings-dialog.c:315
 msgid "Set Geo_location Information for Pictures"
 msgstr "Pošlji _geolokacijske podatke slik"
 
-#: ../src/frogr-settings-dialog.c:323
+#: src/frogr-settings-dialog.c:318
 msgid "Replace 'Date Posted' with 'Date Taken' for Pictures"
 msgstr "Zamenjaj 'datum objave' z datumom 'prevzema' za slike"
 
-#: ../src/frogr-settings-dialog.c:329
+#: src/frogr-settings-dialog.c:324
 msgid "_General"
 msgstr "_Splošno"
 
-#: ../src/frogr-settings-dialog.c:352
+#: src/frogr-settings-dialog.c:344
 msgid "Proxy Settings"
 msgstr "Nastavitve posredniškega strežnika"
 
-#. Enable proxy
-#: ../src/frogr-settings-dialog.c:361
+#: src/frogr-settings-dialog.c:353
 msgid "_Enable HTTP Proxy"
 msgstr "_Omogoči posredovalni strežnik"
 
-#: ../src/frogr-settings-dialog.c:371
+#: src/frogr-settings-dialog.c:363
 msgid "_Host:"
 msgstr "_Gostitelj:"
 
-#. Proxy port
-#: ../src/frogr-settings-dialog.c:384
+#: src/frogr-settings-dialog.c:376
 msgid "_Port:"
 msgstr "_Vrata:"
 
-#. Proxy username
-#: ../src/frogr-settings-dialog.c:397
+#: src/frogr-settings-dialog.c:389
 msgid "U_sername:"
 msgstr "_Uporabniško ime:"
 
-#. Proxy password
-#: ../src/frogr-settings-dialog.c:410
+#: src/frogr-settings-dialog.c:402
 msgid "Pass_word:"
 msgstr "_Geslo:"
 
-#: ../src/frogr-settings-dialog.c:434
+#: src/frogr-settings-dialog.c:426
 msgid "Connec_tion"
 msgstr "Pove_zava"
 
-#: ../src/frogr-settings-dialog.c:455
+#: src/frogr-settings-dialog.c:444
 msgid "Other options"
 msgstr "Druge možnosti"
 
-#: ../src/frogr-settings-dialog.c:465
+#: src/frogr-settings-dialog.c:454
 msgid "Ena_ble Tags Auto-Completion"
 msgstr "Omogoči samodejno _dopolnjevanje oznak"
 
-#: ../src/frogr-settings-dialog.c:468
+#: src/frogr-settings-dialog.c:457
 msgid "_Import Tags from Pictures Metadata"
 msgstr "_Uvozi oznake iz metapodatkov slik"
 
-#: ../src/frogr-settings-dialog.c:472
+#: src/frogr-settings-dialog.c:461
 msgid "Use _Dark GTK Theme"
 msgstr "Uporabi _temno temo"
 
-#: ../src/frogr-settings-dialog.c:476
+#: src/frogr-settings-dialog.c:465
 msgid "_Keep File Extensions in Titles when Loading"
 msgstr "_Ohrani pripono datotek v naslovu med nalaganjem slik"
 
-#: ../src/frogr-settings-dialog.c:482
+#: src/frogr-settings-dialog.c:471
 msgid "_Misc"
 msgstr "_Razno"
 
-#: ../src/frogr-settings-dialog.c:1003
+#: src/frogr-settings-dialog.c:972
 msgid "Preferences"
 msgstr "Možnosti"
 
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:1
-msgid "Aut_horize Account…"
-msgstr "_Overi račun ..."
-
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:2
-msgid "_Preferences…"
-msgstr "_Možnosti ..."
-
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:3
-msgid "_Help"
-msgstr "Pomo_č"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:1
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:9
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:3
-msgid "_Edit Details…"
-msgstr "_Uredi podrobnosti ..."
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:2
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:10
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:4
-msgid "Add _Tags…"
-msgstr "Dodaj _oznake ..."
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:3
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:11
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:5
-msgid "Add to _Group…"
-msgstr "Dodaj _skupini ..."
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:4
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:12
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:6
-msgid "Add to _Photoset"
-msgstr "_Dodaj v nabor slik"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:5
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:13
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:7
-msgid "_Add to Existing Photoset…"
-msgstr "D_odaj k obstoječemu naboru ..."
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:6
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:14
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:8
-msgid "_Create New Photoset…"
-msgstr "_Ustvari nov nabor slik ..."
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:7
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:15
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:16
-msgid "_Open in External Viewer"
-msgstr "Odpri v zunanjem pregledovalniku"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:8
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:6
-msgid "_Remove Elements"
-msgstr "_Odstrani predmete"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:1
-msgid "_File"
-msgstr "_Datoteka"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:2
-msgid "_Open…"
-msgstr "_Odpri ..."
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:4
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:2
-msgid "Save _As…"
-msgstr "Shrani _kot ..."
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:5
-msgid "A_dd Elements…"
-msgstr "_Dodaj predmete ..."
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:7
-msgid "_Upload All"
-msgstr "Pošlji _vse"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:16
-msgid "_View"
-msgstr "_Pogled"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:17
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:9
-msgid "_Sort Elements"
-msgstr "_Razvrsti predmete"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:18
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:10
-msgid "As _Loaded"
-msgstr "po _nalaganju"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:19
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:11
-msgid "By _Date Taken"
-msgstr "po _datumu posnetka"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:20
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:12
-msgid "By _Title"
-msgstr "po _naslovu"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:21
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:13
-msgid "By _Size"
-msgstr "Po veliko_sti"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:22
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:14
-msgid "_Reversed Order"
-msgstr "_Obrnjen vrstni red"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:23
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:15
-msgid "Enable _Tooltips"
-msgstr "Omogoči _orodne namige"
+#~ msgid "Frogr"
+#~ msgstr "Frogr"
+
+#~ msgid "Aut_horize Account…"
+#~ msgstr "_Overi račun ..."
+
+#~ msgid "_Preferences…"
+#~ msgstr "_Možnosti ..."
+
+#~ msgid "_Help"
+#~ msgstr "Pomo_č"
+
+#~ msgid "_Edit Details…"
+#~ msgstr "_Uredi podrobnosti ..."
+
+#~ msgid "Add _Tags…"
+#~ msgstr "Dodaj _oznake ..."
+
+#~ msgid "Add to _Group…"
+#~ msgstr "Dodaj _skupini ..."
+
+#~ msgid "Add to _Photoset"
+#~ msgstr "_Dodaj v nabor slik"
+
+#~ msgid "_Add to Existing Photoset…"
+#~ msgstr "D_odaj k obstoječemu naboru ..."
+
+#~ msgid "_Create New Photoset…"
+#~ msgstr "_Ustvari nov nabor slik ..."
+
+#~ msgid "_Open in External Viewer"
+#~ msgstr "Odpri v zunanjem pregledovalniku"
+
+#~ msgid "_Remove Elements"
+#~ msgstr "_Odstrani predmete"
+
+#~ msgid "_File"
+#~ msgstr "_Datoteka"
+
+#~ msgid "_Open…"
+#~ msgstr "_Odpri ..."
+
+#~ msgid "Save _As…"
+#~ msgstr "Shrani _kot ..."
+
+#~ msgid "A_dd Elements…"
+#~ msgstr "_Dodaj predmete ..."
+
+#~ msgid "_Upload All"
+#~ msgstr "Pošlji _vse"
+
+#~ msgid "_View"
+#~ msgstr "_Pogled"
+
+#~ msgid "_Sort Elements"
+#~ msgstr "_Razvrsti predmete"
+
+#~ msgid "As _Loaded"
+#~ msgstr "po _nalaganju"
+
+#~ msgid "By _Date Taken"
+#~ msgstr "po _datumu posnetka"
+
+#~ msgid "By _Title"
+#~ msgstr "po _naslovu"
+
+#~ msgid "By _Size"
+#~ msgstr "Po veliko_sti"
+
+#~ msgid "_Reversed Order"
+#~ msgstr "_Obrnjen vrstni red"
+
+#~ msgid "Enable _Tooltips"
+#~ msgstr "Omogoči _orodne namige"
 
 #~ msgid "_Use GNOME General Proxy Settings"
 #~ msgstr "Uporabi _splošne nastavitve posredovanja"
@@ -996,9 +929,6 @@ msgstr "Omogoči _orodne namige"
 #~ msgid "_Load Pictures…"
 #~ msgstr "_Naloži slike ..."
 
-#~ msgid "frogr"
-#~ msgstr "frogr"
-
 #~ msgid "Load Project"
 #~ msgstr "Naloži projekt"
 
diff --git a/po/sr.po b/po/sr.po
index 083b51e..57c2c7e 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -5,9 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: frogr master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=frogr&k";
-"eywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-01-22 18:06+0000\n"
+"Report-Msgid-Bugs-To: msanchez gnome org\n"
+"POT-Creation-Date: 2016-08-12 13:09+0100\n"
 "PO-Revision-Date: 2016-02-20 11:52+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic rocketmail com>\n"
 "Language-Team: Serbian <gnom prevod org>\n"
@@ -15,11 +14,20 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=n==1? 3 : 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=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n"
+"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
-#: ../data/frogr.appdata.xml.in.h:1
+#: data/frogr.appdata.xml.in:5 data/frogr.desktop.in.in:5
+#: data/frogr.desktop.in.in:14
+msgid "frogr"
+msgstr "фрогр"
+
+#: data/frogr.appdata.xml.in:6 data/frogr.desktop.in.in:6
+msgid "frogr: a Flickr Remote Organizer for GNOME"
+msgstr "фрогр: Фликров удаљени организатор за Гном"
+
+#: data/frogr.appdata.xml.in:8
 msgid ""
 "frogr is a small application for the GNOME desktop that allows users to "
 "manage their accounts in the Flickr image hosting website."
@@ -27,7 +35,7 @@ msgstr ""
 "фрогр је мали програм за Гномово окружење који омогућава корисницима да "
 "управљају својим налозима на Фликровој веб страници за удомљавање слика."
 
-#: ../data/frogr.appdata.xml.in.h:2
+#: data/frogr.appdata.xml.in:13
 msgid ""
 "It supports all the basic Flickr features, including uploading pictures, "
 "adding descriptions, setting tags and managing sets and groups pools."
@@ -35,81 +43,75 @@ msgstr ""
 "Подржава све основне Фликрове функције, укључујући отпремање слика, додавање "
 "описа, подешавање ознака и управљање депоима подешавања и група."
 
-#: ../data/frogr.appdata.xml.in.h:3
-#| msgid "Scree_nshot"
+#: data/frogr.appdata.xml.in:24
 msgid "Screenshot of frogr"
 msgstr "Снимак екрана фрогра"
 
-#: ../data/frogr.desktop.in.in.h:1
-msgid "frogr"
-msgstr "фрогр"
-
-#: ../data/frogr.desktop.in.in.h:2
-msgid "frogr: a Flickr Remote Organizer for GNOME"
-msgstr "фрогр: Фликров удаљени организатор за Гном"
+#: data/frogr.appdata.xml.in:29
+msgid "Mario Sanchez Prada"
+msgstr ""
 
-#: ../data/frogr.desktop.in.in.h:3
+#: data/frogr.desktop.in.in:7
 msgid "Upload and organize photos in Flickr accounts"
 msgstr "Пошаљите и организујте фотографије на Фликровим налозима"
 
-#: ../data/frogr.desktop.in.in.h:4
+#: data/frogr.desktop.in.in:8
 msgid "Flickr;Image;Picture;Photo;Video;Uploader;"
 msgstr "фликр;слика;фотографија;видео;снимак;отпремник;"
 
-#: ../src/frogr-about-dialog.c:43
+#: src/frogr-about-dialog.c:43
 msgid "A Flickr Remote Organizer for GNOME\n"
 msgstr "Фликров удаљени организатор за Гном\n"
 
-#: ../src/frogr-about-dialog.c:72
+#: src/frogr-about-dialog.c:72
 msgid "translator-credits"
 msgstr ""
 "  Мирослав Николић <miroslavnikolic rocketmail com>\n"
 "\n"
 "http://prevod.org — превод на српски језик"
 
-#: ../src/frogr-add-tags-dialog.c:191 ../src/frogr-add-to-group-dialog.c:528
-#: ../src/frogr-add-to-set-dialog.c:529 ../src/frogr-auth-dialog.c:153
-#: ../src/frogr-create-new-set-dialog.c:310 ../src/frogr-details-dialog.c:1168
-#: ../src/frogr-main-view.c:1543 ../src/frogr-main-view.c:1618
-#: ../src/frogr-main-view.c:1670 ../src/frogr-settings-dialog.c:930
+#: src/frogr-add-tags-dialog.c:191 src/frogr-add-to-group-dialog.c:528
+#: src/frogr-add-to-set-dialog.c:529 src/frogr-auth-dialog.c:153
+#: src/frogr-create-new-set-dialog.c:310 src/frogr-details-dialog.c:1168
+#: src/frogr-main-view.c:1543 src/frogr-main-view.c:1618
+#: src/frogr-main-view.c:1670 src/frogr-settings-dialog.c:930
 msgid "_Cancel"
 msgstr "_Откажи"
 
-#: ../src/frogr-add-tags-dialog.c:193 ../src/frogr-add-to-group-dialog.c:530
-#: ../src/frogr-add-to-set-dialog.c:531
-#: ../src/frogr-create-new-set-dialog.c:312
+#: src/frogr-add-tags-dialog.c:193 src/frogr-add-to-group-dialog.c:530
+#: src/frogr-add-to-set-dialog.c:531 src/frogr-create-new-set-dialog.c:312
 msgid "_Add"
 msgstr "_Додај"
 
-#: ../src/frogr-add-tags-dialog.c:202
+#: src/frogr-add-tags-dialog.c:202
 msgid "Enter a spaces separated list of tags:"
 msgstr "Унесите размаком раздвојен списак ознака:"
 
-#: ../src/frogr-add-tags-dialog.c:228
+#: src/frogr-add-tags-dialog.c:228
 msgid "Add Tags"
 msgstr "Додајте ознаке"
 
-#: ../src/frogr-add-to-group-dialog.c:147
+#: src/frogr-add-to-group-dialog.c:147
 msgid "Name"
 msgstr "Назив"
 
-#: ../src/frogr-add-to-group-dialog.c:162 ../src/frogr-add-to-set-dialog.c:163
+#: src/frogr-add-to-group-dialog.c:162 src/frogr-add-to-set-dialog.c:163
 msgid "Elements"
 msgstr "Елементи"
 
-#: ../src/frogr-add-to-group-dialog.c:581
+#: src/frogr-add-to-group-dialog.c:581
 msgid "Add to Groups"
 msgstr "Додај у групе"
 
-#: ../src/frogr-add-to-set-dialog.c:148
+#: src/frogr-add-to-set-dialog.c:148
 msgid "Title"
 msgstr "Назив"
 
-#: ../src/frogr-add-to-set-dialog.c:582
+#: src/frogr-add-to-set-dialog.c:582
 msgid "Add to Sets"
 msgstr "Додај у подешавања"
 
-#: ../src/frogr-auth-dialog.c:59
+#: src/frogr-auth-dialog.c:59
 #, c-format
 msgid ""
 "Please press the button to authorize %s and then come back to complete the "
@@ -118,30 +120,29 @@ msgstr ""
 "Молим притисните дугме да овластите „%s“ и затим се вратите да довршите "
 "процес."
 
-#: ../src/frogr-auth-dialog.c:63 ../src/frogr-auth-dialog.c:149
-#: ../src/frogr-controller.c:2286
+#: src/frogr-auth-dialog.c:63 src/frogr-auth-dialog.c:149
+#: src/frogr-controller.c:2286
 #, c-format
 msgid "Authorize %s"
 msgstr "Овласти „%s“"
 
-#: ../src/frogr-auth-dialog.c:155 ../src/frogr-settings-dialog.c:932
+#: src/frogr-auth-dialog.c:155 src/frogr-settings-dialog.c:932
 msgid "_Close"
 msgstr "_Затвори"
 
-#. Description label
-#: ../src/frogr-auth-dialog.c:167
+#: src/frogr-auth-dialog.c:167
 msgid "Enter verification code:"
 msgstr "Унеси шифру провере:"
 
-#: ../src/frogr-auth-dialog.c:221
+#: src/frogr-auth-dialog.c:221
 msgid "Invalid verification code"
 msgstr "Неисправна шифра провере"
 
-#: ../src/frogr-controller.c:581
+#: src/frogr-controller.c:581
 msgid "Process cancelled"
 msgstr "Процес је отказан"
 
-#: ../src/frogr-controller.c:586
+#: src/frogr-controller.c:586
 msgid ""
 "Connection error:\n"
 "Network not available"
@@ -149,7 +150,7 @@ msgstr ""
 "Грешка повезивања:\n"
 "Мрежа није доступна"
 
-#: ../src/frogr-controller.c:590
+#: src/frogr-controller.c:590
 msgid ""
 "Connection error:\n"
 "Bad request"
@@ -157,7 +158,7 @@ msgstr ""
 "Грешка повезивања:\n"
 "Лош захтев"
 
-#: ../src/frogr-controller.c:594
+#: src/frogr-controller.c:594
 msgid ""
 "Connection error:\n"
 "Server-side error"
@@ -165,7 +166,7 @@ msgstr ""
 "Грешка повезивања:\n"
 "Грешка сервера"
 
-#: ../src/frogr-controller.c:598
+#: src/frogr-controller.c:598
 msgid ""
 "Error uploading:\n"
 "File invalid"
@@ -173,7 +174,7 @@ msgstr ""
 "Грешка при слању:\n"
 "Неисправна датотека"
 
-#: ../src/frogr-controller.c:602
+#: src/frogr-controller.c:602
 msgid ""
 "Error uploading picture:\n"
 "Quota exceeded"
@@ -181,7 +182,7 @@ msgstr ""
 "Грешка при слању слике:\n"
 "Премашена квота"
 
-#: ../src/frogr-controller.c:607
+#: src/frogr-controller.c:607
 #, c-format
 msgid "Quota exceeded (limit: %d video per month)"
 msgid_plural "Quota exceeded (limit: %d videos per month)"
@@ -190,7 +191,7 @@ msgstr[1] "Премашена је количина (ограничење: %d с
 msgstr[2] "Премашена је количина (ограничење: %d снимака месечно)"
 msgstr[3] "Премашена је количина (ограничење: један снимак месечно)"
 
-#: ../src/frogr-controller.c:611
+#: src/frogr-controller.c:611
 msgid ""
 "Error uploading video:\n"
 "You can't upload more videos with this account"
@@ -198,7 +199,7 @@ msgstr ""
 "Грешка отпремања снимка:\n"
 "Са овим налогом не можете да отпремите још снимака"
 
-#: ../src/frogr-controller.c:617
+#: src/frogr-controller.c:617
 msgid ""
 "Error:\n"
 "Photo not found"
@@ -206,7 +207,7 @@ msgstr ""
 "Грешка:\n"
 "Нисам пронашао фотографију"
 
-#: ../src/frogr-controller.c:621
+#: src/frogr-controller.c:621
 msgid ""
 "Error:\n"
 "Photo already in photoset"
@@ -214,7 +215,7 @@ msgstr ""
 "Грешка:\n"
 "Фотографија је већ у скупу фотографија"
 
-#: ../src/frogr-controller.c:625
+#: src/frogr-controller.c:625
 msgid ""
 "Error:\n"
 "Photo already in group"
@@ -222,7 +223,7 @@ msgstr ""
 "Грешка:\n"
 "Фотографија је већ у групи"
 
-#: ../src/frogr-controller.c:629
+#: src/frogr-controller.c:629
 msgid ""
 "Error:\n"
 "Photo already in the maximum number of groups possible"
@@ -230,7 +231,7 @@ msgstr ""
 "Грешка:\n"
 "Фотографија је већ у највећем могућем броју група"
 
-#: ../src/frogr-controller.c:633
+#: src/frogr-controller.c:633
 msgid ""
 "Error:\n"
 "Group limit already reached"
@@ -238,7 +239,7 @@ msgstr ""
 "Грешка:\n"
 "Већ сте достигли ограничење групе"
 
-#: ../src/frogr-controller.c:637
+#: src/frogr-controller.c:637
 msgid ""
 "Error:\n"
 "Photo added to group's queue"
@@ -246,7 +247,7 @@ msgstr ""
 "Грешка:\n"
 "Фотографија је додата у ред групе"
 
-#: ../src/frogr-controller.c:641
+#: src/frogr-controller.c:641
 msgid ""
 "Error:\n"
 "Photo already added to group's queue"
@@ -254,7 +255,7 @@ msgstr ""
 "Грешка:\n"
 "Фотографија је већ додата у ред групе"
 
-#: ../src/frogr-controller.c:645
+#: src/frogr-controller.c:645
 msgid ""
 "Error:\n"
 "Content not allowed for this group"
@@ -262,8 +263,7 @@ msgstr ""
 "Грешка:\n"
 "Садржај није допуштен за ову групу"
 
-#: ../src/frogr-controller.c:649
-#, c-format
+#: src/frogr-controller.c:649
 msgid ""
 "Authorization failed.\n"
 "Please try again"
@@ -271,7 +271,7 @@ msgstr ""
 "Потврда идентитета није успела.\n"
 "Покушајте поново"
 
-#: ../src/frogr-controller.c:655
+#: src/frogr-controller.c:655
 #, c-format
 msgid ""
 "Error\n"
@@ -282,8 +282,7 @@ msgstr ""
 "%s није исправно овлашћен да шаље слике на Фликр.\n"
 "Молим овластите га поново"
 
-#: ../src/frogr-controller.c:660
-#, c-format
+#: src/frogr-controller.c:660
 msgid ""
 "Unable to authenticate in Flickr\n"
 "Please try again."
@@ -291,7 +290,7 @@ msgstr ""
 "Не могу да потврдим идентитет на Фликру\n"
 "Покушајте опет."
 
-#: ../src/frogr-controller.c:664
+#: src/frogr-controller.c:664
 #, c-format
 msgid ""
 "You have not properly authorized %s yet.\n"
@@ -300,8 +299,7 @@ msgstr ""
 "Још увек нисте исправно овластили „%s“.\n"
 "Покушајте опет."
 
-#: ../src/frogr-controller.c:669
-#, c-format
+#: src/frogr-controller.c:669
 msgid ""
 "Invalid verification code.\n"
 "Please try again."
@@ -309,8 +307,7 @@ msgstr ""
 "Неисправна шифра провере.\n"
 "Покушајте опет."
 
-#: ../src/frogr-controller.c:673
-#, c-format
+#: src/frogr-controller.c:673
 msgid ""
 "Error:\n"
 "Service not available"
@@ -318,64 +315,62 @@ msgstr ""
 "Грешка:\n"
 "Услуга није доступна"
 
-#. General error: just dump the raw error description
-#: ../src/frogr-controller.c:678
+#: src/frogr-controller.c:678
 #, c-format
 msgid "An error happened: %s."
 msgstr "Догодила се грешка: %s."
 
-#: ../src/frogr-controller.c:883
+#: src/frogr-controller.c:883
 msgid "Authorization failed (timed out)"
 msgstr "Није успело потврђивање идентитета (истекло је време)"
 
-#: ../src/frogr-controller.c:931
+#: src/frogr-controller.c:931
 #, c-format
 msgid "Retrying Upload (attempt %d/%d)…"
 msgstr "Поново покушавам отпремање (покушај %d/%d)…"
 
-#: ../src/frogr-controller.c:936
+#: src/frogr-controller.c:936
 #, c-format
 msgid "Uploading '%s'…"
 msgstr "Отпремам „%s“…"
 
-#: ../src/frogr-controller.c:2242
+#: src/frogr-controller.c:2242
 msgid "Updating credentials…"
 msgstr "Освежавам уверења…"
 
-#: ../src/frogr-controller.c:2247
+#: src/frogr-controller.c:2247
 msgid "Retrieving data for authorization…"
 msgstr "Преузимам податке за потврђивање идентитета…"
 
-#: ../src/frogr-controller.c:2252
+#: src/frogr-controller.c:2252
 msgid "Finishing authorization…"
 msgstr "Завршавам потврђивање идентитета…"
 
-#: ../src/frogr-controller.c:2257
+#: src/frogr-controller.c:2257
 msgid "Retrieving list of sets…"
 msgstr "Преузимам списак скупова…"
 
-#: ../src/frogr-controller.c:2262
+#: src/frogr-controller.c:2262
 msgid "Retrieving list of groups…"
 msgstr "Преузимам списак група…"
 
-#: ../src/frogr-controller.c:2267
+#: src/frogr-controller.c:2267
 msgid "Retrieving list of tags…"
 msgstr "Преузимам списак ознака…"
 
-#: ../src/frogr-controller.c:2292
-#, c-format
+#: src/frogr-controller.c:2292
 msgid "Fetching information"
 msgstr "Преузимам податке"
 
-#: ../src/frogr-controller.c:2398
+#: src/frogr-controller.c:2398
 msgid "No sets found"
 msgstr "Нисам пронашао скупове"
 
-#: ../src/frogr-controller.c:2423
+#: src/frogr-controller.c:2423
 msgid "No groups found"
 msgstr "Нисам пронашао групе"
 
-#: ../src/frogr-controller.c:2984
+#: src/frogr-controller.c:2984
 #, c-format
 msgid ""
 "You need to properly authorize %s before uploading any pictures to Flickr.\n"
@@ -384,163 +379,159 @@ msgstr ""
 "Морате исправно да овластите „%s“ пре слања било каквих слика на Фликр.\n"
 "Молим овластите га поново."
 
-#: ../src/frogr-controller.c:2994
-#, c-format
+#: src/frogr-controller.c:2994
 msgid "You need to be connected before uploading any pictures to Flickr."
 msgstr "Морате бити повезани да бисте слали слике на Фликр."
 
-#: ../src/frogr-controller.c:3012
+#: src/frogr-controller.c:3012
 msgid "Uploading Pictures"
 msgstr "Отпремам слике"
 
-#: ../src/frogr-controller.c:3057
-#, c-format
+#: src/frogr-controller.c:3057
 msgid "Error opening project file"
 msgstr "Грешка отварања датотеке пројекта"
 
-#. This shows a dialog notifying the problem to the user
-#: ../src/frogr-create-new-set-dialog.c:143 ../src/frogr-details-dialog.c:1001
+#: src/frogr-create-new-set-dialog.c:143 src/frogr-details-dialog.c:1001
 msgid "Missing data required"
 msgstr "Подаци који недостају су потребни"
 
-#: ../src/frogr-create-new-set-dialog.c:326
+#: src/frogr-create-new-set-dialog.c:326
 msgid "Title:"
 msgstr "Назив:"
 
-#: ../src/frogr-create-new-set-dialog.c:335
+#: src/frogr-create-new-set-dialog.c:335
 msgid "Description:"
 msgstr "Опис:"
 
-#: ../src/frogr-create-new-set-dialog.c:356
+#: src/frogr-create-new-set-dialog.c:356
 msgid "Fill Pictures Details with Title and Description"
 msgstr "Попуните податке о слици називом и описом"
 
-#: ../src/frogr-create-new-set-dialog.c:381
+#: src/frogr-create-new-set-dialog.c:381
 msgid "Create New Set"
 msgstr "Направи нови скуп"
 
-#: ../src/frogr-details-dialog.c:89 ../src/frogr-settings-dialog.c:97
+#: src/frogr-details-dialog.c:89 src/frogr-settings-dialog.c:97
 msgid "Default (as specified in Flickr)"
 msgstr "Основно (као што је наведено у Фликру)"
 
-#: ../src/frogr-details-dialog.c:90 ../src/frogr-settings-dialog.c:98
+#: src/frogr-details-dialog.c:90 src/frogr-settings-dialog.c:98
 msgid "All rights reserved"
 msgstr "Сва права су задржана"
 
-#: ../src/frogr-details-dialog.c:91 ../src/frogr-settings-dialog.c:99
+#: src/frogr-details-dialog.c:91 src/frogr-settings-dialog.c:99
 msgid "CC Attribution-NonCommercial-ShareAlike"
 msgstr "ЦЦ Ауторство—Некомерцијално—Истоветно дељење"
 
-#: ../src/frogr-details-dialog.c:92 ../src/frogr-settings-dialog.c:100
+#: src/frogr-details-dialog.c:92 src/frogr-settings-dialog.c:100
 msgid "CC Attribution-NonCommercial"
 msgstr "ЦЦ Ауторство—Некомерцијално"
 
-#: ../src/frogr-details-dialog.c:93 ../src/frogr-settings-dialog.c:101
+#: src/frogr-details-dialog.c:93 src/frogr-settings-dialog.c:101
 msgid "CC Attribution-NonCommercial-NoDerivs"
 msgstr "ЦЦ Ауторство—Некомерцијално—Без прерада"
 
-#: ../src/frogr-details-dialog.c:94 ../src/frogr-settings-dialog.c:102
+#: src/frogr-details-dialog.c:94 src/frogr-settings-dialog.c:102
 msgid "CC Attribution"
 msgstr "ЦЦ Ауторство"
 
-#: ../src/frogr-details-dialog.c:95 ../src/frogr-settings-dialog.c:103
+#: src/frogr-details-dialog.c:95 src/frogr-settings-dialog.c:103
 msgid "CC Attribution-ShareAlike"
 msgstr "ЦЦ Ауторство—Истоветно дељење"
 
-#: ../src/frogr-details-dialog.c:96 ../src/frogr-settings-dialog.c:104
+#: src/frogr-details-dialog.c:96 src/frogr-settings-dialog.c:104
 msgid "CC Attribution-NoDerivs"
 msgstr "ЦЦ Ауторство—Без прерада"
 
-#: ../src/frogr-details-dialog.c:172
+#: src/frogr-details-dialog.c:172
 msgid "Open with image viewer"
 msgstr "Отвори у прегледнику слика"
 
-#: ../src/frogr-details-dialog.c:190
+#: src/frogr-details-dialog.c:190
 msgid "_Title:"
 msgstr "_Назив:"
 
-#: ../src/frogr-details-dialog.c:200
+#: src/frogr-details-dialog.c:200
 msgid "_Description:"
 msgstr "_Опис:"
 
-#: ../src/frogr-details-dialog.c:224
+#: src/frogr-details-dialog.c:224
 msgid "Ta_gs:"
 msgstr "О_знаке:"
 
-#: ../src/frogr-details-dialog.c:247
+#: src/frogr-details-dialog.c:247
 msgid "Visibility"
 msgstr "Видљивост"
 
-#: ../src/frogr-details-dialog.c:257 ../src/frogr-settings-dialog.c:196
+#: src/frogr-details-dialog.c:257 src/frogr-settings-dialog.c:196
 msgid "_Private"
 msgstr "_Лично"
 
-#: ../src/frogr-details-dialog.c:261 ../src/frogr-settings-dialog.c:199
+#: src/frogr-details-dialog.c:261 src/frogr-settings-dialog.c:199
 msgid "P_ublic"
 msgstr "_Јавно"
 
-#: ../src/frogr-details-dialog.c:270 ../src/frogr-settings-dialog.c:207
+#: src/frogr-details-dialog.c:270 src/frogr-settings-dialog.c:207
 msgid "_Family"
 msgstr "П_ородица"
 
-#: ../src/frogr-details-dialog.c:274 ../src/frogr-settings-dialog.c:209
+#: src/frogr-details-dialog.c:274 src/frogr-settings-dialog.c:209
 msgid "F_riends"
 msgstr "П_ријатељи"
 
-#: ../src/frogr-details-dialog.c:288
+#: src/frogr-details-dialog.c:288
 msgid "Content Type"
 msgstr "Врста садржаја"
 
-#: ../src/frogr-details-dialog.c:296 ../src/frogr-settings-dialog.c:234
+#: src/frogr-details-dialog.c:296 src/frogr-settings-dialog.c:234
 msgid "P_hoto"
 msgstr "_Фотографија"
 
-#: ../src/frogr-details-dialog.c:300 ../src/frogr-settings-dialog.c:236
+#: src/frogr-details-dialog.c:300 src/frogr-settings-dialog.c:236
 msgid "Scree_nshot"
 msgstr "_Снимак екрана"
 
-#: ../src/frogr-details-dialog.c:304 ../src/frogr-settings-dialog.c:238
+#: src/frogr-details-dialog.c:304 src/frogr-settings-dialog.c:238
 msgid "Oth_er"
 msgstr "_Друго"
 
-#: ../src/frogr-details-dialog.c:317
+#: src/frogr-details-dialog.c:317
 msgid "Safety Level"
 msgstr "Ниво безбедности"
 
-#: ../src/frogr-details-dialog.c:325 ../src/frogr-settings-dialog.c:260
+#: src/frogr-details-dialog.c:325 src/frogr-settings-dialog.c:260
 msgid "S_afe"
 msgstr "_Безбедно"
 
-#: ../src/frogr-details-dialog.c:329 ../src/frogr-settings-dialog.c:262
+#: src/frogr-details-dialog.c:329 src/frogr-settings-dialog.c:262
 msgid "_Moderate"
 msgstr "_Умерено"
 
-#: ../src/frogr-details-dialog.c:333 ../src/frogr-settings-dialog.c:264
+#: src/frogr-details-dialog.c:333 src/frogr-settings-dialog.c:264
 msgid "Restr_icted"
 msgstr "_Ограничено"
 
-#: ../src/frogr-details-dialog.c:345
+#: src/frogr-details-dialog.c:345
 msgid "License Type"
 msgstr "Врста дозволе"
 
-#: ../src/frogr-details-dialog.c:367
+#: src/frogr-details-dialog.c:367
 msgid "Other Properties"
 msgstr "Остала својства"
 
-#: ../src/frogr-details-dialog.c:375
+#: src/frogr-details-dialog.c:375
 msgid "_Show Up in Global Search Results"
 msgstr "Прикажи у резултатима _опште претраге"
 
-#: ../src/frogr-details-dialog.c:379
+#: src/frogr-details-dialog.c:379
 msgid "Set Geo_location Information"
 msgstr "Подеси податке _геоположаја"
 
-#: ../src/frogr-details-dialog.c:383
+#: src/frogr-details-dialog.c:383
 msgid "Replace 'Date Posted' with 'Date Taken'"
 msgstr "Замени „датум постављања“ са „датумом снимања“"
 
-#. Visually indicate how many pictures are being edited
-#: ../src/frogr-details-dialog.c:475
+#: src/frogr-details-dialog.c:475
 #, c-format
 msgid "(%d Picture)"
 msgid_plural "(%d Pictures)"
@@ -549,24 +540,24 @@ msgstr[1] "(%d слике)"
 msgstr[2] "(%d слика)"
 msgstr[3] "(једна слика)"
 
-#: ../src/frogr-details-dialog.c:548
+#: src/frogr-details-dialog.c:548
 msgid "An error happened trying to load the picture"
 msgstr "Дошло је до грешке приликом покушаја слања слике"
 
-#: ../src/frogr-details-dialog.c:1169 ../data/gtkbuilder/frogr-menu-bar.xml.h:8
+#: src/frogr-details-dialog.c:1169
 msgid "_Edit"
 msgstr "_Уређивање"
 
-#: ../src/frogr-details-dialog.c:1197
+#: src/frogr-details-dialog.c:1197
 msgid "Edit Picture Details"
 msgstr "Уреди податке слике"
 
-#: ../src/frogr-file-loader.c:142
+#: src/frogr-file-loader.c:142
 #, c-format
 msgid "Loading files %d / %d"
 msgstr "Отпремам датотеку %d од %d"
 
-#: ../src/frogr-file-loader.c:369
+#: src/frogr-file-loader.c:369
 #, c-format
 msgid ""
 "Unable to load picture %s:\n"
@@ -575,7 +566,7 @@ msgstr ""
 "Не могу да учитам слику „%s“:\n"
 "%s"
 
-#: ../src/frogr-file-loader.c:400
+#: src/frogr-file-loader.c:400
 #, c-format
 msgid ""
 "Unable to load video %s\n"
@@ -584,10 +575,7 @@ msgstr ""
 "Не могу да отпремим снимак %s\n"
 "Проверите да ли сте инсталирали одговарајући кодек"
 
-#. First %s is the title of the picture (filename of the file by
-#. default). Second %s is the max allowed size for a picture to be
-#. uploaded to flickr (different for free and PRO accounts).
-#: ../src/frogr-file-loader.c:636
+#: src/frogr-file-loader.c:636
 #, c-format
 msgid ""
 "Can't load file %s:\n"
@@ -596,150 +584,135 @@ msgstr ""
 "Не могу да пошаљем датотеку „%s“:\n"
 "Датотека је већа од највеће допуштене за овај налог (%s)"
 
-#. First create the left side buttons
-#: ../src/frogr-main-view.c:630 ../src/frogr-main-view.c:726
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
 msgid "Open"
 msgstr "Отвори"
 
-#: ../src/frogr-main-view.c:630 ../src/frogr-main-view.c:726
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
 msgid "Open Existing Project"
 msgstr "Отворите постојећи пројекат"
 
-#: ../src/frogr-main-view.c:631 ../src/frogr-main-view.c:729
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
 msgid "Add"
 msgstr "Додај"
 
-#: ../src/frogr-main-view.c:631 ../src/frogr-main-view.c:729
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
 msgid "Add Elements"
 msgstr "Додајте елементе"
 
-#: ../src/frogr-main-view.c:632 ../src/frogr-main-view.c:730
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
 msgid "Remove"
 msgstr "Уклони"
 
-#: ../src/frogr-main-view.c:632 ../src/frogr-main-view.c:730
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
 msgid "Remove Elements"
 msgstr "Уклоните елементе"
 
-#: ../src/frogr-main-view.c:633 ../src/frogr-main-view.c:732
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
 msgid "Upload"
 msgstr "Отпреми"
 
-#: ../src/frogr-main-view.c:633 ../src/frogr-main-view.c:732
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
 msgid "Upload All"
 msgstr "Отпремите све"
 
-#. Save project item
-#: ../src/frogr-main-view.c:666 ../src/frogr-main-view.c:727
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
 msgid "Save"
 msgstr "Сачувај"
 
-#: ../src/frogr-main-view.c:666 ../src/frogr-main-view.c:727
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
 msgid "Save Current Project"
 msgstr "Сачувајте текући пројекат"
 
-#: ../src/frogr-main-view.c:1016 ../data/gtkbuilder/frogr-app-menu.xml.h:4
+#: src/frogr-main-view.c:1016
 msgid "_About"
 msgstr "_О програму"
 
-#: ../src/frogr-main-view.c:1020 ../data/gtkbuilder/frogr-app-menu.xml.h:5
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:17
+#: src/frogr-main-view.c:1020
 msgid "_Quit"
 msgstr "_Изађи"
 
-#. Create the submenu and insert it in the right section
-#: ../src/frogr-main-view.c:1070
+#: src/frogr-main-view.c:1070
 msgid "Accounts"
 msgstr "Налози"
 
-#. String showind the date and time a picture was taken
-#: ../src/frogr-main-view.c:1410
+#: src/frogr-main-view.c:1410
 #, c-format
 msgid "Taken: %s"
 msgstr "Снимљена: %s"
 
-#: ../src/frogr-main-view.c:1415
+#: src/frogr-main-view.c:1415
 #, c-format
 msgid "File size: %s"
 msgstr "Величина датотеке: %s"
 
-#: ../src/frogr-main-view.c:1540
+#: src/frogr-main-view.c:1540
 msgid "Select File"
 msgstr "Изаберите датотеку"
 
-#: ../src/frogr-main-view.c:1544 ../src/frogr-main-view.c:1671
+#: src/frogr-main-view.c:1544 src/frogr-main-view.c:1671
 msgid "_Open"
 msgstr "_Отвори"
 
-#: ../src/frogr-main-view.c:1553
+#: src/frogr-main-view.c:1553
 msgid "Frogr Project Files"
 msgstr "Датотеке Фрогровог пројекта"
 
-#: ../src/frogr-main-view.c:1615
+#: src/frogr-main-view.c:1615
 msgid "Select Destination"
 msgstr "Изаберите одредиште"
 
-#: ../src/frogr-main-view.c:1619 ../data/gtkbuilder/frogr-menu-bar.xml.h:3
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:1
+#: src/frogr-main-view.c:1619
 msgid "_Save"
 msgstr "_Сачувај"
 
-#: ../src/frogr-main-view.c:1622
+#: src/frogr-main-view.c:1622
 msgid "Untitled Project.frogr"
 msgstr "Неименовани пројекат.frogr"
 
-#: ../src/frogr-main-view.c:1667
+#: src/frogr-main-view.c:1667
 msgid "Select a Picture"
 msgstr "Изаберите слику"
 
-#: ../src/frogr-main-view.c:1694
+#: src/frogr-main-view.c:1694
 msgid "All Files"
 msgstr "Све датотеке"
 
-#: ../src/frogr-main-view.c:1697
+#: src/frogr-main-view.c:1697
 msgid "Image Files"
 msgstr "Датотеке слика"
 
-#: ../src/frogr-main-view.c:1701
+#: src/frogr-main-view.c:1701
 msgid "Video Files"
 msgstr "Датотеке снимака"
 
-#: ../src/frogr-main-view.c:1723
+#: src/frogr-main-view.c:1723
 msgid "You don't have any picture added yet"
 msgstr "Још увек нисте додали ниједну слику"
 
-#: ../src/frogr-main-view.c:1736
+#: src/frogr-main-view.c:1736
 msgid "You need to select some pictures first"
 msgstr "Прво морате да изаберете неке слике"
 
-#: ../src/frogr-main-view.c:2108
+#: src/frogr-main-view.c:2108
 msgid "Not connected to Flickr"
 msgstr "Нисте повезани на Фликр"
 
-#. Login string, showing the user is PRO (second '%s') if so.
-#: ../src/frogr-main-view.c:2118
+#: src/frogr-main-view.c:2118
 #, c-format
 msgid "Connected as %s%s"
 msgstr "Повезани сте као %s%s"
 
-#: ../src/frogr-main-view.c:2119
+#: src/frogr-main-view.c:2119
 msgid " (PRO account)"
 msgstr " (ПРО налог)"
 
-#. Will show in the status bar the amount of data (in KB, MB
-#. or GB) the user is currently allowed to upload to flicker
-#. till the end of the month, in a CURRENT / MAX fashion.
-#. The '-' at the beginning is just a separator, since more
-#. blocks of text will be shown in the status bar too.
-#: ../src/frogr-main-view.c:2143
+#: src/frogr-main-view.c:2143
 #, c-format
 msgid " - %s / %s remaining"
 msgstr " — преостаје вам %s од %s"
 
-#. Will show in the status bar the amount of pictures and data
-#. (in KB, MB or GB) that would be uploaded as the sum of the
-#. sizes for every picture loaded in the application
-#: ../src/frogr-main-view.c:2169
+#: src/frogr-main-view.c:2169
 #, c-format
 msgid " - %d file to upload (%s)"
 msgid_plural " - %d files to upload (%s)"
@@ -748,217 +721,166 @@ msgstr[1] " — %d датотеке за отпремање (%s)"
 msgstr[2] " — %d датотека за отпремање (%s)"
 msgstr[3] " — %d датотека за отпремање (%s)"
 
-#: ../src/frogr-settings-dialog.c:185
+#: src/frogr-settings-dialog.c:185
 msgid "Default Visibility"
 msgstr "Основна видљивост"
 
-#: ../src/frogr-settings-dialog.c:224
+#: src/frogr-settings-dialog.c:224
 msgid "Default Content Type"
 msgstr "Основна врста садржаја"
 
-#: ../src/frogr-settings-dialog.c:250
+#: src/frogr-settings-dialog.c:250
 msgid "Default Safety Level"
 msgstr "Основни ниво безбедности"
 
-#: ../src/frogr-settings-dialog.c:276
+#: src/frogr-settings-dialog.c:276
 msgid "Default License"
 msgstr "Основна дозвола"
 
-#: ../src/frogr-settings-dialog.c:302
+#: src/frogr-settings-dialog.c:302
 msgid "Other Defaults"
 msgstr "Остале основности"
 
-#: ../src/frogr-settings-dialog.c:312
+#: src/frogr-settings-dialog.c:312
 msgid "_Show Pictures in Global Search Results"
 msgstr "Прикажи _слике у резултатима опште претраге"
 
-#: ../src/frogr-settings-dialog.c:315
+#: src/frogr-settings-dialog.c:315
 msgid "Set Geo_location Information for Pictures"
 msgstr "Подеси податке _геоположаја за слику"
 
-#: ../src/frogr-settings-dialog.c:318
+#: src/frogr-settings-dialog.c:318
 msgid "Replace 'Date Posted' with 'Date Taken' for Pictures"
 msgstr "Замени „датум постављања“ са „датумом снимања“ за слике"
 
-#: ../src/frogr-settings-dialog.c:324
+#: src/frogr-settings-dialog.c:324
 msgid "_General"
 msgstr "_Опште"
 
-#: ../src/frogr-settings-dialog.c:344
+#: src/frogr-settings-dialog.c:344
 msgid "Proxy Settings"
 msgstr "Подешавања посредника"
 
-#. Enable proxy
-#: ../src/frogr-settings-dialog.c:353
+#: src/frogr-settings-dialog.c:353
 msgid "_Enable HTTP Proxy"
 msgstr "Укључи _ХТТП посредника"
 
-#: ../src/frogr-settings-dialog.c:363
+#: src/frogr-settings-dialog.c:363
 msgid "_Host:"
 msgstr "_Рачунар:"
 
-#. Proxy port
-#: ../src/frogr-settings-dialog.c:376
+#: src/frogr-settings-dialog.c:376
 msgid "_Port:"
 msgstr "_Прикључак:"
 
-#. Proxy username
-#: ../src/frogr-settings-dialog.c:389
+#: src/frogr-settings-dialog.c:389
 msgid "U_sername:"
 msgstr "Корисничко _име:"
 
-#. Proxy password
-#: ../src/frogr-settings-dialog.c:402
+#: src/frogr-settings-dialog.c:402
 msgid "Pass_word:"
 msgstr "_Лозинка:"
 
-#: ../src/frogr-settings-dialog.c:426
+#: src/frogr-settings-dialog.c:426
 msgid "Connec_tion"
 msgstr "_Веза"
 
-#: ../src/frogr-settings-dialog.c:444
+#: src/frogr-settings-dialog.c:444
 msgid "Other options"
 msgstr "Остали избори"
 
-#: ../src/frogr-settings-dialog.c:454
+#: src/frogr-settings-dialog.c:454
 msgid "Ena_ble Tags Auto-Completion"
 msgstr "Укључи _самодовршавање ознака"
 
-#: ../src/frogr-settings-dialog.c:457
+#: src/frogr-settings-dialog.c:457
 msgid "_Import Tags from Pictures Metadata"
 msgstr "Увези ознаке из _метаподтака слика"
 
-#: ../src/frogr-settings-dialog.c:461
+#: src/frogr-settings-dialog.c:461
 msgid "Use _Dark GTK Theme"
 msgstr "Користи _тамну ГТК тему"
 
-#: ../src/frogr-settings-dialog.c:465
+#: src/frogr-settings-dialog.c:465
 msgid "_Keep File Extensions in Titles when Loading"
 msgstr "_Задржи проширења датотека у називима приликом слања"
 
-#: ../src/frogr-settings-dialog.c:471
+#: src/frogr-settings-dialog.c:471
 msgid "_Misc"
 msgstr "_Разно"
 
-#: ../src/frogr-settings-dialog.c:972
+#: src/frogr-settings-dialog.c:972
 msgid "Preferences"
 msgstr "Поставке"
 
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:1
-msgid "Aut_horize Account…"
-msgstr "_Овласти налог…"
-
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:2
-msgid "_Preferences…"
-msgstr "_Поставке…"
-
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:3
-msgid "_Help"
-msgstr "По_моћ"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:1
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:9
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:3
-msgid "_Edit Details…"
-msgstr "Измени _детаље…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:2
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:10
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:4
-msgid "Add _Tags…"
-msgstr "Додај _ознаке…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:3
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:11
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:5
-msgid "Add to _Group…"
-msgstr "Додај у _групу…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:4
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:12
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:6
-msgid "Add to _Photoset"
-msgstr "Додај у _скуп фотографија"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:5
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:13
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:7
-msgid "_Add to Existing Photoset…"
-msgstr "_Додај у постојећи скуп фотографија…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:6
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:14
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:8
-msgid "_Create New Photoset…"
-msgstr "_Направи нови скуп фотографија…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:7
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:15
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:16
-msgid "_Open in External Viewer"
-msgstr "Отвори у _спољном прегледнику"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:8
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:6
-msgid "_Remove Elements"
-msgstr "_Уклони елементе"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:1
-msgid "_File"
-msgstr "_Датотека"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:2
-msgid "_Open…"
-msgstr "_Отвори…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:4
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:2
-msgid "Save _As…"
-msgstr "Сачувај _као…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:5
-msgid "A_dd Elements…"
-msgstr "Додај _елементе…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:7
-msgid "_Upload All"
-msgstr "Отпремите _све"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:16
-msgid "_View"
-msgstr "_Преглед"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:17
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:9
-msgid "_Sort Elements"
-msgstr "_Поређај елементе"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:18
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:10
-msgid "As _Loaded"
-msgstr "Према _учитавању"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:19
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:11
-msgid "By _Date Taken"
-msgstr "Према _датуму снимања"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:20
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:12
-msgid "By _Title"
-msgstr "Према _називу"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:21
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:13
-msgid "By _Size"
-msgstr "Према _величини"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:22
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:14
-msgid "_Reversed Order"
-msgstr "_Обрнути редослед"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:23
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:15
-msgid "Enable _Tooltips"
-msgstr "Укључи облачиће _алата"
+#~ msgid "Aut_horize Account…"
+#~ msgstr "_Овласти налог…"
+
+#~ msgid "_Preferences…"
+#~ msgstr "_Поставке…"
+
+#~ msgid "_Help"
+#~ msgstr "По_моћ"
+
+#~ msgid "_Edit Details…"
+#~ msgstr "Измени _детаље…"
+
+#~ msgid "Add _Tags…"
+#~ msgstr "Додај _ознаке…"
+
+#~ msgid "Add to _Group…"
+#~ msgstr "Додај у _групу…"
+
+#~ msgid "Add to _Photoset"
+#~ msgstr "Додај у _скуп фотографија"
+
+#~ msgid "_Add to Existing Photoset…"
+#~ msgstr "_Додај у постојећи скуп фотографија…"
+
+#~ msgid "_Create New Photoset…"
+#~ msgstr "_Направи нови скуп фотографија…"
+
+#~ msgid "_Open in External Viewer"
+#~ msgstr "Отвори у _спољном прегледнику"
+
+#~ msgid "_Remove Elements"
+#~ msgstr "_Уклони елементе"
+
+#~ msgid "_File"
+#~ msgstr "_Датотека"
+
+#~ msgid "_Open…"
+#~ msgstr "_Отвори…"
+
+#~ msgid "Save _As…"
+#~ msgstr "Сачувај _као…"
+
+#~ msgid "A_dd Elements…"
+#~ msgstr "Додај _елементе…"
+
+#~ msgid "_Upload All"
+#~ msgstr "Отпремите _све"
+
+#~ msgid "_View"
+#~ msgstr "_Преглед"
+
+#~ msgid "_Sort Elements"
+#~ msgstr "_Поређај елементе"
+
+#~ msgid "As _Loaded"
+#~ msgstr "Према _учитавању"
+
+#~ msgid "By _Date Taken"
+#~ msgstr "Према _датуму снимања"
+
+#~ msgid "By _Title"
+#~ msgstr "Према _називу"
+
+#~ msgid "By _Size"
+#~ msgstr "Према _величини"
+
+#~ msgid "_Reversed Order"
+#~ msgstr "_Обрнути редослед"
+
+#~ msgid "Enable _Tooltips"
+#~ msgstr "Укључи облачиће _алата"
diff --git a/po/sr latin po b/po/sr latin po
index 0fd252d..947582f 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -5,9 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: frogr master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=frogr&k";
-"eywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-01-22 18:06+0000\n"
+"Report-Msgid-Bugs-To: msanchez gnome org\n"
+"POT-Creation-Date: 2016-08-12 13:09+0100\n"
 "PO-Revision-Date: 2016-02-20 11:52+0200\n"
 "Last-Translator: Miroslav Nikolić <miroslavnikolic rocketmail com>\n"
 "Language-Team: Serbian <gnom prevod org>\n"
@@ -15,11 +14,20 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=n==1? 3 : 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=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n"
+"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
-#: ../data/frogr.appdata.xml.in.h:1
+#: data/frogr.appdata.xml.in:5 data/frogr.desktop.in.in:5
+#: data/frogr.desktop.in.in:14
+msgid "frogr"
+msgstr "frogr"
+
+#: data/frogr.appdata.xml.in:6 data/frogr.desktop.in.in:6
+msgid "frogr: a Flickr Remote Organizer for GNOME"
+msgstr "frogr: Flikrov udaljeni organizator za Gnom"
+
+#: data/frogr.appdata.xml.in:8
 msgid ""
 "frogr is a small application for the GNOME desktop that allows users to "
 "manage their accounts in the Flickr image hosting website."
@@ -27,89 +35,84 @@ msgstr ""
 "frogr je mali program za Gnomovo okruženje koji omogućava korisnicima da "
 "upravljaju svojim nalozima na Flikrovoj veb stranici za udomljavanje slika."
 
-#: ../data/frogr.appdata.xml.in.h:2
+#: data/frogr.appdata.xml.in:13
 msgid ""
 "It supports all the basic Flickr features, including uploading pictures, "
 "adding descriptions, setting tags and managing sets and groups pools."
 msgstr ""
-"Podržava sve osnovne Flikrove funkcije, uključujući otpremanje slika, dodavanje "
-"opisa, podešavanje oznaka i upravljanje depoima podešavanja i grupa."
+"Podržava sve osnovne Flikrove funkcije, uključujući otpremanje slika, "
+"dodavanje opisa, podešavanje oznaka i upravljanje depoima podešavanja i "
+"grupa."
 
-#: ../data/frogr.appdata.xml.in.h:3
-#| msgid "Scree_nshot"
+#: data/frogr.appdata.xml.in:24
 msgid "Screenshot of frogr"
 msgstr "Snimak ekrana frogra"
 
-#: ../data/frogr.desktop.in.in.h:1
-msgid "frogr"
-msgstr "frogr"
-
-#: ../data/frogr.desktop.in.in.h:2
-msgid "frogr: a Flickr Remote Organizer for GNOME"
-msgstr "frogr: Flikrov udaljeni organizator za Gnom"
+#: data/frogr.appdata.xml.in:29
+msgid "Mario Sanchez Prada"
+msgstr ""
 
-#: ../data/frogr.desktop.in.in.h:3
+#: data/frogr.desktop.in.in:7
 msgid "Upload and organize photos in Flickr accounts"
 msgstr "Pošaljite i organizujte fotografije na Flikrovim nalozima"
 
-#: ../data/frogr.desktop.in.in.h:4
+#: data/frogr.desktop.in.in:8
 msgid "Flickr;Image;Picture;Photo;Video;Uploader;"
 msgstr "flikr;slika;fotografija;video;snimak;otpremnik;"
 
-#: ../src/frogr-about-dialog.c:43
+#: src/frogr-about-dialog.c:43
 msgid "A Flickr Remote Organizer for GNOME\n"
 msgstr "Flikrov udaljeni organizator za Gnom\n"
 
-#: ../src/frogr-about-dialog.c:72
+#: src/frogr-about-dialog.c:72
 msgid "translator-credits"
 msgstr ""
 "  Miroslav Nikolić <miroslavnikolic rocketmail com>\n"
 "\n"
 "http://prevod.org — prevod na srpski jezik"
 
-#: ../src/frogr-add-tags-dialog.c:191 ../src/frogr-add-to-group-dialog.c:528
-#: ../src/frogr-add-to-set-dialog.c:529 ../src/frogr-auth-dialog.c:153
-#: ../src/frogr-create-new-set-dialog.c:310 ../src/frogr-details-dialog.c:1168
-#: ../src/frogr-main-view.c:1543 ../src/frogr-main-view.c:1618
-#: ../src/frogr-main-view.c:1670 ../src/frogr-settings-dialog.c:930
+#: src/frogr-add-tags-dialog.c:191 src/frogr-add-to-group-dialog.c:528
+#: src/frogr-add-to-set-dialog.c:529 src/frogr-auth-dialog.c:153
+#: src/frogr-create-new-set-dialog.c:310 src/frogr-details-dialog.c:1168
+#: src/frogr-main-view.c:1543 src/frogr-main-view.c:1618
+#: src/frogr-main-view.c:1670 src/frogr-settings-dialog.c:930
 msgid "_Cancel"
 msgstr "_Otkaži"
 
-#: ../src/frogr-add-tags-dialog.c:193 ../src/frogr-add-to-group-dialog.c:530
-#: ../src/frogr-add-to-set-dialog.c:531
-#: ../src/frogr-create-new-set-dialog.c:312
+#: src/frogr-add-tags-dialog.c:193 src/frogr-add-to-group-dialog.c:530
+#: src/frogr-add-to-set-dialog.c:531 src/frogr-create-new-set-dialog.c:312
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: ../src/frogr-add-tags-dialog.c:202
+#: src/frogr-add-tags-dialog.c:202
 msgid "Enter a spaces separated list of tags:"
 msgstr "Unesite razmakom razdvojen spisak oznaka:"
 
-#: ../src/frogr-add-tags-dialog.c:228
+#: src/frogr-add-tags-dialog.c:228
 msgid "Add Tags"
 msgstr "Dodajte oznake"
 
-#: ../src/frogr-add-to-group-dialog.c:147
+#: src/frogr-add-to-group-dialog.c:147
 msgid "Name"
 msgstr "Naziv"
 
-#: ../src/frogr-add-to-group-dialog.c:162 ../src/frogr-add-to-set-dialog.c:163
+#: src/frogr-add-to-group-dialog.c:162 src/frogr-add-to-set-dialog.c:163
 msgid "Elements"
 msgstr "Elementi"
 
-#: ../src/frogr-add-to-group-dialog.c:581
+#: src/frogr-add-to-group-dialog.c:581
 msgid "Add to Groups"
 msgstr "Dodaj u grupe"
 
-#: ../src/frogr-add-to-set-dialog.c:148
+#: src/frogr-add-to-set-dialog.c:148
 msgid "Title"
 msgstr "Naziv"
 
-#: ../src/frogr-add-to-set-dialog.c:582
+#: src/frogr-add-to-set-dialog.c:582
 msgid "Add to Sets"
 msgstr "Dodaj u podešavanja"
 
-#: ../src/frogr-auth-dialog.c:59
+#: src/frogr-auth-dialog.c:59
 #, c-format
 msgid ""
 "Please press the button to authorize %s and then come back to complete the "
@@ -118,30 +121,29 @@ msgstr ""
 "Molim pritisnite dugme da ovlastite „%s“ i zatim se vratite da dovršite "
 "proces."
 
-#: ../src/frogr-auth-dialog.c:63 ../src/frogr-auth-dialog.c:149
-#: ../src/frogr-controller.c:2286
+#: src/frogr-auth-dialog.c:63 src/frogr-auth-dialog.c:149
+#: src/frogr-controller.c:2286
 #, c-format
 msgid "Authorize %s"
 msgstr "Ovlasti „%s“"
 
-#: ../src/frogr-auth-dialog.c:155 ../src/frogr-settings-dialog.c:932
+#: src/frogr-auth-dialog.c:155 src/frogr-settings-dialog.c:932
 msgid "_Close"
 msgstr "_Zatvori"
 
-#. Description label
-#: ../src/frogr-auth-dialog.c:167
+#: src/frogr-auth-dialog.c:167
 msgid "Enter verification code:"
 msgstr "Unesi šifru provere:"
 
-#: ../src/frogr-auth-dialog.c:221
+#: src/frogr-auth-dialog.c:221
 msgid "Invalid verification code"
 msgstr "Neispravna šifra provere"
 
-#: ../src/frogr-controller.c:581
+#: src/frogr-controller.c:581
 msgid "Process cancelled"
 msgstr "Proces je otkazan"
 
-#: ../src/frogr-controller.c:586
+#: src/frogr-controller.c:586
 msgid ""
 "Connection error:\n"
 "Network not available"
@@ -149,7 +151,7 @@ msgstr ""
 "Greška povezivanja:\n"
 "Mreža nije dostupna"
 
-#: ../src/frogr-controller.c:590
+#: src/frogr-controller.c:590
 msgid ""
 "Connection error:\n"
 "Bad request"
@@ -157,7 +159,7 @@ msgstr ""
 "Greška povezivanja:\n"
 "Loš zahtev"
 
-#: ../src/frogr-controller.c:594
+#: src/frogr-controller.c:594
 msgid ""
 "Connection error:\n"
 "Server-side error"
@@ -165,7 +167,7 @@ msgstr ""
 "Greška povezivanja:\n"
 "Greška servera"
 
-#: ../src/frogr-controller.c:598
+#: src/frogr-controller.c:598
 msgid ""
 "Error uploading:\n"
 "File invalid"
@@ -173,7 +175,7 @@ msgstr ""
 "Greška pri slanju:\n"
 "Neispravna datoteka"
 
-#: ../src/frogr-controller.c:602
+#: src/frogr-controller.c:602
 msgid ""
 "Error uploading picture:\n"
 "Quota exceeded"
@@ -181,7 +183,7 @@ msgstr ""
 "Greška pri slanju slike:\n"
 "Premašena kvota"
 
-#: ../src/frogr-controller.c:607
+#: src/frogr-controller.c:607
 #, c-format
 msgid "Quota exceeded (limit: %d video per month)"
 msgid_plural "Quota exceeded (limit: %d videos per month)"
@@ -190,7 +192,7 @@ msgstr[1] "Premašena je količina (ograničenje: %d snimka mesečno)"
 msgstr[2] "Premašena je količina (ograničenje: %d snimaka mesečno)"
 msgstr[3] "Premašena je količina (ograničenje: jedan snimak mesečno)"
 
-#: ../src/frogr-controller.c:611
+#: src/frogr-controller.c:611
 msgid ""
 "Error uploading video:\n"
 "You can't upload more videos with this account"
@@ -198,7 +200,7 @@ msgstr ""
 "Greška otpremanja snimka:\n"
 "Sa ovim nalogom ne možete da otpremite još snimaka"
 
-#: ../src/frogr-controller.c:617
+#: src/frogr-controller.c:617
 msgid ""
 "Error:\n"
 "Photo not found"
@@ -206,7 +208,7 @@ msgstr ""
 "Greška:\n"
 "Nisam pronašao fotografiju"
 
-#: ../src/frogr-controller.c:621
+#: src/frogr-controller.c:621
 msgid ""
 "Error:\n"
 "Photo already in photoset"
@@ -214,7 +216,7 @@ msgstr ""
 "Greška:\n"
 "Fotografija je već u skupu fotografija"
 
-#: ../src/frogr-controller.c:625
+#: src/frogr-controller.c:625
 msgid ""
 "Error:\n"
 "Photo already in group"
@@ -222,7 +224,7 @@ msgstr ""
 "Greška:\n"
 "Fotografija je već u grupi"
 
-#: ../src/frogr-controller.c:629
+#: src/frogr-controller.c:629
 msgid ""
 "Error:\n"
 "Photo already in the maximum number of groups possible"
@@ -230,7 +232,7 @@ msgstr ""
 "Greška:\n"
 "Fotografija je već u najvećem mogućem broju grupa"
 
-#: ../src/frogr-controller.c:633
+#: src/frogr-controller.c:633
 msgid ""
 "Error:\n"
 "Group limit already reached"
@@ -238,7 +240,7 @@ msgstr ""
 "Greška:\n"
 "Već ste dostigli ograničenje grupe"
 
-#: ../src/frogr-controller.c:637
+#: src/frogr-controller.c:637
 msgid ""
 "Error:\n"
 "Photo added to group's queue"
@@ -246,7 +248,7 @@ msgstr ""
 "Greška:\n"
 "Fotografija je dodata u red grupe"
 
-#: ../src/frogr-controller.c:641
+#: src/frogr-controller.c:641
 msgid ""
 "Error:\n"
 "Photo already added to group's queue"
@@ -254,7 +256,7 @@ msgstr ""
 "Greška:\n"
 "Fotografija je već dodata u red grupe"
 
-#: ../src/frogr-controller.c:645
+#: src/frogr-controller.c:645
 msgid ""
 "Error:\n"
 "Content not allowed for this group"
@@ -262,8 +264,7 @@ msgstr ""
 "Greška:\n"
 "Sadržaj nije dopušten za ovu grupu"
 
-#: ../src/frogr-controller.c:649
-#, c-format
+#: src/frogr-controller.c:649
 msgid ""
 "Authorization failed.\n"
 "Please try again"
@@ -271,7 +272,7 @@ msgstr ""
 "Potvrda identiteta nije uspela.\n"
 "Pokušajte ponovo"
 
-#: ../src/frogr-controller.c:655
+#: src/frogr-controller.c:655
 #, c-format
 msgid ""
 "Error\n"
@@ -282,8 +283,7 @@ msgstr ""
 "%s nije ispravno ovlašćen da šalje slike na Flikr.\n"
 "Molim ovlastite ga ponovo"
 
-#: ../src/frogr-controller.c:660
-#, c-format
+#: src/frogr-controller.c:660
 msgid ""
 "Unable to authenticate in Flickr\n"
 "Please try again."
@@ -291,7 +291,7 @@ msgstr ""
 "Ne mogu da potvrdim identitet na Flikru\n"
 "Pokušajte opet."
 
-#: ../src/frogr-controller.c:664
+#: src/frogr-controller.c:664
 #, c-format
 msgid ""
 "You have not properly authorized %s yet.\n"
@@ -300,8 +300,7 @@ msgstr ""
 "Još uvek niste ispravno ovlastili „%s“.\n"
 "Pokušajte opet."
 
-#: ../src/frogr-controller.c:669
-#, c-format
+#: src/frogr-controller.c:669
 msgid ""
 "Invalid verification code.\n"
 "Please try again."
@@ -309,8 +308,7 @@ msgstr ""
 "Neispravna šifra provere.\n"
 "Pokušajte opet."
 
-#: ../src/frogr-controller.c:673
-#, c-format
+#: src/frogr-controller.c:673
 msgid ""
 "Error:\n"
 "Service not available"
@@ -318,64 +316,62 @@ msgstr ""
 "Greška:\n"
 "Usluga nije dostupna"
 
-#. General error: just dump the raw error description
-#: ../src/frogr-controller.c:678
+#: src/frogr-controller.c:678
 #, c-format
 msgid "An error happened: %s."
 msgstr "Dogodila se greška: %s."
 
-#: ../src/frogr-controller.c:883
+#: src/frogr-controller.c:883
 msgid "Authorization failed (timed out)"
 msgstr "Nije uspelo potvrđivanje identiteta (isteklo je vreme)"
 
-#: ../src/frogr-controller.c:931
+#: src/frogr-controller.c:931
 #, c-format
 msgid "Retrying Upload (attempt %d/%d)…"
 msgstr "Ponovo pokušavam otpremanje (pokušaj %d/%d)…"
 
-#: ../src/frogr-controller.c:936
+#: src/frogr-controller.c:936
 #, c-format
 msgid "Uploading '%s'…"
 msgstr "Otpremam „%s“…"
 
-#: ../src/frogr-controller.c:2242
+#: src/frogr-controller.c:2242
 msgid "Updating credentials…"
 msgstr "Osvežavam uverenja…"
 
-#: ../src/frogr-controller.c:2247
+#: src/frogr-controller.c:2247
 msgid "Retrieving data for authorization…"
 msgstr "Preuzimam podatke za potvrđivanje identiteta…"
 
-#: ../src/frogr-controller.c:2252
+#: src/frogr-controller.c:2252
 msgid "Finishing authorization…"
 msgstr "Završavam potvrđivanje identiteta…"
 
-#: ../src/frogr-controller.c:2257
+#: src/frogr-controller.c:2257
 msgid "Retrieving list of sets…"
 msgstr "Preuzimam spisak skupova…"
 
-#: ../src/frogr-controller.c:2262
+#: src/frogr-controller.c:2262
 msgid "Retrieving list of groups…"
 msgstr "Preuzimam spisak grupa…"
 
-#: ../src/frogr-controller.c:2267
+#: src/frogr-controller.c:2267
 msgid "Retrieving list of tags…"
 msgstr "Preuzimam spisak oznaka…"
 
-#: ../src/frogr-controller.c:2292
-#, c-format
+#: src/frogr-controller.c:2292
 msgid "Fetching information"
 msgstr "Preuzimam podatke"
 
-#: ../src/frogr-controller.c:2398
+#: src/frogr-controller.c:2398
 msgid "No sets found"
 msgstr "Nisam pronašao skupove"
 
-#: ../src/frogr-controller.c:2423
+#: src/frogr-controller.c:2423
 msgid "No groups found"
 msgstr "Nisam pronašao grupe"
 
-#: ../src/frogr-controller.c:2984
+#: src/frogr-controller.c:2984
 #, c-format
 msgid ""
 "You need to properly authorize %s before uploading any pictures to Flickr.\n"
@@ -384,163 +380,159 @@ msgstr ""
 "Morate ispravno da ovlastite „%s“ pre slanja bilo kakvih slika na Flikr.\n"
 "Molim ovlastite ga ponovo."
 
-#: ../src/frogr-controller.c:2994
-#, c-format
+#: src/frogr-controller.c:2994
 msgid "You need to be connected before uploading any pictures to Flickr."
 msgstr "Morate biti povezani da biste slali slike na Flikr."
 
-#: ../src/frogr-controller.c:3012
+#: src/frogr-controller.c:3012
 msgid "Uploading Pictures"
 msgstr "Otpremam slike"
 
-#: ../src/frogr-controller.c:3057
-#, c-format
+#: src/frogr-controller.c:3057
 msgid "Error opening project file"
 msgstr "Greška otvaranja datoteke projekta"
 
-#. This shows a dialog notifying the problem to the user
-#: ../src/frogr-create-new-set-dialog.c:143 ../src/frogr-details-dialog.c:1001
+#: src/frogr-create-new-set-dialog.c:143 src/frogr-details-dialog.c:1001
 msgid "Missing data required"
 msgstr "Podaci koji nedostaju su potrebni"
 
-#: ../src/frogr-create-new-set-dialog.c:326
+#: src/frogr-create-new-set-dialog.c:326
 msgid "Title:"
 msgstr "Naziv:"
 
-#: ../src/frogr-create-new-set-dialog.c:335
+#: src/frogr-create-new-set-dialog.c:335
 msgid "Description:"
 msgstr "Opis:"
 
-#: ../src/frogr-create-new-set-dialog.c:356
+#: src/frogr-create-new-set-dialog.c:356
 msgid "Fill Pictures Details with Title and Description"
 msgstr "Popunite podatke o slici nazivom i opisom"
 
-#: ../src/frogr-create-new-set-dialog.c:381
+#: src/frogr-create-new-set-dialog.c:381
 msgid "Create New Set"
 msgstr "Napravi novi skup"
 
-#: ../src/frogr-details-dialog.c:89 ../src/frogr-settings-dialog.c:97
+#: src/frogr-details-dialog.c:89 src/frogr-settings-dialog.c:97
 msgid "Default (as specified in Flickr)"
 msgstr "Osnovno (kao što je navedeno u Flikru)"
 
-#: ../src/frogr-details-dialog.c:90 ../src/frogr-settings-dialog.c:98
+#: src/frogr-details-dialog.c:90 src/frogr-settings-dialog.c:98
 msgid "All rights reserved"
 msgstr "Sva prava su zadržana"
 
-#: ../src/frogr-details-dialog.c:91 ../src/frogr-settings-dialog.c:99
+#: src/frogr-details-dialog.c:91 src/frogr-settings-dialog.c:99
 msgid "CC Attribution-NonCommercial-ShareAlike"
 msgstr "CC Autorstvo—Nekomercijalno—Istovetno deljenje"
 
-#: ../src/frogr-details-dialog.c:92 ../src/frogr-settings-dialog.c:100
+#: src/frogr-details-dialog.c:92 src/frogr-settings-dialog.c:100
 msgid "CC Attribution-NonCommercial"
 msgstr "CC Autorstvo—Nekomercijalno"
 
-#: ../src/frogr-details-dialog.c:93 ../src/frogr-settings-dialog.c:101
+#: src/frogr-details-dialog.c:93 src/frogr-settings-dialog.c:101
 msgid "CC Attribution-NonCommercial-NoDerivs"
 msgstr "CC Autorstvo—Nekomercijalno—Bez prerada"
 
-#: ../src/frogr-details-dialog.c:94 ../src/frogr-settings-dialog.c:102
+#: src/frogr-details-dialog.c:94 src/frogr-settings-dialog.c:102
 msgid "CC Attribution"
 msgstr "CC Autorstvo"
 
-#: ../src/frogr-details-dialog.c:95 ../src/frogr-settings-dialog.c:103
+#: src/frogr-details-dialog.c:95 src/frogr-settings-dialog.c:103
 msgid "CC Attribution-ShareAlike"
 msgstr "CC Autorstvo—Istovetno deljenje"
 
-#: ../src/frogr-details-dialog.c:96 ../src/frogr-settings-dialog.c:104
+#: src/frogr-details-dialog.c:96 src/frogr-settings-dialog.c:104
 msgid "CC Attribution-NoDerivs"
 msgstr "CC Autorstvo—Bez prerada"
 
-#: ../src/frogr-details-dialog.c:172
+#: src/frogr-details-dialog.c:172
 msgid "Open with image viewer"
 msgstr "Otvori u pregledniku slika"
 
-#: ../src/frogr-details-dialog.c:190
+#: src/frogr-details-dialog.c:190
 msgid "_Title:"
 msgstr "_Naziv:"
 
-#: ../src/frogr-details-dialog.c:200
+#: src/frogr-details-dialog.c:200
 msgid "_Description:"
 msgstr "_Opis:"
 
-#: ../src/frogr-details-dialog.c:224
+#: src/frogr-details-dialog.c:224
 msgid "Ta_gs:"
 msgstr "O_znake:"
 
-#: ../src/frogr-details-dialog.c:247
+#: src/frogr-details-dialog.c:247
 msgid "Visibility"
 msgstr "Vidljivost"
 
-#: ../src/frogr-details-dialog.c:257 ../src/frogr-settings-dialog.c:196
+#: src/frogr-details-dialog.c:257 src/frogr-settings-dialog.c:196
 msgid "_Private"
 msgstr "_Lično"
 
-#: ../src/frogr-details-dialog.c:261 ../src/frogr-settings-dialog.c:199
+#: src/frogr-details-dialog.c:261 src/frogr-settings-dialog.c:199
 msgid "P_ublic"
 msgstr "_Javno"
 
-#: ../src/frogr-details-dialog.c:270 ../src/frogr-settings-dialog.c:207
+#: src/frogr-details-dialog.c:270 src/frogr-settings-dialog.c:207
 msgid "_Family"
 msgstr "P_orodica"
 
-#: ../src/frogr-details-dialog.c:274 ../src/frogr-settings-dialog.c:209
+#: src/frogr-details-dialog.c:274 src/frogr-settings-dialog.c:209
 msgid "F_riends"
 msgstr "P_rijatelji"
 
-#: ../src/frogr-details-dialog.c:288
+#: src/frogr-details-dialog.c:288
 msgid "Content Type"
 msgstr "Vrsta sadržaja"
 
-#: ../src/frogr-details-dialog.c:296 ../src/frogr-settings-dialog.c:234
+#: src/frogr-details-dialog.c:296 src/frogr-settings-dialog.c:234
 msgid "P_hoto"
 msgstr "_Fotografija"
 
-#: ../src/frogr-details-dialog.c:300 ../src/frogr-settings-dialog.c:236
+#: src/frogr-details-dialog.c:300 src/frogr-settings-dialog.c:236
 msgid "Scree_nshot"
 msgstr "_Snimak ekrana"
 
-#: ../src/frogr-details-dialog.c:304 ../src/frogr-settings-dialog.c:238
+#: src/frogr-details-dialog.c:304 src/frogr-settings-dialog.c:238
 msgid "Oth_er"
 msgstr "_Drugo"
 
-#: ../src/frogr-details-dialog.c:317
+#: src/frogr-details-dialog.c:317
 msgid "Safety Level"
 msgstr "Nivo bezbednosti"
 
-#: ../src/frogr-details-dialog.c:325 ../src/frogr-settings-dialog.c:260
+#: src/frogr-details-dialog.c:325 src/frogr-settings-dialog.c:260
 msgid "S_afe"
 msgstr "_Bezbedno"
 
-#: ../src/frogr-details-dialog.c:329 ../src/frogr-settings-dialog.c:262
+#: src/frogr-details-dialog.c:329 src/frogr-settings-dialog.c:262
 msgid "_Moderate"
 msgstr "_Umereno"
 
-#: ../src/frogr-details-dialog.c:333 ../src/frogr-settings-dialog.c:264
+#: src/frogr-details-dialog.c:333 src/frogr-settings-dialog.c:264
 msgid "Restr_icted"
 msgstr "_Ograničeno"
 
-#: ../src/frogr-details-dialog.c:345
+#: src/frogr-details-dialog.c:345
 msgid "License Type"
 msgstr "Vrsta dozvole"
 
-#: ../src/frogr-details-dialog.c:367
+#: src/frogr-details-dialog.c:367
 msgid "Other Properties"
 msgstr "Ostala svojstva"
 
-#: ../src/frogr-details-dialog.c:375
+#: src/frogr-details-dialog.c:375
 msgid "_Show Up in Global Search Results"
 msgstr "Prikaži u rezultatima _opšte pretrage"
 
-#: ../src/frogr-details-dialog.c:379
+#: src/frogr-details-dialog.c:379
 msgid "Set Geo_location Information"
 msgstr "Podesi podatke _geopoložaja"
 
-#: ../src/frogr-details-dialog.c:383
+#: src/frogr-details-dialog.c:383
 msgid "Replace 'Date Posted' with 'Date Taken'"
 msgstr "Zameni „datum postavljanja“ sa „datumom snimanja“"
 
-#. Visually indicate how many pictures are being edited
-#: ../src/frogr-details-dialog.c:475
+#: src/frogr-details-dialog.c:475
 #, c-format
 msgid "(%d Picture)"
 msgid_plural "(%d Pictures)"
@@ -549,24 +541,24 @@ msgstr[1] "(%d slike)"
 msgstr[2] "(%d slika)"
 msgstr[3] "(jedna slika)"
 
-#: ../src/frogr-details-dialog.c:548
+#: src/frogr-details-dialog.c:548
 msgid "An error happened trying to load the picture"
 msgstr "Došlo je do greške prilikom pokušaja slanja slike"
 
-#: ../src/frogr-details-dialog.c:1169 ../data/gtkbuilder/frogr-menu-bar.xml.h:8
+#: src/frogr-details-dialog.c:1169
 msgid "_Edit"
 msgstr "_Uređivanje"
 
-#: ../src/frogr-details-dialog.c:1197
+#: src/frogr-details-dialog.c:1197
 msgid "Edit Picture Details"
 msgstr "Uredi podatke slike"
 
-#: ../src/frogr-file-loader.c:142
+#: src/frogr-file-loader.c:142
 #, c-format
 msgid "Loading files %d / %d"
 msgstr "Otpremam datoteku %d od %d"
 
-#: ../src/frogr-file-loader.c:369
+#: src/frogr-file-loader.c:369
 #, c-format
 msgid ""
 "Unable to load picture %s:\n"
@@ -575,7 +567,7 @@ msgstr ""
 "Ne mogu da učitam sliku „%s“:\n"
 "%s"
 
-#: ../src/frogr-file-loader.c:400
+#: src/frogr-file-loader.c:400
 #, c-format
 msgid ""
 "Unable to load video %s\n"
@@ -584,10 +576,7 @@ msgstr ""
 "Ne mogu da otpremim snimak %s\n"
 "Proverite da li ste instalirali odgovarajući kodek"
 
-#. First %s is the title of the picture (filename of the file by
-#. default). Second %s is the max allowed size for a picture to be
-#. uploaded to flickr (different for free and PRO accounts).
-#: ../src/frogr-file-loader.c:636
+#: src/frogr-file-loader.c:636
 #, c-format
 msgid ""
 "Can't load file %s:\n"
@@ -596,150 +585,135 @@ msgstr ""
 "Ne mogu da pošaljem datoteku „%s“:\n"
 "Datoteka je veća od najveće dopuštene za ovaj nalog (%s)"
 
-#. First create the left side buttons
-#: ../src/frogr-main-view.c:630 ../src/frogr-main-view.c:726
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
 msgid "Open"
 msgstr "Otvori"
 
-#: ../src/frogr-main-view.c:630 ../src/frogr-main-view.c:726
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
 msgid "Open Existing Project"
 msgstr "Otvorite postojeći projekat"
 
-#: ../src/frogr-main-view.c:631 ../src/frogr-main-view.c:729
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
 msgid "Add"
 msgstr "Dodaj"
 
-#: ../src/frogr-main-view.c:631 ../src/frogr-main-view.c:729
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
 msgid "Add Elements"
 msgstr "Dodajte elemente"
 
-#: ../src/frogr-main-view.c:632 ../src/frogr-main-view.c:730
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
 msgid "Remove"
 msgstr "Ukloni"
 
-#: ../src/frogr-main-view.c:632 ../src/frogr-main-view.c:730
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
 msgid "Remove Elements"
 msgstr "Uklonite elemente"
 
-#: ../src/frogr-main-view.c:633 ../src/frogr-main-view.c:732
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
 msgid "Upload"
 msgstr "Otpremi"
 
-#: ../src/frogr-main-view.c:633 ../src/frogr-main-view.c:732
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
 msgid "Upload All"
 msgstr "Otpremite sve"
 
-#. Save project item
-#: ../src/frogr-main-view.c:666 ../src/frogr-main-view.c:727
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
 msgid "Save"
 msgstr "Sačuvaj"
 
-#: ../src/frogr-main-view.c:666 ../src/frogr-main-view.c:727
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
 msgid "Save Current Project"
 msgstr "Sačuvajte tekući projekat"
 
-#: ../src/frogr-main-view.c:1016 ../data/gtkbuilder/frogr-app-menu.xml.h:4
+#: src/frogr-main-view.c:1016
 msgid "_About"
 msgstr "_O programu"
 
-#: ../src/frogr-main-view.c:1020 ../data/gtkbuilder/frogr-app-menu.xml.h:5
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:17
+#: src/frogr-main-view.c:1020
 msgid "_Quit"
 msgstr "_Izađi"
 
-#. Create the submenu and insert it in the right section
-#: ../src/frogr-main-view.c:1070
+#: src/frogr-main-view.c:1070
 msgid "Accounts"
 msgstr "Nalozi"
 
-#. String showind the date and time a picture was taken
-#: ../src/frogr-main-view.c:1410
+#: src/frogr-main-view.c:1410
 #, c-format
 msgid "Taken: %s"
 msgstr "Snimljena: %s"
 
-#: ../src/frogr-main-view.c:1415
+#: src/frogr-main-view.c:1415
 #, c-format
 msgid "File size: %s"
 msgstr "Veličina datoteke: %s"
 
-#: ../src/frogr-main-view.c:1540
+#: src/frogr-main-view.c:1540
 msgid "Select File"
 msgstr "Izaberite datoteku"
 
-#: ../src/frogr-main-view.c:1544 ../src/frogr-main-view.c:1671
+#: src/frogr-main-view.c:1544 src/frogr-main-view.c:1671
 msgid "_Open"
 msgstr "_Otvori"
 
-#: ../src/frogr-main-view.c:1553
+#: src/frogr-main-view.c:1553
 msgid "Frogr Project Files"
 msgstr "Datoteke Frogrovog projekta"
 
-#: ../src/frogr-main-view.c:1615
+#: src/frogr-main-view.c:1615
 msgid "Select Destination"
 msgstr "Izaberite odredište"
 
-#: ../src/frogr-main-view.c:1619 ../data/gtkbuilder/frogr-menu-bar.xml.h:3
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:1
+#: src/frogr-main-view.c:1619
 msgid "_Save"
 msgstr "_Sačuvaj"
 
-#: ../src/frogr-main-view.c:1622
+#: src/frogr-main-view.c:1622
 msgid "Untitled Project.frogr"
 msgstr "Neimenovani projekat.frogr"
 
-#: ../src/frogr-main-view.c:1667
+#: src/frogr-main-view.c:1667
 msgid "Select a Picture"
 msgstr "Izaberite sliku"
 
-#: ../src/frogr-main-view.c:1694
+#: src/frogr-main-view.c:1694
 msgid "All Files"
 msgstr "Sve datoteke"
 
-#: ../src/frogr-main-view.c:1697
+#: src/frogr-main-view.c:1697
 msgid "Image Files"
 msgstr "Datoteke slika"
 
-#: ../src/frogr-main-view.c:1701
+#: src/frogr-main-view.c:1701
 msgid "Video Files"
 msgstr "Datoteke snimaka"
 
-#: ../src/frogr-main-view.c:1723
+#: src/frogr-main-view.c:1723
 msgid "You don't have any picture added yet"
 msgstr "Još uvek niste dodali nijednu sliku"
 
-#: ../src/frogr-main-view.c:1736
+#: src/frogr-main-view.c:1736
 msgid "You need to select some pictures first"
 msgstr "Prvo morate da izaberete neke slike"
 
-#: ../src/frogr-main-view.c:2108
+#: src/frogr-main-view.c:2108
 msgid "Not connected to Flickr"
 msgstr "Niste povezani na Flikr"
 
-#. Login string, showing the user is PRO (second '%s') if so.
-#: ../src/frogr-main-view.c:2118
+#: src/frogr-main-view.c:2118
 #, c-format
 msgid "Connected as %s%s"
 msgstr "Povezani ste kao %s%s"
 
-#: ../src/frogr-main-view.c:2119
+#: src/frogr-main-view.c:2119
 msgid " (PRO account)"
 msgstr " (PRO nalog)"
 
-#. Will show in the status bar the amount of data (in KB, MB
-#. or GB) the user is currently allowed to upload to flicker
-#. till the end of the month, in a CURRENT / MAX fashion.
-#. The '-' at the beginning is just a separator, since more
-#. blocks of text will be shown in the status bar too.
-#: ../src/frogr-main-view.c:2143
+#: src/frogr-main-view.c:2143
 #, c-format
 msgid " - %s / %s remaining"
 msgstr " — preostaje vam %s od %s"
 
-#. Will show in the status bar the amount of pictures and data
-#. (in KB, MB or GB) that would be uploaded as the sum of the
-#. sizes for every picture loaded in the application
-#: ../src/frogr-main-view.c:2169
+#: src/frogr-main-view.c:2169
 #, c-format
 msgid " - %d file to upload (%s)"
 msgid_plural " - %d files to upload (%s)"
@@ -748,217 +722,166 @@ msgstr[1] " — %d datoteke za otpremanje (%s)"
 msgstr[2] " — %d datoteka za otpremanje (%s)"
 msgstr[3] " — %d datoteka za otpremanje (%s)"
 
-#: ../src/frogr-settings-dialog.c:185
+#: src/frogr-settings-dialog.c:185
 msgid "Default Visibility"
 msgstr "Osnovna vidljivost"
 
-#: ../src/frogr-settings-dialog.c:224
+#: src/frogr-settings-dialog.c:224
 msgid "Default Content Type"
 msgstr "Osnovna vrsta sadržaja"
 
-#: ../src/frogr-settings-dialog.c:250
+#: src/frogr-settings-dialog.c:250
 msgid "Default Safety Level"
 msgstr "Osnovni nivo bezbednosti"
 
-#: ../src/frogr-settings-dialog.c:276
+#: src/frogr-settings-dialog.c:276
 msgid "Default License"
 msgstr "Osnovna dozvola"
 
-#: ../src/frogr-settings-dialog.c:302
+#: src/frogr-settings-dialog.c:302
 msgid "Other Defaults"
 msgstr "Ostale osnovnosti"
 
-#: ../src/frogr-settings-dialog.c:312
+#: src/frogr-settings-dialog.c:312
 msgid "_Show Pictures in Global Search Results"
 msgstr "Prikaži _slike u rezultatima opšte pretrage"
 
-#: ../src/frogr-settings-dialog.c:315
+#: src/frogr-settings-dialog.c:315
 msgid "Set Geo_location Information for Pictures"
 msgstr "Podesi podatke _geopoložaja za sliku"
 
-#: ../src/frogr-settings-dialog.c:318
+#: src/frogr-settings-dialog.c:318
 msgid "Replace 'Date Posted' with 'Date Taken' for Pictures"
 msgstr "Zameni „datum postavljanja“ sa „datumom snimanja“ za slike"
 
-#: ../src/frogr-settings-dialog.c:324
+#: src/frogr-settings-dialog.c:324
 msgid "_General"
 msgstr "_Opšte"
 
-#: ../src/frogr-settings-dialog.c:344
+#: src/frogr-settings-dialog.c:344
 msgid "Proxy Settings"
 msgstr "Podešavanja posrednika"
 
-#. Enable proxy
-#: ../src/frogr-settings-dialog.c:353
+#: src/frogr-settings-dialog.c:353
 msgid "_Enable HTTP Proxy"
 msgstr "Uključi _HTTP posrednika"
 
-#: ../src/frogr-settings-dialog.c:363
+#: src/frogr-settings-dialog.c:363
 msgid "_Host:"
 msgstr "_Računar:"
 
-#. Proxy port
-#: ../src/frogr-settings-dialog.c:376
+#: src/frogr-settings-dialog.c:376
 msgid "_Port:"
 msgstr "_Priključak:"
 
-#. Proxy username
-#: ../src/frogr-settings-dialog.c:389
+#: src/frogr-settings-dialog.c:389
 msgid "U_sername:"
 msgstr "Korisničko _ime:"
 
-#. Proxy password
-#: ../src/frogr-settings-dialog.c:402
+#: src/frogr-settings-dialog.c:402
 msgid "Pass_word:"
 msgstr "_Lozinka:"
 
-#: ../src/frogr-settings-dialog.c:426
+#: src/frogr-settings-dialog.c:426
 msgid "Connec_tion"
 msgstr "_Veza"
 
-#: ../src/frogr-settings-dialog.c:444
+#: src/frogr-settings-dialog.c:444
 msgid "Other options"
 msgstr "Ostali izbori"
 
-#: ../src/frogr-settings-dialog.c:454
+#: src/frogr-settings-dialog.c:454
 msgid "Ena_ble Tags Auto-Completion"
 msgstr "Uključi _samodovršavanje oznaka"
 
-#: ../src/frogr-settings-dialog.c:457
+#: src/frogr-settings-dialog.c:457
 msgid "_Import Tags from Pictures Metadata"
 msgstr "Uvezi oznake iz _metapodtaka slika"
 
-#: ../src/frogr-settings-dialog.c:461
+#: src/frogr-settings-dialog.c:461
 msgid "Use _Dark GTK Theme"
 msgstr "Koristi _tamnu GTK temu"
 
-#: ../src/frogr-settings-dialog.c:465
+#: src/frogr-settings-dialog.c:465
 msgid "_Keep File Extensions in Titles when Loading"
 msgstr "_Zadrži proširenja datoteka u nazivima prilikom slanja"
 
-#: ../src/frogr-settings-dialog.c:471
+#: src/frogr-settings-dialog.c:471
 msgid "_Misc"
 msgstr "_Razno"
 
-#: ../src/frogr-settings-dialog.c:972
+#: src/frogr-settings-dialog.c:972
 msgid "Preferences"
 msgstr "Postavke"
 
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:1
-msgid "Aut_horize Account…"
-msgstr "_Ovlasti nalog…"
-
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:2
-msgid "_Preferences…"
-msgstr "_Postavke…"
-
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:3
-msgid "_Help"
-msgstr "Po_moć"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:1
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:9
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:3
-msgid "_Edit Details…"
-msgstr "Izmeni _detalje…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:2
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:10
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:4
-msgid "Add _Tags…"
-msgstr "Dodaj _oznake…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:3
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:11
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:5
-msgid "Add to _Group…"
-msgstr "Dodaj u _grupu…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:4
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:12
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:6
-msgid "Add to _Photoset"
-msgstr "Dodaj u _skup fotografija"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:5
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:13
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:7
-msgid "_Add to Existing Photoset…"
-msgstr "_Dodaj u postojeći skup fotografija…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:6
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:14
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:8
-msgid "_Create New Photoset…"
-msgstr "_Napravi novi skup fotografija…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:7
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:15
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:16
-msgid "_Open in External Viewer"
-msgstr "Otvori u _spoljnom pregledniku"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:8
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:6
-msgid "_Remove Elements"
-msgstr "_Ukloni elemente"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:1
-msgid "_File"
-msgstr "_Datoteka"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:2
-msgid "_Open…"
-msgstr "_Otvori…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:4
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:2
-msgid "Save _As…"
-msgstr "Sačuvaj _kao…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:5
-msgid "A_dd Elements…"
-msgstr "Dodaj _elemente…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:7
-msgid "_Upload All"
-msgstr "Otpremite _sve"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:16
-msgid "_View"
-msgstr "_Pregled"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:17
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:9
-msgid "_Sort Elements"
-msgstr "_Poređaj elemente"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:18
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:10
-msgid "As _Loaded"
-msgstr "Prema _učitavanju"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:19
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:11
-msgid "By _Date Taken"
-msgstr "Prema _datumu snimanja"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:20
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:12
-msgid "By _Title"
-msgstr "Prema _nazivu"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:21
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:13
-msgid "By _Size"
-msgstr "Prema _veličini"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:22
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:14
-msgid "_Reversed Order"
-msgstr "_Obrnuti redosled"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:23
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:15
-msgid "Enable _Tooltips"
-msgstr "Uključi oblačiće _alata"
+#~ msgid "Aut_horize Account…"
+#~ msgstr "_Ovlasti nalog…"
+
+#~ msgid "_Preferences…"
+#~ msgstr "_Postavke…"
+
+#~ msgid "_Help"
+#~ msgstr "Po_moć"
+
+#~ msgid "_Edit Details…"
+#~ msgstr "Izmeni _detalje…"
+
+#~ msgid "Add _Tags…"
+#~ msgstr "Dodaj _oznake…"
+
+#~ msgid "Add to _Group…"
+#~ msgstr "Dodaj u _grupu…"
+
+#~ msgid "Add to _Photoset"
+#~ msgstr "Dodaj u _skup fotografija"
+
+#~ msgid "_Add to Existing Photoset…"
+#~ msgstr "_Dodaj u postojeći skup fotografija…"
+
+#~ msgid "_Create New Photoset…"
+#~ msgstr "_Napravi novi skup fotografija…"
+
+#~ msgid "_Open in External Viewer"
+#~ msgstr "Otvori u _spoljnom pregledniku"
+
+#~ msgid "_Remove Elements"
+#~ msgstr "_Ukloni elemente"
+
+#~ msgid "_File"
+#~ msgstr "_Datoteka"
+
+#~ msgid "_Open…"
+#~ msgstr "_Otvori…"
+
+#~ msgid "Save _As…"
+#~ msgstr "Sačuvaj _kao…"
+
+#~ msgid "A_dd Elements…"
+#~ msgstr "Dodaj _elemente…"
+
+#~ msgid "_Upload All"
+#~ msgstr "Otpremite _sve"
+
+#~ msgid "_View"
+#~ msgstr "_Pregled"
+
+#~ msgid "_Sort Elements"
+#~ msgstr "_Poređaj elemente"
+
+#~ msgid "As _Loaded"
+#~ msgstr "Prema _učitavanju"
+
+#~ msgid "By _Date Taken"
+#~ msgstr "Prema _datumu snimanja"
+
+#~ msgid "By _Title"
+#~ msgstr "Prema _nazivu"
+
+#~ msgid "By _Size"
+#~ msgstr "Prema _veličini"
+
+#~ msgid "_Reversed Order"
+#~ msgstr "_Obrnuti redosled"
+
+#~ msgid "Enable _Tooltips"
+#~ msgstr "Uključi oblačiće _alata"
diff --git a/po/sv.po b/po/sv.po
index f0b41e3..b1c97af 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: frogr\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=frogr&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-02-03 12:38+0000\n"
+"Report-Msgid-Bugs-To: msanchez gnome org\n"
+"POT-Creation-Date: 2016-08-12 13:09+0100\n"
 "PO-Revision-Date: 2016-05-10 10:17+0200\n"
 "Last-Translator: Anders Jonsson <anders jonsson norsjovallen se>\n"
 "Language-Team: Swedish <tp-sv listor tp-sv se>\n"
@@ -21,7 +20,16 @@ msgstr ""
 "X-Project-Style: gnome\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: ../data/frogr.appdata.xml.in.h:1
+#: data/frogr.appdata.xml.in:5 data/frogr.desktop.in.in:5
+#: data/frogr.desktop.in.in:14
+msgid "frogr"
+msgstr "frogr"
+
+#: data/frogr.appdata.xml.in:6 data/frogr.desktop.in.in:6
+msgid "frogr: a Flickr Remote Organizer for GNOME"
+msgstr "frogr: en Flickr-fjärrhanterare för GNOME"
+
+#: data/frogr.appdata.xml.in:8
 msgid ""
 "frogr is a small application for the GNOME desktop that allows users to "
 "manage their accounts in the Flickr image hosting website."
@@ -29,7 +37,7 @@ msgstr ""
 "frogr är ett litet program för GNOME-skrivbordet som gör möjligt för "
 "användare att hantera deras konton på bildhanterarwebbplatsen Flickr."
 
-#: ../data/frogr.appdata.xml.in.h:2
+#: data/frogr.appdata.xml.in:13
 msgid ""
 "It supports all the basic Flickr features, including uploading pictures, "
 "adding descriptions, setting tags and managing sets and groups pools."
@@ -37,79 +45,74 @@ msgstr ""
 "Det stöder alla grundläggande Flickr-funktioner som att skicka upp bilder, "
 "lägga till beskrivningar, ange taggar samt att hantera samlingar och grupper."
 
-#: ../data/frogr.appdata.xml.in.h:3
+#: data/frogr.appdata.xml.in:24
 msgid "Screenshot of frogr"
 msgstr "Skärmbild av frogr"
 
-#: ../data/frogr.desktop.in.in.h:1
-msgid "frogr"
-msgstr "frogr"
-
-#: ../data/frogr.desktop.in.in.h:2
-msgid "frogr: a Flickr Remote Organizer for GNOME"
-msgstr "frogr: en Flickr-fjärrhanterare för GNOME"
+#: data/frogr.appdata.xml.in:29
+msgid "Mario Sanchez Prada"
+msgstr ""
 
-#: ../data/frogr.desktop.in.in.h:3
+#: data/frogr.desktop.in.in:7
 msgid "Upload and organize photos in Flickr accounts"
 msgstr "Skicka upp och hantera foton i Flickr-konton"
 
-#: ../data/frogr.desktop.in.in.h:4
+#: data/frogr.desktop.in.in:8
 msgid "Flickr;Image;Picture;Photo;Video;Uploader;"
 msgstr "Flickr;Bild;Foto;Video;Skicka upp;"
 
-#: ../src/frogr-about-dialog.c:43
+#: src/frogr-about-dialog.c:43
 msgid "A Flickr Remote Organizer for GNOME\n"
 msgstr "En Flickr-fjärrhanterare för GNOME\n"
 
-#: ../src/frogr-about-dialog.c:72
+#: src/frogr-about-dialog.c:72
 msgid "translator-credits"
 msgstr ""
 "Daniel Nylander <po danielnylander se>\n"
 "Josef Andersson <josef andersson fripost org>"
 
-#: ../src/frogr-add-tags-dialog.c:191 ../src/frogr-add-to-group-dialog.c:528
-#: ../src/frogr-add-to-set-dialog.c:529 ../src/frogr-auth-dialog.c:153
-#: ../src/frogr-create-new-set-dialog.c:310 ../src/frogr-details-dialog.c:1168
-#: ../src/frogr-main-view.c:1543 ../src/frogr-main-view.c:1618
-#: ../src/frogr-main-view.c:1670 ../src/frogr-settings-dialog.c:930
+#: src/frogr-add-tags-dialog.c:191 src/frogr-add-to-group-dialog.c:528
+#: src/frogr-add-to-set-dialog.c:529 src/frogr-auth-dialog.c:153
+#: src/frogr-create-new-set-dialog.c:310 src/frogr-details-dialog.c:1168
+#: src/frogr-main-view.c:1543 src/frogr-main-view.c:1618
+#: src/frogr-main-view.c:1670 src/frogr-settings-dialog.c:930
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: ../src/frogr-add-tags-dialog.c:193 ../src/frogr-add-to-group-dialog.c:530
-#: ../src/frogr-add-to-set-dialog.c:531
-#: ../src/frogr-create-new-set-dialog.c:312
+#: src/frogr-add-tags-dialog.c:193 src/frogr-add-to-group-dialog.c:530
+#: src/frogr-add-to-set-dialog.c:531 src/frogr-create-new-set-dialog.c:312
 msgid "_Add"
 msgstr "_Lägg till"
 
-#: ../src/frogr-add-tags-dialog.c:202
+#: src/frogr-add-tags-dialog.c:202
 msgid "Enter a spaces separated list of tags:"
 msgstr "Ange en mellanslagsseparerad tagglista:"
 
-#: ../src/frogr-add-tags-dialog.c:228
+#: src/frogr-add-tags-dialog.c:228
 msgid "Add Tags"
 msgstr "Lägg till taggar"
 
-#: ../src/frogr-add-to-group-dialog.c:147
+#: src/frogr-add-to-group-dialog.c:147
 msgid "Name"
 msgstr "Namn"
 
-#: ../src/frogr-add-to-group-dialog.c:162 ../src/frogr-add-to-set-dialog.c:163
+#: src/frogr-add-to-group-dialog.c:162 src/frogr-add-to-set-dialog.c:163
 msgid "Elements"
 msgstr "Objekt"
 
-#: ../src/frogr-add-to-group-dialog.c:581
+#: src/frogr-add-to-group-dialog.c:581
 msgid "Add to Groups"
 msgstr "Lägg till i grupper"
 
-#: ../src/frogr-add-to-set-dialog.c:148
+#: src/frogr-add-to-set-dialog.c:148
 msgid "Title"
 msgstr "Titel"
 
-#: ../src/frogr-add-to-set-dialog.c:582
+#: src/frogr-add-to-set-dialog.c:582
 msgid "Add to Sets"
 msgstr "Lägg till i samlingar"
 
-#: ../src/frogr-auth-dialog.c:59
+#: src/frogr-auth-dialog.c:59
 #, c-format
 msgid ""
 "Please press the button to authorize %s and then come back to complete the "
@@ -118,30 +121,29 @@ msgstr ""
 "Tryck på knappen för att auktorisera %s och gå sedan tillbaka för att "
 "färdigställa processen."
 
-#: ../src/frogr-auth-dialog.c:63 ../src/frogr-auth-dialog.c:149
-#: ../src/frogr-controller.c:2286
+#: src/frogr-auth-dialog.c:63 src/frogr-auth-dialog.c:149
+#: src/frogr-controller.c:2286
 #, c-format
 msgid "Authorize %s"
 msgstr "Auktorisera %s"
 
-#: ../src/frogr-auth-dialog.c:155 ../src/frogr-settings-dialog.c:932
+#: src/frogr-auth-dialog.c:155 src/frogr-settings-dialog.c:932
 msgid "_Close"
 msgstr "_Stäng"
 
-#. Description label
-#: ../src/frogr-auth-dialog.c:167
+#: src/frogr-auth-dialog.c:167
 msgid "Enter verification code:"
 msgstr "Ange verifikationskod:"
 
-#: ../src/frogr-auth-dialog.c:221
+#: src/frogr-auth-dialog.c:221
 msgid "Invalid verification code"
 msgstr "Ogiltig verifikationskod"
 
-#: ../src/frogr-controller.c:581
+#: src/frogr-controller.c:581
 msgid "Process cancelled"
 msgstr "Processen avbruten"
 
-#: ../src/frogr-controller.c:586
+#: src/frogr-controller.c:586
 msgid ""
 "Connection error:\n"
 "Network not available"
@@ -149,7 +151,7 @@ msgstr ""
 "Anslutningsfel:\n"
 "Nätverket ej tillgängligt"
 
-#: ../src/frogr-controller.c:590
+#: src/frogr-controller.c:590
 msgid ""
 "Connection error:\n"
 "Bad request"
@@ -157,7 +159,7 @@ msgstr ""
 "Anslutningsfel:\n"
 "Dålig begäran"
 
-#: ../src/frogr-controller.c:594
+#: src/frogr-controller.c:594
 msgid ""
 "Connection error:\n"
 "Server-side error"
@@ -165,7 +167,7 @@ msgstr ""
 "Anslutningsfel:\n"
 "Serverfel"
 
-#: ../src/frogr-controller.c:598
+#: src/frogr-controller.c:598
 msgid ""
 "Error uploading:\n"
 "File invalid"
@@ -173,7 +175,7 @@ msgstr ""
 "Fel vid sändning:\n"
 "Ogiltig fil"
 
-#: ../src/frogr-controller.c:602
+#: src/frogr-controller.c:602
 msgid ""
 "Error uploading picture:\n"
 "Quota exceeded"
@@ -181,14 +183,14 @@ msgstr ""
 "Fel vid sändning av bild:\n"
 "Gräns överstigen"
 
-#: ../src/frogr-controller.c:607
+#: src/frogr-controller.c:607
 #, c-format
 msgid "Quota exceeded (limit: %d video per month)"
 msgid_plural "Quota exceeded (limit: %d videos per month)"
 msgstr[0] "Gräns överstigen (gräns: %d video per månad)"
 msgstr[1] "Gräns överstigen (gräns: %d videor per månad)"
 
-#: ../src/frogr-controller.c:611
+#: src/frogr-controller.c:611
 msgid ""
 "Error uploading video:\n"
 "You can't upload more videos with this account"
@@ -196,7 +198,7 @@ msgstr ""
 "Fel då video skickades upp:\n"
 "Du kan inte skicka upp mer videor med detta konto"
 
-#: ../src/frogr-controller.c:617
+#: src/frogr-controller.c:617
 msgid ""
 "Error:\n"
 "Photo not found"
@@ -204,7 +206,7 @@ msgstr ""
 "Fel:\n"
 "Hittade inte foto"
 
-#: ../src/frogr-controller.c:621
+#: src/frogr-controller.c:621
 msgid ""
 "Error:\n"
 "Photo already in photoset"
@@ -212,7 +214,7 @@ msgstr ""
 "Fel:\n"
 "Foto finns redan i fotosamlingen"
 
-#: ../src/frogr-controller.c:625
+#: src/frogr-controller.c:625
 msgid ""
 "Error:\n"
 "Photo already in group"
@@ -220,7 +222,7 @@ msgstr ""
 "Fel:\n"
 "Foto finns redan i gruppen"
 
-#: ../src/frogr-controller.c:629
+#: src/frogr-controller.c:629
 msgid ""
 "Error:\n"
 "Photo already in the maximum number of groups possible"
@@ -228,7 +230,7 @@ msgstr ""
 "Fel:\n"
 "Fotot finns redan i högsta antalet möjliga grupper"
 
-#: ../src/frogr-controller.c:633
+#: src/frogr-controller.c:633
 msgid ""
 "Error:\n"
 "Group limit already reached"
@@ -236,7 +238,7 @@ msgstr ""
 "Fel:\n"
 "Gruppgränsen redan nådd"
 
-#: ../src/frogr-controller.c:637
+#: src/frogr-controller.c:637
 msgid ""
 "Error:\n"
 "Photo added to group's queue"
@@ -244,7 +246,7 @@ msgstr ""
 "Fel:\n"
 "Fotot redan tillagt i gruppens kö"
 
-#: ../src/frogr-controller.c:641
+#: src/frogr-controller.c:641
 msgid ""
 "Error:\n"
 "Photo already added to group's queue"
@@ -252,7 +254,7 @@ msgstr ""
 "Fel:\n"
 "Fotot redan tillagt till gruppens kö"
 
-#: ../src/frogr-controller.c:645
+#: src/frogr-controller.c:645
 msgid ""
 "Error:\n"
 "Content not allowed for this group"
@@ -260,8 +262,7 @@ msgstr ""
 "Fel\n"
 "Innehåll inte tillåtet för denna grupp"
 
-#: ../src/frogr-controller.c:649
-#, c-format
+#: src/frogr-controller.c:649
 msgid ""
 "Authorization failed.\n"
 "Please try again"
@@ -269,7 +270,7 @@ msgstr ""
 "Behörighetskontroll misslyckades.\n"
 "Prova igen"
 
-#: ../src/frogr-controller.c:655
+#: src/frogr-controller.c:655
 #, c-format
 msgid ""
 "Error\n"
@@ -280,8 +281,7 @@ msgstr ""
 "%s har inte rätt behörighet för att skicka upp filer till Flickr.\n"
 "Ompröva behörighet"
 
-#: ../src/frogr-controller.c:660
-#, c-format
+#: src/frogr-controller.c:660
 msgid ""
 "Unable to authenticate in Flickr\n"
 "Please try again."
@@ -289,7 +289,7 @@ msgstr ""
 "Kunde inte autentisera i Flickr\n"
 "Prova igen."
 
-#: ../src/frogr-controller.c:664
+#: src/frogr-controller.c:664
 #, c-format
 msgid ""
 "You have not properly authorized %s yet.\n"
@@ -298,8 +298,7 @@ msgstr ""
 "Du har inte autentiserat %s korrekt än.\n"
 "Prova igen."
 
-#: ../src/frogr-controller.c:669
-#, c-format
+#: src/frogr-controller.c:669
 msgid ""
 "Invalid verification code.\n"
 "Please try again."
@@ -307,8 +306,7 @@ msgstr ""
 "Ogiltig verifikationskod.\n"
 "Prova igen."
 
-#: ../src/frogr-controller.c:673
-#, c-format
+#: src/frogr-controller.c:673
 msgid ""
 "Error:\n"
 "Service not available"
@@ -316,64 +314,62 @@ msgstr ""
 "Fel:\n"
 "Tjänsten är inte tillgänglig"
 
-#. General error: just dump the raw error description
-#: ../src/frogr-controller.c:678
+#: src/frogr-controller.c:678
 #, c-format
 msgid "An error happened: %s."
 msgstr "Ett fel inträffade: %s."
 
-#: ../src/frogr-controller.c:883
+#: src/frogr-controller.c:883
 msgid "Authorization failed (timed out)"
 msgstr "Behörighet misslyckades (tidsgränsen överskreds)"
 
-#: ../src/frogr-controller.c:931
+#: src/frogr-controller.c:931
 #, c-format
 msgid "Retrying Upload (attempt %d/%d)…"
 msgstr "Försöker skicka upp igen (försök %d/%d)…"
 
-#: ../src/frogr-controller.c:936
+#: src/frogr-controller.c:936
 #, c-format
 msgid "Uploading '%s'…"
 msgstr "Skickar upp \"%s\"…"
 
-#: ../src/frogr-controller.c:2242
+#: src/frogr-controller.c:2242
 msgid "Updating credentials…"
 msgstr "Uppdaterar autentiseringsuppgifter…"
 
-#: ../src/frogr-controller.c:2247
+#: src/frogr-controller.c:2247
 msgid "Retrieving data for authorization…"
 msgstr "Hämtar data för behörighet…"
 
-#: ../src/frogr-controller.c:2252
+#: src/frogr-controller.c:2252
 msgid "Finishing authorization…"
 msgstr "Färdigställer behörighet…"
 
-#: ../src/frogr-controller.c:2257
+#: src/frogr-controller.c:2257
 msgid "Retrieving list of sets…"
 msgstr "Hämtar lista över samlingar…"
 
-#: ../src/frogr-controller.c:2262
+#: src/frogr-controller.c:2262
 msgid "Retrieving list of groups…"
 msgstr "Hämtar lista över grupper…"
 
-#: ../src/frogr-controller.c:2267
+#: src/frogr-controller.c:2267
 msgid "Retrieving list of tags…"
 msgstr "Hämtar lista över taggar…"
 
-#: ../src/frogr-controller.c:2292
-#, c-format
+#: src/frogr-controller.c:2292
 msgid "Fetching information"
 msgstr "Hämtar information"
 
-#: ../src/frogr-controller.c:2398
+#: src/frogr-controller.c:2398
 msgid "No sets found"
 msgstr "Inga samlingar hittades"
 
-#: ../src/frogr-controller.c:2423
+#: src/frogr-controller.c:2423
 msgid "No groups found"
 msgstr "Inga grupper hittades"
 
-#: ../src/frogr-controller.c:2984
+#: src/frogr-controller.c:2984
 #, c-format
 msgid ""
 "You need to properly authorize %s before uploading any pictures to Flickr.\n"
@@ -383,188 +379,184 @@ msgstr ""
 "Flickr:\n"
 "Ge behörighet."
 
-#: ../src/frogr-controller.c:2994
-#, c-format
+#: src/frogr-controller.c:2994
 msgid "You need to be connected before uploading any pictures to Flickr."
 msgstr ""
 "Du måste vara ansluten innan du kan skicka upp några bilder till Flickr."
 
-#: ../src/frogr-controller.c:3012
+#: src/frogr-controller.c:3012
 msgid "Uploading Pictures"
 msgstr "Skickar upp bilder"
 
-#: ../src/frogr-controller.c:3057
-#, c-format
+#: src/frogr-controller.c:3057
 msgid "Error opening project file"
 msgstr "Fel vid öppnandet av fil"
 
-#. This shows a dialog notifying the problem to the user
-#: ../src/frogr-create-new-set-dialog.c:143 ../src/frogr-details-dialog.c:1001
+#: src/frogr-create-new-set-dialog.c:143 src/frogr-details-dialog.c:1001
 msgid "Missing data required"
 msgstr "Kräver saknad data"
 
-#: ../src/frogr-create-new-set-dialog.c:326
+#: src/frogr-create-new-set-dialog.c:326
 msgid "Title:"
 msgstr "Titel:"
 
-#: ../src/frogr-create-new-set-dialog.c:335
+#: src/frogr-create-new-set-dialog.c:335
 msgid "Description:"
 msgstr "Beskrivning:"
 
-#: ../src/frogr-create-new-set-dialog.c:356
+#: src/frogr-create-new-set-dialog.c:356
 msgid "Fill Pictures Details with Title and Description"
 msgstr "Fyll i bilddetaljer med titel och beskrivning"
 
-#: ../src/frogr-create-new-set-dialog.c:381
+#: src/frogr-create-new-set-dialog.c:381
 msgid "Create New Set"
 msgstr "Skapa ny samling"
 
-#: ../src/frogr-details-dialog.c:89 ../src/frogr-settings-dialog.c:97
+#: src/frogr-details-dialog.c:89 src/frogr-settings-dialog.c:97
 msgid "Default (as specified in Flickr)"
 msgstr "Standard (som specificerat i Flickr)"
 
-#: ../src/frogr-details-dialog.c:90 ../src/frogr-settings-dialog.c:98
+#: src/frogr-details-dialog.c:90 src/frogr-settings-dialog.c:98
 msgid "All rights reserved"
 msgstr "Alla rättigheter förbehållna"
 
-#: ../src/frogr-details-dialog.c:91 ../src/frogr-settings-dialog.c:99
+#: src/frogr-details-dialog.c:91 src/frogr-settings-dialog.c:99
 msgid "CC Attribution-NonCommercial-ShareAlike"
 msgstr "CC Attribution-NonCommercial-ShareAlike"
 
-#: ../src/frogr-details-dialog.c:92 ../src/frogr-settings-dialog.c:100
+#: src/frogr-details-dialog.c:92 src/frogr-settings-dialog.c:100
 msgid "CC Attribution-NonCommercial"
 msgstr "CC Attribution-NonCommercial"
 
-#: ../src/frogr-details-dialog.c:93 ../src/frogr-settings-dialog.c:101
+#: src/frogr-details-dialog.c:93 src/frogr-settings-dialog.c:101
 msgid "CC Attribution-NonCommercial-NoDerivs"
 msgstr "CC Attribution-NonCommercial-NoDerivs"
 
-#: ../src/frogr-details-dialog.c:94 ../src/frogr-settings-dialog.c:102
+#: src/frogr-details-dialog.c:94 src/frogr-settings-dialog.c:102
 msgid "CC Attribution"
 msgstr "CC Attribution"
 
-#: ../src/frogr-details-dialog.c:95 ../src/frogr-settings-dialog.c:103
+#: src/frogr-details-dialog.c:95 src/frogr-settings-dialog.c:103
 msgid "CC Attribution-ShareAlike"
 msgstr "CC Attribution-ShareAlike"
 
-#: ../src/frogr-details-dialog.c:96 ../src/frogr-settings-dialog.c:104
+#: src/frogr-details-dialog.c:96 src/frogr-settings-dialog.c:104
 msgid "CC Attribution-NoDerivs"
 msgstr "CC Attribution-NoDerivs"
 
-#: ../src/frogr-details-dialog.c:172
+#: src/frogr-details-dialog.c:172
 msgid "Open with image viewer"
 msgstr "Öppna med bildvisare"
 
-#: ../src/frogr-details-dialog.c:190
+#: src/frogr-details-dialog.c:190
 msgid "_Title:"
 msgstr "_Titel:"
 
-#: ../src/frogr-details-dialog.c:200
+#: src/frogr-details-dialog.c:200
 msgid "_Description:"
 msgstr "_Beskrivning:"
 
-#: ../src/frogr-details-dialog.c:224
+#: src/frogr-details-dialog.c:224
 msgid "Ta_gs:"
 msgstr "Ta_ggar:"
 
-#: ../src/frogr-details-dialog.c:247
+#: src/frogr-details-dialog.c:247
 msgid "Visibility"
 msgstr "Synlighet"
 
-#: ../src/frogr-details-dialog.c:257 ../src/frogr-settings-dialog.c:196
+#: src/frogr-details-dialog.c:257 src/frogr-settings-dialog.c:196
 msgid "_Private"
 msgstr "_Privat"
 
-#: ../src/frogr-details-dialog.c:261 ../src/frogr-settings-dialog.c:199
+#: src/frogr-details-dialog.c:261 src/frogr-settings-dialog.c:199
 msgid "P_ublic"
 msgstr "O_ffentlig"
 
-#: ../src/frogr-details-dialog.c:270 ../src/frogr-settings-dialog.c:207
+#: src/frogr-details-dialog.c:270 src/frogr-settings-dialog.c:207
 msgid "_Family"
 msgstr "_Familj"
 
-#: ../src/frogr-details-dialog.c:274 ../src/frogr-settings-dialog.c:209
+#: src/frogr-details-dialog.c:274 src/frogr-settings-dialog.c:209
 msgid "F_riends"
 msgstr "V_änner"
 
-#: ../src/frogr-details-dialog.c:288
+#: src/frogr-details-dialog.c:288
 msgid "Content Type"
 msgstr "Innehållstyp"
 
-#: ../src/frogr-details-dialog.c:296 ../src/frogr-settings-dialog.c:234
+#: src/frogr-details-dialog.c:296 src/frogr-settings-dialog.c:234
 msgid "P_hoto"
 msgstr "F_oto"
 
-#: ../src/frogr-details-dialog.c:300 ../src/frogr-settings-dialog.c:236
+#: src/frogr-details-dialog.c:300 src/frogr-settings-dialog.c:236
 msgid "Scree_nshot"
 msgstr "Skär_mbild"
 
-#: ../src/frogr-details-dialog.c:304 ../src/frogr-settings-dialog.c:238
+#: src/frogr-details-dialog.c:304 src/frogr-settings-dialog.c:238
 msgid "Oth_er"
 msgstr "And_ra"
 
-#: ../src/frogr-details-dialog.c:317
+#: src/frogr-details-dialog.c:317
 msgid "Safety Level"
 msgstr "Säkerhetsnivå"
 
-#: ../src/frogr-details-dialog.c:325 ../src/frogr-settings-dialog.c:260
+#: src/frogr-details-dialog.c:325 src/frogr-settings-dialog.c:260
 msgid "S_afe"
 msgstr "S_äker"
 
-#: ../src/frogr-details-dialog.c:329 ../src/frogr-settings-dialog.c:262
+#: src/frogr-details-dialog.c:329 src/frogr-settings-dialog.c:262
 msgid "_Moderate"
 msgstr "_Måttlig"
 
-#: ../src/frogr-details-dialog.c:333 ../src/frogr-settings-dialog.c:264
+#: src/frogr-details-dialog.c:333 src/frogr-settings-dialog.c:264
 msgid "Restr_icted"
 msgstr "Begrän_sad"
 
-#: ../src/frogr-details-dialog.c:345
+#: src/frogr-details-dialog.c:345
 msgid "License Type"
 msgstr "Licenstyp"
 
-#: ../src/frogr-details-dialog.c:367
+#: src/frogr-details-dialog.c:367
 msgid "Other Properties"
 msgstr "Andra egenskaper"
 
-#: ../src/frogr-details-dialog.c:375
+#: src/frogr-details-dialog.c:375
 msgid "_Show Up in Global Search Results"
 msgstr "_Visa i globala sökresultat"
 
-#: ../src/frogr-details-dialog.c:379
+#: src/frogr-details-dialog.c:379
 msgid "Set Geo_location Information"
 msgstr "Visa pla_tsinformation"
 
-#: ../src/frogr-details-dialog.c:383
+#: src/frogr-details-dialog.c:383
 msgid "Replace 'Date Posted' with 'Date Taken'"
 msgstr "Ersätt ”Datum postat” med ”Datum taget”"
 
-#. Visually indicate how many pictures are being edited
-#: ../src/frogr-details-dialog.c:475
+#: src/frogr-details-dialog.c:475
 #, c-format
 msgid "(%d Picture)"
 msgid_plural "(%d Pictures)"
 msgstr[0] "(%d bild)"
 msgstr[1] "(%d bilder)"
 
-#: ../src/frogr-details-dialog.c:548
+#: src/frogr-details-dialog.c:548
 msgid "An error happened trying to load the picture"
 msgstr "Ett fel inträffade då bilden försökte läsas in"
 
-#: ../src/frogr-details-dialog.c:1169 ../data/gtkbuilder/frogr-menu-bar.xml.h:8
+#: src/frogr-details-dialog.c:1169
 msgid "_Edit"
 msgstr "_Redigera"
 
-#: ../src/frogr-details-dialog.c:1197
+#: src/frogr-details-dialog.c:1197
 msgid "Edit Picture Details"
 msgstr "Redigera bilddetaljer"
 
-#: ../src/frogr-file-loader.c:142
+#: src/frogr-file-loader.c:142
 #, c-format
 msgid "Loading files %d / %d"
 msgstr "Läser in fil %d / %d"
 
-#: ../src/frogr-file-loader.c:369
+#: src/frogr-file-loader.c:369
 #, c-format
 msgid ""
 "Unable to load picture %s:\n"
@@ -573,7 +565,7 @@ msgstr ""
 "Kan inte läsa bild %s:\n"
 "%s"
 
-#: ../src/frogr-file-loader.c:400
+#: src/frogr-file-loader.c:400
 #, c-format
 msgid ""
 "Unable to load video %s\n"
@@ -582,10 +574,7 @@ msgstr ""
 "Kunde inte läsa in video %s\n"
 "Kontrollera att du har rätt kodek installerad"
 
-#. First %s is the title of the picture (filename of the file by
-#. default). Second %s is the max allowed size for a picture to be
-#. uploaded to flickr (different for free and PRO accounts).
-#: ../src/frogr-file-loader.c:636
+#: src/frogr-file-loader.c:636
 #, c-format
 msgid ""
 "Can't load file %s:\n"
@@ -594,370 +583,304 @@ msgstr ""
 "Kan inte läsa in fil %s\n"
 "Filens storlek är större än största storleken tillåten för detta konto (%s)"
 
-#. First create the left side buttons
-#: ../src/frogr-main-view.c:630 ../src/frogr-main-view.c:726
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
 msgid "Open"
 msgstr "Öppna"
 
-#: ../src/frogr-main-view.c:630 ../src/frogr-main-view.c:726
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
 msgid "Open Existing Project"
 msgstr "Öppna befintligt projekt"
 
-#: ../src/frogr-main-view.c:631 ../src/frogr-main-view.c:729
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
 msgid "Add"
 msgstr "Lägg till"
 
-#: ../src/frogr-main-view.c:631 ../src/frogr-main-view.c:729
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
 msgid "Add Elements"
 msgstr "Lägg till objekt"
 
-#: ../src/frogr-main-view.c:632 ../src/frogr-main-view.c:730
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
 msgid "Remove"
 msgstr "Ta bort"
 
-#: ../src/frogr-main-view.c:632 ../src/frogr-main-view.c:730
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
 msgid "Remove Elements"
 msgstr "Ta bort objekt"
 
-#: ../src/frogr-main-view.c:633 ../src/frogr-main-view.c:732
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
 msgid "Upload"
 msgstr "Skicka upp"
 
-#: ../src/frogr-main-view.c:633 ../src/frogr-main-view.c:732
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
 msgid "Upload All"
 msgstr "Skicka upp alla"
 
-#. Save project item
-#: ../src/frogr-main-view.c:666 ../src/frogr-main-view.c:727
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
 msgid "Save"
 msgstr "Spara"
 
-#: ../src/frogr-main-view.c:666 ../src/frogr-main-view.c:727
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
 msgid "Save Current Project"
 msgstr "Spara aktuellt projekt"
 
-#: ../src/frogr-main-view.c:1016 ../data/gtkbuilder/frogr-app-menu.xml.h:4
+#: src/frogr-main-view.c:1016
 msgid "_About"
 msgstr "_Om"
 
-#: ../src/frogr-main-view.c:1020 ../data/gtkbuilder/frogr-app-menu.xml.h:5
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:17
+#: src/frogr-main-view.c:1020
 msgid "_Quit"
 msgstr "A_vsluta"
 
-#. Create the submenu and insert it in the right section
-#: ../src/frogr-main-view.c:1070
+#: src/frogr-main-view.c:1070
 msgid "Accounts"
 msgstr "Konton"
 
-#. String showind the date and time a picture was taken
-#: ../src/frogr-main-view.c:1410
+#: src/frogr-main-view.c:1410
 #, c-format
 msgid "Taken: %s"
 msgstr "Taget: %s"
 
-#: ../src/frogr-main-view.c:1415
+#: src/frogr-main-view.c:1415
 #, c-format
 msgid "File size: %s"
 msgstr "Filstorlek: %s"
 
-#: ../src/frogr-main-view.c:1540
+#: src/frogr-main-view.c:1540
 msgid "Select File"
 msgstr "Välj fil"
 
-#: ../src/frogr-main-view.c:1544 ../src/frogr-main-view.c:1671
+#: src/frogr-main-view.c:1544 src/frogr-main-view.c:1671
 msgid "_Open"
 msgstr "_Öppna"
 
-#: ../src/frogr-main-view.c:1553
+#: src/frogr-main-view.c:1553
 msgid "Frogr Project Files"
 msgstr "Frogr-projektfiler"
 
-#: ../src/frogr-main-view.c:1615
+#: src/frogr-main-view.c:1615
 msgid "Select Destination"
 msgstr "Välj målplats"
 
-#: ../src/frogr-main-view.c:1619 ../data/gtkbuilder/frogr-menu-bar.xml.h:3
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:1
+#: src/frogr-main-view.c:1619
 msgid "_Save"
 msgstr "_Spara"
 
-#: ../src/frogr-main-view.c:1622
+#: src/frogr-main-view.c:1622
 msgid "Untitled Project.frogr"
 msgstr "Namnlöst projekt.frogr"
 
-#: ../src/frogr-main-view.c:1667
+#: src/frogr-main-view.c:1667
 msgid "Select a Picture"
 msgstr "Välj en bild"
 
-#: ../src/frogr-main-view.c:1694
+#: src/frogr-main-view.c:1694
 msgid "All Files"
 msgstr "Alla filer"
 
-#: ../src/frogr-main-view.c:1697
+#: src/frogr-main-view.c:1697
 msgid "Image Files"
 msgstr "Bildfiler"
 
-#: ../src/frogr-main-view.c:1701
+#: src/frogr-main-view.c:1701
 msgid "Video Files"
 msgstr "Videofiler"
 
-#: ../src/frogr-main-view.c:1723
+#: src/frogr-main-view.c:1723
 msgid "You don't have any picture added yet"
 msgstr "Du har inte lagt till bilder än"
 
-#: ../src/frogr-main-view.c:1736
+#: src/frogr-main-view.c:1736
 msgid "You need to select some pictures first"
 msgstr "Du måste välja några bilder först"
 
-#: ../src/frogr-main-view.c:2108
+#: src/frogr-main-view.c:2108
 msgid "Not connected to Flickr"
 msgstr "Inte ansluten till Flickr"
 
-#. Login string, showing the user is PRO (second '%s') if so.
-#: ../src/frogr-main-view.c:2118
+#: src/frogr-main-view.c:2118
 #, c-format
 msgid "Connected as %s%s"
 msgstr "Ansluten som %s%s"
 
-#: ../src/frogr-main-view.c:2119
+#: src/frogr-main-view.c:2119
 msgid " (PRO account)"
 msgstr " (PRO-konto)"
 
-#. Will show in the status bar the amount of data (in KB, MB
-#. or GB) the user is currently allowed to upload to flicker
-#. till the end of the month, in a CURRENT / MAX fashion.
-#. The '-' at the beginning is just a separator, since more
-#. blocks of text will be shown in the status bar too.
-#: ../src/frogr-main-view.c:2143
+#: src/frogr-main-view.c:2143
 #, c-format
 msgid " - %s / %s remaining"
 msgstr " - %s / %s återstående"
 
-#. Will show in the status bar the amount of pictures and data
-#. (in KB, MB or GB) that would be uploaded as the sum of the
-#. sizes for every picture loaded in the application
-#: ../src/frogr-main-view.c:2169
+#: src/frogr-main-view.c:2169
 #, c-format
 msgid " - %d file to upload (%s)"
 msgid_plural " - %d files to upload (%s)"
 msgstr[0] " - %d fil att skicka upp (%s)"
 msgstr[1] " - %d filer att skicka upp (%s)"
 
-#: ../src/frogr-settings-dialog.c:185
+#: src/frogr-settings-dialog.c:185
 msgid "Default Visibility"
 msgstr "Standardsynlighet"
 
-#: ../src/frogr-settings-dialog.c:224
+#: src/frogr-settings-dialog.c:224
 msgid "Default Content Type"
 msgstr "Standardinnehållstyp"
 
-#: ../src/frogr-settings-dialog.c:250
+#: src/frogr-settings-dialog.c:250
 msgid "Default Safety Level"
 msgstr "Standardsäkerhetsnivå"
 
-#: ../src/frogr-settings-dialog.c:276
+#: src/frogr-settings-dialog.c:276
 msgid "Default License"
 msgstr "Standardlicens"
 
-#: ../src/frogr-settings-dialog.c:302
+#: src/frogr-settings-dialog.c:302
 msgid "Other Defaults"
 msgstr "Andra standardvärden"
 
-#: ../src/frogr-settings-dialog.c:312
+#: src/frogr-settings-dialog.c:312
 msgid "_Show Pictures in Global Search Results"
 msgstr "_Visa bilder i globala sökresultat"
 
-#: ../src/frogr-settings-dialog.c:315
+#: src/frogr-settings-dialog.c:315
 msgid "Set Geo_location Information for Pictures"
 msgstr "Ange _platsinformation för bilder"
 
-#: ../src/frogr-settings-dialog.c:318
+#: src/frogr-settings-dialog.c:318
 msgid "Replace 'Date Posted' with 'Date Taken' for Pictures"
 msgstr "Ersätt ”Datum postat” med ”Datum taget” för bilder"
 
-#: ../src/frogr-settings-dialog.c:324
+#: src/frogr-settings-dialog.c:324
 msgid "_General"
 msgstr "_Allmänt"
 
-#: ../src/frogr-settings-dialog.c:344
+#: src/frogr-settings-dialog.c:344
 msgid "Proxy Settings"
 msgstr "Proxyinställningar"
 
-#. Enable proxy
-#: ../src/frogr-settings-dialog.c:353
+#: src/frogr-settings-dialog.c:353
 msgid "_Enable HTTP Proxy"
 msgstr "A_ktivera HTTP-proxyserver"
 
-#: ../src/frogr-settings-dialog.c:363
+#: src/frogr-settings-dialog.c:363
 msgid "_Host:"
 msgstr "_Värd:"
 
-#. Proxy port
-#: ../src/frogr-settings-dialog.c:376
+#: src/frogr-settings-dialog.c:376
 msgid "_Port:"
 msgstr "_Port:"
 
-#. Proxy username
-#: ../src/frogr-settings-dialog.c:389
+#: src/frogr-settings-dialog.c:389
 msgid "U_sername:"
 msgstr "An_vändarnamn:"
 
-#. Proxy password
-#: ../src/frogr-settings-dialog.c:402
+#: src/frogr-settings-dialog.c:402
 msgid "Pass_word:"
 msgstr "Lös_enord:"
 
-#: ../src/frogr-settings-dialog.c:426
+#: src/frogr-settings-dialog.c:426
 msgid "Connec_tion"
 msgstr "Anslu_tning"
 
-#: ../src/frogr-settings-dialog.c:444
+#: src/frogr-settings-dialog.c:444
 msgid "Other options"
 msgstr "Andra alternativ"
 
-#: ../src/frogr-settings-dialog.c:454
+#: src/frogr-settings-dialog.c:454
 msgid "Ena_ble Tags Auto-Completion"
 msgstr "Akti_vera autokomplettering för taggar"
 
-#: ../src/frogr-settings-dialog.c:457
+#: src/frogr-settings-dialog.c:457
 msgid "_Import Tags from Pictures Metadata"
 msgstr "_Importera taggar från bildmetadata"
 
-#: ../src/frogr-settings-dialog.c:461
+#: src/frogr-settings-dialog.c:461
 msgid "Use _Dark GTK Theme"
 msgstr "Använd GTK-temat _mörk"
 
-#: ../src/frogr-settings-dialog.c:465
+#: src/frogr-settings-dialog.c:465
 msgid "_Keep File Extensions in Titles when Loading"
 msgstr "_Behåll filtillägg i titlar vid inläsning"
 
-#: ../src/frogr-settings-dialog.c:471
+#: src/frogr-settings-dialog.c:471
 msgid "_Misc"
 msgstr "_Övrigt"
 
-#: ../src/frogr-settings-dialog.c:972
+#: src/frogr-settings-dialog.c:972
 msgid "Preferences"
 msgstr "Inställningar"
 
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:1
-msgid "Aut_horize Account…"
-msgstr "Auktor_isera konto…"
-
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:2
-msgid "_Preferences…"
-msgstr "_Inställningar…"
-
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:3
-msgid "_Help"
-msgstr "_Hjälp"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:1
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:9
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:3
-msgid "_Edit Details…"
-msgstr "Redigera _detaljer…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:2
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:10
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:4
-msgid "Add _Tags…"
-msgstr "Lägg till _taggar…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:3
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:11
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:5
-msgid "Add to _Group…"
-msgstr "Lägg till i _grupp…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:4
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:12
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:6
-msgid "Add to _Photoset"
-msgstr "Lägg till i _fotosamling"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:5
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:13
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:7
-msgid "_Add to Existing Photoset…"
-msgstr "Lägg till i _befintlig fotosamling…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:6
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:14
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:8
-msgid "_Create New Photoset…"
-msgstr "_Skapa ny fotosamling…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:7
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:15
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:16
-msgid "_Open in External Viewer"
-msgstr "_Öppna i extern visare"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:8
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:6
-msgid "_Remove Elements"
-msgstr "_Ta bort objekt"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:1
-msgid "_File"
-msgstr "_Arkiv"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:2
-msgid "_Open…"
-msgstr "_Öppna…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:4
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:2
-msgid "Save _As…"
-msgstr "Spara _som…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:5
-msgid "A_dd Elements…"
-msgstr "_Lägg till objekt…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:7
-msgid "_Upload All"
-msgstr "Ski_cka upp alla"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:16
-msgid "_View"
-msgstr "_Visa"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:17
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:9
-msgid "_Sort Elements"
-msgstr "_Sortera objekt"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:18
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:10
-msgid "As _Loaded"
-msgstr "Som i_nläst"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:19
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:11
-msgid "By _Date Taken"
-msgstr "Efter _datum taget"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:20
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:12
-msgid "By _Title"
-msgstr "Efter _titel"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:21
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:13
-msgid "By _Size"
-msgstr "Efter _storlek"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:22
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:14
-msgid "_Reversed Order"
-msgstr "_Omvänd ordning"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:23
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:15
-msgid "Enable _Tooltips"
-msgstr "Aktivera _inforutor"
+#~ msgid "Aut_horize Account…"
+#~ msgstr "Auktor_isera konto…"
+
+#~ msgid "_Preferences…"
+#~ msgstr "_Inställningar…"
+
+#~ msgid "_Help"
+#~ msgstr "_Hjälp"
+
+#~ msgid "_Edit Details…"
+#~ msgstr "Redigera _detaljer…"
+
+#~ msgid "Add _Tags…"
+#~ msgstr "Lägg till _taggar…"
+
+#~ msgid "Add to _Group…"
+#~ msgstr "Lägg till i _grupp…"
+
+#~ msgid "Add to _Photoset"
+#~ msgstr "Lägg till i _fotosamling"
+
+#~ msgid "_Add to Existing Photoset…"
+#~ msgstr "Lägg till i _befintlig fotosamling…"
+
+#~ msgid "_Create New Photoset…"
+#~ msgstr "_Skapa ny fotosamling…"
+
+#~ msgid "_Open in External Viewer"
+#~ msgstr "_Öppna i extern visare"
+
+#~ msgid "_Remove Elements"
+#~ msgstr "_Ta bort objekt"
+
+#~ msgid "_File"
+#~ msgstr "_Arkiv"
+
+#~ msgid "_Open…"
+#~ msgstr "_Öppna…"
+
+#~ msgid "Save _As…"
+#~ msgstr "Spara _som…"
+
+#~ msgid "A_dd Elements…"
+#~ msgstr "_Lägg till objekt…"
+
+#~ msgid "_Upload All"
+#~ msgstr "Ski_cka upp alla"
+
+#~ msgid "_View"
+#~ msgstr "_Visa"
+
+#~ msgid "_Sort Elements"
+#~ msgstr "_Sortera objekt"
+
+#~ msgid "As _Loaded"
+#~ msgstr "Som i_nläst"
+
+#~ msgid "By _Date Taken"
+#~ msgstr "Efter _datum taget"
+
+#~ msgid "By _Title"
+#~ msgstr "Efter _titel"
+
+#~ msgid "By _Size"
+#~ msgstr "Efter _storlek"
+
+#~ msgid "_Reversed Order"
+#~ msgstr "_Omvänd ordning"
+
+#~ msgid "Enable _Tooltips"
+#~ msgstr "Aktivera _inforutor"
 
 #~ msgid ""
 #~ "Press the button to start using %s once you've authorized it in your "
diff --git a/po/te.po b/po/te.po
index 8838c04..89a4b2c 100644
--- a/po/te.po
+++ b/po/te.po
@@ -5,9 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: frogr master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=frogr&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-08-08 22:44+0000\n"
+"Report-Msgid-Bugs-To: msanchez gnome org\n"
+"POT-Creation-Date: 2016-08-12 13:09+0100\n"
 "PO-Revision-Date: 2012-12-30 22:48+0530\n"
 "Last-Translator: వీవెన్ <veeven gmail com>\n"
 "Language-Team: e-తెలుగు స్థానికీకరణ జట్టు\n"
@@ -19,102 +18,141 @@ msgstr ""
 "X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"
 
-#: ../data/frogr.desktop.in.in.h:1
-msgid "Frogr"
+#: data/frogr.appdata.xml.in:5 data/frogr.desktop.in.in:5
+#: data/frogr.desktop.in.in:14
+msgid "frogr"
 msgstr ""
 
-#: ../data/frogr.desktop.in.in.h:2
-msgid "Frogr: a Flickr Remote Organizer for GNOME"
+#: data/frogr.appdata.xml.in:6 data/frogr.desktop.in.in:6
+msgid "frogr: a Flickr Remote Organizer for GNOME"
 msgstr ""
 
-#: ../data/frogr.desktop.in.in.h:3
+#: data/frogr.appdata.xml.in:8
+msgid ""
+"frogr is a small application for the GNOME desktop that allows users to "
+"manage their accounts in the Flickr image hosting website."
+msgstr ""
+
+#: data/frogr.appdata.xml.in:13
+msgid ""
+"It supports all the basic Flickr features, including uploading pictures, "
+"adding descriptions, setting tags and managing sets and groups pools."
+msgstr ""
+
+#: data/frogr.appdata.xml.in:24
+#, fuzzy
+msgid "Screenshot of frogr"
+msgstr "తెరపట్టు (_n)"
+
+#: data/frogr.appdata.xml.in:29
+msgid "Mario Sanchez Prada"
+msgstr ""
+
+#: data/frogr.desktop.in.in:7
 msgid "Upload and organize photos in Flickr accounts"
 msgstr "ఫిక్లర్ ఖాతాల లోనికి ఫొటోలను ఎక్కించి అమర్చుకోండి"
 
-#: ../data/frogr.desktop.in.in.h:4
+#: data/frogr.desktop.in.in:8
 msgid "Flickr;Image;Picture;Photo;Video;Uploader;"
 msgstr ""
 
-#: ../src/frogr-about-dialog.c:43
-msgid "A Flickr remote organizer for GNOME\n"
+#: src/frogr-about-dialog.c:43
+msgid "A Flickr Remote Organizer for GNOME\n"
 msgstr ""
 
-#: ../src/frogr-about-dialog.c:72
+#: src/frogr-about-dialog.c:72
 msgid "translator-credits"
 msgstr "వీవెన్ <veeven gmail com>"
 
-#: ../src/frogr-add-tags-dialog.c:207
+#: src/frogr-add-tags-dialog.c:191 src/frogr-add-to-group-dialog.c:528
+#: src/frogr-add-to-set-dialog.c:529 src/frogr-auth-dialog.c:153
+#: src/frogr-create-new-set-dialog.c:310 src/frogr-details-dialog.c:1168
+#: src/frogr-main-view.c:1543 src/frogr-main-view.c:1618
+#: src/frogr-main-view.c:1670 src/frogr-settings-dialog.c:930
+msgid "_Cancel"
+msgstr ""
+
+#: src/frogr-add-tags-dialog.c:193 src/frogr-add-to-group-dialog.c:530
+#: src/frogr-add-to-set-dialog.c:531 src/frogr-create-new-set-dialog.c:312
+msgid "_Add"
+msgstr ""
+
+#: src/frogr-add-tags-dialog.c:202
 msgid "Enter a spaces separated list of tags:"
 msgstr ""
 
-#: ../src/frogr-add-tags-dialog.c:230
+#: src/frogr-add-tags-dialog.c:228
 msgid "Add Tags"
 msgstr ""
 
-#: ../src/frogr-add-to-set-dialog.c:155
-msgid "Title"
-msgstr "శీర్షిక"
+#: src/frogr-add-to-group-dialog.c:147
+msgid "Name"
+msgstr "పేరు"
 
-#: ../src/frogr-add-to-set-dialog.c:170 ../src/frogr-add-to-group-dialog.c:169
+#: src/frogr-add-to-group-dialog.c:162 src/frogr-add-to-set-dialog.c:163
 msgid "Elements"
 msgstr "మూలకాలు"
 
-#: ../src/frogr-add-to-set-dialog.c:602
-msgid "Add to Sets"
+#: src/frogr-add-to-group-dialog.c:581
+msgid "Add to Groups"
 msgstr ""
 
-#: ../src/frogr-add-to-group-dialog.c:154
-msgid "Name"
-msgstr "పేరు"
+#: src/frogr-add-to-set-dialog.c:148
+msgid "Title"
+msgstr "శీర్షిక"
 
-#: ../src/frogr-add-to-group-dialog.c:601
-msgid "Add to Groups"
+#: src/frogr-add-to-set-dialog.c:582
+msgid "Add to Sets"
 msgstr ""
 
-#: ../src/frogr-auth-dialog.c:52
+#: src/frogr-auth-dialog.c:59
 #, c-format
 msgid ""
 "Please press the button to authorize %s and then come back to complete the "
 "process."
 msgstr ""
 
-#: ../src/frogr-auth-dialog.c:56 ../src/frogr-auth-dialog.c:141
+#: src/frogr-auth-dialog.c:63 src/frogr-auth-dialog.c:149
+#: src/frogr-controller.c:2286
 #, c-format
 msgid "Authorize %s"
 msgstr ""
 
-#. Description label
-#: ../src/frogr-auth-dialog.c:158
+#: src/frogr-auth-dialog.c:155 src/frogr-settings-dialog.c:932
+msgid "_Close"
+msgstr ""
+
+#: src/frogr-auth-dialog.c:167
 msgid "Enter verification code:"
 msgstr "తనిఖీ సంకేతాన్ని ఇవ్వండి:"
 
-#: ../src/frogr-auth-dialog.c:209
+#: src/frogr-auth-dialog.c:221
 msgid "Invalid verification code"
 msgstr "చెల్లని తనిఖీ సంకేతం"
 
-#: ../src/frogr-controller.c:593
+#: src/frogr-controller.c:581
 msgid "Process cancelled"
 msgstr "ప్రక్రియ రద్దయింది"
 
-#: ../src/frogr-controller.c:598
+#: src/frogr-controller.c:586
 msgid ""
 "Connection error:\n"
 "Network not available"
 msgstr ""
 
-#: ../src/frogr-controller.c:602
+#: src/frogr-controller.c:590
 msgid ""
 "Connection error:\n"
 "Bad request"
 msgstr ""
 
-#: ../src/frogr-controller.c:606
+#: src/frogr-controller.c:594
 msgid ""
 "Connection error:\n"
 "Server-side error"
 msgstr ""
 
-#: ../src/frogr-controller.c:610
+#: src/frogr-controller.c:598
 msgid ""
 "Error uploading:\n"
 "File invalid"
@@ -122,81 +160,80 @@ msgstr ""
 "ఎక్కించడంలో పొరపాటు:\n"
 "చెల్లని దస్త్రం"
 
-#: ../src/frogr-controller.c:614
+#: src/frogr-controller.c:602
 msgid ""
 "Error uploading picture:\n"
 "Quota exceeded"
 msgstr ""
 
-#: ../src/frogr-controller.c:619
+#: src/frogr-controller.c:607
 #, c-format
 msgid "Quota exceeded (limit: %d video per month)"
 msgid_plural "Quota exceeded (limit: %d videos per month)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/frogr-controller.c:623
+#: src/frogr-controller.c:611
 msgid ""
 "Error uploading video:\n"
 "You can't upload more videos with this account"
 msgstr ""
 
-#: ../src/frogr-controller.c:629
+#: src/frogr-controller.c:617
 msgid ""
 "Error:\n"
 "Photo not found"
 msgstr ""
 
-#: ../src/frogr-controller.c:633
+#: src/frogr-controller.c:621
 msgid ""
 "Error:\n"
 "Photo already in photoset"
 msgstr ""
 
-#: ../src/frogr-controller.c:637
+#: src/frogr-controller.c:625
 msgid ""
 "Error:\n"
 "Photo already in group"
 msgstr ""
 
-#: ../src/frogr-controller.c:641
+#: src/frogr-controller.c:629
 msgid ""
 "Error:\n"
 "Photo already in the maximum number of groups possible"
 msgstr ""
 
-#: ../src/frogr-controller.c:645
+#: src/frogr-controller.c:633
 msgid ""
 "Error:\n"
 "Group limit already reached"
 msgstr ""
 
-#: ../src/frogr-controller.c:649
+#: src/frogr-controller.c:637
 msgid ""
 "Error:\n"
 "Photo added to group's queue"
 msgstr ""
 
-#: ../src/frogr-controller.c:653
+#: src/frogr-controller.c:641
 msgid ""
 "Error:\n"
 "Photo already added to group's queue"
 msgstr ""
 
-#: ../src/frogr-controller.c:657
+#: src/frogr-controller.c:645
 msgid ""
 "Error:\n"
 "Content not allowed for this group"
 msgstr ""
 
-#: ../src/frogr-controller.c:661
-#, c-format
+#: src/frogr-controller.c:649
 msgid ""
 "Authorization failed.\n"
 "Please try again"
 msgstr ""
 
-#: ../src/frogr-controller.c:667
+#: src/frogr-controller.c:655
 #, c-format
 msgid ""
 "Error\n"
@@ -204,22 +241,20 @@ msgid ""
 "Please re-authorize it"
 msgstr ""
 
-#: ../src/frogr-controller.c:672
-#, c-format
+#: src/frogr-controller.c:660
 msgid ""
 "Unable to authenticate in Flickr\n"
 "Please try again."
 msgstr ""
 
-#: ../src/frogr-controller.c:676
+#: src/frogr-controller.c:664
 #, c-format
 msgid ""
 "You have not properly authorized %s yet.\n"
 "Please try again."
 msgstr ""
 
-#: ../src/frogr-controller.c:681
-#, c-format
+#: src/frogr-controller.c:669
 msgid ""
 "Invalid verification code.\n"
 "Please try again."
@@ -227,8 +262,7 @@ msgstr ""
 "చెల్లని తనిఖీ సంకేతం.\n"
 "దయచేసి మళ్ళీ ప్రయత్నించండి."
 
-#: ../src/frogr-controller.c:685
-#, c-format
+#: src/frogr-controller.c:673
 msgid ""
 "Error:\n"
 "Service not available"
@@ -236,598 +270,525 @@ msgstr ""
 "పొరపాటు:\n"
 "సేవ అందుబాటులో లేదు"
 
-#. General error: just dump the raw error description
-#: ../src/frogr-controller.c:690
+#: src/frogr-controller.c:678
 #, c-format
 msgid "An error happened: %s."
 msgstr "పొరపాటు జరిగింది: %s."
 
-#: ../src/frogr-controller.c:906
+#: src/frogr-controller.c:883
 msgid "Authorization failed (timed out)"
 msgstr ""
 
-#: ../src/frogr-controller.c:958
+#: src/frogr-controller.c:931
 #, c-format
 msgid "Retrying Upload (attempt %d/%d)…"
 msgstr ""
 
-#: ../src/frogr-controller.c:963
+#: src/frogr-controller.c:936
 #, c-format
 msgid "Uploading '%s'…"
 msgstr ""
 
-#: ../src/frogr-controller.c:2221
+#: src/frogr-controller.c:2242
 msgid "Updating credentials…"
 msgstr ""
 
-#: ../src/frogr-controller.c:2226
+#: src/frogr-controller.c:2247
 msgid "Retrieving data for authorization…"
 msgstr ""
 
-#: ../src/frogr-controller.c:2231
+#: src/frogr-controller.c:2252
 msgid "Finishing authorization…"
 msgstr ""
 
-#: ../src/frogr-controller.c:2236
+#: src/frogr-controller.c:2257
 msgid "Retrieving list of sets…"
 msgstr ""
 
-#: ../src/frogr-controller.c:2241
+#: src/frogr-controller.c:2262
 msgid "Retrieving list of groups…"
 msgstr ""
 
-#: ../src/frogr-controller.c:2246
+#: src/frogr-controller.c:2267
 msgid "Retrieving list of tags…"
 msgstr ""
 
-#: ../src/frogr-controller.c:2363
+#: src/frogr-controller.c:2292
+msgid "Fetching information"
+msgstr ""
+
+#: src/frogr-controller.c:2398
 msgid "No sets found"
 msgstr ""
 
-#: ../src/frogr-controller.c:2390
+#: src/frogr-controller.c:2423
 msgid "No groups found"
 msgstr ""
 
-#: ../src/frogr-controller.c:3031
+#: src/frogr-controller.c:2984
 #, c-format
 msgid ""
 "You need to properly authorize %s before uploading any pictures to Flickr.\n"
 "Please re-authorize it."
 msgstr ""
 
-#: ../src/frogr-controller.c:3041
-#, c-format
+#: src/frogr-controller.c:2994
 msgid "You need to be connected before uploading any pictures to Flickr."
 msgstr ""
 
-#: ../src/frogr-controller.c:3113
-#, c-format
+#: src/frogr-controller.c:3012
+msgid "Uploading Pictures"
+msgstr ""
+
+#: src/frogr-controller.c:3057
 msgid "Error opening project file"
 msgstr ""
 
-#. This shows a dialog notifying the problem to the user
-#: ../src/frogr-create-new-set-dialog.c:156 ../src/frogr-details-dialog.c:1024
+#: src/frogr-create-new-set-dialog.c:143 src/frogr-details-dialog.c:1001
 msgid "Missing data required"
 msgstr ""
 
-#: ../src/frogr-create-new-set-dialog.c:342
+#: src/frogr-create-new-set-dialog.c:326
 msgid "Title:"
 msgstr "శీర్షిక:"
 
-#: ../src/frogr-create-new-set-dialog.c:351
+#: src/frogr-create-new-set-dialog.c:335
 msgid "Description:"
 msgstr "వివరణ:"
 
-#: ../src/frogr-create-new-set-dialog.c:372
+#: src/frogr-create-new-set-dialog.c:356
 msgid "Fill Pictures Details with Title and Description"
 msgstr ""
 
-#: ../src/frogr-create-new-set-dialog.c:393
+#: src/frogr-create-new-set-dialog.c:381
 msgid "Create New Set"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:90 ../src/frogr-settings-dialog.c:100
+#: src/frogr-details-dialog.c:89 src/frogr-settings-dialog.c:97
 msgid "Default (as specified in Flickr)"
 msgstr "అప్రమేయం (ఫ్లికర్‌లో పేర్కొన్నట్లు)"
 
-#: ../src/frogr-details-dialog.c:91 ../src/frogr-settings-dialog.c:101
+#: src/frogr-details-dialog.c:90 src/frogr-settings-dialog.c:98
 msgid "All rights reserved"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:92 ../src/frogr-settings-dialog.c:102
+#: src/frogr-details-dialog.c:91 src/frogr-settings-dialog.c:99
 msgid "CC Attribution-NonCommercial-ShareAlike"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:93 ../src/frogr-settings-dialog.c:103
+#: src/frogr-details-dialog.c:92 src/frogr-settings-dialog.c:100
 msgid "CC Attribution-NonCommercial"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:94 ../src/frogr-settings-dialog.c:104
+#: src/frogr-details-dialog.c:93 src/frogr-settings-dialog.c:101
 msgid "CC Attribution-NonCommercial-NoDerivs"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:95 ../src/frogr-settings-dialog.c:105
+#: src/frogr-details-dialog.c:94 src/frogr-settings-dialog.c:102
 msgid "CC Attribution"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:96 ../src/frogr-settings-dialog.c:106
+#: src/frogr-details-dialog.c:95 src/frogr-settings-dialog.c:103
 msgid "CC Attribution-ShareAlike"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:97 ../src/frogr-settings-dialog.c:107
+#: src/frogr-details-dialog.c:96 src/frogr-settings-dialog.c:104
 msgid "CC Attribution-NoDerivs"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:180
+#: src/frogr-details-dialog.c:172
 msgid "Open with image viewer"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:197
+#: src/frogr-details-dialog.c:190
 msgid "_Title:"
 msgstr "శీర్షిక (_T):"
 
-#: ../src/frogr-details-dialog.c:207
+#: src/frogr-details-dialog.c:200
 msgid "_Description:"
 msgstr "వివరణ (_D):"
 
-#: ../src/frogr-details-dialog.c:231
+#: src/frogr-details-dialog.c:224
 msgid "Ta_gs:"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:257
+#: src/frogr-details-dialog.c:247
 msgid "Visibility"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:269 ../src/frogr-settings-dialog.c:203
-msgid "P_ublic"
-msgstr "బహిరంగం (_u)"
-
-#: ../src/frogr-details-dialog.c:278 ../src/frogr-settings-dialog.c:209
+#: src/frogr-details-dialog.c:257 src/frogr-settings-dialog.c:196
 msgid "_Private"
 msgstr "అంతరంగికం (_P)"
 
-#: ../src/frogr-details-dialog.c:282 ../src/frogr-settings-dialog.c:212
+#: src/frogr-details-dialog.c:261 src/frogr-settings-dialog.c:199
+msgid "P_ublic"
+msgstr "బహిరంగం (_u)"
+
+#: src/frogr-details-dialog.c:270 src/frogr-settings-dialog.c:207
 msgid "_Family"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:286 ../src/frogr-settings-dialog.c:214
+#: src/frogr-details-dialog.c:274 src/frogr-settings-dialog.c:209
 msgid "F_riends"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:312
+#: src/frogr-details-dialog.c:288
 msgid "Content Type"
 msgstr "విషయపు రకం"
 
-#: ../src/frogr-details-dialog.c:321 ../src/frogr-settings-dialog.c:238
+#: src/frogr-details-dialog.c:296 src/frogr-settings-dialog.c:234
 msgid "P_hoto"
 msgstr "ఫొటో (_h)"
 
-#: ../src/frogr-details-dialog.c:325 ../src/frogr-settings-dialog.c:240
+#: src/frogr-details-dialog.c:300 src/frogr-settings-dialog.c:236
 msgid "Scree_nshot"
 msgstr "తెరపట్టు (_n)"
 
-#: ../src/frogr-details-dialog.c:329 ../src/frogr-settings-dialog.c:242
+#: src/frogr-details-dialog.c:304 src/frogr-settings-dialog.c:238
 msgid "Oth_er"
 msgstr "ఇతర (_e)"
 
-#: ../src/frogr-details-dialog.c:345
+#: src/frogr-details-dialog.c:317
 msgid "Safety Level"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:354 ../src/frogr-settings-dialog.c:263
+#: src/frogr-details-dialog.c:325 src/frogr-settings-dialog.c:260
 msgid "S_afe"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:358 ../src/frogr-settings-dialog.c:265
+#: src/frogr-details-dialog.c:329 src/frogr-settings-dialog.c:262
 msgid "_Moderate"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:362 ../src/frogr-settings-dialog.c:267
+#: src/frogr-details-dialog.c:333 src/frogr-settings-dialog.c:264
 msgid "Restr_icted"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:376
+#: src/frogr-details-dialog.c:345
 msgid "License Type"
 msgstr "లైసెన్సు రకం"
 
-#: ../src/frogr-details-dialog.c:400
+#: src/frogr-details-dialog.c:367
 msgid "Other Properties"
 msgstr "ఇతర లక్షణాలు"
 
-#: ../src/frogr-details-dialog.c:409
+#: src/frogr-details-dialog.c:375
+msgid "_Show Up in Global Search Results"
+msgstr ""
+
+#: src/frogr-details-dialog.c:379
 msgid "Set Geo_location Information"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:413
-msgid "_Show Up in Global Search Results"
+#: src/frogr-details-dialog.c:383
+msgid "Replace 'Date Posted' with 'Date Taken'"
 msgstr ""
 
-#. Visually indicate how many pictures are being edited
-#: ../src/frogr-details-dialog.c:504
+#: src/frogr-details-dialog.c:475
 #, c-format
 msgid "(%d Picture)"
 msgid_plural "(%d Pictures)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/frogr-details-dialog.c:578
+#: src/frogr-details-dialog.c:548
 msgid "An error happened trying to load the picture"
 msgstr ""
 
-#: ../src/frogr-details-dialog.c:1227
+#: src/frogr-details-dialog.c:1169
+msgid "_Edit"
+msgstr ""
+
+#: src/frogr-details-dialog.c:1197
 msgid "Edit Picture Details"
 msgstr ""
 
-#: ../src/frogr-file-loader.c:147
+#: src/frogr-file-loader.c:142
 #, c-format
 msgid "Loading files %d / %d"
 msgstr ""
 
-#: ../src/frogr-file-loader.c:381
+#: src/frogr-file-loader.c:369
 #, c-format
 msgid ""
 "Unable to load picture %s:\n"
 "%s"
 msgstr ""
 
-#: ../src/frogr-file-loader.c:412
+#: src/frogr-file-loader.c:400
 #, c-format
 msgid ""
 "Unable to load video %s\n"
 "Please check that you have the right codec installed"
 msgstr ""
 
-#. First %s is the title of the picture (filename of the file by
-#. default). Second %s is the max allowed size for a picture to be
-#. uploaded to flickr (different for free and PRO accounts).
-#: ../src/frogr-file-loader.c:652
+#: src/frogr-file-loader.c:636
 #, c-format
 msgid ""
 "Can't load file %s:\n"
 "Size of file is bigger than the maximum allowed for this account (%s)"
 msgstr ""
 
-#: ../src/frogr-main-view.c:822 ../data/gtkbuilder/frogr-app-menu.xml.h:4
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
+msgid "Open"
+msgstr "తెరువు"
+
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
+msgid "Open Existing Project"
+msgstr ""
+
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
+msgid "Add"
+msgstr "చేర్చు"
+
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
+msgid "Add Elements"
+msgstr "మూలకాలను చేర్చు"
+
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
+msgid "Remove"
+msgstr "తొలగించు"
+
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
+msgid "Remove Elements"
+msgstr "మూలకాలను తొలగించు"
+
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
+msgid "Upload"
+msgstr "ఎక్కించు"
+
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
+msgid "Upload All"
+msgstr "అన్నింటినీ ఎక్కించు"
+
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
+msgid "Save"
+msgstr "భద్రపరచు"
+
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
+msgid "Save Current Project"
+msgstr "ప్రస్తుత ప్రాజెక్టును భద్రపరచు"
+
+#: src/frogr-main-view.c:1016
 msgid "_About"
 msgstr "గురించి (_A)"
 
-#: ../src/frogr-main-view.c:826 ../data/gtkbuilder/frogr-app-menu.xml.h:5
+#: src/frogr-main-view.c:1020
 msgid "_Quit"
 msgstr "చాలించు (_Q)"
 
-#. Create the submenu and insert it in the right section
-#: ../src/frogr-main-view.c:882
+#: src/frogr-main-view.c:1070
 msgid "Accounts"
 msgstr "ఖాతాలు"
 
-#. String showind the date and time a picture was taken
-#: ../src/frogr-main-view.c:1111
+#: src/frogr-main-view.c:1410
 #, c-format
 msgid "Taken: %s"
 msgstr "తీసిన సమయం: %s"
 
-#: ../src/frogr-main-view.c:1116
+#: src/frogr-main-view.c:1415
 #, c-format
 msgid "File size: %s"
 msgstr "దస్త్ర పరిమాణం: %s"
 
-#: ../src/frogr-main-view.c:1239
+#: src/frogr-main-view.c:1540
 msgid "Select File"
 msgstr "దస్త్రాన్ని ఎంచుకోండి"
 
-#: ../src/frogr-main-view.c:1252
+#: src/frogr-main-view.c:1544 src/frogr-main-view.c:1671
+#, fuzzy
+msgid "_Open"
+msgstr "తెరువు"
+
+#: src/frogr-main-view.c:1553
 msgid "Frogr Project Files"
 msgstr ""
 
-#: ../src/frogr-main-view.c:1316
+#: src/frogr-main-view.c:1615
 msgid "Select Destination"
 msgstr "గమ్యస్థానాన్ని ఎంచుకోండి"
 
-#: ../src/frogr-main-view.c:1323
+#: src/frogr-main-view.c:1619
+msgid "_Save"
+msgstr "భద్రపరచు (_S)"
+
+#: src/frogr-main-view.c:1622
 msgid "Untitled Project.frogr"
 msgstr "పేరులేని ప్రాజెక్టు.frogr"
 
-#: ../src/frogr-main-view.c:1364
+#: src/frogr-main-view.c:1667
 msgid "Select a Picture"
 msgstr "ఒక చిత్రాన్ని ఎంచుకోండి"
 
-#: ../src/frogr-main-view.c:1387
+#: src/frogr-main-view.c:1694
 msgid "All Files"
 msgstr "అన్ని దస్త్రాలు"
 
-#: ../src/frogr-main-view.c:1390
+#: src/frogr-main-view.c:1697
 msgid "Image Files"
 msgstr "బొమ్మల దస్త్రాలు"
 
-#: ../src/frogr-main-view.c:1393
+#: src/frogr-main-view.c:1701
 msgid "Video Files"
 msgstr "వీడియో దస్త్రాలు"
 
-#: ../src/frogr-main-view.c:1414
+#: src/frogr-main-view.c:1723
 msgid "You don't have any picture added yet"
 msgstr "మీరు ఇంకా ఏ చిత్రాలనూ చేర్చలేదు"
 
-#: ../src/frogr-main-view.c:1429
+#: src/frogr-main-view.c:1736
 msgid "You need to select some pictures first"
 msgstr ""
 
-#: ../src/frogr-main-view.c:1889
+#: src/frogr-main-view.c:2108
 msgid "Not connected to Flickr"
 msgstr ""
 
-#. Login string, showing the user is PRO (second '%s') if so.
-#: ../src/frogr-main-view.c:1899
+#: src/frogr-main-view.c:2118
 #, c-format
 msgid "Connected as %s%s"
 msgstr ""
 
-#: ../src/frogr-main-view.c:1900
+#: src/frogr-main-view.c:2119
 msgid " (PRO account)"
 msgstr " (PRO ఖాతా)"
 
-#. Will show in the status bar the amount of data (in KB, MB
-#. or GB) the user is currently allowed to upload to flicker
-#. till the end of the month, in a CURRENT / MAX fashion.
-#. The '-' at the beginning is just a separator, since more
-#. blocks of text will be shown in the status bar too.
-#: ../src/frogr-main-view.c:1924
+#: src/frogr-main-view.c:2143
 #, c-format
 msgid " - %s / %s remaining"
 msgstr ""
 
-#. Will show in the status bar the amount of pictures and data
-#. (in KB, MB or GB) that would be uploaded as the sum of the
-#. sizes for every picture loaded in the application
-#: ../src/frogr-main-view.c:1950
+#: src/frogr-main-view.c:2169
 #, c-format
 msgid " - %d file to upload (%s)"
 msgid_plural " - %d files to upload (%s)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/frogr-settings-dialog.c:189
+#: src/frogr-settings-dialog.c:185
 msgid "Default Visibility"
 msgstr ""
 
-#: ../src/frogr-settings-dialog.c:226
+#: src/frogr-settings-dialog.c:224
 msgid "Default Content Type"
 msgstr "అప్రమేయ విషయపు రకం"
 
-#: ../src/frogr-settings-dialog.c:251
+#: src/frogr-settings-dialog.c:250
 msgid "Default Safety Level"
 msgstr ""
 
-#: ../src/frogr-settings-dialog.c:276
+#: src/frogr-settings-dialog.c:276
 msgid "Default License"
 msgstr "అప్రమేయ లైసెన్సు"
 
-#: ../src/frogr-settings-dialog.c:300
+#: src/frogr-settings-dialog.c:302
 msgid "Other Defaults"
 msgstr "ఇతర అప్రమేయాలు"
 
-#: ../src/frogr-settings-dialog.c:312
+#: src/frogr-settings-dialog.c:312
+msgid "_Show Pictures in Global Search Results"
+msgstr ""
+
+#: src/frogr-settings-dialog.c:315
 msgid "Set Geo_location Information for Pictures"
 msgstr ""
 
-#: ../src/frogr-settings-dialog.c:315
-msgid "_Show Pictures in Global Search Results"
+#: src/frogr-settings-dialog.c:318
+msgid "Replace 'Date Posted' with 'Date Taken' for Pictures"
 msgstr ""
 
-#: ../src/frogr-settings-dialog.c:321
+#: src/frogr-settings-dialog.c:324
 msgid "_General"
 msgstr "సాధారణం (_G)"
 
-#: ../src/frogr-settings-dialog.c:346
+#: src/frogr-settings-dialog.c:344
 msgid "Proxy Settings"
 msgstr "ప్రాక్సీ అమరికలు"
 
-#. Enable proxy
-#: ../src/frogr-settings-dialog.c:356
+#: src/frogr-settings-dialog.c:353
 msgid "_Enable HTTP Proxy"
 msgstr ""
 
-#: ../src/frogr-settings-dialog.c:368
+#: src/frogr-settings-dialog.c:363
 msgid "_Host:"
 msgstr ""
 
-#. Proxy port
-#: ../src/frogr-settings-dialog.c:381
+#: src/frogr-settings-dialog.c:376
 msgid "_Port:"
 msgstr ""
 
-#. Proxy username
-#: ../src/frogr-settings-dialog.c:394
+#: src/frogr-settings-dialog.c:389
 msgid "U_sername:"
 msgstr "వాడుకరి పేరు (_s):"
 
-#. Proxy password
-#: ../src/frogr-settings-dialog.c:407
+#: src/frogr-settings-dialog.c:402
 msgid "Pass_word:"
 msgstr "సంకేతపదం (_w):"
 
-#: ../src/frogr-settings-dialog.c:447
+#: src/frogr-settings-dialog.c:426
 msgid "Connec_tion"
 msgstr ""
 
-#: ../src/frogr-settings-dialog.c:470
+#: src/frogr-settings-dialog.c:444
 msgid "Other options"
 msgstr "ఇతర ఎంపికలు"
 
-#: ../src/frogr-settings-dialog.c:482
+#: src/frogr-settings-dialog.c:454
 msgid "Ena_ble Tags Auto-Completion"
 msgstr ""
 
-#: ../src/frogr-settings-dialog.c:485
+#: src/frogr-settings-dialog.c:457
 msgid "_Import Tags from Pictures Metadata"
 msgstr ""
 
-#: ../src/frogr-settings-dialog.c:489
+#: src/frogr-settings-dialog.c:461
 msgid "Use _Dark GTK Theme"
 msgstr ""
 
-#: ../src/frogr-settings-dialog.c:493
+#: src/frogr-settings-dialog.c:465
 msgid "_Keep File Extensions in Titles when Loading"
 msgstr ""
 
-#: ../src/frogr-settings-dialog.c:499
+#: src/frogr-settings-dialog.c:471
 msgid "_Misc"
 msgstr ""
 
-#: ../src/frogr-settings-dialog.c:1035
+#: src/frogr-settings-dialog.c:972
 msgid "Preferences"
 msgstr "అభిరుచులు"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:1
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:9
-msgid "_Edit Details…"
-msgstr ""
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:2
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:10
-msgid "Add _Tags…"
-msgstr ""
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:3
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:11
-msgid "Add to _Group…"
-msgstr ""
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:4
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:12
-msgid "Add to _Photoset"
-msgstr ""
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:5
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:13
-msgid "_Add to Existing Photoset…"
-msgstr ""
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:6
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:14
-msgid "_Create New Photoset…"
-msgstr ""
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:7
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:15
-msgid "_Open in External Viewer"
-msgstr ""
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:8
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:6
-msgid "_Remove Elements"
-msgstr "మూలకాలను తొలగించు (_R)"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:9
-msgid "Open Existing Project"
-msgstr ""
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:10
-msgid "Open"
-msgstr "తెరువు"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:11
-msgid "Save Current Project"
-msgstr "ప్రస్తుత ప్రాజెక్టును భద్రపరచు"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:12
-msgid "Save"
-msgstr "భద్రపరచు"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:13
-msgid "Add Elements"
-msgstr "మూలకాలను చేర్చు"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:14
-msgid "Add"
-msgstr "చేర్చు"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:15
-msgid "Remove Elements"
-msgstr "మూలకాలను తొలగించు"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:16
-msgid "Remove"
-msgstr "తొలగించు"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:17
-msgid "Upload All"
-msgstr "అన్నింటినీ ఎక్కించు"
-
-#: ../data/gtkbuilder/frogr-main-view.xml.h:18
-msgid "Upload"
-msgstr "ఎక్కించు"
-
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:1
-msgid "Aut_horize Account…"
-msgstr ""
+#~ msgid "_Remove Elements"
+#~ msgstr "మూలకాలను తొలగించు (_R)"
 
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:2
-msgid "_Preferences…"
-msgstr "అభిరుచులు (_P)…"
+#~ msgid "_Preferences…"
+#~ msgstr "అభిరుచులు (_P)…"
 
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:3
-msgid "_Help"
-msgstr "సహాయం (_H)"
+#~ msgid "_Help"
+#~ msgstr "సహాయం (_H)"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:1
-msgid "_File"
-msgstr "దస్త్రం (_F)"
+#~ msgid "_File"
+#~ msgstr "దస్త్రం (_F)"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:2
-msgid "_Open…"
-msgstr "తెరువు (_O)…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:3
-msgid "_Save"
-msgstr "భద్రపరచు (_S)"
+#~ msgid "_Open…"
+#~ msgstr "తెరువు (_O)…"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:4
-msgid "Save _As…"
-msgstr "మరోపేరుతో భద్రపరచు (_A)…"
+#~ msgid "Save _As…"
+#~ msgstr "మరోపేరుతో భద్రపరచు (_A)…"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:5
-msgid "A_dd Elements…"
-msgstr ""
+#~ msgid "_Upload All"
+#~ msgstr "అన్నింటినీ ఎక్కించు (_U)"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:7
-msgid "_Upload All"
-msgstr "అన్నింటినీ ఎక్కించు (_U)"
+#~ msgid "By _Date Taken"
+#~ msgstr "తీసిన తేదీ ప్రకారం (_D)"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:8
-msgid "_Edit"
-msgstr ""
+#~ msgid "By _Title"
+#~ msgstr "శీర్షిక ప్రకారం (_T)"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:16
-msgid "_View"
-msgstr ""
+#~ msgid "By _Size"
+#~ msgstr "పరిమాణమును బట్టి (_S)"
 
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:17
-msgid "_Sort Elements"
-msgstr ""
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:18
-msgid "As _Loaded"
-msgstr ""
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:19
-msgid "By _Date Taken"
-msgstr "తీసిన తేదీ ప్రకారం (_D)"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:20
-msgid "By _Title"
-msgstr "శీర్షిక ప్రకారం (_T)"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:21
-msgid "By _Size"
-msgstr "పరిమాణమును బట్టి (_S)"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:22
-msgid "_Reversed Order"
-msgstr "వ్యతిరేక క్రమం (_R)"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:23
-msgid "Enable _Tooltips"
-msgstr ""
+#~ msgid "_Reversed Order"
+#~ msgstr "వ్యతిరేక క్రమం (_R)"
 
 #~ msgid "Visible to _Family"
 #~ msgstr "కుటుంబసభ్యులకు మాత్రమే (_F)"
diff --git a/po/tr.po b/po/tr.po
index 2f419f7..642854f 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,9 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: frogr master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=frogr&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-06-23 16:40+0000\n"
+"Report-Msgid-Bugs-To: msanchez gnome org\n"
+"POT-Creation-Date: 2016-08-12 13:09+0100\n"
 "PO-Revision-Date: 2015-08-09 19:14+0300\n"
 "Last-Translator: Muhammet Kara <muhammetk gmail com>\n"
 "Language-Team: Türkçe <gnome-turk gnome org>\n"
@@ -21,16 +20,28 @@ msgstr ""
 "X-Generator: Gtranslator 2.91.7\n"
 "X-POOTLE-MTIME: 1425026434.000000\n"
 
-#: ../data/frogr.appdata.xml.in.h:1
+#: data/frogr.appdata.xml.in:5 data/frogr.desktop.in.in:5
+#: data/frogr.desktop.in.in:14
+#, fuzzy
+msgid "frogr"
+msgstr "Frogr"
+
+#: data/frogr.appdata.xml.in:6 data/frogr.desktop.in.in:6
+#, fuzzy
+msgid "frogr: a Flickr Remote Organizer for GNOME"
+msgstr "Frogr: GNOME için bir Flickr Uzaktan Düzenleyicisi"
+
+#: data/frogr.appdata.xml.in:8
+#, fuzzy
 msgid ""
-"Frogr is a small application for the GNOME desktop that allows users to "
+"frogr is a small application for the GNOME desktop that allows users to "
 "manage their accounts in the Flickr image hosting website."
 msgstr ""
 "Frogr; GNOME masaüstü için hazırlanmış küçük bir uygulamadır ve "
 "kullanıcıların Flickr resim barındırma web sitesindeki hesaplarını "
 "yönetmelerine olanak tanır."
 
-#: ../data/frogr.appdata.xml.in.h:2
+#: data/frogr.appdata.xml.in:13
 msgid ""
 "It supports all the basic Flickr features, including uploading pictures, "
 "adding descriptions, setting tags and managing sets and groups pools."
@@ -39,73 +50,74 @@ msgstr ""
 "eklenmesi, etiketlerin ayarlanması ve küme ve grup havuzlarının yönetilmesi "
 "dahil."
 
-#: ../data/frogr.desktop.in.in.h:1
-msgid "Frogr"
-msgstr "Frogr"
+#: data/frogr.appdata.xml.in:24
+#, fuzzy
+msgid "Screenshot of frogr"
+msgstr "Ekra_n görüntüsü"
 
-#: ../data/frogr.desktop.in.in.h:2
-msgid "Frogr: a Flickr Remote Organizer for GNOME"
-msgstr "Frogr: GNOME için bir Flickr Uzaktan Düzenleyicisi"
+#: data/frogr.appdata.xml.in:29
+msgid "Mario Sanchez Prada"
+msgstr ""
 
-#: ../data/frogr.desktop.in.in.h:3
+#: data/frogr.desktop.in.in:7
 msgid "Upload and organize photos in Flickr accounts"
 msgstr "Flickr hesaplarına fotoğraf yükleyin ve düzenleyin."
 
-#: ../data/frogr.desktop.in.in.h:4
+#: data/frogr.desktop.in.in:8
 msgid "Flickr;Image;Picture;Photo;Video;Uploader;"
 msgstr "Flickr;Görüntü;Resim;Fotoğraf;Video;Karşıya Yükleyici;"
 
-#: ../src/frogr-about-dialog.c:43
-msgid "A Flickr remote organizer for GNOME\n"
+#: src/frogr-about-dialog.c:43
+#, fuzzy
+msgid "A Flickr Remote Organizer for GNOME\n"
 msgstr "GNOME için Flickr uzaktan düzenleyicisi\n"
 
-#: ../src/frogr-about-dialog.c:72
+#: src/frogr-about-dialog.c:72
 msgid "translator-credits"
 msgstr "Muhammet Kara <muhammetk gmail com>"
 
-#: ../src/frogr-add-tags-dialog.c:198 ../src/frogr-add-to-group-dialog.c:552
-#: ../src/frogr-add-to-set-dialog.c:553 ../src/frogr-auth-dialog.c:153
-#: ../src/frogr-create-new-set-dialog.c:329 ../src/frogr-details-dialog.c:1195
-#: ../src/frogr-main-view.c:1600 ../src/frogr-main-view.c:1679
-#: ../src/frogr-main-view.c:1731 ../src/frogr-settings-dialog.c:961
+#: src/frogr-add-tags-dialog.c:191 src/frogr-add-to-group-dialog.c:528
+#: src/frogr-add-to-set-dialog.c:529 src/frogr-auth-dialog.c:153
+#: src/frogr-create-new-set-dialog.c:310 src/frogr-details-dialog.c:1168
+#: src/frogr-main-view.c:1543 src/frogr-main-view.c:1618
+#: src/frogr-main-view.c:1670 src/frogr-settings-dialog.c:930
 msgid "_Cancel"
 msgstr "_Vazgeç"
 
-#: ../src/frogr-add-tags-dialog.c:200 ../src/frogr-add-to-group-dialog.c:554
-#: ../src/frogr-add-to-set-dialog.c:555
-#: ../src/frogr-create-new-set-dialog.c:331
+#: src/frogr-add-tags-dialog.c:193 src/frogr-add-to-group-dialog.c:530
+#: src/frogr-add-to-set-dialog.c:531 src/frogr-create-new-set-dialog.c:312
 msgid "_Add"
 msgstr "_Ekle"
 
-#: ../src/frogr-add-tags-dialog.c:209
+#: src/frogr-add-tags-dialog.c:202
 msgid "Enter a spaces separated list of tags:"
 msgstr "Boşluklarla ayrılmış bir etiket listesi girin:"
 
-#: ../src/frogr-add-tags-dialog.c:235
+#: src/frogr-add-tags-dialog.c:228
 msgid "Add Tags"
 msgstr "Etiket Ekle"
 
-#: ../src/frogr-add-to-group-dialog.c:154
+#: src/frogr-add-to-group-dialog.c:147
 msgid "Name"
 msgstr "Ad"
 
-#: ../src/frogr-add-to-group-dialog.c:169 ../src/frogr-add-to-set-dialog.c:170
+#: src/frogr-add-to-group-dialog.c:162 src/frogr-add-to-set-dialog.c:163
 msgid "Elements"
 msgstr "Öğeler"
 
-#: ../src/frogr-add-to-group-dialog.c:605
+#: src/frogr-add-to-group-dialog.c:581
 msgid "Add to Groups"
 msgstr "Gruplara Ekle"
 
-#: ../src/frogr-add-to-set-dialog.c:155
+#: src/frogr-add-to-set-dialog.c:148
 msgid "Title"
 msgstr "Başlık"
 
-#: ../src/frogr-add-to-set-dialog.c:606
+#: src/frogr-add-to-set-dialog.c:582
 msgid "Add to Sets"
 msgstr "Kümelere Ekle"
 
-#: ../src/frogr-auth-dialog.c:59
+#: src/frogr-auth-dialog.c:59
 #, c-format
 msgid ""
 "Please press the button to authorize %s and then come back to complete the "
@@ -114,30 +126,29 @@ msgstr ""
 "Lütfen %s'i yetkilendirmek için düğmeye basın ve işlemi tamamlamak için geri "
 "gelin."
 
-#: ../src/frogr-auth-dialog.c:63 ../src/frogr-auth-dialog.c:149
-#: ../src/frogr-controller.c:2373
+#: src/frogr-auth-dialog.c:63 src/frogr-auth-dialog.c:149
+#: src/frogr-controller.c:2286
 #, c-format
 msgid "Authorize %s"
 msgstr "%s'i Yetkilendir"
 
-#: ../src/frogr-auth-dialog.c:155 ../src/frogr-settings-dialog.c:963
+#: src/frogr-auth-dialog.c:155 src/frogr-settings-dialog.c:932
 msgid "_Close"
 msgstr "_Kapat"
 
-#. Description label
-#: ../src/frogr-auth-dialog.c:167
+#: src/frogr-auth-dialog.c:167
 msgid "Enter verification code:"
 msgstr "Doğrulama kodunu girin:"
 
-#: ../src/frogr-auth-dialog.c:221
+#: src/frogr-auth-dialog.c:221
 msgid "Invalid verification code"
 msgstr "Geçersiz doğrulama kodu"
 
-#: ../src/frogr-controller.c:597
+#: src/frogr-controller.c:581
 msgid "Process cancelled"
 msgstr "İşlem iptal edildi"
 
-#: ../src/frogr-controller.c:602
+#: src/frogr-controller.c:586
 msgid ""
 "Connection error:\n"
 "Network not available"
@@ -145,7 +156,7 @@ msgstr ""
 "Bağlantı hatası:\n"
 "Ağ kulanılabilir değil"
 
-#: ../src/frogr-controller.c:606
+#: src/frogr-controller.c:590
 msgid ""
 "Connection error:\n"
 "Bad request"
@@ -153,7 +164,7 @@ msgstr ""
 "Bağlantı hatası:\n"
 "Hatalı istek"
 
-#: ../src/frogr-controller.c:610
+#: src/frogr-controller.c:594
 msgid ""
 "Connection error:\n"
 "Server-side error"
@@ -161,7 +172,7 @@ msgstr ""
 "Bağlantı hatası:\n"
 "Sunucu taraflı hata"
 
-#: ../src/frogr-controller.c:614
+#: src/frogr-controller.c:598
 msgid ""
 "Error uploading:\n"
 "File invalid"
@@ -169,7 +180,7 @@ msgstr ""
 "Karşıya yüklenirken hata oluştu:\n"
 "Dosya geçersiz"
 
-#: ../src/frogr-controller.c:618
+#: src/frogr-controller.c:602
 msgid ""
 "Error uploading picture:\n"
 "Quota exceeded"
@@ -177,13 +188,13 @@ msgstr ""
 "Resim karşıya yüklenirken hata:\n"
 "Kota aşıldı"
 
-#: ../src/frogr-controller.c:623
+#: src/frogr-controller.c:607
 #, c-format
 msgid "Quota exceeded (limit: %d video per month)"
 msgid_plural "Quota exceeded (limit: %d videos per month)"
 msgstr[0] "Kota aşıldı (sınır: her ay %d video)"
 
-#: ../src/frogr-controller.c:627
+#: src/frogr-controller.c:611
 msgid ""
 "Error uploading video:\n"
 "You can't upload more videos with this account"
@@ -191,7 +202,7 @@ msgstr ""
 "Video yüklemede hata:\n"
 "Bu hesapla daha fazla video yükleyemezsiniz"
 
-#: ../src/frogr-controller.c:633
+#: src/frogr-controller.c:617
 msgid ""
 "Error:\n"
 "Photo not found"
@@ -199,7 +210,7 @@ msgstr ""
 "Hata:\n"
 "Fotoğraf bulunamadı"
 
-#: ../src/frogr-controller.c:637
+#: src/frogr-controller.c:621
 msgid ""
 "Error:\n"
 "Photo already in photoset"
@@ -207,7 +218,7 @@ msgstr ""
 "Hata:\n"
 "Fotoğraf zaten kümede"
 
-#: ../src/frogr-controller.c:641
+#: src/frogr-controller.c:625
 msgid ""
 "Error:\n"
 "Photo already in group"
@@ -215,7 +226,7 @@ msgstr ""
 "Hata:\n"
 "Fotoğraf zaten grupta"
 
-#: ../src/frogr-controller.c:645
+#: src/frogr-controller.c:629
 msgid ""
 "Error:\n"
 "Photo already in the maximum number of groups possible"
@@ -223,7 +234,7 @@ msgstr ""
 "Hata:\n"
 "Fotoğraf zaten mümkün olan en yüksek sayıda gruba dahil"
 
-#: ../src/frogr-controller.c:649
+#: src/frogr-controller.c:633
 msgid ""
 "Error:\n"
 "Group limit already reached"
@@ -231,7 +242,7 @@ msgstr ""
 "Hata:\n"
 "Grup sınırına çoktan ulaşıldı"
 
-#: ../src/frogr-controller.c:653
+#: src/frogr-controller.c:637
 msgid ""
 "Error:\n"
 "Photo added to group's queue"
@@ -239,7 +250,7 @@ msgstr ""
 "Hata:\n"
 "Fotoğraf, grup kuyruğuna eklendi"
 
-#: ../src/frogr-controller.c:657
+#: src/frogr-controller.c:641
 msgid ""
 "Error:\n"
 "Photo already added to group's queue"
@@ -247,7 +258,7 @@ msgstr ""
 "Hata:\n"
 "Fotoğraf, grup kuyruğuna zaten eklenmiş"
 
-#: ../src/frogr-controller.c:661
+#: src/frogr-controller.c:645
 msgid ""
 "Error:\n"
 "Content not allowed for this group"
@@ -255,8 +266,7 @@ msgstr ""
 "Hata:\n"
 "Bu grup için içeriğe izin verilmiyor"
 
-#: ../src/frogr-controller.c:665
-#, c-format
+#: src/frogr-controller.c:649
 msgid ""
 "Authorization failed.\n"
 "Please try again"
@@ -264,7 +274,7 @@ msgstr ""
 "Yetkilendirme başarısız oldu.\n"
 "Lütfen tekrar deneyin"
 
-#: ../src/frogr-controller.c:671
+#: src/frogr-controller.c:655
 #, c-format
 msgid ""
 "Error\n"
@@ -275,8 +285,7 @@ msgstr ""
 "%s Flickr'a resim yüklemek için uygun şekilde yetkilendirilmemiş.\n"
 "Lütfen tekrar yetkilendirin"
 
-#: ../src/frogr-controller.c:676
-#, c-format
+#: src/frogr-controller.c:660
 msgid ""
 "Unable to authenticate in Flickr\n"
 "Please try again."
@@ -284,7 +293,7 @@ msgstr ""
 "Flickr içinde yetkilendirililemedi\n"
 "Lütfen tekrar deneyin."
 
-#: ../src/frogr-controller.c:680
+#: src/frogr-controller.c:664
 #, c-format
 msgid ""
 "You have not properly authorized %s yet.\n"
@@ -293,8 +302,7 @@ msgstr ""
 "%s'i henüz uygun şekilde yetkilendirmediniz.\n"
 "Lütfen tekrar deneyin."
 
-#: ../src/frogr-controller.c:685
-#, c-format
+#: src/frogr-controller.c:669
 msgid ""
 "Invalid verification code.\n"
 "Please try again."
@@ -302,8 +310,7 @@ msgstr ""
 "Geçersiz doğrulama kodu.\n"
 "Lütfen tekrar deneyin."
 
-#: ../src/frogr-controller.c:689
-#, c-format
+#: src/frogr-controller.c:673
 msgid ""
 "Error:\n"
 "Service not available"
@@ -311,65 +318,62 @@ msgstr ""
 "Hata:\n"
 "Hizmet kullanılabilir değil."
 
-#. General error: just dump the raw error description
-#: ../src/frogr-controller.c:694
+#: src/frogr-controller.c:678
 #, c-format
 msgid "An error happened: %s."
 msgstr "Bir hata oluştu: %s."
 
-#: ../src/frogr-controller.c:910
+#: src/frogr-controller.c:883
 msgid "Authorization failed (timed out)"
 msgstr "Yetkilendirme başarısız oldu (zaman aşımı)"
 
-#: ../src/frogr-controller.c:962
+#: src/frogr-controller.c:931
 #, c-format
 msgid "Retrying Upload (attempt %d/%d)…"
 msgstr "Yükleme Tekrar Deneniyor (girişim  %d/%d)..."
 
-#: ../src/frogr-controller.c:967
+#: src/frogr-controller.c:936
 #, c-format
 msgid "Uploading '%s'…"
 msgstr "'%s' karşıya yükleniyor…"
 
-#: ../src/frogr-controller.c:2329
+#: src/frogr-controller.c:2242
 msgid "Updating credentials…"
 msgstr "Kimlik bilgileri güncelleniyor..."
 
-#: ../src/frogr-controller.c:2334
+#: src/frogr-controller.c:2247
 msgid "Retrieving data for authorization…"
 msgstr "Yetkilendirme için veri alınıyor..."
 
-#: ../src/frogr-controller.c:2339
+#: src/frogr-controller.c:2252
 msgid "Finishing authorization…"
 msgstr "Yetkilendirme sonlandırılıyor..."
 
-#: ../src/frogr-controller.c:2344
+#: src/frogr-controller.c:2257
 msgid "Retrieving list of sets…"
 msgstr "Küme listesi alınıyor..."
 
-#: ../src/frogr-controller.c:2349
+#: src/frogr-controller.c:2262
 msgid "Retrieving list of groups…"
 msgstr "Grup listesi alınıyor..."
 
-#: ../src/frogr-controller.c:2354
+#: src/frogr-controller.c:2267
 msgid "Retrieving list of tags…"
 msgstr "Etiket listesi alınıyor..."
 
-#: ../src/frogr-controller.c:2379
-#, c-format
-#| msgid "Set Geo_location Information"
+#: src/frogr-controller.c:2292
 msgid "Fetching information"
 msgstr "Bilgiler alınıyor"
 
-#: ../src/frogr-controller.c:2493
+#: src/frogr-controller.c:2398
 msgid "No sets found"
 msgstr "Küme bulunamadı"
 
-#: ../src/frogr-controller.c:2520
+#: src/frogr-controller.c:2423
 msgid "No groups found"
 msgstr "Grup bulunamadı"
 
-#: ../src/frogr-controller.c:3164
+#: src/frogr-controller.c:2984
 #, c-format
 msgid ""
 "You need to properly authorize %s before uploading any pictures to Flickr.\n"
@@ -379,188 +383,182 @@ msgstr ""
 "yetkilendirmelisiniz.\n"
 "Lütfen tekrar yetkilendirin."
 
-#: ../src/frogr-controller.c:3174
-#, c-format
+#: src/frogr-controller.c:2994
 msgid "You need to be connected before uploading any pictures to Flickr."
 msgstr "Flickr'a herhangi bir resim yüklemeden önce bağlanmış olmalısınız."
 
-#: ../src/frogr-controller.c:3192
-#| msgid "_Add Pictures"
+#: src/frogr-controller.c:3012
 msgid "Uploading Pictures"
 msgstr "Resimler Karşıya Yükleniyor"
 
-#: ../src/frogr-controller.c:3246
-#, c-format
+#: src/frogr-controller.c:3057
 msgid "Error opening project file"
 msgstr "Proje dosyası açılırken hata"
 
-#. This shows a dialog notifying the problem to the user
-#: ../src/frogr-create-new-set-dialog.c:156 ../src/frogr-details-dialog.c:1022
+#: src/frogr-create-new-set-dialog.c:143 src/frogr-details-dialog.c:1001
 msgid "Missing data required"
 msgstr "Gerekli bilgi eksik"
 
-#: ../src/frogr-create-new-set-dialog.c:345
+#: src/frogr-create-new-set-dialog.c:326
 msgid "Title:"
 msgstr "Başlık:"
 
-#: ../src/frogr-create-new-set-dialog.c:354
+#: src/frogr-create-new-set-dialog.c:335
 msgid "Description:"
 msgstr "Açıklama:"
 
-#: ../src/frogr-create-new-set-dialog.c:375
+#: src/frogr-create-new-set-dialog.c:356
 msgid "Fill Pictures Details with Title and Description"
 msgstr "Resim ayrıntılarını Başlık ve Açıklama ile doldur"
 
-#: ../src/frogr-create-new-set-dialog.c:400
+#: src/frogr-create-new-set-dialog.c:381
 msgid "Create New Set"
 msgstr "Yeni Küme Oluştur"
 
-#: ../src/frogr-details-dialog.c:91 ../src/frogr-settings-dialog.c:99
+#: src/frogr-details-dialog.c:89 src/frogr-settings-dialog.c:97
 msgid "Default (as specified in Flickr)"
 msgstr "Öntanımlı (Flickr'da belirtildiği gibi)"
 
-#: ../src/frogr-details-dialog.c:92 ../src/frogr-settings-dialog.c:100
+#: src/frogr-details-dialog.c:90 src/frogr-settings-dialog.c:98
 msgid "All rights reserved"
 msgstr "Tüm hakları saklıdır"
 
-#: ../src/frogr-details-dialog.c:93 ../src/frogr-settings-dialog.c:101
+#: src/frogr-details-dialog.c:91 src/frogr-settings-dialog.c:99
 msgid "CC Attribution-NonCommercial-ShareAlike"
 msgstr "CC Atıf-Gayriticari-LisansDevam"
 
-#: ../src/frogr-details-dialog.c:94 ../src/frogr-settings-dialog.c:102
+#: src/frogr-details-dialog.c:92 src/frogr-settings-dialog.c:100
 msgid "CC Attribution-NonCommercial"
 msgstr "CC Atıf-Gayriticari"
 
-#: ../src/frogr-details-dialog.c:95 ../src/frogr-settings-dialog.c:103
+#: src/frogr-details-dialog.c:93 src/frogr-settings-dialog.c:101
 msgid "CC Attribution-NonCommercial-NoDerivs"
 msgstr "CC Atıf-Gayriticari-Türetilemez"
 
-#: ../src/frogr-details-dialog.c:96 ../src/frogr-settings-dialog.c:104
+#: src/frogr-details-dialog.c:94 src/frogr-settings-dialog.c:102
 msgid "CC Attribution"
 msgstr "CC Atıf"
 
-#: ../src/frogr-details-dialog.c:97 ../src/frogr-settings-dialog.c:105
+#: src/frogr-details-dialog.c:95 src/frogr-settings-dialog.c:103
 msgid "CC Attribution-ShareAlike"
 msgstr "CC Atıf-LisansDevam"
 
-#: ../src/frogr-details-dialog.c:98 ../src/frogr-settings-dialog.c:106
+#: src/frogr-details-dialog.c:96 src/frogr-settings-dialog.c:104
 msgid "CC Attribution-NoDerivs"
 msgstr "CC Atıf-Türetilemez"
 
-#: ../src/frogr-details-dialog.c:178
+#: src/frogr-details-dialog.c:172
 msgid "Open with image viewer"
 msgstr "Resim görüntüleyici ile aç"
 
-#: ../src/frogr-details-dialog.c:196
+#: src/frogr-details-dialog.c:190
 msgid "_Title:"
 msgstr "_Başlık:"
 
-#: ../src/frogr-details-dialog.c:206
+#: src/frogr-details-dialog.c:200
 msgid "_Description:"
 msgstr "_Açıklama:"
 
-#: ../src/frogr-details-dialog.c:230
+#: src/frogr-details-dialog.c:224
 msgid "Ta_gs:"
 msgstr "Et_iketler:"
 
-#: ../src/frogr-details-dialog.c:253
+#: src/frogr-details-dialog.c:247
 msgid "Visibility"
 msgstr "Görünürlük"
 
-#: ../src/frogr-details-dialog.c:263 ../src/frogr-settings-dialog.c:201
+#: src/frogr-details-dialog.c:257 src/frogr-settings-dialog.c:196
 msgid "_Private"
 msgstr "_Özel"
 
-#: ../src/frogr-details-dialog.c:267 ../src/frogr-settings-dialog.c:204
+#: src/frogr-details-dialog.c:261 src/frogr-settings-dialog.c:199
 msgid "P_ublic"
 msgstr "_Genel"
 
-#: ../src/frogr-details-dialog.c:276 ../src/frogr-settings-dialog.c:212
+#: src/frogr-details-dialog.c:270 src/frogr-settings-dialog.c:207
 msgid "_Family"
 msgstr "_Aile"
 
-#: ../src/frogr-details-dialog.c:280 ../src/frogr-settings-dialog.c:214
+#: src/frogr-details-dialog.c:274 src/frogr-settings-dialog.c:209
 msgid "F_riends"
 msgstr "A_rkadaşlar"
 
-#: ../src/frogr-details-dialog.c:294
+#: src/frogr-details-dialog.c:288
 msgid "Content Type"
 msgstr "İçerik Türü"
 
-#: ../src/frogr-details-dialog.c:302 ../src/frogr-settings-dialog.c:239
+#: src/frogr-details-dialog.c:296 src/frogr-settings-dialog.c:234
 msgid "P_hoto"
 msgstr "F_otoğraf"
 
-#: ../src/frogr-details-dialog.c:306 ../src/frogr-settings-dialog.c:241
+#: src/frogr-details-dialog.c:300 src/frogr-settings-dialog.c:236
 msgid "Scree_nshot"
 msgstr "Ekra_n görüntüsü"
 
-#: ../src/frogr-details-dialog.c:310 ../src/frogr-settings-dialog.c:243
+#: src/frogr-details-dialog.c:304 src/frogr-settings-dialog.c:238
 msgid "Oth_er"
 msgstr "Diğ_er"
 
-#: ../src/frogr-details-dialog.c:323
+#: src/frogr-details-dialog.c:317
 msgid "Safety Level"
 msgstr "Güvenlik Düzeyi"
 
-#: ../src/frogr-details-dialog.c:331 ../src/frogr-settings-dialog.c:265
+#: src/frogr-details-dialog.c:325 src/frogr-settings-dialog.c:260
 msgid "S_afe"
 msgstr "G_üvenli"
 
-#: ../src/frogr-details-dialog.c:335 ../src/frogr-settings-dialog.c:267
+#: src/frogr-details-dialog.c:329 src/frogr-settings-dialog.c:262
 msgid "_Moderate"
 msgstr "_Orta"
 
-#: ../src/frogr-details-dialog.c:339 ../src/frogr-settings-dialog.c:269
+#: src/frogr-details-dialog.c:333 src/frogr-settings-dialog.c:264
 msgid "Restr_icted"
 msgstr "_Kısıtlı"
 
-#: ../src/frogr-details-dialog.c:351
+#: src/frogr-details-dialog.c:345
 msgid "License Type"
 msgstr "Lisans Türü"
 
-#: ../src/frogr-details-dialog.c:373
+#: src/frogr-details-dialog.c:367
 msgid "Other Properties"
 msgstr "Diğer Özellikler"
 
-#: ../src/frogr-details-dialog.c:381
+#: src/frogr-details-dialog.c:375
 msgid "_Show Up in Global Search Results"
 msgstr "Genel Arama Sonuçlarında _Görün"
 
-#: ../src/frogr-details-dialog.c:385
+#: src/frogr-details-dialog.c:379
 msgid "Set Geo_location Information"
 msgstr "Coğrafi _Konum Bilgisi Ayarla"
 
-#: ../src/frogr-details-dialog.c:389
+#: src/frogr-details-dialog.c:383
 msgid "Replace 'Date Posted' with 'Date Taken'"
 msgstr "'Gönderilen Tarihi' 'Çekilen Tarih' ile değiştir"
 
-#. Visually indicate how many pictures are being edited
-#: ../src/frogr-details-dialog.c:484
+#: src/frogr-details-dialog.c:475
 #, c-format
 msgid "(%d Picture)"
 msgid_plural "(%d Pictures)"
 msgstr[0] "(%d Resim)"
 
-#: ../src/frogr-details-dialog.c:558
+#: src/frogr-details-dialog.c:548
 msgid "An error happened trying to load the picture"
 msgstr "Resim yüklenirken hata oluştu"
 
-#: ../src/frogr-details-dialog.c:1196
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:8
+#: src/frogr-details-dialog.c:1169
 msgid "_Edit"
 msgstr "Düz_enle"
 
-#: ../src/frogr-details-dialog.c:1224
+#: src/frogr-details-dialog.c:1197
 msgid "Edit Picture Details"
 msgstr "Resim Ayrıntılarını Düzenle"
 
-#: ../src/frogr-file-loader.c:148
+#: src/frogr-file-loader.c:142
 #, c-format
 msgid "Loading files %d / %d"
 msgstr "Dosyalar yükleniyor %d / %d"
 
-#: ../src/frogr-file-loader.c:382
+#: src/frogr-file-loader.c:369
 #, c-format
 msgid ""
 "Unable to load picture %s:\n"
@@ -569,7 +567,7 @@ msgstr ""
 "Resim %s yüklenemedi:\n"
 "%s"
 
-#: ../src/frogr-file-loader.c:413
+#: src/frogr-file-loader.c:400
 #, c-format
 msgid ""
 "Unable to load video %s\n"
@@ -578,10 +576,7 @@ msgstr ""
 "Video %s yüklenemedi\n"
 "Lütfen doğru kodlayıcıyı yüklediğinizden emin olun"
 
-#. First %s is the title of the picture (filename of the file by
-#. default). Second %s is the max allowed size for a picture to be
-#. uploaded to flickr (different for free and PRO accounts).
-#: ../src/frogr-file-loader.c:654
+#: src/frogr-file-loader.c:636
 #, c-format
 msgid ""
 "Can't load file %s:\n"
@@ -590,369 +585,303 @@ msgstr ""
 "Dosya %s yüklenemiyor:\n"
 "Dosya boyutu bu hesap için izin verilenden büyük (%s)"
 
-#. First create the left side buttons
-#: ../src/frogr-main-view.c:642 ../src/frogr-main-view.c:744
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
 msgid "Open"
 msgstr "Aç"
 
-#: ../src/frogr-main-view.c:642 ../src/frogr-main-view.c:744
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
 msgid "Open Existing Project"
 msgstr "Mevcut Projeyi Aç"
 
-#: ../src/frogr-main-view.c:643 ../src/frogr-main-view.c:747
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
 msgid "Add"
 msgstr "Ekle"
 
-#: ../src/frogr-main-view.c:643 ../src/frogr-main-view.c:747
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
 msgid "Add Elements"
 msgstr "Öğeler Ekle"
 
-#: ../src/frogr-main-view.c:644 ../src/frogr-main-view.c:748
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
 msgid "Remove"
 msgstr "Çıkar"
 
-#: ../src/frogr-main-view.c:644 ../src/frogr-main-view.c:748
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
 msgid "Remove Elements"
 msgstr "Öğeleri Kaldır"
 
-#: ../src/frogr-main-view.c:645 ../src/frogr-main-view.c:750
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
 msgid "Upload"
 msgstr "Karşıya Yükle"
 
-#: ../src/frogr-main-view.c:645 ../src/frogr-main-view.c:750
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
 msgid "Upload All"
 msgstr "Tümünü Karşıya Yükle"
 
-#. Save project item
-#: ../src/frogr-main-view.c:678 ../src/frogr-main-view.c:745
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
 msgid "Save"
 msgstr "Kaydet"
 
-#: ../src/frogr-main-view.c:678 ../src/frogr-main-view.c:745
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
 msgid "Save Current Project"
 msgstr "Mevcut Projeyi Kaydet"
 
-#: ../src/frogr-main-view.c:1050 ../data/gtkbuilder/frogr-app-menu.xml.h:4
+#: src/frogr-main-view.c:1016
 msgid "_About"
 msgstr "_Hakkında"
 
-#: ../src/frogr-main-view.c:1054 ../data/gtkbuilder/frogr-app-menu.xml.h:5
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:17
+#: src/frogr-main-view.c:1020
 msgid "_Quit"
 msgstr "_Kapat"
 
-#. Create the submenu and insert it in the right section
-#: ../src/frogr-main-view.c:1107
+#: src/frogr-main-view.c:1070
 msgid "Accounts"
 msgstr "Hesaplar"
 
-#. String showind the date and time a picture was taken
-#: ../src/frogr-main-view.c:1459
+#: src/frogr-main-view.c:1410
 #, c-format
 msgid "Taken: %s"
 msgstr "Çekildi: %s"
 
-#: ../src/frogr-main-view.c:1464
+#: src/frogr-main-view.c:1415
 #, c-format
 msgid "File size: %s"
 msgstr "Dosya boyutu: %s"
 
-#: ../src/frogr-main-view.c:1597
+#: src/frogr-main-view.c:1540
 msgid "Select File"
 msgstr "Dosya Seç"
 
-#: ../src/frogr-main-view.c:1601 ../src/frogr-main-view.c:1732
+#: src/frogr-main-view.c:1544 src/frogr-main-view.c:1671
 msgid "_Open"
 msgstr "_Aç"
 
-#: ../src/frogr-main-view.c:1610
+#: src/frogr-main-view.c:1553
 msgid "Frogr Project Files"
 msgstr "Frogr Proje Dosyaları"
 
-#: ../src/frogr-main-view.c:1676
+#: src/frogr-main-view.c:1615
 msgid "Select Destination"
 msgstr "Hedef Seçin"
 
-#: ../src/frogr-main-view.c:1680 ../data/gtkbuilder/frogr-menu-bar.xml.h:3
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:1
+#: src/frogr-main-view.c:1619
 msgid "_Save"
 msgstr "_Kaydet"
 
-#: ../src/frogr-main-view.c:1683
+#: src/frogr-main-view.c:1622
 msgid "Untitled Project.frogr"
 msgstr "Başlıksız Proje.frogr"
 
-#: ../src/frogr-main-view.c:1728
+#: src/frogr-main-view.c:1667
 msgid "Select a Picture"
 msgstr "Bir Resim Seçin"
 
-#: ../src/frogr-main-view.c:1755
+#: src/frogr-main-view.c:1694
 msgid "All Files"
 msgstr "Tüm Dosyalar"
 
-#: ../src/frogr-main-view.c:1758
+#: src/frogr-main-view.c:1697
 msgid "Image Files"
 msgstr "Görüntü Dosyaları"
 
-#: ../src/frogr-main-view.c:1762
+#: src/frogr-main-view.c:1701
 msgid "Video Files"
 msgstr "Video Dosyaları"
 
-#: ../src/frogr-main-view.c:1786
+#: src/frogr-main-view.c:1723
 msgid "You don't have any picture added yet"
 msgstr "Henüz eklenmiş resminiz yok"
 
-#: ../src/frogr-main-view.c:1801
+#: src/frogr-main-view.c:1736
 msgid "You need to select some pictures first"
 msgstr "İlk önce bazı resimler seçmelisiniz"
 
-#: ../src/frogr-main-view.c:2265
+#: src/frogr-main-view.c:2108
 msgid "Not connected to Flickr"
 msgstr "Flickr'a bağlı değil"
 
-#. Login string, showing the user is PRO (second '%s') if so.
-#: ../src/frogr-main-view.c:2275
+#: src/frogr-main-view.c:2118
 #, c-format
 msgid "Connected as %s%s"
 msgstr "%s%s olarak bağlanıldı"
 
-#: ../src/frogr-main-view.c:2276
+#: src/frogr-main-view.c:2119
 msgid " (PRO account)"
 msgstr "(PRO hesap)"
 
-#. Will show in the status bar the amount of data (in KB, MB
-#. or GB) the user is currently allowed to upload to flicker
-#. till the end of the month, in a CURRENT / MAX fashion.
-#. The '-' at the beginning is just a separator, since more
-#. blocks of text will be shown in the status bar too.
-#: ../src/frogr-main-view.c:2300
+#: src/frogr-main-view.c:2143
 #, c-format
 msgid " - %s / %s remaining"
 msgstr " - %s / %s kaldı"
 
-#. Will show in the status bar the amount of pictures and data
-#. (in KB, MB or GB) that would be uploaded as the sum of the
-#. sizes for every picture loaded in the application
-#: ../src/frogr-main-view.c:2326
+#: src/frogr-main-view.c:2169
 #, c-format
 msgid " - %d file to upload (%s)"
 msgid_plural " - %d files to upload (%s)"
 msgstr[0] " - yüklenecek %d dosya (%s)"
 
-#: ../src/frogr-settings-dialog.c:190
+#: src/frogr-settings-dialog.c:185
 msgid "Default Visibility"
 msgstr "Öntanımlı Görünürlük"
 
-#: ../src/frogr-settings-dialog.c:229
+#: src/frogr-settings-dialog.c:224
 msgid "Default Content Type"
 msgstr "Öntanımlı İçerik Türü"
 
-#: ../src/frogr-settings-dialog.c:255
+#: src/frogr-settings-dialog.c:250
 msgid "Default Safety Level"
 msgstr "Öntanımlı Güvenlik Düzeyi"
 
-#: ../src/frogr-settings-dialog.c:281
+#: src/frogr-settings-dialog.c:276
 msgid "Default License"
 msgstr "Öntanımlı Lisans"
 
-#: ../src/frogr-settings-dialog.c:307
+#: src/frogr-settings-dialog.c:302
 msgid "Other Defaults"
 msgstr "Diğer Öntanımlılar"
 
-#: ../src/frogr-settings-dialog.c:317
+#: src/frogr-settings-dialog.c:312
 msgid "_Show Pictures in Global Search Results"
 msgstr "_Resimleri Genel Arama Sonuçlarında Göster"
 
-#: ../src/frogr-settings-dialog.c:320
+#: src/frogr-settings-dialog.c:315
 msgid "Set Geo_location Information for Pictures"
 msgstr "Resimler için Coğrafi _Konum Bilgisini Ayarla"
 
-#: ../src/frogr-settings-dialog.c:323
+#: src/frogr-settings-dialog.c:318
 msgid "Replace 'Date Posted' with 'Date Taken' for Pictures"
 msgstr "Resimler için 'Gönderim Tarihi'ni 'Çekilen Tarih' ile değiştir"
 
-#: ../src/frogr-settings-dialog.c:329
+#: src/frogr-settings-dialog.c:324
 msgid "_General"
 msgstr "_Genel"
 
-#: ../src/frogr-settings-dialog.c:352
+#: src/frogr-settings-dialog.c:344
 msgid "Proxy Settings"
 msgstr "Vekil Sunucu Ayarları"
 
-#. Enable proxy
-#: ../src/frogr-settings-dialog.c:361
+#: src/frogr-settings-dialog.c:353
 msgid "_Enable HTTP Proxy"
 msgstr "HTTP Vekili _Etkinleştir"
 
-#: ../src/frogr-settings-dialog.c:371
+#: src/frogr-settings-dialog.c:363
 msgid "_Host:"
 msgstr "_Ana makine:"
 
-#. Proxy port
-#: ../src/frogr-settings-dialog.c:384
+#: src/frogr-settings-dialog.c:376
 msgid "_Port:"
 msgstr "_Port:"
 
-#. Proxy username
-#: ../src/frogr-settings-dialog.c:397
+#: src/frogr-settings-dialog.c:389
 msgid "U_sername:"
 msgstr "_Kullanıcı adı:"
 
-#. Proxy password
-#: ../src/frogr-settings-dialog.c:410
+#: src/frogr-settings-dialog.c:402
 msgid "Pass_word:"
 msgstr "Par_ola:"
 
-#: ../src/frogr-settings-dialog.c:434
+#: src/frogr-settings-dialog.c:426
 msgid "Connec_tion"
 msgstr "Bağlan_tı"
 
-#: ../src/frogr-settings-dialog.c:455
+#: src/frogr-settings-dialog.c:444
 msgid "Other options"
 msgstr "Diğer seçenekler"
 
-#: ../src/frogr-settings-dialog.c:465
+#: src/frogr-settings-dialog.c:454
 msgid "Ena_ble Tags Auto-Completion"
 msgstr "Etiket Otomatik Tamamlamayı Etki_nleştir"
 
-#: ../src/frogr-settings-dialog.c:468
+#: src/frogr-settings-dialog.c:457
 msgid "_Import Tags from Pictures Metadata"
 msgstr "Etiketleri Resim Metadata'sından _İçe Aktar"
 
-#: ../src/frogr-settings-dialog.c:472
+#: src/frogr-settings-dialog.c:461
 msgid "Use _Dark GTK Theme"
 msgstr "_Karanlık GTK Teması Kullan"
 
-#: ../src/frogr-settings-dialog.c:476
+#: src/frogr-settings-dialog.c:465
 msgid "_Keep File Extensions in Titles when Loading"
 msgstr "Yüklenirken Dosya Uzantılarını Başlıklarda _Tut"
 
-#: ../src/frogr-settings-dialog.c:482
+#: src/frogr-settings-dialog.c:471
 msgid "_Misc"
 msgstr "_Çeşitli"
 
-#: ../src/frogr-settings-dialog.c:1003
+#: src/frogr-settings-dialog.c:972
 msgid "Preferences"
 msgstr "Tercihler"
 
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:1
-msgid "Aut_horize Account…"
-msgstr "Hesabı Yetki_lendir..."
-
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:2
-msgid "_Preferences…"
-msgstr "_Tercihler..."
-
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:3
-msgid "_Help"
-msgstr "_Yardım"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:1
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:9
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:3
-msgid "_Edit Details…"
-msgstr "Ayrıntıları _Düzenle…"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:2
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:10
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:4
-msgid "Add _Tags…"
-msgstr "E_tiket Ekle..."
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:3
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:11
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:5
-msgid "Add to _Group…"
-msgstr "_Gruba Ekle..."
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:4
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:12
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:6
-msgid "Add to _Photoset"
-msgstr "Fotoğraf kümesine _Ekle"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:5
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:13
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:7
-msgid "_Add to Existing Photoset…"
-msgstr "_Mevcut Fotoğraf Kümesine Ekle..."
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:6
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:14
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:8
-msgid "_Create New Photoset…"
-msgstr "Yeni Fotoğraf Kümesi _Oluştur..."
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:7
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:15
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:16
-msgid "_Open in External Viewer"
-msgstr "Harici Görüntüleyicide _Aç"
-
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:8
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:6
-msgid "_Remove Elements"
-msgstr "Öğeleri _Kaldır"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:1
-msgid "_File"
-msgstr "_Dosya"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:2
-msgid "_Open…"
-msgstr "_Aç..."
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:4
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:2
-msgid "Save _As…"
-msgstr "F_arklı Kaydet…"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:5
-msgid "A_dd Elements…"
-msgstr "Öğeler _Ekle..."
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:7
-msgid "_Upload All"
-msgstr "T_ümünü Karşıya Yükle"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:16
-msgid "_View"
-msgstr "_Görünüm"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:17
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:9
-msgid "_Sort Elements"
-msgstr "Öğeleri _Sırala"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:18
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:10
-msgid "As _Loaded"
-msgstr "_Yüklemeye Göre"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:19
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:11
-msgid "By _Date Taken"
-msgstr "Çekildiği _Tarihe Göre"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:20
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:12
-msgid "By _Title"
-msgstr "_Başlığa Göre"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:21
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:13
-msgid "By _Size"
-msgstr "Bo_yuta Göre"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:22
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:14
-msgid "_Reversed Order"
-msgstr "Te_rs Sırada"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:23
-#: ../data/gtkbuilder/frogr-menu-button.xml.h:15
-msgid "Enable _Tooltips"
-msgstr "_İpuçlarını Etkinleştir"
+#~ msgid "Aut_horize Account…"
+#~ msgstr "Hesabı Yetki_lendir..."
+
+#~ msgid "_Preferences…"
+#~ msgstr "_Tercihler..."
+
+#~ msgid "_Help"
+#~ msgstr "_Yardım"
+
+#~ msgid "_Edit Details…"
+#~ msgstr "Ayrıntıları _Düzenle…"
+
+#~ msgid "Add _Tags…"
+#~ msgstr "E_tiket Ekle..."
+
+#~ msgid "Add to _Group…"
+#~ msgstr "_Gruba Ekle..."
+
+#~ msgid "Add to _Photoset"
+#~ msgstr "Fotoğraf kümesine _Ekle"
+
+#~ msgid "_Add to Existing Photoset…"
+#~ msgstr "_Mevcut Fotoğraf Kümesine Ekle..."
+
+#~ msgid "_Create New Photoset…"
+#~ msgstr "Yeni Fotoğraf Kümesi _Oluştur..."
+
+#~ msgid "_Open in External Viewer"
+#~ msgstr "Harici Görüntüleyicide _Aç"
+
+#~ msgid "_Remove Elements"
+#~ msgstr "Öğeleri _Kaldır"
+
+#~ msgid "_File"
+#~ msgstr "_Dosya"
+
+#~ msgid "_Open…"
+#~ msgstr "_Aç..."
+
+#~ msgid "Save _As…"
+#~ msgstr "F_arklı Kaydet…"
+
+#~ msgid "A_dd Elements…"
+#~ msgstr "Öğeler _Ekle..."
+
+#~ msgid "_Upload All"
+#~ msgstr "T_ümünü Karşıya Yükle"
+
+#~ msgid "_View"
+#~ msgstr "_Görünüm"
+
+#~ msgid "_Sort Elements"
+#~ msgstr "Öğeleri _Sırala"
+
+#~ msgid "As _Loaded"
+#~ msgstr "_Yüklemeye Göre"
+
+#~ msgid "By _Date Taken"
+#~ msgstr "Çekildiği _Tarihe Göre"
+
+#~ msgid "By _Title"
+#~ msgstr "_Başlığa Göre"
+
+#~ msgid "By _Size"
+#~ msgstr "Bo_yuta Göre"
+
+#~ msgid "_Reversed Order"
+#~ msgstr "Te_rs Sırada"
+
+#~ msgid "Enable _Tooltips"
+#~ msgstr "_İpuçlarını Etkinleştir"
 
 #~ msgid "Flickr Remote Organizer"
 #~ msgstr "Flickr Uzaktan Düzenleyicisi"
diff --git a/po/uk.po b/po/uk.po
index 6814c24..d5105f2 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: frogr master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-28 23:09+0300\n"
+"Report-Msgid-Bugs-To: msanchez gnome org\n"
+"POT-Creation-Date: 2016-08-12 13:09+0100\n"
 "PO-Revision-Date: 2011-07-28 23:32+0300\n"
 "Last-Translator: Korostil Daniel <ted korostiled gmail com>\n"
 "Language-Team: translation linux org ua\n"
@@ -15,83 +15,133 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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"
 "X-Generator: Virtaal 0.6.1\n"
 
-#: ../data/frogr.desktop.in.in.h:1
-msgid "Flickr Remote Organizer"
-msgstr "Віддалений упорядник Flickr"
+#: data/frogr.appdata.xml.in:5 data/frogr.desktop.in.in:5
+#: data/frogr.desktop.in.in:14
+msgid "frogr"
+msgstr "frogr"
 
-#: ../data/frogr.desktop.in.in.h:2
-msgid "Frogr: a Flickr Remote Organizer for GNOME"
+#: data/frogr.appdata.xml.in:6 data/frogr.desktop.in.in:6
+#, fuzzy
+msgid "frogr: a Flickr Remote Organizer for GNOME"
 msgstr "Frogr: віддалений упорядник Flickr для середовища GNOME"
 
-#: ../data/frogr.desktop.in.in.h:3
+#: data/frogr.appdata.xml.in:8
+msgid ""
+"frogr is a small application for the GNOME desktop that allows users to "
+"manage their accounts in the Flickr image hosting website."
+msgstr ""
+
+#: data/frogr.appdata.xml.in:13
+msgid ""
+"It supports all the basic Flickr features, including uploading pictures, "
+"adding descriptions, setting tags and managing sets and groups pools."
+msgstr ""
+
+#: data/frogr.appdata.xml.in:24
+#, fuzzy
+msgid "Screenshot of frogr"
+msgstr "_Знімок екрана"
+
+#: data/frogr.appdata.xml.in:29
+msgid "Mario Sanchez Prada"
+msgstr ""
+
+#: data/frogr.desktop.in.in:7
 msgid "Upload and organize photos in Flickr accounts"
 msgstr "Вивантаження й упорядкування фотографій у Flickr"
 
-#: ../src/frogr-about-dialog.c:43
-msgid "A Flickr remote organizer for GNOME\n"
+#: data/frogr.desktop.in.in:8
+msgid "Flickr;Image;Picture;Photo;Video;Uploader;"
+msgstr ""
+
+#: src/frogr-about-dialog.c:43
+#, fuzzy
+msgid "A Flickr Remote Organizer for GNOME\n"
 msgstr "Віддалений упорядник Flickr для середовища GNOME\n"
 
-#: ../src/frogr-about-dialog.c:115
+#: src/frogr-about-dialog.c:72
 msgid "translator-credits"
 msgstr ""
 "Sergiy Gavrylov <sergiovana bigmir net>\n"
 "Daniel Korostil <ted korostiled gmail com>"
 
-#: ../src/frogr-add-tags-dialog.c:337
+#: src/frogr-add-tags-dialog.c:191 src/frogr-add-to-group-dialog.c:528
+#: src/frogr-add-to-set-dialog.c:529 src/frogr-auth-dialog.c:153
+#: src/frogr-create-new-set-dialog.c:310 src/frogr-details-dialog.c:1168
+#: src/frogr-main-view.c:1543 src/frogr-main-view.c:1618
+#: src/frogr-main-view.c:1670 src/frogr-settings-dialog.c:930
+msgid "_Cancel"
+msgstr ""
+
+#: src/frogr-add-tags-dialog.c:193 src/frogr-add-to-group-dialog.c:530
+#: src/frogr-add-to-set-dialog.c:531 src/frogr-create-new-set-dialog.c:312
+msgid "_Add"
+msgstr ""
+
+#: src/frogr-add-tags-dialog.c:202
 msgid "Enter a spaces separated list of tags:"
 msgstr "Введіть розділений пробілами перелік міток:"
 
-#: ../src/frogr-add-tags-dialog.c:381
+#: src/frogr-add-tags-dialog.c:228
 msgid "Add Tags"
 msgstr "Додати мітки"
 
-#: ../src/frogr-add-to-set-dialog.c:131
-msgid "Title"
+#: src/frogr-add-to-group-dialog.c:147
+msgid "Name"
 msgstr "Назва"
 
-#: ../src/frogr-add-to-set-dialog.c:146 ../src/frogr-add-to-group-dialog.c:146
+#: src/frogr-add-to-group-dialog.c:162 src/frogr-add-to-set-dialog.c:163
 msgid "Elements"
 msgstr "Елементи"
 
-#: ../src/frogr-add-to-set-dialog.c:568
-msgid "Add to Sets"
-msgstr "Додати до альбомів"
+#: src/frogr-add-to-group-dialog.c:581
+msgid "Add to Groups"
+msgstr "Додати до груп"
 
-#: ../src/frogr-add-to-group-dialog.c:131
-msgid "Name"
+#: src/frogr-add-to-set-dialog.c:148
+msgid "Title"
 msgstr "Назва"
 
-#: ../src/frogr-add-to-group-dialog.c:568
-msgid "Add to Groups"
-msgstr "Додати до груп"
+#: src/frogr-add-to-set-dialog.c:582
+msgid "Add to Sets"
+msgstr "Додати до альбомів"
 
-#: ../src/frogr-auth-dialog.c:30
-#, c-format
+#: src/frogr-auth-dialog.c:59
+#, fuzzy, c-format
 msgid ""
-"Please press the button to authorize %s and then come back to this screen to "
-"complete the process."
+"Please press the button to authorize %s and then come back to complete the "
+"process."
 msgstr ""
 "Натисніть цю кнопку, щоб авторизувати %s, потім поверніться до цього вікна, "
 "щоб продовжити процес."
 
-#: ../src/frogr-auth-dialog.c:34
-#, c-format
-msgid ""
-"Press the button to start using %s once you've authorized it in your flickr "
-"account."
+#: src/frogr-auth-dialog.c:63 src/frogr-auth-dialog.c:149
+#: src/frogr-controller.c:2286
+#, fuzzy, c-format
+msgid "Authorize %s"
+msgstr "Авторизувати _frogr"
+
+#: src/frogr-auth-dialog.c:155 src/frogr-settings-dialog.c:932
+msgid "_Close"
 msgstr ""
-"Натисніть цю кнопку, щоб почати роботу з %s, як тільки авторизуєте її у "
-"своєму обліковому записі flickr."
 
-#: ../src/frogr-controller.c:264
+#: src/frogr-auth-dialog.c:167
+msgid "Enter verification code:"
+msgstr ""
+
+#: src/frogr-auth-dialog.c:221
+msgid "Invalid verification code"
+msgstr ""
+
+#: src/frogr-controller.c:581
 msgid "Process cancelled"
 msgstr "Процес скасовано"
 
-#: ../src/frogr-controller.c:269
+#: src/frogr-controller.c:586
 msgid ""
 "Connection error:\n"
 "Network not available"
@@ -99,7 +149,7 @@ msgstr ""
 "Помилка з'єднання:\n"
 "Мережа недоступна"
 
-#: ../src/frogr-controller.c:274
+#: src/frogr-controller.c:590
 msgid ""
 "Connection error:\n"
 "Bad request"
@@ -107,7 +157,7 @@ msgstr ""
 "Помилка з'єднання:\n"
 "Неправильний запит"
 
-#: ../src/frogr-controller.c:279
+#: src/frogr-controller.c:594
 msgid ""
 "Connection error:\n"
 "Server-side error"
@@ -115,15 +165,16 @@ msgstr ""
 "Помилка з'єднання:\n"
 "Помилка сервера"
 
-#: ../src/frogr-controller.c:284
+#: src/frogr-controller.c:598
+#, fuzzy
 msgid ""
-"Error uploading picture:\n"
+"Error uploading:\n"
 "File invalid"
 msgstr ""
 "Помилка вивантаження зображення:\n"
 "Помилковий файл"
 
-#: ../src/frogr-controller.c:289
+#: src/frogr-controller.c:602
 msgid ""
 "Error uploading picture:\n"
 "Quota exceeded"
@@ -131,7 +182,21 @@ msgstr ""
 "Помилка вивантаження зображення:\n"
 "Ліміт перевищено"
 
-#: ../src/frogr-controller.c:294
+#: src/frogr-controller.c:607
+#, c-format
+msgid "Quota exceeded (limit: %d video per month)"
+msgid_plural "Quota exceeded (limit: %d videos per month)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/frogr-controller.c:611
+msgid ""
+"Error uploading video:\n"
+"You can't upload more videos with this account"
+msgstr ""
+
+#: src/frogr-controller.c:617
 msgid ""
 "Error:\n"
 "Photo not found"
@@ -139,7 +204,7 @@ msgstr ""
 "Помилка:\n"
 "Фотографію не знайдено"
 
-#: ../src/frogr-controller.c:299
+#: src/frogr-controller.c:621
 msgid ""
 "Error:\n"
 "Photo already in photoset"
@@ -147,7 +212,7 @@ msgstr ""
 "Помилка:\n"
 "Фотографія вже є в альбомі"
 
-#: ../src/frogr-controller.c:304
+#: src/frogr-controller.c:625
 msgid ""
 "Error:\n"
 "Photo already in group"
@@ -155,7 +220,7 @@ msgstr ""
 "Помилка:\n"
 "Фотографія вже є в групі"
 
-#: ../src/frogr-controller.c:309
+#: src/frogr-controller.c:629
 msgid ""
 "Error:\n"
 "Photo already in the maximum number of groups possible"
@@ -163,7 +228,7 @@ msgstr ""
 "Помилка:\n"
 "Фотографія вже є в максимальному числі груп"
 
-#: ../src/frogr-controller.c:314
+#: src/frogr-controller.c:633
 msgid ""
 "Error:\n"
 "Group limit already reached"
@@ -171,7 +236,7 @@ msgstr ""
 "Помилка:\n"
 "Ліміт групи вже перевищено"
 
-#: ../src/frogr-controller.c:319
+#: src/frogr-controller.c:637
 msgid ""
 "Error:\n"
 "Photo added to group's queue"
@@ -179,7 +244,7 @@ msgstr ""
 "Помилка:\n"
 "Фотографія додано до черги групи"
 
-#: ../src/frogr-controller.c:324
+#: src/frogr-controller.c:641
 msgid ""
 "Error:\n"
 "Photo already added to group's queue"
@@ -187,7 +252,7 @@ msgstr ""
 "Помилка:\n"
 "Фотографія вже додана до черги групи"
 
-#: ../src/frogr-controller.c:329
+#: src/frogr-controller.c:645
 msgid ""
 "Error:\n"
 "Content not allowed for this group"
@@ -195,8 +260,7 @@ msgstr ""
 "Помилка:\n"
 "Вміст не дозволений для цієї групи"
 
-#: ../src/frogr-controller.c:334
-#, c-format
+#: src/frogr-controller.c:649
 msgid ""
 "Authorization failed.\n"
 "Please try again"
@@ -204,19 +268,45 @@ msgstr ""
 "Авторизація невдала.\n"
 "Спробуйте ще раз"
 
-#: ../src/frogr-controller.c:340
-#, c-format
+#: src/frogr-controller.c:655
+#, fuzzy, c-format
 msgid ""
 "Error\n"
-"%s is not properly authorized to upload pictures to flickr.\n"
+"%s is not properly authorized to upload pictures to Flickr.\n"
 "Please re-authorize it"
 msgstr ""
 "Помилка\n"
 "%s неправильно авторизована для вивантаження фотографія на flickr.\n"
 "Авторизуйте її знову"
 
-#: ../src/frogr-controller.c:346
-#, c-format
+#: src/frogr-controller.c:660
+#, fuzzy
+msgid ""
+"Unable to authenticate in Flickr\n"
+"Please try again."
+msgstr ""
+"Авторизація невдала.\n"
+"Спробуйте ще раз"
+
+#: src/frogr-controller.c:664
+#, fuzzy, c-format
+msgid ""
+"You have not properly authorized %s yet.\n"
+"Please try again."
+msgstr ""
+"Потрібно правильно авторизувати %s перед вивантаженням зображень на flickr.\n"
+"Авторизуйте її знову."
+
+#: src/frogr-controller.c:669
+#, fuzzy
+msgid ""
+"Invalid verification code.\n"
+"Please try again."
+msgstr ""
+"Авторизація невдала.\n"
+"Спробуйте ще раз"
+
+#: src/frogr-controller.c:673
 msgid ""
 "Error:\n"
 "Service not available"
@@ -224,204 +314,240 @@ msgstr ""
 "Помилка:\n"
 "Служба недоступна"
 
-#. General error: just dump the raw error description
-#: ../src/frogr-controller.c:352
-#, c-format
-msgid "An error happened while uploading a picture: %s."
+#: src/frogr-controller.c:678
+#, fuzzy, c-format
+msgid "An error happened: %s."
 msgstr "Під час вивантаження зображення виникла помилка: %s."
 
-#: ../src/frogr-controller.c:506
-msgid ""
-"Authorization failed (timed out)\n"
-"Please try again"
+#: src/frogr-controller.c:883
+#, fuzzy
+msgid "Authorization failed (timed out)"
 msgstr ""
 "Не вдалось авторизуватись (вичерпався час)\n"
 "Спробуйте ще раз"
 
-#: ../src/frogr-controller.c:1010
-msgid "Setting license for picture…"
-msgstr "Налаштування ліцензії для малюнка…"
-
-#: ../src/frogr-controller.c:1033
-msgid "Creating new photosets…"
-msgstr "Створення нових альбомів…"
+#: src/frogr-controller.c:931
+#, c-format
+msgid "Retrying Upload (attempt %d/%d)…"
+msgstr ""
 
-#: ../src/frogr-controller.c:1057
-msgid "Adding picture to photosets…"
-msgstr "Додавання зображення до альбомів…"
+#: src/frogr-controller.c:936
+#, c-format
+msgid "Uploading '%s'…"
+msgstr "Вивантаження «%s»…"
 
-#: ../src/frogr-controller.c:1079
-msgid "Adding picture to groups…"
-msgstr "Додавання зображення до груп…"
+#: src/frogr-controller.c:2242
+msgid "Updating credentials…"
+msgstr ""
 
-#: ../src/frogr-controller.c:1572
+#: src/frogr-controller.c:2247
 msgid "Retrieving data for authorization…"
 msgstr "Одержання даних для авторизації…"
 
-#: ../src/frogr-controller.c:1577
+#: src/frogr-controller.c:2252
 msgid "Finishing authorization…"
 msgstr "Завершення авторизації…"
 
-#: ../src/frogr-controller.c:1582
+#: src/frogr-controller.c:2257
 msgid "Retrieving list of sets…"
 msgstr "Пошук переліку альбомів…"
 
-#: ../src/frogr-controller.c:1587
+#: src/frogr-controller.c:2262
 msgid "Retrieving list of groups…"
 msgstr "Пошук переліку груп…"
 
-#: ../src/frogr-controller.c:1592
+#: src/frogr-controller.c:2267
 msgid "Retrieving list of tags…"
 msgstr "Пошук переліку міток…"
 
-#: ../src/frogr-controller.c:1728
+#: src/frogr-controller.c:2292
+msgid "Fetching information"
+msgstr ""
+
+#: src/frogr-controller.c:2398
 msgid "No sets found"
 msgstr "Альбомів не знайдено"
 
-#: ../src/frogr-controller.c:1760
+#: src/frogr-controller.c:2423
 msgid "No groups found"
 msgstr "Груп не знайдено"
 
-#: ../src/frogr-controller.c:2434
-#, c-format
+#: src/frogr-controller.c:2984
+#, fuzzy, c-format
 msgid ""
-"You need to properly authorize %s before uploading any pictures to flickr.\n"
+"You need to properly authorize %s before uploading any pictures to Flickr.\n"
 "Please re-authorize it."
 msgstr ""
 "Потрібно правильно авторизувати %s перед вивантаженням зображень на flickr.\n"
 "Авторизуйте її знову."
 
-#. This shows a dialog notifying the problem to the user
-#: ../src/frogr-create-new-set-dialog.c:134 ../src/frogr-details-dialog.c:1148
+#: src/frogr-controller.c:2994
+#, fuzzy
+msgid "You need to be connected before uploading any pictures to Flickr."
+msgstr ""
+"Потрібно правильно авторизувати %s перед вивантаженням зображень на flickr.\n"
+"Авторизуйте її знову."
+
+#: src/frogr-controller.c:3012
+#, fuzzy
+msgid "Uploading Pictures"
+msgstr "Завантаження зображень %d / %d"
+
+#: src/frogr-controller.c:3057
+msgid "Error opening project file"
+msgstr ""
+
+#: src/frogr-create-new-set-dialog.c:143 src/frogr-details-dialog.c:1001
 msgid "Missing data required"
 msgstr "Немає потрібних даних"
 
-#: ../src/frogr-create-new-set-dialog.c:321
-msgid "Set's title:"
-msgstr "Назва альбому:"
+#: src/frogr-create-new-set-dialog.c:326
+#, fuzzy
+msgid "Title:"
+msgstr "_Назва:"
 
-#: ../src/frogr-create-new-set-dialog.c:334
-msgid "Set's description:"
-msgstr "Опис альбому:"
+#: src/frogr-create-new-set-dialog.c:335
+#, fuzzy
+msgid "Description:"
+msgstr "_Опис:"
 
-#: ../src/frogr-create-new-set-dialog.c:357
-msgid "Fill pictures details with title and description"
+#: src/frogr-create-new-set-dialog.c:356
+#, fuzzy
+msgid "Fill Pictures Details with Title and Description"
 msgstr "Заповнити подробиці фотографій з назвою й описом"
 
-#: ../src/frogr-create-new-set-dialog.c:378
-msgid "Create new Set"
+#: src/frogr-create-new-set-dialog.c:381
+#, fuzzy
+msgid "Create New Set"
 msgstr "Створити новий альбом"
 
-#: ../src/frogr-details-dialog.c:92 ../src/frogr-settings-dialog.c:92
-msgid "Default (as specified in flickr)"
+#: src/frogr-details-dialog.c:89 src/frogr-settings-dialog.c:97
+#, fuzzy
+msgid "Default (as specified in Flickr)"
 msgstr "Типово (як вказано в Flickr)"
 
-#: ../src/frogr-details-dialog.c:93 ../src/frogr-settings-dialog.c:93
+#: src/frogr-details-dialog.c:90 src/frogr-settings-dialog.c:98
 msgid "All rights reserved"
 msgstr "Усі права застережено"
 
-#: ../src/frogr-details-dialog.c:94 ../src/frogr-settings-dialog.c:94
+#: src/frogr-details-dialog.c:91 src/frogr-settings-dialog.c:99
 msgid "CC Attribution-NonCommercial-ShareAlike"
 msgstr "CC Attribution-NonCommercial-ShareAlike"
 
-#: ../src/frogr-details-dialog.c:95 ../src/frogr-settings-dialog.c:95
+#: src/frogr-details-dialog.c:92 src/frogr-settings-dialog.c:100
 msgid "CC Attribution-NonCommercial"
 msgstr "CC Attribution-NonCommercial"
 
-#: ../src/frogr-details-dialog.c:96 ../src/frogr-settings-dialog.c:96
+#: src/frogr-details-dialog.c:93 src/frogr-settings-dialog.c:101
 msgid "CC Attribution-NonCommercial-NoDerivs"
 msgstr "CC Attribution-NonCommercial-NoDerivs"
 
-#: ../src/frogr-details-dialog.c:97 ../src/frogr-settings-dialog.c:97
+#: src/frogr-details-dialog.c:94 src/frogr-settings-dialog.c:102
 msgid "CC Attribution"
 msgstr "CC Attribution"
 
-#: ../src/frogr-details-dialog.c:98 ../src/frogr-settings-dialog.c:98
+#: src/frogr-details-dialog.c:95 src/frogr-settings-dialog.c:103
 msgid "CC Attribution-ShareAlike"
 msgstr "CC Attribution-ShareAlike"
 
-#: ../src/frogr-details-dialog.c:99 ../src/frogr-settings-dialog.c:99
+#: src/frogr-details-dialog.c:96 src/frogr-settings-dialog.c:104
 msgid "CC Attribution-NoDerivs"
 msgstr "CC Attribution-NoDerivs"
 
-#: ../src/frogr-details-dialog.c:181
+#: src/frogr-details-dialog.c:172
 msgid "Open with image viewer"
 msgstr "Відкрити переглядачем"
 
-#: ../src/frogr-details-dialog.c:209
+#: src/frogr-details-dialog.c:190
+msgid "_Title:"
+msgstr "_Назва:"
+
+#: src/frogr-details-dialog.c:200
+msgid "_Description:"
+msgstr "_Опис:"
+
+#: src/frogr-details-dialog.c:224
+msgid "Ta_gs:"
+msgstr "Мі_тки:"
+
+#: src/frogr-details-dialog.c:247
 msgid "Visibility"
 msgstr "Видимість"
 
-#: ../src/frogr-details-dialog.c:224 ../src/frogr-settings-dialog.c:200
+#: src/frogr-details-dialog.c:257 src/frogr-settings-dialog.c:196
 msgid "_Private"
 msgstr "_Особисте"
 
-#: ../src/frogr-details-dialog.c:228 ../src/frogr-settings-dialog.c:202
+#: src/frogr-details-dialog.c:261 src/frogr-settings-dialog.c:199
 msgid "P_ublic"
 msgstr "_Публічне"
 
-#: ../src/frogr-details-dialog.c:240 ../src/frogr-settings-dialog.c:213
-msgid "Visible to _Family"
-msgstr "Бачитиме род_ина"
-
-#: ../src/frogr-details-dialog.c:244 ../src/frogr-settings-dialog.c:215
-msgid "Visible to F_riends"
-msgstr "Бачитимуть _друзі"
+#: src/frogr-details-dialog.c:270 src/frogr-settings-dialog.c:207
+msgid "_Family"
+msgstr ""
 
-#: ../src/frogr-details-dialog.c:272 ../src/frogr-settings-dialog.c:227
-msgid "_Show up in Global Search Results"
-msgstr "По_казувати в глобальних результатах пошуку"
+#: src/frogr-details-dialog.c:274 src/frogr-settings-dialog.c:209
+msgid "F_riends"
+msgstr ""
 
-#: ../src/frogr-details-dialog.c:290
-msgid "Content type"
+#: src/frogr-details-dialog.c:288
+#, fuzzy
+msgid "Content Type"
 msgstr "Тип вмісту"
 
-#: ../src/frogr-details-dialog.c:299 ../src/frogr-settings-dialog.c:252
+#: src/frogr-details-dialog.c:296 src/frogr-settings-dialog.c:234
 msgid "P_hoto"
 msgstr "_Фотографія"
 
-#: ../src/frogr-details-dialog.c:303 ../src/frogr-settings-dialog.c:254
+#: src/frogr-details-dialog.c:300 src/frogr-settings-dialog.c:236
 msgid "Scree_nshot"
 msgstr "_Знімок екрана"
 
-#: ../src/frogr-details-dialog.c:307 ../src/frogr-settings-dialog.c:256
+#: src/frogr-details-dialog.c:304 src/frogr-settings-dialog.c:238
 msgid "Oth_er"
 msgstr "_Інше"
 
-#: ../src/frogr-details-dialog.c:326
-msgid "Safety level"
+#: src/frogr-details-dialog.c:317
+#, fuzzy
+msgid "Safety Level"
 msgstr "Рівень безпеки"
 
-#: ../src/frogr-details-dialog.c:335 ../src/frogr-settings-dialog.c:280
+#: src/frogr-details-dialog.c:325 src/frogr-settings-dialog.c:260
 msgid "S_afe"
 msgstr "_Безпечний"
 
-#: ../src/frogr-details-dialog.c:339 ../src/frogr-settings-dialog.c:282
+#: src/frogr-details-dialog.c:329 src/frogr-settings-dialog.c:262
 msgid "_Moderate"
 msgstr "По_мірний"
 
-#: ../src/frogr-details-dialog.c:343 ../src/frogr-settings-dialog.c:284
+#: src/frogr-details-dialog.c:333 src/frogr-settings-dialog.c:264
 msgid "Restr_icted"
 msgstr "Обм_ежений"
 
-#: ../src/frogr-details-dialog.c:360
-msgid "License type"
+#: src/frogr-details-dialog.c:345
+#, fuzzy
+msgid "License Type"
 msgstr "Тип ліцензії"
 
-#: ../src/frogr-details-dialog.c:388
-msgid "_Title:"
-msgstr "_Назва:"
+#: src/frogr-details-dialog.c:367
+#, fuzzy
+msgid "Other Properties"
+msgstr "Інші параметри"
 
-#: ../src/frogr-details-dialog.c:400
-msgid "_Description:"
-msgstr "_Опис:"
+#: src/frogr-details-dialog.c:375
+#, fuzzy
+msgid "_Show Up in Global Search Results"
+msgstr "По_казувати в глобальних результатах пошуку"
 
-#: ../src/frogr-details-dialog.c:426
-msgid "Ta_gs:"
-msgstr "Мі_тки:"
+#: src/frogr-details-dialog.c:379
+msgid "Set Geo_location Information"
+msgstr ""
 
-#. Visually indicate how many pictures are being edited
-#: ../src/frogr-details-dialog.c:653
+#: src/frogr-details-dialog.c:383
+msgid "Replace 'Date Posted' with 'Date Taken'"
+msgstr ""
+
+#: src/frogr-details-dialog.c:475
 #, c-format
 msgid "(%d Picture)"
 msgid_plural "(%d Pictures)"
@@ -429,281 +555,385 @@ msgstr[0] "(%d зображення)"
 msgstr[1] "(%d зображення)"
 msgstr[2] "(%d зображень)"
 
-#: ../src/frogr-details-dialog.c:729
+#: src/frogr-details-dialog.c:548
 msgid "An error happened trying to load the picture"
 msgstr "Помилка при спробі завантажити малюнок"
 
-#: ../src/frogr-details-dialog.c:1375
+#: src/frogr-details-dialog.c:1169
+msgid "_Edit"
+msgstr ""
+
+#: src/frogr-details-dialog.c:1197
 msgid "Edit Picture Details"
 msgstr "Змінити подробиці про зображення"
 
-#. String showind the date and time a picture was taken
-#: ../src/frogr-main-view.c:671
+#: src/frogr-file-loader.c:142
+#, fuzzy, c-format
+msgid "Loading files %d / %d"
+msgstr "Завантаження зображень %d / %d"
+
+#: src/frogr-file-loader.c:369
+#, c-format
+msgid ""
+"Unable to load picture %s:\n"
+"%s"
+msgstr ""
+
+#: src/frogr-file-loader.c:400
+#, c-format
+msgid ""
+"Unable to load video %s\n"
+"Please check that you have the right codec installed"
+msgstr ""
+
+#: src/frogr-file-loader.c:636
+#, c-format
+msgid ""
+"Can't load file %s:\n"
+"Size of file is bigger than the maximum allowed for this account (%s)"
+msgstr ""
+
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
+msgid "Open"
+msgstr ""
+
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
+msgid "Open Existing Project"
+msgstr ""
+
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
+msgid "Add"
+msgstr "Додати"
+
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
+#, fuzzy
+msgid "Add Elements"
+msgstr "Елементи"
+
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
+msgid "Remove"
+msgstr "Вилучити"
+
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
+#, fuzzy
+msgid "Remove Elements"
+msgstr "Елементи"
+
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
+msgid "Upload"
+msgstr "Вивантажити"
+
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
+#, fuzzy
+msgid "Upload All"
+msgstr "_Вивантажити все"
+
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
+msgid "Save"
+msgstr ""
+
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
+msgid "Save Current Project"
+msgstr ""
+
+#: src/frogr-main-view.c:1016
+msgid "_About"
+msgstr "_Про програму"
+
+#: src/frogr-main-view.c:1020
+msgid "_Quit"
+msgstr "Ви_йти"
+
+#: src/frogr-main-view.c:1070
+#, fuzzy
+msgid "Accounts"
+msgstr "_Користувачі"
+
+#: src/frogr-main-view.c:1410
 #, c-format
 msgid "Taken: %s"
 msgstr "Зроблено: %s"
 
-#: ../src/frogr-main-view.c:676
+#: src/frogr-main-view.c:1415
 #, c-format
 msgid "File size: %s"
 msgstr "Розмір файла: %s"
 
-#: ../src/frogr-main-view.c:865
+#: src/frogr-main-view.c:1540
+#, fuzzy
+msgid "Select File"
+msgstr "Вибрати зображення"
+
+#: src/frogr-main-view.c:1544 src/frogr-main-view.c:1671
+msgid "_Open"
+msgstr ""
+
+#: src/frogr-main-view.c:1553
+msgid "Frogr Project Files"
+msgstr ""
+
+#: src/frogr-main-view.c:1615
+#, fuzzy
+msgid "Select Destination"
+msgstr "Опис альбому:"
+
+#: src/frogr-main-view.c:1619
+msgid "_Save"
+msgstr ""
+
+#: src/frogr-main-view.c:1622
+msgid "Untitled Project.frogr"
+msgstr ""
+
+#: src/frogr-main-view.c:1667
 msgid "Select a Picture"
 msgstr "Вибрати зображення"
 
-#: ../src/frogr-main-view.c:891
-msgid "images"
-msgstr "зображення"
+#: src/frogr-main-view.c:1694
+msgid "All Files"
+msgstr ""
 
-#: ../src/frogr-main-view.c:912
-msgid "You need to select some pictures first"
-msgstr "Спочатку виберіть кілька зображень"
+#: src/frogr-main-view.c:1697
+msgid "Image Files"
+msgstr ""
 
-#: ../src/frogr-main-view.c:1069
-#, c-format
-msgid ""
-"Could not display help for Frogr:\n"
-"%s"
+#: src/frogr-main-view.c:1701
+msgid "Video Files"
 msgstr ""
-"Неможливо показати довідку про Frogr:\n"
-"%s"
 
-#: ../src/frogr-main-view.c:1290
-msgid "Not connected to flickr"
+#: src/frogr-main-view.c:1723
+msgid "You don't have any picture added yet"
+msgstr ""
+
+#: src/frogr-main-view.c:1736
+msgid "You need to select some pictures first"
+msgstr "Спочатку виберіть кілька зображень"
+
+#: src/frogr-main-view.c:2108
+#, fuzzy
+msgid "Not connected to Flickr"
 msgstr "Немає з'єднання з flickr"
 
-#. Login string, showing the user is PRO (second '%s') if so.
-#: ../src/frogr-main-view.c:1300
+#: src/frogr-main-view.c:2118
 #, c-format
 msgid "Connected as %s%s"
 msgstr "З'єднано як %s%s"
 
-#: ../src/frogr-main-view.c:1301
+#: src/frogr-main-view.c:2119
 msgid " (PRO account)"
 msgstr " (обліковий запис PRO)"
 
-#. Will show in the status bar the amount of data (in KB, MB
-#. or GB) the user is currently allowed to upload to flicker
-#. till the end of the month, in a CURRENT / MAX fashion.
-#. The '-' at the beginning is just a separator, since more
-#. blocks of text will be shown in the status bar too.
-#: ../src/frogr-main-view.c:1325
-#, c-format
-msgid " - %s / %s remaining for the current month"
+#: src/frogr-main-view.c:2143
+#, fuzzy, c-format
+msgid " - %s / %s remaining"
 msgstr " — %s / %s залишилось у цьому місяці"
 
-#. Will show in the status bar the amount of data (in KB, MB or
-#. GB) that would be uploaded as the sum of the sizes for every
-#. picture currently loadad in the application
-#: ../src/frogr-main-view.c:1350
-#, c-format
-msgid " - %s to be uploaded"
-msgstr " — %s буде вивантажено"
-
-#: ../src/frogr-picture-loader.c:105
-#, c-format
-msgid "Loading pictures %d / %d"
-msgstr "Завантаження зображень %d / %d"
-
-#. Update progress
-#: ../src/frogr-picture-uploader.c:83
-#, c-format
-msgid "Uploading '%s'…"
-msgstr "Вивантаження «%s»…"
+#: src/frogr-main-view.c:2169
+#, fuzzy, c-format
+msgid " - %d file to upload (%s)"
+msgid_plural " - %d files to upload (%s)"
+msgstr[0] " — %s буде вивантажено"
+msgstr[1] " — %s буде вивантажено"
+msgstr[2] " — %s буде вивантажено"
 
-#: ../src/frogr-settings-dialog.c:184
+#: src/frogr-settings-dialog.c:185
 msgid "Default Visibility"
 msgstr "Типова видимість"
 
-#: ../src/frogr-settings-dialog.c:237
+#: src/frogr-settings-dialog.c:224
 msgid "Default Content Type"
 msgstr "Типовий тип вмісту"
 
-#: ../src/frogr-settings-dialog.c:265
+#: src/frogr-settings-dialog.c:250
 msgid "Default Safety Level"
 msgstr "Типовий рівень безпеки"
 
-#: ../src/frogr-settings-dialog.c:293
+#: src/frogr-settings-dialog.c:276
 msgid "Default License"
 msgstr "Типова ліцензія"
 
-#: ../src/frogr-settings-dialog.c:317
+#: src/frogr-settings-dialog.c:302
+msgid "Other Defaults"
+msgstr ""
+
+#: src/frogr-settings-dialog.c:312
+#, fuzzy
+msgid "_Show Pictures in Global Search Results"
+msgstr "По_казувати в глобальних результатах пошуку"
+
+#: src/frogr-settings-dialog.c:315
+msgid "Set Geo_location Information for Pictures"
+msgstr ""
+
+#: src/frogr-settings-dialog.c:318
+msgid "Replace 'Date Posted' with 'Date Taken' for Pictures"
+msgstr ""
+
+#: src/frogr-settings-dialog.c:324
 msgid "_General"
 msgstr "_Загальне"
 
-#: ../src/frogr-settings-dialog.c:345
+#: src/frogr-settings-dialog.c:344
 msgid "Proxy Settings"
 msgstr "Налаштування проксі"
 
-#. Enable proxy
-#: ../src/frogr-settings-dialog.c:355
+#: src/frogr-settings-dialog.c:353
 msgid "_Enable HTTP Proxy"
 msgstr "_Увімкнути проксі через HTTP"
 
-#: ../src/frogr-settings-dialog.c:365
+#: src/frogr-settings-dialog.c:363
 msgid "_Host:"
 msgstr "_Вузол:"
 
-#. Proxy port
-#: ../src/frogr-settings-dialog.c:383
+#: src/frogr-settings-dialog.c:376
 msgid "_Port:"
 msgstr "_Порт:"
 
-#. Proxy username
-#: ../src/frogr-settings-dialog.c:401
+#: src/frogr-settings-dialog.c:389
 msgid "U_sername:"
 msgstr "_Користувач:"
 
-#. Proxy password
-#: ../src/frogr-settings-dialog.c:419
+#: src/frogr-settings-dialog.c:402
 msgid "Pass_word:"
 msgstr "П_ароль:"
 
-#. Use GNOME General Proxy Settings
-#: ../src/frogr-settings-dialog.c:440
-msgid "_Use GNOME General Proxy Settings"
-msgstr "_Використовувати загальні налаштування проксі для GNOME"
-
-#: ../src/frogr-settings-dialog.c:466
+#: src/frogr-settings-dialog.c:426
 msgid "Connec_tion"
 msgstr "З'_єднання"
 
-#: ../src/frogr-settings-dialog.c:492
+#: src/frogr-settings-dialog.c:444
 msgid "Other options"
 msgstr "Інші параметри"
 
-#: ../src/frogr-settings-dialog.c:507
-msgid "Disa_ble Tags Auto-Completion"
+#: src/frogr-settings-dialog.c:454
+#, fuzzy
+msgid "Ena_ble Tags Auto-Completion"
 msgstr "_Вимкнути автоматичне завершення міток"
 
-#: ../src/frogr-settings-dialog.c:510
-msgid "_Keep File Extensions in Titles when Loading Pictures"
+#: src/frogr-settings-dialog.c:457
+msgid "_Import Tags from Pictures Metadata"
+msgstr ""
+
+#: src/frogr-settings-dialog.c:461
+msgid "Use _Dark GTK Theme"
+msgstr ""
+
+#: src/frogr-settings-dialog.c:465
+#, fuzzy
+msgid "_Keep File Extensions in Titles when Loading"
 msgstr "_Зберегти розширення файла в назві, коли завантажується зображення"
 
-#: ../src/frogr-settings-dialog.c:516
+#: src/frogr-settings-dialog.c:471
 msgid "_Misc"
 msgstr "_Інше"
 
-#: ../src/frogr-settings-dialog.c:1012
+#: src/frogr-settings-dialog.c:972
 msgid "Preferences"
 msgstr "Параметри"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:1
-msgid "A_ctions"
-msgstr "Ді_ї"
+#~ msgid "Flickr Remote Organizer"
+#~ msgstr "Віддалений упорядник Flickr"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:2
-msgid "Accou_nts"
-msgstr "_Користувачі"
+#~ msgid ""
+#~ "Press the button to start using %s once you've authorized it in your "
+#~ "flickr account."
+#~ msgstr ""
+#~ "Натисніть цю кнопку, щоб почати роботу з %s, як тільки авторизуєте її у "
+#~ "своєму обліковому записі flickr."
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:3
-msgid "Add"
-msgstr "Додати"
+#~ msgid "Setting license for picture…"
+#~ msgstr "Налаштування ліцензії для малюнка…"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:4
-msgid "Add _Tags…"
-msgstr "Додати мі_тки…"
+#~ msgid "Creating new photosets…"
+#~ msgstr "Створення нових альбомів…"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:5
-msgid "Add to _Existing Set…"
-msgstr "Додати до на_явного альбому…"
+#~ msgid "Adding picture to photosets…"
+#~ msgstr "Додавання зображення до альбомів…"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:6
-msgid "Add to _Group…"
-msgstr "Додати до _групи…"
+#~ msgid "Adding picture to groups…"
+#~ msgstr "Додавання зображення до груп…"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:7
-msgid "Add to _Set"
-msgstr "Додати до _альбому"
+#~ msgid "Set's title:"
+#~ msgstr "Назва альбому:"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:8
-msgid "As _Loaded"
-msgstr "За _завантаженням"
+#~ msgid "Visible to _Family"
+#~ msgstr "Бачитиме род_ина"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:9
-msgid "Authorize _frogr"
-msgstr "Авторизувати _frogr"
+#~ msgid "Visible to F_riends"
+#~ msgstr "Бачитимуть _друзі"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:10
-msgid "By _Date Taken"
-msgstr "За _часом створення"
+#~ msgid "images"
+#~ msgstr "зображення"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:11
-msgid "By _Title"
-msgstr "За _назвою"
+#~ msgid ""
+#~ "Could not display help for Frogr:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Неможливо показати довідку про Frogr:\n"
+#~ "%s"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:12
-msgid "Disable _Tooltips"
-msgstr "Вимкнути пі_дказки"
+#~ msgid "_Use GNOME General Proxy Settings"
+#~ msgstr "_Використовувати загальні налаштування проксі для GNOME"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:13
-msgid "Edit _Details…"
-msgstr "Змінити подробиці…"
+#~ msgid "A_ctions"
+#~ msgstr "Ді_ї"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:14
-msgid "Open in E_xternal Viewer"
-msgstr "Відкрити через зовнішній переглядач"
+#~ msgid "Add _Tags…"
+#~ msgstr "Додати мі_тки…"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:15
-msgid "Remove"
-msgstr "Вилучити"
+#~ msgid "Add to _Existing Set…"
+#~ msgstr "Додати до на_явного альбому…"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:16
-msgid "Upload"
-msgstr "Вивантажити"
+#~ msgid "Add to _Group…"
+#~ msgstr "Додати до _групи…"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:17
-msgid "_About"
-msgstr "_Про програму"
+#~ msgid "Add to _Set"
+#~ msgstr "Додати до _альбому"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:18
-msgid "_Add Pictures"
-msgstr "_Додати зображення"
+#~ msgid "As _Loaded"
+#~ msgstr "За _завантаженням"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:19
-msgid "_Create New Set…"
-msgstr "_Створити новий альбом"
+#~ msgid "By _Date Taken"
+#~ msgstr "За _часом створення"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:20
-msgid "_File"
-msgstr "_Файл"
+#~ msgid "By _Title"
+#~ msgstr "За _назвою"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:21
-msgid "_Help"
-msgstr "_Довідка"
+#~ msgid "Disable _Tooltips"
+#~ msgstr "Вимкнути пі_дказки"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:22
-msgid "_Preferences…"
-msgstr "_Параметри…"
+#~ msgid "Edit _Details…"
+#~ msgstr "Змінити подробиці…"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:23
-msgid "_Quit"
-msgstr "Ви_йти"
+#~ msgid "Open in E_xternal Viewer"
+#~ msgstr "Відкрити через зовнішній переглядач"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:24
-msgid "_Remove Pictures"
-msgstr "_Вилучити зображення"
+#~ msgid "_Add Pictures"
+#~ msgstr "_Додати зображення"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:25
-msgid "_Reversed Order"
-msgstr "Зворотний _порядок"
+#~ msgid "_Create New Set…"
+#~ msgstr "_Створити новий альбом"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:26
-msgid "_Sort Pictures"
-msgstr "_Упорядкувати фотографії"
+#~ msgid "_File"
+#~ msgstr "_Файл"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:27
-msgid "_Upload All"
-msgstr "_Вивантажити все"
+#~ msgid "_Help"
+#~ msgstr "_Довідка"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:28
-msgid "_View"
-msgstr "П_ерегляд"
+#~ msgid "_Preferences…"
+#~ msgstr "_Параметри…"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:29
-msgid "frogr"
-msgstr "frogr"
+#~ msgid "_Remove Pictures"
+#~ msgstr "_Вилучити зображення"
+
+#~ msgid "_Reversed Order"
+#~ msgstr "Зворотний _порядок"
+
+#~ msgid "_Sort Pictures"
+#~ msgstr "_Упорядкувати фотографії"
+
+#~ msgid "_View"
+#~ msgstr "П_ерегляд"
 
 #~ msgid "_About frogr..."
 #~ msgstr "_Про frogr…"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 471df45..95f64d8 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,9 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: frogr master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=frogr&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-01-17 01:51+0000\n"
+"Report-Msgid-Bugs-To: msanchez gnome org\n"
+"POT-Creation-Date: 2016-08-12 13:09+0100\n"
 "PO-Revision-Date: 2014-01-25 10:42+0800\n"
 "Last-Translator: YunQiang Su <wzssyqa gmail com>\n"
 "Language-Team: Chinese (China) <i18n-zh googlegroups com>\n"
@@ -20,121 +19,133 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/frogr.appdata.xml.in.h:1 ../data/frogr.desktop.in.in.h:2
-msgid "Frogr: a Flickr Remote Organizer for GNOME"
+#: data/frogr.appdata.xml.in:5 data/frogr.desktop.in.in:5
+#: data/frogr.desktop.in.in:14
+msgid "frogr"
+msgstr "frogr"
+
+#: data/frogr.appdata.xml.in:6 data/frogr.desktop.in.in:6
+#, fuzzy
+msgid "frogr: a Flickr Remote Organizer for GNOME"
 msgstr "Frogr:一个 GNOME 下的 Flickr 远程整理器"
 
-#: ../data/frogr.appdata.xml.in.h:2
+#: data/frogr.appdata.xml.in:8
+#, fuzzy
 msgid ""
-"Frogr is a small application for the GNOME desktop that allows users to "
+"frogr is a small application for the GNOME desktop that allows users to "
 "manage their accounts in the Flickr image hosting website."
 msgstr ""
 "Frogr 是 GNOME 桌面的一个小型程序,允许用户管理其 Flickr 相片托管网站的帐号。"
 
-#: ../data/frogr.appdata.xml.in.h:3
+#: data/frogr.appdata.xml.in:13
 msgid ""
 "It supports all the basic Flickr features, including uploading pictures, "
 "adding descriptions, setting tags and managing sets and groups pools."
 msgstr ""
-"其支持 Flickr 的基本功能,包括上传相片,添加描述,设置标记和管理相片集和群组"
-"。"
+"其支持 Flickr 的基本功能,包括上传相片,添加描述,设置标记和管理相片集和群"
+"组。"
 
-#: ../data/frogr.desktop.in.in.h:1
-msgid "Frogr"
-msgstr "Frogr"
+#: data/frogr.appdata.xml.in:24
+#, fuzzy
+msgid "Screenshot of frogr"
+msgstr "截屏(_N)"
 
-#: ../data/frogr.desktop.in.in.h:3
+#: data/frogr.appdata.xml.in:29
+msgid "Mario Sanchez Prada"
+msgstr ""
+
+#: data/frogr.desktop.in.in:7
 msgid "Upload and organize photos in Flickr accounts"
 msgstr "上传和整理 Flickr 账户中的相片"
 
-#: ../data/frogr.desktop.in.in.h:4
+#: data/frogr.desktop.in.in:8
 msgid "Flickr;Image;Picture;Photo;Video;Uploader;"
-msgstr "Flickr;Image;Picture;Photo;Video;Uploader;图像;照片;相片;图片;视频;上传;"
+msgstr ""
+"Flickr;Image;Picture;Photo;Video;Uploader;图像;照片;相片;图片;视频;上传;"
 
-#: ../src/frogr-about-dialog.c:43
-msgid "A Flickr remote organizer for GNOME\n"
+#: src/frogr-about-dialog.c:43
+#, fuzzy
+msgid "A Flickr Remote Organizer for GNOME\n"
 msgstr "一个 GNOME 下的 Flickr 远程管理器\n"
 
-#: ../src/frogr-about-dialog.c:72
+#: src/frogr-about-dialog.c:72
 msgid "translator-credits"
 msgstr ""
 "Wylmer Wang <wantinghard gmail com>, 2011, 2013.\n"
 "tuhaihe <1132321739qq gmail com>, 2012.\n"
 "YunQiang Su <wzssyqa gmail com>, 2014."
 
-#: ../src/frogr-add-tags-dialog.c:198 ../src/frogr-add-to-set-dialog.c:553
-#: ../src/frogr-add-to-group-dialog.c:552
-#: ../src/frogr-create-new-set-dialog.c:328 ../src/frogr-details-dialog.c:1194
-#: ../src/frogr-main-view.c:469 ../src/frogr-main-view.c:1378
-#: ../src/frogr-main-view.c:1455 ../src/frogr-main-view.c:1505
-#: ../src/frogr-settings-dialog.c:1002
+#: src/frogr-add-tags-dialog.c:191 src/frogr-add-to-group-dialog.c:528
+#: src/frogr-add-to-set-dialog.c:529 src/frogr-auth-dialog.c:153
+#: src/frogr-create-new-set-dialog.c:310 src/frogr-details-dialog.c:1168
+#: src/frogr-main-view.c:1543 src/frogr-main-view.c:1618
+#: src/frogr-main-view.c:1670 src/frogr-settings-dialog.c:930
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../src/frogr-add-tags-dialog.c:200 ../src/frogr-add-to-set-dialog.c:555
-#: ../src/frogr-add-to-group-dialog.c:554
-#: ../src/frogr-create-new-set-dialog.c:330
+#: src/frogr-add-tags-dialog.c:193 src/frogr-add-to-group-dialog.c:530
+#: src/frogr-add-to-set-dialog.c:531 src/frogr-create-new-set-dialog.c:312
 msgid "_Add"
 msgstr "添加(_A)"
 
-#: ../src/frogr-add-tags-dialog.c:207
+#: src/frogr-add-tags-dialog.c:202
 msgid "Enter a spaces separated list of tags:"
 msgstr "输入一系列标签,以逗号分隔:"
 
-#: ../src/frogr-add-tags-dialog.c:230
+#: src/frogr-add-tags-dialog.c:228
 msgid "Add Tags"
 msgstr "添加标签"
 
-#: ../src/frogr-add-to-set-dialog.c:155
-msgid "Title"
-msgstr "标题"
+#: src/frogr-add-to-group-dialog.c:147
+msgid "Name"
+msgstr "名称"
 
-#: ../src/frogr-add-to-set-dialog.c:170 ../src/frogr-add-to-group-dialog.c:169
+#: src/frogr-add-to-group-dialog.c:162 src/frogr-add-to-set-dialog.c:163
 msgid "Elements"
 msgstr "元素"
 
-#: ../src/frogr-add-to-set-dialog.c:604
-msgid "Add to Sets"
-msgstr "添加到相片集"
-
-#: ../src/frogr-add-to-group-dialog.c:154
-msgid "Name"
-msgstr "名称"
-
-#: ../src/frogr-add-to-group-dialog.c:603
+#: src/frogr-add-to-group-dialog.c:581
 msgid "Add to Groups"
 msgstr "添加到群组"
 
-#: ../src/frogr-auth-dialog.c:52
+#: src/frogr-add-to-set-dialog.c:148
+msgid "Title"
+msgstr "标题"
+
+#: src/frogr-add-to-set-dialog.c:582
+msgid "Add to Sets"
+msgstr "添加到相片集"
+
+#: src/frogr-auth-dialog.c:59
 #, c-format
 msgid ""
 "Please press the button to authorize %s and then come back to complete the "
 "process."
 msgstr "请按下该按钮对 %s 进行认证,然后返回以完成此过程。"
 
-#: ../src/frogr-auth-dialog.c:56 ../src/frogr-auth-dialog.c:141
+#: src/frogr-auth-dialog.c:63 src/frogr-auth-dialog.c:149
+#: src/frogr-controller.c:2286
 #, c-format
 msgid "Authorize %s"
 msgstr "认证 %s"
 
-#: ../src/frogr-auth-dialog.c:145 ../src/frogr-settings-dialog.c:1004
+#: src/frogr-auth-dialog.c:155 src/frogr-settings-dialog.c:932
 msgid "_Close"
 msgstr "关闭(_C)"
 
-#. Description label
-#: ../src/frogr-auth-dialog.c:158
+#: src/frogr-auth-dialog.c:167
 msgid "Enter verification code:"
 msgstr "输入验证码:"
 
-#: ../src/frogr-auth-dialog.c:209
+#: src/frogr-auth-dialog.c:221
 msgid "Invalid verification code"
 msgstr "无效的验证码"
 
-#: ../src/frogr-controller.c:593
+#: src/frogr-controller.c:581
 msgid "Process cancelled"
 msgstr "操作已取消"
 
-#: ../src/frogr-controller.c:598
+#: src/frogr-controller.c:586
 msgid ""
 "Connection error:\n"
 "Network not available"
@@ -142,7 +153,7 @@ msgstr ""
 "连接错误:\n"
 "网络不可用"
 
-#: ../src/frogr-controller.c:602
+#: src/frogr-controller.c:590
 msgid ""
 "Connection error:\n"
 "Bad request"
@@ -150,7 +161,7 @@ msgstr ""
 "连接错误:\n"
 "无效请求"
 
-#: ../src/frogr-controller.c:606
+#: src/frogr-controller.c:594
 msgid ""
 "Connection error:\n"
 "Server-side error"
@@ -158,7 +169,7 @@ msgstr ""
 "连接错误:\n"
 "服务器端错误"
 
-#: ../src/frogr-controller.c:610
+#: src/frogr-controller.c:598
 msgid ""
 "Error uploading:\n"
 "File invalid"
@@ -166,7 +177,7 @@ msgstr ""
 "上传出错:\n"
 "文件无效"
 
-#: ../src/frogr-controller.c:614
+#: src/frogr-controller.c:602
 msgid ""
 "Error uploading picture:\n"
 "Quota exceeded"
@@ -174,13 +185,13 @@ msgstr ""
 "上传相片出错:\n"
 "超出限额"
 
-#: ../src/frogr-controller.c:619
+#: src/frogr-controller.c:607
 #, c-format
 msgid "Quota exceeded (limit: %d video per month)"
 msgid_plural "Quota exceeded (limit: %d videos per month)"
 msgstr[0] "超出限额(限额:每月 %d 段视频)"
 
-#: ../src/frogr-controller.c:623
+#: src/frogr-controller.c:611
 msgid ""
 "Error uploading video:\n"
 "You can't upload more videos with this account"
@@ -188,7 +199,7 @@ msgstr ""
 "上传视频出错:\n"
 "您这个帐户不能再上传更多视频了"
 
-#: ../src/frogr-controller.c:629
+#: src/frogr-controller.c:617
 msgid ""
 "Error:\n"
 "Photo not found"
@@ -196,7 +207,7 @@ msgstr ""
 "错误:\n"
 "找不到相片"
 
-#: ../src/frogr-controller.c:633
+#: src/frogr-controller.c:621
 msgid ""
 "Error:\n"
 "Photo already in photoset"
@@ -204,7 +215,7 @@ msgstr ""
 "错误:\n"
 "相片已在相片集中"
 
-#: ../src/frogr-controller.c:637
+#: src/frogr-controller.c:625
 msgid ""
 "Error:\n"
 "Photo already in group"
@@ -212,7 +223,7 @@ msgstr ""
 "错误:\n"
 "相片已在群组中"
 
-#: ../src/frogr-controller.c:641
+#: src/frogr-controller.c:629
 msgid ""
 "Error:\n"
 "Photo already in the maximum number of groups possible"
@@ -220,7 +231,7 @@ msgstr ""
 "错误:\n"
 "相片所在的群组数已达上限"
 
-#: ../src/frogr-controller.c:645
+#: src/frogr-controller.c:633
 msgid ""
 "Error:\n"
 "Group limit already reached"
@@ -228,7 +239,7 @@ msgstr ""
 "错误:\n"
 "已经达到群组限制"
 
-#: ../src/frogr-controller.c:649
+#: src/frogr-controller.c:637
 msgid ""
 "Error:\n"
 "Photo added to group's queue"
@@ -236,7 +247,7 @@ msgstr ""
 "错误:\n"
 "相片已添加到群组队列中"
 
-#: ../src/frogr-controller.c:653
+#: src/frogr-controller.c:641
 msgid ""
 "Error:\n"
 "Photo already added to group's queue"
@@ -244,7 +255,7 @@ msgstr ""
 "错误:\n"
 "相片已经添加到群组队列中"
 
-#: ../src/frogr-controller.c:657
+#: src/frogr-controller.c:645
 msgid ""
 "Error:\n"
 "Content not allowed for this group"
@@ -252,8 +263,7 @@ msgstr ""
 "错误:\n"
 "此群组不允许此类内容"
 
-#: ../src/frogr-controller.c:661
-#, c-format
+#: src/frogr-controller.c:649
 msgid ""
 "Authorization failed.\n"
 "Please try again"
@@ -261,7 +271,7 @@ msgstr ""
 "认证失败。\n"
 "请重试"
 
-#: ../src/frogr-controller.c:667
+#: src/frogr-controller.c:655
 #, c-format
 msgid ""
 "Error\n"
@@ -272,8 +282,7 @@ msgstr ""
 "%s 未经过正确认证,无法上传相片到 flickr。\n"
 "请重新对它进行认证"
 
-#: ../src/frogr-controller.c:672
-#, c-format
+#: src/frogr-controller.c:660
 msgid ""
 "Unable to authenticate in Flickr\n"
 "Please try again."
@@ -281,7 +290,7 @@ msgstr ""
 "无法在 Flickr 上认证\n"
 "请重试。"
 
-#: ../src/frogr-controller.c:676
+#: src/frogr-controller.c:664
 #, c-format
 msgid ""
 "You have not properly authorized %s yet.\n"
@@ -290,8 +299,7 @@ msgstr ""
 "您还没有正确认证 %s。\n"
 "请重试。"
 
-#: ../src/frogr-controller.c:681
-#, c-format
+#: src/frogr-controller.c:669
 msgid ""
 "Invalid verification code.\n"
 "Please try again."
@@ -299,8 +307,7 @@ msgstr ""
 "无效的验证码。\n"
 "请重试。"
 
-#: ../src/frogr-controller.c:685
-#, c-format
+#: src/frogr-controller.c:673
 msgid ""
 "Error:\n"
 "Service not available"
@@ -308,59 +315,63 @@ msgstr ""
 "错误:\n"
 "服务不可用"
 
-#. General error: just dump the raw error description
-#: ../src/frogr-controller.c:690
+#: src/frogr-controller.c:678
 #, c-format
 msgid "An error happened: %s."
 msgstr "发生错误:%s。"
 
-#: ../src/frogr-controller.c:906
+#: src/frogr-controller.c:883
 msgid "Authorization failed (timed out)"
 msgstr "认证失败(超时)"
 
-#: ../src/frogr-controller.c:958
+#: src/frogr-controller.c:931
 #, c-format
 msgid "Retrying Upload (attempt %d/%d)…"
 msgstr "正在重新尝试上传(第 %d/%d 次)..."
 
-#: ../src/frogr-controller.c:963
+#: src/frogr-controller.c:936
 #, c-format
 msgid "Uploading '%s'…"
 msgstr "正在上传“%s”..."
 
-#: ../src/frogr-controller.c:2221
+#: src/frogr-controller.c:2242
 msgid "Updating credentials…"
 msgstr "正在更新凭证..."
 
-#: ../src/frogr-controller.c:2226
+#: src/frogr-controller.c:2247
 msgid "Retrieving data for authorization…"
 msgstr "正在获取认证数据..."
 
-#: ../src/frogr-controller.c:2231
+#: src/frogr-controller.c:2252
 msgid "Finishing authorization…"
 msgstr "正在完成认证..."
 
-#: ../src/frogr-controller.c:2236
+#: src/frogr-controller.c:2257
 msgid "Retrieving list of sets…"
 msgstr "正在获取相片集列表..."
 
-#: ../src/frogr-controller.c:2241
+#: src/frogr-controller.c:2262
 msgid "Retrieving list of groups…"
 msgstr "正在获取群组列表..."
 
-#: ../src/frogr-controller.c:2246
+#: src/frogr-controller.c:2267
 msgid "Retrieving list of tags…"
 msgstr "正在获取标签列表..."
 
-#: ../src/frogr-controller.c:2363
+#: src/frogr-controller.c:2292
+#, fuzzy
+msgid "Fetching information"
+msgstr "设置地理位置信息(_L)"
+
+#: src/frogr-controller.c:2398
 msgid "No sets found"
 msgstr "未找到相片集"
 
-#: ../src/frogr-controller.c:2390
+#: src/frogr-controller.c:2423
 msgid "No groups found"
 msgstr "未找到群组"
 
-#: ../src/frogr-controller.c:3029
+#: src/frogr-controller.c:2984
 #, c-format
 msgid ""
 "You need to properly authorize %s before uploading any pictures to Flickr.\n"
@@ -369,179 +380,183 @@ msgstr ""
 "您需要对 %s 进行正确认证才能向 Flickr 上传相片。\n"
 "请重新对它进行认证。"
 
-#: ../src/frogr-controller.c:3039
-#, c-format
+#: src/frogr-controller.c:2994
 msgid "You need to be connected before uploading any pictures to Flickr."
 msgstr "您要先联网才能向 Flickr 上传相片。"
 
-#: ../src/frogr-controller.c:3111
-#, c-format
+#: src/frogr-controller.c:3012
+#, fuzzy
+msgid "Uploading Pictures"
+msgstr "加载相片(_L)..."
+
+#: src/frogr-controller.c:3057
 msgid "Error opening project file"
 msgstr "打开项目文件出错"
 
-#. This shows a dialog notifying the problem to the user
-#: ../src/frogr-create-new-set-dialog.c:156 ../src/frogr-details-dialog.c:1021
+#: src/frogr-create-new-set-dialog.c:143 src/frogr-details-dialog.c:1001
 msgid "Missing data required"
 msgstr "需要缺少的数据"
 
-#: ../src/frogr-create-new-set-dialog.c:342
+#: src/frogr-create-new-set-dialog.c:326
 msgid "Title:"
 msgstr "标题:"
 
-#: ../src/frogr-create-new-set-dialog.c:351
+#: src/frogr-create-new-set-dialog.c:335
 msgid "Description:"
 msgstr "描述:"
 
-#: ../src/frogr-create-new-set-dialog.c:372
+#: src/frogr-create-new-set-dialog.c:356
 msgid "Fill Pictures Details with Title and Description"
 msgstr "填写相片的标题和描述细节"
 
-#: ../src/frogr-create-new-set-dialog.c:393
+#: src/frogr-create-new-set-dialog.c:381
 msgid "Create New Set"
 msgstr "创建新相片集"
 
-#: ../src/frogr-details-dialog.c:90 ../src/frogr-settings-dialog.c:100
+#: src/frogr-details-dialog.c:89 src/frogr-settings-dialog.c:97
 msgid "Default (as specified in Flickr)"
 msgstr "默认(与 Flickr 上指定的相同)"
 
-#: ../src/frogr-details-dialog.c:91 ../src/frogr-settings-dialog.c:101
+#: src/frogr-details-dialog.c:90 src/frogr-settings-dialog.c:98
 msgid "All rights reserved"
 msgstr "保留所有权利"
 
-#: ../src/frogr-details-dialog.c:92 ../src/frogr-settings-dialog.c:102
+#: src/frogr-details-dialog.c:91 src/frogr-settings-dialog.c:99
 msgid "CC Attribution-NonCommercial-ShareAlike"
 msgstr "CC 署名 - 非商业性使用 - 相同方式共享"
 
-#: ../src/frogr-details-dialog.c:93 ../src/frogr-settings-dialog.c:103
+#: src/frogr-details-dialog.c:92 src/frogr-settings-dialog.c:100
 msgid "CC Attribution-NonCommercial"
 msgstr "CC 署名 - 非商业性"
 
-#: ../src/frogr-details-dialog.c:94 ../src/frogr-settings-dialog.c:104
+#: src/frogr-details-dialog.c:93 src/frogr-settings-dialog.c:101
 msgid "CC Attribution-NonCommercial-NoDerivs"
 msgstr "CC署名 - 非商业性使用 - 禁止演绎"
 
-#: ../src/frogr-details-dialog.c:95 ../src/frogr-settings-dialog.c:105
+#: src/frogr-details-dialog.c:94 src/frogr-settings-dialog.c:102
 msgid "CC Attribution"
 msgstr "CC 署名"
 
-#: ../src/frogr-details-dialog.c:96 ../src/frogr-settings-dialog.c:106
+#: src/frogr-details-dialog.c:95 src/frogr-settings-dialog.c:103
 msgid "CC Attribution-ShareAlike"
 msgstr "CC署名 - 相同方式共享"
 
-#: ../src/frogr-details-dialog.c:97 ../src/frogr-settings-dialog.c:107
+#: src/frogr-details-dialog.c:96 src/frogr-settings-dialog.c:104
 msgid "CC Attribution-NoDerivs"
 msgstr "CC署名 - 禁止演绎"
 
-#: ../src/frogr-details-dialog.c:180
+#: src/frogr-details-dialog.c:172
 msgid "Open with image viewer"
 msgstr "使用图像查看器打开"
 
-#: ../src/frogr-details-dialog.c:194
+#: src/frogr-details-dialog.c:190
 msgid "_Title:"
 msgstr "标题(_T):"
 
-#: ../src/frogr-details-dialog.c:204
+#: src/frogr-details-dialog.c:200
 msgid "_Description:"
 msgstr "描述(_D):"
 
-#: ../src/frogr-details-dialog.c:228
+#: src/frogr-details-dialog.c:224
 msgid "Ta_gs:"
 msgstr "标签(_G):"
 
-#: ../src/frogr-details-dialog.c:254
+#: src/frogr-details-dialog.c:247
 msgid "Visibility"
 msgstr "可见性"
 
-#: ../src/frogr-details-dialog.c:266 ../src/frogr-settings-dialog.c:207
+#: src/frogr-details-dialog.c:257 src/frogr-settings-dialog.c:196
 msgid "_Private"
 msgstr "私有(_P)"
 
-#: ../src/frogr-details-dialog.c:270 ../src/frogr-settings-dialog.c:210
+#: src/frogr-details-dialog.c:261 src/frogr-settings-dialog.c:199
 msgid "P_ublic"
 msgstr "公开(_U)"
 
-#: ../src/frogr-details-dialog.c:279 ../src/frogr-settings-dialog.c:221
+#: src/frogr-details-dialog.c:270 src/frogr-settings-dialog.c:207
 msgid "_Family"
 msgstr "家庭(_F)"
 
-#: ../src/frogr-details-dialog.c:283 ../src/frogr-settings-dialog.c:223
+#: src/frogr-details-dialog.c:274 src/frogr-settings-dialog.c:209
 msgid "F_riends"
 msgstr "朋友(_R)"
 
-#: ../src/frogr-details-dialog.c:309
+#: src/frogr-details-dialog.c:288
 msgid "Content Type"
 msgstr "内容类型"
 
-#: ../src/frogr-details-dialog.c:318 ../src/frogr-settings-dialog.c:248
+#: src/frogr-details-dialog.c:296 src/frogr-settings-dialog.c:234
 msgid "P_hoto"
 msgstr "相片(_H)"
 
-#: ../src/frogr-details-dialog.c:322 ../src/frogr-settings-dialog.c:250
+#: src/frogr-details-dialog.c:300 src/frogr-settings-dialog.c:236
 msgid "Scree_nshot"
 msgstr "截屏(_N)"
 
-#: ../src/frogr-details-dialog.c:326 ../src/frogr-settings-dialog.c:252
+#: src/frogr-details-dialog.c:304 src/frogr-settings-dialog.c:238
 msgid "Oth_er"
 msgstr "其他(_E)"
 
-#: ../src/frogr-details-dialog.c:342
+#: src/frogr-details-dialog.c:317
 msgid "Safety Level"
 msgstr "安全级别"
 
-#: ../src/frogr-details-dialog.c:351 ../src/frogr-settings-dialog.c:273
+#: src/frogr-details-dialog.c:325 src/frogr-settings-dialog.c:260
 msgid "S_afe"
 msgstr "安全(_A)"
 
-#: ../src/frogr-details-dialog.c:355 ../src/frogr-settings-dialog.c:275
+#: src/frogr-details-dialog.c:329 src/frogr-settings-dialog.c:262
 msgid "_Moderate"
 msgstr "中等(_M)"
 
-#: ../src/frogr-details-dialog.c:359 ../src/frogr-settings-dialog.c:277
+#: src/frogr-details-dialog.c:333 src/frogr-settings-dialog.c:264
 msgid "Restr_icted"
 msgstr "严格(_I)"
 
-#: ../src/frogr-details-dialog.c:373
+#: src/frogr-details-dialog.c:345
 msgid "License Type"
 msgstr "许可证类型"
 
-#: ../src/frogr-details-dialog.c:397
+#: src/frogr-details-dialog.c:367
 msgid "Other Properties"
 msgstr "其他属性"
 
-#: ../src/frogr-details-dialog.c:406
+#: src/frogr-details-dialog.c:375
+msgid "_Show Up in Global Search Results"
+msgstr "显示在全局搜索结果中(_S)"
+
+#: src/frogr-details-dialog.c:379
 msgid "Set Geo_location Information"
 msgstr "设置地理位置信息(_L)"
 
-#: ../src/frogr-details-dialog.c:410
-msgid "_Show Up in Global Search Results"
-msgstr "显示在全局搜索结果中(_S)"
+#: src/frogr-details-dialog.c:383
+msgid "Replace 'Date Posted' with 'Date Taken'"
+msgstr ""
 
-#. Visually indicate how many pictures are being edited
-#: ../src/frogr-details-dialog.c:501
+#: src/frogr-details-dialog.c:475
 #, c-format
 msgid "(%d Picture)"
 msgid_plural "(%d Pictures)"
 msgstr[0] "(%d 张相片)"
 
-#: ../src/frogr-details-dialog.c:575
+#: src/frogr-details-dialog.c:548
 msgid "An error happened trying to load the picture"
 msgstr "尝试加载相片时发生错误"
 
-#: ../src/frogr-details-dialog.c:1195
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:8
+#: src/frogr-details-dialog.c:1169
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: ../src/frogr-details-dialog.c:1224
+#: src/frogr-details-dialog.c:1197
 msgid "Edit Picture Details"
 msgstr "编辑相片细节"
 
-#: ../src/frogr-file-loader.c:147
+#: src/frogr-file-loader.c:142
 #, c-format
 msgid "Loading files %d / %d"
 msgstr "正在加载文件 %d / %d"
 
-#: ../src/frogr-file-loader.c:381
+#: src/frogr-file-loader.c:369
 #, c-format
 msgid ""
 "Unable to load picture %s:\n"
@@ -550,7 +565,7 @@ msgstr ""
 "无法加载相片 %s:\n"
 "%s"
 
-#: ../src/frogr-file-loader.c:412
+#: src/frogr-file-loader.c:400
 #, c-format
 msgid ""
 "Unable to load video %s\n"
@@ -559,10 +574,7 @@ msgstr ""
 "无法加载视频 %s\n"
 "请检查是否安装了正确的编解码器"
 
-#. First %s is the title of the picture (filename of the file by
-#. default). Second %s is the max allowed size for a picture to be
-#. uploaded to flickr (different for free and PRO accounts).
-#: ../src/frogr-file-loader.c:652
+#: src/frogr-file-loader.c:636
 #, c-format
 msgid ""
 "Can't load file %s:\n"
@@ -571,346 +583,306 @@ msgstr ""
 "无法加载文件 %s:\n"
 "文件尺寸大于此帐户的最大允许值(%s)"
 
-#: ../src/frogr-main-view.c:401
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
 msgid "Open"
 msgstr "打开"
 
-#: ../src/frogr-main-view.c:401
+#: src/frogr-main-view.c:630 src/frogr-main-view.c:726
 msgid "Open Existing Project"
 msgstr "打开现有的项目"
 
-#: ../src/frogr-main-view.c:403
-msgid "Save"
-msgstr "保存"
-
-#: ../src/frogr-main-view.c:403
-msgid "Save Current Project"
-msgstr "保存当前项目"
-
-#: ../src/frogr-main-view.c:407
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
 msgid "Add"
 msgstr "添加"
 
-#: ../src/frogr-main-view.c:407
+#: src/frogr-main-view.c:631 src/frogr-main-view.c:729
 msgid "Add Elements"
 msgstr "添加元素"
 
-#: ../src/frogr-main-view.c:409
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
 msgid "Remove"
 msgstr "移除"
 
-#: ../src/frogr-main-view.c:409
+#: src/frogr-main-view.c:632 src/frogr-main-view.c:730
 msgid "Remove Elements"
 msgstr "移除元素"
 
-#: ../src/frogr-main-view.c:413
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
 msgid "Upload"
 msgstr "上传"
 
-#: ../src/frogr-main-view.c:413
+#: src/frogr-main-view.c:633 src/frogr-main-view.c:732
 msgid "Upload All"
 msgstr "全部上传"
 
-#: ../src/frogr-main-view.c:827 ../data/gtkbuilder/frogr-app-menu.xml.h:4
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
+msgid "Save"
+msgstr "保存"
+
+#: src/frogr-main-view.c:666 src/frogr-main-view.c:727
+msgid "Save Current Project"
+msgstr "保存当前项目"
+
+#: src/frogr-main-view.c:1016
 msgid "_About"
 msgstr "关于(_A)"
 
-#: ../src/frogr-main-view.c:831 ../data/gtkbuilder/frogr-app-menu.xml.h:5
+#: src/frogr-main-view.c:1020
 msgid "_Quit"
 msgstr "退出(_Q)"
 
-#. Create the submenu and insert it in the right section
-#: ../src/frogr-main-view.c:887
+#: src/frogr-main-view.c:1070
 msgid "Accounts"
 msgstr "账户"
 
-#. String showind the date and time a picture was taken
-#: ../src/frogr-main-view.c:1237
+#: src/frogr-main-view.c:1410
 #, c-format
 msgid "Taken: %s"
 msgstr "拍摄于:%s"
 
-#: ../src/frogr-main-view.c:1242
+#: src/frogr-main-view.c:1415
 #, c-format
 msgid "File size: %s"
 msgstr "文件大小:%s"
 
-#: ../src/frogr-main-view.c:1375
+#: src/frogr-main-view.c:1540
 msgid "Select File"
 msgstr "选择文件"
 
-#: ../src/frogr-main-view.c:1379 ../src/frogr-main-view.c:1506
+#: src/frogr-main-view.c:1544 src/frogr-main-view.c:1671
 msgid "_Open"
 msgstr "打开(_O)"
 
-#: ../src/frogr-main-view.c:1388
+#: src/frogr-main-view.c:1553
 msgid "Frogr Project Files"
 msgstr "Frogr 项目文件"
 
-#: ../src/frogr-main-view.c:1452
+#: src/frogr-main-view.c:1615
 msgid "Select Destination"
 msgstr "选择目标位置"
 
-#: ../src/frogr-main-view.c:1456 ../data/gtkbuilder/frogr-menu-bar.xml.h:3
+#: src/frogr-main-view.c:1619
 msgid "_Save"
 msgstr "保存(_S)"
 
-#: ../src/frogr-main-view.c:1459
+#: src/frogr-main-view.c:1622
 msgid "Untitled Project.frogr"
 msgstr "无标题项目.frogr"
 
-#: ../src/frogr-main-view.c:1502
+#: src/frogr-main-view.c:1667
 msgid "Select a Picture"
 msgstr "选择一张相片"
 
-#: ../src/frogr-main-view.c:1529
+#: src/frogr-main-view.c:1694
 msgid "All Files"
 msgstr "所有文件"
 
-#: ../src/frogr-main-view.c:1532
+#: src/frogr-main-view.c:1697
 msgid "Image Files"
 msgstr "图像文件"
 
-#: ../src/frogr-main-view.c:1536
+#: src/frogr-main-view.c:1701
 msgid "Video Files"
 msgstr "视频文件"
 
-#: ../src/frogr-main-view.c:1558
+#: src/frogr-main-view.c:1723
 msgid "You don't have any picture added yet"
 msgstr "您还没有添加任何相片"
 
-#: ../src/frogr-main-view.c:1573
+#: src/frogr-main-view.c:1736
 msgid "You need to select some pictures first"
 msgstr "您需要先选择一些相片"
 
-#: ../src/frogr-main-view.c:2037
+#: src/frogr-main-view.c:2108
 msgid "Not connected to Flickr"
 msgstr "未连接到 Flickr"
 
-#. Login string, showing the user is PRO (second '%s') if so.
-#: ../src/frogr-main-view.c:2047
+#: src/frogr-main-view.c:2118
 #, c-format
 msgid "Connected as %s%s"
 msgstr "连接为 %s%s"
 
-#: ../src/frogr-main-view.c:2048
+#: src/frogr-main-view.c:2119
 msgid " (PRO account)"
 msgstr " (专业账户)"
 
-#. Will show in the status bar the amount of data (in KB, MB
-#. or GB) the user is currently allowed to upload to flicker
-#. till the end of the month, in a CURRENT / MAX fashion.
-#. The '-' at the beginning is just a separator, since more
-#. blocks of text will be shown in the status bar too.
-#: ../src/frogr-main-view.c:2072
+#: src/frogr-main-view.c:2143
 #, c-format
 msgid " - %s / %s remaining"
 msgstr " - 剩余 %s / %s "
 
-#. Will show in the status bar the amount of pictures and data
-#. (in KB, MB or GB) that would be uploaded as the sum of the
-#. sizes for every picture loaded in the application
-#: ../src/frogr-main-view.c:2098
+#: src/frogr-main-view.c:2169
 #, c-format
 msgid " - %d file to upload (%s)"
 msgid_plural " - %d files to upload (%s)"
 msgstr[0] " - %d 个文件待上传(%s)"
 
-#: ../src/frogr-settings-dialog.c:190
+#: src/frogr-settings-dialog.c:185
 msgid "Default Visibility"
 msgstr "默认可见性"
 
-#: ../src/frogr-settings-dialog.c:236
+#: src/frogr-settings-dialog.c:224
 msgid "Default Content Type"
 msgstr "默认内容类型"
 
-#: ../src/frogr-settings-dialog.c:261
+#: src/frogr-settings-dialog.c:250
 msgid "Default Safety Level"
 msgstr "默认安全级别"
 
-#: ../src/frogr-settings-dialog.c:286
+#: src/frogr-settings-dialog.c:276
 msgid "Default License"
 msgstr "默认许可协议"
 
-#: ../src/frogr-settings-dialog.c:310
+#: src/frogr-settings-dialog.c:302
 msgid "Other Defaults"
 msgstr "其他默认值"
 
-#: ../src/frogr-settings-dialog.c:322
+#: src/frogr-settings-dialog.c:312
+msgid "_Show Pictures in Global Search Results"
+msgstr "显示在全局搜索结果中(_S)"
+
+#: src/frogr-settings-dialog.c:315
 msgid "Set Geo_location Information for Pictures"
 msgstr "设置相片的地理位置信息(_L)"
 
-#: ../src/frogr-settings-dialog.c:325
-msgid "_Show Pictures in Global Search Results"
-msgstr "显示在全局搜索结果中(_S)"
+#: src/frogr-settings-dialog.c:318
+msgid "Replace 'Date Posted' with 'Date Taken' for Pictures"
+msgstr ""
 
-#: ../src/frogr-settings-dialog.c:331
+#: src/frogr-settings-dialog.c:324
 msgid "_General"
 msgstr "常规(_G)"
 
-#: ../src/frogr-settings-dialog.c:356
+#: src/frogr-settings-dialog.c:344
 msgid "Proxy Settings"
 msgstr "代理设置"
 
-#. Enable proxy
-#: ../src/frogr-settings-dialog.c:366
+#: src/frogr-settings-dialog.c:353
 msgid "_Enable HTTP Proxy"
 msgstr "使用 HTTP 代理(_E)"
 
-#: ../src/frogr-settings-dialog.c:378
+#: src/frogr-settings-dialog.c:363
 msgid "_Host:"
 msgstr "主机(_H):"
 
-#. Proxy port
-#: ../src/frogr-settings-dialog.c:391
+#: src/frogr-settings-dialog.c:376
 msgid "_Port:"
 msgstr "端口(_P):"
 
-#. Proxy username
-#: ../src/frogr-settings-dialog.c:404
+#: src/frogr-settings-dialog.c:389
 msgid "U_sername:"
 msgstr "用户名(_S):"
 
-#. Proxy password
-#: ../src/frogr-settings-dialog.c:417
+#: src/frogr-settings-dialog.c:402
 msgid "Pass_word:"
 msgstr "密码(_W):"
 
-#: ../src/frogr-settings-dialog.c:457
+#: src/frogr-settings-dialog.c:426
 msgid "Connec_tion"
 msgstr "连接(_T)"
 
-#: ../src/frogr-settings-dialog.c:480
+#: src/frogr-settings-dialog.c:444
 msgid "Other options"
 msgstr "其他选项"
 
-#: ../src/frogr-settings-dialog.c:492
+#: src/frogr-settings-dialog.c:454
 msgid "Ena_ble Tags Auto-Completion"
 msgstr "启用标签自动补全(_B)"
 
-#: ../src/frogr-settings-dialog.c:495
+#: src/frogr-settings-dialog.c:457
 msgid "_Import Tags from Pictures Metadata"
 msgstr "从相片元数据导入标签(_I)"
 
-#: ../src/frogr-settings-dialog.c:499
+#: src/frogr-settings-dialog.c:461
 msgid "Use _Dark GTK Theme"
 msgstr "使用深色 GTK 主题(_D)"
 
-#: ../src/frogr-settings-dialog.c:503
+#: src/frogr-settings-dialog.c:465
 msgid "_Keep File Extensions in Titles when Loading"
 msgstr "加载时保留标题中的文件扩展名(_K)"
 
-#: ../src/frogr-settings-dialog.c:509
+#: src/frogr-settings-dialog.c:471
 msgid "_Misc"
 msgstr "杂项(_M)"
 
-#: ../src/frogr-settings-dialog.c:1045
+#: src/frogr-settings-dialog.c:972
 msgid "Preferences"
 msgstr "首选项"
 
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:1
-msgid "Aut_horize Account…"
-msgstr "认证账户(_H)..."
-
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:2
-msgid "_Preferences…"
-msgstr "首选项(_P)..."
-
-#: ../data/gtkbuilder/frogr-app-menu.xml.h:3
-msgid "_Help"
-msgstr "帮助(_H)"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:1
-msgid "_File"
-msgstr "文件(_F)"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:2
-msgid "_Open…"
-msgstr "打开(_O)..."
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:4
-msgid "Save _As…"
-msgstr "保存为(_A)..."
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:5
-msgid "A_dd Elements…"
-msgstr "添加元素(_D)..."
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:6
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:8
-msgid "_Remove Elements"
-msgstr "移除元素(_R)"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:7
-msgid "_Upload All"
-msgstr "全部上传(_U)"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:9
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:1
-msgid "_Edit Details…"
-msgstr "编辑详细信息(_E)..."
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:10
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:2
-msgid "Add _Tags…"
-msgstr "添加标签(_T)..."
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:11
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:3
-msgid "Add to _Group…"
-msgstr "添加到群组(_G)..."
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:12
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:4
-msgid "Add to _Photoset"
-msgstr "添加到相片集(_P)"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:13
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:5
-msgid "_Add to Existing Photoset…"
-msgstr "添加到已有相片集(_A)..."
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:14
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:6
-msgid "_Create New Photoset…"
-msgstr "创建新相片集(_C)..."
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:15
-#: ../data/gtkbuilder/frogr-context-menu.xml.h:7
-msgid "_Open in External Viewer"
-msgstr "在外部查看器中打开(_O)"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:16
-msgid "_View"
-msgstr "查看(_V)"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:17
-msgid "_Sort Elements"
-msgstr "排序元素(_S)"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:18
-msgid "As _Loaded"
-msgstr "同载入时(_L)"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:19
-msgid "By _Date Taken"
-msgstr "按拍摄日期(_D)"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:20
-msgid "By _Title"
-msgstr "按标题(_T)"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:21
-msgid "By _Size"
-msgstr "按大小(_S)"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:22
-msgid "_Reversed Order"
-msgstr "逆序(_R)"
-
-#: ../data/gtkbuilder/frogr-menu-bar.xml.h:23
-msgid "Enable _Tooltips"
-msgstr "启用工具提示(_T)"
+#~ msgid "Frogr"
+#~ msgstr "Frogr"
+
+#~ msgid "Aut_horize Account…"
+#~ msgstr "认证账户(_H)..."
+
+#~ msgid "_Preferences…"
+#~ msgstr "首选项(_P)..."
+
+#~ msgid "_Help"
+#~ msgstr "帮助(_H)"
+
+#~ msgid "_File"
+#~ msgstr "文件(_F)"
+
+#~ msgid "_Open…"
+#~ msgstr "打开(_O)..."
+
+#~ msgid "Save _As…"
+#~ msgstr "保存为(_A)..."
+
+#~ msgid "A_dd Elements…"
+#~ msgstr "添加元素(_D)..."
+
+#~ msgid "_Remove Elements"
+#~ msgstr "移除元素(_R)"
+
+#~ msgid "_Upload All"
+#~ msgstr "全部上传(_U)"
+
+#~ msgid "_Edit Details…"
+#~ msgstr "编辑详细信息(_E)..."
+
+#~ msgid "Add _Tags…"
+#~ msgstr "添加标签(_T)..."
+
+#~ msgid "Add to _Group…"
+#~ msgstr "添加到群组(_G)..."
+
+#~ msgid "Add to _Photoset"
+#~ msgstr "添加到相片集(_P)"
+
+#~ msgid "_Add to Existing Photoset…"
+#~ msgstr "添加到已有相片集(_A)..."
+
+#~ msgid "_Create New Photoset…"
+#~ msgstr "创建新相片集(_C)..."
+
+#~ msgid "_Open in External Viewer"
+#~ msgstr "在外部查看器中打开(_O)"
+
+#~ msgid "_View"
+#~ msgstr "查看(_V)"
+
+#~ msgid "_Sort Elements"
+#~ msgstr "排序元素(_S)"
+
+#~ msgid "As _Loaded"
+#~ msgstr "同载入时(_L)"
+
+#~ msgid "By _Date Taken"
+#~ msgstr "按拍摄日期(_D)"
+
+#~ msgid "By _Title"
+#~ msgstr "按标题(_T)"
+
+#~ msgid "By _Size"
+#~ msgstr "按大小(_S)"
+
+#~ msgid "_Reversed Order"
+#~ msgstr "逆序(_R)"
+
+#~ msgid "Enable _Tooltips"
+#~ msgstr "启用工具提示(_T)"
 
 #~ msgid "Visible to _Family"
 #~ msgstr "家人可见(_F)"
@@ -942,15 +914,9 @@ msgstr "启用工具提示(_T)"
 #~ msgid " - %d pictures to upload (%s)"
 #~ msgstr " - 待上传 %d 张图片(%s)"
 
-#~ msgid "_Load Pictures…"
-#~ msgstr "加载相片(_L)..."
-
 #~ msgid "_Remove Pictures"
 #~ msgstr "移除相片(_R)"
 
-#~ msgid "frogr"
-#~ msgstr "frogr"
-
 #~ msgid "A_ctions"
 #~ msgstr "操作(_C)"
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]