October 2018 - tbb-commits - lists.torproject.org

[tor-launcher/master] Version bump (0.2.17)
by gk＠torproject.org 19 Oct '18

19 Oct '18

commit a34b539f6d9cd3b8d043b6f65c37175deaca312f Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 19 07:41:23 2018 +0000 Version bump (0.2.17) --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index a5d027e..1ee7a87 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.16.5</em:version> + <em:version>0.2.17</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL>

1 0

[tor-launcher/master] Translations update
by gk＠torproject.org 19 Oct '18

19 Oct '18

commit 2ce44eb159ae8f288f897f80d4263baa687a98d8 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 19 07:40:26 2018 +0000 Translations update --- src/chrome/locale/bn/network-settings.dtd | 88 +++++++++---------- src/chrome/locale/bn/torlauncher.properties | 116 ++++++++++++------------- src/chrome/locale/cs/network-settings.dtd | 52 +++++------ src/chrome/locale/cs/torlauncher.properties | 90 +++++++++---------- src/chrome/locale/da/network-settings.dtd | 4 +- src/chrome/locale/de/network-settings.dtd | 8 +- src/chrome/locale/de/torlauncher.properties | 8 +- src/chrome/locale/el/network-settings.dtd | 14 +-- src/chrome/locale/el/torlauncher.properties | 30 +++---- src/chrome/locale/es-AR/torlauncher.properties | 52 +++++------ src/chrome/locale/fa/network-settings.dtd | 30 +++---- src/chrome/locale/he/network-settings.dtd | 6 +- src/chrome/locale/he/torlauncher.properties | 4 +- src/chrome/locale/is/network-settings.dtd | 10 +-- src/chrome/locale/is/torlauncher.properties | 18 ++-- src/chrome/locale/ka/network-settings.dtd | 30 +++---- src/chrome/locale/ka/torlauncher.properties | 94 ++++++++++---------- src/chrome/locale/nl/torlauncher.properties | 12 +-- src/chrome/locale/zh-TW/network-settings.dtd | 6 +- 19 files changed, 336 insertions(+), 336 deletions(-) diff --git a/src/chrome/locale/bn/network-settings.dtd b/src/chrome/locale/bn/network-settings.dtd index 8ba1fd3..99ab804 100644 --- a/src/chrome/locale/bn/network-settings.dtd +++ b/src/chrome/locale/bn/network-settings.dtd @@ -1,62 +1,62 @@ -<!ENTITY torsettings.dialog.title "টর নেটওয়ার্ক সেটিংস"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> -<!ENTITY torsettings.wizard.title.configure "টর নেটওয়ার্ক সেটিংস"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.dialog.title "টর নেটওয়ার্ক সেটিংস"> +<!ENTITY torsettings.wizard.title.default "টর সাথে সংযোগ স্থাপন করুন"> +<!ENTITY torsettings.wizard.title.configure "টর নেটওয়ার্ক সেটিংস"> +<!ENTITY torsettings.wizard.title.connecting "একটি সংযোগ স্থাপন">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.title "টর ব্রাউজার ভাষা"> +<!ENTITY torlauncher.localePicker.prompt "দয়া করে একটি ভাষা নির্বাচন করুন">  -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connect "সংযোগ করুন"> +<!ENTITY torSettings.connectPrompt "টর সাথে সংযোগ করতে "সংযোগ করুন" ক্লিক করুন"> +<!ENTITY torSettings.configurePrompt "আপনি এমন একটি দেশে থাকলে নেটওয়ার্ক সেটিংস সংশোধন করতে "কনফিগার করুন" ক্লিক করুন যা টরকে সেন্সর করে (যেমনঃ মিশর, চীন, তুরস্ক) অথবা যদি আপনি একটি প্রাইভেট নেটওয়ার্ক থেকে সংযোগ করেন যা প্রক্সি প্রয়োজন।"> +<!ENTITY torSettings.configure "কনফিগার করুন"> +<!ENTITY torSettings.connect "সংযোগ করা">  -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restartTor "Restart Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.startingTor "টর শুরু করার জন্য অপেক্ষা করছে ..."> +<!ENTITY torsettings.restartTor "টর্চ পুনরায় চালু করুন"> +<!ENTITY torsettings.reconfigTor "পুনরায় কনফিগার করুন"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "আপনি টর ব্রিজগুলি কনফিগার করেছেন বা আপনি স্থানীয় প্রক্সি সেটিংস এ প্রবেশ করেছেন।  টর নেটওয়ার্কের সাথে সরাসরি সংযোগ স্থাপনের জন্য, এই সেটিংস মুছে ফেলা আবশ্যক।"> +<!ENTITY torsettings.discardSettings.proceed "সেটিংস সরান এবং সংযুক্ত করুন"> -<!ENTITY torsettings.optional "Optional"> +<!ENTITY torsettings.optional "ঐচ্ছিক"> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "পোর্ট:"> +<!ENTITY torsettings.useProxy.checkbox "আমি ইন্টারনেটে সংযোগ স্থাপন করতে প্রক্সি ব্যবহার করি"> +<!ENTITY torsettings.useProxy.type "প্রক্সি প্রকার:"> +<!ENTITY torsettings.useProxy.type.placeholder "একটি প্রক্সি টাইপ নির্বাচন করুন"> +<!ENTITY torsettings.useProxy.address "ঠিকানা:"> +<!ENTITY torsettings.useProxy.address.placeholder "আইপি ঠিকানা বা হোস্টনাম"> +<!ENTITY torsettings.useProxy.port "পোর্টঃ"> <!ENTITY torsettings.useProxy.username "ব্যবহারকারী নাম:"> <!ENTITY torsettings.useProxy.password "পাসওয়ার্ড:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> -<!ENTITY torsettings.useBridges.captchaSubmit "দাখিল করা"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> -<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> - -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> - -<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> -<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings."> - -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> -<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> +<!ENTITY torsettings.firewall.checkbox "এই কম্পিউটারটি একটি ফায়ারওয়ালের মাধ্যমে যায় যা কেবলমাত্র কিছু পোর্টের সংযোগের অনুমতি দেয়"> +<!ENTITY torsettings.firewall.allowedPorts "অনুমোদিত পোর্টসমূহ:"> +<!ENTITY torsettings.useBridges.checkbox "টর আমার দেশে সেন্সর করা হয়"> +<!ENTITY torsettings.useBridges.default "একটি অন্তর্নির্মিত ব্রিজ নির্বাচন করুন"> +<!ENTITY torsettings.useBridges.default.placeholder "একটি ব্রিজ নির্বাচন করুন"> +<!ENTITY torsettings.useBridges.bridgeDB "torproject.org থেকে একটি সেতুর জন্য অনুরোধ করুন"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "ইমেজ থেকে অক্ষর লিখুন"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "একটি নতুন চ্যালেঞ্জ পান"> +<!ENTITY torsettings.useBridges.captchaSubmit "জমা করুন"> +<!ENTITY torsettings.useBridges.custom "একটি ব্রিজ প্রদান আমি জানি"> +<!ENTITY torsettings.useBridges.label "বিশ্বস্ত উৎস থেকে ব্রিজ তথ্য প্রবেশ করান।"> +<!ENTITY torsettings.useBridges.placeholder "টাইপ ঠিকানা: পোর্ট (প্রতি লাইন প্রতি)"> + +<!ENTITY torsettings.copyLog "ক্লিপবোর্ডে কপি টর লগ করুন"> + +<!ENTITY torsettings.proxyHelpTitle "প্রক্সি সাহায্য"> +<!ENTITY torsettings.proxyHelp1 "একটি প্রতিষ্ঠান, স্কুল বা বিশ্ববিদ্যালয়ের নেটওয়ার্কের মাধ্যমে সংযোগ করার সময় স্থানীয় প্রক্সির প্রয়োজন হতে পারে । #160; যদি আপনি নিশ্চিত না হন যে কোন প্রক্সি প্রয়োজন কিনা, অন্য ব্রাউজারে ইন্টারনেট সেটিংসের দিকে তাকান অথবা আপনার সিস্টেম এর নেটওয়ার্ক সেটিংস চেক করুন."> + +<!ENTITY torsettings.bridgeHelpTitle "ব্রিজ রিলে সহায়তা"> +<!ENTITY torsettings.bridgeHelp1 "ব্রিজগুলি তালিকাভুক্ত নয় এমন রিলে যা টর নেটওয়ার্ক সংযোগ বন্ধ করে আরও কঠিন করে তোলে।   সেন্সরশিপ এড়ানোর জন্য প্রতিটি ধরনের সেতু একটি ভিন্ন পদ্ধতি ব্যবহার করে।   Obfs আপনার ট্র্যাফিক র্যান্ডম শব্দ মত চেহারা, এবং নিছক টাওয়ার ট্র্যাফিক চেহারা মত এটি টর পরিবর্তে যে পরিষেবা সংযোগ করা হয়।"> +<!ENTITY torsettings.bridgeHelp2 "কিছু দেশ টোরকে বাধা দেওয়ার চেষ্টা করে কেন, কিছু কিছু ব্রিজ নির্দিষ্ট দেশে কাজ করে কিন্তু অন্যদের নয়।   আপনার দেশে কোন ব্রিজগুলি কাজ করে তা যদি আপনি অনিশ্চিত থাকেন, তাহলে torproject.org/about/contact.html#support দেখুন">  -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "আমরা টর নেটওয়ার্কে একটি সংযোগ স্থাপন করার সময় অনুগ্রহ করে অপেক্ষা করুন।   এই কয়েক মিনিট সময় নিতে পারে."> diff --git a/src/chrome/locale/bn/torlauncher.properties b/src/chrome/locale/bn/torlauncher.properties index cc1fdd5..ad26572 100644 --- a/src/chrome/locale/bn/torlauncher.properties +++ b/src/chrome/locale/bn/torlauncher.properties @@ -1,78 +1,78 @@ ### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Tor Launcher +torlauncher.error_title=টর লঞ্চার -torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. +torlauncher.tor_exited_during_startup=টর্চ প্রারম্ভকালে exited। এটি আপনার torrc ফাইলের ত্রুটির কারণে, টর বা আপনার সিস্টেমে অন্য প্রোগ্রামের একটি বাগ বা ত্রুটির হার্ডওয়্যারগুলির কারণে হতে পারে। যতক্ষন না আপনি অন্তর্নিহিত সমস্যাটি সমাধান করেন এবং টর পুনরায় চালু করুন, টর ব্রাউজারটি শুরু হবে না। torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. -torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. +torlauncher.tor_exited2=টর রিস্টার্ট করলে আপনার ব্রাউজার ট্যাব বন্ধ হবে না। torlauncher.tor_controlconn_failed=Could not connect to Tor control port. -torlauncher.tor_failed_to_start=টর শুরু হতে ব্যর্থ হয়েছে -torlauncher.tor_control_failed=Failed to take control of Tor. -torlauncher.tor_bootstrap_failed=টর নেটওয়ার্ক সংযোগ সৃষ্টি করতে হতে ব্যর্থ হয়েছে। -torlauncher.tor_bootstrap_failed_details=%1$S ব্যর্থ হয়েছে (%2$S). +torlauncher.tor_failed_to_start=Tor failed to start. +torlauncher.tor_control_failed=টর্চ নিয়ন্ত্রণ নিতে ব্যর্থ হয়েছে +torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. +torlauncher.tor_bootstrap_failed_details=%1$S ব্যর্থ (%2$S)। -torlauncher.unable_to_start_tor=টর শুরু করা সম্ভব নয়।\n\n%S -torlauncher.tor_missing= Tor executable নথিটি পাওয়া যাচ্ছে না। -torlauncher.torrc_missing=The torrc file is missing and could not be created. -torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. -torlauncher.password_hash_missing=Failed to get hashed password. +torlauncher.unable_to_start_tor=টর শুরু করতে অক্ষম %S +torlauncher.tor_missing=টর্ক এক্সিকিউটেবল মিস করা হয়। +torlauncher.torrc_missing=Torrc ফাইলটি অনুপস্থিত এবং তৈরি করা যায়নি। +torlauncher.datadir_missing=টর ডেটা ডিরেক্টরিটি বিদ্যমান নয় এবং তৈরি করা যাবে না। +torlauncher.password_hash_missing=হ্যাশড পাসওয়ার্ড পেতে ব্যর্থ। -torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S -torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S -torlauncher.ensure_tor_is_running=Please ensure that Tor is running. +torlauncher.failed_to_get_settings=টর সেটিংস পুনরুদ্ধার করতে অক্ষম। %S +torlauncher.failed_to_save_settings=টর সেটিংস সংরক্ষণ করতে অক্ষম %S +torlauncher.ensure_tor_is_running=টর চলছে তা নিশ্চিত করুন। -torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. -torlauncher.error_proxy_type_missing=You must select the proxy type. -torlauncher.error_bridges_missing=You must specify one or more bridges. -torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. -torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. +torlauncher.error_proxy_addr_missing=আপনি ইন্টারনেট অ্যাক্সেস করার জন্য প্রক্সি ব্যবহার করার জন্য টরকে কনফিগার করার জন্য অবশ্যই একটি IP ঠিকানা বা হোস্টনাম এবং একটি পোর্ট নম্বর উল্লেখ করতে হবে। +torlauncher.error_proxy_type_missing=আপনাকে প্রক্সি টাইপ নির্বাচন করতে হবে। +torlauncher.error_bridges_missing=আপনাকে অবশ্যই এক বা একাধিক ব্রিজগুলি নির্দিষ্ট করতে হবে। +torlauncher.error_default_bridges_type_missing=সরবরাহকৃত ব্রিজের জন্য আপনাকে অবশ্যই একটি পরিবহন প্রকার নির্বাচন করতে হবে। +torlauncher.error_bridgedb_bridges_missing=একটি ব্রিজ অনুরোধ করুন +torlauncher.error_bridge_bad_default_type=কোনও ব্রিজ নেই যেটি ট্রান্সপোর্ট টাইপ% S আছে। আপনার সেটিংস সামঞ্জস্য করুন দয়া করে। -torlauncher.bridge_suffix.meek-amazon=(works in China) -torlauncher.bridge_suffix.meek-azure=(works in China) +torlauncher.bridge_suffix.meek-amazon=(চীন মধ্যে কাজ করে) +torlauncher.bridge_suffix.meek-azure=(চীন মধ্যে কাজ করে) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.request_a_bridge=ব্রিজ অনুরোধ করুন........ +torlauncher.request_a_new_bridge=একটি নতুন ব্রিজ অনুরোধ করুন +torlauncher.contacting_bridgedb=ব্রিজডিবি এ যোগাযোগ করা হচ্ছে। অনুগ্রহপূর্বক অপেক্ষা করুন. +torlauncher.captcha_prompt=একটি ব্রিজ অনুরোধ করার জন্য ক্যাপচা সমাধান করুন।... +torlauncher.bad_captcha_solution=সমাধান সঠিক নয়। অনুগ্রহপূর্বক আবার চেষ্টা করুন. +torlauncher.unable_to_get_bridge=BridgeDB থেকে একটি ব্রিজ প্রাপ্ত করতে অক্ষম। +torlauncher.no_meek=এই ব্রাউজারটি meek এর জন্য কনফিগার করা হয় নি, যা ব্রিজ প্রাপ্ত করার প্রয়োজন হয়। +torlauncher.no_bridges_available=এই সময়ে কোন ব্রিজ নেই। দুঃখিত। -torlauncher.connect=সংযোগ করুন -torlauncher.restart_tor=Restart Tor -torlauncher.quit=বেরিয়ে যান +torlauncher.connect=সংযোগ করা +torlauncher.restart_tor=টর্চ পুনরায় চালু করুন +torlauncher.quit=অব্যাহতিপ্রাপ্ত torlauncher.quit_win=বেরিয়ে যান torlauncher.done=সমাপ্ত -torlauncher.forAssistance=সাহায্যের জন্য , যোগাযোগ করুনঃ %S -torlauncher.forAssistance2=For assistance, visit %S +torlauncher.forAssistance=সহায়তার জন্য, যোগাযোগ করুন %S +torlauncher.forAssistance2=সহায়তার জন্য, %S এ যান -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=কপি সম্পূর্ণ। %S টর লগ বার্তা একটি টেক্সট এডিটর বা একটি ইমেইল বার্তা আটকানোর জন্য প্রস্তুত। -torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory +torlauncher.bootstrapStatus.conn_dir=একটি রিলে ডিরেক্টরি সাথে সংযোগ স্থাপন torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection -torlauncher.bootstrapStatus.requesting_status=Retrieving network status -torlauncher.bootstrapStatus.loading_status=Loading network status -torlauncher.bootstrapStatus.loading_keys=Loading authority certificates -torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information -torlauncher.bootstrapStatus.loading_descriptors=Loading relay information -torlauncher.bootstrapStatus.conn_or=টর নেটওয়ার্কের সাথে সংযুক্ত হচ্ছে -torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit -torlauncher.bootstrapStatus.done=টর নেটওয়ার্কের সাথে সংযুক্ত হয়েছে! +torlauncher.bootstrapStatus.requesting_status=নেটওয়ার্ক স্থিতি পুনরুদ্ধার +torlauncher.bootstrapStatus.loading_status=নেটওয়ার্ক স্থিতি লোড হচ্ছে +torlauncher.bootstrapStatus.loading_keys=কর্তৃপক্ষ সার্টিফিকেট লোড হচ্ছে +torlauncher.bootstrapStatus.requesting_descriptors=রিলে তথ্য অনুরোধ +torlauncher.bootstrapStatus.loading_descriptors=রিলে তথ্য লোড হচ্ছে +torlauncher.bootstrapStatus.conn_or=টর নেটওয়ার্কে সংযুক্ত হচ্ছে +torlauncher.bootstrapStatus.handshake_or=একটি টর্ক সার্কিট স্থাপন +torlauncher.bootstrapStatus.done=টর নেটওয়ার্ক সংযুক্ত! -torlauncher.bootstrapWarning.done=সম্পূর্ণ -torlauncher.bootstrapWarning.connectrefused=connection refused -torlauncher.bootstrapWarning.misc=miscellaneous -torlauncher.bootstrapWarning.resourcelimit=insufficient resources -torlauncher.bootstrapWarning.identity=identity mismatch -torlauncher.bootstrapWarning.timeout=connection timeout -torlauncher.bootstrapWarning.noroute=no route to host -torlauncher.bootstrapWarning.ioerror=read/write error -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.bootstrapWarning.done=সম্পন্ন +torlauncher.bootstrapWarning.connectrefused=সংযোগ প্রত্যাখ্যাত +torlauncher.bootstrapWarning.misc=বিবিধ +torlauncher.bootstrapWarning.resourcelimit=অপর্যাপ্ত সম্পদ +torlauncher.bootstrapWarning.identity=পরিচয় মেলেনি +torlauncher.bootstrapWarning.timeout=আউট সংযোগ সময় +torlauncher.bootstrapWarning.noroute=কোন রুট হোস্ট করার জন্য +torlauncher.bootstrapWarning.ioerror=পড়া / লিখুন ত্রুটি +torlauncher.bootstrapWarning.pt_missing=অনুপস্থিত প্ল্যাগেবল পরিবহন -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=সার্ভারের সংযোগ হারিয়ে গেছে। +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=সার্ভারের সাথে যুক্ত হতে পারছে না. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=প্রক্সি সাথে সংযোগ করা যায়নি diff --git a/src/chrome/locale/cs/network-settings.dtd b/src/chrome/locale/cs/network-settings.dtd index 20d4e19..53fc3a1 100644 --- a/src/chrome/locale/cs/network-settings.dtd +++ b/src/chrome/locale/cs/network-settings.dtd @@ -1,38 +1,38 @@ -<!ENTITY torsettings.dialog.title "Síťové nastavení TORu"> -<!ENTITY torsettings.wizard.title.default "Připojit k Toru"> +<!ENTITY torsettings.dialog.title "Síťové nastavení Toru"> +<!ENTITY torsettings.wizard.title.default "Připojení k síti Tor"> <!ENTITY torsettings.wizard.title.configure "Nastavení sítě Tor"> -<!ENTITY torsettings.wizard.title.connecting "Sestavuji spojení"> +<!ENTITY torsettings.wizard.title.connecting "Navazování spojení">  -<!ENTITY torlauncher.localePicker.title "Jazyk Tor Prohlížeče"> -<!ENTITY torlauncher.localePicker.prompt "Prosím zvolte jazyk."> +<!ENTITY torlauncher.localePicker.title "Jazyk prohlížeče Tor"> +<!ENTITY torlauncher.localePicker.prompt "Zvolte prosím jazyk.">  -<!ENTITY torSettings.connectPrompt "Klikněte na „Připojit“ pro připojení k Toru."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> -<!ENTITY torSettings.configure "Konfigurovat"> +<!ENTITY torSettings.connectPrompt "Pro připojení k síti Tor klepněte na tlačítko „Připojit“."> +<!ENTITY torSettings.configurePrompt "Pokud jste v zemi, která síť Tor omezuje (např. Egypt, Čína, Turecko), nebo pokud se připojujete ze sítě, která vyžaduje použití proxy, klepněte na tlačítko „Nastavení“ pro úpravu nastavení sítě."> +<!ENTITY torSettings.configure "Nastavení"> <!ENTITY torSettings.connect "Připojit">  -<!ENTITY torsettings.startingTor "Čekání na start TORu"> +<!ENTITY torsettings.startingTor "Čekání na start Toru"> <!ENTITY torsettings.restartTor "Restartovat Tor"> <!ENTITY torsettings.reconfigTor "Přenastavit"> -<!ENTITY torsettings.discardSettings.prompt "Nastavil jste síťový most nebo zadal lokální proxy.  Aby jste se mohl připojit k síti Tor přímo, musíte tato nastavení odstranit."> +<!ENTITY torsettings.discardSettings.prompt "Nastavili jste síťový most nebo lokální proxy.  Pro připojení k síti Tor přímo tato nastavení odstraňte."> <!ENTITY torsettings.discardSettings.proceed "Odstranit nastavení a připojit se"> -<!ENTITY torsettings.optional "Volitelný"> +<!ENTITY torsettings.optional "Volitelné"> <!ENTITY torsettings.useProxy.checkbox "Používám proxy pro připojení k Internetu"> -<!ENTITY torsettings.useProxy.type "Typ Proxy:"> +<!ENTITY torsettings.useProxy.type "Typ proxy:"> <!ENTITY torsettings.useProxy.type.placeholder "vyberte typ proxy"> <!ENTITY torsettings.useProxy.address "Adresa:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP adresa nebo jméno hosta"> +<!ENTITY torsettings.useProxy.address.placeholder "IP adresa nebo název serveru"> <!ENTITY torsettings.useProxy.port "Port:"> <!ENTITY torsettings.useProxy.username "Uživatel:"> -<!ENTITY torsettings.useProxy.password "Heslo."> +<!ENTITY torsettings.useProxy.password "Heslo:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> @@ -41,22 +41,22 @@ <!ENTITY torsettings.useBridges.checkbox "Tor je v mé zemi cenzurován"> <!ENTITY torsettings.useBridges.default "Vyberte vestavěný most"> <!ENTITY torsettings.useBridges.default.placeholder "vyberte most"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> -<!ENTITY torsettings.useBridges.captchaSubmit "Předložit"> -<!ENTITY torsettings.useBridges.custom "Znám poskytovatele mostu"> +<!ENTITY torsettings.useBridges.bridgeDB "Vyžádat most od torproject.org"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Zadejte písmena z obrázku"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Nový obrázek"> +<!ENTITY torsettings.useBridges.captchaSubmit "Odeslat"> +<!ENTITY torsettings.useBridges.custom "Zadat známý most"> <!ENTITY torsettings.useBridges.label "Zadejte informace o mostu z důvěryhodného zdroje."> -<!ENTITY torsettings.useBridges.placeholder "napište adresa:post (jedna položka na řádek)"> +<!ENTITY torsettings.useBridges.placeholder "zadávejte ve tvaru adresa:post (jedna položka na řádek)"> -<!ENTITY torsettings.copyLog "Zkopíruj logový soubor Toru do schránky"> +<!ENTITY torsettings.copyLog "Zkopírovat protokol Toru do schránky"> <!ENTITY torsettings.proxyHelpTitle "Nápověda k proxy"> -<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings."> +<!ENTITY torsettings.proxyHelp1 "Pří připojení skrze síť firmy, školy nebo univerzity může být potřeba lokální proxy. Pokud si nejste jisti, jestli je proxy potřeba, podívejte se do nastavení internetu jiného prohlížeče, nebo do systémového nastavení sítě."> -<!ENTITY torsettings.bridgeHelpTitle "Nápověda o mostních relé"> -<!ENTITY torsettings.bridgeHelp1 "Mosty jsou nezveřejněné prvky, které dělají blokování připojení k síti Tor obtížnější.  Každý typ mostu používá odlišný způsob jak zabránit cenzuře.  Obfs mosty dělají z vašich dat náhodný šum a meek mosty vytvářejí dojem, že se připojujete k dané službě a ne k Toru."> -<!ENTITY torsettings.bridgeHelp2 "Protože se každá země snaží zablokovat Tor jinak, některé typy mostů fungují pouze v některých zemích.  Pokud si nejste jisti typy mostů, které fungují ve vaší zemi, navštivte torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelpTitle "Nápověda o mostních uzlech"> +<!ENTITY torsettings.bridgeHelp1 "Mosty jsou neveřejné uzly, které znesnadňují blokování sítě Tor.  Každý typ mostu používá odlišný způsob jak zabránit cenzuře.  Obfs mosty dělají z vašich dat náhodný šum a meek mosty vytvářejí dojem, že se připojujete k dané službě a ne k Toru."> +<!ENTITY torsettings.bridgeHelp2 "Protože se některé země snaží zablokovat Tor, některé typy mostů fungují pouze v některých zemích.  Pokud si nejste jisti typy mostů, které fungují ve vaší zemi, navštivte torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Počkejte prosím, než vytvoříme spojení do sítě Tor.  Může to trvat několik minut."> +<!ENTITY torprogress.pleaseWait "Počkejte prosím na vytvoření spojení do sítě Tor.  Může to trvat několik minut."> diff --git a/src/chrome/locale/cs/torlauncher.properties b/src/chrome/locale/cs/torlauncher.properties index c7caeb5..2a21d5f 100644 --- a/src/chrome/locale/cs/torlauncher.properties +++ b/src/chrome/locale/cs/torlauncher.properties @@ -1,78 +1,78 @@ ### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Tor spouštěč +torlauncher.error_title=Spouštěč Toru -torlauncher.tor_exited_during_startup=Tor byl ukončen při spuštění. To by mohlo být způsobeno chybou ve vašem torrc souboru, chybou v Toru nebo jiném programu na vašem systému, nebo vadným hardware. Dokud neopravíte základní problém a nerestartujete Tor, Tor Browser se nespustí. -torlauncher.tor_exited=Tor byl neočekávaně ukončen. To by mohlo být způsobeno chybou v Toru, jiném programu na vašem systému, nebo vadným hardware. Dokud nerestartujete Tor, nebude Tor Browser schopen dosáhnout jakékoli webové stránky. Pokud problém přetrvává, prosím pošlete týmu podpory kopii souboru Tor Logu. +torlauncher.tor_exited_during_startup=Tor byl ukončen během spouštění. Příčinou může být chyba ve vašem souboru torrc, v Toru, v jiném programu na vašem systému, nebo vadný hardware. Dokud nebude příčina opravena a Tor restartován, prohlížeč Tor se nespustí. +torlauncher.tor_exited=Tor byl neočekávaně ukončen. Příčinou může být chyba v Toru, v jiném programu na vašem systému, nebo vadný hardware. Dokud nebude Tor restartován, prohlížeč Tor nebude moci načíst žádnou webovou stránku. Pokud problém přetrvává, prosím pošlete týmu podpory kopii protokolu Toru. torlauncher.tor_exited2=Restartování Tor nebude zavírat záložky prohlížeče. torlauncher.tor_controlconn_failed=Nemohu se připojit ke kontrolnímu portu Tor. torlauncher.tor_failed_to_start=Tor nenastartoval. -torlauncher.tor_control_failed=Nezdařilo se převzít kontrolu nad Tor. -torlauncher.tor_bootstrap_failed=Tor selhal při sestavení připojení do sítě Tor. +torlauncher.tor_control_failed=Nepodařilo se převzít kontrolu nad Torem. +torlauncher.tor_bootstrap_failed=Nepodařilo se připojit do sítě Tor. torlauncher.tor_bootstrap_failed_details=%1$S selhal (%2$S). -torlauncher.unable_to_start_tor=Tor není schopen startovat\n\n%S -torlauncher.tor_missing=Spustitelný soubor Tor chybí. +torlauncher.unable_to_start_tor=Tor není možné zapnout\n\n%S +torlauncher.tor_missing=Spustitelný soubor Toru chybí. torlauncher.torrc_missing=Chybí soubor torrc a nemohl být vytvořen. -torlauncher.datadir_missing=Složka Tor data neexistuje a nemohla být vytvořena. +torlauncher.datadir_missing=Složka s daty Toru neexistuje a nemohla být vytvořena. torlauncher.password_hash_missing=Nepovedlo se získat hashované heslo. -torlauncher.failed_to_get_settings=Nelze načíst Tor nastavení.\n\n%S -torlauncher.failed_to_save_settings=Nelze uložit Tor nastavení.\n\n%S -torlauncher.ensure_tor_is_running=Prosím zkontrolujte zda Tor je spuštěn. +torlauncher.failed_to_get_settings=Nelze načíst nastavení Toru.\n\n%S +torlauncher.failed_to_save_settings=Nelze uložit nastavení Toru.\n\n%S +torlauncher.ensure_tor_is_running=Zkontrolujte prosím, že je Tor spuštěn. -torlauncher.error_proxy_addr_missing=Pro nastavení Toru pro použití proxy serveru musíte specifikovat jak IP adresu (nebo jméno hostitele) tak číslo portu -torlauncher.error_proxy_type_missing=Musíte vybrat typ proxy -torlauncher.error_bridges_missing=Musíte specifikovat jeden nebo více mostů. -torlauncher.error_default_bridges_type_missing=Pro zadané bridge musíte zadat typ transportu. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. -torlauncher.error_bridge_bad_default_type=Nejsou zadané žádné bridge, které by měly ty transportu %S. Změňte prosím nastavení. +torlauncher.error_proxy_addr_missing=Pro nastavení proxy serveru musíte zadat jak IP adresu (nebo název hostitele) tak číslo portu. +torlauncher.error_proxy_type_missing=Vyberte typ proxy. +torlauncher.error_bridges_missing=Vyberte jeden nebo více mostů. +torlauncher.error_default_bridges_type_missing=Pro vybrané mosty musíte zadat typ transportu. +torlauncher.error_bridgedb_bridges_missing=Požádejte prosím o most. +torlauncher.error_bridge_bad_default_type=Nejsou nastaveny žádné mosty s typem transportu %S. Změňte prosím nastavení. torlauncher.bridge_suffix.meek-amazon=(funguje v Číně) torlauncher.bridge_suffix.meek-azure=(funguje v Číně) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.request_a_bridge=Požádat o most… +torlauncher.request_a_new_bridge=Požádat o nový most… +torlauncher.contacting_bridgedb=Kontaktování BridgeDB. Čekejte prosím. +torlauncher.captcha_prompt=Pro vyžádání mostu prosím opište kód CAPTCHA. +torlauncher.bad_captcha_solution=Neopsali jste kód správně. Zkuste to prosím znovu. +torlauncher.unable_to_get_bridge=Nepodařilo se získat most z BridgeDB.\n\n%S +torlauncher.no_meek=Tento prohlížeč nemá nastaven meek, který je potřebný pro získávání mostů. +torlauncher.no_bridges_available=Je nám líto, ale v tuto chvíli nejsou dostupné žádné mosty. torlauncher.connect=Připojit torlauncher.restart_tor=Restartovat Tor -torlauncher.quit=Ukoncit -torlauncher.quit_win=Konec +torlauncher.quit=Ukončit +torlauncher.quit_win=Ukončit torlauncher.done=Hotovo torlauncher.forAssistance=Pro asistenci kontaktujte %S torlauncher.forAssistance2=Pro asistenci navštivte %S -torlauncher.copiedNLogMessages=Kopírování kompletní. %S zprávy protokolu Tor jsou připraveny k vložení do textového editoru nebo e-mailové zprávy. +torlauncher.copiedNLogMessages=Kopírování dokončeno. %S zprávy protokolu Tor jsou připraveny k vložení do textového editoru nebo e-mailu. -torlauncher.bootstrapStatus.conn_dir=Připojování do adresáře uzlu -torlauncher.bootstrapStatus.handshake_dir=Navazuji spojení s šifrovaným adresářem -torlauncher.bootstrapStatus.requesting_status=Zjišťuji stav sítě -torlauncher.bootstrapStatus.loading_status=Načítam stav sítě -torlauncher.bootstrapStatus.loading_keys=Nahrávám certifikáty autority -torlauncher.bootstrapStatus.requesting_descriptors=Zjišťuji informace o uzlu -torlauncher.bootstrapStatus.loading_descriptors=Nahrávám informace o uzlu -torlauncher.bootstrapStatus.conn_or=Připojuji se k síti Tor -torlauncher.bootstrapStatus.handshake_or=Navazuji na okruh Tor -torlauncher.bootstrapStatus.done=Připojen k síti Tor! +torlauncher.bootstrapStatus.conn_dir=Připojování do adresáře uzlů +torlauncher.bootstrapStatus.handshake_dir=Spojování s šifrovaným adresářem +torlauncher.bootstrapStatus.requesting_status=Kontrola stavu sítě +torlauncher.bootstrapStatus.loading_status=Načítání stavu sítě +torlauncher.bootstrapStatus.loading_keys=Nahrávání certifikátů autorit +torlauncher.bootstrapStatus.requesting_descriptors=Zjišťování informací o uzlu +torlauncher.bootstrapStatus.loading_descriptors=Nahrávání informací o uzlu +torlauncher.bootstrapStatus.conn_or=Připojování k síti Tor +torlauncher.bootstrapStatus.handshake_or=Navazování okruhu Tor +torlauncher.bootstrapStatus.done=Připojení k síti Tor dokončeno! torlauncher.bootstrapWarning.done=hotovo torlauncher.bootstrapWarning.connectrefused=připojení odmítnuto torlauncher.bootstrapWarning.misc=různý torlauncher.bootstrapWarning.resourcelimit=nedostatečné zdroje torlauncher.bootstrapWarning.identity=nesouhlasí identita -torlauncher.bootstrapWarning.timeout=vypršel čas na připojení -torlauncher.bootstrapWarning.noroute=bez spojení s hostitelem -torlauncher.bootstrapWarning.ioerror=chyba během čtení/zápisu -torlauncher.bootstrapWarning.pt_missing=Chybějící zásuvný transport +torlauncher.bootstrapWarning.timeout=čas spojení vypršel +torlauncher.bootstrapWarning.noroute=žádné spojení s hostitelem +torlauncher.bootstrapWarning.ioerror=chyba během čtení nebo zápisu +torlauncher.bootstrapWarning.pt_missing=chybějící zásuvný transport -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=Spojení se serverem bylo ztraceno. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Nelze se připojit k serveru. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Nelze se připojit k proxy. diff --git a/src/chrome/locale/da/network-settings.dtd b/src/chrome/locale/da/network-settings.dtd index 07cdd4d..cdc10bd 100644 --- a/src/chrome/locale/da/network-settings.dtd +++ b/src/chrome/locale/da/network-settings.dtd @@ -36,7 +36,7 @@ <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP/HTTPS"> -<!ENTITY torsettings.firewall.checkbox "Computeren går gennem en firewall som kun tillader forbindelse til specifikke porte"> +<!ENTITY torsettings.firewall.checkbox "Computeren går gennem en firewall som kun tillader forbindelse til bestemte porte"> <!ENTITY torsettings.firewall.allowedPorts "Tilladte Porte:"> <!ENTITY torsettings.useBridges.checkbox "Tor er censureret i mit land"> <!ENTITY torsettings.useBridges.default "Vælg en indbygget bro"> @@ -52,7 +52,7 @@ <!ENTITY torsettings.copyLog "Kopiér Tor-loggen til udklipsholderen"> <!ENTITY torsettings.proxyHelpTitle "Hjælp til proxy"> -<!ENTITY torsettings.proxyHelp1 "Der kan være brug for en lokal proxy når der oprettes forbindelse gennem et netværk i virksomhed, skole eller universitet. Hvis du ikke er sikker på om der er brug for en proxy, så kig i internetindstillingerne i en anden browser eller tjek dit systems netværksindstillinger."> +<!ENTITY torsettings.proxyHelp1 "Der kan være brug for en lokal proxy når der oprettes forbindelse gennem et netværk i virksomhed, skole eller universitet. Hvis du er i tvivl om der er brug for en proxy, så kig i internetindstillingerne i en anden browser eller tjek dit systems netværksindstillinger."> <!ENTITY torsettings.bridgeHelpTitle "Bro-relæ hjælp"> <!ENTITY torsettings.bridgeHelp1 "Broer er ulistede relæer som gør det sværrer at blokere forbindelser til Tor-netværket.  Hver type bro bruger en anderledes metode for at undgå censur.  Dem med obfs får din netværkstrafik til at ligne tilfældig støj og dem med meek får din netværkstrafik til at se ud som om den er forbundet til tjenesten i stedet for Tor."> diff --git a/src/chrome/locale/de/network-settings.dtd b/src/chrome/locale/de/network-settings.dtd index 33caee2..ae68303 100644 --- a/src/chrome/locale/de/network-settings.dtd +++ b/src/chrome/locale/de/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Klicken Sie auf "Verbinden", um eine Verbindung zu Tor herzustellen."> -<!ENTITY torSettings.configurePrompt "Klicken Sie auf "Konfigurieren", um die Netzwerkeinstellungen anzupassen, wenn Sie sich in einem Land befinden, das Tor blockiert (z.B. Ägypten, China, Türkei) oder wenn Sie sich von einem privaten Netzwerk aus verbinden, das einen Proxy benötigt."> +<!ENTITY torSettings.configurePrompt "Klicken Sie auf "Konfigurieren", um die Netzwerkeinstellungen anzupassen, wenn Sie sich in einem Land befinden, das Tor blockiert (z.B. Ägypten, China, Türkei), oder wenn Sie sich von einem privaten Netzwerk aus verbinden, das einen Proxy benötigt."> <!ENTITY torSettings.configure "Konfigurieren"> <!ENTITY torSettings.connect "Verbinden"> @@ -41,7 +41,7 @@ <!ENTITY torsettings.useBridges.checkbox "Tor wird in meinem Land blockiert."> <!ENTITY torsettings.useBridges.default "Bereitgestellte Brücke auswählen"> <!ENTITY torsettings.useBridges.default.placeholder "Brücke auswählen"> -<!ENTITY torsettings.useBridges.bridgeDB "Brücke von torproject.org anfragen"> +<!ENTITY torsettings.useBridges.bridgeDB "Brücke von torproject.org anfordern"> <!ENTITY torsettings.useBridges.captchaSolution.placeholder "Geben Sie die Zeichen in dem Bild ein"> <!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Neue Herausforderung bekommen"> <!ENTITY torsettings.useBridges.captchaSubmit "Übermitteln"> @@ -55,8 +55,8 @@ <!ENTITY torsettings.proxyHelp1 "Unter Umständen ist ein lokaler Proxy nötig, um sich von einem eingeschränkten Netzwerk eines Unternehmens, einer Schule oder Universität zu verbinden. Im Zweifelsfall kann die Einstellung in einem anderen Browser oder die System-Netzwerkeinstellung .verglichen werden."> <!ENTITY torsettings.bridgeHelpTitle "Hilfe zum Brückenrelais"> -<!ENTITY torsettings.bridgeHelp1 "Brücken sind nicht aufgelistete Vermittler, die es schwieriger machen, Verbindungen zum Tor-Netzwerk zu blockieren.  Jede Art von Brücke verwendet eine andere Methode, um Zensur zu vermeiden.  Die vom Typ obfs lassen Ihren Datenverkehr wie Zufallsrauschen aussehen und die vom Typ meek lassen Ihren Datenverkehr aussehen, als ob Sie eine Verbindung zu diesem jeweiligen Dienst herstellen anstatt zu Tor."> -<!ENTITY torsettings.bridgeHelp2 "Aufgrund der Tatsache, dass bestimmte Länder versuchen, Tor zu blockieren, funktionieren bestimmte Brücken in bestimmten Ländern, aber nicht in anderen.  Wenn Sie sich nicht sicher sind, welche Brücken in Ihrem Land funktionieren, besuchen Sie torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelp1 "Brücken sind nicht aufgelistete Vermittler, die es schwieriger machen, Verbindungen zum Tor-Netzwerk zu blockieren.  Jede Art von Brücke verwendet eine andere Methode, um Zensur zu vermeiden.  Die vom Typ obfs lassen Ihren Datenverkehr wie Zufallsrauschen aussehen, und die vom Typ meek lassen Ihren Datenverkehr aussehen, als ob Sie eine Verbindung zu diesem jeweiligen Dienst herstellen anstatt zu Tor."> +<!ENTITY torsettings.bridgeHelp2 "Aufgrund der Art, wie bestimmte Länder versuchen, Tor zu blockieren, funktionieren bestimmte Brücken in gewissen Ländern, nicht aber in anderen.  Wenn Sie sich nicht sicher sind, welche Brücken in Ihrem Land funktionieren, besuchen Sie torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Bitte warten Sie, während eine Verbindung zum Tor-Netzwerk hergestellt wird.  Das kann einige Minuten dauern."> diff --git a/src/chrome/locale/de/torlauncher.properties b/src/chrome/locale/de/torlauncher.properties index 49aabaa..18afad1 100644 --- a/src/chrome/locale/de/torlauncher.properties +++ b/src/chrome/locale/de/torlauncher.properties @@ -3,7 +3,7 @@ torlauncher.error_title=Tor-Starter -torlauncher.tor_exited_during_startup=Tor wurde unerwartet beendet. Dies kann die Folge eines Fehlers in ihrer "torrc"-Datei sein, ein Fehler in Tor, einem anderen Programm in ihrem System oder fehlerhafte Hardware sein. Bis die Ursache beseitigt wurde und Tor neugestartet wurde, wird der Tor Browser nicht starten. +torlauncher.tor_exited_during_startup=Tor wurde unerwartet beendet. Dies kann die Folge eines Fehlers in ihrer "torrc"-Datei sein, ein Fehler in Tor, einem anderen Programm in ihrem System oder fehlerhafte Hardware. Bis die Ursache beseitigt wurde und Tor neu gestartet wurde, wird der Tor Browser nicht starten. torlauncher.tor_exited=Tor wurde unerwartet beendet. Das kann an einem Fehler von Tor selbst, an einem anderen Programm auf ihrem System oder fehlerhaften Geräten liegen. Bis Sie Tor neu starten, kann der Tor-Browser keine Internetseiten mehr erreichen. Wenn das Problem bestehen bleibt, bitte eine Kopie des Tor-Protokolls an die Unterstützungsmannschaft senden. torlauncher.tor_exited2=Das Neustarten von Tor wird die Reiter Ihres Browsers nicht schließen. torlauncher.tor_controlconn_failed=Zum Tor-Kontrollanschluss konnte keine Verbindung hergestellt werden. @@ -23,7 +23,7 @@ torlauncher.failed_to_save_settings=Die Tor-Einstellungen können nicht gespeich torlauncher.ensure_tor_is_running=Bitte stellen Sie sicher, dass Tor läuft. torlauncher.error_proxy_addr_missing=Damit Tor einen Vermittlungsserver benutzt, um auf das Internet zuzugreifen, muss eine IP-Adresse oder ein Rechnername und eine Anschlussnummer angegeben werden. -torlauncher.error_proxy_type_missing=Sie müssen eine Vermittlungstyp auswählen. +torlauncher.error_proxy_type_missing=Sie müssen einen Vermittlungs-Typ auswählen. torlauncher.error_bridges_missing=Sie müssen eine oder mehrere Brücken eingeben. torlauncher.error_default_bridges_type_missing=Sie müssen eine Transporttyp für die bereitgestellten Brücken auswählen. torlauncher.error_bridgedb_bridges_missing=Bitte eine Brücke anfordern. @@ -32,10 +32,10 @@ torlauncher.error_bridge_bad_default_type=Es sind keine bereitgestellten Brücke torlauncher.bridge_suffix.meek-amazon=(funktioniert in China) torlauncher.bridge_suffix.meek-azure=(funktioniert in China) -torlauncher.request_a_bridge=Brücke anfordern +torlauncher.request_a_bridge=Brücke anfordern... torlauncher.request_a_new_bridge=Neue Brücke anfordern... torlauncher.contacting_bridgedb=Kontaktiere BridgeDB. Bitte warten. -torlauncher.captcha_prompt=Löse das CAPTCHA um eine Brücke anzufordern. +torlauncher.captcha_prompt=Löse das CAPTCHA, um eine Brücke anzufordern. torlauncher.bad_captcha_solution=Die Lösung ist nicht korrekt. Bitte versuchen Sie es erneut. torlauncher.unable_to_get_bridge=Nicht imstande eine Brücke von der BridgeDB zu erhalten.\n\n%S torlauncher.no_meek=Der Browser ist nicht für meek eingestellt, was gebraucht wird um Brücken zu bekommen. diff --git a/src/chrome/locale/el/network-settings.dtd b/src/chrome/locale/el/network-settings.dtd index 116550e..eacb515 100644 --- a/src/chrome/locale/el/network-settings.dtd +++ b/src/chrome/locale/el/network-settings.dtd @@ -1,16 +1,16 @@ -<!ENTITY torsettings.dialog.title "Tor Ρυθμίσεις Δικτύου "> +<!ENTITY torsettings.dialog.title "Ρυθμίσεις Δικτύου Tor "> <!ENTITY torsettings.wizard.title.default "Σύνδεση στο Tor"> -<!ENTITY torsettings.wizard.title.configure "Ρυθμίσεις δικτύου Tor"> +<!ENTITY torsettings.wizard.title.configure "Ρυθμίσεις Δικτύου Tor"> <!ENTITY torsettings.wizard.title.connecting "Δημιουργείται σύνδεση">  <!ENTITY torlauncher.localePicker.title "Γλώσσα του Tor Browser"> -<!ENTITY torlauncher.localePicker.prompt "Παρακαλώ επέλεξε μια γλώσσα."> +<!ENTITY torlauncher.localePicker.prompt "Παρακαλώ επιλέξτε μια γλώσσα.">  <!ENTITY torSettings.connectPrompt "Πατήστε "Σύνδεση" για να συνδεθείτε στο Tor"> -<!ENTITY torSettings.configurePrompt "Πατήστε "Ρύθμιση" για να προσαρμόσετε τις ρυθμίσεις δικτύου αν βρίσκεστε σε χώρα που αποκλείει τον Tor (όπως η Αίγυπτος, η Κίνα, η Τουρκία) ή αν συνδέεστε από προσωπικό δίκτυο που χρειάζεται διακομιστή μεσολάβησης."> +<!ENTITY torSettings.configurePrompt "Πατήστε "Ρύθμιση" για να προσαρμόσετε τις ρυθμίσεις δικτύου αν βρίσκεστε σε χώρα που αποκλείει το Tor (όπως η Αίγυπτος, η Κίνα, η Τουρκία) ή αν συνδέεστε από προσωπικό δίκτυο που χρειάζεται διακομιστή μεσολάβησης."> <!ENTITY torSettings.configure "Ρύθμιση "> <!ENTITY torSettings.connect "Σύνδεση"> @@ -38,7 +38,7 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Το τείχος προστασίας μου με αφήνει να συνδέομαι μόνο σε συγκεκριμένες θύρες συστήματος"> <!ENTITY torsettings.firewall.allowedPorts "Επιτρεπόμενες Θύρες:"> -<!ENTITY torsettings.useBridges.checkbox "Ο Tor είναι αποκλεισμένος στην χώρα μου"> +<!ENTITY torsettings.useBridges.checkbox "Ο Tor είναι αποκλεισμένος στη χώρα μου"> <!ENTITY torsettings.useBridges.default "Επιλέξτε μία ενταγμένη γέφυρα"> <!ENTITY torsettings.useBridges.default.placeholder "Επιλέξτε μία γέφυρα"> <!ENTITY torsettings.useBridges.bridgeDB "Αιτηθείτε μίας γέφυρας από το torproject.org"> @@ -55,8 +55,8 @@ <!ENTITY torsettings.proxyHelp1 "Ο τοπικός διακομιστής μεσολάβησης μπορεί να χρειαστεί, όταν συνδέεστε από μία εταιρία, ένα σχολείο ή ένα δίκτυο πανεπιστημίου. Αν δεν είστε σίγουρος αν χρειάζεστε διακομιστή μεσολάβησης, ελέγξτε τις ρυθμίσεις ίντερνετ ενός άλλου περιηγητή ή τις ρυθμίσεις του δικτύου συστήματος. "> <!ENTITY torsettings.bridgeHelpTitle "Γεφυρες αναμεταδοτων Βοηθεια"> -<!ENTITY torsettings.bridgeHelp1 "Οι γέφυρες είναι μη καταχωρημένες διευθύνσεις που κάνουν πιο δύσκολο τον αποκλεισμό της σύνδεσης στο δίκτυο Tor.  Κάθε τύπος γέφυρας χρησιμοποιεί διαφορετική μέθοδο για να αποφύγει τον αποκλεισμό.  Οι obfs κάνουν τις κινήσεις σας να μοιάζουν με τυχαίο ήχο και οι meek κάνουν τις συνδέσεις σας να μοιάζουν πως γίνονται μέσω εκείνης της υπηρεσίας αντί του Tor."> +<!ENTITY torsettings.bridgeHelp1 "Οι γέφυρες είναι μη καταχωρημένες διευθύνσεις που κάνουν πιο δύσκολο τον αποκλεισμό της σύνδεσης στο δίκτυο Tor.  Κάθε τύπος γέφυρας χρησιμοποιεί διαφορετική μέθοδο για να αποφύγει τον αποκλεισμό.  Οι obfs κάνουν τις κινήσεις σας να μοιάζουν με τυχαίο ήχο και οι meek κάνουν τις συνδέσεις σας να μοιάζουν πως γίνονται μέσω της αντίστοιχης υπηρεσίας αντί του Tor."> <!ENTITY torsettings.bridgeHelp2 "Λόγω του τρόπου που προσπαθούν κάποιες χώρες να αποκλείσουν το Tor, κάποιες γέφυρες λειτουργούν σε κάποιες χώρες, ενώ άλλες όχι.  Αν δεν είστε σίγουρος για το ποιες γέφυρες λειτουργούν στη χώρα σας, επισκεφτείτε το torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Παρακαλώ περιμένετε καθώς δημιουργήστε σύνδεση στο δίκτυο Tor.  Αυτό μπορεί να πάρει μερικά λεπτά."> +<!ENTITY torprogress.pleaseWait "Παρακαλώ περιμένετε καθώς δημιουργούμε σύνδεση στο δίκτυο Tor.  Αυτό μπορεί να πάρει μερικά λεπτά."> diff --git a/src/chrome/locale/el/torlauncher.properties b/src/chrome/locale/el/torlauncher.properties index ddf3011..3457ae9 100644 --- a/src/chrome/locale/el/torlauncher.properties +++ b/src/chrome/locale/el/torlauncher.properties @@ -3,12 +3,12 @@ torlauncher.error_title=Tor Launcher -torlauncher.tor_exited_during_startup=Το Tor έκλεισε κατά την εκκίνηση. Αυτό μπορεί να οφείλεται σε σφάλμα στο αρχείο torrc, σε σφάλμα στο Tor ή σε κάποιο άλλο πρόγραμμα στο σύστημά σας, ή σε ελαττωματικό υλικό. Ο Tor Browser δεν θα ξεκινήσει μέχρι να διορθώσετε το σφάλμα και να επανεκκινησετε το Tor. -torlauncher.tor_exited=Ο Tor έκλεισε απροσδόκητα. Αυτό μπορεί να οφείλεται σε κάποιο bug του ίδιου του Tor, σε κάποιο άλλο πρόγραμμα στο σύστημά σας, ή σε ελαττωματικό υλικό. Εως ότου επανεκκινήσετε το Tor, ο περιηγητής Tor δεν θα είναι σε θέση να εμφανίσει οποιονδήποτε ιστότοπο. Αν το πρόβλημα εξακολουθεί, παρακαλώ στείλτε ένα αντίγραφο του αρχείου καταγραφής του Tor στην ομάδα υποστήριξης. -torlauncher.tor_exited2=Επανεκκίνηση του Tor δεν θα κλείσει τις καρτέλες browser σας. +torlauncher.tor_exited_during_startup=Το Tor έκλεισε κατά την εκκίνηση. Αυτό μπορεί να οφείλεται σε σφάλμα στο αρχείο torrc, σε σφάλμα στο Tor ή σε κάποιο άλλο πρόγραμμα στο σύστημά σας, ή σε ελαττωματικό υλικό. Ο Tor Browser δεν θα ξεκινήσει μέχρι να διορθώσετε το σφάλμα και να επανεκκινήσετε το Tor. +torlauncher.tor_exited=Ο Tor έκλεισε απροσδόκητα. Αυτό μπορεί να οφείλεται σε κάποιο σφάλμα του ίδιου του Tor, σε κάποιο άλλο πρόγραμμα στο σύστημά σας, ή σε ελαττωματικό υλικό. Εως ότου επανεκκινήσετε το Tor, ο περιηγητής Tor δεν θα είναι σε θέση να εμφανίσει οποιονδήποτε ιστότοπο. Αν το πρόβλημα παραμείνει, παρακαλώ στείλτε ένα αντίγραφο του αρχείου καταγραφής του Tor στην ομάδα υποστήριξης. +torlauncher.tor_exited2=Η επανεκκίνηση του Tor δεν θα κλείσει τις καρτέλες browser σας. torlauncher.tor_controlconn_failed=Δεν ήταν δυνατή η σύνδεση με την υποδοχη ελέγχου του Tor. torlauncher.tor_failed_to_start=Αδυναμία εκκίνησης του Tor. -torlauncher.tor_control_failed=Απέτυχε να πάρει τον έλεγχο του Tor. +torlauncher.tor_control_failed=Απέτυχε να ελέγξει το Tor. torlauncher.tor_bootstrap_failed=Το Tor απέτυχε να δημιουργήσει μια σύνδεση δικτύου Tor. torlauncher.tor_bootstrap_failed_details=%1$S απέτυχε (%2$S). @@ -34,10 +34,10 @@ torlauncher.bridge_suffix.meek-azure=(λειτουργεί στην Κίνα) torlauncher.request_a_bridge=Ζητήστε μία γέφυρα... torlauncher.request_a_new_bridge=Ζητήστε μία καινούρια γέφυρα... -torlauncher.contacting_bridgedb=Επικοινωνούμε με την γέφυραDB. Παρακαλώ, περιμένετε. +torlauncher.contacting_bridgedb=Επικοινωνούμε με την BridgeDB. Παρακαλώ, περιμένετε. torlauncher.captcha_prompt=Λύστε το CAPTCHA για να ζητήσετε γέφυρα. torlauncher.bad_captcha_solution=Η λύση δεν είναι σωστή. Παρακαλώ, προσπαθήστε ξανά. -torlauncher.unable_to_get_bridge=Είναι αδύνατο να βρεθεί γέφυρα από το BridgeDB.\n\n%S +torlauncher.unable_to_get_bridge=Είναι αδύνατο να βρεθεί γέφυρα από την BridgeDB.\n\n%S torlauncher.no_meek=Αυτός ο περιηγητής δεν είναι φτιαγμένος για meek, το οποίο χρειάζεται για να υπάρξει πρόσβαση σε γέφυρες. torlauncher.no_bridges_available=Δεν υπάρχουν διαθέσιμες γέφυρες αυτή τη στιγμή. Συγγνώμη. @@ -52,18 +52,18 @@ torlauncher.forAssistance2=Για βοήθεια, επισκεφτείτε %S torlauncher.copiedNLogMessages=Η αντιγραφή ολοκληρώθηκε. %S μηνύματα καταγραφής είναι έτοιμα να επικολληθούν σε ένα κειμενογράφο ή ένα μήνυμα ηλεκτρονικού ταχυδρομείου. -torlauncher.bootstrapStatus.conn_dir=Σύνδεση σε ενδιάμεσο (relay) κατάλογο +torlauncher.bootstrapStatus.conn_dir=Σύνδεση στη διεύθυνση αναμεταδοτών torlauncher.bootstrapStatus.handshake_dir=Πραγματοποιήθηκε σύνδεση σε κρυπτογραφημένο κατάλογο torlauncher.bootstrapStatus.requesting_status=Ανάκτηση της κατάστασης του δικτύου torlauncher.bootstrapStatus.loading_status=Φόρτωση της κατάστασης του δικτύου torlauncher.bootstrapStatus.loading_keys=Φόρτωση των πιστοποιητικών του φορέα -torlauncher.bootstrapStatus.requesting_descriptors=Γίνεται αίτηση για πληροφορίες των Ενδιάμεσων -torlauncher.bootstrapStatus.loading_descriptors=Φόρτωση πληροφοριών Ενδιάμεσου +torlauncher.bootstrapStatus.requesting_descriptors=Γίνεται αίτηση για πληροφορίες των αναμεταδοτών +torlauncher.bootstrapStatus.loading_descriptors=Φόρτωση πληροφοριών αναμεταδότη torlauncher.bootstrapStatus.conn_or=Δημιουργια σύνδεσης στο δίκτυο Tor torlauncher.bootstrapStatus.handshake_or=Σύνδεση σε ένα κύκλωμα Tor -torlauncher.bootstrapStatus.done=Συνδέθηκε στο δίκτυο Tor! +torlauncher.bootstrapStatus.done=Συνδεθήκατε στο δίκτυο Tor! -torlauncher.bootstrapWarning.done=εντάξει +torlauncher.bootstrapWarning.done=έγινε torlauncher.bootstrapWarning.connectrefused=απόρριψη σύνδεσης torlauncher.bootstrapWarning.misc=διάφορα torlauncher.bootstrapWarning.resourcelimit=ανεπαρκείς πόροι @@ -71,8 +71,8 @@ torlauncher.bootstrapWarning.identity=η ταυτότητα δεν ταιριά torlauncher.bootstrapWarning.timeout=λήξη χρονικού ορίου σύνδεσης torlauncher.bootstrapWarning.noroute=δεν βρέθηκε διαδρομή προς σύνδεση torlauncher.bootstrapWarning.ioerror=σφάλμα ανάγνωσης/εγγραφής -torlauncher.bootstrapWarning.pt_missing=Λείπει δυνατότητα σύνδεσης μεταφοράς. +torlauncher.bootstrapWarning.pt_missing=Λείπει το pluggable transport -torlauncher.nsresult.NS_ERROR_NET_RESET=Χάθηκε η σύνδεση στον διακομιστή. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Δεν έγινε σύνδεση στον διακομιστή. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Δεν έγινε σύνδεση στο διακομιστή μεσολάβησης. +torlauncher.nsresult.NS_ERROR_NET_RESET=Χάθηκε η σύνδεση στον server. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Δεν έγινε σύνδεση στον server. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Δεν έγινε σύνδεση στο proxy. diff --git a/src/chrome/locale/es-AR/torlauncher.properties b/src/chrome/locale/es-AR/torlauncher.properties index 1aa88ea..e3b43c4 100644 --- a/src/chrome/locale/es-AR/torlauncher.properties +++ b/src/chrome/locale/es-AR/torlauncher.properties @@ -4,30 +4,30 @@ torlauncher.error_title=Lanzador de Tor torlauncher.tor_exited_during_startup=Tor se cerró durante el arranque. Esto puede deberse a un error en tu archivo torrc, un fallo en Tor u otro programa en tu sistema, o componentes electrónicos defectuosos. Hasta que arregles el problema subyacente y reinicies Tor, el navegador Tor no arrancará. -torlauncher.tor_exited=Tor se cerró inesperadamente. Esto pudo ser debido a un error dentro de Tor, otro programa en tu sistema, o hardware defectuoso. Hasta que reinicies Tor, el navegador Tor no será capaz de acceder a sitios web. Si el problema persiste, por favor envía una copia de tu archivo de registro de Tor al equipo de soporte técnico. +torlauncher.tor_exited=Tor se cerró inesperadamente. Esto pudo ser debido a un error dentro de Tor, otro programa en tu sistema, o componentes electrónicos defectuoso. Hasta que reinicies Tor, el navegador Tor no será capaz de acceder a sitios web. Si el problema persiste, por favor enviá una copia de tu bitácora Tor al equipo de soporte técnico. torlauncher.tor_exited2=Reiniciar Tor no cerrará las pestañas de navegación. torlauncher.tor_controlconn_failed=No se pudo conectar Tor con el puerto de control torlauncher.tor_failed_to_start=Fallo al iniciar Tor torlauncher.tor_control_failed=Falló toma de control de Tor -torlauncher.tor_bootstrap_failed=Fallo al establecer una conexión con la red Tor +torlauncher.tor_bootstrap_failed=Fallo al establecer una conexión con la red de Tor torlauncher.tor_bootstrap_failed_details=%1$S falló (%2$S). torlauncher.unable_to_start_tor=No se puede iniciar Tor.\n\n%S -torlauncher.tor_missing=No se encuentra el archivo ejecutable de Tor +torlauncher.tor_missing=No se encuentra el archivo ejecutable de Tor. torlauncher.torrc_missing=No se encuentra el archivo torrc y no pudo ser creado. torlauncher.datadir_missing=El directorio de datos de Tor no existe y no pudo ser creado. torlauncher.password_hash_missing=Falló al conseguir contraseñas encriptadas. torlauncher.failed_to_get_settings=No se pudo acceder a las configuraciones de Tor.\n\n%S torlauncher.failed_to_save_settings=No se pudieron guardar las configuraciones de Tor\n\n%S -torlauncher.ensure_tor_is_running=Por favor, asegurese que Tor esta ejecutandose. +torlauncher.ensure_tor_is_running=Por favor, asegurate que Tor esté ejecutándose. -torlauncher.error_proxy_addr_missing=Debes especificar tu IP o el nombre de tu Host y un puerto para que Tor utilize un Proxy para acceder a internet. -torlauncher.error_proxy_type_missing=Debes seleccionar el tipo de Proxy. -torlauncher.error_bridges_missing=Debes especificar uno o más puentes. -torlauncher.error_default_bridges_type_missing=Debe seleccionar un tipo de transporte para los puentes provistos. +torlauncher.error_proxy_addr_missing=Debés especificar tanto una dirección IP, o el nombre de tu equipo, como un número de puerto para configurar Tor de manera que utilice un proxy para acceder a Internet. +torlauncher.error_proxy_type_missing=Debés seleccionar el tipo de proxy. +torlauncher.error_bridges_missing=Debés especificar uno o más puentes. +torlauncher.error_default_bridges_type_missing=Debés seleccionar un tipo de transporte para los puentes provistos. torlauncher.error_bridgedb_bridges_missing=Por favor solicitá un puente. -torlauncher.error_bridge_bad_default_type=No hay puentes disponibles que tengan el tipo de transporte %S. Por favor ajuste su configuración. +torlauncher.error_bridge_bad_default_type=No hay puentes disponibles que tengan el tipo de transporte %S. Por favor ajustá tu configuración. torlauncher.bridge_suffix.meek-amazon=(funciona en China) torlauncher.bridge_suffix.meek-azure=(funciona en China) @@ -47,31 +47,31 @@ torlauncher.quit=Quitar torlauncher.quit_win=Salir torlauncher.done=Hecho -torlauncher.forAssistance=Para solicitar asistencia, contactese al %S -torlauncher.forAssistance2=Para asistencia, visita %S +torlauncher.forAssistance=Para asistencia, contactá %S +torlauncher.forAssistance2=Para asistencia, visitá %S -torlauncher.copiedNLogMessages=Copia completa. %S registros de log de Tor están listos para ser pegados en un editor de textos o un e-mail. +torlauncher.copiedNLogMessages=Copia completa. %S registros de bitácora de Tor están listos para ser pegados en un editor de textos o un correo electrónico. -torlauncher.bootstrapStatus.conn_dir=Conectando para retransmitir directorio -torlauncher.bootstrapStatus.handshake_dir=Estableciendo una conexión segura al directorio -torlauncher.bootstrapStatus.requesting_status=Regresando el estado de la red de trabajo -torlauncher.bootstrapStatus.loading_status=Cargando el estado de la red de trabajo -torlauncher.bootstrapStatus.loading_keys=Cargando certificados de dominio -torlauncher.bootstrapStatus.requesting_descriptors=Solicitando información de retransmisión -torlauncher.bootstrapStatus.loading_descriptors=Cargando información de retransmisión -torlauncher.bootstrapStatus.conn_or=Conectando a la red Tor -torlauncher.bootstrapStatus.handshake_or=Estableciendo una ruta Tor -torlauncher.bootstrapStatus.done=¡Conectado a la red Tor! +torlauncher.bootstrapStatus.conn_dir=Conectando a un directorio de relevos +torlauncher.bootstrapStatus.handshake_dir=Estableciendo una conexión encriptada al directorio +torlauncher.bootstrapStatus.requesting_status=Obteniendo el estado de red +torlauncher.bootstrapStatus.loading_status=Cargando el estado de red +torlauncher.bootstrapStatus.loading_keys=Cargando certificados de autoridad +torlauncher.bootstrapStatus.requesting_descriptors=Solicitando información de relevos +torlauncher.bootstrapStatus.loading_descriptors=Cargando información de relevos +torlauncher.bootstrapStatus.conn_or=Conectando a la red de Tor +torlauncher.bootstrapStatus.handshake_or=Estableciendo un circuito Tor +torlauncher.bootstrapStatus.done=¡Conectado a la red de Tor! -torlauncher.bootstrapWarning.done=finalizado +torlauncher.bootstrapWarning.done=hecho torlauncher.bootstrapWarning.connectrefused=conexión rechazada torlauncher.bootstrapWarning.misc=misceláneo torlauncher.bootstrapWarning.resourcelimit=recursos insuficientes -torlauncher.bootstrapWarning.identity=error de indentificación -torlauncher.bootstrapWarning.timeout=tiempo de espera de conexión +torlauncher.bootstrapWarning.identity=identidad no coincidente +torlauncher.bootstrapWarning.timeout=tiempo de espera para conexión agotado torlauncher.bootstrapWarning.noroute=sin ruta al servidor torlauncher.bootstrapWarning.ioerror=error de lectura/escritura -torlauncher.bootstrapWarning.pt_missing=Perdida de la conectividad\n +torlauncher.bootstrapWarning.pt_missing=transporte insertable faltante torlauncher.nsresult.NS_ERROR_NET_RESET=La conexión al servidor fue perdida. torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=No se pudo conectar al servidor. diff --git a/src/chrome/locale/fa/network-settings.dtd b/src/chrome/locale/fa/network-settings.dtd index 10da60d..d194b7d 100644 --- a/src/chrome/locale/fa/network-settings.dtd +++ b/src/chrome/locale/fa/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "تنظیمات شبکه تور"> <!ENTITY torsettings.wizard.title.default "اتصال به تور"> <!ENTITY torsettings.wizard.title.configure "تنظیمات شبکه Tor"> -<!ENTITY torsettings.wizard.title.connecting "ارتباط برقرار شده است ."> +<!ENTITY torsettings.wizard.title.connecting "ارتباط پایدار است">  <!ENTITY torlauncher.localePicker.title "زبان مرورگر تور"> @@ -9,8 +9,8 @@  -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.connectPrompt "برای اتصال به تور بر روی "اتصال" کلیک کنید."> +<!ENTITY torSettings.configurePrompt "اگر شما در کشورهایی هستید که سعی می کنند تور را سانسور کنند (مانند مصر، چین، ترکیه)، یا اگر از یک شبکه خصوصی که نیاز به یک پروکسی دارد استفاده کنید؛ برای اعمال تنظیمات شبکه روی "پیکربندی" کلیک کنید."> <!ENTITY torSettings.configure "پیکربندی"> <!ENTITY torSettings.connect "اتصال"> @@ -25,9 +25,9 @@ <!ENTITY torsettings.optional "اختیاری"> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> +<!ENTITY torsettings.useProxy.checkbox "من برای دسترسی به اینترنت از پروکسی استفاده می‌کنم."> <!ENTITY torsettings.useProxy.type "نوع پراکسی:"> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> +<!ENTITY torsettings.useProxy.type.placeholder "یک نوع پروکسی را انتخاب کنید"> <!ENTITY torsettings.useProxy.address "آدرس:"> <!ENTITY torsettings.useProxy.address.placeholder "آدرس آی‌پی یا نام میزبان"> <!ENTITY torsettings.useProxy.port "پورت:"> @@ -38,21 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "به نظر می رسد شبکه ارتباطی شما به اینترنت، از یک فایروال استفاده می کند. یعنی فقط اجازه اتصال از یک سری درگاه های به خصوص را می دهد."> <!ENTITY torsettings.firewall.allowedPorts "پورت های مجاز:"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> +<!ENTITY torsettings.useBridges.checkbox "تور در کشور من فیلتر یا سانسور شده است"> +<!ENTITY torsettings.useBridges.default "پل ساخته شده را انتخاب کنید"> +<!ENTITY torsettings.useBridges.default.placeholder "یک پل انتخاب کنید"> +<!ENTITY torsettings.useBridges.bridgeDB "درخواست یک پل از torproject.org"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "حروف موجود در تصویر را وارد کنید"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "یک چالش جدید داشته باشید"> <!ENTITY torsettings.useBridges.captchaSubmit "ثبت کردن"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> -<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> +<!ENTITY torsettings.useBridges.custom "یک پل فراهم کنید که من می‌شناسم."> +<!ENTITY torsettings.useBridges.label "اطلاعات پل را از یک منبع مورد اعتماد وارد کنید."> +<!ENTITY torsettings.useBridges.placeholder "نوع آدرس: درگاه - پورت (هر کدام در یک خط)"> <!ENTITY torsettings.copyLog "کپی گزارش وقایع تور"> <!ENTITY torsettings.proxyHelpTitle "کمک پروکسی"> -<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings."> +<!ENTITY torsettings.proxyHelp1 "اگر از طریق شبکه‌ی یک شرکت، مدرسه، یا دانشگاه به اینترنت متصل می‌شوید، ممکن است احتیاج به یک پروکسی داخلی داشته باشید. اگر از احتیاج به پروکسی داخلی مطمئن نیستید، به تنظیمات شبکه یک مرورگر دیگر یا تنظیمات شبکه سیستم خود نگاه کنید."> <!ENTITY torsettings.bridgeHelpTitle "کمک برای پل ارتباطی"> <!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> diff --git a/src/chrome/locale/he/network-settings.dtd b/src/chrome/locale/he/network-settings.dtd index 1b6ff51..135530f 100644 --- a/src/chrome/locale/he/network-settings.dtd +++ b/src/chrome/locale/he/network-settings.dtd @@ -10,15 +10,15 @@  <!ENTITY torSettings.connectPrompt "לחץ על “התחבר“ כדי להתחבר אל Tor."> -<!ENTITY torSettings.configurePrompt "לחץ על ”הגדר“ כדי להתאים הגדרות רשת אם אתה במדינה שמצנזרת את Tor (למשל מצרים, סין וטורקיה) או אם אתה מתחבר מרשת פרטית הדורשת ייפוי־כוח."> -<!ENTITY torSettings.configure "הגדר"> +<!ENTITY torSettings.configurePrompt "לחץ על ”תצר“ כדי להתאים הגדרות רשת אם אתה במדינה שמצנזרת את Tor (למשל מצרים, סין וטורקיה) או אם אתה מתחבר מרשת פרטית הדורשת ייפוי־כוח."> +<!ENTITY torSettings.configure "תצר"> <!ENTITY torSettings.connect "התחבר">  <!ENTITY torsettings.startingTor "ממתין אל Tor להתחיל..."> <!ENTITY torsettings.restartTor "הפעל מחדש את Tor"> -<!ENTITY torsettings.reconfigTor "הגדר מחדש"> +<!ENTITY torsettings.reconfigTor "תצר מחדש"> <!ENTITY torsettings.discardSettings.prompt "הגדרת גשרי Tor או הכנסת הגדרות ייפוי־כוח מקומי.  כדי לעשות חיבור ישיר לרשת Tor, הגדרות אלו חייבות להיות מוסרות."> <!ENTITY torsettings.discardSettings.proceed "הסר הגדרות והתחבר"> diff --git a/src/chrome/locale/he/torlauncher.properties b/src/chrome/locale/he/torlauncher.properties index 29f2c1f..68c61e1 100644 --- a/src/chrome/locale/he/torlauncher.properties +++ b/src/chrome/locale/he/torlauncher.properties @@ -22,7 +22,7 @@ torlauncher.failed_to_get_settings=לא היה ניתן לאחזר הגדרות torlauncher.failed_to_save_settings=לא היה ניתן לשמור הגדרות Tor.\n\n%S torlauncher.ensure_tor_is_running=אנא וודא כי Tor פועל. -torlauncher.error_proxy_addr_missing=אתה חייב לציין כתובת IP או שם מארח וגם מספר פתחה כדי להגדיר את Tor להשתמש בייפוי־כוח כדי לגשת לאינטרנט. +torlauncher.error_proxy_addr_missing=אתה חייב לציין כתובת IP או שם מארח וגם מספר פתחה כדי לתצר את Tor להשתמש בייפוי־כוח כדי לגשת לאינטרנט. torlauncher.error_proxy_type_missing=אתה חייב לבחור את סוג ייפוי־הכוח. torlauncher.error_bridges_missing=אתה חייב לציין גשר אחד או יותר. torlauncher.error_default_bridges_type_missing=אתה חייב לבחור סוג תעבורה עבור הגשרים המסופקים. @@ -38,7 +38,7 @@ torlauncher.contacting_bridgedb=יוצר קשר עם BridgeDB. אנא המתן. torlauncher.captcha_prompt=פתור את ה־CAPTCHA כדי לבקש גשר. torlauncher.bad_captcha_solution=הפתרון אינו נכון. אנא נסה שוב. torlauncher.unable_to_get_bridge=לא היה ניתן להשיג גשר מן BridgeDB.\n\n%S -torlauncher.no_meek=דפדפן זה אינו מוגדר עבור meek, אשר דרוש כדי להשיג גשרים. +torlauncher.no_meek=דפדפן זה אינו מתוצר עבור meek, אשר דרוש כדי להשיג גשרים. torlauncher.no_bridges_available=אין גשרים זמינים הפעם. סליחה. torlauncher.connect=התחבר diff --git a/src/chrome/locale/is/network-settings.dtd b/src/chrome/locale/is/network-settings.dtd index 4676680..33e81fb 100644 --- a/src/chrome/locale/is/network-settings.dtd +++ b/src/chrome/locale/is/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Smelltu á "Tengjast" til að tengjast við Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Smelltu á “Stilla” til að breyta netstillingum ef þú ert í landi sem ritskoðar umferð um Tor (svo sem Egyptalandi, Kína, Tyrklandi) eða ef þú ert að tengjast af einkaneti sem krefst þess að fara um milliþjón."> <!ENTITY torSettings.configure "Stilla"> <!ENTITY torSettings.connect "Tengjast"> @@ -20,7 +20,7 @@ <!ENTITY torsettings.restartTor "Endurræsa Tor"> <!ENTITY torsettings.reconfigTor "Endurstilla"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> +<!ENTITY torsettings.discardSettings.prompt "Þú hefur sett upp brýr fyrir Tor eða að þú hefur farið inn í stillingar milliþjóns á kerfinu.  Til að útbúa beina tengingu inn á Tor-netið, þá verður að fjarlægja þessar stillingar."> <!ENTITY torsettings.discardSettings.proceed "Fjarlægja stillingar og tengjast"> <!ENTITY torsettings.optional "Valkvætt"> @@ -36,7 +36,7 @@ <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> +<!ENTITY torsettings.firewall.checkbox "Þessi tölva tengist í gegnum eldvegg sem leyfir einungis tengingar í gegnum tilteknar gáttir"> <!ENTITY torsettings.firewall.allowedPorts "Leyfðar gáttir:"> <!ENTITY torsettings.useBridges.checkbox "Tor er ritskoðað í landinu mínu"> <!ENTITY torsettings.useBridges.default "Veldu innbyggða brú"> @@ -55,8 +55,8 @@ <!ENTITY torsettings.proxyHelp1 "Hugsanlega þarf að nota staðværan milliþjón (proxy) þegar tengst er í gegnum net fyrirtækis, skóla eða stofnunar. Ef þú ert ekki viss hvort þurfi að nota milliþjón, kíktu þá á netstillingarnar í einhverjum öðrum vafra eða á uppsetningu netsins í stýrikerfinu þínu."> <!ENTITY torsettings.bridgeHelpTitle "Hjálp fyrir brúaendurvarpa"> -<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> -<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelp1 "Brýr eru faldir endurvarpar sem gera erfiðara að loka á tengingar á Tor netinu.  Hver tegund af brúm notar mismunandi aðferðir til að forðast ritskoðun.  obfs-brýrnar láta netumferðina þína líta út sem handahófskennt suð og meek-brýr láta netumferðina þína líta út fyrir að tengjast þeirri þjónustu í staðinn fyrir Tor."> +<!ENTITY torsettings.bridgeHelp2 "Vegna þess hvernig sum lönd reyna að loka á umferð um Tor, munu sumar brýr virka í sumum löndum en aðrar ekki.  Ef þú ert ekki viss um hvaða brýr virka í landinu þínu, skaltu skoða torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Bíddu aðeins á meðan tengingu er komið á við Tor-netið.  Það getur tekið nokkrar mínútur."> diff --git a/src/chrome/locale/is/torlauncher.properties b/src/chrome/locale/is/torlauncher.properties index c68bbdc..1e51efd 100644 --- a/src/chrome/locale/is/torlauncher.properties +++ b/src/chrome/locale/is/torlauncher.properties @@ -3,8 +3,8 @@ torlauncher.error_title=Tor-ræsir -torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. -torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. +torlauncher.tor_exited_during_startup=Tor hætti óvænt í ræsingu. Þetta gæti verið villa í torrc-skránni, í sjálfum Tor, öðru forriti á kerfinu þínu eða galli í vélbúnaði. Þar til þú endurræsir Tor mun Tor-vafrinn ekki geta tengst neinum vefsvæðum. Ef undirliggjandi vandamál er ekki leyst og Tor endurræst, þá mun Tor-vafrinn ekki fara í gang. +torlauncher.tor_exited=Tor hætti óvænt. Þetta gæti verið villa í sjálfum Tor, öðru forriti á kerfinu þínu eða galli í vélbúnaði. Þar til þú endurræsir Tor mun Tor-vafrinn ekki geta tengst neinum vefsvæðum. Ef vandamálið er viðvarandi, skaltu senda atvikaskrá Tor (log) til aðstoðarteymisins. torlauncher.tor_exited2=Endurræsing Tor mun ekki loka flipum vafrans. torlauncher.tor_controlconn_failed=Gat ekki tengst stýrigátt Tor. torlauncher.tor_failed_to_start=Tor ræstist ekki. @@ -22,12 +22,12 @@ torlauncher.failed_to_get_settings=Tókst ekki að nálgast stillingar fyrir Tor torlauncher.failed_to_save_settings=Tókst ekki að vista stillingar fyrir Tor.\n\n%S torlauncher.ensure_tor_is_running=Gakktu úr skugga um að Tor sé keyrandi. -torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. +torlauncher.error_proxy_addr_missing=Þú þarft að tilgreina bæði IP-vistfang eða vélarheiti og númer gáttar til að setja Tor í að nota milliþjón (proxy) fyrir aðgang að internetinu. torlauncher.error_proxy_type_missing=Þú verður að velja tegund milliþjóns. torlauncher.error_bridges_missing=Þú verður að tilgreina eina eða fleiri brýr. -torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. +torlauncher.error_default_bridges_type_missing=Þú verður að tilgreina gerð tengileiðar fyrir þessar brýr. torlauncher.error_bridgedb_bridges_missing=Biðja um brú. -torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. +torlauncher.error_bridge_bad_default_type=Engar meðfylgjandi brýr sem eru með tengileiðina %S eru til taks. Lagaðu stillingarnar þínar. torlauncher.bridge_suffix.meek-amazon=(virkar í Kína) torlauncher.bridge_suffix.meek-azure=(virkar í Kína) @@ -50,10 +50,10 @@ torlauncher.done=Búið torlauncher.forAssistance=Til að fá hjálp, hafðu samband við %S torlauncher.forAssistance2=Til að fá hjálp, heimsæktu %S -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=Afritun lokið. %S færslur úr Tor-atvikaskrá eru tilbúnar til að líma inn í textaritil eða tölvupóst. -torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory -torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection +torlauncher.bootstrapStatus.conn_dir=Tengist við yfirlitsskrá um endurvarpa +torlauncher.bootstrapStatus.handshake_dir=Kem á tengingu við dulritaða yfirlitsskrá torlauncher.bootstrapStatus.requesting_status=Næ í stöðu netkerfis torlauncher.bootstrapStatus.loading_status=Hleð inn stöðu netkerfis torlauncher.bootstrapStatus.loading_keys=Hleð inn skilríkjum vottunarstöðvar @@ -69,7 +69,7 @@ torlauncher.bootstrapWarning.misc=ýmislegt torlauncher.bootstrapWarning.resourcelimit=ekki nægileg tilföng torlauncher.bootstrapWarning.identity=auðkenni samsvara ekki torlauncher.bootstrapWarning.timeout=tenging féll á tíma -torlauncher.bootstrapWarning.noroute=no route to host +torlauncher.bootstrapWarning.noroute=engin leið til hýsils torlauncher.bootstrapWarning.ioerror=les/skrifvilla torlauncher.bootstrapWarning.pt_missing=vantar 'pluggable transport' tengileiðir diff --git a/src/chrome/locale/ka/network-settings.dtd b/src/chrome/locale/ka/network-settings.dtd index ac1e9a4..72017f1 100644 --- a/src/chrome/locale/ka/network-settings.dtd +++ b/src/chrome/locale/ka/network-settings.dtd @@ -4,7 +4,7 @@ <!ENTITY torsettings.wizard.title.connecting "კავშირის დამყარება">  -<!ENTITY torlauncher.localePicker.title "Tor-ის ბრაუზერის ენა"> +<!ENTITY torlauncher.localePicker.title "Tor-ბრაუზერის ენა"> <!ENTITY torlauncher.localePicker.prompt "გთხოვთ, აირჩიოთ ენა.">  @@ -20,16 +20,16 @@ <!ENTITY torsettings.restartTor "Tor-ის ხელახლა გაშვება"> <!ENTITY torsettings.reconfigTor "ხელახლა გამართვა"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> +<!ENTITY torsettings.discardSettings.prompt "თქვენ გამართული გაქვთ Tor-ის გადამცემი ხიდები ან მითითებული გაქვთ ადგილობრივი პროქსის პარამეტრები.  Tor-ქსელთან პირდაპირ დასაკავშირებლად, საჭიროა ამ პარამეტრების მოცილება."> <!ENTITY torsettings.discardSettings.proceed "პარამეტრების მოცილება და დაკავშირება"> -<!ENTITY torsettings.optional "დამატებითი"> +<!ENTITY torsettings.optional "არასავალდებულო"> <!ENTITY torsettings.useProxy.checkbox "ინტერნეტთან დასაკავშირებლად პროქსის ვიყენებ"> <!ENTITY torsettings.useProxy.type "პროქსის სახეობა:"> <!ENTITY torsettings.useProxy.type.placeholder "მიუთითეთ პროქსის სახეობა"> <!ENTITY torsettings.useProxy.address "მისამართი"> -<!ENTITY torsettings.useProxy.address.placeholder "IP მისამართი ან დასახელება"> +<!ENTITY torsettings.useProxy.address.placeholder "IP-მისამართი ან დასახელება"> <!ENTITY torsettings.useProxy.port "პორტი:"> <!ENTITY torsettings.useProxy.username "მომხმარებლის სახელი:"> <!ENTITY torsettings.useProxy.password "პაროლი"> @@ -39,24 +39,24 @@ <!ENTITY torsettings.firewall.checkbox "კომპიუტერი ინტერნეტს უკავშირდება ქსელის ფარის გავლით, რომელშიც მხოლოდ ცალკეული პორტებია დაშვებული"> <!ENTITY torsettings.firewall.allowedPorts "დაშვებული პორტები:"> <!ENTITY torsettings.useBridges.checkbox "Tor შეზღუდულია ჩემს ქვეყანაში"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> +<!ENTITY torsettings.useBridges.default "ჩაშენებული გადამცემი ხიდის მითითება"> +<!ENTITY torsettings.useBridges.default.placeholder "ხიდის მითითება"> +<!ENTITY torsettings.useBridges.bridgeDB "გადამცემი ხიდის მოთხოვნა საიტიდან torproject.org"> <!ENTITY torsettings.useBridges.captchaSolution.placeholder "შეიყვანეთ სურათზე მოცემული სიმბოლოები"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "ახალი გამოწვევა"> -<!ENTITY torsettings.useBridges.captchaSubmit "წარუდგინოს"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "ახალი კოდის მიღება"> +<!ENTITY torsettings.useBridges.captchaSubmit "გაგზავნა"> +<!ENTITY torsettings.useBridges.custom "ნაცნობი გადამცემი ხიდის მითითება"> +<!ENTITY torsettings.useBridges.label "გადამცემი ხიდის მონაცემების მითითება სანდო წყაროდან."> <!ENTITY torsettings.useBridges.placeholder "აკრიფეთ მისამართი:პორტი (თითო ცალკე ხაზზე)"> <!ENTITY torsettings.copyLog "Tor-ის აღრიცხვის ჩანაწერების დაკოპირება"> <!ENTITY torsettings.proxyHelpTitle "პროქსი — დახმარება"> -<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings."> +<!ENTITY torsettings.proxyHelp1 "ადგილობრივი პროქსი მაშინაა საჭირო, როცა ინტერნეტს უკავშირდებით კომპანიის, სკოლის ან უნივერსიტეტის ქსელის გავლით. თუ დარწმუნებული არ ხართ პროქსის საჭიროებაში, გადახედეთ ინტერნეტის პარამეტრებს სხვა ბრაუზერში ან იხილეთ სისტემის ქსელის პარამეტრები."> -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> -<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelpTitle "დახმარება გადამცემი ხიდის თაობაზე"> +<!ENTITY torsettings.bridgeHelp1 "ხიდები წარმოადგენს აღუნუსხავ გადამცემებს, რომელთა გამოყენებაც ართულებს Tor-ქსელთან კავშირის შეზღუდვას.  თითოეული სახის ხიდი იყენებს განსხვავებულ საშუალებებს, ცენზურის ასარიდებლად.  obfs-გადამყვანი, გადაცემულ მონაცემებს წარმოადგენს შემთხვევითი ხმაურის სახით, ხოლო meek-გადამყვანი კი თქვენს მონაცემთა მიმოცვლას წარმოაჩენს ისე, თითქოს ცალკეულ მომსახურებას უკავ შირდებით და არა Tor-ს."> +<!ENTITY torsettings.bridgeHelp2 "იმისდა მიხედვით, თუ როგორ ზღუდავს ცალკეული ქვეყანა Tor-ს, გარკვეული სახის გადამცემი ხიდები, მხოლოდ შესაბამის ქვეყნებში იმუშავებს და არა სხგავან.  თუ დანამდვილებით არ იცით, რომელი გადამცემი მუშაობს თქვენს ქვეყანაში, ეწვიეთ დახმარების გვერდს torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "გთხოვთ, მოითმინოთ სანამ დაუკავშირდება Tor-ქსელს.  რამდენიმე წუთს შეიძლება გასტანოს."> diff --git a/src/chrome/locale/ka/torlauncher.properties b/src/chrome/locale/ka/torlauncher.properties index 2218a43..48a7acf 100644 --- a/src/chrome/locale/ka/torlauncher.properties +++ b/src/chrome/locale/ka/torlauncher.properties @@ -3,18 +3,18 @@ torlauncher.error_title=Tor-ის გამშვები -torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. -torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. -torlauncher.tor_exited2=Tor-ის ხელახლა ჩართვით თქვენი ბრაუზერის ჩანართები არ დაიხურება. -torlauncher.tor_controlconn_failed=Could not connect to Tor control port. +torlauncher.tor_exited_during_startup=Tor მოულოდნელად დაიხურა გაშვებისას. ამის მიზეზი შესაძლოა იყოს შეცდომა torrc-ფაილში, Tor-ის ხარვეზი, სისტემაში არსებული სხვა პროგრამა ან დაზიანებული აპარატურა. სანამ აღნიშნულ გაუმართაობას არ გამოასწორებთ და Tor-ს ხელახლა არ გაუშვებთ, Tor-ბრაუზერი არ ჩაირთვება. +torlauncher.tor_exited=Tor მოულოდნელად დაიხურა. ამის მიზეზი შესაძლოა იყოს თავად Tor-ის ხარვეზი, სისტემაში არსებული სხვა პროგრამა ან დაზიანებული აპარატურა. Tor-ის ხელახლა გაშვების გარეშე, Tor-ბრაუზერი ვერ შეძლებს საიტების გახსნას. თუ გაუმართაობა არ მოგვარდება, გთხოვთ, გადაუგზავნოთ Tor-ის აღრიცხვის ჩანაწერის ასლი მხარდაჭერის გუნდს. +torlauncher.tor_exited2=Tor-ის ხელახლა გაშვებით, თქვენი ბრაუზერის ჩანართები არ დაიხურება. +torlauncher.tor_controlconn_failed=Tor-ის მართვის პორტთან დაკავშირება ვერ ხერხდება. torlauncher.tor_failed_to_start=Tor-ის გაშვება ვერ მოხერხდა. torlauncher.tor_control_failed=Tor-ის მართვა ვერ ხერხდება. torlauncher.tor_bootstrap_failed=Tor ვერ ახერხებს Tor-ქსელთან კავშირის დამყარებას. -torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). +torlauncher.tor_bootstrap_failed_details=%1$S ვერ მოხერხდა (%2$S). torlauncher.unable_to_start_tor=Tor-ის გაშვება ვერ ხერხდება.\n\n%S torlauncher.tor_missing=Tor-ის გამშვები ვერ მოიძებნა. -torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.torrc_missing=torrc-ფაილი ვერ მოინახა და ვერ შეიქმნება. torlauncher.datadir_missing=Tor-ის მონაცემთა საქაღალდე არ არსებობს და ვერ შეიქმნება. torlauncher.password_hash_missing=ჰეშირებული პაროლის მიღება ვერ მოხერხდა. @@ -22,57 +22,57 @@ torlauncher.failed_to_get_settings=Tor-ის პარამეტრები torlauncher.failed_to_save_settings=Tor-ის პარამეტრების შენახვა ვერ ხერხდება.\n\n%S torlauncher.ensure_tor_is_running=გთხოვთ დარწმუნდეთ, რომ Tor გაშვებულია. -torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. -torlauncher.error_proxy_type_missing=You must select the proxy type. -torlauncher.error_bridges_missing=You must specify one or more bridges. -torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. -torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. +torlauncher.error_proxy_addr_missing=თქვენ უნდა მიუთითოთ ორივე, IP-მისამართი ან დასახელება და პორტის ნომერი, რომ Tor დაუკავშირდეს ინტერნეტს პროქსის საშუალებით. +torlauncher.error_proxy_type_missing=უნდა მიუთითოთ პროქსის სახეობა. +torlauncher.error_bridges_missing=უნდა მიუთითოთ ერთი ან რამდენიმე გადამცემი ხიდი. +torlauncher.error_default_bridges_type_missing=უნდა მიუთითოთ გადამყვანის სახეობა, მოცემული გადამცემი ხიდებისთვის. +torlauncher.error_bridgedb_bridges_missing=გთხოვთ, მოითხოვოთ გადამცემი ხიდი. +torlauncher.error_bridge_bad_default_type=არცერთი მოცემული გადამცემ ხიდისთვის, %S სახის გადამყვანი არაა ხელმისაწვდომი. გთხოვთ გამართოთ თქვენი პარამეტრები. -torlauncher.bridge_suffix.meek-amazon=(works in China) -torlauncher.bridge_suffix.meek-azure=(works in China) +torlauncher.bridge_suffix.meek-amazon=(მუშაობს ჩინეთში) +torlauncher.bridge_suffix.meek-azure=(მუშაობს ჩინეთში) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.request_a_bridge=გადამცემი ხიდის მოთხოვნა... +torlauncher.request_a_new_bridge=ახალი გადამცემი ხიდის მოთხოვნა... +torlauncher.contacting_bridgedb=დაკავშირება BridgeDB-სთან. გთხოვთ, მოითმინოთ. +torlauncher.captcha_prompt=გაიარეთ CAPTCHA, გადამცემი ხიდის მოთხოვნისთვის. +torlauncher.bad_captcha_solution=გადაწყვეტა არასწორია. გთხოვთ სცადოთ ხელახლა. +torlauncher.unable_to_get_bridge=გადამცემი ხიდების მიღება BridgeDB-იდან ვერ ხერხდება.\n\n%S +torlauncher.no_meek=ბრაუზერი არაა გამართული meek-ისთვის, რომელიც საჭიროა გადამცემი ხიდების მისაღებად. +torlauncher.no_bridges_available=ამჟამად გადამცემი ხიდები არაა ხელმისაწვდომი. ვწუხვართ. torlauncher.connect=დაკავშირება torlauncher.restart_tor=Tor-ის ხელახლა გაშვება -torlauncher.quit=Quit +torlauncher.quit=დახურვა torlauncher.quit_win=გასვლა torlauncher.done=შესრულებულია -torlauncher.forAssistance=For assistance, contact %S -torlauncher.forAssistance2=For assistance, visit %S +torlauncher.forAssistance=დახმარებისთვის დაუკავშირდით %S +torlauncher.forAssistance2=დახმარებისთვის ეწვიეთ %S -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=დაკოპირება დასრულებულია. %S Tor-ის აღრიცხვის ჩანაწერები მზადაა ტექსტურ რედაქტორში ან ელფოსტის წერილში ჩასასმელად. -torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory -torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection -torlauncher.bootstrapStatus.requesting_status=Retrieving network status -torlauncher.bootstrapStatus.loading_status=Loading network status -torlauncher.bootstrapStatus.loading_keys=Loading authority certificates -torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information -torlauncher.bootstrapStatus.loading_descriptors=Loading relay information +torlauncher.bootstrapStatus.conn_dir=გადამცემთა ცნობართან დაკავშირება +torlauncher.bootstrapStatus.handshake_dir=დაშიფრული კავშირის დამყარება ცნობართან +torlauncher.bootstrapStatus.requesting_status=ქსელის მდგომარეობის დადგენა +torlauncher.bootstrapStatus.loading_status=ქსელის მდგომარეობის ჩატვირთვა +torlauncher.bootstrapStatus.loading_keys=უფლებამოსილი სერტიფიკატების ჩატვირთვა +torlauncher.bootstrapStatus.requesting_descriptors=გადამცემის მონაცემების მოთხოვნა +torlauncher.bootstrapStatus.loading_descriptors=გადამცემის მონაცემების ჩატვირთვა torlauncher.bootstrapStatus.conn_or=უკავშირდება Tor-ქსელს -torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit -torlauncher.bootstrapStatus.done=Connected to the Tor network! +torlauncher.bootstrapStatus.handshake_or=Tor-ის კავშირის წრედის დამყარება +torlauncher.bootstrapStatus.done=Tor-ქსელთან დაკავშირებულია! -torlauncher.bootstrapWarning.done=done -torlauncher.bootstrapWarning.connectrefused=connection refused -torlauncher.bootstrapWarning.misc=miscellaneous -torlauncher.bootstrapWarning.resourcelimit=insufficient resources -torlauncher.bootstrapWarning.identity=identity mismatch -torlauncher.bootstrapWarning.timeout=connection timeout -torlauncher.bootstrapWarning.noroute=no route to host -torlauncher.bootstrapWarning.ioerror=read/write error -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.bootstrapWarning.done=მზადაა +torlauncher.bootstrapWarning.connectrefused=კავშირი უარყოფილია +torlauncher.bootstrapWarning.misc=სხვადასხვა +torlauncher.bootstrapWarning.resourcelimit=არასაკმარისი რესურსები +torlauncher.bootstrapWarning.identity=მოწმობა არ ემთხვევა +torlauncher.bootstrapWarning.timeout=კავშირის ვადა +torlauncher.bootstrapWarning.noroute=მისამართი არაა აღნიშნული +torlauncher.bootstrapWarning.ioerror=წაკითხვა/ჩაწერის შეცდომა +torlauncher.bootstrapWarning.pt_missing=მისაერთებელი გადამყვანი ვერ მოიძებნა -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=სერვერთან კავშირი დაიკარგა. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=სერვერთან დაკავშირება ვერ ხერხდება. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=პროქსისთან დაკავშირება ვერ ხერხდება. diff --git a/src/chrome/locale/nl/torlauncher.properties b/src/chrome/locale/nl/torlauncher.properties index 9b19476..3807906 100644 --- a/src/chrome/locale/nl/torlauncher.properties +++ b/src/chrome/locale/nl/torlauncher.properties @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=Je moet zowel een IP-adres of hostnaam en e torlauncher.error_proxy_type_missing=Je moet het proxy-type kiezen. torlauncher.error_bridges_missing=Je moet één of meerdere bridges opgeven. torlauncher.error_default_bridges_type_missing=Je moet een transport-type selecteren voor de verstrekte bridges. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=Selekteer s.v.p. een brug. torlauncher.error_bridge_bad_default_type=Géén van de verstrekte bridges met het transport-type %S zijn beschikbaar. Pas aub je instellingen aan. torlauncher.bridge_suffix.meek-amazon=(Werkt in China) torlauncher.bridge_suffix.meek-azure=(werkt in China) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… +torlauncher.request_a_bridge=Verzoek een brug... +torlauncher.request_a_new_bridge=Verzoek een Nieuwe Brug... torlauncher.contacting_bridgedb=Contact maken met BridgeDB. Een ogenblik. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. +torlauncher.captcha_prompt=Los de CAPTCHA op om een brug te verzoeken. torlauncher.bad_captcha_solution=De oplossing is niet correct. Probeer opnieuw. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S +torlauncher.unable_to_get_bridge=Kan geen brug verkrijgen van BridgeDB.\n\n%S torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.no_bridges_available=Geen bruggen zijn beschikbaar op dit moment. Sorry. torlauncher.connect=Verbind torlauncher.restart_tor=Herstart Tor diff --git a/src/chrome/locale/zh-TW/network-settings.dtd b/src/chrome/locale/zh-TW/network-settings.dtd index 8a90487..d32caea 100644 --- a/src/chrome/locale/zh-TW/network-settings.dtd +++ b/src/chrome/locale/zh-TW/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "點擊"連接"來連上 Tor "> -<!ENTITY torSettings.configurePrompt "如果您處於會監視tor網絡的國家（例如埃及，中國，土耳其）或者您位於私人網絡中，需要代理訪問互聯網。請點擊“配置”更改網絡設置。"> +<!ENTITY torSettings.configurePrompt "如果您處於會監視tor網絡的國家（例如埃及，中國，土耳其）或者您位於私人網路中，需要代理訪問互聯網。請點擊，「設定」更改網路設置。"> <!ENTITY torSettings.configure "設定"> <!ENTITY torSettings.connect "連接"> @@ -41,8 +41,8 @@ <!ENTITY torsettings.useBridges.checkbox "我的國家中 Tor 受到審查"> <!ENTITY torsettings.useBridges.default "選擇內建的橋接"> <!ENTITY torsettings.useBridges.default.placeholder "選擇網橋"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> +<!ENTITY torsettings.useBridges.bridgeDB "從 torproject.org 請求網橋"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "輸入圖片中的文字"> <!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> <!ENTITY torsettings.useBridges.captchaSubmit "提交"> <!ENTITY torsettings.useBridges.custom "提供一個認識的橋接 ">

