diff options
| author | l10n daemon script <[email protected]> | 2025-05-26 01:33:43 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-05-26 01:33:43 +0000 |
| commit | b0a9907b9cb18e7c1a566f67a90206f067b7eb5e (patch) | |
| tree | dc7cfb14f3d7f4033365c34911608a007a66ea42 | |
| parent | 6b17e856d2bfe875731386517083958c2d6f02e8 (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 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index 1f90595dc..232cc1600 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -131,6 +131,9 @@ Comment[ca]=Gestioneu els fitxers Comment[ca@valencia]=Gestioneu els fitxers Comment[es]=Gestión de archivos Comment[eu]=Kudeatu zure fitxategiak +Comment[fi]=Hallinnoi tiedostojasi +Comment[fr]=Gérer vos fichiers +Comment[he]=ניהול הקבצים שלך Comment[it]=Gestisci i tuoi file Comment[ka]=მართეთ თქვენი ფაილები Comment[nl]=Uw bestanden beheren |