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"

diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index 1f90595dc4a188d50bde266ff42c0e07d0614ef2..232cc16006d1c6af01473e9542e39de5f31f4c09 100755 (executable)
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -131,6 +131,9 @@ Comment[ca]=Gestioneu els fitxers
 Comment[ca@valencia]=Gestioneu els fitxers
 Comment[es]=Gestión de archivos
 Comment[eu]=Kudeatu zure fitxategiak
 Comment[ca@valencia]=Gestioneu els fitxers
 Comment[es]=Gestión de archivos
 Comment[eu]=Kudeatu zure fitxategiak

+Comment[fi]=Hallinnoi tiedostojasi
+Comment[fr]=Gérer vos fichiers
+Comment[he]=ניהול הקבצים שלך

 Comment[it]=Gestisci i tuoi file
 Comment[ka]=მართეთ თქვენი ფაილები
 Comment[nl]=Uw bestanden beheren
 Comment[it]=Gestisci i tuoi file
 Comment[ka]=მართეთ თქვენი ფაილები
 Comment[nl]=Uw bestanden beheren