Commit 2abfabfd 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 f784038a
......@@ -9,6 +9,7 @@ X-KDE-StartupNotify=false
Name=KDED Global Shortcuts Server
Name[ar]=خادوم KDED للاختصارات العمومية
Name[az]=KDED Qlobal Qısayollar Xidməti
Name[be@latin]=Słužba paŭsiudnych klavijaturnych skarotaŭ dla „KDE”
Name[bg]=Сървър KDED Global Shortcuts
Name[bn]=কে.ডি.ই.ডি গ্লোবাল শর্টকাট সার্ভার
......
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