Merge branch 'master' of github.com:guardianproject/haven

.tx/config

@@ -7,25 +7,3 @@ file_filter = src/main/res/values-<lang>/strings.xml
 host = https://www.transifex.com
 source_file = src/main/res/values/strings.xml
 source_lang = en
-
-[haven.fulldescriptiontxt]
-file_filter=fastlane/android/metadata/<lang>/full_description.txt
-host = https://www.transifex.com
-source_file = fastlane/android/metadata/en-US/full_description.txt
-source_lang = en
-type = TXT
-
-[haven.shortdescriptiontxt]
-file_filter=fastlane/android/metadata/<lang>/short_description.txt
-host = https://www.transifex.com
-source_file = fastlane/android/metadata/en-US/short_description.txt
-source_lang = en
-type = TXT
-
-[haven.titletxt]
-file_filter=fastlane/android/metadata/<lang>/title.txt
-host = https://www.transifex.com
-source_file = fastlane/android/metadata/en-US/title.txt
-source_lang = en
-type = TXT
-

fastlane/android/metadata/en-US/full_description.txt

@@ -25,15 +25,14 @@ Haven only saves images and sound when triggered by motion or volume,
 and stores everything locally on the device. You can position the
 device’s camera to capture visible motion, or set your phone somewhere
 discreet to just listen for noises. Get secure notifications of
-intrusion events instantly and access the logs remotely or anytime
+intrusion events instantly, and access logs remotely or anytime
 later.
 
-The follow sensors are monitored for a measurable change, and then
+The following sensors are monitored for measurable change, and then
 recorded to an event log on the device:
 
-* Accelerometer: phone’s motion and vibration
-* Camera: motion in the phone’s visible surroundings from front or back camera
-* Microphone: noises in the environment
-* Light: change in light from ambient light sensor
-* Power: detect device being unplugged or power loss
-
+* Accelerometer: Motion and vibration of phone
+* Camera: Motion in the phone’s visible surroundings from front or back camera
+* Microphone: Noises in the environment
+* Light: Change in light from ambient light sensor
+* Power: Detect device being unplugged or power loss/shutdown

fastlane/android/metadata/en-US/title.txt

@@ -1 +1 @@
-Haven
+Haven

fastlane/android/metadata/fr/short_description.txt

@@ -0,0 +1 @@
+Protége les espaces et les biens privés sans compromettre l’intimité

fastlane/android/metadata/fr/title.txt

@@ -1 +1 @@
-Haven
+Haven

fastlane/android/metadata/nb_NO/short_description.txt

@@ -0,0 +1 @@
+Beskytt private rom og eiendeler uten å ofre personvernet

fastlane/android/metadata/nb_NO/title.txt

@@ -0,0 +1 @@
+Haven

fix-translations

@@ -0,0 +1,25 @@
+#!/bin/bash -e
+
+# Fix TypographyEllipsis programmatically
+sed -i 's/\.\.\./…/g' src/main/res/values*/strings.xml
+
+# Replace "--" with an "em dash" character
+sed -i 's,\(\>[^\<]*\)--\([^\>]\),\1—\2,g' src/main/res/values*/strings.xml
+
+# indent <string> lines like Android Studio does
+sed -i "s,^\s*<string,    <string," src/main/res/values*/strings.xml
+
+# no indent on <resources>
+sed -i 's,\s*<resources>,<resources>,' src/main/res/values*/strings.xml
+sed -i 's,\s*</resources>,</resources>,' src/main/res/values*/strings.xml
+
+# strip leading whitespace
+sed -Ei 's,(<string[^>]+>)\s*,\1,' src/main/res/values*/strings.xml
+
+# strip trailing whitespace
+sed -i 's,\s*</string>,</string>,' src/main/res/values*/strings.xml
+
+if ! git diff --exit-code > /dev/null; then
+    echo "Run fix-translations and include the needed differences!"
+    exit 1
+fi

gradle/wrapper/gradle-wrapper.properties

@@ -5,3 +5,4 @@ zipStoreBase=GRADLE_USER_HOME
 android.enableR8=true
 zipStorePath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionSha256Sum=53b71812f18cdb2777e9f1b2a0f2038683907c90bdc406bc64d8b400e1fb2c3b

src/main/res/values-be/strings.xml

@@ -0,0 +1,35 @@
+<resources>
+
+    <string name="menu_save">Захаваць</string>
+    <string name="menu_about">Наладзiць…</string>
+
+    <string name="title_activity_start">Haven</string>
+
+    <string name="accelerometer_prompt">Адчувальнасць Руху</string>
+
+    <string name="microphone_sensitivity">Адчувальнасць Гуку</string>
+
+    <string name="timer_delay_label">Час Затрымкi</string>
+
+    <string name="sms_label">Апавяшчаць праз СМС або праз дадатак Signal</string>
+
+    <string name="sms_hint">+12125551212</string>
+
+    <string name="camera_prompt">Выбар Камеры</string>
+
+    <string name="secure_service_started">Haven Работае</string>
+
+    <string name="intrusion_detected">Спрацаваў Сэнсар Haven (Тып: %s)</string>
+    <string name="title_activity_event">Падзеi</string>
+
+    <string name="action_settings">Налады</string>
+
+    <string name="intro1_title">Вiтаем у Haven</string>
+    <string name="intro1_desc">\"Now when the ark of human fate,\nLong baffled by the wayward wind,\nIs drifting with its peopled freight,\nSAFE HAVEN on the height find…\"\n-George Meredith</string>
+
+    <string name="intro2_title">Haven прызначаны для людзей, што жадаюць сачыць за ўварваннямi ў iх дамы, офiсы, гастiнiчныя нумары або iншыя прыватныя месцы</string>
+    <string name="intro3_desc">Ператварыце дадатковы тэлефон у дэтэктар руху, гуку, вiбрацыi i свету, каб назiраць за нечаканымi гасцямi i нежаданымi зламыснiкамi.</string>
+
+    <string name="intro4_desc">Атрымоўвайце апавяшчэннi аб уварваннях iмгненна. Назiрайце за журналам падзей аддалена альбо асабiста.</string>
+
+</resources>

src/main/res/values-de/strings.xml

@@ -1,29 +1,21 @@
 <resources>
 
     <string name="menu_save">Speichern</string>
-    <string name="menu_about">Einrichtung...</string>
+    <string name="menu_about">Einrichtung…</string>
 
     <string name="title_activity_start">Haven</string>
 
-    <string name="accelerometer_prompt">
-    	Empfindlichkeit Bewegung
-    </string>
+    <string name="accelerometer_prompt">Empfindlichkeit Bewegung</string>
 
-    <string name="microphone_sensitivity">
-    	Empfindlichkeit Geräusche
-    </string>
+    <string name="microphone_sensitivity">Empfindlichkeit Geräusche</string>
 
-    <string name="timer_delay_label">
-    	Verzögerungszeit setzen
-    </string>
+    <string name="timer_delay_label">Verzögerungszeit setzen</string>
 
     <string name="remote_notification_label">"Bei Alarm SMS oder Signal Nachricht senden "</string>
 
     <string name="sms_hint">+4917712345678</string>
 
-    <string name="camera_prompt">
-    	Kamera wählen
-    </string>
+    <string name="camera_prompt">Kamera wählen</string>
 
     <string name="secure_service_started">Haven aktiviert</string>
 
@@ -33,9 +25,9 @@
     <string name="action_settings">Einstellungen</string>
 
     <string name="intro1_title">Willkommen bei Haven</string>
-    <string name="intro1_desc">\"Now when the ark of human fate,\nLong baffled by the wayward wind,\nIs drifting with its peopled freight,\nSAFE HAVEN on the height find...\"\n-George Meredith</string>
+    <string name="intro1_desc">\"Now when the ark of human fate,\nLong baffled by the wayward wind,\nIs drifting with its peopled freight,\nSAFE HAVEN on the height find…\"\n-George Meredith</string>
 
-    <string name="intro2_title">Haven ist für Personen die gerne wissen was in Ihrem Haus, Büro, Hotelraum, ... vorgeht.</string>
+    <string name="intro2_title">Haven ist für Personen die gerne wissen was in Ihrem Haus, Büro, Hotelraum, … vorgeht.</string>
     <string name="intro3_desc">Verwandle ein zweites Telefon in einen Geräusch, Vibrations, Licht und Bewegungssensor um ungewünschte Besucher direkt zu erkennen.</string>
 
     <string name="intro4_desc">Werde direkt benachrichtigt wenn Haven etwas erkennt und schaue per Fenzugriff in die Logs oder schaue nach den Logs direkt am Telefon</string>
@@ -81,7 +73,7 @@
     <string name="data_light">LICHT</string>
     <string name="data_pressure">DRUCK</string>
     <string name="data_power">POWER</string>
-    <string name="share_event_action">Event teilen...</string>
+    <string name="share_event_action">Event teilen…</string>
     <string name="signal_test_message">Dies ist eine Testnachricht von Haven</string>
     <string name="send_test_message">Testnachricht senden</string>
     <string name="verify">Prüfen</string>
@@ -94,12 +86,11 @@
     <string name="register_signal_desc">Registriere eine neue Telefonnummer (+4917712345678) mit Signal um sichere Benachrichtigungen zu senden. NICHT IHRE PRIMÄRE SIGNAL NUMMER NUTZEN.</string>
     <string name="phone_hint">+4917712345678</string>
 
-    <string name="menu_licenses">Lizenzen...</string>
+    <string name="menu_licenses">Lizenzen…</string>
     <string name="sensor_light">Umgebungslicht</string>
     <string name="sensor_accel">Bewegung (Beschleunigungssensor)</string>
     <string name="sensor_camera">Bewegung (Kamera)</string>
     <string name="sensor_sound">Mikrofon</string>
     <string name="sensor_power">USB Power</string>
     <string name="sensor_unknown">Unbekannt</string>
-
-    </resources>
+</resources>

src/main/res/values-es/strings.xml

@@ -1,51 +1,42 @@
 <resources>
 
     <string name="menu_save">Guardar</string>
-    <string name="menu_about">Configurar...</string>
+    <string name="menu_about">Configurar…</string>
 
     <string name="title_activity_start">Haven</string>
 
-    <string name="accelerometer_prompt">
-        Sensibilidad de movimiento
-    </string>
+    <string name="accelerometer_prompt">Sensibilidad de movimiento</string>
 
-    <string name="microphone_sensitivity">
-        Sensibilidad de sonido
-    </string>
+    <string name="microphone_sensitivity">Sensibilidad de sonido</string>
 
-    <string name="timer_delay_label">
-        Temporizador
-    </string>
+    <string name="timer_delay_label">Temporizador</string>
 
     <string name="remote_notification_label">
-        Enviar SMS o mensaje de alerta por Signal
+        Enviar mensaje de alerta por Signal
     </string>
 
-    <string name="sms_hint">
-+12125551212</string>
+    <string name="sms_hint">+12125551212</string>
 
-    <string name="camera_prompt">
-        Seleccionar la cámara
-    </string>
+    <string name="camera_prompt">Seleccionar la cámara</string>
 
     <string name="secure_service_started">Haven Activado</string>
 
     <string name="intrusion_detected">Se ha detectado un intruso (Type: %s)
         Grabando prueba de audio e imagen.
-    </string>
+</string>
     <string name="title_activity_event">EventActivity</string>
 
     <string name="action_settings">Configuración</string>
 
     <string name="intro1_title">Bienvenido a Haven</string>
-    <string name="intro1_desc">\"Now when the ark of human fate,\nLong baffled by the wayward wind,\nIs drifting with its peopled freight,\nSAFE HAVEN on the height find...\"\n-George Meredith</string>
+    <string name="intro1_desc">\"Now when the ark of human fate,\nLong baffled by the wayward wind,\nIs drifting with its peopled freight,\nSAFE HAVEN on the height find…\"\n-George Meredith</string>
 
     <string name="intro2_title">Haven es para las personas que quieren detectar invasiones a su hogar, oficina, cuarto de hotel o cualquier otro espacio privado.</string>
-    <string name="intro3_desc">Convierte un teléfono extra en un detector de sonido, movimiento, vibración y luz, vigilando visitantes inesperados e intrusos indeseados. </string>
+    <string name="intro3_desc">Convierte un teléfono extra en un detector de sonido, movimiento, vibración y luz, vigilando visitantes inesperados e intrusos indeseados.</string>
 
     <string name="intro4_desc">Recibe notificaciones de intrusos inmediatamente y accede a las detecciones de manera remota o en persona posteriormente.</string>
 
-    <string name="intro5_title">Haven está listo. </string>
+    <string name="intro5_title">Haven está listo.</string>
     <string name="intro5_desc">Activa la Aplicación en cualquier momento usando el botón &gt; en la pantalla principal.</string>
 
     <string name="onboarding_action_end">Terminar</string>
@@ -101,7 +92,7 @@
     <string name="register_signal_desc">Registra un número de teléfono nuevo (+12125551212) con Signal para enviar notificaciones seguras. NO USES TU NÚMERO PRINCIPAL DE SIGNAL.</string>
     <string name="phone_hint">+12125551212</string>
 
-    <string name="menu_licenses">Licencias...</string>
+    <string name="menu_licenses">Licencias…</string>
     <string name="sensor_light">Luz ambiental</string>
     <string name="sensor_accel">Movimiento (Acelerómetro)</string>
     <string name="sensor_camera">Movimiento (Cámara)</string>
@@ -114,4 +105,4 @@
     <string name="remote_access_onion_error">Esta función requiere Orbot instalado: La aplicación de Tor para dispositivos Android.</string>
 
     <string name="sms_dialog_summary">Número de teléfono remoto para enviar mensajes de notificaciones</string>
-    </resources>
+</resources>