Commit 4d165bd1 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 0471922f
......@@ -7,6 +7,7 @@ Name[es]=Mycroft Bigscreen
Name[et]=Mycrofti suurekraan
Name[nl]=Mycroft Bigscreen
Name[pt]=Mycroft de Grande Ecrã
Name[sk]=Mycroft Bigscreen
Name[sv]=Mycroft storbildsskärm
Name[uk]=Mycroft для великих екранів
Name[x-test]=xxMycroft Bigscreenxx
......
......@@ -19,6 +19,7 @@ Name[es]=Idioma
Name[et]=Keel
Name[nl]=Taal
Name[pt]=Língua
Name[sk]=Jazyk
Name[sv]=Språk
Name[uk]=Мова
Name[x-test]=xxLanguagexx
......
......@@ -6,6 +6,7 @@ Name[es]=Idioma
Name[et]=Keel
Name[nl]=Taal
Name[pt]=Língua
Name[sk]=Jazyk
Name[sv]=Språk
Name[uk]=Мова
Name[x-test]=xxLanguagexx
......
......@@ -19,6 +19,7 @@ Name[es]=Wifi
Name[et]=WiFi
Name[nl]=Wi-Fi
Name[pt]=Wi-Fi
Name[sk]=Wifi
Name[sv]=WIFI
Name[uk]=Wi-Fi
Name[x-test]=xxWifixx
......
......@@ -6,6 +6,7 @@ Name[es]=Wifi
Name[et]=WiFi
Name[nl]=Wi-Fi
Name[pt]=Wi-Fi
Name[sk]=Wifi
Name[sv]=WIFI
Name[uk]=Wi-Fi
Name[x-test]=xxWifixx
......
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