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
176643f48c
commit
58d8fc6dd5
@ -46,6 +46,7 @@ Comment[ca@valencia]=Brisa fosca pel VDG del KDE
|
||||
Comment[de]=Breeze-Dunkel von der KDE VDG
|
||||
Comment[en_GB]=Breeze Dark by the KDE VDG
|
||||
Comment[es]=Brisa oscuro por KDE VDG
|
||||
Comment[eu]=Breeze iluna, KDE VDGk egina
|
||||
Comment[fi]=Breeze Dark KDE VDG:ltä
|
||||
Comment[fr]=Breeze sombre, par KDE VDG
|
||||
Comment[gl]=Breeze escuro de KDE VDG
|
||||
|
@ -43,6 +43,7 @@ Comment[ca@valencia]=Brisa clara pel VDG del KDE
|
||||
Comment[de]=Breeze-Hell von der KDE VDG
|
||||
Comment[en_GB]=Breeze Light by the KDE VDG
|
||||
Comment[es]=Brisa claro por KDE VDG
|
||||
Comment[eu]=Breeze argia, KDE VDGk egina
|
||||
Comment[fi]=Breeze Light KDE VDG:ltä
|
||||
Comment[fr]=Breeze clair, par KDE VDG
|
||||
Comment[gl]=Breeze claro de KDE VDG
|
||||
|
@ -46,6 +46,7 @@ Comment[ca@valencia]=Brisa pel VDG del KDE
|
||||
Comment[de]=Breeze von der KDE VDG
|
||||
Comment[en_GB]=Breeze by the KDE VDG
|
||||
Comment[es]=Brisa por KDE VDG
|
||||
Comment[eu]=Breeze, KDE VDGk egina
|
||||
Comment[fi]=Breeze KDE VDG:ltä
|
||||
Comment[fr]=Breeze, par KDE VDG
|
||||
Comment[gl]=Breeze de KDE VDG
|
||||
|
Loading…
Reference in New Issue
Block a user