From fb9561c457207d5c1661a9ffc7fafdd0710c7ff1 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 13 Dec 2025 01:38:58 +0000 Subject: 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/org.kde.dolphin.desktop | 1 + 1 file changed, 1 insertion(+) (limited to 'src/org.kde.dolphin.desktop') diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index 7f34e2425..b1c082ae3 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -148,6 +148,7 @@ Comment[nl]=Uw bestanden beheren Comment[pa]=ਆਪਣੀਆਂ ਫ਼ਾਇਲਾਂ ਦਾ ਇੰਤਜ਼ਾਮ ਕਰੋ Comment[pl]=Zarządzaj swoimi plikami Comment[pt_BR]=Gerencie seus arquivos +Comment[ro]=Gestionați-vă fișierele Comment[ru]=Управление файлами Comment[sl]=Upravlja vaše datoteke Comment[sv]=Hantera filer -- cgit v1.3