1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-19 18:26: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:
l10n daemon script 2019-10-16 05:24:08 +02:00
parent c772438470
commit fcfdc340ac

View File

@ -40,7 +40,7 @@ Comment[id]=Tema seperti Windows berdasarkan pada desain Material
Comment[it]=Tema di tipo Windows, basato sul design Material
Comment[ko]= Windows
Comment[lt]=Į Windows panašus apipavidalinimas, pagrįstas Material dizainu
Comment[nl]=Op Windows lijkend thema gebaseerd op Material ontwerp
Comment[nl]=Op Windows lijkend thema gebaseerd op Materiaalontwerp
Comment[nn]=Windows-liknande tema, basert på Material-stilen
Comment[pl]=Wygląd przypominający Windowsa dla Falkona oparty na wyglądzie Material
Comment[pt]=Tema semelhante ao Windows, baseado no 'material design'