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
af2d51349a
commit
0f3d60b678
1 changed files with 3 additions and 0 deletions
|
@ -11,6 +11,7 @@
|
|||
"Name[es]": "Aleix Pol i Gonzalez",
|
||||
"Name[it]": "Aleix Pol i Gonzalez",
|
||||
"Name[nl]": "Aleix Pol i Gonzalez",
|
||||
"Name[ro]": "Aleix Pol i Gonzalez",
|
||||
"Name[sl]": "Aleix Pol i Gonzalez",
|
||||
"Name[sv]": "Aleix Pol i Gonzalez",
|
||||
"Name[tr]": "Aleix Pol i Gonzalez",
|
||||
|
@ -26,6 +27,7 @@
|
|||
"Description[es]": "Usar sus dispositivos como monitores virtuales",
|
||||
"Description[it]": "Usa i tuoi dispositivi come schermi virtuali",
|
||||
"Description[nl]": "Uw apparaten als virtuele monitoren gebruiken",
|
||||
"Description[ro]": "Folosiți-vă dispozitivele ca monitoare virtuale",
|
||||
"Description[sl]": "Uporabi vaše naprave kot navidezne monitorje",
|
||||
"Description[sv]": "Använd apparater som virtuella bildskärmar",
|
||||
"Description[tr]": "Aygıtlarınızı sanal ekranlar olarak kullanın",
|
||||
|
@ -43,6 +45,7 @@
|
|||
"Name[es]": "Monitor virtual",
|
||||
"Name[it]": "Schermo virtuale",
|
||||
"Name[nl]": "Virtuele monitor",
|
||||
"Name[ro]": "Monitor virtual",
|
||||
"Name[sl]": "Navidezni monitor",
|
||||
"Name[sv]": "Virtuell bildskärm",
|
||||
"Name[tr]": "Sanal Ekran",
|
||||
|
|
Loading…
Reference in a new issue