Commit 1a3875cf 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 d5fa0a96
......@@ -15,6 +15,7 @@ X-KDE-FormFactors=tablet,handset,desktop
Name=Language
Name[ca]=Idioma
Name[ca@valencia]=Idioma
Name[cs]=Jazyk
Name[es]=Idioma
Name[et]=Keel
Name[nl]=Taal
......@@ -27,6 +28,7 @@ Name[zh_TW]=語言
Comment=Change workspace and application languages
Comment[ca]=Canvi dels idiomes de l'espai de treball i les aplicacions
Comment[ca@valencia]=Canvi dels idiomes de l'espai de treball i les aplicacions
Comment[cs]=Změnit pracovní prostředí a jazyk aplikace
Comment[es]=Cambiar el idioma de las aplicaciones y el espacio de trabajo
Comment[et]=Töötsooni ja rakenduse keele muutmine
Comment[nl]=Werkruimte en talen van toepassingen wijzigen
......
......@@ -2,6 +2,7 @@
Name=Language
Name[ca]=Idioma
Name[ca@valencia]=Idioma
Name[cs]=Jazyk
Name[es]=Idioma
Name[et]=Keel
Name[nl]=Taal
......
......@@ -15,6 +15,7 @@ X-KDE-FormFactors=mediacenter
Name=Wifi
Name[ca]=Wi-Fi
Name[ca@valencia]=Wi-Fi
Name[cs]=WiFi
Name[es]=Wifi
Name[et]=WiFi
Name[nl]=Wi-Fi
......
......@@ -2,6 +2,7 @@
Name=Wifi
Name[ca]=Wi-Fi
Name[ca@valencia]=Wi-Fi
Name[cs]=WiFi
Name[es]=Wifi
Name[et]=WiFi
Name[nl]=Wi-Fi
......
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