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
9c78fa0fff
commit
4918be1ef0
1 changed files with 1 additions and 0 deletions
|
@ -56,6 +56,7 @@
|
|||
"Description[eu]": "Sinkronizatu kontaktuak konektatutako gailutik mahaigainera",
|
||||
"Description[fr]": "Synchroniser les contacts du périphérique connecté avec ceux du bureau",
|
||||
"Description[it]": "Sincronizza i contatti dal dispositivo connesso al desktop",
|
||||
"Description[ko]": "연결된 장치에서 데스크톱으로 연락처 동기화",
|
||||
"Description[nl]": "Contactpersonen synchroniseren uit het verbonden apparaat naar het bureaublad",
|
||||
"Description[nn]": "Synkroniser kontaktar frå tilkopla eining og til skrivebordet",
|
||||
"Description[pl]": "Współdzieli kontakty podłączonego urządzenia z komputerem",
|
||||
|
|
Loading…
Reference in a new issue