From: Jiang Xin <worldhello.net@gmail.com>
Date: Tue, 15 May 2012 23:32:20 +0000 (+0800)
Subject: Merge branch 'maint' into master
X-Git-Tag: v1.7.11-rc0~22^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=154ca11d4b6b17fd03d0f70cb71e437708753261;p=thirdparty%2Fgit.git

Merge branch 'maint' into master

By Ralf Thielow(1) and Jiang Xin(1)
* maint:
  l10n: de.po: translate 3 new messages
  l10n: zh_CN.po: translate 3 new messages
---

154ca11d4b6b17fd03d0f70cb71e437708753261
diff --cc po/de.po
index 3f62c1ae80,591ba507d1..0edce30938
--- a/po/de.po
+++ b/po/de.po
@@@ -3697,118 -3660,119 +3680,118 @@@ msgstr "
  msgid "repo URL: '$repo' must be absolute or begin with ./|../"
  msgstr "repo URL: '$repo' muss absolut sein oder mit ./|../ beginnen"
  
- #: git-submodule.sh:266
- #,  sh-format
- msgid "'$sm_path' already exists in the index"
- msgstr "'$sm_path' existiert bereits in der Bereitstellung"
+ #: git-submodule.sh:265
+ #, sh-format
+ msgid "'$path' already exists in the index"
+ msgstr "'$path' existiert bereits in der Bereitstellung"
  
- #: git-submodule.sh:283
+ #: git-submodule.sh:282
  #, sh-format
 -msgid "'$path' already exists and is not a valid git repo"
 -msgstr "'$path' existiert bereits und ist kein gültiges Git-Projektarchiv"
 +msgid "'$sm_path' already exists and is not a valid git repo"
 +msgstr "'$sm_path' existiert bereits und ist kein gültiges Git-Projektarchiv"
  
- #: git-submodule.sh:297
+ #: git-submodule.sh:296
  #, sh-format
 -msgid "Unable to checkout submodule '$path'"
 -msgstr "Unfähig Unterprojekt '$path' auszuchecken"
 +msgid "Unable to checkout submodule '$sm_path'"
 +msgstr "Unfähig Unterprojekt '$sm_path' auszuchecken"
  
- #: git-submodule.sh:302
+ #: git-submodule.sh:301
  #, sh-format
 -msgid "Failed to add submodule '$path'"
 -msgstr "Hinzufügen von Unterprojekt '$path' fehlgeschlagen"
 +msgid "Failed to add submodule '$sm_path'"
 +msgstr "Hinzufügen von Unterprojekt '$sm_path' fehlgeschlagen"
  
- #: git-submodule.sh:307
+ #: git-submodule.sh:306
  #, sh-format
 -msgid "Failed to register submodule '$path'"
 -msgstr "Registrierung von Unterprojekt '$path' fehlgeschlagen"
 +msgid "Failed to register submodule '$sm_path'"
 +msgstr "Registierung von Unterprojekt '$sm_path' fehlgeschlagen"
  
- #: git-submodule.sh:349
+ #: git-submodule.sh:348
  #, sh-format
 -msgid "Entering '$prefix$path'"
 -msgstr "Betrete '$prefix$path'"
 +msgid "Entering '$prefix$sm_path'"
 +msgstr "Betrete '$prefix$sm_path'"
  
- #: git-submodule.sh:363
+ #: git-submodule.sh:360
  #, sh-format
 -msgid "Stopping at '$path'; script returned non-zero status."
 -msgstr "Stoppe bei '$path'; Skript gab nicht-Null Status zurück."
 +msgid "Stopping at '$sm_path'; script returned non-zero status."
 +msgstr "Stoppe bei '$sm_path'; Skript gab nicht-Null Status zurück."
  
- #: git-submodule.sh:405
+ #: git-submodule.sh:402
  #, sh-format
 -msgid "No url found for submodule path '$path' in .gitmodules"
 -msgstr "Keine URL für Unterprojekt-Pfad '$path' in .gitmodules gefunden"
 +msgid "No url found for submodule path '$sm_path' in .gitmodules"
 +msgstr "Keine URL für Unterprojekt-Pfad '$sm_path' in .gitmodules gefunden"
  
- #: git-submodule.sh:414
+ #: git-submodule.sh:411
  #, sh-format
 -msgid "Failed to register url for submodule path '$path'"
 -msgstr "Registrierung der URL für Unterprojekt-Pfad '$path' fehlgeschlagen"
 +msgid "Failed to register url for submodule path '$sm_path'"
 +msgstr "Registrierung der URL für Unterprojekt-Pfad '$sm_path' fehlgeschlagen"
  
