1
0
mirror of https://github.com/KDE/latte-dock.git synced 2025-01-10 21:18:19 +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-03-31 06:13:11 +02:00
parent a8cd465917
commit 50ed071d93

View File

@ -3,6 +3,7 @@ Name=Plasma Tab Style
Name[ca]=Estil pestanya del Plasma
Name[ca@valencia]=Estil pestanya del Plasma
Name[cs]=Styl Karet Plasma
Name[en_GB]=Plasma Tab Style
Name[es]=Estilo de pestaña Plasma
Name[et]=Plasma kaardistiil
Name[eu]=Plasmako fitxen estiloa
@ -21,6 +22,7 @@ Comment=Plasma Tab style indicator for Latte
Comment[ca]=Indicador a l'estil pestanya del Plasma per al Latte
Comment[ca@valencia]=Indicador a l'estil pestanya del Plasma per al Latte
Comment[cs]=Ukazatel stylu Karet Plasma pro Latte
Comment[en_GB]=Plasma Tab style indicator for Latte
Comment[es]=Indicador de estilo de pestaña Plasma para Latte
Comment[et]=Latte Plasma kaardistiili indikaator
Comment[eu]=Plasmako fitxa estiloko adierazlea Latte-n