Skip to content
This repository was archived by the owner on Oct 18, 2024. It is now read-only.

Commit 882ec83

Browse files
committed
fix(resources): reformat termux strings to make them single-line
This is required so that the strings are not messed up in Crowdin
1 parent 10b920a commit 882ec83

File tree

2 files changed

+10
-27
lines changed

2 files changed

+10
-27
lines changed

resources/src/main/res/values/termux_app_strings.xml

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,8 @@
2424
<string name="bootstrap_error_body">AndroidIDE was unable to install the bootstrap packages.</string>
2525
<string name="bootstrap_error_abort">Abort</string>
2626
<string name="bootstrap_error_try_again">Try again</string>
27-
<string name="bootstrap_error_not_primary_user_message">AndroidIDE can only be run as the primary user.
28-
\nBootstrap binaries compiled for AndroidIDE have hardcoded $PREFIX path and cannot be installed
29-
under any path other than:\n%1$s.</string>
30-
<string name="bootstrap_error_installed_on_portable_sd">AndroidIDE cannot be installed on
31-
portable/external/removable sd card on your device.
32-
\nBootstrap binaries compiled for AndroidIDE have hardcoded $PREFIX path and cannot be installed
33-
under any path other than:\n%1$s.</string>
34-
35-
27+
<string name="bootstrap_error_not_primary_user_message">AndroidIDE can only be run as the primary user.\nBootstrap binaries compiled for AndroidIDE have hardcoded $PREFIX path and cannot be installed under any path other than:\n%1$s.</string>
28+
<string name="bootstrap_error_installed_on_portable_sd">AndroidIDE cannot be installed on portable/external/removable sd card on your device.\nBootstrap binaries compiled for AndroidIDE have hardcoded $PREFIX path and cannot be installed under any path other than:\n%1$s.</string>
3629

3730
<!-- Terminal Sidebar and Shortcuts -->
3831
<string name="action_new_session">New session</string>
@@ -92,9 +85,7 @@
9285

9386

9487
<!-- TermuxService -->
95-
<string name="error_display_over_other_apps_permission_not_granted_to_start_terminal">AndroidIDE requires
96-
\"Display over other apps\" permission to start terminal sessions from background on Android >= 10.
97-
Grants it from Settings -> Apps -> AndroidIDE -> Advanced</string>
88+
<string name="error_display_over_other_apps_permission_not_granted_to_start_terminal">AndroidIDE requires \"Display over other apps\" permission to start terminal sessions from background on Android >= 10. Grants it from Settings -> Apps -> AndroidIDE -> Advanced</string>
9889
<string name="error_termux_service_invalid_execution_command_runner" translatable="false">Invalid execution command runner to TermuxService: `%1$s`</string>
9990
<string name="error_termux_service_unsupported_execution_command_runner" translatable="false">Unsupported execution command runner to TermuxService: `%1$s`</string>
10091
<string name="error_termux_service_unsupported_execution_command_shell_create_mode" translatable="false">Unsupported execution command shell create mode to TermuxService: `%1$s`</string>
@@ -126,8 +117,7 @@
126117
<!-- Terminal View Key Logging -->
127118
<string name="termux_terminal_view_key_logging_enabled_title">Terminal View Key Logging</string>
128119
<string name="termux_terminal_view_key_logging_enabled_off">Logs will not have entries for terminal view keys. (Default)</string>
129-
<string name="termux_terminal_view_key_logging_enabled_on">Logcat logs will have entries for terminal view keys.
130-
These are very verbose and should be disabled under normal circumstances or will cause performance issues.</string>
120+
<string name="termux_terminal_view_key_logging_enabled_on">Logcat logs will have entries for terminal view keys. These are very verbose and should be disabled under normal circumstances or will cause performance issues.</string>
131121

132122
<!-- Crash Report Notifications -->
133123
<string name="termux_crash_report_notifications_enabled_title">Crash Report Notifications</string>
@@ -149,10 +139,8 @@
149139

