diff options
| author | l10n daemon script <[email protected]> | 2025-12-12 01:36:36 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-12-12 01:36:36 +0000 |
| commit | 69a98144f385dae4fcdd77fb1565364d3ab9079d (patch) | |
| tree | ebbf857893f1ed61284c68e516ec497fdc5393f3 /src | |
| parent | 59580237b843bbc6e72e548a4cc9cd510e819093 (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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index 7612c7dfd..7f34e2425 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -129,6 +129,7 @@ Comment[ar]=أدر ملفاتك Comment[bg]=Управление на файловете Comment[ca]=Gestioneu els fitxers Comment[ca@valencia]=Gestioneu els fitxers +Comment[cs]=Spravujte své soubory Comment[de]=Verwalten Sie Ihre Dateien Comment[es]=Gestión de archivos Comment[eu]=Kudeatu zure fitxategiak |