Skip to content

Some more Update Merge.rc incorporated #1231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Mar 4, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions Translations/WinMerge/Bulgarian.po
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,19 @@ msgid "Copy to Middle"
msgstr ""

msgid "C&opy to Right\tAlt+Right"
msgstr ""
msgstr "Копиране в&дясно\tAlt+Right"

msgid "Copy from Middle"
msgstr ""

msgid "Copy fro&m Right\tAlt+Shift+Left"
msgstr ""
msgstr "Копиране отд&ясно\tAlt+Shift+Left"

msgid "Cop&y to Left\tAlt+Left"
msgstr ""
msgstr "Копиране в&ляво\tAlt+Left"

msgid "Copy &from Left\tAlt+Shift+Right"
msgstr ""
msgstr "Копиране &отляво\tAlt+Shift+Right"

msgid "Copy Selected Line(s) to Middle"
msgstr ""
Expand Down Expand Up @@ -1090,7 +1090,7 @@ msgid "Show \"Select Files or Folders\" Dialog on Startup"
msgstr "Показване „Избиране на файлове или папки“ при стартиране"

msgid "Close \"Select Files or Folders\" Dialog on clicking Compare button"
msgstr ""
msgstr "Затваряне „Избиране на файлове или папки“ при избиране на бутон Сравняване"

msgid "Op&en-dialog Auto-Completion:"
msgstr "Автоматично &довършване в „Избиране на файлове или папки“:"
Expand Down Expand Up @@ -2260,7 +2260,7 @@ msgstr "Файлове с филтри (*.flt)|*.flt|Всички файлове

#, c-format
msgid "Cannot find file filter template file!\n\nPlease copy file %1 to WinMerge/Filters folder:\n%2."
msgstr ""
msgstr "Шаблонът за филтри не може да бъде намерен!\n\nМоля, копирайте файла %1 в папката WinMerge/Filters:\n%2."

#, c-format
msgid ""
Expand Down Expand Up @@ -3056,13 +3056,13 @@ msgid "Text files are identical"
msgstr "Текстовите файлове са еднакви"

msgid " (Middle and right are identical)"
msgstr ""
msgstr " (Среда и дясно са еднакви)"

msgid " (Left and right are identical)"
msgstr ""
msgstr " (Ляво и дясно са еднакви)"

msgid " (Left and middle are identical)"
msgstr ""
msgstr " (Ляво и среда са еднакви)"

msgid "Text files are different"
msgstr "Текстовите файлове са различни"
Expand Down Expand Up @@ -3140,13 +3140,13 @@ msgid "Tells which side has newer modification date."
msgstr "Показва коя секция има късна дата на промяна."

msgid "Left side file version, only for some file types."
msgstr ""
msgstr "Версия на файла вляво, само за файлове от един вид."

msgid "Right side file version, only for some file types."
msgstr ""
msgstr "Версия на файла вдясно, само за файлове от един вид."

msgid "Middle side file version, only for some file types."
msgstr ""
msgstr "Версия на файла всредата, само за файлове от един вид."

msgid "Short comparison result."
msgstr "Кратък резултат от сравнението."
Expand Down Expand Up @@ -3560,16 +3560,16 @@ msgstr ""
"Последно различие (Alt+End)"

msgid "\nCopy to Right (Alt+Right)"
msgstr ""
msgstr "\nКопира вдясно (Alt+Right)"

msgid "\nCopy to Left (Alt+Left)"
msgstr ""
msgstr "\nКопира вляво (Alt+Left)"

msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)"
msgstr ""
msgstr "\nКопира вдясно и продължава (Ctrl+Alt+Right)"

msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)"
msgstr ""
msgstr "\nКопира вляво и продължава (Ctrl+Alt+Left)"

msgid "\nCopy All to Right"
msgstr "\nКопирай &всичко в дясно"
Expand Down
36 changes: 18 additions & 18 deletions Translations/WinMerge/ChineseSimplified.po
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,19 @@ msgid "Copy to Middle"
msgstr "复制到中间"

msgid "C&opy to Right\tAlt+Right"
msgstr ""
msgstr "复制到右侧(&O)\tAlt+Right"

msgid "Copy from Middle"
msgstr "从中间复制"

msgid "Copy fro&m Right\tAlt+Shift+Left"
msgstr ""
msgstr "从右侧复制(&M)\tAlt+Shift+Left"

msgid "Cop&y to Left\tAlt+Left"
msgstr ""
msgstr "复制到左侧(&Y)\tAlt+Left"

msgid "Copy &from Left\tAlt+Shift+Right"
msgstr ""
msgstr "从左侧复制(&F)\tAlt+Shift+Right"

msgid "Copy Selected Line(s) to Middle"
msgstr "复制选中行到中间"
Expand Down Expand Up @@ -210,7 +210,7 @@ msgid "&Vector Image Scaling"
msgstr "矢量图形缩放 (&V)"

msgid "Compare Extracted &Text From Images"
msgstr ""
msgstr "比较从图像中解析的文字(&T)"

msgid "&File"
msgstr "文件(&F)"
Expand Down Expand Up @@ -1370,10 +1370,10 @@ msgid "Default arguments:"
msgstr "默认参数:"

msgid "Display all plugins, don't check the extension"
msgstr ""
msgstr "显示所有插件, 不检查文件扩展名"

msgid "&Open files in the same window type after unpacking"
msgstr ""
msgstr "解包后在同一窗口类型中打开文件(&O)。"

msgid "&Plugin Pipeline:"
msgstr "插件流程(pipeline)(&P):"
Expand Down Expand Up @@ -2259,7 +2259,7 @@ msgstr "过滤器文件 (*.flt)|*.flt|所有文件 (*.*)|*.*||"

