mirror of
https://github.com/KDE/latte-dock.git
synced 2025-03-30 14:50:12 +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
09759bec1b
commit
953683d1e1
@ -5,11 +5,12 @@ Name[ca@valencia]=Indicadors del Latte
|
||||
Name[cs]=Ukazatele Latte
|
||||
Name[en_GB]=Latte Indicators
|
||||
Name[es]=Indicadores de Latte
|
||||
Name[eu]=Latte adierazleak
|
||||
Name[fi]=Latte-ilmaisimet
|
||||
Name[gl]=Indicadores de Latte
|
||||
Name[id]=Indikator Latte
|
||||
Name[it]=Indicatori Latte
|
||||
Name[ko]=Latte 표시기
|
||||
Name[ko]=Latte 표시도구
|
||||
Name[nl]=Indicatoren van Latte
|
||||
Name[nn]=Latte-markørar
|
||||
Name[pl]=Wskaźniki Latte
|
||||
|
@ -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
|
||||
@ -65,6 +65,7 @@ Name[cs]=Importováno úspěšně
|
||||
Name[de]=Erfolgreich importiert
|
||||
Name[en_GB]=Imported successfully
|
||||
Name[es]=Importada exitosamente
|
||||
Name[eu]=Inportatze arrakastatsua
|
||||
Name[fi]=Tuonti onnistui
|
||||
Name[gl]=Importouse correctamente
|
||||
Name[id]=Berhasil diimpor
|
||||
@ -92,6 +93,7 @@ Name[cs]=Nepodařilo se importovat
|
||||
Name[de]=Importieren fehlgeschlagen
|
||||
Name[en_GB]=Failed to import
|
||||
Name[es]=Error al importar
|
||||
Name[eu]=Huts egin du inportatzea
|
||||
Name[fi]=Tuonti epäonnistui
|
||||
Name[gl]=Non se puido importar
|
||||
Name[id]=Gagal mengimpor
|
||||
@ -119,6 +121,7 @@ Name[cs]=Exportováno úspěšně
|
||||
Name[de]=Erfolgreich exportiert
|
||||
Name[en_GB]=Exported successfully
|
||||
Name[es]=Exportada exitosamente
|
||||
Name[eu]=Esportatze arrakastatsua
|
||||
Name[fi]=Vienti onnistui
|
||||
Name[gl]=Exportouse correctamente
|
||||
Name[id]=Berhasil diekspor
|
||||
@ -146,6 +149,7 @@ Name[cs]=Export selhal
|
||||
Name[de]=Exportieren fehlgeschlagen
|
||||
Name[en_GB]=Failed to export
|
||||
Name[es]=Error al exportar
|
||||
Name[eu]=Huts egin du esportatzea
|
||||
Name[fi]=Vienti epäonnistui
|
||||
Name[gl]=Non se puido exportar
|
||||
Name[id]=Gagal mengekspor
|
||||
@ -173,6 +177,7 @@ Name[cs]=Úspěšně odstraněno
|
||||
Name[de]=Erfolgreich entfernt
|
||||
Name[en_GB]=Removed successfully
|
||||
Name[es]=Eliminada exitosamente
|
||||
Name[eu]=Ezabatze arrakastatsua
|
||||
Name[fi]=Poistaminen onnistui
|
||||
Name[gl]=Retirouse correctamente
|
||||
Name[id]=Berhasil dihapus
|
||||
@ -200,11 +205,12 @@ Name[cs]=Selhalo odstranění
|
||||
Name[de]=Entfernen fehlgeschlagen
|
||||
Name[en_GB]=Failed to remove
|
||||
Name[es]=Error al eliminar
|
||||
Name[eu]=Huts egin du ezabatzea
|
||||
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
|
||||
|
@ -8,11 +8,12 @@ Comment[ca@valencia]=Indicador del Latte
|
||||
Comment[cs]=Ukazatel Latte
|
||||
Comment[en_GB]=Latte indicator
|
||||
Comment[es]=Indicador Latte
|
||||
Comment[eu]=Latte adierazlea
|
||||
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
|
||||
|
@ -5,11 +5,12 @@ Name[ca@valencia]=Indicador
|
||||
Name[cs]=Ukazatel
|
||||
Name[en_GB]=Indicator
|
||||
Name[es]=Indicador
|
||||
Name[eu]=Adierazlea
|
||||
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
|
||||
|
@ -33,11 +33,12 @@ Comment[ca@valencia]=Indicador predeterminat del Latte
|
||||
Comment[cs]=Výchozí ukazatel Latte
|
||||
Comment[en_GB]=Latte default indicator
|
||||
Comment[es]=Indicador por omisión de Latte
|
||||
Comment[eu]=Latte adierazle lehenetsia
|
||||
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
|
||||
|
@ -6,12 +6,13 @@ Name[cs]=Plasma
|
||||
Name[de]=Plasma
|
||||
Name[en_GB]=Plasma
|
||||
Name[es]=Plasma
|
||||
Name[eu]=Plasma
|
||||
Name[fi]=Plasma
|
||||
Name[fr]=Plasma
|
||||
Name[gl]=Plasma
|
||||
Name[id]=Plasma
|
||||
Name[it]=Plasma
|
||||
Name[ko]=Plasma
|
||||
Name[ko]=플라즈마
|
||||
Name[nl]=Plasma
|
||||
Name[nn]=Plasma
|
||||
Name[pl]=Plazma
|
||||
@ -30,11 +31,12 @@ Comment[ca@valencia]=Indicador a l'estil Plasma del Latte
|
||||
Comment[cs]=Ukazatel Latte ve stylu Plasma
|
||||
Comment[en_GB]=Latte Plasma style indicator
|
||||
Comment[es]=Estilo del indicador Plasma Latte
|
||||
Comment[eu]=Latte plasma adierazle estiloa
|
||||
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 Plasma 스타일 표시기
|
||||
Comment[ko]=Latte 플라즈마 스타일 표시도구
|
||||
Comment[nl]=Plasma stijlindicator van Latte
|
||||
Comment[nn]=Latte-markør i Plasma-stil
|
||||
Comment[pl]=Wskaźnik Latte dla Plazmy
|
||||
|
@ -5,6 +5,7 @@ Name[ca@valencia]=Tasques del Latte
|
||||
Name[cs]=Úlohy Latte
|
||||
Name[en_GB]=Latte Tasks
|
||||
Name[es]=Tareas de Latte
|
||||
Name[eu]=Latte atazak
|
||||
Name[fi]=Latte-tehtävät
|
||||
Name[gl]=Tarefas de Latte
|
||||
Name[id]=Tugas-tugas Latte
|
||||
@ -28,11 +29,12 @@ Comment[ca@valencia]=Plasmoide de tasques del Latte Dock
|
||||
Comment[cs]=Plasmoid úloh z doku Latte
|
||||
Comment[en_GB]=Tasks plasmoid from Latte Dock
|
||||
Comment[es]=Plasmoide de tareas de Latte Dock
|
||||
Comment[eu]=Atazen plasmoidea Latte Docketik
|
||||
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
|
||||
|
@ -5,6 +5,7 @@ Name[ca@valencia]=Tasques del Latte
|
||||
Name[cs]=Úlohy Latte
|
||||
Name[en_GB]=Latte Tasks
|
||||
Name[es]=Tareas de Latte
|
||||
Name[eu]=Latte atazak
|
||||
Name[fi]=Latte-tehtävät
|
||||
Name[gl]=Tarefas de Latte
|
||||
Name[id]=Tugas-tugas Latte
|
||||
@ -28,11 +29,12 @@ Comment[ca@valencia]=Plasmoide de tasques del Latte Dock
|
||||
Comment[cs]=Plasmoid úloh z doku Latte
|
||||
Comment[en_GB]=Tasks plasmoid from Latte Dock
|
||||
Comment[es]=Plasmoide de tareas de Latte Dock
|
||||
Comment[eu]=Atazen plasmoidea Latte Docketik
|
||||
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