[frogr] update Simplified Chinese (zh_CN) translation

[YunQiang Su <yqsu src gnome org>]

commit 456a6b9b1fc522ec76e3d787456237021085af4c
Author: tuhaihe <wangdianjin linuxdeepin com>
Date:   Sat Jun 23 21:30:01 2012 +0800

    update Simplified Chinese (zh_CN) translation

 po/zh_CN.po |  649 ++++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 444 insertions(+), 205 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 88abaeb..8b28fd2 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,13 +8,14 @@ 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: 2011-03-14 12:51+0000\n"
-"PO-Revision-Date: 2011-03-06 16:21+0800\n"
-"Last-Translator: Yinghua Wang <wantinghard gmail com>\n"
+"POT-Creation-Date: 2012-05-25 10:25+0000\n"
+"PO-Revision-Date: 2012-05-24 21:04+0800\n"
+"Last-Translator: tuhaihe <1132321739qq gmail com>\n"
 "Language-Team: Chinese (China) <i18n-zh googlegroups com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/frogr.desktop.in.in.h:1
@@ -29,61 +30,69 @@ msgstr "Frogrïää GNOME äç Flickr èçæçå"
 msgid "Upload and organize photos in Flickr accounts"
 msgstr "ääåæç Flickr èæäççç"
 
-#: ../src/frogr-about-dialog.c:44
+#: ../src/frogr-about-dialog.c:43
 msgid "A Flickr remote organizer for GNOME\n"
 msgstr "ää GNOME äç Flickr èçæçå\n"
 
-#: ../src/frogr-about-dialog.c:106
+#: ../src/frogr-about-dialog.c:115
 msgid "translator-credits"
-msgstr "Yinghua Wang <wantinghard gmail com>"
+msgstr ""
+"Yinghua Wang <wantinghard gmail com>\n"
+"tuhaihe <1132321739qq gmail com>, 2012"
 
-#: ../src/frogr-add-tags-dialog.c:343
+#: ../src/frogr-add-tags-dialog.c:201
 msgid "Enter a spaces separated list of tags:"
 msgstr "èåäçåæçïäéååéï"
 
-#: ../src/frogr-add-tags-dialog.c:390
+#: ../src/frogr-add-tags-dialog.c:224
 msgid "Add Tags"
 msgstr "æåæç"
 
-#: ../src/frogr-add-to-set-dialog.c:133
+#: ../src/frogr-add-to-set-dialog.c:131
 msgid "Title"
 msgstr "æé"
 
-#: ../src/frogr-add-to-set-dialog.c:148 ../src/frogr-add-to-group-dialog.c:148
+#: ../src/frogr-add-to-set-dialog.c:146 ../src/frogr-add-to-group-dialog.c:146
 msgid "Elements"
 msgstr "åç"
 
-#: ../src/frogr-add-to-set-dialog.c:573
+#: ../src/frogr-add-to-set-dialog.c:563
 msgid "Add to Sets"
 msgstr "æååççé"
 
-#: ../src/frogr-add-to-group-dialog.c:133
+#: ../src/frogr-add-to-group-dialog.c:131
 msgid "Name"
 msgstr "åç"
 
-#: ../src/frogr-add-to-group-dialog.c:573
+#: ../src/frogr-add-to-group-dialog.c:563
 msgid "Add to Groups"
 msgstr "æååçç"
 
 #: ../src/frogr-auth-dialog.c:32
 #, c-format
 msgid ""
-"Please press the button to authorize %s and then come back to this screen to "
-"complete the process."
-msgstr "èçåèæéå %s èèèèïçåèåæåååææäèçã"
+"Please press the button to authorize %s and then come back to complete the "
+"process."
+msgstr "èæäèæéå %s èèèèïçåèåäåææèçã"
 
 #: ../src/frogr-auth-dialog.c:36
+msgid "Enter verification code:"
+msgstr "èåéèçï"
+
+#: ../src/frogr-auth-dialog.c:63 ../src/frogr-auth-dialog.c:147
 #, c-format
-msgid ""
-"Press the button to start using %s once you've authorized it in your flickr "
-"account."
-msgstr "åæåèåç flickr èæäèè %s åïçåææéååäçã"
+msgid "Authorize %s"
+msgstr "èè %s"
 
-#: ../src/frogr-controller.c:240
-msgid "Process cancelled by the user"
-msgstr "çæåæäæä"
+#: ../src/frogr-auth-dialog.c:214
+msgid "Invalid verification code"
+msgstr "ææçéèç"
 
