1
0
mirror of https://github.com/KDE/latte-dock.git synced 2024-12-23 01: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 2020-01-21 06:00:38 +01:00
parent 58fcd834d7
commit 881d0b47ec

View File

@ -1,6 +1,7 @@
[Desktop Entry]
Name=Plasma Tab Style
Name[ca]=Estil pestanya del Plasma
Name[es]=Estilo de pestaña Plasma
Name[et]=Plasma kaardistiil
Name[lt]=Plasma kortelių stilius
Name[nl]=Plasma-tabbladstijl
@ -12,6 +13,7 @@ Name[x-test]=xxPlasma Tab Stylexx
Name[zh_TW]=Plasma
Comment=Plasma Tab style indicator for Latte
Comment[ca]=Indicador a l'estil pestanya del Plasma per al Latte
Comment[es]=Indicador de estilo de pestaña Plasma para Latte
Comment[et]=Latte Plasma kaardistiili indikaator
Comment[lt]=Plasma kortelių stiliaus indikatorius skirtas Latte
Comment[nl]=Plasma tabbladstijlindicator voor Latte