1
0
mirror of https://github.com/KDE/latte-dock.git synced 2024-12-23 13:33:50 +03:00

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 2019-04-20 05:58:30 +02:00
parent dfa9e28f52
commit 32904be361
15 changed files with 36 additions and 0 deletions

View File

@ -6,6 +6,7 @@ Name[en_GB]=Latte Indicators
Name[es]=Indicadores de Latte
Name[gl]=Indicadores de Latte
Name[it]=Indicatori Latte
Name[ko]=Latte 표시기
Name[nl]=Indicatoren van Latte
Name[pt]=Indicadores do Latte
Name[sv]=Latte indikatorer

View File

@ -12,6 +12,7 @@ Name[eu]=Latte diseinuak
Name[fi]=Latte-asettelut
Name[gl]=Disposicións de Latte
Name[it]=Disposizioni di Latte
Name[ko]=Latte 배치하기
Name[nl]=Latte-indelingen
Name[nn]=Latte-utformingar
Name[pl]=Układy Latte

View File

@ -13,6 +13,7 @@ Name[eu]=Latte Dock
Name[fi]=Latte-telakka
Name[gl]=Doca Latte
Name[it]=Latte Dock
Name[ko]=Latte 독
Name[nl]=Latte Dock
Name[nn]=Latte-dokk
Name[pl]=Dok Latte
@ -38,6 +39,7 @@ Comment[eu]=Latte Dock
Comment[fi]=Latte-telakka
Comment[gl]=Doca Latte.
Comment[it]=Latte Dock
Comment[ko]=Latte 독
Comment[nl]=Latte Dock
Comment[nn]=Latte-dokk
Comment[pl]=Dok Latte
@ -59,6 +61,7 @@ Name[en_GB]=Imported successfully
Name[es]=Importada exitosamente
Name[gl]=Importouse correctamente
Name[it]=Importata con successo
Name[ko]=성공적으로 가져왔습니다
Name[nl]=Met succes geïmporteerd
Name[pt]=Importado com sucesso
Name[sv]=Import lyckades
@ -75,6 +78,7 @@ Name[en_GB]=Failed to import
Name[es]=Error al importar
Name[gl]=Non se puido importar
Name[it]=Impossibile importare
Name[ko]=가져오지 못했습니다
Name[nl]=Importeren is mislukt
Name[pt]=Não foi possível importar
Name[sv]=Misslyckades importera
@ -91,6 +95,7 @@ Name[en_GB]=Exported successfully
Name[es]=Exportada exitosamente
Name[gl]=Exportouse correctamente
Name[it]=Esportata correttamente
Name[ko]=성공적으로 내보냈습니다
Name[nl]=Met succes geëxporteerd
Name[pt]=Exportada com sucesso
Name[sv]=Export lyckades
@ -107,6 +112,7 @@ Name[en_GB]=Failed to export
Name[es]=Error al exportar
Name[gl]=Non se puido exportar
Name[it]=Impossibile esportare
Name[ko]=내보내지 못했습니다
Name[nl]=Exporteren is mislukt
Name[pt]=Não foi possível exportar
Name[sv]=Misslyckades exportera
@ -123,6 +129,7 @@ Name[en_GB]=Removed successfully
Name[es]=Eliminada exitosamente
Name[gl]=Retirouse correctamente
Name[it]=Rimossa con successo
Name[ko]=성공적으로 삭제했습니다
Name[nl]=Met succes verwijderd
Name[pt]=Removido com sucesso
Name[sv]=Borttagning lyckades
@ -139,6 +146,7 @@ Name[en_GB]=Failed to remove
Name[es]=Error al eliminar
Name[gl]=Non se puido retirar
Name[it]=Impossibile rimuovere
Name[ko]=삭제할 수 없음
Name[nl]=Verwijderen is mislukt
Name[pt]=Não foi possível remover
Name[sv]=Misslyckades ta bort
@ -160,6 +168,7 @@ Name[eu]=Aldatu diseinura
Name[fi]=Vaihda asetteluun
Name[gl]=Cambiar á disposición
Name[it]=Passa alla disposizione
Name[ko]=배치하기로 전환
Name[nl]=Naar indeling omschakelen
Name[nn]=Byt til utforming
Name[pl]=Przełącz układ

View File

