diff options
| author | l10n daemon script <[email protected]> | 2025-09-16 01:35:02 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-09-16 01:35:02 +0000 |
| commit | ccce1c123fad5d668e44a705f629eccfdbea2048 (patch) | |
| tree | 9a1d108a0056474f3e03eb2e5d056c5c81c8574e | |
| parent | df57589d12d755a05185296a2e73d84bcbe34a26 (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 5e7f3ebf5..7612c7dfd 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -144,6 +144,7 @@ Comment[ka]=მართეთ თქვენი ფაილები Comment[ko]=내 파일 관리 Comment[lv]=Pārvaldiet ierīces datnes Comment[nl]=Uw bestanden beheren +Comment[pa]=ਆਪਣੀਆਂ ਫ਼ਾਇਲਾਂ ਦਾ ਇੰਤਜ਼ਾਮ ਕਰੋ Comment[pl]=Zarządzaj swoimi plikami Comment[pt_BR]=Gerencie seus arquivos Comment[ru]=Управление файлами |