Commit f218a4f4 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 82032b86
Pipeline #23253 failed with stage
in 1 minute and 5 seconds
......@@ -11,6 +11,7 @@ Name[ca]=Meteorologia
Name[nl]=Het weer
......@@ -25,6 +26,7 @@ Comment[ca]=Una aplicació de meteorologia en Kirigami.
Comment[cs]=Předpověď počasí v Kirigami.
Comment[es]=Aplicación meteorológica en Kirigami.
Comment[fr]=Une application météo dans Kirigami.
Comment[it]=Un'applicazione meteo in Kirigami
Comment[nl]=Een weer-toepassing in Kirigami.
Comment[nn]=Eit vêrmeldingsprogram i Kirigami.
Comment[pt]=Uma aplicação meteorológica feita com o Kirigami.
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