June 2015 - tor-commits - lists.torproject.org

[translation/tor_animation] Update translations for tor_animation
by translation＠torproject.org 30 Jun '15

30 Jun '15

commit 808576a8d91b1fa7dc3c0c0e371583b984e52a23 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 30 20:16:15 2015 +0000 Update translations for tor_animation --- bg.srt | 172 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 86 insertions(+), 86 deletions(-) diff --git a/bg.srt b/bg.srt index 78c998d..083f374 100644 --- a/bg.srt +++ b/bg.srt @@ -1,165 +1,165 @@ 1 00:00:00,660 --> 00:00:02,780 -We've gotten very used to the Internet. +Свикнали сме с интернет. 2 00:00:03,120 --> 00:00:07,700 -We are constantly sharing information -about ourselves and our private lives: +Постоянно споделяме информация +за себе си и за личния си живот: 3 00:00:08,000 --> 00:00:09,960 -food we eat, people we meet, +храната, която ядем, хората, с които се срещаме, 4 00:00:10,180 --> 00:00:12,480 -places we go, and the stuff we read. +местата, на които ходим, и нещата, които четем. 5 00:00:13,280 --> 00:00:14,640 -Let me explain it better. +Нека обясня по-добре. 6 00:00:14,920 --> 00:00:17,740 -Right at this moment, -if someone attempts to look you up, +Точно в този момент, + ако някой реши да потърси информация за Вас, 7 00:00:18,060 --> 00:00:22,480 -they'll see your real identity, -precise location, operating system, +ще види истинската Ви самоличност, +точно местоположение, операционна система, 8 00:00:22,800 --> 00:00:26,500 -all the sites you've visited, -the browser you use to surf the web, +всички сайтове, които сте посетили, +браузърът, който използвате, 9 00:00:26,700 --> 00:00:29,140 -and so much more information -about you and your life +и още много информация +за Вас и живота Ви, 10 -00:00:29,620 --> 00:00:32,460 -which you probably didn't mean -to share with unknown strangers, +00:00:29,200 --> 00:00:31,500 +която вероятно не сте искали +да споделяте с непознати, 11 -00:00:32,920 --> 00:00:35,840 -who could easily use this data -to exploit you. +00:00:31,700 --> 00:00:34,000 +които лесно могат да използват тази информация, +за да Ви навредят. 12 -00:00:36,220 --> 00:00:38,120 -But not if you're using Tor! +00:00:34,500 --> 00:00:37,000 +Но не и ако използвате Tor! 13 -00:00:39,140 --> 00:00:42,840 -Tor Browser protects our privacy -and identity on the Internet. +00:00:37,140 --> 00:00:40,840 +Браузърът Tor защитава вашата лична +неприкосновеност и самоличност в Интернет. 14 -00:00:43,560 --> 00:00:46,760 -Tor secures your connection -with three layers of encryption +00:00:41,560 --> 00:00:44,760 +Tor подсигурява връзката Ви +чрез три слоя шифроване 15 -00:00:46,940 --> 00:00:51,760 -and passes it through three voluntarily -operated servers around the world, +00:00:44,940 --> 00:00:49,760 +и я прекарва през три доброволно +пуснати сървъра по света, 16 -00:00:52,280 --> 00:00:55,520 -which enables us to communicate -anonymously over the Internet. +00:00:50,280 --> 00:00:53,520 +което ни позволява да общуваме анонимно +през Интернет. 17 -00:00:58,560 --> 00:01:00,280 -Tor also protects our data +00:00:56,560 --> 00:00:58,280 +Освен това Tor защитава нашите данни 18 -00:01:00,400 --> 00:01:03,900 -against corporate or government targeted -and mass surveillance. +00:00:58,400 --> 00:01:01,900 +от корпоративно или правителствено +масово наблюдение. 19 -00:01:04,880 --> 00:01:09,340 -Perhaps you live in a repressive country -which tries to control and surveil the Internet. +00:01:02,880 --> 00:01:07,340 +Може би живеете в репресивна страна, +която се опитва да контролира и наблюдава Интернет. 20 -00:01:09,900 --> 00:01:13,800 -Or perhaps you don't want big corporations -taking advantage of your personal information. +00:01:07,900 --> 00:01:11,800 +Или може да не искате големите корпорации +да се възползват от личната Ви информация. 21 -00:01:14,880 --> 00:01:17,640 -Tor makes all of its users -to look the same +00:01:12,880 --> 00:01:15,640 +Tor прави така, че всички негови потребители +да изглеждат еднакви, 22 -00:01:17,920 --> 00:01:20,800 -which confuses the observer -and makes you anonymous. +00:01:15,920 --> 00:01:18,800 +което обърква наблюдаващите +и Ви прави анонимни. 23 -00:01:21,500 --> 00:01:24,980 -So, the more people use the Tor network, -the stronger it gets +00:01:19,500 --> 00:01:22,980 +Така колкото повече хора използват мрежата Tor, +толкова по-силна става тя 24 -00:01:25,140 --> 00:01:29,800 -as it's easier to hide in a crowd -of people who look exactly the same. +00:01:23,140 --> 00:01:27,800 +както е по-лесно да се скриеш в тълпа +от еднакво изглеждащи хора. 25 -00:01:30,700 --> 00:01:33,240 -You can bypass the censorship -without being worried about +00:01:28,700 --> 00:01:31,240 +Можете да заобиколите цензурата +без да се притеснявате, че 26 -00:01:33,400 --> 00:01:36,100 -the censor knowing what you do -on the Internet. +00:01:31,400 --> 00:01:34,100 +цeнзуриращият ще разбере какво правите в Интернет. 27 -00:01:38,540 --> 00:01:41,440 -The ads won't follow you -everywhere for months, +00:01:36,540 --> 00:01:39,440 +Рекламите няма да Ви преследват +навсякъде с месеци, 28 -00:01:41,640 --> 00:01:43,300 -starting when you first -clicked on a product. +00:01:39,640 --> 00:01:41,300 +започвайки от първото Ви +кликване на продукт. 29 -00:01:45,880 --> 00:01:49,380 -By using Tor, the sites you visit -won't even know who you are, +00:01:43,880 --> 00:01:47,380 +Използвайки Tor сайтовете, които посещавате, +дори няма да знаят кой сте, 30 -00:01:49,540 --> 00:01:51,760 -from what part of the world -you're visiting them, +00:01:47,540 --> 00:01:49,760 +от коя част на света +ги посещавате, 31 -00:01:51,920 --> 00:01:53,920 -unless you login and tell them so. +00:01:49,920 --> 00:01:51,920 +освен ако не влезете в профила си +и не им кажете. 32 -00:01:56,200 --> 00:01:57,840 -By downloading and using Tor, +00:01:54,200 --> 00:01:55,840 +Изтегляйки и използвайки Tor 33 -00:01:58,200 --> 00:02:00,560 -you can protect the people -who need anonymity, +00:01:56,200 --> 00:01:58,560 +Вие можете да защитите хората, +които се нуждаят от анонимност, 34 -00:02:00,880 --> 00:02:03,640 -like activists, journalists and bloggers. +00:01:58,880 --> 00:02:01,640 +като активисти, журналисти и блогъри. 35 -00:02:04,000 --> 00:02:09,000 -Download and use Tor! Or run a relay! +00:02:02,000 --> 00:02:07,000 +Изтеглете и използвайте Tor! Или пуснете реле!

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 30 Jun '15

