mirror of
https://invent.kde.org/network/falkon.git
synced 2024-12-20 02:36:34 +01: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
cda838a35e
commit
5614914d14
@ -32,7 +32,7 @@ Comment[es]=Añade iconos adicionales y control de zum a la barra de estado
|
||||
Comment[fi]=Lisää tilariville kuvakkeita ja lähennyssovelman
|
||||
Comment[fr]=Ajout d'icônes supplémentaires et d'un composant graphique de zoom à la barre d'état
|
||||
Comment[gl]=Engade iconas adicionais e un trebello de ampliación á barra de estado
|
||||
Comment[id]=Menambah tambahan ikon dan perbesaran widget untuk bilah status
|
||||
Comment[id]=Menambah tambahan ikon dan zum widget untuk bilah status
|
||||
Comment[it]=Aggiunge alla barra di stato alcune icone aggiuntive ed uno strumento di ingrandimento
|
||||
Comment[nl]=Voegt extra pictogrammen en zoomwidget toe aan de statusbalk
|
||||
Comment[nn]=Leggjer til fleire ikon og sideforstørring via statuslinja
|
||||
|
Loading…
Reference in New Issue
Block a user