Skip to content

Commit 384a8b2

Browse files
gitstergitster
committed
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)
2 parents c3eb4e6 + 554e850 commit 384a8b2

File tree

9 files changed

+17022
-15801
lines changed

9 files changed

+17022
-15801
lines changed

‎po/TEAMS‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,5 +58,6 @@ Members: Nguyễn Thái Ngọc Duy <pclouds AT gmail.com>
5858

5959
Language: zh_CN (Simplified Chinese)
6060
Repository: https://github.com/jiangxin/git/
61-
Leader: Jiang Xin <worldhello.net@gmail.com>
62-
Members: Ray Chen <oldsharp@gmail.com>
61+
Leader: Jiang Xin <worldhello.net AT gmail.com>
62+
Members: Ray Chen <oldsharp AT gmail.com>
63+
依云 <lilydjwg AT gmail.com>

‎po/bg.po‎

Lines changed: 67 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ msgid ""
9494
msgstr ""
9595
"Project-Id-Version: git master\n"
9696
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
97-
"POT-Creation-Date: 2017-07-15 11:57+0800\n"
98-
"PO-Revision-Date: 2017-07-14 10:54+0200\n"
97+
"POT-Creation-Date: 2017-07-24 21:54+0800\n"
98+
"PO-Revision-Date: 2017-07-24 17:26+0200\n"
9999
"Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
100100
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
101101
"Language: bg\n"
@@ -1585,19 +1585,69 @@ msgstr ""
15851585
msgid "in the future"
15861586
msgstr "в бъдещето"
15871587

1588-
#: date.c:122 date.c:129 date.c:136 date.c:143 date.c:149 date.c:156 date.c:167
1589-
#: date.c:175 date.c:180
1590-
msgid "%"
1591-
msgid_plural "%"
1592-
msgstr[0] "%"
1593-
msgstr[1] "%"
1588+
#: date.c:122
1589+
#, c-format
1590+
msgid "%<PRIuMAX> second ago"
1591+
msgid_plural "%<PRIuMAX> seconds ago"
1592+
msgstr[0] "преди %<PRIuMAX> секунда"
1593+
msgstr[1] "преди %<PRIuMAX> секунди"
1594+
1595+
#: date.c:129
1596+
#, c-format
1597+
msgid "%<PRIuMAX> minute ago"
1598+
msgid_plural "%<PRIuMAX> minutes ago"
1599+
msgstr[0] "преди %<PRIuMAX> минута"
1600+
msgstr[1] "преди %<PRIuMAX> минути"
1601+
1602+
#: date.c:136
1603+
#, c-format
1604+
msgid "%<PRIuMAX> hour ago"
1605+
msgid_plural "%<PRIuMAX> hours ago"
1606+
msgstr[0] "преди %<PRIuMAX> час"
1607+
msgstr[1] "преди %<PRIuMAX> часа"
1608+
1609+
#: date.c:143
1610+
#, c-format
1611+
msgid "%<PRIuMAX> day ago"
1612+
msgid_plural "%<PRIuMAX> days ago"
1613+
msgstr[0] "преди %<PRIuMAX> ден"
1614+
msgstr[1] "преди %<PRIuMAX> дена"
1615+
1616+
#: date.c:149
1617+
#, c-format
1618+
msgid "%<PRIuMAX> week ago"
1619+
msgid_plural "%<PRIuMAX> weeks ago"
1620+
msgstr[0] "преди %<PRIuMAX> седмица"
1621+
msgstr[1] "преди %<PRIuMAX> седмици"
1622+
1623+
#: date.c:156
1624+
#, c-format
1625+
msgid "%<PRIuMAX> month ago"
1626+
msgid_plural "%<PRIuMAX> months ago"
1627+
msgstr[0] "преди %<PRIuMAX> месец"
1628+
msgstr[1] "преди %<PRIuMAX> месеца"
1629+
1630+
#: date.c:167
1631+
#, c-format
1632+
msgid "%<PRIuMAX> year"
1633+
msgid_plural "%<PRIuMAX> years"
1634+
msgstr[0] "%<PRIuMAX> година"
1635+
msgstr[1] "%<PRIuMAX> години"
15941636

15951637
#. TRANSLATORS: "%s" is "<n> years"
15961638
#: date.c:170
1597-
msgid "%s, %"
1598-
msgid_plural "%s, %"
1599-
msgstr[0] "%s, %"
1600-
msgstr[1] "%s, %"
1639+
#, c-format
1640+
msgid "%s, %<PRIuMAX> month ago"
1641+
msgid_plural "%s, %<PRIuMAX> months ago"
1642+
msgstr[0] "преди %s и %<PRIuMAX> месец"
1643+
msgstr[1] "преди %s и %<PRIuMAX> месеца"
1644+
1645+
#: date.c:175 date.c:180
1646+
#, c-format
1647+
msgid "%<PRIuMAX> year ago"
1648+
msgid_plural "%<PRIuMAX> years ago"
1649+
msgstr[0] "преди %<PRIuMAX> година"
1650+
msgstr[1] "преди %<PRIuMAX> години"
16011651

16021652
#: diffcore-order.c:24
16031653
#, c-format
@@ -1776,7 +1826,7 @@ msgstr "неправилно подаване: „%s“"
17761826
msgid "giving up"
17771827
msgstr "преустановяване"
17781828

1779-
#: fetch-pack.c:533 progress.c:235
1829+
#: fetch-pack.c:533 progress.c:237
17801830
msgid "done"
17811831
msgstr "действието завърши"
17821832

@@ -3196,12 +3246,12 @@ msgstr "съобщението за подаване към „%s“ не мож
31963246
#: sequencer.c:879
31973247
#, c-format
31983248
msgid "This is the commit message #%d:"
3199-
msgstr "Това е съобщение при подаване №${%d}:"
3249+
msgstr "Това е съобщение при подаване №%d:"
32003250

32013251
#: sequencer.c:884
32023252
#, c-format
32033253
msgid "The commit message #%d will be skipped:"
3204-
msgstr "Съобщение при подаване №${%d} ще бъде прескочено:"
3254+
msgstr "Съобщение при подаване №%d ще бъде прескочено:"
32053255

32063256
#: sequencer.c:889
32073257
#, c-format
@@ -8664,7 +8714,7 @@ msgstr ""
86648714
"Погледнете ръководството за повече информация как да изпълните „git help "
86658715
"gc“.\n"
86668716

8667-
#: builtin/gc.c:432
8717+
#: builtin/gc.c:436
86688718
#, c-format
86698719
msgid ""
86708720
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -8673,7 +8723,7 @@ msgstr ""
86738723
"процеса: %<PRIuMAX> (ако сте сигурни, че това не е вярно, това използвайте\n"
86748724
"опцията „--force“)"
86758725

8676-
#: builtin/gc.c:476
8726+
#: builtin/gc.c:480
86778727
msgid ""
86788728
"There are too many unreachable loose objects; run 'git prune' to remove them."
86798729
msgstr ""

0 commit comments

Comments
 (0)