May 2016 - tor-commits - lists.torproject.org

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 17 May '16

17 May '16

commit 3f732fe04ab3a32ef9a4a0d38480d334ceadc02e Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 17 12:45:30 2016 +0000 Update translations for torbirdy --- es/torbirdy.properties | 2 +- zh_CN/torbirdy.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/es/torbirdy.properties b/es/torbirdy.properties index a5cba24..46162f7 100644 --- a/es/torbirdy.properties +++ b/es/torbirdy.properties @@ -6,7 +6,7 @@ torbirdy.enabled.custom=TorBirdy habilitado: usando proxy personalizado torbirdy.enabled.torification=TorBirdy habilitado: usando torificación transparente torbirdy.enabled.whonix=Torbirdy habilitado: usando Whonix (virtualización) torbirdy.disabled=TorBirdy: ¡Deshabilitado! -torbirdy.enabled=TorBirdy: Enabled +torbirdy.enabled=TorBirdy: Habilitado torbirdy.email.prompt=TorBirdy ha deshabilitado el asistente de auto-configuración de Thunderbird para proteger su anonimato.\n\nHan sido establecidos los parámetros recomendados de seguridad para %S.\n\nAhora puede configurar el resto de parámetros de la cuenta manualmente. diff --git a/zh_CN/torbirdy.properties b/zh_CN/torbirdy.properties index bff118c..ba7259b 100644 --- a/zh_CN/torbirdy.properties +++ b/zh_CN/torbirdy.properties @@ -6,7 +6,7 @@ torbirdy.enabled.custom=TorBirdy 已启用：自定义代理 torbirdy.enabled.torification=TorBirdy 已启用：透明 Torification torbirdy.enabled.whonix=TorBirdy 已启用：Whonix torbirdy.disabled=TorBirdy：已禁用！ -torbirdy.enabled=TorBirdy: Enabled +torbirdy.enabled=TorBirdy：已启用 torbirdy.email.prompt=TorBirdy 已禁用 Thunderbird 自动配置向导以保护你的匿名性。\n\n已设置为 %S 的建议安全设置。\n\n现在可手动配置其他帐户设置。

1 0

[tor-launcher/master] Bug 18947: not starting on OS X if put into /Applications
by gk＠torproject.org 17 May '16

17 May '16

commit 7ee11f5d012773445cc21a86bb1e8d423b15093d Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon May 16 10:48:51 2016 -0400 Bug 18947: not starting on OS X if put into /Applications Display a better error message if tor exits and Tor Launcher was never able to establish a connection to the control port (pointing users to a possible error in their torrc may help them find and fix the startup problem themselves). --- src/chrome/locale/en/torlauncher.properties | 1 + src/components/tl-process.js | 21 ++++++++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties index 6b471a3..24bb4d6 100644 --- a/src/chrome/locale/en/torlauncher.properties +++ b/src/chrome/locale/en/torlauncher.properties @@ -3,6 +3,7 @@ torlauncher.error_title=Tor Launcher +torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 7daa31f..ba50310 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -150,8 +150,25 @@ TorProcessService.prototype = { this.mProtocolSvc.TorCleanupConnection(); - var s = TorLauncherUtil.getLocalizedString("tor_exited") + "\n\n" + let s; + if (!this.mDidConnectToTorControlPort) + { + // The "tor_exited_during_startup" property string was added in + // May 2016. If it is available, we use it; otherwise, we fall back + // to the older "tor_exited" message (below). Once this new string + // has been translated into all of the languages that we ship, we + // can simplify this code. + let key = "tor_exited_during_startup"; + s = TorLauncherUtil.getLocalizedString(key) + if (s == key) // No string found for key. + s = undefined; + } + + if (!s) + { + s = TorLauncherUtil.getLocalizedString("tor_exited") + "\n\n" + TorLauncherUtil.getLocalizedString("tor_exited2"); + } TorLauncherLogger.log(4, s); var defaultBtnLabel = TorLauncherUtil.getLocalizedString("restart_tor"); var cancelBtnLabel = "OK"; @@ -178,6 +195,7 @@ TorProcessService.prototype = var haveConnection = this.mProtocolSvc.TorHaveControlConnection(); if (haveConnection) { + this.mDidConnectToTorControlPort = true; this.mControlConnTimer = null; this.mTorProcessStatus = this.kStatusRunning; this.mProtocolSvc.TorStartEventMonitor(); @@ -282,6 +300,7 @@ TorProcessService.prototype = // Private Member Variables //////////////////////////////////////////////// mTorProcessStatus: 0, // kStatusUnknown + mDidConnectToTorControlPort: false, // Have we ever made a connection? mIsBootstrapDone: false, mBootstrapErrorOccurred: false, mIsQuitting: false,

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 17 May '16

17 May '16

commit fec5a526b94ca190fadfd44bf58fffa3aca0f3ca Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 17 11:15:50 2016 +0000 Update translations for tor-launcher-network-settings_completed --- tr/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tr/network-settings.dtd b/tr/network-settings.dtd index adcf972..a0881ff 100644 --- a/tr/network-settings.dtd +++ b/tr/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Tor Günlüğünü Panoya Kopyala"> <!ENTITY torsettings.bridgeHelpTitle "Köprü Aktarıcı Yardımı"> <!ENTITY torsettings.bridgeHelp1 "Tor ağına bağlanamıyorsanız, kullandığınız İnternet Servis Sağlayıcısı (ISS) ya da başka bir kurum Tor 'u engelliyor olabilir. Bu sorunu çoğunlukla, engellenmesi daha zor olan listelenmeyen aktarıcılar, Tor Köprülerini kullanarak çözebilirsiniz."> -<!ENTITY torsettings.bridgeHelp1B "Önceden ayarlanan, sunulan köprü adreslerini kullanabilirsiniz veya şu üç yöntemden biriyle özel adresler edinebilirsiniz:"> +<!ENTITY torsettings.bridgeHelp1B "Önceden ayarlanmış, sunulan köprü adreslerini kullanabilir ya da şu üç yöntemden biriyle özel adresler edinebilirsiniz:"> <!ENTITY torsettings.bridgeHelp2Heading "Web yoluyla"> <!ENTITY torsettings.bridgeHelp2 "Bir web tarayıcısı kullanarak https://bridges.torproject.org adresini ziyaret edin"> <!ENTITY torsettings.bridgeHelp3Heading "Otomatik e-posta yanıtı yoluyla">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 17 May '16

17 May '16

commit ace34d43c48d56d0948f2bf5399a1311c657ca17 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 17 11:15:47 2016 +0000 Update translations for tor-launcher-network-settings --- tr/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tr/network-settings.dtd b/tr/network-settings.dtd index adcf972..a0881ff 100644 --- a/tr/network-settings.dtd +++ b/tr/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Tor Günlüğünü Panoya Kopyala"> <!ENTITY torsettings.bridgeHelpTitle "Köprü Aktarıcı Yardımı"> <!ENTITY torsettings.bridgeHelp1 "Tor ağına bağlanamıyorsanız, kullandığınız İnternet Servis Sağlayıcısı (ISS) ya da başka bir kurum Tor 'u engelliyor olabilir. Bu sorunu çoğunlukla, engellenmesi daha zor olan listelenmeyen aktarıcılar, Tor Köprülerini kullanarak çözebilirsiniz."> -<!ENTITY torsettings.bridgeHelp1B "Önceden ayarlanan, sunulan köprü adreslerini kullanabilirsiniz veya şu üç yöntemden biriyle özel adresler edinebilirsiniz:"> +<!ENTITY torsettings.bridgeHelp1B "Önceden ayarlanmış, sunulan köprü adreslerini kullanabilir ya da şu üç yöntemden biriyle özel adresler edinebilirsiniz:"> <!ENTITY torsettings.bridgeHelp2Heading "Web yoluyla"> <!ENTITY torsettings.bridgeHelp2 "Bir web tarayıcısı kullanarak https://bridges.torproject.org adresini ziyaret edin"> <!ENTITY torsettings.bridgeHelp3Heading "Otomatik e-posta yanıtı yoluyla">

1 0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 17 May '16

17 May '16

commit 48e03aad1d11e451811d12c1919f713e23e3bcef Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 17 11:15:41 2016 +0000 Update translations for tor-launcher-properties_completed --- tr/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tr/torlauncher.properties b/tr/torlauncher.properties index 863d279..99f146e 100644 --- a/tr/torlauncher.properties +++ b/tr/torlauncher.properties @@ -36,7 +36,7 @@ torlauncher.quit_win=Çıkış torlauncher.done=Tamamlandı torlauncher.forAssistance=Yardım için %S ile görüşün -torlauncher.forAssistance2=Yardım almak için, %S 'i ziyaret edin +torlauncher.forAssistance2=Yardım almak için, %S sayfasına bakın torlauncher.copiedNLogMessages=Kopyalama tamamlandı. %S Tor günlük iletisi bir metin düzenleyici ya da e-posta iletisine kopyalanmaya hazır.

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 17 May '16

17 May '16

commit 7de06576970d7230a03e788afa9caa90cc219d14 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 17 11:15:38 2016 +0000 Update translations for tor-launcher-properties --- tr/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tr/torlauncher.properties b/tr/torlauncher.properties index 863d279..99f146e 100644 --- a/tr/torlauncher.properties +++ b/tr/torlauncher.properties @@ -36,7 +36,7 @@ torlauncher.quit_win=Çıkış torlauncher.done=Tamamlandı torlauncher.forAssistance=Yardım için %S ile görüşün -torlauncher.forAssistance2=Yardım almak için, %S 'i ziyaret edin +torlauncher.forAssistance2=Yardım almak için, %S sayfasına bakın torlauncher.copiedNLogMessages=Kopyalama tamamlandı. %S Tor günlük iletisi bir metin düzenleyici ya da e-posta iletisine kopyalanmaya hazır.

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 17 May '16

17 May '16

commit fec18dcac9503883189a41ea0f274960eb329d14 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 17 11:15:33 2016 +0000 Update translations for torbirdy_completed --- tr/torbirdy.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/tr/torbirdy.properties b/tr/torbirdy.properties index 0bba03c..363c34a 100644 --- a/tr/torbirdy.properties +++ b/tr/torbirdy.properties @@ -6,6 +6,7 @@ torbirdy.enabled.custom=TorBirdy Etkinleştirildi: Özel Vekil Sunucu torbirdy.enabled.torification=TorBirdy Etkinleştirildi: Şeffaf Tor İletişimi torbirdy.enabled.whonix=TorBirdy Etkinleştirildi: Whonix torbirdy.disabled=TorBirdy: Devre Dışı! +torbirdy.enabled=TorBirdy: Etkin torbirdy.email.prompt=Gizliliğinizi korumak için Thunderbird otomatik ayar yardımcısı TorBirdy tarafından devre dışı bırakıldı.\n \n%S için önerilen güvenlik ayarları yapıldı.\n\nArtık diğer hesap ayarlarını el ile yapabilirsiniz.

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 17 May '16

17 May '16

commit 096e9d63486efd3a920b00b8e19f98fb2621a9eb Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 17 11:15:28 2016 +0000 Update translations for torbirdy --- tr/torbirdy.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tr/torbirdy.properties b/tr/torbirdy.properties index e32f1ed..363c34a 100644 --- a/tr/torbirdy.properties +++ b/tr/torbirdy.properties @@ -6,7 +6,7 @@ torbirdy.enabled.custom=TorBirdy Etkinleştirildi: Özel Vekil Sunucu torbirdy.enabled.torification=TorBirdy Etkinleştirildi: Şeffaf Tor İletişimi torbirdy.enabled.whonix=TorBirdy Etkinleştirildi: Whonix torbirdy.disabled=TorBirdy: Devre Dışı! -torbirdy.enabled=TorBirdy: Enabled +torbirdy.enabled=TorBirdy: Etkin torbirdy.email.prompt=Gizliliğinizi korumak için Thunderbird otomatik ayar yardımcısı TorBirdy tarafından devre dışı bırakıldı.\n \n%S için önerilen güvenlik ayarları yapıldı.\n\nArtık diğer hesap ayarlarını el ile yapabilirsiniz.

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 17 May '16

17 May '16

commit cd9c1039fdab119ff7f57cb62b4507087b4e6a1f Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 17 10:15:33 2016 +0000 Update translations for torbirdy_completed --- nb/torbirdy.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/nb/torbirdy.properties b/nb/torbirdy.properties index d848168..5011306 100644 --- a/nb/torbirdy.properties +++ b/nb/torbirdy.properties @@ -6,6 +6,7 @@ torbirdy.enabled.custom=TorBirdy aktivert: egendefinert mellomtjener torbirdy.enabled.torification=TorBirdy Aktivert: Transparent Torification torbirdy.enabled.whonix=TorBirdy Aktivert: Whonix torbirdy.disabled=TorBirdy: Deaktivert! +torbirdy.enabled=TorBirdy Aktivert torbirdy.email.prompt=TorBirdy har skrudd av Thunderbirds oppsettshjelp for å beskytte anonymiteten din.\n\nDe anbefalte sikkerhetsinnstillingene for %S er i bruk.\n\nDu kan nå sette opp de andre kontoinnstillingene manuelt.

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 17 May '16

17 May '16

commit 2ccb3914f3fdbc687c84805552abac4ba8cc120e Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 17 10:15:29 2016 +0000 Update translations for torbirdy --- nb/torbirdy.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nb/torbirdy.properties b/nb/torbirdy.properties index 128bceb..5011306 100644 --- a/nb/torbirdy.properties +++ b/nb/torbirdy.properties @@ -6,7 +6,7 @@ torbirdy.enabled.custom=TorBirdy aktivert: egendefinert mellomtjener torbirdy.enabled.torification=TorBirdy Aktivert: Transparent Torification torbirdy.enabled.whonix=TorBirdy Aktivert: Whonix torbirdy.disabled=TorBirdy: Deaktivert! -torbirdy.enabled=TorBirdy: Enabled +torbirdy.enabled=TorBirdy Aktivert torbirdy.email.prompt=TorBirdy har skrudd av Thunderbirds oppsettshjelp for å beskytte anonymiteten din.\n\nDe anbefalte sikkerhetsinnstillingene for %S er i bruk.\n\nDu kan nå sette opp de andre kontoinnstillingene manuelt.

1 0