1 0

[torbutton/master] Release preparations for 2.1.1
by gk＠torproject.org 19 Oct '18

19 Oct '18

commit d343226ef34e037ceb5dafec9242da80e380287b Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 19 07:35:04 2018 +0000 Release preparations for 2.1.1 Changelog update and version bump --- src/CHANGELOG | 6 ++++++ src/install.rdf | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 8bffbe8b..468d2a99 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,9 @@ +2.1.1 + * Bug 23925+27959: Donation banner for year end 2018 campaign + * Bug 24172: Donation banner clobbers Tor Browser version string + * Bug 28082: Add locales cs, el, hu, ka + * Translations update + 2.1 * Bug 27175: Add pref to allow users to persist custom noscript settings * Bug 27760: Use new NoScript API for IPC and fix about:blank issue diff --git a/src/install.rdf b/src/install.rdf index 5df0f129..fcd857a4 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>2.1</em:version> + <em:version>2.1.1</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[tor-browser/tor-browser-60.2.1esr-8.5-1] Bug 1448014 - avoid needless flattening in AndroidDecoderModule; r=jesup
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit 1e7ee8ad5a57315bda89fb5b1f7fba49e63ccce4 Author: Nathan Froyd <froydnj(a)mozilla.com> Date: Mon Jun 18 15:27:06 2018 -0400 Bug 1448014 - avoid needless flattening in AndroidDecoderModule; r=jesup --- dom/media/platforms/android/AndroidDecoderModule.cpp | 12 +++++++----- dom/media/platforms/android/AndroidDecoderModule.h | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dom/media/platforms/android/AndroidDecoderModule.cpp b/dom/media/platforms/android/AndroidDecoderModule.cpp index df32d9b2f4fd..bffefde46a36 100644 --- a/dom/media/platforms/android/AndroidDecoderModule.cpp +++ b/dom/media/platforms/android/AndroidDecoderModule.cpp @@ -33,15 +33,17 @@ namespace mozilla { mozilla::LazyLogModule sAndroidDecoderModuleLog("AndroidDecoderModule"); -const char* +const nsCString TranslateMimeType(const nsACString& aMimeType) { if (VPXDecoder::IsVPX(aMimeType, VPXDecoder::VP8)) { - return "video/x-vnd.on2.vp8"; + static NS_NAMED_LITERAL_CSTRING(vp8, "video/x-vnd.on2.vp8"); + return vp8; } else if (VPXDecoder::IsVPX(aMimeType, VPXDecoder::VP9)) { - return "video/x-vnd.on2.vp9"; + static NS_NAMED_LITERAL_CSTRING(vp9, "video/x-vnd.on2.vp9"); + return vp9; } - return PromiseFlatCString(aMimeType).get(); + return nsCString(aMimeType); } static bool @@ -112,7 +114,7 @@ AndroidDecoderModule::SupportsMimeType( } return java::HardwareCodecCapabilityUtils::FindDecoderCodecInfoForMimeType( - nsCString(TranslateMimeType(aMimeType))); + TranslateMimeType(aMimeType)); } already_AddRefed<MediaDataDecoder> diff --git a/dom/media/platforms/android/AndroidDecoderModule.h b/dom/media/platforms/android/AndroidDecoderModule.h index 86a0766c36e6..4f67965d2b3a 100644 --- a/dom/media/platforms/android/AndroidDecoderModule.h +++ b/dom/media/platforms/android/AndroidDecoderModule.h @@ -31,7 +31,7 @@ private: extern LazyLogModule sAndroidDecoderModuleLog; -const char* +const nsCString TranslateMimeType(const nsACString& aMimeType); } // namespace mozilla

