diff options
| author | l10n daemon script <[email protected]> | 2022-05-05 01:47:17 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-05-05 01:47:17 +0000 |
| commit | ab9fcf0041d5ea220e07b4abe4d53bb10c385be2 (patch) | |
| tree | c92c246f17c7cdaa5a00121f2d865b4ea43348b2 /src/settings | |
| parent | 6b46ebe64882651c535ee97f17c5b8d96bb26009 (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')
| -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 e5e1914e3..fdc64528f 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -9,6 +9,7 @@ "Description[fr]": "Configurer les paramètres généraux pour le gestionnaire de fichiers", "Description[it]": "Configura le impostazioni generali del gestore dei file", "Description[nl]": "Algemene bestandsbeheerderinstellingen configureren", + "Description[pt]": "Configurar as definições gerais do gestor de ficheiros", "Description[pt_BR]": "Configura as opções gerais do gerenciador de arquivos", "Description[ro]": "Configurează opțiuni generale ale gestionarului de fișiere", "Description[sl]": "Postavi splošne nastavitve upravljalnika datotek", @@ -29,6 +30,7 @@ "Name[fr]": "Général", "Name[it]": "Generale", "Name[nl]": "Algemeen", + "Name[pt]": "Geral", "Name[pt_BR]": "Geral", "Name[ro]": "Generale", "Name[sl]": "Splošno", diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json index 26f696651..5e3f1dbeb 100644 --- a/src/settings/kcm/kcmdolphinnavigation.json +++ b/src/settings/kcm/kcmdolphinnavigation.json @@ -9,6 +9,7 @@ "Description[fr]": "Configurer la navigation dans le gestionnaire de fichiers", "Description[it]": "Configura la navigazione col gestore dei file", "Description[nl]": "Bestandsbeheerdernavigatie configureren", + "Description[pt]": "Configurar a navegação do gestor de ficheiros", "Description[pt_BR]": "Configura a navegação do gerenciador de arquivos", "Description[ro]": "Configurează navigarea cu gestionarul de fișiere", "Description[sl]": "Postavi krmarjenje v upravljalniku datotek", diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json index ea8b685ba..6c3d666cb 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -9,6 +9,7 @@ "Description[fr]": "Configurer les modes d'affichage du gestionnaire de fichiers", "Description[it]": "Configura le viste del gestore dei file", "Description[nl]": "Bestandsbeheerderweergavemodussen configureren", + "Description[pt]": "Configurar os modos de visualização do gestor de ficheiros", "Description[pt_BR]": "Configura os modos de exibição do gerenciador de arquivos", "Description[ro]": "Configurează regimurile de vizualizare ale gestionarului de fișiere", "Description[sl]": "Postavi načine prikaza upravljalnika datotek", |