Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-01-18 21:33:24 +01:00
commit b79282da7c
3 changed files with 5 additions and 5 deletions

View file

@ -1333,7 +1333,7 @@
<string name="recording_delete_confirm">Wollen Sie diese Aufnahme löschen?</string>
<string name="recording_unavailable">nicht verfügbar</string>
<string name="recording_context_menu_play">Wiedergabe</string>
<string name="recording_default_name">Aufnehmen</string>
<string name="recording_default_name">Aufnahme</string>
<string name="recording_error">Fehler bei der Aufnahme</string>
<string name="recording_is_recorded">Audio/Video wird aufgenommen. Zum Stoppen drücken Sie das A/V-Widget.</string>
<string name="recording_playing">Aus der angegebenen Aufnahme wird abgespielt.\n%1$s</string>
@ -1908,7 +1908,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
<string name="gpx_selection_segment_title">Abschnitt</string>
<string name="gpx_selection_number_of_points"> %1$s Punkte</string>
<string name="gpx_selection_point">Punkt %1$s</string>
<string name="gpx_selection_current_track">Aufnahme</string>
<!-- string name="gpx_selection_current_track">Aufnahme</string -->
<string name="gpx_selection_route_points">%1$s \nRoutenpunkte %2$s</string>
<string name="gpx_selection_points">%1$s \nPunkte</string>
<string name="gpx_selection_track">%1$s \nTrack %2$s</string>

View file

@ -266,7 +266,7 @@
<string name="gpx_selection_segment_title">Segment</string>
<string name="gpx_selection_number_of_points"> %1$s points</string>
<string name="gpx_selection_point">Point %1$s</string>
<string name="gpx_selection_current_track">recording</string>
<!-- string name="gpx_selection_current_track">recording</string -->
<string name="gpx_selection_route_points">%1$s \nRoute points %2$s</string>
<string name="gpx_selection_points">%1$s \nPoints</string>
<string name="gpx_selection_track">%1$s \nTrack %2$s</string>
@ -748,7 +748,7 @@
<string name="recording_context_menu_delete">Delete recording</string>
<string name="recording_context_menu_play">Play</string>
<string name="recording_description">Recording %1$s %3$s %2$s</string>
<string name="recording_default_name">recording</string>
<string name="recording_default_name">Recording</string>
<string name="av_control_stop">Stop</string>
<string name="av_control_start">Start</string>
<string name="map_widget_av_notes">Audio/video notes</string>

View file

@ -74,7 +74,7 @@ public class GpxSelectionHelper {
private void collectDisplayGroups(List<GpxDisplayGroup> dg, GPXFile g) {
String name = g.path;
if(g.showCurrentTrack){
name = getString(R.string.gpx_selection_current_track);
name = getString(R.string.gpx_available_current_track);
} else {
int i = name.lastIndexOf('/');
if(i >= 0) {