kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-01-10 21:18:19 +03: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 2020-04-20 05:38:30 +02:00
parent 0d0b0413bb
commit d0bf13aa72
12 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/lattedock.notifyrc
View File

@ -15,7 +15,7 @@ Name[fi]=Latte-telakka
Name[gl]=Doca Latte
Name[id]=Dock Latte
Name[it]=Latte Dock
Name[ko]=Latte 도구집
Name[ko]=Latte 독
Name[lt]=Latte dokas
Name[nl]=Latte Dock
Name[nn]=Latte-dokk
@ -45,7 +45,7 @@ Comment[fi]=Latte-telakka
Comment[gl]=Doca Latte.
Comment[id]=Dock Latte
Comment[it]=Latte Dock
Comment[ko]=Latte 도구집
Comment[ko]=Latte 독
Comment[lt]=Latte dokas
Comment[nl]=Latte Dock
Comment[nn]=Latte-dokk
@ -232,7 +232,7 @@ Name[gl]=Non se puido retirar
Name[ia]=Il falleva a remover
Name[id]=Gagal menghapus
Name[it]=Impossibile rimuovere
Name[ko]=제거하지 못했습니다
Name[ko]=삭제하지 못했습니다
Name[lt]=Nepavyko pašalinti
Name[nl]=Verwijderen is mislukt
Name[nn]=Feil ved fjerning

4
app/org.kde.latte-dock.desktop.cmake
View File

@ -43,7 +43,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[lt]=Dokas masėms
Comment[nl]=Dock voor de massa
Comment[nn]=Dokk for massane
@ -73,7 +73,7 @@ GenericName[gl]=Doca
GenericName[ia]=Bassino
GenericName[id]=Dok
GenericName[it]=Aggancio
GenericName[ko]=도구집
GenericName[ko]=독
GenericName[lt]=Dokas
GenericName[nl]=Dock
GenericName[nn]=Dokk

2
app/packageplugins/indicator/latte-indicator.desktop
View File

@ -15,7 +15,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[lt]=Latte indikatorius
Comment[nl]=Indicator van Latte
Comment[nn]=Latte-markør

2
app/packageplugins/indicator/latte-packagestructure-indicator.desktop
View File

@ -12,7 +12,7 @@ Name[fi]=Ilmaisin
Name[gl]=Indicador
Name[id]=Indikator
Name[it]=Indicatore
Name[ko]=표시도구
Name[ko]=표시기
Name[lt]=Indikatorius
Name[nl]=Indicator
Name[nn]=Markør

2
containment/metadata.desktop.cmake
View File

@ -43,7 +43,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[lt]=Latte dokui teikiamas suvaržymas
Comment[nl]=Container geleverd voor de Latte Dock
Comment[nn]=Behaldar for Latte-dokk

2
containment/package/metadata.desktop
View File

@ -43,7 +43,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[lt]=Latte dokui teikiamas suvaržymas
Comment[nl]=Container geleverd voor de Latte Dock
Comment[nn]=Behaldar for Latte-dokk

2
indicators/default/metadata.desktop
View File

@ -41,7 +41,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[lt]=Latte numatytasis indikatorius
Comment[nl]=Standaard indicator van Latte
Comment[nn]=Standard Latte-markør

4
indicators/org.kde.latte.plasma/metadata.desktop
View File

@ -15,7 +15,7 @@ Name[gl]=Plasma
Name[ia]=Plasma
Name[id]=Plasma
Name[it]=Plasma
Name[ko]=플라즈마
Name[ko]=Plasma
Name[lt]=Plasma
Name[nl]=Plasma
Name[nn]=Plasma
@ -42,7 +42,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[lt]=Latte Plasma stiliaus indikatorius
Comment[nl]=Plasma stijlindicator van Latte
Comment[nn]=Latte-markør i Plasma-stil

4
plasmoid/metadata.desktop.cmake
View File

@ -12,7 +12,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[lt]=Latte užduotys
Name[nl]=Latte-taken
Name[nn]=Latte-oppgåver
@ -39,7 +39,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[lt]=Užduočių Plasma įskiepis iš Latte doko
Comment[nl]=Plasmoid voor taken uit Latte Dock
Comment[nn]=Oppgåve-skjermelement frå Latte-dokk

4
plasmoid/package/metadata.desktop
View File

@ -12,7 +12,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[lt]=Latte užduotys
Name[nl]=Latte-taken
Name[nn]=Latte-oppgåver
@ -39,7 +39,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[lt]=Užduočių Plasma įskiepis iš Latte doko
Comment[nl]=Plasmoid voor taken uit Latte Dock
Comment[nn]=Oppgåve-skjermelement frå Latte-dokk

2
shell/metadata.desktop.cmake
View File

@ -42,7 +42,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[lt]=Latte dokui teikiamas apvalkalas
Comment[nl]=Shell geleverd voor de Latte Dock
Comment[nn]=Skal frå Latte-dokk

2
shell/package/metadata.desktop
View File

@ -42,7 +42,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[lt]=Latte dokui teikiamas apvalkalas
Comment[nl]=Shell geleverd voor de Latte Dock
Comment[nn]=Skal frå Latte-dokk