1 0

[tor-browser/tor-browser-60.2.1esr-8.5-1] Bug 1441345 - Force the use of the Linux phishing list on Android. r=dimi, a=pascalc
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit 9ec06f1b4bb17e562e10cb7d39e1af8370522538 Author: Francois Marier <francois(a)mozilla.com> Date: Wed Sep 12 18:07:26 2018 +0300 Bug 1441345 - Force the use of the Linux phishing list on Android. r=dimi, a=pascalc Reviewers: dimi Reviewed By: dimi Subscribers: dveditz, francois, dimi Bug #: 1441345 Differential Revision: https://phabricator.services.mozilla.com/D5479 --HG-- extra : source : 3fa9372e4c5f05713fe1a9f758487fa443ce7500 --- .../url-classifier/nsUrlClassifierUtils.cpp | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/toolkit/components/url-classifier/nsUrlClassifierUtils.cpp b/toolkit/components/url-classifier/nsUrlClassifierUtils.cpp index ce445d4a473e..b8ca0539550a 100644 --- a/toolkit/components/url-classifier/nsUrlClassifierUtils.cpp +++ b/toolkit/components/url-classifier/nsUrlClassifierUtils.cpp @@ -112,7 +112,15 @@ InitListUpdateRequest(ThreatType aThreatType, ListUpdateRequest* aListUpdateRequest) { aListUpdateRequest->set_threat_type(aThreatType); - aListUpdateRequest->set_platform_type(GetPlatformType()); + PlatformType platform = GetPlatformType(); +#if defined(ANDROID) + // Temporary hack to fix bug 1441345. + if ((aThreatType == SOCIAL_ENGINEERING_PUBLIC) || + (aThreatType == SOCIAL_ENGINEERING)) { + platform = LINUX_PLATFORM; + } +#endif + aListUpdateRequest->set_platform_type(platform); aListUpdateRequest->set_threat_entry_type(URL); Constraints* contraints = new Constraints(); @@ -418,6 +426,8 @@ nsUrlClassifierUtils::MakeFindFullHashRequestV4(const char** aListNames, // Set up FindFullHashesRequest.threat_info. auto threatInfo = r.mutable_threat_info(); + PlatformType platform = GetPlatformType(); + // 1) Set threat types. for (uint32_t i = 0; i < aListCount; i++) { // Add threat types. @@ -433,6 +443,14 @@ nsUrlClassifierUtils::MakeFindFullHashRequestV4(const char** aListNames, } threatInfo->add_threat_types((ThreatType)threatType); +#if defined(ANDROID) + // Temporary hack to fix bug 1441345. + if (((ThreatType)threatType == SOCIAL_ENGINEERING_PUBLIC) || + ((ThreatType)threatType == SOCIAL_ENGINEERING)) { + platform = LINUX_PLATFORM; + } +#endif + // Add client states for index 'i' only when the threat type is available // on current platform. nsCString stateBinary; @@ -442,7 +460,7 @@ nsUrlClassifierUtils::MakeFindFullHashRequestV4(const char** aListNames, } // 2) Set platform type. - threatInfo->add_platform_types(GetPlatformType()); + threatInfo->add_platform_types(platform); // 3) Set threat entry type. threatInfo->add_threat_entry_types(URL);

