Commit f7d370d5 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 86a48bdc
Pipeline #46052 skipped
......@@ -3,6 +3,7 @@
Type=Application
Exec=kdebugsettings
GenericName=Debug settings
GenericName[az]=Sazlama ayarları
GenericName[ca]=Configuració de la depuració
GenericName[ca@valencia]=Depuració de l'arranjament
GenericName[cs]=Nastavení ladění
......@@ -41,6 +42,7 @@ GenericName[zh_CN]=调试设置
GenericName[zh_TW]=除錯設定
Terminal=false
Name=KDebugSettings
Name[az]=KDebugSettings
Name[ca]=KDebugSettings
Name[ca@valencia]=KDebugSettings
Name[cs]=Nastavení KDebug
......@@ -77,6 +79,7 @@ Name[x-test]=xxKDebugSettingsxx
Name[zh_CN]=KDebugSettings
Name[zh_TW]=KDebug 設定
Comment=Configure debug output from Qt applications
Comment[az]=Sazlama çıxışlarını Qt tətbiqlərindən tənzimləmək
Comment[ca]=Configura la sortida detallada de les aplicacions Qt
Comment[ca@valencia]=Configura l'eixida detallada de les aplicacions Qt
Comment[cs]=Nastavte ladicí výstup z aplikací Qt
......
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