150140
<!-- Soft Keyboard Only If No Hardware-->
151141
<string name="termux_soft_keyboard_enabled_only_if_no_hardware_title">Soft Keyboard Only If No Hardware</string>
152-
<string name="termux_soft_keyboard_enabled_only_if_no_hardware_off">Soft keyboard will be enabled even if
153-
hardware keyboard is connected. (Default)</string>
154-
<string name="termux_soft_keyboard_enabled_only_if_no_hardware_on">Soft keyboard will be enabled only if
155-
no hardware keyboard is connected.</string>
142+
<string name="termux_soft_keyboard_enabled_only_if_no_hardware_off">Soft keyboard will be enabled even if hardware keyboard is connected. (Default)</string>
143+
<string name="termux_soft_keyboard_enabled_only_if_no_hardware_on">Soft keyboard will be enabled only if no hardware keyboard is connected.</string>
156144

157145

158146
<!-- Terminal View Preferences -->
@@ -165,8 +153,6 @@
165153
<!-- Terminal View Margin Adjustment -->
166154
<string name="termux_terminal_view_terminal_margin_adjustment_title">Terminal Margin Adjustment</string>
167155
<string name="termux_terminal_view_terminal_margin_adjustment_off">Terminal margin adjustment will be disabled.</string>
168-
<string name="termux_terminal_view_terminal_margin_adjustment_on">Terminal margin adjustment will be enabled.
169-
It should be enabled to try to fix the issue where soft keyboard covers part of extra keys/terminal view.
170-
If it causes screen flickering on your devices, then disable it. (Default)</string>
156+
<string name="termux_terminal_view_terminal_margin_adjustment_on">Terminal margin adjustment will be enabled. It should be enabled to try to fix the issue where soft keyboard covers part of extra keys/terminal view. If it causes screen flickering on your devices, then disable it. (Default)</string>
171157

172158
</resources>

resources/src/main/res/values/termux_shared_strings.xml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@
2424
<!-- PackageUtils -->
2525
<string name="error_app_not_installed_or_disabled_warning">The %1$s (%2$s) app is not installed or is disabled.</string>
2626
<string name="error_get_package_context_failed_title">Failed To Get Package Context</string>
27-
<string name="error_get_package_context_failed_message">Failed to get package context for the \"%1$s\" package.
28-
This may be because the app package is not installed or it has different APK signature from the current app.</string>
27+
<string name="error_get_package_context_failed_message">Failed to get package context for the \"%1$s\" package. This may be because the app package is not installed or it has different APK signature from the current app.</string>
2928
<string name="error_get_package_context_failed_help_url_message">Check %1$s for more details.</string>
3029
<string name="error_get_component_state_failed">Failed to get %1$s/%2$s component state</string>
3130
<string name="error_enable_component_failed">Failed to enable %1$s/%2$s component</string>
@@ -49,15 +48,13 @@
4948

5049

5150
<!-- TermuxPluginUtils -->
52-
<string name="error_allow_external_apps_ungranted">%1$s requires `allow-external-apps`
53-
property to be set to `true` in `%2$s` file.</string>
51+
<string name="error_allow_external_apps_ungranted">%1$s requires `allow-external-apps` property to be set to `true` in `%2$s` file.</string>
5452

5553

5654

5755
<!-- ReportActivity -->
5856
<string name="title_report_text">Report Text</string>
59-
<string name="msg_report_truncated">**Report Truncated**\n\nReport is too large to view here.
60-
Use `Save To File` option from options menu (3-dots on top right) and view it in an external text editor app.\n\n##\n\n</string>
57+
<string name="msg_report_truncated">**Report Truncated**\n\nReport is too large to view here. Use `Save To File` option from options menu (3-dots on top right) and view it in an external text editor app.\n\n##\n\n</string>
6158

6259

6360

0 commit comments

Comments
 (0)