Commit a401707c 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 5b7311d4
......@@ -118,6 +118,7 @@ GenericName[zh_TW]=Qt Designer UI 檔案檢視器
Comment=A quick viewer for Qt Designer UI File
Comment[ca]=Un visor ràpid de fitxer UI de Qt Designer
Comment[ca@valencia]=Un visor ràpid de fitxer UI de Qt Designer
Comment[cs]=Rychlý prohlížeč souborů UI programu Qt Designer
Comment[es]=Un rápido visor para archivos de interfaz de usuario de Qt Designer
Comment[it]=Un visualizzatore veloce per i file UI di Qt Designer
Comment[nl]=Een snelle viewer voor Qt Designer UI bestand
......
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