Commit 29145e72 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 247d9d73
......@@ -14,12 +14,14 @@ X-KDE-Weight=50
Name=Shortcuts
Name[az]=Qısayollar
Name[ca]=Dreceres
Name[de]=Kurzbefehle
Name[es]=Accesos rápidos
Name[eu]=Lasterbideak
Name[fr]=Raccourcis
Name[it]=Scorciatoie
Name[nl]=Sneltoetsen
Name[pt]=Atalhos
Name[pt_BR]=Atalhos
Name[sv]=Genvägar
Name[uk]=Скорочення
Name[x-test]=xxShortcutsxx
......@@ -27,12 +29,14 @@ Name[x-test]=xxShortcutsxx
Comment=Configure Keyboard Shortcuts
Comment[az]=Klaviatura qısayollarını tənzimləmək
Comment[ca]=Configura les dreceres de teclat
Comment[de]=Tastatur-Kurzbefehle einrichten
Comment[es]=Configurar los accesos rápidos de teclado
Comment[eu]=Konfiguratu teklatuko lasterbideak
Comment[fr]=Configurer les raccourcis de clavier
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[sv]=Anpassa snabbtangenter
Comment[uk]=Налаштовування клавіатурних скорочень
Comment[x-test]=xxConfigure Keyboard Shortcutsxx
......
......@@ -2,12 +2,14 @@
Name=Shortcuts
Name[az]=Qısayollar
Name[ca]=Dreceres
Name[de]=Kurzbefehle
Name[es]=Accesos rápidos
Name[eu]=Lasterbideak
Name[fr]=Raccourcis
Name[it]=Scorciatoie
Name[nl]=Sneltoetsen
Name[pt]=Atalhos
Name[pt_BR]=Atalhos
Name[sv]=Genvägar
Name[uk]=Скорочення
Name[x-test]=xxShortcutsxx
......@@ -15,12 +17,14 @@ Name[x-test]=xxShortcutsxx
Comment=Configure Keyboard Shortcuts
Comment[az]=Klaviatura qısayollarını tənzimləmək
Comment[ca]=Configura les dreceres de teclat
Comment[de]=Tastatur-Kurzbefehle einrichten
Comment[es]=Configurar los accesos rápidos de teclado
Comment[eu]=Konfiguratu teklatuko lasterbideak
Comment[fr]=Configurer les raccourcis de clavier
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[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