merge heads

This commit is contained in:
Jimmy Shih
2012-03-21 13:05:41 -07:00
76 changed files with 281 additions and 529 deletions
+5
View File
@@ -1292,6 +1292,11 @@ limitations under the License.
found.">
No account found
</string>
<string name="send_google_no_service_selected"
translation_description="When sending a track to Google, a message indicating that the user has
not selected any Google service and no data is sent.">
You did not select any service. No data is sent.
</string>
<string name="send_google_progress_title"
translation_description="When sending a track to a Google service, the title on the progress
dialog.