diff options
| author | l10n daemon script <[email protected]> | 2026-03-21 01:42:09 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2026-03-21 01:42:09 +0000 |
| commit | 57a3dbe6b1913af0788a7b8ec98b93c149aa5d0e (patch) | |
| tree | e05167d7585bb885334ce7d6857e48fcea00f7fd /src | |
| parent | d50b7c8716db61624adf4419dc3496ed6d904ee3 (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 b74480aac..575d6862b 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -132,6 +132,7 @@ Comment[bg]=Управление на файловете Comment[ca]=Gestioneu els fitxers Comment[ca@valencia]=Gestioneu els fitxers Comment[cs]=Spravujte své soubory +Comment[da]=Adminstrér dine filer Comment[de]=Verwalten Sie Ihre Dateien Comment[es]=Gestión de archivos Comment[eu]=Kudeatu zure fitxategiak |