diff options
| author | l10n daemon script <[email protected]> | 2022-07-20 01:45:24 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-07-20 01:45:24 +0000 |
| commit | d0c3e373a131f9e9d1dc183c4d8c8b24fa89346c (patch) | |
| tree | 77760191fe9e104cc68686aef132274fbb040e46 | |
| parent | 9bcac452caa1941ec667b47b00f8c8da019eb5e1 (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 fbf6a9428..f5596b426 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -23,6 +23,7 @@ "Description[pt_BR]": "Configura as opções gerais do gerenciador de arquivos", "Description[ro]": "Configurează opțiuni generale ale gestionarului de fișiere", "Description[ru]": "Настройка основных параметров диспетчера файлов", + "Description[sk]": "Všeobecné nastavenie správcu súborov", "Description[sl]": "Postavi splošne nastavitve upravljalnika datotek", "Description[sv]": "Anpassa filhanterarens allmänna inställningar", "Description[ta]": "பொதுவான கோப்பு மேலாளி அமைப்புகளை அமையுங்கள்", @@ -55,6 +56,7 @@ "Name[pt_BR]": "Geral", "Name[ro]": "Generale", "Name[ru]": "Основные параметры", + "Name[sk]": "Všeobecné", "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 30e8b431f..07b7d245a 100644 --- a/src/settings/kcm/kcmdolphinnavigation.json +++ b/src/settings/kcm/kcmdolphinnavigation.json @@ -23,6 +23,7 @@ "Description[pt_BR]": "Configura a navegação do gerenciador de arquivos", "Description[ro]": "Configurează navigarea cu gestionarul de fișiere", "Description[ru]": "Настройка навигации в диспетчере файлов", + "Description[sk]": "Nastavenie navigácie správcu súborov", "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 5e39fc5e8..5f2f02d66 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -23,6 +23,7 @@ "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[ru]": "Настройка режимов просмотра папок в диспетчере файлов", + "Description[sk]": "Nastavenie režimov zobrazenia správcu súborov", "Description[sl]": "Postavi načine prikaza upravljalnika datotek", "Description[sv]": "Anpassa filhanterarens visningslägen", "Description[ta]": "கோப்பு உலாவியின் காட்சிமுறைகளை அமையுங்கள்", |