From 80edd065b64d442ff3834a92d5cdd2e7b51144cd Mon Sep 17 00:00:00 2001 From: BobIsMyManager Date: Fri, 8 Apr 2022 00:02:31 +0200 Subject: [PATCH 01/12] Switch to matrix.to So the url should work with all supported clients --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a264f89d8..76fe04b61 100644 --- a/README.md +++ b/README.md @@ -143,7 +143,7 @@ Translations can be contributed via https://hosted.weblate.org/projects/freeyour ## Community If you would like to get in touch with other Gadgetbridge users and developers outside of Codeberg, you can do so via: -* Matrix: `#gadgetbridge:matrix.org` ([web access via Element.io](https://app.element.io/#/room/#gadgetbridge:matrix.org)) +* Matrix: [`#gadgetbridge:matrix.org`](https://matrix.to/#/#gadgetbridge:matrix.org) ## Do you have further questions or feedback? From 9ab9186e58e5235cd396f918ece998c03cf4b723 Mon Sep 17 00:00:00 2001 From: Daniel Dakhno Date: Fri, 15 Apr 2022 01:21:26 +0200 Subject: [PATCH 02/12] UM25: added reset option to current accumulation --- .../gadgetbridge/devices/um25/Activity/DataActivity.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/um25/Activity/DataActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/um25/Activity/DataActivity.java index 485398cdf..2f0a11f62 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/um25/Activity/DataActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/um25/Activity/DataActivity.java @@ -56,6 +56,7 @@ public class DataActivity extends AbstractGBActivity { chargeDurationTextView = findViewById(R.id.um25_text_charge_duration); TextView wattHoursTextView = findViewById(R.id.um25_text_wattage_sum); + TextView currentAccumulatedTextView = findViewById(R.id.um25_text_current_sum); View.OnLongClickListener longClickListener = new View.OnLongClickListener() { @Override @@ -70,6 +71,7 @@ public class DataActivity extends AbstractGBActivity { chargeDurationTextView.setOnLongClickListener(longClickListener); wattHoursTextView.setOnLongClickListener(longClickListener); + currentAccumulatedTextView.setOnLongClickListener(longClickListener); } @Override From bba5452f571dd188eeec587440038999cdf13924 Mon Sep 17 00:00:00 2001 From: Daniel Dakhno Date: Fri, 15 Apr 2022 01:27:00 +0200 Subject: [PATCH 03/12] QC35: fixed typo --- app/src/main/res/xml/devicesettings_qc35.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/xml/devicesettings_qc35.xml b/app/src/main/res/xml/devicesettings_qc35.xml index 4d1899c10..e220130f8 100644 --- a/app/src/main/res/xml/devicesettings_qc35.xml +++ b/app/src/main/res/xml/devicesettings_qc35.xml @@ -2,7 +2,7 @@ From bf4e948c3578da2731eaaf47b86771f34e74f12a Mon Sep 17 00:00:00 2001 From: Daniel Dakhno Date: Fri, 15 Apr 2022 02:08:51 +0200 Subject: [PATCH 04/12] UM25: added notification on below current threshold --- .../DeviceSettingsPreferenceConst.java | 3 + .../DeviceSpecificSettingsFragment.java | 3 + .../um25/Coordinator/UM25Coordinator.java | 8 +++ .../devices/um25/Support/UM25Support.java | 71 ++++++++++++++++++- app/src/main/res/xml/devicesettings_um25.xml | 11 +++ 5 files changed, 94 insertions(+), 2 deletions(-) create mode 100644 app/src/main/res/xml/devicesettings_um25.xml diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java index 2903eb033..7e461dfd1 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java @@ -178,6 +178,9 @@ public class DeviceSettingsPreferenceConst { public static final String PREFS_ACTIVITY_IN_DEVICE_CARD_DISTANCE = "prefs_activity_in_device_card_distance"; public static final String PREFS_DEVICE_CHARTS_TABS = "charts_tabs"; + public static final String PREF_UM25_SHOW_THRESHOLD_NOTIFICATION = "um25_current_threshold_notify"; + public static final String PREF_UM25_SHOW_THRESHOLD = "um25_current_threshold"; + public static final String PREF_SOUNDS = "sounds"; public static final String PREF_AUTH_KEY = "authkey"; public static final String PREF_USER_FITNESS_GOAL = "fitness_goal"; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java index 373e03aee..260a64ea8 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java @@ -456,6 +456,9 @@ public class DeviceSpecificSettingsFragment extends PreferenceFragmentCompat imp addPreferenceHandlerFor(PREF_QC35_NOISE_CANCELLING_LEVEL); addPreferenceHandlerFor(PREF_USER_FITNESS_GOAL); + addPreferenceHandlerFor(PREF_UM25_SHOW_THRESHOLD_NOTIFICATION); + addPreferenceHandlerFor(PREF_UM25_SHOW_THRESHOLD); + String sleepTimeState = prefs.getString(PREF_SLEEP_TIME, PREF_DO_NOT_DISTURB_OFF); boolean sleepTimeScheduled = sleepTimeState.equals(PREF_DO_NOT_DISTURB_SCHEDULED); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/um25/Coordinator/UM25Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/um25/Coordinator/UM25Coordinator.java index efe70c99a..65c312caf 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/um25/Coordinator/UM25Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/um25/Coordinator/UM25Coordinator.java @@ -16,6 +16,7 @@ import java.util.Collections; import cyanogenmod.app.CustomTile; import nodomain.freeyourgadget.gadgetbridge.GBException; +import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.devices.AbstractDeviceCoordinator; import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator; import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler; @@ -55,6 +56,13 @@ public class UM25Coordinator extends AbstractDeviceCoordinator { return DeviceType.UNKNOWN; } + @Override + public int[] getSupportedDeviceSpecificSettings(GBDevice device) { + return new int[]{ + R.xml.devicesettings_um25 + }; + } + @Override public DeviceType getDeviceType() { return DeviceType.UM25; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/um25/Support/UM25Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/um25/Support/UM25Support.java index 7a728c375..8a6c8b19d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/um25/Support/UM25Support.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/um25/Support/UM25Support.java @@ -1,12 +1,15 @@ package nodomain.freeyourgadget.gadgetbridge.service.devices.um25.Support; +import android.app.Notification; import android.bluetooth.BluetoothGatt; import android.bluetooth.BluetoothGattCharacteristic; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; +import android.content.SharedPreferences; +import androidx.core.app.NotificationCompat; import androidx.localbroadcastmanager.content.LocalBroadcastManager; import org.slf4j.Logger; @@ -19,12 +22,16 @@ import java.util.UUID; import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.TimeUnit; +import nodomain.freeyourgadget.gadgetbridge.GBApplication; +import nodomain.freeyourgadget.gadgetbridge.R; +import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.service.btle.BtLEAction; import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder; import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetDeviceStateAction; import nodomain.freeyourgadget.gadgetbridge.service.devices.um25.Data.CaptureGroup; import nodomain.freeyourgadget.gadgetbridge.service.devices.um25.Data.MeasurementData; +import nodomain.freeyourgadget.gadgetbridge.util.GB; import nodomain.freeyourgadget.gadgetbridge.util.StringUtils; public class UM25Support extends UM25BaseSupport { @@ -44,6 +51,12 @@ public class UM25Support extends UM25BaseSupport { private static final Logger logger = LoggerFactory.getLogger(UM25Support.class); + SharedPreferences preferences; + + private boolean notifyOnCurrentThreshold; + private int notificationCurrentThreshold; + private boolean wasOverNotificationCurrent = false; + private long lastOverThresholdTimestamp = 0; public UM25Support() { super(logger); @@ -63,8 +76,22 @@ public class UM25Support extends UM25BaseSupport { } }; + void readPreferences(){ + notifyOnCurrentThreshold = preferences.getBoolean(DeviceSettingsPreferenceConst.PREF_UM25_SHOW_THRESHOLD_NOTIFICATION, false); + notificationCurrentThreshold = Integer.parseInt(preferences.getString(DeviceSettingsPreferenceConst.PREF_UM25_SHOW_THRESHOLD, "100")); + } + + @Override + public void onSendConfiguration(String config) { + readPreferences(); + } + @Override protected TransactionBuilder initializeDevice(TransactionBuilder builder) { + preferences = GBApplication.getDeviceSpecificSharedPrefs(getDevice().getAddress()); + + readPreferences(); + return builder .add(new SetDeviceStateAction(getDevice(), GBDevice.State.INITIALIZING, getContext())) .notify(getCharacteristic(UUID.fromString(UUID_CHAR)), true) @@ -132,6 +159,46 @@ public class UM25Support extends UM25BaseSupport { return true; } + private void handleCurrentNotification(int currentMa){ + logger.debug("current: " + currentMa); + + if(!notifyOnCurrentThreshold){ + return; + } + + boolean isOverNotificationCurrent = currentMa > notificationCurrentThreshold; + + long now = System.currentTimeMillis(); + + if(isOverNotificationCurrent){ + lastOverThresholdTimestamp = now; + wasOverNotificationCurrent = true; + return; + } + long deltaSinceOverThreshold = now - lastOverThresholdTimestamp; + + if(deltaSinceOverThreshold < 5000){ + // must be below threshold for over certain time before triggering notification + return; + } + + if(wasOverNotificationCurrent){ + // handle change from over threshold to below threshold + wasOverNotificationCurrent = false; + Notification notification = new NotificationCompat.Builder(getContext(), GB.NOTIFICATION_CHANNEL_HIGH_PRIORITY_ID) + .setSmallIcon(R.drawable.ic_notification_low_battery) + .setContentTitle("USB current") + .setContentText("USB current below threshold") + .build(); + + GB.notify( + GB.NOTIFICATION_ID_LOW_BATTERY, + notification, + getContext() + ); + } + } + private void handlePayload(ByteBuffer payload){ String payloadString = StringUtils.bytesToHex(payload.array()); payloadString = payloadString.replaceAll("(..)", "$1 "); @@ -163,8 +230,6 @@ public class UM25Support extends UM25BaseSupport { int chargingSeconds = payload.getInt(112); int cableResistance = payload.getInt(122); - logger.debug("variable: " + chargedCurrent); - MeasurementData data = new MeasurementData( voltage, current, @@ -185,6 +250,8 @@ public class UM25Support extends UM25BaseSupport { measurementIntent.putExtra(EXTRA_KEY_MEASUREMENT_DATA, data); + handleCurrentNotification(current / 10); + LocalBroadcastManager.getInstance(getContext()) .sendBroadcast(measurementIntent); } diff --git a/app/src/main/res/xml/devicesettings_um25.xml b/app/src/main/res/xml/devicesettings_um25.xml new file mode 100644 index 000000000..ebc0cb7fb --- /dev/null +++ b/app/src/main/res/xml/devicesettings_um25.xml @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file From 3fc53ef6b38f4377a816724ef4397dc00377ab99 Mon Sep 17 00:00:00 2001 From: Daniel Dakhno Date: Fri, 15 Apr 2022 02:12:36 +0200 Subject: [PATCH 05/12] UM25: added click listener to notification --- .../service/devices/um25/Support/UM25Support.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/um25/Support/UM25Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/um25/Support/UM25Support.java index 8a6c8b19d..48a57ea3a 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/um25/Support/UM25Support.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/um25/Support/UM25Support.java @@ -1,6 +1,7 @@ package nodomain.freeyourgadget.gadgetbridge.service.devices.um25.Support; import android.app.Notification; +import android.app.PendingIntent; import android.bluetooth.BluetoothGatt; import android.bluetooth.BluetoothGattCharacteristic; import android.content.BroadcastReceiver; @@ -25,6 +26,7 @@ import java.util.concurrent.TimeUnit; import nodomain.freeyourgadget.gadgetbridge.GBApplication; import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst; +import nodomain.freeyourgadget.gadgetbridge.devices.um25.Activity.DataActivity; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.service.btle.BtLEAction; import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder; @@ -185,10 +187,12 @@ public class UM25Support extends UM25BaseSupport { if(wasOverNotificationCurrent){ // handle change from over threshold to below threshold wasOverNotificationCurrent = false; + Intent activityIntent = new Intent(getContext(), DataActivity.class); Notification notification = new NotificationCompat.Builder(getContext(), GB.NOTIFICATION_CHANNEL_HIGH_PRIORITY_ID) .setSmallIcon(R.drawable.ic_notification_low_battery) .setContentTitle("USB current") .setContentText("USB current below threshold") + .setContentIntent(PendingIntent.getActivity(getContext(), 0, activityIntent, PendingIntent.FLAG_CANCEL_CURRENT)) .build(); GB.notify( From 367ad19205739c2a4f197b6b7f8b49510b70729e Mon Sep 17 00:00:00 2001 From: Daniel Dakhno Date: Fri, 15 Apr 2022 02:37:53 +0200 Subject: [PATCH 06/12] UM25: optimized imports, added pref summary --- .../devices/um25/Coordinator/UM25Coordinator.java | 4 ---- app/src/main/res/xml/devicesettings_um25.xml | 7 +++++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/um25/Coordinator/UM25Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/um25/Coordinator/UM25Coordinator.java index 65c312caf..4acf35b94 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/um25/Coordinator/UM25Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/um25/Coordinator/UM25Coordinator.java @@ -9,16 +9,12 @@ import android.os.ParcelUuid; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; -import cyanogenmod.app.CustomTile; import nodomain.freeyourgadget.gadgetbridge.GBException; import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.devices.AbstractDeviceCoordinator; -import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator; import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler; import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider; import nodomain.freeyourgadget.gadgetbridge.devices.um25.Activity.DataActivity; diff --git a/app/src/main/res/xml/devicesettings_um25.xml b/app/src/main/res/xml/devicesettings_um25.xml index ebc0cb7fb..b005f48a2 100644 --- a/app/src/main/res/xml/devicesettings_um25.xml +++ b/app/src/main/res/xml/devicesettings_um25.xml @@ -1,5 +1,7 @@ - + @@ -7,5 +9,6 @@ android:title="Current threshold im mA" android:key="um25_current_threshold" android:inputType="number" - android:defaultValue="100"/> + android:defaultValue="100" + app:useSimpleSummaryProvider="true" />/> \ No newline at end of file From 04a8d242c7ad306b2c182a2a98bf1f97eff4d469 Mon Sep 17 00:00:00 2001 From: vanous Date: Sat, 2 Apr 2022 16:49:09 +0200 Subject: [PATCH 07/12] provide app strings based on variants via code --- app/src/banglejs/res/values/strings.xml | 8 ------ .../gadgetbridge/GBApplication.java | 21 ++++++++++++++++ .../activities/AboutActivity.java | 13 ++++++++++ .../activities/AbstractGBActivity.java | 2 ++ .../activities/ControlCenterv2.java | 1 + .../service/DeviceCommunicationService.java | 2 +- app/src/main/res/layout/activity_about.xml | 2 +- app/src/main/res/values/strings.xml | 25 ++++++++++++++++--- app/src/nightly/res/values/strings.xml | 2 +- app/src/nopebble/res/values/strings.xml | 2 +- 10 files changed, 63 insertions(+), 15 deletions(-) delete mode 100644 app/src/banglejs/res/values/strings.xml diff --git a/app/src/banglejs/res/values/strings.xml b/app/src/banglejs/res/values/strings.xml deleted file mode 100644 index e965e9764..000000000 --- a/app/src/banglejs/res/values/strings.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - Bangle.js Gadgetbridge - Bangle.js Gadgetbridge - About Bangle.js Gadgetbridge - Android companion app for Bangle.js built on top of the Gadgetbridge project, with added Internet Access. - Bangle.js running - diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java index 6282ebcac..7556e2468 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java @@ -1218,4 +1218,25 @@ public class GBApplication extends Application { public void setAutoExportScheduledTimestamp(long autoExportScheduledTimestamp) { this.autoExportScheduledTimestamp = autoExportScheduledTimestamp; } + /** + * Provides either a string resource based on current variant + * (main_debug, main_nightly...): "about_description_main_debug" + * or just a universal string resource for "about_description" + * + * @param resString + * @return string + */ + public String getStringResourceByVariantName(String resString) { + String packageName = getPackageName(); + String variation = BuildConfig.FLAVOR + "_" + BuildConfig.BUILD_TYPE; + int resIdVariation = getResources().getIdentifier(resString + "_" + variation, "string", packageName); + int resIdNormal = getResources().getIdentifier(resString, "string", packageName); + + if (resIdVariation == 0) { + //LOG.warn("Missing variation string: " + aString + "_" + variation); + return getString(resIdNormal); + } else { + return getString(resIdVariation); + } + } } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AboutActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AboutActivity.java index 56a7ae3b9..18ba47446 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AboutActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AboutActivity.java @@ -20,17 +20,30 @@ package nodomain.freeyourgadget.gadgetbridge.activities; import android.os.Bundle; import android.text.method.LinkMovementMethod; import android.widget.TextView; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import nodomain.freeyourgadget.gadgetbridge.BuildConfig; +import nodomain.freeyourgadget.gadgetbridge.GBApplication; import nodomain.freeyourgadget.gadgetbridge.R; public class AboutActivity extends AbstractGBActivity { + private static final Logger LOG = LoggerFactory.getLogger(ConfigureAlarms.class); @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_about); TextView about_version = findViewById(R.id.about_version); + TextView about_title = findViewById(R.id.about_title); + TextView about_description = findViewById(R.id.about_description); + + setTitle(GBApplication.app().getStringResourceByVariantName("about_activity_title")); + about_title.setText(GBApplication.app().getStringResourceByVariantName("about_activity_title")); + about_description.setText(GBApplication.app().getStringResourceByVariantName("about_description")); + TextView about_hash = findViewById(R.id.about_hash); String versionName = BuildConfig.VERSION_NAME; String versionHASH = BuildConfig.GIT_HASH_SHORT; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractGBActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractGBActivity.java index 8d0ea2d51..ba96aaa15 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractGBActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractGBActivity.java @@ -28,6 +28,8 @@ import java.util.Locale; import androidx.appcompat.app.AppCompatActivity; import androidx.localbroadcastmanager.content.LocalBroadcastManager; + +import nodomain.freeyourgadget.gadgetbridge.BuildConfig; import nodomain.freeyourgadget.gadgetbridge.GBApplication; import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.util.AndroidUtils; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenterv2.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenterv2.java index e63c4d23e..893813238 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenterv2.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenterv2.java @@ -151,6 +151,7 @@ public class ControlCenterv2 extends AppCompatActivity setContentView(R.layout.activity_controlcenterv2); Toolbar toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); + setTitle(GBApplication.app().getStringResourceByVariantName("title_activity_controlcenter")); DrawerLayout drawer = findViewById(R.id.drawer_layout); ActionBarDrawerToggle toggle = new ActionBarDrawerToggle( diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java index a9f7ddfa6..260f8e803 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java @@ -666,7 +666,7 @@ public class DeviceCommunicationService extends Service implements SharedPrefere private void start() { if (!mStarted) { GB.createNotificationChannels(this); - startForeground(GB.NOTIFICATION_ID, GB.createNotification(getString(R.string.gadgetbridge_running), this)); + startForeground(GB.NOTIFICATION_ID, GB.createNotification(GBApplication.app().getStringResourceByVariantName("gadgetbridge_running"), this)); mStarted = true; } } diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index a0817758e..769ce31ee 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -44,7 +44,7 @@ android:paddingRight="@dimen/about_margin"> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8d65c4df6..5b8247005 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2,6 +2,28 @@ Gadgetbridge Gadgetbridge + About Gadgetbridge + Cloudless copylefted libre replacement for closed source Android gadget apps from vendors. + Gadgetbridge running + + Bangle.js Gadgetbridge + Bangle.js Gadgetbridge + About Bangle.js Gadgetbridge + Android companion app for Bangle.js built on top of the Gadgetbridge project, with added Internet Access. + Bangle.js running + + Gadgetbridge (Nightly) + Gadgetbridge Nightly + About Gadgetbridge Nightly + Cloudless copylefted libre replacement for closed source Android gadget apps from vendors. Nightly releases of Gadgetbridge. It cannot be installed if you already have either the Gadgetbridge or the Pebble app installed, due to a conflict in the Pebble provider. + Nightly GB running + + Gadgetbridge (Nightly, No Pebble provider) + Gadgetbridge Nightly No Pebble + About Gadgetbridge Nightly No Pebble + Cloudless copylefted libre replacement for closed source Android gadget apps from vendors. Nightly releases of Gadgetbridge. This version has the Pebble provider renamed to prevent conflicts, so some Pebble related integrations will not work, but it can be installed alongside existing Gadgetbridge installation. + Nightly NoPebble GB running + Settings Debug Quit @@ -368,7 +390,6 @@ Tap connected device for vibration Tap a device to connect Cannot connect. Bluetooth address invalid? - Gadgetbridge running Installing binary %1$d/%2$d Installation failed Installed @@ -1096,11 +1117,9 @@ About Version %s Commit %s - About Gadgetbridge GPX Receiver Gadgetbridge GPX file(s) received: Some file(s) already exist. Overwrite? - Cloudless copylefted libre replacement for closed source Android gadget apps from vendors. Core Team (in order of first code contribution) Contributors Andreas Shimokawa\nCarsten Pfeiffer\nDaniele Gobbetti diff --git a/app/src/nightly/res/values/strings.xml b/app/src/nightly/res/values/strings.xml index c4e5885c9..e9a80b725 100644 --- a/app/src/nightly/res/values/strings.xml +++ b/app/src/nightly/res/values/strings.xml @@ -1,4 +1,4 @@ - Gadgetbridge (Nightly) + diff --git a/app/src/nopebble/res/values/strings.xml b/app/src/nopebble/res/values/strings.xml index 090f10a24..e9a80b725 100644 --- a/app/src/nopebble/res/values/strings.xml +++ b/app/src/nopebble/res/values/strings.xml @@ -1,4 +1,4 @@ - Gadgetbridge (Nightly, No Pebble provider) + From 38b9a8f80ec10ee5daea0423fe84fdb295f93d11 Mon Sep 17 00:00:00 2001 From: vanous Date: Sat, 2 Apr 2022 19:35:10 +0200 Subject: [PATCH 08/12] add logging --- .../nodomain/freeyourgadget/gadgetbridge/GBApplication.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java index 7556e2468..070b0b74f 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java @@ -1233,7 +1233,8 @@ public class GBApplication extends Application { int resIdNormal = getResources().getIdentifier(resString, "string", packageName); if (resIdVariation == 0) { - //LOG.warn("Missing variation string: " + aString + "_" + variation); + // Since this class must not log to slf4j, we use plain android.util.Log + Log.i(TAG, "Missing variation string: " + resString + "_" + variation); return getString(resIdNormal); } else { return getString(resIdVariation); From ffeba878acaa0907b1a0b882b2fcbeb7ff7b5434 Mon Sep 17 00:00:00 2001 From: vanous Date: Sat, 2 Apr 2022 19:35:39 +0200 Subject: [PATCH 09/12] make Bangle strings working --- app/src/main/res/values/strings.xml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5b8247005..4b5d55d2f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -6,11 +6,17 @@ Cloudless copylefted libre replacement for closed source Android gadget apps from vendors. Gadgetbridge running - Bangle.js Gadgetbridge - Bangle.js Gadgetbridge - About Bangle.js Gadgetbridge - Android companion app for Bangle.js built on top of the Gadgetbridge project, with added Internet Access. - Bangle.js running + Bangle.js Gadgetbridge + Bangle.js Gadgetbridge + About Bangle.js Gadgetbridge + Android companion app for Bangle.js built on top of the Gadgetbridge project, with added Internet Access. + Bangle.js running + + Bangle.js Gadgetbridge + Bangle.js Gadgetbridge + About Bangle.js Gadgetbridge + Android companion app for Bangle.js built on top of the Gadgetbridge project, with added Internet Access. + Bangle.js running Gadgetbridge (Nightly) Gadgetbridge Nightly From dfd659301709939a9086404baed93a165224970d Mon Sep 17 00:00:00 2001 From: vanous Date: Sun, 3 Apr 2022 12:10:10 +0200 Subject: [PATCH 10/12] modify app_name in gradle --- app/build.gradle | 4 ++++ app/src/main/AndroidManifest.xml | 3 ++- app/src/main/res/values/strings.xml | 10 +++++----- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index b7264498e..c4e4d1d23 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -62,6 +62,7 @@ android { buildConfigField "String", "GIT_HASH_SHORT", "\"${getGitHashShort()}\"" buildConfigField "boolean", "INTERNET_ACCESS", "false" resValue "string", "pebble_content_provider", "com.getpebble.android.provider" + resValue "string", "app_name", "@string/application_name" } signingConfigs { nightly { @@ -91,6 +92,7 @@ android { } proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" resValue "string", "pebble_content_provider", "com.getpebble.android.provider" + resValue "string", "app_name", "@string/application_name_main_nightly" debuggable true } nopebble { @@ -104,6 +106,7 @@ android { } proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" resValue "string", "pebble_content_provider", "com.getpebble.android.nopebble.provider" + resValue "string", "app_name", "@string/application_name_main_nopebble" debuggable true } @@ -140,6 +143,7 @@ android { buildConfigField "boolean", "INTERNET_ACCESS", "true" // Disable pebble provider to allow Bangle.js Gadgetbridge to coexist with Gadgetbridge resValue "string", "pebble_content_provider", "com.getpebble.android.nopebble.provider" + resValue "string", "app_name", "@string/application_name_banglejs_main" } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index edf7b965e..a2078b549 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -69,7 +69,8 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:requestLegacyExternalStorage="true" - android:theme="@style/GadgetbridgeTheme"> + android:theme="@style/GadgetbridgeTheme" + tools:replace="android:label"> - Gadgetbridge + Gadgetbridge Gadgetbridge About Gadgetbridge Cloudless copylefted libre replacement for closed source Android gadget apps from vendors. Gadgetbridge running - Bangle.js Gadgetbridge + Bangle.js Gadgetbridge Bangle.js Gadgetbridge About Bangle.js Gadgetbridge Android companion app for Bangle.js built on top of the Gadgetbridge project, with added Internet Access. Bangle.js running - Bangle.js Gadgetbridge + Bangle.js Gadgetbridge Bangle.js Gadgetbridge About Bangle.js Gadgetbridge Android companion app for Bangle.js built on top of the Gadgetbridge project, with added Internet Access. Bangle.js running - Gadgetbridge (Nightly) + Gadgetbridge (Nightly) Gadgetbridge Nightly About Gadgetbridge Nightly Cloudless copylefted libre replacement for closed source Android gadget apps from vendors. Nightly releases of Gadgetbridge. It cannot be installed if you already have either the Gadgetbridge or the Pebble app installed, due to a conflict in the Pebble provider. Nightly GB running - Gadgetbridge (Nightly, No Pebble provider) + Gadgetbridge (Nightly, No Pebble provider) Gadgetbridge Nightly No Pebble About Gadgetbridge Nightly No Pebble Cloudless copylefted libre replacement for closed source Android gadget apps from vendors. Nightly releases of Gadgetbridge. This version has the Pebble provider renamed to prevent conflicts, so some Pebble related integrations will not work, but it can be installed alongside existing Gadgetbridge installation. From 1516033955ad8ecd3a950230c617de388f4991bc Mon Sep 17 00:00:00 2001 From: vanous Date: Sat, 23 Apr 2022 07:29:54 +0200 Subject: [PATCH 11/12] make string resources to be customazibe via gradle only, no code --- app/build.gradle | 18 ++++++++++++++- .../gadgetbridge/GBApplication.java | 22 ------------------- .../activities/AboutActivity.java | 13 ----------- .../activities/AbstractGBActivity.java | 2 -- .../activities/ControlCenterv2.java | 1 - .../service/DeviceCommunicationService.java | 2 +- app/src/main/res/values/strings.xml | 10 ++++----- 7 files changed, 23 insertions(+), 45 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c4e4d1d23..85eeb0121 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -62,7 +62,11 @@ android { buildConfigField "String", "GIT_HASH_SHORT", "\"${getGitHashShort()}\"" buildConfigField "boolean", "INTERNET_ACCESS", "false" resValue "string", "pebble_content_provider", "com.getpebble.android.provider" - resValue "string", "app_name", "@string/application_name" + resValue "string", "app_name", "@string/application_name_generic" + resValue "string", "title_activity_controlcenter", "@string/title_activity_controlcenter_generic" + resValue "string", "about_activity_title", "@string/about_activity_title_generic" + resValue "string", "about_description", "@string/about_description_generic" + resValue "string", "gadgetbridge_running", "@string/gadgetbridge_running_generic" } signingConfigs { nightly { @@ -93,6 +97,10 @@ android { proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" resValue "string", "pebble_content_provider", "com.getpebble.android.provider" resValue "string", "app_name", "@string/application_name_main_nightly" + resValue "string", "title_activity_controlcenter", "@string/title_activity_controlcenter_main_nightly" + resValue "string", "about_activity_title", "@string/about_activity_title_main_nightly" + resValue "string", "about_description", "@string/about_description_main_nightly" + resValue "string", "gadgetbridge_running", "@string/gadgetbridge_running_main_nightly" debuggable true } nopebble { @@ -107,6 +115,10 @@ android { proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" resValue "string", "pebble_content_provider", "com.getpebble.android.nopebble.provider" resValue "string", "app_name", "@string/application_name_main_nopebble" + resValue "string", "title_activity_controlcenter", "@string/title_activity_controlcenter_main_nopebble" + resValue "string", "about_activity_title", "@string/about_activity_title_main_nopebble" + resValue "string", "about_description", "@string/about_description_main_nopebble" + resValue "string", "gadgetbridge_running", "@string/gadgetbridge_running_main_nopebble" debuggable true } @@ -144,6 +156,10 @@ android { // Disable pebble provider to allow Bangle.js Gadgetbridge to coexist with Gadgetbridge resValue "string", "pebble_content_provider", "com.getpebble.android.nopebble.provider" resValue "string", "app_name", "@string/application_name_banglejs_main" + resValue "string", "title_activity_controlcenter", "@string/title_activity_controlcenter_banglejs_main" + resValue "string", "about_activity_title", "@string/about_activity_title_banglejs_main" + resValue "string", "about_description", "@string/about_description_banglejs_main" + resValue "string", "gadgetbridge_running", "@string/gadgetbridge_running_banglejs_main" } } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java index 070b0b74f..6282ebcac 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java @@ -1218,26 +1218,4 @@ public class GBApplication extends Application { public void setAutoExportScheduledTimestamp(long autoExportScheduledTimestamp) { this.autoExportScheduledTimestamp = autoExportScheduledTimestamp; } - /** - * Provides either a string resource based on current variant - * (main_debug, main_nightly...): "about_description_main_debug" - * or just a universal string resource for "about_description" - * - * @param resString - * @return string - */ - public String getStringResourceByVariantName(String resString) { - String packageName = getPackageName(); - String variation = BuildConfig.FLAVOR + "_" + BuildConfig.BUILD_TYPE; - int resIdVariation = getResources().getIdentifier(resString + "_" + variation, "string", packageName); - int resIdNormal = getResources().getIdentifier(resString, "string", packageName); - - if (resIdVariation == 0) { - // Since this class must not log to slf4j, we use plain android.util.Log - Log.i(TAG, "Missing variation string: " + resString + "_" + variation); - return getString(resIdNormal); - } else { - return getString(resIdVariation); - } - } } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AboutActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AboutActivity.java index 18ba47446..56a7ae3b9 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AboutActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AboutActivity.java @@ -20,30 +20,17 @@ package nodomain.freeyourgadget.gadgetbridge.activities; import android.os.Bundle; import android.text.method.LinkMovementMethod; import android.widget.TextView; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import nodomain.freeyourgadget.gadgetbridge.BuildConfig; -import nodomain.freeyourgadget.gadgetbridge.GBApplication; import nodomain.freeyourgadget.gadgetbridge.R; public class AboutActivity extends AbstractGBActivity { - private static final Logger LOG = LoggerFactory.getLogger(ConfigureAlarms.class); @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_about); TextView about_version = findViewById(R.id.about_version); - TextView about_title = findViewById(R.id.about_title); - TextView about_description = findViewById(R.id.about_description); - - setTitle(GBApplication.app().getStringResourceByVariantName("about_activity_title")); - about_title.setText(GBApplication.app().getStringResourceByVariantName("about_activity_title")); - about_description.setText(GBApplication.app().getStringResourceByVariantName("about_description")); - TextView about_hash = findViewById(R.id.about_hash); String versionName = BuildConfig.VERSION_NAME; String versionHASH = BuildConfig.GIT_HASH_SHORT; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractGBActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractGBActivity.java index ba96aaa15..8d0ea2d51 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractGBActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractGBActivity.java @@ -28,8 +28,6 @@ import java.util.Locale; import androidx.appcompat.app.AppCompatActivity; import androidx.localbroadcastmanager.content.LocalBroadcastManager; - -import nodomain.freeyourgadget.gadgetbridge.BuildConfig; import nodomain.freeyourgadget.gadgetbridge.GBApplication; import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.util.AndroidUtils; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenterv2.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenterv2.java index 893813238..e63c4d23e 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenterv2.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenterv2.java @@ -151,7 +151,6 @@ public class ControlCenterv2 extends AppCompatActivity setContentView(R.layout.activity_controlcenterv2); Toolbar toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); - setTitle(GBApplication.app().getStringResourceByVariantName("title_activity_controlcenter")); DrawerLayout drawer = findViewById(R.id.drawer_layout); ActionBarDrawerToggle toggle = new ActionBarDrawerToggle( diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java index 260f8e803..a9f7ddfa6 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java @@ -666,7 +666,7 @@ public class DeviceCommunicationService extends Service implements SharedPrefere private void start() { if (!mStarted) { GB.createNotificationChannels(this); - startForeground(GB.NOTIFICATION_ID, GB.createNotification(GBApplication.app().getStringResourceByVariantName("gadgetbridge_running"), this)); + startForeground(GB.NOTIFICATION_ID, GB.createNotification(getString(R.string.gadgetbridge_running), this)); mStarted = true; } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9bebbd325..b4c78e916 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,10 +1,10 @@ - Gadgetbridge - Gadgetbridge - About Gadgetbridge - Cloudless copylefted libre replacement for closed source Android gadget apps from vendors. - Gadgetbridge running + Gadgetbridge + Gadgetbridge + About Gadgetbridge + Cloudless copylefted libre replacement for closed source Android gadget apps from vendors. + Gadgetbridge running Bangle.js Gadgetbridge Bangle.js Gadgetbridge From 8a2a03ecd34b8c7134706fb780367d65ebf6d879 Mon Sep 17 00:00:00 2001 From: Gordon Williams Date: Tue, 26 Apr 2022 15:29:05 +0100 Subject: [PATCH 12/12] Update strings for app_name/etc to '_generic' values to allow differently named apps - https://codeberg.org/Freeyourgadget/Gadgetbridge/issues/2627 --- app/src/main/res/values-bg/strings.xml | 6 +++--- app/src/main/res/values-ca/strings.xml | 10 +++++----- app/src/main/res/values-cs/strings.xml | 10 +++++----- app/src/main/res/values-de/strings.xml | 10 +++++----- app/src/main/res/values-el/strings.xml | 10 +++++----- app/src/main/res/values-en-rGB/strings.xml | 10 +++++----- app/src/main/res/values-es/strings.xml | 10 +++++----- app/src/main/res/values-et/strings.xml | 10 +++++----- app/src/main/res/values-fa/strings.xml | 4 ++-- app/src/main/res/values-fi/strings.xml | 6 +++--- app/src/main/res/values-fr-rCA/strings.xml | 6 +++--- app/src/main/res/values-fr/strings.xml | 10 +++++----- app/src/main/res/values-gl/strings.xml | 6 +++--- app/src/main/res/values-he/strings.xml | 10 +++++----- app/src/main/res/values-hr/strings.xml | 10 +++++----- app/src/main/res/values-hu/strings.xml | 6 +++--- app/src/main/res/values-id/strings.xml | 6 +++--- app/src/main/res/values-it/strings.xml | 10 +++++----- app/src/main/res/values-ja/strings.xml | 8 ++++---- app/src/main/res/values-ka/strings.xml | 4 ++-- app/src/main/res/values-ko/strings.xml | 6 +++--- app/src/main/res/values-lt/strings.xml | 6 +++--- app/src/main/res/values-ml/strings.xml | 4 ++-- app/src/main/res/values-my/strings.xml | 4 ++-- app/src/main/res/values-nb-rNO/strings.xml | 10 +++++----- app/src/main/res/values-nl/strings.xml | 10 +++++----- app/src/main/res/values-pl/strings.xml | 10 +++++----- app/src/main/res/values-pt-rBR/strings.xml | 10 +++++----- app/src/main/res/values-pt/strings.xml | 10 +++++----- app/src/main/res/values-ro/strings.xml | 4 ++-- app/src/main/res/values-ru/strings.xml | 10 +++++----- app/src/main/res/values-sk/strings.xml | 6 +++--- app/src/main/res/values-sv/strings.xml | 4 ++-- app/src/main/res/values-tr/strings.xml | 10 +++++----- app/src/main/res/values-uk/strings.xml | 10 +++++----- app/src/main/res/values-vi/strings.xml | 6 +++--- app/src/main/res/values-zh-rCN/strings.xml | 10 +++++----- app/src/main/res/values-zh-rTW/strings.xml | 10 +++++----- 38 files changed, 151 insertions(+), 151 deletions(-) diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index e74f26fca..2976c5371 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -17,8 +17,8 @@ Обхват на Графиката Обхвата е Месец Обхвата е Седмица - Gadgetbridge - Gadgetbridge + Gadgetbridge + Gadgetbridge Настройки Дебъгване Изход @@ -228,7 +228,7 @@ Докоснете свързаното устройство за вибрации Докоснете устройство за свързване Не може да се установи връзка. Грешен Bluetooth адрес\? - Gadgetbridge работи + Gadgetbridge работи Инсталиране на двоичен файл %1$d/%2$d Инсталацията пропадна Инсталирано diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index dfd01fa43..242f20e44 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -1,7 +1,7 @@ - Gadgetbridge - Gadgetbridge + Gadgetbridge + Gadgetbridge Configuració Depuració Surt @@ -174,7 +174,7 @@ Toca l\'aparell per fer-lo vibrar Toca un aparell per connectar-hi No es pot connectar. Potser la direcció Bluetooth és incorrecta\? - El Gadgetbridge està funcionant + El Gadgetbridge està funcionant S\'està instal·lant el binari %1$d/%2$d La instal·lació ha fallat Instal·lat @@ -908,7 +908,7 @@ Support d\'aparell addicional Col·laboradors Equip principal (en ordre de primera contribució de codi) - Substitut lliure, copyleft i sense núvol per a les aplicacions Android de codi tancat dels fabricants dels aparells. + Substitut lliure, copyleft i sense núvol per a les aplicacions Android de codi tancat dels fabricants dels aparells. No molestis SpO2 PAI @@ -995,7 +995,7 @@ ES REQUEREIX CLAU La ubicació ha d\'estar activada Enllaços - Quant a Gadgetbridge + Quant a Gadgetbridge Versió %s Quant a Última notificació diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 507730638..4b382a539 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -1,7 +1,7 @@ - Gadgetbridge - Gadgetbridge + Gadgetbridge + Gadgetbridge Nastavení Ladění Ukončit @@ -154,7 +154,7 @@ Dotkněte se zařízení pro vibrace Dotkněte se zařízení pro připojení Nelze připojit. Je BT adresa v pořádku? - Gadgetbridge běží + Gadgetbridge běží Instaluji soubor %1$d/%2$d Instalace selhala Instalace úspěšná @@ -915,8 +915,8 @@ Podpora dalších zařízení Přispěvatelé Centrální tým (v pořadí příspěvku prvního kódu) - Svobodná a lokální náhrada za uzavřenou aplikaci vašich hodinek/náramku. - O aplikaci Gadgetbridge + Svobodná a lokální náhrada za uzavřenou aplikaci vašich hodinek/náramku. + O aplikaci Gadgetbridge O aplikaci Světový Čas Použito s poskytovatelem počasí LineageOS. Ostatní verze Androidu vyžadují \"Weather Notification\" app. Více informací naleznete na Gadgetbridge wiki. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index c7a592dad..bf3117e66 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1,7 +1,7 @@ - Gadgetbridge - Gadgetbridge + Gadgetbridge + Gadgetbridge Einstellungen Debug Beenden @@ -161,7 +161,7 @@ Tippe auf das verbundene Gerät, um es vibrieren zu lassen Tippe auf ein Gerät, um eine Verbindung herzustellen Keine Verbindung möglich. Bluetooth-Adresse ungültig\? - Gadgetbridge läuft + Gadgetbridge läuft Binärdatei %1$d/%2$d wird installiert Installation fehlgeschlagen Installiert @@ -923,8 +923,8 @@ Unterstützung zusätzlicher Geräte Beitragende Kernteam (Reihenfolge der ersten Mitwirkung am Code) - Cloudloser freier Ersatz für proprietäre Android-Gadget-Apps der Hersteller. - Über Gadgetbridge + Cloudloser freier Ersatz für proprietäre Android-Gadget-Apps der Hersteller. + Über Gadgetbridge Über Wird für den LineageOS Wetterdienst genutzt, andere Android-Versionen müssen eine Anwendung wie Weather notification nutzen. Mehr Informationen gibt es im Gadgetbride-Wiki. Weltzeituhr diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index cd82ac718..e4c50f513 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -1,7 +1,7 @@ - Gadgetbridge - Gadgetbridge + Gadgetbridge + Gadgetbridge Ρυθμίσεις Αποσφαλμάτωση Έξοδος @@ -174,7 +174,7 @@ Πατήστε τη συνδεδεμένη συσκευή για δόνηση Πατήστε μία συσκευή για να συνδεθεί Δεν μπορεί να γίνει σύνδεση. Μήπως δεν είναι έγκυρη η διεύθυνση Bluetooth; - Το Gadgetbridge εκτελείται + Το Gadgetbridge εκτελείται Γίνεται εγκατάσταση των βιβλιοθηκών %1$d/%2$d Η εγκατάσταση απέτυχε Εγκατεστημένο @@ -901,8 +901,8 @@ Πρόσθετη υποστήριξη συσκευών Συντελεστές Βασική ομάδα (κατά σειρά μεγαλύτερης συνεισφοράς κώδικα) - Μια δωρεάν, ελεύθερου κώδικα και χωρίς πρόσβαση στο διαδίκτυο εφαρμογή Android για να αντικαταστήσει τις υπάρχουσες εφαρμογές κλειστού κώδικα των κατασκευαστών του smartwatch σας. - Σχετικά με το Gadgetbridge + Μια δωρεάν, ελεύθερου κώδικα και χωρίς πρόσβαση στο διαδίκτυο εφαρμογή Android για να αντικαταστήσει τις υπάρχουσες εφαρμογές κλειστού κώδικα των κατασκευαστών του smartwatch σας. + Σχετικά με το Gadgetbridge Σχετικά Παγκόσμιο Ρολόι Amazfit T-Rex diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml index 401143723..953d8f9e2 100644 --- a/app/src/main/res/values-en-rGB/strings.xml +++ b/app/src/main/res/values-en-rGB/strings.xml @@ -684,7 +684,7 @@ Installed Installation failed Installing binary %1$d/%2$d - Gadgetbridge running + Gadgetbridge running Cannot connect. Bluetooth address invalid\? Tap a device to connect Tap connected device for vibration @@ -853,8 +853,8 @@ Quit Debug Settings - Gadgetbridge - Gadgetbridge + Gadgetbridge + Gadgetbridge Save raw activity files Workout Event Reminder @@ -1124,7 +1124,7 @@ Statistics Upper Button short Upper Button double - About Gadgetbridge + About Gadgetbridge GPX file(s) received: Some file(s) already exist. Overwrite\? Many thanks to all unlisted contributors for contributing code, translations, support, ideas, motivation, bug reports, money… ✊ @@ -1276,7 +1276,7 @@ Temperature Version %s About - Cloudless copylefted libre replacement for closed source Android gadget apps from vendors. + Cloudless copylefted libre replacement for closed source Android gadget apps from vendors. 30 days Time period Already bonded diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 3cba4fce6..f0f86007f 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1,7 +1,7 @@ - Gadgetbridge - Gadgetbridge + Gadgetbridge + Gadgetbridge Configuración Depuración Salir @@ -161,7 +161,7 @@ Toque el dispositivo conectado para la vibración Toca un dispositivo para conectarlo No se puede conectar. ¿Dirección BT incorrecta? - Gadgetbridge funcionando + Gadgetbridge funcionando Instalando binario %1$d/%2$d Instalación fallida Instalado @@ -1093,8 +1093,8 @@ Soporte de dispositivos adicionales Colaboradores Equipo principal (por orden de primera contribución de código) - Sustitución sin nube y con copyleft de las aplicaciones de código cerrado para Android de los proveedores. - Acerca de Gadgetbridge + Sustitución sin nube y con copyleft de las aplicaciones de código cerrado para Android de los proveedores. + Acerca de Gadgetbridge Versión %s Acerca de Última notificación diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index c1dcfc880..d271cdd78 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -1,7 +1,7 @@ - Gadgetbridge - Gadgetbridge + Gadgetbridge + Gadgetbridge Seaded Silumine Välju @@ -243,7 +243,7 @@ Puuduta ühendatud seadet värina tekitamiseks Puuduta seadet, et ühendada Ei saa ühendust. Vigane bluetooth aadress\? - Gadgetbridge töötab + Gadgetbridge töötab Binaarfaili %1$d/%2$d paigaldamine Paigaldamine nurjus Paigaldatud @@ -746,8 +746,8 @@ Täiendavate seadmete tugi Kaasaaitajad Tuumiktiim (järjestatud esimese koodirea kuupäeva järgi) - Tasuta ja pilvevaba asendus teie kantavate nutiseadmete tootjate rakendustele. - Gadgetbridge\'ist + Tasuta ja pilvevaba asendus teie kantavate nutiseadmete tootjate rakendustele. + Gadgetbridge\'ist Rakendusest Alumine nupp Keskmine nupp diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 6c9da732f..2fcd9211d 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -1,7 +1,7 @@ - گجت‌بریج - گجت‌بریج + گجت‌بریج + گجت‌بریج تنظیمات اشکال‌زدایی خروج diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index f2c7af838..820f5adff 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -3,8 +3,8 @@ Asetukset Synkronoi Löydä kadonnut laite - Gadgetbridge - Gadgetbridge + Gadgetbridge + Gadgetbridge Lopeta Lahjoita Ota ruutukaappaus @@ -447,7 +447,7 @@ Askeleiden historia Kokonaisaskeleet Tietoja - Tietoja Gadgetbridgestä + Tietoja Gadgetbridgestä Alkaen Päättyen Vastaamatta jääneen puhelun ilmoitus diff --git a/app/src/main/res/values-fr-rCA/strings.xml b/app/src/main/res/values-fr-rCA/strings.xml index b93cfdd6c..d588a524f 100644 --- a/app/src/main/res/values-fr-rCA/strings.xml +++ b/app/src/main/res/values-fr-rCA/strings.xml @@ -129,8 +129,8 @@ Calories Vibration Long - Gadgetbridge - Gadgetbridge + Gadgetbridge + Gadgetbridge %d heure %d heures @@ -697,7 +697,7 @@ Installé Échec de l\'installation Installation du binaire %1$d/%2$d - Gadgetbridge est en fonctionnement + Gadgetbridge est en fonctionnement Tapez sur le périphérique pour le connecter Cliquez sur connecter pour envoyer une vibration Cliquez sur l\'appareil pour ouvrir le gestionnaire d’activité diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 6e3c5c682..1eeb6039f 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1,7 +1,7 @@ - Gadgetbridge - Gadgetbridge + Gadgetbridge + Gadgetbridge Paramètres Déboguer Quitter @@ -161,7 +161,7 @@ Cliquez sur connecter pour envoyer une vibration Tapez sur le périphérique pour le connecter Connexion impossible. L’adresse Bluetooth est-elle valide ? - Gadgetbridge est en fonctionnement + Gadgetbridge est en fonctionnement Installation du binaire %1$d/%2$d Échec de l\'installation Installé @@ -1017,8 +1017,8 @@ Temps de sommeil préféré en heures Support d\'appareil supplémentaire Contributeurs Équipe principal (dans l\'ordre de la première contribution au code) - Un remplaçant libre et sans cloud aux applications Android propriétaires des fabricants de vos bracelets. - A propos de Gadgetbridge + Un remplaçant libre et sans cloud aux applications Android propriétaires des fabricants de vos bracelets. + A propos de Gadgetbridge A propos Horloge mondiale Stress diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 2947c1049..ae765d3aa 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -1,7 +1,7 @@ - Gadgetbridge - Gadgetbridge + Gadgetbridge + Gadgetbridge Axustes Depuración Saír @@ -143,7 +143,7 @@ Toque nun dispositivo conectado para facelo Vibrar Toque nun dispositivo para conectar Non foi posíbel conectar. Enderezo Bluetooth inválido? - Gadgetbridge en execución + Gadgetbridge en execución Instalando binario %1$d/%2$d Fallou a instalación Instalado diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index 9fe7ad229..b6c614675 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -1,7 +1,7 @@ - Gadgetbridge - Gadgetbridge + Gadgetbridge + Gadgetbridge הגדרות ניפוי שגיאות יציאה @@ -147,7 +147,7 @@ נקישה על ההתקן המחובר לרטט יש לגעת בהתקן כדי להתחבר לא ניתן להתחבר. כתובת ה־Bluetooth שגויה? - Gadgetbridge פעיל + Gadgetbridge פעיל התקנת הבינרי %1$d/%2$d ההתקנה נכשלה ההתקנה הצליחה @@ -913,8 +913,8 @@ תמיכה במכשירים נוספים תורמים צוות הליבה (מסודרים לפי מועד תרומת הקוד הראשונה) - חלופה חופשית ונטולת ענן ליישומוני ה־Android לחפיצים עם הקוד הסגור של היצרנים. - על אודות Gadgetbridge + חלופה חופשית ונטולת ענן ליישומוני ה־Android לחפיצים עם הקוד הסגור של היצרנים. + על אודות Gadgetbridge על אודות משמש לספק מזג האוויר של LineageOS, גרסאות אחרות של Android צריכות להשתמש ביישומונים כמו „התראות מזג אוויר”. אפשר למצוא מידע נוסף בוויקי של Gadgetbridge. שעון עולמי diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 711a0edb3..09e10ad4f 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -1,6 +1,6 @@ - Gadgetbridge + Gadgetbridge Muško Žensko Ostalo @@ -28,7 +28,7 @@ Postavi pseudonim Izlaz Debug - Gadgetbridge + Gadgetbridge Stvarno izbrisati staru bazu podataka aktivnosti\? Podaci aktivnosti koji nisu uvezeni će se izgubiti. Izbrisati staru bazu podataka aktivnosti\? Podaci izbrisani. @@ -1268,8 +1268,8 @@ Dodaj widget Postavljanje alarma za %1$02d:%2$02d Verzija %s - O Gadgetbridge - Zamjena za libre bez oblaka bez kopiranja za zatvorene aplikacije za Android gadgete od dobavljača. + O Gadgetbridge + Zamjena za libre bez oblaka bez kopiranja za zatvorene aplikacije za Android gadgete od dobavljača. Osnovni tim (po redoslijedu doprinosa prvog koda) Konfiguracija izgleda sata Promjena pozadinske slike @@ -1358,7 +1358,7 @@ \n \n \n Ovaj firmware je za HW reviziju: %s - Gadgetbridge je pokrenut + Gadgetbridge je pokrenut Dodirnite uređaj za povezivanje Test Nije povezano diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index d9cf5a1f6..36b660a49 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -1,7 +1,7 @@ - Gadgetbridge - Gadgetbridge + Gadgetbridge + Gadgetbridge Beállítások Hibakeresés Kilépés @@ -157,7 +157,7 @@ Koppints az eszközre a rezgetéshez. Koppints az eszközre a csatlakozáshoz Nem lehet csatlakozni. Rossz Bluetooth cím? - A Gadgetbridge fut + A Gadgetbridge fut %1$d/%2$d bináris telepítése Sikertelen telepítés Telepítve diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index dd7f06e40..2f9a12290 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -1,7 +1,7 @@ - Gadgetbridge - Gadgetbridge + Gadgetbridge + Gadgetbridge Pengaturan Keluar Donasi @@ -175,7 +175,7 @@ Kalori Penerima GPX Gadgetbridge Lokasi harus diaktifkan - Tentang Gadgetbridge + Tentang Gadgetbridge Versi %s Tentang Tautan diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index f6ab2f1c9..d7877fe9e 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -1,7 +1,7 @@ - Gadgetbridge - Gadgetbridge + Gadgetbridge + Gadgetbridge Impostazioni Debug Esci @@ -158,7 +158,7 @@ Tocca il dispositivo connesso per la vibrazione tocca il dispositivo a cui connettersi Impossibile connettersi. Indirizzo Bluetooth non valido? - Gadgetbridge in esecuzione + Gadgetbridge in esecuzione Installazione del binario %1$d/%2$d Installazione fallita Installazione conclusa con successo @@ -884,8 +884,8 @@ Supporto a dispositivi aggiuntivi Contributori Team principale (ordinati in base al primo contributo di codice) - Un\'alternativa gratuita, libera e senza cloud alle applicazioni Android a sorgente chiusa del tuo dispositivo. - Su Gadgetbridge + Un\'alternativa gratuita, libera e senza cloud alle applicazioni Android a sorgente chiusa del tuo dispositivo. + Su Gadgetbridge Informazioni Ultima notifica Salva i dati raw (grezzi) delle attività diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 90f5245de..2e8deca6e 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -1,7 +1,7 @@ - ガジェットブリッジ - ガジェットブリッジ + ガジェットブリッジ + ガジェットブリッジ 設定 デバッグ 終了 @@ -161,7 +161,7 @@ バイブレーションの接続されたデバイスをタップ 接続するデバイスをタップ 接続できません。 Bluetoothアドレスが無効ですか\? - ガジェットブリッジは実行中 + ガジェットブリッジは実行中 バイナリーのインストール中 %1$d/%2$d インストールに失敗しました インストールに成功しました @@ -708,7 +708,7 @@ 距離 キーが必要です 貢献者 - Gadgetbridgeについて + Gadgetbridgeについて について 最終通知 通勤 diff --git a/app/src/main/res/values-ka/strings.xml b/app/src/main/res/values-ka/strings.xml index b55601dd1..43984c98e 100644 --- a/app/src/main/res/values-ka/strings.xml +++ b/app/src/main/res/values-ka/strings.xml @@ -1,7 +1,7 @@ - Gadgetbridge - Gadgetbridge + Gadgetbridge + Gadgetbridge პარამეტრები შეწყვეტა დონაცია diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 35e2abd47..7afd8b2d9 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -1,7 +1,7 @@ - 가젯브릿지 - 가젯브릿지 + 가젯브릿지 + 가젯브릿지 설정 디버그 종료 @@ -77,7 +77,7 @@ 연결된 기기를 선택해 앱 관리자 실행 기기를 선택해 연결 연결할 수 없습니다. 블루투스 주소가 올바르지 않은 것 같습니다\? - 가젯브릿지 실행중 + 가젯브릿지 실행중 바이너리 설치중: %1$d/%2$d 설치 실패 설치됨 diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index f466c9a57..3180dafc8 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -1,7 +1,7 @@ - Gadgetbridge - Gadgetbridge + Gadgetbridge + Gadgetbridge Nustatymai Šalinti riktus Išeiti @@ -167,7 +167,7 @@ Bluetooth nepalaikomas. Bluetooth išjungtas. Bagstelėkite įrenginį, kad prisijungtumėte - Gadgetbridge paleistas + Gadgetbridge paleistas Instaluota Įrenginio paieška Stabdyti skenavimą diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml index 692c26523..7e0dca922 100644 --- a/app/src/main/res/values-ml/strings.xml +++ b/app/src/main/res/values-ml/strings.xml @@ -78,8 +78,8 @@ പുറത്തു കടക്കുക തെറ്റുകൾ തിരുത്തുക ക്രമീകരണങ്ങൾ - ഗാഡ്ജക്‌റ്റ് ബ്രിഡ്ജ് - ഗാഡ്ജക്‌റ്റ് ബ്രിഡ്ജ് + ഗാഡ്ജക്‌റ്റ് ബ്രിഡ്ജ് + ഗാഡ്ജക്‌റ്റ് ബ്രിഡ്ജ് ബാൻഡിൽ വൈബ്രേഷന്റെ കുറഞ്ഞ തീവ്രത പ്രവർത്തനക്ഷമമാക്കുക പവർ സേവിംഗ് മോഡ് ഹൃദയമിടിപ്പിന്റെ ആനുകാലിക യാന്ത്രിക അളവ് ഓഫുചെയ്യുന്നത് പ്രവർത്തന സമയം വർദ്ധിപ്പിക്കുന്നു ഇൻസ്റ്റാൾ ചെയ്ത അലാറത്തിന് മുമ്പുള്ള ഇടവേളയാണ് സ്മാർട്ട് അലാറം ഇടവേള. ഈ ഇടവേള ഉപകരണം ഉപയോക്താവിനെ ഉണർത്താൻ ഉറക്കത്തിന്റെ ഭാരം കുറഞ്ഞ ഘട്ടം കണ്ടെത്താൻ ശ്രമിക്കുന്നു diff --git a/app/src/main/res/values-my/strings.xml b/app/src/main/res/values-my/strings.xml index 4caf4bc91..6b15aa624 100644 --- a/app/src/main/res/values-my/strings.xml +++ b/app/src/main/res/values-my/strings.xml @@ -1,7 +1,7 @@ - Gadgetbridge - Gadgetbridge + Gadgetbridge + Gadgetbridge ခ်ိန္ညွိရန္ ျပစ္ခ်က္ ထြက္မည္ diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index 89b097f23..f035c80c7 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -39,8 +39,8 @@ Svartelistede kalendere Fastvare-/program-installerer Du er i ferd med å installere %s. - Gadgetbru - Gadgetbru + Gadgetbru + Gadgetbru Dette vil slette enheten og all tilknyttet data! Du er i ferd med å installere %s-fastvaren på din Amazfit Bip. \n @@ -165,7 +165,7 @@ Trykk på tilkoblet enhet for vibrasjon Trykk på en enhet for å koble til Kan ikke koble til. Ugyldig Blåtannsadresse? - Gadgetbro kjører + Gadgetbro kjører Installerer binærfil %1$d/%2$d Installasjon mislyktes Installert @@ -902,7 +902,7 @@ Klarte ikke å starte bakgrunnstjeneste Ytterligere enhetsstøtte Bidragsytere - Om Gadgetbridge + Om Gadgetbridge Om Verdensklokke Stress @@ -1034,7 +1034,7 @@ Aktiver lav vibrasjonsintensitet på båndet Strømsparingsmodus slår av periodisk automatisk måling av hjertefrekvensen og øker dermed arbeidstiden Smart alarmintervall er intervall før installert alarm. I dette intervallet prøver enheten å oppdage den letteste søvnfasen for å våkne brukeren - Skyfri, gemenhetslig fri erstatning for den lukkede motsatsen for dine Android-slaveenheter. + Skyfri, gemenhetslig fri erstatning for den lukkede motsatsen for dine Android-slaveenheter. Sjekk og forespør tilganger selv om de ikke trengs umiddelbart. Skru av dette kun hvis enhetene dine ikke støtter noen av disse funksjonene. Å ikke innvilge tilganger kan forårsake problemer! Skrur på slaveenhets-API (funker kun på Android 8 og høyere, og tilknytningen må settes opp på ny med Gadgetbro), noe som øker påliteligheten hvis tjenester må startes på ny i bakgrunnen Advarsel: Kunne ikke sjekke versjonsinfo! Du bør ikke fortsette og versjonsnavnet «%s» ble sett. diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 7acb91769..0867fe1a0 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -1,7 +1,7 @@ - Gadgetbridge - Gadgetbridge + Gadgetbridge + Gadgetbridge Instellingen Debug Sluit af @@ -185,7 +185,7 @@ Tap op het verbonden apparaat voor vibratie Tap op een apparaat om te verbinden Kan niet verbinden. Is het Bluetooth adres ongeldig? - Gadgetbridge loopt + Gadgetbridge loopt Binary installeren %1$d/%2$d Installatie gefaald Geïnstalleerd @@ -914,8 +914,8 @@ Extra apparaatondersteuning Bijdragers Kernteam (in volgorde van eerste codebijdrage) - Cloudloze vrije vervanging voor de gesloten Android-applicaties van gadgetfabrikanten. - Over Gadgetbridge + Cloudloze vrije vervanging voor de gesloten Android-applicaties van gadgetfabrikanten. + Over Gadgetbridge Over Gebruikt voor de LineageOS-weeraanbieder, andere Android versies moeten een app zoals \"Weather notification\" gebruiken. Meer informatie is te vinden in de Gadgetbridge wiki. Wereld Klok diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index bed0b2fe6..00bd6f24f 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -1,7 +1,7 @@ - Gadgetbridge - Gadgetbridge + Gadgetbridge + Gadgetbridge Ustawienia Debuguj Wyjdź @@ -108,7 +108,7 @@ Kliknij połączone urządzenie, aby uruchomić menadżer aplikacji Dotknij urządzenie aby połączyć Nie można połączyć. Nieprawidłowy adres Bluetooth\? - Gadgetbridge działa + Gadgetbridge działa Instalowanie binarki %1$d/%2$d Instalacja nie powiodła się Zainstalowano @@ -913,7 +913,7 @@ Ostatnie powiadomienie Ustaw własną nazwę Współtwórcy - O Gadgetbridge + O Gadgetbridge Amazfit T-Rex Styl grzbietowy Styl dowolny @@ -1031,7 +1031,7 @@ Linki Dziękujemy wszystkim nie notowanym na liście współtwórcom za udostępnienie kodu, tłumaczenia, wsparcie, pomysły, motywację, zgłoszenia błędów, pieniądze… ✊ Zespół główny (w kolejności od pierwszego wkładu w kod aplikacji) - Wolny od chmury zamiennik dla aplikacji o zamkniętym kodzie źródłowym dostarczanych przez producentów gadżetów dla systemu Android. + Wolny od chmury zamiennik dla aplikacji o zamkniętym kodzie źródłowym dostarczanych przez producentów gadżetów dla systemu Android. Edytuj etykietę Ping-pong Krykiet diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index a411025d3..d42561908 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -1,7 +1,7 @@ - Gadgetbridge - Gadgetbridge + Gadgetbridge + Gadgetbridge Configurações Depurar Sair @@ -148,7 +148,7 @@ Toque no dispositivo conectado para vibração Toque num dispositivo para ligar Não foi possível conectar. Endereço de Bluetooth inválido\? - Gadgetbridge em execução + Gadgetbridge em execução Instalando binário %1$d/%2$d Instalação falhou Instalado @@ -920,8 +920,8 @@ Suporte a dispositivos adicionais Contribuidores Equipe Core (na ordem da primeira contribuição de código) - Um substituto livre, protegido por copyleft, sem acesso a nuvem para os aplicativos Android de código fechado dos fornecedores de gadgets. - Sobre o Gadgetbridge + Um substituto livre, protegido por copyleft, sem acesso a nuvem para os aplicativos Android de código fechado dos fornecedores de gadgets. + Sobre o Gadgetbridge Sobre Usado para o provedor do clima do LineageOS, outras versões do Android precisam usar um aplicativo como o \"Notificação de clima\". Encontrará mais informações no wiki do Gadgetbridge. Relógio mundial diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 74efd9cd1..d26dbd7aa 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -1,7 +1,7 @@ - Gadgetbridge - Gadgetbridge + Gadgetbridge + Gadgetbridge Definições Depurar Sair @@ -156,7 +156,7 @@ Toque no aparelho ligado para o fazer vibrar Toque num aparelho para ligar Não foi possível conectar. Endereço de Bluetooth inválido\? - Gadgetbridge a executar + Gadgetbridge a executar Instalando binário %1$d/%2$d A instalação falhou Instalado @@ -573,8 +573,8 @@ Suporte a aparelhos adicionais Contribuidores Equipa Core (na ordem da primeira contribuição de código) - Um substituto livre, protegido por copyleft, sem acesso a nuvem para as apps Android de código fechado dos fornecedores de gadgets. - Sobre o Gadgetbridge + Um substituto livre, protegido por copyleft, sem acesso a nuvem para as apps Android de código fechado dos fornecedores de gadgets. + Sobre o Gadgetbridge Sobre Está prestes a instalar o firmware %s no seu Amazit T-Rex. \n diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index a05411b86..a12113c8a 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -1,7 +1,7 @@ - Gadgetbridge - Gadgetbridge + Gadgetbridge + Gadgetbridge Setari Depaneaza Iesire diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index a6c394052..1d606ba1d 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -1,7 +1,7 @@ - Gadgetbridge - Gadgetbridge + Gadgetbridge + Gadgetbridge Настройки Отладка Выйти @@ -157,7 +157,7 @@ Коснитесь подключённого устройства для Вибрации Коснитесь устройства для соединения Не удалось соединиться. Неверный адрес Bluetooth\? - Gadgetbridge запущен + Gadgetbridge запущен установка бинарного файла %1$d/%2$d Установка не удалась Установлено @@ -848,8 +848,8 @@ Дополнительная поддержка устройств Соавторы Основная команда (в порядке поступления первого кода) - \"Безоблачная\" свободная альтернатива закрытым приложениям от производителей гаджетов. - О Gadgetbridge + \"Безоблачная\" свободная альтернатива закрытым приложениям от производителей гаджетов. + О Gadgetbridge О программе Последнее уведомление Сохранять необработанные файлы активности diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 8cff0a970..ec6aba113 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -1,7 +1,7 @@ - Gadgetbridge - Gadgetbridge + Gadgetbridge + Gadgetbridge Nastavenia Ladenie Ukončiť @@ -180,7 +180,7 @@ Dotknite sa pripojeného zariadenia pre vibrácie Dotknite sa pripojeného zariadenia pre pripojenie Nie je možné pripojiť. Je BT adresa v poriadku? - Gadgetbridge je spustený + Gadgetbridge je spustený Instalujem binárny súbor %1$d/%2$d Inštalácia zlyhala Inštalácia bola úspešná diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 6a8f73ae5..47dea915a 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -1,7 +1,7 @@ - Gadgetbridge - Gadgetbridge + Gadgetbridge + Gadgetbridge Inställningar Avsluta Donera diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 3a2ab4b7b..9bafbe118 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -88,7 +88,7 @@ \nSürüm %2$s, %3$s tarafından \n Yukarı taşı - Gadgetbridge + Gadgetbridge Kur Pebble uygulama mağazasında ara Önbellekteki uygulamalar @@ -314,7 +314,7 @@ Dosya kurulamıyor, aygıt hazır değil. Aygıta bağlantı: %1$s Bu ürün yazılımı bu aygıtla uyumlu değil - Gadgetbridge çalışıyor + Gadgetbridge çalışıyor Almanca Kalp ritmi Yatay @@ -754,7 +754,7 @@ Uygulama Yöneticisi Kara Listeye Alınan Takvimler Etkinlik ve Uyku - Gadgetbridge + Gadgetbridge Veri yönetimi Hata Ayıklama Aygıta özel ayarlar @@ -937,8 +937,8 @@ Ek aygıt desteği Katkıda bulunanlar Çekirdek Ekip (ilk kod katkıda bulunma sırasına göre) - Satıcıların kapalı kaynaklı Android aygıt uygulamalarının yerine bulut gerektirmeyen copyleft özgür alternatif. - Gadgetbridge hakkında + Satıcıların kapalı kaynaklı Android aygıt uygulamalarının yerine bulut gerektirmeyen copyleft özgür alternatif. + Gadgetbridge hakkında Hakkında LineageOS hava durumu sağlayıcısı için kullanılır, diğer Android sürümleri \"Weather notification\" gibi bir uygulama kullanmalıdır. Gadgetbridge wiki sayfasında daha fazla bilgi bulabilirsiniz. Dünya Saati diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 1b8d399aa..814a11ce0 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -1,7 +1,7 @@ - Gadgetbridge - Gadgetbridge + Gadgetbridge + Gadgetbridge Налаштування Зневадження Вийти @@ -98,7 +98,7 @@ Bluetooth не підтримується. Bluetooth вимкнуто. Не вдалося з\'єднатися. Неправильна Bluetooth адреса\? - Gadgetbridge запущено + Gadgetbridge запущено Встановлення двійкового файлу %1$d/%2$d Невдале встановлення Встановлено @@ -1022,8 +1022,8 @@ Підтримка додаткових пристроїв Співавтори Основна команда (впорядковано за датою допомоги) - Незалежний від хмари, вільний замінник закритих застосунків від інших виробників. - Про Gadgetbridge + Незалежний від хмари, вільний замінник закритих застосунків від інших виробників. + Про Gadgetbridge Про застосунок Останнє сповіщення Світовий час diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 3e852602c..fbd33c430 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -1,7 +1,7 @@ - Gadgetbridge - Gadgetbridge + Gadgetbridge + Gadgetbridge Cài đặt Dò lỗi Thoát @@ -49,7 +49,7 @@ Không hỗ trợ Bluetooth. Đã tắt Bluetooth. Không thể kết nối. Địa chỉ Bluetooth không hợp lệ\? - Gadgetbridge đang chạy + Gadgetbridge đang chạy Đang cài tệp nhị phân %1$d/%2$d Cài đặt thất bại Đã cài đặt diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index ea6d5dcdf..3746eaf0d 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1,7 +1,7 @@ - Gadgetbridge - Gadgetbridge + Gadgetbridge + Gadgetbridge 设置 调试 退出 @@ -166,7 +166,7 @@ 点按以震动已连接的设备 点按一个设备以连接 无法连接。 蓝牙地址无效？ - Gadgetbridge 正在运行 + Gadgetbridge 正在运行 正在安装二进制文件 %1$d/%2$d 安装失败 安装成功 @@ -917,8 +917,8 @@ 额外设备支持 贡献者 核心成员 （以第一次提交代码排序） - 用于替代原厂手环应用的脱机无版权自由应用。 - 关于 Gadgetbridge + 用于替代原厂手环应用的脱机无版权自由应用。 + 关于 Gadgetbridge 关于 由LineageOS天气服务提供，其他版本的Android系统需要使用诸如“Weather notification”。更多信息请访问 Gadgetbridge 的Wiki。 世界时钟 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 1c761d590..132683fe5 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -26,8 +26,8 @@ 刪除並清除緩存 重新安裝 nodomain.freeyourgadget.gadgetbridge.ButtonPressed - Gadgetbridge - Gadgetbridge + Gadgetbridge + Gadgetbridge 連接中… 截取設備的屏幕截圖 校正設備 @@ -524,7 +524,7 @@ 配對您的小米手環 配對裝置 初始化完成 - Gadgetbridge 正在執行 + Gadgetbridge 正在執行 點擊一個裝置以進行連線 藍芽不支援。 涵蓋活動與未活動時消耗的卡路里 @@ -583,8 +583,8 @@ 額外裝置支援 貢獻者 核心團隊（按第一次程式碼貢獻順序排列） - 用來取代廠商提供的閉源 Android 小裝置應用程式的離線且版權自由的替代品。 - 關於 Gadgetbridge + 用來取代廠商提供的閉源 Android 小裝置應用程式的離線且版權自由的替代品。 + 關於 Gadgetbridge 關於 運動活動 游泳