#, c-format
msgid "Cannot find file filter template file!\n\nPlease copy file %1 to WinMerge/Filters folder:\n%2."
msgstr ""
msgstr "无法找到文件过滤器模板!\n\n请将文件 %1 复制到 WinMerge/Filters 文件夹下。"

#, c-format
msgid ""
Expand Down Expand Up @@ -3037,13 +3037,13 @@ msgid "Text files are identical"
msgstr "文本文件完全相同"

msgid " (Middle and right are identical)"
msgstr ""
msgstr " (中间和右侧完全相同)"

msgid " (Left and right are identical)"
msgstr ""
msgstr " (左侧和右侧完全相同)"

msgid " (Left and middle are identical)"
msgstr ""
msgstr " (左侧和中间完全相同)"

msgid "Text files are different"
msgstr "文本文件不同"
Expand Down Expand Up @@ -3121,13 +3121,13 @@ msgid "Tells which side has newer modification date."
msgstr "显示哪边是较晚才被修改。"

msgid "Left side file version, only for some file types."
msgstr ""
msgstr "左侧的文件版本,只对部分文件类型有效。"

msgid "Right side file version, only for some file types."
msgstr ""
msgstr "右侧的文件版本,只对部分文件类型有效。"

msgid "Middle side file version, only for some file types."
msgstr ""
msgstr "中间的文件版本,只对部分文件类型有效。"

msgid "Short comparison result."
msgstr "简短格式的比较结果。"
Expand Down Expand Up @@ -3526,16 +3526,16 @@ msgstr ""
"末个差异 (Alt+End)"

msgid "\nCopy to Right (Alt+Right)"
msgstr ""
msgstr "\n复制到右侧 (Alt+Right)"

msgid "\nCopy to Left (Alt+Left)"
msgstr ""
msgstr "\n复制到左侧 (Alt+Left)"

msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)"
msgstr ""
msgstr "\n复制到右侧并前进 (Ctrl+Alt+Right)"

msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)"
msgstr ""
msgstr "\n复制到左侧并前进 (Ctrl+Alt+Left)"

msgid ""
"\n"
Expand Down
32 changes: 16 additions & 16 deletions Translations/WinMerge/ChineseTraditional.po
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,19 @@ msgid "Copy to Middle"
msgstr "複製到中間"

msgid "C&opy to Right\tAlt+Right"
msgstr ""
msgstr "複製到右側 (&O)\tAlt+Right"

msgid "Copy from Middle"
msgstr "從中間複製"

msgid "Copy fro&m Right\tAlt+Shift+Left"
msgstr ""
msgstr "從右側複製 (&M)\tAlt+Shift+Left"

msgid "Cop&y to Left\tAlt+Left"
msgstr ""
msgstr "複製到左側 (&Y)\tAlt+Left"

msgid "Copy &from Left\tAlt+Shift+Right"
msgstr ""
msgstr "從左側複製 (&F)\tAlt+Shift+Right"

msgid "Copy Selected Line(s) to Middle"
msgstr "複製所選行到中間"
Expand Down Expand Up @@ -237,7 +237,7 @@ msgid "&Vector Image Scaling"
msgstr "向量圖縮放 (&V)"

msgid "Compare Extracted &Text From Images"
msgstr ""
msgstr "比較從圖片中擷取的文字 (&T)"

#, c-format
msgid "&File"
Expand Down Expand Up @@ -2784,7 +2784,7 @@ msgstr "檔案篩選器 (*.flt)|*.flt|所有檔案 (*.*)|*.*||"

#, c-format
msgid "Cannot find file filter template file!\n\nPlease copy file %1 to WinMerge/Filters folder:\n%2."
msgstr ""
msgstr "找不到檔案篩選器樣板檔!\n\n請複製檔案 %1 到 WinMerge/檔案篩選器-資料夾:\n%2。"

#, c-format
msgid ""
Expand Down Expand Up @@ -3649,13 +3649,13 @@ msgid "Text files are identical"
msgstr "文字檔內容相同"

msgid " (Middle and right are identical)"
msgstr ""
msgstr " (中間和右側內容相同)"

msgid " (Left and right are identical)"
msgstr ""
msgstr " (左側和右側內容相同)"

msgid " (Left and middle are identical)"
msgstr ""
msgstr " (左側和中間內容相同)"

#, c-format
msgid "Text files are different"
Expand Down Expand Up @@ -3752,13 +3752,13 @@ msgid "Tells which side has newer modification date."
msgstr "告知哪邊有較新的修改日期。"

msgid "Left side file version, only for some file types."
msgstr ""
msgstr "左側檔案版本,只某些檔案類型。"

msgid "Right side file version, only for some file types."
msgstr ""
msgstr "右側檔案版本,只某些檔案類型。"

msgid "Middle side file version, only for some file types."
msgstr ""
msgstr "中間檔案版本,只某些檔案類型。"

#, c-format
msgid "Short comparison result."
Expand Down Expand Up @@ -4215,16 +4215,16 @@ msgstr ""
"最後一個差異 (Alt+End)"

msgid "\nCopy to Right (Alt+Right)"
msgstr ""
msgstr "\n複製到右側 (Alt+Right)"

msgid "\nCopy to Left (Alt+Left)"
msgstr ""
msgstr "\n複製到左側 (Alt+Left)"

msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)"
msgstr ""
msgstr "\n複製到右側後到下一個 (Ctrl+Alt+Right)"

msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)"
msgstr ""
msgstr "\n複製到左側後到下一個 (Ctrl+Alt+Left)"

msgid "\nCopy All to Right"
msgstr ""
Expand Down
Loading