Commit 9bc9212c 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 9628e87c
Pipeline #8781 passed with stage
in 11 minutes and 35 seconds
......@@ -16,6 +16,7 @@ Name[x-test]=xxInformationxx
Name[zh_TW]=資訊
Comment=Software Versions
Comment[ca]=Versions de programari
Comment[cs]=Verze softwaru
Comment[en_GB]=Software Versions
Comment[es]=Versiones de software
Comment[gl]=Versións de software
......@@ -35,11 +36,12 @@ X-KDE-FormFactors=handset,tablet,mediacenter
Categories=Qt;KDE;X-KDE-settings-system;
X-KDE-Keywords=info, distro, system
X-KDE-Keywords[ca]=informació, distribució, sistema
X-KDE-Keywords[cs]=informace, distribuce, systém
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[lt]=informacija, platinamasis paketas, platinimas, distribucija, sistema, distributyvas
X-KDE-Keywords[nl]=informatie, distributie, systeem
X-KDE-Keywords[pt]=informação, distribuição, sistema
X-KDE-Keywords[pt_BR]=informação, info, distro, distribuição, sistema
......
......@@ -16,6 +16,7 @@ Name[x-test]=xxInformationxx
Name[zh_TW]=資訊
Comment=Software versions
Comment[ca]=Versions de programari
Comment[cs]=Verze softwaru
Comment[en_GB]=Software versions
Comment[es]=Versiones de software
Comment[gl]=Versións de software
......
......@@ -29,6 +29,7 @@ Name[zh_TW]=個人化
Comment=Font and Theme
Comment[ca]=Tipus de lletra i tema
Comment[ca@valencia]=Tipus de lletra i tema
Comment[cs]=Písmo a motiv
Comment[da]=Skrifttype og tema
Comment[de]=Schriftart und Design
Comment[el]=Γραμματοσειρά και Θέμα
......
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