From ed1ddafa601763c23bec74d1f44f9968689b9d8f Mon Sep 17 00:00:00 2001 From: Jiang Xin Date: Tue, 5 Mar 2013 12:41:45 +0800 Subject: [PATCH 1/5] l10n: git.pot: v1.8.2 round 4 (1 changed) Generate po/git.pot from v1.8.2-rc2-4-g77995 for git v1.8.2 l10n round 4. Signed-off-by: Jiang Xin --- po/git.pot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/git.pot b/po/git.pot index a2ab9e82633..a826dcbf9ff 100644 --- a/po/git.pot +++ b/po/git.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2013-02-19 13:32+0800\n" +"POT-Creation-Date: 2013-03-05 12:36+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -122,7 +122,7 @@ msgstr "" #: attr.c:259 msgid "" -"Negative patterns are forbidden in git attributes\n" +"Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." msgstr "" From b6eab8bdaad0f1714ed1676799034c05bada2189 Mon Sep 17 00:00:00 2001 From: Peter Krefting Date: Tue, 5 Mar 2013 09:18:25 +0100 Subject: [PATCH 2/5] l10n: Update Swedish translation (2009t0f0u) Signed-off-by: Peter Krefting --- po/sv.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/sv.po b/po/sv.po index 9ac06c9700d..15f1aa82a08 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: git 1.8.2\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2013-02-19 13:32+0800\n" -"PO-Revision-Date: 2013-02-19 10:25+0100\n" +"POT-Creation-Date: 2013-03-05 12:36+0800\n" +"PO-Revision-Date: 2013-03-05 09:17+0100\n" "Last-Translator: Peter Krefting \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -127,10 +127,10 @@ msgstr "sökväg till kommandot git-upload-archive på fjärren" #: attr.c:259 msgid "" -"Negative patterns are forbidden in git attributes\n" +"Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." msgstr "" -"Negativa mönster är förbjudna i git-attribut\n" +"Negativa mönster ignoreras i git-attribut\n" "Använd '\\!' för att inleda med ett utropstecken." #: bundle.c:36 From 3fef5536a05735ebf6e4be4bb18920d16c84a7bd Mon Sep 17 00:00:00 2001 From: Tran Ngoc Quan Date: Wed, 6 Mar 2013 13:57:17 +0700 Subject: [PATCH 3/5] l10n: vi.po: Update translation (2009t0f0u) Signed-off-by: Tran Ngoc Quan --- po/vi.po | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/po/vi.po b/po/vi.po index f1ab8621ec6..7d9d05d6cb0 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,10 +6,10 @@ # msgid "" msgstr "" -"Project-Id-Version: git-v1.8.2-rc0-16-g20a59\n" +"Project-Id-Version: git-v1.8.2-rc2-4-g77995\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2013-02-19 13:32+0800\n" -"PO-Revision-Date: 2013-02-20 07:14+0700\n" +"POT-Creation-Date: 2013-03-05 12:36+0800\n" +"PO-Revision-Date: 2013-03-06 13:55+0700\n" "Last-Translator: Trần Ngọc Quân \n" "Language-Team: Vietnamese \n" "Language: vi\n" @@ -131,11 +131,11 @@ msgstr "đường dẫn đến lệnh git-upload-pack trên máy chủ" #: attr.c:259 msgid "" -"Negative patterns are forbidden in git attributes\n" +"Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." msgstr "" -"Các mẫu dạng phủ định bị cấm dùng trong các thuộc tính của git\n" -"Dùng “\\!” cho các chuỗi văn bản có dấu chấm than." +"Các mẫu dạng phủ định bị cấm dùng cho các thuộc tính của git\n" +"Dùng “\\!” cho các chuỗi văn bản có dấu chấm than dẫn đầu." #: bundle.c:36 #, c-format @@ -1269,7 +1269,7 @@ msgstr " (dùng \"git am --abort\" để phục hồi lại nhánh nguyên th #: wt-status.c:879 wt-status.c:896 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." -msgstr "Bạn hiện nay đang thực hiện việc rebase nhánh '%s' trên '%s'." +msgstr "Bạn hiện nay đang thực hiện việc rebase nhánh “%s” trên “%s”." #: wt-status.c:884 wt-status.c:901 msgid "You are currently rebasing." @@ -1298,7 +1298,7 @@ msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" "Bạn hiện nay đang thực hiện việc chia tách một lần chuyển giao (commit) " -"trong khi đang rebase nhánh '%s' trên '%s'." +"trong khi đang rebase nhánh “%s” trên “%s”." #: wt-status.c:913 msgid "You are currently splitting a commit during a rebase." @@ -1317,7 +1317,7 @@ msgstr "" msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Bạn hiện nay đang thực hiện việc sửa chữa một lần chuyển giao (commit) trong " -"khi đang rebase nhánh '%s' trên '%s'." +"khi đang rebase nhánh “%s” trên “%s”." #: wt-status.c:925 msgid "You are currently editing a commit during a rebase." @@ -1348,7 +1348,7 @@ msgstr " (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git msgid "You are currently bisecting branch '%s'." msgstr "" "Bạn hiện nay đang thực hiện thao tác di chuyển nửa bước (bisect) trên nhánh " -"'%s'." +"“%s”." #: wt-status.c:962 msgid "You are currently bisecting." From 79d0f373379d4b2e9bad16e3071bd3d16e7842a0 Mon Sep 17 00:00:00 2001 From: Ralf Thielow Date: Tue, 5 Mar 2013 06:32:41 +0100 Subject: [PATCH 4/5] l10n: de.po: translate 1 new message Translate 1 new message came from git.pot update in ed1ddaf (l10n: git.pot: v1.8.2 round 4 (1 changed)). Signed-off-by: Ralf Thielow --- po/de.po | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/po/de.po b/po/de.po index 4df53e44367..83c30b15876 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: git 1.8.2\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2013-02-19 13:32+0800\n" +"POT-Creation-Date: 2013-03-05 12:36+0800\n" "PO-Revision-Date: 2012-10-02 19:35+0200\n" "Last-Translator: Ralf Thielow \n" "Language-Team: German <>\n" @@ -127,10 +127,10 @@ msgstr "Pfad zum externen \"git-upload-archive\"-Programm" #: attr.c:259 msgid "" -"Negative patterns are forbidden in git attributes\n" +"Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." msgstr "" -"Verneinende Muster sind in Git-Attributen verboten.\n" +"Verneinende Muster werden in Git-Attributen ignoriert.\n" "Benutzen Sie '\\!' für führende Ausrufezeichen." #: bundle.c:36 @@ -1303,8 +1303,9 @@ msgstr " (alle Konflikte behoben: führen Sie \"git rebase --continue\" aus)" #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." -msgstr "Sie teilen gerade eine Version auf, während ein Neuaufbau von Zweig " -"'%s' auf '%s' im Gange ist." +msgstr "" +"Sie teilen gerade eine Version auf, während ein Neuaufbau von Zweig '%s' auf " +"'%s' im Gange ist." #: wt-status.c:913 msgid "You are currently splitting a commit during a rebase." @@ -1319,8 +1320,9 @@ msgstr "" #: wt-status.c:920 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." -msgstr "Sie editieren gerade eine Version während eines Neuaufbaus von Zweig " -"'%s' auf '%s'." +msgstr "" +"Sie editieren gerade eine Version während eines Neuaufbaus von Zweig '%s' " +"auf '%s'." #: wt-status.c:925 msgid "You are currently editing a commit during a rebase." From a7409dfbc1c0d7e0c62f704a03a61bf669e90ae9 Mon Sep 17 00:00:00 2001 From: Jiang Xin Date: Tue, 5 Mar 2013 13:09:55 +0800 Subject: [PATCH 5/5] l10n: zh_CN.po: translate 1 new message Translate 1 new message came from git.pot update in ed1ddaf (l10n: git.pot: v1.8.2 round 4 (1 changed)). Signed-off-by: Jiang Xin --- po/zh_CN.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 583ed3385df..c48ae10d785 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2013-02-19 13:32+0800\n" -"PO-Revision-Date: 2013-02-19 14:44+0800\n" +"POT-Creation-Date: 2013-03-05 12:36+0800\n" +"PO-Revision-Date: 2013-03-05 13:07+0800\n" "Last-Translator: Jiang Xin \n" "Language-Team: GitHub \n" "Language: zh_CN\n" @@ -130,10 +130,10 @@ msgstr "远程 git-upload-archive 命令的路径" #: attr.c:259 msgid "" -"Negative patterns are forbidden in git attributes\n" +"Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." msgstr "" -"在 git attributes 中不允许使用负值模版\n" +"负值模版在 git attributes 中被忽略\n" "当字符串确实要以感叹号开始时，使用 '\\!'。" #: bundle.c:36