Revert "#1607 rename parallel triggers to "combination""

This reverts commit 415bdc0.

Author: sds100

CHANGELOG.md

@@ -16,7 +16,6 @@ This is not an April Fool's joke ;)
 
 - Turn off flashlight when using decrease brightness action.
 - Animate floating buttons in and out.
-- #1607 rename parallel triggers to "combination"
 
 ## Bug fixes
 

app/src/main/res/values/strings.xml

@@ -153,7 +153,7 @@
     <!--  Hints  -->
 
     <!--  Radio buttons  -->
-    <string name="radio_button_parallel">Combination</string>
+    <string name="radio_button_parallel">At the same time</string>
     <string name="radio_button_sequence">In sequence</string>
     <string name="radio_button_and">AND</string>
     <string name="radio_button_or">OR</string>
@@ -417,7 +417,7 @@
 
     <string name="dialog_message_cant_find_accessibility_settings_page">Your device doesn\'t seem to have an accessibility services settings page. Tap \"guide\" to read the online guide that explains how to fix this.</string>
     <string name="dialog_message_parallel_trigger_order">The keys need to be listed from top to bottom in the order that they will be held down.</string>
-    <string name="dialog_message_sequence_trigger_explanation">A \"sequence\" trigger has a timeout unlike combination triggers. This means after you press the first key, you will have a set amount of time to input the rest of the keys in the trigger. All the keys that you have added to the trigger won\'t do their usual action until the timeout has been reached. You can change this timeout in the "Options" tab.</string>
+    <string name="dialog_message_sequence_trigger_explanation">A \"sequence\" trigger has a timeout unlike parallel triggers. This means after you press the first key, you will have a set amount of time to input the rest of the keys in the trigger. All the keys that you have added to the trigger won\'t do their usual action until the timeout has been reached. You can change this timeout in the "Options" tab.</string>
     <string name="dialog_message_bt_constraint_limitation">Android doesn\'t allow apps to get a list of connected (not paired) Bluetooth devices. Apps can only detect when they are connected and disconnected. So if your Bluetooth device is already connected to your device when the accessibility service starts, you will have to reconnect it for the app to know it is connected.</string>
     <string name="dialog_message_change_location_or_disable">Change location or turn off automatic back up?</string>
     <string name="dialog_message_screen_constraints_limitation">Screen on/off constraints will only work if you have turned on the \"detect trigger when screen is off\" key map option. This option will only show for some keys (e.g volume buttons) and if you are rooted. See a list of supported keys on the Help page.</string>