Commit 2c6d1b94 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 3811ae26
Pipeline #27951 skipped
......@@ -155,8 +155,8 @@ Comment[zh_TW]=設定顏色與字型
X-KDE-Keywords=color,font, configuration
X-KDE-Keywords[ar]=color,font,configuration,لون,خط,ضبط
X-KDE-Keywords[bs]=boja, vrsta slova, konfiguracija
X-KDE-Keywords[ca]=color,tipus de lletra, configuració
X-KDE-Keywords[ca@valencia]=color,tipus de lletra, configuració
X-KDE-Keywords[ca]=color,tipus de lletra,configuració
X-KDE-Keywords[ca@valencia]=color,tipus de lletra,configuració
X-KDE-Keywords[cs]=barva,písmu,nastavení
X-KDE-Keywords[da]=farve,skriftype,konfiguration
X-KDE-Keywords[de]=Farben,Schriftarten,Konfiguration,Einrichtung,Einstellungen
......
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