-#: ../src/frogr-controller.c:245
+#: ../src/frogr-controller.c:277
+msgid "Process cancelled"
+msgstr "æäååæ"
+
+#: ../src/frogr-controller.c:282
 msgid ""
 "Connection error:\n"
 "Network not available"
@@ -91,7 +100,7 @@ msgstr ""
 "èæéèï\n"
 "ççäåç"
 
-#: ../src/frogr-controller.c:250
+#: ../src/frogr-controller.c:287
 msgid ""
 "Connection error:\n"
 "Bad request"
@@ -99,7 +108,7 @@ msgstr ""
 "èæéèï\n"
 "ææèæ"
 
-#: ../src/frogr-controller.c:255
+#: ../src/frogr-controller.c:292
 msgid ""
 "Connection error:\n"
 "Server-side error"
@@ -107,7 +116,7 @@ msgstr ""
 "èæéèï\n"
 "æååçéè"
 
-#: ../src/frogr-controller.c:260
+#: ../src/frogr-controller.c:297
 msgid ""
 "Error uploading picture:\n"
 "File invalid"
@@ -115,7 +124,7 @@ msgstr ""
 "ääççåéï\n"
 "æäææ"
 
-#: ../src/frogr-controller.c:265
+#: ../src/frogr-controller.c:302
 msgid ""
 "Error uploading picture:\n"
 "Quota exceeded"
@@ -123,7 +132,7 @@ msgstr ""
 "ääççåéï\n"
 "èåéé"
 
-#: ../src/frogr-controller.c:270
+#: ../src/frogr-controller.c:307
 msgid ""
 "Error:\n"
 "Photo not found"
@@ -131,7 +140,7 @@ msgstr ""
 "éèï\n"
 "æäåçç"
 
-#: ../src/frogr-controller.c:275
+#: ../src/frogr-controller.c:312
 msgid ""
 "Error:\n"
 "Photo already in photoset"
@@ -139,7 +148,7 @@ msgstr ""
 "éèï\n"
 "ççååççéä"
 
-#: ../src/frogr-controller.c:280
+#: ../src/frogr-controller.c:317
 msgid ""
 "Error:\n"
 "Photo already in group"
@@ -147,7 +156,7 @@ msgstr ""
 "éèï\n"
 "ççååççä"
 
-#: ../src/frogr-controller.c:285
+#: ../src/frogr-controller.c:322
 msgid ""
 "Error:\n"
 "Photo already in the maximum number of groups possible"
@@ -155,7 +164,7 @@ msgstr ""
 "éèï\n"
 "ççæåçççæåèäé"
 
-#: ../src/frogr-controller.c:290
+#: ../src/frogr-controller.c:327
 msgid ""
 "Error:\n"
 "Group limit already reached"
@@ -163,7 +172,7 @@ msgstr ""
 "éèï\n"
 "åçèåççéå"
 
-#: ../src/frogr-controller.c:295
+#: ../src/frogr-controller.c:332
 msgid ""
 "Error:\n"
 "Photo added to group's queue"
@@ -171,7 +180,7 @@ msgstr ""
 "éèï\n"
 "ççåæååççéåä"
 
-#: ../src/frogr-controller.c:300
+#: ../src/frogr-controller.c:337
 msgid ""
 "Error:\n"
 "Photo already added to group's queue"
@@ -179,7 +188,7 @@ msgstr ""
 "éèï\n"
 "ççåçæååççéåä"
 
-#: ../src/frogr-controller.c:305
+#: ../src/frogr-controller.c:342
 msgid ""
 "Error:\n"
 "Content not allowed for this group"
@@ -187,7 +196,7 @@ msgstr ""
 "éèï\n"
 "æççäåèæçåå"
 
-#: ../src/frogr-controller.c:310
+#: ../src/frogr-controller.c:347
 #, c-format
 msgid ""
 "Authorization failed.\n"
@@ -196,7 +205,7 @@ msgstr ""
 "èèåèã\n"
 "èéè"
 
-#: ../src/frogr-controller.c:316
+#: ../src/frogr-controller.c:353
 #, c-format
 msgid ""
 "Error\n"
@@ -207,7 +216,34 @@ msgstr ""
 "%s æçèæçèèïææääççå flickrã\n"
 "èéæååèèèè"
 
