|
13 | 13 | <string name="action_send_share">Send/share</string> |
14 | 14 | <string name="action_switch_grid_view">Grid view</string> |
15 | 15 | <string name="action_switch_list_view">List view</string> |
| 16 | + <string name="action_triggered">Action triggered</string> |
16 | 17 | <string name="actionbar_calendar_contacts_restore">Restore contacts and calendar</string> |
17 | 18 | <string name="actionbar_mkdir">New folder</string> |
18 | 19 | <string name="actionbar_move_or_copy">Move or copy</string> |
|
396 | 397 | <string name="failed_to_create_conflict_dialog">Failed to create conflict dialog</string> |
397 | 398 | <string name="failed_to_download">Failed to pass file to download manager</string> |
398 | 399 | <string name="failed_to_print">Failed to print file</string> |
| 400 | + <string name="failed_to_start_action">Failed to start action!</string> |
399 | 401 | <string name="failed_to_start_editor">Failed to start editor</string> |
400 | 402 | <string name="failed_update_ui">Failed to update UI</string> |
401 | 403 | <string name="favorite">Add to favourites</string> |
|
755 | 757 | <string name="prefs_two_way_sync_interval">Interval</string> |
756 | 758 | <string name="prefs_two_way_sync_summary">Manage internal folders for two way sync</string> |
757 | 759 | <string name="prefs_two_way_sync_switch_title">Enable two way sync</string> |
| 760 | + <string name="prefs_two_way_sync_title">Two way sync</string> |
758 | 761 | <string name="prefs_value_theme_dark">Dark</string> |
759 | 762 | <string name="prefs_value_theme_light">Light</string> |
760 | 763 | <string name="prefs_value_theme_system">Follow system</string> |
|
960 | 963 | <string name="suggest">Suggest</string> |
961 | 964 | <string name="sync">Sync</string> |
962 | 965 | <string name="sync_anyway">Sync anyway</string> |
| 966 | + <string name="sync_conflict_notification_action_title">Resolve conflicts</string> |
| 967 | + <string name="sync_conflict_notification_description">Upload conflicts detected. Open uploads to resolve.</string> |
| 968 | + <string name="sync_conflict_notification_title">File upload conflicts</string> |
963 | 969 | <string name="sync_conflicts_in_favourites_ticker">Conflicts found</string> |
964 | 970 | <string name="sync_current_folder_was_removed">The folder %1$s does not exist any more</string> |
965 | 971 | <string name="sync_duplication">Sync duplication</string> |
|
0 commit comments