diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index e308106..db7fa89 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -339,15 +339,22 @@
     <string name="webstorage_origin_summary_mb_stored" msgid="1985885826292236210">"MB 数据存储在您手机中"</string>
     <string name="loading_video" msgid="7886324933131962321">"正在加载视频..."</string>
     <string name="geolocation_permissions_prompt_message" msgid="356796102004052471">"<xliff:g id="WEBSITE_ORIGIN">%s</xliff:g>需要了解您的位置信息"</string>
-    <string name="geolocation_permissions_prompt_share" msgid="9084486342048347976">"共享位置信息"</string>
+    <string name="geolocation_permissions_prompt_share" msgid="9084486342048347976">"允许"</string>
+    <string name="geolocation_permissions_prompt_share_for_limited_time">"24小时内允许"</string>
     <string name="geolocation_permissions_prompt_dont_share" msgid="6303025160237860300">"拒绝"</string>
     <string name="geolocation_permissions_prompt_remember" msgid="3118526300707348308">"记住偏好设置"</string>
     <string name="geolocation_permissions_prompt_toast_allowed" msgid="7201417941112726112">"此网站可以获取您的位置信息。您可以在“设置”&gt;“高级”&gt;“网站设置”屏幕中更改此设置。"</string>
     <string name="geolocation_permissions_prompt_toast_disallowed" msgid="156443445797377409">"此网站无法获取您的位置信息。您可以在“设置”&gt;“高级”&gt;“网站设置”屏幕中更改此设置。"</string>
-    <string name="geolocation_settings_page_title" msgid="1745477985097536528">"取消获取位置信息的权限"</string>
+    <string name="geolocation_settings_page_title" msgid="1745477985097536528">"编辑位置选项"</string>
     <string name="geolocation_settings_page_summary_allowed" msgid="9180251524290811398">"此网站目前可获取您的位置信息"</string>
     <string name="geolocation_settings_page_summary_not_allowed" msgid="7941769772784366199">"此网站目前不能获取您的位置信息"</string>
-    <string name="geolocation_settings_page_dialog_message" msgid="8772923416296868537">"要取消此网站获取位置信息的权限吗？"</string>
+    <string name="geolocation_settings_page_dialog_title">编辑 <xliff:g id="website origin" example="maps.google.com">%s</xliff:g> 的位置策略</string>
+    <string-array name="geolocation_settings_choices">
+        <item>总是拒绝</item>
+        <item>24小时内允许</item>
+        <item>总是允许</item>
+        <item>总是询问</item>
+    </string-array>
     <string name="geolocation_settings_page_dialog_ok_button" msgid="2113465477131017852">"确定"</string>
     <string name="geolocation_settings_page_dialog_cancel_button" msgid="7941036504673409747">"取消"</string>
     <string name="website_settings_clear_all" msgid="8739804325997655980">"全部清除"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 3f12b50..499a1ee 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -336,15 +336,22 @@
     <string name="webstorage_origin_summary_mb_stored" msgid="1985885826292236210">"您手機的儲存空間使用量 (MB)"</string>
     <string name="loading_video" msgid="7886324933131962321">"正在載入影片..."</string>
     <string name="geolocation_permissions_prompt_message" msgid="356796102004052471">"<xliff:g id="WEBSITE_ORIGIN">%s</xliff:g> 想取得您的位置資訊"</string>
-    <string name="geolocation_permissions_prompt_share" msgid="9084486342048347976">"分享位置資訊"</string>
+    <string name="geolocation_permissions_prompt_share" msgid="9084486342048347976">"允許"</string>
+    <string name="geolocation_permissions_prompt_share_for_limited_time">"24小時內允許"</string>
     <string name="geolocation_permissions_prompt_dont_share" msgid="6303025160237860300">"拒絕"</string>
     <string name="geolocation_permissions_prompt_remember" msgid="3118526300707348308">"記住偏好設定"</string>
     <string name="geolocation_permissions_prompt_toast_allowed" msgid="7201417941112726112">"這個網站可以存取您的位置資訊，您可以前往 [設定] &gt; [進階] &gt; [網站] 畫面更改這項設定。"</string>
     <string name="geolocation_permissions_prompt_toast_disallowed" msgid="156443445797377409">"這個網站無法存取您的位置資訊，您可以前往 [設定] -&gt; [進階] -&gt; [網站] 畫面更改這項設定。"</string>
-    <string name="geolocation_settings_page_title" msgid="1745477985097536528">"清除位置資訊存取權"</string>
+    <string name="geolocation_settings_page_title" msgid="1745477985097536528">"編輯位置選項"</string>
     <string name="geolocation_settings_page_summary_allowed" msgid="9180251524290811398">"此網站目前可以存取您的位置資訊"</string>
     <string name="geolocation_settings_page_summary_not_allowed" msgid="7941769772784366199">"這個網站目前無法存取您的位置資訊"</string>
