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 f421ae5c6faf5d090ebef14e544d449d288133f5..1a1f7e7bb23010da85236772ec34d58927a99b2f 100644 (file)
--- a/src/settings/kcm/kcmdolphinviewmodes.desktop
+++ b/src/settings/kcm/kcmdolphinviewmodes.desktop
@@ -21,6 +21,7 @@ Name[lt]=Dolphin rodymo būdai
 Name[nb]=Dolphin visningsmåter
 Name[nl]=Dolphin-weergavemodussen
 Name[nn]=Dolphin-visingar
 Name[nb]=Dolphin visningsmåter
 Name[nl]=Dolphin-weergavemodussen
 Name[nn]=Dolphin-visingar

+Name[pa]=ਡਾਲਫਿਨ ਝਲਕ ਢੰਗ

 Name[pl]=Tryby widoku Dolphina
 Name[pt]=Modos de Visualização do Dolphin
 Name[pt_BR]=Modos de exibição do Dolphin
 Name[pl]=Tryby widoku Dolphina
 Name[pt]=Modos de Visualização do Dolphin
 Name[pt_BR]=Modos de exibição do Dolphin