diff options
| author | l10n daemon script <[email protected]> | 2026-07-03 01:43:59 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2026-07-03 01:43:59 +0000 |
| commit | 920e1171cae8680819571e7052d09a13263be776 (patch) | |
| tree | f471c1ef4d8eb3df9fe1b0ed6208653c5345f0f9 | |
| parent | 96ac17d4ecbd3867f0bb68b4b3ea070213b31169 (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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index 89b346c39..b062a3925 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -104,7 +104,7 @@ GenericName[ml]=ഫയല് മാനേജര് GenericName[my]=ဖိုင်လ်မန်နေဂျာ GenericName[nb]=Filbehandler GenericName[nl]=Bestandsbeheerder -GenericName[nn]=Filhandsamar +GenericName[nn]=Filhandsamar GenericName[pa]=ਫਾਇਲ ਮੈਨੇਜਰ GenericName[pl]=Zarządzanie plikami GenericName[pt]=Gestor de Ficheiros @@ -154,6 +154,7 @@ Comment[lt]=Tvarkyti failus Comment[lv]=Pārvaldiet ierīces datnes Comment[nb]=Behandle filene dine Comment[nl]=Uw bestanden beheren +Comment[nn]=Handsam filene dine Comment[pa]=ਆਪਣੀਆਂ ਫ਼ਾਇਲਾਂ ਦਾ ਇੰਤਜ਼ਾਮ ਕਰੋ Comment[pl]=Zarządzaj swoimi plikami Comment[pt]=Gerir os seus ficheiros |