You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2015/10/25 19:20:25 UTC
svn commit: r1710471 - in /subversion/branches/1.9.x: ./ subversion/po/
Author: svn-role
Date: Sun Oct 25 18:20:24 2015
New Revision: 1710471
URL: http://svn.apache.org/viewvc?rev=1710471&view=rev
Log:
Merge the r1709389 group from trunk:
* r1709389, r1709562
Simple translation fix
Justification:
Trivial fix that doesn't require nomination, but I like to see
at least one developer or translator reviewing this.
Votes:
+1: rhuijben, philip
Modified:
subversion/branches/1.9.x/ (props changed)
subversion/branches/1.9.x/STATUS
subversion/branches/1.9.x/subversion/po/es.po
subversion/branches/1.9.x/subversion/po/fr.po
subversion/branches/1.9.x/subversion/po/it.po
subversion/branches/1.9.x/subversion/po/ja.po
subversion/branches/1.9.x/subversion/po/ko.po
subversion/branches/1.9.x/subversion/po/nb.po
subversion/branches/1.9.x/subversion/po/pl.po
subversion/branches/1.9.x/subversion/po/pt_BR.po
subversion/branches/1.9.x/subversion/po/sv.po
subversion/branches/1.9.x/subversion/po/zh_CN.po
subversion/branches/1.9.x/subversion/po/zh_TW.po
Propchange: subversion/branches/1.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 25 18:20:24 2015
@@ -94,4 +94,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663338,1663347,1663355,1663374,1663450,1663530,1663671,1663697,1663706,1663738,1663749,1663791,1663991,1664035,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664489-1664490,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664593-1664594,1664596,1664653,1664664,1664672,1664674,1664684,1664927,1664938-1664940,1664978,1664984,1664997,1665164,1665195,1665213,1665259,1665318,1665437-1665438,1665609,1665611-1665612,1665845,1665850,1665852,1665886,1665894,1665896,1666096,1666258,1666270,1666272,1666379,1666449,1666690,1666832,1666851,1666965,1667101,1667106-1667107,1667120,1667228,1667233-1667235,1667249-1667250,1667258,1667290,1667301,1667471,1667691-1667693,1667699-1667700,1667715,1667941,1667976,1668320,1668598-1668600,1668602-1668603,1668607-1668608,1668618,1669743,1669746,1669749,1669945,1670139,1670149,1670152,1670329,1670337,167
0347,1670353,1671164,1671388,1672295,1672311,1672372,1672404,1672511-1672512,1672578,1672728,1673044,1673062-1673063,1673065,1673153,1673170,1673172,1673197,1673202,1673204,1673228,1673282,1673445,1673691-1673692,1673746,1673785,1673803,1674015,1674032,1674170,1674301,1674305,1674308,1674339-1674340,1674406,1674415,1674455-1674456,1674475,1674487,1674522,1674580,1674626-1674627,1674785,1674891,1675771,1675774,1676526,1676535,1676538,1676555,1676564,1676570,1676665,1676667,1676769,1677003,1677191,1677267,1677440,1678147,1678149,1678494,1678571,1678734,1678742,1678745-1678746,1678755,1678839,1678846,1678894,1678950,1678963,1679166,1679169,1679228,1679230,1679240,1679287,1679864,1679866,1679909,1680242,1680264,1680495,1680705,1680819,1681317,1682714,1682854,1683071,1683126,1683135,1683290,1683303,1683311,1683378,1683387,1684034,1684077,1684322,1684325,1684344,1684412,1684940,1685034,1685085,1686175,1686239,1686478,1686541,1686543,1686554,1686557,1686802,1686888,1686984,1687029,1687304,
1687389,1687769,1687776,1688258,1688273,1688395,1689214,1689216,1689721,1689729,1691712-1691713,1691924,1691928,1692091,1692093,1692098,1692448,1692469-1692470,1692798-1692799,1693135,1693138,1693159,1693886,1694023,1694194,1694481,1694929,1695022,1695600,1695606,1695681,1696222,1696225,1696387,1696695,1697381,1697384,1697387,1697664,1697824,1697835,1697845,1697914,1697967,1698106,1698312,1700215,1700219-1700220,1700740,1700951,1701064,1701206,1701270,1701298,1701633,1701638,1701736,1701792,1701797,1701838,1701997,1702198,1702200,1702203,1702218,1702231,1702237-1702239,1702247,1702288,1702299-1702300,1702310,1702397,1702407,1702467,1702472,1702474,1702478,1702533,1702549,1702553,1702565,1702891,1702974,1702991,1703675,1703740,1705060,1705062,1705064,1705088,1705328,1706241,1710104
+/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663338,1663347,1663355,1663374,1663450,1663530,1663671,1663697,1663706,1663738,1663749,1663791,1663991,1664035,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664489-1664490,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664593-1664594,1664596,1664653,1664664,1664672,1664674,1664684,1664927,1664938-1664940,1664978,1664984,1664997,1665164,1665195,1665213,1665259,1665318,1665437-1665438,1665609,1665611-1665612,1665845,1665850,1665852,1665886,1665894,1665896,1666096,1666258,1666270,1666272,1666379,1666449,1666690,1666832,1666851,1666965,1667101,1667106-1667107,1667120,1667228,1667233-1667235,1667249-1667250,1667258,1667290,1667301,1667471,1667691-1667693,1667699-1667700,1667715,1667941,1667976,1668320,1668598-1668600,1668602-1668603,1668607-1668608,1668618,1669743,1669746,1669749,1669945,1670139,1670149,1670152,1670329,1670337,167
0347,1670353,1671164,1671388,1672295,1672311,1672372,1672404,1672511-1672512,1672578,1672728,1673044,1673062-1673063,1673065,1673153,1673170,1673172,1673197,1673202,1673204,1673228,1673282,1673445,1673691-1673692,1673746,1673785,1673803,1674015,1674032,1674170,1674301,1674305,1674308,1674339-1674340,1674406,1674415,1674455-1674456,1674475,1674487,1674522,1674580,1674626-1674627,1674785,1674891,1675771,1675774,1676526,1676535,1676538,1676555,1676564,1676570,1676665,1676667,1676769,1677003,1677191,1677267,1677440,1678147,1678149,1678494,1678571,1678734,1678742,1678745-1678746,1678755,1678839,1678846,1678894,1678950,1678963,1679166,1679169,1679228,1679230,1679240,1679287,1679864,1679866,1679909,1680242,1680264,1680495,1680705,1680819,1681317,1682714,1682854,1683071,1683126,1683135,1683290,1683303,1683311,1683378,1683387,1684034,1684077,1684322,1684325,1684344,1684412,1684940,1685034,1685085,1686175,1686239,1686478,1686541,1686543,1686554,1686557,1686802,1686888,1686984,1687029,1687304,
1687389,1687769,1687776,1688258,1688273,1688395,1689214,1689216,1689721,1689729,1691712-1691713,1691924,1691928,1692091,1692093,1692098,1692448,1692469-1692470,1692798-1692799,1693135,1693138,1693159,1693886,1694023,1694194,1694481,1694929,1695022,1695600,1695606,1695681,1696222,1696225,1696387,1696695,1697381,1697384,1697387,1697664,1697824,1697835,1697845,1697914,1697967,1698106,1698312,1700215,1700219-1700220,1700740,1700951,1701064,1701206,1701270,1701298,1701633,1701638,1701736,1701792,1701797,1701838,1701997,1702198,1702200,1702203,1702218,1702231,1702237-1702239,1702247,1702288,1702299-1702300,1702310,1702397,1702407,1702467,1702472,1702474,1702478,1702533,1702549,1702553,1702565,1702891,1702974,1702991,1703675,1703740,1705060,1705062,1705064,1705088,1705328,1706241,1709389,1709562,1710104
Modified: subversion/branches/1.9.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev=1710471&r1=1710470&r2=1710471&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Sun Oct 25 18:20:24 2015
@@ -153,11 +153,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1709389, r1709562
- Simple translation fix
- Justification:
- Trivial fix that doesn't require nomination, but I like to see
- at least one developer or translator reviewing this.
- Votes:
- +1: rhuijben, philip
Modified: subversion/branches/1.9.x/subversion/po/es.po
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/po/es.po?rev=1710471&r1=1710470&r2=1710471&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/po/es.po [UTF-8] (original)
+++ subversion/branches/1.9.x/subversion/po/es.po [UTF-8] Sun Oct 25 18:20:24 2015
@@ -10197,13 +10197,11 @@ msgid "local %s, incoming %s upon %s"
msgstr ""
#: ../svn/util.c:74
-#, fuzzy, c-format
+#, c-format
msgid ""
-"\n"
"Committed revision %ld%s.\n"
msgstr ""
-"\n"
-"Commit de la revisión %ld.\n"
+"Commit de la revisión %ld%s.\n"
#: ../svn/util.c:78
msgid " (the answer to life, the universe, and everything)"
Modified: subversion/branches/1.9.x/subversion/po/fr.po
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/po/fr.po?rev=1710471&r1=1710470&r2=1710471&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/po/fr.po [UTF-8] (original)
+++ subversion/branches/1.9.x/subversion/po/fr.po [UTF-8] Sun Oct 25 18:20:24 2015
@@ -11331,6 +11331,11 @@ msgstr "Mise à jour de '%s'\n"
msgid "Redirecting to URL '%s':\n"
msgstr "Redirection vers l'URL '%s' :\n"
+#: ../svn/notify.c:1066
+#, c-format
+msgid "Committing transaction...\n"
+msgstr "Transaction de propagation...\n"
+
#: ../svn/propdel-cmd.c:88
#, c-format
msgid "Cannot specify revision for deleting versioned property '%s'"
@@ -11543,10 +11548,8 @@ msgstr "'%s' actualisé à la révision
#: ../svn/util.c:76
#, c-format
msgid ""
-"\n"
"Committed revision %ld%s.\n"
msgstr ""
-"\n"
"Révision %ld%s propagée.\n"
#: ../svn/util.c:80
Modified: subversion/branches/1.9.x/subversion/po/it.po
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/po/it.po?rev=1710471&r1=1710470&r2=1710471&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/po/it.po (original)
+++ subversion/branches/1.9.x/subversion/po/it.po Sun Oct 25 18:20:24 2015
@@ -10286,13 +10286,11 @@ msgid "local %s, incoming %s upon %s"
msgstr ""
#: ../svn/util.c:74
-#, fuzzy, c-format
+#, c-format
msgid ""
-"\n"
"Committed revision %ld%s.\n"
msgstr ""
-"\n"
-"Commit della Revisione %ld eseguito.\n"
+"Commit della Revisione %ld%s eseguito.\n"
#: ../svn/util.c:78
msgid " (the answer to life, the universe, and everything)"
Modified: subversion/branches/1.9.x/subversion/po/ja.po
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/po/ja.po?rev=1710471&r1=1710470&r2=1710471&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/po/ja.po [UTF-8] (original)
+++ subversion/branches/1.9.x/subversion/po/ja.po [UTF-8] Sun Oct 25 18:20:24 2015
@@ -10643,13 +10643,11 @@ msgid "local %s, incoming %s upon %s"
msgstr ""
#: ../svn/util.c:74
-#, fuzzy, c-format
+#, c-format
msgid ""
-"\n"
"Committed revision %ld%s.\n"
msgstr ""
-"\n"
-"リビジョン %ld をコミットしました。\n"
+"リビジョン %ld%s をコミットしました。\n"
#: ../svn/util.c:78
msgid " (the answer to life, the universe, and everything)"
Modified: subversion/branches/1.9.x/subversion/po/ko.po
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/po/ko.po?rev=1710471&r1=1710470&r2=1710471&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/po/ko.po [UTF-8] (original)
+++ subversion/branches/1.9.x/subversion/po/ko.po [UTF-8] Sun Oct 25 18:20:24 2015
@@ -10530,10 +10530,8 @@ msgstr " '%s' 을(를) r%ld 로 업데�
#: ../svn/util.c:75
#, c-format
msgid ""
-"\n"
"Committed revision %ld%s.\n"
msgstr ""
-"\n"
"커밋된 리비전 %ld%s.\n"
#: ../svn/util.c:79
Modified: subversion/branches/1.9.x/subversion/po/nb.po
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/po/nb.po?rev=1710471&r1=1710470&r2=1710471&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/po/nb.po [UTF-8] (original)
+++ subversion/branches/1.9.x/subversion/po/nb.po [UTF-8] Sun Oct 25 18:20:24 2015
@@ -10226,13 +10226,11 @@ msgid "local %s, incoming %s upon %s"
msgstr "lokal %s, innkommende %s på %s"
#: ../svn/util.c:74
-#, fuzzy, c-format
+#, c-format
msgid ""
-"\n"
"Committed revision %ld%s.\n"
msgstr ""
-"\n"
-"La inn revisjon %ld.\n"
+"La inn revisjon %ld%s.\n"
#: ../svn/util.c:78
msgid " (the answer to life, the universe, and everything)"
Modified: subversion/branches/1.9.x/subversion/po/pl.po
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/po/pl.po?rev=1710471&r1=1710470&r2=1710471&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/po/pl.po [UTF-8] (original)
+++ subversion/branches/1.9.x/subversion/po/pl.po [UTF-8] Sun Oct 25 18:20:24 2015
@@ -10285,13 +10285,11 @@ msgid "local %s, incoming %s upon %s"
msgstr "lokalne: %s, przychodzące: %s, operacja: %s"
#: ../svn/util.c:74
-#, fuzzy, c-format
+#, c-format
msgid ""
-"\n"
"Committed revision %ld%s.\n"
msgstr ""
-"\n"
-"Zatwierdzona wersja %ld.\n"
+"Zatwierdzona wersja %ld%s.\n"
#: ../svn/util.c:78
msgid " (the answer to life, the universe, and everything)"
Modified: subversion/branches/1.9.x/subversion/po/pt_BR.po
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/po/pt_BR.po?rev=1710471&r1=1710470&r2=1710471&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/po/pt_BR.po [UTF-8] (original)
+++ subversion/branches/1.9.x/subversion/po/pt_BR.po [UTF-8] Sun Oct 25 18:20:24 2015
@@ -10087,13 +10087,11 @@ msgid "local %s, incoming %s upon %s"
msgstr ""
#: ../svn/util.c:74
-#, fuzzy, c-format
+#, c-format
msgid ""
-"\n"
"Committed revision %ld%s.\n"
msgstr ""
-"\n"
-"Commit da revisão %ld.\n"
+"Commit da revisão %ld%s.\n"
#: ../svn/util.c:78
msgid " (the answer to life, the universe, and everything)"
Modified: subversion/branches/1.9.x/subversion/po/sv.po
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/po/sv.po?rev=1710471&r1=1710470&r2=1710471&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/po/sv.po [UTF-8] (original)
+++ subversion/branches/1.9.x/subversion/po/sv.po [UTF-8] Sun Oct 25 18:20:24 2015
@@ -13145,10 +13145,8 @@ msgstr " Uppdaterade \"%s\" till r%ld.\
#: ../svn/util.c:79
#, c-format
msgid ""
-"\n"
"Committed revision %ld%s.\n"
msgstr ""
-"\n"
"Arkiverade revision %ld%s.\n"
#: ../svn/util.c:83
Modified: subversion/branches/1.9.x/subversion/po/zh_CN.po
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/po/zh_CN.po?rev=1710471&r1=1710470&r2=1710471&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/po/zh_CN.po [UTF-8] (original)
+++ subversion/branches/1.9.x/subversion/po/zh_CN.po [UTF-8] Sun Oct 25 18:20:24 2015
@@ -11284,9 +11284,9 @@ msgid "done\n"
msgstr "完成。\n"
#: ../svn/notify.c:1066
-#, fuzzy, c-format
+#, c-format
msgid "Committing transaction...\n"
-msgstr "正在读取事务"
+msgstr "正在读取事务\n"
#: ../svn/propdel-cmd.c:88
#, c-format
@@ -13710,10 +13710,9 @@ msgid " Updated '%s' to r%ld.\n"
msgstr "更新 '%s' 到版本 %ld。\n"
#: ../svn/util.c:79
-#, fuzzy, c-format
+#, c-format
msgid "Committed revision %ld%s.\n"
msgstr ""
-"\n"
"提交后的版本为 %ld%s。\n"
#: ../svn/util.c:83
Modified: subversion/branches/1.9.x/subversion/po/zh_TW.po
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/po/zh_TW.po?rev=1710471&r1=1710470&r2=1710471&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/po/zh_TW.po [UTF-8] (original)
+++ subversion/branches/1.9.x/subversion/po/zh_TW.po [UTF-8] Sun Oct 25 18:20:24 2015
@@ -10123,13 +10123,11 @@ msgid "local %s, incoming %s upon %s"
msgstr ""
#: ../svn/util.c:74
-#, fuzzy, c-format
+#, c-format
msgid ""
-"\n"
"Committed revision %ld%s.\n"
msgstr ""
-"\n"
-"送交修訂版 %ld.\n"
+"送交修訂版 %ld%s.\n"
#: ../svn/util.c:78
msgid " (the answer to life, the universe, and everything)"