-#: ../src/frogr-controller.c:322
+#: ../src/frogr-controller.c:359
+#, c-format
+msgid ""
+"Unable to authenticate in flickr\n"
+"Please try again."
+msgstr ""
+"ææå flickr äèè\n"
+"èéèã"
+
+#: ../src/frogr-controller.c:364
+#, c-format
+msgid ""
+"You have not properly authorized %s yet.\n"
+"Please try again."
+msgstr ""
+"æèæææçèè %sã\n"
+"èéèã"
+
+#: ../src/frogr-controller.c:370
+#, c-format
+msgid ""
+"Invalid verification code.\n"
+"Please try again."
+msgstr ""
+"ææçéèçã\n"
+"èéèã"
+
+#: ../src/frogr-controller.c:375
 #, c-format
 msgid ""
 "Error:\n"
@@ -217,44 +253,78 @@ msgstr ""
 "æåäåç"
 
 #. General error: just dump the raw error description
-#: ../src/frogr-controller.c:328
+#: ../src/frogr-controller.c:381
 #, c-format
-msgid "An error happened while uploading a picture: %s."
-msgstr "ääççæåçäääéèï%sã"
+msgid "An error happened: %s."
+msgstr "åçéèï%sã"
 
-#: ../src/frogr-controller.c:900
+#: ../src/frogr-controller.c:591
+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â"
+msgstr "æåèçåçåçäç..."
+
+#: ../src/frogr-controller.c:1206
 msgid "Creating new photosetsâ"
 msgstr "æåååæççé..."
 
-#: ../src/frogr-controller.c:924
+#: ../src/frogr-controller.c:1230
 msgid "Adding picture to photosetsâ"
 msgstr "æååççéæåçç..."
 
-#: ../src/frogr-controller.c:946
+#: ../src/frogr-controller.c:1252
 msgid "Adding picture to groupsâ"
 msgstr "æååççæåçç..."
 
-#: ../src/frogr-controller.c:1530
-msgid "No sets found"
-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:1292
+#, c-format
+msgid ""
+"Can't load picture %s: size of file is bigger than the maximum allowed for "
+"this account (%s)"
+msgstr "ææåèåç %sïæäåååäèåå(%s)æåèçæååå"
 
-#: ../src/frogr-controller.c:1564
-msgid "No groups found"
-msgstr "ææåçç"
+#: ../src/frogr-controller.c:1766
+msgid "Updating credentialsâ"
+msgstr "æåææåè..."
 
-#: ../src/frogr-controller.c:2000 ../src/frogr-controller.c:2026
-msgid "Retrieving list of tagsâ"
-msgstr "æåèåæçåè..."
+#: ../src/frogr-controller.c:1771
+msgid "Retrieving data for authorizationâ"
+msgstr "æåèåèèææ..."
+
+#: ../src/frogr-controller.c:1776
+msgid "Finishing authorizationâ"
+msgstr "æååæèè..."
 
-#: ../src/frogr-controller.c:2050 ../src/frogr-controller.c:2073
+#: ../src/frogr-controller.c:1781
 msgid "Retrieving list of setsâ"
 msgstr "æåèåççéåè..."
 
-#: ../src/frogr-controller.c:2096
+#: ../src/frogr-controller.c:1786
 msgid "Retrieving list of groupsâ"
 msgstr "æåèåççåè..."
 
-#: ../src/frogr-controller.c:2175
+#: ../src/frogr-controller.c:1791
+msgid "Retrieving list of tagsâ"
+msgstr "æåèåæçåè..."
+
+#: ../src/frogr-controller.c:1927
+msgid "No sets found"
+msgstr "ææåççé"
+
+#: ../src/frogr-controller.c:1959
+msgid "No groups found"
+msgstr "ææåçç"
+
+#: ../src/frogr-controller.c:2676
 #, c-format
 msgid ""
 "You need to properly authorize %s before uploading any pictures to flickr.\n"
@@ -264,282 +334,451 @@ msgstr ""
 "èéæååèèèèã"
 
 #. This shows a dialog notifying the problem to the user
-#: ../src/frogr-create-new-set-dialog.c:120 ../src/frogr-details-dialog.c:900
+#: ../src/frogr-create-new-set-dialog.c:134 ../src/frogr-details-dialog.c:1007
 msgid "Missing data required"
 msgstr "éèçåçææ"
 
-#: ../src/frogr-create-new-set-dialog.c:300
-msgid "Set's title:"
-msgstr "ççéæéï"
+#: ../src/frogr-create-new-set-dialog.c:321
+msgid "Title:"
+msgstr "æéï"
 
