Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-01-01 12:55:58 +01:00
commit 089df6c4fe
4 changed files with 4 additions and 4 deletions

View file

@ -816,7 +816,7 @@
<string name="search_address_building">Hausnummer</string>
<string name="search_address_building_option">Hausnummer</string>
<string name="search_address_street_option">Querstraße</string>
<string name="search_tabs_location">Position</string>
<!-- string name="search_tabs_location">Position</string -->
<string name="context_menu_item_update_map">Karte aktualisieren</string>

View file

@ -1990,7 +1990,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="search_address_building">Building</string>
<string name="search_address_building_option">Building</string>
<string name="search_address_street_option">Intersecting street</string>
<string name="search_tabs_location">Location</string>
<!-- string name="search_tabs_location">Location</string -->
<string name="context_menu_item_update_map">Update map</string>
<string name="context_menu_item_create_poi">Create POI</string>

View file

@ -93,7 +93,7 @@ public class SearchActivity extends TabActivity implements OsmAndLocationListene
List<TabItem> mTabs = new ArrayList<TabItem>();
mTabs.add(getTabIndicator(R.string.poi, getFragment(POI_TAB_INDEX)));
mTabs.add(getTabIndicator(R.string.address, getFragment(ADDRESS_TAB_INDEX)));
mTabs.add(getTabIndicator(R.string.search_tabs_location, getFragment(LOCATION_TAB_INDEX)));
mTabs.add(getTabIndicator(R.string.shared_string_location, getFragment(LOCATION_TAB_INDEX)));
mTabs.add(getTabIndicator(R.string.favorite, getFragment(FAVORITES_TAB_INDEX)));
mTabs.add(getTabIndicator(R.string.shared_string_history, getFragment(HISTORY_TAB_INDEX)));

View file

@ -86,7 +86,7 @@ public class ShareMenu extends BaseMenuController {
if (!Algorithms.isEmpty(title)) {
sb.append(title).append("\n");
}
sb.append(getMapActivity().getString(R.string.search_tabs_location)).append(": ");
sb.append(getMapActivity().getString(R.string.shared_string_location)).append(": ");
sb.append(geoUrl).append("\n").append(httpUrl);
String sms = sb.toString();
switch (item) {