[Xfce4-commits] <xfce4-screenshooter:master> Update po files.

Jérôme Guelfucci noreply at xfce.org
Sun Nov 15 00:30:02 CET 2009


Updating branch refs/heads/master
         to 0040564cbf05b175afec8c6664e9706e84d6db7b (commit)
       from e2550bf282cc0ad984cd895641872b2a8e091168 (commit)

commit 0040564cbf05b175afec8c6664e9706e84d6db7b
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Sun Nov 15 00:30:37 2009 +0100

    Update po files.

 po/ar.po                   |  231 +++++++++++++-------------
 po/ast.po                  |  294 ++++++++++++++++++---------------
 po/bg.po                   |  267 ++++++++++++++++--------------
 po/ca.po                   |  291 ++++++++++++++++++--------------
 po/cs.po                   |  386 ++++++++++++++++++++++++++-----------------
 po/da.po                   |  389 ++++++++++++++++++++++++++-----------------
 po/de.po                   |  281 +++++++++++++++++--------------
 po/el.po                   |  293 +++++++++++++++++++--------------
 po/en_GB.po                |  290 ++++++++++++++++++--------------
 po/es.po                   |  394 ++++++++++++++++++++++++++-----------------
 po/et.po                   |  267 ++++++++++++++++--------------
 po/eu.po                   |  315 ++++++++++++++++++++---------------
 po/fi.po                   |  267 ++++++++++++++++--------------
 po/fr.po                   |  295 +++++++++++++++++++--------------
 po/gl.po                   |  383 ++++++++++++++++++++++++++-----------------
 po/hr.po                   |  242 ++++++++++++++--------------
 po/hu.po                   |  277 +++++++++++++++++--------------
 po/id.po                   |  301 +++++++++++++++++++---------------
 po/it.po                   |  335 ++++++++++++++++++++++---------------
 po/ja.po                   |   60 ++++----
 po/kk.po                   |  339 ++++++++++++++++++++++----------------
 po/lv.po                   |  295 +++++++++++++++++++--------------
 po/nb.po                   |  267 ++++++++++++++++--------------
 po/nl.po                   |  390 ++++++++++++++++++++++++++-----------------
 po/pl.po                   |  368 ++++++++++++++++++++++++-----------------
 po/pt.po                   |  391 ++++++++++++++++++++++++++------------------
 po/pt_BR.po                |  267 ++++++++++++++++--------------
 po/ro.po                   |  267 ++++++++++++++++--------------
 po/ru.po                   |  345 +++++++++++++++++++++++----------------
 po/sq.po                   |  263 +++++++++++++++--------------
 po/sv.po                   |  267 ++++++++++++++++--------------
 po/tr.po                   |  393 ++++++++++++++++++++++++++-----------------
 po/uk.po                   |  374 +++++++++++++++++++++++++-----------------
 po/ur.po                   |  364 ++++++++++++++++++++++++-----------------
 po/ur_PK.po                |  364 ++++++++++++++++++++++++-----------------
 po/vi.po                   |  330 +++++++++++++++++++------------------
 po/xfce4-screenshooter.pot |  231 +++++++++++++-------------
 po/zh_CN.po                |  308 +++++++++++++++++++----------------
 po/zh_TW.po                |  242 ++++++++++++++--------------
 39 files changed, 6744 insertions(+), 5179 deletions(-)

diff --git a/po/ar.po b/po/ar.po
index 86abb8a..19d322d 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-31 14:02+0200\n"
+"POT-Creation-Date: 2009-11-15 00:29+0100\n"
 "PO-Revision-Date: 2008-07-15 23:10+0200\n"
 "Last-Translator: Mohamed Magdy <mohamedmk at gmail.com>\n"
 "Language-Team: Arabeyes <doc at arabeyes.org>\n"
@@ -11,322 +11,307 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Arabic\n"
 
-#: ../lib/screenshooter-dialogs.c:283
-msgid "Screenshot.png"
-msgstr ""
-
-#: ../lib/screenshooter-dialogs.c:300
-#, c-format
-msgid "Screenshot-%d.png"
-msgstr ""
-
-#: ../lib/screenshooter-dialogs.c:493
+#: ../lib/screenshooter-dialogs.c:478
 #, c-format
 msgid "%.2fKb of %.2fKb"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:577
+#: ../lib/screenshooter-dialogs.c:560
 msgid "Transfer"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:600
+#: ../lib/screenshooter-dialogs.c:581
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being "
 "transferred to:</span>"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:724 ../lib/screenshooter-dialogs.c:741
+#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
 msgid "Screenshot"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:736
+#: ../lib/screenshooter-dialogs.c:709
 msgid "Take a screenshot"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:751
+#: ../lib/screenshooter-dialogs.c:724
 msgid "Preferences"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:793
+#: ../lib/screenshooter-dialogs.c:754
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Region to capture</span>"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:820
+#: ../lib/screenshooter-dialogs.c:774
 msgid "Entire screen"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:830 ../src/main.c:58
-#: ../panel-plugin/screenshooter-plugin.c:292
+#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../panel-plugin/screenshooter-plugin.c:308
 msgid "Take a screenshot of the entire screen"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:841
+#: ../lib/screenshooter-dialogs.c:789
 msgid "Active window"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:851 ../src/main.c:104
-#: ../panel-plugin/screenshooter-plugin.c:297
+#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:862
+#: ../lib/screenshooter-dialogs.c:804
 msgid "Select a region"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:872 ../src/main.c:78
-#: ../panel-plugin/screenshooter-plugin.c:302
+#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../panel-plugin/screenshooter-plugin.c:318
 msgid ""
 "Select a region to be captured by clicking a point of the screen without "
 "releasing the mouse button, dragging your mouse to the other corner of the "
 "region, and releasing the mouse button."
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:884
+#: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:892
+#: ../lib/screenshooter-dialogs.c:824
 msgid "Display the mouse pointer on the screenshot"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:917
+#: ../lib/screenshooter-dialogs.c:840
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:952
+#: ../lib/screenshooter-dialogs.c:862
 msgid "Delay in seconds before the screenshot is taken"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:958
+#: ../lib/screenshooter-dialogs.c:865
 msgid "seconds"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:984
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
-msgstr ""
-
-#. Display the save dialog checkbox
-#: ../lib/screenshooter-dialogs.c:1007
-msgid "Show the save dialog"
-msgstr ""
-
-#: ../lib/screenshooter-dialogs.c:1013
-msgid ""
-"The save dialog allows you to change the file name and the save location"
-msgstr ""
-
-#: ../lib/screenshooter-dialogs.c:1027
-msgid "Close the application"
-msgstr ""
-
-#: ../lib/screenshooter-dialogs.c:1033
-msgid ""
-"If unchecked, the current window will be displayed again after the "
-"screenshot has been taken to allow you to take several screenshots in a row"
+#: ../lib/screenshooter-dialogs.c:917
+msgid "Action"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1056
+#: ../lib/screenshooter-dialogs.c:945
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Action</span>"
 msgstr ""
 
 #. Save option radio button
-#: ../lib/screenshooter-dialogs.c:1081
-msgid "Save in:"
+#: ../lib/screenshooter-dialogs.c:961
+msgid "Save"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1089
+#: ../lib/screenshooter-dialogs.c:966
 msgid "Save the screenshot to a PNG file"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1104
-msgid "Default save location"
-msgstr ""
-
-#: ../lib/screenshooter-dialogs.c:1114
-msgid "Set the default save location"
-msgstr ""
-
-#: ../lib/screenshooter-dialogs.c:1127
+#: ../lib/screenshooter-dialogs.c:975
 msgid "Copy to the clipboard"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1132
+#: ../lib/screenshooter-dialogs.c:977
 msgid "Copy the screenshot to the clipboard so that it can be pasted later"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1147
+#: ../lib/screenshooter-dialogs.c:994
 msgid "Open with:"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1158
+#: ../lib/screenshooter-dialogs.c:1000
 msgid "Open the screenshot with the chosen application"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1191 ../src/main.c:73
+#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
 msgid "Application to open the screenshot"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1204
+#: ../lib/screenshooter-dialogs.c:1028
 msgid "Host on ZimageZ"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1210 ../src/main.c:92
+#: ../lib/screenshooter-dialogs.c:1032 ../src/main.c:80
 msgid "Host the screenshot on ZimageZ, a free online image hosting service"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1255
+#: ../lib/screenshooter-dialogs.c:1046
+msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Preview</span>"
+msgstr ""
+
+#: ../lib/screenshooter-dialogs.c:1107
 msgid "Save screenshot as..."
 msgstr ""
 
-#. Start the user XML RPC session
-#: ../lib/screenshooter-zimagez.c:159
-msgid "Initialize the connection..."
+#: ../lib/screenshooter-zimagez.c:134
+#, c-format
+msgid "An error occured when creating the XMLRPC request."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:172 ../lib/screenshooter-zimagez.c:332
-#: ../lib/screenshooter-zimagez.c:361 ../lib/screenshooter-zimagez.c:389
-#: ../lib/screenshooter-zimagez.c:520 ../lib/screenshooter-zimagez.c:543
-#: ../lib/screenshooter-zimagez.c:580
+#: ../lib/screenshooter-zimagez.c:153
 #, c-format
-msgid ""
-"An error occurred during the XML exchange: %s (%d).\n"
-" The screenshot could not be uploaded."
+msgid "An error occured when transfering the data to ZimageZ."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:223
+#: ../lib/screenshooter-zimagez.c:178
+#, c-format
+msgid "An error occured when parsing the response from ZimageZ."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:228
+#, c-format
+msgid "Taken on %s, at %s"
+msgstr ""
+
+#. Start the user soup session
+#: ../lib/screenshooter-zimagez.c:295
+msgid "Initialize the connection..."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:341
 msgid ""
 "Please file the following fields with your <a href=\"http://www.zimagez.com"
 "\">ZimageZ</a> \n"
 "user name, passsword and details about the screenshot."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:283
+#: ../lib/screenshooter-zimagez.c:398
 msgid "Check the user information..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:305
+#: ../lib/screenshooter-zimagez.c:405
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You "
 "must fill all the fields.</span>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:320
+#: ../lib/screenshooter-zimagez.c:419
 msgid "Login on ZimageZ..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:436
+#: ../lib/screenshooter-zimagez.c:459 ../lib/screenshooter-zimagez.c:610
+msgid ""
+"An unexpected reply from ZimageZ was received. The upload of the screenshot "
+"failed."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:498
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The "
 "user and the password you entered do not match. Please retry.</span>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:501
+#: ../lib/screenshooter-zimagez.c:556
 msgid "Upload the screenshot..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:559
+#: ../lib/screenshooter-zimagez.c:589
 #, c-format
 msgid "An error occurred while uploading the screenshot."
 msgstr ""
 
 #. End the user session
-#: ../lib/screenshooter-zimagez.c:597
+#: ../lib/screenshooter-zimagez.c:622
 msgid "Close the session on ZimageZ..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:650
+#: ../lib/screenshooter-zimagez.c:692
 msgid "Details about the screenshot for ZimageZ"
 msgstr ""
 
 #. Create the user label
-#: ../lib/screenshooter-zimagez.c:692
+#: ../lib/screenshooter-zimagez.c:734
 msgid "User:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:703
+#: ../lib/screenshooter-zimagez.c:745
 msgid ""
 "Your Zimagez user name, if you do not have one yet please create one on the "
 "Web page linked above"
 msgstr ""
 
 #. Create the password label
-#: ../lib/screenshooter-zimagez.c:708
+#: ../lib/screenshooter-zimagez.c:751
 msgid "Password:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:718
+#: ../lib/screenshooter-zimagez.c:761
 msgid "The password for the user above"
 msgstr ""
 
 #. Create the title label
-#: ../lib/screenshooter-zimagez.c:723
+#: ../lib/screenshooter-zimagez.c:767
 msgid "Title:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:733
+#: ../lib/screenshooter-zimagez.c:777
 msgid ""
 "The title of the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
 msgstr ""
 
 #. Create the comment label
-#: ../lib/screenshooter-zimagez.c:738
+#: ../lib/screenshooter-zimagez.c:783
 msgid "Comment:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:749
+#: ../lib/screenshooter-zimagez.c:794
 msgid ""
 "A comment on the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:870
+#: ../lib/screenshooter-zimagez.c:917
 #, c-format
 msgid "<a href=\"%s\">Full size image</a>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:872
+#: ../lib/screenshooter-zimagez.c:919
 #, c-format
 msgid "<a href=\"%s\">Large thumbnail</a>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:874
+#: ../lib/screenshooter-zimagez.c:921
 #, c-format
 msgid "<a href=\"%s\">Small thumbnail</a>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:894
+#: ../lib/screenshooter-zimagez.c:937
 msgid "My screenshot on ZimageZ"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:920
+#: ../lib/screenshooter-zimagez.c:963
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Links</span>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:965
+#: ../lib/screenshooter-zimagez.c:1008
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing "
 "to the full size image</span>"
 msgstr ""
 
 #. HTML title
-#: ../lib/screenshooter-zimagez.c:981
+#: ../lib/screenshooter-zimagez.c:1024
 msgid "HTML"
 msgstr ""
 
 #. BB title
-#: ../lib/screenshooter-zimagez.c:1002
+#: ../lib/screenshooter-zimagez.c:1045
 msgid "BBCode for forums"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:1122
+#: ../lib/screenshooter-zimagez.c:1174
 msgid "ZimageZ"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:1155
+#: ../lib/screenshooter-zimagez.c:1207
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Status</span>"
 msgstr ""
 
@@ -340,34 +325,42 @@ msgstr ""
 msgid "Copy _Link Address"
 msgstr ""
 
-#: ../src/main.c:53
+#: ../src/main.c:48
 msgid "Delay in seconds before taking the screenshot"
 msgstr ""
 
-#: ../src/main.c:63
-msgid "Do not display the save dialog"
+#: ../src/main.c:58
+msgid "Display the mouse on the screenshot"
 msgstr ""
 
-#: ../src/main.c:68
-msgid "Do not display the mouse on the screenshot"
+#: ../src/main.c:75
+msgid "Directory where the screenshot will be saved"
 msgstr ""
 
 #: ../src/main.c:85
-msgid "Directory where the screenshot will be saved"
+msgid "Version information"
 msgstr ""
 
-#: ../src/main.c:99
-msgid "Version information"
+#: ../src/main.c:134
+#, c-format
+msgid "Conflicting options: --%s and --%s cannot be used at the same time.\n"
 msgstr ""
 
 #: ../src/main.c:136
 #, c-format
 msgid ""
+"The --%s option is only used when --fullscreen, --window or --region is "
+"given. It will be ignored.\n"
+msgstr ""
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
 
-#: ../src/main.c:235
+#: ../src/main.c:282
 #, c-format
 msgid "%s is not a valid directory, the default directory will be used."
 msgstr ""
diff --git a/po/ast.po b/po/ast.po
index 645de08..c5a2c94 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-31 14:02+0200\n"
+"POT-Creation-Date: 2009-11-15 00:29+0100\n"
 "PO-Revision-Date: 2009-07-13 19:55+0100\n"
 "Last-Translator: Marcos Antonio Alvarez Costales <marcoscostales at gmail.com>\n"
 "Language-Team: Asturian <alministradores at softastur.org>\n"
@@ -12,25 +12,16 @@ msgstr ""
 "X-Poedit-Country: SPAIN\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../lib/screenshooter-dialogs.c:283
-msgid "Screenshot.png"
-msgstr "Captura de pantalla.png"
-
-#: ../lib/screenshooter-dialogs.c:300
-#, c-format
-msgid "Screenshot-%d.png"
-msgstr "Captura de pantalla-%d.png"
-
-#: ../lib/screenshooter-dialogs.c:493
+#: ../lib/screenshooter-dialogs.c:478
 #, c-format
 msgid "%.2fKb of %.2fKb"
 msgstr "%.2fKb de %.2fKb"
 
-#: ../lib/screenshooter-dialogs.c:577
+#: ../lib/screenshooter-dialogs.c:560
 msgid "Transfer"
 msgstr "Tresferencia"
 
-#: ../lib/screenshooter-dialogs.c:600
+#: ../lib/screenshooter-dialogs.c:581
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being "
 "transferred to:</span>"
@@ -38,48 +29,50 @@ msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">La captura de pantalla ta "
 "tresfiriéndose a:</span>"
 
-#: ../lib/screenshooter-dialogs.c:724 ../lib/screenshooter-dialogs.c:741
+#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
 msgid "Screenshot"
 msgstr "Captura de pantalla"
 
-#: ../lib/screenshooter-dialogs.c:736
+#: ../lib/screenshooter-dialogs.c:709
 msgid "Take a screenshot"
 msgstr "Toma una captura de pantalla"
 
-#: ../lib/screenshooter-dialogs.c:751
+#: ../lib/screenshooter-dialogs.c:724
 msgid "Preferences"
 msgstr "Preferencies"
 
-#: ../lib/screenshooter-dialogs.c:793
+#: ../lib/screenshooter-dialogs.c:754
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Region to capture</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Zona a capturar</span>"
 
-#: ../lib/screenshooter-dialogs.c:820
+#: ../lib/screenshooter-dialogs.c:774
 msgid "Entire screen"
 msgstr "Tola pantalla"
 
-#: ../lib/screenshooter-dialogs.c:830 ../src/main.c:58
-#: ../panel-plugin/screenshooter-plugin.c:292
+#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../panel-plugin/screenshooter-plugin.c:308
 msgid "Take a screenshot of the entire screen"
 msgstr "Facer una captura de tola pantalla"
 
-#: ../lib/screenshooter-dialogs.c:841
+#: ../lib/screenshooter-dialogs.c:789
 msgid "Active window"
 msgstr "Ventana activa"
 
-#: ../lib/screenshooter-dialogs.c:851 ../src/main.c:104
-#: ../panel-plugin/screenshooter-plugin.c:297
+#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr "Facer una captura de pantalla de la ventana activa"
 
-#: ../lib/screenshooter-dialogs.c:862
+#: ../lib/screenshooter-dialogs.c:804
 msgid "Select a region"
 msgstr "Seleicionar una rexón"
 
-#: ../lib/screenshooter-dialogs.c:872 ../src/main.c:78
-#: ../panel-plugin/screenshooter-plugin.c:302
+#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../panel-plugin/screenshooter-plugin.c:318
 msgid ""
 "Select a region to be captured by clicking a point of the screen without "
 "releasing the mouse button, dragging your mouse to the other corner of the "
@@ -89,132 +82,112 @@ msgstr ""
 "el botón del mur, arrastrando'l mur a la otra esquina de la zona y "
 "soltando'l botón del mur."
 
-#: ../lib/screenshooter-dialogs.c:884
+#: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
 msgstr "Capturar el punteru del mur"
 
-#: ../lib/screenshooter-dialogs.c:892
+#: ../lib/screenshooter-dialogs.c:824
 msgid "Display the mouse pointer on the screenshot"
 msgstr "Amosar el punteru del mur na captura de pantalla"
 
-#: ../lib/screenshooter-dialogs.c:917
+#: ../lib/screenshooter-dialogs.c:840
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
 msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Allanciu enantes de capturar</"
 "span>"
 
-#: ../lib/screenshooter-dialogs.c:952
+#: ../lib/screenshooter-dialogs.c:862
 msgid "Delay in seconds before the screenshot is taken"
 msgstr "Allanciu en segundos enantes de que se capture la pantalla"
 
-#: ../lib/screenshooter-dialogs.c:958
+#: ../lib/screenshooter-dialogs.c:865
 msgid "seconds"
 msgstr "segundos"
 
-#: ../lib/screenshooter-dialogs.c:984
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
-msgstr ""
-"<span weight=\"bold\" stretch=\"semiexpanded\">Enantes de capturar</span>"
-
-#. Display the save dialog checkbox
-#: ../lib/screenshooter-dialogs.c:1007
-msgid "Show the save dialog"
-msgstr "Amosar el cuadru de diálogu guardar"
-
-#: ../lib/screenshooter-dialogs.c:1013
-msgid ""
-"The save dialog allows you to change the file name and the save location"
-msgstr ""
-"El cuadru de diálogu guardar permitete camudar el nome del ficheru y el "
-"llugar au atroxalu"
-
-#: ../lib/screenshooter-dialogs.c:1027
-msgid "Close the application"
-msgstr "Zarrar l'aplicación"
-
-#: ../lib/screenshooter-dialogs.c:1033
-msgid ""
-"If unchecked, the current window will be displayed again after the "
-"screenshot has been taken to allow you to take several screenshots in a row"
+#: ../lib/screenshooter-dialogs.c:917
+msgid "Action"
 msgstr ""
-"Si ta ensin marcar, la ventana actual amosaráse de nueves dempués de la "
-"captura de pantalla; tomáronse midíes pa permitir que tomes varies captures "
-"de pantalla nuna filera"
 
-#: ../lib/screenshooter-dialogs.c:1056
+#: ../lib/screenshooter-dialogs.c:945
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Action</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Aición</span>"
 
 #. Save option radio button
-#: ../lib/screenshooter-dialogs.c:1081
-msgid "Save in:"
+#: ../lib/screenshooter-dialogs.c:961
+#, fuzzy
+msgid "Save"
 msgstr "Guardar en:"
 
-#: ../lib/screenshooter-dialogs.c:1089
+#: ../lib/screenshooter-dialogs.c:966
 msgid "Save the screenshot to a PNG file"
 msgstr "Guardar la captura de pantalla nún ficheru PNG"
 
-#: ../lib/screenshooter-dialogs.c:1104
-msgid "Default save location"
-msgstr "Llugar predetermináu au guardar"
-
-#: ../lib/screenshooter-dialogs.c:1114
-msgid "Set the default save location"
-msgstr "Configurar el llugar predetermináu pa guardar"
-
-#: ../lib/screenshooter-dialogs.c:1127
+#: ../lib/screenshooter-dialogs.c:975
 msgid "Copy to the clipboard"
 msgstr "Copiar al cartafueyu"
 
-#: ../lib/screenshooter-dialogs.c:1132
+#: ../lib/screenshooter-dialogs.c:977
 msgid "Copy the screenshot to the clipboard so that it can be pasted later"
 msgstr "Copiar la captura de pantalla al cartafueyu pa poder apegala dempués"
 
-#: ../lib/screenshooter-dialogs.c:1147
+#: ../lib/screenshooter-dialogs.c:994
 msgid "Open with:"
 msgstr "Abrir con:"
 
-#: ../lib/screenshooter-dialogs.c:1158
+#: ../lib/screenshooter-dialogs.c:1000
 msgid "Open the screenshot with the chosen application"
 msgstr "Abrir la captura de pantalla cola aplicación escoyía"
 
-#: ../lib/screenshooter-dialogs.c:1191 ../src/main.c:73
+#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
 msgid "Application to open the screenshot"
 msgstr "Aplicación p'abrir la captura de pantalla"
 
-#: ../lib/screenshooter-dialogs.c:1204
+#: ../lib/screenshooter-dialogs.c:1028
 msgid "Host on ZimageZ"
 msgstr "Agospiar en ZimageZ"
 
-#: ../lib/screenshooter-dialogs.c:1210 ../src/main.c:92
+#: ../lib/screenshooter-dialogs.c:1032 ../src/main.c:80
 msgid "Host the screenshot on ZimageZ, a free online image hosting service"
 msgstr ""
 "Agospiar la captura de pantalla en ZimageZ, un serviciu de baldre "
 "d'agospiamientu d'imáxenes en llinia"
 
-#: ../lib/screenshooter-dialogs.c:1255
+#: ../lib/screenshooter-dialogs.c:1046
+#, fuzzy
+msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Preview</span>"
+msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Enllaces</span>"
+
+#: ../lib/screenshooter-dialogs.c:1107
 msgid "Save screenshot as..."
 msgstr "Guardar la captura de pantalla como..."
 
-#. Start the user XML RPC session
-#: ../lib/screenshooter-zimagez.c:159
-msgid "Initialize the connection..."
-msgstr "Aniciando la conexón..."
+#: ../lib/screenshooter-zimagez.c:134
+#, fuzzy, c-format
+msgid "An error occured when creating the XMLRPC request."
+msgstr "Prodúxose un fallu al xubir la captura de pantalla."
+
+#: ../lib/screenshooter-zimagez.c:153
+#, fuzzy, c-format
+msgid "An error occured when transfering the data to ZimageZ."
+msgstr "Prodúxose un fallu al xubir la captura de pantalla."
 
-#: ../lib/screenshooter-zimagez.c:172 ../lib/screenshooter-zimagez.c:332
-#: ../lib/screenshooter-zimagez.c:361 ../lib/screenshooter-zimagez.c:389
-#: ../lib/screenshooter-zimagez.c:520 ../lib/screenshooter-zimagez.c:543
-#: ../lib/screenshooter-zimagez.c:580
+#: ../lib/screenshooter-zimagez.c:178
+#, fuzzy, c-format
+msgid "An error occured when parsing the response from ZimageZ."
+msgstr "Prodúxose un fallu al xubir la captura de pantalla."
+
+#: ../lib/screenshooter-zimagez.c:228
 #, c-format
-msgid ""
-"An error occurred during the XML exchange: %s (%d).\n"
-" The screenshot could not be uploaded."
+msgid "Taken on %s, at %s"
 msgstr ""
-"Hebo un fallu durante l'intercambéu de XML: %s (%d).\n"
-"La captura de pantalla nun puede cargase."
 
-#: ../lib/screenshooter-zimagez.c:223
+#. Start the user soup session
+#: ../lib/screenshooter-zimagez.c:295
+msgid "Initialize the connection..."
+msgstr "Aniciando la conexón..."
+
+#: ../lib/screenshooter-zimagez.c:341
 msgid ""
 "Please file the following fields with your <a href=\"http://www.zimagez.com"
 "\">ZimageZ</a> \n"
@@ -224,11 +197,11 @@ msgstr ""
 "\"http://www.zimagez.com\">ZimageZ</a>, \n"
 "contraseña y detalles sobro la captura de pantalla."
 
-#: ../lib/screenshooter-zimagez.c:283
+#: ../lib/screenshooter-zimagez.c:398
 msgid "Check the user information..."
 msgstr "Comprobando la información d'usuariu..."
 
-#: ../lib/screenshooter-zimagez.c:305
+#: ../lib/screenshooter-zimagez.c:405
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You "
 "must fill all the fields.</span>"
@@ -236,11 +209,17 @@ msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Tienes de llenar tolos campos."
 "</span>"
 
-#: ../lib/screenshooter-zimagez.c:320
+#: ../lib/screenshooter-zimagez.c:419
 msgid "Login on ZimageZ..."
 msgstr "Aniciando sesión en ZimageZ..."
 
-#: ../lib/screenshooter-zimagez.c:436
+#: ../lib/screenshooter-zimagez.c:459 ../lib/screenshooter-zimagez.c:610
+msgid ""
+"An unexpected reply from ZimageZ was received. The upload of the screenshot "
+"failed."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:498
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The "
 "user and the password you entered do not match. Please retry.</span>"
@@ -248,30 +227,30 @@ msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">L'usuariu y la contraseña "
 "introducíu nun concasen. Por favor, inténtalo de nueves.</span>"
 
-#: ../lib/screenshooter-zimagez.c:501
+#: ../lib/screenshooter-zimagez.c:556
 msgid "Upload the screenshot..."
 msgstr "Xubiendo la captura de pantalla..."
 
-#: ../lib/screenshooter-zimagez.c:559
+#: ../lib/screenshooter-zimagez.c:589
 #, c-format
 msgid "An error occurred while uploading the screenshot."
 msgstr "Prodúxose un fallu al xubir la captura de pantalla."
 
 #. End the user session
-#: ../lib/screenshooter-zimagez.c:597
+#: ../lib/screenshooter-zimagez.c:622
 msgid "Close the session on ZimageZ..."
 msgstr "Zarrando la sesión en ZimageZ..."
 
-#: ../lib/screenshooter-zimagez.c:650
+#: ../lib/screenshooter-zimagez.c:692
 msgid "Details about the screenshot for ZimageZ"
 msgstr "Detalles sobro la captura de pantalla pa ZimageZ"
 
 #. Create the user label
-#: ../lib/screenshooter-zimagez.c:692
+#: ../lib/screenshooter-zimagez.c:734
 msgid "User:"
 msgstr "Usuariu:"
 
-#: ../lib/screenshooter-zimagez.c:703
+#: ../lib/screenshooter-zimagez.c:745
 msgid ""
 "Your Zimagez user name, if you do not have one yet please create one on the "
 "Web page linked above"
@@ -280,20 +259,20 @@ msgstr ""
 "enllazada enantes"
 
 #. Create the password label
-#: ../lib/screenshooter-zimagez.c:708
+#: ../lib/screenshooter-zimagez.c:751
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: ../lib/screenshooter-zimagez.c:718
+#: ../lib/screenshooter-zimagez.c:761
 msgid "The password for the user above"
 msgstr "La contraseña pal usuariu ingresáu"
 
 #. Create the title label
-#: ../lib/screenshooter-zimagez.c:723
+#: ../lib/screenshooter-zimagez.c:767
 msgid "Title:"
 msgstr "Títulu:"
 
-#: ../lib/screenshooter-zimagez.c:733
+#: ../lib/screenshooter-zimagez.c:777
 msgid ""
 "The title of the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
@@ -302,11 +281,11 @@ msgstr ""
 "pantalla en ZimageZ"
 
 #. Create the comment label
-#: ../lib/screenshooter-zimagez.c:738
+#: ../lib/screenshooter-zimagez.c:783
 msgid "Comment:"
 msgstr "Comentariu:"
 
-#: ../lib/screenshooter-zimagez.c:749
+#: ../lib/screenshooter-zimagez.c:794
 msgid ""
 "A comment on the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
@@ -314,30 +293,30 @@ msgstr ""
 "El comentariu de la captura de pantalla, usaráse cuando s'amuese la captura "
 "de pantalla en ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:870
+#: ../lib/screenshooter-zimagez.c:917
 #, c-format
 msgid "<a href=\"%s\">Full size image</a>"
 msgstr "<a href=\"%s\">Imaxe a tamañu completu</a>"
 
-#: ../lib/screenshooter-zimagez.c:872
+#: ../lib/screenshooter-zimagez.c:919
 #, c-format
 msgid "<a href=\"%s\">Large thumbnail</a>"
 msgstr "<a href=\"%s\">Miniatura grande</a>"
 
-#: ../lib/screenshooter-zimagez.c:874
+#: ../lib/screenshooter-zimagez.c:921
 #, c-format
 msgid "<a href=\"%s\">Small thumbnail</a>"
 msgstr "<a href=\"%s\">Miniatura pequeña</a>"
 
-#: ../lib/screenshooter-zimagez.c:894
+#: ../lib/screenshooter-zimagez.c:937
 msgid "My screenshot on ZimageZ"
 msgstr "La mio captura de pantalla en ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:920
+#: ../lib/screenshooter-zimagez.c:963
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Links</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Enllaces</span>"
 
-#: ../lib/screenshooter-zimagez.c:965
+#: ../lib/screenshooter-zimagez.c:1008
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing "
 "to the full size image</span>"
@@ -346,20 +325,20 @@ msgstr ""
 "qu'apunta a la imaxe a tamañu completu</span>"
 
 #. HTML title
-#: ../lib/screenshooter-zimagez.c:981
+#: ../lib/screenshooter-zimagez.c:1024
 msgid "HTML"
 msgstr "HTML"
 
 #. BB title
-#: ../lib/screenshooter-zimagez.c:1002
+#: ../lib/screenshooter-zimagez.c:1045
 msgid "BBCode for forums"
 msgstr "BBcode pa foros"
 
-#: ../lib/screenshooter-zimagez.c:1122
+#: ../lib/screenshooter-zimagez.c:1174
 msgid "ZimageZ"
 msgstr "ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:1155
+#: ../lib/screenshooter-zimagez.c:1207
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Status</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Estáu</span>"
 
@@ -373,29 +352,38 @@ msgstr "_Abrir enllaz"
 msgid "Copy _Link Address"
 msgstr "Copiar direición del _enllaz"
 
-#: ../src/main.c:53
+#: ../src/main.c:48
 msgid "Delay in seconds before taking the screenshot"
 msgstr "Allanciu en segundos enantes de la captura de pantalla"
 
-#: ../src/main.c:63
-msgid "Do not display the save dialog"
-msgstr "Nun amosar el diálogu de guardar"
-
-#: ../src/main.c:68
-msgid "Do not display the mouse on the screenshot"
+#: ../src/main.c:58
+#, fuzzy
+msgid "Display the mouse on the screenshot"
 msgstr "Nun amosar el mur na captura de pantalla"
 
-#: ../src/main.c:85
+#: ../src/main.c:75
 msgid "Directory where the screenshot will be saved"
 msgstr "Direutoriu au atroxar la captura de pantalla"
 
-#: ../src/main.c:99
+#: ../src/main.c:85
 msgid "Version information"
 msgstr "Información de versión"
 
+#: ../src/main.c:134
+#, c-format
+msgid "Conflicting options: --%s and --%s cannot be used at the same time.\n"
+msgstr ""
+
 #: ../src/main.c:136
 #, c-format
 msgid ""
+"The --%s option is only used when --fullscreen, --window or --region is "
+"given. It will be ignored.\n"
+msgstr ""
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
@@ -403,7 +391,7 @@ msgstr ""
 "Preba %s --help pa ver una llista completa d'opciones de llinia de "
 "comandos.\n"
 
-#: ../src/main.c:235
+#: ../src/main.c:282
 #, c-format
 msgid "%s is not a valid directory, the default directory will be used."
 msgstr "%s nun ye un direutoriu válidu, emplegaráse'l direutoriu por defeutu."
@@ -415,6 +403,54 @@ msgid ""
 msgstr ""
 "Fai captures de la pantalla completa, de la ventana activa o d'una zona"
 
+#~ msgid "Screenshot.png"
+#~ msgstr "Captura de pantalla.png"
+
+#~ msgid "Screenshot-%d.png"
+#~ msgstr "Captura de pantalla-%d.png"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">Enantes de capturar</span>"
+
+#~ msgid "Show the save dialog"
+#~ msgstr "Amosar el cuadru de diálogu guardar"
+
+#~ msgid ""
+#~ "The save dialog allows you to change the file name and the save location"
+#~ msgstr ""
+#~ "El cuadru de diálogu guardar permitete camudar el nome del ficheru y el "
+#~ "llugar au atroxalu"
+
+#~ msgid "Close the application"
+#~ msgstr "Zarrar l'aplicación"
+
+#~ msgid ""
+#~ "If unchecked, the current window will be displayed again after the "
+#~ "screenshot has been taken to allow you to take several screenshots in a "
+#~ "row"
+#~ msgstr ""
+#~ "Si ta ensin marcar, la ventana actual amosaráse de nueves dempués de la "
+#~ "captura de pantalla; tomáronse midíes pa permitir que tomes varies "
+#~ "captures de pantalla nuna filera"
+
+#~ msgid "Default save location"
+#~ msgstr "Llugar predetermináu au guardar"
+
+#~ msgid "Set the default save location"
+#~ msgstr "Configurar el llugar predetermináu pa guardar"
+
+#~ msgid ""
+#~ "An error occurred during the XML exchange: %s (%d).\n"
+#~ " The screenshot could not be uploaded."
+#~ msgstr ""
+#~ "Hebo un fallu durante l'intercambéu de XML: %s (%d).\n"
+#~ "La captura de pantalla nun puede cargase."
+
+#~ msgid "Do not display the save dialog"
+#~ msgstr "Nun amosar el diálogu de guardar"
+
 #, fuzzy
 #~ msgid "Tak a screenshot of the entire screen"
 #~ msgstr "Facer una captura de tola pantalla"
diff --git a/po/bg.po b/po/bg.po
index d04b480..69af6c4 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-31 14:02+0200\n"
+"POT-Creation-Date: 2009-11-15 00:29+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Adrian Dimitrov <Enzo_01 at abv.bg>\n"
 "Language-Team: \n"
@@ -11,75 +11,67 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Bulgarian\n"
 
-#: ../lib/screenshooter-dialogs.c:283
-#, fuzzy
-msgid "Screenshot.png"
-msgstr "Screenshot.png"
-
-#: ../lib/screenshooter-dialogs.c:300
-#, c-format
-msgid "Screenshot-%d.png"
-msgstr "Screenshot-%d.png"
-
-#: ../lib/screenshooter-dialogs.c:493
+#: ../lib/screenshooter-dialogs.c:478
 #, c-format
 msgid "%.2fKb of %.2fKb"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:577
+#: ../lib/screenshooter-dialogs.c:560
 msgid "Transfer"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:600
+#: ../lib/screenshooter-dialogs.c:581
 #, fuzzy
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being "
 "transferred to:</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Действие</span>"
 
-#: ../lib/screenshooter-dialogs.c:724 ../lib/screenshooter-dialogs.c:741
+#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
 msgid "Screenshot"
 msgstr "Снимка на екрана"
 
-#: ../lib/screenshooter-dialogs.c:736
+#: ../lib/screenshooter-dialogs.c:709
 msgid "Take a screenshot"
 msgstr "Направи снимка на екрана"
 
-#: ../lib/screenshooter-dialogs.c:751
+#: ../lib/screenshooter-dialogs.c:724
 msgid "Preferences"
 msgstr "Предпочитания"
 
-#: ../lib/screenshooter-dialogs.c:793
+#: ../lib/screenshooter-dialogs.c:754
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Region to capture</span>"
 msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Район на прихващане</span>"
 
-#: ../lib/screenshooter-dialogs.c:820
+#: ../lib/screenshooter-dialogs.c:774
 msgid "Entire screen"
 msgstr "Целия екран"
 
-#: ../lib/screenshooter-dialogs.c:830 ../src/main.c:58
-#: ../panel-plugin/screenshooter-plugin.c:292
+#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../panel-plugin/screenshooter-plugin.c:308
 msgid "Take a screenshot of the entire screen"
 msgstr "Направи снимка на целия екран"
 
-#: ../lib/screenshooter-dialogs.c:841
+#: ../lib/screenshooter-dialogs.c:789
 msgid "Active window"
 msgstr "Активния прозорец"
 
-#: ../lib/screenshooter-dialogs.c:851 ../src/main.c:104
-#: ../panel-plugin/screenshooter-plugin.c:297
+#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr "Направи снимка на активния прозорец"
 
-#: ../lib/screenshooter-dialogs.c:862
+#: ../lib/screenshooter-dialogs.c:804
 msgid "Select a region"
 msgstr "Избери район"
 
-#: ../lib/screenshooter-dialogs.c:872 ../src/main.c:78
-#: ../panel-plugin/screenshooter-plugin.c:302
+#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../panel-plugin/screenshooter-plugin.c:318
 msgid ""
 "Select a region to be captured by clicking a point of the screen without "
 "releasing the mouse button, dragging your mouse to the other corner of the "
@@ -89,139 +81,123 @@ msgstr ""
 "докато стигнеш до другия диагонал на района, и тогава освободиш бутона на "
 "мишката."
 
-#: ../lib/screenshooter-dialogs.c:884
+#: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:892
+#: ../lib/screenshooter-dialogs.c:824
 #, fuzzy
 msgid "Display the mouse pointer on the screenshot"
 msgstr "Не показвай диалога за запис"
 
-#: ../lib/screenshooter-dialogs.c:917
+#: ../lib/screenshooter-dialogs.c:840
 #, fuzzy
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
 msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Район на прихващане</span>"
 
-#: ../lib/screenshooter-dialogs.c:952
+#: ../lib/screenshooter-dialogs.c:862
 msgid "Delay in seconds before the screenshot is taken"
 msgstr "Забавяне в секунди, преди снимането да бъде извършено"
 
-#: ../lib/screenshooter-dialogs.c:958
+#: ../lib/screenshooter-dialogs.c:865
 msgid "seconds"
 msgstr "секунди"
 
-#: ../lib/screenshooter-dialogs.c:984
-#, fuzzy
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Действие</span>"
-
-#. Display the save dialog checkbox
-#: ../lib/screenshooter-dialogs.c:1007
-#, fuzzy
-msgid "Show the save dialog"
-msgstr "Не показвай диалога за запис"
-
-#: ../lib/screenshooter-dialogs.c:1013
-msgid ""
-"The save dialog allows you to change the file name and the save location"
-msgstr ""
-
-#: ../lib/screenshooter-dialogs.c:1027
-#, fuzzy
-msgid "Close the application"
-msgstr "Приложение:"
-
-#: ../lib/screenshooter-dialogs.c:1033
-msgid ""
-"If unchecked, the current window will be displayed again after the "
-"screenshot has been taken to allow you to take several screenshots in a row"
+#: ../lib/screenshooter-dialogs.c:917
+msgid "Action"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1056
+#: ../lib/screenshooter-dialogs.c:945
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Action</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Действие</span>"
 
 #. Save option radio button
-#: ../lib/screenshooter-dialogs.c:1081
+#: ../lib/screenshooter-dialogs.c:961
 #, fuzzy
-msgid "Save in:"
+msgid "Save"
 msgstr "Запиши"
 
-#: ../lib/screenshooter-dialogs.c:1089
+#: ../lib/screenshooter-dialogs.c:966
 msgid "Save the screenshot to a PNG file"
 msgstr "Запиши снимката в PNG файл"
 
-#: ../lib/screenshooter-dialogs.c:1104
-msgid "Default save location"
-msgstr "Място за запис  по подразбиране"
-
-#: ../lib/screenshooter-dialogs.c:1114
-msgid "Set the default save location"
-msgstr "Настрой място за запис по подразбиране"
-
-#: ../lib/screenshooter-dialogs.c:1127
+#: ../lib/screenshooter-dialogs.c:975
 msgid "Copy to the clipboard"
 msgstr "Копирай в клипборда"
 
-#: ../lib/screenshooter-dialogs.c:1132
+#: ../lib/screenshooter-dialogs.c:977
 msgid "Copy the screenshot to the clipboard so that it can be pasted later"
 msgstr ""
 "Копирай снимката в клипборда, така че да може да бъде вмъквана по-късно"
 
-#: ../lib/screenshooter-dialogs.c:1147
+#: ../lib/screenshooter-dialogs.c:994
 msgid "Open with:"
 msgstr "Отвори с:"
 
-#: ../lib/screenshooter-dialogs.c:1158
+#: ../lib/screenshooter-dialogs.c:1000
 msgid "Open the screenshot with the chosen application"
 msgstr "Отвори снимката с избраното приложение"
 
-#: ../lib/screenshooter-dialogs.c:1191 ../src/main.c:73
+#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
 msgid "Application to open the screenshot"
 msgstr "Приложение за отваряне на снимките"
 
-#: ../lib/screenshooter-dialogs.c:1204
+#: ../lib/screenshooter-dialogs.c:1028
 msgid "Host on ZimageZ"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1210 ../src/main.c:92
+#: ../lib/screenshooter-dialogs.c:1032 ../src/main.c:80
 msgid "Host the screenshot on ZimageZ, a free online image hosting service"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1255
+#: ../lib/screenshooter-dialogs.c:1046
+#, fuzzy
+msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Preview</span>"
+msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Действие</span>"
+
+#: ../lib/screenshooter-dialogs.c:1107
 msgid "Save screenshot as..."
 msgstr "Запиши снимката като..."
 
-#. Start the user XML RPC session
-#: ../lib/screenshooter-zimagez.c:159
-msgid "Initialize the connection..."
+#: ../lib/screenshooter-zimagez.c:134
+#, c-format
+msgid "An error occured when creating the XMLRPC request."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:172 ../lib/screenshooter-zimagez.c:332
-#: ../lib/screenshooter-zimagez.c:361 ../lib/screenshooter-zimagez.c:389
-#: ../lib/screenshooter-zimagez.c:520 ../lib/screenshooter-zimagez.c:543
-#: ../lib/screenshooter-zimagez.c:580
+#: ../lib/screenshooter-zimagez.c:153
 #, c-format
-msgid ""
-"An error occurred during the XML exchange: %s (%d).\n"
-" The screenshot could not be uploaded."
+msgid "An error occured when transfering the data to ZimageZ."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:178
+#, c-format
+msgid "An error occured when parsing the response from ZimageZ."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:228
+#, c-format
+msgid "Taken on %s, at %s"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:223
+#. Start the user soup session
+#: ../lib/screenshooter-zimagez.c:295
+msgid "Initialize the connection..."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:341
 msgid ""
 "Please file the following fields with your <a href=\"http://www.zimagez.com"
 "\">ZimageZ</a> \n"
 "user name, passsword and details about the screenshot."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:283
+#: ../lib/screenshooter-zimagez.c:398
 msgid "Check the user information..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:305
+#: ../lib/screenshooter-zimagez.c:405
 #, fuzzy
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You "
@@ -229,105 +205,111 @@ msgid ""
 msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Район на прихващане</span>"
 
-#: ../lib/screenshooter-zimagez.c:320
+#: ../lib/screenshooter-zimagez.c:419
 msgid "Login on ZimageZ..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:436
+#: ../lib/screenshooter-zimagez.c:459 ../lib/screenshooter-zimagez.c:610
+msgid ""
+"An unexpected reply from ZimageZ was received. The upload of the screenshot "
+"failed."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:498
 #, fuzzy
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The "
 "user and the password you entered do not match. Please retry.</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Действие</span>"
 
-#: ../lib/screenshooter-zimagez.c:501
+#: ../lib/screenshooter-zimagez.c:556
 #, fuzzy
 msgid "Upload the screenshot..."
 msgstr "Вземи снимката"
 
-#: ../lib/screenshooter-zimagez.c:559
+#: ../lib/screenshooter-zimagez.c:589
 #, c-format
 msgid "An error occurred while uploading the screenshot."
 msgstr ""
 
 #. End the user session
-#: ../lib/screenshooter-zimagez.c:597
+#: ../lib/screenshooter-zimagez.c:622
 msgid "Close the session on ZimageZ..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:650
+#: ../lib/screenshooter-zimagez.c:692
 #, fuzzy
 msgid "Details about the screenshot for ZimageZ"
 msgstr "Забавяне в секунди, преди снимането да бъде извършено"
 
 #. Create the user label
-#: ../lib/screenshooter-zimagez.c:692
+#: ../lib/screenshooter-zimagez.c:734
 msgid "User:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:703
+#: ../lib/screenshooter-zimagez.c:745
 msgid ""
 "Your Zimagez user name, if you do not have one yet please create one on the "
 "Web page linked above"
 msgstr ""
 
 #. Create the password label
-#: ../lib/screenshooter-zimagez.c:708
+#: ../lib/screenshooter-zimagez.c:751
 msgid "Password:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:718
+#: ../lib/screenshooter-zimagez.c:761
 msgid "The password for the user above"
 msgstr ""
 
 #. Create the title label
-#: ../lib/screenshooter-zimagez.c:723
+#: ../lib/screenshooter-zimagez.c:767
 msgid "Title:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:733
+#: ../lib/screenshooter-zimagez.c:777
 msgid ""
 "The title of the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
 msgstr ""
 
 #. Create the comment label
-#: ../lib/screenshooter-zimagez.c:738
+#: ../lib/screenshooter-zimagez.c:783
 msgid "Comment:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:749
+#: ../lib/screenshooter-zimagez.c:794
 msgid ""
 "A comment on the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:870
+#: ../lib/screenshooter-zimagez.c:917
 #, c-format
 msgid "<a href=\"%s\">Full size image</a>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:872
+#: ../lib/screenshooter-zimagez.c:919
 #, c-format
 msgid "<a href=\"%s\">Large thumbnail</a>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:874
+#: ../lib/screenshooter-zimagez.c:921
 #, c-format
 msgid "<a href=\"%s\">Small thumbnail</a>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:894
+#: ../lib/screenshooter-zimagez.c:937
 #, fuzzy
 msgid "My screenshot on ZimageZ"
 msgstr "Забавяне в секунди, преди снимането да бъде извършено"
 
-#: ../lib/screenshooter-zimagez.c:920
+#: ../lib/screenshooter-zimagez.c:963
 #, fuzzy
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Links</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Действие</span>"
 
-#: ../lib/screenshooter-zimagez.c:965
+#: ../lib/screenshooter-zimagez.c:1008
 #, fuzzy
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing "
@@ -337,20 +319,20 @@ msgstr ""
 "бъде извършено</span>"
 
 #. HTML title
-#: ../lib/screenshooter-zimagez.c:981
+#: ../lib/screenshooter-zimagez.c:1024
 msgid "HTML"
 msgstr ""
 
 #. BB title
-#: ../lib/screenshooter-zimagez.c:1002
+#: ../lib/screenshooter-zimagez.c:1045
 msgid "BBCode for forums"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:1122
+#: ../lib/screenshooter-zimagez.c:1174
 msgid "ZimageZ"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:1155
+#: ../lib/screenshooter-zimagez.c:1207
 #, fuzzy
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Status</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Действие</span>"
@@ -366,37 +348,45 @@ msgstr "Отвори с:"
 msgid "Copy _Link Address"
 msgstr ""
 
-#: ../src/main.c:53
+#: ../src/main.c:48
 msgid "Delay in seconds before taking the screenshot"
 msgstr "Забавяне в секунди преди снимката да бъде направена"
 
-#: ../src/main.c:63
-msgid "Do not display the save dialog"
-msgstr "Не показвай диалога за запис"
-
-#: ../src/main.c:68
+#: ../src/main.c:58
 #, fuzzy
-msgid "Do not display the mouse on the screenshot"
+msgid "Display the mouse on the screenshot"
 msgstr "Не показвай диалога за запис"
 
-#: ../src/main.c:85
+#: ../src/main.c:75
 msgid "Directory where the screenshot will be saved"
 msgstr "Директория където снимките да бъдат записвани"
 
-#: ../src/main.c:99
+#: ../src/main.c:85
 msgid "Version information"
 msgstr "Информация за версията"
 
+#: ../src/main.c:134
+#, c-format
+msgid "Conflicting options: --%s and --%s cannot be used at the same time.\n"
+msgstr ""
+
 #: ../src/main.c:136
 #, c-format
 msgid ""
+"The --%s option is only used when --fullscreen, --window or --region is "
+"given. It will be ignored.\n"
+msgstr ""
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
 "%s: %s\n"
 "Опитай %s --help за да видиш пълния списък от налични команди.\n"
 
-#: ../src/main.c:235
+#: ../src/main.c:282
 #, c-format
 msgid "%s is not a valid directory, the default directory will be used."
 msgstr ""
@@ -409,6 +399,35 @@ msgid ""
 msgstr "Направи снимка на целия екран, от активния прозорец или от района"
 
 #, fuzzy
+#~ msgid "Screenshot.png"
+#~ msgstr "Screenshot.png"
+
+#~ msgid "Screenshot-%d.png"
+#~ msgstr "Screenshot-%d.png"
+
+#, fuzzy
+#~ msgid ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
+#~ msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Действие</span>"
+
+#, fuzzy
+#~ msgid "Show the save dialog"
+#~ msgstr "Не показвай диалога за запис"
+
+#, fuzzy
+#~ msgid "Close the application"
+#~ msgstr "Приложение:"
+
+#~ msgid "Default save location"
+#~ msgstr "Място за запис  по подразбиране"
+
+#~ msgid "Set the default save location"
+#~ msgstr "Настрой място за запис по подразбиране"
+
+#~ msgid "Do not display the save dialog"
+#~ msgstr "Не показвай диалога за запис"
+
+#, fuzzy
 #~ msgid "Tak a screenshot of the entire screen"
 #~ msgstr "Направи снимка на целия екран"
 
diff --git a/po/ca.po b/po/ca.po
index cd9af64..eb0009d 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-screenshooter 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-31 14:02+0200\n"
+"POT-Creation-Date: 2009-11-15 00:29+0100\n"
 "PO-Revision-Date: 2009-06-08 16:14+0100\n"
 "Last-Translator: Carles Muñoz Gorriz <carlesmu at internautas.org>\n"
 "Language-Team: Catalan <xfce-i18n at xfce.org>\n"
@@ -19,25 +19,16 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../lib/screenshooter-dialogs.c:283
-msgid "Screenshot.png"
-msgstr "captura.png"
-
-#: ../lib/screenshooter-dialogs.c:300
-#, c-format
-msgid "Screenshot-%d.png"
-msgstr "captura-%d.png"
-
-#: ../lib/screenshooter-dialogs.c:493
+#: ../lib/screenshooter-dialogs.c:478
 #, c-format
 msgid "%.2fKb of %.2fKb"
 msgstr "%.2fKb de %.2fKb"
 
-#: ../lib/screenshooter-dialogs.c:577
+#: ../lib/screenshooter-dialogs.c:560
 msgid "Transfer"
 msgstr "Envia"
 
-#: ../lib/screenshooter-dialogs.c:600
+#: ../lib/screenshooter-dialogs.c:581
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being "
 "transferred to:</span>"
@@ -45,48 +36,50 @@ msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">S'està enviant la captura a:</"
 "span>"
 
-#: ../lib/screenshooter-dialogs.c:724 ../lib/screenshooter-dialogs.c:741
+#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
 msgid "Screenshot"
 msgstr "Captura"
 
-#: ../lib/screenshooter-dialogs.c:736
+#: ../lib/screenshooter-dialogs.c:709
 msgid "Take a screenshot"
 msgstr "Fes una captura"
 
-#: ../lib/screenshooter-dialogs.c:751
+#: ../lib/screenshooter-dialogs.c:724
 msgid "Preferences"
 msgstr "Preferències"
 
-#: ../lib/screenshooter-dialogs.c:793
+#: ../lib/screenshooter-dialogs.c:754
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Region to capture</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Regió a capturar</span>"
 
-#: ../lib/screenshooter-dialogs.c:820
+#: ../lib/screenshooter-dialogs.c:774
 msgid "Entire screen"
 msgstr "Total la pantalla"
 
-#: ../lib/screenshooter-dialogs.c:830 ../src/main.c:58
-#: ../panel-plugin/screenshooter-plugin.c:292
+#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../panel-plugin/screenshooter-plugin.c:308
 msgid "Take a screenshot of the entire screen"
 msgstr "Fa una captura de tota la pantalla"
 
-#: ../lib/screenshooter-dialogs.c:841
+#: ../lib/screenshooter-dialogs.c:789
 msgid "Active window"
 msgstr "Finestra activa"
 
-#: ../lib/screenshooter-dialogs.c:851 ../src/main.c:104
-#: ../panel-plugin/screenshooter-plugin.c:297
+#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr "Fa una captura de la finestra activa"
 
-#: ../lib/screenshooter-dialogs.c:862
+#: ../lib/screenshooter-dialogs.c:804
 msgid "Select a region"
 msgstr "Regió seleccionada"
 
-#: ../lib/screenshooter-dialogs.c:872 ../src/main.c:78
-#: ../panel-plugin/screenshooter-plugin.c:302
+#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../panel-plugin/screenshooter-plugin.c:318
 msgid ""
 "Select a region to be captured by clicking a point of the screen without "
 "releasing the mouse button, dragging your mouse to the other corner of the "
@@ -96,132 +89,114 @@ msgstr ""
 "de la pantalla i sense deixar anar el botó del ratolí, arrossegant el ratolí "
 "fins a l'altre cantonada de la regió i deixant anar el botó del ratolí."
 
-#: ../lib/screenshooter-dialogs.c:884
+#: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
 msgstr "Capturar el punter del ratolí"
 
-#: ../lib/screenshooter-dialogs.c:892
+#: ../lib/screenshooter-dialogs.c:824
 msgid "Display the mouse pointer on the screenshot"
 msgstr "No mostris el ratolí a la captura"
 
-#: ../lib/screenshooter-dialogs.c:917
+#: ../lib/screenshooter-dialogs.c:840
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
 msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Retard abans de fer la "
 "captura</span>"
 
-#: ../lib/screenshooter-dialogs.c:952
+#: ../lib/screenshooter-dialogs.c:862
 msgid "Delay in seconds before the screenshot is taken"
 msgstr "Retard en segons abans de fer la captura"
 
-#: ../lib/screenshooter-dialogs.c:958
+#: ../lib/screenshooter-dialogs.c:865
 msgid "seconds"
 msgstr "segons"
 
-#: ../lib/screenshooter-dialogs.c:984
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
-msgstr ""
-"<span weight=\"bold\" stretch=\"semiexpanded\">Després de fer la captura</"
-"span>"
-
-#. Display the save dialog checkbox
-#: ../lib/screenshooter-dialogs.c:1007
-msgid "Show the save dialog"
-msgstr "Mostra el diàleg per a desar"
-
-#: ../lib/screenshooter-dialogs.c:1013
-msgid ""
-"The save dialog allows you to change the file name and the save location"
-msgstr "El diàleg per a desar permet canviar la destinació i el nom del fitxer"
-
-#: ../lib/screenshooter-dialogs.c:1027
-msgid "Close the application"
-msgstr "Tanca l'aplicació"
-
-#: ../lib/screenshooter-dialogs.c:1033
-msgid ""
-"If unchecked, the current window will be displayed again after the "
-"screenshot has been taken to allow you to take several screenshots in a row"
+#: ../lib/screenshooter-dialogs.c:917
+msgid "Action"
 msgstr ""
-"Si està desmarcat, la finestra actual es mostrarà un altre cop després de "
-"realitzar la captura per a poder fer una ràfega de captures"
 
-#: ../lib/screenshooter-dialogs.c:1056
+#: ../lib/screenshooter-dialogs.c:945
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Action</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Acció</span>"
 
 #. Save option radio button
-#: ../lib/screenshooter-dialogs.c:1081
-msgid "Save in:"
+#: ../lib/screenshooter-dialogs.c:961
+#, fuzzy
+msgid "Save"
 msgstr "Desa a:"
 
-#: ../lib/screenshooter-dialogs.c:1089
+#: ../lib/screenshooter-dialogs.c:966
 msgid "Save the screenshot to a PNG file"
 msgstr "Desa la captura com a fitxer PNG"
 
-#: ../lib/screenshooter-dialogs.c:1104
-msgid "Default save location"
-msgstr "Lloc per defecte on desar"
-
-#: ../lib/screenshooter-dialogs.c:1114
-msgid "Set the default save location"
-msgstr "Indica el lloc per defecte on desar"
-
-#: ../lib/screenshooter-dialogs.c:1127
+#: ../lib/screenshooter-dialogs.c:975
 msgid "Copy to the clipboard"
 msgstr "Copia al porta-retalls"
 
-#: ../lib/screenshooter-dialogs.c:1132
+#: ../lib/screenshooter-dialogs.c:977
 msgid "Copy the screenshot to the clipboard so that it can be pasted later"
 msgstr ""
 "Copia la captura al porta-retalls i, d'aquesta manera, el podreu enganxar "
 "més endavant"
 
-#: ../lib/screenshooter-dialogs.c:1147
+#: ../lib/screenshooter-dialogs.c:994
 msgid "Open with:"
 msgstr "Obre amb:"
 
-#: ../lib/screenshooter-dialogs.c:1158
+#: ../lib/screenshooter-dialogs.c:1000
 msgid "Open the screenshot with the chosen application"
 msgstr "Obre la captura amb l'aplicació seleccionada"
 
-#: ../lib/screenshooter-dialogs.c:1191 ../src/main.c:73
+#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
 msgid "Application to open the screenshot"
 msgstr "Aplicació amb la que s'obre la captura"
 
-#: ../lib/screenshooter-dialogs.c:1204
+#: ../lib/screenshooter-dialogs.c:1028
 msgid "Host on ZimageZ"
 msgstr "Emmagatzemar a ZimageZ"
 
-#: ../lib/screenshooter-dialogs.c:1210 ../src/main.c:92
+#: ../lib/screenshooter-dialogs.c:1032 ../src/main.c:80
 msgid "Host the screenshot on ZimageZ, a free online image hosting service"
 msgstr ""
 "Emmagatzemar la captura de pantalla a ZimageZ, un servei d'emmagatzematge en "
 "línia gratuït"
 
-#: ../lib/screenshooter-dialogs.c:1255
+#: ../lib/screenshooter-dialogs.c:1046
+#, fuzzy
+msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Preview</span>"
+msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Enllaços</span>"
+
+#: ../lib/screenshooter-dialogs.c:1107
 msgid "Save screenshot as..."
 msgstr "Desa la captura com…"
 
-#. Start the user XML RPC session
-#: ../lib/screenshooter-zimagez.c:159
-msgid "Initialize the connection..."
-msgstr "Inicialitza la connexió…"
+#: ../lib/screenshooter-zimagez.c:134
+#, fuzzy, c-format
+msgid "An error occured when creating the XMLRPC request."
+msgstr "Hi ha hagut un error mentre s'estava enviant la captura de pantalla."
+
+#: ../lib/screenshooter-zimagez.c:153
+#, fuzzy, c-format
+msgid "An error occured when transfering the data to ZimageZ."
+msgstr "Hi ha hagut un error mentre s'estava enviant la captura de pantalla."
 
-#: ../lib/screenshooter-zimagez.c:172 ../lib/screenshooter-zimagez.c:332
-#: ../lib/screenshooter-zimagez.c:361 ../lib/screenshooter-zimagez.c:389
-#: ../lib/screenshooter-zimagez.c:520 ../lib/screenshooter-zimagez.c:543
-#: ../lib/screenshooter-zimagez.c:580
+#: ../lib/screenshooter-zimagez.c:178
+#, fuzzy, c-format
+msgid "An error occured when parsing the response from ZimageZ."
+msgstr "Hi ha hagut un error mentre s'estava enviant la captura de pantalla."
+
+#: ../lib/screenshooter-zimagez.c:228
 #, c-format
-msgid ""
-"An error occurred during the XML exchange: %s (%d).\n"
-" The screenshot could not be uploaded."
+msgid "Taken on %s, at %s"
 msgstr ""
-"Ha succeït un error durant l'intercanvi de l'XML: %s (%d).\n"
-"La captura de pantalla no s'ha transferit."
 
-#: ../lib/screenshooter-zimagez.c:223
+#. Start the user soup session
+#: ../lib/screenshooter-zimagez.c:295
+msgid "Initialize the connection..."
+msgstr "Inicialitza la connexió…"
+
+#: ../lib/screenshooter-zimagez.c:341
 msgid ""
 "Please file the following fields with your <a href=\"http://www.zimagez.com"
 "\">ZimageZ</a> \n"
@@ -231,11 +206,11 @@ msgstr ""
 "\">ZimageZ</a> \n"
 "nom d'usuari, la contrasenya i els detalls de la captura."
 
-#: ../lib/screenshooter-zimagez.c:283
+#: ../lib/screenshooter-zimagez.c:398
 msgid "Check the user information..."
 msgstr "Comprovar la informació de l'usuari…"
 
-#: ../lib/screenshooter-zimagez.c:305
+#: ../lib/screenshooter-zimagez.c:405
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You "
 "must fill all the fields.</span>"
@@ -243,11 +218,17 @@ msgstr ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">Heu "
 "d'omplir tots els camps.</span>"
 
-#: ../lib/screenshooter-zimagez.c:320
+#: ../lib/screenshooter-zimagez.c:419
 msgid "Login on ZimageZ..."
 msgstr "Entrada a ZimageZ…"
 
-#: ../lib/screenshooter-zimagez.c:436
+#: ../lib/screenshooter-zimagez.c:459 ../lib/screenshooter-zimagez.c:610
+msgid ""
+"An unexpected reply from ZimageZ was received. The upload of the screenshot "
+"failed."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:498
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The "
 "user and the password you entered do not match. Please retry.</span>"
@@ -256,30 +237,30 @@ msgstr ""
 "\">L'usuari i la contrasenya introduïts no coincideixen. Torneu a provar-ho."
 "</span>"
 
-#: ../lib/screenshooter-zimagez.c:501
+#: ../lib/screenshooter-zimagez.c:556
 msgid "Upload the screenshot..."
 msgstr "Transfereix la captura de pantalla…"
 
-#: ../lib/screenshooter-zimagez.c:559
+#: ../lib/screenshooter-zimagez.c:589
 #, c-format
 msgid "An error occurred while uploading the screenshot."
 msgstr "Hi ha hagut un error mentre s'estava enviant la captura de pantalla."
 
 #. End the user session
-#: ../lib/screenshooter-zimagez.c:597
+#: ../lib/screenshooter-zimagez.c:622
 msgid "Close the session on ZimageZ..."
 msgstr "Tanca la sessió amb ZimageZ…"
 
-#: ../lib/screenshooter-zimagez.c:650
+#: ../lib/screenshooter-zimagez.c:692
 msgid "Details about the screenshot for ZimageZ"
 msgstr "Detalls sobre la captura per ZimageZ"
 
 #. Create the user label
-#: ../lib/screenshooter-zimagez.c:692
+#: ../lib/screenshooter-zimagez.c:734
 msgid "User:"
 msgstr "Usuari:"
 
-#: ../lib/screenshooter-zimagez.c:703
+#: ../lib/screenshooter-zimagez.c:745
 msgid ""
 "Your Zimagez user name, if you do not have one yet please create one on the "
 "Web page linked above"
@@ -288,20 +269,20 @@ msgstr ""
 "visitant l'enllaç web proporcionat a dalt"
 
 #. Create the password label
-#: ../lib/screenshooter-zimagez.c:708
+#: ../lib/screenshooter-zimagez.c:751
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: ../lib/screenshooter-zimagez.c:718
+#: ../lib/screenshooter-zimagez.c:761
 msgid "The password for the user above"
 msgstr "La contrasenya per a l'usuari de dalt"
 
 #. Create the title label
-#: ../lib/screenshooter-zimagez.c:723
+#: ../lib/screenshooter-zimagez.c:767
 msgid "Title:"
 msgstr "Títol:"
 
-#: ../lib/screenshooter-zimagez.c:733
+#: ../lib/screenshooter-zimagez.c:777
 msgid ""
 "The title of the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
@@ -310,40 +291,40 @@ msgstr ""
 "captura de pantalla"
 
 #. Create the comment label
-#: ../lib/screenshooter-zimagez.c:738
+#: ../lib/screenshooter-zimagez.c:783
 msgid "Comment:"
 msgstr "Comentari:"
 
-#: ../lib/screenshooter-zimagez.c:749
+#: ../lib/screenshooter-zimagez.c:794
 msgid ""
 "A comment on the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
 msgstr "Un comentari a la captura que serà usat quan es mostri a Zimage>"
 
-#: ../lib/screenshooter-zimagez.c:870
+#: ../lib/screenshooter-zimagez.c:917
 #, c-format
 msgid "<a href=\"%s\">Full size image</a>"
 msgstr "<a href=\"%s\">Imatge a mida completa</a>"
 
-#: ../lib/screenshooter-zimagez.c:872
+#: ../lib/screenshooter-zimagez.c:919
 #, c-format
 msgid "<a href=\"%s\">Large thumbnail</a>"
 msgstr "<a href=\"%s\">Miniatura gran</a>"
 
-#: ../lib/screenshooter-zimagez.c:874
+#: ../lib/screenshooter-zimagez.c:921
 #, c-format
 msgid "<a href=\"%s\">Small thumbnail</a>"
 msgstr "<a href=\"%s\">Miniatura petita</a>"
 
-#: ../lib/screenshooter-zimagez.c:894
+#: ../lib/screenshooter-zimagez.c:937
 msgid "My screenshot on ZimageZ"
 msgstr "La meva captura a ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:920
+#: ../lib/screenshooter-zimagez.c:963
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Links</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Enllaços</span>"
 
-#: ../lib/screenshooter-zimagez.c:965
+#: ../lib/screenshooter-zimagez.c:1008
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing "
 "to the full size image</span>"
@@ -352,20 +333,20 @@ msgstr ""
 "apunta a la imatge de mida commpleta</span>"
 
 #. HTML title
-#: ../lib/screenshooter-zimagez.c:981
+#: ../lib/screenshooter-zimagez.c:1024
 msgid "HTML"
 msgstr "HTML"
 
 #. BB title
-#: ../lib/screenshooter-zimagez.c:1002
+#: ../lib/screenshooter-zimagez.c:1045
 msgid "BBCode for forums"
 msgstr "Codi de fòrum «BBCode»"
 
-#: ../lib/screenshooter-zimagez.c:1122
+#: ../lib/screenshooter-zimagez.c:1174
 msgid "ZimageZ"
 msgstr "ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:1155
+#: ../lib/screenshooter-zimagez.c:1207
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Status</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Estat</span>"
 
@@ -379,29 +360,38 @@ msgstr "_Obrir enllaç"
 msgid "Copy _Link Address"
 msgstr "Copiar l'adreça de l'en_llaç"
 
-#: ../src/main.c:53
+#: ../src/main.c:48
 msgid "Delay in seconds before taking the screenshot"
 msgstr "Retard en segons abans de fer la captura de pantalla"
 
-#: ../src/main.c:63
-msgid "Do not display the save dialog"
-msgstr "No mostris el diàleg d'on desar-la"
-
-#: ../src/main.c:68
-msgid "Do not display the mouse on the screenshot"
+#: ../src/main.c:58
+#, fuzzy
+msgid "Display the mouse on the screenshot"
 msgstr "No mostris el ratolí a la captura"
 
-#: ../src/main.c:85
+#: ../src/main.c:75
 msgid "Directory where the screenshot will be saved"
 msgstr "Carpeta on la captura es desarà"
 
-#: ../src/main.c:99
+#: ../src/main.c:85
 msgid "Version information"
 msgstr "Informació de la versió"
 
+#: ../src/main.c:134
+#, c-format
+msgid "Conflicting options: --%s and --%s cannot be used at the same time.\n"
+msgstr ""
+
 #: ../src/main.c:136
 #, c-format
 msgid ""
+"The --%s option is only used when --fullscreen, --window or --region is "
+"given. It will be ignored.\n"
+msgstr ""
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
@@ -409,7 +399,7 @@ msgstr ""
 "Feu %s --help per veure la llista complerta d'opcions disponibles de la "
 "línia d'ordres.\n"
 
-#: ../src/main.c:235
+#: ../src/main.c:282
 #, c-format
 msgid "%s is not a valid directory, the default directory will be used."
 msgstr "«%s» no és un directori vàlid, s'emprarà el directori per defecte."
@@ -421,6 +411,53 @@ msgid ""
 msgstr ""
 "Fes les captures de tota la pantalla, de la finestra activa o d'una regió"
 
+#~ msgid "Screenshot.png"
+#~ msgstr "captura.png"
+
+#~ msgid "Screenshot-%d.png"
+#~ msgstr "captura-%d.png"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">Després de fer la captura</"
+#~ "span>"
+
+#~ msgid "Show the save dialog"
+#~ msgstr "Mostra el diàleg per a desar"
+
+#~ msgid ""
+#~ "The save dialog allows you to change the file name and the save location"
+#~ msgstr ""
+#~ "El diàleg per a desar permet canviar la destinació i el nom del fitxer"
+
+#~ msgid "Close the application"
+#~ msgstr "Tanca l'aplicació"
+
+#~ msgid ""
+#~ "If unchecked, the current window will be displayed again after the "
+#~ "screenshot has been taken to allow you to take several screenshots in a "
+#~ "row"
+#~ msgstr ""
+#~ "Si està desmarcat, la finestra actual es mostrarà un altre cop després de "
+#~ "realitzar la captura per a poder fer una ràfega de captures"
+
+#~ msgid "Default save location"
+#~ msgstr "Lloc per defecte on desar"
+
+#~ msgid "Set the default save location"
+#~ msgstr "Indica el lloc per defecte on desar"
+
+#~ msgid ""
+#~ "An error occurred during the XML exchange: %s (%d).\n"
+#~ " The screenshot could not be uploaded."
+#~ msgstr ""
+#~ "Ha succeït un error durant l'intercanvi de l'XML: %s (%d).\n"
+#~ "La captura de pantalla no s'ha transferit."
+
+#~ msgid "Do not display the save dialog"
+#~ msgstr "No mostris el diàleg d'on desar-la"
+
 #, fuzzy
 #~ msgid "Uploading to ZimageZ..."
 #~ msgstr "Entrada a ZimageZ..."
diff --git a/po/cs.po b/po/cs.po
index 6aa024c..b7b197e 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-screenshooter-plugin 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-31 14:02+0200\n"
+"POT-Creation-Date: 2009-11-15 00:29+0100\n"
 "PO-Revision-Date: 2009-06-06 21:30+0100\n"
 "Last-Translator: Michal Várady <miko.vaji at gmail.com>\n"
 "Language-Team: Czech <translation-team-cs at lists.sourceforge.net>\n"
@@ -16,313 +16,335 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ../lib/screenshooter-dialogs.c:283
-msgid "Screenshot.png"
-msgstr "Snímek_obrazovky.png"
-
-#: ../lib/screenshooter-dialogs.c:300
-#, c-format
-msgid "Screenshot-%d.png"
-msgstr "Snímek_obrazovky-%d.png"
-
-#: ../lib/screenshooter-dialogs.c:493
+#: ../lib/screenshooter-dialogs.c:478
 #, c-format
 msgid "%.2fKb of %.2fKb"
 msgstr "%.2fKb z %.2fKb"
 
-#: ../lib/screenshooter-dialogs.c:577
+#: ../lib/screenshooter-dialogs.c:560
 msgid "Transfer"
 msgstr "Přenos"
 
-#: ../lib/screenshooter-dialogs.c:600
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being transferred to:</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Snímek obrazovky se přenáší na adresu:</span>"
+#: ../lib/screenshooter-dialogs.c:581
+msgid ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being "
+"transferred to:</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Snímek obrazovky se přenáší "
+"na adresu:</span>"
 
-#: ../lib/screenshooter-dialogs.c:724
-#: ../lib/screenshooter-dialogs.c:741
+#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
 msgid "Screenshot"
 msgstr "Snímek obrazovky"
 
-#: ../lib/screenshooter-dialogs.c:736
+#: ../lib/screenshooter-dialogs.c:709
 msgid "Take a screenshot"
 msgstr "Pořídit snímek obrazovky"
 
-#: ../lib/screenshooter-dialogs.c:751
+#: ../lib/screenshooter-dialogs.c:724
 msgid "Preferences"
 msgstr "Předvolby"
 
-#: ../lib/screenshooter-dialogs.c:793
+#: ../lib/screenshooter-dialogs.c:754
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Region to capture</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Snímaná oblast</span>"
 
-#: ../lib/screenshooter-dialogs.c:820
+#: ../lib/screenshooter-dialogs.c:774
 msgid "Entire screen"
 msgstr "Celá obrazovka"
 
-#: ../lib/screenshooter-dialogs.c:830
-#: ../src/main.c:58
-#: ../panel-plugin/screenshooter-plugin.c:292
+#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../panel-plugin/screenshooter-plugin.c:308
 msgid "Take a screenshot of the entire screen"
 msgstr "Pořídí snímek celé obrazovky"
 
-#: ../lib/screenshooter-dialogs.c:841
+#: ../lib/screenshooter-dialogs.c:789
 msgid "Active window"
 msgstr "Aktivní okno"
 
-#: ../lib/screenshooter-dialogs.c:851
-#: ../src/main.c:104
-#: ../panel-plugin/screenshooter-plugin.c:297
+#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr "Pořídí snímek aktivního okna"
 
-#: ../lib/screenshooter-dialogs.c:862
+#: ../lib/screenshooter-dialogs.c:804
 msgid "Select a region"
 msgstr "Vybraná oblast"
 
-#: ../lib/screenshooter-dialogs.c:872
-#: ../src/main.c:78
-#: ../panel-plugin/screenshooter-plugin.c:302
-msgid "Select a region to be captured by clicking a point of the screen without releasing the mouse button, dragging your mouse to the other corner of the region, and releasing the mouse button."
-msgstr "Pořídí snímek vybrané oblasti tak, že kliknete myší v počátečním bodě, bez uvolnění tlačítka přesunete kurzor myši do protějšího bodu vybrané oblasti a poté tlačítko myši pustíte."
+#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../panel-plugin/screenshooter-plugin.c:318
+msgid ""
+"Select a region to be captured by clicking a point of the screen without "
+"releasing the mouse button, dragging your mouse to the other corner of the "
+"region, and releasing the mouse button."
+msgstr ""
+"Pořídí snímek vybrané oblasti tak, že kliknete myší v počátečním bodě, bez "
+"uvolnění tlačítka přesunete kurzor myši do protějšího bodu vybrané oblasti a "
+"poté tlačítko myši pustíte."
 
-#: ../lib/screenshooter-dialogs.c:884
+#: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
 msgstr "Zachytit ukazatel myši"
 
-#: ../lib/screenshooter-dialogs.c:892
+#: ../lib/screenshooter-dialogs.c:824
 msgid "Display the mouse pointer on the screenshot"
 msgstr "Zobrazit ukazatel myši na snímku obrazovky"
 
-#: ../lib/screenshooter-dialogs.c:917
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Prodleva před pořízením snímku</span>"
+#: ../lib/screenshooter-dialogs.c:840
+msgid ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Prodleva před pořízením "
+"snímku</span>"
 
-#: ../lib/screenshooter-dialogs.c:952
+#: ../lib/screenshooter-dialogs.c:862
 msgid "Delay in seconds before the screenshot is taken"
 msgstr "Zpoždění před pořízením snímku obrazovky v sekundách"
 
-#: ../lib/screenshooter-dialogs.c:958
+#: ../lib/screenshooter-dialogs.c:865
 msgid "seconds"
 msgstr "sekund"
 
-#: ../lib/screenshooter-dialogs.c:984
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Po pořízení snímku</span>"
-
-#. Display the save dialog checkbox
-#: ../lib/screenshooter-dialogs.c:1007
-msgid "Show the save dialog"
-msgstr "Zobrazit dialogové okno pro uložení"
-
-#: ../lib/screenshooter-dialogs.c:1013
-msgid "The save dialog allows you to change the file name and the save location"
-msgstr "Dialogové okno pro uložení umožňuje změnit název souboru a umístění"
-
-#: ../lib/screenshooter-dialogs.c:1027
-msgid "Close the application"
-msgstr "Zavřít aplikaci"
-
-#: ../lib/screenshooter-dialogs.c:1033
-msgid "If unchecked, the current window will be displayed again after the screenshot has been taken to allow you to take several screenshots in a row"
-msgstr "Není-li zaškrtnuto, zobrazí se toto okno po pořízení snímku obrazovky znovu, aby bylo možné pořídit více snímků obrazovky za sebou"
+#: ../lib/screenshooter-dialogs.c:917
+msgid "Action"
+msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1056
+#: ../lib/screenshooter-dialogs.c:945
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Action</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Akce</span>"
 
 #. Save option radio button
-#: ../lib/screenshooter-dialogs.c:1081
-msgid "Save in:"
+#: ../lib/screenshooter-dialogs.c:961
+#, fuzzy
+msgid "Save"
 msgstr "Uložit do:"
 
-#: ../lib/screenshooter-dialogs.c:1089
+#: ../lib/screenshooter-dialogs.c:966
 msgid "Save the screenshot to a PNG file"
 msgstr "Uložit snímek obrazovky do souboru PNG"
 
-#: ../lib/screenshooter-dialogs.c:1104
-msgid "Default save location"
-msgstr "Výchozí umístění pro uložení"
-
-#: ../lib/screenshooter-dialogs.c:1114
-msgid "Set the default save location"
-msgstr "Nastavení výchozího umístění pro uložení"
-
-#: ../lib/screenshooter-dialogs.c:1127
+#: ../lib/screenshooter-dialogs.c:975
 msgid "Copy to the clipboard"
 msgstr "Zkopírovat do schránky"
 
-#: ../lib/screenshooter-dialogs.c:1132
+#: ../lib/screenshooter-dialogs.c:977
 msgid "Copy the screenshot to the clipboard so that it can be pasted later"
-msgstr "Zkopíruje snímek obrazovky do schránky, aby bylo možné jej později vložit jinam"
+msgstr ""
+"Zkopíruje snímek obrazovky do schránky, aby bylo možné jej později vložit "
+"jinam"
 
-#: ../lib/screenshooter-dialogs.c:1147
+#: ../lib/screenshooter-dialogs.c:994
 msgid "Open with:"
 msgstr "Otevřít pomocí:"
 
-#: ../lib/screenshooter-dialogs.c:1158
+#: ../lib/screenshooter-dialogs.c:1000
 msgid "Open the screenshot with the chosen application"
 msgstr "Otevře snímek obrazovky ve zvolené aplikaci"
 
-#: ../lib/screenshooter-dialogs.c:1191
-#: ../src/main.c:73
+#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
 msgid "Application to open the screenshot"
 msgstr "Aplikace pro otevírání snímků obrazovky"
 
-#: ../lib/screenshooter-dialogs.c:1204
+#: ../lib/screenshooter-dialogs.c:1028
 msgid "Host on ZimageZ"
 msgstr "Hostovat v galerii ZimageZ"
 
-#: ../lib/screenshooter-dialogs.c:1210
-#: ../src/main.c:92
+#: ../lib/screenshooter-dialogs.c:1032 ../src/main.c:80
 msgid "Host the screenshot on ZimageZ, a free online image hosting service"
-msgstr "Snímek obrazovky bude hostován v galerii ZimageZ, bezplatnou službou pro hostování obrázků"
+msgstr ""
+"Snímek obrazovky bude hostován v galerii ZimageZ, bezplatnou službou pro "
+"hostování obrázků"
+
+#: ../lib/screenshooter-dialogs.c:1046
+#, fuzzy
+msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Preview</span>"
+msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Odkazy</span>"
 
-#: ../lib/screenshooter-dialogs.c:1255
+#: ../lib/screenshooter-dialogs.c:1107
 msgid "Save screenshot as..."
 msgstr "Uložit snímek obrazovky jako..."
 
-#. Start the user XML RPC session
-#: ../lib/screenshooter-zimagez.c:159
-msgid "Initialize the connection..."
-msgstr "Inicializace spojení..."
+#: ../lib/screenshooter-zimagez.c:134
+#, fuzzy, c-format
+msgid "An error occured when creating the XMLRPC request."
+msgstr "Při ukládání snímku obrazovky na web došlo k chybě."
 
-#: ../lib/screenshooter-zimagez.c:172
-#: ../lib/screenshooter-zimagez.c:332
-#: ../lib/screenshooter-zimagez.c:361
-#: ../lib/screenshooter-zimagez.c:389
-#: ../lib/screenshooter-zimagez.c:520
-#: ../lib/screenshooter-zimagez.c:543
-#: ../lib/screenshooter-zimagez.c:580
+#: ../lib/screenshooter-zimagez.c:153
+#, fuzzy, c-format
+msgid "An error occured when transfering the data to ZimageZ."
+msgstr "Při ukládání snímku obrazovky na web došlo k chybě."
+
+#: ../lib/screenshooter-zimagez.c:178
+#, fuzzy, c-format
+msgid "An error occured when parsing the response from ZimageZ."
+msgstr "Při ukládání snímku obrazovky na web došlo k chybě."
+
+#: ../lib/screenshooter-zimagez.c:228
 #, c-format
-msgid ""
-"An error occurred during the XML exchange: %s (%d).\n"
-" The screenshot could not be uploaded."
+msgid "Taken on %s, at %s"
 msgstr ""
-"Při výměně dat XML došlo k chybě: %s (%d).\n"
-" Snímek obrazovky nelze umístit na web."
 
-#: ../lib/screenshooter-zimagez.c:223
+#. Start the user soup session
+#: ../lib/screenshooter-zimagez.c:295
+msgid "Initialize the connection..."
+msgstr "Inicializace spojení..."
+
+#: ../lib/screenshooter-zimagez.c:341
 msgid ""
-"Please file the following fields with your <a href=\"http://www.zimagez.com\">ZimageZ</a> \n"
+"Please file the following fields with your <a href=\"http://www.zimagez.com"
+"\">ZimageZ</a> \n"
 "user name, passsword and details about the screenshot."
 msgstr ""
-"Do následujících polí vyplňte uživatelské jméno, heslo a podrobnosti o snímku obrazovky\n"
+"Do následujících polí vyplňte uživatelské jméno, heslo a podrobnosti o "
+"snímku obrazovky\n"
 "v galerii <a href=\"http://www.zimagez.com\">ZimageZ</a>."
 
-#: ../lib/screenshooter-zimagez.c:283
+#: ../lib/screenshooter-zimagez.c:398
 msgid "Check the user information..."
 msgstr "Ověřování údajů o uživateli..."
 
-#: ../lib/screenshooter-zimagez.c:305
-msgid "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You must fill all the fields.</span>"
-msgstr "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">Je nutné vyplnit všechna pole.</span>"
+#: ../lib/screenshooter-zimagez.c:405
+msgid ""
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You "
+"must fill all the fields.</span>"
+msgstr ""
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">Je "
+"nutné vyplnit všechna pole.</span>"
 
-#: ../lib/screenshooter-zimagez.c:320
+#: ../lib/screenshooter-zimagez.c:419
 msgid "Login on ZimageZ..."
 msgstr "Přihlašování do galerie ZimageZ..."
 
-#: ../lib/screenshooter-zimagez.c:436
-msgid "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The user and the password you entered do not match. Please retry.</span>"
-msgstr "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">Zadané uživatelské jméno nebo heslo není platné. Zadejte jej znovu.</span>"
+#: ../lib/screenshooter-zimagez.c:459 ../lib/screenshooter-zimagez.c:610
+msgid ""
+"An unexpected reply from ZimageZ was received. The upload of the screenshot "
+"failed."
+msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:501
+#: ../lib/screenshooter-zimagez.c:498
+msgid ""
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The "
+"user and the password you entered do not match. Please retry.</span>"
+msgstr ""
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">Zadané "
+"uživatelské jméno nebo heslo není platné. Zadejte jej znovu.</span>"
+
+#: ../lib/screenshooter-zimagez.c:556
 msgid "Upload the screenshot..."
 msgstr "Uložit snímek obrazovky na web..."
 
-#: ../lib/screenshooter-zimagez.c:559
+#: ../lib/screenshooter-zimagez.c:589
 #, c-format
 msgid "An error occurred while uploading the screenshot."
 msgstr "Při ukládání snímku obrazovky na web došlo k chybě."
 
 #. End the user session
-#: ../lib/screenshooter-zimagez.c:597
+#: ../lib/screenshooter-zimagez.c:622
 msgid "Close the session on ZimageZ..."
 msgstr "Zavřít relaci na galerii ZimageZ..."
 
-#: ../lib/screenshooter-zimagez.c:650
+#: ../lib/screenshooter-zimagez.c:692
 msgid "Details about the screenshot for ZimageZ"
 msgstr "Podobnosti o snímku obrazovky pro galerii ZimageZ"
 
 #. Create the user label
-#: ../lib/screenshooter-zimagez.c:692
+#: ../lib/screenshooter-zimagez.c:734
 msgid "User:"
 msgstr "Uživatel:"
 
-#: ../lib/screenshooter-zimagez.c:703
-msgid "Your Zimagez user name, if you do not have one yet please create one on the Web page linked above"
-msgstr "Vaše uživatelské jméno v galerii Zimagez. Pokud ještě nemáte účet, vytvořte si jej kliknutím na odkaz na webovou stránku výše"
+#: ../lib/screenshooter-zimagez.c:745
+msgid ""
+"Your Zimagez user name, if you do not have one yet please create one on the "
+"Web page linked above"
+msgstr ""
+"Vaše uživatelské jméno v galerii Zimagez. Pokud ještě nemáte účet, vytvořte "
+"si jej kliknutím na odkaz na webovou stránku výše"
 
 #. Create the password label
-#: ../lib/screenshooter-zimagez.c:708
+#: ../lib/screenshooter-zimagez.c:751
 msgid "Password:"
 msgstr "Heslo:"
 
-#: ../lib/screenshooter-zimagez.c:718
+#: ../lib/screenshooter-zimagez.c:761
 msgid "The password for the user above"
 msgstr "Heslo pro uživatele zmíněného výše"
 
 #. Create the title label
-#: ../lib/screenshooter-zimagez.c:723
+#: ../lib/screenshooter-zimagez.c:767
 msgid "Title:"
 msgstr "Titulek:"
 
-#: ../lib/screenshooter-zimagez.c:733
-msgid "The title of the screenshot, it will be used when displaying the screenshot on ZimageZ"
-msgstr "Titulek snímku obrazovky, bude použit při zobrazení tohoto snímku v galerii Zimagez"
+#: ../lib/screenshooter-zimagez.c:777
+msgid ""
+"The title of the screenshot, it will be used when displaying the screenshot "
+"on ZimageZ"
+msgstr ""
+"Titulek snímku obrazovky, bude použit při zobrazení tohoto snímku v galerii "
+"Zimagez"
 
 #. Create the comment label
-#: ../lib/screenshooter-zimagez.c:738
+#: ../lib/screenshooter-zimagez.c:783
 msgid "Comment:"
 msgstr "Komentář:"
 
-#: ../lib/screenshooter-zimagez.c:749
-msgid "A comment on the screenshot, it will be used when displaying the screenshot on ZimageZ"
-msgstr "Komentář snímku obrazovky, bude použit při zobrazení tohoto snímku v galerii Zimagez"
+#: ../lib/screenshooter-zimagez.c:794
+msgid ""
+"A comment on the screenshot, it will be used when displaying the screenshot "
+"on ZimageZ"
+msgstr ""
+"Komentář snímku obrazovky, bude použit při zobrazení tohoto snímku v galerii "
+"Zimagez"
 
-#: ../lib/screenshooter-zimagez.c:870
+#: ../lib/screenshooter-zimagez.c:917
 #, c-format
 msgid "<a href=\"%s\">Full size image</a>"
 msgstr "<a href=\"%s\">Obrázek v plném rozlišení</a>"
 
-#: ../lib/screenshooter-zimagez.c:872
+#: ../lib/screenshooter-zimagez.c:919
 #, c-format
 msgid "<a href=\"%s\">Large thumbnail</a>"
 msgstr "<a href=\"%s\">Velký náhled</a>"
 
-#: ../lib/screenshooter-zimagez.c:874
+#: ../lib/screenshooter-zimagez.c:921
 #, c-format
 msgid "<a href=\"%s\">Small thumbnail</a>"
 msgstr "<a href=\"%s\">Malý náhled</a>"
 
-#: ../lib/screenshooter-zimagez.c:894
+#: ../lib/screenshooter-zimagez.c:937
 msgid "My screenshot on ZimageZ"
 msgstr "Můj snímek obrazovky v galerii ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:920
+#: ../lib/screenshooter-zimagez.c:963
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Links</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Odkazy</span>"
 
-#: ../lib/screenshooter-zimagez.c:965
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing to the full size image</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Kód pro náhled odkazující na obrázek v plném rozlišení</span>"
+#: ../lib/screenshooter-zimagez.c:1008
+msgid ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing "
+"to the full size image</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Kód pro náhled odkazující na "
+"obrázek v plném rozlišení</span>"
 
 #. HTML title
-#: ../lib/screenshooter-zimagez.c:981
+#: ../lib/screenshooter-zimagez.c:1024
 msgid "HTML"
 msgstr "HTML"
 
 #. BB title
-#: ../lib/screenshooter-zimagez.c:1002
+#: ../lib/screenshooter-zimagez.c:1045
 msgid "BBCode for forums"
 msgstr "Kód BBCode pro diskuzní fóra"
 
-#: ../lib/screenshooter-zimagez.c:1122
+#: ../lib/screenshooter-zimagez.c:1174
 msgid "ZimageZ"
 msgstr "ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:1155
+#: ../lib/screenshooter-zimagez.c:1207
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Status</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Stav</span>"
 
@@ -336,45 +358,100 @@ msgstr "_Otevřít odkaz"
 msgid "Copy _Link Address"
 msgstr "Kopírovat adresu _odkazu"
 
-#: ../src/main.c:53
+#: ../src/main.c:48
 msgid "Delay in seconds before taking the screenshot"
 msgstr "Zpoždění před pořízením snímku obrazovky v sekundách"
 
-#: ../src/main.c:63
-msgid "Do not display the save dialog"
-msgstr "Nezobrazovat dialogové okno pro uložení"
-
-#: ../src/main.c:68
-msgid "Do not display the mouse on the screenshot"
+#: ../src/main.c:58
+#, fuzzy
+msgid "Display the mouse on the screenshot"
 msgstr "Nezobrazovat myš na snímku obrazovky"
 
-#: ../src/main.c:85
+#: ../src/main.c:75
 msgid "Directory where the screenshot will be saved"
 msgstr "Adresář pro uložení snímků obrazovky"
 
-#: ../src/main.c:99
+#: ../src/main.c:85
 msgid "Version information"
 msgstr "Informace o verzi"
 
+#: ../src/main.c:134
+#, c-format
+msgid "Conflicting options: --%s and --%s cannot be used at the same time.\n"
+msgstr ""
+
 #: ../src/main.c:136
 #, c-format
 msgid ""
+"The --%s option is only used when --fullscreen, --window or --region is "
+"given. It will be ignored.\n"
+msgstr ""
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
 "%s: %s\n"
 "Úplný výpis dostupných voleb příkazové řádky získáte příkazem %s --help\n"
 
-#: ../src/main.c:235
+#: ../src/main.c:282
 #, c-format
 msgid "%s is not a valid directory, the default directory will be used."
 msgstr "%s není platným adresářem, použije se výchozí adresář."
 
 #: ../src/xfce4-screenshooter.desktop.in.in.h:2
 #: ../panel-plugin/screenshooter.desktop.in.in.h:2
-msgid "Take screenshots of the entire screen, of the active window or of a region"
+msgid ""
+"Take screenshots of the entire screen, of the active window or of a region"
 msgstr "Pořizuje snímky celé obrazovky, aktivního okna nebo zvolené oblasti"
 
+#~ msgid "Screenshot.png"
+#~ msgstr "Snímek_obrazovky.png"
+
+#~ msgid "Screenshot-%d.png"
+#~ msgstr "Snímek_obrazovky-%d.png"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">Po pořízení snímku</span>"
+
+#~ msgid "Show the save dialog"
+#~ msgstr "Zobrazit dialogové okno pro uložení"
+
+#~ msgid ""
+#~ "The save dialog allows you to change the file name and the save location"
+#~ msgstr "Dialogové okno pro uložení umožňuje změnit název souboru a umístění"
+
+#~ msgid "Close the application"
+#~ msgstr "Zavřít aplikaci"
+
+#~ msgid ""
+#~ "If unchecked, the current window will be displayed again after the "
+#~ "screenshot has been taken to allow you to take several screenshots in a "
+#~ "row"
+#~ msgstr ""
+#~ "Není-li zaškrtnuto, zobrazí se toto okno po pořízení snímku obrazovky "
+#~ "znovu, aby bylo možné pořídit více snímků obrazovky za sebou"
+
+#~ msgid "Default save location"
+#~ msgstr "Výchozí umístění pro uložení"
+
+#~ msgid "Set the default save location"
+#~ msgstr "Nastavení výchozího umístění pro uložení"
+
+#~ msgid ""
+#~ "An error occurred during the XML exchange: %s (%d).\n"
+#~ " The screenshot could not be uploaded."
+#~ msgstr ""
+#~ "Při výměně dat XML došlo k chybě: %s (%d).\n"
+#~ " Snímek obrazovky nelze umístit na web."
+
+#~ msgid "Do not display the save dialog"
+#~ msgstr "Nezobrazovat dialogové okno pro uložení"
+
 #, fuzzy
 #~ msgid "Tak a screenshot of the entire screen"
 #~ msgstr "Pořídí snímek celé obrazovky"
@@ -386,12 +463,13 @@ msgstr "Pořizuje snímky celé obrazovky, aktivního okna nebo zvolené oblasti
 #, fuzzy
 #~ msgid "Display the save dialog"
 #~ msgstr "Nezobrazovat dialogové okno pro ukládání"
+
 #~ msgid "Save by default to:"
 #~ msgstr "Uložit do výchozího umístění:"
+
 #~ msgid ""
 #~ "If checked, the screenshot will be saved by default to the location set "
 #~ "on the right without displaying a save dialog"
 #~ msgstr ""
 #~ "Pokud je volba povolena, snímek obrazovky se uloží do výchozího umístění "
 #~ "nastaveného vpravo, aniž by se zobrazilo dialogové okno pro uložení"
-
diff --git a/po/da.po b/po/da.po
index 5dd4068..35e0e2c 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-screenshooter 1.5.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-31 14:02+0200\n"
+"POT-Creation-Date: 2009-11-15 00:29+0100\n"
 "PO-Revision-Date: 2009-06-02 19:07+0100\n"
 "Last-Translator: Per Kongstad <p_kongstad at op.pl>\n"
 "Language-Team: Danish <dansk at dansk-gruppen.dk>\n"
@@ -18,313 +18,333 @@ msgstr ""
 "X-Poedit-Country: DENMARK\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../lib/screenshooter-dialogs.c:283
-msgid "Screenshot.png"
-msgstr "Skærmbillede.png"
-
-#: ../lib/screenshooter-dialogs.c:300
-#, c-format
-msgid "Screenshot-%d.png"
-msgstr "Skærmbillede-%d.png"
-
-#: ../lib/screenshooter-dialogs.c:493
+#: ../lib/screenshooter-dialogs.c:478
 #, c-format
 msgid "%.2fKb of %.2fKb"
 msgstr "%.2fKb af %.2fKb"
 
-#: ../lib/screenshooter-dialogs.c:577
+#: ../lib/screenshooter-dialogs.c:560
 msgid "Transfer"
 msgstr "Overførsel"
 
-#: ../lib/screenshooter-dialogs.c:600
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being transferred to:</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Skærmbilledet bliver overført til:</span>"
+#: ../lib/screenshooter-dialogs.c:581
+msgid ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being "
+"transferred to:</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Skærmbilledet bliver overført "
+"til:</span>"
 
-#: ../lib/screenshooter-dialogs.c:724
-#: ../lib/screenshooter-dialogs.c:741
+#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
 msgid "Screenshot"
 msgstr "Skærmbillede"
 
-#: ../lib/screenshooter-dialogs.c:736
+#: ../lib/screenshooter-dialogs.c:709
 msgid "Take a screenshot"
 msgstr "Tag et skærmbillede"
 
-#: ../lib/screenshooter-dialogs.c:751
+#: ../lib/screenshooter-dialogs.c:724
 msgid "Preferences"
 msgstr "Indstillinger"
 
-#: ../lib/screenshooter-dialogs.c:793
+#: ../lib/screenshooter-dialogs.c:754
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Region to capture</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Område til kopiering</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Område til kopiering</span>"
 
-#: ../lib/screenshooter-dialogs.c:820
+#: ../lib/screenshooter-dialogs.c:774
 msgid "Entire screen"
 msgstr "Hele skærmen"
 
-#: ../lib/screenshooter-dialogs.c:830
-#: ../src/main.c:58
-#: ../panel-plugin/screenshooter-plugin.c:292
+#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../panel-plugin/screenshooter-plugin.c:308
 msgid "Take a screenshot of the entire screen"
 msgstr "Tag et skærmbillede af hele skærmen"
 
-#: ../lib/screenshooter-dialogs.c:841
+#: ../lib/screenshooter-dialogs.c:789
 msgid "Active window"
 msgstr "Aktive vindue"
 
-#: ../lib/screenshooter-dialogs.c:851
-#: ../src/main.c:104
-#: ../panel-plugin/screenshooter-plugin.c:297
+#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr "Tag et skærmbillede af det aktive vindue"
 
-#: ../lib/screenshooter-dialogs.c:862
+#: ../lib/screenshooter-dialogs.c:804
 msgid "Select a region"
 msgstr "Markér et område"
 
-#: ../lib/screenshooter-dialogs.c:872
-#: ../src/main.c:78
-#: ../panel-plugin/screenshooter-plugin.c:302
-msgid "Select a region to be captured by clicking a point of the screen without releasing the mouse button, dragging your mouse to the other corner of the region, and releasing the mouse button."
-msgstr "Markér et område til kopiering ved at klikke et startpunkt på skærmen uden at slippe museknappen, og trække musen til slutpunkt af området, og derefter slippe museknappen."
+#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../panel-plugin/screenshooter-plugin.c:318
+msgid ""
+"Select a region to be captured by clicking a point of the screen without "
+"releasing the mouse button, dragging your mouse to the other corner of the "
+"region, and releasing the mouse button."
+msgstr ""
+"Markér et område til kopiering ved at klikke et startpunkt på skærmen uden "
+"at slippe museknappen, og trække musen til slutpunkt af området, og derefter "
+"slippe museknappen."
 
-#: ../lib/screenshooter-dialogs.c:884
+#: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
 msgstr "Fang musemarkøren"
 
-#: ../lib/screenshooter-dialogs.c:892
+#: ../lib/screenshooter-dialogs.c:824
 msgid "Display the mouse pointer on the screenshot"
 msgstr "Vis musemarkøren på skærmbilledet"
 
-#: ../lib/screenshooter-dialogs.c:917
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Forsinkelse inden billede tages</span>"
+#: ../lib/screenshooter-dialogs.c:840
+msgid ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Forsinkelse inden billede "
+"tages</span>"
 
-#: ../lib/screenshooter-dialogs.c:952
+#: ../lib/screenshooter-dialogs.c:862
 msgid "Delay in seconds before the screenshot is taken"
 msgstr "Forsinkelse i sekunder før skærmbilledet bliver taget"
 
-#: ../lib/screenshooter-dialogs.c:958
+#: ../lib/screenshooter-dialogs.c:865
 msgid "seconds"
 msgstr "sekunder"
 
-#: ../lib/screenshooter-dialogs.c:984
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Efter billedet er taget</span>"
-
-#. Display the save dialog checkbox
-#: ../lib/screenshooter-dialogs.c:1007
-msgid "Show the save dialog"
-msgstr "Vis gem-dialogen"
-
-#: ../lib/screenshooter-dialogs.c:1013
-msgid "The save dialog allows you to change the file name and the save location"
-msgstr "Gemmedialogen tillader dig at ændre filnavnet og placeringen"
-
-#: ../lib/screenshooter-dialogs.c:1027
-msgid "Close the application"
-msgstr "Afslut programmet"
-
-#: ../lib/screenshooter-dialogs.c:1033
-msgid "If unchecked, the current window will be displayed again after the screenshot has been taken to allow you to take several screenshots in a row"
-msgstr "Hvis ej afkrydset, vil det aktuelle vindue blive vist igen, efter skærmbilledet er blevet taget, således du kan tage flere skærmbilleder efter hinanden"
+#: ../lib/screenshooter-dialogs.c:917
+msgid "Action"
+msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1056
+#: ../lib/screenshooter-dialogs.c:945
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Action</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Handling</span>"
 
 #. Save option radio button
-#: ../lib/screenshooter-dialogs.c:1081
-msgid "Save in:"
+#: ../lib/screenshooter-dialogs.c:961
+#, fuzzy
+msgid "Save"
 msgstr "Gem i:"
 
-#: ../lib/screenshooter-dialogs.c:1089
+#: ../lib/screenshooter-dialogs.c:966
 msgid "Save the screenshot to a PNG file"
 msgstr "Gem skærmbilledet til en PNG-fil"
 
-#: ../lib/screenshooter-dialogs.c:1104
-msgid "Default save location"
-msgstr "Standard-placering af fil"
-
-#: ../lib/screenshooter-dialogs.c:1114
-msgid "Set the default save location"
-msgstr "Indstil standard-placering af fil"
-
-#: ../lib/screenshooter-dialogs.c:1127
+#: ../lib/screenshooter-dialogs.c:975
 msgid "Copy to the clipboard"
 msgstr "Kopiér til udklipsholderen"
 
-#: ../lib/screenshooter-dialogs.c:1132
+#: ../lib/screenshooter-dialogs.c:977
 msgid "Copy the screenshot to the clipboard so that it can be pasted later"
 msgstr "Kopiér skærmbilledet til udklipsholderen til senere indsætning"
 
-#: ../lib/screenshooter-dialogs.c:1147
+#: ../lib/screenshooter-dialogs.c:994
 msgid "Open with:"
 msgstr "Åbn med:"
 
-#: ../lib/screenshooter-dialogs.c:1158
+#: ../lib/screenshooter-dialogs.c:1000
 msgid "Open the screenshot with the chosen application"
 msgstr "Åbn skærmbilledet med det valgte program"
 
-#: ../lib/screenshooter-dialogs.c:1191
-#: ../src/main.c:73
+#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
 msgid "Application to open the screenshot"
 msgstr "Program til åbning af skærmbilledet"
 
-#: ../lib/screenshooter-dialogs.c:1204
+#: ../lib/screenshooter-dialogs.c:1028
 msgid "Host on ZimageZ"
 msgstr "Host på ZimageZ"
 
-#: ../lib/screenshooter-dialogs.c:1210
-#: ../src/main.c:92
+#: ../lib/screenshooter-dialogs.c:1032 ../src/main.c:80
 msgid "Host the screenshot on ZimageZ, a free online image hosting service"
 msgstr "Host skærmbilledet på ZimageZ. en fri online billed-hosting-tjeneste"
 
-#: ../lib/screenshooter-dialogs.c:1255
+#: ../lib/screenshooter-dialogs.c:1046
+#, fuzzy
+msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Preview</span>"
+msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Links</span>"
+
+#: ../lib/screenshooter-dialogs.c:1107
 msgid "Save screenshot as..."
 msgstr "Gem skærmbillede som..."
 
-#. Start the user XML RPC session
-#: ../lib/screenshooter-zimagez.c:159
-msgid "Initialize the connection..."
-msgstr "Initiér forbindelsen..."
+#: ../lib/screenshooter-zimagez.c:134
+#, fuzzy, c-format
+msgid "An error occured when creating the XMLRPC request."
+msgstr "En fejl opstod under overførsel af skærmbilledet."
+
+#: ../lib/screenshooter-zimagez.c:153
+#, fuzzy, c-format
+msgid "An error occured when transfering the data to ZimageZ."
+msgstr "En fejl opstod under overførsel af skærmbilledet."
 
-#: ../lib/screenshooter-zimagez.c:172
-#: ../lib/screenshooter-zimagez.c:332
-#: ../lib/screenshooter-zimagez.c:361
-#: ../lib/screenshooter-zimagez.c:389
-#: ../lib/screenshooter-zimagez.c:520
-#: ../lib/screenshooter-zimagez.c:543
-#: ../lib/screenshooter-zimagez.c:580
+#: ../lib/screenshooter-zimagez.c:178
+#, fuzzy, c-format
+msgid "An error occured when parsing the response from ZimageZ."
+msgstr "En fejl opstod under overførsel af skærmbilledet."
+
+#: ../lib/screenshooter-zimagez.c:228
 #, c-format
-msgid ""
-"An error occurred during the XML exchange: %s (%d).\n"
-" The screenshot could not be uploaded."
+msgid "Taken on %s, at %s"
 msgstr ""
-"En fejl opstod under udveksling af  XML: %s (%d).\n"
-" Skærmbilledet kunne ikke overføres."
 
-#: ../lib/screenshooter-zimagez.c:223
+#. Start the user soup session
+#: ../lib/screenshooter-zimagez.c:295
+msgid "Initialize the connection..."
+msgstr "Initiér forbindelsen..."
+
+#: ../lib/screenshooter-zimagez.c:341
 msgid ""
-"Please file the following fields with your <a href=\"http://www.zimagez.com\">ZimageZ</a> \n"
+"Please file the following fields with your <a href=\"http://www.zimagez.com"
+"\">ZimageZ</a> \n"
 "user name, passsword and details about the screenshot."
 msgstr ""
-"Arkivér venligst de følgende felter med dit <a href=\"http://www.zimagez.com\">ZimageZ</a> \n"
+"Arkivér venligst de følgende felter med dit <a href=\"http://www.zimagez.com"
+"\">ZimageZ</a> \n"
 "brugernavn, adgangskode og detaljer om skærmbilledet."
 
-#: ../lib/screenshooter-zimagez.c:283
+#: ../lib/screenshooter-zimagez.c:398
 msgid "Check the user information..."
 msgstr "Kontrollér brugerinformationen..."
 
-#: ../lib/screenshooter-zimagez.c:305
-msgid "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You must fill all the fields.</span>"
-msgstr "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">Du skal udfylde alle felterne.</span>"
+#: ../lib/screenshooter-zimagez.c:405
+msgid ""
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You "
+"must fill all the fields.</span>"
+msgstr ""
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">Du "
+"skal udfylde alle felterne.</span>"
 
-#: ../lib/screenshooter-zimagez.c:320
+#: ../lib/screenshooter-zimagez.c:419
 msgid "Login on ZimageZ..."
 msgstr "Logind til ZimageZ..."
 
-#: ../lib/screenshooter-zimagez.c:436
-msgid "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The user and the password you entered do not match. Please retry.</span>"
-msgstr "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">Brugeren og adgangskoden som du indtastede stemmer ikke overens. Prøv igen.</span>"
+#: ../lib/screenshooter-zimagez.c:459 ../lib/screenshooter-zimagez.c:610
+msgid ""
+"An unexpected reply from ZimageZ was received. The upload of the screenshot "
+"failed."
+msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:501
+#: ../lib/screenshooter-zimagez.c:498
+msgid ""
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The "
+"user and the password you entered do not match. Please retry.</span>"
+msgstr ""
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded"
+"\">Brugeren og adgangskoden som du indtastede stemmer ikke overens. Prøv "
+"igen.</span>"
+
+#: ../lib/screenshooter-zimagez.c:556
 msgid "Upload the screenshot..."
 msgstr "Overfør skærmbilledet..."
 
-#: ../lib/screenshooter-zimagez.c:559
+#: ../lib/screenshooter-zimagez.c:589
 #, c-format
 msgid "An error occurred while uploading the screenshot."
 msgstr "En fejl opstod under overførsel af skærmbilledet."
 
 #. End the user session
-#: ../lib/screenshooter-zimagez.c:597
+#: ../lib/screenshooter-zimagez.c:622
 msgid "Close the session on ZimageZ..."
 msgstr "Luk sessionen til ZimageZ..."
 
-#: ../lib/screenshooter-zimagez.c:650
+#: ../lib/screenshooter-zimagez.c:692
 msgid "Details about the screenshot for ZimageZ"
 msgstr "Detaljer om skærmbilledet til ZimageZ"
 
 #. Create the user label
-#: ../lib/screenshooter-zimagez.c:692
+#: ../lib/screenshooter-zimagez.c:734
 msgid "User:"
 msgstr "Bruger:"
 
-#: ../lib/screenshooter-zimagez.c:703
-msgid "Your Zimagez user name, if you do not have one yet please create one on the Web page linked above"
-msgstr "Dit ZimageZ-brugernavn. Hvis du endnu ikke har et, bedes du venligst oprette ét på netsiden linket til foroven"
+#: ../lib/screenshooter-zimagez.c:745
+msgid ""
+"Your Zimagez user name, if you do not have one yet please create one on the "
+"Web page linked above"
+msgstr ""
+"Dit ZimageZ-brugernavn. Hvis du endnu ikke har et, bedes du venligst oprette "
+"ét på netsiden linket til foroven"
 
 #. Create the password label
-#: ../lib/screenshooter-zimagez.c:708
+#: ../lib/screenshooter-zimagez.c:751
 msgid "Password:"
 msgstr "Adgangskode:"
 
-#: ../lib/screenshooter-zimagez.c:718
+#: ../lib/screenshooter-zimagez.c:761
 msgid "The password for the user above"
 msgstr "Adgangskoden til brugeren for oven"
 
 #. Create the title label
-#: ../lib/screenshooter-zimagez.c:723
+#: ../lib/screenshooter-zimagez.c:767
 msgid "Title:"
 msgstr "Titel:"
 
-#: ../lib/screenshooter-zimagez.c:733
-msgid "The title of the screenshot, it will be used when displaying the screenshot on ZimageZ"
-msgstr "Titlen på skærmbilledet. Det vil blive brugt ved visning af skærmbilledet på ZimageZ"
+#: ../lib/screenshooter-zimagez.c:777
+msgid ""
+"The title of the screenshot, it will be used when displaying the screenshot "
+"on ZimageZ"
+msgstr ""
+"Titlen på skærmbilledet. Det vil blive brugt ved visning af skærmbilledet på "
+"ZimageZ"
 
 #. Create the comment label
-#: ../lib/screenshooter-zimagez.c:738
+#: ../lib/screenshooter-zimagez.c:783
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: ../lib/screenshooter-zimagez.c:749
-msgid "A comment on the screenshot, it will be used when displaying the screenshot on ZimageZ"
-msgstr "En kommentar på skærmbilledet. Det vil blive brugt når skærmbilledet vises på ZimageZ"
+#: ../lib/screenshooter-zimagez.c:794
+msgid ""
+"A comment on the screenshot, it will be used when displaying the screenshot "
+"on ZimageZ"
+msgstr ""
+"En kommentar på skærmbilledet. Det vil blive brugt når skærmbilledet vises "
+"på ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:870
+#: ../lib/screenshooter-zimagez.c:917
 #, c-format
 msgid "<a href=\"%s\">Full size image</a>"
 msgstr "<a href=\"%s\">Fuld størrelse billede</a>"
 
-#: ../lib/screenshooter-zimagez.c:872
+#: ../lib/screenshooter-zimagez.c:919
 #, c-format
 msgid "<a href=\"%s\">Large thumbnail</a>"
 msgstr "<a href=\"%s\">Stor miniature</a>"
 
-#: ../lib/screenshooter-zimagez.c:874
+#: ../lib/screenshooter-zimagez.c:921
 #, c-format
 msgid "<a href=\"%s\">Small thumbnail</a>"
 msgstr "<a href=\"%s\">Lille miniature</a>"
 
-#: ../lib/screenshooter-zimagez.c:894
+#: ../lib/screenshooter-zimagez.c:937
 msgid "My screenshot on ZimageZ"
 msgstr "Mine skærmbilleder på ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:920
+#: ../lib/screenshooter-zimagez.c:963
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Links</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Links</span>"
 
-#: ../lib/screenshooter-zimagez.c:965
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing to the full size image</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Kode for en miniature som peger på billedet i fuld størrelse</span>"
+#: ../lib/screenshooter-zimagez.c:1008
+msgid ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing "
+"to the full size image</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Kode for en miniature som "
+"peger på billedet i fuld størrelse</span>"
 
 #. HTML title
-#: ../lib/screenshooter-zimagez.c:981
+#: ../lib/screenshooter-zimagez.c:1024
 msgid "HTML"
 msgstr "HTML"
 
 #. BB title
-#: ../lib/screenshooter-zimagez.c:1002
+#: ../lib/screenshooter-zimagez.c:1045
 msgid "BBCode for forums"
 msgstr "BBCode til fora"
 
-#: ../lib/screenshooter-zimagez.c:1122
+#: ../lib/screenshooter-zimagez.c:1174
 msgid "ZimageZ"
 msgstr "ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:1155
+#: ../lib/screenshooter-zimagez.c:1207
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Status</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Status</span>"
 
@@ -338,47 +358,106 @@ msgstr "_Åbn link"
 msgid "Copy _Link Address"
 msgstr "Kopiér _linkadresse"
 
-#: ../src/main.c:53
+#: ../src/main.c:48
 msgid "Delay in seconds before taking the screenshot"
 msgstr "Forsinkelse i sekunder før skærmbilledet tages"
 
-#: ../src/main.c:63
-msgid "Do not display the save dialog"
-msgstr "Vis ikke gem-dialogen"
-
-#: ../src/main.c:68
-msgid "Do not display the mouse on the screenshot"
+#: ../src/main.c:58
+#, fuzzy
+msgid "Display the mouse on the screenshot"
 msgstr "Vis ikke musen på skærmbilledet"
 
-#: ../src/main.c:85
+#: ../src/main.c:75
 msgid "Directory where the screenshot will be saved"
 msgstr "Katalog hvor skærmbilledet vil blive gemt"
 
-#: ../src/main.c:99
+#: ../src/main.c:85
 msgid "Version information"
 msgstr "Versionsinformation"
 
+#: ../src/main.c:134
+#, c-format
+msgid "Conflicting options: --%s and --%s cannot be used at the same time.\n"
+msgstr ""
+
 #: ../src/main.c:136
 #, c-format
 msgid ""
+"The --%s option is only used when --fullscreen, --window or --region is "
+"given. It will be ignored.\n"
+msgstr ""
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
 "%s: %s\n"
 "Prøv %s --help for at se en liste med mulige kommandolinjetilvalg.\n"
 
-#: ../src/main.c:235
+#: ../src/main.c:282
 #, c-format
 msgid "%s is not a valid directory, the default directory will be used."
 msgstr "%s er ikke et gyldigt katalog. Standardkataloget vil blive brugt."
 
 #: ../src/xfce4-screenshooter.desktop.in.in.h:2
 #: ../panel-plugin/screenshooter.desktop.in.in.h:2
-msgid "Take screenshots of the entire screen, of the active window or of a region"
-msgstr "Tag skærmbillede af hele skærmen, af det aktive vindue eller af et område"
+msgid ""
+"Take screenshots of the entire screen, of the active window or of a region"
+msgstr ""
+"Tag skærmbillede af hele skærmen, af det aktive vindue eller af et område"
+
+#~ msgid "Screenshot.png"
+#~ msgstr "Skærmbillede.png"
+
+#~ msgid "Screenshot-%d.png"
+#~ msgstr "Skærmbillede-%d.png"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">Efter billedet er taget</"
+#~ "span>"
+
+#~ msgid "Show the save dialog"
+#~ msgstr "Vis gem-dialogen"
+
+#~ msgid ""
+#~ "The save dialog allows you to change the file name and the save location"
+#~ msgstr "Gemmedialogen tillader dig at ændre filnavnet og placeringen"
+
+#~ msgid "Close the application"
+#~ msgstr "Afslut programmet"
+
+#~ msgid ""
+#~ "If unchecked, the current window will be displayed again after the "
+#~ "screenshot has been taken to allow you to take several screenshots in a "
+#~ "row"
+#~ msgstr ""
+#~ "Hvis ej afkrydset, vil det aktuelle vindue blive vist igen, efter "
+#~ "skærmbilledet er blevet taget, således du kan tage flere skærmbilleder "
+#~ "efter hinanden"
+
+#~ msgid "Default save location"
+#~ msgstr "Standard-placering af fil"
+
+#~ msgid "Set the default save location"
+#~ msgstr "Indstil standard-placering af fil"
+
+#~ msgid ""
+#~ "An error occurred during the XML exchange: %s (%d).\n"
+#~ " The screenshot could not be uploaded."
+#~ msgstr ""
+#~ "En fejl opstod under udveksling af  XML: %s (%d).\n"
+#~ " Skærmbilledet kunne ikke overføres."
+
+#~ msgid "Do not display the save dialog"
+#~ msgstr "Vis ikke gem-dialogen"
 
 #~ msgid "Uploading to ZimageZ..."
 #~ msgstr "Overfører til ZimageZ..."
+
 #~ msgid "Upload the screenshot to ZimageZ©, a free Web hosting solution"
 #~ msgstr ""
 #~ "Overfør skærmbilledet  til ZimageZ. en fri online billed-hosting-tjeneste"
@@ -390,18 +469,20 @@ msgstr "Tag skærmbillede af hele skærmen, af det aktive vindue eller af et omr
 #, fuzzy
 #~ msgid "Applicatio to open the screenshot"
 #~ msgstr "Program til åbning af skærmbilledet"
+
 #~ msgid "%i bytes remaining"
 #~ msgstr "%i byte tilbage"
 
 #, fuzzy
 #~ msgid "Display the save dialog"
 #~ msgstr "Vis ikke gem-dialogen"
+
 #~ msgid "Save by default to:"
 #~ msgstr "Gem som standard til:"
+
 #~ msgid ""
 #~ "If checked, the screenshot will be saved by default to the location set "
 #~ "on the right without displaying a save dialog"
 #~ msgstr ""
 #~ "Hvis afkrydset, vil skærmbilledet som standard blive gemt til stedet "
 #~ "indstillet til højre uden visning af gem-dialog"
-
diff --git a/po/de.po b/po/de.po
index ecdaade..f452ca4 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-screenshooter-plugin 1.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-31 14:02+0200\n"
+"POT-Creation-Date: 2009-11-15 00:29+0100\n"
 "PO-Revision-Date: 2009-04-14 23:34+0200\n"
 "Last-Translator: Fabian Nowak <tiymstery at arcor.de>\n"
 "Language-Team: German <xfce-i18n at xfce.org>\n"
@@ -17,25 +17,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../lib/screenshooter-dialogs.c:283
-msgid "Screenshot.png"
-msgstr "Bildschirmfoto.png"
-
-#: ../lib/screenshooter-dialogs.c:300
-#, c-format
-msgid "Screenshot-%d.png"
-msgstr "Bildschirmfoto-%d.png"
-
-#: ../lib/screenshooter-dialogs.c:493
+#: ../lib/screenshooter-dialogs.c:478
 #, c-format
 msgid "%.2fKb of %.2fKb"
 msgstr "%.2fKb von %.2fKb"
 
-#: ../lib/screenshooter-dialogs.c:577
+#: ../lib/screenshooter-dialogs.c:560
 msgid "Transfer"
 msgstr "Übertragen"
 
-#: ../lib/screenshooter-dialogs.c:600
+#: ../lib/screenshooter-dialogs.c:581
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being "
 "transferred to:</span>"
@@ -43,48 +34,50 @@ msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Das Bildschirmfoto wird "
 "übertragen nach:</span>"
 
-#: ../lib/screenshooter-dialogs.c:724 ../lib/screenshooter-dialogs.c:741
+#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
 msgid "Screenshot"
 msgstr "Bildschirmfoto"
 
-#: ../lib/screenshooter-dialogs.c:736
+#: ../lib/screenshooter-dialogs.c:709
 msgid "Take a screenshot"
 msgstr "Bildschirmfoto erstellen"
 
-#: ../lib/screenshooter-dialogs.c:751
+#: ../lib/screenshooter-dialogs.c:724
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ../lib/screenshooter-dialogs.c:793
+#: ../lib/screenshooter-dialogs.c:754
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Region to capture</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Aufnahmebereich</span>"
 
-#: ../lib/screenshooter-dialogs.c:820
+#: ../lib/screenshooter-dialogs.c:774
 msgid "Entire screen"
 msgstr "Ganzer Bildschirm"
 
-#: ../lib/screenshooter-dialogs.c:830 ../src/main.c:58
-#: ../panel-plugin/screenshooter-plugin.c:292
+#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../panel-plugin/screenshooter-plugin.c:308
 msgid "Take a screenshot of the entire screen"
 msgstr "Bildschirmfoto des ganzen Bildschirms erstellen"
 
-#: ../lib/screenshooter-dialogs.c:841
+#: ../lib/screenshooter-dialogs.c:789
 msgid "Active window"
 msgstr "Aktives Fenster"
 
-#: ../lib/screenshooter-dialogs.c:851 ../src/main.c:104
-#: ../panel-plugin/screenshooter-plugin.c:297
+#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr "Bildschirmfoto des aktuellen Fensters erstellen"
 
-#: ../lib/screenshooter-dialogs.c:862
+#: ../lib/screenshooter-dialogs.c:804
 msgid "Select a region"
 msgstr "Bereich auswählen"
 
-#: ../lib/screenshooter-dialogs.c:872 ../src/main.c:78
-#: ../panel-plugin/screenshooter-plugin.c:302
+#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../panel-plugin/screenshooter-plugin.c:318
 msgid ""
 "Select a region to be captured by clicking a point of the screen without "
 "releasing the mouse button, dragging your mouse to the other corner of the "
@@ -94,151 +87,140 @@ msgstr ""
 "Bildschirm klicken, ohne die Maustaste loszulassen, den Mauszeiger dann an "
 "das entgegengesetzte Ende des Bereichs ziehen und die Taste loslassen."
 
-#: ../lib/screenshooter-dialogs.c:884
+#: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
 msgstr "Mauszeiger aufnehmen"
 
-#: ../lib/screenshooter-dialogs.c:892
+#: ../lib/screenshooter-dialogs.c:824
 msgid "Display the mouse pointer on the screenshot"
 msgstr "Den Mauszeiger im Bildschirmfoto mitanzeigen"
 
-#: ../lib/screenshooter-dialogs.c:917
+#: ../lib/screenshooter-dialogs.c:840
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
 msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Verzögerung vor der Aufnahme</"
 "span>"
 
-#: ../lib/screenshooter-dialogs.c:952
+#: ../lib/screenshooter-dialogs.c:862
 msgid "Delay in seconds before the screenshot is taken"
 msgstr "Verzögerung in Sekunden vor Erstellung des Bildschirmfotos"
 
-#: ../lib/screenshooter-dialogs.c:958
+#: ../lib/screenshooter-dialogs.c:865
 msgid "seconds"
 msgstr "Sekunden"
 
-#: ../lib/screenshooter-dialogs.c:984
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
-msgstr ""
-"<span weight=\"bold\" stretch=\"semiexpanded\">Nach der Aufnahme</span>"
-
-#. Display the save dialog checkbox
-#: ../lib/screenshooter-dialogs.c:1007
-msgid "Show the save dialog"
-msgstr "Den Speichern-Dialog zeigen"
-
-#: ../lib/screenshooter-dialogs.c:1013
-msgid ""
-"The save dialog allows you to change the file name and the save location"
-msgstr ""
-"Mit dem Speichern-Dialog kann man den Dateinamen und Speicherort angeben"
-
-#: ../lib/screenshooter-dialogs.c:1027
-msgid "Close the application"
-msgstr "Anwendung schließen"
-
-#: ../lib/screenshooter-dialogs.c:1033
-msgid ""
-"If unchecked, the current window will be displayed again after the "
-"screenshot has been taken to allow you to take several screenshots in a row"
+#: ../lib/screenshooter-dialogs.c:917
+msgid "Action"
 msgstr ""
-"Wenn dies nicht ausgewählt ist, wird das derzeitige Fenster wieder "
-"angezeigt, nachdem das Bildschirmfoto gemacht wurde, damit mehrere "
-"Bildschirmfotos hintereinander aufgenommen werden können."
 
-#: ../lib/screenshooter-dialogs.c:1056
+#: ../lib/screenshooter-dialogs.c:945
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Action</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Aktion</span>"
 
 #. Save option radio button
-#: ../lib/screenshooter-dialogs.c:1081
-msgid "Save in:"
+#: ../lib/screenshooter-dialogs.c:961
+#, fuzzy
+msgid "Save"
 msgstr "Speichern unter:"
 
-#: ../lib/screenshooter-dialogs.c:1089
+#: ../lib/screenshooter-dialogs.c:966
 msgid "Save the screenshot to a PNG file"
 msgstr "Bildschirmfoto als PNG-Datei speichern"
 
-#: ../lib/screenshooter-dialogs.c:1104
-msgid "Default save location"
-msgstr "Voreingestellter Speicherort"
-
-#: ../lib/screenshooter-dialogs.c:1114
-msgid "Set the default save location"
-msgstr "Voreingestellten Speicherort angeben"
-
-#: ../lib/screenshooter-dialogs.c:1127
+#: ../lib/screenshooter-dialogs.c:975
 msgid "Copy to the clipboard"
 msgstr "In die Zwischenablage kopieren"
 
-#: ../lib/screenshooter-dialogs.c:1132
+#: ../lib/screenshooter-dialogs.c:977
 msgid "Copy the screenshot to the clipboard so that it can be pasted later"
 msgstr ""
 "Das Bildschirmfoto in die Zwischenablage kopieren, so dass es später "
 "eingefügt werden kann"
 
-#: ../lib/screenshooter-dialogs.c:1147
+#: ../lib/screenshooter-dialogs.c:994
 msgid "Open with:"
 msgstr "Öffnen mit:"
 
-#: ../lib/screenshooter-dialogs.c:1158
+#: ../lib/screenshooter-dialogs.c:1000
 msgid "Open the screenshot with the chosen application"
 msgstr "Bildschirmfoto mit der angegebenen Anwendung öffnen"
 
-#: ../lib/screenshooter-dialogs.c:1191 ../src/main.c:73
+#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
 msgid "Application to open the screenshot"
 msgstr "Anwendung zum Öffnen des Bildschirmfotos"
 
-#: ../lib/screenshooter-dialogs.c:1204
+#: ../lib/screenshooter-dialogs.c:1028
 msgid "Host on ZimageZ"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1210 ../src/main.c:92
+#: ../lib/screenshooter-dialogs.c:1032 ../src/main.c:80
 msgid "Host the screenshot on ZimageZ, a free online image hosting service"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1255
+#: ../lib/screenshooter-dialogs.c:1046
+#, fuzzy
+msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Preview</span>"
+msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Aktion</span>"
+
+#: ../lib/screenshooter-dialogs.c:1107
 msgid "Save screenshot as..."
 msgstr "Speichere Bildschirmfoto als ..."
 
-#. Start the user XML RPC session
-#: ../lib/screenshooter-zimagez.c:159
-msgid "Initialize the connection..."
+#: ../lib/screenshooter-zimagez.c:134
+#, c-format
+msgid "An error occured when creating the XMLRPC request."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:172 ../lib/screenshooter-zimagez.c:332
-#: ../lib/screenshooter-zimagez.c:361 ../lib/screenshooter-zimagez.c:389
-#: ../lib/screenshooter-zimagez.c:520 ../lib/screenshooter-zimagez.c:543
-#: ../lib/screenshooter-zimagez.c:580
+#: ../lib/screenshooter-zimagez.c:153
 #, c-format
-msgid ""
-"An error occurred during the XML exchange: %s (%d).\n"
-" The screenshot could not be uploaded."
+msgid "An error occured when transfering the data to ZimageZ."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:178
+#, c-format
+msgid "An error occured when parsing the response from ZimageZ."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:228
+#, c-format
+msgid "Taken on %s, at %s"
+msgstr ""
+
+#. Start the user soup session
+#: ../lib/screenshooter-zimagez.c:295
+msgid "Initialize the connection..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:223
+#: ../lib/screenshooter-zimagez.c:341
 msgid ""
 "Please file the following fields with your <a href=\"http://www.zimagez.com"
 "\">ZimageZ</a> \n"
 "user name, passsword and details about the screenshot."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:283
+#: ../lib/screenshooter-zimagez.c:398
 msgid "Check the user information..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:305
+#: ../lib/screenshooter-zimagez.c:405
 #, fuzzy
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You "
 "must fill all the fields.</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Aufnahmebereich</span>"
 
-#: ../lib/screenshooter-zimagez.c:320
+#: ../lib/screenshooter-zimagez.c:419
 msgid "Login on ZimageZ..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:436
+#: ../lib/screenshooter-zimagez.c:459 ../lib/screenshooter-zimagez.c:610
+msgid ""
+"An unexpected reply from ZimageZ was received. The upload of the screenshot "
+"failed."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:498
 #, fuzzy
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The "
@@ -247,94 +229,94 @@ msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Das Bildschirmfoto wird "
 "übertragen nach:</span>"
 
-#: ../lib/screenshooter-zimagez.c:501
+#: ../lib/screenshooter-zimagez.c:556
 #, fuzzy
 msgid "Upload the screenshot..."
 msgstr "Bildschirmfoto erstellen"
 
-#: ../lib/screenshooter-zimagez.c:559
+#: ../lib/screenshooter-zimagez.c:589
 #, c-format
 msgid "An error occurred while uploading the screenshot."
 msgstr ""
 
 #. End the user session
-#: ../lib/screenshooter-zimagez.c:597
+#: ../lib/screenshooter-zimagez.c:622
 msgid "Close the session on ZimageZ..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:650
+#: ../lib/screenshooter-zimagez.c:692
 #, fuzzy
 msgid "Details about the screenshot for ZimageZ"
 msgstr "Verzögerung in Sekunden vor Erstellung des Bildschirmfotos"
 
 #. Create the user label
-#: ../lib/screenshooter-zimagez.c:692
+#: ../lib/screenshooter-zimagez.c:734
 msgid "User:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:703
+#: ../lib/screenshooter-zimagez.c:745
 msgid ""
 "Your Zimagez user name, if you do not have one yet please create one on the "
 "Web page linked above"
 msgstr ""
 
 #. Create the password label
-#: ../lib/screenshooter-zimagez.c:708
+#: ../lib/screenshooter-zimagez.c:751
 msgid "Password:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:718
+#: ../lib/screenshooter-zimagez.c:761
 msgid "The password for the user above"
 msgstr ""
 
 #. Create the title label
-#: ../lib/screenshooter-zimagez.c:723
+#: ../lib/screenshooter-zimagez.c:767
 msgid "Title:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:733
+#: ../lib/screenshooter-zimagez.c:777
 msgid ""
 "The title of the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
 msgstr ""
 
 #. Create the comment label
-#: ../lib/screenshooter-zimagez.c:738
+#: ../lib/screenshooter-zimagez.c:783
 msgid "Comment:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:749
+#: ../lib/screenshooter-zimagez.c:794
 msgid ""
 "A comment on the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:870
+#: ../lib/screenshooter-zimagez.c:917
 #, c-format
 msgid "<a href=\"%s\">Full size image</a>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:872
+#: ../lib/screenshooter-zimagez.c:919
 #, c-format
 msgid "<a href=\"%s\">Large thumbnail</a>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:874
+#: ../lib/screenshooter-zimagez.c:921
 #, c-format
 msgid "<a href=\"%s\">Small thumbnail</a>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:894
+#: ../lib/screenshooter-zimagez.c:937
 #, fuzzy
 msgid "My screenshot on ZimageZ"
 msgstr "Verzögerung in Sekunden vor Erstellung des Bildschirmfotos"
 
-#: ../lib/screenshooter-zimagez.c:920
+#: ../lib/screenshooter-zimagez.c:963
 #, fuzzy
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Links</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Aktion</span>"
 
-#: ../lib/screenshooter-zimagez.c:965
+#: ../lib/screenshooter-zimagez.c:1008
 #, fuzzy
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing "
@@ -344,20 +326,20 @@ msgstr ""
 "Bildschirmfoto erstellt wird</span>"
 
 #. HTML title
-#: ../lib/screenshooter-zimagez.c:981
+#: ../lib/screenshooter-zimagez.c:1024
 msgid "HTML"
 msgstr ""
 
 #. BB title
-#: ../lib/screenshooter-zimagez.c:1002
+#: ../lib/screenshooter-zimagez.c:1045
 msgid "BBCode for forums"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:1122
+#: ../lib/screenshooter-zimagez.c:1174
 msgid "ZimageZ"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:1155
+#: ../lib/screenshooter-zimagez.c:1207
 #, fuzzy
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Status</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Aktion</span>"
@@ -373,36 +355,45 @@ msgstr "Öffnen mit:"
 msgid "Copy _Link Address"
 msgstr ""
 
-#: ../src/main.c:53
+#: ../src/main.c:48
 msgid "Delay in seconds before taking the screenshot"
 msgstr "Verzögerung in Sekunden vor Erstellung des Bildschirmfotos"
 
-#: ../src/main.c:63
-msgid "Do not display the save dialog"
-msgstr "Den Speichern-Dialog nicht anzeigen"
-
-#: ../src/main.c:68
-msgid "Do not display the mouse on the screenshot"
+#: ../src/main.c:58
+#, fuzzy
+msgid "Display the mouse on the screenshot"
 msgstr "Den Mauszeiger iauf dem Bildschirmfoto nicht anzeigen"
 
-#: ../src/main.c:85
+#: ../src/main.c:75
 msgid "Directory where the screenshot will be saved"
 msgstr "Das Verzeichnis, in dem das Bildschirmfoto gespeichert werden soll"
 
-#: ../src/main.c:99
+#: ../src/main.c:85
 msgid "Version information"
 msgstr "Versionsinformation"
 
+#: ../src/main.c:134
+#, c-format
+msgid "Conflicting options: --%s and --%s cannot be used at the same time.\n"
+msgstr ""
+
 #: ../src/main.c:136
 #, c-format
 msgid ""
+"The --%s option is only used when --fullscreen, --window or --region is "
+"given. It will be ignored.\n"
+msgstr ""
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
 "%s: %s\n"
 "Geben Sie »%s --help« ein, um Informationen über die Verwendung zu erhalten.\n"
 
-#: ../src/main.c:235
+#: ../src/main.c:282
 #, c-format
 msgid "%s is not a valid directory, the default directory will be used."
 msgstr ""
@@ -416,6 +407,46 @@ msgstr ""
 "Bildschirmfoto des ganzen Bildschirms, des aktuellen Fensters oder eines "
 "Bereichs erstellen"
 
+#~ msgid "Screenshot.png"
+#~ msgstr "Bildschirmfoto.png"
+
+#~ msgid "Screenshot-%d.png"
+#~ msgstr "Bildschirmfoto-%d.png"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">Nach der Aufnahme</span>"
+
+#~ msgid "Show the save dialog"
+#~ msgstr "Den Speichern-Dialog zeigen"
+
+#~ msgid ""
+#~ "The save dialog allows you to change the file name and the save location"
+#~ msgstr ""
+#~ "Mit dem Speichern-Dialog kann man den Dateinamen und Speicherort angeben"
+
+#~ msgid "Close the application"
+#~ msgstr "Anwendung schließen"
+
+#~ msgid ""
+#~ "If unchecked, the current window will be displayed again after the "
+#~ "screenshot has been taken to allow you to take several screenshots in a "
+#~ "row"
+#~ msgstr ""
+#~ "Wenn dies nicht ausgewählt ist, wird das derzeitige Fenster wieder "
+#~ "angezeigt, nachdem das Bildschirmfoto gemacht wurde, damit mehrere "
+#~ "Bildschirmfotos hintereinander aufgenommen werden können."
+
+#~ msgid "Default save location"
+#~ msgstr "Voreingestellter Speicherort"
+
+#~ msgid "Set the default save location"
+#~ msgstr "Voreingestellten Speicherort angeben"
+
+#~ msgid "Do not display the save dialog"
+#~ msgstr "Den Speichern-Dialog nicht anzeigen"
+
 #, fuzzy
 #~ msgid "Tak a screenshot of the entire screen"
 #~ msgstr "Bildschirmfoto des ganzen Bildschirms erstellen"
diff --git a/po/el.po b/po/el.po
index 53d12c4..2690336 100644
--- a/po/el.po
+++ b/po/el.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-screenshooter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-31 14:02+0200\n"
+"POT-Creation-Date: 2009-11-15 00:29+0100\n"
 "PO-Revision-Date: 2009-06-19 17:42-0800\n"
 "Last-Translator: Evaggelos Balaskas <ebalaskas at ebalaskas.gr>\n"
 "Language-Team: Greek <nls at tux.hellug.gr>\n"
@@ -19,25 +19,16 @@ msgstr ""
 "X-Generator: Lokalize 0.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../lib/screenshooter-dialogs.c:283
-msgid "Screenshot.png"
-msgstr "Στιγμιότυπο.png"
-
-#: ../lib/screenshooter-dialogs.c:300
-#, c-format
-msgid "Screenshot-%d.png"
-msgstr "Στιγμιότυπο-%d.png"
-
-#: ../lib/screenshooter-dialogs.c:493
+#: ../lib/screenshooter-dialogs.c:478
 #, c-format
 msgid "%.2fKb of %.2fKb"
 msgstr "%.2fKb από %.2fKb"
 
-#: ../lib/screenshooter-dialogs.c:577
+#: ../lib/screenshooter-dialogs.c:560
 msgid "Transfer"
 msgstr "Μεταφορά"
 
-#: ../lib/screenshooter-dialogs.c:600
+#: ../lib/screenshooter-dialogs.c:581
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being "
 "transferred to:</span>"
@@ -45,50 +36,52 @@ msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Το στιγμιότυπο έχει "
 "μεταφερθεί στο:</span>"
 
-#: ../lib/screenshooter-dialogs.c:724 ../lib/screenshooter-dialogs.c:741
+#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
 msgid "Screenshot"
 msgstr "Στιγμιότυπο οθόνης"
 
-#: ../lib/screenshooter-dialogs.c:736
+#: ../lib/screenshooter-dialogs.c:709
 msgid "Take a screenshot"
 msgstr "Λήψη στιγμιότυπου οθόνης"
 
-#: ../lib/screenshooter-dialogs.c:751
+#: ../lib/screenshooter-dialogs.c:724
 msgid "Preferences"
 msgstr "Προτιμήσεις"
 
-#: ../lib/screenshooter-dialogs.c:793
+#: ../lib/screenshooter-dialogs.c:754
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Region to capture</span>"
 msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Προεπιλεγμένη περιοχή "
 "αρπαγής</span>"
 
-#: ../lib/screenshooter-dialogs.c:820
+#: ../lib/screenshooter-dialogs.c:774
 msgid "Entire screen"
 msgstr "Ολόκληρη οθόνη"
 
-#: ../lib/screenshooter-dialogs.c:830 ../src/main.c:58
-#: ../panel-plugin/screenshooter-plugin.c:292
+#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../panel-plugin/screenshooter-plugin.c:308
 msgid "Take a screenshot of the entire screen"
 msgstr "Λήψη ενός στιγμιότυπου ολόκληρης οθόνης"
 
-#: ../lib/screenshooter-dialogs.c:841
+#: ../lib/screenshooter-dialogs.c:789
 msgid "Active window"
 msgstr "Ενεργό παράθυρο"
 
-#: ../lib/screenshooter-dialogs.c:851 ../src/main.c:104
-#: ../panel-plugin/screenshooter-plugin.c:297
+#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr "Λήψη στιγμιοτύπου οθόνης του ενεργού παραθύρου"
 
-#: ../lib/screenshooter-dialogs.c:862
+#: ../lib/screenshooter-dialogs.c:804
 msgid "Select a region"
 msgstr "Επιλογή περιοχής"
 
-#: ../lib/screenshooter-dialogs.c:872 ../src/main.c:78
-#: ../panel-plugin/screenshooter-plugin.c:302
+#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../panel-plugin/screenshooter-plugin.c:318
 msgid ""
 "Select a region to be captured by clicking a point of the screen without "
 "releasing the mouse button, dragging your mouse to the other corner of the "
@@ -98,131 +91,113 @@ msgstr ""
 "την απελευθέρωση του κουμπιού του ποντικιού, σύροντας το ποντίκι στην άλλη "
 "γωνία της περιοχής, και απελευθέρωση του κουμπιού του ποντικιού."
 
-#: ../lib/screenshooter-dialogs.c:884
+#: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
 msgstr "Αρπαγή του κέρσορα του ποντικιού"
 
-#: ../lib/screenshooter-dialogs.c:892
+#: ../lib/screenshooter-dialogs.c:824
 msgid "Display the mouse pointer on the screenshot"
 msgstr "Εμφάνιση του κέρσορα του ποντικιού στο στιγμιότυπο"
 
-#: ../lib/screenshooter-dialogs.c:917
+#: ../lib/screenshooter-dialogs.c:840
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
 msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Καθυστέρηση πριν την αρπαγή</"
 "span>"
 
-#: ../lib/screenshooter-dialogs.c:952
+#: ../lib/screenshooter-dialogs.c:862
 msgid "Delay in seconds before the screenshot is taken"
 msgstr "Καθυστέρηση σε δευτερόλεπτα πριν την ληψη του στιγμιοτύπου οθόνης"
 
-#: ../lib/screenshooter-dialogs.c:958
+#: ../lib/screenshooter-dialogs.c:865
 msgid "seconds"
 msgstr "δευτερόλεπτα"
 
-#: ../lib/screenshooter-dialogs.c:984
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Μετά την αρπαγή</span>"
-
-#. Display the save dialog checkbox
-#: ../lib/screenshooter-dialogs.c:1007
-msgid "Show the save dialog"
-msgstr "Εμφάνιση του διαλόγου αποθήκευσης"
-
-#: ../lib/screenshooter-dialogs.c:1013
-msgid ""
-"The save dialog allows you to change the file name and the save location"
-msgstr ""
-"Το παράθυρο διαλόγου κατά την αποθήκευση σας επιτρέπει να αλλάξετε το όνομα "
-"του αρχείου και την τοποθεσία αποθήκευσης"
-
-#: ../lib/screenshooter-dialogs.c:1027
-msgid "Close the application"
-msgstr "Τερματισμός εφαρμογής"
-
-#: ../lib/screenshooter-dialogs.c:1033
-msgid ""
-"If unchecked, the current window will be displayed again after the "
-"screenshot has been taken to allow you to take several screenshots in a row"
+#: ../lib/screenshooter-dialogs.c:917
+msgid "Action"
 msgstr ""
-"Εάν επιλεχθεί, το τρέχον παράθυρο θα εμφανιστεί ξανά με την το λήψη του "
-"στιγμιότυπου ώστε να σας επιτραπεί  η λήψη πολλαπλών στιγμιοτύπων στην σειρά."
 
-#: ../lib/screenshooter-dialogs.c:1056
+#: ../lib/screenshooter-dialogs.c:945
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Action</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Ενέργεια</span>"
 
 #. Save option radio button
-#: ../lib/screenshooter-dialogs.c:1081
-msgid "Save in:"
+#: ../lib/screenshooter-dialogs.c:961
+#, fuzzy
+msgid "Save"
 msgstr "Αποθήκευση σε:"
 
-#: ../lib/screenshooter-dialogs.c:1089
+#: ../lib/screenshooter-dialogs.c:966
 msgid "Save the screenshot to a PNG file"
 msgstr "Αποθήκευση στιγμιοτύπου σε αρχείο PNG"
 
-#: ../lib/screenshooter-dialogs.c:1104
-msgid "Default save location"
-msgstr "Προεπιλεγμένη τοποθεσία αποθήκευσης"
-
-#: ../lib/screenshooter-dialogs.c:1114
-msgid "Set the default save location"
-msgstr "Ορισμός της προεπιλεγμένης τοποθεσίας αποθήκευσης"
-
-#: ../lib/screenshooter-dialogs.c:1127
+#: ../lib/screenshooter-dialogs.c:975
 msgid "Copy to the clipboard"
 msgstr "Αντιγραφή στο πρόχειρο"
 
-#: ../lib/screenshooter-dialogs.c:1132
+#: ../lib/screenshooter-dialogs.c:977
 msgid "Copy the screenshot to the clipboard so that it can be pasted later"
 msgstr ""
 "Αντιγραφή του στιγμιοτύπου οθόνης στο πρόχειρο ώστε να μπορεί να επικολληθεί "
 "αργότερα"
 
-#: ../lib/screenshooter-dialogs.c:1147
+#: ../lib/screenshooter-dialogs.c:994
 msgid "Open with:"
 msgstr "Άνοιγμα με:"
 
-#: ../lib/screenshooter-dialogs.c:1158
+#: ../lib/screenshooter-dialogs.c:1000
 msgid "Open the screenshot with the chosen application"
 msgstr "Άνοιγμα του στιγμιοτύπου οθόνης με την επιλεγμένη εφαρμογή"
 
-#: ../lib/screenshooter-dialogs.c:1191 ../src/main.c:73
+#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
 msgid "Application to open the screenshot"
 msgstr "Εφαρμογή να ανοίξει το στιγμιοτύπο οθόνης"
 
-#: ../lib/screenshooter-dialogs.c:1204
+#: ../lib/screenshooter-dialogs.c:1028
 msgid "Host on ZimageZ"
 msgstr "Φιλοξενία στο ZimageZ"
 
-#: ../lib/screenshooter-dialogs.c:1210 ../src/main.c:92
+#: ../lib/screenshooter-dialogs.c:1032 ../src/main.c:80
 msgid "Host the screenshot on ZimageZ, a free online image hosting service"
 msgstr ""
 "Φιλοξενία του στιγμιότυπου στο ZimageZ, μία δωρεάν υπηρεσία φιλοξενία εικόνων"
 
-#: ../lib/screenshooter-dialogs.c:1255
+#: ../lib/screenshooter-dialogs.c:1046
+#, fuzzy
+msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Preview</span>"
+msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Σύνδεσμοι</span>"
+
+#: ../lib/screenshooter-dialogs.c:1107
 msgid "Save screenshot as..."
 msgstr "Αποθήκευση στιγμιοτύπου ως ... "
 
-#. Start the user XML RPC session
-#: ../lib/screenshooter-zimagez.c:159
-msgid "Initialize the connection..."
-msgstr "Αρχικοποίηση της σύνδεσης..."
+#: ../lib/screenshooter-zimagez.c:134
+#, fuzzy, c-format
+msgid "An error occured when creating the XMLRPC request."
+msgstr "Παρουσιάστηκε ένα σφάλμα κατά το ανέβασμα του στιγμιότυπου."
+
+#: ../lib/screenshooter-zimagez.c:153
+#, fuzzy, c-format
+msgid "An error occured when transfering the data to ZimageZ."
+msgstr "Παρουσιάστηκε ένα σφάλμα κατά το ανέβασμα του στιγμιότυπου."
 
-#: ../lib/screenshooter-zimagez.c:172 ../lib/screenshooter-zimagez.c:332
-#: ../lib/screenshooter-zimagez.c:361 ../lib/screenshooter-zimagez.c:389
-#: ../lib/screenshooter-zimagez.c:520 ../lib/screenshooter-zimagez.c:543
-#: ../lib/screenshooter-zimagez.c:580
+#: ../lib/screenshooter-zimagez.c:178
+#, fuzzy, c-format
+msgid "An error occured when parsing the response from ZimageZ."
+msgstr "Παρουσιάστηκε ένα σφάλμα κατά το ανέβασμα του στιγμιότυπου."
+
+#: ../lib/screenshooter-zimagez.c:228
 #, c-format
-msgid ""
-"An error occurred during the XML exchange: %s (%d).\n"
-" The screenshot could not be uploaded."
+msgid "Taken on %s, at %s"
 msgstr ""
-"Παρουσιάστηκε ένα σφάλμα κατά την διάρκεια της ανταλλαγής του XML: %s (%d).\n"
-"Το στιγμιότυπο δεν μπορεί να ανέβει."
 
-#: ../lib/screenshooter-zimagez.c:223
+#. Start the user soup session
+#: ../lib/screenshooter-zimagez.c:295
+msgid "Initialize the connection..."
+msgstr "Αρχικοποίηση της σύνδεσης..."
+
+#: ../lib/screenshooter-zimagez.c:341
 msgid ""
 "Please file the following fields with your <a href=\"http://www.zimagez.com"
 "\">ZimageZ</a> \n"
@@ -232,11 +207,11 @@ msgstr ""
 "\"http://www.zimagez.com\">ZimageZ</a> \n"
 "όνομα χρήστη, συνθηματικό και τις λεπτομέρειες σχετικά με το στιγμιότυπο."
 
-#: ../lib/screenshooter-zimagez.c:283
+#: ../lib/screenshooter-zimagez.c:398
 msgid "Check the user information..."
 msgstr "Ελέγξτε τις πληροφορίες του χρήστη."
 
-#: ../lib/screenshooter-zimagez.c:305
+#: ../lib/screenshooter-zimagez.c:405
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You "
 "must fill all the fields.</span>"
@@ -244,11 +219,17 @@ msgstr ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">Πρέπει "
 "να συμπληρώσετε όλα τα πεδία.</span>"
 
-#: ../lib/screenshooter-zimagez.c:320
+#: ../lib/screenshooter-zimagez.c:419
 msgid "Login on ZimageZ..."
 msgstr "Σύνδεση στο ZimageZ..."
 
-#: ../lib/screenshooter-zimagez.c:436
+#: ../lib/screenshooter-zimagez.c:459 ../lib/screenshooter-zimagez.c:610
+msgid ""
+"An unexpected reply from ZimageZ was received. The upload of the screenshot "
+"failed."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:498
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The "
 "user and the password you entered do not match. Please retry.</span>"
@@ -257,30 +238,30 @@ msgstr ""
 "όνομα χρήστη και το συνθηματικό που εισάγεται δεν ταιριάζουν. Παρακαλώ "
 "δοκιμάστε πάλι.</span>"
 
-#: ../lib/screenshooter-zimagez.c:501
+#: ../lib/screenshooter-zimagez.c:556
 msgid "Upload the screenshot..."
 msgstr "Ανέβασμα του στιγμιότυπου..."
 
-#: ../lib/screenshooter-zimagez.c:559
+#: ../lib/screenshooter-zimagez.c:589
 #, c-format
 msgid "An error occurred while uploading the screenshot."
 msgstr "Παρουσιάστηκε ένα σφάλμα κατά το ανέβασμα του στιγμιότυπου."
 
 #. End the user session
-#: ../lib/screenshooter-zimagez.c:597
+#: ../lib/screenshooter-zimagez.c:622
 msgid "Close the session on ZimageZ..."
 msgstr "Κλείσιμο της συνεδρίας στο ZimageZ..."
 
-#: ../lib/screenshooter-zimagez.c:650
+#: ../lib/screenshooter-zimagez.c:692
 msgid "Details about the screenshot for ZimageZ"
 msgstr "Λεπτομέρειες σχετικά με το στιγμιότυπο για το ZimageZ"
 
 #. Create the user label
-#: ../lib/screenshooter-zimagez.c:692
+#: ../lib/screenshooter-zimagez.c:734
 msgid "User:"
 msgstr "Χρήστης:"
 
-#: ../lib/screenshooter-zimagez.c:703
+#: ../lib/screenshooter-zimagez.c:745
 msgid ""
 "Your Zimagez user name, if you do not have one yet please create one on the "
 "Web page linked above"
@@ -289,20 +270,20 @@ msgstr ""
 "δημιουργείστε στην παραπάνω ιστοσελίδα "
 
 #. Create the password label
-#: ../lib/screenshooter-zimagez.c:708
+#: ../lib/screenshooter-zimagez.c:751
 msgid "Password:"
 msgstr "Συνθηματικό:"
 
-#: ../lib/screenshooter-zimagez.c:718
+#: ../lib/screenshooter-zimagez.c:761
 msgid "The password for the user above"
 msgstr "Το συνθηματικό για τον παραπάνω χρήστη"
 
 #. Create the title label
-#: ../lib/screenshooter-zimagez.c:723
+#: ../lib/screenshooter-zimagez.c:767
 msgid "Title:"
 msgstr "Τίτλος:"
 
-#: ../lib/screenshooter-zimagez.c:733
+#: ../lib/screenshooter-zimagez.c:777
 msgid ""
 "The title of the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
@@ -311,11 +292,11 @@ msgstr ""
 "στιγμιότυπο στο ZimageZ"
 
 #. Create the comment label
-#: ../lib/screenshooter-zimagez.c:738
+#: ../lib/screenshooter-zimagez.c:783
 msgid "Comment:"
 msgstr "Σχόλιο:"
 
-#: ../lib/screenshooter-zimagez.c:749
+#: ../lib/screenshooter-zimagez.c:794
 msgid ""
 "A comment on the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
@@ -323,30 +304,30 @@ msgstr ""
 "Ένα σχόλιο στο στιγμιότυπο, θα χρησιμοποιηθεί όταν θα εμφανίζεται το "
 "στιγμιότυπο στο ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:870
+#: ../lib/screenshooter-zimagez.c:917
 #, c-format
 msgid "<a href=\"%s\">Full size image</a>"
 msgstr "<a href=\"%s\">Πλήρες μέγεθος εικόνα</a>"
 
-#: ../lib/screenshooter-zimagez.c:872
+#: ../lib/screenshooter-zimagez.c:919
 #, c-format
 msgid "<a href=\"%s\">Large thumbnail</a>"
 msgstr "<a href=\"%s\">Μεγάλη μικρογραφία</a>"
 
-#: ../lib/screenshooter-zimagez.c:874
+#: ../lib/screenshooter-zimagez.c:921
 #, c-format
 msgid "<a href=\"%s\">Small thumbnail</a>"
 msgstr "<a href=\"%s\">Μικρή μικρογραφία</a>"
 
-#: ../lib/screenshooter-zimagez.c:894
+#: ../lib/screenshooter-zimagez.c:937
 msgid "My screenshot on ZimageZ"
 msgstr "Το στιγμιότυπό μου στο ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:920
+#: ../lib/screenshooter-zimagez.c:963
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Links</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Σύνδεσμοι</span>"
 
-#: ../lib/screenshooter-zimagez.c:965
+#: ../lib/screenshooter-zimagez.c:1008
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing "
 "to the full size image</span>"
@@ -355,20 +336,20 @@ msgstr ""
 "που δείχνει σε μία ολόκληρη μεγάλου μεγέθους εικόνα</span>"
 
 #. HTML title
-#: ../lib/screenshooter-zimagez.c:981
+#: ../lib/screenshooter-zimagez.c:1024
 msgid "HTML"
 msgstr "HTML"
 
 #. BB title
-#: ../lib/screenshooter-zimagez.c:1002
+#: ../lib/screenshooter-zimagez.c:1045
 msgid "BBCode for forums"
 msgstr "BBCode για forums"
 
-#: ../lib/screenshooter-zimagez.c:1122
+#: ../lib/screenshooter-zimagez.c:1174
 msgid "ZimageZ"
 msgstr "ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:1155
+#: ../lib/screenshooter-zimagez.c:1207
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Status</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Κατάσταση</span>"
 
@@ -382,29 +363,38 @@ msgstr "Άν_οιγμα συνδέσμου"
 msgid "Copy _Link Address"
 msgstr "Αντιγραφή διεύθυνσης σ_υνδέσμου"
 
-#: ../src/main.c:53
+#: ../src/main.c:48
 msgid "Delay in seconds before taking the screenshot"
 msgstr "Καθυστέρηση σε δευτερόλεπτα πριν την ληψη του στιγμιοτύπου οθόνης"
 
-#: ../src/main.c:63
-msgid "Do not display the save dialog"
-msgstr "Μη εμφάνιση του διαλόγου αποθήκευσης"
-
-#: ../src/main.c:68
-msgid "Do not display the mouse on the screenshot"
+#: ../src/main.c:58
+#, fuzzy
+msgid "Display the mouse on the screenshot"
 msgstr "Να μην εμφανίζεται το ποντίκι στο στιγμιότυπο"
 
-#: ../src/main.c:85
+#: ../src/main.c:75
 msgid "Directory where the screenshot will be saved"
 msgstr "Κατάλογος στον οποίο θα αποθηκευτεί το στιγμιότυπο οθόνης"
 
-#: ../src/main.c:99
+#: ../src/main.c:85
 msgid "Version information"
 msgstr "Πληροφορίες έκδοσης"
 
+#: ../src/main.c:134
+#, c-format
+msgid "Conflicting options: --%s and --%s cannot be used at the same time.\n"
+msgstr ""
+
 #: ../src/main.c:136
 #, c-format
 msgid ""
+"The --%s option is only used when --fullscreen, --window or --region is "
+"given. It will be ignored.\n"
+msgstr ""
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
@@ -412,7 +402,7 @@ msgstr ""
 "Δοκίμασε %s --help για να δεις μία πλήρη λίστα με τις διαθέσιμες επιλογές "
 "της γραμμής εντολών.\n"
 
-#: ../src/main.c:235
+#: ../src/main.c:282
 #, c-format
 msgid "%s is not a valid directory, the default directory will be used."
 msgstr ""
@@ -424,6 +414,55 @@ msgid ""
 "Take screenshots of the entire screen, of the active window or of a region"
 msgstr "Λήψη στιγμιότυπου ολόκληρης οθόνης, ενεργού παραθύρου ή μίας περιοχής"
 
+#~ msgid "Screenshot.png"
+#~ msgstr "Στιγμιότυπο.png"
+
+#~ msgid "Screenshot-%d.png"
+#~ msgstr "Στιγμιότυπο-%d.png"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">Μετά την αρπαγή</span>"
+
+#~ msgid "Show the save dialog"
+#~ msgstr "Εμφάνιση του διαλόγου αποθήκευσης"
+
+#~ msgid ""
+#~ "The save dialog allows you to change the file name and the save location"
+#~ msgstr ""
+#~ "Το παράθυρο διαλόγου κατά την αποθήκευση σας επιτρέπει να αλλάξετε το "
+#~ "όνομα του αρχείου και την τοποθεσία αποθήκευσης"
+
+#~ msgid "Close the application"
+#~ msgstr "Τερματισμός εφαρμογής"
+
+#~ msgid ""
+#~ "If unchecked, the current window will be displayed again after the "
+#~ "screenshot has been taken to allow you to take several screenshots in a "
+#~ "row"
+#~ msgstr ""
+#~ "Εάν επιλεχθεί, το τρέχον παράθυρο θα εμφανιστεί ξανά με την το λήψη του "
+#~ "στιγμιότυπου ώστε να σας επιτραπεί  η λήψη πολλαπλών στιγμιοτύπων στην "
+#~ "σειρά."
+
+#~ msgid "Default save location"
+#~ msgstr "Προεπιλεγμένη τοποθεσία αποθήκευσης"
+
+#~ msgid "Set the default save location"
+#~ msgstr "Ορισμός της προεπιλεγμένης τοποθεσίας αποθήκευσης"
+
+#~ msgid ""
+#~ "An error occurred during the XML exchange: %s (%d).\n"
+#~ " The screenshot could not be uploaded."
+#~ msgstr ""
+#~ "Παρουσιάστηκε ένα σφάλμα κατά την διάρκεια της ανταλλαγής του XML: %s (%"
+#~ "d).\n"
+#~ "Το στιγμιότυπο δεν μπορεί να ανέβει."
+
+#~ msgid "Do not display the save dialog"
+#~ msgstr "Μη εμφάνιση του διαλόγου αποθήκευσης"
+
 #, fuzzy
 #~ msgid "Tak a screenshot of the entire screen"
 #~ msgstr "Λήψη στιγμιοτύπου οθόνης ολόκληρης της οθόνης"
diff --git a/po/en_GB.po b/po/en_GB.po
index 9d4e913..b505af9 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-screenshooter-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-31 14:02+0200\n"
+"POT-Creation-Date: 2009-11-15 00:29+0100\n"
 "PO-Revision-Date: 2009-08-18 13:14+1000\n"
 "Last-Translator: Jeff Bailes <thepizzaking at gmail.com>\n"
 "Language-Team: English/GB <en at li.org>\n"
@@ -19,25 +19,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/screenshooter-dialogs.c:283
-msgid "Screenshot.png"
-msgstr "Screenshot.png"
-
-#: ../lib/screenshooter-dialogs.c:300
-#, c-format
-msgid "Screenshot-%d.png"
-msgstr "Screenshot-%d.png"
-
-#: ../lib/screenshooter-dialogs.c:493
+#: ../lib/screenshooter-dialogs.c:478
 #, c-format
 msgid "%.2fKb of %.2fKb"
 msgstr "%.2fKb of %.2fKb"
 
-#: ../lib/screenshooter-dialogs.c:577
+#: ../lib/screenshooter-dialogs.c:560
 msgid "Transfer"
 msgstr "Transfer"
 
-#: ../lib/screenshooter-dialogs.c:600
+#: ../lib/screenshooter-dialogs.c:581
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being "
 "transferred to:</span>"
@@ -45,49 +36,51 @@ msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being "
 "transferred to:</span>"
 
-#: ../lib/screenshooter-dialogs.c:724 ../lib/screenshooter-dialogs.c:741
+#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
 msgid "Screenshot"
 msgstr "Screenshot"
 
-#: ../lib/screenshooter-dialogs.c:736
+#: ../lib/screenshooter-dialogs.c:709
 msgid "Take a screenshot"
 msgstr "Take a screenshot"
 
-#: ../lib/screenshooter-dialogs.c:751
+#: ../lib/screenshooter-dialogs.c:724
 msgid "Preferences"
 msgstr "Preferences"
 
-#: ../lib/screenshooter-dialogs.c:793
+#: ../lib/screenshooter-dialogs.c:754
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Region to capture</span>"
 msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Region to capture</span>"
 
-#: ../lib/screenshooter-dialogs.c:820
+#: ../lib/screenshooter-dialogs.c:774
 msgid "Entire screen"
 msgstr "Entire screen"
 
-#: ../lib/screenshooter-dialogs.c:830 ../src/main.c:58
-#: ../panel-plugin/screenshooter-plugin.c:292
+#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../panel-plugin/screenshooter-plugin.c:308
 msgid "Take a screenshot of the entire screen"
 msgstr "Take a screenshot of the entire screen"
 
-#: ../lib/screenshooter-dialogs.c:841
+#: ../lib/screenshooter-dialogs.c:789
 msgid "Active window"
 msgstr "Active window"
 
-#: ../lib/screenshooter-dialogs.c:851 ../src/main.c:104
-#: ../panel-plugin/screenshooter-plugin.c:297
+#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr "Take a screenshot of the active window"
 
-#: ../lib/screenshooter-dialogs.c:862
+#: ../lib/screenshooter-dialogs.c:804
 msgid "Select a region"
 msgstr "Select a region"
 
-#: ../lib/screenshooter-dialogs.c:872 ../src/main.c:78
-#: ../panel-plugin/screenshooter-plugin.c:302
+#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../panel-plugin/screenshooter-plugin.c:318
 msgid ""
 "Select a region to be captured by clicking a point of the screen without "
 "releasing the mouse button, dragging your mouse to the other corner of the "
@@ -97,126 +90,109 @@ msgstr ""
 "releasing the mouse button, dragging your mouse to the other corner of the "
 "region, and releasing the mouse button."
 
-#: ../lib/screenshooter-dialogs.c:884
+#: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
 msgstr "Capture the mouse pointer"
 
-#: ../lib/screenshooter-dialogs.c:892
+#: ../lib/screenshooter-dialogs.c:824
 msgid "Display the mouse pointer on the screenshot"
 msgstr "Display the mouse pointer on the screenshot"
 
-#: ../lib/screenshooter-dialogs.c:917
+#: ../lib/screenshooter-dialogs.c:840
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
 msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
 
-#: ../lib/screenshooter-dialogs.c:952
+#: ../lib/screenshooter-dialogs.c:862
 msgid "Delay in seconds before the screenshot is taken"
 msgstr "Delay in seconds before the screenshot is taken"
 
-#: ../lib/screenshooter-dialogs.c:958
+#: ../lib/screenshooter-dialogs.c:865
 msgid "seconds"
 msgstr "seconds"
 
-#: ../lib/screenshooter-dialogs.c:984
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
-
-#. Display the save dialog checkbox
-#: ../lib/screenshooter-dialogs.c:1007
-msgid "Show the save dialog"
-msgstr "Show the save dialogue"
-
-#: ../lib/screenshooter-dialogs.c:1013
-msgid ""
-"The save dialog allows you to change the file name and the save location"
-msgstr ""
-"The save dialogue allows you to change the file name and the save location"
-
-#: ../lib/screenshooter-dialogs.c:1027
-msgid "Close the application"
-msgstr "Close the application"
-
-#: ../lib/screenshooter-dialogs.c:1033
-msgid ""
-"If unchecked, the current window will be displayed again after the "
-"screenshot has been taken to allow you to take several screenshots in a row"
+#: ../lib/screenshooter-dialogs.c:917
+msgid "Action"
 msgstr ""
-"If unticked, the current window will be displayed again after the "
-"screenshot has been taken to allow you to take several screenshots in a row"
 
-#: ../lib/screenshooter-dialogs.c:1056
+#: ../lib/screenshooter-dialogs.c:945
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Action</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Action</span>"
 
 #. Save option radio button
-#: ../lib/screenshooter-dialogs.c:1081
-msgid "Save in:"
+#: ../lib/screenshooter-dialogs.c:961
+#, fuzzy
+msgid "Save"
 msgstr "Save in:"
 
-#: ../lib/screenshooter-dialogs.c:1089
+#: ../lib/screenshooter-dialogs.c:966
 msgid "Save the screenshot to a PNG file"
 msgstr "Save the screenshot to a PNG file"
 
-#: ../lib/screenshooter-dialogs.c:1104
-msgid "Default save location"
-msgstr "Default save location"
-
-#: ../lib/screenshooter-dialogs.c:1114
-msgid "Set the default save location"
-msgstr "Set the default save location"
-
-#: ../lib/screenshooter-dialogs.c:1127
+#: ../lib/screenshooter-dialogs.c:975
 msgid "Copy to the clipboard"
 msgstr "Copy to the clipboard"
 
-#: ../lib/screenshooter-dialogs.c:1132
+#: ../lib/screenshooter-dialogs.c:977
 msgid "Copy the screenshot to the clipboard so that it can be pasted later"
 msgstr "Copy the screenshot to the clipboard so that it can be pasted later"
 
-#: ../lib/screenshooter-dialogs.c:1147
+#: ../lib/screenshooter-dialogs.c:994
 msgid "Open with:"
 msgstr "Open with:"
 
-#: ../lib/screenshooter-dialogs.c:1158
+#: ../lib/screenshooter-dialogs.c:1000
 msgid "Open the screenshot with the chosen application"
 msgstr "Open the screenshot with the chosen application"
 
-#: ../lib/screenshooter-dialogs.c:1191 ../src/main.c:73
+#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
 msgid "Application to open the screenshot"
 msgstr "Application to open the screenshot"
 
-#: ../lib/screenshooter-dialogs.c:1204
+#: ../lib/screenshooter-dialogs.c:1028
 msgid "Host on ZimageZ"
 msgstr "Host on ZimageZ"
 
-#: ../lib/screenshooter-dialogs.c:1210 ../src/main.c:92
+#: ../lib/screenshooter-dialogs.c:1032 ../src/main.c:80
 msgid "Host the screenshot on ZimageZ, a free online image hosting service"
 msgstr "Host the screenshot on ZimageZ, a free online image hosting service"
 
-#: ../lib/screenshooter-dialogs.c:1255
+#: ../lib/screenshooter-dialogs.c:1046
+#, fuzzy
+msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Preview</span>"
+msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Links</span>"
+
+#: ../lib/screenshooter-dialogs.c:1107
 msgid "Save screenshot as..."
 msgstr "Save screenshot as..."
 
-#. Start the user XML RPC session
-#: ../lib/screenshooter-zimagez.c:159
-msgid "Initialize the connection..."
-msgstr "Initialise the connection..."
+#: ../lib/screenshooter-zimagez.c:134
+#, fuzzy, c-format
+msgid "An error occured when creating the XMLRPC request."
+msgstr "An error occurred while uploading the screenshot."
+
+#: ../lib/screenshooter-zimagez.c:153
+#, fuzzy, c-format
+msgid "An error occured when transfering the data to ZimageZ."
+msgstr "An error occurred while uploading the screenshot."
 
-#: ../lib/screenshooter-zimagez.c:172 ../lib/screenshooter-zimagez.c:332
-#: ../lib/screenshooter-zimagez.c:361 ../lib/screenshooter-zimagez.c:389
-#: ../lib/screenshooter-zimagez.c:520 ../lib/screenshooter-zimagez.c:543
-#: ../lib/screenshooter-zimagez.c:580
+#: ../lib/screenshooter-zimagez.c:178
+#, fuzzy, c-format
+msgid "An error occured when parsing the response from ZimageZ."
+msgstr "An error occurred while uploading the screenshot."
+
+#: ../lib/screenshooter-zimagez.c:228
 #, c-format
-msgid ""
-"An error occurred during the XML exchange: %s (%d).\n"
-" The screenshot could not be uploaded."
+msgid "Taken on %s, at %s"
 msgstr ""
-"An error occurred during the XML exchange: %s (%d).\n"
-" The screenshot could not be uploaded."
 
-#: ../lib/screenshooter-zimagez.c:223
+#. Start the user soup session
+#: ../lib/screenshooter-zimagez.c:295
+msgid "Initialize the connection..."
+msgstr "Initialise the connection..."
+
+#: ../lib/screenshooter-zimagez.c:341
 msgid ""
 "Please file the following fields with your <a href=\"http://www.zimagez.com"
 "\">ZimageZ</a> \n"
@@ -226,11 +202,11 @@ msgstr ""
 "\">ZimageZ</a> \n"
 "user name, passsword and details about the screenshot."
 
-#: ../lib/screenshooter-zimagez.c:283
+#: ../lib/screenshooter-zimagez.c:398
 msgid "Check the user information..."
 msgstr "Check the user information..."
 
-#: ../lib/screenshooter-zimagez.c:305
+#: ../lib/screenshooter-zimagez.c:405
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You "
 "must fill all the fields.</span>"
@@ -238,11 +214,17 @@ msgstr ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You "
 "must fill all the fields.</span>"
 
-#: ../lib/screenshooter-zimagez.c:320
+#: ../lib/screenshooter-zimagez.c:419
 msgid "Login on ZimageZ..."
 msgstr "Login on ZimageZ..."
 
-#: ../lib/screenshooter-zimagez.c:436
+#: ../lib/screenshooter-zimagez.c:459 ../lib/screenshooter-zimagez.c:610
+msgid ""
+"An unexpected reply from ZimageZ was received. The upload of the screenshot "
+"failed."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:498
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The "
 "user and the password you entered do not match. Please retry.</span>"
@@ -250,30 +232,30 @@ msgstr ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The "
 "user and the password you entered do not match. Please retry.</span>"
 
-#: ../lib/screenshooter-zimagez.c:501
+#: ../lib/screenshooter-zimagez.c:556
 msgid "Upload the screenshot..."
 msgstr "Upload the screenshot..."
 
-#: ../lib/screenshooter-zimagez.c:559
+#: ../lib/screenshooter-zimagez.c:589
 #, c-format
 msgid "An error occurred while uploading the screenshot."
 msgstr "An error occurred while uploading the screenshot."
 
 #. End the user session
-#: ../lib/screenshooter-zimagez.c:597
+#: ../lib/screenshooter-zimagez.c:622
 msgid "Close the session on ZimageZ..."
 msgstr "Close the session on ZimageZ..."
 
-#: ../lib/screenshooter-zimagez.c:650
+#: ../lib/screenshooter-zimagez.c:692
 msgid "Details about the screenshot for ZimageZ"
 msgstr "Details about the screenshot for ZimageZ"
 
 #. Create the user label
-#: ../lib/screenshooter-zimagez.c:692
+#: ../lib/screenshooter-zimagez.c:734
 msgid "User:"
 msgstr "User:"
 
-#: ../lib/screenshooter-zimagez.c:703
+#: ../lib/screenshooter-zimagez.c:745
 msgid ""
 "Your Zimagez user name, if you do not have one yet please create one on the "
 "Web page linked above"
@@ -282,20 +264,20 @@ msgstr ""
 "Web page linked above"
 
 #. Create the password label
-#: ../lib/screenshooter-zimagez.c:708
+#: ../lib/screenshooter-zimagez.c:751
 msgid "Password:"
 msgstr "Password:"
 
-#: ../lib/screenshooter-zimagez.c:718
+#: ../lib/screenshooter-zimagez.c:761
 msgid "The password for the user above"
 msgstr "The password for the user above"
 
 #. Create the title label
-#: ../lib/screenshooter-zimagez.c:723
+#: ../lib/screenshooter-zimagez.c:767
 msgid "Title:"
 msgstr "Title:"
 
-#: ../lib/screenshooter-zimagez.c:733
+#: ../lib/screenshooter-zimagez.c:777
 msgid ""
 "The title of the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
@@ -304,11 +286,11 @@ msgstr ""
 "on ZimageZ"
 
 #. Create the comment label
-#: ../lib/screenshooter-zimagez.c:738
+#: ../lib/screenshooter-zimagez.c:783
 msgid "Comment:"
 msgstr "Comment:"
 
-#: ../lib/screenshooter-zimagez.c:749
+#: ../lib/screenshooter-zimagez.c:794
 msgid ""
 "A comment on the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
@@ -316,30 +298,30 @@ msgstr ""
 "A comment on the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:870
+#: ../lib/screenshooter-zimagez.c:917
 #, c-format
 msgid "<a href=\"%s\">Full size image</a>"
 msgstr "<a href=\"%s\">Full size image</a>"
 
-#: ../lib/screenshooter-zimagez.c:872
+#: ../lib/screenshooter-zimagez.c:919
 #, c-format
 msgid "<a href=\"%s\">Large thumbnail</a>"
 msgstr "<a href=\"%s\">Large thumbnail</a>"
 
-#: ../lib/screenshooter-zimagez.c:874
+#: ../lib/screenshooter-zimagez.c:921
 #, c-format
 msgid "<a href=\"%s\">Small thumbnail</a>"
 msgstr "<a href=\"%s\">Small thumbnail</a>"
 
-#: ../lib/screenshooter-zimagez.c:894
+#: ../lib/screenshooter-zimagez.c:937
 msgid "My screenshot on ZimageZ"
 msgstr "My screenshot on ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:920
+#: ../lib/screenshooter-zimagez.c:963
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Links</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Links</span>"
 
-#: ../lib/screenshooter-zimagez.c:965
+#: ../lib/screenshooter-zimagez.c:1008
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing "
 "to the full size image</span>"
@@ -348,20 +330,20 @@ msgstr ""
 "to the full size image</span>"
 
 #. HTML title
-#: ../lib/screenshooter-zimagez.c:981
+#: ../lib/screenshooter-zimagez.c:1024
 msgid "HTML"
 msgstr "HTML"
 
 #. BB title
-#: ../lib/screenshooter-zimagez.c:1002
+#: ../lib/screenshooter-zimagez.c:1045
 msgid "BBCode for forums"
 msgstr "BBCode for forums"
 
-#: ../lib/screenshooter-zimagez.c:1122
+#: ../lib/screenshooter-zimagez.c:1174
 msgid "ZimageZ"
 msgstr "ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:1155
+#: ../lib/screenshooter-zimagez.c:1207
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Status</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Status</span>"
 
@@ -375,36 +357,45 @@ msgstr "_Open Link"
 msgid "Copy _Link Address"
 msgstr "Copy _Link Address"
 
-#: ../src/main.c:53
+#: ../src/main.c:48
 msgid "Delay in seconds before taking the screenshot"
 msgstr "Delay in seconds before taking the screenshot"
 
-#: ../src/main.c:63
-msgid "Do not display the save dialog"
-msgstr "Do not display the save dialogue"
-
-#: ../src/main.c:68
-msgid "Do not display the mouse on the screenshot"
+#: ../src/main.c:58
+#, fuzzy
+msgid "Display the mouse on the screenshot"
 msgstr "Do not display the mouse on the screenshot"
 
-#: ../src/main.c:85
+#: ../src/main.c:75
 msgid "Directory where the screenshot will be saved"
 msgstr "Directory where the screenshot will be saved"
 
-#: ../src/main.c:99
+#: ../src/main.c:85
 msgid "Version information"
 msgstr "Version information"
 
+#: ../src/main.c:134
+#, c-format
+msgid "Conflicting options: --%s and --%s cannot be used at the same time.\n"
+msgstr ""
+
 #: ../src/main.c:136
 #, c-format
 msgid ""
+"The --%s option is only used when --fullscreen, --window or --region is "
+"given. It will be ignored.\n"
+msgstr ""
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 
-#: ../src/main.c:235
+#: ../src/main.c:282
 #, c-format
 msgid "%s is not a valid directory, the default directory will be used."
 msgstr "%s is not a valid directory, the default directory will be used."
@@ -416,6 +407,53 @@ msgid ""
 msgstr ""
 "Take screenshots of the entire screen, of the active window or of a region"
 
+#~ msgid "Screenshot.png"
+#~ msgstr "Screenshot.png"
+
+#~ msgid "Screenshot-%d.png"
+#~ msgstr "Screenshot-%d.png"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
+
+#~ msgid "Show the save dialog"
+#~ msgstr "Show the save dialogue"
+
+#~ msgid ""
+#~ "The save dialog allows you to change the file name and the save location"
+#~ msgstr ""
+#~ "The save dialogue allows you to change the file name and the save location"
+
+#~ msgid "Close the application"
+#~ msgstr "Close the application"
+
+#~ msgid ""
+#~ "If unchecked, the current window will be displayed again after the "
+#~ "screenshot has been taken to allow you to take several screenshots in a "
+#~ "row"
+#~ msgstr ""
+#~ "If unticked, the current window will be displayed again after the "
+#~ "screenshot has been taken to allow you to take several screenshots in a "
+#~ "row"
+
+#~ msgid "Default save location"
+#~ msgstr "Default save location"
+
+#~ msgid "Set the default save location"
+#~ msgstr "Set the default save location"
+
+#~ msgid ""
+#~ "An error occurred during the XML exchange: %s (%d).\n"
+#~ " The screenshot could not be uploaded."
+#~ msgstr ""
+#~ "An error occurred during the XML exchange: %s (%d).\n"
+#~ " The screenshot could not be uploaded."
+
+#~ msgid "Do not display the save dialog"
+#~ msgstr "Do not display the save dialogue"
+
 #, fuzzy
 #~ msgid "Tak a screenshot of the entire screen"
 #~ msgstr "Take a screenshot of the entire screen"
diff --git a/po/es.po b/po/es.po
index 8007397..af83687 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-31 14:02+0200\n"
+"POT-Creation-Date: 2009-11-15 00:29+0100\n"
 "PO-Revision-Date: 2009-06-18 14:43-0300\n"
 "Last-Translator: elega <elega at elega.com.ar>\n"
 "Language-Team: Spanish <xfce-i18n at xfce.org>\n"
@@ -19,313 +19,334 @@ msgstr ""
 "X-Poedit-Country: SPAIN\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../lib/screenshooter-dialogs.c:283
-msgid "Screenshot.png"
-msgstr "Captura de pantalla.png"
-
-#: ../lib/screenshooter-dialogs.c:300
-#, c-format
-msgid "Screenshot-%d.png"
-msgstr "Captura de pantalla-%d.png"
-
-#: ../lib/screenshooter-dialogs.c:493
+#: ../lib/screenshooter-dialogs.c:478
 #, c-format
 msgid "%.2fKb of %.2fKb"
 msgstr "%.2fKb de %.2fKb"
 
-#: ../lib/screenshooter-dialogs.c:577
+#: ../lib/screenshooter-dialogs.c:560
 msgid "Transfer"
 msgstr "Transferencia"
 
-#: ../lib/screenshooter-dialogs.c:600
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being transferred to:</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">La captura de pantalla está siendo transfirienda a:</span>"
+#: ../lib/screenshooter-dialogs.c:581
+msgid ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being "
+"transferred to:</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">La captura de pantalla está "
+"siendo transfirienda a:</span>"
 
-#: ../lib/screenshooter-dialogs.c:724
-#: ../lib/screenshooter-dialogs.c:741
+#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
 msgid "Screenshot"
 msgstr "Captura de pantalla"
 
-#: ../lib/screenshooter-dialogs.c:736
+#: ../lib/screenshooter-dialogs.c:709
 msgid "Take a screenshot"
 msgstr "Tome una captura de pantalla"
 
-#: ../lib/screenshooter-dialogs.c:751
+#: ../lib/screenshooter-dialogs.c:724
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../lib/screenshooter-dialogs.c:793
+#: ../lib/screenshooter-dialogs.c:754
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Region to capture</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Zona a capturar</span>"
 
-#: ../lib/screenshooter-dialogs.c:820
+#: ../lib/screenshooter-dialogs.c:774
 msgid "Entire screen"
 msgstr "Toda la pantalla"
 
-#: ../lib/screenshooter-dialogs.c:830
-#: ../src/main.c:58
-#: ../panel-plugin/screenshooter-plugin.c:292
+#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../panel-plugin/screenshooter-plugin.c:308
 msgid "Take a screenshot of the entire screen"
 msgstr "Realizar una captura de toda la pantalla"
 
-#: ../lib/screenshooter-dialogs.c:841
+#: ../lib/screenshooter-dialogs.c:789
 msgid "Active window"
 msgstr "Ventana activa"
 
-#: ../lib/screenshooter-dialogs.c:851
-#: ../src/main.c:104
-#: ../panel-plugin/screenshooter-plugin.c:297
+#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr "Hacer una captura de pantalla de la ventana activa"
 
-#: ../lib/screenshooter-dialogs.c:862
+#: ../lib/screenshooter-dialogs.c:804
 msgid "Select a region"
 msgstr "Seleccionar una región"
 
-#: ../lib/screenshooter-dialogs.c:872
-#: ../src/main.c:78
-#: ../panel-plugin/screenshooter-plugin.c:302
-msgid "Select a region to be captured by clicking a point of the screen without releasing the mouse button, dragging your mouse to the other corner of the region, and releasing the mouse button."
-msgstr "Seleccione una zona para ser capturada haciendo clic en un punto de la pantalla sin soltar el botón del ratón, arrastrando el ratón a la otra esquina de la zona y soltando el botón del ratón."
+#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../panel-plugin/screenshooter-plugin.c:318
+msgid ""
+"Select a region to be captured by clicking a point of the screen without "
+"releasing the mouse button, dragging your mouse to the other corner of the "
+"region, and releasing the mouse button."
+msgstr ""
+"Seleccione una zona para ser capturada haciendo clic en un punto de la "
+"pantalla sin soltar el botón del ratón, arrastrando el ratón a la otra "
+"esquina de la zona y soltando el botón del ratón."
 
-#: ../lib/screenshooter-dialogs.c:884
+#: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
 msgstr "Capturar el puntero del ratón"
 
-#: ../lib/screenshooter-dialogs.c:892
+#: ../lib/screenshooter-dialogs.c:824
 msgid "Display the mouse pointer on the screenshot"
 msgstr "Mostrar el puntero del ratón en la captura de pantalla"
 
-#: ../lib/screenshooter-dialogs.c:917
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Demora antes de capturar</span>"
+#: ../lib/screenshooter-dialogs.c:840
+msgid ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Demora antes de capturar</"
+"span>"
 
-#: ../lib/screenshooter-dialogs.c:952
+#: ../lib/screenshooter-dialogs.c:862
 msgid "Delay in seconds before the screenshot is taken"
 msgstr "Retraso en segundos antes de que se capture la pantalla"
 
-#: ../lib/screenshooter-dialogs.c:958
+#: ../lib/screenshooter-dialogs.c:865
 msgid "seconds"
 msgstr "segundos"
 
-#: ../lib/screenshooter-dialogs.c:984
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Antes de capturar</span>"
-
-#. Display the save dialog checkbox
-#: ../lib/screenshooter-dialogs.c:1007
-msgid "Show the save dialog"
-msgstr "Mostrar el cuadro de diálogo guardar"
-
-#: ../lib/screenshooter-dialogs.c:1013
-msgid "The save dialog allows you to change the file name and the save location"
-msgstr "El cuadro de diálogo guardar le permite cambiar el nombre del archivo y el lugar donde se guarda"
-
-#: ../lib/screenshooter-dialogs.c:1027
-msgid "Close the application"
-msgstr "Cerrar la aplicación"
-
-#: ../lib/screenshooter-dialogs.c:1033
-msgid "If unchecked, the current window will be displayed again after the screenshot has been taken to allow you to take several screenshots in a row"
-msgstr "Si está sin marcar, la ventana actual se mostrará de nuevo después de la captura de pantalla; se han tomado medidas para permitir que usted tome varias capturas de pantalla en una fila"
+#: ../lib/screenshooter-dialogs.c:917
+msgid "Action"
+msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1056
+#: ../lib/screenshooter-dialogs.c:945
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Action</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Acción</span>"
 
 #. Save option radio button
-#: ../lib/screenshooter-dialogs.c:1081
-msgid "Save in:"
+#: ../lib/screenshooter-dialogs.c:961
+#, fuzzy
+msgid "Save"
 msgstr "Guardar en:"
 
-#: ../lib/screenshooter-dialogs.c:1089
+#: ../lib/screenshooter-dialogs.c:966
 msgid "Save the screenshot to a PNG file"
 msgstr "Guardar la captura de pantalla en un archivo PNG"
 
-#: ../lib/screenshooter-dialogs.c:1104
-msgid "Default save location"
-msgstr "Lugar predeterminado donde guardar"
-
-#: ../lib/screenshooter-dialogs.c:1114
-msgid "Set the default save location"
-msgstr "Configurar el lugar predeterminado para guardar"
-
-#: ../lib/screenshooter-dialogs.c:1127
+#: ../lib/screenshooter-dialogs.c:975
 msgid "Copy to the clipboard"
 msgstr "Copiar al portapapeles"
 
-#: ../lib/screenshooter-dialogs.c:1132
+#: ../lib/screenshooter-dialogs.c:977
 msgid "Copy the screenshot to the clipboard so that it can be pasted later"
-msgstr "Copiar la captura de pantalla al portapapeles para poder ser pegada después"
+msgstr ""
+"Copiar la captura de pantalla al portapapeles para poder ser pegada después"
 
-#: ../lib/screenshooter-dialogs.c:1147
+#: ../lib/screenshooter-dialogs.c:994
 msgid "Open with:"
 msgstr "Abrir con:"
 
-#: ../lib/screenshooter-dialogs.c:1158
+#: ../lib/screenshooter-dialogs.c:1000
 msgid "Open the screenshot with the chosen application"
 msgstr "Abrir la captura de pantalla con la aplicación elegida"
 
-#: ../lib/screenshooter-dialogs.c:1191
-#: ../src/main.c:73
+#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
 msgid "Application to open the screenshot"
 msgstr "Aplicación para abrir la captura de pantalla"
 
-#: ../lib/screenshooter-dialogs.c:1204
+#: ../lib/screenshooter-dialogs.c:1028
 msgid "Host on ZimageZ"
 msgstr "Alojar en ZimageZ"
 
-#: ../lib/screenshooter-dialogs.c:1210
-#: ../src/main.c:92
+#: ../lib/screenshooter-dialogs.c:1032 ../src/main.c:80
 msgid "Host the screenshot on ZimageZ, a free online image hosting service"
-msgstr "Alojar la captura de pantalla en ZimageZ, un servicio gratuito de alojamiento de imágenes en línea"
+msgstr ""
+"Alojar la captura de pantalla en ZimageZ, un servicio gratuito de "
+"alojamiento de imágenes en línea"
+
+#: ../lib/screenshooter-dialogs.c:1046
+#, fuzzy
+msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Preview</span>"
+msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Enlaces</span>"
 
-#: ../lib/screenshooter-dialogs.c:1255
+#: ../lib/screenshooter-dialogs.c:1107
 msgid "Save screenshot as..."
 msgstr "Guardar la captura de pantalla como..."
 
-#. Start the user XML RPC session
-#: ../lib/screenshooter-zimagez.c:159
-msgid "Initialize the connection..."
-msgstr "Iniciando la conexión..."
+#: ../lib/screenshooter-zimagez.c:134
+#, fuzzy, c-format
+msgid "An error occured when creating the XMLRPC request."
+msgstr "Se ha producido un error al subir la captura de pantalla."
+
+#: ../lib/screenshooter-zimagez.c:153
+#, fuzzy, c-format
+msgid "An error occured when transfering the data to ZimageZ."
+msgstr "Se ha producido un error al subir la captura de pantalla."
+
+#: ../lib/screenshooter-zimagez.c:178
+#, fuzzy, c-format
+msgid "An error occured when parsing the response from ZimageZ."
+msgstr "Se ha producido un error al subir la captura de pantalla."
 
-#: ../lib/screenshooter-zimagez.c:172
-#: ../lib/screenshooter-zimagez.c:332
-#: ../lib/screenshooter-zimagez.c:361
-#: ../lib/screenshooter-zimagez.c:389
-#: ../lib/screenshooter-zimagez.c:520
-#: ../lib/screenshooter-zimagez.c:543
-#: ../lib/screenshooter-zimagez.c:580
+#: ../lib/screenshooter-zimagez.c:228
 #, c-format
-msgid ""
-"An error occurred during the XML exchange: %s (%d).\n"
-" The screenshot could not be uploaded."
+msgid "Taken on %s, at %s"
 msgstr ""
-"Se ha producido un error durante el intercambio de XML: %s (%d).\n"
-"La captura de pantalla no puede ser cargada."
 
-#: ../lib/screenshooter-zimagez.c:223
+#. Start the user soup session
+#: ../lib/screenshooter-zimagez.c:295
+msgid "Initialize the connection..."
+msgstr "Iniciando la conexión..."
+
+#: ../lib/screenshooter-zimagez.c:341
 msgid ""
-"Please file the following fields with your <a href=\"http://www.zimagez.com\">ZimageZ</a> \n"
+"Please file the following fields with your <a href=\"http://www.zimagez.com"
+"\">ZimageZ</a> \n"
 "user name, passsword and details about the screenshot."
 msgstr ""
-"Por favor, complete los siguientes campos con su nombre de usuario en <a href=\"http://www.zimagez.com\">ZimageZ</a>, \n"
+"Por favor, complete los siguientes campos con su nombre de usuario en <a "
+"href=\"http://www.zimagez.com\">ZimageZ</a>, \n"
 "contraseña y detalles sobre la captura de pantalla."
 
-#: ../lib/screenshooter-zimagez.c:283
+#: ../lib/screenshooter-zimagez.c:398
 msgid "Check the user information..."
 msgstr "Comprobando la información del usuario..."
 
-#: ../lib/screenshooter-zimagez.c:305
-msgid "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You must fill all the fields.</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Usted debe llenar todos los campos.</span>"
+#: ../lib/screenshooter-zimagez.c:405
+msgid ""
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You "
+"must fill all the fields.</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Usted debe llenar todos los "
+"campos.</span>"
 
-#: ../lib/screenshooter-zimagez.c:320
+#: ../lib/screenshooter-zimagez.c:419
 msgid "Login on ZimageZ..."
 msgstr "Iniciando sesión en ZimageZ..."
 
-#: ../lib/screenshooter-zimagez.c:436
-msgid "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The user and the password you entered do not match. Please retry.</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">El usuario y la contraseña que ha introducido no coinciden. Por favor, inténtelo de nuevo.</span>"
+#: ../lib/screenshooter-zimagez.c:459 ../lib/screenshooter-zimagez.c:610
+msgid ""
+"An unexpected reply from ZimageZ was received. The upload of the screenshot "
+"failed."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:498
+msgid ""
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The "
+"user and the password you entered do not match. Please retry.</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">El usuario y la contraseña "
+"que ha introducido no coinciden. Por favor, inténtelo de nuevo.</span>"
 
-#: ../lib/screenshooter-zimagez.c:501
+#: ../lib/screenshooter-zimagez.c:556
 msgid "Upload the screenshot..."
 msgstr "Subiendo la captura de pantalla..."
 
-#: ../lib/screenshooter-zimagez.c:559
+#: ../lib/screenshooter-zimagez.c:589
 #, c-format
 msgid "An error occurred while uploading the screenshot."
 msgstr "Se ha producido un error al subir la captura de pantalla."
 
 #. End the user session
-#: ../lib/screenshooter-zimagez.c:597
+#: ../lib/screenshooter-zimagez.c:622
 msgid "Close the session on ZimageZ..."
 msgstr "Cerrando la sesión en ZimageZ..."
 
-#: ../lib/screenshooter-zimagez.c:650
+#: ../lib/screenshooter-zimagez.c:692
 msgid "Details about the screenshot for ZimageZ"
 msgstr "Detalles sobre la captura de pantalla para ZimageZ"
 
 #. Create the user label
-#: ../lib/screenshooter-zimagez.c:692
+#: ../lib/screenshooter-zimagez.c:734
 msgid "User:"
 msgstr "Usuario:"
 
-#: ../lib/screenshooter-zimagez.c:703
-msgid "Your Zimagez user name, if you do not have one yet please create one on the Web page linked above"
-msgstr "Su nombre de usuario Zimagez , si usted no tiene por favor cree uno en la página web enlazada anteriormente"
+#: ../lib/screenshooter-zimagez.c:745
+msgid ""
+"Your Zimagez user name, if you do not have one yet please create one on the "
+"Web page linked above"
+msgstr ""
+"Su nombre de usuario Zimagez , si usted no tiene por favor cree uno en la "
+"página web enlazada anteriormente"
 
 #. Create the password label
-#: ../lib/screenshooter-zimagez.c:708
+#: ../lib/screenshooter-zimagez.c:751
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: ../lib/screenshooter-zimagez.c:718
+#: ../lib/screenshooter-zimagez.c:761
 msgid "The password for the user above"
 msgstr "La contraseña para el usuario ingresado"
 
 #. Create the title label
-#: ../lib/screenshooter-zimagez.c:723
+#: ../lib/screenshooter-zimagez.c:767
 msgid "Title:"
 msgstr "Título:"
 
-#: ../lib/screenshooter-zimagez.c:733
-msgid "The title of the screenshot, it will be used when displaying the screenshot on ZimageZ"
-msgstr "El título de la captura de pantalla, se utilizará cuando se muestre la captura de pantalla en ZimageZ"
+#: ../lib/screenshooter-zimagez.c:777
+msgid ""
+"The title of the screenshot, it will be used when displaying the screenshot "
+"on ZimageZ"
+msgstr ""
+"El título de la captura de pantalla, se utilizará cuando se muestre la "
+"captura de pantalla en ZimageZ"
 
 #. Create the comment label
-#: ../lib/screenshooter-zimagez.c:738
+#: ../lib/screenshooter-zimagez.c:783
 msgid "Comment:"
 msgstr "Comentario:"
 
-#: ../lib/screenshooter-zimagez.c:749
-msgid "A comment on the screenshot, it will be used when displaying the screenshot on ZimageZ"
-msgstr "El comentario de la captura de pantalla, se utilizará cuando se muestre la captura de pantalla en ZimageZ"
+#: ../lib/screenshooter-zimagez.c:794
+msgid ""
+"A comment on the screenshot, it will be used when displaying the screenshot "
+"on ZimageZ"
+msgstr ""
+"El comentario de la captura de pantalla, se utilizará cuando se muestre la "
+"captura de pantalla en ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:870
+#: ../lib/screenshooter-zimagez.c:917
 #, c-format
 msgid "<a href=\"%s\">Full size image</a>"
 msgstr "<a href=\"%s\">Imagen a tamaño completo</a>"
 
-#: ../lib/screenshooter-zimagez.c:872
+#: ../lib/screenshooter-zimagez.c:919
 #, c-format
 msgid "<a href=\"%s\">Large thumbnail</a>"
 msgstr "<a href=\"%s\">Miniatura grande</a>"
 
-#: ../lib/screenshooter-zimagez.c:874
+#: ../lib/screenshooter-zimagez.c:921
 #, c-format
 msgid "<a href=\"%s\">Small thumbnail</a>"
 msgstr "<a href=\"%s\">Miniatura pequeña</a>"
 
-#: ../lib/screenshooter-zimagez.c:894
+#: ../lib/screenshooter-zimagez.c:937
 msgid "My screenshot on ZimageZ"
 msgstr "Mi captura de pantalla en ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:920
+#: ../lib/screenshooter-zimagez.c:963
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Links</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Enlaces</span>"
 
-#: ../lib/screenshooter-zimagez.c:965
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing to the full size image</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Código para una miniatura que apunta a la imagen a tamaño completo</span>"
+#: ../lib/screenshooter-zimagez.c:1008
+msgid ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing "
+"to the full size image</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Código para una miniatura que "
+"apunta a la imagen a tamaño completo</span>"
 
 #. HTML title
-#: ../lib/screenshooter-zimagez.c:981
+#: ../lib/screenshooter-zimagez.c:1024
 msgid "HTML"
 msgstr "HTML"
 
 #. BB title
-#: ../lib/screenshooter-zimagez.c:1002
+#: ../lib/screenshooter-zimagez.c:1045
 msgid "BBCode for forums"
 msgstr "BBcode para foros"
 
-#: ../lib/screenshooter-zimagez.c:1122
+#: ../lib/screenshooter-zimagez.c:1174
 msgid "ZimageZ"
 msgstr "ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:1155
+#: ../lib/screenshooter-zimagez.c:1207
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Status</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Estado</span>"
 
@@ -339,44 +360,104 @@ msgstr "_Abrir enlace"
 msgid "Copy _Link Address"
 msgstr "Copiar dirección del _enlace"
 
-#: ../src/main.c:53
+#: ../src/main.c:48
 msgid "Delay in seconds before taking the screenshot"
 msgstr "Retraso en segundos antes de la captura de pantalla"
 
-#: ../src/main.c:63
-msgid "Do not display the save dialog"
-msgstr "No mostrar el diálogo de guardar"
-
-#: ../src/main.c:68
-msgid "Do not display the mouse on the screenshot"
+#: ../src/main.c:58
+#, fuzzy
+msgid "Display the mouse on the screenshot"
 msgstr "No mostrar el ratón en la captura de pantalla"
 
-#: ../src/main.c:85
+#: ../src/main.c:75
 msgid "Directory where the screenshot will be saved"
 msgstr "Directorio donde se guardará la captura de pantalla"
 
-#: ../src/main.c:99
+#: ../src/main.c:85
 msgid "Version information"
 msgstr "Información de versión"
 
+#: ../src/main.c:134
+#, c-format
+msgid "Conflicting options: --%s and --%s cannot be used at the same time.\n"
+msgstr ""
+
 #: ../src/main.c:136
 #, c-format
 msgid ""
+"The --%s option is only used when --fullscreen, --window or --region is "
+"given. It will be ignored.\n"
+msgstr ""
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
 "%s: %s\n"
-"Pruebe %s --help para ver una lista completa de opciones de línea de comandos.\n"
+"Pruebe %s --help para ver una lista completa de opciones de línea de "
+"comandos.\n"
 
-#: ../src/main.c:235
+#: ../src/main.c:282
 #, c-format
 msgid "%s is not a valid directory, the default directory will be used."
 msgstr "%s no es un directorio válido, se empleará el directorio por defecto."
 
 #: ../src/xfce4-screenshooter.desktop.in.in.h:2
 #: ../panel-plugin/screenshooter.desktop.in.in.h:2
-msgid "Take screenshots of the entire screen, of the active window or of a region"
-msgstr "Realiza capturas de la pantalla completa, de la ventana activa o de una zona"
+msgid ""
+"Take screenshots of the entire screen, of the active window or of a region"
+msgstr ""
+"Realiza capturas de la pantalla completa, de la ventana activa o de una zona"
+
+#~ msgid "Screenshot.png"
+#~ msgstr "Captura de pantalla.png"
+
+#~ msgid "Screenshot-%d.png"
+#~ msgstr "Captura de pantalla-%d.png"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">Antes de capturar</span>"
+
+#~ msgid "Show the save dialog"
+#~ msgstr "Mostrar el cuadro de diálogo guardar"
+
+#~ msgid ""
+#~ "The save dialog allows you to change the file name and the save location"
+#~ msgstr ""
+#~ "El cuadro de diálogo guardar le permite cambiar el nombre del archivo y "
+#~ "el lugar donde se guarda"
+
+#~ msgid "Close the application"
+#~ msgstr "Cerrar la aplicación"
+
+#~ msgid ""
+#~ "If unchecked, the current window will be displayed again after the "
+#~ "screenshot has been taken to allow you to take several screenshots in a "
+#~ "row"
+#~ msgstr ""
+#~ "Si está sin marcar, la ventana actual se mostrará de nuevo después de la "
+#~ "captura de pantalla; se han tomado medidas para permitir que usted tome "
+#~ "varias capturas de pantalla en una fila"
+
+#~ msgid "Default save location"
+#~ msgstr "Lugar predeterminado donde guardar"
+
+#~ msgid "Set the default save location"
+#~ msgstr "Configurar el lugar predeterminado para guardar"
+
+#~ msgid ""
+#~ "An error occurred during the XML exchange: %s (%d).\n"
+#~ " The screenshot could not be uploaded."
+#~ msgstr ""
+#~ "Se ha producido un error durante el intercambio de XML: %s (%d).\n"
+#~ "La captura de pantalla no puede ser cargada."
+
+#~ msgid "Do not display the save dialog"
+#~ msgstr "No mostrar el diálogo de guardar"
 
 #, fuzzy
 #~ msgid "Tak a screenshot of the entire screen"
@@ -389,12 +470,13 @@ msgstr "Realiza capturas de la pantalla completa, de la ventana activa o de una
 #, fuzzy
 #~ msgid "Display the save dialog"
 #~ msgstr "No mostrar el diálogo de guardar"
+
 #~ msgid "Save by default to:"
 #~ msgstr "Guardar por defecto como:"
+
 #~ msgid ""
 #~ "If checked, the screenshot will be saved by default to the location set "
 #~ "on the right without displaying a save dialog"
 #~ msgstr ""
 #~ "Si está habilitado, la captura de pantalla será guardada por defecto a la "
 #~ "localización configurada a la derecha, sin mostrar un diálogo de guardar"
-
diff --git a/po/et.po b/po/et.po
index 10a27a5..4c224ae 100644
--- a/po/et.po
+++ b/po/et.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-screenshooter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-31 14:02+0200\n"
+"POT-Creation-Date: 2009-11-15 00:29+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: kristjan <kristjan.siimson at gmail.com>\n"
 "Language-Team: \n"
@@ -10,74 +10,66 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/screenshooter-dialogs.c:283
-#, fuzzy
-msgid "Screenshot.png"
-msgstr "Ekraanipilt.png"
-
-#: ../lib/screenshooter-dialogs.c:300
-#, c-format
-msgid "Screenshot-%d.png"
-msgstr "Ekraanipilt-%d.png"
-
-#: ../lib/screenshooter-dialogs.c:493
+#: ../lib/screenshooter-dialogs.c:478
 #, c-format
 msgid "%.2fKb of %.2fKb"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:577
+#: ../lib/screenshooter-dialogs.c:560
 msgid "Transfer"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:600
+#: ../lib/screenshooter-dialogs.c:581
 #, fuzzy
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being "
 "transferred to:</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Toiming</span>"
 
-#: ../lib/screenshooter-dialogs.c:724 ../lib/screenshooter-dialogs.c:741
+#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
 msgid "Screenshot"
 msgstr "Ekraanipilt"
 
-#: ../lib/screenshooter-dialogs.c:736
+#: ../lib/screenshooter-dialogs.c:709
 msgid "Take a screenshot"
 msgstr "Tee ekraanipilt"
 
-#: ../lib/screenshooter-dialogs.c:751
+#: ../lib/screenshooter-dialogs.c:724
 msgid "Preferences"
 msgstr "Eelistused"
 
-#: ../lib/screenshooter-dialogs.c:793
+#: ../lib/screenshooter-dialogs.c:754
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Region to capture</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Pildistatav ala</span>"
 
-#: ../lib/screenshooter-dialogs.c:820
+#: ../lib/screenshooter-dialogs.c:774
 msgid "Entire screen"
 msgstr "Kogu ekraan"
 
-#: ../lib/screenshooter-dialogs.c:830 ../src/main.c:58
-#: ../panel-plugin/screenshooter-plugin.c:292
+#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../panel-plugin/screenshooter-plugin.c:308
 msgid "Take a screenshot of the entire screen"
 msgstr "Tee ekraanipilt kogu ekraanist"
 
-#: ../lib/screenshooter-dialogs.c:841
+#: ../lib/screenshooter-dialogs.c:789
 msgid "Active window"
 msgstr "Käsilolev aken"
 
-#: ../lib/screenshooter-dialogs.c:851 ../src/main.c:104
-#: ../panel-plugin/screenshooter-plugin.c:297
+#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr "Tee ekraanipilt käsilolevast aknast"
 
-#: ../lib/screenshooter-dialogs.c:862
+#: ../lib/screenshooter-dialogs.c:804
 msgid "Select a region"
 msgstr "Vali ala"
 
-#: ../lib/screenshooter-dialogs.c:872 ../src/main.c:78
-#: ../panel-plugin/screenshooter-plugin.c:302
+#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../panel-plugin/screenshooter-plugin.c:318
 msgid ""
 "Select a region to be captured by clicking a point of the screen without "
 "releasing the mouse button, dragging your mouse to the other corner of the "
@@ -86,242 +78,232 @@ msgstr ""
 "Pildistatava ala valimiseks klõpsake ekraanile ilma nuppu lahti laskmata, "
 "lohistage osuti teise valitava ala otsa, ning laske hiirenupp lahti."
 
-#: ../lib/screenshooter-dialogs.c:884
+#: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:892
+#: ../lib/screenshooter-dialogs.c:824
 #, fuzzy
 msgid "Display the mouse pointer on the screenshot"
 msgstr "Salvestusdialoogi mitte näidata"
 
-#: ../lib/screenshooter-dialogs.c:917
+#: ../lib/screenshooter-dialogs.c:840
 #, fuzzy
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Pildistatav ala</span>"
 
-#: ../lib/screenshooter-dialogs.c:952
+#: ../lib/screenshooter-dialogs.c:862
 msgid "Delay in seconds before the screenshot is taken"
 msgstr "Viivitus sekundites enne ekraanipildi tegemist"
 
-#: ../lib/screenshooter-dialogs.c:958
+#: ../lib/screenshooter-dialogs.c:865
 msgid "seconds"
 msgstr "sekundit"
 
-#: ../lib/screenshooter-dialogs.c:984
-#, fuzzy
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Toiming</span>"
-
-#. Display the save dialog checkbox
-#: ../lib/screenshooter-dialogs.c:1007
-#, fuzzy
-msgid "Show the save dialog"
-msgstr "Salvestusdialoogi mitte näidata"
-
-#: ../lib/screenshooter-dialogs.c:1013
-msgid ""
-"The save dialog allows you to change the file name and the save location"
-msgstr ""
-
-#: ../lib/screenshooter-dialogs.c:1027
-#, fuzzy
-msgid "Close the application"
-msgstr "Rakendus:"
-
-#: ../lib/screenshooter-dialogs.c:1033
-msgid ""
-"If unchecked, the current window will be displayed again after the "
-"screenshot has been taken to allow you to take several screenshots in a row"
+#: ../lib/screenshooter-dialogs.c:917
+msgid "Action"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1056
+#: ../lib/screenshooter-dialogs.c:945
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Action</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Toiming</span>"
 
 #. Save option radio button
-#: ../lib/screenshooter-dialogs.c:1081
+#: ../lib/screenshooter-dialogs.c:961
 #, fuzzy
-msgid "Save in:"
+msgid "Save"
 msgstr "Salvesta"
 
-#: ../lib/screenshooter-dialogs.c:1089
+#: ../lib/screenshooter-dialogs.c:966
 msgid "Save the screenshot to a PNG file"
 msgstr "Salvesta ekraanipilt PNG-säilikuna"
 
-#: ../lib/screenshooter-dialogs.c:1104
-msgid "Default save location"
-msgstr "Vaikimisi salvestamise asukoht"
-
-#: ../lib/screenshooter-dialogs.c:1114
-msgid "Set the default save location"
-msgstr "Määrake vaikimisi salvestamise asukoht"
-
-#: ../lib/screenshooter-dialogs.c:1127
+#: ../lib/screenshooter-dialogs.c:975
 msgid "Copy to the clipboard"
 msgstr "Kopeeri lõikepuhvrisse"
 
-#: ../lib/screenshooter-dialogs.c:1132
+#: ../lib/screenshooter-dialogs.c:977
 msgid "Copy the screenshot to the clipboard so that it can be pasted later"
 msgstr "Kopeeri ekraanipilt lõikepuhvrisse, et seda hiljem asetada"
 
-#: ../lib/screenshooter-dialogs.c:1147
+#: ../lib/screenshooter-dialogs.c:994
 msgid "Open with:"
 msgstr "Ava kasutades:"
 
-#: ../lib/screenshooter-dialogs.c:1158
+#: ../lib/screenshooter-dialogs.c:1000
 msgid "Open the screenshot with the chosen application"
 msgstr "Ava ekraanipilt valitud rakendusega"
 
-#: ../lib/screenshooter-dialogs.c:1191 ../src/main.c:73
+#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
 msgid "Application to open the screenshot"
 msgstr "Ekraanipildi avamise rakendus"
 
-#: ../lib/screenshooter-dialogs.c:1204
+#: ../lib/screenshooter-dialogs.c:1028
 msgid "Host on ZimageZ"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1210 ../src/main.c:92
+#: ../lib/screenshooter-dialogs.c:1032 ../src/main.c:80
 msgid "Host the screenshot on ZimageZ, a free online image hosting service"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1255
+#: ../lib/screenshooter-dialogs.c:1046
+#, fuzzy
+msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Preview</span>"
+msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Toiming</span>"
+
+#: ../lib/screenshooter-dialogs.c:1107
 msgid "Save screenshot as..."
 msgstr "Salvesta ekraanipilt kui..."
 
-#. Start the user XML RPC session
-#: ../lib/screenshooter-zimagez.c:159
-msgid "Initialize the connection..."
+#: ../lib/screenshooter-zimagez.c:134
+#, c-format
+msgid "An error occured when creating the XMLRPC request."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:172 ../lib/screenshooter-zimagez.c:332
-#: ../lib/screenshooter-zimagez.c:361 ../lib/screenshooter-zimagez.c:389
-#: ../lib/screenshooter-zimagez.c:520 ../lib/screenshooter-zimagez.c:543
-#: ../lib/screenshooter-zimagez.c:580
+#: ../lib/screenshooter-zimagez.c:153
 #, c-format
-msgid ""
-"An error occurred during the XML exchange: %s (%d).\n"
-" The screenshot could not be uploaded."
+msgid "An error occured when transfering the data to ZimageZ."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:178
+#, c-format
+msgid "An error occured when parsing the response from ZimageZ."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:228
+#, c-format
+msgid "Taken on %s, at %s"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:223
+#. Start the user soup session
+#: ../lib/screenshooter-zimagez.c:295
+msgid "Initialize the connection..."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:341
 msgid ""
 "Please file the following fields with your <a href=\"http://www.zimagez.com"
 "\">ZimageZ</a> \n"
 "user name, passsword and details about the screenshot."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:283
+#: ../lib/screenshooter-zimagez.c:398
 msgid "Check the user information..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:305
+#: ../lib/screenshooter-zimagez.c:405
 #, fuzzy
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You "
 "must fill all the fields.</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Pildistatav ala</span>"
 
-#: ../lib/screenshooter-zimagez.c:320
+#: ../lib/screenshooter-zimagez.c:419
 msgid "Login on ZimageZ..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:436
+#: ../lib/screenshooter-zimagez.c:459 ../lib/screenshooter-zimagez.c:610
+msgid ""
+"An unexpected reply from ZimageZ was received. The upload of the screenshot "
+"failed."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:498
 #, fuzzy
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The "
 "user and the password you entered do not match. Please retry.</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Toiming</span>"
 
-#: ../lib/screenshooter-zimagez.c:501
+#: ../lib/screenshooter-zimagez.c:556
 #, fuzzy
 msgid "Upload the screenshot..."
 msgstr "Tee ekraanipilt"
 
-#: ../lib/screenshooter-zimagez.c:559
+#: ../lib/screenshooter-zimagez.c:589
 #, c-format
 msgid "An error occurred while uploading the screenshot."
 msgstr ""
 
 #. End the user session
-#: ../lib/screenshooter-zimagez.c:597
+#: ../lib/screenshooter-zimagez.c:622
 msgid "Close the session on ZimageZ..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:650
+#: ../lib/screenshooter-zimagez.c:692
 #, fuzzy
 msgid "Details about the screenshot for ZimageZ"
 msgstr "Viivitus sekundites enne ekraanipildi tegemist"
 
 #. Create the user label
-#: ../lib/screenshooter-zimagez.c:692
+#: ../lib/screenshooter-zimagez.c:734
 msgid "User:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:703
+#: ../lib/screenshooter-zimagez.c:745
 msgid ""
 "Your Zimagez user name, if you do not have one yet please create one on the "
 "Web page linked above"
 msgstr ""
 
 #. Create the password label
-#: ../lib/screenshooter-zimagez.c:708
+#: ../lib/screenshooter-zimagez.c:751
 msgid "Password:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:718
+#: ../lib/screenshooter-zimagez.c:761
 msgid "The password for the user above"
 msgstr ""
 
 #. Create the title label
-#: ../lib/screenshooter-zimagez.c:723
+#: ../lib/screenshooter-zimagez.c:767
 msgid "Title:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:733
+#: ../lib/screenshooter-zimagez.c:777
 msgid ""
 "The title of the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
 msgstr ""
 
 #. Create the comment label
-#: ../lib/screenshooter-zimagez.c:738
+#: ../lib/screenshooter-zimagez.c:783
 msgid "Comment:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:749
+#: ../lib/screenshooter-zimagez.c:794
 msgid ""
 "A comment on the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:870
+#: ../lib/screenshooter-zimagez.c:917
 #, c-format
 msgid "<a href=\"%s\">Full size image</a>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:872
+#: ../lib/screenshooter-zimagez.c:919
 #, c-format
 msgid "<a href=\"%s\">Large thumbnail</a>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:874
+#: ../lib/screenshooter-zimagez.c:921
 #, c-format
 msgid "<a href=\"%s\">Small thumbnail</a>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:894
+#: ../lib/screenshooter-zimagez.c:937
 #, fuzzy
 msgid "My screenshot on ZimageZ"
 msgstr "Viivitus sekundites enne ekraanipildi tegemist"
 
-#: ../lib/screenshooter-zimagez.c:920
+#: ../lib/screenshooter-zimagez.c:963
 #, fuzzy
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Links</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Toiming</span>"
 
-#: ../lib/screenshooter-zimagez.c:965
+#: ../lib/screenshooter-zimagez.c:1008
 #, fuzzy
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing "
@@ -331,20 +313,20 @@ msgstr ""
 "tegemist</span>"
 
 #. HTML title
-#: ../lib/screenshooter-zimagez.c:981
+#: ../lib/screenshooter-zimagez.c:1024
 msgid "HTML"
 msgstr ""
 
 #. BB title
-#: ../lib/screenshooter-zimagez.c:1002
+#: ../lib/screenshooter-zimagez.c:1045
 msgid "BBCode for forums"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:1122
+#: ../lib/screenshooter-zimagez.c:1174
 msgid "ZimageZ"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:1155
+#: ../lib/screenshooter-zimagez.c:1207
 #, fuzzy
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Status</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Toiming</span>"
@@ -360,37 +342,45 @@ msgstr "Ava kasutades:"
 msgid "Copy _Link Address"
 msgstr ""
 
-#: ../src/main.c:53
+#: ../src/main.c:48
 msgid "Delay in seconds before taking the screenshot"
 msgstr "Viivitus sekundites enne ekraanipildi tegemist"
 
-#: ../src/main.c:63
-msgid "Do not display the save dialog"
-msgstr "Salvestusdialoogi mitte näidata"
-
-#: ../src/main.c:68
+#: ../src/main.c:58
 #, fuzzy
-msgid "Do not display the mouse on the screenshot"
+msgid "Display the mouse on the screenshot"
 msgstr "Salvestusdialoogi mitte näidata"
 
-#: ../src/main.c:85
+#: ../src/main.c:75
 msgid "Directory where the screenshot will be saved"
 msgstr "Kataloog kuhu ekraanipildid salvestatakse"
 
-#: ../src/main.c:99
+#: ../src/main.c:85
 msgid "Version information"
 msgstr "Versiooniteave"
 
+#: ../src/main.c:134
+#, c-format
+msgid "Conflicting options: --%s and --%s cannot be used at the same time.\n"
+msgstr ""
+
 #: ../src/main.c:136
 #, c-format
 msgid ""
+"The --%s option is only used when --fullscreen, --window or --region is "
+"given. It will be ignored.\n"
+msgstr ""
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
 "%s: %s\n"
 "%s --help Näitab täieliku loendit käsurea valikutest.\n"
 
-#: ../src/main.c:235
+#: ../src/main.c:282
 #, c-format
 msgid "%s is not a valid directory, the default directory will be used."
 msgstr "%s ei ole korrektne asukoht, kasutatakse vaikimisi kataloogi."
@@ -402,6 +392,35 @@ msgid ""
 msgstr "Tehke ekraanipildid tervest ekraanist, käsilolevast aknast või alast"
 
 #, fuzzy
+#~ msgid "Screenshot.png"
+#~ msgstr "Ekraanipilt.png"
+
+#~ msgid "Screenshot-%d.png"
+#~ msgstr "Ekraanipilt-%d.png"
+
+#, fuzzy
+#~ msgid ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
+#~ msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Toiming</span>"
+
+#, fuzzy
+#~ msgid "Show the save dialog"
+#~ msgstr "Salvestusdialoogi mitte näidata"
+
+#, fuzzy
+#~ msgid "Close the application"
+#~ msgstr "Rakendus:"
+
+#~ msgid "Default save location"
+#~ msgstr "Vaikimisi salvestamise asukoht"
+
+#~ msgid "Set the default save location"
+#~ msgstr "Määrake vaikimisi salvestamise asukoht"
+
+#~ msgid "Do not display the save dialog"
+#~ msgstr "Salvestusdialoogi mitte näidata"
+
+#, fuzzy
 #~ msgid "Tak a screenshot of the entire screen"
 #~ msgstr "Tee ekraanipilt kogu ekraanist"
 
diff --git a/po/eu.po b/po/eu.po
index 8002fec..c98a004 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-31 14:02+0200\n"
+"POT-Creation-Date: 2009-11-15 00:29+0100\n"
 "PO-Revision-Date: 2009-06-14 00:00+0200\n"
 "Last-Translator: Piarres Beobide <pi at beobide.net>\n"
 "Language-Team: Euskara <debian-l10n-basque at lists.debian.org>\n"
@@ -17,72 +17,68 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../lib/screenshooter-dialogs.c:283
-msgid "Screenshot.png"
-msgstr "Pantaila-argazkia.png"
-
-#: ../lib/screenshooter-dialogs.c:300
-#, c-format
-msgid "Screenshot-%d.png"
-msgstr "Pantaila-argazkia-%d.png"
-
-#: ../lib/screenshooter-dialogs.c:493
+#: ../lib/screenshooter-dialogs.c:478
 #, c-format
 msgid "%.2fKb of %.2fKb"
 msgstr "%.2fKb %.2fKb-tik"
 
-#: ../lib/screenshooter-dialogs.c:577
+#: ../lib/screenshooter-dialogs.c:560
 msgid "Transfer"
 msgstr "Transferitu"
 
-#: ../lib/screenshooter-dialogs.c:600
+#: ../lib/screenshooter-dialogs.c:581
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being "
 "transferred to:</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Pantaila argazkia hona transferitzen ari da:</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Pantaila argazkia hona "
+"transferitzen ari da:</span>"
 
-#: ../lib/screenshooter-dialogs.c:724 ../lib/screenshooter-dialogs.c:741
+#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
 msgid "Screenshot"
 msgstr "Pantaila-argazkia"
 
-#: ../lib/screenshooter-dialogs.c:736
+#: ../lib/screenshooter-dialogs.c:709
 msgid "Take a screenshot"
 msgstr "Atera pantaila-argazkia bat"
 
-#: ../lib/screenshooter-dialogs.c:751
+#: ../lib/screenshooter-dialogs.c:724
 msgid "Preferences"
 msgstr "Hobespenak"
 
-#: ../lib/screenshooter-dialogs.c:793
+#: ../lib/screenshooter-dialogs.c:754
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Region to capture</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Kapturatzeko eremua</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Kapturatzeko eremua</span>"
 
-#: ../lib/screenshooter-dialogs.c:820
+#: ../lib/screenshooter-dialogs.c:774
 msgid "Entire screen"
 msgstr "Pantaila osoa"
 
-#: ../lib/screenshooter-dialogs.c:830 ../src/main.c:58
-#: ../panel-plugin/screenshooter-plugin.c:292
+#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../panel-plugin/screenshooter-plugin.c:308
 msgid "Take a screenshot of the entire screen"
 msgstr "Atera pantaila osoaren pantaila-argazkia"
 
-#: ../lib/screenshooter-dialogs.c:841
+#: ../lib/screenshooter-dialogs.c:789
 msgid "Active window"
 msgstr "Leiho aktiboa"
 
-#: ../lib/screenshooter-dialogs.c:851 ../src/main.c:104
-#: ../panel-plugin/screenshooter-plugin.c:297
+#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr "Atera leiho aktiboaren pantaila-argazkia"
 
-#: ../lib/screenshooter-dialogs.c:862
+#: ../lib/screenshooter-dialogs.c:804
 msgid "Select a region"
 msgstr "Hautatu eremu bat"
 
-#: ../lib/screenshooter-dialogs.c:872 ../src/main.c:78
-#: ../panel-plugin/screenshooter-plugin.c:302
+#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../panel-plugin/screenshooter-plugin.c:318
 msgid ""
 "Select a region to be captured by clicking a point of the screen without "
 "releasing the mouse button, dragging your mouse to the other corner of the "
@@ -92,122 +88,111 @@ msgstr ""
 "sagu botoia askatu gabe arrastratu kurtsorea eremuaren beste ertzera, han "
 "sagu botoia askatuaz."
 
-#: ../lib/screenshooter-dialogs.c:884
+#: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
 msgstr "Kapturatu sagu markatzailea"
 
-#: ../lib/screenshooter-dialogs.c:892
+#: ../lib/screenshooter-dialogs.c:824
 msgid "Display the mouse pointer on the screenshot"
 msgstr "Bistarazi sagu markatzailea pantaila-argazkian."
 
-#: ../lib/screenshooter-dialogs.c:917
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Kapturatu arreko atzerapena</span>"
+#: ../lib/screenshooter-dialogs.c:840
+msgid ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Kapturatu arreko atzerapena</"
+"span>"
 
-#: ../lib/screenshooter-dialogs.c:952
+#: ../lib/screenshooter-dialogs.c:862
 msgid "Delay in seconds before the screenshot is taken"
 msgstr "Pantaila-argazkia atera aurretiko atzerapena segundotan"
 
-#: ../lib/screenshooter-dialogs.c:958
+#: ../lib/screenshooter-dialogs.c:865
 msgid "seconds"
 msgstr "segundu"
 
-#: ../lib/screenshooter-dialogs.c:984
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Kapturatu ondoren</span>"
-
-#. Display the save dialog checkbox
-#: ../lib/screenshooter-dialogs.c:1007
-msgid "Show the save dialog"
-msgstr "Erakutsi gordetze elkarrizketa"
-
-#: ../lib/screenshooter-dialogs.c:1013
-msgid "The save dialog allows you to change the file name and the save location"
-msgstr "Gordetze leihoan fitxategi izena eta gordetze kokapena aldatu ditzakezu"
-
-#: ../lib/screenshooter-dialogs.c:1027
-msgid "Close the application"
-msgstr "Itxi aplikazioa:"
-
-#: ../lib/screenshooter-dialogs.c:1033
-msgid ""
-"If unchecked, the current window will be displayed again after the "
-"screenshot has been taken to allow you to take several screenshots in a row"
+#: ../lib/screenshooter-dialogs.c:917
+msgid "Action"
 msgstr ""
-"Hautaturik ez badago, leihoa hau bistaraziko da berriz pantaila-argazkia "
-"atera ondoren zuri pantaila-argazki anitz ateratzeko aukera emateko"
 
-#: ../lib/screenshooter-dialogs.c:1056
+#: ../lib/screenshooter-dialogs.c:945
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Action</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Ekintza</span>"
 
 #. Save option radio button
-#: ../lib/screenshooter-dialogs.c:1081
-msgid "Save in:"
+#: ../lib/screenshooter-dialogs.c:961
+#, fuzzy
+msgid "Save"
 msgstr "Gorde hemen:"
 
-#: ../lib/screenshooter-dialogs.c:1089
+#: ../lib/screenshooter-dialogs.c:966
 msgid "Save the screenshot to a PNG file"
 msgstr "Gorde pantaila-argazkia PNG fitxategi batetan"
 
-#: ../lib/screenshooter-dialogs.c:1104
-msgid "Default save location"
-msgstr "Lehenetsitako gordetze kokapena"
-
-#: ../lib/screenshooter-dialogs.c:1114
-msgid "Set the default save location"
-msgstr "Ezarri lehenetsitako gordetze kokapena"
-
-#: ../lib/screenshooter-dialogs.c:1127
+#: ../lib/screenshooter-dialogs.c:975
 msgid "Copy to the clipboard"
 msgstr "Kopiatu arbelera"
 
-#: ../lib/screenshooter-dialogs.c:1132
+#: ../lib/screenshooter-dialogs.c:977
 msgid "Copy the screenshot to the clipboard so that it can be pasted later"
 msgstr "Kopiatu pantaila-argazkia arbelera beranduago itsatsi ahal izateko"
 
-#: ../lib/screenshooter-dialogs.c:1147
+#: ../lib/screenshooter-dialogs.c:994
 msgid "Open with:"
 msgstr "Ireki honekin:"
 
-#: ../lib/screenshooter-dialogs.c:1158
+#: ../lib/screenshooter-dialogs.c:1000
 msgid "Open the screenshot with the chosen application"
 msgstr "Ireki pantaila-argazkia hautatutako aplikazioarekin"
 
-#: ../lib/screenshooter-dialogs.c:1191 ../src/main.c:73
+#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
 msgid "Application to open the screenshot"
 msgstr "Pantaila-argazkia irekitzeko aplikazioa"
 
-#: ../lib/screenshooter-dialogs.c:1204
+#: ../lib/screenshooter-dialogs.c:1028
 msgid "Host on ZimageZ"
 msgstr "Ipini ZimageZ-en"
 
-#: ../lib/screenshooter-dialogs.c:1210 ../src/main.c:92
+#: ../lib/screenshooter-dialogs.c:1032 ../src/main.c:80
 msgid "Host the screenshot on ZimageZ, a free online image hosting service"
-msgstr "Ipini irudia ZimageZ-en, doako sare bidezko irudi ostalaritza zerbitzu bat"
+msgstr ""
+"Ipini irudia ZimageZ-en, doako sare bidezko irudi ostalaritza zerbitzu bat"
 
-#: ../lib/screenshooter-dialogs.c:1255
+#: ../lib/screenshooter-dialogs.c:1046
+#, fuzzy
+msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Preview</span>"
+msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Loturak</span>"
+
+#: ../lib/screenshooter-dialogs.c:1107
 msgid "Save screenshot as..."
 msgstr "Gorde pantaila-argazkia honela ..."
 
-#. Start the user XML RPC session
-#: ../lib/screenshooter-zimagez.c:159
-msgid "Initialize the connection..."
-msgstr "Abiarazi konexioa...."
+#: ../lib/screenshooter-zimagez.c:134
+#, fuzzy, c-format
+msgid "An error occured when creating the XMLRPC request."
+msgstr "Erreore bat gertatu da irudia igotzerakoan."
+
+#: ../lib/screenshooter-zimagez.c:153
+#, fuzzy, c-format
+msgid "An error occured when transfering the data to ZimageZ."
+msgstr "Erreore bat gertatu da irudia igotzerakoan."
 
-#: ../lib/screenshooter-zimagez.c:172 ../lib/screenshooter-zimagez.c:332
-#: ../lib/screenshooter-zimagez.c:361 ../lib/screenshooter-zimagez.c:389
-#: ../lib/screenshooter-zimagez.c:520 ../lib/screenshooter-zimagez.c:543
-#: ../lib/screenshooter-zimagez.c:580
+#: ../lib/screenshooter-zimagez.c:178
+#, fuzzy, c-format
+msgid "An error occured when parsing the response from ZimageZ."
+msgstr "Erreore bat gertatu da irudia igotzerakoan."
+
+#: ../lib/screenshooter-zimagez.c:228
 #, c-format
-msgid ""
-"An error occurred during the XML exchange: %s (%d).\n"
-" The screenshot could not be uploaded."
+msgid "Taken on %s, at %s"
 msgstr ""
-"Errore bat gertatu da XML trukatzean; %s (%d).\n"
-" Pantaila-argazkia ezin izan da igo."
 
-#: ../lib/screenshooter-zimagez.c:223
+#. Start the user soup session
+#: ../lib/screenshooter-zimagez.c:295
+msgid "Initialize the connection..."
+msgstr "Abiarazi konexioa...."
+
+#: ../lib/screenshooter-zimagez.c:341
 msgid ""
 "Please file the following fields with your <a href=\"http://www.zimagez.com"
 "\">ZimageZ</a> \n"
@@ -217,50 +202,61 @@ msgstr ""
 "\">ZimageZ</a> \n"
 "erabiltzaile-izena, pasahitza eta argazkiari buruzko xehetasunekin."
 
-#: ../lib/screenshooter-zimagez.c:283
+#: ../lib/screenshooter-zimagez.c:398
 msgid "Check the user information..."
 msgstr "Egiaztatu erabiltzaile datuak..."
 
-#: ../lib/screenshooter-zimagez.c:305
+#: ../lib/screenshooter-zimagez.c:405
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You "
 "must fill all the fields.</span>"
-msgstr "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">Eremu guztaik bete behar dituzu.</span>"
+msgstr ""
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">Eremu "
+"guztaik bete behar dituzu.</span>"
 
-#: ../lib/screenshooter-zimagez.c:320
+#: ../lib/screenshooter-zimagez.c:419
 msgid "Login on ZimageZ..."
 msgstr "Saioa hasi ZimageZ-en..."
 
-#: ../lib/screenshooter-zimagez.c:436
+#: ../lib/screenshooter-zimagez.c:459 ../lib/screenshooter-zimagez.c:610
+msgid ""
+"An unexpected reply from ZimageZ was received. The upload of the screenshot "
+"failed."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:498
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The "
 "user and the password you entered do not match. Please retry.</span>"
-msgstr "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">Idatzitako erabiltzailea eta pasahitza ez datoz bat. Saiatu berriro.</span>"
+msgstr ""
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded"
+"\">Idatzitako erabiltzailea eta pasahitza ez datoz bat. Saiatu berriro.</"
+"span>"
 
-#: ../lib/screenshooter-zimagez.c:501
+#: ../lib/screenshooter-zimagez.c:556
 msgid "Upload the screenshot..."
 msgstr "Igo pantaila-argazkia..."
 
-#: ../lib/screenshooter-zimagez.c:559
+#: ../lib/screenshooter-zimagez.c:589
 #, c-format
 msgid "An error occurred while uploading the screenshot."
 msgstr "Erreore bat gertatu da irudia igotzerakoan."
 
 #. End the user session
-#: ../lib/screenshooter-zimagez.c:597
+#: ../lib/screenshooter-zimagez.c:622
 msgid "Close the session on ZimageZ..."
 msgstr "Itxi ZimageZ-rekiko saioa..."
 
-#: ../lib/screenshooter-zimagez.c:650
+#: ../lib/screenshooter-zimagez.c:692
 msgid "Details about the screenshot for ZimageZ"
 msgstr "ZimageZ-rako pantaila-argazkiaren xehetasunak"
 
 #. Create the user label
-#: ../lib/screenshooter-zimagez.c:692
+#: ../lib/screenshooter-zimagez.c:734
 msgid "User:"
 msgstr "Erabiltzailea:"
 
-#: ../lib/screenshooter-zimagez.c:703
+#: ../lib/screenshooter-zimagez.c:745
 msgid ""
 "Your Zimagez user name, if you do not have one yet please create one on the "
 "Web page linked above"
@@ -269,20 +265,20 @@ msgstr ""
 "goiko loturako webgunean"
 
 #. Create the password label
-#: ../lib/screenshooter-zimagez.c:708
+#: ../lib/screenshooter-zimagez.c:751
 msgid "Password:"
 msgstr "Pasahitza:"
 
-#: ../lib/screenshooter-zimagez.c:718
+#: ../lib/screenshooter-zimagez.c:761
 msgid "The password for the user above"
 msgstr "Aurreko erabiltzailearen pasahitza"
 
 #. Create the title label
-#: ../lib/screenshooter-zimagez.c:723
+#: ../lib/screenshooter-zimagez.c:767
 msgid "Title:"
 msgstr "Izenburua:"
 
-#: ../lib/screenshooter-zimagez.c:733
+#: ../lib/screenshooter-zimagez.c:777
 msgid ""
 "The title of the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
@@ -291,11 +287,11 @@ msgstr ""
 "bistaratzean."
 
 #. Create the comment label
-#: ../lib/screenshooter-zimagez.c:738
+#: ../lib/screenshooter-zimagez.c:783
 msgid "Comment:"
 msgstr "Iruzkina:"
 
-#: ../lib/screenshooter-zimagez.c:749
+#: ../lib/screenshooter-zimagez.c:794
 msgid ""
 "A comment on the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
@@ -303,30 +299,30 @@ msgstr ""
 "Pantaila argazkiaren iruzkina, berau erabiliko da irudia ZimageZ-en "
 "bistaratzean."
 
-#: ../lib/screenshooter-zimagez.c:870
+#: ../lib/screenshooter-zimagez.c:917
 #, c-format
 msgid "<a href=\"%s\">Full size image</a>"
 msgstr "<a href=\"%s\">Tamaina osoko irudia</a>"
 
-#: ../lib/screenshooter-zimagez.c:872
+#: ../lib/screenshooter-zimagez.c:919
 #, c-format
 msgid "<a href=\"%s\">Large thumbnail</a>"
 msgstr "<a href=\"%s\">Argazkitxo handia</a>"
 
-#: ../lib/screenshooter-zimagez.c:874
+#: ../lib/screenshooter-zimagez.c:921
 #, c-format
 msgid "<a href=\"%s\">Small thumbnail</a>"
 msgstr "<a href=\"%s\">Argazkitxo txikia</a>"
 
-#: ../lib/screenshooter-zimagez.c:894
+#: ../lib/screenshooter-zimagez.c:937
 msgid "My screenshot on ZimageZ"
 msgstr "Nire pantaila-argazkia ZimageZ-en"
 
-#: ../lib/screenshooter-zimagez.c:920
+#: ../lib/screenshooter-zimagez.c:963
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Links</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Loturak</span>"
 
-#: ../lib/screenshooter-zimagez.c:965
+#: ../lib/screenshooter-zimagez.c:1008
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing "
 "to the full size image</span>"
@@ -335,20 +331,20 @@ msgstr ""
 "to the full size image</span>"
 
 #. HTML title
-#: ../lib/screenshooter-zimagez.c:981
+#: ../lib/screenshooter-zimagez.c:1024
 msgid "HTML"
 msgstr "HTML"
 
 #. BB title
-#: ../lib/screenshooter-zimagez.c:1002
+#: ../lib/screenshooter-zimagez.c:1045
 msgid "BBCode for forums"
 msgstr "Foroetarako BBCode"
 
-#: ../lib/screenshooter-zimagez.c:1122
+#: ../lib/screenshooter-zimagez.c:1174
 msgid "ZimageZ"
 msgstr "ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:1155
+#: ../lib/screenshooter-zimagez.c:1207
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Status</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Egoera</span>"
 
@@ -362,44 +358,99 @@ msgstr "_Ireki lotura"
 msgid "Copy _Link Address"
 msgstr "Kopiatu _lotura helbidea"
 
-#: ../src/main.c:53
+#: ../src/main.c:48
 msgid "Delay in seconds before taking the screenshot"
 msgstr "Pantaila-argazkia ateratzeko atzerapena segundutan"
 
-#: ../src/main.c:63
-msgid "Do not display the save dialog"
-msgstr "Ez erakutsi gordetze elkarrizketa"
-
-#: ../src/main.c:68
-msgid "Do not display the mouse on the screenshot"
+#: ../src/main.c:58
+#, fuzzy
+msgid "Display the mouse on the screenshot"
 msgstr "Ez erakutsi sagua pantaila-argazkian"
 
-#: ../src/main.c:85
+#: ../src/main.c:75
 msgid "Directory where the screenshot will be saved"
 msgstr "Pantaila-argazkia gordeko den direktorioan"
 
-#: ../src/main.c:99
+#: ../src/main.c:85
 msgid "Version information"
 msgstr "Bertsio argibideak"
 
+#: ../src/main.c:134
+#, c-format
+msgid "Conflicting options: --%s and --%s cannot be used at the same time.\n"
+msgstr ""
+
 #: ../src/main.c:136
 #, c-format
 msgid ""
+"The --%s option is only used when --fullscreen, --window or --region is "
+"given. It will be ignored.\n"
+msgstr ""
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
 "%s: %s\n"
 "Erabili %s --help komando-lerroko komando erabilgarriak ikusteko.\n"
 
-#: ../src/main.c:235
+#: ../src/main.c:282
 #, c-format
 msgid "%s is not a valid directory, the default directory will be used."
 msgstr "%s ez baliozko direktorio bat, lehenetsitako direktorioa erabiliko da."
 
 #: ../src/xfce4-screenshooter.desktop.in.in.h:2
 #: ../panel-plugin/screenshooter.desktop.in.in.h:2
-msgid "Take screenshots of the entire screen, of the active window or of a region"
+msgid ""
+"Take screenshots of the entire screen, of the active window or of a region"
 msgstr ""
 "Panataila osoaren, aktibo dagoen leihoaren edo panatailaren eremu baten  "
 "pantaila-argazki bat egin"
 
+#~ msgid "Screenshot.png"
+#~ msgstr "Pantaila-argazkia.png"
+
+#~ msgid "Screenshot-%d.png"
+#~ msgstr "Pantaila-argazkia-%d.png"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">Kapturatu ondoren</span>"
+
+#~ msgid "Show the save dialog"
+#~ msgstr "Erakutsi gordetze elkarrizketa"
+
+#~ msgid ""
+#~ "The save dialog allows you to change the file name and the save location"
+#~ msgstr ""
+#~ "Gordetze leihoan fitxategi izena eta gordetze kokapena aldatu ditzakezu"
+
+#~ msgid "Close the application"
+#~ msgstr "Itxi aplikazioa:"
+
+#~ msgid ""
+#~ "If unchecked, the current window will be displayed again after the "
+#~ "screenshot has been taken to allow you to take several screenshots in a "
+#~ "row"
+#~ msgstr ""
+#~ "Hautaturik ez badago, leihoa hau bistaraziko da berriz pantaila-argazkia "
+#~ "atera ondoren zuri pantaila-argazki anitz ateratzeko aukera emateko"
+
+#~ msgid "Default save location"
+#~ msgstr "Lehenetsitako gordetze kokapena"
+
+#~ msgid "Set the default save location"
+#~ msgstr "Ezarri lehenetsitako gordetze kokapena"
+
+#~ msgid ""
+#~ "An error occurred during the XML exchange: %s (%d).\n"
+#~ " The screenshot could not be uploaded."
+#~ msgstr ""
+#~ "Errore bat gertatu da XML trukatzean; %s (%d).\n"
+#~ " Pantaila-argazkia ezin izan da igo."
+
+#~ msgid "Do not display the save dialog"
+#~ msgstr "Ez erakutsi gordetze elkarrizketa"
diff --git a/po/fi.po b/po/fi.po
index 4b12631..88d841a 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-screenshooter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-31 14:02+0200\n"
+"POT-Creation-Date: 2009-11-15 00:29+0100\n"
 "PO-Revision-Date: 2009-03-28 22:12+0200\n"
 "Last-Translator: Jari Rahkonen <jari.rahkonen at pp1.inet.fi>\n"
 "Language-Team: Finnish\n"
@@ -16,26 +16,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/screenshooter-dialogs.c:283
-#, fuzzy
-msgid "Screenshot.png"
-msgstr "Kuvakaappaus.png"
-
-#: ../lib/screenshooter-dialogs.c:300
-#, c-format
-msgid "Screenshot-%d.png"
-msgstr "Kuvakaappaus-%d.png"
-
-#: ../lib/screenshooter-dialogs.c:493
+#: ../lib/screenshooter-dialogs.c:478
 #, c-format
 msgid "%.2fKb of %.2fKb"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:577
+#: ../lib/screenshooter-dialogs.c:560
 msgid "Transfer"
 msgstr "Siirto"
 
-#: ../lib/screenshooter-dialogs.c:600
+#: ../lib/screenshooter-dialogs.c:581
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being "
 "transferred to:</span>"
@@ -43,48 +33,50 @@ msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Kuvakaappausta siirretään "
 "kohteeseen:</span>"
 
-#: ../lib/screenshooter-dialogs.c:724 ../lib/screenshooter-dialogs.c:741
+#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
 msgid "Screenshot"
 msgstr "Kuvakaappaus"
 
-#: ../lib/screenshooter-dialogs.c:736
+#: ../lib/screenshooter-dialogs.c:709
 msgid "Take a screenshot"
 msgstr "Kaappaa kuva"
 
-#: ../lib/screenshooter-dialogs.c:751
+#: ../lib/screenshooter-dialogs.c:724
 msgid "Preferences"
 msgstr "Asetukset"
 
-#: ../lib/screenshooter-dialogs.c:793
+#: ../lib/screenshooter-dialogs.c:754
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Region to capture</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Kaapattava alue</span>"
 
-#: ../lib/screenshooter-dialogs.c:820
+#: ../lib/screenshooter-dialogs.c:774
 msgid "Entire screen"
 msgstr "Koko näyttö"
 
-#: ../lib/screenshooter-dialogs.c:830 ../src/main.c:58
-#: ../panel-plugin/screenshooter-plugin.c:292
+#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../panel-plugin/screenshooter-plugin.c:308
 msgid "Take a screenshot of the entire screen"
 msgstr "Kaappaa kuva koko näytöstä"
 
-#: ../lib/screenshooter-dialogs.c:841
+#: ../lib/screenshooter-dialogs.c:789
 msgid "Active window"
 msgstr "Aktiivinen ikkuna"
 
-#: ../lib/screenshooter-dialogs.c:851 ../src/main.c:104
-#: ../panel-plugin/screenshooter-plugin.c:297
+#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr "Kaappaa kuva aktiivisesta ikkunasta"
 
-#: ../lib/screenshooter-dialogs.c:862
+#: ../lib/screenshooter-dialogs.c:804
 msgid "Select a region"
 msgstr "Valitse alue"
 
-#: ../lib/screenshooter-dialogs.c:872 ../src/main.c:78
-#: ../panel-plugin/screenshooter-plugin.c:302
+#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../panel-plugin/screenshooter-plugin.c:318
 msgid ""
 "Select a region to be captured by clicking a point of the screen without "
 "releasing the mouse button, dragging your mouse to the other corner of the "
@@ -93,145 +85,139 @@ msgstr ""
 "Aseta hiiren osoitin kaapattavan alueen kulmaan, paina hiiren vasen painike "
 "pohjaan, siirrä osoitin alueen vastakkaiseen kulmaan ja päästä painike ylös."
 
-#: ../lib/screenshooter-dialogs.c:884
+#: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
 msgstr "Sisällytä hiiren osoitin"
 
-#: ../lib/screenshooter-dialogs.c:892
+#: ../lib/screenshooter-dialogs.c:824
 #, fuzzy
 msgid "Display the mouse pointer on the screenshot"
 msgstr "Älä sisällytä hiiren osoitinta kuvakaappaukseen"
 
-#: ../lib/screenshooter-dialogs.c:917
+#: ../lib/screenshooter-dialogs.c:840
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Kaappausviive</span>"
 
-#: ../lib/screenshooter-dialogs.c:952
+#: ../lib/screenshooter-dialogs.c:862
 msgid "Delay in seconds before the screenshot is taken"
 msgstr "Aika sekunteina ennen kuvakaappauksen ottamista"
 
-#: ../lib/screenshooter-dialogs.c:958
+#: ../lib/screenshooter-dialogs.c:865
 msgid "seconds"
 msgstr "sekuntia"
 
-#: ../lib/screenshooter-dialogs.c:984
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Lopuksi</span>"
-
-#. Display the save dialog checkbox
-#: ../lib/screenshooter-dialogs.c:1007
-msgid "Show the save dialog"
-msgstr "Näytä tallennusdialogi"
-
-#: ../lib/screenshooter-dialogs.c:1013
-msgid ""
-"The save dialog allows you to change the file name and the save location"
-msgstr "Tallennusdialogissa voit vaihtaa tiedostonimeä ja tallennuskansiota"
-
-#: ../lib/screenshooter-dialogs.c:1027
-msgid "Close the application"
-msgstr "Sulje sovellus"
-
-#: ../lib/screenshooter-dialogs.c:1033
-msgid ""
-"If unchecked, the current window will be displayed again after the "
-"screenshot has been taken to allow you to take several screenshots in a row"
+#: ../lib/screenshooter-dialogs.c:917
+msgid "Action"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1056
+#: ../lib/screenshooter-dialogs.c:945
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Action</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Tehtävä</span>"
 
 #. Save option radio button
-#: ../lib/screenshooter-dialogs.c:1081
-msgid "Save in:"
+#: ../lib/screenshooter-dialogs.c:961
+#, fuzzy
+msgid "Save"
 msgstr "Tallennuskansio:"
 
-#: ../lib/screenshooter-dialogs.c:1089
+#: ../lib/screenshooter-dialogs.c:966
 msgid "Save the screenshot to a PNG file"
 msgstr "Tallenna kaappaus PNG-tiedostoon"
 
-#: ../lib/screenshooter-dialogs.c:1104
-msgid "Default save location"
-msgstr "Oletustallennuskansio"
-
-#: ../lib/screenshooter-dialogs.c:1114
-msgid "Set the default save location"
-msgstr "Valitse oletustallennuskansio"
-
-#: ../lib/screenshooter-dialogs.c:1127
+#: ../lib/screenshooter-dialogs.c:975
 msgid "Copy to the clipboard"
 msgstr "Kopioi leikepöydälle"
 
-#: ../lib/screenshooter-dialogs.c:1132
+#: ../lib/screenshooter-dialogs.c:977
 msgid "Copy the screenshot to the clipboard so that it can be pasted later"
 msgstr ""
 "Kopioi kuvakaappaus leikepöydälle, josta voit liittää sen haluamaasi "
 "sovellukseen"
 
-#: ../lib/screenshooter-dialogs.c:1147
+#: ../lib/screenshooter-dialogs.c:994
 msgid "Open with:"
 msgstr "Avaa sovelluksessa:"
 
-#: ../lib/screenshooter-dialogs.c:1158
+#: ../lib/screenshooter-dialogs.c:1000
 msgid "Open the screenshot with the chosen application"
 msgstr "Avaa kuvakaappaus valitussa sovelluksessa"
 
-#: ../lib/screenshooter-dialogs.c:1191 ../src/main.c:73
+#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
 msgid "Application to open the screenshot"
 msgstr "Sovellus, jolla kaappaus avataan"
 
-#: ../lib/screenshooter-dialogs.c:1204
+#: ../lib/screenshooter-dialogs.c:1028
 msgid "Host on ZimageZ"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1210 ../src/main.c:92
+#: ../lib/screenshooter-dialogs.c:1032 ../src/main.c:80
 msgid "Host the screenshot on ZimageZ, a free online image hosting service"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1255
+#: ../lib/screenshooter-dialogs.c:1046
+#, fuzzy
+msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Preview</span>"
+msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Tehtävä</span>"
+
+#: ../lib/screenshooter-dialogs.c:1107
 msgid "Save screenshot as..."
 msgstr "Tallenna kaappaus nimellä..."
 
-#. Start the user XML RPC session
-#: ../lib/screenshooter-zimagez.c:159
-msgid "Initialize the connection..."
+#: ../lib/screenshooter-zimagez.c:134
+#, c-format
+msgid "An error occured when creating the XMLRPC request."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:172 ../lib/screenshooter-zimagez.c:332
-#: ../lib/screenshooter-zimagez.c:361 ../lib/screenshooter-zimagez.c:389
-#: ../lib/screenshooter-zimagez.c:520 ../lib/screenshooter-zimagez.c:543
-#: ../lib/screenshooter-zimagez.c:580
+#: ../lib/screenshooter-zimagez.c:153
 #, c-format
-msgid ""
-"An error occurred during the XML exchange: %s (%d).\n"
-" The screenshot could not be uploaded."
+msgid "An error occured when transfering the data to ZimageZ."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:223
+#: ../lib/screenshooter-zimagez.c:178
+#, c-format
+msgid "An error occured when parsing the response from ZimageZ."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:228
+#, c-format
+msgid "Taken on %s, at %s"
+msgstr ""
+
+#. Start the user soup session
+#: ../lib/screenshooter-zimagez.c:295
+msgid "Initialize the connection..."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:341
 msgid ""
 "Please file the following fields with your <a href=\"http://www.zimagez.com"
 "\">ZimageZ</a> \n"
 "user name, passsword and details about the screenshot."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:283
+#: ../lib/screenshooter-zimagez.c:398
 msgid "Check the user information..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:305
+#: ../lib/screenshooter-zimagez.c:405
 #, fuzzy
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You "
 "must fill all the fields.</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Kaapattava alue</span>"
 
-#: ../lib/screenshooter-zimagez.c:320
+#: ../lib/screenshooter-zimagez.c:419
 msgid "Login on ZimageZ..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:436
+#: ../lib/screenshooter-zimagez.c:459 ../lib/screenshooter-zimagez.c:610
+msgid ""
+"An unexpected reply from ZimageZ was received. The upload of the screenshot "
+"failed."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:498
 #, fuzzy
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The "
@@ -240,94 +226,94 @@ msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Kuvakaappausta siirretään "
 "kohteeseen:</span>"
 
-#: ../lib/screenshooter-zimagez.c:501
+#: ../lib/screenshooter-zimagez.c:556
 #, fuzzy
 msgid "Upload the screenshot..."
 msgstr "Kaappaa kuva"
 
-#: ../lib/screenshooter-zimagez.c:559
+#: ../lib/screenshooter-zimagez.c:589
 #, c-format
 msgid "An error occurred while uploading the screenshot."
 msgstr ""
 
 #. End the user session
-#: ../lib/screenshooter-zimagez.c:597
+#: ../lib/screenshooter-zimagez.c:622
 msgid "Close the session on ZimageZ..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:650
+#: ../lib/screenshooter-zimagez.c:692
 #, fuzzy
 msgid "Details about the screenshot for ZimageZ"
 msgstr "Aika sekunteina ennen kuvakaappauksen ottamista"
 
 #. Create the user label
-#: ../lib/screenshooter-zimagez.c:692
+#: ../lib/screenshooter-zimagez.c:734
 msgid "User:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:703
+#: ../lib/screenshooter-zimagez.c:745
 msgid ""
 "Your Zimagez user name, if you do not have one yet please create one on the "
 "Web page linked above"
 msgstr ""
 
 #. Create the password label
-#: ../lib/screenshooter-zimagez.c:708
+#: ../lib/screenshooter-zimagez.c:751
 msgid "Password:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:718
+#: ../lib/screenshooter-zimagez.c:761
 msgid "The password for the user above"
 msgstr ""
 
 #. Create the title label
-#: ../lib/screenshooter-zimagez.c:723
+#: ../lib/screenshooter-zimagez.c:767
 msgid "Title:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:733
+#: ../lib/screenshooter-zimagez.c:777
 msgid ""
 "The title of the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
 msgstr ""
 
 #. Create the comment label
-#: ../lib/screenshooter-zimagez.c:738
+#: ../lib/screenshooter-zimagez.c:783
 msgid "Comment:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:749
+#: ../lib/screenshooter-zimagez.c:794
 msgid ""
 "A comment on the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:870
+#: ../lib/screenshooter-zimagez.c:917
 #, c-format
 msgid "<a href=\"%s\">Full size image</a>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:872
+#: ../lib/screenshooter-zimagez.c:919
 #, c-format
 msgid "<a href=\"%s\">Large thumbnail</a>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:874
+#: ../lib/screenshooter-zimagez.c:921
 #, c-format
 msgid "<a href=\"%s\">Small thumbnail</a>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:894
+#: ../lib/screenshooter-zimagez.c:937
 #, fuzzy
 msgid "My screenshot on ZimageZ"
 msgstr "Aika sekunteina ennen kuvakaappauksen ottamista"
 
-#: ../lib/screenshooter-zimagez.c:920
+#: ../lib/screenshooter-zimagez.c:963
 #, fuzzy
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Links</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Tehtävä</span>"
 
-#: ../lib/screenshooter-zimagez.c:965
+#: ../lib/screenshooter-zimagez.c:1008
 #, fuzzy
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing "
@@ -337,20 +323,20 @@ msgstr ""
 "ottamista</span>"
 
 #. HTML title
-#: ../lib/screenshooter-zimagez.c:981
+#: ../lib/screenshooter-zimagez.c:1024
 msgid "HTML"
 msgstr ""
 
 #. BB title
-#: ../lib/screenshooter-zimagez.c:1002
+#: ../lib/screenshooter-zimagez.c:1045
 msgid "BBCode for forums"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:1122
+#: ../lib/screenshooter-zimagez.c:1174
 msgid "ZimageZ"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:1155
+#: ../lib/screenshooter-zimagez.c:1207
 #, fuzzy
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Status</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Tehtävä</span>"
@@ -366,36 +352,45 @@ msgstr "Avaa sovelluksessa:"
 msgid "Copy _Link Address"
 msgstr ""
 
-#: ../src/main.c:53
+#: ../src/main.c:48
 msgid "Delay in seconds before taking the screenshot"
 msgstr "Aika sekunteina ennen kuvakaappauksen ottamista"
 
-#: ../src/main.c:63
-msgid "Do not display the save dialog"
-msgstr "Älä näytä tallennusdialogia"
-
-#: ../src/main.c:68
-msgid "Do not display the mouse on the screenshot"
+#: ../src/main.c:58
+#, fuzzy
+msgid "Display the mouse on the screenshot"
 msgstr "Älä sisällytä hiiren osoitinta kuvakaappaukseen"
 
-#: ../src/main.c:85
+#: ../src/main.c:75
 msgid "Directory where the screenshot will be saved"
 msgstr "Kansio, johon kuvakaappaus tallennetaan"
 
-#: ../src/main.c:99
+#: ../src/main.c:85
 msgid "Version information"
 msgstr "Versiotiedot"
 
+#: ../src/main.c:134
+#, c-format
+msgid "Conflicting options: --%s and --%s cannot be used at the same time.\n"
+msgstr ""
+
 #: ../src/main.c:136
 #, c-format
 msgid ""
+"The --%s option is only used when --fullscreen, --window or --region is "
+"given. It will be ignored.\n"
+msgstr ""
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
 "%s: %s\n"
 "Näet kaikki komentorivivalitsimet kirjoittamalla %s --help.\n"
 
-#: ../src/main.c:235
+#: ../src/main.c:282
 #, c-format
 msgid "%s is not a valid directory, the default directory will be used."
 msgstr "%s ei ole kelvollinen kansio, joten käytetään oletuskansiota."
@@ -408,6 +403,36 @@ msgstr ""
 "Kaappaa kuvia koko näytöstä, aktiivisesta ikkunasta tai näytön alueesta"
 
 #, fuzzy
+#~ msgid "Screenshot.png"
+#~ msgstr "Kuvakaappaus.png"
+
+#~ msgid "Screenshot-%d.png"
+#~ msgstr "Kuvakaappaus-%d.png"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
+#~ msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Lopuksi</span>"
+
+#~ msgid "Show the save dialog"
+#~ msgstr "Näytä tallennusdialogi"
+
+#~ msgid ""
+#~ "The save dialog allows you to change the file name and the save location"
+#~ msgstr "Tallennusdialogissa voit vaihtaa tiedostonimeä ja tallennuskansiota"
+
+#~ msgid "Close the application"
+#~ msgstr "Sulje sovellus"
+
+#~ msgid "Default save location"
+#~ msgstr "Oletustallennuskansio"
+
+#~ msgid "Set the default save location"
+#~ msgstr "Valitse oletustallennuskansio"
+
+#~ msgid "Do not display the save dialog"
+#~ msgstr "Älä näytä tallennusdialogia"
+
+#, fuzzy
 #~ msgid "Tak a screenshot of the entire screen"
 #~ msgstr "Kaappaa kuva koko näytöstä"
 
diff --git a/po/fr.po b/po/fr.po
index 8893bf3..295fa9e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-screenshooter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-31 14:02+0200\n"
+"POT-Creation-Date: 2009-11-15 00:29+0100\n"
 "PO-Revision-Date: 2009-05-24 16:42+0200\n"
 "Last-Translator: Jérôme Guelfucci <jeromeg at xfce.org>\n"
 "Language-Team: French <xfce-i18n at xfce.org>\n"
@@ -15,25 +15,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/screenshooter-dialogs.c:283
-msgid "Screenshot.png"
-msgstr "Capture.png"
-
-#: ../lib/screenshooter-dialogs.c:300
-#, c-format
-msgid "Screenshot-%d.png"
-msgstr "Capture-%d.png"
-
-#: ../lib/screenshooter-dialogs.c:493
+#: ../lib/screenshooter-dialogs.c:478
 #, c-format
 msgid "%.2fKb of %.2fKb"
 msgstr "%.2fKb de %.2fKb"
 
-#: ../lib/screenshooter-dialogs.c:577
+#: ../lib/screenshooter-dialogs.c:560
 msgid "Transfer"
 msgstr "Transfert"
 
-#: ../lib/screenshooter-dialogs.c:600
+#: ../lib/screenshooter-dialogs.c:581
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being "
 "transferred to:</span>"
@@ -41,48 +32,50 @@ msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">La capture d'écran est "
 "transferée vers : </span>"
 
-#: ../lib/screenshooter-dialogs.c:724 ../lib/screenshooter-dialogs.c:741
+#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
 msgid "Screenshot"
 msgstr "Capture d'écran"
 
-#: ../lib/screenshooter-dialogs.c:736
+#: ../lib/screenshooter-dialogs.c:709
 msgid "Take a screenshot"
 msgstr "Prendre une capture d'écran"
 
-#: ../lib/screenshooter-dialogs.c:751
+#: ../lib/screenshooter-dialogs.c:724
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../lib/screenshooter-dialogs.c:793
+#: ../lib/screenshooter-dialogs.c:754
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Region to capture</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Zone à capturer</span>"
 
-#: ../lib/screenshooter-dialogs.c:820
+#: ../lib/screenshooter-dialogs.c:774
 msgid "Entire screen"
 msgstr "L'écran tout entier"
 
-#: ../lib/screenshooter-dialogs.c:830 ../src/main.c:58
-#: ../panel-plugin/screenshooter-plugin.c:292
+#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../panel-plugin/screenshooter-plugin.c:308
 msgid "Take a screenshot of the entire screen"
 msgstr "Prendre une capture d'écran de l'écran tout entier"
 
-#: ../lib/screenshooter-dialogs.c:841
+#: ../lib/screenshooter-dialogs.c:789
 msgid "Active window"
 msgstr "La fenêtre active"
 
-#: ../lib/screenshooter-dialogs.c:851 ../src/main.c:104
-#: ../panel-plugin/screenshooter-plugin.c:297
+#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr "Prendre une capture d'écran de la fenêtre active"
 
-#: ../lib/screenshooter-dialogs.c:862
+#: ../lib/screenshooter-dialogs.c:804
 msgid "Select a region"
 msgstr "Sélectionner une zone"
 
-#: ../lib/screenshooter-dialogs.c:872 ../src/main.c:78
-#: ../panel-plugin/screenshooter-plugin.c:302
+#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../panel-plugin/screenshooter-plugin.c:318
 msgid ""
 "Select a region to be captured by clicking a point of the screen without "
 "releasing the mouse button, dragging your mouse to the other corner of the "
@@ -92,131 +85,115 @@ msgstr ""
 "relacher le bouton de la souris, puis en déplaçant votre souris jusqu'à "
 "l'autre coin de la zone, et en relachant le bouton de la souris."
 
-#: ../lib/screenshooter-dialogs.c:884
+#: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
 msgstr "Inclure le pointeur de la souris"
 
-#: ../lib/screenshooter-dialogs.c:892
+#: ../lib/screenshooter-dialogs.c:824
 msgid "Display the mouse pointer on the screenshot"
 msgstr "Afficher la souris sur la capture d'écran"
 
-#: ../lib/screenshooter-dialogs.c:917
+#: ../lib/screenshooter-dialogs.c:840
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
 msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Délai avant la capture</span>"
 
-#: ../lib/screenshooter-dialogs.c:952
+#: ../lib/screenshooter-dialogs.c:862
 msgid "Delay in seconds before the screenshot is taken"
 msgstr "Délai en secondes avant que la capture d'écran ne soit prise"
 
-#: ../lib/screenshooter-dialogs.c:958
+#: ../lib/screenshooter-dialogs.c:865
 msgid "seconds"
 msgstr "secondes"
 
-#: ../lib/screenshooter-dialogs.c:984
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
-msgstr ""
-"<span weight=\"bold\" stretch=\"semiexpanded\">Après la capture </span>"
-
-#. Display the save dialog checkbox
-#: ../lib/screenshooter-dialogs.c:1007
-msgid "Show the save dialog"
-msgstr "Afficher la fenêtre de sauvegarde"
-
-#: ../lib/screenshooter-dialogs.c:1013
-msgid ""
-"The save dialog allows you to change the file name and the save location"
-msgstr ""
-"La fenêtre de sauvegarde vous permet de changer le nom du fichier et "
-"l'emplacement de sauvegarde"
-
-#: ../lib/screenshooter-dialogs.c:1027
-msgid "Close the application"
-msgstr "Fermer l'application"
-
-#: ../lib/screenshooter-dialogs.c:1033
-msgid ""
-"If unchecked, the current window will be displayed again after the "
-"screenshot has been taken to allow you to take several screenshots in a row"
+#: ../lib/screenshooter-dialogs.c:917
+msgid "Action"
 msgstr ""
-"Si décoché, la fenêtre actuelle sera affichée à nouveau après la prise de la "
-"capture d'écran ce qui permet de prendre plusieurs captures à la suite."
 
-#: ../lib/screenshooter-dialogs.c:1056
+#: ../lib/screenshooter-dialogs.c:945
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Action</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Action</span>"
 
 #. Save option radio button
-#: ../lib/screenshooter-dialogs.c:1081
-msgid "Save in:"
+#: ../lib/screenshooter-dialogs.c:961
+#, fuzzy
+msgid "Save"
 msgstr "Sauvegarder dans :"
 
-#: ../lib/screenshooter-dialogs.c:1089
+#: ../lib/screenshooter-dialogs.c:966
 msgid "Save the screenshot to a PNG file"
 msgstr "Sauvegarder la capture d'écran dans un fichier PNG"
 
-#: ../lib/screenshooter-dialogs.c:1104
-msgid "Default save location"
-msgstr "Emplacement de sauvegarde par défaut"
-
-#: ../lib/screenshooter-dialogs.c:1114
-msgid "Set the default save location"
-msgstr "Choisir l'emplacement de sauvegarde par défaut"
-
-#: ../lib/screenshooter-dialogs.c:1127
+#: ../lib/screenshooter-dialogs.c:975
 msgid "Copy to the clipboard"
 msgstr "Copier dans le presse papier"
 
-#: ../lib/screenshooter-dialogs.c:1132
+#: ../lib/screenshooter-dialogs.c:977
 msgid "Copy the screenshot to the clipboard so that it can be pasted later"
 msgstr ""
 "Copier la capture d'écran dans le presse papier pour la coller plus tard"
 
-#: ../lib/screenshooter-dialogs.c:1147
+#: ../lib/screenshooter-dialogs.c:994
 msgid "Open with:"
 msgstr "Ouvrir avec:"
 
-#: ../lib/screenshooter-dialogs.c:1158
+#: ../lib/screenshooter-dialogs.c:1000
 msgid "Open the screenshot with the chosen application"
 msgstr "Ouvrir la capture d'écran avec l'application choisie"
 
-#: ../lib/screenshooter-dialogs.c:1191 ../src/main.c:73
+#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
 msgid "Application to open the screenshot"
 msgstr "Application pour ouvrir la capture d'écran"
 
-#: ../lib/screenshooter-dialogs.c:1204
+#: ../lib/screenshooter-dialogs.c:1028
 msgid "Host on ZimageZ"
 msgstr "Héberger sur ZimageZ"
 
-#: ../lib/screenshooter-dialogs.c:1210 ../src/main.c:92
+#: ../lib/screenshooter-dialogs.c:1032 ../src/main.c:80
 msgid "Host the screenshot on ZimageZ, a free online image hosting service"
 msgstr ""
 "Héberger la capture d'écran sur ZimageZ, un service en ligne gratuit "
 "d'hébergement d'images"
 
-#: ../lib/screenshooter-dialogs.c:1255
+#: ../lib/screenshooter-dialogs.c:1046
+#, fuzzy
+msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Preview</span>"
+msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Liens</span>"
+
+#: ../lib/screenshooter-dialogs.c:1107
 msgid "Save screenshot as..."
 msgstr "Enregistrer la capture d'écran sous..."
 
-#. Start the user XML RPC session
-#: ../lib/screenshooter-zimagez.c:159
-msgid "Initialize the connection..."
-msgstr "Initialisation de la connexion..."
+#: ../lib/screenshooter-zimagez.c:134
+#, fuzzy, c-format
+msgid "An error occured when creating the XMLRPC request."
+msgstr ""
+"Une erreur est survenue lors de la mise en ligne de la capture d'écran."
 
-#: ../lib/screenshooter-zimagez.c:172 ../lib/screenshooter-zimagez.c:332
-#: ../lib/screenshooter-zimagez.c:361 ../lib/screenshooter-zimagez.c:389
-#: ../lib/screenshooter-zimagez.c:520 ../lib/screenshooter-zimagez.c:543
-#: ../lib/screenshooter-zimagez.c:580
+#: ../lib/screenshooter-zimagez.c:153
+#, fuzzy, c-format
+msgid "An error occured when transfering the data to ZimageZ."
+msgstr ""
+"Une erreur est survenue lors de la mise en ligne de la capture d'écran."
+
+#: ../lib/screenshooter-zimagez.c:178
+#, fuzzy, c-format
+msgid "An error occured when parsing the response from ZimageZ."
+msgstr ""
+"Une erreur est survenue lors de la mise en ligne de la capture d'écran."
+
+#: ../lib/screenshooter-zimagez.c:228
 #, c-format
-msgid ""
-"An error occurred during the XML exchange: %s (%d).\n"
-" The screenshot could not be uploaded."
+msgid "Taken on %s, at %s"
 msgstr ""
-"Une erreur est survenue pendant l'échange XML: %s (%d).\n"
-" La capture d'écran n'a pas pu être mise en ligne."
 
-#: ../lib/screenshooter-zimagez.c:223
+#. Start the user soup session
+#: ../lib/screenshooter-zimagez.c:295
+msgid "Initialize the connection..."
+msgstr "Initialisation de la connexion..."
+
+#: ../lib/screenshooter-zimagez.c:341
 msgid ""
 "Please file the following fields with your <a href=\"http://www.zimagez.com"
 "\">ZimageZ</a> \n"
@@ -226,11 +203,11 @@ msgstr ""
 "<a href=\"http://www.zimagez.com\">ZimageZ</a>, votre mot de passe et les "
 "informations sur la capture d'écran."
 
-#: ../lib/screenshooter-zimagez.c:283
+#: ../lib/screenshooter-zimagez.c:398
 msgid "Check the user information..."
 msgstr "Vérification des informations de l'utilisateur..."
 
-#: ../lib/screenshooter-zimagez.c:305
+#: ../lib/screenshooter-zimagez.c:405
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You "
 "must fill all the fields.</span>"
@@ -238,11 +215,17 @@ msgstr ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">Vous "
 "devez remplir tous les champs.</span>"
 
-#: ../lib/screenshooter-zimagez.c:320
+#: ../lib/screenshooter-zimagez.c:419
 msgid "Login on ZimageZ..."
 msgstr "Identification sur ZimageZ..."
 
-#: ../lib/screenshooter-zimagez.c:436
+#: ../lib/screenshooter-zimagez.c:459 ../lib/screenshooter-zimagez.c:610
+msgid ""
+"An unexpected reply from ZimageZ was received. The upload of the screenshot "
+"failed."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:498
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The "
 "user and the password you entered do not match. Please retry.</span>"
@@ -251,31 +234,31 @@ msgstr ""
 "utilisateur et le mot de passe entrés ne correspondent pas. Merci de "
 "réessayer.</span>"
 
-#: ../lib/screenshooter-zimagez.c:501
+#: ../lib/screenshooter-zimagez.c:556
 msgid "Upload the screenshot..."
 msgstr "Mise en ligne de la capture d'écran..."
 
-#: ../lib/screenshooter-zimagez.c:559
+#: ../lib/screenshooter-zimagez.c:589
 #, c-format
 msgid "An error occurred while uploading the screenshot."
 msgstr ""
 "Une erreur est survenue lors de la mise en ligne de la capture d'écran."
 
 #. End the user session
-#: ../lib/screenshooter-zimagez.c:597
+#: ../lib/screenshooter-zimagez.c:622
 msgid "Close the session on ZimageZ..."
 msgstr "Fermeture de la session sur ZimageZ..."
 
-#: ../lib/screenshooter-zimagez.c:650
+#: ../lib/screenshooter-zimagez.c:692
 msgid "Details about the screenshot for ZimageZ"
 msgstr "Information sur la capture d'écran pour ZimageZ"
 
 #. Create the user label
-#: ../lib/screenshooter-zimagez.c:692
+#: ../lib/screenshooter-zimagez.c:734
 msgid "User:"
 msgstr "Utilisateur :"
 
-#: ../lib/screenshooter-zimagez.c:703
+#: ../lib/screenshooter-zimagez.c:745
 msgid ""
 "Your Zimagez user name, if you do not have one yet please create one on the "
 "Web page linked above"
@@ -284,20 +267,20 @@ msgstr ""
 "cliquant sur le lien ci-dessus"
 
 #. Create the password label
-#: ../lib/screenshooter-zimagez.c:708
+#: ../lib/screenshooter-zimagez.c:751
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: ../lib/screenshooter-zimagez.c:718
+#: ../lib/screenshooter-zimagez.c:761
 msgid "The password for the user above"
 msgstr "Le mot de passe pour l'utilisateur ci-dessus"
 
 #. Create the title label
-#: ../lib/screenshooter-zimagez.c:723
+#: ../lib/screenshooter-zimagez.c:767
 msgid "Title:"
 msgstr "Titre :"
 
-#: ../lib/screenshooter-zimagez.c:733
+#: ../lib/screenshooter-zimagez.c:777
 msgid ""
 "The title of the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
@@ -306,40 +289,40 @@ msgstr ""
 "capture  d'écran"
 
 #. Create the comment label
-#: ../lib/screenshooter-zimagez.c:738
+#: ../lib/screenshooter-zimagez.c:783
 msgid "Comment:"
 msgstr "Commentaire :"
 
-#: ../lib/screenshooter-zimagez.c:749
+#: ../lib/screenshooter-zimagez.c:794
 msgid ""
 "A comment on the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
 msgstr "Un commentaire sur la capture d'écran, il sera affiché sur ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:870
+#: ../lib/screenshooter-zimagez.c:917
 #, c-format
 msgid "<a href=\"%s\">Full size image</a>"
 msgstr "<a href=\"%s\">Image taille réelle</a>"
 
-#: ../lib/screenshooter-zimagez.c:872
+#: ../lib/screenshooter-zimagez.c:919
 #, c-format
 msgid "<a href=\"%s\">Large thumbnail</a>"
 msgstr "<a href=\"%s\">Grande miniature</a>"
 
-#: ../lib/screenshooter-zimagez.c:874
+#: ../lib/screenshooter-zimagez.c:921
 #, c-format
 msgid "<a href=\"%s\">Small thumbnail</a>"
 msgstr "<a href=\"%s\">Petite miniature</a>"
 
-#: ../lib/screenshooter-zimagez.c:894
+#: ../lib/screenshooter-zimagez.c:937
 msgid "My screenshot on ZimageZ"
 msgstr "Ma capture d'écran sur ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:920
+#: ../lib/screenshooter-zimagez.c:963
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Links</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Liens</span>"
 
-#: ../lib/screenshooter-zimagez.c:965
+#: ../lib/screenshooter-zimagez.c:1008
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing "
 "to the full size image</span>"
@@ -348,20 +331,20 @@ msgstr ""
 "pointant vers l'image en taille réelle</span>"
 
 #. HTML title
-#: ../lib/screenshooter-zimagez.c:981
+#: ../lib/screenshooter-zimagez.c:1024
 msgid "HTML"
 msgstr "HTML"
 
 #. BB title
-#: ../lib/screenshooter-zimagez.c:1002
+#: ../lib/screenshooter-zimagez.c:1045
 msgid "BBCode for forums"
 msgstr "BBCode pour les forums"
 
-#: ../lib/screenshooter-zimagez.c:1122
+#: ../lib/screenshooter-zimagez.c:1174
 msgid "ZimageZ"
 msgstr "ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:1155
+#: ../lib/screenshooter-zimagez.c:1207
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Status</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Statut</span>"
 
@@ -375,29 +358,38 @@ msgstr "_Ouvrir le lien"
 msgid "Copy _Link Address"
 msgstr "Copier l'adress du _lien"
 
-#: ../src/main.c:53
+#: ../src/main.c:48
 msgid "Delay in seconds before taking the screenshot"
 msgstr "Délai en secondes avant la prise de la capture d'écran"
 
-#: ../src/main.c:63
-msgid "Do not display the save dialog"
-msgstr "Ne pas afficher la fenêtre de sauvegarde"
-
-#: ../src/main.c:68
-msgid "Do not display the mouse on the screenshot"
+#: ../src/main.c:58
+#, fuzzy
+msgid "Display the mouse on the screenshot"
 msgstr "Ne pas afficher la souris sur la capture d'écran"
 
-#: ../src/main.c:85
+#: ../src/main.c:75
 msgid "Directory where the screenshot will be saved"
 msgstr "Dossier où la capture d'écran sera enregistrée"
 
-#: ../src/main.c:99
+#: ../src/main.c:85
 msgid "Version information"
 msgstr "Informations sur la version"
 
+#: ../src/main.c:134
+#, c-format
+msgid "Conflicting options: --%s and --%s cannot be used at the same time.\n"
+msgstr ""
+
 #: ../src/main.c:136
 #, c-format
 msgid ""
+"The --%s option is only used when --fullscreen, --window or --region is "
+"given. It will be ignored.\n"
+msgstr ""
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
@@ -405,7 +397,7 @@ msgstr ""
 "Essayez %s --help pour afficher la liste des options de ligne de commande "
 "disponibles.\n"
 
-#: ../src/main.c:235
+#: ../src/main.c:282
 #, c-format
 msgid "%s is not a valid directory, the default directory will be used."
 msgstr ""
@@ -419,3 +411,50 @@ msgid ""
 msgstr ""
 "Prendre une capture d'écran de l'écran tout entier, de la fenêtre active ou "
 "d'une zone"
+
+#~ msgid "Screenshot.png"
+#~ msgstr "Capture.png"
+
+#~ msgid "Screenshot-%d.png"
+#~ msgstr "Capture-%d.png"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">Après la capture </span>"
+
+#~ msgid "Show the save dialog"
+#~ msgstr "Afficher la fenêtre de sauvegarde"
+
+#~ msgid ""
+#~ "The save dialog allows you to change the file name and the save location"
+#~ msgstr ""
+#~ "La fenêtre de sauvegarde vous permet de changer le nom du fichier et "
+#~ "l'emplacement de sauvegarde"
+
+#~ msgid "Close the application"
+#~ msgstr "Fermer l'application"
+
+#~ msgid ""
+#~ "If unchecked, the current window will be displayed again after the "
+#~ "screenshot has been taken to allow you to take several screenshots in a "
+#~ "row"
+#~ msgstr ""
+#~ "Si décoché, la fenêtre actuelle sera affichée à nouveau après la prise de "
+#~ "la capture d'écran ce qui permet de prendre plusieurs captures à la suite."
+
+#~ msgid "Default save location"
+#~ msgstr "Emplacement de sauvegarde par défaut"
+
+#~ msgid "Set the default save location"
+#~ msgstr "Choisir l'emplacement de sauvegarde par défaut"
+
+#~ msgid ""
+#~ "An error occurred during the XML exchange: %s (%d).\n"
+#~ " The screenshot could not be uploaded."
+#~ msgstr ""
+#~ "Une erreur est survenue pendant l'échange XML: %s (%d).\n"
+#~ " La capture d'écran n'a pas pu être mise en ligne."
+
+#~ msgid "Do not display the save dialog"
+#~ msgstr "Ne pas afficher la fenêtre de sauvegarde"
diff --git a/po/gl.po b/po/gl.po
index 0204eb4..33f49d4 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-screenshooter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-31 14:02+0200\n"
+"POT-Creation-Date: 2009-11-15 00:29+0100\n"
 "PO-Revision-Date: 2009-09-19 11:50+0100\n"
 "Last-Translator: Leandro Regueiro <leandro.regueiro at gmail.com>\n"
 "Language-Team: Galician <proxecto at trasno.net>\n"
@@ -20,314 +20,331 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: ../lib/screenshooter-dialogs.c:283
-msgid "Screenshot.png"
-msgstr "Captura de pantalla.png"
-
-#: ../lib/screenshooter-dialogs.c:300
-#, c-format
-msgid "Screenshot-%d.png"
-msgstr "Captura de pantalla-%d.png"
-
-#: ../lib/screenshooter-dialogs.c:493
+#: ../lib/screenshooter-dialogs.c:478
 #, c-format
 msgid "%.2fKb of %.2fKb"
 msgstr "%.2fKb de %.2fKb"
 
-#: ../lib/screenshooter-dialogs.c:577
+#: ../lib/screenshooter-dialogs.c:560
 msgid "Transfer"
 msgstr "Transferir"
 
-#: ../lib/screenshooter-dialogs.c:600
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being transferred to:</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Vaise transferir a captura de pantalla a:</span>"
+#: ../lib/screenshooter-dialogs.c:581
+msgid ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being "
+"transferred to:</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Vaise transferir a captura de "
+"pantalla a:</span>"
 
-#: ../lib/screenshooter-dialogs.c:724
-#: ../lib/screenshooter-dialogs.c:741
+#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
 msgid "Screenshot"
 msgstr "Captura de pantalla"
 
-#: ../lib/screenshooter-dialogs.c:736
+#: ../lib/screenshooter-dialogs.c:709
 msgid "Take a screenshot"
 msgstr "Facer unha captura de pantalla"
 
-#: ../lib/screenshooter-dialogs.c:751
+#: ../lib/screenshooter-dialogs.c:724
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../lib/screenshooter-dialogs.c:793
+#: ../lib/screenshooter-dialogs.c:754
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Region to capture</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Zona a capturar</span>"
 
-#: ../lib/screenshooter-dialogs.c:820
+#: ../lib/screenshooter-dialogs.c:774
 msgid "Entire screen"
 msgstr "Toda a pantalla"
 
-#: ../lib/screenshooter-dialogs.c:830
-#: ../src/main.c:58
-#: ../panel-plugin/screenshooter-plugin.c:292
+#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../panel-plugin/screenshooter-plugin.c:308
 msgid "Take a screenshot of the entire screen"
 msgstr "Facer a captura de pantalla de toda a pantalla"
 
-#: ../lib/screenshooter-dialogs.c:841
+#: ../lib/screenshooter-dialogs.c:789
 msgid "Active window"
 msgstr "Ventá activa"
 
-#: ../lib/screenshooter-dialogs.c:851
-#: ../src/main.c:104
-#: ../panel-plugin/screenshooter-plugin.c:297
+#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr "Facer unha captura de pantalla da ventá activa"
 
-#: ../lib/screenshooter-dialogs.c:862
+#: ../lib/screenshooter-dialogs.c:804
 msgid "Select a region"
 msgstr "Seleccionar unha zona"
 
-#: ../lib/screenshooter-dialogs.c:872
-#: ../src/main.c:78
-#: ../panel-plugin/screenshooter-plugin.c:302
-msgid "Select a region to be captured by clicking a point of the screen without releasing the mouse button, dragging your mouse to the other corner of the region, and releasing the mouse button."
-msgstr "Seleccione unha zona para capturar premendo nun punto da pantalla sen soltar o botón do rato, arrastrando o rato á esquina oposta da zona, e soltando o botón do rato."
+#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../panel-plugin/screenshooter-plugin.c:318
+msgid ""
+"Select a region to be captured by clicking a point of the screen without "
+"releasing the mouse button, dragging your mouse to the other corner of the "
+"region, and releasing the mouse button."
+msgstr ""
+"Seleccione unha zona para capturar premendo nun punto da pantalla sen soltar "
+"o botón do rato, arrastrando o rato á esquina oposta da zona, e soltando o "
+"botón do rato."
 
-#: ../lib/screenshooter-dialogs.c:884
+#: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
 msgstr "Capturar o punteiro do rato"
 
-#: ../lib/screenshooter-dialogs.c:892
+#: ../lib/screenshooter-dialogs.c:824
 msgid "Display the mouse pointer on the screenshot"
 msgstr "Mostrar o punteiro do rato na captura de pantalla"
 
-#: ../lib/screenshooter-dialogs.c:917
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Tempo de espera antes da captura</span>"
+#: ../lib/screenshooter-dialogs.c:840
+msgid ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Tempo de espera antes da "
+"captura</span>"
 
-#: ../lib/screenshooter-dialogs.c:952
+#: ../lib/screenshooter-dialogs.c:862
 msgid "Delay in seconds before the screenshot is taken"
 msgstr "Retraso en segundos antes de facer a captura"
 
-#: ../lib/screenshooter-dialogs.c:958
+#: ../lib/screenshooter-dialogs.c:865
 msgid "seconds"
 msgstr "segundos"
 
-#: ../lib/screenshooter-dialogs.c:984
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Despois da captura</span>"
-
-#. Display the save dialog checkbox
-#: ../lib/screenshooter-dialogs.c:1007
-msgid "Show the save dialog"
-msgstr "Mostrar o diálogo de gardado"
-
-#: ../lib/screenshooter-dialogs.c:1013
-msgid "The save dialog allows you to change the file name and the save location"
-msgstr "O diálogo de gardar permítelle cambiar o nome do ficheiro e a localización onde se garda"
-
-#: ../lib/screenshooter-dialogs.c:1027
-msgid "Close the application"
-msgstr "Pechar a aplicación"
-
-#: ../lib/screenshooter-dialogs.c:1033
-msgid "If unchecked, the current window will be displayed again after the screenshot has been taken to allow you to take several screenshots in a row"
-msgstr "Se non está marcado, a ventá actual hase mostrar outra vez despois de tomar a captura para permitirlle tomar varias capturas seguidas"
+#: ../lib/screenshooter-dialogs.c:917
+msgid "Action"
+msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1056
+#: ../lib/screenshooter-dialogs.c:945
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Action</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Acción</span>"
 
 #. Save option radio button
-#: ../lib/screenshooter-dialogs.c:1081
-msgid "Save in:"
+#: ../lib/screenshooter-dialogs.c:961
+#, fuzzy
+msgid "Save"
 msgstr "Gardar en:"
 
-#: ../lib/screenshooter-dialogs.c:1089
+#: ../lib/screenshooter-dialogs.c:966
 msgid "Save the screenshot to a PNG file"
 msgstr "Gardar a captura de pantalla nun ficheiro PNG"
 
-#: ../lib/screenshooter-dialogs.c:1104
-msgid "Default save location"
-msgstr "Localización predeterminada para gardar"
-
-#: ../lib/screenshooter-dialogs.c:1114
-msgid "Set the default save location"
-msgstr "Definir a localización predeterminada para gardar"
-
-#: ../lib/screenshooter-dialogs.c:1127
+#: ../lib/screenshooter-dialogs.c:975
 msgid "Copy to the clipboard"
 msgstr "Copiar ao portarretallos"
 
-#: ../lib/screenshooter-dialogs.c:1132
+#: ../lib/screenshooter-dialogs.c:977
 msgid "Copy the screenshot to the clipboard so that it can be pasted later"
-msgstr "Copiar a captura de pantalla ó portarretallos para que se poida pegar despois"
+msgstr ""
+"Copiar a captura de pantalla ó portarretallos para que se poida pegar despois"
 
-#: ../lib/screenshooter-dialogs.c:1147
+#: ../lib/screenshooter-dialogs.c:994
 msgid "Open with:"
 msgstr "Abrir con:"
 
-#: ../lib/screenshooter-dialogs.c:1158
+#: ../lib/screenshooter-dialogs.c:1000
 msgid "Open the screenshot with the chosen application"
 msgstr "Abrir a captura de pantalla ca aplicación escollida"
 
-#: ../lib/screenshooter-dialogs.c:1191
-#: ../src/main.c:73
+#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
 msgid "Application to open the screenshot"
 msgstr "Aplicación ca que abrir a captura de pantalla"
 
-#: ../lib/screenshooter-dialogs.c:1204
+#: ../lib/screenshooter-dialogs.c:1028
 msgid "Host on ZimageZ"
 msgstr "Gardar en ZimageZ"
 
-#: ../lib/screenshooter-dialogs.c:1210
-#: ../src/main.c:92
+#: ../lib/screenshooter-dialogs.c:1032 ../src/main.c:80
 msgid "Host the screenshot on ZimageZ, a free online image hosting service"
-msgstr "Gardar a captura en ZimageZ, un servizo de almacenamento de imaxes en liña gratuito"
+msgstr ""
+"Gardar a captura en ZimageZ, un servizo de almacenamento de imaxes en liña "
+"gratuito"
+
+#: ../lib/screenshooter-dialogs.c:1046
+#, fuzzy
+msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Preview</span>"
+msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Ligazóns</span>"
 
-#: ../lib/screenshooter-dialogs.c:1255
+#: ../lib/screenshooter-dialogs.c:1107
 msgid "Save screenshot as..."
 msgstr "Gardar a captura de pantalla coma..."
 
-#. Start the user XML RPC session
-#: ../lib/screenshooter-zimagez.c:159
-msgid "Initialize the connection..."
-msgstr "Iniciar a conexión..."
+#: ../lib/screenshooter-zimagez.c:134
+#, fuzzy, c-format
+msgid "An error occured when creating the XMLRPC request."
+msgstr "Produciuse un erro mentres se subía a captura."
+
+#: ../lib/screenshooter-zimagez.c:153
+#, fuzzy, c-format
+msgid "An error occured when transfering the data to ZimageZ."
+msgstr "Produciuse un erro mentres se subía a captura."
+
+#: ../lib/screenshooter-zimagez.c:178
+#, fuzzy, c-format
+msgid "An error occured when parsing the response from ZimageZ."
+msgstr "Produciuse un erro mentres se subía a captura."
 
-#: ../lib/screenshooter-zimagez.c:172
-#: ../lib/screenshooter-zimagez.c:332
-#: ../lib/screenshooter-zimagez.c:361
-#: ../lib/screenshooter-zimagez.c:389
-#: ../lib/screenshooter-zimagez.c:520
-#: ../lib/screenshooter-zimagez.c:543
-#: ../lib/screenshooter-zimagez.c:580
+#: ../lib/screenshooter-zimagez.c:228
 #, c-format
-msgid ""
-"An error occurred during the XML exchange: %s (%d).\n"
-" The screenshot could not be uploaded."
+msgid "Taken on %s, at %s"
 msgstr ""
-"Ocurriu un erro durante o intercambio XML: %s (%d).\n"
-"Non se puido subir a captura."
 
-#: ../lib/screenshooter-zimagez.c:223
+#. Start the user soup session
+#: ../lib/screenshooter-zimagez.c:295
+msgid "Initialize the connection..."
+msgstr "Iniciar a conexión..."
+
+#: ../lib/screenshooter-zimagez.c:341
 msgid ""
-"Please file the following fields with your <a href=\"http://www.zimagez.com\">ZimageZ</a> \n"
+"Please file the following fields with your <a href=\"http://www.zimagez.com"
+"\">ZimageZ</a> \n"
 "user name, passsword and details about the screenshot."
 msgstr ""
 "Cubra os seguintes campos co seu nome de usuario\n"
 "en <a href=\"http://www.zimagez.com\">ZimageZ</a>, contrasinal\n"
 "e detalles sobre a captura."
 
-#: ../lib/screenshooter-zimagez.c:283
+#: ../lib/screenshooter-zimagez.c:398
 msgid "Check the user information..."
 msgstr "Comprobar a información de usuario..."
 
-#: ../lib/screenshooter-zimagez.c:305
-msgid "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You must fill all the fields.</span>"
-msgstr "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">Debe cubrir tódolos campos.</span>"
+#: ../lib/screenshooter-zimagez.c:405
+msgid ""
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You "
+"must fill all the fields.</span>"
+msgstr ""
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">Debe "
+"cubrir tódolos campos.</span>"
 
-#: ../lib/screenshooter-zimagez.c:320
+#: ../lib/screenshooter-zimagez.c:419
 msgid "Login on ZimageZ..."
 msgstr "Iniciando sesión en ZimageZ..."
 
-#: ../lib/screenshooter-zimagez.c:436
-msgid "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The user and the password you entered do not match. Please retry.</span>"
-msgstr "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">O usuario e o contrasinal que introduciu non coinciden. Probe de novo.</span>"
+#: ../lib/screenshooter-zimagez.c:459 ../lib/screenshooter-zimagez.c:610
+msgid ""
+"An unexpected reply from ZimageZ was received. The upload of the screenshot "
+"failed."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:498
+msgid ""
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The "
+"user and the password you entered do not match. Please retry.</span>"
+msgstr ""
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">O "
+"usuario e o contrasinal que introduciu non coinciden. Probe de novo.</span>"
 
-#: ../lib/screenshooter-zimagez.c:501
+#: ../lib/screenshooter-zimagez.c:556
 msgid "Upload the screenshot..."
 msgstr "Subir a captura..."
 
-#: ../lib/screenshooter-zimagez.c:559
+#: ../lib/screenshooter-zimagez.c:589
 #, c-format
 msgid "An error occurred while uploading the screenshot."
 msgstr "Produciuse un erro mentres se subía a captura."
 
 #. End the user session
-#: ../lib/screenshooter-zimagez.c:597
+#: ../lib/screenshooter-zimagez.c:622
 msgid "Close the session on ZimageZ..."
 msgstr "Pechar a sesión en ZimageZ..."
 
-#: ../lib/screenshooter-zimagez.c:650
+#: ../lib/screenshooter-zimagez.c:692
 msgid "Details about the screenshot for ZimageZ"
 msgstr "Detalles sobre a captura para ZimageZ"
 
 #. Create the user label
-#: ../lib/screenshooter-zimagez.c:692
+#: ../lib/screenshooter-zimagez.c:734
 msgid "User:"
 msgstr "Usuario:"
 
-#: ../lib/screenshooter-zimagez.c:703
-msgid "Your Zimagez user name, if you do not have one yet please create one on the Web page linked above"
-msgstr "O seu nome de usuario en ZimageZ, se aínda non ten un cree un na páxina web da ligazón de enriba"
+#: ../lib/screenshooter-zimagez.c:745
+msgid ""
+"Your Zimagez user name, if you do not have one yet please create one on the "
+"Web page linked above"
+msgstr ""
+"O seu nome de usuario en ZimageZ, se aínda non ten un cree un na páxina web "
+"da ligazón de enriba"
 
 #. Create the password label
-#: ../lib/screenshooter-zimagez.c:708
+#: ../lib/screenshooter-zimagez.c:751
 msgid "Password:"
 msgstr "Contrasinal:"
 
-#: ../lib/screenshooter-zimagez.c:718
+#: ../lib/screenshooter-zimagez.c:761
 msgid "The password for the user above"
 msgstr "O contrasinal do usuario de enriba"
 
 #. Create the title label
-#: ../lib/screenshooter-zimagez.c:723
+#: ../lib/screenshooter-zimagez.c:767
 msgid "Title:"
 msgstr "Título:"
 
-#: ../lib/screenshooter-zimagez.c:733
-msgid "The title of the screenshot, it will be used when displaying the screenshot on ZimageZ"
+#: ../lib/screenshooter-zimagez.c:777
+msgid ""
+"The title of the screenshot, it will be used when displaying the screenshot "
+"on ZimageZ"
 msgstr "O título da captura, que se usará ao mostrar a captura en ZimageZ"
 
 #. Create the comment label
-#: ../lib/screenshooter-zimagez.c:738
+#: ../lib/screenshooter-zimagez.c:783
 msgid "Comment:"
 msgstr "Comentario:"
 
-#: ../lib/screenshooter-zimagez.c:749
-msgid "A comment on the screenshot, it will be used when displaying the screenshot on ZimageZ"
-msgstr "Un comentario sobre a captura, que se usará ao mostrar a captura en ZimageZ"
+#: ../lib/screenshooter-zimagez.c:794
+msgid ""
+"A comment on the screenshot, it will be used when displaying the screenshot "
+"on ZimageZ"
+msgstr ""
+"Un comentario sobre a captura, que se usará ao mostrar a captura en ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:870
+#: ../lib/screenshooter-zimagez.c:917
 #, c-format
 msgid "<a href=\"%s\">Full size image</a>"
 msgstr "<a href=\"%s\">Tamaño completo</a>"
 
-#: ../lib/screenshooter-zimagez.c:872
+#: ../lib/screenshooter-zimagez.c:919
 #, c-format
 msgid "<a href=\"%s\">Large thumbnail</a>"
 msgstr "<a href=\"%s\">Miniatura grande</a>"
 
-#: ../lib/screenshooter-zimagez.c:874
+#: ../lib/screenshooter-zimagez.c:921
 #, c-format
 msgid "<a href=\"%s\">Small thumbnail</a>"
 msgstr "<a href=\"%s\">Miniatura pequena</a>"
 
-#: ../lib/screenshooter-zimagez.c:894
+#: ../lib/screenshooter-zimagez.c:937
 msgid "My screenshot on ZimageZ"
 msgstr "A miña captura de pantalla en ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:920
+#: ../lib/screenshooter-zimagez.c:963
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Links</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Ligazóns</span>"
 
-#: ../lib/screenshooter-zimagez.c:965
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing to the full size image</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Código para unha miniatura que apunte á imaxe a tamaño completo</span>"
+#: ../lib/screenshooter-zimagez.c:1008
+msgid ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing "
+"to the full size image</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Código para unha miniatura "
+"que apunte á imaxe a tamaño completo</span>"
 
 #. HTML title
-#: ../lib/screenshooter-zimagez.c:981
+#: ../lib/screenshooter-zimagez.c:1024
 msgid "HTML"
 msgstr "HTML"
 
 #. BB title
-#: ../lib/screenshooter-zimagez.c:1002
+#: ../lib/screenshooter-zimagez.c:1045
 msgid "BBCode for forums"
 msgstr "BBCode para os foros"
 
-#: ../lib/screenshooter-zimagez.c:1122
+#: ../lib/screenshooter-zimagez.c:1174
 msgid "ZimageZ"
 msgstr "ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:1155
+#: ../lib/screenshooter-zimagez.c:1207
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Status</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Estado</span>"
 
@@ -341,44 +358,102 @@ msgstr "_Abrir ligazón"
 msgid "Copy _Link Address"
 msgstr "Copiar o enderezo da _ligazón"
 
-#: ../src/main.c:53
+#: ../src/main.c:48
 msgid "Delay in seconds before taking the screenshot"
 msgstr "Retraso en segundos antes de facer a captura"
 
-#: ../src/main.c:63
-msgid "Do not display the save dialog"
-msgstr "Non mostrar o diálogo de gardar"
-
-#: ../src/main.c:68
-msgid "Do not display the mouse on the screenshot"
+#: ../src/main.c:58
+#, fuzzy
+msgid "Display the mouse on the screenshot"
 msgstr "Non mostrar o rato na captura de pantalla"
 
-#: ../src/main.c:85
+#: ../src/main.c:75
 msgid "Directory where the screenshot will be saved"
 msgstr "O directorio onde se vai gardar a captura de pantalla"
 
-#: ../src/main.c:99
+#: ../src/main.c:85
 msgid "Version information"
 msgstr "Información da versión"
 
+#: ../src/main.c:134
+#, c-format
+msgid "Conflicting options: --%s and --%s cannot be used at the same time.\n"
+msgstr ""
+
 #: ../src/main.c:136
 #, c-format
 msgid ""
+"The --%s option is only used when --fullscreen, --window or --region is "
+"given. It will be ignored.\n"
+msgstr ""
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
 "%s: %s\n"
 "Execute %s --help para ver unha lista completa das opcións dispoñibles.\n"
 
-#: ../src/main.c:235
+#: ../src/main.c:282
 #, c-format
 msgid "%s is not a valid directory, the default directory will be used."
 msgstr "%s non é un directorio válido, hase usar o directorio predeterminado."
 
 #: ../src/xfce4-screenshooter.desktop.in.in.h:2
 #: ../panel-plugin/screenshooter.desktop.in.in.h:2
-msgid "Take screenshots of the entire screen, of the active window or of a region"
-msgstr "Facer capturas de pantalla de toda a pantalla, da ventá activa ou dunha zona"
+msgid ""
+"Take screenshots of the entire screen, of the active window or of a region"
+msgstr ""
+"Facer capturas de pantalla de toda a pantalla, da ventá activa ou dunha zona"
+
+#~ msgid "Screenshot.png"
+#~ msgstr "Captura de pantalla.png"
+
+#~ msgid "Screenshot-%d.png"
+#~ msgstr "Captura de pantalla-%d.png"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">Despois da captura</span>"
+
+#~ msgid "Show the save dialog"
+#~ msgstr "Mostrar o diálogo de gardado"
+
+#~ msgid ""
+#~ "The save dialog allows you to change the file name and the save location"
+#~ msgstr ""
+#~ "O diálogo de gardar permítelle cambiar o nome do ficheiro e a "
+#~ "localización onde se garda"
+
+#~ msgid "Close the application"
+#~ msgstr "Pechar a aplicación"
+
+#~ msgid ""
+#~ "If unchecked, the current window will be displayed again after the "
+#~ "screenshot has been taken to allow you to take several screenshots in a "
+#~ "row"
+#~ msgstr ""
+#~ "Se non está marcado, a ventá actual hase mostrar outra vez despois de "
+#~ "tomar a captura para permitirlle tomar varias capturas seguidas"
+
+#~ msgid "Default save location"
+#~ msgstr "Localización predeterminada para gardar"
+
+#~ msgid "Set the default save location"
+#~ msgstr "Definir a localización predeterminada para gardar"
+
+#~ msgid ""
+#~ "An error occurred during the XML exchange: %s (%d).\n"
+#~ " The screenshot could not be uploaded."
+#~ msgstr ""
+#~ "Ocurriu un erro durante o intercambio XML: %s (%d).\n"
+#~ "Non se puido subir a captura."
+
+#~ msgid "Do not display the save dialog"
+#~ msgstr "Non mostrar o diálogo de gardar"
 
 #, fuzzy
 #~ msgid "Tak a screenshot of the entire screen"
@@ -387,14 +462,16 @@ msgstr "Facer capturas de pantalla de toda a pantalla, da ventá activa ou dunha
 #, fuzzy
 #~ msgid "Applicatio to open the screenshot"
 #~ msgstr "Aplicación ca que abrir a captura de pantalla"
+
 #~ msgid "%i bytes remaining"
 #~ msgstr "quedan %i bytes"
+
 #~ msgid "Save by default to:"
 #~ msgstr "Gardar por defecto en:"
+
 #~ msgid ""
 #~ "If checked, the screenshot will be saved by default to the location set "
 #~ "on the right without displaying a save dialog"
 #~ msgstr ""
 #~ "Se está marcado, a captura de pantalla hase gardar por defecto na "
 #~ "localización definida á dereita, sen mostrar o diálogo de gardar"
-
diff --git a/po/hr.po b/po/hr.po
index c6bfcce..60a9abd 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-screenshooter-plugin 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-31 14:02+0200\n"
+"POT-Creation-Date: 2009-11-15 00:29+0100\n"
 "PO-Revision-Date: 2008-06-17 12:27+0100\n"
 "Last-Translator: Jérôme Guelfucci <jeromeg at xfce.org>\n"
 "Language-Team: Croatian <mario.danic at gmail.com>\n"
@@ -15,334 +15,318 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/screenshooter-dialogs.c:283
-#, fuzzy
-msgid "Screenshot.png"
-msgstr " Screenshot"
-
-#: ../lib/screenshooter-dialogs.c:300
-#, fuzzy, c-format
-msgid "Screenshot-%d.png"
-msgstr " Screenshot"
-
-#: ../lib/screenshooter-dialogs.c:493
+#: ../lib/screenshooter-dialogs.c:478
 #, c-format
 msgid "%.2fKb of %.2fKb"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:577
+#: ../lib/screenshooter-dialogs.c:560
 msgid "Transfer"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:600
+#: ../lib/screenshooter-dialogs.c:581
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being "
 "transferred to:</span>"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:724 ../lib/screenshooter-dialogs.c:741
+#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
 #, fuzzy
 msgid "Screenshot"
 msgstr " Screenshot"
 
-#: ../lib/screenshooter-dialogs.c:736
+#: ../lib/screenshooter-dialogs.c:709
 #, fuzzy
 msgid "Take a screenshot"
 msgstr " Uhvati screenshot"
 
-#: ../lib/screenshooter-dialogs.c:751
+#: ../lib/screenshooter-dialogs.c:724
 msgid "Preferences"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:793
+#: ../lib/screenshooter-dialogs.c:754
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Region to capture</span>"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:820
+#: ../lib/screenshooter-dialogs.c:774
 msgid "Entire screen"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:830 ../src/main.c:58
-#: ../panel-plugin/screenshooter-plugin.c:292
+#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../panel-plugin/screenshooter-plugin.c:308
 #, fuzzy
 msgid "Take a screenshot of the entire screen"
 msgstr "Uhvati screenshot desktopa"
 
-#: ../lib/screenshooter-dialogs.c:841
+#: ../lib/screenshooter-dialogs.c:789
 msgid "Active window"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:851 ../src/main.c:104
-#: ../panel-plugin/screenshooter-plugin.c:297
+#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr "Uhvati screenshot trenutnog prozora"
 
-#: ../lib/screenshooter-dialogs.c:862
+#: ../lib/screenshooter-dialogs.c:804
 msgid "Select a region"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:872 ../src/main.c:78
-#: ../panel-plugin/screenshooter-plugin.c:302
+#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../panel-plugin/screenshooter-plugin.c:318
 msgid ""
 "Select a region to be captured by clicking a point of the screen without "
 "releasing the mouse button, dragging your mouse to the other corner of the "
 "region, and releasing the mouse button."
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:884
+#: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:892
+#: ../lib/screenshooter-dialogs.c:824
 #, fuzzy
 msgid "Display the mouse pointer on the screenshot"
 msgstr " Uhvati screenshot"
 
-#: ../lib/screenshooter-dialogs.c:917
+#: ../lib/screenshooter-dialogs.c:840
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:952
+#: ../lib/screenshooter-dialogs.c:862
 #, fuzzy
 msgid "Delay in seconds before the screenshot is taken"
 msgstr "Odgoda u sekundama prije hvatanja screenshota"
 
-#: ../lib/screenshooter-dialogs.c:958
+#: ../lib/screenshooter-dialogs.c:865
 msgid "seconds"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:984
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
-msgstr ""
-
-#. Display the save dialog checkbox
-#: ../lib/screenshooter-dialogs.c:1007
-msgid "Show the save dialog"
-msgstr ""
-
-#: ../lib/screenshooter-dialogs.c:1013
-msgid ""
-"The save dialog allows you to change the file name and the save location"
-msgstr ""
-
-#: ../lib/screenshooter-dialogs.c:1027
-msgid "Close the application"
-msgstr ""
-
-#: ../lib/screenshooter-dialogs.c:1033
-msgid ""
-"If unchecked, the current window will be displayed again after the "
-"screenshot has been taken to allow you to take several screenshots in a row"
+#: ../lib/screenshooter-dialogs.c:917
+msgid "Action"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1056
+#: ../lib/screenshooter-dialogs.c:945
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Action</span>"
 msgstr ""
 
 #. Save option radio button
-#: ../lib/screenshooter-dialogs.c:1081
-msgid "Save in:"
+#: ../lib/screenshooter-dialogs.c:961
+msgid "Save"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1089
+#: ../lib/screenshooter-dialogs.c:966
 #, fuzzy
 msgid "Save the screenshot to a PNG file"
 msgstr "Snimi screenshot kao ..."
 
-#: ../lib/screenshooter-dialogs.c:1104
-msgid "Default save location"
-msgstr ""
-
-#: ../lib/screenshooter-dialogs.c:1114
-msgid "Set the default save location"
-msgstr ""
-
-#: ../lib/screenshooter-dialogs.c:1127
+#: ../lib/screenshooter-dialogs.c:975
 msgid "Copy to the clipboard"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1132
+#: ../lib/screenshooter-dialogs.c:977
 msgid "Copy the screenshot to the clipboard so that it can be pasted later"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1147
+#: ../lib/screenshooter-dialogs.c:994
 msgid "Open with:"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1158
+#: ../lib/screenshooter-dialogs.c:1000
 msgid "Open the screenshot with the chosen application"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1191 ../src/main.c:73
+#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
 #, fuzzy
 msgid "Application to open the screenshot"
 msgstr " Uhvati screenshot"
 
-#: ../lib/screenshooter-dialogs.c:1204
+#: ../lib/screenshooter-dialogs.c:1028
 msgid "Host on ZimageZ"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1210 ../src/main.c:92
+#: ../lib/screenshooter-dialogs.c:1032 ../src/main.c:80
 msgid "Host the screenshot on ZimageZ, a free online image hosting service"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1255
+#: ../lib/screenshooter-dialogs.c:1046
+msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Preview</span>"
+msgstr ""
+
+#: ../lib/screenshooter-dialogs.c:1107
 #, fuzzy
 msgid "Save screenshot as..."
 msgstr "Snimi screenshot kao ..."
 
-#. Start the user XML RPC session
-#: ../lib/screenshooter-zimagez.c:159
-msgid "Initialize the connection..."
+#: ../lib/screenshooter-zimagez.c:134
+#, c-format
+msgid "An error occured when creating the XMLRPC request."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:172 ../lib/screenshooter-zimagez.c:332
-#: ../lib/screenshooter-zimagez.c:361 ../lib/screenshooter-zimagez.c:389
-#: ../lib/screenshooter-zimagez.c:520 ../lib/screenshooter-zimagez.c:543
-#: ../lib/screenshooter-zimagez.c:580
+#: ../lib/screenshooter-zimagez.c:153
 #, c-format
-msgid ""
-"An error occurred during the XML exchange: %s (%d).\n"
-" The screenshot could not be uploaded."
+msgid "An error occured when transfering the data to ZimageZ."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:223
+#: ../lib/screenshooter-zimagez.c:178
+#, c-format
+msgid "An error occured when parsing the response from ZimageZ."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:228
+#, c-format
+msgid "Taken on %s, at %s"
+msgstr ""
+
+#. Start the user soup session
+#: ../lib/screenshooter-zimagez.c:295
+msgid "Initialize the connection..."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:341
 msgid ""
 "Please file the following fields with your <a href=\"http://www.zimagez.com"
 "\">ZimageZ</a> \n"
 "user name, passsword and details about the screenshot."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:283
+#: ../lib/screenshooter-zimagez.c:398
 msgid "Check the user information..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:305
+#: ../lib/screenshooter-zimagez.c:405
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You "
 "must fill all the fields.</span>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:320
+#: ../lib/screenshooter-zimagez.c:419
 msgid "Login on ZimageZ..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:436
+#: ../lib/screenshooter-zimagez.c:459 ../lib/screenshooter-zimagez.c:610
+msgid ""
+"An unexpected reply from ZimageZ was received. The upload of the screenshot "
+"failed."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:498
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The "
 "user and the password you entered do not match. Please retry.</span>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:501
+#: ../lib/screenshooter-zimagez.c:556
 #, fuzzy
 msgid "Upload the screenshot..."
 msgstr " Uhvati screenshot"
 
-#: ../lib/screenshooter-zimagez.c:559
+#: ../lib/screenshooter-zimagez.c:589
 #, c-format
 msgid "An error occurred while uploading the screenshot."
 msgstr ""
 
 #. End the user session
-#: ../lib/screenshooter-zimagez.c:597
+#: ../lib/screenshooter-zimagez.c:622
 msgid "Close the session on ZimageZ..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:650
+#: ../lib/screenshooter-zimagez.c:692
 #, fuzzy
 msgid "Details about the screenshot for ZimageZ"
 msgstr "Odgoda u sekundama prije hvatanja screenshota"
 
 #. Create the user label
-#: ../lib/screenshooter-zimagez.c:692
+#: ../lib/screenshooter-zimagez.c:734
 msgid "User:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:703
+#: ../lib/screenshooter-zimagez.c:745
 msgid ""
 "Your Zimagez user name, if you do not have one yet please create one on the "
 "Web page linked above"
 msgstr ""
 
 #. Create the password label
-#: ../lib/screenshooter-zimagez.c:708
+#: ../lib/screenshooter-zimagez.c:751
 msgid "Password:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:718
+#: ../lib/screenshooter-zimagez.c:761
 msgid "The password for the user above"
 msgstr ""
 
 #. Create the title label
-#: ../lib/screenshooter-zimagez.c:723
+#: ../lib/screenshooter-zimagez.c:767
 msgid "Title:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:733
+#: ../lib/screenshooter-zimagez.c:777
 msgid ""
 "The title of the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
 msgstr ""
 
 #. Create the comment label
-#: ../lib/screenshooter-zimagez.c:738
+#: ../lib/screenshooter-zimagez.c:783
 msgid "Comment:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:749
+#: ../lib/screenshooter-zimagez.c:794
 msgid ""
 "A comment on the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:870
+#: ../lib/screenshooter-zimagez.c:917
 #, c-format
 msgid "<a href=\"%s\">Full size image</a>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:872
+#: ../lib/screenshooter-zimagez.c:919
 #, c-format
 msgid "<a href=\"%s\">Large thumbnail</a>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:874
+#: ../lib/screenshooter-zimagez.c:921
 #, c-format
 msgid "<a href=\"%s\">Small thumbnail</a>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:894
+#: ../lib/screenshooter-zimagez.c:937
 #, fuzzy
 msgid "My screenshot on ZimageZ"
 msgstr "Odgoda u sekundama prije hvatanja screenshota"
 
-#: ../lib/screenshooter-zimagez.c:920
+#: ../lib/screenshooter-zimagez.c:963
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Links</span>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:965
+#: ../lib/screenshooter-zimagez.c:1008
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing "
 "to the full size image</span>"
 msgstr ""
 
 #. HTML title
-#: ../lib/screenshooter-zimagez.c:981
+#: ../lib/screenshooter-zimagez.c:1024
 msgid "HTML"
 msgstr ""
 
 #. BB title
-#: ../lib/screenshooter-zimagez.c:1002
+#: ../lib/screenshooter-zimagez.c:1045
 msgid "BBCode for forums"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:1122
+#: ../lib/screenshooter-zimagez.c:1174
 msgid "ZimageZ"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:1155
+#: ../lib/screenshooter-zimagez.c:1207
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Status</span>"
 msgstr ""
 
@@ -356,30 +340,38 @@ msgstr ""
 msgid "Copy _Link Address"
 msgstr ""
 
-#: ../src/main.c:53
+#: ../src/main.c:48
 msgid "Delay in seconds before taking the screenshot"
 msgstr "Odgoda u sekundama prije hvatanja screenshota"
 
-#: ../src/main.c:63
-msgid "Do not display the save dialog"
-msgstr ""
-
-#: ../src/main.c:68
+#: ../src/main.c:58
 #, fuzzy
-msgid "Do not display the mouse on the screenshot"
+msgid "Display the mouse on the screenshot"
 msgstr " Uhvati screenshot"
 
-#: ../src/main.c:85
+#: ../src/main.c:75
 msgid "Directory where the screenshot will be saved"
 msgstr ""
 
-#: ../src/main.c:99
+#: ../src/main.c:85
 msgid "Version information"
 msgstr "Informacije o inačici"
 
+#: ../src/main.c:134
+#, c-format
+msgid "Conflicting options: --%s and --%s cannot be used at the same time.\n"
+msgstr ""
+
 #: ../src/main.c:136
 #, c-format
 msgid ""
+"The --%s option is only used when --fullscreen, --window or --region is "
+"given. It will be ignored.\n"
+msgstr ""
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
@@ -387,7 +379,7 @@ msgstr ""
 "Pokušajte %s --help kako biste vidjeli potpunu listu dostupni command-line "
 "parametara.\n"
 
-#: ../src/main.c:235
+#: ../src/main.c:282
 #, c-format
 msgid "%s is not a valid directory, the default directory will be used."
 msgstr ""
@@ -400,6 +392,14 @@ msgid ""
 msgstr "Uhvati screenshot trenutnog prozora"
 
 #, fuzzy
+#~ msgid "Screenshot.png"
+#~ msgstr " Screenshot"
+
+#, fuzzy
+#~ msgid "Screenshot-%d.png"
+#~ msgstr " Screenshot"
+
+#, fuzzy
 #~ msgid "Tak a screenshot of the entire screen"
 #~ msgstr "Uhvati screenshot desktopa"
 
diff --git a/po/hu.po b/po/hu.po
index aca555d..736e581 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-screenshooter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-25 12:33+0200\n"
+"POT-Creation-Date: 2009-11-15 00:29+0100\n"
 "PO-Revision-Date: 2009-07-25 12:34+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
 "Language-Team: Hungarian <gnome at gnome dot hu>\n"
@@ -17,72 +17,66 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../lib/screenshooter-dialogs.c:274
-msgid "Screenshot.png"
-msgstr "Képernyőkép.png"
-
-#: ../lib/screenshooter-dialogs.c:291
-#, c-format
-msgid "Screenshot-%d.png"
-msgstr "Képernyőkép-%d.png"
-
-#: ../lib/screenshooter-dialogs.c:484
+#: ../lib/screenshooter-dialogs.c:478
 #, c-format
 msgid "%.2fKb of %.2fKb"
 msgstr "%.2fKb, összesen %.2fKb"
 
-#: ../lib/screenshooter-dialogs.c:568
+#: ../lib/screenshooter-dialogs.c:560
 msgid "Transfer"
 msgstr "Átvitel"
 
-#: ../lib/screenshooter-dialogs.c:591
+#: ../lib/screenshooter-dialogs.c:581
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being "
 "transferred to:</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">A képernyőkép átvitele:</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">A képernyőkép átvitele:</span>"
 
-#: ../lib/screenshooter-dialogs.c:708 ../lib/screenshooter-dialogs.c:725
+#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
 msgid "Screenshot"
 msgstr "Képernyőkép"
 
-#: ../lib/screenshooter-dialogs.c:720
+#: ../lib/screenshooter-dialogs.c:709
 msgid "Take a screenshot"
 msgstr "Képernyőkép készítése"
 
-#: ../lib/screenshooter-dialogs.c:735
+#: ../lib/screenshooter-dialogs.c:724
 msgid "Preferences"
 msgstr "Beállítások"
 
-#: ../lib/screenshooter-dialogs.c:777
+#: ../lib/screenshooter-dialogs.c:754
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Region to capture</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Mentendő terület</span>"
 
-#: ../lib/screenshooter-dialogs.c:804
+#: ../lib/screenshooter-dialogs.c:774
 msgid "Entire screen"
 msgstr "Teljes képernyő"
 
-#: ../lib/screenshooter-dialogs.c:814 ../src/main.c:54
-#: ../panel-plugin/screenshooter-plugin.c:292
+#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../panel-plugin/screenshooter-plugin.c:308
 msgid "Take a screenshot of the entire screen"
 msgstr "Képernyőkép készítése a teljes képernyőről"
 
-#: ../lib/screenshooter-dialogs.c:825
+#: ../lib/screenshooter-dialogs.c:789
 msgid "Active window"
 msgstr "Aktív ablak"
 
-#: ../lib/screenshooter-dialogs.c:835 ../src/main.c:96
-#: ../panel-plugin/screenshooter-plugin.c:297
+#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr "Képernyőkép készítése az aktív ablakról"
 
-#: ../lib/screenshooter-dialogs.c:846
+#: ../lib/screenshooter-dialogs.c:804
 msgid "Select a region"
 msgstr "Válaszon területet"
 
-#: ../lib/screenshooter-dialogs.c:856 ../src/main.c:74
-#: ../panel-plugin/screenshooter-plugin.c:302
+#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../panel-plugin/screenshooter-plugin.c:318
 msgid ""
 "Select a region to be captured by clicking a point of the screen without "
 "releasing the mouse button, dragging your mouse to the other corner of the "
@@ -92,127 +86,111 @@ msgstr ""
 "majd az egérgomb felengedése nélkül húzza az egeret a terület másik sarkára "
 "és engedje fel a gombot."
 
-#: ../lib/screenshooter-dialogs.c:868
+#: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
 msgstr "Egérmutató bevétele"
 
-#: ../lib/screenshooter-dialogs.c:876
+#: ../lib/screenshooter-dialogs.c:824
 msgid "Display the mouse pointer on the screenshot"
 msgstr "Egérmutató megjelenítése a képernyőképen"
 
-#: ../lib/screenshooter-dialogs.c:901
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
+#: ../lib/screenshooter-dialogs.c:840
+msgid ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
 msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Késleltetés a felvétel előtt</"
 "span>"
 
-#: ../lib/screenshooter-dialogs.c:936
+#: ../lib/screenshooter-dialogs.c:862
 msgid "Delay in seconds before the screenshot is taken"
 msgstr "A képernyőkép készítése előtti késleltetés másodpercben"
 
-#: ../lib/screenshooter-dialogs.c:942
+#: ../lib/screenshooter-dialogs.c:865
 msgid "seconds"
 msgstr "másodperc"
 
-#: ../lib/screenshooter-dialogs.c:968
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Felvétel után</span>"
-
-#. Display the save dialog checkbox
-#: ../lib/screenshooter-dialogs.c:991
-msgid "Show the save dialog"
-msgstr "Mentés ablak megjelenítése"
-
-#: ../lib/screenshooter-dialogs.c:997
-msgid "The save dialog allows you to change the file name and the save location"
-msgstr "A mentés ablak lehetővé teszi a fájlnév és a mentés helyének megadását"
-
-#: ../lib/screenshooter-dialogs.c:1011
-msgid "Close the application"
-msgstr "Alkalmazás bezárása"
-
-#: ../lib/screenshooter-dialogs.c:1017
-msgid ""
-"If unchecked, the current window will be displayed again after the "
-"screenshot has been taken to allow you to take several screenshots in a row"
+#: ../lib/screenshooter-dialogs.c:917
+msgid "Action"
 msgstr ""
-"Ha nincs bejelölve, a jelenlegi ablak újra megjelenik a képernyőkép "
-"elkészülte után, így egymás után több képet is készíthet."
 
-#: ../lib/screenshooter-dialogs.c:1040
+#: ../lib/screenshooter-dialogs.c:945
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Action</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Művelet</span>"
 
 #. Save option radio button
-#: ../lib/screenshooter-dialogs.c:1065
-msgid "Save in:"
+#: ../lib/screenshooter-dialogs.c:961
+#, fuzzy
+msgid "Save"
 msgstr "Mentés ide:"
 
-#: ../lib/screenshooter-dialogs.c:1073
+#: ../lib/screenshooter-dialogs.c:966
 msgid "Save the screenshot to a PNG file"
 msgstr "Képernyőkép mentése PNG fájlba"
 
-#: ../lib/screenshooter-dialogs.c:1088
-msgid "Default save location"
-msgstr "Alapértelmezett mentési hely"
-
-#: ../lib/screenshooter-dialogs.c:1098
-msgid "Set the default save location"
-msgstr "Az alapértelmezett mentési hely beállítása"
-
-#: ../lib/screenshooter-dialogs.c:1111
+#: ../lib/screenshooter-dialogs.c:975
 msgid "Copy to the clipboard"
 msgstr "Másolás a vágólapra"
 
-#: ../lib/screenshooter-dialogs.c:1116
+#: ../lib/screenshooter-dialogs.c:977
 msgid "Copy the screenshot to the clipboard so that it can be pasted later"
 msgstr "A képernyőkép másolása a vágólapra, így az beilleszthető lesz"
 
-#: ../lib/screenshooter-dialogs.c:1131
+#: ../lib/screenshooter-dialogs.c:994
 msgid "Open with:"
 msgstr "Megnyitás ezzel:"
 
-#: ../lib/screenshooter-dialogs.c:1142
+#: ../lib/screenshooter-dialogs.c:1000
 msgid "Open the screenshot with the chosen application"
 msgstr "Képernyőkép megnyitása a kiválasztott alkalmazással"
 
-#: ../lib/screenshooter-dialogs.c:1175 ../src/main.c:69
+#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
 msgid "Application to open the screenshot"
 msgstr "Alkalmazás a képernyő megnyitásához"
 
-#: ../lib/screenshooter-dialogs.c:1186
+#: ../lib/screenshooter-dialogs.c:1028
 msgid "Host on ZimageZ"
 msgstr "Megosztás a ZimageZ-on"
 
-#: ../lib/screenshooter-dialogs.c:1192 ../src/main.c:86
+#: ../lib/screenshooter-dialogs.c:1032 ../src/main.c:80
 msgid "Host the screenshot on ZimageZ, a free online image hosting service"
-msgstr "Képernyőkép megosztása a ZimageZ nevű ingyenes online képmegosztó oldalon"
+msgstr ""
+"Képernyőkép megosztása a ZimageZ nevű ingyenes online képmegosztó oldalon"
+
+#: ../lib/screenshooter-dialogs.c:1046
+#, fuzzy
+msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Preview</span>"
+msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Hivatkozások</span>"
 
-#: ../lib/screenshooter-dialogs.c:1235
+#: ../lib/screenshooter-dialogs.c:1107
 msgid "Save screenshot as..."
 msgstr "Képernyőkép mentése másként…"
 
-#: ../lib/screenshooter-zimagez.c:131
+#: ../lib/screenshooter-zimagez.c:134
 #, c-format
 msgid "An error occured when creating the XMLRPC request."
 msgstr "Hiba történt az XMLRPC kérés létrehozásakor."
 
-#: ../lib/screenshooter-zimagez.c:150
+#: ../lib/screenshooter-zimagez.c:153
 #, c-format
 msgid "An error occured when transfering the data to ZimageZ."
 msgstr "Hiba történt az adatok átvitelekor a ZimageZ oldalra."
 
-#: ../lib/screenshooter-zimagez.c:175
+#: ../lib/screenshooter-zimagez.c:178
 #, c-format
 msgid "An error occured when parsing the response from ZimageZ."
 msgstr "Hiba történt a ZimageZ válaszának elemzésekor."
 
+#: ../lib/screenshooter-zimagez.c:228
+#, c-format
+msgid "Taken on %s, at %s"
+msgstr ""
+
 #. Start the user soup session
-#: ../lib/screenshooter-zimagez.c:275
+#: ../lib/screenshooter-zimagez.c:295
 msgid "Initialize the connection..."
 msgstr "Kapcsolat előkészítése…"
 
-#: ../lib/screenshooter-zimagez.c:311
+#: ../lib/screenshooter-zimagez.c:341
 msgid ""
 "Please file the following fields with your <a href=\"http://www.zimagez.com"
 "\">ZimageZ</a> \n"
@@ -222,11 +200,11 @@ msgstr ""
 "a>felhasználói nevét,\n"
 "jelszavát és a képernyőkép leírását."
 
-#: ../lib/screenshooter-zimagez.c:368
+#: ../lib/screenshooter-zimagez.c:398
 msgid "Check the user information..."
 msgstr "Felhasználói információk ellenőrzése…"
 
-#: ../lib/screenshooter-zimagez.c:375
+#: ../lib/screenshooter-zimagez.c:405
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You "
 "must fill all the fields.</span>"
@@ -234,17 +212,19 @@ msgstr ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">Ki "
 "kell töltenie az összes mezőt.</span>"
 
-#: ../lib/screenshooter-zimagez.c:389
+#: ../lib/screenshooter-zimagez.c:419
 msgid "Login on ZimageZ..."
 msgstr "Bejelentkezés a ZimageZ oldalra…"
 
-#: ../lib/screenshooter-zimagez.c:429 ../lib/screenshooter-zimagez.c:580
+#: ../lib/screenshooter-zimagez.c:459 ../lib/screenshooter-zimagez.c:610
 msgid ""
 "An unexpected reply from ZimageZ was received. The upload of the screenshot "
 "failed."
-msgstr "Váratlan válasz érkezett a ZimageZ oldalról. A képernyőkép feltöltése meghiúsult."
+msgstr ""
+"Váratlan válasz érkezett a ZimageZ oldalról. A képernyőkép feltöltése "
+"meghiúsult."
 
-#: ../lib/screenshooter-zimagez.c:468
+#: ../lib/screenshooter-zimagez.c:498
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The "
 "user and the password you entered do not match. Please retry.</span>"
@@ -252,30 +232,30 @@ msgstr ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">A "
 "felhasználónév és jelszó nem megfelelő. Próbálja újra.</span>"
 
-#: ../lib/screenshooter-zimagez.c:526
+#: ../lib/screenshooter-zimagez.c:556
 msgid "Upload the screenshot..."
 msgstr "Képernyőkép feltöltése…"
 
-#: ../lib/screenshooter-zimagez.c:559
+#: ../lib/screenshooter-zimagez.c:589
 #, c-format
 msgid "An error occurred while uploading the screenshot."
 msgstr "Hiba történt a képernyőkép feltöltésekor."
 
 #. End the user session
-#: ../lib/screenshooter-zimagez.c:592
+#: ../lib/screenshooter-zimagez.c:622
 msgid "Close the session on ZimageZ..."
 msgstr "Munkamenet bezárása a ZimageZ oldallal…"
 
-#: ../lib/screenshooter-zimagez.c:659
+#: ../lib/screenshooter-zimagez.c:692
 msgid "Details about the screenshot for ZimageZ"
 msgstr "A képernyőkép leírása a ZimageZ oldalra"
 
 #. Create the user label
-#: ../lib/screenshooter-zimagez.c:701
+#: ../lib/screenshooter-zimagez.c:734
 msgid "User:"
 msgstr "Felhasználó:"
 
-#: ../lib/screenshooter-zimagez.c:712
+#: ../lib/screenshooter-zimagez.c:745
 msgid ""
 "Your Zimagez user name, if you do not have one yet please create one on the "
 "Web page linked above"
@@ -284,60 +264,61 @@ msgstr ""
 "hivatkozott weboldalon."
 
 #. Create the password label
-#: ../lib/screenshooter-zimagez.c:717
+#: ../lib/screenshooter-zimagez.c:751
 msgid "Password:"
 msgstr "Jelszó:"
 
-#: ../lib/screenshooter-zimagez.c:727
+#: ../lib/screenshooter-zimagez.c:761
 msgid "The password for the user above"
 msgstr "A fenti felhasználó jelszava"
 
 #. Create the title label
-#: ../lib/screenshooter-zimagez.c:732
+#: ../lib/screenshooter-zimagez.c:767
 msgid "Title:"
 msgstr "Cím:"
 
-#: ../lib/screenshooter-zimagez.c:742
+#: ../lib/screenshooter-zimagez.c:777
 msgid ""
 "The title of the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
 msgstr "A képernyőkép címe, a képernyőkép megjelenítésekor lesz felhasználva"
 
 #. Create the comment label
-#: ../lib/screenshooter-zimagez.c:747
+#: ../lib/screenshooter-zimagez.c:783
 msgid "Comment:"
 msgstr "Megjegyzés:"
 
-#: ../lib/screenshooter-zimagez.c:758
+#: ../lib/screenshooter-zimagez.c:794
 msgid ""
 "A comment on the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
-msgstr "Megjegyzés a képernyőképhez, a képernyőkép megjelenítésekor lesz felhasználva"
+msgstr ""
+"Megjegyzés a képernyőképhez, a képernyőkép megjelenítésekor lesz felhasználva"
 
-#: ../lib/screenshooter-zimagez.c:877
+#: ../lib/screenshooter-zimagez.c:917
 #, c-format
 msgid "<a href=\"%s\">Full size image</a>"
 msgstr "<a href=\"%s\">Teljes méretű kép</a>"
 
-#: ../lib/screenshooter-zimagez.c:879
+#: ../lib/screenshooter-zimagez.c:919
 #, c-format
 msgid "<a href=\"%s\">Large thumbnail</a>"
 msgstr "<a href=\"%s\">Nagy bélyegkép</a>"
 
-#: ../lib/screenshooter-zimagez.c:881
+#: ../lib/screenshooter-zimagez.c:921
 #, c-format
 msgid "<a href=\"%s\">Small thumbnail</a>"
 msgstr "<a href=\"%s\">Kis bélyegkép</a>"
 
-#: ../lib/screenshooter-zimagez.c:901
+#: ../lib/screenshooter-zimagez.c:937
 msgid "My screenshot on ZimageZ"
 msgstr "A képernyőképem a ZimageZ oldalon"
 
-#: ../lib/screenshooter-zimagez.c:927
+#: ../lib/screenshooter-zimagez.c:963
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Links</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Hivatkozások</span>"
 
-#: ../lib/screenshooter-zimagez.c:972
+#: ../lib/screenshooter-zimagez.c:1008
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing "
 "to the full size image</span>"
@@ -346,20 +327,20 @@ msgstr ""
 "bélyegkép kódja</span>"
 
 #. HTML title
-#: ../lib/screenshooter-zimagez.c:988
+#: ../lib/screenshooter-zimagez.c:1024
 msgid "HTML"
 msgstr "HTML"
 
 #. BB title
-#: ../lib/screenshooter-zimagez.c:1009
+#: ../lib/screenshooter-zimagez.c:1045
 msgid "BBCode for forums"
 msgstr "BBCode fórumokhoz"
 
-#: ../lib/screenshooter-zimagez.c:1129
+#: ../lib/screenshooter-zimagez.c:1174
 msgid "ZimageZ"
 msgstr "ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:1162
+#: ../lib/screenshooter-zimagez.c:1207
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Status</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Állapot</span>"
 
@@ -373,27 +354,36 @@ msgstr "_Hivatkozás megnyitása"
 msgid "Copy _Link Address"
 msgstr "_Hivatkozás címének másolása"
 
-#: ../src/main.c:49
+#: ../src/main.c:48
 msgid "Delay in seconds before taking the screenshot"
 msgstr "Késleltetés a képernyőkép készítése előtt másodpercben"
 
-#: ../src/main.c:59
-msgid "Do not display the save dialog"
-msgstr "Ne jelenjen meg a mentés ablak"
-
-#: ../src/main.c:64
-msgid "Do not display the mouse on the screenshot"
+#: ../src/main.c:58
+#, fuzzy
+msgid "Display the mouse on the screenshot"
 msgstr "Ne jelenjen meg az egér a képernyőképen"
 
-#: ../src/main.c:81
+#: ../src/main.c:75
 msgid "Directory where the screenshot will be saved"
 msgstr "Könyvtár a képernyőképek mentéséhez"
 
-#: ../src/main.c:91
+#: ../src/main.c:85
 msgid "Version information"
 msgstr "Verzióinformációk"
 
-#: ../src/main.c:128
+#: ../src/main.c:134
+#, c-format
+msgid "Conflicting options: --%s and --%s cannot be used at the same time.\n"
+msgstr ""
+
+#: ../src/main.c:136
+#, c-format
+msgid ""
+"The --%s option is only used when --fullscreen, --window or --region is "
+"given. It will be ignored.\n"
+msgstr ""
+
+#: ../src/main.c:150
 #, c-format
 msgid ""
 "%s: %s\n"
@@ -402,13 +392,52 @@ msgstr ""
 "%s: %s\n"
 "Az elérhető kapcsolók listájáért adja ki az %s --help parancsot.\n"
 
-#: ../src/main.c:223
+#: ../src/main.c:282
 #, c-format
 msgid "%s is not a valid directory, the default directory will be used."
 msgstr "%s nem érvényes könyvtár, az alapértelmezett kerül felhasználásra."
 
 #: ../src/xfce4-screenshooter.desktop.in.in.h:2
 #: ../panel-plugin/screenshooter.desktop.in.in.h:2
-msgid "Take screenshots of the entire screen, of the active window or of a region"
-msgstr "Képernyőkép készítése a teljes képernyőről, egy ablakról vagy területről"
+msgid ""
+"Take screenshots of the entire screen, of the active window or of a region"
+msgstr ""
+"Képernyőkép készítése a teljes képernyőről, egy ablakról vagy területről"
+
+#~ msgid "Screenshot.png"
+#~ msgstr "Képernyőkép.png"
+
+#~ msgid "Screenshot-%d.png"
+#~ msgstr "Képernyőkép-%d.png"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
+#~ msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Felvétel után</span>"
+
+#~ msgid "Show the save dialog"
+#~ msgstr "Mentés ablak megjelenítése"
+
+#~ msgid ""
+#~ "The save dialog allows you to change the file name and the save location"
+#~ msgstr ""
+#~ "A mentés ablak lehetővé teszi a fájlnév és a mentés helyének megadását"
+
+#~ msgid "Close the application"
+#~ msgstr "Alkalmazás bezárása"
+
+#~ msgid ""
+#~ "If unchecked, the current window will be displayed again after the "
+#~ "screenshot has been taken to allow you to take several screenshots in a "
+#~ "row"
+#~ msgstr ""
+#~ "Ha nincs bejelölve, a jelenlegi ablak újra megjelenik a képernyőkép "
+#~ "elkészülte után, így egymás után több képet is készíthet."
+
+#~ msgid "Default save location"
+#~ msgstr "Alapértelmezett mentési hely"
+
+#~ msgid "Set the default save location"
+#~ msgstr "Az alapértelmezett mentési hely beállítása"
 
+#~ msgid "Do not display the save dialog"
+#~ msgstr "Ne jelenjen meg a mentés ablak"
diff --git a/po/id.po b/po/id.po
index 676076e..c86abe7 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-screenshooter-plugin 1.4.91\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-31 14:02+0200\n"
+"POT-Creation-Date: 2009-11-15 00:29+0100\n"
 "PO-Revision-Date: 2009-06-10 23:39+0700\n"
 "Last-Translator: Andhika Padmawan <andhika.padmawan at gmail.com>\n"
 "Language-Team: Indonesian <translation-team-id at lists.sourceforge.net>\n"
@@ -15,25 +15,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/screenshooter-dialogs.c:283
-msgid "Screenshot.png"
-msgstr "Cuplikanlayar.png"
-
-#: ../lib/screenshooter-dialogs.c:300
-#, c-format
-msgid "Screenshot-%d.png"
-msgstr "Cuplikanlayar-%d.png"
-
-#: ../lib/screenshooter-dialogs.c:493
+#: ../lib/screenshooter-dialogs.c:478
 #, c-format
 msgid "%.2fKb of %.2fKb"
 msgstr "%.2fKb dari %.2fKb"
 
-#: ../lib/screenshooter-dialogs.c:577
+#: ../lib/screenshooter-dialogs.c:560
 msgid "Transfer"
 msgstr "Transfer"
 
-#: ../lib/screenshooter-dialogs.c:600
+#: ../lib/screenshooter-dialogs.c:581
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being "
 "transferred to:</span>"
@@ -41,49 +32,51 @@ msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Cuplikan layar sedang "
 "ditransfer ke:</span>"
 
-#: ../lib/screenshooter-dialogs.c:724 ../lib/screenshooter-dialogs.c:741
+#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
 msgid "Screenshot"
 msgstr "Cuplikan Layar"
 
-#: ../lib/screenshooter-dialogs.c:736
+#: ../lib/screenshooter-dialogs.c:709
 msgid "Take a screenshot"
 msgstr "Ambil cuplikan layar"
 
-#: ../lib/screenshooter-dialogs.c:751
+#: ../lib/screenshooter-dialogs.c:724
 msgid "Preferences"
 msgstr "Pengaturan"
 
-#: ../lib/screenshooter-dialogs.c:793
+#: ../lib/screenshooter-dialogs.c:754
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Region to capture</span>"
 msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Daerah akan ditangkap</span>"
 
-#: ../lib/screenshooter-dialogs.c:820
+#: ../lib/screenshooter-dialogs.c:774
 msgid "Entire screen"
 msgstr "Seluruh layar"
 
-#: ../lib/screenshooter-dialogs.c:830 ../src/main.c:58
-#: ../panel-plugin/screenshooter-plugin.c:292
+#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../panel-plugin/screenshooter-plugin.c:308
 msgid "Take a screenshot of the entire screen"
 msgstr "Ambil cuplikan layar dari seluruh layar"
 
-#: ../lib/screenshooter-dialogs.c:841
+#: ../lib/screenshooter-dialogs.c:789
 msgid "Active window"
 msgstr "Jendela aktif"
 
-#: ../lib/screenshooter-dialogs.c:851 ../src/main.c:104
-#: ../panel-plugin/screenshooter-plugin.c:297
+#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr "Ambil cuplikan layar jendela yang aktif"
 
-#: ../lib/screenshooter-dialogs.c:862
+#: ../lib/screenshooter-dialogs.c:804
 msgid "Select a region"
 msgstr "Pilih daerah"
 
-#: ../lib/screenshooter-dialogs.c:872 ../src/main.c:78
-#: ../panel-plugin/screenshooter-plugin.c:302
+#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../panel-plugin/screenshooter-plugin.c:318
 msgid ""
 "Select a region to be captured by clicking a point of the screen without "
 "releasing the mouse button, dragging your mouse to the other corner of the "
@@ -93,143 +86,124 @@ msgstr ""
 "melepas tombol tetikus, tarik tetikus anda ke sudut yang lain, lalu lepas "
 "tombol tetikus."
 
-#: ../lib/screenshooter-dialogs.c:884
+#: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
 msgstr "Tangkap penunjuk tetikus"
 
-#: ../lib/screenshooter-dialogs.c:892
+#: ../lib/screenshooter-dialogs.c:824
 msgid "Display the mouse pointer on the screenshot"
 msgstr "Tampilkan penunjuk tetikus di cuplikan layar"
 
-#: ../lib/screenshooter-dialogs.c:917
+#: ../lib/screenshooter-dialogs.c:840
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
 msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Jeda sebelum menangkap</span>"
 
-#: ../lib/screenshooter-dialogs.c:952
+#: ../lib/screenshooter-dialogs.c:862
 msgid "Delay in seconds before the screenshot is taken"
 msgstr "Jeda dalam detik sebelum cuplikan layar diambil"
 
-#: ../lib/screenshooter-dialogs.c:958
+#: ../lib/screenshooter-dialogs.c:865
 msgid "seconds"
 msgstr "detik"
 
-#: ../lib/screenshooter-dialogs.c:984
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
-msgstr ""
-"<span weight=\"bold\" stretch=\"semiexpanded\">Setelah menangkap</span>"
-
-#. Display the save dialog checkbox
-#: ../lib/screenshooter-dialogs.c:1007
-msgid "Show the save dialog"
-msgstr "Tampilkan dialog simpan"
-
-#: ../lib/screenshooter-dialogs.c:1013
-msgid ""
-"The save dialog allows you to change the file name and the save location"
-msgstr ""
-"Dialog simpan mengizinkan anda untuk mengubah nama berkas dan lokasi "
-"penyimpanan"
-
-#: ../lib/screenshooter-dialogs.c:1027
-msgid "Close the application"
-msgstr "Tutup aplikasi"
-
-#: ../lib/screenshooter-dialogs.c:1033
-msgid ""
-"If unchecked, the current window will be displayed again after the "
-"screenshot has been taken to allow you to take several screenshots in a row"
+#: ../lib/screenshooter-dialogs.c:917
+msgid "Action"
 msgstr ""
-"Jika tidak dicentang, jendela saat ini akan ditampilkan lagi setelah "
-"cuplikan layar telah diambil sehingga anda dapat mengambil beberapa "
-"cuplikan layar secara berurutan"
 
-#: ../lib/screenshooter-dialogs.c:1056
+#: ../lib/screenshooter-dialogs.c:945
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Action</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Aksi</span>"
 
 #. Save option radio button
-#: ../lib/screenshooter-dialogs.c:1081
-msgid "Save in:"
+#: ../lib/screenshooter-dialogs.c:961
+#, fuzzy
+msgid "Save"
 msgstr "Simpan di:"
 
-#: ../lib/screenshooter-dialogs.c:1089
+#: ../lib/screenshooter-dialogs.c:966
 msgid "Save the screenshot to a PNG file"
 msgstr "Simpan cuplikan layar sebagai berkas PNG"
 
-#: ../lib/screenshooter-dialogs.c:1104
-msgid "Default save location"
-msgstr "Lokasi penyimpanan standar"
-
-#: ../lib/screenshooter-dialogs.c:1114
-msgid "Set the default save location"
-msgstr "Atur lokasi penyimpanan standar"
-
-#: ../lib/screenshooter-dialogs.c:1127
+#: ../lib/screenshooter-dialogs.c:975
 msgid "Copy to the clipboard"
 msgstr "Salin ke papan klip"
 
-#: ../lib/screenshooter-dialogs.c:1132
+#: ../lib/screenshooter-dialogs.c:977
 msgid "Copy the screenshot to the clipboard so that it can be pasted later"
 msgstr "Simpan cuplikan layar ke papan klip agar dapat direkatkan nanti"
 
-#: ../lib/screenshooter-dialogs.c:1147
+#: ../lib/screenshooter-dialogs.c:994
 msgid "Open with:"
 msgstr "Buka dengan:"
 
-#: ../lib/screenshooter-dialogs.c:1158
+#: ../lib/screenshooter-dialogs.c:1000
 msgid "Open the screenshot with the chosen application"
 msgstr "Buka cuplikan layar dengan aplikasi yang dipilih"
 
-#: ../lib/screenshooter-dialogs.c:1191 ../src/main.c:73
+#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
 msgid "Application to open the screenshot"
 msgstr "Aplikasi untuk membuka cuplikan layar"
 
-#: ../lib/screenshooter-dialogs.c:1204
+#: ../lib/screenshooter-dialogs.c:1028
 msgid "Host on ZimageZ"
 msgstr "Simpan di ZimageZ"
 
-#: ../lib/screenshooter-dialogs.c:1210 ../src/main.c:92
+#: ../lib/screenshooter-dialogs.c:1032 ../src/main.c:80
 msgid "Host the screenshot on ZimageZ, a free online image hosting service"
-msgstr "Simpan cuplikan layar di ZimageZ, layanan penyimpanan citra daring gratis"
+msgstr ""
+"Simpan cuplikan layar di ZimageZ, layanan penyimpanan citra daring gratis"
 
-#: ../lib/screenshooter-dialogs.c:1255
+#: ../lib/screenshooter-dialogs.c:1046
+#, fuzzy
+msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Preview</span>"
+msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Tautan</span>"
+
+#: ../lib/screenshooter-dialogs.c:1107
 msgid "Save screenshot as..."
 msgstr "Simpan cuplikan layar sebagai..."
 
-#. Start the user XML RPC session
-#: ../lib/screenshooter-zimagez.c:159
-msgid "Initialize the connection..."
-msgstr "Menginisialisasi koneksi..."
+#: ../lib/screenshooter-zimagez.c:134
+#, fuzzy, c-format
+msgid "An error occured when creating the XMLRPC request."
+msgstr "Galat terjadi ketika menggunggah cuplikan layar."
+
+#: ../lib/screenshooter-zimagez.c:153
+#, fuzzy, c-format
+msgid "An error occured when transfering the data to ZimageZ."
+msgstr "Galat terjadi ketika menggunggah cuplikan layar."
 
-#: ../lib/screenshooter-zimagez.c:172 ../lib/screenshooter-zimagez.c:332
-#: ../lib/screenshooter-zimagez.c:361 ../lib/screenshooter-zimagez.c:389
-#: ../lib/screenshooter-zimagez.c:520 ../lib/screenshooter-zimagez.c:543
-#: ../lib/screenshooter-zimagez.c:580
+#: ../lib/screenshooter-zimagez.c:178
+#, fuzzy, c-format
+msgid "An error occured when parsing the response from ZimageZ."
+msgstr "Galat terjadi ketika menggunggah cuplikan layar."
+
+#: ../lib/screenshooter-zimagez.c:228
 #, c-format
-msgid ""
-"An error occurred during the XML exchange: %s (%d).\n"
-" The screenshot could not be uploaded."
+msgid "Taken on %s, at %s"
 msgstr ""
-"Galat terjadi ketika penukaran XML: %s (%d).\n"
-" Cuplikan layar tak dapat diunggah."
 
-#: ../lib/screenshooter-zimagez.c:223
+#. Start the user soup session
+#: ../lib/screenshooter-zimagez.c:295
+msgid "Initialize the connection..."
+msgstr "Menginisialisasi koneksi..."
+
+#: ../lib/screenshooter-zimagez.c:341
 msgid ""
 "Please file the following fields with your <a href=\"http://www.zimagez.com"
 "\">ZimageZ</a> \n"
 "user name, passsword and details about the screenshot."
 msgstr ""
-"Silakan isi ruang kosong berikut dengan nama pengguna, dan sandi "
-"<a href=\"http://www.zimagez.com\">ZimageZ</a> anda, \n"
+"Silakan isi ruang kosong berikut dengan nama pengguna, dan sandi <a href="
+"\"http://www.zimagez.com\">ZimageZ</a> anda, \n"
 "beserta detail dari cuplikan layar."
 
-#: ../lib/screenshooter-zimagez.c:283
+#: ../lib/screenshooter-zimagez.c:398
 msgid "Check the user information..."
 msgstr "Cek informasi pengguna..."
 
-#: ../lib/screenshooter-zimagez.c:305
+#: ../lib/screenshooter-zimagez.c:405
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You "
 "must fill all the fields.</span>"
@@ -237,11 +211,17 @@ msgstr ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">Anda "
 "harus mengisi semua ruang kosong.</span>"
 
-#: ../lib/screenshooter-zimagez.c:320
+#: ../lib/screenshooter-zimagez.c:419
 msgid "Login on ZimageZ..."
 msgstr "Log masuk ke ZimageZ..."
 
-#: ../lib/screenshooter-zimagez.c:436
+#: ../lib/screenshooter-zimagez.c:459 ../lib/screenshooter-zimagez.c:610
+msgid ""
+"An unexpected reply from ZimageZ was received. The upload of the screenshot "
+"failed."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:498
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The "
 "user and the password you entered do not match. Please retry.</span>"
@@ -249,30 +229,30 @@ msgstr ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">Nama "
 "dan sandi yang anda masukkan tidak sesuai. Silakan ulangi.</span>"
 
-#: ../lib/screenshooter-zimagez.c:501
+#: ../lib/screenshooter-zimagez.c:556
 msgid "Upload the screenshot..."
 msgstr "Unggah cuplikan layar"
 
-#: ../lib/screenshooter-zimagez.c:559
+#: ../lib/screenshooter-zimagez.c:589
 #, c-format
 msgid "An error occurred while uploading the screenshot."
 msgstr "Galat terjadi ketika menggunggah cuplikan layar."
 
 #. End the user session
-#: ../lib/screenshooter-zimagez.c:597
+#: ../lib/screenshooter-zimagez.c:622
 msgid "Close the session on ZimageZ..."
 msgstr "Menutup sesi di ZimageZ..."
 
-#: ../lib/screenshooter-zimagez.c:650
+#: ../lib/screenshooter-zimagez.c:692
 msgid "Details about the screenshot for ZimageZ"
 msgstr "Detail tentang cuplikan layar untuk ZimageZ"
 
 #. Create the user label
-#: ../lib/screenshooter-zimagez.c:692
+#: ../lib/screenshooter-zimagez.c:734
 msgid "User:"
 msgstr "Pengguna:"
 
-#: ../lib/screenshooter-zimagez.c:703
+#: ../lib/screenshooter-zimagez.c:745
 msgid ""
 "Your Zimagez user name, if you do not have one yet please create one on the "
 "Web page linked above"
@@ -281,20 +261,20 @@ msgstr ""
 "tautan halaman web di atas"
 
 #. Create the password label
-#: ../lib/screenshooter-zimagez.c:708
+#: ../lib/screenshooter-zimagez.c:751
 msgid "Password:"
 msgstr "Sandi:"
 
-#: ../lib/screenshooter-zimagez.c:718
+#: ../lib/screenshooter-zimagez.c:761
 msgid "The password for the user above"
 msgstr "Sandi untuk pengguna di atas"
 
 #. Create the title label
-#: ../lib/screenshooter-zimagez.c:723
+#: ../lib/screenshooter-zimagez.c:767
 msgid "Title:"
 msgstr "Judul:"
 
-#: ../lib/screenshooter-zimagez.c:733
+#: ../lib/screenshooter-zimagez.c:777
 msgid ""
 "The title of the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
@@ -303,11 +283,11 @@ msgstr ""
 "di ZimageZ"
 
 #. Create the comment label
-#: ../lib/screenshooter-zimagez.c:738
+#: ../lib/screenshooter-zimagez.c:783
 msgid "Comment:"
 msgstr "Komentar:"
 
-#: ../lib/screenshooter-zimagez.c:749
+#: ../lib/screenshooter-zimagez.c:794
 msgid ""
 "A comment on the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
@@ -315,30 +295,30 @@ msgstr ""
 "Komentar di cuplikan layar, komentar akan digunakan ketika menampilkan "
 "cuplikan layar di ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:870
+#: ../lib/screenshooter-zimagez.c:917
 #, c-format
 msgid "<a href=\"%s\">Full size image</a>"
 msgstr "<a href=\"%s\">Citra ukuran penuh</a>"
 
-#: ../lib/screenshooter-zimagez.c:872
+#: ../lib/screenshooter-zimagez.c:919
 #, c-format
 msgid "<a href=\"%s\">Large thumbnail</a>"
 msgstr "<a href=\"%s\">Miniatur besar</a>"
 
-#: ../lib/screenshooter-zimagez.c:874
+#: ../lib/screenshooter-zimagez.c:921
 #, c-format
 msgid "<a href=\"%s\">Small thumbnail</a>"
 msgstr "<a href=\"%s\">Miniatur kecil</a>"
 
-#: ../lib/screenshooter-zimagez.c:894
+#: ../lib/screenshooter-zimagez.c:937
 msgid "My screenshot on ZimageZ"
 msgstr "Cuplikan layar saya di ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:920
+#: ../lib/screenshooter-zimagez.c:963
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Links</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Tautan</span>"
 
-#: ../lib/screenshooter-zimagez.c:965
+#: ../lib/screenshooter-zimagez.c:1008
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing "
 "to the full size image</span>"
@@ -347,20 +327,20 @@ msgstr ""
 "menunjuk ke citra ukuran penuh</span>"
 
 #. HTML title
-#: ../lib/screenshooter-zimagez.c:981
+#: ../lib/screenshooter-zimagez.c:1024
 msgid "HTML"
 msgstr "HTML"
 
 #. BB title
-#: ../lib/screenshooter-zimagez.c:1002
+#: ../lib/screenshooter-zimagez.c:1045
 msgid "BBCode for forums"
 msgstr "BBCode untuk forum"
 
-#: ../lib/screenshooter-zimagez.c:1122
+#: ../lib/screenshooter-zimagez.c:1174
 msgid "ZimageZ"
 msgstr "ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:1155
+#: ../lib/screenshooter-zimagez.c:1207
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Status</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Status</span>"
 
@@ -374,29 +354,38 @@ msgstr "_Buka Tautan"
 msgid "Copy _Link Address"
 msgstr "Salin Alamat _Taut"
 
-#: ../src/main.c:53
+#: ../src/main.c:48
 msgid "Delay in seconds before taking the screenshot"
 msgstr "Jeda dalam detik sebelum mengambil cuplikan layar"
 
-#: ../src/main.c:63
-msgid "Do not display the save dialog"
-msgstr "Jangan tampilkan dialog simpan"
-
-#: ../src/main.c:68
-msgid "Do not display the mouse on the screenshot"
+#: ../src/main.c:58
+#, fuzzy
+msgid "Display the mouse on the screenshot"
 msgstr "Jangan tampilkan tetikus di cuplikan layar"
 
-#: ../src/main.c:85
+#: ../src/main.c:75
 msgid "Directory where the screenshot will be saved"
 msgstr "Direktori tempat cuplikan layar akan disimpan"
 
-#: ../src/main.c:99
+#: ../src/main.c:85
 msgid "Version information"
 msgstr "Informasi versi"
 
+#: ../src/main.c:134
+#, c-format
+msgid "Conflicting options: --%s and --%s cannot be used at the same time.\n"
+msgstr ""
+
 #: ../src/main.c:136
 #, c-format
 msgid ""
+"The --%s option is only used when --fullscreen, --window or --region is "
+"given. It will be ignored.\n"
+msgstr ""
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
@@ -404,7 +393,7 @@ msgstr ""
 "Gunakan %s --help untuk melihat senarai lengkap opsi baris perintah yang "
 "tersedia.\n"
 
-#: ../src/main.c:235
+#: ../src/main.c:282
 #, c-format
 msgid "%s is not a valid directory, the default directory will be used."
 msgstr "%s bukan direktori yang sah, direktori standar yang akan digunakan."
@@ -417,6 +406,54 @@ msgstr ""
 "Ambil cuplikan layar dari seluruh layar, dari jendela yang aktif atau dari "
 "sebuah daerah"
 
+#~ msgid "Screenshot.png"
+#~ msgstr "Cuplikanlayar.png"
+
+#~ msgid "Screenshot-%d.png"
+#~ msgstr "Cuplikanlayar-%d.png"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">Setelah menangkap</span>"
+
+#~ msgid "Show the save dialog"
+#~ msgstr "Tampilkan dialog simpan"
+
+#~ msgid ""
+#~ "The save dialog allows you to change the file name and the save location"
+#~ msgstr ""
+#~ "Dialog simpan mengizinkan anda untuk mengubah nama berkas dan lokasi "
+#~ "penyimpanan"
+
+#~ msgid "Close the application"
+#~ msgstr "Tutup aplikasi"
+
+#~ msgid ""
+#~ "If unchecked, the current window will be displayed again after the "
+#~ "screenshot has been taken to allow you to take several screenshots in a "
+#~ "row"
+#~ msgstr ""
+#~ "Jika tidak dicentang, jendela saat ini akan ditampilkan lagi setelah "
+#~ "cuplikan layar telah diambil sehingga anda dapat mengambil beberapa "
+#~ "cuplikan layar secara berurutan"
+
+#~ msgid "Default save location"
+#~ msgstr "Lokasi penyimpanan standar"
+
+#~ msgid "Set the default save location"
+#~ msgstr "Atur lokasi penyimpanan standar"
+
+#~ msgid ""
+#~ "An error occurred during the XML exchange: %s (%d).\n"
+#~ " The screenshot could not be uploaded."
+#~ msgstr ""
+#~ "Galat terjadi ketika penukaran XML: %s (%d).\n"
+#~ " Cuplikan layar tak dapat diunggah."
+
+#~ msgid "Do not display the save dialog"
+#~ msgstr "Jangan tampilkan dialog simpan"
+
 #, fuzzy
 #~ msgid "Tak a screenshot of the entire screen"
 #~ msgstr "Ambil cuplikan layar dari seluruh layar"
diff --git a/po/it.po b/po/it.po
index abb5165..5865fc1 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,87 +5,82 @@
 # Glossario:
 # screenshot=istantanea
 # take a screenshoot = scatta un'istantanea
-# 
-# 
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-screenshooter trunk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-31 14:02+0200\n"
+"POT-Creation-Date: 2009-11-15 00:29+0100\n"
 "PO-Revision-Date: 2009-06-15 11:33+0200\n"
 "Last-Translator: gianluca foddis <gianluca.foddis at gmail.com>\n"
 "Language-Team: it <xfce-it-translators at googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/screenshooter-dialogs.c:283
-msgid "Screenshot.png"
-msgstr "Istantanea.png"
-
-#: ../lib/screenshooter-dialogs.c:300
-#, c-format
-msgid "Screenshot-%d.png"
-msgstr "Istantanea-%d.png"
-
-#: ../lib/screenshooter-dialogs.c:493
+#: ../lib/screenshooter-dialogs.c:478
 #, c-format
 msgid "%.2fKb of %.2fKb"
 msgstr "%.2fKb·di·%.2fKb"
 
-#: ../lib/screenshooter-dialogs.c:577
+#: ../lib/screenshooter-dialogs.c:560
 msgid "Transfer"
 msgstr "Trasferimento"
 
-#: ../lib/screenshooter-dialogs.c:600
+#: ../lib/screenshooter-dialogs.c:581
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being "
 "transferred to:</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">L'istantanea è in  corso di trasferimento in:</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">L'istantanea è in  corso di "
+"trasferimento in:</span>"
 
-#: ../lib/screenshooter-dialogs.c:724 ../lib/screenshooter-dialogs.c:741
+#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
 msgid "Screenshot"
 msgstr "Istantanea"
 
-#: ../lib/screenshooter-dialogs.c:736
+#: ../lib/screenshooter-dialogs.c:709
 msgid "Take a screenshot"
 msgstr "Scatta un'istantanea"
 
-#: ../lib/screenshooter-dialogs.c:751
+#: ../lib/screenshooter-dialogs.c:724
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: ../lib/screenshooter-dialogs.c:793
+#: ../lib/screenshooter-dialogs.c:754
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Region to capture</span>"
 msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Regione da catturare</span>"
 
-#: ../lib/screenshooter-dialogs.c:820
+#: ../lib/screenshooter-dialogs.c:774
 msgid "Entire screen"
 msgstr "Schermo intero"
 
-#: ../lib/screenshooter-dialogs.c:830 ../src/main.c:58
-#: ../panel-plugin/screenshooter-plugin.c:292
+#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../panel-plugin/screenshooter-plugin.c:308
 msgid "Take a screenshot of the entire screen"
 msgstr "Scatta un'istantanea dell'intero schermo"
 
-#: ../lib/screenshooter-dialogs.c:841
+#: ../lib/screenshooter-dialogs.c:789
 msgid "Active window"
 msgstr "Finestra attiva"
 
-#: ../lib/screenshooter-dialogs.c:851 ../src/main.c:104
-#: ../panel-plugin/screenshooter-plugin.c:297
+#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr "Scatta un'istantanea della finestra attiva"
 
-#: ../lib/screenshooter-dialogs.c:862
+#: ../lib/screenshooter-dialogs.c:804
 msgid "Select a region"
 msgstr "Regione di schermo"
 
-#: ../lib/screenshooter-dialogs.c:872 ../src/main.c:78
-#: ../panel-plugin/screenshooter-plugin.c:302
+#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../panel-plugin/screenshooter-plugin.c:318
 msgid ""
 "Select a region to be captured by clicking a point of the screen without "
 "releasing the mouse button, dragging your mouse to the other corner of the "
@@ -95,257 +90,264 @@ msgstr ""
 "senza rilasciare il tasto del mouse, poi spostare il mouse nell'altro angolo "
 "della regione, quindi rilasciare il tasto del mouse."
 
-#: ../lib/screenshooter-dialogs.c:884
+#: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
 msgstr "Includi il puntatore del mouse"
 
-#: ../lib/screenshooter-dialogs.c:892
+#: ../lib/screenshooter-dialogs.c:824
 msgid "Display the mouse pointer on the screenshot"
 msgstr "Mostra il puntatore del mouse nell'istantanea"
 
-#: ../lib/screenshooter-dialogs.c:917
+#: ../lib/screenshooter-dialogs.c:840
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
 msgstr ""
-"<span weight=\"bold\" stretch=\"semiexpanded\">Attesa prima della cattura</span>"
+"<span weight=\"bold\" stretch=\"semiexpanded\">Attesa prima della cattura</"
+"span>"
 
-#: ../lib/screenshooter-dialogs.c:952
+#: ../lib/screenshooter-dialogs.c:862
 msgid "Delay in seconds before the screenshot is taken"
 msgstr "Ritardo, in secondi, prima di scattare l'istantanea"
 
-#: ../lib/screenshooter-dialogs.c:958
+#: ../lib/screenshooter-dialogs.c:865
 msgid "seconds"
 msgstr "secondi"
 
-#: ../lib/screenshooter-dialogs.c:984
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Dopo la cattura</span>"
-
-#. Display the save dialog checkbox
-#: ../lib/screenshooter-dialogs.c:1007
-msgid "Show the save dialog"
-msgstr "Mostra il dialogo di salvataggio"
-
-#: ../lib/screenshooter-dialogs.c:1013
-msgid ""
-"The save dialog allows you to change the file name and the save location"
-msgstr "Il dialogo di salvataggio consente di cambiare il nome e la posizione del file"
-
-#: ../lib/screenshooter-dialogs.c:1027
-msgid "Close the application"
-msgstr "Chiudi l'applicazione"
-
-#: ../lib/screenshooter-dialogs.c:1033
-msgid ""
-"If unchecked, the current window will be displayed again after the "
-"screenshot has been taken to allow you to take several screenshots in a row"
-msgstr "Se dissabilitato, la finestra corrent verrà mostrata nuovamente dopo la cattura dell'istantanea in modo da poter effettuare più istantanee di seguito"
+#: ../lib/screenshooter-dialogs.c:917
+msgid "Action"
+msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1056
+#: ../lib/screenshooter-dialogs.c:945
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Action</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Azione</span>"
 
 #. Save option radio button
-#: ../lib/screenshooter-dialogs.c:1081
-msgid "Save in:"
+#: ../lib/screenshooter-dialogs.c:961
+#, fuzzy
+msgid "Save"
 msgstr "Salva in:"
 
-#: ../lib/screenshooter-dialogs.c:1089
+#: ../lib/screenshooter-dialogs.c:966
 msgid "Save the screenshot to a PNG file"
 msgstr "Salva l'istantanea come file PNG"
 
-#: ../lib/screenshooter-dialogs.c:1104
-msgid "Default save location"
-msgstr "Posizione di salvataggio predefinita"
-
-#: ../lib/screenshooter-dialogs.c:1114
-msgid "Set the default save location"
-msgstr "Imposta la posizione di salvataggio predefinita"
-
-#: ../lib/screenshooter-dialogs.c:1127
+#: ../lib/screenshooter-dialogs.c:975
 msgid "Copy to the clipboard"
 msgstr "Copia negli appunti"
 
-#: ../lib/screenshooter-dialogs.c:1132
+#: ../lib/screenshooter-dialogs.c:977
 msgid "Copy the screenshot to the clipboard so that it can be pasted later"
 msgstr ""
 "Copia l'istantanea negli appunti in modo che possa essere incollata più "
 "tardi."
 
-#: ../lib/screenshooter-dialogs.c:1147
+#: ../lib/screenshooter-dialogs.c:994
 msgid "Open with:"
 msgstr "Apri con:"
 
-#: ../lib/screenshooter-dialogs.c:1158
+#: ../lib/screenshooter-dialogs.c:1000
 msgid "Open the screenshot with the chosen application"
 msgstr "Apri l'istantanea con l'applicazione scelta"
 
-#: ../lib/screenshooter-dialogs.c:1191 ../src/main.c:73
+#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
 msgid "Application to open the screenshot"
 msgstr "Applicazione per aprire l'istantanea"
 
-#: ../lib/screenshooter-dialogs.c:1204
+#: ../lib/screenshooter-dialogs.c:1028
 msgid "Host on ZimageZ"
 msgstr "Host su ZimageZ"
 
-#: ../lib/screenshooter-dialogs.c:1210 ../src/main.c:92
+#: ../lib/screenshooter-dialogs.c:1032 ../src/main.c:80
 msgid "Host the screenshot on ZimageZ, a free online image hosting service"
-msgstr "Conserva l'istantanea su ZimageZ, un servizio online gratuito per condividere le immagini"
+msgstr ""
+"Conserva l'istantanea su ZimageZ, un servizio online gratuito per "
+"condividere le immagini"
 
-#: ../lib/screenshooter-dialogs.c:1255
+#: ../lib/screenshooter-dialogs.c:1046
+#, fuzzy
+msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Preview</span>"
+msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Collegamenti</span>"
+
+#: ../lib/screenshooter-dialogs.c:1107
 msgid "Save screenshot as..."
 msgstr "Salva l'istantanea come..."
 
-#. Start the user XML RPC session
-#: ../lib/screenshooter-zimagez.c:159
-msgid "Initialize the connection..."
-msgstr "Instaurazione della connessione in corso..."
+#: ../lib/screenshooter-zimagez.c:134
+#, fuzzy, c-format
+msgid "An error occured when creating the XMLRPC request."
+msgstr "Errore durante l'invio dell'istantanea."
+
+#: ../lib/screenshooter-zimagez.c:153
+#, fuzzy, c-format
+msgid "An error occured when transfering the data to ZimageZ."
+msgstr "Errore durante l'invio dell'istantanea."
+
+#: ../lib/screenshooter-zimagez.c:178
+#, fuzzy, c-format
+msgid "An error occured when parsing the response from ZimageZ."
+msgstr "Errore durante l'invio dell'istantanea."
 
-#: ../lib/screenshooter-zimagez.c:172 ../lib/screenshooter-zimagez.c:332
-#: ../lib/screenshooter-zimagez.c:361 ../lib/screenshooter-zimagez.c:389
-#: ../lib/screenshooter-zimagez.c:520 ../lib/screenshooter-zimagez.c:543
-#: ../lib/screenshooter-zimagez.c:580
+#: ../lib/screenshooter-zimagez.c:228
 #, c-format
-msgid ""
-"An error occurred during the XML exchange: %s (%d).\n"
-" The screenshot could not be uploaded."
-msgstr "Errore durante lo  scambio XML: %s (%d).\n"
-"L'istantanea non può essere inviata."
+msgid "Taken on %s, at %s"
+msgstr ""
+
+#. Start the user soup session
+#: ../lib/screenshooter-zimagez.c:295
+msgid "Initialize the connection..."
+msgstr "Instaurazione della connessione in corso..."
 
-#: ../lib/screenshooter-zimagez.c:223
+#: ../lib/screenshooter-zimagez.c:341
 msgid ""
 "Please file the following fields with your <a href=\"http://www.zimagez.com"
 "\">ZimageZ</a> \n"
 "user name, passsword and details about the screenshot."
-msgstr "Per favore inserire i seguenti campi di utente e password per <a·href=\"http://www.zimagez.com"
-"\">ZimageZ</a> e i dettagli dell'istantanea."
+msgstr ""
+"Per favore inserire i seguenti campi di utente e password per <a·href="
+"\"http://www.zimagez.com\">ZimageZ</a> e i dettagli dell'istantanea."
 
-#: ../lib/screenshooter-zimagez.c:283
+#: ../lib/screenshooter-zimagez.c:398
 msgid "Check the user information..."
 msgstr "Controllo dei dati utenti in corso..."
 
-#: ../lib/screenshooter-zimagez.c:305
+#: ../lib/screenshooter-zimagez.c:405
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You "
 "must fill all the fields.</span>"
 msgstr ""
-"<span weight=\"bold\" stretch=\"semiexpanded\">Occorre compilare tutti i campi</span>"
+"<span weight=\"bold\" stretch=\"semiexpanded\">Occorre compilare tutti i "
+"campi</span>"
 
-#: ../lib/screenshooter-zimagez.c:320
+#: ../lib/screenshooter-zimagez.c:419
 msgid "Login on ZimageZ..."
 msgstr "Autenticazione su ZimageZ in corso..."
 
-#: ../lib/screenshooter-zimagez.c:436
+#: ../lib/screenshooter-zimagez.c:459 ../lib/screenshooter-zimagez.c:610
+msgid ""
+"An unexpected reply from ZimageZ was received. The upload of the screenshot "
+"failed."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:498
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The "
 "user and the password you entered do not match. Please retry.</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Utente e password inseriti non corrispondono. Per favore, riprovare.</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Utente e password inseriti "
+"non corrispondono. Per favore, riprovare.</span>"
 
-#: ../lib/screenshooter-zimagez.c:501
+#: ../lib/screenshooter-zimagez.c:556
 msgid "Upload the screenshot..."
 msgstr "Invio dell'istantanea..."
 
-#: ../lib/screenshooter-zimagez.c:559
+#: ../lib/screenshooter-zimagez.c:589
 #, c-format
 msgid "An error occurred while uploading the screenshot."
 msgstr "Errore durante l'invio dell'istantanea."
 
 #. End the user session
-#: ../lib/screenshooter-zimagez.c:597
+#: ../lib/screenshooter-zimagez.c:622
 msgid "Close the session on ZimageZ..."
 msgstr "Chiusura della sessione su ZimageZ in corso..."
 
-#: ../lib/screenshooter-zimagez.c:650
+#: ../lib/screenshooter-zimagez.c:692
 msgid "Details about the screenshot for ZimageZ"
 msgstr "Dettagli sull'istantanea per ZimageZ"
 
 #. Create the user label
-#: ../lib/screenshooter-zimagez.c:692
+#: ../lib/screenshooter-zimagez.c:734
 msgid "User:"
 msgstr "Utente:"
 
-#: ../lib/screenshooter-zimagez.c:703
+#: ../lib/screenshooter-zimagez.c:745
 msgid ""
 "Your Zimagez user name, if you do not have one yet please create one on the "
 "Web page linked above"
-msgstr "Nome utente su ZimageZ, se non se ha uno è possibile crearne uno al collegamento web indicato sopra"
+msgstr ""
+"Nome utente su ZimageZ, se non se ha uno è possibile crearne uno al "
+"collegamento web indicato sopra"
 
 #. Create the password label
-#: ../lib/screenshooter-zimagez.c:708
+#: ../lib/screenshooter-zimagez.c:751
 msgid "Password:"
 msgstr "Password:"
 
-#: ../lib/screenshooter-zimagez.c:718
+#: ../lib/screenshooter-zimagez.c:761
 msgid "The password for the user above"
 msgstr "Password per l'utente indicato sopra"
 
 #. Create the title label
-#: ../lib/screenshooter-zimagez.c:723
+#: ../lib/screenshooter-zimagez.c:767
 msgid "Title:"
 msgstr "Titolo:"
 
-#: ../lib/screenshooter-zimagez.c:733
+#: ../lib/screenshooter-zimagez.c:777
 msgid ""
 "The title of the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
-msgstr "Titolo per l'istantanea, verrà utilizzato su ZimageZ nel mostrare l'istantanea"
+msgstr ""
+"Titolo per l'istantanea, verrà utilizzato su ZimageZ nel mostrare "
+"l'istantanea"
 
 #. Create the comment label
-#: ../lib/screenshooter-zimagez.c:738
+#: ../lib/screenshooter-zimagez.c:783
 msgid "Comment:"
 msgstr "Commento:"
 
-#: ../lib/screenshooter-zimagez.c:749
+#: ../lib/screenshooter-zimagez.c:794
 msgid ""
 "A comment on the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
-msgstr "Commento per l'istantanea, verrà utilizzato su ZimageZ nel mostrare l'istantanea"
+msgstr ""
+"Commento per l'istantanea, verrà utilizzato su ZimageZ nel mostrare "
+"l'istantanea"
 
-#: ../lib/screenshooter-zimagez.c:870
+#: ../lib/screenshooter-zimagez.c:917
 #, c-format
 msgid "<a href=\"%s\">Full size image</a>"
 msgstr "<a href=\"%s\">Immgine di dimensioni originali</a>"
 
-#: ../lib/screenshooter-zimagez.c:872
+#: ../lib/screenshooter-zimagez.c:919
 #, c-format
 msgid "<a href=\"%s\">Large thumbnail</a>"
 msgstr "<a href=\"%s\">Miniatura grande</a>"
 
-#: ../lib/screenshooter-zimagez.c:874
+#: ../lib/screenshooter-zimagez.c:921
 #, c-format
 msgid "<a href=\"%s\">Small thumbnail</a>"
 msgstr "<a href=\"%s\">Miniatura piccola</a>"
 
-#: ../lib/screenshooter-zimagez.c:894
+#: ../lib/screenshooter-zimagez.c:937
 msgid "My screenshot on ZimageZ"
 msgstr "La mia istantanea su ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:920
+#: ../lib/screenshooter-zimagez.c:963
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Links</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Collegamenti</span>"
 
-#: ../lib/screenshooter-zimagez.c:965
+#: ../lib/screenshooter-zimagez.c:1008
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing "
 "to the full size image</span>"
 msgstr ""
-"<span weight=\"bold\" stretch=\"semiexpanded\">Codice per la miniatura dell'immagine di dimensioni originali</span>"
+"<span weight=\"bold\" stretch=\"semiexpanded\">Codice per la miniatura "
+"dell'immagine di dimensioni originali</span>"
 
 #. HTML title
-#: ../lib/screenshooter-zimagez.c:981
+#: ../lib/screenshooter-zimagez.c:1024
 msgid "HTML"
 msgstr "HTML"
 
 #. BB title
-#: ../lib/screenshooter-zimagez.c:1002
+#: ../lib/screenshooter-zimagez.c:1045
 msgid "BBCode for forums"
 msgstr "BBCode per i forum"
 
-#: ../lib/screenshooter-zimagez.c:1122
+#: ../lib/screenshooter-zimagez.c:1174
 msgid "ZimageZ"
 msgstr "ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:1155
+#: ../lib/screenshooter-zimagez.c:1207
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Status</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Stato</span>"
 
@@ -359,29 +361,38 @@ msgstr "_Apri collegamento"
 msgid "Copy _Link Address"
 msgstr "Copia indirizzo del col_legamento"
 
-#: ../src/main.c:53
+#: ../src/main.c:48
 msgid "Delay in seconds before taking the screenshot"
 msgstr "Ritardo, in secondi, prima di scattare l'istantanea"
 
-#: ../src/main.c:63
-msgid "Do not display the save dialog"
-msgstr "Non mostrare il dialogo di salvataggio"
-
-#: ../src/main.c:68
-msgid "Do not display the mouse on the screenshot"
+#: ../src/main.c:58
+#, fuzzy
+msgid "Display the mouse on the screenshot"
 msgstr "Non mostrare il mouse nell'istantanea"
 
-#: ../src/main.c:85
+#: ../src/main.c:75
 msgid "Directory where the screenshot will be saved"
 msgstr "Cartella nella quale verrà salvata l'istantanea"
 
-#: ../src/main.c:99
+#: ../src/main.c:85
 msgid "Version information"
 msgstr "Informazioni sulla versione"
 
+#: ../src/main.c:134
+#, c-format
+msgid "Conflicting options: --%s and --%s cannot be used at the same time.\n"
+msgstr ""
+
 #: ../src/main.c:136
 #, c-format
 msgid ""
+"The --%s option is only used when --fullscreen, --window or --region is "
+"given. It will be ignored.\n"
+msgstr ""
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
@@ -389,7 +400,7 @@ msgstr ""
 "Provare %s --help per vedere l'elenco completo delle opzioni da riga di "
 "comando.\n"
 
-#: ../src/main.c:235
+#: ../src/main.c:282
 #, c-format
 msgid "%s is not a valid directory, the default directory will be used."
 msgstr ""
@@ -403,6 +414,54 @@ msgstr ""
 "Esegui l'istantanea dell'intero schermo, di una porzione o della finestra "
 "attiva."
 
+#~ msgid "Screenshot.png"
+#~ msgstr "Istantanea.png"
+
+#~ msgid "Screenshot-%d.png"
+#~ msgstr "Istantanea-%d.png"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">Dopo la cattura</span>"
+
+#~ msgid "Show the save dialog"
+#~ msgstr "Mostra il dialogo di salvataggio"
+
+#~ msgid ""
+#~ "The save dialog allows you to change the file name and the save location"
+#~ msgstr ""
+#~ "Il dialogo di salvataggio consente di cambiare il nome e la posizione del "
+#~ "file"
+
+#~ msgid "Close the application"
+#~ msgstr "Chiudi l'applicazione"
+
+#~ msgid ""
+#~ "If unchecked, the current window will be displayed again after the "
+#~ "screenshot has been taken to allow you to take several screenshots in a "
+#~ "row"
+#~ msgstr ""
+#~ "Se dissabilitato, la finestra corrent verrà mostrata nuovamente dopo la "
+#~ "cattura dell'istantanea in modo da poter effettuare più istantanee di "
+#~ "seguito"
+
+#~ msgid "Default save location"
+#~ msgstr "Posizione di salvataggio predefinita"
+
+#~ msgid "Set the default save location"
+#~ msgstr "Imposta la posizione di salvataggio predefinita"
+
+#~ msgid ""
+#~ "An error occurred during the XML exchange: %s (%d).\n"
+#~ " The screenshot could not be uploaded."
+#~ msgstr ""
+#~ "Errore durante lo  scambio XML: %s (%d).\n"
+#~ "L'istantanea non può essere inviata."
+
+#~ msgid "Do not display the save dialog"
+#~ msgstr "Non mostrare il dialogo di salvataggio"
+
 #, fuzzy
 #~ msgid "Tak a screenshot of the entire screen"
 #~ msgstr "Scatta un'istantanea dell'intero schermo"
diff --git a/po/ja.po b/po/ja.po
index ba755ed..93ba475 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce 4-screenshooter-plugin 1.3.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-11 23:23+0900\n"
+"POT-Creation-Date: 2009-11-15 00:29+0100\n"
 "PO-Revision-Date: 2009-11-11 23:22+0900\n"
 "Last-Translator: Masato Hashimoto <cabezon.hashimoto at gmail.com>\n"
 "Language-Team: Japanese <xfce-users-jp at ml.fdiary.net>\n"
@@ -35,49 +35,49 @@ msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">スクリーンショットの転送先:</"
 "span>"
 
-#: ../lib/screenshooter-dialogs.c:673 ../lib/screenshooter-dialogs.c:690
-#: ../lib/screenshooter-dialogs.c:880 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
 #: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
 msgid "Screenshot"
 msgstr "スクリーンショット"
 
-#: ../lib/screenshooter-dialogs.c:685
+#: ../lib/screenshooter-dialogs.c:709
 msgid "Take a screenshot"
 msgstr "スクリーンショットを撮影します"
 
-#: ../lib/screenshooter-dialogs.c:700
+#: ../lib/screenshooter-dialogs.c:724
 msgid "Preferences"
 msgstr "設定"
 
-#: ../lib/screenshooter-dialogs.c:730
+#: ../lib/screenshooter-dialogs.c:754
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Region to capture</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">撮影する領域</span>"
 
-#: ../lib/screenshooter-dialogs.c:750
+#: ../lib/screenshooter-dialogs.c:774
 msgid "Entire screen"
 msgstr "画面全体"
 
-#: ../lib/screenshooter-dialogs.c:757 ../src/main.c:53
+#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
 #: ../panel-plugin/screenshooter-plugin.c:308
 msgid "Take a screenshot of the entire screen"
 msgstr "画面全体のスクリーンショットを撮ります"
 
-#: ../lib/screenshooter-dialogs.c:765
+#: ../lib/screenshooter-dialogs.c:789
 msgid "Active window"
 msgstr "アクティブウィンドウ"
 
-#: ../lib/screenshooter-dialogs.c:772 ../src/main.c:90
+#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
 #: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr "アクティブウィンドウのスクリーンショットを撮ります"
 
-#: ../lib/screenshooter-dialogs.c:780
+#: ../lib/screenshooter-dialogs.c:804
 msgid "Select a region"
 msgstr "選択した領域"
 
-#: ../lib/screenshooter-dialogs.c:785 ../src/main.c:68
+#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
 #: ../panel-plugin/screenshooter-plugin.c:318
 msgid ""
 "Select a region to be captured by clicking a point of the screen without "
@@ -87,81 +87,81 @@ msgstr ""
 "画面の一点をクリックおよびそこからドラッグし、マウスボタンを離したところまで"
 "の矩形領域を撮ります。"
 
-#: ../lib/screenshooter-dialogs.c:795
+#: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
 msgstr "マウスポインタも撮影する"
 
-#: ../lib/screenshooter-dialogs.c:800
+#: ../lib/screenshooter-dialogs.c:824
 msgid "Display the mouse pointer on the screenshot"
 msgstr "スクリーンショットにマウスポインタを表示します"
 
-#: ../lib/screenshooter-dialogs.c:816
+#: ../lib/screenshooter-dialogs.c:840
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
 msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">撮影するまでの遅延時間</span>"
 
-#: ../lib/screenshooter-dialogs.c:838
+#: ../lib/screenshooter-dialogs.c:862
 msgid "Delay in seconds before the screenshot is taken"
 msgstr "スクリーンショットを撮るまでの遅延秒数を指定できます"
 
-#: ../lib/screenshooter-dialogs.c:841
+#: ../lib/screenshooter-dialogs.c:865
 msgid "seconds"
 msgstr "秒"
 
-#: ../lib/screenshooter-dialogs.c:892
+#: ../lib/screenshooter-dialogs.c:917
 msgid "Action"
 msgstr "アクション"
 
-#: ../lib/screenshooter-dialogs.c:920
+#: ../lib/screenshooter-dialogs.c:945
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Action</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">アクション</span>"
 
 #. Save option radio button
-#: ../lib/screenshooter-dialogs.c:936
+#: ../lib/screenshooter-dialogs.c:961
 msgid "Save"
 msgstr "保存する"
 
-#: ../lib/screenshooter-dialogs.c:941
+#: ../lib/screenshooter-dialogs.c:966
 msgid "Save the screenshot to a PNG file"
 msgstr "スクリーンショットを PNG ファイルに保存します"
 
-#: ../lib/screenshooter-dialogs.c:950
+#: ../lib/screenshooter-dialogs.c:975
 msgid "Copy to the clipboard"
 msgstr "クリップボードにコピーする"
 
-#: ../lib/screenshooter-dialogs.c:952
+#: ../lib/screenshooter-dialogs.c:977
 msgid "Copy the screenshot to the clipboard so that it can be pasted later"
 msgstr ""
 "後で貼り付けることができるよう、クリップボードにスクリーンショットをコピーし"
 "ます。"
 
-#: ../lib/screenshooter-dialogs.c:969
+#: ../lib/screenshooter-dialogs.c:994
 msgid "Open with:"
 msgstr "アプリケーションで開く:"
 
-#: ../lib/screenshooter-dialogs.c:975
+#: ../lib/screenshooter-dialogs.c:1000
 msgid "Open the screenshot with the chosen application"
 msgstr "選択したアプリケーションでスクリーンショットを開きます"
 
-#: ../lib/screenshooter-dialogs.c:993 ../src/main.c:63
+#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
 msgid "Application to open the screenshot"
 msgstr "スクリーンショットを開くアプリケーションを設定します"
 
-#: ../lib/screenshooter-dialogs.c:1003
+#: ../lib/screenshooter-dialogs.c:1028
 msgid "Host on ZimageZ"
 msgstr "ZimageZ で公開する"
 
-#: ../lib/screenshooter-dialogs.c:1007 ../src/main.c:80
+#: ../lib/screenshooter-dialogs.c:1032 ../src/main.c:80
 msgid "Host the screenshot on ZimageZ, a free online image hosting service"
 msgstr ""
 "スクリーンショットをフリーのウェブホスティングサービス ZimageZ で公開します"
 
-#: ../lib/screenshooter-dialogs.c:1021
+#: ../lib/screenshooter-dialogs.c:1046
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Preview</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">プレビュー</span>"
 
-#: ../lib/screenshooter-dialogs.c:1073
+#: ../lib/screenshooter-dialogs.c:1107
 msgid "Save screenshot as..."
 msgstr "名前をつけてスクリーンショットを保存..."
 
diff --git a/po/kk.po b/po/kk.po
index 8bb6753..821148d 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trunk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-31 14:02+0200\n"
+"POT-Creation-Date: 2009-11-15 00:29+0100\n"
 "PO-Revision-Date: 2009-08-15 12:26+0600\n"
 "Last-Translator: Baurzhan Muftakhidinov <baurthefirst at gmail.com>\n"
 "Language-Team: Kazakh <kk_KZ at googlegroups.com>\n"
@@ -16,309 +16,313 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ../lib/screenshooter-dialogs.c:283
-msgid "Screenshot.png"
-msgstr "Скриншот.png"
-
-#: ../lib/screenshooter-dialogs.c:300
-#, c-format
-msgid "Screenshot-%d.png"
-msgstr "Скриншот-%d.png"
-
-#: ../lib/screenshooter-dialogs.c:493
+#: ../lib/screenshooter-dialogs.c:478
 #, c-format
 msgid "%.2fKb of %.2fKb"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:577
+#: ../lib/screenshooter-dialogs.c:560
 msgid "Transfer"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:600
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being transferred to:</span>"
+#: ../lib/screenshooter-dialogs.c:581
+msgid ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being "
+"transferred to:</span>"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:724
-#: ../lib/screenshooter-dialogs.c:741
+#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
 msgid "Screenshot"
 msgstr "Скриншот"
 
-#: ../lib/screenshooter-dialogs.c:736
+#: ../lib/screenshooter-dialogs.c:709
 msgid "Take a screenshot"
 msgstr "Скриншотты түсіру"
 
-#: ../lib/screenshooter-dialogs.c:751
+#: ../lib/screenshooter-dialogs.c:724
 msgid "Preferences"
 msgstr "Баптаулар"
 
-#: ../lib/screenshooter-dialogs.c:793
+#: ../lib/screenshooter-dialogs.c:754
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Region to capture</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Түсірілетін аймақ</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Түсірілетін аймақ</span>"
 
-#: ../lib/screenshooter-dialogs.c:820
+#: ../lib/screenshooter-dialogs.c:774
 msgid "Entire screen"
 msgstr "Экран толығымен"
 
-#: ../lib/screenshooter-dialogs.c:830
-#: ../src/main.c:58
-#: ../panel-plugin/screenshooter-plugin.c:292
+#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../panel-plugin/screenshooter-plugin.c:308
 msgid "Take a screenshot of the entire screen"
 msgstr "Толық экранның скриншотын түсіреді"
 
-#: ../lib/screenshooter-dialogs.c:841
+#: ../lib/screenshooter-dialogs.c:789
 msgid "Active window"
 msgstr "Белсенді терезе"
 
-#: ../lib/screenshooter-dialogs.c:851
-#: ../src/main.c:104
-#: ../panel-plugin/screenshooter-plugin.c:297
+#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr "Белсенді терезенің скриншотын түсіреді"
 
-#: ../lib/screenshooter-dialogs.c:862
+#: ../lib/screenshooter-dialogs.c:804
 msgid "Select a region"
 msgstr "Аймақты таңдаңыз"
 
-#: ../lib/screenshooter-dialogs.c:872
-#: ../src/main.c:78
-#: ../panel-plugin/screenshooter-plugin.c:302
-msgid "Select a region to be captured by clicking a point of the screen without releasing the mouse button, dragging your mouse to the other corner of the region, and releasing the mouse button."
+#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../panel-plugin/screenshooter-plugin.c:318
+msgid ""
+"Select a region to be captured by clicking a point of the screen without "
+"releasing the mouse button, dragging your mouse to the other corner of the "
+"region, and releasing the mouse button."
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:884
+#: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
 msgstr "Тышқан курсорын қоса түсіру"
 
-#: ../lib/screenshooter-dialogs.c:892
+#: ../lib/screenshooter-dialogs.c:824
 msgid "Display the mouse pointer on the screenshot"
 msgstr "Скриншотқа тышқан курсорын де түсіру"
 
-#: ../lib/screenshooter-dialogs.c:917
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Түсіру алдында күту</span>"
+#: ../lib/screenshooter-dialogs.c:840
+msgid ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Түсіру алдында күту</span>"
 
-#: ../lib/screenshooter-dialogs.c:952
+#: ../lib/screenshooter-dialogs.c:862
 msgid "Delay in seconds before the screenshot is taken"
 msgstr "Скриншот түсірілгенге дейін күтудің секундтағы уақыты"
 
-#: ../lib/screenshooter-dialogs.c:958
+#: ../lib/screenshooter-dialogs.c:865
 msgid "seconds"
 msgstr "секунд"
 
-#: ../lib/screenshooter-dialogs.c:984
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Түсіргеннен кейін</span>"
-
-#. Display the save dialog checkbox
-#: ../lib/screenshooter-dialogs.c:1007
-msgid "Show the save dialog"
-msgstr "Сақтау сұхбат терезесін көрсету"
-
-#: ../lib/screenshooter-dialogs.c:1013
-msgid "The save dialog allows you to change the file name and the save location"
-msgstr "Сақтау сұхбат терезесі ішінде файл атын мен сақталатын орнын өзгерте аласыз"
-
-#: ../lib/screenshooter-dialogs.c:1027
-msgid "Close the application"
-msgstr "Осы қолданбаны жабу"
-
-#: ../lib/screenshooter-dialogs.c:1033
-msgid "If unchecked, the current window will be displayed again after the screenshot has been taken to allow you to take several screenshots in a row"
-msgstr "Белгіленбесе, скриншот түсірілгеннен кейін осы қолданбаның терезесі қайта шығады, осы арқылы бірнеше скриншотты қатарынан түсіре аласыз"
+#: ../lib/screenshooter-dialogs.c:917
+msgid "Action"
+msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1056
+#: ../lib/screenshooter-dialogs.c:945
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Action</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Әрекет</span>"
 
 #. Save option radio button
-#: ../lib/screenshooter-dialogs.c:1081
-msgid "Save in:"
+#: ../lib/screenshooter-dialogs.c:961
+#, fuzzy
+msgid "Save"
 msgstr "Қайда сақтау:"
 
-#: ../lib/screenshooter-dialogs.c:1089
+#: ../lib/screenshooter-dialogs.c:966
 msgid "Save the screenshot to a PNG file"
 msgstr "Скриншотты PNG файлына сақтау"
 
-#: ../lib/screenshooter-dialogs.c:1104
-msgid "Default save location"
-msgstr "Негізгі сақтау орны"
-
-#: ../lib/screenshooter-dialogs.c:1114
-msgid "Set the default save location"
-msgstr "Негізгі сақтау орнын орнату"
-
-#: ../lib/screenshooter-dialogs.c:1127
+#: ../lib/screenshooter-dialogs.c:975
 msgid "Copy to the clipboard"
 msgstr "Алмасу буферіне көшіру"
 
-#: ../lib/screenshooter-dialogs.c:1132
+#: ../lib/screenshooter-dialogs.c:977
 msgid "Copy the screenshot to the clipboard so that it can be pasted later"
-msgstr "Түсірілген скриншотты алмасы буферіне орналастыру, кейін оны басқа бір жерге кірістіруге болады"
+msgstr ""
+"Түсірілген скриншотты алмасы буферіне орналастыру, кейін оны басқа бір жерге "
+"кірістіруге болады"
 
-#: ../lib/screenshooter-dialogs.c:1147
+#: ../lib/screenshooter-dialogs.c:994
 msgid "Open with:"
 msgstr "Көмегімен ашу:"
 
-#: ../lib/screenshooter-dialogs.c:1158
+#: ../lib/screenshooter-dialogs.c:1000
 msgid "Open the screenshot with the chosen application"
 msgstr "Түсірілген скриншотты таңдалған қолданбамен ашу"
 
-#: ../lib/screenshooter-dialogs.c:1191
-#: ../src/main.c:73
+#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
 msgid "Application to open the screenshot"
 msgstr "Скриншотты ашу үшін қолданба"
 
-#: ../lib/screenshooter-dialogs.c:1204
+#: ../lib/screenshooter-dialogs.c:1028
 msgid "Host on ZimageZ"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1210
-#: ../src/main.c:92
+#: ../lib/screenshooter-dialogs.c:1032 ../src/main.c:80
 msgid "Host the screenshot on ZimageZ, a free online image hosting service"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1255
+#: ../lib/screenshooter-dialogs.c:1046
+#, fuzzy
+msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Preview</span>"
+msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Әрекет</span>"
+
+#: ../lib/screenshooter-dialogs.c:1107
 msgid "Save screenshot as..."
 msgstr "Скриншотты қалайша сақтау..."
 
-#. Start the user XML RPC session
-#: ../lib/screenshooter-zimagez.c:159
-msgid "Initialize the connection..."
+#: ../lib/screenshooter-zimagez.c:134
+#, c-format
+msgid "An error occured when creating the XMLRPC request."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:172
-#: ../lib/screenshooter-zimagez.c:332
-#: ../lib/screenshooter-zimagez.c:361
-#: ../lib/screenshooter-zimagez.c:389
-#: ../lib/screenshooter-zimagez.c:520
-#: ../lib/screenshooter-zimagez.c:543
-#: ../lib/screenshooter-zimagez.c:580
+#: ../lib/screenshooter-zimagez.c:153
 #, c-format
-msgid ""
-"An error occurred during the XML exchange: %s (%d).\n"
-" The screenshot could not be uploaded."
+msgid "An error occured when transfering the data to ZimageZ."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:178
+#, c-format
+msgid "An error occured when parsing the response from ZimageZ."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:228
+#, c-format
+msgid "Taken on %s, at %s"
+msgstr ""
+
+#. Start the user soup session
+#: ../lib/screenshooter-zimagez.c:295
+msgid "Initialize the connection..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:223
+#: ../lib/screenshooter-zimagez.c:341
 msgid ""
-"Please file the following fields with your <a href=\"http://www.zimagez.com\">ZimageZ</a> \n"
+"Please file the following fields with your <a href=\"http://www.zimagez.com"
+"\">ZimageZ</a> \n"
 "user name, passsword and details about the screenshot."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:283
+#: ../lib/screenshooter-zimagez.c:398
 msgid "Check the user information..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:305
-msgid "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You must fill all the fields.</span>"
+#: ../lib/screenshooter-zimagez.c:405
+msgid ""
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You "
+"must fill all the fields.</span>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:320
+#: ../lib/screenshooter-zimagez.c:419
 msgid "Login on ZimageZ..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:436
-msgid "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The user and the password you entered do not match. Please retry.</span>"
+#: ../lib/screenshooter-zimagez.c:459 ../lib/screenshooter-zimagez.c:610
+msgid ""
+"An unexpected reply from ZimageZ was received. The upload of the screenshot "
+"failed."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:501
+#: ../lib/screenshooter-zimagez.c:498
+msgid ""
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The "
+"user and the password you entered do not match. Please retry.</span>"
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:556
 msgid "Upload the screenshot..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:559
+#: ../lib/screenshooter-zimagez.c:589
 #, c-format
 msgid "An error occurred while uploading the screenshot."
 msgstr ""
 
 #. End the user session
-#: ../lib/screenshooter-zimagez.c:597
+#: ../lib/screenshooter-zimagez.c:622
 msgid "Close the session on ZimageZ..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:650
+#: ../lib/screenshooter-zimagez.c:692
 msgid "Details about the screenshot for ZimageZ"
 msgstr ""
 
 #. Create the user label
-#: ../lib/screenshooter-zimagez.c:692
+#: ../lib/screenshooter-zimagez.c:734
 msgid "User:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:703
-msgid "Your Zimagez user name, if you do not have one yet please create one on the Web page linked above"
+#: ../lib/screenshooter-zimagez.c:745
+msgid ""
+"Your Zimagez user name, if you do not have one yet please create one on the "
+"Web page linked above"
 msgstr ""
 
 #. Create the password label
-#: ../lib/screenshooter-zimagez.c:708
+#: ../lib/screenshooter-zimagez.c:751
 msgid "Password:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:718
+#: ../lib/screenshooter-zimagez.c:761
 msgid "The password for the user above"
 msgstr ""
 
 #. Create the title label
-#: ../lib/screenshooter-zimagez.c:723
+#: ../lib/screenshooter-zimagez.c:767
 msgid "Title:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:733
-msgid "The title of the screenshot, it will be used when displaying the screenshot on ZimageZ"
+#: ../lib/screenshooter-zimagez.c:777
+msgid ""
+"The title of the screenshot, it will be used when displaying the screenshot "
+"on ZimageZ"
 msgstr ""
 
 #. Create the comment label
-#: ../lib/screenshooter-zimagez.c:738
+#: ../lib/screenshooter-zimagez.c:783
 msgid "Comment:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:749
-msgid "A comment on the screenshot, it will be used when displaying the screenshot on ZimageZ"
+#: ../lib/screenshooter-zimagez.c:794
+msgid ""
+"A comment on the screenshot, it will be used when displaying the screenshot "
+"on ZimageZ"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:870
+#: ../lib/screenshooter-zimagez.c:917
 #, c-format
 msgid "<a href=\"%s\">Full size image</a>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:872
+#: ../lib/screenshooter-zimagez.c:919
 #, c-format
 msgid "<a href=\"%s\">Large thumbnail</a>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:874
+#: ../lib/screenshooter-zimagez.c:921
 #, c-format
 msgid "<a href=\"%s\">Small thumbnail</a>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:894
+#: ../lib/screenshooter-zimagez.c:937
 msgid "My screenshot on ZimageZ"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:920
+#: ../lib/screenshooter-zimagez.c:963
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Links</span>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:965
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing to the full size image</span>"
+#: ../lib/screenshooter-zimagez.c:1008
+msgid ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing "
+"to the full size image</span>"
 msgstr ""
 
 #. HTML title
-#: ../lib/screenshooter-zimagez.c:981
+#: ../lib/screenshooter-zimagez.c:1024
 msgid "HTML"
 msgstr ""
 
 #. BB title
-#: ../lib/screenshooter-zimagez.c:1002
+#: ../lib/screenshooter-zimagez.c:1045
 msgid "BBCode for forums"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:1122
+#: ../lib/screenshooter-zimagez.c:1174
 msgid "ZimageZ"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:1155
+#: ../lib/screenshooter-zimagez.c:1207
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Status</span>"
 msgstr ""
 
@@ -332,40 +336,91 @@ msgstr ""
 msgid "Copy _Link Address"
 msgstr ""
 
-#: ../src/main.c:53
+#: ../src/main.c:48
 msgid "Delay in seconds before taking the screenshot"
 msgstr ""
 
-#: ../src/main.c:63
-msgid "Do not display the save dialog"
-msgstr "Сақтау сұхбатын көрсетпеу"
-
-#: ../src/main.c:68
-msgid "Do not display the mouse on the screenshot"
+#: ../src/main.c:58
+#, fuzzy
+msgid "Display the mouse on the screenshot"
 msgstr "Скриншотта тышқан курсорын көрсетпеу"
 
-#: ../src/main.c:85
+#: ../src/main.c:75
 msgid "Directory where the screenshot will be saved"
 msgstr "Скриншот сақталатын бума"
 
-#: ../src/main.c:99
+#: ../src/main.c:85
 msgid "Version information"
 msgstr "Нұсқа ақпараты"
 
+#: ../src/main.c:134
+#, c-format
+msgid "Conflicting options: --%s and --%s cannot be used at the same time.\n"
+msgstr ""
+
 #: ../src/main.c:136
 #, c-format
 msgid ""
+"The --%s option is only used when --fullscreen, --window or --region is "
+"given. It will be ignored.\n"
+msgstr ""
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
 
-#: ../src/main.c:235
+#: ../src/main.c:282
 #, c-format
 msgid "%s is not a valid directory, the default directory will be used."
 msgstr "%s дұрыс бума емес, бастапқы бума қолданылады"
 
 #: ../src/xfce4-screenshooter.desktop.in.in.h:2
 #: ../panel-plugin/screenshooter.desktop.in.in.h:2
-msgid "Take screenshots of the entire screen, of the active window or of a region"
-msgstr "Толық экранның, белсенді терезенің не таңдауыңызша аймақтың скриншотын түсіреді"
+msgid ""
+"Take screenshots of the entire screen, of the active window or of a region"
+msgstr ""
+"Толық экранның, белсенді терезенің не таңдауыңызша аймақтың скриншотын "
+"түсіреді"
+
+#~ msgid "Screenshot.png"
+#~ msgstr "Скриншот.png"
+
+#~ msgid "Screenshot-%d.png"
+#~ msgstr "Скриншот-%d.png"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">Түсіргеннен кейін</span>"
+
+#~ msgid "Show the save dialog"
+#~ msgstr "Сақтау сұхбат терезесін көрсету"
+
+#~ msgid ""
+#~ "The save dialog allows you to change the file name and the save location"
+#~ msgstr ""
+#~ "Сақтау сұхбат терезесі ішінде файл атын мен сақталатын орнын өзгерте "
+#~ "аласыз"
+
+#~ msgid "Close the application"
+#~ msgstr "Осы қолданбаны жабу"
+
+#~ msgid ""
+#~ "If unchecked, the current window will be displayed again after the "
+#~ "screenshot has been taken to allow you to take several screenshots in a "
+#~ "row"
+#~ msgstr ""
+#~ "Белгіленбесе, скриншот түсірілгеннен кейін осы қолданбаның терезесі қайта "
+#~ "шығады, осы арқылы бірнеше скриншотты қатарынан түсіре аласыз"
+
+#~ msgid "Default save location"
+#~ msgstr "Негізгі сақтау орны"
+
+#~ msgid "Set the default save location"
+#~ msgstr "Негізгі сақтау орнын орнату"
 
+#~ msgid "Do not display the save dialog"
+#~ msgstr "Сақтау сұхбатын көрсетпеу"
diff --git a/po/lv.po b/po/lv.po
index 29081bc..3081db7 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-screenshooter-plugin 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-31 14:02+0200\n"
+"POT-Creation-Date: 2009-11-15 00:29+0100\n"
 "PO-Revision-Date: 2009-10-21 13:36+0100\n"
 "Last-Translator: Rihards Prieditis <rprieditis at gmail.com>\n"
 "Language-Team: Latvian <translation-team-lv at lists.sourceforge.net>\n"
@@ -19,24 +19,16 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
 "2);\n"
 
-#: ../lib/screenshooter-dialogs.c:283
-msgid "Screenshot.png"
-msgstr "Ekrānkopija.png"
-
-#: ../lib/screenshooter-dialogs.c:300, c-format
-msgid "Screenshot-%d.png"
-msgstr "Ekrānkopija-%d.png"
-
-#: ../lib/screenshooter-dialogs.c:493
+#: ../lib/screenshooter-dialogs.c:478
 #, c-format
 msgid "%.2fKb of %.2fKb"
 msgstr "%.2fKb of %.2fKb"
 
-#: ../lib/screenshooter-dialogs.c:577
+#: ../lib/screenshooter-dialogs.c:560
 msgid "Transfer"
 msgstr "Pārsūtīt"
 
-#: ../lib/screenshooter-dialogs.c:600
+#: ../lib/screenshooter-dialogs.c:581
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being "
 "transferred to:</span>"
@@ -44,48 +36,50 @@ msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Ekrāna kopija tiek pārsūtīta "
 "uz:</span>"
 
-#: ../lib/screenshooter-dialogs.c:724 ../lib/screenshooter-dialogs.c:741
+#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
 msgid "Screenshot"
 msgstr "Ekrānkopija"
 
-#: ../lib/screenshooter-dialogs.c:736
+#: ../lib/screenshooter-dialogs.c:709
 msgid "Take a screenshot"
 msgstr "Uzņemt ekrānkopiju"
 
-#: ../lib/screenshooter-dialogs.c:751
+#: ../lib/screenshooter-dialogs.c:724
 msgid "Preferences"
 msgstr "Uzstādījumi"
 
-#: ../lib/screenshooter-dialogs.c:793
+#: ../lib/screenshooter-dialogs.c:754
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Region to capture</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Ķeramais reģions</span>"
 
-#: ../lib/screenshooter-dialogs.c:820
+#: ../lib/screenshooter-dialogs.c:774
 msgid "Entire screen"
 msgstr "Visu ekrānu"
 
-#: ../lib/screenshooter-dialogs.c:830 ../src/main.c:58
-#: ../panel-plugin/screenshooter-plugin.c:292
+#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../panel-plugin/screenshooter-plugin.c:308
 msgid "Take a screenshot of the entire screen"
 msgstr "Uzņemt visa ekrāna ekrānkopiju"
 
-#: ../lib/screenshooter-dialogs.c:841
+#: ../lib/screenshooter-dialogs.c:789
 msgid "Active window"
 msgstr "Aktīvais logs"
 
-#: ../lib/screenshooter-dialogs.c:851 ../src/main.c:104
-#: ../panel-plugin/screenshooter-plugin.c:297
+#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr "Uzņemt aktīvā loga ekrānkopiju"
 
-#: ../lib/screenshooter-dialogs.c:862
+#: ../lib/screenshooter-dialogs.c:804
 msgid "Select a region"
 msgstr "Atlasīt reģionu"
 
-#: ../lib/screenshooter-dialogs.c:872 ../src/main.c:78
-#: ../panel-plugin/screenshooter-plugin.c:302
+#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../panel-plugin/screenshooter-plugin.c:318
 msgid ""
 "Select a region to be captured by clicking a point of the screen without "
 "releasing the mouse button, dragging your mouse to the other corner of the "
@@ -94,128 +88,112 @@ msgstr ""
 "Atlasīt reģionu kuru uzņemt. Klikšķiniet uz ekrāna neatlaižot peli un "
 "velciet peli līdz nākamajam reģiona stūrim, pēc tam atlaižiet peles pogu."
 
-#: ../lib/screenshooter-dialogs.c:884
+#: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
 msgstr "Uzņemt peles kursoru"
 
-#: ../lib/screenshooter-dialogs.c:892
+#: ../lib/screenshooter-dialogs.c:824
 msgid "Display the mouse pointer on the screenshot"
 msgstr "Attēlot peles kursoru ekrānkopijā"
 
-#: ../lib/screenshooter-dialogs.c:917
+#: ../lib/screenshooter-dialogs.c:840
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
 msgstr ""
-"<span weight=\"bold\" stretch=\"semiexpanded\">Aizture pirms uzņemšanas<"
-"/span>"
+"<span weight=\"bold\" stretch=\"semiexpanded\">Aizture pirms uzņemšanas</"
+"span>"
 
-#: ../lib/screenshooter-dialogs.c:952
+#: ../lib/screenshooter-dialogs.c:862
 msgid "Delay in seconds before the screenshot is taken"
 msgstr "Aizture sekundēs, pirms ekrānkopijas uzņemšanas"
 
-#: ../lib/screenshooter-dialogs.c:958
+#: ../lib/screenshooter-dialogs.c:865
 msgid "seconds"
 msgstr "sekundes"
 
-#: ../lib/screenshooter-dialogs.c:984
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Pēc uzņemšanas</span>"
-
-#. Display the save dialog checkbox
-#: ../lib/screenshooter-dialogs.c:1007
-msgid "Show the save dialog"
-msgstr "Rādīt saglabāšanas dialogu"
-
-#: ../lib/screenshooter-dialogs.c:1013
-msgid ""
-"The save dialog allows you to change the file name and the save location"
-msgstr "Saglabāšanas dialogs ļauj mainīt faila nosaukumu un saglabāšanas vietu"
-
-#: ../lib/screenshooter-dialogs.c:1027
-msgid "Close the application"
-msgstr "Aizvērt lietotni"
-
-#: ../lib/screenshooter-dialogs.c:1033
-msgid ""
-"If unchecked, the current window will be displayed again after the "
-"screenshot has been taken to allow you to take several screenshots in a row"
+#: ../lib/screenshooter-dialogs.c:917
+msgid "Action"
 msgstr ""
-"Ja neatzīmēts, pašreizējais logs tiks attēlots atkal pēc ekrānkopijas "
-"uzņemšanas, lai jūs varat uzņemt vairākus ekrānakopijas rindā"
 
-#: ../lib/screenshooter-dialogs.c:1056
+#: ../lib/screenshooter-dialogs.c:945
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Action</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Darbības</span>"
 
 #. Save option radio button
-#: ../lib/screenshooter-dialogs.c:1081
-msgid "Save in:"
+#: ../lib/screenshooter-dialogs.c:961
+#, fuzzy
+msgid "Save"
 msgstr "Saglabāt iekš:"
 
-#: ../lib/screenshooter-dialogs.c:1089
+#: ../lib/screenshooter-dialogs.c:966
 msgid "Save the screenshot to a PNG file"
 msgstr "Saglabāt ekrānkopiju PNG failā"
 
-#: ../lib/screenshooter-dialogs.c:1104
-msgid "Default save location"
-msgstr "Noklusēta saglabāšanas vieta"
-
-#: ../lib/screenshooter-dialogs.c:1114
-msgid "Set the default save location"
-msgstr "Uzstādīt noklusēto saglabāšanas vietu"
-
-#: ../lib/screenshooter-dialogs.c:1127
+#: ../lib/screenshooter-dialogs.c:975
 msgid "Copy to the clipboard"
 msgstr "Kopēt uz starpliktuvi"
 
-#: ../lib/screenshooter-dialogs.c:1132
+#: ../lib/screenshooter-dialogs.c:977
 msgid "Copy the screenshot to the clipboard so that it can be pasted later"
 msgstr "Kopēt ekrānkopiju uz starpliktuvi, lai vēlāk kopija var tikt ielīmētā"
 
-#: ../lib/screenshooter-dialogs.c:1147
+#: ../lib/screenshooter-dialogs.c:994
 msgid "Open with:"
 msgstr "Atvērt ar:"
 
-#: ../lib/screenshooter-dialogs.c:1158
+#: ../lib/screenshooter-dialogs.c:1000
 msgid "Open the screenshot with the chosen application"
 msgstr "Atvērt ekrānkopiju ar izvēlēto lietotni"
 
-#: ../lib/screenshooter-dialogs.c:1191 ../src/main.c:73
+#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
 msgid "Application to open the screenshot"
 msgstr "Lietotne ar kuru atvērt ekrānkopiju"
 
-#: ../lib/screenshooter-dialogs.c:1204
+#: ../lib/screenshooter-dialogs.c:1028
 msgid "Host on ZimageZ"
 msgstr "Izstādīt uz ZimageZ"
 
-#: ../lib/screenshooter-dialogs.c:1210 ../src/main.c:92
+#: ../lib/screenshooter-dialogs.c:1032 ../src/main.c:80
 msgid "Host the screenshot on ZimageZ, a free online image hosting service"
 msgstr ""
 "Izstādīt ekrānkopiju uz ZimageZ, bezmaksas tiešsaistes attēlu izstādīšanas "
 "pakalpojums"
 
-#: ../lib/screenshooter-dialogs.c:1255
+#: ../lib/screenshooter-dialogs.c:1046
+#, fuzzy
+msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Preview</span>"
+msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Saites</span>"
+
+#: ../lib/screenshooter-dialogs.c:1107
 msgid "Save screenshot as..."
 msgstr "Saglabāt ekrānkopiju kā..."
 
-#. Start the user XML RPC session
-#: ../lib/screenshooter-zimagez.c:159
-msgid "Initialize the connection..."
-msgstr "Savienojuma inicializācija..."
+#: ../lib/screenshooter-zimagez.c:134
+#, fuzzy, c-format
+msgid "An error occured when creating the XMLRPC request."
+msgstr "Notika kļūda pie ekrānkopijas augšupielādes."
 
-#: ../lib/screenshooter-zimagez.c:172 ../lib/screenshooter-zimagez.c:332
-#: ../lib/screenshooter-zimagez.c:361 ../lib/screenshooter-zimagez.c:389
-#: ../lib/screenshooter-zimagez.c:520 ../lib/screenshooter-zimagez.c:543
-#: ../lib/screenshooter-zimagez.c:580
+#: ../lib/screenshooter-zimagez.c:153
+#, fuzzy, c-format
+msgid "An error occured when transfering the data to ZimageZ."
+msgstr "Notika kļūda pie ekrānkopijas augšupielādes."
+
+#: ../lib/screenshooter-zimagez.c:178
+#, fuzzy, c-format
+msgid "An error occured when parsing the response from ZimageZ."
+msgstr "Notika kļūda pie ekrānkopijas augšupielādes."
+
+#: ../lib/screenshooter-zimagez.c:228
 #, c-format
-msgid ""
-"An error occurred during the XML exchange: %s (%d).\n"
-" The screenshot could not be uploaded."
+msgid "Taken on %s, at %s"
 msgstr ""
-"Notika kļūda XML apmaiņas laikā: %s (%d).\n"
-" Ekrānkopiju nevarēja augšupielādēt."
 
-#: ../lib/screenshooter-zimagez.c:223
+#. Start the user soup session
+#: ../lib/screenshooter-zimagez.c:295
+msgid "Initialize the connection..."
+msgstr "Savienojuma inicializācija..."
+
+#: ../lib/screenshooter-zimagez.c:341
 msgid ""
 "Please file the following fields with your <a href=\"http://www.zimagez.com"
 "\">ZimageZ</a> \n"
@@ -225,11 +203,11 @@ msgstr ""
 "\">ZimageZ</a> \n"
 "lietotāja vārdu, paroli un ekrānkopijas detaļām."
 
-#: ../lib/screenshooter-zimagez.c:283
+#: ../lib/screenshooter-zimagez.c:398
 msgid "Check the user information..."
 msgstr "Lietotāja informācijas pārbaudīšana..."
 
-#: ../lib/screenshooter-zimagez.c:305
+#: ../lib/screenshooter-zimagez.c:405
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You "
 "must fill all the fields.</span>"
@@ -237,42 +215,48 @@ msgstr ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">Jums "
 "ir jāaizpilda visi lauki.</span>"
 
-#: ../lib/screenshooter-zimagez.c:320
+#: ../lib/screenshooter-zimagez.c:419
 msgid "Login on ZimageZ..."
 msgstr "ZimageZ pieteikšanās..."
 
-#: ../lib/screenshooter-zimagez.c:436
+#: ../lib/screenshooter-zimagez.c:459 ../lib/screenshooter-zimagez.c:610
+msgid ""
+"An unexpected reply from ZimageZ was received. The upload of the screenshot "
+"failed."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:498
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The "
 "user and the password you entered do not match. Please retry.</span>"
 msgstr ""
-"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">"
-"Lietotāja vārds un parole nesakrīt. Lūdzu mēģiniet vēlreiz.</span>"
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded"
+"\">Lietotāja vārds un parole nesakrīt. Lūdzu mēģiniet vēlreiz.</span>"
 
-#: ../lib/screenshooter-zimagez.c:501
+#: ../lib/screenshooter-zimagez.c:556
 msgid "Upload the screenshot..."
 msgstr "Ekrānkopijas augšupielāde..."
 
-#: ../lib/screenshooter-zimagez.c:559
+#: ../lib/screenshooter-zimagez.c:589
 #, c-format
 msgid "An error occurred while uploading the screenshot."
 msgstr "Notika kļūda pie ekrānkopijas augšupielādes."
 
 #. End the user session
-#: ../lib/screenshooter-zimagez.c:597
+#: ../lib/screenshooter-zimagez.c:622
 msgid "Close the session on ZimageZ..."
 msgstr "ZimageZ sesijas aizvēršana..."
 
-#: ../lib/screenshooter-zimagez.c:650
+#: ../lib/screenshooter-zimagez.c:692
 msgid "Details about the screenshot for ZimageZ"
 msgstr "Detaļas par ekrānkopiju no ZimageZ"
 
 #. Create the user label
-#: ../lib/screenshooter-zimagez.c:692
+#: ../lib/screenshooter-zimagez.c:734
 msgid "User:"
 msgstr "Lietotājs:"
 
-#: ../lib/screenshooter-zimagez.c:703
+#: ../lib/screenshooter-zimagez.c:745
 msgid ""
 "Your Zimagez user name, if you do not have one yet please create one on the "
 "Web page linked above"
@@ -281,60 +265,60 @@ msgstr ""
 "norādītājā vietnē"
 
 #. Create the password label
-#: ../lib/screenshooter-zimagez.c:708
+#: ../lib/screenshooter-zimagez.c:751
 msgid "Password:"
 msgstr "Parole:"
 
-#: ../lib/screenshooter-zimagez.c:718
+#: ../lib/screenshooter-zimagez.c:761
 msgid "The password for the user above"
 msgstr "Augstāk minētā lietotāja parole"
 
 #. Create the title label
-#: ../lib/screenshooter-zimagez.c:723
+#: ../lib/screenshooter-zimagez.c:767
 msgid "Title:"
 msgstr "Virsraksts:"
 
-#: ../lib/screenshooter-zimagez.c:733
+#: ../lib/screenshooter-zimagez.c:777
 msgid ""
 "The title of the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
 msgstr "Ekrānkopijas virsraksts, tiks lietots attēla attēlošanai uz ZimageZ"
 
 #. Create the comment label
-#: ../lib/screenshooter-zimagez.c:738
+#: ../lib/screenshooter-zimagez.c:783
 msgid "Comment:"
 msgstr "Komentārs:"
 
-#: ../lib/screenshooter-zimagez.c:749
+#: ../lib/screenshooter-zimagez.c:794
 msgid ""
 "A comment on the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
 msgstr "Komentārs par ekrānkopiju, tas tiks attēlots kopā ar attēlu uz ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:870
+#: ../lib/screenshooter-zimagez.c:917
 #, c-format
 msgid "<a href=\"%s\">Full size image</a>"
 msgstr "<a href=\"%s\">Pilna izmēra attēls</a>"
 
-#: ../lib/screenshooter-zimagez.c:872
+#: ../lib/screenshooter-zimagez.c:919
 #, c-format
 msgid "<a href=\"%s\">Large thumbnail</a>"
 msgstr "<a href=\"%s\">Liels sīktēls</a>"
 
-#: ../lib/screenshooter-zimagez.c:874
+#: ../lib/screenshooter-zimagez.c:921
 #, c-format
 msgid "<a href=\"%s\">Small thumbnail</a>"
 msgstr "<a href=\"%s\">Mazs sīktēls</a>"
 
-#: ../lib/screenshooter-zimagez.c:894
+#: ../lib/screenshooter-zimagez.c:937
 msgid "My screenshot on ZimageZ"
 msgstr "Mana ekrānkopija uz ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:920
+#: ../lib/screenshooter-zimagez.c:963
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Links</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Saites</span>"
 
-#: ../lib/screenshooter-zimagez.c:965
+#: ../lib/screenshooter-zimagez.c:1008
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing "
 "to the full size image</span>"
@@ -343,20 +327,20 @@ msgstr ""
 "pilna izmēra attēlu</span>"
 
 #. HTML title
-#: ../lib/screenshooter-zimagez.c:981
+#: ../lib/screenshooter-zimagez.c:1024
 msgid "HTML"
 msgstr "HTML"
 
 #. BB title
-#: ../lib/screenshooter-zimagez.c:1002
+#: ../lib/screenshooter-zimagez.c:1045
 msgid "BBCode for forums"
 msgstr "BBCode priekš forumiem"
 
-#: ../lib/screenshooter-zimagez.c:1122
+#: ../lib/screenshooter-zimagez.c:1174
 msgid "ZimageZ"
 msgstr "ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:1155
+#: ../lib/screenshooter-zimagez.c:1207
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Status</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Status</span>"
 
@@ -370,29 +354,38 @@ msgstr "_Atvērt saiti"
 msgid "Copy _Link Address"
 msgstr "Kopēt _saites adresi"
 
-#: ../src/main.c:53
+#: ../src/main.c:48
 msgid "Delay in seconds before taking the screenshot"
 msgstr "Aizture sekundēs pirms ekrānkopijas uzņemšanas"
 
-#: ../src/main.c:63
-msgid "Do not display the save dialog"
-msgstr "Nerādīt saglabāšanas logu"
-
-#: ../src/main.c:68
-msgid "Do not display the mouse on the screenshot"
+#: ../src/main.c:58
+#, fuzzy
+msgid "Display the mouse on the screenshot"
 msgstr "Nerādīt peli uz ekrānkopijas"
 
-#: ../src/main.c:85
+#: ../src/main.c:75
 msgid "Directory where the screenshot will be saved"
 msgstr "Direktorija, kurā saglabāt ekrānkopijas"
 
-#: ../src/main.c:99
+#: ../src/main.c:85
 msgid "Version information"
 msgstr "Versijas informācija"
 
+#: ../src/main.c:134
+#, c-format
+msgid "Conflicting options: --%s and --%s cannot be used at the same time.\n"
+msgstr ""
+
 #: ../src/main.c:136
 #, c-format
 msgid ""
+"The --%s option is only used when --fullscreen, --window or --region is "
+"given. It will be ignored.\n"
+msgstr ""
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
@@ -400,7 +393,7 @@ msgstr ""
 "Mēģiniet %s --help , lai redzētu pilnu pieejamo komandas līnijas iespēju "
 "sarakstu.\n"
 
-#: ../src/main.c:235
+#: ../src/main.c:282
 #, c-format
 msgid "%s is not a valid directory, the default directory will be used."
 msgstr "%s nav derīgā direktorija, noklusētā direktorija tiks izmantota."
@@ -411,6 +404,52 @@ msgid ""
 "Take screenshots of the entire screen, of the active window or of a region"
 msgstr "Uzņemt pilna ekrāna, aktīva loga, vai reģiona kopiju"
 
+#~ msgid "Screenshot.png"
+#~ msgstr "Ekrānkopija.png"
+
+#~ msgid "Screenshot-%d.png"
+#~ msgstr "Ekrānkopija-%d.png"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">Pēc uzņemšanas</span>"
+
+#~ msgid "Show the save dialog"
+#~ msgstr "Rādīt saglabāšanas dialogu"
+
+#~ msgid ""
+#~ "The save dialog allows you to change the file name and the save location"
+#~ msgstr ""
+#~ "Saglabāšanas dialogs ļauj mainīt faila nosaukumu un saglabāšanas vietu"
+
+#~ msgid "Close the application"
+#~ msgstr "Aizvērt lietotni"
+
+#~ msgid ""
+#~ "If unchecked, the current window will be displayed again after the "
+#~ "screenshot has been taken to allow you to take several screenshots in a "
+#~ "row"
+#~ msgstr ""
+#~ "Ja neatzīmēts, pašreizējais logs tiks attēlots atkal pēc ekrānkopijas "
+#~ "uzņemšanas, lai jūs varat uzņemt vairākus ekrānakopijas rindā"
+
+#~ msgid "Default save location"
+#~ msgstr "Noklusēta saglabāšanas vieta"
+
+#~ msgid "Set the default save location"
+#~ msgstr "Uzstādīt noklusēto saglabāšanas vietu"
+
+#~ msgid ""
+#~ "An error occurred during the XML exchange: %s (%d).\n"
+#~ " The screenshot could not be uploaded."
+#~ msgstr ""
+#~ "Notika kļūda XML apmaiņas laikā: %s (%d).\n"
+#~ " Ekrānkopiju nevarēja augšupielādēt."
+
+#~ msgid "Do not display the save dialog"
+#~ msgstr "Nerādīt saglabāšanas logu"
+
 #, fuzzy
 #~ msgid "Tak a screenshot of the entire screen"
 #~ msgstr "Bildēt ekrānkopiju"
diff --git a/po/nb.po b/po/nb.po
index 5c7850b..789e78e 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-screenshooter-plugin 1.0.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-31 14:02+0200\n"
+"POT-Creation-Date: 2009-11-15 00:29+0100\n"
 "PO-Revision-Date: 2007-07-02 00:22+0200\n"
 "Last-Translator: Terje Uriansrud <terje at uriansrud.net>\n"
 "Language-Team: Norwegian Bokmal\n"
@@ -17,76 +17,68 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../lib/screenshooter-dialogs.c:283
-#, fuzzy
-msgid "Screenshot.png"
-msgstr "Skjermbildekopi.png"
-
-#: ../lib/screenshooter-dialogs.c:300
-#, c-format
-msgid "Screenshot-%d.png"
-msgstr "Skjermbildekopi-%d.png"
-
-#: ../lib/screenshooter-dialogs.c:493
+#: ../lib/screenshooter-dialogs.c:478
 #, c-format
 msgid "%.2fKb of %.2fKb"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:577
+#: ../lib/screenshooter-dialogs.c:560
 msgid "Transfer"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:600
+#: ../lib/screenshooter-dialogs.c:581
 #, fuzzy
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being "
 "transferred to:</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Aksjon</span>"
 
-#: ../lib/screenshooter-dialogs.c:724 ../lib/screenshooter-dialogs.c:741
+#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
 msgid "Screenshot"
 msgstr "Skjermbildekopi"
 
-#: ../lib/screenshooter-dialogs.c:736
+#: ../lib/screenshooter-dialogs.c:709
 msgid "Take a screenshot"
 msgstr "Skjermbildekopi"
 
-#: ../lib/screenshooter-dialogs.c:751
+#: ../lib/screenshooter-dialogs.c:724
 msgid "Preferences"
 msgstr "Innstillinger"
 
-#: ../lib/screenshooter-dialogs.c:793
+#: ../lib/screenshooter-dialogs.c:754
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Region to capture</span>"
 msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Område som skal tas bilde av</"
 "span>"
 
-#: ../lib/screenshooter-dialogs.c:820
+#: ../lib/screenshooter-dialogs.c:774
 msgid "Entire screen"
 msgstr "Hele skjermen"
 
-#: ../lib/screenshooter-dialogs.c:830 ../src/main.c:58
-#: ../panel-plugin/screenshooter-plugin.c:292
+#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../panel-plugin/screenshooter-plugin.c:308
 msgid "Take a screenshot of the entire screen"
 msgstr "Ta skjermbildekopi av hele skjermen"
 
-#: ../lib/screenshooter-dialogs.c:841
+#: ../lib/screenshooter-dialogs.c:789
 msgid "Active window"
 msgstr "Aktivt vindu"
 
-#: ../lib/screenshooter-dialogs.c:851 ../src/main.c:104
-#: ../panel-plugin/screenshooter-plugin.c:297
+#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr "Ta en skjermbildekopi av det aktive vinduet"
 
-#: ../lib/screenshooter-dialogs.c:862
+#: ../lib/screenshooter-dialogs.c:804
 msgid "Select a region"
 msgstr "Velg et område"
 
-#: ../lib/screenshooter-dialogs.c:872 ../src/main.c:78
-#: ../panel-plugin/screenshooter-plugin.c:302
+#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../panel-plugin/screenshooter-plugin.c:318
 msgid ""
 "Select a region to be captured by clicking a point of the screen without "
 "releasing the mouse button, dragging your mouse to the other corner of the "
@@ -96,16 +88,16 @@ msgstr ""
 "deretter flytt musepekeren til det andre hjørnet av området, og slipp "
 "knappen."
 
-#: ../lib/screenshooter-dialogs.c:884
+#: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:892
+#: ../lib/screenshooter-dialogs.c:824
 #, fuzzy
 msgid "Display the mouse pointer on the screenshot"
 msgstr "Ikke vis vindu for å lagre"
 
-#: ../lib/screenshooter-dialogs.c:917
+#: ../lib/screenshooter-dialogs.c:840
 #, fuzzy
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
@@ -113,123 +105,107 @@ msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Område som skal tas bilde av</"
 "span>"
 
-#: ../lib/screenshooter-dialogs.c:952
+#: ../lib/screenshooter-dialogs.c:862
 msgid "Delay in seconds before the screenshot is taken"
 msgstr "Forsinkelse i sekunder før skjermbildekopien tas"
 
-#: ../lib/screenshooter-dialogs.c:958
+#: ../lib/screenshooter-dialogs.c:865
 msgid "seconds"
 msgstr "sekunder"
 
-#: ../lib/screenshooter-dialogs.c:984
-#, fuzzy
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Aksjon</span>"
-
-#. Display the save dialog checkbox
-#: ../lib/screenshooter-dialogs.c:1007
-#, fuzzy
-msgid "Show the save dialog"
-msgstr "Ikke vis vindu for å lagre"
-
-#: ../lib/screenshooter-dialogs.c:1013
-msgid ""
-"The save dialog allows you to change the file name and the save location"
-msgstr ""
-
-#: ../lib/screenshooter-dialogs.c:1027
-#, fuzzy
-msgid "Close the application"
-msgstr "Program:"
-
-#: ../lib/screenshooter-dialogs.c:1033
-msgid ""
-"If unchecked, the current window will be displayed again after the "
-"screenshot has been taken to allow you to take several screenshots in a row"
+#: ../lib/screenshooter-dialogs.c:917
+msgid "Action"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1056
+#: ../lib/screenshooter-dialogs.c:945
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Action</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Aksjon</span>"
 
 #. Save option radio button
-#: ../lib/screenshooter-dialogs.c:1081
+#: ../lib/screenshooter-dialogs.c:961
 #, fuzzy
-msgid "Save in:"
+msgid "Save"
 msgstr "Lagre"
 
-#: ../lib/screenshooter-dialogs.c:1089
+#: ../lib/screenshooter-dialogs.c:966
 msgid "Save the screenshot to a PNG file"
 msgstr "Lagre skjermbildekopien som en PNG fil"
 
-#: ../lib/screenshooter-dialogs.c:1104
-msgid "Default save location"
-msgstr "Standard lagringsplass"
-
-#: ../lib/screenshooter-dialogs.c:1114
-msgid "Set the default save location"
-msgstr "Sett standard lagringsplass"
-
-#: ../lib/screenshooter-dialogs.c:1127
+#: ../lib/screenshooter-dialogs.c:975
 msgid "Copy to the clipboard"
 msgstr "Kopier til utklippstavlen"
 
-#: ../lib/screenshooter-dialogs.c:1132
+#: ../lib/screenshooter-dialogs.c:977
 msgid "Copy the screenshot to the clipboard so that it can be pasted later"
 msgstr ""
 "Kopier skjermbildekopien til utklippstavlen slik at det kan limes inn senere"
 
-#: ../lib/screenshooter-dialogs.c:1147
+#: ../lib/screenshooter-dialogs.c:994
 msgid "Open with:"
 msgstr "Åpne med:"
 
-#: ../lib/screenshooter-dialogs.c:1158
+#: ../lib/screenshooter-dialogs.c:1000
 msgid "Open the screenshot with the chosen application"
 msgstr "Åpne skjermbildekopien med valgt program"
 
-#: ../lib/screenshooter-dialogs.c:1191 ../src/main.c:73
+#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
 msgid "Application to open the screenshot"
 msgstr "Program for å åpne skjermbildekopier"
 
-#: ../lib/screenshooter-dialogs.c:1204
+#: ../lib/screenshooter-dialogs.c:1028
 msgid "Host on ZimageZ"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1210 ../src/main.c:92
+#: ../lib/screenshooter-dialogs.c:1032 ../src/main.c:80
 msgid "Host the screenshot on ZimageZ, a free online image hosting service"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1255
+#: ../lib/screenshooter-dialogs.c:1046
+#, fuzzy
+msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Preview</span>"
+msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Aksjon</span>"
+
+#: ../lib/screenshooter-dialogs.c:1107
 msgid "Save screenshot as..."
 msgstr "Lagre skjermbildekopi som ..."
 
-#. Start the user XML RPC session
-#: ../lib/screenshooter-zimagez.c:159
-msgid "Initialize the connection..."
+#: ../lib/screenshooter-zimagez.c:134
+#, c-format
+msgid "An error occured when creating the XMLRPC request."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:172 ../lib/screenshooter-zimagez.c:332
-#: ../lib/screenshooter-zimagez.c:361 ../lib/screenshooter-zimagez.c:389
-#: ../lib/screenshooter-zimagez.c:520 ../lib/screenshooter-zimagez.c:543
-#: ../lib/screenshooter-zimagez.c:580
+#: ../lib/screenshooter-zimagez.c:153
 #, c-format
-msgid ""
-"An error occurred during the XML exchange: %s (%d).\n"
-" The screenshot could not be uploaded."
+msgid "An error occured when transfering the data to ZimageZ."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:178
+#, c-format
+msgid "An error occured when parsing the response from ZimageZ."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:228
+#, c-format
+msgid "Taken on %s, at %s"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:223
+#. Start the user soup session
+#: ../lib/screenshooter-zimagez.c:295
+msgid "Initialize the connection..."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:341
 msgid ""
 "Please file the following fields with your <a href=\"http://www.zimagez.com"
 "\">ZimageZ</a> \n"
 "user name, passsword and details about the screenshot."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:283
+#: ../lib/screenshooter-zimagez.c:398
 msgid "Check the user information..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:305
+#: ../lib/screenshooter-zimagez.c:405
 #, fuzzy
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You "
@@ -238,105 +214,111 @@ msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Område som skal tas bilde av</"
 "span>"
 
-#: ../lib/screenshooter-zimagez.c:320
+#: ../lib/screenshooter-zimagez.c:419
 msgid "Login on ZimageZ..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:436
+#: ../lib/screenshooter-zimagez.c:459 ../lib/screenshooter-zimagez.c:610
+msgid ""
+"An unexpected reply from ZimageZ was received. The upload of the screenshot "
+"failed."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:498
 #, fuzzy
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The "
 "user and the password you entered do not match. Please retry.</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Aksjon</span>"
 
-#: ../lib/screenshooter-zimagez.c:501
+#: ../lib/screenshooter-zimagez.c:556
 #, fuzzy
 msgid "Upload the screenshot..."
 msgstr "Ta skjermbildekopien"
 
-#: ../lib/screenshooter-zimagez.c:559
+#: ../lib/screenshooter-zimagez.c:589
 #, c-format
 msgid "An error occurred while uploading the screenshot."
 msgstr ""
 
 #. End the user session
-#: ../lib/screenshooter-zimagez.c:597
+#: ../lib/screenshooter-zimagez.c:622
 msgid "Close the session on ZimageZ..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:650
+#: ../lib/screenshooter-zimagez.c:692
 #, fuzzy
 msgid "Details about the screenshot for ZimageZ"
 msgstr "Forsinkelse i sekunder før skjermbildekopien tas"
 
 #. Create the user label
-#: ../lib/screenshooter-zimagez.c:692
+#: ../lib/screenshooter-zimagez.c:734
 msgid "User:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:703
+#: ../lib/screenshooter-zimagez.c:745
 msgid ""
 "Your Zimagez user name, if you do not have one yet please create one on the "
 "Web page linked above"
 msgstr ""
 
 #. Create the password label
-#: ../lib/screenshooter-zimagez.c:708
+#: ../lib/screenshooter-zimagez.c:751
 msgid "Password:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:718
+#: ../lib/screenshooter-zimagez.c:761
 msgid "The password for the user above"
 msgstr ""
 
 #. Create the title label
-#: ../lib/screenshooter-zimagez.c:723
+#: ../lib/screenshooter-zimagez.c:767
 msgid "Title:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:733
+#: ../lib/screenshooter-zimagez.c:777
 msgid ""
 "The title of the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
 msgstr ""
 
 #. Create the comment label
-#: ../lib/screenshooter-zimagez.c:738
+#: ../lib/screenshooter-zimagez.c:783
 msgid "Comment:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:749
+#: ../lib/screenshooter-zimagez.c:794
 msgid ""
 "A comment on the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:870
+#: ../lib/screenshooter-zimagez.c:917
 #, c-format
 msgid "<a href=\"%s\">Full size image</a>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:872
+#: ../lib/screenshooter-zimagez.c:919
 #, c-format
 msgid "<a href=\"%s\">Large thumbnail</a>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:874
+#: ../lib/screenshooter-zimagez.c:921
 #, c-format
 msgid "<a href=\"%s\">Small thumbnail</a>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:894
+#: ../lib/screenshooter-zimagez.c:937
 #, fuzzy
 msgid "My screenshot on ZimageZ"
 msgstr "Forsinkelse i sekunder før skjermbildekopien tas"
 
-#: ../lib/screenshooter-zimagez.c:920
+#: ../lib/screenshooter-zimagez.c:963
 #, fuzzy
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Links</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Aksjon</span>"
 
-#: ../lib/screenshooter-zimagez.c:965
+#: ../lib/screenshooter-zimagez.c:1008
 #, fuzzy
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing "
@@ -346,20 +328,20 @@ msgstr ""
 "skjermbildekopien tas</span>"
 
 #. HTML title
-#: ../lib/screenshooter-zimagez.c:981
+#: ../lib/screenshooter-zimagez.c:1024
 msgid "HTML"
 msgstr ""
 
 #. BB title
-#: ../lib/screenshooter-zimagez.c:1002
+#: ../lib/screenshooter-zimagez.c:1045
 msgid "BBCode for forums"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:1122
+#: ../lib/screenshooter-zimagez.c:1174
 msgid "ZimageZ"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:1155
+#: ../lib/screenshooter-zimagez.c:1207
 #, fuzzy
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Status</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Aksjon</span>"
@@ -375,37 +357,45 @@ msgstr "Åpne med:"
 msgid "Copy _Link Address"
 msgstr ""
 
-#: ../src/main.c:53
+#: ../src/main.c:48
 msgid "Delay in seconds before taking the screenshot"
 msgstr "Forsinkelse i sekunder før skjermbildekopi tas"
 
-#: ../src/main.c:63
-msgid "Do not display the save dialog"
-msgstr "Ikke vis vindu for å lagre"
-
-#: ../src/main.c:68
+#: ../src/main.c:58
 #, fuzzy
-msgid "Do not display the mouse on the screenshot"
+msgid "Display the mouse on the screenshot"
 msgstr "Ikke vis vindu for å lagre"
 
-#: ../src/main.c:85
+#: ../src/main.c:75
 msgid "Directory where the screenshot will be saved"
 msgstr "Mappen hvor skjermbildekopier lagres"
 
-#: ../src/main.c:99
+#: ../src/main.c:85
 msgid "Version information"
 msgstr "Versjonsinformasjon"
 
+#: ../src/main.c:134
+#, c-format
+msgid "Conflicting options: --%s and --%s cannot be used at the same time.\n"
+msgstr ""
+
 #: ../src/main.c:136
 #, c-format
 msgid ""
+"The --%s option is only used when --fullscreen, --window or --region is "
+"given. It will be ignored.\n"
+msgstr ""
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
 "%s: %s\n"
 "Prøv %s --help for å se liste over tilgjengelige kommandolinjeopsjoner.\n"
 
-#: ../src/main.c:235
+#: ../src/main.c:282
 #, c-format
 msgid "%s is not a valid directory, the default directory will be used."
 msgstr "%s er ikke en gyldig mappe, standard mappe vil bli benyttet."
@@ -419,6 +409,35 @@ msgstr ""
 "av skjermen"
 
 #, fuzzy
+#~ msgid "Screenshot.png"
+#~ msgstr "Skjermbildekopi.png"
+
+#~ msgid "Screenshot-%d.png"
+#~ msgstr "Skjermbildekopi-%d.png"
+
+#, fuzzy
+#~ msgid ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
+#~ msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Aksjon</span>"
+
+#, fuzzy
+#~ msgid "Show the save dialog"
+#~ msgstr "Ikke vis vindu for å lagre"
+
+#, fuzzy
+#~ msgid "Close the application"
+#~ msgstr "Program:"
+
+#~ msgid "Default save location"
+#~ msgstr "Standard lagringsplass"
+
+#~ msgid "Set the default save location"
+#~ msgstr "Sett standard lagringsplass"
+
+#~ msgid "Do not display the save dialog"
+#~ msgstr "Ikke vis vindu for å lagre"
+
+#, fuzzy
 #~ msgid "Tak a screenshot of the entire screen"
 #~ msgstr "Ta skjermbildekopi av hele skjermen"
 
diff --git a/po/nl.po b/po/nl.po
index ae5cabe..90a48ca 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-31 14:02+0200\n"
+"POT-Creation-Date: 2009-11-15 00:29+0100\n"
 "PO-Revision-Date: 2009-08-15 14:59-0800\n"
 "Last-Translator: Auke Kok <auke-jan.h.kok at intel.com>\n"
 "Language-Team: Dutch <xfce-i18n at xfce.org>\n"
@@ -17,311 +17,331 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../lib/screenshooter-dialogs.c:283
-msgid "Screenshot.png"
-msgstr "Schermafdruk.png"
-
-#: ../lib/screenshooter-dialogs.c:300
-#, c-format
-msgid "Screenshot-%d.png"
-msgstr "Schermafdruk-%d.png"
-
-#: ../lib/screenshooter-dialogs.c:493
+#: ../lib/screenshooter-dialogs.c:478
 #, c-format
 msgid "%.2fKb of %.2fKb"
 msgstr "%.2fKb van %.2fKb"
 
-#: ../lib/screenshooter-dialogs.c:577
+#: ../lib/screenshooter-dialogs.c:560
 msgid "Transfer"
 msgstr "Overdracht"
 
-#: ../lib/screenshooter-dialogs.c:600
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being transferred to:</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">De schermafdruk wordt overgedragen naar:</span>"
+#: ../lib/screenshooter-dialogs.c:581
+msgid ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being "
+"transferred to:</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">De schermafdruk wordt "
+"overgedragen naar:</span>"
 
-#: ../lib/screenshooter-dialogs.c:724
-#: ../lib/screenshooter-dialogs.c:741
+#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
 msgid "Screenshot"
 msgstr "Schermafdruk"
 
-#: ../lib/screenshooter-dialogs.c:736
+#: ../lib/screenshooter-dialogs.c:709
 msgid "Take a screenshot"
 msgstr "Schermafdruk maken"
 
-#: ../lib/screenshooter-dialogs.c:751
+#: ../lib/screenshooter-dialogs.c:724
 msgid "Preferences"
 msgstr "Voorkeuren"
 
-#: ../lib/screenshooter-dialogs.c:793
+#: ../lib/screenshooter-dialogs.c:754
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Region to capture</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Gebied om een schermafdruk van te maken</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Gebied om een schermafdruk "
+"van te maken</span>"
 
-#: ../lib/screenshooter-dialogs.c:820
+#: ../lib/screenshooter-dialogs.c:774
 msgid "Entire screen"
 msgstr "Volledig scherm"
 
-#: ../lib/screenshooter-dialogs.c:830
-#: ../src/main.c:58
-#: ../panel-plugin/screenshooter-plugin.c:292
+#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../panel-plugin/screenshooter-plugin.c:308
 msgid "Take a screenshot of the entire screen"
 msgstr "Schermafdruk van het hele scherm maken"
 
-#: ../lib/screenshooter-dialogs.c:841
+#: ../lib/screenshooter-dialogs.c:789
 msgid "Active window"
 msgstr "Actieve venster"
 
-#: ../lib/screenshooter-dialogs.c:851
-#: ../src/main.c:104
-#: ../panel-plugin/screenshooter-plugin.c:297
+#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr "Actieve venster"
 
-#: ../lib/screenshooter-dialogs.c:862
+#: ../lib/screenshooter-dialogs.c:804
 msgid "Select a region"
 msgstr "Selecteer een gebied"
 
-#: ../lib/screenshooter-dialogs.c:872
-#: ../src/main.c:78
-#: ../panel-plugin/screenshooter-plugin.c:302
-msgid "Select a region to be captured by clicking a point of the screen without releasing the mouse button, dragging your mouse to the other corner of the region, and releasing the mouse button."
-msgstr "Selecteer een gebied om een schermafdruk door te klikken op een hoek van het gebied zonder de muisknop zo te laten. Sleep vervolgens de muis naar de andere hoek en laat de muisknop los."
+#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../panel-plugin/screenshooter-plugin.c:318
+msgid ""
+"Select a region to be captured by clicking a point of the screen without "
+"releasing the mouse button, dragging your mouse to the other corner of the "
+"region, and releasing the mouse button."
+msgstr ""
+"Selecteer een gebied om een schermafdruk door te klikken op een hoek van het "
+"gebied zonder de muisknop zo te laten. Sleep vervolgens de muis naar de "
+"andere hoek en laat de muisknop los."
 
-#: ../lib/screenshooter-dialogs.c:884
+#: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
 msgstr "Muisaanwijzer afbeelden"
 
-#: ../lib/screenshooter-dialogs.c:892
+#: ../lib/screenshooter-dialogs.c:824
 msgid "Display the mouse pointer on the screenshot"
 msgstr "Muisaanwijzer weergeven op de schermafdruk"
 
-#: ../lib/screenshooter-dialogs.c:917
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Vertraging voor het maken van de schermafdruk</span>"
+#: ../lib/screenshooter-dialogs.c:840
+msgid ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Vertraging voor het maken van "
+"de schermafdruk</span>"
 
-#: ../lib/screenshooter-dialogs.c:952
+#: ../lib/screenshooter-dialogs.c:862
 msgid "Delay in seconds before the screenshot is taken"
 msgstr "Vertraging in seconden voor het maken van een schermafdruk"
 
-#: ../lib/screenshooter-dialogs.c:958
+#: ../lib/screenshooter-dialogs.c:865
 msgid "seconds"
 msgstr "seconden"
 
-#: ../lib/screenshooter-dialogs.c:984
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Na het maken van de schermafdruk</span>"
-
-#. Display the save dialog checkbox
-#: ../lib/screenshooter-dialogs.c:1007
-msgid "Show the save dialog"
-msgstr "Opslaan-dialoogvenster weergeven"
-
-#: ../lib/screenshooter-dialogs.c:1013
-msgid "The save dialog allows you to change the file name and the save location"
-msgstr "In het opslaan-dialoogvenster kunt u de bestandsnaam en opslaglocatie wijzigen"
-
-#: ../lib/screenshooter-dialogs.c:1027
-msgid "Close the application"
-msgstr "Toepassing sluiten"
-
-#: ../lib/screenshooter-dialogs.c:1033
-msgid "If unchecked, the current window will be displayed again after the screenshot has been taken to allow you to take several screenshots in a row"
-msgstr "Wanneer deze optie niet is aangevinkt zal het huidige venster opnieuw weergegeven worden na het maken van een schermafdruk zodat u meerdere schermafdrukken op rij kunt maken"
+#: ../lib/screenshooter-dialogs.c:917
+msgid "Action"
+msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1056
+#: ../lib/screenshooter-dialogs.c:945
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Action</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Actie</span>"
 
 #. Save option radio button
-#: ../lib/screenshooter-dialogs.c:1081
-msgid "Save in:"
+#: ../lib/screenshooter-dialogs.c:961
+#, fuzzy
+msgid "Save"
 msgstr "Opslaan in:"
 
-#: ../lib/screenshooter-dialogs.c:1089
+#: ../lib/screenshooter-dialogs.c:966
 msgid "Save the screenshot to a PNG file"
 msgstr "Schermafdruk opslaan als PNG-bestand"
 
-#: ../lib/screenshooter-dialogs.c:1104
-msgid "Default save location"
-msgstr "Standaard opslaglocatie"
-
-#: ../lib/screenshooter-dialogs.c:1114
-msgid "Set the default save location"
-msgstr "Standaard-opslaglocatie instellen"
-
-#: ../lib/screenshooter-dialogs.c:1127
+#: ../lib/screenshooter-dialogs.c:975
 msgid "Copy to the clipboard"
 msgstr "Kopieer naar klembord"
 
-#: ../lib/screenshooter-dialogs.c:1132
+#: ../lib/screenshooter-dialogs.c:977
 msgid "Copy the screenshot to the clipboard so that it can be pasted later"
-msgstr "Kopieer de schermafdruk naar het klembord zodat deze later geplakt kan worden"
+msgstr ""
+"Kopieer de schermafdruk naar het klembord zodat deze later geplakt kan worden"
 
-#: ../lib/screenshooter-dialogs.c:1147
+#: ../lib/screenshooter-dialogs.c:994
 msgid "Open with:"
 msgstr "Openen met:"
 
-#: ../lib/screenshooter-dialogs.c:1158
+#: ../lib/screenshooter-dialogs.c:1000
 msgid "Open the screenshot with the chosen application"
 msgstr "Open de schermafdruk met de gegeven toepassing"
 
-#: ../lib/screenshooter-dialogs.c:1191
-#: ../src/main.c:73
+#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
 msgid "Application to open the screenshot"
 msgstr "Toepassing om de schermafdruk te openen"
 
-#: ../lib/screenshooter-dialogs.c:1204
+#: ../lib/screenshooter-dialogs.c:1028
 msgid "Host on ZimageZ"
 msgstr "Uploaden naar ZimageZ"
 
-#: ../lib/screenshooter-dialogs.c:1210
-#: ../src/main.c:92
+#: ../lib/screenshooter-dialogs.c:1032 ../src/main.c:80
 msgid "Host the screenshot on ZimageZ, a free online image hosting service"
-msgstr "De schermadruk uploaden naar ZimageZ, een gratis online dienst om afbeeldingen te bewaren"
+msgstr ""
+"De schermadruk uploaden naar ZimageZ, een gratis online dienst om "
+"afbeeldingen te bewaren"
+
+#: ../lib/screenshooter-dialogs.c:1046
+#, fuzzy
+msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Preview</span>"
+msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Links</span>"
 
-#: ../lib/screenshooter-dialogs.c:1255
+#: ../lib/screenshooter-dialogs.c:1107
 msgid "Save screenshot as..."
 msgstr "Schermafdruk opslaan als..."
 
-#. Start the user XML RPC session
-#: ../lib/screenshooter-zimagez.c:159
-msgid "Initialize the connection..."
-msgstr "Verbinding aan het initialiseren..."
+#: ../lib/screenshooter-zimagez.c:134
+#, fuzzy, c-format
+msgid "An error occured when creating the XMLRPC request."
+msgstr "Er is een fout opgetreden bij het uploaden van de schermafdruk."
 
-#: ../lib/screenshooter-zimagez.c:172
-#: ../lib/screenshooter-zimagez.c:332
-#: ../lib/screenshooter-zimagez.c:361
-#: ../lib/screenshooter-zimagez.c:389
-#: ../lib/screenshooter-zimagez.c:520
-#: ../lib/screenshooter-zimagez.c:543
-#: ../lib/screenshooter-zimagez.c:580
+#: ../lib/screenshooter-zimagez.c:153
+#, fuzzy, c-format
+msgid "An error occured when transfering the data to ZimageZ."
+msgstr "Er is een fout opgetreden bij het uploaden van de schermafdruk."
+
+#: ../lib/screenshooter-zimagez.c:178
+#, fuzzy, c-format
+msgid "An error occured when parsing the response from ZimageZ."
+msgstr "Er is een fout opgetreden bij het uploaden van de schermafdruk."
+
+#: ../lib/screenshooter-zimagez.c:228
 #, c-format
-msgid ""
-"An error occurred during the XML exchange: %s (%d).\n"
-" The screenshot could not be uploaded."
+msgid "Taken on %s, at %s"
 msgstr ""
-"Kon de schermafdruk niet uploaden.\n"
-"Fout bij het uitwisselen van XML: %s (%d)"
 
-#: ../lib/screenshooter-zimagez.c:223
+#. Start the user soup session
+#: ../lib/screenshooter-zimagez.c:295
+msgid "Initialize the connection..."
+msgstr "Verbinding aan het initialiseren..."
+
+#: ../lib/screenshooter-zimagez.c:341
 msgid ""
-"Please file the following fields with your <a href=\"http://www.zimagez.com\">ZimageZ</a> \n"
+"Please file the following fields with your <a href=\"http://www.zimagez.com"
+"\">ZimageZ</a> \n"
 "user name, passsword and details about the screenshot."
-msgstr "Vul een opmerking bij de schermafdruk en uw gebruikersnaam en wachtwoord van ZimageZ in."
+msgstr ""
+"Vul een opmerking bij de schermafdruk en uw gebruikersnaam en wachtwoord van "
+"ZimageZ in."
 
-#: ../lib/screenshooter-zimagez.c:283
+#: ../lib/screenshooter-zimagez.c:398
 msgid "Check the user information..."
 msgstr "Gebruikersinformatie aan het nakijken..."
 
-#: ../lib/screenshooter-zimagez.c:305
-msgid "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You must fill all the fields.</span>"
-msgstr "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">Alle velden moeten ingevuld worden.</span>"
+#: ../lib/screenshooter-zimagez.c:405
+msgid ""
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You "
+"must fill all the fields.</span>"
+msgstr ""
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">Alle "
+"velden moeten ingevuld worden.</span>"
 
-#: ../lib/screenshooter-zimagez.c:320
+#: ../lib/screenshooter-zimagez.c:419
 msgid "Login on ZimageZ..."
 msgstr "Aan het inloggen bij ZimageZ..."
 
-#: ../lib/screenshooter-zimagez.c:436
-msgid "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The user and the password you entered do not match. Please retry.</span>"
-msgstr "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">De gegeven gebruikersnaam en wachtwoord zijn niet correct.</span>"
+#: ../lib/screenshooter-zimagez.c:459 ../lib/screenshooter-zimagez.c:610
+msgid ""
+"An unexpected reply from ZimageZ was received. The upload of the screenshot "
+"failed."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:498
+msgid ""
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The "
+"user and the password you entered do not match. Please retry.</span>"
+msgstr ""
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">De "
+"gegeven gebruikersnaam en wachtwoord zijn niet correct.</span>"
 
-#: ../lib/screenshooter-zimagez.c:501
+#: ../lib/screenshooter-zimagez.c:556
 msgid "Upload the screenshot..."
 msgstr "Schermafdruk uploaden..."
 
-#: ../lib/screenshooter-zimagez.c:559
+#: ../lib/screenshooter-zimagez.c:589
 #, c-format
 msgid "An error occurred while uploading the screenshot."
 msgstr "Er is een fout opgetreden bij het uploaden van de schermafdruk."
 
 #. End the user session
-#: ../lib/screenshooter-zimagez.c:597
+#: ../lib/screenshooter-zimagez.c:622
 msgid "Close the session on ZimageZ..."
 msgstr "Sessie bij ZimageZ aan het afsluiten..."
 
-#: ../lib/screenshooter-zimagez.c:650
+#: ../lib/screenshooter-zimagez.c:692
 msgid "Details about the screenshot for ZimageZ"
 msgstr "Opmerking bij de schermafdruk voor ZimageZ"
 
 #. Create the user label
-#: ../lib/screenshooter-zimagez.c:692
+#: ../lib/screenshooter-zimagez.c:734
 msgid "User:"
 msgstr "Gebruikersnaam:"
 
-#: ../lib/screenshooter-zimagez.c:703
-msgid "Your Zimagez user name, if you do not have one yet please create one on the Web page linked above"
-msgstr "Uw gebruikersnaam bij ZimageZ. Als u nog geen gebruikersnaam heeft kunt u die aanmaken op de hierboven genoemde website"
+#: ../lib/screenshooter-zimagez.c:745
+msgid ""
+"Your Zimagez user name, if you do not have one yet please create one on the "
+"Web page linked above"
+msgstr ""
+"Uw gebruikersnaam bij ZimageZ. Als u nog geen gebruikersnaam heeft kunt u "
+"die aanmaken op de hierboven genoemde website"
 
 #. Create the password label
-#: ../lib/screenshooter-zimagez.c:708
+#: ../lib/screenshooter-zimagez.c:751
 msgid "Password:"
 msgstr "Wachtwoord:"
 
-#: ../lib/screenshooter-zimagez.c:718
+#: ../lib/screenshooter-zimagez.c:761
 msgid "The password for the user above"
 msgstr "Het wachtwoord behorende bij de gegeven gebruikersnaam"
 
 #. Create the title label
-#: ../lib/screenshooter-zimagez.c:723
+#: ../lib/screenshooter-zimagez.c:767
 msgid "Title:"
 msgstr "Titel:"
 
-#: ../lib/screenshooter-zimagez.c:733
-msgid "The title of the screenshot, it will be used when displaying the screenshot on ZimageZ"
+#: ../lib/screenshooter-zimagez.c:777
+msgid ""
+"The title of the screenshot, it will be used when displaying the screenshot "
+"on ZimageZ"
 msgstr "Titel van de schermafdruk"
 
 #. Create the comment label
-#: ../lib/screenshooter-zimagez.c:738
+#: ../lib/screenshooter-zimagez.c:783
 msgid "Comment:"
 msgstr "Opmerking:"
 
-#: ../lib/screenshooter-zimagez.c:749
-msgid "A comment on the screenshot, it will be used when displaying the screenshot on ZimageZ"
+#: ../lib/screenshooter-zimagez.c:794
+msgid ""
+"A comment on the screenshot, it will be used when displaying the screenshot "
+"on ZimageZ"
 msgstr "Een opmerking bij de schermafdruk"
 
-#: ../lib/screenshooter-zimagez.c:870
+#: ../lib/screenshooter-zimagez.c:917
 #, c-format
 msgid "<a href=\"%s\">Full size image</a>"
 msgstr "<a href=\"%s\">Afbeelding op volledige grootte</a>"
 
-#: ../lib/screenshooter-zimagez.c:872
+#: ../lib/screenshooter-zimagez.c:919
 #, c-format
 msgid "<a href=\"%s\">Large thumbnail</a>"
 msgstr "<a href=\"%s\">Grote miniatuurversie</a>"
 
-#: ../lib/screenshooter-zimagez.c:874
+#: ../lib/screenshooter-zimagez.c:921
 #, c-format
 msgid "<a href=\"%s\">Small thumbnail</a>"
 msgstr "<a href=\"%s\">Kleine miniatuurversie</a>"
 
-#: ../lib/screenshooter-zimagez.c:894
+#: ../lib/screenshooter-zimagez.c:937
 msgid "My screenshot on ZimageZ"
 msgstr "De schermafdruk op ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:920
+#: ../lib/screenshooter-zimagez.c:963
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Links</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Links</span>"
 
-#: ../lib/screenshooter-zimagez.c:965
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing to the full size image</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Code voor een miniatuurweergave met een link naar de volledige grootte</span>"
+#: ../lib/screenshooter-zimagez.c:1008
+msgid ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing "
+"to the full size image</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Code voor een "
+"miniatuurweergave met een link naar de volledige grootte</span>"
 
 #. HTML title
-#: ../lib/screenshooter-zimagez.c:981
+#: ../lib/screenshooter-zimagez.c:1024
 msgid "HTML"
 msgstr "HTML-code"
 
 #. BB title
-#: ../lib/screenshooter-zimagez.c:1002
+#: ../lib/screenshooter-zimagez.c:1045
 msgid "BBCode for forums"
 msgstr "BBCode voor forums"
 
-#: ../lib/screenshooter-zimagez.c:1122
+#: ../lib/screenshooter-zimagez.c:1174
 msgid "ZimageZ"
 msgstr "ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:1155
+#: ../lib/screenshooter-zimagez.c:1207
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Status</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Status</span>"
 
@@ -335,44 +355,105 @@ msgstr "Link _openen"
 msgid "Copy _Link Address"
 msgstr "_Link kopiëren"
 
-#: ../src/main.c:53
+#: ../src/main.c:48
 msgid "Delay in seconds before taking the screenshot"
 msgstr "Vertraging in seconden voor het maken van een schermafdruk"
 
-#: ../src/main.c:63
-msgid "Do not display the save dialog"
-msgstr "Niet vragen waar de schermafdruk opgeslagen moet worden"
-
-#: ../src/main.c:68
-msgid "Do not display the mouse on the screenshot"
+#: ../src/main.c:58
+#, fuzzy
+msgid "Display the mouse on the screenshot"
 msgstr "Muisaanwijzer niet op de schermafdruk afbeelden"
 
-#: ../src/main.c:85
+#: ../src/main.c:75
 msgid "Directory where the screenshot will be saved"
 msgstr "Locatie voor de schermafdruk"
 
-#: ../src/main.c:99
+#: ../src/main.c:85
 msgid "Version information"
 msgstr "Versie-informatie"
 
+#: ../src/main.c:134
+#, c-format
+msgid "Conflicting options: --%s and --%s cannot be used at the same time.\n"
+msgstr ""
+
 #: ../src/main.c:136
 #, c-format
 msgid ""
+"The --%s option is only used when --fullscreen, --window or --region is "
+"given. It will be ignored.\n"
+msgstr ""
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
 "%s: %s\n"
 "Probeer %s --help voor een volledige lijst van mogelijke opties.\n"
 
-#: ../src/main.c:235
+#: ../src/main.c:282
 #, c-format
 msgid "%s is not a valid directory, the default directory will be used."
 msgstr "%s is geen geldige map, de standaardmap zal worden gebruikt."
 
 #: ../src/xfce4-screenshooter.desktop.in.in.h:2
 #: ../panel-plugin/screenshooter.desktop.in.in.h:2
-msgid "Take screenshots of the entire screen, of the active window or of a region"
-msgstr "Schermafdruk maken van het gehele scherm, het actieve venster of van een deelgebied"
+msgid ""
+"Take screenshots of the entire screen, of the active window or of a region"
+msgstr ""
+"Schermafdruk maken van het gehele scherm, het actieve venster of van een "
+"deelgebied"
+
+#~ msgid "Screenshot.png"
+#~ msgstr "Schermafdruk.png"
+
+#~ msgid "Screenshot-%d.png"
+#~ msgstr "Schermafdruk-%d.png"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">Na het maken van de "
+#~ "schermafdruk</span>"
+
+#~ msgid "Show the save dialog"
+#~ msgstr "Opslaan-dialoogvenster weergeven"
+
+#~ msgid ""
+#~ "The save dialog allows you to change the file name and the save location"
+#~ msgstr ""
+#~ "In het opslaan-dialoogvenster kunt u de bestandsnaam en opslaglocatie "
+#~ "wijzigen"
+
+#~ msgid "Close the application"
+#~ msgstr "Toepassing sluiten"
+
+#~ msgid ""
+#~ "If unchecked, the current window will be displayed again after the "
+#~ "screenshot has been taken to allow you to take several screenshots in a "
+#~ "row"
+#~ msgstr ""
+#~ "Wanneer deze optie niet is aangevinkt zal het huidige venster opnieuw "
+#~ "weergegeven worden na het maken van een schermafdruk zodat u meerdere "
+#~ "schermafdrukken op rij kunt maken"
+
+#~ msgid "Default save location"
+#~ msgstr "Standaard opslaglocatie"
+
+#~ msgid "Set the default save location"
+#~ msgstr "Standaard-opslaglocatie instellen"
+
+#~ msgid ""
+#~ "An error occurred during the XML exchange: %s (%d).\n"
+#~ " The screenshot could not be uploaded."
+#~ msgstr ""
+#~ "Kon de schermafdruk niet uploaden.\n"
+#~ "Fout bij het uitwisselen van XML: %s (%d)"
+
+#~ msgid "Do not display the save dialog"
+#~ msgstr "Niet vragen waar de schermafdruk opgeslagen moet worden"
 
 #, fuzzy
 #~ msgid "Tak a screenshot of the entire screen"
@@ -385,8 +466,10 @@ msgstr "Schermafdruk maken van het gehele scherm, het actieve venster of van een
 #, fuzzy
 #~ msgid "Display the save dialog"
 #~ msgstr "Niet vragen waar de schermafdruk opgeslagen moet worden"
+
 #~ msgid "Save by default to:"
 #~ msgstr "Standaard-opslaglocatie:"
+
 #~ msgid ""
 #~ "If checked, the screenshot will be saved by default to the location set "
 #~ "on the right without displaying a save dialog"
@@ -394,4 +477,3 @@ msgstr "Schermafdruk maken van het gehele scherm, het actieve venster of van een
 #~ "Als deze optie is aangevinkt zal de schermafdruk standaard opgeslagen "
 #~ "worden in de locatie die hiernaast is aangegeven. Zo niet zal elke keer "
 #~ "worden gevraagd waar de afdruk opgeslagen moet worden."
-
diff --git a/po/pl.po b/po/pl.po
index 5e6a368..4dc7f29 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-screenshooter 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-31 14:02+0200\n"
+"POT-Creation-Date: 2009-11-15 00:29+0100\n"
 "PO-Revision-Date: 2009-07-20 15:17+0100\n"
 "Last-Translator: Piotr Sokół <piotr.sokol at 10g.pl>\n"
 "Language-Team: Polish\n"
@@ -15,313 +15,323 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/screenshooter-dialogs.c:283
-msgid "Screenshot.png"
-msgstr "Zrzut ekranu.png"
-
-#: ../lib/screenshooter-dialogs.c:300
-#, c-format
-msgid "Screenshot-%d.png"
-msgstr "Zrzut ekranu-%d.png"
-
-#: ../lib/screenshooter-dialogs.c:493
+#: ../lib/screenshooter-dialogs.c:478
 #, c-format
 msgid "%.2fKb of %.2fKb"
 msgstr "%.2fKb z %.2fKb"
 
-#: ../lib/screenshooter-dialogs.c:577
+#: ../lib/screenshooter-dialogs.c:560
 msgid "Transfer"
 msgstr "Wysyłanie"
 
-#: ../lib/screenshooter-dialogs.c:600
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being transferred to:</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Wysyłanie obrazu do:</span>"
+#: ../lib/screenshooter-dialogs.c:581
+msgid ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being "
+"transferred to:</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Wysyłanie obrazu do:</span>"
 
-#: ../lib/screenshooter-dialogs.c:724
-#: ../lib/screenshooter-dialogs.c:741
+#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
 msgid "Screenshot"
 msgstr "Zrzut ekranu"
 
-#: ../lib/screenshooter-dialogs.c:736
+#: ../lib/screenshooter-dialogs.c:709
 msgid "Take a screenshot"
 msgstr "Przechwytuje obraz wyświetlany na ekranie"
 
-#: ../lib/screenshooter-dialogs.c:751
+#: ../lib/screenshooter-dialogs.c:724
 msgid "Preferences"
 msgstr "Konfiguruje ustawienia apletu"
 
-#: ../lib/screenshooter-dialogs.c:793
+#: ../lib/screenshooter-dialogs.c:754
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Region to capture</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Rejestrowany obszar</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Rejestrowany obszar</span>"
 
-#: ../lib/screenshooter-dialogs.c:820
+#: ../lib/screenshooter-dialogs.c:774
 msgid "Entire screen"
 msgstr "Cały ekran"
 
-#: ../lib/screenshooter-dialogs.c:830
-#: ../src/main.c:58
-#: ../panel-plugin/screenshooter-plugin.c:292
+#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../panel-plugin/screenshooter-plugin.c:308
 msgid "Take a screenshot of the entire screen"
 msgstr "Przechwytuje obraz całego ekranu"
 
-#: ../lib/screenshooter-dialogs.c:841
+#: ../lib/screenshooter-dialogs.c:789
 msgid "Active window"
 msgstr "Bieżące okno"
 
-#: ../lib/screenshooter-dialogs.c:851
-#: ../src/main.c:104
-#: ../panel-plugin/screenshooter-plugin.c:297
+#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr "Przechwytuje obraz bieżącego okna"
 
-#: ../lib/screenshooter-dialogs.c:862
+#: ../lib/screenshooter-dialogs.c:804
 msgid "Select a region"
 msgstr "Wybrany"
 
-#: ../lib/screenshooter-dialogs.c:872
-#: ../src/main.c:78
-#: ../panel-plugin/screenshooter-plugin.c:302
-msgid "Select a region to be captured by clicking a point of the screen without releasing the mouse button, dragging your mouse to the other corner of the region, and releasing the mouse button."
+#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../panel-plugin/screenshooter-plugin.c:318
+msgid ""
+"Select a region to be captured by clicking a point of the screen without "
+"releasing the mouse button, dragging your mouse to the other corner of the "
+"region, and releasing the mouse button."
 msgstr "Przechwytuje obraz zaznaczonego obszaru ekranu"
 
-#: ../lib/screenshooter-dialogs.c:884
+#: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
 msgstr "Przechwytywanie kursora myszy"
 
-#: ../lib/screenshooter-dialogs.c:892
+#: ../lib/screenshooter-dialogs.c:824
 msgid "Display the mouse pointer on the screenshot"
 msgstr "Wyświetla kursor myszy na zrzucie ekranu"
 
-#: ../lib/screenshooter-dialogs.c:917
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
+#: ../lib/screenshooter-dialogs.c:840
+msgid ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Opóźnienie</span>"
 
-#: ../lib/screenshooter-dialogs.c:952
+#: ../lib/screenshooter-dialogs.c:862
 msgid "Delay in seconds before the screenshot is taken"
 msgstr "Określa wartość opóźnienia przed wykonaniem zrzutu ekranu"
 
-#: ../lib/screenshooter-dialogs.c:958
+#: ../lib/screenshooter-dialogs.c:865
 msgid "seconds"
 msgstr "sekund"
 
-#: ../lib/screenshooter-dialogs.c:984
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Po wykonaniu</span>"
-
-#. Display the save dialog checkbox
-#: ../lib/screenshooter-dialogs.c:1007
-msgid "Show the save dialog"
-msgstr "Wyświetlenie okna dialogowego zapisywania"
-
-#: ../lib/screenshooter-dialogs.c:1013
-msgid "The save dialog allows you to change the file name and the save location"
-msgstr "Wyświetla okno dialogowe umożliwiające określenie nazwy pliku i położenia zapisywania"
-
-#: ../lib/screenshooter-dialogs.c:1027
-msgid "Close the application"
-msgstr "Zakończenie programu"
-
-#: ../lib/screenshooter-dialogs.c:1033
-msgid "If unchecked, the current window will be displayed again after the screenshot has been taken to allow you to take several screenshots in a row"
-msgstr "Kończy działanie programu po wykonaniu zrzutu ekranu"
+#: ../lib/screenshooter-dialogs.c:917
+msgid "Action"
+msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1056
+#: ../lib/screenshooter-dialogs.c:945
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Action</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Czynność</span>"
 
 #. Save option radio button
-#: ../lib/screenshooter-dialogs.c:1081
-msgid "Save in:"
+#: ../lib/screenshooter-dialogs.c:961
+#, fuzzy
+msgid "Save"
 msgstr "Zapisanie:"
 
-#: ../lib/screenshooter-dialogs.c:1089
+#: ../lib/screenshooter-dialogs.c:966
 msgid "Save the screenshot to a PNG file"
 msgstr "Zapisuje zrzut ekranu do pliku .png"
 
-#: ../lib/screenshooter-dialogs.c:1104
-msgid "Default save location"
-msgstr "Domyślne położenie zapisywania"
-
-#: ../lib/screenshooter-dialogs.c:1114
-msgid "Set the default save location"
-msgstr "Określa domyślne położenie zapisywanych plików"
-
-#: ../lib/screenshooter-dialogs.c:1127
+#: ../lib/screenshooter-dialogs.c:975
 msgid "Copy to the clipboard"
 msgstr "Skopiowanie do schowka"
 
-#: ../lib/screenshooter-dialogs.c:1132
+#: ../lib/screenshooter-dialogs.c:977
 msgid "Copy the screenshot to the clipboard so that it can be pasted later"
-msgstr "Przygotowywuje wykonany zrzut ekranu do skopiowania za pomocą polecenia „Wklej”"
+msgstr ""
+"Przygotowywuje wykonany zrzut ekranu do skopiowania za pomocą polecenia "
+"„Wklej”"
 
-#: ../lib/screenshooter-dialogs.c:1147
+#: ../lib/screenshooter-dialogs.c:994
 msgid "Open with:"
 msgstr "Otwarcie za pomocą:"
 
-#: ../lib/screenshooter-dialogs.c:1158
+#: ../lib/screenshooter-dialogs.c:1000
 msgid "Open the screenshot with the chosen application"
 msgstr "Otwiera zrzut ekranu za pomocą wybranego programu"
 
-#: ../lib/screenshooter-dialogs.c:1191
-#: ../src/main.c:73
+#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
 msgid "Application to open the screenshot"
 msgstr "Otwiera zrzut ekranu za pomocą wybranego programu"
 
-#: ../lib/screenshooter-dialogs.c:1204
+#: ../lib/screenshooter-dialogs.c:1028
 msgid "Host on ZimageZ"
 msgstr "Przechowanie w serwisie ZimageZ"
 
-#: ../lib/screenshooter-dialogs.c:1210
-#: ../src/main.c:92
+#: ../lib/screenshooter-dialogs.c:1032 ../src/main.c:80
 msgid "Host the screenshot on ZimageZ, a free online image hosting service"
-msgstr "Przechowywuje zrzut ekranu używając bezpłatnej usługi hostingowej ZimageZ"
+msgstr ""
+"Przechowywuje zrzut ekranu używając bezpłatnej usługi hostingowej ZimageZ"
 
-#: ../lib/screenshooter-dialogs.c:1255
+#: ../lib/screenshooter-dialogs.c:1046
+#, fuzzy
+msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Preview</span>"
+msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Odnośniki</span>"
+
+#: ../lib/screenshooter-dialogs.c:1107
 msgid "Save screenshot as..."
 msgstr "Wybór pliku"
 
-#. Start the user XML RPC session
-#: ../lib/screenshooter-zimagez.c:159
-msgid "Initialize the connection..."
-msgstr "Inicjowanie połączenia..."
+#: ../lib/screenshooter-zimagez.c:134
+#, fuzzy, c-format
+msgid "An error occured when creating the XMLRPC request."
+msgstr "Wystąpił błąd podczas wysyłania obrazu."
 
-#: ../lib/screenshooter-zimagez.c:172
-#: ../lib/screenshooter-zimagez.c:332
-#: ../lib/screenshooter-zimagez.c:361
-#: ../lib/screenshooter-zimagez.c:389
-#: ../lib/screenshooter-zimagez.c:520
-#: ../lib/screenshooter-zimagez.c:543
-#: ../lib/screenshooter-zimagez.c:580
+#: ../lib/screenshooter-zimagez.c:153
+#, fuzzy, c-format
+msgid "An error occured when transfering the data to ZimageZ."
+msgstr "Wystąpił błąd podczas wysyłania obrazu."
+
+#: ../lib/screenshooter-zimagez.c:178
+#, fuzzy, c-format
+msgid "An error occured when parsing the response from ZimageZ."
+msgstr "Wystąpił błąd podczas wysyłania obrazu."
+
+#: ../lib/screenshooter-zimagez.c:228
 #, c-format
-msgid ""
-"An error occurred during the XML exchange: %s (%d).\n"
-" The screenshot could not be uploaded."
+msgid "Taken on %s, at %s"
 msgstr ""
-"Wystąpił błąd podczas wymiany XML: %s (%d).\n"
-"Obraz nie może zostać wysłany."
 
-#: ../lib/screenshooter-zimagez.c:223
+#. Start the user soup session
+#: ../lib/screenshooter-zimagez.c:295
+msgid "Initialize the connection..."
+msgstr "Inicjowanie połączenia..."
+
+#: ../lib/screenshooter-zimagez.c:341
 msgid ""
-"Please file the following fields with your <a href=\"http://www.zimagez.com\">ZimageZ</a> \n"
+"Please file the following fields with your <a href=\"http://www.zimagez.com"
+"\">ZimageZ</a> \n"
 "user name, passsword and details about the screenshot."
 msgstr ""
 "Proszę uzupełnić poniższe pola, wprowadzając nazwę użytkownika, \n"
-"hasło używane w serwisie <a href=\"http://www.zimagez.com\">ZimageZ</a> oraz opis obrazu."
+"hasło używane w serwisie <a href=\"http://www.zimagez.com\">ZimageZ</a> oraz "
+"opis obrazu."
 
-#: ../lib/screenshooter-zimagez.c:283
+#: ../lib/screenshooter-zimagez.c:398
 msgid "Check the user information..."
 msgstr "Sprawdzanie danych użytkownika..."
 
-#: ../lib/screenshooter-zimagez.c:305
-msgid "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You must fill all the fields.</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Proszę wypełnić wszystkie pola.</span>"
+#: ../lib/screenshooter-zimagez.c:405
+msgid ""
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You "
+"must fill all the fields.</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Proszę wypełnić wszystkie "
+"pola.</span>"
 
-#: ../lib/screenshooter-zimagez.c:320
+#: ../lib/screenshooter-zimagez.c:419
 msgid "Login on ZimageZ..."
 msgstr "Logowanie w serwisie ZimageZ..."
 
-#: ../lib/screenshooter-zimagez.c:436
-msgid "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The user and the password you entered do not match. Please retry.</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Wprowadzona nazwa użytkownika lub hasło jest niepoprawne. Proszę spróbować ponownie.</span>"
+#: ../lib/screenshooter-zimagez.c:459 ../lib/screenshooter-zimagez.c:610
+msgid ""
+"An unexpected reply from ZimageZ was received. The upload of the screenshot "
+"failed."
+msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:501
+#: ../lib/screenshooter-zimagez.c:498
+msgid ""
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The "
+"user and the password you entered do not match. Please retry.</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Wprowadzona nazwa użytkownika "
+"lub hasło jest niepoprawne. Proszę spróbować ponownie.</span>"
+
+#: ../lib/screenshooter-zimagez.c:556
 msgid "Upload the screenshot..."
 msgstr "Wysyłanie obrazu..."
 
-#: ../lib/screenshooter-zimagez.c:559
+#: ../lib/screenshooter-zimagez.c:589
 #, c-format
 msgid "An error occurred while uploading the screenshot."
 msgstr "Wystąpił błąd podczas wysyłania obrazu."
 
 #. End the user session
-#: ../lib/screenshooter-zimagez.c:597
+#: ../lib/screenshooter-zimagez.c:622
 msgid "Close the session on ZimageZ..."
 msgstr "Zamykanie sesji..."
 
-#: ../lib/screenshooter-zimagez.c:650
+#: ../lib/screenshooter-zimagez.c:692
 msgid "Details about the screenshot for ZimageZ"
 msgstr "Wysyłanie obrazu"
 
 #. Create the user label
-#: ../lib/screenshooter-zimagez.c:692
+#: ../lib/screenshooter-zimagez.c:734
 msgid "User:"
 msgstr "Nazwa użytkownika:"
 
-#: ../lib/screenshooter-zimagez.c:703
-msgid "Your Zimagez user name, if you do not have one yet please create one on the Web page linked above"
+#: ../lib/screenshooter-zimagez.c:745
+msgid ""
+"Your Zimagez user name, if you do not have one yet please create one on the "
+"Web page linked above"
 msgstr "Wprowadza nazwę użytkownika serwisu ZimageZ"
 
 #. Create the password label
-#: ../lib/screenshooter-zimagez.c:708
+#: ../lib/screenshooter-zimagez.c:751
 msgid "Password:"
 msgstr "Hasło:"
 
-#: ../lib/screenshooter-zimagez.c:718
+#: ../lib/screenshooter-zimagez.c:761
 msgid "The password for the user above"
 msgstr "Wprowadza hasło przypisane wprowadzonej nazwie użytkownika"
 
 #. Create the title label
-#: ../lib/screenshooter-zimagez.c:723
+#: ../lib/screenshooter-zimagez.c:767
 msgid "Title:"
 msgstr "Tytuł:"
 
-#: ../lib/screenshooter-zimagez.c:733
-msgid "The title of the screenshot, it will be used when displaying the screenshot on ZimageZ"
+#: ../lib/screenshooter-zimagez.c:777
+msgid ""
+"The title of the screenshot, it will be used when displaying the screenshot "
+"on ZimageZ"
 msgstr "Wprowadza tytuł obrazu wyświetlany w serwisie ZimageZ"
 
 #. Create the comment label
-#: ../lib/screenshooter-zimagez.c:738
+#: ../lib/screenshooter-zimagez.c:783
 msgid "Comment:"
 msgstr "Komentarz:"
 
-#: ../lib/screenshooter-zimagez.c:749
-msgid "A comment on the screenshot, it will be used when displaying the screenshot on ZimageZ"
+#: ../lib/screenshooter-zimagez.c:794
+msgid ""
+"A comment on the screenshot, it will be used when displaying the screenshot "
+"on ZimageZ"
 msgstr "Wprowadza komentarz obrazu wyświetlany w serwisie ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:870
+#: ../lib/screenshooter-zimagez.c:917
 #, c-format
 msgid "<a href=\"%s\">Full size image</a>"
 msgstr "<a href=\"%s\">Pełny rozmiar</a>"
 
-#: ../lib/screenshooter-zimagez.c:872
+#: ../lib/screenshooter-zimagez.c:919
 #, c-format
 msgid "<a href=\"%s\">Large thumbnail</a>"
 msgstr "<a href=\"%s\">Duża miniatura</a>"
 
-#: ../lib/screenshooter-zimagez.c:874
+#: ../lib/screenshooter-zimagez.c:921
 #, c-format
 msgid "<a href=\"%s\">Small thumbnail</a>"
 msgstr "<a href=\"%s\">Mała miniatura</a>"
 
-#: ../lib/screenshooter-zimagez.c:894
+#: ../lib/screenshooter-zimagez.c:937
 msgid "My screenshot on ZimageZ"
 msgstr "Zrzut obrazu w serwisie ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:920
+#: ../lib/screenshooter-zimagez.c:963
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Links</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Odnośniki</span>"
 
-#: ../lib/screenshooter-zimagez.c:965
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing to the full size image</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Kod minatury odsyłającej do obrazu w pełnym rozmiarze</span>"
+#: ../lib/screenshooter-zimagez.c:1008
+msgid ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing "
+"to the full size image</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Kod minatury odsyłającej do "
+"obrazu w pełnym rozmiarze</span>"
 
 #. HTML title
-#: ../lib/screenshooter-zimagez.c:981
+#: ../lib/screenshooter-zimagez.c:1024
 msgid "HTML"
 msgstr "HTML:"
 
 #. BB title
-#: ../lib/screenshooter-zimagez.c:1002
+#: ../lib/screenshooter-zimagez.c:1045
 msgid "BBCode for forums"
 msgstr "BBCode przeznaczony dla for dyskusyjnych:"
 
-#: ../lib/screenshooter-zimagez.c:1122
+#: ../lib/screenshooter-zimagez.c:1174
 msgid "ZimageZ"
 msgstr "ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:1155
+#: ../lib/screenshooter-zimagez.c:1207
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Status</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Stan</span>"
 
@@ -335,55 +345,109 @@ msgstr "_Otwórz odnośnik"
 msgid "Copy _Link Address"
 msgstr "_Skopiuj adres odnośnika"
 
-#: ../src/main.c:53
+#: ../src/main.c:48
 msgid "Delay in seconds before taking the screenshot"
 msgstr ""
 "Określa wartość opóźnienia przed wykonaniem\n"
 "                          zrzutu ekranu"
 
-#: ../src/main.c:63
-msgid "Do not display the save dialog"
-msgstr ""
-"Zapisuje pliki zrzutów ekranu w domyślnym położeniu,\n"
-"                          nie wyświetlając okna wyboru pliku"
-
-#: ../src/main.c:68
-msgid "Do not display the mouse on the screenshot"
+#: ../src/main.c:58
+#, fuzzy
+msgid "Display the mouse on the screenshot"
 msgstr "Nie rejestruje kursora myszy na zrzucie ekranu"
 
-#: ../src/main.c:85
+#: ../src/main.c:75
 msgid "Directory where the screenshot will be saved"
 msgstr "Określa domyślne położenie zapisywanych plików"
 
-#: ../src/main.c:99
+#: ../src/main.c:85
 msgid "Version information"
 msgstr "Wypisuje informacje o wersji"
 
+#: ../src/main.c:134
+#, c-format
+msgid "Conflicting options: --%s and --%s cannot be used at the same time.\n"
+msgstr ""
+
 #: ../src/main.c:136
 #, c-format
 msgid ""
+"The --%s option is only used when --fullscreen, --window or --region is "
+"given. It will be ignored.\n"
+msgstr ""
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
 "%s: %s\n"
 "Wpisz „%s --help” aby wypisać pełną listę opcji wiersza poleceń.\n"
 
-#: ../src/main.c:235
+#: ../src/main.c:282
 #, c-format
 msgid "%s is not a valid directory, the default directory will be used."
 msgstr "„%s” nie jest poprawnym katalogiem. Zostanie użyty domyślny katalog."
 
 #: ../src/xfce4-screenshooter.desktop.in.in.h:2
 #: ../panel-plugin/screenshooter.desktop.in.in.h:2
-msgid "Take screenshots of the entire screen, of the active window or of a region"
+msgid ""
+"Take screenshots of the entire screen, of the active window or of a region"
 msgstr "Przechwytuje obraz całego ekranu, bieżącego okna lub wybranego obszaru"
 
+#~ msgid "Screenshot.png"
+#~ msgstr "Zrzut ekranu.png"
+
+#~ msgid "Screenshot-%d.png"
+#~ msgstr "Zrzut ekranu-%d.png"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
+#~ msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Po wykonaniu</span>"
+
+#~ msgid "Show the save dialog"
+#~ msgstr "Wyświetlenie okna dialogowego zapisywania"
+
+#~ msgid ""
+#~ "The save dialog allows you to change the file name and the save location"
+#~ msgstr ""
+#~ "Wyświetla okno dialogowe umożliwiające określenie nazwy pliku i położenia "
+#~ "zapisywania"
+
+#~ msgid "Close the application"
+#~ msgstr "Zakończenie programu"
+
+#~ msgid ""
+#~ "If unchecked, the current window will be displayed again after the "
+#~ "screenshot has been taken to allow you to take several screenshots in a "
+#~ "row"
+#~ msgstr "Kończy działanie programu po wykonaniu zrzutu ekranu"
+
+#~ msgid "Default save location"
+#~ msgstr "Domyślne położenie zapisywania"
+
+#~ msgid "Set the default save location"
+#~ msgstr "Określa domyślne położenie zapisywanych plików"
+
+#~ msgid ""
+#~ "An error occurred during the XML exchange: %s (%d).\n"
+#~ " The screenshot could not be uploaded."
+#~ msgstr ""
+#~ "Wystąpił błąd podczas wymiany XML: %s (%d).\n"
+#~ "Obraz nie może zostać wysłany."
+
+#~ msgid "Do not display the save dialog"
+#~ msgstr ""
+#~ "Zapisuje pliki zrzutów ekranu w domyślnym położeniu,\n"
+#~ "                          nie wyświetlając okna wyboru pliku"
+
 #~ msgid "Save by default to:"
 #~ msgstr "Domyślne położenie:"
+
 #~ msgid ""
 #~ "If checked, the screenshot will be saved by default to the location set "
 #~ "on the right without displaying a save dialog"
 #~ msgstr ""
 #~ "Zapisuje pliki zrzutów ekranu w domyślnym położeniu, nie wyświetlając "
 #~ "okna wyboru pliku"
-
diff --git a/po/pt.po b/po/pt.po
index 02c5c76..edb13db 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-screenshooter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-31 14:02+0200\n"
+"POT-Creation-Date: 2009-11-15 00:29+0100\n"
 "PO-Revision-Date: 2009-06-12 17:23+0100\n"
 "Last-Translator: Nuno Miguel <nunis at netcabo.pt>\n"
 "Language-Team: \n"
@@ -17,313 +17,334 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../lib/screenshooter-dialogs.c:283
-msgid "Screenshot.png"
-msgstr "Captura_de_ecrã.png"
-
-#: ../lib/screenshooter-dialogs.c:300
-#, c-format
-msgid "Screenshot-%d.png"
-msgstr "Captura_de_ecrã-%d.png"
-
-#: ../lib/screenshooter-dialogs.c:493
+#: ../lib/screenshooter-dialogs.c:478
 #, c-format
 msgid "%.2fKb of %.2fKb"
 msgstr "%.2fKb de %.2fKb"
 
-#: ../lib/screenshooter-dialogs.c:577
+#: ../lib/screenshooter-dialogs.c:560
 msgid "Transfer"
 msgstr "Transferir"
 
-#: ../lib/screenshooter-dialogs.c:600
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being transferred to:</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">A captura de ecrã está a ser transferida para:</span>"
+#: ../lib/screenshooter-dialogs.c:581
+msgid ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being "
+"transferred to:</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">A captura de ecrã está a ser "
+"transferida para:</span>"
 
-#: ../lib/screenshooter-dialogs.c:724
-#: ../lib/screenshooter-dialogs.c:741
+#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
 msgid "Screenshot"
 msgstr "Captura de ecrã"
 
-#: ../lib/screenshooter-dialogs.c:736
+#: ../lib/screenshooter-dialogs.c:709
 msgid "Take a screenshot"
 msgstr "Tirar uma captura de ecrã"
 
-#: ../lib/screenshooter-dialogs.c:751
+#: ../lib/screenshooter-dialogs.c:724
 msgid "Preferences"
 msgstr "Preferências"
 
-#: ../lib/screenshooter-dialogs.c:793
+#: ../lib/screenshooter-dialogs.c:754
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Region to capture</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Zona a capturar</span>"
 
-#: ../lib/screenshooter-dialogs.c:820
+#: ../lib/screenshooter-dialogs.c:774
 msgid "Entire screen"
 msgstr "Ecrã inteiro"
 
-#: ../lib/screenshooter-dialogs.c:830
-#: ../src/main.c:58
-#: ../panel-plugin/screenshooter-plugin.c:292
+#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../panel-plugin/screenshooter-plugin.c:308
 msgid "Take a screenshot of the entire screen"
 msgstr "Tirar uma captura de todo o ecrã"
 
-#: ../lib/screenshooter-dialogs.c:841
+#: ../lib/screenshooter-dialogs.c:789
 msgid "Active window"
 msgstr "Janela activa"
 
-#: ../lib/screenshooter-dialogs.c:851
-#: ../src/main.c:104
-#: ../panel-plugin/screenshooter-plugin.c:297
+#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr "Fazer uma captura da janela activa"
 
-#: ../lib/screenshooter-dialogs.c:862
+#: ../lib/screenshooter-dialogs.c:804
 msgid "Select a region"
 msgstr "Seleccionar uma zona"
 
-#: ../lib/screenshooter-dialogs.c:872
-#: ../src/main.c:78
-#: ../panel-plugin/screenshooter-plugin.c:302
-msgid "Select a region to be captured by clicking a point of the screen without releasing the mouse button, dragging your mouse to the other corner of the region, and releasing the mouse button."
-msgstr "Seleccione uma zona para capturar ao clicar num ponto do ecrã sem libertar o botão do rato, arrastando o rato para outro canto da zona e libertando o botão do rato."
+#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../panel-plugin/screenshooter-plugin.c:318
+msgid ""
+"Select a region to be captured by clicking a point of the screen without "
+"releasing the mouse button, dragging your mouse to the other corner of the "
+"region, and releasing the mouse button."
+msgstr ""
+"Seleccione uma zona para capturar ao clicar num ponto do ecrã sem libertar o "
+"botão do rato, arrastando o rato para outro canto da zona e libertando o "
+"botão do rato."
 
-#: ../lib/screenshooter-dialogs.c:884
+#: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
 msgstr "Capturar o ponteiro do rato"
 
-#: ../lib/screenshooter-dialogs.c:892
+#: ../lib/screenshooter-dialogs.c:824
 msgid "Display the mouse pointer on the screenshot"
 msgstr "Mostrar o ponteiro do rato na captura"
 
-#: ../lib/screenshooter-dialogs.c:917
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Atraso antes de capturar</span>"
+#: ../lib/screenshooter-dialogs.c:840
+msgid ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Atraso antes de capturar</"
+"span>"
 
-#: ../lib/screenshooter-dialogs.c:952
+#: ../lib/screenshooter-dialogs.c:862
 msgid "Delay in seconds before the screenshot is taken"
 msgstr "Atraso em segundos antes de capturar o ecrã"
 
-#: ../lib/screenshooter-dialogs.c:958
+#: ../lib/screenshooter-dialogs.c:865
 msgid "seconds"
 msgstr "segundos"
 
-#: ../lib/screenshooter-dialogs.c:984
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Após capturar</span>"
-
-#. Display the save dialog checkbox
-#: ../lib/screenshooter-dialogs.c:1007
-msgid "Show the save dialog"
-msgstr "Mostrar o diálogo de gravar"
-
-#: ../lib/screenshooter-dialogs.c:1013
-msgid "The save dialog allows you to change the file name and the save location"
-msgstr "O diálogo de gravação permite-lhe alterar o nome do ficheiro e a localização de gravação"
-
-#: ../lib/screenshooter-dialogs.c:1027
-msgid "Close the application"
-msgstr "Fechar a aplicação"
-
-#: ../lib/screenshooter-dialogs.c:1033
-msgid "If unchecked, the current window will be displayed again after the screenshot has been taken to allow you to take several screenshots in a row"
-msgstr "Se desmarcado, a janela actual será mostrada novamente após a captura ter sido feita para permitir-lhe tirar várias capturas de seguida"
+#: ../lib/screenshooter-dialogs.c:917
+#, fuzzy
+msgid "Action"
+msgstr "Aplicação:"
 
-#: ../lib/screenshooter-dialogs.c:1056
+#: ../lib/screenshooter-dialogs.c:945
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Action</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Acção</span>"
 
 #. Save option radio button
-#: ../lib/screenshooter-dialogs.c:1081
-msgid "Save in:"
+#: ../lib/screenshooter-dialogs.c:961
+#, fuzzy
+msgid "Save"
 msgstr "Gravar em:"
 
-#: ../lib/screenshooter-dialogs.c:1089
+#: ../lib/screenshooter-dialogs.c:966
 msgid "Save the screenshot to a PNG file"
 msgstr "Gravar captura de ecrã para ficheiro PNG"
 
-#: ../lib/screenshooter-dialogs.c:1104
-msgid "Default save location"
-msgstr "Localização por omissão para gravar"
-
-#: ../lib/screenshooter-dialogs.c:1114
-msgid "Set the default save location"
-msgstr "Definir a localização por omissão para gravar"
-
-#: ../lib/screenshooter-dialogs.c:1127
+#: ../lib/screenshooter-dialogs.c:975
 msgid "Copy to the clipboard"
 msgstr "Copiar para a área de transferência"
 
-#: ../lib/screenshooter-dialogs.c:1132
+#: ../lib/screenshooter-dialogs.c:977
 msgid "Copy the screenshot to the clipboard so that it can be pasted later"
-msgstr "Copiar a imagem para a área de transferência para poder ser colada mais tarde"
+msgstr ""
+"Copiar a imagem para a área de transferência para poder ser colada mais tarde"
 
-#: ../lib/screenshooter-dialogs.c:1147
+#: ../lib/screenshooter-dialogs.c:994
 msgid "Open with:"
 msgstr "Abrir com:"
 
-#: ../lib/screenshooter-dialogs.c:1158
+#: ../lib/screenshooter-dialogs.c:1000
 msgid "Open the screenshot with the chosen application"
 msgstr "Abrir a imagem com a aplicação escolhida"
 
-#: ../lib/screenshooter-dialogs.c:1191
-#: ../src/main.c:73
+#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
 msgid "Application to open the screenshot"
 msgstr "Aplicação para abrir a captura de ecrã"
 
-#: ../lib/screenshooter-dialogs.c:1204
+#: ../lib/screenshooter-dialogs.c:1028
 msgid "Host on ZimageZ"
 msgstr "cdArmazenar no ZimageZ "
 
-#: ../lib/screenshooter-dialogs.c:1210
-#: ../src/main.c:92
+#: ../lib/screenshooter-dialogs.c:1032 ../src/main.c:80
 msgid "Host the screenshot on ZimageZ, a free online image hosting service"
-msgstr "Alojar a captura de ecrã em ZimageZ, um serviço gratuito de alojamento de imagens em série"
+msgstr ""
+"Alojar a captura de ecrã em ZimageZ, um serviço gratuito de alojamento de "
+"imagens em série"
+
+#: ../lib/screenshooter-dialogs.c:1046
+#, fuzzy
+msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Preview</span>"
+msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Links</span>"
 
-#: ../lib/screenshooter-dialogs.c:1255
+#: ../lib/screenshooter-dialogs.c:1107
 msgid "Save screenshot as..."
 msgstr "Gravar captura de ecrã como..."
 
-#. Start the user XML RPC session
-#: ../lib/screenshooter-zimagez.c:159
-msgid "Initialize the connection..."
-msgstr "Inicializar a conexão..."
+#: ../lib/screenshooter-zimagez.c:134
+#, fuzzy, c-format
+msgid "An error occured when creating the XMLRPC request."
+msgstr "Ocorreu um erro ao enviar a captura de ecrã."
 
-#: ../lib/screenshooter-zimagez.c:172
-#: ../lib/screenshooter-zimagez.c:332
-#: ../lib/screenshooter-zimagez.c:361
-#: ../lib/screenshooter-zimagez.c:389
-#: ../lib/screenshooter-zimagez.c:520
-#: ../lib/screenshooter-zimagez.c:543
-#: ../lib/screenshooter-zimagez.c:580
+#: ../lib/screenshooter-zimagez.c:153
+#, fuzzy, c-format
+msgid "An error occured when transfering the data to ZimageZ."
+msgstr "Ocorreu um erro ao enviar a captura de ecrã."
+
+#: ../lib/screenshooter-zimagez.c:178
+#, fuzzy, c-format
+msgid "An error occured when parsing the response from ZimageZ."
+msgstr "Ocorreu um erro ao enviar a captura de ecrã."
+
+#: ../lib/screenshooter-zimagez.c:228
 #, c-format
-msgid ""
-"An error occurred during the XML exchange: %s (%d).\n"
-" The screenshot could not be uploaded."
+msgid "Taken on %s, at %s"
 msgstr ""
-"Ocorreu um erro durante o intercâmbio de XML: %s (%d).\n"
-" A captura de ecrã não pode ser carregada."
 
-#: ../lib/screenshooter-zimagez.c:223
+#. Start the user soup session
+#: ../lib/screenshooter-zimagez.c:295
+msgid "Initialize the connection..."
+msgstr "Inicializar a conexão..."
+
+#: ../lib/screenshooter-zimagez.c:341
 msgid ""
-"Please file the following fields with your <a href=\"http://www.zimagez.com\">ZimageZ</a> \n"
+"Please file the following fields with your <a href=\"http://www.zimagez.com"
+"\">ZimageZ</a> \n"
 "user name, passsword and details about the screenshot."
 msgstr ""
-"Por favor, complete os seguintes campos com o seu <a href=\"http://www.zimagez.com\">ZimageZ</a> \n"
+"Por favor, complete os seguintes campos com o seu <a href=\"http://www."
+"zimagez.com\">ZimageZ</a> \n"
 "nome de utilizador, senha e detalhes sobre a captura de ecrã."
 
-#: ../lib/screenshooter-zimagez.c:283
+#: ../lib/screenshooter-zimagez.c:398
 msgid "Check the user information..."
 msgstr "Verificar a informação do utilizador..."
 
-#: ../lib/screenshooter-zimagez.c:305
-msgid "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You must fill all the fields.</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Tem de preencher todos os campos</span>"
+#: ../lib/screenshooter-zimagez.c:405
+msgid ""
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You "
+"must fill all the fields.</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Tem de preencher todos os "
+"campos</span>"
 
-#: ../lib/screenshooter-zimagez.c:320
+#: ../lib/screenshooter-zimagez.c:419
 msgid "Login on ZimageZ..."
 msgstr "Ligar ao ZimageZ..."
 
-#: ../lib/screenshooter-zimagez.c:436
-msgid "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The user and the password you entered do not match. Please retry.</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">O utilizador e senha introduzidos não combinam. Volte a tentar</span>"
+#: ../lib/screenshooter-zimagez.c:459 ../lib/screenshooter-zimagez.c:610
+msgid ""
+"An unexpected reply from ZimageZ was received. The upload of the screenshot "
+"failed."
+msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:501
+#: ../lib/screenshooter-zimagez.c:498
+msgid ""
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The "
+"user and the password you entered do not match. Please retry.</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">O utilizador e senha "
+"introduzidos não combinam. Volte a tentar</span>"
+
+#: ../lib/screenshooter-zimagez.c:556
 msgid "Upload the screenshot..."
 msgstr "Enviar a captura..."
 
-#: ../lib/screenshooter-zimagez.c:559
+#: ../lib/screenshooter-zimagez.c:589
 #, c-format
 msgid "An error occurred while uploading the screenshot."
 msgstr "Ocorreu um erro ao enviar a captura de ecrã."
 
 #. End the user session
-#: ../lib/screenshooter-zimagez.c:597
+#: ../lib/screenshooter-zimagez.c:622
 msgid "Close the session on ZimageZ..."
 msgstr "Fechar sessão em ZimageZ..."
 
-#: ../lib/screenshooter-zimagez.c:650
+#: ../lib/screenshooter-zimagez.c:692
 msgid "Details about the screenshot for ZimageZ"
 msgstr "Detalhes sobre a captura de ecrã para ZimageZ"
 
 #. Create the user label
-#: ../lib/screenshooter-zimagez.c:692
+#: ../lib/screenshooter-zimagez.c:734
 msgid "User:"
 msgstr "Utilizador:"
 
-#: ../lib/screenshooter-zimagez.c:703
-msgid "Your Zimagez user name, if you do not have one yet please create one on the Web page linked above"
-msgstr "O seu nome de utilizador do Zimagez, se não possui um, por favor crie-o na página Web indicada acima"
+#: ../lib/screenshooter-zimagez.c:745
+msgid ""
+"Your Zimagez user name, if you do not have one yet please create one on the "
+"Web page linked above"
+msgstr ""
+"O seu nome de utilizador do Zimagez, se não possui um, por favor crie-o na "
+"página Web indicada acima"
 
 #. Create the password label
-#: ../lib/screenshooter-zimagez.c:708
+#: ../lib/screenshooter-zimagez.c:751
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../lib/screenshooter-zimagez.c:718
+#: ../lib/screenshooter-zimagez.c:761
 msgid "The password for the user above"
 msgstr "A senha para o utilizador acima"
 
 #. Create the title label
-#: ../lib/screenshooter-zimagez.c:723
+#: ../lib/screenshooter-zimagez.c:767
 msgid "Title:"
 msgstr "Título:"
 
-#: ../lib/screenshooter-zimagez.c:733
-msgid "The title of the screenshot, it will be used when displaying the screenshot on ZimageZ"
-msgstr "O título da captura de ecrã, será usado quando a captura de ecrã é mostrada em ZimageZ"
+#: ../lib/screenshooter-zimagez.c:777
+msgid ""
+"The title of the screenshot, it will be used when displaying the screenshot "
+"on ZimageZ"
+msgstr ""
+"O título da captura de ecrã, será usado quando a captura de ecrã é mostrada "
+"em ZimageZ"
 
 #. Create the comment label
-#: ../lib/screenshooter-zimagez.c:738
+#: ../lib/screenshooter-zimagez.c:783
 msgid "Comment:"
 msgstr "Comentário:"
 
-#: ../lib/screenshooter-zimagez.c:749
-msgid "A comment on the screenshot, it will be used when displaying the screenshot on ZimageZ"
-msgstr "Um comentário sobre a captura será usado quando a mesma é mostrada no ZimageZ"
+#: ../lib/screenshooter-zimagez.c:794
+msgid ""
+"A comment on the screenshot, it will be used when displaying the screenshot "
+"on ZimageZ"
+msgstr ""
+"Um comentário sobre a captura será usado quando a mesma é mostrada no ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:870
+#: ../lib/screenshooter-zimagez.c:917
 #, c-format
 msgid "<a href=\"%s\">Full size image</a>"
 msgstr "<a href=\"%s\">Imagem de tamanho inteiro</a>"
 
-#: ../lib/screenshooter-zimagez.c:872
+#: ../lib/screenshooter-zimagez.c:919
 #, c-format
 msgid "<a href=\"%s\">Large thumbnail</a>"
 msgstr "<a href=\"%s\">Miniatura grande</a>"
 
-#: ../lib/screenshooter-zimagez.c:874
+#: ../lib/screenshooter-zimagez.c:921
 #, c-format
 msgid "<a href=\"%s\">Small thumbnail</a>"
 msgstr "<a href=\"%s\">Miniatura pequena</a>"
 
-#: ../lib/screenshooter-zimagez.c:894
+#: ../lib/screenshooter-zimagez.c:937
 msgid "My screenshot on ZimageZ"
 msgstr "A minha captura no ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:920
+#: ../lib/screenshooter-zimagez.c:963
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Links</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Links</span>"
 
-#: ../lib/screenshooter-zimagez.c:965
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing to the full size image</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Código para uma miniatura que aponta para a imagem de tamanho completo</span>"
+#: ../lib/screenshooter-zimagez.c:1008
+msgid ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing "
+"to the full size image</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Código para uma miniatura que "
+"aponta para a imagem de tamanho completo</span>"
 
 #. HTML title
-#: ../lib/screenshooter-zimagez.c:981
+#: ../lib/screenshooter-zimagez.c:1024
 msgid "HTML"
 msgstr "HTML"
 
 #. BB title
-#: ../lib/screenshooter-zimagez.c:1002
+#: ../lib/screenshooter-zimagez.c:1045
 msgid "BBCode for forums"
 msgstr "BBCode para fóruns"
 
-#: ../lib/screenshooter-zimagez.c:1122
+#: ../lib/screenshooter-zimagez.c:1174
 msgid "ZimageZ"
 msgstr "ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:1155
+#: ../lib/screenshooter-zimagez.c:1207
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Status</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Estado</span>"
 
@@ -337,51 +358,109 @@ msgstr "_Abrir Link"
 msgid "Copy _Link Address"
 msgstr "Copiar Endereço do _Link"
 
-#: ../src/main.c:53
+#: ../src/main.c:48
 msgid "Delay in seconds before taking the screenshot"
 msgstr "Atraso em segundos antes de capturar o ecrã"
 
-#: ../src/main.c:63
-msgid "Do not display the save dialog"
-msgstr "Não exibir o diálogo gravar"
-
-#: ../src/main.c:68
-msgid "Do not display the mouse on the screenshot"
+#: ../src/main.c:58
+#, fuzzy
+msgid "Display the mouse on the screenshot"
 msgstr "Não mostrar o rato na captura"
 
-#: ../src/main.c:85
+#: ../src/main.c:75
 msgid "Directory where the screenshot will be saved"
 msgstr "Directório onde será gravada a captura de ecrã"
 
-#: ../src/main.c:99
+#: ../src/main.c:85
 msgid "Version information"
 msgstr "Informação da versão"
 
+#: ../src/main.c:134
+#, c-format
+msgid "Conflicting options: --%s and --%s cannot be used at the same time.\n"
+msgstr ""
+
 #: ../src/main.c:136
 #, c-format
 msgid ""
+"The --%s option is only used when --fullscreen, --window or --region is "
+"given. It will be ignored.\n"
+msgstr ""
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
 "%s: %s\n"
-"Tente %s --help para ver uma lista completa das opções de linha de comando disponíveis.\n"
+"Tente %s --help para ver uma lista completa das opções de linha de comando "
+"disponíveis.\n"
 
-#: ../src/main.c:235
+#: ../src/main.c:282
 #, c-format
 msgid "%s is not a valid directory, the default directory will be used."
 msgstr "%s não é um directório válido, o directório por omissão será usado."
 
 #: ../src/xfce4-screenshooter.desktop.in.in.h:2
 #: ../panel-plugin/screenshooter.desktop.in.in.h:2
-msgid "Take screenshots of the entire screen, of the active window or of a region"
+msgid ""
+"Take screenshots of the entire screen, of the active window or of a region"
 msgstr "Capturar imagens de todo o ecrã, da janela activa ou de uma zona"
 
+#~ msgid "Screenshot.png"
+#~ msgstr "Captura_de_ecrã.png"
+
+#~ msgid "Screenshot-%d.png"
+#~ msgstr "Captura_de_ecrã-%d.png"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
+#~ msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Após capturar</span>"
+
+#~ msgid "Show the save dialog"
+#~ msgstr "Mostrar o diálogo de gravar"
+
+#~ msgid ""
+#~ "The save dialog allows you to change the file name and the save location"
+#~ msgstr ""
+#~ "O diálogo de gravação permite-lhe alterar o nome do ficheiro e a "
+#~ "localização de gravação"
+
+#~ msgid "Close the application"
+#~ msgstr "Fechar a aplicação"
+
+#~ msgid ""
+#~ "If unchecked, the current window will be displayed again after the "
+#~ "screenshot has been taken to allow you to take several screenshots in a "
+#~ "row"
+#~ msgstr ""
+#~ "Se desmarcado, a janela actual será mostrada novamente após a captura ter "
+#~ "sido feita para permitir-lhe tirar várias capturas de seguida"
+
+#~ msgid "Default save location"
+#~ msgstr "Localização por omissão para gravar"
+
+#~ msgid "Set the default save location"
+#~ msgstr "Definir a localização por omissão para gravar"
+
+#~ msgid ""
+#~ "An error occurred during the XML exchange: %s (%d).\n"
+#~ " The screenshot could not be uploaded."
+#~ msgstr ""
+#~ "Ocorreu um erro durante o intercâmbio de XML: %s (%d).\n"
+#~ " A captura de ecrã não pode ser carregada."
+
+#~ msgid "Do not display the save dialog"
+#~ msgstr "Não exibir o diálogo gravar"
+
 #~ msgid ""
 #~ "<span weight=\"bold\" stretch=\"semiexpanded\">Delay before taking the "
 #~ "screenshot</span>"
 #~ msgstr ""
 #~ "<span weight=\"bold\" stretch=\"semiexpanded\">Atraso antes de fazer a "
 #~ "captura</span>"
+
 #~ msgid "Display the save dialog"
 #~ msgstr "Mostrar o diálogo gravar"
 
@@ -396,12 +475,10 @@ msgstr "Capturar imagens de todo o ecrã, da janela activa ou de uma zona"
 #, fuzzy
 #~ msgid "Save by default to:"
 #~ msgstr "Gravar na localização por omissão:"
+
 #~ msgid ""
 #~ "If checked, the screenshot will be saved by default to the location set "
 #~ "on the right without displaying a save dialog"
 #~ msgstr ""
 #~ "Se activo, a imagem será gravada na localização por omissão definida à "
 #~ "direita sem mostrar um diálogo de gravação."
-#~ msgid "Application:"
-#~ msgstr "Aplicação:"
-
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 82514a8..010d686 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-screenshooter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-31 14:02+0200\n"
+"POT-Creation-Date: 2009-11-15 00:29+0100\n"
 "PO-Revision-Date: 2009-01-16 12:53-0500\n"
 "Last-Translator: Og Maciel <ogmaciel at gnome.org>\n"
 "Language-Team: Brazilian Portuguese <ldp-br at bazar2.conectiva.com.br>\n"
@@ -20,75 +20,67 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../lib/screenshooter-dialogs.c:283
-#, fuzzy
-msgid "Screenshot.png"
-msgstr "Captura_de_tela.png"
-
-#: ../lib/screenshooter-dialogs.c:300
-#, c-format
-msgid "Screenshot-%d.png"
-msgstr "Captura_de_tela-%d.png"
-
-#: ../lib/screenshooter-dialogs.c:493
+#: ../lib/screenshooter-dialogs.c:478
 #, c-format
 msgid "%.2fKb of %.2fKb"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:577
+#: ../lib/screenshooter-dialogs.c:560
 msgid "Transfer"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:600
+#: ../lib/screenshooter-dialogs.c:581
 #, fuzzy
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being "
 "transferred to:</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Ação</span>"
 
-#: ../lib/screenshooter-dialogs.c:724 ../lib/screenshooter-dialogs.c:741
+#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
 msgid "Screenshot"
 msgstr " Captura de tela"
 
-#: ../lib/screenshooter-dialogs.c:736
+#: ../lib/screenshooter-dialogs.c:709
 msgid "Take a screenshot"
 msgstr "Capturar uma imagem da tela"
 
-#: ../lib/screenshooter-dialogs.c:751
+#: ../lib/screenshooter-dialogs.c:724
 msgid "Preferences"
 msgstr "Preferências"
 
-#: ../lib/screenshooter-dialogs.c:793
+#: ../lib/screenshooter-dialogs.c:754
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Region to capture</span>"
 msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Região para capturar</span>"
 
-#: ../lib/screenshooter-dialogs.c:820
+#: ../lib/screenshooter-dialogs.c:774
 msgid "Entire screen"
 msgstr "Tela inteira"
 
-#: ../lib/screenshooter-dialogs.c:830 ../src/main.c:58
-#: ../panel-plugin/screenshooter-plugin.c:292
+#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../panel-plugin/screenshooter-plugin.c:308
 msgid "Take a screenshot of the entire screen"
 msgstr "Obter uma captura da tela inteira"
 
-#: ../lib/screenshooter-dialogs.c:841
+#: ../lib/screenshooter-dialogs.c:789
 msgid "Active window"
 msgstr "Janela ativa"
 
-#: ../lib/screenshooter-dialogs.c:851 ../src/main.c:104
-#: ../panel-plugin/screenshooter-plugin.c:297
+#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr "Capturar uma imagem da janela atual"
 
-#: ../lib/screenshooter-dialogs.c:862
+#: ../lib/screenshooter-dialogs.c:804
 msgid "Select a region"
 msgstr "Selecionar uma região"
 
-#: ../lib/screenshooter-dialogs.c:872 ../src/main.c:78
-#: ../panel-plugin/screenshooter-plugin.c:302
+#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../panel-plugin/screenshooter-plugin.c:318
 msgid ""
 "Select a region to be captured by clicking a point of the screen without "
 "releasing the mouse button, dragging your mouse to the other corner of the "
@@ -98,140 +90,124 @@ msgstr ""
 "soltar o botao do mouse, arrastando o mouse para o outro canto da região, e "
 "largando o botão do mouse."
 
-#: ../lib/screenshooter-dialogs.c:884
+#: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:892
+#: ../lib/screenshooter-dialogs.c:824
 #, fuzzy
 msgid "Display the mouse pointer on the screenshot"
 msgstr "Não exibir o diálogo para salvar"
 
-#: ../lib/screenshooter-dialogs.c:917
+#: ../lib/screenshooter-dialogs.c:840
 #, fuzzy
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
 msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Região para capturar</span>"
 
-#: ../lib/screenshooter-dialogs.c:952
+#: ../lib/screenshooter-dialogs.c:862
 msgid "Delay in seconds before the screenshot is taken"
 msgstr "Atraso em segundos antes de capturar uma imagem da tela"
 
-#: ../lib/screenshooter-dialogs.c:958
+#: ../lib/screenshooter-dialogs.c:865
 msgid "seconds"
 msgstr "segundos"
 
-#: ../lib/screenshooter-dialogs.c:984
-#, fuzzy
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Ação</span>"
-
-#. Display the save dialog checkbox
-#: ../lib/screenshooter-dialogs.c:1007
-#, fuzzy
-msgid "Show the save dialog"
-msgstr "Não exibir o diálogo para salvar"
-
-#: ../lib/screenshooter-dialogs.c:1013
-msgid ""
-"The save dialog allows you to change the file name and the save location"
-msgstr ""
-
-#: ../lib/screenshooter-dialogs.c:1027
-#, fuzzy
-msgid "Close the application"
-msgstr "Aplicativo:"
-
-#: ../lib/screenshooter-dialogs.c:1033
-msgid ""
-"If unchecked, the current window will be displayed again after the "
-"screenshot has been taken to allow you to take several screenshots in a row"
+#: ../lib/screenshooter-dialogs.c:917
+msgid "Action"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1056
+#: ../lib/screenshooter-dialogs.c:945
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Action</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Ação</span>"
 
 #. Save option radio button
-#: ../lib/screenshooter-dialogs.c:1081
+#: ../lib/screenshooter-dialogs.c:961
 #, fuzzy
-msgid "Save in:"
+msgid "Save"
 msgstr "Salvar"
 
-#: ../lib/screenshooter-dialogs.c:1089
+#: ../lib/screenshooter-dialogs.c:966
 msgid "Save the screenshot to a PNG file"
 msgstr "Salvar a captura de tela em um arquivo PNG"
 
-#: ../lib/screenshooter-dialogs.c:1104
-msgid "Default save location"
-msgstr "Localização padrão para salvar"
-
-#: ../lib/screenshooter-dialogs.c:1114
-msgid "Set the default save location"
-msgstr "Configura a localização padrão para salvar"
-
-#: ../lib/screenshooter-dialogs.c:1127
+#: ../lib/screenshooter-dialogs.c:975
 msgid "Copy to the clipboard"
 msgstr "Copiar para a área de transferência"
 
-#: ../lib/screenshooter-dialogs.c:1132
+#: ../lib/screenshooter-dialogs.c:977
 msgid "Copy the screenshot to the clipboard so that it can be pasted later"
 msgstr ""
 "Copia a captura da tela para a área de transferência para que possa ser "
 "colada posteriormente"
 
-#: ../lib/screenshooter-dialogs.c:1147
+#: ../lib/screenshooter-dialogs.c:994
 msgid "Open with:"
 msgstr "Abrir com:"
 
-#: ../lib/screenshooter-dialogs.c:1158
+#: ../lib/screenshooter-dialogs.c:1000
 msgid "Open the screenshot with the chosen application"
 msgstr "Abrir a captura de tela com o aplicativo escolhido"
 
-#: ../lib/screenshooter-dialogs.c:1191 ../src/main.c:73
+#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
 msgid "Application to open the screenshot"
 msgstr "Aplicativo para abrir a captura da tela"
 
-#: ../lib/screenshooter-dialogs.c:1204
+#: ../lib/screenshooter-dialogs.c:1028
 msgid "Host on ZimageZ"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1210 ../src/main.c:92
+#: ../lib/screenshooter-dialogs.c:1032 ../src/main.c:80
 msgid "Host the screenshot on ZimageZ, a free online image hosting service"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1255
+#: ../lib/screenshooter-dialogs.c:1046
+#, fuzzy
+msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Preview</span>"
+msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Ação</span>"
+
+#: ../lib/screenshooter-dialogs.c:1107
 msgid "Save screenshot as..."
 msgstr "Salvar a captura de tela como..."
 
-#. Start the user XML RPC session
-#: ../lib/screenshooter-zimagez.c:159
-msgid "Initialize the connection..."
+#: ../lib/screenshooter-zimagez.c:134
+#, c-format
+msgid "An error occured when creating the XMLRPC request."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:172 ../lib/screenshooter-zimagez.c:332
-#: ../lib/screenshooter-zimagez.c:361 ../lib/screenshooter-zimagez.c:389
-#: ../lib/screenshooter-zimagez.c:520 ../lib/screenshooter-zimagez.c:543
-#: ../lib/screenshooter-zimagez.c:580
+#: ../lib/screenshooter-zimagez.c:153
 #, c-format
-msgid ""
-"An error occurred during the XML exchange: %s (%d).\n"
-" The screenshot could not be uploaded."
+msgid "An error occured when transfering the data to ZimageZ."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:178
+#, c-format
+msgid "An error occured when parsing the response from ZimageZ."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:228
+#, c-format
+msgid "Taken on %s, at %s"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:223
+#. Start the user soup session
+#: ../lib/screenshooter-zimagez.c:295
+msgid "Initialize the connection..."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:341
 msgid ""
 "Please file the following fields with your <a href=\"http://www.zimagez.com"
 "\">ZimageZ</a> \n"
 "user name, passsword and details about the screenshot."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:283
+#: ../lib/screenshooter-zimagez.c:398
 msgid "Check the user information..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:305
+#: ../lib/screenshooter-zimagez.c:405
 #, fuzzy
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You "
@@ -239,105 +215,111 @@ msgid ""
 msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Região para capturar</span>"
 
-#: ../lib/screenshooter-zimagez.c:320
+#: ../lib/screenshooter-zimagez.c:419
 msgid "Login on ZimageZ..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:436
+#: ../lib/screenshooter-zimagez.c:459 ../lib/screenshooter-zimagez.c:610
+msgid ""
+"An unexpected reply from ZimageZ was received. The upload of the screenshot "
+"failed."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:498
 #, fuzzy
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The "
 "user and the password you entered do not match. Please retry.</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Ação</span>"
 
-#: ../lib/screenshooter-zimagez.c:501
+#: ../lib/screenshooter-zimagez.c:556
 #, fuzzy
 msgid "Upload the screenshot..."
 msgstr "Capturar a imagem da tela"
 
-#: ../lib/screenshooter-zimagez.c:559
+#: ../lib/screenshooter-zimagez.c:589
 #, c-format
 msgid "An error occurred while uploading the screenshot."
 msgstr ""
 
 #. End the user session
-#: ../lib/screenshooter-zimagez.c:597
+#: ../lib/screenshooter-zimagez.c:622
 msgid "Close the session on ZimageZ..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:650
+#: ../lib/screenshooter-zimagez.c:692
 #, fuzzy
 msgid "Details about the screenshot for ZimageZ"
 msgstr "Atraso em segundos antes de capturar uma imagem da tela"
 
 #. Create the user label
-#: ../lib/screenshooter-zimagez.c:692
+#: ../lib/screenshooter-zimagez.c:734
 msgid "User:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:703
+#: ../lib/screenshooter-zimagez.c:745
 msgid ""
 "Your Zimagez user name, if you do not have one yet please create one on the "
 "Web page linked above"
 msgstr ""
 
 #. Create the password label
-#: ../lib/screenshooter-zimagez.c:708
+#: ../lib/screenshooter-zimagez.c:751
 msgid "Password:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:718
+#: ../lib/screenshooter-zimagez.c:761
 msgid "The password for the user above"
 msgstr ""
 
 #. Create the title label
-#: ../lib/screenshooter-zimagez.c:723
+#: ../lib/screenshooter-zimagez.c:767
 msgid "Title:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:733
+#: ../lib/screenshooter-zimagez.c:777
 msgid ""
 "The title of the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
 msgstr ""
 
 #. Create the comment label
-#: ../lib/screenshooter-zimagez.c:738
+#: ../lib/screenshooter-zimagez.c:783
 msgid "Comment:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:749
+#: ../lib/screenshooter-zimagez.c:794
 msgid ""
 "A comment on the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:870
+#: ../lib/screenshooter-zimagez.c:917
 #, c-format
 msgid "<a href=\"%s\">Full size image</a>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:872
+#: ../lib/screenshooter-zimagez.c:919
 #, c-format
 msgid "<a href=\"%s\">Large thumbnail</a>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:874
+#: ../lib/screenshooter-zimagez.c:921
 #, c-format
 msgid "<a href=\"%s\">Small thumbnail</a>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:894
+#: ../lib/screenshooter-zimagez.c:937
 #, fuzzy
 msgid "My screenshot on ZimageZ"
 msgstr "Atraso em segundos antes de capturar uma imagem da tela"
 
-#: ../lib/screenshooter-zimagez.c:920
+#: ../lib/screenshooter-zimagez.c:963
 #, fuzzy
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Links</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Ação</span>"
 
-#: ../lib/screenshooter-zimagez.c:965
+#: ../lib/screenshooter-zimagez.c:1008
 #, fuzzy
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing "
@@ -347,20 +329,20 @@ msgstr ""
 "imagem da tela</span>"
 
 #. HTML title
-#: ../lib/screenshooter-zimagez.c:981
+#: ../lib/screenshooter-zimagez.c:1024
 msgid "HTML"
 msgstr ""
 
 #. BB title
-#: ../lib/screenshooter-zimagez.c:1002
+#: ../lib/screenshooter-zimagez.c:1045
 msgid "BBCode for forums"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:1122
+#: ../lib/screenshooter-zimagez.c:1174
 msgid "ZimageZ"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:1155
+#: ../lib/screenshooter-zimagez.c:1207
 #, fuzzy
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Status</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Ação</span>"
@@ -376,30 +358,38 @@ msgstr "Abrir com:"
 msgid "Copy _Link Address"
 msgstr ""
 
-#: ../src/main.c:53
+#: ../src/main.c:48
 msgid "Delay in seconds before taking the screenshot"
 msgstr "Atraso em segundos antes de capturar uma imagem da tela"
 
-#: ../src/main.c:63
-msgid "Do not display the save dialog"
-msgstr "Não exibir o diálogo para salvar"
-
-#: ../src/main.c:68
+#: ../src/main.c:58
 #, fuzzy
-msgid "Do not display the mouse on the screenshot"
+msgid "Display the mouse on the screenshot"
 msgstr "Não exibir o diálogo para salvar"
 
-#: ../src/main.c:85
+#: ../src/main.c:75
 msgid "Directory where the screenshot will be saved"
 msgstr "Diretório onde será salva a imagem da captura de tela"
 
-#: ../src/main.c:99
+#: ../src/main.c:85
 msgid "Version information"
 msgstr "Informação da versão"
 
+#: ../src/main.c:134
+#, c-format
+msgid "Conflicting options: --%s and --%s cannot be used at the same time.\n"
+msgstr ""
+
 #: ../src/main.c:136
 #, c-format
 msgid ""
+"The --%s option is only used when --fullscreen, --window or --region is "
+"given. It will be ignored.\n"
+msgstr ""
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
@@ -407,7 +397,7 @@ msgstr ""
 "Tente %s --help para ver uma lista completa das opções de linha de comando "
 "disponíveis.\n"
 
-#: ../src/main.c:235
+#: ../src/main.c:282
 #, c-format
 msgid "%s is not a valid directory, the default directory will be used."
 msgstr "%s não é um diretório válido; o diretório padrão será usado."
@@ -419,6 +409,35 @@ msgid ""
 msgstr "Obtem uma captura da tela inteira, da janela atual ou de uma região"
 
 #, fuzzy
+#~ msgid "Screenshot.png"
+#~ msgstr "Captura_de_tela.png"
+
+#~ msgid "Screenshot-%d.png"
+#~ msgstr "Captura_de_tela-%d.png"
+
+#, fuzzy
+#~ msgid ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
+#~ msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Ação</span>"
+
+#, fuzzy
+#~ msgid "Show the save dialog"
+#~ msgstr "Não exibir o diálogo para salvar"
+
+#, fuzzy
+#~ msgid "Close the application"
+#~ msgstr "Aplicativo:"
+
+#~ msgid "Default save location"
+#~ msgstr "Localização padrão para salvar"
+
+#~ msgid "Set the default save location"
+#~ msgstr "Configura a localização padrão para salvar"
+
+#~ msgid "Do not display the save dialog"
+#~ msgstr "Não exibir o diálogo para salvar"
+
+#, fuzzy
 #~ msgid "Tak a screenshot of the entire screen"
 #~ msgstr "Obter uma captura da tela inteira"
 
diff --git a/po/ro.po b/po/ro.po
index 443bdc9..948852d 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-screenshooter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-31 14:02+0200\n"
+"POT-Creation-Date: 2009-11-15 00:29+0100\n"
 "PO-Revision-Date: 2009-03-01 19:05+0200\n"
 "Last-Translator: Igor Știrbu <igor.stirbu at gmail.com>\n"
 "Language-Team: Romanian <debian-l10n-romanian at lists.debian.org>\n"
@@ -15,75 +15,67 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/screenshooter-dialogs.c:283
-#, fuzzy
-msgid "Screenshot.png"
-msgstr "Captura.png"
-
-#: ../lib/screenshooter-dialogs.c:300
-#, c-format
-msgid "Screenshot-%d.png"
-msgstr "Captura-%d.png"
-
-#: ../lib/screenshooter-dialogs.c:493
+#: ../lib/screenshooter-dialogs.c:478
 #, c-format
 msgid "%.2fKb of %.2fKb"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:577
+#: ../lib/screenshooter-dialogs.c:560
 msgid "Transfer"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:600
+#: ../lib/screenshooter-dialogs.c:581
 #, fuzzy
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being "
 "transferred to:</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Acțiune</span>"
 
-#: ../lib/screenshooter-dialogs.c:724 ../lib/screenshooter-dialogs.c:741
+#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
 msgid "Screenshot"
 msgstr "Captură de ecran"
 
-#: ../lib/screenshooter-dialogs.c:736
+#: ../lib/screenshooter-dialogs.c:709
 msgid "Take a screenshot"
 msgstr "Captură de ecran"
 
-#: ../lib/screenshooter-dialogs.c:751
+#: ../lib/screenshooter-dialogs.c:724
 msgid "Preferences"
 msgstr "Preferințe"
 
-#: ../lib/screenshooter-dialogs.c:793
+#: ../lib/screenshooter-dialogs.c:754
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Region to capture</span>"
 msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Regiune de capturat</span>"
 
-#: ../lib/screenshooter-dialogs.c:820
+#: ../lib/screenshooter-dialogs.c:774
 msgid "Entire screen"
 msgstr "Tot ecranul"
 
-#: ../lib/screenshooter-dialogs.c:830 ../src/main.c:58
-#: ../panel-plugin/screenshooter-plugin.c:292
+#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../panel-plugin/screenshooter-plugin.c:308
 msgid "Take a screenshot of the entire screen"
 msgstr "Captura întregului ecran"
 
-#: ../lib/screenshooter-dialogs.c:841
+#: ../lib/screenshooter-dialogs.c:789
 msgid "Active window"
 msgstr "Fereastra activă"
 
-#: ../lib/screenshooter-dialogs.c:851 ../src/main.c:104
-#: ../panel-plugin/screenshooter-plugin.c:297
+#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr "Captura ferestrei active"
 
-#: ../lib/screenshooter-dialogs.c:862
+#: ../lib/screenshooter-dialogs.c:804
 msgid "Select a region"
 msgstr "Regiune selectată"
 
-#: ../lib/screenshooter-dialogs.c:872 ../src/main.c:78
-#: ../panel-plugin/screenshooter-plugin.c:302
+#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../panel-plugin/screenshooter-plugin.c:318
 msgid ""
 "Select a region to be captured by clicking a point of the screen without "
 "releasing the mouse button, dragging your mouse to the other corner of the "
@@ -93,138 +85,122 @@ msgstr ""
 "fără a elibera butonul mausului, trageți până la colțul opus al regiunii și "
 "apoi eliberați butonul mausului."
 
-#: ../lib/screenshooter-dialogs.c:884
+#: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:892
+#: ../lib/screenshooter-dialogs.c:824
 #, fuzzy
 msgid "Display the mouse pointer on the screenshot"
 msgstr "Nu afișa dialogul de salvare"
 
-#: ../lib/screenshooter-dialogs.c:917
+#: ../lib/screenshooter-dialogs.c:840
 #, fuzzy
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
 msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Regiune de capturat</span>"
 
-#: ../lib/screenshooter-dialogs.c:952
+#: ../lib/screenshooter-dialogs.c:862
 msgid "Delay in seconds before the screenshot is taken"
 msgstr "Întârziere în secunde înainte de a face captura"
 
-#: ../lib/screenshooter-dialogs.c:958
+#: ../lib/screenshooter-dialogs.c:865
 msgid "seconds"
 msgstr "secunde"
 
-#: ../lib/screenshooter-dialogs.c:984
-#, fuzzy
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Acțiune</span>"
-
-#. Display the save dialog checkbox
-#: ../lib/screenshooter-dialogs.c:1007
-#, fuzzy
-msgid "Show the save dialog"
-msgstr "Nu afișa dialogul de salvare"
-
-#: ../lib/screenshooter-dialogs.c:1013
-msgid ""
-"The save dialog allows you to change the file name and the save location"
-msgstr ""
-
-#: ../lib/screenshooter-dialogs.c:1027
-#, fuzzy
-msgid "Close the application"
-msgstr "Aplicație:"
-
-#: ../lib/screenshooter-dialogs.c:1033
-msgid ""
-"If unchecked, the current window will be displayed again after the "
-"screenshot has been taken to allow you to take several screenshots in a row"
+#: ../lib/screenshooter-dialogs.c:917
+msgid "Action"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1056
+#: ../lib/screenshooter-dialogs.c:945
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Action</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Acțiune</span>"
 
 #. Save option radio button
-#: ../lib/screenshooter-dialogs.c:1081
+#: ../lib/screenshooter-dialogs.c:961
 #, fuzzy
-msgid "Save in:"
+msgid "Save"
 msgstr "Salvează"
 
-#: ../lib/screenshooter-dialogs.c:1089
+#: ../lib/screenshooter-dialogs.c:966
 msgid "Save the screenshot to a PNG file"
 msgstr "Salvează captura într-un fișier PNG"
 
-#: ../lib/screenshooter-dialogs.c:1104
-msgid "Default save location"
-msgstr "Locația implicită pentru salvare"
-
-#: ../lib/screenshooter-dialogs.c:1114
-msgid "Set the default save location"
-msgstr "Alegeți unde se salvează implicit"
-
-#: ../lib/screenshooter-dialogs.c:1127
+#: ../lib/screenshooter-dialogs.c:975
 msgid "Copy to the clipboard"
 msgstr "Copiere în clipboard"
 
-#: ../lib/screenshooter-dialogs.c:1132
+#: ../lib/screenshooter-dialogs.c:977
 msgid "Copy the screenshot to the clipboard so that it can be pasted later"
 msgstr "Copiază captura în clipboard pentru a lipi mai târziu"
 
-#: ../lib/screenshooter-dialogs.c:1147
+#: ../lib/screenshooter-dialogs.c:994
 msgid "Open with:"
 msgstr "Deschide cu:"
 
-#: ../lib/screenshooter-dialogs.c:1158
+#: ../lib/screenshooter-dialogs.c:1000
 msgid "Open the screenshot with the chosen application"
 msgstr "Deschide captura cu aplicația aleasă:"
 
-#: ../lib/screenshooter-dialogs.c:1191 ../src/main.c:73
+#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
 msgid "Application to open the screenshot"
 msgstr "Aplicația pentru deschiderea capturii"
 
-#: ../lib/screenshooter-dialogs.c:1204
+#: ../lib/screenshooter-dialogs.c:1028
 msgid "Host on ZimageZ"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1210 ../src/main.c:92
+#: ../lib/screenshooter-dialogs.c:1032 ../src/main.c:80
 msgid "Host the screenshot on ZimageZ, a free online image hosting service"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1255
+#: ../lib/screenshooter-dialogs.c:1046
+#, fuzzy
+msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Preview</span>"
+msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Acțiune</span>"
+
+#: ../lib/screenshooter-dialogs.c:1107
 msgid "Save screenshot as..."
 msgstr "Salvează captura ca..."
 
-#. Start the user XML RPC session
-#: ../lib/screenshooter-zimagez.c:159
-msgid "Initialize the connection..."
+#: ../lib/screenshooter-zimagez.c:134
+#, c-format
+msgid "An error occured when creating the XMLRPC request."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:172 ../lib/screenshooter-zimagez.c:332
-#: ../lib/screenshooter-zimagez.c:361 ../lib/screenshooter-zimagez.c:389
-#: ../lib/screenshooter-zimagez.c:520 ../lib/screenshooter-zimagez.c:543
-#: ../lib/screenshooter-zimagez.c:580
+#: ../lib/screenshooter-zimagez.c:153
 #, c-format
-msgid ""
-"An error occurred during the XML exchange: %s (%d).\n"
-" The screenshot could not be uploaded."
+msgid "An error occured when transfering the data to ZimageZ."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:178
+#, c-format
+msgid "An error occured when parsing the response from ZimageZ."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:228
+#, c-format
+msgid "Taken on %s, at %s"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:223
+#. Start the user soup session
+#: ../lib/screenshooter-zimagez.c:295
+msgid "Initialize the connection..."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:341
 msgid ""
 "Please file the following fields with your <a href=\"http://www.zimagez.com"
 "\">ZimageZ</a> \n"
 "user name, passsword and details about the screenshot."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:283
+#: ../lib/screenshooter-zimagez.c:398
 msgid "Check the user information..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:305
+#: ../lib/screenshooter-zimagez.c:405
 #, fuzzy
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You "
@@ -232,105 +208,111 @@ msgid ""
 msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Regiune de capturat</span>"
 
-#: ../lib/screenshooter-zimagez.c:320
+#: ../lib/screenshooter-zimagez.c:419
 msgid "Login on ZimageZ..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:436
+#: ../lib/screenshooter-zimagez.c:459 ../lib/screenshooter-zimagez.c:610
+msgid ""
+"An unexpected reply from ZimageZ was received. The upload of the screenshot "
+"failed."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:498
 #, fuzzy
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The "
 "user and the password you entered do not match. Please retry.</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Acțiune</span>"
 
-#: ../lib/screenshooter-zimagez.c:501
+#: ../lib/screenshooter-zimagez.c:556
 #, fuzzy
 msgid "Upload the screenshot..."
 msgstr "Fă captura de ecran"
 
-#: ../lib/screenshooter-zimagez.c:559
+#: ../lib/screenshooter-zimagez.c:589
 #, c-format
 msgid "An error occurred while uploading the screenshot."
 msgstr ""
 
 #. End the user session
-#: ../lib/screenshooter-zimagez.c:597
+#: ../lib/screenshooter-zimagez.c:622
 msgid "Close the session on ZimageZ..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:650
+#: ../lib/screenshooter-zimagez.c:692
 #, fuzzy
 msgid "Details about the screenshot for ZimageZ"
 msgstr "Întârziere în secunde înainte de a face captura"
 
 #. Create the user label
-#: ../lib/screenshooter-zimagez.c:692
+#: ../lib/screenshooter-zimagez.c:734
 msgid "User:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:703
+#: ../lib/screenshooter-zimagez.c:745
 msgid ""
 "Your Zimagez user name, if you do not have one yet please create one on the "
 "Web page linked above"
 msgstr ""
 
 #. Create the password label
-#: ../lib/screenshooter-zimagez.c:708
+#: ../lib/screenshooter-zimagez.c:751
 msgid "Password:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:718
+#: ../lib/screenshooter-zimagez.c:761
 msgid "The password for the user above"
 msgstr ""
 
 #. Create the title label
-#: ../lib/screenshooter-zimagez.c:723
+#: ../lib/screenshooter-zimagez.c:767
 msgid "Title:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:733
+#: ../lib/screenshooter-zimagez.c:777
 msgid ""
 "The title of the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
 msgstr ""
 
 #. Create the comment label
-#: ../lib/screenshooter-zimagez.c:738
+#: ../lib/screenshooter-zimagez.c:783
 msgid "Comment:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:749
+#: ../lib/screenshooter-zimagez.c:794
 msgid ""
 "A comment on the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:870
+#: ../lib/screenshooter-zimagez.c:917
 #, c-format
 msgid "<a href=\"%s\">Full size image</a>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:872
+#: ../lib/screenshooter-zimagez.c:919
 #, c-format
 msgid "<a href=\"%s\">Large thumbnail</a>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:874
+#: ../lib/screenshooter-zimagez.c:921
 #, c-format
 msgid "<a href=\"%s\">Small thumbnail</a>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:894
+#: ../lib/screenshooter-zimagez.c:937
 #, fuzzy
 msgid "My screenshot on ZimageZ"
 msgstr "Întârziere în secunde înainte de a face captura"
 
-#: ../lib/screenshooter-zimagez.c:920
+#: ../lib/screenshooter-zimagez.c:963
 #, fuzzy
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Links</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Acțiune</span>"
 
-#: ../lib/screenshooter-zimagez.c:965
+#: ../lib/screenshooter-zimagez.c:1008
 #, fuzzy
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing "
@@ -340,20 +322,20 @@ msgstr ""
 "captura</span>"
 
 #. HTML title
-#: ../lib/screenshooter-zimagez.c:981
+#: ../lib/screenshooter-zimagez.c:1024
 msgid "HTML"
 msgstr ""
 
 #. BB title
-#: ../lib/screenshooter-zimagez.c:1002
+#: ../lib/screenshooter-zimagez.c:1045
 msgid "BBCode for forums"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:1122
+#: ../lib/screenshooter-zimagez.c:1174
 msgid "ZimageZ"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:1155
+#: ../lib/screenshooter-zimagez.c:1207
 #, fuzzy
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Status</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Acțiune</span>"
@@ -369,30 +351,38 @@ msgstr "Deschide cu:"
 msgid "Copy _Link Address"
 msgstr ""
 
-#: ../src/main.c:53
+#: ../src/main.c:48
 msgid "Delay in seconds before taking the screenshot"
 msgstr "Întârziere în secunde înainte de a face captura"
 
-#: ../src/main.c:63
-msgid "Do not display the save dialog"
-msgstr "Nu afișa dialogul de salvare"
-
-#: ../src/main.c:68
+#: ../src/main.c:58
 #, fuzzy
-msgid "Do not display the mouse on the screenshot"
+msgid "Display the mouse on the screenshot"
 msgstr "Nu afișa dialogul de salvare"
 
-#: ../src/main.c:85
+#: ../src/main.c:75
 msgid "Directory where the screenshot will be saved"
 msgstr "Directorul în care se vor salva capturile"
 
-#: ../src/main.c:99
+#: ../src/main.c:85
 msgid "Version information"
 msgstr "Detalii versiune"
 
+#: ../src/main.c:134
+#, c-format
+msgid "Conflicting options: --%s and --%s cannot be used at the same time.\n"
+msgstr ""
+
 #: ../src/main.c:136
 #, c-format
 msgid ""
+"The --%s option is only used when --fullscreen, --window or --region is "
+"given. It will be ignored.\n"
+msgstr ""
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
@@ -400,7 +390,7 @@ msgstr ""
 "Încercați %s --help pentru a vedea întreaga listă de opțiuni în linie de "
 "comandă.\n"
 
-#: ../src/main.c:235
+#: ../src/main.c:282
 #, c-format
 msgid "%s is not a valid directory, the default directory will be used."
 msgstr "%s nu este un director valid, se va folosi directorul implicit."
@@ -412,6 +402,35 @@ msgid ""
 msgstr "Capturi ale întregului ecran, ferestrei active sau unei regiuni"
 
 #, fuzzy
+#~ msgid "Screenshot.png"
+#~ msgstr "Captura.png"
+
+#~ msgid "Screenshot-%d.png"
+#~ msgstr "Captura-%d.png"
+
+#, fuzzy
+#~ msgid ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
+#~ msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Acțiune</span>"
+
+#, fuzzy
+#~ msgid "Show the save dialog"
+#~ msgstr "Nu afișa dialogul de salvare"
+
+#, fuzzy
+#~ msgid "Close the application"
+#~ msgstr "Aplicație:"
+
+#~ msgid "Default save location"
+#~ msgstr "Locația implicită pentru salvare"
+
+#~ msgid "Set the default save location"
+#~ msgstr "Alegeți unde se salvează implicit"
+
+#~ msgid "Do not display the save dialog"
+#~ msgstr "Nu afișa dialogul de salvare"
+
+#, fuzzy
 #~ msgid "Tak a screenshot of the entire screen"
 #~ msgstr "Captura întregului ecran"
 
diff --git a/po/ru.po b/po/ru.po
index 268dc98..5b345cb 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-screenshooter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-31 14:02+0200\n"
+"POT-Creation-Date: 2009-11-15 00:29+0100\n"
 "PO-Revision-Date: 2009-06-06 18:33+0400\n"
 "Last-Translator: Denis Koryavov <dkoryavov at yandex.ru>\n"
 "Language-Team: Russian\n"
@@ -16,72 +16,68 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../lib/screenshooter-dialogs.c:283
-msgid "Screenshot.png"
-msgstr "Снимок экрана.png"
-
-#: ../lib/screenshooter-dialogs.c:300
-#, c-format
-msgid "Screenshot-%d.png"
-msgstr "Снимок экрана-%d.png"
-
-#: ../lib/screenshooter-dialogs.c:493
+#: ../lib/screenshooter-dialogs.c:478
 #, c-format
 msgid "%.2fKb of %.2fKb"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:577
+#: ../lib/screenshooter-dialogs.c:560
 msgid "Transfer"
 msgstr "Перенести"
 
-#: ../lib/screenshooter-dialogs.c:600
+#: ../lib/screenshooter-dialogs.c:581
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being "
 "transferred to:</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Снимок экрана был перемещен в:</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Снимок экрана был перемещен в:"
+"</span>"
 
-#: ../lib/screenshooter-dialogs.c:724 ../lib/screenshooter-dialogs.c:741
+#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
 msgid "Screenshot"
 msgstr "Снимок экрана"
 
-#: ../lib/screenshooter-dialogs.c:736
+#: ../lib/screenshooter-dialogs.c:709
 msgid "Take a screenshot"
 msgstr "Сделать снимок экрана"
 
-#: ../lib/screenshooter-dialogs.c:751
+#: ../lib/screenshooter-dialogs.c:724
 msgid "Preferences"
 msgstr "Параметры"
 
-#: ../lib/screenshooter-dialogs.c:793
+#: ../lib/screenshooter-dialogs.c:754
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Region to capture</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Область для захвата</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Область для захвата</span>"
 
-#: ../lib/screenshooter-dialogs.c:820
+#: ../lib/screenshooter-dialogs.c:774
 msgid "Entire screen"
 msgstr "Весь экран"
 
-#: ../lib/screenshooter-dialogs.c:830 ../src/main.c:58
-#: ../panel-plugin/screenshooter-plugin.c:292
+#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../panel-plugin/screenshooter-plugin.c:308
 msgid "Take a screenshot of the entire screen"
 msgstr "Сделать снимок всего экрана"
 
-#: ../lib/screenshooter-dialogs.c:841
+#: ../lib/screenshooter-dialogs.c:789
 msgid "Active window"
 msgstr "Активное окно"
 
-#: ../lib/screenshooter-dialogs.c:851 ../src/main.c:104
-#: ../panel-plugin/screenshooter-plugin.c:297
+#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr "Сделать снимок активного окна"
 
-#: ../lib/screenshooter-dialogs.c:862
+#: ../lib/screenshooter-dialogs.c:804
 msgid "Select a region"
 msgstr "Выделить область"
 
-#: ../lib/screenshooter-dialogs.c:872 ../src/main.c:78
-#: ../panel-plugin/screenshooter-plugin.c:302
+#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../panel-plugin/screenshooter-plugin.c:318
 msgid ""
 "Select a region to be captured by clicking a point of the screen without "
 "releasing the mouse button, dragging your mouse to the other corner of the "
@@ -91,256 +87,264 @@ msgstr ""
 "укажите верхний угол захватываемой области, и, не отпуская кнопки мыши, "
 "укажите нижний угол. Отпустите кнопку мыши."
 
-#: ../lib/screenshooter-dialogs.c:884
+#: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
 msgstr "Захватывать курсор мыши"
 
-#: ../lib/screenshooter-dialogs.c:892
+#: ../lib/screenshooter-dialogs.c:824
 msgid "Display the mouse pointer on the screenshot"
 msgstr "Отображать курсор мыши на снимке экрана"
 
-#: ../lib/screenshooter-dialogs.c:917
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Задержка перед выполнением снимка</span>"
+#: ../lib/screenshooter-dialogs.c:840
+msgid ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Задержка перед выполнением "
+"снимка</span>"
 
-#: ../lib/screenshooter-dialogs.c:952
+#: ../lib/screenshooter-dialogs.c:862
 msgid "Delay in seconds before the screenshot is taken"
 msgstr "Задержка в секундах перед выполнением снимка экрана"
 
-#: ../lib/screenshooter-dialogs.c:958
+#: ../lib/screenshooter-dialogs.c:865
 msgid "seconds"
 msgstr "сек."
 
-#: ../lib/screenshooter-dialogs.c:984
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">После выполнения снимка</span>"
-
-#. Display the save dialog checkbox
-#: ../lib/screenshooter-dialogs.c:1007
-msgid "Show the save dialog"
-msgstr "Показать диалог сохранения файла"
-
-#: ../lib/screenshooter-dialogs.c:1013
-msgid "The save dialog allows you to change the file name and the save location"
-msgstr "В диалоге сохранения файла вы можете задать имя файла и указать путь для его сохранения"
-
-#: ../lib/screenshooter-dialogs.c:1027
-msgid "Close the application"
-msgstr "Закрыть приложение"
-
-#: ../lib/screenshooter-dialogs.c:1033
-msgid ""
-"If unchecked, the current window will be displayed again after the "
-"screenshot has been taken to allow you to take several screenshots in a row"
-msgstr "Если не выбрано, после выполнения снимка экрана текущее окно появится вновь, "
-"что позволит вам выполнить несколько снимков экрана за раз"
+#: ../lib/screenshooter-dialogs.c:917
+msgid "Action"
+msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1056
+#: ../lib/screenshooter-dialogs.c:945
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Action</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Действие</span>"
 
 #. Save option radio button
-#: ../lib/screenshooter-dialogs.c:1081
-msgid "Save in:"
+#: ../lib/screenshooter-dialogs.c:961
+#, fuzzy
+msgid "Save"
 msgstr "Сохранить в:"
 
-#: ../lib/screenshooter-dialogs.c:1089
+#: ../lib/screenshooter-dialogs.c:966
 msgid "Save the screenshot to a PNG file"
 msgstr "Сохранить снимок экрана в файл формата PNG"
 
-#: ../lib/screenshooter-dialogs.c:1104
-msgid "Default save location"
-msgstr "Путь для сохранения снимков по умолчанию"
-
-#: ../lib/screenshooter-dialogs.c:1114
-msgid "Set the default save location"
-msgstr "Укажите путь куда следует сохранять снимки экрана"
-
-#: ../lib/screenshooter-dialogs.c:1127
+#: ../lib/screenshooter-dialogs.c:975
 msgid "Copy to the clipboard"
 msgstr "Копировать в буфер обмена"
 
-#: ../lib/screenshooter-dialogs.c:1132
+#: ../lib/screenshooter-dialogs.c:977
 msgid "Copy the screenshot to the clipboard so that it can be pasted later"
-msgstr "Копировать снимок экрана в буфер обмена для использования его в дальнейшем"
+msgstr ""
+"Копировать снимок экрана в буфер обмена для использования его в дальнейшем"
 
-#: ../lib/screenshooter-dialogs.c:1147
+#: ../lib/screenshooter-dialogs.c:994
 msgid "Open with:"
 msgstr "Открыть с помощью:"
 
-#: ../lib/screenshooter-dialogs.c:1158
+#: ../lib/screenshooter-dialogs.c:1000
 msgid "Open the screenshot with the chosen application"
 msgstr "Открыть снимок экрана с помощью выбранного приложения"
 
-#: ../lib/screenshooter-dialogs.c:1191 ../src/main.c:73
+#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
 msgid "Application to open the screenshot"
 msgstr "Приложение для просмотра снимков экрана"
 
-#: ../lib/screenshooter-dialogs.c:1204
+#: ../lib/screenshooter-dialogs.c:1028
 msgid "Host on ZimageZ"
 msgstr "Разместить на сервере ZimageZ"
 
-#: ../lib/screenshooter-dialogs.c:1210 ../src/main.c:92
+#: ../lib/screenshooter-dialogs.c:1032 ../src/main.c:80
 msgid "Host the screenshot on ZimageZ, a free online image hosting service"
-msgstr "Разместить снимок экрана на свободном сервере для хранения изображений ZimageZ"
+msgstr ""
+"Разместить снимок экрана на свободном сервере для хранения изображений "
+"ZimageZ"
+
+#: ../lib/screenshooter-dialogs.c:1046
+#, fuzzy
+msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Preview</span>"
+msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Ссылки</span>"
 
-#: ../lib/screenshooter-dialogs.c:1255
+#: ../lib/screenshooter-dialogs.c:1107
 msgid "Save screenshot as..."
 msgstr "Сохранить снимок как..."
 
-#. Start the user XML RPC session
-#: ../lib/screenshooter-zimagez.c:159
-msgid "Initialize the connection..."
-msgstr "Устанавливается соединение..."
+#: ../lib/screenshooter-zimagez.c:134
+#, fuzzy, c-format
+msgid "An error occured when creating the XMLRPC request."
+msgstr "Произошла ошибка при загрузке снимка экрана."
+
+#: ../lib/screenshooter-zimagez.c:153
+#, fuzzy, c-format
+msgid "An error occured when transfering the data to ZimageZ."
+msgstr "Произошла ошибка при загрузке снимка экрана."
+
+#: ../lib/screenshooter-zimagez.c:178
+#, fuzzy, c-format
+msgid "An error occured when parsing the response from ZimageZ."
+msgstr "Произошла ошибка при загрузке снимка экрана."
 
-#: ../lib/screenshooter-zimagez.c:172 ../lib/screenshooter-zimagez.c:332
-#: ../lib/screenshooter-zimagez.c:361 ../lib/screenshooter-zimagez.c:389
-#: ../lib/screenshooter-zimagez.c:520 ../lib/screenshooter-zimagez.c:543
-#: ../lib/screenshooter-zimagez.c:580
+#: ../lib/screenshooter-zimagez.c:228
 #, c-format
-msgid ""
-"An error occurred during the XML exchange: %s (%d).\n"
-" The screenshot could not be uploaded."
+msgid "Taken on %s, at %s"
 msgstr ""
-"Невозможно передать XML документ с описанием снимка экрана на сервер %s (%d).\n"
-"Снимок экрана не может быть загружен."
 
-#: ../lib/screenshooter-zimagez.c:223
+#. Start the user soup session
+#: ../lib/screenshooter-zimagez.c:295
+msgid "Initialize the connection..."
+msgstr "Устанавливается соединение..."
+
+#: ../lib/screenshooter-zimagez.c:341
 msgid ""
 "Please file the following fields with your <a href=\"http://www.zimagez.com"
 "\">ZimageZ</a> \n"
 "user name, passsword and details about the screenshot."
 msgstr ""
-"Пожалуйста, укажите свой логин и пароль на сервере <a href=\"http://www.zimagez.com"
-"\">ZimageZ</a> \n"
+"Пожалуйста, укажите свой логин и пароль на сервере <a href=\"http://www."
+"zimagez.com\">ZimageZ</a> \n"
 "и добавьте описание снимка экрана."
 
-#: ../lib/screenshooter-zimagez.c:283
+#: ../lib/screenshooter-zimagez.c:398
 msgid "Check the user information..."
 msgstr "Проверка введенных данных..."
 
-#: ../lib/screenshooter-zimagez.c:305
+#: ../lib/screenshooter-zimagez.c:405
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You "
 "must fill all the fields.</span>"
-msgstr "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">Необходимо заполнить все поля.</span>"
+msgstr ""
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded"
+"\">Необходимо заполнить все поля.</span>"
 
-#: ../lib/screenshooter-zimagez.c:320
+#: ../lib/screenshooter-zimagez.c:419
 msgid "Login on ZimageZ..."
 msgstr "Аунтефикация на сервере ZimageZ..."
 
-#: ../lib/screenshooter-zimagez.c:436
+#: ../lib/screenshooter-zimagez.c:459 ../lib/screenshooter-zimagez.c:610
+msgid ""
+"An unexpected reply from ZimageZ was received. The upload of the screenshot "
+"failed."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:498
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The "
 "user and the password you entered do not match. Please retry.</span>"
-msgstr "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">Указаны "
-"неверные логин или пароль. Пожалуйста, попробуйте еще раз.</span>"
+msgstr ""
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded"
+"\">Указаны неверные логин или пароль. Пожалуйста, попробуйте еще раз.</span>"
 
-#: ../lib/screenshooter-zimagez.c:501
+#: ../lib/screenshooter-zimagez.c:556
 msgid "Upload the screenshot..."
 msgstr "Загрузка снимка экрана..."
 
-#: ../lib/screenshooter-zimagez.c:559
+#: ../lib/screenshooter-zimagez.c:589
 #, c-format
 msgid "An error occurred while uploading the screenshot."
 msgstr "Произошла ошибка при загрузке снимка экрана."
 
 #. End the user session
-#: ../lib/screenshooter-zimagez.c:597
+#: ../lib/screenshooter-zimagez.c:622
 msgid "Close the session on ZimageZ..."
 msgstr "Закрытие сессии на сервере ZimageZ..."
 
-#: ../lib/screenshooter-zimagez.c:650
+#: ../lib/screenshooter-zimagez.c:692
 msgid "Details about the screenshot for ZimageZ"
 msgstr "Описание снимка экрана для размещения на сервере ZimageZ"
 
 #. Create the user label
-#: ../lib/screenshooter-zimagez.c:692
+#: ../lib/screenshooter-zimagez.c:734
 msgid "User:"
 msgstr "Пользователь:"
 
-#: ../lib/screenshooter-zimagez.c:703
+#: ../lib/screenshooter-zimagez.c:745
 msgid ""
 "Your Zimagez user name, if you do not have one yet please create one on the "
 "Web page linked above"
-msgstr "Ваше имя пользователя (логин) на сервере ZimageZ. Если вы еще не "
+msgstr ""
+"Ваше имя пользователя (логин) на сервере ZimageZ. Если вы еще не "
 "зарегистрированы на сервере, вы можете это сделать на странице указанной выше"
 
 #. Create the password label
-#: ../lib/screenshooter-zimagez.c:708
+#: ../lib/screenshooter-zimagez.c:751
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../lib/screenshooter-zimagez.c:718
+#: ../lib/screenshooter-zimagez.c:761
 msgid "The password for the user above"
 msgstr "Пароль для пользователя указанного выше"
 
 #. Create the title label
-#: ../lib/screenshooter-zimagez.c:723
+#: ../lib/screenshooter-zimagez.c:767
 msgid "Title:"
 msgstr "Заголовок:"
 
-#: ../lib/screenshooter-zimagez.c:733
+#: ../lib/screenshooter-zimagez.c:777
 msgid ""
 "The title of the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
-msgstr "Заголовок снимка экрана, будет использован при отображении снимка на сервере ZimageZ"
+msgstr ""
+"Заголовок снимка экрана, будет использован при отображении снимка на сервере "
+"ZimageZ"
 
 #. Create the comment label
-#: ../lib/screenshooter-zimagez.c:738
+#: ../lib/screenshooter-zimagez.c:783
 msgid "Comment:"
 msgstr "Описание:"
 
-#: ../lib/screenshooter-zimagez.c:749
+#: ../lib/screenshooter-zimagez.c:794
 msgid ""
 "A comment on the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
-msgstr "Описание снимка экрана, будет использовано при отображении снимка на сервере ZimageZ"
+msgstr ""
+"Описание снимка экрана, будет использовано при отображении снимка на сервере "
+"ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:870
+#: ../lib/screenshooter-zimagez.c:917
 #, c-format
 msgid "<a href=\"%s\">Full size image</a>"
 msgstr "<a href=\"%s\">Полный размер изображения</a>"
 
-#: ../lib/screenshooter-zimagez.c:872
+#: ../lib/screenshooter-zimagez.c:919
 #, c-format
 msgid "<a href=\"%s\">Large thumbnail</a>"
 msgstr "<a href=\"%s\">Большая пиктограмма</a>"
 
-#: ../lib/screenshooter-zimagez.c:874
+#: ../lib/screenshooter-zimagez.c:921
 #, c-format
 msgid "<a href=\"%s\">Small thumbnail</a>"
 msgstr "<a href=\"%s\">Маленькая пиктограмма</a>"
 
-#: ../lib/screenshooter-zimagez.c:894
+#: ../lib/screenshooter-zimagez.c:937
 msgid "My screenshot on ZimageZ"
 msgstr "Мой снимок экрана на ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:920
+#: ../lib/screenshooter-zimagez.c:963
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Links</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Ссылки</span>"
 
-#: ../lib/screenshooter-zimagez.c:965
+#: ../lib/screenshooter-zimagez.c:1008
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing "
 "to the full size image</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Код для перехода с пиктограммы к полному изображению</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Код для перехода с "
+"пиктограммы к полному изображению</span>"
 
 #. HTML title
-#: ../lib/screenshooter-zimagez.c:981
+#: ../lib/screenshooter-zimagez.c:1024
 msgid "HTML"
 msgstr "HTML"
 
 #. BB title
-#: ../lib/screenshooter-zimagez.c:1002
+#: ../lib/screenshooter-zimagez.c:1045
 msgid "BBCode for forums"
 msgstr "Код (BBCode) для форумов"
 
-#: ../lib/screenshooter-zimagez.c:1122
+#: ../lib/screenshooter-zimagez.c:1174
 msgid "ZimageZ"
 msgstr "ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:1155
+#: ../lib/screenshooter-zimagez.c:1207
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Status</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Статус</span>"
 
@@ -354,29 +358,38 @@ msgstr "_Открыть ссылку"
 msgid "Copy _Link Address"
 msgstr "Скопировать _адрес ссылки"
 
-#: ../src/main.c:53
+#: ../src/main.c:48
 msgid "Delay in seconds before taking the screenshot"
 msgstr "Задержка в секундах перед выполнением снимка"
 
-#: ../src/main.c:63
-msgid "Do not display the save dialog"
-msgstr "Скрывать диалог сохранения"
-
-#: ../src/main.c:68
-msgid "Do not display the mouse on the screenshot"
+#: ../src/main.c:58
+#, fuzzy
+msgid "Display the mouse on the screenshot"
 msgstr "Скрывать курсор мыши на снимке экрана"
 
-#: ../src/main.c:85
+#: ../src/main.c:75
 msgid "Directory where the screenshot will be saved"
 msgstr "Директория, где будут сохраняться снимки экрана"
 
-#: ../src/main.c:99
+#: ../src/main.c:85
 msgid "Version information"
 msgstr "Информация о версии"
 
+#: ../src/main.c:134
+#, c-format
+msgid "Conflicting options: --%s and --%s cannot be used at the same time.\n"
+msgstr ""
+
 #: ../src/main.c:136
 #, c-format
 msgid ""
+"The --%s option is only used when --fullscreen, --window or --region is "
+"given. It will be ignored.\n"
+msgstr ""
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
@@ -384,13 +397,63 @@ msgstr ""
 "Запустите программу с опцией %s --help для того, чтобы увидеть весь список "
 "опций.\n"
 
-#: ../src/main.c:235
+#: ../src/main.c:282
 #, c-format
 msgid "%s is not a valid directory, the default directory will be used."
-msgstr "%s не является директорией. Будет использована директория по умолчанию."
+msgstr ""
+"%s не является директорией. Будет использована директория по умолчанию."
 
 #: ../src/xfce4-screenshooter.desktop.in.in.h:2
 #: ../panel-plugin/screenshooter.desktop.in.in.h:2
-msgid "Take screenshots of the entire screen, of the active window or of a region"
+msgid ""
+"Take screenshots of the entire screen, of the active window or of a region"
 msgstr "Выполнить снимок всего экрана, активного окна или региона"
 
+#~ msgid "Screenshot.png"
+#~ msgstr "Снимок экрана.png"
+
+#~ msgid "Screenshot-%d.png"
+#~ msgstr "Снимок экрана-%d.png"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">После выполнения снимка</"
+#~ "span>"
+
+#~ msgid "Show the save dialog"
+#~ msgstr "Показать диалог сохранения файла"
+
+#~ msgid ""
+#~ "The save dialog allows you to change the file name and the save location"
+#~ msgstr ""
+#~ "В диалоге сохранения файла вы можете задать имя файла и указать путь для "
+#~ "его сохранения"
+
+#~ msgid "Close the application"
+#~ msgstr "Закрыть приложение"
+
+#~ msgid ""
+#~ "If unchecked, the current window will be displayed again after the "
+#~ "screenshot has been taken to allow you to take several screenshots in a "
+#~ "row"
+#~ msgstr ""
+#~ "Если не выбрано, после выполнения снимка экрана текущее окно появится "
+#~ "вновь, что позволит вам выполнить несколько снимков экрана за раз"
+
+#~ msgid "Default save location"
+#~ msgstr "Путь для сохранения снимков по умолчанию"
+
+#~ msgid "Set the default save location"
+#~ msgstr "Укажите путь куда следует сохранять снимки экрана"
+
+#~ msgid ""
+#~ "An error occurred during the XML exchange: %s (%d).\n"
+#~ " The screenshot could not be uploaded."
+#~ msgstr ""
+#~ "Невозможно передать XML документ с описанием снимка экрана на сервер %s (%"
+#~ "d).\n"
+#~ "Снимок экрана не может быть загружен."
+
+#~ msgid "Do not display the save dialog"
+#~ msgstr "Скрывать диалог сохранения"
diff --git a/po/sq.po b/po/sq.po
index 505ce1b..b7e5b8c 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-screenshooter 1.4.91\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-31 14:02+0200\n"
+"POT-Creation-Date: 2009-11-15 00:29+0100\n"
 "PO-Revision-Date: 2008-11-04 23:27+0200\n"
 "Last-Translator: Besnik Bleta <besnik at programeshqip.org>\n"
 "Language-Team: Albanian <translation-team-sq at lists.sourceforge.net>\n"
@@ -15,26 +15,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.1\n"
 
-#: ../lib/screenshooter-dialogs.c:283
-#, fuzzy
-msgid "Screenshot.png"
-msgstr "Foto ekrani"
-
-#: ../lib/screenshooter-dialogs.c:300
-#, fuzzy, c-format
-msgid "Screenshot-%d.png"
-msgstr "Foto ekrani"
-
-#: ../lib/screenshooter-dialogs.c:493
+#: ../lib/screenshooter-dialogs.c:478
 #, c-format
 msgid "%.2fKb of %.2fKb"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:577
+#: ../lib/screenshooter-dialogs.c:560
 msgid "Transfer"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:600
+#: ../lib/screenshooter-dialogs.c:581
 #, fuzzy
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being "
@@ -43,70 +33,72 @@ msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Vend parazgjedhje për "
 "ruajtje</span>"
 
-#: ../lib/screenshooter-dialogs.c:724 ../lib/screenshooter-dialogs.c:741
+#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
 #, fuzzy
 msgid "Screenshot"
 msgstr "Foto ekrani"
 
-#: ../lib/screenshooter-dialogs.c:736
+#: ../lib/screenshooter-dialogs.c:709
 #, fuzzy
 msgid "Take a screenshot"
 msgstr " Bëj një foto ekrani"
 
-#: ../lib/screenshooter-dialogs.c:751
+#: ../lib/screenshooter-dialogs.c:724
 msgid "Preferences"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:793
+#: ../lib/screenshooter-dialogs.c:754
 #, fuzzy
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Region to capture</span>"
 msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Vend parazgjedhje për "
 "ruajtje</span>"
 
-#: ../lib/screenshooter-dialogs.c:820
+#: ../lib/screenshooter-dialogs.c:774
 msgid "Entire screen"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:830 ../src/main.c:58
-#: ../panel-plugin/screenshooter-plugin.c:292
+#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../panel-plugin/screenshooter-plugin.c:308
 #, fuzzy
 msgid "Take a screenshot of the entire screen"
 msgstr "Bëni një foto ekrani të dritares aktive"
 
-#: ../lib/screenshooter-dialogs.c:841
+#: ../lib/screenshooter-dialogs.c:789
 msgid "Active window"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:851 ../src/main.c:104
-#: ../panel-plugin/screenshooter-plugin.c:297
+#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr "Bëni një foto ekrani të dritares aktive"
 
-#: ../lib/screenshooter-dialogs.c:862
+#: ../lib/screenshooter-dialogs.c:804
 msgid "Select a region"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:872 ../src/main.c:78
-#: ../panel-plugin/screenshooter-plugin.c:302
+#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../panel-plugin/screenshooter-plugin.c:318
 msgid ""
 "Select a region to be captured by clicking a point of the screen without "
 "releasing the mouse button, dragging your mouse to the other corner of the "
 "region, and releasing the mouse button."
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:884
+#: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:892
+#: ../lib/screenshooter-dialogs.c:824
 #, fuzzy
 msgid "Display the mouse pointer on the screenshot"
 msgstr " Bëj një foto ekrani"
 
-#: ../lib/screenshooter-dialogs.c:917
+#: ../lib/screenshooter-dialogs.c:840
 #, fuzzy
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
@@ -114,43 +106,20 @@ msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Vend parazgjedhje për "
 "ruajtje</span>"
 
-#: ../lib/screenshooter-dialogs.c:952
+#: ../lib/screenshooter-dialogs.c:862
 #, fuzzy
 msgid "Delay in seconds before the screenshot is taken"
 msgstr "Vonesë në sekonda përpara bërjes së fotos së ekranit"
 
-#: ../lib/screenshooter-dialogs.c:958
+#: ../lib/screenshooter-dialogs.c:865
 msgid "seconds"
 msgstr "sekonda"
 
-#: ../lib/screenshooter-dialogs.c:984
-#, fuzzy
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
-msgstr ""
-"<span weight=\"bold\" stretch=\"semiexpanded\">Vend parazgjedhje për "
-"ruajtje</span>"
-
-#. Display the save dialog checkbox
-#: ../lib/screenshooter-dialogs.c:1007
-msgid "Show the save dialog"
-msgstr ""
-
-#: ../lib/screenshooter-dialogs.c:1013
-msgid ""
-"The save dialog allows you to change the file name and the save location"
-msgstr ""
-
-#: ../lib/screenshooter-dialogs.c:1027
-msgid "Close the application"
-msgstr ""
-
-#: ../lib/screenshooter-dialogs.c:1033
-msgid ""
-"If unchecked, the current window will be displayed again after the "
-"screenshot has been taken to allow you to take several screenshots in a row"
+#: ../lib/screenshooter-dialogs.c:917
+msgid "Action"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1056
+#: ../lib/screenshooter-dialogs.c:945
 #, fuzzy
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Action</span>"
 msgstr ""
@@ -158,85 +127,93 @@ msgstr ""
 "ruajtje</span>"
 
 #. Save option radio button
-#: ../lib/screenshooter-dialogs.c:1081
-msgid "Save in:"
+#: ../lib/screenshooter-dialogs.c:961
+msgid "Save"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1089
+#: ../lib/screenshooter-dialogs.c:966
 #, fuzzy
 msgid "Save the screenshot to a PNG file"
 msgstr "Ruaj foto ekrani si ..."
 
-#: ../lib/screenshooter-dialogs.c:1104
-msgid "Default save location"
-msgstr "Vend parazgjedhje për ruajtje"
-
-#: ../lib/screenshooter-dialogs.c:1114
-#, fuzzy
-msgid "Set the default save location"
-msgstr "Vend parazgjedhje për ruajtje"
-
-#: ../lib/screenshooter-dialogs.c:1127
+#: ../lib/screenshooter-dialogs.c:975
 msgid "Copy to the clipboard"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1132
+#: ../lib/screenshooter-dialogs.c:977
 msgid "Copy the screenshot to the clipboard so that it can be pasted later"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1147
+#: ../lib/screenshooter-dialogs.c:994
 msgid "Open with:"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1158
+#: ../lib/screenshooter-dialogs.c:1000
 msgid "Open the screenshot with the chosen application"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1191 ../src/main.c:73
+#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
 #, fuzzy
 msgid "Application to open the screenshot"
 msgstr " Bëj një foto ekrani"
 
-#: ../lib/screenshooter-dialogs.c:1204
+#: ../lib/screenshooter-dialogs.c:1028
 msgid "Host on ZimageZ"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1210 ../src/main.c:92
+#: ../lib/screenshooter-dialogs.c:1032 ../src/main.c:80
 msgid "Host the screenshot on ZimageZ, a free online image hosting service"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1255
+#: ../lib/screenshooter-dialogs.c:1046
+#, fuzzy
+msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Preview</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Vend parazgjedhje për "
+"ruajtje</span>"
+
+#: ../lib/screenshooter-dialogs.c:1107
 #, fuzzy
 msgid "Save screenshot as..."
 msgstr "Ruaj foto ekrani si ..."
 
-#. Start the user XML RPC session
-#: ../lib/screenshooter-zimagez.c:159
-msgid "Initialize the connection..."
+#: ../lib/screenshooter-zimagez.c:134
+#, c-format
+msgid "An error occured when creating the XMLRPC request."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:172 ../lib/screenshooter-zimagez.c:332
-#: ../lib/screenshooter-zimagez.c:361 ../lib/screenshooter-zimagez.c:389
-#: ../lib/screenshooter-zimagez.c:520 ../lib/screenshooter-zimagez.c:543
-#: ../lib/screenshooter-zimagez.c:580
+#: ../lib/screenshooter-zimagez.c:153
 #, c-format
-msgid ""
-"An error occurred during the XML exchange: %s (%d).\n"
-" The screenshot could not be uploaded."
+msgid "An error occured when transfering the data to ZimageZ."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:223
+#: ../lib/screenshooter-zimagez.c:178
+#, c-format
+msgid "An error occured when parsing the response from ZimageZ."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:228
+#, c-format
+msgid "Taken on %s, at %s"
+msgstr ""
+
+#. Start the user soup session
+#: ../lib/screenshooter-zimagez.c:295
+msgid "Initialize the connection..."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:341
 msgid ""
 "Please file the following fields with your <a href=\"http://www.zimagez.com"
 "\">ZimageZ</a> \n"
 "user name, passsword and details about the screenshot."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:283
+#: ../lib/screenshooter-zimagez.c:398
 msgid "Check the user information..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:305
+#: ../lib/screenshooter-zimagez.c:405
 #, fuzzy
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You "
@@ -245,11 +222,17 @@ msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Vend parazgjedhje për "
 "ruajtje</span>"
 
-#: ../lib/screenshooter-zimagez.c:320
+#: ../lib/screenshooter-zimagez.c:419
 msgid "Login on ZimageZ..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:436
+#: ../lib/screenshooter-zimagez.c:459 ../lib/screenshooter-zimagez.c:610
+msgid ""
+"An unexpected reply from ZimageZ was received. The upload of the screenshot "
+"failed."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:498
 #, fuzzy
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The "
@@ -258,96 +241,96 @@ msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Vend parazgjedhje për "
 "ruajtje</span>"
 
-#: ../lib/screenshooter-zimagez.c:501
+#: ../lib/screenshooter-zimagez.c:556
 #, fuzzy
 msgid "Upload the screenshot..."
 msgstr " Bëj një foto ekrani"
 
-#: ../lib/screenshooter-zimagez.c:559
+#: ../lib/screenshooter-zimagez.c:589
 #, c-format
 msgid "An error occurred while uploading the screenshot."
 msgstr ""
 
 #. End the user session
-#: ../lib/screenshooter-zimagez.c:597
+#: ../lib/screenshooter-zimagez.c:622
 msgid "Close the session on ZimageZ..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:650
+#: ../lib/screenshooter-zimagez.c:692
 #, fuzzy
 msgid "Details about the screenshot for ZimageZ"
 msgstr "Vonesë në sekonda përpara bërjes së fotos së ekranit"
 
 #. Create the user label
-#: ../lib/screenshooter-zimagez.c:692
+#: ../lib/screenshooter-zimagez.c:734
 msgid "User:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:703
+#: ../lib/screenshooter-zimagez.c:745
 msgid ""
 "Your Zimagez user name, if you do not have one yet please create one on the "
 "Web page linked above"
 msgstr ""
 
 #. Create the password label
-#: ../lib/screenshooter-zimagez.c:708
+#: ../lib/screenshooter-zimagez.c:751
 msgid "Password:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:718
+#: ../lib/screenshooter-zimagez.c:761
 msgid "The password for the user above"
 msgstr ""
 
 #. Create the title label
-#: ../lib/screenshooter-zimagez.c:723
+#: ../lib/screenshooter-zimagez.c:767
 msgid "Title:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:733
+#: ../lib/screenshooter-zimagez.c:777
 msgid ""
 "The title of the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
 msgstr ""
 
 #. Create the comment label
-#: ../lib/screenshooter-zimagez.c:738
+#: ../lib/screenshooter-zimagez.c:783
 msgid "Comment:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:749
+#: ../lib/screenshooter-zimagez.c:794
 msgid ""
 "A comment on the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:870
+#: ../lib/screenshooter-zimagez.c:917
 #, c-format
 msgid "<a href=\"%s\">Full size image</a>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:872
+#: ../lib/screenshooter-zimagez.c:919
 #, c-format
 msgid "<a href=\"%s\">Large thumbnail</a>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:874
+#: ../lib/screenshooter-zimagez.c:921
 #, c-format
 msgid "<a href=\"%s\">Small thumbnail</a>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:894
+#: ../lib/screenshooter-zimagez.c:937
 #, fuzzy
 msgid "My screenshot on ZimageZ"
 msgstr "Vonesë në sekonda përpara bërjes së fotos së ekranit"
 
-#: ../lib/screenshooter-zimagez.c:920
+#: ../lib/screenshooter-zimagez.c:963
 #, fuzzy
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Links</span>"
 msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Vend parazgjedhje për "
 "ruajtje</span>"
 
-#: ../lib/screenshooter-zimagez.c:965
+#: ../lib/screenshooter-zimagez.c:1008
 #, fuzzy
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing "
@@ -357,20 +340,20 @@ msgstr ""
 "bërjes së fotos së ekranit</span>"
 
 #. HTML title
-#: ../lib/screenshooter-zimagez.c:981
+#: ../lib/screenshooter-zimagez.c:1024
 msgid "HTML"
 msgstr ""
 
 #. BB title
-#: ../lib/screenshooter-zimagez.c:1002
+#: ../lib/screenshooter-zimagez.c:1045
 msgid "BBCode for forums"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:1122
+#: ../lib/screenshooter-zimagez.c:1174
 msgid "ZimageZ"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:1155
+#: ../lib/screenshooter-zimagez.c:1207
 #, fuzzy
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Status</span>"
 msgstr ""
@@ -387,30 +370,38 @@ msgstr ""
 msgid "Copy _Link Address"
 msgstr ""
 
-#: ../src/main.c:53
+#: ../src/main.c:48
 msgid "Delay in seconds before taking the screenshot"
 msgstr "Vonesë në sekonda përpara bërjes së fotos së ekranit"
 
-#: ../src/main.c:63
-msgid "Do not display the save dialog"
-msgstr ""
-
-#: ../src/main.c:68
+#: ../src/main.c:58
 #, fuzzy
-msgid "Do not display the mouse on the screenshot"
+msgid "Display the mouse on the screenshot"
 msgstr " Bëj një foto ekrani"
 
-#: ../src/main.c:85
+#: ../src/main.c:75
 msgid "Directory where the screenshot will be saved"
 msgstr ""
 
-#: ../src/main.c:99
+#: ../src/main.c:85
 msgid "Version information"
 msgstr "Të dhëna versioni"
 
+#: ../src/main.c:134
+#, c-format
+msgid "Conflicting options: --%s and --%s cannot be used at the same time.\n"
+msgstr ""
+
 #: ../src/main.c:136
 #, c-format
 msgid ""
+"The --%s option is only used when --fullscreen, --window or --region is "
+"given. It will be ignored.\n"
+msgstr ""
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
@@ -418,7 +409,7 @@ msgstr ""
 "Provoni %s --help për të parë një listë të plotë të mundësive të passhme për "
 "rresht urdhërash.\n"
 
-#: ../src/main.c:235
+#: ../src/main.c:282
 #, c-format
 msgid "%s is not a valid directory, the default directory will be used."
 msgstr ""
@@ -431,6 +422,28 @@ msgid ""
 msgstr "Bëni një foto ekrani të dritares aktive"
 
 #, fuzzy
+#~ msgid "Screenshot.png"
+#~ msgstr "Foto ekrani"
+
+#, fuzzy
+#~ msgid "Screenshot-%d.png"
+#~ msgstr "Foto ekrani"
+
+#, fuzzy
+#~ msgid ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">Vend parazgjedhje për "
+#~ "ruajtje</span>"
+
+#~ msgid "Default save location"
+#~ msgstr "Vend parazgjedhje për ruajtje"
+
+#, fuzzy
+#~ msgid "Set the default save location"
+#~ msgstr "Vend parazgjedhje për ruajtje"
+
+#, fuzzy
 #~ msgid "Tak a screenshot of the entire screen"
 #~ msgstr "Bëni një foto ekrani të dritares aktive"
 
diff --git a/po/sv.po b/po/sv.po
index da63ba5..4a63dd8 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-screenshooter-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-31 14:02+0200\n"
+"POT-Creation-Date: 2009-11-15 00:29+0100\n"
 "PO-Revision-Date: 2009-02-09 15:28+0100\n"
 "Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@ -16,74 +16,66 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../lib/screenshooter-dialogs.c:283
-#, fuzzy
-msgid "Screenshot.png"
-msgstr "Skärmbild.png"
-
-#: ../lib/screenshooter-dialogs.c:300
-#, c-format
-msgid "Screenshot-%d.png"
-msgstr "Skärmbild-%d.png"
-
-#: ../lib/screenshooter-dialogs.c:493
+#: ../lib/screenshooter-dialogs.c:478
 #, c-format
 msgid "%.2fKb of %.2fKb"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:577
+#: ../lib/screenshooter-dialogs.c:560
 msgid "Transfer"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:600
+#: ../lib/screenshooter-dialogs.c:581
 #, fuzzy
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being "
 "transferred to:</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Åtgärd</span>"
 
-#: ../lib/screenshooter-dialogs.c:724 ../lib/screenshooter-dialogs.c:741
+#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
 msgid "Screenshot"
 msgstr "Skärmbild"
 
-#: ../lib/screenshooter-dialogs.c:736
+#: ../lib/screenshooter-dialogs.c:709
 msgid "Take a screenshot"
 msgstr "Ta en skärmbild"
 
-#: ../lib/screenshooter-dialogs.c:751
+#: ../lib/screenshooter-dialogs.c:724
 msgid "Preferences"
 msgstr "Inställningar"
 
-#: ../lib/screenshooter-dialogs.c:793
+#: ../lib/screenshooter-dialogs.c:754
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Region to capture</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Område att fånga</span>"
 
-#: ../lib/screenshooter-dialogs.c:820
+#: ../lib/screenshooter-dialogs.c:774
 msgid "Entire screen"
 msgstr "Hela skärmen"
 
-#: ../lib/screenshooter-dialogs.c:830 ../src/main.c:58
-#: ../panel-plugin/screenshooter-plugin.c:292
+#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../panel-plugin/screenshooter-plugin.c:308
 msgid "Take a screenshot of the entire screen"
 msgstr "Ta en skärmbild av hela skärmen"
 
-#: ../lib/screenshooter-dialogs.c:841
+#: ../lib/screenshooter-dialogs.c:789
 msgid "Active window"
 msgstr "Aktivt fönster"
 
-#: ../lib/screenshooter-dialogs.c:851 ../src/main.c:104
-#: ../panel-plugin/screenshooter-plugin.c:297
+#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr "Ta en skärmbild av aktivt fönster"
 
-#: ../lib/screenshooter-dialogs.c:862
+#: ../lib/screenshooter-dialogs.c:804
 msgid "Select a region"
 msgstr "Välj ett område"
 
-#: ../lib/screenshooter-dialogs.c:872 ../src/main.c:78
-#: ../panel-plugin/screenshooter-plugin.c:302
+#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../panel-plugin/screenshooter-plugin.c:318
 msgid ""
 "Select a region to be captured by clicking a point of the screen without "
 "releasing the mouse button, dragging your mouse to the other corner of the "
@@ -93,242 +85,232 @@ msgstr ""
 "att släppa musknappen, dra sedan muspekaren till andra sidan av området och "
 "släpp musknappen."
 
-#: ../lib/screenshooter-dialogs.c:884
+#: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:892
+#: ../lib/screenshooter-dialogs.c:824
 #, fuzzy
 msgid "Display the mouse pointer on the screenshot"
 msgstr "Visa inte sparningsdialogen"
 
-#: ../lib/screenshooter-dialogs.c:917
+#: ../lib/screenshooter-dialogs.c:840
 #, fuzzy
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Område att fånga</span>"
 
-#: ../lib/screenshooter-dialogs.c:952
+#: ../lib/screenshooter-dialogs.c:862
 msgid "Delay in seconds before the screenshot is taken"
 msgstr "Fördröjning i sekunder innan skärmbilden fångas"
 
-#: ../lib/screenshooter-dialogs.c:958
+#: ../lib/screenshooter-dialogs.c:865
 msgid "seconds"
 msgstr "sekunder"
 
-#: ../lib/screenshooter-dialogs.c:984
-#, fuzzy
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Åtgärd</span>"
-
-#. Display the save dialog checkbox
-#: ../lib/screenshooter-dialogs.c:1007
-#, fuzzy
-msgid "Show the save dialog"
-msgstr "Visa inte sparningsdialogen"
-
-#: ../lib/screenshooter-dialogs.c:1013
-msgid ""
-"The save dialog allows you to change the file name and the save location"
-msgstr ""
-
-#: ../lib/screenshooter-dialogs.c:1027
-#, fuzzy
-msgid "Close the application"
-msgstr "Program:"
-
-#: ../lib/screenshooter-dialogs.c:1033
-msgid ""
-"If unchecked, the current window will be displayed again after the "
-"screenshot has been taken to allow you to take several screenshots in a row"
+#: ../lib/screenshooter-dialogs.c:917
+msgid "Action"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1056
+#: ../lib/screenshooter-dialogs.c:945
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Action</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Åtgärd</span>"
 
 #. Save option radio button
-#: ../lib/screenshooter-dialogs.c:1081
+#: ../lib/screenshooter-dialogs.c:961
 #, fuzzy
-msgid "Save in:"
+msgid "Save"
 msgstr "Spara"
 
-#: ../lib/screenshooter-dialogs.c:1089
+#: ../lib/screenshooter-dialogs.c:966
 msgid "Save the screenshot to a PNG file"
 msgstr "Spara skärmbilden till en PNG-fil"
 
-#: ../lib/screenshooter-dialogs.c:1104
-msgid "Default save location"
-msgstr "Standardplats att spara i"
-
-#: ../lib/screenshooter-dialogs.c:1114
-msgid "Set the default save location"
-msgstr "Ange standardplatsen för sparade filer"
-
-#: ../lib/screenshooter-dialogs.c:1127
+#: ../lib/screenshooter-dialogs.c:975
 msgid "Copy to the clipboard"
 msgstr "Kopiera till urklipp"
 
-#: ../lib/screenshooter-dialogs.c:1132
+#: ../lib/screenshooter-dialogs.c:977
 msgid "Copy the screenshot to the clipboard so that it can be pasted later"
 msgstr "Kopiera skärmbilden till urklipp så att den kan klistras in senare"
 
-#: ../lib/screenshooter-dialogs.c:1147
+#: ../lib/screenshooter-dialogs.c:994
 msgid "Open with:"
 msgstr "Öppna med:"
 
-#: ../lib/screenshooter-dialogs.c:1158
+#: ../lib/screenshooter-dialogs.c:1000
 msgid "Open the screenshot with the chosen application"
 msgstr "Öppna skärmbilden med valt program"
 
-#: ../lib/screenshooter-dialogs.c:1191 ../src/main.c:73
+#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
 msgid "Application to open the screenshot"
 msgstr "Program att öppna skärmbilden med"
 
-#: ../lib/screenshooter-dialogs.c:1204
+#: ../lib/screenshooter-dialogs.c:1028
 msgid "Host on ZimageZ"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1210 ../src/main.c:92
+#: ../lib/screenshooter-dialogs.c:1032 ../src/main.c:80
 msgid "Host the screenshot on ZimageZ, a free online image hosting service"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1255
+#: ../lib/screenshooter-dialogs.c:1046
+#, fuzzy
+msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Preview</span>"
+msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Åtgärd</span>"
+
+#: ../lib/screenshooter-dialogs.c:1107
 msgid "Save screenshot as..."
 msgstr "Spara skärmbild som..."
 
-#. Start the user XML RPC session
-#: ../lib/screenshooter-zimagez.c:159
-msgid "Initialize the connection..."
+#: ../lib/screenshooter-zimagez.c:134
+#, c-format
+msgid "An error occured when creating the XMLRPC request."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:172 ../lib/screenshooter-zimagez.c:332
-#: ../lib/screenshooter-zimagez.c:361 ../lib/screenshooter-zimagez.c:389
-#: ../lib/screenshooter-zimagez.c:520 ../lib/screenshooter-zimagez.c:543
-#: ../lib/screenshooter-zimagez.c:580
+#: ../lib/screenshooter-zimagez.c:153
 #, c-format
-msgid ""
-"An error occurred during the XML exchange: %s (%d).\n"
-" The screenshot could not be uploaded."
+msgid "An error occured when transfering the data to ZimageZ."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:178
+#, c-format
+msgid "An error occured when parsing the response from ZimageZ."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:228
+#, c-format
+msgid "Taken on %s, at %s"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:223
+#. Start the user soup session
+#: ../lib/screenshooter-zimagez.c:295
+msgid "Initialize the connection..."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:341
 msgid ""
 "Please file the following fields with your <a href=\"http://www.zimagez.com"
 "\">ZimageZ</a> \n"
 "user name, passsword and details about the screenshot."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:283
+#: ../lib/screenshooter-zimagez.c:398
 msgid "Check the user information..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:305
+#: ../lib/screenshooter-zimagez.c:405
 #, fuzzy
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You "
 "must fill all the fields.</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Område att fånga</span>"
 
-#: ../lib/screenshooter-zimagez.c:320
+#: ../lib/screenshooter-zimagez.c:419
 msgid "Login on ZimageZ..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:436
+#: ../lib/screenshooter-zimagez.c:459 ../lib/screenshooter-zimagez.c:610
+msgid ""
+"An unexpected reply from ZimageZ was received. The upload of the screenshot "
+"failed."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:498
 #, fuzzy
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The "
 "user and the password you entered do not match. Please retry.</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Åtgärd</span>"
 
-#: ../lib/screenshooter-zimagez.c:501
+#: ../lib/screenshooter-zimagez.c:556
 #, fuzzy
 msgid "Upload the screenshot..."
 msgstr "Ta skärmbilden"
 
-#: ../lib/screenshooter-zimagez.c:559
+#: ../lib/screenshooter-zimagez.c:589
 #, c-format
 msgid "An error occurred while uploading the screenshot."
 msgstr ""
 
 #. End the user session
-#: ../lib/screenshooter-zimagez.c:597
+#: ../lib/screenshooter-zimagez.c:622
 msgid "Close the session on ZimageZ..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:650
+#: ../lib/screenshooter-zimagez.c:692
 #, fuzzy
 msgid "Details about the screenshot for ZimageZ"
 msgstr "Fördröjning i sekunder innan skärmbilden fångas"
 
 #. Create the user label
-#: ../lib/screenshooter-zimagez.c:692
+#: ../lib/screenshooter-zimagez.c:734
 msgid "User:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:703
+#: ../lib/screenshooter-zimagez.c:745
 msgid ""
 "Your Zimagez user name, if you do not have one yet please create one on the "
 "Web page linked above"
 msgstr ""
 
 #. Create the password label
-#: ../lib/screenshooter-zimagez.c:708
+#: ../lib/screenshooter-zimagez.c:751
 msgid "Password:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:718
+#: ../lib/screenshooter-zimagez.c:761
 msgid "The password for the user above"
 msgstr ""
 
 #. Create the title label
-#: ../lib/screenshooter-zimagez.c:723
+#: ../lib/screenshooter-zimagez.c:767
 msgid "Title:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:733
+#: ../lib/screenshooter-zimagez.c:777
 msgid ""
 "The title of the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
 msgstr ""
 
 #. Create the comment label
-#: ../lib/screenshooter-zimagez.c:738
+#: ../lib/screenshooter-zimagez.c:783
 msgid "Comment:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:749
+#: ../lib/screenshooter-zimagez.c:794
 msgid ""
 "A comment on the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:870
+#: ../lib/screenshooter-zimagez.c:917
 #, c-format
 msgid "<a href=\"%s\">Full size image</a>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:872
+#: ../lib/screenshooter-zimagez.c:919
 #, c-format
 msgid "<a href=\"%s\">Large thumbnail</a>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:874
+#: ../lib/screenshooter-zimagez.c:921
 #, c-format
 msgid "<a href=\"%s\">Small thumbnail</a>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:894
+#: ../lib/screenshooter-zimagez.c:937
 #, fuzzy
 msgid "My screenshot on ZimageZ"
 msgstr "Fördröjning i sekunder innan skärmbilden fångas"
 
-#: ../lib/screenshooter-zimagez.c:920
+#: ../lib/screenshooter-zimagez.c:963
 #, fuzzy
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Links</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Åtgärd</span>"
 
-#: ../lib/screenshooter-zimagez.c:965
+#: ../lib/screenshooter-zimagez.c:1008
 #, fuzzy
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing "
@@ -338,20 +320,20 @@ msgstr ""
 "fångas</span>"
 
 #. HTML title
-#: ../lib/screenshooter-zimagez.c:981
+#: ../lib/screenshooter-zimagez.c:1024
 msgid "HTML"
 msgstr ""
 
 #. BB title
-#: ../lib/screenshooter-zimagez.c:1002
+#: ../lib/screenshooter-zimagez.c:1045
 msgid "BBCode for forums"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:1122
+#: ../lib/screenshooter-zimagez.c:1174
 msgid "ZimageZ"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:1155
+#: ../lib/screenshooter-zimagez.c:1207
 #, fuzzy
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Status</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Åtgärd</span>"
@@ -367,30 +349,38 @@ msgstr "Öppna med:"
 msgid "Copy _Link Address"
 msgstr ""
 
-#: ../src/main.c:53
+#: ../src/main.c:48
 msgid "Delay in seconds before taking the screenshot"
 msgstr "Fördröjning i sekunder innan skärmbilden fångas"
 
-#: ../src/main.c:63
-msgid "Do not display the save dialog"
-msgstr "Visa inte sparningsdialogen"
-
-#: ../src/main.c:68
+#: ../src/main.c:58
 #, fuzzy
-msgid "Do not display the mouse on the screenshot"
+msgid "Display the mouse on the screenshot"
 msgstr "Visa inte sparningsdialogen"
 
-#: ../src/main.c:85
+#: ../src/main.c:75
 msgid "Directory where the screenshot will be saved"
 msgstr "Katalog där skärmbilden ska sparas"
 
-#: ../src/main.c:99
+#: ../src/main.c:85
 msgid "Version information"
 msgstr "Versionsinformation"
 
+#: ../src/main.c:134
+#, c-format
+msgid "Conflicting options: --%s and --%s cannot be used at the same time.\n"
+msgstr ""
+
 #: ../src/main.c:136
 #, c-format
 msgid ""
+"The --%s option is only used when --fullscreen, --window or --region is "
+"given. It will be ignored.\n"
+msgstr ""
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
@@ -398,7 +388,7 @@ msgstr ""
 "Prova %s --help för att se en komplett lista över tillgängliga "
 "kommandoradsflaggor.\n"
 
-#: ../src/main.c:235
+#: ../src/main.c:282
 #, c-format
 msgid "%s is not a valid directory, the default directory will be used."
 msgstr "%s är inte en giltig katalog, standardkatalogen kommer att användas."
@@ -410,6 +400,35 @@ msgid ""
 msgstr "Ta skärmbilder av hela skärmen, aktivt fönster eller ett område"
 
 #, fuzzy
+#~ msgid "Screenshot.png"
+#~ msgstr "Skärmbild.png"
+
+#~ msgid "Screenshot-%d.png"
+#~ msgstr "Skärmbild-%d.png"
+
+#, fuzzy
+#~ msgid ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
+#~ msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Åtgärd</span>"
+
+#, fuzzy
+#~ msgid "Show the save dialog"
+#~ msgstr "Visa inte sparningsdialogen"
+
+#, fuzzy
+#~ msgid "Close the application"
+#~ msgstr "Program:"
+
+#~ msgid "Default save location"
+#~ msgstr "Standardplats att spara i"
+
+#~ msgid "Set the default save location"
+#~ msgstr "Ange standardplatsen för sparade filer"
+
+#~ msgid "Do not display the save dialog"
+#~ msgstr "Visa inte sparningsdialogen"
+
+#, fuzzy
 #~ msgid "Tak a screenshot of the entire screen"
 #~ msgstr "Ta en skärmbild av hela skärmen"
 
diff --git a/po/tr.po b/po/tr.po
index 8a00c0d..635208e 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-31 14:02+0200\n"
+"POT-Creation-Date: 2009-11-15 00:29+0100\n"
 "PO-Revision-Date: 2009-06-02 19:49+0200\n"
 "Last-Translator: Samed Beyribey <ras0ir at eventualis.org>\n"
 "Language-Team: Turkish <turkce at pardus.org.tr>\n"
@@ -15,313 +15,335 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/screenshooter-dialogs.c:283
-msgid "Screenshot.png"
-msgstr "Resim.png"
-
-#: ../lib/screenshooter-dialogs.c:300
-#, c-format
-msgid "Screenshot-%d.png"
-msgstr "resim-%d.png"
-
-#: ../lib/screenshooter-dialogs.c:493
+#: ../lib/screenshooter-dialogs.c:478
 #, c-format
 msgid "%.2fKb of %.2fKb"
 msgstr "%.2fKb aktarıldı, toplam %.2fKb"
 
-#: ../lib/screenshooter-dialogs.c:577
+#: ../lib/screenshooter-dialogs.c:560
 msgid "Transfer"
 msgstr "Aktar"
 
-#: ../lib/screenshooter-dialogs.c:600
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being transferred to:</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Ekran görüntüsü aktarılıyor:</span>"
+#: ../lib/screenshooter-dialogs.c:581
+msgid ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being "
+"transferred to:</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Ekran görüntüsü aktarılıyor:</"
+"span>"
 
-#: ../lib/screenshooter-dialogs.c:724
-#: ../lib/screenshooter-dialogs.c:741
+#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
 msgid "Screenshot"
 msgstr "Ekran görüntüsü"
 
-#: ../lib/screenshooter-dialogs.c:736
+#: ../lib/screenshooter-dialogs.c:709
 msgid "Take a screenshot"
 msgstr "Ekran görüntüsü al"
 
-#: ../lib/screenshooter-dialogs.c:751
+#: ../lib/screenshooter-dialogs.c:724
 msgid "Preferences"
 msgstr "Tercihler"
 
-#: ../lib/screenshooter-dialogs.c:793
+#: ../lib/screenshooter-dialogs.c:754
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Region to capture</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Görüntüsü alınacak alan</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Görüntüsü alınacak alan</span>"
 
-#: ../lib/screenshooter-dialogs.c:820
+#: ../lib/screenshooter-dialogs.c:774
 msgid "Entire screen"
 msgstr "Tüm ekran"
 
-#: ../lib/screenshooter-dialogs.c:830
-#: ../src/main.c:58
-#: ../panel-plugin/screenshooter-plugin.c:292
+#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../panel-plugin/screenshooter-plugin.c:308
 msgid "Take a screenshot of the entire screen"
 msgstr "Tüm ekranın görüntüsünü al"
 
-#: ../lib/screenshooter-dialogs.c:841
+#: ../lib/screenshooter-dialogs.c:789
 msgid "Active window"
 msgstr "Etkin pencere"
 
-#: ../lib/screenshooter-dialogs.c:851
-#: ../src/main.c:104
-#: ../panel-plugin/screenshooter-plugin.c:297
+#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr "Etkin pencerenin ekran görüntüsünü al"
 
-#: ../lib/screenshooter-dialogs.c:862
+#: ../lib/screenshooter-dialogs.c:804
 msgid "Select a region"
 msgstr "Alan seçimi"
 
-#: ../lib/screenshooter-dialogs.c:872
-#: ../src/main.c:78
-#: ../panel-plugin/screenshooter-plugin.c:302
-msgid "Select a region to be captured by clicking a point of the screen without releasing the mouse button, dragging your mouse to the other corner of the region, and releasing the mouse button."
-msgstr "Farenin sol tuşuna basılı tutup fareyi hareket ettirerek belirli bir alanı seçip, o alanın ekran görüntüsünü alabilirsiniz."
+#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../panel-plugin/screenshooter-plugin.c:318
+msgid ""
+"Select a region to be captured by clicking a point of the screen without "
+"releasing the mouse button, dragging your mouse to the other corner of the "
+"region, and releasing the mouse button."
+msgstr ""
+"Farenin sol tuşuna basılı tutup fareyi hareket ettirerek belirli bir alanı "
+"seçip, o alanın ekran görüntüsünü alabilirsiniz."
 
-#: ../lib/screenshooter-dialogs.c:884
+#: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
 msgstr "Fare imlecini yakala"
 
-#: ../lib/screenshooter-dialogs.c:892
+#: ../lib/screenshooter-dialogs.c:824
 msgid "Display the mouse pointer on the screenshot"
 msgstr "Ekran görüntüsünde fare imlecini göster"
 
-#: ../lib/screenshooter-dialogs.c:917
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Görüntü almadan önce beklenecek süre</span>"
+#: ../lib/screenshooter-dialogs.c:840
+msgid ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Görüntü almadan önce "
+"beklenecek süre</span>"
 
-#: ../lib/screenshooter-dialogs.c:952
+#: ../lib/screenshooter-dialogs.c:862
 msgid "Delay in seconds before the screenshot is taken"
 msgstr "Ekran görüntüsü almayı saniye değerinden geciktir"
 
-#: ../lib/screenshooter-dialogs.c:958
+#: ../lib/screenshooter-dialogs.c:865
 msgid "seconds"
 msgstr "saniye"
 
-#: ../lib/screenshooter-dialogs.c:984
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Görüntü alındıktan sonra</span>"
-
-#. Display the save dialog checkbox
-#: ../lib/screenshooter-dialogs.c:1007
-msgid "Show the save dialog"
-msgstr "Kaydetme penceresini göster"
-
-#: ../lib/screenshooter-dialogs.c:1013
-msgid "The save dialog allows you to change the file name and the save location"
-msgstr "Kaydetme penceresi dosya adını ve dosya konumunu değiştirmenizi sağlar"
-
-#: ../lib/screenshooter-dialogs.c:1027
-msgid "Close the application"
-msgstr "Uygulamayı kapat"
-
-#: ../lib/screenshooter-dialogs.c:1033
-msgid "If unchecked, the current window will be displayed again after the screenshot has been taken to allow you to take several screenshots in a row"
-msgstr "Eğer işaretlenmemişse, belli bir sıra dahilinde ekran görüntüleri alındıktan sonra ana pencere tekrar gösterilecektir"
+#: ../lib/screenshooter-dialogs.c:917
+msgid "Action"
+msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1056
+#: ../lib/screenshooter-dialogs.c:945
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Action</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Eylem</span>"
 
 #. Save option radio button
-#: ../lib/screenshooter-dialogs.c:1081
-msgid "Save in:"
+#: ../lib/screenshooter-dialogs.c:961
+#, fuzzy
+msgid "Save"
 msgstr "Buraya kaydet:"
 
-#: ../lib/screenshooter-dialogs.c:1089
+#: ../lib/screenshooter-dialogs.c:966
 msgid "Save the screenshot to a PNG file"
 msgstr "Ekran görüntüsünü PNG biçiminde kaydet"
 
-#: ../lib/screenshooter-dialogs.c:1104
-msgid "Default save location"
-msgstr "Öntanımlı kaydetme yeri"
-
-#: ../lib/screenshooter-dialogs.c:1114
-msgid "Set the default save location"
-msgstr "Öntanımlı kaydetme dizini"
-
-#: ../lib/screenshooter-dialogs.c:1127
+#: ../lib/screenshooter-dialogs.c:975
 msgid "Copy to the clipboard"
 msgstr "Panoya kopyala"
 
-#: ../lib/screenshooter-dialogs.c:1132
+#: ../lib/screenshooter-dialogs.c:977
 msgid "Copy the screenshot to the clipboard so that it can be pasted later"
-msgstr "Ekran görüntüsünü panoya kopyalar daha sonra ihtiyaç duyduğunuzda yapıştırmak için kullanabilirsiniz"
+msgstr ""
+"Ekran görüntüsünü panoya kopyalar daha sonra ihtiyaç duyduğunuzda "
+"yapıştırmak için kullanabilirsiniz"
 
-#: ../lib/screenshooter-dialogs.c:1147
+#: ../lib/screenshooter-dialogs.c:994
 msgid "Open with:"
 msgstr "Birlikte aç:"
 
-#: ../lib/screenshooter-dialogs.c:1158
+#: ../lib/screenshooter-dialogs.c:1000
 msgid "Open the screenshot with the chosen application"
 msgstr "Ekran görüntüsünü seçilen uygulama ile açar"
 
-#: ../lib/screenshooter-dialogs.c:1191
-#: ../src/main.c:73
+#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
 msgid "Application to open the screenshot"
 msgstr "Ekran görüntüsünü gösterecek uygulama"
 
-#: ../lib/screenshooter-dialogs.c:1204
+#: ../lib/screenshooter-dialogs.c:1028
 msgid "Host on ZimageZ"
 msgstr "ZimageZ üzerinde yayınla"
 
-#: ../lib/screenshooter-dialogs.c:1210
-#: ../src/main.c:92
+#: ../lib/screenshooter-dialogs.c:1032 ../src/main.c:80
 msgid "Host the screenshot on ZimageZ, a free online image hosting service"
-msgstr "Ekran görüntüsünü ücretsiz resim yükleme servisi ZimageZ servisine aktarır"
+msgstr ""
+"Ekran görüntüsünü ücretsiz resim yükleme servisi ZimageZ servisine aktarır"
+
+#: ../lib/screenshooter-dialogs.c:1046
+#, fuzzy
+msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Preview</span>"
+msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Bağlantılar</span>"
 
-#: ../lib/screenshooter-dialogs.c:1255
+#: ../lib/screenshooter-dialogs.c:1107
 msgid "Save screenshot as..."
 msgstr "Ekran görüntüsünü farklı kaydet..."
 
-#. Start the user XML RPC session
-#: ../lib/screenshooter-zimagez.c:159
-msgid "Initialize the connection..."
-msgstr "Bağlantıyı başlat..."
+#: ../lib/screenshooter-zimagez.c:134
+#, fuzzy, c-format
+msgid "An error occured when creating the XMLRPC request."
+msgstr "Ekran görüntüsü aktarılırken bir hata meydana geldi."
+
+#: ../lib/screenshooter-zimagez.c:153
+#, fuzzy, c-format
+msgid "An error occured when transfering the data to ZimageZ."
+msgstr "Ekran görüntüsü aktarılırken bir hata meydana geldi."
+
+#: ../lib/screenshooter-zimagez.c:178
+#, fuzzy, c-format
+msgid "An error occured when parsing the response from ZimageZ."
+msgstr "Ekran görüntüsü aktarılırken bir hata meydana geldi."
 
-#: ../lib/screenshooter-zimagez.c:172
-#: ../lib/screenshooter-zimagez.c:332
-#: ../lib/screenshooter-zimagez.c:361
-#: ../lib/screenshooter-zimagez.c:389
-#: ../lib/screenshooter-zimagez.c:520
-#: ../lib/screenshooter-zimagez.c:543
-#: ../lib/screenshooter-zimagez.c:580
+#: ../lib/screenshooter-zimagez.c:228
 #, c-format
-msgid ""
-"An error occurred during the XML exchange: %s (%d).\n"
-" The screenshot could not be uploaded."
+msgid "Taken on %s, at %s"
 msgstr ""
-"XML değişimi sırasında bir hata oluştur: %s (%d).\n"
-" Ekran görüntüsü aktarılamadı."
 
-#: ../lib/screenshooter-zimagez.c:223
+#. Start the user soup session
+#: ../lib/screenshooter-zimagez.c:295
+msgid "Initialize the connection..."
+msgstr "Bağlantıyı başlat..."
+
+#: ../lib/screenshooter-zimagez.c:341
 msgid ""
-"Please file the following fields with your <a href=\"http://www.zimagez.com\">ZimageZ</a> \n"
+"Please file the following fields with your <a href=\"http://www.zimagez.com"
+"\">ZimageZ</a> \n"
 "user name, passsword and details about the screenshot."
 msgstr ""
-"Lütfen aşağıdaki kısımları <a href=\"http://www.zimagez.com\">ZimageZ</a> üzerindeki \n"
+"Lütfen aşağıdaki kısımları <a href=\"http://www.zimagez.com\">ZimageZ</a> "
+"üzerindeki \n"
 "kullanıcı adı, parolanız ve diğer detayları kullanarak doldurunuz. "
 
-#: ../lib/screenshooter-zimagez.c:283
+#: ../lib/screenshooter-zimagez.c:398
 msgid "Check the user information..."
 msgstr "Kullanıcı bilgilerini kontrol et..."
 
-#: ../lib/screenshooter-zimagez.c:305
-msgid "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You must fill all the fields.</span>"
-msgstr "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">Tüm alanları doldurmalısınız.</span>"
+#: ../lib/screenshooter-zimagez.c:405
+msgid ""
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You "
+"must fill all the fields.</span>"
+msgstr ""
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">Tüm "
+"alanları doldurmalısınız.</span>"
 
-#: ../lib/screenshooter-zimagez.c:320
+#: ../lib/screenshooter-zimagez.c:419
 msgid "Login on ZimageZ..."
 msgstr "ZimageZ servisine giriş yap..."
 
-#: ../lib/screenshooter-zimagez.c:436
-msgid "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The user and the password you entered do not match. Please retry.</span>"
-msgstr "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">Girmiş olduğunuz kullanıcı adı ve parola birbirini tutmuyor. Lütfen tekrar deneyin.</span>"
+#: ../lib/screenshooter-zimagez.c:459 ../lib/screenshooter-zimagez.c:610
+msgid ""
+"An unexpected reply from ZimageZ was received. The upload of the screenshot "
+"failed."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:498
+msgid ""
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The "
+"user and the password you entered do not match. Please retry.</span>"
+msgstr ""
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">Girmiş "
+"olduğunuz kullanıcı adı ve parola birbirini tutmuyor. Lütfen tekrar deneyin."
+"</span>"
 
-#: ../lib/screenshooter-zimagez.c:501
+#: ../lib/screenshooter-zimagez.c:556
 msgid "Upload the screenshot..."
 msgstr "Ekran görüntüsünü gönder..."
 
-#: ../lib/screenshooter-zimagez.c:559
+#: ../lib/screenshooter-zimagez.c:589
 #, c-format
 msgid "An error occurred while uploading the screenshot."
 msgstr "Ekran görüntüsü aktarılırken bir hata meydana geldi."
 
 #. End the user session
-#: ../lib/screenshooter-zimagez.c:597
+#: ../lib/screenshooter-zimagez.c:622
 msgid "Close the session on ZimageZ..."
 msgstr "ZimageZ oturumunu kapat... "
 
-#: ../lib/screenshooter-zimagez.c:650
+#: ../lib/screenshooter-zimagez.c:692
 msgid "Details about the screenshot for ZimageZ"
 msgstr "ZimageZ için ekran görüntüsü detayları"
 
 #. Create the user label
-#: ../lib/screenshooter-zimagez.c:692
+#: ../lib/screenshooter-zimagez.c:734
 msgid "User:"
 msgstr "Kullanıcı Adı:"
 
-#: ../lib/screenshooter-zimagez.c:703
-msgid "Your Zimagez user name, if you do not have one yet please create one on the Web page linked above"
-msgstr "Zimagez kullanıcı adınız, eğer henüz bir kullanıcı oluşturmamışsanız yukarıdaki bağlantıyı kullanarak oluşturabilirsiniz"
+#: ../lib/screenshooter-zimagez.c:745
+msgid ""
+"Your Zimagez user name, if you do not have one yet please create one on the "
+"Web page linked above"
+msgstr ""
+"Zimagez kullanıcı adınız, eğer henüz bir kullanıcı oluşturmamışsanız "
+"yukarıdaki bağlantıyı kullanarak oluşturabilirsiniz"
 
 #. Create the password label
-#: ../lib/screenshooter-zimagez.c:708
+#: ../lib/screenshooter-zimagez.c:751
 msgid "Password:"
 msgstr "Parola:"
 
-#: ../lib/screenshooter-zimagez.c:718
+#: ../lib/screenshooter-zimagez.c:761
 msgid "The password for the user above"
 msgstr "Kullanıcı parolanız"
 
 #. Create the title label
-#: ../lib/screenshooter-zimagez.c:723
+#: ../lib/screenshooter-zimagez.c:767
 msgid "Title:"
 msgstr "Başlık:"
 
-#: ../lib/screenshooter-zimagez.c:733
-msgid "The title of the screenshot, it will be used when displaying the screenshot on ZimageZ"
-msgstr "Ekran görüntüsü için isim, ZimageZ üzerinde ekran görüntüsü gösterilirken kullanılacaktır"
+#: ../lib/screenshooter-zimagez.c:777
+msgid ""
+"The title of the screenshot, it will be used when displaying the screenshot "
+"on ZimageZ"
+msgstr ""
+"Ekran görüntüsü için isim, ZimageZ üzerinde ekran görüntüsü gösterilirken "
+"kullanılacaktır"
 
 #. Create the comment label
-#: ../lib/screenshooter-zimagez.c:738
+#: ../lib/screenshooter-zimagez.c:783
 msgid "Comment:"
 msgstr "Yorum:"
 
-#: ../lib/screenshooter-zimagez.c:749
-msgid "A comment on the screenshot, it will be used when displaying the screenshot on ZimageZ"
-msgstr "Ekran görüntüsü için yorum, ZimageZ üzerinde ekran görüntüsü gösterilirken kullanılacaktır "
+#: ../lib/screenshooter-zimagez.c:794
+msgid ""
+"A comment on the screenshot, it will be used when displaying the screenshot "
+"on ZimageZ"
+msgstr ""
+"Ekran görüntüsü için yorum, ZimageZ üzerinde ekran görüntüsü gösterilirken "
+"kullanılacaktır "
 
-#: ../lib/screenshooter-zimagez.c:870
+#: ../lib/screenshooter-zimagez.c:917
 #, c-format
 msgid "<a href=\"%s\">Full size image</a>"
 msgstr "<a href=\"%s\">Tam boy resim</a>"
 
-#: ../lib/screenshooter-zimagez.c:872
+#: ../lib/screenshooter-zimagez.c:919
 #, c-format
 msgid "<a href=\"%s\">Large thumbnail</a>"
 msgstr "<a href=\"%s\">Büyük önizleme resmi</a>"
 
-#: ../lib/screenshooter-zimagez.c:874
+#: ../lib/screenshooter-zimagez.c:921
 #, c-format
 msgid "<a href=\"%s\">Small thumbnail</a>"
 msgstr "<a href=\"%s\">Küçük önizleme resmi</a>"
 
-#: ../lib/screenshooter-zimagez.c:894
+#: ../lib/screenshooter-zimagez.c:937
 msgid "My screenshot on ZimageZ"
 msgstr "ZimageZ üzerindeki ekran görüntüm"
 
-#: ../lib/screenshooter-zimagez.c:920
+#: ../lib/screenshooter-zimagez.c:963
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Links</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Bağlantılar</span>"
 
-#: ../lib/screenshooter-zimagez.c:965
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing to the full size image</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Tam boyut için kullanılacak önizleme resmi kodu</span>"
+#: ../lib/screenshooter-zimagez.c:1008
+msgid ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing "
+"to the full size image</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Tam boyut için kullanılacak "
+"önizleme resmi kodu</span>"
 
 #. HTML title
-#: ../lib/screenshooter-zimagez.c:981
+#: ../lib/screenshooter-zimagez.c:1024
 msgid "HTML"
 msgstr "HTML"
 
 #. BB title
-#: ../lib/screenshooter-zimagez.c:1002
+#: ../lib/screenshooter-zimagez.c:1045
 msgid "BBCode for forums"
 msgstr "Forumlar için BBCode"
 
-#: ../lib/screenshooter-zimagez.c:1122
+#: ../lib/screenshooter-zimagez.c:1174
 msgid "ZimageZ"
 msgstr "ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:1155
+#: ../lib/screenshooter-zimagez.c:1207
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Status</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Durum</span>"
 
@@ -335,44 +357,102 @@ msgstr "_Bağlantıyı Aç"
 msgid "Copy _Link Address"
 msgstr "Bağlantı Adresini Kopya_la"
 
-#: ../src/main.c:53
+#: ../src/main.c:48
 msgid "Delay in seconds before taking the screenshot"
 msgstr "Ekran görüntüsü almayı saniye değerinden geciktir"
 
-#: ../src/main.c:63
-msgid "Do not display the save dialog"
-msgstr "Kaydetme penceresini gösterme"
-
-#: ../src/main.c:68
-msgid "Do not display the mouse on the screenshot"
+#: ../src/main.c:58
+#, fuzzy
+msgid "Display the mouse on the screenshot"
 msgstr "Ekran görüntüsünde fare imlecini gösterme"
 
-#: ../src/main.c:85
+#: ../src/main.c:75
 msgid "Directory where the screenshot will be saved"
 msgstr "Ekran görüntüsünün kaydedileceği dizin"
 
-#: ../src/main.c:99
+#: ../src/main.c:85
 msgid "Version information"
 msgstr "Sürüm bilgisi"
 
+#: ../src/main.c:134
+#, c-format
+msgid "Conflicting options: --%s and --%s cannot be used at the same time.\n"
+msgstr ""
+
 #: ../src/main.c:136
 #, c-format
 msgid ""
+"The --%s option is only used when --fullscreen, --window or --region is "
+"given. It will be ignored.\n"
+msgstr ""
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
 "%s: %s\n"
 "Uygun komut satırı seçeneklerini görmek için, %s --help komutunu deneyiniz.\n"
 
-#: ../src/main.c:235
+#: ../src/main.c:282
 #, c-format
 msgid "%s is not a valid directory, the default directory will be used."
 msgstr "%s geçerli bir dizin değil, öntanımlı dizin kullanılacak."
 
 #: ../src/xfce4-screenshooter.desktop.in.in.h:2
 #: ../panel-plugin/screenshooter.desktop.in.in.h:2
-msgid "Take screenshots of the entire screen, of the active window or of a region"
-msgstr "Tüm ekranın, etkin pencerenin veya belirli bir alanın ekran görüntüsünü alır"
+msgid ""
+"Take screenshots of the entire screen, of the active window or of a region"
+msgstr ""
+"Tüm ekranın, etkin pencerenin veya belirli bir alanın ekran görüntüsünü alır"
+
+#~ msgid "Screenshot.png"
+#~ msgstr "Resim.png"
+
+#~ msgid "Screenshot-%d.png"
+#~ msgstr "resim-%d.png"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">Görüntü alındıktan sonra</"
+#~ "span>"
+
+#~ msgid "Show the save dialog"
+#~ msgstr "Kaydetme penceresini göster"
+
+#~ msgid ""
+#~ "The save dialog allows you to change the file name and the save location"
+#~ msgstr ""
+#~ "Kaydetme penceresi dosya adını ve dosya konumunu değiştirmenizi sağlar"
+
+#~ msgid "Close the application"
+#~ msgstr "Uygulamayı kapat"
+
+#~ msgid ""
+#~ "If unchecked, the current window will be displayed again after the "
+#~ "screenshot has been taken to allow you to take several screenshots in a "
+#~ "row"
+#~ msgstr ""
+#~ "Eğer işaretlenmemişse, belli bir sıra dahilinde ekran görüntüleri "
+#~ "alındıktan sonra ana pencere tekrar gösterilecektir"
+
+#~ msgid "Default save location"
+#~ msgstr "Öntanımlı kaydetme yeri"
+
+#~ msgid "Set the default save location"
+#~ msgstr "Öntanımlı kaydetme dizini"
+
+#~ msgid ""
+#~ "An error occurred during the XML exchange: %s (%d).\n"
+#~ " The screenshot could not be uploaded."
+#~ msgstr ""
+#~ "XML değişimi sırasında bir hata oluştur: %s (%d).\n"
+#~ " Ekran görüntüsü aktarılamadı."
+
+#~ msgid "Do not display the save dialog"
+#~ msgstr "Kaydetme penceresini gösterme"
 
 #, fuzzy
 #~ msgid "Tak a screenshot of the entire screen"
@@ -385,12 +465,13 @@ msgstr "Tüm ekranın, etkin pencerenin veya belirli bir alanın ekran görünt
 #, fuzzy
 #~ msgid "Display the save dialog"
 #~ msgstr "Kaydetme penceresini gösterme"
+
 #~ msgid "Save by default to:"
 #~ msgstr "Öntanımlı kaydetme yeri:"
+
 #~ msgid ""
 #~ "If checked, the screenshot will be saved by default to the location set "
 #~ "on the right without displaying a save dialog"
 #~ msgstr ""
 #~ "Seçildiği takdirde, ekran görüntüsü sağ kısımda belirtilen dizine "
 #~ "kaydedilecektir"
-
diff --git a/po/uk.po b/po/uk.po
index c113234..c89771b 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-screenshooter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-31 14:02+0200\n"
+"POT-Creation-Date: 2009-11-15 00:29+0100\n"
 "PO-Revision-Date: 2009-10-06 18:07+0300\n"
 "Last-Translator: Andriy Matkovsky <sidius.ua at gmail.com>\n"
 "Language-Team: Ukrainian <xfce4-dev at xfce.org>\n"
@@ -15,311 +15,325 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../lib/screenshooter-dialogs.c:283
-msgid "Screenshot.png"
-msgstr "Знімок_екрану.png"
-
-#: ../lib/screenshooter-dialogs.c:300
-#, c-format
-msgid "Screenshot-%d.png"
-msgstr "Знімок_екрану-%d.png"
-
-#: ../lib/screenshooter-dialogs.c:493
+#: ../lib/screenshooter-dialogs.c:478
 #, c-format
 msgid "%.2fKb of %.2fKb"
 msgstr "%.2fКб з %.2fКб"
 
-#: ../lib/screenshooter-dialogs.c:577
+#: ../lib/screenshooter-dialogs.c:560
 msgid "Transfer"
 msgstr "Передача"
 
-#: ../lib/screenshooter-dialogs.c:600
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being transferred to:</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Знімок пересилається на  </span>"
+#: ../lib/screenshooter-dialogs.c:581
+msgid ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being "
+"transferred to:</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Знімок пересилається на  </"
+"span>"
 
-#: ../lib/screenshooter-dialogs.c:724
-#: ../lib/screenshooter-dialogs.c:741
+#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
 msgid "Screenshot"
 msgstr "Знімок екрану"
 
-#: ../lib/screenshooter-dialogs.c:736
+#: ../lib/screenshooter-dialogs.c:709
 msgid "Take a screenshot"
 msgstr "Отримати знімок"
 
-#: ../lib/screenshooter-dialogs.c:751
+#: ../lib/screenshooter-dialogs.c:724
 msgid "Preferences"
 msgstr "Параметри"
 
-#: ../lib/screenshooter-dialogs.c:793
+#: ../lib/screenshooter-dialogs.c:754
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Region to capture</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Область захоплення</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Область захоплення</span>"
 
-#: ../lib/screenshooter-dialogs.c:820
+#: ../lib/screenshooter-dialogs.c:774
 msgid "Entire screen"
 msgstr "Весь екран"
 
-#: ../lib/screenshooter-dialogs.c:830
-#: ../src/main.c:58
-#: ../panel-plugin/screenshooter-plugin.c:292
+#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../panel-plugin/screenshooter-plugin.c:308
 msgid "Take a screenshot of the entire screen"
 msgstr "Зробити знімок всього екрану"
 
-#: ../lib/screenshooter-dialogs.c:841
+#: ../lib/screenshooter-dialogs.c:789
 msgid "Active window"
 msgstr "Активного вікна"
 
-#: ../lib/screenshooter-dialogs.c:851
-#: ../src/main.c:104
-#: ../panel-plugin/screenshooter-plugin.c:297
+#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr "Зробити знімок активного вікна"
 
-#: ../lib/screenshooter-dialogs.c:862
+#: ../lib/screenshooter-dialogs.c:804
 msgid "Select a region"
 msgstr "Виділеної області"
 
-#: ../lib/screenshooter-dialogs.c:872
-#: ../src/main.c:78
-#: ../panel-plugin/screenshooter-plugin.c:302
-msgid "Select a region to be captured by clicking a point of the screen without releasing the mouse button, dragging your mouse to the other corner of the region, and releasing the mouse button."
-msgstr "Виберіть область для захоплення шляхом клацання мишкою на екрані і без відпускання кнопки миші пересуньте вказівник в інший кут області і тоді відпустіть кнопку миші."
+#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../panel-plugin/screenshooter-plugin.c:318
+msgid ""
+"Select a region to be captured by clicking a point of the screen without "
+"releasing the mouse button, dragging your mouse to the other corner of the "
+"region, and releasing the mouse button."
+msgstr ""
+"Виберіть область для захоплення шляхом клацання мишкою на екрані і без "
+"відпускання кнопки миші пересуньте вказівник в інший кут області і тоді "
+"відпустіть кнопку миші."
 
-#: ../lib/screenshooter-dialogs.c:884
+#: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
 msgstr "Показувати курсор миші"
 
-#: ../lib/screenshooter-dialogs.c:892
+#: ../lib/screenshooter-dialogs.c:824
 msgid "Display the mouse pointer on the screenshot"
 msgstr "Показувати курсор миші на знімку"
 
-#: ../lib/screenshooter-dialogs.c:917
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Затримка перед знімком</span>"
+#: ../lib/screenshooter-dialogs.c:840
+msgid ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Затримка перед знімком</span>"
 
-#: ../lib/screenshooter-dialogs.c:952
+#: ../lib/screenshooter-dialogs.c:862
 msgid "Delay in seconds before the screenshot is taken"
 msgstr "Затримка в секундах перед отриманням знімку екрану"
 
-#: ../lib/screenshooter-dialogs.c:958
+#: ../lib/screenshooter-dialogs.c:865
 msgid "seconds"
 msgstr "секунд"
 
-#: ../lib/screenshooter-dialogs.c:984
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Після знімку</span>"
-
-#. Display the save dialog checkbox
-#: ../lib/screenshooter-dialogs.c:1007
-msgid "Show the save dialog"
-msgstr "Відображати діалог збереження"
-
-#: ../lib/screenshooter-dialogs.c:1013
-msgid "The save dialog allows you to change the file name and the save location"
-msgstr "Діалог збереження дозволяє Вам змінити назву файлу та теку"
-
-#: ../lib/screenshooter-dialogs.c:1027
-msgid "Close the application"
-msgstr "Закрити програму"
-
-#: ../lib/screenshooter-dialogs.c:1033
-msgid "If unchecked, the current window will be displayed again after the screenshot has been taken to allow you to take several screenshots in a row"
-msgstr "Якщо вимкнено, то це вікно буде знову показано після створення знімку для того, щоб Ви могли зробити декільки знімків підряд"
+#: ../lib/screenshooter-dialogs.c:917
+msgid "Action"
+msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1056
+#: ../lib/screenshooter-dialogs.c:945
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Action</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Дія   </span>"
 
 #. Save option radio button
-#: ../lib/screenshooter-dialogs.c:1081
-msgid "Save in:"
+#: ../lib/screenshooter-dialogs.c:961
+#, fuzzy
+msgid "Save"
 msgstr "Зберегти в:"
 
-#: ../lib/screenshooter-dialogs.c:1089
+#: ../lib/screenshooter-dialogs.c:966
 msgid "Save the screenshot to a PNG file"
 msgstr "Зберегти знімок у файл PNG"
 
-#: ../lib/screenshooter-dialogs.c:1104
-msgid "Default save location"
-msgstr "Типове місце збереження знімків екрану"
-
-#: ../lib/screenshooter-dialogs.c:1114
-msgid "Set the default save location"
-msgstr "Призначити типове місце збереження знімків екрану"
-
-#: ../lib/screenshooter-dialogs.c:1127
+#: ../lib/screenshooter-dialogs.c:975
 msgid "Copy to the clipboard"
 msgstr "Копіювати в буфер обміну"
 
-#: ../lib/screenshooter-dialogs.c:1132
+#: ../lib/screenshooter-dialogs.c:977
 msgid "Copy the screenshot to the clipboard so that it can be pasted later"
 msgstr "Копіювати знімок в буфер, що можна було вставити його пізніше"
 
-#: ../lib/screenshooter-dialogs.c:1147
+#: ../lib/screenshooter-dialogs.c:994
 msgid "Open with:"
 msgstr "Відкрити з:"
 
-#: ../lib/screenshooter-dialogs.c:1158
+#: ../lib/screenshooter-dialogs.c:1000
 msgid "Open the screenshot with the chosen application"
 msgstr "Відкрити знімок екрану вибраною програмою"
 
-#: ../lib/screenshooter-dialogs.c:1191
-#: ../src/main.c:73
+#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
 msgid "Application to open the screenshot"
 msgstr "Програма для відкриття знімку екрану"
 
-#: ../lib/screenshooter-dialogs.c:1204
+#: ../lib/screenshooter-dialogs.c:1028
 msgid "Host on ZimageZ"
 msgstr "Розмістити на ZimageZ"
 
-#: ../lib/screenshooter-dialogs.c:1210
-#: ../src/main.c:92
+#: ../lib/screenshooter-dialogs.c:1032 ../src/main.c:80
 msgid "Host the screenshot on ZimageZ, a free online image hosting service"
 msgstr "Розмістити знімок на ZimageZ, вільний сервіс для розміщення зображень"
 
-#: ../lib/screenshooter-dialogs.c:1255
+#: ../lib/screenshooter-dialogs.c:1046
+#, fuzzy
+msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Preview</span>"
+msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Посилання</span>"
+
+#: ../lib/screenshooter-dialogs.c:1107
 msgid "Save screenshot as..."
 msgstr "Зберегти знімок як..."
 
-#. Start the user XML RPC session
-#: ../lib/screenshooter-zimagez.c:159
-msgid "Initialize the connection..."
-msgstr "Почати з'єднання..."
+#: ../lib/screenshooter-zimagez.c:134
+#, fuzzy, c-format
+msgid "An error occured when creating the XMLRPC request."
+msgstr "Сталась помилка під час завантаження знімку."
+
+#: ../lib/screenshooter-zimagez.c:153
+#, fuzzy, c-format
+msgid "An error occured when transfering the data to ZimageZ."
+msgstr "Сталась помилка під час завантаження знімку."
+
+#: ../lib/screenshooter-zimagez.c:178
+#, fuzzy, c-format
+msgid "An error occured when parsing the response from ZimageZ."
+msgstr "Сталась помилка під час завантаження знімку."
 
-#: ../lib/screenshooter-zimagez.c:172
-#: ../lib/screenshooter-zimagez.c:332
-#: ../lib/screenshooter-zimagez.c:361
-#: ../lib/screenshooter-zimagez.c:389
-#: ../lib/screenshooter-zimagez.c:520
-#: ../lib/screenshooter-zimagez.c:543
-#: ../lib/screenshooter-zimagez.c:580
+#: ../lib/screenshooter-zimagez.c:228
 #, c-format
-msgid ""
-"An error occurred during the XML exchange: %s (%d).\n"
-" The screenshot could not be uploaded."
+msgid "Taken on %s, at %s"
 msgstr ""
-"Сталася помилка під час XML обміну: %s (%d).\n"
-" Знімок не завантажено."
 
-#: ../lib/screenshooter-zimagez.c:223
+#. Start the user soup session
+#: ../lib/screenshooter-zimagez.c:295
+msgid "Initialize the connection..."
+msgstr "Почати з'єднання..."
+
+#: ../lib/screenshooter-zimagez.c:341
 msgid ""
-"Please file the following fields with your <a href=\"http://www.zimagez.com\">ZimageZ</a> \n"
+"Please file the following fields with your <a href=\"http://www.zimagez.com"
+"\">ZimageZ</a> \n"
 "user name, passsword and details about the screenshot."
-msgstr "Будь ласка, заповніть відповідні поля Вашими ім'ям користувача, паролем та інформацією щодо знімку на <a href=\"http://www.zimagez.com\">ZimageZ</a>"
+msgstr ""
+"Будь ласка, заповніть відповідні поля Вашими ім'ям користувача, паролем та "
+"інформацією щодо знімку на <a href=\"http://www.zimagez.com\">ZimageZ</a>"
 
-#: ../lib/screenshooter-zimagez.c:283
+#: ../lib/screenshooter-zimagez.c:398
 msgid "Check the user information..."
 msgstr "Перевірте інформацію про користувача..."
 
-#: ../lib/screenshooter-zimagez.c:305
-msgid "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You must fill all the fields.</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Ви маєте заповнити всі поля</span>"
+#: ../lib/screenshooter-zimagez.c:405
+msgid ""
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You "
+"must fill all the fields.</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Ви маєте заповнити всі поля</"
+"span>"
 
-#: ../lib/screenshooter-zimagez.c:320
+#: ../lib/screenshooter-zimagez.c:419
 msgid "Login on ZimageZ..."
 msgstr "Вхід на ZimageZ..."
 
-#: ../lib/screenshooter-zimagez.c:436
-msgid "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The user and the password you entered do not match. Please retry.</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Ім'я користувача та пароль, що Ви ввели, не підходять. Будь ласка, спробуйте ще раз.</span>"
+#: ../lib/screenshooter-zimagez.c:459 ../lib/screenshooter-zimagez.c:610
+msgid ""
+"An unexpected reply from ZimageZ was received. The upload of the screenshot "
+"failed."
+msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:501
+#: ../lib/screenshooter-zimagez.c:498
+msgid ""
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The "
+"user and the password you entered do not match. Please retry.</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Ім'я користувача та пароль, "
+"що Ви ввели, не підходять. Будь ласка, спробуйте ще раз.</span>"
+
+#: ../lib/screenshooter-zimagez.c:556
 msgid "Upload the screenshot..."
 msgstr "Завантажити знімок екрану..."
 
-#: ../lib/screenshooter-zimagez.c:559
+#: ../lib/screenshooter-zimagez.c:589
 #, c-format
 msgid "An error occurred while uploading the screenshot."
 msgstr "Сталась помилка під час завантаження знімку."
 
 #. End the user session
-#: ../lib/screenshooter-zimagez.c:597
+#: ../lib/screenshooter-zimagez.c:622
 msgid "Close the session on ZimageZ..."
 msgstr "Закінчити сессію з ZimageZ..."
 
-#: ../lib/screenshooter-zimagez.c:650
+#: ../lib/screenshooter-zimagez.c:692
 msgid "Details about the screenshot for ZimageZ"
 msgstr "Деталі щодо знімку для ZimageZ"
 
 #. Create the user label
-#: ../lib/screenshooter-zimagez.c:692
+#: ../lib/screenshooter-zimagez.c:734
 msgid "User:"
 msgstr "Користувач:"
 
-#: ../lib/screenshooter-zimagez.c:703
-msgid "Your Zimagez user name, if you do not have one yet please create one on the Web page linked above"
-msgstr "Ваше ім'я користувача на Zimagez. Якщо немає, то зареєструйтесь на веб-сайті"
+#: ../lib/screenshooter-zimagez.c:745
+msgid ""
+"Your Zimagez user name, if you do not have one yet please create one on the "
+"Web page linked above"
+msgstr ""
+"Ваше ім'я користувача на Zimagez. Якщо немає, то зареєструйтесь на веб-сайті"
 
 #. Create the password label
-#: ../lib/screenshooter-zimagez.c:708
+#: ../lib/screenshooter-zimagez.c:751
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../lib/screenshooter-zimagez.c:718
+#: ../lib/screenshooter-zimagez.c:761
 msgid "The password for the user above"
 msgstr "Пароль для користувача вище"
 
 #. Create the title label
-#: ../lib/screenshooter-zimagez.c:723
+#: ../lib/screenshooter-zimagez.c:767
 msgid "Title:"
 msgstr "Заголовок:"
 
-#: ../lib/screenshooter-zimagez.c:733
-msgid "The title of the screenshot, it will be used when displaying the screenshot on ZimageZ"
+#: ../lib/screenshooter-zimagez.c:777
+msgid ""
+"The title of the screenshot, it will be used when displaying the screenshot "
+"on ZimageZ"
 msgstr "Заголовок знімку. Буде використано при відображенні на ZimageZ"
 
 #. Create the comment label
-#: ../lib/screenshooter-zimagez.c:738
+#: ../lib/screenshooter-zimagez.c:783
 msgid "Comment:"
 msgstr "Комментар"
 
-#: ../lib/screenshooter-zimagez.c:749
-msgid "A comment on the screenshot, it will be used when displaying the screenshot on ZimageZ"
+#: ../lib/screenshooter-zimagez.c:794
+msgid ""
+"A comment on the screenshot, it will be used when displaying the screenshot "
+"on ZimageZ"
 msgstr "Комментар до знімку. Буде використано при відображенні на ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:870
+#: ../lib/screenshooter-zimagez.c:917
 #, c-format
 msgid "<a href=\"%s\">Full size image</a>"
 msgstr "<a href=\"%s\">Повнорозмірне зображення</a>"
 
-#: ../lib/screenshooter-zimagez.c:872
+#: ../lib/screenshooter-zimagez.c:919
 #, c-format
 msgid "<a href=\"%s\">Large thumbnail</a>"
 msgstr "<a href=\"%s\">Велике зображення попереднього перегляду</a>"
 
-#: ../lib/screenshooter-zimagez.c:874
+#: ../lib/screenshooter-zimagez.c:921
 #, c-format
 msgid "<a href=\"%s\">Small thumbnail</a>"
 msgstr "<a href=\"%s\">Маленьке зображення попереднього перегляду</a>"
 
-#: ../lib/screenshooter-zimagez.c:894
+#: ../lib/screenshooter-zimagez.c:937
 msgid "My screenshot on ZimageZ"
 msgstr "Мій знімок на ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:920
+#: ../lib/screenshooter-zimagez.c:963
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Links</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Посилання</span>"
 
-#: ../lib/screenshooter-zimagez.c:965
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing to the full size image</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Код для попереднього перекладу, що веде до оригіналу</span>"
+#: ../lib/screenshooter-zimagez.c:1008
+msgid ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing "
+"to the full size image</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Код для попереднього "
+"перекладу, що веде до оригіналу</span>"
 
 #. HTML title
-#: ../lib/screenshooter-zimagez.c:981
+#: ../lib/screenshooter-zimagez.c:1024
 msgid "HTML"
 msgstr "HTML"
 
 #. BB title
-#: ../lib/screenshooter-zimagez.c:1002
+#: ../lib/screenshooter-zimagez.c:1045
 msgid "BBCode for forums"
 msgstr "BB Код для форумів"
 
-#: ../lib/screenshooter-zimagez.c:1122
+#: ../lib/screenshooter-zimagez.c:1174
 msgid "ZimageZ"
 msgstr "ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:1155
+#: ../lib/screenshooter-zimagez.c:1207
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Status</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Статус </span>"
 
@@ -333,45 +347,100 @@ msgstr "Перейти за п_осиланням:"
 msgid "Copy _Link Address"
 msgstr "Зкопіювати адресу _посилання"
 
-#: ../src/main.c:53
+#: ../src/main.c:48
 msgid "Delay in seconds before taking the screenshot"
 msgstr "Затримка в секундах перед отриманням знімку"
 
-#: ../src/main.c:63
-msgid "Do not display the save dialog"
-msgstr "Не відображати діалог збереження"
-
-#: ../src/main.c:68
-msgid "Do not display the mouse on the screenshot"
+#: ../src/main.c:58
+#, fuzzy
+msgid "Display the mouse on the screenshot"
 msgstr "Не показувати курсор на знімку"
 
-#: ../src/main.c:85
+#: ../src/main.c:75
 msgid "Directory where the screenshot will be saved"
 msgstr "Тека, де зберігатимуться знімки екрану"
 
-#: ../src/main.c:99
+#: ../src/main.c:85
 msgid "Version information"
 msgstr "Інформація про версію"
 
+#: ../src/main.c:134
+#, c-format
+msgid "Conflicting options: --%s and --%s cannot be used at the same time.\n"
+msgstr ""
+
 #: ../src/main.c:136
 #, c-format
 msgid ""
+"The --%s option is only used when --fullscreen, --window or --region is "
+"given. It will be ignored.\n"
+msgstr ""
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
 "%s: %s\n"
-"Спробуйте, %s --help щоб побачити повний список доступних опцій командного рядка.\n"
+"Спробуйте, %s --help щоб побачити повний список доступних опцій командного "
+"рядка.\n"
 
-#: ../src/main.c:235
+#: ../src/main.c:282
 #, c-format
 msgid "%s is not a valid directory, the default directory will be used."
 msgstr "%s не є правильною текою, буде використано типову теку."
 
 #: ../src/xfce4-screenshooter.desktop.in.in.h:2
 #: ../panel-plugin/screenshooter.desktop.in.in.h:2
-msgid "Take screenshots of the entire screen, of the active window or of a region"
+msgid ""
+"Take screenshots of the entire screen, of the active window or of a region"
 msgstr "Отримати знімки всього екрану, активного вікна або окремої області"
 
+#~ msgid "Screenshot.png"
+#~ msgstr "Знімок_екрану.png"
+
+#~ msgid "Screenshot-%d.png"
+#~ msgstr "Знімок_екрану-%d.png"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
+#~ msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Після знімку</span>"
+
+#~ msgid "Show the save dialog"
+#~ msgstr "Відображати діалог збереження"
+
+#~ msgid ""
+#~ "The save dialog allows you to change the file name and the save location"
+#~ msgstr "Діалог збереження дозволяє Вам змінити назву файлу та теку"
+
+#~ msgid "Close the application"
+#~ msgstr "Закрити програму"
+
+#~ msgid ""
+#~ "If unchecked, the current window will be displayed again after the "
+#~ "screenshot has been taken to allow you to take several screenshots in a "
+#~ "row"
+#~ msgstr ""
+#~ "Якщо вимкнено, то це вікно буде знову показано після створення знімку для "
+#~ "того, щоб Ви могли зробити декільки знімків підряд"
+
+#~ msgid "Default save location"
+#~ msgstr "Типове місце збереження знімків екрану"
+
+#~ msgid "Set the default save location"
+#~ msgstr "Призначити типове місце збереження знімків екрану"
+
+#~ msgid ""
+#~ "An error occurred during the XML exchange: %s (%d).\n"
+#~ " The screenshot could not be uploaded."
+#~ msgstr ""
+#~ "Сталася помилка під час XML обміну: %s (%d).\n"
+#~ " Знімок не завантажено."
+
+#~ msgid "Do not display the save dialog"
+#~ msgstr "Не відображати діалог збереження"
+
 #, fuzzy
 #~ msgid "Tak a screenshot of the entire screen"
 #~ msgstr "Зробити знімок всього екрану"
@@ -383,12 +452,13 @@ msgstr "Отримати знімки всього екрану, активно
 #, fuzzy
 #~ msgid "Display the save dialog"
 #~ msgstr "Не відображати діалог збереження"
+
 #~ msgid "Save by default to:"
 #~ msgstr "Зберегти по замовчанню в:"
+
 #~ msgid ""
 #~ "If checked, the screenshot will be saved by default to the location set "
 #~ "on the right without displaying a save dialog"
 #~ msgstr ""
 #~ "Якщо відмічено знімок буде збережено до типового місця, що визначено "
 #~ "справа, причому без відображення діалогу збереження"
-
diff --git a/po/ur.po b/po/ur.po
index 01701f2..70ece6f 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-screenshooter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-31 14:02+0200\n"
+"POT-Creation-Date: 2009-11-15 00:29+0100\n"
 "PO-Revision-Date: 2009-06-09 01:12+0500\n"
 "Last-Translator: Muhammad Ali Makki <makki.ma at gmail.com>\n"
 "Language-Team: Urdu <makki.ma at gmail.com>\n"
@@ -19,313 +19,325 @@ msgstr ""
 "X-Poedit-Country: PAKISTAN\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../lib/screenshooter-dialogs.c:283
-msgid "Screenshot.png"
-msgstr "Screenshot.png"
-
-#: ../lib/screenshooter-dialogs.c:300
-#, c-format
-msgid "Screenshot-%d.png"
-msgstr "Screenshot-%d.png"
-
-#: ../lib/screenshooter-dialogs.c:493
+#: ../lib/screenshooter-dialogs.c:478
 #, c-format
 msgid "%.2fKb of %.2fKb"
 msgstr "%.2fKb of %.2fKb"
 
-#: ../lib/screenshooter-dialogs.c:577
+#: ../lib/screenshooter-dialogs.c:560
 msgid "Transfer"
 msgstr "منتقل"
 
-#: ../lib/screenshooter-dialogs.c:600
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being transferred to:</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">سکرین شاٹ منتقل کیا جارہا ہے تا:</span>"
+#: ../lib/screenshooter-dialogs.c:581
+msgid ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being "
+"transferred to:</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">سکرین شاٹ منتقل کیا جارہا ہے "
+"تا:</span>"
 
-#: ../lib/screenshooter-dialogs.c:724
-#: ../lib/screenshooter-dialogs.c:741
+#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
 msgid "Screenshot"
 msgstr "سکرین شوٹ"
 
-#: ../lib/screenshooter-dialogs.c:736
+#: ../lib/screenshooter-dialogs.c:709
 msgid "Take a screenshot"
 msgstr "تصویر اتاریں"
 
-#: ../lib/screenshooter-dialogs.c:751
+#: ../lib/screenshooter-dialogs.c:724
 msgid "Preferences"
 msgstr "ترجیحات"
 
-#: ../lib/screenshooter-dialogs.c:793
+#: ../lib/screenshooter-dialogs.c:754
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Region to capture</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">اتارنے کا رقبہ</span>"
 
-#: ../lib/screenshooter-dialogs.c:820
+#: ../lib/screenshooter-dialogs.c:774
 msgid "Entire screen"
 msgstr "پوری سکرین"
 
-#: ../lib/screenshooter-dialogs.c:830
-#: ../src/main.c:58
-#: ../panel-plugin/screenshooter-plugin.c:292
+#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../panel-plugin/screenshooter-plugin.c:308
 msgid "Take a screenshot of the entire screen"
 msgstr "پوری سکرین کی تصویر اتاریں"
 
-#: ../lib/screenshooter-dialogs.c:841
+#: ../lib/screenshooter-dialogs.c:789
 msgid "Active window"
 msgstr "فعال ونڈو"
 
-#: ../lib/screenshooter-dialogs.c:851
-#: ../src/main.c:104
-#: ../panel-plugin/screenshooter-plugin.c:297
+#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr "فعال ونڈو کی تصویر اتاریں"
 
-#: ../lib/screenshooter-dialogs.c:862
+#: ../lib/screenshooter-dialogs.c:804
 msgid "Select a region"
 msgstr "علاقہ منتخب کریں"
 
-#: ../lib/screenshooter-dialogs.c:872
-#: ../src/main.c:78
-#: ../panel-plugin/screenshooter-plugin.c:302
-msgid "Select a region to be captured by clicking a point of the screen without releasing the mouse button, dragging your mouse to the other corner of the region, and releasing the mouse button."
-msgstr "کسی مخصوص علاقے کی تصویر اتارنے کے لیے پؤائنٹر کو اس مقام پر لے جا کر کلک کر کے اس مقام کے دوسرے کونے تک لے جائیں اور ماؤس کا بٹن چھوڑ دیں."
+#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../panel-plugin/screenshooter-plugin.c:318
+msgid ""
+"Select a region to be captured by clicking a point of the screen without "
+"releasing the mouse button, dragging your mouse to the other corner of the "
+"region, and releasing the mouse button."
+msgstr ""
+"کسی مخصوص علاقے کی تصویر اتارنے کے لیے پؤائنٹر کو اس مقام پر لے جا کر کلک کر "
+"کے اس مقام کے دوسرے کونے تک لے جائیں اور ماؤس کا بٹن چھوڑ دیں."
 
-#: ../lib/screenshooter-dialogs.c:884
+#: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
 msgstr "ماؤس کے پؤائنٹر کو اتاریں"
 
-#: ../lib/screenshooter-dialogs.c:892
+#: ../lib/screenshooter-dialogs.c:824
 msgid "Display the mouse pointer on the screenshot"
 msgstr "تصویر پر ماؤس کا پؤائنٹر دکھائیں"
 
-#: ../lib/screenshooter-dialogs.c:917
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">تصویر اتارنے سے پہلے وقفہ</span>"
+#: ../lib/screenshooter-dialogs.c:840
+msgid ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">تصویر اتارنے سے پہلے وقفہ</"
+"span>"
 
-#: ../lib/screenshooter-dialogs.c:952
+#: ../lib/screenshooter-dialogs.c:862
 msgid "Delay in seconds before the screenshot is taken"
 msgstr "تصویر اتارنے سے پہلے سیکنڈوں میں وقفہ"
 
-#: ../lib/screenshooter-dialogs.c:958
+#: ../lib/screenshooter-dialogs.c:865
 msgid "seconds"
 msgstr "سیکنڈ"
 
-#: ../lib/screenshooter-dialogs.c:984
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">تصویر اتارنے کے بعد</span>"
-
-#. Display the save dialog checkbox
-#: ../lib/screenshooter-dialogs.c:1007
-msgid "Show the save dialog"
-msgstr "محفوظ کرنے کا ڈائیلاگ دکھائیں"
-
-#: ../lib/screenshooter-dialogs.c:1013
-msgid "The save dialog allows you to change the file name and the save location"
-msgstr "محفوظ کرنے کے ڈائیلاگ سے آپ فائل کا نام اور محفوظ کرنے کا مقام بدل سکتے ہیں"
-
-#: ../lib/screenshooter-dialogs.c:1027
-msgid "Close the application"
-msgstr "اطلاقیہ بند کریں"
-
-#: ../lib/screenshooter-dialogs.c:1033
-msgid "If unchecked, the current window will be displayed again after the screenshot has been taken to allow you to take several screenshots in a row"
-msgstr "اگر غیر نشان زدہ کیا گیا، تو حالیہ ونڈو تصویر اتارنے کے بعد دوبارہ ظاہر ہوگی تاکہ آپ متعدد تصاویر اتار سکیں"
+#: ../lib/screenshooter-dialogs.c:917
+msgid "Action"
+msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1056
+#: ../lib/screenshooter-dialogs.c:945
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Action</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">حرکت</span>"
 
 #. Save option radio button
-#: ../lib/screenshooter-dialogs.c:1081
-msgid "Save in:"
+#: ../lib/screenshooter-dialogs.c:961
+#, fuzzy
+msgid "Save"
 msgstr "محفوظ کریں:"
 
-#: ../lib/screenshooter-dialogs.c:1089
+#: ../lib/screenshooter-dialogs.c:966
 msgid "Save the screenshot to a PNG file"
 msgstr "تصویر کو PNG فائل میں مفوظ کریں"
 
-#: ../lib/screenshooter-dialogs.c:1104
-msgid "Default save location"
-msgstr "محفوظ کرنے کا طے شدہ مقام"
-
-#: ../lib/screenshooter-dialogs.c:1114
-msgid "Set the default save location"
-msgstr "محفوظ کرنے کا طے شدہ مقام مرتب کریں"
-
-#: ../lib/screenshooter-dialogs.c:1127
+#: ../lib/screenshooter-dialogs.c:975
 msgid "Copy to the clipboard"
 msgstr "کلپ بورڈ پر کاپی کریں"
 
-#: ../lib/screenshooter-dialogs.c:1132
+#: ../lib/screenshooter-dialogs.c:977
 msgid "Copy the screenshot to the clipboard so that it can be pasted later"
 msgstr "تصویر کو کلپ بورڈ پر کاپی کریں چنانچہ بعد میں آپ اسے پیسٹ کر سکیں گے"
 
-#: ../lib/screenshooter-dialogs.c:1147
+#: ../lib/screenshooter-dialogs.c:994
 msgid "Open with:"
 msgstr "کھولیں بذریعہ:"
 
-#: ../lib/screenshooter-dialogs.c:1158
+#: ../lib/screenshooter-dialogs.c:1000
 msgid "Open the screenshot with the chosen application"
 msgstr "تصویر کو منتخب کردہ اطلاقیہ میں کھولیں"
 
-#: ../lib/screenshooter-dialogs.c:1191
-#: ../src/main.c:73
+#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
 msgid "Application to open the screenshot"
 msgstr "تصویر کو کھولنے کا اطلاقیہ"
 
-#: ../lib/screenshooter-dialogs.c:1204
+#: ../lib/screenshooter-dialogs.c:1028
 msgid "Host on ZimageZ"
 msgstr "ZimageZ پر ہوسٹ کریں"
 
-#: ../lib/screenshooter-dialogs.c:1210
-#: ../src/main.c:92
+#: ../lib/screenshooter-dialogs.c:1032 ../src/main.c:80
 msgid "Host the screenshot on ZimageZ, a free online image hosting service"
 msgstr "تصویر ZimageZ پر ہوسٹ کریں، ایک مفت آن لائن تصاویر ہوسٹنگ سروس"
 
-#: ../lib/screenshooter-dialogs.c:1255
+#: ../lib/screenshooter-dialogs.c:1046
+#, fuzzy
+msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Preview</span>"
+msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">روابط</span>"
+
+#: ../lib/screenshooter-dialogs.c:1107
 msgid "Save screenshot as..."
 msgstr "تصویر محفوظ کریں بنام..."
 
-#. Start the user XML RPC session
-#: ../lib/screenshooter-zimagez.c:159
-msgid "Initialize the connection..."
-msgstr "اتصال تیار کیا جارہا ہے..."
+#: ../lib/screenshooter-zimagez.c:134
+#, fuzzy, c-format
+msgid "An error occured when creating the XMLRPC request."
+msgstr "تصویر اپلوڈ کرنے کے دوران غلطی."
 
-#: ../lib/screenshooter-zimagez.c:172
-#: ../lib/screenshooter-zimagez.c:332
-#: ../lib/screenshooter-zimagez.c:361
-#: ../lib/screenshooter-zimagez.c:389
-#: ../lib/screenshooter-zimagez.c:520
-#: ../lib/screenshooter-zimagez.c:543
-#: ../lib/screenshooter-zimagez.c:580
+#: ../lib/screenshooter-zimagez.c:153
+#, fuzzy, c-format
+msgid "An error occured when transfering the data to ZimageZ."
+msgstr "تصویر اپلوڈ کرنے کے دوران غلطی."
+
+#: ../lib/screenshooter-zimagez.c:178
+#, fuzzy, c-format
+msgid "An error occured when parsing the response from ZimageZ."
+msgstr "تصویر اپلوڈ کرنے کے دوران غلطی."
+
+#: ../lib/screenshooter-zimagez.c:228
 #, c-format
-msgid ""
-"An error occurred during the XML exchange: %s (%d).\n"
-" The screenshot could not be uploaded."
+msgid "Taken on %s, at %s"
 msgstr ""
-"ایکس ایم ایل XML کی تبدیلی کے دوران غلطی ہوئی ہے: %s (%d).\n"
-" تصویر اپلوڈ نہیں کی جاسکتی."
 
-#: ../lib/screenshooter-zimagez.c:223
+#. Start the user soup session
+#: ../lib/screenshooter-zimagez.c:295
+msgid "Initialize the connection..."
+msgstr "اتصال تیار کیا جارہا ہے..."
+
+#: ../lib/screenshooter-zimagez.c:341
 msgid ""
-"Please file the following fields with your <a href=\"http://www.zimagez.com\">ZimageZ</a> \n"
+"Please file the following fields with your <a href=\"http://www.zimagez.com"
+"\">ZimageZ</a> \n"
 "user name, passsword and details about the screenshot."
 msgstr ""
 "مندرجہ خانوں میں اپنے <a href=\"http://www.zimagez.com\">ZimageZ</a>\n"
 "کے اسمِ صارف، پاس ورڈ اور تصویر کی تفصیلات فراہم کریں."
 
-#: ../lib/screenshooter-zimagez.c:283
+#: ../lib/screenshooter-zimagez.c:398
 msgid "Check the user information..."
 msgstr "صارف کی معلومات کی تصدیق..."
 
-#: ../lib/screenshooter-zimagez.c:305
-msgid "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You must fill all the fields.</span>"
-msgstr "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">تمام خانے بھرنے لازمی ہیں.</span>"
+#: ../lib/screenshooter-zimagez.c:405
+msgid ""
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You "
+"must fill all the fields.</span>"
+msgstr ""
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">تمام "
+"خانے بھرنے لازمی ہیں.</span>"
 
-#: ../lib/screenshooter-zimagez.c:320
+#: ../lib/screenshooter-zimagez.c:419
 msgid "Login on ZimageZ..."
 msgstr "ZimageZ پر لاگ ان ہوں..."
 
-#: ../lib/screenshooter-zimagez.c:436
-msgid "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The user and the password you entered do not match. Please retry.</span>"
-msgstr "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">صارف اور پاس ورڈ جو آپ نے داخل کیے ہیں مطابقت نہیں رکھتے. دوبارہ کوشش کریں.</span>"
+#: ../lib/screenshooter-zimagez.c:459 ../lib/screenshooter-zimagez.c:610
+msgid ""
+"An unexpected reply from ZimageZ was received. The upload of the screenshot "
+"failed."
+msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:501
+#: ../lib/screenshooter-zimagez.c:498
+msgid ""
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The "
+"user and the password you entered do not match. Please retry.</span>"
+msgstr ""
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">صارف "
+"اور پاس ورڈ جو آپ نے داخل کیے ہیں مطابقت نہیں رکھتے. دوبارہ کوشش کریں.</span>"
+
+#: ../lib/screenshooter-zimagez.c:556
 msgid "Upload the screenshot..."
 msgstr "تصویر اپلوڈ کریں"
 
-#: ../lib/screenshooter-zimagez.c:559
+#: ../lib/screenshooter-zimagez.c:589
 #, c-format
 msgid "An error occurred while uploading the screenshot."
 msgstr "تصویر اپلوڈ کرنے کے دوران غلطی."
 
 #. End the user session
-#: ../lib/screenshooter-zimagez.c:597
+#: ../lib/screenshooter-zimagez.c:622
 msgid "Close the session on ZimageZ..."
 msgstr "ZimageZ پر نشست بند کریں..."
 
-#: ../lib/screenshooter-zimagez.c:650
+#: ../lib/screenshooter-zimagez.c:692
 msgid "Details about the screenshot for ZimageZ"
 msgstr "تصویر کی بابت تفصیل برائے ZimageZ"
 
 #. Create the user label
-#: ../lib/screenshooter-zimagez.c:692
+#: ../lib/screenshooter-zimagez.c:734
 msgid "User:"
 msgstr "اسمِ صارف:"
 
-#: ../lib/screenshooter-zimagez.c:703
-msgid "Your Zimagez user name, if you do not have one yet please create one on the Web page linked above"
-msgstr "آپ کا ZimageZ کا اسمِ صارف، اگر آپ کے پاس کھاتہ نہیں ہے تو ازراہِ کرم اوپر کے ویب صفحہ کے ربط پر جاکر ایک بنا لیں"
+#: ../lib/screenshooter-zimagez.c:745
+msgid ""
+"Your Zimagez user name, if you do not have one yet please create one on the "
+"Web page linked above"
+msgstr ""
+"آپ کا ZimageZ کا اسمِ صارف، اگر آپ کے پاس کھاتہ نہیں ہے تو ازراہِ کرم اوپر کے "
+"ویب صفحہ کے ربط پر جاکر ایک بنا لیں"
 
 #. Create the password label
-#: ../lib/screenshooter-zimagez.c:708
+#: ../lib/screenshooter-zimagez.c:751
 msgid "Password:"
 msgstr "پاس ورڈ:"
 
-#: ../lib/screenshooter-zimagez.c:718
+#: ../lib/screenshooter-zimagez.c:761
 msgid "The password for the user above"
 msgstr "اوپر کے صارف کا پاس ورڈ"
 
 #. Create the title label
-#: ../lib/screenshooter-zimagez.c:723
+#: ../lib/screenshooter-zimagez.c:767
 msgid "Title:"
 msgstr "عنوان:"
 
-#: ../lib/screenshooter-zimagez.c:733
-msgid "The title of the screenshot, it will be used when displaying the screenshot on ZimageZ"
+#: ../lib/screenshooter-zimagez.c:777
+msgid ""
+"The title of the screenshot, it will be used when displaying the screenshot "
+"on ZimageZ"
 msgstr "تصویر کا عنوان، یہ تب استعمال ہوگا جب تصویر ZimageZ پر ظاہر ہوگی"
 
 #. Create the comment label
-#: ../lib/screenshooter-zimagez.c:738
+#: ../lib/screenshooter-zimagez.c:783
 msgid "Comment:"
 msgstr "تبصرہ:"
 
-#: ../lib/screenshooter-zimagez.c:749
-msgid "A comment on the screenshot, it will be used when displaying the screenshot on ZimageZ"
+#: ../lib/screenshooter-zimagez.c:794
+msgid ""
+"A comment on the screenshot, it will be used when displaying the screenshot "
+"on ZimageZ"
 msgstr "تصویر پر تبصرہ، یہ تب استعمال ہوگا جب تصویر ZimageZ پر ظاہر ہوگی"
 
-#: ../lib/screenshooter-zimagez.c:870
+#: ../lib/screenshooter-zimagez.c:917
 #, c-format
 msgid "<a href=\"%s\">Full size image</a>"
 msgstr "<a href=\"%s\">پورے حجم کی تصویر</a>"
 
-#: ../lib/screenshooter-zimagez.c:872
+#: ../lib/screenshooter-zimagez.c:919
 #, c-format
 msgid "<a href=\"%s\">Large thumbnail</a>"
 msgstr "<a href=\"%s\">بڑا تصویرچہ</a>"
 
-#: ../lib/screenshooter-zimagez.c:874
+#: ../lib/screenshooter-zimagez.c:921
 #, c-format
 msgid "<a href=\"%s\">Small thumbnail</a>"
 msgstr "<a href=\"%s\">چھوٹا تصویرچہ</a>"
 
-#: ../lib/screenshooter-zimagez.c:894
+#: ../lib/screenshooter-zimagez.c:937
 msgid "My screenshot on ZimageZ"
 msgstr "میری تصاویر ZimageZ پر"
 
-#: ../lib/screenshooter-zimagez.c:920
+#: ../lib/screenshooter-zimagez.c:963
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Links</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">روابط</span>"
 
-#: ../lib/screenshooter-zimagez.c:965
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing to the full size image</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">کوڈ برائے تصویرچہ جس پر بڑی تصویر کا ربط ہے</span>"
+#: ../lib/screenshooter-zimagez.c:1008
+msgid ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing "
+"to the full size image</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">کوڈ برائے تصویرچہ جس پر بڑی "
+"تصویر کا ربط ہے</span>"
 
 #. HTML title
-#: ../lib/screenshooter-zimagez.c:981
+#: ../lib/screenshooter-zimagez.c:1024
 msgid "HTML"
 msgstr "HTML"
 
 #. BB title
-#: ../lib/screenshooter-zimagez.c:1002
+#: ../lib/screenshooter-zimagez.c:1045
 msgid "BBCode for forums"
 msgstr "بی بی کوڈ برائے فورمز"
 
-#: ../lib/screenshooter-zimagez.c:1122
+#: ../lib/screenshooter-zimagez.c:1174
 msgid "ZimageZ"
 msgstr "ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:1155
+#: ../lib/screenshooter-zimagez.c:1207
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Status</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">حالت</span>"
 
@@ -339,42 +351,98 @@ msgstr "_ربط کھولیں"
 msgid "Copy _Link Address"
 msgstr "_ربط کا پتہ کاپی کریں"
 
-#: ../src/main.c:53
+#: ../src/main.c:48
 msgid "Delay in seconds before taking the screenshot"
 msgstr "تصویر اتارنے سے پہلے سیکنڈوں میں وقفہ"
 
-#: ../src/main.c:63
-msgid "Do not display the save dialog"
-msgstr "محفوظ کرنے کا ڈائیلاگ مت دکھائیں"
-
-#: ../src/main.c:68
-msgid "Do not display the mouse on the screenshot"
+#: ../src/main.c:58
+#, fuzzy
+msgid "Display the mouse on the screenshot"
 msgstr "ماؤس کو سکرین پر مت دکھائیں"
 
-#: ../src/main.c:85
+#: ../src/main.c:75
 msgid "Directory where the screenshot will be saved"
 msgstr "ڈائریکٹری جہاں تصویر محفوظ کی جائے گی"
 
-#: ../src/main.c:99
+#: ../src/main.c:85
 msgid "Version information"
 msgstr "ورژن کی معلومات"
 
+#: ../src/main.c:134
+#, c-format
+msgid "Conflicting options: --%s and --%s cannot be used at the same time.\n"
+msgstr ""
+
 #: ../src/main.c:136
 #, c-format
 msgid ""
+"The --%s option is only used when --fullscreen, --window or --region is "
+"given. It will be ignored.\n"
+msgstr ""
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
 "%s: %s\n"
 "تمام دستیاب کمانڈ لائن اختیارات کی فہرست کے لیے %s --help لکھیں.\n"
 
-#: ../src/main.c:235
+#: ../src/main.c:282
 #, c-format
 msgid "%s is not a valid directory, the default directory will be used."
 msgstr "%s موزوں دائریکٹری نہیں ہے، طے شدہ ڈائریکٹری استعمال کی جائے گی."
 
 #: ../src/xfce4-screenshooter.desktop.in.in.h:2
 #: ../panel-plugin/screenshooter.desktop.in.in.h:2
-msgid "Take screenshots of the entire screen, of the active window or of a region"
+msgid ""
+"Take screenshots of the entire screen, of the active window or of a region"
 msgstr "پوری سکرین، فعال ونڈو یا مخصوص علاقے کی تصویر اتاریں"
 
+#~ msgid "Screenshot.png"
+#~ msgstr "Screenshot.png"
+
+#~ msgid "Screenshot-%d.png"
+#~ msgstr "Screenshot-%d.png"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">تصویر اتارنے کے بعد</span>"
+
+#~ msgid "Show the save dialog"
+#~ msgstr "محفوظ کرنے کا ڈائیلاگ دکھائیں"
+
+#~ msgid ""
+#~ "The save dialog allows you to change the file name and the save location"
+#~ msgstr ""
+#~ "محفوظ کرنے کے ڈائیلاگ سے آپ فائل کا نام اور محفوظ کرنے کا مقام بدل سکتے "
+#~ "ہیں"
+
+#~ msgid "Close the application"
+#~ msgstr "اطلاقیہ بند کریں"
+
+#~ msgid ""
+#~ "If unchecked, the current window will be displayed again after the "
+#~ "screenshot has been taken to allow you to take several screenshots in a "
+#~ "row"
+#~ msgstr ""
+#~ "اگر غیر نشان زدہ کیا گیا، تو حالیہ ونڈو تصویر اتارنے کے بعد دوبارہ ظاہر "
+#~ "ہوگی تاکہ آپ متعدد تصاویر اتار سکیں"
+
+#~ msgid "Default save location"
+#~ msgstr "محفوظ کرنے کا طے شدہ مقام"
+
+#~ msgid "Set the default save location"
+#~ msgstr "محفوظ کرنے کا طے شدہ مقام مرتب کریں"
+
+#~ msgid ""
+#~ "An error occurred during the XML exchange: %s (%d).\n"
+#~ " The screenshot could not be uploaded."
+#~ msgstr ""
+#~ "ایکس ایم ایل XML کی تبدیلی کے دوران غلطی ہوئی ہے: %s (%d).\n"
+#~ " تصویر اپلوڈ نہیں کی جاسکتی."
+
+#~ msgid "Do not display the save dialog"
+#~ msgstr "محفوظ کرنے کا ڈائیلاگ مت دکھائیں"
diff --git a/po/ur_PK.po b/po/ur_PK.po
index 01701f2..70ece6f 100644
--- a/po/ur_PK.po
+++ b/po/ur_PK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-screenshooter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-31 14:02+0200\n"
+"POT-Creation-Date: 2009-11-15 00:29+0100\n"
 "PO-Revision-Date: 2009-06-09 01:12+0500\n"
 "Last-Translator: Muhammad Ali Makki <makki.ma at gmail.com>\n"
 "Language-Team: Urdu <makki.ma at gmail.com>\n"
@@ -19,313 +19,325 @@ msgstr ""
 "X-Poedit-Country: PAKISTAN\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../lib/screenshooter-dialogs.c:283
-msgid "Screenshot.png"
-msgstr "Screenshot.png"
-
-#: ../lib/screenshooter-dialogs.c:300
-#, c-format
-msgid "Screenshot-%d.png"
-msgstr "Screenshot-%d.png"
-
-#: ../lib/screenshooter-dialogs.c:493
+#: ../lib/screenshooter-dialogs.c:478
 #, c-format
 msgid "%.2fKb of %.2fKb"
 msgstr "%.2fKb of %.2fKb"
 
-#: ../lib/screenshooter-dialogs.c:577
+#: ../lib/screenshooter-dialogs.c:560
 msgid "Transfer"
 msgstr "منتقل"
 
-#: ../lib/screenshooter-dialogs.c:600
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being transferred to:</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">سکرین شاٹ منتقل کیا جارہا ہے تا:</span>"
+#: ../lib/screenshooter-dialogs.c:581
+msgid ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being "
+"transferred to:</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">سکرین شاٹ منتقل کیا جارہا ہے "
+"تا:</span>"
 
-#: ../lib/screenshooter-dialogs.c:724
-#: ../lib/screenshooter-dialogs.c:741
+#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
 msgid "Screenshot"
 msgstr "سکرین شوٹ"
 
-#: ../lib/screenshooter-dialogs.c:736
+#: ../lib/screenshooter-dialogs.c:709
 msgid "Take a screenshot"
 msgstr "تصویر اتاریں"
 
-#: ../lib/screenshooter-dialogs.c:751
+#: ../lib/screenshooter-dialogs.c:724
 msgid "Preferences"
 msgstr "ترجیحات"
 
-#: ../lib/screenshooter-dialogs.c:793
+#: ../lib/screenshooter-dialogs.c:754
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Region to capture</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">اتارنے کا رقبہ</span>"
 
-#: ../lib/screenshooter-dialogs.c:820
+#: ../lib/screenshooter-dialogs.c:774
 msgid "Entire screen"
 msgstr "پوری سکرین"
 
-#: ../lib/screenshooter-dialogs.c:830
-#: ../src/main.c:58
-#: ../panel-plugin/screenshooter-plugin.c:292
+#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../panel-plugin/screenshooter-plugin.c:308
 msgid "Take a screenshot of the entire screen"
 msgstr "پوری سکرین کی تصویر اتاریں"
 
-#: ../lib/screenshooter-dialogs.c:841
+#: ../lib/screenshooter-dialogs.c:789
 msgid "Active window"
 msgstr "فعال ونڈو"
 
-#: ../lib/screenshooter-dialogs.c:851
-#: ../src/main.c:104
-#: ../panel-plugin/screenshooter-plugin.c:297
+#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr "فعال ونڈو کی تصویر اتاریں"
 
-#: ../lib/screenshooter-dialogs.c:862
+#: ../lib/screenshooter-dialogs.c:804
 msgid "Select a region"
 msgstr "علاقہ منتخب کریں"
 
-#: ../lib/screenshooter-dialogs.c:872
-#: ../src/main.c:78
-#: ../panel-plugin/screenshooter-plugin.c:302
-msgid "Select a region to be captured by clicking a point of the screen without releasing the mouse button, dragging your mouse to the other corner of the region, and releasing the mouse button."
-msgstr "کسی مخصوص علاقے کی تصویر اتارنے کے لیے پؤائنٹر کو اس مقام پر لے جا کر کلک کر کے اس مقام کے دوسرے کونے تک لے جائیں اور ماؤس کا بٹن چھوڑ دیں."
+#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../panel-plugin/screenshooter-plugin.c:318
+msgid ""
+"Select a region to be captured by clicking a point of the screen without "
+"releasing the mouse button, dragging your mouse to the other corner of the "
+"region, and releasing the mouse button."
+msgstr ""
+"کسی مخصوص علاقے کی تصویر اتارنے کے لیے پؤائنٹر کو اس مقام پر لے جا کر کلک کر "
+"کے اس مقام کے دوسرے کونے تک لے جائیں اور ماؤس کا بٹن چھوڑ دیں."
 
-#: ../lib/screenshooter-dialogs.c:884
+#: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
 msgstr "ماؤس کے پؤائنٹر کو اتاریں"
 
-#: ../lib/screenshooter-dialogs.c:892
+#: ../lib/screenshooter-dialogs.c:824
 msgid "Display the mouse pointer on the screenshot"
 msgstr "تصویر پر ماؤس کا پؤائنٹر دکھائیں"
 
-#: ../lib/screenshooter-dialogs.c:917
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">تصویر اتارنے سے پہلے وقفہ</span>"
+#: ../lib/screenshooter-dialogs.c:840
+msgid ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">تصویر اتارنے سے پہلے وقفہ</"
+"span>"
 
-#: ../lib/screenshooter-dialogs.c:952
+#: ../lib/screenshooter-dialogs.c:862
 msgid "Delay in seconds before the screenshot is taken"
 msgstr "تصویر اتارنے سے پہلے سیکنڈوں میں وقفہ"
 
-#: ../lib/screenshooter-dialogs.c:958
+#: ../lib/screenshooter-dialogs.c:865
 msgid "seconds"
 msgstr "سیکنڈ"
 
-#: ../lib/screenshooter-dialogs.c:984
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">تصویر اتارنے کے بعد</span>"
-
-#. Display the save dialog checkbox
-#: ../lib/screenshooter-dialogs.c:1007
-msgid "Show the save dialog"
-msgstr "محفوظ کرنے کا ڈائیلاگ دکھائیں"
-
-#: ../lib/screenshooter-dialogs.c:1013
-msgid "The save dialog allows you to change the file name and the save location"
-msgstr "محفوظ کرنے کے ڈائیلاگ سے آپ فائل کا نام اور محفوظ کرنے کا مقام بدل سکتے ہیں"
-
-#: ../lib/screenshooter-dialogs.c:1027
-msgid "Close the application"
-msgstr "اطلاقیہ بند کریں"
-
-#: ../lib/screenshooter-dialogs.c:1033
-msgid "If unchecked, the current window will be displayed again after the screenshot has been taken to allow you to take several screenshots in a row"
-msgstr "اگر غیر نشان زدہ کیا گیا، تو حالیہ ونڈو تصویر اتارنے کے بعد دوبارہ ظاہر ہوگی تاکہ آپ متعدد تصاویر اتار سکیں"
+#: ../lib/screenshooter-dialogs.c:917
+msgid "Action"
+msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1056
+#: ../lib/screenshooter-dialogs.c:945
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Action</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">حرکت</span>"
 
 #. Save option radio button
-#: ../lib/screenshooter-dialogs.c:1081
-msgid "Save in:"
+#: ../lib/screenshooter-dialogs.c:961
+#, fuzzy
+msgid "Save"
 msgstr "محفوظ کریں:"
 
-#: ../lib/screenshooter-dialogs.c:1089
+#: ../lib/screenshooter-dialogs.c:966
 msgid "Save the screenshot to a PNG file"
 msgstr "تصویر کو PNG فائل میں مفوظ کریں"
 
-#: ../lib/screenshooter-dialogs.c:1104
-msgid "Default save location"
-msgstr "محفوظ کرنے کا طے شدہ مقام"
-
-#: ../lib/screenshooter-dialogs.c:1114
-msgid "Set the default save location"
-msgstr "محفوظ کرنے کا طے شدہ مقام مرتب کریں"
-
-#: ../lib/screenshooter-dialogs.c:1127
+#: ../lib/screenshooter-dialogs.c:975
 msgid "Copy to the clipboard"
 msgstr "کلپ بورڈ پر کاپی کریں"
 
-#: ../lib/screenshooter-dialogs.c:1132
+#: ../lib/screenshooter-dialogs.c:977
 msgid "Copy the screenshot to the clipboard so that it can be pasted later"
 msgstr "تصویر کو کلپ بورڈ پر کاپی کریں چنانچہ بعد میں آپ اسے پیسٹ کر سکیں گے"
 
-#: ../lib/screenshooter-dialogs.c:1147
+#: ../lib/screenshooter-dialogs.c:994
 msgid "Open with:"
 msgstr "کھولیں بذریعہ:"
 
-#: ../lib/screenshooter-dialogs.c:1158
+#: ../lib/screenshooter-dialogs.c:1000
 msgid "Open the screenshot with the chosen application"
 msgstr "تصویر کو منتخب کردہ اطلاقیہ میں کھولیں"
 
-#: ../lib/screenshooter-dialogs.c:1191
-#: ../src/main.c:73
+#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
 msgid "Application to open the screenshot"
 msgstr "تصویر کو کھولنے کا اطلاقیہ"
 
-#: ../lib/screenshooter-dialogs.c:1204
+#: ../lib/screenshooter-dialogs.c:1028
 msgid "Host on ZimageZ"
 msgstr "ZimageZ پر ہوسٹ کریں"
 
-#: ../lib/screenshooter-dialogs.c:1210
-#: ../src/main.c:92
+#: ../lib/screenshooter-dialogs.c:1032 ../src/main.c:80
 msgid "Host the screenshot on ZimageZ, a free online image hosting service"
 msgstr "تصویر ZimageZ پر ہوسٹ کریں، ایک مفت آن لائن تصاویر ہوسٹنگ سروس"
 
-#: ../lib/screenshooter-dialogs.c:1255
+#: ../lib/screenshooter-dialogs.c:1046
+#, fuzzy
+msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Preview</span>"
+msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">روابط</span>"
+
+#: ../lib/screenshooter-dialogs.c:1107
 msgid "Save screenshot as..."
 msgstr "تصویر محفوظ کریں بنام..."
 
-#. Start the user XML RPC session
-#: ../lib/screenshooter-zimagez.c:159
-msgid "Initialize the connection..."
-msgstr "اتصال تیار کیا جارہا ہے..."
+#: ../lib/screenshooter-zimagez.c:134
+#, fuzzy, c-format
+msgid "An error occured when creating the XMLRPC request."
+msgstr "تصویر اپلوڈ کرنے کے دوران غلطی."
 
-#: ../lib/screenshooter-zimagez.c:172
-#: ../lib/screenshooter-zimagez.c:332
-#: ../lib/screenshooter-zimagez.c:361
-#: ../lib/screenshooter-zimagez.c:389
-#: ../lib/screenshooter-zimagez.c:520
-#: ../lib/screenshooter-zimagez.c:543
-#: ../lib/screenshooter-zimagez.c:580
+#: ../lib/screenshooter-zimagez.c:153
+#, fuzzy, c-format
+msgid "An error occured when transfering the data to ZimageZ."
+msgstr "تصویر اپلوڈ کرنے کے دوران غلطی."
+
+#: ../lib/screenshooter-zimagez.c:178
+#, fuzzy, c-format
+msgid "An error occured when parsing the response from ZimageZ."
+msgstr "تصویر اپلوڈ کرنے کے دوران غلطی."
+
+#: ../lib/screenshooter-zimagez.c:228
 #, c-format
-msgid ""
-"An error occurred during the XML exchange: %s (%d).\n"
-" The screenshot could not be uploaded."
+msgid "Taken on %s, at %s"
 msgstr ""
-"ایکس ایم ایل XML کی تبدیلی کے دوران غلطی ہوئی ہے: %s (%d).\n"
-" تصویر اپلوڈ نہیں کی جاسکتی."
 
-#: ../lib/screenshooter-zimagez.c:223
+#. Start the user soup session
+#: ../lib/screenshooter-zimagez.c:295
+msgid "Initialize the connection..."
+msgstr "اتصال تیار کیا جارہا ہے..."
+
+#: ../lib/screenshooter-zimagez.c:341
 msgid ""
-"Please file the following fields with your <a href=\"http://www.zimagez.com\">ZimageZ</a> \n"
+"Please file the following fields with your <a href=\"http://www.zimagez.com"
+"\">ZimageZ</a> \n"
 "user name, passsword and details about the screenshot."
 msgstr ""
 "مندرجہ خانوں میں اپنے <a href=\"http://www.zimagez.com\">ZimageZ</a>\n"
 "کے اسمِ صارف، پاس ورڈ اور تصویر کی تفصیلات فراہم کریں."
 
-#: ../lib/screenshooter-zimagez.c:283
+#: ../lib/screenshooter-zimagez.c:398
 msgid "Check the user information..."
 msgstr "صارف کی معلومات کی تصدیق..."
 
-#: ../lib/screenshooter-zimagez.c:305
-msgid "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You must fill all the fields.</span>"
-msgstr "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">تمام خانے بھرنے لازمی ہیں.</span>"
+#: ../lib/screenshooter-zimagez.c:405
+msgid ""
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You "
+"must fill all the fields.</span>"
+msgstr ""
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">تمام "
+"خانے بھرنے لازمی ہیں.</span>"
 
-#: ../lib/screenshooter-zimagez.c:320
+#: ../lib/screenshooter-zimagez.c:419
 msgid "Login on ZimageZ..."
 msgstr "ZimageZ پر لاگ ان ہوں..."
 
-#: ../lib/screenshooter-zimagez.c:436
-msgid "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The user and the password you entered do not match. Please retry.</span>"
-msgstr "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">صارف اور پاس ورڈ جو آپ نے داخل کیے ہیں مطابقت نہیں رکھتے. دوبارہ کوشش کریں.</span>"
+#: ../lib/screenshooter-zimagez.c:459 ../lib/screenshooter-zimagez.c:610
+msgid ""
+"An unexpected reply from ZimageZ was received. The upload of the screenshot "
+"failed."
+msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:501
+#: ../lib/screenshooter-zimagez.c:498
+msgid ""
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The "
+"user and the password you entered do not match. Please retry.</span>"
+msgstr ""
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">صارف "
+"اور پاس ورڈ جو آپ نے داخل کیے ہیں مطابقت نہیں رکھتے. دوبارہ کوشش کریں.</span>"
+
+#: ../lib/screenshooter-zimagez.c:556
 msgid "Upload the screenshot..."
 msgstr "تصویر اپلوڈ کریں"
 
-#: ../lib/screenshooter-zimagez.c:559
+#: ../lib/screenshooter-zimagez.c:589
 #, c-format
 msgid "An error occurred while uploading the screenshot."
 msgstr "تصویر اپلوڈ کرنے کے دوران غلطی."
 
 #. End the user session
-#: ../lib/screenshooter-zimagez.c:597
+#: ../lib/screenshooter-zimagez.c:622
 msgid "Close the session on ZimageZ..."
 msgstr "ZimageZ پر نشست بند کریں..."
 
-#: ../lib/screenshooter-zimagez.c:650
+#: ../lib/screenshooter-zimagez.c:692
 msgid "Details about the screenshot for ZimageZ"
 msgstr "تصویر کی بابت تفصیل برائے ZimageZ"
 
 #. Create the user label
-#: ../lib/screenshooter-zimagez.c:692
+#: ../lib/screenshooter-zimagez.c:734
 msgid "User:"
 msgstr "اسمِ صارف:"
 
-#: ../lib/screenshooter-zimagez.c:703
-msgid "Your Zimagez user name, if you do not have one yet please create one on the Web page linked above"
-msgstr "آپ کا ZimageZ کا اسمِ صارف، اگر آپ کے پاس کھاتہ نہیں ہے تو ازراہِ کرم اوپر کے ویب صفحہ کے ربط پر جاکر ایک بنا لیں"
+#: ../lib/screenshooter-zimagez.c:745
+msgid ""
+"Your Zimagez user name, if you do not have one yet please create one on the "
+"Web page linked above"
+msgstr ""
+"آپ کا ZimageZ کا اسمِ صارف، اگر آپ کے پاس کھاتہ نہیں ہے تو ازراہِ کرم اوپر کے "
+"ویب صفحہ کے ربط پر جاکر ایک بنا لیں"
 
 #. Create the password label
-#: ../lib/screenshooter-zimagez.c:708
+#: ../lib/screenshooter-zimagez.c:751
 msgid "Password:"
 msgstr "پاس ورڈ:"
 
-#: ../lib/screenshooter-zimagez.c:718
+#: ../lib/screenshooter-zimagez.c:761
 msgid "The password for the user above"
 msgstr "اوپر کے صارف کا پاس ورڈ"
 
 #. Create the title label
-#: ../lib/screenshooter-zimagez.c:723
+#: ../lib/screenshooter-zimagez.c:767
 msgid "Title:"
 msgstr "عنوان:"
 
-#: ../lib/screenshooter-zimagez.c:733
-msgid "The title of the screenshot, it will be used when displaying the screenshot on ZimageZ"
+#: ../lib/screenshooter-zimagez.c:777
+msgid ""
+"The title of the screenshot, it will be used when displaying the screenshot "
+"on ZimageZ"
 msgstr "تصویر کا عنوان، یہ تب استعمال ہوگا جب تصویر ZimageZ پر ظاہر ہوگی"
 
 #. Create the comment label
-#: ../lib/screenshooter-zimagez.c:738
+#: ../lib/screenshooter-zimagez.c:783
 msgid "Comment:"
 msgstr "تبصرہ:"
 
-#: ../lib/screenshooter-zimagez.c:749
-msgid "A comment on the screenshot, it will be used when displaying the screenshot on ZimageZ"
+#: ../lib/screenshooter-zimagez.c:794
+msgid ""
+"A comment on the screenshot, it will be used when displaying the screenshot "
+"on ZimageZ"
 msgstr "تصویر پر تبصرہ، یہ تب استعمال ہوگا جب تصویر ZimageZ پر ظاہر ہوگی"
 
-#: ../lib/screenshooter-zimagez.c:870
+#: ../lib/screenshooter-zimagez.c:917
 #, c-format
 msgid "<a href=\"%s\">Full size image</a>"
 msgstr "<a href=\"%s\">پورے حجم کی تصویر</a>"
 
-#: ../lib/screenshooter-zimagez.c:872
+#: ../lib/screenshooter-zimagez.c:919
 #, c-format
 msgid "<a href=\"%s\">Large thumbnail</a>"
 msgstr "<a href=\"%s\">بڑا تصویرچہ</a>"
 
-#: ../lib/screenshooter-zimagez.c:874
+#: ../lib/screenshooter-zimagez.c:921
 #, c-format
 msgid "<a href=\"%s\">Small thumbnail</a>"
 msgstr "<a href=\"%s\">چھوٹا تصویرچہ</a>"
 
-#: ../lib/screenshooter-zimagez.c:894
+#: ../lib/screenshooter-zimagez.c:937
 msgid "My screenshot on ZimageZ"
 msgstr "میری تصاویر ZimageZ پر"
 
-#: ../lib/screenshooter-zimagez.c:920
+#: ../lib/screenshooter-zimagez.c:963
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Links</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">روابط</span>"
 
-#: ../lib/screenshooter-zimagez.c:965
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing to the full size image</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">کوڈ برائے تصویرچہ جس پر بڑی تصویر کا ربط ہے</span>"
+#: ../lib/screenshooter-zimagez.c:1008
+msgid ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing "
+"to the full size image</span>"
+msgstr ""
+"<span weight=\"bold\" stretch=\"semiexpanded\">کوڈ برائے تصویرچہ جس پر بڑی "
+"تصویر کا ربط ہے</span>"
 
 #. HTML title
-#: ../lib/screenshooter-zimagez.c:981
+#: ../lib/screenshooter-zimagez.c:1024
 msgid "HTML"
 msgstr "HTML"
 
 #. BB title
-#: ../lib/screenshooter-zimagez.c:1002
+#: ../lib/screenshooter-zimagez.c:1045
 msgid "BBCode for forums"
 msgstr "بی بی کوڈ برائے فورمز"
 
-#: ../lib/screenshooter-zimagez.c:1122
+#: ../lib/screenshooter-zimagez.c:1174
 msgid "ZimageZ"
 msgstr "ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:1155
+#: ../lib/screenshooter-zimagez.c:1207
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Status</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">حالت</span>"
 
@@ -339,42 +351,98 @@ msgstr "_ربط کھولیں"
 msgid "Copy _Link Address"
 msgstr "_ربط کا پتہ کاپی کریں"
 
-#: ../src/main.c:53
+#: ../src/main.c:48
 msgid "Delay in seconds before taking the screenshot"
 msgstr "تصویر اتارنے سے پہلے سیکنڈوں میں وقفہ"
 
-#: ../src/main.c:63
-msgid "Do not display the save dialog"
-msgstr "محفوظ کرنے کا ڈائیلاگ مت دکھائیں"
-
-#: ../src/main.c:68
-msgid "Do not display the mouse on the screenshot"
+#: ../src/main.c:58
+#, fuzzy
+msgid "Display the mouse on the screenshot"
 msgstr "ماؤس کو سکرین پر مت دکھائیں"
 
-#: ../src/main.c:85
+#: ../src/main.c:75
 msgid "Directory where the screenshot will be saved"
 msgstr "ڈائریکٹری جہاں تصویر محفوظ کی جائے گی"
 
-#: ../src/main.c:99
+#: ../src/main.c:85
 msgid "Version information"
 msgstr "ورژن کی معلومات"
 
+#: ../src/main.c:134
+#, c-format
+msgid "Conflicting options: --%s and --%s cannot be used at the same time.\n"
+msgstr ""
+
 #: ../src/main.c:136
 #, c-format
 msgid ""
+"The --%s option is only used when --fullscreen, --window or --region is "
+"given. It will be ignored.\n"
+msgstr ""
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
 "%s: %s\n"
 "تمام دستیاب کمانڈ لائن اختیارات کی فہرست کے لیے %s --help لکھیں.\n"
 
-#: ../src/main.c:235
+#: ../src/main.c:282
 #, c-format
 msgid "%s is not a valid directory, the default directory will be used."
 msgstr "%s موزوں دائریکٹری نہیں ہے، طے شدہ ڈائریکٹری استعمال کی جائے گی."
 
 #: ../src/xfce4-screenshooter.desktop.in.in.h:2
 #: ../panel-plugin/screenshooter.desktop.in.in.h:2
-msgid "Take screenshots of the entire screen, of the active window or of a region"
+msgid ""
+"Take screenshots of the entire screen, of the active window or of a region"
 msgstr "پوری سکرین، فعال ونڈو یا مخصوص علاقے کی تصویر اتاریں"
 
+#~ msgid "Screenshot.png"
+#~ msgstr "Screenshot.png"
+
+#~ msgid "Screenshot-%d.png"
+#~ msgstr "Screenshot-%d.png"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">تصویر اتارنے کے بعد</span>"
+
+#~ msgid "Show the save dialog"
+#~ msgstr "محفوظ کرنے کا ڈائیلاگ دکھائیں"
+
+#~ msgid ""
+#~ "The save dialog allows you to change the file name and the save location"
+#~ msgstr ""
+#~ "محفوظ کرنے کے ڈائیلاگ سے آپ فائل کا نام اور محفوظ کرنے کا مقام بدل سکتے "
+#~ "ہیں"
+
+#~ msgid "Close the application"
+#~ msgstr "اطلاقیہ بند کریں"
+
+#~ msgid ""
+#~ "If unchecked, the current window will be displayed again after the "
+#~ "screenshot has been taken to allow you to take several screenshots in a "
+#~ "row"
+#~ msgstr ""
+#~ "اگر غیر نشان زدہ کیا گیا، تو حالیہ ونڈو تصویر اتارنے کے بعد دوبارہ ظاہر "
+#~ "ہوگی تاکہ آپ متعدد تصاویر اتار سکیں"
+
+#~ msgid "Default save location"
+#~ msgstr "محفوظ کرنے کا طے شدہ مقام"
+
+#~ msgid "Set the default save location"
+#~ msgstr "محفوظ کرنے کا طے شدہ مقام مرتب کریں"
+
+#~ msgid ""
+#~ "An error occurred during the XML exchange: %s (%d).\n"
+#~ " The screenshot could not be uploaded."
+#~ msgstr ""
+#~ "ایکس ایم ایل XML کی تبدیلی کے دوران غلطی ہوئی ہے: %s (%d).\n"
+#~ " تصویر اپلوڈ نہیں کی جاسکتی."
+
+#~ msgid "Do not display the save dialog"
+#~ msgstr "محفوظ کرنے کا ڈائیلاگ مت دکھائیں"
diff --git a/po/vi.po b/po/vi.po
index f0e4f85..61f6473 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: i 18n.xfce.org\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-31 14:02+0200\n"
+"POT-Creation-Date: 2009-11-15 00:29+0100\n"
 "PO-Revision-Date: 2009-05-31 14:02+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,216 +17,191 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../lib/screenshooter-dialogs.c:283
-msgid "Screenshot.png"
-msgstr ""
-
-#: ../lib/screenshooter-dialogs.c:300
-#, c-format
-msgid "Screenshot-%d.png"
-msgstr ""
-
-#: ../lib/screenshooter-dialogs.c:493
+#: ../lib/screenshooter-dialogs.c:478
 #, c-format
 msgid "%.2fKb of %.2fKb"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:577
+#: ../lib/screenshooter-dialogs.c:560
 msgid "Transfer"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:600
+#: ../lib/screenshooter-dialogs.c:581
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being "
 "transferred to:</span>"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:724 ../lib/screenshooter-dialogs.c:741
+#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
 msgid "Screenshot"
 msgstr "Ảnh chụp màn hình"
 
-#: ../lib/screenshooter-dialogs.c:736
+#: ../lib/screenshooter-dialogs.c:709
 msgid "Take a screenshot"
 msgstr "Tạo ảnh chụp màn hình"
 
-#: ../lib/screenshooter-dialogs.c:751
+#: ../lib/screenshooter-dialogs.c:724
 msgid "Preferences"
 msgstr "Tuỳ chỉnh"
 
-#: ../lib/screenshooter-dialogs.c:793
+#: ../lib/screenshooter-dialogs.c:754
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Region to capture</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Vùng chụp</span>"
 
-#: ../lib/screenshooter-dialogs.c:820
+#: ../lib/screenshooter-dialogs.c:774
 msgid "Entire screen"
 msgstr "Toàn bộ màn hình"
 
-#: ../lib/screenshooter-dialogs.c:830 ../src/main.c:58
-#: ../panel-plugin/screenshooter-plugin.c:292
+#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../panel-plugin/screenshooter-plugin.c:308
 msgid "Take a screenshot of the entire screen"
 msgstr "Tạo ảnh chụp toàn bộ màn hình"
 
-#: ../lib/screenshooter-dialogs.c:841
+#: ../lib/screenshooter-dialogs.c:789
 msgid "Active window"
 msgstr "Của sổ đang kích hoạt"
 
-#: ../lib/screenshooter-dialogs.c:851 ../src/main.c:104
-#: ../panel-plugin/screenshooter-plugin.c:297
+#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr "Tạo một ảnh chụp của cửa sổ đang kích hoạt"
 
-#: ../lib/screenshooter-dialogs.c:862
+#: ../lib/screenshooter-dialogs.c:804
 msgid "Select a region"
 msgstr "Chọn vùng"
 
-#: ../lib/screenshooter-dialogs.c:872 ../src/main.c:78
-#: ../panel-plugin/screenshooter-plugin.c:302
+#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../panel-plugin/screenshooter-plugin.c:318
 msgid ""
 "Select a region to be captured by clicking a point of the screen without "
 "releasing the mouse button, dragging your mouse to the other corner of the "
 "region, and releasing the mouse button."
 msgstr ""
-"Chọn một vùng để chụp bằng cách nhấn vào một điểm trên màn hình và không "
-"thả nút chuột, rê chuột đến góc còn lại của vùng "
-"rồi thả nút chuột."
+"Chọn một vùng để chụp bằng cách nhấn vào một điểm trên màn hình và không thả "
+"nút chuột, rê chuột đến góc còn lại của vùng rồi thả nút chuột."
 
-#: ../lib/screenshooter-dialogs.c:884
+#: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
 msgstr "Chụp ảnh chuột"
 
-#: ../lib/screenshooter-dialogs.c:892
+#: ../lib/screenshooter-dialogs.c:824
 msgid "Display the mouse pointer on the screenshot"
 msgstr "Hiển thị chuột trên ảnh"
 
-#: ../lib/screenshooter-dialogs.c:917
+#: ../lib/screenshooter-dialogs.c:840
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
 msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Tạm dừng trước khi chụp</span>"
 
-#: ../lib/screenshooter-dialogs.c:952
+#: ../lib/screenshooter-dialogs.c:862
 msgid "Delay in seconds before the screenshot is taken"
 msgstr "Số giây để hoãn trước khi ảnh được chụp"
 
-#: ../lib/screenshooter-dialogs.c:958
+#: ../lib/screenshooter-dialogs.c:865
 msgid "seconds"
 msgstr "giây"
 
-#: ../lib/screenshooter-dialogs.c:984
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Sau khi chụp</span>"
-
-#. Display the save dialog checkbox
-#: ../lib/screenshooter-dialogs.c:1007
-msgid "Show the save dialog"
-msgstr "Hiển thị hộp thoại lưu"
-
-#: ../lib/screenshooter-dialogs.c:1013
-msgid ""
-"The save dialog allows you to change the file name and the save location"
-msgstr ""
-"Hộp thoại lưu cho phép bạn đổi tên tập tin ảnh và vị trí lưu"
-
-#: ../lib/screenshooter-dialogs.c:1027
-msgid "Close the application"
-msgstr "Đóng ứng dụng"
-
-#: ../lib/screenshooter-dialogs.c:1033
-msgid ""
-"If unchecked, the current window will be displayed again after the "
-"screenshot has been taken to allow you to take several screenshots in a row"
+#: ../lib/screenshooter-dialogs.c:917
+msgid "Action"
 msgstr ""
-"Nếu bỏ chọn, cửa sổ hiện tại sẽ được hiển thị lại sau khi "
-"ảnh đã được chụp và cho phép bạn chụp nhiều ảnh khác"
 
-#: ../lib/screenshooter-dialogs.c:1056
+#: ../lib/screenshooter-dialogs.c:945
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Action</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Hành động</span>"
 
 #. Save option radio button
-#: ../lib/screenshooter-dialogs.c:1081
-msgid "Save in:"
+#: ../lib/screenshooter-dialogs.c:961
+#, fuzzy
+msgid "Save"
 msgstr "Lưu ở:"
 
-#: ../lib/screenshooter-dialogs.c:1089
+#: ../lib/screenshooter-dialogs.c:966
 msgid "Save the screenshot to a PNG file"
 msgstr "Lưu ảnh chụp màn hình thành tập tin PNG"
 
-#: ../lib/screenshooter-dialogs.c:1104
-msgid "Default save location"
-msgstr "Vị trí lưu mặc định"
-
-#: ../lib/screenshooter-dialogs.c:1114
-msgid "Set the default save location"
-msgstr "Thiết lập vị trí lưu mặc đinh"
-
-#: ../lib/screenshooter-dialogs.c:1127
+#: ../lib/screenshooter-dialogs.c:975
 msgid "Copy to the clipboard"
 msgstr "Sao chép vào bộ đệm"
 
-#: ../lib/screenshooter-dialogs.c:1132
+#: ../lib/screenshooter-dialogs.c:977
 msgid "Copy the screenshot to the clipboard so that it can be pasted later"
 msgstr "Sao chép ảnh chụp màn hình đến bộ đệm để bạn có thể sao chép nó sau"
 
-#: ../lib/screenshooter-dialogs.c:1147
+#: ../lib/screenshooter-dialogs.c:994
 msgid "Open with:"
 msgstr "Mở với:"
 
-#: ../lib/screenshooter-dialogs.c:1158
+#: ../lib/screenshooter-dialogs.c:1000
 msgid "Open the screenshot with the chosen application"
 msgstr "Mở ảnh chụp với ứng dụng đã chọn"
 
-#: ../lib/screenshooter-dialogs.c:1191 ../src/main.c:73
+#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
 msgid "Application to open the screenshot"
 msgstr "Ứng dụng để mở ảnh chụp"
 
-#: ../lib/screenshooter-dialogs.c:1204
+#: ../lib/screenshooter-dialogs.c:1028
 msgid "Host on ZimageZ"
 msgstr "Lưu trực tuyến trên ZimageZ"
 
-#: ../lib/screenshooter-dialogs.c:1210 ../src/main.c:92
+#: ../lib/screenshooter-dialogs.c:1032 ../src/main.c:80
 msgid "Host the screenshot on ZimageZ, a free online image hosting service"
-msgstr "Lưu trực tuyến trên ZimageZ, một dịch vụ hosting ảnh trực tuyến miễn phí"
+msgstr ""
+"Lưu trực tuyến trên ZimageZ, một dịch vụ hosting ảnh trực tuyến miễn phí"
+
+#: ../lib/screenshooter-dialogs.c:1046
+#, fuzzy
+msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Preview</span>"
+msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Các liên kết</span>"
 
-#: ../lib/screenshooter-dialogs.c:1255
+#: ../lib/screenshooter-dialogs.c:1107
 msgid "Save screenshot as..."
 msgstr "Lưu ảnh chụp thành..."
 
-#. Start the user XML RPC session
-#: ../lib/screenshooter-zimagez.c:159
-msgid "Initialize the connection..."
-msgstr "Khỏi tạo kết nối"
+#: ../lib/screenshooter-zimagez.c:134
+#, fuzzy, c-format
+msgid "An error occured when creating the XMLRPC request."
+msgstr "Một lỗi đã xảy ra trong khi đang tải ảnh lên"
+
+#: ../lib/screenshooter-zimagez.c:153
+#, fuzzy, c-format
+msgid "An error occured when transfering the data to ZimageZ."
+msgstr "Một lỗi đã xảy ra trong khi đang tải ảnh lên"
+
+#: ../lib/screenshooter-zimagez.c:178
+#, fuzzy, c-format
+msgid "An error occured when parsing the response from ZimageZ."
+msgstr "Một lỗi đã xảy ra trong khi đang tải ảnh lên"
 
-#: ../lib/screenshooter-zimagez.c:172 ../lib/screenshooter-zimagez.c:332
-#: ../lib/screenshooter-zimagez.c:361 ../lib/screenshooter-zimagez.c:389
-#: ../lib/screenshooter-zimagez.c:520 ../lib/screenshooter-zimagez.c:543
-#: ../lib/screenshooter-zimagez.c:580
+#: ../lib/screenshooter-zimagez.c:228
 #, c-format
-msgid ""
-"An error occurred during the XML exchange: %s (%d).\n"
-" The screenshot could not be uploaded."
+msgid "Taken on %s, at %s"
 msgstr ""
-"Có lỗi xảy ra trong khi Ảnh ko thể upload được %s (%d)."
 
+#. Start the user soup session
+#: ../lib/screenshooter-zimagez.c:295
+msgid "Initialize the connection..."
+msgstr "Khỏi tạo kết nối"
 
-#: ../lib/screenshooter-zimagez.c:223
+#: ../lib/screenshooter-zimagez.c:341
 msgid ""
 "Please file the following fields with your <a href=\"http://www.zimagez.com"
 "\">ZimageZ</a> \n"
 "user name, passsword and details about the screenshot."
 msgstr ""
-"Hãy điền vào những trường sau với tên, mật khẩu <a href=\"http://www.zimagez.com"
-"\">ZimageZ</a> \n"
+"Hãy điền vào những trường sau với tên, mật khẩu <a href=\"http://www.zimagez."
+"com\">ZimageZ</a> \n"
 "của bạn và chi tiết về ảnh chụp màn hình."
 
-
-#: ../lib/screenshooter-zimagez.c:283
+#: ../lib/screenshooter-zimagez.c:398
 msgid "Check the user information..."
 msgstr "Kiểm tra thông tin người dùng"
 
-#: ../lib/screenshooter-zimagez.c:305
+#: ../lib/screenshooter-zimagez.c:405
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You "
 "must fill all the fields.</span>"
@@ -234,135 +209,132 @@ msgstr ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">Bạn "
 "phải điền vào tất cả các trường.</span>"
 
-
-#: ../lib/screenshooter-zimagez.c:320
+#: ../lib/screenshooter-zimagez.c:419
 msgid "Login on ZimageZ..."
 msgstr "Đăng nhập ZimageZ..."
 
-#: ../lib/screenshooter-zimagez.c:436
+#: ../lib/screenshooter-zimagez.c:459 ../lib/screenshooter-zimagez.c:610
+msgid ""
+"An unexpected reply from ZimageZ was received. The upload of the screenshot "
+"failed."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:498
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The "
 "user and the password you entered do not match. Please retry.</span>"
 msgstr ""
-"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">Tên& mật khẩu "
-"bạn đã nhập ko khớp nhau. Hãy thử lại.</span>"
-
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">Tên& "
+"mật khẩu bạn đã nhập ko khớp nhau. Hãy thử lại.</span>"
 
-#: ../lib/screenshooter-zimagez.c:501
+#: ../lib/screenshooter-zimagez.c:556
 msgid "Upload the screenshot..."
 msgstr "Tải ảnh chụp màn hình lên..."
 
-#: ../lib/screenshooter-zimagez.c:559
+#: ../lib/screenshooter-zimagez.c:589
 #, c-format
 msgid "An error occurred while uploading the screenshot."
 msgstr "Một lỗi đã xảy ra trong khi đang tải ảnh lên"
 
 #. End the user session
-#: ../lib/screenshooter-zimagez.c:597
+#: ../lib/screenshooter-zimagez.c:622
 msgid "Close the session on ZimageZ..."
 msgstr "Đóng phiên làm việc trên ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:650
+#: ../lib/screenshooter-zimagez.c:692
 msgid "Details about the screenshot for ZimageZ"
 msgstr "Thông tin ảnh trên ZimageZ"
 
 #. Create the user label
-#: ../lib/screenshooter-zimagez.c:692
+#: ../lib/screenshooter-zimagez.c:734
 msgid "User:"
 msgstr "Người dùng:"
 
-#: ../lib/screenshooter-zimagez.c:703
+#: ../lib/screenshooter-zimagez.c:745
 msgid ""
 "Your Zimagez user name, if you do not have one yet please create one on the "
 "Web page linked above"
 msgstr ""
-"Tên đăng nhập trên ZimageZ của ban, nếu bạn chưa có thì hãy tạo một tài khoản "
-"từ liên kết trên"
+"Tên đăng nhập trên ZimageZ của ban, nếu bạn chưa có thì hãy tạo một tài "
+"khoản từ liên kết trên"
 
 #. Create the password label
-#: ../lib/screenshooter-zimagez.c:708
+#: ../lib/screenshooter-zimagez.c:751
 msgid "Password:"
 msgstr "Mật khẩu"
 
-#: ../lib/screenshooter-zimagez.c:718
+#: ../lib/screenshooter-zimagez.c:761
 msgid "The password for the user above"
 msgstr "Mật khẩu cho người dùng trên"
 
 #. Create the title label
-#: ../lib/screenshooter-zimagez.c:723
+#: ../lib/screenshooter-zimagez.c:767
 msgid "Title:"
 msgstr "Tiêu đề:"
 
-#: ../lib/screenshooter-zimagez.c:733
+#: ../lib/screenshooter-zimagez.c:777
 msgid ""
 "The title of the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
-msgstr ""
-"Tiêu đề của ảnh chụp, nó sẽ được dùng khi hiển thị ảnh "
-"trên ZimageZ"
-
+msgstr "Tiêu đề của ảnh chụp, nó sẽ được dùng khi hiển thị ảnh trên ZimageZ"
 
 #. Create the comment label
-#: ../lib/screenshooter-zimagez.c:738
+#: ../lib/screenshooter-zimagez.c:783
 msgid "Comment:"
 msgstr "Chú thích:"
 
-#: ../lib/screenshooter-zimagez.c:749
+#: ../lib/screenshooter-zimagez.c:794
 msgid ""
 "A comment on the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
-msgstr ""
-"Chú thích ảnh, nó sẽ được dùng khi hiển thị ảnh "
-"trên ZimageZ"
+msgstr "Chú thích ảnh, nó sẽ được dùng khi hiển thị ảnh trên ZimageZ"
 
-
-#: ../lib/screenshooter-zimagez.c:870
+#: ../lib/screenshooter-zimagez.c:917
 #, c-format
 msgid "<a href=\"%s\">Full size image</a>"
 msgstr "<a href=\"%s\">Kích thước ảnh</a>"
 
-#: ../lib/screenshooter-zimagez.c:872
-#, c-format
-msgid "<a href=\"%s\">Ảnh thumbnail lớn</a>"
-msgstr ""
+#: ../lib/screenshooter-zimagez.c:919
+#, fuzzy, c-format
+msgid "<a href=\"%s\">Large thumbnail</a>"
+msgstr "<a href=\"%s\">Kích thước ảnh</a>"
 
-#: ../lib/screenshooter-zimagez.c:874
-#, c-format
-msgid "<a href=\"%s\">Ảnh thumbnail nhỏ</a>"
-msgstr ""
+#: ../lib/screenshooter-zimagez.c:921
+#, fuzzy, c-format
+msgid "<a href=\"%s\">Small thumbnail</a>"
+msgstr "<a href=\"%s\">Kích thước ảnh</a>"
 
-#: ../lib/screenshooter-zimagez.c:894
+#: ../lib/screenshooter-zimagez.c:937
 msgid "My screenshot on ZimageZ"
 msgstr "Ảnh chụp màn hình của tôi trên ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:920
+#: ../lib/screenshooter-zimagez.c:963
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Links</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Các liên kết</span>"
 
-#: ../lib/screenshooter-zimagez.c:965
+#: ../lib/screenshooter-zimagez.c:1008
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing "
 "to the full size image</span>"
 msgstr ""
-"<span weight=\"bold\" stretch=\"semiexpanded\">Mã cho một thumbnail trỏ "
-"đến ảnh với kích thước gốc</span>"
-
+"<span weight=\"bold\" stretch=\"semiexpanded\">Mã cho một thumbnail trỏ đến "
+"ảnh với kích thước gốc</span>"
 
 #. HTML title
-#: ../lib/screenshooter-zimagez.c:981
+#: ../lib/screenshooter-zimagez.c:1024
 msgid "HTML"
 msgstr "HTML"
 
 #. BB title
-#: ../lib/screenshooter-zimagez.c:1002
+#: ../lib/screenshooter-zimagez.c:1045
 msgid "BBCode for forums"
 msgstr "BBCode dùng trong các diễn đàn"
 
-#: ../lib/screenshooter-zimagez.c:1122
+#: ../lib/screenshooter-zimagez.c:1174
 msgid "ZimageZ"
 msgstr "ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:1155
+#: ../lib/screenshooter-zimagez.c:1207
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Status</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Tình trạng</span>"
 
@@ -376,36 +348,45 @@ msgstr "_Mở liên kết"
 msgid "Copy _Link Address"
 msgstr "Sao chép địa chỉ _Liên kết"
 
-#: ../src/main.c:53
+#: ../src/main.c:48
 msgid "Delay in seconds before taking the screenshot"
 msgstr "Số giây hoãn trước khi chụp"
 
-#: ../src/main.c:63
-msgid "Do not display the save dialog"
-msgstr "Đừng hiển thị hộp thoại lưu"
-
-#: ../src/main.c:68
-msgid "Do not display the mouse on the screenshot"
+#: ../src/main.c:58
+#, fuzzy
+msgid "Display the mouse on the screenshot"
 msgstr "Không hiển thị chuột trên ảnh"
 
-#: ../src/main.c:85
+#: ../src/main.c:75
 msgid "Directory where the screenshot will be saved"
 msgstr "Thư mục nơi ảnh được lưu"
 
-#: ../src/main.c:99
+#: ../src/main.c:85
 msgid "Version information"
 msgstr "Thông tin phiên bản"
 
+#: ../src/main.c:134
+#, c-format
+msgid "Conflicting options: --%s and --%s cannot be used at the same time.\n"
+msgstr ""
+
 #: ../src/main.c:136
 #, c-format
 msgid ""
+"The --%s option is only used when --fullscreen, --window or --region is "
+"given. It will be ignored.\n"
+msgstr ""
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
 "%s: %s\n"
 "Thử %s --help để xem danh sách đầy đủ của các tuỳ chọn dòng lệnh khả dụng.\n"
 
-#: ../src/main.c:235
+#: ../src/main.c:282
 #, c-format
 msgid "%s is not a valid directory, the default directory will be used."
 msgstr "%s không trỏ tới một thư mục nào cả, thư mục mặc định sẽ được sử dụng."
@@ -414,5 +395,40 @@ msgstr "%s không trỏ tới một thư mục nào cả, thư mục mặc đị
 #: ../panel-plugin/screenshooter.desktop.in.in.h:2
 msgid ""
 "Take screenshots of the entire screen, of the active window or of a region"
-msgstr ""
-"Chụp toàn bộ màn hình, hay cửa sổ đang kích hoạt hay một vùng màn hình"
+msgstr "Chụp toàn bộ màn hình, hay cửa sổ đang kích hoạt hay một vùng màn hình"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
+#~ msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">Sau khi chụp</span>"
+
+#~ msgid "Show the save dialog"
+#~ msgstr "Hiển thị hộp thoại lưu"
+
+#~ msgid ""
+#~ "The save dialog allows you to change the file name and the save location"
+#~ msgstr "Hộp thoại lưu cho phép bạn đổi tên tập tin ảnh và vị trí lưu"
+
+#~ msgid "Close the application"
+#~ msgstr "Đóng ứng dụng"
+
+#~ msgid ""
+#~ "If unchecked, the current window will be displayed again after the "
+#~ "screenshot has been taken to allow you to take several screenshots in a "
+#~ "row"
+#~ msgstr ""
+#~ "Nếu bỏ chọn, cửa sổ hiện tại sẽ được hiển thị lại sau khi ảnh đã được "
+#~ "chụp và cho phép bạn chụp nhiều ảnh khác"
+
+#~ msgid "Default save location"
+#~ msgstr "Vị trí lưu mặc định"
+
+#~ msgid "Set the default save location"
+#~ msgstr "Thiết lập vị trí lưu mặc đinh"
+
+#~ msgid ""
+#~ "An error occurred during the XML exchange: %s (%d).\n"
+#~ " The screenshot could not be uploaded."
+#~ msgstr "Có lỗi xảy ra trong khi Ảnh ko thể upload được %s (%d)."
+
+#~ msgid "Do not display the save dialog"
+#~ msgstr "Đừng hiển thị hộp thoại lưu"
diff --git a/po/xfce4-screenshooter.pot b/po/xfce4-screenshooter.pot
index d7da64d..cfdd263 100644
--- a/po/xfce4-screenshooter.pot
+++ b/po/xfce4-screenshooter.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-31 14:02+0200\n"
+"POT-Creation-Date: 2009-11-15 00:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,322 +16,307 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/screenshooter-dialogs.c:283
-msgid "Screenshot.png"
-msgstr ""
-
-#: ../lib/screenshooter-dialogs.c:300
-#, c-format
-msgid "Screenshot-%d.png"
-msgstr ""
-
-#: ../lib/screenshooter-dialogs.c:493
+#: ../lib/screenshooter-dialogs.c:478
 #, c-format
 msgid "%.2fKb of %.2fKb"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:577
+#: ../lib/screenshooter-dialogs.c:560
 msgid "Transfer"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:600
+#: ../lib/screenshooter-dialogs.c:581
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being "
 "transferred to:</span>"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:724 ../lib/screenshooter-dialogs.c:741
+#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
 msgid "Screenshot"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:736
+#: ../lib/screenshooter-dialogs.c:709
 msgid "Take a screenshot"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:751
+#: ../lib/screenshooter-dialogs.c:724
 msgid "Preferences"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:793
+#: ../lib/screenshooter-dialogs.c:754
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Region to capture</span>"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:820
+#: ../lib/screenshooter-dialogs.c:774
 msgid "Entire screen"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:830 ../src/main.c:58
-#: ../panel-plugin/screenshooter-plugin.c:292
+#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../panel-plugin/screenshooter-plugin.c:308
 msgid "Take a screenshot of the entire screen"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:841
+#: ../lib/screenshooter-dialogs.c:789
 msgid "Active window"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:851 ../src/main.c:104
-#: ../panel-plugin/screenshooter-plugin.c:297
+#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:862
+#: ../lib/screenshooter-dialogs.c:804
 msgid "Select a region"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:872 ../src/main.c:78
-#: ../panel-plugin/screenshooter-plugin.c:302
+#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../panel-plugin/screenshooter-plugin.c:318
 msgid ""
 "Select a region to be captured by clicking a point of the screen without "
 "releasing the mouse button, dragging your mouse to the other corner of the "
 "region, and releasing the mouse button."
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:884
+#: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:892
+#: ../lib/screenshooter-dialogs.c:824
 msgid "Display the mouse pointer on the screenshot"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:917
+#: ../lib/screenshooter-dialogs.c:840
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:952
+#: ../lib/screenshooter-dialogs.c:862
 msgid "Delay in seconds before the screenshot is taken"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:958
+#: ../lib/screenshooter-dialogs.c:865
 msgid "seconds"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:984
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
-msgstr ""
-
-#. Display the save dialog checkbox
-#: ../lib/screenshooter-dialogs.c:1007
-msgid "Show the save dialog"
-msgstr ""
-
-#: ../lib/screenshooter-dialogs.c:1013
-msgid ""
-"The save dialog allows you to change the file name and the save location"
-msgstr ""
-
-#: ../lib/screenshooter-dialogs.c:1027
-msgid "Close the application"
-msgstr ""
-
-#: ../lib/screenshooter-dialogs.c:1033
-msgid ""
-"If unchecked, the current window will be displayed again after the "
-"screenshot has been taken to allow you to take several screenshots in a row"
+#: ../lib/screenshooter-dialogs.c:917
+msgid "Action"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1056
+#: ../lib/screenshooter-dialogs.c:945
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Action</span>"
 msgstr ""
 
 #. Save option radio button
-#: ../lib/screenshooter-dialogs.c:1081
-msgid "Save in:"
+#: ../lib/screenshooter-dialogs.c:961
+msgid "Save"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1089
+#: ../lib/screenshooter-dialogs.c:966
 msgid "Save the screenshot to a PNG file"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1104
-msgid "Default save location"
-msgstr ""
-
-#: ../lib/screenshooter-dialogs.c:1114
-msgid "Set the default save location"
-msgstr ""
-
-#: ../lib/screenshooter-dialogs.c:1127
+#: ../lib/screenshooter-dialogs.c:975
 msgid "Copy to the clipboard"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1132
+#: ../lib/screenshooter-dialogs.c:977
 msgid "Copy the screenshot to the clipboard so that it can be pasted later"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1147
+#: ../lib/screenshooter-dialogs.c:994
 msgid "Open with:"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1158
+#: ../lib/screenshooter-dialogs.c:1000
 msgid "Open the screenshot with the chosen application"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1191 ../src/main.c:73
+#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
 msgid "Application to open the screenshot"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1204
+#: ../lib/screenshooter-dialogs.c:1028
 msgid "Host on ZimageZ"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1210 ../src/main.c:92
+#: ../lib/screenshooter-dialogs.c:1032 ../src/main.c:80
 msgid "Host the screenshot on ZimageZ, a free online image hosting service"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1255
+#: ../lib/screenshooter-dialogs.c:1046
+msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Preview</span>"
+msgstr ""
+
+#: ../lib/screenshooter-dialogs.c:1107
 msgid "Save screenshot as..."
 msgstr ""
 
-#. Start the user XML RPC session
-#: ../lib/screenshooter-zimagez.c:159
-msgid "Initialize the connection..."
+#: ../lib/screenshooter-zimagez.c:134
+#, c-format
+msgid "An error occured when creating the XMLRPC request."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:172 ../lib/screenshooter-zimagez.c:332
-#: ../lib/screenshooter-zimagez.c:361 ../lib/screenshooter-zimagez.c:389
-#: ../lib/screenshooter-zimagez.c:520 ../lib/screenshooter-zimagez.c:543
-#: ../lib/screenshooter-zimagez.c:580
+#: ../lib/screenshooter-zimagez.c:153
 #, c-format
-msgid ""
-"An error occurred during the XML exchange: %s (%d).\n"
-" The screenshot could not be uploaded."
+msgid "An error occured when transfering the data to ZimageZ."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:223
+#: ../lib/screenshooter-zimagez.c:178
+#, c-format
+msgid "An error occured when parsing the response from ZimageZ."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:228
+#, c-format
+msgid "Taken on %s, at %s"
+msgstr ""
+
+#. Start the user soup session
+#: ../lib/screenshooter-zimagez.c:295
+msgid "Initialize the connection..."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:341
 msgid ""
 "Please file the following fields with your <a href=\"http://www.zimagez.com"
 "\">ZimageZ</a> \n"
 "user name, passsword and details about the screenshot."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:283
+#: ../lib/screenshooter-zimagez.c:398
 msgid "Check the user information..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:305
+#: ../lib/screenshooter-zimagez.c:405
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You "
 "must fill all the fields.</span>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:320
+#: ../lib/screenshooter-zimagez.c:419
 msgid "Login on ZimageZ..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:436
+#: ../lib/screenshooter-zimagez.c:459 ../lib/screenshooter-zimagez.c:610
+msgid ""
+"An unexpected reply from ZimageZ was received. The upload of the screenshot "
+"failed."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:498
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The "
 "user and the password you entered do not match. Please retry.</span>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:501
+#: ../lib/screenshooter-zimagez.c:556
 msgid "Upload the screenshot..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:559
+#: ../lib/screenshooter-zimagez.c:589
 #, c-format
 msgid "An error occurred while uploading the screenshot."
 msgstr ""
 
 #. End the user session
-#: ../lib/screenshooter-zimagez.c:597
+#: ../lib/screenshooter-zimagez.c:622
 msgid "Close the session on ZimageZ..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:650
+#: ../lib/screenshooter-zimagez.c:692
 msgid "Details about the screenshot for ZimageZ"
 msgstr ""
 
 #. Create the user label
-#: ../lib/screenshooter-zimagez.c:692
+#: ../lib/screenshooter-zimagez.c:734
 msgid "User:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:703
+#: ../lib/screenshooter-zimagez.c:745
 msgid ""
 "Your Zimagez user name, if you do not have one yet please create one on the "
 "Web page linked above"
 msgstr ""
 
 #. Create the password label
-#: ../lib/screenshooter-zimagez.c:708
+#: ../lib/screenshooter-zimagez.c:751
 msgid "Password:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:718
+#: ../lib/screenshooter-zimagez.c:761
 msgid "The password for the user above"
 msgstr ""
 
 #. Create the title label
-#: ../lib/screenshooter-zimagez.c:723
+#: ../lib/screenshooter-zimagez.c:767
 msgid "Title:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:733
+#: ../lib/screenshooter-zimagez.c:777
 msgid ""
 "The title of the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
 msgstr ""
 
 #. Create the comment label
-#: ../lib/screenshooter-zimagez.c:738
+#: ../lib/screenshooter-zimagez.c:783
 msgid "Comment:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:749
+#: ../lib/screenshooter-zimagez.c:794
 msgid ""
 "A comment on the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:870
+#: ../lib/screenshooter-zimagez.c:917
 #, c-format
 msgid "<a href=\"%s\">Full size image</a>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:872
+#: ../lib/screenshooter-zimagez.c:919
 #, c-format
 msgid "<a href=\"%s\">Large thumbnail</a>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:874
+#: ../lib/screenshooter-zimagez.c:921
 #, c-format
 msgid "<a href=\"%s\">Small thumbnail</a>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:894
+#: ../lib/screenshooter-zimagez.c:937
 msgid "My screenshot on ZimageZ"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:920
+#: ../lib/screenshooter-zimagez.c:963
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Links</span>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:965
+#: ../lib/screenshooter-zimagez.c:1008
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing "
 "to the full size image</span>"
 msgstr ""
 
 #. HTML title
-#: ../lib/screenshooter-zimagez.c:981
+#: ../lib/screenshooter-zimagez.c:1024
 msgid "HTML"
 msgstr ""
 
 #. BB title
-#: ../lib/screenshooter-zimagez.c:1002
+#: ../lib/screenshooter-zimagez.c:1045
 msgid "BBCode for forums"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:1122
+#: ../lib/screenshooter-zimagez.c:1174
 msgid "ZimageZ"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:1155
+#: ../lib/screenshooter-zimagez.c:1207
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Status</span>"
 msgstr ""
 
@@ -345,34 +330,42 @@ msgstr ""
 msgid "Copy _Link Address"
 msgstr ""
 
-#: ../src/main.c:53
+#: ../src/main.c:48
 msgid "Delay in seconds before taking the screenshot"
 msgstr ""
 
-#: ../src/main.c:63
-msgid "Do not display the save dialog"
+#: ../src/main.c:58
+msgid "Display the mouse on the screenshot"
 msgstr ""
 
-#: ../src/main.c:68
-msgid "Do not display the mouse on the screenshot"
+#: ../src/main.c:75
+msgid "Directory where the screenshot will be saved"
 msgstr ""
 
 #: ../src/main.c:85
-msgid "Directory where the screenshot will be saved"
+msgid "Version information"
 msgstr ""
 
-#: ../src/main.c:99
-msgid "Version information"
+#: ../src/main.c:134
+#, c-format
+msgid "Conflicting options: --%s and --%s cannot be used at the same time.\n"
 msgstr ""
 
 #: ../src/main.c:136
 #, c-format
 msgid ""
+"The --%s option is only used when --fullscreen, --window or --region is "
+"given. It will be ignored.\n"
+msgstr ""
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
 
-#: ../src/main.c:235
+#: ../src/main.c:282
 #, c-format
 msgid "%s is not a valid directory, the default directory will be used."
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9b0ca18..b653658 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce 4-screenshooter-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-31 14:02+0200\n"
+"POT-Creation-Date: 2009-11-15 00:29+0100\n"
 "PO-Revision-Date: 2009-06-09 01:27+0800\n"
 "Last-Translator: Hunt Xu <huntxu at live.cn>\n"
 "Language-Team: Chinese (simplified)\n"
@@ -15,340 +15,319 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/screenshooter-dialogs.c:283
-msgid "Screenshot.png"
-msgstr "Screenshot.png"
-
-#: ../lib/screenshooter-dialogs.c:300
-#, c-format
-msgid "Screenshot-%d.png"
-msgstr "Screenshot-%d.png"
-
-#: ../lib/screenshooter-dialogs.c:493
+#: ../lib/screenshooter-dialogs.c:478
 #, c-format
 msgid "%.2fKb of %.2fKb"
 msgstr "%2$.2fKb中的%1$.2fKb"
 
-#: ../lib/screenshooter-dialogs.c:577
+#: ../lib/screenshooter-dialogs.c:560
 msgid "Transfer"
 msgstr "传送"
 
-#: ../lib/screenshooter-dialogs.c:600
+#: ../lib/screenshooter-dialogs.c:581
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being "
 "transferred to:</span>"
 msgstr ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">这张截图将会被传送至: </span>"
 
-#: ../lib/screenshooter-dialogs.c:724 ../lib/screenshooter-dialogs.c:741
+#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
 msgid "Screenshot"
 msgstr "屏幕截图"
 
-#: ../lib/screenshooter-dialogs.c:736
+#: ../lib/screenshooter-dialogs.c:709
 msgid "Take a screenshot"
 msgstr "截屏"
 
-#: ../lib/screenshooter-dialogs.c:751
+#: ../lib/screenshooter-dialogs.c:724
 msgid "Preferences"
 msgstr "首选项"
 
-#: ../lib/screenshooter-dialogs.c:793
+#: ../lib/screenshooter-dialogs.c:754
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Region to capture</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">截取范围</span>"
 
-#: ../lib/screenshooter-dialogs.c:820
+#: ../lib/screenshooter-dialogs.c:774
 msgid "Entire screen"
 msgstr "全屏幕"
 
-#: ../lib/screenshooter-dialogs.c:830 ../src/main.c:58
-#: ../panel-plugin/screenshooter-plugin.c:292
+#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../panel-plugin/screenshooter-plugin.c:308
 msgid "Take a screenshot of the entire screen"
 msgstr "截取全屏幕图像"
 
-#: ../lib/screenshooter-dialogs.c:841
+#: ../lib/screenshooter-dialogs.c:789
 msgid "Active window"
 msgstr "活动窗口"
 
-#: ../lib/screenshooter-dialogs.c:851 ../src/main.c:104
-#: ../panel-plugin/screenshooter-plugin.c:297
+#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr "只截取当前活动窗口图像"
 
-#: ../lib/screenshooter-dialogs.c:862
+#: ../lib/screenshooter-dialogs.c:804
 msgid "Select a region"
 msgstr "选择一个区域"
 
-#: ../lib/screenshooter-dialogs.c:872 ../src/main.c:78
-#: ../panel-plugin/screenshooter-plugin.c:302
+#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../panel-plugin/screenshooter-plugin.c:318
 msgid ""
 "Select a region to be captured by clicking a point of the screen without "
 "releasing the mouse button, dragging your mouse to the other corner of the "
 "region, and releasing the mouse button."
 msgstr "按住鼠标左键拖拽后松开以选取要截取的屏幕区域。"
 
-#: ../lib/screenshooter-dialogs.c:884
+#: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
 msgstr "截取鼠标指针"
 
-#: ../lib/screenshooter-dialogs.c:892
+#: ../lib/screenshooter-dialogs.c:824
 msgid "Display the mouse pointer on the screenshot"
 msgstr "抓取鼠标光标"
 
-#: ../lib/screenshooter-dialogs.c:917
+#: ../lib/screenshooter-dialogs.c:840
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">截图前延迟</span>"
 
-#: ../lib/screenshooter-dialogs.c:952
+#: ../lib/screenshooter-dialogs.c:862
 msgid "Delay in seconds before the screenshot is taken"
 msgstr "截图前延迟"
 
-#: ../lib/screenshooter-dialogs.c:958
+#: ../lib/screenshooter-dialogs.c:865
 msgid "seconds"
 msgstr "秒"
 
-#: ../lib/screenshooter-dialogs.c:984
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
-msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">截图之后</span>"
-
-#. Display the save dialog checkbox
-#: ../lib/screenshooter-dialogs.c:1007
-msgid "Show the save dialog"
-msgstr "显示保存对话框"
-
-#: ../lib/screenshooter-dialogs.c:1013
-msgid ""
-"The save dialog allows you to change the file name and the save location"
-msgstr "保存对话框允许您改变默认保存的文件名和位置"
-
-#: ../lib/screenshooter-dialogs.c:1027
-msgid "Close the application"
-msgstr "关闭程序"
-
-#: ../lib/screenshooter-dialogs.c:1033
-msgid ""
-"If unchecked, the current window will be displayed again after the "
-"screenshot has been taken to allow you to take several screenshots in a row"
+#: ../lib/screenshooter-dialogs.c:917
+msgid "Action"
 msgstr ""
-"如果未选中此项,当前窗口会在截图之后再次出现以便一次截多幅图"
 
-#: ../lib/screenshooter-dialogs.c:1056
+#: ../lib/screenshooter-dialogs.c:945
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Action</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">动作</span>"
 
 #. Save option radio button
-#: ../lib/screenshooter-dialogs.c:1081
-msgid "Save in:"
+#: ../lib/screenshooter-dialogs.c:961
+#, fuzzy
+msgid "Save"
 msgstr "保存在:"
 
-#: ../lib/screenshooter-dialogs.c:1089
+#: ../lib/screenshooter-dialogs.c:966
 msgid "Save the screenshot to a PNG file"
 msgstr "保存为 PNG 文件"
 
-#: ../lib/screenshooter-dialogs.c:1104
-msgid "Default save location"
-msgstr "默认保存位置"
-
-#: ../lib/screenshooter-dialogs.c:1114
-msgid "Set the default save location"
-msgstr "设置默认保存位置"
-
-#: ../lib/screenshooter-dialogs.c:1127
+#: ../lib/screenshooter-dialogs.c:975
 msgid "Copy to the clipboard"
 msgstr "复制到剪贴板"
 
-#: ../lib/screenshooter-dialogs.c:1132
+#: ../lib/screenshooter-dialogs.c:977
 msgid "Copy the screenshot to the clipboard so that it can be pasted later"
 msgstr "复制到剪贴板以便之后粘贴"
 
-#: ../lib/screenshooter-dialogs.c:1147
+#: ../lib/screenshooter-dialogs.c:994
 msgid "Open with:"
 msgstr "打开程序:"
 
-#: ../lib/screenshooter-dialogs.c:1158
+#: ../lib/screenshooter-dialogs.c:1000
 msgid "Open the screenshot with the chosen application"
 msgstr "使用所选程序打开截图"
 
-#: ../lib/screenshooter-dialogs.c:1191 ../src/main.c:73
+#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
 msgid "Application to open the screenshot"
 msgstr "用以打开截图的程序"
 
-#: ../lib/screenshooter-dialogs.c:1204
+#: ../lib/screenshooter-dialogs.c:1028
 msgid "Host on ZimageZ"
 msgstr "上传至ZimageZ"
 
-#: ../lib/screenshooter-dialogs.c:1210 ../src/main.c:92
+#: ../lib/screenshooter-dialogs.c:1032 ../src/main.c:80
 msgid "Host the screenshot on ZimageZ, a free online image hosting service"
 msgstr "上传屏幕截图至ZimageZ,一个免费的在线存储图片服务"
 
-#: ../lib/screenshooter-dialogs.c:1255
+#: ../lib/screenshooter-dialogs.c:1046
+#, fuzzy
+msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Preview</span>"
+msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">链接</span>"
+
+#: ../lib/screenshooter-dialogs.c:1107
 msgid "Save screenshot as..."
 msgstr "截图另存为..."
 
-#. Start the user XML RPC session
-#: ../lib/screenshooter-zimagez.c:159
-msgid "Initialize the connection..."
-msgstr "初始化连接..."
+#: ../lib/screenshooter-zimagez.c:134
+#, fuzzy, c-format
+msgid "An error occured when creating the XMLRPC request."
+msgstr "上传屏幕截图时出现一个错误。"
+
+#: ../lib/screenshooter-zimagez.c:153
+#, fuzzy, c-format
+msgid "An error occured when transfering the data to ZimageZ."
+msgstr "上传屏幕截图时出现一个错误。"
+
+#: ../lib/screenshooter-zimagez.c:178
+#, fuzzy, c-format
+msgid "An error occured when parsing the response from ZimageZ."
+msgstr "上传屏幕截图时出现一个错误。"
 
-#: ../lib/screenshooter-zimagez.c:172 ../lib/screenshooter-zimagez.c:332
-#: ../lib/screenshooter-zimagez.c:361 ../lib/screenshooter-zimagez.c:389
-#: ../lib/screenshooter-zimagez.c:520 ../lib/screenshooter-zimagez.c:543
-#: ../lib/screenshooter-zimagez.c:580
+#: ../lib/screenshooter-zimagez.c:228
 #, c-format
-msgid ""
-"An error occurred during the XML exchange: %s (%d).\n"
-" The screenshot could not be uploaded."
+msgid "Taken on %s, at %s"
 msgstr ""
-"XML传送时出现一个错误: %s (%d).\n"
-"该截图无法上传"
 
-#: ../lib/screenshooter-zimagez.c:223
+#. Start the user soup session
+#: ../lib/screenshooter-zimagez.c:295
+msgid "Initialize the connection..."
+msgstr "初始化连接..."
+
+#: ../lib/screenshooter-zimagez.c:341
 msgid ""
 "Please file the following fields with your <a href=\"http://www.zimagez.com"
 "\">ZimageZ</a> \n"
 "user name, passsword and details about the screenshot."
 msgstr ""
-"填写以下栏目,包括您的<a href=\"http://www.zimagez.com"
-"\">ZimageZ</a> \n"
+"填写以下栏目,包括您的<a href=\"http://www.zimagez.com\">ZimageZ</a> \n"
 "用户名,密码以及截图的详细信息。"
 
-#: ../lib/screenshooter-zimagez.c:283
+#: ../lib/screenshooter-zimagez.c:398
 msgid "Check the user information..."
 msgstr "检查用户信息..."
 
-#: ../lib/screenshooter-zimagez.c:305
+#: ../lib/screenshooter-zimagez.c:405
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You "
 "must fill all the fields.</span>"
 msgstr ""
-"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">您"
-"必须填写所有栏目。</span>"
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">您必须"
+"填写所有栏目。</span>"
 
-#: ../lib/screenshooter-zimagez.c:320
+#: ../lib/screenshooter-zimagez.c:419
 msgid "Login on ZimageZ..."
 msgstr "登录到ZimageZ..."
 
-#: ../lib/screenshooter-zimagez.c:436
+#: ../lib/screenshooter-zimagez.c:459 ../lib/screenshooter-zimagez.c:610
+msgid ""
+"An unexpected reply from ZimageZ was received. The upload of the screenshot "
+"failed."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:498
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The "
 "user and the password you entered do not match. Please retry.</span>"
 msgstr ""
-"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">您"
-"输入的用户名和密码有误,请重新输入。</span>"
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">您输入"
+"的用户名和密码有误,请重新输入。</span>"
 
-#: ../lib/screenshooter-zimagez.c:501
+#: ../lib/screenshooter-zimagez.c:556
 msgid "Upload the screenshot..."
 msgstr "上传截图"
 
-#: ../lib/screenshooter-zimagez.c:559
+#: ../lib/screenshooter-zimagez.c:589
 #, c-format
 msgid "An error occurred while uploading the screenshot."
 msgstr "上传屏幕截图时出现一个错误。"
 
 #. End the user session
-#: ../lib/screenshooter-zimagez.c:597
+#: ../lib/screenshooter-zimagez.c:622
 msgid "Close the session on ZimageZ..."
 msgstr "结束与ZimageZ的会话..."
 
-#: ../lib/screenshooter-zimagez.c:650
+#: ../lib/screenshooter-zimagez.c:692
 msgid "Details about the screenshot for ZimageZ"
 msgstr "放上ZimageZ的关于截图的详细信息"
 
 #. Create the user label
-#: ../lib/screenshooter-zimagez.c:692
+#: ../lib/screenshooter-zimagez.c:734
 msgid "User:"
 msgstr "用户:"
 
-#: ../lib/screenshooter-zimagez.c:703
+#: ../lib/screenshooter-zimagez.c:745
 msgid ""
 "Your Zimagez user name, if you do not have one yet please create one on the "
 "Web page linked above"
 msgstr ""
-"您的ZimageZ用户名,如果您还未拥有一个ZimageZ用户名,请点击上方"
-"的网页链接创建"
+"您的ZimageZ用户名,如果您还未拥有一个ZimageZ用户名,请点击上方的网页链接创建"
 
 #. Create the password label
-#: ../lib/screenshooter-zimagez.c:708
+#: ../lib/screenshooter-zimagez.c:751
 msgid "Password:"
 msgstr "密码:"
 
-#: ../lib/screenshooter-zimagez.c:718
+#: ../lib/screenshooter-zimagez.c:761
 msgid "The password for the user above"
 msgstr "上方填写的用户的密码"
 
 #. Create the title label
-#: ../lib/screenshooter-zimagez.c:723
+#: ../lib/screenshooter-zimagez.c:767
 msgid "Title:"
 msgstr "标题:"
 
-#: ../lib/screenshooter-zimagez.c:733
+#: ../lib/screenshooter-zimagez.c:777
 msgid ""
 "The title of the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
-msgstr ""
-"屏幕截图的标题,将会在ZimageZ上显示该截图时出现"
+msgstr "屏幕截图的标题,将会在ZimageZ上显示该截图时出现"
 
 #. Create the comment label
-#: ../lib/screenshooter-zimagez.c:738
+#: ../lib/screenshooter-zimagez.c:783
 msgid "Comment:"
 msgstr "注释:"
 
-#: ../lib/screenshooter-zimagez.c:749
+#: ../lib/screenshooter-zimagez.c:794
 msgid ""
 "A comment on the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
-msgstr ""
-"屏幕截图的注释,将会在ZimageZ上显示该截图时出现"
+msgstr "屏幕截图的注释,将会在ZimageZ上显示该截图时出现"
 
-
-#: ../lib/screenshooter-zimagez.c:870
+#: ../lib/screenshooter-zimagez.c:917
 #, c-format
 msgid "<a href=\"%s\">Full size image</a>"
 msgstr "<a href=\"%s\">完整大小</a>"
 
-#: ../lib/screenshooter-zimagez.c:872
+#: ../lib/screenshooter-zimagez.c:919
 #, c-format
 msgid "<a href=\"%s\">Large thumbnail</a>"
 msgstr "<a href=\"%s\">大缩略图</a>"
 
-#: ../lib/screenshooter-zimagez.c:874
+#: ../lib/screenshooter-zimagez.c:921
 #, c-format
 msgid "<a href=\"%s\">Small thumbnail</a>"
 msgstr "<a href=\"%s\">小缩略图</a>"
 
-#: ../lib/screenshooter-zimagez.c:894
+#: ../lib/screenshooter-zimagez.c:937
 msgid "My screenshot on ZimageZ"
 msgstr "我在ZimageZ上的截图"
 
-#: ../lib/screenshooter-zimagez.c:920
+#: ../lib/screenshooter-zimagez.c:963
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Links</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">链接</span>"
 
-#: ../lib/screenshooter-zimagez.c:965
+#: ../lib/screenshooter-zimagez.c:1008
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing "
 "to the full size image</span>"
 msgstr ""
-"<span weight=\"bold\" stretch=\"semiexpanded\">显示一幅缩略图链接至"
-"完整大小的图像</span>"
+"<span weight=\"bold\" stretch=\"semiexpanded\">显示一幅缩略图链接至完整大小的"
+"图像</span>"
 
 #. HTML title
-#: ../lib/screenshooter-zimagez.c:981
+#: ../lib/screenshooter-zimagez.c:1024
 msgid "HTML"
 msgstr "HTML"
 
 #. BB title
-#: ../lib/screenshooter-zimagez.c:1002
+#: ../lib/screenshooter-zimagez.c:1045
 msgid "BBCode for forums"
 msgstr "在论坛中使用的BBCode"
 
-#: ../lib/screenshooter-zimagez.c:1122
+#: ../lib/screenshooter-zimagez.c:1174
 msgid "ZimageZ"
 msgstr "ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:1155
+#: ../lib/screenshooter-zimagez.c:1207
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Status</span>"
 msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">状态</span>"
 
@@ -362,36 +341,45 @@ msgstr "打开链接(_O):"
 msgid "Copy _Link Address"
 msgstr "复制链接地址(_L)"
 
-#: ../src/main.c:53
+#: ../src/main.c:48
 msgid "Delay in seconds before taking the screenshot"
 msgstr "截图前延迟(秒)"
 
-#: ../src/main.c:63
-msgid "Do not display the save dialog"
-msgstr "不弹出保存对话框"
-
-#: ../src/main.c:68
-msgid "Do not display the mouse on the screenshot"
+#: ../src/main.c:58
+#, fuzzy
+msgid "Display the mouse on the screenshot"
 msgstr "不抓取鼠标光标"
 
-#: ../src/main.c:85
+#: ../src/main.c:75
 msgid "Directory where the screenshot will be saved"
 msgstr "截图保存到的目录"
 
-#: ../src/main.c:99
+#: ../src/main.c:85
 msgid "Version information"
 msgstr "版本信息"
 
+#: ../src/main.c:134
+#, c-format
+msgid "Conflicting options: --%s and --%s cannot be used at the same time.\n"
+msgstr ""
+
 #: ../src/main.c:136
 #, c-format
 msgid ""
+"The --%s option is only used when --fullscreen, --window or --region is "
+"given. It will be ignored.\n"
+msgstr ""
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
 "%s: %s\n"
 "运行 %s --help 查看全部可用的命令行参数列表。\n"
 
-#: ../src/main.c:235
+#: ../src/main.c:282
 #, c-format
 msgid "%s is not a valid directory, the default directory will be used."
 msgstr "%s 不是一个有效目录,将使用默认目录。"
@@ -402,6 +390,48 @@ msgid ""
 "Take screenshots of the entire screen, of the active window or of a region"
 msgstr "截取全屏幕或当前活动窗口或某一指定区域图像"
 
+#~ msgid "Screenshot.png"
+#~ msgstr "Screenshot.png"
+
+#~ msgid "Screenshot-%d.png"
+#~ msgstr "Screenshot-%d.png"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
+#~ msgstr "<span weight=\"bold\" stretch=\"semiexpanded\">截图之后</span>"
+
+#~ msgid "Show the save dialog"
+#~ msgstr "显示保存对话框"
+
+#~ msgid ""
+#~ "The save dialog allows you to change the file name and the save location"
+#~ msgstr "保存对话框允许您改变默认保存的文件名和位置"
+
+#~ msgid "Close the application"
+#~ msgstr "关闭程序"
+
+#~ msgid ""
+#~ "If unchecked, the current window will be displayed again after the "
+#~ "screenshot has been taken to allow you to take several screenshots in a "
+#~ "row"
+#~ msgstr "如果未选中此项,当前窗口会在截图之后再次出现以便一次截多幅图"
+
+#~ msgid "Default save location"
+#~ msgstr "默认保存位置"
+
+#~ msgid "Set the default save location"
+#~ msgstr "设置默认保存位置"
+
+#~ msgid ""
+#~ "An error occurred during the XML exchange: %s (%d).\n"
+#~ " The screenshot could not be uploaded."
+#~ msgstr ""
+#~ "XML传送时出现一个错误: %s (%d).\n"
+#~ "该截图无法上传"
+
+#~ msgid "Do not display the save dialog"
+#~ msgstr "不弹出保存对话框"
+
 #~ msgid "Tak a screenshot of the entire screen"
 #~ msgstr "截取全屏幕图像"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index f1e9d20..2a6a936 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-screenshooter-plugin 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-31 14:02+0200\n"
+"POT-Creation-Date: 2009-11-15 00:29+0100\n"
 "PO-Revision-Date: 2007-03-10 18:05+0800\n"
 "Last-Translator: Dsewnr Lu <dsewnr at gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n at linux.org.tw>\n"
@@ -15,335 +15,319 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/screenshooter-dialogs.c:283
-#, fuzzy
-msgid "Screenshot.png"
-msgstr "螢幕快照"
-
-#: ../lib/screenshooter-dialogs.c:300
-#, fuzzy, c-format
-msgid "Screenshot-%d.png"
-msgstr "螢幕快照"
-
-#: ../lib/screenshooter-dialogs.c:493
+#: ../lib/screenshooter-dialogs.c:478
 #, c-format
 msgid "%.2fKb of %.2fKb"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:577
+#: ../lib/screenshooter-dialogs.c:560
 msgid "Transfer"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:600
+#: ../lib/screenshooter-dialogs.c:581
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">The screenshot is being "
 "transferred to:</span>"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:724 ../lib/screenshooter-dialogs.c:741
+#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
 #, fuzzy
 msgid "Screenshot"
 msgstr "螢幕快照"
 
-#: ../lib/screenshooter-dialogs.c:736
+#: ../lib/screenshooter-dialogs.c:709
 #, fuzzy
 msgid "Take a screenshot"
 msgstr " 進行一次螢幕快照"
 
-#: ../lib/screenshooter-dialogs.c:751
+#: ../lib/screenshooter-dialogs.c:724
 msgid "Preferences"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:793
+#: ../lib/screenshooter-dialogs.c:754
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Region to capture</span>"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:820
+#: ../lib/screenshooter-dialogs.c:774
 msgid "Entire screen"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:830 ../src/main.c:58
-#: ../panel-plugin/screenshooter-plugin.c:292
+#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../panel-plugin/screenshooter-plugin.c:308
 #, fuzzy
 msgid "Take a screenshot of the entire screen"
 msgstr " 進行一次螢幕快照"
 
-#: ../lib/screenshooter-dialogs.c:841
+#: ../lib/screenshooter-dialogs.c:789
 msgid "Active window"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:851 ../src/main.c:104
-#: ../panel-plugin/screenshooter-plugin.c:297
+#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../panel-plugin/screenshooter-plugin.c:313
 #, fuzzy
 msgid "Take a screenshot of the active window"
 msgstr " 進行一次螢幕快照"
 
-#: ../lib/screenshooter-dialogs.c:862
+#: ../lib/screenshooter-dialogs.c:804
 msgid "Select a region"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:872 ../src/main.c:78
-#: ../panel-plugin/screenshooter-plugin.c:302
+#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../panel-plugin/screenshooter-plugin.c:318
 msgid ""
 "Select a region to be captured by clicking a point of the screen without "
 "releasing the mouse button, dragging your mouse to the other corner of the "
 "region, and releasing the mouse button."
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:884
+#: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:892
+#: ../lib/screenshooter-dialogs.c:824
 #, fuzzy
 msgid "Display the mouse pointer on the screenshot"
 msgstr " 進行一次螢幕快照"
 
-#: ../lib/screenshooter-dialogs.c:917
+#: ../lib/screenshooter-dialogs.c:840
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Delay before capturing</span>"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:952
+#: ../lib/screenshooter-dialogs.c:862
 #, fuzzy
 msgid "Delay in seconds before the screenshot is taken"
 msgstr " 進行一次螢幕快照"
 
-#: ../lib/screenshooter-dialogs.c:958
+#: ../lib/screenshooter-dialogs.c:865
 msgid "seconds"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:984
-msgid "<span weight=\"bold\" stretch=\"semiexpanded\">After capturing</span>"
-msgstr ""
-
-#. Display the save dialog checkbox
-#: ../lib/screenshooter-dialogs.c:1007
-msgid "Show the save dialog"
-msgstr ""
-
-#: ../lib/screenshooter-dialogs.c:1013
-msgid ""
-"The save dialog allows you to change the file name and the save location"
-msgstr ""
-
-#: ../lib/screenshooter-dialogs.c:1027
-msgid "Close the application"
-msgstr ""
-
-#: ../lib/screenshooter-dialogs.c:1033
-msgid ""
-"If unchecked, the current window will be displayed again after the "
-"screenshot has been taken to allow you to take several screenshots in a row"
+#: ../lib/screenshooter-dialogs.c:917
+msgid "Action"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1056
+#: ../lib/screenshooter-dialogs.c:945
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Action</span>"
 msgstr ""
 
 #. Save option radio button
-#: ../lib/screenshooter-dialogs.c:1081
-msgid "Save in:"
+#: ../lib/screenshooter-dialogs.c:961
+msgid "Save"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1089
+#: ../lib/screenshooter-dialogs.c:966
 #, fuzzy
 msgid "Save the screenshot to a PNG file"
 msgstr "另存螢幕快照為 ..."
 
-#: ../lib/screenshooter-dialogs.c:1104
-msgid "Default save location"
-msgstr ""
-
-#: ../lib/screenshooter-dialogs.c:1114
-msgid "Set the default save location"
-msgstr ""
-
-#: ../lib/screenshooter-dialogs.c:1127
+#: ../lib/screenshooter-dialogs.c:975
 msgid "Copy to the clipboard"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1132
+#: ../lib/screenshooter-dialogs.c:977
 msgid "Copy the screenshot to the clipboard so that it can be pasted later"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1147
+#: ../lib/screenshooter-dialogs.c:994
 msgid "Open with:"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1158
+#: ../lib/screenshooter-dialogs.c:1000
 msgid "Open the screenshot with the chosen application"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1191 ../src/main.c:73
+#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
 #, fuzzy
 msgid "Application to open the screenshot"
 msgstr " 進行一次螢幕快照"
 
-#: ../lib/screenshooter-dialogs.c:1204
+#: ../lib/screenshooter-dialogs.c:1028
 msgid "Host on ZimageZ"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1210 ../src/main.c:92
+#: ../lib/screenshooter-dialogs.c:1032 ../src/main.c:80
 msgid "Host the screenshot on ZimageZ, a free online image hosting service"
 msgstr ""
 
-#: ../lib/screenshooter-dialogs.c:1255
+#: ../lib/screenshooter-dialogs.c:1046
+msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Preview</span>"
+msgstr ""
+
+#: ../lib/screenshooter-dialogs.c:1107
 #, fuzzy
 msgid "Save screenshot as..."
 msgstr "另存螢幕快照為 ..."
 
-#. Start the user XML RPC session
-#: ../lib/screenshooter-zimagez.c:159
-msgid "Initialize the connection..."
+#: ../lib/screenshooter-zimagez.c:134
+#, c-format
+msgid "An error occured when creating the XMLRPC request."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:172 ../lib/screenshooter-zimagez.c:332
-#: ../lib/screenshooter-zimagez.c:361 ../lib/screenshooter-zimagez.c:389
-#: ../lib/screenshooter-zimagez.c:520 ../lib/screenshooter-zimagez.c:543
-#: ../lib/screenshooter-zimagez.c:580
+#: ../lib/screenshooter-zimagez.c:153
 #, c-format
-msgid ""
-"An error occurred during the XML exchange: %s (%d).\n"
-" The screenshot could not be uploaded."
+msgid "An error occured when transfering the data to ZimageZ."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:223
+#: ../lib/screenshooter-zimagez.c:178
+#, c-format
+msgid "An error occured when parsing the response from ZimageZ."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:228
+#, c-format
+msgid "Taken on %s, at %s"
+msgstr ""
+
+#. Start the user soup session
+#: ../lib/screenshooter-zimagez.c:295
+msgid "Initialize the connection..."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:341
 msgid ""
 "Please file the following fields with your <a href=\"http://www.zimagez.com"
 "\">ZimageZ</a> \n"
 "user name, passsword and details about the screenshot."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:283
+#: ../lib/screenshooter-zimagez.c:398
 msgid "Check the user information..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:305
+#: ../lib/screenshooter-zimagez.c:405
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">You "
 "must fill all the fields.</span>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:320
+#: ../lib/screenshooter-zimagez.c:419
 msgid "Login on ZimageZ..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:436
+#: ../lib/screenshooter-zimagez.c:459 ../lib/screenshooter-zimagez.c:610
+msgid ""
+"An unexpected reply from ZimageZ was received. The upload of the screenshot "
+"failed."
+msgstr ""
+
+#: ../lib/screenshooter-zimagez.c:498
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">The "
 "user and the password you entered do not match. Please retry.</span>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:501
+#: ../lib/screenshooter-zimagez.c:556
 #, fuzzy
 msgid "Upload the screenshot..."
 msgstr " 進行一次螢幕快照"
 
-#: ../lib/screenshooter-zimagez.c:559
+#: ../lib/screenshooter-zimagez.c:589
 #, c-format
 msgid "An error occurred while uploading the screenshot."
 msgstr ""
 
 #. End the user session
-#: ../lib/screenshooter-zimagez.c:597
+#: ../lib/screenshooter-zimagez.c:622
 msgid "Close the session on ZimageZ..."
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:650
+#: ../lib/screenshooter-zimagez.c:692
 #, fuzzy
 msgid "Details about the screenshot for ZimageZ"
 msgstr " 進行一次螢幕快照"
 
 #. Create the user label
-#: ../lib/screenshooter-zimagez.c:692
+#: ../lib/screenshooter-zimagez.c:734
 msgid "User:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:703
+#: ../lib/screenshooter-zimagez.c:745
 msgid ""
 "Your Zimagez user name, if you do not have one yet please create one on the "
 "Web page linked above"
 msgstr ""
 
 #. Create the password label
-#: ../lib/screenshooter-zimagez.c:708
+#: ../lib/screenshooter-zimagez.c:751
 msgid "Password:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:718
+#: ../lib/screenshooter-zimagez.c:761
 msgid "The password for the user above"
 msgstr ""
 
 #. Create the title label
-#: ../lib/screenshooter-zimagez.c:723
+#: ../lib/screenshooter-zimagez.c:767
 msgid "Title:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:733
+#: ../lib/screenshooter-zimagez.c:777
 msgid ""
 "The title of the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
 msgstr ""
 
 #. Create the comment label
-#: ../lib/screenshooter-zimagez.c:738
+#: ../lib/screenshooter-zimagez.c:783
 msgid "Comment:"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:749
+#: ../lib/screenshooter-zimagez.c:794
 msgid ""
 "A comment on the screenshot, it will be used when displaying the screenshot "
 "on ZimageZ"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:870
+#: ../lib/screenshooter-zimagez.c:917
 #, c-format
 msgid "<a href=\"%s\">Full size image</a>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:872
+#: ../lib/screenshooter-zimagez.c:919
 #, c-format
 msgid "<a href=\"%s\">Large thumbnail</a>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:874
+#: ../lib/screenshooter-zimagez.c:921
 #, c-format
 msgid "<a href=\"%s\">Small thumbnail</a>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:894
+#: ../lib/screenshooter-zimagez.c:937
 #, fuzzy
 msgid "My screenshot on ZimageZ"
 msgstr " 進行一次螢幕快照"
 
-#: ../lib/screenshooter-zimagez.c:920
+#: ../lib/screenshooter-zimagez.c:963
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Links</span>"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:965
+#: ../lib/screenshooter-zimagez.c:1008
 msgid ""
 "<span weight=\"bold\" stretch=\"semiexpanded\">Code for a thumbnail pointing "
 "to the full size image</span>"
 msgstr ""
 
 #. HTML title
-#: ../lib/screenshooter-zimagez.c:981
+#: ../lib/screenshooter-zimagez.c:1024
 msgid "HTML"
 msgstr ""
 
 #. BB title
-#: ../lib/screenshooter-zimagez.c:1002
+#: ../lib/screenshooter-zimagez.c:1045
 msgid "BBCode for forums"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:1122
+#: ../lib/screenshooter-zimagez.c:1174
 msgid "ZimageZ"
 msgstr ""
 
-#: ../lib/screenshooter-zimagez.c:1155
+#: ../lib/screenshooter-zimagez.c:1207
 msgid "<span weight=\"bold\" stretch=\"semiexpanded\">Status</span>"
 msgstr ""
 
@@ -357,35 +341,43 @@ msgstr ""
 msgid "Copy _Link Address"
 msgstr ""
 
-#: ../src/main.c:53
+#: ../src/main.c:48
 msgid "Delay in seconds before taking the screenshot"
 msgstr ""
 
-#: ../src/main.c:63
-msgid "Do not display the save dialog"
-msgstr ""
-
-#: ../src/main.c:68
+#: ../src/main.c:58
 #, fuzzy
-msgid "Do not display the mouse on the screenshot"
+msgid "Display the mouse on the screenshot"
 msgstr " 進行一次螢幕快照"
 
-#: ../src/main.c:85
+#: ../src/main.c:75
 msgid "Directory where the screenshot will be saved"
 msgstr ""
 
-#: ../src/main.c:99
+#: ../src/main.c:85
 msgid "Version information"
 msgstr ""
 
+#: ../src/main.c:134
+#, c-format
+msgid "Conflicting options: --%s and --%s cannot be used at the same time.\n"
+msgstr ""
+
 #: ../src/main.c:136
 #, c-format
 msgid ""
+"The --%s option is only used when --fullscreen, --window or --region is "
+"given. It will be ignored.\n"
+msgstr ""
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
 
-#: ../src/main.c:235
+#: ../src/main.c:282
 #, c-format
 msgid "%s is not a valid directory, the default directory will be used."
 msgstr ""
@@ -398,6 +390,14 @@ msgid ""
 msgstr " 進行一次螢幕快照"
 
 #, fuzzy
+#~ msgid "Screenshot.png"
+#~ msgstr "螢幕快照"
+
+#, fuzzy
+#~ msgid "Screenshot-%d.png"
+#~ msgstr "螢幕快照"
+
+#, fuzzy
 #~ msgid "Tak a screenshot of the entire screen"
 #~ msgstr " 進行一次螢幕快照"
 



More information about the Xfce4-commits mailing list