diff options
| author | l10n daemon script <[email protected]> | 2025-06-02 01:32:45 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-06-02 01:32:45 +0000 |
| commit | 57615e7ba2c7702321684c56fa2a86d65b7eee4b (patch) | |
| tree | a34cdb92af9c1442743694cc3b976d7328305e69 | |
| parent | 149c043c59f0b99d13919bfec4f86baaded3cf16 (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 b82eaaecc..c114295ec 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -138,6 +138,7 @@ Comment[fr]=Gérer vos fichiers Comment[gl]=Xestione os seus ficheiros. Comment[he]=ניהול הקבצים שלך Comment[ia]=Gere tu files +Comment[is]=Hafðu umsjón með skránum þínum Comment[it]=Gestisci i tuoi file Comment[ka]=მართეთ თქვენი ფაილები Comment[nl]=Uw bestanden beheren |