Commit f681911d 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 d872b9ef
Pipeline #65822 skipped
......@@ -9,6 +9,7 @@
"Name[ca]": "David Shlemayev",
"Name[cs]": "David Shlemayev",
"Name[de]": "David Shlemayev",
"Name[el]": "David Shlemayev",
"Name[en_GB]": "David Shlemayev",
"Name[es]": "David Shlemayev",
"Name[eu]": "David Shlemayev",
......@@ -37,6 +38,7 @@
"Description[ca]": "Mostra la intensitat del senyal de xarxa del vostre telèfon",
"Description[cs]": "Zobrazit sílu signálu telefonu",
"Description[de]": "Signalstärke des Mobiltelefons anzeigen",
"Description[el]": "Εμφάνιση της ισχύος του δικτυακού σήματος",
"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[eu]": "Erakutsi zure telefonoaren sare-seinalearen sendotasuna",
......@@ -67,6 +69,7 @@
"Name[ca]": "Monitor de la connectivitat",
"Name[cs]": "Monitor spojení",
"Name[de]": "Verbindungs-Überwachung",
"Name[el]": "Παρακολούθηση συνδεσιμότητας",
"Name[en_GB]": "Connectivity monitor",
"Name[es]": "Monitor de conectividad",
"Name[eu]": "Konektagarritasun begiralea",
......
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