30 Jun '15

commit c5c1eece16beea2176b15c0f283f40bbb131c077 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 30 20:15:48 2015 +0000 Update translations for tails-misc --- bg.po | 47 ++++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/bg.po b/bg.po index b09f021..072fc66 100644 --- a/bg.po +++ b/bg.po @@ -6,15 +6,16 @@ # Etem Bavarian <mr.cyberpower(a)gmail.com>, 2014 # Gabriel Radev <gabosss(a)gmail.com>, 2015 # iliev.mb <iliev.mb(a)gmail.com>, 2015 +# Ivaylo Markov <ivaylo.markov(a)openmailbox.org>, 2015 # alexdimitrov <kvikmen(a)gmail.com>, 2013 # Mal Malakov <dev(a)epsilon-labs.com>, 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-02 23:47+0200\n" -"PO-Revision-Date: 2015-06-22 20:07+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2015-06-28 19:40+0200\n" +"PO-Revision-Date: 2015-06-30 20:13+0000\n" +"Last-Translator: Ivaylo Markov <ivaylo.markov(a)openmailbox.org>\n" "Language-Team: Bulgarian (http://www.transifex.com/projects/p/torproject/language/bg/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -364,28 +365,28 @@ msgstr "Внимание: открита е виртуална машина!" msgid "" "Both the host operating system and the virtualization software are able to " "monitor what you are doing in Tails." -msgstr "" +msgstr "Операционната система - домакин и софтуерът за виртуализация могат да наблюдават какво правите в Tails." #: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:57 msgid "" "<a " "href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html#security'>Learn" " more...</a>" -msgstr "" +msgstr "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html#security'>Научете повече...</a>" -#: config/chroot_local-includes/usr/local/bin/tor-browser:18 +#: config/chroot_local-includes/usr/local/bin/tor-browser:24 msgid "Tor is not ready" msgstr "Tor не е готов" -#: config/chroot_local-includes/usr/local/bin/tor-browser:19 +#: config/chroot_local-includes/usr/local/bin/tor-browser:25 msgid "Tor is not ready. Start Tor Browser anyway?" msgstr "Tor не е готов.Да стартирам ли Tor Браузър въпреки всичко?" -#: config/chroot_local-includes/usr/local/bin/tor-browser:20 +#: config/chroot_local-includes/usr/local/bin/tor-browser:26 msgid "Start Tor Browser" msgstr "Стартирай Tor Браузър" -#: config/chroot_local-includes/usr/local/bin/tor-browser:21 +#: config/chroot_local-includes/usr/local/bin/tor-browser:27 msgid "Cancel" msgstr "Отказ" @@ -443,7 +444,7 @@ msgstr "" msgid "" "No DNS server was obtained through DHCP or manually configured in " "NetworkManager." -msgstr "" +msgstr "DNS сървър не беше получен чрез DHCP или ръчно зададен в NetworkManager." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:123 msgid "Failed to setup chroot." @@ -451,11 +452,11 @@ msgstr "Не можа да се установи chroot." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:129 msgid "Failed to configure browser." -msgstr "" +msgstr "Неуспех при настройката на браузъра." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:134 msgid "Failed to run browser." -msgstr "" +msgstr "Неуспех при пускането на браузъра." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:31 msgid "I2P failed to start" @@ -465,19 +466,19 @@ msgstr "I2P не можа да се стартира" msgid "" "Something went wrong when I2P was starting. Check the logs in /var/log/i2p " "for more information." -msgstr "" +msgstr "Нещо се обърка, докато I2P стартираше. Проверете логовете в /var/log/i2p за повече информация." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:43 msgid "I2P's router console is ready" -msgstr "" +msgstr "Терминалът на I2P рутера е готов" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:44 msgid "You can now access I2P's router console on http://127.0.0.1:7657." -msgstr "" +msgstr "Можете да достъпите терминала на I2P рутера на http://127.0.0.1:7657." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:49 msgid "I2P is not ready" -msgstr "" +msgstr "I2P не е готово" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:50 msgid "" @@ -488,11 +489,11 @@ msgstr "" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 msgid "I2P is ready" -msgstr "" +msgstr "I2P е готово" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:61 msgid "You can now access services on I2P." -msgstr "" +msgstr "Сега може да използвате услуги през I2P" #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1 msgid "Report an error" @@ -505,7 +506,7 @@ msgstr "Tails документация" #: ../config/chroot_local-includes/usr/share/applications/tails-documentation.desktop.in.h:2 msgid "Learn how to use Tails" -msgstr "" +msgstr "Научете се как да използвате Tails" #: ../config/chroot_local-includes/usr/share/applications/i2p-browser.desktop.in.h:1 msgid "Anonymous overlay network browser" @@ -513,11 +514,11 @@ msgstr "" #: ../config/chroot_local-includes/usr/share/applications/i2p-browser.desktop.in.h:2 msgid "I2P Browser" -msgstr "" +msgstr "I2P браузър" #: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:2 msgid "Learn more about Tails" -msgstr "" +msgstr "Научете повече за Tails" #: ../config/chroot_local-includes/usr/share/applications/tails-reboot.desktop.in.h:1 msgid "Reboot" @@ -541,11 +542,11 @@ msgstr "Tor браузър" #: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:2 msgid "Anonymous Web Browser" -msgstr "" +msgstr "Анонимен уеб браузър" #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:2 msgid "Browse the World Wide Web without anonymity" -msgstr "" +msgstr "Достъпвайте световната мрежа без анонимност." #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:3 msgid "Unsafe Web Browser"

