Skip to content

Commit cde47b9

Browse files
gitstergitster
committed
Merge git://github.com/git-l10n/git-po
* 'master' of git://github.com/git-l10n/git-po: l10n: zh_CN.po: translate 1 new message l10n: de.po: translate 1 new message l10n: vi.po: Update translation (2009t0f0u) l10n: Update Swedish translation (2009t0f0u) l10n: git.pot: v1.8.2 round 4 (1 changed)
2 parents c5443b2 + a7409df commit cde47b9

5 files changed

Lines changed: 29 additions & 27 deletions

File tree

‎po/de.po‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: git 1.8.2\n"
99
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
10-
"POT-Creation-Date: 2013-02-19 13:32+0800\n"
10+
"POT-Creation-Date: 2013-03-05 12:36+0800\n"
1111
"PO-Revision-Date: 2012-10-02 19:35+0200\n"
1212
"Last-Translator: Ralf Thielow <ralf.thielow@gmail.com>\n"
1313
"Language-Team: German <>\n"
@@ -127,10 +127,10 @@ msgstr "Pfad zum externen \"git-upload-archive\"-Programm"
127127

128128
#: attr.c:259
129129
msgid ""
130-
"Negative patterns are forbidden in git attributes\n"
130+
"Negative patterns are ignored in git attributes\n"
131131
"Use '\\!' for literal leading exclamation."
132132
msgstr ""
133-
"Verneinende Muster sind in Git-Attributen verboten.\n"
133+
"Verneinende Muster werden in Git-Attributen ignoriert.\n"
134134
"Benutzen Sie '\\!' für führende Ausrufezeichen."
135135

136136
#: bundle.c:36
@@ -1303,8 +1303,9 @@ msgstr " (alle Konflikte behoben: führen Sie \"git rebase --continue\" aus)"
13031303
#, c-format
13041304
msgid ""
13051305
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
1306-
msgstr "Sie teilen gerade eine Version auf, während ein Neuaufbau von Zweig "
1307-
"'%s' auf '%s' im Gange ist."
1306+
msgstr ""
1307+
"Sie teilen gerade eine Version auf, während ein Neuaufbau von Zweig '%s' auf "
1308+
"'%s' im Gange ist."
13081309

13091310
#: wt-status.c:913
13101311
msgid "You are currently splitting a commit during a rebase."
@@ -1319,8 +1320,9 @@ msgstr ""
13191320
#: wt-status.c:920
13201321
#, c-format
13211322
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
1322-
msgstr "Sie editieren gerade eine Version während eines Neuaufbaus von Zweig "
1323-
"'%s' auf '%s'."
1323+
msgstr ""
1324+
"Sie editieren gerade eine Version während eines Neuaufbaus von Zweig '%s' "
1325+
"auf '%s'."
13241326

13251327
#: wt-status.c:925
13261328
msgid "You are currently editing a commit during a rebase."

‎po/git.pot‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
11-
"POT-Creation-Date: 2013-02-19 13:32+0800\n"
11+
"POT-Creation-Date: 2013-03-05 12:36+0800\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -122,7 +122,7 @@ msgstr ""
122122

123123
#: attr.c:259
124124
msgid ""
125-
"Negative patterns are forbidden in git attributes\n"
125+
"Negative patterns are ignored in git attributes\n"
126126
"Use '\\!' for literal leading exclamation."
127127
msgstr ""
128128

‎po/sv.po‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: git 1.8.2\n"
99
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
10-
"POT-Creation-Date: 2013-02-19 13:32+0800\n"
11-
"PO-Revision-Date: 2013-02-19 10:25+0100\n"
10+
"POT-Creation-Date: 2013-03-05 12:36+0800\n"
11+
"PO-Revision-Date: 2013-03-05 09:17+0100\n"
1212
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
1313
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
1414
"Language: sv\n"
@@ -127,10 +127,10 @@ msgstr "sökväg till kommandot git-upload-archive på fjärren"
127127

128128
#: attr.c:259
129129
msgid ""
130-
"Negative patterns are forbidden in git attributes\n"
130+
"Negative patterns are ignored in git attributes\n"
131131
"Use '\\!' for literal leading exclamation."
132132
msgstr ""
133-
"Negativa mönster är förbjudna i git-attribut\n"
133+
"Negativa mönster ignoreras i git-attribut\n"
134134
"Använd '\\!' för att inleda med ett utropstecken."
135135

136136
#: bundle.c:36

