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
662058bea4
commit
5a9361c22b
1 changed files with 3 additions and 0 deletions
|
@ -18,6 +18,7 @@
|
|||
"Name[fr]": "David Shlemayev",
|
||||
"Name[hu]": "David Shlemayev",
|
||||
"Name[ia]": "David Shlemayev",
|
||||
"Name[id]": "David Shlemayev",
|
||||
"Name[it]": "David Shlemayev",
|
||||
"Name[ko]": "David Shlemayev",
|
||||
"Name[lt]": "David Shlemayev",
|
||||
|
@ -53,6 +54,7 @@
|
|||
"Description[fr]": "Afficher la force du signal du réseau pour votre téléphone",
|
||||
"Description[hu]": "A telefon hálózati jelerősségének megjelenítése",
|
||||
"Description[ia]": "Monstra fortia de signal de rete de tu telephono",
|
||||
"Description[id]": "Tampilkan kekuatan sinyal teleponmu",
|
||||
"Description[it]": "Mostra la potenza del segnale di rete del tuo telefono",
|
||||
"Description[ko]": "내 휴대폰의 네트워크 신호 세기 표시",
|
||||
"Description[lt]": "Rodyti jūsų telefono tinklo signalo stiprumą",
|
||||
|
@ -90,6 +92,7 @@
|
|||
"Name[fr]": "Surveillance de connectivité",
|
||||
"Name[hu]": "Kapcsolódásfigyelő",
|
||||
"Name[ia]": "Controlator de connectivitate",
|
||||
"Name[id]": "Pemantau konektivitas",
|
||||
"Name[it]": "Monitor di connettività",
|
||||
"Name[ko]": "연결 모니터",
|
||||
"Name[lt]": "Jungiamumo prižiūryklė",
|
||||
|
|
Loading…
Reference in a new issue