diff options
| author | l10n daemon script <[email protected]> | 2022-07-09 01:52:00 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-07-09 01:52:00 +0000 |
| commit | b1eb12e03ac0206c463c95b207209f5e181f3d71 (patch) | |
| tree | 9a9946040e03799b61176dc0a8b744a42cc3b051 /src/settings/kcm/kcmdolphingeneral.json | |
| parent | d4476fab9fe4fc3c252d18b5244572310f57cc38 (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/settings/kcm/kcmdolphingeneral.json')
| -rw-r--r-- | src/settings/kcm/kcmdolphingeneral.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json index 6f48717d8..954fb1f72 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -6,6 +6,7 @@ "Description[bg]": "Конфигуриране на общите настройки на файловия мениджър", "Description[ca@valencia]": "Configura les opcions generals del gestor de fitxers", "Description[ca]": "Configura les opcions generals del gestor de fitxers", + "Description[cs]": "Obecné nastavení správce souborů", "Description[de]": "Allgemeine Einstellungen an der Dateiverwaltung vornehmen", "Description[es]": "Configurar las preferencias generales del gestor de archivos", "Description[fr]": "Configurer les paramètres généraux pour le gestionnaire de fichiers", |