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:
l10n daemon script 2021-03-21 09:11:09 +01:00
parent 5c7ff447b7
commit 244af8433e
3 changed files with 4 additions and 0 deletions

View file

@ -8,6 +8,7 @@
"Name[ca]": "David Shlemayev",
"Name[es]": "David Shlemayev",
"Name[fr]": "David Shlemayev",
"Name[ia]": "David Shlemayev",
"Name[it]": "David Shlemayev",
"Name[nl]": "David Shlemayev",
"Name[pl]": "David Shlemayev",
@ -42,6 +43,7 @@
"Name[ca]": "Monitor de la connectivitat",
"Name[es]": "Monitor de conectividad",
"Name[fr]": "Surveillance de connectivité",
"Name[ia]": "Controlator de connectivitate",
"Name[it]": "Monitor di connettività",
"Name[nl]": "Monitor van connectiviteit",
"Name[pl]": "Monitor łączności",

View file

@ -150,6 +150,7 @@
"Name[fi]": "Soita puhelimeeni",
"Name[fr]": "Faire sonner mon téléphone",
"Name[gl]": "Facer soar o meu móbil",
"Name[ia]": "Sona mi telephono",
"Name[id]": "Ring my phone",
"Name[it]": "Fai squillare il mio telefono",
"Name[ja]": "端末を鳴らす",

View file

@ -93,6 +93,7 @@
"Name[fi]": "Etsi tämä laite",
"Name[fr]": "Trouver ce périphérique",
"Name[gl]": "Atopar o dispositivo",
"Name[ia]": "Trova iste dispositivo",
"Name[id]": "Find this device",
"Name[it]": "Trova questo dispositivo",
"Name[ja]": "デバイスを探す",