sync from main

This commit is contained in:
Jimmy Shih
2012-03-20 11:14:35 -07:00
parent 7318884583
commit 21ba44d422
34 changed files with 1874 additions and 1734 deletions
+1 -2
View File
@@ -1537,8 +1537,7 @@ limitations under the License.
and it will overwrite all the current tracks and settings.
Screenshot: settings_backup_restore_confirm_message.png">
Restoring a backup from the SD card will overwrite all your current tracks and settings. Are you
sure?
Restoring a backup from the SD card will overwrite all your current tracks and settings.
</string>
<string name="settings_backup_restore_no_backup"
translation_description="In the 'Backup' settings, after pressing the 'Restore now' option, the