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/kcmdolphinservices.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/kcmdolphinservices.desktop')
| -rw-r--r-- | src/settings/kcm/kcmdolphinservices.desktop | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop index fc685206b..e70eeba2e 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -18,6 +18,7 @@ Name[nl]=Dolphin-services Name[pl]=Usługi Dolphina Name[pt]=Serviços do Dolphin Name[pt_BR]=Serviços do Dolphin +Name[ru]=Действия Dolphin Name[sk]=Služby Dolphinu Name[sl]=Dolphin - storitve Name[sr]=Делфинови сервиси @@ -61,6 +62,7 @@ Name[nl]=Services Name[pl]=Usługi Name[pt]=Serviços Name[pt_BR]=Serviços +Name[ru]=Действия Name[sk]=Služby Name[sl]=Storitve Name[sr]=Сервиси @@ -94,6 +96,7 @@ Comment[nn]=Set opp tenester i filhandsamaren Comment[pl]=Ustawienia usług zarządzania plikami Comment[pt]=Configurar os serviços do gestor de ficheiros Comment[pt_BR]=Configura os serviços do gerenciador de arquivos +Comment[ru]=Настройка действий в диспетчере файлов Comment[sk]=Nastavenie služieb správcu súborov Comment[sl]=Nastavitve storitev upravljalnika datotek Comment[sr]=Подешавање сервиса менаџера фајлова @@ -126,6 +129,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,менаџер фајлова |