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
@@ -163,7 +163,7 @@ limitations under the License.
<string name="waypointdetails_category_hint">Markörtyp</string>
<!-- MyTracks Settings -->
<string name="mytracks_settings">My Tracks inställningar</string>
<string name="settings_title">My Tracks inställningar</string>
<string name="settings_display">Visning</string>
<string name="settings_recording">Inspelning</string>
<string name="settings_sharing">Delning</string>