Commit c5132e7a 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 c51f384a
......@@ -12,9 +12,12 @@ X-KDE-System-Settings-Parent-Category=shortcuts
X-KDE-Weight=50
Name=Shortcuts
Name[az]=Qısayollar
Name[ca]=Dreceres
Name[es]=Accesos rápidos
Name[eu]=Lasterbideak
Name[fr]=Raccourcis
Name[it]=Scorciatoie
Name[nl]=Sneltoetsen
Name[pt]=Atalhos
Name[sv]=Genvägar
......@@ -22,9 +25,12 @@ Name[uk]=Скорочення
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[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[sv]=Anpassa snabbtangenter
......
[Desktop Entry]
Name=Shortcuts
Name[az]=Qısayollar
Name[ca]=Dreceres
Name[es]=Accesos rápidos
Name[eu]=Lasterbideak
Name[fr]=Raccourcis
Name[it]=Scorciatoie
Name[nl]=Sneltoetsen
Name[pt]=Atalhos
Name[sv]=Genvägar
......@@ -10,9 +13,12 @@ Name[uk]=Скорочення
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[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[sv]=Anpassa snabbtangenter
......
[KNewStuff3]
Name=GNOME/GTK Application Styles
Name[az]=GNOME/GTK Tətbiq Üslubu
Name[ca]=Estils de les aplicacions GNOME/GTK
Name[es]=Estilo de las aplicaciones de GNOME/GTK
Name[eu]=GNOME/GTK aplikazioen estiloak
......
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