Revision | 12297 (tree) |
---|---|
Zeit | 2008-03-09 16:26:44 |
Autor | dongsheng.song |
Simplified Chinese GUI translation.
* Languages/Tortoise_zh_CN.po: Update to r12295 of Tortoise.pot
@@ -30,6 +30,7 @@ | ||
30 | 30 | # age 年代 |
31 | 31 | # BASE revision 基础版本 |
32 | 32 | # blame 追溯 |
33 | +# branch 分枝 | |
33 | 34 | # checkout 检出 |
34 | 35 | # default 默认 |
35 | 36 | # HEAD revision 最新版本 |
@@ -56,7 +57,7 @@ | ||
56 | 57 | "Project-Id-Version: TortoiseSVN zh_CN\n" |
57 | 58 | "Report-Msgid-Bugs-To: \n" |
58 | 59 | "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" | |
60 | 61 | "Last-Translator: Dongsheng Song <dongsheng.song@gmail.com>\n" |
61 | 62 | "Language-Team: TortoiseSVN translation team <dev@tortoisesvn.tigris.org>\n" |
62 | 63 | "MIME-Version: 1.0\n" |
@@ -489,8 +490,8 @@ | ||
489 | 490 | msgstr "跳转到指定行(&G)..." |
490 | 491 | |
491 | 492 | #. Resource IDs: (32799) |
492 | -msgid "&Group branches" | |
493 | -msgstr "分组分支(&G)" | |
493 | +msgid "&Group by branch" | |
494 | +msgstr "按照分枝分组(&G)" | |
494 | 495 | |
495 | 496 | #. Resource IDs: (1032, 1115) |
496 | 497 | msgid "&HEAD Revision" |
@@ -668,7 +669,7 @@ | ||
668 | 669 | |
669 | 670 | #. Resource IDs: (1316) |
670 | 671 | msgid "&Reopen commit and branch/tag dialog after a commit failed" |
671 | -msgstr "在提交失败后,重新打开提交或分支/标签对话框(&R)" | |
672 | +msgstr "在提交失败后,重新打开提交或分枝/标签对话框(&R)" | |
672 | 673 | |
673 | 674 | #. Resource IDs: (13) |
674 | 675 | msgid "&Repo-browser" |
@@ -1131,6 +1132,10 @@ | ||
1131 | 1132 | msgid "Always use the system locale settings to show times and dates" |
1132 | 1133 | msgstr "始终使用系统区域设置显示时间和日期" |
1133 | 1134 | |
1135 | +#. Resource IDs: (339) | |
1136 | +msgid "Amount of memory required to load the cache" | |
1137 | +msgstr "加载缓存需要的内存数量" | |
1138 | + | |
1134 | 1139 | #. Resource IDs: (78) |
1135 | 1140 | #, c-format |
1136 | 1141 | msgid "" |
@@ -1189,7 +1194,7 @@ | ||
1189 | 1194 | |
1190 | 1195 | #. Resource IDs: (269) |
1191 | 1196 | msgid "Analyze revision data..." |
1192 | -msgstr "分析分支数据..." | |
1197 | +msgstr "分析分枝数据..." | |
1193 | 1198 | |
1194 | 1199 | #. Resource IDs: (14) |
1195 | 1200 | msgid "Applies a unified diff file to the working copy" |
@@ -1374,15 +1379,15 @@ | ||
1374 | 1379 | |
1375 | 1380 | #. Resource IDs: (115) |
1376 | 1381 | msgid "Branch / tag created successfully!" |
1377 | -msgstr "分支/标记创建成功!" | |
1382 | +msgstr "分枝/标记创建成功!" | |
1378 | 1383 | |
1379 | 1384 | #. Resource IDs: (2052) |
1380 | 1385 | 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 分枝,不管此版本是否修改" | |
1382 | 1387 | |
1383 | 1388 | #. Resource IDs: (9) |
1384 | 1389 | msgid "Branch/&tag..." |
1385 | -msgstr "分支/标记(&T)..." | |
1390 | +msgstr "分枝/标记(&T)..." | |
1386 | 1391 | |
1387 | 1392 | #. Resource IDs: (16) |
1388 | 1393 | msgid "Break loc&k" |
@@ -1426,7 +1431,7 @@ | ||
1426 | 1431 | |
1427 | 1432 | #. Resource IDs: (77) |
1428 | 1433 | msgid "C&reate branch/tag from revision" |
1429 | -msgstr "从版本创建分支/标记(&R)" | |
1434 | +msgstr "从版本创建分枝/标记(&R)" | |
1430 | 1435 | |
1431 | 1436 | #. Resource IDs: (101) |
1432 | 1437 | msgid "C&reate folder..." |
@@ -1864,6 +1869,10 @@ | ||
1864 | 1869 | msgid "Conflicts: %d" |
1865 | 1870 | msgstr "冲突:%d" |
1866 | 1871 | |
1872 | +#. Resource IDs: (345) | |
1873 | +msgid "Connect to the repository server and download missing log data" | |
1874 | +msgstr "连接版本库服务器下载缺少的日志数据" | |
1875 | + | |
1867 | 1876 | #. Resource IDs: (65535) |
1868 | 1877 | msgid "Container sizes" |
1869 | 1878 | msgstr "容器大小" |
@@ -1918,7 +1927,7 @@ | ||
1918 | 1927 | |
1919 | 1928 | #. Resource IDs: (142) |
1920 | 1929 | msgid "Copy (Branch / Tag)" |
1921 | -msgstr "复制(分支/标记)" | |
1930 | +msgstr "复制(分枝/标记)" | |
1922 | 1931 | |
1923 | 1932 | #. Resource IDs: (78) |
1924 | 1933 | msgid "Copy - TortoiseSVN" |
@@ -2191,7 +2200,7 @@ | ||
2191 | 2200 | |
2192 | 2201 | #. Resource IDs: (10) |
2193 | 2202 | msgid "Creates a 'cheap' copy inside the repository used for branches or tagging" |
2194 | -msgstr "在版本库中快速创建副本用作分支或标记" | |
2203 | +msgstr "在版本库中快速创建副本用作分枝或标记" | |
2195 | 2204 | |
2196 | 2205 | #. Resource IDs: (10) |
2197 | 2206 | msgid "Creates a repository database at the current location" |
@@ -2520,6 +2529,10 @@ | ||
2520 | 2529 | msgid "Empty" |
2521 | 2530 | msgstr "空的" |
2522 | 2531 | |
2532 | +#. Resource IDs: (344) | |
2533 | +msgid "Enable log caching to speed up log and revision graph dialogs" | |
2534 | +msgstr "启用缓存来加速日志和版本图对话框" | |
2535 | + | |
2523 | 2536 | #. Resource IDs: (196) |
2524 | 2537 | msgid "" |
2525 | 2538 | "Enable this only if you're working with web projects on VS.NET2003!\n" |
@@ -2714,6 +2727,10 @@ | ||
2714 | 2727 | msgid "Export directory:" |
2715 | 2728 | msgstr "导出目录:" |
2716 | 2729 | |
2730 | +#. Resource IDs: (345) | |
2731 | +msgid "Export the selected cache as a set of Comma Separated Value (CSV) files" | |
2732 | +msgstr "将选中的缓存导出为逗号分割(CSV)的文件" | |
2733 | + | |
2717 | 2734 | #. Resource IDs: (79) |
2718 | 2735 | msgid "Export unversioned files too" |
2719 | 2736 | msgstr "导出无版本控制信息的文件" |
@@ -2997,6 +3014,10 @@ | ||
2997 | 3014 | msgid "Force blame" |
2998 | 3015 | msgstr "强制追溯" |
2999 | 3016 | |
3017 | +#. Resource IDs: (65535) | |
3018 | +msgid "From URL:" | |
3019 | +msgstr "从 URL:" | |
3020 | + | |
3000 | 3021 | #. Resource IDs: (1200, 65535) |
3001 | 3022 | msgid "From:" |
3002 | 3023 | msgstr "起始:" |
@@ -3161,14 +3182,14 @@ | ||
3161 | 3182 | msgid "Graph type:" |
3162 | 3183 | msgstr "MIME 类型" |
3163 | 3184 | |
3185 | +#. Resource IDs: (2050) | |
3186 | +msgid "Group by branch" | |
3187 | +msgstr "按照分枝分组" | |
3188 | + | |
3164 | 3189 | #. Resource IDs: (214) |
3165 | 3190 | msgid "Group changelists" |
3166 | 3191 | msgstr "分组修改列表" |
3167 | 3192 | |
3168 | -#. Resource IDs: (2050) | |
3169 | -msgid "Groups branches together" | |
3170 | -msgstr "分组分支" | |
3171 | - | |
3172 | 3193 | #. Resource IDs: (1229) |
3173 | 3194 | msgid "H&ide unrelated changed paths" |
3174 | 3195 | msgstr "隐藏无关的修改路径(&I)" |
@@ -3833,6 +3854,10 @@ | ||
3833 | 3854 | "列出帮助主题\n" |
3834 | 3855 | "帮助主题" |
3835 | 3856 | |
3857 | +#. Resource IDs: (344) | |
3858 | +msgid "List of repositories for which log information has been cached" | |
3859 | +msgstr "列出被缓存日志信息的对话框" | |
3860 | + | |
3836 | 3861 | #. Resource IDs: (130) |
3837 | 3862 | msgid "Load Images" |
3838 | 3863 | msgstr "载入图片" |
@@ -3963,6 +3988,10 @@ | ||
3963 | 3988 | msgid "Mark as resolved" |
3964 | 3989 | msgstr "标记为已解决" |
3965 | 3990 | |
3991 | +#. Resource IDs: (2052) | |
3992 | +msgid "Mark current revision of your working copy" | |
3993 | +msgstr "标记工作副本的当前版本号" | |
3994 | + | |
3966 | 3995 | #. Resource IDs: (101) |
3967 | 3996 | msgid "Mark for comparison" |
3968 | 3997 | msgstr "为比较标记" |
@@ -4003,6 +4032,10 @@ | ||
4003 | 4032 | msgid "Merge - TortoiseSVN" |
4004 | 4033 | msgstr "合并 - TortoiseSVN" |
4005 | 4034 | |
4035 | +#. Resource IDs: (221) | |
4036 | +msgid "Merge Reintegrate" | |
4037 | +msgstr "合并复兴分枝" | |
4038 | + | |
4006 | 4039 | #. Resource IDs: (1416) |
4007 | 4040 | msgid "Merge a range of revisions" |
4008 | 4041 | msgstr "合并一个版本范围" |
@@ -4054,7 +4087,7 @@ | ||
4054 | 4087 | |
4055 | 4088 | #. Resource IDs: (10) |
4056 | 4089 | msgid "Merges a branch into the main trunk" |
4057 | -msgstr "将分支树合并回主干" | |
4090 | +msgstr "将分枝树合并回主干" | |
4058 | 4091 | |
4059 | 4092 | #. Resource IDs: (14) |
4060 | 4093 | msgid "Merges all missing revisions back into the working copy using merge-tracking information" |
@@ -4366,36 +4399,40 @@ | ||
4366 | 4399 | |
4367 | 4400 | #. Resource IDs: (339) |
4368 | 4401 | msgid "Number of cached revisions" |
4369 | -msgstr "缓存版本数量" | |
4402 | +msgstr "缓存的版本数量" | |
4370 | 4403 | |
4371 | 4404 | #. 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 "有非空修改列表的缓存的版本数量" | |
4374 | 4407 | |
4375 | 4408 | #. 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 "有用户版本属性的缓存的版本数量" | |
4378 | 4411 | |
4379 | 4412 | #. 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 "有尚未缓存的修改列表的缓存的版本数量" | |
4382 | 4415 | |
4416 | +#. Resource IDs: (339) | |
4417 | +msgid "Number of cached revisions whose user revision properties are not cached yet" | |
4418 | +msgstr "有尚未缓存的用户版本属性的缓存的版本数量" | |
4419 | + | |
4383 | 4420 | #. Resource IDs: (338) |
4384 | 4421 | msgid "Number of different paths shown in the log dialog, including parent paths" |
4385 | 4422 | msgstr "在日志对话框中显示的不同路径(包含父路径)数量" |
4386 | 4423 | |
4424 | +#. Resource IDs: (338) | |
4425 | +msgid "Number of different words used in log messages" | |
4426 | +msgstr "在日志对话框中使用的唯一单词数量" | |
4427 | + | |
4387 | 4428 | #. Resource IDs: (339) |
4388 | 4429 | msgid "Number of merged revisions that are not cached yet" |
4389 | 4430 | msgstr "尚未缓存的已经合并版本的数量" |
4390 | 4431 | |
4391 | 4432 | #. 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”。" | |
4394 | 4435 | |
4395 | -#. Resource IDs: (339) | |
4396 | -msgid "Number of user revision properties that are not cached yet" | |
4397 | -msgstr "尚未缓存的用户版本属性数量" | |
4398 | - | |
4399 | 4436 | #. Resource IDs: (1160) |
4400 | 4437 | msgid "Number of weeks:" |
4401 | 4438 | msgstr "周数" |
@@ -4603,7 +4640,7 @@ | ||
4603 | 4640 | msgstr "" |
4604 | 4641 | "请注意:\n" |
4605 | 4642 | "你的工作副本仍设为原来的路径。如果你想要之后的修改会\n" |
4606 | -"提交到刚才创建的地址或分支,你必须先切换到新的URL。\n" | |
4643 | +"提交到刚才创建的地址或分枝,你必须先切换到新的URL。\n" | |
4607 | 4644 | "可使用切换指令来执行此操作。" |
4608 | 4645 | |
4609 | 4646 | #. Resource IDs: (1287) |
@@ -4867,6 +4904,15 @@ | ||
4867 | 4904 | "\\d\t\t\t数字 0-9\n" |
4868 | 4905 | "\\s\t\t\t空白" |
4869 | 4906 | |
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 | + | |
4870 | 4916 | #. Resource IDs: (82) |
4871 | 4917 | msgid "Reject" |
4872 | 4918 | msgstr "拒绝" |
@@ -4935,7 +4981,7 @@ | ||
4935 | 4981 | |
4936 | 4982 | #. Resource IDs: (2052) |
4937 | 4983 | msgid "Remove deleted branches and tags" |
4938 | -msgstr "删除已经删除的分支或标签" | |
4984 | +msgstr "删除已经删除的分枝或标签" | |
4939 | 4985 | |
4940 | 4986 | #. Resource IDs: (15) |
4941 | 4987 | msgid "Remove from &ignore list" |
@@ -4954,9 +5000,13 @@ | ||
4954 | 5000 | "删除属性“%s”于\r\n" |
4955 | 5001 | "%s" |
4956 | 5002 | |
5003 | +#. Resource IDs: (345) | |
5004 | +msgid "Remove the selected cache(s) from disk" | |
5005 | +msgstr "从磁盘删除选择的缓存" | |
5006 | + | |
4957 | 5007 | #. Resource IDs: (1332) |
4958 | 5008 | msgid "Remove..." |
4959 | -msgstr "移除..." | |
5009 | +msgstr "删除..." | |
4960 | 5010 | |
4961 | 5011 | #. Resource IDs: (65535) |
4962 | 5012 | msgid "Removed" |
@@ -5184,7 +5234,7 @@ | ||
5184 | 5234 | #. Resource IDs: (269, 270, 272) |
5185 | 5235 | #, c-format |
5186 | 5236 | msgid "Revision %ld" |
5187 | -msgstr "版本分支 %ld" | |
5237 | +msgstr "版本分枝 %ld" | |
5188 | 5238 | |
5189 | 5239 | #. Resource IDs: (120) |
5190 | 5240 | #, c-format |
@@ -5193,7 +5243,7 @@ | ||
5193 | 5243 | |
5194 | 5244 | #. Resource IDs: (15) |
5195 | 5245 | msgid "Revision &graph" |
5196 | -msgstr "版本分支图(&G)" | |
5246 | +msgstr "版本分枝图(&G)" | |
5197 | 5247 | |
5198 | 5248 | #. Resource IDs: (65535) |
5199 | 5249 | msgid "Revision / Author:" |
@@ -5201,11 +5251,11 @@ | ||
5201 | 5251 | |
5202 | 5252 | #. Resource IDs: (182) |
5203 | 5253 | msgid "Revision Graph" |
5204 | -msgstr "版本分支图" | |
5254 | +msgstr "版本分枝图" | |
5205 | 5255 | |
5206 | 5256 | #. Resource IDs: (239) |
5207 | 5257 | msgid "Revision Graph Filter" |
5208 | -msgstr "版本分支图过滤器" | |
5258 | +msgstr "版本分枝图过滤器" | |
5209 | 5259 | |
5210 | 5260 | #. Resource IDs: (228) |
5211 | 5261 | msgid "Revision Range" |
@@ -5213,7 +5263,7 @@ | ||
5213 | 5263 | |
5214 | 5264 | #. Resource IDs: (269, 65535) |
5215 | 5265 | msgid "Revision graph" |
5216 | -msgstr "版本分支图" | |
5266 | +msgstr "版本分枝图" | |
5217 | 5267 | |
5218 | 5268 | #. Resource IDs: (65535) |
5219 | 5269 | msgid "Revision range to merge" |
@@ -5402,6 +5452,10 @@ | ||
5402 | 5452 | msgid "Saved Data" |
5403 | 5453 | msgstr "已保存数据" |
5404 | 5454 | |
5455 | +#. Resource IDs: (344) | |
5456 | +msgid "Saves expensive server roundtrips when set to longer than 0 seconds" | |
5457 | +msgstr "当设置为大于0的值十节约昂贵的服务器往返时间" | |
5458 | + | |
5405 | 5459 | #. Resource IDs: (581) |
5406 | 5460 | msgid "Saves the selected property value to a file" |
5407 | 5461 | msgstr "将选择的属性值保存到文件" |
@@ -5633,6 +5687,10 @@ | ||
5633 | 5687 | msgid "Show &Range..." |
5634 | 5688 | msgstr "显示范围(&R)..." |
5635 | 5689 | |
5690 | +#. Resource IDs: (32826) | |
5691 | +msgid "Show &WC revision" | |
5692 | +msgstr "显示工作副本的版本号(&W)" | |
5693 | + | |
5636 | 5694 | #. Resource IDs: (32796) |
5637 | 5695 | msgid "Show &all revisions" |
5638 | 5696 | msgstr "显示全部版本(&A)" |
@@ -5749,6 +5807,10 @@ | ||
5749 | 5807 | "以特殊字符显示空白字符\n" |
5750 | 5808 | "显示空白字符" |
5751 | 5809 | |
5810 | +#. Resource IDs: (345) | |
5811 | +msgid "Show statistics for the selected log cache" | |
5812 | +msgstr "显示选定的日志缓存统计" | |
5813 | + | |
5752 | 5814 | #. Resource IDs: (2052) |
5753 | 5815 | msgid "Show tags on the copy source, not as separate nodes" |
5754 | 5816 | msgstr "在复制源显示标签,而不是单独节点" |
@@ -5782,7 +5844,7 @@ | ||
5782 | 5844 | |
5783 | 5845 | #. Resource IDs: (15) |
5784 | 5846 | msgid "Shows a graphical representation of copies/tags/branches" |
5785 | -msgstr "以图形方式显示版本和标签的分支图" | |
5847 | +msgstr "以图形方式显示版本和标签的分枝图" | |
5786 | 5848 | |
5787 | 5849 | #. Resource IDs: (13) |
5788 | 5850 | msgid "Shows all files which were changed since the last update, locally and in the repository" |
@@ -5829,6 +5891,10 @@ | ||
5829 | 5891 | msgstr "缓存的全部文本信息的大小" |
5830 | 5892 | |
5831 | 5893 | #. Resource IDs: (339) |
5894 | +msgid "Size of the cache file on disk" | |
5895 | +msgstr "磁盘缓存文件的大小" | |
5896 | + | |
5897 | +#. Resource IDs: (339) | |
5832 | 5898 | msgid "Size of the cache if it were not compressed" |
5833 | 5899 | msgstr "没有压缩时缓存的大小" |
5834 | 5900 |
@@ -5963,7 +6029,7 @@ | ||
5963 | 6029 | |
5964 | 6030 | #. Resource IDs: (1232) |
5965 | 6031 | msgid "Sw&itch working copy to new branch/tag" |
5966 | -msgstr "切换工作副本至新分支/标记(&I)" | |
6032 | +msgstr "切换工作副本至新分枝/标记(&I)" | |
5967 | 6033 | |
5968 | 6034 | #. Resource IDs: (229) |
5969 | 6035 | #, c-format |
@@ -5980,7 +6046,7 @@ | ||
5980 | 6046 | |
5981 | 6047 | #. Resource IDs: (140) |
5982 | 6048 | msgid "Switch To Branch / Tag" |
5983 | -msgstr "切换至分支/标记" | |
6049 | +msgstr "切换至分枝/标记" | |
5984 | 6050 | |
5985 | 6051 | #. Resource IDs: (3606) |
5986 | 6052 | msgid "" |
@@ -6024,8 +6090,12 @@ | ||
6024 | 6090 | |
6025 | 6091 | #. Resource IDs: (9) |
6026 | 6092 | msgid "Switch working copy to another branch / tag" |
6027 | -msgstr "切换工作副本至其它分支/标记" | |
6093 | +msgstr "切换工作副本至其它分枝/标记" | |
6028 | 6094 | |
6095 | +#. Resource IDs: (65535) | |
6096 | +msgid "Switch:" | |
6097 | +msgstr "切换:" | |
6098 | + | |
6029 | 6099 | #. Resource IDs: (325) |
6030 | 6100 | msgid "Switches the comparison left<<->right" |
6031 | 6101 | msgstr "左右切换比较" |
@@ -6491,13 +6561,17 @@ | ||
6491 | 6561 | "com1-com9,lpt1-lpt9,prn,aux,con,nul,clock$" |
6492 | 6562 | |
6493 | 6563 | #. 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 手册中讨论的新特性分枝,要合并分枝到主干的场合。" | |
6496 | 6566 | |
6497 | 6567 | #. Resource IDs: (594) |
6498 | 6568 | 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 "这个方法适用于你已经在分枝(或主干)提交了版本,要合并这些修改到不同分枝的场合。" | |
6500 | 6570 | |
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 | + | |
6501 | 6575 | #. Resource IDs: (65535) |
6502 | 6576 | msgid "This product includes software developed by CollabNet (http://www.Collab.Net/)" |
6503 | 6577 | msgstr "本产品包含由 CollabNet(http://www.Collab.Net/) 所开发的软件" |
@@ -6676,8 +6750,8 @@ | ||
6676 | 6750 | msgstr "文件改动次数合计:" |
6677 | 6751 | |
6678 | 6752 | #. Resource IDs: (339) |
6679 | -msgid "Total number of changed revisions" | |
6680 | -msgstr "已经修改的版本总数" | |
6753 | +msgid "Total number of changes over all cached revisions" | |
6754 | +msgstr "在缓存的版本中已经修改的版本数量" | |
6681 | 6755 | |
6682 | 6756 | #. Resource IDs: (339) |
6683 | 6757 | msgid "Total number of merged revisions" |
@@ -7113,6 +7187,15 @@ | ||
7113 | 7187 | msgid "Warning!" |
7114 | 7188 | msgstr "警告!" |
7115 | 7189 | |
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 | + | |
7116 | 7199 | #. Resource IDs: (197) |
7117 | 7200 | msgid "When enabled, the versioned items listed in the commit dialog are automatically selected" |
7118 | 7201 | msgstr "启用时,在提交对话框中列出的受版本控制的项目会被自动选择" |
@@ -7284,7 +7367,7 @@ | ||
7284 | 7367 | "Do you want to commit anyway?" |
7285 | 7368 | msgstr "" |
7286 | 7369 | "你的工作副本正处于标记的路径下!\n" |
7287 | -"你必须先切换至主版本或分支才能进行提交动作。\n" | |
7370 | +"你必须先切换至主版本或分枝才能进行提交动作。\n" | |
7288 | 7371 | "\n" |
7289 | 7372 | "确定要继续提交吗?" |
7290 | 7373 |
@@ -7295,8 +7378,8 @@ | ||
7295 | 7378 | "won't look exactly as it was in the revision you're updating to!" |
7296 | 7379 | msgstr "" |
7297 | 7380 | "您本地的工作副本已经修改!\n" |
7298 | -"提示:更新到另一个分支不会丢失这些修改,因此工作副本\n" | |
7299 | -"可能看上去和你要更新到的那个分支不是完全一致!" | |
7381 | +"提示:更新到另一个分枝不会丢失这些修改,因此工作副本\n" | |
7382 | +"可能看上去和你要更新到的那个分枝不是完全一致!" | |
7300 | 7383 | |
7301 | 7384 | #. Resource IDs: (89) |
7302 | 7385 | msgid "" |
@@ -7305,7 +7388,7 @@ | ||
7305 | 7388 | "show up in the branch/tag!" |
7306 | 7389 | msgstr "" |
7307 | 7390 | "你的工作副本已经有本地修改。\n" |
7308 | -"如果你从 HEAD 版本创建分支/标签,你的本地修改不会在分支/标签中出现!" | |
7391 | +"如果你从 HEAD 版本创建分枝/标签,你的本地修改不会在分枝/标签中出现!" | |
7309 | 7392 | |
7310 | 7393 | #. Resource IDs: (32783) |
7311 | 7394 | msgid "Zoo&m out" |
@@ -7378,6 +7461,14 @@ | ||
7378 | 7461 | msgid "another item already exists in its place." |
7379 | 7462 | msgstr "其它项目已经存在。" |
7380 | 7463 | |
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 | + | |
7381 | 7472 | #. Resource IDs: (245) |
7382 | 7473 | msgid "author" |
7383 | 7474 | msgstr "作者" |
@@ -7570,7 +7661,7 @@ | ||
7570 | 7661 | msgstr "合并" |
7571 | 7662 | |
7572 | 7663 | #. Resource IDs: (65535) |
7573 | -msgid "merges total:" | |
7664 | +msgid "merges total: " | |
7574 | 7665 | msgstr "合并总计:" |
7575 | 7666 | |
7576 | 7667 | #. Resource IDs: (10) |
@@ -7980,3 +8071,15 @@ | ||
7980 | 8071 | #. Resource IDs: (18, 1002, 1011, 1012) |
7981 | 8072 | msgid "yes" |
7982 | 8073 | 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 手册中讨论的特性分枝的情况。所有主干修改已经每周合并到此特性分枝,现在完成了新特性,你需要将它合并回主干。因为你已经保持特性分枝与主干同步,分枝和主干的最新版本除了你的分枝修改都相同。所以在这种情况下,你可以通过比较分枝与主干来合并。" |
@@ -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 | + |