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"

diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop
index 5d8f511ebb32cefc77e5f0ea119a546e54591fc6..24f258d2ac838c34a3a3e14fca4afb6dd3287153 100644 (file)
--- a/src/dolphinpart.desktop
+++ b/src/dolphinpart.desktop
@@ -20,6 +20,7 @@ Name[lt]=Dolphin žiūryklė
 Name[nb]=Dolphin visning
 Name[nl]=Dolphin-weergave
 Name[nn]=Dolphin-vising
 Name[nb]=Dolphin visning
 Name[nl]=Dolphin-weergave
 Name[nn]=Dolphin-vising

+Name[pa]=ਡਾਲਫਿਨ ਝਲਕ

 Name[pl]=Widok Dolphina
 Name[pt]=Área do Dolphin
 Name[pt_BR]=Visualização do Dolphin
 Name[pl]=Widok Dolphina
 Name[pt]=Área do Dolphin
 Name[pt_BR]=Visualização do Dolphin


@@ -71,6 +72,7 @@ Name[lt]=Piktogramos
 Name[nb]=Ikoner
 Name[nl]=Pictogrammen
 Name[nn]=Ikon
 Name[nb]=Ikoner
 Name[nl]=Pictogrammen
 Name[nn]=Ikon

+Name[pa]=ਆਈਕਾਨ

 Name[pl]=Ikony
 Name[pt]=Ícones
 Name[pt_BR]=Ícones
 Name[pl]=Ikony
 Name[pt]=Ícones
 Name[pt_BR]=Ícones


@@ -111,6 +113,7 @@ Name[ko]=축소됨
 Name[lt]=Kompaktiškas
 Name[nb]=Kompakt
 Name[nl]=Compact
 Name[lt]=Kompaktiškas
 Name[nb]=Kompakt
 Name[nl]=Compact

+Name[pa]=ਸੰਖਿਪਤ

 Name[pl]=Kompaktowy
 Name[pt]=Compacta
 Name[pt_BR]=Compacto
 Name[pl]=Kompaktowy
 Name[pt]=Compacta
 Name[pt_BR]=Compacto


@@ -152,6 +155,7 @@ Name[lt]=Informacija
 Name[nb]=Detaljer
 Name[nl]=Details
 Name[nn]=Detaljar
 Name[nb]=Detaljer
 Name[nl]=Details
 Name[nn]=Detaljar

+Name[pa]=ਵੇਰਵੇ

 Name[pl]=Szczegóły
 Name[pt]=Detalhes
 Name[pt_BR]=Detalhes
 Name[pl]=Szczegóły
 Name[pt]=Detalhes
 Name[pt_BR]=Detalhes

diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index ed13e38fededb0531053f3b6b4a23990c92ceb3b..d5c50aa8b3a80a3dfa789a1eeaf1ed56b0b00861 100755 (executable)
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -19,6 +19,7 @@ Name[lt]=Dolphin
 Name[nb]=Dolphin
 Name[nl]=Dolphin
 Name[nn]=Dolphin
 Name[nb]=Dolphin
 Name[nl]=Dolphin
 Name[nn]=Dolphin

+Name[pa]=ਡਾਲਫਿਨ

 Name[pl]=Dolphin
 Name[pt]=Dolphin
 Name[pt_BR]=Dolphin
 Name[pl]=Dolphin
 Name[pt]=Dolphin
 Name[pt_BR]=Dolphin


@@ -61,6 +62,7 @@ GenericName[lt]=Failų tvarkyklė
 GenericName[nb]=Filbehandler
 GenericName[nl]=Bestandsbeheerder
 GenericName[nn]=Filhandsamar
 GenericName[nb]=Filbehandler
 GenericName[nl]=Bestandsbeheerder
 GenericName[nn]=Filhandsamar

+GenericName[pa]=ਫਾਇਲ ਮੈਨੇਜਰ

 GenericName[pl]=Zarządzanie plikami
 GenericName[pt]=Gestor de Ficheiros
 GenericName[pt_BR]=Gerenciador de arquivos
 GenericName[pl]=Zarządzanie plikami
 GenericName[pt]=Gestor de Ficheiros
 GenericName[pt_BR]=Gerenciador de arquivos

diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop
index dcd2ff9f910b881a0dfe4582a719de4c1577eb19..182d09fa8edad7beedadfd2b160329838034977b 100644 (file)
--- a/src/settings/kcm/kcmdolphingeneral.desktop
+++ b/src/settings/kcm/kcmdolphingeneral.desktop
@@ -18,6 +18,7 @@ Name[lt]=Dolphin bendrieji
 Name[nb]=Dolphin generelt
 Name[nl]=Dolphin algemeen
 Name[nn]=Generelt for Dolphin
 Name[nb]=Dolphin generelt
 Name[nl]=Dolphin algemeen
 Name[nn]=Generelt for Dolphin

+Name[pa]=ਡਾਲਫਿਨ ਆਮ

 Name[pl]=Ustawienia Dolphina
 Name[pt]=Geral do Dolphin
 Name[pt_BR]=Geral do Dolphin
 Name[pl]=Ustawienia Dolphina
 Name[pt]=Geral do Dolphin
 Name[pt_BR]=Geral do Dolphin


@@ -102,6 +103,7 @@ Name[lt]=Bendra
 Name[nb]=Generelt
 Name[nl]=Algemeen
 Name[nn]=Generelt
 Name[nb]=Generelt
 Name[nl]=Algemeen
 Name[nn]=Generelt

+Name[pa]=ਆਮ

 Name[pl]=Ogólne
 Name[pt]=Geral
 Name[pt_BR]=Geral
 Name[pl]=Ogólne
 Name[pt]=Geral
 Name[pt_BR]=Geral


@@ -172,6 +174,7 @@ X-KDE-Keywords[lt]=Failų tvarkyklė
 X-KDE-Keywords[nb]=filbehandler
 X-KDE-Keywords[nl]=bestandsbeheerder
 X-KDE-Keywords[nn]=filhandsamar
 X-KDE-Keywords[nb]=filbehandler
 X-KDE-Keywords[nl]=bestandsbeheerder
 X-KDE-Keywords[nn]=filhandsamar

+X-KDE-Keywords[pa]=ਫਾਇਲ ਮੈਨੇਜਰ

 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[pl]=zarządzanie plikami
 X-KDE-Keywords[pt]=gestor de ficheiros
 X-KDE-Keywords[pt_BR]=gerenciador de arquivos

diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop
index 522fb56dcc779d724fcea45deb5ba8ef3ef2aa10..0038822e0c400fdc31297e2f09d3b34555246326 100644 (file)
--- a/src/settings/kcm/kcmdolphinnavigation.desktop
+++ b/src/settings/kcm/kcmdolphinnavigation.desktop
@@ -18,6 +18,7 @@ Name[lt]=Dolphin navigacija
 Name[nb]=Navigasjon i Dolphin
 Name[nl]=Dolphin-navigatie
 Name[nn]=Navigasjon i Dolphin
 Name[nb]=Navigasjon i Dolphin
 Name[nl]=Dolphin-navigatie
 Name[nn]=Navigasjon i Dolphin

+Name[pa]=ਡਾਲਫਿਨ ਨੇਵੀਗੇਸ਼ਨ

 Name[pl]=Nawigacja Dolphina
 Name[pt]=Navegação do Dolphin
 Name[pt_BR]=Navegação do Dolphin
 Name[pl]=Nawigacja Dolphina
 Name[pt]=Navegação do Dolphin
 Name[pt_BR]=Navegação do Dolphin


@@ -101,6 +102,7 @@ Name[lt]=Navigacija
 Name[nb]=Navigasjon
 Name[nl]=Navigatie
 Name[nn]=Navigasjon
 Name[nb]=Navigasjon
 Name[nl]=Navigatie
 Name[nn]=Navigasjon

+Name[pa]=ਨੇਵੀਗੇਸ਼ਨ

 Name[pl]=Nawigacja
 Name[pt]=Navegação
 Name[pt_BR]=Navegação
 Name[pl]=Nawigacja
 Name[pt]=Navegação
 Name[pt_BR]=Navegação


@@ -174,6 +176,7 @@ X-KDE-Keywords[lt]=Failų tvarkyklė
 X-KDE-Keywords[nb]=filbehandler
 X-KDE-Keywords[nl]=bestandsbeheerder
 X-KDE-Keywords[nn]=filhandsamar
 X-KDE-Keywords[nb]=filbehandler
 X-KDE-Keywords[nl]=bestandsbeheerder
 X-KDE-Keywords[nn]=filhandsamar

