From 579b38050d0ac86a23465bbaba796e1c9bb25619 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 6 Jun 2022 01:43:37 +0000 Subject: 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" --- src/settings/kcm/kcmdolphinnavigation.json | 1 + 1 file changed, 1 insertion(+) (limited to 'src/settings/kcm/kcmdolphinnavigation.json') 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]": "கோப்பு உலாவியில் உலாவலை அமையுங்கள்", -- cgit v1.3