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

[translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
by translation＠torproject.org 21 Dec '16

21 Dec '16

commit 4881038f939d6dd717edb33949a355c6364f2cf1 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 21 20:46:23 2016 +0000 Update translations for abouttor-homepage_completed --- hu/aboutTor.dtd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hu/aboutTor.dtd b/hu/aboutTor.dtd index b937ee6..d79c0c5 100644 --- a/hu/aboutTor.dtd +++ b/hu/aboutTor.dtd @@ -20,7 +20,6 @@ <!ENTITY aboutTor.search.label "Keresés"> -<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> <!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> @@ -32,6 +31,8 @@ <!ENTITY aboutTor.whatnextAnswer.label "Tor NEM minden, amire szükséged van az anonim böngészéshez! Esetleg szükség lehet arra, hogy megváltoztasd a böngészési szokásaidat, hogy biztosítsd a személyazonosságod biztonságát."> <!ENTITY aboutTor.whatnext.label "Tippek a névtelennek maradáshoz »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Felhasználói Kézikönyv »"> +<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org"> <!ENTITY aboutTor.helpInfo1.label "Te is segíthetsz!"> <!ENTITY aboutTor.helpInfo2.label "Több lehetősége van segíteni abban, hogy a Tor hálózatot gyorssá és erőssé tegye:"> <!ENTITY aboutTor.helpInfo3.label "Futtasson Tor Relét »">

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 21 Dec '16

21 Dec '16

commit 07049a12afd23bd0db79fb08fcd145663750ef98 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 21 20:46:19 2016 +0000 Update translations for abouttor-homepage --- hu/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hu/aboutTor.dtd b/hu/aboutTor.dtd index 7b89f41..d79c0c5 100644 --- a/hu/aboutTor.dtd +++ b/hu/aboutTor.dtd @@ -31,7 +31,7 @@ <!ENTITY aboutTor.whatnextAnswer.label "Tor NEM minden, amire szükséged van az anonim böngészéshez! Esetleg szükség lehet arra, hogy megváltoztasd a böngészési szokásaidat, hogy biztosítsd a személyazonosságod biztonságát."> <!ENTITY aboutTor.whatnext.label "Tippek a névtelennek maradáshoz »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser User Manual »"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Felhasználói Kézikönyv »"> <!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org"> <!ENTITY aboutTor.helpInfo1.label "Te is segíthetsz!"> <!ENTITY aboutTor.helpInfo2.label "Több lehetősége van segíteni abban, hogy a Tor hálózatot gyorssá és erőssé tegye:">

1 0

[translation/tor-messenger-privproperties_completed] Update translations for tor-messenger-privproperties_completed
by translation＠torproject.org 21 Dec '16

21 Dec '16

commit 919c540163c9cbad5defaf9bea6984276e853af6 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 21 19:48:08 2016 +0000 Update translations for tor-messenger-privproperties_completed --- fr/priv.properties | 2 +- fr_CA/priv.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fr/priv.properties b/fr/priv.properties index 157511f..c91676a 100644 --- a/fr/priv.properties +++ b/fr/priv.properties @@ -1,2 +1,2 @@ priv.account=Génération d'une clé privée pour %S (%S)... -priv.failed=Échec de génération de la clef : %S +priv.failed=Échec de génération de la clé : %S diff --git a/fr_CA/priv.properties b/fr_CA/priv.properties index 157511f..c91676a 100644 --- a/fr_CA/priv.properties +++ b/fr_CA/priv.properties @@ -1,2 +1,2 @@ priv.account=Génération d'une clé privée pour %S (%S)... -priv.failed=Échec de génération de la clef : %S +priv.failed=Échec de génération de la clé : %S

1 0

[translation/tor-messenger-privproperties] Update translations for tor-messenger-privproperties
by translation＠torproject.org 21 Dec '16

21 Dec '16

commit 7b49ef845a376e65a192844e282bd03e857a82d7 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 21 19:48:04 2016 +0000 Update translations for tor-messenger-privproperties --- fr/priv.properties | 2 +- fr_CA/priv.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fr/priv.properties b/fr/priv.properties index 157511f..c91676a 100644 --- a/fr/priv.properties +++ b/fr/priv.properties @@ -1,2 +1,2 @@ priv.account=Génération d'une clé privée pour %S (%S)... -priv.failed=Échec de génération de la clef : %S +priv.failed=Échec de génération de la clé : %S diff --git a/fr_CA/priv.properties b/fr_CA/priv.properties index 157511f..c91676a 100644 --- a/fr_CA/priv.properties +++ b/fr_CA/priv.properties @@ -1,2 +1,2 @@ priv.account=Génération d'une clé privée pour %S (%S)... -priv.failed=Échec de génération de la clef : %S +priv.failed=Échec de génération de la clé : %S

1 0

[translation/tor-messenger-privdtd_completed] Update translations for tor-messenger-privdtd_completed
by translation＠torproject.org 21 Dec '16

21 Dec '16

commit cbc518b25986a7b5f50741b541321af767521865 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 21 19:48:00 2016 +0000 Update translations for tor-messenger-privdtd_completed --- fr/priv.dtd | 2 +- fr_CA/priv.dtd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fr/priv.dtd b/fr/priv.dtd index 59634c3..48a9ada 100644 --- a/fr/priv.dtd +++ b/fr/priv.dtd @@ -1,2 +1,2 @@ <!ENTITY privDialog.title "Génération de la clé privée"> -<!ENTITY privDialog.done "Terminé"> \ No newline at end of file +<!ENTITY privDialog.done "Fait"> \ No newline at end of file diff --git a/fr_CA/priv.dtd b/fr_CA/priv.dtd index 1f74020..48a9ada 100644 --- a/fr_CA/priv.dtd +++ b/fr_CA/priv.dtd @@ -1,2 +1,2 @@ -<!ENTITY privDialog.title "Création de la clé privée"> +<!ENTITY privDialog.title "Génération de la clé privée"> <!ENTITY privDialog.done "Fait"> \ No newline at end of file

1 0

[translation/tor-messenger-privdtd] Update translations for tor-messenger-privdtd
by translation＠torproject.org 21 Dec '16

21 Dec '16

commit dd440ac82820cba4bbac109191f5d439fca22a3d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 21 19:47:54 2016 +0000 Update translations for tor-messenger-privdtd --- fr/priv.dtd | 2 +- fr_CA/priv.dtd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fr/priv.dtd b/fr/priv.dtd index 59634c3..48a9ada 100644 --- a/fr/priv.dtd +++ b/fr/priv.dtd @@ -1,2 +1,2 @@ <!ENTITY privDialog.title "Génération de la clé privée"> -<!ENTITY privDialog.done "Terminé"> \ No newline at end of file +<!ENTITY privDialog.done "Fait"> \ No newline at end of file diff --git a/fr_CA/priv.dtd b/fr_CA/priv.dtd index 1f74020..48a9ada 100644 --- a/fr_CA/priv.dtd +++ b/fr_CA/priv.dtd @@ -1,2 +1,2 @@ -<!ENTITY privDialog.title "Création de la clé privée"> +<!ENTITY privDialog.title "Génération de la clé privée"> <!ENTITY privDialog.done "Fait"> \ No newline at end of file

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 21 Dec '16

21 Dec '16

commit 416f86a182f1440394da53c26e01c63479a4979a Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 21 19:16:35 2016 +0000 Update translations for torbutton-torbuttonproperties --- la/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/la/torbutton.properties b/la/torbutton.properties index 2f70923..73ab3cb 100644 --- a/la/torbutton.properties +++ b/la/torbutton.properties @@ -10,7 +10,7 @@ torbutton.panel.tooltip.disabled = Preme murem, ut Tor adsit torbutton.panel.tooltip.enabled = Preme murem, ut Tor desit torbutton.panel.label.disabled = Tor deest torbutton.panel.label.enabled = Tor adest -extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. +extensions.torbutton(a)torproject.org.description = Circulus Toris circulum dat, quo praeferentias Toris mutare et cito facileque informationem navigandi delere potes. torbutton.popup.external.title = Download an external file type? torbutton.popup.external.app = Tor Browser cannot display this file. You will need to open it with another application.\n\n torbutton.popup.external.note = Some types of files can cause applications to connect to the Internet without using Tor.\n\n

1 0

[sandboxed-tor-browser/master] Bug 21055: Fall back gracefully if the Adwaita theme is not present.
by yawning＠torproject.org 21 Dec '16

21 Dec '16

commit 8aaa94a766a4154be4027a65aa86ad000d696f07 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Wed Dec 21 18:33:18 2016 +0000 Bug 21055: Fall back gracefully if the Adwaita theme is not present. This will look horrendous, because the default Gtk+-2.0 appearnce is such, but it should work even on weird systems that don't have the "Standard GNOME theme" installed. --- ChangeLog | 1 + README.md | 1 + data/gtkrc-2.0-fallback | 1 + .../internal/sandbox/application.go | 66 +++++++++++++++------- 4 files changed, 49 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index f68edb8..ace155d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ Changes in version 0.0.3 - UNRELEASED: + * Bug 21055: Fall back gracefully if the Adwaita theme is not present. * Bug 20791: Fetch install/update metadata using onions. * Bug 20979: runtime/cgo: pthread_create failed: Resource temporarily unavailable. diff --git a/README.md b/README.md index c054980..9e1ec83 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,7 @@ Runtime dependencies: * bubblewrap >= 0.1.3 (https://github.com/projectatomic/bubblewrap) * Gtk+ >= 3.14.0 * (Optional) PulseAudio + * (Optional) Adwaita Gtk+-2.0 theme Build time dependencies: diff --git a/data/gtkrc-2.0-fallback b/data/gtkrc-2.0-fallback new file mode 100644 index 0000000..e3f6a86 --- /dev/null +++ b/data/gtkrc-2.0-fallback @@ -0,0 +1 @@ +gtk-font-name = "Arimo 11" diff --git a/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go b/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go index 4cff1c7..122e714 100644 --- a/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go +++ b/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go @@ -76,13 +76,9 @@ func RunTorBrowser(cfg *config.Config, manif *config.Manifest, tor *tor.Tor) (cm if err = h.enableX11(cfg.Sandbox.Display); err != nil { return } - h.roBind("/usr/share/themes/Adwaita/gtk-2.0", "/usr/share/themes/Adwaita/gtk-2.0", false) - h.roBind("/usr/share/icons/Adwaita", "/usr/share/icons/Adwaita", false) + hasAdwaita := h.appendGtk2Theme() h.roBind("/usr/share/icons/hicolor", "/usr/share/icons/hicolor", true) h.roBind("/usr/share/mime", "/usr/share/mime", false) - gtkRcPath := filepath.Join(h.homeDir, ".gtkrc-2.0") - h.setenv("GTK2_RC_FILES", gtkRcPath) - h.assetFile(gtkRcPath, "gtkrc-2.0") pulseAudioWorks := false if cfg.Sandbox.EnablePulseAudio { @@ -261,7 +257,7 @@ func RunTorBrowser(cfg *config.Config, manif *config.Manifest, tor *tor.Tor) (cm // Gtk uses plugin libraries and shit for theming, and expecting // them to be in consistent locations, is too much to ask for. - gtkExtraLibs, gtkLibPaths, err := h.appendRestrictedGtk2() + gtkExtraLibs, gtkLibPaths, err := h.appendRestrictedGtk2(hasAdwaita) if err != nil { return nil, err } @@ -640,7 +636,34 @@ func (h *hugbox) appendRestrictedOpenGL() ([]string, string) { return nil, "" } -func (h *hugbox) appendRestrictedGtk2() ([]string, string, error) { +func (h *hugbox) appendGtk2Theme() bool { + const ( + themeDir = "/usr/share/themes/Adwaita/gtk-2.0" + iconDir = "/usr/share/themes/Adwaita" + adwaitaGtkrcAsset = "gtkrc-2.0" + + fallbackGtkrcAsset = "gtkrc-2.0-fallback" + ) + + gtkRc := fallbackGtkrcAsset + + hasAdwaita := DirExists(themeDir) && DirExists(iconDir) + if hasAdwaita { + h.roBind("/usr/share/themes/Adwaita/gtk-2.0", "/usr/share/themes/Adwaita/gtk-2.0", false) + h.roBind("/usr/share/icons/Adwaita", "/usr/share/icons/Adwaita", false) + gtkRc = adwaitaGtkrcAsset + } else { + log.Printf("sandbox: Failed to find Adwaita gtk-2.0 theme.") + } + + gtkRcPath := filepath.Join(h.homeDir, ".gtkrc-2.0") + h.setenv("GTK2_RC_FILES", gtkRcPath) + h.assetFile(gtkRcPath, gtkRc) + + return hasAdwaita +} + +func (h *hugbox) appendRestrictedGtk2(hasAdwaita bool) ([]string, string, error) { const ( libAdwaita = "libadwaita.so" libPixmap = "libpixmap.so" @@ -656,21 +679,24 @@ func (h *hugbox) appendRestrictedGtk2() ([]string, string, error) { gtkLibPath := "" setGtkPath := false - // Figure out where the system keeps the Gtk+-2.0 theme libraries, - // and bind mount in Adwaita and Pixmap. normGtkDir := filepath.Join(restrictedLibDir, "gtk-2.0", "2.10.0") - adwaitaPath := findDistributionDependentLibs(nil, engineSubDir, libAdwaita) - if adwaitaPath != "" { - gtkEngineDir, _ := filepath.Split(adwaitaPath) - normGtkEngineDir := filepath.Join(normGtkDir, "engines") - h.roBind(adwaitaPath, filepath.Join(normGtkEngineDir, libAdwaita), false) - h.roBind(filepath.Join(gtkEngineDir, libPixmap), filepath.Join(normGtkEngineDir, libPixmap), true) - setGtkPath = true - gtkLibs = append(gtkLibs, libAdwaita) - gtkLibPath = gtkLibPath + ":" + gtkEngineDir - } else { - log.Printf("sandbox: Failed to find gtk-2.0 libadwaita.so.") + // Figure out where the system keeps the Gtk+-2.0 theme libraries, + // and bind mount in Adwaita and Pixmap. + if hasAdwaita { + adwaitaPath := findDistributionDependentLibs(nil, engineSubDir, libAdwaita) + if adwaitaPath != "" { + gtkEngineDir, _ := filepath.Split(adwaitaPath) + normGtkEngineDir := filepath.Join(normGtkDir, "engines") + h.roBind(adwaitaPath, filepath.Join(normGtkEngineDir, libAdwaita), false) + h.roBind(filepath.Join(gtkEngineDir, libPixmap), filepath.Join(normGtkEngineDir, libPixmap), true) + + setGtkPath = true + gtkLibs = append(gtkLibs, libAdwaita) + gtkLibPath = gtkLibPath + ":" + gtkEngineDir + } else { + log.Printf("sandbox: Failed to find gtk-2.0 libadwaita.so.") + } } // Figure out where the system keeps the Gtk+-2.0 print backends,

1 0

[translation/tor_animation_completed] Update translations for tor_animation_completed
by translation＠torproject.org 21 Dec '16

21 Dec '16

commit d7ac3f17ca1154865c9b138a4793dd874beac230 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 21 17:17:02 2016 +0000 Update translations for tor_animation_completed --- fr.srt | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/fr.srt b/fr.srt index 178fe77..8981188 100644 --- a/fr.srt +++ b/fr.srt @@ -137,26 +137,29 @@ ne sauront même pas qui vous êtes, 30 00:01:47,540 --> 00:01:49,760 -ni de quelle région du monde vous venez +de quelle partie du monde +vous les visitez, 31 00:01:49,920 --> 00:01:51,920 -à moins que vous vous connectiez et identifiez. +à moins que vous ne vous connectiez +et leur disiez. 32 00:01:54,200 --> 00:01:55,840 -En téléchargeant et utilisant Tor, +En téléchargeant et en utilisant Tor, 33 00:01:56,200 --> 00:01:58,560 - vous protégerez les gens -qui ont besoin d'être anonymes, +vous pouvez protéger les personnes +recherchant l'anonymat, 34 00:01:58,880 --> 00:02:01,640 -tel que les activistes, journalistes et blogueurs. +telles que les activistes, les journalistes et les blogueurs. 35 00:02:02,000 --> 00:02:07,000 -Téléchargez et utilisez Tor ! Ou faites fonctionner un relais ! +Téléchargez et utilisez Tor ! +Ou mettez en place un relais !

1 0

[translation/tor_animation] Update translations for tor_animation
by translation＠torproject.org 21 Dec '16

21 Dec '16

commit 62433406517240c3544af63da9ec95392bdc2019 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 21 17:16:59 2016 +0000 Update translations for tor_animation --- fr.srt | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/fr.srt b/fr.srt index 178fe77..8981188 100644 --- a/fr.srt +++ b/fr.srt @@ -137,26 +137,29 @@ ne sauront même pas qui vous êtes, 30 00:01:47,540 --> 00:01:49,760 -ni de quelle région du monde vous venez +de quelle partie du monde +vous les visitez, 31 00:01:49,920 --> 00:01:51,920 -à moins que vous vous connectiez et identifiez. +à moins que vous ne vous connectiez +et leur disiez. 32 00:01:54,200 --> 00:01:55,840 -En téléchargeant et utilisant Tor, +En téléchargeant et en utilisant Tor, 33 00:01:56,200 --> 00:01:58,560 - vous protégerez les gens -qui ont besoin d'être anonymes, +vous pouvez protéger les personnes +recherchant l'anonymat, 34 00:01:58,880 --> 00:02:01,640 -tel que les activistes, journalistes et blogueurs. +telles que les activistes, les journalistes et les blogueurs. 35 00:02:02,000 --> 00:02:07,000 -Téléchargez et utilisez Tor ! Ou faites fonctionner un relais ! +Téléchargez et utilisez Tor ! +Ou mettez en place un relais !

1 0