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
e468759df4
commit
68cdecff16
1 changed files with 3 additions and 0 deletions
|
@ -23,6 +23,7 @@
|
|||
"Name[pt]": "Aleix Pol i Gonzalez",
|
||||
"Name[pt_BR]": "Aleix Pol i Gonzalez",
|
||||
"Name[ro]": "Aleix Pol i Gonzalez",
|
||||
"Name[sk]": "Aleix Pol i Gonzalez",
|
||||
"Name[sl]": "Aleix Pol i Gonzalez",
|
||||
"Name[sv]": "Aleix Pol i Gonzalez",
|
||||
"Name[tr]": "Aleix Pol i Gonzalez",
|
||||
|
@ -50,6 +51,7 @@
|
|||
"Description[pt]": "Usar os seus dispositivos como monitores virtuais",
|
||||
"Description[pt_BR]": "Usa seus dispositivos como monitores virtuais",
|
||||
"Description[ro]": "Folosiți-vă dispozitivele ca monitoare virtuale",
|
||||
"Description[sk]": "Používajte zariadenia ako virtuálne monitory",
|
||||
"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",
|
||||
|
@ -79,6 +81,7 @@
|
|||
"Name[pt]": "Monitor Virtual",
|
||||
"Name[pt_BR]": "Monitor virtual",
|
||||
"Name[ro]": "Monitor virtual",
|
||||
"Name[sk]": "Virtuálny Monitor",
|
||||
"Name[sl]": "Navidezni monitor",
|
||||
"Name[sv]": "Virtuell bildskärm",
|
||||
"Name[tr]": "Sanal Ekran",
|
||||
|
|
Loading…
Reference in a new issue