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
b100d75077
commit
87b41a96a9
1 changed files with 3 additions and 0 deletions
|
@ -12,6 +12,7 @@
|
|||
"Name[cs]": "Aleix Pol i Gonzalez",
|
||||
"Name[de]": "Aleix Pol i Gonzalez",
|
||||
"Name[es]": "Aleix Pol i Gonzalez",
|
||||
"Name[fi]": "Aleix Pol i Gonzalez",
|
||||
"Name[fr]": "Aleix Pol i Gonzalez",
|
||||
"Name[it]": "Aleix Pol i Gonzalez",
|
||||
"Name[nl]": "Aleix Pol i Gonzalez",
|
||||
|
@ -34,6 +35,7 @@
|
|||
"Description[ca]": "Useu els vostres dispositius com a monitors virtuals",
|
||||
"Description[cs]": "Používejte svá zařízení jako virtuální monitory",
|
||||
"Description[es]": "Usar sus dispositivos como monitores virtuales",
|
||||
"Description[fi]": "Käytä laitteita virtuaalinäyttöinä",
|
||||
"Description[fr]": "Utilisez vos périphériques comme des écrans virtuels",
|
||||
"Description[id]": "Gunakan perangkatmu sebagai monitor virtual",
|
||||
"Description[it]": "Usa i tuoi dispositivi come schermi virtuali",
|
||||
|
@ -59,6 +61,7 @@
|
|||
"Name[ca]": "Monitor virtual",
|
||||
"Name[cs]": "Virtuální monitor",
|
||||
"Name[es]": "Monitor virtual",
|
||||
"Name[fi]": "Virtuaalinäyttö",
|
||||
"Name[fr]": "Écran virtuel",
|
||||
"Name[id]": "Monitor Virtual",
|
||||
"Name[it]": "Schermo virtuale",
|
||||
|
|
Loading…
Reference in a new issue