July 2020 - tor-commits - lists.torproject.org

[torbutton/master] Translations update
by gk＠torproject.org 08 Jul '20

08 Jul '20

commit 11848e8c48eb9617ef197b82d16875d925eeb3e1 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jul 8 12:12:53 2020 +0000 Translations update --- chrome/locale/ar/torbutton.properties | 8 ++--- chrome/locale/bn-BD/torbutton.properties | 26 +++++++------- chrome/locale/fr/aboutTor.dtd | 2 +- chrome/locale/fr/brand.dtd | 2 +- chrome/locale/fr/brand.properties | 2 +- chrome/locale/fr/branding/tor-browser-brand.ftl | 2 +- chrome/locale/fr/torbutton.properties | 2 +- chrome/locale/ja/aboutDialog.dtd | 2 +- chrome/locale/ja/torbutton.properties | 28 +++++++-------- chrome/locale/pl/torbutton.properties | 46 ++++++++++++------------- 10 files changed, 60 insertions(+), 60 deletions(-) diff --git a/chrome/locale/ar/torbutton.properties b/chrome/locale/ar/torbutton.properties index 23b34ec5..60cbd6b7 100644 --- a/chrome/locale/ar/torbutton.properties +++ b/chrome/locale/ar/torbutton.properties @@ -60,7 +60,7 @@ updateDownloadingPanelUILabel=جاري تحميل S% من التحديث # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=الاتصال معمى (خدمة بصلة، %1$S، مفاتيح %2$S بتة، %3$S) pageInfo_OnionEncryption=الاتصال معمى (خدمة بصلة) -pageInfo_OnionName=Onion Name: +pageInfo_OnionName=موقع أونيون # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=تعرف على المزيد @@ -71,8 +71,8 @@ onionServices.errorPage.onionSite=موقع Onion # an error code, e.g., 0xF3. # Tor SOCKS error 0xF0: onionServices.descNotFound.pageTitle=حدثت مشكلة أثناء تحميل موقع Onion -onionServices.descNotFound.header=Onionsite Not Found -onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. +onionServices.descNotFound.header=لم يتم العثور على موقع Onion +onionServices.descNotFound=على الأغلب أن موقع onion غير متصل.تواصل مع مديرها. onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client. # Tor SOCKS error 0xF1: onionServices.descInvalid.pageTitle=حدثت مشكلة أثناء تحميل موقع Onion @@ -82,7 +82,7 @@ onionServices.descInvalid.longDescription=Details: %S — The requested onion se # Tor SOCKS error 0xF2: onionServices.introFailed.pageTitle=حدثت مشكلة أثناء تحميل موقع Onion onionServices.introFailed.header=موقع Onion قطع الاتصال. -onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. +onionServices.introFailed=على الأغلب أن موقع onion غير متصل.تواصل مع مديرها . onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running. # Tor SOCKS error 0xF3: onionServices.rendezvousFailed.pageTitle=حدثت مشكلة أثناء تحميل موقع Onion diff --git a/chrome/locale/bn-BD/torbutton.properties b/chrome/locale/bn-BD/torbutton.properties index fb43f5c0..e3e0e1cf 100644 --- a/chrome/locale/bn-BD/torbutton.properties +++ b/chrome/locale/bn-BD/torbutton.properties @@ -1,4 +1,4 @@ -torbutton.circuit_display.internet = ইন্টারনেটের +torbutton.circuit_display.internet = ইন্টারনেট torbutton.circuit_display.ip_unknown = আইপি অজানা torbutton.circuit_display.onion_site = অনিওন সাইট torbutton.circuit_display.this_browser = এই ব্রাউজার @@ -8,8 +8,8 @@ torbutton.circuit_display.unknown_country = অজানা দেশ torbutton.circuit_display.guard = গার্ড torbutton.circuit_display.guard_note = আপনার [গার্ড] নোড পরিবর্তন হতে পারে না। torbutton.circuit_display.learn_more = আরও জানুন -torbutton.circuit_display.click_to_copy = Click to Copy -torbutton.circuit_display.copied = Copied! +torbutton.circuit_display.click_to_copy = অনুলিপি করতে ক্লিক করো +torbutton.circuit_display.copied = অনুলিপিত! torbutton.content_sizer.margin_tooltip = টর ব্রাউজার আপনার উইন্ডো প্রস্থ এবং উচ্চতা নিখুঁত করতে এই মার্জিন যোগ করে, এবং এইভাবে মানুষ আপনাকে অনলাইন ট্র্যাক করার ক্ষমতা হ্রাস করে। torbutton.panel.tooltip.disabled = টর সক্রিয় করতে ক্লিক করুন torbutton.panel.tooltip.enabled = টর অক্ষম করতে ক্লিক করুন @@ -60,32 +60,32 @@ updateDownloadingPanelUILabel=ডাউনলোড হচ্ছে %S আধু # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=সংযোগ এনক্রিপ্ট (Onion Service, %1$S, %2$S bit keys, %3$S) pageInfo_OnionEncryption=সংযোগ এনক্রিপ্ট (Onion Service) -pageInfo_OnionName=Onion Name: +pageInfo_OnionName=অনিওন নাম # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=আরও জানুন onionServices.errorPage.browser=ব্রাউজার onionServices.errorPage.network=নেটওয়ার্ক -onionServices.errorPage.onionSite=Onionsite +onionServices.errorPage.onionSite=অনিওনসাইট # LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with # an error code, e.g., 0xF3. # Tor SOCKS error 0xF0: -onionServices.descNotFound.pageTitle=Problem Loading Onionsite -onionServices.descNotFound.header=Onionsite Not Found +onionServices.descNotFound.pageTitle=অনিওনসাইট লোড করতে সমস্যা +onionServices.descNotFound.header=অনিওনসাইট পাওয়া যায় নি onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client. # Tor SOCKS error 0xF1: -onionServices.descInvalid.pageTitle=Problem Loading Onionsite +onionServices.descInvalid.pageTitle=অনিওনসাইট লোড করতে সমস্যা onionServices.descInvalid.header=Onionsite Cannot Be Reached onionServices.descInvalid=The onionsite is unreachable due an internal error. onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed. # Tor SOCKS error 0xF2: -onionServices.introFailed.pageTitle=Problem Loading Onionsite +onionServices.introFailed.pageTitle=অনিওনসাইট লোড করতে সমস্যা onionServices.introFailed.header=Onionsite Has Disconnected onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running. # Tor SOCKS error 0xF3: -onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite +onionServices.rendezvousFailed.pageTitle=অনিওনসাইট লোড করতে সমস্যা onionServices.rendezvousFailed.header=Unable to Connect to Onionsite onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later. onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection. @@ -100,12 +100,12 @@ onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator. onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked. # Tor SOCKS error 0xF6: -onionServices.badAddress.pageTitle=Problem Loading Onionsite +onionServices.badAddress.pageTitle=অনিওনসাইট লোড করতে সমস্যা onionServices.badAddress.header=Invalid Onionsite Address onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly. onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid. # Tor SOCKS error 0xF7: -onionServices.introTimedOut.pageTitle=Problem Loading Onionsite +onionServices.introTimedOut.pageTitle=অনিওনসাইট লোড করতে সমস্যা onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection. onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. @@ -122,7 +122,7 @@ onionServices.authPreferences.overview=Some onion services require that you iden onionServices.authPreferences.savedKeys=Saved Keys… onionServices.authPreferences.dialogTitle=Onion Service Keys onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer -onionServices.authPreferences.onionSite=Onionsite +onionServices.authPreferences.onionSite=অনিওনসাইট onionServices.authPreferences.onionKey=কি onionServices.authPreferences.remove=অপসারণ onionServices.authPreferences.removeAll=Remove All diff --git a/chrome/locale/fr/aboutTor.dtd b/chrome/locale/fr/aboutTor.dtd index e48a8fff..0356e3d8 100644 --- a/chrome/locale/fr/aboutTor.dtd +++ b/chrome/locale/fr/aboutTor.dtd @@ -22,7 +22,7 @@ <!ENTITY aboutTor.torbrowser_user_manual.accesskey "G"> <!ENTITY aboutTor.torbrowser_user_manual.label "Guide d’utilisation du Navigateur Tor"> -<!ENTITY aboutTor.tor_mission.label "Le Projet Tor est un organisme sans but lucratif US 501(c)(3) qui fait progresser les droits de la personne et les libertés en créant et en déployant des technologies gratuites d’anonymat et de protection de la vie privée et des données personnelles, à code source ouvert. Nous soutenons leur disponibilité et leur utilisation sans restriction, et promouvons une meilleure compréhension scientifique et populaire."> +<!ENTITY aboutTor.tor_mission.label "Le Projet Tor est un organisme sans but lucratif US 501(c)(3) qui fait progresser les droits de la personne et les libertés en créant et en déployant des technologies gratuites d’anonymat et de protection de la vie privée et des données personnelles, à code source ouvert. Nous soutenons leur disponibilité et leur utilisation sans restriction, et promouvons une meilleure compréhension scientifique et populaire."> <!ENTITY aboutTor.getInvolved.label "Impliquez-vous »"> <!ENTITY aboutTor.newsletter.tagline "Obtenez les dernières nouvelles au sujet de Tor directement dans votre boîte de réception."> diff --git a/chrome/locale/fr/brand.dtd b/chrome/locale/fr/brand.dtd index cee7ce86..96443d6a 100644 --- a/chrome/locale/fr/brand.dtd +++ b/chrome/locale/fr/brand.dtd @@ -5,7 +5,7 @@ <!ENTITY brandShorterName "Le Navigateur Tor"> <!ENTITY brandShortName "Le Navigateur Tor"> <!ENTITY brandFullName "Le Navigateur Tor"> -<!ENTITY vendorShortName "Le Projet Tor"> +<!ENTITY vendorShortName "Le Projet Tor"> <!ENTITY trademarkInfo.part1 "« Tor » et le « logo Onion » sont des marques de commerce de « The Projet Tor, Inc. »">  <!ENTITY help.donateLink "寄付"> <!ENTITY help.or "や"> diff --git a/chrome/locale/ja/torbutton.properties b/chrome/locale/ja/torbutton.properties index 5ebc1dbd..cc36ba78 100644 --- a/chrome/locale/ja/torbutton.properties +++ b/chrome/locale/ja/torbutton.properties @@ -1,7 +1,7 @@ torbutton.circuit_display.internet = インターネット -torbutton.circuit_display.ip_unknown = 不明なIP +torbutton.circuit_display.ip_unknown = 不明な IP torbutton.circuit_display.onion_site = Onion サイト -torbutton.circuit_display.this_browser = このブラウザー +torbutton.circuit_display.this_browser = このブラウザ torbutton.circuit_display.relay = リレー torbutton.circuit_display.tor_bridge = ブリッジ torbutton.circuit_display.unknown_country = 不明な国 @@ -11,12 +11,12 @@ torbutton.circuit_display.learn_more = 詳細情報 torbutton.circuit_display.click_to_copy = クリックしてコピー torbutton.circuit_display.copied = コピーされました torbutton.content_sizer.margin_tooltip = Tor Browser はウィンドウのサイズを平凡にするためにこのマージンを追加します。これにより、あなたのことをオンラインで追跡しにくくします。 -torbutton.panel.tooltip.disabled = クリックしてTorを有効にする -torbutton.panel.tooltip.enabled = クリックしてTorを無効にする +torbutton.panel.tooltip.disabled = クリックして Tor を有効にする +torbutton.panel.tooltip.enabled = クリックして Tor を無効にする torbutton.panel.label.disabled = Tor 無効 torbutton.panel.label.enabled = Tor 有効 -extensions.torbutton(a)torproject.org.description = TorbuttonはTorの設定を構成し、素早くかつ容易にプライベートな閲覧データをクリアするボタンを提供します。 -torbutton.popup.external.title = 外部ファイル種別をダウンロードしますか +extensions.torbutton(a)torproject.org.description = Torbutton は Tor の設定を構成し、素早くかつ容易にプライベートな閲覧データをクリアするボタンを提供します。 +torbutton.popup.external.title = 外部ファイル種別をダウンロードしますか? torbutton.popup.external.app = Tor Browser はこのファイルを表示できません。別のアプリケーションで開く必要があります。\n torbutton.popup.external.note = ファイルのタイプの中に、アプリケーションが Tor を使用せずインターネットに接続する原因となる可能性があるものがあります。\n torbutton.popup.external.suggest = 安全であるためには、オフラインの時のみダウンロードしたファイルを開くか、 Tails のような Tor のライブ CD を使用すべきです。\n @@ -25,18 +25,18 @@ torbutton.popup.cancel = キャンセル torbutton.popup.dontask = 今からファイルを自動的にダウンロードする torbutton.popup.no_newnym = Tor コントロールポートにアクセスできませんでした。 Torbutton は新しい接続経路を安全に用意することができません。\n\nTor Browser バンドルを起動していますか？ torbutton.security_settings.menu.title = セキュリティ設定 -torbutton.title.prompt_torbrowser = 重要なTorbuttonの情報 -torbutton.popup.prompt_torbrowser = Torbuttonは現在別様に動作しています。もう止めることはできません。\n\n私たちは、非Torブラウジングのためにも使われているブラウザでのTorbuttonの使用が安全ではないため、この変更を行いました。他の方法で修正することができないバグも多すぎました。\n\n正常にFirefoxを使用したい場合は、Torbuttonをアンインストールして、Tor Browser Bundleをダウンロードすべきです。 Tor Browserのプライバシー特性はFirefoxがTorbuttonと使われている時でも、通常のFirefoxのそれよりも優勢です。\n\nTorbuttonを削除するには、ツール->アドオン->エクステンションに行き、それからTorbuttonの隣の削除ボタンをクリックしてください。 -torbutton.popup.short_torbrowser = 重要なTorbuttonの情報!\n\nTorbuttonは現在常に有効です。\n\n詳細はTorbuttonをクリックしてください。 +torbutton.title.prompt_torbrowser = Torbutton の重要な情報 +torbutton.popup.prompt_torbrowser = Torbutton は現在別様に動作しています。もう止めることはできません。\n\n私たちは、非 Tor ブラウジングのためにも使われているブラウザでの Torbutton の使用が安全ではないため、この変更を行いました。他の方法で修正することができないバグも多すぎました。\n\n正常にFirefoxを使用したい場合は、Torbutton をアンインストールして、Tor Browser バンドルをダウンロードすべきです。 Tor Browser のプライバシー特性は Firefox が Torbutton と使われている時でも、通常の Firefox のそれよりも優勢です。\n\nTorbutton を削除するには、ツール->アドオン->エクステンションに行き、それから Torbutton の隣の削除ボタンをクリックしてください。 +torbutton.popup.short_torbrowser = Torbutton の重要な情報\n\nTorbutton は現在常に有効です。\n\n詳細は Torbutton をクリックしてください。 -torbutton.popup.confirm_plugins = Flashなどのプラグインはあなたのプライバシーや匿名性を損なう恐れがあります。 \n\nそれらはTorを迂回しあなたの現在の位置やIPアドレスを漏らしてしまう恐れがあります。\n\n本当にプラグインを有効にしますか？\n\n +torbutton.popup.confirm_plugins = Flash などのプラグインはあなたのプライバシーや匿名性を損なう恐れがあります。 \n\nそれらは Tor を迂回しあなたの現在の位置や IP アドレスを漏らしてしまう恐れがあります。\n\n本当にプラグインを有効にしますか？\n\n torbutton.popup.never_ask_again = 次からはたずねない torbutton.popup.confirm_newnym = Tor Browser は全てのウィンドウとタブを閉じようとしています。全てのセッションは失われます。\n\nあなたの情報をリセットするために Tor Browser を再起動しますか？\n\n -torbutton.maximize_warning = Tor Browser を最大化すると、Webサイトはあなたのモニターサイズを利用して追跡できるようになります。Tor Browser のウィンドウのサイズは初期状態のままにしておくことをおすすめします。 +torbutton.maximize_warning = Tor Browser を最大化すると、ウェブサイトはあなたのモニターサイズを利用して追跡できるようになります。Tor Browser のウィンドウのサイズは初期状態のままにしておくことをおすすめします。 # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=このWebサイト(%S)がHTML5 canvas画像を使用しようとしています。これはあなたのコンピューターを識別するために使われる可能性があります。\n\nTor ブラウザーにHTML5 canvas画像の使用を許可しますか？ +canvas.siteprompt=このウェブサイト(%S)が HTML5 canvas 画像を使用しようとしています。これはあなたのコンピューターを識別するために使われる可能性があります。\n\nTor Browser に HTML5 canvas 画像の使用を許可しますか？ canvas.notNow=今は許可しない canvas.notNowAccessKey=N canvas.allow=許可する @@ -126,8 +126,8 @@ onionServices.authPreferences.onionSite=Onion サイト onionServices.authPreferences.onionKey=鍵 onionServices.authPreferences.remove=解除 onionServices.authPreferences.removeAll=すべて削除 -onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor -onionServices.authPreferences.failedToRemoveKey=Unable to remove key +onionServices.authPreferences.failedToGetKeys=Tor から鍵を取得できません +onionServices.authPreferences.failedToRemoveKey=鍵を削除できません # Onion-Location strings. onionLocation.alwaysPrioritize=常に Onion を優先する diff --git a/chrome/locale/pl/torbutton.properties b/chrome/locale/pl/torbutton.properties index efa3a8a7..e1563298 100644 --- a/chrome/locale/pl/torbutton.properties +++ b/chrome/locale/pl/torbutton.properties @@ -60,7 +60,7 @@ updateDownloadingPanelUILabel=Pobieranie aktualizacji %S # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=Połączenie zaszyfrowane (usługa Onion, %1$S, %2$S klucze bitowe, %3$S) pageInfo_OnionEncryption=Połączenie zaszyfrowane (usługa Onion) -pageInfo_OnionName=Onion Name: +pageInfo_OnionName=Nazwa Cebuli: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=Dowiedz się więcej @@ -71,18 +71,18 @@ onionServices.errorPage.onionSite=Strona cebulowa # an error code, e.g., 0xF3. # Tor SOCKS error 0xF0: onionServices.descNotFound.pageTitle=Problem z ładowaniem strony Onionsite -onionServices.descNotFound.header=Onionsite Not Found -onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. +onionServices.descNotFound.header=Nie znaleziono strony cebuli +onionServices.descNotFound=Najbardziej prawdopodobną przyczyną jest to, że strona cebuli jest offline. Skontaktuj się z administratorem strony cebuli. onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client. # Tor SOCKS error 0xF1: onionServices.descInvalid.pageTitle=Problem z ładowaniem strony Onionsite -onionServices.descInvalid.header=Onionsite Cannot Be Reached -onionServices.descInvalid=The onionsite is unreachable due an internal error. -onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed. +onionServices.descInvalid.header=Nie można dotrzeć do strony cebuli +onionServices.descInvalid=Strona cebuli jest nieosiągalna z powodu błędu wewnętrznego. +onionServices.descInvalid.longDescription=Szczegóły: %S — Żądany deskryptor usługi cebulowej nie może zostać przeanalizowany lub sprawdzenie poprawności podpisu nie powiodło się. # Tor SOCKS error 0xF2: onionServices.introFailed.pageTitle=Problem z ładowaniem strony Onionsite -onionServices.introFailed.header=Onionsite Has Disconnected -onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. +onionServices.introFailed.header=Strona cebuli została rozłączona +onionServices.introFailed=Najbardziej prawdopodobną przyczyną jest to, że strona cebuli jest offline. Skontaktuj się z administratorem strony cebuli. onionServices.introFailed.longDescription=Szczegóły: %S - Wprowadzenie nie powiodło się, co oznacza, że znaleziono deskryptor, ale usługa nie jest już połączona z punktem wprowadzenia. Prawdopodobnie usługa zmieniła swój deskryptor lub nie jest uruchomiona. # Tor SOCKS error 0xF3: onionServices.rendezvousFailed.pageTitle=Problem z ładowaniem strony Onionsite @@ -93,35 +93,35 @@ onionServices.rendezvousFailed.longDescription=Szczegóły: %S — Klient nie m onionServices.clientAuthMissing.pageTitle=Wymagana Autoryzacja onionServices.clientAuthMissing.header=Strona Onionsite wymaga uwierzytelnienia onionServices.clientAuthMissing=Dostęp do onionite wymaga klucza, ale żaden nie został dostarczony. -onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing. +onionServices.clientAuthMissing.longDescription=Szczegóły: %S — Klient pobrał żądany deskryptor usługi cebulowej, ale nie mógł odszyfrować jego zawartości, ponieważ brakuje informacji autoryzacyjnych klienta. # Tor SOCKS error 0xF5: onionServices.clientAuthIncorrect.pageTitle=Błąd Autoryzacji onionServices.clientAuthIncorrect.header=Uwierzytelnianie strony Onionsite nie powiodło się onionServices.clientAuthIncorrect=Podany klucz jest niepoprawny lub został odwołany. Skontaktuj się z administratorem strony onionsite. -onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked. +onionServices.clientAuthIncorrect.longDescription=Szczegóły: %S — Klient mógł pobrać żądany deskryptor usługi cebulowej, ale nie był w stanie odszyfrować jego zawartości przy użyciu podanych informacji autoryzacyjnych klienta. Może to oznaczać, że dostęp został cofnięty. # Tor SOCKS error 0xF6: onionServices.badAddress.pageTitle=Problem z ładowaniem strony Onionsite -onionServices.badAddress.header=Invalid Onionsite Address -onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly. -onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid. +onionServices.badAddress.header=Nieprawidłowy adres strony cebuli +onionServices.badAddress=Podany adres strony cebulowej jest nieprawidłowy. Sprawdź, czy wpisałeś go poprawnie. +onionServices.badAddress.longDescription=Szczegóły: %S — Podany adres .onion jest nieprawidłowy. Ten błąd jest zwracany z jednego z następujących powodów: suma kontrolna adresu nie jest zgodna, klucz publiczny ed25519 jest nieprawidłowy lub kodowanie jest nieprawidłowe. # Tor SOCKS error 0xF7: onionServices.introTimedOut.pageTitle=Problem z ładowaniem strony Onionsite -onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out -onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection. -onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. +onionServices.introTimedOut.header=Limit czasu tworzenia obwodu cebuli +onionServices.introTimedOut=Nie udało się połączyć z witryną cebuli, prawdopodobnie z powodu słabego połączenia sieciowego. +onionServices.introTimedOut.longDescription=Szczegóły: %S — Upłynął limit czasu połączenia z żądaną usługą cebulową podczas próby zbudowania obwodu spotkania. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description2=%S is requesting that you authenticate. +onionServices.authPrompt.description2=%S żąda uwierzytelnienia. onionServices.authPrompt.keyPlaceholder=Wprowadź swój klucz prywatny dla tej usługi cebulowej onionServices.authPrompt.done=Skończone onionServices.authPrompt.doneAccessKey=d -onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) +onionServices.authPrompt.invalidKey=Wprowadź poprawny klucz (52 znaki baza32 lub 44 znaki baza64) onionServices.authPrompt.failedToSetKey=Konfiguracja Tor przy użyciu twojego klucza nie powiodła się -onionServices.authPreferences.header=Onion Services Authentication -onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. +onionServices.authPreferences.header=Uwierzytelnianie usług cebulowych +onionServices.authPreferences.overview=Niektóre usługi cebulowe wymagają identyfikacji za pomocą klucza (rodzaj hasła) przed uzyskaniem dostępu do nich. onionServices.authPreferences.savedKeys=Zapisane klucze... onionServices.authPreferences.dialogTitle=Klucze Usługi Cebulowej -onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer +onionServices.authPreferences.dialogIntro=Klucze następujących stron cebuli są przechowywane na twoim komputerze onionServices.authPreferences.onionSite=Strona cebulowa onionServices.authPreferences.onionKey=Klucz onionServices.authPreferences.remove=Usuń @@ -130,12 +130,12 @@ onionServices.authPreferences.failedToGetKeys=Nie można odebrać kluczy z Tor onionServices.authPreferences.failedToRemoveKey=Usunięcie klucza nie powiodło się # Onion-Location strings. -onionLocation.alwaysPrioritize=Always Prioritize Onions +onionLocation.alwaysPrioritize=Zawsze ustalaj priorytet cebuli onionLocation.alwaysPrioritizeAccessKey=u onionLocation.notNow=Nie teraz onionLocation.notNowAccessKey=n onionLocation.description=Bezpieczniejsza wersja tej strony jest dostępna jako usługa cebulowa. Usługi cebulowe pomagają twórcom witryn internetowych oraz odwiedzającym je bronić się przed monitorowaniem ruchu i cenzurą. -onionLocation.tryThis=Try Onion Services +onionLocation.tryThis=Wypróbuj Usługi Cebulowe onionLocation.onionAvailable=.onion dostępna onionLocation.learnMore=Dowiedz się więcej... onionLocation.always=Zawsze

