diff --git a/translations/messages/kdiff3/zh_CN.po b/translations/messages/kdiff3/zh_CN.po index c93f2e5..58b5d64 100644 --- a/translations/messages/kdiff3/zh_CN.po +++ b/translations/messages/kdiff3/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" "POT-Creation-Date: 2023-11-26 18:16+0000\n" -"PO-Revision-Date: 2025-01-27 17:12+0000\n" +"PO-Revision-Date: 2025-04-24 18:28+0000\n" "Last-Translator: Toad114514 \n" "Language-Team: Chinese (Simplified) \n" @@ -79,9 +79,8 @@ msgid "Severe Internal Error" msgstr "严重内部错误" #: difftextwindow.cpp:1643 kdiff3.cpp:772 -#, fuzzy msgid "Top line" -msgstr "顶端行数 %1" +msgstr "顶端行数" #: difftextwindow.cpp:1653 msgid "End" @@ -599,9 +598,8 @@ msgid "Dest: " msgstr "目标:" #: directorymergewindow.cpp:2833 -#, fuzzy msgid "Save Directory Merge State As..." -msgstr "目录合并" +msgstr "保存目录合并状态为..." #: directorymergewindow.cpp:2920 msgid "Start/Continue Directory Merge" @@ -649,12 +647,11 @@ msgstr "全部项目无操作" #: directorymergewindow.cpp:2938 msgid "Show Identical Files" -msgstr "" +msgstr "显示相同文件" #: directorymergewindow.cpp:2939 -#, fuzzy msgid "Show Different Files" -msgstr "不同文件数:" +msgstr "显示不同文件" #: directorymergewindow.cpp:2940 msgid "Show Files only in A" @@ -669,14 +666,12 @@ msgid "Show Files only in C" msgstr "仅在 C 显示文件" #: directorymergewindow.cpp:2946 -#, fuzzy msgid "Compare Explicitly Selected Files" msgstr "比较所选文件" #: directorymergewindow.cpp:2947 -#, fuzzy msgid "Merge Explicitly Selected Files" -msgstr "比较所选文件" +msgstr "合并所选文件" #: directorymergewindow.cpp:2949 directorymergewindow.cpp:2956 msgid "Do Nothing" @@ -798,14 +793,12 @@ msgid "Listing directory: %1" msgstr "目录列表:%1" #: kdiff3.cpp:145 -#, fuzzy msgid "Current Configuration:" -msgstr "当前项目同步操作" +msgstr "目前配置:" #: kdiff3.cpp:150 -#, fuzzy msgid "Config Option Error:" -msgstr "文件打开出错" +msgstr "配置选项出错:" #: kdiff3.cpp:193 msgid "Option --auto used, but no output file specified." @@ -861,7 +854,7 @@ msgstr "粘贴剪贴板内容到实际位置" #: kdiff3.cpp:453 msgid "Select everything in current window" -msgstr "" +msgstr "在当前窗口中全选" #: kdiff3.cpp:455 msgid "Search for a string" @@ -1003,21 +996,19 @@ msgstr "设置 Delta 为冲突" #: kdiff3.cpp:523 msgid "Run Regular Expression Auto Merge" -msgstr "" +msgstr "运行正则表达式自动合并" #: kdiff3.cpp:524 -#, fuzzy msgid "Automatically Solve History Conflicts" -msgstr "自动解决简单冲突" +msgstr "自动解决历史冲突" #: kdiff3.cpp:525 msgid "Split Diff At Selection" -msgstr "" +msgstr "在选定时分割差异" #: kdiff3.cpp:526 -#, fuzzy msgid "Join Selected Diffs" -msgstr "比较所选文件" +msgstr "添加所选的 Diff" #: kdiff3.cpp:528 msgid "Show Window A" @@ -1057,11 +1048,11 @@ msgstr "在 Diff 窗口自动换行" #: kdiff3.cpp:538 msgid "Add Manual Diff Alignment" -msgstr "" +msgstr "添加手册的差异准" #: kdiff3.cpp:539 msgid "Clear All Manual Diff Alignments" -msgstr "" +msgstr "清除所有手册的差异准" #: kdiff3.cpp:544 msgid "Focus Prev Window" @@ -1109,22 +1100,20 @@ msgid "Saving file with a new filename..." msgstr "正在用新文件名保存文件..." #: kdiff3.cpp:751 -#, fuzzy msgid "Printing..." -msgstr "正在退出..." +msgstr "打印中..." #: kdiff3.cpp:757 kdiff3.cpp:919 msgid "Printing aborted." -msgstr "" +msgstr "打印被取消。" #: kdiff3.cpp:889 msgid "Selection" -msgstr "" +msgstr "选择" #: kdiff3.cpp:915 -#, fuzzy msgid "Printing completed." -msgstr "合并操作完成。" +msgstr "打印操作完成。" #: kdiff3.cpp:925 msgid "Exiting..." @@ -1203,16 +1192,15 @@ msgstr "候选可见名替换。每次输入提供。" msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " "\"AutoAdvance=1\"" -msgstr "" +msgstr "覆盖了一个配置设置。为所有设置使用一次命令。例如:“AutoAdvance=1”" #: main.cpp:54 msgid "Show list of config settings and current values." -msgstr "" +msgstr "列出配置设置和目前参数。" #: main.cpp:55 -#, fuzzy msgid "Use a different config file." -msgstr "不同文件数:" +msgstr "使用一个不同的时候的:" #: main.cpp:59 msgid "file1 to open (base, if not specified via --base)" @@ -1228,7 +1216,7 @@ msgstr "要打开的文件 3" #: main.cpp:93 msgid "Ignored. (User defined.)" -msgstr "" +msgstr "取消。(用户因素。)" #: kdiff3_part.rc:16 main.cpp:173 #, no-c-format