diff options
| author | l10n daemon script <[email protected]> | 2022-05-01 01:55:50 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-05-01 01:55:50 +0000 |
| commit | ce720337e5f7db8fa52b5f092b4cb5c4154abac0 (patch) | |
| tree | 46a4c6710963739af79fe29df0a9e23ba85eeddd /src | |
| parent | 5a3c57ffb24f7fcc6975e4a99dc07a007304ada6 (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 | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json index 17f6e9e5a..cfe09e763 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -8,6 +8,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[ro]": "Configurează opțiuni generale ale gestionarului de fișiere", "Description[sl]": "Postavi splošne nastavitve upravljalnika datotek", "Description[sv]": "Anpassa filhanterarens allmänna inställningar", "Description[ta]": "பொதுவான கோப்பு மேலாளி அமைப்புகளை அமையுங்கள்", @@ -24,6 +25,7 @@ "Name[fr]": "Général", "Name[it]": "Generale", "Name[nl]": "Algemeen", + "Name[ro]": "Generale", "Name[sl]": "Splošno", "Name[sv]": "Allmänt", "Name[ta]": "பொதுவானவை", diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json index 6b0c56a40..db11a5cb2 100644 --- a/src/settings/kcm/kcmdolphinnavigation.json +++ b/src/settings/kcm/kcmdolphinnavigation.json @@ -8,6 +8,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[ro]": "Configurează navigarea cu gestionarul de fișiere", "Description[sl]": "Postavi krmarjenje v upravljalniku datotek", "Description[sv]": "Anpassa filhanterarens navigering", "Description[ta]": "கோப்பு உலாவியில் உலாவலை அமையுங்கள்", diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json index 2fcdd7f7b..3f1449ee4 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -8,6 +8,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[ro]": "Configurează regimurile de vizualizare ale gestionarului de fișiere", "Description[sl]": "Postavi načine prikaza upravljalnika datotek", "Description[sv]": "Anpassa filhanterarens visningslägen", "Description[ta]": "கோப்பு உலாவியின் காட்சிமுறைகளை அமையுங்கள்", @@ -52,7 +53,7 @@ "Name[pl]": "Tryby widoku", "Name[pt]": "Modos de Visualização", "Name[pt_BR]": "Modos de exibição", - "Name[ro]": "Moduri de vizualizare", + "Name[ro]": "Regimuri de vizualizare", "Name[ru]": "Режимы просмотра", "Name[se]": "Čájehanmodusat", "Name[sk]": "Režimy zobrazenia", |