Commit 9d891b98 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 60388eea
......@@ -234,6 +234,7 @@ Name=Global Theme
Name[ast]=Estilu global
Name[az]=Qlobal Mövzu
Name[ca]=Tema global
Name[cs]=Celkový motiv
Name[el]=Καθολικό θέμα
Name[en_GB]=Global Theme
Name[es]=Tema global
......@@ -291,6 +292,7 @@ Exec=systemsettings5 kcm_users
Name=Screen Locking
Name[az]=Ekran Kilidlənməsi
Name[ca]=Bloqueig de pantalla
Name[cs]=Uzamykání obrazovky
Name[el]=Κλείδωμα οθόνης
Name[en_GB]=Screen Locking
Name[es]=Bloqueo de pantalla
......@@ -320,6 +322,7 @@ Name=Energy Saving
Name[ast]=Aforru d'enerxía
Name[az]=Enerjiyə Qənaət
Name[ca]=Estalvi d'energia
Name[cs]=Úsporný režim
Name[el]=Εξοικονόμηση ενέργειας
Name[en_GB]=Energy Saving
Name[es]=Ahorro de energía
......@@ -348,6 +351,7 @@ Exec=systemsettings5 powerdevilprofilesconfig
Name=Display Configuration
Name[az]=Ekran Ayarları
Name[ca]=Configuració de la pantalla
Name[cs]=Nastavení zobrazení
Name[el]=Διαμόρφωση οθόνης
Name[en_GB]=Display Configuration
Name[es]=Configuración de la pantalla
......
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