Commit 944dfb40 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 e25a1c95
......@@ -60,7 +60,7 @@ Exec=kuiviewer -qwindowtitle %c %f
Icon=kuiviewer
Type=Application
GenericName=Qt Designer UI File Viewer
GenericName[ast]=Visor de ficheros UI de Qt Designer
GenericName[ast]=Visor de ficheros d'IU de Qt Designer
GenericName[bg]=Преглед на файлове на Qt Designer
GenericName[br]=Ur gweler restr UI Ergrafer Qt
GenericName[bs]=Preglednik datoteka Qt dizajnera
......@@ -116,6 +116,7 @@ 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[ast]=Un visor rápidu pa ficheros d'IU de Qt Designer
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
......
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