rpm/quilt
SHA256
1
0
Fork 0
forked from pool/quilt
Code Pull Requests Activity
6433efb15a
quilt/translation-fixes-04.patch

207 lines
7.4 KiB
Diff
Raw Normal View History

Translation fixes: - translation-fixes-01.patch: Make gettext happy (needed so that following patches apply cleanly.) - translation-fixes-02.patch: Missing escape in Japanese translation. - translation-fixes-03.patch: Improve the German translation (including a number of important fixes.) - translation-fixes-04.patch: Fix translation of main usage message (all languages.) Fixes to the "edit" command: - edit-01-test-file-creation.patch: edit: Improve the test case (needed so that following patches apply cleanly.) - edit-02-call-remove-not-revert.patch: edit: Use command "remove" to remove files. - edit-03-fix-corner-case.patch: edit: Fix a corner case. OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/quilt?expand=0&rev=100
2015-02-16 17:29:50 +01:00
From: Jean Delvare <jdelvare@suse.de>
Date: Wed, 11 Feb 2015 16:59:22 +0000
Subject: Fix translation of main usage message
Upstream: Committed (249f34528986e3dbc7bb7e6eb746f85468379137)
@ETCDIR@ is substituted at build time so it should not appear in
translated messages. Replace it with %s and pass the actual value as a
parameter.
---
diff --git a/bin/quilt.in b/bin/quilt.in
index 2271833..45aebbc 100644
--- a/bin/quilt.in
+++ b/bin/quilt.in
@@ -45,7 +45,7 @@ usage()
| sort \
| column | column -t \
| sed -e $'s/^/\t/'
- echo $"
+ printf $"
Global options:
--trace
@@ -53,13 +53,13 @@ Global options:
--quiltrc file
Use the specified configuration file instead of ~/.quiltrc (or
- @ETCDIR@/quilt.quiltrc if ~/.quiltrc does not exist). See the pdf
+ %s/quilt.quiltrc if ~/.quiltrc does not exist). See the pdf
documentation for details about its possible contents. The
special value \"-\" causes quilt not to read any configuration
file.
--version
- Print the version number and exit immediately."
+ Print the version number and exit immediately.\n" "@ETCDIR@"
exit 1
}
diff --git a/po/de.po b/po/de.po
index 379acf3..b22173b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -39,13 +39,13 @@ msgid ""
"\n"
"--quiltrc file\n"
"\tUse the specified configuration file instead of ~/.quiltrc (or\n"
-"\t@ETCDIR@/quilt.quiltrc if ~/.quiltrc does not exist). See the pdf\n"
+"\t%s/quilt.quiltrc if ~/.quiltrc does not exist). See the pdf\n"
"\tdocumentation for details about its possible contents. The\n"
"\tspecial value \\\"-\\\" causes quilt not to read any configuration\n"
"\tfile.\n"
"\n"
"--version\n"
-"\tPrint the version number and exit immediately."
+"\tPrint the version number and exit immediately.\\n"
msgstr ""
"\n"
"Globale Optionen:\n"
@@ -55,13 +55,13 @@ msgstr ""
"\n"
"--quiltrc datei\n"
"\tDie angegebene Konfigurationsdatei verwenden statt ~/.quiltrc (oder\n"
-"\t@ETCDIR@/quilt.quiltrc, wenn ~/.quiltrc fehlt). Details über mögliche\n"
+"\t%s/quilt.quiltrc, wenn ~/.quiltrc fehlt). Details über mögliche\n"
"\tInhalte finden Sie in der pdf-Dokumentation.\n"
"\tDer Dateiname \\`-' bedeutet, dass keine Konfigurationsdatei\n"
"\teingelesen werden soll.\n"
"\n"
"--version\n"
-"\tGibt die Versionsummer aus."
+"\tGibt die Versionsummer aus.\\n"
#: quilt/add.in:22
msgid "Usage: quilt add [-P patch] {file} ...\\n"
diff --git a/po/fr.po b/po/fr.po
index ffe3645..01d45cd 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -36,13 +36,13 @@ msgid ""
"\n"
"--quiltrc file\n"
"\tUse the specified configuration file instead of ~/.quiltrc (or\n"
-"\t@ETCDIR@/quilt.quiltrc if ~/.quiltrc does not exist). See the pdf\n"
+"\t%s/quilt.quiltrc if ~/.quiltrc does not exist). See the pdf\n"
"\tdocumentation for details about its possible contents. The\n"
"\tspecial value \\\"-\\\" causes quilt not to read any configuration\n"
"\tfile.\n"
"\n"
"--version\n"
-"\tPrint the version number and exit immediately."
+"\tPrint the version number and exit immediately.\\n"
msgstr ""
"\n"
"Options globales :\n"
@@ -52,13 +52,13 @@ msgstr ""
"\n"
"--quiltrc fichier\n"
"\tUtilise le fichier de configuration spécifié au lieu de ~/.quiltrc\n"
-"\t(ou @ETCDIR@/quilt.quiltrc si ~/.quiltrc n'existe pas). Voir la\n"
+"\t(ou %s/quilt.quiltrc si ~/.quiltrc n'existe pas). Voir la\n"
"\tdocumentation pdf pour plus de détails sur son contenu potentiel.\n"
-"La valeur spéciale \\\"-\\\" spécifie à quilt de ne lire aucun fichier\n"
-"de configuration.\n"
+"\tLa valeur spéciale \\\"-\\\" spécifie à quilt de ne lire aucun fichier\n"
+"\tde configuration.\n"
"\n"
"--version\n"
-"\tAffiche le numéro de version et sort immédiatement."
+"\tAffiche le numéro de version et sort immédiatement.\\n"
#: quilt/add.in:22
msgid "Usage: quilt add [-P patch] {file} ...\\n"
diff --git a/po/ja.po b/po/ja.po
index 6697b0d..90a61cd 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -35,13 +35,13 @@ msgid ""
"\n"
"--quiltrc file\n"
"\tUse the specified configuration file instead of ~/.quiltrc (or\n"
-"\t@ETCDIR@/quilt.quiltrc if ~/.quiltrc does not exist). See the pdf\n"
+"\t%s/quilt.quiltrc if ~/.quiltrc does not exist). See the pdf\n"
"\tdocumentation for details about its possible contents. The\n"
"\tspecial value \\\"-\\\" causes quilt not to read any configuration\n"
"\tfile.\n"
"\n"
"--version\n"
-"\tPrint the version number and exit immediately."
+"\tPrint the version number and exit immediately.\\n"
msgstr ""
"\n"
"全コマンド共通オプション:\n"
@@ -50,13 +50,13 @@ msgstr ""
"\tコマンドをbashのトレースモード(-x)で実行。内部デバッグ用。\n"
"\n"
"--quiltrc file\n"
-"\t~/.quiltrc (存在しない場合は @ETCDIR@/quiltrc) の代りに読み込む\n"
+"\t~/.quiltrc (存在しない場合は %s/quiltrc) の代りに読み込む\n"
"\tコンフィギュレーションファイルを指定。内容の詳細については\n"
"\tPDFのドキュメントを参照。特別なファイル名 \\\"-\\\"を使うと、\n"
"\tコンフィギュレーションファイルを読み込まない。\n"
"\n"
"--version\n"
-"\tバージョン情報を出力して終了。"
+"\tバージョン情報を出力して終了。\\n"
#: quilt/add.in:22
msgid "Usage: quilt add [-P patch] {file} ...\\n"
diff --git a/po/quilt.pot b/po/quilt.pot
index d907829..264943f 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -20,13 +20,13 @@ msgid ""
"\n"
"--quiltrc file\n"
"\tUse the specified configuration file instead of ~/.quiltrc (or\n"
-"\t@ETCDIR@/quilt.quiltrc if ~/.quiltrc does not exist). See the pdf\n"
+"\t%s/quilt.quiltrc if ~/.quiltrc does not exist). See the pdf\n"
"\tdocumentation for details about its possible contents. The\n"
"\tspecial value \\\"-\\\" causes quilt not to read any configuration\n"
"\tfile.\n"
"\n"
"--version\n"
-"\tPrint the version number and exit immediately."
+"\tPrint the version number and exit immediately.\\n"
msgstr ""
#: quilt/add.in:22
diff --git a/po/ru.po b/po/ru.po
index 85e04b0..78b9f38 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -40,13 +40,13 @@ msgid ""
"\n"
"--quiltrc file\n"
"\tUse the specified configuration file instead of ~/.quiltrc (or\n"
-"\t@ETCDIR@/quilt.quiltrc if ~/.quiltrc does not exist). See the pdf\n"
+"\t%s/quilt.quiltrc if ~/.quiltrc does not exist). See the pdf\n"
"\tdocumentation for details about its possible contents. The\n"
"\tspecial value \\\"-\\\" causes quilt not to read any configuration\n"
"\tfile.\n"
"\n"
"--version\n"
-"\tPrint the version number and exit immediately."
+"\tPrint the version number and exit immediately.\\n"
msgstr ""
"\n"
"Общие опции:\n"
@@ -56,13 +56,13 @@ msgstr ""
"\n"
"--quiltrc файл\n"
"\tИспользовать указанный файл конфигурации вместо ~/.quiltrc (или\n"
-"\t@ETCDIR@/quilt.quiltrc, если ~/.quiltrc не существует). Смотрите\n"
+"\t%s/quilt.quiltrc, если ~/.quiltrc не существует). Смотрите\n"
"\tpdf-документацию, чтобы узнать о возможном содержимом.\n"
"\tСпециальное значение «-» запрещает quilt читать конфигурационные\n"
"\tфайлы.\n"
"\n"
"--version\n"
-"\tНапечатать номер версии и выйти из программы."
+"\tНапечатать номер версии и выйти из программы.\\n"
#: quilt/add.in:22
msgid "Usage: quilt add [-P patch] {file} ...\\n"
--
cgit v0.9.0.2
Copy Permalink