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
05811535d4
commit
fd68cf3ff4
1 changed files with 1 additions and 0 deletions
|
@ -3,6 +3,7 @@ Name=Eye on Screen
|
|||
Name[az]=Pəncərənin ekranın mərkəzinə çəkilməsi
|
||||
Name[ca]=Ull a la pantalla
|
||||
Name[cs]=Oko na obrazovce
|
||||
Name[de]=Ansicht der Arbeitsfläche
|
||||
Name[en_GB]=Eye on Screen
|
||||
Name[es]=Ojo a la pantalla
|
||||
Name[et]=Eye on Screen
|
||||
|
|
Loading…
Reference in a new issue