Commit 9c3e1531 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 c22d1897
Pipeline #17337 passed with stage
in 13 minutes and 47 seconds
......@@ -122,7 +122,7 @@ Comment[pt_BR]=A renderização foi terminada
Comment[ro]=Randarea s-a încheiat
Comment[ru]=Сборка завершена
Comment[sk]=Renderovanie je skončené
Comment[sl]=Izrisovanje je končano
Comment[sl]=Izrisovanje je poteklo
Comment[sv]=Återgivningen är gjord
Comment[tr]=Hazırlama bitti
Comment[uk]=Виконання обробки завершено
......@@ -22,6 +22,7 @@ Name[pl]=Układy klawiatur Kdenlive
Name[pt]=Esquemas de Teclado do Kdenlive
Name[pt_BR]=Esquemas de teclado do Kdenlive
Name[ru]=Схемы горячих клавиш
Name[sl]=Sheme tipkovnic Kdenlive
Name[uk]=Схеми клавіатурних скорочень Kdenlive
Name[x-test]=xxKdenlive Keyboard Schemesxx
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