-    <string name="geolocation_settings_page_dialog_message" msgid="8772923416296868537">"清除這個網站的位置資訊存取權？"</string>
+    <string name="geolocation_settings_page_dialog_title">編輯 <xliff:g id="website origin" example="maps.google.com">%s</xliff:g> 的位置策略</string>
+    <string-array name="geolocation_settings_choices">
+        <item>總是拒絕</item>
+        <item>24小時內允許</item>
+        <item>總是允許</item>
+        <item>總是詢問</item>
+    </string-array>
     <string name="geolocation_settings_page_dialog_ok_button" msgid="2113465477131017852">"確定"</string>
     <string name="geolocation_settings_page_dialog_cancel_button" msgid="7941036504673409747">"取消"</string>
     <string name="website_settings_clear_all" msgid="8739804325997655980">"全部清除"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index bb3be03..1e7c5e0 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -325,15 +325,22 @@
     <string name="webstorage_origin_summary_mb_stored" msgid="1985885826292236210">"您手機的儲存空間使用量 (MB)"</string>
     <string name="loading_video" msgid="7886324933131962321">"正在載入影片…"</string>
     <string name="geolocation_permissions_prompt_message" msgid="356796102004052471">"<xliff:g id="WEBSITE_ORIGIN">%s</xliff:g> 想取得您的位置資訊"</string>
-    <string name="geolocation_permissions_prompt_share" msgid="9084486342048347976">"分享位置資訊"</string>
+    <string name="geolocation_permissions_prompt_share" msgid="9084486342048347976">"允許"</string>
+    <string name="geolocation_permissions_prompt_share_for_limited_time">"24小時內允許"</string>
     <string name="geolocation_permissions_prompt_dont_share" msgid="6303025160237860300">"拒絕"</string>
     <string name="geolocation_permissions_prompt_remember" msgid="3118526300707348308">"記住偏好設定"</string>
     <string name="geolocation_permissions_prompt_toast_allowed" msgid="7201417941112726112">"這個網站可以存取您的位置資訊，您可以前往 [設定] &gt; [進階] &gt; [網站] 畫面變更這項設定。"</string>
     <string name="geolocation_permissions_prompt_toast_disallowed" msgid="156443445797377409">"這個網站無法存取您的位置資訊，您可以前往 [設定] &gt; [進階] &gt; [網站] 畫面變更這項設定。"</string>
-    <string name="geolocation_settings_page_title" msgid="1745477985097536528">"清除位置資訊存取權"</string>
+    <string name="geolocation_settings_page_title" msgid="1745477985097536528">"編輯位置選項"</string>
     <string name="geolocation_settings_page_summary_allowed" msgid="9180251524290811398">"此網站目前可以存取您的位置資訊"</string>
     <string name="geolocation_settings_page_summary_not_allowed" msgid="7941769772784366199">"這個網站目前無法存取您的位置資訊"</string>
-    <string name="geolocation_settings_page_dialog_message" msgid="8772923416296868537">"清除這個網站的位置資訊存取權？"</string>
+    <string name="geolocation_settings_page_dialog_title">編輯 <xliff:g id="website origin" example="maps.google.com">%s</xliff:g> 的位置策略</string>
+    <string-array name="geolocation_settings_choices">
+        <item>總是拒絕</item>
+        <item>24小時內允許</item>
+        <item>總是允許</item>
+        <item>總是詢問</item>
+    </string-array>
     <string name="geolocation_settings_page_dialog_ok_button" msgid="2113465477131017852">"確定"</string>
     <string name="geolocation_settings_page_dialog_cancel_button" msgid="7941036504673409747">"取消"</string>
     <string name="website_settings_clear_all" msgid="8739804325997655980">"全部清除"</string>
