Merge remote-tracking branch 'upstream/master'

apps/smclock/ChangeLog

@@ -1,2 +1,3 @@
 0.01: Initial version
 0.02: Add battery level
+0.03: fix battery level displaying

apps/smclock/app.js

@@ -51,7 +51,7 @@ function draw() {
   g.drawImage(background);
 
   const color = getBatteryColor();
-  const bat = d02(E.getBattery()) + "%";
+  const bat = E.getBattery() + "%";
   const d = new Date();
   const day = d.getDate();
   const month = (d.getMonth() + 1);
@@ -78,7 +78,7 @@ function draw() {
   g.setFont("Vector", 16);
   g.drawString("Bat:", 12, 22, false);
   g.setColor(color[0], color[1], color[2]);
-  g.drawString(bat, 52, 22, false);
+  g.drawString(bat, 46, 22, false);
 }
 
 g.clear();

apps/smclock/metadata.json

@@ -3,7 +3,7 @@
   "name":"Monogram Watch Face",
   "shortName":"MonoClock",
   "icon":"app.png",
-  "version":"0.02",
+  "version":"0.03",
   "description": "A simple watchface based on my stylised monogram.",
   "tags":"clock",
   "readme":"README.md",

lang/nl_NL.json

@@ -11,10 +11,10 @@
         "Back": "Terug",
         "Repeat": "Herhalen",
         "Delete": "Verwijderen",
-        "ALARM!": "ALARV.",
-        "Sleep": "Stand-by",
+        "ALARM!": "ALARM!",
+        "Sleep": "Standby",
         "New Timer": "Nieuwe Timer",
-        "(repeat)": "(herhaling)",
+        "(repeat)": "(herhaal)",
         "music": "muziek",
         "week": "week",
         "Auto snooze": "Auto snooze",
@@ -31,7 +31,7 @@
         "minimum": "minimum",
         "valid period": "geldige periode",
         "heartrate": "hartslag",
-        "battery warn": "batterijwaarschuwing",
+        "battery warn": "batterijwaarsch.",
         "data": "gegevens",
         "step length": "staplengte",
         "min. confidence": "min. vertrouwen",
@@ -47,7 +47,7 @@
         "Yes\ndefinitely": "Ja\nzeker",
         "STEPS": "STAPPEN",
         "Show clocks": "Toon klokken",
-        "Record Run": "Record run",
+        "Record Run": "Rondje opnemen",
         "No Messages": "Geen berichten.",
         "View Message": "Bekijk bericht",
         "Piezo": "Piëzo",
@@ -63,7 +63,7 @@
         "Make Connectable": "Maak Verbindbaar",
         "Quiet Mode": "Rustige modus",
         "BLE": "BLE",
-        "Dark BW": "Donker BW",
+        "Dark BW": "Donkere modus",
         "Apps": "Apps",
         "Programmable": "Programmeerbaar",
         "Vibration": "Trilling",
@@ -82,32 +82,32 @@
         "Remove": "Verwijder",
         "Add Device": "Apparaat toevoegen",
         "Connect device\nto add to\nwhitelist": "Apparaat aansluiten\ntoe te voegen aan\nwhitelist",
-        "Wake on Twist": "Wake on Twist",
-        "Wake on BTN2": "Wake op BTN2",
-        "Wake on BTN1": "Wake op BTN1",
-        "Wake on FaceUp": "Wakker worden op FaceUp",
+        "Wake on Twist": "Aangaan bij draaien",
+        "Wake on BTN2": "Aangaan bij BTN2",
+        "Wake on BTN1": "Aangaan bij BTN1",
+        "Wake on FaceUp": "Aangaan bij FaceUp",
         "Log": "Log",
         "Debug Info": "Debug info",
-        "Wake on BTN3": "Wake op BTN3",
-        "Flatten Battery": "Batterij plat maken",
+        "Wake on BTN3": "Aangaan bij BTN3",
+        "Flatten Battery": "Batterij leegmaken",
         "Rewrite Settings": "Instellingen herschrijven",
-        "Compact Storage": "Compacte opslag",
-        "Utilities": "Nutsbedrijven",
+        "Compact Storage": "Comprimeer opslag",
+        "Utilities": "Gereedschap",
         "Clock Style": "Klok Stijl",
         "Time Zone": "Tijdzone",
-        "Twist Timeout": "Time-out draaien",
-        "Twist Max Y": "Twist Max Y",
-        "Twist Threshold": "Twist Drempel",
-        "Wake on Touch": "Wakker worden bij aanraking",
-        "Compacting...\nTakes approx\n1 minute": "Verdichten...\nDuurt ongeveer\n1 minuut",
-        "Reset to Defaults": "Terugzetten op standaardwaarden",
+        "Twist Timeout": "Draaien time-out",
+        "Twist Max Y": "Draaien Max Y",
+        "Twist Threshold": "Draaien vanaf",
+        "Wake on Touch": "Aangaan bij aanraking",
+        "Compacting...\nTakes approx\n1 minute": "Comprimeren...\nDuurt ongeveer\n1 minuut",
+        "Reset to Defaults": "Terug naar standaardwaarden",
         "No Clocks Found": "Geen klokken gevonden",
         "Month": "Maand",
-        "Minute": "Minuutje",
+        "Minute": "Minuut",
         "Flattening battery - this can take hours.\nLong-press button to cancel": "Batterij leegmaken - dit kan uren duren.\nDruk lang op de knop om te annuleren",
         "Sleep Phase Alarm": "Slaapfase alarm",
         "Second": "Tweede",
-        "Turn Off": "Zet uit.",
+        "Turn Off": "Uitzetten",
         "Hour": "Uur",
         "Storage": "Opslag",
         "Date": "Datum",
@@ -144,7 +144,7 @@
         "Hide": "Verberg",
         "Messages": "Berichten",
         "Error in settings": "Fout in instellingen",
-        "BACK": "ACHTER",
+        "BACK": "TERUG",
         "Whitelist": "Whitelist",
         "Set Time": "Tijd instellen",
         "Disable": "Uitschakelen",
@@ -162,7 +162,7 @@
         "Loading": "Laden",
         "Music": "Muziek",
         "color": "kleur",
-        "off": "van",
+        "off": "uit",
         "Off": "Uit",
         "Theme": "Thema"
     },