+X-KDE-Keywords[pa]=ਫਾਇਲ ਮੈਨੇਜਰ

 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[pl]=zarządzanie plikami
 X-KDE-Keywords[pt]=gestor de ficheiros
 X-KDE-Keywords[pt_BR]=gerenciador de arquivos

diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop
index ed176542a3fbea1a75b4e7dc51cf82ebffa4e833..a8638dc7f80a2a91bb0852be36d2de4a603355e4 100644 (file)
--- a/src/settings/kcm/kcmdolphinservices.desktop
+++ b/src/settings/kcm/kcmdolphinservices.desktop
@@ -17,6 +17,7 @@ Name[ko]=Dolphin 서비스
 Name[lt]=Dolphin tarnybos
 Name[nb]=Dolphin-tjenester
 Name[nl]=Dolphin-services
 Name[lt]=Dolphin tarnybos
 Name[nb]=Dolphin-tjenester
 Name[nl]=Dolphin-services

+Name[pa]=ਡਾਲਫਿਨ ਸੇਵਾਵਾਂ

 Name[pl]=Usługi Dolphina
 Name[pt]=Serviços do Dolphin
 Name[pt_BR]=Serviços do Dolphin
 Name[pl]=Usługi Dolphina
 Name[pt]=Serviços do Dolphin
 Name[pt_BR]=Serviços do Dolphin


@@ -63,6 +64,7 @@ Name[ko]=서비스
 Name[lt]=Paslaugos
 Name[nb]=Tjenester
 Name[nl]=Services
 Name[lt]=Paslaugos
 Name[nb]=Tjenester
 Name[nl]=Services

+Name[pa]=ਸੇਵਾਵਾਂ

 Name[pl]=Usługi
 Name[pt]=Serviços
 Name[pt_BR]=Serviços
 Name[pl]=Usługi
 Name[pt]=Serviços
 Name[pt_BR]=Serviços


@@ -134,6 +136,7 @@ X-KDE-Keywords[lt]=Failų tvarkyklė
 X-KDE-Keywords[nb]=filbehandler
 X-KDE-Keywords[nl]=bestandsbeheerder
 X-KDE-Keywords[nn]=filhandsamar
 X-KDE-Keywords[nb]=filbehandler
 X-KDE-Keywords[nl]=bestandsbeheerder
 X-KDE-Keywords[nn]=filhandsamar

+X-KDE-Keywords[pa]=ਫਾਇਲ ਮੈਨੇਜਰ

 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[pl]=zarządzanie plikami
 X-KDE-Keywords[pt]=gestor de ficheiros
 X-KDE-Keywords[pt_BR]=gerenciador de arquivos

diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop
index 11c9bd0d41e0540328fd2c531427f9f0d53ba781..d869acfdcadf41e1e678fd5bfa13d6865436d73a 100644 (file)
--- a/src/settings/kcm/kcmdolphinviewmodes.desktop
+++ b/src/settings/kcm/kcmdolphinviewmodes.desktop
@@ -101,6 +101,7 @@ Name[lt]=Rodymo būdai
 Name[nb]=Visningsmåter
 Name[nl]=Weergavemodi
 Name[nn]=Visingsmodusar
 Name[nb]=Visningsmåter
 Name[nl]=Weergavemodi
 Name[nn]=Visingsmodusar

+Name[pa]=ਵੇਖਣ ਢੰਗ

 Name[pl]=Tryby widoku
 Name[pt]=Modos de Visualização
 Name[pt_BR]=Modos de exibição
 Name[pl]=Tryby widoku
 Name[pt]=Modos de Visualização
 Name[pt_BR]=Modos de exibição


@@ -174,6 +175,7 @@ X-KDE-Keywords[lt]=Failų tvarkyklė
 X-KDE-Keywords[nb]=filbehandler
 X-KDE-Keywords[nl]=bestandsbeheerder
 X-KDE-Keywords[nn]=filhandsamar
 X-KDE-Keywords[nb]=filbehandler
 X-KDE-Keywords[nl]=bestandsbeheerder
 X-KDE-Keywords[nn]=filhandsamar

+X-KDE-Keywords[pa]=ਫਾਇਲ ਮੈਨੇਜਰ

 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[pl]=zarządzanie plikami
 X-KDE-Keywords[pt]=gestor de ficheiros
 X-KDE-Keywords[pt_BR]=gerenciador de arquivos