1 0

[webwml/master] Add Tor animation to press page per ailanthus request. closes #16463
by sebastian＠torproject.org 30 Jun '15

30 Jun '15

commit 79edc73e3837fe40fbe42ffc49a328d22933139b Author: Nima Fatemi <mrphs(a)riseup.net> Date: Tue Jun 30 19:11:33 2015 +0000 Add Tor animation to press page per ailanthus request. closes #16463 --- press/en/press.wml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/press/en/press.wml b/press/en/press.wml index e19cb9c..f774b65 100644 --- a/press/en/press.wml +++ b/press/en/press.wml @@ -12,6 +12,26 @@  <h1>Tor Press and Media Information</h1> +<br> + +<h2>Video About Tor</h2> +<p> + A two-minute video explaining what Tor is and how it works. + This video is available for <a href="https://media.torproject + .org/video/2015-03-animation/">download</a> and streaming + both on Tor Project <a href="https://blog.torproject.org/blog/ + releasing-tor-animation">website</a> and via <a href="https://www + .youtube.com/playlist?list=PLwyU2dZ3LJErtu3GGElIa7VyORE2B6H1H"> + YouTube</a> in many different languages. +</p> +<div style="text-align:center;"> + +<video width="500" height="281" controls preload="none" poster="https://people.torproject.org/~nima/03-2015-Tor-Animation/Screen-Shot.jpg"> + <source src="https://media.torproject.org/video/2015-03-animation/HQ/Tor_Animation_en.we…" type="video/webm"> + <track label="English" kind="captions" src="https://people.torproject.org/~nima/03-2015-Tor-Animation/subs/vtt/en.vtt" srclang="en" default> +</video> +</div> + <h2>Media Appearances</h2> <p>Major news organizations including the New York Times, Forbes, Al Jazeera, Washington Post, Le Monde, NPR, BBC, and more have sought out