‎po/vi.po‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
#
77
msgid ""
88
msgstr ""
9-
"Project-Id-Version: git-v1.8.2-rc0-16-g20a59\n"
9+
"Project-Id-Version: git-v1.8.2-rc2-4-g77995\n"
1010
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
11-
"POT-Creation-Date: 2013-02-19 13:32+0800\n"
12-
"PO-Revision-Date: 2013-02-20 07:14+0700\n"
11+
"POT-Creation-Date: 2013-03-05 12:36+0800\n"
12+
"PO-Revision-Date: 2013-03-06 13:55+0700\n"
1313
"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
1414
"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
1515
"Language: vi\n"
@@ -131,11 +131,11 @@ msgstr "đường dẫn đến lệnh git-upload-pack trên máy chủ"
131131

132132
#: attr.c:259
133133
msgid ""
134-
"Negative patterns are forbidden in git attributes\n"
134+
"Negative patterns are ignored in git attributes\n"
135135
"Use '\\!' for literal leading exclamation."
136136
msgstr ""
137-
"Các mẫu dạng phủ định bị cấm dùng trong các thuộc tính của git\n"
138-
"Dùng “\\!” cho các chuỗi văn bản có dấu chấm than."
137+
"Các mẫu dạng phủ định bị cấm dùng cho các thuộc tính của git\n"
138+
"Dùng “\\!” cho các chuỗi văn bản có dấu chấm than dẫn đầu."
139139

140140
#: bundle.c:36
141141
#, c-format
@@ -1269,7 +1269,7 @@ msgstr " (dùng \"git am --abort\" để phục hồi lại nhánh nguyên th
12691269
#: wt-status.c:879 wt-status.c:896
12701270
#, c-format
12711271
msgid "You are currently rebasing branch '%s' on '%s'."
1272-
msgstr "Bạn hiện nay đang thực hiện việc rebase nhánh '%s' trên '%s'."
1272+
msgstr "Bạn hiện nay đang thực hiện việc rebase nhánh “%s” trên “%s”."
12731273

12741274
#: wt-status.c:884 wt-status.c:901
12751275
msgid "You are currently rebasing."
@@ -1298,7 +1298,7 @@ msgid ""
12981298
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
12991299
msgstr ""
13001300
"Bạn hiện nay đang thực hiện việc chia tách một lần chuyển giao (commit) "
1301-
"trong khi đang rebase nhánh '%s' trên '%s'."
1301+
"trong khi đang rebase nhánh “%s” trên “%s”."
13021302

13031303
#: wt-status.c:913
13041304
msgid "You are currently splitting a commit during a rebase."
@@ -1317,7 +1317,7 @@ msgstr ""
13171317
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
13181318
msgstr ""
13191319
"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 "
1320-
"khi đang rebase nhánh '%s' trên '%s'."
1320+
"khi đang rebase nhánh “%s” trên “%s”."
13211321

13221322
#: wt-status.c:925
13231323
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
13481348
msgid "You are currently bisecting branch '%s'."
13491349
msgstr ""
13501350
"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 "
1351-
"'%s'."
1351+
"“%s”."
13521352

13531353
#: wt-status.c:962
13541354
msgid "You are currently bisecting."

‎po/zh_CN.po‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ msgid ""
1212
msgstr ""
1313
"Project-Id-Version: Git\n"
1414
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
15-
"POT-Creation-Date: 2013-02-19 13:32+0800\n"
16-
"PO-Revision-Date: 2013-02-19 14:44+0800\n"
15+
"POT-Creation-Date: 2013-03-05 12:36+0800\n"
16+
"PO-Revision-Date: 2013-03-05 13:07+0800\n"
1717
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
1818
"Language-Team: GitHub <https://github.com/gotgit/git/>\n"
1919
"Language: zh_CN\n"
@@ -130,10 +130,10 @@ msgstr "远程 git-upload-archive 命令的路径"
130130

131131
#: attr.c:259
132132
msgid ""
133-
"Negative patterns are forbidden in git attributes\n"
133+
"Negative patterns are ignored in git attributes\n"
134134
"Use '\\!' for literal leading exclamation."
135135
msgstr ""
136-
"在 git attributes 中不允许使用负值模版\n"
136+
"负值模版在 git attributes 中被忽略\n"
137137
"当字符串确实要以感叹号开始时，使用 '\\!'。"
138138

139139
#: bundle.c:36

0 commit comments

Comments
 (0)