diff options
Diffstat (limited to '')
| -rw-r--r-- | src/main/res/layout/activity_import_backup.xml | 13 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 8 |
2 files changed, 17 insertions, 4 deletions
diff --git a/src/main/res/layout/activity_import_backup.xml b/src/main/res/layout/activity_import_backup.xml index bc5ccecc1..e9ee433fe 100644 --- a/src/main/res/layout/activity_import_backup.xml +++ b/src/main/res/layout/activity_import_backup.xml @@ -13,6 +13,19 @@ android:id="@+id/toolbar" layout="@layout/toolbar" /> + <LinearLayout + android:id="@+id/in_progress" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:gravity="center" + android:visibility="gone"> + + <ProgressBar + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" /> + </LinearLayout> + <android.support.design.widget.CoordinatorLayout android:id="@+id/coordinator" android:layout_width="match_parent" diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 1f227a3ff..058ae89e0 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -317,7 +317,7 @@ <string name="pref_create_backup">Create backup</string> <string name="pref_create_backup_summary">Write backup files to %s</string> <string name="notification_create_backup_title">Creating backup files</string> - <string name="notification_restore_backup_title">Restoring backup</string> + <string name="restoring_backup">Restoring backup</string> <string name="notification_restored_backup_title">Your backup has been restored</string> <string name="notification_restored_backup_subtitle">Do not forget to enable the account.</string> <string name="choose_file">Choose file</string> @@ -823,7 +823,7 @@ <string name="pref_more_notification_settings">Notification Settings</string> <string name="pref_more_notification_settings_summary">Importance, Sound, Vibrate</string> <string name="video_compression_channel_name">Video compression</string> - <string name="backup_channel_name"><![CDATA[Backup & Restore]]></string> + <string name="backup_channel_name">Backup & Restore</string> <string name="app_update_channel_name">App update</string> <string name="action_group_details">Group details</string> <string name="view_media">View media</string> @@ -866,6 +866,6 @@ <string name="restore">Restore</string> <string name="enter_password_to_restore">Enter your password for the account %s to restore the backup.</string> <string name="restore_warning">Do not use the restore backup feature in an attempt to clone (run simultaneously) an installation. Restoring a backup is only meant for migrations or in case you have lost the original device.</string> - <string name="unable_to_restore_backup">Unable to restore backup</string> - <string name="unable_to_decrypt_backup">Unable to decrypt backup</string> + <string name="unable_to_restore_backup">Unable to restore backup.</string> + <string name="unable_to_decrypt_backup">Unable to decrypt backup. Is the password correct?</string> </resources> |