Commit b46ec2e8 authored by Script Kiddy's avatar Script Kiddy
Browse files

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 64e03f11
Pipeline #77644 skipped
......@@ -65,7 +65,7 @@ Name[th]=แฟ้มประมวลผลได้ของระบบว
Name[tr]=Microsoft Windows Çalıştırılabilir Dosyaları
Name[ug]=Microsoft Windows ئىجراچان ھۆججەتلەر
Name[uk]=Виконувані файли Microsoft Windows
Name[vi]=Tệp thực thi Microsoft Windows
Name[vi]=Tệp thực thi Windows Microsoft
Name[wa]=Fitchîs enondåves Microsoft Windows
Name[x-test]=xxMicrosoft Windows Executablesxx
Name[zh_CN]=Microsoft Windows 可执行文件
......
......@@ -65,7 +65,7 @@ Name[th]=แฟ้มภาพต่าง ๆ ของระบบวินโ
Name[tr]=Microsoft Windows Resimleri
Name[ug]=Microsoft Windows سۈرەتلەر
Name[uk]=Зображення Microsoft Windows
Name[vi]=Ảnh Microsoft Windows
Name[vi]=Ảnh Windows Microsoft
Name[wa]=Imådjes Microsoft Windows
Name[x-test]=xxMicrosoft Windows Imagesxx
Name[zh_CN]=Microsoft Windows 图像
......
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