- #: git-submodule.sh:422
+ #: git-submodule.sh:419
  #, sh-format
 -msgid "Failed to register update mode for submodule path '$path'"
 -msgstr ""
 -"Registrierung des Aktualisierungsmodus für Unterprojekt-Pfad '$path' "
 -"fehlgeschlagen"
 +msgid "Failed to register update mode for submodule path '$sm_path'"
 +msgstr "Registrierung des Aktualisierungsmodus für Unterprojekt-Pfad "
 +"'$sm_path' fehlgeschlagen"
  
- #: git-submodule.sh:424
+ #: git-submodule.sh:421
  #, sh-format
 -msgid "Submodule '$name' ($url) registered for path '$path'"
 -msgstr "Unterprojekt '$name' ($url) ist für Pfad '$path' registriert"
 +msgid "Submodule '$name' ($url) registered for path '$sm_path'"
 +msgstr "Unterprojekt '$name' ($url) ist für Pfad '$sm_path' registriert"
  
- #: git-submodule.sh:523
+ #: git-submodule.sh:520
  #, sh-format
  msgid ""
 -"Submodule path '$path' not initialized\n"
 +"Submodule path '$sm_path' not initialized\n"
  "Maybe you want to use 'update --init'?"
  msgstr ""
 -"Unterprojekt-Pfad '$path' ist nicht initialisiert\n"
 +"Unterprojekt-Pfad '$sm_path' ist nicht initialisiert\n"
  "Vielleicht möchtest du 'update --init' benutzen?"
  
- #: git-submodule.sh:536
+ #: git-submodule.sh:533
  #, sh-format
 -msgid "Unable to find current revision in submodule path '$path'"
 -msgstr "Konnte aktuelle Version in Unterprojekt-Pfad '$path' nicht finden"
 +msgid "Unable to find current revision in submodule path '$sm_path'"
 +msgstr "Konnte aktuelle Version in Unterprojekt-Pfad '$sm_path' nicht finden"
  
- #: git-submodule.sh:555
+ #: git-submodule.sh:552
  #, sh-format
 -msgid "Unable to fetch in submodule path '$path'"
 -msgstr "Konnte Unterprojekt-Pfad '$path' nicht anfordern"
 +msgid "Unable to fetch in submodule path '$sm_path'"
 +msgstr "Konnte in Unterprojekt-Pfad '$sm_path' nicht anfordern"
  
- #: git-submodule.sh:569
+ #: git-submodule.sh:566
  #, sh-format
 -msgid "Unable to rebase '$sha1' in submodule path '$path'"
 -msgstr "Neuaufbau von '$sha1' in Unterprojekt-Pfad '$path' nicht möglich"
 +msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
 +msgstr "Neuaufbau von '$sha1' in Unterprojekt-Pfad '$sm_path' nicht möglich"
  
- #: git-submodule.sh:570
+ #: git-submodule.sh:567
  #, sh-format
 -msgid "Submodule path '$path': rebased into '$sha1'"
 -msgstr "Unterprojekt-Pfad '$path': neu aufgebaut in '$sha1'"
 +msgid "Submodule path '$sm_path': rebased into '$sha1'"
 +msgstr "Unterprojekt-Pfad '$sm_path': neu aufgebaut in '$sha1'"
  
- #: git-submodule.sh:575
+ #: git-submodule.sh:572
  #, sh-format
 -msgid "Unable to merge '$sha1' in submodule path '$path'"
 +msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
  msgstr ""
 -"Zusammenführung von '$sha1' in Unterprojekt-Pfad '$path' fehlgeschlagen"
 +"Zusammenführung von '$sha1' in Unterprojekt-Pfad '$sm_path' fehlgeschlagen"
  
- #: git-submodule.sh:576
+ #: git-submodule.sh:573
  #, sh-format
 -msgid "Submodule path '$path': merged in '$sha1'"
 -msgstr "Unterprojekt-Pfad '$path': zusammengeführt in '$sha1'"
 +msgid "Submodule path '$sm_path': merged in '$sha1'"
 +msgstr "Unterprojekt-Pfad '$sm_path': zusammengeführt in '$sha1'"
  
- #: git-submodule.sh:581
+ #: git-submodule.sh:578
  #, sh-format
 -msgid "Unable to checkout '$sha1' in submodule path '$path'"
 -msgstr "Konnte '$sha1' in Unterprojekt-Pfad '$path' nicht auschecken."
 +msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
 +msgstr "Konnte '$sha1' in Unterprojekt-Pfad '$sm_path' nicht auschecken."
  
