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"
11 years ago · 4c1d827df2
parent 0b8c4afe35
commit 4c1d827df2
1 changed files with 1 additions and 0 deletions
--- a/applets/batterymonitor/package/metadata.desktop
+++ b/applets/batterymonitor/package/metadata.desktop
@ -15,6 +15,7 @@ Name[it]=Batteria e luminosità
 Name[ko]=배터리와 밝기
 Name[lt]=Baterija ir ryškumas
 Name[nl]=Batterij en helderheid
+Name[nn]=Batteri og lysstyrke
 Name[pl]=Bateria i jasność
 Name[pt]=Bateria e Brilho
 Name[pt_BR]=Bateria e brilho da tela