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/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop
index 6824b74ea475176d718c545495d0c7282b9f2658..4374c84d7c9a40aa97f644a4a881290a4128fe2e 100644 (file)
--- a/src/settings/kcm/kcmdolphinviewmodes.desktop
+++ b/src/settings/kcm/kcmdolphinviewmodes.desktop
@@ -147,7 +147,7 @@ Name[pa]=ਵੇਖਣ ਢੰਗ
 Name[pl]=Tryby widoku
 Name[pt]=Modos de Visualização
 Name[pt_BR]=Modos de exibição
-Name[ro]=Moduri de vizualizare
+Name[ro]=Regimuri de vizualizare
 Name[ru]=Режимы просмотра
 Name[se]=Čájehanmodusat
 Name[sk]=Režimy zobrazenia