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"
This commit is contained in:
l10n daemon script 2015-05-31 10:13:13 +00:00
parent 0c7da668e7
commit 586252341e
4 changed files with 6 additions and 0 deletions

View file

@ -42,6 +42,7 @@ Comment[it]=Questo servizio permette di configurare le impostazioni generali di
Comment[ja]=Dolphin
Comment[ko]= Dolphin .
Comment[lt]=Ši tarnyba leidžia konfigūruoti Dolphin bendruosius nustatymus.
Comment[nb]=Med denne tjenesten kan du sette opp generelle innstillinger for Dolphin.
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.
@ -112,6 +113,7 @@ Comment[it]=Configura le impostazioni generali del gestore dei file
Comment[ja]=
Comment[ko]=
Comment[lt]=Bendrųjų failų tvarkyklės nustatymų konfigūravimas
Comment[nb]=Sett opp generelle innstillinger for filbehandleren
Comment[nl]=Algemene bestandsbeheerderinstellingen configureren
Comment[pl]=Ustawienia ogólne zarządzania plikami
Comment[pt]=Configurar as definições gerais do gestor de ficheiros

View file

@ -42,6 +42,7 @@ Comment[it]=Questo servizio permette di configurare la navigazione con Dolphin.
Comment[ja]=Dolphin
Comment[ko]= Dolphin .
Comment[lt]=Ši tarnyba leidžia konfigūruoti Dolphin navigaciją.
Comment[nb]=Med denne tjenesten kan du sette opp navigasjon for Dolphin.
Comment[nl]=Met deze dienst kunt u Dolphin-navigatie configureren.
Comment[pl]=Ta usługa umożliwia ustawienie nawigacji w Dolphinie.
Comment[pt]=Este serviço permite a configuração da navegação do Dolphin.

View file

@ -11,6 +11,7 @@ Name[it]=Servizi di Dolphin
Name[ja]=Dolphin
Name[ko]=Dolphin
Name[lt]=Dolphin tarnybos
Name[nb]=Dolphin-tjenester
Name[nl]=Dolphin-services
Name[pl]=Usługi Dolphina
Name[pt]=Serviços do Dolphin
@ -50,6 +51,7 @@ Name[it]=Servizi
Name[ja]=
Name[ko]=
Name[lt]=Paslaugos
Name[nb]=Tjenester
Name[nl]=Services
Name[pl]=Usługi
Name[pt]=Serviços

View file

@ -42,6 +42,7 @@ Comment[it]=Questo servizio permette di configurare le viste di Dolphin.
Comment[ja]=Dolphin
Comment[ko]= Dolphin .
Comment[lt]=Ši tarnyba leidžia konfigūruoti Dolphin rodymo būdus.
Comment[nb]=Med denne tjenesten kan du sette opp Dolphins visningsmåter.
Comment[nl]=Met deze dienst kunt u Dolphin-weergavemodussen configureren.
Comment[pl]=Ta usługa umożliwia ustawienie trybów widoku Dolphina.
Comment[pt]=Este serviço permite a configuração dos modos de visualização do Dolphin.