@ -12,6 +12,7 @@ Name[eu]=Latte
Name[fi]=Latte
Name[gl]=Latte
Name[it]=Latte
Name[ko]=Latte
Name[nl]=Latte
Name[nn]=Latte
Name[pl]=Latte
@ -36,6 +37,7 @@ Comment[eu]=Jendartearen kaia
Comment[fi]=Telakka massoille
Comment[gl]=Doca para as masas.
Comment[it]=Area di aggancio per le masse
Comment[ko]=
Comment[nl]=Dock voor de massa
Comment[nn]=Dokk for massane
Comment[pl]=Dok dla mas
@ -60,6 +62,7 @@ GenericName[eu]=Kaia
GenericName[fi]=Telakka
GenericName[gl]=Doca
GenericName[it]=Aggancio
GenericName[ko]=
GenericName[nl]=Dock
GenericName[nn]=Dokk
GenericName[pl]=Dok

View File

@ -9,6 +9,7 @@ Comment[en_GB]=Latte indicator
Comment[es]=Indicador Latte
Comment[gl]=Indicador de Latte
Comment[it]=Indicatore Latte
Comment[ko]=Latte
Comment[nl]=Indicator van Latte
Comment[pt]=Indicador do Latte
Comment[pt_BR]=Indicador do Latte

View File

@ -6,6 +6,7 @@ Name[en_GB]=Indicator
Name[es]=Indicador
Name[gl]=Indicador
Name[it]=Indicatore
Name[ko]=
Name[nl]=Indicator
Name[pt]=Indicador
Name[pt_BR]=Indicador

View File

@ -13,6 +13,7 @@ Name[eu]=Latte
Name[fi]=Latte
Name[gl]=Latte
Name[it]=Latte
Name[ko]=Latte
Name[nl]=Latte
Name[nn]=Latte
Name[pl]=Latte
@ -36,6 +37,7 @@ Comment[eu]=Konfinamendua hornitu da Latte Dockentzako
Comment[fi]=Latte-telakalla tarjottu sisällytys
Comment[gl]=Contedor fornecido para a doca Latte.
Comment[it]=Contenitore fornito per Latte Dock
Comment[ko]=Latte
Comment[nl]=Container geleverd voor de Latte Dock
Comment[nn]=Behaldar for Latte-dokk
Comment[pl]=Pojemnik dla doku Latte

View File

@ -13,6 +13,7 @@ Name[eu]=Latte
Name[fi]=Latte
Name[gl]=Latte
Name[it]=Latte
Name[ko]=Latte
Name[nl]=Latte
Name[nn]=Latte
Name[pl]=Latte
@ -36,6 +37,7 @@ Comment[eu]=Konfinamendua hornitu da Latte Dockentzako
Comment[fi]=Latte-telakalla tarjottu sisällytys
Comment[gl]=Contedor fornecido para a doca Latte.
Comment[it]=Contenitore fornito per Latte Dock
Comment[ko]=Latte
Comment[nl]=Container geleverd voor de Latte Dock
Comment[nn]=Behaldar for Latte-dokk
Comment[pl]=Pojemnik dla doku Latte

View File

@ -11,6 +11,7 @@ Name[eu]=Latte menu estandarra
Name[fi]=Latten vakiovalikko
Name[gl]=Menú estándar de Latte
Name[it]=Menu standard di Latte
Name[ko]= Latte
Name[nl]=Standaard menu van Latte
Name[nn]=Standard Latte-meny
Name[pl]=Menu standardowe Latte
@ -33,6 +34,7 @@ Comment[eu]=Eskuineko botoiaz klik eginda agertu ohi den latte menua
Comment[fi]=Latte-valikko, joka tavallisesti näytetään hiiren oikealla painikkeella
Comment[gl]=O menú de Latte que adoita mostrarse ao facer clic dereito
Comment[it]=Il menu di Latte che normalmente viene mostrato al clic destro
Comment[ko]= latte
Comment[nl]=Het menu van latte dat normaal getoond wordt bij rechtsklikken
Comment[nn]=Latte-menyen som som standard vert vist ved høgreklikk
Comment[pl]=Menu Latte, które normalnie pokazuj się po kliknięciu prawym

View File

@ -12,6 +12,7 @@ Name[eu]=Latte
Name[fi]=Latte
Name[gl]=Latte
Name[it]=Latte
Name[ko]=Latte
Name[nl]=Latte
Name[nn]=Latte
Name[pl]=Latte
@ -30,6 +31,7 @@ Comment[en_GB]=Latte default indicator
Comment[es]=Indicador por omisión de Latte
Comment[gl]=Indicador predeterminado de Latte
Comment[it]=Indicatore predefinito di Latte
Comment[ko]=Latte
Comment[nl]=Standaard indicator van Latte
Comment[pt]=Indicador predefinido do Latte
Comment[pt_BR]=Indicador padrão do Latte

View File