-#: ../src/frogr-create-new-set-dialog.c:313
-msgid "Set's description:"
-msgstr "ççéæèï"
+#: ../src/frogr-create-new-set-dialog.c:334
+msgid "Description:"
+msgstr "æèï"
 
-#: ../src/frogr-create-new-set-dialog.c:352
-msgid "Create new Set"
+#: ../src/frogr-create-new-set-dialog.c:357
+msgid "Fill Pictures Details with Title and Description"
+msgstr "åååççæéåæèçè"
+
+#: ../src/frogr-create-new-set-dialog.c:378
+msgid "Create New Set"
 msgstr "ååæççé"
 
-#: ../src/frogr-details-dialog.c:157
+#: ../src/frogr-details-dialog.c:91 ../src/frogr-settings-dialog.c:105
+msgid "Default (as specified in flickr)"
+msgstr "éè(ä flickr äæåççå)"
+
+#: ../src/frogr-details-dialog.c:92 ../src/frogr-settings-dialog.c:106
+msgid "All rights reserved"
+msgstr "äçæææå"
+
+#: ../src/frogr-details-dialog.c:93 ../src/frogr-settings-dialog.c:107
+msgid "CC Attribution-NonCommercial-ShareAlike"
+msgstr "CC çå - éåäæäç - çåæååä"
+
+#: ../src/frogr-details-dialog.c:94 ../src/frogr-settings-dialog.c:108
+msgid "CC Attribution-NonCommercial"
+msgstr "CC çå - éåäæ"
+
+#: ../src/frogr-details-dialog.c:95 ../src/frogr-settings-dialog.c:109
+msgid "CC Attribution-NonCommercial-NoDerivs"
+msgstr "CCçå - éåäæäç - çææç"
+
+#: ../src/frogr-details-dialog.c:96 ../src/frogr-settings-dialog.c:110
+msgid "CC Attribution"
+msgstr "CC çå"
+
+#: ../src/frogr-details-dialog.c:97 ../src/frogr-settings-dialog.c:111
+msgid "CC Attribution-ShareAlike"
+msgstr "CCçå - çåæååä"
+
+#: ../src/frogr-details-dialog.c:98 ../src/frogr-settings-dialog.c:112
+msgid "CC Attribution-NoDerivs"
+msgstr "CCçå - çææç"
+
+#: ../src/frogr-details-dialog.c:166
+msgid "Open with image viewer"
+msgstr "äçååæçåæå"
+
+#: ../src/frogr-details-dialog.c:189
 msgid "Visibility"
 msgstr "åèæ"
 
-#: ../src/frogr-details-dialog.c:168 ../src/frogr-settings-dialog.c:144
+#: ../src/frogr-details-dialog.c:200 ../src/frogr-settings-dialog.c:204
 msgid "_Private"
 msgstr "çæ(_P)"
 
-#: ../src/frogr-details-dialog.c:172 ../src/frogr-settings-dialog.c:148
+#: ../src/frogr-details-dialog.c:204 ../src/frogr-settings-dialog.c:206
 msgid "P_ublic"
 msgstr "åå(_U)"
 
-#: ../src/frogr-details-dialog.c:180 ../src/frogr-settings-dialog.c:156
+#: ../src/frogr-details-dialog.c:212 ../src/frogr-settings-dialog.c:213
 msgid "Visible to _Family"
 msgstr "åäåè(_F)"
 
-#: ../src/frogr-details-dialog.c:184 ../src/frogr-settings-dialog.c:160
+#: ../src/frogr-details-dialog.c:216 ../src/frogr-settings-dialog.c:215
 msgid "Visible to F_riends"
 msgstr "æååè(_R)"
 
-#: ../src/frogr-details-dialog.c:197 ../src/frogr-settings-dialog.c:168
-msgid "_Show up in Global Search Results"
-msgstr "æçåååæççæä(_S)"
-
-#: ../src/frogr-details-dialog.c:210
-msgid "Content type"
+#: ../src/frogr-details-dialog.c:238
+msgid "Content Type"
 msgstr "ååçå"
 
-#: ../src/frogr-details-dialog.c:219 ../src/frogr-settings-dialog.c:205
+#: ../src/frogr-details-dialog.c:247 ../src/frogr-settings-dialog.c:240
 msgid "P_hoto"
 msgstr "çç(_H)"
 
-#: ../src/frogr-details-dialog.c:223 ../src/frogr-settings-dialog.c:209
+#: ../src/frogr-details-dialog.c:251 ../src/frogr-settings-dialog.c:242
 msgid "Scree_nshot"
 msgstr "æå(_N)"
 
