diff options
| author | l10n daemon script <[email protected]> | 2026-02-11 01:42:12 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2026-02-11 01:42:12 +0000 |
| commit | 9014e2651cbbfc5e5baa3b6ce9f53d495dbaae2c (patch) | |
| tree | 96c7f8378eace17c30ff705931a672551ac5ac89 | |
| parent | 369d0dc5d6dc8b37ca057b6acfbb01a945dccb66 (diff) | |
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"
| -rwxr-xr-x | src/org.kde.dolphin.desktop | 1 |
1 files changed, 1 insertions, 0 deletions
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]=Управление файлами |