1 0

[translation/torbutton-aboutdialogdtd_completed] Update translations for torbutton-aboutdialogdtd_completed
by translation＠torproject.org 30 Jun '15

30 Jun '15

commit 6e9293d210000128ea45af9d713f4829a23acede Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 30 19:46:16 2015 +0000 Update translations for torbutton-aboutdialogdtd_completed --- bg/aboutdialog.dtd | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/bg/aboutdialog.dtd b/bg/aboutdialog.dtd new file mode 100644 index 0000000..0646216 --- /dev/null +++ b/bg/aboutdialog.dtd @@ -0,0 +1,19 @@ +<!ENTITY project.start "&brandShortName; се разработва от"> + +<!ENTITY project.tpoLink "&vendorShortName;"> +<!ENTITY project.end ", организация с нестопанска цел, работеща зa запазването на Вашата лична неприкосновеност и свобода онлайн."> + +<!ENTITY help.start "Искате да помогнете?"> + +<!ENTITY help.donateLink "Дарете"> +<!ENTITY help.or "или"> + +<!ENTITY help.getInvolvedLink "станете доброволец"> +<!ENTITY help.end "!"> + +<!ENTITY bottomLinks.questions "Въпроси?"> + +<!ENTITY bottomLinks.grow "Помогнете на Tor мрежата да се разрасне!"> + +<!ENTITY bottomLinks.license "Информация за лицензи"> +<!ENTITY tor.TrademarkStatement "'Tor' и 'Onion Logo' са регистрирани търговски марки на Tor Project Inc.">

1 0

[translation/torbutton-aboutdialogdtd] Update translations for torbutton-aboutdialogdtd
by translation＠torproject.org 30 Jun '15

30 Jun '15

