diff options
| author | l10n daemon script <[email protected]> | 2015-07-26 19:57:51 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-07-26 19:57:51 +0000 |
| commit | d1871eb1b84fa9697b69d98eac02ca0a58874a65 (patch) | |
| tree | bd0f9db85ba7324a106c925c1666b76b5cbbb355 /src/settings/kcm/kcmdolphingeneral.desktop | |
| parent | 8d2a8a0f920cfe1c7f2d24053ded0743d3047fb5 (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/kcm/kcmdolphingeneral.desktop')
| -rw-r--r-- | src/settings/kcm/kcmdolphingeneral.desktop | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index cb98aed83..b660399dc 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -19,6 +19,7 @@ Name[nn]=Generelt for Dolphin Name[pl]=Ustawienia Dolphina Name[pt]=Geral do Dolphin Name[pt_BR]=Geral do Dolphin +Name[ru]=Основные параметры Dolphin Name[se]=Dolphinoppalaččat Name[sk]=Všeobecný Dolphin Name[sl]=Dolphin - splošno @@ -52,6 +53,7 @@ Comment[nl]=Met deze dienst kunt u algemene Dolphin-instellingen configureren. Comment[pl]=Ta usługa pozwala na ogólne ustawienie Dolphina. Comment[pt]=Este serviço permite a configuração das definições gerais do Dolphin. Comment[pt_BR]=Este serviço permite configurar as opções gerais do Dolphin. +Comment[ru]=Эта служба позволяет настраивать основные параметры Dolphin Comment[sk]=Táto služba umožňuje všeobecné nastavenie Dolphinu. Comment[sl]=Ta storitev omogoča spreminjanje splošnih nastavitev programa Dolphin. Comment[sr]=Овај сервис омогућава подешавање општих Делфинових поставки. @@ -97,6 +99,7 @@ Name[nn]=Generelt Name[pl]=Ogólne Name[pt]=Geral Name[pt_BR]=Geral +Name[ru]=Основное Name[sk]=Všeobecné Name[sl]=Splošno Name[sr]=Опште @@ -129,6 +132,7 @@ Comment[nl]=Algemene bestandsbeheerderinstellingen configureren Comment[pl]=Ustawienia ogólne zarządzania plikami Comment[pt]=Configurar as definições gerais do gestor de ficheiros Comment[pt_BR]=Configura as opções gerais do gerenciador de arquivos +Comment[ru]=Настройка диспетчера файлов Comment[sk]=Všeobecné nastavenie správcu súborov Comment[sl]=Splošne nastavitve upravljalnika datotek Comment[sr]=Подешавање општих поставки менаџера фајлова @@ -161,6 +165,7 @@ X-KDE-Keywords[nn]=filhandsamar X-KDE-Keywords[pl]=zarządzanie plikami X-KDE-Keywords[pt]=gestor de ficheiros X-KDE-Keywords[pt_BR]=gerenciador de arquivos +X-KDE-Keywords[ru]=диспетчер файлов X-KDE-Keywords[sk]=správca súborov X-KDE-Keywords[sl]=upravljalnik datotek X-KDE-Keywords[sr]=file manager,менаџер фајлова |