diff --git a/swe_android_browser.gypi b/swe_android_browser.gypi
index 83751ec..ee0ff20 100644
--- a/swe_android_browser.gypi
+++ b/swe_android_browser.gypi
@@ -5,6 +5,7 @@
       'type': 'none',
       'dependencies': [
         'swe_engine_java',
+        'swe_android_browser_paks',
         'android-support-v13',
         '<@(libnetxt_dependencies)',
         '<@(libsweadrenoext_dependencies)',
@@ -21,7 +22,9 @@
         'additional_native_libs': [
           '<@(libnetxt_native_libs)',
           '<@(libsweadrenoext_native_libs)'],
-        'additional_input_paths': ['<(PRODUCT_DIR)/android_webview_apk/assets/webviewchromium.pak'],
+        'additional_input_paths': [
+          '<!@pymod_do_main(swe_repack_locales -i -p <(OS) -g <(SHARED_INTERMEDIATE_DIR) -s <(SHARED_INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(locales))',
+        ],
         'conditions': [
           ['icu_use_data_file_flag==1', {
             'additional_input_paths': [
@@ -32,28 +35,16 @@
         'override_package_name': 'com.android.swe.browser',
         'android_manifest_path': '../../swe/browser/AndroidManifest.xml',
         'additional_src_dirs': ['<(DEPTH)/swe/browser/src_standalone/com/android/browser'],
+
       },
       'copies': [
         {
-              'destination': '<(PRODUCT_DIR)/swe_android_browser_apk/assets/',
-              'files': [
-                '<(PRODUCT_DIR)/android_webview_apk/assets/webviewchromium.pak'
-              ],
-              'conditions': [
-                ['icu_use_data_file_flag==1', {
-                  'files': [
-                    '<(PRODUCT_DIR)/icudtl.dat',
-                ],
-                }],
-              ],
-        },
-        {
-              'destination': '<(PRODUCT_DIR)/swe_android_browser_apk/assets/wml',
-              'files': [
-                '<(assets_dir)/wml/swe_wml.xsl',
-                '<(assets_dir)/wml/swe_wml.js',
-                '<(assets_dir)/wml/swe_wml.css',
-              ],
+          'destination': '<(PRODUCT_DIR)/swe_android_browser_apk/assets/wml',
+          'files': [
+            '<(assets_dir)/wml/swe_wml.xsl',
+            '<(assets_dir)/wml/swe_wml.js',
+            '<(assets_dir)/wml/swe_wml.css',
+          ],
         },
       ],
       'includes': [ '../../build/java_apk.gypi' ],
@@ -66,5 +57,75 @@
       ],
       'includes': [ '../../build/apk_fake_jar.gypi' ],
     },
+    {
+      'target_name': 'swe_android_browser_paks',
+      'type': 'none',
+      'dependencies': [
+        '<(DEPTH)/components/components_strings.gyp:components_strings',
+        '<(DEPTH)/net/net.gyp:net_resources',
+        '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
+        '<(DEPTH)/ui/strings/ui_strings.gyp:ui_strings',
+        '<(DEPTH)/content/app/strings/content_strings.gyp:content_strings',
+        '<(DEPTH)/content/content_resources.gyp:content_resources',
+        '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_resources',
+        '<(DEPTH)/webkit/glue/resources/webkit_resources.gyp:webkit_resources',
+      ],
+      'variables': {
+        'repack_path': '<(DEPTH)/tools/grit/grit/format/repack.py',
+      },
+      'actions': [
+        {
+          'action_name': 'repack_non_locale_paks',
+          'variables': {
+            # pak_inputs should be in sync with pak_inputs in the
+            # repack_android_webview_pack action within android_webview.gyp
+            'pak_inputs': [
+              '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/components/component_resources.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.pak',
+            ],
+          },
+          'inputs': [
+            '<(repack_path)',
+            '<@(pak_inputs)',
+          ],
+          'outputs': [
+            '<(PRODUCT_DIR)/swe_android_browser_apk/assets/webviewchromium.pak',
+          ],
+          'action': ['python', '<(repack_path)', '<@(_outputs)',
+                     '<@(pak_inputs)'],
+        },
+        {
+          'action_name': 'repack_locale_paks',
+          'variables': {
+            'repack_extra_flags%': [],
+            'repack_output_dir%': '<(PRODUCT_DIR)/swe_android_browser_apk/assets',
+            'repack_locales_cmd': ['python', '<(DEPTH)/swe/tools/build/swe_repack_locales.py'],
+            'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/android_webview',
+          },
+          'inputs': [
+            '../tools/build/swe_repack_locales.py',
+            '<!@pymod_do_main(swe_repack_locales -i -p <(OS) -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(repack_output_dir) <(repack_extra_flags) <(locales))',
+          ],
+          'outputs': [
+            '<!@pymod_do_main(swe_repack_locales -o -p <(OS) -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(repack_output_dir) <(locales))',
+          ],
+          'action': [
+            '<@(repack_locales_cmd)',
+            '-p', '<(OS)',
+            '-g', '<(grit_out_dir)',
+            '-s', '<(SHARED_INTERMEDIATE_DIR)',
+            '-x', '<(repack_output_dir)/.',
+            '<@(repack_extra_flags)',
+            '<@(locales)',
+          ],
+        },
+      ],
+    },
   ],
 }