[Xfce4-commits] <terminal:master> Set the prgname and use it in the help and dialogs.
Nick Schermer
noreply at xfce.org
Sun Feb 7 17:16:01 CET 2010
Updating branch refs/heads/master
to 5a5b59559025445f3a2740216abe8fc30647cf6e (commit)
from 08506d0caaf163db4ebffb58ba6fc19f1c956305 (commit)
commit 5a5b59559025445f3a2740216abe8fc30647cf6e
Author: Nick Schermer <nick at xfce.org>
Date: Sun Feb 7 17:13:33 2010 +0100
Set the prgname and use it in the help and dialogs.
po/ar.po | 4 ++--
po/ast.po | 4 ++--
po/be.po | 4 ++--
po/ca.po | 4 ++--
po/cs.po | 4 ++--
po/da.po | 4 ++--
po/de.po | 4 ++--
po/dz.po | 4 ++--
po/el.po | 4 ++--
po/en_GB.po | 4 ++--
po/eo.po | 4 ++--
po/es.po | 4 ++--
po/et.po | 4 ++--
po/eu.po | 4 ++--
po/fi.po | 4 ++--
po/fr.po | 4 ++--
po/gl.po | 4 ++--
po/he.po | 4 ++--
po/hu.po | 4 ++--
po/id.po | 4 ++--
po/it.po | 4 ++--
po/ja.po | 4 ++--
po/kk.po | 4 ++--
po/ko.po | 4 ++--
po/ku.po | 2 +-
po/lt.po | 2 +-
po/lv.po | 4 ++--
po/nb.po | 4 ++--
po/nl.po | 4 ++--
po/pa.po | 2 +-
po/pl.po | 4 ++--
po/pt.po | 4 ++--
po/pt_BR.po | 4 ++--
po/ro.po | 4 ++--
po/ru.po | 4 ++--
po/sk.po | 4 ++--
po/sq.po | 4 ++--
po/sv.po | 4 ++--
po/tr.po | 4 ++--
po/uk.po | 4 ++--
po/ur.po | 4 ++--
po/ur_PK.po | 4 ++--
po/vi.po | 4 ++--
po/zh_CN.po | 4 ++--
po/zh_TW.po | 4 ++--
terminal/Makefile.am | 1 -
terminal/main.c | 17 ++++++++++++-----
terminal/terminal-dialogs.c | 8 ++++++--
terminal/terminal-options.c | 7 ++++++-
49 files changed, 111 insertions(+), 96 deletions(-)
diff --git a/po/ar.po b/po/ar.po
index 55c8969..899159b 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -104,7 +104,7 @@ msgstr "طرفية"
#: ../terminal/main.c:135
#, c-format
msgid ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
@@ -115,7 +115,7 @@ msgid ""
"\n"
"Please report bugs to <%s>.\n"
msgstr ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"حقوق النسخ (c) %s\n"
" os-cillation e.K. جميع الحقوق محفوظة.\n"
diff --git a/po/ast.po b/po/ast.po
index 7712c27..00fb1ec 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -95,7 +95,7 @@ msgstr "Terminal"
#: ../terminal/main.c:135
#, c-format
msgid ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
@@ -106,7 +106,7 @@ msgid ""
"\n"
"Please report bugs to <%s>.\n"
msgstr ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. Tolos drechos reservaos.\n"
diff --git a/po/be.po b/po/be.po
index 530f500..11896b0 100644
--- a/po/be.po
+++ b/po/be.po
@@ -102,7 +102,7 @@ msgstr "Тэрмінал"
#: ../terminal/main.c:135
#, c-format
msgid ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
@@ -113,7 +113,7 @@ msgid ""
"\n"
"Please report bugs to <%s>.\n"
msgstr ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Аўтарскія правы (c) %s\n"
" os-cillation e.K. Усе правы абаронены.\n"
diff --git a/po/ca.po b/po/ca.po
index a109f58..37175ec 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -103,7 +103,7 @@ msgstr "Terminal"
#: ../terminal/main.c:135
#, c-format
msgid ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
@@ -114,7 +114,7 @@ msgid ""
"\n"
"Please report bugs to <%s>.\n"
msgstr ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
diff --git a/po/cs.po b/po/cs.po
index 1e8f283..5fc9409 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -99,7 +99,7 @@ msgstr "Terminal"
#: ../terminal/main.c:135
#, c-format
msgid ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
@@ -110,7 +110,7 @@ msgid ""
"\n"
"Please report bugs to <%s>.\n"
msgstr ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. Všechna práva vyhrazena.\n"
diff --git a/po/da.po b/po/da.po
index 009f57d..23ff87a 100644
--- a/po/da.po
+++ b/po/da.po
@@ -101,7 +101,7 @@ msgstr "Terminal"
#: ../terminal/main.c:135
#, c-format
msgid ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
@@ -112,7 +112,7 @@ msgid ""
"\n"
"Please report bugs to <%s>.\n"
msgstr ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
diff --git a/po/de.po b/po/de.po
index d4752fd..d819674 100644
--- a/po/de.po
+++ b/po/de.po
@@ -102,7 +102,7 @@ msgstr "Terminal"
#: ../terminal/main.c:135
#, c-format
msgid ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
@@ -113,7 +113,7 @@ msgid ""
"\n"
"Please report bugs to <%s>.\n"
msgstr ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. Alle Rechte vorbehalten.\n"
diff --git a/po/dz.po b/po/dz.po
index dfebf83..6c80142 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -106,7 +106,7 @@ msgstr "ཊར་མི་ནཱལ།"
#: ../terminal/main.c:135
#, fuzzy, c-format
msgid ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
@@ -117,7 +117,7 @@ msgid ""
"\n"
"Please report bugs to <%s>.\n"
msgstr ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) 2003-2006\n"
" os-cillation e.K. All rights reserved.\n"
diff --git a/po/el.po b/po/el.po
index 4b3c5e5..d92c717 100644
--- a/po/el.po
+++ b/po/el.po
@@ -103,7 +103,7 @@ msgstr "Τερματικό"
#: ../terminal/main.c:134
#, c-format
msgid ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
@@ -114,7 +114,7 @@ msgid ""
"\n"
"Please report bugs to <%s>.\n"
msgstr ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
diff --git a/po/en_GB.po b/po/en_GB.po
index 16e4691..fccb976 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -96,7 +96,7 @@ msgstr "Terminal"
#: ../terminal/main.c:134
#, c-format
msgid ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
@@ -107,7 +107,7 @@ msgid ""
"\n"
"Please report bugs to <%s>.\n"
msgstr ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
diff --git a/po/eo.po b/po/eo.po
index 62a5b01..08c73b9 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -106,7 +106,7 @@ msgstr "Terminalo"
#: ../terminal/main.c:135
#, fuzzy, c-format
msgid ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
@@ -117,7 +117,7 @@ msgid ""
"\n"
"Please report bugs to <%s>.\n"
msgstr ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Kopirajtoj (c) 2003-2006\n"
" os-cillation e.K. Ĉiuj rajtoj rezervitaj.\n"
diff --git a/po/es.po b/po/es.po
index faa2166..c4c366f 100644
--- a/po/es.po
+++ b/po/es.po
@@ -102,7 +102,7 @@ msgstr "Terminal"
#: ../terminal/main.c:135
#, c-format
msgid ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
@@ -113,7 +113,7 @@ msgid ""
"\n"
"Please report bugs to <%s>.\n"
msgstr ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. Todos los derechos reservados.\n"
diff --git a/po/et.po b/po/et.po
index 8721096..92ba3aa 100644
--- a/po/et.po
+++ b/po/et.po
@@ -103,7 +103,7 @@ msgstr "Terminal"
#: ../terminal/main.c:135
#, c-format
msgid ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
@@ -114,7 +114,7 @@ msgid ""
"\n"
"Please report bugs to <%s>.\n"
msgstr ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Autoriõigus (c) %s\n"
" os-cillation e.K. Kõik õigused reserveeritud.\n"
diff --git a/po/eu.po b/po/eu.po
index 5970636..d6b6c96 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -100,7 +100,7 @@ msgstr "Terminala"
#: ../terminal/main.c:134
#, c-format
msgid ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
@@ -111,7 +111,7 @@ msgid ""
"\n"
"Please report bugs to <%s>.\n"
msgstr ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
diff --git a/po/fi.po b/po/fi.po
index 384afae..730e0c7 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -94,7 +94,7 @@ msgstr "Pääte"
#: ../terminal/main.c:135
#, c-format
msgid ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
@@ -105,7 +105,7 @@ msgid ""
"\n"
"Please report bugs to <%s>.\n"
msgstr ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Tekijänoikeus (c) %s\n"
" os-cillation e.K. Kaikki oikeudet pidätetään.\n"
diff --git a/po/fr.po b/po/fr.po
index b2bf2e0..58c7842 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -109,7 +109,7 @@ msgstr "Terminal"
#: ../terminal/main.c:134
#, c-format
msgid ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
@@ -120,7 +120,7 @@ msgid ""
"\n"
"Please report bugs to <%s>.\n"
msgstr ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. Tous droits réservés.\n"
diff --git a/po/gl.po b/po/gl.po
index 787dfc6..af801c6 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -99,7 +99,7 @@ msgstr "Terminal"
#: ../terminal/main.c:135
#, c-format
msgid ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
@@ -110,7 +110,7 @@ msgid ""
"\n"
"Please report bugs to <%s>.\n"
msgstr ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. Todos os dereitos reservados.\n"
diff --git a/po/he.po b/po/he.po
index ae202a8..5b0d2b0 100644
--- a/po/he.po
+++ b/po/he.po
@@ -105,7 +105,7 @@ msgstr "מסוף"
#: ../terminal/main.c:135
#, c-format
msgid ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
@@ -116,7 +116,7 @@ msgid ""
"\n"
"Please report bugs to <%s>.\n"
msgstr ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"זכויות יוצרים (c) %s \n"
" os-cillation e.K. All rights reserved.\n"
diff --git a/po/hu.po b/po/hu.po
index 33b1f75..ce48b7f 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -96,7 +96,7 @@ msgstr "Terminál"
#: ../terminal/main.c:135
#, c-format
msgid ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
@@ -107,7 +107,7 @@ msgid ""
"\n"
"Please report bugs to <%s>.\n"
msgstr ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
diff --git a/po/id.po b/po/id.po
index 20a6c65..cf1a194 100644
--- a/po/id.po
+++ b/po/id.po
@@ -94,7 +94,7 @@ msgstr "Terminal"
#: ../terminal/main.c:135
#, c-format
msgid ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
@@ -105,7 +105,7 @@ msgid ""
"\n"
"Please report bugs to <%s>.\n"
msgstr ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Hak cipta (c) %s\n"
" os-cillation e.K. Hak cipta dilindungi undang-undang.\n"
diff --git a/po/it.po b/po/it.po
index 47f7e06..8ba2a2b 100644
--- a/po/it.po
+++ b/po/it.po
@@ -100,7 +100,7 @@ msgstr "Terminale"
#: ../terminal/main.c:134
#, c-format
msgid ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
@@ -111,7 +111,7 @@ msgid ""
"\n"
"Please report bugs to <%s>.\n"
msgstr ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. Tutti i diritti riservati.\n"
diff --git a/po/ja.po b/po/ja.po
index 9969686..cd1e904 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -94,7 +94,7 @@ msgstr "Terminal"
#: ../terminal/main.c:135
#, c-format
msgid ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
@@ -105,7 +105,7 @@ msgid ""
"\n"
"Please report bugs to <%s>.\n"
msgstr ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
diff --git a/po/kk.po b/po/kk.po
index 5a18b98..7e85ed0 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -100,7 +100,7 @@ msgstr "Терминал"
#: ../terminal/main.c:135
#, c-format
msgid ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
@@ -111,7 +111,7 @@ msgid ""
"\n"
"Please report bugs to <%s>.\n"
msgstr ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. Барлық құқықтары қорғалған.\n"
diff --git a/po/ko.po b/po/ko.po
index 3322631..b522a9e 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -102,7 +102,7 @@ msgstr "터미널"
#: ../terminal/main.c:135
#, c-format
msgid ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
@@ -113,7 +113,7 @@ msgid ""
"\n"
"Please report bugs to <%s>.\n"
msgstr ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
diff --git a/po/ku.po b/po/ku.po
index abeae73..ab31c95 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -103,7 +103,7 @@ msgstr "Termînal"
#: ../terminal/main.c:135
#, c-format
msgid ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
diff --git a/po/lt.po b/po/lt.po
index 6475353..1f6c147 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -96,7 +96,7 @@ msgstr ""
#: ../terminal/main.c:135
#, c-format
msgid ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
diff --git a/po/lv.po b/po/lv.po
index 3377767..524db1c 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -103,7 +103,7 @@ msgstr "Terminālis"
#: ../terminal/main.c:134
#, c-format
msgid ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
@@ -114,7 +114,7 @@ msgid ""
"\n"
"Please report bugs to <%s>.\n"
msgstr ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Autortiesības (c) %s\n"
" os-cillation e.K. Visas tiesības paturētas.\n"
diff --git a/po/nb.po b/po/nb.po
index 1ea8307..594b384 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -100,7 +100,7 @@ msgstr "Terminal"
#: ../terminal/main.c:135
#, c-format
msgid ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
@@ -111,7 +111,7 @@ msgid ""
"\n"
"Please report bugs to <%s>.\n"
msgstr ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. Alle rettigheter reservert.\n"
diff --git a/po/nl.po b/po/nl.po
index 8414045..75cd1c4 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -96,7 +96,7 @@ msgstr "Terminal"
#: ../terminal/main.c:135
#, c-format
msgid ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
@@ -107,7 +107,7 @@ msgid ""
"\n"
"Please report bugs to <%s>.\n"
msgstr ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. Alle rechten voorbehouden.\n"
diff --git a/po/pa.po b/po/pa.po
index 49ed85f..43ea1cc 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -104,7 +104,7 @@ msgstr "ਟਰਮੀਨਲ"
#: ../terminal/main.c:135
#, c-format
msgid ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
diff --git a/po/pl.po b/po/pl.po
index 4642668..76b1c90 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -105,7 +105,7 @@ msgstr "Terminal"
#: ../terminal/main.c:135
#, c-format
msgid ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
@@ -116,7 +116,7 @@ msgid ""
"\n"
"Please report bugs to <%s>.\n"
msgstr ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. Wszelkie prawa zastrzeżone.\n"
diff --git a/po/pt.po b/po/pt.po
index 616db4e..1097d6a 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -100,7 +100,7 @@ msgstr "Terminal"
#: ../terminal/main.c:135
#, c-format
msgid ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
@@ -111,7 +111,7 @@ msgid ""
"\n"
"Please report bugs to <%s>.\n"
msgstr ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. Todos os direitos reservados.\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index a088a46..7d2fe93 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -97,7 +97,7 @@ msgstr "Terminal"
#: ../terminal/main.c:135
#, c-format
msgid ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
@@ -108,7 +108,7 @@ msgid ""
"\n"
"Please report bugs to <%s>.\n"
msgstr ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. Todos os direitos reservados.\n"
diff --git a/po/ro.po b/po/ro.po
index 163b87e..2c3e813 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -103,7 +103,7 @@ msgstr "Terminal"
#: ../terminal/main.c:135
#, c-format
msgid ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
@@ -114,7 +114,7 @@ msgid ""
"\n"
"Please report bugs to <%s>.\n"
msgstr ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Drepturi de autor © %s\n"
" os-cillation e.K. Toate drepturile rezervate.\n"
diff --git a/po/ru.po b/po/ru.po
index 9e366f1..0974586 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -99,7 +99,7 @@ msgstr "Terminal"
#: ../terminal/main.c:134
#, c-format
msgid ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
@@ -110,7 +110,7 @@ msgid ""
"\n"
"Please report bugs to <%s>.\n"
msgstr ""
-"%s (%s Xfce)\n"
+"%s %s (%s Xfce)\n"
"\n"
"Авторское право (c) %s\n"
" os-cillation e.K. Все права защищены.\n"
diff --git a/po/sk.po b/po/sk.po
index 65d1129..ea989b7 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -96,7 +96,7 @@ msgstr "Terminál"
#: ../terminal/main.c:134
#, c-format
msgid ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
@@ -107,7 +107,7 @@ msgid ""
"\n"
"Please report bugs to <%s>.\n"
msgstr ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. Všetky práva vyhradené.\n"
diff --git a/po/sq.po b/po/sq.po
index d731c8d..071e905 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -100,7 +100,7 @@ msgstr "Terminal"
#: ../terminal/main.c:135
#, c-format
msgid ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
@@ -111,7 +111,7 @@ msgid ""
"\n"
"Please report bugs to <%s>.\n"
msgstr ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Të drejta Kopjimi (c) %s\n"
" os-cillation e.K. Tërë të drejtat të ruajtura.\n"
diff --git a/po/sv.po b/po/sv.po
index ed0345e..c09ca83 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -102,7 +102,7 @@ msgstr "Terminal"
#: ../terminal/main.c:135
#, c-format
msgid ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
@@ -113,7 +113,7 @@ msgid ""
"\n"
"Please report bugs to <%s>.\n"
msgstr ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. Alla rättigheter reserverade.\n"
diff --git a/po/tr.po b/po/tr.po
index e8fb51b..49b85cc 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -101,7 +101,7 @@ msgstr "Uçbirim"
#: ../terminal/main.c:135
#, c-format
msgid ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
@@ -112,7 +112,7 @@ msgid ""
"\n"
"Please report bugs to <%s>.\n"
msgstr ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. Bütün hakları saklıdır.\n"
diff --git a/po/uk.po b/po/uk.po
index 9d961c5..f4d4fc5 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -103,7 +103,7 @@ msgstr "Термінал"
#: ../terminal/main.c:135
#, c-format
msgid ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
@@ -114,7 +114,7 @@ msgid ""
"\n"
"Please report bugs to <%s>.\n"
msgstr ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. Всі права застережено.\n"
diff --git a/po/ur.po b/po/ur.po
index 2216cfd..0832e45 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -104,7 +104,7 @@ msgstr "ٹرمنل"
#: ../terminal/main.c:135
#, c-format
msgid ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
@@ -115,7 +115,7 @@ msgid ""
"\n"
"Please report bugs to <%s>.\n"
msgstr ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
diff --git a/po/ur_PK.po b/po/ur_PK.po
index 2216cfd..0832e45 100644
--- a/po/ur_PK.po
+++ b/po/ur_PK.po
@@ -104,7 +104,7 @@ msgstr "ٹرمنل"
#: ../terminal/main.c:135
#, c-format
msgid ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
@@ -115,7 +115,7 @@ msgid ""
"\n"
"Please report bugs to <%s>.\n"
msgstr ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
diff --git a/po/vi.po b/po/vi.po
index 2352704..1c8d121 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -104,7 +104,7 @@ msgstr "Terminal"
#: ../terminal/main.c:135
#, fuzzy, c-format
msgid ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
@@ -115,7 +115,7 @@ msgid ""
"\n"
"Please report bugs to <%s>.\n"
msgstr ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Đăng ký bản quyền (c) 2003-2006\n"
" os-cillation e.K. Mọi quyền đã được bảo vệ.\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index fa125f8..9ced91a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -96,7 +96,7 @@ msgstr "Xfce 终端"
#: ../terminal/main.c:135
#, c-format
msgid ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
@@ -107,7 +107,7 @@ msgid ""
"\n"
"Please report bugs to <%s>.\n"
msgstr ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. 版权所有。\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 06ea70a..3ce8e07 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -102,7 +102,7 @@ msgstr "終端機"
#: ../terminal/main.c:135
#, fuzzy, c-format
msgid ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n"
@@ -113,7 +113,7 @@ msgid ""
"\n"
"Please report bugs to <%s>.\n"
msgstr ""
-"%s (Xfce %s)\n"
+"%s %s (Xfce %s)\n"
"\n"
"Copyright (c) 2003-2005\n"
" os-cillation e.K. 版權所有\n"
diff --git a/terminal/Makefile.am b/terminal/Makefile.am
index 4d26ffb..b8bda66 100644
--- a/terminal/Makefile.am
+++ b/terminal/Makefile.am
@@ -6,7 +6,6 @@ INCLUDES = \
-DLIBEXECDIR=\"$(libexecdir)\" \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
-DSN_API_NOT_YET_FROZEN \
- -DTERMINAL_NAME=\"`echo $(PACKAGE_NAME) | sed '$(program_transform_name)'`\" \
-I$(top_srcdir) \
$(PLATFORM_CPPFLAGS)
diff --git a/terminal/main.c b/terminal/main.c
index bf60732..4950d5f 100644
--- a/terminal/main.c
+++ b/terminal/main.c
@@ -42,9 +42,11 @@
static void
usage (void)
{
+ gchar *name = g_get_prgname ();
+
g_print ("%s\n"
" %s [%s...]\n\n",
- _("Usage:"), TERMINAL_NAME, _("OPTION"));
+ _("Usage:"), name, _("OPTION"));
g_print ("%s:\n"
" -h, --help; -V, --version; --disable-server;\n"
@@ -88,9 +90,11 @@ usage (void)
_("icon"));
g_print (_("See the %s man page for full explanation of the options above."),
- TERMINAL_NAME);
+ name);
g_print ("\n\n");
+
+ g_free (name);
}
@@ -109,12 +113,13 @@ main (int argc, char **argv)
gchar **nargv;
gint nargc;
gint n;
+ gchar *name;
/* install required signal handlers */
signal (SIGPIPE, SIG_IGN);
xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
- g_set_application_name (TERMINAL_NAME);
+ g_set_application_name (_("Terminal"));
/* required because we don't call gtk_init() prior to usage() */
gtk_set_locale ();
@@ -131,18 +136,20 @@ main (int argc, char **argv)
if (G_UNLIKELY (show_version))
{
- g_print (_("%s (Xfce %s)\n\n"
+ name = g_get_prgname ();
+ g_print (_("%s %s (Xfce %s)\n\n"
"Copyright (c) %s\n"
" os-cillation e.K. All rights reserved.\n\n"
"Written by Benedikt Meurer <benny at xfce.org>.\n\n"
"Built with Gtk+-%d.%d.%d, running with Gtk+-%d.%d.%d.\n\n"
"Please report bugs to <%s>.\n"),
- TERMINAL_NAME " " PACKAGE_VERSION,
+ name, PACKAGE_VERSION,
xfce_version_string (),
"2003-2010",
GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION,
gtk_major_version, gtk_minor_version, gtk_micro_version,
PACKAGE_BUGREPORT);
+ g_free (name);
return EXIT_SUCCESS;
}
else if (G_UNLIKELY (show_help))
diff --git a/terminal/terminal-dialogs.c b/terminal/terminal-dialogs.c
index ca3807c..a68099b 100644
--- a/terminal/terminal-dialogs.c
+++ b/terminal/terminal-dialogs.c
@@ -65,6 +65,7 @@ terminal_dialogs_show_about (GtkWindow *parent)
};
GdkPixbuf *logo;
+ gchar *name;
/* try to load the about logo */
logo = gdk_pixbuf_new_from_file_at_size (DATADIR "/icons/hicolor/scalable/apps/Terminal.svg", 168, 168, NULL);
@@ -81,6 +82,7 @@ terminal_dialogs_show_about (GtkWindow *parent)
#endif
/* open the about dialog */
+ name = g_get_prgname ();
gtk_show_about_dialog (parent,
"authors", authors,
"artists", artists,
@@ -90,7 +92,7 @@ terminal_dialogs_show_about (GtkWindow *parent)
"Copyright \302\251 2007-2010 Nick Schermer",
"license", XFCE_LICENSE_GPL,
"logo", logo,
- "program-name", TERMINAL_NAME,
+ "program-name", name,
"translator-credits", _("translator-credits"),
"version", PACKAGE_VERSION,
"website", "http://goodies.xfce.org/projects/applications/terminal",
@@ -100,6 +102,8 @@ terminal_dialogs_show_about (GtkWindow *parent)
/* release the about logo (if any) */
if (G_LIKELY (logo != NULL))
g_object_unref (G_OBJECT (logo));
+
+ g_free (name);
}
@@ -226,7 +230,7 @@ terminal_dialogs_show_help (gpointer parent,
screen = gtk_widget_get_screen (GTK_WIDGET (parent));
/* generate the command for the documentation browser */
- command = g_strdup (LIBEXECDIR G_DIR_SEPARATOR_S TERMINAL_NAME "Help");
+ command = g_strdup (LIBEXECDIR G_DIR_SEPARATOR_S "TerminalHelp");
/* check if a page is given */
if (G_UNLIKELY (page != NULL))
diff --git a/terminal/terminal-options.c b/terminal/terminal-options.c
index 1700cda..02994b4 100644
--- a/terminal/terminal-options.c
+++ b/terminal/terminal-options.c
@@ -145,7 +145,12 @@ terminal_options_parse (gint argc,
gboolean *show_version,
gboolean *disable_server)
{
- gint n;
+ gint n;
+ gchar *prgname;
+
+ prgname = g_path_get_basename (*argv);
+ g_set_prgname (prgname);
+ g_free (prgname);
for (n = 1; n < argc; ++n)
{
More information about the Xfce4-commits
mailing list