Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history 
* develop:
  Update strings from POEditor
  • Loading branch information
@AlvaroBrey
AlvaroBrey committed Nov 13, 2018
2 parents 145b46b + 19b3d18 commit 4a3e6e6
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 16 deletions.
9 changes: 9 additions & 0 deletions Calendula/src/main/res/values-es/strings_translatable.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -542,6 +542,15 @@ Quieres instalar la nueva base de datos ahora?"</string>
<string name="channel_meds_description">"Notificaciones relacionadas con medicamentos, como recordatorios de tomas."</string>
<string name="channel_default_name">"Por defecto"</string>
<string name="channel_default_description">"Otras notificaciones."</string>
<string name="delays_five_min">"5 min"</string>
<string name="pref_secure_window_title">"Ventana segura"</string>
<string name="pref_secure_window_summary">"Impide que se muestre información de la app en capturas de pantalla o en el menú de aplicaciones en ejecución"</string>
<string name="pref_notification_vibration">"Vibración"</string>
<string name="pref_notification_vibration_title">"Vibrar"</string>
<string name="pref_notification_vibration_always">"Siempre"</string>
<string name="pref_notification_vibration_alarm_audible">"Sólo cuando la alarma es audible"</string>
<string name="pref_notification_vibration_alarm_silent">"Sólo cuando la alarma es silenciosa"</string>
<string name="pref_notification_vibration_never">"Nunca"</string>
<string name="pref_notification_management">"Configurar notificaciones"</string>
<string name="pref_notification_management_sum">"Ajustes de importancia, sonido y vibración"</string>
</resources>
16 changes: 8 additions & 8 deletions Calendula/src/main/res/values-fr/strings_translatable.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -386,14 +386,6 @@ Vous verrez toutes leurs prises sur l'écran d'accueil."</string>
<string name="pref_title_reminder_window">"Arrêter les rappels après"</string>
<string name="pref_notification_tone">"Sonnerie"</string>
<string name="pref_notification_tone_sum">"Par défaut"</string>
<string name="pref_notification_vibration">"Vibration"</string>
<string name="pref_notification_vibration_title">"Vibrer"</string>
<string name="pref_notification_vibration_always">"Toujours"</string>
<string name="pref_notification_vibration_alarm_audible">"Seulement quand l'alarme est audible"</string>
<string name="pref_notification_vibration_alarm_silent">"Seulement Quand l'alarme est silencieuse"</string>
<string name="pref_notification_vibration_never">"Jamais"</string>
<string name="pref_notification_management">"Gérer les notifications"</string>
<string name="pref_notification_management_sum">"Paramètres d'importance, de son et de vibration"</string>
<string name="pref_alarm_repeat_five_min">"5 min"</string>
<string name="pref_alarm_repeat_fifteen_min">"15 min"</string>
<string name="pref_alarm_repeat_thirty_min">"30 min"</string>
Expand Down Expand Up @@ -551,4 +543,12 @@ Voulez-vous installer la nouvelle base de données maintenant ?
<string name="months">"mois"</string>
<string name="year">"année"</string>
<string name="years">"années"</string>
<string name="pref_notification_vibration">"Vibration"</string>
<string name="pref_notification_vibration_title">"Vibrer"</string>
<string name="pref_notification_vibration_always">"Toujours"</string>
<string name="pref_notification_vibration_alarm_audible">"Seulement quand l'alarme est audible"</string>
<string name="pref_notification_vibration_alarm_silent">"Seulement Quand l'alarme est silencieuse"</string>
<string name="pref_notification_vibration_never">"Jamais"</string>
<string name="pref_notification_management">"Gérer les notifications"</string>
<string name="pref_notification_management_sum">"Paramètres d'importance, de son et de vibration"</string>
</resources>
9 changes: 9 additions & 0 deletions Calendula/src/main/res/values-gl-rES/strings_translatable.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -543,6 +543,15 @@ Queres instalar a nova base de datos agora?"</string>
<string name="channel_meds_description">"Notificacións relacionadas con medicamentos, como recordatorios de tomas."</string>
<string name="channel_default_name">"Por defecto"</string>
<string name="channel_default_description">"Outras notificacións."</string>
<string name="delays_five_min">"5 min"</string>
<string name="pref_secure_window_title">"Xanela segura"</string>
<string name="pref_secure_window_summary">"Impide que se amose información da app en capturas de pantalla ou no menú de aplicacións en execución"</string>
<string name="pref_notification_vibration">"Vibración"</string>
<string name="pref_notification_vibration_title">"Vibrar"</string>
<string name="pref_notification_vibration_always">"Sempre"</string>
<string name="pref_notification_vibration_alarm_audible">"Só cando a alarma é audible"</string>
<string name="pref_notification_vibration_alarm_silent">"Só cando a alarma é silenciosa"</string>
<string name="pref_notification_vibration_never">"Nunca"</string>
<string name="pref_notification_management">"Configurar notificacións"</string>
<string name="pref_notification_management_sum">"Axustes de importancia, son e vibración"</string>
</resources>
16 changes: 8 additions & 8 deletions Calendula/src/main/res/values/strings_translatable.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -380,14 +380,6 @@ You will see all their intakes in the home screen."</string>
<string name="pref_title_reminder_window">"Dismiss alarms after"</string>
<string name="pref_notification_tone">"Ringtone"</string>
<string name="pref_notification_tone_sum">"Default"</string>
<string name="pref_notification_vibration">"Vibration"</string>
<string name="pref_notification_vibration_title">"Vibrate"</string>
<string name="pref_notification_vibration_always">"Always"</string>
<string name="pref_notification_vibration_alarm_audible">"When alarm is audible only"</string>
<string name="pref_notification_vibration_alarm_silent">"When alarm is silent only"</string>
<string name="pref_notification_vibration_never">"Never"</string>
<string name="pref_notification_management">"Manage notifications"</string>
<string name="pref_notification_management_sum">"Importance, sound and vibration settings"</string>
<string name="pref_alarm_repeat_five_min">"5 min"</string>
<string name="pref_alarm_repeat_fifteen_min">"15 min"</string>
<string name="pref_alarm_repeat_thirty_min">"30 min"</string>
Expand Down Expand Up @@ -552,4 +544,12 @@ Do you want to install the new database now?
<string name="delays_five_min">"5 min"</string>
<string name="pref_secure_window_title">"Secure window"</string>
<string name="pref_secure_window_summary">"Prevents app info from appearing in screenshots or in the open apps menu"</string>
<string name="pref_notification_vibration">"Vibration"</string>
<string name="pref_notification_vibration_title">"Vibrate"</string>
<string name="pref_notification_vibration_always">"Always"</string>
<string name="pref_notification_vibration_alarm_audible">"When alarm is audible only"</string>
<string name="pref_notification_vibration_alarm_silent">"When alarm is silent only"</string>
<string name="pref_notification_vibration_never">"Never"</string>
<string name="pref_notification_management">"Manage notifications"</string>
<string name="pref_notification_management_sum">"Importance, sound and vibration settings"</string>
</resources>

0 comments on commit 4a3e6e6

Please sign in to comment.