- #: git-submodule.sh:582
+ #: git-submodule.sh:579
  #, sh-format
 -msgid "Submodule path '$path': checked out '$sha1'"
 -msgstr "Unterprojekt-Pfad: '$path': '$sha1' ausgecheckt"
 +msgid "Submodule path '$sm_path': checked out '$sha1'"
 +msgstr "Unterprojekt-Pfad: '$sm_path': '$sha1' ausgecheckt"
  
- #: git-submodule.sh:604 git-submodule.sh:927
+ #: git-submodule.sh:601 git-submodule.sh:924
  #, sh-format
 -msgid "Failed to recurse into submodule path '$path'"
 -msgstr "Fehler bei Rekursion in Unterprojekt-Pfad '$path'"
 +msgid "Failed to recurse into submodule path '$sm_path'"
 +msgstr "Fehler bei Rekursion in Unterprojekt-Pfad '$sm_path'"
  
- #: git-submodule.sh:712
+ #: git-submodule.sh:709
  msgid "--"
  msgstr "--"
  
diff --cc po/zh_CN.po
index 701b693378,3894faf342..155c75e57e
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@@ -3606,116 -3584,116 +3603,116 @@@ msgstr "Gitdir '$a' 在子模组路径 
  msgid "repo URL: '$repo' must be absolute or begin with ./|../"
  msgstr "版本库URL：'$repo' 必须是绝对路径或以 ./|../ 起始"
  
- #: git-submodule.sh:266
+ #: git-submodule.sh:265
  #, sh-format
 -msgid "'$path' already exists in the index"
 -msgstr "'$path' 已经存在于索引中"
 +msgid "'$sm_path' already exists in the index"
 +msgstr "'$sm_path' 已经存在于索引中"
  
- #: git-submodule.sh:283
+ #: git-submodule.sh:282
  #, sh-format
 -msgid "'$path' already exists and is not a valid git repo"
 -msgstr "'$path' 已存在且不是一个有效的 git 版本库"
 +msgid "'$sm_path' already exists and is not a valid git repo"
 +msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
  
- #: git-submodule.sh:297
+ #: git-submodule.sh:296
  #, sh-format
 -msgid "Unable to checkout submodule '$path'"
 -msgstr "不能检出子模组 '$path'"
 +msgid "Unable to checkout submodule '$sm_path'"
 +msgstr "不能检出子模组 '$sm_path'"
  
- #: git-submodule.sh:302
+ #: git-submodule.sh:301
  #, sh-format
 -msgid "Failed to add submodule '$path'"
 -msgstr "无法添加子模组 '$path'"
 +msgid "Failed to add submodule '$sm_path'"
 +msgstr "无法添加子模组 '$sm_path'"
  
- #: git-submodule.sh:307
+ #: git-submodule.sh:306
  #, sh-format
 -msgid "Failed to register submodule '$path'"
 -msgstr "无法注册子模组 '$path'"
 +msgid "Failed to register submodule '$sm_path'"
 +msgstr "无法注册子模组 '$sm_path'"
  
- #: git-submodule.sh:349
+ #: git-submodule.sh:348
  #, sh-format
 -msgid "Entering '$prefix$path'"
 -msgstr "正在进入 '$prefix$path'"
 +msgid "Entering '$prefix$sm_path'"
 +msgstr "正在进入 '$prefix$sm_path'"
  
- #: git-submodule.sh:363
+ #: git-submodule.sh:360
  #, sh-format
 -msgid "Stopping at '$path'; script returned non-zero status."
 -msgstr "停止于 '$path'，脚本返回非零值。"
 +msgid "Stopping at '$sm_path'; script returned non-zero status."
 +msgstr "停止于 '$sm_path'，脚本返回非零值。"
  
- #: git-submodule.sh:405
+ #: git-submodule.sh:402
  #, sh-format
 -msgid "No url found for submodule path '$path' in .gitmodules"
 -msgstr "在 .gitmodules 中未找到子模组路径 '$path' 的 url"
 +msgid "No url found for submodule path '$sm_path' in .gitmodules"
 +msgstr "在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url"
  
- #: git-submodule.sh:414
+ #: git-submodule.sh:411
  #, sh-format
 -msgid "Failed to register url for submodule path '$path'"
 -msgstr "无法为子模组路径 '$path' 注册 url"
 +msgid "Failed to register url for submodule path '$sm_path'"
 +msgstr "无法为子模组路径 '$sm_path' 注册 url"
  
