mirror of
https://github.com/KDE/latte-dock.git
synced 2024-12-23 13: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:
parent
45619c7248
commit
d43f3d5ac4
@ -3,7 +3,7 @@ Name=Plasma Tab Style
|
||||
Name[ar]=نمط ألسنة بلازما
|
||||
Name[az]=Plasma Vərəq Üslubu
|
||||
Name[ca]=Estil pestanya del Plasma
|
||||
Name[ca@valencia]=Estil pestanya del Plasma
|
||||
Name[ca@valencia]=Estil pestanya de Plasma
|
||||
Name[cs]=Styl Karet Plasma
|
||||
Name[en_GB]=Plasma Tab Style
|
||||
Name[es]=Estilo de pestaña Plasma
|
||||
@ -31,7 +31,7 @@ Comment=Plasma Tab style indicator for Latte
|
||||
Comment[ar]=مؤشر نمط ألسنة بلازما للاتيه
|
||||
Comment[az]=Latte üçün Plasma Vərəq Üslubu indikatoru
|
||||
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[ca@valencia]=Indicador a l'estil pestanya de 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
|
||||
|
Loading…
Reference in New Issue
Block a user