mirror of
https://github.com/KDE/latte-dock.git
synced 2024-12-26 23:21:37 +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
77f7d27c83
commit
fea93c95a3
@ -1,54 +1,6 @@
|
||||
[Desktop Entry]
|
||||
Name=Latte Tasks
|
||||
Name[ca]=Plasmoide del Latte
|
||||
Name[ca@valencia]=Plasmoide del Latte
|
||||
Name[cs]=Plasmoid Latte
|
||||
Name[da]=Latte-plasmoid
|
||||
Name[de]=Latte-Plasmoid
|
||||
Name[el]=Πρόσθετο Latte
|
||||
Name[en_GB]=Latte Plasmoid
|
||||
Name[es]=Plasmoide Latte
|
||||
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
|
||||
Name[pt]=Plasmóide do Latte
|
||||
Name[pt_BR]=Plasmoide do Latte
|
||||
Name[ru]=Виджет Latte
|
||||
Name[sv]=Latte Plasmoid
|
||||
Name[uk]=Плазмоїд Латте
|
||||
Name[x-test]=xxLatte Plasmoidxx
|
||||
Name[zh_CN]=Latte Plasmoid
|
||||
Name[zh_TW]=Latte Plasmoid
|
||||
Comment=Tasks plasmoid from Latte Dock
|
||||
Comment[ca]=Plasmoide del Latte Dock
|
||||
Comment[ca@valencia]=Plasmoide del Latte Dock
|
||||
Comment[cs]=Plasmoid z doku Latte
|
||||
Comment[da]=Plasmoid fra Latte-dokken
|
||||
Comment[de]=Latte-Starterbereich als Miniprogramm
|
||||
Comment[el]=Πρόσθετο της εφαρμογής Latte
|
||||
Comment[en_GB]=Plasmoid from the Latte Dock
|
||||
Comment[es]=Plasmoide de Latte Dock
|
||||
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
|
||||
Comment[pt]=Plasmóide da Área Acoplável do Latte
|
||||
Comment[pt_BR]=Plasmoide do Latte Dock
|
||||
Comment[ru]=Виджет из Latte Dock
|
||||
Comment[sv]=Plasmoid för Latte dockningsfönster
|
||||
Comment[uk]=Плазмоїд для панелі Латте
|
||||
Comment[x-test]=xxPlasmoid from the Latte Dockxx
|
||||
Comment[zh_CN]=Latte 停靠栏的 Plasmoid
|
||||
Comment[zh_TW]=從 Latte Dock 而來的 Plasmoid
|
||||
|
||||
Type=Service
|
||||
Icon=latte-dock
|
||||
|
@ -1,54 +1,6 @@
|
||||
[Desktop Entry]
|
||||
Name=Latte Tasks
|
||||
Name[ca]=Plasmoide del Latte
|
||||
Name[ca@valencia]=Plasmoide del Latte
|
||||
Name[cs]=Plasmoid Latte
|
||||
Name[da]=Latte-plasmoid
|
||||
Name[de]=Latte-Plasmoid
|
||||
Name[el]=Πρόσθετο Latte
|
||||
Name[en_GB]=Latte Plasmoid
|
||||
Name[es]=Plasmoide Latte
|
||||
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
|
||||
Name[pt]=Plasmóide do Latte
|
||||
Name[pt_BR]=Plasmoide do Latte
|
||||
Name[ru]=Виджет Latte
|
||||
Name[sv]=Latte Plasmoid
|
||||
Name[uk]=Плазмоїд Латте
|
||||
Name[x-test]=xxLatte Plasmoidxx
|
||||
Name[zh_CN]=Latte Plasmoid
|
||||
Name[zh_TW]=Latte Plasmoid
|
||||
Comment=Tasks plasmoid from Latte Dock
|
||||
Comment[ca]=Plasmoide del Latte Dock
|
||||
Comment[ca@valencia]=Plasmoide del Latte Dock
|
||||
Comment[cs]=Plasmoid z doku Latte
|
||||
Comment[da]=Plasmoid fra Latte-dokken
|
||||
Comment[de]=Latte-Starterbereich als Miniprogramm
|
||||
Comment[el]=Πρόσθετο της εφαρμογής Latte
|
||||
Comment[en_GB]=Plasmoid from the Latte Dock
|
||||
Comment[es]=Plasmoide de Latte Dock
|
||||
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
|
||||
Comment[pt]=Plasmóide da Área Acoplável do Latte
|
||||
Comment[pt_BR]=Plasmoide do Latte Dock
|
||||
Comment[ru]=Виджет из Latte Dock
|
||||
Comment[sv]=Plasmoid för Latte dockningsfönster
|
||||
Comment[uk]=Плазмоїд для панелі Латте
|
||||
Comment[x-test]=xxPlasmoid from the Latte Dockxx
|
||||
Comment[zh_CN]=Latte 停靠栏的 Plasmoid
|
||||
Comment[zh_TW]=從 Latte Dock 而來的 Plasmoid
|
||||
|
||||
Type=Service
|
||||
Icon=latte-dock
|
||||
|
Loading…
Reference in New Issue
Block a user