mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-30 11:40:23 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
OliE
2018-10-08 20:04:06 +02:00
parent 8a9e07977d 05d15f1b83
commit da5dfcaa2d
6 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android_app/app/src/main/java/com/health/openscale/core/bluetooth/lib/TrisaBodyAnalyzeLib.java
View File

@@ -19,12 +19,8 @@ import android.support.annotation.Nullable;
import com.health.openscale.core.datatypes.ScaleMeasurement;
import java.time.Clock;
import java.util.Date;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.SECONDS;
/**
* Class with static helper methods. This is a separate class for testing purposes.
*

9
android_app/app/src/main/res/values-iw/strings.xml
View File

@@ -248,4 +248,11 @@
<string name="activity_level_heavy">גבוהה</string>
<string name="activity_level_extreme">קיצונית</string>
<string name="label_data_provider_enable">גישה ליישומון צד שלישי</string>
</resources>
<string name="trisa_scale_not_paired">המשקל טרם עבר צימוד!
\n
\nיש להחזיק את הכפתור בתחתית המשקל כדי להפעיל אותו במצב צימוד ואז להתחבר מחדש כדי לקבל את הססמה של המכשיר.</string>
<string name="trisa_scale_pairing_succeeded">הצימוד הצליח!
\n
\nיש להתחבר מחדש כדי לקבל את נתוני המדידות.</string>
</resources>

9
android_app/app/src/main/res/values-nb/strings.xml
View File

@@ -246,4 +246,11 @@
<string name="permission_read_data_description">les openScale-data, inkludert brukerinfo, og alle lagrede målinger</string>
<string name="permission_read_data_label">Les openScale-data</string>
<string name="label_data_provider_enable">Tilgang for tredjepartsprogrammer</string>
</resources>
<string name="trisa_scale_not_paired">Denne vekten har ikke blitt parret.
\n
\nHold knappen på bunnen av vekten for å sette den i paringsmodus, koble deretter til den igjen for å hente enhetens passord.</string>
<string name="trisa_scale_pairing_succeeded">Paring utført.
\n
\nKoble til igjen for å hente målingsdata.</string>
</resources>