Commit 5b425058 authored by Script Kiddy's avatar Script Kiddy

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
parent 77487938
Pipeline #6727 passed with stage
in 7 minutes and 50 seconds
......@@ -25,6 +25,7 @@
"Name[sv]": "Jämför/Sammanfoga filer/kataloger med KDiff3",
"Name[uk]": "Порівняння та об'єднання файлів та каталогів за допомогою KDiff3",
"Name[x-test]": "xxCompare/Merge Files/Directories with KDiff3xx",
"Name[zh_CN]": "使用KDiff3比较/合并文件或文件夹",
"Name[zh_TW]": "使用 KDiff3 比較/合併檔案或資料夾",
"ServiceTypes": [
"KFileItemAction/Plugin"
......
......@@ -150,7 +150,7 @@ Comment[tr]=Bir Dosya Ve Dizin Karşılaştırma Ve Birleştirme Aracı
Comment[ug]=ھۆججەت ۋە مۇندەرىجە سېلىشتۇرۇش ۋە بىرىكتۈرۈش قورالى
Comment[uk]=Інструмент для порівняння та з’єднання файлів та тек
Comment[x-test]=xxA File And Directory Comparison And Merge Toolxx
Comment[zh_CN]=一个文件和目录的比较和合并工具
Comment[zh_CN]=文件和文件夹比较合并工具
Comment[zh_TW]=一個檔案與目錄比較與合併的工具
Terminal=false
Categories=Qt;KDE;Development;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment