Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-12-14 09:02:16 +01:00
commit 83aacba0ba
2 changed files with 4 additions and 2 deletions

View file

@ -28,4 +28,6 @@
<string name="no_location_permission">App have no permission to access location data.</string>
<string name="no_camera_permission">App have no permission to access camera.</string>
<string name="no_microphone_permission">App have no permission to access microphone.</string>
<string name="live_updates_on">Live updates on</string>
<string name="live_updates_off">Live updates off</string>
</resources>

View file

@ -218,9 +218,9 @@ public class LiveUpdatesFragment extends Fragment {
@Override
public String getGroup(int groupPosition) {
if (groupPosition == 0) {
return "Live updates on";
return getString(R.string.live_updates_on);
} else if (groupPosition == 1) {
return "Love updates off";
return getString(R.string.live_updates_off);
} else {
throw new IllegalArgumentException("unexpected group position:" + groupPosition);
}