commit fc553e10eb659c778940bfb0fde66a4c32fd4a0b Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 30 19:46:12 2015 +0000 Update translations for torbutton-aboutdialogdtd --- bg/aboutdialog.dtd | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/bg/aboutdialog.dtd b/bg/aboutdialog.dtd index 5099ad7..c7b24be 100644 --- a/bg/aboutdialog.dtd +++ b/bg/aboutdialog.dtd @@ -1,19 +1,19 @@ -<!ENTITY project.start "&brandShortName; is developed by "> +<!ENTITY project.start "&brandShortName; се разработва от">  -<!ENTITY project.tpoLink "the &vendorShortName;"> -<!ENTITY project.end ", a nonprofit working to defend your privacy and freedom online."> +<!ENTITY project.tpoLink "&vendorShortName;"> +<!ENTITY project.end ", организация с нестопанска цел, работеща зa запазването на Вашата лична неприкосновеност и свобода онлайн."> -<!ENTITY help.start "Want to help? "> +<!ENTITY help.start "Искате да помогнете?">  -<!ENTITY help.donateLink "Donate"> -<!ENTITY help.or " or "> +<!ENTITY help.donateLink "Дарете"> +<!ENTITY help.or "или">  -<!ENTITY help.getInvolvedLink "get involved"> +<!ENTITY help.getInvolvedLink "станете доброволец"> <!ENTITY help.end "!">  -<!ENTITY bottomLinks.questions "Questions?"> +<!ENTITY bottomLinks.questions "Въпроси?">  -<!ENTITY bottomLinks.grow "Help the Tor Network Grow!"> +<!ENTITY bottomLinks.grow "Помогнете на Tor мрежата да се разрасне!">  -<!ENTITY bottomLinks.license "Licensing Information"> +<!ENTITY bottomLinks.license "Информация за лицензи"> <!ENTITY tor.TrademarkStatement "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">

1 0

[tor-messenger-build/master] Bump version to 0.0.6; prepare for third alpha
by sukhbir＠torproject.org 30 Jun '15

30 Jun '15

commit c39215e85d5071adc61d77aa84d68ee3ea162953 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Jun 30 13:18:00 2015 -0400 Bump version to 0.0.6; prepare for third alpha --- projects/tor-messenger/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-messenger/config b/projects/tor-messenger/config index eaaaba9..49f4592 100644 --- a/projects/tor-messenger/config +++ b/projects/tor-messenger/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.0.5 +version: 0.0.6 filename: 'tor-messenger-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].[% c("var/filename_ext") %]' input_files: - name: instantbird

1 0

[translation/mat-gui_completed] Update translations for mat-gui_completed
by translation＠torproject.org 30 Jun '15

30 Jun '15

commit 232d8f4088e589fb88329e5f9eae83cb31d9342a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 30 16:45:36 2015 +0000 Update translations for mat-gui_completed --- zh_CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN.po b/zh_CN.po index 4bbbec8..3d6c7f2 100644 --- a/zh_CN.po +++ b/zh_CN.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-12-31 04:53+0100\n" -"PO-Revision-Date: 2015-06-18 17:00+0000\n" +"PO-Revision-Date: 2015-06-30 16:15+0000\n" "Last-Translator: YF <yfdyh000(a)gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n"

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 30 Jun '15

30 Jun '15

commit c1a4d24a8a29a05982ac8bb683ebd62ca6cb1520 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 30 16:45:32 2015 +0000 Update translations for mat-gui --- zh_CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN.po b/zh_CN.po index 4bbbec8..3d6c7f2 100644 --- a/zh_CN.po +++ b/zh_CN.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-12-31 04:53+0100\n" -"PO-Revision-Date: 2015-06-18 17:00+0000\n" +"PO-Revision-Date: 2015-06-30 16:15+0000\n" "Last-Translator: YF <yfdyh000(a)gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n"

1 0

[tor-messenger-build/master] Add patch to fix menu on OSX
by boklm＠torproject.org 30 Jun '15

30 Jun '15

