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

Nick Schermer noreply at xfce.org
Mon Dec 14 16:24:15 CET 2009


Updating branch refs/heads/master
         to 5a1cb2a2983c0a5887d78f617efa8cd987280170 (commit)
       from e3949082d79899fbb787ccd45429d1d4d7d5b987 (commit)

commit 5a1cb2a2983c0a5887d78f617efa8cd987280170
Author: Nick Schermer <nick at xfce.org>
Date:   Mon Dec 14 16:04:29 2009 +0100

    Update po files.

 po/Terminal.pot |  248 ++++-------------
 po/ar.po        |  325 +++++++++-------------
 po/ast.po       |  656 ++++++++++++++++++++++++--------------------
 po/be.po        |  594 ++++++++++++++++++++++------------------
 po/ca.po        |  623 +++++++++++++++++++++++------------------
 po/cs.po        |  612 +++++++++++++++++++++++------------------
 po/da.po        |  633 +++++++++++++++++++++++-------------------
 po/de.po        |  631 +++++++++++++++++++++++-------------------
 po/dz.po        |  637 +++++++++++++++++++++++-------------------
 po/el.po        |  652 ++++++++++++++++++++++++--------------------
 po/en_GB.po     |  606 +++++++++++++++++++++++------------------
 po/eo.po        |  621 +++++++++++++++++++++++------------------
 po/es.po        |  674 ++++++++++++++++++++++++--------------------
 po/et.po        |  587 +++++++++++++++++++++------------------
 po/eu.po        |  613 ++++++++++++++++++++++------------------
 po/fi.po        |  596 ++++++++++++++++++++++------------------
 po/fr.po        |  653 ++++++++++++++++++++++++--------------------
 po/gl.po        |  592 +++++++++++++++++++++-------------------
 po/he.po        |  613 +++++++++++++++++++++++------------------
 po/hu.po        |  609 ++++++++++++++++++++++------------------
 po/id.po        |  635 +++++++++++++++++++++++-------------------
 po/it.po        |  832 ++++++++++++++++++++++++++++++++++---------------------
 po/ja.po        |  617 +++++++++++++++++++++++------------------
 po/kk.po        |  587 +++++++++++++++++++++------------------
 po/ko.po        |  575 +++++++++++++++++++++-----------------
 po/ku.po        |  257 +++++-------------
 po/lt.po        |  248 ++++-------------
 po/lv.po        |  628 +++++++++++++++++++++++-------------------
 po/nb.po        |  576 +++++++++++++++++++++-----------------
 po/nl.po        |  600 ++++++++++++++++++++++------------------
 po/pa.po        |  275 ++++++-------------
 po/pl.po        |  558 ++++++++++++++++++++-----------------
 po/pt.po        |  753 +++++++++++++++++++++++++++++++-------------------
 po/pt_BR.po     |  656 ++++++++++++++++++++++++-------------------
 po/ro.po        |  627 ++++++++++++++++++++++++------------------
 po/ru.po        |  644 +++++++++++++++++++++++-------------------
 po/sk.po        |  606 ++++++++++++++++++++++------------------
 po/sq.po        |  629 +++++++++++++++++++++++------------------
 po/sv.po        |  643 ++++++++++++++++++++++++-------------------
 po/tr.po        |  617 +++++++++++++++++++++++------------------
 po/uk.po        |  643 ++++++++++++++++++++++++-------------------
 po/ur.po        |  610 +++++++++++++++++++++++------------------
 po/ur_PK.po     |  610 +++++++++++++++++++++++------------------
 po/vi.po        |  583 ++++++++++++++++++++++-----------------
 po/zh_CN.po     |  515 +++++++++++++++++++---------------
 po/zh_TW.po     |  332 +++++++++--------------
 46 files changed, 14437 insertions(+), 12194 deletions(-)

diff --git a/po/Terminal.pot b/po/Terminal.pot
index f20fd33..b1ab847 100644
--- a/po/Terminal.pot
+++ b/po/Terminal.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 11:48+0100\n"
+"POT-Creation-Date: 2009-12-14 16:03+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,206 +16,83 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../terminal/main.c:46
+#: ../terminal/main.c:48
 msgid "Usage:"
 msgstr ""
 
-#: ../terminal/main.c:47
+#: ../terminal/main.c:48
 msgid "OPTION"
 msgstr ""
 
-#: ../terminal/main.c:49
+#: ../terminal/main.c:53
 msgid "General Options"
 msgstr ""
 
-#: ../terminal/main.c:50
-msgid "  -h, --help                          Print this help message and exit"
+#. parameter of --default-display
+#. parameter of --display
+#: ../terminal/main.c:55 ../terminal/main.c:81
+msgid "display"
 msgstr ""
 
-#: ../terminal/main.c:51
-msgid ""
-"  -V, --version                       Print version information and exit"
-msgstr ""
-
-#: ../terminal/main.c:52
-msgid ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
-msgstr ""
-
-#: ../terminal/main.c:54
-msgid "  --default-display=DISPLAY           default X display to use"
-msgstr ""
-
-#: ../terminal/main.c:55
-msgid ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
+#. parameter of --default-working-directory
+#. parameter of --working-directory
+#: ../terminal/main.c:57 ../terminal/main.c:72
+msgid "directory"
 msgstr ""
 
-#: ../terminal/main.c:58
+#: ../terminal/main.c:61
 msgid "Window or Tab Separators"
 msgstr ""
 
-#: ../terminal/main.c:59
-msgid ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-msgstr ""
-
-#: ../terminal/main.c:62
-msgid ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-msgstr ""
-
 #: ../terminal/main.c:66
 msgid "Tab Options"
 msgstr ""
 
-#: ../terminal/main.c:67
-msgid ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-msgstr ""
-
-#: ../terminal/main.c:69
-msgid ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-msgstr ""
-
-#: ../terminal/main.c:71
-msgid ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
+#. parameter of --command
+#: ../terminal/main.c:68
+msgid "command"
 msgstr ""
 
-#: ../terminal/main.c:72
-msgid "  -T, --title=TITLE                   Set the terminal's title"
-msgstr ""
-
-#: ../terminal/main.c:73
-msgid ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-msgstr ""
-
-#: ../terminal/main.c:76
-msgid "Window Options"
-msgstr ""
-
-#: ../terminal/main.c:77
-msgid ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
+#. parameter of --title
+#: ../terminal/main.c:70
+msgid "title"
 msgstr ""
 
 #: ../terminal/main.c:79
-msgid ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
-msgstr ""
-
-#: ../terminal/main.c:82
-msgid ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
-msgstr ""
-
-#: ../terminal/main.c:86
-msgid ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
-msgstr ""
-
-#: ../terminal/main.c:88
-msgid ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
-msgstr ""
-
-#: ../terminal/main.c:90
-msgid ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+msgid "Window Options"
 msgstr ""
 
-#: ../terminal/main.c:95
-msgid ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
+#. parameter of --geometry
+#: ../terminal/main.c:83
+msgid "geometry"
 msgstr ""
 
-#: ../terminal/main.c:99
-msgid ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#. parameter of --role
+#: ../terminal/main.c:85
+msgid "role"
 msgstr ""
 
-#: ../terminal/main.c:104
-msgid ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#. parameter of --startup-id
+#: ../terminal/main.c:87
+msgid "string"
 msgstr ""
 
-#: ../terminal/main.c:109
-msgid ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
+#. parameter of --icon
+#: ../terminal/main.c:89
+msgid "icon"
 msgstr ""
 
-#: ../terminal/main.c:114
-msgid ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-
-#: ../terminal/main.c:119
-msgid ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-
-#: ../terminal/main.c:124
-msgid ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#: ../terminal/main.c:91
+#, c-format
+msgid "See the %s man page for full explanation of the options above."
 msgstr ""
 
-#: ../terminal/main.c:151 ../terminal/terminal-preferences.c:1263
+#: ../terminal/main.c:118 ../terminal/terminal-preferences.c:1263
 #: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr ""
 
-#: ../terminal/main.c:173
+#: ../terminal/main.c:135
 #, c-format
 msgid ""
 "%s (Xfce %s)\n"
@@ -230,31 +107,26 @@ msgid ""
 "Please report bugs to <%s>.\n"
 msgstr ""
 
-#: ../terminal/main.c:267
+#: ../terminal/main.c:239
 #, c-format
 msgid "Unable to register terminal service: %s\n"
 msgstr ""
 
-#: ../terminal/main.c:276
-#, c-format
-msgid "Unable to launch terminal: %s\n"
-msgstr ""
-
-#: ../terminal/terminal-app.c:551
+#: ../terminal/terminal-app.c:554
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr ""
 
-#: ../terminal/terminal-dbus.c:114
+#: ../terminal/terminal-dbus.c:108
 msgid "User id mismatch"
 msgstr ""
 
-#: ../terminal/terminal-dbus.c:146
+#: ../terminal/terminal-dbus.c:134
 #, c-format
 msgid "D-BUS message bus disconnected, exiting...\n"
 msgstr ""
 
-#: ../terminal/terminal-dbus.c:208
+#: ../terminal/terminal-dbus.c:196
 #, c-format
 msgid "Unable to register object %s"
 msgstr ""
@@ -276,84 +148,78 @@ msgstr ""
 msgid "Failed to open the documentation browser"
 msgstr ""
 
-#: ../terminal/terminal-options.c:189
+#: ../terminal/terminal-options.c:206
 #, c-format
 msgid ""
 "Option \"--default-display\" requires specifying the default X display as "
 "its parameter"
 msgstr ""
 
-#: ../terminal/terminal-options.c:204
+#: ../terminal/terminal-options.c:221
 #, c-format
 msgid ""
 "Option \"--default-working-directory\" requires specifying the default "
 "working directory as its parameter"
 msgstr ""
 
-#: ../terminal/terminal-options.c:235
-#, c-format
-msgid ""
-"Option \"--sm-client-id\" requires specifying the session id as its parameter"
-msgstr ""
-
-#: ../terminal/terminal-options.c:250
+#: ../terminal/terminal-options.c:237
 #, c-format
 msgid ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
 "of the command line"
 msgstr ""
 
-#: ../terminal/terminal-options.c:267
+#: ../terminal/terminal-options.c:254
 #, c-format
 msgid ""
 "Option \"--command/-e\" requires specifying the command to run as its "
 "parameter"
 msgstr ""
 
-#: ../terminal/terminal-options.c:284
+#: ../terminal/terminal-options.c:271
 #, c-format
 msgid ""
 "Option \"--working-directory\" requires specifying the working directory as "
 "its parameter"
 msgstr ""
 
-#: ../terminal/terminal-options.c:299
+#: ../terminal/terminal-options.c:286
 #, c-format
 msgid "Option \"--title/-T\" requires specifying the title as its parameter"
 msgstr ""
 
-#: ../terminal/terminal-options.c:319
+#: ../terminal/terminal-options.c:305
 #, c-format
 msgid ""
 "Option \"--display\" requires specifying the X display as its parameters"
 msgstr ""
 
-#: ../terminal/terminal-options.c:334
+#: ../terminal/terminal-options.c:320
 #, c-format
 msgid ""
 "Option \"--geometry\" requires specifying the window geometry as its "
 "parameter"
 msgstr ""
 
-#: ../terminal/terminal-options.c:349
+#: ../terminal/terminal-options.c:335
 #, c-format
 msgid "Option \"--role\" requires specifying the window role as its parameter"
 msgstr ""
 
-#: ../terminal/terminal-options.c:364
+#: ../terminal/terminal-options.c:350
 #, c-format
 msgid ""
 "Option \"--startup-id\" requires specifying the startup id as its parameter"
 msgstr ""
 
-#: ../terminal/terminal-options.c:379
+#: ../terminal/terminal-options.c:365
 #, c-format
 msgid ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
 "parameter"
 msgstr ""
 
-#: ../terminal/terminal-options.c:435
+#: ../terminal/terminal-options.c:419
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr ""
@@ -422,7 +288,7 @@ msgstr ""
 msgid "Set Title"
 msgstr ""
 
-#: ../terminal/terminal-preferences.c:464
+#: ../terminal/terminal-preferences.c:464 ../terminal/terminal-window.c:237
 msgid "Reset"
 msgstr ""
 
@@ -713,6 +579,10 @@ msgstr ""
 msgid "Reset and C_lear"
 msgstr ""
 
+#: ../terminal/terminal-window.c:238
+msgid "Reset and clear"
+msgstr ""
+
 #: ../terminal/terminal-window.c:239
 msgid "_Go"
 msgstr ""
diff --git a/po/ar.po b/po/ar.po
index 8b75b67..55c8969 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 11:48+0100\n"
+"POT-Creation-Date: 2009-12-14 16:03+0100\n"
 "PO-Revision-Date: 2008-07-18 21:41+0200\n"
 "Last-Translator: Mohamed Magdy <mohamedmk at gmail.com>\n"
 "Language-Team: Arabic <doc at arabeyes.org>\n"
@@ -17,217 +17,91 @@ msgstr ""
 "Plural-Forms: Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : n>=3 && "
 "n<=10 ? 2 : 3\n"
 
-#: ../terminal/main.c:46
+#: ../terminal/main.c:48
 msgid "Usage:"
 msgstr ""
 
-#: ../terminal/main.c:47
+#: ../terminal/main.c:48
 msgid "OPTION"
 msgstr ""
 
-#: ../terminal/main.c:49
+#: ../terminal/main.c:53
 #, fuzzy
 msgid "General Options"
 msgstr "عام"
 
-#: ../terminal/main.c:50
-msgid "  -h, --help                          Print this help message and exit"
-msgstr "  -h, --help                          اطبع رسالة المساعدة هذه ثم اخرج"
-
-#: ../terminal/main.c:51
+#. parameter of --default-display
+#. parameter of --display
+#: ../terminal/main.c:55 ../terminal/main.c:81
 #, fuzzy
-msgid ""
-"  -V, --version                       Print version information and exit"
-msgstr "  -v, --version                       اطبع معلومات الإصدارة ثم اخرج"
+msgid "display"
+msgstr "لا يُعرض"
 
-#: ../terminal/main.c:52
-msgid ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
+#. parameter of --default-working-directory
+#. parameter of --working-directory
+#: ../terminal/main.c:57 ../terminal/main.c:72
+msgid "directory"
 msgstr ""
-"  --disable-server                    لا تسجل مع ناقل\n"
-"                                      رسائل جلسة D-BUS"
 
-#: ../terminal/main.c:54
-msgid "  --default-display=DISPLAY           default X display to use"
-msgstr "  --default-display=DISPLAY           عرض x الإفتراضي اللذي سيُستخدم"
-
-#: ../terminal/main.c:55
-msgid ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
-msgstr ""
-
-#: ../terminal/main.c:58
+#: ../terminal/main.c:61
 msgid "Window or Tab Separators"
 msgstr ""
 
-#: ../terminal/main.c:59
-msgid ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-msgstr ""
-
-#: ../terminal/main.c:62
-msgid ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-msgstr ""
-
 #: ../terminal/main.c:66
 #, fuzzy
 msgid "Tab Options"
 msgstr "موقع اللسان"
 
-#: ../terminal/main.c:67
-msgid ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-msgstr ""
-"  -x, --execute                       نفذّ باقي سطر الأوامر\n"
-"                                      داخل الطرفية"
-
-#: ../terminal/main.c:69
-msgid ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-msgstr ""
-"  -e, --command=STRING                نفِّذ معاملات هذا الخيار داخل الطرفية"
-
-#: ../terminal/main.c:71
-msgid ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
-msgstr "  --working-directory=DIRNAME        حدد مجلّد عمل الطرفية"
-
-#: ../terminal/main.c:72
-msgid "  -T, --title=TITLE                   Set the terminal's title"
-msgstr "  -T, --title=TITLE                   حدد عنوان الطرفية"
+#. parameter of --command
+#: ../terminal/main.c:68
+#, fuzzy
+msgid "command"
+msgstr "<b>أمر</b>"
 
-#: ../terminal/main.c:73
-msgid ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-msgstr ""
+#. parameter of --title
+#: ../terminal/main.c:70
+#, fuzzy
+msgid "title"
+msgstr "العنوان"
 
-#: ../terminal/main.c:76
+#: ../terminal/main.c:79
 #, fuzzy
 msgid "Window Options"
 msgstr "خيار مجهول \"%s\""
 
-#: ../terminal/main.c:77
-msgid ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
+#. parameter of --geometry
+#: ../terminal/main.c:83
+msgid "geometry"
 msgstr ""
 
-#: ../terminal/main.c:79
-msgid ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
-msgstr ""
-
-#: ../terminal/main.c:82
-msgid ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
-msgstr ""
-
-#: ../terminal/main.c:86
-msgid ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
+#. parameter of --role
+#: ../terminal/main.c:85
+msgid "role"
 msgstr ""
 
-#: ../terminal/main.c:88
+#. parameter of --startup-id
+#: ../terminal/main.c:87
 #, fuzzy
-msgid ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
-msgstr ""
-"  -e, --command=STRING                نفِّذ معاملات هذا الخيار داخل الطرفية"
-
-#: ../terminal/main.c:90
-msgid ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-
-#: ../terminal/main.c:95
-msgid ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
-msgstr ""
-
-#: ../terminal/main.c:99
-msgid ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-
-#: ../terminal/main.c:104
-msgid ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-
-#: ../terminal/main.c:109
-msgid ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-
-#: ../terminal/main.c:114
-msgid ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
+msgid "string"
+msgstr "تحذير"
 
-#: ../terminal/main.c:119
-msgid ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
+#. parameter of --icon
+#: ../terminal/main.c:89
+#, fuzzy
+msgid "icon"
+msgstr "إجراء"
 
-#: ../terminal/main.c:124
-msgid ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#: ../terminal/main.c:91
+#, c-format
+msgid "See the %s man page for full explanation of the options above."
 msgstr ""
 
-#: ../terminal/main.c:151 ../terminal/terminal-preferences.c:1263
+#: ../terminal/main.c:118 ../terminal/terminal-preferences.c:1263
 #: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr "طرفية"
 
-#: ../terminal/main.c:173
+#: ../terminal/main.c:135
 #, c-format
 msgid ""
 "%s (Xfce %s)\n"
@@ -250,31 +124,26 @@ msgstr ""
 "\n"
 "فضلا أرسل تقارير العلل إلى <%s>.\n"
 
-#: ../terminal/main.c:267
+#: ../terminal/main.c:239
 #, c-format
 msgid "Unable to register terminal service: %s\n"
 msgstr "تعذّر تسجيل خدمة الطرفية: %s\n"
 
-#: ../terminal/main.c:276
-#, c-format
-msgid "Unable to launch terminal: %s\n"
-msgstr "تعذّر تشغيل الطرفية: %s\n"
-
-#: ../terminal/terminal-app.c:551
+#: ../terminal/terminal-app.c:554
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "سلسلة هندسة غير سليمة \"%s\"\n"
 
-#: ../terminal/terminal-dbus.c:114
+#: ../terminal/terminal-dbus.c:108
 msgid "User id mismatch"
 msgstr "لم يتطابق معرِّف المستخدم"
 
-#: ../terminal/terminal-dbus.c:146
+#: ../terminal/terminal-dbus.c:134
 #, c-format
 msgid "D-BUS message bus disconnected, exiting...\n"
 msgstr "لقد انقطع اتصال رسالة D-BUS، جارِ الخروج...\n"
 
-#: ../terminal/terminal-dbus.c:208
+#: ../terminal/terminal-dbus.c:196
 #, c-format
 msgid "Unable to register object %s"
 msgstr "تعذذر تسجيل الكائن %s"
@@ -298,27 +167,21 @@ msgstr ""
 msgid "Failed to open the documentation browser"
 msgstr "تعذّر فتح متصفح الوثائق"
 
-#: ../terminal/terminal-options.c:189
+#: ../terminal/terminal-options.c:206
 #, c-format
 msgid ""
 "Option \"--default-display\" requires specifying the default X display as "
 "its parameter"
 msgstr ""
 
-#: ../terminal/terminal-options.c:204
+#: ../terminal/terminal-options.c:221
 #, c-format
 msgid ""
 "Option \"--default-working-directory\" requires specifying the default "
 "working directory as its parameter"
 msgstr ""
 
-#: ../terminal/terminal-options.c:235
-#, c-format
-msgid ""
-"Option \"--sm-client-id\" requires specifying the session id as its parameter"
-msgstr "يحتاج الخيار \"--sm-client-id\" لتحديد معرِّف (id) الجلية كمعامل له"
-
-#: ../terminal/terminal-options.c:250
+#: ../terminal/terminal-options.c:237
 #, c-format
 msgid ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
@@ -326,57 +189,57 @@ msgid ""
 msgstr ""
 "يحتاج الخيار \"--execute/-x\" لتحديد الأمر الذي سيشغل على باقي سطر الأوامر"
 
-#: ../terminal/terminal-options.c:267
+#: ../terminal/terminal-options.c:254
 #, c-format
 msgid ""
 "Option \"--command/-e\" requires specifying the command to run as its "
 "parameter"
 msgstr "يحتاج الخيار \"--execute/-x\" لتحديد الأمر الذي سيُشغل كمعامل له"
 
-#: ../terminal/terminal-options.c:284
+#: ../terminal/terminal-options.c:271
 #, c-format
 msgid ""
 "Option \"--working-directory\" requires specifying the working directory as "
 "its parameter"
 msgstr "يحتاج الخيار \"--execute/-x\" لتحديد مجلّد العمل كمعامل له"
 
-#: ../terminal/terminal-options.c:299
+#: ../terminal/terminal-options.c:286
 #, c-format
 msgid "Option \"--title/-T\" requires specifying the title as its parameter"
 msgstr "يحتاج الخيار \"--execute/-x\" لتحديد العنوان كمعامل له"
 
-#: ../terminal/terminal-options.c:319
+#: ../terminal/terminal-options.c:305
 #, c-format
 msgid ""
 "Option \"--display\" requires specifying the X display as its parameters"
 msgstr ""
 
-#: ../terminal/terminal-options.c:334
+#: ../terminal/terminal-options.c:320
 #, c-format
 msgid ""
 "Option \"--geometry\" requires specifying the window geometry as its "
 "parameter"
 msgstr ""
 
-#: ../terminal/terminal-options.c:349
+#: ../terminal/terminal-options.c:335
 #, c-format
 msgid "Option \"--role\" requires specifying the window role as its parameter"
 msgstr ""
 
-#: ../terminal/terminal-options.c:364
+#: ../terminal/terminal-options.c:350
 #, c-format
 msgid ""
 "Option \"--startup-id\" requires specifying the startup id as its parameter"
 msgstr ""
 
-#: ../terminal/terminal-options.c:379
+#: ../terminal/terminal-options.c:365
 #, fuzzy, c-format
 msgid ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
 "parameter"
 msgstr "يحتاج الخيار \"--execute/-x\" لتحديد الأمر الذي سيُشغل كمعامل له"
 
-#: ../terminal/terminal-options.c:435
+#: ../terminal/terminal-options.c:419
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "خيار مجهول \"%s\""
@@ -445,7 +308,7 @@ msgstr "ملء الشاشة"
 msgid "Set Title"
 msgstr "حدِّد العنوان"
 
-#: ../terminal/terminal-preferences.c:464
+#: ../terminal/terminal-preferences.c:464 ../terminal/terminal-window.c:237
 msgid "Reset"
 msgstr "أعد الضبط"
 
@@ -736,6 +599,11 @@ msgstr "_صفر"
 msgid "Reset and C_lear"
 msgstr "أعد الضبط و ا_مسح"
 
+#: ../terminal/terminal-window.c:238
+#, fuzzy
+msgid "Reset and clear"
+msgstr "أعد الضبط وامسح"
+
 #: ../terminal/terminal-window.c:239
 msgid "_Go"
 msgstr "ا_نطلق"
@@ -1396,6 +1264,63 @@ msgstr "_حدِّث سجلّات utmp/wtmp عند إطلاق أمر"
 msgid "seconds"
 msgstr ""
 
+#~ msgid ""
+#~ "  -h, --help                          Print this help message and exit"
+#~ msgstr ""
+#~ "  -h, --help                          اطبع رسالة المساعدة هذه ثم اخرج"
+
+#, fuzzy
+#~ msgid ""
+#~ "  -V, --version                       Print version information and exit"
+#~ msgstr "  -v, --version                       اطبع معلومات الإصدارة ثم اخرج"
+
+#~ msgid ""
+#~ "  --disable-server                    Do not register with the D-BUS\n"
+#~ "                                      session message bus"
+#~ msgstr ""
+#~ "  --disable-server                    لا تسجل مع ناقل\n"
+#~ "                                      رسائل جلسة D-BUS"
+
+#~ msgid "  --default-display=DISPLAY           default X display to use"
+#~ msgstr "  --default-display=DISPLAY           عرض x الإفتراضي اللذي سيُستخدم"
+
+#~ msgid ""
+#~ "  -x, --execute                       Execute the remainder of the "
+#~ "command\n"
+#~ "                                      line inside the terminal"
+#~ msgstr ""
+#~ "  -x, --execute                       نفذّ باقي سطر الأوامر\n"
+#~ "                                      داخل الطرفية"
+
+#~ msgid ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+#~ msgstr ""
+#~ "  -e, --command=STRING                نفِّذ معاملات هذا الخيار داخل الطرفية"
+
+#~ msgid ""
+#~ "  --working-directory=DIRNAME         Set the terminal's working directory"
+#~ msgstr "  --working-directory=DIRNAME        حدد مجلّد عمل الطرفية"
+
+#~ msgid "  -T, --title=TITLE                   Set the terminal's title"
+#~ msgstr "  -T, --title=TITLE                   حدد عنوان الطرفية"
+
+#, fuzzy
+#~ msgid ""
+#~ "  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
+#~ "                                      name or filename"
+#~ msgstr ""
+#~ "  -e, --command=STRING                نفِّذ معاملات هذا الخيار داخل الطرفية"
+
+#~ msgid "Unable to launch terminal: %s\n"
+#~ msgstr "تعذّر تشغيل الطرفية: %s\n"
+
+#~ msgid ""
+#~ "Option \"--sm-client-id\" requires specifying the session id as its "
+#~ "parameter"
+#~ msgstr "يحتاج الخيار \"--sm-client-id\" لتحديد معرِّف (id) الجلية كمعامل له"
+
 #~ msgid "<b>Title:</b>"
 #~ msgstr "<b>العنوان:</b>"
 
diff --git a/po/ast.po b/po/ast.po
index 6b0f048..7712c27 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: terminal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 11:48+0100\n"
+"POT-Creation-Date: 2009-12-14 16:03+0100\n"
 "PO-Revision-Date: 2009-09-02 12:55+0100\n"
 "Last-Translator: astur <malditoastur at gmail.com>\n"
 "Language-Team: Asturian <alministradores at softastur.org>\n"
@@ -11,307 +11,88 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../terminal/main.c:46
+#: ../terminal/main.c:48
 msgid "Usage:"
 msgstr "Usu:"
 
-#: ../terminal/main.c:47
+#: ../terminal/main.c:48
 msgid "OPTION"
 msgstr "OPCIÓN"
 
-#: ../terminal/main.c:49
+#: ../terminal/main.c:53
 msgid "General Options"
 msgstr "Opciones Xenerales"
 
-#: ../terminal/main.c:50
-msgid "  -h, --help                          Print this help message and exit"
-msgstr "  -h, --help                          Amosar esta aida y colar"
-
-#: ../terminal/main.c:51
-msgid ""
-"  -V, --version                       Print version information and exit"
-msgstr "  -v, --version                       Amosar la versión y colar"
-
-#: ../terminal/main.c:52
-msgid ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
-msgstr ""
-"  --disable-server                    Nun rexistrase nel bus de\n"
-"                                      mensaxes de sesión D-BUS"
-
-#: ../terminal/main.c:54
-msgid "  --default-display=DISPLAY           default X display to use"
-msgstr "  --default-display=DISPLAY           display X predetermináu"
+#. parameter of --default-display
+#. parameter of --display
+#: ../terminal/main.c:55 ../terminal/main.c:81
+#, fuzzy
+msgid "display"
+msgstr "Nun s'amuesa"
 
-#: ../terminal/main.c:55
-msgid ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
+#. parameter of --default-working-directory
+#. parameter of --working-directory
+#: ../terminal/main.c:57 ../terminal/main.c:72
+msgid "directory"
 msgstr ""
-"  --default-working-directory=DIR     Afita'l direutoriu de trabayu por\n"
-"                                      defeutu del terminal"
 
-#: ../terminal/main.c:58
+#: ../terminal/main.c:61
 msgid "Window or Tab Separators"
 msgstr "Ventana o Separtadores de Tabulador"
 
-#: ../terminal/main.c:59
-msgid ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-msgstr ""
-"  --tab                               Abre una nueva llingüeta na cabera\n"
-"                                      ventana especificada; pueden usase\n"
-"                                      más d'una d'estes opciones"
-
-#: ../terminal/main.c:62
-msgid ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-msgstr ""
-"  --window                            Abre una ventana conteniendo una "
-"llingüeta;\n"
-"                                      Puede apurrise más d'una d'estes\n"
-"                                      opciones"
-
 #: ../terminal/main.c:66
 msgid "Tab Options"
 msgstr "Opciones de Tabulador"
 
-#: ../terminal/main.c:67
-msgid ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-msgstr ""
-"  -x, --execute                       Executar lo que queda de la llinia de "
-"comandos\n"
-"                                      nel terminal"
-
-#: ../terminal/main.c:69
-msgid ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-msgstr ""
-"  -e, --command=CADENA                Executar l'argumentu d'esta opción\n"
-"                                      dientro del terminal"
-
-#: ../terminal/main.c:71
-msgid ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
-msgstr ""
-"  --working-directory=DIR             Afitar el direutoriu de trabayu del "
-"terminal"
-
-#: ../terminal/main.c:72
-msgid "  -T, --title=TITLE                   Set the terminal's title"
-msgstr "  -T, --title=TITLE                   Afitar el títulu del terminal"
+#. parameter of --command
+#: ../terminal/main.c:68
+#, fuzzy
+msgid "command"
+msgstr "<b>Comandu</b>"
 
-#: ../terminal/main.c:73
-msgid ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-msgstr ""
-"  -H, --hold                          Nun afarar darréu la llingüeta\n"
-"                                      cuando'l comandu fíu termina"
+#. parameter of --title
+#: ../terminal/main.c:70
+#, fuzzy
+msgid "title"
+msgstr "Títulu"
 
-#: ../terminal/main.c:76
+#: ../terminal/main.c:79
 msgid "Window Options"
 msgstr "Opciones de Ventana"
 
-#: ../terminal/main.c:77
-msgid ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
+#. parameter of --geometry
+#: ../terminal/main.c:83
+msgid "geometry"
 msgstr ""
-"  --display=DISPLAY                   Display X a usar pa la cabera\n"
-"                                      ventana especificada"
 
-#: ../terminal/main.c:79
-msgid ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
-msgstr ""
-"  --geometry=GEOMETRY                 especificación de la xeometría X (ver "
-"la\n"
-"                                      páxina de manual de \"X\"), que "
-"puede \n"
-"                                      especificase una vegada por cada "
-"ventana pa\n"
-"                                      abrir"
-
-#: ../terminal/main.c:82
-msgid ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
+#. parameter of --role
+#: ../terminal/main.c:85
+msgid "role"
 msgstr ""
-"  --role=ROL                          Afitar el rol pa la cabera ventana\n"
-"                                      especificada; aplícase solamente a "
-"una\n"
-"                                      ventana; puede especificase una "
-"vegada\n"
-"                                      por cada ventana que cria na llinia "
-"de\n"
-"                                      comandos"
-
-#: ../terminal/main.c:86
-msgid ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
-msgstr ""
-"  --startup-id=CADENA                 ID pal protocolu de\n"
-"                                      notificación d'arranque"
 
-#: ../terminal/main.c:88
-msgid ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
-msgstr ""
-"  -I, --icon=ICON                     Afita l'iconu de terminal como un "
-"iconu\n"
-"                                      nome o nome de ficheru"
+#. parameter of --startup-id
+#: ../terminal/main.c:87
+#, fuzzy
+msgid "string"
+msgstr "Curiáu"
 
-#: ../terminal/main.c:90
-msgid ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --fullscreen                        Alluga la cabera ventana especificada\n"
-"                                      a pantalla completa; aplícase namái a "
-"una\n"
-"                                      ventana; puede especificase una vegada "
-"por\n"
-"                                      cada ventana que cree dende la llinia "
-"de\n"
-"                                      comandos."
-
-#: ../terminal/main.c:95
-msgid ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
-msgstr ""
-"  --maximize                          Maximizar la cabera ventana\n"
-"                                      especificada; aplícase namái a una\n"
-"                                      ventana; puede especificase una "
-"vegada\n"
-"                                      por cada ventana que cria na llinia "
-"de\n"
-"                                      comandos"
-
-#: ../terminal/main.c:99
-msgid ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-menubar                      Amuesa la barra de menú pa la cabera\n"
-"                                      ventana especificada; aplícase a namái "
-"una\n"
-"                                      ventana; puede especificase una vegada "
-"por cada\n"
-"                                      ventana creada dende la llinia de "
-"comandos"
-
-#: ../terminal/main.c:104
-msgid ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --hide-menubar                      Tapez la barra de menú pa la cabera\n"
-"                                      ventana especificada; namái aplicable "
-"a una\n"
-"                                      ventana; puede especificase pa cada\n"
-"                                      ventana que cree dende la llinia de "
-"comandos"
-
-#: ../terminal/main.c:109
-msgid ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --show-borders                      Amuesa les decoraciones de ventana pa\n"
-"                                      la cabera ventana especificada; "
-"aplicable namái\n"
-"                                      a una ventana; puede especificase una "
-"vegada\n"
-"                                      pa cada ventana que cria dende la "
-"llinia\n"
-"                                      de comandos"
-
-#: ../terminal/main.c:114
-msgid ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --hide-borders                      Tapez les decoraciones de la ventana "
-"pa\n"
-"                                      la cabera ventana especificada; "
-"aplicable\n"
-"                                      a solamente una ventana; puede "
-"especificase una\n"
-"                                      vegada por cada ventana que cree dende "
-"la llinia de\n"
-"                                      comandos"
-
-#: ../terminal/main.c:119
-msgid ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-toolbars                     Amuesa les barres de xeres pa la "
-"cabera ventana\n"
-"                                      especificada; aplicable a solamente "
-"una ventana;\n"
-"                                      puede especificase una vegada por cada "
-"ventana que\n"
-"                                      cree dende la llinia de comandos"
-
-#: ../terminal/main.c:124
-msgid ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#. parameter of --icon
+#: ../terminal/main.c:89
+#, fuzzy
+msgid "icon"
+msgstr "Aición"
+
+#: ../terminal/main.c:91
+#, c-format
+msgid "See the %s man page for full explanation of the options above."
 msgstr ""
-"  --hide-toolbars                     Tapez les barres de ferramientes pa\n"
-"                                      la cabera ventana especificada; "
-"aplicable a solamente\n"
-"                                      una ventana; puede especificase una "
-"vegada por cada\n"
-"                                      ventana que cree dende la llinia de "
-"comandos"
-
-#: ../terminal/main.c:151 ../terminal/terminal-preferences.c:1263
+
+#: ../terminal/main.c:118 ../terminal/terminal-preferences.c:1263
 #: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../terminal/main.c:173
+#: ../terminal/main.c:135
 #, c-format
 msgid ""
 "%s (Xfce %s)\n"
@@ -336,31 +117,26 @@ msgstr ""
 "\n"
 "Por favor, envíe los informes de fallu a <%s>.\n"
 
-#: ../terminal/main.c:267
+#: ../terminal/main.c:239
 #, c-format
 msgid "Unable to register terminal service: %s\n"
 msgstr "Imposible rexistrar el serviciu del terminal: %s\n"
 
-#: ../terminal/main.c:276
-#, c-format
-msgid "Unable to launch terminal: %s\n"
-msgstr "Imposible entamar terminal: %s\n"
-
-#: ../terminal/terminal-app.c:551
+#: ../terminal/terminal-app.c:554
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "Cadena de xeometría non válida \"%s\"\n"
 
-#: ../terminal/terminal-dbus.c:114
+#: ../terminal/terminal-dbus.c:108
 msgid "User id mismatch"
 msgstr "Nun concasa l'id d'usuariu"
 
-#: ../terminal/terminal-dbus.c:146
+#: ../terminal/terminal-dbus.c:134
 #, c-format
 msgid "D-BUS message bus disconnected, exiting...\n"
 msgstr "Bus de mensaxes D-BUS desconectáu. Finando...\n"
 
-#: ../terminal/terminal-dbus.c:208
+#: ../terminal/terminal-dbus.c:196
 #, c-format
 msgid "Unable to register object %s"
 msgstr "Imposible rexistrar oxetu %s"
@@ -382,7 +158,7 @@ msgstr "Visitar páxina de Terminal"
 msgid "Failed to open the documentation browser"
 msgstr "Fallu al abrir el visor de documentación"
 
-#: ../terminal/terminal-options.c:189
+#: ../terminal/terminal-options.c:206
 #, c-format
 msgid ""
 "Option \"--default-display\" requires specifying the default X display as "
@@ -391,7 +167,7 @@ msgstr ""
 "La opción  \"--default-display\" requier que que s'especifique'l display X "
 "predetermináu como parámetru"
 
-#: ../terminal/terminal-options.c:204
+#: ../terminal/terminal-options.c:221
 #, c-format
 msgid ""
 "Option \"--default-working-directory\" requires specifying the default "
@@ -400,15 +176,7 @@ msgstr ""
 "La opción \"--default-working-directory\" requierque s'especifique'l "
 "direutoriu de trabayu predetermináu como parámetru"
 
-#: ../terminal/terminal-options.c:235
-#, c-format
-msgid ""
-"Option \"--sm-client-id\" requires specifying the session id as its parameter"
-msgstr ""
-"La opción \"--sm-client-id\" requier que s'especifique l'identificador de "
-"sesión como'l so parámetru"
-
-#: ../terminal/terminal-options.c:250
+#: ../terminal/terminal-options.c:237
 #, c-format
 msgid ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
@@ -417,7 +185,7 @@ msgstr ""
 "La opción \"--execute/-x\" requier que s'especifique'l comandu a executar "
 "nel restu de la llinia de comandos"
 
-#: ../terminal/terminal-options.c:267
+#: ../terminal/terminal-options.c:254
 #, c-format
 msgid ""
 "Option \"--command/-e\" requires specifying the command to run as its "
@@ -426,7 +194,7 @@ msgstr ""
 "La opción \"--command/-e\" requier que s'especifique'l comandu a executar "
 "como'l so parámetru"
 
-#: ../terminal/terminal-options.c:284
+#: ../terminal/terminal-options.c:271
 #, c-format
 msgid ""
 "Option \"--working-directory\" requires specifying the working directory as "
@@ -435,14 +203,14 @@ msgstr ""
 "La opción \"--working-directory\" requier que s'especifique'l direutoriu de "
 "trabayu como'l so parámetru"
 
-#: ../terminal/terminal-options.c:299
+#: ../terminal/terminal-options.c:286
 #, c-format
 msgid "Option \"--title/-T\" requires specifying the title as its parameter"
 msgstr ""
 "La opción \"--title/-T\" requier que s'especifique'l títulu como'l so "
 "parámetru"
 
-#: ../terminal/terminal-options.c:319
+#: ../terminal/terminal-options.c:305
 #, c-format
 msgid ""
 "Option \"--display\" requires specifying the X display as its parameters"
@@ -450,7 +218,7 @@ msgstr ""
 "La opción \"--display\" requier que s'especifique'l display X como ún de los "
 "sos parámetros"
 
-#: ../terminal/terminal-options.c:334
+#: ../terminal/terminal-options.c:320
 #, c-format
 msgid ""
 "Option \"--geometry\" requires specifying the window geometry as its "
@@ -459,14 +227,14 @@ msgstr ""
 "La opción \"--geometry\" requier que s'especifique la xeometría de la "
 "ventana como'l so parámetru"
 
-#: ../terminal/terminal-options.c:349
+#: ../terminal/terminal-options.c:335
 #, c-format
 msgid "Option \"--role\" requires specifying the window role as its parameter"
 msgstr ""
 "La opción \"--role\" requier que s'especifique'l rol de la ventana como'l so "
 "parámetru"
 
-#: ../terminal/terminal-options.c:364
+#: ../terminal/terminal-options.c:350
 #, c-format
 msgid ""
 "Option \"--startup-id\" requires specifying the startup id as its parameter"
@@ -474,7 +242,7 @@ msgstr ""
 "La opción \"--startup-id\" requier que s'especifique l'ID d'arranque como'l "
 "so parámetru"
 
-#: ../terminal/terminal-options.c:379
+#: ../terminal/terminal-options.c:365
 #, c-format
 msgid ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
@@ -483,7 +251,7 @@ msgstr ""
 "Opción \"--icon/-I\" requier especificar un nome d'iconu o nome de ficheru "
 "como parámetru"
 
-#: ../terminal/terminal-options.c:435
+#: ../terminal/terminal-options.c:419
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Opción desconocida \"%s\""
@@ -552,7 +320,7 @@ msgstr "Pantalla completa"
 msgid "Set Title"
 msgstr "Afitar títulu"
 
-#: ../terminal/terminal-preferences.c:464
+#: ../terminal/terminal-preferences.c:464 ../terminal/terminal-window.c:237
 msgid "Reset"
 msgstr "Reaniciar"
 
@@ -851,6 +619,11 @@ msgstr "_Resetear"
 msgid "Reset and C_lear"
 msgstr "Reaniciar y L_limpiar"
 
+#: ../terminal/terminal-window.c:238
+#, fuzzy
+msgid "Reset and clear"
+msgstr "Reaniciar y desaniciar"
+
 #: ../terminal/terminal-window.c:239
 msgid "_Go"
 msgstr "_Dir"
@@ -1482,5 +1255,290 @@ msgstr "_Anovar rexistros de utmp/wtmp cuando s'executa un comandu"
 msgid "seconds"
 msgstr "segundos"
 
+#~ msgid ""
+#~ "  -h, --help                          Print this help message and exit"
+#~ msgstr "  -h, --help                          Amosar esta aida y colar"
+
+#~ msgid ""
+#~ "  -V, --version                       Print version information and exit"
+#~ msgstr "  -v, --version                       Amosar la versión y colar"
+
+#~ msgid ""
+#~ "  --disable-server                    Do not register with the D-BUS\n"
+#~ "                                      session message bus"
+#~ msgstr ""
+#~ "  --disable-server                    Nun rexistrase nel bus de\n"
+#~ "                                      mensaxes de sesión D-BUS"
+
+#~ msgid "  --default-display=DISPLAY           default X display to use"
+#~ msgstr "  --default-display=DISPLAY           display X predetermináu"
+
+#~ msgid ""
+#~ "  --default-working-directory=DIRNAME Set the default terminal's working\n"
+#~ "                                      directory"
+#~ msgstr ""
+#~ "  --default-working-directory=DIR     Afita'l direutoriu de trabayu por\n"
+#~ "                                      defeutu del terminal"
+
+#~ msgid ""
+#~ "  --tab                               Open a new tab in the last-"
+#~ "specified\n"
+#~ "                                      window; more than one of these\n"
+#~ "                                      options can be provided"
+#~ msgstr ""
+#~ "  --tab                               Abre una nueva llingüeta na cabera\n"
+#~ "                                      ventana especificada; pueden usase\n"
+#~ "                                      más d'una d'estes opciones"
+
+#~ msgid ""
+#~ "  --window                            Open a new window containing one "
+#~ "tab;\n"
+#~ "                                      more than one of these options can "
+#~ "be\n"
+#~ "                                      provided"
+#~ msgstr ""
+#~ "  --window                            Abre una ventana conteniendo una "
+#~ "llingüeta;\n"
+#~ "                                      Puede apurrise más d'una d'estes\n"
+#~ "                                      opciones"
+
+#~ msgid ""
+#~ "  -x, --execute                       Execute the remainder of the "
+#~ "command\n"
+#~ "                                      line inside the terminal"
+#~ msgstr ""
+#~ "  -x, --execute                       Executar lo que queda de la llinia "
+#~ "de comandos\n"
+#~ "                                      nel terminal"
+
+#~ msgid ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+#~ msgstr ""
+#~ "  -e, --command=CADENA                Executar l'argumentu d'esta opción\n"
+#~ "                                      dientro del terminal"
+
+#~ msgid ""
+#~ "  --working-directory=DIRNAME         Set the terminal's working directory"
+#~ msgstr ""
+#~ "  --working-directory=DIR             Afitar el direutoriu de trabayu del "
+#~ "terminal"
+
+#~ msgid "  -T, --title=TITLE                   Set the terminal's title"
+#~ msgstr "  -T, --title=TITLE                   Afitar el títulu del terminal"
+
+#~ msgid ""
+#~ "  -H, --hold                          Do not immediately destroy the tab\n"
+#~ "                                      when the child command exits"
+#~ msgstr ""
+#~ "  -H, --hold                          Nun afarar darréu la llingüeta\n"
+#~ "                                      cuando'l comandu fíu termina"
+
+#~ msgid ""
+#~ "  --display=DISPLAY                   X display to use for the last-\n"
+#~ "                                      specified window"
+#~ msgstr ""
+#~ "  --display=DISPLAY                   Display X a usar pa la cabera\n"
+#~ "                                      ventana especificada"
+
+#~ msgid ""
+#~ "  --geometry=GEOMETRY                 X geometry specification (see \"X"
+#~ "\"\n"
+#~ "                                      man page), can be specified once "
+#~ "per\n"
+#~ "                                      window to be opened"
+#~ msgstr ""
+#~ "  --geometry=GEOMETRY                 especificación de la xeometría X "
+#~ "(ver la\n"
+#~ "                                      páxina de manual de \"X\"), que "
+#~ "puede \n"
+#~ "                                      especificase una vegada por cada "
+#~ "ventana pa\n"
+#~ "                                      abrir"
+
+#~ msgid ""
+#~ "  --role=ROLE                         Set the role for the last-"
+#~ "specified\n"
+#~ "                                      window; applies to only one "
+#~ "window;\n"
+#~ "                                      can be specified once for each "
+#~ "window\n"
+#~ "                                      you create from the command line"
+#~ msgstr ""
+#~ "  --role=ROL                          Afitar el rol pa la cabera ventana\n"
+#~ "                                      especificada; aplícase solamente a "
+#~ "una\n"
+#~ "                                      ventana; puede especificase una "
+#~ "vegada\n"
+#~ "                                      por cada ventana que cria na llinia "
+#~ "de\n"
+#~ "                                      comandos"
+
+#~ msgid ""
+#~ "  --startup-id=STRING                 ID for the startup notification\n"
+#~ "                                      protocol"
+#~ msgstr ""
+#~ "  --startup-id=CADENA                 ID pal protocolu de\n"
+#~ "                                      notificación d'arranque"
+
+#~ msgid ""
+#~ "  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
+#~ "                                      name or filename"
+#~ msgstr ""
+#~ "  -I, --icon=ICON                     Afita l'iconu de terminal como un "
+#~ "iconu\n"
+#~ "                                      nome o nome de ficheru"
+
+#~ msgid ""
+#~ "  --fullscreen                        Set the last-specified window into\n"
+#~ "                                      fullscreen mode; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --fullscreen                        Alluga la cabera ventana "
+#~ "especificada\n"
+#~ "                                      a pantalla completa; aplícase namái "
+#~ "a una\n"
+#~ "                                      ventana; puede especificase una "
+#~ "vegada por\n"
+#~ "                                      cada ventana que cree dende la "
+#~ "llinia de\n"
+#~ "                                      comandos."
+
+#~ msgid ""
+#~ "  --maximize                          Maximize the last-specified "
+#~ "window;\n"
+#~ "                                      applies to only one window; can be\n"
+#~ "                                      specified once for each window you\n"
+#~ "                                      create from the command line"
+#~ msgstr ""
+#~ "  --maximize                          Maximizar la cabera ventana\n"
+#~ "                                      especificada; aplícase namái a una\n"
+#~ "                                      ventana; puede especificase una "
+#~ "vegada\n"
+#~ "                                      por cada ventana que cria na llinia "
+#~ "de\n"
+#~ "                                      comandos"
+
+#~ msgid ""
+#~ "  --show-menubar                      Turn on the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-menubar                      Amuesa la barra de menú pa la "
+#~ "cabera\n"
+#~ "                                      ventana especificada; aplícase a "
+#~ "namái una\n"
+#~ "                                      ventana; puede especificase una "
+#~ "vegada por cada\n"
+#~ "                                      ventana creada dende la llinia de "
+#~ "comandos"
+
+#~ msgid ""
+#~ "  --hide-menubar                      Turn off the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-menubar                      Tapez la barra de menú pa la "
+#~ "cabera\n"
+#~ "                                      ventana especificada; namái "
+#~ "aplicable a una\n"
+#~ "                                      ventana; puede especificase pa "
+#~ "cada\n"
+#~ "                                      ventana que cree dende la llinia de "
+#~ "comandos"
+
+#~ msgid ""
+#~ "  --show-borders                      Turn on the window decorations for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --show-borders                      Amuesa les decoraciones de ventana "
+#~ "pa\n"
+#~ "                                      la cabera ventana especificada; "
+#~ "aplicable namái\n"
+#~ "                                      a una ventana; puede especificase "
+#~ "una vegada\n"
+#~ "                                      pa cada ventana que cria dende la "
+#~ "llinia\n"
+#~ "                                      de comandos"
+
+#~ msgid ""
+#~ "  --hide-borders                      Turn off the window decorations "
+#~ "for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --hide-borders                      Tapez les decoraciones de la "
+#~ "ventana pa\n"
+#~ "                                      la cabera ventana especificada; "
+#~ "aplicable\n"
+#~ "                                      a solamente una ventana; puede "
+#~ "especificase una\n"
+#~ "                                      vegada por cada ventana que cree "
+#~ "dende la llinia de\n"
+#~ "                                      comandos"
+
+#~ msgid ""
+#~ "  --show-toolbars                     Turn on the toolbars for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-toolbars                     Amuesa les barres de xeres pa la "
+#~ "cabera ventana\n"
+#~ "                                      especificada; aplicable a solamente "
+#~ "una ventana;\n"
+#~ "                                      puede especificase una vegada por "
+#~ "cada ventana que\n"
+#~ "                                      cree dende la llinia de comandos"
+
+#~ msgid ""
+#~ "  --hide-toolbars                     Turn off the toolbars for the "
+#~ "last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-toolbars                     Tapez les barres de ferramientes "
+#~ "pa\n"
+#~ "                                      la cabera ventana especificada; "
+#~ "aplicable a solamente\n"
+#~ "                                      una ventana; puede especificase una "
+#~ "vegada por cada\n"
+#~ "                                      ventana que cree dende la llinia de "
+#~ "comandos"
+
+#~ msgid "Unable to launch terminal: %s\n"
+#~ msgstr "Imposible entamar terminal: %s\n"
+
+#~ msgid ""
+#~ "Option \"--sm-client-id\" requires specifying the session id as its "
+#~ "parameter"
+#~ msgstr ""
+#~ "La opción \"--sm-client-id\" requier que s'especifique l'identificador de "
+#~ "sesión como'l so parámetru"
+
 #~ msgid "<b>Title:</b>"
 #~ msgstr "<b>Títulu:</b>"
diff --git a/po/be.po b/po/be.po
index 6156d0c..530f500 100644
--- a/po/be.po
+++ b/po/be.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Terminal trunk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 11:48+0100\n"
+"POT-Creation-Date: 2009-12-14 16:03+0100\n"
 "PO-Revision-Date: 2008-11-18 01:02+0200\n"
 "Last-Translator: Alexander Nyakhaychyk <nyakhaychyk at gmail.com>\n"
 "Language-Team: Belarusian <i18n at mova.org>\n"
@@ -15,281 +15,91 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../terminal/main.c:46
+#: ../terminal/main.c:48
 msgid "Usage:"
 msgstr ""
 
-#: ../terminal/main.c:47
+#: ../terminal/main.c:48
 msgid "OPTION"
 msgstr ""
 
-#: ../terminal/main.c:49
+#: ../terminal/main.c:53
 #, fuzzy
 msgid "General Options"
 msgstr "Агульныя"
 
-#: ../terminal/main.c:50
-msgid "  -h, --help                          Print this help message and exit"
-msgstr "  -h, --help                          Друкуе гэтую даведу"
-
-#: ../terminal/main.c:51
+#. parameter of --default-display
+#. parameter of --display
+#: ../terminal/main.c:55 ../terminal/main.c:81
 #, fuzzy
-msgid ""
-"  -V, --version                       Print version information and exit"
-msgstr "  -v, --version                       Друкуе зьвесткі пра вэрсію"
-
-#: ../terminal/main.c:52
-msgid ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
-msgstr "  --disable-server                    Не рэгістравацца ў службе D-BUS"
-
-#: ../terminal/main.c:54
-msgid "  --default-display=DISPLAY           default X display to use"
-msgstr "  --default-display=ДЫСПЛЭЙ           прадвызначаны дысплэй X"
+msgid "display"
+msgstr "не адлюстроўваецца"
 
-#: ../terminal/main.c:55
-msgid ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
+#. parameter of --default-working-directory
+#. parameter of --working-directory
+#: ../terminal/main.c:57 ../terminal/main.c:72
+msgid "directory"
 msgstr ""
-"  --default-working-directory=ДЫРЭКТОРЫЯ  Задае прадвызначаную працоўную\n"
-"                                          дырэкторыю для Тэрмінала"
 
-#: ../terminal/main.c:58
+#: ../terminal/main.c:61
 msgid "Window or Tab Separators"
 msgstr ""
 
-#: ../terminal/main.c:59
-msgid ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-msgstr ""
-"  --tab                               Адкрыць новую ўкладку ў апошнім "
-"вакне;\n"
-"                                      гэтую опцыю можна задаць больш чым\n"
-"                                      адзін раз"
-
-#: ../terminal/main.c:62
-msgid ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-msgstr ""
-"  --window                            Адкрыць новае вакно з адной укладкай;\n"
-"                                      гэтую опцыю можна задаць больш чым\n"
-"                                      адзін раз"
-
 #: ../terminal/main.c:66
 #, fuzzy
 msgid "Tab Options"
 msgstr "Пазыцыя ўкладкі"
 
-#: ../terminal/main.c:67
-msgid ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-msgstr ""
-"  -x, --execute                       Выканаць астатнюю частку загаднага\n"
-"                                      радка ўнутры тэрмінала"
-
-#: ../terminal/main.c:69
-msgid ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-msgstr ""
-"  -e, --command=РАДОК                 Выканаць парамэтры гэтай опцыі\n"
-"                                      ўнутры тэрмінала"
-
-#: ../terminal/main.c:71
-msgid ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
-msgstr "  --working-directory=ДЫРЭКТОРЫЯ      Задае працоўную дырэкторыю"
-
-#: ../terminal/main.c:72
-msgid "  -T, --title=TITLE                   Set the terminal's title"
-msgstr "  -T, --title=НАЗВА                   Задае загаловак тэрмінала"
-
-#: ../terminal/main.c:73
-msgid ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-msgstr ""
-"  -H, --hold                          Не зьнішчаць укладку, адразу пасьля\n"
-"                                      завяршэньня працы нашчадка"
-
-#: ../terminal/main.c:76
+#. parameter of --command
+#: ../terminal/main.c:68
 #, fuzzy
-msgid "Window Options"
-msgstr "Невядомая опцыя \"%s\""
+msgid "command"
+msgstr "<b>Загад</b>"
 
-#: ../terminal/main.c:77
-msgid ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
-msgstr "  --display=DISPLAY                   Дысплэй X для выкарыстаньня"
+#. parameter of --title
+#: ../terminal/main.c:70
+#, fuzzy
+msgid "title"
+msgstr "Загаловак"
 
 #: ../terminal/main.c:79
-msgid ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
-msgstr ""
-"  --geometry=ГЕАМЭТРЫЯ                Спэцыфікацыя геамэтрыі X (гл.\n"
-"                                      man-старонку  \"X\"), можна задаваць "
-"для\n"
-"                                      кожнага асобнага вакна"
-
-#: ../terminal/main.c:82
 #, fuzzy
-msgid ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
-msgstr ""
-"  --role=ROLE                         Задае ролю вакна; ужываецца толькі да\n"
-"                                      аднаго вакна; можна задаваць для\n"
-"                                      кожнага вакна, якое вы ствараеце праз\n"
-"                                      загадны радок"
+msgid "Window Options"
+msgstr "Невядомая опцыя \"%s\""
 
-#: ../terminal/main.c:86
-msgid ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
+#. parameter of --geometry
+#: ../terminal/main.c:83
+msgid "geometry"
 msgstr ""
-"  --startup-id=STRING                 ID для пратакола інфармаваньня\n"
-"                                      пра запуск"
 
-#: ../terminal/main.c:88
-#, fuzzy
-msgid ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
+#. parameter of --role
+#: ../terminal/main.c:85
+msgid "role"
 msgstr ""
-"  -e, --command=РАДОК                 Выканаць парамэтры гэтай опцыі\n"
-"                                      ўнутры тэрмінала"
 
-#: ../terminal/main.c:90
+#. parameter of --startup-id
+#: ../terminal/main.c:87
 #, fuzzy
-msgid ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --fullscreen                        Пераключае апошняе заданае вакно ў\n"
-"                                      поўнаэкранны рэжым; ужываецца толькі "
-"да\n"
-"                                      аднаго вакна; можна задаваць для\n"
-"                                      кожнага вакна, якое вы ствараеце праз\n"
-"                                      загадны радок"
+msgid "string"
+msgstr "Увага"
 
-#: ../terminal/main.c:95
+#. parameter of --icon
+#: ../terminal/main.c:89
 #, fuzzy
-msgid ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
-msgstr ""
-"  --role=ROLE                         Задае ролю вакна; ужываецца толькі да\n"
-"                                      аднаго вакна; можна задаваць для\n"
-"                                      кожнага вакна, якое вы ствараеце праз\n"
-"                                      загадны радок"
-
-#: ../terminal/main.c:99
-msgid ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-menubar                      Уключае радок мэню для апошняга\n"
-"                                      заданага вакна; ужываецца толькі да\n"
-"                                      аднаго вакна; можна задаваць для\n"
-"                                      кожнага вакна, якое вы ствараеце праз\n"
-"                                      загадны радок"
-
-#: ../terminal/main.c:104
-msgid ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --hide-menubar                      Выключае мэню для апошняга заданага\n"
-"                                      вакна; ужываецца толькі да\n"
-"                                      аднаго вакна; можна задаваць для\n"
-"                                      кожнага вакна, якое вы ствараеце праз\n"
-"                                      загадны радок"
-
-#: ../terminal/main.c:109
-msgid ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --show-borders                      Уключае ўпрыгожваньні вакна\n"
-"                                      ужываецца толькі да\n"
-"                                      аднаго вакна; можна задаваць для\n"
-"                                      кожнага вакна, якое вы ствараеце праз\n"
-"                                      загадны радок"
-
-#: ../terminal/main.c:114
-msgid ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --hide-borders                      Адключае ўпрыгожваньні вакна\n"
-"                                      ужываецца толькі да\n"
-"                                      аднаго вакна; можна задаваць для\n"
-"                                      кожнага вакна, якое вы ствараеце праз\n"
-"                                      загадны радок"
-
-#: ../terminal/main.c:119
-msgid ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-toolbars                     Уключае панэлі інструмэнтаў\n"
-"                                      ужываецца толькі да\n"
-"                                      аднаго вакна; можна задаваць для\n"
-"                                      кожнага вакна, якое вы ствараеце праз\n"
-"                                      загадны радок"
+msgid "icon"
+msgstr "Дзеяньне"
 
-#: ../terminal/main.c:124
-msgid ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#: ../terminal/main.c:91
+#, c-format
+msgid "See the %s man page for full explanation of the options above."
 msgstr ""
-"  --hide-toolbars                     Адключае панэлі інструмэнтаў\n"
-"                                      ужываецца толькі да\n"
-"                                      аднаго вакна; можна задаваць для\n"
-"                                      кожнага вакна, якое вы ствараеце праз\n"
-"                                      загадны радок"
 
-#: ../terminal/main.c:151 ../terminal/terminal-preferences.c:1263
+#: ../terminal/main.c:118 ../terminal/terminal-preferences.c:1263
 #: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr "Тэрмінал"
 
-#: ../terminal/main.c:173
+#: ../terminal/main.c:135
 #, c-format
 msgid ""
 "%s (Xfce %s)\n"
@@ -314,31 +124,26 @@ msgstr ""
 "\n"
 "Калі ласка, паведамляйце пра памылка ні <%s>.\n"
 
-#: ../terminal/main.c:267
+#: ../terminal/main.c:239
 #, c-format
 msgid "Unable to register terminal service: %s\n"
 msgstr "Немагчыма зарэгістраваць тэрмінал: %s\n"
 
-#: ../terminal/main.c:276
-#, c-format
-msgid "Unable to launch terminal: %s\n"
-msgstr "Немагчыма запусьціць тэрмінал: %s\n"
-
-#: ../terminal/terminal-app.c:551
+#: ../terminal/terminal-app.c:554
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "Нерэчаісны радок геамэтрыі \"%s\"\n"
 
-#: ../terminal/terminal-dbus.c:114
+#: ../terminal/terminal-dbus.c:108
 msgid "User id mismatch"
 msgstr "Несупадзеньне ідэнтыфікатара карыстальніка"
 
-#: ../terminal/terminal-dbus.c:146
+#: ../terminal/terminal-dbus.c:134
 #, c-format
 msgid "D-BUS message bus disconnected, exiting...\n"
 msgstr "Шына D-BUS выключана; завяршэньне працы...\n"
 
-#: ../terminal/terminal-dbus.c:208
+#: ../terminal/terminal-dbus.c:196
 #, c-format
 msgid "Unable to register object %s"
 msgstr "Немагчыма зарэгістраваць аб'ект %s"
@@ -360,7 +165,7 @@ msgstr ""
 msgid "Failed to open the documentation browser"
 msgstr "Немагчыма адкрыць гартач дакумэнтацыі"
 
-#: ../terminal/terminal-options.c:189
+#: ../terminal/terminal-options.c:206
 #, c-format
 msgid ""
 "Option \"--default-display\" requires specifying the default X display as "
@@ -369,7 +174,7 @@ msgstr ""
 "Опцыя \"--default-display\" патрабуе ў якасьці парамэтра прадвызначаны "
 "дысплэй Х"
 
-#: ../terminal/terminal-options.c:204
+#: ../terminal/terminal-options.c:221
 #, c-format
 msgid ""
 "Option \"--default-working-directory\" requires specifying the default "
@@ -378,13 +183,7 @@ msgstr ""
 "Опцыя \"--default-working-directory\" патрабуе ў якасьці парамэтра "
 "прадвызначаную працоўную тэчку"
 
-#: ../terminal/terminal-options.c:235
-#, c-format
-msgid ""
-"Option \"--sm-client-id\" requires specifying the session id as its parameter"
-msgstr "Опцыя \"--sm-client-id\" патрабуе ў якасьці парамэтра id сэанса"
-
-#: ../terminal/terminal-options.c:250
+#: ../terminal/terminal-options.c:237
 #, c-format
 msgid ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
@@ -393,7 +192,7 @@ msgstr ""
 "Опцыя \"--execute/-x\" патрабуе ў якасьці парамэтра загад для выкананьня ў "
 "канцы загаднага радка"
 
-#: ../terminal/terminal-options.c:267
+#: ../terminal/terminal-options.c:254
 #, c-format
 msgid ""
 "Option \"--command/-e\" requires specifying the command to run as its "
@@ -401,7 +200,7 @@ msgid ""
 msgstr ""
 "Опцыя \"--command/-e\" патрабуе ў якасьці парамэтра загад для выкананьня"
 
-#: ../terminal/terminal-options.c:284
+#: ../terminal/terminal-options.c:271
 #, c-format
 msgid ""
 "Option \"--working-directory\" requires specifying the working directory as "
@@ -409,36 +208,36 @@ msgid ""
 msgstr ""
 "Опцыя \"--working-directory\" патрабуе ў якасьці парамэтра працоўную тэчку"
 
-#: ../terminal/terminal-options.c:299
+#: ../terminal/terminal-options.c:286
 #, c-format
 msgid "Option \"--title/-T\" requires specifying the title as its parameter"
 msgstr "Опцыя \"--title/-T\" патрабуе ў якасьці парамэтра загаловак"
 
-#: ../terminal/terminal-options.c:319
+#: ../terminal/terminal-options.c:305
 #, c-format
 msgid ""
 "Option \"--display\" requires specifying the X display as its parameters"
 msgstr "Опцыя \"--display\" патрабуе ў якасьці парамэтра дысплэй Х"
 
-#: ../terminal/terminal-options.c:334
+#: ../terminal/terminal-options.c:320
 #, c-format
 msgid ""
 "Option \"--geometry\" requires specifying the window geometry as its "
 "parameter"
 msgstr "Опцыя \"--geometry\" патрабуе ў якасьці парамэтра геамэтрыю вакна"
 
-#: ../terminal/terminal-options.c:349
+#: ../terminal/terminal-options.c:335
 #, c-format
 msgid "Option \"--role\" requires specifying the window role as its parameter"
 msgstr "Опцыя \"--role\" патрабуе ў якасьці парамэтра ролю вакна"
 
-#: ../terminal/terminal-options.c:364
+#: ../terminal/terminal-options.c:350
 #, c-format
 msgid ""
 "Option \"--startup-id\" requires specifying the startup id as its parameter"
 msgstr "Опцыя \"--startup-id\" патрабуе ў якасьці парамэтра id запуску"
 
-#: ../terminal/terminal-options.c:379
+#: ../terminal/terminal-options.c:365
 #, fuzzy, c-format
 msgid ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
@@ -446,7 +245,7 @@ msgid ""
 msgstr ""
 "Опцыя \"--command/-e\" патрабуе ў якасьці парамэтра загад для выкананьня"
 
-#: ../terminal/terminal-options.c:435
+#: ../terminal/terminal-options.c:419
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Невядомая опцыя \"%s\""
@@ -515,7 +314,7 @@ msgstr "На ўвесь экран"
 msgid "Set Title"
 msgstr "Наставіць загаловак"
 
-#: ../terminal/terminal-preferences.c:464
+#: ../terminal/terminal-preferences.c:464 ../terminal/terminal-window.c:237
 msgid "Reset"
 msgstr "Скінуць"
 
@@ -812,6 +611,11 @@ msgstr "Ск_інуць "
 msgid "Reset and C_lear"
 msgstr "Скінуць і а_чысьціць"
 
+#: ../terminal/terminal-window.c:238
+#, fuzzy
+msgid "Reset and clear"
+msgstr "Скінуць і ачысьціць"
+
 #: ../terminal/terminal-window.c:239
 msgid "_Go"
 msgstr "_Пераход"
@@ -1487,6 +1291,270 @@ msgstr "Абнаўляць запісы utmp/wtmp, калі запускаюцц
 msgid "seconds"
 msgstr "сэкунд"
 
+#~ msgid ""
+#~ "  -h, --help                          Print this help message and exit"
+#~ msgstr "  -h, --help                          Друкуе гэтую даведу"
+
+#, fuzzy
+#~ msgid ""
+#~ "  -V, --version                       Print version information and exit"
+#~ msgstr "  -v, --version                       Друкуе зьвесткі пра вэрсію"
+
+#~ msgid ""
+#~ "  --disable-server                    Do not register with the D-BUS\n"
+#~ "                                      session message bus"
+#~ msgstr ""
+#~ "  --disable-server                    Не рэгістравацца ў службе D-BUS"
+
+#~ msgid "  --default-display=DISPLAY           default X display to use"
+#~ msgstr "  --default-display=ДЫСПЛЭЙ           прадвызначаны дысплэй X"
+
+#~ msgid ""
+#~ "  --default-working-directory=DIRNAME Set the default terminal's working\n"
+#~ "                                      directory"
+#~ msgstr ""
+#~ "  --default-working-directory=ДЫРЭКТОРЫЯ  Задае прадвызначаную працоўную\n"
+#~ "                                          дырэкторыю для Тэрмінала"
+
+#~ msgid ""
+#~ "  --tab                               Open a new tab in the last-"
+#~ "specified\n"
+#~ "                                      window; more than one of these\n"
+#~ "                                      options can be provided"
+#~ msgstr ""
+#~ "  --tab                               Адкрыць новую ўкладку ў апошнім "
+#~ "вакне;\n"
+#~ "                                      гэтую опцыю можна задаць больш чым\n"
+#~ "                                      адзін раз"
+
+#~ msgid ""
+#~ "  --window                            Open a new window containing one "
+#~ "tab;\n"
+#~ "                                      more than one of these options can "
+#~ "be\n"
+#~ "                                      provided"
+#~ msgstr ""
+#~ "  --window                            Адкрыць новае вакно з адной "
+#~ "укладкай;\n"
+#~ "                                      гэтую опцыю можна задаць больш чым\n"
+#~ "                                      адзін раз"
+
+#~ msgid ""
+#~ "  -x, --execute                       Execute the remainder of the "
+#~ "command\n"
+#~ "                                      line inside the terminal"
+#~ msgstr ""
+#~ "  -x, --execute                       Выканаць астатнюю частку загаднага\n"
+#~ "                                      радка ўнутры тэрмінала"
+
+#~ msgid ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+#~ msgstr ""
+#~ "  -e, --command=РАДОК                 Выканаць парамэтры гэтай опцыі\n"
+#~ "                                      ўнутры тэрмінала"
+
+#~ msgid ""
+#~ "  --working-directory=DIRNAME         Set the terminal's working directory"
+#~ msgstr "  --working-directory=ДЫРЭКТОРЫЯ      Задае працоўную дырэкторыю"
+
+#~ msgid "  -T, --title=TITLE                   Set the terminal's title"
+#~ msgstr "  -T, --title=НАЗВА                   Задае загаловак тэрмінала"
+
+#~ msgid ""
+#~ "  -H, --hold                          Do not immediately destroy the tab\n"
+#~ "                                      when the child command exits"
+#~ msgstr ""
+#~ "  -H, --hold                          Не зьнішчаць укладку, адразу "
+#~ "пасьля\n"
+#~ "                                      завяршэньня працы нашчадка"
+
+#~ msgid ""
+#~ "  --display=DISPLAY                   X display to use for the last-\n"
+#~ "                                      specified window"
+#~ msgstr "  --display=DISPLAY                   Дысплэй X для выкарыстаньня"
+
+#~ msgid ""
+#~ "  --geometry=GEOMETRY                 X geometry specification (see \"X"
+#~ "\"\n"
+#~ "                                      man page), can be specified once "
+#~ "per\n"
+#~ "                                      window to be opened"
+#~ msgstr ""
+#~ "  --geometry=ГЕАМЭТРЫЯ                Спэцыфікацыя геамэтрыі X (гл.\n"
+#~ "                                      man-старонку  \"X\"), можна "
+#~ "задаваць для\n"
+#~ "                                      кожнага асобнага вакна"
+
+#, fuzzy
+#~ msgid ""
+#~ "  --role=ROLE                         Set the role for the last-"
+#~ "specified\n"
+#~ "                                      window; applies to only one "
+#~ "window;\n"
+#~ "                                      can be specified once for each "
+#~ "window\n"
+#~ "                                      you create from the command line"
+#~ msgstr ""
+#~ "  --role=ROLE                         Задае ролю вакна; ужываецца толькі "
+#~ "да\n"
+#~ "                                      аднаго вакна; можна задаваць для\n"
+#~ "                                      кожнага вакна, якое вы ствараеце "
+#~ "праз\n"
+#~ "                                      загадны радок"
+
+#~ msgid ""
+#~ "  --startup-id=STRING                 ID for the startup notification\n"
+#~ "                                      protocol"
+#~ msgstr ""
+#~ "  --startup-id=STRING                 ID для пратакола інфармаваньня\n"
+#~ "                                      пра запуск"
+
+#, fuzzy
+#~ msgid ""
+#~ "  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
+#~ "                                      name or filename"
+#~ msgstr ""
+#~ "  -e, --command=РАДОК                 Выканаць парамэтры гэтай опцыі\n"
+#~ "                                      ўнутры тэрмінала"
+
+#, fuzzy
+#~ msgid ""
+#~ "  --fullscreen                        Set the last-specified window into\n"
+#~ "                                      fullscreen mode; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --fullscreen                        Пераключае апошняе заданае вакно ў\n"
+#~ "                                      поўнаэкранны рэжым; ужываецца "
+#~ "толькі да\n"
+#~ "                                      аднаго вакна; можна задаваць для\n"
+#~ "                                      кожнага вакна, якое вы ствараеце "
+#~ "праз\n"
+#~ "                                      загадны радок"
+
+#, fuzzy
+#~ msgid ""
+#~ "  --maximize                          Maximize the last-specified "
+#~ "window;\n"
+#~ "                                      applies to only one window; can be\n"
+#~ "                                      specified once for each window you\n"
+#~ "                                      create from the command line"
+#~ msgstr ""
+#~ "  --role=ROLE                         Задае ролю вакна; ужываецца толькі "
+#~ "да\n"
+#~ "                                      аднаго вакна; можна задаваць для\n"
+#~ "                                      кожнага вакна, якое вы ствараеце "
+#~ "праз\n"
+#~ "                                      загадны радок"
+
+#~ msgid ""
+#~ "  --show-menubar                      Turn on the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-menubar                      Уключае радок мэню для апошняга\n"
+#~ "                                      заданага вакна; ужываецца толькі "
+#~ "да\n"
+#~ "                                      аднаго вакна; можна задаваць для\n"
+#~ "                                      кожнага вакна, якое вы ствараеце "
+#~ "праз\n"
+#~ "                                      загадны радок"
+
+#~ msgid ""
+#~ "  --hide-menubar                      Turn off the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-menubar                      Выключае мэню для апошняга "
+#~ "заданага\n"
+#~ "                                      вакна; ужываецца толькі да\n"
+#~ "                                      аднаго вакна; можна задаваць для\n"
+#~ "                                      кожнага вакна, якое вы ствараеце "
+#~ "праз\n"
+#~ "                                      загадны радок"
+
+#~ msgid ""
+#~ "  --show-borders                      Turn on the window decorations for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --show-borders                      Уключае ўпрыгожваньні вакна\n"
+#~ "                                      ужываецца толькі да\n"
+#~ "                                      аднаго вакна; можна задаваць для\n"
+#~ "                                      кожнага вакна, якое вы ствараеце "
+#~ "праз\n"
+#~ "                                      загадны радок"
+
+#~ msgid ""
+#~ "  --hide-borders                      Turn off the window decorations "
+#~ "for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --hide-borders                      Адключае ўпрыгожваньні вакна\n"
+#~ "                                      ужываецца толькі да\n"
+#~ "                                      аднаго вакна; можна задаваць для\n"
+#~ "                                      кожнага вакна, якое вы ствараеце "
+#~ "праз\n"
+#~ "                                      загадны радок"
+
+#~ msgid ""
+#~ "  --show-toolbars                     Turn on the toolbars for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-toolbars                     Уключае панэлі інструмэнтаў\n"
+#~ "                                      ужываецца толькі да\n"
+#~ "                                      аднаго вакна; можна задаваць для\n"
+#~ "                                      кожнага вакна, якое вы ствараеце "
+#~ "праз\n"
+#~ "                                      загадны радок"
+
+#~ msgid ""
+#~ "  --hide-toolbars                     Turn off the toolbars for the "
+#~ "last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-toolbars                     Адключае панэлі інструмэнтаў\n"
+#~ "                                      ужываецца толькі да\n"
+#~ "                                      аднаго вакна; можна задаваць для\n"
+#~ "                                      кожнага вакна, якое вы ствараеце "
+#~ "праз\n"
+#~ "                                      загадны радок"
+
+#~ msgid "Unable to launch terminal: %s\n"
+#~ msgstr "Немагчыма запусьціць тэрмінал: %s\n"
+
+#~ msgid ""
+#~ "Option \"--sm-client-id\" requires specifying the session id as its "
+#~ "parameter"
+#~ msgstr "Опцыя \"--sm-client-id\" патрабуе ў якасьці парамэтра id сэанса"
+
 #~ msgid "<b>Title:</b>"
 #~ msgstr "<b>Назва:</b>"
 
diff --git a/po/ca.po b/po/ca.po
index fd3bec2..bcd3ebc 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Terminal 0.2.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 11:48+0100\n"
+"POT-Creation-Date: 2009-12-14 16:03+0100\n"
 "PO-Revision-Date: 2009-10-17 18:00+0100\n"
 "Last-Translator: Carles Muñoz Gorriz <carlesmu at internautas.org>\n"
 "Language-Team: Catalan\n"
@@ -22,282 +22,88 @@ msgstr ""
 "X-Poedit-Language: Catalan\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../terminal/main.c:46
+#: ../terminal/main.c:48
 msgid "Usage:"
 msgstr "Ús:"
 
-#: ../terminal/main.c:47
+#: ../terminal/main.c:48
 msgid "OPTION"
 msgstr "OPCIÓ"
 
-#: ../terminal/main.c:49
+#: ../terminal/main.c:53
 msgid "General Options"
 msgstr "Opcions generals"
 
-#: ../terminal/main.c:50
-msgid "  -h, --help                          Print this help message and exit"
-msgstr ""
-"  -h, --help                          Mostra aquest missatge d'ajuda i surt"
-
-#: ../terminal/main.c:51
-msgid ""
-"  -V, --version                       Print version information and exit"
-msgstr ""
-"  -V, --version                       Mostra informació de la versió i surt"
-
-#: ../terminal/main.c:52
-msgid ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
-msgstr ""
-"  --disable-server                    No registrar-se amb el gestor de\n"
-"                                      missatges de sessió D-BUS"
+#. parameter of --default-display
+#. parameter of --display
+#: ../terminal/main.c:55 ../terminal/main.c:81
+#, fuzzy
+msgid "display"
+msgstr "Ocult"
 
-#: ../terminal/main.c:54
-msgid "  --default-display=DISPLAY           default X display to use"
+#. parameter of --default-working-directory
+#. parameter of --working-directory
+#: ../terminal/main.c:57 ../terminal/main.c:72
+msgid "directory"
 msgstr ""
-"  --default-display=PANTALLA          Pantalla de les X a emprar per defecte"
 
-#: ../terminal/main.c:55
-msgid ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
-msgstr ""
-"  --default-working-directory=DIR     Especifiqueu el directori de treball\n"
-"                                      per defecte dels terminals"
-
-#: ../terminal/main.c:58
+#: ../terminal/main.c:61
 msgid "Window or Tab Separators"
 msgstr "Finestra o separadors de pestanyes"
 
-#: ../terminal/main.c:59
-msgid ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-msgstr ""
-"  --tab                               Obre una nova pestanya a l'última\n"
-"                                      finestra; aquesta opció es pot\n"
-"                                      informar més d'un cop"
-
-#: ../terminal/main.c:62
-msgid ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-msgstr ""
-"  --window                            Obre una nova finestra amb una\n"
-"                                      pestanya; aquesta opció es pot\n"
-"                                      informar més d'un cop"
-
 #: ../terminal/main.c:66
 msgid "Tab Options"
 msgstr "Opcions de pestanyes"
 
-#: ../terminal/main.c:67
-msgid ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-msgstr ""
-"  -x, --execute                       Executa la resta de la línia\n"
-"                                      d'ordres dins del terminal."
-
-#: ../terminal/main.c:69
-msgid ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-msgstr ""
-"  -e, --command=CADENA                Executa l'argument d'aquesta opció\n"
-"                                      dins del terminal."
-
-#: ../terminal/main.c:71
-msgid ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
-msgstr ""
-"  --working-directory=DIRECTORI       Estableix el directori de treball "
-"dels\n"
-"                                      terminals"
-
-#: ../terminal/main.c:72
-msgid "  -T, --title=TITLE                   Set the terminal's title"
-msgstr "  -T, --title=TÍTOL                   Estableix el títol del terminal"
+#. parameter of --command
+#: ../terminal/main.c:68
+#, fuzzy
+msgid "command"
+msgstr "Ordre"
 
-#: ../terminal/main.c:73
-msgid ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-msgstr ""
-"  -H, --hold                          No destrueixis immediatament la\n"
-"                                      pestanya quan el procés fill acabi."
+#. parameter of --title
+#: ../terminal/main.c:70
+#, fuzzy
+msgid "title"
+msgstr "Títol"
 
-#: ../terminal/main.c:76
+#: ../terminal/main.c:79
 msgid "Window Options"
 msgstr "Opcions de finestra"
 
-#: ../terminal/main.c:77
-msgid ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
-msgstr ""
-"  --display=PANTALLA                  Pantalla de les X per la finestra\n"
-"                                      especificada"
-
-#: ../terminal/main.c:79
-msgid ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
-msgstr ""
-"  --geometry=GEOMETRIA                Especifiqueu la geometria de les X\n"
-"                                      (mireu «man X»), es pot especificar\n"
-"                                      una vegada per finestra oberta"
-
-#: ../terminal/main.c:82
-msgid ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
-msgstr ""
-"  --role=ROL                          Especifiqueu el rol per l'última\n"
-"                                      finestra especificada; s'aplica només\n"
-"                                      a una finestra; Es pot especificar un\n"
-"                                      cop per cada finestra que creeu des\n"
-"                                      de la línia d'ordres"
-
-#: ../terminal/main.c:86
-msgid ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
-msgstr ""
-"  --startup-id=CADENA                 Identificador pel protocol de\n"
-"                                      notificació d'engegada."
-
-#: ../terminal/main.c:88
-msgid ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
-msgstr ""
-"  -I, --icon=ICONA                    Fixa la icona del terminal mitjançant\n"
-"                                      el nom o el nom de fitxer de la icona"
-
-#: ../terminal/main.c:90
-msgid ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --fullscreen                        Posa l'última finestra en mode de\n"
-"                                      pantalla complerta; només s'aplica a\n"
-"                                      una finestra; es pot especificar un\n"
-"                                      cop per cada finestra que es crei\n"
-"                                      des de la línia d'ordres"
-
-#: ../terminal/main.c:95
-msgid ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
-msgstr ""
-"  --maximeze                          Maximitza la última finestra especi-\n"
-"                                       ficada; només s'aplica a una\n"
-"                                       finestra. Es pot especificar un cop\n"
-"                                      per cada finestra que es crei des de\n"
-"                                       la línia d'ordres"
-
-#: ../terminal/main.c:99
-msgid ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-menubar                      Mostra la barra de menú a l'última\n"
-"                                      finestra; s'aplica només a una\n"
-"                                      finestra. Es por especificar un cop\n"
-"                                      per cada finestra que es crei des de\n"
-"                                      la línia d'ordres."
-
-#: ../terminal/main.c:104
-msgid ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#. parameter of --geometry
+#: ../terminal/main.c:83
+msgid "geometry"
 msgstr ""
-"  --hide-menubar                      Oculta la barra de menú a l'última\n"
-"                                      finestra; s'aplica només a una\n"
-"                                      finestra. Es por especificar un cop\n"
-"                                      per cada finestra que es crei des de\n"
-"                                      la línia d'ordres."
 
-#: ../terminal/main.c:109
-msgid ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
+#. parameter of --role
+#: ../terminal/main.c:85
+msgid "role"
 msgstr ""
-"  --show-borders                      Mostra la decoració de les vores a\n"
-"                                      l'última finestra; s'aplica només a\n"
-"                                      una finestra. Es por especificar un\n"
-"                                      cop per cada finestra que es crei\n"
-"                                       des de la línia d'ordres."
 
-#: ../terminal/main.c:114
-msgid ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --hide-borders                      Oculta la decoració de les vores a\n"
-"                                      l'última finestra; s'aplica només a\n"
-"                                      una finestra. Es por especificar un\n"
-"                                      cop per cada finestra que es crei\n"
-"                                       des de la línia d'ordres."
+#. parameter of --startup-id
+#: ../terminal/main.c:87
+#, fuzzy
+msgid "string"
+msgstr "Avís"
 
-#: ../terminal/main.c:119
-msgid ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-toolbars                     Mostra la barra d'eines a l'última\n"
-"                                      finestra; s'aplica només a una\n"
-"                                      finestra. Es por especificar un cop\n"
-"                                      per cada finestra que es crei des de\n"
-"                                      la línia d'ordres."
+#. parameter of --icon
+#: ../terminal/main.c:89
+#, fuzzy
+msgid "icon"
+msgstr "Acció"
 
-#: ../terminal/main.c:124
-msgid ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#: ../terminal/main.c:91
+#, c-format
+msgid "See the %s man page for full explanation of the options above."
 msgstr ""
-"  --hide-toolbars                     Oculta la barra d'eines a l'última\n"
-"                                      finestra; s'aplica només a una\n"
-"                                      finestra. Es por especificar un cop\n"
-"                                      per cada finestra que es crei des de\n"
-"                                      la línia d'ordres."
 
-#: ../terminal/main.c:151 ../terminal/terminal-preferences.c:1263
+#: ../terminal/main.c:118 ../terminal/terminal-preferences.c:1263
 #: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../terminal/main.c:173
+#: ../terminal/main.c:135
 #, c-format
 msgid ""
 "%s (Xfce %s)\n"
@@ -322,32 +128,27 @@ msgstr ""
 "\n"
 "Envieu els errors a <%s>.\n"
 
-#: ../terminal/main.c:267
+#: ../terminal/main.c:239
 #, c-format
 msgid "Unable to register terminal service: %s\n"
 msgstr "No es por registrar el servei de terminal: %s\n"
 
-#: ../terminal/main.c:276
-#, c-format
-msgid "Unable to launch terminal: %s\n"
-msgstr "No es pot llançar el terminal: %s\n"
-
-#: ../terminal/terminal-app.c:551
+#: ../terminal/terminal-app.c:554
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "Cadena de geometria invàlida «%s»\n"
 
 # mismatch = desajustat ?
-#: ../terminal/terminal-dbus.c:114
+#: ../terminal/terminal-dbus.c:108
 msgid "User id mismatch"
 msgstr "L'identificador d'usuari no coincideix"
 
-#: ../terminal/terminal-dbus.c:146
+#: ../terminal/terminal-dbus.c:134
 #, c-format
 msgid "D-BUS message bus disconnected, exiting...\n"
 msgstr "Bus de missatges D-BUS desconnectat, sortint…\n"
 
-#: ../terminal/terminal-dbus.c:208
+#: ../terminal/terminal-dbus.c:196
 #, c-format
 msgid "Unable to register object %s"
 msgstr "No es por registrar l'objecte %s"
@@ -372,7 +173,7 @@ msgstr "Vés al lloc web de Terminal"
 msgid "Failed to open the documentation browser"
 msgstr "No s'ha pogut obrir l'explorador de documentació"
 
-#: ../terminal/terminal-options.c:189
+#: ../terminal/terminal-options.c:206
 #, c-format
 msgid ""
 "Option \"--default-display\" requires specifying the default X display as "
@@ -381,7 +182,7 @@ msgstr ""
 "A l'opció «--default-display» li cal que especifiqueu com paràmetre le "
 "pantalla de les X"
 
-#: ../terminal/terminal-options.c:204
+#: ../terminal/terminal-options.c:221
 #, c-format
 msgid ""
 "Option \"--default-working-directory\" requires specifying the default "
@@ -390,15 +191,7 @@ msgstr ""
 "A l'opció «--default-working-derectoy» li cal que especifiqueu com paràmetre "
 "el directori de treball per defecte"
 
-#: ../terminal/terminal-options.c:235
-#, c-format
-msgid ""
-"Option \"--sm-client-id\" requires specifying the session id as its parameter"
-msgstr ""
-"A l'opció «--sm-client-id» li cal que especifiqueu com a paràmetre "
-"l'identificador de sessió"
-
-#: ../terminal/terminal-options.c:250
+#: ../terminal/terminal-options.c:237
 #, c-format
 msgid ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
@@ -407,7 +200,7 @@ msgstr ""
 "A l'opció «--execute/-x» li cal que especifique l'ordre a executar en la "
 "resta de la línia d'ordres"
 
-#: ../terminal/terminal-options.c:267
+#: ../terminal/terminal-options.c:254
 #, c-format
 msgid ""
 "Option \"--command/-e\" requires specifying the command to run as its "
@@ -416,7 +209,7 @@ msgstr ""
 "A l'opció «--command/-e» lo cal que especifiqueu com a paràmetre l'ordre a "
 "executar"
 
-#: ../terminal/terminal-options.c:284
+#: ../terminal/terminal-options.c:271
 #, c-format
 msgid ""
 "Option \"--working-directory\" requires specifying the working directory as "
@@ -425,13 +218,13 @@ msgstr ""
 "A l'opció «--working-directory» li cal que especifiqueu com a paràmetre el "
 "directori de treball"
 
-#: ../terminal/terminal-options.c:299
+#: ../terminal/terminal-options.c:286
 #, c-format
 msgid "Option \"--title/-T\" requires specifying the title as its parameter"
 msgstr ""
 "A l'opció «--title/-T» li cal que especifiqueu com a paràmetre el títol."
 
-#: ../terminal/terminal-options.c:319
+#: ../terminal/terminal-options.c:305
 #, c-format
 msgid ""
 "Option \"--display\" requires specifying the X display as its parameters"
@@ -439,7 +232,7 @@ msgstr ""
 "A l'opció «--display» li cal que especifiqueu com a paràmetre la pantall de "
 "les X"
 
-#: ../terminal/terminal-options.c:334
+#: ../terminal/terminal-options.c:320
 #, c-format
 msgid ""
 "Option \"--geometry\" requires specifying the window geometry as its "
@@ -448,14 +241,14 @@ msgstr ""
 "A l'opció «--geometry» li cal que especifiqueu com a paràmetre la geometria "
 "de la finestra"
 
-#: ../terminal/terminal-options.c:349
+#: ../terminal/terminal-options.c:335
 #, c-format
 msgid "Option \"--role\" requires specifying the window role as its parameter"
 msgstr ""
 "A l'opció «--role» li cal que especifiqueu com a paràmetre el rol de la "
 "finestra"
 
-#: ../terminal/terminal-options.c:364
+#: ../terminal/terminal-options.c:350
 #, c-format
 msgid ""
 "Option \"--startup-id\" requires specifying the startup id as its parameter"
@@ -463,7 +256,7 @@ msgstr ""
 "A l'opció «--startup-id» li cal que especifiqueu com paràmetre "
 "l'identificador d'engegada"
 
-#: ../terminal/terminal-options.c:379
+#: ../terminal/terminal-options.c:365
 #, c-format
 msgid ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
@@ -472,7 +265,7 @@ msgstr ""
 "A l'opció «--icon/-I» li cal que especifiqueu un nom d'icona o nom de fitxer "
 "com a paràmetre"
 
-#: ../terminal/terminal-options.c:435
+#: ../terminal/terminal-options.c:419
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "L'opció «%s» és desconeguda"
@@ -541,7 +334,7 @@ msgstr "Pantalla completa"
 msgid "Set Title"
 msgstr "Estableix el títol"
 
-#: ../terminal/terminal-preferences.c:464
+#: ../terminal/terminal-preferences.c:464 ../terminal/terminal-window.c:237
 msgid "Reset"
 msgstr "Reinicia"
 
@@ -839,6 +632,11 @@ msgstr "_Reinicia"
 msgid "Reset and C_lear"
 msgstr "Reinicia i _neteja"
 
+#: ../terminal/terminal-window.c:238
+#, fuzzy
+msgid "Reset and clear"
+msgstr "Reinicia i neteja"
+
 #: ../terminal/terminal-window.c:239
 msgid "_Go"
 msgstr "Vé_s"
@@ -1473,6 +1271,287 @@ msgstr "Act_ualitza el registre utmp/wtmp quan l'ordre s'executi"
 msgid "seconds"
 msgstr "segons"
 
+#~ msgid ""
+#~ "  -h, --help                          Print this help message and exit"
+#~ msgstr ""
+#~ "  -h, --help                          Mostra aquest missatge d'ajuda i "
+#~ "surt"
+
+#~ msgid ""
+#~ "  -V, --version                       Print version information and exit"
+#~ msgstr ""
+#~ "  -V, --version                       Mostra informació de la versió i "
+#~ "surt"
+
+#~ msgid ""
+#~ "  --disable-server                    Do not register with the D-BUS\n"
+#~ "                                      session message bus"
+#~ msgstr ""
+#~ "  --disable-server                    No registrar-se amb el gestor de\n"
+#~ "                                      missatges de sessió D-BUS"
+
+#~ msgid "  --default-display=DISPLAY           default X display to use"
+#~ msgstr ""
+#~ "  --default-display=PANTALLA          Pantalla de les X a emprar per "
+#~ "defecte"
+
+#~ msgid ""
+#~ "  --default-working-directory=DIRNAME Set the default terminal's working\n"
+#~ "                                      directory"
+#~ msgstr ""
+#~ "  --default-working-directory=DIR     Especifiqueu el directori de "
+#~ "treball\n"
+#~ "                                      per defecte dels terminals"
+
+#~ msgid ""
+#~ "  --tab                               Open a new tab in the last-"
+#~ "specified\n"
+#~ "                                      window; more than one of these\n"
+#~ "                                      options can be provided"
+#~ msgstr ""
+#~ "  --tab                               Obre una nova pestanya a l'última\n"
+#~ "                                      finestra; aquesta opció es pot\n"
+#~ "                                      informar més d'un cop"
+
+#~ msgid ""
+#~ "  --window                            Open a new window containing one "
+#~ "tab;\n"
+#~ "                                      more than one of these options can "
+#~ "be\n"
+#~ "                                      provided"
+#~ msgstr ""
+#~ "  --window                            Obre una nova finestra amb una\n"
+#~ "                                      pestanya; aquesta opció es pot\n"
+#~ "                                      informar més d'un cop"
+
+#~ msgid ""
+#~ "  -x, --execute                       Execute the remainder of the "
+#~ "command\n"
+#~ "                                      line inside the terminal"
+#~ msgstr ""
+#~ "  -x, --execute                       Executa la resta de la línia\n"
+#~ "                                      d'ordres dins del terminal."
+
+#~ msgid ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+#~ msgstr ""
+#~ "  -e, --command=CADENA                Executa l'argument d'aquesta opció\n"
+#~ "                                      dins del terminal."
+
+#~ msgid ""
+#~ "  --working-directory=DIRNAME         Set the terminal's working directory"
+#~ msgstr ""
+#~ "  --working-directory=DIRECTORI       Estableix el directori de treball "
+#~ "dels\n"
+#~ "                                      terminals"
+
+#~ msgid "  -T, --title=TITLE                   Set the terminal's title"
+#~ msgstr ""
+#~ "  -T, --title=TÍTOL                   Estableix el títol del terminal"
+
+#~ msgid ""
+#~ "  -H, --hold                          Do not immediately destroy the tab\n"
+#~ "                                      when the child command exits"
+#~ msgstr ""
+#~ "  -H, --hold                          No destrueixis immediatament la\n"
+#~ "                                      pestanya quan el procés fill acabi."
+
+#~ msgid ""
+#~ "  --display=DISPLAY                   X display to use for the last-\n"
+#~ "                                      specified window"
+#~ msgstr ""
+#~ "  --display=PANTALLA                  Pantalla de les X per la finestra\n"
+#~ "                                      especificada"
+
+#~ msgid ""
+#~ "  --geometry=GEOMETRY                 X geometry specification (see \"X"
+#~ "\"\n"
+#~ "                                      man page), can be specified once "
+#~ "per\n"
+#~ "                                      window to be opened"
+#~ msgstr ""
+#~ "  --geometry=GEOMETRIA                Especifiqueu la geometria de les X\n"
+#~ "                                      (mireu «man X»), es pot especificar\n"
+#~ "                                      una vegada per finestra oberta"
+
+#~ msgid ""
+#~ "  --role=ROLE                         Set the role for the last-"
+#~ "specified\n"
+#~ "                                      window; applies to only one "
+#~ "window;\n"
+#~ "                                      can be specified once for each "
+#~ "window\n"
+#~ "                                      you create from the command line"
+#~ msgstr ""
+#~ "  --role=ROL                          Especifiqueu el rol per l'última\n"
+#~ "                                      finestra especificada; s'aplica "
+#~ "només\n"
+#~ "                                      a una finestra; Es pot especificar "
+#~ "un\n"
+#~ "                                      cop per cada finestra que creeu "
+#~ "des\n"
+#~ "                                      de la línia d'ordres"
+
+#~ msgid ""
+#~ "  --startup-id=STRING                 ID for the startup notification\n"
+#~ "                                      protocol"
+#~ msgstr ""
+#~ "  --startup-id=CADENA                 Identificador pel protocol de\n"
+#~ "                                      notificació d'engegada."
+
+#~ msgid ""
+#~ "  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
+#~ "                                      name or filename"
+#~ msgstr ""
+#~ "  -I, --icon=ICONA                    Fixa la icona del terminal "
+#~ "mitjançant\n"
+#~ "                                      el nom o el nom de fitxer de la "
+#~ "icona"
+
+#~ msgid ""
+#~ "  --fullscreen                        Set the last-specified window into\n"
+#~ "                                      fullscreen mode; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --fullscreen                        Posa l'última finestra en mode de\n"
+#~ "                                      pantalla complerta; només s'aplica "
+#~ "a\n"
+#~ "                                      una finestra; es pot especificar "
+#~ "un\n"
+#~ "                                      cop per cada finestra que es crei\n"
+#~ "                                      des de la línia d'ordres"
+
+#~ msgid ""
+#~ "  --maximize                          Maximize the last-specified "
+#~ "window;\n"
+#~ "                                      applies to only one window; can be\n"
+#~ "                                      specified once for each window you\n"
+#~ "                                      create from the command line"
+#~ msgstr ""
+#~ "  --maximeze                          Maximitza la última finestra "
+#~ "especi-\n"
+#~ "                                       ficada; només s'aplica a una\n"
+#~ "                                       finestra. Es pot especificar un "
+#~ "cop\n"
+#~ "                                      per cada finestra que es crei des "
+#~ "de\n"
+#~ "                                       la línia d'ordres"
+
+#~ msgid ""
+#~ "  --show-menubar                      Turn on the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-menubar                      Mostra la barra de menú a l'última\n"
+#~ "                                      finestra; s'aplica només a una\n"
+#~ "                                      finestra. Es por especificar un "
+#~ "cop\n"
+#~ "                                      per cada finestra que es crei des "
+#~ "de\n"
+#~ "                                      la línia d'ordres."
+
+#~ msgid ""
+#~ "  --hide-menubar                      Turn off the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-menubar                      Oculta la barra de menú a l'última\n"
+#~ "                                      finestra; s'aplica només a una\n"
+#~ "                                      finestra. Es por especificar un "
+#~ "cop\n"
+#~ "                                      per cada finestra que es crei des "
+#~ "de\n"
+#~ "                                      la línia d'ordres."
+
+#~ msgid ""
+#~ "  --show-borders                      Turn on the window decorations for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --show-borders                      Mostra la decoració de les vores a\n"
+#~ "                                      l'última finestra; s'aplica només "
+#~ "a\n"
+#~ "                                      una finestra. Es por especificar "
+#~ "un\n"
+#~ "                                      cop per cada finestra que es crei\n"
+#~ "                                       des de la línia d'ordres."
+
+#~ msgid ""
+#~ "  --hide-borders                      Turn off the window decorations "
+#~ "for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --hide-borders                      Oculta la decoració de les vores a\n"
+#~ "                                      l'última finestra; s'aplica només "
+#~ "a\n"
+#~ "                                      una finestra. Es por especificar "
+#~ "un\n"
+#~ "                                      cop per cada finestra que es crei\n"
+#~ "                                       des de la línia d'ordres."
+
+#~ msgid ""
+#~ "  --show-toolbars                     Turn on the toolbars for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-toolbars                     Mostra la barra d'eines a l'última\n"
+#~ "                                      finestra; s'aplica només a una\n"
+#~ "                                      finestra. Es por especificar un "
+#~ "cop\n"
+#~ "                                      per cada finestra que es crei des "
+#~ "de\n"
+#~ "                                      la línia d'ordres."
+
+#~ msgid ""
+#~ "  --hide-toolbars                     Turn off the toolbars for the "
+#~ "last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-toolbars                     Oculta la barra d'eines a l'última\n"
+#~ "                                      finestra; s'aplica només a una\n"
+#~ "                                      finestra. Es por especificar un "
+#~ "cop\n"
+#~ "                                      per cada finestra que es crei des "
+#~ "de\n"
+#~ "                                      la línia d'ordres."
+
+#~ msgid "Unable to launch terminal: %s\n"
+#~ msgstr "No es pot llançar el terminal: %s\n"
+
+#~ msgid ""
+#~ "Option \"--sm-client-id\" requires specifying the session id as its "
+#~ "parameter"
+#~ msgstr ""
+#~ "A l'opció «--sm-client-id» li cal que especifiqueu com a paràmetre "
+#~ "l'identificador de sessió"
+
 #~ msgid "<b>Title:</b>"
 #~ msgstr "<b>Títol:</b>"
 
diff --git a/po/cs.po b/po/cs.po
index a8acfc8..c3eb394 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Terminal 0.2.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 11:48+0100\n"
+"POT-Creation-Date: 2009-12-14 16:03+0100\n"
 "PO-Revision-Date: 2009-10-03 19:33+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,282 +16,88 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ../terminal/main.c:46
+#: ../terminal/main.c:48
 msgid "Usage:"
 msgstr "Použití:"
 
-#: ../terminal/main.c:47
+#: ../terminal/main.c:48
 msgid "OPTION"
 msgstr "VOLBA"
 
-#: ../terminal/main.c:49
+#: ../terminal/main.c:53
 msgid "General Options"
 msgstr "Obecné"
 
-#: ../terminal/main.c:50
-msgid "  -h, --help                          Print this help message and exit"
-msgstr ""
-"  -h, --help                          Zobrazí tuto nápovědu a ukončí se"
-
-#: ../terminal/main.c:51
-msgid ""
-"  -V, --version                       Print version information and exit"
-msgstr ""
-"  -V, --version                       Zobrazí informace o verzi a ukončí se"
-
-#: ../terminal/main.c:52
-msgid ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
-msgstr ""
-"  --disable-server                    Nezaregistruje se k relaci sběrnice D-"
-"BUS"
-
-#: ../terminal/main.c:54
-msgid "  --default-display=DISPLAY           default X display to use"
-msgstr "  --default-display=DISPLEJ           Výchozí displej X pro použití"
+#. parameter of --default-display
+#. parameter of --display
+#: ../terminal/main.c:55 ../terminal/main.c:81
+#, fuzzy
+msgid "display"
+msgstr "Nebude zobrazen"
 
-#: ../terminal/main.c:55
-msgid ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
+#. parameter of --default-working-directory
+#. parameter of --working-directory
+#: ../terminal/main.c:57 ../terminal/main.c:72
+msgid "directory"
 msgstr ""
-"  --default-working-directory=NÁZEVADRESÁŘE\n"
-"                                      Nastaví výchozí pracovní adresář\n"
-"                                      terminálu"
 
-#: ../terminal/main.c:58
+#: ../terminal/main.c:61
 msgid "Window or Tab Separators"
 msgstr "Oddělovače oken nebo karet"
 
-#: ../terminal/main.c:59
-msgid ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-msgstr ""
-"  --tab                               Otevře novou kartu v posledně zadaném\n"
-"                                      okně; lze zadat více těchto voleb"
-
-#: ../terminal/main.c:62
-msgid ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-msgstr ""
-"  --window                            Otevřít nové okno obsahující jednu\n"
-"                                      kartu; lze zadat více než jednu "
-"takovou\n"
-"                                      volbu"
-
 #: ../terminal/main.c:66
 msgid "Tab Options"
 msgstr "Možnosti karty"
 
-#: ../terminal/main.c:67
-msgid ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-msgstr ""
-"  -x, --execute                       Spustí zbytek příkazové řádky v "
-"terminálu"
-
-#: ../terminal/main.c:69
-msgid ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-msgstr ""
-"  -e, --command=ŘETĚZEC               Spustí argument k této volbě uvnitř\n"
-"                                      terminálu"
-
-#: ../terminal/main.c:71
-msgid ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
-msgstr ""
-"  --working-directory=NÁZEV_ADRESÁŘE  Nastaví pracovní adresář terminálu"
-
-#: ../terminal/main.c:72
-msgid "  -T, --title=TITLE                   Set the terminal's title"
-msgstr "  -T, --title=TITULEK                 Nastaví titulek terminálu"
+#. parameter of --command
+#: ../terminal/main.c:68
+#, fuzzy
+msgid "command"
+msgstr "Příkaz"
 
-#: ../terminal/main.c:73
-msgid ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-msgstr ""
-"  -H, --hold                          Nezavře kartu ihned po ukončení\n"
-"                                      potomka"
+#. parameter of --title
+#: ../terminal/main.c:70
+#, fuzzy
+msgid "title"
+msgstr "Titulek"
 
-#: ../terminal/main.c:76
+#: ../terminal/main.c:79
 msgid "Window Options"
 msgstr "Možnosti okna"
 
-#: ../terminal/main.c:77
-msgid ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
+#. parameter of --geometry
+#: ../terminal/main.c:83
+msgid "geometry"
 msgstr ""
-"  --display=DISPLEJ                   Displej X serveru pro poslední\n"
-"                                      zadané okno"
 
-#: ../terminal/main.c:79
-msgid ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
+#. parameter of --role
+#: ../terminal/main.c:85
+msgid "role"
 msgstr ""
-"  --geometry=GEOMETRIE                Specifikace geometrie X (viz "
-"manuálová\n"
-"                                      stránka \"X\"), může být zadána jedna "
-"na\n"
-"                                      otevřené okno"
 
-#: ../terminal/main.c:82
-msgid ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
-msgstr ""
-"  --role=ÚLOHA                        Nastaví úlohu pro poslední zadané\n"
-"                                      okno; použije se jen pro jedno okno;\n"
-"                                      může být zadáno jednou pro každé\n"
-"                                      okno spuštěné z příkazové řádky"
-
-#: ../terminal/main.c:86
-msgid ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
-msgstr ""
-"  --startup-id=ŘETĚZEC                Identifikátor pro protokol oznámení "
-"při\n"
-"                                      spuštění"
-
-#: ../terminal/main.c:88
-msgid ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
-msgstr ""
-"  -I, --icon=IKONA                    Nastaví ikonu terminálu jako název "
-"ikony\n"
-"                                             nebo název souboru name or "
-"filename"
-
-#: ../terminal/main.c:90
-msgid ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --fullscreen                        Přepne poslední zadané okno do režimu "
-"celé\n"
-"                                      obrazovky; použije se jen pro jedno "
-"okno;\n"
-"                                      může být zadáno jednou pro každé\n"
-"                                      okno spuštěné z příkazové řádky"
-
-#: ../terminal/main.c:95
-msgid ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
-msgstr ""
-"  --maximize                          Maximalizuje poslední specifikované\n"
-"                                      okno; lze použít pouze na jedno okno;\n"
-"                                      lze použít pro každé zadané okno\n"
-"                                      vytvořené z příkazového řádku"
-
-#: ../terminal/main.c:99
-msgid ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-menubar                      Zobrazí nabídku okna pro poslední "
-"zadané\n"
-"                                      okno; použije se jen pro jedno okno;\n"
-"                                      může být zadáno jednou pro každé\n"
-"                                      okno spuštěné z příkazové řádky"
-
-#: ../terminal/main.c:104
-msgid ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --hide-menubar                      Skryje nabídku okna pro poslední "
-"zadané\n"
-"                                      okno; použije se jen pro jedno okno;\n"
-"                                      může být zadáno jednou pro každé\n"
-"                                      okno spuštěné z příkazové řádky"
-
-#: ../terminal/main.c:109
-msgid ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --hide-borders                      Povolí dekorace okna pro poslední "
-"zadané\n"
-"                                      okno; použije se jen pro jedno okno;\n"
-"                                      může být zadáno jednou pro každé\n"
-"                                      okno spuštěné z příkazové řádky"
-
-#: ../terminal/main.c:114
-msgid ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --hide-borders                      Zakáže dekorace okna pro poslední "
-"zadané\n"
-"                                      okno; použije se jen pro jedno okno;\n"
-"                                      může být zadáno jednou pro každé\n"
-"                                      okno spuštěné z příkazové řádky"
+#. parameter of --startup-id
+#: ../terminal/main.c:87
+#, fuzzy
+msgid "string"
+msgstr "Varování"
 
-#: ../terminal/main.c:119
-msgid ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-toolbars                     Povolí panely nástrojů pro poslední\n"
-"                                      zadané okno; použije se jen na jedno\n"
-"                                      okno; může být zadáno jednou pro\n"
-"                                      každé okno vytvořené z příkazové řádky"
+#. parameter of --icon
+#: ../terminal/main.c:89
+#, fuzzy
+msgid "icon"
+msgstr "Akce"
 
-#: ../terminal/main.c:124
-msgid ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#: ../terminal/main.c:91
+#, c-format
+msgid "See the %s man page for full explanation of the options above."
 msgstr ""
-"  --hide-toolbars                     Zakáže panely nástrojů pro poslední\n"
-"                                      zadané okno; použije se jen na jedno\n"
-"                                      okno; může být zadáno jednou pro\n"
-"                                      každé okno vytvořené z příkazové řádky"
 
-#: ../terminal/main.c:151 ../terminal/terminal-preferences.c:1263
+#: ../terminal/main.c:118 ../terminal/terminal-preferences.c:1263
 #: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../terminal/main.c:173
+#: ../terminal/main.c:135
 #, c-format
 msgid ""
 "%s (Xfce %s)\n"
@@ -316,31 +122,26 @@ msgstr ""
 "\n"
 "Prosíme, abyste chyby hlásili na <%s>.\n"
 
-#: ../terminal/main.c:267
+#: ../terminal/main.c:239
 #, c-format
 msgid "Unable to register terminal service: %s\n"
 msgstr "Nelze registrovat službu terminálu: %s\n"
 
-#: ../terminal/main.c:276
-#, c-format
-msgid "Unable to launch terminal: %s\n"
-msgstr "Nelze spustit teminál: %s\n"
-
-#: ../terminal/terminal-app.c:551
+#: ../terminal/terminal-app.c:554
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "Neplatný řetězec geometrie \"%s\"\n"
 
-#: ../terminal/terminal-dbus.c:114
+#: ../terminal/terminal-dbus.c:108
 msgid "User id mismatch"
 msgstr "ID uživatele neodpovídá"
 
-#: ../terminal/terminal-dbus.c:146
+#: ../terminal/terminal-dbus.c:134
 #, c-format
 msgid "D-BUS message bus disconnected, exiting...\n"
 msgstr "Sběrnice D-BUS byla odpojena, ukončování...\n"
 
-#: ../terminal/terminal-dbus.c:208
+#: ../terminal/terminal-dbus.c:196
 #, c-format
 msgid "Unable to register object %s"
 msgstr "Nelze registrovat objekt %s"
@@ -362,7 +163,7 @@ msgstr "Navštívit webovou stránku aplikace Terminal"
 msgid "Failed to open the documentation browser"
 msgstr "Nepodařilo se otevřít prohlížeč dokumentace"
 
-#: ../terminal/terminal-options.c:189
+#: ../terminal/terminal-options.c:206
 #, c-format
 msgid ""
 "Option \"--default-display\" requires specifying the default X display as "
@@ -371,7 +172,7 @@ msgstr ""
 "Volba \"--default-display\" vyžaduje zadání výchozího X displeje jako jeho "
 "parametru"
 
-#: ../terminal/terminal-options.c:204
+#: ../terminal/terminal-options.c:221
 #, c-format
 msgid ""
 "Option \"--default-working-directory\" requires specifying the default "
@@ -380,15 +181,7 @@ msgstr ""
 "Volba \"--default-working-directory\" vyžaduje zadání výchozího pracovního "
 "adresáře jako jeho parametru"
 
-#: ../terminal/terminal-options.c:235
-#, c-format
-msgid ""
-"Option \"--sm-client-id\" requires specifying the session id as its parameter"
-msgstr ""
-"Volba \"--sm-client-id\" vyžaduje zadání identifikátoru relace (id) jako "
-"parametru"
-
-#: ../terminal/terminal-options.c:250
+#: ../terminal/terminal-options.c:237
 #, c-format
 msgid ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
@@ -397,7 +190,7 @@ msgstr ""
 "Volba \"--execute/-x\" vyžaduje zadání příkazu ke spuštění na zbytku "
 "příkazové řádky"
 
-#: ../terminal/terminal-options.c:267
+#: ../terminal/terminal-options.c:254
 #, c-format
 msgid ""
 "Option \"--command/-e\" requires specifying the command to run as its "
@@ -406,7 +199,7 @@ msgstr ""
 "Volba \"--command/-e\" vyžaduje zadání příkazu ke spuštění jako jeho "
 "parametru"
 
-#: ../terminal/terminal-options.c:284
+#: ../terminal/terminal-options.c:271
 #, c-format
 msgid ""
 "Option \"--working-directory\" requires specifying the working directory as "
@@ -415,18 +208,18 @@ msgstr ""
 "Volba \"--working-directory\" vyžaduje zadání pracovního adresáře jako "
 "parametru"
 
-#: ../terminal/terminal-options.c:299
+#: ../terminal/terminal-options.c:286
 #, c-format
 msgid "Option \"--title/-T\" requires specifying the title as its parameter"
 msgstr "Volba \"--title/-T\" vyžaduje zadání titulku jako parametru"
 
-#: ../terminal/terminal-options.c:319
+#: ../terminal/terminal-options.c:305
 #, c-format
 msgid ""
 "Option \"--display\" requires specifying the X display as its parameters"
 msgstr "Volba \"--display\" vyžaduje zadání X displeje jako jeho parametru"
 
-#: ../terminal/terminal-options.c:334
+#: ../terminal/terminal-options.c:320
 #, c-format
 msgid ""
 "Option \"--geometry\" requires specifying the window geometry as its "
@@ -434,12 +227,12 @@ msgid ""
 msgstr ""
 "Volba \"--geometry\" vyžaduje zadání geometrie okna jako jeho parametru"
 
-#: ../terminal/terminal-options.c:349
+#: ../terminal/terminal-options.c:335
 #, c-format
 msgid "Option \"--role\" requires specifying the window role as its parameter"
 msgstr "Volba \"--role\" vyžaduje zadání úlohy okna jako jeho parametru"
 
-#: ../terminal/terminal-options.c:364
+#: ../terminal/terminal-options.c:350
 #, c-format
 msgid ""
 "Option \"--startup-id\" requires specifying the startup id as its parameter"
@@ -447,7 +240,7 @@ msgstr ""
 "Volba \"--startup-id\" vyžaduje zadání spouštěcího identifikátoru (id) jako "
 "parametru"
 
-#: ../terminal/terminal-options.c:379
+#: ../terminal/terminal-options.c:365
 #, c-format
 msgid ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
@@ -456,7 +249,7 @@ msgstr ""
 "Volba \"--icon/-I\" vyžaduje zadání názvu ikony nebo názvu souboru jako jeho "
 "parametru"
 
-#: ../terminal/terminal-options.c:435
+#: ../terminal/terminal-options.c:419
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Neznámá volba \"%s\""
@@ -525,7 +318,7 @@ msgstr "Celá obrazovka"
 msgid "Set Title"
 msgstr "Nastavit titulek"
 
-#: ../terminal/terminal-preferences.c:464
+#: ../terminal/terminal-preferences.c:464 ../terminal/terminal-window.c:237
 msgid "Reset"
 msgstr "Inicializovat"
 
@@ -823,6 +616,11 @@ msgstr "_Inicializovat"
 msgid "Reset and C_lear"
 msgstr "Inicializovat a _vymazat"
 
+#: ../terminal/terminal-window.c:238
+#, fuzzy
+msgid "Reset and clear"
+msgstr "Inicializovat a vymazat"
+
 #: ../terminal/terminal-window.c:239
 msgid "_Go"
 msgstr "Pře_jít"
@@ -1449,6 +1247,276 @@ msgstr "_Aktualizovat záznamy utmp/wtmp při spuštění příkazu"
 msgid "seconds"
 msgstr "sekundách"
 
+#~ msgid ""
+#~ "  -h, --help                          Print this help message and exit"
+#~ msgstr ""
+#~ "  -h, --help                          Zobrazí tuto nápovědu a ukončí se"
+
+#~ msgid ""
+#~ "  -V, --version                       Print version information and exit"
+#~ msgstr ""
+#~ "  -V, --version                       Zobrazí informace o verzi a ukončí "
+#~ "se"
+
+#~ msgid ""
+#~ "  --disable-server                    Do not register with the D-BUS\n"
+#~ "                                      session message bus"
+#~ msgstr ""
+#~ "  --disable-server                    Nezaregistruje se k relaci sběrnice "
+#~ "D-BUS"
+
+#~ msgid "  --default-display=DISPLAY           default X display to use"
+#~ msgstr "  --default-display=DISPLEJ           Výchozí displej X pro použití"
+
+#~ msgid ""
+#~ "  --default-working-directory=DIRNAME Set the default terminal's working\n"
+#~ "                                      directory"
+#~ msgstr ""
+#~ "  --default-working-directory=NÁZEVADRESÁŘE\n"
+#~ "                                      Nastaví výchozí pracovní adresář\n"
+#~ "                                      terminálu"
+
+#~ msgid ""
+#~ "  --tab                               Open a new tab in the last-"
+#~ "specified\n"
+#~ "                                      window; more than one of these\n"
+#~ "                                      options can be provided"
+#~ msgstr ""
+#~ "  --tab                               Otevře novou kartu v posledně "
+#~ "zadaném\n"
+#~ "                                      okně; lze zadat více těchto voleb"
+
+#~ msgid ""
+#~ "  --window                            Open a new window containing one "
+#~ "tab;\n"
+#~ "                                      more than one of these options can "
+#~ "be\n"
+#~ "                                      provided"
+#~ msgstr ""
+#~ "  --window                            Otevřít nové okno obsahující jednu\n"
+#~ "                                      kartu; lze zadat více než jednu "
+#~ "takovou\n"
+#~ "                                      volbu"
+
+#~ msgid ""
+#~ "  -x, --execute                       Execute the remainder of the "
+#~ "command\n"
+#~ "                                      line inside the terminal"
+#~ msgstr ""
+#~ "  -x, --execute                       Spustí zbytek příkazové řádky v "
+#~ "terminálu"
+
+#~ msgid ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+#~ msgstr ""
+#~ "  -e, --command=ŘETĚZEC               Spustí argument k této volbě "
+#~ "uvnitř\n"
+#~ "                                      terminálu"
+
+#~ msgid ""
+#~ "  --working-directory=DIRNAME         Set the terminal's working directory"
+#~ msgstr ""
+#~ "  --working-directory=NÁZEV_ADRESÁŘE  Nastaví pracovní adresář terminálu"
+
+#~ msgid "  -T, --title=TITLE                   Set the terminal's title"
+#~ msgstr "  -T, --title=TITULEK                 Nastaví titulek terminálu"
+
+#~ msgid ""
+#~ "  -H, --hold                          Do not immediately destroy the tab\n"
+#~ "                                      when the child command exits"
+#~ msgstr ""
+#~ "  -H, --hold                          Nezavře kartu ihned po ukončení\n"
+#~ "                                      potomka"
+
+#~ msgid ""
+#~ "  --display=DISPLAY                   X display to use for the last-\n"
+#~ "                                      specified window"
+#~ msgstr ""
+#~ "  --display=DISPLEJ                   Displej X serveru pro poslední\n"
+#~ "                                      zadané okno"
+
+#~ msgid ""
+#~ "  --geometry=GEOMETRY                 X geometry specification (see \"X"
+#~ "\"\n"
+#~ "                                      man page), can be specified once "
+#~ "per\n"
+#~ "                                      window to be opened"
+#~ msgstr ""
+#~ "  --geometry=GEOMETRIE                Specifikace geometrie X (viz "
+#~ "manuálová\n"
+#~ "                                      stránka \"X\"), může být zadána "
+#~ "jedna na\n"
+#~ "                                      otevřené okno"
+
+#~ msgid ""
+#~ "  --role=ROLE                         Set the role for the last-"
+#~ "specified\n"
+#~ "                                      window; applies to only one "
+#~ "window;\n"
+#~ "                                      can be specified once for each "
+#~ "window\n"
+#~ "                                      you create from the command line"
+#~ msgstr ""
+#~ "  --role=ÚLOHA                        Nastaví úlohu pro poslední zadané\n"
+#~ "                                      okno; použije se jen pro jedno "
+#~ "okno;\n"
+#~ "                                      může být zadáno jednou pro každé\n"
+#~ "                                      okno spuštěné z příkazové řádky"
+
+#~ msgid ""
+#~ "  --startup-id=STRING                 ID for the startup notification\n"
+#~ "                                      protocol"
+#~ msgstr ""
+#~ "  --startup-id=ŘETĚZEC                Identifikátor pro protokol oznámení "
+#~ "při\n"
+#~ "                                      spuštění"
+
+#~ msgid ""
+#~ "  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
+#~ "                                      name or filename"
+#~ msgstr ""
+#~ "  -I, --icon=IKONA                    Nastaví ikonu terminálu jako název "
+#~ "ikony\n"
+#~ "                                             nebo název souboru name or "
+#~ "filename"
+
+#~ msgid ""
+#~ "  --fullscreen                        Set the last-specified window into\n"
+#~ "                                      fullscreen mode; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --fullscreen                        Přepne poslední zadané okno do "
+#~ "režimu celé\n"
+#~ "                                      obrazovky; použije se jen pro jedno "
+#~ "okno;\n"
+#~ "                                      může být zadáno jednou pro každé\n"
+#~ "                                      okno spuštěné z příkazové řádky"
+
+#~ msgid ""
+#~ "  --maximize                          Maximize the last-specified "
+#~ "window;\n"
+#~ "                                      applies to only one window; can be\n"
+#~ "                                      specified once for each window you\n"
+#~ "                                      create from the command line"
+#~ msgstr ""
+#~ "  --maximize                          Maximalizuje poslední "
+#~ "specifikované\n"
+#~ "                                      okno; lze použít pouze na jedno "
+#~ "okno;\n"
+#~ "                                      lze použít pro každé zadané okno\n"
+#~ "                                      vytvořené z příkazového řádku"
+
+#~ msgid ""
+#~ "  --show-menubar                      Turn on the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-menubar                      Zobrazí nabídku okna pro poslední "
+#~ "zadané\n"
+#~ "                                      okno; použije se jen pro jedno "
+#~ "okno;\n"
+#~ "                                      může být zadáno jednou pro každé\n"
+#~ "                                      okno spuštěné z příkazové řádky"
+
+#~ msgid ""
+#~ "  --hide-menubar                      Turn off the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-menubar                      Skryje nabídku okna pro poslední "
+#~ "zadané\n"
+#~ "                                      okno; použije se jen pro jedno "
+#~ "okno;\n"
+#~ "                                      může být zadáno jednou pro každé\n"
+#~ "                                      okno spuštěné z příkazové řádky"
+
+#~ msgid ""
+#~ "  --show-borders                      Turn on the window decorations for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --hide-borders                      Povolí dekorace okna pro poslední "
+#~ "zadané\n"
+#~ "                                      okno; použije se jen pro jedno "
+#~ "okno;\n"
+#~ "                                      může být zadáno jednou pro každé\n"
+#~ "                                      okno spuštěné z příkazové řádky"
+
+#~ msgid ""
+#~ "  --hide-borders                      Turn off the window decorations "
+#~ "for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --hide-borders                      Zakáže dekorace okna pro poslední "
+#~ "zadané\n"
+#~ "                                      okno; použije se jen pro jedno "
+#~ "okno;\n"
+#~ "                                      může být zadáno jednou pro každé\n"
+#~ "                                      okno spuštěné z příkazové řádky"
+
+#~ msgid ""
+#~ "  --show-toolbars                     Turn on the toolbars for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-toolbars                     Povolí panely nástrojů pro "
+#~ "poslední\n"
+#~ "                                      zadané okno; použije se jen na "
+#~ "jedno\n"
+#~ "                                      okno; může být zadáno jednou pro\n"
+#~ "                                      každé okno vytvořené z příkazové "
+#~ "řádky"
+
+#~ msgid ""
+#~ "  --hide-toolbars                     Turn off the toolbars for the "
+#~ "last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-toolbars                     Zakáže panely nástrojů pro "
+#~ "poslední\n"
+#~ "                                      zadané okno; použije se jen na "
+#~ "jedno\n"
+#~ "                                      okno; může být zadáno jednou pro\n"
+#~ "                                      každé okno vytvořené z příkazové "
+#~ "řádky"
+
+#~ msgid "Unable to launch terminal: %s\n"
+#~ msgstr "Nelze spustit teminál: %s\n"
+
+#~ msgid ""
+#~ "Option \"--sm-client-id\" requires specifying the session id as its "
+#~ "parameter"
+#~ msgstr ""
+#~ "Volba \"--sm-client-id\" vyžaduje zadání identifikátoru relace (id) jako "
+#~ "parametru"
+
 #~ msgid "<b>Title:</b>"
 #~ msgstr "<b>Titulek</b>"
 
diff --git a/po/da.po b/po/da.po
index e9eb2f0..7c5a54a 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Terminal 0.2.99.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 11:48+0100\n"
+"POT-Creation-Date: 2009-12-14 16:03+0100\n"
 "PO-Revision-Date: 2009-08-19 22:56+0100\n"
 "Last-Translator: Per Kongstad <p_kongstad at op.pl>\n"
 "Language-Team: Danish <dansk at dansk-gruppen>\n"
@@ -18,297 +18,88 @@ msgstr ""
 "X-Poedit-Language: Danish\n"
 "X-Poedit-Country: DENMARK\n"
 
-#: ../terminal/main.c:46
+#: ../terminal/main.c:48
 msgid "Usage:"
 msgstr "Brug:"
 
-#: ../terminal/main.c:47
+#: ../terminal/main.c:48
 msgid "OPTION"
 msgstr "TILVALG"
 
-#: ../terminal/main.c:49
+#: ../terminal/main.c:53
 msgid "General Options"
 msgstr "Generelle tilvalg"
 
-#: ../terminal/main.c:50
-msgid "  -h, --help                          Print this help message and exit"
-msgstr ""
-"  -h, --help                          Udskriv denne hjælpetekst og afslut"
-
-#: ../terminal/main.c:51
-msgid ""
-"  -V, --version                       Print version information and exit"
-msgstr ""
-"  -V, --version                       Udskriv versionsinformation og afslut"
-
-#: ../terminal/main.c:52
-msgid ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
-msgstr ""
-"  --disable-server                    Registrér ikke hos\n"
-"                                      D-BUS-sessionsbeskedsystemet"
-
-#: ../terminal/main.c:54
-msgid "  --default-display=DISPLAY           default X display to use"
-msgstr ""
-"  --default-display=SKÆRM             standard X skærm som skal benyttes"
+#. parameter of --default-display
+#. parameter of --display
+#: ../terminal/main.c:55 ../terminal/main.c:81
+#, fuzzy
+msgid "display"
+msgstr "Vises ikke"
 
-#: ../terminal/main.c:55
-msgid ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
+#. parameter of --default-working-directory
+#. parameter of --working-directory
+#: ../terminal/main.c:57 ../terminal/main.c:72
+msgid "directory"
 msgstr ""
-"  --default-working-directory=MAPPENAVN Angiv terminalens\n"
-"                                      standardarbejdsmappe"
 
-#: ../terminal/main.c:58
+#: ../terminal/main.c:61
 msgid "Window or Tab Separators"
 msgstr "Adskillere til vindue eller faneblad"
 
-#: ../terminal/main.c:59
-msgid ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-msgstr ""
-"  --tab                               Åbn et nyt faneblad i det sidste\n"
-"                                      specificerede vindue; der kan "
-"specificeres\n"
-"                                      mere end en af disse parametre"
-
-#: ../terminal/main.c:62
-msgid ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-msgstr ""
-"  --window                            Åbn et nyt vindue med et faneblad;\n"
-"                                      der kan specificeres mere end en af\n"
-"                                      disse parametre"
-
 #: ../terminal/main.c:66
 msgid "Tab Options"
 msgstr "Tilvalg til faneblad"
 
-#: ../terminal/main.c:67
-msgid ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-msgstr ""
-"  -x, --execute                       Udfør resten af kommandolinjen\n"
-"                                      i terminalen"
-
-#: ../terminal/main.c:69
-msgid ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-msgstr ""
-"  -e, --command=STRENG                Udfør parameteren til denne\n"
-"                                      indstilling i terminalen"
-
-#: ../terminal/main.c:71
-msgid ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
-msgstr "  --working-directory=MAPPENAVN       Angiv terminalens arbejdsmappe"
-
-#: ../terminal/main.c:72
-msgid "  -T, --title=TITLE                   Set the terminal's title"
-msgstr "  -T, --title=TITEL                   Angiv teminalens titel"
+#. parameter of --command
+#: ../terminal/main.c:68
+#, fuzzy
+msgid "command"
+msgstr "Kommando"
 
-#: ../terminal/main.c:73
-msgid ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-msgstr ""
-"  -H, --hold                          Luk ikke fanebladet,\n"
-"                                      når underprocessen afslutter"
+#. parameter of --title
+#: ../terminal/main.c:70
+#, fuzzy
+msgid "title"
+msgstr "Titel"
 
-#: ../terminal/main.c:76
+#: ../terminal/main.c:79
 msgid "Window Options"
 msgstr "Tilvalgsvindue"
 
-#: ../terminal/main.c:77
-msgid ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
-msgstr ""
-"  --display=SKÆRM                     X skærm til brug for det sidste "
-"angivne\n"
-"                                      vindue"
-
-#: ../terminal/main.c:79
-msgid ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
-msgstr ""
-"  --geometry=GEOMETRI                 X geometri specifikationer (se \"X\"\n"
-"                                      manualsiden), kan specificeres en gang "
-"per \n"
-"                                      vindue, der skal åbnes"
-
-#: ../terminal/main.c:82
-msgid ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
-msgstr ""
-"  --role=ROLLE                        Indstil rollen for det sidst "
-"specificerede;\n"
-"                                      vindue;gælder kun for ét vindue;\n"
-"                                      kan specificeres en gang for hvert "
-"vindue\n"
-"                                      du opretter fra kommandolinjen"
-
-#: ../terminal/main.c:86
-msgid ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
-msgstr ""
-"  --startup-id=STRENG                 Id til opstartsnotifikationsprotokollen"
-
-#: ../terminal/main.c:88
-msgid ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
-msgstr ""
-"  -I, --icon=IKON                     Indstil terminalikon som et ikonnavn\n"
-"                                      eller et filnavn"
-
-#: ../terminal/main.c:90
-msgid ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --fullscreen                        Angiver det sidst specificerede "
-"vindue\n"
-"                                      i fuldskærmsindstilling; gælder kun "
-"for\n"
-"                                      et vindue; kan specificeres en gang\n"
-"                                      forhvert vindue du opretter fra\n"
-"                                      kommandolinjen"
-
-#: ../terminal/main.c:95
-msgid ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
-msgstr ""
-"  --maximize                          Maksimér det sidste angivne vindue;\n"
-"                                      anvendes til kun ét vindue; det kan\n"
-"                                      angives engang for hvert vindue du\n"
-"                                      opretter fra kommandolinjen"
-
-#: ../terminal/main.c:99
-msgid ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-menubar                      Aktivér menulinjen for det sidst\n"
-"                                      specificerede vindue; gælder kun for "
-"det\n"
-"                                      ene vindue; kan specificeres en gang "
-"for\n"
-"                                      hvert vindue du opretter fra "
-"kommandolinjen"
-
-#: ../terminal/main.c:104
-msgid ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#. parameter of --geometry
+#: ../terminal/main.c:83
+msgid "geometry"
 msgstr ""
-"  --hide-menubar                      Deaktivér menulinjen for det sidst\n"
-"                                      specificerede vindue; gælder kun for "
-"det\n"
-"                                      ene vindue;kan specificeres en gang "
-"for\n"
-"                                      hvert vindue du opretter fra "
-"kommandolinjen"
 
-#: ../terminal/main.c:109
-msgid ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
+#. parameter of --role
+#: ../terminal/main.c:85
+msgid "role"
 msgstr ""
-"  --show-borders                      Aktivér vinduesdekorationer for det\n"
-"                                      sidst specificerede vindue; gælder kun "
-"for\n"
-"                                      det ene vindue;kan specificeres en "
-"gang for\n"
-"                                      hvert vindue du opretter fra "
-"kommandolinjen"
 
-#: ../terminal/main.c:114
-msgid ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --hide-borders                      Deaktivér vinduesdekorationer for det "
-"sidst\n"
-"                                      specificerede vindue; gælder kun for "
-"det\n"
-"                                      ene vindue; kan specificeres en gang "
-"for\n"
-"                                      hvert vindue du opretter fra "
-"kommandolinjen"
+#. parameter of --startup-id
+#: ../terminal/main.c:87
+#, fuzzy
+msgid "string"
+msgstr "Advarsel"
 
-#: ../terminal/main.c:119
-msgid ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-toolbars                     Aktivér værktøjslinjer for det sidst\n"
-"                                      specificerede vindue; gælder kun for "
-"det\n"
-"                                      ene vindue; kan specificeres en gang "
-"for\n"
-"                                      hvert vindue du opretter fra "
-"kommandolinjen"
+#. parameter of --icon
+#: ../terminal/main.c:89
+#, fuzzy
+msgid "icon"
+msgstr "Handling"
 
-#: ../terminal/main.c:124
-msgid ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#: ../terminal/main.c:91
+#, c-format
+msgid "See the %s man page for full explanation of the options above."
 msgstr ""
-"  --hide-toolbars                     Deaktivér værktøjslinjer for det "
-"sidst\n"
-"                                      specificerede vindue; gælder kun for "
-"det\n"
-"                                      ene vindue; kan specificeres en gang "
-"for\n"
-"                                      hvert vindue du opretter fra "
-"kommandolinjen"
 
-#: ../terminal/main.c:151 ../terminal/terminal-preferences.c:1263
+#: ../terminal/main.c:118 ../terminal/terminal-preferences.c:1263
 #: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../terminal/main.c:173
+#: ../terminal/main.c:135
 #, c-format
 msgid ""
 "%s (Xfce %s)\n"
@@ -333,31 +124,26 @@ msgstr ""
 "\n"
 "Rapportér fejl til <%s>.\n"
 
-#: ../terminal/main.c:267
+#: ../terminal/main.c:239
 #, c-format
 msgid "Unable to register terminal service: %s\n"
 msgstr "Kan ikke registrere terminalservice: %s\n"
 
-#: ../terminal/main.c:276
-#, c-format
-msgid "Unable to launch terminal: %s\n"
-msgstr "Kan ikke starte terminal: %s\n"
-
-#: ../terminal/terminal-app.c:551
+#: ../terminal/terminal-app.c:554
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "Ugyldig geometri-streng \"%s\"\n"
 
-#: ../terminal/terminal-dbus.c:114
+#: ../terminal/terminal-dbus.c:108
 msgid "User id mismatch"
 msgstr "Bruger-id passer ikke"
 
-#: ../terminal/terminal-dbus.c:146
+#: ../terminal/terminal-dbus.c:134
 #, c-format
 msgid "D-BUS message bus disconnected, exiting...\n"
 msgstr "D-BUS-beskedsystemet afbrudt, afslutter...\n"
 
-#: ../terminal/terminal-dbus.c:208
+#: ../terminal/terminal-dbus.c:196
 #, c-format
 msgid "Unable to register object %s"
 msgstr "Kan ikke registrere objekt %s"
@@ -383,7 +169,7 @@ msgstr "Besøg netstedet for Terminal"
 msgid "Failed to open the documentation browser"
 msgstr "Kunne ikke åbne dokumentationsnavigatoren"
 
-#: ../terminal/terminal-options.c:189
+#: ../terminal/terminal-options.c:206
 #, c-format
 msgid ""
 "Option \"--default-display\" requires specifying the default X display as "
@@ -392,7 +178,7 @@ msgstr ""
 "Tilvalg \"--default-display\" kræver angivelser af standard X skærm som "
 "parameter"
 
-#: ../terminal/terminal-options.c:204
+#: ../terminal/terminal-options.c:221
 #, c-format
 msgid ""
 "Option \"--default-working-directory\" requires specifying the default "
@@ -401,13 +187,7 @@ msgstr ""
 "Tilvalg \"--default-working-directory\" kræver angivelse af standard aktuel "
 "arbejdsmappe som parameter"
 
-#: ../terminal/terminal-options.c:235
-#, c-format
-msgid ""
-"Option \"--sm-client-id\" requires specifying the session id as its parameter"
-msgstr "Tilvalg \"--sm-client-id\" kræver sessionsid'et som parameter"
-
-#: ../terminal/terminal-options.c:250
+#: ../terminal/terminal-options.c:237
 #, c-format
 msgid ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
@@ -416,7 +196,7 @@ msgstr ""
 "Tilvalg \"--execute/-x\" kræver en kommando, som skal køres på resten af "
 "kommandolinjen"
 
-#: ../terminal/terminal-options.c:267
+#: ../terminal/terminal-options.c:254
 #, c-format
 msgid ""
 "Option \"--command/-e\" requires specifying the command to run as its "
@@ -424,7 +204,7 @@ msgid ""
 msgstr ""
 "Tilvalg \"--command/-e\" kræver kommandoen, som skal køres som parameter"
 
-#: ../terminal/terminal-options.c:284
+#: ../terminal/terminal-options.c:271
 #, c-format
 msgid ""
 "Option \"--working-directory\" requires specifying the working directory as "
@@ -432,18 +212,18 @@ msgid ""
 msgstr ""
 "Tilvalg \"--working-directory\" kræver aktuel arbejdsmappe som parameter"
 
-#: ../terminal/terminal-options.c:299
+#: ../terminal/terminal-options.c:286
 #, c-format
 msgid "Option \"--title/-T\" requires specifying the title as its parameter"
 msgstr "Tilvalg \"--title/-T\" kræver en titel som parameter"
 
-#: ../terminal/terminal-options.c:319
+#: ../terminal/terminal-options.c:305
 #, c-format
 msgid ""
 "Option \"--display\" requires specifying the X display as its parameters"
 msgstr "Tilvalg \"--display\" kræver angivelse af X skærm som parameter"
 
-#: ../terminal/terminal-options.c:334
+#: ../terminal/terminal-options.c:320
 #, c-format
 msgid ""
 "Option \"--geometry\" requires specifying the window geometry as its "
@@ -451,18 +231,18 @@ msgid ""
 msgstr ""
 "Tilvalg \"--geometry\" kræver angivelse af vinduets geometri som parameter"
 
-#: ../terminal/terminal-options.c:349
+#: ../terminal/terminal-options.c:335
 #, c-format
 msgid "Option \"--role\" requires specifying the window role as its parameter"
 msgstr "Tilvalg \"--role\" kræver angivelse af vinduets rolle som parameter"
 
-#: ../terminal/terminal-options.c:364
+#: ../terminal/terminal-options.c:350
 #, c-format
 msgid ""
 "Option \"--startup-id\" requires specifying the startup id as its parameter"
 msgstr "Tilvalg \"--startup-id\" kræver angivelse af startup ID som parameter"
 
-#: ../terminal/terminal-options.c:379
+#: ../terminal/terminal-options.c:365
 #, c-format
 msgid ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
@@ -471,7 +251,7 @@ msgstr ""
 "Tilvalg \"--icon/-I\" kræver angivelse af ikonnavn eller filnavn som "
 "parameter"
 
-#: ../terminal/terminal-options.c:435
+#: ../terminal/terminal-options.c:419
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Ukendt tilvalg \"%s\""
@@ -540,7 +320,7 @@ msgstr "Fuldskærm"
 msgid "Set Title"
 msgstr "Angiv titel"
 
-#: ../terminal/terminal-preferences.c:464
+#: ../terminal/terminal-preferences.c:464 ../terminal/terminal-window.c:237
 msgid "Reset"
 msgstr "Nulstil"
 
@@ -837,6 +617,11 @@ msgstr "_Nulstil"
 msgid "Reset and C_lear"
 msgstr "Nulstil og _ryd"
 
+#: ../terminal/terminal-window.c:238
+#, fuzzy
+msgid "Reset and clear"
+msgstr "Nulstil og ryd"
+
 #: ../terminal/terminal-window.c:239
 msgid "_Go"
 msgstr "_Gå"
@@ -1465,6 +1250,284 @@ msgstr "_Opdatér utmp/wtmp posterne når en kommando bliver startet"
 msgid "seconds"
 msgstr "sekunder"
 
+#~ msgid ""
+#~ "  -h, --help                          Print this help message and exit"
+#~ msgstr ""
+#~ "  -h, --help                          Udskriv denne hjælpetekst og afslut"
+
+#~ msgid ""
+#~ "  -V, --version                       Print version information and exit"
+#~ msgstr ""
+#~ "  -V, --version                       Udskriv versionsinformation og "
+#~ "afslut"
+
+#~ msgid ""
+#~ "  --disable-server                    Do not register with the D-BUS\n"
+#~ "                                      session message bus"
+#~ msgstr ""
+#~ "  --disable-server                    Registrér ikke hos\n"
+#~ "                                      D-BUS-sessionsbeskedsystemet"
+
+#~ msgid "  --default-display=DISPLAY           default X display to use"
+#~ msgstr ""
+#~ "  --default-display=SKÆRM             standard X skærm som skal benyttes"
+
+#~ msgid ""
+#~ "  --default-working-directory=DIRNAME Set the default terminal's working\n"
+#~ "                                      directory"
+#~ msgstr ""
+#~ "  --default-working-directory=MAPPENAVN Angiv terminalens\n"
+#~ "                                      standardarbejdsmappe"
+
+#~ msgid ""
+#~ "  --tab                               Open a new tab in the last-"
+#~ "specified\n"
+#~ "                                      window; more than one of these\n"
+#~ "                                      options can be provided"
+#~ msgstr ""
+#~ "  --tab                               Åbn et nyt faneblad i det sidste\n"
+#~ "                                      specificerede vindue; der kan "
+#~ "specificeres\n"
+#~ "                                      mere end en af disse parametre"
+
+#~ msgid ""
+#~ "  --window                            Open a new window containing one "
+#~ "tab;\n"
+#~ "                                      more than one of these options can "
+#~ "be\n"
+#~ "                                      provided"
+#~ msgstr ""
+#~ "  --window                            Åbn et nyt vindue med et faneblad;\n"
+#~ "                                      der kan specificeres mere end en "
+#~ "af\n"
+#~ "                                      disse parametre"
+
+#~ msgid ""
+#~ "  -x, --execute                       Execute the remainder of the "
+#~ "command\n"
+#~ "                                      line inside the terminal"
+#~ msgstr ""
+#~ "  -x, --execute                       Udfør resten af kommandolinjen\n"
+#~ "                                      i terminalen"
+
+#~ msgid ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+#~ msgstr ""
+#~ "  -e, --command=STRENG                Udfør parameteren til denne\n"
+#~ "                                      indstilling i terminalen"
+
+#~ msgid ""
+#~ "  --working-directory=DIRNAME         Set the terminal's working directory"
+#~ msgstr ""
+#~ "  --working-directory=MAPPENAVN       Angiv terminalens arbejdsmappe"
+
+#~ msgid "  -T, --title=TITLE                   Set the terminal's title"
+#~ msgstr "  -T, --title=TITEL                   Angiv teminalens titel"
+
+#~ msgid ""
+#~ "  -H, --hold                          Do not immediately destroy the tab\n"
+#~ "                                      when the child command exits"
+#~ msgstr ""
+#~ "  -H, --hold                          Luk ikke fanebladet,\n"
+#~ "                                      når underprocessen afslutter"
+
+#~ msgid ""
+#~ "  --display=DISPLAY                   X display to use for the last-\n"
+#~ "                                      specified window"
+#~ msgstr ""
+#~ "  --display=SKÆRM                     X skærm til brug for det sidste "
+#~ "angivne\n"
+#~ "                                      vindue"
+
+#~ msgid ""
+#~ "  --geometry=GEOMETRY                 X geometry specification (see \"X"
+#~ "\"\n"
+#~ "                                      man page), can be specified once "
+#~ "per\n"
+#~ "                                      window to be opened"
+#~ msgstr ""
+#~ "  --geometry=GEOMETRI                 X geometri specifikationer (se \"X"
+#~ "\"\n"
+#~ "                                      manualsiden), kan specificeres en "
+#~ "gang per \n"
+#~ "                                      vindue, der skal åbnes"
+
+#~ msgid ""
+#~ "  --role=ROLE                         Set the role for the last-"
+#~ "specified\n"
+#~ "                                      window; applies to only one "
+#~ "window;\n"
+#~ "                                      can be specified once for each "
+#~ "window\n"
+#~ "                                      you create from the command line"
+#~ msgstr ""
+#~ "  --role=ROLLE                        Indstil rollen for det sidst "
+#~ "specificerede;\n"
+#~ "                                      vindue;gælder kun for ét vindue;\n"
+#~ "                                      kan specificeres en gang for hvert "
+#~ "vindue\n"
+#~ "                                      du opretter fra kommandolinjen"
+
+#~ msgid ""
+#~ "  --startup-id=STRING                 ID for the startup notification\n"
+#~ "                                      protocol"
+#~ msgstr ""
+#~ "  --startup-id=STRENG                 Id til "
+#~ "opstartsnotifikationsprotokollen"
+
+#~ msgid ""
+#~ "  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
+#~ "                                      name or filename"
+#~ msgstr ""
+#~ "  -I, --icon=IKON                     Indstil terminalikon som et "
+#~ "ikonnavn\n"
+#~ "                                      eller et filnavn"
+
+#~ msgid ""
+#~ "  --fullscreen                        Set the last-specified window into\n"
+#~ "                                      fullscreen mode; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --fullscreen                        Angiver det sidst specificerede "
+#~ "vindue\n"
+#~ "                                      i fuldskærmsindstilling; gælder kun "
+#~ "for\n"
+#~ "                                      et vindue; kan specificeres en "
+#~ "gang\n"
+#~ "                                      forhvert vindue du opretter fra\n"
+#~ "                                      kommandolinjen"
+
+#~ msgid ""
+#~ "  --maximize                          Maximize the last-specified "
+#~ "window;\n"
+#~ "                                      applies to only one window; can be\n"
+#~ "                                      specified once for each window you\n"
+#~ "                                      create from the command line"
+#~ msgstr ""
+#~ "  --maximize                          Maksimér det sidste angivne "
+#~ "vindue;\n"
+#~ "                                      anvendes til kun ét vindue; det "
+#~ "kan\n"
+#~ "                                      angives engang for hvert vindue du\n"
+#~ "                                      opretter fra kommandolinjen"
+
+#~ msgid ""
+#~ "  --show-menubar                      Turn on the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-menubar                      Aktivér menulinjen for det sidst\n"
+#~ "                                      specificerede vindue; gælder kun "
+#~ "for det\n"
+#~ "                                      ene vindue; kan specificeres en "
+#~ "gang for\n"
+#~ "                                      hvert vindue du opretter fra "
+#~ "kommandolinjen"
+
+#~ msgid ""
+#~ "  --hide-menubar                      Turn off the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-menubar                      Deaktivér menulinjen for det sidst\n"
+#~ "                                      specificerede vindue; gælder kun "
+#~ "for det\n"
+#~ "                                      ene vindue;kan specificeres en gang "
+#~ "for\n"
+#~ "                                      hvert vindue du opretter fra "
+#~ "kommandolinjen"
+
+#~ msgid ""
+#~ "  --show-borders                      Turn on the window decorations for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --show-borders                      Aktivér vinduesdekorationer for "
+#~ "det\n"
+#~ "                                      sidst specificerede vindue; gælder "
+#~ "kun for\n"
+#~ "                                      det ene vindue;kan specificeres en "
+#~ "gang for\n"
+#~ "                                      hvert vindue du opretter fra "
+#~ "kommandolinjen"
+
+#~ msgid ""
+#~ "  --hide-borders                      Turn off the window decorations "
+#~ "for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --hide-borders                      Deaktivér vinduesdekorationer for "
+#~ "det sidst\n"
+#~ "                                      specificerede vindue; gælder kun "
+#~ "for det\n"
+#~ "                                      ene vindue; kan specificeres en "
+#~ "gang for\n"
+#~ "                                      hvert vindue du opretter fra "
+#~ "kommandolinjen"
+
+#~ msgid ""
+#~ "  --show-toolbars                     Turn on the toolbars for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-toolbars                     Aktivér værktøjslinjer for det "
+#~ "sidst\n"
+#~ "                                      specificerede vindue; gælder kun "
+#~ "for det\n"
+#~ "                                      ene vindue; kan specificeres en "
+#~ "gang for\n"
+#~ "                                      hvert vindue du opretter fra "
+#~ "kommandolinjen"
+
+#~ msgid ""
+#~ "  --hide-toolbars                     Turn off the toolbars for the "
+#~ "last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-toolbars                     Deaktivér værktøjslinjer for det "
+#~ "sidst\n"
+#~ "                                      specificerede vindue; gælder kun "
+#~ "for det\n"
+#~ "                                      ene vindue; kan specificeres en "
+#~ "gang for\n"
+#~ "                                      hvert vindue du opretter fra "
+#~ "kommandolinjen"
+
+#~ msgid "Unable to launch terminal: %s\n"
+#~ msgstr "Kan ikke starte terminal: %s\n"
+
+#~ msgid ""
+#~ "Option \"--sm-client-id\" requires specifying the session id as its "
+#~ "parameter"
+#~ msgstr "Tilvalg \"--sm-client-id\" kræver sessionsid'et som parameter"
+
 #~ msgid "<b>Title:</b>"
 #~ msgstr "<b>Titel:</b>"
 
diff --git a/po/de.po b/po/de.po
index de908dc..d4752fd 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Terminal 0.2.12\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 11:48+0100\n"
+"POT-Creation-Date: 2009-12-14 16:03+0100\n"
 "PO-Revision-Date: 2009-07-06 22:10+0200\n"
 "Last-Translator: Enrico Tröger <enrico at xfce.org>\n"
 "Language-Team: German <xfce-i18n-de at xfce.org>\n"
@@ -18,292 +18,88 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../terminal/main.c:46
+#: ../terminal/main.c:48
 msgid "Usage:"
 msgstr "Aufruf:"
 
-#: ../terminal/main.c:47
+#: ../terminal/main.c:48
 msgid "OPTION"
 msgstr "OPTION"
 
-#: ../terminal/main.c:49
+#: ../terminal/main.c:53
 msgid "General Options"
 msgstr "Allgemeine Einstellungen"
 
-#: ../terminal/main.c:50
-msgid "  -h, --help                          Print this help message and exit"
-msgstr "  -h, --help                          Diese Hilfe anzeigen"
-
-#: ../terminal/main.c:51
-msgid ""
-"  -V, --version                       Print version information and exit"
-msgstr "  -V, --version                       Programmversion anzeigen"
-
-#: ../terminal/main.c:52
-msgid ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
-msgstr ""
-"  --disable-server                    Nicht am Nachrichtenbus D-Bus anmelden"
-
-#: ../terminal/main.c:54
-msgid "  --default-display=DISPLAY           default X display to use"
-msgstr ""
-"  --default-display=DISPLAY           Zu verwendende Standard-X-Anzeige"
+#. parameter of --default-display
+#. parameter of --display
+#: ../terminal/main.c:55 ../terminal/main.c:81
+#, fuzzy
+msgid "display"
+msgstr "Nicht anzeigen"
 
-#: ../terminal/main.c:55
-msgid ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
+#. parameter of --default-working-directory
+#. parameter of --working-directory
+#: ../terminal/main.c:57 ../terminal/main.c:72
+msgid "directory"
 msgstr ""
-"  --default-working-directory=VERZNAME Das Standard-Arbeitsverzeichnis\n"
-"                                      festlegen"
 
-#: ../terminal/main.c:58
+#: ../terminal/main.c:61
 msgid "Window or Tab Separators"
 msgstr "Fenster und Reiter trennen:"
 
-#: ../terminal/main.c:59
-msgid ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-msgstr ""
-"  --tab                               Öffne einen neuen Reiter im zuletzt\n"
-"                                      angegebenen Fenster; diese Option "
-"kann\n"
-"                                      mehr als einmal angegeben werden"
-
-#: ../terminal/main.c:62
-msgid ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-msgstr ""
-"  --window                            Öffne ein neues Fenster mit einem\n"
-"                                      Reiter; diese Option kann mehr als\n"
-"                                      einmal angegeben werden"
-
 #: ../terminal/main.c:66
 msgid "Tab Options"
 msgstr "Reitereinstellungen"
 
-#: ../terminal/main.c:67
-msgid ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-msgstr ""
-"  -x, --execute                       Den verbleibenden Teil der Befehls-\n"
-"                                      zeile innerhalb des Terminals ausführen"
-
-#: ../terminal/main.c:69
-msgid ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-msgstr ""
-"  -e, --command=STRING                Das Argument dieser Option innerhalb\n"
-"                                      des Terminals ausführen"
-
-#: ../terminal/main.c:71
-msgid ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
-msgstr ""
-"  --working-directory=VERZNAME        Setzt das Arbeitsverzeichnis des "
-"Terminals"
-
-#: ../terminal/main.c:72
-msgid "  -T, --title=TITLE                   Set the terminal's title"
-msgstr "  -T, --title=TITEL                   Setzt den Titel des Terminals"
+#. parameter of --command
+#: ../terminal/main.c:68
+#, fuzzy
+msgid "command"
+msgstr "Befehl"
 
-#: ../terminal/main.c:73
-msgid ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-msgstr ""
-"  -H, --hold                          Den Reiter nicht sofort schließen,\n"
-"                                      wenn der Kindprozess beendet wird"
+#. parameter of --title
+#: ../terminal/main.c:70
+#, fuzzy
+msgid "title"
+msgstr "Titel"
 
-#: ../terminal/main.c:76
+#: ../terminal/main.c:79
 msgid "Window Options"
 msgstr "Fenstereinstellungen"
 
-#: ../terminal/main.c:77
-msgid ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
+#. parameter of --geometry
+#: ../terminal/main.c:83
+msgid "geometry"
 msgstr ""
-"  --display=ANZEIGE                   X-Anzeige, die für das zuletzt\n"
-"                                      angegebene Fenster verwendet werden "
-"soll"
 
-#: ../terminal/main.c:79
-msgid ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
+#. parameter of --role
+#: ../terminal/main.c:85
+msgid "role"
 msgstr ""
-"  --geometry=GEOMETRIE                X-Geometriespezifikation (siehe \n"
-"                                      Handbuch zu »X«), kann für jedes zu\n"
-"                                      öffnende Fenster angegeben werden"
 
-#: ../terminal/main.c:82
-msgid ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
-msgstr ""
-"  --role=ROLLE                        Die Rolle für das zuletzt angegebene\n"
-"                                      Fenster festlegen; dies gilt nur\n"
-"                                      für ein Fenster; kann für jedes "
-"Fenster\n"
-"                                      angegeben werden, das von der "
-"Befehls-\n"
-"                                      zeile aus geöffnet wird"
-
-#: ../terminal/main.c:86
-msgid ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
-msgstr ""
-"  --startup-id=STRING                 Identifikationsnummer für das "
-"Protokoll\n"
-"                                      zur visuellen Rückmeldung"
+#. parameter of --startup-id
+#: ../terminal/main.c:87
+#, fuzzy
+msgid "string"
+msgstr "Warnung"
 
-#: ../terminal/main.c:88
-msgid ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
-msgstr ""
-"  -I, --icon=SYMBOL                   Das Symbol für Terminal über einen\n"
-"                                      Symbolnamen oder Dateinamen festlgegen"
+#. parameter of --icon
+#: ../terminal/main.c:89
+#, fuzzy
+msgid "icon"
+msgstr "Aktion"
 
-#: ../terminal/main.c:90
-msgid ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --fullscreen                        Setzt das zuletzt angegebene Fenster\n"
-"                                      in den Vollbildmodus; dies gilt nur\n"
-"                                      für ein Fenster; kann für jedes "
-"Fesnter\n"
-"                                      angegeben werden, das von der "
-"Befehls-\n"
-"                                      zeile aus geöffnet wird"
-
-#: ../terminal/main.c:95
-msgid ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
-msgstr ""
-"  --maximize                          Das zuletzt angegebene Fenster "
-"maximier-\n"
-"                                      en; dies gilt nur für ein Fenster; "
-"kann\n"
-"                                      für jedes Fenster angegeben werden, "
-"das\n"
-"                                      von der Befehlszeile aus geöffnet wird"
-
-#: ../terminal/main.c:99
-msgid ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-menubar                      Die Menüleiste für das zuletzt "
-"angegebene\n"
-"                                      Fenster anzeigen; dies gilt nur\n"
-"                                      für ein Fenster; kann aber für jedes "
-"zu\n"
-"                                      öffnende Fenster angegeben werden"
-
-#: ../terminal/main.c:104
-msgid ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --hide-menubar                      Die Menüleiste für das zuletzt "
-"angegebene\n"
-"                                      Fenster verbergen; dies gilt nur\n"
-"                                      für ein Fenster; kann aber für jedes "
-"zu\n"
-"                                      öffnende Fenster angegeben werden"
-
-#: ../terminal/main.c:109
-msgid ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --show-borders                      Die Fensterdekoration für das zuletzt\n"
-"                                      angegebene Fenster anzeigen; dies "
-"gilt\n"
-"                                      nur für ein Fenster; kann aber für "
-"jedes\n"
-"                                      zu öffnende Fenster angegeben werden"
-
-#: ../terminal/main.c:114
-msgid ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --hide-borders                      Die Fensterdekoration für das zuletzt\n"
-"                                      angegebene Fenster verbergen; dies "
-"gilt\n"
-"                                      nur für ein Fenster; kann aber für "
-"jedes\n"
-"                                      zu öffnende Fenster angegeben werden"
-
-#: ../terminal/main.c:119
-msgid ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-toolbars                     Die Werkzeugleisten für das zuletzt\n"
-"                                      angegebene Fenster anzeigen; dies  "
-"gilt\n"
-"                                      nur für ein Fenster; kann aber für "
-"jedes\n"
-"                                      zu öffnende Fenster angegeben werden"
-
-#: ../terminal/main.c:124
-msgid ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#: ../terminal/main.c:91
+#, c-format
+msgid "See the %s man page for full explanation of the options above."
 msgstr ""
-"  --hide-toolbars                     Die Werkzeugleisten für das zuletzt\n"
-"                                      genannte Fenster verbegren; dies gilt\n"
-"                                      nur für ein Fenster; kann aber für "
-"jedes\n"
-"                                      zu öffnende Fenster angegeben werden"
 
-#: ../terminal/main.c:151 ../terminal/terminal-preferences.c:1263
+#: ../terminal/main.c:118 ../terminal/terminal-preferences.c:1263
 #: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../terminal/main.c:173
+#: ../terminal/main.c:135
 #, c-format
 msgid ""
 "%s (Xfce %s)\n"
@@ -328,31 +124,26 @@ msgstr ""
 "\n"
 "Bitte melden Sie Probleme unter <%s>.\n"
 
-#: ../terminal/main.c:267
+#: ../terminal/main.c:239
 #, c-format
 msgid "Unable to register terminal service: %s\n"
 msgstr "Fehler beim Registrieren des Terminaldienstes: %s\n"
 
-#: ../terminal/main.c:276
-#, c-format
-msgid "Unable to launch terminal: %s\n"
-msgstr "Terminal konnte nicht gestartet werden: %s\n"
-
-#: ../terminal/terminal-app.c:551
+#: ../terminal/terminal-app.c:554
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "Ungültige Geometrieangabe »%s«\n"
 
-#: ../terminal/terminal-dbus.c:114
+#: ../terminal/terminal-dbus.c:108
 msgid "User id mismatch"
 msgstr "Benutzer-Identifikationsnummern stimmen nicht überein"
 
-#: ../terminal/terminal-dbus.c:146
+#: ../terminal/terminal-dbus.c:134
 #, c-format
 msgid "D-BUS message bus disconnected, exiting...\n"
 msgstr "Verbindung zum Nachrichtenbus D-Bus wurde getrennt, beende...\n"
 
-#: ../terminal/terminal-dbus.c:208
+#: ../terminal/terminal-dbus.c:196
 #, c-format
 msgid "Unable to register object %s"
 msgstr "Konnte das D-Bus-Objekt nicht registrieren: %s"
@@ -378,7 +169,7 @@ msgstr ""
 msgid "Failed to open the documentation browser"
 msgstr "Konnte den Browser für die Dokumentation nicht öffnen"
 
-#: ../terminal/terminal-options.c:189
+#: ../terminal/terminal-options.c:206
 #, c-format
 msgid ""
 "Option \"--default-display\" requires specifying the default X display as "
@@ -387,7 +178,7 @@ msgstr ""
 "Die Option »--default-display« benötigt als Parameter die Angabe der\n"
 "Standard-X-Anzeige"
 
-#: ../terminal/terminal-options.c:204
+#: ../terminal/terminal-options.c:221
 #, c-format
 msgid ""
 "Option \"--default-working-directory\" requires specifying the default "
@@ -396,15 +187,7 @@ msgstr ""
 "Die Option »--default-working-directory« benötigt als Parameter die Angabe\n"
 "des Standard-Arbeitsverzeichnisses"
 
-#: ../terminal/terminal-options.c:235
-#, c-format
-msgid ""
-"Option \"--sm-client-id\" requires specifying the session id as its parameter"
-msgstr ""
-"Die Option »--sm-client-id« benötigt als Parameter die Sitzungs-\n"
-"Identifikationsnummer."
-
-#: ../terminal/terminal-options.c:250
+#: ../terminal/terminal-options.c:237
 #, c-format
 msgid ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
@@ -413,7 +196,7 @@ msgstr ""
 "Die Option »--execute/-x« benötigt, dass die folgenden Befehlszeilen-\n"
 "parameter den auszuführenden Befehl enthalten"
 
-#: ../terminal/terminal-options.c:267
+#: ../terminal/terminal-options.c:254
 #, c-format
 msgid ""
 "Option \"--command/-e\" requires specifying the command to run as its "
@@ -421,7 +204,7 @@ msgid ""
 msgstr ""
 "Die Option »--command/-e« benötigt als Parameter den auszuführenden Befehl"
 
-#: ../terminal/terminal-options.c:284
+#: ../terminal/terminal-options.c:271
 #, c-format
 msgid ""
 "Option \"--working-directory\" requires specifying the working directory as "
@@ -431,13 +214,13 @@ msgstr ""
 "Arbeitsverzeichnisses, welches für den auszuführenden Befehl benutzt\n"
 "werden soll"
 
-#: ../terminal/terminal-options.c:299
+#: ../terminal/terminal-options.c:286
 #, c-format
 msgid "Option \"--title/-T\" requires specifying the title as its parameter"
 msgstr ""
 "Die Option \"--title/-T\" benötigt als Parameter den Titel für das Terminal"
 
-#: ../terminal/terminal-options.c:319
+#: ../terminal/terminal-options.c:305
 #, c-format
 msgid ""
 "Option \"--display\" requires specifying the X display as its parameters"
@@ -445,7 +228,7 @@ msgstr ""
 "Die Option »--display« benötigt als Parameter die Angabe eines Namens\n"
 "für die X-Anzeige"
 
-#: ../terminal/terminal-options.c:334
+#: ../terminal/terminal-options.c:320
 #, c-format
 msgid ""
 "Option \"--geometry\" requires specifying the window geometry as its "
@@ -453,14 +236,14 @@ msgid ""
 msgstr ""
 "Die Option »--geometry« benötigt als Parameter eine Geometrie-Spezifikation"
 
-#: ../terminal/terminal-options.c:349
+#: ../terminal/terminal-options.c:335
 #, c-format
 msgid "Option \"--role\" requires specifying the window role as its parameter"
 msgstr ""
 "Die Option »--role« benötigt als Parameter die Angabe einer Rolle\n"
 "für das Fenster"
 
-#: ../terminal/terminal-options.c:364
+#: ../terminal/terminal-options.c:350
 #, c-format
 msgid ""
 "Option \"--startup-id\" requires specifying the startup id as its parameter"
@@ -468,7 +251,7 @@ msgstr ""
 "Die Option »--startup-id« benötigt als Parameter die Angabe einer\n"
 "Start-Identifikationsnummer"
 
-#: ../terminal/terminal-options.c:379
+#: ../terminal/terminal-options.c:365
 #, c-format
 msgid ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
@@ -477,7 +260,7 @@ msgstr ""
 "Die Option »--icon/-I« benötigt als Parameter einen Symbolnamen oder "
 "Dateinamen"
 
-#: ../terminal/terminal-options.c:435
+#: ../terminal/terminal-options.c:419
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Unbekannte Option »%s«"
@@ -546,7 +329,7 @@ msgstr "Vollbild"
 msgid "Set Title"
 msgstr "Titel festlegen"
 
-#: ../terminal/terminal-preferences.c:464
+#: ../terminal/terminal-preferences.c:464 ../terminal/terminal-window.c:237
 msgid "Reset"
 msgstr "Zurücksetzen"
 
@@ -840,6 +623,11 @@ msgstr "_Zurücksetzen"
 msgid "Reset and C_lear"
 msgstr "Zurücksetzen und _leeren"
 
+#: ../terminal/terminal-window.c:238
+#, fuzzy
+msgid "Reset and clear"
+msgstr "Zurücksetzen und leeren"
+
 #: ../terminal/terminal-window.c:239
 msgid "_Go"
 msgstr "_Gehe zu"
@@ -1471,6 +1259,285 @@ msgstr "utmp/_wtmp-Aufzeichnungen aktualisieren"
 msgid "seconds"
 msgstr "Sekunden"
 
+#~ msgid ""
+#~ "  -h, --help                          Print this help message and exit"
+#~ msgstr "  -h, --help                          Diese Hilfe anzeigen"
+
+#~ msgid ""
+#~ "  -V, --version                       Print version information and exit"
+#~ msgstr "  -V, --version                       Programmversion anzeigen"
+
+#~ msgid ""
+#~ "  --disable-server                    Do not register with the D-BUS\n"
+#~ "                                      session message bus"
+#~ msgstr ""
+#~ "  --disable-server                    Nicht am Nachrichtenbus D-Bus "
+#~ "anmelden"
+
+#~ msgid "  --default-display=DISPLAY           default X display to use"
+#~ msgstr ""
+#~ "  --default-display=DISPLAY           Zu verwendende Standard-X-Anzeige"
+
+#~ msgid ""
+#~ "  --default-working-directory=DIRNAME Set the default terminal's working\n"
+#~ "                                      directory"
+#~ msgstr ""
+#~ "  --default-working-directory=VERZNAME Das Standard-Arbeitsverzeichnis\n"
+#~ "                                      festlegen"
+
+#~ msgid ""
+#~ "  --tab                               Open a new tab in the last-"
+#~ "specified\n"
+#~ "                                      window; more than one of these\n"
+#~ "                                      options can be provided"
+#~ msgstr ""
+#~ "  --tab                               Öffne einen neuen Reiter im "
+#~ "zuletzt\n"
+#~ "                                      angegebenen Fenster; diese Option "
+#~ "kann\n"
+#~ "                                      mehr als einmal angegeben werden"
+
+#~ msgid ""
+#~ "  --window                            Open a new window containing one "
+#~ "tab;\n"
+#~ "                                      more than one of these options can "
+#~ "be\n"
+#~ "                                      provided"
+#~ msgstr ""
+#~ "  --window                            Öffne ein neues Fenster mit einem\n"
+#~ "                                      Reiter; diese Option kann mehr als\n"
+#~ "                                      einmal angegeben werden"
+
+#~ msgid ""
+#~ "  -x, --execute                       Execute the remainder of the "
+#~ "command\n"
+#~ "                                      line inside the terminal"
+#~ msgstr ""
+#~ "  -x, --execute                       Den verbleibenden Teil der "
+#~ "Befehls-\n"
+#~ "                                      zeile innerhalb des Terminals "
+#~ "ausführen"
+
+#~ msgid ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+#~ msgstr ""
+#~ "  -e, --command=STRING                Das Argument dieser Option "
+#~ "innerhalb\n"
+#~ "                                      des Terminals ausführen"
+
+#~ msgid ""
+#~ "  --working-directory=DIRNAME         Set the terminal's working directory"
+#~ msgstr ""
+#~ "  --working-directory=VERZNAME        Setzt das Arbeitsverzeichnis des "
+#~ "Terminals"
+
+#~ msgid "  -T, --title=TITLE                   Set the terminal's title"
+#~ msgstr "  -T, --title=TITEL                   Setzt den Titel des Terminals"
+
+#~ msgid ""
+#~ "  -H, --hold                          Do not immediately destroy the tab\n"
+#~ "                                      when the child command exits"
+#~ msgstr ""
+#~ "  -H, --hold                          Den Reiter nicht sofort schließen,\n"
+#~ "                                      wenn der Kindprozess beendet wird"
+
+#~ msgid ""
+#~ "  --display=DISPLAY                   X display to use for the last-\n"
+#~ "                                      specified window"
+#~ msgstr ""
+#~ "  --display=ANZEIGE                   X-Anzeige, die für das zuletzt\n"
+#~ "                                      angegebene Fenster verwendet werden "
+#~ "soll"
+
+#~ msgid ""
+#~ "  --geometry=GEOMETRY                 X geometry specification (see \"X"
+#~ "\"\n"
+#~ "                                      man page), can be specified once "
+#~ "per\n"
+#~ "                                      window to be opened"
+#~ msgstr ""
+#~ "  --geometry=GEOMETRIE                X-Geometriespezifikation (siehe \n"
+#~ "                                      Handbuch zu »X«), kann für jedes zu\n"
+#~ "                                      öffnende Fenster angegeben werden"
+
+#~ msgid ""
+#~ "  --role=ROLE                         Set the role for the last-"
+#~ "specified\n"
+#~ "                                      window; applies to only one "
+#~ "window;\n"
+#~ "                                      can be specified once for each "
+#~ "window\n"
+#~ "                                      you create from the command line"
+#~ msgstr ""
+#~ "  --role=ROLLE                        Die Rolle für das zuletzt "
+#~ "angegebene\n"
+#~ "                                      Fenster festlegen; dies gilt nur\n"
+#~ "                                      für ein Fenster; kann für jedes "
+#~ "Fenster\n"
+#~ "                                      angegeben werden, das von der "
+#~ "Befehls-\n"
+#~ "                                      zeile aus geöffnet wird"
+
+#~ msgid ""
+#~ "  --startup-id=STRING                 ID for the startup notification\n"
+#~ "                                      protocol"
+#~ msgstr ""
+#~ "  --startup-id=STRING                 Identifikationsnummer für das "
+#~ "Protokoll\n"
+#~ "                                      zur visuellen Rückmeldung"
+
+#~ msgid ""
+#~ "  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
+#~ "                                      name or filename"
+#~ msgstr ""
+#~ "  -I, --icon=SYMBOL                   Das Symbol für Terminal über einen\n"
+#~ "                                      Symbolnamen oder Dateinamen "
+#~ "festlgegen"
+
+#~ msgid ""
+#~ "  --fullscreen                        Set the last-specified window into\n"
+#~ "                                      fullscreen mode; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --fullscreen                        Setzt das zuletzt angegebene "
+#~ "Fenster\n"
+#~ "                                      in den Vollbildmodus; dies gilt "
+#~ "nur\n"
+#~ "                                      für ein Fenster; kann für jedes "
+#~ "Fesnter\n"
+#~ "                                      angegeben werden, das von der "
+#~ "Befehls-\n"
+#~ "                                      zeile aus geöffnet wird"
+
+#~ msgid ""
+#~ "  --maximize                          Maximize the last-specified "
+#~ "window;\n"
+#~ "                                      applies to only one window; can be\n"
+#~ "                                      specified once for each window you\n"
+#~ "                                      create from the command line"
+#~ msgstr ""
+#~ "  --maximize                          Das zuletzt angegebene Fenster "
+#~ "maximier-\n"
+#~ "                                      en; dies gilt nur für ein Fenster; "
+#~ "kann\n"
+#~ "                                      für jedes Fenster angegeben werden, "
+#~ "das\n"
+#~ "                                      von der Befehlszeile aus geöffnet "
+#~ "wird"
+
+#~ msgid ""
+#~ "  --show-menubar                      Turn on the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-menubar                      Die Menüleiste für das zuletzt "
+#~ "angegebene\n"
+#~ "                                      Fenster anzeigen; dies gilt nur\n"
+#~ "                                      für ein Fenster; kann aber für "
+#~ "jedes zu\n"
+#~ "                                      öffnende Fenster angegeben werden"
+
+#~ msgid ""
+#~ "  --hide-menubar                      Turn off the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-menubar                      Die Menüleiste für das zuletzt "
+#~ "angegebene\n"
+#~ "                                      Fenster verbergen; dies gilt nur\n"
+#~ "                                      für ein Fenster; kann aber für "
+#~ "jedes zu\n"
+#~ "                                      öffnende Fenster angegeben werden"
+
+#~ msgid ""
+#~ "  --show-borders                      Turn on the window decorations for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --show-borders                      Die Fensterdekoration für das "
+#~ "zuletzt\n"
+#~ "                                      angegebene Fenster anzeigen; dies "
+#~ "gilt\n"
+#~ "                                      nur für ein Fenster; kann aber für "
+#~ "jedes\n"
+#~ "                                      zu öffnende Fenster angegeben werden"
+
+#~ msgid ""
+#~ "  --hide-borders                      Turn off the window decorations "
+#~ "for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --hide-borders                      Die Fensterdekoration für das "
+#~ "zuletzt\n"
+#~ "                                      angegebene Fenster verbergen; dies "
+#~ "gilt\n"
+#~ "                                      nur für ein Fenster; kann aber für "
+#~ "jedes\n"
+#~ "                                      zu öffnende Fenster angegeben werden"
+
+#~ msgid ""
+#~ "  --show-toolbars                     Turn on the toolbars for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-toolbars                     Die Werkzeugleisten für das "
+#~ "zuletzt\n"
+#~ "                                      angegebene Fenster anzeigen; dies  "
+#~ "gilt\n"
+#~ "                                      nur für ein Fenster; kann aber für "
+#~ "jedes\n"
+#~ "                                      zu öffnende Fenster angegeben werden"
+
+#~ msgid ""
+#~ "  --hide-toolbars                     Turn off the toolbars for the "
+#~ "last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-toolbars                     Die Werkzeugleisten für das "
+#~ "zuletzt\n"
+#~ "                                      genannte Fenster verbegren; dies "
+#~ "gilt\n"
+#~ "                                      nur für ein Fenster; kann aber für "
+#~ "jedes\n"
+#~ "                                      zu öffnende Fenster angegeben werden"
+
+#~ msgid "Unable to launch terminal: %s\n"
+#~ msgstr "Terminal konnte nicht gestartet werden: %s\n"
+
+#~ msgid ""
+#~ "Option \"--sm-client-id\" requires specifying the session id as its "
+#~ "parameter"
+#~ msgstr ""
+#~ "Die Option »--sm-client-id« benötigt als Parameter die Sitzungs-\n"
+#~ "Identifikationsnummer."
+
 #~ msgid "<b>Title:</b>"
 #~ msgstr "<b>Titel:</b>"
 
diff --git a/po/dz.po b/po/dz.po
index 6537fe3..dfebf83 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Terminal 0.2.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 11:48+0100\n"
+"POT-Creation-Date: 2009-12-14 16:03+0100\n"
 "PO-Revision-Date: 2006-10-23 01:56+0530\n"
 "Last-Translator: yangka <yanang_ka at hotmail.com>\n"
 "Language-Team: dzongkha <pgeyleg at dit.gov.bt>\n"
@@ -19,305 +19,91 @@ msgstr ""
 "X-Poedit-Country: bhutan\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../terminal/main.c:46
+#: ../terminal/main.c:48
 msgid "Usage:"
 msgstr ""
 
-#: ../terminal/main.c:47
+#: ../terminal/main.c:48
 msgid "OPTION"
 msgstr ""
 
-#: ../terminal/main.c:49
+#: ../terminal/main.c:53
 #, fuzzy
 msgid "General Options"
 msgstr "ཡོངས་ཁྱབ།"
 
-#: ../terminal/main.c:50
-msgid "  -h, --help                          Print this help message and exit"
-msgstr ""
-"  -h, --help                          གྲོགས་རམ་འཕྲིན་དོན་འདི་དཔར་བསྐྲུན་འབད་ནི་དང་ཕྱིར་"
-"ཐོན།"
-
-#: ../terminal/main.c:51
+#. parameter of --default-display
+#. parameter of --display
+#: ../terminal/main.c:55 ../terminal/main.c:81
 #, fuzzy
-msgid ""
-"  -V, --version                       Print version information and exit"
-msgstr "  -v, --version                       དཔར་བསྐྲུན་ཐོན་རིམ་བརྡ་དོན་དང་ཕྱིར་་ཐོན།"
-
-#: ../terminal/main.c:52
-msgid ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
-msgstr ""
-"  --disable-server                    ཌི-བི་ཡུ་ཨེསི་དང་གཅིག་ཁར་\n"
-"                                      ལཱ་ཡུན་འཕྲིན་དོན་བརྡ་རྟགས་འགྲུལ་ལམ་ཐོ་འགོད་མ་འབད།"
-
-#: ../terminal/main.c:54
-msgid "  --default-display=DISPLAY           default X display to use"
-msgstr ""
-"  --default-display=DISPLAY           ལག་ལེན་འཐབ་ནི་ལུ་སྔོན་སྒྲིག་ཨེགསི་བཀྲམ་བཏོན་འབད།"
+msgid "display"
+msgstr "བཀྲམ་བཏོན་མ་འབད་བས།"
 
-#: ../terminal/main.c:55
-#, fuzzy
-msgid ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
+#. parameter of --default-working-directory
+#. parameter of --working-directory
+#: ../terminal/main.c:57 ../terminal/main.c:72
+msgid "directory"
 msgstr ""
-"  --default-working-directory=DIRNAME སྔོན་སྒྲིག་ཊར་མི་ནཱལ་ཚུ་ལཱ་འབད་མི\n"
-"                                      སྣོད་ཐོ་འདི་གཞི་སྒྲིག་འབད།"
 
-#: ../terminal/main.c:58
+#: ../terminal/main.c:61
 msgid "Window or Tab Separators"
 msgstr ""
 
-#: ../terminal/main.c:59
-msgid ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-msgstr ""
-"  --tab                               མཇུག་-གསལ་བཀོད་འབད་ཡོད་མི་ཝིནཌོ་འདི་ནང་\n"
-"                                      མཆོང་ལྡེ་གསརཔ་ཅིག་ཁ་ཕྱེ་སྦེ་གདམ་ཁ་དེ་ཚུ་ལས་\n"
-"                                      ཧེང་བཀེལ་བྱིནམ་ཨིན།"
-
-#: ../terminal/main.c:62
-msgid ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-msgstr ""
-"  --window                            ཝིནཌོ་གསརཔ་ཅིག་ནང་ན་མཆོང་ལྡེ་གཅིག་ཡོད་མི་ཁ་ཕྱེ\n"
-"                                      གདམ་ཁ་དེ་ཚུ་གཅིག་ལས་མངམ་\n"
-"                                      བྱིནམ་ཨིན།"
-
 #: ../terminal/main.c:66
 #, fuzzy
 msgid "Tab Options"
 msgstr "མཆོང་ལྡེ་གནས་ས།"
 
-#: ../terminal/main.c:67
-msgid ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-msgstr ""
-"  -x, --execute                       ཊར་མི་ནཱལ་འདིའི་ནང་་གི་གྱལ་བརྡ་བཀོད་འདི་\n"
-"                                      གི་ལྷག་ལུས་མི་འདི་ལག་ལེན་འཐབ།"
-
-#: ../terminal/main.c:69
-msgid ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-msgstr ""
-"  -e, --command=STRING                ཊར་མི་ནཱལ་འདིའི་ནང་གི་གདམ་ཁ་འདི་ལུ་\n"
-"                                      སྒྲུབ་རྟགས་འདི་ལག་ལེན་འཐབ།"
-
-#: ../terminal/main.c:71
+#. parameter of --command
+#: ../terminal/main.c:68
 #, fuzzy
-msgid ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
-msgstr ""
-"  --working-directory=DIRNAME         ཊར་མི་ནཱལ་ཚུ་གི་ལཱ་འབད་བའི་སྣོད་ཐོ་འདི་གཞི་སྒྲིག་འབད།"
+msgid "command"
+msgstr "<b>བརྡ་བཀོད</b>"
 
-#: ../terminal/main.c:72
+#. parameter of --title
+#: ../terminal/main.c:70
 #, fuzzy
-msgid "  -T, --title=TITLE                   Set the terminal's title"
-msgstr "  -T, --title=TITLE                   ཊར་མི་ནཱལ་ཚུ་གི་མགོ་མིང་འདི་གཞི་སྒྲིག་འབད།"
-
-#: ../terminal/main.c:73
-msgid ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-msgstr ""
-"  -H, --hold                          ལག་ཆས་འདི་གིས་ཕྱིར་ཐོན་བརྡ་བཀོད་འབད་བའི་སྐབས་\n"
-"                                      མཆོང་ལྡེ་འདི་དེ་འཕྲལ་ལས་རྩ་མེད་མ་གཏང་།"
+msgid "title"
+msgstr "མགོ་མིང་།"
 
-#: ../terminal/main.c:76
+#: ../terminal/main.c:79
 #, fuzzy
 msgid "Window Options"
 msgstr "མ་ཤེས་པའི་གདམ་ཁ \"%s\""
 
-#: ../terminal/main.c:77
-msgid ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
+#. parameter of --geometry
+#: ../terminal/main.c:83
+msgid "geometry"
 msgstr ""
-"  --display=DISPLAY                   མཇུག་-གསལ་བཀོད་འབད་ཡོད་མི་ཝིནཌོ་འདིའི་དོན་ལུ་\n"
-"                                      ལག་ལེན་འཐབ་ནི་ལུ་ཨེགསི་བཀྲམ་བཏོན་འབད།"
 
-#: ../terminal/main.c:79
-msgid ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
+#. parameter of --role
+#: ../terminal/main.c:85
+msgid "role"
 msgstr ""
-"  --geometry=GEOMETRY                 ཨེགསི་ཐིག་རྩིས་གསལ་བཀོད་ (བལྟ་ཡང་ \"X\"\n"
-"                                      མཱན་ཤོག་ལེབ) འདི་ཁ་ཕྱེ་ནི་ཨིན་མི་ཝིནཌོ་\n"
-"                                      ཚར་རེ་གསལ་བཀོད་འབད་བཏུབ་ཨིན།"
 
-#: ../terminal/main.c:82
+#. parameter of --startup-id
+#: ../terminal/main.c:87
 #, fuzzy
-msgid ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
-msgstr ""
-"  --role=ROLE                         མཇུག་གསལ་བཀོད་འབད་ཡོད་མི་ཝིནཌོ་དོན་ལུ་ལས་འགན་"
-"གཞི་སྒྲིག་འདི་གིས་\n"
-"                                      ཝིནཌོ་གཅིག་ལུ་རྐྱངམ་ཅིག་འཇུག་སྤྱོད་འབད་མི་\n"
-"                                      འདི་ཁྱོད་ཀྱིས་བརྡ་བཀོད་གྱལ་ནང་ལས་གསར་བསྐྲུན་འབད་མི་"
-"ཝིནཌོ་རེ་རེ་དོན་ལུ་\n"
-"                                      གསལ་བཀོད་འབད་བཏུབ་ཨིན།"
-
-#: ../terminal/main.c:86
-msgid ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
-msgstr ""
-"  --startup-id=STRING                 གནད་སྤེལ་ལམ་ལུགས་བརྡ་བསྐུལ་འགོ་བཙུགས་དོན་ལུ་\n"
-"                                      ཨའི་ཌི།"
+msgid "string"
+msgstr "ཉེན་བརྡ།"
 
-#: ../terminal/main.c:88
+#. parameter of --icon
+#: ../terminal/main.c:89
 #, fuzzy
-msgid ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
-msgstr ""
-"  -e, --command=STRING                ཊར་མི་ནཱལ་འདིའི་ནང་གི་གདམ་ཁ་འདི་ལུ་\n"
-"                                      སྒྲུབ་རྟགས་འདི་ལག་ལེན་འཐབ།"
+msgid "icon"
+msgstr "བྱ་བ།"
 
-#: ../terminal/main.c:90
-#, fuzzy
-msgid ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#: ../terminal/main.c:91
+#, c-format
+msgid "See the %s man page for full explanation of the options above."
 msgstr ""
-"  --fullscreen                        མཇུག་གསལ་བཀོད་འབད་མི་ཝིནཌོ་འདི་གསལ་གཞི་གངམ་"
-"ཐབས་ལམ་ནང་གཞི་སྒྲིག་འབད་མི་\n"
-"                                      འདི་ཝིནཌོ་གཅིག་རྐྱངམ་ཅིག་ལུ་འཇུག་སྤྱོད་འབད་མི་\n"
-"                                      བརྡ་བསྐུལ་གྱལ་ལས་ཁྱོད་ཀྱིས་གསར་བསྐྲུན་\n"
-"                                      འབད་མི་ཝིནཌོ་རེ་རེ་དོན་ལུ་\n"
-"                                      ཚར་གཅིག་གསལ་བཀོད་འབད་བཏུབ་ཨིན།"
 
-#: ../terminal/main.c:95
-#, fuzzy
-msgid ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
-msgstr ""
-"  --role=ROLE                         མཇུག་གསལ་བཀོད་འབད་ཡོད་མི་ཝིནཌོ་དོན་ལུ་ལས་འགན་"
-"གཞི་སྒྲིག་འདི་གིས་\n"
-"                                      ཝིནཌོ་གཅིག་ལུ་རྐྱངམ་ཅིག་འཇུག་སྤྱོད་འབད་མི་\n"
-"                                      འདི་ཁྱོད་ཀྱིས་བརྡ་བཀོད་གྱལ་ནང་ལས་གསར་བསྐྲུན་འབད་མི་"
-"ཝིནཌོ་རེ་རེ་དོན་ལུ་\n"
-"                                      གསལ་བཀོད་འབད་བཏུབ་ཨིན།"
-
-#: ../terminal/main.c:99
-msgid ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-menubar                      མཇུག་གསལ་བཀོད་འབད་མི་ཝིནཌོ་དོན་ལུ་དཀར་ཆག་གུ་སྐོར་"
-"ཐེངས་\n"
-"                                      འབད་མི་ཝིནཌོ་གཅིག་ལུ་རྐྱངམ་ཅིག་འཇུག་སྤྱོད་འབདཝ་ད་\n"
-"                                      ཁྱོད་ཀྱིས་གསར་བསྐྲུན་འབད་མི་བརྡ་བསྐུལ་གྱལ་འདི་ལས་\n"
-"                                    ཝིནཌོ་རེ་རེ་དོན་ལུ་ཚར་གཅིག་རྐྱངམ་ཅིག\n"
-"                                   གསལ་བཀོད་འབད་བཏུབ་ཨིན།"
-
-#: ../terminal/main.c:104
-msgid ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --hide-menubar                      མཇུག་གསལ་བཀོད་འབད་མི་ཝིནཌོ་དོན་ལུ་དཀར་ཆག་ཕྲ་རིང་"
-"འདི་ཊརནི་ཨོཕ་\n"
-"                                      ཝིནདོ་གཅིག་རྐྱངམ་ཅིག་ལུ་འཇུག་སྤྱོད་འབདཝ་ད་\n"
-"                                      ཁྱོད་ཀྱིས་བརྡ་བསྐུལ་གྱལ་འདི་ལས་གསར་བསྐྲུན་འབད་མི་\n"
-"                                      ཝིནཌོ་རེ་རེ་དོན་ལུ་\n"
-"                                     གསལ་བཀོད་འབད་བཏུབ་ཨིན།"
-
-#: ../terminal/main.c:109
-msgid ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --show-borders                      མཇུག་གསལ་བཀོད་འབད་མི་ཝིནཌོ་དོན་ལུ་ཝིནཌོ་མཛེས་བཀོད་"
-"ཚུ་\n"
-"                                      གུ་ཊརནི་འབད ཝིནཌོ་གཅིག་རྐྱངམ་ཅིག་ལུ་\n"
-"                                      འཇུག་སྤྱོད་འབདཝ་ད་ འདི་ཡང་ཁྱོད་ཀྱིས་བརྡ་བསྐུལ་གྱལ་"
-"ལས\n"
-"                                      གསར་བསྐྲུན་འབད་མི་ཝིནཌོ་དོན་ལུ་ཚར་གཅིག\n"
-"                                     གསལ་བཀོད་འབད་བཏུབ་ཨིན།"
-
-#: ../terminal/main.c:114
-msgid ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --hide-borders                      མཇུག་གསལ་བཀོད་འབད་མི་ཝིནཌོདོན་ལུཝིནདོ་མཛེས་བཀོད་"
-"ཚུ\n"
-"                                      ཊརནི་ཨོཕ་ ཝིནཌོ་གཅིག་རྐྱངམ་ཅིག་ལུ་འཇུག་སྤྱོད་འབདཝ་"
-"ད་\n"
-"                                      འདི་ཡང་་ཁྱོད་ཀྱིས་བརྡ་བསྐུལ་གྱལ་ལས་གསར་བསྐྲུན་འབད་"
-"མི་\n"
-"                                      ཝིནཌོ་རེ་རེ་དོན་ལུ་ཚར་གཅིག་\n"
-"                                      གསལ་བཀོད་འབད་བཏུབ་ཨིན།"
-
-#: ../terminal/main.c:119
-msgid ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-toolbars                     མཇུག་གསལ་བཀོད་འབད་མི་ཝིནཌོ་དོན་ལུ་ལག་ཆས་ཕྲ་རིང་"
-"ཚུ་གུ་\n"
-"                                      ཊརནི་ཨོན་འབད་ ཝིནཌོ་གཅིག་རྐྱངམ་ཅིག་ལུ་འཇུག་སྤྱོད་"
-"འབདཝ་\n"
-"                                     ད་ ཁྱོད་ཀྱིས་བརྡ་བསྐུལ་གྱལ་འདི་ལས་གསར་བསྐྲུན་འབད་མི\n"
-"                                      ཝིནཌོ་རེ་རེ་དོན་ལུ་ཚར་གཅིག་གསལ་\n"
-"                                      བཀོད་འབད་བཏུབ་ཨིན།"
-
-#: ../terminal/main.c:124
-msgid ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --hide-toolbars                     མཇུག་གསལ་བཀོད་འབད་མི་ཝིནཌོ་དོན་ལུ་ལག་ཆས་ཕྲ་རིང་"
-"ཚུ་\n"
-"                                      ཊརནི་ཨོཕ་འབད ཝིནཌོ་གཅིག་རྐྱངམ་ཅིག་ལུ་འཇུག་སྤྱོད་"
-"འབདཝ་ད་\n"
-"                                      འདི་ཡང་ཁྱོད་ཀྱིས་བརྡ་བསྐུལ་གྱལ་ལས་གསར་བསྐྲུན\n"
-"                                      འབད་མི་ཝིནཌོ་རེ་རེ་དོན་ལུ་ཚར་གཅིག་\n"
-"                                      གསལ་བཀོད་འབད་བཏུབ་ཨིན།"
-
-#: ../terminal/main.c:151 ../terminal/terminal-preferences.c:1263
+#: ../terminal/main.c:118 ../terminal/terminal-preferences.c:1263
 #: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr "ཊར་མི་ནཱལ།"
 
-#: ../terminal/main.c:173
+#: ../terminal/main.c:135
 #, fuzzy, c-format
 msgid ""
 "%s (Xfce %s)\n"
@@ -342,31 +128,26 @@ msgstr ""
 "\n"
 "Please report bugs to <%s>.\n"
 
-#: ../terminal/main.c:267
+#: ../terminal/main.c:239
 #, c-format
 msgid "Unable to register terminal service: %s\n"
 msgstr "ཊར་མི་ནཱལ་ཞབས་ཏོག་ཐོ་བཀོད་འབད་མི་ཚུགསཔ: %s\n"
 
-#: ../terminal/main.c:276
-#, c-format
-msgid "Unable to launch terminal: %s\n"
-msgstr "ཊར་མི་ནཱལ་གསར་བཙུགས་འབད་མི་ཚུགསཔ: %s\n"
-
-#: ../terminal/terminal-app.c:551
+#: ../terminal/terminal-app.c:554
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "ནུས་མེད་ཐིག་རྩིས་ཡིག་རྒྱུན། \"%s\"\n"
 
-#: ../terminal/terminal-dbus.c:114
+#: ../terminal/terminal-dbus.c:108
 msgid "User id mismatch"
 msgstr "ལག་ལེན་པ་གི་ཨའི་ཌི་མཐུན་སྒྲིག་མེདཔ།"
 
-#: ../terminal/terminal-dbus.c:146
+#: ../terminal/terminal-dbus.c:134
 #, c-format
 msgid "D-BUS message bus disconnected, exiting...\n"
 msgstr "ཌི-བསི་འཕྲིན་དོན་བརྡ་རྟགས་འགྲུལ་ལམ་མཐུད་ལམ་བཏོག་ཡོད་མི་ ཕྱིར་ཐོན་དོ...\n"
 
-#: ../terminal/terminal-dbus.c:208
+#: ../terminal/terminal-dbus.c:196
 #, c-format
 msgid "Unable to register object %s"
 msgstr "དངོས་པོ་ཐོ་བཀོད་འབད་མི་ཚུགསཔ %s"
@@ -388,7 +169,7 @@ msgstr ""
 msgid "Failed to open the documentation browser"
 msgstr "ཡིག་ཐོག་བཀོད་པ་བརའུ་ཟར་ཁ་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་འབྱུང་ཡོདཔ།"
 
-#: ../terminal/terminal-options.c:189
+#: ../terminal/terminal-options.c:206
 #, c-format
 msgid ""
 "Option \"--default-display\" requires specifying the default X display as "
@@ -397,7 +178,7 @@ msgstr ""
 "གདམ་ཁ་ \"--default-display\" ཚད་བཟུང་སྦེ་སྔོན་སྒྲིག་ཨེགསི་བཀྲམ་བཏོན་གསལ་བཀོད་འབད་མི་དགོས་མཁོ་"
 "ཡོདཔ་ཨིན།"
 
-#: ../terminal/terminal-options.c:204
+#: ../terminal/terminal-options.c:221
 #, c-format
 msgid ""
 "Option \"--default-working-directory\" requires specifying the default "
@@ -406,15 +187,7 @@ msgstr ""
 "གདམ་ཁ \"--default-working-directory\" ཚཐ་བཟུང་སྦེ་སྔོན་སྒྲིག་ལཱ་འབད་མི་སྣོད་ཐོ་གསལ་བཀོད་"
 "འབད་མི་དགོས་མཁོ་ཡོདཔ་ཨིན།"
 
-#: ../terminal/terminal-options.c:235
-#, c-format
-msgid ""
-"Option \"--sm-client-id\" requires specifying the session id as its parameter"
-msgstr ""
-"གདམ་ཁ་ \"--sm-client-id\" འདི་ཚད་བཟུང་སྦེ་ལཱ་ཡུན་ཨའི་ཌི་གསལ་བཀོད་འབད་བའི་བསྒང་དགོས་མཁོ་"
-"ཡོདཔ་ཨིན།"
-
-#: ../terminal/terminal-options.c:250
+#: ../terminal/terminal-options.c:237
 #, c-format
 msgid ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
@@ -423,7 +196,7 @@ msgstr ""
 "གདམ་ཁ་ \"--execute/-x\" འདི་བརྡ་བསྐུལ་གྱལ་གྱི་ངལ་འཚོ་གུ་གཡོག་བསྐུལ་མི་བརྡ་བསྐུལ་འདི་གསལ་བཀོད་"
 "འབད་མི་དགོས་མཁོ་ཡོདཔ་ཨིན།"
 
-#: ../terminal/terminal-options.c:267
+#: ../terminal/terminal-options.c:254
 #, c-format
 msgid ""
 "Option \"--command/-e\" requires specifying the command to run as its "
@@ -431,7 +204,7 @@ msgid ""
 msgstr ""
 "གདམ་ཁ་ \"--command/-e\" ཚད་བཟུང་སྦེ་གཡོག་བཀོལ་མི་གསལ་བཀོད་འབད་མི་དགོས་མཁོ་ཡོདཔ་ཨིན།"
 
-#: ../terminal/terminal-options.c:284
+#: ../terminal/terminal-options.c:271
 #, c-format
 msgid ""
 "Option \"--working-directory\" requires specifying the working directory as "
@@ -440,37 +213,37 @@ msgstr ""
 "གདམ་ཁ་ \"--working-directory\" ཚད་བཟུང་སྦེ་ལཱ་འབད་བའི་བསྒང་སྣོད་ཐོ་གསལ་བཀོད་འབད་མི་འདི་"
 "དགོས་མཁོ་ཡོདཔ་ཨིན།"
 
-#: ../terminal/terminal-options.c:299
+#: ../terminal/terminal-options.c:286
 #, c-format
 msgid "Option \"--title/-T\" requires specifying the title as its parameter"
 msgstr "གདམ་ཁ \"--title/-T\" ཚད་བཟུང་སྦེ་མགོ་མིང་གསལ་བཀོད་འབད་མི་དགོས་མཁོ་ཡོདཔ་ཨིན།"
 
-#: ../terminal/terminal-options.c:319
+#: ../terminal/terminal-options.c:305
 #, c-format
 msgid ""
 "Option \"--display\" requires specifying the X display as its parameters"
 msgstr "གདམ་ཁ་ \"--display\" ཚད་བཟུང་སྦེ་ཨེགསི་བཀྲམ་བཏོན་གསལ་བཀོད་འབད་མི་དགོས་མཁོ་ཡོདཔ་ཨིན།"
 
-#: ../terminal/terminal-options.c:334
+#: ../terminal/terminal-options.c:320
 #, c-format
 msgid ""
 "Option \"--geometry\" requires specifying the window geometry as its "
 "parameter"
 msgstr "གདམ་ཁ་ \"--geometry\" ཚད་བཟུང་སྦེ་ཝིནཌོ་ཐིག་རྩིས་གསལ་བཀོད་འབད་མི་དགོས་མཁོ་ཡོདཔ་ཨིན།"
 
-#: ../terminal/terminal-options.c:349
+#: ../terminal/terminal-options.c:335
 #, c-format
 msgid "Option \"--role\" requires specifying the window role as its parameter"
 msgstr "གདམ་ཁ \"--role\" ཚད་བཟུང་སྦེ་ཝིནཌོ་ལས་འགན་གསལ་བཀོད་འབད་མི་དགོས་མཁོ་ཡོདཔ་ཨིན།"
 
-#: ../terminal/terminal-options.c:364
+#: ../terminal/terminal-options.c:350
 #, c-format
 msgid ""
 "Option \"--startup-id\" requires specifying the startup id as its parameter"
 msgstr ""
 "གདམ་ཁ་ \"--startup-id\" ཚད་བཟུང་སྦེ་འགོ་བཙུགས་ཨའི་ཌི་གསལ་བཀོད་འབད་མི་དགོས་མཁོ་ཡོདཔ་ཨིན།"
 
-#: ../terminal/terminal-options.c:379
+#: ../terminal/terminal-options.c:365
 #, fuzzy, c-format
 msgid ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
@@ -478,7 +251,7 @@ msgid ""
 msgstr ""
 "གདམ་ཁ་ \"--command/-e\" ཚད་བཟུང་སྦེ་གཡོག་བཀོལ་མི་གསལ་བཀོད་འབད་མི་དགོས་མཁོ་ཡོདཔ་ཨིན།"
 
-#: ../terminal/terminal-options.c:435
+#: ../terminal/terminal-options.c:419
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "མ་ཤེས་པའི་གདམ་ཁ \"%s\""
@@ -547,7 +320,7 @@ msgstr "གསལ་གཞི་གངམ།"
 msgid "Set Title"
 msgstr "མགོ་མིང་གཞི་སྒྲིག་འབད།"
 
-#: ../terminal/terminal-preferences.c:464
+#: ../terminal/terminal-preferences.c:464 ../terminal/terminal-window.c:237
 msgid "Reset"
 msgstr "སླར་སྒྲིག"
 
@@ -843,6 +616,11 @@ msgstr "སླར་སྒྲིག(_R)"
 msgid "Reset and C_lear"
 msgstr "སླར་སྒྲིག་དང་བསལ།(_l)"
 
+#: ../terminal/terminal-window.c:238
+#, fuzzy
+msgid "Reset and clear"
+msgstr "སླར་སྒྲིག་དང་བསལ།"
+
 #: ../terminal/terminal-window.c:239
 msgid "_Go"
 msgstr "འགྱོ།(_G)"
@@ -1517,6 +1295,291 @@ msgstr "བརྡ་བསྐུལ་འི་གཞི་བཙུགས་འ
 msgid "seconds"
 msgstr ""
 
+#~ msgid ""
+#~ "  -h, --help                          Print this help message and exit"
+#~ msgstr ""
+#~ "  -h, --help                          གྲོགས་རམ་འཕྲིན་དོན་འདི་དཔར་བསྐྲུན་འབད་ནི་དང་"
+#~ "ཕྱིར་ཐོན།"
+
+#, fuzzy
+#~ msgid ""
+#~ "  -V, --version                       Print version information and exit"
+#~ msgstr ""
+#~ "  -v, --version                       དཔར་བསྐྲུན་ཐོན་རིམ་བརྡ་དོན་དང་ཕྱིར་་ཐོན།"
+
+#~ msgid ""
+#~ "  --disable-server                    Do not register with the D-BUS\n"
+#~ "                                      session message bus"
+#~ msgstr ""
+#~ "  --disable-server                    ཌི-བི་ཡུ་ཨེསི་དང་གཅིག་ཁར་\n"
+#~ "                                      ལཱ་ཡུན་འཕྲིན་དོན་བརྡ་རྟགས་འགྲུལ་ལམ་ཐོ་འགོད་མ་"
+#~ "འབད།"
+
+#~ msgid "  --default-display=DISPLAY           default X display to use"
+#~ msgstr ""
+#~ "  --default-display=DISPLAY           ལག་ལེན་འཐབ་ནི་ལུ་སྔོན་སྒྲིག་ཨེགསི་བཀྲམ་བཏོན་འབད།"
+
+#, fuzzy
+#~ msgid ""
+#~ "  --default-working-directory=DIRNAME Set the default terminal's working\n"
+#~ "                                      directory"
+#~ msgstr ""
+#~ "  --default-working-directory=DIRNAME སྔོན་སྒྲིག་ཊར་མི་ནཱལ་ཚུ་ལཱ་འབད་མི\n"
+#~ "                                      སྣོད་ཐོ་འདི་གཞི་སྒྲིག་འབད།"
+
+#~ msgid ""
+#~ "  --tab                               Open a new tab in the last-"
+#~ "specified\n"
+#~ "                                      window; more than one of these\n"
+#~ "                                      options can be provided"
+#~ msgstr ""
+#~ "  --tab                               མཇུག་-གསལ་བཀོད་འབད་ཡོད་མི་ཝིནཌོ་འདི་ནང་\n"
+#~ "                                      མཆོང་ལྡེ་གསརཔ་ཅིག་ཁ་ཕྱེ་སྦེ་གདམ་ཁ་དེ་ཚུ་ལས་\n"
+#~ "                                      ཧེང་བཀེལ་བྱིནམ་ཨིན།"
+
+#~ msgid ""
+#~ "  --window                            Open a new window containing one "
+#~ "tab;\n"
+#~ "                                      more than one of these options can "
+#~ "be\n"
+#~ "                                      provided"
+#~ msgstr ""
+#~ "  --window                            ཝིནཌོ་གསརཔ་ཅིག་ནང་ན་མཆོང་ལྡེ་གཅིག་ཡོད་མི་ཁ་"
+#~ "ཕྱེ\n"
+#~ "                                      གདམ་ཁ་དེ་ཚུ་གཅིག་ལས་མངམ་\n"
+#~ "                                      བྱིནམ་ཨིན།"
+
+#~ msgid ""
+#~ "  -x, --execute                       Execute the remainder of the "
+#~ "command\n"
+#~ "                                      line inside the terminal"
+#~ msgstr ""
+#~ "  -x, --execute                       ཊར་མི་ནཱལ་འདིའི་ནང་་གི་གྱལ་བརྡ་བཀོད་འདི་\n"
+#~ "                                      གི་ལྷག་ལུས་མི་འདི་ལག་ལེན་འཐབ།"
+
+#~ msgid ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+#~ msgstr ""
+#~ "  -e, --command=STRING                ཊར་མི་ནཱལ་འདིའི་ནང་གི་གདམ་ཁ་འདི་ལུ་\n"
+#~ "                                      སྒྲུབ་རྟགས་འདི་ལག་ལེན་འཐབ།"
+
+#, fuzzy
+#~ msgid ""
+#~ "  --working-directory=DIRNAME         Set the terminal's working directory"
+#~ msgstr ""
+#~ "  --working-directory=DIRNAME         ཊར་མི་ནཱལ་ཚུ་གི་ལཱ་འབད་བའི་སྣོད་ཐོ་འདི་གཞི་སྒྲིག་"
+#~ "འབད།"
+
+#, fuzzy
+#~ msgid "  -T, --title=TITLE                   Set the terminal's title"
+#~ msgstr ""
+#~ "  -T, --title=TITLE                   ཊར་མི་ནཱལ་ཚུ་གི་མགོ་མིང་འདི་གཞི་སྒྲིག་འབད།"
+
+#~ msgid ""
+#~ "  -H, --hold                          Do not immediately destroy the tab\n"
+#~ "                                      when the child command exits"
+#~ msgstr ""
+#~ "  -H, --hold                          ལག་ཆས་འདི་གིས་ཕྱིར་ཐོན་བརྡ་བཀོད་འབད་བའི་"
+#~ "སྐབས་\n"
+#~ "                                      མཆོང་ལྡེ་འདི་དེ་འཕྲལ་ལས་རྩ་མེད་མ་གཏང་།"
+
+#~ msgid ""
+#~ "  --display=DISPLAY                   X display to use for the last-\n"
+#~ "                                      specified window"
+#~ msgstr ""
+#~ "  --display=DISPLAY                   མཇུག་-གསལ་བཀོད་འབད་ཡོད་མི་ཝིནཌོ་འདིའི་དོན་"
+#~ "ལུ་\n"
+#~ "                                      ལག་ལེན་འཐབ་ནི་ལུ་ཨེགསི་བཀྲམ་བཏོན་འབད།"
+
+#~ msgid ""
+#~ "  --geometry=GEOMETRY                 X geometry specification (see \"X"
+#~ "\"\n"
+#~ "                                      man page), can be specified once "
+#~ "per\n"
+#~ "                                      window to be opened"
+#~ msgstr ""
+#~ "  --geometry=GEOMETRY                 ཨེགསི་ཐིག་རྩིས་གསལ་བཀོད་ (བལྟ་ཡང་ \"X\"\n"
+#~ "                                      མཱན་ཤོག་ལེབ) འདི་ཁ་ཕྱེ་ནི་ཨིན་མི་ཝིནཌོ་\n"
+#~ "                                      ཚར་རེ་གསལ་བཀོད་འབད་བཏུབ་ཨིན།"
+
+#, fuzzy
+#~ msgid ""
+#~ "  --role=ROLE                         Set the role for the last-"
+#~ "specified\n"
+#~ "                                      window; applies to only one "
+#~ "window;\n"
+#~ "                                      can be specified once for each "
+#~ "window\n"
+#~ "                                      you create from the command line"
+#~ msgstr ""
+#~ "  --role=ROLE                         མཇུག་གསལ་བཀོད་འབད་ཡོད་མི་ཝིནཌོ་དོན་ལུ་ལས་"
+#~ "འགན་གཞི་སྒྲིག་འདི་གིས་\n"
+#~ "                                      ཝིནཌོ་གཅིག་ལུ་རྐྱངམ་ཅིག་འཇུག་སྤྱོད་འབད་མི་\n"
+#~ "                                      འདི་ཁྱོད་ཀྱིས་བརྡ་བཀོད་གྱལ་ནང་ལས་གསར་བསྐྲུན་"
+#~ "འབད་མི་ཝིནཌོ་རེ་རེ་དོན་ལུ་\n"
+#~ "                                      གསལ་བཀོད་འབད་བཏུབ་ཨིན།"
+
+#~ msgid ""
+#~ "  --startup-id=STRING                 ID for the startup notification\n"
+#~ "                                      protocol"
+#~ msgstr ""
+#~ "  --startup-id=STRING                 གནད་སྤེལ་ལམ་ལུགས་བརྡ་བསྐུལ་འགོ་བཙུགས་དོན་ལུ་\n"
+#~ "                                      ཨའི་ཌི།"
+
+#, fuzzy
+#~ msgid ""
+#~ "  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
+#~ "                                      name or filename"
+#~ msgstr ""
+#~ "  -e, --command=STRING                ཊར་མི་ནཱལ་འདིའི་ནང་གི་གདམ་ཁ་འདི་ལུ་\n"
+#~ "                                      སྒྲུབ་རྟགས་འདི་ལག་ལེན་འཐབ།"
+
+#, fuzzy
+#~ msgid ""
+#~ "  --fullscreen                        Set the last-specified window into\n"
+#~ "                                      fullscreen mode; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --fullscreen                        མཇུག་གསལ་བཀོད་འབད་མི་ཝིནཌོ་འདི་གསལ་གཞི་གངམ་"
+#~ "ཐབས་ལམ་ནང་གཞི་སྒྲིག་འབད་མི་\n"
+#~ "                                      འདི་ཝིནཌོ་གཅིག་རྐྱངམ་ཅིག་ལུ་འཇུག་སྤྱོད་འབད་མི་\n"
+#~ "                                      བརྡ་བསྐུལ་གྱལ་ལས་ཁྱོད་ཀྱིས་གསར་བསྐྲུན་\n"
+#~ "                                      འབད་མི་ཝིནཌོ་རེ་རེ་དོན་ལུ་\n"
+#~ "                                      ཚར་གཅིག་གསལ་བཀོད་འབད་བཏུབ་ཨིན།"
+
+#, fuzzy
+#~ msgid ""
+#~ "  --maximize                          Maximize the last-specified "
+#~ "window;\n"
+#~ "                                      applies to only one window; can be\n"
+#~ "                                      specified once for each window you\n"
+#~ "                                      create from the command line"
+#~ msgstr ""
+#~ "  --role=ROLE                         མཇུག་གསལ་བཀོད་འབད་ཡོད་མི་ཝིནཌོ་དོན་ལུ་ལས་"
+#~ "འགན་གཞི་སྒྲིག་འདི་གིས་\n"
+#~ "                                      ཝིནཌོ་གཅིག་ལུ་རྐྱངམ་ཅིག་འཇུག་སྤྱོད་འབད་མི་\n"
+#~ "                                      འདི་ཁྱོད་ཀྱིས་བརྡ་བཀོད་གྱལ་ནང་ལས་གསར་བསྐྲུན་"
+#~ "འབད་མི་ཝིནཌོ་རེ་རེ་དོན་ལུ་\n"
+#~ "                                      གསལ་བཀོད་འབད་བཏུབ་ཨིན།"
+
+#~ msgid ""
+#~ "  --show-menubar                      Turn on the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-menubar                      མཇུག་གསལ་བཀོད་འབད་མི་ཝིནཌོ་དོན་ལུ་དཀར་ཆག་གུ་"
+#~ "སྐོར་ཐེངས་\n"
+#~ "                                      འབད་མི་ཝིནཌོ་གཅིག་ལུ་རྐྱངམ་ཅིག་འཇུག་སྤྱོད་འབདཝ་"
+#~ "ད་\n"
+#~ "                                      ཁྱོད་ཀྱིས་གསར་བསྐྲུན་འབད་མི་བརྡ་བསྐུལ་གྱལ་འདི་"
+#~ "ལས་\n"
+#~ "                                    ཝིནཌོ་རེ་རེ་དོན་ལུ་ཚར་གཅིག་རྐྱངམ་ཅིག\n"
+#~ "                                   གསལ་བཀོད་འབད་བཏུབ་ཨིན།"
+
+#~ msgid ""
+#~ "  --hide-menubar                      Turn off the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-menubar                      མཇུག་གསལ་བཀོད་འབད་མི་ཝིནཌོ་དོན་ལུ་དཀར་ཆག་ཕྲ་"
+#~ "རིང་འདི་ཊརནི་ཨོཕ་\n"
+#~ "                                      ཝིནདོ་གཅིག་རྐྱངམ་ཅིག་ལུ་འཇུག་སྤྱོད་འབདཝ་ད་\n"
+#~ "                                      ཁྱོད་ཀྱིས་བརྡ་བསྐུལ་གྱལ་འདི་ལས་གསར་བསྐྲུན་འབད་"
+#~ "མི་\n"
+#~ "                                      ཝིནཌོ་རེ་རེ་དོན་ལུ་\n"
+#~ "                                     གསལ་བཀོད་འབད་བཏུབ་ཨིན།"
+
+#~ msgid ""
+#~ "  --show-borders                      Turn on the window decorations for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --show-borders                      མཇུག་གསལ་བཀོད་འབད་མི་ཝིནཌོ་དོན་ལུ་ཝིནཌོ་མཛེས་"
+#~ "བཀོད་ཚུ་\n"
+#~ "                                      གུ་ཊརནི་འབད ཝིནཌོ་གཅིག་རྐྱངམ་ཅིག་ལུ་\n"
+#~ "                                      འཇུག་སྤྱོད་འབདཝ་ད་ འདི་ཡང་ཁྱོད་ཀྱིས་བརྡ་བསྐུལ་"
+#~ "གྱལ་ལས\n"
+#~ "                                      གསར་བསྐྲུན་འབད་མི་ཝིནཌོ་དོན་ལུ་ཚར་གཅིག\n"
+#~ "                                     གསལ་བཀོད་འབད་བཏུབ་ཨིན།"
+
+#~ msgid ""
+#~ "  --hide-borders                      Turn off the window decorations "
+#~ "for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --hide-borders                      མཇུག་གསལ་བཀོད་འབད་མི་ཝིནཌོདོན་ལུཝིནདོ་མཛེས་"
+#~ "བཀོད་ཚུ\n"
+#~ "                                      ཊརནི་ཨོཕ་ ཝིནཌོ་གཅིག་རྐྱངམ་ཅིག་ལུ་འཇུག་སྤྱོད་"
+#~ "འབདཝ་ད་\n"
+#~ "                                      འདི་ཡང་་ཁྱོད་ཀྱིས་བརྡ་བསྐུལ་གྱལ་ལས་གསར་བསྐྲུན་"
+#~ "འབད་མི་\n"
+#~ "                                      ཝིནཌོ་རེ་རེ་དོན་ལུ་ཚར་གཅིག་\n"
+#~ "                                      གསལ་བཀོད་འབད་བཏུབ་ཨིན།"
+
+#~ msgid ""
+#~ "  --show-toolbars                     Turn on the toolbars for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-toolbars                     མཇུག་གསལ་བཀོད་འབད་མི་ཝིནཌོ་དོན་ལུ་ལག་ཆས་ཕྲ་"
+#~ "རིང་ཚུ་གུ་\n"
+#~ "                                      ཊརནི་ཨོན་འབད་ ཝིནཌོ་གཅིག་རྐྱངམ་ཅིག་ལུ་འཇུག་སྤྱོད་"
+#~ "འབདཝ་\n"
+#~ "                                     ད་ ཁྱོད་ཀྱིས་བརྡ་བསྐུལ་གྱལ་འདི་ལས་གསར་བསྐྲུན་འབད་"
+#~ "མི\n"
+#~ "                                      ཝིནཌོ་རེ་རེ་དོན་ལུ་ཚར་གཅིག་གསལ་\n"
+#~ "                                      བཀོད་འབད་བཏུབ་ཨིན།"
+
+#~ msgid ""
+#~ "  --hide-toolbars                     Turn off the toolbars for the "
+#~ "last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-toolbars                     མཇུག་གསལ་བཀོད་འབད་མི་ཝིནཌོ་དོན་ལུ་ལག་ཆས་ཕྲ་"
+#~ "རིང་ཚུ་\n"
+#~ "                                      ཊརནི་ཨོཕ་འབད ཝིནཌོ་གཅིག་རྐྱངམ་ཅིག་ལུ་འཇུག་སྤྱོད་"
+#~ "འབདཝ་ད་\n"
+#~ "                                      འདི་ཡང་ཁྱོད་ཀྱིས་བརྡ་བསྐུལ་གྱལ་ལས་གསར་བསྐྲུན\n"
+#~ "                                      འབད་མི་ཝིནཌོ་རེ་རེ་དོན་ལུ་ཚར་གཅིག་\n"
+#~ "                                      གསལ་བཀོད་འབད་བཏུབ་ཨིན།"
+
+#~ msgid "Unable to launch terminal: %s\n"
+#~ msgstr "ཊར་མི་ནཱལ་གསར་བཙུགས་འབད་མི་ཚུགསཔ: %s\n"
+
+#~ msgid ""
+#~ "Option \"--sm-client-id\" requires specifying the session id as its "
+#~ "parameter"
+#~ msgstr ""
+#~ "གདམ་ཁ་ \"--sm-client-id\" འདི་ཚད་བཟུང་སྦེ་ལཱ་ཡུན་ཨའི་ཌི་གསལ་བཀོད་འབད་བའི་བསྒང་དགོས་མཁོ་"
+#~ "ཡོདཔ་ཨིན།"
+
 #~ msgid "<b>Title:</b>"
 #~ msgstr "<b>མགོ་མིང་:</b>"
 
diff --git a/po/el.po b/po/el.po
index bcef5e4..e86e788 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Terminal 0.2.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 11:48+0100\n"
+"POT-Creation-Date: 2009-12-14 16:03+0100\n"
 "PO-Revision-Date: 2009-07-25 21:25+0200\n"
 "Last-Translator: Evaggelos Balaskas <ebalaskas at ebalaskas.gr>\n"
 "Language-Team: Greek <nls at tux.hellug.gr>\n"
@@ -17,303 +17,88 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../terminal/main.c:46
+#: ../terminal/main.c:48
 msgid "Usage:"
 msgstr "Χρήση:"
 
-#: ../terminal/main.c:47
+#: ../terminal/main.c:48
 msgid "OPTION"
 msgstr "ΕΠΙΛΟΓΗ"
 
-#: ../terminal/main.c:49
+#: ../terminal/main.c:53
 msgid "General Options"
 msgstr "Γενικές επιλογές"
 
-#: ../terminal/main.c:50
-msgid "  -h, --help                          Print this help message and exit"
-msgstr ""
-"  -h, --help                          Εμφανίζει αυτό το κείμενο βοήθειας"
-
-#: ../terminal/main.c:51
-msgid ""
-"  -V, --version                       Print version information and exit"
-msgstr ""
-"  -V, --version                       Εμφανίζει τις πληροφορίες της έκδοσης "
-"και τερματίζει"
-
-#: ../terminal/main.c:52
-msgid ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
-msgstr ""
-"  --disable-server                    Όχι σύνδεση με το δίαυλο μηνυμάτων\n"
-"                                      συστήματος D-BUS"
-
-#: ../terminal/main.c:54
-msgid "  --default-display=DISPLAY           default X display to use"
-msgstr ""
-"  --default-display=DISPLAY           προκαθορισμένο X display προς χρήση"
+#. parameter of --default-display
+#. parameter of --display
+#: ../terminal/main.c:55 ../terminal/main.c:81
+#, fuzzy
+msgid "display"
+msgstr "Δεν προβάλλεται"
 
-#: ../terminal/main.c:55
-msgid ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
+#. parameter of --default-working-directory
+#. parameter of --working-directory
+#: ../terminal/main.c:57 ../terminal/main.c:72
+msgid "directory"
 msgstr ""
-"  --default-working-directory=DIRNAME Ορισμός του εξ ορισμού καταλόγου\n"
-"                                      εργασίας του τερματικού."
 
-#: ../terminal/main.c:58
+#: ../terminal/main.c:61
 msgid "Window or Tab Separators"
 msgstr "Διαχωριστές παραθύρων ή καρτελών"
 
-#: ../terminal/main.c:59
-msgid ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-msgstr ""
-"  --tab                               Ανοίγει μια νέα καρτέλα στο "
-"προσδιορισμένο\n"
-"                                      παράθυρο· μπορεί να δοθεί παραπάνω από "
-"μια\n"
-"                                      φορές."
-
-#: ../terminal/main.c:62
-msgid ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-msgstr ""
-"  --window                            Ανοίγει ένα νέο παράθυρο με μια "
-"καρτέλα.\n"
-"                                      Μπορεί να δοθεί παραπάνω από μια φορές."
-
 #: ../terminal/main.c:66
 msgid "Tab Options"
 msgstr "Επιλογές καρτέλας"
 
-#: ../terminal/main.c:67
-msgid ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-msgstr ""
-"  -x, --execute                       Εκτέλεση του υπολοίπου της εντολής\n"
-"                                      μέσα στο τερματικό."
-
-#: ../terminal/main.c:69
-msgid ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-msgstr ""
-"  -e, --command=ΕΝΤΟΛΗ                Εκτελεί το όρισμα αυτής της επιλογής\n"
-"                                      μέσα στο τερματικό"
-
-#: ../terminal/main.c:71
-msgid ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
-msgstr ""
-"  --working-directory=ΚΑΤΑΛΟΓΟΣ    Ορισμός του καταλόγου εργασίας του "
-"τερματικού."
-
-#: ../terminal/main.c:72
-msgid "  -T, --title=TITLE                   Set the terminal's title"
-msgstr "  -T, --title=TITLE                   Ορίζει τον τίτλο του τερματικού"
+#. parameter of --command
+#: ../terminal/main.c:68
+#, fuzzy
+msgid "command"
+msgstr "Εντολή"
 
-#: ../terminal/main.c:73
-msgid ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-msgstr ""
-"  -H, --hold                          Να μην κλείσει η καρτέλλα αμέσως μετά\n"
-"                                      την έξοδο της θυγατρικής διεργασίας"
+#. parameter of --title
+#: ../terminal/main.c:70
+#, fuzzy
+msgid "title"
+msgstr "Τίτλος"
 
-#: ../terminal/main.c:76
+#: ../terminal/main.c:79
 msgid "Window Options"
 msgstr "Επιλογές παραθύρου"
 
-#: ../terminal/main.c:77
-msgid ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
+#. parameter of --geometry
+#: ../terminal/main.c:83
+msgid "geometry"
 msgstr ""
-"  --display=DISPLAY                   Ποιο X display να χρησιμοποιηθεί για\n"
-"                                      το προσδιορισμένο παράθυρο"
 
-#: ../terminal/main.c:79
-msgid ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
+#. parameter of --role
+#: ../terminal/main.c:85
+msgid "role"
 msgstr ""
-"  --geometry=ΓΕΩΜΕΤΡΙΑ                Ο καθορισμός γεωμετρίας Χ (βλ. σελίδα\n"
-"                                      τεκμηρίωσης man \"X\"), μπορεί να "
-"ορισθεί\n"
-"                                      μια φορά ανά παράθυρο που ανοίγεται."
 
-#: ../terminal/main.c:82
-msgid ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
-msgstr ""
-"  --role=ΡΟΛΟΣ                        Ορισμός του ρόλου για το τελευταίο\n"
-"                                      καθορισμένο παράθυρο, εφαρμόζεται μόνο "
-"σε\n"
-"                                      ένα παράθυρο και μπορεί να καθοριστεί "
-"μια\n"
-"                                      φορά για κάθε παράθυρο που "
-"δημιουργείται\n"
-"                                      από τη γραμμή εντολών."
-
-#: ../terminal/main.c:86
-msgid ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
-msgstr ""
-"  --startup-id=ΑΝΑΓΩΡΙΣΤΙΚΟ           Αναγνωριστικό για το πρωτόκολλο\n"
-"                                      ειδοποίησης εκκίνησης"
+#. parameter of --startup-id
+#: ../terminal/main.c:87
+#, fuzzy
+msgid "string"
+msgstr "Προειδοποίηση"
 
-#: ../terminal/main.c:88
-msgid ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
-msgstr ""
-"  -I, --icon=ΕΙΚΟΝΙΔΙΟ                     Ορισμός του εικονιδίου του "
-"τερματικού\n"
-"                                                        ως εικονίδιο "
-"ονόματος ή ονόματος αρχείου"
+#. parameter of --icon
+#: ../terminal/main.c:89
+#, fuzzy
+msgid "icon"
+msgstr "Δράση"
 
-#: ../terminal/main.c:90
-msgid ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --fullscreen                        Ορισμός του τελευταίου καθορισμένου "
-"παραθύρου σε\n"
-"                                       μεγιστοποίηση, εφαρμόζεται μόνο σε "
-"ένα παράθυρο\n"
-"                                       και μπορεί να καθοριστεί μία φορά για "
-"κάθε νέο παράθυρο\n"
-"                                       που δημιουργείται από την γραμμή "
-"εντολών."
-
-#: ../terminal/main.c:95
-msgid ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
-msgstr ""
-"  --maximize                          Μεγιστοποιεί το τελευταίο καθορισμένο "
-"παράθυρο\n"
-"                                      εφαρμόζεται μόνο σε ένα νέο παράθυρο "
-"και μπορεί να\n"
-"                                      καθοριστεί μία φορά για κάθε παράθυρο "
-"που δημιουργείται\n"
-"                                      από την γραμμή εντολών"
-
-#: ../terminal/main.c:99
-msgid ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-menubar                      Ενεργοποιεί τη μπάρα μενού για το\n"
-"                                      προσδιορισμένο παράθυρο· ενεργεί μόνο\n"
-"                                      σε ένα παράθυρο· μπορεί να "
-"προσδιοριστεί\n"
-"                                      για κάθε παράθυρο που δημιουργείτε\n"
-"                                      από τη γραμμή εντολών"
-
-#: ../terminal/main.c:104
-msgid ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --hide-menubar                      Αποκρύπτει τη μπάρα μενού για το\n"
-"                                      προσδιορισμένο παράθυρο· ενεργεί μόνο\n"
-"                                      σε ένα παράθυρο· μπορεί να "
-"προσδιοριστεί\n"
-"                                      για κάθε παράθυρο που δημιουργείτε\n"
-"                                      από τη γραμμή εντολών"
-
-#: ../terminal/main.c:109
-msgid ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --show-borders                      Ενεργοποιεί τα περιγράμματα για το\n"
-"                                      προσδιορισμένο παράθυρο· ενεργεί μόνο\n"
-"                                      σε ένα παράθυρο· μπορεί να "
-"προσδιοριστεί\n"
-"                                      για κάθε παράθυρο που δημιουργείτε\n"
-"                                      από τη γραμμή εντολών"
-
-#: ../terminal/main.c:114
-msgid ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --hide-borders                      Αποκρύπτει τα περιγράμματα για το\n"
-"                                      προσδιορισμένο παράθυρο· ενεργεί μόνο\n"
-"                                      σε ένα παράθυρο· μπορεί να "
-"προσδιοριστεί\n"
-"                                      για κάθε παράθυρο που δημιουργείτε\n"
-"                                      από τη γραμμή εντολών"
-
-#: ../terminal/main.c:119
-msgid ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-toolbars                     Εμφανίζει τις γραμμές εργαλείων για "
-"το\n"
-"                                      προσδιορισμένο παράθυρο· ενεργεί μόνο\n"
-"                                      σε ένα παράθυρο· μπορεί να "
-"προσδιοριστεί\n"
-"                                      για κάθε παράθυρο που δημιουργείτε\n"
-"                                      από τη γραμμή εντολών"
-
-#: ../terminal/main.c:124
-msgid ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#: ../terminal/main.c:91
+#, c-format
+msgid "See the %s man page for full explanation of the options above."
 msgstr ""
-"  --hide-toolbars                     Αποκρύπτει τις γραμμές εργαλείων για "
-"το\n"
-"                                      προσδιορισμένο παράθυρο· ενεργεί μόνο\n"
-"                                      σε ένα παράθυρο· μπορεί να "
-"προσδιοριστεί\n"
-"                                      για κάθε παράθυρο που δημιουργείτε\n"
-"                                      από τη γραμμή εντολών"
-
-#: ../terminal/main.c:151 ../terminal/terminal-preferences.c:1263
+
+#: ../terminal/main.c:118 ../terminal/terminal-preferences.c:1263
 #: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr "Τερματικό"
 
-#: ../terminal/main.c:173
+#: ../terminal/main.c:135
 #, c-format
 msgid ""
 "%s (Xfce %s)\n"
@@ -338,31 +123,26 @@ msgstr ""
 "\n"
 "Παρακαλώ αναφέρετε σφάλματα στο <%s>.\n"
 
-#: ../terminal/main.c:267
+#: ../terminal/main.c:239
 #, c-format
 msgid "Unable to register terminal service: %s\n"
 msgstr "Δεν ήταν δυνατή η καταχώρηση της υπηρεσίας τερματικού: %s\n"
 
-#: ../terminal/main.c:276
-#, c-format
-msgid "Unable to launch terminal: %s\n"
-msgstr "Δεν ήταν δυνατή η εκκίνηση του τερματικού: %s\n"
-
-#: ../terminal/terminal-app.c:551
+#: ../terminal/terminal-app.c:554
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "Μη έγκυρο αλφαριθμητικό γεωμετρίας \"%s\"\"\n"
 
-#: ../terminal/terminal-dbus.c:114
+#: ../terminal/terminal-dbus.c:108
 msgid "User id mismatch"
 msgstr "Το αναγνωριστικό χρήστη δεν ταιριάζει"
 
-#: ../terminal/terminal-dbus.c:146
+#: ../terminal/terminal-dbus.c:134
 #, c-format
 msgid "D-BUS message bus disconnected, exiting...\n"
 msgstr "Ο δίαυλος μηνυμάτων D-BUS αποσυνδέθηκε, έξοδος...\n"
 
-#: ../terminal/terminal-dbus.c:208
+#: ../terminal/terminal-dbus.c:196
 #, c-format
 msgid "Unable to register object %s"
 msgstr "Δεν ήταν δυνατή η εγγραφή του αντικειμένου %s"
@@ -384,7 +164,7 @@ msgstr ""
 msgid "Failed to open the documentation browser"
 msgstr "Το άνοιγμα του αναγνώστη τεκμηρίωσης απέτυχε"
 
-#: ../terminal/terminal-options.c:189
+#: ../terminal/terminal-options.c:206
 #, c-format
 msgid ""
 "Option \"--default-display\" requires specifying the default X display as "
@@ -393,7 +173,7 @@ msgstr ""
 "Η επιλογή \"--default-display\" απαιτεί τον προσδιορισμό του προκαθορισμένου "
 "X display ως παράμετρο"
 
-#: ../terminal/terminal-options.c:204
+#: ../terminal/terminal-options.c:221
 #, c-format
 msgid ""
 "Option \"--default-working-directory\" requires specifying the default "
@@ -402,15 +182,7 @@ msgstr ""
 "Η επιλογή \"--default-working-directory\" απαιτεί τον προσδιορισμό του "
 "προκαθορισμένου καταλόγου στον οποίο θα ξεκινήσει ως παράμετρο"
 
-#: ../terminal/terminal-options.c:235
-#, c-format
-msgid ""
-"Option \"--sm-client-id\" requires specifying the session id as its parameter"
-msgstr ""
-"Η επιλογή \"--sm-client-id\" απαιτεί τον προσδιορισμό του αναγνωριστικού "
-"συνεδρίας ως παράμετρο"
-
-#: ../terminal/terminal-options.c:250
+#: ../terminal/terminal-options.c:237
 #, c-format
 msgid ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
@@ -419,7 +191,7 @@ msgstr ""
 "Η επιλογή \"--execute/-x\" απαιτεί τον προσδιορισμό της εντολής που θα "
 "εκτελεστεί στο υπόλοιπο της εντολής"
 
-#: ../terminal/terminal-options.c:267
+#: ../terminal/terminal-options.c:254
 #, c-format
 msgid ""
 "Option \"--command/-e\" requires specifying the command to run as its "
@@ -428,7 +200,7 @@ msgstr ""
 "Η επιλογή \"--command/-e\" απαιτεί τον προσδιορισμό της εντολής που θα "
 "εκτελεστεί ως παράμετρο"
 
-#: ../terminal/terminal-options.c:284
+#: ../terminal/terminal-options.c:271
 #, c-format
 msgid ""
 "Option \"--working-directory\" requires specifying the working directory as "
@@ -437,21 +209,21 @@ msgstr ""
 "Η επιλογή \"--working-directory\" απαιτεί τον προσδιορισμό του καταλόγου "
 "στον οποίο θα ξεκινήσει ως παράμετρο"
 
-#: ../terminal/terminal-options.c:299
+#: ../terminal/terminal-options.c:286
 #, c-format
 msgid "Option \"--title/-T\" requires specifying the title as its parameter"
 msgstr ""
 "Η εντολή \"--working-directory\" απαιτεί τον προσδιορισμό του τίτλου ως "
 "παράμετρο"
 
-#: ../terminal/terminal-options.c:319
+#: ../terminal/terminal-options.c:305
 #, c-format
 msgid ""
 "Option \"--display\" requires specifying the X display as its parameters"
 msgstr ""
 "Η Επιλογή \"--display\" απαιτεί τον προσδιορισμό του X display ως παράμετρο"
 
-#: ../terminal/terminal-options.c:334
+#: ../terminal/terminal-options.c:320
 #, c-format
 msgid ""
 "Option \"--geometry\" requires specifying the window geometry as its "
@@ -460,14 +232,14 @@ msgstr ""
 "Η επιλογή \"--geometry\" απαιτεί τον προσδιορισμό της γεωμετρίας του "
 "παραθύρου ως παράμετρο"
 
-#: ../terminal/terminal-options.c:349
+#: ../terminal/terminal-options.c:335
 #, c-format
 msgid "Option \"--role\" requires specifying the window role as its parameter"
 msgstr ""
 "Η επιλογή \"--role\" απαιτεί τον προσδιορισμό του ρόλου του παραθύρου ως "
 "παράμετρο"
 
-#: ../terminal/terminal-options.c:364
+#: ../terminal/terminal-options.c:350
 #, c-format
 msgid ""
 "Option \"--startup-id\" requires specifying the startup id as its parameter"
@@ -475,7 +247,7 @@ msgstr ""
 "Η επιλογή \"--startup-id\" απαιτεί τον προσδιορισμό του αναγνωριστικού "
 "εκκίνησης ως παράμετρο"
 
-#: ../terminal/terminal-options.c:379
+#: ../terminal/terminal-options.c:365
 #, c-format
 msgid ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
@@ -484,7 +256,7 @@ msgstr ""
 "Η επιλογή \"--icon/-I\" απαιτεί τον καθορισμό ενός ονόματος εικονιδίου ή "
 "όνομα αρχείου ως παράμετρο"
 
-#: ../terminal/terminal-options.c:435
+#: ../terminal/terminal-options.c:419
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Άγνωστη επιλογή \"%s\""
@@ -553,7 +325,7 @@ msgstr "Πλήρης οθόνη"
 msgid "Set Title"
 msgstr "Καθορισμός τίτλου"
 
-#: ../terminal/terminal-preferences.c:464
+#: ../terminal/terminal-preferences.c:464 ../terminal/terminal-window.c:237
 msgid "Reset"
 msgstr "Αρχικοποίηση"
 
@@ -850,6 +622,11 @@ msgstr "Επανα_φορά"
 msgid "Reset and C_lear"
 msgstr "Επαναφορά και Καθαρι_σμός"
 
+#: ../terminal/terminal-window.c:238
+#, fuzzy
+msgid "Reset and clear"
+msgstr "Αρχικοποίηση και Καθαρισμός"
+
 #: ../terminal/terminal-window.c:239
 msgid "_Go"
 msgstr "_Μετάβαση"
@@ -1483,6 +1260,293 @@ msgstr "Εν_ημέρωση των εγγραφών utmp/wtmp όταν εκτε
 msgid "seconds"
 msgstr "δευτερόλεπτα"
 
+#~ msgid ""
+#~ "  -h, --help                          Print this help message and exit"
+#~ msgstr ""
+#~ "  -h, --help                          Εμφανίζει αυτό το κείμενο βοήθειας"
+
+#~ msgid ""
+#~ "  -V, --version                       Print version information and exit"
+#~ msgstr ""
+#~ "  -V, --version                       Εμφανίζει τις πληροφορίες της "
+#~ "έκδοσης και τερματίζει"
+
+#~ msgid ""
+#~ "  --disable-server                    Do not register with the D-BUS\n"
+#~ "                                      session message bus"
+#~ msgstr ""
+#~ "  --disable-server                    Όχι σύνδεση με το δίαυλο μηνυμάτων\n"
+#~ "                                      συστήματος D-BUS"
+
+#~ msgid "  --default-display=DISPLAY           default X display to use"
+#~ msgstr ""
+#~ "  --default-display=DISPLAY           προκαθορισμένο X display προς χρήση"
+
+#~ msgid ""
+#~ "  --default-working-directory=DIRNAME Set the default terminal's working\n"
+#~ "                                      directory"
+#~ msgstr ""
+#~ "  --default-working-directory=DIRNAME Ορισμός του εξ ορισμού καταλόγου\n"
+#~ "                                      εργασίας του τερματικού."
+
+#~ msgid ""
+#~ "  --tab                               Open a new tab in the last-"
+#~ "specified\n"
+#~ "                                      window; more than one of these\n"
+#~ "                                      options can be provided"
+#~ msgstr ""
+#~ "  --tab                               Ανοίγει μια νέα καρτέλα στο "
+#~ "προσδιορισμένο\n"
+#~ "                                      παράθυρο· μπορεί να δοθεί παραπάνω "
+#~ "από μια\n"
+#~ "                                      φορές."
+
+#~ msgid ""
+#~ "  --window                            Open a new window containing one "
+#~ "tab;\n"
+#~ "                                      more than one of these options can "
+#~ "be\n"
+#~ "                                      provided"
+#~ msgstr ""
+#~ "  --window                            Ανοίγει ένα νέο παράθυρο με μια "
+#~ "καρτέλα.\n"
+#~ "                                      Μπορεί να δοθεί παραπάνω από μια "
+#~ "φορές."
+
+#~ msgid ""
+#~ "  -x, --execute                       Execute the remainder of the "
+#~ "command\n"
+#~ "                                      line inside the terminal"
+#~ msgstr ""
+#~ "  -x, --execute                       Εκτέλεση του υπολοίπου της εντολής\n"
+#~ "                                      μέσα στο τερματικό."
+
+#~ msgid ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+#~ msgstr ""
+#~ "  -e, --command=ΕΝΤΟΛΗ                Εκτελεί το όρισμα αυτής της "
+#~ "επιλογής\n"
+#~ "                                      μέσα στο τερματικό"
+
+#~ msgid ""
+#~ "  --working-directory=DIRNAME         Set the terminal's working directory"
+#~ msgstr ""
+#~ "  --working-directory=ΚΑΤΑΛΟΓΟΣ    Ορισμός του καταλόγου εργασίας του "
+#~ "τερματικού."
+
+#~ msgid "  -T, --title=TITLE                   Set the terminal's title"
+#~ msgstr ""
+#~ "  -T, --title=TITLE                   Ορίζει τον τίτλο του τερματικού"
+
+#~ msgid ""
+#~ "  -H, --hold                          Do not immediately destroy the tab\n"
+#~ "                                      when the child command exits"
+#~ msgstr ""
+#~ "  -H, --hold                          Να μην κλείσει η καρτέλλα αμέσως "
+#~ "μετά\n"
+#~ "                                      την έξοδο της θυγατρικής διεργασίας"
+
+#~ msgid ""
+#~ "  --display=DISPLAY                   X display to use for the last-\n"
+#~ "                                      specified window"
+#~ msgstr ""
+#~ "  --display=DISPLAY                   Ποιο X display να χρησιμοποιηθεί "
+#~ "για\n"
+#~ "                                      το προσδιορισμένο παράθυρο"
+
+#~ msgid ""
+#~ "  --geometry=GEOMETRY                 X geometry specification (see \"X"
+#~ "\"\n"
+#~ "                                      man page), can be specified once "
+#~ "per\n"
+#~ "                                      window to be opened"
+#~ msgstr ""
+#~ "  --geometry=ΓΕΩΜΕΤΡΙΑ                Ο καθορισμός γεωμετρίας Χ (βλ. "
+#~ "σελίδα\n"
+#~ "                                      τεκμηρίωσης man \"X\"), μπορεί να "
+#~ "ορισθεί\n"
+#~ "                                      μια φορά ανά παράθυρο που ανοίγεται."
+
+#~ msgid ""
+#~ "  --role=ROLE                         Set the role for the last-"
+#~ "specified\n"
+#~ "                                      window; applies to only one "
+#~ "window;\n"
+#~ "                                      can be specified once for each "
+#~ "window\n"
+#~ "                                      you create from the command line"
+#~ msgstr ""
+#~ "  --role=ΡΟΛΟΣ                        Ορισμός του ρόλου για το τελευταίο\n"
+#~ "                                      καθορισμένο παράθυρο, εφαρμόζεται "
+#~ "μόνο σε\n"
+#~ "                                      ένα παράθυρο και μπορεί να "
+#~ "καθοριστεί μια\n"
+#~ "                                      φορά για κάθε παράθυρο που "
+#~ "δημιουργείται\n"
+#~ "                                      από τη γραμμή εντολών."
+
+#~ msgid ""
+#~ "  --startup-id=STRING                 ID for the startup notification\n"
+#~ "                                      protocol"
+#~ msgstr ""
+#~ "  --startup-id=ΑΝΑΓΩΡΙΣΤΙΚΟ           Αναγνωριστικό για το πρωτόκολλο\n"
+#~ "                                      ειδοποίησης εκκίνησης"
+
+#~ msgid ""
+#~ "  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
+#~ "                                      name or filename"
+#~ msgstr ""
+#~ "  -I, --icon=ΕΙΚΟΝΙΔΙΟ                     Ορισμός του εικονιδίου του "
+#~ "τερματικού\n"
+#~ "                                                        ως εικονίδιο "
+#~ "ονόματος ή ονόματος αρχείου"
+
+#~ msgid ""
+#~ "  --fullscreen                        Set the last-specified window into\n"
+#~ "                                      fullscreen mode; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --fullscreen                        Ορισμός του τελευταίου καθορισμένου "
+#~ "παραθύρου σε\n"
+#~ "                                       μεγιστοποίηση, εφαρμόζεται μόνο σε "
+#~ "ένα παράθυρο\n"
+#~ "                                       και μπορεί να καθοριστεί μία φορά "
+#~ "για κάθε νέο παράθυρο\n"
+#~ "                                       που δημιουργείται από την γραμμή "
+#~ "εντολών."
+
+#~ msgid ""
+#~ "  --maximize                          Maximize the last-specified "
+#~ "window;\n"
+#~ "                                      applies to only one window; can be\n"
+#~ "                                      specified once for each window you\n"
+#~ "                                      create from the command line"
+#~ msgstr ""
+#~ "  --maximize                          Μεγιστοποιεί το τελευταίο "
+#~ "καθορισμένο παράθυρο\n"
+#~ "                                      εφαρμόζεται μόνο σε ένα νέο "
+#~ "παράθυρο και μπορεί να\n"
+#~ "                                      καθοριστεί μία φορά για κάθε "
+#~ "παράθυρο που δημιουργείται\n"
+#~ "                                      από την γραμμή εντολών"
+
+#~ msgid ""
+#~ "  --show-menubar                      Turn on the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-menubar                      Ενεργοποιεί τη μπάρα μενού για το\n"
+#~ "                                      προσδιορισμένο παράθυρο· ενεργεί "
+#~ "μόνο\n"
+#~ "                                      σε ένα παράθυρο· μπορεί να "
+#~ "προσδιοριστεί\n"
+#~ "                                      για κάθε παράθυρο που δημιουργείτε\n"
+#~ "                                      από τη γραμμή εντολών"
+
+#~ msgid ""
+#~ "  --hide-menubar                      Turn off the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-menubar                      Αποκρύπτει τη μπάρα μενού για το\n"
+#~ "                                      προσδιορισμένο παράθυρο· ενεργεί "
+#~ "μόνο\n"
+#~ "                                      σε ένα παράθυρο· μπορεί να "
+#~ "προσδιοριστεί\n"
+#~ "                                      για κάθε παράθυρο που δημιουργείτε\n"
+#~ "                                      από τη γραμμή εντολών"
+
+#~ msgid ""
+#~ "  --show-borders                      Turn on the window decorations for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --show-borders                      Ενεργοποιεί τα περιγράμματα για το\n"
+#~ "                                      προσδιορισμένο παράθυρο· ενεργεί "
+#~ "μόνο\n"
+#~ "                                      σε ένα παράθυρο· μπορεί να "
+#~ "προσδιοριστεί\n"
+#~ "                                      για κάθε παράθυρο που δημιουργείτε\n"
+#~ "                                      από τη γραμμή εντολών"
+
+#~ msgid ""
+#~ "  --hide-borders                      Turn off the window decorations "
+#~ "for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --hide-borders                      Αποκρύπτει τα περιγράμματα για το\n"
+#~ "                                      προσδιορισμένο παράθυρο· ενεργεί "
+#~ "μόνο\n"
+#~ "                                      σε ένα παράθυρο· μπορεί να "
+#~ "προσδιοριστεί\n"
+#~ "                                      για κάθε παράθυρο που δημιουργείτε\n"
+#~ "                                      από τη γραμμή εντολών"
+
+#~ msgid ""
+#~ "  --show-toolbars                     Turn on the toolbars for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-toolbars                     Εμφανίζει τις γραμμές εργαλείων για "
+#~ "το\n"
+#~ "                                      προσδιορισμένο παράθυρο· ενεργεί "
+#~ "μόνο\n"
+#~ "                                      σε ένα παράθυρο· μπορεί να "
+#~ "προσδιοριστεί\n"
+#~ "                                      για κάθε παράθυρο που δημιουργείτε\n"
+#~ "                                      από τη γραμμή εντολών"
+
+#~ msgid ""
+#~ "  --hide-toolbars                     Turn off the toolbars for the "
+#~ "last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-toolbars                     Αποκρύπτει τις γραμμές εργαλείων "
+#~ "για το\n"
+#~ "                                      προσδιορισμένο παράθυρο· ενεργεί "
+#~ "μόνο\n"
+#~ "                                      σε ένα παράθυρο· μπορεί να "
+#~ "προσδιοριστεί\n"
+#~ "                                      για κάθε παράθυρο που δημιουργείτε\n"
+#~ "                                      από τη γραμμή εντολών"
+
+#~ msgid "Unable to launch terminal: %s\n"
+#~ msgstr "Δεν ήταν δυνατή η εκκίνηση του τερματικού: %s\n"
+
+#~ msgid ""
+#~ "Option \"--sm-client-id\" requires specifying the session id as its "
+#~ "parameter"
+#~ msgstr ""
+#~ "Η επιλογή \"--sm-client-id\" απαιτεί τον προσδιορισμό του αναγνωριστικού "
+#~ "συνεδρίας ως παράμετρο"
+
 #~ msgid "<b>Title:</b>"
 #~ msgstr "<b>Τίτλος:</b>"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 4ecabd4..c6f1a11 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Terminal 0.2.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 11:48+0100\n"
+"POT-Creation-Date: 2009-12-14 16:03+0100\n"
 "PO-Revision-Date: 2009-08-30 19:20+1000\n"
 "Last-Translator: Jeff Bailes <thepizzaking at gmail.com>\n"
 "Language-Team: English/GB\n"
@@ -17,276 +17,88 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../terminal/main.c:46
+#: ../terminal/main.c:48
 msgid "Usage:"
 msgstr "Usage:"
 
-#: ../terminal/main.c:47
+#: ../terminal/main.c:48
 msgid "OPTION"
 msgstr "OPTION"
 
-#: ../terminal/main.c:49
+#: ../terminal/main.c:53
 msgid "General Options"
 msgstr "General Options"
 
-#: ../terminal/main.c:50
-msgid "  -h, --help                          Print this help message and exit"
-msgstr "  -h, --help                          Print this help message and exit"
-
-#: ../terminal/main.c:51
-msgid ""
-"  -V, --version                       Print version information and exit"
-msgstr ""
-"  -V, --version                       Print version information and exit"
-
-#: ../terminal/main.c:52
-msgid ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
-msgstr ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
-
-#: ../terminal/main.c:54
-msgid "  --default-display=DISPLAY           default X display to use"
-msgstr "  --default-display=DISPLAY           default X display to use"
+#. parameter of --default-display
+#. parameter of --display
+#: ../terminal/main.c:55 ../terminal/main.c:81
+#, fuzzy
+msgid "display"
+msgstr "Isn't displayed"
 
-#: ../terminal/main.c:55
-msgid ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
+#. parameter of --default-working-directory
+#. parameter of --working-directory
+#: ../terminal/main.c:57 ../terminal/main.c:72
+msgid "directory"
 msgstr ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
 
-#: ../terminal/main.c:58
+#: ../terminal/main.c:61
 msgid "Window or Tab Separators"
 msgstr "Window or Tab Separators"
 
-#: ../terminal/main.c:59
-msgid ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-msgstr ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-
-#: ../terminal/main.c:62
-msgid ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-msgstr ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-
 #: ../terminal/main.c:66
 msgid "Tab Options"
 msgstr "Tab Options"
 
-#: ../terminal/main.c:67
-msgid ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-msgstr ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-
-#: ../terminal/main.c:69
-msgid ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-msgstr ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-
-#: ../terminal/main.c:71
-msgid ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
-msgstr ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
-
-#: ../terminal/main.c:72
-msgid "  -T, --title=TITLE                   Set the terminal's title"
-msgstr "  -T, --title=TITLE                   Set the terminal's title"
+#. parameter of --command
+#: ../terminal/main.c:68
+#, fuzzy
+msgid "command"
+msgstr "Command"
 
-#: ../terminal/main.c:73
-msgid ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-msgstr ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
+#. parameter of --title
+#: ../terminal/main.c:70
+#, fuzzy
+msgid "title"
+msgstr "Title"
 
-#: ../terminal/main.c:76
+#: ../terminal/main.c:79
 msgid "Window Options"
 msgstr "Window Options"
 
-#: ../terminal/main.c:77
-msgid ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
-msgstr ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
-
-#: ../terminal/main.c:79
-msgid ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
-msgstr ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
-
-#: ../terminal/main.c:82
-msgid ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
-msgstr ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
-
-#: ../terminal/main.c:86
-msgid ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
-msgstr ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
-
-#: ../terminal/main.c:88
-msgid ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
+#. parameter of --geometry
+#: ../terminal/main.c:83
+msgid "geometry"
 msgstr ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
 
-#: ../terminal/main.c:90
-msgid ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-
-#: ../terminal/main.c:95
-msgid ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
-msgstr ""
-"  --maximize                          Maximise the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
-
-#: ../terminal/main.c:99
-msgid ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-
-#: ../terminal/main.c:104
-msgid ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-
-#: ../terminal/main.c:109
-msgid ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
+#. parameter of --role
+#: ../terminal/main.c:85
+msgid "role"
 msgstr ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
 
-#: ../terminal/main.c:114
-msgid ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
+#. parameter of --startup-id
+#: ../terminal/main.c:87
+#, fuzzy
+msgid "string"
+msgstr "Warning"
 
-#: ../terminal/main.c:119
-msgid ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#. parameter of --icon
+#: ../terminal/main.c:89
+#, fuzzy
+msgid "icon"
+msgstr "Action"
 
-#: ../terminal/main.c:124
-msgid ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#: ../terminal/main.c:91
+#, c-format
+msgid "See the %s man page for full explanation of the options above."
 msgstr ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
 
-#: ../terminal/main.c:151 ../terminal/terminal-preferences.c:1263
+#: ../terminal/main.c:118 ../terminal/terminal-preferences.c:1263
 #: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../terminal/main.c:173
+#: ../terminal/main.c:135
 #, c-format
 msgid ""
 "%s (Xfce %s)\n"
@@ -311,31 +123,26 @@ msgstr ""
 "\n"
 "Please report bugs to <%s>.\n"
 
-#: ../terminal/main.c:267
+#: ../terminal/main.c:239
 #, c-format
 msgid "Unable to register terminal service: %s\n"
 msgstr "Unable to register terminal service: %s\n"
 
-#: ../terminal/main.c:276
-#, c-format
-msgid "Unable to launch terminal: %s\n"
-msgstr "Unable to launch terminal: %s\n"
-
-#: ../terminal/terminal-app.c:551
+#: ../terminal/terminal-app.c:554
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "Invalid geometry string \"%s\"\n"
 
-#: ../terminal/terminal-dbus.c:114
+#: ../terminal/terminal-dbus.c:108
 msgid "User id mismatch"
 msgstr "User id mismatch"
 
-#: ../terminal/terminal-dbus.c:146
+#: ../terminal/terminal-dbus.c:134
 #, c-format
 msgid "D-BUS message bus disconnected, exiting...\n"
 msgstr "D-BUS message bus disconnected, exiting...\n"
 
-#: ../terminal/terminal-dbus.c:208
+#: ../terminal/terminal-dbus.c:196
 #, c-format
 msgid "Unable to register object %s"
 msgstr "Unable to register object %s"
@@ -359,7 +166,7 @@ msgstr "Visit Terminal website"
 msgid "Failed to open the documentation browser"
 msgstr "Failed to open the documentation browser"
 
-#: ../terminal/terminal-options.c:189
+#: ../terminal/terminal-options.c:206
 #, c-format
 msgid ""
 "Option \"--default-display\" requires specifying the default X display as "
@@ -368,7 +175,7 @@ msgstr ""
 "Option \"--default-display\" requires specifying the default X display as "
 "its parameter"
 
-#: ../terminal/terminal-options.c:204
+#: ../terminal/terminal-options.c:221
 #, c-format
 msgid ""
 "Option \"--default-working-directory\" requires specifying the default "
@@ -377,14 +184,7 @@ msgstr ""
 "Option \"--default-working-directory\" requires specifying the default "
 "working directory as its parameter"
 
-#: ../terminal/terminal-options.c:235
-#, c-format
-msgid ""
-"Option \"--sm-client-id\" requires specifying the session id as its parameter"
-msgstr ""
-"Option \"--sm-client-id\" requires specifying the session id as its parameter"
-
-#: ../terminal/terminal-options.c:250
+#: ../terminal/terminal-options.c:237
 #, c-format
 msgid ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
@@ -393,7 +193,7 @@ msgstr ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
 "of the command line"
 
-#: ../terminal/terminal-options.c:267
+#: ../terminal/terminal-options.c:254
 #, c-format
 msgid ""
 "Option \"--command/-e\" requires specifying the command to run as its "
@@ -402,7 +202,7 @@ msgstr ""
 "Option \"--command/-e\" requires specifying the command to run as its "
 "parameter"
 
-#: ../terminal/terminal-options.c:284
+#: ../terminal/terminal-options.c:271
 #, c-format
 msgid ""
 "Option \"--working-directory\" requires specifying the working directory as "
@@ -411,19 +211,19 @@ msgstr ""
 "Option \"--working-directory\" requires specifying the working directory as "
 "its parameter"
 
-#: ../terminal/terminal-options.c:299
+#: ../terminal/terminal-options.c:286
 #, c-format
 msgid "Option \"--title/-T\" requires specifying the title as its parameter"
 msgstr "Option \"--title/-T\" requires specifying the title as its parameter"
 
-#: ../terminal/terminal-options.c:319
+#: ../terminal/terminal-options.c:305
 #, c-format
 msgid ""
 "Option \"--display\" requires specifying the X display as its parameters"
 msgstr ""
 "Option \"--display\" requires specifying the X display as its parameters"
 
-#: ../terminal/terminal-options.c:334
+#: ../terminal/terminal-options.c:320
 #, c-format
 msgid ""
 "Option \"--geometry\" requires specifying the window geometry as its "
@@ -432,19 +232,19 @@ msgstr ""
 "Option \"--geometry\" requires specifying the window geometry as its "
 "parameter"
 
-#: ../terminal/terminal-options.c:349
+#: ../terminal/terminal-options.c:335
 #, c-format
 msgid "Option \"--role\" requires specifying the window role as its parameter"
 msgstr "Option \"--role\" requires specifying the window role as its parameter"
 
-#: ../terminal/terminal-options.c:364
+#: ../terminal/terminal-options.c:350
 #, c-format
 msgid ""
 "Option \"--startup-id\" requires specifying the startup id as its parameter"
 msgstr ""
 "Option \"--startup-id\" requires specifying the startup id as its parameter"
 
-#: ../terminal/terminal-options.c:379
+#: ../terminal/terminal-options.c:365
 #, c-format
 msgid ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
@@ -453,7 +253,7 @@ msgstr ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
 "parameter"
 
-#: ../terminal/terminal-options.c:435
+#: ../terminal/terminal-options.c:419
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Unknown option \"%s\""
@@ -522,7 +322,7 @@ msgstr "Fullscreen"
 msgid "Set Title"
 msgstr "Set Title"
 
-#: ../terminal/terminal-preferences.c:464
+#: ../terminal/terminal-preferences.c:464 ../terminal/terminal-window.c:237
 msgid "Reset"
 msgstr "Reset"
 
@@ -817,6 +617,11 @@ msgstr "_Reset"
 msgid "Reset and C_lear"
 msgstr "Reset and C_lear"
 
+#: ../terminal/terminal-window.c:238
+#, fuzzy
+msgid "Reset and clear"
+msgstr "Reset and Clear"
+
 #: ../terminal/terminal-window.c:239
 msgid "_Go"
 msgstr "_Go"
@@ -1444,6 +1249,277 @@ msgstr "_Update utmp/wtmp records when command is launched"
 msgid "seconds"
 msgstr "seconds"
 
+#~ msgid ""
+#~ "  -h, --help                          Print this help message and exit"
+#~ msgstr ""
+#~ "  -h, --help                          Print this help message and exit"
+
+#~ msgid ""
+#~ "  -V, --version                       Print version information and exit"
+#~ msgstr ""
+#~ "  -V, --version                       Print version information and exit"
+
+#~ msgid ""
+#~ "  --disable-server                    Do not register with the D-BUS\n"
+#~ "                                      session message bus"
+#~ msgstr ""
+#~ "  --disable-server                    Do not register with the D-BUS\n"
+#~ "                                      session message bus"
+
+#~ msgid "  --default-display=DISPLAY           default X display to use"
+#~ msgstr "  --default-display=DISPLAY           default X display to use"
+
+#~ msgid ""
+#~ "  --default-working-directory=DIRNAME Set the default terminal's working\n"
+#~ "                                      directory"
+#~ msgstr ""
+#~ "  --default-working-directory=DIRNAME Set the default terminal's working\n"
+#~ "                                      directory"
+
+#~ msgid ""
+#~ "  --tab                               Open a new tab in the last-"
+#~ "specified\n"
+#~ "                                      window; more than one of these\n"
+#~ "                                      options can be provided"
+#~ msgstr ""
+#~ "  --tab                               Open a new tab in the last-"
+#~ "specified\n"
+#~ "                                      window; more than one of these\n"
+#~ "                                      options can be provided"
+
+#~ msgid ""
+#~ "  --window                            Open a new window containing one "
+#~ "tab;\n"
+#~ "                                      more than one of these options can "
+#~ "be\n"
+#~ "                                      provided"
+#~ msgstr ""
+#~ "  --window                            Open a new window containing one "
+#~ "tab;\n"
+#~ "                                      more than one of these options can "
+#~ "be\n"
+#~ "                                      provided"
+
+#~ msgid ""
+#~ "  -x, --execute                       Execute the remainder of the "
+#~ "command\n"
+#~ "                                      line inside the terminal"
+#~ msgstr ""
+#~ "  -x, --execute                       Execute the remainder of the "
+#~ "command\n"
+#~ "                                      line inside the terminal"
+
+#~ msgid ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+#~ msgstr ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+
+#~ msgid ""
+#~ "  --working-directory=DIRNAME         Set the terminal's working directory"
+#~ msgstr ""
+#~ "  --working-directory=DIRNAME         Set the terminal's working directory"
+
+#~ msgid "  -T, --title=TITLE                   Set the terminal's title"
+#~ msgstr "  -T, --title=TITLE                   Set the terminal's title"
+
+#~ msgid ""
+#~ "  -H, --hold                          Do not immediately destroy the tab\n"
+#~ "                                      when the child command exits"
+#~ msgstr ""
+#~ "  -H, --hold                          Do not immediately destroy the tab\n"
+#~ "                                      when the child command exits"
+
+#~ msgid ""
+#~ "  --display=DISPLAY                   X display to use for the last-\n"
+#~ "                                      specified window"
+#~ msgstr ""
+#~ "  --display=DISPLAY                   X display to use for the last-\n"
+#~ "                                      specified window"
+
+#~ msgid ""
+#~ "  --geometry=GEOMETRY                 X geometry specification (see \"X"
+#~ "\"\n"
+#~ "                                      man page), can be specified once "
+#~ "per\n"
+#~ "                                      window to be opened"
+#~ msgstr ""
+#~ "  --geometry=GEOMETRY                 X geometry specification (see \"X"
+#~ "\"\n"
+#~ "                                      man page), can be specified once "
+#~ "per\n"
+#~ "                                      window to be opened"
+
+#~ msgid ""
+#~ "  --role=ROLE                         Set the role for the last-"
+#~ "specified\n"
+#~ "                                      window; applies to only one "
+#~ "window;\n"
+#~ "                                      can be specified once for each "
+#~ "window\n"
+#~ "                                      you create from the command line"
+#~ msgstr ""
+#~ "  --role=ROLE                         Set the role for the last-"
+#~ "specified\n"
+#~ "                                      window; applies to only one "
+#~ "window;\n"
+#~ "                                      can be specified once for each "
+#~ "window\n"
+#~ "                                      you create from the command line"
+
+#~ msgid ""
+#~ "  --startup-id=STRING                 ID for the startup notification\n"
+#~ "                                      protocol"
+#~ msgstr ""
+#~ "  --startup-id=STRING                 ID for the startup notification\n"
+#~ "                                      protocol"
+
+#~ msgid ""
+#~ "  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
+#~ "                                      name or filename"
+#~ msgstr ""
+#~ "  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
+#~ "                                      name or filename"
+
+#~ msgid ""
+#~ "  --fullscreen                        Set the last-specified window into\n"
+#~ "                                      fullscreen mode; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --fullscreen                        Set the last-specified window into\n"
+#~ "                                      fullscreen mode; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+
+#~ msgid ""
+#~ "  --maximize                          Maximize the last-specified "
+#~ "window;\n"
+#~ "                                      applies to only one window; can be\n"
+#~ "                                      specified once for each window you\n"
+#~ "                                      create from the command line"
+#~ msgstr ""
+#~ "  --maximize                          Maximise the last-specified "
+#~ "window;\n"
+#~ "                                      applies to only one window; can be\n"
+#~ "                                      specified once for each window you\n"
+#~ "                                      create from the command line"
+
+#~ msgid ""
+#~ "  --show-menubar                      Turn on the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-menubar                      Turn on the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+
+#~ msgid ""
+#~ "  --hide-menubar                      Turn off the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-menubar                      Turn off the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+
+#~ msgid ""
+#~ "  --show-borders                      Turn on the window decorations for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --show-borders                      Turn on the window decorations for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+
+#~ msgid ""
+#~ "  --hide-borders                      Turn off the window decorations "
+#~ "for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --hide-borders                      Turn off the window decorations "
+#~ "for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+
+#~ msgid ""
+#~ "  --show-toolbars                     Turn on the toolbars for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-toolbars                     Turn on the toolbars for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+
+#~ msgid ""
+#~ "  --hide-toolbars                     Turn off the toolbars for the "
+#~ "last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-toolbars                     Turn off the toolbars for the "
+#~ "last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+
+#~ msgid "Unable to launch terminal: %s\n"
+#~ msgstr "Unable to launch terminal: %s\n"
+
+#~ msgid ""
+#~ "Option \"--sm-client-id\" requires specifying the session id as its "
+#~ "parameter"
+#~ msgstr ""
+#~ "Option \"--sm-client-id\" requires specifying the session id as its "
+#~ "parameter"
+
 #~ msgid "<b>Title:</b>"
 #~ msgstr "<b>Title:</b>"
 
diff --git a/po/eo.po b/po/eo.po
index 408c9e5..62a5b01 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Terminal 0.2.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 11:48+0100\n"
+"POT-Creation-Date: 2009-12-14 16:03+0100\n"
 "PO-Revision-Date: 2006-09-14 12:14+0200\n"
 "Last-Translator: Jarbas Araujo Jr. <jarbasaraujojr at yahoo.com.br>\n"
 "Language-Team: Debian-l10n-esperanto <debian-l10n-esperanto at lists.debian."
@@ -19,294 +19,91 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../terminal/main.c:46
+#: ../terminal/main.c:48
 msgid "Usage:"
 msgstr ""
 
-#: ../terminal/main.c:47
+#: ../terminal/main.c:48
 msgid "OPTION"
 msgstr ""
 
-#: ../terminal/main.c:49
+#: ../terminal/main.c:53
 #, fuzzy
 msgid "General Options"
 msgstr "Ĝenerala"
 
-#: ../terminal/main.c:50
-msgid "  -h, --help                          Print this help message and exit"
-msgstr "  -h, --help                          Eligu tiun ĉi mesaĝon kaj ĉesiĝu"
-
-#: ../terminal/main.c:51
+#. parameter of --default-display
+#. parameter of --display
+#: ../terminal/main.c:55 ../terminal/main.c:81
 #, fuzzy
-msgid ""
-"  -V, --version                       Print version information and exit"
-msgstr ""
-"  -, --version                       Eligu informaĵon pri versio kaj ĉesiĝu"
-
-#: ../terminal/main.c:52
-msgid ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
-msgstr ""
-"  --disable-server                    Ne registru per D-BUSa\n"
-"                                      mesaĝosesia buso"
-
-#: ../terminal/main.c:54
-msgid "  --default-display=DISPLAY           default X display to use"
-msgstr "  --default-display=EKRANO            defaŭlta X-a ekranbloko uzenda"
+msgid "display"
+msgstr "Ne estas montrata"
 
-#: ../terminal/main.c:55
-#, fuzzy
-msgid ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
+#. parameter of --default-working-directory
+#. parameter of --working-directory
+#: ../terminal/main.c:57 ../terminal/main.c:72
+msgid "directory"
 msgstr ""
-"  --default-working-directory=DOSIERUJO Difinas la defaŭltan terminalan\n"
-"                                        labordosierujon"
 
-#: ../terminal/main.c:58
+#: ../terminal/main.c:61
 msgid "Window or Tab Separators"
 msgstr ""
 
-#: ../terminal/main.c:59
-msgid ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-msgstr ""
-"  --tab                               Malfermas novan langeton en la\n"
-"                                      lastespecifata fenestro; opcio\n"
-"                                      plurfoje uzebla"
-
-#: ../terminal/main.c:62
-msgid ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-msgstr ""
-"  --tab                               Malfermas novan fenestron kun unu "
-"langeto\n"
-"                                      tiu opcio estas plurfoje uzebla"
-
 #: ../terminal/main.c:66
 #, fuzzy
 msgid "Tab Options"
 msgstr "Langetopozicio"
 
-#: ../terminal/main.c:67
-msgid ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-msgstr ""
-"  -x, --execute                       Lanĉu la linioresta \n"
-"                                      komando en la terminalo"
-
-#: ../terminal/main.c:69
-msgid ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-msgstr ""
-"  -e, --command=ĈENO                Lanĉu la argumenton por tiu opcio\n"
-"                                    en la terminalo"
-
-#: ../terminal/main.c:71
-msgid ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
-msgstr ""
-"  --working-directory=DOSIERUJO       Difinu la terminalan labordosierujon"
-
-#: ../terminal/main.c:72
-msgid "  -T, --title=TITLE                   Set the terminal's title"
-msgstr "  -T, --title=TITOLO                  Difinu la terminalan titolon"
-
-#: ../terminal/main.c:73
-msgid ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-msgstr ""
-"  -H, --hold                          Ne tuje detruu la langeton\n"
-"                                      dum la filkomando ekzistas"
-
-#: ../terminal/main.c:76
-#, fuzzy
-msgid "Window Options"
-msgstr "Nekonata opcio \"%s\""
-
-#: ../terminal/main.c:77
-msgid ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
-msgstr ""
-"  --display=DISPLAY                   X-a ekranbloko uzenda por la lasta -\n"
-"                                      specifita fenestro"
-
-#: ../terminal/main.c:79
-msgid ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
-msgstr ""
-"  --geometry=GEOMETRIO                X-a geometria specifado (vidu \"X-an"
-"\"\n"
-"                                      manlibrojn), unu po aktiva fenestro"
-
-#: ../terminal/main.c:82
-#, fuzzy
-msgid ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
-msgstr ""
-"  --role=TRAJTO                         Difinas la trajto por la laste "
-"specifita;\n"
-"                                      fenestro; aplikebla po unu fenestro;\n"
-"                                      specifebla unufoje por ĉiu fenestro\n"
-"                                      kreita de la komandlinio"
-
-#: ../terminal/main.c:86
-msgid ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
-msgstr ""
-"  --startup-id=ĈENO                   Identignomo por la komencmesaĝila "
-"protokolo"
-
-#: ../terminal/main.c:88
+#. parameter of --command
+#: ../terminal/main.c:68
 #, fuzzy
-msgid ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
-msgstr ""
-"  -e, --command=ĈENO                Lanĉu la argumenton por tiu opcio\n"
-"                                    en la terminalo"
+msgid "command"
+msgstr "<b>Komando</b>"
 
-#: ../terminal/main.c:90
+#. parameter of --title
+#: ../terminal/main.c:70
 #, fuzzy
-msgid ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --fullscreen                        Difinu la lastspecifatan fenestron "
-"kiel\n"
-"                                      plenekrana; aplikebla al nur unu\n"
-"                                      fenestro; specifebla unufoje po\n"
-"                                      ĉiu fenestro kreita de la\n"
-"                                      komandlinio."
+msgid "title"
+msgstr "Titolo"
 
-#: ../terminal/main.c:95
+#: ../terminal/main.c:79
 #, fuzzy
-msgid ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
-msgstr ""
-"  --role=TRAJTO                         Difinas la trajto por la laste "
-"specifita;\n"
-"                                      fenestro; aplikebla po unu fenestro;\n"
-"                                      specifebla unufoje por ĉiu fenestro\n"
-"                                      kreita de la komandlinio"
+msgid "Window Options"
+msgstr "Nekonata opcio \"%s\""
 
-#: ../terminal/main.c:99
-#, fuzzy
-msgid ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#. parameter of --geometry
+#: ../terminal/main.c:83
+msgid "geometry"
 msgstr ""
-"  --show-menubar                      Malkaŝas la menuostrion por la lasta-\n"
-"                                      specifata fenestro; aplikeblas nur al "
-"unu\n"
-"                                      fenestro; specifebla unufoje po ĉiu\n"
-"                                      fenestro kreita per la komandlinio\n"
 
-#: ../terminal/main.c:104
-#, fuzzy
-msgid ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#. parameter of --role
+#: ../terminal/main.c:85
+msgid "role"
 msgstr ""
-"  --hide-menubar                      Kaŝas la menuostrion por la lasta-\n"
-"                                      specifata fenestro; aplikeblas nur al "
-"unu\n"
-"                                      fenestro; specifebla unufoje po ĉiu\n"
-"                                      fenestro kreita per la komandlinio\n"
 
-#: ../terminal/main.c:109
+#. parameter of --startup-id
+#: ../terminal/main.c:87
 #, fuzzy
-msgid ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --show-borders                      Malkaŝas la fenestrdekoracioj por "
-"la                                      specifata fenestro; aplikeblas nur "
-"al unu\n"
-"                                      fenestro; specifebla unufoje po ĉiu\n"
-"                                      fenestro kreita per la komandlinio\n"
-
-#: ../terminal/main.c:114
-#, fuzzy
-msgid ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --hide-borders                      Kaŝas la fenestrdekoracioj por "
-"la                                      specifata fenestro; aplikeblas nur "
-"al unu\n"
-"                                      fenestro; specifebla unufoje po ĉiu\n"
-"                                      fenestro kreita per la komandlinio\n"
+msgid "string"
+msgstr "Averto"
 
-#: ../terminal/main.c:119
+#. parameter of --icon
+#: ../terminal/main.c:89
 #, fuzzy
-msgid ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-toolbars                     Malkaŝas la ilarostrion por la lasta-\n"
-"                                      specifata fenestro; aplikeblas nur al "
-"unu\n"
-"                                      fenestro; specifebla unufoje po ĉiu\n"
-"                                      fenestro kreita per la komandlinio\n"
+msgid "icon"
+msgstr "Ago"
 
-#: ../terminal/main.c:124
-#, fuzzy
-msgid ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#: ../terminal/main.c:91
+#, c-format
+msgid "See the %s man page for full explanation of the options above."
 msgstr ""
-"  --hide-toolbars                     Kaŝas la ilarostrion por la lasta-\n"
-"                                      specifata fenestro; aplikeblas nur al "
-"unu\n"
-"                                      fenestro; specifebla unufoje po ĉiu\n"
-"                                      fenestro kreita per la komandlinio\n"
 
-#: ../terminal/main.c:151 ../terminal/terminal-preferences.c:1263
+#: ../terminal/main.c:118 ../terminal/terminal-preferences.c:1263
 #: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr "Terminalo"
 
-#: ../terminal/main.c:173
+#: ../terminal/main.c:135
 #, fuzzy, c-format
 msgid ""
 "%s (Xfce %s)\n"
@@ -331,31 +128,26 @@ msgstr ""
 "\n"
 "Erarojn, bonvolu raporti al <%s>.\n"
 
-#: ../terminal/main.c:267
+#: ../terminal/main.c:239
 #, c-format
 msgid "Unable to register terminal service: %s\n"
 msgstr "Ne eblas registri servicon de terminalo: %s\n"
 
-#: ../terminal/main.c:276
-#, c-format
-msgid "Unable to launch terminal: %s\n"
-msgstr "Ne eblas lanĉi terminalon: %s\n"
-
-#: ../terminal/terminal-app.c:551
+#: ../terminal/terminal-app.c:554
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "Nevalida geometria ĉeno \"%s\"\n"
 
-#: ../terminal/terminal-dbus.c:114
+#: ../terminal/terminal-dbus.c:108
 msgid "User id mismatch"
 msgstr "Neĝusta uzanta identigo"
 
-#: ../terminal/terminal-dbus.c:146
+#: ../terminal/terminal-dbus.c:134
 #, c-format
 msgid "D-BUS message bus disconnected, exiting...\n"
 msgstr "D-BUS-o mesaĝobuso malkonektata, eliranta...\n"
 
-#: ../terminal/terminal-dbus.c:208
+#: ../terminal/terminal-dbus.c:196
 #, c-format
 msgid "Unable to register object %s"
 msgstr "Ne eblas registri objekton %s"
@@ -380,7 +172,7 @@ msgstr ""
 msgid "Failed to open the documentation browser"
 msgstr "Ne elblas malfermi dokumentar-krozilon"
 
-#: ../terminal/terminal-options.c:189
+#: ../terminal/terminal-options.c:206
 #, c-format
 msgid ""
 "Option \"--default-display\" requires specifying the default X display as "
@@ -389,7 +181,7 @@ msgstr ""
 "Opcio \"--default-display\" necesas defaŭltan X-an ekranblokon kiel "
 "parametro "
 
-#: ../terminal/terminal-options.c:204
+#: ../terminal/terminal-options.c:221
 #, c-format
 msgid ""
 "Option \"--default-working-directory\" requires specifying the default "
@@ -398,13 +190,7 @@ msgstr ""
 "Opcio \"--default-working-directory\" necesas defaŭltan labordosierujonkiel "
 "parametro"
 
-#: ../terminal/terminal-options.c:235
-#, c-format
-msgid ""
-"Option \"--sm-client-id\" requires specifying the session id as its parameter"
-msgstr "Opcio \"--sm-client-id\" necesas seancidentigilon kiel ĝia parametro"
-
-#: ../terminal/terminal-options.c:250
+#: ../terminal/terminal-options.c:237
 #, c-format
 msgid ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
@@ -412,57 +198,57 @@ msgid ""
 msgstr ""
 "Opcio \"--execute/-x\" necesas komandon lanĉendan ĉe la fino de lakomandlinio"
 
-#: ../terminal/terminal-options.c:267
+#: ../terminal/terminal-options.c:254
 #, c-format
 msgid ""
 "Option \"--command/-e\" requires specifying the command to run as its "
 "parameter"
 msgstr "Opcio \"--command/-e\" necesas komandon lanĉendan kiel parametro "
 
-#: ../terminal/terminal-options.c:284
+#: ../terminal/terminal-options.c:271
 #, c-format
 msgid ""
 "Option \"--working-directory\" requires specifying the working directory as "
 "its parameter"
 msgstr "Opcio \"--working-directory\" necesas labordosierujon kie parametro "
 
-#: ../terminal/terminal-options.c:299
+#: ../terminal/terminal-options.c:286
 #, c-format
 msgid "Option \"--title/-T\" requires specifying the title as its parameter"
 msgstr "Opcio \"--title/-T\" necesas titolon kiel parametro "
 
-#: ../terminal/terminal-options.c:319
+#: ../terminal/terminal-options.c:305
 #, c-format
 msgid ""
 "Option \"--display\" requires specifying the X display as its parameters"
 msgstr "Opcio \"--display\" necesas X-an ekranblokon kiel parametro"
 
-#: ../terminal/terminal-options.c:334
+#: ../terminal/terminal-options.c:320
 #, c-format
 msgid ""
 "Option \"--geometry\" requires specifying the window geometry as its "
 "parameter"
 msgstr "Opcio \"--geometry\" necesas fenestran geometrion kiel parametro"
 
-#: ../terminal/terminal-options.c:349
+#: ../terminal/terminal-options.c:335
 #, c-format
 msgid "Option \"--role\" requires specifying the window role as its parameter"
 msgstr "Opcio \"--role\" necesas fenestran regulon kiel parametro"
 
-#: ../terminal/terminal-options.c:364
+#: ../terminal/terminal-options.c:350
 #, c-format
 msgid ""
 "Option \"--startup-id\" requires specifying the startup id as its parameter"
 msgstr "Opcio \"--startup-id\" necesas startigan identigilon kiel parametro"
 
-#: ../terminal/terminal-options.c:379
+#: ../terminal/terminal-options.c:365
 #, fuzzy, c-format
 msgid ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
 "parameter"
 msgstr "Opcio \"--command/-e\" necesas komandon lanĉendan kiel parametro "
 
-#: ../terminal/terminal-options.c:435
+#: ../terminal/terminal-options.c:419
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Nekonata opcio \"%s\""
@@ -532,7 +318,7 @@ msgstr "Tutekrana"
 msgid "Set Title"
 msgstr "Difinu titolo"
 
-#: ../terminal/terminal-preferences.c:464
+#: ../terminal/terminal-preferences.c:464 ../terminal/terminal-window.c:237
 msgid "Reset"
 msgstr "Reŝarĝu"
 
@@ -828,6 +614,11 @@ msgstr "_Reŝarĝu"
 msgid "Reset and C_lear"
 msgstr "Reŝarĝu kaj _Purigu"
 
+#: ../terminal/terminal-window.c:238
+#, fuzzy
+msgid "Reset and clear"
+msgstr "Reŝarĝu kaj Purigu"
+
 #: ../terminal/terminal-window.c:239
 msgid "_Go"
 msgstr "_Aliru"
@@ -1501,6 +1292,284 @@ msgstr "A_ktualigas utmp/wtmp datumojn kiam komando startiĝas"
 msgid "seconds"
 msgstr ""
 
+#~ msgid ""
+#~ "  -h, --help                          Print this help message and exit"
+#~ msgstr ""
+#~ "  -h, --help                          Eligu tiun ĉi mesaĝon kaj ĉesiĝu"
+
+#, fuzzy
+#~ msgid ""
+#~ "  -V, --version                       Print version information and exit"
+#~ msgstr ""
+#~ "  -, --version                       Eligu informaĵon pri versio kaj "
+#~ "ĉesiĝu"
+
+#~ msgid ""
+#~ "  --disable-server                    Do not register with the D-BUS\n"
+#~ "                                      session message bus"
+#~ msgstr ""
+#~ "  --disable-server                    Ne registru per D-BUSa\n"
+#~ "                                      mesaĝosesia buso"
+
+#~ msgid "  --default-display=DISPLAY           default X display to use"
+#~ msgstr ""
+#~ "  --default-display=EKRANO            defaŭlta X-a ekranbloko uzenda"
+
+#, fuzzy
+#~ msgid ""
+#~ "  --default-working-directory=DIRNAME Set the default terminal's working\n"
+#~ "                                      directory"
+#~ msgstr ""
+#~ "  --default-working-directory=DOSIERUJO Difinas la defaŭltan terminalan\n"
+#~ "                                        labordosierujon"
+
+#~ msgid ""
+#~ "  --tab                               Open a new tab in the last-"
+#~ "specified\n"
+#~ "                                      window; more than one of these\n"
+#~ "                                      options can be provided"
+#~ msgstr ""
+#~ "  --tab                               Malfermas novan langeton en la\n"
+#~ "                                      lastespecifata fenestro; opcio\n"
+#~ "                                      plurfoje uzebla"
+
+#~ msgid ""
+#~ "  --window                            Open a new window containing one "
+#~ "tab;\n"
+#~ "                                      more than one of these options can "
+#~ "be\n"
+#~ "                                      provided"
+#~ msgstr ""
+#~ "  --tab                               Malfermas novan fenestron kun unu "
+#~ "langeto\n"
+#~ "                                      tiu opcio estas plurfoje uzebla"
+
+#~ msgid ""
+#~ "  -x, --execute                       Execute the remainder of the "
+#~ "command\n"
+#~ "                                      line inside the terminal"
+#~ msgstr ""
+#~ "  -x, --execute                       Lanĉu la linioresta \n"
+#~ "                                      komando en la terminalo"
+
+#~ msgid ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+#~ msgstr ""
+#~ "  -e, --command=ĈENO                Lanĉu la argumenton por tiu opcio\n"
+#~ "                                    en la terminalo"
+
+#~ msgid ""
+#~ "  --working-directory=DIRNAME         Set the terminal's working directory"
+#~ msgstr ""
+#~ "  --working-directory=DOSIERUJO       Difinu la terminalan labordosierujon"
+
+#~ msgid "  -T, --title=TITLE                   Set the terminal's title"
+#~ msgstr "  -T, --title=TITOLO                  Difinu la terminalan titolon"
+
+#~ msgid ""
+#~ "  -H, --hold                          Do not immediately destroy the tab\n"
+#~ "                                      when the child command exits"
+#~ msgstr ""
+#~ "  -H, --hold                          Ne tuje detruu la langeton\n"
+#~ "                                      dum la filkomando ekzistas"
+
+#~ msgid ""
+#~ "  --display=DISPLAY                   X display to use for the last-\n"
+#~ "                                      specified window"
+#~ msgstr ""
+#~ "  --display=DISPLAY                   X-a ekranbloko uzenda por la lasta "
+#~ "-\n"
+#~ "                                      specifita fenestro"
+
+#~ msgid ""
+#~ "  --geometry=GEOMETRY                 X geometry specification (see \"X"
+#~ "\"\n"
+#~ "                                      man page), can be specified once "
+#~ "per\n"
+#~ "                                      window to be opened"
+#~ msgstr ""
+#~ "  --geometry=GEOMETRIO                X-a geometria specifado (vidu \"X-an"
+#~ "\"\n"
+#~ "                                      manlibrojn), unu po aktiva fenestro"
+
+#, fuzzy
+#~ msgid ""
+#~ "  --role=ROLE                         Set the role for the last-"
+#~ "specified\n"
+#~ "                                      window; applies to only one "
+#~ "window;\n"
+#~ "                                      can be specified once for each "
+#~ "window\n"
+#~ "                                      you create from the command line"
+#~ msgstr ""
+#~ "  --role=TRAJTO                         Difinas la trajto por la laste "
+#~ "specifita;\n"
+#~ "                                      fenestro; aplikebla po unu "
+#~ "fenestro;\n"
+#~ "                                      specifebla unufoje por ĉiu "
+#~ "fenestro\n"
+#~ "                                      kreita de la komandlinio"
+
+#~ msgid ""
+#~ "  --startup-id=STRING                 ID for the startup notification\n"
+#~ "                                      protocol"
+#~ msgstr ""
+#~ "  --startup-id=ĈENO                   Identignomo por la komencmesaĝila "
+#~ "protokolo"
+
+#, fuzzy
+#~ msgid ""
+#~ "  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
+#~ "                                      name or filename"
+#~ msgstr ""
+#~ "  -e, --command=ĈENO                Lanĉu la argumenton por tiu opcio\n"
+#~ "                                    en la terminalo"
+
+#, fuzzy
+#~ msgid ""
+#~ "  --fullscreen                        Set the last-specified window into\n"
+#~ "                                      fullscreen mode; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --fullscreen                        Difinu la lastspecifatan fenestron "
+#~ "kiel\n"
+#~ "                                      plenekrana; aplikebla al nur unu\n"
+#~ "                                      fenestro; specifebla unufoje po\n"
+#~ "                                      ĉiu fenestro kreita de la\n"
+#~ "                                      komandlinio."
+
+#, fuzzy
+#~ msgid ""
+#~ "  --maximize                          Maximize the last-specified "
+#~ "window;\n"
+#~ "                                      applies to only one window; can be\n"
+#~ "                                      specified once for each window you\n"
+#~ "                                      create from the command line"
+#~ msgstr ""
+#~ "  --role=TRAJTO                         Difinas la trajto por la laste "
+#~ "specifita;\n"
+#~ "                                      fenestro; aplikebla po unu "
+#~ "fenestro;\n"
+#~ "                                      specifebla unufoje por ĉiu "
+#~ "fenestro\n"
+#~ "                                      kreita de la komandlinio"
+
+#, fuzzy
+#~ msgid ""
+#~ "  --show-menubar                      Turn on the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-menubar                      Malkaŝas la menuostrion por la "
+#~ "lasta-\n"
+#~ "                                      specifata fenestro; aplikeblas nur "
+#~ "al unu\n"
+#~ "                                      fenestro; specifebla unufoje po "
+#~ "ĉiu\n"
+#~ "                                      fenestro kreita per la komandlinio\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "  --hide-menubar                      Turn off the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-menubar                      Kaŝas la menuostrion por la lasta-\n"
+#~ "                                      specifata fenestro; aplikeblas nur "
+#~ "al unu\n"
+#~ "                                      fenestro; specifebla unufoje po "
+#~ "ĉiu\n"
+#~ "                                      fenestro kreita per la komandlinio\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "  --show-borders                      Turn on the window decorations for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --show-borders                      Malkaŝas la fenestrdekoracioj por "
+#~ "la                                      specifata fenestro; aplikeblas "
+#~ "nur al unu\n"
+#~ "                                      fenestro; specifebla unufoje po "
+#~ "ĉiu\n"
+#~ "                                      fenestro kreita per la komandlinio\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "  --hide-borders                      Turn off the window decorations "
+#~ "for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --hide-borders                      Kaŝas la fenestrdekoracioj por "
+#~ "la                                      specifata fenestro; aplikeblas "
+#~ "nur al unu\n"
+#~ "                                      fenestro; specifebla unufoje po "
+#~ "ĉiu\n"
+#~ "                                      fenestro kreita per la komandlinio\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "  --show-toolbars                     Turn on the toolbars for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-toolbars                     Malkaŝas la ilarostrion por la "
+#~ "lasta-\n"
+#~ "                                      specifata fenestro; aplikeblas nur "
+#~ "al unu\n"
+#~ "                                      fenestro; specifebla unufoje po "
+#~ "ĉiu\n"
+#~ "                                      fenestro kreita per la komandlinio\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "  --hide-toolbars                     Turn off the toolbars for the "
+#~ "last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-toolbars                     Kaŝas la ilarostrion por la lasta-\n"
+#~ "                                      specifata fenestro; aplikeblas nur "
+#~ "al unu\n"
+#~ "                                      fenestro; specifebla unufoje po "
+#~ "ĉiu\n"
+#~ "                                      fenestro kreita per la komandlinio\n"
+
+#~ msgid "Unable to launch terminal: %s\n"
+#~ msgstr "Ne eblas lanĉi terminalon: %s\n"
+
+#~ msgid ""
+#~ "Option \"--sm-client-id\" requires specifying the session id as its "
+#~ "parameter"
+#~ msgstr ""
+#~ "Opcio \"--sm-client-id\" necesas seancidentigilon kiel ĝia parametro"
+
 #~ msgid "<b>Title:</b>"
 #~ msgstr "<b>Titolo:</b>"
 
diff --git a/po/es.po b/po/es.po
index a82b1e1..84b0980 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Terminal 0.2.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 11:48+0100\n"
+"POT-Creation-Date: 2009-12-14 16:03+0100\n"
 "PO-Revision-Date: 2009-08-21 03:12-0300\n"
 "Last-Translator: elega <elega at elega.com.ar>\n"
 "Language-Team: Spanish/ES <xfce-i18n at xfce.org>\n"
@@ -16,316 +16,88 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../terminal/main.c:46
+#: ../terminal/main.c:48
 msgid "Usage:"
 msgstr "Uso:"
 
-#: ../terminal/main.c:47
+#: ../terminal/main.c:48
 msgid "OPTION"
 msgstr "OPCIÓN"
 
-#: ../terminal/main.c:49
+#: ../terminal/main.c:53
 msgid "General Options"
 msgstr "Opciones generales"
 
-#: ../terminal/main.c:50
-msgid "  -h, --help                          Print this help message and exit"
-msgstr "  -h, --help                          Mostrar esta ayuda y salir"
-
-#: ../terminal/main.c:51
-msgid ""
-"  -V, --version                       Print version information and exit"
-msgstr "  -v, --version                       Mostrar la versión y salir"
-
-#: ../terminal/main.c:52
-msgid ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
-msgstr ""
-"  --disable-server                    No registrarse en el bus de\n"
-"                                      mensajes de sesión D-BUS"
-
-#: ../terminal/main.c:54
-msgid "  --default-display=DISPLAY           default X display to use"
-msgstr "  --default-display=DISPLAY           display X predeterminado"
+#. parameter of --default-display
+#. parameter of --display
+#: ../terminal/main.c:55 ../terminal/main.c:81
+#, fuzzy
+msgid "display"
+msgstr "No se muestra"
 
-#: ../terminal/main.c:55
-msgid ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
+#. parameter of --default-working-directory
+#. parameter of --working-directory
+#: ../terminal/main.c:57 ../terminal/main.c:72
+msgid "directory"
 msgstr ""
-"  --default-working-directory=DIR     Establece el directorio de trabajo "
-"por\n"
-"                                      defecto del terminal"
 
-#: ../terminal/main.c:58
+#: ../terminal/main.c:61
 msgid "Window or Tab Separators"
 msgstr "Ventanas o pestañas separadas"
 
-#: ../terminal/main.c:59
-msgid ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-msgstr ""
-"  --tab                               Abre una nueva pestaña en la última\n"
-"                                      ventana especificada; se pueden usar\n"
-"                                      más de una de estas opciones"
-
-#: ../terminal/main.c:62
-msgid ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-msgstr ""
-"  --window                            Abre una ventana conteniendo una "
-"pestaña;\n"
-"                                      Se puede proporcionar más de una de "
-"estas\n"
-"                                      opciones"
-
 #: ../terminal/main.c:66
 msgid "Tab Options"
 msgstr "Opciones de la pestaña"
 
-#: ../terminal/main.c:67
-msgid ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-msgstr ""
-"  -x, --execute                       Ejecutar lo que queda de la línea de "
-"comandos\n"
-"                                      en el terminal"
-
-#: ../terminal/main.c:69
-msgid ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-msgstr ""
-"  -e, --command=CADENA                Ejecutar el argumento de esta opción\n"
-"                                      dentro del terminal"
-
-#: ../terminal/main.c:71
-msgid ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
-msgstr ""
-"  --working-directory=DIR             Establecer el directorio de trabajo "
-"del terminal"
-
-#: ../terminal/main.c:72
-msgid "  -T, --title=TITLE                   Set the terminal's title"
-msgstr ""
-"  -T, --title=TITLE                   Establecer el título del terminal"
+#. parameter of --command
+#: ../terminal/main.c:68
+#, fuzzy
+msgid "command"
+msgstr "Comando"
 
-#: ../terminal/main.c:73
-msgid ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-msgstr ""
-"  -H, --hold                          No destruir inmediatamente la pestaña\n"
-"                                      cuando el comando hijo termina"
+#. parameter of --title
+#: ../terminal/main.c:70
+#, fuzzy
+msgid "title"
+msgstr "Título"
 
-#: ../terminal/main.c:76
+#: ../terminal/main.c:79
 msgid "Window Options"
 msgstr "Opciones de la ventana"
 
-#: ../terminal/main.c:77
-msgid ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
+#. parameter of --geometry
+#: ../terminal/main.c:83
+msgid "geometry"
 msgstr ""
-"  --display=DISPLAY                   Display X a usar para la última\n"
-"                                      ventana especificada"
 
-#: ../terminal/main.c:79
-msgid ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
-msgstr ""
-"  --geometry=GEOMETRY                 especificación de la geometría X (ver "
-"la\n"
-"                                      página de manual de \"X\"), que puede "
-"ser\n"
-"                                      especificada una vez por cada ventana "
-"a\n"
-"                                      abrirse"
-
-#: ../terminal/main.c:82
-msgid ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
+#. parameter of --role
+#: ../terminal/main.c:85
+msgid "role"
 msgstr ""
-"  --role=ROL                          Establecer el rol para la última "
-"ventana\n"
-"                                      especificada; se aplica solamente a "
-"una\n"
-"                                      ventana; puede ser especificada una "
-"vez\n"
-"                                      por cada ventana que crea en la línea "
-"de\n"
-"                                      comandos"
-
-#: ../terminal/main.c:86
-msgid ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
-msgstr ""
-"  --startup-id=CADENA                 ID para el protocolo de\n"
-"                                      notificación de arranque"
 
-#: ../terminal/main.c:88
-msgid ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
-msgstr ""
-"  -I, --icon=ICON                     Establece el ícono de la terminal como "
-"un\n"
-"                                      nombre de ícono o un nombre de archivo"
+#. parameter of --startup-id
+#: ../terminal/main.c:87
+#, fuzzy
+msgid "string"
+msgstr "Atención"
 
-#: ../terminal/main.c:90
-msgid ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --fullscreen                        Coloca la última ventana especificada\n"
-"                                      a pantalla completa; se aplica sólo a "
-"una\n"
-"                                      ventana; puede especificarse una vez "
-"por\n"
-"                                      cada ventana que cree desde la línea "
-"de\n"
-"                                      comandos."
-
-#: ../terminal/main.c:95
-msgid ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
-msgstr ""
-"  --maximize                          Maximiza la última ventana "
-"especificada,\n"
-"                                      se aplica a una sóla ventana, se "
-"puede\n"
-"                                      especificar una vez por cada ventana, "
-"se\n"
-"                                      crea desde la línea de comando"
-
-#: ../terminal/main.c:99
-msgid ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-menubar                      Muestra la barra de menú para la "
-"última\n"
-"                                      ventana especificada; se aplica a sólo "
-"una\n"
-"                                      ventana; puede ser especificada una "
-"vez por cada\n"
-"                                      ventana creada desde la línea de "
-"comandos"
-
-#: ../terminal/main.c:104
-msgid ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --hide-menubar                      Oculta la barra de menú para la "
-"última\n"
-"                                      ventana especificada; sólo aplicable a "
-"una\n"
-"                                      ventana; puede ser especificada para "
-"cada\n"
-"                                      ventana que cree desde la línea de "
-"comandos"
-
-#: ../terminal/main.c:109
-msgid ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --show-borders                      Muestra las decoraciones de ventana "
-"para\n"
-"                                      la última ventana especificada; "
-"aplicable sólo\n"
-"                                      a una ventana; puede ser especificada "
-"una vez\n"
-"                                      para cada ventana que crea desde la "
-"línea\n"
-"                                      de comandos"
-
-#: ../terminal/main.c:114
-msgid ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --hide-borders                      Oculta las decoraciones de la ventana "
-"para\n"
-"                                      las última ventana especificada; "
-"aplicable\n"
-"                                      a solamente una ventana; puede "
-"especificarse una\n"
-"                                      vez por cada ventana que cree desde la "
-"línea de\n"
-"                                      comandos"
-
-#: ../terminal/main.c:119
-msgid ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-toolbars                     Muestra las barras de tareas para la "
-"última ventana\n"
-"                                      especificada; aplicable a solamente "
-"una ventana;\n"
-"                                      puede especificarse una vez por cada "
-"ventana que\n"
-"                                      cree desde la línea de comandos"
-
-#: ../terminal/main.c:124
-msgid ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#. parameter of --icon
+#: ../terminal/main.c:89
+#, fuzzy
+msgid "icon"
+msgstr "Acción"
+
+#: ../terminal/main.c:91
+#, c-format
+msgid "See the %s man page for full explanation of the options above."
 msgstr ""
-"  --hide-toolbars                     Oculta las barras de herramientas "
-"para\n"
-"                                      la última ventana especificada; "
-"aplicable a solamente\n"
-"                                      una ventana; puede especificarse una "
-"vez por cada\n"
-"                                      ventana que cree desde la línea de "
-"comandos"
-
-#: ../terminal/main.c:151 ../terminal/terminal-preferences.c:1263
+
+#: ../terminal/main.c:118 ../terminal/terminal-preferences.c:1263
 #: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../terminal/main.c:173
+#: ../terminal/main.c:135
 #, c-format
 msgid ""
 "%s (Xfce %s)\n"
@@ -350,31 +122,26 @@ msgstr ""
 "\n"
 "Por favor, envíe los informes de error a <%s>.\n"
 
-#: ../terminal/main.c:267
+#: ../terminal/main.c:239
 #, c-format
 msgid "Unable to register terminal service: %s\n"
 msgstr "Imposible registrar el servicio del terminal: %s\n"
 
-#: ../terminal/main.c:276
-#, c-format
-msgid "Unable to launch terminal: %s\n"
-msgstr "Imposible iniciar terminal: %s\n"
-
-#: ../terminal/terminal-app.c:551
+#: ../terminal/terminal-app.c:554
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "Cadena de geometría no válida \"%s\"\n"
 
-#: ../terminal/terminal-dbus.c:114
+#: ../terminal/terminal-dbus.c:108
 msgid "User id mismatch"
 msgstr "No coincide el id de usuario"
 
-#: ../terminal/terminal-dbus.c:146
+#: ../terminal/terminal-dbus.c:134
 #, c-format
 msgid "D-BUS message bus disconnected, exiting...\n"
 msgstr "Bus de mensajes D-BUS desconectado. Finalizando...\n"
 
-#: ../terminal/terminal-dbus.c:208
+#: ../terminal/terminal-dbus.c:196
 #, c-format
 msgid "Unable to register object %s"
 msgstr "Imposible registrar objeto %s"
@@ -399,7 +166,7 @@ msgstr "Visite el sitio web de Terminal"
 msgid "Failed to open the documentation browser"
 msgstr "Fallo al abrir el visor de documentación"
 
-#: ../terminal/terminal-options.c:189
+#: ../terminal/terminal-options.c:206
 #, c-format
 msgid ""
 "Option \"--default-display\" requires specifying the default X display as "
@@ -408,7 +175,7 @@ msgstr ""
 "La opción  \"--default-display\" requiere que se especifique el display X "
 "predeterminado como parámetro"
 
-#: ../terminal/terminal-options.c:204
+#: ../terminal/terminal-options.c:221
 #, c-format
 msgid ""
 "Option \"--default-working-directory\" requires specifying the default "
@@ -417,15 +184,7 @@ msgstr ""
 "La opción \"--default-working-directory\" requiere que se especifique el "
 "directorio de trabajo predeterminado como parámetro"
 
-#: ../terminal/terminal-options.c:235
-#, c-format
-msgid ""
-"Option \"--sm-client-id\" requires specifying the session id as its parameter"
-msgstr ""
-"La opción \"--sm-client-id\" requiere que se especifique el identificador de "
-"sesión como su parámetro"
-
-#: ../terminal/terminal-options.c:250
+#: ../terminal/terminal-options.c:237
 #, c-format
 msgid ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
@@ -434,7 +193,7 @@ msgstr ""
 "La opción \"--execute/-x\" requiere que se especifique el comando a ejecutar "
 "en el resto de la línea de comandos"
 
-#: ../terminal/terminal-options.c:267
+#: ../terminal/terminal-options.c:254
 #, c-format
 msgid ""
 "Option \"--command/-e\" requires specifying the command to run as its "
@@ -443,7 +202,7 @@ msgstr ""
 "La opción \"--command/-e\" requiere que se especifique el comando a ejecutar "
 "como su parámetro"
 
-#: ../terminal/terminal-options.c:284
+#: ../terminal/terminal-options.c:271
 #, c-format
 msgid ""
 "Option \"--working-directory\" requires specifying the working directory as "
@@ -452,14 +211,14 @@ msgstr ""
 "La opción \"--working-directory\" requiere que se especifique el directorio "
 "de trabajo como su parámetro"
 
-#: ../terminal/terminal-options.c:299
+#: ../terminal/terminal-options.c:286
 #, c-format
 msgid "Option \"--title/-T\" requires specifying the title as its parameter"
 msgstr ""
 "La opción \"--title/-T\" requiere que se especifique el título como su "
 "parámetro"
 
-#: ../terminal/terminal-options.c:319
+#: ../terminal/terminal-options.c:305
 #, c-format
 msgid ""
 "Option \"--display\" requires specifying the X display as its parameters"
@@ -467,7 +226,7 @@ msgstr ""
 "La opción \"--display\" requiere que se especifique el display X como uno de "
 "sus parámetros"
 
-#: ../terminal/terminal-options.c:334
+#: ../terminal/terminal-options.c:320
 #, c-format
 msgid ""
 "Option \"--geometry\" requires specifying the window geometry as its "
@@ -476,14 +235,14 @@ msgstr ""
 "La opción \"--geometry\" requiere que se especifique la geometría de la "
 "ventana como su parámetro"
 
-#: ../terminal/terminal-options.c:349
+#: ../terminal/terminal-options.c:335
 #, c-format
 msgid "Option \"--role\" requires specifying the window role as its parameter"
 msgstr ""
 "La opción \"--role\" requiere que se especifique el rol de la ventana como "
 "su parámetro"
 
-#: ../terminal/terminal-options.c:364
+#: ../terminal/terminal-options.c:350
 #, c-format
 msgid ""
 "Option \"--startup-id\" requires specifying the startup id as its parameter"
@@ -491,7 +250,7 @@ msgstr ""
 "La opción \"--startup-id\" requiere que se especifique el ID de arranque "
 "como su parámetro"
 
-#: ../terminal/terminal-options.c:379
+#: ../terminal/terminal-options.c:365
 #, c-format
 msgid ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
@@ -500,7 +259,7 @@ msgstr ""
 "La opción\"--icon/-I\" requiere que se especifique un nombre de ícono o un "
 "nombre de archivo como parámetro"
 
-#: ../terminal/terminal-options.c:435
+#: ../terminal/terminal-options.c:419
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Opción desconocida \"%s\""
@@ -569,7 +328,7 @@ msgstr "Pantalla completa"
 msgid "Set Title"
 msgstr "Establecer título"
 
-#: ../terminal/terminal-preferences.c:464
+#: ../terminal/terminal-preferences.c:464 ../terminal/terminal-window.c:237
 msgid "Reset"
 msgstr "Reiniciar"
 
@@ -868,6 +627,11 @@ msgstr "_Resetear"
 msgid "Reset and C_lear"
 msgstr "Reiniciar y _limpiar"
 
+#: ../terminal/terminal-window.c:238
+#, fuzzy
+msgid "Reset and clear"
+msgstr "Reiniciar y borrar"
+
 #: ../terminal/terminal-window.c:239
 msgid "_Go"
 msgstr "_Ir"
@@ -1503,6 +1267,300 @@ msgstr "_Actualizar registros de utmp/wtmp cuando se ejecuta un comando"
 msgid "seconds"
 msgstr "segundos"
 
+#~ msgid ""
+#~ "  -h, --help                          Print this help message and exit"
+#~ msgstr "  -h, --help                          Mostrar esta ayuda y salir"
+
+#~ msgid ""
+#~ "  -V, --version                       Print version information and exit"
+#~ msgstr "  -v, --version                       Mostrar la versión y salir"
+
+#~ msgid ""
+#~ "  --disable-server                    Do not register with the D-BUS\n"
+#~ "                                      session message bus"
+#~ msgstr ""
+#~ "  --disable-server                    No registrarse en el bus de\n"
+#~ "                                      mensajes de sesión D-BUS"
+
+#~ msgid "  --default-display=DISPLAY           default X display to use"
+#~ msgstr "  --default-display=DISPLAY           display X predeterminado"
+
+#~ msgid ""
+#~ "  --default-working-directory=DIRNAME Set the default terminal's working\n"
+#~ "                                      directory"
+#~ msgstr ""
+#~ "  --default-working-directory=DIR     Establece el directorio de trabajo "
+#~ "por\n"
+#~ "                                      defecto del terminal"
+
+#~ msgid ""
+#~ "  --tab                               Open a new tab in the last-"
+#~ "specified\n"
+#~ "                                      window; more than one of these\n"
+#~ "                                      options can be provided"
+#~ msgstr ""
+#~ "  --tab                               Abre una nueva pestaña en la "
+#~ "última\n"
+#~ "                                      ventana especificada; se pueden "
+#~ "usar\n"
+#~ "                                      más de una de estas opciones"
+
+#~ msgid ""
+#~ "  --window                            Open a new window containing one "
+#~ "tab;\n"
+#~ "                                      more than one of these options can "
+#~ "be\n"
+#~ "                                      provided"
+#~ msgstr ""
+#~ "  --window                            Abre una ventana conteniendo una "
+#~ "pestaña;\n"
+#~ "                                      Se puede proporcionar más de una de "
+#~ "estas\n"
+#~ "                                      opciones"
+
+#~ msgid ""
+#~ "  -x, --execute                       Execute the remainder of the "
+#~ "command\n"
+#~ "                                      line inside the terminal"
+#~ msgstr ""
+#~ "  -x, --execute                       Ejecutar lo que queda de la línea "
+#~ "de comandos\n"
+#~ "                                      en el terminal"
+
+#~ msgid ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+#~ msgstr ""
+#~ "  -e, --command=CADENA                Ejecutar el argumento de esta "
+#~ "opción\n"
+#~ "                                      dentro del terminal"
+
+#~ msgid ""
+#~ "  --working-directory=DIRNAME         Set the terminal's working directory"
+#~ msgstr ""
+#~ "  --working-directory=DIR             Establecer el directorio de trabajo "
+#~ "del terminal"
+
+#~ msgid "  -T, --title=TITLE                   Set the terminal's title"
+#~ msgstr ""
+#~ "  -T, --title=TITLE                   Establecer el título del terminal"
+
+#~ msgid ""
+#~ "  -H, --hold                          Do not immediately destroy the tab\n"
+#~ "                                      when the child command exits"
+#~ msgstr ""
+#~ "  -H, --hold                          No destruir inmediatamente la "
+#~ "pestaña\n"
+#~ "                                      cuando el comando hijo termina"
+
+#~ msgid ""
+#~ "  --display=DISPLAY                   X display to use for the last-\n"
+#~ "                                      specified window"
+#~ msgstr ""
+#~ "  --display=DISPLAY                   Display X a usar para la última\n"
+#~ "                                      ventana especificada"
+
+#~ msgid ""
+#~ "  --geometry=GEOMETRY                 X geometry specification (see \"X"
+#~ "\"\n"
+#~ "                                      man page), can be specified once "
+#~ "per\n"
+#~ "                                      window to be opened"
+#~ msgstr ""
+#~ "  --geometry=GEOMETRY                 especificación de la geometría X "
+#~ "(ver la\n"
+#~ "                                      página de manual de \"X\"), que "
+#~ "puede ser\n"
+#~ "                                      especificada una vez por cada "
+#~ "ventana a\n"
+#~ "                                      abrirse"
+
+#~ msgid ""
+#~ "  --role=ROLE                         Set the role for the last-"
+#~ "specified\n"
+#~ "                                      window; applies to only one "
+#~ "window;\n"
+#~ "                                      can be specified once for each "
+#~ "window\n"
+#~ "                                      you create from the command line"
+#~ msgstr ""
+#~ "  --role=ROL                          Establecer el rol para la última "
+#~ "ventana\n"
+#~ "                                      especificada; se aplica solamente a "
+#~ "una\n"
+#~ "                                      ventana; puede ser especificada una "
+#~ "vez\n"
+#~ "                                      por cada ventana que crea en la "
+#~ "línea de\n"
+#~ "                                      comandos"
+
+#~ msgid ""
+#~ "  --startup-id=STRING                 ID for the startup notification\n"
+#~ "                                      protocol"
+#~ msgstr ""
+#~ "  --startup-id=CADENA                 ID para el protocolo de\n"
+#~ "                                      notificación de arranque"
+
+#~ msgid ""
+#~ "  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
+#~ "                                      name or filename"
+#~ msgstr ""
+#~ "  -I, --icon=ICON                     Establece el ícono de la terminal "
+#~ "como un\n"
+#~ "                                      nombre de ícono o un nombre de "
+#~ "archivo"
+
+#~ msgid ""
+#~ "  --fullscreen                        Set the last-specified window into\n"
+#~ "                                      fullscreen mode; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --fullscreen                        Coloca la última ventana "
+#~ "especificada\n"
+#~ "                                      a pantalla completa; se aplica sólo "
+#~ "a una\n"
+#~ "                                      ventana; puede especificarse una "
+#~ "vez por\n"
+#~ "                                      cada ventana que cree desde la "
+#~ "línea de\n"
+#~ "                                      comandos."
+
+#~ msgid ""
+#~ "  --maximize                          Maximize the last-specified "
+#~ "window;\n"
+#~ "                                      applies to only one window; can be\n"
+#~ "                                      specified once for each window you\n"
+#~ "                                      create from the command line"
+#~ msgstr ""
+#~ "  --maximize                          Maximiza la última ventana "
+#~ "especificada,\n"
+#~ "                                      se aplica a una sóla ventana, se "
+#~ "puede\n"
+#~ "                                      especificar una vez por cada "
+#~ "ventana, se\n"
+#~ "                                      crea desde la línea de comando"
+
+#~ msgid ""
+#~ "  --show-menubar                      Turn on the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-menubar                      Muestra la barra de menú para la "
+#~ "última\n"
+#~ "                                      ventana especificada; se aplica a "
+#~ "sólo una\n"
+#~ "                                      ventana; puede ser especificada una "
+#~ "vez por cada\n"
+#~ "                                      ventana creada desde la línea de "
+#~ "comandos"
+
+#~ msgid ""
+#~ "  --hide-menubar                      Turn off the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-menubar                      Oculta la barra de menú para la "
+#~ "última\n"
+#~ "                                      ventana especificada; sólo "
+#~ "aplicable a una\n"
+#~ "                                      ventana; puede ser especificada "
+#~ "para cada\n"
+#~ "                                      ventana que cree desde la línea de "
+#~ "comandos"
+
+#~ msgid ""
+#~ "  --show-borders                      Turn on the window decorations for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --show-borders                      Muestra las decoraciones de ventana "
+#~ "para\n"
+#~ "                                      la última ventana especificada; "
+#~ "aplicable sólo\n"
+#~ "                                      a una ventana; puede ser "
+#~ "especificada una vez\n"
+#~ "                                      para cada ventana que crea desde la "
+#~ "línea\n"
+#~ "                                      de comandos"
+
+#~ msgid ""
+#~ "  --hide-borders                      Turn off the window decorations "
+#~ "for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --hide-borders                      Oculta las decoraciones de la "
+#~ "ventana para\n"
+#~ "                                      las última ventana especificada; "
+#~ "aplicable\n"
+#~ "                                      a solamente una ventana; puede "
+#~ "especificarse una\n"
+#~ "                                      vez por cada ventana que cree desde "
+#~ "la línea de\n"
+#~ "                                      comandos"
+
+#~ msgid ""
+#~ "  --show-toolbars                     Turn on the toolbars for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-toolbars                     Muestra las barras de tareas para "
+#~ "la última ventana\n"
+#~ "                                      especificada; aplicable a solamente "
+#~ "una ventana;\n"
+#~ "                                      puede especificarse una vez por "
+#~ "cada ventana que\n"
+#~ "                                      cree desde la línea de comandos"
+
+#~ msgid ""
+#~ "  --hide-toolbars                     Turn off the toolbars for the "
+#~ "last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-toolbars                     Oculta las barras de herramientas "
+#~ "para\n"
+#~ "                                      la última ventana especificada; "
+#~ "aplicable a solamente\n"
+#~ "                                      una ventana; puede especificarse "
+#~ "una vez por cada\n"
+#~ "                                      ventana que cree desde la línea de "
+#~ "comandos"
+
+#~ msgid "Unable to launch terminal: %s\n"
+#~ msgstr "Imposible iniciar terminal: %s\n"
+
+#~ msgid ""
+#~ "Option \"--sm-client-id\" requires specifying the session id as its "
+#~ "parameter"
+#~ msgstr ""
+#~ "La opción \"--sm-client-id\" requiere que se especifique el identificador "
+#~ "de sesión como su parámetro"
+
 #~ msgid "<b>Title:</b>"
 #~ msgstr "<b>Título:</b>"
 
diff --git a/po/et.po b/po/et.po
index 9b572b9..8721096 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Terminal 0.2.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 11:48+0100\n"
+"POT-Creation-Date: 2009-12-14 16:03+0100\n"
 "PO-Revision-Date: 2008-10-01 07:10-0700\n"
 "Last-Translator: Kristjan Siimson <epost at ksiimson.se>\n"
 "Language-Team: Estonian <et at li.org>\n"
@@ -17,281 +17,90 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Narro 0.9.2 on http://tolge.pingviin.org\n"
 
-#: ../terminal/main.c:46
+#: ../terminal/main.c:48
 msgid "Usage:"
 msgstr ""
 
-#: ../terminal/main.c:47
+#: ../terminal/main.c:48
 msgid "OPTION"
 msgstr ""
 
-#: ../terminal/main.c:49
+#: ../terminal/main.c:53
 #, fuzzy
 msgid "General Options"
 msgstr "Üldine"
 
-#: ../terminal/main.c:50
-msgid "  -h, --help                          Print this help message and exit"
-msgstr "  -h, --help                          Trükkida see abiteade ja väljuda"
-
-#: ../terminal/main.c:51
+#. parameter of --default-display
+#. parameter of --display
+#: ../terminal/main.c:55 ../terminal/main.c:81
 #, fuzzy
-msgid ""
-"  -V, --version                       Print version information and exit"
-msgstr ""
-"  -v, --version                       Trükkida versiooniteave ja väljuda"
-
-#: ../terminal/main.c:52
-msgid ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
-msgstr ""
-"  --disable-server                    Mitte registreerida D-BUS\n"
-"                                      seansisõnumite edastajaga"
-
-#: ../terminal/main.c:54
-msgid "  --default-display=DISPLAY           default X display to use"
-msgstr "  --default-display=EKRAAN           vaikimisi kasutatav „X”-i ekraan"
+msgid "display"
+msgstr "Ei kuvata"
 
-#: ../terminal/main.c:55
-msgid ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
+#. parameter of --default-working-directory
+#. parameter of --working-directory
+#: ../terminal/main.c:57 ../terminal/main.c:72
+msgid "directory"
 msgstr ""
-"  --default-working-directory=KATALOOGINIMI Määrata terminalile vaikimisi\n"
-"                                      töökataloog"
 
-#: ../terminal/main.c:58
+#: ../terminal/main.c:61
 msgid "Window or Tab Separators"
 msgstr ""
 
-#: ../terminal/main.c:59
-msgid ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-msgstr ""
-"  --tab                               Viimati täpsustatud aknas avada uus\n"
-"                                      kaart; seda valikut saab\n"
-"                                      kasutada mitu korda"
-
-#: ../terminal/main.c:62
-msgid ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-msgstr ""
-"  --window                            Avada uus aken koos ühe kaardiga;\n"
-"                                      seda valikut saab kasutada mitu\n"
-"                                      korda"
-
 #: ../terminal/main.c:66
 msgid "Tab Options"
 msgstr ""
 
-#: ../terminal/main.c:67
-msgid ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-msgstr ""
-"  -x, --execute                       Ülejäänud käsk käivitatakse\n"
-"                                      terminalis"
-
-#: ../terminal/main.c:69
-msgid ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-msgstr ""
-"  -e, --command=SÕNE                  Selle valiku argument käivitatakse\n"
-"                                      terminalis"
-
-#: ../terminal/main.c:71
-msgid ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
-msgstr "  --working-directory=KAUSTANIMI      Määrata terminalile töökataloog"
-
-#: ../terminal/main.c:72
-msgid "  -T, --title=TITLE                   Set the terminal's title"
-msgstr "  -T, --title=PEALKIRI                Määrata terminalile pealkiri"
-
-#: ../terminal/main.c:73
-msgid ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-msgstr ""
-"  -H, --hold                          Kaarti ei hävitata kohe, kui\n"
-"                                      alamkäsk väljub"
-
-#: ../terminal/main.c:76
+#. parameter of --command
+#: ../terminal/main.c:68
 #, fuzzy
-msgid "Window Options"
-msgstr "Tundmatu valik „%s”"
+msgid "command"
+msgstr "<b>Käsk</b>"
 
-#: ../terminal/main.c:77
-msgid ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
-msgstr ""
-"  --display=EKRAAN                    Viimasena täpsustatud akna jaoks\n"
-"                                      kasutatav X-i ekraan."
+#. parameter of --title
+#: ../terminal/main.c:70
+#, fuzzy
+msgid "title"
+msgstr "Paanitud"
 
 #: ../terminal/main.c:79
-msgid ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
-msgstr ""
-"  --geometry=GEOMEETRIA               X-i geomeetria täpsustus (vt. X-i\n"
-"                                      käsiraamatut), võimalik korra\n"
-"                                      täpsustada igale avatavale\n"
-"                                      aknale."
-
-#: ../terminal/main.c:82
 #, fuzzy
-msgid ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
-msgstr ""
-"  -role=ROLL                          Määrata roll viimati täpsustatud\n"
-"                                      aknale; kehtib ainult ühes aknas;\n"
-"                                      võimalik korra täpsustada igale\n"
-"                                      käsurealt loodavale aknale"
+msgid "Window Options"
+msgstr "Tundmatu valik „%s”"
 
-#: ../terminal/main.c:86
-msgid ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
+#. parameter of --geometry
+#: ../terminal/main.c:83
+msgid "geometry"
 msgstr ""
-"  --startup-id=SÕNE                   TUNNUS käivitusteatise\n"
-"                                      protokollile"
 
-#: ../terminal/main.c:88
-#, fuzzy
-msgid ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
+#. parameter of --role
+#: ../terminal/main.c:85
+msgid "role"
 msgstr ""
-"  -e, --command=SÕNE                  Selle valiku argument käivitatakse\n"
-"                                      terminalis"
 
-#: ../terminal/main.c:90
+#. parameter of --startup-id
+#: ../terminal/main.c:87
 #, fuzzy
-msgid ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --fullscreen                        Viimati täpsustatud aken määrata\n"
-"                                      üleekraanirežiimi; mõjub\n"
-"                                      korraga ainult ühele aknale;\n"
-"                                      võimalik korra määrata igale\n"
-"                                      käsurealt loodavale aknale."
+msgid "string"
+msgstr "Hoiatus"
 
-#: ../terminal/main.c:95
+#. parameter of --icon
+#: ../terminal/main.c:89
 #, fuzzy
-msgid ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
-msgstr ""
-"  -role=ROLL                          Määrata roll viimati täpsustatud\n"
-"                                      aknale; kehtib ainult ühes aknas;\n"
-"                                      võimalik korra täpsustada igale\n"
-"                                      käsurealt loodavale aknale"
-
-#: ../terminal/main.c:99
-msgid ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-menubar                      Viimati täpsustatud aknas lülitada\n"
-"                                      menüüriba sisse; kehtib ainult ühes\n"
-"                                      aknas; võimalik korra\n"
-"                                      täpsustada igale käsurealt loodavale\n"
-"                                      aknale"
-
-#: ../terminal/main.c:104
-msgid ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --hide-menubar                      Viimati täpsustatud aknas lülitada\n"
-"                                      menüüriba välja; kehtib ainult\n"
-"                                      ühes aknas; võimalik korra\n"
-"                                      täpsustada igale käsurealt\n"
-"                                      loodavale aknale"
-
-#: ../terminal/main.c:109
-msgid ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --show-borders                      Viimati täpsustatud aknas lülitada\n"
-"                                      aknadekoratsioonid sisse; kehtib\n"
-"                                      ainult ühes aknas; võimalik korra\n"
-"                                      täpsustada igale käsurealt\n"
-"                                      loodavale aknale"
-
-#: ../terminal/main.c:114
-msgid ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --hide-borders                      Viimati täpsustatud aknas lülitada\n"
-"                                      aknadekoratsioonid välja; kehtib\n"
-"                                      ainult ühes aknas; võimalik korra\n"
-"                                      täpsustada igale käsurealt\n"
-"                                      loodavale aknale"
-
-#: ../terminal/main.c:119
-msgid ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-toolbars                     Viimati täpsustatud aknas lülitada\n"
-"                                      tööriistariba sisse; kehtib ainult\n"
-"                                      ühes aknas; võimalik korra määrata\n"
-"                                      igale käsurealt loodavale aknale"
+msgid "icon"
+msgstr "Tegevus"
 
-#: ../terminal/main.c:124
-msgid ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#: ../terminal/main.c:91
+#, c-format
+msgid "See the %s man page for full explanation of the options above."
 msgstr ""
-"  --hide-toolbars                     Viimati täpsustatud aknas lülitada\n"
-"                                      tööriistariba välja; kehtib ainult\n"
-"                                      ühes aknas; võimalik korra määrata\n"
-"                                      igale käsurealt loodavale aknale"
 
-#: ../terminal/main.c:151 ../terminal/terminal-preferences.c:1263
+#: ../terminal/main.c:118 ../terminal/terminal-preferences.c:1263
 #: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../terminal/main.c:173
+#: ../terminal/main.c:135
 #, c-format
 msgid ""
 "%s (Xfce %s)\n"
@@ -316,31 +125,26 @@ msgstr ""
 "\n"
 "Palun teavitage vigadest <%s>.\n"
 
-#: ../terminal/main.c:267
+#: ../terminal/main.c:239
 #, c-format
 msgid "Unable to register terminal service: %s\n"
 msgstr "Terminaliteenust ei saanud registreerida: %s\n"
 
-#: ../terminal/main.c:276
-#, c-format
-msgid "Unable to launch terminal: %s\n"
-msgstr "Terminali ei saanud käivitada: %s\n"
-
-#: ../terminal/terminal-app.c:551
+#: ../terminal/terminal-app.c:554
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "Vigane geomeetria sõne „%s”\n"
 
-#: ../terminal/terminal-dbus.c:114
+#: ../terminal/terminal-dbus.c:108
 msgid "User id mismatch"
 msgstr "Kasutajatunnus ei kattu"
 
-#: ../terminal/terminal-dbus.c:146
+#: ../terminal/terminal-dbus.c:134
 #, c-format
 msgid "D-BUS message bus disconnected, exiting...\n"
 msgstr "D-BUS sõnumisiini ühendus katkestatud, väljutakse...\n"
 
-#: ../terminal/terminal-dbus.c:208
+#: ../terminal/terminal-dbus.c:196
 #, c-format
 msgid "Unable to register object %s"
 msgstr "Ei saanud registreerida objekti „%s”"
@@ -362,7 +166,7 @@ msgstr ""
 msgid "Failed to open the documentation browser"
 msgstr "Dokumentatsioonibrauseri avamine ebaõnnestus"
 
-#: ../terminal/terminal-options.c:189
+#: ../terminal/terminal-options.c:206
 #, c-format
 msgid ""
 "Option \"--default-display\" requires specifying the default X display as "
@@ -371,7 +175,7 @@ msgstr ""
 "Valik „--default-display” vajab parameetrina määratletud vaikimisi X-i "
 "ekraani"
 
-#: ../terminal/terminal-options.c:204
+#: ../terminal/terminal-options.c:221
 #, c-format
 msgid ""
 "Option \"--default-working-directory\" requires specifying the default "
@@ -380,13 +184,7 @@ msgstr ""
 "Valik „--default-working-directory” vajab parameetrina määratletud vaikimisi "
 "töökataloogi"
 
-#: ../terminal/terminal-options.c:235
-#, c-format
-msgid ""
-"Option \"--sm-client-id\" requires specifying the session id as its parameter"
-msgstr "Valik „--sm-client-id” vajab parameetrina session-id määratlemist"
-
-#: ../terminal/terminal-options.c:250
+#: ../terminal/terminal-options.c:237
 #, c-format
 msgid ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
@@ -394,14 +192,14 @@ msgid ""
 msgstr ""
 "Valik „--execute/-x” vajab ülejäänud käsureal käivitamiseks määratletud käsku"
 
-#: ../terminal/terminal-options.c:267
+#: ../terminal/terminal-options.c:254
 #, c-format
 msgid ""
 "Option \"--command/-e\" requires specifying the command to run as its "
 "parameter"
 msgstr "Valik  „--command/-e” vajab parameetrina käivitatavat käsku"
 
-#: ../terminal/terminal-options.c:284
+#: ../terminal/terminal-options.c:271
 #, c-format
 msgid ""
 "Option \"--working-directory\" requires specifying the working directory as "
@@ -409,43 +207,43 @@ msgid ""
 msgstr ""
 "Valik „--working-directory” vajab parameetrina määratletud töökataloogi"
 
-#: ../terminal/terminal-options.c:299
+#: ../terminal/terminal-options.c:286
 #, c-format
 msgid "Option \"--title/-T\" requires specifying the title as its parameter"
 msgstr "Valik Option „--title/-T” vajab parameetrina määratletud pealkirja"
 
-#: ../terminal/terminal-options.c:319
+#: ../terminal/terminal-options.c:305
 #, c-format
 msgid ""
 "Option \"--display\" requires specifying the X display as its parameters"
 msgstr "Valik „--display” vajab parameetritena määratud X ekraani"
 
-#: ../terminal/terminal-options.c:334
+#: ../terminal/terminal-options.c:320
 #, c-format
 msgid ""
 "Option \"--geometry\" requires specifying the window geometry as its "
 "parameter"
 msgstr "Valik „--geometry” vajab parameetrina määratletud aknageomeetriat"
 
-#: ../terminal/terminal-options.c:349
+#: ../terminal/terminal-options.c:335
 #, c-format
 msgid "Option \"--role\" requires specifying the window role as its parameter"
 msgstr "Valik „--role” vajab parameetrina määratletud aknarolli"
 
-#: ../terminal/terminal-options.c:364
+#: ../terminal/terminal-options.c:350
 #, c-format
 msgid ""
 "Option \"--startup-id\" requires specifying the startup id as its parameter"
 msgstr "Valik „--startup-id” vajab parameetrina määratud käivitustunnust"
 
-#: ../terminal/terminal-options.c:379
+#: ../terminal/terminal-options.c:365
 #, fuzzy, c-format
 msgid ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
 "parameter"
 msgstr "Valik  „--command/-e” vajab parameetrina käivitatavat käsku"
 
-#: ../terminal/terminal-options.c:435
+#: ../terminal/terminal-options.c:419
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Tundmatu valik „%s”"
@@ -514,7 +312,7 @@ msgstr "Üleekraanirežiim"
 msgid "Set Title"
 msgstr "Määrata pealkiri"
 
-#: ../terminal/terminal-preferences.c:464
+#: ../terminal/terminal-preferences.c:464 ../terminal/terminal-window.c:237
 msgid "Reset"
 msgstr "Lähtestada"
 
@@ -811,6 +609,11 @@ msgstr "_Lähtestada"
 msgid "Reset and C_lear"
 msgstr "_Lähtestada ja puhastada"
 
+#: ../terminal/terminal-window.c:238
+#, fuzzy
+msgid "Reset and clear"
+msgstr "Lähtestada ja puhastada"
+
 #: ../terminal/terminal-window.c:239
 msgid "_Go"
 msgstr "_Liikuda"
@@ -1486,6 +1289,262 @@ msgstr "Käs_u käivitamisel uuendada utmp/wtmp kirjeid"
 msgid "seconds"
 msgstr ""
 
+#~ msgid ""
+#~ "  -h, --help                          Print this help message and exit"
+#~ msgstr ""
+#~ "  -h, --help                          Trükkida see abiteade ja väljuda"
+
+#, fuzzy
+#~ msgid ""
+#~ "  -V, --version                       Print version information and exit"
+#~ msgstr ""
+#~ "  -v, --version                       Trükkida versiooniteave ja väljuda"
+
+#~ msgid ""
+#~ "  --disable-server                    Do not register with the D-BUS\n"
+#~ "                                      session message bus"
+#~ msgstr ""
+#~ "  --disable-server                    Mitte registreerida D-BUS\n"
+#~ "                                      seansisõnumite edastajaga"
+
+#~ msgid "  --default-display=DISPLAY           default X display to use"
+#~ msgstr ""
+#~ "  --default-display=EKRAAN           vaikimisi kasutatav „X”-i ekraan"
+
+#~ msgid ""
+#~ "  --default-working-directory=DIRNAME Set the default terminal's working\n"
+#~ "                                      directory"
+#~ msgstr ""
+#~ "  --default-working-directory=KATALOOGINIMI Määrata terminalile "
+#~ "vaikimisi\n"
+#~ "                                      töökataloog"
+
+#~ msgid ""
+#~ "  --tab                               Open a new tab in the last-"
+#~ "specified\n"
+#~ "                                      window; more than one of these\n"
+#~ "                                      options can be provided"
+#~ msgstr ""
+#~ "  --tab                               Viimati täpsustatud aknas avada "
+#~ "uus\n"
+#~ "                                      kaart; seda valikut saab\n"
+#~ "                                      kasutada mitu korda"
+
+#~ msgid ""
+#~ "  --window                            Open a new window containing one "
+#~ "tab;\n"
+#~ "                                      more than one of these options can "
+#~ "be\n"
+#~ "                                      provided"
+#~ msgstr ""
+#~ "  --window                            Avada uus aken koos ühe kaardiga;\n"
+#~ "                                      seda valikut saab kasutada mitu\n"
+#~ "                                      korda"
+
+#~ msgid ""
+#~ "  -x, --execute                       Execute the remainder of the "
+#~ "command\n"
+#~ "                                      line inside the terminal"
+#~ msgstr ""
+#~ "  -x, --execute                       Ülejäänud käsk käivitatakse\n"
+#~ "                                      terminalis"
+
+#~ msgid ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+#~ msgstr ""
+#~ "  -e, --command=SÕNE                  Selle valiku argument käivitatakse\n"
+#~ "                                      terminalis"
+
+#~ msgid ""
+#~ "  --working-directory=DIRNAME         Set the terminal's working directory"
+#~ msgstr ""
+#~ "  --working-directory=KAUSTANIMI      Määrata terminalile töökataloog"
+
+#~ msgid "  -T, --title=TITLE                   Set the terminal's title"
+#~ msgstr "  -T, --title=PEALKIRI                Määrata terminalile pealkiri"
+
+#~ msgid ""
+#~ "  -H, --hold                          Do not immediately destroy the tab\n"
+#~ "                                      when the child command exits"
+#~ msgstr ""
+#~ "  -H, --hold                          Kaarti ei hävitata kohe, kui\n"
+#~ "                                      alamkäsk väljub"
+
+#~ msgid ""
+#~ "  --display=DISPLAY                   X display to use for the last-\n"
+#~ "                                      specified window"
+#~ msgstr ""
+#~ "  --display=EKRAAN                    Viimasena täpsustatud akna jaoks\n"
+#~ "                                      kasutatav X-i ekraan."
+
+#~ msgid ""
+#~ "  --geometry=GEOMETRY                 X geometry specification (see \"X"
+#~ "\"\n"
+#~ "                                      man page), can be specified once "
+#~ "per\n"
+#~ "                                      window to be opened"
+#~ msgstr ""
+#~ "  --geometry=GEOMEETRIA               X-i geomeetria täpsustus (vt. X-i\n"
+#~ "                                      käsiraamatut), võimalik korra\n"
+#~ "                                      täpsustada igale avatavale\n"
+#~ "                                      aknale."
+
+#, fuzzy
+#~ msgid ""
+#~ "  --role=ROLE                         Set the role for the last-"
+#~ "specified\n"
+#~ "                                      window; applies to only one "
+#~ "window;\n"
+#~ "                                      can be specified once for each "
+#~ "window\n"
+#~ "                                      you create from the command line"
+#~ msgstr ""
+#~ "  -role=ROLL                          Määrata roll viimati täpsustatud\n"
+#~ "                                      aknale; kehtib ainult ühes aknas;\n"
+#~ "                                      võimalik korra täpsustada igale\n"
+#~ "                                      käsurealt loodavale aknale"
+
+#~ msgid ""
+#~ "  --startup-id=STRING                 ID for the startup notification\n"
+#~ "                                      protocol"
+#~ msgstr ""
+#~ "  --startup-id=SÕNE                   TUNNUS käivitusteatise\n"
+#~ "                                      protokollile"
+
+#, fuzzy
+#~ msgid ""
+#~ "  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
+#~ "                                      name or filename"
+#~ msgstr ""
+#~ "  -e, --command=SÕNE                  Selle valiku argument käivitatakse\n"
+#~ "                                      terminalis"
+
+#, fuzzy
+#~ msgid ""
+#~ "  --fullscreen                        Set the last-specified window into\n"
+#~ "                                      fullscreen mode; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --fullscreen                        Viimati täpsustatud aken määrata\n"
+#~ "                                      üleekraanirežiimi; mõjub\n"
+#~ "                                      korraga ainult ühele aknale;\n"
+#~ "                                      võimalik korra määrata igale\n"
+#~ "                                      käsurealt loodavale aknale."
+
+#, fuzzy
+#~ msgid ""
+#~ "  --maximize                          Maximize the last-specified "
+#~ "window;\n"
+#~ "                                      applies to only one window; can be\n"
+#~ "                                      specified once for each window you\n"
+#~ "                                      create from the command line"
+#~ msgstr ""
+#~ "  -role=ROLL                          Määrata roll viimati täpsustatud\n"
+#~ "                                      aknale; kehtib ainult ühes aknas;\n"
+#~ "                                      võimalik korra täpsustada igale\n"
+#~ "                                      käsurealt loodavale aknale"
+
+#~ msgid ""
+#~ "  --show-menubar                      Turn on the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-menubar                      Viimati täpsustatud aknas lülitada\n"
+#~ "                                      menüüriba sisse; kehtib ainult "
+#~ "ühes\n"
+#~ "                                      aknas; võimalik korra\n"
+#~ "                                      täpsustada igale käsurealt "
+#~ "loodavale\n"
+#~ "                                      aknale"
+
+#~ msgid ""
+#~ "  --hide-menubar                      Turn off the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-menubar                      Viimati täpsustatud aknas lülitada\n"
+#~ "                                      menüüriba välja; kehtib ainult\n"
+#~ "                                      ühes aknas; võimalik korra\n"
+#~ "                                      täpsustada igale käsurealt\n"
+#~ "                                      loodavale aknale"
+
+#~ msgid ""
+#~ "  --show-borders                      Turn on the window decorations for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --show-borders                      Viimati täpsustatud aknas lülitada\n"
+#~ "                                      aknadekoratsioonid sisse; kehtib\n"
+#~ "                                      ainult ühes aknas; võimalik korra\n"
+#~ "                                      täpsustada igale käsurealt\n"
+#~ "                                      loodavale aknale"
+
+#~ msgid ""
+#~ "  --hide-borders                      Turn off the window decorations "
+#~ "for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --hide-borders                      Viimati täpsustatud aknas lülitada\n"
+#~ "                                      aknadekoratsioonid välja; kehtib\n"
+#~ "                                      ainult ühes aknas; võimalik korra\n"
+#~ "                                      täpsustada igale käsurealt\n"
+#~ "                                      loodavale aknale"
+
+#~ msgid ""
+#~ "  --show-toolbars                     Turn on the toolbars for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-toolbars                     Viimati täpsustatud aknas lülitada\n"
+#~ "                                      tööriistariba sisse; kehtib ainult\n"
+#~ "                                      ühes aknas; võimalik korra määrata\n"
+#~ "                                      igale käsurealt loodavale aknale"
+
+#~ msgid ""
+#~ "  --hide-toolbars                     Turn off the toolbars for the "
+#~ "last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-toolbars                     Viimati täpsustatud aknas lülitada\n"
+#~ "                                      tööriistariba välja; kehtib ainult\n"
+#~ "                                      ühes aknas; võimalik korra määrata\n"
+#~ "                                      igale käsurealt loodavale aknale"
+
+#~ msgid "Unable to launch terminal: %s\n"
+#~ msgstr "Terminali ei saanud käivitada: %s\n"
+
+#~ msgid ""
+#~ "Option \"--sm-client-id\" requires specifying the session id as its "
+#~ "parameter"
+#~ msgstr "Valik „--sm-client-id” vajab parameetrina session-id määratlemist"
+
 #~ msgid "<b>Title:</b>"
 #~ msgstr "<b>Pealkiri:</b>"
 
diff --git a/po/eu.po b/po/eu.po
index b1bbdcb..69edbac 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-12-07 11:48+0100\n"
+"POT-Creation-Date: 2009-12-14 16:03+0100\n"
 "PO-Revision-Date: 2009-09-21 23:07+0200\n"
 "Last-Translator: Piarres Beobide <pi at beobide.net>\n"
 "Language-Team: Basque <debian-l10n-eu at debian.lists.org>\n"
@@ -19,287 +19,88 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 1.0\n"
 
-#: ../terminal/main.c:46
+#: ../terminal/main.c:48
 msgid "Usage:"
 msgstr "Erabilera:"
 
-#: ../terminal/main.c:47
+#: ../terminal/main.c:48
 msgid "OPTION"
 msgstr "AUKERA"
 
-#: ../terminal/main.c:49
+#: ../terminal/main.c:53
 msgid "General Options"
 msgstr "Aukerak orokorrak"
 
-#: ../terminal/main.c:50
-msgid "  -h, --help                          Print this help message and exit"
-msgstr ""
-"  -h, --help                          Laguntza mezu hau bistarazi eta irten"
-
-#: ../terminal/main.c:51
-msgid ""
-"  -V, --version                       Print version information and exit"
-msgstr ""
-"  -v, --version                       Bertsio argibideak bistarazi eta irten"
-
-#: ../terminal/main.c:52
-msgid ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
-msgstr ""
-"  --disable-server                    Ez erregistratu D-BUS\n"
-"                                      saio mezu bus-arekin"
-
-#: ../terminal/main.c:54
-msgid "  --default-display=DISPLAY           default X display to use"
-msgstr "  --default-display=DISPLAY           lehenetsiriko X pantaila"
+#. parameter of --default-display
+#. parameter of --display
+#: ../terminal/main.c:55 ../terminal/main.c:81
+#, fuzzy
+msgid "display"
+msgstr "Ez da bistaratzen"
 
-#: ../terminal/main.c:55
-msgid ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
+#. parameter of --default-working-directory
+#. parameter of --working-directory
+#: ../terminal/main.c:57 ../terminal/main.c:72
+msgid "directory"
 msgstr ""
-"  --default-working-directory=DIRIZENA terminalen lehenetsiriko lan "
-"direktorioa\n"
-"                                      ezartzen du"
 
-#: ../terminal/main.c:58
+#: ../terminal/main.c:61
 msgid "Window or Tab Separators"
 msgstr "Leiho edo fitxa bereizleak"
 
-#: ../terminal/main.c:59
-msgid ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-msgstr ""
-"  --tab                               Azkenez hautaturiko leihoan fitxa\n"
-"                                      berri bat ireki; horrelako aukera bat\n"
-"                                      baino gehiago erabili daiteke"
-
-#: ../terminal/main.c:62
-msgid ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-msgstr ""
-"  --window                            Fitxa bat duen leiho berri bat ireki;\n"
-"                                      horrelako aukera bat baino gehiago\n"
-"                                      erabili daiteke"
-
 #: ../terminal/main.c:66
 msgid "Tab Options"
 msgstr "Fitxa aukerak"
 
-#: ../terminal/main.c:67
-msgid ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-msgstr ""
-"  -x, --execute                       Komandoaren hondarra terminalean\n"
-"                                      exekutatu"
-
-#: ../terminal/main.c:69
-msgid ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-msgstr ""
-"  -e, --command=KATEA                Aukera honen argumentua terminal\n"
-"                                      barnean exekutatu"
-
-#: ../terminal/main.c:71
-msgid ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
-msgstr ""
-"  --working-directory=DIRIZENA        Terminalaren lan direktorioa ezarri"
-
-#: ../terminal/main.c:72
-msgid "  -T, --title=TITLE                   Set the terminal's title"
-msgstr "  -T, --title=TITULUA               Terminalaren titulua ezarri"
+#. parameter of --command
+#: ../terminal/main.c:68
+#, fuzzy
+msgid "command"
+msgstr "Komandoa"
 
-#: ../terminal/main.c:73
-msgid ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-msgstr ""
-"  -H, --hold                          Ez automatikoki itxi fitxa komando\n"
-"                                      semea amaitzerakoan"
+#. parameter of --title
+#: ../terminal/main.c:70
+#, fuzzy
+msgid "title"
+msgstr "Titulua"
 
-#: ../terminal/main.c:76
+#: ../terminal/main.c:79
 msgid "Window Options"
 msgstr "Leiho aukerak"
 
-#: ../terminal/main.c:77
-msgid ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
+#. parameter of --geometry
+#: ../terminal/main.c:83
+msgid "geometry"
 msgstr ""
-"  --display=DISPLAY                   Azken ezarritako leihoarentzat\n"
-"                                       erabiliko den X pantaila"
 
-#: ../terminal/main.c:79
-msgid ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
+#. parameter of --role
+#: ../terminal/main.c:85
+msgid "role"
 msgstr ""
-"  --geometry=GEOMETRIA                X geometria ezarpena (ikus \"X\"\n"
-"                                      manual orria), ireki behar den leiho\n"
-"                                      bakoitzeko bat ezarri daiteke"
 
-#: ../terminal/main.c:82
-msgid ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
-msgstr ""
-"  --role=PORTAMOLDEA                  Azken hautatutako leihoaren;\n"
-"                                      portamoldea ezarri; bakarrik leiho\n"
-"                                      batean ezartzen da; komando lerrotik\n"
-"                                      sortutako leiho bakoitzeko behin "
-"ezarri\n"
-"                                      daiteke"
-
-#: ../terminal/main.c:86
-msgid ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
-msgstr ""
-"  --startup-id=KATEA                  Abiarazte berri emate protokoloaren\n"
-"                                      identifikazioa"
-
-#: ../terminal/main.c:88
-msgid ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
-msgstr ""
-"  -I, --icon=IKONOA                   Ezarri terminalaren ikonoa ikono-izen "
-"edo\n"
-"                                      fitxategi-izen gisa"
-
-#: ../terminal/main.c:90
-msgid ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --fullscreen                        Azken ezarritako leihoa pantaila-osoa\n"
-"                                      moduan ipini; leiho batean bakarrik\n"
-"                                      ezartzen da; komando lerrotik\n"
-"                                      sorturiko leiho bakoitzagatik bat\n"
-"                                      ezarri dezakezu."
+#. parameter of --startup-id
+#: ../terminal/main.c:87
+#, fuzzy
+msgid "string"
+msgstr "Kontuz!"
 
-#: ../terminal/main.c:95
-msgid ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
-msgstr ""
-"  --maximize                        Azken ezarritako leihoa handitu;\n"
-"                                      leiho batean bakarrik\n"
-"                                      ezartzen da; komando lerrotik\n"
-"                                      sorturiko leiho bakoitzagatik bat\n"
-"                                      ezarri dezakezu"
+#. parameter of --icon
+#: ../terminal/main.c:89
+#, fuzzy
+msgid "icon"
+msgstr "Ekintza"
 
-#: ../terminal/main.c:99
-msgid ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-menubar                      Azken hautaturiko leihoaren\n"
-"                                      menubarra gaitu; leiho batean "
-"bakarrik\n"
-"                                      ezartzen da; komando lerrotik\n"
-"                                      sorturiko leiho bakoitzagatik bat\n"
-"                                      ezarri dezakezu."
-
-#: ../terminal/main.c:104
-msgid ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --hide-menubar                      Azken hautaturiko leihoaren\n"
-"                                      menubarra ezgaitu; leiho batean "
-"bakarrik\n"
-"                                      ezartzen da; komando lerrotik\n"
-"                                      sorturiko leiho bakoitzagatik bat\n"
-"                                      ezarri dezakezu."
-
-#: ../terminal/main.c:109
-msgid ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --show-borders                      Azken hautaturiko leihoaren\n"
-"                                      dekorazioa gaitu; leiho batean "
-"bakarrik\n"
-"                                      ezartzen da; komando lerrotik\n"
-"                                      sorturiko leiho bakoitzagatik bat\n"
-"                                      ezarri dezakezu."
-
-#: ../terminal/main.c:114
-msgid ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --hide-borders                      Azken hautaturiko leihoaren\n"
-"                                      dekorazioa ezgaitu; leiho batean "
-"bakarrik\n"
-"                                      ezartzen da; komando lerrotik\n"
-"                                      sorturiko leiho bakoitzagatik bat\n"
-"                                      ezarri dezakezu."
-
-#: ../terminal/main.c:119
-msgid ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-toolbars                     Azken hautaturiko leihoaren\n"
-"                                      tresna-barrak bistarazi; leiho batean "
-"bakarrik\n"
-"                                      ezartzen da; komando lerrotik\n"
-"                                      sorturiko leiho bakoitzagatik bat\n"
-"                                      ezarri dezakezu."
-
-#: ../terminal/main.c:124
-msgid ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#: ../terminal/main.c:91
+#, c-format
+msgid "See the %s man page for full explanation of the options above."
 msgstr ""
-"  --hide-toolbars                     Azken hautaturiko leihoaren\n"
-"                                      tresna-barrak ezkutatuko; leiho\n"
-"                                      batean bakarrik ezartzen da;\n"
-"                                      komando lerrotik sorturiko leiho\n"
-"                                      bakoitzagatik bat ezarri dezakezu."
 
-#: ../terminal/main.c:151 ../terminal/terminal-preferences.c:1263
+#: ../terminal/main.c:118 ../terminal/terminal-preferences.c:1263
 #: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr "Terminala"
 
-#: ../terminal/main.c:173
+#: ../terminal/main.c:135
 #, c-format
 msgid ""
 "%s (Xfce %s)\n"
@@ -324,31 +125,26 @@ msgstr ""
 "\n"
 "Mesedez arazoen berri <%s>-en eman.\n"
 
-#: ../terminal/main.c:267
+#: ../terminal/main.c:239
 #, c-format
 msgid "Unable to register terminal service: %s\n"
 msgstr "Ezin da terminal zerbitzua erregistratu: %s\n"
 
-#: ../terminal/main.c:276
-#, c-format
-msgid "Unable to launch terminal: %s\n"
-msgstr "Ezin da terminala abiarazi: %s\n"
-
-#: ../terminal/terminal-app.c:551
+#: ../terminal/terminal-app.c:554
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "\"%s\" geometria-kate baliogabea\n"
 
-#: ../terminal/terminal-dbus.c:114
+#: ../terminal/terminal-dbus.c:108
 msgid "User id mismatch"
 msgstr "Okerreko erabiltzaile id-a"
 
-#: ../terminal/terminal-dbus.c:146
+#: ../terminal/terminal-dbus.c:134
 #, c-format
 msgid "D-BUS message bus disconnected, exiting...\n"
 msgstr "D-BUS mezu bus-a deskonektaturik, irteten...\n"
 
-#: ../terminal/terminal-dbus.c:208
+#: ../terminal/terminal-dbus.c:196
 #, c-format
 msgid "Unable to register object %s"
 msgstr "Ezin da objektua erregistratu: %s"
@@ -370,7 +166,7 @@ msgstr "Joan terminalaren webgunera"
 msgid "Failed to open the documentation browser"
 msgstr "Dokumentazio nabigatzailea irekitzerakoan huts egin du"
 
-#: ../terminal/terminal-options.c:189
+#: ../terminal/terminal-options.c:206
 #, c-format
 msgid ""
 "Option \"--default-display\" requires specifying the default X display as "
@@ -379,7 +175,7 @@ msgstr ""
 "\"--default-display\" aukerak bere parametro bezala lehenetsiriko X pantaila "
 "ezartzea behar du"
 
-#: ../terminal/terminal-options.c:204
+#: ../terminal/terminal-options.c:221
 #, c-format
 msgid ""
 "Option \"--default-working-directory\" requires specifying the default "
@@ -388,14 +184,7 @@ msgstr ""
 "\"--default-working-directory\" aukerak bere parametro bezala lehenetsiriko "
 "lan direktorioa ezartzea behar du"
 
-#: ../terminal/terminal-options.c:235
-#, c-format
-msgid ""
-"Option \"--sm-client-id\" requires specifying the session id as its parameter"
-msgstr ""
-"\"--sm-client-id\" aukerak saio id-a parametro bezala ezartzea behar du"
-
-#: ../terminal/terminal-options.c:250
+#: ../terminal/terminal-options.c:237
 #, c-format
 msgid ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
@@ -404,7 +193,7 @@ msgstr ""
 "\"--execute/-x\" aukerak komando lerroaren ondareaz abiaraziko den komandoa "
 "behar du."
 
-#: ../terminal/terminal-options.c:267
+#: ../terminal/terminal-options.c:254
 #, c-format
 msgid ""
 "Option \"--command/-e\" requires specifying the command to run as its "
@@ -412,7 +201,7 @@ msgid ""
 msgstr ""
 "\"--command/-e\" aukerak bere parametro bezala komando bat ezartzea behar du"
 
-#: ../terminal/terminal-options.c:284
+#: ../terminal/terminal-options.c:271
 #, c-format
 msgid ""
 "Option \"--working-directory\" requires specifying the working directory as "
@@ -421,19 +210,19 @@ msgstr ""
 "\"--working-directory\" aukerak bere parametro bezala lan direktorioa "
 "ezartzea behar du"
 
-#: ../terminal/terminal-options.c:299
+#: ../terminal/terminal-options.c:286
 #, c-format
 msgid "Option \"--title/-T\" requires specifying the title as its parameter"
 msgstr "\"--title/-T\" aukerak bere parametro bezala titulua ezartzea behar du"
 
-#: ../terminal/terminal-options.c:319
+#: ../terminal/terminal-options.c:305
 #, c-format
 msgid ""
 "Option \"--display\" requires specifying the X display as its parameters"
 msgstr ""
 "\"--display\" aukerak bere parametro bezala X pantaila  ezartzea behar du"
 
-#: ../terminal/terminal-options.c:334
+#: ../terminal/terminal-options.c:320
 #, c-format
 msgid ""
 "Option \"--geometry\" requires specifying the window geometry as its "
@@ -442,12 +231,12 @@ msgstr ""
 "\"--geometry\" aukerak bere parametro bezala leiho geometria ezartzea behar "
 "du"
 
-#: ../terminal/terminal-options.c:349
+#: ../terminal/terminal-options.c:335
 #, c-format
 msgid "Option \"--role\" requires specifying the window role as its parameter"
 msgstr "\"--role\" aukerak leiho portamoldea parametro bat bezala behar du"
 
-#: ../terminal/terminal-options.c:364
+#: ../terminal/terminal-options.c:350
 #, c-format
 msgid ""
 "Option \"--startup-id\" requires specifying the startup id as its parameter"
@@ -455,7 +244,7 @@ msgstr ""
 "\"--startup-id\" aukerak bere parametro bezala abiarazte id-a ezartzea behar "
 "du"
 
-#: ../terminal/terminal-options.c:379
+#: ../terminal/terminal-options.c:365
 #, c-format
 msgid ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
@@ -464,7 +253,7 @@ msgstr ""
 "\"--icon/-I\" aukerak parametro bezala ikono-izena edo fitxategi-izena "
 "ezartzea behar du"
 
-#: ../terminal/terminal-options.c:435
+#: ../terminal/terminal-options.c:419
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Aukera ezezaguna \"%s\""
@@ -533,7 +322,7 @@ msgstr "Pantaila-osoa"
 msgid "Set Title"
 msgstr "Titulua ezarri"
 
-#: ../terminal/terminal-preferences.c:464
+#: ../terminal/terminal-preferences.c:464 ../terminal/terminal-window.c:237
 msgid "Reset"
 msgstr "Berrezarri"
 
@@ -831,6 +620,11 @@ msgstr "Berre_zarri"
 msgid "Reset and C_lear"
 msgstr "Berrezarri eta ga_rbitu"
 
+#: ../terminal/terminal-window.c:238
+#, fuzzy
+msgid "Reset and clear"
+msgstr "Berrezarri eta garbitu"
+
 #: ../terminal/terminal-window.c:239
 msgid "_Go"
 msgstr "_Joan"
@@ -1457,3 +1251,270 @@ msgstr "_Utmp/wtmp erregistroa eguneratu komando bat abiaraztean"
 #: ../Terminal.glade.h:115
 msgid "seconds"
 msgstr "segundo"
+
+#~ msgid ""
+#~ "  -h, --help                          Print this help message and exit"
+#~ msgstr ""
+#~ "  -h, --help                          Laguntza mezu hau bistarazi eta "
+#~ "irten"
+
+#~ msgid ""
+#~ "  -V, --version                       Print version information and exit"
+#~ msgstr ""
+#~ "  -v, --version                       Bertsio argibideak bistarazi eta "
+#~ "irten"
+
+#~ msgid ""
+#~ "  --disable-server                    Do not register with the D-BUS\n"
+#~ "                                      session message bus"
+#~ msgstr ""
+#~ "  --disable-server                    Ez erregistratu D-BUS\n"
+#~ "                                      saio mezu bus-arekin"
+
+#~ msgid "  --default-display=DISPLAY           default X display to use"
+#~ msgstr "  --default-display=DISPLAY           lehenetsiriko X pantaila"
+
+#~ msgid ""
+#~ "  --default-working-directory=DIRNAME Set the default terminal's working\n"
+#~ "                                      directory"
+#~ msgstr ""
+#~ "  --default-working-directory=DIRIZENA terminalen lehenetsiriko lan "
+#~ "direktorioa\n"
+#~ "                                      ezartzen du"
+
+#~ msgid ""
+#~ "  --tab                               Open a new tab in the last-"
+#~ "specified\n"
+#~ "                                      window; more than one of these\n"
+#~ "                                      options can be provided"
+#~ msgstr ""
+#~ "  --tab                               Azkenez hautaturiko leihoan fitxa\n"
+#~ "                                      berri bat ireki; horrelako aukera "
+#~ "bat\n"
+#~ "                                      baino gehiago erabili daiteke"
+
+#~ msgid ""
+#~ "  --window                            Open a new window containing one "
+#~ "tab;\n"
+#~ "                                      more than one of these options can "
+#~ "be\n"
+#~ "                                      provided"
+#~ msgstr ""
+#~ "  --window                            Fitxa bat duen leiho berri bat "
+#~ "ireki;\n"
+#~ "                                      horrelako aukera bat baino gehiago\n"
+#~ "                                      erabili daiteke"
+
+#~ msgid ""
+#~ "  -x, --execute                       Execute the remainder of the "
+#~ "command\n"
+#~ "                                      line inside the terminal"
+#~ msgstr ""
+#~ "  -x, --execute                       Komandoaren hondarra terminalean\n"
+#~ "                                      exekutatu"
+
+#~ msgid ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+#~ msgstr ""
+#~ "  -e, --command=KATEA                Aukera honen argumentua terminal\n"
+#~ "                                      barnean exekutatu"
+
+#~ msgid ""
+#~ "  --working-directory=DIRNAME         Set the terminal's working directory"
+#~ msgstr ""
+#~ "  --working-directory=DIRIZENA        Terminalaren lan direktorioa ezarri"
+
+#~ msgid "  -T, --title=TITLE                   Set the terminal's title"
+#~ msgstr "  -T, --title=TITULUA               Terminalaren titulua ezarri"
+
+#~ msgid ""
+#~ "  -H, --hold                          Do not immediately destroy the tab\n"
+#~ "                                      when the child command exits"
+#~ msgstr ""
+#~ "  -H, --hold                          Ez automatikoki itxi fitxa komando\n"
+#~ "                                      semea amaitzerakoan"
+
+#~ msgid ""
+#~ "  --display=DISPLAY                   X display to use for the last-\n"
+#~ "                                      specified window"
+#~ msgstr ""
+#~ "  --display=DISPLAY                   Azken ezarritako leihoarentzat\n"
+#~ "                                       erabiliko den X pantaila"
+
+#~ msgid ""
+#~ "  --geometry=GEOMETRY                 X geometry specification (see \"X"
+#~ "\"\n"
+#~ "                                      man page), can be specified once "
+#~ "per\n"
+#~ "                                      window to be opened"
+#~ msgstr ""
+#~ "  --geometry=GEOMETRIA                X geometria ezarpena (ikus \"X\"\n"
+#~ "                                      manual orria), ireki behar den "
+#~ "leiho\n"
+#~ "                                      bakoitzeko bat ezarri daiteke"
+
+#~ msgid ""
+#~ "  --role=ROLE                         Set the role for the last-"
+#~ "specified\n"
+#~ "                                      window; applies to only one "
+#~ "window;\n"
+#~ "                                      can be specified once for each "
+#~ "window\n"
+#~ "                                      you create from the command line"
+#~ msgstr ""
+#~ "  --role=PORTAMOLDEA                  Azken hautatutako leihoaren;\n"
+#~ "                                      portamoldea ezarri; bakarrik leiho\n"
+#~ "                                      batean ezartzen da; komando "
+#~ "lerrotik\n"
+#~ "                                      sortutako leiho bakoitzeko behin "
+#~ "ezarri\n"
+#~ "                                      daiteke"
+
+#~ msgid ""
+#~ "  --startup-id=STRING                 ID for the startup notification\n"
+#~ "                                      protocol"
+#~ msgstr ""
+#~ "  --startup-id=KATEA                  Abiarazte berri emate "
+#~ "protokoloaren\n"
+#~ "                                      identifikazioa"
+
+#~ msgid ""
+#~ "  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
+#~ "                                      name or filename"
+#~ msgstr ""
+#~ "  -I, --icon=IKONOA                   Ezarri terminalaren ikonoa ikono-"
+#~ "izen edo\n"
+#~ "                                      fitxategi-izen gisa"
+
+#~ msgid ""
+#~ "  --fullscreen                        Set the last-specified window into\n"
+#~ "                                      fullscreen mode; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --fullscreen                        Azken ezarritako leihoa pantaila-"
+#~ "osoa\n"
+#~ "                                      moduan ipini; leiho batean "
+#~ "bakarrik\n"
+#~ "                                      ezartzen da; komando lerrotik\n"
+#~ "                                      sorturiko leiho bakoitzagatik bat\n"
+#~ "                                      ezarri dezakezu."
+
+#~ msgid ""
+#~ "  --maximize                          Maximize the last-specified "
+#~ "window;\n"
+#~ "                                      applies to only one window; can be\n"
+#~ "                                      specified once for each window you\n"
+#~ "                                      create from the command line"
+#~ msgstr ""
+#~ "  --maximize                        Azken ezarritako leihoa handitu;\n"
+#~ "                                      leiho batean bakarrik\n"
+#~ "                                      ezartzen da; komando lerrotik\n"
+#~ "                                      sorturiko leiho bakoitzagatik bat\n"
+#~ "                                      ezarri dezakezu"
+
+#~ msgid ""
+#~ "  --show-menubar                      Turn on the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-menubar                      Azken hautaturiko leihoaren\n"
+#~ "                                      menubarra gaitu; leiho batean "
+#~ "bakarrik\n"
+#~ "                                      ezartzen da; komando lerrotik\n"
+#~ "                                      sorturiko leiho bakoitzagatik bat\n"
+#~ "                                      ezarri dezakezu."
+
+#~ msgid ""
+#~ "  --hide-menubar                      Turn off the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-menubar                      Azken hautaturiko leihoaren\n"
+#~ "                                      menubarra ezgaitu; leiho batean "
+#~ "bakarrik\n"
+#~ "                                      ezartzen da; komando lerrotik\n"
+#~ "                                      sorturiko leiho bakoitzagatik bat\n"
+#~ "                                      ezarri dezakezu."
+
+#~ msgid ""
+#~ "  --show-borders                      Turn on the window decorations for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --show-borders                      Azken hautaturiko leihoaren\n"
+#~ "                                      dekorazioa gaitu; leiho batean "
+#~ "bakarrik\n"
+#~ "                                      ezartzen da; komando lerrotik\n"
+#~ "                                      sorturiko leiho bakoitzagatik bat\n"
+#~ "                                      ezarri dezakezu."
+
+#~ msgid ""
+#~ "  --hide-borders                      Turn off the window decorations "
+#~ "for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --hide-borders                      Azken hautaturiko leihoaren\n"
+#~ "                                      dekorazioa ezgaitu; leiho batean "
+#~ "bakarrik\n"
+#~ "                                      ezartzen da; komando lerrotik\n"
+#~ "                                      sorturiko leiho bakoitzagatik bat\n"
+#~ "                                      ezarri dezakezu."
+
+#~ msgid ""
+#~ "  --show-toolbars                     Turn on the toolbars for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-toolbars                     Azken hautaturiko leihoaren\n"
+#~ "                                      tresna-barrak bistarazi; leiho "
+#~ "batean bakarrik\n"
+#~ "                                      ezartzen da; komando lerrotik\n"
+#~ "                                      sorturiko leiho bakoitzagatik bat\n"
+#~ "                                      ezarri dezakezu."
+
+#~ msgid ""
+#~ "  --hide-toolbars                     Turn off the toolbars for the "
+#~ "last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-toolbars                     Azken hautaturiko leihoaren\n"
+#~ "                                      tresna-barrak ezkutatuko; leiho\n"
+#~ "                                      batean bakarrik ezartzen da;\n"
+#~ "                                      komando lerrotik sorturiko leiho\n"
+#~ "                                      bakoitzagatik bat ezarri dezakezu."
+
+#~ msgid "Unable to launch terminal: %s\n"
+#~ msgstr "Ezin da terminala abiarazi: %s\n"
+
+#~ msgid ""
+#~ "Option \"--sm-client-id\" requires specifying the session id as its "
+#~ "parameter"
+#~ msgstr ""
+#~ "\"--sm-client-id\" aukerak saio id-a parametro bezala ezartzea behar du"
diff --git a/po/fi.po b/po/fi.po
index 5d8ccba..1bd7c5d 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Terminal 0.2.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 11:48+0100\n"
+"POT-Creation-Date: 2009-12-14 16:03+0100\n"
 "PO-Revision-Date: 2008-10-31 12:45+0200\n"
 "Last-Translator: Jari Rahkonen <jari.rahkonen at pp1.inet.fi>\n"
 "Language-Team: Finnish <translation-team-fi at lists.sourceforge.net>\n"
@@ -15,280 +15,91 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../terminal/main.c:46
+#: ../terminal/main.c:48
 msgid "Usage:"
 msgstr ""
 
-#: ../terminal/main.c:47
+#: ../terminal/main.c:48
 msgid "OPTION"
 msgstr ""
 
-#: ../terminal/main.c:49
+#: ../terminal/main.c:53
 #, fuzzy
 msgid "General Options"
 msgstr "Yleiset"
 
-#: ../terminal/main.c:50
-msgid "  -h, --help                          Print this help message and exit"
-msgstr "  -h, --help                          Tulosta tämä ohje ja poistu"
-
-#: ../terminal/main.c:51
+#. parameter of --default-display
+#. parameter of --display
+#: ../terminal/main.c:55 ../terminal/main.c:81
 #, fuzzy
-msgid ""
-"  -V, --version                       Print version information and exit"
-msgstr "  -v, --version                       Tulosta versiotiedot ja poistu"
+msgid "display"
+msgstr "Ei näytetä"
 
-#: ../terminal/main.c:52
-msgid ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
+#. parameter of --default-working-directory
+#. parameter of --working-directory
+#: ../terminal/main.c:57 ../terminal/main.c:72
+msgid "directory"
 msgstr ""
-"  --disable-server                    Älä rekisteröidy D-BUS-viestiväylän\n"
-"                                      yhteyteen"
-
-#: ../terminal/main.c:54
-msgid "  --default-display=DISPLAY           default X display to use"
-msgstr "  --default-display=NÄYTTÖ            oletuksena käytettävä X:n näyttö"
 
-#: ../terminal/main.c:55
-msgid ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
-msgstr "  --default-working-directory=KANSIO  Aseta oletuspäätteen työkansio"
-
-#: ../terminal/main.c:58
+#: ../terminal/main.c:61
 msgid "Window or Tab Separators"
 msgstr ""
 
-#: ../terminal/main.c:59
-msgid ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-msgstr ""
-"  --tab                               Avaa välilehti viimeksi määritettyyn\n"
-"                                      ikkunaan. Näitä valitsimia voi olla\n"
-"                                      enemmän kuin yksi"
-
-#: ../terminal/main.c:62
-msgid ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-msgstr ""
-"  --window                            Avaa uusi ikkuna, jossa on yksi\n"
-"                                      välilehti; Näitä valitsimia voi olla\n"
-"                                      enemmän kuin yksi"
-
 #: ../terminal/main.c:66
 #, fuzzy
 msgid "Tab Options"
 msgstr "Välilehden sijainti"
 
-#: ../terminal/main.c:67
-msgid ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-msgstr ""
-"  -x, --execute                       Suorita komentorivin loppuosa\n"
-"                                      päätteessä"
-
-#: ../terminal/main.c:69
-msgid ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-msgstr ""
-"  -e, --command=MERKKIJONO            Suorita tämän valitsimen argumentti\n"
-"                                      päätteessä"
-
-#: ../terminal/main.c:71
-msgid ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
-msgstr "  --working-directory=KANSIO          Aseta päätteen työkansio"
-
-#: ../terminal/main.c:72
-msgid "  -T, --title=TITLE                   Set the terminal's title"
-msgstr "  -T, --title=OTSAKE                  Aseta pääteikkunan otsake"
+#. parameter of --command
+#: ../terminal/main.c:68
+#, fuzzy
+msgid "command"
+msgstr "<b>Komento</b>"
 
-#: ../terminal/main.c:73
-msgid ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-msgstr ""
-"  -H, --hold                          Älä tuhoa välilehteä automaattisesti\n"
-"                                      sen lapsikomennon poistuessa"
+#. parameter of --title
+#: ../terminal/main.c:70
+#, fuzzy
+msgid "title"
+msgstr "Otsake"
 
-#: ../terminal/main.c:76
+#: ../terminal/main.c:79
 #, fuzzy
 msgid "Window Options"
 msgstr "Tuntematon valitsin \"%s\""
 
-#: ../terminal/main.c:77
-msgid ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
+#. parameter of --geometry
+#: ../terminal/main.c:83
+msgid "geometry"
 msgstr ""
-"  --display=NÄYTTÖ                    X:n näyttö, jota viimeksi valittu\n"
-"                                      ikkuna käyttää"
 
-#: ../terminal/main.c:79
-msgid ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
+#. parameter of --role
+#: ../terminal/main.c:85
+msgid "role"
 msgstr ""
-"  --geometry=GEOMETRIA                X:n geometriamääritys (katso\n"
-"                                      \"man X\"), voi määrittää kerran\n"
-"                                      avattavaa ikkunaa kohden"
 
-#: ../terminal/main.c:82
+#. parameter of --startup-id
+#: ../terminal/main.c:87
 #, fuzzy
-msgid ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
-msgstr ""
-"  --role=ROOLI                        Aseta rooli viimeksi määritetylle\n"
-"                                      ikkunalle; koskee vain yhtä ikkunaa;\n"
-"                                      voi määrittää kerran jokaiselle\n"
-"                                      komentoriviltä luodulle ikkunalle"
-
-#: ../terminal/main.c:86
-msgid ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
-msgstr ""
-"  --startup-id=MERKKIJONO             Tunniste käynnistyksen huomautus-\n"
-"                                      protokollaa varten"
-
-#: ../terminal/main.c:88
-#, fuzzy
-msgid ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
-msgstr ""
-"  -e, --command=MERKKIJONO            Suorita tämän valitsimen argumentti\n"
-"                                      päätteessä"
-
-#: ../terminal/main.c:90
-#, fuzzy
-msgid ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --fullscreen                        Aseta viimeksi määritetty ikkuna\n"
-"                                      täysruututilaan; koskee ainoastaan\n"
-"                                      yhtä ikkunaa; voi määrittää kerran\n"
-"                                      jokaista komentoriviltä luotua\n"
-"                                      ikkunaa kohden"
+msgid "string"
+msgstr "Varoitus"
 
-#: ../terminal/main.c:95
+#. parameter of --icon
+#: ../terminal/main.c:89
 #, fuzzy
-msgid ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
-msgstr ""
-"  --role=ROOLI                        Aseta rooli viimeksi määritetylle\n"
-"                                      ikkunalle; koskee vain yhtä ikkunaa;\n"
-"                                      voi määrittää kerran jokaiselle\n"
-"                                      komentoriviltä luodulle ikkunalle"
-
-#: ../terminal/main.c:99
-msgid ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-menubar                      Asettaa valikkopalkin näkyviin\n"
-"                                      viimeksi määritetyssä ikkunassa;\n"
-"                                      koskee ainoastaan yhtä ikkunaa;\n"
-"                                      voi määrittää kerran jokaista\n"
-"                                      komentoriviltä luotua ikkunaa kohden"
-
-#: ../terminal/main.c:104
-msgid ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --hide-menubar                      Piilottaa valikkopalkin näkyvistä\n"
-"                                      viimeksi määritetyssä ikkunassa;\n"
-"                                      koskee ainoastaan yhtä ikkunaa;\n"
-"                                      voi määrittää kerran jokaista\n"
-"                                      komentoriviltä luotua ikkunaa kohden"
-
-#: ../terminal/main.c:109
-msgid ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --show-borders                      Asettaa viimeksi määritetyn ikkunan\n"
-"                                      reunukset näkyviin; koskee ainoastaan\n"
-"                                      yhtä ikkunaa; voi määrittää kerran\n"
-"                                      jokaista komentoriviltä luotua\n"
-"                                      ikkunaa kohden"
-
-#: ../terminal/main.c:114
-msgid ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --hide-borders                      Piilottaa viimeksi määritetyn ikkunan\n"
-"                                      reunukset; koskee ainoastaan yhtä\n"
-"                                      ikkunaa; voi määrittää kerran\n"
-"                                      jokaista komentoriviltä luotua\n"
-"                                      ikkunaa kohden"
-
-#: ../terminal/main.c:119
-msgid ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-toolbars                     Asettaa viimeksi määritetyn ikkunan\n"
-"                                      työkalupalkin näkyviin; koskee\n"
-"                                      ainoastaan yhtä ikkunaa;\n"
-"                                      voi määrittää kerran jokaista\n"
-"                                      komentoriviltä luotua ikkunaa kohden"
+msgid "icon"
+msgstr "Toiminto"
 
-#: ../terminal/main.c:124
-msgid ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#: ../terminal/main.c:91
+#, c-format
+msgid "See the %s man page for full explanation of the options above."
 msgstr ""
-"  --hide-toolbars                     Piilottaa viimeksi määritetyn ikkunan\n"
-"                                      työkalupalkin; koskee ainoastaan yhtä\n"
-"                                      ikkunaa; voi määrittää kerran\n"
-"                                      jokaista komentoriviltä luotua\n"
-"                                      ikkunaa kohden"
 
-#: ../terminal/main.c:151 ../terminal/terminal-preferences.c:1263
+#: ../terminal/main.c:118 ../terminal/terminal-preferences.c:1263
 #: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr "Pääte"
 
-#: ../terminal/main.c:173
+#: ../terminal/main.c:135
 #, c-format
 msgid ""
 "%s (Xfce %s)\n"
@@ -313,31 +124,26 @@ msgstr ""
 "\n"
 "Ilmoita viat osoitteeseen <%s>.\n"
 
-#: ../terminal/main.c:267
+#: ../terminal/main.c:239
 #, c-format
 msgid "Unable to register terminal service: %s\n"
 msgstr "Päätepalvelua ei voi rekisteröidä: %s\n"
 
-#: ../terminal/main.c:276
-#, c-format
-msgid "Unable to launch terminal: %s\n"
-msgstr "Päätettä ei voi käynnistää: %s\n"
-
-#: ../terminal/terminal-app.c:551
+#: ../terminal/terminal-app.c:554
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "Epäkelpo geometriamääritys \"%s\"\n"
 
-#: ../terminal/terminal-dbus.c:114
+#: ../terminal/terminal-dbus.c:108
 msgid "User id mismatch"
 msgstr "Käyttäjätunnus ei täsmää"
 
-#: ../terminal/terminal-dbus.c:146
+#: ../terminal/terminal-dbus.c:134
 #, c-format
 msgid "D-BUS message bus disconnected, exiting...\n"
 msgstr "D-BUS-viestiyhteys katkaistu, poistutaan...\n"
 
-#: ../terminal/terminal-dbus.c:208
+#: ../terminal/terminal-dbus.c:196
 #, c-format
 msgid "Unable to register object %s"
 msgstr "Ei voi rekisteröidä oliota %s"
@@ -359,7 +165,7 @@ msgstr ""
 msgid "Failed to open the documentation browser"
 msgstr "Dokumentaatioselaimen avaaminen epäonnistui"
 
-#: ../terminal/terminal-options.c:189
+#: ../terminal/terminal-options.c:206
 #, c-format
 msgid ""
 "Option \"--default-display\" requires specifying the default X display as "
@@ -367,7 +173,7 @@ msgid ""
 msgstr ""
 "\"--default-display\"  -valitsin tarvitsee parametrikseen X:n oletusnäytön"
 
-#: ../terminal/terminal-options.c:204
+#: ../terminal/terminal-options.c:221
 #, c-format
 msgid ""
 "Option \"--default-working-directory\" requires specifying the default "
@@ -376,14 +182,7 @@ msgstr ""
 "\"--default-working-directory\"  -valitsin tarvitsee parametrikseen "
 "oletustyökansion"
 
-#: ../terminal/terminal-options.c:235
-#, c-format
-msgid ""
-"Option \"--sm-client-id\" requires specifying the session id as its parameter"
-msgstr ""
-"\"--sm-client-id\" -valitsin tarvitsee parametrikseen istunnon tunnisteen"
-
-#: ../terminal/terminal-options.c:250
+#: ../terminal/terminal-options.c:237
 #, c-format
 msgid ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
@@ -392,7 +191,7 @@ msgstr ""
 "\"--execute/-x\" -valitsin vaatii, että komentorivin loppuosa määrittää "
 "suoritettavan komennon"
 
-#: ../terminal/terminal-options.c:267
+#: ../terminal/terminal-options.c:254
 #, c-format
 msgid ""
 "Option \"--command/-e\" requires specifying the command to run as its "
@@ -400,44 +199,44 @@ msgid ""
 msgstr ""
 "\"--command/-e\"  -valitsin tarvitsee parametrikseen suoritettavan komennon"
 
-#: ../terminal/terminal-options.c:284
+#: ../terminal/terminal-options.c:271
 #, c-format
 msgid ""
 "Option \"--working-directory\" requires specifying the working directory as "
 "its parameter"
 msgstr "\"--working-directory\"  -valitsin tarvitsee parametrikseen työkansion"
 
-#: ../terminal/terminal-options.c:299
+#: ../terminal/terminal-options.c:286
 #, c-format
 msgid "Option \"--title/-T\" requires specifying the title as its parameter"
 msgstr "\"--title/-T\"  -valitsin tarvitsee parametrikseen otsakkeen"
 
-#: ../terminal/terminal-options.c:319
+#: ../terminal/terminal-options.c:305
 #, c-format
 msgid ""
 "Option \"--display\" requires specifying the X display as its parameters"
 msgstr "\"--display\"  -valitsin tarvitsee parametreikseen X:n näytön"
 
-#: ../terminal/terminal-options.c:334
+#: ../terminal/terminal-options.c:320
 #, c-format
 msgid ""
 "Option \"--geometry\" requires specifying the window geometry as its "
 "parameter"
 msgstr "\"--geometry\" -valitsin tarvitsee parametrikseen ikkunan geometrian"
 
-#: ../terminal/terminal-options.c:349
+#: ../terminal/terminal-options.c:335
 #, c-format
 msgid "Option \"--role\" requires specifying the window role as its parameter"
 msgstr "\"--role\" -valitsin tarvitsee parametrikseen ikkunan roolin"
 
-#: ../terminal/terminal-options.c:364
+#: ../terminal/terminal-options.c:350
 #, c-format
 msgid ""
 "Option \"--startup-id\" requires specifying the startup id as its parameter"
 msgstr ""
 "\"--startup-id\" -valitsin tarvitsee parametrikseen käynnistystunnisteen"
 
-#: ../terminal/terminal-options.c:379
+#: ../terminal/terminal-options.c:365
 #, fuzzy, c-format
 msgid ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
@@ -445,7 +244,7 @@ msgid ""
 msgstr ""
 "\"--command/-e\"  -valitsin tarvitsee parametrikseen suoritettavan komennon"
 
-#: ../terminal/terminal-options.c:435
+#: ../terminal/terminal-options.c:419
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Tuntematon valitsin \"%s\""
@@ -514,7 +313,7 @@ msgstr "Täysruutu"
 msgid "Set Title"
 msgstr "Aseta otsake"
 
-#: ../terminal/terminal-preferences.c:464
+#: ../terminal/terminal-preferences.c:464 ../terminal/terminal-window.c:237
 msgid "Reset"
 msgstr "Palauta"
 
@@ -811,6 +610,11 @@ msgstr "_Palauta"
 msgid "Reset and C_lear"
 msgstr "Palauta ja _tyhjennä"
 
+#: ../terminal/terminal-window.c:238
+#, fuzzy
+msgid "Reset and clear"
+msgstr "Palauta ja tyhjennä"
+
 #: ../terminal/terminal-window.c:239
 msgid "_Go"
 msgstr "_Siirry"
@@ -1486,6 +1290,272 @@ msgstr "_Päivitä utmp/wtmp -tietueet, kun komento käynnistetään"
 msgid "seconds"
 msgstr "sekuntia"
 
+#~ msgid ""
+#~ "  -h, --help                          Print this help message and exit"
+#~ msgstr "  -h, --help                          Tulosta tämä ohje ja poistu"
+
+#, fuzzy
+#~ msgid ""
+#~ "  -V, --version                       Print version information and exit"
+#~ msgstr ""
+#~ "  -v, --version                       Tulosta versiotiedot ja poistu"
+
+#~ msgid ""
+#~ "  --disable-server                    Do not register with the D-BUS\n"
+#~ "                                      session message bus"
+#~ msgstr ""
+#~ "  --disable-server                    Älä rekisteröidy D-BUS-"
+#~ "viestiväylän\n"
+#~ "                                      yhteyteen"
+
+#~ msgid "  --default-display=DISPLAY           default X display to use"
+#~ msgstr ""
+#~ "  --default-display=NÄYTTÖ            oletuksena käytettävä X:n näyttö"
+
+#~ msgid ""
+#~ "  --default-working-directory=DIRNAME Set the default terminal's working\n"
+#~ "                                      directory"
+#~ msgstr ""
+#~ "  --default-working-directory=KANSIO  Aseta oletuspäätteen työkansio"
+
+#~ msgid ""
+#~ "  --tab                               Open a new tab in the last-"
+#~ "specified\n"
+#~ "                                      window; more than one of these\n"
+#~ "                                      options can be provided"
+#~ msgstr ""
+#~ "  --tab                               Avaa välilehti viimeksi "
+#~ "määritettyyn\n"
+#~ "                                      ikkunaan. Näitä valitsimia voi "
+#~ "olla\n"
+#~ "                                      enemmän kuin yksi"
+
+#~ msgid ""
+#~ "  --window                            Open a new window containing one "
+#~ "tab;\n"
+#~ "                                      more than one of these options can "
+#~ "be\n"
+#~ "                                      provided"
+#~ msgstr ""
+#~ "  --window                            Avaa uusi ikkuna, jossa on yksi\n"
+#~ "                                      välilehti; Näitä valitsimia voi "
+#~ "olla\n"
+#~ "                                      enemmän kuin yksi"
+
+#~ msgid ""
+#~ "  -x, --execute                       Execute the remainder of the "
+#~ "command\n"
+#~ "                                      line inside the terminal"
+#~ msgstr ""
+#~ "  -x, --execute                       Suorita komentorivin loppuosa\n"
+#~ "                                      päätteessä"
+
+#~ msgid ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+#~ msgstr ""
+#~ "  -e, --command=MERKKIJONO            Suorita tämän valitsimen "
+#~ "argumentti\n"
+#~ "                                      päätteessä"
+
+#~ msgid ""
+#~ "  --working-directory=DIRNAME         Set the terminal's working directory"
+#~ msgstr "  --working-directory=KANSIO          Aseta päätteen työkansio"
+
+#~ msgid "  -T, --title=TITLE                   Set the terminal's title"
+#~ msgstr "  -T, --title=OTSAKE                  Aseta pääteikkunan otsake"
+
+#~ msgid ""
+#~ "  -H, --hold                          Do not immediately destroy the tab\n"
+#~ "                                      when the child command exits"
+#~ msgstr ""
+#~ "  -H, --hold                          Älä tuhoa välilehteä "
+#~ "automaattisesti\n"
+#~ "                                      sen lapsikomennon poistuessa"
+
+#~ msgid ""
+#~ "  --display=DISPLAY                   X display to use for the last-\n"
+#~ "                                      specified window"
+#~ msgstr ""
+#~ "  --display=NÄYTTÖ                    X:n näyttö, jota viimeksi valittu\n"
+#~ "                                      ikkuna käyttää"
+
+#~ msgid ""
+#~ "  --geometry=GEOMETRY                 X geometry specification (see \"X"
+#~ "\"\n"
+#~ "                                      man page), can be specified once "
+#~ "per\n"
+#~ "                                      window to be opened"
+#~ msgstr ""
+#~ "  --geometry=GEOMETRIA                X:n geometriamääritys (katso\n"
+#~ "                                      \"man X\"), voi määrittää kerran\n"
+#~ "                                      avattavaa ikkunaa kohden"
+
+#, fuzzy
+#~ msgid ""
+#~ "  --role=ROLE                         Set the role for the last-"
+#~ "specified\n"
+#~ "                                      window; applies to only one "
+#~ "window;\n"
+#~ "                                      can be specified once for each "
+#~ "window\n"
+#~ "                                      you create from the command line"
+#~ msgstr ""
+#~ "  --role=ROOLI                        Aseta rooli viimeksi määritetylle\n"
+#~ "                                      ikkunalle; koskee vain yhtä "
+#~ "ikkunaa;\n"
+#~ "                                      voi määrittää kerran jokaiselle\n"
+#~ "                                      komentoriviltä luodulle ikkunalle"
+
+#~ msgid ""
+#~ "  --startup-id=STRING                 ID for the startup notification\n"
+#~ "                                      protocol"
+#~ msgstr ""
+#~ "  --startup-id=MERKKIJONO             Tunniste käynnistyksen huomautus-\n"
+#~ "                                      protokollaa varten"
+
+#, fuzzy
+#~ msgid ""
+#~ "  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
+#~ "                                      name or filename"
+#~ msgstr ""
+#~ "  -e, --command=MERKKIJONO            Suorita tämän valitsimen "
+#~ "argumentti\n"
+#~ "                                      päätteessä"
+
+#, fuzzy
+#~ msgid ""
+#~ "  --fullscreen                        Set the last-specified window into\n"
+#~ "                                      fullscreen mode; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --fullscreen                        Aseta viimeksi määritetty ikkuna\n"
+#~ "                                      täysruututilaan; koskee ainoastaan\n"
+#~ "                                      yhtä ikkunaa; voi määrittää kerran\n"
+#~ "                                      jokaista komentoriviltä luotua\n"
+#~ "                                      ikkunaa kohden"
+
+#, fuzzy
+#~ msgid ""
+#~ "  --maximize                          Maximize the last-specified "
+#~ "window;\n"
+#~ "                                      applies to only one window; can be\n"
+#~ "                                      specified once for each window you\n"
+#~ "                                      create from the command line"
+#~ msgstr ""
+#~ "  --role=ROOLI                        Aseta rooli viimeksi määritetylle\n"
+#~ "                                      ikkunalle; koskee vain yhtä "
+#~ "ikkunaa;\n"
+#~ "                                      voi määrittää kerran jokaiselle\n"
+#~ "                                      komentoriviltä luodulle ikkunalle"
+
+#~ msgid ""
+#~ "  --show-menubar                      Turn on the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-menubar                      Asettaa valikkopalkin näkyviin\n"
+#~ "                                      viimeksi määritetyssä ikkunassa;\n"
+#~ "                                      koskee ainoastaan yhtä ikkunaa;\n"
+#~ "                                      voi määrittää kerran jokaista\n"
+#~ "                                      komentoriviltä luotua ikkunaa kohden"
+
+#~ msgid ""
+#~ "  --hide-menubar                      Turn off the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-menubar                      Piilottaa valikkopalkin näkyvistä\n"
+#~ "                                      viimeksi määritetyssä ikkunassa;\n"
+#~ "                                      koskee ainoastaan yhtä ikkunaa;\n"
+#~ "                                      voi määrittää kerran jokaista\n"
+#~ "                                      komentoriviltä luotua ikkunaa kohden"
+
+#~ msgid ""
+#~ "  --show-borders                      Turn on the window decorations for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --show-borders                      Asettaa viimeksi määritetyn "
+#~ "ikkunan\n"
+#~ "                                      reunukset näkyviin; koskee "
+#~ "ainoastaan\n"
+#~ "                                      yhtä ikkunaa; voi määrittää kerran\n"
+#~ "                                      jokaista komentoriviltä luotua\n"
+#~ "                                      ikkunaa kohden"
+
+#~ msgid ""
+#~ "  --hide-borders                      Turn off the window decorations "
+#~ "for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --hide-borders                      Piilottaa viimeksi määritetyn "
+#~ "ikkunan\n"
+#~ "                                      reunukset; koskee ainoastaan yhtä\n"
+#~ "                                      ikkunaa; voi määrittää kerran\n"
+#~ "                                      jokaista komentoriviltä luotua\n"
+#~ "                                      ikkunaa kohden"
+
+#~ msgid ""
+#~ "  --show-toolbars                     Turn on the toolbars for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-toolbars                     Asettaa viimeksi määritetyn "
+#~ "ikkunan\n"
+#~ "                                      työkalupalkin näkyviin; koskee\n"
+#~ "                                      ainoastaan yhtä ikkunaa;\n"
+#~ "                                      voi määrittää kerran jokaista\n"
+#~ "                                      komentoriviltä luotua ikkunaa kohden"
+
+#~ msgid ""
+#~ "  --hide-toolbars                     Turn off the toolbars for the "
+#~ "last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-toolbars                     Piilottaa viimeksi määritetyn "
+#~ "ikkunan\n"
+#~ "                                      työkalupalkin; koskee ainoastaan "
+#~ "yhtä\n"
+#~ "                                      ikkunaa; voi määrittää kerran\n"
+#~ "                                      jokaista komentoriviltä luotua\n"
+#~ "                                      ikkunaa kohden"
+
+#~ msgid "Unable to launch terminal: %s\n"
+#~ msgstr "Päätettä ei voi käynnistää: %s\n"
+
+#~ msgid ""
+#~ "Option \"--sm-client-id\" requires specifying the session id as its "
+#~ "parameter"
+#~ msgstr ""
+#~ "\"--sm-client-id\" -valitsin tarvitsee parametrikseen istunnon tunnisteen"
+
 #~ msgid "<b>Title:</b>"
 #~ msgstr "<b>Otsake:</b>"
 
diff --git a/po/fr.po b/po/fr.po
index b885b91..63705bc 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Terminal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 11:48+0100\n"
+"POT-Creation-Date: 2009-12-14 16:03+0100\n"
 "PO-Revision-Date: 2009-07-09 11:44+0200\n"
 "Last-Translator: Jérôme Guelfucci <jeromeg at xfce.org>\n"
 "Language-Team: French <xfce-i18n at xfce.org>\n"
@@ -18,304 +18,88 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../terminal/main.c:46
+#: ../terminal/main.c:48
 msgid "Usage:"
 msgstr "Utilisation :"
 
-#: ../terminal/main.c:47
+#: ../terminal/main.c:48
 msgid "OPTION"
 msgstr "OPTION"
 
-#: ../terminal/main.c:49
+#: ../terminal/main.c:53
 msgid "General Options"
 msgstr "Options générales"
 
-#: ../terminal/main.c:50
-msgid "  -h, --help                          Print this help message and exit"
-msgstr ""
-"  -h, --help                          Affiche ce message d'aide et quitte"
-
-#: ../terminal/main.c:51
-msgid ""
-"  -V, --version                       Print version information and exit"
-msgstr "  -V, --version                       Affiche la version et quitte"
-
-#: ../terminal/main.c:52
-msgid ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
-msgstr ""
-"  --disable-server                    Ne pas s'inscrire au bus de message\n"
-"                                      de la session D-BUS"
+#. parameter of --default-display
+#. parameter of --display
+#: ../terminal/main.c:55 ../terminal/main.c:81
+#, fuzzy
+msgid "display"
+msgstr "N'est pas affiché"
 
-#: ../terminal/main.c:54
-msgid "  --default-display=DISPLAY           default X display to use"
+#. parameter of --default-working-directory
+#. parameter of --working-directory
+#: ../terminal/main.c:57 ../terminal/main.c:72
+msgid "directory"
 msgstr ""
-"  --default-display=DISPLAY           Précise l'écran X par défaut à utiliser"
 
-#: ../terminal/main.c:55
-msgid ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
-msgstr ""
-"  --default-working-directory=NOMREP  Définit le répertoire de travail\n"
-"                                      par défaut"
-
-#: ../terminal/main.c:58
+#: ../terminal/main.c:61
 msgid "Window or Tab Separators"
 msgstr "Séparateurs de fenêtres ou d'onglets"
 
-#: ../terminal/main.c:59
-msgid ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-msgstr ""
-"  --tab                               Ouvre un nouvel onglet dans la "
-"dernière\n"
-"                                      fenêtre spécifiée; cette option peut "
-"être\n"
-"                                      utilisée plusieurs fois"
-
-#: ../terminal/main.c:62
-msgid ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-msgstr ""
-"  --window                            Ouvre une nouvelle fenêtre contenant "
-"un onglet;\n"
-"                                      cette option peut être utilisée "
-"plusieurs fois"
-
 #: ../terminal/main.c:66
 msgid "Tab Options"
 msgstr "Options des onglets"
 
-#: ../terminal/main.c:67
-msgid ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-msgstr ""
-"  -x, --execute                       Exécute le reste de la ligne de\n"
-"                                      commande dans le terminal"
-
-#: ../terminal/main.c:69
-msgid ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-msgstr ""
-"  -e, --command=STRING                Exécute l'argument de cette option\n"
-"                                      dans le terminal"
-
-#: ../terminal/main.c:71
-msgid ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
-msgstr ""
-"  --working-directory=NOMREP          Détermine le répertoire de travail du "
-"terminal"
-
-#: ../terminal/main.c:72
-msgid "  -T, --title=TITLE                   Set the terminal's title"
-msgstr "  -T, --title=TITRE                   Définit le titre du terminal"
+#. parameter of --command
+#: ../terminal/main.c:68
+#, fuzzy
+msgid "command"
+msgstr "Commande"
 
-#: ../terminal/main.c:73
-msgid ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-msgstr ""
-"  -H, --hold                          Ne pas supprimer l'onglet\n"
-"                                      lorsque la commande est terminée"
+#. parameter of --title
+#: ../terminal/main.c:70
+#, fuzzy
+msgid "title"
+msgstr "Titre"
 
-#: ../terminal/main.c:76
+#: ../terminal/main.c:79
 msgid "Window Options"
 msgstr "Options des fenêtres"
 
-#: ../terminal/main.c:77
-msgid ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
+#. parameter of --geometry
+#: ../terminal/main.c:83
+msgid "geometry"
 msgstr ""
-"  --display=ECRAN                     Précise l'écran X à utiliser\n"
-"                                      pour la dernière fenêtre spécifiée"
 
-#: ../terminal/main.c:79
-msgid ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
-msgstr ""
-"  --geometry=GEOMETRIE                Spécifications des dimensions X\n"
-"                                      (voir la page de manuel de \"X\"), "
-"peut\n"
-"                                      être spécifié une fois par fenêtre à "
-"être\n"
-"                                      ouverte"
-
-#: ../terminal/main.c:82
-msgid ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
+#. parameter of --role
+#: ../terminal/main.c:85
+msgid "role"
 msgstr ""
-"  --role=ROLE                         Régler le rôle de la dernière fenêtre\n"
-"                                      spécifiée; s'applique seulement à une\n"
-"                                      fenêtre; peut être spécifié pour "
-"chaque\n"
-"                                      fenêtre que vous créez à partir de la\n"
-"                                      ligne de commande"
-
-#: ../terminal/main.c:86
-msgid ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
-msgstr ""
-"  --startup-id=CHAINE                 Précise l'ID pour le protocole de\n"
-"                                      notification de démarrage"
 
-#: ../terminal/main.c:88
-msgid ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
-msgstr ""
-"  -I, --icon=ICONE                    Passer un nom d'icône ou un nom de "
-"fichier\n"
-"                                      à utiliser comme icône du terminal."
+#. parameter of --startup-id
+#: ../terminal/main.c:87
+#, fuzzy
+msgid "string"
+msgstr "Attention"
 
-#: ../terminal/main.c:90
-msgid ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --fullscreen                        Passe la dernière fenêtre spécifiée\n"
-"                                      en mode plein écran; s'applique\n"
-"                                      seulement à une fenêtre; peut être\n"
-"                                      spécifié pour chaque fenêtre que\n"
-"                                      vous créez à partir de la ligne de\n"
-"                                      commande"
-
-#: ../terminal/main.c:95
-msgid ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
-msgstr ""
-"  --maximize                          Maximise la dernière fenêtre "
-"spécifiée;\n"
-"                                      s'applique seulement à une fenêtre; "
-"peut\n"
-"                                      être spécifié pour chaque fenêtre que "
-"vous\n"
-"                                      créez à partir de la ligne de commande"
-
-#: ../terminal/main.c:99
-msgid ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-menubar                      Montre la barre de menu pour la\n"
-"                                      dernière fenêtre spécifiée; "
-"s'applique\n"
-"                                      seulement à une fenêtre; peut être\n"
-"                                      spécifié pour chaque fenêtre que\n"
-"                                      vous créez à partir de la ligne de\n"
-"                                      commande"
-
-#: ../terminal/main.c:104
-msgid ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --hide-menubar                      Cacher la barre de menu pour la\n"
-"                                      dernière fenêtre spécifiée; "
-"s'applique\n"
-"                                      seulement à une fenêtre; peut être\n"
-"                                      spécifié pour chaque fenêtre que\n"
-"                                      vous créez à partir de la ligne de\n"
-"                                      commande"
-
-#: ../terminal/main.c:109
-msgid ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --show-borders                      Afficher les décorations de la "
-"dernière\n"
-"                                      fenêtre spécifiée; s'applique "
-"seulement à une\n"
-"                                      fenêtre; peut être spécifié pour "
-"chaque\n"
-"                                      fenêtre que vous créez à partir de la\n"
-"                                      ligne de commande"
-
-#: ../terminal/main.c:114
-msgid ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --hide-borders                      Cacher les décorations de la dernière\n"
-"                                      fenêtre spécifiée; s'applique "
-"seulement à une\n"
-"                                      fenêtre; peut être spécifié pour "
-"chaque\n"
-"                                      fenêtre que vous créez à partir de la\n"
-"                                      ligne de commande"
-
-#: ../terminal/main.c:119
-msgid ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-toolbars                     Afficher la barre d'outils pour la\n"
-"                                      dernière fenêtre spécifiée; "
-"s'applique\n"
-"                                      seulement à une fenêtre; peut être\n"
-"                                      spécifié pour chaque fenêtre que\n"
-"                                      vous créez à partir de la ligne de\n"
-"                                      commande"
-
-#: ../terminal/main.c:124
-msgid ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#. parameter of --icon
+#: ../terminal/main.c:89
+#, fuzzy
+msgid "icon"
+msgstr "Action"
+
+#: ../terminal/main.c:91
+#, c-format
+msgid "See the %s man page for full explanation of the options above."
 msgstr ""
-"  --hide-toolbars                     Cacher la barre d'outils pour la\n"
-"                                      dernière fenêtre spécifiée; "
-"s'applique\n"
-"                                      seulement à une fenêtre; peut être\n"
-"                                      spécifié pour chaque fenêtre que\n"
-"                                      vous créez à partir de la ligne de\n"
-"                                      commande"
-
-#: ../terminal/main.c:151 ../terminal/terminal-preferences.c:1263
+
+#: ../terminal/main.c:118 ../terminal/terminal-preferences.c:1263
 #: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../terminal/main.c:173
+#: ../terminal/main.c:135
 #, c-format
 msgid ""
 "%s (Xfce %s)\n"
@@ -340,31 +124,26 @@ msgstr ""
 "\n"
 "Veuillez rapporter les bogues à <%s>.\n"
 
-#: ../terminal/main.c:267
+#: ../terminal/main.c:239
 #, c-format
 msgid "Unable to register terminal service: %s\n"
 msgstr "Impossible d'enregistrer le service terminal: %s\n"
 
-#: ../terminal/main.c:276
-#, c-format
-msgid "Unable to launch terminal: %s\n"
-msgstr "Impossible de lancer le terminal : %s\n"
-
-#: ../terminal/terminal-app.c:551
+#: ../terminal/terminal-app.c:554
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "Chaîne de géométrie invalide \"%s\"\n"
 
-#: ../terminal/terminal-dbus.c:114
+#: ../terminal/terminal-dbus.c:108
 msgid "User id mismatch"
 msgstr "Mauvaise concordance id utilisateur"
 
-#: ../terminal/terminal-dbus.c:146
+#: ../terminal/terminal-dbus.c:134
 #, c-format
 msgid "D-BUS message bus disconnected, exiting...\n"
 msgstr "Bus de message D-BUS déconnecté, sortie...\n"
 
-#: ../terminal/terminal-dbus.c:208
+#: ../terminal/terminal-dbus.c:196
 #, c-format
 msgid "Unable to register object %s"
 msgstr "Impossible d'enregistrer l'objet %s"
@@ -390,7 +169,7 @@ msgstr ""
 msgid "Failed to open the documentation browser"
 msgstr "Erreur lors de l'ouverture du navigateur de documentation"
 
-#: ../terminal/terminal-options.c:189
+#: ../terminal/terminal-options.c:206
 #, c-format
 msgid ""
 "Option \"--default-display\" requires specifying the default X display as "
@@ -399,7 +178,7 @@ msgstr ""
 "L'option \"--default-display\" demande comme paramètre l'écran X à utiliser "
 "par défaut"
 
-#: ../terminal/terminal-options.c:204
+#: ../terminal/terminal-options.c:221
 #, c-format
 msgid ""
 "Option \"--default-working-directory\" requires specifying the default "
@@ -408,28 +187,21 @@ msgstr ""
 "L'option \"--default-working-directory\" demande comme paramètre le "
 "répertoire de travail par défaut"
 
-#: ../terminal/terminal-options.c:235
-#, c-format
-msgid ""
-"Option \"--sm-client-id\" requires specifying the session id as its parameter"
-msgstr ""
-"L'option \"--sm-client-id\" demande comme paramètre l'identifiant de session"
-
-#: ../terminal/terminal-options.c:250
+#: ../terminal/terminal-options.c:237
 #, c-format
 msgid ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
 "of the command line"
 msgstr "L'option \"--execute/-x\" doit être suivie par la commande à lancer"
 
-#: ../terminal/terminal-options.c:267
+#: ../terminal/terminal-options.c:254
 #, c-format
 msgid ""
 "Option \"--command/-e\" requires specifying the command to run as its "
 "parameter"
 msgstr "L'option \"--command/-e\" demande comme paramètre la commande à lancer"
 
-#: ../terminal/terminal-options.c:284
+#: ../terminal/terminal-options.c:271
 #, c-format
 msgid ""
 "Option \"--working-directory\" requires specifying the working directory as "
@@ -438,18 +210,18 @@ msgstr ""
 "L'option \"--working-directory\" demande comme paramètre le répertoire de "
 "travail"
 
-#: ../terminal/terminal-options.c:299
+#: ../terminal/terminal-options.c:286
 #, c-format
 msgid "Option \"--title/-T\" requires specifying the title as its parameter"
 msgstr "L'option \"--title/-T\" demande le titre comme paramètre"
 
-#: ../terminal/terminal-options.c:319
+#: ../terminal/terminal-options.c:305
 #, c-format
 msgid ""
 "Option \"--display\" requires specifying the X display as its parameters"
 msgstr "L'option \"--display\" demande comme paramètre l'écran X"
 
-#: ../terminal/terminal-options.c:334
+#: ../terminal/terminal-options.c:320
 #, c-format
 msgid ""
 "Option \"--geometry\" requires specifying the window geometry as its "
@@ -457,19 +229,19 @@ msgid ""
 msgstr ""
 "L'option \"--geometry\" demande comme paramètre les dimensions de la fenêtre"
 
-#: ../terminal/terminal-options.c:349
+#: ../terminal/terminal-options.c:335
 #, c-format
 msgid "Option \"--role\" requires specifying the window role as its parameter"
 msgstr "L'option \"--role\" demande comme paramètre le rôle de la fenêtre"
 
-#: ../terminal/terminal-options.c:364
+#: ../terminal/terminal-options.c:350
 #, c-format
 msgid ""
 "Option \"--startup-id\" requires specifying the startup id as its parameter"
 msgstr ""
 "L'option \"--startup-id\" demande comme paramètre l'identifiant de démarrage"
 
-#: ../terminal/terminal-options.c:379
+#: ../terminal/terminal-options.c:365
 #, c-format
 msgid ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
@@ -478,7 +250,7 @@ msgstr ""
 "L'option \"--icon/-I\" demande comme paramètre le nom de l'icône ou le nom "
 "du fichier"
 
-#: ../terminal/terminal-options.c:435
+#: ../terminal/terminal-options.c:419
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Option \"%s\" inconnue"
@@ -547,7 +319,7 @@ msgstr "Plein écran"
 msgid "Set Title"
 msgstr "Modifier le titre"
 
-#: ../terminal/terminal-preferences.c:464
+#: ../terminal/terminal-preferences.c:464 ../terminal/terminal-window.c:237
 msgid "Reset"
 msgstr "Réinitialiser"
 
@@ -844,6 +616,11 @@ msgstr "_Réinitialiser"
 msgid "Reset and C_lear"
 msgstr "Réinitialiser et _effacer"
 
+#: ../terminal/terminal-window.c:238
+#, fuzzy
+msgid "Reset and clear"
+msgstr "Réinitialiser et effacer"
+
 #: ../terminal/terminal-window.c:239
 msgid "_Go"
 msgstr "_Aller"
@@ -1479,5 +1256,291 @@ msgstr ""
 msgid "seconds"
 msgstr "secondes"
 
+#~ msgid ""
+#~ "  -h, --help                          Print this help message and exit"
+#~ msgstr ""
+#~ "  -h, --help                          Affiche ce message d'aide et quitte"
+
+#~ msgid ""
+#~ "  -V, --version                       Print version information and exit"
+#~ msgstr "  -V, --version                       Affiche la version et quitte"
+
+#~ msgid ""
+#~ "  --disable-server                    Do not register with the D-BUS\n"
+#~ "                                      session message bus"
+#~ msgstr ""
+#~ "  --disable-server                    Ne pas s'inscrire au bus de "
+#~ "message\n"
+#~ "                                      de la session D-BUS"
+
+#~ msgid "  --default-display=DISPLAY           default X display to use"
+#~ msgstr ""
+#~ "  --default-display=DISPLAY           Précise l'écran X par défaut à "
+#~ "utiliser"
+
+#~ msgid ""
+#~ "  --default-working-directory=DIRNAME Set the default terminal's working\n"
+#~ "                                      directory"
+#~ msgstr ""
+#~ "  --default-working-directory=NOMREP  Définit le répertoire de travail\n"
+#~ "                                      par défaut"
+
+#~ msgid ""
+#~ "  --tab                               Open a new tab in the last-"
+#~ "specified\n"
+#~ "                                      window; more than one of these\n"
+#~ "                                      options can be provided"
+#~ msgstr ""
+#~ "  --tab                               Ouvre un nouvel onglet dans la "
+#~ "dernière\n"
+#~ "                                      fenêtre spécifiée; cette option "
+#~ "peut être\n"
+#~ "                                      utilisée plusieurs fois"
+
+#~ msgid ""
+#~ "  --window                            Open a new window containing one "
+#~ "tab;\n"
+#~ "                                      more than one of these options can "
+#~ "be\n"
+#~ "                                      provided"
+#~ msgstr ""
+#~ "  --window                            Ouvre une nouvelle fenêtre "
+#~ "contenant un onglet;\n"
+#~ "                                      cette option peut être utilisée "
+#~ "plusieurs fois"
+
+#~ msgid ""
+#~ "  -x, --execute                       Execute the remainder of the "
+#~ "command\n"
+#~ "                                      line inside the terminal"
+#~ msgstr ""
+#~ "  -x, --execute                       Exécute le reste de la ligne de\n"
+#~ "                                      commande dans le terminal"
+
+#~ msgid ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+#~ msgstr ""
+#~ "  -e, --command=STRING                Exécute l'argument de cette option\n"
+#~ "                                      dans le terminal"
+
+#~ msgid ""
+#~ "  --working-directory=DIRNAME         Set the terminal's working directory"
+#~ msgstr ""
+#~ "  --working-directory=NOMREP          Détermine le répertoire de travail "
+#~ "du terminal"
+
+#~ msgid "  -T, --title=TITLE                   Set the terminal's title"
+#~ msgstr "  -T, --title=TITRE                   Définit le titre du terminal"
+
+#~ msgid ""
+#~ "  -H, --hold                          Do not immediately destroy the tab\n"
+#~ "                                      when the child command exits"
+#~ msgstr ""
+#~ "  -H, --hold                          Ne pas supprimer l'onglet\n"
+#~ "                                      lorsque la commande est terminée"
+
+#~ msgid ""
+#~ "  --display=DISPLAY                   X display to use for the last-\n"
+#~ "                                      specified window"
+#~ msgstr ""
+#~ "  --display=ECRAN                     Précise l'écran X à utiliser\n"
+#~ "                                      pour la dernière fenêtre spécifiée"
+
+#~ msgid ""
+#~ "  --geometry=GEOMETRY                 X geometry specification (see \"X"
+#~ "\"\n"
+#~ "                                      man page), can be specified once "
+#~ "per\n"
+#~ "                                      window to be opened"
+#~ msgstr ""
+#~ "  --geometry=GEOMETRIE                Spécifications des dimensions X\n"
+#~ "                                      (voir la page de manuel de \"X\"), "
+#~ "peut\n"
+#~ "                                      être spécifié une fois par fenêtre "
+#~ "à être\n"
+#~ "                                      ouverte"
+
+#~ msgid ""
+#~ "  --role=ROLE                         Set the role for the last-"
+#~ "specified\n"
+#~ "                                      window; applies to only one "
+#~ "window;\n"
+#~ "                                      can be specified once for each "
+#~ "window\n"
+#~ "                                      you create from the command line"
+#~ msgstr ""
+#~ "  --role=ROLE                         Régler le rôle de la dernière "
+#~ "fenêtre\n"
+#~ "                                      spécifiée; s'applique seulement à "
+#~ "une\n"
+#~ "                                      fenêtre; peut être spécifié pour "
+#~ "chaque\n"
+#~ "                                      fenêtre que vous créez à partir de "
+#~ "la\n"
+#~ "                                      ligne de commande"
+
+#~ msgid ""
+#~ "  --startup-id=STRING                 ID for the startup notification\n"
+#~ "                                      protocol"
+#~ msgstr ""
+#~ "  --startup-id=CHAINE                 Précise l'ID pour le protocole de\n"
+#~ "                                      notification de démarrage"
+
+#~ msgid ""
+#~ "  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
+#~ "                                      name or filename"
+#~ msgstr ""
+#~ "  -I, --icon=ICONE                    Passer un nom d'icône ou un nom de "
+#~ "fichier\n"
+#~ "                                      à utiliser comme icône du terminal."
+
+#~ msgid ""
+#~ "  --fullscreen                        Set the last-specified window into\n"
+#~ "                                      fullscreen mode; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --fullscreen                        Passe la dernière fenêtre "
+#~ "spécifiée\n"
+#~ "                                      en mode plein écran; s'applique\n"
+#~ "                                      seulement à une fenêtre; peut être\n"
+#~ "                                      spécifié pour chaque fenêtre que\n"
+#~ "                                      vous créez à partir de la ligne de\n"
+#~ "                                      commande"
+
+#~ msgid ""
+#~ "  --maximize                          Maximize the last-specified "
+#~ "window;\n"
+#~ "                                      applies to only one window; can be\n"
+#~ "                                      specified once for each window you\n"
+#~ "                                      create from the command line"
+#~ msgstr ""
+#~ "  --maximize                          Maximise la dernière fenêtre "
+#~ "spécifiée;\n"
+#~ "                                      s'applique seulement à une fenêtre; "
+#~ "peut\n"
+#~ "                                      être spécifié pour chaque fenêtre "
+#~ "que vous\n"
+#~ "                                      créez à partir de la ligne de "
+#~ "commande"
+
+#~ msgid ""
+#~ "  --show-menubar                      Turn on the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-menubar                      Montre la barre de menu pour la\n"
+#~ "                                      dernière fenêtre spécifiée; "
+#~ "s'applique\n"
+#~ "                                      seulement à une fenêtre; peut être\n"
+#~ "                                      spécifié pour chaque fenêtre que\n"
+#~ "                                      vous créez à partir de la ligne de\n"
+#~ "                                      commande"
+
+#~ msgid ""
+#~ "  --hide-menubar                      Turn off the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-menubar                      Cacher la barre de menu pour la\n"
+#~ "                                      dernière fenêtre spécifiée; "
+#~ "s'applique\n"
+#~ "                                      seulement à une fenêtre; peut être\n"
+#~ "                                      spécifié pour chaque fenêtre que\n"
+#~ "                                      vous créez à partir de la ligne de\n"
+#~ "                                      commande"
+
+#~ msgid ""
+#~ "  --show-borders                      Turn on the window decorations for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --show-borders                      Afficher les décorations de la "
+#~ "dernière\n"
+#~ "                                      fenêtre spécifiée; s'applique "
+#~ "seulement à une\n"
+#~ "                                      fenêtre; peut être spécifié pour "
+#~ "chaque\n"
+#~ "                                      fenêtre que vous créez à partir de "
+#~ "la\n"
+#~ "                                      ligne de commande"
+
+#~ msgid ""
+#~ "  --hide-borders                      Turn off the window decorations "
+#~ "for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --hide-borders                      Cacher les décorations de la "
+#~ "dernière\n"
+#~ "                                      fenêtre spécifiée; s'applique "
+#~ "seulement à une\n"
+#~ "                                      fenêtre; peut être spécifié pour "
+#~ "chaque\n"
+#~ "                                      fenêtre que vous créez à partir de "
+#~ "la\n"
+#~ "                                      ligne de commande"
+
+#~ msgid ""
+#~ "  --show-toolbars                     Turn on the toolbars for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-toolbars                     Afficher la barre d'outils pour la\n"
+#~ "                                      dernière fenêtre spécifiée; "
+#~ "s'applique\n"
+#~ "                                      seulement à une fenêtre; peut être\n"
+#~ "                                      spécifié pour chaque fenêtre que\n"
+#~ "                                      vous créez à partir de la ligne de\n"
+#~ "                                      commande"
+
+#~ msgid ""
+#~ "  --hide-toolbars                     Turn off the toolbars for the "
+#~ "last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-toolbars                     Cacher la barre d'outils pour la\n"
+#~ "                                      dernière fenêtre spécifiée; "
+#~ "s'applique\n"
+#~ "                                      seulement à une fenêtre; peut être\n"
+#~ "                                      spécifié pour chaque fenêtre que\n"
+#~ "                                      vous créez à partir de la ligne de\n"
+#~ "                                      commande"
+
+#~ msgid "Unable to launch terminal: %s\n"
+#~ msgstr "Impossible de lancer le terminal : %s\n"
+
+#~ msgid ""
+#~ "Option \"--sm-client-id\" requires specifying the session id as its "
+#~ "parameter"
+#~ msgstr ""
+#~ "L'option \"--sm-client-id\" demande comme paramètre l'identifiant de "
+#~ "session"
+
 #~ msgid "<b>Title:</b>"
 #~ msgstr "<b>Titre :</b>"
diff --git a/po/gl.po b/po/gl.po
index b0e4663..fc83590 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Terminal 0.2.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 11:48+0100\n"
+"POT-Creation-Date: 2009-12-14 16:03+0100\n"
 "PO-Revision-Date: 2009-08-19 12:34+0100\n"
 "Last-Translator: Leandro Regueiro <leandro.regueiro at gmail.com>\n"
 "Language-Team: Galician <proxecto at trasno.net>\n"
@@ -20,290 +20,88 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: ../terminal/main.c:46
+#: ../terminal/main.c:48
 msgid "Usage:"
 msgstr "Uso:"
 
-#: ../terminal/main.c:47
+#: ../terminal/main.c:48
 msgid "OPTION"
 msgstr "OPCIÓN"
 
-#: ../terminal/main.c:49
+#: ../terminal/main.c:53
 msgid "General Options"
 msgstr "Opcións xerais"
 
-#: ../terminal/main.c:50
-msgid "  -h, --help                          Print this help message and exit"
-msgstr ""
-"  -h, --help                          Mostra esta mensaxe de axuda e sae"
-
-#: ../terminal/main.c:51
-msgid ""
-"  -V, --version                       Print version information and exit"
-msgstr ""
-"  -V, --version                       Mostra información da versión e sae"
-
-#: ../terminal/main.c:52
-msgid ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
-msgstr ""
-
-#: ../terminal/main.c:54
-msgid "  --default-display=DISPLAY           default X display to use"
-msgstr ""
+#. parameter of --default-display
+#. parameter of --display
+#: ../terminal/main.c:55 ../terminal/main.c:81
+#, fuzzy
+msgid "display"
+msgstr "Non se mostra"
 
-#: ../terminal/main.c:55
-msgid ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
+#. parameter of --default-working-directory
+#. parameter of --working-directory
+#: ../terminal/main.c:57 ../terminal/main.c:72
+msgid "directory"
 msgstr ""
-"  --default-working-directory=NOME_DIR Definie o directorio de traballo\n"
-"                                       predeterminado do terminal"
 
-#: ../terminal/main.c:58
+#: ../terminal/main.c:61
 msgid "Window or Tab Separators"
 msgstr "Separadores de fiestras ou lapelas"
 
-#: ../terminal/main.c:59
-msgid ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-msgstr ""
-"  --tab                               Abrir unha nova lapela na última "
-"xanela\n"
-"                                      especificada; pódese proporcionar "
-"máis\n"
-"                                      dunha destas opcións"
-
-#: ../terminal/main.c:62
-msgid ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-msgstr ""
-"  --window                            Abrir unha nova xanela cunha soa\n"
-"                                      lapela; pódese proporcionar máis "
-"dunha\n"
-"                                      destas opcións"
-
 #: ../terminal/main.c:66
 msgid "Tab Options"
 msgstr "Opcións de lapelas"
 
-#: ../terminal/main.c:67
-msgid ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-msgstr ""
-"  -x, --execute                       Executa o resto da liña de comandos "
-"na\n"
-"                                      terminal"
-
-#: ../terminal/main.c:69
-msgid ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-msgstr ""
-"  -e, --command=CADEA                 Executa na terminal o argumento\n"
-"                                      desta opción"
-
-#: ../terminal/main.c:71
-msgid ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
-msgstr ""
-"  --working-directory=NOME_DIR        Define o directorio de traballo do\n"
-"                                      terminal"
-
-#: ../terminal/main.c:72
-msgid "  -T, --title=TITLE                   Set the terminal's title"
-msgstr "  -T, --title=TITULO                 Definir o título da terminal"
+#. parameter of --command
+#: ../terminal/main.c:68
+#, fuzzy
+msgid "command"
+msgstr "Comando"
 
-#: ../terminal/main.c:73
-msgid ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-msgstr ""
-"  -H, --hold                          Non destruír a lapela inmediatamente\n"
-"                                      cando o comando fillo remata"
+#. parameter of --title
+#: ../terminal/main.c:70
+#, fuzzy
+msgid "title"
+msgstr "Título"
 
-#: ../terminal/main.c:76
+#: ../terminal/main.c:79
 msgid "Window Options"
 msgstr "Opcións de ventá"
 
-#: ../terminal/main.c:77
-msgid ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
+#. parameter of --geometry
+#: ../terminal/main.c:83
+msgid "geometry"
 msgstr ""
 
-#: ../terminal/main.c:79
-msgid ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
+#. parameter of --role
+#: ../terminal/main.c:85
+msgid "role"
 msgstr ""
 
-#: ../terminal/main.c:82
-msgid ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
-msgstr ""
+#. parameter of --startup-id
+#: ../terminal/main.c:87
+#, fuzzy
+msgid "string"
+msgstr "Advertencia"
 
-#: ../terminal/main.c:86
-msgid ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
-msgstr ""
-"  --startup-id=CADEA                  ID para o protocolo de notificación\n"
-"                                      de inicio"
+#. parameter of --icon
+#: ../terminal/main.c:89
+#, fuzzy
+msgid "icon"
+msgstr "Acción"
 
-#: ../terminal/main.c:88
-msgid ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
+#: ../terminal/main.c:91
+#, c-format
+msgid "See the %s man page for full explanation of the options above."
 msgstr ""
-"  -I, --icon=ICONA                    Define a icona da terminal como\n"
-"                                      un nome de icona ou un nome de ficheiro"
 
-#: ../terminal/main.c:90
-msgid ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --fullscreen                        Poñer a última fiestra especificada\n"
-"                                      en modo pantalla completa; só se "
-"aplica\n"
-"                                      a unha fiestra; pode especificarse "
-"unha\n"
-"                                      vez por cada fiestra que se crea "
-"dende\n"
-"                                      a liña de comandos"
-
-#: ../terminal/main.c:95
-msgid ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
-msgstr ""
-"  --maximize                          Maximiza a última fiestra "
-"especificada;\n"
-"                                      só se aplica a unha fiestra; pode\n"
-"                                      especificarse unha vez por cada "
-"fiestra\n"
-"                                      que se crea dende a liña de comandos"
-
-#: ../terminal/main.c:99
-msgid ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-menubar                      Activar a barra de menú para a\n"
-"                                      última fiestra especificada; só se "
-"aplica a\n"
-"                                      unha fiestra; pode especificarse unha "
-"vez\n"
-"                                      por cada fiestra que se crea dende a\n"
-"                                      liña de comandos"
-
-#: ../terminal/main.c:104
-msgid ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --hide-menubar                      Desactivar a barra de menú para\n"
-"                                      a última fiestra especificada; só se "
-"aplica\n"
-"                                      a unha fiestra; pode especificarse "
-"unha\n"
-"                                      vez por cada fiestra que se crea "
-"dende\n"
-"                                      a liña de comandos"
-
-#: ../terminal/main.c:109
-msgid ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --show-borders                      Activar as decoracións das fiestras\n"
-"                                       para a última fiestra especificada; "
-"só se\n"
-"                                      aplica a unha fiestra; pode "
-"especificarse\n"
-"                                      unha vez por cada fiestra que se crea\n"
-"                                      dende a liña de comandos"
-
-#: ../terminal/main.c:114
-msgid ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --hide-borders                      Desactivar as decoracións das "
-"fiestras\n"
-"                                       para a última fiestra especificada; "
-"só se\n"
-"                                      aplica a unha fiestra; pode "
-"especificarse\n"
-"                                      unha vez por cada fiestra que se crea\n"
-"                                      dende a liña de comandos"
-
-#: ../terminal/main.c:119
-msgid ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-toolbars                     Activar as barras de ferramentas\n"
-"                                      para a última fiestra especificada; só "
-"se\n"
-"                                      aplica a unha fiestra; pode "
-"especificarse\n"
-"                                      unha vez por cada fiestra que se crea\n"
-"                                      dende a liña de comandos"
-
-#: ../terminal/main.c:124
-msgid ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --hide-toolbars                     Desactivar as barras de ferramentas\n"
-"                                      para a última fiestra especificada; só "
-"se\n"
-"                                      aplica a unha fiestra; pode "
-"especificarse\n"
-"                                      unha vez por cada fiestra que se crea\n"
-"                                      dende a liña de comandos"
-
-#: ../terminal/main.c:151 ../terminal/terminal-preferences.c:1263
+#: ../terminal/main.c:118 ../terminal/terminal-preferences.c:1263
 #: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../terminal/main.c:173
+#: ../terminal/main.c:135
 #, c-format
 msgid ""
 "%s (Xfce %s)\n"
@@ -328,31 +126,26 @@ msgstr ""
 "\n"
 "Comuníquelle os erros a <%s>.\n"
 
-#: ../terminal/main.c:267
+#: ../terminal/main.c:239
 #, c-format
 msgid "Unable to register terminal service: %s\n"
 msgstr "Non foi posible rexistrar o servizo de terminal: %s\n"
 
-#: ../terminal/main.c:276
-#, c-format
-msgid "Unable to launch terminal: %s\n"
-msgstr "Non foi posible iniciar a terminal: %s\n"
-
-#: ../terminal/terminal-app.c:551
+#: ../terminal/terminal-app.c:554
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "A cadea de xeometría \"%s\" é incorrecta\n"
 
-#: ../terminal/terminal-dbus.c:114
+#: ../terminal/terminal-dbus.c:108
 msgid "User id mismatch"
 msgstr "O id do usuario non coincide"
 
-#: ../terminal/terminal-dbus.c:146
+#: ../terminal/terminal-dbus.c:134
 #, c-format
 msgid "D-BUS message bus disconnected, exiting...\n"
 msgstr "Bus de mensaxes D-BUS desconectado, saíndo...\n"
 
-#: ../terminal/terminal-dbus.c:208
+#: ../terminal/terminal-dbus.c:196
 #, c-format
 msgid "Unable to register object %s"
 msgstr "Non foi posible rexistrar o obxecto %s"
@@ -378,14 +171,14 @@ msgstr ""
 msgid "Failed to open the documentation browser"
 msgstr "Fallo ó abrir o navegador da documentación"
 
-#: ../terminal/terminal-options.c:189
+#: ../terminal/terminal-options.c:206
 #, c-format
 msgid ""
 "Option \"--default-display\" requires specifying the default X display as "
 "its parameter"
 msgstr ""
 
-#: ../terminal/terminal-options.c:204
+#: ../terminal/terminal-options.c:221
 #, c-format
 msgid ""
 "Option \"--default-working-directory\" requires specifying the default "
@@ -394,15 +187,7 @@ msgstr ""
 "A opción \"--default-working-directory\" require especificar o directorio de "
 "traballo predeterminado como parámetro"
 
-#: ../terminal/terminal-options.c:235
-#, c-format
-msgid ""
-"Option \"--sm-client-id\" requires specifying the session id as its parameter"
-msgstr ""
-"A opción \"--sm-client-id\" require que se especifique o id de sesión como "
-"parámetro"
-
-#: ../terminal/terminal-options.c:250
+#: ../terminal/terminal-options.c:237
 #, c-format
 msgid ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
@@ -411,7 +196,7 @@ msgstr ""
 "A opción \"--execute/-x\" require que se especifique o comando a executar no "
 "resto da liña de comandos"
 
-#: ../terminal/terminal-options.c:267
+#: ../terminal/terminal-options.c:254
 #, c-format
 msgid ""
 "Option \"--command/-e\" requires specifying the command to run as its "
@@ -420,7 +205,7 @@ msgstr ""
 "A opción \"--command/-e\" require que se especifique como parámetro o "
 "comando a executar"
 
-#: ../terminal/terminal-options.c:284
+#: ../terminal/terminal-options.c:271
 #, c-format
 msgid ""
 "Option \"--working-directory\" requires specifying the working directory as "
@@ -429,19 +214,19 @@ msgstr ""
 "A opción \"--working-directory\" require que se especifique o directorio de "
 "traballo como parámetro"
 
-#: ../terminal/terminal-options.c:299
+#: ../terminal/terminal-options.c:286
 #, c-format
 msgid "Option \"--title/-T\" requires specifying the title as its parameter"
 msgstr ""
 "A opción \"--title/-T\" require que se especifique o título como parámetro"
 
-#: ../terminal/terminal-options.c:319
+#: ../terminal/terminal-options.c:305
 #, c-format
 msgid ""
 "Option \"--display\" requires specifying the X display as its parameters"
 msgstr ""
 
-#: ../terminal/terminal-options.c:334
+#: ../terminal/terminal-options.c:320
 #, c-format
 msgid ""
 "Option \"--geometry\" requires specifying the window geometry as its "
@@ -450,12 +235,12 @@ msgstr ""
 "A opción \"--geometry\" require que se especifique a xeometría da ventá como "
 "parámetro"
 
-#: ../terminal/terminal-options.c:349
+#: ../terminal/terminal-options.c:335
 #, c-format
 msgid "Option \"--role\" requires specifying the window role as its parameter"
 msgstr ""
 
-#: ../terminal/terminal-options.c:364
+#: ../terminal/terminal-options.c:350
 #, c-format
 msgid ""
 "Option \"--startup-id\" requires specifying the startup id as its parameter"
@@ -463,7 +248,7 @@ msgstr ""
 "A opción \"--startup-id\" require a especificación do id de inicio como "
 "parámetro"
 
-#: ../terminal/terminal-options.c:379
+#: ../terminal/terminal-options.c:365
 #, c-format
 msgid ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
@@ -472,7 +257,7 @@ msgstr ""
 "A opción \"--icon/-I\" require que se especifique un nome de icona ou o seu "
 "nome de ficheiro como parámetro"
 
-#: ../terminal/terminal-options.c:435
+#: ../terminal/terminal-options.c:419
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Opción descoñecida \"%s\""
@@ -541,7 +326,7 @@ msgstr "Pantalla completa"
 msgid "Set Title"
 msgstr "Definir o título"
 
-#: ../terminal/terminal-preferences.c:464
+#: ../terminal/terminal-preferences.c:464 ../terminal/terminal-window.c:237
 msgid "Reset"
 msgstr "Restablecer"
 
@@ -840,6 +625,11 @@ msgstr "_Restablecer"
 msgid "Reset and C_lear"
 msgstr "Restaurar e _limpar"
 
+#: ../terminal/terminal-window.c:238
+#, fuzzy
+msgid "Reset and clear"
+msgstr "Restablecer e limpar"
+
 #: ../terminal/terminal-window.c:239
 msgid "_Go"
 msgstr "_Ir"
@@ -1470,6 +1260,248 @@ msgstr "_Actualizar os rexistros utmp/wtmp cando se inicia o comando"
 msgid "seconds"
 msgstr "segundos"
 
+#~ msgid ""
+#~ "  -h, --help                          Print this help message and exit"
+#~ msgstr ""
+#~ "  -h, --help                          Mostra esta mensaxe de axuda e sae"
+
+#~ msgid ""
+#~ "  -V, --version                       Print version information and exit"
+#~ msgstr ""
+#~ "  -V, --version                       Mostra información da versión e sae"
+
+#~ msgid ""
+#~ "  --default-working-directory=DIRNAME Set the default terminal's working\n"
+#~ "                                      directory"
+#~ msgstr ""
+#~ "  --default-working-directory=NOME_DIR Definie o directorio de traballo\n"
+#~ "                                       predeterminado do terminal"
+
+#~ msgid ""
+#~ "  --tab                               Open a new tab in the last-"
+#~ "specified\n"
+#~ "                                      window; more than one of these\n"
+#~ "                                      options can be provided"
+#~ msgstr ""
+#~ "  --tab                               Abrir unha nova lapela na última "
+#~ "xanela\n"
+#~ "                                      especificada; pódese proporcionar "
+#~ "máis\n"
+#~ "                                      dunha destas opcións"
+
+#~ msgid ""
+#~ "  --window                            Open a new window containing one "
+#~ "tab;\n"
+#~ "                                      more than one of these options can "
+#~ "be\n"
+#~ "                                      provided"
+#~ msgstr ""
+#~ "  --window                            Abrir unha nova xanela cunha soa\n"
+#~ "                                      lapela; pódese proporcionar máis "
+#~ "dunha\n"
+#~ "                                      destas opcións"
+
+#~ msgid ""
+#~ "  -x, --execute                       Execute the remainder of the "
+#~ "command\n"
+#~ "                                      line inside the terminal"
+#~ msgstr ""
+#~ "  -x, --execute                       Executa o resto da liña de comandos "
+#~ "na\n"
+#~ "                                      terminal"
+
+#~ msgid ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+#~ msgstr ""
+#~ "  -e, --command=CADEA                 Executa na terminal o argumento\n"
+#~ "                                      desta opción"
+
+#~ msgid ""
+#~ "  --working-directory=DIRNAME         Set the terminal's working directory"
+#~ msgstr ""
+#~ "  --working-directory=NOME_DIR        Define o directorio de traballo do\n"
+#~ "                                      terminal"
+
+#~ msgid "  -T, --title=TITLE                   Set the terminal's title"
+#~ msgstr "  -T, --title=TITULO                 Definir o título da terminal"
+
+#~ msgid ""
+#~ "  -H, --hold                          Do not immediately destroy the tab\n"
+#~ "                                      when the child command exits"
+#~ msgstr ""
+#~ "  -H, --hold                          Non destruír a lapela "
+#~ "inmediatamente\n"
+#~ "                                      cando o comando fillo remata"
+
+#~ msgid ""
+#~ "  --startup-id=STRING                 ID for the startup notification\n"
+#~ "                                      protocol"
+#~ msgstr ""
+#~ "  --startup-id=CADEA                  ID para o protocolo de "
+#~ "notificación\n"
+#~ "                                      de inicio"
+
+#~ msgid ""
+#~ "  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
+#~ "                                      name or filename"
+#~ msgstr ""
+#~ "  -I, --icon=ICONA                    Define a icona da terminal como\n"
+#~ "                                      un nome de icona ou un nome de "
+#~ "ficheiro"
+
+#~ msgid ""
+#~ "  --fullscreen                        Set the last-specified window into\n"
+#~ "                                      fullscreen mode; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --fullscreen                        Poñer a última fiestra "
+#~ "especificada\n"
+#~ "                                      en modo pantalla completa; só se "
+#~ "aplica\n"
+#~ "                                      a unha fiestra; pode especificarse "
+#~ "unha\n"
+#~ "                                      vez por cada fiestra que se crea "
+#~ "dende\n"
+#~ "                                      a liña de comandos"
+
+#~ msgid ""
+#~ "  --maximize                          Maximize the last-specified "
+#~ "window;\n"
+#~ "                                      applies to only one window; can be\n"
+#~ "                                      specified once for each window you\n"
+#~ "                                      create from the command line"
+#~ msgstr ""
+#~ "  --maximize                          Maximiza a última fiestra "
+#~ "especificada;\n"
+#~ "                                      só se aplica a unha fiestra; pode\n"
+#~ "                                      especificarse unha vez por cada "
+#~ "fiestra\n"
+#~ "                                      que se crea dende a liña de comandos"
+
+#~ msgid ""
+#~ "  --show-menubar                      Turn on the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-menubar                      Activar a barra de menú para a\n"
+#~ "                                      última fiestra especificada; só se "
+#~ "aplica a\n"
+#~ "                                      unha fiestra; pode especificarse "
+#~ "unha vez\n"
+#~ "                                      por cada fiestra que se crea dende "
+#~ "a\n"
+#~ "                                      liña de comandos"
+
+#~ msgid ""
+#~ "  --hide-menubar                      Turn off the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-menubar                      Desactivar a barra de menú para\n"
+#~ "                                      a última fiestra especificada; só "
+#~ "se aplica\n"
+#~ "                                      a unha fiestra; pode especificarse "
+#~ "unha\n"
+#~ "                                      vez por cada fiestra que se crea "
+#~ "dende\n"
+#~ "                                      a liña de comandos"
+
+#~ msgid ""
+#~ "  --show-borders                      Turn on the window decorations for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --show-borders                      Activar as decoracións das "
+#~ "fiestras\n"
+#~ "                                       para a última fiestra "
+#~ "especificada; só se\n"
+#~ "                                      aplica a unha fiestra; pode "
+#~ "especificarse\n"
+#~ "                                      unha vez por cada fiestra que se "
+#~ "crea\n"
+#~ "                                      dende a liña de comandos"
+
+#~ msgid ""
+#~ "  --hide-borders                      Turn off the window decorations "
+#~ "for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --hide-borders                      Desactivar as decoracións das "
+#~ "fiestras\n"
+#~ "                                       para a última fiestra "
+#~ "especificada; só se\n"
+#~ "                                      aplica a unha fiestra; pode "
+#~ "especificarse\n"
+#~ "                                      unha vez por cada fiestra que se "
+#~ "crea\n"
+#~ "                                      dende a liña de comandos"
+
+#~ msgid ""
+#~ "  --show-toolbars                     Turn on the toolbars for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-toolbars                     Activar as barras de ferramentas\n"
+#~ "                                      para a última fiestra especificada; "
+#~ "só se\n"
+#~ "                                      aplica a unha fiestra; pode "
+#~ "especificarse\n"
+#~ "                                      unha vez por cada fiestra que se "
+#~ "crea\n"
+#~ "                                      dende a liña de comandos"
+
+#~ msgid ""
+#~ "  --hide-toolbars                     Turn off the toolbars for the "
+#~ "last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-toolbars                     Desactivar as barras de "
+#~ "ferramentas\n"
+#~ "                                      para a última fiestra especificada; "
+#~ "só se\n"
+#~ "                                      aplica a unha fiestra; pode "
+#~ "especificarse\n"
+#~ "                                      unha vez por cada fiestra que se "
+#~ "crea\n"
+#~ "                                      dende a liña de comandos"
+
+#~ msgid "Unable to launch terminal: %s\n"
+#~ msgstr "Non foi posible iniciar a terminal: %s\n"
+
+#~ msgid ""
+#~ "Option \"--sm-client-id\" requires specifying the session id as its "
+#~ "parameter"
+#~ msgstr ""
+#~ "A opción \"--sm-client-id\" require que se especifique o id de sesión "
+#~ "como parámetro"
+
 #~ msgid "<b>Title:</b>"
 #~ msgstr "<b>Título:</b>"
 
diff --git a/po/he.po b/po/he.po
index be6dd8f..ae202a8 100644
--- a/po/he.po
+++ b/po/he.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Terminal 0.2.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 11:48+0100\n"
+"POT-Creation-Date: 2009-12-14 16:03+0100\n"
 "PO-Revision-Date: 2008-04-29 20:44+0200\n"
 "Last-Translator: Dotan Kamber <kamberd at yahoo.com>\n"
 "Language-Team: Hebrew\n"
@@ -18,284 +18,91 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../terminal/main.c:46
+#: ../terminal/main.c:48
 msgid "Usage:"
 msgstr ""
 
-#: ../terminal/main.c:47
+#: ../terminal/main.c:48
 msgid "OPTION"
 msgstr ""
 
-#: ../terminal/main.c:49
+#: ../terminal/main.c:53
 #, fuzzy
 msgid "General Options"
 msgstr "כללי"
 
-#: ../terminal/main.c:50
-msgid "  -h, --help                          Print this help message and exit"
-msgstr "  -h, --help                          Print this help message and exit"
-
-#: ../terminal/main.c:51
+#. parameter of --default-display
+#. parameter of --display
+#: ../terminal/main.c:55 ../terminal/main.c:81
 #, fuzzy
-msgid ""
-"  -V, --version                       Print version information and exit"
-msgstr ""
-"  -v, --version                       Print version information and exit"
-
-#: ../terminal/main.c:52
-msgid ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
-msgstr ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
-
-#: ../terminal/main.c:54
-msgid "  --default-display=DISPLAY           default X display to use"
-msgstr "  --default-display=DISPLAY           default X display to use"
+msgid "display"
+msgstr "לא מוצגת"
 
-#: ../terminal/main.c:55
-msgid ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
+#. parameter of --default-working-directory
+#. parameter of --working-directory
+#: ../terminal/main.c:57 ../terminal/main.c:72
+msgid "directory"
 msgstr ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
 
-#: ../terminal/main.c:58
+#: ../terminal/main.c:61
 msgid "Window or Tab Separators"
 msgstr ""
 
-#: ../terminal/main.c:59
-msgid ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-msgstr ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-
-#: ../terminal/main.c:62
-msgid ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-msgstr ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-
 #: ../terminal/main.c:66
 #, fuzzy
 msgid "Tab Options"
 msgstr "אפשרויות כרטיסיות"
 
-#: ../terminal/main.c:67
-msgid ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-msgstr ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-
-#: ../terminal/main.c:69
-msgid ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-msgstr ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-
-#: ../terminal/main.c:71
-msgid ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
-msgstr ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
-
-#: ../terminal/main.c:72
-msgid "  -T, --title=TITLE                   Set the terminal's title"
-msgstr "  -T, --title=TITLE                   Set the terminal's title"
-
-#: ../terminal/main.c:73
-msgid ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-msgstr ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-
-#: ../terminal/main.c:76
+#. parameter of --command
+#: ../terminal/main.c:68
 #, fuzzy
-msgid "Window Options"
-msgstr "Unknown option \"%s\""
+msgid "command"
+msgstr "<b>פקודה</b>"
 
-#: ../terminal/main.c:77
-msgid ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
-msgstr ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
+#. parameter of --title
+#: ../terminal/main.c:70
+#, fuzzy
+msgid "title"
+msgstr "כותרת"
 
 #: ../terminal/main.c:79
-msgid ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
-msgstr ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
-
-#: ../terminal/main.c:82
 #, fuzzy
-msgid ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
-msgstr ""
-"  --role=ROLE                         Set the role for the last-specified;\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
+msgid "Window Options"
+msgstr "Unknown option \"%s\""
 
-#: ../terminal/main.c:86
-msgid ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
+#. parameter of --geometry
+#: ../terminal/main.c:83
+msgid "geometry"
 msgstr ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
 
-#: ../terminal/main.c:88
-#, fuzzy
-msgid ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
+#. parameter of --role
+#: ../terminal/main.c:85
+msgid "role"
 msgstr ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
 
-#: ../terminal/main.c:90
+#. parameter of --startup-id
+#: ../terminal/main.c:87
 #, fuzzy
-msgid ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line."
+msgid "string"
+msgstr "אזהרה"
 
-#: ../terminal/main.c:95
+#. parameter of --icon
+#: ../terminal/main.c:89
 #, fuzzy
-msgid ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
-msgstr ""
-"  --role=ROLE                         Set the role for the last-specified;\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
-
-#: ../terminal/main.c:99
-msgid ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-
-#: ../terminal/main.c:104
-msgid ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-
-#: ../terminal/main.c:109
-msgid ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-
-#: ../terminal/main.c:114
-msgid ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-
-#: ../terminal/main.c:119
-msgid ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+msgid "icon"
+msgstr "פעולה"
 
-#: ../terminal/main.c:124
-msgid ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#: ../terminal/main.c:91
+#, c-format
+msgid "See the %s man page for full explanation of the options above."
 msgstr ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
 
-#: ../terminal/main.c:151 ../terminal/terminal-preferences.c:1263
+#: ../terminal/main.c:118 ../terminal/terminal-preferences.c:1263
 #: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr "מסוף"
 
-#: ../terminal/main.c:173
+#: ../terminal/main.c:135
 #, c-format
 msgid ""
 "%s (Xfce %s)\n"
@@ -320,31 +127,26 @@ msgstr ""
 "\n"
 "דיווחי באגים נא לשלוח אל <%s>.\n"
 
-#: ../terminal/main.c:267
+#: ../terminal/main.c:239
 #, c-format
 msgid "Unable to register terminal service: %s\n"
 msgstr "אין אפשרות לרשום את שרות המסוף: %s\n"
 
-#: ../terminal/main.c:276
-#, c-format
-msgid "Unable to launch terminal: %s\n"
-msgstr "אין אפשרות להפעיל מסוף: %s\n"
-
-#: ../terminal/terminal-app.c:551
+#: ../terminal/terminal-app.c:554
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "מחרוזת גודל ומיקום לא שגויה \"%s\"\n"
 
-#: ../terminal/terminal-dbus.c:114
+#: ../terminal/terminal-dbus.c:108
 msgid "User id mismatch"
 msgstr "חוסר התאמה בזהות המשתמש"
 
-#: ../terminal/terminal-dbus.c:146
+#: ../terminal/terminal-dbus.c:134
 #, c-format
 msgid "D-BUS message bus disconnected, exiting...\n"
 msgstr "ערוץ ההודעות של D-BUS מנותק, יוצא...\n"
 
-#: ../terminal/terminal-dbus.c:208
+#: ../terminal/terminal-dbus.c:196
 #, c-format
 msgid "Unable to register object %s"
 msgstr "אין אפשרות לרשום אובייקט %s"
@@ -366,7 +168,7 @@ msgstr ""
 msgid "Failed to open the documentation browser"
 msgstr "אין אפשרות לפתוח את מציג התיעוד"
 
-#: ../terminal/terminal-options.c:189
+#: ../terminal/terminal-options.c:206
 #, c-format
 msgid ""
 "Option \"--default-display\" requires specifying the default X display as "
@@ -375,7 +177,7 @@ msgstr ""
 "Option \"--default-display\" requires specifying the default X display as "
 "its parameter"
 
-#: ../terminal/terminal-options.c:204
+#: ../terminal/terminal-options.c:221
 #, c-format
 msgid ""
 "Option \"--default-working-directory\" requires specifying the default "
@@ -384,14 +186,7 @@ msgstr ""
 "Option \"--default-working-directory\" requires specifying the default "
 "working directory as its parameter"
 
-#: ../terminal/terminal-options.c:235
-#, c-format
-msgid ""
-"Option \"--sm-client-id\" requires specifying the session id as its parameter"
-msgstr ""
-"Option \"--sm-client-id\" requires specifying the session id as its parameter"
-
-#: ../terminal/terminal-options.c:250
+#: ../terminal/terminal-options.c:237
 #, c-format
 msgid ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
@@ -400,7 +195,7 @@ msgstr ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
 "of the command line"
 
-#: ../terminal/terminal-options.c:267
+#: ../terminal/terminal-options.c:254
 #, c-format
 msgid ""
 "Option \"--command/-e\" requires specifying the command to run as its "
@@ -409,7 +204,7 @@ msgstr ""
 "Option \"--command/-e\" requires specifying the command to run as its "
 "parameter"
 
-#: ../terminal/terminal-options.c:284
+#: ../terminal/terminal-options.c:271
 #, c-format
 msgid ""
 "Option \"--working-directory\" requires specifying the working directory as "
@@ -418,19 +213,19 @@ msgstr ""
 "Option \"--working-directory\" requires specifying the working directory as "
 "its parameter"
 
-#: ../terminal/terminal-options.c:299
+#: ../terminal/terminal-options.c:286
 #, c-format
 msgid "Option \"--title/-T\" requires specifying the title as its parameter"
 msgstr "Option \"--title/-T\" requires specifying the title as its parameter"
 
-#: ../terminal/terminal-options.c:319
+#: ../terminal/terminal-options.c:305
 #, c-format
 msgid ""
 "Option \"--display\" requires specifying the X display as its parameters"
 msgstr ""
 "Option \"--display\" requires specifying the X display as its parameters"
 
-#: ../terminal/terminal-options.c:334
+#: ../terminal/terminal-options.c:320
 #, c-format
 msgid ""
 "Option \"--geometry\" requires specifying the window geometry as its "
@@ -439,19 +234,19 @@ msgstr ""
 "Option \"--geometry\" requires specifying the window geometry as its "
 "parameter"
 
-#: ../terminal/terminal-options.c:349
+#: ../terminal/terminal-options.c:335
 #, c-format
 msgid "Option \"--role\" requires specifying the window role as its parameter"
 msgstr "Option \"--role\" requires specifying the window role as its parameter"
 
-#: ../terminal/terminal-options.c:364
+#: ../terminal/terminal-options.c:350
 #, c-format
 msgid ""
 "Option \"--startup-id\" requires specifying the startup id as its parameter"
 msgstr ""
 "Option \"--startup-id\" requires specifying the startup id as its parameter"
 
-#: ../terminal/terminal-options.c:379
+#: ../terminal/terminal-options.c:365
 #, fuzzy, c-format
 msgid ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
@@ -460,7 +255,7 @@ msgstr ""
 "Option \"--command/-e\" requires specifying the command to run as its "
 "parameter"
 
-#: ../terminal/terminal-options.c:435
+#: ../terminal/terminal-options.c:419
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Unknown option \"%s\""
@@ -529,7 +324,7 @@ msgstr "מסך מלא"
 msgid "Set Title"
 msgstr "הגדר כותרת"
 
-#: ../terminal/terminal-preferences.c:464
+#: ../terminal/terminal-preferences.c:464 ../terminal/terminal-window.c:237
 msgid "Reset"
 msgstr "אפס"
 
@@ -823,6 +618,11 @@ msgstr "_אפס"
 msgid "Reset and C_lear"
 msgstr "אפס ו_נקה"
 
+#: ../terminal/terminal-window.c:238
+#, fuzzy
+msgid "Reset and clear"
+msgstr "אפס ונקה"
+
 #: ../terminal/terminal-window.c:239
 msgid "_Go"
 msgstr "ע_בור"
@@ -1490,6 +1290,285 @@ msgstr "_עדכן את רישומי utmp/wtmp כאשר פקודה נשלחת"
 msgid "seconds"
 msgstr ""
 
+#~ msgid ""
+#~ "  -h, --help                          Print this help message and exit"
+#~ msgstr ""
+#~ "  -h, --help                          Print this help message and exit"
+
+#, fuzzy
+#~ msgid ""
+#~ "  -V, --version                       Print version information and exit"
+#~ msgstr ""
+#~ "  -v, --version                       Print version information and exit"
+
+#~ msgid ""
+#~ "  --disable-server                    Do not register with the D-BUS\n"
+#~ "                                      session message bus"
+#~ msgstr ""
+#~ "  --disable-server                    Do not register with the D-BUS\n"
+#~ "                                      session message bus"
+
+#~ msgid "  --default-display=DISPLAY           default X display to use"
+#~ msgstr "  --default-display=DISPLAY           default X display to use"
+
+#~ msgid ""
+#~ "  --default-working-directory=DIRNAME Set the default terminal's working\n"
+#~ "                                      directory"
+#~ msgstr ""
+#~ "  --default-working-directory=DIRNAME Set the default terminal's working\n"
+#~ "                                      directory"
+
+#~ msgid ""
+#~ "  --tab                               Open a new tab in the last-"
+#~ "specified\n"
+#~ "                                      window; more than one of these\n"
+#~ "                                      options can be provided"
+#~ msgstr ""
+#~ "  --tab                               Open a new tab in the last-"
+#~ "specified\n"
+#~ "                                      window; more than one of these\n"
+#~ "                                      options can be provided"
+
+#~ msgid ""
+#~ "  --window                            Open a new window containing one "
+#~ "tab;\n"
+#~ "                                      more than one of these options can "
+#~ "be\n"
+#~ "                                      provided"
+#~ msgstr ""
+#~ "  --window                            Open a new window containing one "
+#~ "tab;\n"
+#~ "                                      more than one of these options can "
+#~ "be\n"
+#~ "                                      provided"
+
+#~ msgid ""
+#~ "  -x, --execute                       Execute the remainder of the "
+#~ "command\n"
+#~ "                                      line inside the terminal"
+#~ msgstr ""
+#~ "  -x, --execute                       Execute the remainder of the "
+#~ "command\n"
+#~ "                                      line inside the terminal"
+
+#~ msgid ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+#~ msgstr ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+
+#~ msgid ""
+#~ "  --working-directory=DIRNAME         Set the terminal's working directory"
+#~ msgstr ""
+#~ "  --working-directory=DIRNAME         Set the terminal's working directory"
+
+#~ msgid "  -T, --title=TITLE                   Set the terminal's title"
+#~ msgstr "  -T, --title=TITLE                   Set the terminal's title"
+
+#~ msgid ""
+#~ "  -H, --hold                          Do not immediately destroy the tab\n"
+#~ "                                      when the child command exits"
+#~ msgstr ""
+#~ "  -H, --hold                          Do not immediately destroy the tab\n"
+#~ "                                      when the child command exits"
+
+#~ msgid ""
+#~ "  --display=DISPLAY                   X display to use for the last-\n"
+#~ "                                      specified window"
+#~ msgstr ""
+#~ "  --display=DISPLAY                   X display to use for the last-\n"
+#~ "                                      specified window"
+
+#~ msgid ""
+#~ "  --geometry=GEOMETRY                 X geometry specification (see \"X"
+#~ "\"\n"
+#~ "                                      man page), can be specified once "
+#~ "per\n"
+#~ "                                      window to be opened"
+#~ msgstr ""
+#~ "  --geometry=GEOMETRY                 X geometry specification (see \"X"
+#~ "\"\n"
+#~ "                                      man page), can be specified once "
+#~ "per\n"
+#~ "                                      window to be opened"
+
+#, fuzzy
+#~ msgid ""
+#~ "  --role=ROLE                         Set the role for the last-"
+#~ "specified\n"
+#~ "                                      window; applies to only one "
+#~ "window;\n"
+#~ "                                      can be specified once for each "
+#~ "window\n"
+#~ "                                      you create from the command line"
+#~ msgstr ""
+#~ "  --role=ROLE                         Set the role for the last-"
+#~ "specified;\n"
+#~ "                                      window; applies to only one "
+#~ "window;\n"
+#~ "                                      can be specified once for each "
+#~ "window\n"
+#~ "                                      you create from the command line"
+
+#~ msgid ""
+#~ "  --startup-id=STRING                 ID for the startup notification\n"
+#~ "                                      protocol"
+#~ msgstr ""
+#~ "  --startup-id=STRING                 ID for the startup notification\n"
+#~ "                                      protocol"
+
+#, fuzzy
+#~ msgid ""
+#~ "  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
+#~ "                                      name or filename"
+#~ msgstr ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+
+#, fuzzy
+#~ msgid ""
+#~ "  --fullscreen                        Set the last-specified window into\n"
+#~ "                                      fullscreen mode; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --fullscreen                        Set the last-specified window into\n"
+#~ "                                      fullscreen mode; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line."
+
+#, fuzzy
+#~ msgid ""
+#~ "  --maximize                          Maximize the last-specified "
+#~ "window;\n"
+#~ "                                      applies to only one window; can be\n"
+#~ "                                      specified once for each window you\n"
+#~ "                                      create from the command line"
+#~ msgstr ""
+#~ "  --role=ROLE                         Set the role for the last-"
+#~ "specified;\n"
+#~ "                                      window; applies to only one "
+#~ "window;\n"
+#~ "                                      can be specified once for each "
+#~ "window\n"
+#~ "                                      you create from the command line"
+
+#~ msgid ""
+#~ "  --show-menubar                      Turn on the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-menubar                      Turn on the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+
+#~ msgid ""
+#~ "  --hide-menubar                      Turn off the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-menubar                      Turn off the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+
+#~ msgid ""
+#~ "  --show-borders                      Turn on the window decorations for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --show-borders                      Turn on the window decorations for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+
+#~ msgid ""
+#~ "  --hide-borders                      Turn off the window decorations "
+#~ "for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --hide-borders                      Turn off the window decorations "
+#~ "for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+
+#~ msgid ""
+#~ "  --show-toolbars                     Turn on the toolbars for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-toolbars                     Turn on the toolbars for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+
+#~ msgid ""
+#~ "  --hide-toolbars                     Turn off the toolbars for the "
+#~ "last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-toolbars                     Turn off the toolbars for the "
+#~ "last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+
+#~ msgid "Unable to launch terminal: %s\n"
+#~ msgstr "אין אפשרות להפעיל מסוף: %s\n"
+
+#~ msgid ""
+#~ "Option \"--sm-client-id\" requires specifying the session id as its "
+#~ "parameter"
+#~ msgstr ""
+#~ "Option \"--sm-client-id\" requires specifying the session id as its "
+#~ "parameter"
+
 #~ msgid "<b>Title:</b>"
 #~ msgstr "<b>כותרת:</b>"
 
diff --git a/po/hu.po b/po/hu.po
index 604c584..f822762 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-terminal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 11:48+0100\n"
+"POT-Creation-Date: 2009-12-14 16:03+0100\n"
 "PO-Revision-Date: 2009-07-07 11:55+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
 "Language-Team: Hungarian <gnome at gnome dot hu>\n"
@@ -17,284 +17,88 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../terminal/main.c:46
+#: ../terminal/main.c:48
 msgid "Usage:"
 msgstr "Használat:"
 
-#: ../terminal/main.c:47
+#: ../terminal/main.c:48
 msgid "OPTION"
 msgstr "KAPCSOLÓ"
 
-#: ../terminal/main.c:49
+#: ../terminal/main.c:53
 msgid "General Options"
 msgstr "Általános beállítások"
 
-#: ../terminal/main.c:50
-msgid "  -h, --help                          Print this help message and exit"
-msgstr "  -h, --help                          Ezen súgó kiírása és kilépés"
-
-#: ../terminal/main.c:51
-msgid ""
-"  -V, --version                       Print version information and exit"
-msgstr ""
-"  -V, --version                       Verzióinformációk kiírása és kilépés"
-
-#: ../terminal/main.c:52
-msgid ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
-msgstr ""
-"  --disable-server                    Ne regisztráljon a D-BUS\n"
-"                                      munkamenet-üzenetbuszon"
-
-#: ../terminal/main.c:54
-msgid "  --default-display=DISPLAY           default X display to use"
-msgstr ""
-"  --default-display=KIJELZŐ           alapértelmezésben használandó X kijelző"
+#. parameter of --default-display
+#. parameter of --display
+#: ../terminal/main.c:55 ../terminal/main.c:81
+#, fuzzy
+msgid "display"
+msgstr "Nem jelenik meg"
 
-#: ../terminal/main.c:55
-msgid ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
+#. parameter of --default-working-directory
+#. parameter of --working-directory
+#: ../terminal/main.c:57 ../terminal/main.c:72
+msgid "directory"
 msgstr ""
-"  --default-working-directory=KÖNYVTÁRNÉV  A terminál alapértelmezett\n"
-"                                      munkakönyvtárának beállítása"
 
-#: ../terminal/main.c:58
+#: ../terminal/main.c:61
 msgid "Window or Tab Separators"
 msgstr "Ablak- vagy lapelválasztók"
 
-#: ../terminal/main.c:59
-msgid ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-msgstr ""
-"  --tab                               Lap megnyitása az utoljára megadott\n"
-"                                      ablakban, ez a kapcsoló többször is\n"
-"                                      megadható"
-
-#: ../terminal/main.c:62
-msgid ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-msgstr ""
-"  --window                            Új ablak megnyitása egy lappal,\n"
-"                                      ez a kapcsoló többször is\n"
-"                                      megadható"
-
 #: ../terminal/main.c:66
 msgid "Tab Options"
 msgstr "Lapok kapcsolói"
 
-#: ../terminal/main.c:67
-msgid ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-msgstr ""
-"  -x, --execute                       A parancssor további részének\n"
-"                                      végrehajtása a terminálban"
-
-#: ../terminal/main.c:69
-msgid ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-msgstr ""
-"  -e, --command=KARAKTERLÁNC          A kapcsoló argumentumának\n"
-"                                      végrehajtása a terminálban"
-
-#: ../terminal/main.c:71
-msgid ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
-msgstr ""
-"  --working-directory=KÖNYVTÁRNÉV    A terminál munkakönyvtárának beállítása"
-
-#: ../terminal/main.c:72
-msgid "  -T, --title=TITLE                   Set the terminal's title"
-msgstr "  -T, --title=CÍM                     A terminál címének beállítása"
+#. parameter of --command
+#: ../terminal/main.c:68
+#, fuzzy
+msgid "command"
+msgstr "Parancs"
 
-#: ../terminal/main.c:73
-msgid ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-msgstr ""
-"  -H, --hold                          Ne zárja be azonnal a lapot a "
-"gyermek-\n"
-"                                      folyamat kilépésekor"
+#. parameter of --title
+#: ../terminal/main.c:70
+#, fuzzy
+msgid "title"
+msgstr "Cím"
 
-#: ../terminal/main.c:76
+#: ../terminal/main.c:79
 msgid "Window Options"
 msgstr "Ablak kapcsolói"
 
-#: ../terminal/main.c:77
-msgid ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
-msgstr ""
-"  --display=KIJELZŐ                   Az utoljára megadott ablakhoz\n"
-"                                      használandó kijelző"
-
-#: ../terminal/main.c:79
-msgid ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
-msgstr ""
-"  --geometry=GEOMETRY                 X geometria megadása (lásd az „X”\n"
-"                                      kézikönyvoldalát), minden megnyitandó\n"
-"                                      ablakhoz egyszer adható meg"
-
-#: ../terminal/main.c:82
-msgid ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
+#. parameter of --geometry
+#: ../terminal/main.c:83
+msgid "geometry"
 msgstr ""
-"  --role=SZEREP                       Az utoljára megadott ablak szerepének\n"
-"                                      megadása, csak egy ablakra érvényes,\n"
-"                                      a parancssorból létrehozott minden\n"
-"                                      ablakhoz egyszer adható meg"
 
-#: ../terminal/main.c:86
-msgid ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
+#. parameter of --role
+#: ../terminal/main.c:85
+msgid "role"
 msgstr ""
-"  --startup-id=KARAKTERLÁNC           az indítási értesítés protokollhoz\n"
-"                                      használandó azonosító"
 
-#: ../terminal/main.c:88
-msgid ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
-msgstr ""
-"  -I, --icon=IKON                     A terminál ikonjának beállítása\n"
-"                                      ikonnévként vagy fájlnévként"
+#. parameter of --startup-id
+#: ../terminal/main.c:87
+#, fuzzy
+msgid "string"
+msgstr "Figyelmeztetés"
 
-#: ../terminal/main.c:90
-msgid ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --fullscreen                        Az utoljára megadott ablak teljes\n"
-"                                      képernyős módúvá tétele, csak egy "
-"ablakra\n"
-"                                      érvényes, a parancssorból létrehozott\n"
-"                                      minden ablakhoz egyszer adható meg"
+#. parameter of --icon
+#: ../terminal/main.c:89
+#, fuzzy
+msgid "icon"
+msgstr "Művelet"
 
-#: ../terminal/main.c:95
-msgid ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
+#: ../terminal/main.c:91
+#, c-format
+msgid "See the %s man page for full explanation of the options above."
 msgstr ""
-"  --maximize                          Az utoljára megadott ablak\n"
-"                                      maximalizálása, csak egy ablakra\n"
-"                                      érvényes, a parancssorból létrehozott\n"
-"                                      minden ablakhoz egyszer adható meg"
 
-#: ../terminal/main.c:99
-msgid ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-menubar                      Az utoljára megadott ablak "
-"menüsávjának\n"
-"                                      bekapcsolása, csak egy ablakra "
-"érvényes,\n"
-"                                      a parancssorból létrehozott minden\n"
-"                                      ablakhoz egyszer adható meg"
-
-#: ../terminal/main.c:104
-msgid ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --hide-menubar                      Az utoljára megadott ablak "
-"menüsávjának\n"
-"                                      kikapcsolása, csak egy ablakra "
-"érvényes,\n"
-"                                      a parancssorból létrehozott minden\n"
-"                                      ablakhoz egyszer adható meg"
-
-#: ../terminal/main.c:109
-msgid ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --show-borders                      Az utoljára megadott ablak "
-"dekorációjának\n"
-"                                      bekapcsolása, csak egy ablakra "
-"érvényes,\n"
-"                                      a parancssorból létrehozott minden\n"
-"                                      ablakhoz egyszer adható meg"
-
-#: ../terminal/main.c:114
-msgid ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --hide-borders                      Az utoljára megadott ablak "
-"dekorációjának\n"
-"                                      kikapcsolása, csak egy ablakra "
-"érvényes,\n"
-"                                      a parancssorból létrehozott minden\n"
-"                                      ablakhoz egyszer adható meg"
-
-#: ../terminal/main.c:119
-msgid ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-toolbars                     Az utoljára megadott ablak "
-"eszköztárának\n"
-"                                      bekapcsolása, csak egy ablakra "
-"érvényes,\n"
-"                                      a parancssorból létrehozott minden\n"
-"                                      ablakhoz egyszer adható meg"
-
-#: ../terminal/main.c:124
-msgid ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --hide-toolbars                     Az utoljára megadott ablak "
-"eszköztárának\n"
-"                                      kikapcsolása, csak egy ablakra "
-"érvényes,\n"
-"                                      a parancssorból létrehozott minden\n"
-"                                      ablakhoz egyszer adható meg"
-
-#: ../terminal/main.c:151 ../terminal/terminal-preferences.c:1263
+#: ../terminal/main.c:118 ../terminal/terminal-preferences.c:1263
 #: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr "Terminál"
 
-#: ../terminal/main.c:173
+#: ../terminal/main.c:135
 #, c-format
 msgid ""
 "%s (Xfce %s)\n"
@@ -319,31 +123,26 @@ msgstr ""
 "\n"
 "A hibákat itt jelentse: <%s>.\n"
 
-#: ../terminal/main.c:267
+#: ../terminal/main.c:239
 #, c-format
 msgid "Unable to register terminal service: %s\n"
 msgstr "A terminálszolgáltatás nem regisztrálható: %s\n"
 
-#: ../terminal/main.c:276
-#, c-format
-msgid "Unable to launch terminal: %s\n"
-msgstr "A terminál nem indítható: %s\n"
-
-#: ../terminal/terminal-app.c:551
+#: ../terminal/terminal-app.c:554
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "Érvénytelen geometria-karakterlánc: „%s”\n"
 
-#: ../terminal/terminal-dbus.c:114
+#: ../terminal/terminal-dbus.c:108
 msgid "User id mismatch"
 msgstr "A felhasználói azonosító eltér"
 
-#: ../terminal/terminal-dbus.c:146
+#: ../terminal/terminal-dbus.c:134
 #, c-format
 msgid "D-BUS message bus disconnected, exiting...\n"
 msgstr "A D-Bus üzenetbusz leválasztva, kilépés…\n"
 
-#: ../terminal/terminal-dbus.c:208
+#: ../terminal/terminal-dbus.c:196
 #, c-format
 msgid "Unable to register object %s"
 msgstr "Az objektum (%s) nem regisztrálható"
@@ -365,7 +164,7 @@ msgstr ""
 msgid "Failed to open the documentation browser"
 msgstr "A dokumentációböngésző megnyitása meghiúsult"
 
-#: ../terminal/terminal-options.c:189
+#: ../terminal/terminal-options.c:206
 #, c-format
 msgid ""
 "Option \"--default-display\" requires specifying the default X display as "
@@ -374,7 +173,7 @@ msgstr ""
 "A „--default-display” kapcsoló megköveteli az alapértelmezett X kijelző "
 "megadását paraméterként"
 
-#: ../terminal/terminal-options.c:204
+#: ../terminal/terminal-options.c:221
 #, c-format
 msgid ""
 "Option \"--default-working-directory\" requires specifying the default "
@@ -383,15 +182,7 @@ msgstr ""
 "A „--default-working-directory” kapcsoló megköveteli az alapértelmezett "
 "munkakönyvtár megadását paraméterként"
 
-#: ../terminal/terminal-options.c:235
-#, c-format
-msgid ""
-"Option \"--sm-client-id\" requires specifying the session id as its parameter"
-msgstr ""
-"A „--sm-client-id” kapcsoló megköveteli a munkamenet azonosítójának "
-"megadását paraméterként"
-
-#: ../terminal/terminal-options.c:250
+#: ../terminal/terminal-options.c:237
 #, c-format
 msgid ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
@@ -400,7 +191,7 @@ msgstr ""
 "Az „--execute/-x” kapcsoló megköveteli a futtatandó parancs megadását a "
 "parancssor további részében"
 
-#: ../terminal/terminal-options.c:267
+#: ../terminal/terminal-options.c:254
 #, c-format
 msgid ""
 "Option \"--command/-e\" requires specifying the command to run as its "
@@ -409,7 +200,7 @@ msgstr ""
 "A „--command/-e” kapcsoló megköveteli a futtatandó parancs megadását a "
 "parancssor további részében"
 
-#: ../terminal/terminal-options.c:284
+#: ../terminal/terminal-options.c:271
 #, c-format
 msgid ""
 "Option \"--working-directory\" requires specifying the working directory as "
@@ -418,20 +209,20 @@ msgstr ""
 "A „--working-directory” kapcsoló megköveteli a munkakönyvtár megadását "
 "paraméterként"
 
-#: ../terminal/terminal-options.c:299
+#: ../terminal/terminal-options.c:286
 #, c-format
 msgid "Option \"--title/-T\" requires specifying the title as its parameter"
 msgstr ""
 "A „--title/-T” kapcsoló megköveteli az ablak címének megadását paraméterként"
 
-#: ../terminal/terminal-options.c:319
+#: ../terminal/terminal-options.c:305
 #, c-format
 msgid ""
 "Option \"--display\" requires specifying the X display as its parameters"
 msgstr ""
 "A „--display” kapcsoló megköveteli az X kijelző megadását paraméterként"
 
-#: ../terminal/terminal-options.c:334
+#: ../terminal/terminal-options.c:320
 #, c-format
 msgid ""
 "Option \"--geometry\" requires specifying the window geometry as its "
@@ -440,13 +231,13 @@ msgstr ""
 "A „--geometry” kapcsoló megköveteli az ablak geometriájának megadását "
 "paraméterként"
 
-#: ../terminal/terminal-options.c:349
+#: ../terminal/terminal-options.c:335
 #, c-format
 msgid "Option \"--role\" requires specifying the window role as its parameter"
 msgstr ""
 "A „--role” kapcsoló megköveteli az ablak szerepének megadását paraméterként"
 
-#: ../terminal/terminal-options.c:364
+#: ../terminal/terminal-options.c:350
 #, c-format
 msgid ""
 "Option \"--startup-id\" requires specifying the startup id as its parameter"
@@ -454,7 +245,7 @@ msgstr ""
 "A „--startup-id” kapcsoló megköveteli az indítási azonosító megadását "
 "paraméterként"
 
-#: ../terminal/terminal-options.c:379
+#: ../terminal/terminal-options.c:365
 #, c-format
 msgid ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
@@ -463,7 +254,7 @@ msgstr ""
 "Az „--icon/-I” kapcsoló megköveteli egy ikonnév vagy fájlnév megadását "
 "paraméterként"
 
-#: ../terminal/terminal-options.c:435
+#: ../terminal/terminal-options.c:419
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Ismeretlen kapcsoló: „%s”"
@@ -532,7 +323,7 @@ msgstr "Teljes képernyő"
 msgid "Set Title"
 msgstr "Cím beállítása"
 
-#: ../terminal/terminal-preferences.c:464
+#: ../terminal/terminal-preferences.c:464 ../terminal/terminal-window.c:237
 msgid "Reset"
 msgstr "Visszaállítás"
 
@@ -827,6 +618,11 @@ msgstr "_Visszaállítás"
 msgid "Reset and C_lear"
 msgstr "Visszaállítás és _törlés"
 
+#: ../terminal/terminal-window.c:238
+#, fuzzy
+msgid "Reset and clear"
+msgstr "Visszaállítás és törlés"
+
 #: ../terminal/terminal-window.c:239
 msgid "_Go"
 msgstr "_Ugrás"
@@ -1447,5 +1243,270 @@ msgstr "Parancs indításakor az _utmp/wtmp rekordok frissítése"
 msgid "seconds"
 msgstr "másodperc"
 
+#~ msgid ""
+#~ "  -h, --help                          Print this help message and exit"
+#~ msgstr "  -h, --help                          Ezen súgó kiírása és kilépés"
+
+#~ msgid ""
+#~ "  -V, --version                       Print version information and exit"
+#~ msgstr ""
+#~ "  -V, --version                       Verzióinformációk kiírása és kilépés"
+
+#~ msgid ""
+#~ "  --disable-server                    Do not register with the D-BUS\n"
+#~ "                                      session message bus"
+#~ msgstr ""
+#~ "  --disable-server                    Ne regisztráljon a D-BUS\n"
+#~ "                                      munkamenet-üzenetbuszon"
+
+#~ msgid "  --default-display=DISPLAY           default X display to use"
+#~ msgstr ""
+#~ "  --default-display=KIJELZŐ           alapértelmezésben használandó X "
+#~ "kijelző"
+
+#~ msgid ""
+#~ "  --default-working-directory=DIRNAME Set the default terminal's working\n"
+#~ "                                      directory"
+#~ msgstr ""
+#~ "  --default-working-directory=KÖNYVTÁRNÉV  A terminál alapértelmezett\n"
+#~ "                                      munkakönyvtárának beállítása"
+
+#~ msgid ""
+#~ "  --tab                               Open a new tab in the last-"
+#~ "specified\n"
+#~ "                                      window; more than one of these\n"
+#~ "                                      options can be provided"
+#~ msgstr ""
+#~ "  --tab                               Lap megnyitása az utoljára "
+#~ "megadott\n"
+#~ "                                      ablakban, ez a kapcsoló többször "
+#~ "is\n"
+#~ "                                      megadható"
+
+#~ msgid ""
+#~ "  --window                            Open a new window containing one "
+#~ "tab;\n"
+#~ "                                      more than one of these options can "
+#~ "be\n"
+#~ "                                      provided"
+#~ msgstr ""
+#~ "  --window                            Új ablak megnyitása egy lappal,\n"
+#~ "                                      ez a kapcsoló többször is\n"
+#~ "                                      megadható"
+
+#~ msgid ""
+#~ "  -x, --execute                       Execute the remainder of the "
+#~ "command\n"
+#~ "                                      line inside the terminal"
+#~ msgstr ""
+#~ "  -x, --execute                       A parancssor további részének\n"
+#~ "                                      végrehajtása a terminálban"
+
+#~ msgid ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+#~ msgstr ""
+#~ "  -e, --command=KARAKTERLÁNC          A kapcsoló argumentumának\n"
+#~ "                                      végrehajtása a terminálban"
+
+#~ msgid ""
+#~ "  --working-directory=DIRNAME         Set the terminal's working directory"
+#~ msgstr ""
+#~ "  --working-directory=KÖNYVTÁRNÉV    A terminál munkakönyvtárának "
+#~ "beállítása"
+
+#~ msgid "  -T, --title=TITLE                   Set the terminal's title"
+#~ msgstr "  -T, --title=CÍM                     A terminál címének beállítása"
+
+#~ msgid ""
+#~ "  -H, --hold                          Do not immediately destroy the tab\n"
+#~ "                                      when the child command exits"
+#~ msgstr ""
+#~ "  -H, --hold                          Ne zárja be azonnal a lapot a "
+#~ "gyermek-\n"
+#~ "                                      folyamat kilépésekor"
+
+#~ msgid ""
+#~ "  --display=DISPLAY                   X display to use for the last-\n"
+#~ "                                      specified window"
+#~ msgstr ""
+#~ "  --display=KIJELZŐ                   Az utoljára megadott ablakhoz\n"
+#~ "                                      használandó kijelző"
+
+#~ msgid ""
+#~ "  --geometry=GEOMETRY                 X geometry specification (see \"X"
+#~ "\"\n"
+#~ "                                      man page), can be specified once "
+#~ "per\n"
+#~ "                                      window to be opened"
+#~ msgstr ""
+#~ "  --geometry=GEOMETRY                 X geometria megadása (lásd az „X”\n"
+#~ "                                      kézikönyvoldalát), minden "
+#~ "megnyitandó\n"
+#~ "                                      ablakhoz egyszer adható meg"
+
+#~ msgid ""
+#~ "  --role=ROLE                         Set the role for the last-"
+#~ "specified\n"
+#~ "                                      window; applies to only one "
+#~ "window;\n"
+#~ "                                      can be specified once for each "
+#~ "window\n"
+#~ "                                      you create from the command line"
+#~ msgstr ""
+#~ "  --role=SZEREP                       Az utoljára megadott ablak "
+#~ "szerepének\n"
+#~ "                                      megadása, csak egy ablakra "
+#~ "érvényes,\n"
+#~ "                                      a parancssorból létrehozott minden\n"
+#~ "                                      ablakhoz egyszer adható meg"
+
+#~ msgid ""
+#~ "  --startup-id=STRING                 ID for the startup notification\n"
+#~ "                                      protocol"
+#~ msgstr ""
+#~ "  --startup-id=KARAKTERLÁNC           az indítási értesítés protokollhoz\n"
+#~ "                                      használandó azonosító"
+
+#~ msgid ""
+#~ "  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
+#~ "                                      name or filename"
+#~ msgstr ""
+#~ "  -I, --icon=IKON                     A terminál ikonjának beállítása\n"
+#~ "                                      ikonnévként vagy fájlnévként"
+
+#~ msgid ""
+#~ "  --fullscreen                        Set the last-specified window into\n"
+#~ "                                      fullscreen mode; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --fullscreen                        Az utoljára megadott ablak teljes\n"
+#~ "                                      képernyős módúvá tétele, csak egy "
+#~ "ablakra\n"
+#~ "                                      érvényes, a parancssorból "
+#~ "létrehozott\n"
+#~ "                                      minden ablakhoz egyszer adható meg"
+
+#~ msgid ""
+#~ "  --maximize                          Maximize the last-specified "
+#~ "window;\n"
+#~ "                                      applies to only one window; can be\n"
+#~ "                                      specified once for each window you\n"
+#~ "                                      create from the command line"
+#~ msgstr ""
+#~ "  --maximize                          Az utoljára megadott ablak\n"
+#~ "                                      maximalizálása, csak egy ablakra\n"
+#~ "                                      érvényes, a parancssorból "
+#~ "létrehozott\n"
+#~ "                                      minden ablakhoz egyszer adható meg"
+
+#~ msgid ""
+#~ "  --show-menubar                      Turn on the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-menubar                      Az utoljára megadott ablak "
+#~ "menüsávjának\n"
+#~ "                                      bekapcsolása, csak egy ablakra "
+#~ "érvényes,\n"
+#~ "                                      a parancssorból létrehozott minden\n"
+#~ "                                      ablakhoz egyszer adható meg"
+
+#~ msgid ""
+#~ "  --hide-menubar                      Turn off the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-menubar                      Az utoljára megadott ablak "
+#~ "menüsávjának\n"
+#~ "                                      kikapcsolása, csak egy ablakra "
+#~ "érvényes,\n"
+#~ "                                      a parancssorból létrehozott minden\n"
+#~ "                                      ablakhoz egyszer adható meg"
+
+#~ msgid ""
+#~ "  --show-borders                      Turn on the window decorations for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --show-borders                      Az utoljára megadott ablak "
+#~ "dekorációjának\n"
+#~ "                                      bekapcsolása, csak egy ablakra "
+#~ "érvényes,\n"
+#~ "                                      a parancssorból létrehozott minden\n"
+#~ "                                      ablakhoz egyszer adható meg"
+
+#~ msgid ""
+#~ "  --hide-borders                      Turn off the window decorations "
+#~ "for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --hide-borders                      Az utoljára megadott ablak "
+#~ "dekorációjának\n"
+#~ "                                      kikapcsolása, csak egy ablakra "
+#~ "érvényes,\n"
+#~ "                                      a parancssorból létrehozott minden\n"
+#~ "                                      ablakhoz egyszer adható meg"
+
+#~ msgid ""
+#~ "  --show-toolbars                     Turn on the toolbars for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-toolbars                     Az utoljára megadott ablak "
+#~ "eszköztárának\n"
+#~ "                                      bekapcsolása, csak egy ablakra "
+#~ "érvényes,\n"
+#~ "                                      a parancssorból létrehozott minden\n"
+#~ "                                      ablakhoz egyszer adható meg"
+
+#~ msgid ""
+#~ "  --hide-toolbars                     Turn off the toolbars for the "
+#~ "last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-toolbars                     Az utoljára megadott ablak "
+#~ "eszköztárának\n"
+#~ "                                      kikapcsolása, csak egy ablakra "
+#~ "érvényes,\n"
+#~ "                                      a parancssorból létrehozott minden\n"
+#~ "                                      ablakhoz egyszer adható meg"
+
+#~ msgid "Unable to launch terminal: %s\n"
+#~ msgstr "A terminál nem indítható: %s\n"
+
+#~ msgid ""
+#~ "Option \"--sm-client-id\" requires specifying the session id as its "
+#~ "parameter"
+#~ msgstr ""
+#~ "A „--sm-client-id” kapcsoló megköveteli a munkamenet azonosítójának "
+#~ "megadását paraméterként"
+
 #~ msgid "<b>Title:</b>"
 #~ msgstr "<b>Cím:</b>"
diff --git a/po/id.po b/po/id.po
index 2fd6947..67b1d0a 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Terminal 0.2.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 11:48+0100\n"
+"POT-Creation-Date: 2009-12-14 16:03+0100\n"
 "PO-Revision-Date: 2009-08-25 21:28+0700\n"
 "Last-Translator: Andhika Padmawan <andhika.padmawan at gmail.com>\n"
 "Language-Team: Indonesian <translation-team-id at lists.sourceforge.net>\n"
@@ -15,298 +15,88 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../terminal/main.c:46
+#: ../terminal/main.c:48
 msgid "Usage:"
 msgstr "Penggunaan:"
 
-#: ../terminal/main.c:47
+#: ../terminal/main.c:48
 msgid "OPTION"
 msgstr "OPSI"
 
-#: ../terminal/main.c:49
+#: ../terminal/main.c:53
 msgid "General Options"
 msgstr "Opsi Umum"
 
-#: ../terminal/main.c:50
-msgid "  -h, --help                          Print this help message and exit"
-msgstr ""
-"  -h, --help                        Tampilkan pesan bantuan ini dan keluar"
-
-#: ../terminal/main.c:51
-msgid ""
-"  -V, --version                       Print version information and exit"
-msgstr ""
-"  -V, --version                       Tampilkan informasi versi dan keluar"
-
-#: ../terminal/main.c:52
-msgid ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
-msgstr ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
+#. parameter of --default-display
+#. parameter of --display
+#: ../terminal/main.c:55 ../terminal/main.c:81
+#, fuzzy
+msgid "display"
+msgstr "Tidak ditampilkan"
 
-#: ../terminal/main.c:54
-msgid "  --default-display=DISPLAY           default X display to use"
+#. parameter of --default-working-directory
+#. parameter of --working-directory
+#: ../terminal/main.c:57 ../terminal/main.c:72
+msgid "directory"
 msgstr ""
-"  --default-display=DISPLAY           tampilan X standar yang digunakan"
 
-#: ../terminal/main.c:55
-msgid ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
-msgstr ""
-"  --default-working-directory=DIRNAME Atur direktori kerja terminal\n"
-"                                      standar"
-
-#: ../terminal/main.c:58
+#: ../terminal/main.c:61
 msgid "Window or Tab Separators"
 msgstr "Pemisah Jendela atau Tab"
 
-#: ../terminal/main.c:59
-msgid ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-msgstr ""
-"  --tab                               Buka tab baru di jendela yang terakhir "
-"ditetapkan;\n"
-"                                      lebih dari satu opsi seperti ini\n"
-"                                      dapat diberikan"
-
-#: ../terminal/main.c:62
-msgid ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-msgstr ""
-"  --window                            Buka sebuah jendela baru yang "
-"mengandung satu tab;\n"
-"                                      lebih dari satu opsi seperti ini "
-"dapat\n"
-"                                      diberikan"
-
 #: ../terminal/main.c:66
 msgid "Tab Options"
 msgstr "Opsi Tab"
 
-#: ../terminal/main.c:67
-msgid ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-msgstr ""
-"  -x, --execute                       Eksekusi pengingat baris perintah \n"
-"                                      di dalam terminal"
-
-#: ../terminal/main.c:69
-msgid ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-msgstr ""
-"  -e, --command=STRING                Eksekusi argumen terhadap opsi ini\n"
-"                                      di dalam terminal"
-
-#: ../terminal/main.c:71
-msgid ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
-msgstr ""
-"  --working-directory=DIRNAME         Tentukan direktori kerja terminal"
-
-#: ../terminal/main.c:72
-msgid "  -T, --title=TITLE                   Set the terminal's title"
-msgstr "  -T, --title=TITLE                   Tentukan judul terminal"
+#. parameter of --command
+#: ../terminal/main.c:68
+#, fuzzy
+msgid "command"
+msgstr "Perintah"
 
-#: ../terminal/main.c:73
-msgid ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-msgstr ""
-"  -H, --hold                          Jangan langsung hancurkan tab\n"
-"                                      bila terdapat perintah anak"
+#. parameter of --title
+#: ../terminal/main.c:70
+#, fuzzy
+msgid "title"
+msgstr "Judul"
 
-#: ../terminal/main.c:76
+#: ../terminal/main.c:79
 msgid "Window Options"
 msgstr "Opsi Jendela"
 
-#: ../terminal/main.c:77
-msgid ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
+#. parameter of --geometry
+#: ../terminal/main.c:83
+msgid "geometry"
 msgstr ""
-"  --display=DISPLAY                   Tampilan X agar menggunakan-\n"
-"                                      jendela yang ditetapkan terakhir"
 
-#: ../terminal/main.c:79
-msgid ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
-msgstr ""
-"  --geometry=GEOMETRY                 Spesifikasi geometri X (lihat halaman\n"
-"                                      manual \"X\"), dapat ditetapkan sekali "
-"per\n"
-"                                      jendela yang akan dibuka"
-
-#: ../terminal/main.c:82
-msgid ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
+#. parameter of --role
+#: ../terminal/main.c:85
+msgid "role"
 msgstr ""
-"  --role=PERAN                        Atur peran untuk jendela yang\n"
-"\t\t\t\t       terakhir ditetapkan; berlaku hanya\n"
-"                                      untuk satu jendela; dapat diterapkan\n"
-"                                      sekali untuk tiap jendela yang anda\n"
-"                                      buat dari baris perintah"
 
-#: ../terminal/main.c:86
-msgid ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
-msgstr ""
-"  --startup-id=STRING                 ID untuk protokol notifikasi\n"
-"                                      hidupkan"
-
-#: ../terminal/main.c:88
-msgid ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
-msgstr ""
-"  -I, --icon=IKON                     Atur ikon terminal sebagai ikon nama\n"
-"                                      atau nama berkas"
+#. parameter of --startup-id
+#: ../terminal/main.c:87
+#, fuzzy
+msgid "string"
+msgstr "Peringatan"
 
-#: ../terminal/main.c:90
-msgid ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --fullscreen                        Atur jendela yang terakhir ditetapkan\n"
-"                                      menjadi mode layar penuh; berlaku\n"
-"                                      hanya untuk satu jendela; dapat\n"
-"                                      diterapkan sekali untuk tiap jendela\n"
-"                                      yang anda buat dari baris perintah"
+#. parameter of --icon
+#: ../terminal/main.c:89
+#, fuzzy
+msgid "icon"
+msgstr "Aksi"
 
-#: ../terminal/main.c:95
-msgid ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
+#: ../terminal/main.c:91
+#, c-format
+msgid "See the %s man page for full explanation of the options above."
 msgstr ""
-"  --maximize                          Maksimalkan jendela yang terakhir\n"
-"                                      ditetapkan; berlaku hanya untuk satu\n"
-"                                      jendela; dapat diterapkan sekali\n"
-"                                      untuk tiap jendela yang anda buat\n"
-"                                      dari baris perintah"
 
-#: ../terminal/main.c:99
-msgid ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-menubar                      Nyalakan batang menu untuk jendela-\n"
-"                                      yang terakhir ditetapkan; berlaku "
-"hanya untuk satu\n"
-"                                      jendela; dapat diterapkan sekali "
-"untuk\n"
-"                                      tiap jendela yang anda buat dari\n"
-"                                      baris perintah"
-
-#: ../terminal/main.c:104
-msgid ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --hide-menubar                      Matikan batang menu untuk jendela-\n"
-"                                      yang terakhir ditetapkan; berlaku "
-"hanya untuk satu\n"
-"                                      jendela; dapat diterapkan sekali "
-"untuk\n"
-"                                      tiap jendela yang anda buat dari\n"
-"                                      baris perintah"
-
-#: ../terminal/main.c:109
-msgid ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --show-borders                      Nyalakan dekorasi jendela untuk\n"
-"                                      jendela yang terakhir ditetapkan; "
-"berlaku\n"
-"                                      hanya untuk satu jendela; dapat "
-"diterapkan\n"
-"                                      untuk tiap jendela yang anda buat "
-"dari\n"
-"                                      baris perintah"
-
-#: ../terminal/main.c:114
-msgid ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --hide-borders                      Matikan dekorasi jendela untuk\n"
-"                                      jendela yang terakhir ditetapkan; "
-"berlaku\n"
-"                                      hanya untuk satu jendela; dapat "
-"diterapkan\n"
-"                                      untuk tiap jendela yang anda buat "
-"dari\n"
-"                                      baris perintah"
-
-#: ../terminal/main.c:119
-msgid ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-toolbars                     Nyalakan batang alat untuk jendela-\n"
-"                                      yang terakhir ditetapkan; berlaku "
-"hanya untuk satu\n"
-"                                      jendela; dapat diterapkan sekali "
-"untuk\n"
-"                                      tiap jendela yang anda buat dari\n"
-"                                      baris perintah"
-
-#: ../terminal/main.c:124
-msgid ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --hide-toolbars                     Matikan batang alat untuk jendela-\n"
-"                                      yang terakhir ditetapkan; berlaku "
-"hanya untuk satu;\n"
-"                                      jendela; dapat diterapkan sekali "
-"untuk\n"
-"                                      tiap jendela yang anda buat dari\n"
-"                                      baris perintah"
-
-#: ../terminal/main.c:151 ../terminal/terminal-preferences.c:1263
+#: ../terminal/main.c:118 ../terminal/terminal-preferences.c:1263
 #: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../terminal/main.c:173
+#: ../terminal/main.c:135
 #, c-format
 msgid ""
 "%s (Xfce %s)\n"
@@ -331,31 +121,26 @@ msgstr ""
 "\n"
 "Silakan laporkan kutu ke <%s>.\n"
 
-#: ../terminal/main.c:267
+#: ../terminal/main.c:239
 #, c-format
 msgid "Unable to register terminal service: %s\n"
 msgstr "Tidak dapat mendaftarkan layanan terminal: %s\n"
 
-#: ../terminal/main.c:276
-#, c-format
-msgid "Unable to launch terminal: %s\n"
-msgstr "Tidak dapat menjalankan terminal: %s\n"
-
-#: ../terminal/terminal-app.c:551
+#: ../terminal/terminal-app.c:554
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "Tali geometri \"%s\" tidak benar\n"
 
-#: ../terminal/terminal-dbus.c:114
+#: ../terminal/terminal-dbus.c:108
 msgid "User id mismatch"
 msgstr "ID pengguna tidak cocok"
 
-#: ../terminal/terminal-dbus.c:146
+#: ../terminal/terminal-dbus.c:134
 #, c-format
 msgid "D-BUS message bus disconnected, exiting...\n"
 msgstr "Bus pesan D-BUS terputus, keluar...\n"
 
-#: ../terminal/terminal-dbus.c:208
+#: ../terminal/terminal-dbus.c:196
 #, c-format
 msgid "Unable to register object %s"
 msgstr "Tidak dapat mendaftarkan objek %s"
@@ -377,7 +162,7 @@ msgstr "Kunjungi situs web Terminal"
 msgid "Failed to open the documentation browser"
 msgstr "Gagal ketika membuka peramban dokumentasi"
 
-#: ../terminal/terminal-options.c:189
+#: ../terminal/terminal-options.c:206
 #, c-format
 msgid ""
 "Option \"--default-display\" requires specifying the default X display as "
@@ -386,7 +171,7 @@ msgstr ""
 "Opsi \"--default-display\" membutuhkan penentuan tampilan X standar sebagai "
 "parameternya"
 
-#: ../terminal/terminal-options.c:204
+#: ../terminal/terminal-options.c:221
 #, c-format
 msgid ""
 "Option \"--default-working-directory\" requires specifying the default "
@@ -395,14 +180,7 @@ msgstr ""
 "Opsi \"--default-working-directory\" membutuhkan penentuan direktori kerja "
 "standar sebagai parameternya"
 
-#: ../terminal/terminal-options.c:235
-#, c-format
-msgid ""
-"Option \"--sm-client-id\" requires specifying the session id as its parameter"
-msgstr ""
-"Opsi \"--sm-client-id\" membutuhkan penentuan id sesi sebagai parameternya"
-
-#: ../terminal/terminal-options.c:250
+#: ../terminal/terminal-options.c:237
 #, c-format
 msgid ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
@@ -411,7 +189,7 @@ msgstr ""
 "Opsi \"--execute/-x\" membutuhkan penentuan perintah yang akan dijalankan di "
 "sisa baris perintah"
 
-#: ../terminal/terminal-options.c:267
+#: ../terminal/terminal-options.c:254
 #, c-format
 msgid ""
 "Option \"--command/-e\" requires specifying the command to run as its "
@@ -420,7 +198,7 @@ msgstr ""
 "Opsi \"--command/-e\" membutuhkan penentuan perintah yang akan dijalankan "
 "sebagai parameternya"
 
-#: ../terminal/terminal-options.c:284
+#: ../terminal/terminal-options.c:271
 #, c-format
 msgid ""
 "Option \"--working-directory\" requires specifying the working directory as "
@@ -429,19 +207,19 @@ msgstr ""
 "Opsi \"--working-directory\" membutuhkan penentuan direktori kerja sebagai "
 "parameternya"
 
-#: ../terminal/terminal-options.c:299
+#: ../terminal/terminal-options.c:286
 #, c-format
 msgid "Option \"--title/-T\" requires specifying the title as its parameter"
 msgstr "Opsi \"--title/-T\" membutuhkan penentuan judul sebagai parameternya"
 
-#: ../terminal/terminal-options.c:319
+#: ../terminal/terminal-options.c:305
 #, c-format
 msgid ""
 "Option \"--display\" requires specifying the X display as its parameters"
 msgstr ""
 "Opsi \"--display\" membutuhkan penentuan tampilan X sebagai parameternya"
 
-#: ../terminal/terminal-options.c:334
+#: ../terminal/terminal-options.c:320
 #, c-format
 msgid ""
 "Option \"--geometry\" requires specifying the window geometry as its "
@@ -450,20 +228,20 @@ msgstr ""
 "Opsi \"--geometry\" membutuhkan penentuan geometri jendela sebagai "
 "parameternya"
 
-#: ../terminal/terminal-options.c:349
+#: ../terminal/terminal-options.c:335
 #, c-format
 msgid "Option \"--role\" requires specifying the window role as its parameter"
 msgstr ""
 "Opsi \"--role\" membutuhkan penentuan peran jendela sebagai parameternya"
 
-#: ../terminal/terminal-options.c:364
+#: ../terminal/terminal-options.c:350
 #, c-format
 msgid ""
 "Option \"--startup-id\" requires specifying the startup id as its parameter"
 msgstr ""
 "Opsi \"--startup-id\" membutuhkan penentuan id hidupkan sebagai parameternya"
 
-#: ../terminal/terminal-options.c:379
+#: ../terminal/terminal-options.c:365
 #, c-format
 msgid ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
@@ -471,7 +249,7 @@ msgid ""
 msgstr ""
 "Opsi \"--icon/-I\" memerlukan nama atau nama berkas ikon sebagai parameternya"
 
-#: ../terminal/terminal-options.c:435
+#: ../terminal/terminal-options.c:419
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Opsi \"%s\" tidak dikenal"
@@ -540,7 +318,7 @@ msgstr "Layar penuh"
 msgid "Set Title"
 msgstr "Tentukan Judul"
 
-#: ../terminal/terminal-preferences.c:464
+#: ../terminal/terminal-preferences.c:464 ../terminal/terminal-window.c:237
 msgid "Reset"
 msgstr "Tata ulang"
 
@@ -838,6 +616,11 @@ msgstr "Tata _ulang"
 msgid "Reset and C_lear"
 msgstr "Tata ulang dan Ha_pus"
 
+#: ../terminal/terminal-window.c:238
+#, fuzzy
+msgid "Reset and clear"
+msgstr "Tata ulang dan Bersihkan"
+
 #: ../terminal/terminal-window.c:239
 msgid "_Go"
 msgstr "_Ke"
@@ -1468,6 +1251,284 @@ msgstr "_Mutakhirkan catatan utmp/wtmp ketika perintah dijalankan"
 msgid "seconds"
 msgstr "detik"
 
+#~ msgid ""
+#~ "  -h, --help                          Print this help message and exit"
+#~ msgstr ""
+#~ "  -h, --help                        Tampilkan pesan bantuan ini dan keluar"
+
+#~ msgid ""
+#~ "  -V, --version                       Print version information and exit"
+#~ msgstr ""
+#~ "  -V, --version                       Tampilkan informasi versi dan keluar"
+
+#~ msgid ""
+#~ "  --disable-server                    Do not register with the D-BUS\n"
+#~ "                                      session message bus"
+#~ msgstr ""
+#~ "  --disable-server                    Do not register with the D-BUS\n"
+#~ "                                      session message bus"
+
+#~ msgid "  --default-display=DISPLAY           default X display to use"
+#~ msgstr ""
+#~ "  --default-display=DISPLAY           tampilan X standar yang digunakan"
+
+#~ msgid ""
+#~ "  --default-working-directory=DIRNAME Set the default terminal's working\n"
+#~ "                                      directory"
+#~ msgstr ""
+#~ "  --default-working-directory=DIRNAME Atur direktori kerja terminal\n"
+#~ "                                      standar"
+
+#~ msgid ""
+#~ "  --tab                               Open a new tab in the last-"
+#~ "specified\n"
+#~ "                                      window; more than one of these\n"
+#~ "                                      options can be provided"
+#~ msgstr ""
+#~ "  --tab                               Buka tab baru di jendela yang "
+#~ "terakhir ditetapkan;\n"
+#~ "                                      lebih dari satu opsi seperti ini\n"
+#~ "                                      dapat diberikan"
+
+#~ msgid ""
+#~ "  --window                            Open a new window containing one "
+#~ "tab;\n"
+#~ "                                      more than one of these options can "
+#~ "be\n"
+#~ "                                      provided"
+#~ msgstr ""
+#~ "  --window                            Buka sebuah jendela baru yang "
+#~ "mengandung satu tab;\n"
+#~ "                                      lebih dari satu opsi seperti ini "
+#~ "dapat\n"
+#~ "                                      diberikan"
+
+#~ msgid ""
+#~ "  -x, --execute                       Execute the remainder of the "
+#~ "command\n"
+#~ "                                      line inside the terminal"
+#~ msgstr ""
+#~ "  -x, --execute                       Eksekusi pengingat baris perintah \n"
+#~ "                                      di dalam terminal"
+
+#~ msgid ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+#~ msgstr ""
+#~ "  -e, --command=STRING                Eksekusi argumen terhadap opsi ini\n"
+#~ "                                      di dalam terminal"
+
+#~ msgid ""
+#~ "  --working-directory=DIRNAME         Set the terminal's working directory"
+#~ msgstr ""
+#~ "  --working-directory=DIRNAME         Tentukan direktori kerja terminal"
+
+#~ msgid "  -T, --title=TITLE                   Set the terminal's title"
+#~ msgstr "  -T, --title=TITLE                   Tentukan judul terminal"
+
+#~ msgid ""
+#~ "  -H, --hold                          Do not immediately destroy the tab\n"
+#~ "                                      when the child command exits"
+#~ msgstr ""
+#~ "  -H, --hold                          Jangan langsung hancurkan tab\n"
+#~ "                                      bila terdapat perintah anak"
+
+#~ msgid ""
+#~ "  --display=DISPLAY                   X display to use for the last-\n"
+#~ "                                      specified window"
+#~ msgstr ""
+#~ "  --display=DISPLAY                   Tampilan X agar menggunakan-\n"
+#~ "                                      jendela yang ditetapkan terakhir"
+
+#~ msgid ""
+#~ "  --geometry=GEOMETRY                 X geometry specification (see \"X"
+#~ "\"\n"
+#~ "                                      man page), can be specified once "
+#~ "per\n"
+#~ "                                      window to be opened"
+#~ msgstr ""
+#~ "  --geometry=GEOMETRY                 Spesifikasi geometri X (lihat "
+#~ "halaman\n"
+#~ "                                      manual \"X\"), dapat ditetapkan "
+#~ "sekali per\n"
+#~ "                                      jendela yang akan dibuka"
+
+#~ msgid ""
+#~ "  --role=ROLE                         Set the role for the last-"
+#~ "specified\n"
+#~ "                                      window; applies to only one "
+#~ "window;\n"
+#~ "                                      can be specified once for each "
+#~ "window\n"
+#~ "                                      you create from the command line"
+#~ msgstr ""
+#~ "  --role=PERAN                        Atur peran untuk jendela yang\n"
+#~ "\t\t\t\t       terakhir ditetapkan; berlaku hanya\n"
+#~ "                                      untuk satu jendela; dapat "
+#~ "diterapkan\n"
+#~ "                                      sekali untuk tiap jendela yang "
+#~ "anda\n"
+#~ "                                      buat dari baris perintah"
+
+#~ msgid ""
+#~ "  --startup-id=STRING                 ID for the startup notification\n"
+#~ "                                      protocol"
+#~ msgstr ""
+#~ "  --startup-id=STRING                 ID untuk protokol notifikasi\n"
+#~ "                                      hidupkan"
+
+#~ msgid ""
+#~ "  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
+#~ "                                      name or filename"
+#~ msgstr ""
+#~ "  -I, --icon=IKON                     Atur ikon terminal sebagai ikon "
+#~ "nama\n"
+#~ "                                      atau nama berkas"
+
+#~ msgid ""
+#~ "  --fullscreen                        Set the last-specified window into\n"
+#~ "                                      fullscreen mode; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --fullscreen                        Atur jendela yang terakhir "
+#~ "ditetapkan\n"
+#~ "                                      menjadi mode layar penuh; berlaku\n"
+#~ "                                      hanya untuk satu jendela; dapat\n"
+#~ "                                      diterapkan sekali untuk tiap "
+#~ "jendela\n"
+#~ "                                      yang anda buat dari baris perintah"
+
+#~ msgid ""
+#~ "  --maximize                          Maximize the last-specified "
+#~ "window;\n"
+#~ "                                      applies to only one window; can be\n"
+#~ "                                      specified once for each window you\n"
+#~ "                                      create from the command line"
+#~ msgstr ""
+#~ "  --maximize                          Maksimalkan jendela yang terakhir\n"
+#~ "                                      ditetapkan; berlaku hanya untuk "
+#~ "satu\n"
+#~ "                                      jendela; dapat diterapkan sekali\n"
+#~ "                                      untuk tiap jendela yang anda buat\n"
+#~ "                                      dari baris perintah"
+
+#~ msgid ""
+#~ "  --show-menubar                      Turn on the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-menubar                      Nyalakan batang menu untuk "
+#~ "jendela-\n"
+#~ "                                      yang terakhir ditetapkan; berlaku "
+#~ "hanya untuk satu\n"
+#~ "                                      jendela; dapat diterapkan sekali "
+#~ "untuk\n"
+#~ "                                      tiap jendela yang anda buat dari\n"
+#~ "                                      baris perintah"
+
+#~ msgid ""
+#~ "  --hide-menubar                      Turn off the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-menubar                      Matikan batang menu untuk jendela-\n"
+#~ "                                      yang terakhir ditetapkan; berlaku "
+#~ "hanya untuk satu\n"
+#~ "                                      jendela; dapat diterapkan sekali "
+#~ "untuk\n"
+#~ "                                      tiap jendela yang anda buat dari\n"
+#~ "                                      baris perintah"
+
+#~ msgid ""
+#~ "  --show-borders                      Turn on the window decorations for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --show-borders                      Nyalakan dekorasi jendela untuk\n"
+#~ "                                      jendela yang terakhir ditetapkan; "
+#~ "berlaku\n"
+#~ "                                      hanya untuk satu jendela; dapat "
+#~ "diterapkan\n"
+#~ "                                      untuk tiap jendela yang anda buat "
+#~ "dari\n"
+#~ "                                      baris perintah"
+
+#~ msgid ""
+#~ "  --hide-borders                      Turn off the window decorations "
+#~ "for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --hide-borders                      Matikan dekorasi jendela untuk\n"
+#~ "                                      jendela yang terakhir ditetapkan; "
+#~ "berlaku\n"
+#~ "                                      hanya untuk satu jendela; dapat "
+#~ "diterapkan\n"
+#~ "                                      untuk tiap jendela yang anda buat "
+#~ "dari\n"
+#~ "                                      baris perintah"
+
+#~ msgid ""
+#~ "  --show-toolbars                     Turn on the toolbars for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-toolbars                     Nyalakan batang alat untuk "
+#~ "jendela-\n"
+#~ "                                      yang terakhir ditetapkan; berlaku "
+#~ "hanya untuk satu\n"
+#~ "                                      jendela; dapat diterapkan sekali "
+#~ "untuk\n"
+#~ "                                      tiap jendela yang anda buat dari\n"
+#~ "                                      baris perintah"
+
+#~ msgid ""
+#~ "  --hide-toolbars                     Turn off the toolbars for the "
+#~ "last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-toolbars                     Matikan batang alat untuk jendela-\n"
+#~ "                                      yang terakhir ditetapkan; berlaku "
+#~ "hanya untuk satu;\n"
+#~ "                                      jendela; dapat diterapkan sekali "
+#~ "untuk\n"
+#~ "                                      tiap jendela yang anda buat dari\n"
+#~ "                                      baris perintah"
+
+#~ msgid "Unable to launch terminal: %s\n"
+#~ msgstr "Tidak dapat menjalankan terminal: %s\n"
+
+#~ msgid ""
+#~ "Option \"--sm-client-id\" requires specifying the session id as its "
+#~ "parameter"
+#~ msgstr ""
+#~ "Opsi \"--sm-client-id\" membutuhkan penentuan id sesi sebagai parameternya"
+
 #~ msgid "<b>Title:</b>"
 #~ msgstr "<b>Judul:</b>"
 
diff --git a/po/it.po b/po/it.po
index 1d8c4d3..7e0a1c1 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Terminal trunk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 11:48+0100\n"
+"POT-Creation-Date: 2009-12-14 16:03+0100\n"
 "PO-Revision-Date: 2009-12-09 20:11+0100\n"
 "Last-Translator: Gianluca Foddis <gianluca.foddis at gmail.com>\n"
 "Language-Team: Italian <xfce-it-translators at googlegroups.com>\n"
@@ -19,275 +19,88 @@ msgstr ""
 # glossario
 # tab=scheda
 # terminal=terminale
-#: ../terminal/main.c:46
+#: ../terminal/main.c:48
 msgid "Usage:"
 msgstr "Utilizzo:"
 
-#: ../terminal/main.c:47
+#: ../terminal/main.c:48
 msgid "OPTION"
 msgstr "OPZIONI"
 
-#: ../terminal/main.c:49
+#: ../terminal/main.c:53
 msgid "General Options"
 msgstr "Opzioni generali"
 
-#: ../terminal/main.c:50
-msgid "  -h, --help                          Print this help message and exit"
-msgstr "  -h, --help            \t       Stampa questo messaggio di aiuto ed esce"
-
-#: ../terminal/main.c:51
-msgid "  -V, --version                       Print version information and exit"
-msgstr "  -V, --version                        Stampa le informazioni sulla versione ed esce"
-
-#: ../terminal/main.c:52
-msgid ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
-msgstr ""
-"  --disable-server                     Non registrare con il bus del messaggio\n"
-"                             \t       di sessione D-BUS"
-
-#: ../terminal/main.c:54
-msgid "  --default-display=DISPLAY           default X display to use"
-msgstr "  --default-display=SCHERMO   \t       Schermo X da usare come predefinito"
+#. parameter of --default-display
+#. parameter of --display
+#: ../terminal/main.c:55 ../terminal/main.c:81
+#, fuzzy
+msgid "display"
+msgstr "Non viene mostrato"
 
-#: ../terminal/main.c:55
-msgid ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
+#. parameter of --default-working-directory
+#. parameter of --working-directory
+#: ../terminal/main.c:57 ../terminal/main.c:72
+msgid "directory"
 msgstr ""
-"  --default-working-directory=CARTELLA Imposta la cartella di lavoro\n"
-"                                       predefinita per il terminale"
 
-#: ../terminal/main.c:58
+#: ../terminal/main.c:61
 msgid "Window or Tab Separators"
 msgstr "Separatore di finestre o schede"
 
-#: ../terminal/main.c:59
-msgid ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-msgstr ""
-"  --tab                                Apre una scheda nell'ultima finestra\n"
-"                                       specificata; può essere fornita più\n"
-" \t\t\t\t       di una di queste opzioni"
-
-#: ../terminal/main.c:62
-msgid ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-msgstr ""
-"  --window                             Apre una nuova finestra contenente\n"
-"                                       una scheda; può essere fornita più\n"
-" \t\t\t\t       di una di queste opzioni"
-
 #: ../terminal/main.c:66
 msgid "Tab Options"
 msgstr "Opzioni scheda"
 
-#: ../terminal/main.c:67
-msgid ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-msgstr ""
-"  -x, --execute                        Esegue il resto della linea di comando\n"
-"                                       all'interno del terminale"
-
-#: ../terminal/main.c:69
-msgid ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-msgstr ""
-"  -e, --command=STRINGA                Esegue l'argomento di questa opzione\n"
-"                                       all'interno del terminale"
-
-#: ../terminal/main.c:71
-msgid "  --working-directory=DIRNAME         Set the terminal's working directory"
-msgstr "  --working-directory=CARTELLA         Imposta la cartella di lavoro del terminale"
-
-#: ../terminal/main.c:72
-msgid "  -T, --title=TITLE                   Set the terminal's title"
-msgstr "  -T, --title=TITOLO                   Imposta il titolo del terminale"
+#. parameter of --command
+#: ../terminal/main.c:68
+#, fuzzy
+msgid "command"
+msgstr "Comando"
 
-#: ../terminal/main.c:73
-msgid ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-msgstr ""
-"  -H, --hold                           Non chiude immediatamente la scheda quando\n"
-" \t\t\t\t       il comando è completato"
+#. parameter of --title
+#: ../terminal/main.c:70
+#, fuzzy
+msgid "title"
+msgstr "Titolo"
 
-#: ../terminal/main.c:76
+#: ../terminal/main.c:79
 msgid "Window Options"
 msgstr "Opzioni finestra"
 
-#: ../terminal/main.c:77
-msgid ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
+#. parameter of --geometry
+#: ../terminal/main.c:83
+msgid "geometry"
 msgstr ""
-"  --display=SCHERMO                    Schermo X  da utilizzare per l'ultima\n"
-"                                       finestra specificata"
 
-#: ../terminal/main.c:79
-msgid ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
+#. parameter of --role
+#: ../terminal/main.c:85
+msgid "role"
 msgstr ""
-"  --geometry=GEOMETRIA\t\t       Specifica la geometria del terminale\n"
-"                                      (vedere la pagina man di \"X\"), può essere \n"
-"                                      specificata una volta per ogni finestra da aprire"
 
-#: ../terminal/main.c:82
-msgid ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
-msgstr ""
-"  --role=RUOLO                        Imposta il ruolo per l'ultima finestra\n"
-"                                      specificata; si applica a una sola\n"
-"                                      finestra; può essere specificato una volta\n"
-"                                      per ogni finestra che viene creata da linea\n"
-"                                      di comando"
-
-#: ../terminal/main.c:86
-msgid ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
-msgstr ""
-"  --startup-id=STRINGA                ID per il protocollo di notifica\n"
-"                                      di avvio"
-
-#: ../terminal/main.c:88
-msgid ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
-msgstr ""
-"  -I, --icon=ICONA                    Imposta l'icona del terminale tramite un\n"
-"\t\t\t\t      nome icona o un nome file"
-
-#: ../terminal/main.c:90
-msgid ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --fullscreen                        Imposta l'ultima finestra specificata in\n"
-"                                      modalità schermo intero; è applicabile a\n"
-"                                      una sola finestra; \n"
-"\t\t\t\t      può essere specificato per ciascuna finestra\n"
-" \t\t\t\t      che viene creata da linea di comando."
-
-#: ../terminal/main.c:95
-msgid ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
-msgstr ""
-"  --maximize                          Massimizza l'ultima finestra specificata;\n"
-"                                      è applicabile a una sola finestra; \n"
-"\t\t\t\t      può essere specificato per ciascuna finestra\n"
-" \t\t\t\t      che viene creata da linea di comando."
-
-#: ../terminal/main.c:99
-msgid ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-menubar                      Mostra la barra dei menu per\n"
-"                                      l' ultima finestra specificata;\n"
-"                                      è applicabile a una sola finestra; \n"
-"\t\t\t\t      può essere specificato per ciascuna finestra\n"
-" \t\t\t\t      che viene creata da linea di comando."
-
-#: ../terminal/main.c:104
-msgid ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --hide-menubar                      Nasconde la barra dei menu per\n"
-"                                      l' ultima finestra specificata;\n"
-"                                      è applicabile a una sola finestra; \n"
-"\t\t\t\t      può essere specificato per ciascuna finestra\n"
-" \t\t\t\t      che viene creata da linea di comando."
-
-#: ../terminal/main.c:109
-msgid ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --show-borders                      Mostra i bordi della finestra per\n"
-"                                      l'ultima finestra specificata;\n"
-"                                      è applicabile a una sola finestra; \n"
-"\t\t\t\t      può essere specificato per ciascuna finestra\n"
-" \t\t\t\t      che viene creata da linea di comando."
+#. parameter of --startup-id
+#: ../terminal/main.c:87
+#, fuzzy
+msgid "string"
+msgstr "Attenzione"
 
-#: ../terminal/main.c:114
-msgid ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --hide-borders                      Nasconde i bordi della finestra per\n"
-"                                      l'ultima finestra specificata;\n"
-"                                      è applicabile a una sola finestra; \n"
-"\t\t\t\t      può essere specificato per ciascuna finestra\n"
-" \t\t\t\t      che viene creata da linea di comando."
+#. parameter of --icon
+#: ../terminal/main.c:89
+#, fuzzy
+msgid "icon"
+msgstr "Azione"
 
-#: ../terminal/main.c:119
-msgid ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#: ../terminal/main.c:91
+#, c-format
+msgid "See the %s man page for full explanation of the options above."
 msgstr ""
-"  --show-toolbars                     Mostra la barra degli strumenti per\n"
-"                                      l'ultima finestra specificata;\n"
-"                                      è applicabile a una sola finestra; \n"
-"\t\t\t\t      può essere specificato per ciascuna finestra\n"
-" \t\t\t\t      che viene creata da linea di comando."
 
-#: ../terminal/main.c:124
-msgid ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --hide-toolbars                     Nasconde la barra degli strumenti per\n"
-"                                      l'ultima finestra specificata; \n"
-"                                      è applicabile a una sola finestra; \n"
-"\t\t\t\t      può essere specificato per ciascuna finestra\n"
-" \t\t\t\t      che viene creata da linea di comando."
-
-#: ../terminal/main.c:151
-#: ../terminal/terminal-preferences.c:1263
-#: ../terminal/terminal-shortcut-editor.c:120
-#: ../Terminal.desktop.in.h:1
+#: ../terminal/main.c:118 ../terminal/terminal-preferences.c:1263
+#: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr "Terminale"
 
-#: ../terminal/main.c:173
+#: ../terminal/main.c:135
 #, c-format
 msgid ""
 "%s (Xfce %s)\n"
@@ -312,37 +125,31 @@ msgstr ""
 "\n"
 "Per favore, segnalare i problemi a <%s>.\n"
 
-#: ../terminal/main.c:267
+#: ../terminal/main.c:239
 #, c-format
 msgid "Unable to register terminal service: %s\n"
 msgstr "Impossibile registrare il servizio terminale: %s\n"
 
-#: ../terminal/main.c:276
-#, c-format
-msgid "Unable to launch terminal: %s\n"
-msgstr "Impossibile lanciare il terminale: %s\n"
-
-#: ../terminal/terminal-app.c:551
+#: ../terminal/terminal-app.c:554
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "Stringa della geometria non valida \"%s\"\n"
 
-#: ../terminal/terminal-dbus.c:114
+#: ../terminal/terminal-dbus.c:108
 msgid "User id mismatch"
 msgstr "Mancata corrispondenza dell'id utente"
 
-#: ../terminal/terminal-dbus.c:146
+#: ../terminal/terminal-dbus.c:134
 #, c-format
 msgid "D-BUS message bus disconnected, exiting...\n"
 msgstr "bus dei messaggi D-BUS disconnesso, uscita...\n"
 
-#: ../terminal/terminal-dbus.c:208
+#: ../terminal/terminal-dbus.c:196
 #, c-format
 msgid "Unable to register object %s"
 msgstr "Impossibile registrare l'oggetto %s"
 
-#: ../terminal/terminal-dialogs.c:87
-#: ../Terminal-default-apps.xml.in.h:1
+#: ../terminal/terminal-dialogs.c:87 ../Terminal-default-apps.xml.in.h:1
 msgid "Xfce Terminal Emulator"
 msgstr "Emulatore di terminale per XFCE"
 
@@ -359,69 +166,99 @@ msgstr "Visitare il sito web di Terminale"
 msgid "Failed to open the documentation browser"
 msgstr "Impossibile aprire il browser della documentazione"
 
-#: ../terminal/terminal-options.c:189
+#: ../terminal/terminal-options.c:206
 #, c-format
-msgid "Option \"--default-display\" requires specifying the default X display as its parameter"
+msgid ""
+"Option \"--default-display\" requires specifying the default X display as "
+"its parameter"
 msgstr ""
-"L'opzione \"--default-display\" richiede di specificare lo schermo X predefinito\n"
+"L'opzione \"--default-display\" richiede di specificare lo schermo X "
+"predefinito\n"
 "come parametro"
 
-#: ../terminal/terminal-options.c:204
-#, c-format
-msgid "Option \"--default-working-directory\" requires specifying the default working directory as its parameter"
-msgstr "L'opzione \"--default-working-directory\" richiede di specificare la cartella di lavoro predefinita come parametro"
-
-#: ../terminal/terminal-options.c:235
+#: ../terminal/terminal-options.c:221
 #, c-format
-msgid "Option \"--sm-client-id\" requires specifying the session id as its parameter"
-msgstr "L'opzione \"--sm-client-id\" richiede di specificare l'id di sessione come parametro"
+msgid ""
+"Option \"--default-working-directory\" requires specifying the default "
+"working directory as its parameter"
+msgstr ""
+"L'opzione \"--default-working-directory\" richiede di specificare la "
+"cartella di lavoro predefinita come parametro"
 
-#: ../terminal/terminal-options.c:250
+#: ../terminal/terminal-options.c:237
 #, c-format
-msgid "Option \"--execute/-x\" requires specifying the command to run on the rest of the command line"
-msgstr "L'opzione \"--execute/-x\" richiede di specificare il comando da eseguire nella parte rimanente della linea di comando"
+msgid ""
+"Option \"--execute/-x\" requires specifying the command to run on the rest "
+"of the command line"
+msgstr ""
+"L'opzione \"--execute/-x\" richiede di specificare il comando da eseguire "
+"nella parte rimanente della linea di comando"
 
-#: ../terminal/terminal-options.c:267
+#: ../terminal/terminal-options.c:254
 #, c-format
-msgid "Option \"--command/-e\" requires specifying the command to run as its parameter"
-msgstr "L'opzione \"--command/-e\" richiede di specificare il comando da eseguire come parametro"
+msgid ""
+"Option \"--command/-e\" requires specifying the command to run as its "
+"parameter"
+msgstr ""
+"L'opzione \"--command/-e\" richiede di specificare il comando da eseguire "
+"come parametro"
 
-#: ../terminal/terminal-options.c:284
+#: ../terminal/terminal-options.c:271
 #, c-format
-msgid "Option \"--working-directory\" requires specifying the working directory as its parameter"
-msgstr "L'opzione \"--working-directory\" richiede di specificare la cartella di lavoro come parametro"
+msgid ""
+"Option \"--working-directory\" requires specifying the working directory as "
+"its parameter"
+msgstr ""
+"L'opzione \"--working-directory\" richiede di specificare la cartella di "
+"lavoro come parametro"
 
-#: ../terminal/terminal-options.c:299
+#: ../terminal/terminal-options.c:286
 #, c-format
 msgid "Option \"--title/-T\" requires specifying the title as its parameter"
-msgstr "L'opzione \"--title/-T\" richiede di specificare il titolo come parametro"
+msgstr ""
+"L'opzione \"--title/-T\" richiede di specificare il titolo come parametro"
 
-#: ../terminal/terminal-options.c:319
+#: ../terminal/terminal-options.c:305
 #, c-format
-msgid "Option \"--display\" requires specifying the X display as its parameters"
-msgstr "L'opzione \"--display\" richiede di specificare lo schermo X come parametro"
+msgid ""
+"Option \"--display\" requires specifying the X display as its parameters"
+msgstr ""
+"L'opzione \"--display\" richiede di specificare lo schermo X come parametro"
 
-#: ../terminal/terminal-options.c:334
+#: ../terminal/terminal-options.c:320
 #, c-format
-msgid "Option \"--geometry\" requires specifying the window geometry as its parameter"
-msgstr "L'opzione \"--geometry\" richiede di specificare la geometria della finestra come parametro"
+msgid ""
+"Option \"--geometry\" requires specifying the window geometry as its "
+"parameter"
+msgstr ""
+"L'opzione \"--geometry\" richiede di specificare la geometria della finestra "
+"come parametro"
 
-#: ../terminal/terminal-options.c:349
+#: ../terminal/terminal-options.c:335
 #, c-format
 msgid "Option \"--role\" requires specifying the window role as its parameter"
-msgstr "L'opzione \"--role\" richiede di specificare il ruolo della finestra come parametro"
+msgstr ""
+"L'opzione \"--role\" richiede di specificare il ruolo della finestra come "
+"parametro"
 
-#: ../terminal/terminal-options.c:364
+#: ../terminal/terminal-options.c:350
 #, c-format
-msgid "Option \"--startup-id\" requires specifying the startup id as its parameter"
-msgstr "L'opzione \"--startup-id\" richiede di specificare l'id di avvio come parametro"
+msgid ""
+"Option \"--startup-id\" requires specifying the startup id as its parameter"
+msgstr ""
+"L'opzione \"--startup-id\" richiede di specificare l'id di avvio come "
+"parametro"
 
-#: ../terminal/terminal-options.c:379
+#: ../terminal/terminal-options.c:365
 #, c-format
-msgid "Option \"--icon/-I\" requires specifying an icon name or filename as its parameter"
-msgstr "L'opzione \"--icon/-I\" richiede di specificare il nome dell'icona o il nome del file come parametro"
+msgid ""
+"Option \"--icon/-I\" requires specifying an icon name or filename as its "
+"parameter"
+msgstr ""
+"L'opzione \"--icon/-I\" richiede di specificare il nome dell'icona o il nome "
+"del file come parametro"
 
-#: ../terminal/terminal-options.c:435
+#: ../terminal/terminal-options.c:419
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Opzione \"%s\" sconosciuta"
@@ -490,7 +327,7 @@ msgstr "Schermo intero"
 msgid "Set Title"
 msgstr "Imposta il titolo"
 
-#: ../terminal/terminal-preferences.c:464
+#: ../terminal/terminal-preferences.c:464 ../terminal/terminal-window.c:237
 msgid "Reset"
 msgstr "Reimposta"
 
@@ -548,8 +385,7 @@ msgstr "Contenuti"
 
 #. TRANSLATORS: title for the tab/window used when all other
 #. * possible titles were empty strings
-#: ../terminal/terminal-screen.c:393
-#: ../terminal/terminal-screen.c:592
+#: ../terminal/terminal-screen.c:393 ../terminal/terminal-screen.c:592
 #: ../terminal/terminal-screen.c:1533
 msgid "Untitled"
 msgstr "Senza titolo"
@@ -589,8 +425,7 @@ msgid "Help"
 msgstr "Aiuto"
 
 #: ../terminal/terminal-shortcut-editor.c:210
-#: ../terminal/terminal-shortcut-editor.c:506
-#: ../Terminal.glade.h:24
+#: ../terminal/terminal-shortcut-editor.c:506 ../Terminal.glade.h:24
 msgid "Disabled"
 msgstr "Disabilitato"
 
@@ -644,23 +479,33 @@ msgstr "Apri collegamento"
 
 #: ../terminal/terminal-widget.c:481
 #, c-format
-msgid "Unable to drop selection of type text/plain to terminal: Wrong format (%d) or length (%d)\n"
-msgstr "Impossibile importare la selezione di tipo testo nel terminale: formato (%d) o lunghezza (%d) errati\n"
+msgid ""
+"Unable to drop selection of type text/plain to terminal: Wrong format (%d) "
+"or length (%d)\n"
+msgstr ""
+"Impossibile importare la selezione di tipo testo nel terminale: formato (%d) "
+"o lunghezza (%d) errati\n"
 
 #: ../terminal/terminal-widget.c:497
 #, c-format
-msgid "Unable to drop Mozilla URL on terminal: Wrong format (%d) or length (%d)\n"
-msgstr "Impossibile importare una URL Mozilla nel terminale: formato (%d) o lunghezza (%d) errati\n"
+msgid ""
+"Unable to drop Mozilla URL on terminal: Wrong format (%d) or length (%d)\n"
+msgstr ""
+"Impossibile importare una URL Mozilla nel terminale: formato (%d) o "
+"lunghezza (%d) errati\n"
 
 #: ../terminal/terminal-widget.c:523
 #, c-format
 msgid "Unable to drop URI list on terminal: Wrong format (%d) or length (%d)\n"
-msgstr "Impossibile importare una lista di URI nel terminale: formato (%d) o lunghezza (%d) errati\n"
+msgstr ""
+"Impossibile importare una lista di URI nel terminale: formato (%d) o "
+"lunghezza (%d) errati\n"
 
 #: ../terminal/terminal-widget.c:568
 #, c-format
 msgid "Received invalid color data: Wrong format (%d) or length (%d)\n"
-msgstr "Ricevuto un dato colore non valido: formato (%d) o lunghezza (%d) errati\n"
+msgstr ""
+"Ricevuto un dato colore non valido: formato (%d) o lunghezza (%d) errati\n"
 
 #. tell the user that we were unable to open the responsible application
 #: ../terminal/terminal-widget.c:705
@@ -780,6 +625,11 @@ msgstr "_Reimposta"
 msgid "Reset and C_lear"
 msgstr "Reimposta e _cancella"
 
+#: ../terminal/terminal-window.c:238
+#, fuzzy
+msgid "Reset and clear"
+msgstr "Reimposta e cancella"
+
 #: ../terminal/terminal-window.c:239
 msgid "_Go"
 msgstr "_Vai"
@@ -991,7 +841,8 @@ msgstr "Colore del cu_rsore"
 
 #: ../Terminal.glade.h:22
 msgid "Disable all me_nu access keys (such as Alt+f)"
-msgstr "Disabilita tutte le combinazioni di tasti per l'accesso al me_nu (es. Alt+f)"
+msgstr ""
+"Disabilita tutte le combinazioni di tasti per l'accesso al me_nu (es. Alt+f)"
 
 #: ../Terminal.glade.h:23
 msgid "Disable m_enu shortcut keys (F10 by default)"
@@ -1018,32 +869,62 @@ msgid "Enab_le anti-aliasing for the terminal font"
 msgstr "Abi_lita l'anti aliasing per i caratteri del terminale"
 
 #: ../Terminal.glade.h:30
-msgid "Enable this option if you want Terminal to use anti-aliasing when rendering text in terminal windows. Disabling this option can impressively speed up terminal rendering performance and reduce the overall system load on slow systems."
-msgstr "Abilitare questa opzione se si desidera che il Terminale usi l'anti-aliasing per il testo nelle finestre del terminale. Disabiltare questa opzione potrebbe migliorare molto le prestazioni di resa del terminale e ridurre il carico di sistema complessivo su sistemi lenti."
+msgid ""
+"Enable this option if you want Terminal to use anti-aliasing when rendering "
+"text in terminal windows. Disabling this option can impressively speed up "
+"terminal rendering performance and reduce the overall system load on slow "
+"systems."
+msgstr ""
+"Abilitare questa opzione se si desidera che il Terminale usi l'anti-aliasing "
+"per il testo nelle finestre del terminale. Disabiltare questa opzione "
+"potrebbe migliorare molto le prestazioni di resa del terminale e ridurre il "
+"carico di sistema complessivo su sistemi lenti."
 
 #: ../Terminal.glade.h:31
-msgid "Enable this option to allow applications running inside the terminal windows to use bold text."
-msgstr "Abilitare questa opzione per consentire l'utilizzo del testo in grassetto alle applicazioni in esecuzione all'interno delle finestre di terminale"
+msgid ""
+"Enable this option to allow applications running inside the terminal windows "
+"to use bold text."
+msgstr ""
+"Abilitare questa opzione per consentire l'utilizzo del testo in grassetto "
+"alle applicazioni in esecuzione all'interno delle finestre di terminale"
 
 #: ../Terminal.glade.h:32
-msgid "Enable this option to be able to scroll by a single line using the up/down arrow keys together with the Shift key."
-msgstr "Abilitare questa opzione per consentire lo scorrimento a singola linea tramite i tasti freccia su/giù in combinazione col tasto Shift."
+msgid ""
+"Enable this option to be able to scroll by a single line using the up/down "
+"arrow keys together with the Shift key."
+msgstr ""
+"Abilitare questa opzione per consentire lo scorrimento a singola linea "
+"tramite i tasti freccia su/giù in combinazione col tasto Shift."
 
 #: ../Terminal.glade.h:33
-msgid "Enable this option to show the menubar in newly created terminal windows."
-msgstr "Abilitare questa opzione per mostrare la barra dei menu nelle nuove finestre di terminale create."
+msgid ""
+"Enable this option to show the menubar in newly created terminal windows."
+msgstr ""
+"Abilitare questa opzione per mostrare la barra dei menu nelle nuove finestre "
+"di terminale create."
 
 #: ../Terminal.glade.h:34
-msgid "Enable this option to show the toolbars in newly created terminal windows."
-msgstr "Abilitare questa opzione per mostrare le barre degli strumenti nelle nuove finestre di terminale create."
+msgid ""
+"Enable this option to show the toolbars in newly created terminal windows."
+msgstr ""
+"Abilitare questa opzione per mostrare le barre degli strumenti nelle nuove "
+"finestre di terminale create."
 
 #: ../Terminal.glade.h:35
-msgid "Enable this option to show window decorations around newly created terminal windows."
-msgstr "Abilitare questa opzione per mostrare le decorazioni delle finestre nel nuovo terminale creato."
+msgid ""
+"Enable this option to show window decorations around newly created terminal "
+"windows."
+msgstr ""
+"Abilitare questa opzione per mostrare le decorazioni delle finestre nel "
+"nuovo terminale creato."
 
 #: ../Terminal.glade.h:36
-msgid "Enables you to press any key on the keyboard to scroll down the terminal window to the command prompt."
-msgstr "Permette di effettuare lo scorrimento della finestra del terminale fino al prompt dei comandi tramite la pressione di qualunque tasto"
+msgid ""
+"Enables you to press any key on the keyboard to scroll down the terminal "
+"window to the command prompt."
+msgstr ""
+"Permette di effettuare lo scorrimento della finestra del terminale fino al "
+"prompt dei comandi tramite la pressione di qualunque tasto"
 
 #: ../Terminal.glade.h:37
 msgid "Erase TTY"
@@ -1206,16 +1087,27 @@ msgid "Select Background Image File"
 msgstr "Selezionare il file d'immagine dello sfondo"
 
 #: ../Terminal.glade.h:77
-msgid "Select this option to force Terminal to run your shell as a login shell when you open new terminals. See the documentation of your shell for details about differences between running it as interactive shell and running it as login shell."
-msgstr "Selezionare questa opzione per forzare il Terminale a lanciare la shell come shell di login quando vengono aperti nuovi terminali. Consultare la documentazione della propria shell per ulteriori dettagli riguardo alle differenze tra lanciarla come shell interattiva oppure shell di login."
+msgid ""
+"Select this option to force Terminal to run your shell as a login shell when "
+"you open new terminals. See the documentation of your shell for details "
+"about differences between running it as interactive shell and running it as "
+"login shell."
+msgstr ""
+"Selezionare questa opzione per forzare il Terminale a lanciare la shell come "
+"shell di login quando vengono aperti nuovi terminali. Consultare la "
+"documentazione della propria shell per ulteriori dettagli riguardo alle "
+"differenze tra lanciarla come shell interattiva oppure shell di login."
 
 #: ../Terminal.glade.h:78
 msgid "Shortcut Keys"
 msgstr "Tasti Scorciatoia"
 
 #: ../Terminal.glade.h:79
-msgid "Specifies the number of lines that you can scroll back using the scrollbar."
-msgstr "Specifica il numero di linee di cui è possibile fare lo scorrimento all'indietro usando la barra di scorrimento"
+msgid ""
+"Specifies the number of lines that you can scroll back using the scrollbar."
+msgstr ""
+"Specifica il numero di linee di cui è possibile fare lo scorrimento "
+"all'indietro usando la barra di scorrimento"
 
 #: ../Terminal.glade.h:80
 msgid "St_yle:"
@@ -1239,7 +1131,8 @@ msgstr "Preferenze di Terminale"
 
 #: ../Terminal.glade.h:85
 msgid "Terminal applications have this color palette available to them:"
-msgstr "Le applicazioni nel terminale hanno a disposizione questa tavola di colori:"
+msgstr ""
+"Le applicazioni nel terminale hanno a disposizione questa tavola di colori:"
 
 #: ../Terminal.glade.h:86
 msgid "Text Selection"
@@ -1251,15 +1144,33 @@ msgid ""
 "incorrectly. They are only here to allow you to work around\n"
 "certain applications and operating systems that expect\n"
 "different terminal behavior."
-msgstr "Queste opzioni potrebbero causare un comportamento non corretto in alcune applicazioni. Sono qui disponibili solo per permettere di aggirare certe applicazioni o sistemi operativi che si aspettano un comportamento diverso del terminale."
+msgstr ""
+"Queste opzioni potrebbero causare un comportamento non corretto in alcune "
+"applicazioni. Sono qui disponibili solo per permettere di aggirare certe "
+"applicazioni o sistemi operativi che si aspettano un comportamento diverso "
+"del terminale."
 
 #: ../Terminal.glade.h:91
-msgid "This option controls whether the terminal will scroll down automatically whenever new output is generated by the commands running inside the terminal."
-msgstr "Questa opzione controlla se il terminale deve gestire lo scorrimento automatico qualora del nuovo output venga generato dai comandi in esecuzione all'interno del terminale."
+msgid ""
+"This option controls whether the terminal will scroll down automatically "
+"whenever new output is generated by the commands running inside the terminal."
+msgstr ""
+"Questa opzione controlla se il terminale deve gestire lo scorrimento "
+"automatico qualora del nuovo output venga generato dai comandi in esecuzione "
+"all'interno del terminale."
 
 #: ../Terminal.glade.h:92
-msgid "This specifies the value the $TERM environment variable is set to, when a new terminal tab or terminal window is opened. The default should be ok for most systems. If you have problems with colors in some applications, try xterm-color here."
-msgstr "Specifica il valore a cui la variabile d'ambiente $TERM viene impostata quando una nuova scheda o finestra del terminale viene aperta. Il valore predefinito dovrebbe andare bene per la maggior parte dei sistemi. Se si riscontrano problemi con i colori in certe applicazioni, provare a impostare xterm-color qui."
+msgid ""
+"This specifies the value the $TERM environment variable is set to, when a "
+"new terminal tab or terminal window is opened. The default should be ok for "
+"most systems. If you have problems with colors in some applications, try "
+"xterm-color here."
+msgstr ""
+"Specifica il valore a cui la variabile d'ambiente $TERM viene impostata "
+"quando una nuova scheda o finestra del terminale viene aperta. Il valore "
+"predefinito dovrebbe andare bene per la maggior parte dei sistemi. Se si "
+"riscontrano problemi con i colori in certe applicazioni, provare a impostare "
+"xterm-color qui."
 
 #: ../Terminal.glade.h:93
 msgid "Tiled"
@@ -1353,3 +1264,284 @@ msgstr "_Aggiorna i record di utmp/wtmp quando viene lanciato il comando"
 msgid "seconds"
 msgstr "secondi"
 
+#~ msgid ""
+#~ "  -h, --help                          Print this help message and exit"
+#~ msgstr ""
+#~ "  -h, --help            \t       Stampa questo messaggio di aiuto ed esce"
+
+#~ msgid ""
+#~ "  -V, --version                       Print version information and exit"
+#~ msgstr ""
+#~ "  -V, --version                        Stampa le informazioni sulla "
+#~ "versione ed esce"
+
+#~ msgid ""
+#~ "  --disable-server                    Do not register with the D-BUS\n"
+#~ "                                      session message bus"
+#~ msgstr ""
+#~ "  --disable-server                     Non registrare con il bus del "
+#~ "messaggio\n"
+#~ "                             \t       di sessione D-BUS"
+
+#~ msgid "  --default-display=DISPLAY           default X display to use"
+#~ msgstr ""
+#~ "  --default-display=SCHERMO   \t       Schermo X da usare come predefinito"
+
+#~ msgid ""
+#~ "  --default-working-directory=DIRNAME Set the default terminal's working\n"
+#~ "                                      directory"
+#~ msgstr ""
+#~ "  --default-working-directory=CARTELLA Imposta la cartella di lavoro\n"
+#~ "                                       predefinita per il terminale"
+
+#~ msgid ""
+#~ "  --tab                               Open a new tab in the last-"
+#~ "specified\n"
+#~ "                                      window; more than one of these\n"
+#~ "                                      options can be provided"
+#~ msgstr ""
+#~ "  --tab                                Apre una scheda nell'ultima "
+#~ "finestra\n"
+#~ "                                       specificata; può essere fornita "
+#~ "più\n"
+#~ " \t\t\t\t       di una di queste opzioni"
+
+#~ msgid ""
+#~ "  --window                            Open a new window containing one "
+#~ "tab;\n"
+#~ "                                      more than one of these options can "
+#~ "be\n"
+#~ "                                      provided"
+#~ msgstr ""
+#~ "  --window                             Apre una nuova finestra "
+#~ "contenente\n"
+#~ "                                       una scheda; può essere fornita "
+#~ "più\n"
+#~ " \t\t\t\t       di una di queste opzioni"
+
+#~ msgid ""
+#~ "  -x, --execute                       Execute the remainder of the "
+#~ "command\n"
+#~ "                                      line inside the terminal"
+#~ msgstr ""
+#~ "  -x, --execute                        Esegue il resto della linea di "
+#~ "comando\n"
+#~ "                                       all'interno del terminale"
+
+#~ msgid ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+#~ msgstr ""
+#~ "  -e, --command=STRINGA                Esegue l'argomento di questa "
+#~ "opzione\n"
+#~ "                                       all'interno del terminale"
+
+#~ msgid ""
+#~ "  --working-directory=DIRNAME         Set the terminal's working directory"
+#~ msgstr ""
+#~ "  --working-directory=CARTELLA         Imposta la cartella di lavoro del "
+#~ "terminale"
+
+#~ msgid "  -T, --title=TITLE                   Set the terminal's title"
+#~ msgstr ""
+#~ "  -T, --title=TITOLO                   Imposta il titolo del terminale"
+
+#~ msgid ""
+#~ "  -H, --hold                          Do not immediately destroy the tab\n"
+#~ "                                      when the child command exits"
+#~ msgstr ""
+#~ "  -H, --hold                           Non chiude immediatamente la "
+#~ "scheda quando\n"
+#~ " \t\t\t\t       il comando è completato"
+
+#~ msgid ""
+#~ "  --display=DISPLAY                   X display to use for the last-\n"
+#~ "                                      specified window"
+#~ msgstr ""
+#~ "  --display=SCHERMO                    Schermo X  da utilizzare per "
+#~ "l'ultima\n"
+#~ "                                       finestra specificata"
+
+#~ msgid ""
+#~ "  --geometry=GEOMETRY                 X geometry specification (see \"X"
+#~ "\"\n"
+#~ "                                      man page), can be specified once "
+#~ "per\n"
+#~ "                                      window to be opened"
+#~ msgstr ""
+#~ "  --geometry=GEOMETRIA\t\t       Specifica la geometria del terminale\n"
+#~ "                                      (vedere la pagina man di \"X\"), "
+#~ "può essere \n"
+#~ "                                      specificata una volta per ogni "
+#~ "finestra da aprire"
+
+#~ msgid ""
+#~ "  --role=ROLE                         Set the role for the last-"
+#~ "specified\n"
+#~ "                                      window; applies to only one "
+#~ "window;\n"
+#~ "                                      can be specified once for each "
+#~ "window\n"
+#~ "                                      you create from the command line"
+#~ msgstr ""
+#~ "  --role=RUOLO                        Imposta il ruolo per l'ultima "
+#~ "finestra\n"
+#~ "                                      specificata; si applica a una sola\n"
+#~ "                                      finestra; può essere specificato "
+#~ "una volta\n"
+#~ "                                      per ogni finestra che viene creata "
+#~ "da linea\n"
+#~ "                                      di comando"
+
+#~ msgid ""
+#~ "  --startup-id=STRING                 ID for the startup notification\n"
+#~ "                                      protocol"
+#~ msgstr ""
+#~ "  --startup-id=STRINGA                ID per il protocollo di notifica\n"
+#~ "                                      di avvio"
+
+#~ msgid ""
+#~ "  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
+#~ "                                      name or filename"
+#~ msgstr ""
+#~ "  -I, --icon=ICONA                    Imposta l'icona del terminale "
+#~ "tramite un\n"
+#~ "\t\t\t\t      nome icona o un nome file"
+
+#~ msgid ""
+#~ "  --fullscreen                        Set the last-specified window into\n"
+#~ "                                      fullscreen mode; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --fullscreen                        Imposta l'ultima finestra "
+#~ "specificata in\n"
+#~ "                                      modalità schermo intero; è "
+#~ "applicabile a\n"
+#~ "                                      una sola finestra; \n"
+#~ "\t\t\t\t      può essere specificato per ciascuna finestra\n"
+#~ " \t\t\t\t      che viene creata da linea di comando."
+
+#~ msgid ""
+#~ "  --maximize                          Maximize the last-specified "
+#~ "window;\n"
+#~ "                                      applies to only one window; can be\n"
+#~ "                                      specified once for each window you\n"
+#~ "                                      create from the command line"
+#~ msgstr ""
+#~ "  --maximize                          Massimizza l'ultima finestra "
+#~ "specificata;\n"
+#~ "                                      è applicabile a una sola "
+#~ "finestra; \n"
+#~ "\t\t\t\t      può essere specificato per ciascuna finestra\n"
+#~ " \t\t\t\t      che viene creata da linea di comando."
+
+#~ msgid ""
+#~ "  --show-menubar                      Turn on the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-menubar                      Mostra la barra dei menu per\n"
+#~ "                                      l' ultima finestra specificata;\n"
+#~ "                                      è applicabile a una sola "
+#~ "finestra; \n"
+#~ "\t\t\t\t      può essere specificato per ciascuna finestra\n"
+#~ " \t\t\t\t      che viene creata da linea di comando."
+
+#~ msgid ""
+#~ "  --hide-menubar                      Turn off the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-menubar                      Nasconde la barra dei menu per\n"
+#~ "                                      l' ultima finestra specificata;\n"
+#~ "                                      è applicabile a una sola "
+#~ "finestra; \n"
+#~ "\t\t\t\t      può essere specificato per ciascuna finestra\n"
+#~ " \t\t\t\t      che viene creata da linea di comando."
+
+#~ msgid ""
+#~ "  --show-borders                      Turn on the window decorations for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --show-borders                      Mostra i bordi della finestra per\n"
+#~ "                                      l'ultima finestra specificata;\n"
+#~ "                                      è applicabile a una sola "
+#~ "finestra; \n"
+#~ "\t\t\t\t      può essere specificato per ciascuna finestra\n"
+#~ " \t\t\t\t      che viene creata da linea di comando."
+
+#~ msgid ""
+#~ "  --hide-borders                      Turn off the window decorations "
+#~ "for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --hide-borders                      Nasconde i bordi della finestra "
+#~ "per\n"
+#~ "                                      l'ultima finestra specificata;\n"
+#~ "                                      è applicabile a una sola "
+#~ "finestra; \n"
+#~ "\t\t\t\t      può essere specificato per ciascuna finestra\n"
+#~ " \t\t\t\t      che viene creata da linea di comando."
+
+#~ msgid ""
+#~ "  --show-toolbars                     Turn on the toolbars for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-toolbars                     Mostra la barra degli strumenti "
+#~ "per\n"
+#~ "                                      l'ultima finestra specificata;\n"
+#~ "                                      è applicabile a una sola "
+#~ "finestra; \n"
+#~ "\t\t\t\t      può essere specificato per ciascuna finestra\n"
+#~ " \t\t\t\t      che viene creata da linea di comando."
+
+#~ msgid ""
+#~ "  --hide-toolbars                     Turn off the toolbars for the "
+#~ "last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-toolbars                     Nasconde la barra degli strumenti "
+#~ "per\n"
+#~ "                                      l'ultima finestra specificata; \n"
+#~ "                                      è applicabile a una sola "
+#~ "finestra; \n"
+#~ "\t\t\t\t      può essere specificato per ciascuna finestra\n"
+#~ " \t\t\t\t      che viene creata da linea di comando."
+
+#~ msgid "Unable to launch terminal: %s\n"
+#~ msgstr "Impossibile lanciare il terminale: %s\n"
+
+#~ msgid ""
+#~ "Option \"--sm-client-id\" requires specifying the session id as its "
+#~ "parameter"
+#~ msgstr ""
+#~ "L'opzione \"--sm-client-id\" richiede di specificare l'id di sessione "
+#~ "come parametro"
diff --git a/po/ja.po b/po/ja.po
index 45d41c8..e996cc2 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Terminal 0.2.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 11:48+0100\n"
+"POT-Creation-Date: 2009-12-14 16:03+0100\n"
 "PO-Revision-Date: 2009-08-29 18:12+0900\n"
 "Last-Translator: Masato Hashimoto <cabezon.hashimoto at gmail.com>\n"
 "Language-Team: Japanese <xfce-users-jp at ml.fdiary.net>\n"
@@ -17,280 +17,88 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../terminal/main.c:46
+#: ../terminal/main.c:48
 msgid "Usage:"
 msgstr "使用法:"
 
-#: ../terminal/main.c:47
+#: ../terminal/main.c:48
 msgid "OPTION"
 msgstr "オプション"
 
-#: ../terminal/main.c:49
+#: ../terminal/main.c:53
 msgid "General Options"
 msgstr "一般オプション"
 
-#: ../terminal/main.c:50
-msgid "  -h, --help                          Print this help message and exit"
-msgstr "  -h, --help                          このヘルプを表示して終了する"
-
-#: ../terminal/main.c:51
-msgid ""
-"  -V, --version                       Print version information and exit"
-msgstr "  -V, --version                       バージョン情報を表示して終了する"
-
-#: ../terminal/main.c:52
-msgid ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
-msgstr ""
-"  --disable-server                    D-BUS セッションメッセージバスに\n"
-"                                      登録しない"
+#. parameter of --default-display
+#. parameter of --display
+#: ../terminal/main.c:55 ../terminal/main.c:81
+#, fuzzy
+msgid "display"
+msgstr "表示しない"
 
-#: ../terminal/main.c:54
-msgid "  --default-display=DISPLAY           default X display to use"
+#. parameter of --default-working-directory
+#. parameter of --working-directory
+#: ../terminal/main.c:57 ../terminal/main.c:72
+msgid "directory"
 msgstr ""
-"  --default-display=DISPLAY           使用する標準の X ディスプレイを指定\n"
-"                                      する"
 
-#: ../terminal/main.c:55
-msgid ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
-msgstr ""
-"  --default-working-directory=DIRNAME ターミナルの標準の作業フォルダを指定\n"
-"                                      する"
-
-#: ../terminal/main.c:58
+#: ../terminal/main.c:61
 msgid "Window or Tab Separators"
 msgstr "ウィンドウまたはタブセパレータ"
 
-#: ../terminal/main.c:59
-msgid ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-msgstr ""
-"  --tab                               最後に指定したウィンドウで新しいタブ\n"
-"                                      を開く; 他のオプションと同時に指定でき"
-"る"
-
-#: ../terminal/main.c:62
-msgid ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-msgstr ""
-"  --window                            一つのタブを含む新しいウィンドウを\n"
-"                                      開く; 他のオプションと同時に指定できる"
-
 #: ../terminal/main.c:66
 msgid "Tab Options"
 msgstr "タブオプション"
 
-#: ../terminal/main.c:67
-msgid ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-msgstr ""
-"  -x, --execute                       残りのコマンドラインをターミナル内で\n"
-"                                      実行する"
-
-#: ../terminal/main.c:69
-msgid ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-msgstr ""
-"  -e, --command=STRING                このオプションの引数をターミナル内で\n"
-"                                      実行する"
-
-#: ../terminal/main.c:71
-msgid ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
-msgstr ""
-"  --working-directory=DIRNAME         ターミナルの作業フォルダを指定する"
-
-#: ../terminal/main.c:72
-msgid "  -T, --title=TITLE                   Set the terminal's title"
-msgstr "  -T, --title=TITLE                   ターミナルのタイトルを付ける"
+#. parameter of --command
+#: ../terminal/main.c:68
+#, fuzzy
+msgid "command"
+msgstr "コマンド"
 
-#: ../terminal/main.c:73
-msgid ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-msgstr ""
-"  -H, --hold                          子コマンドが終了してもすぐに\n"
-"                                      タブを破棄しない"
+#. parameter of --title
+#: ../terminal/main.c:70
+#, fuzzy
+msgid "title"
+msgstr "タイトル"
 
-#: ../terminal/main.c:76
+#: ../terminal/main.c:79
 msgid "Window Options"
 msgstr "ウィンドウオプション"
 
-#: ../terminal/main.c:77
-msgid ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
-msgstr ""
-"  --display=DISPLAY                   最後に指定したウィンドウに使用する\n"
-"                                      X ディスプレイを指定する"
-
-#: ../terminal/main.c:79
-msgid ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
-msgstr ""
-"  --geometry=GEOMETRY                 X のジオメトリを指定する (\"X\" の "
-"man\n"
-"                                      ページを参照)。開くウィンドウ毎に指定\n"
-"                                      できる"
-
-#: ../terminal/main.c:82
-msgid ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
-msgstr ""
-"  --role=ROLE                         最後に指定したウィンドウにロールを\n"
-"                                      セットする; 一つのウィンドウのみに\n"
-"                                      適用される; コマンドラインから作成す"
-"る\n"
-"                                      各々のウィンドウに対して一度指定できる"
-
-#: ../terminal/main.c:86
-msgid ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
-msgstr ""
-"  --startup-id=STRING                 起動通知プロトコルの ID を指定する"
-
-#: ../terminal/main.c:88
-msgid ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
+#. parameter of --geometry
+#: ../terminal/main.c:83
+msgid "geometry"
 msgstr ""
-"  -I, --icon=ICON                     ターミナルのアイコンのアイコン名また"
-"は\n"
-"                                      ファイル名を設定する"
 
-#: ../terminal/main.c:90
-msgid ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#. parameter of --role
+#: ../terminal/main.c:85
+msgid "role"
 msgstr ""
-"  --fullscreen                        最後に指定したウィンドウを全画面\n"
-"                                      モードにセットする; 一つのウィン\n"
-"                                      ドウのみに適用される; コマンドライン\n"
-"                                      から作成する各々のウィンドウに対して\n"
-"                                      一度指定できる"
 
-#: ../terminal/main.c:95
-msgid ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
-msgstr ""
-"  --maximize                          最後に指定されたウィンドウを最大化す"
-"る;\n"
-"                                      一つのウィンドウのみに適用される;\n"
-"                                      コマンドラインから作成する各々のウィン"
-"ドウ\n"
-"                                      に対して一度指定できる"
-
-#: ../terminal/main.c:99
-msgid ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-menubar                      最後に指定したウィンドウでメニュー\n"
-"                                      バーを表示する; 一つのウィンドウ\n"
-"                                      のみに適用される; コマンドラインから\n"
-"                                      作成する各々のウィンドウに対して\n"
-"                                      一度指定できる"
-
-#: ../terminal/main.c:104
-msgid ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --hide-menubar                      最後に指定したウィンドウでメニュー\n"
-"                                      バーを表示しない; 一つのウィンドウ\n"
-"                                      のみに適用される; コマンドラインから\n"
-"                                      作成する各々のウィンドウに対して一度\n"
-"                                      指定できる"
-
-#: ../terminal/main.c:109
-msgid ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --show-borders                      最後に指定したウィンドウでウィンドウ\n"
-"                                      の枠を表示する; 一つのウィンドウ\n"
-"                                      のみに適用される; コマンドラインから\n"
-"                                      作成する各々のウィンドウに対して一度\n"
-"                                      指定できる"
-
-#: ../terminal/main.c:114
-msgid ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --hide-borders                      最後に指定したウィンドウでウィンドウ\n"
-"                                      の枠を表示しない; 一つのウィンドウ\n"
-"                                      のみに適用される; コマンドラインから\n"
-"                                      作成する各々のウィンドウに対して一度\n"
-"                                      指定できる"
+#. parameter of --startup-id
+#: ../terminal/main.c:87
+#, fuzzy
+msgid "string"
+msgstr "警告"
 
-#: ../terminal/main.c:119
-msgid ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-toolbars                     最後に指定したウィンドウでツールバー\n"
-"                                      を表示する; 一つのウィンドウのみに\n"
-"                                      適用される; コマンドラインから作成す"
-"る\n"
-"                                      各々のウィンドウに対して一度指定できる"
+#. parameter of --icon
+#: ../terminal/main.c:89
+#, fuzzy
+msgid "icon"
+msgstr "アクション"
 
-#: ../terminal/main.c:124
-msgid ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#: ../terminal/main.c:91
+#, c-format
+msgid "See the %s man page for full explanation of the options above."
 msgstr ""
-"  --hide-toolbars                     最後に指定したウィンドウでツールバー\n"
-"                                      を表示しない; 一つのウィンドウのみ\n"
-"                                      に適用される; コマンドラインから作成\n"
-"                                      する各々のウィンドウに対して一度指定\n"
-"                                      できる"
 
-#: ../terminal/main.c:151 ../terminal/terminal-preferences.c:1263
+#: ../terminal/main.c:118 ../terminal/terminal-preferences.c:1263
 #: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../terminal/main.c:173
+#: ../terminal/main.c:135
 #, c-format
 msgid ""
 "%s (Xfce %s)\n"
@@ -315,31 +123,26 @@ msgstr ""
 "\n"
 "バグの報告は <%s> にお願いします。\n"
 
-#: ../terminal/main.c:267
+#: ../terminal/main.c:239
 #, c-format
 msgid "Unable to register terminal service: %s\n"
 msgstr "ターミナルサービスを登録できません: %s\n"
 
-#: ../terminal/main.c:276
-#, c-format
-msgid "Unable to launch terminal: %s\n"
-msgstr "ターミナルを起動できません: %s\n"
-
-#: ../terminal/terminal-app.c:551
+#: ../terminal/terminal-app.c:554
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "ジオメトリ文字列 \"%s\" は不適切です。\n"
 
-#: ../terminal/terminal-dbus.c:114
+#: ../terminal/terminal-dbus.c:108
 msgid "User id mismatch"
 msgstr "ユーザ ID が一致しません。"
 
-#: ../terminal/terminal-dbus.c:146
+#: ../terminal/terminal-dbus.c:134
 #, c-format
 msgid "D-BUS message bus disconnected, exiting...\n"
 msgstr "D-BUS メッセージバスの接続が切れました。終了します...\n"
 
-#: ../terminal/terminal-dbus.c:208
+#: ../terminal/terminal-dbus.c:196
 #, c-format
 msgid "Unable to register object %s"
 msgstr "オブジェクト %s を登録できません。"
@@ -364,7 +167,7 @@ msgstr "Terminal のウェブサイトへ"
 msgid "Failed to open the documentation browser"
 msgstr "ドキュメントブラウザを開けませんでした"
 
-#: ../terminal/terminal-options.c:189
+#: ../terminal/terminal-options.c:206
 #, c-format
 msgid ""
 "Option \"--default-display\" requires specifying the default X display as "
@@ -373,7 +176,7 @@ msgstr ""
 "オプション \"--default-display\" にはパラメータとして標準の X ディスプレイを"
 "指定する必要があります"
 
-#: ../terminal/terminal-options.c:204
+#: ../terminal/terminal-options.c:221
 #, c-format
 msgid ""
 "Option \"--default-working-directory\" requires specifying the default "
@@ -382,15 +185,7 @@ msgstr ""
 "オプション \"--default-working-directory\" にはパラメータとしてデフォルトの作"
 "業フォルダを指定する必要があります"
 
-#: ../terminal/terminal-options.c:235
-#, c-format
-msgid ""
-"Option \"--sm-client-id\" requires specifying the session id as its parameter"
-msgstr ""
-"オプション \"--sm-client-id\" にはパラメータとしてセッション ID を指定する必"
-"要があります"
-
-#: ../terminal/terminal-options.c:250
+#: ../terminal/terminal-options.c:237
 #, c-format
 msgid ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
@@ -399,7 +194,7 @@ msgstr ""
 "オプション \"--execute/-x\" にはこの後に実行するコマンドを指定する必要があり"
 "ます"
 
-#: ../terminal/terminal-options.c:267
+#: ../terminal/terminal-options.c:254
 #, c-format
 msgid ""
 "Option \"--command/-e\" requires specifying the command to run as its "
@@ -408,7 +203,7 @@ msgstr ""
 "オプション \"--command/-e\" にはパラメータとして実行するコマンドを指定する必"
 "要があります"
 
-#: ../terminal/terminal-options.c:284
+#: ../terminal/terminal-options.c:271
 #, c-format
 msgid ""
 "Option \"--working-directory\" requires specifying the working directory as "
@@ -417,13 +212,13 @@ msgstr ""
 "オプション \"--working-directory\" にはパラメータとして作業フォルダを指定する"
 "必要があります"
 
-#: ../terminal/terminal-options.c:299
+#: ../terminal/terminal-options.c:286
 #, c-format
 msgid "Option \"--title/-T\" requires specifying the title as its parameter"
 msgstr ""
 "オプション \"--title\" にはパラメータとしてタイトルを指定する必要があります"
 
-#: ../terminal/terminal-options.c:319
+#: ../terminal/terminal-options.c:305
 #, c-format
 msgid ""
 "Option \"--display\" requires specifying the X display as its parameters"
@@ -431,7 +226,7 @@ msgstr ""
 "オプション \"--display\" にはパラメータとして X ディスプレイを指定する必要が"
 "あります"
 
-#: ../terminal/terminal-options.c:334
+#: ../terminal/terminal-options.c:320
 #, c-format
 msgid ""
 "Option \"--geometry\" requires specifying the window geometry as its "
@@ -440,14 +235,14 @@ msgstr ""
 "オプション \"--geometry\" にはパラメータとしてウィンドウ位置を指定する必要が"
 "あります"
 
-#: ../terminal/terminal-options.c:349
+#: ../terminal/terminal-options.c:335
 #, c-format
 msgid "Option \"--role\" requires specifying the window role as its parameter"
 msgstr ""
 "オプション \"--role\" にはパラメータとしてウィンドウロールを指定する必要があ"
 "ります"
 
-#: ../terminal/terminal-options.c:364
+#: ../terminal/terminal-options.c:350
 #, c-format
 msgid ""
 "Option \"--startup-id\" requires specifying the startup id as its parameter"
@@ -455,7 +250,7 @@ msgstr ""
 "オプション \"--startup-id\" にはパラメータとして起動 ID を指定する必要があり"
 "ます"
 
-#: ../terminal/terminal-options.c:379
+#: ../terminal/terminal-options.c:365
 #, c-format
 msgid ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
@@ -464,7 +259,7 @@ msgstr ""
 "オプション \"--icon/-I\" にはパラメータとしてアイコン名またはファイル名を指定"
 "する必要があります"
 
-#: ../terminal/terminal-options.c:435
+#: ../terminal/terminal-options.c:419
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "\"%s\" は不明なオプションです"
@@ -533,7 +328,7 @@ msgstr "全画面表示"
 msgid "Set Title"
 msgstr "タイトルを付ける"
 
-#: ../terminal/terminal-preferences.c:464
+#: ../terminal/terminal-preferences.c:464 ../terminal/terminal-window.c:237
 msgid "Reset"
 msgstr "リセット"
 
@@ -830,6 +625,11 @@ msgstr "リセット(_R)"
 msgid "Reset and C_lear"
 msgstr "リセットしてクリア(_L)"
 
+#: ../terminal/terminal-window.c:238
+#, fuzzy
+msgid "Reset and clear"
+msgstr "リセットして消去"
+
 #: ../terminal/terminal-window.c:239
 msgid "_Go"
 msgstr "移動(_G)"
@@ -1456,6 +1256,283 @@ msgstr "コマンドが実行される時に utmp/wtmp の記録を更新する(
 msgid "seconds"
 msgstr "秒"
 
+#~ msgid ""
+#~ "  -h, --help                          Print this help message and exit"
+#~ msgstr "  -h, --help                          このヘルプを表示して終了する"
+
+#~ msgid ""
+#~ "  -V, --version                       Print version information and exit"
+#~ msgstr ""
+#~ "  -V, --version                       バージョン情報を表示して終了する"
+
+#~ msgid ""
+#~ "  --disable-server                    Do not register with the D-BUS\n"
+#~ "                                      session message bus"
+#~ msgstr ""
+#~ "  --disable-server                    D-BUS セッションメッセージバスに\n"
+#~ "                                      登録しない"
+
+#~ msgid "  --default-display=DISPLAY           default X display to use"
+#~ msgstr ""
+#~ "  --default-display=DISPLAY           使用する標準の X ディスプレイを指"
+#~ "定\n"
+#~ "                                      する"
+
+#~ msgid ""
+#~ "  --default-working-directory=DIRNAME Set the default terminal's working\n"
+#~ "                                      directory"
+#~ msgstr ""
+#~ "  --default-working-directory=DIRNAME ターミナルの標準の作業フォルダを指"
+#~ "定\n"
+#~ "                                      する"
+
+#~ msgid ""
+#~ "  --tab                               Open a new tab in the last-"
+#~ "specified\n"
+#~ "                                      window; more than one of these\n"
+#~ "                                      options can be provided"
+#~ msgstr ""
+#~ "  --tab                               最後に指定したウィンドウで新しいタ"
+#~ "ブ\n"
+#~ "                                      を開く; 他のオプションと同時に指定で"
+#~ "きる"
+
+#~ msgid ""
+#~ "  --window                            Open a new window containing one "
+#~ "tab;\n"
+#~ "                                      more than one of these options can "
+#~ "be\n"
+#~ "                                      provided"
+#~ msgstr ""
+#~ "  --window                            一つのタブを含む新しいウィンドウを\n"
+#~ "                                      開く; 他のオプションと同時に指定でき"
+#~ "る"
+
+#~ msgid ""
+#~ "  -x, --execute                       Execute the remainder of the "
+#~ "command\n"
+#~ "                                      line inside the terminal"
+#~ msgstr ""
+#~ "  -x, --execute                       残りのコマンドラインをターミナル内"
+#~ "で\n"
+#~ "                                      実行する"
+
+#~ msgid ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+#~ msgstr ""
+#~ "  -e, --command=STRING                このオプションの引数をターミナル内"
+#~ "で\n"
+#~ "                                      実行する"
+
+#~ msgid ""
+#~ "  --working-directory=DIRNAME         Set the terminal's working directory"
+#~ msgstr ""
+#~ "  --working-directory=DIRNAME         ターミナルの作業フォルダを指定する"
+
+#~ msgid "  -T, --title=TITLE                   Set the terminal's title"
+#~ msgstr "  -T, --title=TITLE                   ターミナルのタイトルを付ける"
+
+#~ msgid ""
+#~ "  -H, --hold                          Do not immediately destroy the tab\n"
+#~ "                                      when the child command exits"
+#~ msgstr ""
+#~ "  -H, --hold                          子コマンドが終了してもすぐに\n"
+#~ "                                      タブを破棄しない"
+
+#~ msgid ""
+#~ "  --display=DISPLAY                   X display to use for the last-\n"
+#~ "                                      specified window"
+#~ msgstr ""
+#~ "  --display=DISPLAY                   最後に指定したウィンドウに使用する\n"
+#~ "                                      X ディスプレイを指定する"
+
+#~ msgid ""
+#~ "  --geometry=GEOMETRY                 X geometry specification (see \"X"
+#~ "\"\n"
+#~ "                                      man page), can be specified once "
+#~ "per\n"
+#~ "                                      window to be opened"
+#~ msgstr ""
+#~ "  --geometry=GEOMETRY                 X のジオメトリを指定する (\"X\" の "
+#~ "man\n"
+#~ "                                      ページを参照)。開くウィンドウ毎に指"
+#~ "定\n"
+#~ "                                      できる"
+
+#~ msgid ""
+#~ "  --role=ROLE                         Set the role for the last-"
+#~ "specified\n"
+#~ "                                      window; applies to only one "
+#~ "window;\n"
+#~ "                                      can be specified once for each "
+#~ "window\n"
+#~ "                                      you create from the command line"
+#~ msgstr ""
+#~ "  --role=ROLE                         最後に指定したウィンドウにロールを\n"
+#~ "                                      セットする; 一つのウィンドウのみに\n"
+#~ "                                      適用される; コマンドラインから作成す"
+#~ "る\n"
+#~ "                                      各々のウィンドウに対して一度指定でき"
+#~ "る"
+
+#~ msgid ""
+#~ "  --startup-id=STRING                 ID for the startup notification\n"
+#~ "                                      protocol"
+#~ msgstr ""
+#~ "  --startup-id=STRING                 起動通知プロトコルの ID を指定する"
+
+#~ msgid ""
+#~ "  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
+#~ "                                      name or filename"
+#~ msgstr ""
+#~ "  -I, --icon=ICON                     ターミナルのアイコンのアイコン名また"
+#~ "は\n"
+#~ "                                      ファイル名を設定する"
+
+#~ msgid ""
+#~ "  --fullscreen                        Set the last-specified window into\n"
+#~ "                                      fullscreen mode; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --fullscreen                        最後に指定したウィンドウを全画面\n"
+#~ "                                      モードにセットする; 一つのウィン\n"
+#~ "                                      ドウのみに適用される; コマンドライ"
+#~ "ン\n"
+#~ "                                      から作成する各々のウィンドウに対し"
+#~ "て\n"
+#~ "                                      一度指定できる"
+
+#~ msgid ""
+#~ "  --maximize                          Maximize the last-specified "
+#~ "window;\n"
+#~ "                                      applies to only one window; can be\n"
+#~ "                                      specified once for each window you\n"
+#~ "                                      create from the command line"
+#~ msgstr ""
+#~ "  --maximize                          最後に指定されたウィンドウを最大化す"
+#~ "る;\n"
+#~ "                                      一つのウィンドウのみに適用される;\n"
+#~ "                                      コマンドラインから作成する各々のウィ"
+#~ "ンドウ\n"
+#~ "                                      に対して一度指定できる"
+
+#~ msgid ""
+#~ "  --show-menubar                      Turn on the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-menubar                      最後に指定したウィンドウでメニュー\n"
+#~ "                                      バーを表示する; 一つのウィンドウ\n"
+#~ "                                      のみに適用される; コマンドラインか"
+#~ "ら\n"
+#~ "                                      作成する各々のウィンドウに対して\n"
+#~ "                                      一度指定できる"
+
+#~ msgid ""
+#~ "  --hide-menubar                      Turn off the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-menubar                      最後に指定したウィンドウでメニュー\n"
+#~ "                                      バーを表示しない; 一つのウィンドウ\n"
+#~ "                                      のみに適用される; コマンドラインか"
+#~ "ら\n"
+#~ "                                      作成する各々のウィンドウに対して一"
+#~ "度\n"
+#~ "                                      指定できる"
+
+#~ msgid ""
+#~ "  --show-borders                      Turn on the window decorations for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --show-borders                      最後に指定したウィンドウでウィンド"
+#~ "ウ\n"
+#~ "                                      の枠を表示する; 一つのウィンドウ\n"
+#~ "                                      のみに適用される; コマンドラインか"
+#~ "ら\n"
+#~ "                                      作成する各々のウィンドウに対して一"
+#~ "度\n"
+#~ "                                      指定できる"
+
+#~ msgid ""
+#~ "  --hide-borders                      Turn off the window decorations "
+#~ "for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --hide-borders                      最後に指定したウィンドウでウィンド"
+#~ "ウ\n"
+#~ "                                      の枠を表示しない; 一つのウィンドウ\n"
+#~ "                                      のみに適用される; コマンドラインか"
+#~ "ら\n"
+#~ "                                      作成する各々のウィンドウに対して一"
+#~ "度\n"
+#~ "                                      指定できる"
+
+#~ msgid ""
+#~ "  --show-toolbars                     Turn on the toolbars for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-toolbars                     最後に指定したウィンドウでツール"
+#~ "バー\n"
+#~ "                                      を表示する; 一つのウィンドウのみに\n"
+#~ "                                      適用される; コマンドラインから作成す"
+#~ "る\n"
+#~ "                                      各々のウィンドウに対して一度指定でき"
+#~ "る"
+
+#~ msgid ""
+#~ "  --hide-toolbars                     Turn off the toolbars for the "
+#~ "last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-toolbars                     最後に指定したウィンドウでツール"
+#~ "バー\n"
+#~ "                                      を表示しない; 一つのウィンドウのみ\n"
+#~ "                                      に適用される; コマンドラインから作"
+#~ "成\n"
+#~ "                                      する各々のウィンドウに対して一度指"
+#~ "定\n"
+#~ "                                      できる"
+
+#~ msgid "Unable to launch terminal: %s\n"
+#~ msgstr "ターミナルを起動できません: %s\n"
+
+#~ msgid ""
+#~ "Option \"--sm-client-id\" requires specifying the session id as its "
+#~ "parameter"
+#~ msgstr ""
+#~ "オプション \"--sm-client-id\" にはパラメータとしてセッション ID を指定する"
+#~ "必要があります"
+
 #~ msgid "<b>Title:</b>"
 #~ msgstr "<b>タイトル:</b>"
 
diff --git a/po/kk.po b/po/kk.po
index 2e7ee63..5a18b98 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-12-07 11:48+0100\n"
+"POT-Creation-Date: 2009-12-14 16:03+0100\n"
 "PO-Revision-Date: 2009-07-17 16:39+0600\n"
 "Last-Translator: Baurzhan M. <baurthefirst at gmail.com>\n"
 "Language-Team: Kazakh <kk_KZ at googlegroups.com>\n"
@@ -16,274 +16,88 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ../terminal/main.c:46
+#: ../terminal/main.c:48
 msgid "Usage:"
 msgstr "Қолданылуы:"
 
-#: ../terminal/main.c:47
+#: ../terminal/main.c:48
 msgid "OPTION"
 msgstr "ОПЦИЯ"
 
-#: ../terminal/main.c:49
+#: ../terminal/main.c:53
 msgid "General Options"
 msgstr "Жалпы опциялар"
 
-#: ../terminal/main.c:50
-msgid "  -h, --help                          Print this help message and exit"
-msgstr "  -h, --help                          Осы ақпаратты шығару және шығу"
-
-#: ../terminal/main.c:51
-msgid ""
-"  -V, --version                       Print version information and exit"
-msgstr "  -V, --version                       Нұсқа ақпаратын шығару және шығу"
+#. parameter of --default-display
+#. parameter of --display
+#: ../terminal/main.c:55 ../terminal/main.c:81
+#, fuzzy
+msgid "display"
+msgstr "Көрсетілмейді"
 
-#: ../terminal/main.c:52
-msgid ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
+#. parameter of --default-working-directory
+#. parameter of --working-directory
+#: ../terminal/main.c:57 ../terminal/main.c:72
+msgid "directory"
 msgstr ""
-"  --disable-server                   D-BUS сессия хабарламалар қызметіне\n"
-"                                      тіркемеу"
 
-#: ../terminal/main.c:54
-msgid "  --default-display=DISPLAY           default X display to use"
-msgstr "  --default-display=DISPLAY           қолдану үшін негізгі X экраны"
-
-#: ../terminal/main.c:55
-msgid ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
-msgstr "  --default-working-directory=DIRNAME Терминалдың жұмыс бумасын орнату"
-
-#: ../terminal/main.c:58
+#: ../terminal/main.c:61
 msgid "Window or Tab Separators"
 msgstr "Терезелер не Беттер ажыратқышы"
 
-#: ../terminal/main.c:59
-msgid ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-msgstr ""
-"  --tab                               Бетті соңғы көрсетілген терезеде ашу;\n"
-"                                      осы опциялардың бірнешеуін көрсетуге "
-"болады"
-
-#: ../terminal/main.c:62
-msgid ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-msgstr ""
-"  --window                            Бір беті бар жаңа терезені ашу;\n"
-"                                      осы опциялардың бірнешеуін көрсетуге "
-"болады"
-
 #: ../terminal/main.c:66
 msgid "Tab Options"
 msgstr "Бет опциялары"
 
-#: ../terminal/main.c:67
-msgid ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-msgstr ""
-"  -x, --execute                       Командалық жолдың қалған бөлігін\n"
-"                                      терминалда орындау"
-
-#: ../terminal/main.c:69
-msgid ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-msgstr ""
-"  -e, --command=STRING                Осы опцияға терминал ішінде\n"
-"                                      аргументті орындайды"
-
-#: ../terminal/main.c:71
-msgid ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
-msgstr "  --working-directory=DIRNAME         Терминалдың жұмыс бумасын орнату"
-
-#: ../terminal/main.c:72
-msgid "  -T, --title=TITLE                   Set the terminal's title"
-msgstr "  -T, --title=TITLE                   Терминалдың атауын орнату"
+#. parameter of --command
+#: ../terminal/main.c:68
+#, fuzzy
+msgid "command"
+msgstr "Команда"
 
-#: ../terminal/main.c:73
-msgid ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-msgstr ""
-"  -H, --hold                          Ішіндегі үрдісі біткен кезде бетті "
-"жаппау"
+#. parameter of --title
+#: ../terminal/main.c:70
+#, fuzzy
+msgid "title"
+msgstr "Атауы"
 
-#: ../terminal/main.c:76
+#: ../terminal/main.c:79
 msgid "Window Options"
 msgstr "Терезе опциялары"
 
-#: ../terminal/main.c:77
-msgid ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
-msgstr ""
-"  --display=DISPLAY                   Соңғы көрсетілген терезе үшін\n"
-"                                      қолданылатын X экраны"
-
-#: ../terminal/main.c:79
-msgid ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
-msgstr ""
-"  --geometry=GEOMETRY                 X өлшемдері (\"X\"\n"
-"                                      man парағын қараpage), әр терезе үішн "
-"бер рет\n"
-"                                      көрсетуге болады"
-
-#: ../terminal/main.c:82
-msgid ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
-msgstr ""
-"  --role=ROLE                         Соңғы терезе ролін орнатады\n"
-"                                      бір ғана терезе үшін іске асады\n"
-"                                      әр командалық жолдан жасалған\n"
-"                                      терезе үшін бір рет қана\n"
-"                                      көрсетуге болады"
-
-#: ../terminal/main.c:86
-msgid ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
-msgstr ""
-"  --startup-id=STRING                 орындалу туралы хабарлау хаттамасы ID-і"
-
-#: ../terminal/main.c:88
-msgid ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
-msgstr ""
-"  -I, --icon=ICON                     Терминал таңбашасын таңбаша аты\n"
-"                                      не файл аты ретінде орнату"
-
-#: ../terminal/main.c:90
-msgid ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --fullscreen                        Соңғы терезені толық экран\n"
-"                                      режимін апарады; бір ғана терезе үшін\n"
-"                                      іске асады; әр командалық жолдан\n"
-"                                      жасалған терезе үшін бір рет қана\n"
-"                                      көрсетуге болады"
-
-#: ../terminal/main.c:95
-msgid ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
+#. parameter of --geometry
+#: ../terminal/main.c:83
+msgid "geometry"
 msgstr ""
-"  --maximize                          Соңғы терезені жазық қылады;\n"
-"                                      бір ғана терезе үшін іске асады;\n"
-"                                      әр командалық жолдан жаслаған\n"
-"                                      терезе үшін бір рет қана\n"
-"                                      көрсетуге болады"
 
-#: ../terminal/main.c:99
-msgid ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-menubar                      Соңғы терезе үшін мәзір жолағын\n"
-"                                      іске қосады;  бір ғана терезе үшін\n"
-"                                      іске асады; әр командалық жолдан\n"
-"                                      жасалған терезе үшін бір рет қана\n"
-"                                      көрсетуге болады"
-
-#: ../terminal/main.c:104
-msgid ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --hide-menubar                      Соңғы терезе үшін мәзір жолағын\n"
-"                                      жасырады;  бір ғана терезе үшін\n"
-"                                      іске асады; әр командалық жолдан\n"
-"                                      жасалған терезе үшін бір рет қана\n"
-"                                      көрсетуге болады"
-
-#: ../terminal/main.c:109
-msgid ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
+#. parameter of --role
+#: ../terminal/main.c:85
+msgid "role"
 msgstr ""
-"  --show-borders                     Соңғы терезе үшін терезе қоршауын\n"
-"                                      іске қосады;  бір ғана терезе үшін\n"
-"                                      іске асады; әр командалық жолдан\n"
-"                                      жасалған терезе үшін бір рет қана\n"
-"                                      көрсетуге болады"
 
-#: ../terminal/main.c:114
-msgid ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --hide-borders                      Соңғы терезе үшін терезе қоршауын\n"
-"                                      жасырады;  бір ғана терезе үшін\n"
-"                                      іске асады; әр командалық жолдан\n"
-"                                      жасалған терезе үшін бір рет қана\n"
-"                                      көрсетуге болады"
+#. parameter of --startup-id
+#: ../terminal/main.c:87
+#, fuzzy
+msgid "string"
+msgstr "Ескерту"
 
-#: ../terminal/main.c:119
-msgid ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-toolbars                     Соңғы терезе үшін сайман панелін\n"
-"                                      іске қосады;  бір ғана терезе үшін\n"
-"                                      іске асады; әр командалық жолдан\n"
-"                                      жасалған терезе үшін бір рет қана\n"
-"                                      көрсетуге болады"
+#. parameter of --icon
+#: ../terminal/main.c:89
+#, fuzzy
+msgid "icon"
+msgstr "Әрекет"
 
-#: ../terminal/main.c:124
-msgid ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#: ../terminal/main.c:91
+#, c-format
+msgid "See the %s man page for full explanation of the options above."
 msgstr ""
-"  --show-toolbars                     Соңғы терезе үшін сайман панелін\n"
-"                                      жасырады;  бір ғана терезе үшін\n"
-"                                      іске асады; әр командалық жолдан\n"
-"                                      жасалған терезе үшін бір рет қана\n"
-"                                      көрсетуге болады"
 
-#: ../terminal/main.c:151 ../terminal/terminal-preferences.c:1263
+#: ../terminal/main.c:118 ../terminal/terminal-preferences.c:1263
 #: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr "Терминал"
 
-#: ../terminal/main.c:173
+#: ../terminal/main.c:135
 #, c-format
 msgid ""
 "%s (Xfce %s)\n"
@@ -308,31 +122,26 @@ msgstr ""
 "\n"
 "Ақаулықтар жөнінде хабарласыңыз: <%s>.\n"
 
-#: ../terminal/main.c:267
+#: ../terminal/main.c:239
 #, c-format
 msgid "Unable to register terminal service: %s\n"
 msgstr "Терминал қызметін тіркеу мүмкін емес: %s\n"
 
-#: ../terminal/main.c:276
-#, c-format
-msgid "Unable to launch terminal: %s\n"
-msgstr "Терминалды жөнелту мүмкін емес: %s\n"
-
-#: ../terminal/terminal-app.c:551
+#: ../terminal/terminal-app.c:554
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "Қате geometry жолы \"%s\"\n"
 
-#: ../terminal/terminal-dbus.c:114
+#: ../terminal/terminal-dbus.c:108
 msgid "User id mismatch"
 msgstr "Пайдаланушы id сәйкес емес"
 
-#: ../terminal/terminal-dbus.c:146
+#: ../terminal/terminal-dbus.c:134
 #, c-format
 msgid "D-BUS message bus disconnected, exiting...\n"
 msgstr "D-BUS хабарлама қызметімен байланыс үзілген, шығу...\n"
 
-#: ../terminal/terminal-dbus.c:208
+#: ../terminal/terminal-dbus.c:196
 #, c-format
 msgid "Unable to register object %s"
 msgstr "%s объектісін тіркеу мүмкін емес"
@@ -354,7 +163,7 @@ msgstr ""
 msgid "Failed to open the documentation browser"
 msgstr "Құжаттама шолушысын ашу мүмкін емес"
 
-#: ../terminal/terminal-options.c:189
+#: ../terminal/terminal-options.c:206
 #, c-format
 msgid ""
 "Option \"--default-display\" requires specifying the default X display as "
@@ -363,7 +172,7 @@ msgstr ""
 "Option \"--default-display\" опциясы негізгі X экраның параметр ретінде "
 "берілуін сұрайды"
 
-#: ../terminal/terminal-options.c:204
+#: ../terminal/terminal-options.c:221
 #, c-format
 msgid ""
 "Option \"--default-working-directory\" requires specifying the default "
@@ -372,15 +181,7 @@ msgstr ""
 "Option \"--default-working-directory\" опциясы негізгі жұмыс бумасының "
 "параметр ретінде беоілуін сұрайды"
 
-#: ../terminal/terminal-options.c:235
-#, c-format
-msgid ""
-"Option \"--sm-client-id\" requires specifying the session id as its parameter"
-msgstr ""
-"Option \"--sm-client-id\" опциясы сессия id-ін параметр ретінде берілуін "
-"сұрайды"
-
-#: ../terminal/terminal-options.c:250
+#: ../terminal/terminal-options.c:237
 #, c-format
 msgid ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
@@ -389,7 +190,7 @@ msgstr ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
 "of the command line"
 
-#: ../terminal/terminal-options.c:267
+#: ../terminal/terminal-options.c:254
 #, c-format
 msgid ""
 "Option \"--command/-e\" requires specifying the command to run as its "
@@ -397,7 +198,7 @@ msgid ""
 msgstr ""
 "Option \"--command/-e\" опциясы команданы параметр ретінде берілуін сұрайды"
 
-#: ../terminal/terminal-options.c:284
+#: ../terminal/terminal-options.c:271
 #, c-format
 msgid ""
 "Option \"--working-directory\" requires specifying the working directory as "
@@ -406,19 +207,19 @@ msgstr ""
 "Option \"--working-directory\" опциясы жұмыс бумасының параметр ретінде "
 "берілуін сұрайды"
 
-#: ../terminal/terminal-options.c:299
+#: ../terminal/terminal-options.c:286
 #, c-format
 msgid "Option \"--title/-T\" requires specifying the title as its parameter"
 msgstr "Option \"--title/-T\" опциясы атауды параметр ретінде берілуін сұрайды"
 
-#: ../terminal/terminal-options.c:319
+#: ../terminal/terminal-options.c:305
 #, c-format
 msgid ""
 "Option \"--display\" requires specifying the X display as its parameters"
 msgstr ""
 "Option \"--display\" опциясы X экранының параметр ретінде берілуін сұрайды"
 
-#: ../terminal/terminal-options.c:334
+#: ../terminal/terminal-options.c:320
 #, c-format
 msgid ""
 "Option \"--geometry\" requires specifying the window geometry as its "
@@ -427,13 +228,13 @@ msgstr ""
 "Option \"--geometry\" опциясы терез өлшемдерінің параметр ретінде берілуін "
 "сұрайды"
 
-#: ../terminal/terminal-options.c:349
+#: ../terminal/terminal-options.c:335
 #, c-format
 msgid "Option \"--role\" requires specifying the window role as its parameter"
 msgstr ""
 "Option \"--role\" опциясы терезе ролінің параметр ретінде берілуін сұрайды"
 
-#: ../terminal/terminal-options.c:364
+#: ../terminal/terminal-options.c:350
 #, c-format
 msgid ""
 "Option \"--startup-id\" requires specifying the startup id as its parameter"
@@ -441,7 +242,7 @@ msgstr ""
 "Option \"--startup-id\" опциясы қосылу id-інің параметр ретінде берілуін "
 "сұрайды"
 
-#: ../terminal/terminal-options.c:379
+#: ../terminal/terminal-options.c:365
 #, c-format
 msgid ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
@@ -450,7 +251,7 @@ msgstr ""
 "Option \"--icon/-I\" опциясы таңбаша аты не файл атының параметр ретінде "
 "берілуін сұрайды"
 
-#: ../terminal/terminal-options.c:435
+#: ../terminal/terminal-options.c:419
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Белгісіз опция \"%s\""
@@ -519,7 +320,7 @@ msgstr "Толық экранға"
 msgid "Set Title"
 msgstr "Атауын орнату"
 
-#: ../terminal/terminal-preferences.c:464
+#: ../terminal/terminal-preferences.c:464 ../terminal/terminal-window.c:237
 msgid "Reset"
 msgstr "Тастау"
 
@@ -816,6 +617,11 @@ msgstr "_Тастау"
 msgid "Reset and C_lear"
 msgstr "Тастау мен та_зарту"
 
+#: ../terminal/terminal-window.c:238
+#, fuzzy
+msgid "Reset and clear"
+msgstr "Тастау мен тазарту"
+
 #: ../terminal/terminal-window.c:239
 msgid "_Go"
 msgstr "Ө_ту"
@@ -1442,5 +1248,258 @@ msgstr "_Команда орындалғанда, utmp/wtmp жазбаларын
 msgid "seconds"
 msgstr "секунд"
 
+#~ msgid ""
+#~ "  -h, --help                          Print this help message and exit"
+#~ msgstr ""
+#~ "  -h, --help                          Осы ақпаратты шығару және шығу"
+
+#~ msgid ""
+#~ "  -V, --version                       Print version information and exit"
+#~ msgstr ""
+#~ "  -V, --version                       Нұсқа ақпаратын шығару және шығу"
+
+#~ msgid ""
+#~ "  --disable-server                    Do not register with the D-BUS\n"
+#~ "                                      session message bus"
+#~ msgstr ""
+#~ "  --disable-server                   D-BUS сессия хабарламалар қызметіне\n"
+#~ "                                      тіркемеу"
+
+#~ msgid "  --default-display=DISPLAY           default X display to use"
+#~ msgstr "  --default-display=DISPLAY           қолдану үшін негізгі X экраны"
+
+#~ msgid ""
+#~ "  --default-working-directory=DIRNAME Set the default terminal's working\n"
+#~ "                                      directory"
+#~ msgstr ""
+#~ "  --default-working-directory=DIRNAME Терминалдың жұмыс бумасын орнату"
+
+#~ msgid ""
+#~ "  --tab                               Open a new tab in the last-"
+#~ "specified\n"
+#~ "                                      window; more than one of these\n"
+#~ "                                      options can be provided"
+#~ msgstr ""
+#~ "  --tab                               Бетті соңғы көрсетілген терезеде "
+#~ "ашу;\n"
+#~ "                                      осы опциялардың бірнешеуін "
+#~ "көрсетуге болады"
+
+#~ msgid ""
+#~ "  --window                            Open a new window containing one "
+#~ "tab;\n"
+#~ "                                      more than one of these options can "
+#~ "be\n"
+#~ "                                      provided"
+#~ msgstr ""
+#~ "  --window                            Бір беті бар жаңа терезені ашу;\n"
+#~ "                                      осы опциялардың бірнешеуін "
+#~ "көрсетуге болады"
+
+#~ msgid ""
+#~ "  -x, --execute                       Execute the remainder of the "
+#~ "command\n"
+#~ "                                      line inside the terminal"
+#~ msgstr ""
+#~ "  -x, --execute                       Командалық жолдың қалған бөлігін\n"
+#~ "                                      терминалда орындау"
+
+#~ msgid ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+#~ msgstr ""
+#~ "  -e, --command=STRING                Осы опцияға терминал ішінде\n"
+#~ "                                      аргументті орындайды"
+
+#~ msgid ""
+#~ "  --working-directory=DIRNAME         Set the terminal's working directory"
+#~ msgstr ""
+#~ "  --working-directory=DIRNAME         Терминалдың жұмыс бумасын орнату"
+
+#~ msgid "  -T, --title=TITLE                   Set the terminal's title"
+#~ msgstr "  -T, --title=TITLE                   Терминалдың атауын орнату"
+
+#~ msgid ""
+#~ "  -H, --hold                          Do not immediately destroy the tab\n"
+#~ "                                      when the child command exits"
+#~ msgstr ""
+#~ "  -H, --hold                          Ішіндегі үрдісі біткен кезде бетті "
+#~ "жаппау"
+
+#~ msgid ""
+#~ "  --display=DISPLAY                   X display to use for the last-\n"
+#~ "                                      specified window"
+#~ msgstr ""
+#~ "  --display=DISPLAY                   Соңғы көрсетілген терезе үшін\n"
+#~ "                                      қолданылатын X экраны"
+
+#~ msgid ""
+#~ "  --geometry=GEOMETRY                 X geometry specification (see \"X"
+#~ "\"\n"
+#~ "                                      man page), can be specified once "
+#~ "per\n"
+#~ "                                      window to be opened"
+#~ msgstr ""
+#~ "  --geometry=GEOMETRY                 X өлшемдері (\"X\"\n"
+#~ "                                      man парағын қараpage), әр терезе "
+#~ "үішн бер рет\n"
+#~ "                                      көрсетуге болады"
+
+#~ msgid ""
+#~ "  --role=ROLE                         Set the role for the last-"
+#~ "specified\n"
+#~ "                                      window; applies to only one "
+#~ "window;\n"
+#~ "                                      can be specified once for each "
+#~ "window\n"
+#~ "                                      you create from the command line"
+#~ msgstr ""
+#~ "  --role=ROLE                         Соңғы терезе ролін орнатады\n"
+#~ "                                      бір ғана терезе үшін іске асады\n"
+#~ "                                      әр командалық жолдан жасалған\n"
+#~ "                                      терезе үшін бір рет қана\n"
+#~ "                                      көрсетуге болады"
+
+#~ msgid ""
+#~ "  --startup-id=STRING                 ID for the startup notification\n"
+#~ "                                      protocol"
+#~ msgstr ""
+#~ "  --startup-id=STRING                 орындалу туралы хабарлау хаттамасы "
+#~ "ID-і"
+
+#~ msgid ""
+#~ "  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
+#~ "                                      name or filename"
+#~ msgstr ""
+#~ "  -I, --icon=ICON                     Терминал таңбашасын таңбаша аты\n"
+#~ "                                      не файл аты ретінде орнату"
+
+#~ msgid ""
+#~ "  --fullscreen                        Set the last-specified window into\n"
+#~ "                                      fullscreen mode; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --fullscreen                        Соңғы терезені толық экран\n"
+#~ "                                      режимін апарады; бір ғана терезе "
+#~ "үшін\n"
+#~ "                                      іске асады; әр командалық жолдан\n"
+#~ "                                      жасалған терезе үшін бір рет қана\n"
+#~ "                                      көрсетуге болады"
+
+#~ msgid ""
+#~ "  --maximize                          Maximize the last-specified "
+#~ "window;\n"
+#~ "                                      applies to only one window; can be\n"
+#~ "                                      specified once for each window you\n"
+#~ "                                      create from the command line"
+#~ msgstr ""
+#~ "  --maximize                          Соңғы терезені жазық қылады;\n"
+#~ "                                      бір ғана терезе үшін іске асады;\n"
+#~ "                                      әр командалық жолдан жаслаған\n"
+#~ "                                      терезе үшін бір рет қана\n"
+#~ "                                      көрсетуге болады"
+
+#~ msgid ""
+#~ "  --show-menubar                      Turn on the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-menubar                      Соңғы терезе үшін мәзір жолағын\n"
+#~ "                                      іске қосады;  бір ғана терезе үшін\n"
+#~ "                                      іске асады; әр командалық жолдан\n"
+#~ "                                      жасалған терезе үшін бір рет қана\n"
+#~ "                                      көрсетуге болады"
+
+#~ msgid ""
+#~ "  --hide-menubar                      Turn off the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-menubar                      Соңғы терезе үшін мәзір жолағын\n"
+#~ "                                      жасырады;  бір ғана терезе үшін\n"
+#~ "                                      іске асады; әр командалық жолдан\n"
+#~ "                                      жасалған терезе үшін бір рет қана\n"
+#~ "                                      көрсетуге болады"
+
+#~ msgid ""
+#~ "  --show-borders                      Turn on the window decorations for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --show-borders                     Соңғы терезе үшін терезе қоршауын\n"
+#~ "                                      іске қосады;  бір ғана терезе үшін\n"
+#~ "                                      іске асады; әр командалық жолдан\n"
+#~ "                                      жасалған терезе үшін бір рет қана\n"
+#~ "                                      көрсетуге болады"
+
+#~ msgid ""
+#~ "  --hide-borders                      Turn off the window decorations "
+#~ "for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --hide-borders                      Соңғы терезе үшін терезе қоршауын\n"
+#~ "                                      жасырады;  бір ғана терезе үшін\n"
+#~ "                                      іске асады; әр командалық жолдан\n"
+#~ "                                      жасалған терезе үшін бір рет қана\n"
+#~ "                                      көрсетуге болады"
+
+#~ msgid ""
+#~ "  --show-toolbars                     Turn on the toolbars for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-toolbars                     Соңғы терезе үшін сайман панелін\n"
+#~ "                                      іске қосады;  бір ғана терезе үшін\n"
+#~ "                                      іске асады; әр командалық жолдан\n"
+#~ "                                      жасалған терезе үшін бір рет қана\n"
+#~ "                                      көрсетуге болады"
+
+#~ msgid ""
+#~ "  --hide-toolbars                     Turn off the toolbars for the "
+#~ "last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-toolbars                     Соңғы терезе үшін сайман панелін\n"
+#~ "                                      жасырады;  бір ғана терезе үшін\n"
+#~ "                                      іске асады; әр командалық жолдан\n"
+#~ "                                      жасалған терезе үшін бір рет қана\n"
+#~ "                                      көрсетуге болады"
+
+#~ msgid "Unable to launch terminal: %s\n"
+#~ msgstr "Терминалды жөнелту мүмкін емес: %s\n"
+
+#~ msgid ""
+#~ "Option \"--sm-client-id\" requires specifying the session id as its "
+#~ "parameter"
+#~ msgstr ""
+#~ "Option \"--sm-client-id\" опциясы сессия id-ін параметр ретінде берілуін "
+#~ "сұрайды"
+
 #~ msgid "<b>Title:</b>"
 #~ msgstr "<b>Атау:</b>"
diff --git a/po/ko.po b/po/ko.po
index 557f4ee..3322631 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Terminal 0.2.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 11:48+0100\n"
+"POT-Creation-Date: 2009-12-14 16:03+0100\n"
 "PO-Revision-Date: 2007-09-24 11:46+0900\n"
 "Last-Translator: ByungHyun Choi<byunghyun.choi at debianusers.org>\n"
 "Language-Team: Korean <translation-team-ko at lists.sourceforge.net>\n"
@@ -15,276 +15,91 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../terminal/main.c:46
+#: ../terminal/main.c:48
 msgid "Usage:"
 msgstr ""
 
-#: ../terminal/main.c:47
+#: ../terminal/main.c:48
 msgid "OPTION"
 msgstr ""
 
-#: ../terminal/main.c:49
+#: ../terminal/main.c:53
 #, fuzzy
 msgid "General Options"
 msgstr "일반"
 
-#: ../terminal/main.c:50
-msgid "  -h, --help                          Print this help message and exit"
-msgstr "  -h, --help                          이 도움말을 출력하고 끝냅니다"
-
-#: ../terminal/main.c:51
+#. parameter of --default-display
+#. parameter of --display
+#: ../terminal/main.c:55 ../terminal/main.c:81
 #, fuzzy
-msgid ""
-"  -V, --version                       Print version information and exit"
-msgstr "  -v, --version                       버전 정보를 출력하고 끝냅니다"
-
-#: ../terminal/main.c:52
-msgid ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
-msgstr ""
-"  --disable-server                    D-BUS, 세션 메시지 버스에 등록하지\n"
-"                                      않습니다"
+msgid "display"
+msgstr "표시하지 않습니다"
 
-#: ../terminal/main.c:54
-msgid "  --default-display=DISPLAY           default X display to use"
+#. parameter of --default-working-directory
+#. parameter of --working-directory
+#: ../terminal/main.c:57 ../terminal/main.c:72
+msgid "directory"
 msgstr ""
-"  --default-display=DISPLAY           기본으로 사용할 X 디스플레이를 설정합니"
-"다"
 
-#: ../terminal/main.c:55
-msgid ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
-msgstr ""
-"  --default-working-directory=DIRNAME 터미널의 기본 작업 디레토리를 설정\n"
-"                                      합니다"
-
-#: ../terminal/main.c:58
+#: ../terminal/main.c:61
 msgid "Window or Tab Separators"
 msgstr ""
 
-#: ../terminal/main.c:59
-msgid ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-msgstr ""
-"  --tab                               마지막으로 지정한 창에 새 탭을\n"
-"                                      엽니다; 이런 욥션은 여러 개 주어질\n"
-"                                      수 있습니다"
-
-#: ../terminal/main.c:62
-msgid ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-msgstr ""
-"  --window                            하나의 탭이 있는 새 창을 엽니다; 이런\n"
-"                                      옵션은 여러 개 주어질 수 있습니다"
-
 #: ../terminal/main.c:66
 #, fuzzy
 msgid "Tab Options"
 msgstr "탭 닫기 단추"
 
-#: ../terminal/main.c:67
-msgid ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-msgstr ""
-"  -x, --execute                       이후에 나오는 명령어를 터미널에서\n"
-"                                      실행합니다"
-
-#: ../terminal/main.c:69
-msgid ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-msgstr ""
-"  -e, --command=STRING                이 옵션의 인자를 터미널에서 실행\n"
-"                                      합니다"
-
-#: ../terminal/main.c:71
-msgid ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
-msgstr ""
-"  --working-directory=DIRNAME         터미널의 작업 디렉토리를 설정합니다"
-
-#: ../terminal/main.c:72
-msgid "  -T, --title=TITLE                   Set the terminal's title"
-msgstr "  -T, --title=TITLE                   터미널의 타이틀을 설정합니다"
-
-#: ../terminal/main.c:73
-msgid ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-msgstr ""
-"  -H, --hold                          명령어가 끝난 후 바로 탭을 닫지\n"
-"                                      않습니다"
-
-#: ../terminal/main.c:76
+#. parameter of --command
+#: ../terminal/main.c:68
 #, fuzzy
-msgid "Window Options"
-msgstr "모르는 옵션 \"%s\""
+msgid "command"
+msgstr "<b>명령어</b>"
 
-#: ../terminal/main.c:77
-msgid ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
-msgstr ""
-"  --display=DISPLAY                   마지막으로 지정한 창에서 사용할 X\n"
-"                                      디스플레이를 설정합니다"
+#. parameter of --title
+#: ../terminal/main.c:70
+#, fuzzy
+msgid "title"
+msgstr "타이틀"
 
 #: ../terminal/main.c:79
-msgid ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
-msgstr ""
-"  --geometry=GEOMETRY                 창의 크기와 위치 (\"X\" 맨페이지를\n"
-"                                      참고하세요)를 지정합니다"
-
-#: ../terminal/main.c:82
 #, fuzzy
-msgid ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
-msgstr ""
-"  --role=ROLE                         마지막으로 지정한 창에 대한 역할을\n"
-"                                      설정합니다; 하나의 창에만 적용됩니다;\n"
-"                                      명령행에서 새로 만든 창에 한번만\n"
-"                                      설정할 수 있습니다"
+msgid "Window Options"
+msgstr "모르는 옵션 \"%s\""
 
-#: ../terminal/main.c:86
-msgid ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
+#. parameter of --geometry
+#: ../terminal/main.c:83
+msgid "geometry"
 msgstr ""
-"  --startup-id=STRING                 시작 알림 프로토콜에 사용할 ID를\n"
-"                                      지정합니다"
 
-#: ../terminal/main.c:88
-#, fuzzy
-msgid ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
+#. parameter of --role
+#: ../terminal/main.c:85
+msgid "role"
 msgstr ""
-"  -e, --command=STRING                이 옵션의 인자를 터미널에서 실행\n"
-"                                      합니다"
 
-#: ../terminal/main.c:90
+#. parameter of --startup-id
+#: ../terminal/main.c:87
 #, fuzzy
-msgid ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --fullscreen                        마지막으로 지정한 창을 전체 화면\n"
-"                                      모드로 설정합니다; 하나의 창에만\n"
-"                                      적용됩니다; 명령행에서 새로 만든 창에\n"
-"                                      한번만 설정할 수 있습니다"
+msgid "string"
+msgstr "주의"
 
-#: ../terminal/main.c:95
+#. parameter of --icon
+#: ../terminal/main.c:89
 #, fuzzy
-msgid ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
-msgstr ""
-"  --role=ROLE                         마지막으로 지정한 창에 대한 역할을\n"
-"                                      설정합니다; 하나의 창에만 적용됩니다;\n"
-"                                      명령행에서 새로 만든 창에 한번만\n"
-"                                      설정할 수 있습니다"
-
-#: ../terminal/main.c:99
-msgid ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-menubar                      마지막으로 지정한 창의 메뉴바를\n"
-"                                      보이게 합니다; 하나의 창에만 적용\n"
-"                                      됩니다; 명령행에서 새로 만든 창에\n"
-"                                      한번만 설정할 수 있습니다"
-
-#: ../terminal/main.c:104
-msgid ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-menubar                      마지막으로 지정한 창의 메뉴바를\n"
-"                                      숨깁니다; 하나의 창에만 적용됩니다;\n"
-"                                      명령행에서 새로 만든 창에 한번만\n"
-"                                      설정할 수 있습니다"
-
-#: ../terminal/main.c:109
-msgid ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --show-menubar                      마지막으로 지정한 창의 테두리를\n"
-"                                      보이게 합니다; 하나의 창에만 적용\n"
-"                                      됩니다; 명령행에서 새로 만든 창에\n"
-"                                      한번만 설정할 수 있습니다"
-
-#: ../terminal/main.c:114
-msgid ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --show-menubar                      마지막으로 지정한 창의 테두리를\n"
-"                                      숨깁니다; 하나의 창에만 적용됩니다;\n"
-"                                      명령행에서 새로 만든 창에 한번만\n"
-"                                      설정할 수 있습니다"
-
-#: ../terminal/main.c:119
-msgid ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-menubar                      마지막으로 지정한 창의 툴바를\n"
-"                                      보이게 합니다; 하나의 창에만 적용\n"
-"                                      됩니다; 명령행에서 새로 만든 창에\n"
-"                                      한번만 설정할 수 있습니다"
+msgid "icon"
+msgstr "동작"
 
-#: ../terminal/main.c:124
-msgid ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#: ../terminal/main.c:91
+#, c-format
+msgid "See the %s man page for full explanation of the options above."
 msgstr ""
-"  --show-menubar                      마지막으로 지정한 창의 툴바를\n"
-"                                      숨깁니다; 하나의 창에만 적용됩니다;\n"
-"                                      명령행에서 새로 만든 창에 한번만\n"
-"                                      설정할 수 있습니다"
 
-#: ../terminal/main.c:151 ../terminal/terminal-preferences.c:1263
+#: ../terminal/main.c:118 ../terminal/terminal-preferences.c:1263
 #: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr "터미널"
 
-#: ../terminal/main.c:173
+#: ../terminal/main.c:135
 #, c-format
 msgid ""
 "%s (Xfce %s)\n"
@@ -309,31 +124,26 @@ msgstr ""
 "\n"
 "버그는 <%s>에게 연락해 주십시오.\n"
 
-#: ../terminal/main.c:267
+#: ../terminal/main.c:239
 #, c-format
 msgid "Unable to register terminal service: %s\n"
 msgstr "터미널 서비스를 등록하는데 실패했습니다: %s\n"
 
-#: ../terminal/main.c:276
-#, c-format
-msgid "Unable to launch terminal: %s\n"
-msgstr "터미널을 실행하는데 실패했습니다: %s\n"
-
-#: ../terminal/terminal-app.c:551
+#: ../terminal/terminal-app.c:554
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "\"%s\"은(는) 잘못된 크기 및 위치입니다\n"
 
-#: ../terminal/terminal-dbus.c:114
+#: ../terminal/terminal-dbus.c:108
 msgid "User id mismatch"
 msgstr "User id가 맞지 않습니다"
 
-#: ../terminal/terminal-dbus.c:146
+#: ../terminal/terminal-dbus.c:134
 #, c-format
 msgid "D-BUS message bus disconnected, exiting...\n"
 msgstr "D-BUS 메시지 버스의 연결이 끊어졌습니다, 마칩니다...\n"
 
-#: ../terminal/terminal-dbus.c:208
+#: ../terminal/terminal-dbus.c:196
 #, c-format
 msgid "Unable to register object %s"
 msgstr "object %s을(를) 등록하는데 실패했습니다"
@@ -355,7 +165,7 @@ msgstr ""
 msgid "Failed to open the documentation browser"
 msgstr "브라우져를 열지 못 했습니다."
 
-#: ../terminal/terminal-options.c:189
+#: ../terminal/terminal-options.c:206
 #, c-format
 msgid ""
 "Option \"--default-display\" requires specifying the default X display as "
@@ -363,7 +173,7 @@ msgid ""
 msgstr ""
 "옵션 \"--default-display\"은 파라미터로 기본 X 디스플레이를 지정해야 합니다"
 
-#: ../terminal/terminal-options.c:204
+#: ../terminal/terminal-options.c:221
 #, c-format
 msgid ""
 "Option \"--default-working-directory\" requires specifying the default "
@@ -372,27 +182,21 @@ msgstr ""
 "옵션 \"--default-working-directory\"은 파리미터로 기본 작업 디렉토리를 지정해"
 "야 합니다"
 
-#: ../terminal/terminal-options.c:235
-#, c-format
-msgid ""
-"Option \"--sm-client-id\" requires specifying the session id as its parameter"
-msgstr "옵션 \"--sm-client-id\"은 세션 ID 파라미터가 필요합니다"
-
-#: ../terminal/terminal-options.c:250
+#: ../terminal/terminal-options.c:237
 #, c-format
 msgid ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
 "of the command line"
 msgstr "옵션 \"--execute/-x\"은 명령행 뒤쪽에 실행할 명령을 적어야 합니다\""
 
-#: ../terminal/terminal-options.c:267
+#: ../terminal/terminal-options.c:254
 #, c-format
 msgid ""
 "Option \"--command/-e\" requires specifying the command to run as its "
 "parameter"
 msgstr "옵션 \"--command/-e\"은 파라미터로 실행할 명령을 명시해야 합니다"
 
-#: ../terminal/terminal-options.c:284
+#: ../terminal/terminal-options.c:271
 #, c-format
 msgid ""
 "Option \"--working-directory\" requires specifying the working directory as "
@@ -400,43 +204,43 @@ msgid ""
 msgstr ""
 "옵션 \"--working-directory\"은 파라미터로 작업 디렉토리를 명시해야 합니다"
 
-#: ../terminal/terminal-options.c:299
+#: ../terminal/terminal-options.c:286
 #, c-format
 msgid "Option \"--title/-T\" requires specifying the title as its parameter"
 msgstr "옵션 \"--title/-T\"은 파라미터로 타이틀을 명시해야 합니다"
 
-#: ../terminal/terminal-options.c:319
+#: ../terminal/terminal-options.c:305
 #, c-format
 msgid ""
 "Option \"--display\" requires specifying the X display as its parameters"
 msgstr "옵션 \"--display\"은 파라미터로 X 디스플레이를 지정해야 합니다"
 
-#: ../terminal/terminal-options.c:334
+#: ../terminal/terminal-options.c:320
 #, c-format
 msgid ""
 "Option \"--geometry\" requires specifying the window geometry as its "
 "parameter"
 msgstr "옵션 \"--geometry\"은 파라미터로 창 크기 및 위치를 지정해야 합니다"
 
-#: ../terminal/terminal-options.c:349
+#: ../terminal/terminal-options.c:335
 #, c-format
 msgid "Option \"--role\" requires specifying the window role as its parameter"
 msgstr "옵션 \"--role\"은 파라미터로 창의 역할을 지정해야 합니다"
 
-#: ../terminal/terminal-options.c:364
+#: ../terminal/terminal-options.c:350
 #, c-format
 msgid ""
 "Option \"--startup-id\" requires specifying the startup id as its parameter"
 msgstr "옵션 \"--startup-id\"은 파라미터로 시작 ID를 지정해야 합니다"
 
-#: ../terminal/terminal-options.c:379
+#: ../terminal/terminal-options.c:365
 #, fuzzy, c-format
 msgid ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
 "parameter"
 msgstr "옵션 \"--command/-e\"은 파라미터로 실행할 명령을 명시해야 합니다"
 
-#: ../terminal/terminal-options.c:435
+#: ../terminal/terminal-options.c:419
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "모르는 옵션 \"%s\""
@@ -505,7 +309,7 @@ msgstr "전체 화면"
 msgid "Set Title"
 msgstr "타이틀 설정"
 
-#: ../terminal/terminal-preferences.c:464
+#: ../terminal/terminal-preferences.c:464 ../terminal/terminal-window.c:237
 msgid "Reset"
 msgstr "리셋"
 
@@ -796,6 +600,11 @@ msgstr "리셋(_R)"
 msgid "Reset and C_lear"
 msgstr "리셋하고 비움(_l)"
 
+#: ../terminal/terminal-window.c:238
+#, fuzzy
+msgid "Reset and clear"
+msgstr "리셋하고 비움"
+
 #: ../terminal/terminal-window.c:239
 msgid "_Go"
 msgstr "이동(_G)"
@@ -1459,6 +1268,256 @@ msgstr "명령어를 실행할 때 utmp/wtmp를 기록(_U)"
 msgid "seconds"
 msgstr ""
 
+#~ msgid ""
+#~ "  -h, --help                          Print this help message and exit"
+#~ msgstr "  -h, --help                          이 도움말을 출력하고 끝냅니다"
+
+#, fuzzy
+#~ msgid ""
+#~ "  -V, --version                       Print version information and exit"
+#~ msgstr "  -v, --version                       버전 정보를 출력하고 끝냅니다"
+
+#~ msgid ""
+#~ "  --disable-server                    Do not register with the D-BUS\n"
+#~ "                                      session message bus"
+#~ msgstr ""
+#~ "  --disable-server                    D-BUS, 세션 메시지 버스에 등록하지\n"
+#~ "                                      않습니다"
+
+#~ msgid "  --default-display=DISPLAY           default X display to use"
+#~ msgstr ""
+#~ "  --default-display=DISPLAY           기본으로 사용할 X 디스플레이를 설정"
+#~ "합니다"
+
+#~ msgid ""
+#~ "  --default-working-directory=DIRNAME Set the default terminal's working\n"
+#~ "                                      directory"
+#~ msgstr ""
+#~ "  --default-working-directory=DIRNAME 터미널의 기본 작업 디레토리를 설정\n"
+#~ "                                      합니다"
+
+#~ msgid ""
+#~ "  --tab                               Open a new tab in the last-"
+#~ "specified\n"
+#~ "                                      window; more than one of these\n"
+#~ "                                      options can be provided"
+#~ msgstr ""
+#~ "  --tab                               마지막으로 지정한 창에 새 탭을\n"
+#~ "                                      엽니다; 이런 욥션은 여러 개 주어질\n"
+#~ "                                      수 있습니다"
+
+#~ msgid ""
+#~ "  --window                            Open a new window containing one "
+#~ "tab;\n"
+#~ "                                      more than one of these options can "
+#~ "be\n"
+#~ "                                      provided"
+#~ msgstr ""
+#~ "  --window                            하나의 탭이 있는 새 창을 엽니다; 이"
+#~ "런\n"
+#~ "                                      옵션은 여러 개 주어질 수 있습니다"
+
+#~ msgid ""
+#~ "  -x, --execute                       Execute the remainder of the "
+#~ "command\n"
+#~ "                                      line inside the terminal"
+#~ msgstr ""
+#~ "  -x, --execute                       이후에 나오는 명령어를 터미널에서\n"
+#~ "                                      실행합니다"
+
+#~ msgid ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+#~ msgstr ""
+#~ "  -e, --command=STRING                이 옵션의 인자를 터미널에서 실행\n"
+#~ "                                      합니다"
+
+#~ msgid ""
+#~ "  --working-directory=DIRNAME         Set the terminal's working directory"
+#~ msgstr ""
+#~ "  --working-directory=DIRNAME         터미널의 작업 디렉토리를 설정합니다"
+
+#~ msgid "  -T, --title=TITLE                   Set the terminal's title"
+#~ msgstr "  -T, --title=TITLE                   터미널의 타이틀을 설정합니다"
+
+#~ msgid ""
+#~ "  -H, --hold                          Do not immediately destroy the tab\n"
+#~ "                                      when the child command exits"
+#~ msgstr ""
+#~ "  -H, --hold                          명령어가 끝난 후 바로 탭을 닫지\n"
+#~ "                                      않습니다"
+
+#~ msgid ""
+#~ "  --display=DISPLAY                   X display to use for the last-\n"
+#~ "                                      specified window"
+#~ msgstr ""
+#~ "  --display=DISPLAY                   마지막으로 지정한 창에서 사용할 X\n"
+#~ "                                      디스플레이를 설정합니다"
+
+#~ msgid ""
+#~ "  --geometry=GEOMETRY                 X geometry specification (see \"X"
+#~ "\"\n"
+#~ "                                      man page), can be specified once "
+#~ "per\n"
+#~ "                                      window to be opened"
+#~ msgstr ""
+#~ "  --geometry=GEOMETRY                 창의 크기와 위치 (\"X\" 맨페이지를\n"
+#~ "                                      참고하세요)를 지정합니다"
+
+#, fuzzy
+#~ msgid ""
+#~ "  --role=ROLE                         Set the role for the last-"
+#~ "specified\n"
+#~ "                                      window; applies to only one "
+#~ "window;\n"
+#~ "                                      can be specified once for each "
+#~ "window\n"
+#~ "                                      you create from the command line"
+#~ msgstr ""
+#~ "  --role=ROLE                         마지막으로 지정한 창에 대한 역할을\n"
+#~ "                                      설정합니다; 하나의 창에만 적용됩니"
+#~ "다;\n"
+#~ "                                      명령행에서 새로 만든 창에 한번만\n"
+#~ "                                      설정할 수 있습니다"
+
+#~ msgid ""
+#~ "  --startup-id=STRING                 ID for the startup notification\n"
+#~ "                                      protocol"
+#~ msgstr ""
+#~ "  --startup-id=STRING                 시작 알림 프로토콜에 사용할 ID를\n"
+#~ "                                      지정합니다"
+
+#, fuzzy
+#~ msgid ""
+#~ "  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
+#~ "                                      name or filename"
+#~ msgstr ""
+#~ "  -e, --command=STRING                이 옵션의 인자를 터미널에서 실행\n"
+#~ "                                      합니다"
+
+#, fuzzy
+#~ msgid ""
+#~ "  --fullscreen                        Set the last-specified window into\n"
+#~ "                                      fullscreen mode; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --fullscreen                        마지막으로 지정한 창을 전체 화면\n"
+#~ "                                      모드로 설정합니다; 하나의 창에만\n"
+#~ "                                      적용됩니다; 명령행에서 새로 만든 창"
+#~ "에\n"
+#~ "                                      한번만 설정할 수 있습니다"
+
+#, fuzzy
+#~ msgid ""
+#~ "  --maximize                          Maximize the last-specified "
+#~ "window;\n"
+#~ "                                      applies to only one window; can be\n"
+#~ "                                      specified once for each window you\n"
+#~ "                                      create from the command line"
+#~ msgstr ""
+#~ "  --role=ROLE                         마지막으로 지정한 창에 대한 역할을\n"
+#~ "                                      설정합니다; 하나의 창에만 적용됩니"
+#~ "다;\n"
+#~ "                                      명령행에서 새로 만든 창에 한번만\n"
+#~ "                                      설정할 수 있습니다"
+
+#~ msgid ""
+#~ "  --show-menubar                      Turn on the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-menubar                      마지막으로 지정한 창의 메뉴바를\n"
+#~ "                                      보이게 합니다; 하나의 창에만 적용\n"
+#~ "                                      됩니다; 명령행에서 새로 만든 창에\n"
+#~ "                                      한번만 설정할 수 있습니다"
+
+#~ msgid ""
+#~ "  --hide-menubar                      Turn off the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-menubar                      마지막으로 지정한 창의 메뉴바를\n"
+#~ "                                      숨깁니다; 하나의 창에만 적용됩니"
+#~ "다;\n"
+#~ "                                      명령행에서 새로 만든 창에 한번만\n"
+#~ "                                      설정할 수 있습니다"
+
+#~ msgid ""
+#~ "  --show-borders                      Turn on the window decorations for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --show-menubar                      마지막으로 지정한 창의 테두리를\n"
+#~ "                                      보이게 합니다; 하나의 창에만 적용\n"
+#~ "                                      됩니다; 명령행에서 새로 만든 창에\n"
+#~ "                                      한번만 설정할 수 있습니다"
+
+#~ msgid ""
+#~ "  --hide-borders                      Turn off the window decorations "
+#~ "for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --show-menubar                      마지막으로 지정한 창의 테두리를\n"
+#~ "                                      숨깁니다; 하나의 창에만 적용됩니"
+#~ "다;\n"
+#~ "                                      명령행에서 새로 만든 창에 한번만\n"
+#~ "                                      설정할 수 있습니다"
+
+#~ msgid ""
+#~ "  --show-toolbars                     Turn on the toolbars for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-menubar                      마지막으로 지정한 창의 툴바를\n"
+#~ "                                      보이게 합니다; 하나의 창에만 적용\n"
+#~ "                                      됩니다; 명령행에서 새로 만든 창에\n"
+#~ "                                      한번만 설정할 수 있습니다"
+
+#~ msgid ""
+#~ "  --hide-toolbars                     Turn off the toolbars for the "
+#~ "last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-menubar                      마지막으로 지정한 창의 툴바를\n"
+#~ "                                      숨깁니다; 하나의 창에만 적용됩니"
+#~ "다;\n"
+#~ "                                      명령행에서 새로 만든 창에 한번만\n"
+#~ "                                      설정할 수 있습니다"
+
+#~ msgid "Unable to launch terminal: %s\n"
+#~ msgstr "터미널을 실행하는데 실패했습니다: %s\n"
+
+#~ msgid ""
+#~ "Option \"--sm-client-id\" requires specifying the session id as its "
+#~ "parameter"
+#~ msgstr "옵션 \"--sm-client-id\"은 세션 ID 파라미터가 필요합니다"
+
 #~ msgid "<b>Title:</b>"
 #~ msgstr "<b>타이틀:</b>"
 
diff --git a/po/ku.po b/po/ku.po
index 3f9252f..abeae73 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ku\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 11:48+0100\n"
+"POT-Creation-Date: 2009-12-14 16:03+0100\n"
 "PO-Revision-Date: 2008-05-04 02:14+0200\n"
 "Last-Translator: Erdal Ronahi <erdal dot ronahi at gmail dot com>\n"
 "Language-Team: Kurdish <ku at li.org>\n"
@@ -20,207 +20,87 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural= n != 1;\n"
 
-#: ../terminal/main.c:46
+#: ../terminal/main.c:48
 msgid "Usage:"
 msgstr ""
 
-#: ../terminal/main.c:47
+#: ../terminal/main.c:48
 msgid "OPTION"
 msgstr ""
 
-#: ../terminal/main.c:49
+#: ../terminal/main.c:53
 #, fuzzy
 msgid "General Options"
 msgstr "Giştî"
 
-#: ../terminal/main.c:50
-msgid "  -h, --help                          Print this help message and exit"
+#. parameter of --default-display
+#. parameter of --display
+#: ../terminal/main.c:55 ../terminal/main.c:81
+msgid "display"
 msgstr ""
 
-#: ../terminal/main.c:51
-msgid ""
-"  -V, --version                       Print version information and exit"
-msgstr ""
-
-#: ../terminal/main.c:52
-msgid ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
-msgstr ""
-
-#: ../terminal/main.c:54
-msgid "  --default-display=DISPLAY           default X display to use"
+#. parameter of --default-working-directory
+#. parameter of --working-directory
+#: ../terminal/main.c:57 ../terminal/main.c:72
+msgid "directory"
 msgstr ""
 
-#: ../terminal/main.c:55
-msgid ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
-msgstr ""
-
-#: ../terminal/main.c:58
+#: ../terminal/main.c:61
 msgid "Window or Tab Separators"
 msgstr ""
 
-#: ../terminal/main.c:59
-msgid ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-msgstr ""
-
-#: ../terminal/main.c:62
-msgid ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-msgstr ""
-
 #: ../terminal/main.c:66
 msgid "Tab Options"
 msgstr ""
 
-#: ../terminal/main.c:67
-msgid ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-msgstr ""
-
-#: ../terminal/main.c:69
-msgid ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-msgstr ""
-
-#: ../terminal/main.c:71
-msgid ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
-msgstr ""
-
-#: ../terminal/main.c:72
-msgid "  -T, --title=TITLE                   Set the terminal's title"
-msgstr ""
-
-#: ../terminal/main.c:73
-msgid ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-msgstr ""
-
-#: ../terminal/main.c:76
-msgid "Window Options"
-msgstr ""
+#. parameter of --command
+#: ../terminal/main.c:68
+#, fuzzy
+msgid "command"
+msgstr "<b>Ferman</b>"
 
-#: ../terminal/main.c:77
-msgid ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
-msgstr ""
+#. parameter of --title
+#: ../terminal/main.c:70
+#, fuzzy
+msgid "title"
+msgstr "Pel"
 
 #: ../terminal/main.c:79
-msgid ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
-msgstr ""
-
-#: ../terminal/main.c:82
-msgid ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
-msgstr ""
-
-#: ../terminal/main.c:86
-msgid ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
-msgstr ""
-
-#: ../terminal/main.c:88
-msgid ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
-msgstr ""
-
-#: ../terminal/main.c:90
-msgid ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-
-#: ../terminal/main.c:95
-msgid ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
-msgstr ""
-
-#: ../terminal/main.c:99
-msgid ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+msgid "Window Options"
 msgstr ""
 
-#: ../terminal/main.c:104
-msgid ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#. parameter of --geometry
+#: ../terminal/main.c:83
+msgid "geometry"
 msgstr ""
 
-#: ../terminal/main.c:109
-msgid ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
+#. parameter of --role
+#: ../terminal/main.c:85
+msgid "role"
 msgstr ""
 
-#: ../terminal/main.c:114
-msgid ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
+#. parameter of --startup-id
+#: ../terminal/main.c:87
+msgid "string"
 msgstr ""
 
-#: ../terminal/main.c:119
-msgid ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
+#. parameter of --icon
+#: ../terminal/main.c:89
+#, fuzzy
+msgid "icon"
+msgstr "Çalakî"
 
-#: ../terminal/main.c:124
-msgid ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#: ../terminal/main.c:91
+#, c-format
+msgid "See the %s man page for full explanation of the options above."
 msgstr ""
 
-#: ../terminal/main.c:151 ../terminal/terminal-preferences.c:1263
+#: ../terminal/main.c:118 ../terminal/terminal-preferences.c:1263
 #: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr "Termînal"
 
-#: ../terminal/main.c:173
+#: ../terminal/main.c:135
 #, c-format
 msgid ""
 "%s (Xfce %s)\n"
@@ -235,31 +115,26 @@ msgid ""
 "Please report bugs to <%s>.\n"
 msgstr ""
 
-#: ../terminal/main.c:267
+#: ../terminal/main.c:239
 #, c-format
 msgid "Unable to register terminal service: %s\n"
 msgstr ""
 
-#: ../terminal/main.c:276
-#, c-format
-msgid "Unable to launch terminal: %s\n"
-msgstr ""
-
-#: ../terminal/terminal-app.c:551
+#: ../terminal/terminal-app.c:554
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr ""
 
-#: ../terminal/terminal-dbus.c:114
+#: ../terminal/terminal-dbus.c:108
 msgid "User id mismatch"
 msgstr ""
 
-#: ../terminal/terminal-dbus.c:146
+#: ../terminal/terminal-dbus.c:134
 #, c-format
 msgid "D-BUS message bus disconnected, exiting...\n"
 msgstr ""
 
-#: ../terminal/terminal-dbus.c:208
+#: ../terminal/terminal-dbus.c:196
 #, c-format
 msgid "Unable to register object %s"
 msgstr ""
@@ -284,84 +159,78 @@ msgstr ""
 msgid "Failed to open the documentation browser"
 msgstr ""
 
-#: ../terminal/terminal-options.c:189
+#: ../terminal/terminal-options.c:206
 #, c-format
 msgid ""
 "Option \"--default-display\" requires specifying the default X display as "
 "its parameter"
 msgstr ""
 
-#: ../terminal/terminal-options.c:204
+#: ../terminal/terminal-options.c:221
 #, c-format
 msgid ""
 "Option \"--default-working-directory\" requires specifying the default "
 "working directory as its parameter"
 msgstr ""
 
-#: ../terminal/terminal-options.c:235
-#, c-format
-msgid ""
-"Option \"--sm-client-id\" requires specifying the session id as its parameter"
-msgstr ""
-
-#: ../terminal/terminal-options.c:250
+#: ../terminal/terminal-options.c:237
 #, c-format
 msgid ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
 "of the command line"
 msgstr ""
 
-#: ../terminal/terminal-options.c:267
+#: ../terminal/terminal-options.c:254
 #, c-format
 msgid ""
 "Option \"--command/-e\" requires specifying the command to run as its "
 "parameter"
 msgstr ""
 
-#: ../terminal/terminal-options.c:284
+#: ../terminal/terminal-options.c:271
 #, c-format
 msgid ""
 "Option \"--working-directory\" requires specifying the working directory as "
 "its parameter"
 msgstr ""
 
-#: ../terminal/terminal-options.c:299
+#: ../terminal/terminal-options.c:286
 #, c-format
 msgid "Option \"--title/-T\" requires specifying the title as its parameter"
 msgstr ""
 
-#: ../terminal/terminal-options.c:319
+#: ../terminal/terminal-options.c:305
 #, c-format
 msgid ""
 "Option \"--display\" requires specifying the X display as its parameters"
 msgstr ""
 
-#: ../terminal/terminal-options.c:334
+#: ../terminal/terminal-options.c:320
 #, c-format
 msgid ""
 "Option \"--geometry\" requires specifying the window geometry as its "
 "parameter"
 msgstr ""
 
-#: ../terminal/terminal-options.c:349
+#: ../terminal/terminal-options.c:335
 #, c-format
 msgid "Option \"--role\" requires specifying the window role as its parameter"
 msgstr ""
 
-#: ../terminal/terminal-options.c:364
+#: ../terminal/terminal-options.c:350
 #, c-format
 msgid ""
 "Option \"--startup-id\" requires specifying the startup id as its parameter"
 msgstr ""
 
-#: ../terminal/terminal-options.c:379
+#: ../terminal/terminal-options.c:365
 #, c-format
 msgid ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
 "parameter"
 msgstr ""
 
-#: ../terminal/terminal-options.c:435
+#: ../terminal/terminal-options.c:419
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr ""
@@ -430,7 +299,7 @@ msgstr ""
 msgid "Set Title"
 msgstr ""
 
-#: ../terminal/terminal-preferences.c:464
+#: ../terminal/terminal-preferences.c:464 ../terminal/terminal-window.c:237
 msgid "Reset"
 msgstr ""
 
@@ -721,6 +590,10 @@ msgstr ""
 msgid "Reset and C_lear"
 msgstr ""
 
+#: ../terminal/terminal-window.c:238
+msgid "Reset and clear"
+msgstr ""
+
 #: ../terminal/terminal-window.c:239
 msgid "_Go"
 msgstr "_Biçe"
diff --git a/po/lt.po b/po/lt.po
index 6fdfcc3..6475353 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Terminal 0.2.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 11:48+0100\n"
+"POT-Creation-Date: 2009-12-14 16:03+0100\n"
 "PO-Revision-Date: 2006-05-26 12:20+0300\n"
 "Last-Translator: mantas <mantaz at users.sourceforge.net>\n"
 "Language-Team: Lithuanian <komp_lt at konferencijos.lt>\n"
@@ -17,206 +17,83 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
 "100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../terminal/main.c:46
+#: ../terminal/main.c:48
 msgid "Usage:"
 msgstr ""
 
-#: ../terminal/main.c:47
+#: ../terminal/main.c:48
 msgid "OPTION"
 msgstr ""
 
-#: ../terminal/main.c:49
+#: ../terminal/main.c:53
 msgid "General Options"
 msgstr ""
 
-#: ../terminal/main.c:50
-msgid "  -h, --help                          Print this help message and exit"
+#. parameter of --default-display
+#. parameter of --display
+#: ../terminal/main.c:55 ../terminal/main.c:81
+msgid "display"
 msgstr ""
 
-#: ../terminal/main.c:51
-msgid ""
-"  -V, --version                       Print version information and exit"
-msgstr ""
-
-#: ../terminal/main.c:52
-msgid ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
-msgstr ""
-
-#: ../terminal/main.c:54
-msgid "  --default-display=DISPLAY           default X display to use"
-msgstr ""
-
-#: ../terminal/main.c:55
-msgid ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
+#. parameter of --default-working-directory
+#. parameter of --working-directory
+#: ../terminal/main.c:57 ../terminal/main.c:72
+msgid "directory"
 msgstr ""
 
-#: ../terminal/main.c:58
+#: ../terminal/main.c:61
 msgid "Window or Tab Separators"
 msgstr ""
 
-#: ../terminal/main.c:59
-msgid ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-msgstr ""
-
-#: ../terminal/main.c:62
-msgid ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-msgstr ""
-
 #: ../terminal/main.c:66
 msgid "Tab Options"
 msgstr ""
 
-#: ../terminal/main.c:67
-msgid ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-msgstr ""
-
-#: ../terminal/main.c:69
-msgid ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-msgstr ""
-
-#: ../terminal/main.c:71
-msgid ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
+#. parameter of --command
+#: ../terminal/main.c:68
+msgid "command"
 msgstr ""
 
-#: ../terminal/main.c:72
-msgid "  -T, --title=TITLE                   Set the terminal's title"
-msgstr ""
-
-#: ../terminal/main.c:73
-msgid ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-msgstr ""
-
-#: ../terminal/main.c:76
-msgid "Window Options"
-msgstr ""
-
-#: ../terminal/main.c:77
-msgid ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
+#. parameter of --title
+#: ../terminal/main.c:70
+msgid "title"
 msgstr ""
 
 #: ../terminal/main.c:79
-msgid ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
-msgstr ""
-
-#: ../terminal/main.c:82
-msgid ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
-msgstr ""
-
-#: ../terminal/main.c:86
-msgid ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
-msgstr ""
-
-#: ../terminal/main.c:88
-msgid ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
-msgstr ""
-
-#: ../terminal/main.c:90
-msgid ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+msgid "Window Options"
 msgstr ""
 
-#: ../terminal/main.c:95
-msgid ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
+#. parameter of --geometry
+#: ../terminal/main.c:83
+msgid "geometry"
 msgstr ""
 
-#: ../terminal/main.c:99
-msgid ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#. parameter of --role
+#: ../terminal/main.c:85
+msgid "role"
 msgstr ""
 
-#: ../terminal/main.c:104
-msgid ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#. parameter of --startup-id
+#: ../terminal/main.c:87
+msgid "string"
 msgstr ""
 
-#: ../terminal/main.c:109
-msgid ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
+#. parameter of --icon
+#: ../terminal/main.c:89
+msgid "icon"
 msgstr ""
 
-#: ../terminal/main.c:114
-msgid ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-
-#: ../terminal/main.c:119
-msgid ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-
-#: ../terminal/main.c:124
-msgid ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#: ../terminal/main.c:91
+#, c-format
+msgid "See the %s man page for full explanation of the options above."
 msgstr ""
 
-#: ../terminal/main.c:151 ../terminal/terminal-preferences.c:1263
+#: ../terminal/main.c:118 ../terminal/terminal-preferences.c:1263
 #: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr ""
 
-#: ../terminal/main.c:173
+#: ../terminal/main.c:135
 #, c-format
 msgid ""
 "%s (Xfce %s)\n"
@@ -231,31 +108,26 @@ msgid ""
 "Please report bugs to <%s>.\n"
 msgstr ""
 
-#: ../terminal/main.c:267
+#: ../terminal/main.c:239
 #, c-format
 msgid "Unable to register terminal service: %s\n"
 msgstr ""
 
-#: ../terminal/main.c:276
-#, c-format
-msgid "Unable to launch terminal: %s\n"
-msgstr ""
-
-#: ../terminal/terminal-app.c:551
+#: ../terminal/terminal-app.c:554
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr ""
 
-#: ../terminal/terminal-dbus.c:114
+#: ../terminal/terminal-dbus.c:108
 msgid "User id mismatch"
 msgstr ""
 
-#: ../terminal/terminal-dbus.c:146
+#: ../terminal/terminal-dbus.c:134
 #, c-format
 msgid "D-BUS message bus disconnected, exiting...\n"
 msgstr ""
 
-#: ../terminal/terminal-dbus.c:208
+#: ../terminal/terminal-dbus.c:196
 #, c-format
 msgid "Unable to register object %s"
 msgstr ""
@@ -277,84 +149,78 @@ msgstr ""
 msgid "Failed to open the documentation browser"
 msgstr ""
 
-#: ../terminal/terminal-options.c:189
+#: ../terminal/terminal-options.c:206
 #, c-format
 msgid ""
 "Option \"--default-display\" requires specifying the default X display as "
 "its parameter"
 msgstr ""
 
-#: ../terminal/terminal-options.c:204
+#: ../terminal/terminal-options.c:221
 #, c-format
 msgid ""
 "Option \"--default-working-directory\" requires specifying the default "
 "working directory as its parameter"
 msgstr ""
 
-#: ../terminal/terminal-options.c:235
-#, c-format
-msgid ""
-"Option \"--sm-client-id\" requires specifying the session id as its parameter"
-msgstr ""
-
-#: ../terminal/terminal-options.c:250
+#: ../terminal/terminal-options.c:237
 #, c-format
 msgid ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
 "of the command line"
 msgstr ""
 
-#: ../terminal/terminal-options.c:267
+#: ../terminal/terminal-options.c:254
 #, c-format
 msgid ""
 "Option \"--command/-e\" requires specifying the command to run as its "
 "parameter"
 msgstr ""
 
-#: ../terminal/terminal-options.c:284
+#: ../terminal/terminal-options.c:271
 #, c-format
 msgid ""
 "Option \"--working-directory\" requires specifying the working directory as "
 "its parameter"
 msgstr ""
 
-#: ../terminal/terminal-options.c:299
+#: ../terminal/terminal-options.c:286
 #, c-format
 msgid "Option \"--title/-T\" requires specifying the title as its parameter"
 msgstr ""
 
-#: ../terminal/terminal-options.c:319
+#: ../terminal/terminal-options.c:305
 #, c-format
 msgid ""
 "Option \"--display\" requires specifying the X display as its parameters"
 msgstr ""
 
-#: ../terminal/terminal-options.c:334
+#: ../terminal/terminal-options.c:320
 #, c-format
 msgid ""
 "Option \"--geometry\" requires specifying the window geometry as its "
 "parameter"
 msgstr ""
 
-#: ../terminal/terminal-options.c:349
+#: ../terminal/terminal-options.c:335
 #, c-format
 msgid "Option \"--role\" requires specifying the window role as its parameter"
 msgstr ""
 
-#: ../terminal/terminal-options.c:364
+#: ../terminal/terminal-options.c:350
 #, c-format
 msgid ""
 "Option \"--startup-id\" requires specifying the startup id as its parameter"
 msgstr ""
 
-#: ../terminal/terminal-options.c:379
+#: ../terminal/terminal-options.c:365
 #, c-format
 msgid ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
 "parameter"
 msgstr ""
 
-#: ../terminal/terminal-options.c:435
+#: ../terminal/terminal-options.c:419
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr ""
@@ -423,7 +289,7 @@ msgstr ""
 msgid "Set Title"
 msgstr ""
 
-#: ../terminal/terminal-preferences.c:464
+#: ../terminal/terminal-preferences.c:464 ../terminal/terminal-window.c:237
 msgid "Reset"
 msgstr ""
 
@@ -714,6 +580,10 @@ msgstr ""
 msgid "Reset and C_lear"
 msgstr ""
 
+#: ../terminal/terminal-window.c:238
+msgid "Reset and clear"
+msgstr ""
+
 #: ../terminal/terminal-window.c:239
 msgid "_Go"
 msgstr ""
diff --git a/po/lv.po b/po/lv.po
index 7417d73..9ef88e4 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Terminal 0.2.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 11:48+0100\n"
+"POT-Creation-Date: 2009-12-14 16:03+0100\n"
 "PO-Revision-Date: 2009-10-16 15:10+0100\n"
 "Last-Translator: Rihards Prieditis <rprieditis at gmail.com>\n"
 "Language-Team: Latvian <translation-team-lv at lists.sourceforge.net>\n"
@@ -21,294 +21,88 @@ msgstr ""
 "X-Poedit-Country: Latvia\n"
 "X-Generator: Lokalize 1.0\n"
 
-#: ../terminal/main.c:46
+#: ../terminal/main.c:48
 msgid "Usage:"
 msgstr "Izmantošana:"
 
-#: ../terminal/main.c:47
+#: ../terminal/main.c:48
 msgid "OPTION"
 msgstr "OPCIJAS"
 
-#: ../terminal/main.c:49
+#: ../terminal/main.c:53
 msgid "General Options"
 msgstr "Vispārējās opcijas"
 
-#: ../terminal/main.c:50
-msgid "  -h, --help                          Print this help message and exit"
-msgstr ""
-"  -h, --help                          Izdrukā šo palīdzības ziņu un iziet"
-
-#: ../terminal/main.c:51
-msgid ""
-"  -V, --version                       Print version information and exit"
-msgstr ""
-"  -v, --version                       Izdrukā versijas informāciju un iziet"
-
-#: ../terminal/main.c:52
-msgid ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
-msgstr ""
-"  --disable-server                    Nereģistrēt ar D-BUS sesiju\n"
-"                                      ziņu kopni"
-
-#: ../terminal/main.c:54
-msgid "  --default-display=DISPLAY           default X display to use"
-msgstr ""
-"  --default-display=DISPLEJS         izmantojamais noklusētais X displejs"
+#. parameter of --default-display
+#. parameter of --display
+#: ../terminal/main.c:55 ../terminal/main.c:81
+#, fuzzy
+msgid "display"
+msgstr "Netiek rādīts"
 
-#: ../terminal/main.c:55
-msgid ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
+#. parameter of --default-working-directory
+#. parameter of --working-directory
+#: ../terminal/main.c:57 ../terminal/main.c:72
+msgid "directory"
 msgstr ""
-"  --default-working-directory=DIRVĀRDS Uzstāda noklusēto termināļa darba\n"
-"                                      direktoriju"
 
-#: ../terminal/main.c:58
+#: ../terminal/main.c:61
 msgid "Window or Tab Separators"
 msgstr "Loga vai cilnes atdalītājs"
 
-#: ../terminal/main.c:59
-msgid ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-msgstr ""
-"  --tab                               Atver jaunu cilni, pēdējā norādītajā\n"
-"                                      logā; vairāk, kā viena opcija var "
-"tikt\n"
-"                                      norādīta"
-
-#: ../terminal/main.c:62
-msgid ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-msgstr ""
-"  --window                            Atvērt jaunu logu, kurš satur vienu "
-"cilni;\n"
-"                                      var tikt norādīta vairāk kā viena\n"
-"                                      opcija"
-
 #: ../terminal/main.c:66
 msgid "Tab Options"
 msgstr "Cilnes opcijas"
 
-#: ../terminal/main.c:67
-msgid ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-msgstr ""
-"  -x, --execute                       Izpildīt komandas līnijas atlikumu\n"
-"                                      terminālī"
-
-#: ../terminal/main.c:69
-msgid ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-msgstr ""
-"  -e, --command=VIRKNE                Izpildīt argumentu, opcijai\n"
-"                                      terminālī"
-
-#: ../terminal/main.c:71
-msgid ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
-msgstr ""
-"  --working-directory=DIRVĀRDS       Uzstādīt termināļa darba direktoriju"
-
-#: ../terminal/main.c:72
-msgid "  -T, --title=TITLE                   Set the terminal's title"
-msgstr "  -T, --title=VIRSRAKSTS         Uzstāda termināļa virsrakstu"
+#. parameter of --command
+#: ../terminal/main.c:68
+#, fuzzy
+msgid "command"
+msgstr "<b>Komanda</b>"
 
-#: ../terminal/main.c:73
-msgid ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-msgstr ""
-"  -H, --hold                          Uzreiz neiznīcināt cilni, kad\n"
-"                                      bērna komanda iziet"
+#. parameter of --title
+#: ../terminal/main.c:70
+#, fuzzy
+msgid "title"
+msgstr "Sakrauti"
 
-#: ../terminal/main.c:76
+#: ../terminal/main.c:79
 msgid "Window Options"
 msgstr "Loga opcijas"
 
-#: ../terminal/main.c:77
-msgid ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
+#. parameter of --geometry
+#: ../terminal/main.c:83
+msgid "geometry"
 msgstr ""
-"  --display=DISPLEJS                 X displejs, kuru izmantot\n"
-"                                      pēdējam norādītajam logam"
 
-#: ../terminal/main.c:79
-msgid ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
+#. parameter of --role
+#: ../terminal/main.c:85
+msgid "role"
 msgstr ""
-"  --geometry=ĢEOMETRIJA                 X ģeometrija specifikācija "
-"(informācija\n"
-"                                       \"X\" man lapā), var tikt uzstādīta "
-"pie logu\n"
-"                                      atvēršanas"
 
-#: ../terminal/main.c:82
-msgid ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
-msgstr ""
-"  --role=LOMA                         Uzstāda lomu pēdējam norādītajam\n"
-"                                      logam; attiecas tikai uz vienu logu;\n"
-"                                      var tikt norādīts vienu reizi, katram "
-"jaunam\n"
-"                                      logam, kuru izveido no komandu līnijas"
+#. parameter of --startup-id
+#: ../terminal/main.c:87
+#, fuzzy
+msgid "string"
+msgstr "Uzmanību"
 
-#: ../terminal/main.c:86
-msgid ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
-msgstr ""
-"  --startup-id=VIRKNE               ID, sāknēšanas paziņošanas\n"
-"                                      protokolam"
+#. parameter of --icon
+#: ../terminal/main.c:89
+#, fuzzy
+msgid "icon"
+msgstr "Darbība"
 
-#: ../terminal/main.c:88
-msgid ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
+#: ../terminal/main.c:91
+#, c-format
+msgid "See the %s man page for full explanation of the options above."
 msgstr ""
-"  -I, --icon=IKONA                     Uzstādit termināļa ikonu kā ikonas "
-"nosaukumu\n"
-"                                      vai faila nosaukumu"
 
-#: ../terminal/main.c:90
-msgid ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --fullscreen                         Uzstāda pilnekrāna režīmu pēdējam\n"
-"                                      norādītajam logam; attiecas tikai uz "
-"vienu\n"
-"                                      logu; var tikt norādīts vienu reizi, "
-"katram\n"
-"                                      jaunam logam, kuru izveido no komandu "
-"līnijas"
-
-#: ../terminal/main.c:95
-msgid ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
-msgstr ""
-"  --maximize                          Maksimizē pēdējo norādīto logu;\n"
-"                                      attiecas tikai uz vienu logu; var "
-"tikt\n"
-"                                      norādit vienu reizi katram logam, "
-"kuru\n"
-"                                      jūs izveidojat no komandlīnijas"
-
-#: ../terminal/main.c:99
-msgid ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-menubar                      Ieslēdz izvēlnes joslu pēdejam\n"
-"                                      norādītajam logam; attiecas\n"
-"                                      tikai uz pirmo logu; var tikt "
-"norādīts\n"
-"                                      vienu reizi katram logam, ko izveido\n"
-"                                      no komandu rindas"
-
-#: ../terminal/main.c:104
-msgid ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --hide-menubar                      Izslēdz izvēlnes joslu pēdejam\n"
-"                                      norādītajam logam; attiecas\n"
-"                                      tikai uz pirmo logu; var tikt "
-"norādīts\n"
-"                                      vienu reizi katram logam, ko izveido\n"
-"                                      no komandu rindas"
-
-#: ../terminal/main.c:109
-msgid ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --show-borders                      Ieslēdz robežas pēdejam\n"
-"                                      norādītajam logam; attiecas\n"
-"                                      tikai uz pirmo logu; var tikt "
-"norādīts\n"
-"                                      vienu reizi katram logam, ko izveido\n"
-"                                      no komandu rindas"
-
-#: ../terminal/main.c:114
-msgid ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --hide-borders                      Izslēdz robežas pēdejam\n"
-"                                      norādītajam logam; attiecas\n"
-"                                      tikai uz pirmo logu; var tikt "
-"norādīts\n"
-"                                      vienu reizi katram logam, ko izveido\n"
-"                                      no komandu rindas"
-
-#: ../terminal/main.c:119
-msgid ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-toolbars                     Ieslēdz rīkjolsu pēdejam\n"
-"                                      norādītajam logam; attiecas\n"
-"                                      tikai uz pirmo logu; var tikt "
-"norādīts\n"
-"                                      vienu reizi katram logam, ko izveido\n"
-"                                      no komandu rindas"
-
-#: ../terminal/main.c:124
-msgid ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --hide-toolbars                     Izslēdz rīkjolsu pēdejam\n"
-"                                      norādītajam logam; attiecas\n"
-"                                      tikai uz pirmo logu; var tikt "
-"norādīts\n"
-"                                      vienu reizi katram logam, ko izveido\n"
-"                                      no komandu rindas"
-
-#: ../terminal/main.c:151 ../terminal/terminal-preferences.c:1263
+#: ../terminal/main.c:118 ../terminal/terminal-preferences.c:1263
 #: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr "Terminālis"
 
-#: ../terminal/main.c:173
+#: ../terminal/main.c:135
 #, c-format
 msgid ""
 "%s (Xfce %s)\n"
@@ -333,31 +127,26 @@ msgstr ""
 "\n"
 "Lūdzu, par kļūdām ziņot <%s>.\n"
 
-#: ../terminal/main.c:267
+#: ../terminal/main.c:239
 #, c-format
 msgid "Unable to register terminal service: %s\n"
 msgstr "Neizdevās piereģistrēt termināļa servisu: %s\n"
 
-#: ../terminal/main.c:276
-#, c-format
-msgid "Unable to launch terminal: %s\n"
-msgstr "Nevarēju palaist termināli: %s\n"
-
-#: ../terminal/terminal-app.c:551
+#: ../terminal/terminal-app.c:554
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "Nederīga ģeometrijas virkne \"%s\"\n"
 
-#: ../terminal/terminal-dbus.c:114
+#: ../terminal/terminal-dbus.c:108
 msgid "User id mismatch"
 msgstr "Lietotāju id nesakritība"
 
-#: ../terminal/terminal-dbus.c:146
+#: ../terminal/terminal-dbus.c:134
 #, c-format
 msgid "D-BUS message bus disconnected, exiting...\n"
 msgstr "D-BUS ziņa, maģistrāle atvienota, izeju...\n"
 
-#: ../terminal/terminal-dbus.c:208
+#: ../terminal/terminal-dbus.c:196
 #, c-format
 msgid "Unable to register object %s"
 msgstr "Neizdevās piereģistrēt objektu %s"
@@ -379,7 +168,7 @@ msgstr "Apmeklēt termināļa mājas lapu"
 msgid "Failed to open the documentation browser"
 msgstr "Neizdevās atvērt dokumentu pārlūku"
 
-#: ../terminal/terminal-options.c:189
+#: ../terminal/terminal-options.c:206
 #, c-format
 msgid ""
 "Option \"--default-display\" requires specifying the default X display as "
@@ -388,7 +177,7 @@ msgstr ""
 "Opcijai \"--default-display\" nepieciešamas noklusētais X displejs, kā "
 "parametrs"
 
-#: ../terminal/terminal-options.c:204
+#: ../terminal/terminal-options.c:221
 #, c-format
 msgid ""
 "Option \"--default-working-directory\" requires specifying the default "
@@ -397,14 +186,7 @@ msgstr ""
 "Opcijai \"--default-working-directory\" nepieciešams norādīt noklusēto darba "
 "direktoriju, kā parametru"
 
-#: ../terminal/terminal-options.c:235
-#, c-format
-msgid ""
-"Option \"--sm-client-id\" requires specifying the session id as its parameter"
-msgstr ""
-"Opcijai \"--sm-client-id\" nepieciešams norādīt sesijas id, kā parametru"
-
-#: ../terminal/terminal-options.c:250
+#: ../terminal/terminal-options.c:237
 #, c-format
 msgid ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
@@ -413,7 +195,7 @@ msgstr ""
 "Opcijai \"--execute/-x\" nepieciešams norādīt izpildāmo komandu, kuru "
 "izpildīt uz atlikušās komandu rindas"
 
-#: ../terminal/terminal-options.c:267
+#: ../terminal/terminal-options.c:254
 #, c-format
 msgid ""
 "Option \"--command/-e\" requires specifying the command to run as its "
@@ -421,7 +203,7 @@ msgid ""
 msgstr ""
 "Opcijai \"--command/-e\" nepieciešams norādīt izpildāmu komandu, kā parametru"
 
-#: ../terminal/terminal-options.c:284
+#: ../terminal/terminal-options.c:271
 #, c-format
 msgid ""
 "Option \"--working-directory\" requires specifying the working directory as "
@@ -430,18 +212,18 @@ msgstr ""
 "Opcijai \"--working-directory\" nepieciešams norādīt darba direktoriju, kā "
 "parametru"
 
-#: ../terminal/terminal-options.c:299
+#: ../terminal/terminal-options.c:286
 #, c-format
 msgid "Option \"--title/-T\" requires specifying the title as its parameter"
 msgstr "Opcijai \"--title/-T\" nepieciešams norādīt virsrakstu, kā parametru"
 
-#: ../terminal/terminal-options.c:319
+#: ../terminal/terminal-options.c:305
 #, c-format
 msgid ""
 "Option \"--display\" requires specifying the X display as its parameters"
 msgstr "Opcijai \"--display\" nepieciešams norādīt X displeju, kā parametru"
 
-#: ../terminal/terminal-options.c:334
+#: ../terminal/terminal-options.c:320
 #, c-format
 msgid ""
 "Option \"--geometry\" requires specifying the window geometry as its "
@@ -449,18 +231,18 @@ msgid ""
 msgstr ""
 "Opcijai \"--geometry\" nepieciešams norādīt loga ģeometriju, kā parametru"
 
-#: ../terminal/terminal-options.c:349
+#: ../terminal/terminal-options.c:335
 #, c-format
 msgid "Option \"--role\" requires specifying the window role as its parameter"
 msgstr "Opcijai \"--role\" nepieciešams norādīt loga lomu, kā parametru"
 
-#: ../terminal/terminal-options.c:364
+#: ../terminal/terminal-options.c:350
 #, c-format
 msgid ""
 "Option \"--startup-id\" requires specifying the startup id as its parameter"
 msgstr "Opcijai \"--startup-id\" nepieciešams sāknēšnas id, kā parametrs"
 
-#: ../terminal/terminal-options.c:379
+#: ../terminal/terminal-options.c:365
 #, c-format
 msgid ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
@@ -469,7 +251,7 @@ msgstr ""
 "Opcijai \"--icon/-I\" nepieciešamas norādīt ikonas nosaukumu vai faila "
 "nosaukumu, kā parametru"
 
-#: ../terminal/terminal-options.c:435
+#: ../terminal/terminal-options.c:419
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Nezināma opcija \"%s\""
@@ -538,7 +320,7 @@ msgstr "Pilnekrāns"
 msgid "Set Title"
 msgstr "Uzstādīt virsrakstu"
 
-#: ../terminal/terminal-preferences.c:464
+#: ../terminal/terminal-preferences.c:464 ../terminal/terminal-window.c:237
 msgid "Reset"
 msgstr "Atiestatīt"
 
@@ -835,6 +617,11 @@ msgstr "_Atiestatīt"
 msgid "Reset and C_lear"
 msgstr "Atiestatīt un no_tīrīt"
 
+#: ../terminal/terminal-window.c:238
+#, fuzzy
+msgid "Reset and clear"
+msgstr "Atiestatīt un notīrīt"
+
 #: ../terminal/terminal-window.c:239
 msgid "_Go"
 msgstr "_Doties"
@@ -1504,6 +1291,281 @@ msgstr "Atja_unināt utmp/wtmp ierakstus, kad tiek palaista komanda"
 msgid "seconds"
 msgstr "sekundes"
 
+#~ msgid ""
+#~ "  -h, --help                          Print this help message and exit"
+#~ msgstr ""
+#~ "  -h, --help                          Izdrukā šo palīdzības ziņu un iziet"
+
+#~ msgid ""
+#~ "  -V, --version                       Print version information and exit"
+#~ msgstr ""
+#~ "  -v, --version                       Izdrukā versijas informāciju un "
+#~ "iziet"
+
+#~ msgid ""
+#~ "  --disable-server                    Do not register with the D-BUS\n"
+#~ "                                      session message bus"
+#~ msgstr ""
+#~ "  --disable-server                    Nereģistrēt ar D-BUS sesiju\n"
+#~ "                                      ziņu kopni"
+
+#~ msgid "  --default-display=DISPLAY           default X display to use"
+#~ msgstr ""
+#~ "  --default-display=DISPLEJS         izmantojamais noklusētais X displejs"
+
+#~ msgid ""
+#~ "  --default-working-directory=DIRNAME Set the default terminal's working\n"
+#~ "                                      directory"
+#~ msgstr ""
+#~ "  --default-working-directory=DIRVĀRDS Uzstāda noklusēto termināļa darba\n"
+#~ "                                      direktoriju"
+
+#~ msgid ""
+#~ "  --tab                               Open a new tab in the last-"
+#~ "specified\n"
+#~ "                                      window; more than one of these\n"
+#~ "                                      options can be provided"
+#~ msgstr ""
+#~ "  --tab                               Atver jaunu cilni, pēdējā "
+#~ "norādītajā\n"
+#~ "                                      logā; vairāk, kā viena opcija var "
+#~ "tikt\n"
+#~ "                                      norādīta"
+
+#~ msgid ""
+#~ "  --window                            Open a new window containing one "
+#~ "tab;\n"
+#~ "                                      more than one of these options can "
+#~ "be\n"
+#~ "                                      provided"
+#~ msgstr ""
+#~ "  --window                            Atvērt jaunu logu, kurš satur vienu "
+#~ "cilni;\n"
+#~ "                                      var tikt norādīta vairāk kā viena\n"
+#~ "                                      opcija"
+
+#~ msgid ""
+#~ "  -x, --execute                       Execute the remainder of the "
+#~ "command\n"
+#~ "                                      line inside the terminal"
+#~ msgstr ""
+#~ "  -x, --execute                       Izpildīt komandas līnijas atlikumu\n"
+#~ "                                      terminālī"
+
+#~ msgid ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+#~ msgstr ""
+#~ "  -e, --command=VIRKNE                Izpildīt argumentu, opcijai\n"
+#~ "                                      terminālī"
+
+#~ msgid ""
+#~ "  --working-directory=DIRNAME         Set the terminal's working directory"
+#~ msgstr ""
+#~ "  --working-directory=DIRVĀRDS       Uzstādīt termināļa darba direktoriju"
+
+#~ msgid "  -T, --title=TITLE                   Set the terminal's title"
+#~ msgstr "  -T, --title=VIRSRAKSTS         Uzstāda termināļa virsrakstu"
+
+#~ msgid ""
+#~ "  -H, --hold                          Do not immediately destroy the tab\n"
+#~ "                                      when the child command exits"
+#~ msgstr ""
+#~ "  -H, --hold                          Uzreiz neiznīcināt cilni, kad\n"
+#~ "                                      bērna komanda iziet"
+
+#~ msgid ""
+#~ "  --display=DISPLAY                   X display to use for the last-\n"
+#~ "                                      specified window"
+#~ msgstr ""
+#~ "  --display=DISPLEJS                 X displejs, kuru izmantot\n"
+#~ "                                      pēdējam norādītajam logam"
+
+#~ msgid ""
+#~ "  --geometry=GEOMETRY                 X geometry specification (see \"X"
+#~ "\"\n"
+#~ "                                      man page), can be specified once "
+#~ "per\n"
+#~ "                                      window to be opened"
+#~ msgstr ""
+#~ "  --geometry=ĢEOMETRIJA                 X ģeometrija specifikācija "
+#~ "(informācija\n"
+#~ "                                       \"X\" man lapā), var tikt "
+#~ "uzstādīta pie logu\n"
+#~ "                                      atvēršanas"
+
+#~ msgid ""
+#~ "  --role=ROLE                         Set the role for the last-"
+#~ "specified\n"
+#~ "                                      window; applies to only one "
+#~ "window;\n"
+#~ "                                      can be specified once for each "
+#~ "window\n"
+#~ "                                      you create from the command line"
+#~ msgstr ""
+#~ "  --role=LOMA                         Uzstāda lomu pēdējam norādītajam\n"
+#~ "                                      logam; attiecas tikai uz vienu "
+#~ "logu;\n"
+#~ "                                      var tikt norādīts vienu reizi, "
+#~ "katram jaunam\n"
+#~ "                                      logam, kuru izveido no komandu "
+#~ "līnijas"
+
+#~ msgid ""
+#~ "  --startup-id=STRING                 ID for the startup notification\n"
+#~ "                                      protocol"
+#~ msgstr ""
+#~ "  --startup-id=VIRKNE               ID, sāknēšanas paziņošanas\n"
+#~ "                                      protokolam"
+
+#~ msgid ""
+#~ "  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
+#~ "                                      name or filename"
+#~ msgstr ""
+#~ "  -I, --icon=IKONA                     Uzstādit termināļa ikonu kā ikonas "
+#~ "nosaukumu\n"
+#~ "                                      vai faila nosaukumu"
+
+#~ msgid ""
+#~ "  --fullscreen                        Set the last-specified window into\n"
+#~ "                                      fullscreen mode; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --fullscreen                         Uzstāda pilnekrāna režīmu pēdējam\n"
+#~ "                                      norādītajam logam; attiecas tikai "
+#~ "uz vienu\n"
+#~ "                                      logu; var tikt norādīts vienu "
+#~ "reizi, katram\n"
+#~ "                                      jaunam logam, kuru izveido no "
+#~ "komandu līnijas"
+
+#~ msgid ""
+#~ "  --maximize                          Maximize the last-specified "
+#~ "window;\n"
+#~ "                                      applies to only one window; can be\n"
+#~ "                                      specified once for each window you\n"
+#~ "                                      create from the command line"
+#~ msgstr ""
+#~ "  --maximize                          Maksimizē pēdējo norādīto logu;\n"
+#~ "                                      attiecas tikai uz vienu logu; var "
+#~ "tikt\n"
+#~ "                                      norādit vienu reizi katram logam, "
+#~ "kuru\n"
+#~ "                                      jūs izveidojat no komandlīnijas"
+
+#~ msgid ""
+#~ "  --show-menubar                      Turn on the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-menubar                      Ieslēdz izvēlnes joslu pēdejam\n"
+#~ "                                      norādītajam logam; attiecas\n"
+#~ "                                      tikai uz pirmo logu; var tikt "
+#~ "norādīts\n"
+#~ "                                      vienu reizi katram logam, ko "
+#~ "izveido\n"
+#~ "                                      no komandu rindas"
+
+#~ msgid ""
+#~ "  --hide-menubar                      Turn off the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-menubar                      Izslēdz izvēlnes joslu pēdejam\n"
+#~ "                                      norādītajam logam; attiecas\n"
+#~ "                                      tikai uz pirmo logu; var tikt "
+#~ "norādīts\n"
+#~ "                                      vienu reizi katram logam, ko "
+#~ "izveido\n"
+#~ "                                      no komandu rindas"
+
+#~ msgid ""
+#~ "  --show-borders                      Turn on the window decorations for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --show-borders                      Ieslēdz robežas pēdejam\n"
+#~ "                                      norādītajam logam; attiecas\n"
+#~ "                                      tikai uz pirmo logu; var tikt "
+#~ "norādīts\n"
+#~ "                                      vienu reizi katram logam, ko "
+#~ "izveido\n"
+#~ "                                      no komandu rindas"
+
+#~ msgid ""
+#~ "  --hide-borders                      Turn off the window decorations "
+#~ "for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --hide-borders                      Izslēdz robežas pēdejam\n"
+#~ "                                      norādītajam logam; attiecas\n"
+#~ "                                      tikai uz pirmo logu; var tikt "
+#~ "norādīts\n"
+#~ "                                      vienu reizi katram logam, ko "
+#~ "izveido\n"
+#~ "                                      no komandu rindas"
+
+#~ msgid ""
+#~ "  --show-toolbars                     Turn on the toolbars for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-toolbars                     Ieslēdz rīkjolsu pēdejam\n"
+#~ "                                      norādītajam logam; attiecas\n"
+#~ "                                      tikai uz pirmo logu; var tikt "
+#~ "norādīts\n"
+#~ "                                      vienu reizi katram logam, ko "
+#~ "izveido\n"
+#~ "                                      no komandu rindas"
+
+#~ msgid ""
+#~ "  --hide-toolbars                     Turn off the toolbars for the "
+#~ "last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-toolbars                     Izslēdz rīkjolsu pēdejam\n"
+#~ "                                      norādītajam logam; attiecas\n"
+#~ "                                      tikai uz pirmo logu; var tikt "
+#~ "norādīts\n"
+#~ "                                      vienu reizi katram logam, ko "
+#~ "izveido\n"
+#~ "                                      no komandu rindas"
+
+#~ msgid "Unable to launch terminal: %s\n"
+#~ msgstr "Nevarēju palaist termināli: %s\n"
+
+#~ msgid ""
+#~ "Option \"--sm-client-id\" requires specifying the session id as its "
+#~ "parameter"
+#~ msgstr ""
+#~ "Opcijai \"--sm-client-id\" nepieciešams norādīt sesijas id, kā parametru"
+
 #~ msgid "<b>Title:</b>"
 #~ msgstr "<b>Virsraksts:</b>"
 
diff --git a/po/nb.po b/po/nb.po
index 85524ee..1ea8307 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Terminal 0.2.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 11:48+0100\n"
+"POT-Creation-Date: 2009-12-14 16:03+0100\n"
 "PO-Revision-Date: 2007-05-12 17:43+0200\n"
 "Last-Translator: Terje Uriansrud <terje at uriansrud.net>\n"
 "Language-Team: Norwegian Bokmal <i18n-nb at lister.ping.uio.no>\n"
@@ -16,270 +16,88 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../terminal/main.c:46
+#: ../terminal/main.c:48
 msgid "Usage:"
 msgstr "Bruk:"
 
-#: ../terminal/main.c:47
+#: ../terminal/main.c:48
 msgid "OPTION"
 msgstr "VALG"
 
-#: ../terminal/main.c:49
+#: ../terminal/main.c:53
 msgid "General Options"
 msgstr "Generelle innstillinger"
 
-#: ../terminal/main.c:50
-msgid "  -h, --help                          Print this help message and exit"
-msgstr ""
-"  -h, --help                          Skriv ut denne meldingen og avslutt"
-
-#: ../terminal/main.c:51
-msgid ""
-"  -V, --version                       Print version information and exit"
-msgstr ""
-"  -V, --version                       Skriv ut versjonsinformasjon og avslutt"
-
-#: ../terminal/main.c:52
-msgid ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
-msgstr ""
-"  --disable-server                    Ikke registerer/bruk D-BUS\n"
-"                                      øktmeldingsbuss"
+#. parameter of --default-display
+#. parameter of --display
+#: ../terminal/main.c:55 ../terminal/main.c:81
+#, fuzzy
+msgid "display"
+msgstr "Vises ikke"
 
-#: ../terminal/main.c:54
-msgid "  --default-display=DISPLAY           default X display to use"
+#. parameter of --default-working-directory
+#. parameter of --working-directory
+#: ../terminal/main.c:57 ../terminal/main.c:72
+msgid "directory"
 msgstr ""
-"  --default-display=DISPLAY           standard X skjerm som skal brukes"
 
-#: ../terminal/main.c:55
-msgid ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
-msgstr ""
-"  --default-working-directory=MAPPENAVN Sett teminalens standard arbeidsmappe"
-
-#: ../terminal/main.c:58
+#: ../terminal/main.c:61
 msgid "Window or Tab Separators"
 msgstr "Vindu eller fanedelere"
 
-#: ../terminal/main.c:59
-msgid ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-msgstr ""
-"  --tab                               Lag ny fane i sist angitte vindu\n"
-"                                      det tillates flere av disse\n"
-"                                      samtidig"
-
-#: ../terminal/main.c:62
-msgid ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-msgstr ""
-"  --window                            Lag nytt vindu med en fane;\n"
-"                                      det tillates flere av disse\n"
-"                                      samtidig"
-
 #: ../terminal/main.c:66
 msgid "Tab Options"
 msgstr "Faneinnstillinger"
 
-#: ../terminal/main.c:67
-msgid ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-msgstr ""
-"  -x, --execute                       Kjør resten av kommando-\n"
-"                                      linjen inne i terminalen"
-
-#: ../terminal/main.c:69
-msgid ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-msgstr ""
-"  -e, --command=STRING                Kjør argumentet til denne oppsjonen\n"
-"                                      inne i terminalen"
-
-#: ../terminal/main.c:71
-msgid ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
-msgstr "  --working-directory=DIRNAME         Sett terminalens arbeidskatalog"
-
-#: ../terminal/main.c:72
-msgid "  -T, --title=TITLE                   Set the terminal's title"
-msgstr "  -T, --title=TITTEL                   Sett terminalens tittel"
+#. parameter of --command
+#: ../terminal/main.c:68
+#, fuzzy
+msgid "command"
+msgstr "Kommando"
 
-#: ../terminal/main.c:73
-msgid ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-msgstr ""
-"  -H, --hold                          Ikke fjern faner øyeblikkelig\n"
-"                                      når underprosessen avsluttes"
+#. parameter of --title
+#: ../terminal/main.c:70
+#, fuzzy
+msgid "title"
+msgstr "Tittel"
 
-#: ../terminal/main.c:76
+#: ../terminal/main.c:79
 msgid "Window Options"
 msgstr "Vindusinnstillinger"
 
-#: ../terminal/main.c:77
-msgid ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
-msgstr ""
-"  --display=DISPLAY                   X skjerm som skal brukes for det sist\n"
-"                                      spesifiserte vinduet"
-
-#: ../terminal/main.c:79
-msgid ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
-msgstr ""
-"  --geometry=GEOMETRI                 X geometri angivelse (se «X»\n"
-"                                      manualside), kan angis en gang\n"
-"                                      per vindu som åpnes"
-
-#: ../terminal/main.c:82
-msgid ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
-msgstr ""
-"  --role=ROLLE                        Sett rollen for sist angitte\n"
-"                                      vindu. Gjelder bare ett vindu,\n"
-"                                      kan angis en gang for hvert vindu\n"
-"                                      du starter fra kommandolinjen"
-
-#: ../terminal/main.c:86
-msgid ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
-msgstr ""
-"  --startup-id=STRENG                 ID for oppstartsvarsel\n"
-"                                      protokoll"
-
-#: ../terminal/main.c:88
-msgid ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
+#. parameter of --geometry
+#: ../terminal/main.c:83
+msgid "geometry"
 msgstr ""
-"  -I, --icon=IKON                     Sett terminalens ikon fra ikonnav\n"
-"                                      eller filnavn.nne oppsjonen"
 
-#: ../terminal/main.c:90
-msgid ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#. parameter of --role
+#: ../terminal/main.c:85
+msgid "role"
 msgstr ""
-"  --fullscreen                        Sett sist angitte vindu til\n"
-"                                      fullskjermmodus; gjelder bare ett\n"
-"                                      vindu; kan angis en gang for\n"
-"                                      hvert vindu du starter fra\n"
-"                                      kommnadolinjen."
 
-#: ../terminal/main.c:95
-msgid ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
-msgstr ""
-"  --maximize                          Maksimer sist angitte\n"
-"                                      vindu. Gjelder bare ett vindu,\n"
-"                                      kan angis en gang for hvert vindu\n"
-"                                      du starter fra kommandolinjen"
-
-#: ../terminal/main.c:99
-msgid ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-menubar                      Skru på menylinjen for sist angitte\n"
-"                                      vindu; gjelder bare ett vindu;\n"
-"                                      kan angis en gang for hvert vindu\n"
-"                                      du starter fra kommandolinjen"
-
-#: ../terminal/main.c:104
-msgid ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --hide-menubar                      Skru av menylinjen for sist angitte\n"
-"                                      vindu; gjelder bare ett vindu;\n"
-"                                      kan angis en gang for hvert vindu\n"
-"                                      du starter fra kommandolinjen"
-
-#: ../terminal/main.c:109
-msgid ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --show-borders                      Vis kantlinjer for sist angitte\n"
-"                                      vindu; gjelder bare ett vindu;\n"
-"                                      kan angis en gang for hvert vindu\n"
-"                                      du starter fra kommandolinjen"
-
-#: ../terminal/main.c:114
-msgid ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --hide-borders                      Skjul kantlinjer for sist angitte\n"
-"                                      vindu; gjelder bare ett vindu;\n"
-"                                      kan angis en gang for hvert vindu\n"
-"                                      du starter fra kommandolinjen"
+#. parameter of --startup-id
+#: ../terminal/main.c:87
+#, fuzzy
+msgid "string"
+msgstr "Advarsel"
 
-#: ../terminal/main.c:119
-msgid ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-toolbars                     Vis verktøylinjer for sist angitte\n"
-"                                      vindu; gjelder bare ett vindu;\n"
-"                                      kan angis en gang for hvert vindu\n"
-"                                      du starter fra kommandolinjen"
+#. parameter of --icon
+#: ../terminal/main.c:89
+#, fuzzy
+msgid "icon"
+msgstr "Aksjon"
 
-#: ../terminal/main.c:124
-msgid ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#: ../terminal/main.c:91
+#, c-format
+msgid "See the %s man page for full explanation of the options above."
 msgstr ""
-"  --hide-toolbars                     Skjul verktøylinjer for sist angitte\n"
-"                                      vindu; gjelder bare ett vindu;\n"
-"                                      kan angis en gang for hvert vindu\n"
-"                                      du starter fra kommandolinjen"
 
-#: ../terminal/main.c:151 ../terminal/terminal-preferences.c:1263
+#: ../terminal/main.c:118 ../terminal/terminal-preferences.c:1263
 #: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../terminal/main.c:173
+#: ../terminal/main.c:135
 #, c-format
 msgid ""
 "%s (Xfce %s)\n"
@@ -304,31 +122,26 @@ msgstr ""
 "\n"
 "Rapporter programfeil til <%s>.\n"
 
-#: ../terminal/main.c:267
+#: ../terminal/main.c:239
 #, c-format
 msgid "Unable to register terminal service: %s\n"
 msgstr "Klarte ikke registerer terminaltjeneste: %s\n"
 
-#: ../terminal/main.c:276
-#, c-format
-msgid "Unable to launch terminal: %s\n"
-msgstr "Klarte ikke å starte terminal: %s\n"
-
-#: ../terminal/terminal-app.c:551
+#: ../terminal/terminal-app.c:554
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "Ugyldig geomtriangivelse «%s»\n"
 
-#: ../terminal/terminal-dbus.c:114
+#: ../terminal/terminal-dbus.c:108
 msgid "User id mismatch"
 msgstr "Brukerid stemmer ikke"
 
-#: ../terminal/terminal-dbus.c:146
+#: ../terminal/terminal-dbus.c:134
 #, c-format
 msgid "D-BUS message bus disconnected, exiting...\n"
 msgstr "D-BUS meldingsbuss frakoblet, avslutter ...\n"
 
-#: ../terminal/terminal-dbus.c:208
+#: ../terminal/terminal-dbus.c:196
 #, c-format
 msgid "Unable to register object %s"
 msgstr "Klarte ikke å registerer objekt %s"
@@ -350,7 +163,7 @@ msgstr ""
 msgid "Failed to open the documentation browser"
 msgstr "Klarte ikke å åpne dokumentleseren"
 
-#: ../terminal/terminal-options.c:189
+#: ../terminal/terminal-options.c:206
 #, c-format
 msgid ""
 "Option \"--default-display\" requires specifying the default X display as "
@@ -358,7 +171,7 @@ msgid ""
 msgstr ""
 "Valget «--default-display» krever at du angir standard X-display som argument."
 
-#: ../terminal/terminal-options.c:204
+#: ../terminal/terminal-options.c:221
 #, c-format
 msgid ""
 "Option \"--default-working-directory\" requires specifying the default "
@@ -367,13 +180,7 @@ msgstr ""
 "Valget «--default-working-directory» krever at du angir standard arbeidsmappe "
 "som argument"
 
-#: ../terminal/terminal-options.c:235
-#, c-format
-msgid ""
-"Option \"--sm-client-id\" requires specifying the session id as its parameter"
-msgstr "Valget «--sm-client-id» krever at du angir økt-id som argument"
-
-#: ../terminal/terminal-options.c:250
+#: ../terminal/terminal-options.c:237
 #, c-format
 msgid ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
@@ -382,7 +189,7 @@ msgstr ""
 "Valget «--execute/-x» krever at du angir kommandoen som skal kjøres påresten "
 "av kommandolinjen"
 
-#: ../terminal/terminal-options.c:267
+#: ../terminal/terminal-options.c:254
 #, c-format
 msgid ""
 "Option \"--command/-e\" requires specifying the command to run as its "
@@ -391,7 +198,7 @@ msgstr ""
 "Valget «--command/-e» krever at du angir kommandoen som skal kjøres som "
 "argument"
 
-#: ../terminal/terminal-options.c:284
+#: ../terminal/terminal-options.c:271
 #, c-format
 msgid ""
 "Option \"--working-directory\" requires specifying the working directory as "
@@ -399,36 +206,36 @@ msgid ""
 msgstr ""
 "Valget «--working-directory» krever at du angir arbeidskatalogen som argument"
 
-#: ../terminal/terminal-options.c:299
+#: ../terminal/terminal-options.c:286
 #, c-format
 msgid "Option \"--title/-T\" requires specifying the title as its parameter"
 msgstr "Valget «--title/-T» krever at du angir tittel som argument"
 
-#: ../terminal/terminal-options.c:319
+#: ../terminal/terminal-options.c:305
 #, c-format
 msgid ""
 "Option \"--display\" requires specifying the X display as its parameters"
 msgstr "Valget «--display» krever at du angir X-skjerm som argument"
 
-#: ../terminal/terminal-options.c:334
+#: ../terminal/terminal-options.c:320
 #, c-format
 msgid ""
 "Option \"--geometry\" requires specifying the window geometry as its "
 "parameter"
 msgstr "Valget «--geometry» krever at du angir vindusgeometrien som argument"
 
-#: ../terminal/terminal-options.c:349
+#: ../terminal/terminal-options.c:335
 #, c-format
 msgid "Option \"--role\" requires specifying the window role as its parameter"
 msgstr "Valget «--role» krever at du angir vindusrollen som argument"
 
-#: ../terminal/terminal-options.c:364
+#: ../terminal/terminal-options.c:350
 #, c-format
 msgid ""
 "Option \"--startup-id\" requires specifying the startup id as its parameter"
 msgstr "Valget «--startup-id» krever at du angir oppstarttid som argument"
 
-#: ../terminal/terminal-options.c:379
+#: ../terminal/terminal-options.c:365
 #, c-format
 msgid ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
@@ -436,7 +243,7 @@ msgid ""
 msgstr ""
 "Valget «--icon/-I» krever at du angir et ikonnavn eller filnavnet til et ikon"
 
-#: ../terminal/terminal-options.c:435
+#: ../terminal/terminal-options.c:419
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Ukjent valgt «%s»"
@@ -505,7 +312,7 @@ msgstr "Fullskjerm"
 msgid "Set Title"
 msgstr "Sett tittel"
 
-#: ../terminal/terminal-preferences.c:464
+#: ../terminal/terminal-preferences.c:464 ../terminal/terminal-window.c:237
 msgid "Reset"
 msgstr "Nullstill"
 
@@ -802,6 +609,11 @@ msgstr "_Nullstill"
 msgid "Reset and C_lear"
 msgstr "_Tøm og nullstill"
 
+#: ../terminal/terminal-window.c:238
+#, fuzzy
+msgid "Reset and clear"
+msgstr "Tøm og nullstill"
+
 #: ../terminal/terminal-window.c:239
 msgid "_Go"
 msgstr "_Gå til"
@@ -1422,3 +1234,251 @@ msgstr "_Oppdater utmp/wtmp oppføring når kommandoen startes"
 #: ../Terminal.glade.h:115
 msgid "seconds"
 msgstr "sekunder"
+
+#~ msgid ""
+#~ "  -h, --help                          Print this help message and exit"
+#~ msgstr ""
+#~ "  -h, --help                          Skriv ut denne meldingen og avslutt"
+
+#~ msgid ""
+#~ "  -V, --version                       Print version information and exit"
+#~ msgstr ""
+#~ "  -V, --version                       Skriv ut versjonsinformasjon og "
+#~ "avslutt"
+
+#~ msgid ""
+#~ "  --disable-server                    Do not register with the D-BUS\n"
+#~ "                                      session message bus"
+#~ msgstr ""
+#~ "  --disable-server                    Ikke registerer/bruk D-BUS\n"
+#~ "                                      øktmeldingsbuss"
+
+#~ msgid "  --default-display=DISPLAY           default X display to use"
+#~ msgstr ""
+#~ "  --default-display=DISPLAY           standard X skjerm som skal brukes"
+
+#~ msgid ""
+#~ "  --default-working-directory=DIRNAME Set the default terminal's working\n"
+#~ "                                      directory"
+#~ msgstr ""
+#~ "  --default-working-directory=MAPPENAVN Sett teminalens standard "
+#~ "arbeidsmappe"
+
+#~ msgid ""
+#~ "  --tab                               Open a new tab in the last-"
+#~ "specified\n"
+#~ "                                      window; more than one of these\n"
+#~ "                                      options can be provided"
+#~ msgstr ""
+#~ "  --tab                               Lag ny fane i sist angitte vindu\n"
+#~ "                                      det tillates flere av disse\n"
+#~ "                                      samtidig"
+
+#~ msgid ""
+#~ "  --window                            Open a new window containing one "
+#~ "tab;\n"
+#~ "                                      more than one of these options can "
+#~ "be\n"
+#~ "                                      provided"
+#~ msgstr ""
+#~ "  --window                            Lag nytt vindu med en fane;\n"
+#~ "                                      det tillates flere av disse\n"
+#~ "                                      samtidig"
+
+#~ msgid ""
+#~ "  -x, --execute                       Execute the remainder of the "
+#~ "command\n"
+#~ "                                      line inside the terminal"
+#~ msgstr ""
+#~ "  -x, --execute                       Kjør resten av kommando-\n"
+#~ "                                      linjen inne i terminalen"
+
+#~ msgid ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+#~ msgstr ""
+#~ "  -e, --command=STRING                Kjør argumentet til denne "
+#~ "oppsjonen\n"
+#~ "                                      inne i terminalen"
+
+#~ msgid ""
+#~ "  --working-directory=DIRNAME         Set the terminal's working directory"
+#~ msgstr ""
+#~ "  --working-directory=DIRNAME         Sett terminalens arbeidskatalog"
+
+#~ msgid "  -T, --title=TITLE                   Set the terminal's title"
+#~ msgstr "  -T, --title=TITTEL                   Sett terminalens tittel"
+
+#~ msgid ""
+#~ "  -H, --hold                          Do not immediately destroy the tab\n"
+#~ "                                      when the child command exits"
+#~ msgstr ""
+#~ "  -H, --hold                          Ikke fjern faner øyeblikkelig\n"
+#~ "                                      når underprosessen avsluttes"
+
+#~ msgid ""
+#~ "  --display=DISPLAY                   X display to use for the last-\n"
+#~ "                                      specified window"
+#~ msgstr ""
+#~ "  --display=DISPLAY                   X skjerm som skal brukes for det "
+#~ "sist\n"
+#~ "                                      spesifiserte vinduet"
+
+#~ msgid ""
+#~ "  --geometry=GEOMETRY                 X geometry specification (see \"X"
+#~ "\"\n"
+#~ "                                      man page), can be specified once "
+#~ "per\n"
+#~ "                                      window to be opened"
+#~ msgstr ""
+#~ "  --geometry=GEOMETRI                 X geometri angivelse (se «X»\n"
+#~ "                                      manualside), kan angis en gang\n"
+#~ "                                      per vindu som åpnes"
+
+#~ msgid ""
+#~ "  --role=ROLE                         Set the role for the last-"
+#~ "specified\n"
+#~ "                                      window; applies to only one "
+#~ "window;\n"
+#~ "                                      can be specified once for each "
+#~ "window\n"
+#~ "                                      you create from the command line"
+#~ msgstr ""
+#~ "  --role=ROLLE                        Sett rollen for sist angitte\n"
+#~ "                                      vindu. Gjelder bare ett vindu,\n"
+#~ "                                      kan angis en gang for hvert vindu\n"
+#~ "                                      du starter fra kommandolinjen"
+
+#~ msgid ""
+#~ "  --startup-id=STRING                 ID for the startup notification\n"
+#~ "                                      protocol"
+#~ msgstr ""
+#~ "  --startup-id=STRENG                 ID for oppstartsvarsel\n"
+#~ "                                      protokoll"
+
+#~ msgid ""
+#~ "  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
+#~ "                                      name or filename"
+#~ msgstr ""
+#~ "  -I, --icon=IKON                     Sett terminalens ikon fra ikonnav\n"
+#~ "                                      eller filnavn.nne oppsjonen"
+
+#~ msgid ""
+#~ "  --fullscreen                        Set the last-specified window into\n"
+#~ "                                      fullscreen mode; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --fullscreen                        Sett sist angitte vindu til\n"
+#~ "                                      fullskjermmodus; gjelder bare ett\n"
+#~ "                                      vindu; kan angis en gang for\n"
+#~ "                                      hvert vindu du starter fra\n"
+#~ "                                      kommnadolinjen."
+
+#~ msgid ""
+#~ "  --maximize                          Maximize the last-specified "
+#~ "window;\n"
+#~ "                                      applies to only one window; can be\n"
+#~ "                                      specified once for each window you\n"
+#~ "                                      create from the command line"
+#~ msgstr ""
+#~ "  --maximize                          Maksimer sist angitte\n"
+#~ "                                      vindu. Gjelder bare ett vindu,\n"
+#~ "                                      kan angis en gang for hvert vindu\n"
+#~ "                                      du starter fra kommandolinjen"
+
+#~ msgid ""
+#~ "  --show-menubar                      Turn on the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-menubar                      Skru på menylinjen for sist "
+#~ "angitte\n"
+#~ "                                      vindu; gjelder bare ett vindu;\n"
+#~ "                                      kan angis en gang for hvert vindu\n"
+#~ "                                      du starter fra kommandolinjen"
+
+#~ msgid ""
+#~ "  --hide-menubar                      Turn off the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-menubar                      Skru av menylinjen for sist "
+#~ "angitte\n"
+#~ "                                      vindu; gjelder bare ett vindu;\n"
+#~ "                                      kan angis en gang for hvert vindu\n"
+#~ "                                      du starter fra kommandolinjen"
+
+#~ msgid ""
+#~ "  --show-borders                      Turn on the window decorations for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --show-borders                      Vis kantlinjer for sist angitte\n"
+#~ "                                      vindu; gjelder bare ett vindu;\n"
+#~ "                                      kan angis en gang for hvert vindu\n"
+#~ "                                      du starter fra kommandolinjen"
+
+#~ msgid ""
+#~ "  --hide-borders                      Turn off the window decorations "
+#~ "for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --hide-borders                      Skjul kantlinjer for sist angitte\n"
+#~ "                                      vindu; gjelder bare ett vindu;\n"
+#~ "                                      kan angis en gang for hvert vindu\n"
+#~ "                                      du starter fra kommandolinjen"
+
+#~ msgid ""
+#~ "  --show-toolbars                     Turn on the toolbars for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-toolbars                     Vis verktøylinjer for sist angitte\n"
+#~ "                                      vindu; gjelder bare ett vindu;\n"
+#~ "                                      kan angis en gang for hvert vindu\n"
+#~ "                                      du starter fra kommandolinjen"
+
+#~ msgid ""
+#~ "  --hide-toolbars                     Turn off the toolbars for the "
+#~ "last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-toolbars                     Skjul verktøylinjer for sist "
+#~ "angitte\n"
+#~ "                                      vindu; gjelder bare ett vindu;\n"
+#~ "                                      kan angis en gang for hvert vindu\n"
+#~ "                                      du starter fra kommandolinjen"
+
+#~ msgid "Unable to launch terminal: %s\n"
+#~ msgstr "Klarte ikke å starte terminal: %s\n"
+
+#~ msgid ""
+#~ "Option \"--sm-client-id\" requires specifying the session id as its "
+#~ "parameter"
+#~ msgstr "Valget «--sm-client-id» krever at du angir økt-id som argument"
diff --git a/po/nl.po b/po/nl.po
index 220d680..725dd1f 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Terminal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 11:48+0100\n"
+"POT-Creation-Date: 2009-12-14 16:03+0100\n"
 "PO-Revision-Date: 2009-08-15 15:16-0800\n"
 "Last-Translator: Auke Kok <auke-jan.h.kok at intel.com>\n"
 "Language-Team: os-cillation <info at os-cillation.com>\n"
@@ -17,282 +17,88 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Dutch\n"
 
-#: ../terminal/main.c:46
+#: ../terminal/main.c:48
 msgid "Usage:"
 msgstr "Gebruik:"
 
-#: ../terminal/main.c:47
+#: ../terminal/main.c:48
 msgid "OPTION"
 msgstr "OPTIE"
 
-#: ../terminal/main.c:49
+#: ../terminal/main.c:53
 msgid "General Options"
 msgstr "Algemene instellingen"
 
-#: ../terminal/main.c:50
-msgid "  -h, --help                          Print this help message and exit"
-msgstr ""
-"  -h, --help                          Deze tekst weergeven en afsluiten"
-
-#: ../terminal/main.c:51
-msgid ""
-"  -V, --version                       Print version information and exit"
-msgstr ""
-"  -V, --version                       Versie-informatie weergeven en "
-"afsluiten"
+#. parameter of --default-display
+#. parameter of --display
+#: ../terminal/main.c:55 ../terminal/main.c:81
+#, fuzzy
+msgid "display"
+msgstr "Is niet weergegeven"
 
-#: ../terminal/main.c:52
-msgid ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
+#. parameter of --default-working-directory
+#. parameter of --working-directory
+#: ../terminal/main.c:57 ../terminal/main.c:72
+msgid "directory"
 msgstr ""
-"  --disable-server                    Niet aanmelden bij D-BUS\n"
-"                                      session message bus"
-
-#: ../terminal/main.c:54
-msgid "  --default-display=DISPLAY           default X display to use"
-msgstr "  --default-display=DISPLAY           standaard X display"
 
-#: ../terminal/main.c:55
-msgid ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
-msgstr ""
-"  --default-working-directory=DIRNAAM De standaard werk-directory van\n"
-"                                      terminal instellen"
-
-#: ../terminal/main.c:58
+#: ../terminal/main.c:61
 msgid "Window or Tab Separators"
 msgstr "Venster- of tabbladscheidingen"
 
-#: ../terminal/main.c:59
-msgid ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-msgstr ""
-"  --tab                               Een nieuwe tab openen in laatst-\n"
-"                                      opgegeven venster; kan meer dan een\n"
-"                                      keer worden gebruikt"
-
-#: ../terminal/main.c:62
-msgid ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-msgstr ""
-"  --window                            Een nieuw venster met een tab openen;\n"
-"                                      kan meer dan een keer worden gebruikt"
-
 #: ../terminal/main.c:66
 msgid "Tab Options"
 msgstr "Tabbladopties"
 
-#: ../terminal/main.c:67
-msgid ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-msgstr ""
-"  -x, --execute                       De rest van de regel uitvoeren als\n"
-"                                      commando in de terminal"
-
-#: ../terminal/main.c:69
-msgid ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-msgstr ""
-"  -e, --command=STRING                Het argument van deze optie uitvoeren\n"
-"                                      als commando in de terminal"
-
-#: ../terminal/main.c:71
-msgid ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
-msgstr "  --working-directory=DIRNAAM         De werk-directory instellen"
-
-#: ../terminal/main.c:72
-msgid "  -T, --title=TITLE                   Set the terminal's title"
-msgstr ""
-"  -T, --title=TITEL                   De titel van het terminalvenster "
-"instellen"
+#. parameter of --command
+#: ../terminal/main.c:68
+#, fuzzy
+msgid "command"
+msgstr "Commando"
 
-#: ../terminal/main.c:73
-msgid ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-msgstr ""
-"  -H, --hold                          Tabblad niet direct sluiten wanneer\n"
-"                                      wanneer het commando eindigt."
+#. parameter of --title
+#: ../terminal/main.c:70
+#, fuzzy
+msgid "title"
+msgstr "Titel"
 
-#: ../terminal/main.c:76
+#: ../terminal/main.c:79
 msgid "Window Options"
 msgstr "Vensteropties"
 
-#: ../terminal/main.c:77
-msgid ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
-msgstr ""
-"  --display=DISPLAY                   X display voor laatst-\n"
-"                                      gegeven venster"
-
-#: ../terminal/main.c:79
-msgid ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
-msgstr ""
-"  --geometry=GEOMETRY                 X geometry (zie \"X\" documentatie),\n"
-"                                      kan een keer per te openen venster\n"
-"                                      opgegeven worden"
-
-#: ../terminal/main.c:82
-msgid ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
-msgstr ""
-"  --role=ROL                          Rol voor laastopgegeven venster;\n"
-"                                      geldt voor één venster;\n"
-"                                      kan één keer per te openen venster\n"
-"                                      opgegeven worden"
-
-#: ../terminal/main.c:86
-msgid ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
-msgstr ""
-"  --startup-id=STRING                 ID voor startup notification\n"
-"                                      protocol"
-
-#: ../terminal/main.c:88
-msgid ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
-msgstr ""
-"  -I, --icon=PICTOGRAM                Gebruik het gegeven pictogram\n"
-"                                      als pictogram voor het terminalvenster"
-
-#: ../terminal/main.c:90
-msgid ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --fullscreen                        Volledig scherm instellen voor\n"
-"                                      laatst opgegeven venster;\n"
-"                                      geldt voor één venster;\n"
-"                                      kan één keer per te openen venster\n"
-"                                      opgegeven worden"
-
-#: ../terminal/main.c:95
-msgid ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
-msgstr ""
-"  --maximize                          Maximaliseer het laatst "
-"gespecifceerde\n"
-"                                      venster. Werkt alleen op een venster; "
-"kan\n"
-"                                      eenmaal gespecificeerd worden voor "
-"elk\n"
-"                                      venster dat je vanaf de commandoregel\n"
-"                                      aanmaakt."
-
-#: ../terminal/main.c:99
-msgid ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-menubar                      Menubalk weergeven voor\n"
-"                                      laatsopgegeven venster;\n"
-"                                      geldt voor een venster;\n"
-"                                      kan een keer per te openen venster\n"
-"                                      opgegeven worden"
-
-#: ../terminal/main.c:104
-msgid ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#. parameter of --geometry
+#: ../terminal/main.c:83
+msgid "geometry"
 msgstr ""
-"  --hide-menubar                      Menubalk verbergen voor\n"
-"                                      laatsopgegeven venster;\n"
-"                                      geldt voor een venster;\n"
-"                                      kan een keer per te openen venster\n"
-"                                      opgegeven worden"
 
-#: ../terminal/main.c:109
-msgid ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
+#. parameter of --role
+#: ../terminal/main.c:85
+msgid "role"
 msgstr ""
-"  --show-borders                      Vensterdecoraties tonen voor\n"
-"                                      laatsopgegeven venster;\n"
-"                                      geldt voor een venster;\n"
-"                                      kan een keer per te openen venster\n"
-"                                      opgegeven worden"
 
-#: ../terminal/main.c:114
-msgid ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --hide-borders                      Vensterdecoraties verbergen voor\n"
-"                                      laatsopgegeven venster;\n"
-"                                      geldt voor een venster;\n"
-"                                      kan een keer per te openen venster\n"
-"                                      opgegeven worden"
+#. parameter of --startup-id
+#: ../terminal/main.c:87
+#, fuzzy
+msgid "string"
+msgstr "Waarschuwing"
 
-#: ../terminal/main.c:119
-msgid ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-toolbars                     Werkbalken weergeven voor\n"
-"                                      laatsopgegeven venster;\n"
-"                                      geldt voor een venster;\n"
-"                                      kan een keer per te openen venster\n"
-"                                      opgegeven worden"
+#. parameter of --icon
+#: ../terminal/main.c:89
+#, fuzzy
+msgid "icon"
+msgstr "Actie"
 
-#: ../terminal/main.c:124
-msgid ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#: ../terminal/main.c:91
+#, c-format
+msgid "See the %s man page for full explanation of the options above."
 msgstr ""
-"  --hide-toolbars                     Werkbalken verbergen voor\n"
-"                                      laatsopgegeven venster;\n"
-"                                      geldt voor een venster;\n"
-"                                      kan een keer per te openen venster\n"
-"                                      opgegeven worden"
 
-#: ../terminal/main.c:151 ../terminal/terminal-preferences.c:1263
+#: ../terminal/main.c:118 ../terminal/terminal-preferences.c:1263
 #: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../terminal/main.c:173
+#: ../terminal/main.c:135
 #, c-format
 msgid ""
 "%s (Xfce %s)\n"
@@ -317,32 +123,27 @@ msgstr ""
 "\n"
 "Rapporteer fouten aan <%s>.\n"
 
-#: ../terminal/main.c:267
+#: ../terminal/main.c:239
 #, c-format
 msgid "Unable to register terminal service: %s\n"
 msgstr "Kan terminal service niet registreren: %s\n"
 
-#: ../terminal/main.c:276
-#, c-format
-msgid "Unable to launch terminal: %s\n"
-msgstr "Kan terminal niet starten: %s\n"
-
-#: ../terminal/terminal-app.c:551
+#: ../terminal/terminal-app.c:554
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "Ongeldige geometrie \"%s\"\n"
 
-#: ../terminal/terminal-dbus.c:114
+#: ../terminal/terminal-dbus.c:108
 msgid "User id mismatch"
 msgstr "Ongeldige gebruikers-id"
 
-#: ../terminal/terminal-dbus.c:146
+#: ../terminal/terminal-dbus.c:134
 #, c-format
 msgid "D-BUS message bus disconnected, exiting...\n"
 msgstr ""
 "Verbinding met D-BUS message bus is verbroken, bezig met afsluiten...\n"
 
-#: ../terminal/terminal-dbus.c:208
+#: ../terminal/terminal-dbus.c:196
 #, c-format
 msgid "Unable to register object %s"
 msgstr "Kan object niet registreren: %s"
@@ -364,14 +165,14 @@ msgstr ""
 msgid "Failed to open the documentation browser"
 msgstr "De documentatie browser kan niet worden gestart"
 
-#: ../terminal/terminal-options.c:189
+#: ../terminal/terminal-options.c:206
 #, c-format
 msgid ""
 "Option \"--default-display\" requires specifying the default X display as "
 "its parameter"
 msgstr "De optie \"--default-display\" vereist een X display als argument"
 
-#: ../terminal/terminal-options.c:204
+#: ../terminal/terminal-options.c:221
 #, c-format
 msgid ""
 "Option \"--default-working-directory\" requires specifying the default "
@@ -379,63 +180,57 @@ msgid ""
 msgstr ""
 "De option \"--default-working-directory\" vereist een directory als argument"
 
-#: ../terminal/terminal-options.c:235
-#, c-format
-msgid ""
-"Option \"--sm-client-id\" requires specifying the session id as its parameter"
-msgstr "De optie \"--sm-client-id\" vereist een sessie-id als argument"
-
-#: ../terminal/terminal-options.c:250
+#: ../terminal/terminal-options.c:237
 #, c-format
 msgid ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
 "of the command line"
 msgstr "De optie \"--execute/-x\" vereist een commandoregel als argument"
 
-#: ../terminal/terminal-options.c:267
+#: ../terminal/terminal-options.c:254
 #, c-format
 msgid ""
 "Option \"--command/-e\" requires specifying the command to run as its "
 "parameter"
 msgstr "De optie \"--command/-e\" vereist een commando als argument"
 
-#: ../terminal/terminal-options.c:284
+#: ../terminal/terminal-options.c:271
 #, c-format
 msgid ""
 "Option \"--working-directory\" requires specifying the working directory as "
 "its parameter"
 msgstr "De option \"--working-directory\" vereist de directory als argument"
 
-#: ../terminal/terminal-options.c:299
+#: ../terminal/terminal-options.c:286
 #, c-format
 msgid "Option \"--title/-T\" requires specifying the title as its parameter"
 msgstr "De optie \"--title/-T\" vereist de titel als argument"
 
-#: ../terminal/terminal-options.c:319
+#: ../terminal/terminal-options.c:305
 #, c-format
 msgid ""
 "Option \"--display\" requires specifying the X display as its parameters"
 msgstr "De optie \"--display\" vereist een X display als argument"
 
-#: ../terminal/terminal-options.c:334
+#: ../terminal/terminal-options.c:320
 #, c-format
 msgid ""
 "Option \"--geometry\" requires specifying the window geometry as its "
 "parameter"
 msgstr "De optie \"--geometry\" vereist de venstergeomety als argument"
 
-#: ../terminal/terminal-options.c:349
+#: ../terminal/terminal-options.c:335
 #, c-format
 msgid "Option \"--role\" requires specifying the window role as its parameter"
 msgstr "De optie \"--role\" vereist een venster-rol als argument"
 
-#: ../terminal/terminal-options.c:364
+#: ../terminal/terminal-options.c:350
 #, c-format
 msgid ""
 "Option \"--startup-id\" requires specifying the startup id as its parameter"
 msgstr "De optie \"--startup-id\" vereist een id als argument"
 
-#: ../terminal/terminal-options.c:379
+#: ../terminal/terminal-options.c:365
 #, c-format
 msgid ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
@@ -443,7 +238,7 @@ msgid ""
 msgstr ""
 "De optie \"--icon/-I\" vereist een pictogramnaam of bestandsnaam als argument"
 
-#: ../terminal/terminal-options.c:435
+#: ../terminal/terminal-options.c:419
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Onbekende optie \"%s\""
@@ -512,7 +307,7 @@ msgstr "Volledig scherm"
 msgid "Set Title"
 msgstr "Titel instellen"
 
-#: ../terminal/terminal-preferences.c:464
+#: ../terminal/terminal-preferences.c:464 ../terminal/terminal-window.c:237
 msgid "Reset"
 msgstr "Herinitialiseren"
 
@@ -809,6 +604,11 @@ msgstr "He_rinitialiseren"
 msgid "Reset and C_lear"
 msgstr "Herinitia_liseren en wissen"
 
+#: ../terminal/terminal-window.c:238
+#, fuzzy
+msgid "Reset and clear"
+msgstr "Herinitialiseren en wissen"
+
 #: ../terminal/terminal-window.c:239
 msgid "_Go"
 msgstr "_Ga naar"
@@ -1427,6 +1227,266 @@ msgstr "utmp/wtmp records _vernieuwen wanneer opdracht wordt uitgevoerd"
 msgid "seconds"
 msgstr "seconden"
 
+#~ msgid ""
+#~ "  -h, --help                          Print this help message and exit"
+#~ msgstr ""
+#~ "  -h, --help                          Deze tekst weergeven en afsluiten"
+
+#~ msgid ""
+#~ "  -V, --version                       Print version information and exit"
+#~ msgstr ""
+#~ "  -V, --version                       Versie-informatie weergeven en "
+#~ "afsluiten"
+
+#~ msgid ""
+#~ "  --disable-server                    Do not register with the D-BUS\n"
+#~ "                                      session message bus"
+#~ msgstr ""
+#~ "  --disable-server                    Niet aanmelden bij D-BUS\n"
+#~ "                                      session message bus"
+
+#~ msgid "  --default-display=DISPLAY           default X display to use"
+#~ msgstr "  --default-display=DISPLAY           standaard X display"
+
+#~ msgid ""
+#~ "  --default-working-directory=DIRNAME Set the default terminal's working\n"
+#~ "                                      directory"
+#~ msgstr ""
+#~ "  --default-working-directory=DIRNAAM De standaard werk-directory van\n"
+#~ "                                      terminal instellen"
+
+#~ msgid ""
+#~ "  --tab                               Open a new tab in the last-"
+#~ "specified\n"
+#~ "                                      window; more than one of these\n"
+#~ "                                      options can be provided"
+#~ msgstr ""
+#~ "  --tab                               Een nieuwe tab openen in laatst-\n"
+#~ "                                      opgegeven venster; kan meer dan "
+#~ "een\n"
+#~ "                                      keer worden gebruikt"
+
+#~ msgid ""
+#~ "  --window                            Open a new window containing one "
+#~ "tab;\n"
+#~ "                                      more than one of these options can "
+#~ "be\n"
+#~ "                                      provided"
+#~ msgstr ""
+#~ "  --window                            Een nieuw venster met een tab "
+#~ "openen;\n"
+#~ "                                      kan meer dan een keer worden "
+#~ "gebruikt"
+
+#~ msgid ""
+#~ "  -x, --execute                       Execute the remainder of the "
+#~ "command\n"
+#~ "                                      line inside the terminal"
+#~ msgstr ""
+#~ "  -x, --execute                       De rest van de regel uitvoeren als\n"
+#~ "                                      commando in de terminal"
+
+#~ msgid ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+#~ msgstr ""
+#~ "  -e, --command=STRING                Het argument van deze optie "
+#~ "uitvoeren\n"
+#~ "                                      als commando in de terminal"
+
+#~ msgid ""
+#~ "  --working-directory=DIRNAME         Set the terminal's working directory"
+#~ msgstr "  --working-directory=DIRNAAM         De werk-directory instellen"
+
+#~ msgid "  -T, --title=TITLE                   Set the terminal's title"
+#~ msgstr ""
+#~ "  -T, --title=TITEL                   De titel van het terminalvenster "
+#~ "instellen"
+
+#~ msgid ""
+#~ "  -H, --hold                          Do not immediately destroy the tab\n"
+#~ "                                      when the child command exits"
+#~ msgstr ""
+#~ "  -H, --hold                          Tabblad niet direct sluiten "
+#~ "wanneer\n"
+#~ "                                      wanneer het commando eindigt."
+
+#~ msgid ""
+#~ "  --display=DISPLAY                   X display to use for the last-\n"
+#~ "                                      specified window"
+#~ msgstr ""
+#~ "  --display=DISPLAY                   X display voor laatst-\n"
+#~ "                                      gegeven venster"
+
+#~ msgid ""
+#~ "  --geometry=GEOMETRY                 X geometry specification (see \"X"
+#~ "\"\n"
+#~ "                                      man page), can be specified once "
+#~ "per\n"
+#~ "                                      window to be opened"
+#~ msgstr ""
+#~ "  --geometry=GEOMETRY                 X geometry (zie \"X\" "
+#~ "documentatie),\n"
+#~ "                                      kan een keer per te openen venster\n"
+#~ "                                      opgegeven worden"
+
+#~ msgid ""
+#~ "  --role=ROLE                         Set the role for the last-"
+#~ "specified\n"
+#~ "                                      window; applies to only one "
+#~ "window;\n"
+#~ "                                      can be specified once for each "
+#~ "window\n"
+#~ "                                      you create from the command line"
+#~ msgstr ""
+#~ "  --role=ROL                          Rol voor laastopgegeven venster;\n"
+#~ "                                      geldt voor één venster;\n"
+#~ "                                      kan één keer per te openen venster\n"
+#~ "                                      opgegeven worden"
+
+#~ msgid ""
+#~ "  --startup-id=STRING                 ID for the startup notification\n"
+#~ "                                      protocol"
+#~ msgstr ""
+#~ "  --startup-id=STRING                 ID voor startup notification\n"
+#~ "                                      protocol"
+
+#~ msgid ""
+#~ "  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
+#~ "                                      name or filename"
+#~ msgstr ""
+#~ "  -I, --icon=PICTOGRAM                Gebruik het gegeven pictogram\n"
+#~ "                                      als pictogram voor het "
+#~ "terminalvenster"
+
+#~ msgid ""
+#~ "  --fullscreen                        Set the last-specified window into\n"
+#~ "                                      fullscreen mode; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --fullscreen                        Volledig scherm instellen voor\n"
+#~ "                                      laatst opgegeven venster;\n"
+#~ "                                      geldt voor één venster;\n"
+#~ "                                      kan één keer per te openen venster\n"
+#~ "                                      opgegeven worden"
+
+#~ msgid ""
+#~ "  --maximize                          Maximize the last-specified "
+#~ "window;\n"
+#~ "                                      applies to only one window; can be\n"
+#~ "                                      specified once for each window you\n"
+#~ "                                      create from the command line"
+#~ msgstr ""
+#~ "  --maximize                          Maximaliseer het laatst "
+#~ "gespecifceerde\n"
+#~ "                                      venster. Werkt alleen op een "
+#~ "venster; kan\n"
+#~ "                                      eenmaal gespecificeerd worden voor "
+#~ "elk\n"
+#~ "                                      venster dat je vanaf de "
+#~ "commandoregel\n"
+#~ "                                      aanmaakt."
+
+#~ msgid ""
+#~ "  --show-menubar                      Turn on the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-menubar                      Menubalk weergeven voor\n"
+#~ "                                      laatsopgegeven venster;\n"
+#~ "                                      geldt voor een venster;\n"
+#~ "                                      kan een keer per te openen venster\n"
+#~ "                                      opgegeven worden"
+
+#~ msgid ""
+#~ "  --hide-menubar                      Turn off the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-menubar                      Menubalk verbergen voor\n"
+#~ "                                      laatsopgegeven venster;\n"
+#~ "                                      geldt voor een venster;\n"
+#~ "                                      kan een keer per te openen venster\n"
+#~ "                                      opgegeven worden"
+
+#~ msgid ""
+#~ "  --show-borders                      Turn on the window decorations for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --show-borders                      Vensterdecoraties tonen voor\n"
+#~ "                                      laatsopgegeven venster;\n"
+#~ "                                      geldt voor een venster;\n"
+#~ "                                      kan een keer per te openen venster\n"
+#~ "                                      opgegeven worden"
+
+#~ msgid ""
+#~ "  --hide-borders                      Turn off the window decorations "
+#~ "for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --hide-borders                      Vensterdecoraties verbergen voor\n"
+#~ "                                      laatsopgegeven venster;\n"
+#~ "                                      geldt voor een venster;\n"
+#~ "                                      kan een keer per te openen venster\n"
+#~ "                                      opgegeven worden"
+
+#~ msgid ""
+#~ "  --show-toolbars                     Turn on the toolbars for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-toolbars                     Werkbalken weergeven voor\n"
+#~ "                                      laatsopgegeven venster;\n"
+#~ "                                      geldt voor een venster;\n"
+#~ "                                      kan een keer per te openen venster\n"
+#~ "                                      opgegeven worden"
+
+#~ msgid ""
+#~ "  --hide-toolbars                     Turn off the toolbars for the "
+#~ "last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-toolbars                     Werkbalken verbergen voor\n"
+#~ "                                      laatsopgegeven venster;\n"
+#~ "                                      geldt voor een venster;\n"
+#~ "                                      kan een keer per te openen venster\n"
+#~ "                                      opgegeven worden"
+
+#~ msgid "Unable to launch terminal: %s\n"
+#~ msgstr "Kan terminal niet starten: %s\n"
+
+#~ msgid ""
+#~ "Option \"--sm-client-id\" requires specifying the session id as its "
+#~ "parameter"
+#~ msgstr "De optie \"--sm-client-id\" vereist een sessie-id als argument"
+
 #~ msgid "<b>Title:</b>"
 #~ msgstr "<b>Titel:</b>"
 
diff --git a/po/pa.po b/po/pa.po
index 03b4291..49ed85f 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Terminal 0.2.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 11:48+0100\n"
+"POT-Creation-Date: 2009-12-14 16:03+0100\n"
 "PO-Revision-Date: 2006-12-22 07:53+0530\n"
 "Last-Translator: A S Alam <apbrar at gmail.com>\n"
 "Language-Team: Punjabi <fedora-trans-pa at redhat.com>\n"
@@ -17,210 +17,91 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../terminal/main.c:46
+#: ../terminal/main.c:48
 msgid "Usage:"
 msgstr ""
 
-#: ../terminal/main.c:47
+#: ../terminal/main.c:48
 msgid "OPTION"
 msgstr ""
 
-#: ../terminal/main.c:49
+#: ../terminal/main.c:53
 #, fuzzy
 msgid "General Options"
 msgstr "ਸਧਾਰਨ"
 
-#: ../terminal/main.c:50
-msgid "  -h, --help                          Print this help message and exit"
-msgstr "  -h, --help                          ਇਹ ਸਹਾਇਤਾ ਸੁਨੇਹਾ ਛਾਪੋ ਅਤੇ ਬੰਦ ਕਰੋ"
-
-#: ../terminal/main.c:51
+#. parameter of --default-display
+#. parameter of --display
+#: ../terminal/main.c:55 ../terminal/main.c:81
 #, fuzzy
-msgid ""
-"  -V, --version                       Print version information and exit"
-msgstr "  -h, --help                          ਇਹ ਸਹਾਇਤਾ ਸੁਨੇਹਾ ਛਾਪੋ ਅਤੇ ਬੰਦ ਕਰੋ"
-
-#: ../terminal/main.c:52
-msgid ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
-msgstr ""
-
-#: ../terminal/main.c:54
-msgid "  --default-display=DISPLAY           default X display to use"
-msgstr ""
+msgid "display"
+msgstr "ਨਹੀਂ ਵੇਖਾਇਆ ਜਾਏਗਾ"
 
-#: ../terminal/main.c:55
-msgid ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
+#. parameter of --default-working-directory
+#. parameter of --working-directory
+#: ../terminal/main.c:57 ../terminal/main.c:72
+msgid "directory"
 msgstr ""
 
-#: ../terminal/main.c:58
+#: ../terminal/main.c:61
 msgid "Window or Tab Separators"
 msgstr ""
 
-#: ../terminal/main.c:59
-msgid ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-msgstr ""
-
-#: ../terminal/main.c:62
-msgid ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-msgstr ""
-
 #: ../terminal/main.c:66
 #, fuzzy
 msgid "Tab Options"
 msgstr "ਟੈਬ ਸਥਿਤੀ"
 
-#: ../terminal/main.c:67
-msgid ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-msgstr ""
-
-#: ../terminal/main.c:69
-msgid ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-msgstr ""
-
-#: ../terminal/main.c:71
-msgid ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
-msgstr ""
-
-#: ../terminal/main.c:72
-msgid "  -T, --title=TITLE                   Set the terminal's title"
-msgstr ""
+#. parameter of --command
+#: ../terminal/main.c:68
+#, fuzzy
+msgid "command"
+msgstr "<b>ਕਮਾਂਡ</b>"
 
-#: ../terminal/main.c:73
-msgid ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-msgstr ""
+#. parameter of --title
+#: ../terminal/main.c:70
+#, fuzzy
+msgid "title"
+msgstr "ਟਾਇਟਲ"
 
-#: ../terminal/main.c:76
+#: ../terminal/main.c:79
 #, fuzzy
 msgid "Window Options"
 msgstr "ਅਣਜਾਣ ਚੋਣ \"%s\""
 
-#: ../terminal/main.c:77
-msgid ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
+#. parameter of --geometry
+#: ../terminal/main.c:83
+msgid "geometry"
 msgstr ""
 
-#: ../terminal/main.c:79
-msgid ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
-msgstr ""
-
-#: ../terminal/main.c:82
-msgid ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
+#. parameter of --role
+#: ../terminal/main.c:85
+msgid "role"
 msgstr ""
 
-#: ../terminal/main.c:86
-msgid ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
-msgstr ""
-
-#: ../terminal/main.c:88
-msgid ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
-msgstr ""
-
-#: ../terminal/main.c:90
-msgid ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-
-#: ../terminal/main.c:95
-msgid ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
-msgstr ""
-
-#: ../terminal/main.c:99
-msgid ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-
-#: ../terminal/main.c:104
-msgid ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-
-#: ../terminal/main.c:109
-msgid ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-
-#: ../terminal/main.c:114
-msgid ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
+#. parameter of --startup-id
+#: ../terminal/main.c:87
+#, fuzzy
+msgid "string"
+msgstr "ਚੇਤਾਵਨੀ"
 
-#: ../terminal/main.c:119
-msgid ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
+#. parameter of --icon
+#: ../terminal/main.c:89
+#, fuzzy
+msgid "icon"
+msgstr "ਐਕਸ਼ਨ"
 
-#: ../terminal/main.c:124
-msgid ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#: ../terminal/main.c:91
+#, c-format
+msgid "See the %s man page for full explanation of the options above."
 msgstr ""
 
-#: ../terminal/main.c:151 ../terminal/terminal-preferences.c:1263
+#: ../terminal/main.c:118 ../terminal/terminal-preferences.c:1263
 #: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr "ਟਰਮੀਨਲ"
 
-#: ../terminal/main.c:173
+#: ../terminal/main.c:135
 #, c-format
 msgid ""
 "%s (Xfce %s)\n"
@@ -235,31 +116,26 @@ msgid ""
 "Please report bugs to <%s>.\n"
 msgstr ""
 
-#: ../terminal/main.c:267
+#: ../terminal/main.c:239
 #, c-format
 msgid "Unable to register terminal service: %s\n"
 msgstr "ਟਰਮੀਨਲ ਸੇਵਾ ਰਜਿਸਟਰ ਕਰਨ ਲਈ ਅਸਫ਼ਲ: %s\n"
 
-#: ../terminal/main.c:276
-#, c-format
-msgid "Unable to launch terminal: %s\n"
-msgstr "ਟਰਮੀਨਲ ਚਾਲੂ ਕਰਨ ਲਈ ਅਸਫ਼ਲ: %s\n"
-
-#: ../terminal/terminal-app.c:551
+#: ../terminal/terminal-app.c:554
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "ਗਲਤ ਜੁਮੈਟਰੀ ਲਾਇਨ \"%s\"\n"
 
-#: ../terminal/terminal-dbus.c:114
+#: ../terminal/terminal-dbus.c:108
 msgid "User id mismatch"
 msgstr "ਯੂਜਰ id ਰਲਦਾ ਨਹੀਂ"
 
-#: ../terminal/terminal-dbus.c:146
+#: ../terminal/terminal-dbus.c:134
 #, c-format
 msgid "D-BUS message bus disconnected, exiting...\n"
 msgstr ""
 
-#: ../terminal/terminal-dbus.c:208
+#: ../terminal/terminal-dbus.c:196
 #, c-format
 msgid "Unable to register object %s"
 msgstr "ਆਬਜੈਕਟ %s ਰਜਿਸਟਰ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
@@ -283,84 +159,78 @@ msgstr ""
 msgid "Failed to open the documentation browser"
 msgstr "ਡਾਕੂਮਿੰਟ ਬਰਾਊਜ਼ਰ ਖੋਲ੍ਹਣ ਲਈ ਫੇਲ੍ਹ"
 
-#: ../terminal/terminal-options.c:189
+#: ../terminal/terminal-options.c:206
 #, c-format
 msgid ""
 "Option \"--default-display\" requires specifying the default X display as "
 "its parameter"
 msgstr ""
 
-#: ../terminal/terminal-options.c:204
+#: ../terminal/terminal-options.c:221
 #, c-format
 msgid ""
 "Option \"--default-working-directory\" requires specifying the default "
 "working directory as its parameter"
 msgstr ""
 
-#: ../terminal/terminal-options.c:235
-#, c-format
-msgid ""
-"Option \"--sm-client-id\" requires specifying the session id as its parameter"
-msgstr ""
-
-#: ../terminal/terminal-options.c:250
+#: ../terminal/terminal-options.c:237
 #, c-format
 msgid ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
 "of the command line"
 msgstr ""
 
-#: ../terminal/terminal-options.c:267
+#: ../terminal/terminal-options.c:254
 #, c-format
 msgid ""
 "Option \"--command/-e\" requires specifying the command to run as its "
 "parameter"
 msgstr ""
 
-#: ../terminal/terminal-options.c:284
+#: ../terminal/terminal-options.c:271
 #, c-format
 msgid ""
 "Option \"--working-directory\" requires specifying the working directory as "
 "its parameter"
 msgstr ""
 
-#: ../terminal/terminal-options.c:299
+#: ../terminal/terminal-options.c:286
 #, c-format
 msgid "Option \"--title/-T\" requires specifying the title as its parameter"
 msgstr ""
 
-#: ../terminal/terminal-options.c:319
+#: ../terminal/terminal-options.c:305
 #, c-format
 msgid ""
 "Option \"--display\" requires specifying the X display as its parameters"
 msgstr ""
 
-#: ../terminal/terminal-options.c:334
+#: ../terminal/terminal-options.c:320
 #, c-format
 msgid ""
 "Option \"--geometry\" requires specifying the window geometry as its "
 "parameter"
 msgstr ""
 
-#: ../terminal/terminal-options.c:349
+#: ../terminal/terminal-options.c:335
 #, c-format
 msgid "Option \"--role\" requires specifying the window role as its parameter"
 msgstr ""
 
-#: ../terminal/terminal-options.c:364
+#: ../terminal/terminal-options.c:350
 #, c-format
 msgid ""
 "Option \"--startup-id\" requires specifying the startup id as its parameter"
 msgstr ""
 
-#: ../terminal/terminal-options.c:379
+#: ../terminal/terminal-options.c:365
 #, c-format
 msgid ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
 "parameter"
 msgstr ""
 
-#: ../terminal/terminal-options.c:435
+#: ../terminal/terminal-options.c:419
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "ਅਣਜਾਣ ਚੋਣ \"%s\""
@@ -429,7 +299,7 @@ msgstr "ਪੂਰੀ ਸਕਰੀਨ"
 msgid "Set Title"
 msgstr "ਟਾਇਟਲ ਦਿਓ"
 
-#: ../terminal/terminal-preferences.c:464
+#: ../terminal/terminal-preferences.c:464 ../terminal/terminal-window.c:237
 msgid "Reset"
 msgstr "ਮੁੜ-ਸੈੱਟ"
 
@@ -720,6 +590,11 @@ msgstr "ਮੁੜ-ਸੈੱਟ(_R)"
 msgid "Reset and C_lear"
 msgstr ""
 
+#: ../terminal/terminal-window.c:238
+#, fuzzy
+msgid "Reset and clear"
+msgstr "ਮੁੜ-ਸੈੱਟ ਅਤੇ ਸਾਫ਼ ਕਰੋ"
+
 #: ../terminal/terminal-window.c:239
 msgid "_Go"
 msgstr "ਜਾਓ(_G)"
@@ -1369,6 +1244,18 @@ msgstr ""
 msgid "seconds"
 msgstr ""
 
+#~ msgid ""
+#~ "  -h, --help                          Print this help message and exit"
+#~ msgstr "  -h, --help                          ਇਹ ਸਹਾਇਤਾ ਸੁਨੇਹਾ ਛਾਪੋ ਅਤੇ ਬੰਦ ਕਰੋ"
+
+#, fuzzy
+#~ msgid ""
+#~ "  -V, --version                       Print version information and exit"
+#~ msgstr "  -h, --help                          ਇਹ ਸਹਾਇਤਾ ਸੁਨੇਹਾ ਛਾਪੋ ਅਤੇ ਬੰਦ ਕਰੋ"
+
+#~ msgid "Unable to launch terminal: %s\n"
+#~ msgstr "ਟਰਮੀਨਲ ਚਾਲੂ ਕਰਨ ਲਈ ਅਸਫ਼ਲ: %s\n"
+
 #~ msgid "<b>Title:</b>"
 #~ msgstr "<b>ਟਾਇਟਲ:</b>"
 
diff --git a/po/pl.po b/po/pl.po
index a662cb7..4642668 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Terminal 0.2.8.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 11:48+0100\n"
+"POT-Creation-Date: 2009-12-14 16:03+0100\n"
 "PO-Revision-Date: 2009-03-25 12:17+0100\n"
 "Last-Translator: Piotr Sokół <piotr.sokol at 10g.pl>\n"
 "Language-Team: Polish\n"
@@ -18,269 +18,91 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=((n==1) ? 0 : ((n%10>=2 && n%10<=4 && (n%"
 "100<10 || n%100>=20)) ? 1 : 2));\n"
 
-#: ../terminal/main.c:46
+#: ../terminal/main.c:48
 msgid "Usage:"
 msgstr ""
 
-#: ../terminal/main.c:47
+#: ../terminal/main.c:48
 msgid "OPTION"
 msgstr ""
 
-#: ../terminal/main.c:49
+#: ../terminal/main.c:53
 #, fuzzy
 msgid "General Options"
 msgstr "Ogólne"
 
-#: ../terminal/main.c:50
-msgid "  -h, --help                          Print this help message and exit"
-msgstr "  -h, --help\t\t\tWypisuje ten komunikat i kończy program"
-
-#: ../terminal/main.c:51
+#. parameter of --default-display
+#. parameter of --display
+#: ../terminal/main.c:55 ../terminal/main.c:81
 #, fuzzy
-msgid ""
-"  -V, --version                       Print version information and exit"
-msgstr "  -v, --version\t\t\tWypisuje informacje o wersji i kończy program"
-
-#: ../terminal/main.c:52
-msgid ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
-msgstr "  --disable-server\t\tNie rejestruje się z szyną komunikatów D-BUS"
-
-#: ../terminal/main.c:54
-msgid "  --default-display=DISPLAY           default X display to use"
-msgstr "  --default-display=DISPLAY\tOkreśla domyślnie używany ekran X"
+msgid "display"
+msgstr "Brak"
 
-#: ../terminal/main.c:55
-msgid ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
+#. parameter of --default-working-directory
+#. parameter of --working-directory
+#: ../terminal/main.c:57 ../terminal/main.c:72
+msgid "directory"
 msgstr ""
-"  --default-working-directory=DIRNAME\n"
-"\t\t\t\tOkreśla domyślny katalog roboczy programu"
 
-#: ../terminal/main.c:58
+#: ../terminal/main.c:61
 msgid "Window or Tab Separators"
 msgstr ""
 
-#: ../terminal/main.c:59
-msgid ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-msgstr ""
-"  --tab\t\t\t\tOtwiera nową kartę w ostatnim określonym oknie.\n"
-"\t\t\t\tMożna użyć wielokrotnie."
-
-#: ../terminal/main.c:62
-msgid ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-msgstr ""
-"  --window\t\t\tOtwiera nowe okno, zawierające jedną kartę.\n"
-"\t\t\t\tMożna użyć wielokrotnie."
-
 #: ../terminal/main.c:66
 #, fuzzy
 msgid "Tab Options"
 msgstr "Pozycja zakładki"
 
-#: ../terminal/main.c:67
-msgid ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-msgstr ""
-"  -x, --execute\t\t\tWykonuje polecenie wewnątrz terminala\n"
-"\t\t\t\tpodane w dalszej części wiersza poleceń"
-
-#: ../terminal/main.c:69
-msgid ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-msgstr ""
-"  -e, --command=STRING\t\tWykonuje parametr tej opcji wewnątrz terminala"
-
-#: ../terminal/main.c:71
-msgid ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
-msgstr "  --working-directory=DIRNAME\tUstawia katalog roboczy terminala"
-
-#: ../terminal/main.c:72
-msgid "  -T, --title=TITLE                   Set the terminal's title"
-msgstr "  -T, --title=TITLE\t\tUstawia tytuł okna terminala"
-
-#: ../terminal/main.c:73
-msgid ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-msgstr ""
-"  -H, --hold\t\t\tNie niszczy karty, nawet gdy proces potomny\n"
-"\t\t\t\tzostanie zakończony"
-
-#: ../terminal/main.c:76
+#. parameter of --command
+#: ../terminal/main.c:68
 #, fuzzy
-msgid "Window Options"
-msgstr "Nieznana opcja „%s”"
+msgid "command"
+msgstr "<b>Polecenie</b>"
 
-#: ../terminal/main.c:77
-msgid ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
-msgstr ""
-"  --display=DISPLAY\t\tOkreśla ekran X do użycia przez ostatnie\n"
-"\t\t\t\tokreślone okno"
+#. parameter of --title
+#: ../terminal/main.c:70
+#, fuzzy
+msgid "title"
+msgstr "Tytuł"
 
 #: ../terminal/main.c:79
-msgid ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
-msgstr ""
-"  --geometry=GEOMETRY\t\tOkreśla geometrię okna X (informacje\n"
-"\t\t\t\tna stronach podręcznika „X”). Można użyć\n"
-"\t\t\t\tjednokrotnie dla każdego otwieranego okna."
-
-#: ../terminal/main.c:82
 #, fuzzy
-msgid ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
-msgstr ""
-"  --role=ROLE\t\t\tUstawia rolę ostatniego okna. Odnosi\n"
-"\t\t\t\tsię tylko do jednego okna. Można użyć\n"
-"\t\t\t\tjednokrotnie dla każdego okna wywoływanego\n"
-"\t\t\t\tz wiersza poleceń."
+msgid "Window Options"
+msgstr "Nieznana opcja „%s”"
 
-#: ../terminal/main.c:86
-msgid ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
+#. parameter of --geometry
+#: ../terminal/main.c:83
+msgid "geometry"
 msgstr ""
-"  --startup-id=STRING\t\tOkreśla ID protokołu powiadamiania przy\n"
-"\t\t\t\turuchamianiu"
 
-#: ../terminal/main.c:88
-#, fuzzy
-msgid ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
+#. parameter of --role
+#: ../terminal/main.c:85
+msgid "role"
 msgstr ""
-"  -e, --command=STRING\t\tWykonuje parametr tej opcji wewnątrz terminala"
 
-#: ../terminal/main.c:90
+#. parameter of --startup-id
+#: ../terminal/main.c:87
 #, fuzzy
-msgid ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --fullscreen\t\t\tUstawia ostatnio określone okno w tryb pełno-\n"
-"\t\t\t\tekranowy. Odnosi się tylko do jednego okna.\n"
-"\t\t\t\tMożna użyć jednorazowo dla każdego okna\n"
-"\t\t\t\twywoływanego z wiersza poleceń."
+msgid "string"
+msgstr "Ostrzeżenie"
 
-#: ../terminal/main.c:95
+#. parameter of --icon
+#: ../terminal/main.c:89
 #, fuzzy
-msgid ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
-msgstr ""
-"  --role=ROLE\t\t\tUstawia rolę ostatniego okna. Odnosi\n"
-"\t\t\t\tsię tylko do jednego okna. Można użyć\n"
-"\t\t\t\tjednokrotnie dla każdego okna wywoływanego\n"
-"\t\t\t\tz wiersza poleceń."
-
-#: ../terminal/main.c:99
-msgid ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-menubar\t\tWyświetla pasek menu w ostatnim określonym\n"
-"\t\t\t\toknie. Odnosi się tylko do jednego okna.\n"
-"\t\t\t\tMożna użyć jednorazowo dla każdego okna\n"
-"\t\t\t\twywoływanego z wiersza poleceń."
-
-#: ../terminal/main.c:104
-msgid ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --hide-menubar\t\tUkrywa pasek menu w ostatnim określonym\n"
-"\t\t\t\toknie. Odnosi się tylko do jednego okna.\n"
-"\t\t\t\tMożna użyć jednorazowo dla każdego okna\n"
-"\t\t\t\twywoływanego z wiersza poleceń."
-
-#: ../terminal/main.c:109
-msgid ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --show-borders\t\tWyświetla obramowanie ostatniego określonego\n"
-"\t\t\t\tokna. Odnosi się tylko do jednego okna.\n"
-"\t\t\t\tMożna użyć jednorazowo dla każdego okna\n"
-"\t\t\t\twywoływanego z wiersza poleceń."
-
-#: ../terminal/main.c:114
-msgid ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --hide-borders\t\tUkrywa obramowanie ostatniego określonego\n"
-"\t\t\t\tokna. Odnosi się tylko do jednego okna.\n"
-"\t\t\t\tMożna użyć jednorazowo dla każdego okna\n"
-"\t\t\t\twywoływanego z wiersza poleceń."
-
-#: ../terminal/main.c:119
-msgid ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-toolbars\t\tWyświetla paski narzędziowe w ostatnim okre-\n"
-"\t\t\t\tślonym oknie. Odnosi się tylko do jednego okna.\n"
-"\t\t\t\tMożna użyć jednorazowo dla każdego okna\n"
-"\t\t\t\twywoływanego z wiersza poleceń."
+msgid "icon"
+msgstr "Akcja"
 
-#: ../terminal/main.c:124
-msgid ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#: ../terminal/main.c:91
+#, c-format
+msgid "See the %s man page for full explanation of the options above."
 msgstr ""
-"  --hide-toolbars\t\tUkrywa paski narzędziowe w ostatnim określonym\n"
-"\t\t\t\toknie. Odnosi się tylko do jednego okna.\n"
-"\t\t\t\tMożna użyć jednorazowo dla każdego okna\n"
-"\t\t\t\twywoływanego z wiersza poleceń."
 
-#: ../terminal/main.c:151 ../terminal/terminal-preferences.c:1263
+#: ../terminal/main.c:118 ../terminal/terminal-preferences.c:1263
 #: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../terminal/main.c:173
+#: ../terminal/main.c:135
 #, c-format
 msgid ""
 "%s (Xfce %s)\n"
@@ -305,31 +127,26 @@ msgstr ""
 "\n"
 "Błędy proszę zgłaszać do <%s>.\n"
 
-#: ../terminal/main.c:267
+#: ../terminal/main.c:239
 #, c-format
 msgid "Unable to register terminal service: %s\n"
 msgstr "Nie udało się zarejestrować usługi terminala: %s.\n"
 
-#: ../terminal/main.c:276
-#, c-format
-msgid "Unable to launch terminal: %s\n"
-msgstr "Nie udało się uruchomić terminala: %s.\n"
-
-#: ../terminal/terminal-app.c:551
+#: ../terminal/terminal-app.c:554
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "Niepoprawna geometria „%s”.\n"
 
-#: ../terminal/terminal-dbus.c:114
+#: ../terminal/terminal-dbus.c:108
 msgid "User id mismatch"
 msgstr "Niezgodny identyfikator użytkownika."
 
-#: ../terminal/terminal-dbus.c:146
+#: ../terminal/terminal-dbus.c:134
 #, c-format
 msgid "D-BUS message bus disconnected, exiting...\n"
 msgstr "Szyna wymiany informacji D-BUS rozłączyła się, kończenie...\n"
 
-#: ../terminal/terminal-dbus.c:208
+#: ../terminal/terminal-dbus.c:196
 #, c-format
 msgid "Unable to register object %s"
 msgstr "Nie udało się zarejestrować obiektu %s."
@@ -353,7 +170,7 @@ msgstr ""
 msgid "Failed to open the documentation browser"
 msgstr "Nie udało się otworzyć przeglądarki dokumentacji."
 
-#: ../terminal/terminal-options.c:189
+#: ../terminal/terminal-options.c:206
 #, c-format
 msgid ""
 "Option \"--default-display\" requires specifying the default X display as "
@@ -362,7 +179,7 @@ msgstr ""
 "Opcja „--default-display” wymaga wprowadzenia domyślnego ekranu X jako "
 "parametru."
 
-#: ../terminal/terminal-options.c:204
+#: ../terminal/terminal-options.c:221
 #, c-format
 msgid ""
 "Option \"--default-working-directory\" requires specifying the default "
@@ -371,15 +188,7 @@ msgstr ""
 "Opcja „--default-working-directory” wymaga wprowadzenia domyślnego katalogu "
 "roboczego jako parametru."
 
-#: ../terminal/terminal-options.c:235
-#, c-format
-msgid ""
-"Option \"--sm-client-id\" requires specifying the session id as its parameter"
-msgstr ""
-"Opcja „--sm-client-id” wymaga wprowadzenia identyfikatora sesji jako "
-"parametru."
-
-#: ../terminal/terminal-options.c:250
+#: ../terminal/terminal-options.c:237
 #, c-format
 msgid ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
@@ -388,7 +197,7 @@ msgstr ""
 "Opcja „--execute/-x” wymaga wprowadzenia polecenia do uruchomienia w dalszej "
 "części wiersza poleceń."
 
-#: ../terminal/terminal-options.c:267
+#: ../terminal/terminal-options.c:254
 #, c-format
 msgid ""
 "Option \"--command/-e\" requires specifying the command to run as its "
@@ -397,7 +206,7 @@ msgstr ""
 "Opcja „--command/-e” wymaga wprowadzenia polecenia do uruchomienia jako "
 "parametru."
 
-#: ../terminal/terminal-options.c:284
+#: ../terminal/terminal-options.c:271
 #, c-format
 msgid ""
 "Option \"--working-directory\" requires specifying the working directory as "
@@ -406,37 +215,37 @@ msgstr ""
 "Opcja „--working-directory” wymaga wprowadzenia katalogu roboczego jako "
 "parametru."
 
-#: ../terminal/terminal-options.c:299
+#: ../terminal/terminal-options.c:286
 #, c-format
 msgid "Option \"--title/-T\" requires specifying the title as its parameter"
 msgstr "Opcja „--title/-T” wymaga wprowadzenia tytułu okna jako parametru."
 
-#: ../terminal/terminal-options.c:319
+#: ../terminal/terminal-options.c:305
 #, c-format
 msgid ""
 "Option \"--display\" requires specifying the X display as its parameters"
 msgstr "Opcja „--display” wymaga wprowadzenia ekranu X jako parametru."
 
-#: ../terminal/terminal-options.c:334
+#: ../terminal/terminal-options.c:320
 #, c-format
 msgid ""
 "Option \"--geometry\" requires specifying the window geometry as its "
 "parameter"
 msgstr "Opcja „--geometry” wymaga wprowadzenia geometrii jako parametru."
 
-#: ../terminal/terminal-options.c:349
+#: ../terminal/terminal-options.c:335
 #, c-format
 msgid "Option \"--role\" requires specifying the window role as its parameter"
 msgstr "Opcja „--role” wymaga wprowadzenia roli okna jako parametru."
 
-#: ../terminal/terminal-options.c:364
+#: ../terminal/terminal-options.c:350
 #, c-format
 msgid ""
 "Option \"--startup-id\" requires specifying the startup id as its parameter"
 msgstr ""
 "Opcja „--startup-id” wymaga wprowadzenia ID uruchamiania jako parametru."
 
-#: ../terminal/terminal-options.c:379
+#: ../terminal/terminal-options.c:365
 #, fuzzy, c-format
 msgid ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
@@ -445,7 +254,7 @@ msgstr ""
 "Opcja „--command/-e” wymaga wprowadzenia polecenia do uruchomienia jako "
 "parametru."
 
-#: ../terminal/terminal-options.c:435
+#: ../terminal/terminal-options.c:419
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Nieznana opcja „%s”"
@@ -514,7 +323,7 @@ msgstr "Pełny ekran"
 msgid "Set Title"
 msgstr "Ustaw tytuł"
 
-#: ../terminal/terminal-preferences.c:464
+#: ../terminal/terminal-preferences.c:464 ../terminal/terminal-window.c:237
 msgid "Reset"
 msgstr "Zresetuj"
 
@@ -812,6 +621,11 @@ msgstr "_Zresetuj"
 msgid "Reset and C_lear"
 msgstr "Zresetuj i wy_czyść"
 
+#: ../terminal/terminal-window.c:238
+#, fuzzy
+msgid "Reset and clear"
+msgstr "Zresetuj i wyczyść"
+
 #: ../terminal/terminal-window.c:239
 msgid "_Go"
 msgstr "_Karty"
@@ -1483,6 +1297,244 @@ msgstr "_Uaktualnianie wpisów utmp/wtmp podczas uruchamiania polecenia"
 msgid "seconds"
 msgstr "sekund"
 
+#~ msgid ""
+#~ "  -h, --help                          Print this help message and exit"
+#~ msgstr "  -h, --help\t\t\tWypisuje ten komunikat i kończy program"
+
+#, fuzzy
+#~ msgid ""
+#~ "  -V, --version                       Print version information and exit"
+#~ msgstr "  -v, --version\t\t\tWypisuje informacje o wersji i kończy program"
+
+#~ msgid ""
+#~ "  --disable-server                    Do not register with the D-BUS\n"
+#~ "                                      session message bus"
+#~ msgstr "  --disable-server\t\tNie rejestruje się z szyną komunikatów D-BUS"
+
+#~ msgid "  --default-display=DISPLAY           default X display to use"
+#~ msgstr "  --default-display=DISPLAY\tOkreśla domyślnie używany ekran X"
+
+#~ msgid ""
+#~ "  --default-working-directory=DIRNAME Set the default terminal's working\n"
+#~ "                                      directory"
+#~ msgstr ""
+#~ "  --default-working-directory=DIRNAME\n"
+#~ "\t\t\t\tOkreśla domyślny katalog roboczy programu"
+
+#~ msgid ""
+#~ "  --tab                               Open a new tab in the last-"
+#~ "specified\n"
+#~ "                                      window; more than one of these\n"
+#~ "                                      options can be provided"
+#~ msgstr ""
+#~ "  --tab\t\t\t\tOtwiera nową kartę w ostatnim określonym oknie.\n"
+#~ "\t\t\t\tMożna użyć wielokrotnie."
+
+#~ msgid ""
+#~ "  --window                            Open a new window containing one "
+#~ "tab;\n"
+#~ "                                      more than one of these options can "
+#~ "be\n"
+#~ "                                      provided"
+#~ msgstr ""
+#~ "  --window\t\t\tOtwiera nowe okno, zawierające jedną kartę.\n"
+#~ "\t\t\t\tMożna użyć wielokrotnie."
+
+#~ msgid ""
+#~ "  -x, --execute                       Execute the remainder of the "
+#~ "command\n"
+#~ "                                      line inside the terminal"
+#~ msgstr ""
+#~ "  -x, --execute\t\t\tWykonuje polecenie wewnątrz terminala\n"
+#~ "\t\t\t\tpodane w dalszej części wiersza poleceń"
+
+#~ msgid ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+#~ msgstr ""
+#~ "  -e, --command=STRING\t\tWykonuje parametr tej opcji wewnątrz terminala"
+
+#~ msgid ""
+#~ "  --working-directory=DIRNAME         Set the terminal's working directory"
+#~ msgstr "  --working-directory=DIRNAME\tUstawia katalog roboczy terminala"
+
+#~ msgid "  -T, --title=TITLE                   Set the terminal's title"
+#~ msgstr "  -T, --title=TITLE\t\tUstawia tytuł okna terminala"
+
+#~ msgid ""
+#~ "  -H, --hold                          Do not immediately destroy the tab\n"
+#~ "                                      when the child command exits"
+#~ msgstr ""
+#~ "  -H, --hold\t\t\tNie niszczy karty, nawet gdy proces potomny\n"
+#~ "\t\t\t\tzostanie zakończony"
+
+#~ msgid ""
+#~ "  --display=DISPLAY                   X display to use for the last-\n"
+#~ "                                      specified window"
+#~ msgstr ""
+#~ "  --display=DISPLAY\t\tOkreśla ekran X do użycia przez ostatnie\n"
+#~ "\t\t\t\tokreślone okno"
+
+#~ msgid ""
+#~ "  --geometry=GEOMETRY                 X geometry specification (see \"X"
+#~ "\"\n"
+#~ "                                      man page), can be specified once "
+#~ "per\n"
+#~ "                                      window to be opened"
+#~ msgstr ""
+#~ "  --geometry=GEOMETRY\t\tOkreśla geometrię okna X (informacje\n"
+#~ "\t\t\t\tna stronach podręcznika „X”). Można użyć\n"
+#~ "\t\t\t\tjednokrotnie dla każdego otwieranego okna."
+
+#, fuzzy
+#~ msgid ""
+#~ "  --role=ROLE                         Set the role for the last-"
+#~ "specified\n"
+#~ "                                      window; applies to only one "
+#~ "window;\n"
+#~ "                                      can be specified once for each "
+#~ "window\n"
+#~ "                                      you create from the command line"
+#~ msgstr ""
+#~ "  --role=ROLE\t\t\tUstawia rolę ostatniego okna. Odnosi\n"
+#~ "\t\t\t\tsię tylko do jednego okna. Można użyć\n"
+#~ "\t\t\t\tjednokrotnie dla każdego okna wywoływanego\n"
+#~ "\t\t\t\tz wiersza poleceń."
+
+#~ msgid ""
+#~ "  --startup-id=STRING                 ID for the startup notification\n"
+#~ "                                      protocol"
+#~ msgstr ""
+#~ "  --startup-id=STRING\t\tOkreśla ID protokołu powiadamiania przy\n"
+#~ "\t\t\t\turuchamianiu"
+
+#, fuzzy
+#~ msgid ""
+#~ "  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
+#~ "                                      name or filename"
+#~ msgstr ""
+#~ "  -e, --command=STRING\t\tWykonuje parametr tej opcji wewnątrz terminala"
+
+#, fuzzy
+#~ msgid ""
+#~ "  --fullscreen                        Set the last-specified window into\n"
+#~ "                                      fullscreen mode; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --fullscreen\t\t\tUstawia ostatnio określone okno w tryb pełno-\n"
+#~ "\t\t\t\tekranowy. Odnosi się tylko do jednego okna.\n"
+#~ "\t\t\t\tMożna użyć jednorazowo dla każdego okna\n"
+#~ "\t\t\t\twywoływanego z wiersza poleceń."
+
+#, fuzzy
+#~ msgid ""
+#~ "  --maximize                          Maximize the last-specified "
+#~ "window;\n"
+#~ "                                      applies to only one window; can be\n"
+#~ "                                      specified once for each window you\n"
+#~ "                                      create from the command line"
+#~ msgstr ""
+#~ "  --role=ROLE\t\t\tUstawia rolę ostatniego okna. Odnosi\n"
+#~ "\t\t\t\tsię tylko do jednego okna. Można użyć\n"
+#~ "\t\t\t\tjednokrotnie dla każdego okna wywoływanego\n"
+#~ "\t\t\t\tz wiersza poleceń."
+
+#~ msgid ""
+#~ "  --show-menubar                      Turn on the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-menubar\t\tWyświetla pasek menu w ostatnim określonym\n"
+#~ "\t\t\t\toknie. Odnosi się tylko do jednego okna.\n"
+#~ "\t\t\t\tMożna użyć jednorazowo dla każdego okna\n"
+#~ "\t\t\t\twywoływanego z wiersza poleceń."
+
+#~ msgid ""
+#~ "  --hide-menubar                      Turn off the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-menubar\t\tUkrywa pasek menu w ostatnim określonym\n"
+#~ "\t\t\t\toknie. Odnosi się tylko do jednego okna.\n"
+#~ "\t\t\t\tMożna użyć jednorazowo dla każdego okna\n"
+#~ "\t\t\t\twywoływanego z wiersza poleceń."
+
+#~ msgid ""
+#~ "  --show-borders                      Turn on the window decorations for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --show-borders\t\tWyświetla obramowanie ostatniego określonego\n"
+#~ "\t\t\t\tokna. Odnosi się tylko do jednego okna.\n"
+#~ "\t\t\t\tMożna użyć jednorazowo dla każdego okna\n"
+#~ "\t\t\t\twywoływanego z wiersza poleceń."
+
+#~ msgid ""
+#~ "  --hide-borders                      Turn off the window decorations "
+#~ "for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --hide-borders\t\tUkrywa obramowanie ostatniego określonego\n"
+#~ "\t\t\t\tokna. Odnosi się tylko do jednego okna.\n"
+#~ "\t\t\t\tMożna użyć jednorazowo dla każdego okna\n"
+#~ "\t\t\t\twywoływanego z wiersza poleceń."
+
+#~ msgid ""
+#~ "  --show-toolbars                     Turn on the toolbars for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-toolbars\t\tWyświetla paski narzędziowe w ostatnim okre-\n"
+#~ "\t\t\t\tślonym oknie. Odnosi się tylko do jednego okna.\n"
+#~ "\t\t\t\tMożna użyć jednorazowo dla każdego okna\n"
+#~ "\t\t\t\twywoływanego z wiersza poleceń."
+
+#~ msgid ""
+#~ "  --hide-toolbars                     Turn off the toolbars for the "
+#~ "last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-toolbars\t\tUkrywa paski narzędziowe w ostatnim określonym\n"
+#~ "\t\t\t\toknie. Odnosi się tylko do jednego okna.\n"
+#~ "\t\t\t\tMożna użyć jednorazowo dla każdego okna\n"
+#~ "\t\t\t\twywoływanego z wiersza poleceń."
+
+#~ msgid "Unable to launch terminal: %s\n"
+#~ msgstr "Nie udało się uruchomić terminala: %s.\n"
+
+#~ msgid ""
+#~ "Option \"--sm-client-id\" requires specifying the session id as its "
+#~ "parameter"
+#~ msgstr ""
+#~ "Opcja „--sm-client-id” wymaga wprowadzenia identyfikatora sesji jako "
+#~ "parametru."
+
 #~ msgid "<b>Title:</b>"
 #~ msgstr "<b>Tytuł:</b>"
 
diff --git a/po/pt.po b/po/pt.po
index e2ec74d..ee90666 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Terminal 0.2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-09 16:23+0000\n"
+"POT-Creation-Date: 2009-12-14 16:03+0100\n"
 "PO-Revision-Date: 2009-12-11 13:47+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -15,276 +15,88 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../terminal/main.c:46
+#: ../terminal/main.c:48
 msgid "Usage:"
 msgstr "Uso:"
 
-#: ../terminal/main.c:47
+#: ../terminal/main.c:48
 msgid "OPTION"
 msgstr "OPÇÃO"
 
-#: ../terminal/main.c:49
+#: ../terminal/main.c:53
 msgid "General Options"
 msgstr "Opções Gerais"
 
-#: ../terminal/main.c:50
-msgid "  -h, --help                          Print this help message and exit"
-msgstr "  -h, --help                          Mostra esta mensagem de ajuda e sai"
-
-#: ../terminal/main.c:51
-msgid "  -V, --version                       Print version information and exit"
-msgstr "  -V, --version                       Mostra a informação de versão e sai"
-
-#: ../terminal/main.c:52
-msgid ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
-msgstr ""
-"  --disable-server                    Não registar com o bus de\n"
-"                                      mensagem de sessão D-BUS"
-
-#: ../terminal/main.c:54
-msgid "  --default-display=DISPLAY           default X display to use"
-msgstr "  --default-display=ECRÃ              ecrã por omissão do X para usar"
+#. parameter of --default-display
+#. parameter of --display
+#: ../terminal/main.c:55 ../terminal/main.c:81
+#, fuzzy
+msgid "display"
+msgstr "Não é mostrado"
 
-#: ../terminal/main.c:55
-msgid ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
+#. parameter of --default-working-directory
+#. parameter of --working-directory
+#: ../terminal/main.c:57 ../terminal/main.c:72
+msgid "directory"
 msgstr ""
-"  --default-working-directory=NOMEDIR Define o directório de trabalho por\n"
-"                                      omissão do terminal"
 
-#: ../terminal/main.c:58
+#: ../terminal/main.c:61
 msgid "Window or Tab Separators"
 msgstr "Janela ou Separadores"
 
-#: ../terminal/main.c:59
-msgid ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-msgstr ""
-"  --tab                               Abre um novo separador na última janela\n"
-"                                      especificada; mais de uma destas\n"
-"                                      opções podem ser fornecidas"
-
-#: ../terminal/main.c:62
-msgid ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-msgstr ""
-"  --window                            Abre uma nova janela contendo um\n"
-"                                      separador; mais de uma destas opções\n"
-"                                      podem ser fornecidas"
-
 #: ../terminal/main.c:66
 msgid "Tab Options"
 msgstr "Opções dos separadores"
 
-#: ../terminal/main.c:67
-msgid ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-msgstr ""
-"  -x, --execute                       Executar o restante da linha de comandos\n"
-"                                      dentro do terminal"
-
-#: ../terminal/main.c:69
-msgid ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-msgstr ""
-"  -e, --command=STRING                Executar o argumento para esta opção\n"
-"                                      dentro do terminal"
-
-#: ../terminal/main.c:71
-msgid "  --working-directory=DIRNAME         Set the terminal's working directory"
-msgstr ""
-"  --working-directory=NOMEDIR         Define o directório de trabalho do\n"
-"                                      terminal"
-
-#: ../terminal/main.c:72
-msgid "  -T, --title=TITLE                   Set the terminal's title"
-msgstr "  -T, --title=TÍTULO                  Define o título do terminal"
+#. parameter of --command
+#: ../terminal/main.c:68
+#, fuzzy
+msgid "command"
+msgstr "Comando"
 
-#: ../terminal/main.c:73
-msgid ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-msgstr ""
-"  -H, --hold                          Não destrói imediatamente o separador\n"
-"                                      quando o comando filho sair"
+#. parameter of --title
+#: ../terminal/main.c:70
+#, fuzzy
+msgid "title"
+msgstr "Título"
 
-#: ../terminal/main.c:76
+#: ../terminal/main.c:79
 msgid "Window Options"
 msgstr "Opções de Janela"
 
-#: ../terminal/main.c:77
-msgid ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
-msgstr ""
-"  --display=ECRÃ                      Ecrã do X a usar para a última\n"
-"                                      janela especificada"
-
-#: ../terminal/main.c:79
-msgid ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
-msgstr ""
-"  --geometry=GEOMETRIA                Especificação de geometria do X (veja a\n"
-"                                      man page do \"X\"), pode ser especificado\n"
-"                                      uma vez para cada janela aberta"
-
-#: ../terminal/main.c:82
-msgid ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
-msgstr ""
-"  --role=REGRA                        Define a regra para a última janela\n"
-"                                      especificada; é aplicado só a uma janela;\n"
-"                                      pode ser especificada uma vez para cada\n"
-"                                      janela criada na linha de comandos"
-
-#: ../terminal/main.c:86
-msgid ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
+#. parameter of --geometry
+#: ../terminal/main.c:83
+msgid "geometry"
 msgstr ""
-"  --startup-id=STRING                 Identificador para o protocolo de\n"
-"                                      notificação de inicialização"
 
-#: ../terminal/main.c:88
-msgid ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
-msgstr ""
-"  -I, --icon=ICON                     Definir o ícone do terminal como\n"
-"                                      um nome de ícone ou de ficheiro"
-
-#: ../terminal/main.c:90
-msgid ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#. parameter of --role
+#: ../terminal/main.c:85
+msgid "role"
 msgstr ""
-"  --fullscreen                        Altera a última janela especificada para\n"
-"                                      o modo ecrã inteiro; é aplicado apenas\n"
-"                                      para uma janela; pode ser especificado\n"
-"                                      uma vez para cada janela criada na\n"
-"                                      linha de comandos"
 
-#: ../terminal/main.c:95
-msgid ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
-msgstr ""
-"  --maximize                        Maximiza a última janela especificada;\n"
-"                                    é aplicado só a uma janela; pode ser\n"
-"                                    especificada uma vez para cada\n"
-"                                    janela criada na linha de comandos"
-
-#: ../terminal/main.c:99
-msgid ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-menubar                      Liga a barra de menu para a última\n"
-"                                      janela especificada; é aplicado para\n"
-"                                      apenas uma janela; pode ser\n"
-"                                      especificado uma vez para cada janela\n"
-"                                      criada na linha de comandos"
-
-#: ../terminal/main.c:104
-msgid ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --hide-menubar                      Desliga a barra de menu para a última\n"
-"                                      janela especificada; é aplicado a apenas\n"
-"                                      uma janela; pode ser especificado\n"
-"                                      uma vez para cada janela criada\n"
-"                                      na linha de comandos"
-
-#: ../terminal/main.c:109
-msgid ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --show-borders                      Liga as decorações para a\n"
-"                                      última janela especificada; aplicado\n"
-"                                      apenas a uma janela; pode ser especificado\n"
-"                                      uma vez para cada janela criada a partir\n"
-"                                      da linha de comandos"
+#. parameter of --startup-id
+#: ../terminal/main.c:87
+#, fuzzy
+msgid "string"
+msgstr "Aviso"
 
-#: ../terminal/main.c:114
-msgid ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --hide-borders                      Desliga as decorações de janela para\n"
-"                                      para a última janela especificada; é\n"
-"                                      aplicado só a uma janela; pode ser\n"
-"                                      especificado uma vez para cada janela\n"
-"                                      criada na linha de comandos"
+#. parameter of --icon
+#: ../terminal/main.c:89
+#, fuzzy
+msgid "icon"
+msgstr "Acção"
 
-#: ../terminal/main.c:119
-msgid ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#: ../terminal/main.c:91
+#, c-format
+msgid "See the %s man page for full explanation of the options above."
 msgstr ""
-"  --show-toolbars                     Liga a barra de ferramentas para a\n"
-"                                      última janela especificada; é aplicado\n"
-"                                      a apenas uma janela; pode ser\n"
-"                                      especificado uma vez para cada janela\n"
-"                                      criada na linha de comandos"
 
-#: ../terminal/main.c:124
-msgid ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --hide-toolbars                     Desliga a barra de ferramentas para\n"
-"                                      a última janela especificada; é aplicado\n"
-"                                      a apenas uma janela; pode ser\n"
-"                                      especificado uma vez para cada janela\n"
-"                                      criada na linha de comandos"
-
-#: ../terminal/main.c:153
-#: ../terminal/terminal-preferences.c:1263
-#: ../terminal/terminal-shortcut-editor.c:120
-#: ../Terminal.desktop.in.h:1
+#: ../terminal/main.c:118 ../terminal/terminal-preferences.c:1263
+#: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../terminal/main.c:170
+#: ../terminal/main.c:135
 #, c-format
 msgid ""
 "%s (Xfce %s)\n"
@@ -309,7 +121,7 @@ msgstr ""
 "\n"
 "Por favor, relate problemas para <%s>.\n"
 
-#: ../terminal/main.c:274
+#: ../terminal/main.c:239
 #, c-format
 msgid "Unable to register terminal service: %s\n"
 msgstr "Incapaz de registar serviço de terminal: %s\n"
@@ -333,8 +145,7 @@ msgstr "bus de mensagem D-BUS desligou, a sair...\n"
 msgid "Unable to register object %s"
 msgstr "Incapaz de registar objecto %s"
 
-#: ../terminal/terminal-dialogs.c:87
-#: ../Terminal-default-apps.xml.in.h:1
+#: ../terminal/terminal-dialogs.c:87 ../Terminal-default-apps.xml.in.h:1
 msgid "Xfce Terminal Emulator"
 msgstr "Emulador de Terminal do Xfce"
 
@@ -353,28 +164,47 @@ msgstr "Falhou ao abrir o navegador da documentação"
 
 #: ../terminal/terminal-options.c:206
 #, c-format
-msgid "Option \"--default-display\" requires specifying the default X display as its parameter"
-msgstr "Opção \"--default-display\" requer especificar o ecrã por omissão do X como parâmetro"
+msgid ""
+"Option \"--default-display\" requires specifying the default X display as "
+"its parameter"
+msgstr ""
+"Opção \"--default-display\" requer especificar o ecrã por omissão do X como "
+"parâmetro"
 
 #: ../terminal/terminal-options.c:221
 #, c-format
-msgid "Option \"--default-working-directory\" requires specifying the default working directory as its parameter"
-msgstr "Opção \"--default-working-directory\" requer especificar o directório de trabalho por omissão como parâmetro"
+msgid ""
+"Option \"--default-working-directory\" requires specifying the default "
+"working directory as its parameter"
+msgstr ""
+"Opção \"--default-working-directory\" requer especificar o directório de "
+"trabalho por omissão como parâmetro"
 
 #: ../terminal/terminal-options.c:237
 #, c-format
-msgid "Option \"--execute/-x\" requires specifying the command to run on the rest of the command line"
-msgstr "Opção \"--execute/-x\" requer especificar o comando para executar no resto da linha de comandos"
+msgid ""
+"Option \"--execute/-x\" requires specifying the command to run on the rest "
+"of the command line"
+msgstr ""
+"Opção \"--execute/-x\" requer especificar o comando para executar no resto "
+"da linha de comandos"
 
 #: ../terminal/terminal-options.c:254
 #, c-format
-msgid "Option \"--command/-e\" requires specifying the command to run as its parameter"
-msgstr "Opção \"--command/-e\" requer especificar o comando a executar como parâmetro"
+msgid ""
+"Option \"--command/-e\" requires specifying the command to run as its "
+"parameter"
+msgstr ""
+"Opção \"--command/-e\" requer especificar o comando a executar como parâmetro"
 
 #: ../terminal/terminal-options.c:271
 #, c-format
-msgid "Option \"--working-directory\" requires specifying the working directory as its parameter"
-msgstr "Opção \"--working-directory\" requer especificar a pasta de trabalho como parâmetro"
+msgid ""
+"Option \"--working-directory\" requires specifying the working directory as "
+"its parameter"
+msgstr ""
+"Opção \"--working-directory\" requer especificar a pasta de trabalho como "
+"parâmetro"
 
 #: ../terminal/terminal-options.c:286
 #, c-format
@@ -383,13 +213,17 @@ msgstr "Opção \"--title/-T\" requer especificar o título como parâmetro"
 
 #: ../terminal/terminal-options.c:305
 #, c-format
-msgid "Option \"--display\" requires specifying the X display as its parameters"
+msgid ""
+"Option \"--display\" requires specifying the X display as its parameters"
 msgstr "Opção \"--display\" requer especificar o ecrã do X como parâmetro"
 
 #: ../terminal/terminal-options.c:320
 #, c-format
-msgid "Option \"--geometry\" requires specifying the window geometry as its parameter"
-msgstr "Opção \"--geometry\" requer especificar a geometria de janela como parâmetro"
+msgid ""
+"Option \"--geometry\" requires specifying the window geometry as its "
+"parameter"
+msgstr ""
+"Opção \"--geometry\" requer especificar a geometria de janela como parâmetro"
 
 #: ../terminal/terminal-options.c:335
 #, c-format
@@ -398,13 +232,19 @@ msgstr "Opção \"--role\" requer especificar a regra de janela como parâmetro"
 
 #: ../terminal/terminal-options.c:350
 #, c-format
-msgid "Option \"--startup-id\" requires specifying the startup id as its parameter"
-msgstr "Opção \"--startup-id\" requer especificar a identificação de inicialização como parâmetro"
+msgid ""
+"Option \"--startup-id\" requires specifying the startup id as its parameter"
+msgstr ""
+"Opção \"--startup-id\" requer especificar a identificação de inicialização "
+"como parâmetro"
 
 #: ../terminal/terminal-options.c:365
 #, c-format
-msgid "Option \"--icon/-I\" requires specifying an icon name or filename as its parameter"
-msgstr "Opção \"--icon/-I\" requer um nome de ícone ou de ficheiro como parâmetro"
+msgid ""
+"Option \"--icon/-I\" requires specifying an icon name or filename as its "
+"parameter"
+msgstr ""
+"Opção \"--icon/-I\" requer um nome de ícone ou de ficheiro como parâmetro"
 
 #: ../terminal/terminal-options.c:419
 #, c-format
@@ -475,7 +315,7 @@ msgstr "Ecrã inteiro"
 msgid "Set Title"
 msgstr "Definir Título"
 
-#: ../terminal/terminal-preferences.c:464
+#: ../terminal/terminal-preferences.c:464 ../terminal/terminal-window.c:237
 msgid "Reset"
 msgstr "Restaurar"
 
@@ -533,8 +373,7 @@ msgstr "Conteúdo"
 
 #. TRANSLATORS: title for the tab/window used when all other
 #. * possible titles were empty strings
-#: ../terminal/terminal-screen.c:393
-#: ../terminal/terminal-screen.c:592
+#: ../terminal/terminal-screen.c:393 ../terminal/terminal-screen.c:592
 #: ../terminal/terminal-screen.c:1533
 msgid "Untitled"
 msgstr "Sem título"
@@ -574,8 +413,7 @@ msgid "Help"
 msgstr "Ajuda"
 
 #: ../terminal/terminal-shortcut-editor.c:210
-#: ../terminal/terminal-shortcut-editor.c:506
-#: ../Terminal.glade.h:24
+#: ../terminal/terminal-shortcut-editor.c:506 ../Terminal.glade.h:24
 msgid "Disabled"
 msgstr "Desligado"
 
@@ -629,23 +467,33 @@ msgstr "Abrir Ligação"
 
 #: ../terminal/terminal-widget.c:481
 #, c-format
-msgid "Unable to drop selection of type text/plain to terminal: Wrong format (%d) or length (%d)\n"
-msgstr "Incapaz de enviar selecção de tipo text/plain para o terminal: Formato (%d) ou comprimento (%d) errado\n"
+msgid ""
+"Unable to drop selection of type text/plain to terminal: Wrong format (%d) "
+"or length (%d)\n"
+msgstr ""
+"Incapaz de enviar selecção de tipo text/plain para o terminal: Formato (%d) "
+"ou comprimento (%d) errado\n"
 
 #: ../terminal/terminal-widget.c:497
 #, c-format
-msgid "Unable to drop Mozilla URL on terminal: Wrong format (%d) or length (%d)\n"
-msgstr "Incapaz de largar URL Mozilla no terminal: Formato (%d) ou comprimento (%d) errado\n"
+msgid ""
+"Unable to drop Mozilla URL on terminal: Wrong format (%d) or length (%d)\n"
+msgstr ""
+"Incapaz de largar URL Mozilla no terminal: Formato (%d) ou comprimento (%d) "
+"errado\n"
 
 #: ../terminal/terminal-widget.c:523
 #, c-format
 msgid "Unable to drop URI list on terminal: Wrong format (%d) or length (%d)\n"
-msgstr "Incapaz de largar lista de URI no terminal: Formato (%d) ou comprimento (%d) errado\n"
+msgstr ""
+"Incapaz de largar lista de URI no terminal: Formato (%d) ou comprimento (%d) "
+"errado\n"
 
 #: ../terminal/terminal-widget.c:568
 #, c-format
 msgid "Received invalid color data: Wrong format (%d) or length (%d)\n"
-msgstr "Recebidos dados de cor inválidos: Formato (%d) ou comprimento (%d) errado\n"
+msgstr ""
+"Recebidos dados de cor inválidos: Formato (%d) ou comprimento (%d) errado\n"
 
 #. tell the user that we were unable to open the responsible application
 #: ../terminal/terminal-widget.c:705
@@ -765,6 +613,11 @@ msgstr "_Restaurar"
 msgid "Reset and C_lear"
 msgstr "Restaurar e _Limpar"
 
+#: ../terminal/terminal-window.c:238
+#, fuzzy
+msgid "Reset and clear"
+msgstr "Restaurar e Limpar"
+
 #: ../terminal/terminal-window.c:239
 msgid "_Go"
 msgstr "_Ir"
@@ -1003,32 +856,61 @@ msgid "Enab_le anti-aliasing for the terminal font"
 msgstr "_Ligar anti-aliasing para a fonte do terminal"
 
 #: ../Terminal.glade.h:30
-msgid "Enable this option if you want Terminal to use anti-aliasing when rendering text in terminal windows. Disabling this option can impressively speed up terminal rendering performance and reduce the overall system load on slow systems."
-msgstr "Active esta opção se quer que o Terminal use anti-aliasing quando renderizar texto nas janelas do terminal. Desactivar esta opção pode acelerar imenso o desempenho e reduzir a carga do sistema em geral em sistemas lentos."
+msgid ""
+"Enable this option if you want Terminal to use anti-aliasing when rendering "
+"text in terminal windows. Disabling this option can impressively speed up "
+"terminal rendering performance and reduce the overall system load on slow "
+"systems."
+msgstr ""
+"Active esta opção se quer que o Terminal use anti-aliasing quando renderizar "
+"texto nas janelas do terminal. Desactivar esta opção pode acelerar imenso o "
+"desempenho e reduzir a carga do sistema em geral em sistemas lentos."
 
 #: ../Terminal.glade.h:31
-msgid "Enable this option to allow applications running inside the terminal windows to use bold text."
-msgstr "Active esta opção para permitir que as aplicações executadas dentro das janelas do terminal usem texto em negrito."
+msgid ""
+"Enable this option to allow applications running inside the terminal windows "
+"to use bold text."
+msgstr ""
+"Active esta opção para permitir que as aplicações executadas dentro das "
+"janelas do terminal usem texto em negrito."
 
 #: ../Terminal.glade.h:32
-msgid "Enable this option to be able to scroll by a single line using the up/down arrow keys together with the Shift key."
-msgstr "Active esta opção para ser capaz de deslocar uma linha com as teclas cima/baixo juntamente com a tecla Shift."
+msgid ""
+"Enable this option to be able to scroll by a single line using the up/down "
+"arrow keys together with the Shift key."
+msgstr ""
+"Active esta opção para ser capaz de deslocar uma linha com as teclas cima/"
+"baixo juntamente com a tecla Shift."
 
 #: ../Terminal.glade.h:33
-msgid "Enable this option to show the menubar in newly created terminal windows."
-msgstr "Active esta opção para mostrar a barra de menu em novas janelas de terminal criadas"
+msgid ""
+"Enable this option to show the menubar in newly created terminal windows."
+msgstr ""
+"Active esta opção para mostrar a barra de menu em novas janelas de terminal "
+"criadas"
 
 #: ../Terminal.glade.h:34
-msgid "Enable this option to show the toolbars in newly created terminal windows."
-msgstr "Active esta opção para mostrar a barra de ferramentas em novas janelas de terminal."
+msgid ""
+"Enable this option to show the toolbars in newly created terminal windows."
+msgstr ""
+"Active esta opção para mostrar a barra de ferramentas em novas janelas de "
+"terminal."
 
 #: ../Terminal.glade.h:35
-msgid "Enable this option to show window decorations around newly created terminal windows."
-msgstr "Active esta opção para mostrar decorações de janela em redor de novas janelas de terminal."
+msgid ""
+"Enable this option to show window decorations around newly created terminal "
+"windows."
+msgstr ""
+"Active esta opção para mostrar decorações de janela em redor de novas "
+"janelas de terminal."
 
 #: ../Terminal.glade.h:36
-msgid "Enables you to press any key on the keyboard to scroll down the terminal window to the command prompt."
-msgstr "Permite pressionar qualquer tecla no teclado para baixar a janela do terminal até à linha de comandos."
+msgid ""
+"Enables you to press any key on the keyboard to scroll down the terminal "
+"window to the command prompt."
+msgstr ""
+"Permite pressionar qualquer tecla no teclado para baixar a janela do "
+"terminal até à linha de comandos."
 
 #: ../Terminal.glade.h:37
 msgid "Erase TTY"
@@ -1191,16 +1073,27 @@ msgid "Select Background Image File"
 msgstr "Seleccionar ficheiro de imagem de fundo"
 
 #: ../Terminal.glade.h:77
-msgid "Select this option to force Terminal to run your shell as a login shell when you open new terminals. See the documentation of your shell for details about differences between running it as interactive shell and running it as login shell."
-msgstr "Seleccione esta opção para forçar o Terminal a executar o seu shell como shell de login quando abrir novos terminais. Veja a documentação do seu shell para detalhes sobre as diferenças entre executá-lo como shell interactivo e executá-lo como shell de login."
+msgid ""
+"Select this option to force Terminal to run your shell as a login shell when "
+"you open new terminals. See the documentation of your shell for details "
+"about differences between running it as interactive shell and running it as "
+"login shell."
+msgstr ""
+"Seleccione esta opção para forçar o Terminal a executar o seu shell como "
+"shell de login quando abrir novos terminais. Veja a documentação do seu "
+"shell para detalhes sobre as diferenças entre executá-lo como shell "
+"interactivo e executá-lo como shell de login."
 
 #: ../Terminal.glade.h:78
 msgid "Shortcut Keys"
 msgstr "Teclas de atalho"
 
 #: ../Terminal.glade.h:79
-msgid "Specifies the number of lines that you can scroll back using the scrollbar."
-msgstr "Especifica o número de linhas que pode deslocar para trás usando a barra de deslocamento."
+msgid ""
+"Specifies the number of lines that you can scroll back using the scrollbar."
+msgstr ""
+"Especifica o número de linhas que pode deslocar para trás usando a barra de "
+"deslocamento."
 
 #: ../Terminal.glade.h:80
 msgid "St_yle:"
@@ -1243,12 +1136,24 @@ msgstr ""
 "esperam um comportamento de terminal diferente."
 
 #: ../Terminal.glade.h:91
-msgid "This option controls whether the terminal will scroll down automatically whenever new output is generated by the commands running inside the terminal."
-msgstr "Esta opção controla se o terminal desloca para baixo automaticamente sempre que uma nova saída é gerada pelos comandos executados dentro do terminal."
+msgid ""
+"This option controls whether the terminal will scroll down automatically "
+"whenever new output is generated by the commands running inside the terminal."
+msgstr ""
+"Esta opção controla se o terminal desloca para baixo automaticamente sempre "
+"que uma nova saída é gerada pelos comandos executados dentro do terminal."
 
 #: ../Terminal.glade.h:92
-msgid "This specifies the value the $TERM environment variable is set to, when a new terminal tab or terminal window is opened. The default should be ok for most systems. If you have problems with colors in some applications, try xterm-color here."
-msgstr "Isto especifica o valor que a variável de ambiente $TERM tem definido, quando um novo separador de terminal é aberto. Por omissão deve ser bom para a maioria dos sistemas. Se tiver problemas com cores em algumas aplicações, tente xterm-color aqui."
+msgid ""
+"This specifies the value the $TERM environment variable is set to, when a "
+"new terminal tab or terminal window is opened. The default should be ok for "
+"most systems. If you have problems with colors in some applications, try "
+"xterm-color here."
+msgstr ""
+"Isto especifica o valor que a variável de ambiente $TERM tem definido, "
+"quando um novo separador de terminal é aberto. Por omissão deve ser bom para "
+"a maioria dos sistemas. Se tiver problemas com cores em algumas aplicações, "
+"tente xterm-color aqui."
 
 #: ../Terminal.glade.h:93
 msgid "Tiled"
@@ -1342,3 +1247,273 @@ msgstr "Actualiza_r registos utmp/wtmp quando o comando é lançado"
 msgid "seconds"
 msgstr "segundos"
 
+#~ msgid ""
+#~ "  -h, --help                          Print this help message and exit"
+#~ msgstr ""
+#~ "  -h, --help                          Mostra esta mensagem de ajuda e sai"
+
+#~ msgid ""
+#~ "  -V, --version                       Print version information and exit"
+#~ msgstr ""
+#~ "  -V, --version                       Mostra a informação de versão e sai"
+
+#~ msgid ""
+#~ "  --disable-server                    Do not register with the D-BUS\n"
+#~ "                                      session message bus"
+#~ msgstr ""
+#~ "  --disable-server                    Não registar com o bus de\n"
+#~ "                                      mensagem de sessão D-BUS"
+
+#~ msgid "  --default-display=DISPLAY           default X display to use"
+#~ msgstr ""
+#~ "  --default-display=ECRÃ              ecrã por omissão do X para usar"
+
+#~ msgid ""
+#~ "  --default-working-directory=DIRNAME Set the default terminal's working\n"
+#~ "                                      directory"
+#~ msgstr ""
+#~ "  --default-working-directory=NOMEDIR Define o directório de trabalho "
+#~ "por\n"
+#~ "                                      omissão do terminal"
+
+#~ msgid ""
+#~ "  --tab                               Open a new tab in the last-"
+#~ "specified\n"
+#~ "                                      window; more than one of these\n"
+#~ "                                      options can be provided"
+#~ msgstr ""
+#~ "  --tab                               Abre um novo separador na última "
+#~ "janela\n"
+#~ "                                      especificada; mais de uma destas\n"
+#~ "                                      opções podem ser fornecidas"
+
+#~ msgid ""
+#~ "  --window                            Open a new window containing one "
+#~ "tab;\n"
+#~ "                                      more than one of these options can "
+#~ "be\n"
+#~ "                                      provided"
+#~ msgstr ""
+#~ "  --window                            Abre uma nova janela contendo um\n"
+#~ "                                      separador; mais de uma destas "
+#~ "opções\n"
+#~ "                                      podem ser fornecidas"
+
+#~ msgid ""
+#~ "  -x, --execute                       Execute the remainder of the "
+#~ "command\n"
+#~ "                                      line inside the terminal"
+#~ msgstr ""
+#~ "  -x, --execute                       Executar o restante da linha de "
+#~ "comandos\n"
+#~ "                                      dentro do terminal"
+
+#~ msgid ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+#~ msgstr ""
+#~ "  -e, --command=STRING                Executar o argumento para esta "
+#~ "opção\n"
+#~ "                                      dentro do terminal"
+
+#~ msgid ""
+#~ "  --working-directory=DIRNAME         Set the terminal's working directory"
+#~ msgstr ""
+#~ "  --working-directory=NOMEDIR         Define o directório de trabalho do\n"
+#~ "                                      terminal"
+
+#~ msgid "  -T, --title=TITLE                   Set the terminal's title"
+#~ msgstr "  -T, --title=TÍTULO                  Define o título do terminal"
+
+#~ msgid ""
+#~ "  -H, --hold                          Do not immediately destroy the tab\n"
+#~ "                                      when the child command exits"
+#~ msgstr ""
+#~ "  -H, --hold                          Não destrói imediatamente o "
+#~ "separador\n"
+#~ "                                      quando o comando filho sair"
+
+#~ msgid ""
+#~ "  --display=DISPLAY                   X display to use for the last-\n"
+#~ "                                      specified window"
+#~ msgstr ""
+#~ "  --display=ECRÃ                      Ecrã do X a usar para a última\n"
+#~ "                                      janela especificada"
+
+#~ msgid ""
+#~ "  --geometry=GEOMETRY                 X geometry specification (see \"X"
+#~ "\"\n"
+#~ "                                      man page), can be specified once "
+#~ "per\n"
+#~ "                                      window to be opened"
+#~ msgstr ""
+#~ "  --geometry=GEOMETRIA                Especificação de geometria do X "
+#~ "(veja a\n"
+#~ "                                      man page do \"X\"), pode ser "
+#~ "especificado\n"
+#~ "                                      uma vez para cada janela aberta"
+
+#~ msgid ""
+#~ "  --role=ROLE                         Set the role for the last-"
+#~ "specified\n"
+#~ "                                      window; applies to only one "
+#~ "window;\n"
+#~ "                                      can be specified once for each "
+#~ "window\n"
+#~ "                                      you create from the command line"
+#~ msgstr ""
+#~ "  --role=REGRA                        Define a regra para a última "
+#~ "janela\n"
+#~ "                                      especificada; é aplicado só a uma "
+#~ "janela;\n"
+#~ "                                      pode ser especificada uma vez para "
+#~ "cada\n"
+#~ "                                      janela criada na linha de comandos"
+
+#~ msgid ""
+#~ "  --startup-id=STRING                 ID for the startup notification\n"
+#~ "                                      protocol"
+#~ msgstr ""
+#~ "  --startup-id=STRING                 Identificador para o protocolo de\n"
+#~ "                                      notificação de inicialização"
+
+#~ msgid ""
+#~ "  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
+#~ "                                      name or filename"
+#~ msgstr ""
+#~ "  -I, --icon=ICON                     Definir o ícone do terminal como\n"
+#~ "                                      um nome de ícone ou de ficheiro"
+
+#~ msgid ""
+#~ "  --fullscreen                        Set the last-specified window into\n"
+#~ "                                      fullscreen mode; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --fullscreen                        Altera a última janela especificada "
+#~ "para\n"
+#~ "                                      o modo ecrã inteiro; é aplicado "
+#~ "apenas\n"
+#~ "                                      para uma janela; pode ser "
+#~ "especificado\n"
+#~ "                                      uma vez para cada janela criada na\n"
+#~ "                                      linha de comandos"
+
+#~ msgid ""
+#~ "  --maximize                          Maximize the last-specified "
+#~ "window;\n"
+#~ "                                      applies to only one window; can be\n"
+#~ "                                      specified once for each window you\n"
+#~ "                                      create from the command line"
+#~ msgstr ""
+#~ "  --maximize                        Maximiza a última janela "
+#~ "especificada;\n"
+#~ "                                    é aplicado só a uma janela; pode ser\n"
+#~ "                                    especificada uma vez para cada\n"
+#~ "                                    janela criada na linha de comandos"
+
+#~ msgid ""
+#~ "  --show-menubar                      Turn on the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-menubar                      Liga a barra de menu para a última\n"
+#~ "                                      janela especificada; é aplicado "
+#~ "para\n"
+#~ "                                      apenas uma janela; pode ser\n"
+#~ "                                      especificado uma vez para cada "
+#~ "janela\n"
+#~ "                                      criada na linha de comandos"
+
+#~ msgid ""
+#~ "  --hide-menubar                      Turn off the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-menubar                      Desliga a barra de menu para a "
+#~ "última\n"
+#~ "                                      janela especificada; é aplicado a "
+#~ "apenas\n"
+#~ "                                      uma janela; pode ser especificado\n"
+#~ "                                      uma vez para cada janela criada\n"
+#~ "                                      na linha de comandos"
+
+#~ msgid ""
+#~ "  --show-borders                      Turn on the window decorations for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --show-borders                      Liga as decorações para a\n"
+#~ "                                      última janela especificada; "
+#~ "aplicado\n"
+#~ "                                      apenas a uma janela; pode ser "
+#~ "especificado\n"
+#~ "                                      uma vez para cada janela criada a "
+#~ "partir\n"
+#~ "                                      da linha de comandos"
+
+#~ msgid ""
+#~ "  --hide-borders                      Turn off the window decorations "
+#~ "for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --hide-borders                      Desliga as decorações de janela "
+#~ "para\n"
+#~ "                                      para a última janela especificada; "
+#~ "é\n"
+#~ "                                      aplicado só a uma janela; pode ser\n"
+#~ "                                      especificado uma vez para cada "
+#~ "janela\n"
+#~ "                                      criada na linha de comandos"
+
+#~ msgid ""
+#~ "  --show-toolbars                     Turn on the toolbars for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-toolbars                     Liga a barra de ferramentas para a\n"
+#~ "                                      última janela especificada; é "
+#~ "aplicado\n"
+#~ "                                      a apenas uma janela; pode ser\n"
+#~ "                                      especificado uma vez para cada "
+#~ "janela\n"
+#~ "                                      criada na linha de comandos"
+
+#~ msgid ""
+#~ "  --hide-toolbars                     Turn off the toolbars for the "
+#~ "last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-toolbars                     Desliga a barra de ferramentas "
+#~ "para\n"
+#~ "                                      a última janela especificada; é "
+#~ "aplicado\n"
+#~ "                                      a apenas uma janela; pode ser\n"
+#~ "                                      especificado uma vez para cada "
+#~ "janela\n"
+#~ "                                      criada na linha de comandos"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 515b295..bbb7930 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Terminal 0.2.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 11:48+0100\n"
+"POT-Creation-Date: 2009-12-14 16:03+0100\n"
 "PO-Revision-Date: 2009-01-15 09:01-0500\n"
 "Last-Translator: Og Maciel <ogmaciel at gnome.org>\n"
 "Language-Team: Brazilian Portuguese <ldp-br at bazar2.conectiva.com.br>\n"
@@ -18,306 +18,91 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../terminal/main.c:46
+#: ../terminal/main.c:48
 msgid "Usage:"
 msgstr ""
 
-#: ../terminal/main.c:47
+#: ../terminal/main.c:48
 msgid "OPTION"
 msgstr ""
 
-#: ../terminal/main.c:49
+#: ../terminal/main.c:53
 #, fuzzy
 msgid "General Options"
 msgstr "Geral"
 
-#: ../terminal/main.c:50
-msgid "  -h, --help                          Print this help message and exit"
-msgstr ""
-"  -h, --help                          Mostra esta mensagem de ajuda e sai"
-
-#: ../terminal/main.c:51
+#. parameter of --default-display
+#. parameter of --display
+#: ../terminal/main.c:55 ../terminal/main.c:81
 #, fuzzy
-msgid ""
-"  -V, --version                       Print version information and exit"
-msgstr ""
-"  -v, --version                       Mostra a informação de versão e sai"
-
-#: ../terminal/main.c:52
-msgid ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
-msgstr ""
-"  --disable-server                    Não registre com o \"bus\" de\n"
-"                                      mensagem de sessão D-BUS"
-
-#: ../terminal/main.c:54
-msgid "  --default-display=DISPLAY           default X display to use"
-msgstr "  --default-display=TELA             tela padrão do X para usar"
+msgid "display"
+msgstr "Não é mostrado"
 
-#: ../terminal/main.c:55
-msgid ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
+#. parameter of --default-working-directory
+#. parameter of --working-directory
+#: ../terminal/main.c:57 ../terminal/main.c:72
+msgid "directory"
 msgstr ""
-"  --default-working-directory=NOMEDODIRETÓRIO Configura o diretório padrão\n"
-"                                      de trabalho do terminal"
 
-#: ../terminal/main.c:58
+#: ../terminal/main.c:61
 msgid "Window or Tab Separators"
 msgstr ""
 
-#: ../terminal/main.c:59
-msgid ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-msgstr ""
-"  --tab                               Abre uma nova aba na última janela\n"
-"                                      especificada; mais de uma dessas\n"
-"                                      opções podem ser fornecidas"
-
-#: ../terminal/main.c:62
-msgid ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-msgstr ""
-"  --window                            Abre uma nova janela contendo uma "
-"aba;\n"
-"                                      mais de uma dessas opções podem ser\n"
-"                                      fornecidas"
-
 #: ../terminal/main.c:66
 #, fuzzy
 msgid "Tab Options"
 msgstr "Posição das abas"
 
-#: ../terminal/main.c:67
-msgid ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-msgstr ""
-"  -x, --execute                       Execute o restante da linha de\n"
-"                                      comando dentro do terminal"
-
-#: ../terminal/main.c:69
-msgid ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-msgstr ""
-"  -e, --command=STRING                Execute o argumento para esta opção\n"
-"                                      dentro do terminal"
-
-#: ../terminal/main.c:71
-msgid ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
-msgstr ""
-"  --working-directory=NOMEDODIRETÓRIO         Configura o diretório de "
-"trabalho do terminal"
-
-#: ../terminal/main.c:72
-msgid "  -T, --title=TITLE                   Set the terminal's title"
-msgstr "  -T, --title=TÍTULO                  Configura o título do terminal"
+#. parameter of --command
+#: ../terminal/main.c:68
+#, fuzzy
+msgid "command"
+msgstr "<b>Comando</b>"
 
-#: ../terminal/main.c:73
-msgid ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-msgstr ""
-"  -H, --hold                          Não destrói imediatamente a aba\n"
-"                                      quando o comando filho sair"
+#. parameter of --title
+#: ../terminal/main.c:70
+#, fuzzy
+msgid "title"
+msgstr "Título"
 
-#: ../terminal/main.c:76
+#: ../terminal/main.c:79
 #, fuzzy
 msgid "Window Options"
 msgstr "Opção desconhecida \"%s\""
 
-#: ../terminal/main.c:77
-msgid ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
+#. parameter of --geometry
+#: ../terminal/main.c:83
+msgid "geometry"
 msgstr ""
-"  --display=TELA                      Tela do X a usar para a última\n"
-"                                      janela especificada"
 
-#: ../terminal/main.c:79
-msgid ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
+#. parameter of --role
+#: ../terminal/main.c:85
+msgid "role"
 msgstr ""
-"  --geometry=GEOMETRIA                Especificação de geometria do X\n"
-"                                      (veja a página do manual do \"X\"),\n"
-"                                      pode ser especificada uma vez para\n"
-"                                      cada janela a ser aberta"
 
-#: ../terminal/main.c:82
+#. parameter of --startup-id
+#: ../terminal/main.c:87
 #, fuzzy
-msgid ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
-msgstr ""
-"  --role=REGRA                        Configura a regra para a última\n"
-"                                      janela especificada; é aplicada "
-"apenas\n"
-"                                      à uma janela; pode ser especificada\n"
-"                                     uma vez para cada janela que você "
-"criar\n"
-"                                     a partir da linha de comando"
-
-#: ../terminal/main.c:86
-msgid ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
-msgstr ""
-"  --startup-id=STRING                 Identificador para o protocolo de\n"
-"                                      notificação de iniciação"
+msgid "string"
+msgstr "Aviso"
 
-#: ../terminal/main.c:88
+#. parameter of --icon
+#: ../terminal/main.c:89
 #, fuzzy
-msgid ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
-msgstr ""
-"  -e, --command=STRING                Execute o argumento para esta opção\n"
-"                                      dentro do terminal"
+msgid "icon"
+msgstr "Ação"
 
-#: ../terminal/main.c:90
-#, fuzzy
-msgid ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#: ../terminal/main.c:91
+#, c-format
+msgid "See the %s man page for full explanation of the options above."
 msgstr ""
-"  --fullscreen                        Configura a última janela\n"
-"                                      especificada para modo tela cheia;\n"
-"                                      é aplicado apenas à uma janela;\n"
-"                                      pode ser especificado uma vez para\n"
-"                                      cada janela que você criar a partir\n"
-"                                      da linha de comando."
 
-#: ../terminal/main.c:95
-#, fuzzy
-msgid ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
-msgstr ""
-"  --role=REGRA                        Configura a regra para a última\n"
-"                                      janela especificada; é aplicada "
-"apenas\n"
-"                                      à uma janela; pode ser especificada\n"
-"                                     uma vez para cada janela que você "
-"criar\n"
-"                                     a partir da linha de comando"
-
-#: ../terminal/main.c:99
-msgid ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-menubar                      Liga a barra de menu para a última\n"
-"                                      janela especificada; é aplicado "
-"apenas\n"
-"                                      à uma janela; pode ser\n"
-"                                      especificado uma vez para cada janela\n"
-"                                      que você criar a partir da linha de\n"
-"                                      comando"
-
-#: ../terminal/main.c:104
-msgid ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --hide-menubar                      Desliga a barra de menu para a última\n"
-"                                      janela especificada; é aplicado "
-"apenas\n"
-"                                      à uma janela; pode ser\n"
-"                                      especificado uma vez para cada janela\n"
-"                                      que você criar a partir da linha de\n"
-"                                      comando"
-
-#: ../terminal/main.c:109
-msgid ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --show-borders                      Liga as decorações de janela para a\n"
-"                                      última janela especificada; é "
-"aplicado\n"
-"                                      apenas à uma janela; pode ser\n"
-"                                      especificado uma vez para cada janela\n"
-"                                      que você criar a partir da linha de\n"
-"                                      comando"
-
-#: ../terminal/main.c:114
-msgid ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --hide-borders                      Desliga as decorações de janela para\n"
-"                                      a última janela especificada; é\n"
-"                                      aplicado apenas à uma janela; pode\n"
-"                                      ser especificado uma vez para cada\n"
-"                                      janela que você criar a partr da\n"
-"                                      linha de comando"
-
-#: ../terminal/main.c:119
-msgid ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-toolbars                     Liga as barras de ferramentas para a\n"
-"                                      última janela especificada; é "
-"aplicado\n"
-"                                      apenas à uma janela; pode ser\n"
-"                                      especificado uma vez para cada janela\n"
-"                                      que você criar a partir da linha de\n"
-"                                      comando"
-
-#: ../terminal/main.c:124
-msgid ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --hide-toolbars                     Desliga as barras de ferramentas para\n"
-"                                      a última janela especificada; é\n"
-"                                      aplicado apenas à uma janela; pode "
-"ser\n"
-"                                      especificado uma vez para cada janela\n"
-"                                      que você criar a partir da linha de\n"
-"                                      comando"
-
-#: ../terminal/main.c:151 ../terminal/terminal-preferences.c:1263
+#: ../terminal/main.c:118 ../terminal/terminal-preferences.c:1263
 #: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../terminal/main.c:173
+#: ../terminal/main.c:135
 #, c-format
 msgid ""
 "%s (Xfce %s)\n"
@@ -342,31 +127,26 @@ msgstr ""
 "\n"
 "Por favor, relate problemas para <%s>.\n"
 
-#: ../terminal/main.c:267
+#: ../terminal/main.c:239
 #, c-format
 msgid "Unable to register terminal service: %s\n"
 msgstr "Não foi possível registrar o serviço de terminal: %s\n"
 
-#: ../terminal/main.c:276
-#, c-format
-msgid "Unable to launch terminal: %s\n"
-msgstr "Não foi possível lançar o terminal: %s\n"
-
-#: ../terminal/terminal-app.c:551
+#: ../terminal/terminal-app.c:554
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "String de geometria inválida \"%s\"\n"
 
-#: ../terminal/terminal-dbus.c:114
+#: ../terminal/terminal-dbus.c:108
 msgid "User id mismatch"
 msgstr "Erro de identificação do usuário"
 
-#: ../terminal/terminal-dbus.c:146
+#: ../terminal/terminal-dbus.c:134
 #, c-format
 msgid "D-BUS message bus disconnected, exiting...\n"
 msgstr "\"bus\" de mensagem D-BUS desconectado, saindo...\n"
 
-#: ../terminal/terminal-dbus.c:208
+#: ../terminal/terminal-dbus.c:196
 #, c-format
 msgid "Unable to register object %s"
 msgstr "Não foi possível registrar o objeto %s"
@@ -391,7 +171,7 @@ msgstr ""
 msgid "Failed to open the documentation browser"
 msgstr "Falhou ao abrir o navegador de documentação"
 
-#: ../terminal/terminal-options.c:189
+#: ../terminal/terminal-options.c:206
 #, c-format
 msgid ""
 "Option \"--default-display\" requires specifying the default X display as "
@@ -400,7 +180,7 @@ msgstr ""
 "A opção \"--default-display\" requer especificar a tela padrão do X como seu "
 "parâmetro"
 
-#: ../terminal/terminal-options.c:204
+#: ../terminal/terminal-options.c:221
 #, c-format
 msgid ""
 "Option \"--default-working-directory\" requires specifying the default "
@@ -409,15 +189,7 @@ msgstr ""
 "A opção \"--default-working-directory\" requer especificar o diretório de "
 "trabalho padrão como seu parâmetro"
 
-#: ../terminal/terminal-options.c:235
-#, c-format
-msgid ""
-"Option \"--sm-client-id\" requires specifying the session id as its parameter"
-msgstr ""
-"A opção \"--sm-client-id\" requer especificar a identificação da sessão como "
-"seu parâmetro"
-
-#: ../terminal/terminal-options.c:250
+#: ../terminal/terminal-options.c:237
 #, c-format
 msgid ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
@@ -426,7 +198,7 @@ msgstr ""
 "A opção \"--execute/-x\" requer especificar o comando para executar no resto "
 "da linha de comando"
 
-#: ../terminal/terminal-options.c:267
+#: ../terminal/terminal-options.c:254
 #, c-format
 msgid ""
 "Option \"--command/-e\" requires specifying the command to run as its "
@@ -435,7 +207,7 @@ msgstr ""
 "A opção \"--command/-e\" requer especificar o comando a executar como seu "
 "parâmetro"
 
-#: ../terminal/terminal-options.c:284
+#: ../terminal/terminal-options.c:271
 #, c-format
 msgid ""
 "Option \"--working-directory\" requires specifying the working directory as "
@@ -444,19 +216,19 @@ msgstr ""
 "A opção \"--working-directory\" requer especificar o diretório de trabalho "
 "como seu parâmetro"
 
-#: ../terminal/terminal-options.c:299
+#: ../terminal/terminal-options.c:286
 #, c-format
 msgid "Option \"--title/-T\" requires specifying the title as its parameter"
 msgstr "A opção \"--title/-T\" requer especificar o título como seu parâmetro"
 
-#: ../terminal/terminal-options.c:319
+#: ../terminal/terminal-options.c:305
 #, c-format
 msgid ""
 "Option \"--display\" requires specifying the X display as its parameters"
 msgstr ""
 "A opção \"--display\" requer especificar a tela do X como seu parâmetro"
 
-#: ../terminal/terminal-options.c:334
+#: ../terminal/terminal-options.c:320
 #, c-format
 msgid ""
 "Option \"--geometry\" requires specifying the window geometry as its "
@@ -465,13 +237,13 @@ msgstr ""
 "A opção \"--geometry\" requer especificar a geometria de janela como seu "
 "parâmetro"
 
-#: ../terminal/terminal-options.c:349
+#: ../terminal/terminal-options.c:335
 #, c-format
 msgid "Option \"--role\" requires specifying the window role as its parameter"
 msgstr ""
 "A opção \"--role\" requer especificar a regra de janela como seu parâmetro"
 
-#: ../terminal/terminal-options.c:364
+#: ../terminal/terminal-options.c:350
 #, c-format
 msgid ""
 "Option \"--startup-id\" requires specifying the startup id as its parameter"
@@ -479,7 +251,7 @@ msgstr ""
 "A opção \"--startup-id\" requer especificar a identificação de iniciação "
 "como seu parâmetro"
 
-#: ../terminal/terminal-options.c:379
+#: ../terminal/terminal-options.c:365
 #, fuzzy, c-format
 msgid ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
@@ -488,7 +260,7 @@ msgstr ""
 "A opção \"--command/-e\" requer especificar o comando a executar como seu "
 "parâmetro"
 
-#: ../terminal/terminal-options.c:435
+#: ../terminal/terminal-options.c:419
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Opção desconhecida \"%s\""
@@ -557,7 +329,7 @@ msgstr "Tela cheia"
 msgid "Set Title"
 msgstr "Configurar Título"
 
-#: ../terminal/terminal-preferences.c:464
+#: ../terminal/terminal-preferences.c:464 ../terminal/terminal-window.c:237
 msgid "Reset"
 msgstr "Restaurar"
 
@@ -855,6 +627,11 @@ msgstr "_Restaurar"
 msgid "Reset and C_lear"
 msgstr "Restaurar e _Limpar"
 
+#: ../terminal/terminal-window.c:238
+#, fuzzy
+msgid "Reset and clear"
+msgstr "Restaurar e Limpar"
+
 #: ../terminal/terminal-window.c:239
 msgid "_Go"
 msgstr "_Ir"
@@ -1538,6 +1315,305 @@ msgstr "_Atualiza registros utmp/wtmp quando o comando é lançado"
 msgid "seconds"
 msgstr "segundos"
 
+#~ msgid ""
+#~ "  -h, --help                          Print this help message and exit"
+#~ msgstr ""
+#~ "  -h, --help                          Mostra esta mensagem de ajuda e sai"
+
+#, fuzzy
+#~ msgid ""
+#~ "  -V, --version                       Print version information and exit"
+#~ msgstr ""
+#~ "  -v, --version                       Mostra a informação de versão e sai"
+
+#~ msgid ""
+#~ "  --disable-server                    Do not register with the D-BUS\n"
+#~ "                                      session message bus"
+#~ msgstr ""
+#~ "  --disable-server                    Não registre com o \"bus\" de\n"
+#~ "                                      mensagem de sessão D-BUS"
+
+#~ msgid "  --default-display=DISPLAY           default X display to use"
+#~ msgstr "  --default-display=TELA             tela padrão do X para usar"
+
+#~ msgid ""
+#~ "  --default-working-directory=DIRNAME Set the default terminal's working\n"
+#~ "                                      directory"
+#~ msgstr ""
+#~ "  --default-working-directory=NOMEDODIRETÓRIO Configura o diretório "
+#~ "padrão\n"
+#~ "                                      de trabalho do terminal"
+
+#~ msgid ""
+#~ "  --tab                               Open a new tab in the last-"
+#~ "specified\n"
+#~ "                                      window; more than one of these\n"
+#~ "                                      options can be provided"
+#~ msgstr ""
+#~ "  --tab                               Abre uma nova aba na última janela\n"
+#~ "                                      especificada; mais de uma dessas\n"
+#~ "                                      opções podem ser fornecidas"
+
+#~ msgid ""
+#~ "  --window                            Open a new window containing one "
+#~ "tab;\n"
+#~ "                                      more than one of these options can "
+#~ "be\n"
+#~ "                                      provided"
+#~ msgstr ""
+#~ "  --window                            Abre uma nova janela contendo uma "
+#~ "aba;\n"
+#~ "                                      mais de uma dessas opções podem "
+#~ "ser\n"
+#~ "                                      fornecidas"
+
+#~ msgid ""
+#~ "  -x, --execute                       Execute the remainder of the "
+#~ "command\n"
+#~ "                                      line inside the terminal"
+#~ msgstr ""
+#~ "  -x, --execute                       Execute o restante da linha de\n"
+#~ "                                      comando dentro do terminal"
+
+#~ msgid ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+#~ msgstr ""
+#~ "  -e, --command=STRING                Execute o argumento para esta "
+#~ "opção\n"
+#~ "                                      dentro do terminal"
+
+#~ msgid ""
+#~ "  --working-directory=DIRNAME         Set the terminal's working directory"
+#~ msgstr ""
+#~ "  --working-directory=NOMEDODIRETÓRIO         Configura o diretório de "
+#~ "trabalho do terminal"
+
+#~ msgid "  -T, --title=TITLE                   Set the terminal's title"
+#~ msgstr ""
+#~ "  -T, --title=TÍTULO                  Configura o título do terminal"
+
+#~ msgid ""
+#~ "  -H, --hold                          Do not immediately destroy the tab\n"
+#~ "                                      when the child command exits"
+#~ msgstr ""
+#~ "  -H, --hold                          Não destrói imediatamente a aba\n"
+#~ "                                      quando o comando filho sair"
+
+#~ msgid ""
+#~ "  --display=DISPLAY                   X display to use for the last-\n"
+#~ "                                      specified window"
+#~ msgstr ""
+#~ "  --display=TELA                      Tela do X a usar para a última\n"
+#~ "                                      janela especificada"
+
+#~ msgid ""
+#~ "  --geometry=GEOMETRY                 X geometry specification (see \"X"
+#~ "\"\n"
+#~ "                                      man page), can be specified once "
+#~ "per\n"
+#~ "                                      window to be opened"
+#~ msgstr ""
+#~ "  --geometry=GEOMETRIA                Especificação de geometria do X\n"
+#~ "                                      (veja a página do manual do \"X"
+#~ "\"),\n"
+#~ "                                      pode ser especificada uma vez para\n"
+#~ "                                      cada janela a ser aberta"
+
+#, fuzzy
+#~ msgid ""
+#~ "  --role=ROLE                         Set the role for the last-"
+#~ "specified\n"
+#~ "                                      window; applies to only one "
+#~ "window;\n"
+#~ "                                      can be specified once for each "
+#~ "window\n"
+#~ "                                      you create from the command line"
+#~ msgstr ""
+#~ "  --role=REGRA                        Configura a regra para a última\n"
+#~ "                                      janela especificada; é aplicada "
+#~ "apenas\n"
+#~ "                                      à uma janela; pode ser "
+#~ "especificada\n"
+#~ "                                     uma vez para cada janela que você "
+#~ "criar\n"
+#~ "                                     a partir da linha de comando"
+
+#~ msgid ""
+#~ "  --startup-id=STRING                 ID for the startup notification\n"
+#~ "                                      protocol"
+#~ msgstr ""
+#~ "  --startup-id=STRING                 Identificador para o protocolo de\n"
+#~ "                                      notificação de iniciação"
+
+#, fuzzy
+#~ msgid ""
+#~ "  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
+#~ "                                      name or filename"
+#~ msgstr ""
+#~ "  -e, --command=STRING                Execute o argumento para esta "
+#~ "opção\n"
+#~ "                                      dentro do terminal"
+
+#, fuzzy
+#~ msgid ""
+#~ "  --fullscreen                        Set the last-specified window into\n"
+#~ "                                      fullscreen mode; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --fullscreen                        Configura a última janela\n"
+#~ "                                      especificada para modo tela cheia;\n"
+#~ "                                      é aplicado apenas à uma janela;\n"
+#~ "                                      pode ser especificado uma vez para\n"
+#~ "                                      cada janela que você criar a "
+#~ "partir\n"
+#~ "                                      da linha de comando."
+
+#, fuzzy
+#~ msgid ""
+#~ "  --maximize                          Maximize the last-specified "
+#~ "window;\n"
+#~ "                                      applies to only one window; can be\n"
+#~ "                                      specified once for each window you\n"
+#~ "                                      create from the command line"
+#~ msgstr ""
+#~ "  --role=REGRA                        Configura a regra para a última\n"
+#~ "                                      janela especificada; é aplicada "
+#~ "apenas\n"
+#~ "                                      à uma janela; pode ser "
+#~ "especificada\n"
+#~ "                                     uma vez para cada janela que você "
+#~ "criar\n"
+#~ "                                     a partir da linha de comando"
+
+#~ msgid ""
+#~ "  --show-menubar                      Turn on the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-menubar                      Liga a barra de menu para a última\n"
+#~ "                                      janela especificada; é aplicado "
+#~ "apenas\n"
+#~ "                                      à uma janela; pode ser\n"
+#~ "                                      especificado uma vez para cada "
+#~ "janela\n"
+#~ "                                      que você criar a partir da linha "
+#~ "de\n"
+#~ "                                      comando"
+
+#~ msgid ""
+#~ "  --hide-menubar                      Turn off the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-menubar                      Desliga a barra de menu para a "
+#~ "última\n"
+#~ "                                      janela especificada; é aplicado "
+#~ "apenas\n"
+#~ "                                      à uma janela; pode ser\n"
+#~ "                                      especificado uma vez para cada "
+#~ "janela\n"
+#~ "                                      que você criar a partir da linha "
+#~ "de\n"
+#~ "                                      comando"
+
+#~ msgid ""
+#~ "  --show-borders                      Turn on the window decorations for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --show-borders                      Liga as decorações de janela para "
+#~ "a\n"
+#~ "                                      última janela especificada; é "
+#~ "aplicado\n"
+#~ "                                      apenas à uma janela; pode ser\n"
+#~ "                                      especificado uma vez para cada "
+#~ "janela\n"
+#~ "                                      que você criar a partir da linha "
+#~ "de\n"
+#~ "                                      comando"
+
+#~ msgid ""
+#~ "  --hide-borders                      Turn off the window decorations "
+#~ "for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --hide-borders                      Desliga as decorações de janela "
+#~ "para\n"
+#~ "                                      a última janela especificada; é\n"
+#~ "                                      aplicado apenas à uma janela; pode\n"
+#~ "                                      ser especificado uma vez para cada\n"
+#~ "                                      janela que você criar a partr da\n"
+#~ "                                      linha de comando"
+
+#~ msgid ""
+#~ "  --show-toolbars                     Turn on the toolbars for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-toolbars                     Liga as barras de ferramentas para "
+#~ "a\n"
+#~ "                                      última janela especificada; é "
+#~ "aplicado\n"
+#~ "                                      apenas à uma janela; pode ser\n"
+#~ "                                      especificado uma vez para cada "
+#~ "janela\n"
+#~ "                                      que você criar a partir da linha "
+#~ "de\n"
+#~ "                                      comando"
+
+#~ msgid ""
+#~ "  --hide-toolbars                     Turn off the toolbars for the "
+#~ "last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-toolbars                     Desliga as barras de ferramentas "
+#~ "para\n"
+#~ "                                      a última janela especificada; é\n"
+#~ "                                      aplicado apenas à uma janela; pode "
+#~ "ser\n"
+#~ "                                      especificado uma vez para cada "
+#~ "janela\n"
+#~ "                                      que você criar a partir da linha "
+#~ "de\n"
+#~ "                                      comando"
+
+#~ msgid "Unable to launch terminal: %s\n"
+#~ msgstr "Não foi possível lançar o terminal: %s\n"
+
+#~ msgid ""
+#~ "Option \"--sm-client-id\" requires specifying the session id as its "
+#~ "parameter"
+#~ msgstr ""
+#~ "A opção \"--sm-client-id\" requer especificar a identificação da sessão "
+#~ "como seu parâmetro"
+
 #~ msgid "<b>Title:</b>"
 #~ msgstr "<b>Título:</b>"
 
diff --git a/po/ro.po b/po/ro.po
index c278cb4..163b87e 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Terminal 0.2.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 11:48+0100\n"
+"POT-Creation-Date: 2009-12-14 16:03+0100\n"
 "PO-Revision-Date: 2009-05-30 15:03+0300\n"
 "Last-Translator: Mișu Moldovan <dumol at xfce.org>\n"
 "Language-Team: Romanian <xfce-i18n at xfce.org>\n"
@@ -17,282 +17,90 @@ msgstr ""
 "Plural-Forms: nplurals=3;plural=(n==1?0:(n==0||((n%100)>0&&(n%100)<20))?"
 "1:2)\n"
 
-#: ../terminal/main.c:46
+#: ../terminal/main.c:48
 msgid "Usage:"
 msgstr ""
 
-#: ../terminal/main.c:47
+#: ../terminal/main.c:48
 msgid "OPTION"
 msgstr ""
 
-#: ../terminal/main.c:49
+#: ../terminal/main.c:53
 #, fuzzy
 msgid "General Options"
 msgstr "Generale"
 
-#: ../terminal/main.c:50
-msgid "  -h, --help                          Print this help message and exit"
-msgstr "  -h, --help                          Arată acest mesaj și ieși"
-
-#: ../terminal/main.c:51
+#. parameter of --default-display
+#. parameter of --display
+#: ../terminal/main.c:55 ../terminal/main.c:81
 #, fuzzy
-msgid ""
-"  -V, --version                       Print version information and exit"
-msgstr "  -v, --version                       Arată versiunea curentă și ieși"
-
-#: ../terminal/main.c:52
-msgid ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
-msgstr ""
-"  --disable-server                    Nu face înregistrarea cu serverul\n"
-"                                      de mesaje de sesiune D-BUS"
-
-#: ../terminal/main.c:54
-msgid "  --default-display=DISPLAY           default X display to use"
-msgstr "  --default-display=ECRAN             display X implicit de folosit"
+msgid "display"
+msgstr "Nu este afișat"
 
-#: ../terminal/main.c:55
-msgid ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
+#. parameter of --default-working-directory
+#. parameter of --working-directory
+#: ../terminal/main.c:57 ../terminal/main.c:72
+msgid "directory"
 msgstr ""
-"  --default-working-directory=NUMEDIR Definiți directorul de lucru implicit\n"
-"                                      al terminalului"
 
-#: ../terminal/main.c:58
+#: ../terminal/main.c:61
 msgid "Window or Tab Separators"
 msgstr ""
 
-#: ../terminal/main.c:59
-msgid ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-msgstr ""
-"  --tab                               Deschide un nou tab în ultima ferea-\n"
-"                                      stră specificată. Se poate preciza de\n"
-"                                      mai multe ori în aceeași comandă"
-
-#: ../terminal/main.c:62
-msgid ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-msgstr ""
-"  --window                            Deschide o nouă fereastră cu un tab.\n"
-"                                      Se poate preciza de mai multe ori în \n"
-"                                      aceeași comandă"
-
 #: ../terminal/main.c:66
 msgid "Tab Options"
 msgstr ""
 
-#: ../terminal/main.c:67
-msgid ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-msgstr ""
-"  -x, --execute                       Execută restul liniei de comandă în\n"
-"                                      cadrul terminalului"
-
-#: ../terminal/main.c:69
-msgid ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-msgstr ""
-"  -e, --command=STRING                Execută argumentul pentru această\n"
-"                                      opțiune în cadrul terminalului"
-
-#: ../terminal/main.c:71
-msgid ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
-msgstr "  --working-directory=NUMEDIR         Schimbă directorul de lucru"
-
-#: ../terminal/main.c:72
-msgid "  -T, --title=TITLE                   Set the terminal's title"
-msgstr "  -T, --title=TITLU                   Schimbă titlul terminalului"
+#. parameter of --command
+#: ../terminal/main.c:68
+#, fuzzy
+msgid "command"
+msgstr "<b>Comandă</b>"
 
-#: ../terminal/main.c:73
-msgid ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-msgstr ""
-"  -H, --hold                          Nu închide tabul când comanda \n"
-"                                      executată în el se termină"
+#. parameter of --title
+#: ../terminal/main.c:70
+#, fuzzy
+msgid "title"
+msgstr "Mozaic"
 
-#: ../terminal/main.c:76
+#: ../terminal/main.c:79
 #, fuzzy
 msgid "Window Options"
 msgstr "Opțiune necunoscută „%s”"
 
-#: ../terminal/main.c:77
-msgid ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
-msgstr ""
-"  --display=ECRAN                     Display X de utilizat pentru ultima\n"
-"                                      fereastră specificată"
-
-#: ../terminal/main.c:79
-msgid ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
-msgstr ""
-"  --geometry=GEOMETRIE                Specificații de geometrie X (detalii\n"
-"                                      în pagina de manual „X”), se pot spe-\n"
-"                                      cifica o dată pentru fiecare fereastră"
-
-#: ../terminal/main.c:82
-msgid ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
-msgstr ""
-"  --role=ROL                          Definește rolul pentru ultima ferea-\n"
-"                                      stră specificată. Se aplică unei sin-\n"
-"                                      gure ferestre. Se poate specifica o\n"
-"                                      dată pentru fiecare fereastră creată\n"
-"                                      în linia de comandă"
-
-#: ../terminal/main.c:86
-msgid ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
+#. parameter of --geometry
+#: ../terminal/main.c:83
+msgid "geometry"
 msgstr ""
-"  --startup-id=STRING                 ID pentru protocolul de notificare\n"
-"                                      la pornire"
 
-#: ../terminal/main.c:88
-#, fuzzy
-msgid ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
+#. parameter of --role
+#: ../terminal/main.c:85
+msgid "role"
 msgstr ""
-"  -e, --command=STRING                Execută argumentul pentru această\n"
-"                                      opțiune în cadrul terminalului"
 
-#: ../terminal/main.c:90
+#. parameter of --startup-id
+#: ../terminal/main.c:87
 #, fuzzy
-msgid ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --fullscreen                        Deschide ultima fereastră specificată\n"
-"                                      pe tot ecranul. Se aplică doar unei\n"
-"                                      ferestre. Se poate specifica o dată\n"
-"                                      pentru fiecare fereastră creată din\n"
-"                                      linia de comandă."
+msgid "string"
+msgstr "Avertizare"
 
-#: ../terminal/main.c:95
+#. parameter of --icon
+#: ../terminal/main.c:89
 #, fuzzy
-msgid ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
-msgstr ""
-"  --role=ROL                          Definește rolul pentru ultima ferea-\n"
-"                                      stră specificată. Se aplică unei sin-\n"
-"                                      gure ferestre. Se poate specifica o\n"
-"                                      dată pentru fiecare fereastră creată\n"
-"                                      în linia de comandă"
-
-#: ../terminal/main.c:99
-msgid ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-menubar                      Arată bara de meniu pentru ultima\n"
-"                                      fereastră specificată. Se aplică unei\n"
-"                                      singure ferestre. Se poate specifica\n"
-"                                      o dată pentru orice fereastră creată\n"
-"                                      din linia de comandă"
-
-#: ../terminal/main.c:104
-msgid ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --hide-menubar                      Dezactivează bara de meniu pentru\n"
-"                                      ultima fereastră specificată. Se\n"
-"                                      aplică doar unei ferestre. Se poate\n"
-"                                      specifica o dată pentru fiecare\n"
-"                                      fereastră creată din linia de comandă"
-
-#: ../terminal/main.c:109
-msgid ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --show-borders                      Arată decorațiile ferestrelor pentru\n"
-"                                      ultima fereastră specificată. Se\n"
-"                                      aplică doar unei ferestre. Se poate\n"
-"                                      specifica o dată pentru fiecare\n"
-"                                      fereastră creată din linia de comandă"
-
-#: ../terminal/main.c:114
-msgid ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --hide-borders                      Dezactivează decorațiile ferestrelor\n"
-"                                      pentru ultima fereastră specificată.\n"
-"                                      Se aplică unei singure ferestre. Se\n"
-"                                      poate specifica o dată pentru fiecare\n"
-"                                      fereastră creată din linia de comandă"
-
-#: ../terminal/main.c:119
-msgid ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-toolbars                     Activează barele de unelte pentru\n"
-"                                      ultima fereastră specificată. Se\n"
-"                                      aplică doar unei ferestre. Se poate\n"
-"                                      specifica o dată pentru fiecare\n"
-"                                      fereastră creată din linia de comandă"
+msgid "icon"
+msgstr "Acțiune"
 
-#: ../terminal/main.c:124
-msgid ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#: ../terminal/main.c:91
+#, c-format
+msgid "See the %s man page for full explanation of the options above."
 msgstr ""
-"  --hide-toolbars                     Dezactivează barele de unelte pentru\n"
-"                                      ultima fereastră specificată. Se\n"
-"                                      aplică doar unei ferestre. Se poate\n"
-"                                      specifica o dată pentru fiecare\n"
-"                                      fereastră creată din linia de comandă"
 
-#: ../terminal/main.c:151 ../terminal/terminal-preferences.c:1263
+#: ../terminal/main.c:118 ../terminal/terminal-preferences.c:1263
 #: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../terminal/main.c:173
+#: ../terminal/main.c:135
 #, c-format
 msgid ""
 "%s (Xfce %s)\n"
@@ -317,31 +125,26 @@ msgstr ""
 "\n"
 "Raportați problemele la <%s>.\n"
 
-#: ../terminal/main.c:267
+#: ../terminal/main.c:239
 #, c-format
 msgid "Unable to register terminal service: %s\n"
 msgstr "Nu se poate înregistra serviciul terminal: %s\n"
 
-#: ../terminal/main.c:276
-#, c-format
-msgid "Unable to launch terminal: %s\n"
-msgstr "Nu se poate lansa terminalul: %s\n"
-
-#: ../terminal/terminal-app.c:551
+#: ../terminal/terminal-app.c:554
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "Date de geometrie invalide „%s”\n"
 
-#: ../terminal/terminal-dbus.c:114
+#: ../terminal/terminal-dbus.c:108
 msgid "User id mismatch"
 msgstr "Nepotrivire ID utilizator"
 
-#: ../terminal/terminal-dbus.c:146
+#: ../terminal/terminal-dbus.c:134
 #, c-format
 msgid "D-BUS message bus disconnected, exiting...\n"
 msgstr "Deconectare de la magistrala D-BUS, ieșire...\n"
 
-#: ../terminal/terminal-dbus.c:208
+#: ../terminal/terminal-dbus.c:196
 #, c-format
 msgid "Unable to register object %s"
 msgstr "Nu se poate înregistra obiectul %s"
@@ -363,7 +166,7 @@ msgstr ""
 msgid "Failed to open the documentation browser"
 msgstr "Nu s-a putut deschide navigatorul documentației"
 
-#: ../terminal/terminal-options.c:189
+#: ../terminal/terminal-options.c:206
 #, c-format
 msgid ""
 "Option \"--default-display\" requires specifying the default X display as "
@@ -372,7 +175,7 @@ msgstr ""
 "Opțiunea „--default-display” necesită specificarea ca parametru a unui ecran "
 "X implicit"
 
-#: ../terminal/terminal-options.c:204
+#: ../terminal/terminal-options.c:221
 #, c-format
 msgid ""
 "Option \"--default-working-directory\" requires specifying the default "
@@ -381,15 +184,7 @@ msgstr ""
 "Opțiunea „--default-working-directory” necesită specificarea ca parametru a "
 "unui director de lucru implicit"
 
-#: ../terminal/terminal-options.c:235
-#, c-format
-msgid ""
-"Option \"--sm-client-id\" requires specifying the session id as its parameter"
-msgstr ""
-"Opțiunea „--sm-client-id” necesită specificarea unui id de sesiune ca "
-"parametru"
-
-#: ../terminal/terminal-options.c:250
+#: ../terminal/terminal-options.c:237
 #, c-format
 msgid ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
@@ -398,7 +193,7 @@ msgstr ""
 "Opțiunea „--execute/-x” necesită specificarea în restul liniei de comandă a "
 "unei comenzi de executat"
 
-#: ../terminal/terminal-options.c:267
+#: ../terminal/terminal-options.c:254
 #, c-format
 msgid ""
 "Option \"--command/-e\" requires specifying the command to run as its "
@@ -407,7 +202,7 @@ msgstr ""
 "Opțiunea „--command/-e” necesită specificarea ca parametru a comenzii de "
 "executat"
 
-#: ../terminal/terminal-options.c:284
+#: ../terminal/terminal-options.c:271
 #, c-format
 msgid ""
 "Option \"--working-directory\" requires specifying the working directory as "
@@ -416,18 +211,18 @@ msgstr ""
 "Opțiunea „--working-directory” necesită specificarea ca parametru a unui "
 "director de lucru"
 
-#: ../terminal/terminal-options.c:299
+#: ../terminal/terminal-options.c:286
 #, c-format
 msgid "Option \"--title/-T\" requires specifying the title as its parameter"
 msgstr "Opțiunea „--title/-T” necesită specificarea ca parametru a titlului"
 
-#: ../terminal/terminal-options.c:319
+#: ../terminal/terminal-options.c:305
 #, c-format
 msgid ""
 "Option \"--display\" requires specifying the X display as its parameters"
 msgstr "Opțiunea „--display” necesită specificarea ca parametru a ecranului X"
 
-#: ../terminal/terminal-options.c:334
+#: ../terminal/terminal-options.c:320
 #, c-format
 msgid ""
 "Option \"--geometry\" requires specifying the window geometry as its "
@@ -436,13 +231,13 @@ msgstr ""
 "Opțiunea „--geometry” necesită specificarea ca parametru a geometriei "
 "ferestrei"
 
-#: ../terminal/terminal-options.c:349
+#: ../terminal/terminal-options.c:335
 #, c-format
 msgid "Option \"--role\" requires specifying the window role as its parameter"
 msgstr ""
 "Opțiunea „--role” necesită specificarea ca parametru a rolului ferestrei"
 
-#: ../terminal/terminal-options.c:364
+#: ../terminal/terminal-options.c:350
 #, c-format
 msgid ""
 "Option \"--startup-id\" requires specifying the startup id as its parameter"
@@ -450,7 +245,7 @@ msgstr ""
 "Opțiunea „--startup-id” necesită specificarea ca parametru a unui id de "
 "pornire"
 
-#: ../terminal/terminal-options.c:379
+#: ../terminal/terminal-options.c:365
 #, fuzzy, c-format
 msgid ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
@@ -459,7 +254,7 @@ msgstr ""
 "Opțiunea „--command/-e” necesită specificarea ca parametru a comenzii de "
 "executat"
 
-#: ../terminal/terminal-options.c:435
+#: ../terminal/terminal-options.c:419
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Opțiune necunoscută „%s”"
@@ -528,7 +323,7 @@ msgstr "Pe tot ecranul"
 msgid "Set Title"
 msgstr "Inițializare titlu"
 
-#: ../terminal/terminal-preferences.c:464
+#: ../terminal/terminal-preferences.c:464 ../terminal/terminal-window.c:237
 msgid "Reset"
 msgstr "Reinițializare"
 
@@ -827,6 +622,11 @@ msgstr "_Reinițializare"
 msgid "Reset and C_lear"
 msgstr "Reinițializare și go_lire"
 
+#: ../terminal/terminal-window.c:238
+#, fuzzy
+msgid "Reset and clear"
+msgstr "Reinițializare și golire"
+
 #: ../terminal/terminal-window.c:239
 msgid "_Go"
 msgstr "_Navigare"
@@ -1509,6 +1309,299 @@ msgstr "Act_ualizează înregistrările utmp/wtmp la lansarea comenzii"
 msgid "seconds"
 msgstr "secunde"
 
+#~ msgid ""
+#~ "  -h, --help                          Print this help message and exit"
+#~ msgstr "  -h, --help                          Arată acest mesaj și ieși"
+
+#, fuzzy
+#~ msgid ""
+#~ "  -V, --version                       Print version information and exit"
+#~ msgstr ""
+#~ "  -v, --version                       Arată versiunea curentă și ieși"
+
+#~ msgid ""
+#~ "  --disable-server                    Do not register with the D-BUS\n"
+#~ "                                      session message bus"
+#~ msgstr ""
+#~ "  --disable-server                    Nu face înregistrarea cu serverul\n"
+#~ "                                      de mesaje de sesiune D-BUS"
+
+#~ msgid "  --default-display=DISPLAY           default X display to use"
+#~ msgstr "  --default-display=ECRAN             display X implicit de folosit"
+
+#~ msgid ""
+#~ "  --default-working-directory=DIRNAME Set the default terminal's working\n"
+#~ "                                      directory"
+#~ msgstr ""
+#~ "  --default-working-directory=NUMEDIR Definiți directorul de lucru "
+#~ "implicit\n"
+#~ "                                      al terminalului"
+
+#~ msgid ""
+#~ "  --tab                               Open a new tab in the last-"
+#~ "specified\n"
+#~ "                                      window; more than one of these\n"
+#~ "                                      options can be provided"
+#~ msgstr ""
+#~ "  --tab                               Deschide un nou tab în ultima "
+#~ "ferea-\n"
+#~ "                                      stră specificată. Se poate preciza "
+#~ "de\n"
+#~ "                                      mai multe ori în aceeași comandă"
+
+#~ msgid ""
+#~ "  --window                            Open a new window containing one "
+#~ "tab;\n"
+#~ "                                      more than one of these options can "
+#~ "be\n"
+#~ "                                      provided"
+#~ msgstr ""
+#~ "  --window                            Deschide o nouă fereastră cu un "
+#~ "tab.\n"
+#~ "                                      Se poate preciza de mai multe ori "
+#~ "în \n"
+#~ "                                      aceeași comandă"
+
+#~ msgid ""
+#~ "  -x, --execute                       Execute the remainder of the "
+#~ "command\n"
+#~ "                                      line inside the terminal"
+#~ msgstr ""
+#~ "  -x, --execute                       Execută restul liniei de comandă "
+#~ "în\n"
+#~ "                                      cadrul terminalului"
+
+#~ msgid ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+#~ msgstr ""
+#~ "  -e, --command=STRING                Execută argumentul pentru această\n"
+#~ "                                      opțiune în cadrul terminalului"
+
+#~ msgid ""
+#~ "  --working-directory=DIRNAME         Set the terminal's working directory"
+#~ msgstr "  --working-directory=NUMEDIR         Schimbă directorul de lucru"
+
+#~ msgid "  -T, --title=TITLE                   Set the terminal's title"
+#~ msgstr "  -T, --title=TITLU                   Schimbă titlul terminalului"
+
+#~ msgid ""
+#~ "  -H, --hold                          Do not immediately destroy the tab\n"
+#~ "                                      when the child command exits"
+#~ msgstr ""
+#~ "  -H, --hold                          Nu închide tabul când comanda \n"
+#~ "                                      executată în el se termină"
+
+#~ msgid ""
+#~ "  --display=DISPLAY                   X display to use for the last-\n"
+#~ "                                      specified window"
+#~ msgstr ""
+#~ "  --display=ECRAN                     Display X de utilizat pentru "
+#~ "ultima\n"
+#~ "                                      fereastră specificată"
+
+#~ msgid ""
+#~ "  --geometry=GEOMETRY                 X geometry specification (see \"X"
+#~ "\"\n"
+#~ "                                      man page), can be specified once "
+#~ "per\n"
+#~ "                                      window to be opened"
+#~ msgstr ""
+#~ "  --geometry=GEOMETRIE                Specificații de geometrie X "
+#~ "(detalii\n"
+#~ "                                      în pagina de manual „X”), se pot "
+#~ "spe-\n"
+#~ "                                      cifica o dată pentru fiecare "
+#~ "fereastră"
+
+#~ msgid ""
+#~ "  --role=ROLE                         Set the role for the last-"
+#~ "specified\n"
+#~ "                                      window; applies to only one "
+#~ "window;\n"
+#~ "                                      can be specified once for each "
+#~ "window\n"
+#~ "                                      you create from the command line"
+#~ msgstr ""
+#~ "  --role=ROL                          Definește rolul pentru ultima "
+#~ "ferea-\n"
+#~ "                                      stră specificată. Se aplică unei "
+#~ "sin-\n"
+#~ "                                      gure ferestre. Se poate specifica "
+#~ "o\n"
+#~ "                                      dată pentru fiecare fereastră "
+#~ "creată\n"
+#~ "                                      în linia de comandă"
+
+#~ msgid ""
+#~ "  --startup-id=STRING                 ID for the startup notification\n"
+#~ "                                      protocol"
+#~ msgstr ""
+#~ "  --startup-id=STRING                 ID pentru protocolul de notificare\n"
+#~ "                                      la pornire"
+
+#, fuzzy
+#~ msgid ""
+#~ "  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
+#~ "                                      name or filename"
+#~ msgstr ""
+#~ "  -e, --command=STRING                Execută argumentul pentru această\n"
+#~ "                                      opțiune în cadrul terminalului"
+
+#, fuzzy
+#~ msgid ""
+#~ "  --fullscreen                        Set the last-specified window into\n"
+#~ "                                      fullscreen mode; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --fullscreen                        Deschide ultima fereastră "
+#~ "specificată\n"
+#~ "                                      pe tot ecranul. Se aplică doar "
+#~ "unei\n"
+#~ "                                      ferestre. Se poate specifica o "
+#~ "dată\n"
+#~ "                                      pentru fiecare fereastră creată "
+#~ "din\n"
+#~ "                                      linia de comandă."
+
+#, fuzzy
+#~ msgid ""
+#~ "  --maximize                          Maximize the last-specified "
+#~ "window;\n"
+#~ "                                      applies to only one window; can be\n"
+#~ "                                      specified once for each window you\n"
+#~ "                                      create from the command line"
+#~ msgstr ""
+#~ "  --role=ROL                          Definește rolul pentru ultima "
+#~ "ferea-\n"
+#~ "                                      stră specificată. Se aplică unei "
+#~ "sin-\n"
+#~ "                                      gure ferestre. Se poate specifica "
+#~ "o\n"
+#~ "                                      dată pentru fiecare fereastră "
+#~ "creată\n"
+#~ "                                      în linia de comandă"
+
+#~ msgid ""
+#~ "  --show-menubar                      Turn on the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-menubar                      Arată bara de meniu pentru ultima\n"
+#~ "                                      fereastră specificată. Se aplică "
+#~ "unei\n"
+#~ "                                      singure ferestre. Se poate "
+#~ "specifica\n"
+#~ "                                      o dată pentru orice fereastră "
+#~ "creată\n"
+#~ "                                      din linia de comandă"
+
+#~ msgid ""
+#~ "  --hide-menubar                      Turn off the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-menubar                      Dezactivează bara de meniu pentru\n"
+#~ "                                      ultima fereastră specificată. Se\n"
+#~ "                                      aplică doar unei ferestre. Se "
+#~ "poate\n"
+#~ "                                      specifica o dată pentru fiecare\n"
+#~ "                                      fereastră creată din linia de "
+#~ "comandă"
+
+#~ msgid ""
+#~ "  --show-borders                      Turn on the window decorations for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --show-borders                      Arată decorațiile ferestrelor "
+#~ "pentru\n"
+#~ "                                      ultima fereastră specificată. Se\n"
+#~ "                                      aplică doar unei ferestre. Se "
+#~ "poate\n"
+#~ "                                      specifica o dată pentru fiecare\n"
+#~ "                                      fereastră creată din linia de "
+#~ "comandă"
+
+#~ msgid ""
+#~ "  --hide-borders                      Turn off the window decorations "
+#~ "for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --hide-borders                      Dezactivează decorațiile "
+#~ "ferestrelor\n"
+#~ "                                      pentru ultima fereastră "
+#~ "specificată.\n"
+#~ "                                      Se aplică unei singure ferestre. "
+#~ "Se\n"
+#~ "                                      poate specifica o dată pentru "
+#~ "fiecare\n"
+#~ "                                      fereastră creată din linia de "
+#~ "comandă"
+
+#~ msgid ""
+#~ "  --show-toolbars                     Turn on the toolbars for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-toolbars                     Activează barele de unelte pentru\n"
+#~ "                                      ultima fereastră specificată. Se\n"
+#~ "                                      aplică doar unei ferestre. Se "
+#~ "poate\n"
+#~ "                                      specifica o dată pentru fiecare\n"
+#~ "                                      fereastră creată din linia de "
+#~ "comandă"
+
+#~ msgid ""
+#~ "  --hide-toolbars                     Turn off the toolbars for the "
+#~ "last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-toolbars                     Dezactivează barele de unelte "
+#~ "pentru\n"
+#~ "                                      ultima fereastră specificată. Se\n"
+#~ "                                      aplică doar unei ferestre. Se "
+#~ "poate\n"
+#~ "                                      specifica o dată pentru fiecare\n"
+#~ "                                      fereastră creată din linia de "
+#~ "comandă"
+
+#~ msgid "Unable to launch terminal: %s\n"
+#~ msgstr "Nu se poate lansa terminalul: %s\n"
+
+#~ msgid ""
+#~ "Option \"--sm-client-id\" requires specifying the session id as its "
+#~ "parameter"
+#~ msgstr ""
+#~ "Opțiunea „--sm-client-id” necesită specificarea unui id de sesiune ca "
+#~ "parametru"
+
 #~ msgid "<b>Title:</b>"
 #~ msgstr "<b>Titlu:</b>"
 
diff --git a/po/ru.po b/po/ru.po
index bb7728d..b001cf9 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,311 +9,100 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Terminal 0.2.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 11:48+0100\n"
+"POT-Creation-Date: 2009-12-14 16:03+0100\n"
 "PO-Revision-Date: 2009-12-10 21:16+0200\n"
 "Last-Translator: Styopa Semenukha <semenukha at gmail.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../terminal/main.c:46
+#: ../terminal/main.c:48
 msgid "Usage:"
 msgstr "Использование:"
 
-#: ../terminal/main.c:47
+#: ../terminal/main.c:48
 msgid "OPTION"
 msgstr "ПАРАМЕТР"
 
-#: ../terminal/main.c:49
+#: ../terminal/main.c:53
 msgid "General Options"
 msgstr "Общие параметры"
 
-#: ../terminal/main.c:50
-msgid "  -h, --help                          Print this help message and exit"
-msgstr "  -h, --help                          Вывести эту подсказку и выйти"
-
-#: ../terminal/main.c:51
-msgid ""
-"  -V, --version                       Print version information and exit"
-msgstr ""
-"  -v, --version                       Вывести сведения о версии и выйти"
-
-#: ../terminal/main.c:52
-msgid ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
-msgstr ""
-"  --disable-server                    Не  регистрироваться в  системе  "
-"сообщений\n"
-"                                      D-BUS"
-
-#: ../terminal/main.c:54
-msgid "  --default-display=DISPLAY           default X display to use"
-msgstr "  --default-display=ЭКРАН            Экран X-сервера по умолчанию"
+#. parameter of --default-display
+#. parameter of --display
+#: ../terminal/main.c:55 ../terminal/main.c:81
+#, fuzzy
+msgid "display"
+msgstr "Не отображается"
 
-#: ../terminal/main.c:55
-msgid ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
+#. parameter of --default-working-directory
+#. parameter of --working-directory
+#: ../terminal/main.c:57 ../terminal/main.c:72
+msgid "directory"
 msgstr ""
-"  --default-working-directory=КАТАЛОГ Установить для терминалов рабочий\n"
-"каталог по умолчанию"
 
-#: ../terminal/main.c:58
+#: ../terminal/main.c:61
 msgid "Window or Tab Separators"
 msgstr "Окна и вкладки"
 
-#: ../terminal/main.c:59
-msgid ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-msgstr ""
-"  --tab                               Открыть    новую   вкладку   в   "
-"последнем\n"
-"                                      указанном   окне;  этот   параметр   "
-"можно\n"
-"                                      указать несколько раз"
-
-#: ../terminal/main.c:62
-msgid ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-msgstr ""
-"  --window                            Открыть   новое  окно  с  одной  "
-"вкладкой;\n"
-"                                      этот  параметр  можно  указать   "
-"несколько\n"
-"                                      раз"
-
 #: ../terminal/main.c:66
 msgid "Tab Options"
 msgstr "Параметры вкладок"
 
-#: ../terminal/main.c:67
-msgid ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-msgstr ""
-"  -x, --execute                       Выполнить   оставшуюся   часть   "
-"командной\n"
-"                                      строки в терминале"
-
-#: ../terminal/main.c:69
-msgid ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-msgstr ""
-"  -e, --command=STRING                Выполнить   аргумент   этого  "
-"параметра  в\n"
-"                                      терминале"
-
-#: ../terminal/main.c:71
-msgid ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
-msgstr ""
-"  --working-directory=КАТАЛОГ         Выбрать текущий каталог терминала"
-
-#: ../terminal/main.c:72
-msgid "  -T, --title=TITLE                   Set the terminal's title"
-msgstr ""
-"  -T, --title=ЗАГОЛОВОК               Установить заголовок окна терминала"
+#. parameter of --command
+#: ../terminal/main.c:68
+#, fuzzy
+msgid "command"
+msgstr "Команда"
 
-#: ../terminal/main.c:73
-msgid ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-msgstr ""
-"  -H, --hold                          Не   уничтожать    вкладку   сразу   "
-"после\n"
-"                                      завершения команды"
+#. parameter of --title
+#: ../terminal/main.c:70
+#, fuzzy
+msgid "title"
+msgstr "Заголовок"
 
-#: ../terminal/main.c:76
+#: ../terminal/main.c:79
 msgid "Window Options"
 msgstr "Параметры окна"
 
-#: ../terminal/main.c:77
-msgid ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
-msgstr ""
-"  --display=DISPLAY                   Экран X-сервера для последнего  "
-"указанного\n"
-"                                      окна"
-
-#: ../terminal/main.c:79
-msgid ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
-msgstr ""
-"  --geometry=РАЗМЕРЫ                  Указать  X-размеры для  открываемого  "
-"окна\n"
-"                                      (см.  man X),  указывается   единожды  "
-"для\n"
-"                                      каждого открываемого окна"
-
-#: ../terminal/main.c:82
-msgid ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
-msgstr ""
-"  --role=РОЛЬ                         Назначить роль последнего указанного "
-"окна;\n"
-"                                      применяется только к одному окну;\n"
-"                                      указывается     единожды    для    "
-"каждого\n"
-"                                      создаваемого окна"
-
-#: ../terminal/main.c:86
-msgid ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
+#. parameter of --geometry
+#: ../terminal/main.c:83
+msgid "geometry"
 msgstr ""
-"  --startup-id=СТРОКА                 Идентификатор уведомления о запуске"
 
-#: ../terminal/main.c:88
-msgid ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
+#. parameter of --role
+#: ../terminal/main.c:85
+msgid "role"
 msgstr ""
-"  -I, --icon=ICON                     Задать значок для терминала в форме\n"
-"                                      названия значка или имени файла"
 
-#: ../terminal/main.c:90
-msgid ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --fullscreen                        Переключить  последнее   указанное  "
-"окно в\n"
-"                                      полноэкранный   режим; можно  "
-"указывать по\n"
-"                                      одному разу для каждого окна, "
-"создаваемого\n"
-"                                      из командной строки."
-
-#: ../terminal/main.c:95
-msgid ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
-msgstr ""
-"  --maximize                          Развернуть последнее указанное окно;\n"
-"                                      применимо только к одному окну; можно\n"
-"                                      указывать для каждого окна, "
-"создаваемого\n"
-"                                      из командной строки"
+#. parameter of --startup-id
+#: ../terminal/main.c:87
+#, fuzzy
+msgid "string"
+msgstr "Предупреждение"
 
-#: ../terminal/main.c:99
-msgid ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-menubar                      Показать меню в последнем  указанном "
-"окне;\n"
-"                                      можно указывать по одному разу для "
-"каждого\n"
-"                                      окна, создаваемого из командной строки"
+#. parameter of --icon
+#: ../terminal/main.c:89
+#, fuzzy
+msgid "icon"
+msgstr "Действие"
 
-#: ../terminal/main.c:104
-msgid ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#: ../terminal/main.c:91
+#, c-format
+msgid "See the %s man page for full explanation of the options above."
 msgstr ""
-"  --hide-menubar                      Скрыть  меню в последнем  указанном  "
-"окне;\n"
-"                                      можно указывать по одному разу для "
-"каждого\n"
-"                                      окна, создаваемого из командной строки"
 
-#: ../terminal/main.c:109
-msgid ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --show-borders                      Показать   заголовок  и  границы   "
-"окна  в\n"
-"                                      последнем  указанном окне; можно "
-"указывать\n"
-"                                      по   одному  разу   для   каждого    "
-"окна,\n"
-"                                      создаваемого из командной строки"
-
-#: ../terminal/main.c:114
-msgid ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --hide-borders                      Скрыть   заголовок   и   границы   "
-"окна  в\n"
-"                                      последнем  указанном окне; можно "
-"указывать\n"
-"                                      по   одному    разу  для    каждого  "
-"окна,\n"
-"                                      создаваемого из командной строки"
-
-#: ../terminal/main.c:119
-msgid ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-toolbars                     Показать  панель  инструментов в "
-"последнем\n"
-"                                      открытом  окне; можно  указывать по "
-"одному\n"
-"                                      разу  для  каждого  окна,  "
-"создаваемого из\n"
-"                                      командной строки"
-
-#: ../terminal/main.c:124
-msgid ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --hide-toolbars                     Скрыть  панель  инструментов  в  "
-"последнем\n"
-"                                      открытом  окне; можно  указывать по "
-"одному\n"
-"                                      разу  для каждого  окна,  "
-"создаваемого  из\n"
-"                                      командной строки"
-
-#: ../terminal/main.c:151 ../terminal/terminal-preferences.c:1263
+#: ../terminal/main.c:118 ../terminal/terminal-preferences.c:1263
 #: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr "Terminal"
 
 # c-format
-#: ../terminal/main.c:173, c-format
+#: ../terminal/main.c:135
+#, fuzzy, c-format
 msgid ""
 "%s (Xfce %s)\n"
 "\n"
@@ -337,31 +126,26 @@ msgstr ""
 "\n"
 "Сообщайте об ошибках по адресу: <%s>.\n"
 
-#: ../terminal/main.c:267
+#: ../terminal/main.c:239
 #, c-format
 msgid "Unable to register terminal service: %s\n"
 msgstr "Невозможно запустить службу терминала: %s\n"
 
-#: ../terminal/main.c:276
-#, c-format
-msgid "Unable to launch terminal: %s\n"
-msgstr "Невозможно запустить терминал: %s\n"
-
-#: ../terminal/terminal-app.c:551
+#: ../terminal/terminal-app.c:554
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "Неверная строка с размерами: \"%s\"\n"
 
-#: ../terminal/terminal-dbus.c:114
+#: ../terminal/terminal-dbus.c:108
 msgid "User id mismatch"
 msgstr "Несовпадение идентификатора пользователя"
 
-#: ../terminal/terminal-dbus.c:146
+#: ../terminal/terminal-dbus.c:134
 #, c-format
 msgid "D-BUS message bus disconnected, exiting...\n"
 msgstr "Произошло отсоединение от D-BUS, выход из программы...\n"
 
-#: ../terminal/terminal-dbus.c:208
+#: ../terminal/terminal-dbus.c:196
 #, c-format
 msgid "Unable to register object %s"
 msgstr "Невозможно зарегистрировать объект %s"
@@ -387,7 +171,7 @@ msgstr "Посетить сайт программы Терминал"
 msgid "Failed to open the documentation browser"
 msgstr "Не удалось открыть браузер для просмотра документации"
 
-#: ../terminal/terminal-options.c:189
+#: ../terminal/terminal-options.c:206
 #, c-format
 msgid ""
 "Option \"--default-display\" requires specifying the default X display as "
@@ -396,7 +180,7 @@ msgstr ""
 "Для параметра \"--default-display\" в качестве значения требуется указать "
 "экран X по умолчанию"
 
-#: ../terminal/terminal-options.c:204
+#: ../terminal/terminal-options.c:221
 #, c-format
 msgid ""
 "Option \"--default-working-directory\" requires specifying the default "
@@ -405,14 +189,7 @@ msgstr ""
 "Для параметра \"--default-working-directory\" в качестве значения требуется "
 "указать рабочий каталог по умолчанию"
 
-#: ../terminal/terminal-options.c:235
-#, c-format
-msgid ""
-"Option \"--sm-client-id\" requires specifying the session id as its parameter"
-msgstr ""
-"Для параметра \"--sm-client-id\" требуется указать идентификатор сеанса"
-
-#: ../terminal/terminal-options.c:250
+#: ../terminal/terminal-options.c:237
 #, c-format
 msgid ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
@@ -421,7 +198,7 @@ msgstr ""
 "Для параметра \"--execute/-x\" требуется указать команду, которую следует "
 "выполнить"
 
-#: ../terminal/terminal-options.c:267
+#: ../terminal/terminal-options.c:254
 #, c-format
 msgid ""
 "Option \"--command/-e\" requires specifying the command to run as its "
@@ -430,7 +207,7 @@ msgstr ""
 "Для параметра \"--command/-e\" требуется указать команду, которую следует "
 "выполнить"
 
-#: ../terminal/terminal-options.c:284
+#: ../terminal/terminal-options.c:271
 #, c-format
 msgid ""
 "Option \"--working-directory\" requires specifying the working directory as "
@@ -438,20 +215,20 @@ msgid ""
 msgstr ""
 "Для параметра \"--working-directory\" требуется указать рабочий каталог"
 
-#: ../terminal/terminal-options.c:299
+#: ../terminal/terminal-options.c:286
 #, c-format
 msgid "Option \"--title/-T\" requires specifying the title as its parameter"
 msgstr ""
 "Для параметра \"--title/-T\" в качестве значения требуется указать заголовок"
 
-#: ../terminal/terminal-options.c:319
+#: ../terminal/terminal-options.c:305
 #, c-format
 msgid ""
 "Option \"--display\" requires specifying the X display as its parameters"
 msgstr ""
 "Для параметра \"--display\" в качестве значения требуется указать X-экран"
 
-#: ../terminal/terminal-options.c:334
+#: ../terminal/terminal-options.c:320
 #, c-format
 msgid ""
 "Option \"--geometry\" requires specifying the window geometry as its "
@@ -460,19 +237,20 @@ msgstr ""
 "Для параметра \"--geometry\" в качестве значения требуется указать размеры "
 "окна"
 
-#: ../terminal/terminal-options.c:349
+#: ../terminal/terminal-options.c:335
 #, c-format
 msgid "Option \"--role\" requires specifying the window role as its parameter"
 msgstr ""
 "Для параметра \"--role\" в качестве значения требуется указать роль окна"
 
-#: ../terminal/terminal-options.c:364
+#: ../terminal/terminal-options.c:350
 #, c-format
 msgid ""
 "Option \"--startup-id\" requires specifying the startup id as its parameter"
 msgstr "Для параметра \"--startup-id\" требуется указать идентификатор запуска"
 
-#: ../terminal/terminal-options.c:379, c-format
+#: ../terminal/terminal-options.c:365
+#, c-format
 msgid ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
 "parameter"
@@ -480,7 +258,7 @@ msgstr ""
 "Для параметра \"--icon/-I\" требуется указать название значка или путь к "
 "файлу"
 
-#: ../terminal/terminal-options.c:435
+#: ../terminal/terminal-options.c:419
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Неизвестный параметр \"%s\""
@@ -549,7 +327,7 @@ msgstr "Полноэкранный режим"
 msgid "Set Title"
 msgstr "Изменить заголовок"
 
-#: ../terminal/terminal-preferences.c:464
+#: ../terminal/terminal-preferences.c:464 ../terminal/terminal-window.c:237
 msgid "Reset"
 msgstr "Сбросить"
 
@@ -731,7 +509,8 @@ msgstr ""
 "Получены недопустимые данные о цвете: неверный формат (%d) или длина (%d)\n"
 
 #. tell the user that we were unable to open the responsible application
-#: ../terminal/terminal-widget.c:705, c-format
+#: ../terminal/terminal-widget.c:705
+#, c-format
 msgid "Failed to open the URL `%s'"
 msgstr "Не удалось открыть адрес \"%s\""
 
@@ -847,6 +626,11 @@ msgstr "_Сбросить"
 msgid "Reset and C_lear"
 msgstr "Сбросить и _очистить"
 
+#: ../terminal/terminal-window.c:238
+#, fuzzy
+msgid "Reset and clear"
+msgstr "Сбросить и очистить"
+
 #: ../terminal/terminal-window.c:239
 msgid "_Go"
 msgstr "П_ереход"
@@ -1470,6 +1254,282 @@ msgstr "_Обновлять записи utmp/wtmp при запуске ком
 msgid "seconds"
 msgstr "секунд"
 
+#~ msgid ""
+#~ "  -h, --help                          Print this help message and exit"
+#~ msgstr "  -h, --help                          Вывести эту подсказку и выйти"
+
+#~ msgid ""
+#~ "  -V, --version                       Print version information and exit"
+#~ msgstr ""
+#~ "  -v, --version                       Вывести сведения о версии и выйти"
+
+#~ msgid ""
+#~ "  --disable-server                    Do not register with the D-BUS\n"
+#~ "                                      session message bus"
+#~ msgstr ""
+#~ "  --disable-server                    Не  регистрироваться в  системе  "
+#~ "сообщений\n"
+#~ "                                      D-BUS"
+
+#~ msgid "  --default-display=DISPLAY           default X display to use"
+#~ msgstr "  --default-display=ЭКРАН            Экран X-сервера по умолчанию"
+
+#~ msgid ""
+#~ "  --default-working-directory=DIRNAME Set the default terminal's working\n"
+#~ "                                      directory"
+#~ msgstr ""
+#~ "  --default-working-directory=КАТАЛОГ Установить для терминалов рабочий\n"
+#~ "каталог по умолчанию"
+
+#~ msgid ""
+#~ "  --tab                               Open a new tab in the last-"
+#~ "specified\n"
+#~ "                                      window; more than one of these\n"
+#~ "                                      options can be provided"
+#~ msgstr ""
+#~ "  --tab                               Открыть    новую   вкладку   в   "
+#~ "последнем\n"
+#~ "                                      указанном   окне;  этот   "
+#~ "параметр   можно\n"
+#~ "                                      указать несколько раз"
+
+#~ msgid ""
+#~ "  --window                            Open a new window containing one "
+#~ "tab;\n"
+#~ "                                      more than one of these options can "
+#~ "be\n"
+#~ "                                      provided"
+#~ msgstr ""
+#~ "  --window                            Открыть   новое  окно  с  одной  "
+#~ "вкладкой;\n"
+#~ "                                      этот  параметр  можно  указать   "
+#~ "несколько\n"
+#~ "                                      раз"
+
+#~ msgid ""
+#~ "  -x, --execute                       Execute the remainder of the "
+#~ "command\n"
+#~ "                                      line inside the terminal"
+#~ msgstr ""
+#~ "  -x, --execute                       Выполнить   оставшуюся   часть   "
+#~ "командной\n"
+#~ "                                      строки в терминале"
+
+#~ msgid ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+#~ msgstr ""
+#~ "  -e, --command=STRING                Выполнить   аргумент   этого  "
+#~ "параметра  в\n"
+#~ "                                      терминале"
+
+#~ msgid ""
+#~ "  --working-directory=DIRNAME         Set the terminal's working directory"
+#~ msgstr ""
+#~ "  --working-directory=КАТАЛОГ         Выбрать текущий каталог терминала"
+
+#~ msgid "  -T, --title=TITLE                   Set the terminal's title"
+#~ msgstr ""
+#~ "  -T, --title=ЗАГОЛОВОК               Установить заголовок окна терминала"
+
+#~ msgid ""
+#~ "  -H, --hold                          Do not immediately destroy the tab\n"
+#~ "                                      when the child command exits"
+#~ msgstr ""
+#~ "  -H, --hold                          Не   уничтожать    вкладку   "
+#~ "сразу   после\n"
+#~ "                                      завершения команды"
+
+#~ msgid ""
+#~ "  --display=DISPLAY                   X display to use for the last-\n"
+#~ "                                      specified window"
+#~ msgstr ""
+#~ "  --display=DISPLAY                   Экран X-сервера для последнего  "
+#~ "указанного\n"
+#~ "                                      окна"
+
+#~ msgid ""
+#~ "  --geometry=GEOMETRY                 X geometry specification (see \"X"
+#~ "\"\n"
+#~ "                                      man page), can be specified once "
+#~ "per\n"
+#~ "                                      window to be opened"
+#~ msgstr ""
+#~ "  --geometry=РАЗМЕРЫ                  Указать  X-размеры для  "
+#~ "открываемого  окна\n"
+#~ "                                      (см.  man X),  указывается   "
+#~ "единожды  для\n"
+#~ "                                      каждого открываемого окна"
+
+#~ msgid ""
+#~ "  --role=ROLE                         Set the role for the last-"
+#~ "specified\n"
+#~ "                                      window; applies to only one "
+#~ "window;\n"
+#~ "                                      can be specified once for each "
+#~ "window\n"
+#~ "                                      you create from the command line"
+#~ msgstr ""
+#~ "  --role=РОЛЬ                         Назначить роль последнего "
+#~ "указанного окна;\n"
+#~ "                                      применяется только к одному окну;\n"
+#~ "                                      указывается     единожды    для    "
+#~ "каждого\n"
+#~ "                                      создаваемого окна"
+
+#~ msgid ""
+#~ "  --startup-id=STRING                 ID for the startup notification\n"
+#~ "                                      protocol"
+#~ msgstr ""
+#~ "  --startup-id=СТРОКА                 Идентификатор уведомления о запуске"
+
+#~ msgid ""
+#~ "  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
+#~ "                                      name or filename"
+#~ msgstr ""
+#~ "  -I, --icon=ICON                     Задать значок для терминала в "
+#~ "форме\n"
+#~ "                                      названия значка или имени файла"
+
+#~ msgid ""
+#~ "  --fullscreen                        Set the last-specified window into\n"
+#~ "                                      fullscreen mode; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --fullscreen                        Переключить  последнее   указанное  "
+#~ "окно в\n"
+#~ "                                      полноэкранный   режим; можно  "
+#~ "указывать по\n"
+#~ "                                      одному разу для каждого окна, "
+#~ "создаваемого\n"
+#~ "                                      из командной строки."
+
+#~ msgid ""
+#~ "  --maximize                          Maximize the last-specified "
+#~ "window;\n"
+#~ "                                      applies to only one window; can be\n"
+#~ "                                      specified once for each window you\n"
+#~ "                                      create from the command line"
+#~ msgstr ""
+#~ "  --maximize                          Развернуть последнее указанное "
+#~ "окно;\n"
+#~ "                                      применимо только к одному окну; "
+#~ "можно\n"
+#~ "                                      указывать для каждого окна, "
+#~ "создаваемого\n"
+#~ "                                      из командной строки"
+
+#~ msgid ""
+#~ "  --show-menubar                      Turn on the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-menubar                      Показать меню в последнем  "
+#~ "указанном окне;\n"
+#~ "                                      можно указывать по одному разу для "
+#~ "каждого\n"
+#~ "                                      окна, создаваемого из командной "
+#~ "строки"
+
+#~ msgid ""
+#~ "  --hide-menubar                      Turn off the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-menubar                      Скрыть  меню в последнем  "
+#~ "указанном  окне;\n"
+#~ "                                      можно указывать по одному разу для "
+#~ "каждого\n"
+#~ "                                      окна, создаваемого из командной "
+#~ "строки"
+
+#~ msgid ""
+#~ "  --show-borders                      Turn on the window decorations for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --show-borders                      Показать   заголовок  и  границы   "
+#~ "окна  в\n"
+#~ "                                      последнем  указанном окне; можно "
+#~ "указывать\n"
+#~ "                                      по   одному  разу   для   "
+#~ "каждого    окна,\n"
+#~ "                                      создаваемого из командной строки"
+
+#~ msgid ""
+#~ "  --hide-borders                      Turn off the window decorations "
+#~ "for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --hide-borders                      Скрыть   заголовок   и   границы   "
+#~ "окна  в\n"
+#~ "                                      последнем  указанном окне; можно "
+#~ "указывать\n"
+#~ "                                      по   одному    разу  для    "
+#~ "каждого  окна,\n"
+#~ "                                      создаваемого из командной строки"
+
+#~ msgid ""
+#~ "  --show-toolbars                     Turn on the toolbars for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-toolbars                     Показать  панель  инструментов в "
+#~ "последнем\n"
+#~ "                                      открытом  окне; можно  указывать по "
+#~ "одному\n"
+#~ "                                      разу  для  каждого  окна,  "
+#~ "создаваемого из\n"
+#~ "                                      командной строки"
+
+#~ msgid ""
+#~ "  --hide-toolbars                     Turn off the toolbars for the "
+#~ "last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-toolbars                     Скрыть  панель  инструментов  в  "
+#~ "последнем\n"
+#~ "                                      открытом  окне; можно  указывать по "
+#~ "одному\n"
+#~ "                                      разу  для каждого  окна,  "
+#~ "создаваемого  из\n"
+#~ "                                      командной строки"
+
+#~ msgid "Unable to launch terminal: %s\n"
+#~ msgstr "Невозможно запустить терминал: %s\n"
+
+#~ msgid ""
+#~ "Option \"--sm-client-id\" requires specifying the session id as its "
+#~ "parameter"
+#~ msgstr ""
+#~ "Для параметра \"--sm-client-id\" требуется указать идентификатор сеанса"
+
 #~ msgid "<b>Title:</b>"
 #~ msgstr "<b>Заголовок:</b>"
 
diff --git a/po/sk.po b/po/sk.po
index 5b7d6d7..b437d1d 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Terminal 0.2.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 11:48+0100\n"
+"POT-Creation-Date: 2009-12-14 16:03+0100\n"
 "PO-Revision-Date: 2008-05-28 01:17-0700\n"
 "Last-Translator: Roman Moravcik <roman.moravcik at gmail.com>\n"
 "Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
@@ -15,287 +15,91 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../terminal/main.c:46
+#: ../terminal/main.c:48
 msgid "Usage:"
 msgstr ""
 
-#: ../terminal/main.c:47
+#: ../terminal/main.c:48
 msgid "OPTION"
 msgstr ""
 
-#: ../terminal/main.c:49
+#: ../terminal/main.c:53
 #, fuzzy
 msgid "General Options"
 msgstr "Všeobecné"
 
-#: ../terminal/main.c:50
-msgid "  -h, --help                          Print this help message and exit"
-msgstr "  -h, --help                          Zobrazí nápovedu a ukončí sa"
-
-#: ../terminal/main.c:51
+#. parameter of --default-display
+#. parameter of --display
+#: ../terminal/main.c:55 ../terminal/main.c:81
 #, fuzzy
-msgid ""
-"  -V, --version                       Print version information and exit"
-msgstr "  -v, --version                       Zobrazí číslo verzie a ukončí sa"
-
-#: ../terminal/main.c:52
-msgid ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
-msgstr "  --disable-server                    Neprihlási sa k zbernici D-BUS"
-
-#: ../terminal/main.c:54
-msgid "  --default-display=DISPLAY           default X display to use"
-msgstr "  --defalut-display=DISPEJ            použiť východzí X displej"
+msgid "display"
+msgstr "Nezobrazené"
 
-#: ../terminal/main.c:55
-msgid ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
+#. parameter of --default-working-directory
+#. parameter of --working-directory
+#: ../terminal/main.c:57 ../terminal/main.c:72
+msgid "directory"
 msgstr ""
-"  --default-working-directory=ZLOŽKA  Nastaví východzí pracovný adresár\n"
-"                                      pre terminál"
 
-#: ../terminal/main.c:58
+#: ../terminal/main.c:61
 msgid "Window or Tab Separators"
 msgstr ""
 
-#: ../terminal/main.c:59
-msgid ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-msgstr ""
-"  --tab                               Otvorí novú záložku v poslednom "
-"špecifikovanom\n"
-"                                      okne; je povolených vykonať viac "
-"takýchto\n"
-"                                      volieb"
-
-#: ../terminal/main.c:62
-msgid ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-msgstr ""
-"  --window                            Otvor nové okno obsahujúce jednu "
-"záložku;\n"
-"                                      je povolených vykonať viac takýchto\n"
-"                                      volieb"
-
 #: ../terminal/main.c:66
 #, fuzzy
 msgid "Tab Options"
 msgstr "Titulok karty"
 
-#: ../terminal/main.c:67
-msgid ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-msgstr ""
-"  -x, --execute                       Spustí zvyšok príkazového riadka v "
-"termináli"
-
-#: ../terminal/main.c:69
-msgid ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-msgstr ""
-"  -e, --command=REŤAZEC               Spustí argument k tejto voľbe\n"
-"                                      v termináli"
-
-#: ../terminal/main.c:71
-msgid ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
-msgstr ""
-"  --working-directory=NÁZOV_ADRESÁRA  Nastaví pracovný adresár terminálu"
-
-#: ../terminal/main.c:72
-msgid "  -T, --title=TITLE                   Set the terminal's title"
-msgstr "  -T, --title=TITULOK                 Nastaví titulok terminálu"
-
-#: ../terminal/main.c:73
-msgid ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-msgstr ""
-"  -H, --hold                          Nezatvorí kartu inheď po skončení\n"
-"                                      potomka"
-
-#: ../terminal/main.c:76
+#. parameter of --command
+#: ../terminal/main.c:68
 #, fuzzy
-msgid "Window Options"
-msgstr "Neznáma predvoľba \"%s\""
+msgid "command"
+msgstr "<b>Príkaz</b>"
 
-#: ../terminal/main.c:77
-msgid ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
-msgstr ""
-"  -display=DISPLEJ                    Displej X servera pre posledné\n"
-"                                      zadané okno"
+#. parameter of --title
+#: ../terminal/main.c:70
+#, fuzzy
+msgid "title"
+msgstr "Titulok"
 
 #: ../terminal/main.c:79
-msgid ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
-msgstr ""
-"  --geometry=GEOMETRIA                Špecifikácia geometrie X (viď "
-"manuálovú\n"
-"                                      stránku \"X\"), môže byť zadaná jedna "
-"na\n"
-"                                      otvorené okno"
-
-#: ../terminal/main.c:82
 #, fuzzy
-msgid ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
-msgstr ""
-"  --role=ÚLOHA                        Nastaví úlohu pre posledné zadané\n"
-"                                      okno; použije sa len pre jedno okno;\n"
-"                                      môže byť zadané jeden raz pre každé\n"
-"                                      okno spustené z príkazovej riadky"
+msgid "Window Options"
+msgstr "Neznáma predvoľba \"%s\""
 
-#: ../terminal/main.c:86
-msgid ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
+#. parameter of --geometry
+#: ../terminal/main.c:83
+msgid "geometry"
 msgstr ""
-"  --startup-id=REŤAZEC                Identifikátor pre protokol oznámenia\n"
-"                                      pri spustení"
 
-#: ../terminal/main.c:88
-#, fuzzy
-msgid ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
+#. parameter of --role
+#: ../terminal/main.c:85
+msgid "role"
 msgstr ""
-"  -e, --command=REŤAZEC               Spustí argument k tejto voľbe\n"
-"                                      v termináli"
 
-#: ../terminal/main.c:90
+#. parameter of --startup-id
+#: ../terminal/main.c:87
 #, fuzzy
-msgid ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --fullscreen                        Prepne posledné zadané okno do režimu "
-"celej\n"
-"                                      obrazovky; použije sa len pre jedno "
-"okno;\n"
-"                                      môže byť zadané raz pre každé okno\n"
-"                                      spustené z príkazového riadku"
+msgid "string"
+msgstr "Upozornenie"
 
-#: ../terminal/main.c:95
+#. parameter of --icon
+#: ../terminal/main.c:89
 #, fuzzy
-msgid ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
-msgstr ""
-"  --role=ÚLOHA                        Nastaví úlohu pre posledné zadané\n"
-"                                      okno; použije sa len pre jedno okno;\n"
-"                                      môže byť zadané jeden raz pre každé\n"
-"                                      okno spustené z príkazovej riadky"
-
-#: ../terminal/main.c:99
-msgid ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-menubar                      Zobrazí ponuku okna pre posledné "
-"zadané okno;\n"
-"                                      použije sa len pre jedno okno;\n"
-"                                      môže byť zadané raz pre každé okno\n"
-"                                      spustené z príkazového riadku"
-
-#: ../terminal/main.c:104
-msgid ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --hide menubar                      Skryje ponuku okna pre posledné zadané "
-"okno;\n"
-"                                      použije sa len pre jedno okno;\n"
-"                                      môže byť zadané raz pre každé okno\n"
-"                                      spustené z príkazového riadku"
-
-#: ../terminal/main.c:109
-msgid ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --show-borders                      Zapne dekoráciu okna pre posledné "
-"zadané okno;\n"
-"                                      použije sa len pre jedno okno;\n"
-"                                      môže byť zadané raz pre každé okno\n"
-"                                      spustené z príkazového riadku"
-
-#: ../terminal/main.c:114
-msgid ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --hide-borders                      Vypne dekorácie okna pre posledné "
-"zadané\n"
-"                                      okno; použije sa len pre jedno okno;\n"
-"                                      môže byť zadané raz pre každé okno\n"
-"                                      spustené z príkazového riadku"
-
-#: ../terminal/main.c:119
-msgid ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-toolbars                     Zapne panely nástrojov pre posledné\n"
-"                                      zadané okno; použije sa len na jedno "
-"okno;\n"
-"                                      môže byť zadané raz pre každé okno\n"
-"                                      vytvorené z príkazového riadka"
+msgid "icon"
+msgstr "Akcia"
 
-#: ../terminal/main.c:124
-msgid ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#: ../terminal/main.c:91
+#, c-format
+msgid "See the %s man page for full explanation of the options above."
 msgstr ""
-"  --hide-toolbars                     Vypne panely nástrojov pre posledné\n"
-"                                      zadané okno; použije sa len na jedno\n"
-"                                      okno; môže byť zadané raz pre každé "
-"okno\n"
-"                                      vytvorené z príkazovej riadky"
 
-#: ../terminal/main.c:151 ../terminal/terminal-preferences.c:1263
+#: ../terminal/main.c:118 ../terminal/terminal-preferences.c:1263
 #: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr "Terminál"
 
-#: ../terminal/main.c:173
+#: ../terminal/main.c:135
 #, c-format
 msgid ""
 "%s (Xfce %s)\n"
@@ -320,31 +124,26 @@ msgstr ""
 "\n"
 "Chyby oznamujte na <%s>.\n"
 
-#: ../terminal/main.c:267
+#: ../terminal/main.c:239
 #, c-format
 msgid "Unable to register terminal service: %s\n"
 msgstr "Nejde registrovať službu terminálu: %s\n"
 
-#: ../terminal/main.c:276
-#, c-format
-msgid "Unable to launch terminal: %s\n"
-msgstr "Nejde spustiť terminál: %s\n"
-
-#: ../terminal/terminal-app.c:551
+#: ../terminal/terminal-app.c:554
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "Neplatný reťazec geometrie \"%s\"\n"
 
-#: ../terminal/terminal-dbus.c:114
+#: ../terminal/terminal-dbus.c:108
 msgid "User id mismatch"
 msgstr "ID užívateľa sa nezhoduje"
 
-#: ../terminal/terminal-dbus.c:146
+#: ../terminal/terminal-dbus.c:134
 #, c-format
 msgid "D-BUS message bus disconnected, exiting...\n"
 msgstr "Zbernica D-BUS bola odpojená, ukončujem...\n"
 
-#: ../terminal/terminal-dbus.c:208
+#: ../terminal/terminal-dbus.c:196
 #, c-format
 msgid "Unable to register object %s"
 msgstr "Nejde registrovať objekt %s"
@@ -366,7 +165,7 @@ msgstr ""
 msgid "Failed to open the documentation browser"
 msgstr "Nepodarilo sa otvoriť prehliadač dokumentácie"
 
-#: ../terminal/terminal-options.c:189
+#: ../terminal/terminal-options.c:206
 #, c-format
 msgid ""
 "Option \"--default-display\" requires specifying the default X display as "
@@ -375,7 +174,7 @@ msgstr ""
 "Voľba \"--default-display\" vyžaduje zadanie východzieho X displeja ako jej "
 "parameter"
 
-#: ../terminal/terminal-options.c:204
+#: ../terminal/terminal-options.c:221
 #, c-format
 msgid ""
 "Option \"--default-working-directory\" requires specifying the default "
@@ -384,15 +183,7 @@ msgstr ""
 "Voľba \"--default-working-directory\" vyžaduje zadanie východziehopracovného "
 "adresára ako jej parameter"
 
-#: ../terminal/terminal-options.c:235
-#, c-format
-msgid ""
-"Option \"--sm-client-id\" requires specifying the session id as its parameter"
-msgstr ""
-"Voľba \"--sm-client-id\" vyžaduje zadanie identifikátoru sedenia (id) ako "
-"parametru"
-
-#: ../terminal/terminal-options.c:250
+#: ../terminal/terminal-options.c:237
 #, c-format
 msgid ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
@@ -401,7 +192,7 @@ msgstr ""
 "Voľba \"--execute/-x\" vyžaduje zadanie príkazu ku spusteniu na zvyšku "
 "príkazového riadka"
 
-#: ../terminal/terminal-options.c:267
+#: ../terminal/terminal-options.c:254
 #, c-format
 msgid ""
 "Option \"--command/-e\" requires specifying the command to run as its "
@@ -410,7 +201,7 @@ msgstr ""
 "Voľba \"--command/-e\" vyžaduje zadanie príkazu ku spusteniu ako jeho "
 "parametra"
 
-#: ../terminal/terminal-options.c:284
+#: ../terminal/terminal-options.c:271
 #, c-format
 msgid ""
 "Option \"--working-directory\" requires specifying the working directory as "
@@ -419,18 +210,18 @@ msgstr ""
 "Voľba \"--working-directory\" vyžaduje zadanie pracovného adresára ako "
 "parametera"
 
-#: ../terminal/terminal-options.c:299
+#: ../terminal/terminal-options.c:286
 #, c-format
 msgid "Option \"--title/-T\" requires specifying the title as its parameter"
 msgstr "Voľba \"--title/-T\" vyžaduje zadanie titulku ako jeho parametra"
 
-#: ../terminal/terminal-options.c:319
+#: ../terminal/terminal-options.c:305
 #, c-format
 msgid ""
 "Option \"--display\" requires specifying the X display as its parameters"
 msgstr "Voľba \"--display\" vyžaduje zadanie X displeja ako jeho parametra"
 
-#: ../terminal/terminal-options.c:334
+#: ../terminal/terminal-options.c:320
 #, c-format
 msgid ""
 "Option \"--geometry\" requires specifying the window geometry as its "
@@ -438,12 +229,12 @@ msgid ""
 msgstr ""
 "Voľba \"--geometry\" vyžaduje zadanie geometrie okna ako jeho parametra"
 
-#: ../terminal/terminal-options.c:349
+#: ../terminal/terminal-options.c:335
 #, c-format
 msgid "Option \"--role\" requires specifying the window role as its parameter"
 msgstr "Voľba \"--role\" vyžaduje zadanie úlohy okna ako jeho parametra"
 
-#: ../terminal/terminal-options.c:364
+#: ../terminal/terminal-options.c:350
 #, c-format
 msgid ""
 "Option \"--startup-id\" requires specifying the startup id as its parameter"
@@ -451,7 +242,7 @@ msgstr ""
 "Voľba \"--startup-id\" vyžaduje zadanie spúšťacieho identifikátora (id) ako "
 "jeho parametra"
 
-#: ../terminal/terminal-options.c:379
+#: ../terminal/terminal-options.c:365
 #, fuzzy, c-format
 msgid ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
@@ -460,7 +251,7 @@ msgstr ""
 "Voľba \"--command/-e\" vyžaduje zadanie príkazu ku spusteniu ako jeho "
 "parametra"
 
-#: ../terminal/terminal-options.c:435
+#: ../terminal/terminal-options.c:419
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Neznáma predvoľba \"%s\""
@@ -529,7 +320,7 @@ msgstr "Celá obrazovka"
 msgid "Set Title"
 msgstr "Nastaviť titulok"
 
-#: ../terminal/terminal-preferences.c:464
+#: ../terminal/terminal-preferences.c:464 ../terminal/terminal-window.c:237
 msgid "Reset"
 msgstr "Reštartovať"
 
@@ -827,6 +618,11 @@ msgstr "_Reštartovať"
 msgid "Reset and C_lear"
 msgstr "Reštartovať a _vymazať"
 
+#: ../terminal/terminal-window.c:238
+#, fuzzy
+msgid "Reset and clear"
+msgstr "Reštartovať a vymazať"
+
 #: ../terminal/terminal-window.c:239
 msgid "_Go"
 msgstr "_Prejsť"
@@ -1502,6 +1298,274 @@ msgstr "_Aktualizovať záznamy utmp/wtmp pri spustení príkazu"
 msgid "seconds"
 msgstr ""
 
+#~ msgid ""
+#~ "  -h, --help                          Print this help message and exit"
+#~ msgstr "  -h, --help                          Zobrazí nápovedu a ukončí sa"
+
+#, fuzzy
+#~ msgid ""
+#~ "  -V, --version                       Print version information and exit"
+#~ msgstr ""
+#~ "  -v, --version                       Zobrazí číslo verzie a ukončí sa"
+
+#~ msgid ""
+#~ "  --disable-server                    Do not register with the D-BUS\n"
+#~ "                                      session message bus"
+#~ msgstr ""
+#~ "  --disable-server                    Neprihlási sa k zbernici D-BUS"
+
+#~ msgid "  --default-display=DISPLAY           default X display to use"
+#~ msgstr "  --defalut-display=DISPEJ            použiť východzí X displej"
+
+#~ msgid ""
+#~ "  --default-working-directory=DIRNAME Set the default terminal's working\n"
+#~ "                                      directory"
+#~ msgstr ""
+#~ "  --default-working-directory=ZLOŽKA  Nastaví východzí pracovný adresár\n"
+#~ "                                      pre terminál"
+
+#~ msgid ""
+#~ "  --tab                               Open a new tab in the last-"
+#~ "specified\n"
+#~ "                                      window; more than one of these\n"
+#~ "                                      options can be provided"
+#~ msgstr ""
+#~ "  --tab                               Otvorí novú záložku v poslednom "
+#~ "špecifikovanom\n"
+#~ "                                      okne; je povolených vykonať viac "
+#~ "takýchto\n"
+#~ "                                      volieb"
+
+#~ msgid ""
+#~ "  --window                            Open a new window containing one "
+#~ "tab;\n"
+#~ "                                      more than one of these options can "
+#~ "be\n"
+#~ "                                      provided"
+#~ msgstr ""
+#~ "  --window                            Otvor nové okno obsahujúce jednu "
+#~ "záložku;\n"
+#~ "                                      je povolených vykonať viac "
+#~ "takýchto\n"
+#~ "                                      volieb"
+
+#~ msgid ""
+#~ "  -x, --execute                       Execute the remainder of the "
+#~ "command\n"
+#~ "                                      line inside the terminal"
+#~ msgstr ""
+#~ "  -x, --execute                       Spustí zvyšok príkazového riadka v "
+#~ "termináli"
+
+#~ msgid ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+#~ msgstr ""
+#~ "  -e, --command=REŤAZEC               Spustí argument k tejto voľbe\n"
+#~ "                                      v termináli"
+
+#~ msgid ""
+#~ "  --working-directory=DIRNAME         Set the terminal's working directory"
+#~ msgstr ""
+#~ "  --working-directory=NÁZOV_ADRESÁRA  Nastaví pracovný adresár terminálu"
+
+#~ msgid "  -T, --title=TITLE                   Set the terminal's title"
+#~ msgstr "  -T, --title=TITULOK                 Nastaví titulok terminálu"
+
+#~ msgid ""
+#~ "  -H, --hold                          Do not immediately destroy the tab\n"
+#~ "                                      when the child command exits"
+#~ msgstr ""
+#~ "  -H, --hold                          Nezatvorí kartu inheď po skončení\n"
+#~ "                                      potomka"
+
+#~ msgid ""
+#~ "  --display=DISPLAY                   X display to use for the last-\n"
+#~ "                                      specified window"
+#~ msgstr ""
+#~ "  -display=DISPLEJ                    Displej X servera pre posledné\n"
+#~ "                                      zadané okno"
+
+#~ msgid ""
+#~ "  --geometry=GEOMETRY                 X geometry specification (see \"X"
+#~ "\"\n"
+#~ "                                      man page), can be specified once "
+#~ "per\n"
+#~ "                                      window to be opened"
+#~ msgstr ""
+#~ "  --geometry=GEOMETRIA                Špecifikácia geometrie X (viď "
+#~ "manuálovú\n"
+#~ "                                      stránku \"X\"), môže byť zadaná "
+#~ "jedna na\n"
+#~ "                                      otvorené okno"
+
+#, fuzzy
+#~ msgid ""
+#~ "  --role=ROLE                         Set the role for the last-"
+#~ "specified\n"
+#~ "                                      window; applies to only one "
+#~ "window;\n"
+#~ "                                      can be specified once for each "
+#~ "window\n"
+#~ "                                      you create from the command line"
+#~ msgstr ""
+#~ "  --role=ÚLOHA                        Nastaví úlohu pre posledné zadané\n"
+#~ "                                      okno; použije sa len pre jedno "
+#~ "okno;\n"
+#~ "                                      môže byť zadané jeden raz pre "
+#~ "každé\n"
+#~ "                                      okno spustené z príkazovej riadky"
+
+#~ msgid ""
+#~ "  --startup-id=STRING                 ID for the startup notification\n"
+#~ "                                      protocol"
+#~ msgstr ""
+#~ "  --startup-id=REŤAZEC                Identifikátor pre protokol "
+#~ "oznámenia\n"
+#~ "                                      pri spustení"
+
+#, fuzzy
+#~ msgid ""
+#~ "  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
+#~ "                                      name or filename"
+#~ msgstr ""
+#~ "  -e, --command=REŤAZEC               Spustí argument k tejto voľbe\n"
+#~ "                                      v termináli"
+
+#, fuzzy
+#~ msgid ""
+#~ "  --fullscreen                        Set the last-specified window into\n"
+#~ "                                      fullscreen mode; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --fullscreen                        Prepne posledné zadané okno do "
+#~ "režimu celej\n"
+#~ "                                      obrazovky; použije sa len pre jedno "
+#~ "okno;\n"
+#~ "                                      môže byť zadané raz pre každé okno\n"
+#~ "                                      spustené z príkazového riadku"
+
+#, fuzzy
+#~ msgid ""
+#~ "  --maximize                          Maximize the last-specified "
+#~ "window;\n"
+#~ "                                      applies to only one window; can be\n"
+#~ "                                      specified once for each window you\n"
+#~ "                                      create from the command line"
+#~ msgstr ""
+#~ "  --role=ÚLOHA                        Nastaví úlohu pre posledné zadané\n"
+#~ "                                      okno; použije sa len pre jedno "
+#~ "okno;\n"
+#~ "                                      môže byť zadané jeden raz pre "
+#~ "každé\n"
+#~ "                                      okno spustené z príkazovej riadky"
+
+#~ msgid ""
+#~ "  --show-menubar                      Turn on the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-menubar                      Zobrazí ponuku okna pre posledné "
+#~ "zadané okno;\n"
+#~ "                                      použije sa len pre jedno okno;\n"
+#~ "                                      môže byť zadané raz pre každé okno\n"
+#~ "                                      spustené z príkazového riadku"
+
+#~ msgid ""
+#~ "  --hide-menubar                      Turn off the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide menubar                      Skryje ponuku okna pre posledné "
+#~ "zadané okno;\n"
+#~ "                                      použije sa len pre jedno okno;\n"
+#~ "                                      môže byť zadané raz pre každé okno\n"
+#~ "                                      spustené z príkazového riadku"
+
+#~ msgid ""
+#~ "  --show-borders                      Turn on the window decorations for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --show-borders                      Zapne dekoráciu okna pre posledné "
+#~ "zadané okno;\n"
+#~ "                                      použije sa len pre jedno okno;\n"
+#~ "                                      môže byť zadané raz pre každé okno\n"
+#~ "                                      spustené z príkazového riadku"
+
+#~ msgid ""
+#~ "  --hide-borders                      Turn off the window decorations "
+#~ "for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --hide-borders                      Vypne dekorácie okna pre posledné "
+#~ "zadané\n"
+#~ "                                      okno; použije sa len pre jedno "
+#~ "okno;\n"
+#~ "                                      môže byť zadané raz pre každé okno\n"
+#~ "                                      spustené z príkazového riadku"
+
+#~ msgid ""
+#~ "  --show-toolbars                     Turn on the toolbars for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-toolbars                     Zapne panely nástrojov pre "
+#~ "posledné\n"
+#~ "                                      zadané okno; použije sa len na "
+#~ "jedno okno;\n"
+#~ "                                      môže byť zadané raz pre každé okno\n"
+#~ "                                      vytvorené z príkazového riadka"
+
+#~ msgid ""
+#~ "  --hide-toolbars                     Turn off the toolbars for the "
+#~ "last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-toolbars                     Vypne panely nástrojov pre "
+#~ "posledné\n"
+#~ "                                      zadané okno; použije sa len na "
+#~ "jedno\n"
+#~ "                                      okno; môže byť zadané raz pre každé "
+#~ "okno\n"
+#~ "                                      vytvorené z príkazovej riadky"
+
+#~ msgid "Unable to launch terminal: %s\n"
+#~ msgstr "Nejde spustiť terminál: %s\n"
+
+#~ msgid ""
+#~ "Option \"--sm-client-id\" requires specifying the session id as its "
+#~ "parameter"
+#~ msgstr ""
+#~ "Voľba \"--sm-client-id\" vyžaduje zadanie identifikátoru sedenia (id) ako "
+#~ "parametru"
+
 #~ msgid "<b>Title:</b>"
 #~ msgstr "<b>Titulok:</b>"
 
diff --git a/po/sq.po b/po/sq.po
index 19ee983..d731c8d 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Terminal 0.2.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 11:48+0100\n"
+"POT-Creation-Date: 2009-12-14 16:03+0100\n"
 "PO-Revision-Date: 2008-11-04 22:24+0200\n"
 "Last-Translator: Besnik Bleta <besnik at programeshqip.org>\n"
 "Language-Team: Albanian <translation-team-sq at lists.sourceforge.net>\n"
@@ -14,290 +14,90 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../terminal/main.c:46
+#: ../terminal/main.c:48
 msgid "Usage:"
 msgstr ""
 
-#: ../terminal/main.c:47
+#: ../terminal/main.c:48
 msgid "OPTION"
 msgstr ""
 
-#: ../terminal/main.c:49
+#: ../terminal/main.c:53
 #, fuzzy
 msgid "General Options"
 msgstr "Të përgjithshme"
 
-#: ../terminal/main.c:50
-msgid "  -h, --help                          Print this help message and exit"
-msgstr "  -h, --help                          Shtyp këtë mesazh ndihme dhe dil"
-
-#: ../terminal/main.c:51
+#. parameter of --default-display
+#. parameter of --display
+#: ../terminal/main.c:55 ../terminal/main.c:81
 #, fuzzy
-msgid ""
-"  -V, --version                       Print version information and exit"
-msgstr "  -v, --version                       Shtyp të dhëna versioni dhe dil"
-
-#: ../terminal/main.c:52
-msgid ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
-msgstr ""
-"  --disable-server                    Mos u regjistro me bus mesazhesh\n"
-"                                       sesioni D-BUS-in"
+msgid "display"
+msgstr "S'paraqitet"
 
-#: ../terminal/main.c:54
-msgid "  --default-display=DISPLAY           default X display to use"
+#. parameter of --default-working-directory
+#. parameter of --working-directory
+#: ../terminal/main.c:57 ../terminal/main.c:72
+msgid "directory"
 msgstr ""
-"  --default-display=EKRAN           ekran X parazgjedhje për t'u përdorur"
 
-#: ../terminal/main.c:55
-msgid ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
-msgstr ""
-"  --default-working-directory=EMËR DREJTORIE  cakton drejtori parazgjedhje\n"
-"                                      për terminale punues"
-
-#: ../terminal/main.c:58
+#: ../terminal/main.c:61
 msgid "Window or Tab Separators"
 msgstr ""
 
-#: ../terminal/main.c:59
-msgid ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-msgstr ""
-"  --tab                               Hap skedë të re në dritaren\n"
-"                                      e treguar së fundi; mund të jepet\n"
-"                                      më shumë se një nga këto mundësi"
-
-#: ../terminal/main.c:62
-msgid ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-msgstr ""
-"  --window                            Hap një dritare të re që përmban "
-"vetëm\n"
-"                                       një skedë; mund të jepet më shumë se\n"
-"                                       një nga këto mundësi"
-
 #: ../terminal/main.c:66
 msgid "Tab Options"
 msgstr ""
 
-#: ../terminal/main.c:67
-msgid ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-msgstr ""
-"  -x, --execute                       Përmbush ç'mbetet prej rreshtit\n"
-"                                       të urdhrit brenda terminalit"
-
-#: ../terminal/main.c:69
-msgid ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-msgstr ""
-"  -e, --command=VARG                Përmbush argumentin për këtë\n"
-"                                      mundësi brenda terminalit"
-
-#: ../terminal/main.c:71
-msgid ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
-msgstr ""
-"  --working-directory=EMËR DREJTORIE         Caktoni drejtorinë e "
-"terminaleve punues"
-
-#: ../terminal/main.c:72
-msgid "  -T, --title=TITLE                   Set the terminal's title"
-msgstr "  -T, --title=TITULL                   Caktoni titull terminalesh"
+#. parameter of --command
+#: ../terminal/main.c:68
+#, fuzzy
+msgid "command"
+msgstr "<b>Urdhër</b>"
 
-#: ../terminal/main.c:73
-msgid ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-msgstr ""
-"  -H, --hold                          Mos asgjëso skedën menjëherë\n"
-"                                      pas daljes së urdhrit pjellë"
+#. parameter of --title
+#: ../terminal/main.c:70
+#, fuzzy
+msgid "title"
+msgstr "Tjegullëzuar"
 
-#: ../terminal/main.c:76
+#: ../terminal/main.c:79
 #, fuzzy
 msgid "Window Options"
 msgstr "Mundësi e panjohur \"%s\""
 
-#: ../terminal/main.c:77
-msgid ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
-msgstr ""
-"  --display=EKRAN                   ekran X për përdorim për dritaren\n"
-"                                      e fundit të treguar"
-
-#: ../terminal/main.c:79
-msgid ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
-msgstr ""
-"  --geometry=GJEOMETRI                 Përcaktime gjeometrie për X-in "
-"(shihni\n"
-"                                                faqe man për \"X\"), mund të "
-"përcaktohet\n"
-"                                               një herë për çdo dritare që "
-"do të hapet"
-
-#: ../terminal/main.c:82
-#, fuzzy
-msgid ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
+#. parameter of --geometry
+#: ../terminal/main.c:83
+msgid "geometry"
 msgstr ""
-"  --role=ROL                         Caktoni rolin e dritares së treguar\n"
-"                                      së fundmi; zbatohet vetëm mbi një "
-"dritare;\n"
-"                                      mund të tregohet një herë për çdo "
-"dritare\n"
-"                                      që krijoni prej rreshti urdhrash"
-
-#: ../terminal/main.c:86
-msgid ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
-msgstr "  --startup-id=VARG                 ID për protokoll njoftimi nisjeje"
 
-#: ../terminal/main.c:88
-#, fuzzy
-msgid ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
+#. parameter of --role
+#: ../terminal/main.c:85
+msgid "role"
 msgstr ""
-"  -e, --command=VARG                Përmbush argumentin për këtë\n"
-"                                      mundësi brenda terminalit"
 
-#: ../terminal/main.c:90
+#. parameter of --startup-id
+#: ../terminal/main.c:87
 #, fuzzy
-msgid ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --fullscreen                     Cakton për dritaren e fundit të treguar\n"
-"                                      mënyrën tërë ekrani; zbatohet vetëm\n"
-"                                      mbi një dritare; mund të përcaktohet\n"
-"                                      një herë për çdo dritare që krijoni\n"
-"                                      prej rreshti urdhrash."
+msgid "string"
+msgstr "Kujdes"
 
-#: ../terminal/main.c:95
+#. parameter of --icon
+#: ../terminal/main.c:89
 #, fuzzy
-msgid ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
-msgstr ""
-"  --role=ROL                         Caktoni rolin e dritares së treguar\n"
-"                                      së fundmi; zbatohet vetëm mbi një "
-"dritare;\n"
-"                                      mund të tregohet një herë për çdo "
-"dritare\n"
-"                                      që krijoni prej rreshti urdhrash"
-
-#: ../terminal/main.c:99
-msgid ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-menubar               Shfaq shtyllë menuje për dritaren\n"
-"                                      e fundit të treguar; zbatohet vetëm\n"
-"                                      mbi një dritare; mund të përcaktohet\n"
-"                                      një herë për çdo dritare që krijoni\n"
-"                                      prej rreshti urdhrash"
-
-#: ../terminal/main.c:104
-msgid ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --hide-menubar               Fsheh shtyllë menuje për dritaren\n"
-"                                      e fundit të treguar; zbatohet vetëm\n"
-"                                      mbi një dritare; mund të përcaktohet\n"
-"                                      një herë për çdo dritare që krijoni\n"
-"                                      prej rreshti urdhrash"
-
-#: ../terminal/main.c:109
-msgid ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --show-borders               Shfaq zbukurime dritaresh për dritaren\n"
-"                                      e fundit të treguar; zbatohet vetëm\n"
-"                                      mbi një dritare; mund të përcaktohet\n"
-"                                      një herë për çdo dritare që krijoni\n"
-"                                      prej rreshti urdhrash"
-
-#: ../terminal/main.c:114
-msgid ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --hide-borders                 Fsheh zbukurime dritaresh për dritaren\n"
-"                                      e fundit të treguar; zbatohet vetëm\n"
-"                                      mbi një dritare; mund të përcaktohet\n"
-"                                      një herë për çdo dritare që krijoni\n"
-"                                      prej rreshti urdhrash"
-
-#: ../terminal/main.c:119
-msgid ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-toolbars                          Shfaq panelet për dritaren\n"
-"                                      e fundit të treguar; zbatohet vetëm\n"
-"                                      mbi një dritare; mund të përcaktohet\n"
-"                                      një herë për çdo dritare që krijoni\n"
-"                                      prej rreshti urdhrash"
+msgid "icon"
+msgstr "Veprim"
 
-#: ../terminal/main.c:124
-msgid ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#: ../terminal/main.c:91
+#, c-format
+msgid "See the %s man page for full explanation of the options above."
 msgstr ""
-"  --hide-toolbars                     Fsheh panelet për dritaren\n"
-"                                      e fundit të treguar; zbatohet vetëm\n"
-"                                      mbi një dritare; mund të përcaktohet\n"
-"                                      një herë për çdo dritare që krijoni\n"
-"                                      prej rreshti urdhrash"
 
-#: ../terminal/main.c:151 ../terminal/terminal-preferences.c:1263
+#: ../terminal/main.c:118 ../terminal/terminal-preferences.c:1263
 #: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../terminal/main.c:173
+#: ../terminal/main.c:135
 #, c-format
 msgid ""
 "%s (Xfce %s)\n"
@@ -322,31 +122,26 @@ msgstr ""
 "\n"
 "Ju lutem njoftoni të metat te <%s>.\n"
 
-#: ../terminal/main.c:267
+#: ../terminal/main.c:239
 #, c-format
 msgid "Unable to register terminal service: %s\n"
 msgstr "I pazoti të regjistrojë shërbim terminali: %s\n"
 
-#: ../terminal/main.c:276
-#, c-format
-msgid "Unable to launch terminal: %s\n"
-msgstr "I pazoti të nisë terminalin: %s\n"
-
-#: ../terminal/terminal-app.c:551
+#: ../terminal/terminal-app.c:554
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "Varg gjeometrie i pavlefshëm \"%s\"\n"
 
-#: ../terminal/terminal-dbus.c:114
+#: ../terminal/terminal-dbus.c:108
 msgid "User id mismatch"
 msgstr "Mospërputhje id-je përdoruesi"
 
-#: ../terminal/terminal-dbus.c:146
+#: ../terminal/terminal-dbus.c:134
 #, c-format
 msgid "D-BUS message bus disconnected, exiting...\n"
 msgstr "Bus mesazhesh D-BUS i shkëputur, po dilet...\n"
 
-#: ../terminal/terminal-dbus.c:208
+#: ../terminal/terminal-dbus.c:196
 #, c-format
 msgid "Unable to register object %s"
 msgstr "I pazoti të regjistrojë objektin %s"
@@ -368,7 +163,7 @@ msgstr ""
 msgid "Failed to open the documentation browser"
 msgstr "Dështoi në hapjen e shfletuesit të dokumentacionit"
 
-#: ../terminal/terminal-options.c:189
+#: ../terminal/terminal-options.c:206
 #, c-format
 msgid ""
 "Option \"--default-display\" requires specifying the default X display as "
@@ -377,7 +172,7 @@ msgstr ""
 "Mundësia \"--default-display\" lyp tregimin e ekranit X parazgjedhje si "
 "parametër të vet"
 
-#: ../terminal/terminal-options.c:204
+#: ../terminal/terminal-options.c:221
 #, c-format
 msgid ""
 "Option \"--default-working-directory\" requires specifying the default "
@@ -386,15 +181,7 @@ msgstr ""
 "Mundësia \"--command/-e\" lyp tregimin e drejtorisë parazgjedhje të punimit "
 "si parametër të vet"
 
-#: ../terminal/terminal-options.c:235
-#, c-format
-msgid ""
-"Option \"--sm-client-id\" requires specifying the session id as its parameter"
-msgstr ""
-"Mundësia \"--sm-client-id\" lyp tregimin e id-së së sesionit si parametër të "
-"vet"
-
-#: ../terminal/terminal-options.c:250
+#: ../terminal/terminal-options.c:237
 #, c-format
 msgid ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
@@ -403,7 +190,7 @@ msgstr ""
 "Mundësia \"--execute/-x\" lyp tregimin e urdhërit për xhirim te pjesa e "
 "mbetur për rreshtin e urdhrit"
 
-#: ../terminal/terminal-options.c:267
+#: ../terminal/terminal-options.c:254
 #, c-format
 msgid ""
 "Option \"--command/-e\" requires specifying the command to run as its "
@@ -412,7 +199,7 @@ msgstr ""
 "Mundësia \"--command/-e\" lyp tregimin e urdhërit për xhirim si parametër të "
 "vet"
 
-#: ../terminal/terminal-options.c:284
+#: ../terminal/terminal-options.c:271
 #, c-format
 msgid ""
 "Option \"--working-directory\" requires specifying the working directory as "
@@ -421,18 +208,18 @@ msgstr ""
 "Mundësia \"--working-directory\" lyp tregimin e drejtorisë së punimit si "
 "parametër të vet"
 
-#: ../terminal/terminal-options.c:299
+#: ../terminal/terminal-options.c:286
 #, c-format
 msgid "Option \"--title/-T\" requires specifying the title as its parameter"
 msgstr "Mundësia \"--title/-T\" lyp tregimin e titullit si parametër të vet"
 
-#: ../terminal/terminal-options.c:319
+#: ../terminal/terminal-options.c:305
 #, c-format
 msgid ""
 "Option \"--display\" requires specifying the X display as its parameters"
 msgstr "Mundësia \"--display\" lyp tregimin e ekranit X si parametër të vet"
 
-#: ../terminal/terminal-options.c:334
+#: ../terminal/terminal-options.c:320
 #, c-format
 msgid ""
 "Option \"--geometry\" requires specifying the window geometry as its "
@@ -441,20 +228,20 @@ msgstr ""
 "Mundësia \"--geometry\" lyp tregimin e gjeometrisë së dritares si parametër "
 "të vet"
 
-#: ../terminal/terminal-options.c:349
+#: ../terminal/terminal-options.c:335
 #, c-format
 msgid "Option \"--role\" requires specifying the window role as its parameter"
 msgstr ""
 "Mundësia \"--role\" lyp tregimin e rolit të dritares si parametër të vet"
 
-#: ../terminal/terminal-options.c:364
+#: ../terminal/terminal-options.c:350
 #, c-format
 msgid ""
 "Option \"--startup-id\" requires specifying the startup id as its parameter"
 msgstr ""
 "Mundësia \"--startup-id\" lyp tregimin e id-së së nisjes si parametër të vet"
 
-#: ../terminal/terminal-options.c:379
+#: ../terminal/terminal-options.c:365
 #, fuzzy, c-format
 msgid ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
@@ -463,7 +250,7 @@ msgstr ""
 "Mundësia \"--command/-e\" lyp tregimin e urdhërit për xhirim si parametër të "
 "vet"
 
-#: ../terminal/terminal-options.c:435
+#: ../terminal/terminal-options.c:419
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Mundësi e panjohur \"%s\""
@@ -532,7 +319,7 @@ msgstr "Tërë ekrani"
 msgid "Set Title"
 msgstr "Caktoni Titull"
 
-#: ../terminal/terminal-preferences.c:464
+#: ../terminal/terminal-preferences.c:464 ../terminal/terminal-window.c:237
 msgid "Reset"
 msgstr "Ricakto"
 
@@ -830,6 +617,11 @@ msgstr "_Ricaktoni"
 msgid "Reset and C_lear"
 msgstr "Ricakto dhe _Pastro"
 
+#: ../terminal/terminal-window.c:238
+#, fuzzy
+msgid "Reset and clear"
+msgstr "Ricakto dhe Pastro"
+
 #: ../terminal/terminal-window.c:239
 msgid "_Go"
 msgstr "_Shko"
@@ -1511,6 +1303,293 @@ msgstr "_Përditëso regjistrime utmp/wtmp kur niset urdhri"
 msgid "seconds"
 msgstr ""
 
+#~ msgid ""
+#~ "  -h, --help                          Print this help message and exit"
+#~ msgstr ""
+#~ "  -h, --help                          Shtyp këtë mesazh ndihme dhe dil"
+
+#, fuzzy
+#~ msgid ""
+#~ "  -V, --version                       Print version information and exit"
+#~ msgstr ""
+#~ "  -v, --version                       Shtyp të dhëna versioni dhe dil"
+
+#~ msgid ""
+#~ "  --disable-server                    Do not register with the D-BUS\n"
+#~ "                                      session message bus"
+#~ msgstr ""
+#~ "  --disable-server                    Mos u regjistro me bus mesazhesh\n"
+#~ "                                       sesioni D-BUS-in"
+
+#~ msgid "  --default-display=DISPLAY           default X display to use"
+#~ msgstr ""
+#~ "  --default-display=EKRAN           ekran X parazgjedhje për t'u përdorur"
+
+#~ msgid ""
+#~ "  --default-working-directory=DIRNAME Set the default terminal's working\n"
+#~ "                                      directory"
+#~ msgstr ""
+#~ "  --default-working-directory=EMËR DREJTORIE  cakton drejtori "
+#~ "parazgjedhje\n"
+#~ "                                      për terminale punues"
+
+#~ msgid ""
+#~ "  --tab                               Open a new tab in the last-"
+#~ "specified\n"
+#~ "                                      window; more than one of these\n"
+#~ "                                      options can be provided"
+#~ msgstr ""
+#~ "  --tab                               Hap skedë të re në dritaren\n"
+#~ "                                      e treguar së fundi; mund të jepet\n"
+#~ "                                      më shumë se një nga këto mundësi"
+
+#~ msgid ""
+#~ "  --window                            Open a new window containing one "
+#~ "tab;\n"
+#~ "                                      more than one of these options can "
+#~ "be\n"
+#~ "                                      provided"
+#~ msgstr ""
+#~ "  --window                            Hap një dritare të re që përmban "
+#~ "vetëm\n"
+#~ "                                       një skedë; mund të jepet më shumë "
+#~ "se\n"
+#~ "                                       një nga këto mundësi"
+
+#~ msgid ""
+#~ "  -x, --execute                       Execute the remainder of the "
+#~ "command\n"
+#~ "                                      line inside the terminal"
+#~ msgstr ""
+#~ "  -x, --execute                       Përmbush ç'mbetet prej rreshtit\n"
+#~ "                                       të urdhrit brenda terminalit"
+
+#~ msgid ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+#~ msgstr ""
+#~ "  -e, --command=VARG                Përmbush argumentin për këtë\n"
+#~ "                                      mundësi brenda terminalit"
+
+#~ msgid ""
+#~ "  --working-directory=DIRNAME         Set the terminal's working directory"
+#~ msgstr ""
+#~ "  --working-directory=EMËR DREJTORIE         Caktoni drejtorinë e "
+#~ "terminaleve punues"
+
+#~ msgid "  -T, --title=TITLE                   Set the terminal's title"
+#~ msgstr "  -T, --title=TITULL                   Caktoni titull terminalesh"
+
+#~ msgid ""
+#~ "  -H, --hold                          Do not immediately destroy the tab\n"
+#~ "                                      when the child command exits"
+#~ msgstr ""
+#~ "  -H, --hold                          Mos asgjëso skedën menjëherë\n"
+#~ "                                      pas daljes së urdhrit pjellë"
+
+#~ msgid ""
+#~ "  --display=DISPLAY                   X display to use for the last-\n"
+#~ "                                      specified window"
+#~ msgstr ""
+#~ "  --display=EKRAN                   ekran X për përdorim për dritaren\n"
+#~ "                                      e fundit të treguar"
+
+#~ msgid ""
+#~ "  --geometry=GEOMETRY                 X geometry specification (see \"X"
+#~ "\"\n"
+#~ "                                      man page), can be specified once "
+#~ "per\n"
+#~ "                                      window to be opened"
+#~ msgstr ""
+#~ "  --geometry=GJEOMETRI                 Përcaktime gjeometrie për X-in "
+#~ "(shihni\n"
+#~ "                                                faqe man për \"X\"), mund "
+#~ "të përcaktohet\n"
+#~ "                                               një herë për çdo dritare "
+#~ "që do të hapet"
+
+#, fuzzy
+#~ msgid ""
+#~ "  --role=ROLE                         Set the role for the last-"
+#~ "specified\n"
+#~ "                                      window; applies to only one "
+#~ "window;\n"
+#~ "                                      can be specified once for each "
+#~ "window\n"
+#~ "                                      you create from the command line"
+#~ msgstr ""
+#~ "  --role=ROL                         Caktoni rolin e dritares së treguar\n"
+#~ "                                      së fundmi; zbatohet vetëm mbi një "
+#~ "dritare;\n"
+#~ "                                      mund të tregohet një herë për çdo "
+#~ "dritare\n"
+#~ "                                      që krijoni prej rreshti urdhrash"
+
+#~ msgid ""
+#~ "  --startup-id=STRING                 ID for the startup notification\n"
+#~ "                                      protocol"
+#~ msgstr ""
+#~ "  --startup-id=VARG                 ID për protokoll njoftimi nisjeje"
+
+#, fuzzy
+#~ msgid ""
+#~ "  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
+#~ "                                      name or filename"
+#~ msgstr ""
+#~ "  -e, --command=VARG                Përmbush argumentin për këtë\n"
+#~ "                                      mundësi brenda terminalit"
+
+#, fuzzy
+#~ msgid ""
+#~ "  --fullscreen                        Set the last-specified window into\n"
+#~ "                                      fullscreen mode; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --fullscreen                     Cakton për dritaren e fundit të "
+#~ "treguar\n"
+#~ "                                      mënyrën tërë ekrani; zbatohet "
+#~ "vetëm\n"
+#~ "                                      mbi një dritare; mund të "
+#~ "përcaktohet\n"
+#~ "                                      një herë për çdo dritare që "
+#~ "krijoni\n"
+#~ "                                      prej rreshti urdhrash."
+
+#, fuzzy
+#~ msgid ""
+#~ "  --maximize                          Maximize the last-specified "
+#~ "window;\n"
+#~ "                                      applies to only one window; can be\n"
+#~ "                                      specified once for each window you\n"
+#~ "                                      create from the command line"
+#~ msgstr ""
+#~ "  --role=ROL                         Caktoni rolin e dritares së treguar\n"
+#~ "                                      së fundmi; zbatohet vetëm mbi një "
+#~ "dritare;\n"
+#~ "                                      mund të tregohet një herë për çdo "
+#~ "dritare\n"
+#~ "                                      që krijoni prej rreshti urdhrash"
+
+#~ msgid ""
+#~ "  --show-menubar                      Turn on the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-menubar               Shfaq shtyllë menuje për dritaren\n"
+#~ "                                      e fundit të treguar; zbatohet "
+#~ "vetëm\n"
+#~ "                                      mbi një dritare; mund të "
+#~ "përcaktohet\n"
+#~ "                                      një herë për çdo dritare që "
+#~ "krijoni\n"
+#~ "                                      prej rreshti urdhrash"
+
+#~ msgid ""
+#~ "  --hide-menubar                      Turn off the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-menubar               Fsheh shtyllë menuje për dritaren\n"
+#~ "                                      e fundit të treguar; zbatohet "
+#~ "vetëm\n"
+#~ "                                      mbi një dritare; mund të "
+#~ "përcaktohet\n"
+#~ "                                      një herë për çdo dritare që "
+#~ "krijoni\n"
+#~ "                                      prej rreshti urdhrash"
+
+#~ msgid ""
+#~ "  --show-borders                      Turn on the window decorations for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --show-borders               Shfaq zbukurime dritaresh për dritaren\n"
+#~ "                                      e fundit të treguar; zbatohet "
+#~ "vetëm\n"
+#~ "                                      mbi një dritare; mund të "
+#~ "përcaktohet\n"
+#~ "                                      një herë për çdo dritare që "
+#~ "krijoni\n"
+#~ "                                      prej rreshti urdhrash"
+
+#~ msgid ""
+#~ "  --hide-borders                      Turn off the window decorations "
+#~ "for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --hide-borders                 Fsheh zbukurime dritaresh për dritaren\n"
+#~ "                                      e fundit të treguar; zbatohet "
+#~ "vetëm\n"
+#~ "                                      mbi një dritare; mund të "
+#~ "përcaktohet\n"
+#~ "                                      një herë për çdo dritare që "
+#~ "krijoni\n"
+#~ "                                      prej rreshti urdhrash"
+
+#~ msgid ""
+#~ "  --show-toolbars                     Turn on the toolbars for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-toolbars                          Shfaq panelet për dritaren\n"
+#~ "                                      e fundit të treguar; zbatohet "
+#~ "vetëm\n"
+#~ "                                      mbi një dritare; mund të "
+#~ "përcaktohet\n"
+#~ "                                      një herë për çdo dritare që "
+#~ "krijoni\n"
+#~ "                                      prej rreshti urdhrash"
+
+#~ msgid ""
+#~ "  --hide-toolbars                     Turn off the toolbars for the "
+#~ "last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-toolbars                     Fsheh panelet për dritaren\n"
+#~ "                                      e fundit të treguar; zbatohet "
+#~ "vetëm\n"
+#~ "                                      mbi një dritare; mund të "
+#~ "përcaktohet\n"
+#~ "                                      një herë për çdo dritare që "
+#~ "krijoni\n"
+#~ "                                      prej rreshti urdhrash"
+
+#~ msgid "Unable to launch terminal: %s\n"
+#~ msgstr "I pazoti të nisë terminalin: %s\n"
+
+#~ msgid ""
+#~ "Option \"--sm-client-id\" requires specifying the session id as its "
+#~ "parameter"
+#~ msgstr ""
+#~ "Mundësia \"--sm-client-id\" lyp tregimin e id-së së sesionit si parametër "
+#~ "të vet"
+
 #~ msgid "<b>Title:</b>"
 #~ msgstr "<b>Titull</b>"
 
diff --git a/po/sv.po b/po/sv.po
index 9186169..7bfc632 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: terminal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 11:48+0100\n"
+"POT-Creation-Date: 2009-12-14 16:03+0100\n"
 "PO-Revision-Date: 2008-12-09 22:06+0100\n"
 "Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@ -17,303 +17,91 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../terminal/main.c:46
+#: ../terminal/main.c:48
 msgid "Usage:"
 msgstr ""
 
-#: ../terminal/main.c:47
+#: ../terminal/main.c:48
 msgid "OPTION"
 msgstr ""
 
-#: ../terminal/main.c:49
+#: ../terminal/main.c:53
 #, fuzzy
 msgid "General Options"
 msgstr "Allmänt"
 
-#: ../terminal/main.c:50
-msgid "  -h, --help                          Print this help message and exit"
-msgstr ""
-"  -h, --help                          Skriv detta hjälpmeddelandet och "
-"avsluta"
-
-#: ../terminal/main.c:51
+#. parameter of --default-display
+#. parameter of --display
+#: ../terminal/main.c:55 ../terminal/main.c:81
 #, fuzzy
-msgid ""
-"  -V, --version                       Print version information and exit"
-msgstr ""
-"  -v, --version                       Skriv versionsinformationen och avsluta"
-
-#: ../terminal/main.c:52
-msgid ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
-msgstr ""
-"  --disable-server                    Registrera inte mot D-BUS-sessions-\n"
-"                                      meddelandebussen"
-
-#: ../terminal/main.c:54
-msgid "  --default-display=DISPLAY           default X display to use"
-msgstr ""
-"  --default-display=DISPLAY          X-display att använda som standard"
+msgid "display"
+msgstr "Visas inte"
 
-#: ../terminal/main.c:55
-msgid ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
+#. parameter of --default-working-directory
+#. parameter of --working-directory
+#: ../terminal/main.c:57 ../terminal/main.c:72
+msgid "directory"
 msgstr ""
-"  --default-working-directory=KATNAMN Ange standardterminalens arbets-\n"
-"                                      katalog"
 
-#: ../terminal/main.c:58
+#: ../terminal/main.c:61
 msgid "Window or Tab Separators"
 msgstr ""
 
-#: ../terminal/main.c:59
-msgid ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-msgstr ""
-" --tab                                Öppna en ny flik i det senaste "
-"angivna\n"
-"                                      fönstret; fler än en av dessa flaggor "
-"kan\n"
-"                                      anges"
-
-#: ../terminal/main.c:62
-msgid ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-msgstr ""
-" --window                             Öppna ett nytt fönster som innehåller\n"
-"                                      en flik; fler än en av dessa flaggor\n"
-"                                      kan anges"
-
 #: ../terminal/main.c:66
 #, fuzzy
 msgid "Tab Options"
 msgstr "Flikposition"
 
-#: ../terminal/main.c:67
-msgid ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-msgstr ""
-"  -x, --execute                       Kör resten av kommandoraden inuti\n"
-"                                      terminalen."
-
-#: ../terminal/main.c:69
-msgid ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-msgstr ""
-"  -e, --command=STRÄNG                Kör argumentet till denna flagga\n"
-"                                      inuti terminalen."
-
-#: ../terminal/main.c:71
-msgid ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
-msgstr "  --working-directory=KATNAMN         Ange terminalens arbetskatalog"
-
-#: ../terminal/main.c:72
-msgid "  -T, --title=TITLE                   Set the terminal's title"
-msgstr "  -T, --title=TITEL                   Ange terminalens titel"
+#. parameter of --command
+#: ../terminal/main.c:68
+#, fuzzy
+msgid "command"
+msgstr "<b>Kommando</b>"
 
-#: ../terminal/main.c:73
-msgid ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-msgstr ""
-"  -H, --hold                          Stäng inte fliken när barnkommandot\n"
-"                                      avslutas"
+#. parameter of --title
+#: ../terminal/main.c:70
+#, fuzzy
+msgid "title"
+msgstr "Titel"
 
-#: ../terminal/main.c:76
+#: ../terminal/main.c:79
 #, fuzzy
 msgid "Window Options"
 msgstr "Okänd flagga \"%s\""
 
-#: ../terminal/main.c:77
-msgid ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
+#. parameter of --geometry
+#: ../terminal/main.c:83
+msgid "geometry"
 msgstr ""
-" --display=DISPLAY                    X-display att använda för det\n"
-"                                      senaste angivna fönstret"
 
-#: ../terminal/main.c:79
-msgid ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
+#. parameter of --role
+#: ../terminal/main.c:85
+msgid "role"
 msgstr ""
-"  --geometry=GEOMETRI                 X-geometriinställning (se manualsidan\n"
-"                                      för \"X\"), kan anges en gång per "
-"fönster\n"
-"                                      som ska öppnas"
 
-#: ../terminal/main.c:82
-msgid ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
-msgstr ""
-"  --role=ROLL                         Ange rollen för det senaste angivna\n"
-"                                      fönstret; gäller endast för ett "
-"fönster; kan\n"
-"                                      anges en gång per fönster som du "
-"skapar\n"
-"                                      från kommandoraden"
-
-#: ../terminal/main.c:86
-msgid ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
-msgstr ""
-" --startup-id=STRÄNG                  ID för uppstartsnotifierings-\n"
-"                                      protokollet"
-
-#: ../terminal/main.c:88
+#. parameter of --startup-id
+#: ../terminal/main.c:87
 #, fuzzy
-msgid ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
-msgstr ""
-"  -e, --command=STRÄNG                Kör argumentet till denna flagga\n"
-"                                      inuti terminalen."
+msgid "string"
+msgstr "Varning"
 
-#: ../terminal/main.c:90
-#, fuzzy
-msgid ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --fullscreen                        Ställer in senaste angivna fönstret "
-"till att\n"
-"                                      köras i helskärmsläge; gäller endast "
-"för\n"
-"                                      ett fönster; kan anges en gång för "
-"varje\n"
-"                                      fönster som du skapar från "
-"kommandoraden."
-
-#: ../terminal/main.c:95
+#. parameter of --icon
+#: ../terminal/main.c:89
 #, fuzzy
-msgid ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
-msgstr ""
-"  --role=ROLL                         Ange rollen för det senaste angivna\n"
-"                                      fönstret; gäller endast för ett "
-"fönster; kan\n"
-"                                      anges en gång per fönster som du "
-"skapar\n"
-"                                      från kommandoraden"
-
-#: ../terminal/main.c:99
-msgid ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-menubar                      Aktivera menyraden för det senaste\n"
-"                                      fönstret; gäller endast för ett "
-"fönster;\n"
-"                                      kan anges en gång för varje fönster "
-"som du\n"
-"                                      skapar från kommandoraden"
-
-#: ../terminal/main.c:104
-msgid ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --hide-menubar                      Inaktivera menyraden för det senaste\n"
-"                                      angivna fönstret; gäller endast för "
-"ett fönster;\n"
-"                                      kan anges en gång för varje fönster "
-"som du\n"
-"                                      skapar från kommandoraden"
-
-#: ../terminal/main.c:109
-msgid ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --show-borders                      Aktivera fönsterdekorationerna för "
-"det\n"
-"                                      senaste angivna fönstret; gäller "
-"endast för ett\n"
-"                                      fönster; kan anges en gång för varje\n"
-"                                      fönster som du skapar från "
-"kommandoraden"
-
-#: ../terminal/main.c:114
-msgid ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --hide-borders                      Inaktivera fönsterdekorationerna för "
-"det\n"
-"                                      senaste angivna fönstret; gäller "
-"endast för ett\n"
-"                                      fönster; kan anges en gång för varje\n"
-"                                      fönster som du skapar från "
-"kommandoraden"
-
-#: ../terminal/main.c:119
-msgid ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-toolbars                     Aktivera verktygsraderna för det\n"
-"                                      senaste angivna fönstret; gäller "
-"endast för ett\n"
-"                                      fönster; kan anges en gång för varje\n"
-"                                      fönster som du skapar från "
-"kommandoraden"
-
-#: ../terminal/main.c:124
-msgid ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+msgid "icon"
+msgstr "Åtgärd"
+
+#: ../terminal/main.c:91
+#, c-format
+msgid "See the %s man page for full explanation of the options above."
 msgstr ""
-"  --hide-toolbars                     Inaktivera verktygsraderna för det\n"
-"                                      senaste angivna fönstret; gäller "
-"endast för ett\n"
-"                                      fönster; kan anges en gång för varje\n"
-"                                      fönster som du skapar från "
-"kommandoraden"
-
-#: ../terminal/main.c:151 ../terminal/terminal-preferences.c:1263
+
+#: ../terminal/main.c:118 ../terminal/terminal-preferences.c:1263
 #: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../terminal/main.c:173
+#: ../terminal/main.c:135
 #, c-format
 msgid ""
 "%s (Xfce %s)\n"
@@ -338,31 +126,26 @@ msgstr ""
 "\n"
 "Rapportera fel till <%s>.\n"
 
-#: ../terminal/main.c:267
+#: ../terminal/main.c:239
 #, c-format
 msgid "Unable to register terminal service: %s\n"
 msgstr "Kunde inte registrera terminaltjänsten: %s\n"
 
-#: ../terminal/main.c:276
-#, c-format
-msgid "Unable to launch terminal: %s\n"
-msgstr "Kunde inte starta terminal: %s\n"
-
-#: ../terminal/terminal-app.c:551
+#: ../terminal/terminal-app.c:554
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "Ogiltig geometristräng: \"%s\"\n"
 
-#: ../terminal/terminal-dbus.c:114
+#: ../terminal/terminal-dbus.c:108
 msgid "User id mismatch"
 msgstr "Användar-id stämmer inte"
 
-#: ../terminal/terminal-dbus.c:146
+#: ../terminal/terminal-dbus.c:134
 #, c-format
 msgid "D-BUS message bus disconnected, exiting...\n"
 msgstr "D-BUS-meddelandebussen kopplades från, avslutar...\n"
 
-#: ../terminal/terminal-dbus.c:208
+#: ../terminal/terminal-dbus.c:196
 #, c-format
 msgid "Unable to register object %s"
 msgstr "Kunde inte registrera objektet %s"
@@ -390,7 +173,7 @@ msgstr "Statisk terminaltitel"
 msgid "Failed to open the documentation browser"
 msgstr "Misslyckades med att öppna dokumentationsvisaren"
 
-#: ../terminal/terminal-options.c:189
+#: ../terminal/terminal-options.c:206
 #, c-format
 msgid ""
 "Option \"--default-display\" requires specifying the default X display as "
@@ -398,7 +181,7 @@ msgid ""
 msgstr ""
 "Flaggan \"--default-display\" kräver att du anger en X-display som parameter"
 
-#: ../terminal/terminal-options.c:204
+#: ../terminal/terminal-options.c:221
 #, c-format
 msgid ""
 "Option \"--default-working-directory\" requires specifying the default "
@@ -407,14 +190,7 @@ msgstr ""
 "Flaggan \"--default-working-directory\" kräver att du anger "
 "standardarbetskatalogen som parameter"
 
-#: ../terminal/terminal-options.c:235
-#, c-format
-msgid ""
-"Option \"--sm-client-id\" requires specifying the session id as its parameter"
-msgstr ""
-"Flaggan \"--sm-client-id\" kräver att du anger ett sessionsid som parameter"
-
-#: ../terminal/terminal-options.c:250
+#: ../terminal/terminal-options.c:237
 #, c-format
 msgid ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
@@ -423,7 +199,7 @@ msgstr ""
 "Flaggan \"--execute/-x\" kräver att du anger ett kommando att köra på resten "
 "av kommandoraden"
 
-#: ../terminal/terminal-options.c:267
+#: ../terminal/terminal-options.c:254
 #, c-format
 msgid ""
 "Option \"--command/-e\" requires specifying the command to run as its "
@@ -432,7 +208,7 @@ msgstr ""
 "Flaggan \"--command/-e/\" kräver att du anger ett kommando att köra som "
 "parameter"
 
-#: ../terminal/terminal-options.c:284
+#: ../terminal/terminal-options.c:271
 #, c-format
 msgid ""
 "Option \"--working-directory\" requires specifying the working directory as "
@@ -441,18 +217,18 @@ msgstr ""
 "Flaggan \"--working-directory\" kräver att du anger en arbetskatalog som "
 "parameter"
 
-#: ../terminal/terminal-options.c:299
+#: ../terminal/terminal-options.c:286
 #, c-format
 msgid "Option \"--title/-T\" requires specifying the title as its parameter"
 msgstr "Flaggan \"--title/-T\" kräver att du anger en titel som parameter"
 
-#: ../terminal/terminal-options.c:319
+#: ../terminal/terminal-options.c:305
 #, c-format
 msgid ""
 "Option \"--display\" requires specifying the X display as its parameters"
 msgstr "Flaggan \"--display\" kräver att du anger en X-display som parameter"
 
-#: ../terminal/terminal-options.c:334
+#: ../terminal/terminal-options.c:320
 #, c-format
 msgid ""
 "Option \"--geometry\" requires specifying the window geometry as its "
@@ -460,19 +236,19 @@ msgid ""
 msgstr ""
 "Flaggan \"--geometry\" kräver att du anger en fönstergeometri som parameter"
 
-#: ../terminal/terminal-options.c:349
+#: ../terminal/terminal-options.c:335
 #, c-format
 msgid "Option \"--role\" requires specifying the window role as its parameter"
 msgstr "Flaggan \"--role\" kräver att du anger en fönsterroll som parameter"
 
-#: ../terminal/terminal-options.c:364
+#: ../terminal/terminal-options.c:350
 #, c-format
 msgid ""
 "Option \"--startup-id\" requires specifying the startup id as its parameter"
 msgstr ""
 "Flaggan \"--startup-id\" kräver att du anger ett uppstarts-id som parameter"
 
-#: ../terminal/terminal-options.c:379
+#: ../terminal/terminal-options.c:365
 #, fuzzy, c-format
 msgid ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
@@ -481,7 +257,7 @@ msgstr ""
 "Flaggan \"--command/-e/\" kräver att du anger ett kommando att köra som "
 "parameter"
 
-#: ../terminal/terminal-options.c:435
+#: ../terminal/terminal-options.c:419
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Okänd flagga \"%s\""
@@ -550,7 +326,7 @@ msgstr "Helskärm"
 msgid "Set Title"
 msgstr "Ange titel"
 
-#: ../terminal/terminal-preferences.c:464
+#: ../terminal/terminal-preferences.c:464 ../terminal/terminal-window.c:237
 msgid "Reset"
 msgstr "Återställ"
 
@@ -847,6 +623,11 @@ msgstr "_Återställ"
 msgid "Reset and C_lear"
 msgstr "Återställ och _töm"
 
+#: ../terminal/terminal-window.c:238
+#, fuzzy
+msgid "Reset and clear"
+msgstr "Återställ och töm"
+
 #: ../terminal/terminal-window.c:239
 msgid "_Go"
 msgstr "_Gå"
@@ -1510,6 +1291,292 @@ msgstr "_Uppdatera utmp/wtmp-poster när kommando körs"
 msgid "seconds"
 msgstr "sekunder"
 
+#~ msgid ""
+#~ "  -h, --help                          Print this help message and exit"
+#~ msgstr ""
+#~ "  -h, --help                          Skriv detta hjälpmeddelandet och "
+#~ "avsluta"
+
+#, fuzzy
+#~ msgid ""
+#~ "  -V, --version                       Print version information and exit"
+#~ msgstr ""
+#~ "  -v, --version                       Skriv versionsinformationen och "
+#~ "avsluta"
+
+#~ msgid ""
+#~ "  --disable-server                    Do not register with the D-BUS\n"
+#~ "                                      session message bus"
+#~ msgstr ""
+#~ "  --disable-server                    Registrera inte mot D-BUS-"
+#~ "sessions-\n"
+#~ "                                      meddelandebussen"
+
+#~ msgid "  --default-display=DISPLAY           default X display to use"
+#~ msgstr ""
+#~ "  --default-display=DISPLAY          X-display att använda som standard"
+
+#~ msgid ""
+#~ "  --default-working-directory=DIRNAME Set the default terminal's working\n"
+#~ "                                      directory"
+#~ msgstr ""
+#~ "  --default-working-directory=KATNAMN Ange standardterminalens arbets-\n"
+#~ "                                      katalog"
+
+#~ msgid ""
+#~ "  --tab                               Open a new tab in the last-"
+#~ "specified\n"
+#~ "                                      window; more than one of these\n"
+#~ "                                      options can be provided"
+#~ msgstr ""
+#~ " --tab                                Öppna en ny flik i det senaste "
+#~ "angivna\n"
+#~ "                                      fönstret; fler än en av dessa "
+#~ "flaggor kan\n"
+#~ "                                      anges"
+
+#~ msgid ""
+#~ "  --window                            Open a new window containing one "
+#~ "tab;\n"
+#~ "                                      more than one of these options can "
+#~ "be\n"
+#~ "                                      provided"
+#~ msgstr ""
+#~ " --window                             Öppna ett nytt fönster som "
+#~ "innehåller\n"
+#~ "                                      en flik; fler än en av dessa "
+#~ "flaggor\n"
+#~ "                                      kan anges"
+
+#~ msgid ""
+#~ "  -x, --execute                       Execute the remainder of the "
+#~ "command\n"
+#~ "                                      line inside the terminal"
+#~ msgstr ""
+#~ "  -x, --execute                       Kör resten av kommandoraden inuti\n"
+#~ "                                      terminalen."
+
+#~ msgid ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+#~ msgstr ""
+#~ "  -e, --command=STRÄNG                Kör argumentet till denna flagga\n"
+#~ "                                      inuti terminalen."
+
+#~ msgid ""
+#~ "  --working-directory=DIRNAME         Set the terminal's working directory"
+#~ msgstr ""
+#~ "  --working-directory=KATNAMN         Ange terminalens arbetskatalog"
+
+#~ msgid "  -T, --title=TITLE                   Set the terminal's title"
+#~ msgstr "  -T, --title=TITEL                   Ange terminalens titel"
+
+#~ msgid ""
+#~ "  -H, --hold                          Do not immediately destroy the tab\n"
+#~ "                                      when the child command exits"
+#~ msgstr ""
+#~ "  -H, --hold                          Stäng inte fliken när "
+#~ "barnkommandot\n"
+#~ "                                      avslutas"
+
+#~ msgid ""
+#~ "  --display=DISPLAY                   X display to use for the last-\n"
+#~ "                                      specified window"
+#~ msgstr ""
+#~ " --display=DISPLAY                    X-display att använda för det\n"
+#~ "                                      senaste angivna fönstret"
+
+#~ msgid ""
+#~ "  --geometry=GEOMETRY                 X geometry specification (see \"X"
+#~ "\"\n"
+#~ "                                      man page), can be specified once "
+#~ "per\n"
+#~ "                                      window to be opened"
+#~ msgstr ""
+#~ "  --geometry=GEOMETRI                 X-geometriinställning (se "
+#~ "manualsidan\n"
+#~ "                                      för \"X\"), kan anges en gång per "
+#~ "fönster\n"
+#~ "                                      som ska öppnas"
+
+#~ msgid ""
+#~ "  --role=ROLE                         Set the role for the last-"
+#~ "specified\n"
+#~ "                                      window; applies to only one "
+#~ "window;\n"
+#~ "                                      can be specified once for each "
+#~ "window\n"
+#~ "                                      you create from the command line"
+#~ msgstr ""
+#~ "  --role=ROLL                         Ange rollen för det senaste "
+#~ "angivna\n"
+#~ "                                      fönstret; gäller endast för ett "
+#~ "fönster; kan\n"
+#~ "                                      anges en gång per fönster som du "
+#~ "skapar\n"
+#~ "                                      från kommandoraden"
+
+#~ msgid ""
+#~ "  --startup-id=STRING                 ID for the startup notification\n"
+#~ "                                      protocol"
+#~ msgstr ""
+#~ " --startup-id=STRÄNG                  ID för uppstartsnotifierings-\n"
+#~ "                                      protokollet"
+
+#, fuzzy
+#~ msgid ""
+#~ "  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
+#~ "                                      name or filename"
+#~ msgstr ""
+#~ "  -e, --command=STRÄNG                Kör argumentet till denna flagga\n"
+#~ "                                      inuti terminalen."
+
+#, fuzzy
+#~ msgid ""
+#~ "  --fullscreen                        Set the last-specified window into\n"
+#~ "                                      fullscreen mode; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --fullscreen                        Ställer in senaste angivna fönstret "
+#~ "till att\n"
+#~ "                                      köras i helskärmsläge; gäller "
+#~ "endast för\n"
+#~ "                                      ett fönster; kan anges en gång för "
+#~ "varje\n"
+#~ "                                      fönster som du skapar från "
+#~ "kommandoraden."
+
+#, fuzzy
+#~ msgid ""
+#~ "  --maximize                          Maximize the last-specified "
+#~ "window;\n"
+#~ "                                      applies to only one window; can be\n"
+#~ "                                      specified once for each window you\n"
+#~ "                                      create from the command line"
+#~ msgstr ""
+#~ "  --role=ROLL                         Ange rollen för det senaste "
+#~ "angivna\n"
+#~ "                                      fönstret; gäller endast för ett "
+#~ "fönster; kan\n"
+#~ "                                      anges en gång per fönster som du "
+#~ "skapar\n"
+#~ "                                      från kommandoraden"
+
+#~ msgid ""
+#~ "  --show-menubar                      Turn on the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-menubar                      Aktivera menyraden för det senaste\n"
+#~ "                                      fönstret; gäller endast för ett "
+#~ "fönster;\n"
+#~ "                                      kan anges en gång för varje fönster "
+#~ "som du\n"
+#~ "                                      skapar från kommandoraden"
+
+#~ msgid ""
+#~ "  --hide-menubar                      Turn off the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-menubar                      Inaktivera menyraden för det "
+#~ "senaste\n"
+#~ "                                      angivna fönstret; gäller endast för "
+#~ "ett fönster;\n"
+#~ "                                      kan anges en gång för varje fönster "
+#~ "som du\n"
+#~ "                                      skapar från kommandoraden"
+
+#~ msgid ""
+#~ "  --show-borders                      Turn on the window decorations for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --show-borders                      Aktivera fönsterdekorationerna för "
+#~ "det\n"
+#~ "                                      senaste angivna fönstret; gäller "
+#~ "endast för ett\n"
+#~ "                                      fönster; kan anges en gång för "
+#~ "varje\n"
+#~ "                                      fönster som du skapar från "
+#~ "kommandoraden"
+
+#~ msgid ""
+#~ "  --hide-borders                      Turn off the window decorations "
+#~ "for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --hide-borders                      Inaktivera fönsterdekorationerna "
+#~ "för det\n"
+#~ "                                      senaste angivna fönstret; gäller "
+#~ "endast för ett\n"
+#~ "                                      fönster; kan anges en gång för "
+#~ "varje\n"
+#~ "                                      fönster som du skapar från "
+#~ "kommandoraden"
+
+#~ msgid ""
+#~ "  --show-toolbars                     Turn on the toolbars for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-toolbars                     Aktivera verktygsraderna för det\n"
+#~ "                                      senaste angivna fönstret; gäller "
+#~ "endast för ett\n"
+#~ "                                      fönster; kan anges en gång för "
+#~ "varje\n"
+#~ "                                      fönster som du skapar från "
+#~ "kommandoraden"
+
+#~ msgid ""
+#~ "  --hide-toolbars                     Turn off the toolbars for the "
+#~ "last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-toolbars                     Inaktivera verktygsraderna för det\n"
+#~ "                                      senaste angivna fönstret; gäller "
+#~ "endast för ett\n"
+#~ "                                      fönster; kan anges en gång för "
+#~ "varje\n"
+#~ "                                      fönster som du skapar från "
+#~ "kommandoraden"
+
+#~ msgid "Unable to launch terminal: %s\n"
+#~ msgstr "Kunde inte starta terminal: %s\n"
+
+#~ msgid ""
+#~ "Option \"--sm-client-id\" requires specifying the session id as its "
+#~ "parameter"
+#~ msgstr ""
+#~ "Flaggan \"--sm-client-id\" kräver att du anger ett sessionsid som "
+#~ "parameter"
+
 #~ msgid "<b>Title:</b>"
 #~ msgstr "<b>Titel:</b>"
 
diff --git a/po/tr.po b/po/tr.po
index c332b4d..e8fb51b 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Terminal 0.2.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 11:48+0100\n"
+"POT-Creation-Date: 2009-12-14 16:03+0100\n"
 "PO-Revision-Date: 2009-07-06 00:02+0200\n"
 "Last-Translator: Samed Beyribey <ras0ir at eventualis.org>\n"
 "Language-Team: Turkish <turkce at pardus.org.tr>\n"
@@ -17,282 +17,88 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../terminal/main.c:46
+#: ../terminal/main.c:48
 msgid "Usage:"
 msgstr "Kullanım:"
 
-#: ../terminal/main.c:47
+#: ../terminal/main.c:48
 msgid "OPTION"
 msgstr "SEÇENEK"
 
-#: ../terminal/main.c:49
+#: ../terminal/main.c:53
 msgid "General Options"
 msgstr "Genel Seçenekler"
 
-#: ../terminal/main.c:50
-msgid "  -h, --help                          Print this help message and exit"
-msgstr "  -h, --help                         Bu yardım mesajını yazar ve çıkar"
-
-#: ../terminal/main.c:51
-msgid ""
-"  -V, --version                       Print version information and exit"
-msgstr "  -V, --version                       Sürüm bilgisini yazar ve çıkar"
-
-#: ../terminal/main.c:52
-msgid ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
-msgstr ""
-"  --disable-server                    D-BUS oturum mesaj taşıtıyla\n"
-"                                      kayıt edilmez"
-
-#: ../terminal/main.c:54
-msgid "  --default-display=DISPLAY           default X display to use"
-msgstr "  --default-display=EKRAN             kullanılacak öntanımlı X ekranı"
+#. parameter of --default-display
+#. parameter of --display
+#: ../terminal/main.c:55 ../terminal/main.c:81
+#, fuzzy
+msgid "display"
+msgstr "Gösterilemiyor"
 
-#: ../terminal/main.c:55
-msgid ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
+#. parameter of --default-working-directory
+#. parameter of --working-directory
+#: ../terminal/main.c:57 ../terminal/main.c:72
+msgid "directory"
 msgstr ""
-"  --default-working-directory=DİZİN   Uçbirimin öntanımlı çalışma dizini\n"
-"                                      belirler"
 
-#: ../terminal/main.c:58
+#: ../terminal/main.c:61
 msgid "Window or Tab Separators"
 msgstr "Pencere veya Sekme Ayırıcıları"
 
-#: ../terminal/main.c:59
-msgid ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-msgstr ""
-"  --tab                               Son belirlenmiş pencerede yeni bir "
-"sekme\n"
-"                                      aç; bu seçeneklerin birden fazlası "
-"verilebilir"
-
-#: ../terminal/main.c:62
-msgid ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-msgstr ""
-"  --window                            Bir sekme içeren yeni pencere aç;\n"
-"                                      bu seçeneklerin birden fazlası\n"
-"                                      verilebilir"
-
 #: ../terminal/main.c:66
 msgid "Tab Options"
 msgstr "Sekme Seçenekleri"
 
-#: ../terminal/main.c:67
-msgid ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-msgstr ""
-"  -x, --execute                       Komut satırındaki notu uçbirim içinde\n"
-"                                      çalıştırır"
-
-#: ../terminal/main.c:69
-msgid ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-msgstr ""
-"  -e, --command=DİZGE                 Argümanı ilgili seçenekle\n"
-"                                      uçbirim içinde çalıştırır"
-
-#: ../terminal/main.c:71
-msgid ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
-msgstr ""
-"  --working-directory=DIZINADI        Uçbirimin çalışacağı dizini belirler"
-
-#: ../terminal/main.c:72
-msgid "  -T, --title=TITLE                   Set the terminal's title"
-msgstr "  -T, --title=TITLE                   Uçbirimin başlığını belirle"
+#. parameter of --command
+#: ../terminal/main.c:68
+#, fuzzy
+msgid "command"
+msgstr "Komut"
 
-#: ../terminal/main.c:73
-msgid ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-msgstr ""
-"  -H, --hold                          Alt komutun çalışması bittiğinde\n"
-"                                      sekmeyi hemen yoketme"
+#. parameter of --title
+#: ../terminal/main.c:70
+#, fuzzy
+msgid "title"
+msgstr "Başlık"
 
-#: ../terminal/main.c:76
+#: ../terminal/main.c:79
 msgid "Window Options"
 msgstr "Pencere Seçenekleri"
 
-#: ../terminal/main.c:77
-msgid ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
-msgstr ""
-"  --display=DISPLAY                   Son belirlenmiş pencere olarak\n"
-"                                      X ekranını kullan"
-
-#: ../terminal/main.c:79
-msgid ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
-msgstr ""
-"  --geometry=GEOMETRİ                 X geometri özelliği (\"X\"\n"
-"                                      kılavuz sayfasına bkz.), açılacak her "
-"pencere\n"
-"                                      için bir kere belirlenebilir"
-
-#: ../terminal/main.c:82
-msgid ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
-msgstr ""
-"  --role=ROL                          Son belirlenmiş pencere için rol "
-"tanımlar;\n"
-"                                      yalnız bir pencereye uygulanır;\n"
-"                                      komut satırından oluşturduğunuz\n"
-"                                      her pencere için bir kez tanımlanabilir"
-
-#: ../terminal/main.c:86
-msgid ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
-msgstr ""
-"  --startup-id=DİZGE                  Açılış uyarı protokolü için\n"
-"                                      ID"
-
-#: ../terminal/main.c:88
-msgid ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
+#. parameter of --geometry
+#: ../terminal/main.c:83
+msgid "geometry"
 msgstr ""
-"  -I, --icon=SİMGE                 Terminal simgesini belirlenen bir\n"
-"                                      dosya adı veya isim olarak ayarlar "
 
-#: ../terminal/main.c:90
-msgid ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#. parameter of --role
+#: ../terminal/main.c:85
+msgid "role"
 msgstr ""
-"  --fullscreen                        Son belirlenmiş pencereyi tam ekran\n"
-"                                      kipinde konumlandır; yalnız tek bir\n"
-"                                      pencereye uygulanır; komut satırından\n"
-"                                      yaratılan her pencere için sadece bir\n"
-"                                      kez belirlenebilir"
 
-#: ../terminal/main.c:95
-msgid ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
-msgstr ""
-"  --maximize                          Son belirlenmiş pencereyi tam ekranda "
-"açar;\n"
-"                                      yalnız bir pencereye uygulanır;\n"
-"                                      komut satırından oluşturduğunuz\n"
-"                                      her pencere için bir kez tanımlanabilir"
-
-#: ../terminal/main.c:99
-msgid ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-menubar                      Son belirlenmiş pencere için menü\n"
-"                                      çubuğunu aç; yalnız tek bir pencereye\n"
-"                                      uygulanır; komut satırından yaratılan\n"
-"                                      her pencere için sadece bir kez\n"
-"                                      belirlenebilir."
+#. parameter of --startup-id
+#: ../terminal/main.c:87
+#, fuzzy
+msgid "string"
+msgstr "Uyarı"
 
-#: ../terminal/main.c:104
-msgid ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --hide-menubar                      Son belirlenen pencere için menü\n"
-"                                      çubuğunu kapat; yalnız tek bir "
-"pencereye\n"
-"                                      uygulanır; komut satırından yaratılan\n"
-"                                      her pencere için sadece bir kez\n"
-"                                      belirlenebilir."
-
-#: ../terminal/main.c:109
-msgid ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --show-borders                      Son belirlenen pencere için pencere\n"
-"                                      desenini aç; yalnız tek bir pencereye\n"
-"                                      uygulanır; komut satırından yaratılan\n"
-"                                      her pencere için sadece bir kez\n"
-"                                      belirlenebilir."
+#. parameter of --icon
+#: ../terminal/main.c:89
+#, fuzzy
+msgid "icon"
+msgstr "Hareket"
 
-#: ../terminal/main.c:114
-msgid ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --hide-borders                      Son belirlenen pencere için pencere\n"
-"                                      desenini kapat; yalnız tek bir "
-"pencereye\n"
-"                                      uygulanır; komut satırından yaratılan\n"
-"                                      her pencere için sadece bir kez\n"
-"                                      belirlenebilir."
-
-#: ../terminal/main.c:119
-msgid ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#: ../terminal/main.c:91
+#, c-format
+msgid "See the %s man page for full explanation of the options above."
 msgstr ""
-"  --show-toolbars                     Son belirlenen pencere için araç\n"
-"                                      çubuğunu aç; yalnız tek bir pencereye\n"
-"                                      uygulanır; komut satırından yaratılan\n"
-"                                      her pencere için sadece bir kez\n"
-"                                      belirlenebilir."
 
-#: ../terminal/main.c:124
-msgid ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --hide-toolbars                     Son belirlenen pencere için araç\n"
-"                                      çubuğunu kapat; yalnız tek bir "
-"pencereye\n"
-"                                      uygulanır; komut satırından yaratılan\n"
-"                                      her pencere için sadece bir kez\n"
-"                                      belirlenebilir."
-
-#: ../terminal/main.c:151 ../terminal/terminal-preferences.c:1263
+#: ../terminal/main.c:118 ../terminal/terminal-preferences.c:1263
 #: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr "Uçbirim"
 
-#: ../terminal/main.c:173
+#: ../terminal/main.c:135
 #, c-format
 msgid ""
 "%s (Xfce %s)\n"
@@ -317,31 +123,26 @@ msgstr ""
 "\n"
 "Lütfen hataları <%s> adresine raporlayın.\n"
 
-#: ../terminal/main.c:267
+#: ../terminal/main.c:239
 #, c-format
 msgid "Unable to register terminal service: %s\n"
 msgstr "%s uçbirim hizmeti kayıt edilmiyor.\n"
 
-#: ../terminal/main.c:276
-#, c-format
-msgid "Unable to launch terminal: %s\n"
-msgstr "%s uçbirimi başlatılamadı.\n"
-
-#: ../terminal/terminal-app.c:551
+#: ../terminal/terminal-app.c:554
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "Geçersiz geometri dizgesi \"%s\"\n"
 
-#: ../terminal/terminal-dbus.c:114
+#: ../terminal/terminal-dbus.c:108
 msgid "User id mismatch"
 msgstr "uyumsuz kullanıcı kimliği (id)"
 
-#: ../terminal/terminal-dbus.c:146
+#: ../terminal/terminal-dbus.c:134
 #, c-format
 msgid "D-BUS message bus disconnected, exiting...\n"
 msgstr "D-BUS mesaj yolu bağlantısı kesildi, işlem sonlanıyor...\n"
 
-#: ../terminal/terminal-dbus.c:208
+#: ../terminal/terminal-dbus.c:196
 #, c-format
 msgid "Unable to register object %s"
 msgstr "%s nesnesinin kaydı yapılamaz"
@@ -363,7 +164,7 @@ msgstr ""
 msgid "Failed to open the documentation browser"
 msgstr "Belge tarayıcısının açılmasında hata oluştu"
 
-#: ../terminal/terminal-options.c:189
+#: ../terminal/terminal-options.c:206
 #, c-format
 msgid ""
 "Option \"--default-display\" requires specifying the default X display as "
@@ -371,7 +172,7 @@ msgid ""
 msgstr ""
 "\"--default-display\" seçeneği parametre olarak varsayılan X ekranını ister"
 
-#: ../terminal/terminal-options.c:204
+#: ../terminal/terminal-options.c:221
 #, c-format
 msgid ""
 "Option \"--default-working-directory\" requires specifying the default "
@@ -380,15 +181,7 @@ msgstr ""
 "\"--default-working-directory\" seçeneği parametre olarak varsayılan çalışma "
 "dizini ister"
 
-#: ../terminal/terminal-options.c:235
-#, c-format
-msgid ""
-"Option \"--sm-client-id\" requires specifying the session id as its parameter"
-msgstr ""
-"\"--sm-client-id\" seçeneği parametre olarak belirlenen oturum kimliğini "
-"ister"
-
-#: ../terminal/terminal-options.c:250
+#: ../terminal/terminal-options.c:237
 #, c-format
 msgid ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
@@ -397,14 +190,14 @@ msgstr ""
 "\"--execute/-x\" seçeneği, komut satırının geri kalanında çalışacak komutu "
 "ister"
 
-#: ../terminal/terminal-options.c:267
+#: ../terminal/terminal-options.c:254
 #, c-format
 msgid ""
 "Option \"--command/-e\" requires specifying the command to run as its "
 "parameter"
 msgstr "\"--command/-e\" seçeneği parametre olarak çalışacak komutu ister"
 
-#: ../terminal/terminal-options.c:284
+#: ../terminal/terminal-options.c:271
 #, c-format
 msgid ""
 "Option \"--working-directory\" requires specifying the working directory as "
@@ -412,36 +205,36 @@ msgid ""
 msgstr ""
 "\"--working-directory\" seçeneği parametre olarak çalışma dizininiister"
 
-#: ../terminal/terminal-options.c:299
+#: ../terminal/terminal-options.c:286
 #, c-format
 msgid "Option \"--title/-T\" requires specifying the title as its parameter"
 msgstr "\"--title/-T\" seçeneği parametre olarak başlığı ister"
 
-#: ../terminal/terminal-options.c:319
+#: ../terminal/terminal-options.c:305
 #, c-format
 msgid ""
 "Option \"--display\" requires specifying the X display as its parameters"
 msgstr "\"--display\" seçeneği parametre olarak belirlenen X ekranını ister"
 
-#: ../terminal/terminal-options.c:334
+#: ../terminal/terminal-options.c:320
 #, c-format
 msgid ""
 "Option \"--geometry\" requires specifying the window geometry as its "
 "parameter"
 msgstr "\"--geometry\" seçeneği parametre olarak pencere biçimini ister."
 
-#: ../terminal/terminal-options.c:349
+#: ../terminal/terminal-options.c:335
 #, c-format
 msgid "Option \"--role\" requires specifying the window role as its parameter"
 msgstr "\"--role\" seçeneği parameter olarak pencere rolünü ister"
 
-#: ../terminal/terminal-options.c:364
+#: ../terminal/terminal-options.c:350
 #, c-format
 msgid ""
 "Option \"--startup-id\" requires specifying the startup id as its parameter"
 msgstr "\"--startup-id\" seçeneği parametre olarak başlangıç kimliğini ister"
 
-#: ../terminal/terminal-options.c:379
+#: ../terminal/terminal-options.c:365
 #, c-format
 msgid ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
@@ -450,7 +243,7 @@ msgstr ""
 "\"--icon/-I\" seçeneği parametre olarak bir simge adı veya dosya adı "
 "gerektirir  "
 
-#: ../terminal/terminal-options.c:435
+#: ../terminal/terminal-options.c:419
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Bilinmeyen seçenek \"%s\""
@@ -519,7 +312,7 @@ msgstr "Tam ekran"
 msgid "Set Title"
 msgstr "Başlık Belirle"
 
-#: ../terminal/terminal-preferences.c:464
+#: ../terminal/terminal-preferences.c:464 ../terminal/terminal-window.c:237
 msgid "Reset"
 msgstr "Sıfırla"
 
@@ -814,6 +607,11 @@ msgstr "Sıfı_rla"
 msgid "Reset and C_lear"
 msgstr "Sıfırla ve Temiz_le"
 
+#: ../terminal/terminal-window.c:238
+#, fuzzy
+msgid "Reset and clear"
+msgstr "Sıfırla ve Temizle"
+
 #: ../terminal/terminal-window.c:239
 msgid "_Go"
 msgstr "_Git"
@@ -1440,6 +1238,281 @@ msgstr "Komut başladığında utmp/wtmp kayıtlarını güncelle"
 msgid "seconds"
 msgstr "saniye"
 
+#~ msgid ""
+#~ "  -h, --help                          Print this help message and exit"
+#~ msgstr ""
+#~ "  -h, --help                         Bu yardım mesajını yazar ve çıkar"
+
+#~ msgid ""
+#~ "  -V, --version                       Print version information and exit"
+#~ msgstr ""
+#~ "  -V, --version                       Sürüm bilgisini yazar ve çıkar"
+
+#~ msgid ""
+#~ "  --disable-server                    Do not register with the D-BUS\n"
+#~ "                                      session message bus"
+#~ msgstr ""
+#~ "  --disable-server                    D-BUS oturum mesaj taşıtıyla\n"
+#~ "                                      kayıt edilmez"
+
+#~ msgid "  --default-display=DISPLAY           default X display to use"
+#~ msgstr ""
+#~ "  --default-display=EKRAN             kullanılacak öntanımlı X ekranı"
+
+#~ msgid ""
+#~ "  --default-working-directory=DIRNAME Set the default terminal's working\n"
+#~ "                                      directory"
+#~ msgstr ""
+#~ "  --default-working-directory=DİZİN   Uçbirimin öntanımlı çalışma dizini\n"
+#~ "                                      belirler"
+
+#~ msgid ""
+#~ "  --tab                               Open a new tab in the last-"
+#~ "specified\n"
+#~ "                                      window; more than one of these\n"
+#~ "                                      options can be provided"
+#~ msgstr ""
+#~ "  --tab                               Son belirlenmiş pencerede yeni bir "
+#~ "sekme\n"
+#~ "                                      aç; bu seçeneklerin birden fazlası "
+#~ "verilebilir"
+
+#~ msgid ""
+#~ "  --window                            Open a new window containing one "
+#~ "tab;\n"
+#~ "                                      more than one of these options can "
+#~ "be\n"
+#~ "                                      provided"
+#~ msgstr ""
+#~ "  --window                            Bir sekme içeren yeni pencere aç;\n"
+#~ "                                      bu seçeneklerin birden fazlası\n"
+#~ "                                      verilebilir"
+
+#~ msgid ""
+#~ "  -x, --execute                       Execute the remainder of the "
+#~ "command\n"
+#~ "                                      line inside the terminal"
+#~ msgstr ""
+#~ "  -x, --execute                       Komut satırındaki notu uçbirim "
+#~ "içinde\n"
+#~ "                                      çalıştırır"
+
+#~ msgid ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+#~ msgstr ""
+#~ "  -e, --command=DİZGE                 Argümanı ilgili seçenekle\n"
+#~ "                                      uçbirim içinde çalıştırır"
+
+#~ msgid ""
+#~ "  --working-directory=DIRNAME         Set the terminal's working directory"
+#~ msgstr ""
+#~ "  --working-directory=DIZINADI        Uçbirimin çalışacağı dizini belirler"
+
+#~ msgid "  -T, --title=TITLE                   Set the terminal's title"
+#~ msgstr "  -T, --title=TITLE                   Uçbirimin başlığını belirle"
+
+#~ msgid ""
+#~ "  -H, --hold                          Do not immediately destroy the tab\n"
+#~ "                                      when the child command exits"
+#~ msgstr ""
+#~ "  -H, --hold                          Alt komutun çalışması bittiğinde\n"
+#~ "                                      sekmeyi hemen yoketme"
+
+#~ msgid ""
+#~ "  --display=DISPLAY                   X display to use for the last-\n"
+#~ "                                      specified window"
+#~ msgstr ""
+#~ "  --display=DISPLAY                   Son belirlenmiş pencere olarak\n"
+#~ "                                      X ekranını kullan"
+
+#~ msgid ""
+#~ "  --geometry=GEOMETRY                 X geometry specification (see \"X"
+#~ "\"\n"
+#~ "                                      man page), can be specified once "
+#~ "per\n"
+#~ "                                      window to be opened"
+#~ msgstr ""
+#~ "  --geometry=GEOMETRİ                 X geometri özelliği (\"X\"\n"
+#~ "                                      kılavuz sayfasına bkz.), açılacak "
+#~ "her pencere\n"
+#~ "                                      için bir kere belirlenebilir"
+
+#~ msgid ""
+#~ "  --role=ROLE                         Set the role for the last-"
+#~ "specified\n"
+#~ "                                      window; applies to only one "
+#~ "window;\n"
+#~ "                                      can be specified once for each "
+#~ "window\n"
+#~ "                                      you create from the command line"
+#~ msgstr ""
+#~ "  --role=ROL                          Son belirlenmiş pencere için rol "
+#~ "tanımlar;\n"
+#~ "                                      yalnız bir pencereye uygulanır;\n"
+#~ "                                      komut satırından oluşturduğunuz\n"
+#~ "                                      her pencere için bir kez "
+#~ "tanımlanabilir"
+
+#~ msgid ""
+#~ "  --startup-id=STRING                 ID for the startup notification\n"
+#~ "                                      protocol"
+#~ msgstr ""
+#~ "  --startup-id=DİZGE                  Açılış uyarı protokolü için\n"
+#~ "                                      ID"
+
+#~ msgid ""
+#~ "  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
+#~ "                                      name or filename"
+#~ msgstr ""
+#~ "  -I, --icon=SİMGE                 Terminal simgesini belirlenen bir\n"
+#~ "                                      dosya adı veya isim olarak ayarlar "
+
+#~ msgid ""
+#~ "  --fullscreen                        Set the last-specified window into\n"
+#~ "                                      fullscreen mode; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --fullscreen                        Son belirlenmiş pencereyi tam "
+#~ "ekran\n"
+#~ "                                      kipinde konumlandır; yalnız tek "
+#~ "bir\n"
+#~ "                                      pencereye uygulanır; komut "
+#~ "satırından\n"
+#~ "                                      yaratılan her pencere için sadece "
+#~ "bir\n"
+#~ "                                      kez belirlenebilir"
+
+#~ msgid ""
+#~ "  --maximize                          Maximize the last-specified "
+#~ "window;\n"
+#~ "                                      applies to only one window; can be\n"
+#~ "                                      specified once for each window you\n"
+#~ "                                      create from the command line"
+#~ msgstr ""
+#~ "  --maximize                          Son belirlenmiş pencereyi tam "
+#~ "ekranda açar;\n"
+#~ "                                      yalnız bir pencereye uygulanır;\n"
+#~ "                                      komut satırından oluşturduğunuz\n"
+#~ "                                      her pencere için bir kez "
+#~ "tanımlanabilir"
+
+#~ msgid ""
+#~ "  --show-menubar                      Turn on the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-menubar                      Son belirlenmiş pencere için menü\n"
+#~ "                                      çubuğunu aç; yalnız tek bir "
+#~ "pencereye\n"
+#~ "                                      uygulanır; komut satırından "
+#~ "yaratılan\n"
+#~ "                                      her pencere için sadece bir kez\n"
+#~ "                                      belirlenebilir."
+
+#~ msgid ""
+#~ "  --hide-menubar                      Turn off the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-menubar                      Son belirlenen pencere için menü\n"
+#~ "                                      çubuğunu kapat; yalnız tek bir "
+#~ "pencereye\n"
+#~ "                                      uygulanır; komut satırından "
+#~ "yaratılan\n"
+#~ "                                      her pencere için sadece bir kez\n"
+#~ "                                      belirlenebilir."
+
+#~ msgid ""
+#~ "  --show-borders                      Turn on the window decorations for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --show-borders                      Son belirlenen pencere için "
+#~ "pencere\n"
+#~ "                                      desenini aç; yalnız tek bir "
+#~ "pencereye\n"
+#~ "                                      uygulanır; komut satırından "
+#~ "yaratılan\n"
+#~ "                                      her pencere için sadece bir kez\n"
+#~ "                                      belirlenebilir."
+
+#~ msgid ""
+#~ "  --hide-borders                      Turn off the window decorations "
+#~ "for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --hide-borders                      Son belirlenen pencere için "
+#~ "pencere\n"
+#~ "                                      desenini kapat; yalnız tek bir "
+#~ "pencereye\n"
+#~ "                                      uygulanır; komut satırından "
+#~ "yaratılan\n"
+#~ "                                      her pencere için sadece bir kez\n"
+#~ "                                      belirlenebilir."
+
+#~ msgid ""
+#~ "  --show-toolbars                     Turn on the toolbars for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-toolbars                     Son belirlenen pencere için araç\n"
+#~ "                                      çubuğunu aç; yalnız tek bir "
+#~ "pencereye\n"
+#~ "                                      uygulanır; komut satırından "
+#~ "yaratılan\n"
+#~ "                                      her pencere için sadece bir kez\n"
+#~ "                                      belirlenebilir."
+
+#~ msgid ""
+#~ "  --hide-toolbars                     Turn off the toolbars for the "
+#~ "last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-toolbars                     Son belirlenen pencere için araç\n"
+#~ "                                      çubuğunu kapat; yalnız tek bir "
+#~ "pencereye\n"
+#~ "                                      uygulanır; komut satırından "
+#~ "yaratılan\n"
+#~ "                                      her pencere için sadece bir kez\n"
+#~ "                                      belirlenebilir."
+
+#~ msgid "Unable to launch terminal: %s\n"
+#~ msgstr "%s uçbirimi başlatılamadı.\n"
+
+#~ msgid ""
+#~ "Option \"--sm-client-id\" requires specifying the session id as its "
+#~ "parameter"
+#~ msgstr ""
+#~ "\"--sm-client-id\" seçeneği parametre olarak belirlenen oturum kimliğini "
+#~ "ister"
+
 #~ msgid "<b>Title:</b>"
 #~ msgstr "<b>Başlık:</b>"
 
diff --git a/po/uk.po b/po/uk.po
index 35f2a66..9d961c5 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: thunar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 11:48+0100\n"
+"POT-Creation-Date: 2009-12-14 16:03+0100\n"
 "PO-Revision-Date: 2008-06-30 18:50+0300\n"
 "Last-Translator: Dmitry Nikitin <luckas_fb at mail.ru>\n"
 "Language-Team: Ukrainian <xfce4-dev at xfce.org>\n"
@@ -17,295 +17,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../terminal/main.c:46
+#: ../terminal/main.c:48
 msgid "Usage:"
 msgstr ""
 
-#: ../terminal/main.c:47
+#: ../terminal/main.c:48
 msgid "OPTION"
 msgstr ""
 
-#: ../terminal/main.c:49
+#: ../terminal/main.c:53
 #, fuzzy
 msgid "General Options"
 msgstr "Загальні"
 
-#: ../terminal/main.c:50
-msgid "  -h, --help                          Print this help message and exit"
-msgstr ""
-"  -h, --help                          Вивести довідку та завершити роботу"
-
-#: ../terminal/main.c:51
+#. parameter of --default-display
+#. parameter of --display
+#: ../terminal/main.c:55 ../terminal/main.c:81
 #, fuzzy
-msgid ""
-"  -V, --version                       Print version information and exit"
-msgstr ""
-"  -v, --version                       Вивести інформацію про версію та вийти"
-
-#: ../terminal/main.c:52
-msgid ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
-msgstr ""
-"  --disable-server                    Не реєструватись у менеджері\n"
-"                                      сеансів на шині D-BUS"
-
-#: ../terminal/main.c:54
-msgid "  --default-display=DISPLAY           default X display to use"
-msgstr ""
-"  --default-display=ДИСПЛЕЙ           типовий X-дисплей, що використовується"
+msgid "display"
+msgstr "Не відображається"
 
-#: ../terminal/main.c:55
-msgid ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
+#. parameter of --default-working-directory
+#. parameter of --working-directory
+#: ../terminal/main.c:57 ../terminal/main.c:72
+msgid "directory"
 msgstr ""
-"  --default-working-directory=ІМ'Я ТЕКИ Встановити типову робочу теку   \n"
-"                                      терміналу"
 
-#: ../terminal/main.c:58
+#: ../terminal/main.c:61
 msgid "Window or Tab Separators"
 msgstr ""
 
-#: ../terminal/main.c:59
-msgid ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-msgstr ""
-"  --tab                               Відкрити нову вкладку у останньому\n"
-"                                      вказаному вікні; застосовується лише "
-"до одного\n"
-"                                      вікна; можна вказувати один раз для\n"
-"                                      кожного вікна створеного з командного "
-"рядка."
-
-#: ../terminal/main.c:62
-msgid ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-msgstr ""
-"  --window                            Відкрити нове вікно з однією "
-"вкладкою;\n"
-"                                      параметр можна вказувати один раз для"
-
 #: ../terminal/main.c:66
 msgid "Tab Options"
 msgstr ""
 
-#: ../terminal/main.c:67
-msgid ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-msgstr ""
-"  -x, --execute                       Виконати залишок командного рядка у\n"
-"                                      терміналі"
-
-#: ../terminal/main.c:69
-msgid ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-msgstr ""
-"  -e, --command=РЯДОК                 Виконати аргумент цього параметра\n"
-"                                      у терміналі"
-
-#: ../terminal/main.c:71
-msgid ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
-msgstr ""
-"  --working-directory=ІМ'Я ТЕКИ  Встановити робочу теку для терміналу     "
-
-#: ../terminal/main.c:72
-msgid "  -T, --title=TITLE                   Set the terminal's title"
-msgstr "  -T, --title=ЗАГОЛОВОК Встановити заголовок вікна терміналу  "
-
-#: ../terminal/main.c:73
-msgid ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-msgstr ""
-"  -H, --hold                          Не знищувати вкладку, при завершенні\n"
-"                                      виконання дочірньої команди"
-
-#: ../terminal/main.c:76
+#. parameter of --command
+#: ../terminal/main.c:68
 #, fuzzy
-msgid "Window Options"
-msgstr "Невідомий параметр \"%s\""
+msgid "command"
+msgstr "<b>Команда</b>"
 
-#: ../terminal/main.c:77
-msgid ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
-msgstr ""
-"  --display=DISPLAY                   X-дисплей що використовується для\n"
-"                                      останнього вказаного вікна"
+#. parameter of --title
+#: ../terminal/main.c:70
+#, fuzzy
+msgid "title"
+msgstr "Плиткою"
 
 #: ../terminal/main.c:79
-msgid ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
-msgstr ""
-"  --geometry=ГЕОМЕТРІЯ                Параметри геометрії вікна X-Window \n"
-"                                      (див сторінку посібника \"X\"), можна\n"
-"                                      вказувати один раз для кожного вікна,\n"
-"                                      що відкриватиметься."
-
-#: ../terminal/main.c:82
 #, fuzzy
-msgid ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
-msgstr ""
-"  --role=РОЛЬ                         Вказати роль для останнього вказаного\n"
-"                                      вікна; застосовується лише до одного\n"
-"                                      вікна; можна вказувати один раз для\n"
-"                                      кожного вікна створеного з командного "
-"рядка."
+msgid "Window Options"
+msgstr "Невідомий параметр \"%s\""
 
-#: ../terminal/main.c:86
-msgid ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
+#. parameter of --geometry
+#: ../terminal/main.c:83
+msgid "geometry"
 msgstr ""
-"  --startup-id=РЯДОК                  ідентифікатор для протоколу\n"
-"                                      сповіщення про запуск"
 
-#: ../terminal/main.c:88
-#, fuzzy
-msgid ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
+#. parameter of --role
+#: ../terminal/main.c:85
+msgid "role"
 msgstr ""
-"  -e, --command=РЯДОК                 Виконати аргумент цього параметра\n"
-"                                      у терміналі"
 
-#: ../terminal/main.c:90
+#. parameter of --startup-id
+#: ../terminal/main.c:87
 #, fuzzy
-msgid ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --fullscreen                        Вказати роль для останнього вказаного\n"
-"                                      вікна; застосовується лише до одного\n"
-"                                      вікна; можна вказувати один раз для\n"
-"                                      кожного вікна створеного з командного\n"
-"                                      рядка."
+msgid "string"
+msgstr "Попередження"
 
-#: ../terminal/main.c:95
+#. parameter of --icon
+#: ../terminal/main.c:89
 #, fuzzy
-msgid ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
-msgstr ""
-"  --role=РОЛЬ                         Вказати роль для останнього вказаного\n"
-"                                      вікна; застосовується лише до одного\n"
-"                                      вікна; можна вказувати один раз для\n"
-"                                      кожного вікна створеного з командного "
-"рядка."
-
-#: ../terminal/main.c:99
-msgid ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-menubar                      Увімкнути панель меню для останнього\n"
-"                                      вказаного вікна; застосовується лише\n"
-"                                      до одного вікна; можна вказувати раз\n"
-"                                      для кожного вікна створеного з\n"
-"                                      командного рядка."
-
-#: ../terminal/main.c:104
-msgid ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --hide-menubar                      Вимкнути панель меню для останнього\n"
-"                                      вказаного вікна; застосовується лише\n"
-"                                      до одного вікна; можна вказувати раз\n"
-"                                      для кожного вікна створеного з\n"
-"                                      командного рядка."
-
-#: ../terminal/main.c:109
-msgid ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --show-borders                      Показати заголовок та межі вікна у\n"
-"                                      останньому вікні; застосовується лише\n"
-"                                      до одного вікна; можна вказувати раз\n"
-"                                      для кожного вікна створеного з\n"
-"                                      командного рядка."
+msgid "icon"
+msgstr "Дія"
 
-#: ../terminal/main.c:114
-msgid ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
+#: ../terminal/main.c:91
+#, c-format
+msgid "See the %s man page for full explanation of the options above."
 msgstr ""
-"  --hide-borders                      Сховати заголовок та межі вікна у\n"
-"                                      останньому вікні; застосовується лише\n"
-"                                      до одного вікна; можна вказувати раз\n"
-"                                      для кожного вікна створеного з "
-"командного рядка."
 
-#: ../terminal/main.c:119
-msgid ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-toolbars                     Показати панелі інструментів "
-"останнього\n"
-"                                      вказаного вікна; застосовується лише "
-"до\n"
-"                                      одного вікна; можна вказувати раз для\n"
-"                                      кожного вікна створеного з командного "
-"рядка."
-
-#: ../terminal/main.c:124
-msgid ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --hide-toolbars                     Сховати панелі інструментів для "
-"останнього\n"
-"                                      вказаного вікна; застосовується лише "
-"до одного\n"
-"                                      вікна; можна вказувати один раз для\n"
-"                                      кожного вікна створеного з командного "
-"рядка."
-
-#: ../terminal/main.c:151 ../terminal/terminal-preferences.c:1263
+#: ../terminal/main.c:118 ../terminal/terminal-preferences.c:1263
 #: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr "Термінал"
 
-#: ../terminal/main.c:173
+#: ../terminal/main.c:135
 #, c-format
 msgid ""
 "%s (Xfce %s)\n"
@@ -330,31 +125,26 @@ msgstr ""
 "\n"
 "Звіт про помилки для  <%s>.\n"
 
-#: ../terminal/main.c:267
+#: ../terminal/main.c:239
 #, c-format
 msgid "Unable to register terminal service: %s\n"
 msgstr "Не вдається зареєструвати службу терміналу: %s\n"
 
-#: ../terminal/main.c:276
-#, c-format
-msgid "Unable to launch terminal: %s\n"
-msgstr "Неможливо запустити термінал: %s\n"
-
-#: ../terminal/terminal-app.c:551
+#: ../terminal/terminal-app.c:554
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "Неправильний рядок геометрії \"%s\"\n"
 
-#: ../terminal/terminal-dbus.c:114
+#: ../terminal/terminal-dbus.c:108
 msgid "User id mismatch"
 msgstr "Невідповідний ідентифікатор користувача"
 
-#: ../terminal/terminal-dbus.c:146
+#: ../terminal/terminal-dbus.c:134
 #, c-format
 msgid "D-BUS message bus disconnected, exiting...\n"
 msgstr "Шина повідомлень D-BUS вимкнена, завершення роботи...\n"
 
-#: ../terminal/terminal-dbus.c:208
+#: ../terminal/terminal-dbus.c:196
 #, c-format
 msgid "Unable to register object %s"
 msgstr "Не вдається зареєструвати об'єкт %s"
@@ -376,7 +166,7 @@ msgstr ""
 msgid "Failed to open the documentation browser"
 msgstr "Не вдається відкрити програму перегляду документації"
 
-#: ../terminal/terminal-options.c:189
+#: ../terminal/terminal-options.c:206
 #, c-format
 msgid ""
 "Option \"--default-display\" requires specifying the default X display as "
@@ -385,7 +175,7 @@ msgstr ""
 "Для параметра \"--default-display\" потрібно вказати аргумент з типовим X-"
 "дисплеєм"
 
-#: ../terminal/terminal-options.c:204
+#: ../terminal/terminal-options.c:221
 #, c-format
 msgid ""
 "Option \"--default-working-directory\" requires specifying the default "
@@ -394,15 +184,7 @@ msgstr ""
 "Для параметра \"--default-working-directory\" потрібно вказати аргумент з "
 "типовим робочим каталогом"
 
-#: ../terminal/terminal-options.c:235
-#, c-format
-msgid ""
-"Option \"--sm-client-id\" requires specifying the session id as its parameter"
-msgstr ""
-"Для параметра \"--sm-client-id\" потрібно вказати аргумент з ідентифікатором "
-"сеансу"
-
-#: ../terminal/terminal-options.c:250
+#: ../terminal/terminal-options.c:237
 #, c-format
 msgid ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
@@ -410,7 +192,7 @@ msgid ""
 msgstr ""
 "Для параметра \"--execute/-x\" потрібно вказати команду, яку слід виконати"
 
-#: ../terminal/terminal-options.c:267
+#: ../terminal/terminal-options.c:254
 #, c-format
 msgid ""
 "Option \"--command/-e\" requires specifying the command to run as its "
@@ -418,7 +200,7 @@ msgid ""
 msgstr ""
 "Для параметра \"--execute/-x\" потрібно вказати команду, яку слід виконати"
 
-#: ../terminal/terminal-options.c:284
+#: ../terminal/terminal-options.c:271
 #, c-format
 msgid ""
 "Option \"--working-directory\" requires specifying the working directory as "
@@ -427,19 +209,19 @@ msgstr ""
 "Для параметра \"--working-directory\" потрібно вказати аргумент з робочим "
 "каталогом"
 
-#: ../terminal/terminal-options.c:299
+#: ../terminal/terminal-options.c:286
 #, c-format
 msgid "Option \"--title/-T\" requires specifying the title as its parameter"
 msgstr ""
 "Для параметра \"--title/-T\" потрібно вказати аргумент із назвою заголовка"
 
-#: ../terminal/terminal-options.c:319
+#: ../terminal/terminal-options.c:305
 #, c-format
 msgid ""
 "Option \"--display\" requires specifying the X display as its parameters"
 msgstr "Для параметра \"--display\" потрібно вказати аргумент з X-дисплеєм"
 
-#: ../terminal/terminal-options.c:334
+#: ../terminal/terminal-options.c:320
 #, c-format
 msgid ""
 "Option \"--geometry\" requires specifying the window geometry as its "
@@ -447,12 +229,12 @@ msgid ""
 msgstr ""
 "Для параметра \"--geometry\" потрібно вказати аргумент з геометрією вікна"
 
-#: ../terminal/terminal-options.c:349
+#: ../terminal/terminal-options.c:335
 #, c-format
 msgid "Option \"--role\" requires specifying the window role as its parameter"
 msgstr "Для параметра \"--role\" потрібно вказати аргумент з роллю вікна"
 
-#: ../terminal/terminal-options.c:364
+#: ../terminal/terminal-options.c:350
 #, c-format
 msgid ""
 "Option \"--startup-id\" requires specifying the startup id as its parameter"
@@ -460,7 +242,7 @@ msgstr ""
 "Для параметра \"--startup-id\" потрібно вказати аргумент з ідентифікатором "
 "запуску"
 
-#: ../terminal/terminal-options.c:379
+#: ../terminal/terminal-options.c:365
 #, fuzzy, c-format
 msgid ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
@@ -468,7 +250,7 @@ msgid ""
 msgstr ""
 "Для параметра \"--execute/-x\" потрібно вказати команду, яку слід виконати"
 
-#: ../terminal/terminal-options.c:435
+#: ../terminal/terminal-options.c:419
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Невідомий параметр \"%s\""
@@ -537,7 +319,7 @@ msgstr "На весь екран"
 msgid "Set Title"
 msgstr "Встановлення заголовка"
 
-#: ../terminal/terminal-preferences.c:464
+#: ../terminal/terminal-preferences.c:464 ../terminal/terminal-window.c:237
 msgid "Reset"
 msgstr "Скинути"
 
@@ -836,6 +618,11 @@ msgstr "Скин_ути"
 msgid "Reset and C_lear"
 msgstr "Скинути та о_чистити"
 
+#: ../terminal/terminal-window.c:238
+#, fuzzy
+msgid "Reset and clear"
+msgstr "Скинути та очистити"
+
 #: ../terminal/terminal-window.c:239
 msgid "_Go"
 msgstr "Пере_йти"
@@ -1510,6 +1297,302 @@ msgstr "_Оновлювати журнали utmp/wtmp під час запус
 msgid "seconds"
 msgstr "секунд"
 
+#~ msgid ""
+#~ "  -h, --help                          Print this help message and exit"
+#~ msgstr ""
+#~ "  -h, --help                          Вивести довідку та завершити роботу"
+
+#, fuzzy
+#~ msgid ""
+#~ "  -V, --version                       Print version information and exit"
+#~ msgstr ""
+#~ "  -v, --version                       Вивести інформацію про версію та "
+#~ "вийти"
+
+#~ msgid ""
+#~ "  --disable-server                    Do not register with the D-BUS\n"
+#~ "                                      session message bus"
+#~ msgstr ""
+#~ "  --disable-server                    Не реєструватись у менеджері\n"
+#~ "                                      сеансів на шині D-BUS"
+
+#~ msgid "  --default-display=DISPLAY           default X display to use"
+#~ msgstr ""
+#~ "  --default-display=ДИСПЛЕЙ           типовий X-дисплей, що "
+#~ "використовується"
+
+#~ msgid ""
+#~ "  --default-working-directory=DIRNAME Set the default terminal's working\n"
+#~ "                                      directory"
+#~ msgstr ""
+#~ "  --default-working-directory=ІМ'Я ТЕКИ Встановити типову робочу теку   \n"
+#~ "                                      терміналу"
+
+#~ msgid ""
+#~ "  --tab                               Open a new tab in the last-"
+#~ "specified\n"
+#~ "                                      window; more than one of these\n"
+#~ "                                      options can be provided"
+#~ msgstr ""
+#~ "  --tab                               Відкрити нову вкладку у останньому\n"
+#~ "                                      вказаному вікні; застосовується "
+#~ "лише до одного\n"
+#~ "                                      вікна; можна вказувати один раз "
+#~ "для\n"
+#~ "                                      кожного вікна створеного з "
+#~ "командного рядка."
+
+#~ msgid ""
+#~ "  --window                            Open a new window containing one "
+#~ "tab;\n"
+#~ "                                      more than one of these options can "
+#~ "be\n"
+#~ "                                      provided"
+#~ msgstr ""
+#~ "  --window                            Відкрити нове вікно з однією "
+#~ "вкладкою;\n"
+#~ "                                      параметр можна вказувати один раз "
+#~ "для"
+
+#~ msgid ""
+#~ "  -x, --execute                       Execute the remainder of the "
+#~ "command\n"
+#~ "                                      line inside the terminal"
+#~ msgstr ""
+#~ "  -x, --execute                       Виконати залишок командного рядка "
+#~ "у\n"
+#~ "                                      терміналі"
+
+#~ msgid ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+#~ msgstr ""
+#~ "  -e, --command=РЯДОК                 Виконати аргумент цього параметра\n"
+#~ "                                      у терміналі"
+
+#~ msgid ""
+#~ "  --working-directory=DIRNAME         Set the terminal's working directory"
+#~ msgstr ""
+#~ "  --working-directory=ІМ'Я ТЕКИ  Встановити робочу теку для терміналу     "
+
+#~ msgid "  -T, --title=TITLE                   Set the terminal's title"
+#~ msgstr "  -T, --title=ЗАГОЛОВОК Встановити заголовок вікна терміналу  "
+
+#~ msgid ""
+#~ "  -H, --hold                          Do not immediately destroy the tab\n"
+#~ "                                      when the child command exits"
+#~ msgstr ""
+#~ "  -H, --hold                          Не знищувати вкладку, при "
+#~ "завершенні\n"
+#~ "                                      виконання дочірньої команди"
+
+#~ msgid ""
+#~ "  --display=DISPLAY                   X display to use for the last-\n"
+#~ "                                      specified window"
+#~ msgstr ""
+#~ "  --display=DISPLAY                   X-дисплей що використовується для\n"
+#~ "                                      останнього вказаного вікна"
+
+#~ msgid ""
+#~ "  --geometry=GEOMETRY                 X geometry specification (see \"X"
+#~ "\"\n"
+#~ "                                      man page), can be specified once "
+#~ "per\n"
+#~ "                                      window to be opened"
+#~ msgstr ""
+#~ "  --geometry=ГЕОМЕТРІЯ                Параметри геометрії вікна X-"
+#~ "Window \n"
+#~ "                                      (див сторінку посібника \"X\"), "
+#~ "можна\n"
+#~ "                                      вказувати один раз для кожного "
+#~ "вікна,\n"
+#~ "                                      що відкриватиметься."
+
+#, fuzzy
+#~ msgid ""
+#~ "  --role=ROLE                         Set the role for the last-"
+#~ "specified\n"
+#~ "                                      window; applies to only one "
+#~ "window;\n"
+#~ "                                      can be specified once for each "
+#~ "window\n"
+#~ "                                      you create from the command line"
+#~ msgstr ""
+#~ "  --role=РОЛЬ                         Вказати роль для останнього "
+#~ "вказаного\n"
+#~ "                                      вікна; застосовується лише до "
+#~ "одного\n"
+#~ "                                      вікна; можна вказувати один раз "
+#~ "для\n"
+#~ "                                      кожного вікна створеного з "
+#~ "командного рядка."
+
+#~ msgid ""
+#~ "  --startup-id=STRING                 ID for the startup notification\n"
+#~ "                                      protocol"
+#~ msgstr ""
+#~ "  --startup-id=РЯДОК                  ідентифікатор для протоколу\n"
+#~ "                                      сповіщення про запуск"
+
+#, fuzzy
+#~ msgid ""
+#~ "  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
+#~ "                                      name or filename"
+#~ msgstr ""
+#~ "  -e, --command=РЯДОК                 Виконати аргумент цього параметра\n"
+#~ "                                      у терміналі"
+
+#, fuzzy
+#~ msgid ""
+#~ "  --fullscreen                        Set the last-specified window into\n"
+#~ "                                      fullscreen mode; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --fullscreen                        Вказати роль для останнього "
+#~ "вказаного\n"
+#~ "                                      вікна; застосовується лише до "
+#~ "одного\n"
+#~ "                                      вікна; можна вказувати один раз "
+#~ "для\n"
+#~ "                                      кожного вікна створеного з "
+#~ "командного\n"
+#~ "                                      рядка."
+
+#, fuzzy
+#~ msgid ""
+#~ "  --maximize                          Maximize the last-specified "
+#~ "window;\n"
+#~ "                                      applies to only one window; can be\n"
+#~ "                                      specified once for each window you\n"
+#~ "                                      create from the command line"
+#~ msgstr ""
+#~ "  --role=РОЛЬ                         Вказати роль для останнього "
+#~ "вказаного\n"
+#~ "                                      вікна; застосовується лише до "
+#~ "одного\n"
+#~ "                                      вікна; можна вказувати один раз "
+#~ "для\n"
+#~ "                                      кожного вікна створеного з "
+#~ "командного рядка."
+
+#~ msgid ""
+#~ "  --show-menubar                      Turn on the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-menubar                      Увімкнути панель меню для "
+#~ "останнього\n"
+#~ "                                      вказаного вікна; застосовується "
+#~ "лише\n"
+#~ "                                      до одного вікна; можна вказувати "
+#~ "раз\n"
+#~ "                                      для кожного вікна створеного з\n"
+#~ "                                      командного рядка."
+
+#~ msgid ""
+#~ "  --hide-menubar                      Turn off the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-menubar                      Вимкнути панель меню для "
+#~ "останнього\n"
+#~ "                                      вказаного вікна; застосовується "
+#~ "лише\n"
+#~ "                                      до одного вікна; можна вказувати "
+#~ "раз\n"
+#~ "                                      для кожного вікна створеного з\n"
+#~ "                                      командного рядка."
+
+#~ msgid ""
+#~ "  --show-borders                      Turn on the window decorations for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --show-borders                      Показати заголовок та межі вікна у\n"
+#~ "                                      останньому вікні; застосовується "
+#~ "лише\n"
+#~ "                                      до одного вікна; можна вказувати "
+#~ "раз\n"
+#~ "                                      для кожного вікна створеного з\n"
+#~ "                                      командного рядка."
+
+#~ msgid ""
+#~ "  --hide-borders                      Turn off the window decorations "
+#~ "for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --hide-borders                      Сховати заголовок та межі вікна у\n"
+#~ "                                      останньому вікні; застосовується "
+#~ "лише\n"
+#~ "                                      до одного вікна; можна вказувати "
+#~ "раз\n"
+#~ "                                      для кожного вікна створеного з "
+#~ "командного рядка."
+
+#~ msgid ""
+#~ "  --show-toolbars                     Turn on the toolbars for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-toolbars                     Показати панелі інструментів "
+#~ "останнього\n"
+#~ "                                      вказаного вікна; застосовується "
+#~ "лише до\n"
+#~ "                                      одного вікна; можна вказувати раз "
+#~ "для\n"
+#~ "                                      кожного вікна створеного з "
+#~ "командного рядка."
+
+#~ msgid ""
+#~ "  --hide-toolbars                     Turn off the toolbars for the "
+#~ "last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-toolbars                     Сховати панелі інструментів для "
+#~ "останнього\n"
+#~ "                                      вказаного вікна; застосовується "
+#~ "лише до одного\n"
+#~ "                                      вікна; можна вказувати один раз "
+#~ "для\n"
+#~ "                                      кожного вікна створеного з "
+#~ "командного рядка."
+
+#~ msgid "Unable to launch terminal: %s\n"
+#~ msgstr "Неможливо запустити термінал: %s\n"
+
+#~ msgid ""
+#~ "Option \"--sm-client-id\" requires specifying the session id as its "
+#~ "parameter"
+#~ msgstr ""
+#~ "Для параметра \"--sm-client-id\" потрібно вказати аргумент з "
+#~ "ідентифікатором сеансу"
+
 #~ msgid "<b>Title:</b>"
 #~ msgstr "<b>Заголовок:</b>"
 
diff --git a/po/ur.po b/po/ur.po
index 5b9e5c9..2216cfd 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Terminal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 11:48+0100\n"
+"POT-Creation-Date: 2009-12-14 16:03+0100\n"
 "PO-Revision-Date: 2009-07-07 09:25+0500\n"
 "Last-Translator: Muhammad Ali Makki <makki.ma at gmail.com>\n"
 "Language-Team: urdu <makki.ma at gmail.com>\n"
@@ -20,277 +20,88 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../terminal/main.c:46
+#: ../terminal/main.c:48
 msgid "Usage:"
 msgstr "استعمال:"
 
-#: ../terminal/main.c:47
+#: ../terminal/main.c:48
 msgid "OPTION"
 msgstr "اختیار"
 
-#: ../terminal/main.c:49
+#: ../terminal/main.c:53
 msgid "General Options"
 msgstr "عام اختیارات"
 
-#: ../terminal/main.c:50
-msgid "  -h, --help                          Print this help message and exit"
-msgstr ""
-"  -h, --help                          ہدایات کا پیغام طبع کر کے برخاست کریں"
-
-#: ../terminal/main.c:51
-msgid ""
-"  -V, --version                       Print version information and exit"
-msgstr ""
-"  -v, --version                       ورژن کی معلومات طبع کر کے برخاست کریں"
-
-#: ../terminal/main.c:52
-msgid ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
-msgstr ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
-
-#: ../terminal/main.c:54
-msgid "  --default-display=DISPLAY           default X display to use"
-msgstr "  --default-display=DISPLAY           default X display to use"
+#. parameter of --default-display
+#. parameter of --display
+#: ../terminal/main.c:55 ../terminal/main.c:81
+#, fuzzy
+msgid "display"
+msgstr "ڈسپلے نہیں ہورہی"
 
-#: ../terminal/main.c:55
-msgid ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
+#. parameter of --default-working-directory
+#. parameter of --working-directory
+#: ../terminal/main.c:57 ../terminal/main.c:72
+msgid "directory"
 msgstr ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
 
-#: ../terminal/main.c:58
+#: ../terminal/main.c:61
 msgid "Window or Tab Separators"
 msgstr "ونڈو یا ٹیب جداگار"
 
-#: ../terminal/main.c:59
-msgid ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-msgstr ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-
-#: ../terminal/main.c:62
-msgid ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-msgstr ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-
 #: ../terminal/main.c:66
 msgid "Tab Options"
 msgstr "ٹیب اختیارات"
 
-#: ../terminal/main.c:67
-msgid ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-msgstr ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-
-#: ../terminal/main.c:69
-msgid ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-msgstr ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-
-#: ../terminal/main.c:71
-msgid ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
-msgstr ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
-
-#: ../terminal/main.c:72
-msgid "  -T, --title=TITLE                   Set the terminal's title"
-msgstr "  -T, --title=TITLE                   ٹرمنل کا عنوان مرتب کریں"
+#. parameter of --command
+#: ../terminal/main.c:68
+#, fuzzy
+msgid "command"
+msgstr "کمانڈ"
 
-#: ../terminal/main.c:73
-msgid ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-msgstr ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
+#. parameter of --title
+#: ../terminal/main.c:70
+#, fuzzy
+msgid "title"
+msgstr "عنوان"
 
-#: ../terminal/main.c:76
+#: ../terminal/main.c:79
 msgid "Window Options"
 msgstr "ونڈو اختیارات"
 
-#: ../terminal/main.c:77
-msgid ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
-msgstr ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
-
-#: ../terminal/main.c:79
-msgid ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
-msgstr ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
-
-#: ../terminal/main.c:82
-msgid ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
-msgstr ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
-
-#: ../terminal/main.c:86
-msgid ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
-msgstr ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
-
-#: ../terminal/main.c:88
-msgid ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
-msgstr ""
-"  -I, --icon=ICON                     ٹرمنل کی آئکن مرتب کریں بطور\n"
-"                                      نام یا فائل کا نام"
-
-#: ../terminal/main.c:90
-msgid ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-
-#: ../terminal/main.c:95
-msgid ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
-msgstr ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
-
-#: ../terminal/main.c:99
-msgid ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-
-#: ../terminal/main.c:104
-msgid ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#. parameter of --geometry
+#: ../terminal/main.c:83
+msgid "geometry"
 msgstr ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
 
-#: ../terminal/main.c:109
-msgid ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
+#. parameter of --role
+#: ../terminal/main.c:85
+msgid "role"
 msgstr ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
 
-#: ../terminal/main.c:114
-msgid ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
+#. parameter of --startup-id
+#: ../terminal/main.c:87
+#, fuzzy
+msgid "string"
+msgstr "انتباہ"
 
-#: ../terminal/main.c:119
-msgid ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#. parameter of --icon
+#: ../terminal/main.c:89
+#, fuzzy
+msgid "icon"
+msgstr "حرکت"
 
-#: ../terminal/main.c:124
-msgid ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#: ../terminal/main.c:91
+#, c-format
+msgid "See the %s man page for full explanation of the options above."
 msgstr ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
 
-#: ../terminal/main.c:151 ../terminal/terminal-preferences.c:1263
+#: ../terminal/main.c:118 ../terminal/terminal-preferences.c:1263
 #: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr "ٹرمنل"
 
-#: ../terminal/main.c:173
+#: ../terminal/main.c:135
 #, c-format
 msgid ""
 "%s (Xfce %s)\n"
@@ -315,31 +126,26 @@ msgstr ""
 "\n"
 "Please report bugs to <%s>.\n"
 
-#: ../terminal/main.c:267
+#: ../terminal/main.c:239
 #, c-format
 msgid "Unable to register terminal service: %s\n"
 msgstr "ٹرمنل سروس %s رجسٹر نہیں ہوپارہی\n"
 
-#: ../terminal/main.c:276
-#, c-format
-msgid "Unable to launch terminal: %s\n"
-msgstr "ٹرمنل چلانے میں ناکامی: %s\n"
-
-#: ../terminal/terminal-app.c:551
+#: ../terminal/terminal-app.c:554
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "غلط جیومینٹری سٹرنگ \"%s\"\n"
 
-#: ../terminal/terminal-dbus.c:114
+#: ../terminal/terminal-dbus.c:108
 msgid "User id mismatch"
 msgstr "صارف آئی ڈی میچ نہ کرسکا"
 
-#: ../terminal/terminal-dbus.c:146
+#: ../terminal/terminal-dbus.c:134
 #, c-format
 msgid "D-BUS message bus disconnected, exiting...\n"
 msgstr "D-BUS پیغام bus کا اتصال منقطع ہوگیا ہے، برخاستگی...\n"
 
-#: ../terminal/terminal-dbus.c:208
+#: ../terminal/terminal-dbus.c:196
 #, c-format
 msgid "Unable to register object %s"
 msgstr "آبجیکٹ %s رجسٹر نہیں ہوسکا"
@@ -367,7 +173,7 @@ msgstr ""
 msgid "Failed to open the documentation browser"
 msgstr "دستاویزات براؤزر کھولنے میں ناکامی"
 
-#: ../terminal/terminal-options.c:189
+#: ../terminal/terminal-options.c:206
 #, c-format
 msgid ""
 "Option \"--default-display\" requires specifying the default X display as "
@@ -376,7 +182,7 @@ msgstr ""
 "آپشن \"--default-display\" کو بطور اس کے پیرامیٹر کے طے شدہ ایکس کا تعین "
 "مطلوب ہے"
 
-#: ../terminal/terminal-options.c:204
+#: ../terminal/terminal-options.c:221
 #, c-format
 msgid ""
 "Option \"--default-working-directory\" requires specifying the default "
@@ -385,15 +191,7 @@ msgstr ""
 "آپشن \"--default-working-directory\" بطور اپنے پیرامیٹر کے طے شدہ کام کی "
 "ڈائریکٹری کا تعین مطلوب ہے"
 
-#: ../terminal/terminal-options.c:235
-#, c-format
-msgid ""
-"Option \"--sm-client-id\" requires specifying the session id as its parameter"
-msgstr ""
-"پیغام \"--sm-client-id\" کو نشست آئی ڈی کے تعین کی ضرورت ہے بطور اس کے "
-"پیرامیٹر کے"
-
-#: ../terminal/terminal-options.c:250
+#: ../terminal/terminal-options.c:237
 #, c-format
 msgid ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
@@ -401,7 +199,7 @@ msgid ""
 msgstr ""
 "آپشن \"--execute/-x\" کو کمانڈ لائن میں چلنے کے لیے کمانڈ کا تعین مطلوب ہے"
 
-#: ../terminal/terminal-options.c:267
+#: ../terminal/terminal-options.c:254
 #, c-format
 msgid ""
 "Option \"--command/-e\" requires specifying the command to run as its "
@@ -409,7 +207,7 @@ msgid ""
 msgstr ""
 "آپشن \"--command/-e\" کو اپنے پیرامیٹر میں چلنے کے لیے کمانڈ کا تعین درکار ہے"
 
-#: ../terminal/terminal-options.c:284
+#: ../terminal/terminal-options.c:271
 #, c-format
 msgid ""
 "Option \"--working-directory\" requires specifying the working directory as "
@@ -418,19 +216,19 @@ msgstr ""
 "آپشن \"--working-directory\" کو بطور اس کے پیرامیٹر کے چلنے کے لیے کام کی "
 "ڈائریکٹری کا تعین مطلوب ہے"
 
-#: ../terminal/terminal-options.c:299
+#: ../terminal/terminal-options.c:286
 #, c-format
 msgid "Option \"--title/-T\" requires specifying the title as its parameter"
 msgstr "آپشن \"--title/-T\" کو بطور اپنے پیرامیٹر عنوان کا تعین مطلوب ہے"
 
-#: ../terminal/terminal-options.c:319
+#: ../terminal/terminal-options.c:305
 #, c-format
 msgid ""
 "Option \"--display\" requires specifying the X display as its parameters"
 msgstr ""
 "آپشن \"--display\" کو بطور اپنے پیرامیٹر کے ایکس ڈسپلے کا تعین مطلوب ہے"
 
-#: ../terminal/terminal-options.c:334
+#: ../terminal/terminal-options.c:320
 #, c-format
 msgid ""
 "Option \"--geometry\" requires specifying the window geometry as its "
@@ -438,12 +236,12 @@ msgid ""
 msgstr ""
 "آپشن \"--geometry\" کو بطور اپنے پیرامیٹر کے ونڈو جیومیٹری کا تعین مطلوب ہے"
 
-#: ../terminal/terminal-options.c:349
+#: ../terminal/terminal-options.c:335
 #, c-format
 msgid "Option \"--role\" requires specifying the window role as its parameter"
 msgstr "آپشن \"--role\" کو بطور اس کے پيرامیٹر کے ونڈو رول کا تعین مطلوب ہے"
 
-#: ../terminal/terminal-options.c:364
+#: ../terminal/terminal-options.c:350
 #, c-format
 msgid ""
 "Option \"--startup-id\" requires specifying the startup id as its parameter"
@@ -451,7 +249,7 @@ msgstr ""
 "آپشن \"--startup-id\" کو بطور اس کے پیرامیٹر کے سٹارٹ اپ آئی ڈی کا تعین "
 "مطلوب ہے"
 
-#: ../terminal/terminal-options.c:379
+#: ../terminal/terminal-options.c:365
 #, c-format
 msgid ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
@@ -460,7 +258,7 @@ msgstr ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
 "parameter"
 
-#: ../terminal/terminal-options.c:435
+#: ../terminal/terminal-options.c:419
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "نا معلوم آپشن \"%s\""
@@ -529,7 +327,7 @@ msgstr "فل سکرین"
 msgid "Set Title"
 msgstr "عنوان مرتب کریں"
 
-#: ../terminal/terminal-preferences.c:464
+#: ../terminal/terminal-preferences.c:464 ../terminal/terminal-window.c:237
 msgid "Reset"
 msgstr "صاف"
 
@@ -823,6 +621,11 @@ msgstr "_صاف"
 msgid "Reset and C_lear"
 msgstr "صاف کریں"
 
+#: ../terminal/terminal-window.c:238
+#, fuzzy
+msgid "Reset and clear"
+msgstr "صاف کریں"
+
 #: ../terminal/terminal-window.c:239
 msgid "_Go"
 msgstr "_جائیں"
@@ -1448,6 +1251,279 @@ msgstr "جب کمانڈ چلائی جائے utmp/wtmp ریکارڈ اپڈیٹ ک
 msgid "seconds"
 msgstr "سیکنڈ"
 
+#~ msgid ""
+#~ "  -h, --help                          Print this help message and exit"
+#~ msgstr ""
+#~ "  -h, --help                          ہدایات کا پیغام طبع کر کے برخاست "
+#~ "کریں"
+
+#~ msgid ""
+#~ "  -V, --version                       Print version information and exit"
+#~ msgstr ""
+#~ "  -v, --version                       ورژن کی معلومات طبع کر کے برخاست "
+#~ "کریں"
+
+#~ msgid ""
+#~ "  --disable-server                    Do not register with the D-BUS\n"
+#~ "                                      session message bus"
+#~ msgstr ""
+#~ "  --disable-server                    Do not register with the D-BUS\n"
+#~ "                                      session message bus"
+
+#~ msgid "  --default-display=DISPLAY           default X display to use"
+#~ msgstr "  --default-display=DISPLAY           default X display to use"
+
+#~ msgid ""
+#~ "  --default-working-directory=DIRNAME Set the default terminal's working\n"
+#~ "                                      directory"
+#~ msgstr ""
+#~ "  --default-working-directory=DIRNAME Set the default terminal's working\n"
+#~ "                                      directory"
+
+#~ msgid ""
+#~ "  --tab                               Open a new tab in the last-"
+#~ "specified\n"
+#~ "                                      window; more than one of these\n"
+#~ "                                      options can be provided"
+#~ msgstr ""
+#~ "  --tab                               Open a new tab in the last-"
+#~ "specified\n"
+#~ "                                      window; more than one of these\n"
+#~ "                                      options can be provided"
+
+#~ msgid ""
+#~ "  --window                            Open a new window containing one "
+#~ "tab;\n"
+#~ "                                      more than one of these options can "
+#~ "be\n"
+#~ "                                      provided"
+#~ msgstr ""
+#~ "  --window                            Open a new window containing one "
+#~ "tab;\n"
+#~ "                                      more than one of these options can "
+#~ "be\n"
+#~ "                                      provided"
+
+#~ msgid ""
+#~ "  -x, --execute                       Execute the remainder of the "
+#~ "command\n"
+#~ "                                      line inside the terminal"
+#~ msgstr ""
+#~ "  -x, --execute                       Execute the remainder of the "
+#~ "command\n"
+#~ "                                      line inside the terminal"
+
+#~ msgid ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+#~ msgstr ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+
+#~ msgid ""
+#~ "  --working-directory=DIRNAME         Set the terminal's working directory"
+#~ msgstr ""
+#~ "  --working-directory=DIRNAME         Set the terminal's working directory"
+
+#~ msgid "  -T, --title=TITLE                   Set the terminal's title"
+#~ msgstr "  -T, --title=TITLE                   ٹرمنل کا عنوان مرتب کریں"
+
+#~ msgid ""
+#~ "  -H, --hold                          Do not immediately destroy the tab\n"
+#~ "                                      when the child command exits"
+#~ msgstr ""
+#~ "  -H, --hold                          Do not immediately destroy the tab\n"
+#~ "                                      when the child command exits"
+
+#~ msgid ""
+#~ "  --display=DISPLAY                   X display to use for the last-\n"
+#~ "                                      specified window"
+#~ msgstr ""
+#~ "  --display=DISPLAY                   X display to use for the last-\n"
+#~ "                                      specified window"
+
+#~ msgid ""
+#~ "  --geometry=GEOMETRY                 X geometry specification (see \"X"
+#~ "\"\n"
+#~ "                                      man page), can be specified once "
+#~ "per\n"
+#~ "                                      window to be opened"
+#~ msgstr ""
+#~ "  --geometry=GEOMETRY                 X geometry specification (see \"X"
+#~ "\"\n"
+#~ "                                      man page), can be specified once "
+#~ "per\n"
+#~ "                                      window to be opened"
+
+#~ msgid ""
+#~ "  --role=ROLE                         Set the role for the last-"
+#~ "specified\n"
+#~ "                                      window; applies to only one "
+#~ "window;\n"
+#~ "                                      can be specified once for each "
+#~ "window\n"
+#~ "                                      you create from the command line"
+#~ msgstr ""
+#~ "  --role=ROLE                         Set the role for the last-"
+#~ "specified\n"
+#~ "                                      window; applies to only one "
+#~ "window;\n"
+#~ "                                      can be specified once for each "
+#~ "window\n"
+#~ "                                      you create from the command line"
+
+#~ msgid ""
+#~ "  --startup-id=STRING                 ID for the startup notification\n"
+#~ "                                      protocol"
+#~ msgstr ""
+#~ "  --startup-id=STRING                 ID for the startup notification\n"
+#~ "                                      protocol"
+
+#~ msgid ""
+#~ "  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
+#~ "                                      name or filename"
+#~ msgstr ""
+#~ "  -I, --icon=ICON                     ٹرمنل کی آئکن مرتب کریں بطور\n"
+#~ "                                      نام یا فائل کا نام"
+
+#~ msgid ""
+#~ "  --fullscreen                        Set the last-specified window into\n"
+#~ "                                      fullscreen mode; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --fullscreen                        Set the last-specified window into\n"
+#~ "                                      fullscreen mode; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+
+#~ msgid ""
+#~ "  --maximize                          Maximize the last-specified "
+#~ "window;\n"
+#~ "                                      applies to only one window; can be\n"
+#~ "                                      specified once for each window you\n"
+#~ "                                      create from the command line"
+#~ msgstr ""
+#~ "  --maximize                          Maximize the last-specified "
+#~ "window;\n"
+#~ "                                      applies to only one window; can be\n"
+#~ "                                      specified once for each window you\n"
+#~ "                                      create from the command line"
+
+#~ msgid ""
+#~ "  --show-menubar                      Turn on the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-menubar                      Turn on the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+
+#~ msgid ""
+#~ "  --hide-menubar                      Turn off the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-menubar                      Turn off the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+
+#~ msgid ""
+#~ "  --show-borders                      Turn on the window decorations for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --show-borders                      Turn on the window decorations for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+
+#~ msgid ""
+#~ "  --hide-borders                      Turn off the window decorations "
+#~ "for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --hide-borders                      Turn off the window decorations "
+#~ "for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+
+#~ msgid ""
+#~ "  --show-toolbars                     Turn on the toolbars for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-toolbars                     Turn on the toolbars for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+
+#~ msgid ""
+#~ "  --hide-toolbars                     Turn off the toolbars for the "
+#~ "last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-toolbars                     Turn off the toolbars for the "
+#~ "last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+
+#~ msgid "Unable to launch terminal: %s\n"
+#~ msgstr "ٹرمنل چلانے میں ناکامی: %s\n"
+
+#~ msgid ""
+#~ "Option \"--sm-client-id\" requires specifying the session id as its "
+#~ "parameter"
+#~ msgstr ""
+#~ "پیغام \"--sm-client-id\" کو نشست آئی ڈی کے تعین کی ضرورت ہے بطور اس کے "
+#~ "پیرامیٹر کے"
+
 #~ msgid "<b>Title:</b>"
 #~ msgstr "<b>عنوان:</b>"
 
diff --git a/po/ur_PK.po b/po/ur_PK.po
index 5b9e5c9..2216cfd 100644
--- a/po/ur_PK.po
+++ b/po/ur_PK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Terminal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 11:48+0100\n"
+"POT-Creation-Date: 2009-12-14 16:03+0100\n"
 "PO-Revision-Date: 2009-07-07 09:25+0500\n"
 "Last-Translator: Muhammad Ali Makki <makki.ma at gmail.com>\n"
 "Language-Team: urdu <makki.ma at gmail.com>\n"
@@ -20,277 +20,88 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../terminal/main.c:46
+#: ../terminal/main.c:48
 msgid "Usage:"
 msgstr "استعمال:"
 
-#: ../terminal/main.c:47
+#: ../terminal/main.c:48
 msgid "OPTION"
 msgstr "اختیار"
 
-#: ../terminal/main.c:49
+#: ../terminal/main.c:53
 msgid "General Options"
 msgstr "عام اختیارات"
 
-#: ../terminal/main.c:50
-msgid "  -h, --help                          Print this help message and exit"
-msgstr ""
-"  -h, --help                          ہدایات کا پیغام طبع کر کے برخاست کریں"
-
-#: ../terminal/main.c:51
-msgid ""
-"  -V, --version                       Print version information and exit"
-msgstr ""
-"  -v, --version                       ورژن کی معلومات طبع کر کے برخاست کریں"
-
-#: ../terminal/main.c:52
-msgid ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
-msgstr ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
-
-#: ../terminal/main.c:54
-msgid "  --default-display=DISPLAY           default X display to use"
-msgstr "  --default-display=DISPLAY           default X display to use"
+#. parameter of --default-display
+#. parameter of --display
+#: ../terminal/main.c:55 ../terminal/main.c:81
+#, fuzzy
+msgid "display"
+msgstr "ڈسپلے نہیں ہورہی"
 
-#: ../terminal/main.c:55
-msgid ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
+#. parameter of --default-working-directory
+#. parameter of --working-directory
+#: ../terminal/main.c:57 ../terminal/main.c:72
+msgid "directory"
 msgstr ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
 
-#: ../terminal/main.c:58
+#: ../terminal/main.c:61
 msgid "Window or Tab Separators"
 msgstr "ونڈو یا ٹیب جداگار"
 
-#: ../terminal/main.c:59
-msgid ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-msgstr ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-
-#: ../terminal/main.c:62
-msgid ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-msgstr ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-
 #: ../terminal/main.c:66
 msgid "Tab Options"
 msgstr "ٹیب اختیارات"
 
-#: ../terminal/main.c:67
-msgid ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-msgstr ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-
-#: ../terminal/main.c:69
-msgid ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-msgstr ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-
-#: ../terminal/main.c:71
-msgid ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
-msgstr ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
-
-#: ../terminal/main.c:72
-msgid "  -T, --title=TITLE                   Set the terminal's title"
-msgstr "  -T, --title=TITLE                   ٹرمنل کا عنوان مرتب کریں"
+#. parameter of --command
+#: ../terminal/main.c:68
+#, fuzzy
+msgid "command"
+msgstr "کمانڈ"
 
-#: ../terminal/main.c:73
-msgid ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-msgstr ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
+#. parameter of --title
+#: ../terminal/main.c:70
+#, fuzzy
+msgid "title"
+msgstr "عنوان"
 
-#: ../terminal/main.c:76
+#: ../terminal/main.c:79
 msgid "Window Options"
 msgstr "ونڈو اختیارات"
 
-#: ../terminal/main.c:77
-msgid ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
-msgstr ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
-
-#: ../terminal/main.c:79
-msgid ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
-msgstr ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
-
-#: ../terminal/main.c:82
-msgid ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
-msgstr ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
-
-#: ../terminal/main.c:86
-msgid ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
-msgstr ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
-
-#: ../terminal/main.c:88
-msgid ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
-msgstr ""
-"  -I, --icon=ICON                     ٹرمنل کی آئکن مرتب کریں بطور\n"
-"                                      نام یا فائل کا نام"
-
-#: ../terminal/main.c:90
-msgid ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-
-#: ../terminal/main.c:95
-msgid ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
-msgstr ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
-
-#: ../terminal/main.c:99
-msgid ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-
-#: ../terminal/main.c:104
-msgid ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#. parameter of --geometry
+#: ../terminal/main.c:83
+msgid "geometry"
 msgstr ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
 
-#: ../terminal/main.c:109
-msgid ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
+#. parameter of --role
+#: ../terminal/main.c:85
+msgid "role"
 msgstr ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
 
-#: ../terminal/main.c:114
-msgid ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
+#. parameter of --startup-id
+#: ../terminal/main.c:87
+#, fuzzy
+msgid "string"
+msgstr "انتباہ"
 
-#: ../terminal/main.c:119
-msgid ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#. parameter of --icon
+#: ../terminal/main.c:89
+#, fuzzy
+msgid "icon"
+msgstr "حرکت"
 
-#: ../terminal/main.c:124
-msgid ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#: ../terminal/main.c:91
+#, c-format
+msgid "See the %s man page for full explanation of the options above."
 msgstr ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
 
-#: ../terminal/main.c:151 ../terminal/terminal-preferences.c:1263
+#: ../terminal/main.c:118 ../terminal/terminal-preferences.c:1263
 #: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr "ٹرمنل"
 
-#: ../terminal/main.c:173
+#: ../terminal/main.c:135
 #, c-format
 msgid ""
 "%s (Xfce %s)\n"
@@ -315,31 +126,26 @@ msgstr ""
 "\n"
 "Please report bugs to <%s>.\n"
 
-#: ../terminal/main.c:267
+#: ../terminal/main.c:239
 #, c-format
 msgid "Unable to register terminal service: %s\n"
 msgstr "ٹرمنل سروس %s رجسٹر نہیں ہوپارہی\n"
 
-#: ../terminal/main.c:276
-#, c-format
-msgid "Unable to launch terminal: %s\n"
-msgstr "ٹرمنل چلانے میں ناکامی: %s\n"
-
-#: ../terminal/terminal-app.c:551
+#: ../terminal/terminal-app.c:554
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "غلط جیومینٹری سٹرنگ \"%s\"\n"
 
-#: ../terminal/terminal-dbus.c:114
+#: ../terminal/terminal-dbus.c:108
 msgid "User id mismatch"
 msgstr "صارف آئی ڈی میچ نہ کرسکا"
 
-#: ../terminal/terminal-dbus.c:146
+#: ../terminal/terminal-dbus.c:134
 #, c-format
 msgid "D-BUS message bus disconnected, exiting...\n"
 msgstr "D-BUS پیغام bus کا اتصال منقطع ہوگیا ہے، برخاستگی...\n"
 
-#: ../terminal/terminal-dbus.c:208
+#: ../terminal/terminal-dbus.c:196
 #, c-format
 msgid "Unable to register object %s"
 msgstr "آبجیکٹ %s رجسٹر نہیں ہوسکا"
@@ -367,7 +173,7 @@ msgstr ""
 msgid "Failed to open the documentation browser"
 msgstr "دستاویزات براؤزر کھولنے میں ناکامی"
 
-#: ../terminal/terminal-options.c:189
+#: ../terminal/terminal-options.c:206
 #, c-format
 msgid ""
 "Option \"--default-display\" requires specifying the default X display as "
@@ -376,7 +182,7 @@ msgstr ""
 "آپشن \"--default-display\" کو بطور اس کے پیرامیٹر کے طے شدہ ایکس کا تعین "
 "مطلوب ہے"
 
-#: ../terminal/terminal-options.c:204
+#: ../terminal/terminal-options.c:221
 #, c-format
 msgid ""
 "Option \"--default-working-directory\" requires specifying the default "
@@ -385,15 +191,7 @@ msgstr ""
 "آپشن \"--default-working-directory\" بطور اپنے پیرامیٹر کے طے شدہ کام کی "
 "ڈائریکٹری کا تعین مطلوب ہے"
 
-#: ../terminal/terminal-options.c:235
-#, c-format
-msgid ""
-"Option \"--sm-client-id\" requires specifying the session id as its parameter"
-msgstr ""
-"پیغام \"--sm-client-id\" کو نشست آئی ڈی کے تعین کی ضرورت ہے بطور اس کے "
-"پیرامیٹر کے"
-
-#: ../terminal/terminal-options.c:250
+#: ../terminal/terminal-options.c:237
 #, c-format
 msgid ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
@@ -401,7 +199,7 @@ msgid ""
 msgstr ""
 "آپشن \"--execute/-x\" کو کمانڈ لائن میں چلنے کے لیے کمانڈ کا تعین مطلوب ہے"
 
-#: ../terminal/terminal-options.c:267
+#: ../terminal/terminal-options.c:254
 #, c-format
 msgid ""
 "Option \"--command/-e\" requires specifying the command to run as its "
@@ -409,7 +207,7 @@ msgid ""
 msgstr ""
 "آپشن \"--command/-e\" کو اپنے پیرامیٹر میں چلنے کے لیے کمانڈ کا تعین درکار ہے"
 
-#: ../terminal/terminal-options.c:284
+#: ../terminal/terminal-options.c:271
 #, c-format
 msgid ""
 "Option \"--working-directory\" requires specifying the working directory as "
@@ -418,19 +216,19 @@ msgstr ""
 "آپشن \"--working-directory\" کو بطور اس کے پیرامیٹر کے چلنے کے لیے کام کی "
 "ڈائریکٹری کا تعین مطلوب ہے"
 
-#: ../terminal/terminal-options.c:299
+#: ../terminal/terminal-options.c:286
 #, c-format
 msgid "Option \"--title/-T\" requires specifying the title as its parameter"
 msgstr "آپشن \"--title/-T\" کو بطور اپنے پیرامیٹر عنوان کا تعین مطلوب ہے"
 
-#: ../terminal/terminal-options.c:319
+#: ../terminal/terminal-options.c:305
 #, c-format
 msgid ""
 "Option \"--display\" requires specifying the X display as its parameters"
 msgstr ""
 "آپشن \"--display\" کو بطور اپنے پیرامیٹر کے ایکس ڈسپلے کا تعین مطلوب ہے"
 
-#: ../terminal/terminal-options.c:334
+#: ../terminal/terminal-options.c:320
 #, c-format
 msgid ""
 "Option \"--geometry\" requires specifying the window geometry as its "
@@ -438,12 +236,12 @@ msgid ""
 msgstr ""
 "آپشن \"--geometry\" کو بطور اپنے پیرامیٹر کے ونڈو جیومیٹری کا تعین مطلوب ہے"
 
-#: ../terminal/terminal-options.c:349
+#: ../terminal/terminal-options.c:335
 #, c-format
 msgid "Option \"--role\" requires specifying the window role as its parameter"
 msgstr "آپشن \"--role\" کو بطور اس کے پيرامیٹر کے ونڈو رول کا تعین مطلوب ہے"
 
-#: ../terminal/terminal-options.c:364
+#: ../terminal/terminal-options.c:350
 #, c-format
 msgid ""
 "Option \"--startup-id\" requires specifying the startup id as its parameter"
@@ -451,7 +249,7 @@ msgstr ""
 "آپشن \"--startup-id\" کو بطور اس کے پیرامیٹر کے سٹارٹ اپ آئی ڈی کا تعین "
 "مطلوب ہے"
 
-#: ../terminal/terminal-options.c:379
+#: ../terminal/terminal-options.c:365
 #, c-format
 msgid ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
@@ -460,7 +258,7 @@ msgstr ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
 "parameter"
 
-#: ../terminal/terminal-options.c:435
+#: ../terminal/terminal-options.c:419
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "نا معلوم آپشن \"%s\""
@@ -529,7 +327,7 @@ msgstr "فل سکرین"
 msgid "Set Title"
 msgstr "عنوان مرتب کریں"
 
-#: ../terminal/terminal-preferences.c:464
+#: ../terminal/terminal-preferences.c:464 ../terminal/terminal-window.c:237
 msgid "Reset"
 msgstr "صاف"
 
@@ -823,6 +621,11 @@ msgstr "_صاف"
 msgid "Reset and C_lear"
 msgstr "صاف کریں"
 
+#: ../terminal/terminal-window.c:238
+#, fuzzy
+msgid "Reset and clear"
+msgstr "صاف کریں"
+
 #: ../terminal/terminal-window.c:239
 msgid "_Go"
 msgstr "_جائیں"
@@ -1448,6 +1251,279 @@ msgstr "جب کمانڈ چلائی جائے utmp/wtmp ریکارڈ اپڈیٹ ک
 msgid "seconds"
 msgstr "سیکنڈ"
 
+#~ msgid ""
+#~ "  -h, --help                          Print this help message and exit"
+#~ msgstr ""
+#~ "  -h, --help                          ہدایات کا پیغام طبع کر کے برخاست "
+#~ "کریں"
+
+#~ msgid ""
+#~ "  -V, --version                       Print version information and exit"
+#~ msgstr ""
+#~ "  -v, --version                       ورژن کی معلومات طبع کر کے برخاست "
+#~ "کریں"
+
+#~ msgid ""
+#~ "  --disable-server                    Do not register with the D-BUS\n"
+#~ "                                      session message bus"
+#~ msgstr ""
+#~ "  --disable-server                    Do not register with the D-BUS\n"
+#~ "                                      session message bus"
+
+#~ msgid "  --default-display=DISPLAY           default X display to use"
+#~ msgstr "  --default-display=DISPLAY           default X display to use"
+
+#~ msgid ""
+#~ "  --default-working-directory=DIRNAME Set the default terminal's working\n"
+#~ "                                      directory"
+#~ msgstr ""
+#~ "  --default-working-directory=DIRNAME Set the default terminal's working\n"
+#~ "                                      directory"
+
+#~ msgid ""
+#~ "  --tab                               Open a new tab in the last-"
+#~ "specified\n"
+#~ "                                      window; more than one of these\n"
+#~ "                                      options can be provided"
+#~ msgstr ""
+#~ "  --tab                               Open a new tab in the last-"
+#~ "specified\n"
+#~ "                                      window; more than one of these\n"
+#~ "                                      options can be provided"
+
+#~ msgid ""
+#~ "  --window                            Open a new window containing one "
+#~ "tab;\n"
+#~ "                                      more than one of these options can "
+#~ "be\n"
+#~ "                                      provided"
+#~ msgstr ""
+#~ "  --window                            Open a new window containing one "
+#~ "tab;\n"
+#~ "                                      more than one of these options can "
+#~ "be\n"
+#~ "                                      provided"
+
+#~ msgid ""
+#~ "  -x, --execute                       Execute the remainder of the "
+#~ "command\n"
+#~ "                                      line inside the terminal"
+#~ msgstr ""
+#~ "  -x, --execute                       Execute the remainder of the "
+#~ "command\n"
+#~ "                                      line inside the terminal"
+
+#~ msgid ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+#~ msgstr ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+
+#~ msgid ""
+#~ "  --working-directory=DIRNAME         Set the terminal's working directory"
+#~ msgstr ""
+#~ "  --working-directory=DIRNAME         Set the terminal's working directory"
+
+#~ msgid "  -T, --title=TITLE                   Set the terminal's title"
+#~ msgstr "  -T, --title=TITLE                   ٹرمنل کا عنوان مرتب کریں"
+
+#~ msgid ""
+#~ "  -H, --hold                          Do not immediately destroy the tab\n"
+#~ "                                      when the child command exits"
+#~ msgstr ""
+#~ "  -H, --hold                          Do not immediately destroy the tab\n"
+#~ "                                      when the child command exits"
+
+#~ msgid ""
+#~ "  --display=DISPLAY                   X display to use for the last-\n"
+#~ "                                      specified window"
+#~ msgstr ""
+#~ "  --display=DISPLAY                   X display to use for the last-\n"
+#~ "                                      specified window"
+
+#~ msgid ""
+#~ "  --geometry=GEOMETRY                 X geometry specification (see \"X"
+#~ "\"\n"
+#~ "                                      man page), can be specified once "
+#~ "per\n"
+#~ "                                      window to be opened"
+#~ msgstr ""
+#~ "  --geometry=GEOMETRY                 X geometry specification (see \"X"
+#~ "\"\n"
+#~ "                                      man page), can be specified once "
+#~ "per\n"
+#~ "                                      window to be opened"
+
+#~ msgid ""
+#~ "  --role=ROLE                         Set the role for the last-"
+#~ "specified\n"
+#~ "                                      window; applies to only one "
+#~ "window;\n"
+#~ "                                      can be specified once for each "
+#~ "window\n"
+#~ "                                      you create from the command line"
+#~ msgstr ""
+#~ "  --role=ROLE                         Set the role for the last-"
+#~ "specified\n"
+#~ "                                      window; applies to only one "
+#~ "window;\n"
+#~ "                                      can be specified once for each "
+#~ "window\n"
+#~ "                                      you create from the command line"
+
+#~ msgid ""
+#~ "  --startup-id=STRING                 ID for the startup notification\n"
+#~ "                                      protocol"
+#~ msgstr ""
+#~ "  --startup-id=STRING                 ID for the startup notification\n"
+#~ "                                      protocol"
+
+#~ msgid ""
+#~ "  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
+#~ "                                      name or filename"
+#~ msgstr ""
+#~ "  -I, --icon=ICON                     ٹرمنل کی آئکن مرتب کریں بطور\n"
+#~ "                                      نام یا فائل کا نام"
+
+#~ msgid ""
+#~ "  --fullscreen                        Set the last-specified window into\n"
+#~ "                                      fullscreen mode; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --fullscreen                        Set the last-specified window into\n"
+#~ "                                      fullscreen mode; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+
+#~ msgid ""
+#~ "  --maximize                          Maximize the last-specified "
+#~ "window;\n"
+#~ "                                      applies to only one window; can be\n"
+#~ "                                      specified once for each window you\n"
+#~ "                                      create from the command line"
+#~ msgstr ""
+#~ "  --maximize                          Maximize the last-specified "
+#~ "window;\n"
+#~ "                                      applies to only one window; can be\n"
+#~ "                                      specified once for each window you\n"
+#~ "                                      create from the command line"
+
+#~ msgid ""
+#~ "  --show-menubar                      Turn on the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-menubar                      Turn on the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+
+#~ msgid ""
+#~ "  --hide-menubar                      Turn off the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-menubar                      Turn off the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+
+#~ msgid ""
+#~ "  --show-borders                      Turn on the window decorations for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --show-borders                      Turn on the window decorations for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+
+#~ msgid ""
+#~ "  --hide-borders                      Turn off the window decorations "
+#~ "for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --hide-borders                      Turn off the window decorations "
+#~ "for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+
+#~ msgid ""
+#~ "  --show-toolbars                     Turn on the toolbars for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-toolbars                     Turn on the toolbars for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+
+#~ msgid ""
+#~ "  --hide-toolbars                     Turn off the toolbars for the "
+#~ "last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-toolbars                     Turn off the toolbars for the "
+#~ "last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+
+#~ msgid "Unable to launch terminal: %s\n"
+#~ msgstr "ٹرمنل چلانے میں ناکامی: %s\n"
+
+#~ msgid ""
+#~ "Option \"--sm-client-id\" requires specifying the session id as its "
+#~ "parameter"
+#~ msgstr ""
+#~ "پیغام \"--sm-client-id\" کو نشست آئی ڈی کے تعین کی ضرورت ہے بطور اس کے "
+#~ "پیرامیٹر کے"
+
 #~ msgid "<b>Title:</b>"
 #~ msgstr "<b>عنوان:</b>"
 
diff --git a/po/vi.po b/po/vi.po
index abe169b..2352704 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Terminal 0.2.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 11:48+0100\n"
+"POT-Creation-Date: 2009-12-14 16:03+0100\n"
 "PO-Revision-Date: 2006-04-26 22:39+0400\n"
 "Last-Translator: Phan Vĩnh Thịnh <teppi at vnlinux.org>\n"
 "Language-Team: Vietnamese <vi_VN at googlegroups.com>\n"
@@ -17,278 +17,91 @@ msgstr ""
 "X-Generator: KBabel 1.10\n"
 "Plural-Forms: nplurals=1; nplural=0\n"
 
-#: ../terminal/main.c:46
+#: ../terminal/main.c:48
 msgid "Usage:"
 msgstr ""
 
-#: ../terminal/main.c:47
+#: ../terminal/main.c:48
 msgid "OPTION"
 msgstr ""
 
-#: ../terminal/main.c:49
+#: ../terminal/main.c:53
 #, fuzzy
 msgid "General Options"
 msgstr "Chung"
 
-#: ../terminal/main.c:50
-msgid "  -h, --help                          Print this help message and exit"
-msgstr "  -h, --help                          In trợ giúp này và thoát"
-
-#: ../terminal/main.c:51
+#. parameter of --default-display
+#. parameter of --display
+#: ../terminal/main.c:55 ../terminal/main.c:81
 #, fuzzy
-msgid ""
-"  -V, --version                       Print version information and exit"
-msgstr "  -v, --version                       In thông tin phiên bản và thoát"
-
-#: ../terminal/main.c:52
-msgid ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
-msgstr ""
-"  --disable-server                    Không đăng ký với D-BUS\n"
-"                                      rãnh thông báo buổi làm việc"
-
-#: ../terminal/main.c:54
-msgid "  --default-display=DISPLAY           default X display to use"
-msgstr "  --default-display=DISPLAY           màn hình X dùng mặc định"
+msgid "display"
+msgstr "Không được hiển thị"
 
-#: ../terminal/main.c:55
-#, fuzzy
-msgid ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
+#. parameter of --default-working-directory
+#. parameter of --working-directory
+#: ../terminal/main.c:57 ../terminal/main.c:72
+msgid "directory"
 msgstr ""
-"  --default-working-directory=DIRNAME Đặt thư mục làm việc mặc định của\n"
-"                                      terminal"
 
-#: ../terminal/main.c:58
+#: ../terminal/main.c:61
 msgid "Window or Tab Separators"
 msgstr ""
 
-#: ../terminal/main.c:59
-msgid ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-msgstr ""
-"  --tab                               Mở một thẻ tab mới trong cửa sổ\n"
-"                                      chỉ ra cuối cùng; có thể đưa ra vài "
-"tùy\n"
-"                                      chọn dạng này"
-
-#: ../terminal/main.c:62
-msgid ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-msgstr ""
-"  --window                             Mở một cửa sổ mới chứa một thẻ tab;\n"
-"                                      có thể đưa ra vài tùy chọn dạng này"
-
 #: ../terminal/main.c:66
 #, fuzzy
 msgid "Tab Options"
 msgstr "Vị trí thẻ tab"
 
-#: ../terminal/main.c:67
-msgid ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-msgstr ""
-"  -x, --execute                       Thực hiện phần còn lại của dòng câu\n"
-"                                      lệnh trong terminal"
-
-#: ../terminal/main.c:69
-msgid ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-msgstr ""
-"  -e, --command=STRING                Thực hiện tham số tới tùy chọn\n"
-"                                      này trong terminal"
-
-#: ../terminal/main.c:71
+#. parameter of --command
+#: ../terminal/main.c:68
 #, fuzzy
-msgid ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
-msgstr ""
-"  --working-directory=DIRNAME         Đặt thư mục làm việc của terminal"
+msgid "command"
+msgstr "<b>Câu lệnh</b>"
 
-#: ../terminal/main.c:72
+#. parameter of --title
+#: ../terminal/main.c:70
 #, fuzzy
-msgid "  -T, --title=TITLE                   Set the terminal's title"
-msgstr "  -T, --title=TITLE                   Đặt tiêu đề terminal"
-
-#: ../terminal/main.c:73
-msgid ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-msgstr ""
-"  -H, --hold                          Không huỷ diệt ngay lập tức thẻ\n"
-"                                      tab khi câu lệnh con thoát"
+msgid "title"
+msgstr "Tiêu đề"
 
-#: ../terminal/main.c:76
+#: ../terminal/main.c:79
 #, fuzzy
 msgid "Window Options"
 msgstr "Tùy chọn không rõ \"%s\""
 
-#: ../terminal/main.c:77
-msgid ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
+#. parameter of --geometry
+#: ../terminal/main.c:83
+msgid "geometry"
 msgstr ""
-"  --display=DISPLAY                   Màn hình X dùng cho cửa\n"
-"                                      sổ chỉ ra cuối cùng"
 
-#: ../terminal/main.c:79
-msgid ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
+#. parameter of --role
+#: ../terminal/main.c:85
+msgid "role"
 msgstr ""
-"  --geometry=GEOMETRY                 Xác định kích thước của X (Hãy xem\n"
-"                                      trang man \"X\"), có thể chỉ ra một "
-"lần cho mỗi\n"
-"                                      cửa sổ mở ra"
 
-#: ../terminal/main.c:82
+#. parameter of --startup-id
+#: ../terminal/main.c:87
 #, fuzzy
-msgid ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
-msgstr ""
-"  --role=ROLE                         Đặt vai trò cho chỉ ra cuối cùng;\n"
-"                                      cửa sổ; chỉ áp dụng cho một cửa sổ;\n"
-"                                      có thể chỉ ra một lần cho mỗi cửa sổ\n"
-"                                      tạo ra từ dòng lệnh"
-
-#: ../terminal/main.c:86
-msgid ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
-msgstr "  --startup-id=STRING                 ID hiển thị khi khởi động"
-
-#: ../terminal/main.c:88
-#, fuzzy
-msgid ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
-msgstr ""
-"  -e, --command=STRING                Thực hiện tham số tới tùy chọn\n"
-"                                      này trong terminal"
-
-#: ../terminal/main.c:90
-#, fuzzy
-msgid ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --fullscreen                        Đặt cửa sổ chỉ ra cuối cùng vào\n"
-"                                      chế độ đầy màn hình; chỉ áp dụng tới\n"
-"                                      một cửa sổ; có thể chỉ ra một lần cho\n"
-"                                      mỗi cửa sổ tạo ra từ dòng lệnh."
+msgid "string"
+msgstr "Cảnh báo"
 
-#: ../terminal/main.c:95
+#. parameter of --icon
+#: ../terminal/main.c:89
 #, fuzzy
-msgid ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
-msgstr ""
-"  --role=ROLE                         Đặt vai trò cho chỉ ra cuối cùng;\n"
-"                                      cửa sổ; chỉ áp dụng cho một cửa sổ;\n"
-"                                      có thể chỉ ra một lần cho mỗi cửa sổ\n"
-"                                      tạo ra từ dòng lệnh"
-
-#: ../terminal/main.c:99
-msgid ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-menubar                      Bật thanh trình đơn cho cửa sổ\n"
-"                                      ra cuối cùng; chỉ áp dụng tới\n"
-"                                      một cửa sổ; có thể chỉ ra một lần cho\n"
-"                                      mỗi cửa sổ tạo ra từ dòng lệnh"
-
-#: ../terminal/main.c:104
-msgid ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --hide-menubar                      Tắt thanh trình đơn cho cửa sổ\n"
-"                                      chỉ ra cuối cùng; chỉ áp dụng tới\n"
-"                                      một cửa sổ; có thể chỉ ra một lần cho\n"
-"                                      mỗi cửa sổ tạo ra từ dòng lệnh"
-
-#: ../terminal/main.c:109
-msgid ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --show-borders                      Hiển thị trang trí cho cửa sổ\n"
-"                                      chỉ ra cuối cùng; chỉ áp dụng tới\n"
-"                                      một cửa sổ; có thể chỉ ra một lần cho\n"
-"                                      mỗi cửa sổ tạo ra từ dòng lệnh"
-
-#: ../terminal/main.c:114
-msgid ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --hide-borders                      Ẩn trang trí cho cửa sổ\n"
-"                                      chỉ ra cuối cùng; chỉ áp dụng tới\n"
-"                                      một cửa sổ; có thể chỉ ra một lần cho\n"
-"                                      mỗi cửa sổ tạo ra từ dòng lệnh"
-
-#: ../terminal/main.c:119
-msgid ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-toolbars                      Hiển thị thanh công cụ cho cửa sổ\n"
-"                                      chỉ ra cuối cùng; chỉ áp dụng tới\n"
-"                                      một cửa sổ; có thể chỉ ra một lần cho\n"
-"                                      mỗi cửa sổ tạo ra từ dòng lệnh"
+msgid "icon"
+msgstr "Hành động"
 
-#: ../terminal/main.c:124
-msgid ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#: ../terminal/main.c:91
+#, c-format
+msgid "See the %s man page for full explanation of the options above."
 msgstr ""
-"  --hide-toolbars                      Ẩn thanh công cụ cho cửa sổ\n"
-"                                      chỉ ra cuối cùng; chỉ áp dụng tới\n"
-"                                      một cửa sổ; có thể chỉ ra một lần cho\n"
-"                                      mỗi cửa sổ tạo ra từ dòng lệnh"
 
-#: ../terminal/main.c:151 ../terminal/terminal-preferences.c:1263
+#: ../terminal/main.c:118 ../terminal/terminal-preferences.c:1263
 #: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../terminal/main.c:173
+#: ../terminal/main.c:135
 #, fuzzy, c-format
 msgid ""
 "%s (Xfce %s)\n"
@@ -313,31 +126,26 @@ msgstr ""
 "\n"
 "Xin hãy báo cáo lỗi tới <%s>.\n"
 
-#: ../terminal/main.c:267
+#: ../terminal/main.c:239
 #, c-format
 msgid "Unable to register terminal service: %s\n"
 msgstr "Không đăng ký được dịch vụ terminal: %s\n"
 
-#: ../terminal/main.c:276
-#, c-format
-msgid "Unable to launch terminal: %s\n"
-msgstr "Không chạy được terminal: %s\n"
-
-#: ../terminal/terminal-app.c:551
+#: ../terminal/terminal-app.c:554
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "Chuỗi kích thước sai \"%s\"\n"
 
-#: ../terminal/terminal-dbus.c:114
+#: ../terminal/terminal-dbus.c:108
 msgid "User id mismatch"
 msgstr "ID người dùng không tương ứng"
 
-#: ../terminal/terminal-dbus.c:146
+#: ../terminal/terminal-dbus.c:134
 #, c-format
 msgid "D-BUS message bus disconnected, exiting...\n"
 msgstr "Đã ngắt bỏ kết nối kênh thông báo D-BUS, đang thoát...\n"
 
-#: ../terminal/terminal-dbus.c:208
+#: ../terminal/terminal-dbus.c:196
 #, c-format
 msgid "Unable to register object %s"
 msgstr "Không đăng ký được vật thể %s"
@@ -359,14 +167,14 @@ msgstr ""
 msgid "Failed to open the documentation browser"
 msgstr ""
 
-#: ../terminal/terminal-options.c:189
+#: ../terminal/terminal-options.c:206
 #, c-format
 msgid ""
 "Option \"--default-display\" requires specifying the default X display as "
 "its parameter"
 msgstr "Tùy chọn \"--default-display\" cần tham số là màn hình X mặc định"
 
-#: ../terminal/terminal-options.c:204
+#: ../terminal/terminal-options.c:221
 #, c-format
 msgid ""
 "Option \"--default-working-directory\" requires specifying the default "
@@ -375,70 +183,64 @@ msgstr ""
 "Tùy chọn \"--default-working-directory\" cần tham số là thư mục làm việc mặc "
 "định"
 
-#: ../terminal/terminal-options.c:235
-#, c-format
-msgid ""
-"Option \"--sm-client-id\" requires specifying the session id as its parameter"
-msgstr "Tùy chọn \"--sm-client-id\" cần tham số là id của buổi làm việc"
-
-#: ../terminal/terminal-options.c:250
+#: ../terminal/terminal-options.c:237
 #, c-format
 msgid ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
 "of the command line"
 msgstr "Tùy chọn \"--execute/-x\" cần một câu lệnh chạy trên dòng lệnh"
 
-#: ../terminal/terminal-options.c:267
+#: ../terminal/terminal-options.c:254
 #, c-format
 msgid ""
 "Option \"--command/-e\" requires specifying the command to run as its "
 "parameter"
 msgstr "Tùy chọn \"--command/-e\" cần tham số là câu lệnh để chạy"
 
-#: ../terminal/terminal-options.c:284
+#: ../terminal/terminal-options.c:271
 #, c-format
 msgid ""
 "Option \"--working-directory\" requires specifying the working directory as "
 "its parameter"
 msgstr "Tùy chọn \"--working-directory\" cần tham số là thư mục làm việc"
 
-#: ../terminal/terminal-options.c:299
+#: ../terminal/terminal-options.c:286
 #, c-format
 msgid "Option \"--title/-T\" requires specifying the title as its parameter"
 msgstr "Tùy chọn \"--title/-T\" cần tham số là tiêu đề"
 
-#: ../terminal/terminal-options.c:319
+#: ../terminal/terminal-options.c:305
 #, c-format
 msgid ""
 "Option \"--display\" requires specifying the X display as its parameters"
 msgstr "Tùy chọn \"--display\" cần tham số là màn hình X"
 
-#: ../terminal/terminal-options.c:334
+#: ../terminal/terminal-options.c:320
 #, c-format
 msgid ""
 "Option \"--geometry\" requires specifying the window geometry as its "
 "parameter"
 msgstr "Tùy chọn \"--geometry\" cần tham số là kích thước của cửa sổ"
 
-#: ../terminal/terminal-options.c:349
+#: ../terminal/terminal-options.c:335
 #, c-format
 msgid "Option \"--role\" requires specifying the window role as its parameter"
 msgstr "Tùy chọn \"--role\" cần tham số là vai trò của cửa sổ"
 
-#: ../terminal/terminal-options.c:364
+#: ../terminal/terminal-options.c:350
 #, c-format
 msgid ""
 "Option \"--startup-id\" requires specifying the startup id as its parameter"
 msgstr "Tùy chọn \"--startup-id\" cần tham số là id chạy lúc đầu"
 
-#: ../terminal/terminal-options.c:379
+#: ../terminal/terminal-options.c:365
 #, fuzzy, c-format
 msgid ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
 "parameter"
 msgstr "Tùy chọn \"--command/-e\" cần tham số là câu lệnh để chạy"
 
-#: ../terminal/terminal-options.c:435
+#: ../terminal/terminal-options.c:419
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Tùy chọn không rõ \"%s\""
@@ -508,7 +310,7 @@ msgstr "Đầy màn hình"
 msgid "Set Title"
 msgstr "Đặt tiêu đề"
 
-#: ../terminal/terminal-preferences.c:464
+#: ../terminal/terminal-preferences.c:464 ../terminal/terminal-window.c:237
 msgid "Reset"
 msgstr "Đặt lại"
 
@@ -805,6 +607,11 @@ msgstr "Đặ_t lại"
 msgid "Reset and C_lear"
 msgstr "Đặt lại và _Xóa"
 
+#: ../terminal/terminal-window.c:238
+#, fuzzy
+msgid "Reset and clear"
+msgstr "Đặt lại và Xóa"
+
 #: ../terminal/terminal-window.c:239
 msgid "_Go"
 msgstr "Đ_i tới"
@@ -1474,6 +1281,266 @@ msgstr "_Cập nhật các bản ghi utmp/wtmp khi chạy câu lệnh"
 msgid "seconds"
 msgstr ""
 
+#~ msgid ""
+#~ "  -h, --help                          Print this help message and exit"
+#~ msgstr "  -h, --help                          In trợ giúp này và thoát"
+
+#, fuzzy
+#~ msgid ""
+#~ "  -V, --version                       Print version information and exit"
+#~ msgstr ""
+#~ "  -v, --version                       In thông tin phiên bản và thoát"
+
+#~ msgid ""
+#~ "  --disable-server                    Do not register with the D-BUS\n"
+#~ "                                      session message bus"
+#~ msgstr ""
+#~ "  --disable-server                    Không đăng ký với D-BUS\n"
+#~ "                                      rãnh thông báo buổi làm việc"
+
+#~ msgid "  --default-display=DISPLAY           default X display to use"
+#~ msgstr "  --default-display=DISPLAY           màn hình X dùng mặc định"
+
+#, fuzzy
+#~ msgid ""
+#~ "  --default-working-directory=DIRNAME Set the default terminal's working\n"
+#~ "                                      directory"
+#~ msgstr ""
+#~ "  --default-working-directory=DIRNAME Đặt thư mục làm việc mặc định của\n"
+#~ "                                      terminal"
+
+#~ msgid ""
+#~ "  --tab                               Open a new tab in the last-"
+#~ "specified\n"
+#~ "                                      window; more than one of these\n"
+#~ "                                      options can be provided"
+#~ msgstr ""
+#~ "  --tab                               Mở một thẻ tab mới trong cửa sổ\n"
+#~ "                                      chỉ ra cuối cùng; có thể đưa ra vài "
+#~ "tùy\n"
+#~ "                                      chọn dạng này"
+
+#~ msgid ""
+#~ "  --window                            Open a new window containing one "
+#~ "tab;\n"
+#~ "                                      more than one of these options can "
+#~ "be\n"
+#~ "                                      provided"
+#~ msgstr ""
+#~ "  --window                             Mở một cửa sổ mới chứa một thẻ "
+#~ "tab;\n"
+#~ "                                      có thể đưa ra vài tùy chọn dạng này"
+
+#~ msgid ""
+#~ "  -x, --execute                       Execute the remainder of the "
+#~ "command\n"
+#~ "                                      line inside the terminal"
+#~ msgstr ""
+#~ "  -x, --execute                       Thực hiện phần còn lại của dòng "
+#~ "câu\n"
+#~ "                                      lệnh trong terminal"
+
+#~ msgid ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+#~ msgstr ""
+#~ "  -e, --command=STRING                Thực hiện tham số tới tùy chọn\n"
+#~ "                                      này trong terminal"
+
+#, fuzzy
+#~ msgid ""
+#~ "  --working-directory=DIRNAME         Set the terminal's working directory"
+#~ msgstr ""
+#~ "  --working-directory=DIRNAME         Đặt thư mục làm việc của terminal"
+
+#, fuzzy
+#~ msgid "  -T, --title=TITLE                   Set the terminal's title"
+#~ msgstr "  -T, --title=TITLE                   Đặt tiêu đề terminal"
+
+#~ msgid ""
+#~ "  -H, --hold                          Do not immediately destroy the tab\n"
+#~ "                                      when the child command exits"
+#~ msgstr ""
+#~ "  -H, --hold                          Không huỷ diệt ngay lập tức thẻ\n"
+#~ "                                      tab khi câu lệnh con thoát"
+
+#~ msgid ""
+#~ "  --display=DISPLAY                   X display to use for the last-\n"
+#~ "                                      specified window"
+#~ msgstr ""
+#~ "  --display=DISPLAY                   Màn hình X dùng cho cửa\n"
+#~ "                                      sổ chỉ ra cuối cùng"
+
+#~ msgid ""
+#~ "  --geometry=GEOMETRY                 X geometry specification (see \"X"
+#~ "\"\n"
+#~ "                                      man page), can be specified once "
+#~ "per\n"
+#~ "                                      window to be opened"
+#~ msgstr ""
+#~ "  --geometry=GEOMETRY                 Xác định kích thước của X (Hãy xem\n"
+#~ "                                      trang man \"X\"), có thể chỉ ra một "
+#~ "lần cho mỗi\n"
+#~ "                                      cửa sổ mở ra"
+
+#, fuzzy
+#~ msgid ""
+#~ "  --role=ROLE                         Set the role for the last-"
+#~ "specified\n"
+#~ "                                      window; applies to only one "
+#~ "window;\n"
+#~ "                                      can be specified once for each "
+#~ "window\n"
+#~ "                                      you create from the command line"
+#~ msgstr ""
+#~ "  --role=ROLE                         Đặt vai trò cho chỉ ra cuối cùng;\n"
+#~ "                                      cửa sổ; chỉ áp dụng cho một cửa "
+#~ "sổ;\n"
+#~ "                                      có thể chỉ ra một lần cho mỗi cửa "
+#~ "sổ\n"
+#~ "                                      tạo ra từ dòng lệnh"
+
+#~ msgid ""
+#~ "  --startup-id=STRING                 ID for the startup notification\n"
+#~ "                                      protocol"
+#~ msgstr "  --startup-id=STRING                 ID hiển thị khi khởi động"
+
+#, fuzzy
+#~ msgid ""
+#~ "  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
+#~ "                                      name or filename"
+#~ msgstr ""
+#~ "  -e, --command=STRING                Thực hiện tham số tới tùy chọn\n"
+#~ "                                      này trong terminal"
+
+#, fuzzy
+#~ msgid ""
+#~ "  --fullscreen                        Set the last-specified window into\n"
+#~ "                                      fullscreen mode; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --fullscreen                        Đặt cửa sổ chỉ ra cuối cùng vào\n"
+#~ "                                      chế độ đầy màn hình; chỉ áp dụng "
+#~ "tới\n"
+#~ "                                      một cửa sổ; có thể chỉ ra một lần "
+#~ "cho\n"
+#~ "                                      mỗi cửa sổ tạo ra từ dòng lệnh."
+
+#, fuzzy
+#~ msgid ""
+#~ "  --maximize                          Maximize the last-specified "
+#~ "window;\n"
+#~ "                                      applies to only one window; can be\n"
+#~ "                                      specified once for each window you\n"
+#~ "                                      create from the command line"
+#~ msgstr ""
+#~ "  --role=ROLE                         Đặt vai trò cho chỉ ra cuối cùng;\n"
+#~ "                                      cửa sổ; chỉ áp dụng cho một cửa "
+#~ "sổ;\n"
+#~ "                                      có thể chỉ ra một lần cho mỗi cửa "
+#~ "sổ\n"
+#~ "                                      tạo ra từ dòng lệnh"
+
+#~ msgid ""
+#~ "  --show-menubar                      Turn on the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-menubar                      Bật thanh trình đơn cho cửa sổ\n"
+#~ "                                      ra cuối cùng; chỉ áp dụng tới\n"
+#~ "                                      một cửa sổ; có thể chỉ ra một lần "
+#~ "cho\n"
+#~ "                                      mỗi cửa sổ tạo ra từ dòng lệnh"
+
+#~ msgid ""
+#~ "  --hide-menubar                      Turn off the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-menubar                      Tắt thanh trình đơn cho cửa sổ\n"
+#~ "                                      chỉ ra cuối cùng; chỉ áp dụng tới\n"
+#~ "                                      một cửa sổ; có thể chỉ ra một lần "
+#~ "cho\n"
+#~ "                                      mỗi cửa sổ tạo ra từ dòng lệnh"
+
+#~ msgid ""
+#~ "  --show-borders                      Turn on the window decorations for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --show-borders                      Hiển thị trang trí cho cửa sổ\n"
+#~ "                                      chỉ ra cuối cùng; chỉ áp dụng tới\n"
+#~ "                                      một cửa sổ; có thể chỉ ra một lần "
+#~ "cho\n"
+#~ "                                      mỗi cửa sổ tạo ra từ dòng lệnh"
+
+#~ msgid ""
+#~ "  --hide-borders                      Turn off the window decorations "
+#~ "for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --hide-borders                      Ẩn trang trí cho cửa sổ\n"
+#~ "                                      chỉ ra cuối cùng; chỉ áp dụng tới\n"
+#~ "                                      một cửa sổ; có thể chỉ ra một lần "
+#~ "cho\n"
+#~ "                                      mỗi cửa sổ tạo ra từ dòng lệnh"
+
+#~ msgid ""
+#~ "  --show-toolbars                     Turn on the toolbars for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-toolbars                      Hiển thị thanh công cụ cho cửa sổ\n"
+#~ "                                      chỉ ra cuối cùng; chỉ áp dụng tới\n"
+#~ "                                      một cửa sổ; có thể chỉ ra một lần "
+#~ "cho\n"
+#~ "                                      mỗi cửa sổ tạo ra từ dòng lệnh"
+
+#~ msgid ""
+#~ "  --hide-toolbars                     Turn off the toolbars for the "
+#~ "last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-toolbars                      Ẩn thanh công cụ cho cửa sổ\n"
+#~ "                                      chỉ ra cuối cùng; chỉ áp dụng tới\n"
+#~ "                                      một cửa sổ; có thể chỉ ra một lần "
+#~ "cho\n"
+#~ "                                      mỗi cửa sổ tạo ra từ dòng lệnh"
+
+#~ msgid "Unable to launch terminal: %s\n"
+#~ msgstr "Không chạy được terminal: %s\n"
+
+#~ msgid ""
+#~ "Option \"--sm-client-id\" requires specifying the session id as its "
+#~ "parameter"
+#~ msgstr "Tùy chọn \"--sm-client-id\" cần tham số là id của buổi làm việc"
+
 #~ msgid "<b>Title:</b>"
 #~ msgstr "<b>Tiêu đề:</b>"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index d95f661..22bef3d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Terminal 0.2.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 11:48+0100\n"
+"POT-Creation-Date: 2009-12-14 16:03+0100\n"
 "PO-Revision-Date: 2009-10-21 13:48+0800\n"
 "Last-Translator: Hunt Xu <huntxu at live.cn>\n"
 "Language-Team: Chinese <xfce-i18n at xfce.org>\n"
@@ -18,237 +18,88 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../terminal/main.c:46
+#: ../terminal/main.c:48
 msgid "Usage:"
 msgstr "用法:"
 
-#: ../terminal/main.c:47
+#: ../terminal/main.c:48
 msgid "OPTION"
 msgstr "选项"
 
-#: ../terminal/main.c:49
+#: ../terminal/main.c:53
 msgid "General Options"
 msgstr "常规选项"
 
-#: ../terminal/main.c:50
-msgid "  -h, --help                          Print this help message and exit"
-msgstr "  -h, --help                          打印此帮助信息并退出"
-
-#: ../terminal/main.c:51
-msgid ""
-"  -V, --version                       Print version information and exit"
-msgstr "  -V, --version                       打印版本信息并退出"
-
-#: ../terminal/main.c:52
-msgid ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
-msgstr "  --disable-server                    不向 D-BUS 会话消息总线注册"
-
-#: ../terminal/main.c:54
-msgid "  --default-display=DISPLAY           default X display to use"
-msgstr "  --default-display=DISPLAY           默认使用的 X 显示"
+#. parameter of --default-display
+#. parameter of --display
+#: ../terminal/main.c:55 ../terminal/main.c:81
+#, fuzzy
+msgid "display"
+msgstr "不显示"
 
-#: ../terminal/main.c:55
-msgid ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
-msgstr "  --default-working-directory=DIRNAME 设置终端的默认工作目录"
+#. parameter of --default-working-directory
+#. parameter of --working-directory
+#: ../terminal/main.c:57 ../terminal/main.c:72
+msgid "directory"
+msgstr ""
 
-#: ../terminal/main.c:58
+#: ../terminal/main.c:61
 msgid "Window or Tab Separators"
 msgstr "窗口或标签分隔符"
 
-#: ../terminal/main.c:59
-msgid ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-msgstr ""
-"  --tab                               打开一个新标签;此选项可以多次使用"
-
-#: ../terminal/main.c:62
-msgid ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-msgstr ""
-"  --window                            打开一个新窗口,此选项可以多次使用"
-
 #: ../terminal/main.c:66
 msgid "Tab Options"
 msgstr "标签选项"
 
-#: ../terminal/main.c:67
-msgid ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-msgstr "  -x, --execute                       在终端中运行此参数后面的剩余部分"
-
-#: ../terminal/main.c:69
-msgid ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-msgstr "  -e, --command=STRING                在终端中运行此参数指定的命令"
-
-#: ../terminal/main.c:71
-msgid ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
-msgstr "  --working-directory=DIRNAME         设置终端工作目录"
-
-#: ../terminal/main.c:72
-msgid "  -T, --title=TITLE                   Set the terminal's title"
-msgstr "  -T, --title=TITLE                   设置终端标题"
+#. parameter of --command
+#: ../terminal/main.c:68
+#, fuzzy
+msgid "command"
+msgstr "命令"
 
-#: ../terminal/main.c:73
-msgid ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-msgstr "  -H, --hold                          当子命令退出时并不立即关闭标签"
+#. parameter of --title
+#: ../terminal/main.c:70
+#, fuzzy
+msgid "title"
+msgstr "标题"
 
-#: ../terminal/main.c:76
+#: ../terminal/main.c:79
 msgid "Window Options"
 msgstr "窗口选项"
 
-#: ../terminal/main.c:77
-msgid ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
-msgstr "  --display=DISPLAY                   选择使用的 X 显示"
-
-#: ../terminal/main.c:79
-msgid ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
-msgstr ""
-"  --geometry=GEOMETRY                 设置 X 几何属性 (参考 \"X\" 手册),\n"
-"                                      可对每个要打开的窗口进行设置"
-
-#: ../terminal/main.c:82
-msgid ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
-msgstr ""
-"  --role=ROLE                         为最后指定的终端窗口设置角色,仅对\n"
-"                                      一个窗口生效;可对每个从命令行打开\n"
-"                                      的窗口进行设置"
-
-#: ../terminal/main.c:86
-msgid ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
-msgstr "  --startup-id=STRING                 启动通知协议的 ID"
-
-#: ../terminal/main.c:88
-msgid ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
-msgstr "  -I, --icon=ICON                     设置终端图标"
-
-#: ../terminal/main.c:90
-msgid ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --fullscreen                        设置最后指定的终端窗口为全屏模式,\n"
-"                                      仅对一个窗口生效;可对每个从命令行\n"
-"                                      打开的窗口进行设置"
-
-#: ../terminal/main.c:95
-msgid ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
-msgstr ""
-"  --maximize                          使最后指定的终端窗口最大化,仅对\n"
-"                                      一个窗口生效;可对每个从命令行打开\n"
-"                                      的窗口进行设置"
-
-#: ../terminal/main.c:99
-msgid ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-menubar                      显示最后指定的终端窗口的菜单栏,仅对\n"
-"                                      一个窗口生效;可对每个从命令行打开的\n"
-"                                      窗口进行设置"
-
-#: ../terminal/main.c:104
-msgid ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#. parameter of --geometry
+#: ../terminal/main.c:83
+msgid "geometry"
 msgstr ""
-"  --hide-menubar                      隐藏最后指定的终端窗口的菜单栏,仅对\n"
-"                                      一个窗口生效;可对每个从命令行打开的\n"
-"                                      窗口进行设置"
 
-#: ../terminal/main.c:109
-msgid ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
+#. parameter of --role
+#: ../terminal/main.c:85
+msgid "role"
 msgstr ""
-"  --show-borders                      显示最后指定的终端窗口的边框,仅对\n"
-"                                      一个窗口生效;可对每个从命令行打开\n"
-"                                      的窗口进行设置"
 
-#: ../terminal/main.c:114
-msgid ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-"  --hide-borders                      隐藏最后指定的终端窗口的边框,仅对\n"
-"                                      一个窗口生效;可对每个从命令行打开\n"
-"                                      的窗口进行设置"
+#. parameter of --startup-id
+#: ../terminal/main.c:87
+#, fuzzy
+msgid "string"
+msgstr "警告"
 
-#: ../terminal/main.c:119
-msgid ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-"  --show-toolbars                     显示最后指定的终端窗口的工具栏,仅对\n"
-"                                      一个窗口生效;可对每个从命令行打开的\n"
-"                                      窗口进行设置"
+#. parameter of --icon
+#: ../terminal/main.c:89
+#, fuzzy
+msgid "icon"
+msgstr "行为"
 
-#: ../terminal/main.c:124
-msgid ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#: ../terminal/main.c:91
+#, c-format
+msgid "See the %s man page for full explanation of the options above."
 msgstr ""
-"  --hide-toolbars                     隐藏最后指定的终端窗口的工具栏,仅对\n"
-"                                      一个窗口生效;可对每个从命令行打开的\n"
-"                                      窗口进行设置"
 
-#: ../terminal/main.c:151 ../terminal/terminal-preferences.c:1263
+#: ../terminal/main.c:118 ../terminal/terminal-preferences.c:1263
 #: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr "Xfce 终端"
 
-#: ../terminal/main.c:173
+#: ../terminal/main.c:135
 #, c-format
 msgid ""
 "%s (Xfce %s)\n"
@@ -273,31 +124,26 @@ msgstr ""
 "\n"
 "请提交错误报告至 <%s>。\n"
 
-#: ../terminal/main.c:267
+#: ../terminal/main.c:239
 #, c-format
 msgid "Unable to register terminal service: %s\n"
 msgstr "无法注册终端服务: %s\n"
 
-#: ../terminal/main.c:276
-#, c-format
-msgid "Unable to launch terminal: %s\n"
-msgstr "无法启动终端: %s\n"
-
-#: ../terminal/terminal-app.c:551
+#: ../terminal/terminal-app.c:554
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "无效的几何属性字符串 \"%s\"\n"
 
-#: ../terminal/terminal-dbus.c:114
+#: ../terminal/terminal-dbus.c:108
 msgid "User id mismatch"
 msgstr "用户 ID 不匹配"
 
-#: ../terminal/terminal-dbus.c:146
+#: ../terminal/terminal-dbus.c:134
 #, c-format
 msgid "D-BUS message bus disconnected, exiting...\n"
 msgstr "与 D-BUS 消息服务器的连接已断开,正在退出...\n"
 
-#: ../terminal/terminal-dbus.c:208
+#: ../terminal/terminal-dbus.c:196
 #, c-format
 msgid "Unable to register object %s"
 msgstr "无法注册对象 %s"
@@ -324,84 +170,78 @@ msgstr "浏览 Terminal 网站"
 msgid "Failed to open the documentation browser"
 msgstr "打开文档浏览器失败"
 
-#: ../terminal/terminal-options.c:189
+#: ../terminal/terminal-options.c:206
 #, c-format
 msgid ""
 "Option \"--default-display\" requires specifying the default X display as "
 "its parameter"
 msgstr "选项 \"--default-display\" 需要指定默认使用的 X 显示作为其参数"
 
-#: ../terminal/terminal-options.c:204
+#: ../terminal/terminal-options.c:221
 #, c-format
 msgid ""
 "Option \"--default-working-directory\" requires specifying the default "
 "working directory as its parameter"
 msgstr "选项 \"--default-working-directory\" 需要指定默认的工作目录作为其参数"
 
-#: ../terminal/terminal-options.c:235
-#, c-format
-msgid ""
-"Option \"--sm-client-id\" requires specifying the session id as its parameter"
-msgstr "选项 \"--sm-client-id\" 需要指定 session id 作为其参数"
-
-#: ../terminal/terminal-options.c:250
+#: ../terminal/terminal-options.c:237
 #, c-format
 msgid ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
 "of the command line"
 msgstr "选项 \"--execute/-x\" 需要在后面指定所要运行的命令"
 
-#: ../terminal/terminal-options.c:267
+#: ../terminal/terminal-options.c:254
 #, c-format
 msgid ""
 "Option \"--command/-e\" requires specifying the command to run as its "
 "parameter"
 msgstr "选项 \"--command/-e\" 需要指定所要运行的命令作为其参数"
 
-#: ../terminal/terminal-options.c:284
+#: ../terminal/terminal-options.c:271
 #, c-format
 msgid ""
 "Option \"--working-directory\" requires specifying the working directory as "
 "its parameter"
 msgstr "选项 \"--working-directory\" 需要指定工作目录作为其参数"
 
-#: ../terminal/terminal-options.c:299
+#: ../terminal/terminal-options.c:286
 #, c-format
 msgid "Option \"--title/-T\" requires specifying the title as its parameter"
 msgstr "选项 \"--title/-T\" 需要指定标题作为其参数"
 
-#: ../terminal/terminal-options.c:319
+#: ../terminal/terminal-options.c:305
 #, c-format
 msgid ""
 "Option \"--display\" requires specifying the X display as its parameters"
 msgstr "选项 \"--display\" 需要指定 X 显示作为其参数"
 
-#: ../terminal/terminal-options.c:334
+#: ../terminal/terminal-options.c:320
 #, c-format
 msgid ""
 "Option \"--geometry\" requires specifying the window geometry as its "
 "parameter"
 msgstr "选项 \"--geometry\" 需要指定窗口大小及位置作为其参数"
 
-#: ../terminal/terminal-options.c:349
+#: ../terminal/terminal-options.c:335
 #, c-format
 msgid "Option \"--role\" requires specifying the window role as its parameter"
 msgstr "选项 \"--role\" 需要指定窗口识别码作为其参数"
 
-#: ../terminal/terminal-options.c:364
+#: ../terminal/terminal-options.c:350
 #, c-format
 msgid ""
 "Option \"--startup-id\" requires specifying the startup id as its parameter"
 msgstr "选项 \"--startup-id\" 需要指定启动 id 作为其参数"
 
-#: ../terminal/terminal-options.c:379
+#: ../terminal/terminal-options.c:365
 #, c-format
 msgid ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
 "parameter"
 msgstr "选项 \"--icon/-I\" 需要指定图标名称或文件名作为其参数"
 
-#: ../terminal/terminal-options.c:435
+#: ../terminal/terminal-options.c:419
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "未知选项 \"%s\""
@@ -470,7 +310,7 @@ msgstr "全屏"
 msgid "Set Title"
 msgstr "设置标题"
 
-#: ../terminal/terminal-preferences.c:464
+#: ../terminal/terminal-preferences.c:464 ../terminal/terminal-window.c:237
 msgid "Reset"
 msgstr "重置"
 
@@ -761,6 +601,11 @@ msgstr "重置(_R)"
 msgid "Reset and C_lear"
 msgstr "重置并清除(_L)"
 
+#: ../terminal/terminal-window.c:238
+#, fuzzy
+msgid "Reset and clear"
+msgstr "重置并清除"
+
 #: ../terminal/terminal-window.c:239
 msgid "_Go"
 msgstr "转到(_G)"
@@ -1366,6 +1211,224 @@ msgstr "当命令执行后更新 utmp/wtmp 记录(_U)"
 msgid "seconds"
 msgstr "秒"
 
+#~ msgid ""
+#~ "  -h, --help                          Print this help message and exit"
+#~ msgstr "  -h, --help                          打印此帮助信息并退出"
+
+#~ msgid ""
+#~ "  -V, --version                       Print version information and exit"
+#~ msgstr "  -V, --version                       打印版本信息并退出"
+
+#~ msgid ""
+#~ "  --disable-server                    Do not register with the D-BUS\n"
+#~ "                                      session message bus"
+#~ msgstr "  --disable-server                    不向 D-BUS 会话消息总线注册"
+
+#~ msgid "  --default-display=DISPLAY           default X display to use"
+#~ msgstr "  --default-display=DISPLAY           默认使用的 X 显示"
+
+#~ msgid ""
+#~ "  --default-working-directory=DIRNAME Set the default terminal's working\n"
+#~ "                                      directory"
+#~ msgstr "  --default-working-directory=DIRNAME 设置终端的默认工作目录"
+
+#~ msgid ""
+#~ "  --tab                               Open a new tab in the last-"
+#~ "specified\n"
+#~ "                                      window; more than one of these\n"
+#~ "                                      options can be provided"
+#~ msgstr ""
+#~ "  --tab                               打开一个新标签;此选项可以多次使用"
+
+#~ msgid ""
+#~ "  --window                            Open a new window containing one "
+#~ "tab;\n"
+#~ "                                      more than one of these options can "
+#~ "be\n"
+#~ "                                      provided"
+#~ msgstr ""
+#~ "  --window                            打开一个新窗口,此选项可以多次使用"
+
+#~ msgid ""
+#~ "  -x, --execute                       Execute the remainder of the "
+#~ "command\n"
+#~ "                                      line inside the terminal"
+#~ msgstr ""
+#~ "  -x, --execute                       在终端中运行此参数后面的剩余部分"
+
+#~ msgid ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+#~ msgstr "  -e, --command=STRING                在终端中运行此参数指定的命令"
+
+#~ msgid ""
+#~ "  --working-directory=DIRNAME         Set the terminal's working directory"
+#~ msgstr "  --working-directory=DIRNAME         设置终端工作目录"
+
+#~ msgid "  -T, --title=TITLE                   Set the terminal's title"
+#~ msgstr "  -T, --title=TITLE                   设置终端标题"
+
+#~ msgid ""
+#~ "  -H, --hold                          Do not immediately destroy the tab\n"
+#~ "                                      when the child command exits"
+#~ msgstr ""
+#~ "  -H, --hold                          当子命令退出时并不立即关闭标签"
+
+#~ msgid ""
+#~ "  --display=DISPLAY                   X display to use for the last-\n"
+#~ "                                      specified window"
+#~ msgstr "  --display=DISPLAY                   选择使用的 X 显示"
+
+#~ msgid ""
+#~ "  --geometry=GEOMETRY                 X geometry specification (see \"X"
+#~ "\"\n"
+#~ "                                      man page), can be specified once "
+#~ "per\n"
+#~ "                                      window to be opened"
+#~ msgstr ""
+#~ "  --geometry=GEOMETRY                 设置 X 几何属性 (参考 \"X\" 手"
+#~ "册),\n"
+#~ "                                      可对每个要打开的窗口进行设置"
+
+#~ msgid ""
+#~ "  --role=ROLE                         Set the role for the last-"
+#~ "specified\n"
+#~ "                                      window; applies to only one "
+#~ "window;\n"
+#~ "                                      can be specified once for each "
+#~ "window\n"
+#~ "                                      you create from the command line"
+#~ msgstr ""
+#~ "  --role=ROLE                         为最后指定的终端窗口设置角色,仅对\n"
+#~ "                                      一个窗口生效;可对每个从命令行打开\n"
+#~ "                                      的窗口进行设置"
+
+#~ msgid ""
+#~ "  --startup-id=STRING                 ID for the startup notification\n"
+#~ "                                      protocol"
+#~ msgstr "  --startup-id=STRING                 启动通知协议的 ID"
+
+#~ msgid ""
+#~ "  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
+#~ "                                      name or filename"
+#~ msgstr "  -I, --icon=ICON                     设置终端图标"
+
+#~ msgid ""
+#~ "  --fullscreen                        Set the last-specified window into\n"
+#~ "                                      fullscreen mode; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --fullscreen                        设置最后指定的终端窗口为全屏模式,\n"
+#~ "                                      仅对一个窗口生效;可对每个从命令行\n"
+#~ "                                      打开的窗口进行设置"
+
+#~ msgid ""
+#~ "  --maximize                          Maximize the last-specified "
+#~ "window;\n"
+#~ "                                      applies to only one window; can be\n"
+#~ "                                      specified once for each window you\n"
+#~ "                                      create from the command line"
+#~ msgstr ""
+#~ "  --maximize                          使最后指定的终端窗口最大化,仅对\n"
+#~ "                                      一个窗口生效;可对每个从命令行打开\n"
+#~ "                                      的窗口进行设置"
+
+#~ msgid ""
+#~ "  --show-menubar                      Turn on the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-menubar                      显示最后指定的终端窗口的菜单栏,仅"
+#~ "对\n"
+#~ "                                      一个窗口生效;可对每个从命令行打开"
+#~ "的\n"
+#~ "                                      窗口进行设置"
+
+#~ msgid ""
+#~ "  --hide-menubar                      Turn off the menubar for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-menubar                      隐藏最后指定的终端窗口的菜单栏,仅"
+#~ "对\n"
+#~ "                                      一个窗口生效;可对每个从命令行打开"
+#~ "的\n"
+#~ "                                      窗口进行设置"
+
+#~ msgid ""
+#~ "  --show-borders                      Turn on the window decorations for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --show-borders                      显示最后指定的终端窗口的边框,仅对\n"
+#~ "                                      一个窗口生效;可对每个从命令行打开\n"
+#~ "                                      的窗口进行设置"
+
+#~ msgid ""
+#~ "  --hide-borders                      Turn off the window decorations "
+#~ "for\n"
+#~ "                                      the last-specified window; applies\n"
+#~ "                                      to only one window; can be "
+#~ "specified\n"
+#~ "                                      once for each window you create "
+#~ "from\n"
+#~ "                                      the command line"
+#~ msgstr ""
+#~ "  --hide-borders                      隐藏最后指定的终端窗口的边框,仅对\n"
+#~ "                                      一个窗口生效;可对每个从命令行打开\n"
+#~ "                                      的窗口进行设置"
+
+#~ msgid ""
+#~ "  --show-toolbars                     Turn on the toolbars for the last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --show-toolbars                     显示最后指定的终端窗口的工具栏,仅"
+#~ "对\n"
+#~ "                                      一个窗口生效;可对每个从命令行打开"
+#~ "的\n"
+#~ "                                      窗口进行设置"
+
+#~ msgid ""
+#~ "  --hide-toolbars                     Turn off the toolbars for the "
+#~ "last-\n"
+#~ "                                      specified window; applies to only "
+#~ "one\n"
+#~ "                                      window; can be specified once for\n"
+#~ "                                      each window you create from the\n"
+#~ "                                      command line"
+#~ msgstr ""
+#~ "  --hide-toolbars                     隐藏最后指定的终端窗口的工具栏,仅"
+#~ "对\n"
+#~ "                                      一个窗口生效;可对每个从命令行打开"
+#~ "的\n"
+#~ "                                      窗口进行设置"
+
+#~ msgid "Unable to launch terminal: %s\n"
+#~ msgstr "无法启动终端: %s\n"
+
+#~ msgid ""
+#~ "Option \"--sm-client-id\" requires specifying the session id as its "
+#~ "parameter"
+#~ msgstr "选项 \"--sm-client-id\" 需要指定 session id 作为其参数"
+
 #~ msgid "<b>Title:</b>"
 #~ msgstr "<b>标题:</b>"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index d746ef0..06ea70a 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Terminal 0.2.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 11:48+0100\n"
+"POT-Creation-Date: 2009-12-14 16:03+0100\n"
 "PO-Revision-Date: 2006-06-12 21:28+0800\n"
 "Last-Translator: Hydonsingore Cia <hydonsingore at educities.edu.tw>\n"
 "Language-Team: Traditional Chinese <zh-l10n at linux.org.tw>\n"
@@ -15,222 +15,91 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../terminal/main.c:46
+#: ../terminal/main.c:48
 msgid "Usage:"
 msgstr ""
 
-#: ../terminal/main.c:47
+#: ../terminal/main.c:48
 msgid "OPTION"
 msgstr ""
 
-#: ../terminal/main.c:49
+#: ../terminal/main.c:53
 #, fuzzy
 msgid "General Options"
 msgstr "一般"
 
-#: ../terminal/main.c:50
-msgid "  -h, --help                          Print this help message and exit"
-msgstr "  -h, --help                          顯示此求助說明並離開"
-
-#: ../terminal/main.c:51
+#. parameter of --default-display
+#. parameter of --display
+#: ../terminal/main.c:55 ../terminal/main.c:81
 #, fuzzy
-msgid ""
-"  -V, --version                       Print version information and exit"
-msgstr "  -v, --version                       顯示版本資訊並離開"
-
-#: ../terminal/main.c:52
-msgid ""
-"  --disable-server                    Do not register with the D-BUS\n"
-"                                      session message bus"
-msgstr ""
+msgid "display"
+msgstr "不顯示"
 
-#: ../terminal/main.c:54
-msgid "  --default-display=DISPLAY           default X display to use"
+#. parameter of --default-working-directory
+#. parameter of --working-directory
+#: ../terminal/main.c:57 ../terminal/main.c:72
+msgid "directory"
 msgstr ""
 
-#: ../terminal/main.c:55
-#, fuzzy
-msgid ""
-"  --default-working-directory=DIRNAME Set the default terminal's working\n"
-"                                      directory"
-msgstr "  --default-working-directory=DIRNAME 設定預設的終端機工作目錄"
-
-#: ../terminal/main.c:58
+#: ../terminal/main.c:61
 msgid "Window or Tab Separators"
 msgstr ""
 
-#: ../terminal/main.c:59
-msgid ""
-"  --tab                               Open a new tab in the last-specified\n"
-"                                      window; more than one of these\n"
-"                                      options can be provided"
-msgstr ""
-
-#: ../terminal/main.c:62
-msgid ""
-"  --window                            Open a new window containing one tab;\n"
-"                                      more than one of these options can be\n"
-"                                      provided"
-msgstr ""
-
 #: ../terminal/main.c:66
 #, fuzzy
 msgid "Tab Options"
 msgstr "分頁位置"
 
-#: ../terminal/main.c:67
-msgid ""
-"  -x, --execute                       Execute the remainder of the command\n"
-"                                      line inside the terminal"
-msgstr ""
-"  -x, --execute                       在終端機中執行命令列中\n"
-"                                      剩下的部份"
-
-#: ../terminal/main.c:69
-msgid ""
-"  -e, --command=STRING                Execute the argument to this option\n"
-"                                      inside the terminal"
-msgstr ""
-"  -e, --command=STRING                在終端機中執行此選項的\n"
-"\t\t\t\t       引數"
-
-#: ../terminal/main.c:71
+#. parameter of --command
+#: ../terminal/main.c:68
 #, fuzzy
-msgid ""
-"  --working-directory=DIRNAME         Set the terminal's working directory"
-msgstr "  --working-directory=DIRNAME         設定終端機工作目錄"
+msgid "command"
+msgstr "<b>命令</b>"
 
-#: ../terminal/main.c:72
+#. parameter of --title
+#: ../terminal/main.c:70
 #, fuzzy
-msgid "  -T, --title=TITLE                   Set the terminal's title"
-msgstr "  -T, --title=TITLE                   設定終端機標題"
-
-#: ../terminal/main.c:73
-msgid ""
-"  -H, --hold                          Do not immediately destroy the tab\n"
-"                                      when the child command exits"
-msgstr ""
-"  -H, --hold                          有子命令存在時\n"
-"                                      不要立即關閉該分頁"
+msgid "title"
+msgstr "標題"
 
-#: ../terminal/main.c:76
+#: ../terminal/main.c:79
 #, fuzzy
 msgid "Window Options"
 msgstr "未知的選項 \"%s\""
 
-#: ../terminal/main.c:77
-msgid ""
-"  --display=DISPLAY                   X display to use for the last-\n"
-"                                      specified window"
+#. parameter of --geometry
+#: ../terminal/main.c:83
+msgid "geometry"
 msgstr ""
 
-#: ../terminal/main.c:79
-msgid ""
-"  --geometry=GEOMETRY                 X geometry specification (see \"X\"\n"
-"                                      man page), can be specified once per\n"
-"                                      window to be opened"
+#. parameter of --role
+#: ../terminal/main.c:85
+msgid "role"
 msgstr ""
 
-#: ../terminal/main.c:82
-msgid ""
-"  --role=ROLE                         Set the role for the last-specified\n"
-"                                      window; applies to only one window;\n"
-"                                      can be specified once for each window\n"
-"                                      you create from the command line"
-msgstr ""
-
-#: ../terminal/main.c:86
-msgid ""
-"  --startup-id=STRING                 ID for the startup notification\n"
-"                                      protocol"
-msgstr ""
-
-#: ../terminal/main.c:88
+#. parameter of --startup-id
+#: ../terminal/main.c:87
 #, fuzzy
-msgid ""
-"  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
-"                                      name or filename"
-msgstr ""
-"  -e, --command=STRING                在終端機中執行此選項的\n"
-"\t\t\t\t       引數"
-
-#: ../terminal/main.c:90
-msgid ""
-"  --fullscreen                        Set the last-specified window into\n"
-"                                      fullscreen mode; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-
-#: ../terminal/main.c:95
-msgid ""
-"  --maximize                          Maximize the last-specified window;\n"
-"                                      applies to only one window; can be\n"
-"                                      specified once for each window you\n"
-"                                      create from the command line"
-msgstr ""
-
-#: ../terminal/main.c:99
-msgid ""
-"  --show-menubar                      Turn on the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-
-#: ../terminal/main.c:104
-msgid ""
-"  --hide-menubar                      Turn off the menubar for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
-
-#: ../terminal/main.c:109
-msgid ""
-"  --show-borders                      Turn on the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
-
-#: ../terminal/main.c:114
-msgid ""
-"  --hide-borders                      Turn off the window decorations for\n"
-"                                      the last-specified window; applies\n"
-"                                      to only one window; can be specified\n"
-"                                      once for each window you create from\n"
-"                                      the command line"
-msgstr ""
+msgid "string"
+msgstr "警告"
 
-#: ../terminal/main.c:119
-msgid ""
-"  --show-toolbars                     Turn on the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
-msgstr ""
+#. parameter of --icon
+#: ../terminal/main.c:89
+#, fuzzy
+msgid "icon"
+msgstr "行為"
 
-#: ../terminal/main.c:124
-msgid ""
-"  --hide-toolbars                     Turn off the toolbars for the last-\n"
-"                                      specified window; applies to only one\n"
-"                                      window; can be specified once for\n"
-"                                      each window you create from the\n"
-"                                      command line"
+#: ../terminal/main.c:91
+#, c-format
+msgid "See the %s man page for full explanation of the options above."
 msgstr ""
 
-#: ../terminal/main.c:151 ../terminal/terminal-preferences.c:1263
+#: ../terminal/main.c:118 ../terminal/terminal-preferences.c:1263
 #: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr "終端機"
 
-#: ../terminal/main.c:173
+#: ../terminal/main.c:135
 #, fuzzy, c-format
 msgid ""
 "%s (Xfce %s)\n"
@@ -255,32 +124,27 @@ msgstr ""
 " \n"
 "請將錯誤報告至 <%s> 。\n"
 
-#: ../terminal/main.c:267
+#: ../terminal/main.c:239
 #, c-format
 msgid "Unable to register terminal service: %s\n"
 msgstr "無法登錄終端機服務: %s\n"
 
-#: ../terminal/main.c:276
-#, c-format
-msgid "Unable to launch terminal: %s\n"
-msgstr "無法起動終端機: %s\n"
-
-#: ../terminal/terminal-app.c:551
+#: ../terminal/terminal-app.c:554
 #, c-format
 msgid "Invalid geometry string \"%s\"\n"
 msgstr "無效的大小字串 \"%s\"\n"
 
-#: ../terminal/terminal-dbus.c:114
+#: ../terminal/terminal-dbus.c:108
 msgid "User id mismatch"
 msgstr "使用者ID不合"
 
-#: ../terminal/terminal-dbus.c:146
+#: ../terminal/terminal-dbus.c:134
 #, c-format
 msgid "D-BUS message bus disconnected, exiting...\n"
 msgstr "D-BUS 訊息服務匯流排中斷連結,離開中...\n"
 
 # y, c-format
-#: ../terminal/terminal-dbus.c:208
+#: ../terminal/terminal-dbus.c:196
 #, c-format
 msgid "Unable to register object %s"
 msgstr "無法登錄物件 %s"
@@ -302,84 +166,78 @@ msgstr ""
 msgid "Failed to open the documentation browser"
 msgstr "無法開啟文件瀏覽器"
 
-#: ../terminal/terminal-options.c:189
+#: ../terminal/terminal-options.c:206
 #, c-format
 msgid ""
 "Option \"--default-display\" requires specifying the default X display as "
 "its parameter"
 msgstr "選項 \"--default-display\" 需要指定預設的 X 螢幕作為其參數"
 
-#: ../terminal/terminal-options.c:204
+#: ../terminal/terminal-options.c:221
 #, c-format
 msgid ""
 "Option \"--default-working-directory\" requires specifying the default "
 "working directory as its parameter"
 msgstr "選項 \"--default-working-directory\" 需要指定預設的工作目錄作為其參數"
 
-#: ../terminal/terminal-options.c:235
-#, c-format
-msgid ""
-"Option \"--sm-client-id\" requires specifying the session id as its parameter"
-msgstr "選項 \"--sm-client-id\" 需要指定 session id 作為其參數"
-
-#: ../terminal/terminal-options.c:250
+#: ../terminal/terminal-options.c:237
 #, c-format
 msgid ""
 "Option \"--execute/-x\" requires specifying the command to run on the rest "
 "of the command line"
 msgstr "選項 \"--execute/-x\" 需要指定剩下的命令列中所要執行的命令。"
 
-#: ../terminal/terminal-options.c:267
+#: ../terminal/terminal-options.c:254
 #, c-format
 msgid ""
 "Option \"--command/-e\" requires specifying the command to run as its "
 "parameter"
 msgstr "選項 \"--command/-e\" 需要指定命令作為其參數"
 
-#: ../terminal/terminal-options.c:284
+#: ../terminal/terminal-options.c:271
 #, c-format
 msgid ""
 "Option \"--working-directory\" requires specifying the working directory as "
 "its parameter"
 msgstr "選項 \"--working-directory\" 需要指定工作目錄作為其參數"
 
-#: ../terminal/terminal-options.c:299
+#: ../terminal/terminal-options.c:286
 #, c-format
 msgid "Option \"--title/-T\" requires specifying the title as its parameter"
 msgstr "選項 \"--title/-T\" 需要指定標題作為其參數"
 
-#: ../terminal/terminal-options.c:319
+#: ../terminal/terminal-options.c:305
 #, c-format
 msgid ""
 "Option \"--display\" requires specifying the X display as its parameters"
 msgstr "選項 \"--display\" 需要指定 X 螢幕作為其參數"
 
-#: ../terminal/terminal-options.c:334
+#: ../terminal/terminal-options.c:320
 #, c-format
 msgid ""
 "Option \"--geometry\" requires specifying the window geometry as its "
 "parameter"
 msgstr "選項 \"--geometry\" 需要指定視窗大小作為其參數"
 
-#: ../terminal/terminal-options.c:349
+#: ../terminal/terminal-options.c:335
 #, c-format
 msgid "Option \"--role\" requires specifying the window role as its parameter"
 msgstr "選項 \"--role\" 需要指定視窗識別碼作為其參數"
 
-#: ../terminal/terminal-options.c:364
+#: ../terminal/terminal-options.c:350
 #, c-format
 msgid ""
 "Option \"--startup-id\" requires specifying the startup id as its parameter"
 msgstr "選項 \"--startup-id\" 需要指定啟動 id 作為其參數"
 
-#: ../terminal/terminal-options.c:379
+#: ../terminal/terminal-options.c:365
 #, fuzzy, c-format
 msgid ""
 "Option \"--icon/-I\" requires specifying an icon name or filename as its "
 "parameter"
 msgstr "選項 \"--command/-e\" 需要指定命令作為其參數"
 
-#: ../terminal/terminal-options.c:435
+#: ../terminal/terminal-options.c:419
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "未知的選項 \"%s\""
@@ -449,7 +307,7 @@ msgstr "全螢幕"
 msgid "Set Title"
 msgstr "設定標題"
 
-#: ../terminal/terminal-preferences.c:464
+#: ../terminal/terminal-preferences.c:464 ../terminal/terminal-window.c:237
 msgid "Reset"
 msgstr "重設"
 
@@ -740,6 +598,11 @@ msgstr "重設(_R)"
 msgid "Reset and C_lear"
 msgstr "重設與清除(_l)"
 
+#: ../terminal/terminal-window.c:238
+#, fuzzy
+msgid "Reset and clear"
+msgstr "重設與清除"
+
 #: ../terminal/terminal-window.c:239
 msgid "_Go"
 msgstr "前往(_G)"
@@ -1402,6 +1265,69 @@ msgstr "當命令執行時更新 utmp/wtmp 紀錄"
 msgid "seconds"
 msgstr ""
 
+#~ msgid ""
+#~ "  -h, --help                          Print this help message and exit"
+#~ msgstr "  -h, --help                          顯示此求助說明並離開"
+
+#, fuzzy
+#~ msgid ""
+#~ "  -V, --version                       Print version information and exit"
+#~ msgstr "  -v, --version                       顯示版本資訊並離開"
+
+#, fuzzy
+#~ msgid ""
+#~ "  --default-working-directory=DIRNAME Set the default terminal's working\n"
+#~ "                                      directory"
+#~ msgstr "  --default-working-directory=DIRNAME 設定預設的終端機工作目錄"
+
+#~ msgid ""
+#~ "  -x, --execute                       Execute the remainder of the "
+#~ "command\n"
+#~ "                                      line inside the terminal"
+#~ msgstr ""
+#~ "  -x, --execute                       在終端機中執行命令列中\n"
+#~ "                                      剩下的部份"
+
+#~ msgid ""
+#~ "  -e, --command=STRING                Execute the argument to this "
+#~ "option\n"
+#~ "                                      inside the terminal"
+#~ msgstr ""
+#~ "  -e, --command=STRING                在終端機中執行此選項的\n"
+#~ "\t\t\t\t       引數"
+
+#, fuzzy
+#~ msgid ""
+#~ "  --working-directory=DIRNAME         Set the terminal's working directory"
+#~ msgstr "  --working-directory=DIRNAME         設定終端機工作目錄"
+
+#, fuzzy
+#~ msgid "  -T, --title=TITLE                   Set the terminal's title"
+#~ msgstr "  -T, --title=TITLE                   設定終端機標題"
+
+#~ msgid ""
+#~ "  -H, --hold                          Do not immediately destroy the tab\n"
+#~ "                                      when the child command exits"
+#~ msgstr ""
+#~ "  -H, --hold                          有子命令存在時\n"
+#~ "                                      不要立即關閉該分頁"
+
+#, fuzzy
+#~ msgid ""
+#~ "  -I, --icon=ICON                     Set the terminal's icon as an icon\n"
+#~ "                                      name or filename"
+#~ msgstr ""
+#~ "  -e, --command=STRING                在終端機中執行此選項的\n"
+#~ "\t\t\t\t       引數"
+
+#~ msgid "Unable to launch terminal: %s\n"
+#~ msgstr "無法起動終端機: %s\n"
+
+#~ msgid ""
+#~ "Option \"--sm-client-id\" requires specifying the session id as its "
+#~ "parameter"
+#~ msgstr "選項 \"--sm-client-id\" 需要指定 session id 作為其參數"
+
 #~ msgid "<b>Title:</b>"
 #~ msgstr "<b>標題:</b>"
 



More information about the Xfce4-commits mailing list