Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
diff --git a/res/layout/regulatory_info.xml b/res/layout/regulatory_info.xml
index dc1efe8..5827557 100755
--- a/res/layout/regulatory_info.xml
+++ b/res/layout/regulatory_info.xml
@@ -13,9 +13,14 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
- android:adjustViewBounds="true"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:scaleType="centerCrop"
- android:src="@drawable/regulatory_info"/>
+ android:layout_height="wrap_content">
+ <ImageView
+ android:adjustViewBounds="true"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:scaleType="centerCrop"
+ android:src="@drawable/regulatory_info" />
+</ScrollView>
+
diff --git a/res/layout/setup_preference.xml b/res/layout/setup_preference.xml
index c2f6989..384ee86 100644
--- a/res/layout/setup_preference.xml
+++ b/res/layout/setup_preference.xml
@@ -54,7 +54,7 @@
android:layout_marginBottom="8dip"
android:src="@*android:drawable/ic_menu_moreoverflow_holo_dark"
android:background="?android:attr/actionBarItemBackground"
- android:contentDescription="@string/wifi_menu_wps_pbc" />
+ android:contentDescription="@string/wifi_menu_more_options" />
</LinearLayout>
@@ -180,4 +180,4 @@
</LinearLayout>
</RelativeLayout>
</LinearLayout>
-</view>
\ No newline at end of file
+</view>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index abdc521..5310c7b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1293,6 +1293,8 @@
<string name="wifi_access_points">Wi-Fi networks</string>
<!-- Menu option to do WPS Push Button [CHAR LIMIT=25]-->
<string name="wifi_menu_wps_pbc">WPS Push Button</string>
+ <!-- Content description for menu button in Wifi setup. Not shown on the screen. [CHAR LIMIT=NONE] -->
+ <string name="wifi_menu_more_options">More options</string>
<!-- Menu option to do WPS Pin Entry [CHAR LIMIT=25]-->
<string name="wifi_menu_wps_pin">WPS Pin Entry</string>
<!-- Menu option to launch Wi-Fi Direct settings [CHAR LIMIT=20]-->