-#: ../src/frogr-details-dialog.c:227 ../src/frogr-settings-dialog.c:213
+#: ../src/frogr-details-dialog.c:255 ../src/frogr-settings-dialog.c:244
 msgid "Oth_er"
 msgstr "åä(_E)"
 
-#: ../src/frogr-details-dialog.c:241
-msgid "Safety level"
+#: ../src/frogr-details-dialog.c:269
+msgid "Safety Level"
 msgstr "ååçå"
 
-#: ../src/frogr-details-dialog.c:250 ../src/frogr-settings-dialog.c:246
+#: ../src/frogr-details-dialog.c:278 ../src/frogr-settings-dialog.c:264
 msgid "S_afe"
 msgstr "åå(_A)"
 
-#: ../src/frogr-details-dialog.c:254 ../src/frogr-settings-dialog.c:250
+#: ../src/frogr-details-dialog.c:282 ../src/frogr-settings-dialog.c:266
 msgid "_Moderate"
 msgstr "äç(_M)"
 
-#: ../src/frogr-details-dialog.c:258 ../src/frogr-settings-dialog.c:254
+#: ../src/frogr-details-dialog.c:286 ../src/frogr-settings-dialog.c:268
 msgid "Restr_icted"
 msgstr "äæ(_I)"
 
-#: ../src/frogr-details-dialog.c:272
+#: ../src/frogr-details-dialog.c:299
+msgid "License Type"
+msgstr "èåèçå"
+
+#: ../src/frogr-details-dialog.c:322
+msgid "Other Properties"
+msgstr "åäåæ"
+
+#: ../src/frogr-details-dialog.c:331
+msgid "Set Geo_location Information"
+msgstr "èçåçäçäæ(_L)"
+
+#: ../src/frogr-details-dialog.c:335
+msgid "_Show Up in Global Search Results"
+msgstr "æçåååæççæä(_S)"
+
+#: ../src/frogr-details-dialog.c:347
 msgid "_Title:"
 msgstr "æé(_T)ï"
 
-#: ../src/frogr-details-dialog.c:284
+#: ../src/frogr-details-dialog.c:359
 msgid "_Description:"
 msgstr "æè(_D)ï"
 
-#: ../src/frogr-details-dialog.c:310
+#: ../src/frogr-details-dialog.c:385
 msgid "Ta_gs:"
 msgstr "æç(_G)ï"
 
-#: ../src/frogr-details-dialog.c:1078
+#. Visually indicate how many pictures are being edited
+#: ../src/frogr-details-dialog.c:482
 #, c-format
-msgid "Edit Picture Details"
-msgid_plural "Edit Picture Details (%d Pictures)"
-msgstr[0] "çèçççè(%d åçç)"
-
-#. File menu
-#: ../src/frogr-main-view.c:229
-msgid "_File"
-msgstr "æä(_F)"
-
-#: ../src/frogr-main-view.c:235
-msgid "_Add Pictures"
-msgstr "æåçç(_A)"
+msgid "(%d Picture)"
+msgid_plural "(%d Pictures)"
+msgstr[0] "(%d åçç)"
 
-#. Remove
-#: ../src/frogr-main-view.c:242 ../src/frogr-main-view.c:450
-msgid "_Remove Pictures"
-msgstr "çéçç(_R)"
-
-#. Accounts menu item and submenu
-#: ../src/frogr-main-view.c:252
-msgid "Accou_nts"
-msgstr "èæ(_N)"
-
-#. Authorize menu item
-#: ../src/frogr-main-view.c:258
-msgid "Authorize _frogr"
-msgstr "èè(_F)"
-
-#: ../src/frogr-main-view.c:267
-msgid "_Preferencesâ"
-msgstr "ééé(_P)..."
-
-#: ../src/frogr-main-view.c:275
-msgid "_Quit"
-msgstr "éå(_Q)"
+#: ../src/frogr-details-dialog.c:560
+msgid "An error happened trying to load the picture"
+msgstr "åèåèççæåçéè"
 
