mirror of
https://github.com/KDE/latte-dock.git
synced 2025-02-04 13:47: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:
parent
d071e3be33
commit
91169b3a09
@ -4,6 +4,7 @@ Name[ca]=Estil pestanya del Plasma
|
||||
Name[ca@valencia]=Estil pestanya del Plasma
|
||||
Name[es]=Estilo de pestaña Plasma
|
||||
Name[et]=Plasma kaardistiil
|
||||
Name[eu]=Plasmako fitxen estiloa
|
||||
Name[it]=Stile delle schede di Plasma
|
||||
Name[lt]=Plasma kortelių stilius
|
||||
Name[nl]=Plasma-tabbladstijl
|
||||
@ -19,6 +20,7 @@ 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[es]=Indicador de estilo de pestaña Plasma para Latte
|
||||
Comment[et]=Latte Plasma kaardistiili indikaator
|
||||
Comment[eu]=Plasmako fitxa estiloko adierazlea Latte-n
|
||||
Comment[it]=Indicatore stile delle schede di Plasma di Latte
|
||||
Comment[lt]=Plasma kortelių stiliaus indikatorius skirtas Latte
|
||||
Comment[nl]=Plasma tabbladstijlindicator voor Latte
|
||||
|
Loading…
x
Reference in New Issue
Block a user