Merge branch 'fp2-2343' into 'master'
FPII-2343: FP Updater: add URL parameters
Add Updater and baseband (FP2) version to updater.zip request.
Change-Id: I05a28cebdc5c9bf00f2e4920d3536c0a848a8f71
See merge request !29
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index ee0c400..4d7aa2e 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<resources>
<string name="app_name">Updater</string>
@@ -41,10 +41,10 @@
<string name="older_version">ältere Version</string>
<string name="older_version_os_install_confirmation">Bist du sicher, dass du weitermachen willst?</string>
<string name="older_version_os_install_confirmation_checkbox">Ich kenne und verstehe alle Konsequenzen dieser Installation</string>
- <string name="older_versions">Ältere Versionen</string>
+ <string name="older_versions">Andere Versionen</string>
<string name="os_update_has_started_message">Das Update hat begonnen. Dies kann ein wenig dauern, abhängig von der Gechwindigkeit deiner Internet Verbindung.</string>
<string name="other_os_options">Betrete den fortgeschrittenen Modus</string>
- <string name="please_be_patient">Bitte gedulde dich noch ein wenig…</string>
+ <string name="please_be_patient">Bitte gedulde dich noch ein wenig…</string>
<string name="restart">Neustarten</string>
<string name="restart_your_phone_message">Neustarte dein Fairphone um das Update abzuschliessen.</string>
<string name="take_me_back">Bring mich zurück</string>
@@ -79,4 +79,4 @@
<string name="charge_battery">Bitte lade die Batterie mindestens 40% auf</string>
<string name="connect_to_internet">Stelle sicher, dass eine Internetverbindung besteht</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index ffb8a57..801385f 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<resources>
<string name="app_name">Updater</string>
@@ -41,10 +41,10 @@
<string name="older_version">Versión Anterior</string>
<string name="older_version_os_install_confirmation">¿Seguro que deseas continuar?</string>
<string name="older_version_os_install_confirmation_checkbox">Comprendo y acepto las consecuencias de esta instalación.</string>
- <string name="older_versions">Versiones anteriores</string>
+ <string name="older_versions">Otras versiones</string>
<string name="os_update_has_started_message">Actualización en proceso. Puede tardar unos minutos dependiendo de la velocidad de tu red.</string>
<string name="other_os_options">Accede al modo avanzado</string>
- <string name="please_be_patient">Un momento, por favor…</string>
+ <string name="please_be_patient">Un momento, por favor…</string>
<string name="restart">Reiniciar</string>
<string name="restart_your_phone_message">Reinicia tu teléfono para completar la instalación.</string>
<string name="take_me_back">Volver atrás</string>
@@ -79,4 +79,4 @@
<string name="charge_battery">Asegúrate de que tu batería está cargada al menos un 40%</string>
<string name="connect_to_internet">Asegúrate de que tienes conexión a internet</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 2ebcb3f..01c1eeb 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<resources>
<string name="app_name">Updater</string>
@@ -41,10 +41,10 @@
<string name="older_version">Version dépassée</string>
<string name="older_version_os_install_confirmation">Êtes-vous certain de vouloir continuer ?</string>
<string name="older_version_os_install_confirmation_checkbox">Je comprends et j\'accepte toutes les implications de cette installation.</string>
- <string name="older_versions">Anciennes versions</string>
+ <string name="older_versions">Autres versions</string>
<string name="os_update_has_started_message">La mise à jour a démarré. Selon la vitesse de votre connexion réseau, cette opération peut prendre un certain temps.</string>
<string name="other_os_options">Passer en mode avancé</string>
- <string name="please_be_patient">Veuillez patienter…</string>
+ <string name="please_be_patient">Veuillez patienter…</string>
<string name="restart">Redémarrer</string>
<string name="restart_your_phone_message">Redémarrez votre téléphone pour terminer la mise à jour.</string>
<string name="take_me_back">Revenir en arrière</string>
@@ -79,4 +79,4 @@
<string name="charge_battery">Chargez votre batterie à au moins 40%</string>
<string name="connect_to_internet">Assurez-vous d\'être connecté à internet</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 6abe6e6..8898f22 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<resources>
<string name="app_name">Updater</string>
@@ -41,10 +41,10 @@
<string name="older_version">Oudere versie</string>
<string name="older_version_os_install_confirmation">Weet je zeker dat je wilt doorgaan?</string>
<string name="older_version_os_install_confirmation_checkbox">Ik ken en begrijp alle implicaties van het uitvoeren van deze installatie</string>
- <string name="older_versions">Oudere versies</string>
+ <string name="older_versions">Andere versies</string>
<string name="os_update_has_started_message">De update is gestart. Dit kan enige tijd duren, afhankelijk van de snelheid van je netwerkverbinding.</string>
<string name="other_os_options">Open de geavanceerde modus</string>
- <string name="please_be_patient">Een ogenblik geduld…</string>
+ <string name="please_be_patient">Een ogenblik geduld…</string>
<string name="restart">Herstart</string>
<string name="restart_your_phone_message">Herstart je telefoon om de update te voltooien.</string>
<string name="take_me_back">Breng me terug</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 039b9ff..8f3dcac 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<resources>
<string name="app_name"> Updater</string>
@@ -36,15 +36,15 @@
<string name="invalid_signature_download_message">Ficheiro inválido descarregado: Assinatura errada</string>
<string name="latest_version">Versão mais recente</string>
<string name="new_os">Novo Sistema Operativo</string>
- <string name="no_space_available_cache_message">Sem espaço disponível em /cache. A abortar…</string>
- <string name="no_space_available_sd_card_message">Sem espaço disponível na memória. A abortar…</string>
+ <string name="no_space_available_cache_message">Sem espaço disponível em /cache. A abortar…</string>
+ <string name="no_space_available_sd_card_message">Sem espaço disponível na memória. A abortar…</string>
<string name="older_version">Versão anterior</string>
<string name="older_version_os_install_confirmation">Tem a certeza de que quer prosseguir?</string>
<string name="older_version_os_install_confirmation_checkbox">Tomei conhecimento das implicações desta instalação</string>
- <string name="older_versions">Versões anteriores</string>
+ <string name="older_versions">Outras versões</string>
<string name="os_update_has_started_message">A actualização foi iniciada. Isto pode levar algum tempo, dependendo da velocidade da sua ligação.</string>
<string name="other_os_options">Entrar no modo avançado</string>
- <string name="please_be_patient">Por favor aguarde…</string>
+ <string name="please_be_patient">Por favor aguarde…</string>
<string name="restart">Reiniciar</string>
<string name="restart_your_phone_message">Reinicie o seu telefone para finalizar a actualização.</string>
<string name="take_me_back">Voltar atrás</string>
@@ -79,4 +79,4 @@
<string name="charge_battery">Por favor carregue a bateria até pelo menos 40%</string>
<string name="connect_to_internet">Certifique-se que está ligado à internet</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e1ff29b..fa3fddb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<resources>
<string name="app_name">Updater</string>
@@ -42,10 +42,10 @@
<string name="older_version">Older version</string>
<string name="older_version_os_install_confirmation">Are you sure you want to continue?</string>
<string name="older_version_os_install_confirmation_checkbox">I know and understand all implications of performing this installation</string>
- <string name="older_versions">Older versions</string>
+ <string name="older_versions">Other versions</string>
<string name="os_update_has_started_message">The update has started. This may take some time depending on your network connection speed.</string>
<string name="other_os_options">Enter advanced mode</string>
- <string name="please_be_patient">Just a moment…</string>
+ <string name="please_be_patient">Just a moment…</string>
<string name="restart">Restart</string>
<string name="restart_your_phone_message">Restart your phone to complete the update.</string>
<string name="take_me_back">Take me back</string>
@@ -81,4 +81,4 @@
<string name="beta_mode">beta mode</string>
<string name="connect_to_internet">Make sure you\'re connected to the internet</string>
-</resources>
\ No newline at end of file
+</resources>