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
7b6191f440
commit
cfaf383f89
@ -19,7 +19,7 @@ Name[hu]=Breeze Light
|
||||
Name[ia]=Brisa legier
|
||||
Name[id]=Breeze Terang
|
||||
Name[it]=Brezza chiaro
|
||||
Name[ko]=Breeze Light
|
||||
Name[ko]=밝은 Breeze
|
||||
Name[lt]=Breeze šviesus
|
||||
Name[lv]=Gaišā brīze
|
||||
Name[nl]=Breeze Light
|
||||
@ -60,7 +60,7 @@ Comment[hu]=Breeze Light a KDE VDG-től
|
||||
Comment[ia]=Brisa legier per le KDE VDG
|
||||
Comment[id]=Breeze Terang oleh KDE VDG
|
||||
Comment[it]=Brezza chiaro del KDE VDG
|
||||
Comment[ko]=KDE 시각 디자인 그룹에서 제작한 Breeze Light
|
||||
Comment[ko]=KDE 시각 디자인 그룹에서 제작한 밝은 Breeze
|
||||
Comment[lt]=Breeze šviesus pagal KDE VDG
|
||||
Comment[nl]=Breeze Light door de KDE VDG
|
||||
Comment[nn]=Breeze lys frå KDE VDG
|
||||
|
Loading…
Reference in New Issue
Block a user