1
0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-07-18 03:14:03 +02:00

revert all unrelated changes done in background-javascript branch

This commit is contained in:
Andreas Shimokawa 2017-05-09 14:42:19 +02:00
parent 3751273cd0
commit f9c70714b8
12 changed files with 114 additions and 113 deletions

View File

@ -31,13 +31,6 @@ import android.os.Build;
import android.os.ParcelUuid;
import android.support.annotation.NonNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.Collection;
import java.util.Collections;
import java.util.Locale;
import de.greenrobot.dao.query.QueryBuilder;
import nodomain.freeyourgadget.gadgetbridge.GBApplication;
import nodomain.freeyourgadget.gadgetbridge.GBException;
@ -56,6 +49,13 @@ import nodomain.freeyourgadget.gadgetbridge.model.ActivityUser;
import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.Collection;
import java.util.Collections;
import java.util.Locale;
import static nodomain.freeyourgadget.gadgetbridge.GBApplication.getContext;
public class HPlusCoordinator extends AbstractDeviceCoordinator {
@ -83,7 +83,7 @@ public class HPlusCoordinator extends AbstractDeviceCoordinator {
}
@Override
public int getBondingStyle(GBDevice deviceCandidate) {
public int getBondingStyle(GBDevice deviceCandidate){
return BONDING_STYLE_NONE;
}

View File

@ -26,6 +26,7 @@ import org.slf4j.LoggerFactory;
import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
import nodomain.freeyourgadget.gadgetbridge.service.DeviceCommunicationService;
import nodomain.freeyourgadget.gadgetbridge.util.DeviceHelper;

View File

@ -101,7 +101,7 @@ public class BleNamesResolver {
mServices.put("00001804-0000-1000-8000-00805f9b34fb", "Tx Power");
mServices.put("0000fee0-0000-3512-2118-0009af100700", "(Propr: Xiaomi MiLi Service)");
mServices.put("00001530-0000-3512-2118-0009af100700", "(Propr: Xiaomi Weight Service)");
mServices.put("14701820-620a-3973-7c78-9cfff0876abd", "(Propr: HPLUS Service)");
mServices.put("14701820-620a-3973-7c78-9cfff0876abd", "(Propr: HPLUS Service)");
mCharacteristics.put("00002a43-0000-1000-8000-00805f9b34fb", "Alert AlertCategory ID");
@ -185,10 +185,10 @@ public class BleNamesResolver {
mCharacteristics.put("00002a0e-0000-1000-8000-00805f9b34fb", "Time Zone");
mCharacteristics.put("00002a07-0000-1000-8000-00805f9b34fb", "Tx Power Level");
mCharacteristics.put("00002a45-0000-1000-8000-00805f9b34fb", "Unread Alert Status");
mCharacteristics.put("14702856-620a-3973-7c78-9cfff0876abd", "(Propr: HPLUS Control)");
mCharacteristics.put("14702853-620a-3973-7c78-9cfff0876abd", "(Propr: HPLUS Measurements)");
mValueFormats.put(Integer.valueOf(52), "32bit float");
mCharacteristics.put("14702856-620a-3973-7c78-9cfff0876abd", "(Propr: HPLUS Control)");
mCharacteristics.put("14702853-620a-3973-7c78-9cfff0876abd", "(Propr: HPLUS Measurements)");
mValueFormats.put(Integer.valueOf(52), "32bit float");
mValueFormats.put(Integer.valueOf(50), "16bit float");
mValueFormats.put(Integer.valueOf(34), "16bit signed int");
mValueFormats.put(Integer.valueOf(36), "32bit signed int");

View File

@ -114,7 +114,7 @@ public class HPlusDataRecordDaySlot extends HPlusDataRecord {
}
public boolean isValid() {
public boolean isValid(){
return steps != 0 || secondsInactive != 0 || heartRate != -1;
}
}

View File

@ -51,8 +51,8 @@ import nodomain.freeyourgadget.gadgetbridge.service.btle.BLETypeConversions;
import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetDeviceBusyAction;
import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.WaitAction;
import nodomain.freeyourgadget.gadgetbridge.service.devices.miband2.AbstractMiBand2Operation;
import nodomain.freeyourgadget.gadgetbridge.service.devices.miband2.MiBand2Support;
import nodomain.freeyourgadget.gadgetbridge.service.devices.miband2.AbstractMiBand2Operation;
import nodomain.freeyourgadget.gadgetbridge.util.ArrayUtils;
import nodomain.freeyourgadget.gadgetbridge.util.DateTimeUtils;
import nodomain.freeyourgadget.gadgetbridge.util.GB;

View File

@ -1,9 +1,9 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
<string name="app_name">Gadgetbridge</string>
<string name="title_activity_controlcenter">Gadgetbridge</string>
<string name="app_name">Gadgetbridge</string>
<string name="title_activity_controlcenter">Gadgetbridge</string>
<string name="action_settings">Nastavení</string>
<string name="action_debug">Ladění</string>
<string name="action_debug">Ladění</string>
<string name="action_quit">Ukončit</string>
<string name="controlcenter_fetch_activity_data">Načíst data</string>
<string name="controlcenter_start_sleepmonitor">Monitor spánku (alfa)</string>
@ -13,13 +13,13 @@
<string name="controlcenter_delete_device">Odstranit zařízení</string>
<string name="controlcenter_delete_device_name">Odstranit %1$s</string>
<string name="controlcenter_delete_device_dialogmessage">Odstraní zařízení a vymaže všechna data!</string>
<string name="controlcenter_navigation_drawer_open">Otevřít navigační lištu</string>
<string name="controlcenter_navigation_drawer_close">Zavřít navigační lištu</string>
<string name="controlcenter_snackbar_need_longpress">Podržte kartu déle pro odpojení</string>
<string name="controlcenter_snackbar_disconnecting">Odpojuji</string>
<string name="controlcenter_snackbar_connecting">Připojuji</string>
<string name="controlcenter_snackbar_requested_screenshot">Sejmout snímek obrazovky</string>
<string name="title_activity_debug">Ladění</string>
<string name="controlcenter_navigation_drawer_open">Otevřít navigační lištu</string>
<string name="controlcenter_navigation_drawer_close">Zavřít navigační lištu</string>
<string name="controlcenter_snackbar_need_longpress">Podržte kartu déle pro odpojení</string>
<string name="controlcenter_snackbar_disconnecting">Odpojuji</string>
<string name="controlcenter_snackbar_connecting">Připojuji</string>
<string name="controlcenter_snackbar_requested_screenshot">Sejmout snímek obrazovky</string>
<string name="title_activity_debug">Ladění</string>
<!--Strings related to AppManager-->
<string name="title_activity_appmanager">Manažer aplikací</string>
<string name="appmanager_cached_watchapps_watchfaces">Aplikace v cache</string>
@ -63,12 +63,12 @@
<string name="pref_theme_dark">Tmavé</string>
<string name="pref_title_language">Jazyk</string>
<string name="pref_title_minimize_priority">Skrýt notifikace Gadgetbridge</string>
<string name="pref_summary_minimize_priority_off">Ikona ve stavové liště a notifikace na zamčeném displeji budou zobrazeny</string>
<string name="pref_summary_minimize_priority_on">Ikona ve stavové liště a notifikace na zamčeném displeji nebudou zobrazeny</string>
<string name="pref_summary_minimize_priority_off">Ikona ve stavové liště a notifikace na zamčeném displeji budou zobrazeny</string>
<string name="pref_summary_minimize_priority_on">Ikona ve stavové liště a notifikace na zamčeném displeji nebudou zobrazeny</string>
<string name="pref_header_notifications">Notifikace</string>
<string name="pref_title_notifications_repetitions">Opakování</string>
<string name="pref_title_notifications_call">Volání</string>
<string name="pref_title_notifications_sms">SMS</string>
<string name="pref_title_notifications_sms">SMS</string>
<string name="pref_title_notifications_pebblemsg">Zpráva Pebble</string>
<string name="pref_summary_notifications_pebblemsg">Podpora pro aplikace, které posílají notifikace do Pebble via PebbleKit.</string>
<string name="pref_title_notifications_generic">Obecná podpora notifikací</string>
@ -125,7 +125,7 @@
<string name="pref_summary_pebble_forceuntested">Povolí funkce, které nebyl testovány. POVOLTE, JEN POKUD VÍTE, CO DĚLÁTE!</string>
<string name="pref_title_pebble_forcele">Vždy preferovat BLE</string>
<string name="pref_summary_pebble_forcele">Použít experimentální podporu Pebble LE pro všechny Pebble místo BT classic, vyžaduje spárování \"Pebble LE\" po připojení bez LE</string>
<string name="pref_title_pebble_mtu_limit">Pebble 2/LE GATT MTU limit</string>
<string name="pref_title_pebble_mtu_limit">Pebble 2/LE GATT MTU limit</string>
<string name="pref_summary_pebble_mtu_limit">Pokud vaše Pebble 2/Pebble LE nepracuje jak má, zkuste toto nastavení pro omezení MTU (povolený rozsah 20-512)</string>
<string name="pref_title_pebble_enable_applogs">Zapnout logování Watch App</string>
<string name="pref_summary_pebble_enable_applogs">Logy od watch app budou logovány v Gadgetbridge (vyžaduje znovupřipojení)</string>
@ -141,10 +141,10 @@
<string name="connecting">připojování</string>
<string name="connected">připojeno</string>
<string name="unknown_state">neznámý stav</string>
<string name="connectionstate_hw_fw">HW: %1$s FW: %2$s</string>
<string name="connectionstate_fw">FW: %1$s</string>
<string name="connectionstate_hw_fw">HW: %1$s FW: %2$s</string>
<string name="connectionstate_fw">FW: %1$s</string>
<string name="_unknown_">(neznámé)</string>
<string name="test">Test</string>
<string name="test">Test</string>
<string name="test_notification">Test notifikací</string>
<string name="this_is_a_test_notification_from_gadgetbridge">Toto je notifikace z Gadgetbridge</string>
<string name="bluetooth_is_not_supported_">BT není podporován.</string>
@ -167,7 +167,7 @@
<string name="discovery_stop_scanning">Zastavit hledání</string>
<string name="discovery_start_scanning">Spustit hledání</string>
<string name="action_discover">Připojit nové zařízení</string>
<string name="device_with_rssi">%1$s (%2$s)</string>
<string name="device_with_rssi">%1$s (%2$s)</string>
<string name="title_activity_android_pairing">Párovat zařízení</string>
<string name="android_pairing_hint">Použijte párování BT Androidu pro spárování se zařízením. </string>
<string name="title_activity_mi_band_pairing">Párovat Mi Band</string>
@ -187,7 +187,7 @@
<string name="miband_pairing_using_dummy_userdata">Data uživatele nejsou platná, nyní používám vzorová.</string>
<string name="miband_pairing_tap_hint">Když Mi Band zavibruje a blikne, dotkněte se jej několikrát po sobě.</string>
<string name="appinstaller_install">Instalovat</string>
<string name="discovery_connected_devices_hint">Nastavte své zařízení pro vyhledání. Již připojená zařízení nebudou vyhledána. Zapněte lokalizaci (GPS) pro mobily s Androidem 6 a vyšším. Vypněte hlídání soukromí pro Gadgetbridge, protože může způsobit nestabilitu mobilu. Pokud není zařízení vyhledáno během několika minut, zkuste to znovu po restartu mobilu.</string>
<string name="discovery_connected_devices_hint">Nastavte své zařízení pro vyhledání. Již připojená zařízení nebudou vyhledána. Zapněte lokalizaci (GPS) pro mobily s Androidem 6 a vyšším. Vypněte hlídání soukromí pro Gadgetbridge, protože může způsobit nestabilitu mobilu. Pokud není zařízení vyhledáno během několika minut, zkuste to znovu po restartu mobilu.</string>
<string name="discovery_note">Poznámka:</string>
<string name="candidate_item_device_image">Obraz zařízení</string>
<string name="miband_prefs_alias">Jméno/přezdívka</string>
@ -199,7 +199,7 @@
<string name="sleep_activity_date_range">Z %1$s do %2$s</string>
<string name="miband_prefs_wearside">Nosíte vlevo nebo vpravo?</string>
<string name="pref_screen_vibration_profile">Profil vibrací</string>
<string name="vibration_profile_staccato">Staccato</string>
<string name="vibration_profile_staccato">Staccato</string>
<string name="vibration_profile_short">Krátké</string>
<string name="vibration_profile_medium">Střední</string>
<string name="vibration_profile_long">Dlouhé</string>
@ -248,19 +248,19 @@
<string name="notif_battery_low_bigtext_number_of_charges">Počet nabití: %s</string>
<string name="sleepchart_your_sleep">Váš spánek</string>
<string name="weeksleepchart_sleep_a_week">Spánek za týden</string>
<string name="weeksleepchart_today_sleep_description">Spánek dnes, cíl: %1$s</string>
<string name="weeksleepchart_today_sleep_description">Spánek dnes, cíl: %1$s</string>
<string name="weekstepschart_steps_a_week">Kroky za týden</string>
<string name="activity_sleepchart_activity_and_sleep">Vaše aktivita a spánek</string>
<string name="updating_firmware">Nahrávám firmware...</string>
<string name="fwapp_install_device_not_ready">Soubor nelze nainstalovat, zařízení není připraveno.</string>
<string name="miband_installhandler_miband_firmware">Mi Band Firmware %1$s</string>
<string name="miband_installhandler_miband_firmware">Mi Band Firmware %1$s</string>
<string name="miband_fwinstaller_compatible_version">Kompatibilní verze</string>
<string name="miband_fwinstaller_untested_version">Netestovaná verze!</string>
<string name="fwappinstaller_connection_state">Připojení k zařízení: %1$s</string>
<string name="pbw_installhandler_pebble_firmware">Pebble Firmware %1$s</string>
<string name="pbw_installhandler_pebble_firmware">Pebble Firmware %1$s</string>
<string name="pbwinstallhandler_correct_hw_revision">Správná revize HW</string>
<string name="pbwinstallhandler_incorrect_hw_revision">Revize HW není správná!</string>
<string name="pbwinstallhandler_app_item">%1$s (%2$s)</string>
<string name="pbwinstallhandler_app_item">%1$s (%2$s)</string>
<string name="updatefirmwareoperation_updateproblem_do_not_reboot">Při přenosu firmwaru nastaly potíže. Nerestartujte svůj Mi Band!</string>
<string name="updatefirmwareoperation_metadata_updateproblem">Problém při přenosu matadat firmware</string>
<string name="updatefirmwareoperation_update_complete">Instalace firmware je kompletní</string>
@ -293,7 +293,7 @@
<string name="miband_prefs_device_time_offset_hours">Časový posun zařízení v hodinách (pro zjišťování spánku směnařů)</string>
<string name="miband2_prefs_dateformat">Mi2: formát data</string>
<string name="dateformat_time">Čas</string>
<string name="dateformat_date_time"><![CDATA[Time & Date]]></string>
<string name="dateformat_date_time"><![CDATA[Time & Date]]></string>
<string name="mi2_prefs_activate_display_on_lift">Zapnout displej při zvednutí</string>
<string name="FetchActivityOperation_about_to_transfer_since">Přenáším data od %1$s</string>
<string name="waiting_for_reconnect">čekání na znovupřipojení</string>
@ -304,14 +304,14 @@
<string name="activity_prefs_weight_kg">Váha v kg</string>
<string name="authenticating">ověřování</string>
<string name="authentication_required">ověřování vyžadováno</string>
<string name="appwidget_text">Spí...</string>
<string name="appwidget_text">Spí...</string>
<string name="add_widget">Přidat widget</string>
<string name="activity_prefs_sleep_duration">Preferovaná doba spánku v hodinách</string>
<string name="appwidget_alarms_set">Budík nastaven na %1$02d:%2$02d</string>
<string name="device_hw">HW: %1$s</string>
<string name="device_fw">FW: %1$s</string>
<string name="device_hw">HW: %1$s</string>
<string name="device_fw">FW: %1$s</string>
<string name="error_creating_directory_for_logfiles">Chyba při vytváření adresáře pro logy: %1$s</string>
<string name="DEVINFO_HR_VER">Tep:</string>
<string name="DEVINFO_HR_VER">Tep:</string>
<string name="updatefirmwareoperation_update_in_progress">Probíhá aktualizace firmware</string>
<string name="updatefirmwareoperation_firmware_not_sent">Firmware neodeslán</string>
<string name="charts_legend_heartrate">Srdeční tep</string>
@ -350,10 +350,10 @@
<string name="pref_summary_setup_bt_pairing">Toto vypněte v případě problémů s připojením</string>
<string name="unit_metric">Metrické</string>
<string name="unit_imperial">Imperiální</string>
<string name="timeformat_24h">24h</string>
<string name="timeformat_am_pm">dop./odp.</string>
<string name="timeformat_24h">24h</string>
<string name="timeformat_am_pm">dop./odp.</string>
<string name="pref_screen_notification_profile_alarm_clock">Budík</string>
<string name="StringUtils_sender">(%1$s)</string>
<string name="find_device_you_found_it">Nalezeno!</string>
<string name="miband2_prefs_timeformat">Formát času Mi2</string>
<string name="StringUtils_sender">(%1$s)</string>
<string name="find_device_you_found_it">Nalezeno!</string>
<string name="miband2_prefs_timeformat">Formát času Mi2</string>
</resources>

View File

@ -84,7 +84,7 @@
<string name="pref_title_call_privacy_mode">Privatsphäre-Modus für Anrufe</string>
<string name="pref_call_privacy_mode_off">Zeige Name und Telefonnumer</string>
<string name="pref_call_privacy_mode_name">Verstecke den Namen aber zeige die Telefonnummer an</string>
<string name="pref_call_privacy_mode_number">Zeige den Namen an aber verstecke die Telefonnummer</string>
<string name="pref_call_privacy_mode_number">Zeige den Namen an aber verstecke die Telefonnummer</string>
<string name="pref_call_privacy_mode_complete">Verstecke Name und Telefonnummer</string>
<string name="pref_blacklist">App-Benachrichtigungen blockieren</string>
<string name="pref_header_cannned_messages">Vorgefertigte Nachrichten</string>
@ -364,7 +364,7 @@
<string name="StringUtils_sender"> (%1$s)</string>
<string name="find_device_you_found_it">Gefunden!</string>
<string name="miband2_prefs_timeformat">Mi2: Uhrzeit-Format</string>
<string name="mi2_fw_installhandler_fw53_hint">Installiere Version %1$s vor dem Installieren der Firmware!</string>
<string name="mi2_enable_text_notifications">Text Benachrichtigung</string>
<string name="off">aus</string>
<string name="mi2_fw_installhandler_fw53_hint">Installiere Version %1$s vor dem Installieren der Firmware!</string>
<string name="mi2_enable_text_notifications">Text Benachrichtigung</string>
<string name="off">aus</string>
</resources>

View File

@ -271,8 +271,8 @@
<string name="updatefirmwareoperation_update_complete_rebooting">Instalación del firmware completa, reiniciando dispositivo...</string>
<string name="updatefirmwareoperation_write_failed">Falló la escritura del firmware</string>
<string name="chart_steps">Pasos</string>
<string name="calories">Calorías</string>
<string name="distance">Distancia</string>
<string name="calories">Calorías</string>
<string name="distance">Distancia</string>
<string name="liveactivity_live_activity">Actividad</string>
<string name="weeksteps_today_steps_description">Pasos hoy, objetivo: %1$s</string>
<string name="pref_title_dont_ack_transfer">No confirmar transferencia</string>
@ -330,13 +330,13 @@
<string name="activity_db_management_merge_old_title">Borrar la base de datos antigua</string>
<string name="dbmanagementactivvity_cannot_access_export_path">No se puede acceder a la ruta para exportar . Por favor, contacta con los desarrolladores.</string>
<string name="dbmanagementactivity_exported_to">Exportado a: %1$s</string>
<string name="dbmanagementactivity_error_exporting_db">Error de exportación de la base de datos: %1$s</string>
<string name="dbmanagementactivity_error_exporting_shared">Error de exportación de las preferencias: %1$s</string>
<string name="dbmanagementactivity_error_exporting_db">Error de exportación de la base de datos: %1$s</string>
<string name="dbmanagementactivity_error_exporting_shared">Error de exportación de las preferencias: %1$s</string>
<string name="dbmanagementactivity_import_data_title">¿Importar Datos?</string>
<string name="dbmanagementactivity_overwrite_database_confirmation">¿Quiere sobreescribir la base de datos actual? Todos sus datos actuales (si los hay) se borrarán.</string>
<string name="dbmanagementactivity_import_successful">Importado con éxito.</string>
<string name="dbmanagementactivity_error_importing_db">Error de importación de la base de datos: %1$s</string>
<string name="dbmanagementactivity_error_importing_shared">Error de importación de las preferencias: %1$s</string>
<string name="dbmanagementactivity_error_importing_db">Error de importación de la base de datos: %1$s</string>
<string name="dbmanagementactivity_error_importing_shared">Error de importación de las preferencias: %1$s</string>
<string name="dbmanagementactivity_delete_activity_data_title">¿Quieres borrar los datos de actividad?</string>
<string name="dbmanagementactivity_really_delete_entire_db">¿Quieres borrar la base de datos? Todos tus datos de actividad y la información sobre tus dispositivos se borrarán.</string>
<string name="dbmanagementactivity_database_successfully_deleted">Datos borrados.</string>
@ -368,13 +368,13 @@
<string name="mi2_enable_text_notifications">Notificaciones textuales</string>
<string name="mi2_enable_text_notifications_summary"><![CDATA[Needs firmware >= 1.0.1.28 and Mili_pro.ft* installed.]]></string>
<string name="off">off</string>
<string name="discovery_attempting_to_pair">Intento de emparejamiento con %1$s</string>
<string name="discovery_bonding_failed_immediately">El enlace con %1$s falló instantáneamente</string>
<string name="discovery_trying_to_connect_to">Intentando conectar con: %1$s</string>
<string name="discovery_enable_bluetooth">Activa el Bluetooth para encontrar dispositivos.</string>
<string name="discovery_successfully_bonded">Correctamente conectado con %1$s</string>
<string name="discovery_pair_title">Emparejar con %1$s?</string>
<string name="discovery_pair_question">Selecciona Emparejar para emparejar tus dispositivos. Si esto falla, prueba de nuevo sin emparejar.</string>
<string name="discovery_yes_pair">Emparejar</string>
<string name="discovery_dont_pair">No emparejar</string>
<string name="discovery_attempting_to_pair">Intento de emparejamiento con %1$s</string>
<string name="discovery_bonding_failed_immediately">El enlace con %1$s falló instantáneamente</string>
<string name="discovery_trying_to_connect_to">Intentando conectar con: %1$s</string>
<string name="discovery_enable_bluetooth">Activa el Bluetooth para encontrar dispositivos.</string>
<string name="discovery_successfully_bonded">Correctamente conectado con %1$s</string>
<string name="discovery_pair_title">Emparejar con %1$s?</string>
<string name="discovery_pair_question">Selecciona Emparejar para emparejar tus dispositivos. Si esto falla, prueba de nuevo sin emparejar.</string>
<string name="discovery_yes_pair">Emparejar</string>
<string name="discovery_dont_pair">No emparejar</string>
</resources>

View File

@ -271,8 +271,8 @@
<string name="updatefirmwareoperation_update_complete_rebooting">Installation complète du micrologiciel, redémarrage de l\'appareil</string>
<string name="updatefirmwareoperation_write_failed">Échec lors de l\'écriture du micrologiciel</string>
<string name="chart_steps">Pas</string>
<string name="calories">Calories</string>
<string name="distance">Distance</string>
<string name="calories">Calories</string>
<string name="distance">Distance</string>
<string name="liveactivity_live_activity">Activité en direct</string>
<string name="weeksteps_today_steps_description">Nombre de pas aujourd\'hui, objectif: %1$s</string>
<string name="pref_title_dont_ack_transfer">Ne pas confirmer le transfert de données d\'activités</string>
@ -332,13 +332,13 @@ NOTE: la base de données sera bien évidement plus grande !</string>
<string name="activity_db_management_merge_old_title">Effacer l\'ancienne base de données</string>
<string name="dbmanagementactivvity_cannot_access_export_path">Impossible d\'accéder au fichier d\'export. Merci de contacter les développeurs.</string>
<string name="dbmanagementactivity_exported_to">Exporter vers : %1$s</string>
<string name="dbmanagementactivity_error_exporting_db">Erreur d\'exportation de la base de données: %1$s</string>
<string name="dbmanagementactivity_error_exporting_shared">Erreur d\'exportation des préférences: %1$s</string>
<string name="dbmanagementactivity_error_exporting_db">Erreur d\'exportation de la base de données: %1$s</string>
<string name="dbmanagementactivity_error_exporting_shared">Erreur d\'exportation des préférences: %1$s</string>
<string name="dbmanagementactivity_import_data_title">Importer des données ?</string>
<string name="dbmanagementactivity_overwrite_database_confirmation">Voulez-vous vraiment effacer la base de données actuelle ? Toutes vos données (si vous en avez) seront perdues.</string>
<string name="dbmanagementactivity_import_successful">Importation réussie.</string>
<string name="dbmanagementactivity_error_importing_db">Erreur lors de l\'importation de la base de données: %1$s</string>
<string name="dbmanagementactivity_error_importing_shared">Erreur d\'importation des préférences: %1$s</string>
<string name="dbmanagementactivity_error_importing_db">Erreur lors de l\'importation de la base de données: %1$s</string>
<string name="dbmanagementactivity_error_importing_shared">Erreur d\'importation des préférences: %1$s</string>
<string name="dbmanagementactivity_delete_activity_data_title">Détruire les anciennes données ?</string>
<string name="dbmanagementactivity_really_delete_entire_db">Voulez-vous vraiment détruire entièrement la base de données ? Toutes vos données d\'activité et vos informations issues de vos appareils seront perdues.</string>
<string name="dbmanagementactivity_database_successfully_deleted">Les données ont été effacées.</string>
@ -370,13 +370,13 @@ NOTE: la base de données sera bien évidement plus grande !</string>
<string name="mi2_enable_text_notifications">Notifications textuelles</string>
<string name="mi2_enable_text_notifications_summary"><![CDATA[Requis: micrologiciel version 1.0.1.28 ou plus, fichier Mili_pro.ft* installé.]]></string>
<string name="off">off</string>
<string name="discovery_attempting_to_pair">Tentative d\'appairage avec %1$s</string>
<string name="discovery_bonding_failed_immediately">Le lien avec %1$s a échoué instantanément</string>
<string name="discovery_trying_to_connect_to">Tentative de connexion à: %1$s</string>
<string name="discovery_enable_bluetooth">Activez le Bluetooth pour trouver des dispositifs</string>
<string name="discovery_successfully_bonded">Correctement lié à %1$s</string>
<string name="discovery_pair_title">Appairer avec %1$s</string>
<string name="discovery_pair_question">Sélectionnez Appairer pour appairer vos dispositifs. Si cela échoue, essayez à nouveau sans appairage.</string>
<string name="discovery_yes_pair">Appairage</string>
<string name="discovery_dont_pair">Ne pas appairer</string>
<string name="discovery_attempting_to_pair">Tentative d\'appairage avec %1$s</string>
<string name="discovery_bonding_failed_immediately">Le lien avec %1$s a échoué instantanément</string>
<string name="discovery_trying_to_connect_to">Tentative de connexion à: %1$s</string>
<string name="discovery_enable_bluetooth">Activez le Bluetooth pour trouver des dispositifs</string>
<string name="discovery_successfully_bonded">Correctement lié à %1$s</string>
<string name="discovery_pair_title">Appairer avec %1$s</string>
<string name="discovery_pair_question">Sélectionnez Appairer pour appairer vos dispositifs. Si cela échoue, essayez à nouveau sans appairage.</string>
<string name="discovery_yes_pair">Appairage</string>
<string name="discovery_dont_pair">Ne pas appairer</string>
</resources>

View File

@ -13,12 +13,12 @@
<string name="controlcenter_delete_device">Rimuovi dispositivo</string>
<string name="controlcenter_delete_device_name">Rimuovi %1$s</string>
<string name="controlcenter_delete_device_dialogmessage">Il dispositivo verrà rimosso e tutti i dati ad esso associati verranno cancellati!</string>
<string name="controlcenter_navigation_drawer_open">Apri menu</string>
<string name="controlcenter_navigation_drawer_close">Chiudi menu</string>
<string name="controlcenter_snackbar_need_longpress">Pressione prolungata sulla scheda per scollegare</string>
<string name="controlcenter_navigation_drawer_open">Apri menu</string>
<string name="controlcenter_navigation_drawer_close">Chiudi menu</string>
<string name="controlcenter_snackbar_need_longpress">Pressione prolungata sulla scheda per scollegare</string>
<string name="controlcenter_snackbar_disconnecting">Disconnessione</string>
<string name="controlcenter_snackbar_connecting">Connessione</string>
<string name="controlcenter_snackbar_requested_screenshot">Screenshot del dispositivo</string>
<string name="controlcenter_snackbar_requested_screenshot">Screenshot del dispositivo</string>
<string name="title_activity_debug">Debug</string>
<!--Strings related to AppManager-->
<string name="title_activity_appmanager">Gestione app</string>
@ -80,11 +80,11 @@
<string name="always">sempre</string>
<string name="when_screen_off">se lo schermo è spento</string>
<string name="never">mai</string>
<string name="pref_header_privacy">Privacy</string>
<string name="pref_header_privacy">Privacy</string>
<string name="pref_title_call_privacy_mode">Impostazioni privacy chiamate</string>
<string name="pref_call_privacy_mode_off">Mostra nome e numero chiamante</string>
<string name="pref_call_privacy_mode_name">Nascondi il nome ma mostra il numero del chiamante</string>
<string name="pref_call_privacy_mode_number">Nascondi il numero ma mostra il nome</string>
<string name="pref_call_privacy_mode_number">Nascondi il numero ma mostra il nome</string>
<string name="pref_call_privacy_mode_complete">Nascondi nome e numero del chiamante</string>
<string name="pref_blacklist">Blocca applicazioni</string>
<string name="pref_header_cannned_messages">Messaggi preimpostati</string>
@ -350,12 +350,12 @@
<string name="pref_summary_setup_bt_pairing">Disattiva se hai problemi di connession</string>
<string name="unit_metric">Metrico</string>
<string name="unit_imperial">Imperiale</string>
<string name="timeformat_24h">24H</string>
<string name="timeformat_am_pm">AM/PM</string>
<string name="timeformat_24h">24H</string>
<string name="timeformat_am_pm">AM/PM</string>
<string name="pref_screen_notification_profile_alarm_clock">Sveglia</string>
<string name="find_device_you_found_it">Trovato!</string>
<string name="miband2_prefs_timeformat">Mi2: Formato dell\'orario</string>
<string name="mi2_fw_installhandler_fw53_hint">E\' necessario installare la verione %1$s prima di installare questo firmware!</string>
<string name="mi2_enable_text_notifications">Notifiche</string>
<string name="off">spento</string>
<string name="mi2_fw_installhandler_fw53_hint">E\' necessario installare la verione %1$s prima di installare questo firmware!</string>
<string name="mi2_enable_text_notifications">Notifiche</string>
<string name="off">spento</string>
</resources>

View File

@ -84,7 +84,7 @@
<string name="pref_title_call_privacy_mode">通話プライバシーモード</string>
<string name="pref_call_privacy_mode_off">名前と番号を表示</string>
<string name="pref_call_privacy_mode_name">名前は非表示、番号は表示</string>
<string name="pref_call_privacy_mode_number">番号は非表示、名前は表示</string>
<string name="pref_call_privacy_mode_number">番号は非表示、名前は表示</string>
<string name="pref_call_privacy_mode_complete">名前と番号を非表示</string>
<string name="pref_blacklist">アップのブラックリスト</string>
<string name="pref_header_cannned_messages">定型のメッセージ</string>
@ -271,8 +271,8 @@
<string name="updatefirmwareoperation_update_complete_rebooting">ファームウェアのインストールが完了しました。デバイスを再起動します…</string>
<string name="updatefirmwareoperation_write_failed">ファームウェアの書き込みに失敗しました</string>
<string name="chart_steps">歩数</string>
<string name="calories">カロリー</string>
<string name="distance">距離</string>
<string name="calories">カロリー</string>
<string name="distance">距離</string>
<string name="liveactivity_live_activity">生活活動</string>
<string name="weeksteps_today_steps_description">今日の歩数、目標: %1$s</string>
<string name="pref_title_dont_ack_transfer">活動データ転送に応答しない</string>
@ -331,12 +331,12 @@
<string name="dbmanagementactivvity_cannot_access_export_path">エクスポート パスにアクセスできません。開発者にご連絡ください。</string>
<string name="dbmanagementactivity_exported_to">エクスポートしました: %1$s</string>
<string name="dbmanagementactivity_error_exporting_db">DB のエクスポート時にエラー: %1$s</string>
<string name="dbmanagementactivity_error_exporting_shared">設定のエクスポート時にエラー: %1$s</string>
<string name="dbmanagementactivity_error_exporting_shared">設定のエクスポート時にエラー: %1$s</string>
<string name="dbmanagementactivity_import_data_title">データをインポートしますか?</string>
<string name="dbmanagementactivity_overwrite_database_confirmation">現在のデータベースを上書きしてもよろしいですか? 現在の活動データは (もしあれば) すべて失われます。</string>
<string name="dbmanagementactivity_import_successful">インポートに成功しました。</string>
<string name="dbmanagementactivity_error_importing_db">DB のインポート時にエラー: %1$s</string>
<string name="dbmanagementactivity_error_importing_shared">設定のインポート時にエラー: %1$s</string>
<string name="dbmanagementactivity_error_importing_shared">設定のインポート時にエラー: %1$s</string>
<string name="dbmanagementactivity_delete_activity_data_title">活動データを削除しますか?</string>
<string name="dbmanagementactivity_really_delete_entire_db">データベース全体を削除してもよろしいですか? 活動データとお使いのデバイスに関する情報がすべて失われます。</string>
<string name="dbmanagementactivity_database_successfully_deleted">データを正常に削除しました。</string>
@ -364,17 +364,17 @@
<string name="StringUtils_sender"> (%1$s)</string>
<string name="find_device_you_found_it">見つかりました!</string>
<string name="miband2_prefs_timeformat">Mi2: 時刻形式</string>
<string name="mi2_fw_installhandler_fw53_hint">このファームウェアをインストールする前に、バージョン %1$s をインストールする必要があります!</string>
<string name="mi2_enable_text_notifications">テキスト通知</string>
<string name="mi2_enable_text_notifications_summary"><![CDATA[ファームウェア >= 1.0.1.28 と Mili_pro.ft* をインストールしていることが必要です。]]></string>
<string name="off">オフ</string>
<string name="discovery_attempting_to_pair">%1$s とペアを試みています</string>
<string name="discovery_bonding_failed_immediately">%1$s との接続がすぐに失敗しました。</string>
<string name="discovery_trying_to_connect_to">接続の試行中: %1$s</string>
<string name="discovery_enable_bluetooth">デバイスを見つけるため Bluetooth を有効にします。</string>
<string name="discovery_successfully_bonded">%1$s と接続しました。</string>
<string name="discovery_pair_title">%1$sとペアにしますか?</string>
<string name="discovery_pair_question">お使いのデバイスとペアにする相手を選択します。 これに失敗した場合は、ペア設定をせずに再試行してください。</string>
<string name="discovery_yes_pair">ペア</string>
<string name="discovery_dont_pair">ペアにしない</string>
<string name="mi2_fw_installhandler_fw53_hint">このファームウェアをインストールする前に、バージョン %1$s をインストールする必要があります!</string>
<string name="mi2_enable_text_notifications">テキスト通知</string>
<string name="mi2_enable_text_notifications_summary"><![CDATA[ファームウェア >= 1.0.1.28 と Mili_pro.ft* をインストールしていることが必要です。]]></string>
<string name="off">オフ</string>
<string name="discovery_attempting_to_pair">%1$s とペアを試みています</string>
<string name="discovery_bonding_failed_immediately">%1$s との接続がすぐに失敗しました。</string>
<string name="discovery_trying_to_connect_to">接続の試行中: %1$s</string>
<string name="discovery_enable_bluetooth">デバイスを見つけるため Bluetooth を有効にします。</string>
<string name="discovery_successfully_bonded">%1$s と接続しました。</string>
<string name="discovery_pair_title">%1$sとペアにしますか?</string>
<string name="discovery_pair_question">お使いのデバイスとペアにする相手を選択します。 これに失敗した場合は、ペア設定をせずに再試行してください。</string>
<string name="discovery_yes_pair">ペア</string>
<string name="discovery_dont_pair">ペアにしない</string>
</resources>

View File

@ -289,7 +289,7 @@
<string name="FetchActivityOperation_about_to_transfer_since">Sobre para transferir dados desde %1$s</string>
<string name="waiting_for_reconnect">aguarde para reconectar</string>
<string name="activity_prefs_about_you">Sobre você</string>
<string name="activity_prefs_year_birth">Ano de anoversário</string>
<string name="activity_prefs_year_birth">Ano de anoversário</string>
<string name="activity_prefs_gender">Gênero</string>
<string name="activity_prefs_height_cm">Altura em cm</string>
<string name="activity_prefs_weight_kg">Peso em kg</string>