summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--res/values-cs/strings.xml3
-rw-r--r--res/values-da/strings.xml3
-rw-r--r--res/values-de/strings.xml3
-rw-r--r--res/values-el/strings.xml3
-rw-r--r--res/values-es-rUS/strings.xml2
-rw-r--r--res/values-es/strings.xml3
-rw-r--r--res/values-fr/strings.xml3
-rw-r--r--res/values-it/strings.xml3
-rw-r--r--res/values-ja/strings.xml3
-rw-r--r--res/values-ko/strings.xml3
-rw-r--r--res/values-nb/strings.xml3
-rw-r--r--res/values-nl/strings.xml3
-rw-r--r--res/values-pl/strings.xml3
-rw-r--r--res/values-pt-rPT/strings.xml3
-rw-r--r--res/values-pt/strings.xml3
-rw-r--r--res/values-ru/strings.xml3
-rw-r--r--res/values-sv/strings.xml3
-rw-r--r--res/values-tr/strings.xml3
-rw-r--r--res/values-zh-rCN/strings.xml3
-rw-r--r--res/values-zh-rTW/strings.xml3
-rw-r--r--res/values/strings.xml4
-rw-r--r--src/com/android/browser/Tab.java31
22 files changed, 0 insertions, 94 deletions
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 307611c..33c9833 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -229,9 +229,6 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Kódování textu"</string>
<string name="pref_default_text_encoding_default" msgid="5272126711231936722">"Latin-1"</string>
- <string name="browserFrameRedirect" msgid="7049675479777828343">"Přesměrování"</string>
- <!-- no translation found for browserFrame307Post (1429094844669510768) -->
- <skip />
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Problémy s datovým připojením"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Problém se souborem"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Potvrdit"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 3f48cd9..0a56413 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -229,9 +229,6 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Tekstkodning"</string>
<string name="pref_default_text_encoding_default" msgid="5272126711231936722">"Latin-1"</string>
- <string name="browserFrameRedirect" msgid="7049675479777828343">"Omdiriger"</string>
- <!-- no translation found for browserFrame307Post (1429094844669510768) -->
- <skip />
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Dataforbindelsesproblem"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Der er et problem med filen"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Bekræft"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 52307a5..894b5f0 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -229,9 +229,6 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Textcodierung"</string>
<string name="pref_default_text_encoding_default" msgid="5272126711231936722">"Latin-1"</string>
- <string name="browserFrameRedirect" msgid="7049675479777828343">"Redirect"</string>
- <!-- no translation found for browserFrame307Post (1429094844669510768) -->
- <skip />
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Datenverbindungsproblem"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Problem mit Datei"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Bestätigen"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 571308d..093ee6d 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -229,9 +229,6 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Κωδικοποίηση κειμένου"</string>
<string name="pref_default_text_encoding_default" msgid="5272126711231936722">"Latin-1"</string>
- <string name="browserFrameRedirect" msgid="7049675479777828343">"Ανακατεύθυνση"</string>
- <!-- no translation found for browserFrame307Post (1429094844669510768) -->
- <skip />
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Πρόβλημα σύνδεσης δεδομένων"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Υπάρχει πρόβλημα με το αρχείο"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Επιβεβαίωση"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 1b1f6e2..efbbc96 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -206,8 +206,6 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Codificación de texto"</string>
<string name="pref_default_text_encoding_default" msgid="5272126711231936722">"Latino-1"</string>
- <string name="browserFrameRedirect" msgid="7049675479777828343">"Redireccionamiento"</string>
- <string name="browserFrame307Post" msgid="1429094844669510768">"Esta página web está siendo redireccionada. ¿Deseas reenviar los datos que ingresaste en tu formulario a la ubicación nueva?"</string>
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Problema de conectividad de datos"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Problema con el archivo"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Confirmar"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 4e8cb27..1cb2fde 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -229,9 +229,6 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Codificación de texto"</string>
<string name="pref_default_text_encoding_default" msgid="5272126711231936722">"Latín-1"</string>
- <string name="browserFrameRedirect" msgid="7049675479777828343">"Redireccionamiento"</string>
- <!-- no translation found for browserFrame307Post (1429094844669510768) -->
- <skip />
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Problema de conectividad de datos"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Problema con archivo"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"OK"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 029078c..03f6012 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -229,9 +229,6 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Codage du texte"</string>
<string name="pref_default_text_encoding_default" msgid="5272126711231936722">"Latin-1"</string>
- <string name="browserFrameRedirect" msgid="7049675479777828343">"Rediriger"</string>
- <!-- no translation found for browserFrame307Post (1429094844669510768) -->
- <skip />
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Problème de connectivité des données"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Problème de fichier"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Confirmer"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 6571ea1..4d1a926 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -229,9 +229,6 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Codifica testo"</string>
<string name="pref_default_text_encoding_default" msgid="5272126711231936722">"Latin-1"</string>
- <string name="browserFrameRedirect" msgid="7049675479777828343">"Reindirizza"</string>
- <!-- no translation found for browserFrame307Post (1429094844669510768) -->
- <skip />
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Problema di connettività dati"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Problemi con il file"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Conferma"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 21b1c58..34c8836 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -229,9 +229,6 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"テキストエンコード"</string>
<string name="pref_default_text_encoding_default" msgid="5272126711231936722">"SHIFT_JIS"</string>
- <string name="browserFrameRedirect" msgid="7049675479777828343">"リダイレクト"</string>
- <!-- no translation found for browserFrame307Post (1429094844669510768) -->
- <skip />
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"データアクセスエラー"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"ファイルに問題があります"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"確認"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 93f5c0f..2559204 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -229,9 +229,6 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"텍스트 인코딩"</string>
<string name="pref_default_text_encoding_default" msgid="5272126711231936722">"라틴어-1"</string>
- <string name="browserFrameRedirect" msgid="7049675479777828343">"리디렉션"</string>
- <!-- no translation found for browserFrame307Post (1429094844669510768) -->
- <skip />
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"데이터 연결에 문제 발생"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"파일 문제 발생"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"확인"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 736eda0..7375d84 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -229,9 +229,6 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Tekstkoding"</string>
<string name="pref_default_text_encoding_default" msgid="5272126711231936722">"Latin-1"</string>
- <string name="browserFrameRedirect" msgid="7049675479777828343">"Videresending"</string>
- <!-- no translation found for browserFrame307Post (1429094844669510768) -->
- <skip />
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Datatilkoblingsproblem"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Problem med fil"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Bekreft"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 7cc30af..fc2d394 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -229,9 +229,6 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Tekstcodering"</string>
<string name="pref_default_text_encoding_default" msgid="5272126711231936722">"Latijns-1"</string>
- <string name="browserFrameRedirect" msgid="7049675479777828343">"Omleiden"</string>
- <!-- no translation found for browserFrame307Post (1429094844669510768) -->
- <skip />
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Probleem met gegevensverbinding"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Probleem met bestand"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Bevestigen"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 45564e6..d285446 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -229,9 +229,6 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Kodowanie tekstu"</string>
<string name="pref_default_text_encoding_default" msgid="5272126711231936722">"Latin-1"</string>
- <string name="browserFrameRedirect" msgid="7049675479777828343">"Przekieruj"</string>
- <!-- no translation found for browserFrame307Post (1429094844669510768) -->
- <skip />
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Problem z łącznością danych"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Problem z plikiem"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Potwierdzenie"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 3c2859d..cabc7eb 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -229,9 +229,6 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Codificação do texto"</string>
<string name="pref_default_text_encoding_default" msgid="5272126711231936722">"Latim-1"</string>
- <string name="browserFrameRedirect" msgid="7049675479777828343">"Redireccionar"</string>
- <!-- no translation found for browserFrame307Post (1429094844669510768) -->
- <skip />
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Problema de conectividade de dados"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Problemas com o ficheiro"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Confirmar"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 0589ca1..958ee10 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -229,9 +229,6 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Codificação de texto"</string>
<string name="pref_default_text_encoding_default" msgid="5272126711231936722">"Latin-1"</string>
- <string name="browserFrameRedirect" msgid="7049675479777828343">"Redirecionar"</string>
- <!-- no translation found for browserFrame307Post (1429094844669510768) -->
- <skip />
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Problema de conectividade de dados"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Problema com o arquivo"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Confirmar"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 1e96da7..4f34126 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -229,9 +229,6 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Кодировка текста"</string>
<string name="pref_default_text_encoding_default" msgid="5272126711231936722">"Latin-1"</string>
- <string name="browserFrameRedirect" msgid="7049675479777828343">"Перенаправление"</string>
- <!-- no translation found for browserFrame307Post (1429094844669510768) -->
- <skip />
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Проблема с подключением"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Проблема с файлом"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Подтверждение"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index b17560d..c3c60dd 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -229,9 +229,6 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Textkodning"</string>
<string name="pref_default_text_encoding_default" msgid="5272126711231936722">"Latin-1"</string>
- <string name="browserFrameRedirect" msgid="7049675479777828343">"Omdirigera"</string>
- <!-- no translation found for browserFrame307Post (1429094844669510768) -->
- <skip />
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Problem med dataanslutning"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Problem med filen"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Bekräfta"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 4d315f0..a0339af 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -229,9 +229,6 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Metin kodlama"</string>
<string name="pref_default_text_encoding_default" msgid="5272126711231936722">"Latin-1"</string>
- <string name="browserFrameRedirect" msgid="7049675479777828343">"Yeniden yönlendir"</string>
- <!-- no translation found for browserFrame307Post (1429094844669510768) -->
- <skip />
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Veri bağlantısı sorunu"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Sorunlu dosya"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Doğrula"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index b6fc573..dc4d444 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -229,9 +229,6 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"文字编码"</string>
<string name="pref_default_text_encoding_default" msgid="5272126711231936722">"Latin-1"</string>
- <string name="browserFrameRedirect" msgid="7049675479777828343">"重定向"</string>
- <!-- no translation found for browserFrame307Post (1429094844669510768) -->
- <skip />
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"数据连接性问题"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"文件有问题"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"确认"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index a094ca2..e03abd7 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -229,9 +229,6 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"文字編碼"</string>
<string name="pref_default_text_encoding_default" msgid="5272126711231936722">"Latin-1"</string>
- <string name="browserFrameRedirect" msgid="7049675479777828343">"轉址"</string>
- <!-- no translation found for browserFrame307Post (1429094844669510768) -->
- <skip />
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"資料連線問題"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"檔案有問題"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"確認"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e797cb9..7ee1164 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -494,10 +494,6 @@
<item>EUC-JP</item>
</string-array>
<string name="pref_default_text_encoding_default">Latin-1</string>
- <!-- Dialog box title -->
- <string name="browserFrameRedirect">Redirect</string>
- <!-- Dialog box message -->
- <string name="browserFrame307Post">This web page is being redirected. Resend your typed form data to the new location?</string>
<!-- Title for a dialog displayed when the browser has a data connectivity
problem -->
<string name="browserFrameNetworkErrorLabel">Data connectivity problem</string>
diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java
index 54dc76d..22c8286 100644
--- a/src/com/android/browser/Tab.java
+++ b/src/com/android/browser/Tab.java
@@ -304,37 +304,6 @@ class Tab {
}
/**
- * Show the dialog if it is in the foreground, asking the user if they
- * would like to continue after an excessive number of HTTP redirects.
- * Cancel if it is in the background.
- */
- @Override
- public void onTooManyRedirects(WebView view, final Message cancelMsg,
- final Message continueMsg) {
- if (!mInForeground) {
- cancelMsg.sendToTarget();
- return;
- }
- new AlertDialog.Builder(mActivity).setTitle(
- R.string.browserFrameRedirect).setMessage(
- R.string.browserFrame307Post).setPositiveButton(
- R.string.ok, new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int which) {
- continueMsg.sendToTarget();
- }
- }).setNegativeButton(R.string.cancel,
- new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int which) {
- cancelMsg.sendToTarget();
- }
- }).setOnCancelListener(new OnCancelListener() {
- public void onCancel(DialogInterface dialog) {
- cancelMsg.sendToTarget();
- }
- }).show();
- }
-
- /**
* Show a dialog informing the user of the network error reported by
* WebCore if it is in the foreground.
*/
generated by cgit v1.1 at 2024-12-24 01:52:09 +0000