kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-07-07 10:51:45 +00:00
Code Issues Projects Releases Wiki Activity

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse Source 
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-11-01 10:40:09 +00:00
parent 07dae709d9
commit 7b273bb4c6
6 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dolphinpart.desktop
View File

@ -20,6 +20,7 @@ Name[lt]=Dolphin žiūryklė
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
@ -71,6 +72,7 @@ Name[lt]=Piktogramos
Name[nb]=Ikoner
Name[nl]=Pictogrammen
Name[nn]=Ikon
Name[pa]=ਆਈਕਾਨ
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[pa]=ਸੰਖਿਪਤ
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[pa]=ਵੇਰਵੇ
Name[pl]=Szczegóły
Name[pt]=Detalhes
Name[pt_BR]=Detalhes

2
src/org.kde.dolphin.desktop
View File

@ -19,6 +19,7 @@ Name[lt]=Dolphin
Name[nb]=Dolphin
Name[nl]=Dolphin
Name[nn]=Dolphin
Name[pa]=ਡਾਲਫਿਨ
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[pa]=ਫਾਇਲ ਮੈਨੇਜਰ
GenericName[pl]=Zarządzanie plikami
GenericName[pt]=Gestor de Ficheiros
GenericName[pt_BR]=Gerenciador de arquivos

3
src/settings/kcm/kcmdolphingeneral.desktop
View File

@ -18,6 +18,7 @@ Name[lt]=Dolphin bendrieji
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
@ -102,6 +103,7 @@ Name[lt]=Bendra
Name[nb]=Generelt
Name[nl]=Algemeen
Name[nn]=Generelt
Name[pa]=ਆਮ
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[pa]=ਫਾਇਲ ਮੈਨੇਜਰ
X-KDE-Keywords[pl]=zarządzanie plikami
X-KDE-Keywords[pt]=gestor de ficheiros
X-KDE-Keywords[pt_BR]=gerenciador de arquivos

3
src/settings/kcm/kcmdolphinnavigation.desktop
View File

@ -18,6 +18,7 @@ Name[lt]=Dolphin navigacija
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
@ -101,6 +102,7 @@ Name[lt]=Navigacija
Name[nb]=Navigasjon
Name[nl]=Navigatie
Name[nn]=Navigasjon
Name[pa]=ਨੇਵੀਗੇਸ਼ਨ
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[pa]=ਫਾਇਲ ਮੈਨੇਜਰ
X-KDE-Keywords[pl]=zarządzanie plikami
X-KDE-Keywords[pt]=gestor de ficheiros
X-KDE-Keywords[pt_BR]=gerenciador de arquivos

3
src/settings/kcm/kcmdolphinservices.desktop
View File

@ -17,6 +17,7 @@ Name[ko]=Dolphin 서비스
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
@ -63,6 +64,7 @@ Name[ko]=서비스
Name[lt]=Paslaugos
Name[nb]=Tjenester
Name[nl]=Services
Name[pa]=ਸੇਵਾਵਾਂ
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[pa]=ਫਾਇਲ ਮੈਨੇਜਰ
X-KDE-Keywords[pl]=zarządzanie plikami
X-KDE-Keywords[pt]=gestor de ficheiros
X-KDE-Keywords[pt_BR]=gerenciador de arquivos

2
src/settings/kcm/kcmdolphinviewmodes.desktop
View File

@ -101,6 +101,7 @@ Name[lt]=Rodymo būdai
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
@ -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[pa]=ਫਾਇਲ ਮੈਨੇਜਰ
X-KDE-Keywords[pl]=zarządzanie plikami
X-KDE-Keywords[pt]=gestor de ficheiros
X-KDE-Keywords[pt_BR]=gerenciador de arquivos