- #: git-submodule.sh:422
+ #: git-submodule.sh:419
  #, sh-format
 -msgid "Failed to register update mode for submodule path '$path'"
 -msgstr "无法为子模组路径 '$path' 注册更新模式"
 +msgid "Failed to register update mode for submodule path '$sm_path'"
 +msgstr "无法为子模组路径 '$sm_path' 注册更新模式"
  
- #: git-submodule.sh:424
+ #: git-submodule.sh:421
  #, sh-format
 -msgid "Submodule '$name' ($url) registered for path '$path'"
 -msgstr "子模组 '$name' ($url) 已为路径 '$path' 注册"
 +msgid "Submodule '$name' ($url) registered for path '$sm_path'"
 +msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
  
- #: git-submodule.sh:523
+ #: git-submodule.sh:520
  #, sh-format
  msgid ""
 -"Submodule path '$path' not initialized\n"
 +"Submodule path '$sm_path' not initialized\n"
  "Maybe you want to use 'update --init'?"
  msgstr ""
 -"子模组路径 '$path' 没有初始化\n"
 +"子模组路径 '$sm_path' 没有初始化\n"
  "也许您想用 'update --init'？"
  
- #: git-submodule.sh:536
+ #: git-submodule.sh:533
  #, sh-format
 -msgid "Unable to find current revision in submodule path '$path'"
 -msgstr "无法在子模组路径 '$path' 中找到当前版本"
 +msgid "Unable to find current revision in submodule path '$sm_path'"
 +msgstr "无法在子模组路径 '$sm_path' 中找到当前版本"
  
- #: git-submodule.sh:555
+ #: git-submodule.sh:552
  #, sh-format
 -msgid "Unable to fetch in submodule path '$path'"
 -msgstr "无法在子模组路径 '$path' 中获取"
 +msgid "Unable to fetch in submodule path '$sm_path'"
 +msgstr "无法在子模组路径 '$sm_path' 中获取"
  
- #: git-submodule.sh:569
+ #: git-submodule.sh:566
  #, sh-format
 -msgid "Unable to rebase '$sha1' in submodule path '$path'"
 -msgstr "无法在子模组路径 '$path' 中变基 '$sha1'"
 +msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
 +msgstr "无法在子模组路径 '$sm_path' 中变基 '$sha1'"
  
- #: git-submodule.sh:570
+ #: git-submodule.sh:567
  #, sh-format
 -msgid "Submodule path '$path': rebased into '$sha1'"
 -msgstr "子模组路径 '$path'：变基至 '$sha1'"
 +msgid "Submodule path '$sm_path': rebased into '$sha1'"
 +msgstr "子模组路径 '$sm_path'：变基至 '$sha1'"
  
- #: git-submodule.sh:575
+ #: git-submodule.sh:572
  #, sh-format
 -msgid "Unable to merge '$sha1' in submodule path '$path'"
 -msgstr "无法合并 '$sha1' 到子模组路径 '$path' 中"
 +msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
 +msgstr "无法合并 '$sha1' 到子模组路径 '$sm_path' 中"
  
- #: git-submodule.sh:576
+ #: git-submodule.sh:573
  #, sh-format
 -msgid "Submodule path '$path': merged in '$sha1'"
 -msgstr "子模组路径 '$path'：已合并入 '$sha1'"
 +msgid "Submodule path '$sm_path': merged in '$sha1'"
 +msgstr "子模组路径 '$sm_path'：已合并入 '$sha1'"
  
- #: git-submodule.sh:581
+ #: git-submodule.sh:578
  #, sh-format
 -msgid "Unable to checkout '$sha1' in submodule path '$path'"
 -msgstr "无法在子模组路径 '$path' 中检出 '$sha1'"
 +msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
 +msgstr "无法在子模组路径 '$sm_path' 中检出 '$sha1'"
  
- #: git-submodule.sh:582
+ #: git-submodule.sh:579
  #, sh-format
 -msgid "Submodule path '$path': checked out '$sha1'"
 -msgstr "子模组路径 '$path'：检出 '$sha1'"
 +msgid "Submodule path '$sm_path': checked out '$sha1'"
 +msgstr "子模组路径 '$sm_path'：检出 '$sha1'"
  
- #: git-submodule.sh:604 git-submodule.sh:927
+ #: git-submodule.sh:601 git-submodule.sh:924
  #, sh-format
 -msgid "Failed to recurse into submodule path '$path'"
 -msgstr "无法递归进子模组路径 '$path'"
 +msgid "Failed to recurse into submodule path '$sm_path'"
 +msgstr "无法递归进子模组路径 '$sm_path'"
  
- #: git-submodule.sh:712
+ #: git-submodule.sh:709
  msgid "--"
  msgstr "--"