diff options
| author | l10n daemon script <[email protected]> | 2022-07-10 01:53:09 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-07-10 01:53:09 +0000 |
| commit | 7fdd9f22d8cef4d07576336bd7c50fc0f31fd849 (patch) | |
| tree | 5f99bb997035adfea408453df3faea680b6a3062 /src | |
| parent | 35244bec7574b1e95fc0c7d51b96bf634673b391 (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')
| -rw-r--r-- | src/settings/kcm/kcmdolphingeneral.json | 2 | ||||
| -rw-r--r-- | src/settings/kcm/kcmdolphinnavigation.json | 1 | ||||
| -rw-r--r-- | src/settings/kcm/kcmdolphinviewmodes.json | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json index 954fb1f72..2ad978142 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[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", "Description[id]": "Konfigurasikan pengaturan pengelola file umum", @@ -39,6 +40,7 @@ "Name[cs]": "Obecné", "Name[de]": "Allgemein", "Name[es]": "General", + "Name[fi]": "Perusasetukset", "Name[fr]": "Général", "Name[ia]": "General", "Name[id]": "Umum", diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json index ddc5d19e6..7fbbb7120 100644 --- a/src/settings/kcm/kcmdolphinnavigation.json +++ b/src/settings/kcm/kcmdolphinnavigation.json @@ -9,6 +9,7 @@ "Description[cs]": "Nastavení navigace správce souborů", "Description[de]": "Einstellungen zur Navigation mit der Dateiverwaltung", "Description[es]": "Configurar la navegación del gestor de archivos", + "Description[fi]": "Tiedostonhallinnan selausasetukset", "Description[fr]": "Configurer la navigation dans le gestionnaire de fichiers", "Description[ia]": "Configura navigation del gerente de file", "Description[id]": "Konfigurasikan navigasi pengelola file", diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json index f5ef43c14..b5e99304a 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -9,6 +9,7 @@ "Description[cs]": "Nastavení režimů pohledu správce souborů", "Description[de]": "Dateiverwaltungs-Ansichten einrichten", "Description[es]": "Configurar los modos de vistas del gestor de archivos", + "Description[fi]": "Tiedostonhallinnan näkymäasetukset", "Description[fr]": "Configurer les modes d'affichage du gestionnaire de fichiers", "Description[ia]": "Configura le modos de vista del gerente de file", "Description[id]": "Konfigurasikan mode tampilan pengelola file", |