1 0

[torbutton/master] Bug 40001: Generate tor-browser-brand.ftl when importing translations
by gk＠torproject.org 08 Jul '20

08 Jul '20

commit e486ef2454a7a9b3751407e3f5d532f939610a5d Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Apr 15 16:16:42 2020 +0200 Bug 40001: Generate tor-browser-brand.ftl when importing translations --- chrome/locale/ar/branding/tor-browser-brand.ftl | 4 +-- chrome/locale/cs/branding/tor-browser-brand.ftl | 2 +- chrome/locale/da/branding/tor-browser-brand.ftl | 4 +-- chrome/locale/es-ES/branding/tor-browser-brand.ftl | 2 +- chrome/locale/fa/branding/tor-browser-brand.ftl | 8 ++--- chrome/locale/fr/branding/tor-browser-brand.ftl | 2 +- chrome/locale/hu/branding/tor-browser-brand.ftl | 8 ++--- chrome/locale/id/branding/tor-browser-brand.ftl | 2 +- chrome/locale/lt/branding/tor-browser-brand.ftl | 12 +++---- chrome/locale/ms/branding/tor-browser-brand.ftl | 12 +++---- chrome/locale/nb-NO/branding/tor-browser-brand.ftl | 4 +-- chrome/locale/nl/branding/tor-browser-brand.ftl | 10 +++--- chrome/locale/ru/branding/tor-browser-brand.ftl | 2 +- chrome/locale/sv-SE/branding/tor-browser-brand.ftl | 2 +- chrome/locale/th/branding/tor-browser-brand.ftl | 4 +-- chrome/locale/tr/branding/tor-browser-brand.ftl | 2 +- chrome/locale/zh-CN/branding/tor-browser-brand.ftl | 8 ++--- chrome/locale/zh-TW/branding/tor-browser-brand.ftl | 4 +-- import-translations.sh | 37 ++++++++++++++++++++++ 19 files changed, 83 insertions(+), 46 deletions(-) diff --git a/chrome/locale/ar/branding/tor-browser-brand.ftl b/chrome/locale/ar/branding/tor-browser-brand.ftl index 9595f702..1bcc7d0a 100644 --- a/chrome/locale/ar/branding/tor-browser-brand.ftl +++ b/chrome/locale/ar/branding/tor-browser-brand.ftl @@ -7,6 +7,6 @@ -brand-full-name = متصفح تور # This brand name can be used in messages where the product name needs to # remain unchanged across different versions (Nightly, Beta, etc.). --brand-product-name = متصفح تور +-brand-product-name = متصفح Tor -vendor-short-name = مشروع تور -trademarkInfo = "تور" و "شعار البصلة" علامات تجارية مسجلة باسم شركة مشروع تور المحدودة +trademarkInfo = 'تور' و 'شعار البصلة' علامات تجارية مسجلة باسم شركة مشروع تور المحدودة diff --git a/chrome/locale/cs/branding/tor-browser-brand.ftl b/chrome/locale/cs/branding/tor-browser-brand.ftl index 61719fb2..604c023d 100644 --- a/chrome/locale/cs/branding/tor-browser-brand.ftl +++ b/chrome/locale/cs/branding/tor-browser-brand.ftl @@ -9,4 +9,4 @@ # remain unchanged across different versions (Nightly, Beta, etc.). -brand-product-name = Prohlížeč Tor -vendor-short-name = Tor Project -trademarkInfo = "Tor" a "Onion logo" jsou registrované ochranné známky společnosti Tor Project, Inc. +trademarkInfo = Tor a logo Onion jsou ochrannými známkami společnosti Tor Project, Inc. diff --git a/chrome/locale/da/branding/tor-browser-brand.ftl b/chrome/locale/da/branding/tor-browser-brand.ftl index c8554742..65c61062 100644 --- a/chrome/locale/da/branding/tor-browser-brand.ftl +++ b/chrome/locale/da/branding/tor-browser-brand.ftl @@ -8,5 +8,5 @@ # This brand name can be used in messages where the product name needs to # remain unchanged across different versions (Nightly, Beta, etc.). -brand-product-name = Tor Browser --vendor-short-name = Tor-projektet -trademarkInfo = "Tor" og "løg-logoet" er registrerede varemærker tilhørende Tor Project, Inc. +-vendor-short-name = Tor-projekt +trademarkInfo = 'Tor' og 'løg-logoet' er registrerede varemærker tilhørende Tor Project, Inc. diff --git a/chrome/locale/es-ES/branding/tor-browser-brand.ftl b/chrome/locale/es-ES/branding/tor-browser-brand.ftl index 7c301ac8..6c35c786 100644 --- a/chrome/locale/es-ES/branding/tor-browser-brand.ftl +++ b/chrome/locale/es-ES/branding/tor-browser-brand.ftl @@ -7,6 +7,6 @@ -brand-full-name = Tor Browser # This brand name can be used in messages where the product name needs to # remain unchanged across different versions (Nightly, Beta, etc.). --brand-product-name = Tor Browser +-brand-product-name = Navegador Tor -vendor-short-name = Proyecto Tor trademarkInfo = 'Tor' y el 'Onion Logo' (logo de la cebolla) son marcas registradas de la Tor Project, Inc. diff --git a/chrome/locale/fa/branding/tor-browser-brand.ftl b/chrome/locale/fa/branding/tor-browser-brand.ftl index 11b305c4..67f426de 100644 --- a/chrome/locale/fa/branding/tor-browser-brand.ftl +++ b/chrome/locale/fa/branding/tor-browser-brand.ftl @@ -2,11 +2,11 @@ # that is used by Firefox) to avoid picking up the -brand-short-name values # that Mozilla includes in the Firefox language packs. --brand-shorter-name = مرورگر تور --brand-short-name = مرورگر تور --brand-full-name = مرورگر تور +-brand-shorter-name = مرورگر Tor +-brand-short-name = مرورگر Tor +-brand-full-name = مرورگر Tor # This brand name can be used in messages where the product name needs to # remain unchanged across different versions (Nightly, Beta, etc.). -brand-product-name = مرورگر تور --vendor-short-name = پروژهٔ تور +-vendor-short-name = پروژه Tor trademarkInfo = 'Tor' و 'Onion Logo' علامت های تجاری ثبت شده از پروژه Tor هستند diff --git a/chrome/locale/fr/branding/tor-browser-brand.ftl b/chrome/locale/fr/branding/tor-browser-brand.ftl index 293fa032..88f33470 100644 --- a/chrome/locale/fr/branding/tor-browser-brand.ftl +++ b/chrome/locale/fr/branding/tor-browser-brand.ftl @@ -7,6 +7,6 @@ -brand-full-name = Le Navigateur Tor # This brand name can be used in messages where the product name needs to # remain unchanged across different versions (Nightly, Beta, etc.). --brand-product-name = Le Navigateur Tor +-brand-product-name = Navigateur Tor -vendor-short-name = Le Projet Tor trademarkInfo = « Tor » et le « logo Onion » sont des marques de commerce de « The Projet Tor, Inc. » diff --git a/chrome/locale/hu/branding/tor-browser-brand.ftl b/chrome/locale/hu/branding/tor-browser-brand.ftl index ab8ff46d..399c1231 100644 --- a/chrome/locale/hu/branding/tor-browser-brand.ftl +++ b/chrome/locale/hu/branding/tor-browser-brand.ftl @@ -2,11 +2,11 @@ # that is used by Firefox) to avoid picking up the -brand-short-name values # that Mozilla includes in the Firefox language packs. --brand-shorter-name = Tor Browser --brand-short-name = Tor Browser --brand-full-name = Tor Browser +-brand-shorter-name = Tor Böngésző +-brand-short-name = Tor Böngésző +-brand-full-name = Tor Böngésző # This brand name can be used in messages where the product name needs to # remain unchanged across different versions (Nightly, Beta, etc.). --brand-product-name = Tor Browser +-brand-product-name = Tor Böngésző -vendor-short-name = Tor Project trademarkInfo = A 'Tor' és az 'Onion Logo' a Tor Project, Inc. bejegyzett védjegyei. diff --git a/chrome/locale/id/branding/tor-browser-brand.ftl b/chrome/locale/id/branding/tor-browser-brand.ftl index b220851c..1724e411 100644 --- a/chrome/locale/id/branding/tor-browser-brand.ftl +++ b/chrome/locale/id/branding/tor-browser-brand.ftl @@ -7,6 +7,6 @@ -brand-full-name = Tor Browser # This brand name can be used in messages where the product name needs to # remain unchanged across different versions (Nightly, Beta, etc.). --brand-product-name = Tor Browser +-brand-product-name = Peramban Tor -vendor-short-name = Proyek Tor trademarkInfo = 'Tor' dan 'Logo Onion' adalah merek dagang terdaftar Tor Project, Inc. diff --git a/chrome/locale/lt/branding/tor-browser-brand.ftl b/chrome/locale/lt/branding/tor-browser-brand.ftl index af1fd648..aeebaec4 100644 --- a/chrome/locale/lt/branding/tor-browser-brand.ftl +++ b/chrome/locale/lt/branding/tor-browser-brand.ftl @@ -2,11 +2,11 @@ # that is used by Firefox) to avoid picking up the -brand-short-name values # that Mozilla includes in the Firefox language packs. --brand-shorter-name = Tor Browser --brand-short-name = Tor Browser --brand-full-name = Tor Browser +-brand-shorter-name = Tor Naršyklė +-brand-short-name = Tor Naršyklė +-brand-full-name = Tor Naršyklė # This brand name can be used in messages where the product name needs to # remain unchanged across different versions (Nightly, Beta, etc.). --brand-product-name = Tor Browser --vendor-short-name = Tor Project -trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc. +-brand-product-name = Tor Naršyklė +-vendor-short-name = Tor projektas +trademarkInfo = 'Tor' ir 'Onion logotipas' yra registruoti Tor Project, Inc. prekių ženklai. diff --git a/chrome/locale/ms/branding/tor-browser-brand.ftl b/chrome/locale/ms/branding/tor-browser-brand.ftl index af1fd648..058e7c9a 100644 --- a/chrome/locale/ms/branding/tor-browser-brand.ftl +++ b/chrome/locale/ms/branding/tor-browser-brand.ftl @@ -2,11 +2,11 @@ # that is used by Firefox) to avoid picking up the -brand-short-name values # that Mozilla includes in the Firefox language packs. --brand-shorter-name = Tor Browser --brand-short-name = Tor Browser --brand-full-name = Tor Browser +-brand-shorter-name = Pelayar Tor +-brand-short-name = Pelayar Tor +-brand-full-name = Pelayar Tor # This brand name can be used in messages where the product name needs to # remain unchanged across different versions (Nightly, Beta, etc.). --brand-product-name = Tor Browser --vendor-short-name = Tor Project -trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc. +-brand-product-name = Pelayar Tor +-vendor-short-name = Projek Tor +trademarkInfo = 'Tor' dan 'Logo Onion' adalah cap dagangan berdaftar bagi Projek Tor, Inc. diff --git a/chrome/locale/nb-NO/branding/tor-browser-brand.ftl b/chrome/locale/nb-NO/branding/tor-browser-brand.ftl index b09f8a20..8f5ec614 100644 --- a/chrome/locale/nb-NO/branding/tor-browser-brand.ftl +++ b/chrome/locale/nb-NO/branding/tor-browser-brand.ftl @@ -7,6 +7,6 @@ -brand-full-name = Tor-nettleseren # This brand name can be used in messages where the product name needs to # remain unchanged across different versions (Nightly, Beta, etc.). --brand-product-name = Tor-nettleseren +-brand-product-name = Tor Browser -vendor-short-name = Tor Project -trademarkInfo = "Tor" og "Løk-logoen" er registrerte varemerker tilhørende the Tor Project, Inc. +trademarkInfo = 'Tor' og 'Løk-logoen' er registrerte varemerker tilhørende the Tor Project, Inc. diff --git a/chrome/locale/nl/branding/tor-browser-brand.ftl b/chrome/locale/nl/branding/tor-browser-brand.ftl index 8ae5a2c6..77d51761 100644 --- a/chrome/locale/nl/branding/tor-browser-brand.ftl +++ b/chrome/locale/nl/branding/tor-browser-brand.ftl @@ -2,11 +2,11 @@ # that is used by Firefox) to avoid picking up the -brand-short-name values # that Mozilla includes in the Firefox language packs. --brand-shorter-name = Tor Browser --brand-short-name = Tor Browser --brand-full-name = Tor Browser +-brand-shorter-name = Tor-browser +-brand-short-name = Tor-browser +-brand-full-name = Tor-browser # This brand name can be used in messages where the product name needs to # remain unchanged across different versions (Nightly, Beta, etc.). -brand-product-name = Tor Browser --vendor-short-name = Tor Project -trademarkInfo = ‘Tor’ en het ‘Onion-logo’ zijn geregistreerde handelsmerken van het Tor Project, Inc. +-vendor-short-name = Tor-project +trademarkInfo = ‘Tor’ en het ‘Onion-logo’ zijn geregistreerde handelsmerken van Tor Project, Inc. diff --git a/chrome/locale/ru/branding/tor-browser-brand.ftl b/chrome/locale/ru/branding/tor-browser-brand.ftl index 44a1226e..c712a1b7 100644 --- a/chrome/locale/ru/branding/tor-browser-brand.ftl +++ b/chrome/locale/ru/branding/tor-browser-brand.ftl @@ -8,5 +8,5 @@ # This brand name can be used in messages where the product name needs to # remain unchanged across different versions (Nightly, Beta, etc.). -brand-product-name = Tor Browser --vendor-short-name = Проект Tor +-vendor-short-name = Tor Project trademarkInfo = 'Tor' и логотип 'Onion' являются зарегистрированными торговыми марками Tor Project, Inc. diff --git a/chrome/locale/sv-SE/branding/tor-browser-brand.ftl b/chrome/locale/sv-SE/branding/tor-browser-brand.ftl index a7f08cfc..56cdff04 100644 --- a/chrome/locale/sv-SE/branding/tor-browser-brand.ftl +++ b/chrome/locale/sv-SE/branding/tor-browser-brand.ftl @@ -9,4 +9,4 @@ # remain unchanged across different versions (Nightly, Beta, etc.). -brand-product-name = Tor Browser -vendor-short-name = Tor-projektet -trademarkInfo = 'Tor' och 'Onion Logotypen' är registerade varumärken av Tor Project, Inc. +trademarkInfo = 'Tor' och 'Onion-logotypen' är registerade varumärken av Tor Project, Inc. diff --git a/chrome/locale/th/branding/tor-browser-brand.ftl b/chrome/locale/th/branding/tor-browser-brand.ftl index af1fd648..b1812e82 100644 --- a/chrome/locale/th/branding/tor-browser-brand.ftl +++ b/chrome/locale/th/branding/tor-browser-brand.ftl @@ -8,5 +8,5 @@ # This brand name can be used in messages where the product name needs to # remain unchanged across different versions (Nightly, Beta, etc.). -brand-product-name = Tor Browser --vendor-short-name = Tor Project -trademarkInfo = 'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc. +-vendor-short-name = โครงการ Tor +trademarkInfo = 'Tor 'และ' Onion Logo 'เป็นเครื่องหมายการค้าจดทะเบียนของโครงการ Tor Project, Inc. diff --git a/chrome/locale/tr/branding/tor-browser-brand.ftl b/chrome/locale/tr/branding/tor-browser-brand.ftl index 606a088b..d77b5427 100644 --- a/chrome/locale/tr/branding/tor-browser-brand.ftl +++ b/chrome/locale/tr/branding/tor-browser-brand.ftl @@ -9,4 +9,4 @@ # remain unchanged across different versions (Nightly, Beta, etc.). -brand-product-name = Tor Browser -vendor-short-name = Tor Projesi -trademarkInfo = 'Tor' ve 'Onion Logo' Tor Project, Inc. tarafından tescillenmiş markalardır. +trademarkInfo = 'Tor' ve 'Onion Logo' Tor Project, Inc. tarafından tescil edilmiş markalardır. diff --git a/chrome/locale/zh-CN/branding/tor-browser-brand.ftl b/chrome/locale/zh-CN/branding/tor-browser-brand.ftl index acaab16c..bd16e2af 100644 --- a/chrome/locale/zh-CN/branding/tor-browser-brand.ftl +++ b/chrome/locale/zh-CN/branding/tor-browser-brand.ftl @@ -2,11 +2,11 @@ # that is used by Firefox) to avoid picking up the -brand-short-name values # that Mozilla includes in the Firefox language packs. --brand-shorter-name = Tor Browser --brand-short-name = Tor Browser --brand-full-name = Tor Browser +-brand-shorter-name = Tor 浏览器 +-brand-short-name = Tor 浏览器 +-brand-full-name = Tor 浏览器 # This brand name can be used in messages where the product name needs to # remain unchanged across different versions (Nightly, Beta, etc.). --brand-product-name = Tor Browser +-brand-product-name = Tor 浏览器 -vendor-short-name = Tor Project trademarkInfo = “Tor”和“Onion Logo”是 Tor Project, Inc 的注册商标。 diff --git a/chrome/locale/zh-TW/branding/tor-browser-brand.ftl b/chrome/locale/zh-TW/branding/tor-browser-brand.ftl index 67938d57..eca78d7c 100644 --- a/chrome/locale/zh-TW/branding/tor-browser-brand.ftl +++ b/chrome/locale/zh-TW/branding/tor-browser-brand.ftl @@ -7,6 +7,6 @@ -brand-full-name = 洋蔥路由瀏覽器 # This brand name can be used in messages where the product name needs to # remain unchanged across different versions (Nightly, Beta, etc.). --brand-product-name = 洋蔥路由瀏覽器 --vendor-short-name = 洋蔥路由專案 +-brand-product-name = Tor 瀏覽器 +-vendor-short-name = Tor 計畫 trademarkInfo = 「Tor」和「Onion Logo」皆是 Tor Project, Inc 的註冊商標。 diff --git a/import-translations.sh b/import-translations.sh index 06060a3c..78b4b8b9 100755 --- a/import-translations.sh +++ b/import-translations.sh @@ -64,6 +64,7 @@ else fi # Update each translated file for each locale. +( echo "Locales: $BUNDLE_LOCALES" cd translation for KEYVAL in "${FILEMAP[@]}"; do @@ -87,3 +88,39 @@ for KEYVAL in "${FILEMAP[@]}"; do $i/"$SRCFILE" > ../$LOCALE_DIR/$i/"$DEST_FILE" done done +) + +# Autogenerate tor-browser-brand.ftl based on brand.properties +# and brand.dtd. +REGEX_ENTITY='<!ENTITY +([^" ]+) +"(.+)">'; +for LOCALE in $BUNDLE_LOCALES; +do + BRAND_PATH="$LOCALE_DIR/$LOCALE/brand.properties" + BRAND_DTD_PATH="$LOCALE_DIR/$LOCALE/brand.dtd" + TOR_BRAND_PATH="$(dirname "$BRAND_PATH")/branding/tor-browser-brand.ftl" + + BRAND_SHORTER_NAME="$(sed -n -e '/^brandShorterName/p' $BRAND_PATH | cut -d= -f2)" + BRAND_SHORT_NAME="$(sed -n -e '/^brandShortName/p' $BRAND_PATH | cut -d= -f2)" + BRAND_FULL_NAME="$(sed -n -e '/^brandFullName/p' $BRAND_PATH | cut -d= -f2)" + BRAND_PRODUCT_NAME="$(sed -n -e '/^brandProductName/p' $BRAND_PATH | cut -d= -f2)" + VENDOR_SHORT_NAME="$(sed -n -e '/^vendorShortName/p' $BRAND_PATH | cut -d= -f2)" + TRADEMARK_INFO='{ " " }' + if [[ "$(sed -n -e '/trademarkInfo/p' $BRAND_DTD_PATH)" =~ $REGEX_ENTITY ]] + then + # Replace some HTML entities (now just ") for tor-browser-brand.ftl. + TRADEMARK_INFO="${BASH_REMATCH[2]//"/\'}" + fi + + echo "# For Tor Browser, we use a new file (different than the brand.ftl file" > $TOR_BRAND_PATH + echo "# that is used by Firefox) to avoid picking up the -brand-short-name values" >> $TOR_BRAND_PATH + echo "# that Mozilla includes in the Firefox language packs." >> $TOR_BRAND_PATH + echo "" >> $TOR_BRAND_PATH + echo "-brand-shorter-name = $BRAND_SHORTER_NAME" >> $TOR_BRAND_PATH + echo "-brand-short-name = $BRAND_SHORT_NAME" >> $TOR_BRAND_PATH + echo "-brand-full-name = $BRAND_FULL_NAME" >> $TOR_BRAND_PATH + echo "# This brand name can be used in messages where the product name needs to" >> $TOR_BRAND_PATH + echo "# remain unchanged across different versions (Nightly, Beta, etc.)." >> $TOR_BRAND_PATH + echo "-brand-product-name = $BRAND_PRODUCT_NAME" >> $TOR_BRAND_PATH + echo "-vendor-short-name = $VENDOR_SHORT_NAME" >> $TOR_BRAND_PATH + echo "trademarkInfo = $TRADEMARK_INFO" >> $TOR_BRAND_PATH +done

