Commit 9b89b06f 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 4a71fd63
Pipeline #8687 passed with stage
in 10 minutes and 25 seconds
......@@ -4,6 +4,7 @@ Name[ca]=Informació
Name[cs]=Informace
Name[en_GB]=Information
Name[es]=Información
Name[gl]=Información
Name[it]=Informazioni
Name[lt]=Informacija
Name[nl]=Informatie
......@@ -17,6 +18,7 @@ Comment=Software Versions
Comment[ca]=Versions de programari
Comment[en_GB]=Software Versions
Comment[es]=Versiones de software
Comment[gl]=Versións de software
Comment[it]=Versioni software
Comment[lt]=Programinės įrangos versijos
Comment[nl]=Softwareversies
......@@ -35,6 +37,7 @@ X-KDE-Keywords=info, distro, system
X-KDE-Keywords[ca]=informació, distribució, sistema
X-KDE-Keywords[en_GB]=info, distro, system
X-KDE-Keywords[es]=información, distro, sistema
X-KDE-Keywords[gl]=info, información, distro, distribución, sistema
X-KDE-Keywords[it]=informazioni, distribuzione, sistema
X-KDE-Keywords[lt]=informacija, platinamasis paketas, platinimas, distribucija, sistema
X-KDE-Keywords[nl]=informatie, distributie, systeem
......
......@@ -4,6 +4,7 @@ Name[ca]=Informació
Name[cs]=Informace
Name[en_GB]=Information
Name[es]=Información
Name[gl]=Información
Name[it]=Informazioni
Name[lt]=Informacija
Name[nl]=Informatie
......@@ -17,6 +18,7 @@ Comment=Software versions
Comment[ca]=Versions de programari
Comment[en_GB]=Software versions
Comment[es]=Versiones de software
Comment[gl]=Versións de software
Comment[it]=Versioni software
Comment[lt]=Programinės įrangos versijos
Comment[nl]=Softwareversies
......
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