From 2834e581e0b734e24f2e3010c4a1bc3c41e2e78a Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 1 May 2022 03:11:08 +0000
Subject: [PATCH] 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"
---
 src/settings/kcm/kcmdolphinviewmodes.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop
index 6824b74ea..4374c84d7 100644
--- 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