commit b0cbd847e07bce67172f65370b5c51efd30ea5f1 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jun 30 18:21:19 2015 +0200 Add patch to fix menu on OSX (patch from ticket #16253, found by Arlo) --- ...refox-app-menu-sometimes-contains-only.mozpatch | 66 ++++++++++++++++++++ projects/instantbird/config | 2 + 2 files changed, 68 insertions(+) diff --git a/projects/instantbird/Bug-1151345-Firefox-app-menu-sometimes-contains-only.mozpatch b/projects/instantbird/Bug-1151345-Firefox-app-menu-sometimes-contains-only.mozpatch new file mode 100644 index 0000000..191ae56 --- /dev/null +++ b/projects/instantbird/Bug-1151345-Firefox-app-menu-sometimes-contains-only.mozpatch @@ -0,0 +1,66 @@ +From bfb108f8d8ba5c748ac0daa027271b063fd503b1 Mon Sep 17 00:00:00 2001 +From: Steven Michaud <smichaud(a)pobox.com> +Date: Wed, 3 Jun 2015 16:19:51 -0500 +Subject: [PATCH] Bug 1151345 - Firefox app menu sometimes contains only "Quit" + on OS X. r=spohl + +--- + widget/cocoa/nsAppShell.mm | 2 ++ + widget/cocoa/nsMenuBarX.h | 1 + + widget/cocoa/nsMenuBarX.mm | 8 ++++++++ + 3 files changed, 11 insertions(+) + +diff --git a/widget/cocoa/nsAppShell.mm b/widget/cocoa/nsAppShell.mm +index 10e0f0e..c89cee9 100644 +--- a/widget/cocoa/nsAppShell.mm ++++ b/widget/cocoa/nsAppShell.mm +@@ -28,6 +28,7 @@ + #include "nsCocoaFeatures.h" + #include "nsCocoaUtils.h" + #include "nsChildView.h" ++#include "nsMenuBarX.h" + #include "nsToolkit.h" + #include "TextInputHandler.h" + #include "mozilla/HangMonitor.h" +@@ -647,6 +648,7 @@ nsAppShell::Run(void) + mStarted = true; + + AddScreenWakeLockListener(); ++ nsMenuBarX::ResetNativeApplicationMenu(); + + NS_OBJC_TRY_ABORT([NSApp run]); + +diff --git a/widget/cocoa/nsMenuBarX.h b/widget/cocoa/nsMenuBarX.h +index a27d373..50f76cb 100644 +--- a/widget/cocoa/nsMenuBarX.h ++++ b/widget/cocoa/nsMenuBarX.h +@@ -127,6 +127,7 @@ public: + void ForceUpdateNativeMenuAt(const nsAString& indexString); + void ForceNativeMenuReload(); // used for testing + static char GetLocalizedAccelKey(const char *shortcutID); ++ static void ResetNativeApplicationMenu(); + + protected: + void ConstructNativeMenus(); +diff --git a/widget/cocoa/nsMenuBarX.mm b/widget/cocoa/nsMenuBarX.mm +index 90c681f..5e13538 100644 +--- a/widget/cocoa/nsMenuBarX.mm ++++ b/widget/cocoa/nsMenuBarX.mm +@@ -498,6 +498,14 @@ char nsMenuBarX::GetLocalizedAccelKey(const char *shortcutID) + return retval; + } + ++/* static */ ++void nsMenuBarX::ResetNativeApplicationMenu() ++{ ++ [sApplicationMenu removeAllItems]; ++ [sApplicationMenu release]; ++ sApplicationMenu = nil; ++} ++ + // Hide the item in the menu by setting the 'hidden' attribute. Returns it in |outHiddenNode| so + // the caller can hang onto it if they so choose. It is acceptable to pass nsull + // for |outHiddenNode| if the caller doesn't care about the hidden node. +-- +2.1.4 + diff --git a/projects/instantbird/config b/projects/instantbird/config index 11c3b36..1e17ae9 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -116,6 +116,8 @@ input_files: enable: '[% c("var/windows") %]' - filename: OSX-package-as-tar.bz2.mozpatch enable: '[% c("var/osx") %]' + - filename: Bug-1151345-Firefox-app-menu-sometimes-contains-only.mozpatch + enable: '[% c("var/osx") %]' - filename: 'mozconfig-[% c("var/osname") %]' name: mozconfig - name: python

1 0

[translation/mat-gui_completed] Update translations for mat-gui_completed
by translation＠torproject.org 30 Jun '15

30 Jun '15

commit 5879918de58e6aa51ef6361f08621d5bd228c757 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 30 16:15:35 2015 +0000 Update translations for mat-gui_completed --- es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es.po b/es.po index 5580953..b61adb4 100644 --- a/es.po +++ b/es.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-12-31 04:53+0100\n" -"PO-Revision-Date: 2015-06-15 11:56+0000\n" +"PO-Revision-Date: 2015-06-30 16:14+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n"

1 0