Commit 81270cb6 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 f27572f4
Pipeline #111702 skipped
......@@ -17,6 +17,7 @@
"Name[ko]": "Nicolas Fella",
"Name[lt]": "Nicolas Fella",
"Name[nl]": "Nicolas Fella",
"Name[nn]": "Nicolas Fella",
"Name[pl]": "Nicolas Fella",
"Name[pt]": "Nicolas Fella",
"Name[pt_BR]": "Nicolas Fella",
......@@ -41,6 +42,7 @@
"Description[ko]": "블루투스 장치 관리",
"Description[lt]": "Tvarkyti Bluetooth įrenginius",
"Description[nl]": "Bluetooth-apparaten beheren",
"Description[nn]": "Handsam Bluetooth-einingar",
"Description[pl]": "Zarządzanie urządzeniami Bluetooth",
"Description[pt]": "Gerir os dispositivos Bluetooth",
"Description[pt_BR]": "Gerenciar dispositivos Bluetooth",
......
Supports Markdown
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