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
db626fa4bd
commit
81e8d3a700
1 changed files with 1 additions and 0 deletions
|
@ -51,6 +51,7 @@
|
|||
"Description[fr]": "Utilisez votre appareil mobile pour montrer des choses à l'écran",
|
||||
"Description[gl]": "Use o seu dispositivo móbil para apuntar a cousas na pantalla",
|
||||
"Description[it]": "Usa il tuo dispositivo mobile per indicare gli oggetti sullo schermo",
|
||||
"Description[ko]": "모바일 장치로 화면의 항목 가리키기",
|
||||
"Description[nl]": "Uw mobiele apparaat gebruiken om naar dingen op het scherm te wijzen",
|
||||
"Description[nn]": "Bruk mobiltelefonen til å peika på ting på skjermen",
|
||||
"Description[pl]": "Użyj swojego urządzenia przenośnego do wskazywania rzeczy na ekranie",
|
||||
|
|
Loading…
Reference in a new issue