Commit fbf1590c 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 ffbbe014
......@@ -14,6 +14,7 @@ X-KDE-Weight=50
Name=Shortcuts
Name[ca]=Dreceres
Name[es]=Accesos rápidos
Name[fr]=Raccourcis
Name[nl]=Sneltoetsen
Name[pt]=Atalhos
Name[sv]=Genvägar
......@@ -23,6 +24,7 @@ Name[x-test]=xxShortcutsxx
Comment=Configure Keyboard Shortcuts
Comment[ca]=Configura les dreceres de teclat
Comment[es]=Configurar los accesos rápidos de teclado
Comment[fr]=Configurer les raccourcis de clavier
Comment[nl]=Sneltoetsen configureren
Comment[pt]=Configurar os Atalhos do Teclado
Comment[sv]=Anpassa snabbtangenter
......
......@@ -2,6 +2,7 @@
Name=Shortcuts
Name[ca]=Dreceres
Name[es]=Accesos rápidos
Name[fr]=Raccourcis
Name[nl]=Sneltoetsen
Name[pt]=Atalhos
Name[sv]=Genvägar
......@@ -11,6 +12,7 @@ Name[x-test]=xxShortcutsxx
Comment=Configure Keyboard Shortcuts
Comment[ca]=Configura les dreceres de teclat
Comment[es]=Configurar los accesos rápidos de teclado
Comment[fr]=Configurer les raccourcis de clavier
Comment[nl]=Sneltoetsen configureren
Comment[pt]=Configurar os Atalhos do Teclado
Comment[sv]=Anpassa snabbtangenter
......
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