Commit a92f86c4 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 6f41b762
Pipeline #90189 skipped
......@@ -14,6 +14,7 @@
"Description[uk]": "Перегляд створеного коду асемблера для коду C/C++",
"Description[vi]": "Xem hợp ngữ được sinh cho mã C/C++",
"Description[x-test]": "xxView generated asm for C/C++ codexx",
"Description[zh_CN]": "查看 C/C++ 代码生成的 asm",
"Name": "Compiler Explorer",
"Name[az]": "Kompliyator bələdçisi",
"Name[ca@valencia]": "Explorador de compiladors",
......@@ -28,6 +29,7 @@
"Name[uk]": "Засіб аналізу компілятора",
"Name[vi]": "Trình khảo sát trình biên dịch",
"Name[x-test]": "xxCompiler Explorerxx",
"Name[zh_CN]": "编译器浏览器",
"ServiceTypes": [
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