diff options
| author | l10n daemon script <[email protected]> | 2025-07-27 01:34:32 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-07-27 01:34:32 +0000 |
| commit | e48bb0405ec431cf9f6048981ca08d3dcfbeeba7 (patch) | |
| tree | 1f76d04766b3cb4e39ab4e7961c2fdd0aeec52db | |
| parent | 13d212fa417ce811aa9778bafdaa025059ed373b (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"
| -rw-r--r-- | src/itemactions/setfoldericonitemaction.json | 1 | ||||
| -rwxr-xr-x | src/org.kde.dolphin.desktop | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/itemactions/setfoldericonitemaction.json b/src/itemactions/setfoldericonitemaction.json index 5d02aeb06..19648c9da 100644 --- a/src/itemactions/setfoldericonitemaction.json +++ b/src/itemactions/setfoldericonitemaction.json @@ -9,6 +9,7 @@ "Name[bg]": "Задаване на икона на папка", "Name[ca@valencia]": "Establix la icona de carpeta", "Name[ca]": "Estableix la icona de carpeta", + "Name[de]": "Ordnersymbol festlegen", "Name[es]": "Definir icono de carpeta", "Name[eu]": "Ezarri karpetaren ikonoa", "Name[fi]": "Aseta kansiokuvake", diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index 581013d2b..42376d260 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -138,6 +138,7 @@ Comment[fi]=Hallinnoi tiedostojasi Comment[fr]=Gérer vos fichiers Comment[gl]=Xestione os seus ficheiros. Comment[he]=ניהול הקבצים שלך +Comment[hu]=Kezelje fájljait Comment[ia]=Gere tu files Comment[is]=Hafðu umsjón með skránum þínum Comment[it]=Gestisci i tuoi file |