Commit 5dd2917f authored by Script Kiddy's avatar Script Kiddy

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 1c463f74
......@@ -11,6 +11,12 @@ X-KDE-System-Settings-Parent-Category=power-management
X-KDE-Weight=50
Name=Activity Power Settings
Name[ca]=Arranjament d'energia d'activitat
Name[es]=Preferencias de energía de las actividades
Name[nl]=Energie-instellingen voor activiteiten
Name[pt]=Configuração de Energia das Actividades
Name[sv]=Ströminställningar för aktiviteter
Name[x-test]=xxActivity Power Settingsxx
Comment=Per-Activity Power Management
Comment[ar]=إدارة طاقة ما قبل الأحداث
......
......@@ -11,6 +11,12 @@ X-KDE-System-Settings-Parent-Category=power-management
X-KDE-Weight=99
Name=Advanced Power Settings
Name[ca]=Arranjament avançat d'energia
Name[es]=Preferencias de energía avanzadas
Name[nl]=Geavanceerde energie-instellingen
Name[pt]=Configuração Avançada da Energia
Name[sv]=Avancerade ströminställningar
Name[x-test]=xxAdvanced Power Settingsxx
Comment=Advanced Power Management Settings
Comment[ar]=إعدادات إدارة الطاقة المتقدمة
......
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