diff options
| author | l10n daemon script <[email protected]> | 2026-03-22 01:39:35 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2026-03-22 01:39:35 +0000 |
| commit | b9530db1b070086b6539f1f1892aeac4d503c2ae (patch) | |
| tree | 436cd4abf0c86e5fd45be4dbe94021563aee3dc8 | |
| parent | dfef28748e4e9af8aefd969e24689e68698b74a3 (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/hidefileitemaction.json | 1 | ||||
| -rw-r--r-- | src/itemactions/setfoldericonitemaction.json | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/itemactions/hidefileitemaction.json b/src/itemactions/hidefileitemaction.json index 6e6174016..234fa10c6 100644 --- a/src/itemactions/hidefileitemaction.json +++ b/src/itemactions/hidefileitemaction.json @@ -10,6 +10,7 @@ "Name[ca@valencia]": "Oculta", "Name[ca]": "Oculta", "Name[cs]": "Skrýt", + "Name[da]": "Skjul", "Name[de]": "Ausblenden", "Name[es]": "Ocultar", "Name[eu]": "Ezkutatu", diff --git a/src/itemactions/setfoldericonitemaction.json b/src/itemactions/setfoldericonitemaction.json index 4d385aec8..b91ceb23f 100644 --- a/src/itemactions/setfoldericonitemaction.json +++ b/src/itemactions/setfoldericonitemaction.json @@ -10,6 +10,7 @@ "Name[ca@valencia]": "Establix la icona de carpeta", "Name[ca]": "Estableix la icona de carpeta", "Name[cs]": "Nastavit ikonu složky", + "Name[da]": "Indstil ikonfarve", "Name[de]": "Ordnersymbol festlegen", "Name[es]": "Definir icono de carpeta", "Name[eu]": "Ezarri karpetaren ikonoa", |