diff options
| author | l10n daemon script <[email protected]> | 2025-05-31 01:34:21 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-05-31 01:34:21 +0000 |
| commit | a1c9bc5595a21299dab9260c6a77c0561c95c8ba (patch) | |
| tree | fb7dfd89db108155507009d386ba975e0e365693 /src | |
| parent | 567bc7176042eb4b41ed56a276c95ab2029782dd (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"
Diffstat (limited to 'src')
| -rwxr-xr-x | src/org.kde.dolphin.desktop | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index 888440844..ec8d2b136 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -136,10 +136,12 @@ Comment[fi]=Hallinnoi tiedostojasi Comment[fr]=Gérer vos fichiers Comment[gl]=Xestione os seus ficheiros. Comment[he]=ניהול הקבצים שלך +Comment[ia]=Gere tu files Comment[it]=Gestisci i tuoi file Comment[ka]=მართეთ თქვენი ფაილები Comment[nl]=Uw bestanden beheren Comment[sl]=Upravlja vaše datoteke +Comment[sv]=Hantera filer Comment[tr]=Dosyalarınızı yönetin Comment[uk]=Керування вашими файлами Comment[x-test]=xxManage your filesxx |