-#. Actions menu
-#: ../src/frogr-main-view.c:281
-msgid "A_ctions"
-msgstr "æä(_C)"
-
-#. Edit details
-#: ../src/frogr-main-view.c:287 ../src/frogr-main-view.c:408
-msgid "Edit _Detailsâ"
-msgstr "çèçè(_D)..."
-
-#. Add Tags
-#: ../src/frogr-main-view.c:294 ../src/frogr-main-view.c:415
-msgid "Add _Tagsâ"
-msgstr "æåæç(_T)..."
-
-#. Add to group
-#: ../src/frogr-main-view.c:301 ../src/frogr-main-view.c:422
-msgid "Add to _Groupâ"
-msgstr "æååçç(_G)..."
-
-#. Add to set
-#: ../src/frogr-main-view.c:308 ../src/frogr-main-view.c:429
-msgid "Add to _Set"
-msgstr "æååççé(_S)"
-
-#: ../src/frogr-main-view.c:315 ../src/frogr-main-view.c:435
-msgid "_Create New Setâ"
-msgstr "ååæççé(_C)..."
-
-#: ../src/frogr-main-view.c:322 ../src/frogr-main-view.c:441
-msgid "Add to _Existing Setâ"
-msgstr "æåååæççé(_E)..."
-
-#: ../src/frogr-main-view.c:331
-msgid "_Upload All"
-msgstr "åéää(_U)"
+#: ../src/frogr-details-dialog.c:1227
+msgid "Edit Picture Details"
+msgstr "çèçççè"
 
-#. Help menu
-#: ../src/frogr-main-view.c:339
-msgid "_Help"
-msgstr "åå(_H)"
+#. String showind the date and time a picture was taken
+#: ../src/frogr-main-view.c:753
+#, c-format
+msgid "Taken: %s"
+msgstr ""
 
-#: ../src/frogr-main-view.c:345
-msgid "_About frogr..."
-msgstr "åä frogr(_A)..."
+#: ../src/frogr-main-view.c:758
+#, c-format
+msgid "File size: %s"
+msgstr "æäååï%s"
 
-#: ../src/frogr-main-view.c:897
+#: ../src/frogr-main-view.c:946
 msgid "Select a Picture"
 msgstr "éæäåçç"
 
-#: ../src/frogr-main-view.c:911
+#: ../src/frogr-main-view.c:972
 msgid "images"
 msgstr "åå"
 
-#: ../src/frogr-main-view.c:931
+#: ../src/frogr-main-view.c:993
 msgid "You need to select some pictures first"
 msgstr "æéèåéæääçç"
 
-#: ../src/frogr-main-view.c:1149
+#: ../src/frogr-main-view.c:1334
 msgid "Not connected to flickr"
 msgstr "æèæå flickr"
 
-#: ../src/frogr-main-view.c:1178
-msgid "remaining for the current month"
-msgstr "ææäé"
-
-#: ../src/frogr-main-view.c:1186
-msgid "Connected as"
-msgstr "èæä"
+#. Login string, showing the user is PRO (second '%s') if so.
+#: ../src/frogr-main-view.c:1344
+#, c-format
+msgid "Connected as %s%s"
+msgstr "èæä %s%s"
 
-#: ../src/frogr-main-view.c:1187
-#, fuzzy
+#: ../src/frogr-main-view.c:1345
 msgid " (PRO account)"
 msgstr " (ääèæ)"
 
-#: ../src/frogr-picture-loader.c:92
+#. 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
+#, c-format
+msgid " - %s / %s remaining"
+msgstr " - åä %s / %s "
+
+#: ../src/frogr-main-view.c:1396
+#, c-format
+msgid " - %d pictures to upload (%s)"
+msgstr " - åää %d ååç(%s)"
+
+#: ../src/frogr-main-view.c:1397
+#, c-format
+msgid " - %d picture to upload (%s)"
+msgstr " - åää %d ååç(%s)"
+
+#: ../src/frogr-picture-loader.c:122
 #, c-format
 msgid "Loading pictures %d / %d"
 msgstr "æååèåç %d / %d"
 
 #. Update progress
-#: ../src/frogr-picture-uploader.c:85
+#: ../src/frogr-picture-uploader.c:84
 #, c-format
 msgid "Uploading '%s'â"
 msgstr "æåääâ%sâ..."
 
-#: ../src/frogr-settings-dialog.c:133
+#: ../src/frogr-settings-dialog.c:193
 msgid "Default Visibility"
 msgstr "éèåèæ"
 
-#: ../src/frogr-settings-dialog.c:195
+#: ../src/frogr-settings-dialog.c:229
 msgid "Default Content Type"
 msgstr "éèååçå"
 
