diff options
| author | l10n daemon script <[email protected]> | 2015-04-04 11:02:00 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-04-04 11:02:00 +0000 |
| commit | 4e96b1a42f7718d7c2401e5abed3e30267f7e0ea (patch) | |
| tree | bd7347e3f0f25b217f16765c83f708f4bab549ea /src/settings/kcm/kcmdolphinservices.desktop | |
| parent | de84f223d4408dc1eaf6f15ebeed2e8acf49ad4c (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 282642944..db259c356 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -13,6 +13,7 @@ Name[pl]=Usługi Dolphina Name[pt]=Serviços do Dolphin Name[pt_BR]=Serviços do Dolphin Name[sk]=Služby Dolphinu +Name[sl]=Dolphin - storitve Name[sr]=Делфинови сервиси Name[sr@ijekavian]=Делфинови сервиси Name[sr@ijekavianlatin]=Dolphinovi servisi @@ -47,6 +48,7 @@ Name[pl]=Usługi Name[pt]=Serviços Name[pt_BR]=Serviços Name[sk]=Služby +Name[sl]=Storitve Name[sr]=Сервиси Name[sr@ijekavian]=Сервиси Name[sr@ijekavianlatin]=Servisi @@ -70,6 +72,7 @@ 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[sk]=Nastavenie služieb správcu súborov +Comment[sl]=Nastavitve storitev upravljalnika datotek Comment[sr]=Подешавање сервиса менаџера фајлова Comment[sr@ijekavian]=Подешавање сервиса менаџера фајлова Comment[sr@ijekavianlatin]=Podešavanje servisa menadžera fajlova @@ -93,6 +96,7 @@ 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[sk]=správca súborov +X-KDE-Keywords[sl]=upravljalnik datotek X-KDE-Keywords[sr]=file manager,менаџер фајлова X-KDE-Keywords[sr@ijekavian]=file manager,менаџер фајлова X-KDE-Keywords[sr@ijekavianlatin]=file manager,menadžer fajlova |