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
e7a75ad7b2
commit
fec0cb0621
@ -52,7 +52,7 @@ Comment[es]=Tema estilo Windows basado en el diseño Material
|
||||
Comment[et]=Windowsi meenutav teema, mille aluseks on Materiali disain
|
||||
Comment[eu]=Windows-en antzeko gaia «Material design»en oinarritua
|
||||
Comment[fi]=Material-designiin pohjautuva Windowsin kaltainen teema
|
||||
Comment[fr]=Thème « Windows » inspiré par Material
|
||||
Comment[fr]=Thème « Windows » inspiré par le thème « Material »
|
||||
Comment[gl]=Tema parecido a Windows baseado no deseño material
|
||||
Comment[ia]=Thema simile a Windows basate su dessigno Material
|
||||
Comment[id]=Tema seperti Windows berdasarkan pada desain Material
|
||||
|
Loading…
Reference in New Issue
Block a user