Commit 9fa3e568 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 497647f1
......@@ -14,6 +14,7 @@ Name[es]=Perfil de gestión de energía
Name[eu]=Energia-kudeaketa profila
Name[fr]=Profil de gestion de l'énergie
Name[ia]=Profilo de gestion de energia
Name[it]=Profilo di gestione energetica
Name[ko]=전원 관리 프로필
Name[lt]=Energijos valdymo profilis
......@@ -41,6 +42,7 @@ Comment[es]=Aplicar un perfil de gestión de energía
Comment[eu]=Aplikatu energia kudeatzeko profil bat
Comment[fi]=Käytä virranhallintaprofiilia
Comment[fr]=Appliquer un profil de gestion de l'énergie
Comment[ia]=Applica un profilo de gestion de energia
Comment[it]=Applica un profilo di gestione energetica
Comment[ko]=전원 관리 프로필 적용
Comment[lt]=Taikyti energijos valdymo profilį
Supports Markdown
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