Commit 68e271b2 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 905a0ac4
......@@ -111,6 +111,7 @@ Comment[en_GB]=Configure Accessibility Options
Comment[es]=Configurar las opciones de accesibilidad
Comment[fr]=Configurer les options d'accessibilité
Comment[ia]=Configura Optiones de Accessibilitate
Comment[it]=Configura le opzioni di accessibilità
Comment[lt]=Konfigūruoti prieinamumo parinktis
Comment[nl]=Opties voor toegankelijkheid configureren
Comment[nn]=Set opp tilgjengeval
......
......@@ -99,6 +99,7 @@ Comment[en_GB]=Configure Accessibility Options
Comment[es]=Configurar las opciones de accesibilidad
Comment[fr]=Configurer les options d'accessibilité
Comment[ia]=Configura Optiones de Accessibilitate
Comment[it]=Configura le opzioni di accessibilità
Comment[lt]=Konfigūruoti prieinamumo parinktis
Comment[nl]=Opties voor toegankelijkheid configureren
Comment[nn]=Set opp tilgjengeval
......
......@@ -12,6 +12,7 @@ X-KDE-Weight=60
Name=Desktop Session
Name[ar]=جلسة سطح المكتب
Name[ast]=Sesión del escritoriu
Name[az]=İş Masası Seansı
Name[bs]=Sesija Radne Površine
Name[ca]=Sessió d'escriptori
......
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