1 0

[tor-browser/tor-browser-60.2.1esr-8.5-1] Bug 1448305 - Avoid disk cache for icons of private tab's session history. r=JanH
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit c72b56ea4eb7dcbb73d1fce9b9ac066abbe5bd53 Author: Rob Wu <rob(a)robwu.nl> Date: Thu Jun 21 15:36:05 2018 +0200 Bug 1448305 - Avoid disk cache for icons of private tab's session history. r=JanH --- mobile/android/base/java/org/mozilla/gecko/BrowserApp.java | 4 ++-- .../java/org/mozilla/gecko/tabs/TabHistoryController.java | 6 ++++-- .../java/org/mozilla/gecko/tabs/TabHistoryFragment.java | 13 +++++++++---- .../base/java/org/mozilla/gecko/tabs/TabHistoryItemRow.java | 3 ++- 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java index ea9480d149cc..4a497f6999e0 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -784,7 +784,7 @@ public class BrowserApp extends GeckoApp // Initialize Tab History Controller. tabHistoryController = new TabHistoryController(new OnShowTabHistory() { @Override - public void onShowHistory(final List<TabHistoryPage> historyPageList, final int toIndex) { + public void onShowHistory(final List<TabHistoryPage> historyPageList, final int toIndex, final boolean isPrivate) { runOnUiThread(new Runnable() { @Override public void run() { @@ -798,7 +798,7 @@ public class BrowserApp extends GeckoApp return; } - final TabHistoryFragment fragment = TabHistoryFragment.newInstance(historyPageList, toIndex); + final TabHistoryFragment fragment = TabHistoryFragment.newInstance(historyPageList, toIndex, isPrivate); final FragmentManager fragmentManager = getSupportFragmentManager(); GeckoAppShell.getHapticFeedbackDelegate().performHapticFeedback(HapticFeedbackConstants.LONG_PRESS); fragment.show(R.id.tab_history_panel, fragmentManager.beginTransaction(), TAB_HISTORY_FRAGMENT_TAG); diff --git a/mobile/android/base/java/org/mozilla/gecko/tabs/TabHistoryController.java b/mobile/android/base/java/org/mozilla/gecko/tabs/TabHistoryController.java index 0d81f587ca5a..5144c10da05b 100644 --- a/mobile/android/base/java/org/mozilla/gecko/tabs/TabHistoryController.java +++ b/mobile/android/base/java/org/mozilla/gecko/tabs/TabHistoryController.java @@ -25,7 +25,7 @@ public class TabHistoryController { }; public interface OnShowTabHistory { - void onShowHistory(List<TabHistoryPage> historyPageList, int toIndex); + void onShowHistory(List<TabHistoryPage> historyPageList, int toIndex, boolean isPrivate); } public TabHistoryController(OnShowTabHistory showTabHistoryListener) { @@ -40,6 +40,8 @@ public class TabHistoryController { data.putString("action", action.name()); data.putInt("tabId", tab.getId()); + final boolean isPrivate = tab.isPrivate(); + EventDispatcher.getInstance().dispatch("Session:GetHistory", data, new EventCallback() { @Override public void sendSuccess(final Object response) { @@ -74,7 +76,7 @@ public class TabHistoryController { historyPageList.add(new TabHistoryPage(title, url, selected)); } - showTabHistoryListener.onShowHistory(historyPageList, toIndex); + showTabHistoryListener.onShowHistory(historyPageList, toIndex, isPrivate); } @Override diff --git a/mobile/android/base/java/org/mozilla/gecko/tabs/TabHistoryFragment.java b/mobile/android/base/java/org/mozilla/gecko/tabs/TabHistoryFragment.java index 3324636e1141..0877fe258746 100644 --- a/mobile/android/base/java/org/mozilla/gecko/tabs/TabHistoryFragment.java +++ b/mobile/android/base/java/org/mozilla/gecko/tabs/TabHistoryFragment.java @@ -32,6 +32,7 @@ import android.widget.ListView; public class TabHistoryFragment extends Fragment implements OnItemClickListener, OnClickListener { private static final String ARG_LIST = "historyPageList"; private static final String ARG_INDEX = "index"; + private static final String ARG_PRIVATE_MODE = "private"; private static final String BACK_STACK_ID = "backStateId"; private List<TabHistoryPage> historyPageList; @@ -45,11 +46,12 @@ public class TabHistoryFragment extends Fragment implements OnItemClickListener, } - public static TabHistoryFragment newInstance(List<TabHistoryPage> historyPageList, int toIndex) { + public static TabHistoryFragment newInstance(List<TabHistoryPage> historyPageList, int toIndex, boolean isPrivate) { final TabHistoryFragment fragment = new TabHistoryFragment(); final Bundle args = new Bundle(); args.putParcelableArrayList(ARG_LIST, (ArrayList<? extends Parcelable>) historyPageList); args.putInt(ARG_INDEX, toIndex); + args.putBoolean(ARG_PRIVATE_MODE, isPrivate); fragment.setArguments(args); return fragment; } @@ -79,7 +81,8 @@ public class TabHistoryFragment extends Fragment implements OnItemClickListener, Bundle bundle = getArguments(); historyPageList = bundle.getParcelableArrayList(ARG_LIST); toIndex = bundle.getInt(ARG_INDEX); - final ArrayAdapter<TabHistoryPage> urlAdapter = new TabHistoryAdapter(getActivity(), historyPageList); + boolean isPrivate = bundle.getBoolean(ARG_PRIVATE_MODE); + final ArrayAdapter<TabHistoryPage> urlAdapter = new TabHistoryAdapter(getActivity(), historyPageList, isPrivate); dialogList.setAdapter(urlAdapter); dialogList.setOnItemClickListener(this); } @@ -153,11 +156,13 @@ public class TabHistoryFragment extends Fragment implements OnItemClickListener, private static class TabHistoryAdapter extends ArrayAdapter<TabHistoryPage> { private final List<TabHistoryPage> pages; private final Context context; + private final boolean isPrivate; - public TabHistoryAdapter(Context context, List<TabHistoryPage> pages) { + public TabHistoryAdapter(Context context, List<TabHistoryPage> pages, boolean isPrivate) { super(context, R.layout.tab_history_item_row, pages); this.context = context; this.pages = pages; + this.isPrivate = isPrivate; } @Override @@ -167,7 +172,7 @@ public class TabHistoryFragment extends Fragment implements OnItemClickListener, row = new TabHistoryItemRow(context, null); } - row.update(pages.get(position), position == 0, position == pages.size() - 1); + row.update(pages.get(position), position == 0, position == pages.size() - 1, isPrivate); return row; } } diff --git a/mobile/android/base/java/org/mozilla/gecko/tabs/TabHistoryItemRow.java b/mobile/android/base/java/org/mozilla/gecko/tabs/TabHistoryItemRow.java index 112dbc07dc9a..7e4220c94fd4 100644 --- a/mobile/android/base/java/org/mozilla/gecko/tabs/TabHistoryItemRow.java +++ b/mobile/android/base/java/org/mozilla/gecko/tabs/TabHistoryItemRow.java @@ -38,7 +38,7 @@ public class TabHistoryItemRow extends RelativeLayout { } // Update the views with historic page detail. - public void update(final TabHistoryPage historyPage, boolean isFirstElement, boolean isLastElement) { + public void update(final TabHistoryPage historyPage, boolean isFirstElement, boolean isLastElement, boolean isPrivate) { ThreadUtils.assertOnUiThread(); timeLineTop.setVisibility(isFirstElement ? View.INVISIBLE : View.VISIBLE); @@ -62,6 +62,7 @@ public class TabHistoryItemRow extends RelativeLayout { ongoingIconLoad = Icons.with(getContext()) .pageUrl(historyPage.getUrl()) + .setPrivateMode(isPrivate) .skipNetwork() .build() .execute(favicon.createIconCallback());

1 0

[tor-browser/tor-browser-60.2.1esr-8.5-1] Bug 1448305 - Avoid disk cache for icons of private tabs. r=JanH
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit c04236287b17b1e8a3ca2a30344d2fe718cae788 Author: Rob Wu <rob(a)robwu.nl> Date: Thu Jun 21 15:35:39 2018 +0200 Bug 1448305 - Avoid disk cache for icons of private tabs. r=JanH --- .../mozilla/gecko/icons/TestIconRequestBuilder.java | 21 +++++++++++++++++++++ mobile/android/base/java/org/mozilla/gecko/Tab.java | 1 + .../java/org/mozilla/gecko/icons/IconRequest.java | 9 +++++++++ .../org/mozilla/gecko/icons/IconRequestBuilder.java | 10 ++++++++++ .../gecko/icons/processing/DiskProcessor.java | 2 +- 5 files changed, 42 insertions(+), 1 deletion(-) diff --git a/mobile/android/app/src/test/java/org/mozilla/gecko/icons/TestIconRequestBuilder.java b/mobile/android/app/src/test/java/org/mozilla/gecko/icons/TestIconRequestBuilder.java index 620caa9f70d0..066febaf2b93 100644 --- a/mobile/android/app/src/test/java/org/mozilla/gecko/icons/TestIconRequestBuilder.java +++ b/mobile/android/app/src/test/java/org/mozilla/gecko/icons/TestIconRequestBuilder.java @@ -85,6 +85,27 @@ public class TestIconRequestBuilder { } @Test + public void testPrivateMode() { + IconRequest request = Icons.with(RuntimeEnvironment.application) + .pageUrl(TEST_PAGE_URL_1) + .build(); + + Assert.assertFalse(request.isPrivateMode()); + + request.modify() + .setPrivateMode(true) + .deferBuild(); + + Assert.assertTrue(request.isPrivateMode()); + + request.modify() + .setPrivateMode(false) + .deferBuild(); + + Assert.assertFalse(request.isPrivateMode()); + } + + @Test public void testSkipNetwork() { IconRequest request = Icons.with(RuntimeEnvironment.application) .pageUrl(TEST_PAGE_URL_1) diff --git a/mobile/android/base/java/org/mozilla/gecko/Tab.java b/mobile/android/base/java/org/mozilla/gecko/Tab.java index 8b84a2c7db66..91c1d1571435 100644 --- a/mobile/android/base/java/org/mozilla/gecko/Tab.java +++ b/mobile/android/base/java/org/mozilla/gecko/Tab.java @@ -443,6 +443,7 @@ public class Tab { } mRunningIconRequest = mIconRequestBuilder + .setPrivateMode(isPrivate()) .build() .execute(new IconCallback() { @Override diff --git a/mobile/android/base/java/org/mozilla/gecko/icons/IconRequest.java b/mobile/android/base/java/org/mozilla/gecko/icons/IconRequest.java index 8161b9510f3f..da74a8fb5318 100644 --- a/mobile/android/base/java/org/mozilla/gecko/icons/IconRequest.java +++ b/mobile/android/base/java/org/mozilla/gecko/icons/IconRequest.java @@ -23,6 +23,7 @@ public class IconRequest { // Those values are written by the IconRequestBuilder class. /* package-private */ String pageUrl; /* package-private */ boolean privileged; + /* package-private */ boolean isPrivate; /* package-private */ TreeSet<IconDescriptor> icons; /* package-private */ boolean skipNetwork; /* package-private */ boolean backgroundThread; @@ -40,6 +41,7 @@ public class IconRequest { // Setting some sensible defaults. this.privileged = false; + this.isPrivate = false; this.skipMemory = false; this.skipDisk = false; this.skipNetwork = false; @@ -97,6 +99,13 @@ public class IconRequest { } /** + * Is this request initiated from a tab in private browsing mode? + */ + public boolean isPrivateMode() { + return isPrivate; + } + + /** * Get the number of icon descriptors associated with this request. */ public int getIconCount() { diff --git a/mobile/android/base/java/org/mozilla/gecko/icons/IconRequestBuilder.java b/mobile/android/base/java/org/mozilla/gecko/icons/IconRequestBuilder.java index ddae3b64bc64..b2fb46e3a39f 100644 --- a/mobile/android/base/java/org/mozilla/gecko/icons/IconRequestBuilder.java +++ b/mobile/android/base/java/org/mozilla/gecko/icons/IconRequestBuilder.java @@ -62,6 +62,15 @@ public class IconRequestBuilder { } /** + * Set the private mode to avoid saving the result to the disk. + */ + @CheckResult + public IconRequestBuilder setPrivateMode(boolean isPrivate) { + internal.isPrivate = isPrivate; + return this; + } + + /** * Skip the network and do not load an icon from a network connection. */ @CheckResult @@ -165,6 +174,7 @@ public class IconRequestBuilder { IconRequest request = new IconRequest(internal.getContext()); request.pageUrl = internal.pageUrl; request.privileged = internal.privileged; + request.isPrivate = internal.isPrivate; request.icons = new TreeSet<>(internal.icons); request.skipNetwork = internal.skipNetwork; request.backgroundThread = internal.backgroundThread; diff --git a/mobile/android/base/java/org/mozilla/gecko/icons/processing/DiskProcessor.java b/mobile/android/base/java/org/mozilla/gecko/icons/processing/DiskProcessor.java index 150aa503b83e..4923c6fc93c4 100644 --- a/mobile/android/base/java/org/mozilla/gecko/icons/processing/DiskProcessor.java +++ b/mobile/android/base/java/org/mozilla/gecko/icons/processing/DiskProcessor.java @@ -8,7 +8,7 @@ import org.mozilla.gecko.util.StringUtils; public class DiskProcessor implements Processor { @Override public void process(IconRequest request, IconResponse response) { - if (request.shouldSkipDisk()) { + if (request.shouldSkipDisk() || request.isPrivateMode()) { return; }

1 0

[tor-browser/tor-browser-60.2.1esr-8.5-1] Bug 1448305 - Avoid disk cache for icons of private tabs in the TabsLayoutItemView. r=JanH
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit 34242a922172ddfcee8e089949e9972f4c0a882f Author: Rob Wu <rob(a)robwu.nl> Date: Thu Jun 21 15:36:27 2018 +0200 Bug 1448305 - Avoid disk cache for icons of private tabs in the TabsLayoutItemView. r=JanH --- mobile/android/base/java/org/mozilla/gecko/tabs/TabsLayoutItemView.java | 1 + 1 file changed, 1 insertion(+) diff --git a/mobile/android/base/java/org/mozilla/gecko/tabs/TabsLayoutItemView.java b/mobile/android/base/java/org/mozilla/gecko/tabs/TabsLayoutItemView.java index bfd09e2a5e56..329eb9f437f4 100644 --- a/mobile/android/base/java/org/mozilla/gecko/tabs/TabsLayoutItemView.java +++ b/mobile/android/base/java/org/mozilla/gecko/tabs/TabsLayoutItemView.java @@ -201,6 +201,7 @@ public class TabsLayoutItemView extends LinearLayout final Context appContext = getContext().getApplicationContext(); mOngoingIconLoad = Icons.with(appContext) .pageUrl(url) + .setPrivateMode(tab.isPrivate()) .skipNetwork() .targetSize(iconSize) .textSize(textSize)

1 0

[tor-browser/tor-browser-60.2.1esr-8.5-1] Bug 1448305 - Avoid disk cache for icons of TwoLinePageRow in private tabs. r=JanH
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit 4744f30185f1e76fd8243bdc07e2c5dac6dd2302 Author: Rob Wu <rob(a)robwu.nl> Date: Thu Jun 21 15:36:40 2018 +0200 Bug 1448305 - Avoid disk cache for icons of TwoLinePageRow in private tabs. r=JanH E.g. autocompletion results and the "Recently closed" list. --- .../base/java/org/mozilla/gecko/home/TwoLinePageRow.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/home/TwoLinePageRow.java b/mobile/android/base/java/org/mozilla/gecko/home/TwoLinePageRow.java index 334842e2bb2f..5be453f5a536 100644 --- a/mobile/android/base/java/org/mozilla/gecko/home/TwoLinePageRow.java +++ b/mobile/android/base/java/org/mozilla/gecko/home/TwoLinePageRow.java @@ -204,14 +204,11 @@ public class TwoLinePageRow extends ThemedLinearLayout * selected tab. */ protected void updateDisplayedUrl() { - final Tab selectedTab = Tabs.getInstance().getSelectedTab(); - final boolean isPrivate = (selectedTab != null) && (selectedTab.isPrivate()); - // We always want to display the underlying page url, however for readermode pages // we navigate to the about:reader equivalent, hence we need to use that url when finding // existing tabs final String navigationUrl = mHasReaderCacheItem ? ReaderModeUtils.getAboutReaderForUrl(mPageUrl) : mPageUrl; - Tab tab = Tabs.getInstance().getFirstTabForUrl(navigationUrl, isPrivate); + Tab tab = Tabs.getInstance().getFirstTabForUrl(navigationUrl, isCurrentTabInPrivateMode()); if (!mShowIcons || tab == null) { @@ -280,6 +277,7 @@ public class TwoLinePageRow extends ThemedLinearLayout } else if (bookmarkId < BrowserContract.Bookmarks.FAKE_PARTNER_BOOKMARKS_START) { mOngoingIconLoad = Icons.with(getContext()) .pageUrl(pageURL) + .setPrivateMode(isCurrentTabInPrivateMode()) .skipNetwork() .privileged(true) .icon(IconDescriptor.createGenericIcon( @@ -289,6 +287,7 @@ public class TwoLinePageRow extends ThemedLinearLayout } else { mOngoingIconLoad = Icons.with(getContext()) .pageUrl(pageURL) + .setPrivateMode(isCurrentTabInPrivateMode()) .skipNetwork() .build() .execute(mFavicon.createIconCallback()); @@ -307,6 +306,15 @@ public class TwoLinePageRow extends ThemedLinearLayout } /** + * @return true if this view is shown inside a private tab, independent of whether + * a private mode theme is applied via <code>setPrivateMode(true)</code>. + */ + private boolean isCurrentTabInPrivateMode() { + final Tab tab = Tabs.getInstance().getSelectedTab(); + return tab != null && tab.isPrivate(); + } + + /** * Update the data displayed by this row. * <p> * This method must be invoked on the UI thread.

1 0

[tor-browser/tor-browser-60.2.1esr-8.5-1] Bug 1448305 - Fall back to the memory cache when a shortcut is created. r=JanH
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit 1387995d6a8764a730deac5a6d50a1f2ffa3ca0e Author: Rob Wu <rob(a)robwu.nl> Date: Thu Jun 21 15:36:56 2018 +0200 Bug 1448305 - Fall back to the memory cache when a shortcut is created. r=JanH --- .../mozilla/gecko/icons/TestIconRequestBuilder.java | 21 +++++++++++++++++++++ .../java/org/mozilla/gecko/GeckoApplication.java | 16 ++++++++++++++-- .../org/mozilla/gecko/icons/IconRequestBuilder.java | 10 ++++++++++ 3 files changed, 45 insertions(+), 2 deletions(-) diff --git a/mobile/android/app/src/test/java/org/mozilla/gecko/icons/TestIconRequestBuilder.java b/mobile/android/app/src/test/java/org/mozilla/gecko/icons/TestIconRequestBuilder.java index 066febaf2b93..2d80ad7ae5f6 100644 --- a/mobile/android/app/src/test/java/org/mozilla/gecko/icons/TestIconRequestBuilder.java +++ b/mobile/android/app/src/test/java/org/mozilla/gecko/icons/TestIconRequestBuilder.java @@ -172,6 +172,27 @@ public class TestIconRequestBuilder { } @Test + public void testSkipMemoryIf() { + IconRequest request = Icons.with(RuntimeEnvironment.application) + .pageUrl(TEST_PAGE_URL_1) + .build(); + + Assert.assertFalse(request.shouldSkipMemory()); + + request.modify() + .skipMemoryIf(true) + .deferBuild(); + + Assert.assertTrue(request.shouldSkipMemory()); + + request.modify() + .skipMemoryIf(false) + .deferBuild(); + + Assert.assertFalse(request.shouldSkipMemory()); + } + + @Test public void testExecutionOnBackgroundThread() { IconRequest request = Icons.with(RuntimeEnvironment.application) .pageUrl(TEST_PAGE_URL_1) diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java b/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java index 9a5e89dc1579..e896134e0af9 100644 --- a/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java +++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java @@ -613,15 +613,27 @@ public class GeckoApplication extends Application } public static void createBrowserShortcut(final String title, final String url) { - Icons.with(GeckoAppShell.getApplicationContext()) + createBrowserShortcut(title, url, true); + } + + private static void createBrowserShortcut(final String title, final String url, final boolean skipMemoryCache) { + // Try to fetch the icon from the disk cache. The memory cache is + // initially skipped to avoid the use of downsized icons. + Icons.with(GeckoAppShell.getApplicationContext()) .pageUrl(url) .skipNetwork() - .skipMemory() + .skipMemoryIf(skipMemoryCache) .forLauncherIcon() .build() .execute(new IconCallback() { @Override public void onIconResponse(final IconResponse response) { + if (response.isGenerated() && skipMemoryCache) { + // The icon was not found in the disk cache. + // Fall back to the memory cache. + createBrowserShortcut(title, url, false); + return; + } createShortcutWithIcon(title, url, response.getBitmap()); } }); diff --git a/mobile/android/base/java/org/mozilla/gecko/icons/IconRequestBuilder.java b/mobile/android/base/java/org/mozilla/gecko/icons/IconRequestBuilder.java index b2fb46e3a39f..7e3ac5ce1395 100644 --- a/mobile/android/base/java/org/mozilla/gecko/icons/IconRequestBuilder.java +++ b/mobile/android/base/java/org/mozilla/gecko/icons/IconRequestBuilder.java @@ -107,6 +107,16 @@ public class IconRequestBuilder { } /** + * If shouldSkipMemory is true then skip the memory cache and do not return + * a previously loaded icon. + */ + @CheckResult + public IconRequestBuilder skipMemoryIf(boolean shouldSkipMemory) { + internal.skipMemory = shouldSkipMemory; + return this; + } + + /** * The icon will be used as (Android) launcher icon. The loaded icon will be scaled to the * preferred Android launcher icon size. */

1 0