April 2016 - tbb-commits - lists.torproject.org

[tor-browser-bundle/maint-5.5] We should bump the release version as well
by gk＠torproject.org 22 Apr '16

22 Apr '16

commit 707c1e6e6d0d4c1a56ad2cd8774215323edbe763 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 22 11:41:48 2016 +0000 We should bump the release version as well --- tools/update-responses/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 138aa50..89c484b 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -10,7 +10,7 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 5.5a6 - release: 5.5.4 + release: 5.5.5 versions: 5.5.5: platformVersion: 38.8.0

1 0

[torbutton/master] Translation updates
by gk＠torproject.org 22 Apr '16

22 Apr '16

commit 06f23d0a74e33fe4870c58763ea25e23c4c1946f Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 22 10:34:34 2016 +0000 Translation updates --- src/chrome/locale/ar/aboutDialog.dtd | 2 +- src/chrome/locale/ar/torbutton.properties | 1 + src/chrome/locale/de/torbutton.properties | 1 + src/chrome/locale/es/torbutton.properties | 1 + src/chrome/locale/eu/torbutton.properties | 1 + src/chrome/locale/fa/torbutton.properties | 1 + src/chrome/locale/fr/aboutTBUpdate.dtd | 4 ++-- src/chrome/locale/fr/aboutTor.dtd | 4 ++-- src/chrome/locale/fr/brand.properties | 2 +- src/chrome/locale/fr/torbutton.dtd | 2 +- src/chrome/locale/fr/torbutton.properties | 3 ++- src/chrome/locale/it/torbutton.properties | 1 + src/chrome/locale/ja/torbutton.properties | 1 + src/chrome/locale/ko/torbutton.properties | 1 + src/chrome/locale/nl/torbutton.properties | 1 + src/chrome/locale/pl/torbutton.properties | 1 + src/chrome/locale/pt/brand.properties | 2 +- src/chrome/locale/pt/torbutton.dtd | 2 +- src/chrome/locale/pt/torbutton.properties | 1 + src/chrome/locale/ru/aboutTor.properties | 2 +- src/chrome/locale/ru/torbutton.properties | 1 + src/chrome/locale/sv/torbutton.properties | 1 + src/chrome/locale/tr/aboutTor.dtd | 2 +- src/chrome/locale/tr/torbutton.dtd | 2 +- src/chrome/locale/tr/torbutton.properties | 7 ++++--- src/chrome/locale/vi/brand.properties | 2 +- src/chrome/locale/vi/torbutton.properties | 1 + src/chrome/locale/zh-CN/torbutton.dtd | 6 +++--- src/chrome/locale/zh-CN/torbutton.properties | 3 ++- 29 files changed, 38 insertions(+), 21 deletions(-) diff --git a/src/chrome/locale/ar/aboutDialog.dtd b/src/chrome/locale/ar/aboutDialog.dtd index 248786e..7297ce3 100644 --- a/src/chrome/locale/ar/aboutDialog.dtd +++ b/src/chrome/locale/ar/aboutDialog.dtd @@ -1,4 +1,4 @@ -<!ENTITY project.start "&brandShortName; is developed by "> +<!ENTITY project.start "مطوْر من طرف &brandShortName;">  <!ENTITY project.tpoLink "the &vendorShortName;"> <!ENTITY project.end "لاتهدف للربح تعمل على حماية خصوصيتك وحريتك على الأنترنت"> diff --git a/src/chrome/locale/ar/torbutton.properties b/src/chrome/locale/ar/torbutton.properties index 4603989..da247c7 100644 --- a/src/chrome/locale/ar/torbutton.properties +++ b/src/chrome/locale/ar/torbutton.properties @@ -76,3 +76,4 @@ profileProblemTitle=%Sمشكله في ملف شخصي profileReadOnly=You cannot run %S from a read-only file system. Please copy %S to another location before trying to use it. profileReadOnlyMac=You cannot run %S from a read-only file system. Please copy %S to your Desktop or Applications folder before trying to use it. profileAccessDenied=%S does not have permission to access the profile. Please adjust your file system permissions and try again. +profileMigrationFailed=Migration of your existing %S profile failed.\nNew settings will be used. diff --git a/src/chrome/locale/de/torbutton.properties b/src/chrome/locale/de/torbutton.properties index 8b57de6..3e0623b 100644 --- a/src/chrome/locale/de/torbutton.properties +++ b/src/chrome/locale/de/torbutton.properties @@ -76,3 +76,4 @@ profileProblemTitle=%S-Profilproblem profileReadOnly=Es ist nicht möglich %S auf einem nur lesbaren Dateisystem zu starten. Bitte kopiere %S an einen anderen Ort bevor Sie es benutzen. profileReadOnlyMac=Es ist nicht möglich %S auf einem nur lesbaren Dateisystem zu starten. Bitte %S auf Ihren Schreibtisch oder den Anwendungsordner kopieren, bevor Sie es benutzen. profileAccessDenied=%S hat keine Berechtigung um dieses Profil abzurufen. Bitte die Berechtigungen Ihres Dateisystems einstellen und es noch einmal probieren. +profileMigrationFailed=Übernahme des bestehenden %S Profils ist fehlgeschlagen.\nEs werden neue Einstellungen verwendet. diff --git a/src/chrome/locale/es/torbutton.properties b/src/chrome/locale/es/torbutton.properties index 0715b9c..a29234b 100644 --- a/src/chrome/locale/es/torbutton.properties +++ b/src/chrome/locale/es/torbutton.properties @@ -76,3 +76,4 @@ profileProblemTitle=Problema del perfil %S profileReadOnly=No puede ejecutar %S desde un sistema de ficheros de solo-lectura. Copie %S a otra ubicación antes de intentar usarlo. profileReadOnlyMac=No puede ejecutar %S desde un sistema de ficheros de solo-lectura. Copie %S a su escritorio o la carpeta de aplicaciones antes de intentar usarlo. profileAccessDenied=%S no tiene permiso para acceder al perfil. Ajuste los permisos de su sistema de ficheros e inténtelo de nuevo. +profileMigrationFailed=Ha ocurrido un error en la migración de su perfil %S. \nSe usarán los nuevos ajustes. diff --git a/src/chrome/locale/eu/torbutton.properties b/src/chrome/locale/eu/torbutton.properties index d4a905f..2136510 100644 --- a/src/chrome/locale/eu/torbutton.properties +++ b/src/chrome/locale/eu/torbutton.properties @@ -76,3 +76,4 @@ profileProblemTitle=%S Profilarekin Arazoa profileReadOnly=You cannot run %S from a read-only file system. Please copy %S to another location before trying to use it. profileReadOnlyMac=You cannot run %S from a read-only file system. Please copy %S to your Desktop or Applications folder before trying to use it. profileAccessDenied=%S does not have permission to access the profile. Please adjust your file system permissions and try again. +profileMigrationFailed=Migration of your existing %S profile failed.\nNew settings will be used. diff --git a/src/chrome/locale/fa/torbutton.properties b/src/chrome/locale/fa/torbutton.properties index 4938af8..195b17b 100644 --- a/src/chrome/locale/fa/torbutton.properties +++ b/src/chrome/locale/fa/torbutton.properties @@ -76,3 +76,4 @@ profileProblemTitle=%S مشکل پروفایل profileReadOnly=شما نمی توانید اجرا %S از یک فایل سیستم فقط خواندنی. لطفا کپی کنید %S به محل دیگری قبل از تلاش برای استفاده از آن. profileReadOnlyMac=شما نمی توانید اجرا %S از یک فایل سیستم فقط خواندنی. لطفا کپی کنید %S به دسکتاپ خودتان یا پوشه برنامه قبل از تلاش برای استفاده از آن. profileAccessDenied=٪ S اجازه دسترسی به مشخصات ندارد. لطفا مجوزهای سیستم فایل خود را تنظیم و دوباره سعی کنید. +profileMigrationFailed=Migration of your existing %S profile failed.\nNew settings will be used. diff --git a/src/chrome/locale/fr/aboutTBUpdate.dtd b/src/chrome/locale/fr/aboutTBUpdate.dtd index 22674be..bbc32e1 100644 --- a/src/chrome/locale/fr/aboutTBUpdate.dtd +++ b/src/chrome/locale/fr/aboutTBUpdate.dtd @@ -1,6 +1,6 @@ <!ENTITY aboutTBUpdate.title "Mise à jour du Navigateur Tor"> <!ENTITY aboutTBUpdate.updated "Le Navigateur Tor a été mis à jour"> <!ENTITY aboutTBUpdate.linkPrefix "Pour avoir les informations les plus récentes sur cette version,"> -<!ENTITY aboutTBUpdate.linkLabel "visiter notre site web"> +<!ENTITY aboutTBUpdate.linkLabel "visitez notre site web"> <!ENTITY aboutTBUpdate.linkSuffix "."> -<!ENTITY aboutTBUpdate.changeLogHeading "Changelog"> +<!ENTITY aboutTBUpdate.changeLogHeading "Changelog :"> diff --git a/src/chrome/locale/fr/aboutTor.dtd b/src/chrome/locale/fr/aboutTor.dtd index ec76322..ab91620 100644 --- a/src/chrome/locale/fr/aboutTor.dtd +++ b/src/chrome/locale/fr/aboutTor.dtd @@ -8,11 +8,11 @@ <!ENTITY aboutTor.outOfDateTorOn.label "ATTENTION : ce navigateur n'est pas à jour."> <!ENTITY aboutTor.outOfDateTorOff.label "DE PLUS, ce navigateur n'est pas à jour."> -<!ENTITY aboutTor.outOfDate2.label "Cliquez sur l'oignon et choisissez ensuite Vérifier les mises à jour du navigateur Tor"> +<!ENTITY aboutTor.outOfDate2.label "Cliquez sur l'oignon et choisissez ensuite Vérifier les mises à jour du Navigateur Tor"> <!ENTITY aboutTor.check.label "Tester les paramètres du réseau Tor"> -<!ENTITY aboutTor.success.label "Bienvenue dans le navigateur Tor"> +<!ENTITY aboutTor.success.label "Bienvenue dans le Navigateur Tor"> <!ENTITY aboutTor.success2.label "Connecté au réseau Tor."> <!ENTITY aboutTor.success3.label "Vous pouvez maintenant naviguer sur Internet de manière anonyme."> <!ENTITY aboutTor.failure.label "Une erreur s'est produite !"> diff --git a/src/chrome/locale/fr/brand.properties b/src/chrome/locale/fr/brand.properties index 1e596f1..375e8b1 100644 --- a/src/chrome/locale/fr/brand.properties +++ b/src/chrome/locale/fr/brand.properties @@ -11,6 +11,6 @@ homePageSingleStartMain=Firefox Start, une page d'accueil rapide avec recherche homePageImport=Importez votre page d'accueil à partir de %S homePageMigrationPageTitle=Sélection de la Page d'accueil -homePageMigrationDescription=S'il vous plaît sélectionner la page d'accueil que vous souhaitez utiliser: +homePageMigrationDescription=S'il vous plaît sélectionnez la page d'accueil que vous souhaitez utiliser : syncBrandShortName=Sync diff --git a/src/chrome/locale/fr/torbutton.dtd b/src/chrome/locale/fr/torbutton.dtd index c1cf801..ddc9137 100644 --- a/src/chrome/locale/fr/torbutton.dtd +++ b/src/chrome/locale/fr/torbutton.dtd @@ -34,7 +34,7 @@ <!ENTITY torbutton.context_menu.about.key "A"> <!ENTITY torbutton.context_menu.networksettings "Paramètres du réseau Tor"> <!ENTITY torbutton.context_menu.networksettings.key "S"> -<!ENTITY torbutton.context_menu.downloadUpdate "Vérifier les mises à jour du navigateur Tor"> +<!ENTITY torbutton.context_menu.downloadUpdate "Vérifier les mises à jour du Navigateur Tor"> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Protections contre les cookies"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> diff --git a/src/chrome/locale/fr/torbutton.properties b/src/chrome/locale/fr/torbutton.properties index 7501c5b..e5161e2 100644 --- a/src/chrome/locale/fr/torbutton.properties +++ b/src/chrome/locale/fr/torbutton.properties @@ -5,7 +5,7 @@ torbutton.circuit_display.ip_unknown = IP inconnue torbutton.circuit_display.onion_site = Site onion torbutton.circuit_display.this_browser = Ce navigateur torbutton.circuit_display.relay = relais -torbutton.circuit_display.tor_bridge = Pont +torbutton.circuit_display.tor_bridge = Bridge torbutton.circuit_display.unknown_country = Pays inconnu torbutton.content_sizer.margin_tooltip = Le navigateur Tor ajoute cette marge pour s'assurer que la largeur et la hauteur de votre fenêtre soit moins distinctive, et ainsi réduire la capacité des personnes à vous repérer en ligne. torbutton.panel.tooltip.disabled = Cliquer pour activer Tor @@ -76,3 +76,4 @@ profileProblemTitle=Problème de profil %S profileReadOnly=Vous ne pouvez pas exécuter %S à partir d'un système de fichiers en lecture seul. Veuillez copier %S vers un autre emplacement avant d'essayer de l'utiliser. profileReadOnlyMac=Vous ne pouvez pas exécuter %S à partir d'un système de fichiers en lecture seul. Veuillez copier %S vers votre dossier Bureau ou Applications avant d'essayer de l'utiliser. profileAccessDenied=%S n'a pas la permission d'accéder au profil. Veuillez ajuster les permissions de votre système de fichiers et ressayer. +profileMigrationFailed=La migration de votre profil existant %S a échoué.\nDe nouveaux paramètres vont être utilisés. diff --git a/src/chrome/locale/it/torbutton.properties b/src/chrome/locale/it/torbutton.properties index ab76409..a7f6173 100644 --- a/src/chrome/locale/it/torbutton.properties +++ b/src/chrome/locale/it/torbutton.properties @@ -76,3 +76,4 @@ profileProblemTitle=Problema Profilo %S profileReadOnly=Non puoi avviare %S da un file system di sola lettura. Per favore copia %S in un'altra posizione prima di usarlo. profileReadOnlyMac=Non puoi avviare %S da un file system di sola lettura. Per favore copia %S sulla tua scrivania o nella cartella Applicazioni prima di usarlo. profileAccessDenied=%S non ha i permessi per accedere al profilo. Per favore, modifica i permessi del tuo file system e riprova. +profileMigrationFailed=Migrazione del tuo profilo %S esistente fallita.\nVerranno usate nuove impostazioni. diff --git a/src/chrome/locale/ja/torbutton.properties b/src/chrome/locale/ja/torbutton.properties index 554cd6f..1f3cc35 100644 --- a/src/chrome/locale/ja/torbutton.properties +++ b/src/chrome/locale/ja/torbutton.properties @@ -76,3 +76,4 @@ profileProblemTitle=%S プロファイル問題 profileReadOnly=読み込み専用のファイルシステムでは %S を実行できません。 %S を別の場所に移動してからもう一度実行してください。 profileReadOnlyMac=読み込み専用のファイルシステムでは %S を実行できません。 %S をデスクトップやアプリケーションフォルダーに移動してからもう一度実行してください。 profileAccessDenied=%S はプロファイルにアクセスする権限がありません。権限を設定してからもう一度試してみてください。 +profileMigrationFailed=存在しているプロファイル %S へのマイグレーションに失敗しました。\n新しい設定が適用されます。 diff --git a/src/chrome/locale/ko/torbutton.properties b/src/chrome/locale/ko/torbutton.properties index 9476333..51c5601 100644 --- a/src/chrome/locale/ko/torbutton.properties +++ b/src/chrome/locale/ko/torbutton.properties @@ -76,3 +76,4 @@ profileProblemTitle=%S 프로필 문제 profileReadOnly=%S 에서 읽기전용 파일시스템으로 실행하실 수 없습니다. 사용하시기 전에 %S를 복사하여 다른 곳에서 테스트 해 보십시오. profileReadOnlyMac=You cannot run %S from a read-only file system. Please copy %S to your Desktop or Applications folder before trying to use it. profileAccessDenied=%S does not have permission to access the profile. Please adjust your file system permissions and try again. +profileMigrationFailed=Migration of your existing %S profile failed.\nNew settings will be used. diff --git a/src/chrome/locale/nl/torbutton.properties b/src/chrome/locale/nl/torbutton.properties index 08b77aa..234d62c 100644 --- a/src/chrome/locale/nl/torbutton.properties +++ b/src/chrome/locale/nl/torbutton.properties @@ -76,3 +76,4 @@ profileProblemTitle=%S Profiel probleem profileReadOnly=Je kan %S niet draaien vanaf een alleen-lezen bestands-systeem Kopieer %S naar een andere locatie voor je het opnieuw probeert. profileReadOnlyMac=Je kan %S niet draaien vanaf een alleen lezen bestands-systeem. Kopieer %S naar je Bureaublad of de Applicatie map voordat je het opnieuw probeert. profileAccessDenied=%S heeft niet de juiste permissies om toegang te krijgen tot het profiel. Pas de bestands-systeem permissies aan en probeer het opnieuw. +profileMigrationFailed=Migreren van uw bestaande %S profiel is mislukt.\nNieuwe instellingen zijn nu van toepassing. diff --git a/src/chrome/locale/pl/torbutton.properties b/src/chrome/locale/pl/torbutton.properties index 8b60e26..c3e9be2 100644 --- a/src/chrome/locale/pl/torbutton.properties +++ b/src/chrome/locale/pl/torbutton.properties @@ -76,3 +76,4 @@ profileProblemTitle=%S Problem profilu profileReadOnly=Nie możesz uruchomić %S z systemu plików tylko do odczytu. Prosimy o skopiowanie %S do innej lokalizacji przed ponownym jego użyciem. profileReadOnlyMac=Nie możesz uruchomić %S w systemie plików tylko do odczytu. Prosimy o skopiowanie %S na pulpit, lub do folderu aplikacji przed ponowną próbą uruchomienia. profileAccessDenied=%S nie posiada uprawnień, aby zobaczyć ten profil. Prosimy zmienić uprawnienia systemu plików i spróbować ponownie. +profileMigrationFailed=Migracja Twojego isniejącego profilu %S nie powiodła się.\nNowe ustawienia zostaną użyte. diff --git a/src/chrome/locale/pt/brand.properties b/src/chrome/locale/pt/brand.properties index 6d96fb0..68215bd 100644 --- a/src/chrome/locale/pt/brand.properties +++ b/src/chrome/locale/pt/brand.properties @@ -10,7 +10,7 @@ vendorShortName=Projeto Tor homePageSingleStartMain=Página Inicial do Firefox, uma página inicial rápida com procura incluída homePageImport=Importe a página inicial a do %S -homePageMigrationPageTitle=Seleção da Página Inicial +homePageMigrationPageTitle=Seleção da Página Inicial homePageMigrationDescription=Selecione a página inicial que deseja usar: syncBrandShortName=Sincronizar diff --git a/src/chrome/locale/pt/torbutton.dtd b/src/chrome/locale/pt/torbutton.dtd index 678ccb7..5e0ef84 100644 --- a/src/chrome/locale/pt/torbutton.dtd +++ b/src/chrome/locale/pt/torbutton.dtd @@ -115,7 +115,7 @@ <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> <!ENTITY torbutton.prefs.no_proxies_on "Nenhum proxy para: "> <!ENTITY torbutton.prefs.no_proxy_warning "Aviso: evite utilizar quaisquer nomes de hospedeiro acima"> -<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh"> +<!ENTITY torbutton.prefs.spoofreresh "Refrescamento da falsificação"> <!ENTITY torbutton.prefs.refereroptions "Opções de falsificação do referente"> <!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)"> <!ENTITY torbutton.prefs.spoofroot "Enganar a pasta da página"> diff --git a/src/chrome/locale/pt/torbutton.properties b/src/chrome/locale/pt/torbutton.properties index 3f5026a..b65f4a4 100644 --- a/src/chrome/locale/pt/torbutton.properties +++ b/src/chrome/locale/pt/torbutton.properties @@ -76,3 +76,4 @@ profileProblemTitle=%S - Problema de Perfil profileReadOnly=Não pode executar %S a partir de um sistema de ficheiros só-de-leitura. Por favor, copie %S para outra localização antes de tentar utilizá-lo. profileReadOnlyMac=Não pode executar %S a partir de um ficheiro do sistema só-de-leitura. Por favor, copie %S para o seu Ambiente de Trabalho antes de tentar utilizá-lo. profileAccessDenied=%S não tem permissão para aceder ao perfil. Por favor, ajuste as suas permissões de ficheiro do sistema e tente de novo. +profileMigrationFailed=Migração do seu perfil %S existente falhou. \nNovas configurações serão utilizadas. diff --git a/src/chrome/locale/ru/aboutTor.properties b/src/chrome/locale/ru/aboutTor.properties index 6795b7c..07d591c 100644 --- a/src/chrome/locale/ru/aboutTor.properties +++ b/src/chrome/locale/ru/aboutTor.properties @@ -2,7 +2,7 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=Ищите <a href="%1$S">конфиденциально</a> со <a href="%2$S">Startpage</a>. +aboutTor.searchSP.privacy=Ищите <a href="%1$S">конфиденциально</a> на <a href="%2$S">Стартовой странице</a>. # The following string is a link which replaces %1$S above. aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.ht… # The following string is a link which replaces %2$S above. diff --git a/src/chrome/locale/ru/torbutton.properties b/src/chrome/locale/ru/torbutton.properties index 00c3dd0..bdda36c 100644 --- a/src/chrome/locale/ru/torbutton.properties +++ b/src/chrome/locale/ru/torbutton.properties @@ -76,3 +76,4 @@ profileProblemTitle=Проблема с профилем %S profileReadOnly=Невозможно запустить %S из под системы с файловой системой "только для чтения". Пожалуйста, скопируйте %S в другое место перед использованием. profileReadOnlyMac=Невозможно запустить %S из файловой системы, доступной только для чтения. Пожалуйста, скопируйте %S на рабочий стол или в папку "Приложения" перед использованием. profileAccessDenied=У %S нет разрешения на доступ к профилю. Пожалуйста, измените права доступа и попробуйте снова. +profileMigrationFailed=Перемещение вашего существующего %S профиля не удалось.\nБудут использоваться новые настройки. diff --git a/src/chrome/locale/sv/torbutton.properties b/src/chrome/locale/sv/torbutton.properties index 443bf1a..a7188c9 100644 --- a/src/chrome/locale/sv/torbutton.properties +++ b/src/chrome/locale/sv/torbutton.properties @@ -76,3 +76,4 @@ profileProblemTitle=%S Profilproblem profileReadOnly=Du kan inte köra %S från ett read-only filsystem. Kopiera först %S till ett annat ställe innan användning. profileReadOnlyMac=Du kan inte köra %S från ett read-only filsystem. Kopiera först %S till Skrivbordet eller Applications-katalogen innan användning. profileAccessDenied=%S har inte rättighet att använda profilen. Vänligen ändra dina rättigheter i filsystemet och försök igen! +profileMigrationFailed=Migrering av din befintliga %S profil misslyckades.\nNya inställningar kommer att användas. diff --git a/src/chrome/locale/tr/aboutTor.dtd b/src/chrome/locale/tr/aboutTor.dtd index 3e3db58..d68d838 100644 --- a/src/chrome/locale/tr/aboutTor.dtd +++ b/src/chrome/locale/tr/aboutTor.dtd @@ -33,7 +33,7 @@ <!ENTITY aboutTor.torInfo4.label "Bu sunucu ziyaretçiler hakkında herhangi bir bilgi toplamaz."> <!ENTITY aboutTor.whatnextQuestion.label "Şimdi ne olacak?"> <!ENTITY aboutTor.whatnextAnswer.label "Tor, anonim kalmanız için gerek duyacağınız her şeyi sağlamaz! Kimliğinizin güvende kalması için bazı İnternet alışkanlıklarınızı değiştirmeniz gerekebilir."> -<!ENTITY aboutTor.whatnext.label "Anonim Kalma İp Uçları »"> +<!ENTITY aboutTor.whatnext.label "Anonim Kalma İpuçları »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> <!ENTITY aboutTor.helpInfo1.label "Yardım Edebilirsiniz!"> <!ENTITY aboutTor.helpInfo2.label "Tor ağını daha hızlı güçlü kılmaya yardımcı olabilmenin çeşitli yolları var:"> diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd index 62114b5..3a03b4d 100644 --- a/src/chrome/locale/tr/torbutton.dtd +++ b/src/chrome/locale/tr/torbutton.dtd @@ -170,7 +170,7 @@ <!ENTITY torbutton.prefs.sec_all_jit_desc "Tüm JavaScript başarım iyileştirmeleri devre dışı bırakılır."> <!ENTITY torbutton.prefs.sec_font_rend_desc "Bazı yazı tipi işleme özellikleri devre dışı bırakılır."> <!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Graphite yazı tipi görüntüleme düzeneği devre dışı bırakılır."> -<!ENTITY torbutton.prefs.sec_svg_desc "Bazı görsel tipleri devre dışı bırakılır."> +<!ENTITY torbutton.prefs.sec_svg_desc "Bazı görsel türleri devre dışı bırakılır."> <!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG görselleri devre dışı bırakılır."> <!ENTITY torbutton.prefs.sec_js_https_desc "HTTPS kullanılmayan sitelerde JavaScript varsayılan olarak devre dışı bırakılır."> <!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript, NoScript araç çubuğu düğmesi kullanılarak her site için ayrı ayrı etkinleştirilebilir."> diff --git a/src/chrome/locale/tr/torbutton.properties b/src/chrome/locale/tr/torbutton.properties index 8c03698..2e2cdff 100644 --- a/src/chrome/locale/tr/torbutton.properties +++ b/src/chrome/locale/tr/torbutton.properties @@ -29,9 +29,9 @@ torbutton.popup.test.auto_failed = Otomatik Tor vekil sunucu sınamasında Tor k torbutton.prefs.recommended = (önerilir) torbutton.prefs.optional = (isteğe bağlı) torbutton.prefs.crucial = (önemli) -torbutton.popup.external.title = Dış bir dosya tipi indirilsin mi? +torbutton.popup.external.title = Dış bir dosya türü indirilsin mi? torbutton.popup.external.app = Tor Browser bu dosyayı görüntüleyemiyor. Başka bir uygulamayla açmanız gerekecek.\n -torbutton.popup.external.note = Bazı dosya tipleri uygulamaların Tor kullanmadan İnternet bağlantısı kurmasına neden olabilir.\n\n +torbutton.popup.external.note = Bazı dosya türleri uygulamaların Tor kullanmadan İnternet bağlantısı kurmasına neden olabilir.\n torbutton.popup.external.suggest = Güvende olmak için, indirilen dosyaları yalnız çevrim dışı iken açmalı ya da Tails benzeri bir Çalışan Tor CD ortamı kullanmalısınız.\n torbutton.popup.launch = Dosyayı indir torbutton.popup.cancel = İptal\n @@ -59,7 +59,7 @@ torbutton.popup.confirm_newnym = Tor Browser tüm sekme ve pencereleri kapatacak torbutton.slider_notification = Yeşil soğan menüsünde artık güvenlik düzeyini ayarlayabileceğiniz bir güvenlik kaydırıcısı var. Deneyin! torbutton.slider_notification_button = Güvenlik ayarlarını aç -torbutton.maximize_warning = Tor Browser görüntüsünün tüm ekranı kaplaması, ekran boyutunuzu web siteleri tarafından öğrenilmesini ve bu bilginin sizi izlemek için kullanılmasını sağlayabilir. Tor Browser pencerelerini özgün varsayılan boyutlarında bırakmanız önerilir. +torbutton.maximize_warning = Tor Browser görüntüsünün tüm ekranı kaplaması, ekran boyutunuzun web siteleri tarafından öğrenilmesini ve bu bilginin sizi izlemek için kullanılmasını sağlayabilir. Tor Browser pencerelerini özgün varsayılan boyutlarında bırakmanız önerilir. # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=Bu web sitesi (%S) bilgisayarınızı benzersiz olarak tanımlayabilmek için kullanılabilen HTML5 tuvalindeki görsel verisine erişmeye çalıştı.\n\nTor Browser bu web sitesine HTML5 tuval, görsel verisini göndersin mi? @@ -76,3 +76,4 @@ profileProblemTitle=%S Profili Sorunu profileReadOnly=%S salt okunur bir dosya sisteminden çalıştırılamaz. Lütfen kullanmadan önce %S yazılımını farklı bir konuma kopyalayın. profileReadOnlyMac=%S salt okunur bir dosya sisteminden çalıştırılamaz. Lütfen kullanmadan önce %S yazılımını Masaüstü veya Uygulamalar klasörüne kopyalayın. profileAccessDenied=%S, profilinize erişemiyor. Lütfen dosya sistemi izinlerini ayarlayarak yeniden deneyin. +profileMigrationFailed=Mevcut %S profilinizin taşınma işlemi başarısız oldu.\nYeni ayarlar kullanılacak. diff --git a/src/chrome/locale/vi/brand.properties b/src/chrome/locale/vi/brand.properties index 87d9b23..bb1ea2d 100644 --- a/src/chrome/locale/vi/brand.properties +++ b/src/chrome/locale/vi/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShorterName=Tor Browser +brandShorterName=Trình duyệt Tor brandShortName=Trình duyệt Tor brandFullName=Trình duyệt Tor vendorShortName=Dự án Tor diff --git a/src/chrome/locale/vi/torbutton.properties b/src/chrome/locale/vi/torbutton.properties index 98b2883..cc5d3c2 100644 --- a/src/chrome/locale/vi/torbutton.properties +++ b/src/chrome/locale/vi/torbutton.properties @@ -76,3 +76,4 @@ profileProblemTitle=%S Profile Problem profileReadOnly=You cannot run %S from a read-only file system. Please copy %S to another location before trying to use it. profileReadOnlyMac=You cannot run %S from a read-only file system. Please copy %S to your Desktop or Applications folder before trying to use it. profileAccessDenied=%S does not have permission to access the profile. Please adjust your file system permissions and try again. +profileMigrationFailed=Migration of your existing %S profile failed.\nNew settings will be used. diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd index 1972a7a..d947470 100644 --- a/src/chrome/locale/zh-CN/torbutton.dtd +++ b/src/chrome/locale/zh-CN/torbutton.dtd @@ -22,9 +22,9 @@ <!ENTITY torbutton.pref_connection.more_info "更多信息"> <!ENTITY torbutton.pref_connection_more_info.title "帮助"> <!ENTITY torbutton.pref_connection_more_info.text "Torbutton 当前已启用。如需对 Tor 之外的代理设置进行更改，请禁用 Torbutton 后再返回这里。如需更改 Tor 的设置，请在 Torbutton 首选项窗口中进行设置。"> -<!ENTITY torbutton.context_menu.new_identity "新标识"> +<!ENTITY torbutton.context_menu.new_identity "新身份"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.new_circuit "为该站点新建 Tor 线路"> +<!ENTITY torbutton.context_menu.new_circuit "为此站点使用新 Tor 线路"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> <!ENTITY torbutton.context_menu.toggle "切换 Tor 状态"> <!ENTITY torbutton.context_menu.toggle.key "T"> @@ -181,5 +181,5 @@ <!ENTITY torbutton.prefs.sec_webfonts_desc "某些字体和图标可能无法正确显示。"> <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "禁用网站提供的字体文件。"> <!ENTITY torbutton.prefs.sec_custom "自定义"> -<!ENTITY torbutton.circuit_display.title "该站点所用的 Tor 线路"> +<!ENTITY torbutton.circuit_display.title "为此站点使用的 Tor 线路"> diff --git a/src/chrome/locale/zh-CN/torbutton.properties b/src/chrome/locale/zh-CN/torbutton.properties index e67ae7a..5b241bb 100644 --- a/src/chrome/locale/zh-CN/torbutton.properties +++ b/src/chrome/locale/zh-CN/torbutton.properties @@ -7,7 +7,7 @@ torbutton.circuit_display.this_browser = 本浏览器 torbutton.circuit_display.relay = 中继 torbutton.circuit_display.tor_bridge = 网桥 torbutton.circuit_display.unknown_country = 未知国家 -torbutton.content_sizer.margin_tooltip = Tor 浏览器添加了一些边框，以降低窗口大小的独特性，从而令在线跟踪监控变得更加困难。 +torbutton.content_sizer.margin_tooltip = Tor 浏览器添加了一些边框，以降低窗口大小的独特性，令在线跟踪监控变得更加困难。 torbutton.panel.tooltip.disabled = 点击启用 Tor torbutton.panel.tooltip.enabled = 点击禁用 Tor torbutton.panel.plugins.disabled = 点击启用插件 @@ -76,3 +76,4 @@ profileProblemTitle=%S 配置文件问题 profileReadOnly=您不能在一个只读文件系统上运行 %S。请在尝试使用前复制 %S 到另一个位置。 profileReadOnlyMac=您不能在一个只读文件系统上运行 %S。请在尝试使用它前复制 %S 到您的桌面或者应用程序文件夹。 profileAccessDenied=%S 没有权限访问配置文件。请调整您的文件系统权限然后重试。 +profileMigrationFailed=转移您已有的配置文件 %S 失败。\n新设置将被使用。

1 0

[torbutton/master] Release preparations for 1.9.5.3
by gk＠torproject.org 22 Apr '16

22 Apr '16

commit ead9462a881ad89365866f29aac6765fef305723 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 22 10:37:44 2016 +0000 Release preparations for 1.9.5.3 Version bumps, changelog update --- src/CHANGELOG | 4 ++++ src/install.rdf | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 5f16834..6ab0827 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,7 @@ +1.9.5.3 + * Bug 18466: Make Torbutton compatible with Firefox ESR 45 + * Translation updates + 1.9.5.2 * Bug 18557: Exempt Graphite preference from Security Slider diff --git a/src/install.rdf b/src/install.rdf index 29c72ba..58f51b3 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>1.9.5.2</em:version> + <em:version>1.9.5.3</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL> @@ -16,7 +16,7 @@ <em:targetApplication> <Description> <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> - <em:minVersion>17.0</em:minVersion> + <em:minVersion>45.0</em:minVersion> <em:maxVersion>10000.0</em:maxVersion> </Description> </em:targetApplication>

1 0

[tor-launcher/master] Getting new strings translated
by gk＠torproject.org 22 Apr '16

22 Apr '16

commit 14c8fff57bcf60d11416cec46d9d560ae132a033 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 22 08:13:05 2016 +0000 Getting new strings translated --- src/chrome/locale/en/network-settings.dtd | 2 +- src/chrome/locale/en/torlauncher.properties | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties index 0ef4437..6b471a3 100644 --- a/src/chrome/locale/en/torlauncher.properties +++ b/src/chrome/locale/en/torlauncher.properties @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.