@ -8,6 +8,7 @@ Name[es]=Plasma
Name[fr]=Plasma
Name[gl]=Plasma
Name[it]=Plasma
Name[ko]=Plasma
Name[nl]=Plasma
Name[nn]=Plasma
Name[pt]=Plasma
@ -22,6 +23,7 @@ Comment[en_GB]=Latte Plasma style indicator
Comment[es]=Estilo del indicador Plasma Latte
Comment[gl]=Indicador de estilo Plasma de Latte
Comment[it]=Indicatore stile di Plasma di Latte
Comment[ko]=Latte Plasma
Comment[nl]=Plasma stijlindicator van Latte
Comment[pt]=Indicador de estilo do Plasma no Latte
Comment[pt_BR]=Indicador de estilo do Plasma no Latte

View File

@ -12,6 +12,7 @@ Name[eu]=Latte plasmoidea
Name[fi]=Latte-sovelma
Name[gl]=Plasmoide de Latte
Name[it]=Plasmoide Latte
Name[ko]=Latte Plasmoid
Name[nl]=Latte-plasmoid
Name[nn]=Latte-skjermelement
Name[pl]=Plazmoid Latte
@ -36,6 +37,7 @@ Comment[eu]=Plasmoidea Latte Docketik
Comment[fi]=Latte-telakan sovelma
Comment[gl]=Plasmoide da doca Latte.
Comment[it]=Plasmoide da Latte Dock
Comment[ko]=Latte Plasmoid
Comment[nl]=Plasmoid uit de Latte Dock
Comment[nn]=Skjermeelement frå Latte-dokk
Comment[pl]=Plazmoid dla doku Latte

View File

@ -12,6 +12,7 @@ Name[eu]=Latte plasmoidea
Name[fi]=Latte-sovelma
Name[gl]=Plasmoide de Latte
Name[it]=Plasmoide Latte
Name[ko]=Latte Plasmoid
Name[nl]=Latte-plasmoid
Name[nn]=Latte-skjermelement
Name[pl]=Plazmoid Latte
@ -36,6 +37,7 @@ Comment[eu]=Plasmoidea Latte Docketik
Comment[fi]=Latte-telakan sovelma
Comment[gl]=Plasmoide da doca Latte.
Comment[it]=Plasmoide da Latte Dock
Comment[ko]=Latte Plasmoid
Comment[nl]=Plasmoid uit de Latte Dock
Comment[nn]=Skjermeelement frå Latte-dokk
Comment[pl]=Plazmoid dla doku Latte

View File

@ -13,6 +13,7 @@ Name[eu]=Latte Shell-a
Name[fi]=Latte-käyttöliittymä
Name[gl]=Intérprete de ordes de Latte
Name[it]=shell Latte
Name[ko]=Latte
Name[nl]=Latte-shell
Name[nn]=Latte-skal
Name[pl]=Powłoka Latte
@ -36,6 +37,7 @@ Comment[eu]=Shell-a Latte Dockentzat
Comment[fi]=Latte-telakalle tarjottu käyttöliittymä
Comment[gl]=Intérprete de ordes fornecido para a doca Latte.
Comment[it]=Shell fornita per Latte Dock
Comment[ko]=Latte
Comment[nl]=Shell geleverd voor de Latte Dock
Comment[nn]=Skal frå Latte-dokk
Comment[pl]=Powłoka dla doku Latte
@ -60,6 +62,7 @@ Keywords[eu]=shell
Keywords[fi]=käyttöliittymä
Keywords[gl]=intérprete de ordes
Keywords[it]=shell
Keywords[ko]=
Keywords[nl]=shell
Keywords[nn]=skal
Keywords[pl]=powłoka

View File

@ -13,6 +13,7 @@ Name[eu]=Latte Shell-a
Name[fi]=Latte-käyttöliittymä
Name[gl]=Intérprete de ordes de Latte
Name[it]=shell Latte
Name[ko]=Latte
Name[nl]=Latte-shell
Name[nn]=Latte-skal
Name[pl]=Powłoka Latte
@ -36,6 +37,7 @@ Comment[eu]=Shell-a Latte Dockentzat
Comment[fi]=Latte-telakalle tarjottu käyttöliittymä
Comment[gl]=Intérprete de ordes fornecido para a doca Latte.
Comment[it]=Shell fornita per Latte Dock
Comment[ko]=Latte
Comment[nl]=Shell geleverd voor de Latte Dock
Comment[nn]=Skal frå Latte-dokk
Comment[pl]=Powłoka dla doku Latte
@ -60,6 +62,7 @@ Keywords[eu]=shell
Keywords[fi]=käyttöliittymä
Keywords[gl]=intérprete de ordes
Keywords[it]=shell
Keywords[ko]=
Keywords[nl]=shell
Keywords[nn]=skal
Keywords[pl]=powłoka