From: l10n daemon script Date: Sat, 28 Jun 2025 01:34:05 +0000 (+0000) Subject: SVN_SILENT made messages (.desktop file) - always resolve ours X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/64f38f89a63c7afe5fbd5181f9de65c4b3be48b7?hp=85f218e24f2af3f65274c64e876cee807c54b5a2 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/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index 98c7cae26..d2285b61f 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -144,6 +144,7 @@ Comment[ka]=მართეთ თქვენი ფაილები Comment[ko]=내 파일 관리 Comment[nl]=Uw bestanden beheren Comment[pl]=Zarządzaj swoimi plikami +Comment[pt_BR]=Gerencie seus arquivos Comment[sl]=Upravlja vaše datoteke Comment[sv]=Hantera filer Comment[tr]=Dosyalarınızı yönetin