Commit bbcfae42 authored by Script Kiddy's avatar Script Kiddy
Browse files

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"
parent d15183b9
Pipeline #54937 skipped
......@@ -6,10 +6,13 @@
"Name": "David Shlemayev",
"Name[az]": "David Shlemayev",
"Name[ca]": "David Shlemayev",
"Name[es]": "David Shlemayev",
"Name[fr]": "David Shlemayev",
"Name[it]": "David Shlemayev",
"Name[nl]": "David Shlemayev",
"Name[pl]": "David Shlemayev",
"Name[pt]": "David Shlemayev",
"Name[pt_BR]": "David Shlemayev",
"Name[sk]": "David Shlemayev",
"Name[sv]": "David Shlemayev",
"Name[uk]": "Давид Шлемаєв",
......@@ -19,10 +22,13 @@
"Description": "Show your phone's network signal strength",
"Description[az]": "Telefonunuzun şəbəkə siqnalı gücü göstərilsin",
"Description[ca]": "Mostra la intensitat del senyal de xarxa del vostre telèfon",
"Description[es]": "Muestra la fuerza de la señal de red de su teléfono",
"Description[fr]": "Afficher la force du signal du réseau pour votre téléphone",
"Description[it]": "Mostra la potenza del segnale di rete del tuo telefono",
"Description[nl]": "Signaalsterkte van het netwerk van uw telefoon tonen",
"Description[pl]": "Pokaż siłę sygnału sieciowego swojego telefnou",
"Description[pt]": "Mostrar a potência do sinal da rede do seu telefone",
"Description[pt_BR]": "Mostra a força do sinal de rede do seu celular",
"Description[sk]": "Zobraziť silu signálu vášho telefónu",
"Description[sv]": "Visa telefonens nätverkssignalstyrka",
"Description[uk]": "Показ потужності сигналу мережі на вашому телефоні",
......@@ -34,10 +40,13 @@
"Name": "Connectivity monitor",
"Name[az]": "Bağlantı monitoru",
"Name[ca]": "Monitor de la connectivitat",
"Name[es]": "Monitor de conectividad",
"Name[fr]": "Surveillance de connectivité",
"Name[it]": "Monitor di connettività",
"Name[nl]": "Monitor van connectiviteit",
"Name[pl]": "Monitor łączności",
"Name[pt]": "Monitor de conectividade",
"Name[pt_BR]": "Monitor de conectividade",
"Name[sk]": "Monitor pripojenia",
"Name[sv]": "Anslutningsövervakare",
"Name[uk]": "Монітор з'єднання",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment