Skip to content

Commit ed0c4e9

Browse files
Merge pull request #14709 from nextcloud/backport/14674/stable-3.31
[stable-3.31] Use sentence style capitalization
2 parents 780136c + a74ef84 commit ed0c4e9

6 files changed

+24
-25
lines changed
Loading
Loading

Diff for: app/src/main/res/layout/list_header.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@
3434
<TextView
3535
android:id="@+id/recommended_files_title"
3636
android:text="@string/recommended_files_title"
37-
android:textSize="@dimen/large_title_text_size"
38-
android:gravity="center|start"
37+
android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
3938
android:layout_width="match_parent"
4039
android:layout_height="match_parent"
4140
android:layout_marginBottom="@dimen/standard_margin"
41+
android:gravity="center|start"
4242
android:textColor="@color/text_color" />
4343

4444
<androidx.recyclerview.widget.RecyclerView
@@ -50,10 +50,10 @@
5050
<TextView
5151
android:id="@+id/all_files_title"
5252
android:text="@string/drawer_item_all_files"
53-
android:textSize="@dimen/large_title_text_size"
54-
android:gravity="center|start"
53+
android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
5554
android:layout_width="match_parent"
5655
android:layout_height="match_parent"
56+
android:gravity="center|start"
5757
android:textColor="@color/text_color" />
5858

5959
</LinearLayout>

Diff for: app/src/main/res/values/dims.xml

-1
Original file line numberDiff line numberDiff line change
@@ -160,5 +160,4 @@
160160
<dimen name="tag_height">18dp</dimen>
161161
<dimen name="recommended_files_thumbnail_height">120dp</dimen>
162162
<dimen name="recommended_files_layout_width">150dp</dimen>
163-
<dimen name="large_title_text_size">22sp</dimen>
164163
</resources>

Diff for: app/src/main/res/values/strings.xml

+20-20
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<string name="menu_item_sort_by_date_oldest_first">Oldest first</string>
3030
<string name="menu_item_sort_by_size_biggest_first">Biggest first</string>
3131
<string name="menu_item_sort_by_size_smallest_first">Smallest first</string>
32-
<string name="oc_file_list_adapter_offline_operation_description_text">Pending Operation</string>
32+
<string name="oc_file_list_adapter_offline_operation_description_text">Pending operation</string>
3333
<string name="ecosystem_apps_display_assistant">Assistant</string>
3434
<string name="unexpected_error_occurred">Unexpected error occurred</string>
3535
<string name="app_config_disable_multiaccount_title">Disable Multi Account</string>
@@ -43,9 +43,9 @@
4343
<string name="app_config_proxy_port_title">Proxy Port</string>
4444
<string name="app_config_enforce_protection_title">Enforce Protection</string>
4545
<string name="offline_operations_file_does_not_exists_yet">File does not exists, yet. Please upload the file first.</string>
46-
<string name="offline_operations_worker_notification_delete_offline_folder">Delete Offline Folder</string>
47-
<string name="offline_operations_worker_notification_conflict_text">Conflicted Folder: %s</string>
48-
<string name="offline_operations_worker_notification_start_text">Starting Offline Operations</string>
46+
<string name="offline_operations_worker_notification_delete_offline_folder">Delete offline folder</string>
47+
<string name="offline_operations_worker_notification_conflict_text">Conflicting folder: %s</string>
48+
<string name="offline_operations_worker_notification_start_text">Starting offline operations</string>
4949
<string name="offline_operations_worker_notification_error_text">The offline operation cannot be completed. %s</string>
5050
<string name="offline_operations_worker_notification_manager_ticker">Offline Operations</string>
5151
<string name="offline_operations_worker_progress_text" translatable="false">%1$d / %2$d - %3$s</string>
@@ -55,10 +55,10 @@
5555
<string name="assistant_screen_task_list_error_state_message">Unable to fetch task list, please check your internet connection.</string>
5656

5757
<string name="assistant_screen_top_bar_title">Assistant</string>
58-
<string name="assistant_screen_loading">Task List are loading, please wait</string>
58+
<string name="assistant_screen_loading">Loading task list…</string>
5959
<string name="assistant_screen_task_output_empty_text">The task output is not ready yet.</string>
6060
<string name="assistant_screen_no_task_available_text">No task available for %s task type, you can create a new task from bottom right.</string>
61-
<string name="assistant_screen_delete_task_alert_dialog_title">Delete Task</string>
61+
<string name="assistant_screen_delete_task_alert_dialog_title">Delete task</string>
6262
<string name="assistant_screen_delete_task_alert_dialog_description">Are you sure you want to delete this task?</string>
6363
<string name="assistant_screen_add_task_alert_dialog_title">Add new task</string>
6464

@@ -74,7 +74,7 @@
7474

7575
<string name="assistant_task_detail_screen_input_button_title">Input</string>
7676
<string name="assistant_task_detail_screen_output_button_title">Output</string>
77-
<string name="recommended_files_title">Recommended Files</string>
77+
<string name="recommended_files_title">Recommended files</string>
7878

7979
<string name="drawer_item_assistant">Assistant</string>
8080
<string name="drawer_item_all_files">All files</string>
@@ -201,7 +201,7 @@
201201
<string name="filedetails_sync_file">Sync</string>
202202
<string name="filedetails_renamed_in_upload_msg">File renamed %1$s during upload</string>
203203
<string name="list_layout">Listed layout</string>
204-
<string name="action_send_share">Send/Share</string>
204+
<string name="action_send_share">Send/share</string>
205205
<string name="common_yes">Yes</string>
206206
<string name="common_no">No</string>
207207
<string name="common_ok">OK</string>
@@ -549,7 +549,7 @@
549549
<string name="log_send_no_mail_app">No app for sending logs found. Please install an email client.</string>
550550
<string name="log_send_mail_subject">%1$s Android app logs</string>
551551

