Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2013-12-26 23:23:36 +01:00
commit 00f16f6d80

View file

@ -37,6 +37,7 @@
android:layout_marginLeft="3dp" android:layout_marginLeft="3dp"
android:text="@string/route_from" android:text="@string/route_from"
android:textSize="18sp" > android:textSize="18sp" >
android:textColor="@color/color_white"
</TextView> </TextView>
<Spinner <Spinner
@ -56,6 +57,7 @@
android:layout_marginLeft="3dp" android:layout_marginLeft="3dp"
android:gravity="left" android:gravity="left"
android:textSize="18sp" /> android:textSize="18sp" />
android:textColor="@color/color_white"
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
@ -67,6 +69,7 @@
android:layout_marginLeft="3dp" android:layout_marginLeft="3dp"
android:text="@string/route_to" android:text="@string/route_to"
android:textSize="18sp" > android:textSize="18sp" >
android:textColor="@color/color_white"
</TextView> </TextView>
<Spinner <Spinner
@ -84,6 +87,7 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/non_optimal_route_calculation" /> android:text="@string/non_optimal_route_calculation" />
android:textColor="@color/color_white"
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>