Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2016-06-09 15:55:59 +02:00
commit d51e2da9e6
8 changed files with 226 additions and 199 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
OsmAnd-java/.settings/org.eclipse.jdt.core.prefs
View file

@ -1,11 +1,12 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.6
org.eclipse.jdt.core.compiler.source=1.7

3
OsmAnd-java/src/net/osmand/binary/BinaryMapAddressReaderAdapter.java
View file

@ -150,7 +150,6 @@ public class BinaryMapAddressReaderAdapter {
}
}
codedIS.seek(block.filePointer + block.length);
break;
@ -493,7 +492,6 @@ public class BinaryMapAddressReaderAdapter {
case OsmandOdb.BuildingIndex.ID_FIELD_NUMBER:
b.setId(codedIS.readUInt64());
break;
case OsmandOdb.BuildingIndex.NAME_EN_FIELD_NUMBER:
b.setEnName(codedIS.readString());
break;
@ -726,5 +724,4 @@ public class BinaryMapAddressReaderAdapter {
}
}
}

3
OsmAnd-java/src/net/osmand/osm/edit/Way.java
View file

@ -187,7 +187,8 @@ public class Way extends Entity {
Collections.reverse(nodes);
}
if (nodeIds != null) {
nodeIds.reverse();;
nodeIds.reverse();
;
}
}
}

6
OsmAnd/res/values-da/phrases.xml
View file

@ -970,7 +970,7 @@
<string name="poi_mobile">Mobiltelefon</string>
<string name="poi_animal_shelter_dog">Internat: hund</string>
<string name="poi_animal_shelter_cat">Internat: kat</string>
<string name="poi_animal_shelter_dog_cat">"Internat: hund, kat"</string>
<string name="poi_animal_shelter_dog_cat">Internat: hund, kat</string>
<string name="poi_animal_shelter_bird">Internat: fugl</string>
<string name="poi_shower">Bruser</string>
@ -2966,8 +2966,8 @@
<string name="poi_crossing_activation_automatic">Overkørsel aktivering: automatisk</string>
<string name="poi_crossing_activation_local">Overkørsel aktivering: lokal</string>
<string name="poi_crossing_activation_remote">Overkørsel aktivering: fjernbetjening</string>
<string name="poi_crossing_barrier_no">Overkørsel med bom: nej</string>
<string name="poi_crossing_barrier_yes&gt;">Overkørsel med bom</string>
<string name="poi_crossing_barrier_no">Overkørsel bom: nej</string>
<string name="poi_crossing_barrier_yes">Overkørsel bom</string>
<string name="poi_crossing_on_demand_yes">Overkørsel på forespørgsel</string>
<string name="poi_crossing_on_demand_no">Overkørsel på forespørgsel: nej</string>
</resources>

2
OsmAnd/res/values-es-rAR/phrases.xml
View file

@ -2920,7 +2920,7 @@
<string name="poi_crossing_activation_local">Activación local del cruce</string>
<string name="poi_crossing_activation_remote">Activación remota del cruce</string>
<string name="poi_crossing_barrier_no">Cruce sin barreras</string>
<string name="poi_crossing_barrier_yes&gt;">Cruce con barreras</string>
<string name="poi_crossing_barrier_yes">Cruce con barreras</string>
<string name="poi_crossing_barrier_full">Cruce con barreras completas</string>
<string name="poi_crossing_barrier_half">Cruce con semi-barreras</string>
<string name="poi_crossing_barrier_double_half">Cruce con doble semi-barreras</string>

2
OsmAnd/res/values-es-rUS/phrases.xml
View file

@ -2683,7 +2683,7 @@
<string name="poi_crossing_activation_local">Activación local del cruce</string>
<string name="poi_crossing_activation_remote">Activación remota del cruce</string>
<string name="poi_crossing_barrier_no">Cruce sin barreras</string>
<string name="poi_crossing_barrier_yes&gt;">Cruce con barreras</string>
<string name="poi_crossing_barrier_yes">Cruce con barreras</string>
<string name="poi_crossing_barrier_full">Cruce con barreras completas</string>
<string name="poi_crossing_barrier_half">Cruce con semi-barreras</string>
<string name="poi_crossing_barrier_double_half">Cruce con doble semi-barreras</string>

16
OsmAnd/res/values-ru/phrases.xml
View file

@ -2878,7 +2878,7 @@
<string name="poi_crossing_activation_local">Управление переездом: местное</string>
<string name="poi_crossing_activation_remote">Управление переездом: дистанционное</string>
<string name="poi_crossing_barrier_no">Барьер на перезде: нет</string>
<string name="poi_crossing_barrier_yes>">Барьер на переезде</string>
<string name="poi_crossing_barrier_yes">Барьер на переезде</string>
<string name="poi_crossing_barrier_full">Барьер на переезде: полный</string>
<string name="poi_crossing_barrier_half">Барьер на переезде: половинный</string>
<string name="poi_crossing_barrier_double_half">Барьер на переезде: двойной половинный</string>
@ -2895,4 +2895,18 @@
<string name="poi_crossing_supervision_attendant">Наблюдение за переездом: смотрящий</string>
<string name="poi_crossing_supervision_camera">Наблюдение за переездом: камера</string>
<string name="poi_dispensing_yes">Продажа лекарств по рецептам</string>
<string name="poi_dispensing_no">Продажа лекарств по рецептам: нет</string>
<string name="poi_aerodrome_type_international">Международный</string>
<string name="poi_aerodrome_type_regional">Региональный</string>
<string name="poi_aerodrome_type_public">Общественный</string>
<string name="poi_aerodrome_type_military">Военный</string>
<string name="poi_aerodrome_type_military_public">Военный/общественный</string>
<string name="poi_aerodrome_type_private">Частный</string>
<string name="poi_valley_balka">Балка</string>
<string name="poi_ventilation_shaft">Вентиляционная шахта</string>
</resources>

16
OsmAnd/res/values/phrases.xml
View file

@ -2882,7 +2882,7 @@
<string name="poi_crossing_activation_local">Crossing activation: local</string>
<string name="poi_crossing_activation_remote">Crossing activation: remote</string>
<string name="poi_crossing_barrier_no">Crossing barrier: no</string>
<string name="poi_crossing_barrier_yes>">Crossing barrier</string>
<string name="poi_crossing_barrier_yes">Crossing barrier</string>
<string name="poi_crossing_barrier_full">Crossing barrier: full</string>
<string name="poi_crossing_barrier_half">Crossing barrier: half</string>
<string name="poi_crossing_barrier_double_half">Crossing barrier: double half</string>
@ -2899,4 +2899,18 @@
<string name="poi_crossing_supervision_attendant">Crossing supervision: attendant</string>
<string name="poi_crossing_supervision_camera">Crossing supervision: camera</string>
<string name="poi_dispensing_yes">Dispensing: yes</string>
<string name="poi_dispensing_no">Dispensing: no</string>
<string name="poi_aerodrome_type_international">International</string>
<string name="poi_aerodrome_type_regional">Regional</string>
<string name="poi_aerodrome_type_public">Public</string>
<string name="poi_aerodrome_type_military">Military</string>
<string name="poi_aerodrome_type_military_public">Military/public</string>
<string name="poi_aerodrome_type_private">Private</string>
<string name="poi_valley_balka">Balka</string>
<string name="poi_ventilation_shaft">Ventilation shaft</string>
</resources>