Commit bdf532ec 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 688e0492
......@@ -18,6 +18,7 @@
"Description[id]": "Menangani peristiwa Bluetooth",
"Description[it]": "Gestisce gli eventi Bluetooth",
"Description[ko]": "블루투스 이벤트 처리",
"Description[nb]": "Håndterer Bluetooth-hendelser",
"Description[nl]": "Behandelt bluetooth-gebeurtenissen",
"Description[nn]": "Handterer Bluetooth-hendingar",
"Description[pl]": "Obsługuje zdarzenia Bluetooth",
......
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