1 0

[tor-browser-bundle/hardened-builds] fetch-inputs.sh: checkout git repositories with -f
by gk＠torproject.org 21 Apr '16

21 Apr '16

commit 55d7ae68564373617ee5a7bd54833ec203afedb0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 21 23:00:28 2016 +0200 fetch-inputs.sh: checkout git repositories with -f Update git repositories using "git checkout -f" to throw away local changes. This avoids an error when updating https-everywhere where a submodule was merged to the main repository. --- gitian/fetch-inputs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 7c9daee..4f3c886 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -99,7 +99,7 @@ update_git() { fi if [ -n "$tag" ]; then - (cd "$dir" && git checkout "$tag") + (cd "$dir" && git checkout -f "$tag") fi # If we're not verifying tags, then some of the tags

1 0

[tor-browser-bundle/master] fetch-inputs.sh: checkout git repositories with -f
by boklm＠torproject.org 21 Apr '16

21 Apr '16

commit 3fbe2d1801286eefceb1d83dfab4e6b62d38c720 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 21 23:00:28 2016 +0200 fetch-inputs.sh: checkout git repositories with -f Update git repositories using "git checkout -f" to throw away local changes. This avoids an error when updating https-everywhere where a submodule was merged to the main repository. --- gitian/fetch-inputs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index b423b48..da487f4 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -100,7 +100,7 @@ update_git() { fi if [ -n "$tag" ]; then - (cd "$dir" && git checkout "$tag") + (cd "$dir" && git checkout -f "$tag") fi # If we're not verifying tags, then some of the tags

1 0

[tor-browser-bundle/maint-5.5] fetch-inputs.sh: checkout git repositories with -f
by boklm＠torproject.org 21 Apr '16

21 Apr '16

commit cbd10de83965b6badaa86489801cf7a5ec78303e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 21 23:00:28 2016 +0200 fetch-inputs.sh: checkout git repositories with -f Update git repositories using "git checkout -f" to throw away local changes. This avoids an error when updating https-everywhere where a submodule was merged to the main repository. --- gitian/fetch-inputs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 7c55ba8..1ff49f8 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -99,7 +99,7 @@ update_git() { fi if [ -n "$tag" ]; then - (cd "$dir" && git checkout "$tag") + (cd "$dir" && git checkout -f "$tag") fi # If we're not verifying tags, then some of the tags

1 0

[tor-launcher/maint-0.2.7] Version bump
by gk＠torproject.org 21 Apr '16

21 Apr '16

commit 8a844acce82de241b5456d7160ae903b3806f037 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 21 19:15:35 2016 +0000 Version bump --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 06ebe1a..9118534 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.7.8</em:version> + <em:version>0.2.7.9</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL> <em:updateKey>-</em:updateKey>

1 0

[tor-launcher/maint-0.2.7] Translation updates
by gk＠torproject.org 21 Apr '16

21 Apr '16

commit 30fd4681784a9ec13395313da1ca6439d79bda49 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 21 19:14:17 2016 +0000 Translation updates --- src/chrome/locale/ar/torlauncher.properties | 1 + src/chrome/locale/de/torlauncher.properties | 1 + src/chrome/locale/es/torlauncher.properties | 1 + src/chrome/locale/fa/torlauncher.properties | 1 + src/chrome/locale/fr/torlauncher.properties | 1 + src/chrome/locale/it/torlauncher.properties | 1 + src/chrome/locale/ja/torlauncher.properties | 1 + src/chrome/locale/ko/torlauncher.properties | 1 + src/chrome/locale/nl/torlauncher.properties | 1 + src/chrome/locale/pl/torlauncher.properties | 1 + src/chrome/locale/pt/torlauncher.properties | 1 + src/chrome/locale/ru/torlauncher.properties | 1 + src/chrome/locale/tr/torlauncher.properties | 1 + src/chrome/locale/vi/torlauncher.properties | 1 + src/chrome/locale/zh-CN/torlauncher.properties | 1 + 15 files changed, 15 insertions(+) diff --git a/src/chrome/locale/ar/torlauncher.properties b/src/chrome/locale/ar/torlauncher.properties index 2fc973e..5e11dec 100644 --- a/src/chrome/locale/ar/torlauncher.properties +++ b/src/chrome/locale/ar/torlauncher.properties @@ -36,6 +36,7 @@ torlauncher.quit_win=خروج torlauncher.done=تم torlauncher.forAssistance=للمساعدة, اتصل بـ %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=تم إكمال النسخ. %S من رسائل سجل تور جاهزة لنسخها في محرر نصوص أو رسالة بريد إلكتروني. diff --git a/src/chrome/locale/de/torlauncher.properties b/src/chrome/locale/de/torlauncher.properties index 0da42da..4c4209e 100644 --- a/src/chrome/locale/de/torlauncher.properties +++ b/src/chrome/locale/de/torlauncher.properties @@ -36,6 +36,7 @@ torlauncher.quit_win=Beenden torlauncher.done=Fertig torlauncher.forAssistance=Falls Sie Hilfe benötigen, kontaktieren Sie %S +torlauncher.forAssistance2=Falls Sie Hilfe benötigen, besuchen Sie %S torlauncher.copiedNLogMessages=Kopie vollständig. %S Tor-Protokollnachrichten sind bereit, um in eine Textbearbeitung oder in eine E-Mail-Nachricht eingefügt zu werden. diff --git a/src/chrome/locale/es/torlauncher.properties b/src/chrome/locale/es/torlauncher.properties index 42780e5..bc309d7 100644 --- a/src/chrome/locale/es/torlauncher.properties +++ b/src/chrome/locale/es/torlauncher.properties @@ -36,6 +36,7 @@ torlauncher.quit_win=Salir torlauncher.done=Listo torlauncher.forAssistance=Para obtener ayuda, contacte con %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copia completada. %S mensajes de registro ('log') de Tor están listos para ser pegados en un editor de texto o en un mensaje de correo electrónico. diff --git a/src/chrome/locale/fa/torlauncher.properties b/src/chrome/locale/fa/torlauncher.properties index bdd5c09..88d84f9 100644 --- a/src/chrome/locale/fa/torlauncher.properties +++ b/src/chrome/locale/fa/torlauncher.properties @@ -36,6 +36,7 @@ torlauncher.quit_win=خروج torlauncher.done=انجام شد torlauncher.forAssistance=برای دریافت کمک٫ با %S تماس بگیرید +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=کپی کامل شد. %S پیامهای ثبت شده آماده است تا Paste شود در ویرایشگر متن یا یک ایمیل. diff --git a/src/chrome/locale/fr/torlauncher.properties b/src/chrome/locale/fr/torlauncher.properties index 6949020..1fb7eb7 100644 --- a/src/chrome/locale/fr/torlauncher.properties +++ b/src/chrome/locale/fr/torlauncher.properties @@ -36,6 +36,7 @@ torlauncher.quit_win=Sortir torlauncher.done=Terminé torlauncher.forAssistance=Pour obtenir de l'aide, contactez %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=La copie est terminée. %S messages de journalisation de Tor sont prêts à être coller dans un éditeur de texte ou un courriel. diff --git a/src/chrome/locale/it/torlauncher.properties b/src/chrome/locale/it/torlauncher.properties index b5729ed..96273d2 100644 --- a/src/chrome/locale/it/torlauncher.properties +++ b/src/chrome/locale/it/torlauncher.properties @@ -36,6 +36,7 @@ torlauncher.quit_win=Esci torlauncher.done=Fatto torlauncher.forAssistance=Per richiedere assistenza, contattare %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copia completata. %S Messaggi di log Tor sono pronti per essere incollato in un editor di testo o un messaggio e-mail. diff --git a/src/chrome/locale/ja/torlauncher.properties b/src/chrome/locale/ja/torlauncher.properties index c679f1d..293c25f 100644 --- a/src/chrome/locale/ja/torlauncher.properties +++ b/src/chrome/locale/ja/torlauncher.properties @@ -36,6 +36,7 @@ torlauncher.quit_win=終了 torlauncher.done=完了 torlauncher.forAssistance=サポートについては、%Sにお問い合わせください +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=コピー成功。 %S個のTorログファイルがテキストエディターやEメールにペーストする準備ができました。 diff --git a/src/chrome/locale/ko/torlauncher.properties b/src/chrome/locale/ko/torlauncher.properties index c20a6ac..a8feef9 100644 --- a/src/chrome/locale/ko/torlauncher.properties +++ b/src/chrome/locale/ko/torlauncher.properties @@ -36,6 +36,7 @@ torlauncher.quit_win=종료 torlauncher.done=완료 torlauncher.forAssistance=지원자 연결 %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=복사 완료. %S Tor 로그 메시지는 텍스트 편집기 나 이메일 메시지에 붙여 넣을 수 있는 상태가 됩니다. diff --git a/src/chrome/locale/nl/torlauncher.properties b/src/chrome/locale/nl/torlauncher.properties index 12c0bf7..1f54f8a 100644 --- a/src/chrome/locale/nl/torlauncher.properties +++ b/src/chrome/locale/nl/torlauncher.properties @@ -36,6 +36,7 @@ torlauncher.quit_win=Sluit af torlauncher.done=OK torlauncher.forAssistance=Voor hulp, contacteer %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Kopiëren klaar. %S Tor logberichten zijn klaar om in een teksteditor of een e-mailbericht te worden geplakt. diff --git a/src/chrome/locale/pl/torlauncher.properties b/src/chrome/locale/pl/torlauncher.properties index 7ba4f88..89e0ffb 100644 --- a/src/chrome/locale/pl/torlauncher.properties +++ b/src/chrome/locale/pl/torlauncher.properties @@ -36,6 +36,7 @@ torlauncher.quit_win=Wyjście torlauncher.done=Gotowe torlauncher.forAssistance=By uzyskać pomoc, skontaktuj się +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Kopia zakończona. %S logi Tora są gotowe do wklejenia do notatnika lub wiadomości email. diff --git a/src/chrome/locale/pt/torlauncher.properties b/src/chrome/locale/pt/torlauncher.properties index 45b7a61..f8ff150 100644 --- a/src/chrome/locale/pt/torlauncher.properties +++ b/src/chrome/locale/pt/torlauncher.properties @@ -36,6 +36,7 @@ torlauncher.quit_win=Sair torlauncher.done=Concluído torlauncher.forAssistance=Para assistência, contacte %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Cópia completa. Estão prontas %S mensagens do registo de eventos do Tor para serem coladas num editor de texto ou numa mensagem de correio eletrónico. diff --git a/src/chrome/locale/ru/torlauncher.properties b/src/chrome/locale/ru/torlauncher.properties index 0b68b18..bfae389 100644 --- a/src/chrome/locale/ru/torlauncher.properties +++ b/src/chrome/locale/ru/torlauncher.properties @@ -36,6 +36,7 @@ torlauncher.quit_win=Выход torlauncher.done=Готово torlauncher.forAssistance=Для помощи свяжитесь с %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Копирование завершено. %S собщение с логами Tor находятся в буфере обмена и могут быть вставлены в текстовый редактор или email. diff --git a/src/chrome/locale/tr/torlauncher.properties b/src/chrome/locale/tr/torlauncher.properties index 3b88714..c8b7ced 100644 --- a/src/chrome/locale/tr/torlauncher.properties +++ b/src/chrome/locale/tr/torlauncher.properties @@ -36,6 +36,7 @@ torlauncher.quit_win=Çıkış torlauncher.done=Tamamlandı torlauncher.forAssistance=Yardım için %S ile görüşün +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Kopyalama tamamlandı. %S Tor günlük iletisi bir metin düzenleyici ya da e-posta iletisine kopyalanmaya hazır. diff --git a/src/chrome/locale/vi/torlauncher.properties b/src/chrome/locale/vi/torlauncher.properties index 4ced031..fdd811f 100644 --- a/src/chrome/locale/vi/torlauncher.properties +++ b/src/chrome/locale/vi/torlauncher.properties @@ -36,6 +36,7 @@ torlauncher.quit_win=Thoát torlauncher.done=Hoàn thành torlauncher.forAssistance=Để được trợ giúp, liên hệ %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/zh-CN/torlauncher.properties b/src/chrome/locale/zh-CN/torlauncher.properties index 828415a..a5c3e49 100644 --- a/src/chrome/locale/zh-CN/torlauncher.properties +++ b/src/chrome/locale/zh-CN/torlauncher.properties @@ -36,6 +36,7 @@ torlauncher.quit_win=关闭 torlauncher.done=完成 torlauncher.forAssistance=如需帮助，请联系 %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=复制完成。%S 条 Tor 日志信息已准备好，可以将其粘贴到文本编辑器或电子邮件中。

1 0

[tor-browser/tor-browser-45.0.2esr-6.x-1] Bug 18821: Disable libmdns for Android and Desktop
by gk＠torproject.org 21 Apr '16

21 Apr '16

commit 7ce38290aaac3b6351061f9ecc5cd6751d10edb4 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 20 14:34:50 2016 +0000 Bug 18821: Disable libmdns for Android and Desktop There should be no need to remove the OS X support introduced in https://bugzilla.mozilla.org/show_bug.cgi?id=1225726 as enabling this is governed by a preference (which is actually set to `false`). However, we remove it at build time as well (defense in depth). This is basically a backout of the relevant passages of https://hg.mozilla.org/mozilla-central/rev/6bfb430de85d, https://hg.mozilla.org/mozilla-central/rev/609b337bf7ab and https://hg.mozilla.org/mozilla-central/rev/8e092ec5fbbd. --- .../provider/PresentationDeviceProviderModule.cpp | 2 +- mobile/android/installer/package-manifest.in | 2 -- netwerk/dns/mdns/libmdns/moz.build | 22 +++++++--------------- netwerk/dns/mdns/libmdns/nsMulticastDNSModule.cpp | 2 +- 4 files changed, 9 insertions(+), 19 deletions(-) diff --git a/dom/presentation/provider/PresentationDeviceProviderModule.cpp b/dom/presentation/provider/PresentationDeviceProviderModule.cpp index aafbed0..1e65208 100644 --- a/dom/presentation/provider/PresentationDeviceProviderModule.cpp +++ b/dom/presentation/provider/PresentationDeviceProviderModule.cpp @@ -28,7 +28,7 @@ static const mozilla::Module::ContractIDEntry kPresentationDeviceProviderContrac }; static const mozilla::Module::CategoryEntry kPresentationDeviceProviderCategories[] = { -#if defined(MOZ_WIDGET_COCOA) || defined(MOZ_WIDGET_ANDROID) || (defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 16) +#if defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 16 { PRESENTATION_DEVICE_PROVIDER_CATEGORY, "MulticastDNSDeviceProvider", MULTICAST_DNS_PROVIDER_CONTRACT_ID }, #endif { nullptr } diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in index ac6ef47..53dbb1c 100644 --- a/mobile/android/installer/package-manifest.in +++ b/mobile/android/installer/package-manifest.in @@ -328,8 +328,6 @@ @BINPATH@/components/BrowserComponents.manifest @BINPATH@/components/nsBrowserContentHandler.js @BINPATH@/components/nsBrowserGlue.js -@BINPATH@/components/nsDNSServiceDiscovery.manifest -@BINPATH@/components/nsDNSServiceDiscovery.js @BINPATH@/components/nsSetDefaultBrowser.manifest @BINPATH@/components/nsSetDefaultBrowser.js @BINPATH@/components/toolkitsearch.manifest diff --git a/netwerk/dns/mdns/libmdns/moz.build b/netwerk/dns/mdns/libmdns/moz.build index 6671b5c..dcae472 100644 --- a/netwerk/dns/mdns/libmdns/moz.build +++ b/netwerk/dns/mdns/libmdns/moz.build @@ -4,14 +4,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': - EXTRA_COMPONENTS += [ - 'nsDNSServiceDiscovery.js', - 'nsDNSServiceDiscovery.manifest', - ] - -elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa' or \ - (CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['ANDROID_VERSION'] >= '16'): +if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['ANDROID_VERSION'] >= '16': UNIFIED_SOURCES += [ 'MDNSResponderOperator.cpp', 'MDNSResponderReply.cpp', @@ -19,15 +12,14 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa' or \ ] LOCAL_INCLUDES += [ - '/netwerk/base', + '%' + '%s/%s' % (CONFIG['ANDROID_SOURCE'], d) for d in [ + 'external/mdnsresponder/mDNSShared', + ] ] - if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': - LOCAL_INCLUDES += [ - '%' + '%s/%s' % (CONFIG['ANDROID_SOURCE'], d) for d in [ - 'external/mdnsresponder/mDNSShared', - ] - ] + LOCAL_INCLUDES += [ + '/netwerk/base', + ] UNIFIED_SOURCES += [ 'nsDNSServiceInfo.cpp', diff --git a/netwerk/dns/mdns/libmdns/nsMulticastDNSModule.cpp b/netwerk/dns/mdns/libmdns/nsMulticastDNSModule.cpp index 22bad3b..1ab3993 100644 --- a/netwerk/dns/mdns/libmdns/nsMulticastDNSModule.cpp +++ b/netwerk/dns/mdns/libmdns/nsMulticastDNSModule.cpp @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#if defined(MOZ_WIDGET_COCOA) || (defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 16) +#if defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 16 #define ENABLE_DNS_SERVICE_DISCOVERY #endif

1 0