OSDN -- Open-Source-Software-Entwicklung und Downloads
Übersetzungsstatus von Deutsch translation status for de
  • R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision12297 (tree)
Zeit2008-03-09 16:26:44
Autordongsheng.song

Log Message

Simplified Chinese GUI translation.

* Languages/Tortoise_zh_CN.po: Update to r12295 of Tortoise.pot

Ändern Zusammenfassung

Diff

--- trunk/Languages/Tortoise_zh_CN.po (revision 12296)
+++ trunk/Languages/Tortoise_zh_CN.po (revision 12297)
@@ -30,6 +30,7 @@
3030 # age 年代
3131 # BASE revision 基础版本
3232 # blame 追溯
33+# branch 分枝
3334 # checkout 检出
3435 # default 默认
3536 # HEAD revision 最新版本
@@ -56,7 +57,7 @@
5657 "Project-Id-Version: TortoiseSVN zh_CN\n"
5758 "Report-Msgid-Bugs-To: \n"
5859 "POT-Creation-Date: 1900-01-01 00:00+0000\n"
59-"PO-Revision-Date: 2008-03-02 11:21+0800\n"
60+"PO-Revision-Date: 2008-03-09 15:07+0800\n"
6061 "Last-Translator: Dongsheng Song <dongsheng.song@gmail.com>\n"
6162 "Language-Team: TortoiseSVN translation team <dev@tortoisesvn.tigris.org>\n"
6263 "MIME-Version: 1.0\n"
@@ -489,8 +490,8 @@
489490 msgstr "跳转到指定行(&G)..."
490491
491492 #. Resource IDs: (32799)
492-msgid "&Group branches"
493-msgstr "分组分支(&G)"
493+msgid "&Group by branch"
494+msgstr "按照分枝分组(&G)"
494495
495496 #. Resource IDs: (1032, 1115)
496497 msgid "&HEAD Revision"
@@ -668,7 +669,7 @@
668669
669670 #. Resource IDs: (1316)
670671 msgid "&Reopen commit and branch/tag dialog after a commit failed"
671-msgstr "在提交失败后，重新打开提交或分支/标签对话框(&R)"
672+msgstr "在提交失败后，重新打开提交或分枝/标签对话框(&R)"
672673
673674 #. Resource IDs: (13)
674675 msgid "&Repo-browser"
@@ -1131,6 +1132,10 @@
11311132 msgid "Always use the system locale settings to show times and dates"
11321133 msgstr "始终使用系统区域设置显示时间和日期"
11331134
1135+#. Resource IDs: (339)
1136+msgid "Amount of memory required to load the cache"
1137+msgstr "加载缓存需要的内存数量"
1138+
11341139 #. Resource IDs: (78)
11351140 #, c-format
11361141 msgid ""
@@ -1189,7 +1194,7 @@
11891194
11901195 #. Resource IDs: (269)
11911196 msgid "Analyze revision data..."
1192-msgstr "分析分支数据..."
1197+msgstr "分析分枝数据..."
11931198
11941199 #. Resource IDs: (14)
11951200 msgid "Applies a unified diff file to the working copy"
@@ -1374,15 +1379,15 @@
13741379
13751380 #. Resource IDs: (115)
13761381 msgid "Branch / tag created successfully!"
1377-msgstr "分支/标记创建成功！"
1382+msgstr "分枝/标记创建成功！"
13781383
13791384 #. Resource IDs: (2052)
13801385 msgid "Branch at copy-from-rev even if there was no change in that revision"
1381-msgstr "在 copy-from-rev 分支，不管此版本是否修改"
1386+msgstr "在 copy-from-rev 分枝，不管此版本是否修改"
13821387
13831388 #. Resource IDs: (9)
13841389 msgid "Branch/&tag..."
1385-msgstr "分支/标记(&T)..."
1390+msgstr "分枝/标记(&T)..."
13861391
13871392 #. Resource IDs: (16)
13881393 msgid "Break loc&k"
@@ -1426,7 +1431,7 @@
14261431
14271432 #. Resource IDs: (77)
14281433 msgid "C&reate branch/tag from revision"
1429-msgstr "从版本创建分支/标记(&R)"
1434+msgstr "从版本创建分枝/标记(&R)"
14301435
14311436 #. Resource IDs: (101)
14321437 msgid "C&reate folder..."
@@ -1864,6 +1869,10 @@
18641869 msgid "Conflicts: %d"
18651870 msgstr "冲突：%d"
18661871
1872+#. Resource IDs: (345)
1873+msgid "Connect to the repository server and download missing log data"
1874+msgstr "连接版本库服务器下载缺少的日志数据"
1875+
18671876 #. Resource IDs: (65535)
18681877 msgid "Container sizes"
18691878 msgstr "容器大小"
@@ -1918,7 +1927,7 @@
19181927
19191928 #. Resource IDs: (142)
19201929 msgid "Copy (Branch / Tag)"
1921-msgstr "复制（分支/标记）"
1930+msgstr "复制（分枝/标记）"
19221931
19231932 #. Resource IDs: (78)
19241933 msgid "Copy - TortoiseSVN"
@@ -2191,7 +2200,7 @@
21912200
21922201 #. Resource IDs: (10)
21932202 msgid "Creates a 'cheap' copy inside the repository used for branches or tagging"
2194-msgstr "在版本库中快速创建副本用作分支或标记"
2203+msgstr "在版本库中快速创建副本用作分枝或标记"
21952204
21962205 #. Resource IDs: (10)
21972206 msgid "Creates a repository database at the current location"
@@ -2520,6 +2529,10 @@
25202529 msgid "Empty"
25212530 msgstr "空的"
25222531
2532+#. Resource IDs: (344)
2533+msgid "Enable log caching to speed up log and revision graph dialogs"
2534+msgstr "启用缓存来加速日志和版本图对话框"
2535+
25232536 #. Resource IDs: (196)
25242537 msgid ""
25252538 "Enable this only if you're working with web projects on VS.NET2003!\n"
@@ -2714,6 +2727,10 @@
27142727 msgid "Export directory:"
27152728 msgstr "导出目录："
27162729
2730+#. Resource IDs: (345)
2731+msgid "Export the selected cache as a set of Comma Separated Value (CSV) files"
2732+msgstr "将选中的缓存导出为逗号分割(CSV)的文件"
2733+
27172734 #. Resource IDs: (79)
27182735 msgid "Export unversioned files too"
27192736 msgstr "导出无版本控制信息的文件"
@@ -2997,6 +3014,10 @@
29973014 msgid "Force blame"
29983015 msgstr "强制追溯"
29993016
3017+#. Resource IDs: (65535)
3018+msgid "From URL:"
3019+msgstr "从 URL："
3020+
30003021 #. Resource IDs: (1200, 65535)
30013022 msgid "From:"
30023023 msgstr "起始："
@@ -3161,14 +3182,14 @@
31613182 msgid "Graph type:"
31623183 msgstr "MIME 类型"
31633184
3185+#. Resource IDs: (2050)
3186+msgid "Group by branch"
3187+msgstr "按照分枝分组"
3188+
31643189 #. Resource IDs: (214)
31653190 msgid "Group changelists"
31663191 msgstr "分组修改列表"
31673192
3168-#. Resource IDs: (2050)
3169-msgid "Groups branches together"
3170-msgstr "分组分支"
3171-
31723193 #. Resource IDs: (1229)
31733194 msgid "H&ide unrelated changed paths"
31743195 msgstr "隐藏无关的修改路径(&I)"
@@ -3833,6 +3854,10 @@
38333854 "列出帮助主题\n"
38343855 "帮助主题"
38353856
3857+#. Resource IDs: (344)
3858+msgid "List of repositories for which log information has been cached"
3859+msgstr "列出被缓存日志信息的对话框"
3860+
38363861 #. Resource IDs: (130)
38373862 msgid "Load Images"
38383863 msgstr "载入图片"
@@ -3963,6 +3988,10 @@
39633988 msgid "Mark as resolved"
39643989 msgstr "标记为已解决"
39653990
3991+#. Resource IDs: (2052)
3992+msgid "Mark current revision of your working copy"
3993+msgstr "标记工作副本的当前版本号"
3994+
39663995 #. Resource IDs: (101)
39673996 msgid "Mark for comparison"
39683997 msgstr "为比较标记"
@@ -4003,6 +4032,10 @@
40034032 msgid "Merge - TortoiseSVN"
40044033 msgstr "合并 - TortoiseSVN"
40054034
4035+#. Resource IDs: (221)
4036+msgid "Merge Reintegrate"
4037+msgstr "合并复兴分枝"
4038+
40064039 #. Resource IDs: (1416)
40074040 msgid "Merge a range of revisions"
40084041 msgstr "合并一个版本范围"
@@ -4054,7 +4087,7 @@
40544087
40554088 #. Resource IDs: (10)
40564089 msgid "Merges a branch into the main trunk"
4057-msgstr "将分支树合并回主干"
4090+msgstr "将分枝树合并回主干"
40584091
40594092 #. Resource IDs: (14)
40604093 msgid "Merges all missing revisions back into the working copy using merge-tracking information"
@@ -4366,36 +4399,40 @@
43664399
43674400 #. Resource IDs: (339)
43684401 msgid "Number of cached revisions"
4369-msgstr "缓存版本数量"
4402+msgstr "缓存的版本数量"
43704403
43714404 #. Resource IDs: (339)
4372-msgid "Number of cached user revision properties"
4373-msgstr "缓存用户版本属性数量"
4405+msgid "Number of cached revisions that have a non-empty change list"
4406+msgstr "有非空修改列表的缓存的版本数量"
43744407
43754408 #. Resource IDs: (339)
4376-msgid "Number of changed cached revisions"
4377-msgstr "缓存版本的修改次数"
4409+msgid "Number of cached revisions that have user revision properties"
4410+msgstr "有用户版本属性的缓存的版本数量"
43784411
43794412 #. Resource IDs: (339)
4380-msgid "Number of changed revisions that are not cached yet"
4381-msgstr "尚未缓存的版本的修改次数"
4413+msgid "Number of cached revisions whose change list is not cached yet"
4414+msgstr "有尚未缓存的修改列表的缓存的版本数量"
43824415
4416+#. Resource IDs: (339)
4417+msgid "Number of cached revisions whose user revision properties are not cached yet"
4418+msgstr "有尚未缓存的用户版本属性的缓存的版本数量"
4419+
43834420 #. Resource IDs: (338)
43844421 msgid "Number of different paths shown in the log dialog, including parent paths"
43854422 msgstr "在日志对话框中显示的不同路径(包含父路径)数量"
43864423
4424+#. Resource IDs: (338)
4425+msgid "Number of different words used in log messages"
4426+msgstr "在日志对话框中使用的唯一单词数量"
4427+
43874428 #. Resource IDs: (339)
43884429 msgid "Number of merged revisions that are not cached yet"
43894430 msgstr "尚未缓存的已经合并版本的数量"
43904431
43914432 #. Resource IDs: (338)
4392-msgid "Number of path elements. This is an internal value indicating the compression level."
4393-msgstr "路径元素数量。它是指定压缩级别的内部值。"
4433+msgid "Number of path elements. A path element is a folder or file name like 'foo.txt' or 'mybranch'."
4434+msgstr "路径元素数量：路径元素是目录或文件名称，例如“foo.txt”或“mybranch”。"
43944435
4395-#. Resource IDs: (339)
4396-msgid "Number of user revision properties that are not cached yet"
4397-msgstr "尚未缓存的用户版本属性数量"
4398-
43994436 #. Resource IDs: (1160)
44004437 msgid "Number of weeks:"
44014438 msgstr "周数"
@@ -4603,7 +4640,7 @@
46034640 msgstr ""
46044641 "请注意：\n"
46054642 "你的工作副本仍设为原来的路径。如果你想要之后的修改会\n"
4606-"提交到刚才创建的地址或分支，你必须先切换到新的URL。\n"
4643+"提交到刚才创建的地址或分枝，你必须先切换到新的URL。\n"
46074644 "可使用切换指令来执行此操作。"
46084645
46094646 #. Resource IDs: (1287)
@@ -4867,6 +4904,15 @@
48674904 "\\d\t\t\t数字 0-9\n"
48684905 "\\s\t\t\t空白"
48694906
4907+#. Resource IDs: (1469)
4908+msgid "Reintegrate a branch"
4909+msgstr "复兴分枝"
4910+
4911+#. Resource IDs: (230)
4912+#, c-format
4913+msgid "Reintegrate merge %s into %s"
4914+msgstr "复兴合并 %s 到 %s"
4915+
48704916 #. Resource IDs: (82)
48714917 msgid "Reject"
48724918 msgstr "拒绝"
@@ -4935,7 +4981,7 @@
49354981
49364982 #. Resource IDs: (2052)
49374983 msgid "Remove deleted branches and tags"
4938-msgstr "删除已经删除的分支或标签"
4984+msgstr "删除已经删除的分枝或标签"
49394985
49404986 #. Resource IDs: (15)
49414987 msgid "Remove from &ignore list"
@@ -4954,9 +5000,13 @@
49545000 "删除属性“%s”于\r\n"
49555001 "%s"
49565002
5003+#. Resource IDs: (345)
5004+msgid "Remove the selected cache(s) from disk"
5005+msgstr "从磁盘删除选择的缓存"
5006+
49575007 #. Resource IDs: (1332)
49585008 msgid "Remove..."
4959-msgstr "移除..."
5009+msgstr "删除..."
49605010
49615011 #. Resource IDs: (65535)
49625012 msgid "Removed"
@@ -5184,7 +5234,7 @@
51845234 #. Resource IDs: (269, 270, 272)
51855235 #, c-format
51865236 msgid "Revision %ld"
5187-msgstr "版本分支 %ld"
5237+msgstr "版本分枝 %ld"
51885238
51895239 #. Resource IDs: (120)
51905240 #, c-format
@@ -5193,7 +5243,7 @@
51935243
51945244 #. Resource IDs: (15)
51955245 msgid "Revision &graph"
5196-msgstr "版本分支图(&G)"
5246+msgstr "版本分枝图(&G)"
51975247
51985248 #. Resource IDs: (65535)
51995249 msgid "Revision / Author:"
@@ -5201,11 +5251,11 @@
52015251
52025252 #. Resource IDs: (182)
52035253 msgid "Revision Graph"
5204-msgstr "版本分支图"
5254+msgstr "版本分枝图"
52055255
52065256 #. Resource IDs: (239)
52075257 msgid "Revision Graph Filter"
5208-msgstr "版本分支图过滤器"
5258+msgstr "版本分枝图过滤器"
52095259
52105260 #. Resource IDs: (228)
52115261 msgid "Revision Range"
@@ -5213,7 +5263,7 @@
52135263
52145264 #. Resource IDs: (269, 65535)
52155265 msgid "Revision graph"
5216-msgstr "版本分支图"
5266+msgstr "版本分枝图"
52175267
52185268 #. Resource IDs: (65535)
52195269 msgid "Revision range to merge"
@@ -5402,6 +5452,10 @@
54025452 msgid "Saved Data"
54035453 msgstr "已保存数据"
54045454
5455+#. Resource IDs: (344)
5456+msgid "Saves expensive server roundtrips when set to longer than 0 seconds"
5457+msgstr "当设置为大于0的值十节约昂贵的服务器往返时间"
5458+
54055459 #. Resource IDs: (581)
54065460 msgid "Saves the selected property value to a file"
54075461 msgstr "将选择的属性值保存到文件"
@@ -5633,6 +5687,10 @@
56335687 msgid "Show &Range..."
56345688 msgstr "显示范围(&R)..."
56355689
5690+#. Resource IDs: (32826)
5691+msgid "Show &WC revision"
5692+msgstr "显示工作副本的版本号(&W)"
5693+
56365694 #. Resource IDs: (32796)
56375695 msgid "Show &all revisions"
56385696 msgstr "显示全部版本(&A)"
@@ -5749,6 +5807,10 @@
57495807 "以特殊字符显示空白字符\n"
57505808 "显示空白字符"
57515809
5810+#. Resource IDs: (345)
5811+msgid "Show statistics for the selected log cache"
5812+msgstr "显示选定的日志缓存统计"
5813+
57525814 #. Resource IDs: (2052)
57535815 msgid "Show tags on the copy source, not as separate nodes"
57545816 msgstr "在复制源显示标签，而不是单独节点"
@@ -5782,7 +5844,7 @@
57825844
57835845 #. Resource IDs: (15)
57845846 msgid "Shows a graphical representation of copies/tags/branches"
5785-msgstr "以图形方式显示版本和标签的分支图"
5847+msgstr "以图形方式显示版本和标签的分枝图"
57865848
57875849 #. Resource IDs: (13)
57885850 msgid "Shows all files which were changed since the last update, locally and in the repository"
@@ -5829,6 +5891,10 @@
58295891 msgstr "缓存的全部文本信息的大小"
58305892
58315893 #. Resource IDs: (339)
5894+msgid "Size of the cache file on disk"
5895+msgstr "磁盘缓存文件的大小"
5896+
5897+#. Resource IDs: (339)
58325898 msgid "Size of the cache if it were not compressed"
58335899 msgstr "没有压缩时缓存的大小"
58345900
@@ -5963,7 +6029,7 @@
59636029
59646030 #. Resource IDs: (1232)
59656031 msgid "Sw&itch working copy to new branch/tag"
5966-msgstr "切换工作副本至新分支/标记(&I)"
6032+msgstr "切换工作副本至新分枝/标记(&I)"
59676033
59686034 #. Resource IDs: (229)
59696035 #, c-format
@@ -5980,7 +6046,7 @@
59806046
59816047 #. Resource IDs: (140)
59826048 msgid "Switch To Branch / Tag"
5983-msgstr "切换至分支/标记"
6049+msgstr "切换至分枝/标记"
59846050
59856051 #. Resource IDs: (3606)
59866052 msgid ""
@@ -6024,8 +6090,12 @@
60246090
60256091 #. Resource IDs: (9)
60266092 msgid "Switch working copy to another branch / tag"
6027-msgstr "切换工作副本至其它分支/标记"
6093+msgstr "切换工作副本至其它分枝/标记"
60286094
6095+#. Resource IDs: (65535)
6096+msgid "Switch:"
6097+msgstr "切换："
6098+
60296099 #. Resource IDs: (325)
60306100 msgid "Switches the comparison left<<->right"
60316101 msgstr "左右切换比较"
@@ -6491,13 +6561,17 @@
64916561 "com1-com9，lpt1-lpt9，prn，aux，con，nul，clock$"
64926562
64936563 #. Resource IDs: (594)
6494-msgid "This method covers the case when you have made a feature branch as discussed in the Subversion book. All trunk changes have been ported to the feature branch, week by week, and now the feature is complete you want to merge it back into the trunk. Because you have kept the feature branch synchronized with the trunk, the latest versions of branch and trunk will be absolutely identical except for your branch changes. So in this special case, you would merge by comparing the branch with the trunk."
6495-msgstr "这个方法覆盖了你已经创建了在 Subversion 手册中讨论的特性分支的情况。所有主干修改已经每周合并到此特性分支，现在完成了新特性，你需要将它合并回主干。因为你已经保持特性分支与主干同步，分支和主干的最新版本除了你的分支修改都相同。所以在这种情况下，你可以通过比较分支与主干来合并。"
6564+msgid "This method covers the case when you have made a feature branch as discussed in the Subversion book. Use this to merge all changes of a branch back to trunk."
6565+msgstr "这个方法适用于你创建了在 Subversion 手册中讨论的新特性分枝，要合并分枝到主干的场合。"
64966566
64976567 #. Resource IDs: (594)
64986568 msgid "This method covers the case when you have made one or more revisions to a branch (or to the trunk) and you want to port those changes across to a different branch."
6499-msgstr "这个方法覆盖了你已经在分支(或主干)提交了版本，要合并这些修改到不同分支的情况。"
6569+msgstr "这个方法适用于你已经在分枝(或主干)提交了版本，要合并这些修改到不同分枝的场合。"
65006570
6571+#. Resource IDs: (594)
6572+msgid "This method covers the case when you want to merge the differences of two different branches into your working copy."
6573+msgstr "此方法适用于合并两个分枝的差异到工作副本"
6574+
65016575 #. Resource IDs: (65535)
65026576 msgid "This product includes software developed by CollabNet (http://www.Collab.Net/)"
65036577 msgstr "本产品包含由 CollabNet(http://www.Collab.Net/) 所开发的软件"
@@ -6676,8 +6750,8 @@
66766750 msgstr "文件改动次数合计："
66776751
66786752 #. Resource IDs: (339)
6679-msgid "Total number of changed revisions"
6680-msgstr "已经修改的版本总数"
6753+msgid "Total number of changes over all cached revisions"
6754+msgstr "在缓存的版本中已经修改的版本数量"
66816755
66826756 #. Resource IDs: (339)
66836757 msgid "Total number of merged revisions"
@@ -7113,6 +7187,15 @@
71137187 msgid "Warning!"
71147188 msgstr "警告！"
71157189
7190+#. Resource IDs: (344)
7191+msgid ""
7192+"When connecting to the respository server is not possible,\n"
7193+"TSVN can switch to using cached data only.\n"
7194+"Select the default beviour here."
7195+msgstr ""
7196+"当不能连接到版本库服务器时，TSVN 可以只使用缓存。\n"
7197+"此处选择缺省行为。"
7198+
71167199 #. Resource IDs: (197)
71177200 msgid "When enabled, the versioned items listed in the commit dialog are automatically selected"
71187201 msgstr "启用时，在提交对话框中列出的受版本控制的项目会被自动选择"
@@ -7284,7 +7367,7 @@
72847367 "Do you want to commit anyway?"
72857368 msgstr ""
72867369 "你的工作副本正处于标记的路径下！\n"
7287-"你必须先切换至主版本或分支才能进行提交动作。\n"
7370+"你必须先切换至主版本或分枝才能进行提交动作。\n"
72887371 "\n"
72897372 "确定要继续提交吗？"
72907373
@@ -7295,8 +7378,8 @@
72957378 "won't look exactly as it was in the revision you're updating to!"
72967379 msgstr ""
72977380 "您本地的工作副本已经修改！\n"
7298-"提示：更新到另一个分支不会丢失这些修改，因此工作副本\n"
7299-"可能看上去和你要更新到的那个分支不是完全一致！"
7381+"提示：更新到另一个分枝不会丢失这些修改，因此工作副本\n"
7382+"可能看上去和你要更新到的那个分枝不是完全一致！"
73007383
73017384 #. Resource IDs: (89)
73027385 msgid ""
@@ -7305,7 +7388,7 @@
73057388 "show up in the branch/tag!"
73067389 msgstr ""
73077390 "你的工作副本已经有本地修改。\n"
7308-"如果你从 HEAD 版本创建分支/标签，你的本地修改不会在分支/标签中出现！"
7391+"如果你从 HEAD 版本创建分枝/标签，你的本地修改不会在分枝/标签中出现！"
73097392
73107393 #. Resource IDs: (32783)
73117394 msgid "Zoo&m out"
@@ -7378,6 +7461,14 @@
73787461 msgid "another item already exists in its place."
73797462 msgstr "其它项目已经存在。"
73807463
7464+#. Resource IDs: (340)
7465+msgid ""
7466+"ask repository first if 'online' -\n"
7467+"work entirely from cache if 'offline'"
7468+msgstr ""
7469+"当在线的时候首先询问版本库 -\n"
7470+"如果离线则全部使用缓存工作"
7471+
73817472 #. Resource IDs: (245)
73827473 msgid "author"
73837474 msgstr "作者"
@@ -7570,7 +7661,7 @@
75707661 msgstr "合并"
75717662
75727663 #. Resource IDs: (65535)
7573-msgid "merges total:"
7664+msgid "merges total: "
75747665 msgstr "合并总计："
75757666
75767667 #. Resource IDs: (10)
@@ -7980,3 +8071,15 @@
79808071 #. Resource IDs: (18, 1002, 1011, 1012)
79818072 msgid "yes"
79828073 msgstr "是"
8074+
8075+#~ msgid "Groups branches together"
8076+#~ msgstr "分组分枝"
8077+
8078+#~ msgid "Number of changed cached revisions"
8079+#~ msgstr "缓存版本的修改次数"
8080+
8081+#~ msgid "Number of path elements. This is an internal value indicating the compression level."
8082+#~ msgstr "路径元素数量。它是指定压缩级别的内部值。"
8083+
8084+#~ msgid "This method covers the case when you have made a feature branch as discussed in the Subversion book. All trunk changes have been ported to the feature branch, week by week, and now the feature is complete you want to merge it back into the trunk. Because you have kept the feature branch synchronized with the trunk, the latest versions of branch and trunk will be absolutely identical except for your branch changes. So in this special case, you would merge by comparing the branch with the trunk."
8085+#~ msgstr "这个方法覆盖了你已经创建了在 Subversion 手册中讨论的特性分枝的情况。所有主干修改已经每周合并到此特性分枝，现在完成了新特性，你需要将它合并回主干。因为你已经保持特性分枝与主干同步，分枝和主干的最新版本除了你的分枝修改都相同。所以在这种情况下，你可以通过比较分枝与主干来合并。"
--- trunk/Languages/po-update.sh (nonexistent)
+++ trunk/Languages/po-update.sh (revision 12297)
@@ -0,0 +1,56 @@
1+#!/bin/sh
2+#
3+# Usage:
4+# ./po-update.sh
5+# - to update all locales
6+# ./po-update.sh LL
7+# - to update one the LL locale
8+
9+set -e
10+
11+MSGMERGE=${MSGMERGE:-msgmerge}
12+
13+tsvn_base=
14+for i in . .. ../..; do
15+ if [ -d "$i/tortoisesvn/Languages" ]; then
16+ tsvn_base="$i"
17+ break
18+ fi
19+done
20+if [ -z "$tsvn_base" ]; then
21+ echo "E: You must run po-update.sh from within a TortoiseSVN source tree." >&2
22+ exit 1
23+fi
24+
25+update_po()
26+{
27+ (cd $tsvn_base/tortoisesvn/Languages &&
28+ for i in $1.po; do
29+ echo "Updating $i..."
30+ msgmerge --no-wrap -o tmp.po $i Tortoise.pot
31+ mv -f tmp.po $i
32+ done )
33+}
34+
35+if [ $# -eq 0 ]; then
36+ update_po \*
37+else
38+ langs=
39+ while [ $# -ge 1 ]; do
40+ case $1 in
41+ pot) ;;
42+ *)
43+ if [ -e $tsvn_base/tortoisesvn/Languages/Tortoise_$1.po ]; then
44+ langs="$langs Tortoise_$1"
45+ else
46+ echo "E: No such .po file 'Tortoise_$1.po'" >&2
47+ exit 1
48+ fi
49+ esac
50+ shift
51+ done
52+ for lang in $langs; do
53+ update_po $lang
54+ done
55+fi
56+
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Show on old repository browser