Commit 0d0e0a46 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 fc1a6252
Pipeline #8637 passed with stage
in 13 minutes and 18 seconds
......@@ -2,6 +2,7 @@
Name=Information
Name[ca]=Informació
Name[cs]=Informace
Name[en_GB]=Information
Name[es]=Información
Name[it]=Informazioni
Name[lt]=Informacija
......@@ -14,6 +15,7 @@ Name[x-test]=xxInformationxx
Name[zh_TW]=資訊
Comment=Software Versions
Comment[ca]=Versions de programari
Comment[en_GB]=Software Versions
Comment[es]=Versiones de software
Comment[it]=Versioni software
Comment[lt]=Programinės įrangos versijos
......@@ -31,6 +33,7 @@ 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[en_GB]=info, distro, system
X-KDE-Keywords[es]=información, distro, sistema
X-KDE-Keywords[it]=informazioni, distribuzione, sistema
X-KDE-Keywords[lt]=informacija, platinamasis paketas, platinimas, distribucija, sistema
......
......@@ -2,6 +2,7 @@
Name=Information
Name[ca]=Informació
Name[cs]=Informace
Name[en_GB]=Information
Name[es]=Información
Name[it]=Informazioni
Name[lt]=Informacija
......@@ -14,6 +15,7 @@ Name[x-test]=xxInformationxx
Name[zh_TW]=資訊
Comment=Software versions
Comment[ca]=Versions de programari
Comment[en_GB]=Software versions
Comment[es]=Versiones de software
Comment[it]=Versioni software
Comment[lt]=Programinės įrangos versijos
......
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