1 0

[dev/master] Change readme
by hiro＠torproject.org 08 Jul '20

08 Jul '20

commit f8716df34e81dd1839959fea1691911f1744f7e9 Author: hiro <hiro(a)torproject.org> Date: Wed Jul 8 12:53:53 2020 +0200 Change readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a3bf30e..972ba0c 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ To just build the website once: ```$ lektor build -O <folder>``` #### How to develop on the website -Check our [wiki pages](https://dip.torproject.org/tpo/web/dev/wikis/How-to-develop-on-the-w…. +Check our [wiki pages](https://gitlab.torproject.org/tpo/web/dev/wikis/How-to-develop-on-th…. ### Translations

1 0

[dev/master] Change readme
by hiro＠torproject.org 08 Jul '20

08 Jul '20

commit d0a666e607c46b6c3c78e027328638ae3c87ae42 Author: hiro <hiro(a)torproject.org> Date: Wed Jul 8 12:48:30 2020 +0200 Change readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0c7dc37..a3bf30e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Community portal -This is the repository of Dev portal. +This is the repository of Dev portal. To clone the code use either of @@ -51,7 +51,7 @@ To just build the website once: ```$ lektor build -O <folder>``` #### How to develop on the website -Check our [wiki pages](https://dip.torproject.org/web/dev/wikis/How-to-develop-on-the-websi…. +Check our [wiki pages](https://dip.torproject.org/tpo/web/dev/wikis/How-to-develop-on-the-w…. ### Translations

