mirror of
https://github.com/git/git
synced 2024-08-28 12:09:19 +00:00
l10n for Git 2.14.0 round 2
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJZgRf5AAoJEMek6Rt1RHooTBoQAI9sepb2JHPV0K/twKAFpMhj bXML7cE0Duf9J/30UUdAymEX5ao6NSfRtQz3qzP9l+JgrzKJ4C2QQ0mMo/8t3F3w hDyOaDmd3NvDl6QTqRFEY/OtLbDCXYt8K8XfzqPgIWmQIILxCjsESfL7M5yodscG qakFYjevvBtRsdXygwEhSGHZVgJcqJPUdW2mgEXpPayRXAceSpmhCKZB5GwMim37 1cM96nudMI2AfwfDd9BMd1uyn7p5Hop2sEDIwqu/ZJPvtKMYJzBgAT0iQipLEBHw hbBQLIuyS8MXKtU7J6eMOs0c3gdYSVxK+dX6X/X7JRRdMr7FmHc1mHoI3iv0XsUD AAMpGO08Fcf9fTL2XYvffpzKXPdT2m1aPw77E728ssLqON2mIy5OjO0lGO3BlBOq VNWxE9Jj8FbyVpEuOH1lH2VxA8KU6p6EbpukqGqoRFGZVvwIJhWyINIOUk7aiLc3 j7JBFhdQNJXTuqmuS1VKrkPqYd5cz95uYRWWt/OlFHIzQA7iWXsJQIwj9xCo1Weu H6c9ekGjguo6892hgF7tuQ8svQhUhH8X/dU2X/IM+KL+jfZZ4sr+lD+v3iuMTNOZ 9YmL5M9SCadFUguHVFNOdWUwhW9TH/goDMBKd6Gq6hN8Y9RlJBem7kRwkc/OKh/L 1VGVpjUHDSd/Sog20gcT =RMsi -----END PGP SIGNATURE----- Merge tag 'l10n-2.14.0-rnd2' of git://github.com/git-l10n/git-po l10n for Git 2.14.0 round 2 * tag 'l10n-2.14.0-rnd2' of git://github.com/git-l10n/git-po: l10n: zh_CN: review for git v2.14.0 l10n l10n: ko.po: Update Korean translation l10n: zh_CN: for git v2.14.0 l10n round 2 l10n: de.po: various fixes in German translation l10n: ru.po: update Russian translation l10n: fr.po v2.14.0 rnd 2 l10n: fr.po Fix some french typos l10n: fr.po Fix typo l10n: fr.po Fix some translations l10n: de.po: update German translation l10n: vi.po (3213t): Updated 9 new strings l10n: Update Catalan translation l10n: bg.po: Updated Bulgarian translation (3213t)
This commit is contained in:
commit
384a8b271c
5
po/TEAMS
5
po/TEAMS
|
@ -58,5 +58,6 @@ Members: Nguyễn Thái Ngọc Duy <pclouds AT gmail.com>
|
|||
|
||||
Language: zh_CN (Simplified Chinese)
|
||||
Repository: https://github.com/jiangxin/git/
|
||||
Leader: Jiang Xin <worldhello.net@gmail.com>
|
||||
Members: Ray Chen <oldsharp@gmail.com>
|
||||
Leader: Jiang Xin <worldhello.net AT gmail.com>
|
||||
Members: Ray Chen <oldsharp AT gmail.com>
|
||||
依云 <lilydjwg AT gmail.com>
|
||||
|
|
84
po/bg.po
84
po/bg.po
|
@ -94,8 +94,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: git master\n"
|
||||
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
||||
"POT-Creation-Date: 2017-07-15 11:57+0800\n"
|
||||
"PO-Revision-Date: 2017-07-14 10:54+0200\n"
|
||||
"POT-Creation-Date: 2017-07-24 21:54+0800\n"
|
||||
"PO-Revision-Date: 2017-07-24 17:26+0200\n"
|
||||
"Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
|
||||
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
|
||||
"Language: bg\n"
|
||||
|
@ -1585,19 +1585,69 @@ msgstr ""
|
|||
msgid "in the future"
|
||||
msgstr "в бъдещето"
|
||||
|
||||
#: date.c:122 date.c:129 date.c:136 date.c:143 date.c:149 date.c:156 date.c:167
|
||||
#: date.c:175 date.c:180
|
||||
msgid "%"
|
||||
msgid_plural "%"
|
||||
msgstr[0] "%"
|
||||
msgstr[1] "%"
|
||||
#: date.c:122
|
||||
#, c-format
|
||||
msgid "%<PRIuMAX> second ago"
|
||||
msgid_plural "%<PRIuMAX> seconds ago"
|
||||
msgstr[0] "преди %<PRIuMAX> секунда"
|
||||
msgstr[1] "преди %<PRIuMAX> секунди"
|
||||
|
||||
#: date.c:129
|
||||
#, c-format
|
||||
msgid "%<PRIuMAX> minute ago"
|
||||
msgid_plural "%<PRIuMAX> minutes ago"
|
||||
msgstr[0] "преди %<PRIuMAX> минута"
|
||||
msgstr[1] "преди %<PRIuMAX> минути"
|
||||
|
||||
#: date.c:136
|
||||
#, c-format
|
||||
msgid "%<PRIuMAX> hour ago"
|
||||
msgid_plural "%<PRIuMAX> hours ago"
|
||||
msgstr[0] "преди %<PRIuMAX> час"
|
||||
msgstr[1] "преди %<PRIuMAX> часа"
|
||||
|
||||
#: date.c:143
|
||||
#, c-format
|
||||
msgid "%<PRIuMAX> day ago"
|
||||
msgid_plural "%<PRIuMAX> days ago"
|
||||
msgstr[0] "преди %<PRIuMAX> ден"
|
||||
msgstr[1] "преди %<PRIuMAX> дена"
|
||||
|
||||
#: date.c:149
|
||||
#, c-format
|
||||
msgid "%<PRIuMAX> week ago"
|
||||
msgid_plural "%<PRIuMAX> weeks ago"
|
||||
msgstr[0] "преди %<PRIuMAX> седмица"
|
||||
msgstr[1] "преди %<PRIuMAX> седмици"
|
||||
|
||||
#: date.c:156
|
||||
#, c-format
|
||||
msgid "%<PRIuMAX> month ago"
|
||||
msgid_plural "%<PRIuMAX> months ago"
|
||||
msgstr[0] "преди %<PRIuMAX> месец"
|
||||
msgstr[1] "преди %<PRIuMAX> месеца"
|
||||
|
||||
#: date.c:167
|
||||
#, c-format
|
||||
msgid "%<PRIuMAX> year"
|
||||
msgid_plural "%<PRIuMAX> years"
|
||||
msgstr[0] "%<PRIuMAX> година"
|
||||
msgstr[1] "%<PRIuMAX> години"
|
||||
|
||||
#. TRANSLATORS: "%s" is "<n> years"
|
||||
#: date.c:170
|
||||
msgid "%s, %"
|
||||
msgid_plural "%s, %"
|
||||
msgstr[0] "%s, %"
|
||||
msgstr[1] "%s, %"
|
||||
#, c-format
|
||||
msgid "%s, %<PRIuMAX> month ago"
|
||||
msgid_plural "%s, %<PRIuMAX> months ago"
|
||||
msgstr[0] "преди %s и %<PRIuMAX> месец"
|
||||
msgstr[1] "преди %s и %<PRIuMAX> месеца"
|
||||
|
||||
#: date.c:175 date.c:180
|
||||
#, c-format
|
||||
msgid "%<PRIuMAX> year ago"
|
||||
msgid_plural "%<PRIuMAX> years ago"
|
||||
msgstr[0] "преди %<PRIuMAX> година"
|
||||
msgstr[1] "преди %<PRIuMAX> години"
|
||||
|
||||
#: diffcore-order.c:24
|
||||
#, c-format
|
||||
|
@ -1776,7 +1826,7 @@ msgstr "неправилно подаване: „%s“"
|
|||
msgid "giving up"
|
||||
msgstr "преустановяване"
|
||||
|
||||
#: fetch-pack.c:533 progress.c:235
|
||||
#: fetch-pack.c:533 progress.c:237
|
||||
msgid "done"
|
||||
msgstr "действието завърши"
|
||||
|
||||
|
@ -3196,12 +3246,12 @@ msgstr "съобщението за подаване към „%s“ не мож
|
|||
#: sequencer.c:879
|
||||
#, c-format
|
||||
msgid "This is the commit message #%d:"
|
||||
msgstr "Това е съобщение при подаване №${%d}:"
|
||||
msgstr "Това е съобщение при подаване №%d:"
|
||||
|
||||
#: sequencer.c:884
|
||||
#, c-format
|
||||
msgid "The commit message #%d will be skipped:"
|
||||
msgstr "Съобщение при подаване №${%d} ще бъде прескочено:"
|
||||
msgstr "Съобщение при подаване №%d ще бъде прескочено:"
|
||||
|
||||
#: sequencer.c:889
|
||||
#, c-format
|
||||
|
@ -8664,7 +8714,7 @@ msgstr ""
|
|||
"Погледнете ръководството за повече информация как да изпълните „git help "
|
||||
"gc“.\n"
|
||||
|
||||
#: builtin/gc.c:432
|
||||
#: builtin/gc.c:436
|
||||
#, c-format
|
||||
msgid ""
|
||||
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
|
||||
|
@ -8673,7 +8723,7 @@ msgstr ""
|
|||
"процеса: %<PRIuMAX> (ако сте сигурни, че това не е вярно, това използвайте\n"
|
||||
"опцията „--force“)"
|
||||
|
||||
#: builtin/gc.c:476
|
||||
#: builtin/gc.c:480
|
||||
msgid ""
|
||||
"There are too many unreachable loose objects; run 'git prune' to remove them."
|
||||
msgstr ""
|
||||
|
|
69
po/ko.po
69
po/ko.po
|
@ -58,8 +58,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: git\n"
|
||||
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
||||
"POT-Creation-Date: 2017-07-15 11:57+0800\n"
|
||||
"PO-Revision-Date: 2017-07-19 17:11+0900\n"
|
||||
"POT-Creation-Date: 2017-07-24 21:54+0800\n"
|
||||
"PO-Revision-Date: 2017-08-01 12:26+0900\n"
|
||||
"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
|
||||
"Language-Team: Git Korean translation <http://github.com/changwoo/git-l10n-"
|
||||
"ko>\n"
|
||||
|
@ -1505,17 +1505,60 @@ msgstr "%s에서 LF는 CRLF로 바뀝니다."
|
|||
msgid "in the future"
|
||||
msgstr "미래에"
|
||||
|
||||
#: date.c:122 date.c:129 date.c:136 date.c:143 date.c:149 date.c:156 date.c:167
|
||||
#: date.c:175 date.c:180
|
||||
msgid "%"
|
||||
msgid_plural "%"
|
||||
msgstr[0] "%"
|
||||
#: date.c:122
|
||||
#, c-format
|
||||
msgid "%<PRIuMAX> second ago"
|
||||
msgid_plural "%<PRIuMAX> seconds ago"
|
||||
msgstr[0] "%<PRIuMAX>초 전"
|
||||
|
||||
#: date.c:129
|
||||
#, c-format
|
||||
msgid "%<PRIuMAX> minute ago"
|
||||
msgid_plural "%<PRIuMAX> minutes ago"
|
||||
msgstr[0] "%<PRIuMAX>분 전"
|
||||
|
||||
#: date.c:136
|
||||
#, c-format
|
||||
msgid "%<PRIuMAX> hour ago"
|
||||
msgid_plural "%<PRIuMAX> hours ago"
|
||||
msgstr[0] "%<PRIuMAX>시간 전"
|
||||
|
||||
#: date.c:143
|
||||
#, c-format
|
||||
msgid "%<PRIuMAX> day ago"
|
||||
msgid_plural "%<PRIuMAX> days ago"
|
||||
msgstr[0] "%<PRIuMAX>일 전"
|
||||
|
||||
#: date.c:149
|
||||
#, c-format
|
||||
msgid "%<PRIuMAX> week ago"
|
||||
msgid_plural "%<PRIuMAX> weeks ago"
|
||||
msgstr[0] "%<PRIuMAX>주 전"
|
||||
|
||||
#: date.c:156
|
||||
#, c-format
|
||||
msgid "%<PRIuMAX> month ago"
|
||||
msgid_plural "%<PRIuMAX> months ago"
|
||||
msgstr[0] "%<PRIuMAX>달 전"
|
||||
|
||||
#: date.c:167
|
||||
#, c-format
|
||||
msgid "%<PRIuMAX> year"
|
||||
msgid_plural "%<PRIuMAX> years"
|
||||
msgstr[0] "%<PRIuMAX>년"
|
||||
|
||||
#. TRANSLATORS: "%s" is "<n> years"
|
||||
#: date.c:170
|
||||
msgid "%s, %"
|
||||
msgid_plural "%s, %"
|
||||
msgstr[0] "%s, %"
|
||||
#, c-format
|
||||
msgid "%s, %<PRIuMAX> month ago"
|
||||
msgid_plural "%s, %<PRIuMAX> months ago"
|
||||
msgstr[0] "%s, %<PRIuMAX>달 전"
|
||||
|
||||
#: date.c:175 date.c:180
|
||||
#, c-format
|
||||
msgid "%<PRIuMAX> year ago"
|
||||
msgid_plural "%<PRIuMAX> years ago"
|
||||
msgstr[0] "%<PRIuMAX>년 전"
|
||||
|
||||
#: diffcore-order.c:24
|
||||
#, c-format
|
||||
|
@ -1686,7 +1729,7 @@ msgstr "잘못된 커밋 %s"
|
|||
msgid "giving up"
|
||||
msgstr "포기함"
|
||||
|
||||
#: fetch-pack.c:533 progress.c:235
|
||||
#: fetch-pack.c:533 progress.c:237
|
||||
msgid "done"
|
||||
msgstr "완료"
|
||||
|
||||
|
@ -8363,7 +8406,7 @@ msgstr "최적 성능을 위해 자동으로 저장소의 묶음을 만듭니다
|
|||
msgid "See \"git help gc\" for manual housekeeping.\n"
|
||||
msgstr "수동 관리 작업은 \"git help gc\" 내용을 참고하십시오.\n"
|
||||
|
||||
#: builtin/gc.c:432
|
||||
#: builtin/gc.c:436
|
||||
#, c-format
|
||||
msgid ""
|
||||
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
|
||||
|
@ -8371,7 +8414,7 @@ msgstr ""
|
|||
"가비지컬렉터가 이미 '%s' 컴퓨터에서 %<PRIuMAX> PID로 실행 중입니다 (아니면 --"
|
||||
"force를 사용하십시오)"
|
||||
|
||||
#: builtin/gc.c:476
|
||||
#: builtin/gc.c:480
|
||||
msgid ""
|
||||
"There are too many unreachable loose objects; run 'git prune' to remove them."
|
||||
msgstr ""
|
||||
|
|
115
po/vi.po
115
po/vi.po
|
@ -8,8 +8,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: git v2.14.0\n"
|
||||
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
||||
"POT-Creation-Date: 2017-07-15 11:57+0800\n"
|
||||
"PO-Revision-Date: 2017-07-15 13:51+0700\n"
|
||||
"POT-Creation-Date: 2017-07-24 21:54+0800\n"
|
||||
"PO-Revision-Date: 2017-07-25 07:06+0700\n"
|
||||
"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
|
||||
"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
|
||||
"Language: vi\n"
|
||||
|
@ -1476,19 +1476,62 @@ msgstr "LF nên thay bằng CRLF trong %s"
|
|||
|
||||
#: date.c:116
|
||||
msgid "in the future"
|
||||
msgstr "trong tương lai"
|
||||
msgstr "ở thời tương lai"
|
||||
|
||||
#: date.c:122 date.c:129 date.c:136 date.c:143 date.c:149 date.c:156 date.c:167
|
||||
#: date.c:175 date.c:180
|
||||
msgid "%"
|
||||
msgid_plural "%"
|
||||
msgstr[0] "%"
|
||||
#: date.c:122
|
||||
#, c-format
|
||||
msgid "%<PRIuMAX> second ago"
|
||||
msgid_plural "%<PRIuMAX> seconds ago"
|
||||
msgstr[0] "%<PRIuMAX> giây trước"
|
||||
|
||||
#: date.c:129
|
||||
#, c-format
|
||||
msgid "%<PRIuMAX> minute ago"
|
||||
msgid_plural "%<PRIuMAX> minutes ago"
|
||||
msgstr[0] "%<PRIuMAX> phút trước"
|
||||
|
||||
#: date.c:136
|
||||
#, c-format
|
||||
msgid "%<PRIuMAX> hour ago"
|
||||
msgid_plural "%<PRIuMAX> hours ago"
|
||||
msgstr[0] "%<PRIuMAX> giờ trước"
|
||||
|
||||
#: date.c:143
|
||||
#, c-format
|
||||
msgid "%<PRIuMAX> day ago"
|
||||
msgid_plural "%<PRIuMAX> days ago"
|
||||
msgstr[0] "%<PRIuMAX> ngày trước"
|
||||
|
||||
#: date.c:149
|
||||
#, c-format
|
||||
msgid "%<PRIuMAX> week ago"
|
||||
msgid_plural "%<PRIuMAX> weeks ago"
|
||||
msgstr[0] "%<PRIuMAX> tuần trước"
|
||||
|
||||
#: date.c:156
|
||||
#, c-format
|
||||
msgid "%<PRIuMAX> month ago"
|
||||
msgid_plural "%<PRIuMAX> months ago"
|
||||
msgstr[0] "%<PRIuMAX> tháng trước"
|
||||
|
||||
#: date.c:167
|
||||
#, c-format
|
||||
msgid "%<PRIuMAX> year"
|
||||
msgid_plural "%<PRIuMAX> years"
|
||||
msgstr[0] "%<PRIuMAX> năm"
|
||||
|
||||
#. TRANSLATORS: "%s" is "<n> years"
|
||||
#: date.c:170
|
||||
msgid "%s, %"
|
||||
msgid_plural "%s, %"
|
||||
msgstr[0] "%s, %"
|
||||
#, c-format
|
||||
msgid "%s, %<PRIuMAX> month ago"
|
||||
msgid_plural "%s, %<PRIuMAX> months ago"
|
||||
msgstr[0] "%s, %<PRIuMAX> tháng trước"
|
||||
|
||||
#: date.c:175 date.c:180
|
||||
#, c-format
|
||||
msgid "%<PRIuMAX> year ago"
|
||||
msgid_plural "%<PRIuMAX> years ago"
|
||||
msgstr[0] "%<PRIuMAX> năm trước"
|
||||
|
||||
#: diffcore-order.c:24
|
||||
#, c-format
|
||||
|
@ -1662,7 +1705,7 @@ msgstr "lần chuyển giao %s không hợp lệ"
|
|||
msgid "giving up"
|
||||
msgstr "chịu thua"
|
||||
|
||||
#: fetch-pack.c:533 progress.c:235
|
||||
#: fetch-pack.c:533 progress.c:237
|
||||
msgid "done"
|
||||
msgstr "xong"
|
||||
|
||||
|
@ -8471,7 +8514,7 @@ msgstr "Tự động đóng gói kho chứa để tối ưu hóa hiệu suất l
|
|||
msgid "See \"git help gc\" for manual housekeeping.\n"
|
||||
msgstr "Xem \"git help gc\" để có hướng dẫn cụ thể về cách dọn dẹp kho git.\n"
|
||||
|
||||
#: builtin/gc.c:432
|
||||
#: builtin/gc.c:436
|
||||
#, c-format
|
||||
msgid ""
|
||||
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
|
||||
|
@ -8479,7 +8522,7 @@ msgstr ""
|
|||
"gc đang được thực hiện trên máy “%s” pid %<PRIuMAX> (dùng --force nếu không "
|
||||
"phải thế)"
|
||||
|
||||
#: builtin/gc.c:476
|
||||
#: builtin/gc.c:480
|
||||
msgid ""
|
||||
"There are too many unreachable loose objects; run 'git prune' to remove them."
|
||||
msgstr ""
|
||||
|
@ -16331,45 +16374,17 @@ msgstr "Bỏ qua %s với hậu tố sao lưu dự phòng “%s”.\n"
|
|||
msgid "Do you really want to send %s? [y|N]: "
|
||||
msgstr "Bạn có thực sự muốn gửi %s? [y|N]: "
|
||||
|
||||
#~ msgid "%"
|
||||
#~ msgid_plural "%"
|
||||
#~ msgstr[0] "%"
|
||||
|
||||
#~ msgid "%s, %"
|
||||
#~ msgid_plural "%s, %"
|
||||
#~ msgstr[0] "%s, %"
|
||||
|
||||
#~ msgid "Could not open file '%s'"
|
||||
#~ msgstr "Không thể mở tập tin “%s”"
|
||||
|
||||
#~ msgid "%lu second ago"
|
||||
#~ msgid_plural "%lu seconds ago"
|
||||
#~ msgstr[0] "%lu giây trước"
|
||||
|
||||
#~ msgid "%lu minute ago"
|
||||
#~ msgid_plural "%lu minutes ago"
|
||||
#~ msgstr[0] "%lu phút trước"
|
||||
|
||||
#~ msgid "%lu hour ago"
|
||||
#~ msgid_plural "%lu hours ago"
|
||||
#~ msgstr[0] "%lu giờ trước"
|
||||
|
||||
#~ msgid "%lu day ago"
|
||||
#~ msgid_plural "%lu days ago"
|
||||
#~ msgstr[0] "%lu ngày trước"
|
||||
|
||||
#~ msgid "%lu week ago"
|
||||
#~ msgid_plural "%lu weeks ago"
|
||||
#~ msgstr[0] "%lu tuần trước"
|
||||
|
||||
#~ msgid "%lu month ago"
|
||||
#~ msgid_plural "%lu months ago"
|
||||
#~ msgstr[0] "%lu tháng trước"
|
||||
|
||||
#~ msgid "%lu year"
|
||||
#~ msgid_plural "%lu years"
|
||||
#~ msgstr[0] "%lu năm"
|
||||
|
||||
#~ msgid "%s, %lu month ago"
|
||||
#~ msgid_plural "%s, %lu months ago"
|
||||
#~ msgstr[0] "%s, %lu tháng trước"
|
||||
|
||||
#~ msgid "%lu year ago"
|
||||
#~ msgid_plural "%lu years ago"
|
||||
#~ msgstr[0] "%lu năm trước"
|
||||
|
||||
#~ msgid "in %0.1f seconds automatically..."
|
||||
#~ msgstr "trong %0.1f giây một cách tự động…"
|
||||
|
||||
|
|
6313
po/zh_CN.po
6313
po/zh_CN.po
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue