Skip to content

Commit

Permalink
standardize formatting of strings.xml
Browse files Browse the repository at this point in the history
  • Loading branch information
@eighthave
eighthave committed Feb 25, 2019
1 parent a7bc0b3 commit 995bd51
Show file tree
Hide file tree
Showing 12 changed files with 154 additions and 260 deletions.
25 changes: 25 additions & 0 deletions fix-translations
View file
Original file line number Diff line number Diff line change
@@ -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
29 changes: 10 additions & 19 deletions src/main/res/values-de/strings.xml
View file
Original file line number Diff line number Diff line change
@@ -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="sms_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>

Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
37 changes: 13 additions & 24 deletions src/main/res/values-es/strings.xml
View file
Original file line number Diff line number Diff line change
@@ -1,51 +1,40 @@
<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="sms_label">
Enviar SMS o mensaje de alerta por Signal
</string>
<string name="sms_label">Enviar SMS o 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>
Expand Down Expand Up @@ -101,7 +90,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>
Expand All @@ -114,4 +103,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>
31 changes: 10 additions & 21 deletions src/main/res/values-fr/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,39 +5,29 @@

<string name="title_activity_start">Haven</string>

<string name="accelerometer_prompt">
Sensibilité du mouvement
</string>
<string name="accelerometer_prompt">Sensibilité du mouvement</string>

<string name="microphone_sensitivity">
Sensibilité du son
</string>
<string name="microphone_sensitivity">Sensibilité du son</string>

<string name="timer_delay_label">
Déterminer un délai
</string>
<string name="timer_delay_label">Déterminer un délai</string>

<string name="sms_label">
Envoyer SMS ou des alertes par message Signal
</string>
<string name="sms_label">Envoyer SMS ou des alertes par message Signal</string>

<string name="sms_hint">+33612345678</string>

<string name="camera_prompt">
Sélectionner la caméra
</string>
<string name="camera_prompt">Sélectionner la caméra</string>

<string name="secure_service_started">Haven activé</string>

<string name="intrusion_detected">Un intrus a été détecté (type: %s)
Enregistrement audio et image en cours.
</string>
</string>
<string name="title_activity_event">EventActivity</string>

<string name="action_settings">Configuration</string>

<string name="intro1_title">Bienvenu(e) sur 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 est fait pour les persones qui veulent détecter des violations de domicile, du lieu de travail, d\'une chambre d\'hotel ou n\'importe quel espace privé</string>
<string name="intro3_desc">Transformez un téléphone supplémentaire en un détecteur de sons, de mouvements, de vibrations et de lumière pour détecter des visiteurs inattendus et des intrus non désirés</string>
Expand Down Expand Up @@ -86,7 +76,7 @@
<string name="data_light">LUMIÈRE</string>
<string name="data_pressure">PRESSION</string>
<string name="data_power">ALIMENTATION</string>
<string name="share_event_action">Partager l\'événement...</string>
<string name="share_event_action">Partager l\'événement…</string>
<string name="signal_test_message">Ceci est un message de test de Haven</string>
<string name="send_test_message">Envoyer un message de test</string>
<string name="verify">Vérifier</string>
Expand All @@ -99,7 +89,7 @@
<string name="register_signal_desc">Entrez un nouveau numéro de téléphone avec Signal pour envoyer des notifications sécurisées. Vous pouvez utiliser le numéro de cet appareil ou créer un numéro virtuel.\n\nATTENTION : Si ce numéro est déjà configuré sur une installation de Signal existante il cessera de fonctionner sur cette installation et ne fonctionnera plus que sur Haven.</string>
<string name="phone_hint">+33612345678</string>

<string name="menu_licenses">Licences...</string>
<string name="menu_licenses">Licences…</string>
<string name="sensor_light">Lumière ambiante</string>
<string name="sensor_accel">Mouvement (Accéléromètre)</string>
<string name="sensor_camera">Mouvement (caméra)</string>
Expand All @@ -116,7 +106,7 @@
<string name="signal_dialog_summary">Un numéro de téléphone depuis lequel envoyer les notifications avec Signal</string>
<string name="verification_dialog_summary">Appuyez pour vérifier votre numéro Signal</string>
<string name="send_message_dialog">Entrez un numéro de téléphone où envoyer une notification d\'alerte test</string>
<string name="send_text_message">Tester les notifications...</string>
<string name="send_text_message">Tester les notifications…</string>
<string name="service_address">Adresse du service</string>
<string name="password">Mot de passe (Requis)</string>
<string name="signal_number">Numéro Signal de ce téléphone</string>
Expand All @@ -139,5 +129,4 @@
<string name="undo">Annuler</string>
<string name="events_deleted">Évènements supprimés</string>


</resources>
39 changes: 13 additions & 26 deletions src/main/res/values-it/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,21 @@
<string name="app_name" translatable="false">Haven</string>
<string name="bullets" translatable="false">•••••••</string>
<string name="menu_save">Salva</string>
<string name="menu_about">Imposta...</string>
<string name="menu_about">Imposta…</string>

<string name="title_activity_start">Haven</string>

<string name="accelerometer_prompt">
Sensibilità di movimento
</string>
<string name="accelerometer_prompt">Sensibilità di movimento</string>

<string name="microphone_sensitivity">
Sensibilità al rumore
</string>
<string name="microphone_sensitivity">Sensibilità al rumore</string>

<string name="timer_delay_label">
Imposta il timer di avvio
</string>
<string name="timer_delay_label">Imposta il timer di avvio</string>

<string name="sms_label">
Invia SMS o messaggi via Signal
</string>
<string name="sms_label">Invia SMS o messaggi via Signal</string>

<string name="sms_hint">
+3934912345678
</string>
<string name="sms_hint">+3934912345678</string>

<string name="camera_prompt">
Seleziona la fotocamera
</string>
<string name="camera_prompt">Seleziona la fotocamera</string>

<string name="secure_service_started">Haven è attivo</string>

Expand All @@ -39,7 +27,7 @@
<string name="action_settings">Impostazioni</string>

<string name="intro1_title">Benvenuto in 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 è pensato per tutti coloro che vogliono sapere cosa accade nelle loro case, nei loro uffici, nelle loro stanze di hotel</string>
<string name="intro3_desc">Trasforma un secondo cellulare in un sensore di movimento, luce, vibrazioni e suoni per riconoscere intrusi e visitatori indesiderati</string>
Expand All @@ -63,8 +51,8 @@

<string name="main_screen_title">Il tuo log di Haven</string>

<string name="current_noise_base">Livello di rumore attuale: </string>
<string name="current_accel_base">Livello di movimento attuale: </string>
<string name="current_noise_base">Livello di rumore attuale:</string>
<string name="current_accel_base">Livello di movimento attuale:</string>

<string name="configure_trigger_level">Scorri orizzontalmente per modificare il limite di riconoscimento</string>
<string name="tune_the_sound_detection">Fai un po\' di rumore!</string>
Expand All @@ -88,7 +76,7 @@
<string name="data_light">LUMINOSITÀ</string>
<string name="data_pressure">PRESSIONE</string>
<string name="data_power">RICARICA</string>
<string name="share_event_action">Condividi l\'evento...</string>
<string name="share_event_action">Condividi l\'evento…</string>
<string name="signal_test_message">Questo è un messaggio di prova inviato da Haven</string>
<string name="send_test_message">Invia un messaggio di prova</string>
<string name="verify">Verifica</string>
Expand All @@ -101,7 +89,7 @@
<string name="register_signal_desc">Inserisci un numero di telefono per registrarti con Signal per inviare notifiche in sicurezza. Puoi inserire il numero di telefono di questo dispositivo o scegliere un numero virtuale.\n\nATTENZIONE! Se questo numero è già in uso in un\'app di Signal questa smetterà di funzionare e il numero funzionerà solo con Haven.</string>
<string name="phone_hint">+3934912345678</string>

<string name="menu_licenses">Licenze...</string>
<string name="menu_licenses">Licenze…</string>
<string name="sensor_light">Luminosità ambientale</string>
<string name="sensor_accel">Movimento (Accelerometro)</string>
<string name="sensor_camera">Movimento (Fotocamera)</string>
Expand All @@ -121,7 +109,7 @@
<string name="signal_dialog_summary">Numero di telefono da cui inviare messaggi tramite Signal</string>
<string name="verification_dialog_summary">Clicca per verificare il tuo numero Signal</string>
<string name="send_message_dialog">Inserisci un numero di telefono al quale inviare una messaggio di prova</string>
<string name="send_text_message">Messaggi di prova...</string>
<string name="send_text_message">Messaggi di prova…</string>
<string name="service_address">Indirizzo del service</string>
<string name="password">Password (Obbligatoria)</string>
<string name="signal_number">Numero Signal (Locale)</string>
Expand All @@ -144,5 +132,4 @@
<string name="disable_battery_opt_title">Disabilita l\'ottimizzazione della batteria</string>
<string name="disable_battery_opt_summary">Consenti alla app di funzionare anche a schermo spento</string>


</resources>
Loading

0 comments on commit 995bd51

Please sign in to comment.