merge heads

This commit is contained in:
Jimmy Shih
2012-04-06 12:59:38 -07:00
parent 6c7131f2a8
commit 70124b8465
21 changed files with 302 additions and 367 deletions
+5 -3
View File
@@ -986,8 +986,9 @@ limitations under the License.
Edit
</string>
<string name="menu_export_all"
translation_description="In the menu, to export all the tracks to the SD card.">
Export all
translation_description="In the menu, to export all the tracks to the SD card. This menu item
has a submenu.">
Export all...
</string>
<string name="menu_export_all_format"
translation_description="Under the 'Export all' menu option, the option to export all tracks as
@@ -1033,7 +1034,8 @@ limitations under the License.
Satellite mode
</string>
<string name="menu_save"
translation_description="In the menu, to save a track to the SD card.">
translation_description="In the menu, to save a track to the SD card. This menu item has a
submenu.">
Save to SD card...
</string>
<string name="menu_save_format"