diff options
| author | l10n daemon script <[email protected]> | 2026-02-25 01:43:55 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2026-02-25 01:43:55 +0000 |
| commit | c8f6833bbab22da2d1ad73c74437dffcda277593 (patch) | |
| tree | d999c543f882ff5f87c2efe749c2ee27631ade55 | |
| parent | 93b20c94ddd2c190dcfa0fa5b2c3c4f953e699bd (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 8ce113690..d01ab2a7a 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -148,6 +148,7 @@ Comment[ka]=მართეთ თქვენი ფაილები Comment[ko]=내 파일 관리 Comment[lt]=Tvarkyti failus Comment[lv]=Pārvaldiet ierīces datnes +Comment[nb]=Behandle filene dine Comment[nl]=Uw bestanden beheren Comment[pa]=ਆਪਣੀਆਂ ਫ਼ਾਇਲਾਂ ਦਾ ਇੰਤਜ਼ਾਮ ਕਰੋ Comment[pl]=Zarządzaj swoimi plikami |