diff --git a/OsmAnd/res/values-en-rGB/phrases.xml b/OsmAnd/res/values-en-rGB/phrases.xml new file mode 100644 index 0000000000..39b5d0648d --- /dev/null +++ b/OsmAnd/res/values-en-rGB/phrases.xml @@ -0,0 +1,149 @@ + + + + + Shop + Filling station + Waste disposal + Convenience store + Farm shop + Wine shop + Bicycle shop + Art shop + Bag shop + Carpet shop + Charity shop + Chemist + Clothes shop + Childrens clothing + Shoe shop + Candles shop + Computer shop + Copy shop + Curtain shop + Drapery shop + Erotic shop + Fashion shop + Heating units shop + Furniture shop + Garden centre + Garden furniture shop + Liquid gas shop + Herb shop + HiFi shop + Interior decoration shop + Jewelry shop + Leather shop + Cell phone shop + Motorcycle shop + Music shop + News agent + Optician + Outdoor shop + Paint shop + Pet shop + Photo shop + Radiotechnics shop + Second hand shop + Scuba diving goods shop + Stationery shop + Tableware shop + Tobacco shop + Tyre store + Vacuum cleaner shop + Video shop + Window blind shop + Electronics shop + Energy shop + Car shop + Car parts + Swimming pool goods shop + Weapons shop + Perfume shop + + traffic sigal + + Tyres + Petrol station + + Railway station + Railway platform + Railway stop + Underground entrance + Underground station + Railway buffer stop + + Type: recycling centre + + Waste disposal + Waste basket + + Railway area + + Healthcare centre + + Sports center + + Theatre club + + Arts centre + + Community centre + Social centre + Theatre + + Harbour basin + Harbour + + With traffic signals + + Railway crossing + + Railway tunnel + Railway bridge + + + Route of a railway + + Historic railway station + Historic railway + + Counselling (addiction): yes + Counselling (addiction): no + Counselling (antenatal): yes + Counselling (antenatal): no + Counselling (child guidance): yes + Counselling (child guidance): no + Counselling (couple): yes + Counselling (couple): no + Counselling (crisis): yes + Counselling (crisis): no + Counselling (drugs): yes + Counselling (drugs): no + Counselling (education): yes + Counselling (education): no + Counselling (family): yes + Counselling (family): no + Counselling (homeless): yes + Counselling (homeless): no + Counselling (immigrant): yes + Counselling (immigrant): no + Counselling (marriage): yes + Counselling (marriage): no + Counselling (nutrition): yes + Counselling (nutrition): no + Counselling (rehabilitation): yes + Counselling (rehabilitation): no + Counselling (sexual): yes + Counselling (sexual): no + Counselling (sexual abuse): yes + Counselling (sexual abuse): no + Counselling (victim): yes + Counselling (victim): no + Counselling (violence): yes + Counselling (violence): no + + diff --git a/OsmAnd/res/values-en-rGB/strings.xml b/OsmAnd/res/values-en-rGB/strings.xml new file mode 100644 index 0000000000..8816e4a8c0 --- /dev/null +++ b/OsmAnd/res/values-en-rGB/strings.xml @@ -0,0 +1,46 @@ + + + + + Default colour + Colouring according to route scope + Colouring according to OSMC + Favourite + Favourites + Add to Favourites + My Favourites + Pedestrian crossing + Show pedestrian crossings + Underground routes + The favourite point name has been modified to %1$s to facilitate properly saving the string with emoticons to a file. + Favourite point name duplicate + Specified favourite name already in use, was changed to %1$s to avoid duplication. + Nearby Favourites + Colour-code buildings by type + Display colour + Select favourite + Select a road colour scheme: + Road colour scheme + Favourites search + File with previously exported favourites already exists. Do you want to replace it? + Favourites… + Favourite point(s) deleted successfully. + You are going to delete %1$d favourite(s) and %2$d favourite group(s). Are you sure? + Favourites successfully imported + Favourites successfully saved to {0} + No favourite points to save + Favourites shared via OsmAnd + Favourite point was edited + No favourite points exist + Enter favourite name + Favourite + Favourite point \'\'{0}\'\' was added successfully. + Add favourite + Edit favourite + Delete favourite + Delete favourite point \'%s\'? + Favourite point {0} was successfully deleted. + diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml index d1927c00c2..9a0f3bc1fc 100644 --- a/OsmAnd/res/values/phrases.xml +++ b/OsmAnd/res/values/phrases.xml @@ -1,12 +1,12 @@  - Shop + Store Food store Emergency Transportation Road obstacle - Filling station + Gas station Personal transport Public transport Air transport @@ -57,7 +57,7 @@ Beverage store Meat market Deli - Farm shop + Farm store Greengrocery Seafood store Confectionery @@ -68,21 +68,20 @@ Pastry shop Dairy shop Vending machine - Wine shop - + Wine store Bookstore - Bicycle shop + Bicycle store Anime shop Antiques store - Art shop + Art store Baby goods - Bag shop + Bag store Bathroom furnishings Bedding store Fashion boutique Cameras and lenses - Carpet shop - Charity shop + Carpet store + Charity store Drug store Apparel store Childrens apparel @@ -90,19 +89,19 @@ Candles store Computer store Copy shop - Curtain shop - Drapery shop + Curtain store + Drapery store Diving equipment Home improvement store Doors - Erotic shop - Fashion shop + Erotic store + Fashion store Fishing tackle Flower shop Picture frame shop Free flying goods store - Heating units shop + Heating units store Furniture store Garden center Garden furniture store @@ -120,31 +119,31 @@ Jewelry store Kiosk Kitchen furnishings - Leather shop + Leather store Medical supply Cell phone store - Motorcycle shop - Music shop + Motorcycle store + Music store Musical instruments - Newsagency + Newsagent Optometrist Organic food Outdoor store - Paint shop - Pet shop + Paint store + Pet store Photo shop Radiotechnics store Second hand store Scuba diving goods store Ship chandler Sporting goods - Stationery shop - Tableware shop - Ticket shop + Stationery store + Tableware store + Ticket sales Tobacco store - Toys store + Toyshop Trading post - Tyres store + Tire store Vacuum cleaner store Variety store Video store @@ -152,8 +151,8 @@ Department store Electronics store Energy store - Car shop - Car parts + Car dealer + Auto parts Quad store Cosmetics Marketplace @@ -166,7 +165,7 @@ Video games Pyrotechnics Weapons store - Perfume shop + Perfume store Police Fire station @@ -244,12 +243,12 @@ Tram stop Public transport station Bus station - Railway station - Railway platform - Railway stop + Railroad station + Railroad platform + Railroad stop Subway entrance Subway station - Railway buffer stop + Railroad buffer stop Taxi stand Airport @@ -322,7 +321,7 @@ Recycling - Type: recycling centre + Type: recycling center Type: container Glass Paper @@ -361,7 +360,7 @@ Mobile phones Hydrargyrum Computers - Tyres + Tires TV, monitors Tetrapak Rubble @@ -392,8 +391,8 @@ Landfill Nuclear waste - Waste disposal - Waste basket + Trash disposal + Trash can Industrial area Quarry @@ -787,12 +786,12 @@ Ski rental Library - Arts centre + Arts center Cinema Casino - Community centre - Social centre - Theatre + Community center + Social center + Theater Circus Art gallery Dance floor @@ -956,8 +955,8 @@ Seamark dyke Floating dock Fog signal - Harbour basin - Harbour + Harbor basin + Harbor Landmark Light, seamark Major light, seamark @@ -1854,11 +1853,11 @@ Water tunnel Road tunnel Pedestrian tunnel - Railway tunnel + Railroad tunnel Road bridge Pedestrian bridge Bicycle bridge - Railway bridge + Railroad bridge Waterway bridge Bridge structure: beam Bridge structure: simple suspension @@ -1919,7 +1918,7 @@ Funicular Ferry - Route of a railway + Route of a railroad Historical object Surveillance: yes @@ -2337,7 +2336,7 @@ Pa (maori fortified settlement) Historic farm - Historic railway station + Historic railroad station Masonic Lodge Sailing club @@ -2345,7 +2344,7 @@ Historic threshing floor Historic gallows - Historic railway + Historic railroad Square Artist @@ -2534,7 +2533,7 @@ Building type: pyramid - Fitness centre + Fitness center Fitness Billiards @@ -2719,7 +2718,7 @@ Medical office Health facility type: field hospital - Health facility type: counselling centre + Health facility type: counselling center Health facility type: laboratory Health facility type: therapy Health facility type: department @@ -2754,40 +2753,40 @@ Role of health worker: technician Role of health worker: witchdoctor - Counselling (addiction): yes - Counselling (addiction): no - Counselling (antenatal): yes - Counselling (antenatal): no - Counselling (child guidance): yes - Counselling (child guidance): no - Counselling (couple): yes - Counselling (couple): no - Counselling (crisis): yes - Counselling (crisis): no - Counselling (drugs): yes - Counselling (drugs): no - Counselling (education): yes - Counselling (education): no - Counselling (family): yes - Counselling (family): no - Counselling (homeless): yes - Counselling (homeless): no - Counselling (immigrant): yes - Counselling (immigrant): no - Counselling (marriage): yes - Counselling (marriage): no - Counselling (nutrition): yes - Counselling (nutrition): no - Counselling (rehabilitation): yes - Counselling (rehabilitation): no - Counselling (sexual): yes - Counselling (sexual): no - Counselling (sexual abuse): yes - Counselling (sexual abuse): no - Counselling (victim): yes - Counselling (victim): no - Counselling (violence): yes - Counselling (violence): no + Counseling (addiction): yes + Counseling (addiction): no + Counseling (antenatal): yes + Counseling (antenatal): no + Counseling (child guidance): yes + Counseling (child guidance): no + Counseling (couple): yes + Counseling (couple): no + Counseling (crisis): yes + Counseling (crisis): no + Counseling (drugs): yes + Counseling (drugs): no + Counseling (education): yes + Counseling (education): no + Counseling (family): yes + Counseling (family): no + Counseling (homeless): yes + Counseling (homeless): no + Counseling (immigrant): yes + Counseling (immigrant): no + Counseling (marriage): yes + Counseling (marriage): no + Counseling (nutrition): yes + Counseling (nutrition): no + Counseling (rehabilitation): yes + Counseling (rehabilitation): no + Counseling (sexual): yes + Counseling (sexual): no + Counseling (sexual abuse): yes + Counseling (sexual abuse): no + Counseling (victim): yes + Counseling (victim): no + Counseling (violence): yes + Counseling (violence): no Provided for infants: yes Provided for infants: no @@ -2813,8 +2812,8 @@ Inpatient services: yes Inpatient services: no Inpatient services: only - Counselling: yes - Counselling: no + Counseling: yes + Counseling: no Emergency: yes Emergency: no Home visit: yes diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 9e6aff39cb..60354d7038 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -877,6 +877,7 @@ Chinese Portuguese (Brazil) English + English (United Kingdom) Afrikaans Albanian Arabic diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java index 97b16d6f61..7b664f32b0 100644 --- a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java @@ -175,6 +175,7 @@ public class SettingsGeneralActivity extends SettingsBaseActivity implements OnR "cs", "da", "nl", + "en_GB", "eo", "fi", "fr", @@ -226,6 +227,7 @@ public class SettingsGeneralActivity extends SettingsBaseActivity implements OnR getString(R.string.lang_cs), getString(R.string.lang_da), getString(R.string.lang_nl), + getString(R.string.lang_en_gb), getString(R.string.lang_eo) + incompleteSuffix, getString(R.string.lang_fi) + incompleteSuffix, getString(R.string.lang_fr),