Commit 9291b9d0 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 d23c7465
......@@ -25,6 +25,7 @@
"Description[nb]": "Håndterer Bluetooth-hendelser",
"Description[nl]": "Behandelt bluetooth-gebeurtenissen",
"Description[nn]": "Handterer Bluetooth-hendingar",
"Description[pa]": "ਬਲੂਟੁੱਥ ਘਟਨਾਵਾਂ ਕੰਟਰੋਲ ਕਰਨ ਲਈ",
"Description[pl]": "Obsługuje zdarzenia Bluetooth",
"Description[pt]": "Lida com os eventos do Bluetooth",
"Description[pt_BR]": "Lida com os eventos de Bluetooth",
......@@ -68,6 +69,7 @@
"Name[nb]": "Bluetooth",
"Name[nl]": "Bluetooth",
"Name[nn]": "Bluetooth",
"Name[pa]": "ਬਲੂਟੁੱਥ",
"Name[pl]": "Bluetooth",
"Name[pt]": "Bluetooth",
"Name[pt_BR]": "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