diff options
| author | l10n daemon script <[email protected]> | 2022-06-06 01:43:37 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-06-06 01:43:37 +0000 |
| commit | 579b38050d0ac86a23465bbaba796e1c9bb25619 (patch) | |
| tree | 81b9b3f67e1c8fdba37fc5b17bb8e42c9715006b | |
| parent | 29acb196ab7f7add77c6656dc911786d6f786127 (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 74db701ed..11b41a7a1 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -17,6 +17,7 @@ "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[ru]": "Настройка основных параметров диспетчера файлов", "Description[sl]": "Postavi splošne nastavitve upravljalnika datotek", "Description[sv]": "Anpassa filhanterarens allmänna inställningar", "Description[ta]": "பொதுவான கோப்பு மேலாளி அமைப்புகளை அமையுங்கள்", @@ -44,6 +45,7 @@ "Name[pt]": "Geral", "Name[pt_BR]": "Geral", "Name[ro]": "Generale", + "Name[ru]": "Основные параметры", "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 e3c340309..3e85eb8be 100644 --- a/src/settings/kcm/kcmdolphinnavigation.json +++ b/src/settings/kcm/kcmdolphinnavigation.json @@ -17,6 +17,7 @@ "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[ru]": "Настройка навигации в диспетчере файлов", "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 3f3f1c96d..a0713967c 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -17,6 +17,7 @@ "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[ru]": "Настройка режимов просмотра папок в диспетчере файлов", "Description[sl]": "Postavi načine prikaza upravljalnika datotek", "Description[sv]": "Anpassa filhanterarens visningslägen", "Description[ta]": "கோப்பு உலாவியின் காட்சிமுறைகளை அமையுங்கள்", |