diff options
| author | l10n daemon script <[email protected]> | 2026-04-09 01:50:12 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2026-04-09 01:50:12 +0000 |
| commit | b6e66e90d71a49a2ad2040a79fecd670425d375f (patch) | |
| tree | e81ea0ce477620a94569ff2abf3bf461e0981d0c | |
| parent | 59bec18c27328c865bbbcb62e38b410fdbefb348 (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 575d6862b..8c41e6288 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -158,6 +158,7 @@ Comment[pt]=Gerir os seus ficheiros Comment[pt_BR]=Gerencie seus arquivos Comment[ro]=Gestionați-vă fișierele Comment[ru]=Управление файлами +Comment[sk]=Spravujte svoje súbory Comment[sl]=Upravlja vaše datoteke Comment[sv]=Hantera filer Comment[tr]=Dosyalarınızı yönetin |