Merge remote-tracking branch 'origin/development-stable' into development

# Conflicts:
#	app/src/main/res/values-de/strings.xml
#	app/src/main/res/values/strings.xml
This commit is contained in:
Jens
2022-06-27 23:04:33 +02:00
9 changed files with 78 additions and 6 deletions

View File

@ -835,4 +835,5 @@
<string name="tetheringNotActive">tethering is not active</string>
<string name="tetheringState">Tethering state</string>
<string name="regularExpressionsIfEquals">If \"equals\" is selected, you may enter a regular expression.</string>
<string name="enter_a_number">Enter a number.</string>
</resources>