-#: ../src/frogr-settings-dialog.c:236
+#: ../src/frogr-settings-dialog.c:253
 msgid "Default Safety Level"
 msgstr "éèååçå"
 
 #: ../src/frogr-settings-dialog.c:277
-msgid "Other options"
-msgstr "åäéé"
+msgid "Default License"
+msgstr "éèèååè"
 
-#: ../src/frogr-settings-dialog.c:287
-msgid "Ena_ble tags auto-completion"
-msgstr "åçæçèååæ(_B)"
+#: ../src/frogr-settings-dialog.c:301
+msgid "Other Defaults"
+msgstr "åäéèå"
+
+#: ../src/frogr-settings-dialog.c:312
+msgid "Set Geo_location Information for Pictures"
+msgstr "èççççåçäçäæ(_L)"
+
+#: ../src/frogr-settings-dialog.c:315
+msgid "_Show Pictures in Global Search Results"
+msgstr "æçåååæççæä(_S)"
 
-#: ../src/frogr-settings-dialog.c:298
+#: ../src/frogr-settings-dialog.c:321
 msgid "_General"
 msgstr "åè(_G)"
 
-#. Proxy settings
-#: ../src/frogr-settings-dialog.c:317
-msgid "_Use HTTP Proxy"
-msgstr "äç HTTP äç(_U)"
+#: ../src/frogr-settings-dialog.c:345
+msgid "Proxy Settings"
+msgstr "äçèç"
 
-#: ../src/frogr-settings-dialog.c:328
+#. Enable proxy
+#: ../src/frogr-settings-dialog.c:355
+msgid "_Enable HTTP Proxy"
+msgstr "äç HTTP äç(_E)"
+
+#: ../src/frogr-settings-dialog.c:365
 msgid "_Host:"
 msgstr "äæ(_H)ï"
 
 #. Proxy port
-#: ../src/frogr-settings-dialog.c:346
+#: ../src/frogr-settings-dialog.c:383
 msgid "_Port:"
 msgstr "çå(_P)ï"
 
 #. Proxy username
-#: ../src/frogr-settings-dialog.c:364
+#: ../src/frogr-settings-dialog.c:401
 msgid "U_sername:"
 msgstr "çæå(_S)ï"
 
 #. Proxy password
-#: ../src/frogr-settings-dialog.c:382
+#: ../src/frogr-settings-dialog.c:419
 msgid "Pass_word:"
 msgstr "åç(_W)ï"
 
-#: ../src/frogr-settings-dialog.c:409
+#. Use GNOME General Proxy Settings
+#: ../src/frogr-settings-dialog.c:440
+msgid "_Use GNOME General Proxy Settings"
+msgstr "äç GNOME éçäçèç(_U)"
+
+#: ../src/frogr-settings-dialog.c:466
 msgid "Connec_tion"
 msgstr "èæ(_T)"
 
-#: ../src/frogr-settings-dialog.c:835
+#: ../src/frogr-settings-dialog.c:488
+msgid "Other options"
+msgstr "åäéé"
+
+#: ../src/frogr-settings-dialog.c:499
+msgid "Ena_ble Tags Auto-Completion"
+msgstr "åçæçèåèå(_B)"
+
+#: ../src/frogr-settings-dialog.c:502
+msgid "_Import Tags from Pictures Metadata"
+msgstr "äåçåææååæç(_I)"
+
+#: ../src/frogr-settings-dialog.c:507
+msgid "Use _Dark GTK Theme"
+msgstr "äçæè GTK äé(_D)"
+
+#: ../src/frogr-settings-dialog.c:512
+msgid "_Keep File Extensions in Titles when Loading"
+msgstr "åèæäçæéäçæäæåå(_K)"
+
+#: ../src/frogr-settings-dialog.c:518
+msgid "_Misc"
+msgstr "æé(_M)"
+
+#: ../src/frogr-settings-dialog.c:1068
 msgid "Preferences"
 msgstr "ééé"
 
 #: ../data/gtkbuilder/frogr-main-view.xml.h:1
