Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-01-23 16:54:24 +01:00
commit 161fd18f42
2 changed files with 2 additions and 2 deletions

View file

@ -15,7 +15,7 @@
<string name="settings_privacy">Privacy</string>
<string name="recents">RECENTS</string>
<string name="navigation_over_track">Start navigation over track?</string>
<string name="avoid_roads_msg">You can change route by selecting roads to avoid</string>
<string name="avoid_roads_msg">You can trigger an alternative route by selecting roads to avoid</string>
<string name="rendering_value__name">Default</string>
<string name="speak_pedestrian">Announce pedestrian crosswalks</string>
<string name="rendering_attr_roadStyle_name">Road style</string>

View file

@ -123,7 +123,7 @@ public class AvoidSpecificRoads {
selectFromMap(mapActivity);
}
});
bld.setNegativeButton(R.string.default_buttons_cancel, null);
bld.setNegativeButton(R.string.close, null);
bld.show();
}