Merge commit 'korg/cupcake'
diff --git a/Android.mk b/Android.mk
index ccda1eb..02ba333 100644
--- a/Android.mk
+++ b/Android.mk
@@ -7,7 +7,7 @@
# library.
LOCAL_JAVA_LIBRARIES := android.test.runner
-LOCAL_STATIC_JAVA_LIBRARIES := googlelogin-client
+LOCAL_STATIC_JAVA_LIBRARIES := google-framework
LOCAL_SRC_FILES := $(call all-subdir-java-files)
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 110bda4..c67cc97 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -28,9 +28,6 @@
<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WAKE_LOCK"/>
- <!-- Needed by the ZoomRingController to set the bit saying we've already shown the
- tutorial toast. -->
- <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
<uses-permission android:name="com.android.browser.permission.READ_HISTORY_BOOKMARKS"/>
<uses-permission android:name="com.android.browser.permission.WRITE_HISTORY_BOOKMARKS"/>
@@ -143,7 +140,8 @@
<activity-alias android:name="ShortcutBookmarksPage"
android:targetActivity="BrowserBookmarksPage"
- android:label="@string/shortcut_bookmark">
+ android:label="@string/shortcut_bookmark"
+ android:icon="@drawable/ic_launcher_shortcut_browser_bookmark">
<intent-filter>
<action android:name="android.intent.action.CREATE_SHORTCUT" />
diff --git a/assets/plugins/gears-0.5.15.0/dummy b/assets/plugins/gears-0.5.16.0/dummy
similarity index 100%
rename from assets/plugins/gears-0.5.15.0/dummy
rename to assets/plugins/gears-0.5.16.0/dummy
diff --git a/assets/plugins/gears.so b/assets/plugins/gears.so
index 1fa4264..326a992 100644
--- a/assets/plugins/gears.so
+++ b/assets/plugins/gears.so
Binary files differ
diff --git a/res/drawable/ic_launcher_browser.png b/res/drawable/ic_launcher_browser.png
index f58b84a..47c79d1 100755
--- a/res/drawable/ic_launcher_browser.png
+++ b/res/drawable/ic_launcher_browser.png
Binary files differ
diff --git a/res/drawable/ic_launcher_shortcut_browser_bookmark.png b/res/drawable/ic_launcher_shortcut_browser_bookmark.png
new file mode 100644
index 0000000..e144727
--- /dev/null
+++ b/res/drawable/ic_launcher_shortcut_browser_bookmark.png
Binary files differ
diff --git a/res/drawable/ic_tab_browser_bookmark_selected.png b/res/drawable/ic_tab_browser_bookmark_selected.png
index 184885e..6f54305 100644
--- a/res/drawable/ic_tab_browser_bookmark_selected.png
+++ b/res/drawable/ic_tab_browser_bookmark_selected.png
Binary files differ
diff --git a/res/drawable/ic_tab_browser_bookmark_unselected.png b/res/drawable/ic_tab_browser_bookmark_unselected.png
index 25ddf18..5037860 100644
--- a/res/drawable/ic_tab_browser_bookmark_unselected.png
+++ b/res/drawable/ic_tab_browser_bookmark_unselected.png
Binary files differ
diff --git a/res/drawable/ic_tab_browser_history_selected.png b/res/drawable/ic_tab_browser_history_selected.png
index b39c21a..d9355f6 100644
--- a/res/drawable/ic_tab_browser_history_selected.png
+++ b/res/drawable/ic_tab_browser_history_selected.png
Binary files differ
diff --git a/res/drawable/ic_tab_browser_history_unselected.png b/res/drawable/ic_tab_browser_history_unselected.png
index c0847d0..c5c794a 100644
--- a/res/drawable/ic_tab_browser_history_unselected.png
+++ b/res/drawable/ic_tab_browser_history_unselected.png
Binary files differ
diff --git a/res/drawable/ic_tab_browser_visited_selected.png b/res/drawable/ic_tab_browser_visited_selected.png
index f2cc55c..9d79107 100644
--- a/res/drawable/ic_tab_browser_visited_selected.png
+++ b/res/drawable/ic_tab_browser_visited_selected.png
Binary files differ
diff --git a/res/drawable/ic_tab_browser_visited_unselected.png b/res/drawable/ic_tab_browser_visited_unselected.png
index b808fbd..55d76e9 100644
--- a/res/drawable/ic_tab_browser_visited_unselected.png
+++ b/res/drawable/ic_tab_browser_visited_unselected.png
Binary files differ
diff --git a/res/layout/browser_find.xml b/res/layout/browser_find.xml
index 000799f..7a77152 100644
--- a/res/layout/browser_find.xml
+++ b/res/layout/browser_find.xml
@@ -62,16 +62,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
- android:text="@string/zero"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="?android:attr/textColorSecondaryInverse"
- />
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginRight="3dip"
- android:layout_gravity="right"
- android:text="@string/matches_found"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorSecondaryInverse"
/>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 5f6677e..8c50afe 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -27,8 +27,10 @@
<string name="action">"Přihlásit se"</string>
<string name="cancel">"Zrušit"</string>
<string name="ok">"OK"</string>
- <string name="matches_found">" shod"</string>
- <string name="zero">"Ne"</string>
+ <!-- no translation found for matches_found:zero (6242659159545399963) -->
+ <!-- no translation found for matches_found:one (4352019729062956802) -->
+ <!-- no translation found for matches_found:few (5544267486978946555) -->
+ <!-- no translation found for matches_found:other (6616125067364315405) -->
<string name="page_info">"Informace o stránce"</string>
<string name="page_info_view">"Zobrazit informace o stránce"</string>
<string name="page_info_address">"Adresa:"</string>
@@ -166,23 +168,6 @@
<string name="pref_extras_reset_default_dlg">"Všechna data prohlížeče budou vymazána a bude použito výchozí nastavení."</string>
<string name="pref_extras_reset_default_dlg_title">"Obnovit výchozí"</string>
<string name="pref_development_title">"Ladit"</string>
- <string name="pref_development_viewport">"Use wide viewport"</string>
- <string name="pref_development_single_column_rendering">"Single column rendering"</string>
- <string name="pref_development_normal_rendering">"Běžné vykreslování"</string>
- <string name="pref_development_trace">"Enable tracing"</string>
- <string name="pref_development_nav_dump">"Enable nav cache dump"</string>
- <string name="pref_development_search_url">"Set search URL"</string>
- <string name="pref_development_uastring">"UAString"</string>
- <string-array name="pref_development_ua_choices">
- <item>"Android"</item>
- <item>"Desktop"</item>
- <item>"iPhone"</item>
- </string-array>
- <string-array name="pref_development_ua_values">
- <item>"0"</item>
- <item>"1"</item>
- <item>"2"</item>
- </string-array>
<string name="pref_default_text_encoding">"Nastavení kódování textu"</string>
<string-array name="pref_default_text_encoding_choices">
<item>"Latin-1 (ISO-8859-1)"</item>
@@ -233,8 +218,7 @@
<string name="download_no_sdcard_dlg_title">"Žádná karta SD není dostupná."</string>
<string name="download_no_sdcard_dlg_msg">"Na kartu SD je třeba stáhnout soubor <xliff:g id="FILENAME">%s</xliff:g>."</string>
<string name="download_sdcard_busy_dlg_title">"Karta SD není dostupná"</string>
- <!-- no translation found for download_sdcard_busy_dlg_msg (3473883538192835204) -->
- <skip />
+ <string name="download_sdcard_busy_dlg_msg">"Karta SD je zaneprázdněna. Chcete-li povolit stahování, vyberte v oznámení možnost Vypnout úložiště USB."</string>
<string name="download_no_application">"Nebyla nalezena žádná aplikace, ve které lze tento soubor otevřít."</string>
<string name="retry">"Zkusit znovu"</string>
<string name="no_downloads">"Historie stahování je prázdná."</string>
@@ -255,63 +239,36 @@
<string name="permdesc_readHistoryBookmarks">"Umožňuje aplikaci číst všechny navštívené adresy URL a záložky prohlížeče."</string>
<string name="permlab_writeHistoryBookmarks">"zápis historie a záložek prohlížeče"</string>
<string name="permdesc_writeHistoryBookmarks">"Umožní aplikaci změnit historii či záložky prohlížeče uložené v telefonu. Škodlivé aplikace mohou pomocí tohoto nastavení vymazat či pozměnit data prohlížeče."</string>
- <!-- no translation found for query_data_prompt (5474381240981604223) -->
- <skip />
- <!-- no translation found for query_data_message (8789381063185445197) -->
- <skip />
- <!-- no translation found for location_prompt (226262202057302423) -->
- <skip />
- <!-- no translation found for location_message (1729456751935683242) -->
- <skip />
- <!-- no translation found for shortcut_prompt (437193299088893596) -->
- <skip />
- <!-- no translation found for shortcut_message (4793042709293755892) -->
- <skip />
+ <string name="query_data_prompt">"Povolit úložiště"</string>
+ <string name="query_data_message">"Tyto webové stránky chtějí uložit informace do vašeho telefonu."</string>
+ <string name="location_prompt">"Přistupovat k poloze"</string>
+ <string name="location_message">"Tyto stránky by chtěly přistupovat k vaší poloze."</string>
+ <string name="shortcut_prompt">"Vytvořit zástupce"</string>
+ <string name="shortcut_message">"Tento web chce vytvořit zástupce této stránky na domovské obrazovce."</string>
<string name="settings_message">"Níže uvedená tabulka zobrazuje oprávnění, která jste udělili jednotlivým webům, které se pokusily použít službu Gears."</string>
- <!-- no translation found for filepicker_message (4929726371602896039) -->
- <skip />
- <!-- no translation found for image_message (5450245866521896891) -->
- <skip />
+ <string name="filepicker_message">"Výběr souboru"</string>
+ <string name="image_message">"Zvolený obrázek"</string>
<string name="settings_title">"Nastavení služby Gears"</string>
<string name="privacy_policy">"Chcete-li zjistit, jak bude vaše poloha využita, přečtěte si zásady ochrany osobních údajů těchto stránek."</string>
- <!-- no translation found for settings_storage_title (7089119630457156408) -->
- <skip />
- <!-- no translation found for settings_storage_subtitle_on (2733295483569432111) -->
- <skip />
- <!-- no translation found for settings_storage_subtitle_off (1338039396087898813) -->
- <skip />
- <!-- no translation found for settings_location_title (4953062923509886651) -->
- <skip />
- <!-- no translation found for settings_location_subtitle_on (1496219621849158879) -->
- <skip />
- <!-- no translation found for settings_location_subtitle_off (5216466051810596189) -->
- <skip />
- <!-- no translation found for settings_remove_site (1822247070226589958) -->
- <skip />
- <!-- no translation found for settings_empty (2008952224378583146) -->
- <skip />
- <!-- no translation found for settings_confirmation_remove_title (5360857296753219635) -->
- <skip />
- <!-- no translation found for settings_confirmation_remove (585560170733446898) -->
- <skip />
- <!-- no translation found for storage_notification (6534213782873968255) -->
- <skip />
- <!-- no translation found for storage_notification_alwaysdeny (5473208033665783513) -->
- <skip />
- <!-- no translation found for location_notification (3495804750470905804) -->
- <skip />
- <!-- no translation found for location_notification_alwaysdeny (6184925953783312629) -->
- <skip />
- <!-- no translation found for shortcut_notification (1659700220868444568) -->
- <skip />
- <!-- no translation found for permission_button_alwaysdeny (3837055994905214848) -->
- <skip />
- <!-- no translation found for permission_button_allow (7301874925704148242) -->
- <skip />
- <!-- no translation found for permission_button_deny (104712269725153018) -->
- <skip />
- <!-- no translation found for shortcut_button_alwaysdeny (4172277731325126605) -->
- <skip />
+ <string name="settings_storage_title">"Povolit místní úložiště"</string>
+ <string name="settings_storage_subtitle_on">"Tyto stránky mohou ukládat informace do vašeho telefonu"</string>
+ <string name="settings_storage_subtitle_off">"Tento web nemůže ukládat informace do vašeho telefonu"</string>
+ <string name="settings_location_title">"Povolit zjištění polohy"</string>
+ <string name="settings_location_subtitle_on">"Tyto stránky mohou zjistit vaši aktuální polohu"</string>
+ <string name="settings_location_subtitle_off">"Tyto stránky nemohou zjistit vaši aktuální polohu"</string>
+ <string name="settings_remove_site">"Odstranit tento web ze služby Gears"</string>
+ <string name="settings_empty">"Nejsou nastavena žádná oprávnění"</string>
+ <string name="settings_confirmation_remove_title">"Odebrat tyto stránky"</string>
+ <string name="settings_confirmation_remove">"Všechna oprávnění a všechna data uložená do telefonu těmito stránkami budou vymazána."</string>
+ <string name="storage_notification">"Tyto stránky budou ukládat informace do tohoto telefonu."\n" Toto nastavení můžete změnit zde:"\n" Nastavení -> Nastavení služby Gears"</string>
+ <string name="storage_notification_alwaysdeny">"Tyto stránky nebudou nikdy ukládat informace do tohoto telefonu."\n" Toto nastavení můžete změnit zde:"\n" Nastavení -> Nastavení služby Gears"</string>
+ <string name="location_notification">"Tyto stránky mohou přistupovat k vaší aktuální poloze."\n" Toto nastavení můžete změnit zde:"\n" Nastavení -> Nastavení služby Gears"</string>
+ <string name="location_notification_alwaysdeny">"Tyto stránky nebudou přistupovat k vaší aktuální poloze."\n" Toto nastavení můžete změnit zde:"\n" Nastavení -> Nastavení služby Gears"</string>
+ <string name="shortcut_notification">"Zástupce vytvořen"</string>
+ <string name="permission_button_alwaysdeny">"Nepovolit nikdy"</string>
+ <string name="permission_button_allow">"OK"</string>
+ <string name="permission_button_deny">"Zrušit"</string>
+ <string name="shortcut_button_alwaysdeny">"Nepovolit nikdy"</string>
<string name="shortcut_button_allow">"OK"</string>
<string name="shortcut_button_deny">"Zrušit"</string>
<string name="settings_button_allow">"Použít"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index ec0ae34..e41f0e7 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -27,8 +27,10 @@
<string name="action">"Anmelden"</string>
<string name="cancel">"Abbrechen"</string>
<string name="ok">"OK"</string>
- <string name="matches_found">" Treffer"</string>
- <string name="zero">"Nein"</string>
+ <!-- no translation found for matches_found:zero (6242659159545399963) -->
+ <!-- no translation found for matches_found:one (4352019729062956802) -->
+ <!-- no translation found for matches_found:few (5544267486978946555) -->
+ <!-- no translation found for matches_found:other (6616125067364315405) -->
<string name="page_info">"Seiten-Info"</string>
<string name="page_info_view">"Seiten-Info anzeigen"</string>
<string name="page_info_address">"Adresse:"</string>
@@ -166,23 +168,6 @@
<string name="pref_extras_reset_default_dlg">"Alle Browserdaten werden gelöscht. Alle Einstellungen werden auf die Standardeinstellung zurückgesetzt."</string>
<string name="pref_extras_reset_default_dlg_title">"Auf Standardeinstellung zurücksetzen"</string>
<string name="pref_development_title">"Debuggen"</string>
- <string name="pref_development_viewport">"Use wide viewport"</string>
- <string name="pref_development_single_column_rendering">"Single column rendering"</string>
- <string name="pref_development_normal_rendering">"Normal rendering"</string>
- <string name="pref_development_trace">"Enable tracing"</string>
- <string name="pref_development_nav_dump">"Enable nav cache dump"</string>
- <string name="pref_development_search_url">"Such-URL einstellen"</string>
- <string name="pref_development_uastring">"UAString"</string>
- <string-array name="pref_development_ua_choices">
- <item>"Android"</item>
- <item>"Google Desktop"</item>
- <item>"iPhone"</item>
- </string-array>
- <string-array name="pref_development_ua_values">
- <item>"0"</item>
- <item>"1"</item>
- <item>"2"</item>
- </string-array>
<string name="pref_default_text_encoding">"Textcodierung einstellen"</string>
<string-array name="pref_default_text_encoding_choices">
<item>"Latin-1 (ISO-8859-1)"</item>
@@ -233,8 +218,7 @@
<string name="download_no_sdcard_dlg_title">"Keine SD-Karte"</string>
<string name="download_no_sdcard_dlg_msg">"Zum Download von <xliff:g id="FILENAME">%s</xliff:g> ist eine SD-Karte erforderlich."</string>
<string name="download_sdcard_busy_dlg_title">"SD-Karte nicht verfügbar"</string>
- <!-- no translation found for download_sdcard_busy_dlg_msg (3473883538192835204) -->
- <skip />
+ <string name="download_sdcard_busy_dlg_msg">"Die SD-Karte ist ausgelastet. Wählen Sie in der Benachrichtigung \"USB-Speicher deaktivieren\" aus, um Downloads zuzulassen."</string>
<string name="download_no_application">"Es kann keine Anwendung gefunden werden, um diese Datei zu öffnen."</string>
<string name="retry">"Wiederholen"</string>
<string name="no_downloads">"Downloadverlauf ist leer."</string>
@@ -255,63 +239,36 @@
<string name="permdesc_readHistoryBookmarks">"Ermöglicht der Anwendung, alle URLs, die mit dem Browser besucht wurden, sowie alle Lesezeichen des Browsers zu lesen."</string>
<string name="permlab_writeHistoryBookmarks">"Browserverlauf und Lesezeichen schreiben"</string>
<string name="permdesc_writeHistoryBookmarks">"Ermöglicht einer Anwendung, den auf Ihrem Telefon gespeicherten Browserverlauf und die Lesezeichen zu ändern. Schädliche Anwendungen können so Ihre Browserdaten löschen oder ändern."</string>
- <!-- no translation found for query_data_prompt (5474381240981604223) -->
- <skip />
- <!-- no translation found for query_data_message (8789381063185445197) -->
- <skip />
- <!-- no translation found for location_prompt (226262202057302423) -->
- <skip />
- <!-- no translation found for location_message (1729456751935683242) -->
- <skip />
- <!-- no translation found for shortcut_prompt (437193299088893596) -->
- <skip />
- <!-- no translation found for shortcut_message (4793042709293755892) -->
- <skip />
+ <string name="query_data_prompt">"Speicher zulassen"</string>
+ <string name="query_data_message">"Diese Website möchte Informationen auf Ihrem Telefon speichern."</string>
+ <string name="location_prompt">"Zugriff auf Ihren Standort"</string>
+ <string name="location_message">"Diese Website möchte auf Ihren Standort zugreifen."</string>
+ <string name="shortcut_prompt">"Verknüpfung erstellen"</string>
+ <string name="shortcut_message">"Diese Website möchte eine Verknüpfung zu diese Seite auf Ihrem Startbildschirm erstellen."</string>
<string name="settings_message">"Die folgende Tabelle zeigt die Berechtigungen, die Sie jeder Website erteilt haben, die versucht hat, Gears zu verwenden."</string>
- <!-- no translation found for filepicker_message (4929726371602896039) -->
- <skip />
- <!-- no translation found for image_message (5450245866521896891) -->
- <skip />
+ <string name="filepicker_message">"File Picker"</string>
+ <string name="image_message">"Gewähltes Bild"</string>
<string name="settings_title">"Gears-Einstellungen"</string>
<string name="privacy_policy">"Lesen Sie die Datenschutzbestimmungen dieser Website, um herauszufinden, wie Ihr Ort verwendet wird."</string>
- <!-- no translation found for settings_storage_title (7089119630457156408) -->
- <skip />
- <!-- no translation found for settings_storage_subtitle_on (2733295483569432111) -->
- <skip />
- <!-- no translation found for settings_storage_subtitle_off (1338039396087898813) -->
- <skip />
- <!-- no translation found for settings_location_title (4953062923509886651) -->
- <skip />
- <!-- no translation found for settings_location_subtitle_on (1496219621849158879) -->
- <skip />
- <!-- no translation found for settings_location_subtitle_off (5216466051810596189) -->
- <skip />
- <!-- no translation found for settings_remove_site (1822247070226589958) -->
- <skip />
- <!-- no translation found for settings_empty (2008952224378583146) -->
- <skip />
- <!-- no translation found for settings_confirmation_remove_title (5360857296753219635) -->
- <skip />
- <!-- no translation found for settings_confirmation_remove (585560170733446898) -->
- <skip />
- <!-- no translation found for storage_notification (6534213782873968255) -->
- <skip />
- <!-- no translation found for storage_notification_alwaysdeny (5473208033665783513) -->
- <skip />
- <!-- no translation found for location_notification (3495804750470905804) -->
- <skip />
- <!-- no translation found for location_notification_alwaysdeny (6184925953783312629) -->
- <skip />
- <!-- no translation found for shortcut_notification (1659700220868444568) -->
- <skip />
- <!-- no translation found for permission_button_alwaysdeny (3837055994905214848) -->
- <skip />
- <!-- no translation found for permission_button_allow (7301874925704148242) -->
- <skip />
- <!-- no translation found for permission_button_deny (104712269725153018) -->
- <skip />
- <!-- no translation found for shortcut_button_alwaysdeny (4172277731325126605) -->
- <skip />
+ <string name="settings_storage_title">"Lokalen Speicher zulassen"</string>
+ <string name="settings_storage_subtitle_on">"Diese Website kann Informationen auf Ihrem Telefon speichern."</string>
+ <string name="settings_storage_subtitle_off">"Diese Website kann keine Informationen auf Ihrem Telefon speichern."</string>
+ <string name="settings_location_title">"Standorterkennung zulassen"</string>
+ <string name="settings_location_subtitle_on">"Diese Website kann Ihren aktuellen Standort erkennen."</string>
+ <string name="settings_location_subtitle_off">"Diese Website kann Ihren aktuellen Standort nicht erkennen."</string>
+ <string name="settings_remove_site">"Diese Website aus Gears entfernen"</string>
+ <string name="settings_empty">"Keine Berechtigungen festgelegt"</string>
+ <string name="settings_confirmation_remove_title">"Diese Website entfernen"</string>
+ <string name="settings_confirmation_remove">"Alle Berechtigungen sowie alle von der Website auf Ihrem Telefon gespeicherten Daten werden gelöscht."</string>
+ <string name="storage_notification">"Diese Website speichert Informationen auf diesem Telefon."\n" Ändern Sie diese Einstellung unter"\n" Einstellungen -> Gears-Einstellungen."</string>
+ <string name="storage_notification_alwaysdeny">"Diese Website speichert nie Informationen auf diesem Telefon."\n" Ändern Sie diese Einstellung unter"\n" Einstellungen -> Gears-Einstellungen."</string>
+ <string name="location_notification">"Diese Website hat Zugriff auf Ihren aktuellen Standort."\n" Ändern Sie diese Einstellung unter"\n" Einstellungen -> Gears-Einstellungen."</string>
+ <string name="location_notification_alwaysdeny">"Diese Website hat keinen Zugriff auf Ihren aktuellen Standort."\n" Ändern Sie diese Einstellung unter"\n" Einstellungen -> Gears-Einstellungen."</string>
+ <string name="shortcut_notification">"Verknüpfung erstellt"</string>
+ <string name="permission_button_alwaysdeny">"Nie zulassen"</string>
+ <string name="permission_button_allow">"OK"</string>
+ <string name="permission_button_deny">"Abbrechen"</string>
+ <string name="shortcut_button_alwaysdeny">"Nie zulassen"</string>
<string name="shortcut_button_allow">"OK"</string>
<string name="shortcut_button_deny">"Abbrechen"</string>
<string name="settings_button_allow">"Anwenden"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index cbef856..218c314 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -27,8 +27,10 @@
<string name="action">"Acceder"</string>
<string name="cancel">"Cancelar"</string>
<string name="ok">"Aceptar"</string>
- <string name="matches_found">" coincidencias"</string>
- <string name="zero">"No"</string>
+ <!-- no translation found for matches_found:zero (6242659159545399963) -->
+ <!-- no translation found for matches_found:one (4352019729062956802) -->
+ <!-- no translation found for matches_found:few (5544267486978946555) -->
+ <!-- no translation found for matches_found:other (6616125067364315405) -->
<string name="page_info">"Información de página"</string>
<string name="page_info_view">"Ver información de página"</string>
<string name="page_info_address">"Dirección:"</string>
@@ -166,23 +168,6 @@
<string name="pref_extras_reset_default_dlg">"Se borrarán todos los datos del navegador y se restablecerá la configuración predeterminada."</string>
<string name="pref_extras_reset_default_dlg_title">"Restablecer valores predeterminados"</string>
<string name="pref_development_title">"Depurar"</string>
- <string name="pref_development_viewport">"Use wide viewport"</string>
- <string name="pref_development_single_column_rendering">"Representación en una columna"</string>
- <string name="pref_development_normal_rendering">"Normal rendering"</string>
- <string name="pref_development_trace">"Enable tracing"</string>
- <string name="pref_development_nav_dump">"Enable nav cache dump"</string>
- <string name="pref_development_search_url">"Establecer URL de búsqueda"</string>
- <string name="pref_development_uastring">"UAString"</string>
- <string-array name="pref_development_ua_choices">
- <item>"Android"</item>
- <item>"Desktop"</item>
- <item>"iPhone"</item>
- </string-array>
- <string-array name="pref_development_ua_values">
- <item>"0"</item>
- <item>"1"</item>
- <item>"2"</item>
- </string-array>
<string name="pref_default_text_encoding">"Establecer codificación de texto"</string>
<string-array name="pref_default_text_encoding_choices">
<item>"Latín-1 (ISO-8859-1)"</item>
@@ -233,8 +218,7 @@
<string name="download_no_sdcard_dlg_title">"Falta la tarjeta SD"</string>
<string name="download_no_sdcard_dlg_msg">"Para descargar <xliff:g id="FILENAME">%s</xliff:g> se necesita una tarjeta SD."</string>
<string name="download_sdcard_busy_dlg_title">"Tarjeta SD no disponible"</string>
- <!-- no translation found for download_sdcard_busy_dlg_msg (3473883538192835204) -->
- <skip />
+ <string name="download_sdcard_busy_dlg_msg">"La tarjeta SD está ocupada. Para permitir descargas, selecciona \"Desactivar almacenamiento USB\" en la notificación."</string>
<string name="download_no_application">"No se ha encontrado ninguna aplicación que permita abrir este archivo."</string>
<string name="retry">"Reintentar"</string>
<string name="no_downloads">"El historial de descargas está vacío."</string>
@@ -255,63 +239,36 @@
<string name="permdesc_readHistoryBookmarks">"Permite que la aplicación lea todas las URL que ha visitado el navegador y todos sus marcadores."</string>
<string name="permlab_writeHistoryBookmarks">"escribir en marcadores y en el historial del navegador"</string>
<string name="permdesc_writeHistoryBookmarks">"Permite que una aplicación modifique la información de los marcadores o del historial del navegador almacenada en el teléfono. Las aplicaciones malintencionadas pueden utilizar este permiso para borrar o modificar los datos del navegador."</string>
- <!-- no translation found for query_data_prompt (5474381240981604223) -->
- <skip />
- <!-- no translation found for query_data_message (8789381063185445197) -->
- <skip />
- <!-- no translation found for location_prompt (226262202057302423) -->
- <skip />
- <!-- no translation found for location_message (1729456751935683242) -->
- <skip />
- <!-- no translation found for shortcut_prompt (437193299088893596) -->
- <skip />
- <!-- no translation found for shortcut_message (4793042709293755892) -->
- <skip />
+ <string name="query_data_prompt">"Permitir almacenamiento"</string>
+ <string name="query_data_message">"Este sitio web desea almacenar información en el teléfono."</string>
+ <string name="location_prompt">"Acceso a tu ubicación"</string>
+ <string name="location_message">"Este sitio web desea tener acceso a tu ubicación."</string>
+ <string name="shortcut_prompt">"Crear un acceso directo"</string>
+ <string name="shortcut_message">"Este sitio web desea crear un acceso directo a esta página en tu página principal."</string>
<string name="settings_message">"En la tabla que aparece a continuación se muestran los permisos que has concedido a los distintos sitios web que han intentado utilizar Gears."</string>
- <!-- no translation found for filepicker_message (4929726371602896039) -->
- <skip />
- <!-- no translation found for image_message (5450245866521896891) -->
- <skip />
+ <string name="filepicker_message">"Selector de archivos"</string>
+ <string name="image_message">"Imagen seleccionada"</string>
<string name="settings_title">"Configuración de Gears"</string>
<string name="privacy_policy">"Lee la política de privacidad del sitio para saber cómo se utilizará tu ubicación."</string>
- <!-- no translation found for settings_storage_title (7089119630457156408) -->
- <skip />
- <!-- no translation found for settings_storage_subtitle_on (2733295483569432111) -->
- <skip />
- <!-- no translation found for settings_storage_subtitle_off (1338039396087898813) -->
- <skip />
- <!-- no translation found for settings_location_title (4953062923509886651) -->
- <skip />
- <!-- no translation found for settings_location_subtitle_on (1496219621849158879) -->
- <skip />
- <!-- no translation found for settings_location_subtitle_off (5216466051810596189) -->
- <skip />
- <!-- no translation found for settings_remove_site (1822247070226589958) -->
- <skip />
- <!-- no translation found for settings_empty (2008952224378583146) -->
- <skip />
- <!-- no translation found for settings_confirmation_remove_title (5360857296753219635) -->
- <skip />
- <!-- no translation found for settings_confirmation_remove (585560170733446898) -->
- <skip />
- <!-- no translation found for storage_notification (6534213782873968255) -->
- <skip />
- <!-- no translation found for storage_notification_alwaysdeny (5473208033665783513) -->
- <skip />
- <!-- no translation found for location_notification (3495804750470905804) -->
- <skip />
- <!-- no translation found for location_notification_alwaysdeny (6184925953783312629) -->
- <skip />
- <!-- no translation found for shortcut_notification (1659700220868444568) -->
- <skip />
- <!-- no translation found for permission_button_alwaysdeny (3837055994905214848) -->
- <skip />
- <!-- no translation found for permission_button_allow (7301874925704148242) -->
- <skip />
- <!-- no translation found for permission_button_deny (104712269725153018) -->
- <skip />
- <!-- no translation found for shortcut_button_alwaysdeny (4172277731325126605) -->
- <skip />
+ <string name="settings_storage_title">"Permitir almacenamiento local"</string>
+ <string name="settings_storage_subtitle_on">"Este sitio puede guardar información en el teléfono."</string>
+ <string name="settings_storage_subtitle_off">"Este sitio no puede guardar información en el teléfono."</string>
+ <string name="settings_location_title">"Permitir detección de ubicación"</string>
+ <string name="settings_location_subtitle_on">"Este sitio puede leer tu ubicación actual."</string>
+ <string name="settings_location_subtitle_off">"Este sitio no puede leer tu ubicación actual."</string>
+ <string name="settings_remove_site">"Eliminar este sitio de Gears"</string>
+ <string name="settings_empty">"No hay permisos establecidos."</string>
+ <string name="settings_confirmation_remove_title">"Eliminar este sitio"</string>
+ <string name="settings_confirmation_remove">"Se borrarán todos los permisos y se eliminarán todos los datos que el sitio haya almacenado en el teléfono."</string>
+ <string name="storage_notification">"Este sitio puede almacenar información en el teléfono."\n" Puedes modificar esta opción en:"\n" Configuración -> Configuración de Gears."</string>
+ <string name="storage_notification_alwaysdeny">"Este sitio no puede almacenar nunca información en el teléfono."\n" Puedes modificar esta opción en:"\n" Configuración -> Configuración de Gears."</string>
+ <string name="location_notification">"Este sitio puede acceder a tu ubicación actual."\n" Puedes modificar esta opción en:"\n" Configuración -> Configuración de Gears."</string>
+ <string name="location_notification_alwaysdeny">"Este sitio no puede acceder a tu ubicación actual."\n" Puedes modificar esta opción en:"\n" Configuración -> Configuración de Gears."</string>
+ <string name="shortcut_notification">"Acceso directo creado"</string>
+ <string name="permission_button_alwaysdeny">"No permitir nunca"</string>
+ <string name="permission_button_allow">"Aceptar"</string>
+ <string name="permission_button_deny">"Cancelar"</string>
+ <string name="shortcut_button_alwaysdeny">"No permitir nunca"</string>
<string name="shortcut_button_allow">"Aceptar"</string>
<string name="shortcut_button_deny">"Cancelar"</string>
<string name="settings_button_allow">"Aplicar"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 56f865a..5829e32 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -27,8 +27,10 @@
<string name="action">"Se connecter"</string>
<string name="cancel">"Annuler"</string>
<string name="ok">"OK"</string>
- <string name="matches_found">" résultat(s) correspondant(s )"</string>
- <string name="zero">"Non"</string>
+ <!-- no translation found for matches_found:zero (6242659159545399963) -->
+ <!-- no translation found for matches_found:one (4352019729062956802) -->
+ <!-- no translation found for matches_found:few (5544267486978946555) -->
+ <!-- no translation found for matches_found:other (6616125067364315405) -->
<string name="page_info">"Infos sur la page"</string>
<string name="page_info_view">"Afficher les infos sur la page"</string>
<string name="page_info_address">"Adresse :"</string>
@@ -166,23 +168,6 @@
<string name="pref_extras_reset_default_dlg">"Toutes les données du navigateur seront effacées et les paramètres par défaut rétablis."</string>
<string name="pref_extras_reset_default_dlg_title">"Rétablir les valeurs par défaut"</string>
<string name="pref_development_title">"Débogage"</string>
- <string name="pref_development_viewport">"Use wide viewport"</string>
- <string name="pref_development_single_column_rendering">"Single column rendering"</string>
- <string name="pref_development_normal_rendering">"Normal rendering"</string>
- <string name="pref_development_trace">"Activer le suivi"</string>
- <string name="pref_development_nav_dump">"Enable nav cache dump"</string>
- <string name="pref_development_search_url">"Set search URL"</string>
- <string name="pref_development_uastring">"UAString"</string>
- <string-array name="pref_development_ua_choices">
- <item>"Android"</item>
- <item>"Desktop"</item>
- <item>"iPhone"</item>
- </string-array>
- <string-array name="pref_development_ua_values">
- <item>"0"</item>
- <item>"1"</item>
- <item>"2"</item>
- </string-array>
<string name="pref_default_text_encoding">"Définir le codage du texte"</string>
<string-array name="pref_default_text_encoding_choices">
<item>"Latin-1 (ISO-8859-1)"</item>
@@ -233,8 +218,7 @@
<string name="download_no_sdcard_dlg_title">"Aucune carte SD"</string>
<string name="download_no_sdcard_dlg_msg">"Le téléchargement de <xliff:g id="FILENAME">%s</xliff:g> requiert une carte SD."</string>
<string name="download_sdcard_busy_dlg_title">"Carte SD non disponible"</string>
- <!-- no translation found for download_sdcard_busy_dlg_msg (3473883538192835204) -->
- <skip />
+ <string name="download_sdcard_busy_dlg_msg">"La carte SD est occupée. Pour autoriser les téléchargements, sélectionnez l\'option \"Désactiver le stockage USB\" dans la notification."</string>
<string name="download_no_application">"Impossible de trouver une application permettant d\'ouvrir ce fichier."</string>
<string name="retry">"Réessayer"</string>
<string name="no_downloads">"L\'historique de téléchargement est vide."</string>
@@ -255,63 +239,36 @@
<string name="permdesc_readHistoryBookmarks">"Permet à l\'application de lire toutes les URL visitées par le navigateur et tous les favoris."</string>
<string name="permlab_writeHistoryBookmarks">"Enregistrement de l\'historique du navigateur et des favoris"</string>
<string name="permdesc_writeHistoryBookmarks">"Permet à une application de modifier l\'historique du navigateur ou les favoris enregistrés sur votre téléphone. Des applications malveillantes peuvent utiliser cette fonction pour effacer ou modifier les données de votre navigateur."</string>
- <!-- no translation found for query_data_prompt (5474381240981604223) -->
- <skip />
- <!-- no translation found for query_data_message (8789381063185445197) -->
- <skip />
- <!-- no translation found for location_prompt (226262202057302423) -->
- <skip />
- <!-- no translation found for location_message (1729456751935683242) -->
- <skip />
- <!-- no translation found for shortcut_prompt (437193299088893596) -->
- <skip />
- <!-- no translation found for shortcut_message (4793042709293755892) -->
- <skip />
+ <string name="query_data_prompt">"Autoriser le stockage"</string>
+ <string name="query_data_message">"Ce site souhaite enregistrer des informations sur votre téléphone."</string>
+ <string name="location_prompt">"Afficher votre position"</string>
+ <string name="location_message">"Ce site souhaite afficher votre position."</string>
+ <string name="shortcut_prompt">"Créer un raccourci"</string>
+ <string name="shortcut_message">"Le site souhaite créer un raccourci vers cette page sur votre page d\'accueil."</string>
<string name="settings_message">"Le tableau ci-dessous indique les fonctions que vous avez autorisées pour chaque site ayant tenté d\'utiliser Google Gears."</string>
- <!-- no translation found for filepicker_message (4929726371602896039) -->
- <skip />
- <!-- no translation found for image_message (5450245866521896891) -->
- <skip />
+ <string name="filepicker_message">"Sélecteur de fichier"</string>
+ <string name="image_message">"Image sélectionnée"</string>
<string name="settings_title">"Paramètres Google Gears"</string>
<string name="privacy_policy">"Lisez les règles de confidentialité du site pour voir comment votre emplacement sera utilisé."</string>
- <!-- no translation found for settings_storage_title (7089119630457156408) -->
- <skip />
- <!-- no translation found for settings_storage_subtitle_on (2733295483569432111) -->
- <skip />
- <!-- no translation found for settings_storage_subtitle_off (1338039396087898813) -->
- <skip />
- <!-- no translation found for settings_location_title (4953062923509886651) -->
- <skip />
- <!-- no translation found for settings_location_subtitle_on (1496219621849158879) -->
- <skip />
- <!-- no translation found for settings_location_subtitle_off (5216466051810596189) -->
- <skip />
- <!-- no translation found for settings_remove_site (1822247070226589958) -->
- <skip />
- <!-- no translation found for settings_empty (2008952224378583146) -->
- <skip />
- <!-- no translation found for settings_confirmation_remove_title (5360857296753219635) -->
- <skip />
- <!-- no translation found for settings_confirmation_remove (585560170733446898) -->
- <skip />
- <!-- no translation found for storage_notification (6534213782873968255) -->
- <skip />
- <!-- no translation found for storage_notification_alwaysdeny (5473208033665783513) -->
- <skip />
- <!-- no translation found for location_notification (3495804750470905804) -->
- <skip />
- <!-- no translation found for location_notification_alwaysdeny (6184925953783312629) -->
- <skip />
- <!-- no translation found for shortcut_notification (1659700220868444568) -->
- <skip />
- <!-- no translation found for permission_button_alwaysdeny (3837055994905214848) -->
- <skip />
- <!-- no translation found for permission_button_allow (7301874925704148242) -->
- <skip />
- <!-- no translation found for permission_button_deny (104712269725153018) -->
- <skip />
- <!-- no translation found for shortcut_button_alwaysdeny (4172277731325126605) -->
- <skip />
+ <string name="settings_storage_title">"Autoriser le stockage local"</string>
+ <string name="settings_storage_subtitle_on">"Ce site peut enregistrer des informations sur votre téléphone."</string>
+ <string name="settings_storage_subtitle_off">"Ce site ne peut enregistrer aucune information sur votre téléphone."</string>
+ <string name="settings_location_title">"Autoriser la détection de ma position"</string>
+ <string name="settings_location_subtitle_on">"Ce site peut détecter votre position actuelle."</string>
+ <string name="settings_location_subtitle_off">"Ce site ne peut pas détecter votre position actuelle."</string>
+ <string name="settings_remove_site">"Supprimer ce site de Gears"</string>
+ <string name="settings_empty">"Aucune autorisation définie"</string>
+ <string name="settings_confirmation_remove_title">"Supprimer ce site"</string>
+ <string name="settings_confirmation_remove">"Toutes les autorisations seront effacées et toutes les données enregistrées par le site sur votre téléphone seront supprimées."</string>
+ <string name="storage_notification">"Ce site enregistrera des informations sur votre téléphone."\n" Modifiez ce paramètre dans :"\n" Paramètres -> Paramètres Gears."</string>
+ <string name="storage_notification_alwaysdeny">"Ce site n\'enregistrera jamais aucune information sur votre téléphone."\n" Modifiez ce paramètre dans :"\n" Paramètres -> Paramètres Gears."</string>
+ <string name="location_notification">"Ce site peut afficher votre emplacement actuel. "\n" Modifiez ce paramètre dans :"\n" Paramètres -> Paramètres Gears."</string>
+ <string name="location_notification_alwaysdeny">"Ce site n\'affichera pas votre position actuelle."\n" Modifiez ce paramètre dans :"\n" Paramètres -> Paramètres Gears."</string>
+ <string name="shortcut_notification">"Raccourci créé"</string>
+ <string name="permission_button_alwaysdeny">"Ne jamais autoriser"</string>
+ <string name="permission_button_allow">"OK"</string>
+ <string name="permission_button_deny">"Annuler"</string>
+ <string name="shortcut_button_alwaysdeny">"Ne jamais autoriser"</string>
<string name="shortcut_button_allow">"OK"</string>
<string name="shortcut_button_deny">"Annuler"</string>
<string name="settings_button_allow">"Appliquer"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index dd3b6ee..284fcbd 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -27,8 +27,10 @@
<string name="action">"Accedi"</string>
<string name="cancel">"Annulla"</string>
<string name="ok">"OK"</string>
- <string name="matches_found">" corrispondenze"</string>
- <string name="zero">"No"</string>
+ <!-- no translation found for matches_found:zero (6242659159545399963) -->
+ <!-- no translation found for matches_found:one (4352019729062956802) -->
+ <!-- no translation found for matches_found:few (5544267486978946555) -->
+ <!-- no translation found for matches_found:other (6616125067364315405) -->
<string name="page_info">"Info pagina"</string>
<string name="page_info_view">"Visualizza info pagina"</string>
<string name="page_info_address">"Indirizzo:"</string>
@@ -72,7 +74,7 @@
<string name="empty_bookmark">"Impossibile creare un segnalibro vuoto."</string>
<string name="bookmark_url_not_valid">"URL non valido."</string>
<string name="delete_bookmark">"Elimina"</string>
- <string name="bookmark_page">"Aggiungi ultima pagina visualizzata in segnalibri"</string>
+ <string name="bookmark_page">"Aggiungi ultima pagina visualizzata ai segnalibri"</string>
<string name="current_page">"da "</string>
<string name="delete_bookmark_warning">"Il segnalibro \"<xliff:g id="BOOKMARK">%s</xliff:g>\" verrà eliminato."</string>
<string name="open_in_new_window">"Apri in nuova finestra"</string>
@@ -166,23 +168,6 @@
<string name="pref_extras_reset_default_dlg">"Verranno cancellati tutti i dati del browser e ripristinate le impostazioni predefinite."</string>
<string name="pref_extras_reset_default_dlg_title">"Ripristina valori predefiniti"</string>
<string name="pref_development_title">"Debug"</string>
- <string name="pref_development_viewport">"Use wide viewport"</string>
- <string name="pref_development_single_column_rendering">"Single column rendering"</string>
- <string name="pref_development_normal_rendering">"Normal rendering"</string>
- <string name="pref_development_trace">"Enable tracing"</string>
- <string name="pref_development_nav_dump">"Enable nav cache dump"</string>
- <string name="pref_development_search_url">"Set search URL"</string>
- <string name="pref_development_uastring">"UAString"</string>
- <string-array name="pref_development_ua_choices">
- <item>"Android"</item>
- <item>"Desktop"</item>
- <item>"iPhone"</item>
- </string-array>
- <string-array name="pref_development_ua_values">
- <item>"0"</item>
- <item>"1"</item>
- <item>"2"</item>
- </string-array>
<string name="pref_default_text_encoding">"Imposta codifica testo"</string>
<string-array name="pref_default_text_encoding_choices">
<item>"Latin-1 (ISO-8859-1)"</item>
@@ -233,8 +218,7 @@
<string name="download_no_sdcard_dlg_title">"Nessuna scheda SD"</string>
<string name="download_no_sdcard_dlg_msg">"Per scaricare <xliff:g id="FILENAME">%s</xliff:g> occorre una scheda SD."</string>
<string name="download_sdcard_busy_dlg_title">"Scheda SD non disponibile"</string>
- <!-- no translation found for download_sdcard_busy_dlg_msg (3473883538192835204) -->
- <skip />
+ <string name="download_sdcard_busy_dlg_msg">"La scheda SD è piena. Per consentire i download, seleziona \"Disattiva archivio USB\" nella notifica."</string>
<string name="download_no_application">"Impossibile trovare un\'applicazione in cui aprire questo file."</string>
<string name="retry">"Riprova"</string>
<string name="no_downloads">"La cronologia download è vuota."</string>
@@ -255,63 +239,36 @@
<string name="permdesc_readHistoryBookmarks">"Consente all\'applicazione di leggere tutti gli URL visitati e tutti i segnalibri del browser."</string>
<string name="permlab_writeHistoryBookmarks">"creazione cronologia e segnalibri del browser"</string>
<string name="permdesc_writeHistoryBookmarks">"Consente a un\'applicazione di modificare la cronologia o i segnalibri del browser memorizzati sul telefono. Le applicazioni dannose possono sfruttare questa possibilità per cancellare o modificare i dati del browser."</string>
- <!-- no translation found for query_data_prompt (5474381240981604223) -->
- <skip />
- <!-- no translation found for query_data_message (8789381063185445197) -->
- <skip />
- <!-- no translation found for location_prompt (226262202057302423) -->
- <skip />
- <!-- no translation found for location_message (1729456751935683242) -->
- <skip />
- <!-- no translation found for shortcut_prompt (437193299088893596) -->
- <skip />
- <!-- no translation found for shortcut_message (4793042709293755892) -->
- <skip />
+ <string name="query_data_prompt">"Consenti archiviazione"</string>
+ <string name="query_data_message">"Il sito web vorrebbe memorizzare informazioni sul cellulare."</string>
+ <string name="location_prompt">"Accedi alla tua posizione"</string>
+ <string name="location_message">"Questo sito web vorrebbe avere accesso alla tua posizione."</string>
+ <string name="shortcut_prompt">"Crea un collegamento"</string>
+ <string name="shortcut_message">"Questo sito web vorrebbe creare un collegamento a questa pagina nella tua home page."</string>
<string name="settings_message">"Nella tabella che segue vengono riportate le autorizzazioni concesse a ogni sito che ha provato a usare Gears."</string>
- <!-- no translation found for filepicker_message (4929726371602896039) -->
- <skip />
- <!-- no translation found for image_message (5450245866521896891) -->
- <skip />
+ <string name="filepicker_message">"Selettore file"</string>
+ <string name="image_message">"Immagine selezionata"</string>
<string name="settings_title">"Impostazioni Gears"</string>
<string name="privacy_policy">"Per conoscere la modalità di utilizzo della tua posizione, leggi le norme sulla privacy del sito."</string>
- <!-- no translation found for settings_storage_title (7089119630457156408) -->
- <skip />
- <!-- no translation found for settings_storage_subtitle_on (2733295483569432111) -->
- <skip />
- <!-- no translation found for settings_storage_subtitle_off (1338039396087898813) -->
- <skip />
- <!-- no translation found for settings_location_title (4953062923509886651) -->
- <skip />
- <!-- no translation found for settings_location_subtitle_on (1496219621849158879) -->
- <skip />
- <!-- no translation found for settings_location_subtitle_off (5216466051810596189) -->
- <skip />
- <!-- no translation found for settings_remove_site (1822247070226589958) -->
- <skip />
- <!-- no translation found for settings_empty (2008952224378583146) -->
- <skip />
- <!-- no translation found for settings_confirmation_remove_title (5360857296753219635) -->
- <skip />
- <!-- no translation found for settings_confirmation_remove (585560170733446898) -->
- <skip />
- <!-- no translation found for storage_notification (6534213782873968255) -->
- <skip />
- <!-- no translation found for storage_notification_alwaysdeny (5473208033665783513) -->
- <skip />
- <!-- no translation found for location_notification (3495804750470905804) -->
- <skip />
- <!-- no translation found for location_notification_alwaysdeny (6184925953783312629) -->
- <skip />
- <!-- no translation found for shortcut_notification (1659700220868444568) -->
- <skip />
- <!-- no translation found for permission_button_alwaysdeny (3837055994905214848) -->
- <skip />
- <!-- no translation found for permission_button_allow (7301874925704148242) -->
- <skip />
- <!-- no translation found for permission_button_deny (104712269725153018) -->
- <skip />
- <!-- no translation found for shortcut_button_alwaysdeny (4172277731325126605) -->
- <skip />
+ <string name="settings_storage_title">"Consenti archiviazione locale"</string>
+ <string name="settings_storage_subtitle_on">"Questo sito può salvare informazioni sul cellulare"</string>
+ <string name="settings_storage_subtitle_off">"Questo sito non può salvare informazioni sul cellulare"</string>
+ <string name="settings_location_title">"Consenti rilevamento posizione"</string>
+ <string name="settings_location_subtitle_on">"Questo sito può leggere la tua posizione attuale"</string>
+ <string name="settings_location_subtitle_off">"Questo sito non può leggere la tua posizione attuale"</string>
+ <string name="settings_remove_site">"Rimuovi il sito da Google Gears"</string>
+ <string name="settings_empty">"Nessuna autorizzazione impostata"</string>
+ <string name="settings_confirmation_remove_title">"Rimuovi il sito"</string>
+ <string name="settings_confirmation_remove">"Tutte le autorizzazioni verranno annullate e tutti i dati memorizzati sul cellulare dal sito verranno eliminati."</string>
+ <string name="storage_notification">"Questo sito memorizzerà informazioni sul cellulare."\n" Modifica questa impostazione in:"\n" Impostazioni -> Impostazioni Gears"</string>
+ <string name="storage_notification_alwaysdeny">"Questo sito non memorizzerà mai informazioni sul cellulare."\n" Modifica questa impostazione in:"\n" Impostazioni -> Impostazioni Gears"</string>
+ <string name="location_notification">"Questo sito può accedere alla tua posizione attuale."\n" Modifica questa impostazione in:"\n" Impostazioni -> Impostazioni Gears"</string>
+ <string name="location_notification_alwaysdeny">"Questo sito non accederà alla tua posizione attuale."\n" Modifica questa impostazione in:"\n" Impostazioni -> Impostazioni Gears"</string>
+ <string name="shortcut_notification">"Collegamento creato"</string>
+ <string name="permission_button_alwaysdeny">"Non consentire mai"</string>
+ <string name="permission_button_allow">"OK"</string>
+ <string name="permission_button_deny">"Annulla"</string>
+ <string name="shortcut_button_alwaysdeny">"Non consentire mai"</string>
<string name="shortcut_button_allow">"OK"</string>
<string name="shortcut_button_deny">"Annulla"</string>
<string name="settings_button_allow">"Applica"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index bd19f84..b97a29d 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -27,8 +27,10 @@
<string name="action">"ログイン"</string>
<string name="cancel">"キャンセル"</string>
<string name="ok">"OK"</string>
- <string name="matches_found">" 件一致"</string>
- <string name="zero">"いいえ"</string>
+ <!-- no translation found for matches_found:zero (6242659159545399963) -->
+ <!-- no translation found for matches_found:one (4352019729062956802) -->
+ <!-- no translation found for matches_found:few (5544267486978946555) -->
+ <!-- no translation found for matches_found:other (6616125067364315405) -->
<string name="page_info">"ページ情報"</string>
<string name="page_info_view">"ページ情報を表示"</string>
<string name="page_info_address">"アドレス:"</string>
@@ -73,13 +75,13 @@
<string name="bookmark_url_not_valid">"無効なURLです。"</string>
<string name="delete_bookmark">"削除"</string>
<string name="bookmark_page">"最後に表示したページをブックマークする"</string>
- <string name="current_page">"ブックマークするページ "</string>
+ <string name="current_page">"URL "</string>
<string name="delete_bookmark_warning">"ブックマーク「<xliff:g id="BOOKMARK">%s</xliff:g>」を削除します。"</string>
<string name="open_in_new_window">"新しいウィンドウで開く"</string>
<string name="new_window">"新規ウィンドウ"</string>
<string name="goto_dot">"移動"</string>
- <string name="find_dot">"このページの検索"</string>
- <string name="select_dot">"テキストを選択"</string>
+ <string name="find_dot">"ページ内検索"</string>
+ <string name="select_dot">"テキストを選択してコピー"</string>
<string name="view_tabs">"ウィンドウリスト"</string>
<string name="view_tabs_condensed">"ウィンドウ"</string>
<string name="tab_picker_title">"現在のウィンドウ"</string>
@@ -111,41 +113,41 @@
<string name="browser_bookmarks_page_bookmarks_text">"ブックマーク"</string>
<string name="menu_preferences">"設定"</string>
<string name="pref_content_title">"ページコンテンツ設定"</string>
- <string name="pref_content_load_images">"画像のロード"</string>
- <string name="pref_content_load_images_summary">"ウェブページに画像を表示"</string>
+ <string name="pref_content_load_images">"画像の読み込み"</string>
+ <string name="pref_content_load_images_summary">"ウェブページに画像を表示する"</string>
<string name="pref_content_block_popups">"ポップアップウィンドウをブロック"</string>
- <string name="pref_content_javascript">"JavaScript有効"</string>
+ <string name="pref_content_javascript">"JavaScriptを有効にする"</string>
<string name="pref_content_open_in_background">"バックグラウンドで開く"</string>
<string name="pref_content_open_in_background_summary">"新しいウィンドウを現在のウィンドウの後ろに開きます"</string>
<string name="pref_content_homepage">"ホームページ設定"</string>
<string name="pref_content_autofit">"ページの自動調整"</string>
- <string name="pref_content_autofit_summary">"ウェブページの大きさを画面に合わせて表示します"</string>
+ <string name="pref_content_autofit_summary">"画面に合わせてウェブページの表示やサイズを自動調整する"</string>
<string name="pref_privacy_title">"プライバシー設定"</string>
<string name="pref_privacy_clear_cache">"キャッシュを消去"</string>
- <string name="pref_privacy_clear_cache_summary">"キャッシュされたページコンテンツをすべて削除します"</string>
+ <string name="pref_privacy_clear_cache_summary">"キャッシュしたコンテンツをすべて削除する"</string>
<string name="pref_privacy_clear_cache_dlg">"キャッシュを消去します。"</string>
- <string name="pref_privacy_clear_cookies">"Cookieデータを全消去"</string>
- <string name="pref_privacy_clear_cookies_summary">"ブラウザのCookieをすべて消去します"</string>
+ <string name="pref_privacy_clear_cookies">"Cookieをすべて消去"</string>
+ <string name="pref_privacy_clear_cookies_summary">"保存されているCookieをすべて消去する"</string>
<string name="pref_privacy_clear_cookies_dlg">"Cookieをすべて消去します。"</string>
<string name="pref_privacy_clear_history">"履歴消去"</string>
<string name="pref_privacy_clear_history_summary">"ブラウザの閲覧履歴を消去します"</string>
<string name="pref_privacy_clear_history_dlg">"ブラウザの閲覧履歴を消去します。"</string>
- <string name="pref_privacy_clear_form_data">"フォームデータをクリア"</string>
+ <string name="pref_privacy_clear_form_data">"フォームデータを消去"</string>
<string name="pref_privacy_clear_form_data_summary">"保存されているフォームデータをすべて消去します"</string>
<string name="pref_privacy_clear_form_data_dlg">"保存されているフォームデータをすべて消去します。"</string>
<string name="pref_privacy_clear_passwords">"パスワードを消去"</string>
- <string name="pref_privacy_clear_passwords_summary">"保存されているパスワードをすべて消去します"</string>
+ <string name="pref_privacy_clear_passwords_summary">"保存されているパスワードをすべて消去する"</string>
<string name="pref_privacy_clear_passwords_dlg">"保存されているパスワードをすべて消去します。"</string>
<string name="pref_security_title">"セキュリティ設定"</string>
<string name="pref_security_remember_passwords">"パスワードを保存"</string>
- <string name="pref_security_remember_passwords_summary">"ウェブサイトのユーザー名とパスワードを保存します"</string>
+ <string name="pref_security_remember_passwords_summary">"サイトのユーザー名とパスワードを保存する"</string>
<string name="pref_security_save_form_data">"フォームデータを保存"</string>
- <string name="pref_security_save_form_data_summary">"フォームに入力したデータを保存して後で再利用します"</string>
- <string name="pref_security_show_security_warning">"セキュリティ警告を表示"</string>
- <string name="pref_security_show_security_warning_summary">"サイトの安全性に問題がある場合に警告を表示"</string>
- <string name="pref_security_accept_cookies">"Cookieの受け入れ"</string>
- <string name="pref_security_accept_cookies_summary">"サイトによるCookieデータの保存と読み取りを許可します"</string>
- <string name="pref_text_size">"テキストサイズを設定"</string>
+ <string name="pref_security_save_form_data_summary">"フォームに入力したデータを保存して後で呼び出せるようにする"</string>
+ <string name="pref_security_show_security_warning">"セキュリティ警告"</string>
+ <string name="pref_security_show_security_warning_summary">"サイトの安全性に問題がある場合に警告を表示する"</string>
+ <string name="pref_security_accept_cookies">"Cookieを受け入れる"</string>
+ <string name="pref_security_accept_cookies_summary">"サイトによるCookieの保存と読み取りを許可する"</string>
+ <string name="pref_text_size">"文字サイズを選択"</string>
<string-array name="pref_text_size_choices">
<item>"最小"</item>
<item>"小"</item>
@@ -154,36 +156,19 @@
<item>"最大"</item>
</string-array>
<string name="pref_text_size_dialogtitle">"文字サイズ"</string>
- <string name="pref_extras_title">"詳細な設定"</string>
- <string name="pref_extras_gears_enable">"Gears有効"</string>
- <string name="pref_extras_gears_enable_summary">"ブラウザの機能を拡張するアプリケーションです"</string>
- <string name="pref_extras_gears_settings">"Gears設定"</string>
+ <string name="pref_extras_title">"詳細設定"</string>
+ <string name="pref_extras_gears_enable">"Gearsを有効にする"</string>
+ <string name="pref_extras_gears_enable_summary">"ブラウザの機能拡張を許可する"</string>
+ <string name="pref_extras_gears_settings">"Gearsの設定"</string>
<string name="pref_plugin_installed">"プラグインリスト"</string>
<string name="pref_plugin_installed_empty_list">"プラグインはインストールされていません。"</string>
<string name="pref_extras_gears_settings_summary">"ブラウザの機能を拡張するアプリケーション"</string>
<string name="pref_extras_reset_default">"初期設定にリセット"</string>
- <string name="pref_extras_reset_default_summary">"ブラウザデータを消去して初期設定に戻します"</string>
+ <string name="pref_extras_reset_default_summary">"ブラウザデータをすべて消去して出荷時の初期設定に戻す"</string>
<string name="pref_extras_reset_default_dlg">"ブラウザデータをすべて消去して初期設定に戻します。"</string>
<string name="pref_extras_reset_default_dlg_title">"初期設定にリセット"</string>
<string name="pref_development_title">"デバッグ"</string>
- <string name="pref_development_viewport">"Use wide viewport"</string>
- <string name="pref_development_single_column_rendering">"Single column rendering"</string>
- <string name="pref_development_normal_rendering">"Normal rendering"</string>
- <string name="pref_development_trace">"Enable tracing"</string>
- <string name="pref_development_nav_dump">"Enable nav cache dump"</string>
- <string name="pref_development_search_url">"Set search URL"</string>
- <string name="pref_development_uastring">"UAString"</string>
- <string-array name="pref_development_ua_choices">
- <item>"Android"</item>
- <item>"Desktop"</item>
- <item>"iPhone"</item>
- </string-array>
- <string-array name="pref_development_ua_values">
- <item>"0"</item>
- <item>"1"</item>
- <item>"2"</item>
- </string-array>
- <string name="pref_default_text_encoding">"テキストエンコードを設定"</string>
+ <string name="pref_default_text_encoding">"エンコードを選択"</string>
<string-array name="pref_default_text_encoding_choices">
<item>"Latin-1 (ISO-8859-1)"</item>
<item>"Unicode (UTF-8)"</item>
@@ -200,13 +185,13 @@
<string name="browserFrameFormResubmitLabel">"確認"</string>
<string name="browserFrameFormResubmitMessage">"表示しようとしているページには、送信済みのデータ (「POSTDATA」) があります。データを再送すると、以前このページのフォームで実行した操作 (検索やオンライン購入など) が繰り返されます。"</string>
<string name="loadSuspendedTitle">"ネットワークに接続していません"</string>
- <string name="loadSuspended">"再接続時にロードを続行します。"</string>
+ <string name="loadSuspended">"接続が回復次第ページを表示します。"</string>
<string name="clear_history">"履歴消去"</string>
<string name="browser_history">"最近閲覧したページ"</string>
<string name="empty_history">"ブラウザ履歴はありません。"</string>
- <string name="add_new_bookmark">"ブックマークを追加..."</string>
+ <string name="add_new_bookmark">"現在のページをブックマーク"</string>
<string name="no_database">"データベースがありません。"</string>
- <string name="search_hint">"ウェブアドレスを入力してください"</string>
+ <string name="search_hint">"ウェブアドレスを入力"</string>
<string name="search_button_text">"移動"</string>
<string name="attention">"注意"</string>
<string name="popup_window_attempt">"このサイトはポップアップウィンドウを開こうとしています。"</string>
@@ -233,8 +218,7 @@
<string name="download_no_sdcard_dlg_title">"SDカードがありません"</string>
<string name="download_no_sdcard_dlg_msg">"<xliff:g id="FILENAME">%s</xliff:g>をダウンロードするにはSDカードが必要です。"</string>
<string name="download_sdcard_busy_dlg_title">"SDカードは利用できません"</string>
- <!-- no translation found for download_sdcard_busy_dlg_msg (3473883538192835204) -->
- <skip />
+ <string name="download_sdcard_busy_dlg_msg">"SDカードは使用中です。[USBストレージをOFFにする]を選択してからダウンロードしてください。"</string>
<string name="download_no_application">"このファイルを開くアプリケーションがありません。"</string>
<string name="retry">"やり直す"</string>
<string name="no_downloads">"ダウンロード履歴はありません。"</string>
@@ -255,63 +239,36 @@
<string name="permdesc_readHistoryBookmarks">"ブラウザでアクセスしたすべてのURLとブックマークの読み取りをアプリケーションに許可します。"</string>
<string name="permlab_writeHistoryBookmarks">"ブラウザの履歴とブックマークの書き込み"</string>
<string name="permdesc_writeHistoryBookmarks">"携帯電話に保存されたブラウザの履歴やブックマークの変更をアプリケーションに許可します。これにより悪意のあるアプリケーションが、ブラウザのデータを消去または変更する恐れがあります。"</string>
- <!-- no translation found for query_data_prompt (5474381240981604223) -->
- <skip />
- <!-- no translation found for query_data_message (8789381063185445197) -->
- <skip />
- <!-- no translation found for location_prompt (226262202057302423) -->
- <skip />
- <!-- no translation found for location_message (1729456751935683242) -->
- <skip />
- <!-- no translation found for shortcut_prompt (437193299088893596) -->
- <skip />
- <!-- no translation found for shortcut_message (4793042709293755892) -->
- <skip />
+ <string name="query_data_prompt">"保存を許可"</string>
+ <string name="query_data_message">"このサイトは携帯電話に情報を保存しようとしています。"</string>
+ <string name="location_prompt">"現在地情報にアクセス"</string>
+ <string name="location_message">"このサイトは現在地情報にアクセスしようとしています。"</string>
+ <string name="shortcut_prompt">"ショートカットを作成"</string>
+ <string name="shortcut_message">"このサイトはホーム画面にこのページへのショートカットを作成しようとしています。"</string>
<string name="settings_message">"Gearsを使用しようとしたサイトに許可した権限は、以下の表のとおりです。"</string>
- <!-- no translation found for filepicker_message (4929726371602896039) -->
- <skip />
- <!-- no translation found for image_message (5450245866521896891) -->
- <skip />
- <string name="settings_title">"Gears設定"</string>
+ <string name="filepicker_message">"ファイル選択"</string>
+ <string name="image_message">"選択した画像"</string>
+ <string name="settings_title">"Gearsの設定"</string>
<string name="privacy_policy">"サイトのプライバシーポリシーを読んで、現在地の情報がどのように使用されるのか確認してください。"</string>
- <!-- no translation found for settings_storage_title (7089119630457156408) -->
- <skip />
- <!-- no translation found for settings_storage_subtitle_on (2733295483569432111) -->
- <skip />
- <!-- no translation found for settings_storage_subtitle_off (1338039396087898813) -->
- <skip />
- <!-- no translation found for settings_location_title (4953062923509886651) -->
- <skip />
- <!-- no translation found for settings_location_subtitle_on (1496219621849158879) -->
- <skip />
- <!-- no translation found for settings_location_subtitle_off (5216466051810596189) -->
- <skip />
- <!-- no translation found for settings_remove_site (1822247070226589958) -->
- <skip />
- <!-- no translation found for settings_empty (2008952224378583146) -->
- <skip />
- <!-- no translation found for settings_confirmation_remove_title (5360857296753219635) -->
- <skip />
- <!-- no translation found for settings_confirmation_remove (585560170733446898) -->
- <skip />
- <!-- no translation found for storage_notification (6534213782873968255) -->
- <skip />
- <!-- no translation found for storage_notification_alwaysdeny (5473208033665783513) -->
- <skip />
- <!-- no translation found for location_notification (3495804750470905804) -->
- <skip />
- <!-- no translation found for location_notification_alwaysdeny (6184925953783312629) -->
- <skip />
- <!-- no translation found for shortcut_notification (1659700220868444568) -->
- <skip />
- <!-- no translation found for permission_button_alwaysdeny (3837055994905214848) -->
- <skip />
- <!-- no translation found for permission_button_allow (7301874925704148242) -->
- <skip />
- <!-- no translation found for permission_button_deny (104712269725153018) -->
- <skip />
- <!-- no translation found for shortcut_button_alwaysdeny (4172277731325126605) -->
- <skip />
+ <string name="settings_storage_title">"ローカル保存を許可"</string>
+ <string name="settings_storage_subtitle_on">"このサイトは携帯電話に情報を保存できます"</string>
+ <string name="settings_storage_subtitle_off">"このサイトは携帯電話に情報を保存できません"</string>
+ <string name="settings_location_title">"現在地の検出を許可"</string>
+ <string name="settings_location_subtitle_on">"このサイトは現在地情報を読み取ることができます"</string>
+ <string name="settings_location_subtitle_off">"このサイトは現在地情報を読み取ることができません"</string>
+ <string name="settings_remove_site">"このサイトをGearsから削除"</string>
+ <string name="settings_empty">"設定されている権限はありません"</string>
+ <string name="settings_confirmation_remove_title">"このサイトを削除"</string>
+ <string name="settings_confirmation_remove">"権限をすべて消去し、このサイトが携帯電話に保存した全データを削除します。"</string>
+ <string name="storage_notification">"このサイトは携帯電話に情報を保存します。"\n"設定変更:"\n"[設定]->[Gears設定]"</string>
+ <string name="storage_notification_alwaysdeny">"このサイトは携帯電話に情報を保存しません。"\n"設定変更:"\n"[設定]->[Gears設定]"</string>
+ <string name="location_notification">"このサイトは現在地情報にアクセスできます。"\n"設定変更:"\n"[設定]->[Gears設定]"</string>
+ <string name="location_notification_alwaysdeny">"このサイトは現在地情報にアクセスしません。"\n"設定変更:"\n"[設定]->[Gears設定]"</string>
+ <string name="shortcut_notification">"ショートカットを作成しました"</string>
+ <string name="permission_button_alwaysdeny">"許可しない"</string>
+ <string name="permission_button_allow">"OK"</string>
+ <string name="permission_button_deny">"キャンセル"</string>
+ <string name="shortcut_button_alwaysdeny">"許可しない"</string>
<string name="shortcut_button_allow">"OK"</string>
<string name="shortcut_button_deny">"キャンセル"</string>
<string name="settings_button_allow">"適用"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index d85caee..52434a5 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -27,8 +27,10 @@
<string name="action">"로그인"</string>
<string name="cancel">"취소"</string>
<string name="ok">"확인"</string>
- <string name="matches_found">" 개 일치"</string>
- <string name="zero">"없음"</string>
+ <!-- no translation found for matches_found:zero (6242659159545399963) -->
+ <!-- no translation found for matches_found:one (4352019729062956802) -->
+ <!-- no translation found for matches_found:few (5544267486978946555) -->
+ <!-- no translation found for matches_found:other (6616125067364315405) -->
<string name="page_info">"페이지 정보"</string>
<string name="page_info_view">"페이지 정보 보기"</string>
<string name="page_info_address">"주소:"</string>
@@ -166,23 +168,6 @@
<string name="pref_extras_reset_default_dlg">"모든 브라우저 데이터가 지워지고 설정이 기본값으로 돌아갑니다."</string>
<string name="pref_extras_reset_default_dlg_title">"기본값으로 재설정"</string>
<string name="pref_development_title">"디버그"</string>
- <string name="pref_development_viewport">"Use wide viewport"</string>
- <string name="pref_development_single_column_rendering">"Single column rendering"</string>
- <string name="pref_development_normal_rendering">"Normal rendering"</string>
- <string name="pref_development_trace">"Enable tracing"</string>
- <string name="pref_development_nav_dump">"Enable nav cache dump"</string>
- <string name="pref_development_search_url">"검색 URL 설정"</string>
- <string name="pref_development_uastring">"UAString"</string>
- <string-array name="pref_development_ua_choices">
- <item>"Android"</item>
- <item>"Desktop"</item>
- <item>"iPhone"</item>
- </string-array>
- <string-array name="pref_development_ua_values">
- <item>"0"</item>
- <item>"1"</item>
- <item>"2"</item>
- </string-array>
<string name="pref_default_text_encoding">"텍스트 인코딩 설정"</string>
<string-array name="pref_default_text_encoding_choices">
<item>"라틴어-1(ISO-8859-1)"</item>
@@ -233,8 +218,7 @@
<string name="download_no_sdcard_dlg_title">"SD 카드 없음"</string>
<string name="download_no_sdcard_dlg_msg">"<xliff:g id="FILENAME">%s</xliff:g>을(를) 다운로드하려면 SD 카드가 필요합니다."</string>
<string name="download_sdcard_busy_dlg_title">"SD 카드를 사용할 수 없음"</string>
- <!-- no translation found for download_sdcard_busy_dlg_msg (3473883538192835204) -->
- <skip />
+ <string name="download_sdcard_busy_dlg_msg">"SD 카드가 사용 중입니다. 다운로드를 허용하려면 알림에서 \'USB 저장소 끄기\'를 선택하세요."</string>
<string name="download_no_application">"파일을 열 수 있는 응용프로그램이 없습니다."</string>
<string name="retry">"다시 시도"</string>
<string name="no_downloads">"다운로드 기록이 비어 있습니다."</string>
@@ -255,63 +239,36 @@
<string name="permdesc_readHistoryBookmarks">"응용프로그램이 브라우저에서 방문한 모든 URL과 브라우저의 북마크를 모두 읽을 수 있습니다."</string>
<string name="permlab_writeHistoryBookmarks">"브라우저의 기록 및 북마크 쓰기"</string>
<string name="permdesc_writeHistoryBookmarks">"응용프로그램이 전화기에 저장된 브라우저의 기록 또는 북마크를 수정할 수 있습니다. 악성 응용프로그램은 이 기능을 이용하여 브라우저의 데이터를 지우거나 수정할 수 있습니다."</string>
- <!-- no translation found for query_data_prompt (5474381240981604223) -->
- <skip />
- <!-- no translation found for query_data_message (8789381063185445197) -->
- <skip />
- <!-- no translation found for location_prompt (226262202057302423) -->
- <skip />
- <!-- no translation found for location_message (1729456751935683242) -->
- <skip />
- <!-- no translation found for shortcut_prompt (437193299088893596) -->
- <skip />
- <!-- no translation found for shortcut_message (4793042709293755892) -->
- <skip />
+ <string name="query_data_prompt">"저장소 허용"</string>
+ <string name="query_data_message">"웹사이트에서 휴대전화에 정보를 저장하려고 합니다."</string>
+ <string name="location_prompt">"사용자 위치에 액세스"</string>
+ <string name="location_message">"웹사이트가 사용자의 위치에 액세스하려고 합니다."</string>
+ <string name="shortcut_prompt">"바로가기 만들기"</string>
+ <string name="shortcut_message">"웹사이트가 홈 화면에 이 페이지의 바로가기를 만들려고 합니다."</string>
<string name="settings_message">"아래 표는 Gears를 사용하려고 시도한 각 사이트에 부여한 권한을 보여줍니다."</string>
- <!-- no translation found for filepicker_message (4929726371602896039) -->
- <skip />
- <!-- no translation found for image_message (5450245866521896891) -->
- <skip />
+ <string name="filepicker_message">"파일 선택기"</string>
+ <string name="image_message">"선택한 이미지"</string>
<string name="settings_title">"Gears 설정"</string>
<string name="privacy_policy">"위치가 어떻게 사용되는지 보려면 사이트의 개인정보 보호정책을 읽어보세요."</string>
- <!-- no translation found for settings_storage_title (7089119630457156408) -->
- <skip />
- <!-- no translation found for settings_storage_subtitle_on (2733295483569432111) -->
- <skip />
- <!-- no translation found for settings_storage_subtitle_off (1338039396087898813) -->
- <skip />
- <!-- no translation found for settings_location_title (4953062923509886651) -->
- <skip />
- <!-- no translation found for settings_location_subtitle_on (1496219621849158879) -->
- <skip />
- <!-- no translation found for settings_location_subtitle_off (5216466051810596189) -->
- <skip />
- <!-- no translation found for settings_remove_site (1822247070226589958) -->
- <skip />
- <!-- no translation found for settings_empty (2008952224378583146) -->
- <skip />
- <!-- no translation found for settings_confirmation_remove_title (5360857296753219635) -->
- <skip />
- <!-- no translation found for settings_confirmation_remove (585560170733446898) -->
- <skip />
- <!-- no translation found for storage_notification (6534213782873968255) -->
- <skip />
- <!-- no translation found for storage_notification_alwaysdeny (5473208033665783513) -->
- <skip />
- <!-- no translation found for location_notification (3495804750470905804) -->
- <skip />
- <!-- no translation found for location_notification_alwaysdeny (6184925953783312629) -->
- <skip />
- <!-- no translation found for shortcut_notification (1659700220868444568) -->
- <skip />
- <!-- no translation found for permission_button_alwaysdeny (3837055994905214848) -->
- <skip />
- <!-- no translation found for permission_button_allow (7301874925704148242) -->
- <skip />
- <!-- no translation found for permission_button_deny (104712269725153018) -->
- <skip />
- <!-- no translation found for shortcut_button_alwaysdeny (4172277731325126605) -->
- <skip />
+ <string name="settings_storage_title">"로컬 저장소 허용"</string>
+ <string name="settings_storage_subtitle_on">"사이트에서 휴대전화에 정보를 저장할 수 있습니다."</string>
+ <string name="settings_storage_subtitle_off">"사이트에서 휴대전화에 정보를 저장할 수 없습니다."</string>
+ <string name="settings_location_title">"위치 확인 허용"</string>
+ <string name="settings_location_subtitle_on">"사이트에서 사용자의 현재 위치를 읽을 수 있습니다."</string>
+ <string name="settings_location_subtitle_off">"사이트에서 사용자의 현재 위치를 읽을 수 없습니다."</string>
+ <string name="settings_remove_site">"Gears에서 사이트 삭제"</string>
+ <string name="settings_empty">"설정된 권한이 없습니다."</string>
+ <string name="settings_confirmation_remove_title">"사이트 삭제"</string>
+ <string name="settings_confirmation_remove">"모든 권한이 지워지고 사이트에서 휴대전화에 저장한 모든 데이터가 삭제됩니다."</string>
+ <string name="storage_notification">"사이트에서 휴대전화에 정보를 저장합니다."\n" 설정을 변경하려면"\n" 설정 -> Gears 설정으로 이동하세요."</string>
+ <string name="storage_notification_alwaysdeny">"사이트에서 휴대전화에 정보를 저장하지 않습니다."\n" 설정을 변경하려면"\n"설정 -> Gears 설정으로 이동하세요."</string>
+ <string name="location_notification">"사이트에서 사용자의 현재 위치에 액세스할 수 있습니다."\n" 설정을 변경하려면"\n" 설정 -> Gears 설정으로 이동하세요."</string>
+ <string name="location_notification_alwaysdeny">"사이트에서 사용자의 현재 위치에 액세스하지 않습니다."\n" 설정을 변경하려면"\n" 설정 -> Gears 설정으로 이동하세요."</string>
+ <string name="shortcut_notification">"바로가기 생성됨"</string>
+ <string name="permission_button_alwaysdeny">"허용 안 함"</string>
+ <string name="permission_button_allow">"확인"</string>
+ <string name="permission_button_deny">"취소"</string>
+ <string name="shortcut_button_alwaysdeny">"허용 안 함"</string>
<string name="shortcut_button_allow">"확인"</string>
<string name="shortcut_button_deny">"취소"</string>
<string name="settings_button_allow">"적용"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 3c149fb..ff90972 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -27,8 +27,10 @@
<string name="action">"Logg inn"</string>
<string name="cancel">"Avbryt"</string>
<string name="ok">"OK"</string>
- <string name="matches_found">" treff"</string>
- <string name="zero">"Ingen"</string>
+ <!-- no translation found for matches_found:zero (6242659159545399963) -->
+ <!-- no translation found for matches_found:one (4352019729062956802) -->
+ <!-- no translation found for matches_found:few (5544267486978946555) -->
+ <!-- no translation found for matches_found:other (6616125067364315405) -->
<string name="page_info">"Sideinformasjon"</string>
<string name="page_info_view">"Vis sideinformasjon"</string>
<string name="page_info_address">"Adresse:"</string>
@@ -166,23 +168,6 @@
<string name="pref_extras_reset_default_dlg">"Alle data vil bli fjernet fra nettleseren, og alle innstillinger vil bli nullstilt."</string>
<string name="pref_extras_reset_default_dlg_title">"Nullstill"</string>
<string name="pref_development_title">"Avlusing"</string>
- <string name="pref_development_viewport">"Use wide viewport"</string>
- <string name="pref_development_single_column_rendering">"Single column rendering"</string>
- <string name="pref_development_normal_rendering">"Normal rendering"</string>
- <string name="pref_development_trace">"Enable tracing"</string>
- <string name="pref_development_nav_dump">"Enable nav cache dump"</string>
- <string name="pref_development_search_url">"Set search URL"</string>
- <string name="pref_development_uastring">"UAString"</string>
- <string-array name="pref_development_ua_choices">
- <item>"Android"</item>
- <item>"Desktop"</item>
- <item>"iPhone"</item>
- </string-array>
- <string-array name="pref_development_ua_values">
- <item>"0"</item>
- <item>"1"</item>
- <item>"2"</item>
- </string-array>
<string name="pref_default_text_encoding">"Velg tekstkoding"</string>
<string-array name="pref_default_text_encoding_choices">
<item>"Latin-1 (ISO-8859-1)"</item>
@@ -233,8 +218,7 @@
<string name="download_no_sdcard_dlg_title">"Mangler minnekort"</string>
<string name="download_no_sdcard_dlg_msg">"Du trenger et minnekort for å laste ned <xliff:g id="FILENAME">%s</xliff:g>."</string>
<string name="download_sdcard_busy_dlg_title">"Minnekort utilgjengelig"</string>
- <!-- no translation found for download_sdcard_busy_dlg_msg (3473883538192835204) -->
- <skip />
+ <string name="download_sdcard_busy_dlg_msg">"Minnekortet er opptatt. For å tillate nedlasting, velg \"Slå av USB-lagring\" i varslingen."</string>
<string name="download_no_application">"Fant ingen applikasjon som kunne åpne denne filen."</string>
<string name="retry">"Prøv igjen"</string>
<string name="no_downloads">"Nedlastingsloggen er tom."</string>
@@ -255,51 +239,32 @@
<string name="permdesc_readHistoryBookmarks">"Allows the application to read all the URLs that the Browser has visited, and all of the Browser\'s bookmarks."</string>
<string name="permlab_writeHistoryBookmarks">"write Browser\'s history and bookmarks"</string>
<string name="permdesc_writeHistoryBookmarks">"Allows an application to modify the Browser\'s history or bookmarks stored on your phone. Malicious applications can use this to erase or modify your Browser\'s data."</string>
- <!-- no translation found for query_data_prompt (5474381240981604223) -->
- <skip />
+ <string name="query_data_prompt">"Tillat lagring"</string>
<string name="query_data_message">"Nettsiden under ønsker å lagre informasjon på datamaskinen ved hjelp av Gears."</string>
- <!-- no translation found for location_prompt (226262202057302423) -->
- <skip />
+ <string name="location_prompt">"Få tilgang til plassering"</string>
<string name="location_message">"Nettsiden under ønsker å finne ut hvor du er ved hjelp av Gears."</string>
- <!-- no translation found for shortcut_prompt (437193299088893596) -->
- <skip />
+ <string name="shortcut_prompt">"Lag snarvei"</string>
<string name="shortcut_message">"Denne nettsiden ønsker å lage en snarvei på datamaskinen. Ønsker du å tillate dette?"</string>
<string name="settings_message">"Tabellen under viser rettighetent du har gitt til hver side som har prøvd å bruke Gears."</string>
<string name="filepicker_message">"Gears filplukker"</string>
- <!-- no translation found for image_message (5450245866521896891) -->
- <skip />
+ <string name="image_message">"Valgt bilde"</string>
<string name="settings_title">"Gears-innstillinger"</string>
<string name="privacy_policy">"Les sidens personvernspolicy for å se hvordan informasjonen vil bli brukt."</string>
- <!-- no translation found for settings_storage_title (7089119630457156408) -->
- <skip />
- <!-- no translation found for settings_storage_subtitle_on (2733295483569432111) -->
- <skip />
- <!-- no translation found for settings_storage_subtitle_off (1338039396087898813) -->
- <skip />
- <!-- no translation found for settings_location_title (4953062923509886651) -->
- <skip />
- <!-- no translation found for settings_location_subtitle_on (1496219621849158879) -->
- <skip />
- <!-- no translation found for settings_location_subtitle_off (5216466051810596189) -->
- <skip />
- <!-- no translation found for settings_remove_site (1822247070226589958) -->
- <skip />
- <!-- no translation found for settings_empty (2008952224378583146) -->
- <skip />
- <!-- no translation found for settings_confirmation_remove_title (5360857296753219635) -->
- <skip />
- <!-- no translation found for settings_confirmation_remove (585560170733446898) -->
- <skip />
- <!-- no translation found for storage_notification (6534213782873968255) -->
- <skip />
- <!-- no translation found for storage_notification_alwaysdeny (5473208033665783513) -->
- <skip />
- <!-- no translation found for location_notification (3495804750470905804) -->
- <skip />
- <!-- no translation found for location_notification_alwaysdeny (6184925953783312629) -->
- <skip />
- <!-- no translation found for shortcut_notification (1659700220868444568) -->
- <skip />
+ <string name="settings_storage_title">"Tillat lokal lagring"</string>
+ <string name="settings_storage_subtitle_on">"Denne siden kan lagre informasjon i telefonen"</string>
+ <string name="settings_storage_subtitle_off">"Denne siden kan ikke lagre informasjon i telefonen"</string>
+ <string name="settings_location_title">"Tillat deteksjon av plassering"</string>
+ <string name="settings_location_subtitle_on">"Siden får vite hvor du befinner deg"</string>
+ <string name="settings_location_subtitle_off">"Siden får ikke vite hvor du befinner deg"</string>
+ <string name="settings_remove_site">"Fjern denne siden fra Gears"</string>
+ <string name="settings_empty">"Ingen rettigheter satt"</string>
+ <string name="settings_confirmation_remove_title">"Fjern denne siden"</string>
+ <string name="settings_confirmation_remove">"Alle rettigheter vil bli nullstilt, og alle data lagret av siden i telefonen vil bli slettet."</string>
+ <string name="storage_notification">"Siden vil lagre informasjon i telefonen."\n" Endre dette i:"\n" Innstillinger -> Gears-innstillinger"</string>
+ <string name="storage_notification_alwaysdeny">"Siden vil aldri lagre informasjon i telefonen."\n" Endre dette i:"\n" Innstillinger -> Gears-innstillinger"</string>
+ <string name="location_notification">"Siden får ikke vite hvor du befinner deg."\n" Endre dette i:"\n" Innstillinger -> Gears-innstillinger"</string>
+ <string name="location_notification_alwaysdeny">"Siden vil ikke få vite hvor du befinner deg."\n" Endre dette i:"\n" Innstillinger -> Gears-innstillinger"</string>
+ <string name="shortcut_notification">"Snarvei opprettet"</string>
<string name="permission_button_alwaysdeny">"Aldri tillat for denne siden"</string>
<string name="permission_button_allow">"Tillat"</string>
<string name="permission_button_deny">"Nekt"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 58b6a97..d43dec9 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -27,8 +27,10 @@
<string name="action">"Aanmelden"</string>
<string name="cancel">"Annuleren"</string>
<string name="ok">"OK"</string>
- <string name="matches_found">" overeenkomsten"</string>
- <string name="zero">"Nee"</string>
+ <!-- no translation found for matches_found:zero (6242659159545399963) -->
+ <!-- no translation found for matches_found:one (4352019729062956802) -->
+ <!-- no translation found for matches_found:few (5544267486978946555) -->
+ <!-- no translation found for matches_found:other (6616125067364315405) -->
<string name="page_info">"Pagina-informatie"</string>
<string name="page_info_view">"Pagina-informatie weergeven"</string>
<string name="page_info_address">"Adres:"</string>
@@ -166,23 +168,6 @@
<string name="pref_extras_reset_default_dlg">"Alle browsergegevens worden gewist en de standaardinstellingen worden hersteld."</string>
<string name="pref_extras_reset_default_dlg_title">"Standaardinstellingen herstellen"</string>
<string name="pref_development_title">"Foutopsporing"</string>
- <string name="pref_development_viewport">"Use wide viewport"</string>
- <string name="pref_development_single_column_rendering">"Single column rendering"</string>
- <string name="pref_development_normal_rendering">"Normaal gerenderd"</string>
- <string name="pref_development_trace">"Traceren inschakelen"</string>
- <string name="pref_development_nav_dump">"Enable nav cache dump"</string>
- <string name="pref_development_search_url">"Set search URL"</string>
- <string name="pref_development_uastring">"UAString"</string>
- <string-array name="pref_development_ua_choices">
- <item>"Android"</item>
- <item>"Desktop"</item>
- <item>"iPhone"</item>
- </string-array>
- <string-array name="pref_development_ua_values">
- <item>"0"</item>
- <item>"1"</item>
- <item>"2"</item>
- </string-array>
<string name="pref_default_text_encoding">"Tekstcodering instellen"</string>
<string-array name="pref_default_text_encoding_choices">
<item>"Latijn-1 (ISO-8859-1)"</item>
@@ -233,8 +218,7 @@
<string name="download_no_sdcard_dlg_title">"Geen SD-kaart"</string>
<string name="download_no_sdcard_dlg_msg">"Een SD-kaart is vereist om <xliff:g id="FILENAME">%s</xliff:g> te kunnen downloaden."</string>
<string name="download_sdcard_busy_dlg_title">"SD-kaart niet beschikbaar"</string>
- <!-- no translation found for download_sdcard_busy_dlg_msg (3473883538192835204) -->
- <skip />
+ <string name="download_sdcard_busy_dlg_msg">"De SD-kaart wordt gebruikt. Als u downloads wilt toestaan, selecteert u \'USB-opslag uitschakelen\' in de melding."</string>
<string name="download_no_application">"Er is geen toepassing gevonden waarmee dit bestand kan worden geopend."</string>
<string name="retry">"Opnieuw proberen"</string>
<string name="no_downloads">"Downloadgeschiedenis is leeg."</string>
@@ -255,63 +239,36 @@
<string name="permdesc_readHistoryBookmarks">"Hiermee kan een toepassing de URL\'s lezen die u via de browser heeft bezocht, evenals alle bladwijzers van de browser."</string>
<string name="permlab_writeHistoryBookmarks">"browsergeschiedenis en bladwijzers schrijven"</string>
<string name="permdesc_writeHistoryBookmarks">"Hiermee kan een toepassing de op uw telefoon opgeslagen browsergeschiedenis of bladwijzers wijzigen. Schadelijke toepassingen kunnen hiermee uw browsergegevens verwijderen of wijzigen."</string>
- <!-- no translation found for query_data_prompt (5474381240981604223) -->
- <skip />
- <!-- no translation found for query_data_message (8789381063185445197) -->
- <skip />
- <!-- no translation found for location_prompt (226262202057302423) -->
- <skip />
- <!-- no translation found for location_message (1729456751935683242) -->
- <skip />
- <!-- no translation found for shortcut_prompt (437193299088893596) -->
- <skip />
- <!-- no translation found for shortcut_message (4793042709293755892) -->
- <skip />
+ <string name="query_data_prompt">"Opslag toestaan"</string>
+ <string name="query_data_message">"Deze website wil informatie opslaan op uw telefoon."</string>
+ <string name="location_prompt">"Toegang tot uw locatie"</string>
+ <string name="location_message">"Deze website wil toegang hebben tot uw locatie."</string>
+ <string name="shortcut_prompt">"Een snelkoppeling maken"</string>
+ <string name="shortcut_message">"Deze website wil een snelkoppeling naar deze pagina maken op uw startscherm."</string>
<string name="settings_message">"De onderstaande tabel geeft de toestemming weer die u heeft verleend aan elke site die Gears heeft geprobeerd te gebruiken."</string>
- <!-- no translation found for filepicker_message (4929726371602896039) -->
- <skip />
- <!-- no translation found for image_message (5450245866521896891) -->
- <skip />
+ <string name="filepicker_message">"Bestandenkiezer"</string>
+ <string name="image_message">"Gekozen afbeelding"</string>
<string name="settings_title">"Instellingen van Gears"</string>
<string name="privacy_policy">"U kunt het privacybeleid van de site raadplegen voor meer informatie over hoe uw locatie wordt gebruikt."</string>
- <!-- no translation found for settings_storage_title (7089119630457156408) -->
- <skip />
- <!-- no translation found for settings_storage_subtitle_on (2733295483569432111) -->
- <skip />
- <!-- no translation found for settings_storage_subtitle_off (1338039396087898813) -->
- <skip />
- <!-- no translation found for settings_location_title (4953062923509886651) -->
- <skip />
- <!-- no translation found for settings_location_subtitle_on (1496219621849158879) -->
- <skip />
- <!-- no translation found for settings_location_subtitle_off (5216466051810596189) -->
- <skip />
- <!-- no translation found for settings_remove_site (1822247070226589958) -->
- <skip />
- <!-- no translation found for settings_empty (2008952224378583146) -->
- <skip />
- <!-- no translation found for settings_confirmation_remove_title (5360857296753219635) -->
- <skip />
- <!-- no translation found for settings_confirmation_remove (585560170733446898) -->
- <skip />
- <!-- no translation found for storage_notification (6534213782873968255) -->
- <skip />
- <!-- no translation found for storage_notification_alwaysdeny (5473208033665783513) -->
- <skip />
- <!-- no translation found for location_notification (3495804750470905804) -->
- <skip />
- <!-- no translation found for location_notification_alwaysdeny (6184925953783312629) -->
- <skip />
- <!-- no translation found for shortcut_notification (1659700220868444568) -->
- <skip />
- <!-- no translation found for permission_button_alwaysdeny (3837055994905214848) -->
- <skip />
- <!-- no translation found for permission_button_allow (7301874925704148242) -->
- <skip />
- <!-- no translation found for permission_button_deny (104712269725153018) -->
- <skip />
- <!-- no translation found for shortcut_button_alwaysdeny (4172277731325126605) -->
- <skip />
+ <string name="settings_storage_title">"Lokale opslag toestaan"</string>
+ <string name="settings_storage_subtitle_on">"Deze site kan informatie opslaan op uw telefoon"</string>
+ <string name="settings_storage_subtitle_off">"Deze site kan geen informatie op uw telefoon opslaan"</string>
+ <string name="settings_location_title">"Locatiedetectie toestaan"</string>
+ <string name="settings_location_subtitle_on">"Deze site kan uw huidige locatie lezen"</string>
+ <string name="settings_location_subtitle_off">"Deze site kan uw huidige locatie niet lezen"</string>
+ <string name="settings_remove_site">"Deze site verwijderen uit Gears"</string>
+ <string name="settings_empty">"Geen machtigingen ingesteld"</string>
+ <string name="settings_confirmation_remove_title">"Deze site verwijderen"</string>
+ <string name="settings_confirmation_remove">"Alle machtigingen worden gewist en eventuele gegevens die op uw telefoon zijn opgeslagen door de site, worden verwijderd."</string>
+ <string name="storage_notification">"Deze site slaat informatie op deze telefoon op."\n" Wijzig deze instelling in:"\n" Instellingen -> Instellingen van Gears"</string>
+ <string name="storage_notification_alwaysdeny">"Deze site slaat nooit informatie op deze telefoon op."\n" Wijzig deze instelling in:"\n" Instellingen -> Instellingen van Gears"</string>
+ <string name="location_notification">"Deze site heeft toegang tot uw huidige locatie."\n" Wijzig deze instelling in:"\n" Instellingen -> Instellingen van Gears"</string>
+ <string name="location_notification_alwaysdeny">"Deze site heeft geen toegang tot uw huidige locatie."\n" Wijzig deze instelling in:"\n" Instellingen -> Instellingen van Gears"</string>
+ <string name="shortcut_notification">"Snelkoppeling gemaakt"</string>
+ <string name="permission_button_alwaysdeny">"Nooit toestaan"</string>
+ <string name="permission_button_allow">"OK"</string>
+ <string name="permission_button_deny">"Annuleren"</string>
+ <string name="shortcut_button_alwaysdeny">"Nooit toestaan"</string>
<string name="shortcut_button_allow">"OK"</string>
<string name="shortcut_button_deny">"Annuleren"</string>
<string name="settings_button_allow">"Toepassen"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 186128b..2e937ab 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -27,8 +27,10 @@
<string name="action">"Zaloguj się"</string>
<string name="cancel">"Anuluj"</string>
<string name="ok">"OK"</string>
- <string name="matches_found">" dopasowania"</string>
- <string name="zero">"Nie"</string>
+ <!-- no translation found for matches_found:zero (6242659159545399963) -->
+ <!-- no translation found for matches_found:one (4352019729062956802) -->
+ <!-- no translation found for matches_found:few (5544267486978946555) -->
+ <!-- no translation found for matches_found:other (6616125067364315405) -->
<string name="page_info">"Informacje o stronie"</string>
<string name="page_info_view">"Informacje o stronie"</string>
<string name="page_info_address">"Adres:"</string>
@@ -166,23 +168,6 @@
<string name="pref_extras_reset_default_dlg">"Wszystkie dane przeglądarki zostaną wyczyszczone, a ustawienia powrócą do wartości domyślnych."</string>
<string name="pref_extras_reset_default_dlg_title">"Przywróć wartości domyślne"</string>
<string name="pref_development_title">"Debugowanie"</string>
- <string name="pref_development_viewport">"Use wide viewport"</string>
- <string name="pref_development_single_column_rendering">"Single column rendering"</string>
- <string name="pref_development_normal_rendering">"Normal rendering"</string>
- <string name="pref_development_trace">"Enable tracing"</string>
- <string name="pref_development_nav_dump">"Enable nav cache dump"</string>
- <string name="pref_development_search_url">"Ustaw adres URL wyszukiwania"</string>
- <string name="pref_development_uastring">"UAString"</string>
- <string-array name="pref_development_ua_choices">
- <item>"Android"</item>
- <item>"Desktop"</item>
- <item>"iPhone"</item>
- </string-array>
- <string-array name="pref_development_ua_values">
- <item>"0"</item>
- <item>"1"</item>
- <item>"2"</item>
- </string-array>
<string name="pref_default_text_encoding">"Ustaw kodowanie tekstu"</string>
<string-array name="pref_default_text_encoding_choices">
<item>"Latin-1 (ISO-8859-1)"</item>
@@ -233,8 +218,7 @@
<string name="download_no_sdcard_dlg_title">"Brak karty SD"</string>
<string name="download_no_sdcard_dlg_msg">"Do pobrania pliku <xliff:g id="FILENAME">%s</xliff:g> potrzebna jest karta SD."</string>
<string name="download_sdcard_busy_dlg_title">"Karta SD jest niedostępna"</string>
- <!-- no translation found for download_sdcard_busy_dlg_msg (3473883538192835204) -->
- <skip />
+ <string name="download_sdcard_busy_dlg_msg">"Karta SD jest zajęta. Aby umożliwić pobieranie, wybierz w powiadomieniu opcję „Wyłącz nośnik USB”."</string>
<string name="download_no_application">"Nie można znaleźć pliku do otwarcia tego programu."</string>
<string name="retry">"Spróbuj ponownie"</string>
<string name="no_downloads">"Historia pobierania jest pusta."</string>
@@ -255,63 +239,36 @@
<string name="permdesc_readHistoryBookmarks">"Zezwala aplikacji na odczytanie wszystkich adresów URL odwiedzonych przy użyciu przeglądarki oraz wszystkich zakładek przeglądarki."</string>
<string name="permlab_writeHistoryBookmarks">"zapisać historię i zakładki przeglądarki"</string>
<string name="permdesc_writeHistoryBookmarks">"Pozwala aplikacji na zmianę historii lub zakładek przeglądarki zapisanych w telefonie. Szkodliwe aplikacje mogą to wykorzystać, aby usunąć lub zmienić dane przeglądarki."</string>
- <!-- no translation found for query_data_prompt (5474381240981604223) -->
- <skip />
- <!-- no translation found for query_data_message (8789381063185445197) -->
- <skip />
- <!-- no translation found for location_prompt (226262202057302423) -->
- <skip />
- <!-- no translation found for location_message (1729456751935683242) -->
- <skip />
- <!-- no translation found for shortcut_prompt (437193299088893596) -->
- <skip />
- <!-- no translation found for shortcut_message (4793042709293755892) -->
- <skip />
+ <string name="query_data_prompt">"Zezwól na zapis"</string>
+ <string name="query_data_message">"Ta witryna internetowa chce zapisać informacje w telefonie."</string>
+ <string name="location_prompt">"Dostęp do informacji o Twojej lokalizacji"</string>
+ <string name="location_message">"Ta witryna internetowa chce uzyskać dostęp do informacji o Twojej lokalizacji."</string>
+ <string name="shortcut_prompt">"Utwórz skrót"</string>
+ <string name="shortcut_message">"Ta witryna internetowa chce utworzyć skrót do tej strony na Twoim ekranie głównym."</string>
<string name="settings_message">"W poniższej tabeli przedstawiono uprawnienia udzielone każdej z witryn próbujących użyć Gears."</string>
- <!-- no translation found for filepicker_message (4929726371602896039) -->
- <skip />
- <!-- no translation found for image_message (5450245866521896891) -->
- <skip />
+ <string name="filepicker_message">"Wybór plików"</string>
+ <string name="image_message">"Wybrany obraz"</string>
<string name="settings_title">"Gears – ustawienia"</string>
<string name="privacy_policy">"Przeczytaj zasady zachowania poufności informacji witryny, aby dowiedzieć się, jak będą użyte informacje o twojej lokalizacji."</string>
- <!-- no translation found for settings_storage_title (7089119630457156408) -->
- <skip />
- <!-- no translation found for settings_storage_subtitle_on (2733295483569432111) -->
- <skip />
- <!-- no translation found for settings_storage_subtitle_off (1338039396087898813) -->
- <skip />
- <!-- no translation found for settings_location_title (4953062923509886651) -->
- <skip />
- <!-- no translation found for settings_location_subtitle_on (1496219621849158879) -->
- <skip />
- <!-- no translation found for settings_location_subtitle_off (5216466051810596189) -->
- <skip />
- <!-- no translation found for settings_remove_site (1822247070226589958) -->
- <skip />
- <!-- no translation found for settings_empty (2008952224378583146) -->
- <skip />
- <!-- no translation found for settings_confirmation_remove_title (5360857296753219635) -->
- <skip />
- <!-- no translation found for settings_confirmation_remove (585560170733446898) -->
- <skip />
- <!-- no translation found for storage_notification (6534213782873968255) -->
- <skip />
- <!-- no translation found for storage_notification_alwaysdeny (5473208033665783513) -->
- <skip />
- <!-- no translation found for location_notification (3495804750470905804) -->
- <skip />
- <!-- no translation found for location_notification_alwaysdeny (6184925953783312629) -->
- <skip />
- <!-- no translation found for shortcut_notification (1659700220868444568) -->
- <skip />
- <!-- no translation found for permission_button_alwaysdeny (3837055994905214848) -->
- <skip />
- <!-- no translation found for permission_button_allow (7301874925704148242) -->
- <skip />
- <!-- no translation found for permission_button_deny (104712269725153018) -->
- <skip />
- <!-- no translation found for shortcut_button_alwaysdeny (4172277731325126605) -->
- <skip />
+ <string name="settings_storage_title">"Zezwól na zapis lokalnie"</string>
+ <string name="settings_storage_subtitle_on">"Ta witryna może zapisać informacje w telefonie"</string>
+ <string name="settings_storage_subtitle_off">"Ta witryna nie może zapisać informacji w telefonie"</string>
+ <string name="settings_location_title">"Zezwól na wykrycie lokalizacji"</string>
+ <string name="settings_location_subtitle_on">"Ta witryna może odczytać informacje o Twojej bieżącej lokalizacji"</string>
+ <string name="settings_location_subtitle_off">"Ta witryna nie może odczytać informacji o Twojej bieżącej lokalizacji"</string>
+ <string name="settings_remove_site">"Usuń tę witrynę z dodatku Gears"</string>
+ <string name="settings_empty">"Brak ustawionych pozwoleń"</string>
+ <string name="settings_confirmation_remove_title">"Usuń tę witrynę"</string>
+ <string name="settings_confirmation_remove">"Wszystkie pozwolenia zostaną wyczyszczone, a wszelkie dane zapisane w telefonie przez tę witrynę zostaną usunięte."</string>
+ <string name="storage_notification">"Ta witryna zapisze informacje w tym telefonie."\n" Zmień to ustawienie w menu:"\n" Ustawienia -> Ustawienia dodatku Gears"</string>
+ <string name="storage_notification_alwaysdeny">"Ta witryna nigdy nie zapisze informacji w tym telefonie."\n" Zmień to ustawienie w menu:"\n" Ustawienia -> Ustawienia dodatku Gears"</string>
+ <string name="location_notification">"Ta witryna może uzyskać dostęp do informacji o Twojej bieżącej lokalizacji."\n" Zmień to ustawienie w menu:"\n" Ustawienia -> Ustawienia dodatku Gears"</string>
+ <string name="location_notification_alwaysdeny">"Ta witryna nie uzyska dostępu do informacji o Twojej bieżącej lokalizacji."\n" Zmień to ustawienie w menu:"\n" Ustawienia -> Ustawienia dodatku Gears"</string>
+ <string name="shortcut_notification">"Skrót został utworzony"</string>
+ <string name="permission_button_alwaysdeny">"Nigdy nie zezwalaj"</string>
+ <string name="permission_button_allow">"OK"</string>
+ <string name="permission_button_deny">"Anuluj"</string>
+ <string name="shortcut_button_alwaysdeny">"Nigdy nie zezwalaj"</string>
<string name="shortcut_button_allow">"OK"</string>
<string name="shortcut_button_deny">"Anuluj"</string>
<string name="settings_button_allow">"Zastosuj"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index eedcbb0..6018e19 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -27,8 +27,10 @@
<string name="action">"Войти"</string>
<string name="cancel">"Отмена"</string>
<string name="ok">"ОК"</string>
- <string name="matches_found">" совпадений(я)"</string>
- <string name="zero">"Нет"</string>
+ <!-- no translation found for matches_found:zero (6242659159545399963) -->
+ <!-- no translation found for matches_found:one (4352019729062956802) -->
+ <!-- no translation found for matches_found:few (5544267486978946555) -->
+ <!-- no translation found for matches_found:other (6616125067364315405) -->
<string name="page_info">"Сведения о странице"</string>
<string name="page_info_view">"Просмотреть сведения о странице"</string>
<string name="page_info_address">"Адрес:"</string>
@@ -166,23 +168,6 @@
<string name="pref_extras_reset_default_dlg">"Все данные бразуера будут удалены, а для настроек будут восстановлены значения по умолчанию."</string>
<string name="pref_extras_reset_default_dlg_title">"Восстановить значения по умолчанию"</string>
<string name="pref_development_title">"Отладка"</string>
- <string name="pref_development_viewport">"Use wide viewport"</string>
- <string name="pref_development_single_column_rendering">"Single column rendering"</string>
- <string name="pref_development_normal_rendering">"Normal rendering"</string>
- <string name="pref_development_trace">"Enable tracing"</string>
- <string name="pref_development_nav_dump">"Enable nav cache dump"</string>
- <string name="pref_development_search_url">"Set search URL"</string>
- <string name="pref_development_uastring">"UAString"</string>
- <string-array name="pref_development_ua_choices">
- <item>"Android"</item>
- <item>"Desktop"</item>
- <item>"iPhone"</item>
- </string-array>
- <string-array name="pref_development_ua_values">
- <item>"0"</item>
- <item>"1"</item>
- <item>"2"</item>
- </string-array>
<string name="pref_default_text_encoding">"Выбрать кодировку текста"</string>
<string-array name="pref_default_text_encoding_choices">
<item>"Латиница-1 (ISO-8859-1)"</item>
@@ -233,8 +218,7 @@
<string name="download_no_sdcard_dlg_title">"Нет карты SD"</string>
<string name="download_no_sdcard_dlg_msg">"Для загрузки файла <xliff:g id="FILENAME">%s</xliff:g> нужна карта SD."</string>
<string name="download_sdcard_busy_dlg_title">"Карта SD недоступна"</string>
- <!-- no translation found for download_sdcard_busy_dlg_msg (3473883538192835204) -->
- <skip />
+ <string name="download_sdcard_busy_dlg_msg">"Карта SD занята. Чтобы разрешить загрузки, выберите \"Выключить USB-накопитель\" в уведомлении."</string>
<string name="download_no_application">"Не удалось найти приложение для открытия этого файла."</string>
<string name="retry">"Повторить"</string>
<string name="no_downloads">"История загрузок пуста."</string>
@@ -255,63 +239,36 @@
<string name="permdesc_readHistoryBookmarks">"Позволяет приложению считывать все URL, открытые через браузер, и все закладки браузера."</string>
<string name="permlab_writeHistoryBookmarks">"записывать историю и закладки браузера"</string>
<string name="permdesc_writeHistoryBookmarks">"Позволяет приложению изменять сохраненные в телефоне историю и закладки браузера. Вредоносное ПО сможет стирать или изменять данные браузера."</string>
- <!-- no translation found for query_data_prompt (5474381240981604223) -->
- <skip />
- <!-- no translation found for query_data_message (8789381063185445197) -->
- <skip />
- <!-- no translation found for location_prompt (226262202057302423) -->
- <skip />
- <!-- no translation found for location_message (1729456751935683242) -->
- <skip />
- <!-- no translation found for shortcut_prompt (437193299088893596) -->
- <skip />
- <!-- no translation found for shortcut_message (4793042709293755892) -->
- <skip />
+ <string name="query_data_prompt">"Разрешить сохранение"</string>
+ <string name="query_data_message">"Этот веб-сайт пытается сохранить данные на вашем телефоне."</string>
+ <string name="location_prompt">"Доступ к вашему местоположению"</string>
+ <string name="location_message">"Этот веб-сайт пытается получить доступ к данным о вашем местоположении."</string>
+ <string name="shortcut_prompt">"Создать ярлык"</string>
+ <string name="shortcut_message">"Этот веб-сайт пытается создать ярлык данной страницы на главном экране телефона."</string>
<string name="settings_message">"В таблице ниже показаны разрешения, которые вы дали сайтам, пытавшимся использовать Gears."</string>
- <!-- no translation found for filepicker_message (4929726371602896039) -->
- <skip />
- <!-- no translation found for image_message (5450245866521896891) -->
- <skip />
+ <string name="filepicker_message">"Выбор файлов"</string>
+ <string name="image_message">"Выбранное изображение"</string>
<string name="settings_title">"Настройки Gears"</string>
<string name="privacy_policy">"Прочитайте политику конфиденциальности сайта, чтобы узнать, как будут использованы данные о вашем местоположении."</string>
- <!-- no translation found for settings_storage_title (7089119630457156408) -->
- <skip />
- <!-- no translation found for settings_storage_subtitle_on (2733295483569432111) -->
- <skip />
- <!-- no translation found for settings_storage_subtitle_off (1338039396087898813) -->
- <skip />
- <!-- no translation found for settings_location_title (4953062923509886651) -->
- <skip />
- <!-- no translation found for settings_location_subtitle_on (1496219621849158879) -->
- <skip />
- <!-- no translation found for settings_location_subtitle_off (5216466051810596189) -->
- <skip />
- <!-- no translation found for settings_remove_site (1822247070226589958) -->
- <skip />
- <!-- no translation found for settings_empty (2008952224378583146) -->
- <skip />
- <!-- no translation found for settings_confirmation_remove_title (5360857296753219635) -->
- <skip />
- <!-- no translation found for settings_confirmation_remove (585560170733446898) -->
- <skip />
- <!-- no translation found for storage_notification (6534213782873968255) -->
- <skip />
- <!-- no translation found for storage_notification_alwaysdeny (5473208033665783513) -->
- <skip />
- <!-- no translation found for location_notification (3495804750470905804) -->
- <skip />
- <!-- no translation found for location_notification_alwaysdeny (6184925953783312629) -->
- <skip />
- <!-- no translation found for shortcut_notification (1659700220868444568) -->
- <skip />
- <!-- no translation found for permission_button_alwaysdeny (3837055994905214848) -->
- <skip />
- <!-- no translation found for permission_button_allow (7301874925704148242) -->
- <skip />
- <!-- no translation found for permission_button_deny (104712269725153018) -->
- <skip />
- <!-- no translation found for shortcut_button_alwaysdeny (4172277731325126605) -->
- <skip />
+ <string name="settings_storage_title">"Разрешить сохранение в памяти"</string>
+ <string name="settings_storage_subtitle_on">"Этот сайт может сохранять данные на вашем телефоне"</string>
+ <string name="settings_storage_subtitle_off">"Этот сайт не может сохранять данные на вашем телефоне"</string>
+ <string name="settings_location_title">"Разрешить определение местоположения"</string>
+ <string name="settings_location_subtitle_on">"У этого сайта есть доступ к данным о вашем местоположении"</string>
+ <string name="settings_location_subtitle_off">"У этого сайта нет доступа к данным о вашем местоположении"</string>
+ <string name="settings_remove_site">"Удалить этот сайт из Gears"</string>
+ <string name="settings_empty">"Разрешения не заданы"</string>
+ <string name="settings_confirmation_remove_title">"Удалить этот сайт"</string>
+ <string name="settings_confirmation_remove">"Все разрешения будут сняты, а все данные, сохраненные этим сайтом на вашем телефоне, будут удалены."</string>
+ <string name="storage_notification">"Этот сайт будет сохранять данные на вашем телефоне."\n" Чтобы изменить эту настройку, выберите"\n" Настройки -> Настройки Gears"</string>
+ <string name="storage_notification_alwaysdeny">"Этот сайт не будет сохранять данные на вашем телефоне."\n" Чтобы изменить эту настройку, выберите"\n" Настройки -> Настройки Gears"</string>
+ <string name="location_notification">"У этого сайта есть доступ к данным о вашем местоположении."\n" Чтобы изменить эту настройку, выберите"\n" Настройки -> Настройки Gears"</string>
+ <string name="location_notification_alwaysdeny">"Этот веб-сайт не будет пытаться получить доступ к данным о вашем местоположении."\n" Чтобы изменить эту настройку, выберите"\n" Настройки -> Настройки Gears"</string>
+ <string name="shortcut_notification">"Ярлык создан"</string>
+ <string name="permission_button_alwaysdeny">"Не разрешать"</string>
+ <string name="permission_button_allow">"ОК"</string>
+ <string name="permission_button_deny">"Отмена"</string>
+ <string name="shortcut_button_alwaysdeny">"Не разрешать"</string>
<string name="shortcut_button_allow">"ОК"</string>
<string name="shortcut_button_deny">"Отмена"</string>
<string name="settings_button_allow">"Применить"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 6cc0db8..d0368bb 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -27,8 +27,10 @@
<string name="action">"登录"</string>
<string name="cancel">"取消"</string>
<string name="ok">"确定"</string>
- <string name="matches_found">" 匹配项"</string>
- <string name="zero">"否"</string>
+ <!-- no translation found for matches_found:zero (6242659159545399963) -->
+ <!-- no translation found for matches_found:one (4352019729062956802) -->
+ <!-- no translation found for matches_found:few (5544267486978946555) -->
+ <!-- no translation found for matches_found:other (6616125067364315405) -->
<string name="page_info">"页面信息"</string>
<string name="page_info_view">"查看页面信息"</string>
<string name="page_info_address">"地址："</string>
@@ -166,23 +168,6 @@
<string name="pref_extras_reset_default_dlg">"会清除所有浏览器数据并且设置会恢复为默认值。"</string>
<string name="pref_extras_reset_default_dlg_title">"重置为默认值"</string>
<string name="pref_development_title">"调试"</string>
- <string name="pref_development_viewport">"使用宽视口"</string>
- <string name="pref_development_single_column_rendering">"单列呈现"</string>
- <string name="pref_development_normal_rendering">"正常呈现"</string>
- <string name="pref_development_trace">"启用跟踪"</string>
- <string name="pref_development_nav_dump">"启用导航缓存转储"</string>
- <string name="pref_development_search_url">"设置搜索网址"</string>
- <string name="pref_development_uastring">"UAString"</string>
- <string-array name="pref_development_ua_choices">
- <item>"Android"</item>
- <item>"桌面"</item>
- <item>"iPhone"</item>
- </string-array>
- <string-array name="pref_development_ua_values">
- <item>"0"</item>
- <item>"1"</item>
- <item>"2"</item>
- </string-array>
<string name="pref_default_text_encoding">"设置文字编码"</string>
<string-array name="pref_default_text_encoding_choices">
<item>"Latin-1 (ISO-8859-1)"</item>
@@ -233,8 +218,7 @@
<string name="download_no_sdcard_dlg_title">"无 SD 卡"</string>
<string name="download_no_sdcard_dlg_msg">"需要 SD 卡才能下载 <xliff:g id="FILENAME">%s</xliff:g>。"</string>
<string name="download_sdcard_busy_dlg_title">"SD 卡不可用"</string>
- <!-- no translation found for download_sdcard_busy_dlg_msg (3473883538192835204) -->
- <skip />
+ <string name="download_sdcard_busy_dlg_msg">"SD 卡正忙。要允许下载，请在通知中选择“关闭 USB 存储”。"</string>
<string name="download_no_application">"无法找到可打开此文件的应用程序。"</string>
<string name="retry">"重试"</string>
<string name="no_downloads">"下载历史记录为空。"</string>
@@ -255,63 +239,36 @@
<string name="permdesc_readHistoryBookmarks">"允许应用程序读取浏览器访问过的所有网址以及浏览器的所有书签。"</string>
<string name="permlab_writeHistoryBookmarks">"写入浏览器的历史记录和书签"</string>
<string name="permdesc_writeHistoryBookmarks">"允许应用程序修改您手机中存储的浏览器的历史记录或书签。恶意应用程序可能会利用此权限清除或修改您浏览器的数据。"</string>
- <!-- no translation found for query_data_prompt (5474381240981604223) -->
- <skip />
- <!-- no translation found for query_data_message (8789381063185445197) -->
- <skip />
- <!-- no translation found for location_prompt (226262202057302423) -->
- <skip />
- <!-- no translation found for location_message (1729456751935683242) -->
- <skip />
- <!-- no translation found for shortcut_prompt (437193299088893596) -->
- <skip />
- <!-- no translation found for shortcut_message (4793042709293755892) -->
- <skip />
+ <string name="query_data_prompt">"允许存储"</string>
+ <string name="query_data_message">"此网站要将信息存储在您的手机上。"</string>
+ <string name="location_prompt">"访问您所在的位置"</string>
+ <string name="location_message">"此网站要访问您所在的位置。"</string>
+ <string name="shortcut_prompt">"创建快捷方式"</string>
+ <string name="shortcut_message">"此网站要在您的主屏幕上创建此网页的快捷方式。"</string>
<string name="settings_message">"下表显示了您授予尝试使用 Gears 的各个网站的权限。"</string>
- <!-- no translation found for filepicker_message (4929726371602896039) -->
- <skip />
- <!-- no translation found for image_message (5450245866521896891) -->
- <skip />
+ <string name="filepicker_message">"文件选择器"</string>
+ <string name="image_message">"选择的图片"</string>
<string name="settings_title">"Gears 设置"</string>
<string name="privacy_policy">"阅读网站的隐私政策，以了解会如何使用您的位置。"</string>
- <!-- no translation found for settings_storage_title (7089119630457156408) -->
- <skip />
- <!-- no translation found for settings_storage_subtitle_on (2733295483569432111) -->
- <skip />
- <!-- no translation found for settings_storage_subtitle_off (1338039396087898813) -->
- <skip />
- <!-- no translation found for settings_location_title (4953062923509886651) -->
- <skip />
- <!-- no translation found for settings_location_subtitle_on (1496219621849158879) -->
- <skip />
- <!-- no translation found for settings_location_subtitle_off (5216466051810596189) -->
- <skip />
- <!-- no translation found for settings_remove_site (1822247070226589958) -->
- <skip />
- <!-- no translation found for settings_empty (2008952224378583146) -->
- <skip />
- <!-- no translation found for settings_confirmation_remove_title (5360857296753219635) -->
- <skip />
- <!-- no translation found for settings_confirmation_remove (585560170733446898) -->
- <skip />
- <!-- no translation found for storage_notification (6534213782873968255) -->
- <skip />
- <!-- no translation found for storage_notification_alwaysdeny (5473208033665783513) -->
- <skip />
- <!-- no translation found for location_notification (3495804750470905804) -->
- <skip />
- <!-- no translation found for location_notification_alwaysdeny (6184925953783312629) -->
- <skip />
- <!-- no translation found for shortcut_notification (1659700220868444568) -->
- <skip />
- <!-- no translation found for permission_button_alwaysdeny (3837055994905214848) -->
- <skip />
- <!-- no translation found for permission_button_allow (7301874925704148242) -->
- <skip />
- <!-- no translation found for permission_button_deny (104712269725153018) -->
- <skip />
- <!-- no translation found for shortcut_button_alwaysdeny (4172277731325126605) -->
- <skip />
+ <string name="settings_storage_title">"允许本地存储"</string>
+ <string name="settings_storage_subtitle_on">"此网站可以将信息保存到您的手机上"</string>
+ <string name="settings_storage_subtitle_off">"此网站无法将信息保存到您的手机上"</string>
+ <string name="settings_location_title">"允许位置检测"</string>
+ <string name="settings_location_subtitle_on">"此网站可以读取您当前所在的位置"</string>
+ <string name="settings_location_subtitle_off">"此网站无法读取您当前所在的位置"</string>
+ <string name="settings_remove_site">"从 Gears 删除此网站"</string>
+ <string name="settings_empty">"未设置权限"</string>
+ <string name="settings_confirmation_remove_title">"删除此网站"</string>
+ <string name="settings_confirmation_remove">"所有权限将会清除，而且此网站存储在您手机上的所有数据也会删除。"</string>
+ <string name="storage_notification">"此网站要将信息存储在此手机上。"\n"在以下位置更改此设置："\n"“设置”->“Gears 设置”"</string>
+ <string name="storage_notification_alwaysdeny">"此网站决不会将信息存储在此手机上。"\n"在以下位置更改此设置："\n"“设置”->“Gears 设置”"</string>
+ <string name="location_notification">"此网站可以访问您当前所在的位置。"\n"在以下位置更改此设置："\n"“设置”->“Gears 设置”"</string>
+ <string name="location_notification_alwaysdeny">"此网站不会访问您当前所在的位置。"\n"在以下位置更改此设置："\n"“设置”->“Gears 设置”"</string>
+ <string name="shortcut_notification">"快捷方式已创建"</string>
+ <string name="permission_button_alwaysdeny">"不允许"</string>
+ <string name="permission_button_allow">"确定"</string>
+ <string name="permission_button_deny">"取消"</string>
+ <string name="shortcut_button_alwaysdeny">"不允许"</string>
<string name="shortcut_button_allow">"确定"</string>
<string name="shortcut_button_deny">"取消"</string>
<string name="settings_button_allow">"应用"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 45241be..fd9e65c 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -27,8 +27,10 @@
<string name="action">"登入"</string>
<string name="cancel">"取消"</string>
<string name="ok">"確定"</string>
- <string name="matches_found">" 個符合項目"</string>
- <string name="zero">"否"</string>
+ <!-- no translation found for matches_found:zero (6242659159545399963) -->
+ <!-- no translation found for matches_found:one (4352019729062956802) -->
+ <!-- no translation found for matches_found:few (5544267486978946555) -->
+ <!-- no translation found for matches_found:other (6616125067364315405) -->
<string name="page_info">"頁面資訊"</string>
<string name="page_info_view">"檢視頁面資訊"</string>
<string name="page_info_address">"位址："</string>
@@ -166,23 +168,6 @@
<string name="pref_extras_reset_default_dlg">"瀏覽器所有資料會被清除， 並回復初始設定。"</string>
<string name="pref_extras_reset_default_dlg_title">"回復初始設定"</string>
<string name="pref_development_title">"除錯"</string>
- <string name="pref_development_viewport">"Use wide viewport"</string>
- <string name="pref_development_single_column_rendering">"單欄模式"</string>
- <string name="pref_development_normal_rendering">"Normal rendering"</string>
- <string name="pref_development_trace">"Enable tracing"</string>
- <string name="pref_development_nav_dump">"Enable nav cache dump"</string>
- <string name="pref_development_search_url">"設定搜尋 URL"</string>
- <string name="pref_development_uastring">"UAString"</string>
- <string-array name="pref_development_ua_choices">
- <item>"Android"</item>
- <item>"桌面"</item>
- <item>"iPhone"</item>
- </string-array>
- <string-array name="pref_development_ua_values">
- <item>"0"</item>
- <item>"1"</item>
- <item>"2"</item>
- </string-array>
<string name="pref_default_text_encoding">"設定文字編碼"</string>
<string-array name="pref_default_text_encoding_choices">
<item>"Latin-1 (ISO-8859-1)"</item>
@@ -233,8 +218,7 @@
<string name="download_no_sdcard_dlg_title">"沒有 SD 卡"</string>
<string name="download_no_sdcard_dlg_msg">"需要 SD 卡下載 <xliff:g id="FILENAME">%s</xliff:g>。"</string>
<string name="download_sdcard_busy_dlg_title">"無法使用 SD 卡"</string>
- <!-- no translation found for download_sdcard_busy_dlg_msg (3473883538192835204) -->
- <skip />
+ <string name="download_sdcard_busy_dlg_msg">"SD 記憶卡忙碌中。若要允許下載，請選取通知區域中的 [停用 USB 儲存裝置]。"</string>
<string name="download_no_application">"找不到可以開啟這個檔案的應用程式。"</string>
<string name="retry">"重試"</string>
<string name="no_downloads">"下載記錄是空的。"</string>
@@ -255,63 +239,36 @@
<string name="permdesc_readHistoryBookmarks">"允許應用程式讀取瀏覽器造訪過的所有 URL 和瀏覽器所有的書籤。"</string>
<string name="permlab_writeHistoryBookmarks">"寫入瀏覽器的瀏覽記錄和書籤"</string>
<string name="permdesc_writeHistoryBookmarks">"允許應用程式修改儲存在電話上的瀏覽器記錄或書籤。惡意應用程式可能會使用此選項來清除或修改您瀏覽器的資料。"</string>
- <!-- no translation found for query_data_prompt (5474381240981604223) -->
- <skip />
- <!-- no translation found for query_data_message (8789381063185445197) -->
- <skip />
- <!-- no translation found for location_prompt (226262202057302423) -->
- <skip />
- <!-- no translation found for location_message (1729456751935683242) -->
- <skip />
- <!-- no translation found for shortcut_prompt (437193299088893596) -->
- <skip />
- <!-- no translation found for shortcut_message (4793042709293755892) -->
- <skip />
+ <string name="query_data_prompt">"允許儲存"</string>
+ <string name="query_data_message">"此網站要在您的手機上儲存資訊。"</string>
+ <string name="location_prompt">"存取您的位置資訊"</string>
+ <string name="location_message">"此網站要存取您的位置資訊。"</string>
+ <string name="shortcut_prompt">"建立捷徑"</string>
+ <string name="shortcut_message">"此網站要在您的主畫面上建立網頁捷徑。"</string>
<string name="settings_message">"下表列出您為每個想要使用 Gears 之網站所授予的權限。"</string>
- <!-- no translation found for filepicker_message (4929726371602896039) -->
- <skip />
- <!-- no translation found for image_message (5450245866521896891) -->
- <skip />
+ <string name="filepicker_message">"檔案挑選程式"</string>
+ <string name="image_message">"選擇的影像"</string>
<string name="settings_title">"裝置設定"</string>
<string name="privacy_policy">"讀取網站的隱私權政策，以瞭解網站將如何使用您的位置資訊。"</string>
- <!-- no translation found for settings_storage_title (7089119630457156408) -->
- <skip />
- <!-- no translation found for settings_storage_subtitle_on (2733295483569432111) -->
- <skip />
- <!-- no translation found for settings_storage_subtitle_off (1338039396087898813) -->
- <skip />
- <!-- no translation found for settings_location_title (4953062923509886651) -->
- <skip />
- <!-- no translation found for settings_location_subtitle_on (1496219621849158879) -->
- <skip />
- <!-- no translation found for settings_location_subtitle_off (5216466051810596189) -->
- <skip />
- <!-- no translation found for settings_remove_site (1822247070226589958) -->
- <skip />
- <!-- no translation found for settings_empty (2008952224378583146) -->
- <skip />
- <!-- no translation found for settings_confirmation_remove_title (5360857296753219635) -->
- <skip />
- <!-- no translation found for settings_confirmation_remove (585560170733446898) -->
- <skip />
- <!-- no translation found for storage_notification (6534213782873968255) -->
- <skip />
- <!-- no translation found for storage_notification_alwaysdeny (5473208033665783513) -->
- <skip />
- <!-- no translation found for location_notification (3495804750470905804) -->
- <skip />
- <!-- no translation found for location_notification_alwaysdeny (6184925953783312629) -->
- <skip />
- <!-- no translation found for shortcut_notification (1659700220868444568) -->
- <skip />
- <!-- no translation found for permission_button_alwaysdeny (3837055994905214848) -->
- <skip />
- <!-- no translation found for permission_button_allow (7301874925704148242) -->
- <skip />
- <!-- no translation found for permission_button_deny (104712269725153018) -->
- <skip />
- <!-- no translation found for shortcut_button_alwaysdeny (4172277731325126605) -->
- <skip />
+ <string name="settings_storage_title">"允許本機儲存"</string>
+ <string name="settings_storage_subtitle_on">"此網站可以在您的手機上儲存資訊"</string>
+ <string name="settings_storage_subtitle_off">"此網站無法在您的手機上儲存資訊"</string>
+ <string name="settings_location_title">"允許偵測位置"</string>
+ <string name="settings_location_subtitle_on">"此網站可以讀取您目前的位置資訊"</string>
+ <string name="settings_location_subtitle_off">"此網站無法讀取您目前的位置資訊"</string>
+ <string name="settings_remove_site">"從 Gears 移除此網站"</string>
+ <string name="settings_empty">"未設定任何權限"</string>
+ <string name="settings_confirmation_remove_title">"移除此網站"</string>
+ <string name="settings_confirmation_remove">"系統將清除所有權限，並且將刪除此網站儲存在手機上的所有資料。"</string>
+ <string name="storage_notification">"此網站將會在您的手機上儲存資訊。"\n"您可以透過以下操作變更此設定："\n"[設定] -> [Gears 設定]"</string>
+ <string name="storage_notification_alwaysdeny">"此網站永遠不會在您的手機上儲存資訊。"\n"您可以透過以下操作變更此設定："\n"[設定] -> [Gears 設定]"</string>
+ <string name="location_notification">"此網站可以存取您目前的位置資訊。"\n"您可以透過以下操作變更此設定："\n"[設定] -> [Gears 設定]"</string>
+ <string name="location_notification_alwaysdeny">"此網站不會存取您目前的位置資訊。"\n"您可以透過以下操作變更此設定："\n"[設定] -> [Gears 設定]"</string>
+ <string name="shortcut_notification">"捷徑已建立"</string>
+ <string name="permission_button_alwaysdeny">"永不允許"</string>
+ <string name="permission_button_allow">"確定"</string>
+ <string name="permission_button_deny">"取消"</string>
+ <string name="shortcut_button_alwaysdeny">"永不允許"</string>
<string name="shortcut_button_allow">"確定"</string>
<string name="shortcut_button_deny">"取消"</string>
<string name="settings_button_allow">"套用"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 83cc639..98142ac 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -44,13 +44,18 @@
<!-- Label for a confirm button. Used in multiple contexts. -->
<string name="ok">OK</string>
- <!--The find dialog -->
- <!-- Displayed on the Find Dialog, stating "X matches" where X is the
- number of matches found in the current page -->
- <string name="matches_found">\u0020matches</string>
- <!-- Displayed on the Find Dialog, stating that there are "zero
- matches" -->
- <string name="zero">No</string>
+ <!-- Displayed on the Find dialog to display the number of matches
+ found in the current page. -->
+ <plurals name="matches_found">
+ <!-- Case of no matches -->
+ <item quantity="zero">No matches</item>
+ <!-- Case of one match -->
+ <item quantity="one">1 match</item>
+ <!-- Case of "few" (two) matches -->
+ <item quantity="few"><xliff:g id="number" example="2">%d</xliff:g> matches</item>
+ <!-- Case of several matches -->
+ <item quantity="other"><xliff:g id="number" example="137">%d</xliff:g> matches</item>
+ </plurals>
<!-- Menu item -->
<string name="page_info">Page info</string>
@@ -340,7 +345,7 @@
<!-- Title of dialog for setting the text size -->
<string name="pref_text_size_dialogtitle">Text size</string>
<!-- Do not translate -->
- <string-array name="pref_text_size_values">
+ <string-array name="pref_text_size_values" translatable="false">
<item><xliff:g>SMALLEST</xliff:g></item>
<item><xliff:g>SMALLER</xliff:g></item>
<item><xliff:g>NORMAL</xliff:g></item>
@@ -371,27 +376,27 @@
<!-- Title for a group of settings -->
<string name="pref_development_title">Debug</string>
<!-- Do not tranlsate. Development option -->
- <string name="pref_development_viewport">Use wide viewport</string>
+ <string name="pref_development_viewport" translatable="false">Use wide viewport</string>
<!-- Do not tranlsate. Development option -->
- <string name="pref_development_single_column_rendering">Single column rendering</string>
+ <string name="pref_development_single_column_rendering" translatable="false">Single column rendering</string>
<!-- Do not tranlsate. Development option -->
- <string name="pref_development_normal_rendering">Normal rendering</string>
+ <string name="pref_development_normal_rendering" translatable="false">Normal rendering</string>
<!-- Do not tranlsate. Development option -->
- <string name="pref_development_trace">Enable tracing</string>
+ <string name="pref_development_trace" translatable="false">Enable tracing</string>
<!-- Do not tranlsate. Development option -->
- <string name="pref_development_nav_dump">Enable nav cache dump</string>
+ <string name="pref_development_nav_dump" translatable="false">Enable nav cache dump</string>
<!-- Do not tranlsate. Development option -->
- <string name="pref_development_search_url">Set search URL</string>
+ <string name="pref_development_search_url" translatable="false">Set search URL</string>
<!-- Do not tranlsate. Development option -->
- <string name="pref_development_uastring">UAString</string>
+ <string name="pref_development_uastring" translatable="false">UAString</string>
<!-- Do not tranlsate. Development option -->
- <string-array name="pref_development_ua_choices">
+ <string-array name="pref_development_ua_choices" translatable="false">
<item>Android</item>
<item>Desktop</item>
<item>iPhone</item>
</string-array>
<!-- Do not tranlsate. Development option -->
- <string-array name="pref_development_ua_values">
+ <string-array name="pref_development_ua_values" translatable="false">
<item>0</item>
<item>1</item>
<item>2</item>
@@ -410,7 +415,7 @@
<!-- Dialog box title -->
<string name="pref_default_text_encoding_dialogtitle">Text encoding</string>
<!-- Do not translate. Actual encoding values. Must be valid text encodings understandable from WebKit. -->
- <string-array name="pref_default_text_encoding_values">
+ <string-array name="pref_default_text_encoding_values" translatable="false">
<item>Latin-1</item>
<item>UTF-8</item>
<item>ISO-2022-JP</item>
@@ -450,7 +455,7 @@
<!-- This string is for the browser "Go To" UI. -->
<!-- Do not translate. This string is not displayed in UI (no badge is selected for go to). -->
- <string name="search_label">Browser</string>
+ <string name="search_label" translatable="false">Browser</string>
<!-- This string is for the browser "Go To" UI. -->
<!-- This is the hint text shown in the Go To widget, before text is entered. -->
<string name="search_hint">Type Web address</string>
@@ -573,15 +578,15 @@
<string name="activity_instrumentation_test_runner">Browser Test Runner</string>
<!-- Do not translate. Testing only -->
- <string name="activity_instrumentation_functional_test_runner">Browser Functional Test Runner</string>
+ <string name="activity_instrumentation_functional_test_runner" translatable="false">Browser Functional Test Runner</string>
<!-- Do not translate. Testing only -->
- <string name="dump_nav">Dump navigation cache</string>
+ <string name="dump_nav" translatable="false">Dump navigation cache</string>
<!-- Bookmarks -->
<string-array name="bookmarks" translatable="false">
<item>Google</item>
<item>http://www.google.com/</item>
- <item>Picasa Web Albums</item>
+ <item>Picasa</item>
<item>http://picasaweb.google.com/m/viewer?source=androidclient</item>
<item>Yahoo!</item>
<item>http://www.yahoo.com/</item>
@@ -609,6 +614,9 @@
<item>http://www.bbc.co.uk/</item>
</string-array>
+ <!-- Bookmark name for Picasa website -->
+ <string name="picasa" translatable="false">Picasa</string>
+
<!-- Note that this is the standard search url. It uses the current locale for language -->
<!-- (%1$s) and country (%2$s) and shouldn't need to be replaced by locale or mcc selected -->
<!-- resources. -->
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index e018eb4..ca788a6 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -18,6 +18,7 @@
import com.google.android.googleapps.IGoogleLoginService;
import com.google.android.googlelogin.GoogleLoginServiceConstants;
+import com.google.android.providers.GoogleSettings.Partner;
import android.app.Activity;
import android.app.ActivityManager;
@@ -137,7 +138,7 @@
import java.util.Date;
import java.util.Enumeration;
import java.util.HashMap;
-import java.util.List;
+import java.util.LinkedList;
import java.util.Locale;
import java.util.Vector;
import java.util.regex.Matcher;
@@ -203,7 +204,7 @@
if (googleUser == null || !hostedUser.equals(googleUser)) {
String domain = hostedUser.substring(hostedUser.lastIndexOf('@')+1);
homepage = "http://www.google.com/m/a/" + domain + "?client=ms-" +
- SystemProperties.get("persist.sys.com.google.clientid", "unknown");
+ Partner.getString(BrowserActivity.this.getContentResolver(), Partner.CLIENT_ID);
}
} catch (RemoteException ignore) {
// Login service died; carry on
@@ -2938,6 +2939,73 @@
.show();
}
+ // Container class for the next error dialog that needs to be
+ // displayed.
+ class ErrorDialog {
+ public final int mTitle;
+ public final String mDescription;
+ public final int mError;
+ ErrorDialog(int title, String desc, int error) {
+ mTitle = title;
+ mDescription = desc;
+ mError = error;
+ }
+ };
+
+ private void processNextError() {
+ if (mQueuedErrors == null) {
+ return;
+ }
+ // The first one is currently displayed so just remove it.
+ mQueuedErrors.removeFirst();
+ if (mQueuedErrors.size() == 0) {
+ mQueuedErrors = null;
+ return;
+ }
+ showError(mQueuedErrors.getFirst());
+ }
+
+ private DialogInterface.OnDismissListener mDialogListener =
+ new DialogInterface.OnDismissListener() {
+ public void onDismiss(DialogInterface d) {
+ processNextError();
+ }
+ };
+ private LinkedList<ErrorDialog> mQueuedErrors;
+
+ private void queueError(int err, String desc) {
+ if (mQueuedErrors == null) {
+ mQueuedErrors = new LinkedList<ErrorDialog>();
+ }
+ for (ErrorDialog d : mQueuedErrors) {
+ if (d.mError == err) {
+ // Already saw a similar error, ignore the new one.
+ return;
+ }
+ }
+ ErrorDialog errDialog = new ErrorDialog(
+ err == EventHandler.FILE_NOT_FOUND_ERROR ?
+ R.string.browserFrameFileErrorLabel :
+ R.string.browserFrameNetworkErrorLabel,
+ desc, err);
+ mQueuedErrors.addLast(errDialog);
+
+ // Show the dialog now if the queue was empty.
+ if (mQueuedErrors.size() == 1) {
+ showError(errDialog);
+ }
+ }
+
+ private void showError(ErrorDialog errDialog) {
+ AlertDialog d = new AlertDialog.Builder(BrowserActivity.this)
+ .setTitle(errDialog.mTitle)
+ .setMessage(errDialog.mDescription)
+ .setPositiveButton(R.string.ok, null)
+ .create();
+ d.setOnDismissListener(mDialogListener);
+ d.show();
+ }
+
/**
* Show a dialog informing the user of the network error reported by
* WebCore.
@@ -2950,15 +3018,10 @@
errorCode != EventHandler.ERROR_BAD_URL &&
errorCode != EventHandler.ERROR_UNSUPPORTED_SCHEME &&
errorCode != EventHandler.FILE_ERROR) {
- new AlertDialog.Builder(BrowserActivity.this)
- .setTitle((errorCode == EventHandler.FILE_NOT_FOUND_ERROR) ?
- R.string.browserFrameFileErrorLabel :
- R.string.browserFrameNetworkErrorLabel)
- .setMessage(description)
- .setPositiveButton(R.string.ok, null)
- .show();
+ queueError(errorCode, description);
}
- Log.e(LOGTAG, "onReceivedError code:"+errorCode+" "+description);
+ Log.e(LOGTAG, "onReceivedError " + errorCode + " " + failingUrl
+ + " " + description);
// We need to reset the title after an error.
resetTitleAndRevertLockIcon();
@@ -4423,7 +4486,7 @@
R.string.google_search_base, l.getLanguage(),
l.getCountry().toLowerCase())
+ "client=ms-"
- + SystemProperties.get("persist.sys.com.google.clientid", "unknown")
+ + Partner.getString(this.getContentResolver(), Partner.CLIENT_ID)
+ "&source=android-" + GOOGLE_SEARCH_SOURCE_SUGGEST + "&q=%s";
} else {
QuickSearch_G = url;
diff --git a/src/com/android/browser/BrowserBookmarksAdapter.java b/src/com/android/browser/BrowserBookmarksAdapter.java
index 479dc0e..27782e0 100644
--- a/src/com/android/browser/BrowserBookmarksAdapter.java
+++ b/src/com/android/browser/BrowserBookmarksAdapter.java
@@ -472,6 +472,21 @@
}
/**
+ * Return the favicon for this item in the list.
+ */
+ public Bitmap getFavicon(int position) {
+ if (position < mExtraOffset || position > mCount) {
+ return null;
+ }
+ mCursor.moveToPosition(position - mExtraOffset);
+ byte[] data = mCursor.getBlob(Browser.HISTORY_PROJECTION_FAVICON_INDEX);
+ if (data == null) {
+ return null;
+ }
+ return BitmapFactory.decodeByteArray(data, 0, data.length);
+ }
+
+ /**
* Private helper function to return the title or url.
*/
private String getString(int cursorIndex, int position) {
diff --git a/src/com/android/browser/BrowserBookmarksPage.java b/src/com/android/browser/BrowserBookmarksPage.java
index a7d45f9..dd34c14 100644
--- a/src/com/android/browser/BrowserBookmarksPage.java
+++ b/src/com/android/browser/BrowserBookmarksPage.java
@@ -21,6 +21,11 @@
import android.content.DialogInterface;
import android.content.Intent;
import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.RectF;
import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
@@ -87,7 +92,7 @@
break;
case R.id.shortcut_context_menu_id:
final Intent send = createShortcutIntent(getUrl(i.position),
- getBookmarkTitle(i.position));
+ getBookmarkTitle(i.position), getFavicon(i.position));
send.setAction(INSTALL_SHORTCUT);
sendBroadcast(send);
break;
@@ -203,14 +208,15 @@
}
} else {
final Intent intent = createShortcutIntent(getUrl(position),
- getBookmarkTitle(position));
+ getBookmarkTitle(position), getFavicon(position));
setResultToParent(RESULT_OK, intent);
finish();
}
}
};
- private Intent createShortcutIntent(String url, String title) {
+ private Intent createShortcutIntent(String url, String title,
+ Bitmap favicon) {
final Intent i = new Intent();
final Intent shortcutIntent = new Intent(Intent.ACTION_VIEW,
Uri.parse(url));
@@ -220,9 +226,42 @@
Long.toString(uniqueId));
i.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent);
i.putExtra(Intent.EXTRA_SHORTCUT_NAME, title);
- i.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE,
- Intent.ShortcutIconResource.fromContext(BrowserBookmarksPage.this,
- R.drawable.ic_launcher_browser));
+ if (favicon == null) {
+ i.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE,
+ Intent.ShortcutIconResource.fromContext(
+ BrowserBookmarksPage.this,
+ R.drawable.ic_launcher_shortcut_browser_bookmark));
+ } else {
+ Bitmap icon = BitmapFactory.decodeResource(getResources(),
+ R.drawable.ic_launcher_shortcut_browser_bookmark);
+
+ // Make a copy of the regular icon so we can modify the pixels.
+ Bitmap copy = icon.copy(Bitmap.Config.ARGB_8888, true);
+ Canvas canvas = new Canvas(copy);
+
+ // Make a Paint for the white background rectangle and for
+ // filtering the favicon.
+ Paint p = new Paint(Paint.ANTI_ALIAS_FLAG
+ | Paint.FILTER_BITMAP_FLAG);
+ p.setStyle(Paint.Style.FILL_AND_STROKE);
+ p.setColor(Color.WHITE);
+
+ // Create a rectangle that is slightly wider than the favicon
+ final float iconSize = 16; // 16x16 favicon
+ final float padding = 2; // white padding around icon
+ final float rectSize = iconSize + 2 * padding;
+ final float y = icon.getHeight() - rectSize;
+ RectF r = new RectF(0, y, rectSize, y + rectSize);
+
+ // Draw a white rounded rectangle behind the favicon
+ canvas.drawRoundRect(r, 2, 2, p);
+
+ // Draw the favicon in the same rectangle as the rounded rectangle
+ // but inset by the padding (results in a 16x16 favicon).
+ r.inset(padding, padding);
+ canvas.drawBitmap(favicon, null, r, p);
+ i.putExtra(Intent.EXTRA_SHORTCUT_ICON, copy);
+ }
// Do not allow duplicate items
i.putExtra("duplicate", false);
return i;
@@ -349,6 +388,13 @@
return mBookmarksAdapter.getUrl(position);
}
+ /**
+ * Return the favicon of the currently highlighted row.
+ */
+ public Bitmap getFavicon(int position) {
+ return mBookmarksAdapter.getFavicon(position);
+ }
+
private void copy(CharSequence text) {
try {
IClipboard clip = IClipboard.Stub.asInterface(ServiceManager.getService("clipboard"));
diff --git a/src/com/android/browser/BrowserProvider.java b/src/com/android/browser/BrowserProvider.java
index 0c930c6..42e22a5 100644
--- a/src/com/android/browser/BrowserProvider.java
+++ b/src/com/android/browser/BrowserProvider.java
@@ -16,15 +16,21 @@
package com.android.browser;
+import com.google.android.providers.GoogleSettings.Partner;
+import java.util.Date;
+
import android.app.ISearchManager;
import android.app.SearchManager;
import android.content.ComponentName;
import android.content.ContentProvider;
import android.content.ContentUris;
+import android.content.ContentResolver;
import android.content.ContentValues;
import android.content.Context;
import android.content.Intent;
+import android.content.SharedPreferences;
import android.content.UriMatcher;
+import android.content.SharedPreferences.Editor;
import android.database.AbstractCursor;
import android.database.Cursor;
import android.database.sqlite.SQLiteOpenHelper;
@@ -33,11 +39,13 @@
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.SystemProperties;
+import android.preference.PreferenceManager;
import android.provider.Browser;
import android.util.Log;
import android.server.search.SearchableInfo;
import android.text.util.Regex;
+
public class BrowserProvider extends ContentProvider {
private SQLiteOpenHelper mOpenHelper;
@@ -45,6 +53,9 @@
private static final String TAG = "BrowserProvider";
private static final String ORDER_BY = "visits DESC, date DESC";
+ private static final String PICASA_URL = "http://picasaweb.google.com/m/" +
+ "viewer?source=androidclient";
+
private static final String[] TABLE_NAMES = new String[] {
"bookmarks", "searches"
};
@@ -126,9 +137,12 @@
}
- private static CharSequence replaceSystemPropertyInString(CharSequence srcString) {
+ private static CharSequence replaceSystemPropertyInString(Context context, CharSequence srcString) {
StringBuffer sb = new StringBuffer();
int lastCharLoc = 0;
+
+ final String client_id = Partner.getString(context.getContentResolver(), Partner.CLIENT_ID);
+
for (int i = 0; i < srcString.length(); ++i) {
char c = srcString.charAt(i);
if (c == '{') {
@@ -139,16 +153,10 @@
char k = srcString.charAt(j);
if (k == '}') {
String propertyKeyValue = srcString.subSequence(i + 1, j).toString();
- // See if the propertyKeyValue specifies a default value
- int defaultOffset = propertyKeyValue.indexOf(':');
- if (defaultOffset == -1) {
- sb.append(SystemProperties.get(propertyKeyValue));
+ if (propertyKeyValue.equals("CLIENT_ID")) {
+ sb.append(client_id);
} else {
- String propertyKey = propertyKeyValue.substring(0, defaultOffset);
- String defaultValue =
- propertyKeyValue.substring(defaultOffset + 1,
- propertyKeyValue.length());
- sb.append(SystemProperties.get(propertyKey, defaultValue));
+ sb.append("unknown");
}
lastCharLoc = j + 1;
i = j;
@@ -191,7 +199,7 @@
int size = bookmarks.length;
try {
for (int i = 0; i < size; i = i + 2) {
- CharSequence bookmarkDestination = replaceSystemPropertyInString(bookmarks[i + 1]);
+ CharSequence bookmarkDestination = replaceSystemPropertyInString(mContext, bookmarks[i + 1]);
db.execSQL("INSERT INTO bookmarks (title, url, visits, " +
"date, created, bookmark)" + " VALUES('" +
bookmarks[i] + "', '" + bookmarkDestination +
@@ -223,10 +231,45 @@
@Override
public boolean onCreate() {
- mOpenHelper = new DatabaseHelper(getContext());
+ final Context context = getContext();
+ mOpenHelper = new DatabaseHelper(context);
+ // we added "picasa web album" into default bookmarks for version 19.
+ // To avoid erasing the bookmark table, we added it explicitly for
+ // version 18 and 19 as in the other cases, we will erase the table.
+ if (DATABASE_VERSION == 18 || DATABASE_VERSION == 19) {
+ SharedPreferences p = PreferenceManager
+ .getDefaultSharedPreferences(context);
+ boolean fix = p.getBoolean("fix_picasa", true);
+ if (fix) {
+ fixPicasaBookmark();
+ Editor ed = p.edit();
+ ed.putBoolean("fix_picasa", false);
+ ed.commit();
+ }
+ }
return true;
}
+ private void fixPicasaBookmark() {
+ SQLiteDatabase db = mOpenHelper.getWritableDatabase();
+ Cursor cursor = db.rawQuery("SELECT _id FROM bookmarks WHERE " +
+ "bookmark = 1 AND url = ?", new String[] { PICASA_URL });
+ try {
+ if (!cursor.moveToFirst()) {
+ // set "created" so that it will be on the top of the list
+ db.execSQL("INSERT INTO bookmarks (title, url, visits, " +
+ "date, created, bookmark)" + " VALUES('" +
+ getContext().getString(R.string.picasa) + "', '"
+ + PICASA_URL + "', 0, 0, " + new Date().getTime()
+ + ", 1);");
+ }
+ } finally {
+ if (cursor != null) {
+ cursor.close();
+ }
+ }
+ }
+
/*
* Subclass AbstractCursor so we can combine multiple Cursors and add
* "Google Search".
diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index d8c5186..0e2c5af 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -16,6 +16,8 @@
package com.android.browser;
+import com.google.android.providers.GoogleSettings.Partner;
+
import android.app.Activity;
import android.content.ContentResolver;
import android.content.Context;
@@ -65,8 +67,7 @@
private boolean saveFormData = true;
private boolean openInBackground = false;
private String defaultTextEncodingName;
- private String homeUrl = "http://www.google.com/m?client=ms-" +
- SystemProperties.get("persist.sys.com.google.clientid", "unknown");
+ private String homeUrl = "http://www.google.com/m?client=ms-";
private boolean loginInitialized = false;
private boolean autoFitPage = true;
private boolean showDebugSettings = false;
@@ -198,6 +199,8 @@
// local directory.
pluginsPath = ctx.getDir("plugins", 0).getPath();
+ homeUrl += Partner.getString(ctx.getContentResolver(), Partner.CLIENT_ID);
+
// Load the defaults from the xml
// This call is TOO SLOW, need to manually keep the defaults
// in sync
@@ -206,8 +209,10 @@
}
/* package */ void syncSharedPreferences(SharedPreferences p) {
+
homeUrl =
p.getString(PREF_HOMEPAGE, homeUrl);
+
loadsImagesAutomatically = p.getBoolean("load_images",
loadsImagesAutomatically);
javaScriptEnabled = p.getBoolean("enable_javascript",
diff --git a/src/com/android/browser/FindDialog.java b/src/com/android/browser/FindDialog.java
index 43cd1c4..6e9574c 100644
--- a/src/com/android/browser/FindDialog.java
+++ b/src/com/android/browser/FindDialog.java
@@ -179,7 +179,7 @@
Spannable span = (Spannable) mEditText.getText();
span.setSpan(this, 0, span.length(),
Spannable.SPAN_INCLUSIVE_INCLUSIVE);
- mMatches.setText(R.string.zero);
+ setMatchesFound(0);
disableButtons();
}
@@ -206,11 +206,11 @@
} else {
mMatchesView.setVisibility(View.VISIBLE);
int found = mWebView.findAll(find.toString());
- mMatches.setText(Integer.toString(found));
+ setMatchesFound(found);
if (found < 2) {
disableButtons();
if (found == 0) {
- mMatches.setText(R.string.zero);
+ setMatchesFound(0);
}
} else {
mPrevButton.setFocusable(true);
@@ -221,6 +221,13 @@
}
}
+ private void setMatchesFound(int found) {
+ String template = mBrowserActivity.getResources().
+ getQuantityString(R.plurals.matches_found, found, found);
+
+ mMatches.setText(template);
+ }
+
public void afterTextChanged(Editable s) {
}
}
diff --git a/src/com/android/browser/TabControl.java b/src/com/android/browser/TabControl.java
index d58ee22..ee63f2c 100644
--- a/src/com/android/browser/TabControl.java
+++ b/src/com/android/browser/TabControl.java
@@ -807,6 +807,8 @@
// Create a new WebView
WebView w = new WebView(mActivity);
w.setMapTrackballToArrowKeys(false); // use trackball directly
+ // Enable the built-in zoom
+ w.getSettings().setBuiltInZoomControls(true);
// Add this WebView to the settings observer list and update the
// settings
final BrowserSettings s = BrowserSettings.getInstance();
