Commit 148426ab 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 dcda6b3c
Pipeline #61338 skipped
......@@ -11,6 +11,7 @@
"Name[de]": "David Shlemayev",
"Name[en_GB]": "David Shlemayev",
"Name[es]": "David Shlemayev",
"Name[fi]": "David Shlemayev",
"Name[fr]": "David Shlemayev",
"Name[it]": "David Shlemayev",
"Name[nl]": "David Shlemayev",
......@@ -36,6 +37,7 @@
"Description[de]": "Signalstärke des Mobiltelefons anzeigen",
"Description[en_GB]": "Show your phone's network signal strength",
"Description[es]": "Muestra la fuerza de la señal de red de su teléfono",
"Description[fi]": "Näytä puhelimen kentän voimakkuus",
"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",
......@@ -63,6 +65,7 @@
"Name[de]": "Verbindungs-Überwachung",
"Name[en_GB]": "Connectivity monitor",
"Name[es]": "Monitor de conectividad",
"Name[fi]": "Yhteysvalvonta",
"Name[fr]": "Surveillance de connectivité",
"Name[ia]": "Controlator de connectivitate",
"Name[it]": "Monitor di connettività",
......
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