Commit ae78ce8d 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 579f4c1c
......@@ -3,6 +3,7 @@ Name=QMake Qt5 QWidgets GUI Application
Name[ca]=Una aplicació IGU per a QMake Qt5 QWidgets
Name[nl]=QMake Qt5 QWidgets GUI-toepassing
Name[pt]=Aplicação Gráfica do QWidgets do Qt5 em QMake
Name[sl]=Grafični program QMake Qt5 QWidgets
Name[sv]=QMake Qt5 QWidgets-program med grafiskt användargränssnitt
Name[uk]=Програма з графічним інтерфейсом на основі QMake, Qt5 та QWidgets
Name[x-test]=xxQMake Qt5 QWidgets GUI Applicationxx
......@@ -10,6 +11,7 @@ Comment=Generate a QMake/Qt5 based GUI application (crossplatform compatible)
Comment[ca]=Genera una aplicació IGU basada en QMake/Qt5 (compatible amb multiplataforma)
Comment[nl]=Op QMake/Qt5 gebaseerde GUI-toepassing genereren (crossplatform compatibel)
Comment[pt]=Gera uma aplicação gráfica baseada no CMake/Qt5 (compatível com várias plataformas)
Comment[sl]=Ustvari program z grafičnim uporabniškim vmesnikom temelječ na QMake/Qt5 (združljiv z več okolji)
Comment[sv]=Skapa ett QMake/Qt5-baserat program med grafiskt användargränssnitt (kompatibelt mellan plattformar)
Comment[uk]=Створити програму з графічним інтерфейсом, засновану на QMake/Qt5 (сумісну з декількома платформами)
Comment[x-test]=xxGenerate a QMake/Qt5 based GUI application (crossplatform compatible)xx
......
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