microsoft
/
git
зеркало из https://github.com/microsoft/git.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge branch 'maint' of git://github.com/git-l10n/git-po 

* 'maint' of git://github.com/git-l10n/git-po:
  l10n: de.po: translate 108 new messages
  l10n: zh_CN: review for git 2.18.0
  l10n: sv.po: Update Swedish translation(3608t0f0u)
This commit is contained in:
Jiang Xin 2018-08-21 08:22:04 +08:00
Родитель 7e8bfb0412 1be2214f4b
Коммит 6b7719ee3f
3 изменённых файлов: 2904 добавлений и 2333 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

5183
po/de.po
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

38
po/sv.po
Просмотреть файл

@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: git 2.18.0\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
"POT-Creation-Date: 2018-06-08 09:03+0800\n"
"PO-Revision-Date: 2018-06-08 22:53+0100\n"
"POT-Creation-Date: 2018-06-16 22:06+0800\n"
"PO-Revision-Date: 2018-06-26 13:28+0100\n"
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"Language: sv\n"
@ -1278,7 +1278,7 @@ msgstr ""
"Slå av detta meddelande genom att skriva\n"
"\"git config advice.graftFileDeprecated false\""
#: commit.c:1537
#: commit.c:1540
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
@ -2335,8 +2335,8 @@ msgstr "Snabbspolar undermodulen %s till följande incheckning:"
#: merge-recursive.c:1211 merge-recursive.c:1223
#, c-format
msgid "Fast-forwarding submodule %s to %s"
msgstr "Snabbspolar undermodulen %s till %s"
msgid "Fast-forwarding submodule %s"
msgstr "Snabbspolar undermodulen %s"
#: merge-recursive.c:1245
#, c-format
@ -9383,7 +9383,7 @@ msgstr "felaktigt antal trådar angivet (%d) för %s"
#. variable for tweaking threads, currently
#. grep.threads
#.
#: builtin/grep.c:293 builtin/index-pack.c:1531 builtin/index-pack.c:1723
#: builtin/grep.c:293 builtin/index-pack.c:1535 builtin/index-pack.c:1727
#, c-format
msgid "no threads support, ignoring %s"
msgstr "trådstöd saknas, ignorerar %s"
@ -9592,7 +9592,7 @@ msgstr "--no-index och --untracked kan inte användas med revisioner"
msgid "unable to resolve revision: %s"
msgstr "kan inte slå upp revision: %s"
#: builtin/grep.c:1036 builtin/index-pack.c:1527
#: builtin/grep.c:1036 builtin/index-pack.c:1531
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "felaktigt antal trådar angivet (%d)"
@ -10001,58 +10001,58 @@ msgstr "kan inte spara paketfil"
msgid "cannot store index file"
msgstr "kan inte spara indexfil"
#: builtin/index-pack.c:1521
#: builtin/index-pack.c:1525
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "felaktig pack.indexversion=%<PRIu32>"
#: builtin/index-pack.c:1590
#: builtin/index-pack.c:1594
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Kan inte öppna befintlig paketfil \"%s\""
#: builtin/index-pack.c:1592
#: builtin/index-pack.c:1596
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Kan inte öppna befintlig paket-idx-fil för \"%s\""
#: builtin/index-pack.c:1640
#: builtin/index-pack.c:1644
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "icke-delta: %d objekt"
msgstr[1] "icke-delta: %d objekt"
#: builtin/index-pack.c:1647
#: builtin/index-pack.c:1651
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "kedjelängd = %d: %lu objekt"
msgstr[1] "kedjelängd = %d: %lu objekt"
#: builtin/index-pack.c:1684
#: builtin/index-pack.c:1688
msgid "Cannot come back to cwd"
msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)"
#: builtin/index-pack.c:1735 builtin/index-pack.c:1738
#: builtin/index-pack.c:1754 builtin/index-pack.c:1758
#: builtin/index-pack.c:1739 builtin/index-pack.c:1742
#: builtin/index-pack.c:1758 builtin/index-pack.c:1762
#, c-format
msgid "bad %s"
msgstr "felaktig %s"
#: builtin/index-pack.c:1774
#: builtin/index-pack.c:1778
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin kan inte användas med --stdin"
#: builtin/index-pack.c:1776
#: builtin/index-pack.c:1780
msgid "--stdin requires a git repository"
msgstr "--stdin kräver ett git-arkiv"
#: builtin/index-pack.c:1782
#: builtin/index-pack.c:1786
msgid "--verify with no packfile name given"
msgstr "--verify angavs utan paketfilnamn"
#: builtin/index-pack.c:1832 builtin/unpack-objects.c:578
#: builtin/index-pack.c:1836 builtin/unpack-objects.c:578
msgid "fsck error in pack objects"
msgstr "fsck-fel i packat objekt"

16
po/zh_CN.po
Просмотреть файл

@ -139,7 +139,7 @@ msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
"POT-Creation-Date: 2018-06-16 22:06+0800\n"
"PO-Revision-Date: 2018-06-18 00:28+0800\n"
"PO-Revision-Date: 2018-07-02 10:22+0800\n"
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
"Language: zh_CN\n"
@ -2324,12 +2324,12 @@ msgstr "（坏提交）\n"
#: merge-recursive.c:320
#, c-format
msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr "addinfo_cache 对路径 '%s' 执行失败，合并终止。"
msgstr "add_cacheinfo 对路径 '%s' 执行失败，合并终止。"
#: merge-recursive.c:328
#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr "addinfo_cache 无法刷新路径 '%s'，合并终止。"
msgstr "add_cacheinfo 无法刷新路径 '%s'，合并终止。"
#: merge-recursive.c:410
msgid "error building trees"
@ -2541,12 +2541,12 @@ msgstr ""
#: merge-recursive.c:1733
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "而是重命名 %s 至 %s，以及 %s 至 %s"
msgstr "代之以重命名 %s 至 %s，以及 %s 至 %s"
#: merge-recursive.c:1745
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr "拒绝丢失未跟踪文件 '%s'，即使它妨碍了。"
msgstr "拒绝在 '%s' 处失去未跟踪文件，即使它存在于重命名中。"
#: merge-recursive.c:1951
#, c-format
@ -2554,9 +2554,7 @@ msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
"directory %s was renamed to multiple other directories, with no destination "
"getting a majority of the files."
msgstr ""
"冲突（分割的目录重命名）：不清楚 %s 应该放在哪里，因为目录 %s 被重命名到多个"
"其它目录，没有一个目录包含主要的文件。"
msgstr "冲突（分割的目录重命名）：不清楚 %s 应该放在哪里，因为目录 %s 被重命名到多个其它目录，没有目录包含大部分文件。"
#: merge-recursive.c:1983
#, c-format
@ -9321,7 +9319,7 @@ msgstr "无法解析 gc.logexpiry 的值 %s"
#: builtin/gc.c:539
#, c-format
msgid "failed to parse prune expiry value %s"
msgstr "无法解析 gc.logexpiry 的值 %s"
msgstr "无法解析清除期限值 %s"
#: builtin/gc.c:559
#, c-format