Commit 745d8b8d 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 d95695f6
Pipeline #5042 passed with stage
in 18 minutes and 37 seconds
......@@ -13,7 +13,7 @@ Name[fr]=Configuration
Name[gl]=Configuración
Name[it]=Impostazioni
Name[ko]=설정
Name[lt]=Nustatymai
Name[lt]=Nuostatos
Name[nl]=Instellingen
Name[nn]=Innstillingar
Name[pl]=Ustawienia
......@@ -40,7 +40,7 @@ GenericName[fr]=Paramètres
GenericName[gl]=Configuración
GenericName[it]=Impostazioni
GenericName[ko]=설정
GenericName[lt]=Nustatymai
GenericName[lt]=Nuostatos
GenericName[nl]=Instellingen
GenericName[nn]=Innstillingar
GenericName[pl]=Ustawienia
......@@ -66,7 +66,7 @@ Comment[fi]=Plasman asetukset
Comment[gl]=Configuración de Plasma
Comment[it]=Impostazioni per Plasma
Comment[ko]=Plasma 설정
Comment[lt]=Plasma nustatymai
Comment[lt]=Plasma nuostatos
Comment[nl]=Instellingen voor Plasma
Comment[nn]=Plasma-innstillingar
Comment[pl]=Ustawienia dla Plazmy
......
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