mirror of
https://invent.kde.org/network/falkon.git
synced 2024-09-21 17:52:10 +02: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
c772438470
commit
fcfdc340ac
|
@ -40,7 +40,7 @@ Comment[id]=Tema seperti Windows berdasarkan pada desain Material
|
||||||
Comment[it]=Tema di tipo Windows, basato sul design Material
|
Comment[it]=Tema di tipo Windows, basato sul design Material
|
||||||
Comment[ko]=머티리얼 디자인 기반 Windows 형태 테마
|
Comment[ko]=머티리얼 디자인 기반 Windows 형태 테마
|
||||||
Comment[lt]=Į Windows panašus apipavidalinimas, pagrįstas Material dizainu
|
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[nn]=Windows-liknande tema, basert på Material-stilen
|
||||||
Comment[pl]=Wygląd przypominający Windowsa dla Falkona oparty na wyglądzie Material
|
Comment[pl]=Wygląd przypominający Windowsa dla Falkona oparty na wyglądzie Material
|
||||||
Comment[pt]=Tema semelhante ao Windows, baseado no 'material design'
|
Comment[pt]=Tema semelhante ao Windows, baseado no 'material design'
|
||||||
|
|
Loading…
Reference in New Issue
Block a user