mirror of
https://github.com/KDE/latte-dock.git
synced 2025-03-27 14:50:21 +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:
parent
dcfbb6a314
commit
b6df500beb
@ -14,7 +14,7 @@ Name[fi]=Latte-telakka
|
||||
Name[gl]=Doca Latte
|
||||
Name[id]=Dock Latte
|
||||
Name[it]=Latte Dock
|
||||
Name[ko]=Latte 도구집
|
||||
Name[ko]=Latte 독
|
||||
Name[nl]=Latte Dock
|
||||
Name[nn]=Latte-dokk
|
||||
Name[pl]=Dok Latte
|
||||
@ -42,7 +42,7 @@ Comment[fi]=Latte-telakka
|
||||
Comment[gl]=Doca Latte.
|
||||
Comment[id]=Dock Latte
|
||||
Comment[it]=Latte Dock
|
||||
Comment[ko]=Latte 도구집
|
||||
Comment[ko]=Latte 독
|
||||
Comment[nl]=Latte Dock
|
||||
Comment[nn]=Latte-dokk
|
||||
Comment[pl]=Dok Latte
|
||||
@ -210,7 +210,7 @@ Name[fi]=Poistaminen epäonnistui
|
||||
Name[gl]=Non se puido retirar
|
||||
Name[id]=Gagal menghapus
|
||||
Name[it]=Impossibile rimuovere
|
||||
Name[ko]=제거하지 못했습니다
|
||||
Name[ko]=삭제하지 못했습니다
|
||||
Name[nl]=Verwijderen is mislukt
|
||||
Name[nn]=Feil ved fjerning
|
||||
Name[pl]=Nie udało się usunąć
|
||||
|
@ -41,7 +41,7 @@ Comment[fi]=Telakka massoille
|
||||
Comment[gl]=Doca para as masas.
|
||||
Comment[id]=Dock untuk mengumpulkan
|
||||
Comment[it]=Area di aggancio per le masse
|
||||
Comment[ko]=다수의 프로그램을 위한 도구집
|
||||
Comment[ko]=모두를 위한 독
|
||||
Comment[nl]=Dock voor de massa
|
||||
Comment[nn]=Dokk for massane
|
||||
Comment[pl]=Dok dla mas
|
||||
@ -68,7 +68,7 @@ GenericName[fi]=Telakka
|
||||
GenericName[gl]=Doca
|
||||
GenericName[id]=Dok
|
||||
GenericName[it]=Aggancio
|
||||
GenericName[ko]=도구집
|
||||
GenericName[ko]=독
|
||||
GenericName[nl]=Dock
|
||||
GenericName[nn]=Dokk
|
||||
GenericName[pl]=Dok
|
||||
|
@ -13,7 +13,7 @@ Comment[fi]=Latte-ilmaisin
|
||||
Comment[gl]=Indicador de Latte
|
||||
Comment[id]=Indikator latte
|
||||
Comment[it]=Indicatore Latte
|
||||
Comment[ko]=Latte 표시도구
|
||||
Comment[ko]=Latte 표시기
|
||||
Comment[nl]=Indicator van Latte
|
||||
Comment[nn]=Latte-markør
|
||||
Comment[pl]=Wskaźnik Latte
|
||||
|
@ -10,7 +10,7 @@ Name[fi]=Ilmaisin
|
||||
Name[gl]=Indicador
|
||||
Name[id]=Indikator
|
||||
Name[it]=Indicatore
|
||||
Name[ko]=표시도구
|
||||
Name[ko]=표시기
|
||||
Name[nl]=Indicator
|
||||
Name[nn]=Markør
|
||||
Name[pl]=Wskaźnik
|
||||
|
@ -41,7 +41,7 @@ Comment[fi]=Latte-telakalla tarjottu sisällytys
|
||||
Comment[gl]=Contedor fornecido para a doca Latte.
|
||||
Comment[id]=Kontainmen disediakan untuk Dock Latte
|
||||
Comment[it]=Contenitore fornito per Latte Dock
|
||||
Comment[ko]=Latte 도구집을 위해 제공된 컨테이너
|
||||
Comment[ko]=Latte 독 컨테이너
|
||||
Comment[nl]=Container geleverd voor de Latte Dock
|
||||
Comment[nn]=Behaldar for Latte-dokk
|
||||
Comment[pl]=Pojemnik dla doku Latte
|
||||
|
@ -41,7 +41,7 @@ Comment[fi]=Latte-telakalla tarjottu sisällytys
|
||||
Comment[gl]=Contedor fornecido para a doca Latte.
|
||||
Comment[id]=Kontainmen disediakan untuk Dock Latte
|
||||
Comment[it]=Contenitore fornito per Latte Dock
|
||||
Comment[ko]=Latte 도구집을 위해 제공된 컨테이너
|
||||
Comment[ko]=Latte 독 컨테이너
|
||||
Comment[nl]=Container geleverd voor de Latte Dock
|
||||
Comment[nn]=Behaldar for Latte-dokk
|
||||
Comment[pl]=Pojemnik dla doku Latte
|
||||
|
@ -38,7 +38,7 @@ Comment[fi]=Latte-oletusilmaisin
|
||||
Comment[gl]=Indicador predeterminado de Latte
|
||||
Comment[id]=Indikator baku latte
|
||||
Comment[it]=Indicatore predefinito di Latte
|
||||
Comment[ko]=Latte 기본 표시도구
|
||||
Comment[ko]=Latte 기본 표시기
|
||||
Comment[nl]=Standaard indicator van Latte
|
||||
Comment[nn]=Standard Latte-markør
|
||||
Comment[pl]=Domyślny wskaźnik Latte
|
||||
|
@ -12,7 +12,7 @@ Name[fr]=Plasma
|
||||
Name[gl]=Plasma
|
||||
Name[id]=Plasma
|
||||
Name[it]=Plasma
|
||||
Name[ko]=플라즈마
|
||||
Name[ko]=Plasma
|
||||
Name[nl]=Plasma
|
||||
Name[nn]=Plasma
|
||||
Name[pl]=Plazma
|
||||
@ -36,7 +36,7 @@ Comment[fi]=Plasma-tyylin Latte-ilmaisin
|
||||
Comment[gl]=Indicador de estilo Plasma de Latte
|
||||
Comment[id]=Indikator latte gaya Plasma
|
||||
Comment[it]=Indicatore stile di Plasma di Latte
|
||||
Comment[ko]=Latte 플라즈마 스타일 표시도구
|
||||
Comment[ko]=Latte Plasma 스타일 표시기
|
||||
Comment[nl]=Plasma stijlindicator voor Latte
|
||||
Comment[nn]=Latte-markør i Plasma-stil
|
||||
Comment[pl]=Wskaźnik Latte dla Plazmy
|
||||
|
@ -10,7 +10,7 @@ Name[fi]=Latte-tehtävät
|
||||
Name[gl]=Tarefas de Latte
|
||||
Name[id]=Tugas-tugas Latte
|
||||
Name[it]=Processi di Latte
|
||||
Name[ko]=Latte 태스크
|
||||
Name[ko]=Latte 작업
|
||||
Name[nl]=Latte-taken
|
||||
Name[nn]=Latte-oppgåver
|
||||
Name[pl]=Zadania Latte
|
||||
@ -34,7 +34,7 @@ Comment[fi]=Latte-telakan tehtäväsovelma
|
||||
Comment[gl]=Plasmoides de tarefas da doca Latte
|
||||
Comment[id]=Plasmoid tugas-tugas dari Dock Latte
|
||||
Comment[it]=Plasmoide dei processi da Latte Dock
|
||||
Comment[ko]=Latte 도구집의 태스크 Plasmoid
|
||||
Comment[ko]=Latte 독의 작업 Plasmoid
|
||||
Comment[nl]=Plasmoid voor taken uit Latte Dock
|
||||
Comment[nn]=Oppgåve-skjermelement frå Latte-dokk
|
||||
Comment[pl]=Plazmoidy zadań dla doku Latte
|
||||
|
@ -10,7 +10,7 @@ Name[fi]=Latte-tehtävät
|
||||
Name[gl]=Tarefas de Latte
|
||||
Name[id]=Tugas-tugas Latte
|
||||
Name[it]=Processi di Latte
|
||||
Name[ko]=Latte 태스크
|
||||
Name[ko]=Latte 작업
|
||||
Name[nl]=Latte-taken
|
||||
Name[nn]=Latte-oppgåver
|
||||
Name[pl]=Zadania Latte
|
||||
@ -34,7 +34,7 @@ Comment[fi]=Latte-telakan tehtäväsovelma
|
||||
Comment[gl]=Plasmoides de tarefas da doca Latte
|
||||
Comment[id]=Plasmoid tugas-tugas dari Dock Latte
|
||||
Comment[it]=Plasmoide dei processi da Latte Dock
|
||||
Comment[ko]=Latte 도구집의 태스크 Plasmoid
|
||||
Comment[ko]=Latte 독의 작업 Plasmoid
|
||||
Comment[nl]=Plasmoid voor taken uit Latte Dock
|
||||
Comment[nn]=Oppgåve-skjermelement frå Latte-dokk
|
||||
Comment[pl]=Plazmoidy zadań dla doku Latte
|
||||
|
@ -40,7 +40,7 @@ Comment[fi]=Latte-telakalle tarjottu käyttöliittymä
|
||||
Comment[gl]=Intérprete de ordes fornecido para a doca Latte.
|
||||
Comment[id]=Shell disediakan untuk Dock Latte
|
||||
Comment[it]=Shell fornita per Latte Dock
|
||||
Comment[ko]=Latte 도구집을 위해 제공된 셸
|
||||
Comment[ko]=Latte 독용 셸
|
||||
Comment[nl]=Shell geleverd voor de Latte Dock
|
||||
Comment[nn]=Skal frå Latte-dokk
|
||||
Comment[pl]=Powłoka dla doku Latte
|
||||
|
@ -40,7 +40,7 @@ Comment[fi]=Latte-telakalle tarjottu käyttöliittymä
|
||||
Comment[gl]=Intérprete de ordes fornecido para a doca Latte.
|
||||
Comment[id]=Shell disediakan untuk Dock Latte
|
||||
Comment[it]=Shell fornita per Latte Dock
|
||||
Comment[ko]=Latte 도구집을 위해 제공된 셸
|
||||
Comment[ko]=Latte 독용 셸
|
||||
Comment[nl]=Shell geleverd voor de Latte Dock
|
||||
Comment[nn]=Skal frå Latte-dokk
|
||||
Comment[pl]=Powłoka dla doku Latte
|
||||
|
Loading…
x
Reference in New Issue
Block a user