merge heads

This commit is contained in:
Jimmy Shih
2011-11-04 14:11:47 -07:00
43 changed files with 601 additions and 281 deletions
+1 -1
View File
@@ -161,7 +161,7 @@ limitations under the License.
<string name="waypointdetails_category_hint">Tipo di segnaposto</string>
<!-- MyTracks Settings -->
<string name="mytracks_settings">Impostazioni di My Tracks</string>
<string name="settings_title">Impostazioni di My Tracks</string>
<string name="settings_display">Visualizzazione</string>
<string name="settings_recording">Registrazione</string>
<string name="settings_sharing">Condivisione</string>