From 9014e2651cbbfc5e5baa3b6ce9f53d495dbaae2c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 11 Feb 2026 01:42:12 +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') diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index d24ce2770..8ce113690 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -151,6 +151,7 @@ Comment[lv]=Pārvaldiet ierīces datnes Comment[nl]=Uw bestanden beheren Comment[pa]=ਆਪਣੀਆਂ ਫ਼ਾਇਲਾਂ ਦਾ ਇੰਤਜ਼ਾਮ ਕਰੋ Comment[pl]=Zarządzaj swoimi plikami +Comment[pt]=Gerir os seus ficheiros Comment[pt_BR]=Gerencie seus arquivos Comment[ro]=Gestionați-vă fișierele Comment[ru]=Управление файлами -- cgit v1.3