diff options
| author | l10n daemon script <[email protected]> | 2025-12-13 01:38:58 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-12-13 01:38:58 +0000 |
| commit | fb9561c457207d5c1661a9ffc7fafdd0710c7ff1 (patch) | |
| tree | d2da670ca53a0d1cca5f274cb4ec4ea1b5cb940c /src/itemactions | |
| parent | b94943bc840b9863fe87c6bd6faa983e1bfa26f1 (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/itemactions')
| -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 f2115d15a..10cc7a07c 100644 --- a/src/itemactions/hidefileitemaction.json +++ b/src/itemactions/hidefileitemaction.json @@ -9,6 +9,7 @@ "Name[bg]": "Скриване", "Name[ca@valencia]": "Oculta", "Name[ca]": "Oculta", + "Name[cs]": "Skrýt", "Name[de]": "Ausblenden", "Name[es]": "Ocultar", "Name[eu]": "Ezkutatu", diff --git a/src/itemactions/setfoldericonitemaction.json b/src/itemactions/setfoldericonitemaction.json index 6868e0e85..cadd7187e 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[cs]": "Nastavit ikonu složky", "Name[de]": "Ordnersymbol festlegen", "Name[es]": "Definir icono de carpeta", "Name[eu]": "Ezarri karpetaren ikonoa", |