Merge branch 'master' into play-release

CominAtYou · Feb 19, 2025 · 3e13311 · 3e13311
2 parents eae04f6 + 74d2da9
commit 3e13311
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/app/src/main/res/values-en-rCA/strings.xml b/app/src/main/res/values-en-rCA/strings.xml
@@ -35,7 +35,7 @@
     <string name="activity_edit_tile_text_title">Edit tile text</string>
     <string name="activity_edit_tile_text_text_input_hint">Tile text</string>
     <string name="activity_edit_discharging_tile_text_info_text">Customise the text displayed on the tile. The following placeholders can be used to display information regarding the battery on the tile:\n\n• %%c: Current of the battery in milliamperes\n• %%a: Average current of the battery in milliamperes\n• %%t: Temperature of the battery in Celsius\n• %%f: Temperature of the battery in Fahrenheit\n• %%v: Voltage of the battery\n• %%w: Wattage of the battery\n• %%l: Current battery percentage\n\nSo, for example, setting the text to \"Battery: %%l%%\" would result in the tile displaying \"Battery: 69%%\".\n\nLeaving this field blank will result in the tile displaying %1$s</string>
-    <string name="activity_edit_charging_tile_text_info_text">Customise the text displayed on the tile. The following placeholders can be used to display information regarding the battery on the tile:\n\n• %%c: Current of the battery in milliamperes\n• %%a: Average current of the battery in milliamperes\n• %%t: Temperature of the battery in Celsius\n• %%f: Temperature of the battery in Fahrenheit\n• %%v: Voltage of the battery\n• %%w: Wattage of the battery\n• %%l: Current battery percentage\n• %%h: Hours until battery is charged\n•%%m: Minutes until battery is charged\n\nSo, for example, setting the text to \"Battery: %%l%%\" would result in the tile displaying \"Battery: 69%%\".\n\nLeaving this field blank will result in the tile displaying %1$s</string>
+    <string name="activity_edit_charging_tile_text_info_text">Customise the text displayed on the tile. The following placeholders can be used to display information regarding the battery on the tile:\n\n• %%c: Current of the battery in milliamperes\n• %%a: Average current of the battery in milliamperes\n• %%t: Temperature of the battery in Celsius\n• %%f: Temperature of the battery in Fahrenheit\n• %%v: Voltage of the battery\n• %%w: Wattage of the battery\n• %%l: Current battery percentage\n• %%h: Hours until battery is charged\n• %%m: Minutes until battery is charged\n\nSo, for example, setting the text to \"Battery: %%l%%\" would result in the tile displaying \"Battery: 69%%\".\n\nLeaving this field blank will result in the tile displaying %1$s</string>
     <string name="activity_edit_tile_text_info_text_default_charging">the battery percentage and a charge time estimate.</string>
     <string name="activity_edit_tile_text_info_text_default_discharging">the battery percentage.</string>
     <string name="activity_edit_tile_text_save_success">Text saved!</string>
@@ -46,4 +46,4 @@
     <string name="menu_edit_title_save_button">Save</string>
     <string name="bottom_sheet_preferences_dynamic_tile_icon_title">Dynamic tile icon</string>
     <string name="bottom_sheet_preferences_dynamic_tile_icon_description">Display the power source in the tile icon when charging</string>
-</resources>
+</resources>
diff --git a/app/src/main/res/values-en-rUS/strings.xml b/app/src/main/res/values-en-rUS/strings.xml
@@ -35,7 +35,7 @@
     <string name="activity_edit_tile_text_title">Edit tile text</string>
     <string name="activity_edit_tile_text_text_input_hint">Tile text</string>
     <string name="activity_edit_discharging_tile_text_info_text">Customize the text displayed on the tile. The following placeholders can be used to display info regarding the battery on the tile:\n\n• %%c: Current of the battery in milliamperes\n• %%a: Average current of the battery in milliamperes\n• %%t: Temperature of the battery in Celsius\n• %%f: Temperature of the battery in Fahrenheit\n• %%v: Voltage of the battery\n• %%w: Wattage of the battery\n• %%l: Current battery percentage\n\nSo, for example, setting the text to \"Battery: %%l%%\" would result in the tile displaying \"Battery: 69%%\".\n\nLeaving this field blank will result in the tile displaying %1$s</string>
-    <string name="activity_edit_charging_tile_text_info_text">Customize the text displayed on the tile. The following placeholders can be used to display info regarding the battery on the tile:\n\n• %%c: Current of the battery in milliamperes\n• %%a: Average current of the battery in milliamperes\n• %%t: Temperature of the battery in Celsius\n• %%f: Temperature of the battery in Fahrenheit\n• %%v: Voltage of the battery\n• %%w: Wattage of the battery\n• %%l: Current battery percentage\n• %%h: Hours until battery is charged\n•%%m: Minutes until battery is charged\n\nSo, for example, setting the text to \"Battery: %%l%%\" would result in the tile displaying \"Battery: 69%%\".\n\nLeaving this field blank will result in the tile displaying %1$s</string>
+    <string name="activity_edit_charging_tile_text_info_text">Customize the text displayed on the tile. The following placeholders can be used to display info regarding the battery on the tile:\n\n• %%c: Current of the battery in milliamperes\n• %%a: Average current of the battery in milliamperes\n• %%t: Temperature of the battery in Celsius\n• %%f: Temperature of the battery in Fahrenheit\n• %%v: Voltage of the battery\n• %%w: Wattage of the battery\n• %%l: Current battery percentage\n• %%h: Hours until battery is charged\n• %%m: Minutes until battery is charged\n\nSo, for example, setting the text to \"Battery: %%l%%\" would result in the tile displaying \"Battery: 69%%\".\n\nLeaving this field blank will result in the tile displaying %1$s</string>
     <string name="activity_edit_tile_text_info_text_default_charging">the battery percentage and a charge time estimate.</string>
     <string name="activity_edit_tile_text_info_text_default_discharging">the battery percentage.</string>
     <string name="activity_edit_tile_text_save_success">Text saved!</string>
@@ -46,4 +46,4 @@
     <string name="menu_edit_title_save_button">Save</string>
     <string name="bottom_sheet_preferences_dynamic_tile_icon_title">Dynamic tile icon</string>
     <string name="bottom_sheet_preferences_dynamic_tile_icon_description">Display the power source in the tile icon when charging</string>
-</resources>
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -35,7 +35,7 @@
     <string name="activity_edit_tile_text_title">Edit tile text</string>
     <string name="activity_edit_tile_text_text_input_hint">Tile text</string>
     <string name="activity_edit_discharging_tile_text_info_text">Customise the text displayed on the tile. The following placeholders can be used to display information regarding the battery on the tile:\n\n• %%c: Current of the battery in milliamperes\n• %%a: Average current of the battery in milliamperes\n• %%t: Temperature of the battery in Celsius\n• %%f: Temperature of the battery in Fahrenheit\n• %%v: Voltage of the battery\n• %%w: Wattage of the battery\n• %%l: Current battery percentage\n\nSo, for example, setting the text to \"Battery: %%l%%\" would result in the tile displaying \"Battery: 69%%\".\n\nLeaving this field blank will result in the tile displaying %1$s</string>
-    <string name="activity_edit_charging_tile_text_info_text">Customise the text displayed on the tile. The following placeholders can be used to display information regarding the battery on the tile:\n\n• %%c: Current of the battery in milliamperes\n• %%a: Average current of the battery in milliamperes\n• %%t: Temperature of the battery in Celsius\n• %%f: Temperature of the battery in Fahrenheit\n• %%v: Voltage of the battery\n• %%w: Wattage of the battery\n• %%l: Current battery percentage\n• %%h: Hours until battery is charged\n•%%m: Minutes until battery is charged\n\nSo, for example, setting the text to \"Battery: %%l%%\" would result in the tile displaying \"Battery: 69%%\".\n\nLeaving this field blank will result in the tile displaying %1$s</string>
+    <string name="activity_edit_charging_tile_text_info_text">Customise the text displayed on the tile. The following placeholders can be used to display information regarding the battery on the tile:\n\n• %%c: Current of the battery in milliamperes\n• %%a: Average current of the battery in milliamperes\n• %%t: Temperature of the battery in Celsius\n• %%f: Temperature of the battery in Fahrenheit\n• %%v: Voltage of the battery\n• %%w: Wattage of the battery\n• %%l: Current battery percentage\n• %%h: Hours until battery is charged\n• %%m: Minutes until battery is charged\n\nSo, for example, setting the text to \"Battery: %%l%%\" would result in the tile displaying \"Battery: 69%%\".\n\nLeaving this field blank will result in the tile displaying %1$s</string>
     <string name="activity_edit_tile_text_info_text_default_charging">the battery percentage and a charge time estimate.</string>
     <string name="activity_edit_tile_text_info_text_default_discharging">the battery percentage.</string>
     <string name="activity_edit_tile_text_save_success">Text saved!</string>