diff options
| author | l10n daemon script <[email protected]> | 2022-07-23 01:50:13 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-07-23 01:50:13 +0000 |
| commit | f0749ee42ccb2e0a7caee165b9934de8e61bfcbc (patch) | |
| tree | 504e56807cab4bca7b4c87aa2973bbd586ce2153 | |
| parent | d0c3e373a131f9e9d1dc183c4d8c8b24fa89346c (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/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 f5596b426..8a068751c 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -8,6 +8,7 @@ "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[en_GB]": "Configure general file manager settings", "Description[es]": "Configurar las preferencias generales del gestor de archivos", "Description[eu]": "Konfiguratu fitxategi-kudeatzailearen ezarpen orokorrak", "Description[fi]": "Tiedostonhallinnan yleisasetukset", @@ -41,6 +42,7 @@ "Name[ca]": "General", "Name[cs]": "Obecné", "Name[de]": "Allgemein", + "Name[en_GB]": "General", "Name[es]": "General", "Name[eu]": "Orokorra", "Name[fi]": "Perusasetukset", diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json index 07b7d245a..337932850 100644 --- a/src/settings/kcm/kcmdolphinnavigation.json +++ b/src/settings/kcm/kcmdolphinnavigation.json @@ -8,6 +8,7 @@ "Description[ca]": "Configura la navegació del gestor de fitxers", "Description[cs]": "Nastavení navigace správce souborů", "Description[de]": "Einstellungen zur Navigation mit der Dateiverwaltung", + "Description[en_GB]": "Configure file manager navigation", "Description[es]": "Configurar la navegación del gestor de archivos", "Description[eu]": "Konfiguratu fitxategi-kudeatzailearen nabigatzea", "Description[fi]": "Tiedostonhallinnan selausasetukset", diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json index 5f2f02d66..c4cc111ba 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -8,6 +8,7 @@ "Description[ca]": "Configura els modes de vista del gestor de fitxers", "Description[cs]": "Nastavení režimů pohledu správce souborů", "Description[de]": "Dateiverwaltungs-Ansichten einrichten", + "Description[en_GB]": "Configure file manager view modes", "Description[es]": "Configurar los modos de vistas del gestor de archivos", "Description[eu]": "Konfiguratu fitxategi-kudeatzailearen ikuspegi moduak", "Description[fi]": "Tiedostonhallinnan näkymäasetukset", |