Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-08-27 16:35:47 +02:00
commit e4e98e5001

View file

@ -197,7 +197,7 @@ public class NavigationService extends Service implements LocationListener {
//Show currently active wake-up interval
int soi = settings.SERVICE_OFF_INTERVAL.get();
String nt = getString(R.string.service_stop_background_service) + ".\n" + getString(R.string.gps_wake_up_timer) + ": ";
String nt = getString(R.string.service_stop_background_service) + ". " + getString(R.string.gps_wake_up_timer) + ": ";
if (soi <= 90000) {
nt = nt + Integer.toString(soi/1000) + " " + getString(R.string.int_seconds);
} else {