Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-08-05 09:30:50 +02:00
commit f6a9225a14
2 changed files with 3 additions and 3 deletions

View file

@ -1161,9 +1161,9 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="accessibility_preferences_descr">Accessibility related preferences</string>
<string name="accessibility_preferences">Accessibility</string>
<string name="arrival_distance_factor_early">Early</string>
<string name="arrival_distance_factor_normally">Normally</string>
<string name="arrival_distance_factor_normally">Normal</string>
<string name="arrival_distance_factor_late">Late</string>
<string name="arrival_distance_factor_at_last">At last metres</string>
<string name="arrival_distance_factor_at_last">In the last meters</string>
<string name="arrival_distance">Arrival announcement</string>
<string name="arrival_distance_descr">How soon do you want the arrival announcement?</string>
<string name="rendering_out_of_memory">Not enough process memory to display selected area</string>

View file

@ -19,10 +19,10 @@
android:key="keep_informing"
android:title="@string/keep_informing"
android:summary="@string/keep_informing_descr" />
<CheckBoxPreference android:title="@string/show_zoom_buttons_navigation" android:summary="@string/show_zoom_buttons_navigation_descr" android:key="show_zoom_buttons_navigation" />
<ListPreference
android:key="arrival_distance_factor"
android:title="@string/arrival_distance"
android:summary="@string/arrival_distance_descr" />
<CheckBoxPreference android:title="@string/show_zoom_buttons_navigation" android:summary="@string/show_zoom_buttons_navigation_descr" android:key="show_zoom_buttons_navigation" />
</PreferenceCategory>
</PreferenceScreen>