diff options
| author | l10n daemon script <[email protected]> | 2026-01-16 01:39:59 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2026-01-16 01:39:59 +0000 |
| commit | c4f8f736e480b81822c9e816167ff51e9d04131b (patch) | |
| tree | 92f43eedf0f97d2ef0cc53bee54dc8463f9a48e4 | |
| parent | ba425b67d2883bd890fe303f74378324a08f9a32 (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 b1c082ae3..9e45d7f46 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -143,6 +143,7 @@ Comment[is]=Hafðu umsjón með skránum þínum Comment[it]=Gestisci i tuoi file Comment[ka]=მართეთ თქვენი ფაილები Comment[ko]=내 파일 관리 +Comment[lt]=Tvarkyti failus Comment[lv]=Pārvaldiet ierīces datnes Comment[nl]=Uw bestanden beheren Comment[pa]=ਆਪਣੀਆਂ ਫ਼ਾਇਲਾਂ ਦਾ ਇੰਤਜ਼ਾਮ ਕਰੋ |