Commit 45a43215 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 fdbe3346
Pipeline #200880 skipped
......@@ -82,7 +82,7 @@ Name=KCharSelect
Name[af]=Kcharselect
Name[ar]=حرف
Name[ast]=KCharSelect
Name[bg]=CharSelect
Name[bg]=KCharSelect
Name[br]=KCharSelect
Name[bs]=KCharSelect
Name[ca]=KCharSelect
......@@ -154,6 +154,7 @@ Name[zh_TW]=KDE 字元選擇
Comment=Browse all unicode characters
Comment[ar]=تصفّح كلّ محارف يونيكود
Comment[ast]=Restola tolos caráuteres d'Unicode
Comment[bg]=Преглед на всички unicode знаци
Comment[ca]=Navega per tots els caràcters Unicode
Comment[ca@valencia]=Navega per tots els caràcters Unicode
Comment[cs]=Prohlížení všech znaků unicode
......
Supports Markdown
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