1 0

[dev/master] Change readme
by hiro＠torproject.org 08 Jul '20

08 Jul '20

commit 18dd237c65211d6ece1132f725210189c31a2776 Author: hiro <hiro(a)torproject.org> Date: Wed Jul 8 12:44:17 2020 +0200 Change readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9271f35..0c7dc37 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Community portal -This is the repository of Dev portal. The current online version of this portal can be found at https://dev.torproject.org (currently in development). +This is the repository of Dev portal. To clone the code use either of

1 0

[dev/master] Change readme
by hiro＠torproject.org 08 Jul '20

08 Jul '20

commit 5f34de046b50eed673701041d3e86bd645736852 Author: hiro <hiro(a)torproject.org> Date: Wed Jul 8 12:41:50 2020 +0200 Change readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2cdefa4..9271f35 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ or browse it [online](http://gitweb.torproject.org/project/web/dev.git). ## How to report bugs or feedback -First check if your issue wasn't already opened in [dip.torproject.org](https://dip.torproject.org/web/dev/issues), then file a [trac ticket](https://trac.torproject.org/projects/tor/newticket) and choose the component: Webpages/Community. +Check if your issue wasn't already opened in [gitlab.torproject.org](https://gitlab.torproject.org/web/dev/issues) then open a new bug. ## What is Lektor

1 0

[dev/master] Change readme
by hiro＠torproject.org 08 Jul '20

08 Jul '20

commit c133a104e7f29a6cd7f010092b722ad970151413 Author: hiro <hiro(a)torproject.org> Date: Wed Jul 8 12:09:23 2020 +0200 Change readme --- README.md | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 13720dc..2cdefa4 100644 --- a/README.md +++ b/README.md @@ -4,15 +4,15 @@ This is the repository of Dev portal. The current online version of this portal To clone the code use either of -```git clone https://git.torproject.org/project/web/community.git/``` +```git clone https://git.torproject.org/project/web/dev.git/``` -```torify git clone http://dccbbv6cooddgcrq.onion/project/web/community.git/``` +```torify git clone http://dccbbv6cooddgcrq.onion/project/web/dev.git/``` -or browse it [online](http://gitweb.torproject.org/project/web/community.git). +or browse it [online](http://gitweb.torproject.org/project/web/dev.git). ## How to report bugs or feedback -First check if your issue wasn't already opened in [dip.torproject.org](https://dip.torproject.org/web/community/issues), then file a [trac ticket](https://trac.torproject.org/projects/tor/newticket) and choose the component: Webpages/Community. +First check if your issue wasn't already opened in [dip.torproject.org](https://dip.torproject.org/web/dev/issues), then file a [trac ticket](https://trac.torproject.org/projects/tor/newticket) and choose the component: Webpages/Community. ## What is Lektor @@ -25,7 +25,7 @@ Its code can be found at [GitHub](https://github.com/lektor/lektor). ### (Easy) Edit this page button -You can click ```Edit this page``` and submit your content changes in a [Pull Request in GitHub](https://github.com/torproject/community/pulls). +You can click ```Edit this page``` and submit your content changes in a [Pull Request in GitHub](https://github.com/torproject/dev/pulls). ### (Advanced) Compiling a local version of the website @@ -35,7 +35,7 @@ You can click ```Edit this page``` and submit your content changes in a [Pull Re 3. Clone the repository: -```git clone https://git.torproject.org/project/web/community.git``` +```git clone https://git.torproject.org/project/web/dev.git``` 4. Init the building blocks submodule: @@ -51,7 +51,7 @@ To just build the website once: ```$ lektor build -O <folder>``` #### How to develop on the website -Check our [wiki pages](https://dip.torproject.org/web/community/wikis/How-to-develop-on-the…. +Check our [wiki pages](https://dip.torproject.org/web/dev/wikis/How-to-develop-on-the-websi…. ### Translations @@ -68,12 +68,12 @@ If you want to contribute to the Community portal, we will be happy to help you. This is the workflow that Tor Internal people should use when making changes on the Community Portal: -1. When starting work on an issue or content, please assign the issue to yourself and move into the `Doing` column on the [Community Portal Project Board](https://dip.torproject.org/web/community/-/boards). You can follow the process outlined in ["How to send a merge request or propose a change"](https://dip.torproject.org/web/tpo/wikis/Git-flow-and-merge-requests#how-to-send-a-merge-request-or-propose-a-change) to work on your changes. +1. When starting work on an issue or content, please assign the issue to yourself and move into the `Doing` column on the [Community Portal Project Board](https://dip.torproject.org/web/dev/-/boards). You can follow the process outlined in ["How to send a merge request or propose a change"](https://dip.torproject.org/web/tpo/wikis/Git-flow-and-merge-requests#how-to-send-a-merge-request-or-propose-a-change) to work on your changes. 2. To view your changes on the website, you can [run lektor locally](https://dip.torproject.org/web/tpo/wikis/Compiling-a-local-version… -3. Once you are happy with your work, push your changes to `develop` branch and move to `needs-review` column on the [Community Portal Project Board](https://dip.torproject.org/web/community/-/boards) +3. Once you are happy with your work, push your changes to `develop` branch and move to `needs-review` column on the [Community Portal Project Board](https://dip.torproject.org/web/dev/-/boards) 4. Add a comment to the issue, tagging the reviewer, e.g `@steph`, with: - - Location of page on lektor-staging `develop` branch, e.g https://lektor-staging.torproject.org/community/develop/ - - Contents file, containing your changes where it would be located on the **reviewer's repo** e.g `https://dip.torproject.org/steph/community/blob/develop/content/onion-services/contents.lr` + - Location of page on lektor-staging `develop` branch, e.g https://lektor-staging.torproject.org/dev/develop/ + - Contents file, containing your changes where it would be located on the **reviewer's repo** e.g `https://dip.torproject.org/steph/dev/blob/develop/content/onion-services/contents.lr` - For the review workflow, please see (Reviewer Workflow) 5. Once the work has been reviewed and any necessary changes and merge request has been made, a repo maintainer or team members with write access to gitweb master will then merge or cherry-pick these changes to master, following the workflow outlined in [How to use our git flow](https://dip.torproject.org/web/tpo/wikis/Git-flow-and-merge-requests#… 6. Merger should then move the the ticket to the `Closed` column. @@ -89,16 +89,16 @@ This is the workflow that Tor Internal people should use when making changes on - Click on "Commit changes" 4. You will be sent to a new page to create your merge request: - Update "Title" with a short title to explain your changes - - Update "Description", you can use the commit message you entered before additionally referencing the original issue you have reviewed, e.g `https://dip.torproject.org/web/community/issues/3` and tagging one of the repo maintainers e.g `@pili` so they know the change can be merged + - Update "Description", you can use the commit message you entered before additionally referencing the original issue you have reviewed, e.g `https://dip.torproject.org/web/dev/issues/3` and tagging one of the repo maintainers e.g `@pili` so they know the change can be merged - Make sure that both "Delete source branch when merge request is accepted" and "Squash commits when merge request is accepted" are checked. - Click "Submit merge request" -5. Reviewer should comment on the original issue with a link to the merge request created, e.g `https://dip.torproject.org/steph/community/merge_requests/2` +5. Reviewer should comment on the original issue with a link to the merge request created, e.g `https://dip.torproject.org/steph/dev/merge_requests/2` ### Volunteer Workflow This is the workflow that external volunteers should use when making changes on the Community Portal: -We recommend that you use our [github mirror](https://github.com/torproject/community) to submit PRs and contributions to our Community repo. Once you have a PR ready you should: +We recommend that you use our [github mirror](https://github.com/torproject/dev) to submit PRs and contributions to our Community repo. Once you have a PR ready you should: 0. Ideally try to run it locally and check that nothing breaks and everything still behaves as before 1. Make a PR and ping the team on #tor-www IRC channel to let us know there's a PR waiting for review @@ -109,4 +109,4 @@ At this point, one of us on the website team will aim to review your PR within 2 - If there are any front end and/or template changes involved, the changes will be pushed to our `develop` branch for functionality review - If there are any fixes necessary, we will ask for changes to be made. -Once it all looks good and behaves correctly, we will merge your request to the master branch of the community portal [canonical repo](https://gitweb.torproject.org/project/web/community.git/) on [gitweb](https://gitweb.torproject.org/) master. +Once it all looks good and behaves correctly, we will merge your request to the master branch of the dev portal [canonical repo](https://gitweb.torproject.org/project/web/dev.git/) on [gitweb](https://gitweb.torproject.org/) master.

1 0

[dev/master] Change readme
by hiro＠torproject.org 08 Jul '20

08 Jul '20

commit 0e881621d232046a1aac6caebb1414a7c8471e8e Author: hiro <hiro(a)torproject.org> Date: Wed Jul 8 12:00:13 2020 +0200 Change readme --- README.md | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index b7dee2b..13720dc 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,18 @@ # Community portal -This is the repository of Community portal. The current online version of this portal can be found at https://community.torproject.org or [Community Onion Service](http://3gldbgtv5e4god56.onion/). +This is the repository of Dev portal. The current online version of this portal can be found at https://dev.torproject.org (currently in development). -To clone the code use either of +To clone the code use either of ```git clone https://git.torproject.org/project/web/community.git/``` -```torify git clone http://dccbbv6cooddgcrq.onion/project/web/community.git/``` +```torify git clone http://dccbbv6cooddgcrq.onion/project/web/community.git/``` or browse it [online](http://gitweb.torproject.org/project/web/community.git). -## How to report bugs or feedback +## How to report bugs or feedback -First check if your issue wasn't already opened in [dip.torproject.org](https://dip.torproject.org/web/community/issues), then file a [trac ticket](https://trac.torproject.org/projects/tor/newticket) and choose the component: Webpages/Community. +First check if your issue wasn't already opened in [dip.torproject.org](https://dip.torproject.org/web/community/issues), then file a [trac ticket](https://trac.torproject.org/projects/tor/newticket) and choose the component: Webpages/Community. ## What is Lektor @@ -37,7 +37,7 @@ You can click ```Edit this page``` and submit your content changes in a [Pull Re ```git clone https://git.torproject.org/project/web/community.git``` -4. Init the building blocks submodule: +4. Init the building blocks submodule: ```$ cd lego && git submodule update --init --recursive``` @@ -109,5 +109,4 @@ At this point, one of us on the website team will aim to review your PR within 2 - If there are any front end and/or template changes involved, the changes will be pushed to our `develop` branch for functionality review - If there are any fixes necessary, we will ask for changes to be made. -Once it all looks good and behaves correctly, we will merge your request to the master branch of the community portal [canonical repo](https://gitweb.torproject.org/project/web/community.git/) on [gitweb](https://gitweb.torproject.org/) master. - +Once it all looks good and behaves correctly, we will merge your request to the master branch of the community portal [canonical repo](https://gitweb.torproject.org/project/web/community.git/) on [gitweb](https://gitweb.torproject.org/) master.

1 0

[dev/master] Update lego
by hiro＠torproject.org 08 Jul '20

08 Jul '20

commit f8f7bca48b101a01bf9c68a6dbc05ac77f6508fe Author: hiro <hiro(a)torproject.org> Date: Wed Jul 8 11:52:43 2020 +0200 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 7f2289b..7bb98ba 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 7f2289bf68685da40878bb09ee91346057c443d3 +Subproject commit 7bb98ba753539250d3346ad559f0279b76dfb0fb

1 0

[tor/maint-0.4.3] Resolve a compiler warning from a 32-bit signed/unsigned comparison
by ahf＠torproject.org 08 Jul '20

08 Jul '20

commit 3e08dd9df1142b66e5f53a55d7e4c2803c3f9868 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 7 14:58:49 2020 -0400 Resolve a compiler warning from a 32-bit signed/unsigned comparison This warning only affects platforms (like win32) with 32-bit time_t. Fixes bug 40028; bugfix on 0.3.2.8-rc. --- changes/bug40028 | 3 +++ src/lib/tls/x509.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug40028 b/changes/bug40028 new file mode 100644 index 000000000..cfd1ffe51 --- /dev/null +++ b/changes/bug40028 @@ -0,0 +1,3 @@ + o Minor bugfixes (compiler warnings): + - Fix a compiler warning on platforms with 32-bit time_t values. + Fixes bug 40028; bugfix on 0.3.2.8-rc. diff --git a/src/lib/tls/x509.c b/src/lib/tls/x509.c index 67a8b49b9..b4a0f8dab 100644 --- a/src/lib/tls/x509.c +++ b/src/lib/tls/x509.c @@ -23,6 +23,7 @@ tor_tls_pick_certificate_lifetime(time_t now, time_t *start_time_out, time_t *end_time_out) { + tor_assert(cert_lifetime < INT_MAX); time_t start_time, end_time; /* Make sure we're part-way through the certificate lifetime, rather * than having it start right now. Don't choose quite uniformly, since @@ -36,7 +37,7 @@ tor_tls_pick_certificate_lifetime(time_t now, const time_t start_granularity = 24*3600; time_t earliest_start_time; /* Don't actually start in the future! */ - if (cert_lifetime <= min_real_lifetime + start_granularity) { + if ((int)cert_lifetime <= min_real_lifetime + start_granularity) { earliest_start_time = now - 1; } else { earliest_start_time = now + min_real_lifetime + start_granularity

1 0