diff options
| author | arne <arne@gaia.fritz.box> | 2012-12-25 23:22:13 +0100 |
|---|---|---|
| committer | arne <arne@gaia.fritz.box> | 2012-12-25 23:22:13 +0100 |
| commit | c9dc454f4ec38f075f951fbf32935054023eed94 (patch) | |
| tree | 33d36c8bfb68db406e3ae90237b145077efecda5 /res/layout | |
| parent | e57c7dd4a792d02897140d0c5e2d014bcd1147c0 (diff) | |
| parent | b2b8b3da3f501543338fc5065519ab778379c274 (diff) | |
Merge local changes with repository
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/faq.xml | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/res/layout/faq.xml b/res/layout/faq.xml index c4fd57f0..959e82a5 100644 --- a/res/layout/faq.xml +++ b/res/layout/faq.xml @@ -37,7 +37,7 @@ android:text="@string/battery_consumption_title" /> <TextView - android:id="@+id/faq_battery" + android:id="@+id/baterry_consumption" style="@style/faqitem" /> <TextView @@ -50,6 +50,14 @@ <TextView style="@style/faqhead" + android:text="@string/vpn_tethering_title" /> + + <TextView + style="@style/faqitem" + android:id="@+id/faq_tethering" /> + + <TextView + style="@style/faqhead" android:text="@string/faq_security_title" /> <TextView @@ -61,7 +69,7 @@ android:text="@string/broken_images" /> <TextView - android:id="@+id/brokenimages" + android:id="@+id/broken_images_faq" style="@style/faqitem" /> <TextView |