Commit cb20f84e 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 91aeb178
Pipeline #28244 skipped
......@@ -61,8 +61,8 @@ Name[zh_TW]=Kontact 設定
Comment=Default KDE Kontact Component
Comment[ar]=مكوّن «متراسلك كدي» المبدئيّ
Comment[bs]=Podrazumijevana KDE Kontakt Komponenta
Comment[ca]=Component per omissió del Kontact pel KDE
Comment[ca@valencia]=Component per omissió del Kontact pel KDE
Comment[ca]=Component per omissió del Kontact per al KDE
Comment[ca@valencia]=Component per omissió del Kontact per al KDE
Comment[cs]=Výchozí komponenta KDE Kontact
Comment[da]=Standardkomponent i KDE Kontact
Comment[de]=Standard-Komponente von Kontact
......
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