diff options
| author | l10n daemon script <[email protected]> | 2022-07-13 01:48:42 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-07-13 01:48:42 +0000 |
| commit | 8a721c35fcd6393cbda17290ab7dd6891487de44 (patch) | |
| tree | cdf5120ea644a630cb04c7e62a37fb8342c1203f /src/settings/kcm/kcmdolphingeneral.json | |
| parent | ecc5279f8dce498c9b5745be6953f48af664c5cb (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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json index 2ad978142..fbf6a9428 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -9,6 +9,7 @@ "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[eu]": "Konfiguratu fitxategi-kudeatzailearen ezarpen orokorrak", "Description[fi]": "Tiedostonhallinnan yleisasetukset", "Description[fr]": "Configurer les paramètres généraux pour le gestionnaire de fichiers", "Description[ia]": "Configura preferentias del gerente general de file", @@ -40,6 +41,7 @@ "Name[cs]": "Obecné", "Name[de]": "Allgemein", "Name[es]": "General", + "Name[eu]": "Orokorra", "Name[fi]": "Perusasetukset", "Name[fr]": "Général", "Name[ia]": "General", |