Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

5.8.0 #991

Merged
merged 2 commits into from
Dec 4, 2024
Merged

5.8.0 #991

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Config.xcconfig
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
APP_DISPLAY_NAME = iAPS
APP_VERSION = 5.6.0
APP_VERSION = 5.8.0
APP_BUILD_NUMBER = 1
COPYRIGHT_NOTICE =
DEVELOPER_TEAM = ##TEAM_ID##
Expand Down
4 changes: 2 additions & 2 deletions Core_Data.xcdatamodeld/Core_Data.xcdatamodel/contents
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="23507" systemVersion="23G93" minimumToolsVersion="Automatic" sourceLanguage="Swift" usedWithCloudKit="YES" userDefinedModelVersionIdentifier="">
<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="22758" systemVersion="23G93" minimumToolsVersion="Automatic" sourceLanguage="Swift" usedWithCloudKit="YES" userDefinedModelVersionIdentifier="">
<entity name="ActiveProfile" representedClassName="ActiveProfile" syncable="YES" codeGenerationType="class">
<attribute name="active" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="date" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
Expand Down Expand Up @@ -116,7 +116,7 @@
</entity>
<entity name="Presets" representedClassName="Presets" syncable="YES" codeGenerationType="class">
<attribute name="carbs" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
<attribute name="dish" optional="YES" attributeType="String"/>
<attribute name="dish" optional="YES" attributeType="String" defaultValueString=" "/>
<attribute name="fat" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
<attribute name="protein" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
</entity>
Expand Down
3 changes: 3 additions & 0 deletions FreeAPS/Resources/Assets.xcassets/Contents.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,8 @@
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"compression-type" : "lossless"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"images" : [
{
"filename" : "artificialPancreas_purple_2.png",
"idiom" : "universal",
"platform" : "ios",
"size" : "1024x1024"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"images" : [
{
"filename" : "iAPS_vial.png",
"idiom" : "universal",
"platform" : "ios",
"size" : "1024x1024"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -1573,6 +1573,15 @@ Enact a temp Basal or a temp target */
/* */
"Meal Presets" = "Meal Presets";

/* Back button */
"Back" = "رجوع";

/* Search Saved Food presets */
"Search" = "Search";

/* Placeholder for name of dish when adding a new food preset */
"New" = "New";

/* */
"Empty" = "Empty";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1572,6 +1572,15 @@ Enact a temp Basal or a temp target */
/* */
"Meal Presets" = "Måltid Forudindstillinger";

/* Back button */
"Back" = "Tilbage";

/* Search Saved Food presets */
"Search" = "Search";

/* Placeholder for name of dish when adding a new food preset */
"New" = "New";

/* */
"Empty" = "Tom";

Expand Down
78 changes: 44 additions & 34 deletions FreeAPS/Sources/Localizations/Main/de.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -477,37 +477,37 @@ Enact a temp Basal or a temp target */
"Max Bolus" = "Maximaler Bolus";

/* Insulin alert message */
"Please verify that you have selected the correct insulin concentration before saving your settings.\n\nThe insulin vial or pen should indicate the concentration in units per milliliter (e.g., U100 indicates 100 units per milliliter, which is the standard concentration).\n\nAccurate selection is critical for proper dosing." = "Please verify that you have selected the correct insulin concentration before saving your settings.\n\nThe insulin vial or pen should indicate the concentration in units per milliliter (e.g., U100 indicates 100 units per milliliter, which is the standard concentration).\n\nAccurate selection is critical for proper dosing.";
"Please verify that you have selected the correct insulin concentration before saving your settings.\n\nThe insulin vial or pen should indicate the concentration in units per milliliter (e.g., U100 indicates 100 units per milliliter, which is the standard concentration).\n\nAccurate selection is critical for proper dosing." = "Bitte vergewissern Sie sich, dass Sie die richtige Insulinkonzentration ausgewählt haben, bevor Sie Ihre Einstellungen speichern.\n\n Auf der Insulinampulle oder dem Pen sollte die Konzentration in Einheiten pro Milliliter angegeben sein (z. B. U100 steht für 100 Einheiten pro Milliliter, was der Standardkonzentration entspricht).\n\nEine genaue Auswahl ist für die richtige Dosierung entscheidend.";

/* Insulin Concentration View */
"Concentration" = "Concentration";
"Concentration" = "Konzentration";

/* Insulin Concentration View */
"Insulin Concentration" = "Insulin Concentration";
"Insulin Concentration" = "Insulinkonzentration";

/* Insulin Concentration View */
"Change Insulin" = "Change Insulin";
"Change Insulin" = "Insulin ändern";

/* Insulin Concentration View */
"Insulin diluted to" = "Insulin diluted to";
"Insulin diluted to" = "Verdünntes Insulin auf";

/* Insulin Concentration View */
"standard concentration:" = "standard concentration:";
"standard concentration:" = "Standardkonzentration:";

/* Insulin Concentration View */
"units per ml" = "units per ml";
"units per ml" = "Einheiten pro ml";

/* Insulin Concentration View */
"Standard concentration (U 100)" = "Standard concentration (U 100)";
"Standard concentration (U 100)" = "Standardkonzentration (U 100)";

/* Insulin Concentration View */
"Insulin concentration increased to" = "Insulin concentration increased to";
"Insulin concentration increased to" = "Insulinkonzentration erhöht auf";

/* Insulin Concentration View */
"Couldn't save to pump. Try again when pump isn't busy bolusing." = "Couldn't save to pump. Try again when pump isn't busy bolusing.";
"Couldn't save to pump. Try again when pump isn't busy bolusing." = "Konnte nicht auf der Pumpe speichern. Versuchen Sie es erneut, wenn die Pumpe nicht mit einem Bolus beschäftigt ist.";

/* Insulin Concentration View */
"Saved" = "Saved";
"Saved" = "Gespeichert";

/* Label inusulin concentration, units per ml */
"U100" = "U100";
Expand All @@ -521,7 +521,7 @@ Enact a temp Basal or a temp target */
/* Label inusulin concentration, units per ml */
"U10" = "U10";
/* Debug option, allow U50 and U10 (diluted insulin) */
"Allow diluted insulin concentration settings" = "Allow diluted insulin concentration settings";
"Allow diluted insulin concentration settings" = "Verdünnte Insulinkonzentration erlauben";
/* Max setting */
"Max Carbs" = "Max Kohlenhydrate";

Expand Down Expand Up @@ -1301,7 +1301,7 @@ Enact a temp Basal or a temp target */
"Pump is Busy." = "Die Insulinpumpe ist beschäftigt.";

/* Alert when bolus is already in progress (tapping the bolus button) */
"Bolus already in Progress!" = "Bolus already in Progress!";
"Bolus already in Progress!" = "Ein Bolus wird bereits abgegeben!";

/* -------------- Developer settings ---------------------- */
/* Debug options */
Expand Down Expand Up @@ -1572,6 +1572,15 @@ Enact a temp Basal or a temp target */
/* */
"Meal Presets" = "Mahlzeit Voreinstellungen";

/* Back button */
"Back" = "Zurück";

/* Search Saved Food presets */
"Search" = "Suchen";

/* Placeholder for name of dish when adding a new food preset */
"New" = "Neu";

/* */
"Empty" = "Leer";

Expand Down Expand Up @@ -1927,13 +1936,13 @@ Enact a temp Basal or a temp target */
"Errors" = "Fehler";

/* Loop Statistics pop-up description */
"Success = Started / Completed (loops)" = "Success = Started / Completed (loops)";
"Success = Started / Completed (loops)" = "Erfolgreich berechnete Loops";

/* Loop Statistics pop-up */
"Most Frequent Error" = "Most Frequent Error";
"Most Frequent Error" = "Häufigste Fehler";

/* Loop Statistics pop-up */
"Non-completed Loops" = "Non-completed Loops";
"Non-completed Loops" = "Nicht abgeschlossene Loops";

/* Average loop interval */
"Interval" = "Intervall";
Expand Down Expand Up @@ -1981,31 +1990,32 @@ Enact a temp Basal or a temp target */
"all" = "alle";

/* Active Insulin View */
"Active Insulin" = "Active Insulin";
"Active Insulin" = "Aktives Insulin";

/* Active Insulin View */
"Time with negative insulin" = "Time with negative insulin";
"Time with negative insulin" = "Zeit mit negativem Insulin";

/* Active Insulin View */
"Insulin compared to yesterday" = "Insulin compared to yesterday";
"Insulin compared to yesterday" = "Insulin im Vergleich zu gestern";

/* Active Insulin View */
"Insulin compared to average" = "Insulin compared to average";
"Insulin compared to average" = "Insulin im Vergleich zum Durchschnitt";

/* Active Insulin View */
"Average Insulin 10 days" = "Average Insulin 10 days";
"Average Insulin 10 days" = "Durchs. Insulinverbrauch (10 Tage)
";

/* Active Insulin View */
"TDD yesterday" = "TDD yesterday";
"TDD yesterday" = "TDD gestern";

/* Active Insulin View */
"TDD 2 days ago" = "TDD 2 days ago";
"TDD 2 days ago" = "TDD vor 2 Tagen";

/* Active Insulin View */
"TDD 3 days ago" = "TDD 3 days ago";
"TDD 3 days ago" = "TDD vor 3 Tagen";

/* Active Carbohydrates View */
"Active Carbohydrates" = "Active Carbohydrates";
"Active Carbohydrates" = "Aktive Kohlenhydrate";

/* -------------------------------------------------------- Dexcom G7 --------------------------------------*/

Expand Down Expand Up @@ -2065,7 +2075,7 @@ Enact a temp Basal or a temp target */
"Just iAPS version number" = "Nur iAPS Versionsnummer";

/* Share info text */
"Every bit of information you choose to share is uploaded anonymously. To prevent duplicate uploads, the data is identified with a unique random string saved on your phone, the recovery token." = "Alle Informationen, die Sie freigeben möchten, werden anonym hochgeladen. Um doppelte Uploads zu vermeiden, werden die Daten mit einer eindeutigen, zufälligen Zeichenfolge identifiziert, die auf Ihrem Telefon gespeichert ist.";
"Every bit of information you choose to share is uploaded anonymously. To prevent duplicate uploads, the data is identified with a unique random string saved on your phone, the recovery token." = "Alle Informationen, die Sie teilen möchten, werden anonym hochgeladen. Um das Hochladen von Duplikaten zu verhindern, werden die Daten mit einer einzigartigen zufälligen Zeichenkette identifiziert, die auf Ihrem Telefon gespeichert wird, dem Wiederherstellungs-Token.Um doppelte Uploads zu verhindern, werden die Daten durch eine eindeutige, zufällige Zeichenfolge identifiziert, die auf deinem Telefon als Wiederherstellungs-Token gespeichert wird.";

/* Token section title */
"Your recovery token" = "Ihr Wiederherstellungs-Token";
Expand Down Expand Up @@ -2545,19 +2555,19 @@ Enact a temp Basal or a temp target */
"Threshold" = "Grenzwert";

/* Dynamic settings View */
"Averages" = "Averages";
"Averages" = "Durchschnitsswerte";

/* Dynamic settings View */
"Average ISF" = "Average ISF";
"Average ISF" = "Durchschnittlicher ISF";

/* Dynamic settings View */
"Average CR" = "Average CR";
"Average CR" = "Durchschnittlicher CR";

/* Dynamic settings View */
"Average CSF" = "Average CSF";
"Average CSF" = "Durchschnittlicher CSF";

/* Dynamic settings View */
"ISF: Insulin Sensitivity, CR: Carb Ratio,\nCSF: Carb Sensitivity = ISF/CR" = "ISF: Insulin Sensitivity, CR: Carb Ratio,\nCSF: Carb Sensitivity = ISF/CR";
"ISF: Insulin Sensitivity, CR: Carb Ratio,\nCSF: Carb Sensitivity = ISF/CR" = "ISF: Insulinempfindlichkeit, CR: Kohlenhydratverhältnis,\nCSF: Kohlenhydrate Empfindlichkeit = ISF/CR";

/* Header */
"Calculator settings" = "Berechnungseinstellungen";
Expand Down Expand Up @@ -2631,13 +2641,13 @@ Enact a temp Basal or a temp target */
"Display Glucose Delta" = "Glukose-Delta anzeigen";

/* UI/UX option */
"Hide Concentration Badge" = "Hide Concentration Badge";
"Hide Concentration Badge" = "Insulinkonzentrations ausblenden";

/* UI/UX option */
"Use insulin bars" = "Use insulin bars";
"Use insulin bars" = "Insulinbalken verwenden";

/* UI/UX option */
"Hide the bolus amount strings when amount is under" = "Hide the bolus amount strings when amount is under";
"Hide the bolus amount strings when amount is under" = "Bolusmengen in der Grafik ausblenden wenn sie kleiner als";

/* Setting title */
"Bolus Calculator" = "Bolus-Rechner";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1587,6 +1587,15 @@ Enact a temp Basal or a temp target */
/* */
"Meal Presets" = "Meal Presets";

/* Back button */
"Back" = "Back";

/* Search Saved Food presets */
"Search" = "Search";

/* Placeholder for name of dish when adding a new food preset */
"New" = "New";

/* */
"Empty" = "Empty";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1583,6 +1583,15 @@ Ajustes predeterminados:\n
/* */
"Meal Presets" = "Atajo de comida";

/* Back button */
"Back" = "Atrás";

/* Search Saved Food presets */
"Search" = "Search";

/* Placeholder for name of dish when adding a new food preset */
"New" = "New";

/* */
"Empty" = "Vacío";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1572,6 +1572,15 @@ Enact a temp Basal or a temp target */
/* */
"Meal Presets" = "Meal Presets";

/* Back button */
"Back" = "Takaisin";

/* Search Saved Food presets */
"Search" = "Search";

/* Placeholder for name of dish when adding a new food preset */
"New" = "New";

/* */
"Empty" = "Empty";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1572,6 +1572,15 @@ Enact a temp Basal or a temp target */
/* */
"Meal Presets" = "Préréglages des repas";

/* Back button */
"Back" = "Retour";

/* Search Saved Food presets */
"Search" = "Recherche";

/* Placeholder for name of dish when adding a new food preset */
"New" = "Nouveau repas";

/* */
"Empty" = "Vide";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1572,6 +1572,15 @@ Enact a temp Basal or a temp target */
/* */
"Meal Presets" = "Meal Presets";

/* Back button */
"Back" = "Back";

/* Search Saved Food presets */
"Search" = "Search";

/* Placeholder for name of dish when adding a new food preset */
"New" = "New";

/* */
"Empty" = "Empty";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1572,6 +1572,15 @@ Enact a temp Basal or a temp target */
/* */
"Meal Presets" = "Meal Presets";

/* Back button */
"Back" = "Back";

/* Search Saved Food presets */
"Search" = "Search";

/* Placeholder for name of dish when adding a new food preset */
"New" = "New";

/* */
"Empty" = "Empty";

Expand Down
Loading