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
47b099e148
commit
0359e25396
@ -47,6 +47,7 @@ Comment[de]=Breeze-Dunkel von der KDE VDG
|
||||
Comment[es]=Brisa oscuro por KDE VDG
|
||||
Comment[gl]=Breeze escuro de KDE VDG
|
||||
Comment[id]=Breeze Dark oleh KDE VDG
|
||||
Comment[it]=Brezza scuro del KDE VDG
|
||||
Comment[nl]=Breeze Dark door de KDE VDG
|
||||
Comment[pt]=Brisa Escuro da VDG do KDE
|
||||
Comment[pt_BR]=Breeze Dark pelo KDE VDG
|
||||
|
@ -44,6 +44,7 @@ Comment[de]=Breeze-Hell von der KDE VDG
|
||||
Comment[es]=Brisa claro por KDE VDG
|
||||
Comment[gl]=Breeze claro de KDE VDG
|
||||
Comment[id]=Breeze Light oleh KDE VDG
|
||||
Comment[it]=Brezza chiaro del KDE VDG
|
||||
Comment[nl]=Breeze Light door de KDE VDG
|
||||
Comment[pt]=Brisa Claro da VDG do KDE
|
||||
Comment[pt_BR]=Breeze Light pelo KDE VDG
|
||||
|
@ -47,6 +47,7 @@ Comment[de]=Breeze von der KDE VDG
|
||||
Comment[es]=Brisa por KDE VDG
|
||||
Comment[gl]=Breeze de KDE VDG
|
||||
Comment[id]=Breeze oleh KDE VDG
|
||||
Comment[it]=Brezza del KDE VDG
|
||||
Comment[nl]=Breeze door de KDE VDG
|
||||
Comment[pt]=Brisa da VDG do KDE
|
||||
Comment[pt_BR]=Breeze pelo KDE VDG
|
||||
|
Loading…
Reference in New Issue
Block a user