diff options
| author | l10n daemon script <[email protected]> | 2022-06-16 01:56:58 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-06-16 01:56:58 +0000 |
| commit | ebe3a111e68b14fd5e8e9a7b1764c5de4ef6e351 (patch) | |
| tree | 034ba0560bff94eda80d0a532fae80c43cf83048 /src | |
| parent | 8aa81a1dc7fa978d44d2c6397df270432df1506f (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 11b41a7a1..c37f276e9 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -5,6 +5,7 @@ "Description[az]": "Əsas fayl meneceri ayarlarını tənzimləyin", "Description[ca@valencia]": "Configura les opcions generals del gestor de fitxers", "Description[ca]": "Configura les opcions generals del gestor de fitxers", + "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", "Description[ia]": "Configura preferentias del gerente general de file", @@ -33,6 +34,7 @@ "Name[ca@valencia]": "General", "Name[ca]": "General", "Name[cs]": "Obecné", + "Name[de]": "Allgemein", "Name[es]": "General", "Name[fr]": "Général", "Name[ia]": "General", diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json index 3e85eb8be..45b2786db 100644 --- a/src/settings/kcm/kcmdolphinnavigation.json +++ b/src/settings/kcm/kcmdolphinnavigation.json @@ -5,6 +5,7 @@ "Description[az]": "Fayl meneceri naviqasiyasını tənzimləyin", "Description[ca@valencia]": "Configura la navegació del gestor de fitxers", "Description[ca]": "Configura la navegació del gestor de fitxers", + "Description[de]": "Einstellungen zur Navigation mit der Dateiverwaltung", "Description[es]": "Configurar la navegación del gestor de archivos", "Description[fr]": "Configurer la navigation dans le gestionnaire de fichiers", "Description[ia]": "Configura navigation del gerente de file", diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json index 86a0191f8..513e92c32 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -5,6 +5,7 @@ "Description[az]": "Fayl meneceri baxış rejimlərini tənzimləyin", "Description[ca@valencia]": "Configura els modes de vista del gestor de fitxers", "Description[ca]": "Configura els modes de vista del gestor de fitxers", + "Description[de]": "Dateiverwaltungs-Ansichten einrichten", "Description[es]": "Configurar los modos de vistas del gestor de archivos", "Description[fr]": "Configurer les modes d'affichage du gestionnaire de fichiers", "Description[ia]": "Configura le modos de vista del gerente de file", |