Commit d2a20682 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 ae9bc760
......@@ -116,6 +116,13 @@ GenericName[x-test]=xxQt Designer UI File Viewerxx
GenericName[zh_CN]=Qt 设计师 UI 文件查看器
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[es]=Un rápido visor para archivos de interfaz de usuario de Qt Designer
Comment[nl]=Een snelle viewer voor Qt Designer UI bestand
Comment[pt]=Um visualizador rápido para os ficheiros UI do Qt Designer
Comment[sv]=En snabbvisning av en Qt Designer UI-fil
Comment[uk]=Швидкий засіб перегляду для файлів UI Qt Designer
Comment[x-test]=xxA quick viewer for Qt Designer UI Filexx
MimeType=application/x-designer;
Terminal=false
X-DBUS-StartupType=Multi
......
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