Merge heads

This commit is contained in:
youtaol
2012-08-24 12:42:57 +08:00
parent bc37316fa5
commit 9859e4ff14
14 changed files with 373 additions and 345 deletions
+7 -2
View File
@@ -683,12 +683,17 @@ limitations under the License.
translation_description="On application start, message when there is no GPS on the device.">
No GPS is found on the device.
</string>
<string name="gps_wait_for_signal"
<string name="gps_wait_for_better_signal"
translation_description="In the main view, the message on the top indicating My Tracks is
waiting for a better GPS signal.">
Waiting for a better GPS signal. Make sure the sky is visible.
</string>
<string name="gps_wait_for_signal"
translation_description="In the main view, the message on the top indicating My Tracks is
waiting for a better GPS signal.">
Waiting for GPS signal. Make sure the sky is visible.
</string>
<!-- Help page -->
<string name="help_about"
translation_description="In the 'Help' page, the button on the bottom to open the 'About My