Commit c4ffd3ed 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 b00acad7
Pipeline #58345 skipped
......@@ -17,6 +17,7 @@
"Name[pl]": "David Shlemayev",
"Name[pt]": "David Shlemayev",
"Name[pt_BR]": "David Shlemayev",
"Name[ro]": "David Shlemayev",
"Name[sk]": "David Shlemayev",
"Name[sl]": "David Shlemayev",
"Name[sv]": "David Shlemayev",
......@@ -40,6 +41,7 @@
"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[ro]": "Arată puterea semnalului rețelei telefonului",
"Description[sk]": "Zobraziť silu signálu vášho telefónu",
"Description[sl]": "Pokaži moč omrežnega signala telefona",
"Description[sv]": "Visa telefonens nätverkssignalstyrka",
......@@ -66,6 +68,7 @@
"Name[pl]": "Monitor łączności",
"Name[pt]": "Monitor de conectividade",
"Name[pt_BR]": "Monitor de conectividade",
"Name[ro]": "Monitor de conectivitate",
"Name[sk]": "Monitor pripojenia",
"Name[sl]": "Nadzornik povezovanja",
"Name[sv]": "Anslutningsövervakare",
......
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