Commit 36aad22c 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 f39e1321
......@@ -12,6 +12,7 @@ X-KDE-Weight=50
Name=Activity Power Settings
Name[ca]=Arranjament d'energia d'activitat
Name[en_GB]=Activity Power Settings
Name[es]=Preferencias de energía de las actividades
Name[eu]=Jardueraren energia ezarpenak
Name[hu]=Aktivitás energiakezelési beállításai
......
......@@ -12,6 +12,7 @@ X-KDE-Weight=99
Name=Advanced Power Settings
Name[ca]=Arranjament avançat d'energia
Name[en_GB]=Advanced Power Settings
Name[es]=Preferencias de energía avanzadas
Name[eu]=Energia ezarpen aurreratuak
Name[hu]=Speciális energiakezelési beállítások
......
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