Commit 68aebb7b 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 4b254ed2
......@@ -22,6 +22,7 @@ Name[it]=Scorciatoie
Name[nl]=Sneltoetsen
Name[pt]=Atalhos
Name[pt_BR]=Atalhos
Name[sl]=Bližnjice
Name[sv]=Genvägar
Name[uk]=Скорочення
Name[x-test]=xxShortcutsxx
......@@ -37,6 +38,7 @@ Comment[it]=Configura le scorciatoie della tastiera
Comment[nl]=Sneltoetsen configureren
Comment[pt]=Configurar os Atalhos do Teclado
Comment[pt_BR]=Configurar atalhos do teclado
Comment[sl]=Nastavi tipkovne bližnjice
Comment[sv]=Anpassa snabbtangenter
Comment[uk]=Налаштовування клавіатурних скорочень
Comment[x-test]=xxConfigure Keyboard Shortcutsxx
......
......@@ -10,6 +10,7 @@ Name[it]=Scorciatoie
Name[nl]=Sneltoetsen
Name[pt]=Atalhos
Name[pt_BR]=Atalhos
Name[sl]=Bližnjice
Name[sv]=Genvägar
Name[uk]=Скорочення
Name[x-test]=xxShortcutsxx
......@@ -25,6 +26,7 @@ Comment[it]=Configura le scorciatoie della tastiera
Comment[nl]=Sneltoetsen configureren
Comment[pt]=Configurar os Atalhos do Teclado
Comment[pt_BR]=Configurar atalhos do teclado
Comment[sl]=Nastavi tipkovne bližnjice
Comment[sv]=Anpassa snabbtangenter
Comment[uk]=Налаштовування клавіатурних скорочень
Comment[x-test]=xxConfigure Keyboard Shortcutsxx
......
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