+msgid "_About"
+msgstr "åä(_A)"
+
+#: ../data/gtkbuilder/frogr-main-view.xml.h:2
+msgid "_Load Picturesâ"
+msgstr "åèçç(_L)..."
+
+#: ../data/gtkbuilder/frogr-main-view.xml.h:3
+msgid "Add _Tagsâ"
+msgstr "æåæç(_T)..."
+
+#: ../data/gtkbuilder/frogr-main-view.xml.h:4
+msgid "Add to _Groupâ"
+msgstr "æååçç(_G)..."
+
+#: ../data/gtkbuilder/frogr-main-view.xml.h:5
+msgid "_Create New Setâ"
+msgstr "ååæççé(_C)..."
+
+#: ../data/gtkbuilder/frogr-main-view.xml.h:6
+msgid "Add to _Existing Setâ"
+msgstr "æåååæççé(_E)..."
+
+#: ../data/gtkbuilder/frogr-main-view.xml.h:7
+msgid "Aut_horize Accountâ"
+msgstr "èèèæ(_H)..."
+
+#: ../data/gtkbuilder/frogr-main-view.xml.h:8
+msgid "Enable _Tooltips"
+msgstr "åçååæç(_T)"
+
+#: ../data/gtkbuilder/frogr-main-view.xml.h:9
+msgid "Edit _Detailsâ"
+msgstr "çèèçäæ(_D)..."
+
+#: ../data/gtkbuilder/frogr-main-view.xml.h:10
+msgid "_Help"
+msgstr "åå(_H)"
+
+#: ../data/gtkbuilder/frogr-main-view.xml.h:11
+msgid "Open in E_xternal Viewer"
+msgstr "ååéæçåäæå"
+
+#: ../data/gtkbuilder/frogr-main-view.xml.h:12
+msgid "_Preferencesâ"
+msgstr "ééé(_P)..."
+
+#: ../data/gtkbuilder/frogr-main-view.xml.h:13
+msgid "_Quit"
+msgstr "éå(_Q)"
+
+#: ../data/gtkbuilder/frogr-main-view.xml.h:14
+msgid "_Remove Pictures"
+msgstr "çéçç(_R)"
+
+#: ../data/gtkbuilder/frogr-main-view.xml.h:15
+msgid "_Reversed Order"
+msgstr "éå(_R)"
+
+#: ../data/gtkbuilder/frogr-main-view.xml.h:16
+msgid "As _Loaded"
+msgstr ""
+
+#: ../data/gtkbuilder/frogr-main-view.xml.h:17
+msgid "By _Date Taken"
+msgstr "æææææ(_D)"
+
+#: ../data/gtkbuilder/frogr-main-view.xml.h:18
+msgid "By _Title"
+msgstr "ææé(_T)"
+
+#: ../data/gtkbuilder/frogr-main-view.xml.h:19
+msgid "_Upload All"
+msgstr "åéää(_U)"
+
+#: ../data/gtkbuilder/frogr-main-view.xml.h:20
+msgid "Add to _Set"
+msgstr "æååççé(_S)"
+
+#: ../data/gtkbuilder/frogr-main-view.xml.h:21
+msgid "frogr"
+msgstr "frogr"
+
+#: ../data/gtkbuilder/frogr-main-view.xml.h:22
 msgid "Add"
 msgstr "æå"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:2
+#: ../data/gtkbuilder/frogr-main-view.xml.h:23
 msgid "Remove"
 msgstr "çé"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:3
+#: ../data/gtkbuilder/frogr-main-view.xml.h:24
 msgid "Upload"
 msgstr "ää"
 
-#: ../data/gtkbuilder/frogr-main-view.xml.h:4
-msgid "frogr"
-msgstr "frogr"
+#: ../data/gtkbuilder/frogr-main-view.xml.h:25
+msgid "_Frogr"
+msgstr "_Frogr"
+
+#: ../data/gtkbuilder/frogr-main-view.xml.h:26
+msgid "Accou_nts"
+msgstr "èæ(_N)"
+
+#: ../data/gtkbuilder/frogr-main-view.xml.h:27
+msgid "A_ctions"
+msgstr "æä(_C)"
+
+#: ../data/gtkbuilder/frogr-main-view.xml.h:28
+msgid "_View"
+msgstr "æç(_V)"
+
+#: ../data/gtkbuilder/frogr-main-view.xml.h:29
+msgid "_Sort Pictures"
+msgstr "ççæå(_S)"
+
+#~ msgid ""
+#~ "Press the button to start using %s once you've authorized it in your "
+#~ "flickr account."
+#~ msgstr "åæåèåç flickr èæäèè %s åïçåææéååäçã"
+
+#~ msgid "Set's title:"
+#~ msgstr "ççéæéï"
+
+#~ msgid "Set's description:"
+#~ msgstr "ççéæèï"
+
+#~ msgid "_About frogr..."
+#~ msgstr "åä frogr(_A)..."
+
+#~ msgid "remaining for the current month"
+#~ msgstr "ææäé"