552-
<string name="actionbar_move_or_copy">Move or Copy</string>
552+
<string name="actionbar_move_or_copy">Move or copy</string>
553553
<string name="file_list_empty_moving">Nothing in here. You can add a folder.</string>
554554

555555
<string name="folder_picker_choose_button_text">Choose</string>
@@ -648,7 +648,7 @@
648648
<string name="confirmation_remove_folders_alert">Do you really want to delete the selected items and their contents?</string>
649649
<string name="maintenance_mode">Server is in maintenance mode</string>
650650
<string name="offline_mode">No internet connection</string>
651-
<string name="offline_mode_info_title">You\'re Offline, But Work Continues</string>
651+
<string name="offline_mode_info_title">You\'re offline, but work continues</string>
652652
<string name="offline_mode_info_description">Even without an internet connection, you can organize your folders, create files. Once you\'re back online, your pending actions will automatically sync.</string>
653653
<string name="uploads_view_upload_status_waiting_for_charging">Awaiting charge</string>
654654
<string name="actionbar_search">Search</string>
@@ -854,7 +854,7 @@
854854
<string name="copy_move_to_encrypted_folder_not_supported">Copy/move into encrypted folder currently not supported.</string>
855855
<string name="untrusted_domain">Access through untrusted domain. Please see documentation for further info.</string>
856856
<string name="notification_channel_push_name">Push notifications</string>
857-
<string name="notification_channel_background_operations_name">Background Operations</string>
857+
<string name="notification_channel_background_operations_name">Background operations</string>
858858
<string name="notification_channel_background_operations_description">Show notifications to interact result of background operations</string>
859859
<string name="notification_channel_push_description">Show push notifications sent by the server: Mentions in comments, reception of new remote shares, announcements posted by an admin etc.</string>
860860
<string name="sendbutton_description">Send button icon</string>
@@ -982,7 +982,7 @@
982982
<string name="remove_notification_failed">Failed to remove notification.</string>
983983
<string name="notification_action_failed">Failed to execute action.</string>
984984
<string name="remove_push_notification">Remove</string>
985-
<string name="new_notification">New Notification</string>
985+
<string name="new_notification">New notification</string>
986986
<string name="storage_choose_location">Choose storage location</string>
987987
<string name="storage_internal_storage">Internal storage</string>
988988
<string name="storage_external_storage">External storage</string>
@@ -1003,7 +1003,7 @@
10031003
<string name="failed_to_print">Failed to print file</string>
10041004
<string name="autoupload_disable_power_save_check">Disable power save check</string>
10051005
<string name="power_save_check_dialog_message">Disabling power save check might result in uploading files when in low battery state!</string>
1006-
<string name="etm_title">Engineering Test Mode</string>
1006+
<string name="etm_title">Engineering test mode</string>
10071007
<string name="etm_accounts">Accounts</string>
10081008
<string name="etm_preferences">Preferences</string>
10091009
<string name="etm_background_jobs">Background jobs</string>
@@ -1068,7 +1068,7 @@
10681068
<string name="sync_not_enough_space_dialog_action_free_space">Free up space</string>
10691069
<string name="sync_not_enough_space_dialog_placeholder">%1$s is %2$s, but there is only %3$s available on device.</string>
10701070
<string name="sync_not_enough_space_dialog_title">Not enough space</string>
1071-
<string name="conflict_folder_headline">Folder Conflict</string>
1071+
<string name="conflict_folder_headline">Folder conflict</string>
10721072
<string name="conflict_message_description_for_folder">If you select both versions, the local folder will have a number appended to its name.</string>
10731073
<string name="conflict_message_description">If you select both versions, the local file will have a number appended to its name.</string>
10741074
<string name="conflict_local_file">Local file</string>
@@ -1157,13 +1157,13 @@
11571157
<string name="share_permission_can_edit">Can edit</string>
11581158
<string name="share_permission_file_drop">File drop</string>
11591159
<string name="share_permission_secure_file_drop">Secure file drop</string>
1160-
<string name="share_permissions">Share Permissions</string>
1161-
<string name="advanced_settings">Advanced Settings</string>
1160+
<string name="share_permissions">Share permissions</string>
1161+
<string name="advanced_settings">Advanced settings</string>
11621162
<string name="common_next">Next</string>
1163-
<string name="send_share">Send Share</string>
1163+
<string name="send_share">Send share</string>
11641164
<string name="no_share_permission_selected">Please select at least one permission to share.</string>
1165-
<string name="share_copy_link">Share and Copy Link</string>
1166-
<string name="set_note">Set Note</string>
1165+
<string name="share_copy_link">Share and copy link</string>
1166+
<string name="set_note">Set note</string>
11671167
<string name="share_send_new_email">Send new email</string>
11681168
<string name="link_name">Link Name</string>
11691169
<string name="delete_link">Delete Link</string>
@@ -1231,7 +1231,7 @@
12311231
<string name="error_file_actions">Error showing file actions</string>
12321232
<string name="file_activity_shared_file_cannot_be_updated">Shared file cannot be updated</string>
12331233
<string name="retry">Retry</string>
1234-
<string name="pin_home">Pin to Home screen</string>
1234+
<string name="pin_home">Pin to home screen</string>
12351235
<string name="pin_shortcut_label">Open %1$s</string>
12361236
<string name="displays_mnemonic">Displays your 12 word passphrase</string>
12371237
<string name="internet_connection_required_for_encrypted_folder_setup">An internet connection is required to set up the encrypted folder</string>

0 commit comments

Comments
 (0)