summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--res/values-cs/strings.xml2
-rw-r--r--res/values-da/strings.xml2
-rw-r--r--res/values-de/strings.xml2
-rw-r--r--res/values-el/strings.xml2
-rw-r--r--res/values-es-rUS/strings.xml2
-rw-r--r--res/values-es/strings.xml2
-rw-r--r--res/values-fr/strings.xml2
-rw-r--r--res/values-it/strings.xml4
-rw-r--r--res/values-ja/strings.xml2
-rw-r--r--res/values-ko/strings.xml2
-rw-r--r--res/values-nb/strings.xml2
-rw-r--r--res/values-nl/strings.xml2
-rw-r--r--res/values-pl/strings.xml2
-rw-r--r--res/values-pt-rPT/strings.xml2
-rw-r--r--res/values-pt/strings.xml4
-rw-r--r--res/values-ru/strings.xml2
-rw-r--r--res/values-sv/strings.xml2
-rw-r--r--res/values-tr/strings.xml4
-rw-r--r--res/values-zh-rCN/strings.xml2
-rw-r--r--res/values-zh-rTW/strings.xml10
-rw-r--r--src/com/android/browser/BrowserBookmarksPage.java12
21 files changed, 54 insertions, 12 deletions
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 021b548..45ea61b 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -19,6 +19,8 @@
<string name="application_name" msgid="1935869255545976415">"Prohlížeč"</string>
<string name="choose_upload" msgid="3649366287575002063">"Zvolit soubor, který chcete nahrát."</string>
<string name="new_tab" msgid="4505722538297295141">"Nové okno"</string>
+ <!-- no translation found for new_incognito_tab (5821404839654751753) -->
+ <skip />
<string name="active_tabs" msgid="3050623868203544623">"Okna"</string>
<string name="tab_bookmarks" msgid="2305793036003473653">"Záložky"</string>
<string name="tab_most_visited" msgid="1077402532455000703">"Nejnavštěvovanější"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index d0a43d1..11964f4 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -19,6 +19,8 @@
<string name="application_name" msgid="1935869255545976415">"Browser"</string>
<string name="choose_upload" msgid="3649366287575002063">"Vælg fil til upload"</string>
<string name="new_tab" msgid="4505722538297295141">"Nyt vindue"</string>
+ <!-- no translation found for new_incognito_tab (5821404839654751753) -->
+ <skip />
<string name="active_tabs" msgid="3050623868203544623">"Vinduer"</string>
<string name="tab_bookmarks" msgid="2305793036003473653">"Bogmærker"</string>
<string name="tab_most_visited" msgid="1077402532455000703">"Mest besøgte"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 7aaa338..15778ea 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -19,6 +19,8 @@
<string name="application_name" msgid="1935869255545976415">"Browser"</string>
<string name="choose_upload" msgid="3649366287575002063">"Datei zum Hochladen auswählen"</string>
<string name="new_tab" msgid="4505722538297295141">"Neues Fenster"</string>
+ <!-- no translation found for new_incognito_tab (5821404839654751753) -->
+ <skip />
<string name="active_tabs" msgid="3050623868203544623">"Fenster"</string>
<string name="tab_bookmarks" msgid="2305793036003473653">"Lesezeichen"</string>
<string name="tab_most_visited" msgid="1077402532455000703">"Meistbesucht"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 48d493f..50fd11b 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -19,6 +19,8 @@
<string name="application_name" msgid="1935869255545976415">"Internet"</string>
<string name="choose_upload" msgid="3649366287575002063">"Επιλογή αρχείου για μεταφόρτωση"</string>
<string name="new_tab" msgid="4505722538297295141">"Νέο παράθυρο"</string>
+ <!-- no translation found for new_incognito_tab (5821404839654751753) -->
+ <skip />
<string name="active_tabs" msgid="3050623868203544623">"Παράθυρα"</string>
<string name="tab_bookmarks" msgid="2305793036003473653">"Σελιδοδείκτες"</string>
<string name="tab_most_visited" msgid="1077402532455000703">"Οι πιο δημοφιλείς"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index c7d6e4f..d445cdc 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -19,6 +19,8 @@
<string name="application_name" msgid="1935869255545976415">"Navegador"</string>
<string name="choose_upload" msgid="3649366287575002063">"Elegir el archivo para cargar"</string>
<string name="new_tab" msgid="4505722538297295141">"Ventana nueva"</string>
+ <!-- no translation found for new_incognito_tab (5821404839654751753) -->
+ <skip />
<string name="active_tabs" msgid="3050623868203544623">"Windows"</string>
<string name="tab_bookmarks" msgid="2305793036003473653">"Marcadores"</string>
<string name="tab_most_visited" msgid="1077402532455000703">"Más visitados"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 211dc44..78578b2 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -19,6 +19,8 @@
<string name="application_name" msgid="1935869255545976415">"Navegador"</string>
<string name="choose_upload" msgid="3649366287575002063">"Seleccionar archivo para subir"</string>
<string name="new_tab" msgid="4505722538297295141">"Nueva ventana"</string>
+ <!-- no translation found for new_incognito_tab (5821404839654751753) -->
+ <skip />
<string name="active_tabs" msgid="3050623868203544623">"Ventanas"</string>
<string name="tab_bookmarks" msgid="2305793036003473653">"Marcadores"</string>
<string name="tab_most_visited" msgid="1077402532455000703">"Más visitados"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index d7caf82..120f6a3 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -19,6 +19,8 @@
<string name="application_name" msgid="1935869255545976415">"Navigateur"</string>
<string name="choose_upload" msgid="3649366287575002063">"Choisir le fichier à importer"</string>
<string name="new_tab" msgid="4505722538297295141">"Nouvelle fenêtre"</string>
+ <!-- no translation found for new_incognito_tab (5821404839654751753) -->
+ <skip />
<string name="active_tabs" msgid="3050623868203544623">"Fenêtres"</string>
<string name="tab_bookmarks" msgid="2305793036003473653">"Favoris"</string>
<string name="tab_most_visited" msgid="1077402532455000703">"Les + visités"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index f354f84..17af175 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -19,6 +19,8 @@
<string name="application_name" msgid="1935869255545976415">"Browser"</string>
<string name="choose_upload" msgid="3649366287575002063">"Scegli il file per il caricamento"</string>
<string name="new_tab" msgid="4505722538297295141">"Nuova finestra"</string>
+ <!-- no translation found for new_incognito_tab (5821404839654751753) -->
+ <skip />
<string name="active_tabs" msgid="3050623868203544623">"Finestre"</string>
<string name="tab_bookmarks" msgid="2305793036003473653">"Segnalibri"</string>
<string name="tab_most_visited" msgid="1077402532455000703">"I più visitati"</string>
@@ -71,7 +73,7 @@
<string name="http" msgid="2163722670597250102">"http://"</string>
<string name="save_to_bookmarks" msgid="6101482434920313244">"Aggiungi ai segnalibri"</string>
<string name="edit_bookmark" msgid="5024089053490231905">"Modifica segnalibro"</string>
- <string name="create_shortcut_bookmark" msgid="4528337239019328891">"Aggiungi a schermata iniziale"</string>
+ <string name="create_shortcut_bookmark" msgid="4528337239019328891">"Aggiungi a schermata Home"</string>
<string name="open_bookmark" msgid="8473581305759935790">"Apri"</string>
<string name="remove_bookmark" msgid="8407495852801410891">"Elimina segnalibro"</string>
<string name="remove_from_bookmarks" msgid="4374080666576982775">"Rimuovi dai segnalibri"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index bc5fa63..841f563 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -19,6 +19,8 @@
<string name="application_name" msgid="1935869255545976415">"ブラウザ"</string>
<string name="choose_upload" msgid="3649366287575002063">"アップロードするファイルを選択"</string>
<string name="new_tab" msgid="4505722538297295141">"新しいウィンドウ"</string>
+ <!-- no translation found for new_incognito_tab (5821404839654751753) -->
+ <skip />
<string name="active_tabs" msgid="3050623868203544623">"ウィンドウ"</string>
<string name="tab_bookmarks" msgid="2305793036003473653">"ブックマーク"</string>
<string name="tab_most_visited" msgid="1077402532455000703">"よく使用"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index e2ae5eb..65b19b2 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -19,6 +19,8 @@
<string name="application_name" msgid="1935869255545976415">"인터넷"</string>
<string name="choose_upload" msgid="3649366287575002063">"업로드할 파일 선택"</string>
<string name="new_tab" msgid="4505722538297295141">"새 창"</string>
+ <!-- no translation found for new_incognito_tab (5821404839654751753) -->
+ <skip />
<string name="active_tabs" msgid="3050623868203544623">"창"</string>
<string name="tab_bookmarks" msgid="2305793036003473653">"북마크"</string>
<string name="tab_most_visited" msgid="1077402532455000703">"자주 방문한 페이지"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 7c6c168..73be6c7 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -19,6 +19,8 @@
<string name="application_name" msgid="1935869255545976415">"Nettleser"</string>
<string name="choose_upload" msgid="3649366287575002063">"Velg fil for opplasting"</string>
<string name="new_tab" msgid="4505722538297295141">"Ny fane"</string>
+ <!-- no translation found for new_incognito_tab (5821404839654751753) -->
+ <skip />
<string name="active_tabs" msgid="3050623868203544623">"Vinduer"</string>
<string name="tab_bookmarks" msgid="2305793036003473653">"Bokmerker"</string>
<string name="tab_most_visited" msgid="1077402532455000703">"Mest besøkt"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 36415f6..fc0fc6d 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -19,6 +19,8 @@
<string name="application_name" msgid="1935869255545976415">"Browser"</string>
<string name="choose_upload" msgid="3649366287575002063">"Bestand selecteren voor uploaden"</string>
<string name="new_tab" msgid="4505722538297295141">"Nieuw venster"</string>
+ <!-- no translation found for new_incognito_tab (5821404839654751753) -->
+ <skip />
<string name="active_tabs" msgid="3050623868203544623">"Vensters"</string>
<string name="tab_bookmarks" msgid="2305793036003473653">"Bladwijzers"</string>
<string name="tab_most_visited" msgid="1077402532455000703">"Meest bezocht"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 4e68a61..cedfcd7 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -19,6 +19,8 @@
<string name="application_name" msgid="1935869255545976415">"Internet"</string>
<string name="choose_upload" msgid="3649366287575002063">"Wybierz plik do przesłania"</string>
<string name="new_tab" msgid="4505722538297295141">"Nowe okno"</string>
+ <!-- no translation found for new_incognito_tab (5821404839654751753) -->
+ <skip />
<string name="active_tabs" msgid="3050623868203544623">"Okna"</string>
<string name="tab_bookmarks" msgid="2305793036003473653">"Zakładki"</string>
<string name="tab_most_visited" msgid="1077402532455000703">"Popularne"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 117f154..23f5dd4 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -19,6 +19,8 @@
<string name="application_name" msgid="1935869255545976415">"Navegad."</string>
<string name="choose_upload" msgid="3649366287575002063">"Escolher ficheiro a carregar"</string>
<string name="new_tab" msgid="4505722538297295141">"Nova janela"</string>
+ <!-- no translation found for new_incognito_tab (5821404839654751753) -->
+ <skip />
<string name="active_tabs" msgid="3050623868203544623">"Janelas"</string>
<string name="tab_bookmarks" msgid="2305793036003473653">"Marcadores"</string>
<string name="tab_most_visited" msgid="1077402532455000703">"Os mais visitados"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 6102dc0..0a63c14 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -19,6 +19,8 @@
<string name="application_name" msgid="1935869255545976415">"Navegador"</string>
<string name="choose_upload" msgid="3649366287575002063">"Escolha o arquivo para envio"</string>
<string name="new_tab" msgid="4505722538297295141">"Nova janela"</string>
+ <!-- no translation found for new_incognito_tab (5821404839654751753) -->
+ <skip />
<string name="active_tabs" msgid="3050623868203544623">"Janelas"</string>
<string name="tab_bookmarks" msgid="2305793036003473653">"Favoritos"</string>
<string name="tab_most_visited" msgid="1077402532455000703">"Mais visitados"</string>
@@ -32,7 +34,7 @@
<string name="bookmarks_search" msgid="5229596268214362873">"Navegador"</string>
<string name="cancel" msgid="3017274947407233702">"Cancelar"</string>
<string name="ok" msgid="1509280796718850364">"OK"</string>
- <string name="no_matches" msgid="6596166519279885087">"Sem correspondências"</string>
+ <string name="no_matches" msgid="6596166519279885087">"Não encontrado"</string>
<plurals name="matches_found">
<item quantity="one" msgid="4352019729062956802">"1 correspondência"</item>
<item quantity="other" msgid="8166868707729972065">"<xliff:g id="INDEX">%d</xliff:g> de <xliff:g id="TOTAL">%d</xliff:g>"</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 8e915a4..f739361 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -19,6 +19,8 @@
<string name="application_name" msgid="1935869255545976415">"Браузер"</string>
<string name="choose_upload" msgid="3649366287575002063">"Выберите файл для загрузки"</string>
<string name="new_tab" msgid="4505722538297295141">"Новое окно"</string>
+ <!-- no translation found for new_incognito_tab (5821404839654751753) -->
+ <skip />
<string name="active_tabs" msgid="3050623868203544623">"Окна"</string>
<string name="tab_bookmarks" msgid="2305793036003473653">"Закладки"</string>
<string name="tab_most_visited" msgid="1077402532455000703">"Часто посещаемые"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index b41604e..a35b42e 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -19,6 +19,8 @@
<string name="application_name" msgid="1935869255545976415">"Webbläs."</string>
<string name="choose_upload" msgid="3649366287575002063">"Välj filen som du vill överföra"</string>
<string name="new_tab" msgid="4505722538297295141">"Nytt fönster"</string>
+ <!-- no translation found for new_incognito_tab (5821404839654751753) -->
+ <skip />
<string name="active_tabs" msgid="3050623868203544623">"Fönster"</string>
<string name="tab_bookmarks" msgid="2305793036003473653">"Bokmärken"</string>
<string name="tab_most_visited" msgid="1077402532455000703">"Mest besökta"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 4a3f16f..62b3581 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -19,6 +19,8 @@
<string name="application_name" msgid="1935869255545976415">"Tarayıcı"</string>
<string name="choose_upload" msgid="3649366287575002063">"Yükleme için dosya seçin"</string>
<string name="new_tab" msgid="4505722538297295141">"Yeni pencere"</string>
+ <!-- no translation found for new_incognito_tab (5821404839654751753) -->
+ <skip />
<string name="active_tabs" msgid="3050623868203544623">"Pencereler"</string>
<string name="tab_bookmarks" msgid="2305793036003473653">"Favoriler"</string>
<string name="tab_most_visited" msgid="1077402532455000703">"En çok ziyaret edilenler"</string>
@@ -104,7 +106,7 @@
<string name="share_page" msgid="593756995297268343">"Sayfayı paylaş"</string>
<string name="menu_save_webarchive" msgid="3934652434001459581">"Web Arşivi olarak Kaydet"</string>
<string name="webarchive_saved" msgid="7045250341467345007">"Web arşivi kaydedildi."</string>
- <string name="webarchive_failed" msgid="2880998204746620260">"Web arşivine kaydedilemedi."</string>
+ <string name="webarchive_failed" msgid="2880998204746620260">"Web arşivi kaydedilemedi."</string>
<string name="contextmenu_openlink" msgid="7237961252214188935">"Aç"</string>
<string name="contextmenu_openlink_newwindow" msgid="992765050093960353">"Yeni pencerede aç"</string>
<string name="contextmenu_bookmark_thislink" msgid="8095373680616870021">"Favori bağlantısı"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 074ed3a..5a2c503 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -19,6 +19,8 @@
<string name="application_name" msgid="1935869255545976415">"浏览器"</string>
<string name="choose_upload" msgid="3649366287575002063">"选择要上传的文件"</string>
<string name="new_tab" msgid="4505722538297295141">"新窗口"</string>
+ <!-- no translation found for new_incognito_tab (5821404839654751753) -->
+ <skip />
<string name="active_tabs" msgid="3050623868203544623">"窗口"</string>
<string name="tab_bookmarks" msgid="2305793036003473653">"书签"</string>
<string name="tab_most_visited" msgid="1077402532455000703">"访问最多"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 5fe35e5..b94dcf6 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -19,6 +19,8 @@
<string name="application_name" msgid="1935869255545976415">"瀏覽器"</string>
<string name="choose_upload" msgid="3649366287575002063">"選擇要上載的檔案"</string>
<string name="new_tab" msgid="4505722538297295141">"新視窗"</string>
+ <!-- no translation found for new_incognito_tab (5821404839654751753) -->
+ <skip />
<string name="active_tabs" msgid="3050623868203544623">"視窗"</string>
<string name="tab_bookmarks" msgid="2305793036003473653">"書籤"</string>
<string name="tab_most_visited" msgid="1077402532455000703">"常用網頁"</string>
@@ -32,7 +34,7 @@
<string name="bookmarks_search" msgid="5229596268214362873">"瀏覽器"</string>
<string name="cancel" msgid="3017274947407233702">"取消"</string>
<string name="ok" msgid="1509280796718850364">"確定"</string>
- <string name="no_matches" msgid="6596166519279885087">"找不到相符項目"</string>
+ <string name="no_matches" msgid="6596166519279885087">"沒有相符項目"</string>
<plurals name="matches_found">
<item quantity="one" msgid="4352019729062956802">"1 個相配項"</item>
<item quantity="other" msgid="8166868707729972065">"第 <xliff:g id="INDEX">%d</xliff:g> 個，共 <xliff:g id="TOTAL">%d</xliff:g> 個"</item>
@@ -102,9 +104,9 @@
<string name="menu_view_download" msgid="2124570321712995120">"下載"</string>
<string name="copy_page_url" msgid="7635062169011319208">"複製網頁網址"</string>
<string name="share_page" msgid="593756995297268343">"分享網頁"</string>
- <string name="menu_save_webarchive" msgid="3934652434001459581">"儲存為網路封存"</string>
- <string name="webarchive_saved" msgid="7045250341467345007">"已儲存網路封存。"</string>
- <string name="webarchive_failed" msgid="2880998204746620260">"無法儲存網路封存。"</string>
+ <string name="menu_save_webarchive" msgid="3934652434001459581">"另存為網頁封存"</string>
+ <string name="webarchive_saved" msgid="7045250341467345007">"已儲存網頁封存。"</string>
+ <string name="webarchive_failed" msgid="2880998204746620260">"無法儲存網頁封存。"</string>
<string name="contextmenu_openlink" msgid="7237961252214188935">"開啟"</string>
<string name="contextmenu_openlink_newwindow" msgid="992765050093960353">"在新視窗開啟"</string>
<string name="contextmenu_bookmark_thislink" msgid="8095373680616870021">"將連結加入書籤"</string>
diff --git a/src/com/android/browser/BrowserBookmarksPage.java b/src/com/android/browser/BrowserBookmarksPage.java
index cd2abd9..4d5c5fa 100644
--- a/src/com/android/browser/BrowserBookmarksPage.java
+++ b/src/com/android/browser/BrowserBookmarksPage.java
@@ -293,11 +293,13 @@ public class BrowserBookmarksPage extends Activity implements
mViewMode = viewMode;
// Update the preferences to make the new view mode sticky.
- Editor ed = getPreferences(MODE_PRIVATE).edit();
- if (mMostVisited) {
- ed.putInt(PREF_MOST_VISITED_VIEW_MODE, mViewMode.ordinal());
- } else {
- ed.putInt(PREF_BOOKMARK_VIEW_MODE, mViewMode.ordinal());
+ SharedPreferences preferences = getPreferences(MODE_PRIVATE);
+ Editor ed = preferences.edit();
+ int pref = mViewMode.ordinal();
+ if (mMostVisited && preferences.getInt(PREF_MOST_VISITED_VIEW_MODE, -1) != pref) {
+ ed.putInt(PREF_MOST_VISITED_VIEW_MODE, pref);
+ } else if (!mMostVisited && preferences.getInt(PREF_BOOKMARK_VIEW_MODE, -1) != pref) {
+ ed.putInt(PREF_BOOKMARK_VIEW_MODE, pref);
}
ed.commit();
generated by cgit v1.1 at 2024-12-27 22:25:52 +0000