Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-04-01 23:37:39 +02:00
commit f8e1a2ff74

View file

@ -174,7 +174,7 @@ public class SettingsNavigationActivity extends SettingsBaseActivity {
p.getPossibleValueDescriptions(), svlss);
}
basePref.setTitle(SettingsBaseActivity.getRoutingStringPropertyName(this, p.getId(), p.getName()));
basePref.setSummary(SettingsBaseActivity.getRoutingStringPropertyName(this, p.getId(), p.getDescription()));
basePref.setSummary(SettingsBaseActivity.getRoutingStringPropertyDescription(this, p.getId(), p.getDescription()));
cat.addPreference(basePref);
}
}