Commit 404ee90d 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 36aad22c
......@@ -15,6 +15,7 @@ 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[fr]=Configuration des activités concernant l'énergie
Name[hu]=Aktivitás energiakezelési beállításai
Name[ia]=Preferentias de energia de activitate
Name[it]=Impostazioni di alimentazione delle attività
......
......@@ -15,6 +15,7 @@ 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[fr]=Configuration avancée pour la gestion de l'énergie
Name[hu]=Speciális energiakezelési beállítások
Name[ia]=Preferentias Avantiate de energia
Name[it]=Impostazioni avanzate di alimentazione
......
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