Commit 49361948 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 f5244452
......@@ -47,7 +47,7 @@ Name[zh_CN]=文档切换器
Name[zh_TW]=文件切換器
Comment=Quick document switching with ALT+Tab behavior
Comment[ar]=يتنقّل بين المستندات بسرعة عبر سلوك Alt+Tab
Comment[ast]=Cambéu rápidu de documentos col comportamientu de ALT+Tabulador
Comment[ast]=Cambéu rápidu de documentos col comportamientu d'Alt+Tabulador
Comment[ca]=Canvia ràpidament de document amb el comportament d'Alt+Tab
Comment[ca@valencia]=Canvia ràpidament de document amb el comportament d'Alt+Tab
Comment[cs]=Rychlé přepínání dokumentů s chováním jako ALT+Tab
......
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