caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #2 from MilosKozak/dev

Browse source 
Dev
This commit is contained in:
Andreas 2018-11-30 12:05:23 +01:00 committed by GitHub
parent 05fa1f4f87 d750438cd3
commit 3f91188775
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
62 changed files with 18718 additions and 17414 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ISSUE_TEMPLATE.md
View file

@ -1,6 +1,6 @@
Reporting bugs
--------------
- Note the precise time the problem occurred and describe the circumstances and steps that caused
- **Note the precise time the problem occurred** and describe the circumstances and steps that caused
the problem
- Note the Build version (found in the About dialog in the app, when pressing the three dots in the
upper-right corner).

2
README.md
View file

@ -1,6 +1,6 @@
# AndroidAPS
* Check the wiki: https://github.com/MilosKozak/AndroidAPS/wiki
* Check the wiki: http://wiki.androidaps.org
* Everyone who’s been looping with AndroidAPS needs to fill out the form after 3 days of looping https://docs.google.com/forms/d/14KcMjlINPMJHVt28MDRupa4sz4DDIooI4SrW0P3HSN8/viewform?c=0&w=1
[![Gitter](https://badges.gitter.im/MilosKozak/AndroidAPS.svg)](https://gitter.im/MilosKozak/AndroidAPS?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

2
app/build.gradle
View file

@ -63,7 +63,7 @@ android {
targetSdkVersion 25
multiDexEnabled true
versionCode 1500
version "2.0i-dev"
version "2.0"
buildConfigField "String", "VERSION", '"' + version + '"'
buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"'
buildConfigField "String", "HEAD", '"' + generateGitBuild() + '"'

4
app/src/main/AndroidManifest.xml
View file

@ -12,6 +12,7 @@
<uses-permission android:name="android.permission.RECEIVE_SMS" />
<uses-permission android:name="android.permission.RECEIVE_MMS" />
<uses-permission android:name="android.permission.SEND_SMS" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.SEND_MMS" />
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.INTERNET" />
@ -34,6 +35,9 @@
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme.NoActionBar">
<meta-data
android:name="com.google.android.gms.car.application"
android:resource="@xml/automotive_app_desc" />
<activity android:name=".MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

1
app/src/main/java/info/nightscout/androidaps/MainActivity.java
View file

@ -326,6 +326,7 @@ public class MainActivity extends AppCompatActivity {
case AndroidPermission.CASE_LOCATION:
case AndroidPermission.CASE_SMS:
case AndroidPermission.CASE_BATTERY:
case AndroidPermission.CASE_PHONESTATE:
break;
}
}

6
app/src/main/java/info/nightscout/androidaps/data/Profile.java
View file

@ -398,7 +398,7 @@ public class Profile {
public String getIsfList() {
if (isf_v == null)
isf_v = convertToSparseArray(isf);
return getValuesList(isf_v, null, new DecimalFormat("0.0"), getUnits() + "/U");
return getValuesList(isf_v, null, new DecimalFormat("0.0"), getUnits() + MainApp.gs(R.string.profile_per_unit));
}
public double getIc() {
@ -418,7 +418,7 @@ public class Profile {
public String getIcList() {
if (ic_v == null)
ic_v = convertToSparseArray(ic);
return getValuesList(ic_v, null, new DecimalFormat("0.0"), "g/U");
return getValuesList(ic_v, null, new DecimalFormat("0.0"), MainApp.gs(R.string.profile_carbs_per_unit));
}
public double getBasal() {
@ -439,7 +439,7 @@ public class Profile {
public String getBasalList() {
if (basal_v == null)
basal_v = convertToSparseArray(basal);
return getValuesList(basal_v, null, new DecimalFormat("0.00"), "U/h");
return getValuesList(basal_v, null, new DecimalFormat("0.00"), MainApp.gs(R.string.profile_ins_units_per_hout));
}
public class BasalValue {

6
app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
View file

@ -156,6 +156,12 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
}
}
@Override
public void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion) {
log.info("Do nothing for downgrading...");
log.debug("oldVersion: {}, newVersion: {}", oldVersion, newVersion);
}
public int getOldVersion() {
return oldVersion;
}

5
app/src/main/java/info/nightscout/androidaps/db/ProfileSwitch.java
View file

@ -101,6 +101,11 @@ public class ProfileSwitch implements Interval, DataPointWithLabelInterface {
return profile;
}
/**
* Note: the name returned here is used as the PS name when uploading to NS. When such a PS is retrieved
* again from NS, the added parts must be removed again, see
* {@link info.nightscout.utils.PercentageSplitter#pureName}
*/
public String getCustomizedName() {
String name = profileName;
if(LocalProfilePlugin.LOCAL_PROFILE.equals(name)){

6
app/src/main/java/info/nightscout/androidaps/logging/L.java
View file

@ -99,13 +99,13 @@ public class L {
private static void initialize() {
logElements = new ArrayList<>();
logElements.add(new LogElement(APS, true));
logElements.add(new LogElement(AUTOSENS, true));
logElements.add(new LogElement(AUTOSENS, false));
logElements.add(new LogElement(BGSOURCE, true));
logElements.add(new LogElement(CONFIGBUILDER, true));
logElements.add(new LogElement(CONFIGBUILDER, false));
logElements.add(new LogElement(CONSTRAINTS, true));
logElements.add(new LogElement(CORE, true));
logElements.add(new LogElement(DATABASE, true));
logElements.add(new LogElement(DATAFOOD, true));
logElements.add(new LogElement(DATAFOOD, false));
logElements.add(new LogElement(DATASERVICE, true));
logElements.add(new LogElement(DATATREATMENTS, true));
logElements.add(new LogElement(EVENTS, false, true));

6
app/src/main/java/info/nightscout/androidaps/plugins/Loop/LoopPlugin.java
View file

@ -409,8 +409,10 @@ public class LoopPlugin extends PluginBase {
.setAutoCancel(true)
.setPriority(Notification.PRIORITY_HIGH)
.setCategory(Notification.CATEGORY_ALARM)
.setVisibility(Notification.VISIBILITY_PUBLIC)
.setLocalOnly(true);
.setVisibility(Notification.VISIBILITY_PUBLIC);
if (SP.getBoolean("wearcontrol", false)) {
builder.setLocalOnly(true);
}
// Creates an explicit intent for an Activity in your app
Intent resultIntent = new Intent(MainApp.instance().getApplicationContext(), MainActivity.class);

41
app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
View file

@ -446,7 +446,8 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
super.onCreateContextMenu(menu, v, menuInfo);
if (v == apsModeView) {
final LoopPlugin loopPlugin = LoopPlugin.getPlugin();
final PumpDescription pumpDescription = ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription();
final PumpDescription pumpDescription =
ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription();
if (!ProfileFunctions.getInstance().isProfileValid("ContexMenuCreation"))
return;
menu.setHeaderTitle(MainApp.gs(R.string.loop));
@ -457,19 +458,21 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
menu.add(MainApp.gs(R.string.suspendloopfor2h));
menu.add(MainApp.gs(R.string.suspendloopfor3h));
menu.add(MainApp.gs(R.string.suspendloopfor10h));
if (pumpDescription.tempDurationStep15mAllowed)
menu.add(MainApp.gs(R.string.disconnectpumpfor15m));
if (pumpDescription.tempDurationStep30mAllowed)
menu.add(MainApp.gs(R.string.disconnectpumpfor30m));
menu.add(MainApp.gs(R.string.disconnectpumpfor1h));
menu.add(MainApp.gs(R.string.disconnectpumpfor2h));
menu.add(MainApp.gs(R.string.disconnectpumpfor3h));
} else {
} else {
menu.add(MainApp.gs(R.string.resume));
}
}
if (!loopPlugin.isEnabled(PluginType.LOOP))
if (!loopPlugin.isEnabled(PluginType.LOOP)) {
menu.add(MainApp.gs(R.string.enableloop));
}
if (!loopPlugin.isDisconnected()) {
showSuspendtPump(menu, pumpDescription);
} else {
menu.add(MainApp.gs(R.string.reconnect));
}
} else if (v == activeProfileView) {
menu.setHeaderTitle(MainApp.gs(R.string.profile));
menu.add(MainApp.gs(R.string.danar_viewprofile));
@ -488,6 +491,17 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
}
}
private void showSuspendtPump(ContextMenu menu,
PumpDescription pumpDescription) {
if (pumpDescription.tempDurationStep15mAllowed)
menu.add(MainApp.gs(R.string.disconnectpumpfor15m));
if (pumpDescription.tempDurationStep30mAllowed)
menu.add(MainApp.gs(R.string.disconnectpumpfor30m));
menu.add(MainApp.gs(R.string.disconnectpumpfor1h));
menu.add(MainApp.gs(R.string.disconnectpumpfor2h));
menu.add(MainApp.gs(R.string.disconnectpumpfor3h));
}
@Override
public boolean onContextItemSelected(MenuItem item) {
final Profile profile = ProfileFunctions.getInstance().getProfile();
@ -516,7 +530,8 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
updateGUI("suspendmenu");
NSUpload.uploadOpenAPSOffline(0);
return true;
} else if (item.getTitle().equals(MainApp.gs(R.string.resume))) {
} else if (item.getTitle().equals(MainApp.gs(R.string.resume)) ||
item.getTitle().equals(MainApp.gs(R.string.reconnect))) {
loopPlugin.suspendTo(0L);
updateGUI("suspendmenu");
ConfigBuilderPlugin.getPlugin().getCommandQueue().cancelTempBasal(true, new Callback() {
@ -1095,7 +1110,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
apsModeView.setBackgroundColor(MainApp.gc(R.color.looppumpsuspended));
apsModeView.setText(String.format(MainApp.gs(R.string.loopsuperbolusfor), loopPlugin.minutesToEndOfSuspend()));
apsModeView.setTextColor(Color.WHITE);
} else if (loopPlugin.isEnabled(PluginType.LOOP) && loopPlugin.isDisconnected()) {
} else if (loopPlugin.isDisconnected()) {
apsModeView.setBackgroundColor(MainApp.gc(R.color.looppumpsuspended));
apsModeView.setText(String.format(MainApp.gs(R.string.loopdisconnectedfor), loopPlugin.minutesToEndOfSuspend()));
apsModeView.setTextColor(Color.WHITE);
@ -1364,7 +1379,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
// Sensitivity
if (sensitivityView != null) {
AutosensData autosensData = IobCobCalculatorPlugin.getPlugin().getLastAutosensDataSynchronized("Overview");
AutosensData autosensData = IobCobCalculatorPlugin.getPlugin().getLastAutosensData("Overview");
if (autosensData != null)
sensitivityView.setText(String.format("%.0f%%", autosensData.autosensResult.ratio * 100));
else

1
app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/Notification.java
View file

@ -71,6 +71,7 @@ public class Notification {
public static final int DEVICENOTPAIRED = 43;
public static final int MEDTRONIC_PUMP_ALARM = 44;
public static final int RILEYLINK_CONNECTION = 45;
public static final int PERMISSION_PHONESTATE = 46;
public int id;

80
app/src/main/java/info/nightscout/androidaps/plugins/Persistentnotification/PersistentNotificationPlugin.java
View file

@ -13,6 +13,14 @@ import android.os.Build;
import android.support.v4.app.NotificationCompat;
import android.support.v4.app.TaskStackBuilder;
// Android Auto
import android.support.v4.app.NotificationCompat;
import android.support.v4.app.NotificationManagerCompat;
import android.support.v4.app.RemoteInput;
import com.squareup.otto.Subscribe;
import info.nightscout.androidaps.Config;
@ -60,6 +68,18 @@ public class PersistentNotificationPlugin extends PluginBase {
public static final int ONGOING_NOTIFICATION_ID = 4711;
private final Context ctx;
/// For Android Auto
/// Intents are not declared in manifest and not consumed, this is intentionally because actually we can't do anything with
private static final String PACKAGE = "info.nightscout";
private static final String READ_ACTION =
"info.nightscout.androidaps.ACTION_MESSAGE_READ";
private static final String REPLY_ACTION =
"info.nightscout.androidaps.ACTION_MESSAGE_REPLY";
private static final String CONVERSATION_ID = "conversation_id";
private static final String EXTRA_VOICE_REPLY = "extra_voice_reply";
/// End Android Auto
public PersistentNotificationPlugin(Context ctx) {
super(new PluginDescription()
.mainType(PluginType.GENERAL)
@ -107,7 +127,8 @@ public class PersistentNotificationPlugin extends PluginBase {
return null;
}
String line1 = "";
String line1;
String line1_aa;
if (ConfigBuilderPlugin.getPlugin().getActiveProfileInterface() == null || !ProfileFunctions.getInstance().isProfileValid("Notificiation"))
return null;
@ -118,22 +139,25 @@ public class PersistentNotificationPlugin extends PluginBase {
GlucoseStatus glucoseStatus = GlucoseStatus.getGlucoseStatusData();
if (lastBG != null) {
line1 = lastBG.valueToUnitsToString(units);
line1 = line1_aa = lastBG.valueToUnitsToString(units);
if (glucoseStatus != null) {
line1 += " Δ" + deltastring(glucoseStatus.delta, glucoseStatus.delta * Constants.MGDL_TO_MMOLL, units)
+ " avgΔ" + deltastring(glucoseStatus.avgdelta, glucoseStatus.avgdelta * Constants.MGDL_TO_MMOLL, units);
line1_aa += " " + lastBG.directionToSymbol();
} else {
line1 += " " +
MainApp.gs(R.string.old_data) +
" ";
line1_aa += line1 + ".";
}
} else {
line1 = MainApp.gs(R.string.missed_bg_readings);
line1 = line1_aa = MainApp.gs(R.string.missed_bg_readings);
}
TemporaryBasal activeTemp = TreatmentsPlugin.getPlugin().getTempBasalFromHistory(System.currentTimeMillis());
if (activeTemp != null) {
line1 += " " + activeTemp.toStringShort();
line1_aa += " " + activeTemp.toStringShort() + ".";
}
//IOB
@ -143,12 +167,55 @@ public class PersistentNotificationPlugin extends PluginBase {
IobTotal basalIob = TreatmentsPlugin.getPlugin().getLastCalculationTempBasals().round();
String line2 = MainApp.gs(R.string.treatments_iob_label_string) + " " + DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob) + "U " + MainApp.gs(R.string.cob)+": " + IobCobCalculatorPlugin.getPlugin().getCobInfo(false, "PersistentNotificationPlugin").generateCOBString();;
String line2 = MainApp.gs(R.string.treatments_iob_label_string) + " " + DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob) + "U " + MainApp.gs(R.string.cob)+": " + IobCobCalculatorPlugin.getPlugin().getCobInfo(false, "PersistentNotificationPlugin").generateCOBString();
String line2_aa = MainApp.gs(R.string.treatments_iob_label_string) + " " + DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob) + "U. " + MainApp.gs(R.string.cob)+": " + IobCobCalculatorPlugin.getPlugin().getCobInfo(false, "PersistentNotificationPlugin").generateCOBString() + ".";
String line3 = DecimalFormatter.to2Decimal(ConfigBuilderPlugin.getPlugin().getActivePump().getBaseBasalRate()) + " U/h";
String line3_aa = DecimalFormatter.to2Decimal(ConfigBuilderPlugin.getPlugin().getActivePump().getBaseBasalRate()) + " U/h.";
line3 += " - " + ProfileFunctions.getInstance().getProfileName();
line3_aa += " - " + ProfileFunctions.getInstance().getProfileName() + ".";
/// For Android Auto
Intent msgReadIntent = new Intent()
.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
.setAction(READ_ACTION)
.putExtra(CONVERSATION_ID, ONGOING_NOTIFICATION_ID)
.setPackage(PACKAGE);
PendingIntent msgReadPendingIntent =
PendingIntent.getBroadcast(ctx,
ONGOING_NOTIFICATION_ID,
msgReadIntent,
PendingIntent.FLAG_UPDATE_CURRENT);
Intent msgReplyIntent = new Intent()
.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
.setAction(REPLY_ACTION)
.putExtra(CONVERSATION_ID, ONGOING_NOTIFICATION_ID)
.setPackage(PACKAGE);
PendingIntent msgReplyPendingIntent = PendingIntent.getBroadcast(
ctx,
ONGOING_NOTIFICATION_ID,
msgReplyIntent,
PendingIntent.FLAG_UPDATE_CURRENT);
// Build a RemoteInput for receiving voice input from devices
RemoteInput remoteInput = new RemoteInput.Builder(EXTRA_VOICE_REPLY).build();
// Create the UnreadConversation
NotificationCompat.CarExtender.UnreadConversation.Builder unreadConversationBuilder =
new NotificationCompat.CarExtender.UnreadConversation.Builder(line1_aa + "\n" + line2_aa)
.setLatestTimestamp(System.currentTimeMillis())
.setReadPendingIntent(msgReadPendingIntent)
.setReplyAction(msgReplyPendingIntent, remoteInput);
/// Add dot to produce a "more natural sounding result"
unreadConversationBuilder.addMessage(line3_aa);
/// End Android Auto
NotificationCompat.Builder builder = new NotificationCompat.Builder(ctx, CHANNEL_ID);
@ -167,6 +234,11 @@ public class PersistentNotificationPlugin extends PluginBase {
builder.setContentTitle(line1);
builder.setContentText(line2);
builder.setSubText(line3);
/// Android Auto
builder.extend(new NotificationCompat.CarExtender()
.setUnreadConversation(unreadConversationBuilder.build()));
/// End Android Auto
Intent resultIntent = new Intent(ctx, MainActivity.class);

2
app/src/main/java/info/nightscout/androidaps/plugins/ProfileLocal/LocalProfileFragment.java
View file

@ -156,7 +156,7 @@ public class LocalProfileFragment extends SubscriberFragment {
public String getSumLabel() {
ProfileStore profile = LocalProfilePlugin.getPlugin().createProfileStore();
if (profile != null)
return " ∑" + DecimalFormatter.to2Decimal(profile.getDefaultProfile().baseBasalSum()) + "U";
return " ∑" + DecimalFormatter.to2Decimal(profile.getDefaultProfile().baseBasalSum()) + MainApp.gs(R.string.insulin_unit_shortname);
else
return MainApp.gs(R.string.localprofile);
}

4
app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/NSProfileFragment.java
View file

@ -52,6 +52,8 @@ public class NSProfileFragment extends SubscriberFragment {
TextView isf;
@BindView(R.id.profileview_basal)
TextView basal;
@BindView(R.id.profileview_basaltotal)
TextView basaltotal;
@BindView(R.id.profileview_target)
TextView target;
@BindView(R.id.basal_graph)
@ -116,6 +118,7 @@ public class NSProfileFragment extends SubscriberFragment {
ic.setText(profile.getIcList());
isf.setText(profile.getIsfList());
basal.setText(profile.getBasalList());
basaltotal.setText(String.format(MainApp.gs(R.string.profile_total), DecimalFormatter.to2Decimal(profile.baseBasalSum())));
target.setText(profile.getTargetList());
basalGraph.show(profile);
}
@ -141,6 +144,7 @@ public class NSProfileFragment extends SubscriberFragment {
ic.setText("");
isf.setText("");
basal.setText("");
basaltotal.setText("");
target.setText("");
activateButton.setVisibility(View.GONE);
}

2
app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWItem.java
View file

@ -81,7 +81,7 @@ public class SWItem {
}
public static LinearLayout generateLayout(View view) {
LinearLayout layout = (LinearLayout) view.findViewById(view.getId());
LinearLayout layout = (LinearLayout) view;
layout.removeAllViews();
return layout;
}

11
app/src/main/java/info/nightscout/utils/AndroidPermission.java
View file

@ -21,6 +21,7 @@ public class AndroidPermission {
public static final int CASE_SMS = 0x2;
public static final int CASE_LOCATION = 0x3;
public static final int CASE_BATTERY = 0x4;
public static final int CASE_PHONESTATE = 0x5;
public static void askForPermission(Activity activity, String[] permission, Integer requestCode) {
boolean test = false;
@ -55,6 +56,16 @@ public class AndroidPermission {
} else
MainApp.bus().post(new EventDismissNotification(Notification.PERMISSION_SMS));
}
// Following is a bug in Android 8
if (Build.VERSION.SDK_INT == Build.VERSION_CODES.O) {
if (!checkForPermission(activity, Manifest.permission.READ_PHONE_STATE)) {
NotificationWithAction notification = new NotificationWithAction(Notification.PERMISSION_PHONESTATE, MainApp.gs(R.string.smscommunicator_missingphonestatepermission), Notification.URGENT);
notification.action(MainApp.gs(R.string.request), () ->
AndroidPermission.askForPermission(activity, new String[]{Manifest.permission.READ_PHONE_STATE}, AndroidPermission.CASE_PHONESTATE));
MainApp.bus().post(new EventNewNotification(notification));
} else
MainApp.bus().post(new EventDismissNotification(Notification.PERMISSION_PHONESTATE));
}
}
}

24
app/src/main/java/info/nightscout/utils/PercentageSplitter.java
View file

@ -8,23 +8,15 @@ import java.util.regex.Pattern;
*/
public class PercentageSplitter {
// "Profile name (200%,2h)"
private static final Pattern percentagePattern = Pattern.compile("(.+)\\(\\d+%,\\d+h\\)");
// "Profile name (200%)"
private static final Pattern percentageShiftPattern = Pattern.compile("(.+)\\(\\d+%\\)");
// Matches "Profile name (200%,-2h)", "Profile name (50%)
private static final Pattern splitPattern = Pattern.compile("(.+)\\(\\d+%(,-?\\d+h)?\\)");
/** Removes the suffix for percentage and timeshift from a profile name. */
/** Removes the suffix for percentage and timeshift from a profile name. This is the inverse of what
* {@link info.nightscout.androidaps.db.ProfileSwitch#getCustomizedName()} does.
* Since the customized name is used for the PS upload to NS, this is needed get the original profile name
* when retrieving the PS from NS again. */
public static String pureName(String name) {
Matcher percentageMatch = percentagePattern.matcher(name);
if (percentageMatch.find()) {
return percentageMatch.group(1).trim();
}
Matcher percentageShiftMatch = percentageShiftPattern.matcher(name);
if (percentageShiftMatch.find()) {
return percentageShiftMatch.group(1).trim();
}
return name;
Matcher percentageMatch = splitPattern.matcher(name);
return percentageMatch.find() ? percentageMatch.group(1).trim() : name;
}
}

36
app/src/main/res/layout/profileviewer_fragment.xml
View file

@ -345,6 +345,42 @@
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="2"
android:gravity="end"
android:paddingRight="5dp"
android:text=""
android:textSize="14sp" />
<TextView
android:layout_width="5dp"
android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="center_horizontal"
android:paddingEnd="2dp"
android:paddingStart="2dp"
android:text=""
android:textSize="14sp" />
<TextView
android:id="@+id/profileview_basaltotal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start"
android:paddingLeft="17dp"
android:textColor="@android:color/white"
android:textSize="14sp" />
</LinearLayout>
<info.nightscout.androidaps.plugins.Treatments.fragments.ProfileGraph
android:id="@+id/basal_graph"
android:layout_width="match_parent"

44
app/src/main/res/values-af/insight_alerts.xml
View file

@ -1,26 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<string name="alert_w31">Waarskuwing W31: Kasset laag</string>
<string name="alert_w32">Waarskuwing W32: Battery laag</string>
<string name="alert_w33">Waarskuwing W33: Ongeldige tyd/datum</string>
<string name="alert_w34">Waakskuwing W34: Einde van waarborg</string>
<string name="alert_w36">Waarskuwing W36: TBR gekanselleer</string>
<string name="alert_w38">Waarskuwing W38: Bolus gekanselleer</string>
<string name="alert_w39">Waarskuwing W39: Leentyd waarskuwing</string>
<string name="alert_m20">Onderhoud M20: Kasset nie ingevoeg</string>
<string name="alert_m21">Onderhoud M21: kasset leeg</string>
<string name="alert_m22">Onderhoud M22: Battery leeg</string>
<string name="alert_m23">Onderhoud M23: Outomaties af</string>
<string name="alert_m24">Onderhoud M24: verstopping</string>
<string name="alert_m25">Onderhoud M25: Leentyd oor - einde van bewerking</string>
<string name="alert_m26">Onderhoud M26: Kasset-verandering nie voltooi nie</string>
<string name="alert_m27">Onderhoud M27: Data aflaai het misluk</string>
<string name="alert_m28">Onderhoud M28: Wag-modus uit tyd uit</string>
<string name="alert_m29">Onderhoud M29: Battery-tipe nie voltooi nie</string>
<string name="alert_m30">Onderhoud M30: Kasset-tipe nie voltooi nie</string>
<string name="alert_e6">Fout E6: Meganiese fout</string>
<string name="alert_e7">Fout E7: Elektroniese fout</string>
<string name="alert_e10">Fout E10: Terugdraai fout</string>
<string name="alert_e13">Fout E13: Taal fout</string>
<string name="alert_w31">Waarskuwing W31: Kasset laag</string>
<string name="alert_w32">Waarskuwing W32: Battery laag</string>
<string name="alert_w33">Waarskuwing W33: Ongeldige tyd/datum</string>
<string name="alert_w34">Waakskuwing W34: Einde van waarborg</string>
<string name="alert_w36">Waarskuwing W36: TBR gekanselleer</string>
<string name="alert_w38">Waarskuwing W38: Bolus gekanselleer</string>
<string name="alert_w39">Waarskuwing W39: Leentyd waarskuwing</string>
<string name="alert_m20">Onderhoud M20: Kasset nie ingevoeg</string>
<string name="alert_m21">Onderhoud M21: kasset leeg</string>
<string name="alert_m22">Onderhoud M22: Battery leeg</string>
<string name="alert_m23">Onderhoud M23: Outomaties af</string>
<string name="alert_m24">Onderhoud M24: verstopping</string>
<string name="alert_m25">Onderhoud M25: Leentyd oor - einde van bewerking</string>
<string name="alert_m26">Onderhoud M26: Kasset-verandering nie voltooi nie</string>
<string name="alert_m27">Onderhoud M27: Data aflaai het misluk</string>
<string name="alert_m28">Onderhoud M28: Wag-modus uit tyd uit</string>
<string name="alert_m29">Onderhoud M29: Battery-tipe nie voltooi nie</string>
<string name="alert_m30">Onderhoud M30: Kasset-tipe nie voltooi nie</string>
<string name="alert_e6">Fout E6: Meganiese fout</string>
<string name="alert_e7">Fout E7: Elektroniese fout</string>
<string name="alert_e10">Fout E10: Terugdraai fout</string>
<string name="alert_e13">Fout E13: Taal fout</string>
</resources>

2134
app/src/main/res/values-af/strings.xml
View file

File diff suppressed because it is too large Load diff

44
app/src/main/res/values-bg/insight_alerts.xml
View file

@ -1,26 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<string name="alert_w31">Предупреждение за W31: Празен резервоар</string>
<string name="alert_w32">Предупреждение W32: Изтощена батерия</string>
<string name="alert_w33">Предупреждение W33: Невалиден час/дата</string>
<string name="alert_w34">Предупреждение за W34: Край на гаранция</string>
<string name="alert_w36">Предупреждение за W36: Временен базал отменен</string>
<string name="alert_w38">Предупреждение за W38: Болус отказан</string>
<string name="alert_w39">Предупреждение за W39: Loantime предупреждение</string>
<string name="alert_m20">Поддръжка M20: Резервоарът не е поставен</string>
<string name="alert_m21">Поддръжка M21: Резервоарът е празен</string>
<string name="alert_m22">Поддръжка M22: Батерията е изтощена</string>
<string name="alert_m23">Поддръжка M23: Автоматично изключване</string>
<string name="alert_m24">Поддръжка М24: Запушване</string>
<string name="alert_m25">Поддръжка M25: Loantime приключи - край на операцията</string>
<string name="alert_m26">Поддръжка M26: Смяната на резервоар не е завършена</string>
<string name="alert_m27">Поддръжка M27: Неуспешно изтегляне данни</string>
<string name="alert_m28">Поддръжка Месие 28: Режим пауза - таймаут</string>
<string name="alert_m29">Поддръжка M29: Незададен тип батерия</string>
<string name="alert_m30">Поддръжка M30: Незададен тип резетвоар</string>
<string name="alert_e6">Грешка E6: Механична грешка</string>
<string name="alert_e7">Грешка E7: Гешка в електрониката</string>
<string name="alert_e10">Грешка E10: Грешка в превъртането</string>
<string name="alert_e13">Грешка E13: Езикова грешка</string>
<string name="alert_w31">Предупреждение за W31: Празен резервоар</string>
<string name="alert_w32">Предупреждение W32: Изтощена батерия</string>
<string name="alert_w33">Предупреждение W33: Невалиден час/дата</string>
<string name="alert_w34">Предупреждение за W34: Край на гаранция</string>
<string name="alert_w36">Предупреждение за W36: Временен базал отменен</string>
<string name="alert_w38">Предупреждение за W38: Болус отказан</string>
<string name="alert_w39">Предупреждение за W39: Loantime предупреждение</string>
<string name="alert_m20">Поддръжка M20: Резервоарът не е поставен</string>
<string name="alert_m21">Поддръжка M21: Резервоарът е празен</string>
<string name="alert_m22">Поддръжка M22: Батерията е изтощена</string>
<string name="alert_m23">Поддръжка M23: Автоматично изключване</string>
<string name="alert_m24">Поддръжка М24: Запушване</string>
<string name="alert_m25">Поддръжка M25: Loantime приключи - край на операцията</string>
<string name="alert_m26">Поддръжка M26: Смяната на резервоар не е завършена</string>
<string name="alert_m27">Поддръжка M27: Неуспешно изтегляне данни</string>
<string name="alert_m28">Поддръжка Месие 28: Режим пауза - таймаут</string>
<string name="alert_m29">Поддръжка M29: Незададен тип батерия</string>
<string name="alert_m30">Поддръжка M30: Незададен тип резетвоар</string>
<string name="alert_e6">Грешка E6: Механична грешка</string>
<string name="alert_e7">Грешка E7: Гешка в електрониката</string>
<string name="alert_e10">Грешка E10: Грешка в превъртането</string>
<string name="alert_e13">Грешка E13: Езикова грешка</string>
</resources>

2128
app/src/main/res/values-bg/strings.xml
View file

File diff suppressed because it is too large Load diff

44
app/src/main/res/values-cs/insight_alerts.xml
View file

@ -1,26 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<string name="alert_w31">Varování W31: Zásobník</string>
<string name="alert_w32">Varování W32: Nízký stav baterie</string>
<string name="alert_w33">Varování W33: Neplatný čas/datum</string>
<string name="alert_w34">Varování W34: Konec záruky</string>
<string name="alert_w36">Varování W36: Dočasný bazál zrušen</string>
<string name="alert_w38">Varování W38: Bolus zrušen</string>
<string name="alert_w39">Varování W39: Varování doba výpůjčky</string>
<string name="alert_m20">Údržba M20: Není vložen zásobník</string>
<string name="alert_m21">Údržba M21: Prázdný zásobník</string>
<string name="alert_m22">Údržba M22: Vybitá baterie</string>
<string name="alert_m23">Údržba M23: Automatické vypnutí</string>
<string name="alert_m24">Údržba M24: Okluze</string>
<string name="alert_m25">Údržba M25: Doba vypůjčení vypršela - ukončení provozu</string>
<string name="alert_m26">Údržba M26: Výměna zásobníku nedokončena</string>
<string name="alert_m27">Údržba M27: Stahování se nezdařilo</string>
<string name="alert_m28">Údržba M28: Časový limit režimu pauza</string>
<string name="alert_m29">Údržba M29: Nenastavený typ baterie</string>
<string name="alert_m30">Údržba M30: Nenastavený typ zásobníku</string>
<string name="alert_e6">Chyba E6: Mechanická chyba</string>
<string name="alert_e7">Chyba E7: Elektronická chyba</string>
<string name="alert_e10">Chyba E10: Chyba převinutí</string>
<string name="alert_e13">Chyba E13: Chyba jazyka</string>
<string name="alert_w31">Varování W31: Zásobník</string>
<string name="alert_w32">Varování W32: Nízký stav baterie</string>
<string name="alert_w33">Varování W33: Neplatný čas/datum</string>
<string name="alert_w34">Varování W34: Konec záruky</string>
<string name="alert_w36">Varování W36: Dočasný bazál zrušen</string>
<string name="alert_w38">Varování W38: Bolus zrušen</string>
<string name="alert_w39">Varování W39: Varování doba výpůjčky</string>
<string name="alert_m20">Údržba M20: Není vložen zásobník</string>
<string name="alert_m21">Údržba M21: Prázdný zásobník</string>
<string name="alert_m22">Údržba M22: Vybitá baterie</string>
<string name="alert_m23">Údržba M23: Automatické vypnutí</string>
<string name="alert_m24">Údržba M24: Okluze</string>
<string name="alert_m25">Údržba M25: Doba vypůjčení vypršela - ukončení provozu</string>
<string name="alert_m26">Údržba M26: Výměna zásobníku nedokončena</string>
<string name="alert_m27">Údržba M27: Stahování se nezdařilo</string>
<string name="alert_m28">Údržba M28: Časový limit režimu pauza</string>
<string name="alert_m29">Údržba M29: Nenastavený typ baterie</string>
<string name="alert_m30">Údržba M30: Nenastavený typ zásobníku</string>
<string name="alert_e6">Chyba E6: Mechanická chyba</string>
<string name="alert_e7">Chyba E7: Elektronická chyba</string>
<string name="alert_e10">Chyba E10: Chyba převinutí</string>
<string name="alert_e13">Chyba E13: Chyba jazyka</string>
</resources>

6
app/src/main/res/values-cs/strings.xml
View file

@ -532,6 +532,7 @@
<string name="disconnectpumpfor2h">Odpojit pumpu na 2 h</string>
<string name="disconnectpumpfor3h">Odpojit pumpu na 3 h</string>
<string name="resume">Uvolnit</string>
<string name="reconnect">Znovu připojit pumpu</string>
<string name="smscommunicator_wrongduration">Chybná doba trvání</string>
<string name="smscommunicator_loopsuspended">Smyčka pozastavena</string>
<string name="smscommunicator_loopresumed">Smyčka obnovena</string>
@ -556,6 +557,7 @@
<string name="danar_bluetooth_status">Stav Bluetooth</string>
<string name="nav_about">O aplikaci</string>
<string name="smscommunicator_missingsmspermission">Chybějící povolení SMS</string>
<string name="smscommunicator_missingphonestatepermission">Chybí oprávnění pro zjišťování stavu telefonu</string>
<string name="xdripstatus_settings">Status z xDripu (hodinky)</string>
<string name="xdripstatus">Statusový řádek xDripu (hodinky)</string>
<string name="xdripstatus_shortname">XDS</string>
@ -1053,6 +1055,10 @@
<string name="loop_openmode_min_change">Minimální změna pro výzvu [%]</string>
<string name="loop_openmode_min_change_summary">Smyčka vytvoří novou žádost o změnu pouze v případě, že změna je větší než tato hodnota. Výchozí hodnota je 20 %</string>
<string name="pairfirst">Spárujte pumpu s telefonem!</string>
<string name="profile_total">== ∑ %1$s U</string>
<string name="profile_ins_units_per_hout">U/h</string>
<string name="profile_carbs_per_unit">g/U</string>
<string name="profile_per_unit">/U</string>
<plurals name="objective_days">
<item quantity="one">%1$d den</item>
<item quantity="few">%1$d dnů</item>

44
app/src/main/res/values-de/insight_alerts.xml
View file

@ -1,26 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<string name="alert_w31">Warnung W31: Ampulle fast leer</string>
<string name="alert_w32">Warnung W32: Batterie fast leer</string>
<string name="alert_w33">Warnung W33: Zeit/Datum ungültig</string>
<string name="alert_w34">Warnung W34: Garantie abgelaufen</string>
<string name="alert_w36">Warnung W36: TBR abgebrochen</string>
<string name="alert_w38">Warnung W38: Bolus abgebrochen</string>
<string name="alert_w39">Warnung W39: Leihdauer-Warnung</string>
<string name="alert_m20">Wartung M20: Keine Ampulle eingesetzt</string>
<string name="alert_m21">Wartung M21: Ampulle leer</string>
<string name="alert_m22">Wartung M22: Batterie leer</string>
<string name="alert_m23">Wartung M23: Sicherheitsabschaltung</string>
<string name="alert_m24">Wartung M24: Verstopfung</string>
<string name="alert_m25">Wartung M25: Leihdauer abgelaufen</string>
<string name="alert_m26">Wartung M26: Ampullenwechsel nicht abgeschlossen</string>
<string name="alert_m27">Wartung M27: Datenübertragung fehlgeschlagen</string>
<string name="alert_m28">Wartung M28: Zeitüberschreitung bei Pause</string>
<string name="alert_m29">Wartung M29: Batterietyp nicht eingestellt</string>
<string name="alert_m30">Wartung M30: Ampullentyp nicht eingestellt</string>
<string name="alert_e6">Fehler E6: Mechanikfehler</string>
<string name="alert_e7">Fehler E7: Elektronikfehler</string>
<string name="alert_e10">Fehler E10: Fehler beim Zurückfahren</string>
<string name="alert_e13">Fehler E13: Fehler in der Sprachanzeige</string>
<string name="alert_w31">Warnung W31: Ampulle fast leer</string>
<string name="alert_w32">Warnung W32: Batterie fast leer</string>
<string name="alert_w33">Warnung W33: Zeit/Datum ungültig</string>
<string name="alert_w34">Warnung W34: Garantie abgelaufen</string>
<string name="alert_w36">Warnung W36: TBR abgebrochen</string>
<string name="alert_w38">Warnung W38: Bolus abgebrochen</string>
<string name="alert_w39">Warnung W39: Leihdauer-Warnung</string>
<string name="alert_m20">Wartung M20: Keine Ampulle eingesetzt</string>
<string name="alert_m21">Wartung M21: Ampulle leer</string>
<string name="alert_m22">Wartung M22: Batterie leer</string>
<string name="alert_m23">Wartung M23: Sicherheitsabschaltung</string>
<string name="alert_m24">Wartung M24: Verstopfung</string>
<string name="alert_m25">Wartung M25: Leihdauer abgelaufen</string>
<string name="alert_m26">Wartung M26: Ampullenwechsel nicht abgeschlossen</string>
<string name="alert_m27">Wartung M27: Datenübertragung fehlgeschlagen</string>
<string name="alert_m28">Wartung M28: Zeitüberschreitung bei Pause</string>
<string name="alert_m29">Wartung M29: Batterietyp nicht eingestellt</string>
<string name="alert_m30">Wartung M30: Ampullentyp nicht eingestellt</string>
<string name="alert_e6">Fehler E6: Mechanikfehler</string>
<string name="alert_e7">Fehler E7: Elektronikfehler</string>
<string name="alert_e10">Fehler E10: Fehler beim Zurückfahren</string>
<string name="alert_e13">Fehler E13: Fehler in der Sprachanzeige</string>
</resources>

2124
app/src/main/res/values-de/strings.xml
View file

File diff suppressed because it is too large Load diff

44
app/src/main/res/values-el/insight_alerts.xml
View file

@ -1,26 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<string name="alert_w31">Ειδοποίηση W31: Χαμηλή αμπούλα</string>
<string name="alert_w32">Ειδοποίηση W32: Χαμηλή μπαταρία</string>
<string name="alert_w33">Ειδοποίηση W33: Μη έγκυρη ώρα/ημερομηνία</string>
<string name="alert_w34">Ειδοποίηση W34: Λήξη εγγύησης</string>
<string name="alert_w36">Ειδοποίηση W36: Ακύρωση TBR</string>
<string name="alert_w38">Ειδοποίηση W38: Ακύρωση bolus</string>
<string name="alert_w39">Ειδοποίηση W39: Ειδοποίηση διάρκειας</string>
<string name="alert_m20">Συντήρηση M20: Η αμπούλα δεν έχει τοποθετηθεί</string>
<string name="alert_m21">Συντήρηση M21: Αμπούλα άδεια</string>
<string name="alert_m22">Συντήρηση M22: Μπαταρία άδεια</string>
<string name="alert_m23">Συντήρηση Μ23: Αυτόματη απενεργοποίηση</string>
<string name="alert_m24">Συντήρηση M24: Έμφραξη</string>
<string name="alert_m25">Συντήρηση M25: Διάρκεια τέλος - τέλος της λειτουργίας</string>
<string name="alert_m26">Συντήρηση M26: Η αλλαγή αμπούλας δεν έχει ολοκληρωθεί</string>
<string name="alert_m27">Συντήρηση Μ27: Απέτυχε η λήψη δεδομένων</string>
<string name="alert_m28">Συντήρηση M28: Λειτουργία παύσης έληξε</string>
<string name="alert_m29">Συντήρηση M29: Ο τύπος μπαταρίας δεν ταιριάζει</string>
<string name="alert_m30">Συντήρηση M30: Ο τύπος αμπούλας δεν ταιριάζει</string>
<string name="alert_e6">Σφάλμα Ε6: Μηχανικό σφάλμα</string>
<string name="alert_e7">Σφάλμα Ε7: Ηλεκτρονικό σφάλμα</string>
<string name="alert_e10">Σφάλματος E10: Σφάλμα Rewind</string>
<string name="alert_e13">Σφάλματος E13: Λάθος γλώσσα</string>
<string name="alert_w31">Ειδοποίηση W31: Χαμηλή αμπούλα</string>
<string name="alert_w32">Ειδοποίηση W32: Χαμηλή μπαταρία</string>
<string name="alert_w33">Ειδοποίηση W33: Μη έγκυρη ώρα/ημερομηνία</string>
<string name="alert_w34">Ειδοποίηση W34: Λήξη εγγύησης</string>
<string name="alert_w36">Ειδοποίηση W36: Ακύρωση TBR</string>
<string name="alert_w38">Ειδοποίηση W38: Ακύρωση bolus</string>
<string name="alert_w39">Ειδοποίηση W39: Ειδοποίηση διάρκειας</string>
<string name="alert_m20">Συντήρηση M20: Η αμπούλα δεν έχει τοποθετηθεί</string>
<string name="alert_m21">Συντήρηση M21: Αμπούλα άδεια</string>
<string name="alert_m22">Συντήρηση M22: Μπαταρία άδεια</string>
<string name="alert_m23">Συντήρηση Μ23: Αυτόματη απενεργοποίηση</string>
<string name="alert_m24">Συντήρηση M24: Έμφραξη</string>
<string name="alert_m25">Συντήρηση M25: Διάρκεια τέλος - τέλος της λειτουργίας</string>
<string name="alert_m26">Συντήρηση M26: Η αλλαγή αμπούλας δεν έχει ολοκληρωθεί</string>
<string name="alert_m27">Συντήρηση Μ27: Απέτυχε η λήψη δεδομένων</string>
<string name="alert_m28">Συντήρηση M28: Λειτουργία παύσης έληξε</string>
<string name="alert_m29">Συντήρηση M29: Ο τύπος μπαταρίας δεν ταιριάζει</string>
<string name="alert_m30">Συντήρηση M30: Ο τύπος αμπούλας δεν ταιριάζει</string>
<string name="alert_e6">Σφάλμα Ε6: Μηχανικό σφάλμα</string>
<string name="alert_e7">Σφάλμα Ε7: Ηλεκτρονικό σφάλμα</string>
<string name="alert_e10">Σφάλματος E10: Σφάλμα Rewind</string>
<string name="alert_e13">Σφάλματος E13: Λάθος γλώσσα</string>
</resources>

2123
app/src/main/res/values-el/strings.xml
View file

File diff suppressed because it is too large Load diff

44
app/src/main/res/values-es/insight_alerts.xml
View file

@ -1,26 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<string name="alert_w31">ADVERTENCIA W31: Cartucho bajo</string>
<string name="alert_w32">ADVERTENCIA W32: Batería baja</string>
<string name="alert_w33">ADVERTENCIA W33: Fecha/Hora no válida</string>
<string name="alert_w34">ADVERTENCIA W34: Fin de la garantía</string>
<string name="alert_w36">ADVERTENCIA W36: TBR cancelada</string>
<string name="alert_w38">ADVERTENCIA W38: Bolo cancelado</string>
<string name="alert_w39">W39 Advertencia: Advertencia de tiempo préstamo</string>
<string name="alert_m20">Mantenimiento M20: Cartucho no insertado</string>
<string name="alert_m21">Mantenimiento M21: Cartucho vacío</string>
<string name="alert_m22">Mantenimiento M22: Batería vacía</string>
<string name="alert_m23">Mantenimiento M23: Apagado automático</string>
<string name="alert_m24">Mantenimiento M24: oclusión</string>
<string name="alert_m25">Mantenimiento M25: Tiempo préstamo finalizado - final de la operación</string>
<string name="alert_m26">Mantenimiento M26: Cambio de cartucho no completado</string>
<string name="alert_m27">Mantenimiento M27: Error de descarga de datos</string>
<string name="alert_m28">Mantenimiento M28: Tiempo de espera vencido</string>
<string name="alert_m29">Mantenimiento M29: Tipo de batería no establecido</string>
<string name="alert_m30">Mantenimiento M30: Tipo cartucho no establecido</string>
<string name="alert_e6">Error E6: Error mecánico</string>
<string name="alert_e7">Error E7: Error electrónico</string>
<string name="alert_e10">Error E10: Error de rebobinado</string>
<string name="alert_e13">Error E13: Error de lenguaje</string>
<string name="alert_w31">ADVERTENCIA W31: Cartucho bajo</string>
<string name="alert_w32">ADVERTENCIA W32: Batería baja</string>
<string name="alert_w33">ADVERTENCIA W33: Fecha/Hora no válida</string>
<string name="alert_w34">ADVERTENCIA W34: Fin de la garantía</string>
<string name="alert_w36">ADVERTENCIA W36: TBR cancelada</string>
<string name="alert_w38">ADVERTENCIA W38: Bolo cancelado</string>
<string name="alert_w39">W39 Advertencia: Advertencia de tiempo préstamo</string>
<string name="alert_m20">Mantenimiento M20: Cartucho no insertado</string>
<string name="alert_m21">Mantenimiento M21: Cartucho vacío</string>
<string name="alert_m22">Mantenimiento M22: Batería vacía</string>
<string name="alert_m23">Mantenimiento M23: Apagado automático</string>
<string name="alert_m24">Mantenimiento M24: oclusión</string>
<string name="alert_m25">Mantenimiento M25: Tiempo préstamo finalizado - final de la operación</string>
<string name="alert_m26">Mantenimiento M26: Cambio de cartucho no completado</string>
<string name="alert_m27">Mantenimiento M27: Error de descarga de datos</string>
<string name="alert_m28">Mantenimiento M28: Tiempo de espera vencido</string>
<string name="alert_m29">Mantenimiento M29: Tipo de batería no establecido</string>
<string name="alert_m30">Mantenimiento M30: Tipo cartucho no establecido</string>
<string name="alert_e6">Error E6: Error mecánico</string>
<string name="alert_e7">Error E7: Error electrónico</string>
<string name="alert_e10">Error E10: Error de rebobinado</string>
<string name="alert_e13">Error E13: Error de lenguaje</string>
</resources>

2111
app/src/main/res/values-es/strings.xml
View file

File diff suppressed because it is too large Load diff

44
app/src/main/res/values-fr/insight_alerts.xml
View file

@ -1,26 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<string name="alert_w31">Alerte W31 : Réservoir presque vide</string>
<string name="alert_w32">Alerte W32 : Batterie presque déchargée</string>
<string name="alert_w33">Avertissement W33 : Heure/date non valides</string>
<string name="alert_w34">Alerte W34 : Fin de garantie</string>
<string name="alert_w36">Alerte W36 : TBR annulé</string>
<string name="alert_w38">Alerte W38 : Bolus annulé</string>
<string name="alert_w39">Alerte W39 : Avertissement Loantime</string>
<string name="alert_m20">Maintenance M20 : Cartouche pas inséré</string>
<string name="alert_m21">Maintenance M21 : Cartouche vide</string>
<string name="alert_m22">Maintenance M22 : Batterie vide</string>
<string name="alert_m23">Maintenance M23 : Arrêt automatique</string>
<string name="alert_m24">Maintenance M24 : Occlusion</string>
<string name="alert_m25">Maintenance M25 : Loantime terminé - fin d’opération</string>
<string name="alert_m26">Maintenance M26 : Changement de cartouche non terminé</string>
<string name="alert_m27">Maintenance M27 : Le téléchargement de données a échoué</string>
<string name="alert_m28">Maintenance M28 : Pause mode timeout</string>
<string name="alert_m29">Maintenance M29 : Type de batterie non défini</string>
<string name="alert_m30">Maintenance M30 : Réservoir type non défini</string>
<string name="alert_e6">Erreur E6 : Problème mécanique</string>
<string name="alert_e7">Erreur E7 : Problème d\'électronique</string>
<string name="alert_e10">Erreur E10 : Erreur de rembobinage</string>
<string name="alert_e13">Erreur E13 : Erreur de langage</string>
<string name="alert_w31">Alerte W31 : Réservoir presque vide</string>
<string name="alert_w32">Alerte W32 : Batterie presque déchargée</string>
<string name="alert_w33">Avertissement W33 : Heure/date non valides</string>
<string name="alert_w34">Alerte W34 : Fin de garantie</string>
<string name="alert_w36">Alerte W36 : TBR annulé</string>
<string name="alert_w38">Alerte W38 : Bolus annulé</string>
<string name="alert_w39">Alerte W39 : Avertissement Loantime</string>
<string name="alert_m20">Maintenance M20 : Cartouche pas inséré</string>
<string name="alert_m21">Maintenance M21 : Cartouche vide</string>
<string name="alert_m22">Maintenance M22 : Batterie vide</string>
<string name="alert_m23">Maintenance M23 : Arrêt automatique</string>
<string name="alert_m24">Maintenance M24 : Occlusion</string>
<string name="alert_m25">Maintenance M25 : Loantime terminé - fin d’opération</string>
<string name="alert_m26">Maintenance M26 : Changement de cartouche non terminé</string>
<string name="alert_m27">Maintenance M27 : Le téléchargement de données a échoué</string>
<string name="alert_m28">Maintenance M28 : Pause mode timeout</string>
<string name="alert_m29">Maintenance M29 : Type de batterie non défini</string>
<string name="alert_m30">Maintenance M30 : Réservoir type non défini</string>
<string name="alert_e6">Erreur E6 : Problème mécanique</string>
<string name="alert_e7">Erreur E7 : Problème d\'électronique</string>
<string name="alert_e10">Erreur E10 : Erreur de rembobinage</string>
<string name="alert_e13">Erreur E13 : Erreur de langage</string>
</resources>

2134
app/src/main/res/values-fr/strings.xml
View file

File diff suppressed because it is too large Load diff

14
app/src/main/res/values-he/strings.xml
View file

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<string name="nav_refreshtreatments">רענן טיפול מ-Nightscout</string>
<string name="danar_useextended_title">השתמש בבולוס מורחב של 200%</string>
<string name="alert_dialog_storage_permission_text">בבקשה אתחל את הסמרטפון שלך או תרענן את אפלקצית AndroidAPS בהגדרות המערכת
<string name="nav_refreshtreatments">רענן טיפול מ-Nightscout</string>
<string name="danar_useextended_title">השתמש בבולוס מורחב של 200%</string>
<string name="alert_dialog_storage_permission_text">בבקשה אתחל את הסמרטפון שלך או תרענן את אפלקצית AndroidAPS בהגדרות המערכת
אחרת AndroidAPS לא יוכל לבצע רישום (חשוב לעקוב אחר ולוודא כי האלגוריתמים פועלים כראוי)!</string>
<string name="description_food">מציג את ההגדרות הקבועות מראש עבור מזון המוגדר ב-Nightscout</string>
<string name="description_loop">להפעיל או לכבות את הלולאה.</string>
<string name="description_ns_client">מסנכרן את הנתונים שלך עם Nightscout</string>
<string name="description_profile_nightscout">יבא פרופיל מ- Nightscout</string>
<string name="description_food">מציג את ההגדרות הקבועות מראש עבור מזון המוגדר ב-Nightscout</string>
<string name="description_loop">להפעיל או לכבות את הלולאה.</string>
<string name="description_ns_client">מסנכרן את הנתונים שלך עם Nightscout</string>
<string name="description_profile_nightscout">יבא פרופיל מ- Nightscout</string>
</resources>

44
app/src/main/res/values-it/insight_alerts.xml
View file

@ -1,26 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<string name="alert_w31">Avviso W31: Cartuccia in esaurimento</string>
<string name="alert_w32">Avviso W32: Batteria bassa</string>
<string name="alert_w33">W33 avviso: Data/ora non valido</string>
<string name="alert_w34">W34 avviso: Fine della garanzia</string>
<string name="alert_w36">Avviso W36: TBR annullato</string>
<string name="alert_w38">Avviso W38: Bolo annullato</string>
<string name="alert_w39">Avviso W39: Avviso Loantime</string>
<string name="alert_m20">Manutenzione M20: Cartuccia non inserita</string>
<string name="alert_m21">Manutenzione M21: Cartuccia vuota</string>
<string name="alert_m22">Manutenzione M22: Batteria scarica</string>
<string name="alert_m23">Manutenzione M23: Spegnimento automatico</string>
<string name="alert_m24">Manutenzione M24: occlusione</string>
<string name="alert_m25">Manutenzione M25: Loantime sopra - fine dell\'operazione</string>
<string name="alert_m26">Manutenzione M26: Sostituzione cartuccia non completata</string>
<string name="alert_m27">Manutenzione M27: Download dati fallito</string>
<string name="alert_m28">Manutenzione M28: Timeout modalità pausa</string>
<string name="alert_m29">Manutenzione M29: Tipo di batteria non impostata</string>
<string name="alert_m30">Manutenzione M30: Tipo di cartuccia non impostata</string>
<string name="alert_e6">Errore E6: Errore meccanico</string>
<string name="alert_e7">E7 errore: Errore elettronico</string>
<string name="alert_e10">Errore E10: Errore Rewind</string>
<string name="alert_e13">Errore E13: Errore lingua</string>
<string name="alert_w31">Avviso W31: Cartuccia in esaurimento</string>
<string name="alert_w32">Avviso W32: Batteria bassa</string>
<string name="alert_w33">W33 avviso: Data/ora non valido</string>
<string name="alert_w34">W34 avviso: Fine della garanzia</string>
<string name="alert_w36">Avviso W36: TBR annullato</string>
<string name="alert_w38">Avviso W38: Bolo annullato</string>
<string name="alert_w39">Avviso W39: Avviso Loantime</string>
<string name="alert_m20">Manutenzione M20: Cartuccia non inserita</string>
<string name="alert_m21">Manutenzione M21: Cartuccia vuota</string>
<string name="alert_m22">Manutenzione M22: Batteria scarica</string>
<string name="alert_m23">Manutenzione M23: Spegnimento automatico</string>
<string name="alert_m24">Manutenzione M24: occlusione</string>
<string name="alert_m25">Manutenzione M25: Loantime sopra - fine dell\'operazione</string>
<string name="alert_m26">Manutenzione M26: Sostituzione cartuccia non completata</string>
<string name="alert_m27">Manutenzione M27: Download dati fallito</string>
<string name="alert_m28">Manutenzione M28: Timeout modalità pausa</string>
<string name="alert_m29">Manutenzione M29: Tipo di batteria non impostata</string>
<string name="alert_m30">Manutenzione M30: Tipo di cartuccia non impostata</string>
<string name="alert_e6">Errore E6: Errore meccanico</string>
<string name="alert_e7">E7 errore: Errore elettronico</string>
<string name="alert_e10">Errore E10: Errore Rewind</string>
<string name="alert_e13">Errore E13: Errore lingua</string>
</resources>

2122
app/src/main/res/values-it/strings.xml
View file

File diff suppressed because it is too large Load diff

44
app/src/main/res/values-ko/insight_alerts.xml
View file

@ -1,26 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<string name="alert_w31">경고 W31: 주사기양 낮음</string>
<string name="alert_w32">경고 W32: 배터리양 낮음</string>
<string name="alert_w33">경고 W33: 시간/날짜 유효하지 않음</string>
<string name="alert_w34">경고 W34: 보증만료</string>
<string name="alert_w36">경고 W36: 임시Basal 취소</string>
<string name="alert_w38">경고 W38: Bolus 취소</string>
<string name="alert_w39">경고 W39: Loantime 경고</string>
<string name="alert_m20">정비 M20: 주사기가 삽입되지 않았습니다.</string>
<string name="alert_m21">정비 M21: 주사기가 비었습니다.</string>
<string name="alert_m22">정비 M22: 배터리가 방전되었습니다.</string>
<string name="alert_m23">정비 M23: 자동 OFF</string>
<string name="alert_m24">정비 M24: 막힘</string>
<string name="alert_m25">정비 M25: Loantime 종료 - 작업 종료</string>
<string name="alert_m26">정비 M26: 주사기 교체가 완료되지 않았습니다.</string>
<string name="alert_m27">정비 M27: 데이터 다운로드가 실패하였습니다.</string>
<string name="alert_m28">정비 M28: 일시정지모드 시간만료</string>
<string name="alert_m29">정비 M29: 배터리 타입이 설정되지 않았습니다.</string>
<string name="alert_m30">정비 M30: 주사기 타입이 설정되지 않았습니다.</string>
<string name="alert_e6">에러 E6: 기계적 에러</string>
<string name="alert_e7">에러 E7: 전기적 에러</string>
<string name="alert_e10">에러 E10: Rewind 에러</string>
<string name="alert_e13">에러 E13: 언어 에러</string>
<string name="alert_w31">경고 W31: 주사기양 낮음</string>
<string name="alert_w32">경고 W32: 배터리양 낮음</string>
<string name="alert_w33">경고 W33: 시간/날짜 유효하지 않음</string>
<string name="alert_w34">경고 W34: 보증만료</string>
<string name="alert_w36">경고 W36: 임시Basal 취소</string>
<string name="alert_w38">경고 W38: Bolus 취소</string>
<string name="alert_w39">경고 W39: Loantime 경고</string>
<string name="alert_m20">정비 M20: 주사기가 삽입되지 않았습니다.</string>
<string name="alert_m21">정비 M21: 주사기가 비었습니다.</string>
<string name="alert_m22">정비 M22: 배터리가 방전되었습니다.</string>
<string name="alert_m23">정비 M23: 자동 OFF</string>
<string name="alert_m24">정비 M24: 막힘</string>
<string name="alert_m25">정비 M25: Loantime 종료 - 작업 종료</string>
<string name="alert_m26">정비 M26: 주사기 교체가 완료되지 않았습니다.</string>
<string name="alert_m27">정비 M27: 데이터 다운로드가 실패하였습니다.</string>
<string name="alert_m28">정비 M28: 일시정지모드 시간만료</string>
<string name="alert_m29">정비 M29: 배터리 타입이 설정되지 않았습니다.</string>
<string name="alert_m30">정비 M30: 주사기 타입이 설정되지 않았습니다.</string>
<string name="alert_e6">에러 E6: 기계적 에러</string>
<string name="alert_e7">에러 E7: 전기적 에러</string>
<string name="alert_e10">에러 E10: Rewind 에러</string>
<string name="alert_e13">에러 E13: 언어 에러</string>
</resources>

2116
app/src/main/res/values-ko/strings.xml
View file

File diff suppressed because it is too large Load diff

44
app/src/main/res/values-nl/insight_alerts.xml
View file

@ -1,26 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<string name="alert_w31">Waarschuwing W31: Cartridge bijna leeg</string>
<string name="alert_w32">Waarschuwing W32: Batterij bijna leeg</string>
<string name="alert_w33">Waarschuwing W33: Onjuiste tijd/datum</string>
<string name="alert_w34">Waarschuwing W34: Einde van garantie</string>
<string name="alert_w36">Waarschuwing W36: TBR geannuleerd</string>
<string name="alert_w38">Waarschuwing W38: Bolus geannuleerd</string>
<string name="alert_w39">Waarschuwing W39: Leentijd waarschuwing</string>
<string name="alert_m20">Onderhoud M20: Cartridge niet geplaatst</string>
<string name="alert_m21">Onderhoud M21: Cartridge leeg</string>
<string name="alert_m22">Onderhoud M22: Batterij leeg</string>
<string name="alert_m23">Onderhoud M23: Automatisch uit</string>
<string name="alert_m24">Onderhoud M24: Verstopping</string>
<string name="alert_m25">Onderhoud M25: Leentijd verstreken - werking geëindigd</string>
<string name="alert_m26">Onderhoud M26: Cartridge verwisselen niet afgerond</string>
<string name="alert_m27">Onderhoud M27: Data download mislukt</string>
<string name="alert_m28">Onderhoud M28: Pauze modus timeout</string>
<string name="alert_m29">Onderhoud M29: Batterij type niet ingesteld</string>
<string name="alert_m30">Onderhoud M30: Cartridge type niet ingesteld</string>
<string name="alert_e6">Fout E6: Mechanische fout</string>
<string name="alert_e7">Fout E7: Elektronische fout</string>
<string name="alert_e10">Fout E10: Terugdraaien fout</string>
<string name="alert_e13">Fout E13: Taal fout</string>
<string name="alert_w31">Waarschuwing W31: Cartridge bijna leeg</string>
<string name="alert_w32">Waarschuwing W32: Batterij bijna leeg</string>
<string name="alert_w33">Waarschuwing W33: Onjuiste tijd/datum</string>
<string name="alert_w34">Waarschuwing W34: Einde van garantie</string>
<string name="alert_w36">Waarschuwing W36: TBR geannuleerd</string>
<string name="alert_w38">Waarschuwing W38: Bolus geannuleerd</string>
<string name="alert_w39">Waarschuwing W39: Leentijd waarschuwing</string>
<string name="alert_m20">Onderhoud M20: Cartridge niet geplaatst</string>
<string name="alert_m21">Onderhoud M21: Cartridge leeg</string>
<string name="alert_m22">Onderhoud M22: Batterij leeg</string>
<string name="alert_m23">Onderhoud M23: Automatisch uit</string>
<string name="alert_m24">Onderhoud M24: Verstopping</string>
<string name="alert_m25">Onderhoud M25: Leentijd verstreken - werking geëindigd</string>
<string name="alert_m26">Onderhoud M26: Cartridge verwisselen niet afgerond</string>
<string name="alert_m27">Onderhoud M27: Data download mislukt</string>
<string name="alert_m28">Onderhoud M28: Pauze modus timeout</string>
<string name="alert_m29">Onderhoud M29: Batterij type niet ingesteld</string>
<string name="alert_m30">Onderhoud M30: Cartridge type niet ingesteld</string>
<string name="alert_e6">Fout E6: Mechanische fout</string>
<string name="alert_e7">Fout E7: Elektronische fout</string>
<string name="alert_e10">Fout E10: Terugdraaien fout</string>
<string name="alert_e13">Fout E13: Taal fout</string>
</resources>

2126
app/src/main/res/values-nl/strings.xml
View file

File diff suppressed because it is too large Load diff

44
app/src/main/res/values-pl/insight_alerts.xml
View file

@ -1,26 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<string name="alert_w31">Ostrzeżenie W31: Niski poziom insuliny</string>
<string name="alert_w32">Ostrzeżenie W32: Niski stan baterii</string>
<string name="alert_w33">Ostrzeżenie W33: Nieprawidłowa godzina/data</string>
<string name="alert_w34">Ostrzeżenie W34: Koniec gwarancji</string>
<string name="alert_w36">Ostrzeżenie W36: Anulowana baza tymczasowa [TBR]</string>
<string name="alert_w38">Ostrzeżenie W38: Bolus anulowany</string>
<string name="alert_w39">Ostrzeżenie W39: ostrzeżenie o użyczonym/przyznanym czasie</string>
<string name="alert_m20">Konserwacja M20: Brak pojemnika na isulinę</string>
<string name="alert_m21">Konserwacja M21: Pusty zbiornik na insulinę</string>
<string name="alert_m22">Konserwacja M22: Koniec baterii</string>
<string name="alert_m23">Konserwacja M23: Wyłącz automatycznie</string>
<string name="alert_m24">Konserwacja M24: Niedrożność</string>
<string name="alert_m25">Obsługa M25: koniec użyczonego czasu - koniec działania</string>
<string name="alert_m26">Konserwacja M26: Nie zakończono wymiany zbiornika</string>
<string name="alert_m27">Konserwacja M27: Błąd pobierania danych</string>
<string name="alert_m28">Obsługa M28: koniec czasu trybu pauza</string>
<string name="alert_m29">Konserwacja M29: Nie wybrano rodzaju baterii</string>
<string name="alert_m30">Konserwacja M30: Nie ustawiono rodzaju pojemnika</string>
<string name="alert_e6">Błąd E6: Usterka mechaniczna</string>
<string name="alert_e7">Błąd E7: Usterka elektroniczna</string>
<string name="alert_e10">Błąd E10: Usterka przewijania</string>
<string name="alert_e13">Błąd E6: Błąd języka</string>
<string name="alert_w31">Ostrzeżenie W31: Niski poziom insuliny</string>
<string name="alert_w32">Ostrzeżenie W32: Niski stan baterii</string>
<string name="alert_w33">Ostrzeżenie W33: Nieprawidłowa godzina/data</string>
<string name="alert_w34">Ostrzeżenie W34: Koniec gwarancji</string>
<string name="alert_w36">Ostrzeżenie W36: Anulowana baza tymczasowa [TBR]</string>
<string name="alert_w38">Ostrzeżenie W38: Bolus anulowany</string>
<string name="alert_w39">Ostrzeżenie W39: ostrzeżenie o użyczonym/przyznanym czasie</string>
<string name="alert_m20">Konserwacja M20: Brak pojemnika na isulinę</string>
<string name="alert_m21">Konserwacja M21: Pusty zbiornik na insulinę</string>
<string name="alert_m22">Konserwacja M22: Koniec baterii</string>
<string name="alert_m23">Konserwacja M23: Wyłącz automatycznie</string>
<string name="alert_m24">Konserwacja M24: Niedrożność</string>
<string name="alert_m25">Obsługa M25: koniec użyczonego czasu - koniec działania</string>
<string name="alert_m26">Konserwacja M26: Nie zakończono wymiany zbiornika</string>
<string name="alert_m27">Konserwacja M27: Błąd pobierania danych</string>
<string name="alert_m28">Obsługa M28: koniec czasu trybu pauza</string>
<string name="alert_m29">Konserwacja M29: Nie wybrano rodzaju baterii</string>
<string name="alert_m30">Konserwacja M30: Nie ustawiono rodzaju pojemnika</string>
<string name="alert_e6">Błąd E6: Usterka mechaniczna</string>
<string name="alert_e7">Błąd E7: Usterka elektroniczna</string>
<string name="alert_e10">Błąd E10: Usterka przewijania</string>
<string name="alert_e13">Błąd E6: Błąd języka</string>
</resources>

2143
app/src/main/res/values-pl/strings.xml
View file

File diff suppressed because it is too large Load diff

44
app/src/main/res/values-pt/insight_alerts.xml
View file

@ -1,26 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<string name="alert_w31">Alerta W31: Cartucho com pouca insulina</string>
<string name="alert_w32">Aviso W32: Bateria baixa</string>
<string name="alert_w33">Aviso W33: Data/hora inválida</string>
<string name="alert_w34">Aviso W34: Fim da garantia</string>
<string name="alert_w36">W36 aviso: DTB cancelada</string>
<string name="alert_w38">Aviso W38: Bolus cancelado</string>
<string name="alert_w39">Alerta W39: Alerta Tempo de Empréstimo</string>
<string name="alert_m20">Manutenção M20: Cartucho não inserido</string>
<string name="alert_m21">Manutenção M21: Cartucho vazio</string>
<string name="alert_m22">Manutenção M22: Bateria vazia</string>
<string name="alert_m23">Manutenção M23: Desligar automático</string>
<string name="alert_m24">Manutenção M24: Oclusão</string>
<string name="alert_m25">Manutenção M25: Tempo de empréstimo expirado - operação finalizada</string>
<string name="alert_m26">Manutenção M26: Mudança de cartucho não concluída</string>
<string name="alert_m27">Manutenção M27: Transferência de dados falhada</string>
<string name="alert_m28">Manutenção M28: Tempo pausa expirado</string>
<string name="alert_m29">Manutenção M29: Tipo de bateria não definido</string>
<string name="alert_m30">Manutenção M30: Tipo de cartucho não definido</string>
<string name="alert_e6">E6 de erro: Erro mecânico</string>
<string name="alert_e7">E7 de erro: Erro electrónico</string>
<string name="alert_e10">Erro E10: Erro a recuar embolo</string>
<string name="alert_e13">E13 de erro: Erro de idioma</string>
<string name="alert_w31">Alerta W31: Cartucho com pouca insulina</string>
<string name="alert_w32">Aviso W32: Bateria baixa</string>
<string name="alert_w33">Aviso W33: Data/hora inválida</string>
<string name="alert_w34">Aviso W34: Fim da garantia</string>
<string name="alert_w36">W36 aviso: DTB cancelada</string>
<string name="alert_w38">Aviso W38: Bolus cancelado</string>
<string name="alert_w39">Alerta W39: Alerta Tempo de Empréstimo</string>
<string name="alert_m20">Manutenção M20: Cartucho não inserido</string>
<string name="alert_m21">Manutenção M21: Cartucho vazio</string>
<string name="alert_m22">Manutenção M22: Bateria vazia</string>
<string name="alert_m23">Manutenção M23: Desligar automático</string>
<string name="alert_m24">Manutenção M24: Oclusão</string>
<string name="alert_m25">Manutenção M25: Tempo de empréstimo expirado - operação finalizada</string>
<string name="alert_m26">Manutenção M26: Mudança de cartucho não concluída</string>
<string name="alert_m27">Manutenção M27: Transferência de dados falhada</string>
<string name="alert_m28">Manutenção M28: Tempo pausa expirado</string>
<string name="alert_m29">Manutenção M29: Tipo de bateria não definido</string>
<string name="alert_m30">Manutenção M30: Tipo de cartucho não definido</string>
<string name="alert_e6">E6 de erro: Erro mecânico</string>
<string name="alert_e7">E7 de erro: Erro electrónico</string>
<string name="alert_e10">Erro E10: Erro a recuar embolo</string>
<string name="alert_e13">E13 de erro: Erro de idioma</string>
</resources>

2120
app/src/main/res/values-pt/strings.xml
View file

File diff suppressed because it is too large Load diff

44
app/src/main/res/values-ro/insight_alerts.xml
View file

@ -1,26 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<string name="alert_w31">Atenționarea W31: rezervor pe terminate</string>
<string name="alert_w32">Atenționarea W32: baterie pe terminate</string>
<string name="alert_w33">Atenționarea W33: Timp/dată invalide</string>
<string name="alert_w34">Atenționarea W34: Sfârșitul perioadei de garanție</string>
<string name="alert_w36">Atenționarea W36: RBT anulată</string>
<string name="alert_w38">Atenționarea W38: Bolus anulat</string>
<string name="alert_w39">Atenționarea W39: Atenționare perioadă de închiriere</string>
<string name="alert_m20">Mentenanță M20: Rezervor neinserat</string>
<string name="alert_m21">Mentenanță M21: Rezervor gol</string>
<string name="alert_m22">Mentenanță M22: Baterie terminată</string>
<string name="alert_m23">Mentenanță M23: Oprire automată</string>
<string name="alert_m24">Mentenanță M24: Ocluzie</string>
<string name="alert_m25">Mentenanță M25: Perioadă de închiriere terminată - sfârșitul operării</string>
<string name="alert_m26">Mentenanță M26: Schimbarea rezervorului este incompletă</string>
<string name="alert_m27">Mentenanță M27: Descărcarea datelor a eșuat</string>
<string name="alert_m28">Mentenanță M28: Sfârșitul modului de pauză</string>
<string name="alert_m29">Mentenanță M29: Tipul de baterie nu este configurat</string>
<string name="alert_m30">Mentenanță M30: Tipul de rezervor nu este configurat</string>
<string name="alert_e6">Eroarea E6: Eroare mecanică</string>
<string name="alert_e7">Eroarea E7: Eroare de electronică</string>
<string name="alert_e10">Eroarea E10: Eroare de derulare</string>
<string name="alert_e13">Eroarea E13: Eroare de limbaj</string>
<string name="alert_w31">Atenționarea W31: rezervor pe terminate</string>
<string name="alert_w32">Atenționarea W32: baterie pe terminate</string>
<string name="alert_w33">Atenționarea W33: Timp/dată invalide</string>
<string name="alert_w34">Atenționarea W34: Sfârșitul perioadei de garanție</string>
<string name="alert_w36">Atenționarea W36: RBT anulată</string>
<string name="alert_w38">Atenționarea W38: Bolus anulat</string>
<string name="alert_w39">Atenționarea W39: Atenționare perioadă de închiriere</string>
<string name="alert_m20">Mentenanță M20: Rezervor neinserat</string>
<string name="alert_m21">Mentenanță M21: Rezervor gol</string>
<string name="alert_m22">Mentenanță M22: Baterie terminată</string>
<string name="alert_m23">Mentenanță M23: Oprire automată</string>
<string name="alert_m24">Mentenanță M24: Ocluzie</string>
<string name="alert_m25">Mentenanță M25: Perioadă de închiriere terminată - sfârșitul operării</string>
<string name="alert_m26">Mentenanță M26: Schimbarea rezervorului este incompletă</string>
<string name="alert_m27">Mentenanță M27: Descărcarea datelor a eșuat</string>
<string name="alert_m28">Mentenanță M28: Sfârșitul modului de pauză</string>
<string name="alert_m29">Mentenanță M29: Tipul de baterie nu este configurat</string>
<string name="alert_m30">Mentenanță M30: Tipul de rezervor nu este configurat</string>
<string name="alert_e6">Eroarea E6: Eroare mecanică</string>
<string name="alert_e7">Eroarea E7: Eroare de electronică</string>
<string name="alert_e10">Eroarea E10: Eroare de derulare</string>
<string name="alert_e13">Eroarea E13: Eroare de limbaj</string>
</resources>

2132
app/src/main/res/values-ro/strings.xml
View file

File diff suppressed because it is too large Load diff

44
app/src/main/res/values-ru/insight_alerts.xml
View file

@ -1,26 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<string name="alert_w31">Предупреждение W31: Картридж заканчивается</string>
<string name="alert_w32">Предупреждение W32: Низкий заряд батареи</string>
<string name="alert_w33">Предупреждение W33: Недопустимое время/Дата</string>
<string name="alert_w34">Предупреждение W34: Окончание гарантии</string>
<string name="alert_w36">W36 предупреждение: временный базал TBR отменен</string>
<string name="alert_w38">Предупреждение W38: Болюс отменен</string>
<string name="alert_w39">Предупреждение W39: окончание заемного периода</string>
<string name="alert_m20">Техническое обслуживание M20: Картридж не вставлен</string>
<string name="alert_m21">Техническое обслуживание M21: Картридж пуст</string>
<string name="alert_m22">Техническое обслуживание M22: Батарея разряжена</string>
<string name="alert_m23">Техническое обслуживание: M23: Автоматическое выключение</string>
<string name="alert_m24">Техническое обслуживание M24: закупорка</string>
<string name="alert_m25">Техническое обслуживание M25: Конец заемного периода - конец операции</string>
<string name="alert_m26">Техническое обслуживание M26: Замена картриджа не завершена</string>
<string name="alert_m27">Техническое обслуживание M27: Ошибка загрузки данных</string>
<string name="alert_m28">Техническое обслуживание M28: Тайм-аут режима паузы</string>
<string name="alert_m29">Техническое обслуживание M29: Тип батареи не задан</string>
<string name="alert_m30">Техническое обслуживание M30: Тип картриджа не задан</string>
<string name="alert_e6">Ошибка E6: Механическая ошибка</string>
<string name="alert_e7">Ошибка E7: Ошибка электроники</string>
<string name="alert_e10">Ошибка Е10: Ошибка возврата</string>
<string name="alert_e13">Ошибка E13: Ошибка языка</string>
<string name="alert_w31">Предупреждение W31: Картридж заканчивается</string>
<string name="alert_w32">Предупреждение W32: Низкий заряд батареи</string>
<string name="alert_w33">Предупреждение W33: Недопустимое время/Дата</string>
<string name="alert_w34">Предупреждение W34: Окончание гарантии</string>
<string name="alert_w36">W36 предупреждение: временный базал TBR отменен</string>
<string name="alert_w38">Предупреждение W38: Болюс отменен</string>
<string name="alert_w39">Предупреждение W39: окончание заемного периода</string>
<string name="alert_m20">Техническое обслуживание M20: Картридж не вставлен</string>
<string name="alert_m21">Техническое обслуживание M21: Картридж пуст</string>
<string name="alert_m22">Техническое обслуживание M22: Батарея разряжена</string>
<string name="alert_m23">Техническое обслуживание: M23: Автоматическое выключение</string>
<string name="alert_m24">Техническое обслуживание M24: закупорка</string>
<string name="alert_m25">Техническое обслуживание M25: Конец заемного периода - конец операции</string>
<string name="alert_m26">Техническое обслуживание M26: Замена картриджа не завершена</string>
<string name="alert_m27">Техническое обслуживание M27: Ошибка загрузки данных</string>
<string name="alert_m28">Техническое обслуживание M28: Тайм-аут режима паузы</string>
<string name="alert_m29">Техническое обслуживание M29: Тип батареи не задан</string>
<string name="alert_m30">Техническое обслуживание M30: Тип картриджа не задан</string>
<string name="alert_e6">Ошибка E6: Механическая ошибка</string>
<string name="alert_e7">Ошибка E7: Ошибка электроники</string>
<string name="alert_e10">Ошибка Е10: Ошибка возврата</string>
<string name="alert_e13">Ошибка E13: Ошибка языка</string>
</resources>

2105
app/src/main/res/values-ru/strings.xml
View file

File diff suppressed because it is too large Load diff

44
app/src/main/res/values-sk/insight_alerts.xml
View file

@ -1,26 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<string name="alert_w31">Upozornenie W31: Zásobník takmer prázdny</string>
<string name="alert_w32">Upozornenie W32: Batéria takmer vybitá</string>
<string name="alert_w33">Upozornenie W33: Neplatný čas/dátum</string>
<string name="alert_w34">Upozornenie W34: Koniec záruky</string>
<string name="alert_w36">Upozornenie W36: Dočasný bazál zrušený</string>
<string name="alert_w38">Upozornenie W38: Bolus zrušený</string>
<string name="alert_w39">Upozornenie W39: Upozornenie na dobu zapožičania</string>
<string name="alert_m20">Údržba M20: Nie je vložený zásobník</string>
<string name="alert_m21">Údržba M21: Prázdny zásobník</string>
<string name="alert_m22">Údržba M22: Vybitá batéria</string>
<string name="alert_m23">Údržba M23: Automatické vypnutie</string>
<string name="alert_m24">Údržba M24: Oklúzia</string>
<string name="alert_m25">Údržba M25: Doba zapožičania uplynula - koniec prevádzky</string>
<string name="alert_m26">Údržba M26: Výmena zásobníka nedokončená</string>
<string name="alert_m27">Údržba M27: Sťahovanie sa nepodarilo</string>
<string name="alert_m28">Údržba M28: Časový limit režimu pauza</string>
<string name="alert_m29">Údržba M29: Nenastavený typ batérie</string>
<string name="alert_m30">Údržba M30: Nenastavený typ zásobníka</string>
<string name="alert_e6">Chyba E6: Mechanická chyba</string>
<string name="alert_e7">Chyba E7: Elektronická chyba</string>
<string name="alert_e10">Chyba E10: Chyba previnutia</string>
<string name="alert_e13">Chyba E13: Chyba jazyka</string>
<string name="alert_w31">Upozornenie W31: Zásobník takmer prázdny</string>
<string name="alert_w32">Upozornenie W32: Batéria takmer vybitá</string>
<string name="alert_w33">Upozornenie W33: Neplatný čas/dátum</string>
<string name="alert_w34">Upozornenie W34: Koniec záruky</string>
<string name="alert_w36">Upozornenie W36: Dočasný bazál zrušený</string>
<string name="alert_w38">Upozornenie W38: Bolus zrušený</string>
<string name="alert_w39">Upozornenie W39: Upozornenie na dobu zapožičania</string>
<string name="alert_m20">Údržba M20: Nie je vložený zásobník</string>
<string name="alert_m21">Údržba M21: Prázdny zásobník</string>
<string name="alert_m22">Údržba M22: Vybitá batéria</string>
<string name="alert_m23">Údržba M23: Automatické vypnutie</string>
<string name="alert_m24">Údržba M24: Oklúzia</string>
<string name="alert_m25">Údržba M25: Doba zapožičania uplynula - koniec prevádzky</string>
<string name="alert_m26">Údržba M26: Výmena zásobníka nedokončená</string>
<string name="alert_m27">Údržba M27: Sťahovanie sa nepodarilo</string>
<string name="alert_m28">Údržba M28: Časový limit režimu pauza</string>
<string name="alert_m29">Údržba M29: Nenastavený typ batérie</string>
<string name="alert_m30">Údržba M30: Nenastavený typ zásobníka</string>
<string name="alert_e6">Chyba E6: Mechanická chyba</string>
<string name="alert_e7">Chyba E7: Elektronická chyba</string>
<string name="alert_e10">Chyba E10: Chyba previnutia</string>
<string name="alert_e13">Chyba E13: Chyba jazyka</string>
</resources>

2138
app/src/main/res/values-sk/strings.xml
View file

File diff suppressed because it is too large Load diff

44
app/src/main/res/values-sv/insight_alerts.xml
View file

@ -1,26 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<string name="alert_w31">Varning W31: Reservoarnivå låg</string>
<string name="alert_w32">Varning W32: Batterinivå låg</string>
<string name="alert_w33">Varning W33: Ogiltig tid/datum</string>
<string name="alert_w34">Varning W34: Garantiperioden har upphört</string>
<string name="alert_w36">Varning W36: Tempbasal avbruten</string>
<string name="alert_w38">Varning W38: Bolus avbruten</string>
<string name="alert_w39">Varning W39: Låneperioden upphör snart</string>
<string name="alert_m20">Underhåll M20: Reservoar inte monterad</string>
<string name="alert_m21">Underhåll M21: Reservoar tom</string>
<string name="alert_m22">Underhåll M22: Batteri tomt</string>
<string name="alert_m23">Underhåll M23: Automatisk avstängning</string>
<string name="alert_m24">Underhåll M24: Ocklusion</string>
<string name="alert_m25">Underhåll M25: Låneperioden över. Stänger av pumpen</string>
<string name="alert_m26">Underhåll M26: Reservoarbyte ej slutfört</string>
<string name="alert_m27">Underhåll M27: Datanedladdning misslyckades</string>
<string name="alert_m28">Underhåll M28: Pausläge timeout</string>
<string name="alert_m29">Underhåll M29: Batterityp inte inställd</string>
<string name="alert_m30">Underhåll M30: Reservoartyp inte inställd</string>
<string name="alert_e6">Fel E6: Mekaniskt fel</string>
<string name="alert_e7">Fel E7: Elektroniskt fel</string>
<string name="alert_e10">Felet E10: Återställningsfel</string>
<string name="alert_e13">Fel E13: Språkfel</string>
<string name="alert_w31">Varning W31: Reservoarnivå låg</string>
<string name="alert_w32">Varning W32: Batterinivå låg</string>
<string name="alert_w33">Varning W33: Ogiltig tid/datum</string>
<string name="alert_w34">Varning W34: Garantiperioden har upphört</string>
<string name="alert_w36">Varning W36: Tempbasal avbruten</string>
<string name="alert_w38">Varning W38: Bolus avbruten</string>
<string name="alert_w39">Varning W39: Låneperioden upphör snart</string>
<string name="alert_m20">Underhåll M20: Reservoar inte monterad</string>
<string name="alert_m21">Underhåll M21: Reservoar tom</string>
<string name="alert_m22">Underhåll M22: Batteri tomt</string>
<string name="alert_m23">Underhåll M23: Automatisk avstängning</string>
<string name="alert_m24">Underhåll M24: Ocklusion</string>
<string name="alert_m25">Underhåll M25: Låneperioden över. Stänger av pumpen</string>
<string name="alert_m26">Underhåll M26: Reservoarbyte ej slutfört</string>
<string name="alert_m27">Underhåll M27: Datanedladdning misslyckades</string>
<string name="alert_m28">Underhåll M28: Pausläge timeout</string>
<string name="alert_m29">Underhåll M29: Batterityp inte inställd</string>
<string name="alert_m30">Underhåll M30: Reservoartyp inte inställd</string>
<string name="alert_e6">Fel E6: Mekaniskt fel</string>
<string name="alert_e7">Fel E7: Elektroniskt fel</string>
<string name="alert_e10">Felet E10: Återställningsfel</string>
<string name="alert_e13">Fel E13: Språkfel</string>
</resources>

2130
app/src/main/res/values-sv/strings.xml
View file

File diff suppressed because it is too large Load diff

25
app/src/main/res/values-tr/insight_alerts.xml
View file

@ -1,3 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources></resources>
<resources>
<string name="alert_w31">Uyarı W31: Kartuş düşük</string>
<string name="alert_w32">Uyarı W32: Pil bitmek üzere</string>
<string name="alert_w33">Uyarı W33: Geçersiz saat/tarih</string>
<string name="alert_w34">Garanti süresi doldu</string>
<string name="alert_w36">Uyarı W36: Geçici bazal iptal edildi</string>
<string name="alert_w38">Uyarı W38: Bolus iptal edildi</string>
<string name="alert_w39">Uyarı W39: Kiralama süresi uyarısı</string>
<string name="alert_m20">Bakım M20: Kartuş takılı değil</string>
<string name="alert_m21">Bakım M21: Kartuş boş</string>
<string name="alert_m22">Bakım M22: Pil boş</string>
<string name="alert_m23">Bakım M23: Otomatik kapalı</string>
<string name="alert_m24">Bakım M24: Tıkanıklık</string>
<string name="alert_m25">Bakım M25: Kiralama süresi doldu</string>
<string name="alert_m26">Bakım M26: Kartuş değişimi tamamlanamadı</string>
<string name="alert_m27">Bakım M27: Veri yükleme başarısız</string>
<string name="alert_m28">Bakım M28: Duraklat modunda zaman aşımı</string>
<string name="alert_m29">Bakım M29: Pil türü seçili değil</string>
<string name="alert_m30">Bakım M30: Kartuş türü ayarlı değil</string>
<string name="alert_e6">Hata E6: Mekanik hata</string>
<string name="alert_e7">Hata E7: Elektronik hata</string>
<string name="alert_e10">Hata E10: Geri sarma hata</string>
<string name="alert_e13">Hata E13: Dil ekranında hata</string>
</resources>

1069
app/src/main/res/values-tr/strings.xml
View file

File diff suppressed because it is too large Load diff

44
app/src/main/res/values-zh/insight_alerts.xml
View file

@ -1,26 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<string name="alert_w31">警告 W31：储药器药量低</string>
<string name="alert_w32">警告 W32：电池电量低</string>
<string name="alert_w33">警告 W33：不合规的时间/日期</string>
<string name="alert_w34">警告 W34：保修期结束</string>
<string name="alert_w36">警告 W36：临时基础率被取消了</string>
<string name="alert_w38">警告 W38：大剂量被取消了</string>
<string name="alert_w39">警告 W39：Loantime 警告</string>
<string name="alert_m20">维护 M10：储药器没有插入</string>
<string name="alert_m21">维护 M21：储药器空了</string>
<string name="alert_m22">维护 M22：电池没有插入</string>
<string name="alert_m23">维护 M23：自动关机</string>
<string name="alert_m24">维护 M24：堵管</string>
<string name="alert_m25">维护 M25：Loantime结束，操作结束</string>
<string name="alert_m26">维护 M26：储药器更换没有完成</string>
<string name="alert_m27">维护 M27：数据下载失败</string>
<string name="alert_m28">维护 M28：暂停模式超时</string>
<string name="alert_m29">维护 M29：电池类型没有设置</string>
<string name="alert_m30">维护 M30：储药器类型没有设置</string>
<string name="alert_e6">错误 E6：机械错误</string>
<string name="alert_e7">错误 E7：电子错误</string>
<string name="alert_e10">错误 E10：复位错误</string>
<string name="alert_e13">错误 E13：语言错误</string>
<string name="alert_w31">警告 W31：储药器药量低</string>
<string name="alert_w32">警告 W32：电池电量低</string>
<string name="alert_w33">警告 W33：不合规的时间/日期</string>
<string name="alert_w34">警告 W34：保修期结束</string>
<string name="alert_w36">警告 W36：临时基础率被取消了</string>
<string name="alert_w38">警告 W38：大剂量被取消了</string>
<string name="alert_w39">警告 W39：Loantime 警告</string>
<string name="alert_m20">维护 M10：储药器没有插入</string>
<string name="alert_m21">维护 M21：储药器空了</string>
<string name="alert_m22">维护 M22：电池没有插入</string>
<string name="alert_m23">维护 M23：自动关机</string>
<string name="alert_m24">维护 M24：堵管</string>
<string name="alert_m25">维护 M25：Loantime结束，操作结束</string>
<string name="alert_m26">维护 M26：储药器更换没有完成</string>
<string name="alert_m27">维护 M27：数据下载失败</string>
<string name="alert_m28">维护 M28：暂停模式超时</string>
<string name="alert_m29">维护 M29：电池类型没有设置</string>
<string name="alert_m30">维护 M30：储药器类型没有设置</string>
<string name="alert_e6">错误 E6：机械错误</string>
<string name="alert_e7">错误 E7：电子错误</string>
<string name="alert_e10">错误 E10：复位错误</string>
<string name="alert_e13">错误 E13：语言错误</string>
</resources>

2114
app/src/main/res/values-zh/strings.xml
View file

File diff suppressed because it is too large Load diff

2
app/src/main/res/values/arrays.xml
View file

@ -29,6 +29,7 @@
<item>@string/sk_lang</item>
<item>@string/sv_lang</item>
<item>@string/pl_lang</item>
<item>@string/tr_lang</item>
<item>@string/zh_lang</item>
</string-array>
<string-array name="languagesValues" translatable="false">
@ -50,6 +51,7 @@
<item>sk</item>
<item>sv</item>
<item>pl</item>
<item>tr</item>
<item>zh</item>
</string-array>

8
app/src/main/res/values/strings.xml
View file

@ -248,6 +248,7 @@
<string name="sv_lang" translatable="false">Swedish</string>
<string name="fr_lang" translatable="false">French</string>
<string name="zh_lang" translatable="false">Chinese</string>
<string name="tr_lang" translatable="false">Turkish</string>
<string name="pl_lang" translatable="false">Polish</string>
<string name="openapsma_maxbasal_title">Max U/hr a Temp Basal can be set to</string>
<string name="openapsma_maxbasal_summary">This value is called max basal in OpenAPS context</string>
@ -584,6 +585,7 @@
<string name="disconnectpumpfor2h">Disconnect pump for 2 h</string>
<string name="disconnectpumpfor3h">Disconnect pump for 3 h</string>
<string name="resume">Resume</string>
<string name="reconnect">Reconnect Pump</string>
<string name="smscommunicator_wrongduration">Wrong duration</string>
<string name="smscommunicator_loopsuspended">Loop suspended</string>
<string name="smscommunicator_loopresumed">Loop resumed</string>
@ -610,6 +612,7 @@
<string name="danar_bluetooth_status">Bluetooth status</string>
<string name="nav_about">About</string>
<string name="smscommunicator_missingsmspermission">Missing SMS permission</string>
<string name="smscommunicator_missingphonestatepermission">Missing phone state permission</string>
<string name="xdripstatus_settings">xDrip Status (watch)</string>
<string name="xdripstatus">xDrip Statusline (watch)</string>
<string name="xdripstatus_shortname">xds</string>
@ -1211,6 +1214,11 @@
<string name="key_short_tabtitles" translatable="false">short_tabtitles</string>
<string name="pairfirst">Please pair your pump with your phone!</string>
<string name="profile_total">== ∑ %1$s U</string>
<string name="profile_ins_units_per_hout">U/h</string>
<string name="profile_carbs_per_unit">g/U</string>
<string name="profile_per_unit">/U</string>
<plurals name="objective_days">
<item quantity="one">%1$d day</item>
<item quantity="other">%1$d days</item>

4
app/src/main/res/xml/automotive_app_desc.xml Normal file
View file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<automotiveApp>
<uses name="notification" />
</automotiveApp>

3
app/src/test/java/info/AAPSMocker.java
View file

@ -101,6 +101,9 @@ public class AAPSMocker {
when(MainApp.gs(R.string.careportal_profileswitch)).thenReturn("Profile Switch");
when(MainApp.gs(R.string.configbuilder_insulin)).thenReturn("Insulin");
when(MainApp.gs(R.string.bolusdelivering)).thenReturn("Delivering 0.0U");
when(MainApp.gs(R.string.profile_per_unit)).thenReturn("/U");
when(MainApp.gs(R.string.profile_carbs_per_unit)).thenReturn("g/U");
when(MainApp.gs(R.string.profile_ins_units_per_hout)).thenReturn("U/h");
}
public static MainApp mockMainApp() {

1
app/src/test/java/info/nightscout/MainAppTest.java
View file

@ -117,6 +117,7 @@ public class MainAppTest {
@Test
public void isEngineeringModeOrReleaseTest() {
mainApp.devBranch = true;
Assert.assertEquals(!Config.APS, mainApp.isEngineeringModeOrRelease());
}

7
app/src/test/java/info/nightscout/utils/PercentageSplitterTest.java
View file

@ -19,7 +19,12 @@ public class PercentageSplitterTest {
}
@Test
public void pureNameTestPercentageAndShift() {
public void pureNameTestPercentageAndPositiveTimeShift() {
assertEquals("Fiasp", PercentageSplitter.pureName("Fiasp (101%,2h)"));
}
@Test
public void pureNameTestPercentageAndNegtiveTimeShift() {
assertEquals("Fiasp", PercentageSplitter.pureName("Fiasp (50%,-2h)"));
}
}