Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-03-09 13:32:21 +01:00
commit bc2f8b72a2
2 changed files with 1 additions and 2 deletions

View file

@ -167,7 +167,6 @@
<string name="proxy_pref_descr">Setup a proxy internet communication</string> <string name="proxy_pref_descr">Setup a proxy internet communication</string>
<string name="settings_privacy">Privacy</string> <string name="settings_privacy">Privacy</string>
<string name="points">Points</string> <string name="points">Points</string>
<string name="tracks">Tracks</string>
<string name="osm_editing_manage">Manage</string> <string name="osm_editing_manage">Manage</string>
<string name="navigation_over_track">Start navigation over track?</string> <string name="navigation_over_track">Start navigation over track?</string>
<string name="avoid_roads_msg">You can trigger an alternative route by selecting roads to avoid</string> <string name="avoid_roads_msg">You can trigger an alternative route by selecting roads to avoid</string>

View file

@ -49,7 +49,7 @@ public class DashTrackFragment extends DashBaseFragment {
Typeface typeface = FontCache.getRobotoMedium(getActivity()); Typeface typeface = FontCache.getRobotoMedium(getActivity());
TextView header = (TextView) view.findViewById(R.id.fav_text); TextView header = (TextView) view.findViewById(R.id.fav_text);
header.setTypeface(typeface); header.setTypeface(typeface);
header.setText(R.string.tracks); header.setText(R.string.shared_string_my_tracks);
((Button) view.findViewById(R.id.show_all)).setTypeface(typeface); ((Button) view.findViewById(R.id.show_all)).setTypeface(typeface);