rpm/quilt
SHA256
1
0
Fork 0
forked from pool/quilt
Code Pull Requests Activity
d2ff2bafb0
quilt/translation-fixes-01.patch

139 lines
5.2 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: Tue, 10 Feb 2015 09:22:06 +0000
Subject: Make gettext happy
Upstream: Committed (cd591fb1656cf9649e92cc5f49925bbc590aae84)
---
diff --git a/po/de.po b/po/de.po
index 5686299..e8190cf 100644
--- a/po/de.po
+++ b/po/de.po
@@ -211,9 +211,9 @@ msgid ""
"R] [-P patch] [--snapshot] [--diff=utility] [--no-timestamps] [--no-index] "
"[--sort] [--color[=always|auto|never]] [file ...]\\n"
msgstr ""
-"Aufruf: quilt diff [-p n|-p ab] [-u|-U num|-c|-C num] [--combine patch|-"
-"z] [-R] [-P patch] [--snapshot] [--diff=programm] [--no-timestamps] [--no-"
-"index] [--sort] [--color[=always|auto|never]] [datei ...]\\n"
+"Aufruf: quilt diff [-p n|-p ab] [-u|-U num|-c|-C num] [--combine patch|-z] [-"
+"R] [-P patch] [--snapshot] [--diff=programm] [--no-timestamps] [--no-index] "
+"[--sort] [--color[=always|auto|never]] [datei ...]\\n"
#: quilt/diff.in:28
msgid ""
@@ -496,8 +496,8 @@ msgid ""
"Usage: quilt graph [--all] [--reduce] [--lines[=num]] [--edge-labels=files] "
"[-T ps] [patch]\\n"
msgstr ""
-"Aufruf: quilt graph [--all] [--reduce] [--lines[=num]] [--edge-"
-"labels=files] [-T ps] [patch]\\n"
+"Aufruf: quilt graph [--all] [--reduce] [--lines[=num]] [--edge-labels=files] "
+"[-T ps] [patch]\\n"
#: quilt/graph.in:26
msgid ""
@@ -746,8 +746,8 @@ msgid ""
"[--sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--"
"subject ...] [--reply-to message] [first_patch [last_patch]]\\n"
msgstr ""
-"Aufruf: quilt mail {--mbox datei|--send} [-m text] [-M datei] [--prefix präfix] "
-"[--sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--"
+"Aufruf: quilt mail {--mbox datei|--send} [-m text] [-M datei] [--prefix "
+"präfix] [--sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--"
"subject ...] [--reply-to message] [first_patch [last_patch]]\\n"
#: quilt/mail.in:27
@@ -850,8 +850,8 @@ msgstr "Einleitungsnachricht bereits angegeben"
#: quilt/mail.in:310
msgid "Could not determine the envelope sender address. Please use --sender."
msgstr ""
-"Die Envelope-Adresse konnte nicht festgestellt werden. Bitte verwenden Sie "
-"--sender."
+"Die Envelope-Adresse konnte nicht festgestellt werden. Bitte verwenden Sie --"
+"sender."
#: quilt/mail.in:455
msgid "Unable to extract a subject header from %s\\n"
@@ -924,8 +924,8 @@ msgstr ""
msgid ""
"Cannot create patches with -p%s, please specify -p0, p1, or -pab instead\\n"
msgstr ""
-"Patches mit Level -p%s können nicht erzeugt werden, bitte stattdessen "
-"-p0, -p1 oder -pab angeben\\n"
+"Patches mit Level -p%s können nicht erzeugt werden, bitte stattdessen -p0, -"
+"p1 oder -pab angeben\\n"
#: quilt/new.in:89
msgid "QUILT_PATCHES(%s) must differ from QUILT_PC(%s)\\n"
@@ -1216,9 +1216,9 @@ msgid ""
"[--no-timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-"
"trailing-whitespace] [patch]\\n"
msgstr ""
-"Aufruf: quilt refresh [-p n|-p ab] [-u|-U num|-c|-C num] [-z[new_name]] "
-"[-f] [--no-timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--"
-"strip-trailing-whitespace] [patch]\\n"
+"Aufruf: quilt refresh [-p n|-p ab] [-u|-U num|-c|-C num] [-z[new_name]] [-f] "
+"[--no-timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-"
+"trailing-whitespace] [patch]\\n"
#: quilt/refresh.in:26
msgid ""
@@ -1355,8 +1355,8 @@ msgid ""
"Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n"
msgstr ""
"--strip-trailing-whitespace kann nicht für Patches verwendt werden, die "
-"Dateien enthalten, welche danach von anderen Patches weiter verändert "
-"werden.\\n"
+"Dateien enthalten, welche danach von anderen Patches weiter verändert werden."
+"\\n"
#: quilt/refresh.in:253 quilt/refresh.in:355
msgid "Nothing in patch %s\\n"
@@ -1526,16 +1526,16 @@ msgstr ""
#: quilt/scripts/patchfns.in:1018
msgid "You have to install '%s' (from package %s) to use 'quilt %s'\\n"
msgstr ""
-"Sie müssen '%s' (aus dem Paket %s) installieren, um 'quilt %s' nutzen zu"
-"können\\n"
+"Sie müssen '%s' (aus dem Paket %s) installieren, um 'quilt %s' nutzen "
+"zukönnen\\n"
#: quilt/scripts/patchfns.in:1138
msgid ""
"The working tree was created by an older version of quilt. Please run 'quilt "
"upgrade'.\\n"
msgstr ""
-"Das Arbeitsverzeichnis wurde von einer älteren quilt-Version erstellt. "
-"Bitte führen Sie \\`quilt upgrade' aus.\\n"
+"Das Arbeitsverzeichnis wurde von einer älteren quilt-Version erstellt. Bitte "
+"führen Sie \\`quilt upgrade' aus.\\n"
#: quilt/scripts/patchfns.in:1146
msgid ""
@@ -1647,8 +1647,7 @@ msgid ""
msgstr ""
"\n"
"Initialisiert einen Quellbaum aus einer rpm-spec-Datei oder einer quilt-\n"
-"series-Datei."
-"\n"
+"series-Datei.\n"
"-d\tOptionaler Pfadpräfix für den resultierenden Quellbaum.\n"
"\n"
"--sourcedir\n"
diff --git a/po/ja.po b/po/ja.po
index 13fb9f5..43bb657 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1476,7 +1476,9 @@ msgstr ""
#: quilt/scripts/patchfns.in:1018
msgid "You have to install '%s' (from package %s) to use 'quilt %s'\\n"
-msgstr "'%s' (%s パッケージ) がインストールされていないと、'quilt %s' は利用できません\\n"
+msgstr ""
+"'%s' (%s パッケージ) がインストールされていないと、'quilt %s' は利用できませ"
+"ん\\n"
#: quilt/scripts/patchfns.in:1138
msgid ""
--
cgit v0.9.0.2
Copy Permalink