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

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 13 Oct '15

13 Oct '15

commit d255cbd375bf73a57e0fba7edb620fa1d5310654 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 13 20:45:40 2015 +0000 Update translations for tor-launcher-network-settings_completed --- ar/network-settings.dtd | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/ar/network-settings.dtd b/ar/network-settings.dtd index c307e6c..b65f290 100644 --- a/ar/network-settings.dtd +++ b/ar/network-settings.dtd @@ -1,4 +1,4 @@ -<!ENTITY torsettings.dialog.title "إعدادات الشبكة الخاصة بتور"> +<!ENTITY torsettings.dialog.title "إعدادات الشبكة">  @@ -9,16 +9,18 @@ <!ENTITY torSettings.firstQuestion "أي مما يلي يعتبر وصف افضل لموقفك؟"> <!ENTITY torSettings.configurePrompt1 "اتصال هذا الحاسب بالإنترنت محجوب أو له بروكسي."> -<!ENTITY torSettings.configurePrompt2 "علي تكوين إعدادات الجسر أو بروكسي."> +<!ENTITY torSettings.configurePrompt2 "أحتاج لإعداد جسر أو بروكسي محلي."> <!ENTITY torSettings.configure "تكوين"> <!ENTITY torSettings.connectPrompt2 "أود الاتصال مباشرة إلى شبكة تور."> <!ENTITY torSettings.connectPrompt3 "سيصلح هذا في معظم الحالات."> <!ENTITY torSettings.connect "اتصل"> -<!ENTITY torSettings.proxyQuestion "هل يحتاج هذا الجهاز إلي بروكسي حتي يصل إلي شبكة الإنترنت؟"> +<!ENTITY torSettings.proxyPageTitle "إعداد البروكسي المحلّي"> +<!ENTITY torSettings.proxyQuestion "هل يحتاج هذا الكمبيوتر لاستخدام وكيل محلي للاتصال بالإنترنت؟">  -<!ENTITY torSettings.proxyHelp "إذا لم تكن متأكدا من كيفية الإجابة على هذا السؤال، إلقي نظرة على إعدادات الإنترنت في متصفح آخر حتي تتأكد إذا كان يستخدام بروكسي."> +<!ENTITY torSettings.proxyHelp "إذا كنت غير متأكد من كيفية الإجابة على هذا السؤال، أنظر الى إعدادات الإنترنت في متصفح آخر لمعرفة ما إذا تمت تهيئتة لاستخدام وكيل محلي."> <!ENTITY torSettings.enterProxy "أدخل إعدادات البروكسي."> +<!ENTITY torSettings.bridgePageTitle "إعداد جسور تور."> <!ENTITY torSettings.bridgeQuestion "هل يقوم مقدم خدمة الإنترنت (ISP) الذي تتعامل معه بحجب الاتصالات بشبكة Tor أو مراقبتها بطريقة أخرى؟"> <!ENTITY torSettings.bridgeHelp "إذا لم تكن متأكدا من إجابة هذا السؤال، قم باختيار لا.   إذا قمت باختيار نعم، فسيطلب منك تكوين جسور Tor والتي هي منافذ ترحيل غير مدرجة تصعب عملية حظر الاتصالات بشبكة Tor."> <!ENTITY torSettings.bridgeSettingsPrompt "يمكنك استخدام مجموعة الجسور المتوفرة أو الحصول على مجموعة مخصصة من الجسور."> @@ -30,7 +32,7 @@ <!ENTITY torsettings.optional "اختياري"> -<!ENTITY torsettings.useProxy.checkbox "يحتاج هذا الجهاز إلي استخدام بروكسي للوصل إلي شبكة الإنترنت"> +<!ENTITY torsettings.useProxy.checkbox "يحتاج هذا الكمبيوتر لاستخدام وكيل محلي للاتصال بالإنترنت"> <!ENTITY torsettings.useProxy.type "نوع البروكسي:"> <!ENTITY torsettings.useProxy.address "العنوان:"> <!ENTITY torsettings.useProxy.address.placeholder "عنوان الإنترنت IP أو اسم المضيف">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 13 Oct '15

13 Oct '15

commit 03528ec4b1335bbc654ce699ca06f450fc4e09b7 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 13 20:45:35 2015 +0000 Update translations for tor-launcher-network-settings --- ar/network-settings.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ar/network-settings.dtd b/ar/network-settings.dtd index 8efd716..b65f290 100644 --- a/ar/network-settings.dtd +++ b/ar/network-settings.dtd @@ -9,18 +9,18 @@ <!ENTITY torSettings.firstQuestion "أي مما يلي يعتبر وصف افضل لموقفك؟"> <!ENTITY torSettings.configurePrompt1 "اتصال هذا الحاسب بالإنترنت محجوب أو له بروكسي."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings."> +<!ENTITY torSettings.configurePrompt2 "أحتاج لإعداد جسر أو بروكسي محلي."> <!ENTITY torSettings.configure "تكوين"> <!ENTITY torSettings.connectPrompt2 "أود الاتصال مباشرة إلى شبكة تور."> <!ENTITY torSettings.connectPrompt3 "سيصلح هذا في معظم الحالات."> <!ENTITY torSettings.connect "اتصل"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> +<!ENTITY torSettings.proxyPageTitle "إعداد البروكسي المحلّي"> <!ENTITY torSettings.proxyQuestion "هل يحتاج هذا الكمبيوتر لاستخدام وكيل محلي للاتصال بالإنترنت؟">  <!ENTITY torSettings.proxyHelp "إذا كنت غير متأكد من كيفية الإجابة على هذا السؤال، أنظر الى إعدادات الإنترنت في متصفح آخر لمعرفة ما إذا تمت تهيئتة لاستخدام وكيل محلي."> <!ENTITY torSettings.enterProxy "أدخل إعدادات البروكسي."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> +<!ENTITY torSettings.bridgePageTitle "إعداد جسور تور."> <!ENTITY torSettings.bridgeQuestion "هل يقوم مقدم خدمة الإنترنت (ISP) الذي تتعامل معه بحجب الاتصالات بشبكة Tor أو مراقبتها بطريقة أخرى؟"> <!ENTITY torSettings.bridgeHelp "إذا لم تكن متأكدا من إجابة هذا السؤال، قم باختيار لا.   إذا قمت باختيار نعم، فسيطلب منك تكوين جسور Tor والتي هي منافذ ترحيل غير مدرجة تصعب عملية حظر الاتصالات بشبكة Tor."> <!ENTITY torSettings.bridgeSettingsPrompt "يمكنك استخدام مجموعة الجسور المتوفرة أو الحصول على مجموعة مخصصة من الجسور.">

1 0

[tor-messenger-build/master] Update Unnamed Messenger logo
by sukhbir＠torproject.org 13 Oct '15

13 Oct '15

commit 458ea2bde1aa0ea912ebf9c2b410251587aeeec8 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Oct 13 15:20:36 2015 -0400 Update Unnamed Messenger logo --- projects/instantbird/branding/about.png | Bin 10728 -> 10718 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/projects/instantbird/branding/about.png b/projects/instantbird/branding/about.png index 8dbd586..99e5969 100644 Binary files a/projects/instantbird/branding/about.png and b/projects/instantbird/branding/about.png differ

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 13 Oct '15

13 Oct '15

commit ad4bbe3b33668c1299766bf73d4a92ab07d923f9 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 13 18:45:03 2015 +0000 Update translations for bridgedb --- eu/LC_MESSAGES/bridgedb.po | 337 ++++++++++++++++++++++---------------------- 1 file changed, 169 insertions(+), 168 deletions(-) diff --git a/eu/LC_MESSAGES/bridgedb.po b/eu/LC_MESSAGES/bridgedb.po index fa14576..8403116 100644 --- a/eu/LC_MESSAGES/bridgedb.po +++ b/eu/LC_MESSAGES/bridgedb.po @@ -11,14 +11,15 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" -"PO-Revision-Date: 2015-07-12 15:59+0000\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" +"POT-Creation-Date: 2015-07-25 03:40+0000\n" +"PO-Revision-Date: 2015-10-13 18:35+0000\n" "Last-Translator: javikitz <javikitz(a)protonmail.com>\n" -"Language-Team: Basque (http://www.transifex.com/projects/p/torproject/language/eu/)\n" +"Language-Team: Basque (http://www.transifex.com/otf/torproject/language/eu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.6\n" +"Generated-By: Babel 1.3\n" "Language: eu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -33,57 +34,182 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:107 +#: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." msgstr "Barkatu! Zerbait gaizki joan da zure eskaeran." -#: lib/bridgedb/strings.py:18 +#: bridgedb/https/templates/base.html:79 +msgid "Report a Bug" +msgstr "Eman errore baten berri" + +#: bridgedb/https/templates/base.html:82 +msgid "Source Code" +msgstr "Iturburu-kodea" + +#: bridgedb/https/templates/base.html:85 +msgid "Changelog" +msgstr "" + +#: bridgedb/https/templates/base.html:88 +msgid "Contact" +msgstr "Kontaktuan jarri." + +#: bridgedb/https/templates/bridges.html:35 +msgid "Select All" +msgstr "Hautatu dena" + +#: bridgedb/https/templates/bridges.html:40 +msgid "Show QRCode" +msgstr "Erakutsi QR Kodea" + +#: bridgedb/https/templates/bridges.html:52 +msgid "QRCode for your bridge lines" +msgstr "" + +#. TRANSLATORS: Please translate this into some silly way to say +#. "There was a problem!" in your language. For example, +#. for Italian, you might translate this into "Mama mia!", +#. or for French: "Sacrebleu!". :) +#: bridgedb/https/templates/bridges.html:67 +#: bridgedb/https/templates/bridges.html:125 +msgid "Uh oh, spaghettios!" +msgstr "" + +#: bridgedb/https/templates/bridges.html:68 +msgid "It seems there was an error getting your QRCode." +msgstr "" + +#: bridgedb/https/templates/bridges.html:73 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "" + +#: bridgedb/https/templates/bridges.html:131 +msgid "There currently aren't any bridges available..." +msgstr "Momentuz ez daude zubirik..." + +#: bridgedb/https/templates/bridges.html:132 +#, python-format +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "Agian saiatu %s atzera itzuli %s eta beste zubi mota bat aukeratzen!" + +#: bridgedb/https/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "%s1.%s urratsa" + +#: bridgedb/https/templates/index.html:13 +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "Jaitsi %s Tor Nabigatzailea %s" + +#: bridgedb/https/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "%s2.%s urratsa" + +#: bridgedb/https/templates/index.html:27 +#, python-format +msgid "Get %s bridges %s" +msgstr "Eskuratu %s zubiak %s" + +#: bridgedb/https/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "%s3.%s urratsa" + +#: bridgedb/https/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "Orain %s gehitu zubiak Torera %s" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. (These are used to insert HTML5 underlining tags, to mark accesskeys +#. for disabled users.) +#: bridgedb/https/templates/options.html:38 +#, python-format +msgid "%sJ%sust give me bridges!" +msgstr "" + +#: bridgedb/https/templates/options.html:51 +msgid "Advanced Options" +msgstr "Aukera Aurreratuak" + +#: bridgedb/https/templates/options.html:86 +msgid "No" +msgstr "Ez" + +#: bridgedb/https/templates/options.html:87 +msgid "none" +msgstr "Bat ere ez." + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." +#: bridgedb/https/templates/options.html:124 +#, python-format +msgid "%sY%ses!" +msgstr "%sB%sai!" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Please do NOT translate the word "bridge"! +#: bridgedb/https/templates/options.html:147 +#, python-format +msgid "%sG%set Bridges" +msgstr "" + +#: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" msgstr "[Hau mezu automatizatu bat da, mesedez ez erantzun.]" -#: lib/bridgedb/strings.py:20 +#: bridgedb/strings.py:45 msgid "Here are your bridges:" msgstr "Hona hemen zure zubiak:" -#: lib/bridgedb/strings.py:22 +#: bridgedb/strings.py:47 #, python-format msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." msgstr "" -#: lib/bridgedb/strings.py:25 +#: bridgedb/strings.py:50 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" msgstr "" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". -#: lib/bridgedb/strings.py:28 +#: bridgedb/strings.py:53 msgid "Welcome to BridgeDB!" msgstr "Ongi Etorri BridgeDB-ra!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". -#: lib/bridgedb/strings.py:30 +#: bridgedb/strings.py:55 msgid "Currently supported transport TYPEs:" msgstr "" -#: lib/bridgedb/strings.py:31 +#: bridgedb/strings.py:56 #, python-format msgid "Hey, %s!" msgstr "Kaixo, %s!" -#: lib/bridgedb/strings.py:32 +#: bridgedb/strings.py:57 msgid "Hello, friend!" msgstr "Kaixo, lagun!" -#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 +#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90 msgid "Public Keys" msgstr "Gako Publikoak" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles #. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." -#: lib/bridgedb/strings.py:37 +#: bridgedb/strings.py:62 #, python-format msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" @@ -94,7 +220,7 @@ msgstr "" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor". #. TRANSLATORS: Please DO NOT translate "Tor Network". -#: lib/bridgedb/strings.py:47 +#: bridgedb/strings.py:72 #, python-format msgid "" "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" @@ -105,7 +231,7 @@ msgid "" msgstr "" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". -#: lib/bridgedb/strings.py:54 +#: bridgedb/strings.py:79 msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" @@ -117,7 +243,7 @@ msgstr "" #. regular, or unexciting". Like vanilla ice cream. It refers to bridges #. which do not have Pluggable Transports, and only speak the regular, #. boring Tor protocol. Translate it as you see fit. Have fun with it. -#: lib/bridgedb/strings.py:63 +#: bridgedb/strings.py:88 #, python-format msgid "" "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" @@ -126,20 +252,20 @@ msgid "" "\n" msgstr "" -#: lib/bridgedb/strings.py:76 +#: bridgedb/strings.py:101 msgid "What are bridges?" msgstr "Zer dira zubiak?" -#: lib/bridgedb/strings.py:77 +#: bridgedb/strings.py:102 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." msgstr "" -#: lib/bridgedb/strings.py:82 +#: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" msgstr "Zubiak eskuratzeko modu alternatibo bat behar dut!" -#: lib/bridgedb/strings.py:83 +#: bridgedb/strings.py:108 #, python-format msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" @@ -147,12 +273,12 @@ msgid "" "%s, %s or %s." msgstr "" -#: lib/bridgedb/strings.py:90 +#: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" msgstr "Nire zubiak ez dute funtzionatzen! Laguntza behar dut!" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:92 +#: bridgedb/strings.py:117 #, python-format msgid "If your Tor doesn't work, you should email %s." msgstr "" @@ -160,48 +286,48 @@ msgstr "" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor Browser". #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:96 +#: bridgedb/strings.py:121 msgid "" "Try including as much info about your case as you can, including the list of\n" "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" "and any messages which Tor gave out, etc." msgstr "" -#: lib/bridgedb/strings.py:103 +#: bridgedb/strings.py:128 msgid "Here are your bridge lines:" msgstr "" -#: lib/bridgedb/strings.py:104 +#: bridgedb/strings.py:129 msgid "Get Bridges!" msgstr "" -#: lib/bridgedb/strings.py:108 +#: bridgedb/strings.py:133 msgid "Please select options for bridge type:" msgstr "" -#: lib/bridgedb/strings.py:109 +#: bridgedb/strings.py:134 msgid "Do you need IPv6 addresses?" msgstr "IPv6 helbideak behar dituzu?" -#: lib/bridgedb/strings.py:110 +#: bridgedb/strings.py:135 #, python-format msgid "Do you need a %s?" msgstr "%s behar duzu?" -#: lib/bridgedb/strings.py:114 +#: bridgedb/strings.py:139 msgid "Your browser is not displaying images properly." msgstr "Zure nabigatzaileak ez ditu irudiak behar bezala erakusten." -#: lib/bridgedb/strings.py:115 +#: bridgedb/strings.py:140 msgid "Enter the characters from the image above..." msgstr "Sartu goiko irudiko karaktereak..." -#: lib/bridgedb/strings.py:119 +#: bridgedb/strings.py:144 msgid "How to start using your bridges" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor Browser". -#: lib/bridgedb/strings.py:121 +#: bridgedb/strings.py:146 #, python-format msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" @@ -210,21 +336,21 @@ msgid "" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:126 +#: bridgedb/strings.py:151 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:130 +#: bridgedb/strings.py:155 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:134 +#: bridgedb/strings.py:159 msgid "" "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" @@ -232,153 +358,28 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "" -#: lib/bridgedb/strings.py:142 +#: bridgedb/strings.py:167 msgid "Displays this message." msgstr "Mezu hau erakusten du" #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. -#: lib/bridgedb/strings.py:146 +#: bridgedb/strings.py:171 msgid "Request vanilla bridges." msgstr "" -#: lib/bridgedb/strings.py:147 +#: bridgedb/strings.py:172 msgid "Request IPv6 bridges." -msgstr "" +msgstr "Eskatu IPv6 zubiak." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:149 +#: bridgedb/strings.py:174 msgid "Request a Pluggable Transport by TYPE." msgstr "" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: lib/bridgedb/strings.py:152 +#: bridgedb/strings.py:177 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "" - -#: lib/bridgedb/templates/base.html:89 -msgid "Report a Bug" -msgstr "Eman errore baten berri" - -#: lib/bridgedb/templates/base.html:92 -msgid "Source Code" -msgstr "Iturburu-kodea" - -#: lib/bridgedb/templates/base.html:95 -msgid "Changelog" -msgstr "" - -#: lib/bridgedb/templates/base.html:98 -msgid "Contact" -msgstr "Kontaktuan jarri." - -#: lib/bridgedb/templates/bridges.html:81 -msgid "Select All" -msgstr "Hautatu dena" - -#: lib/bridgedb/templates/bridges.html:87 -msgid "Show QRCode" -msgstr "Erakutsi QR Kodea" - -#: lib/bridgedb/templates/bridges.html:100 -msgid "QRCode for your bridge lines" -msgstr "" - -#. TRANSLATORS: Please translate this into some silly way to say -#. "There was a problem!" in your language. For example, -#. for Italian, you might translate this into "Mama mia!", -#. or for French: "Sacrebleu!". :) -#: lib/bridgedb/templates/bridges.html:115 -#: lib/bridgedb/templates/bridges.html:175 -msgid "Uh oh, spaghettios!" -msgstr "" - -#: lib/bridgedb/templates/bridges.html:116 -msgid "It seems there was an error getting your QRCode." -msgstr "" - -#: lib/bridgedb/templates/bridges.html:121 -msgid "" -"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" -" your bridge lines onto mobile and other devices." -msgstr "" - -#: lib/bridgedb/templates/bridges.html:181 -msgid "There currently aren't any bridges available..." -msgstr "" - -#: lib/bridgedb/templates/bridges.html:182 -#, python-format -msgid "" -" Perhaps you should try %s going back %s and choosing a different bridge " -"type!" -msgstr "" - -#: lib/bridgedb/templates/index.html:11 -#, python-format -msgid "Step %s1%s" -msgstr "%s1.%s urratsa" - -#: lib/bridgedb/templates/index.html:13 -#, python-format -msgid "Download %s Tor Browser %s" -msgstr "Jaitsi %s Tor Nabigatzailea %s" - -#: lib/bridgedb/templates/index.html:25 -#, python-format -msgid "Step %s2%s" -msgstr "%s2.%s urratsa" - -#: lib/bridgedb/templates/index.html:27 -#, python-format -msgid "Get %s bridges %s" -msgstr "Eskuratu %s zubiak %s" - -#: lib/bridgedb/templates/index.html:36 -#, python-format -msgid "Step %s3%s" -msgstr "%s3.%s urratsa" - -#: lib/bridgedb/templates/index.html:38 -#, python-format -msgid "Now %s add the bridges to Tor Browser %s" -msgstr "" - -#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the -#. beginning of words are present in your final translation. Thanks! -#. (These are used to insert HTML5 underlining tags, to mark accesskeys -#. for disabled users.) -#: lib/bridgedb/templates/options.html:38 -#, python-format -msgid "%sJ%sust give me bridges!" -msgstr "" - -#: lib/bridgedb/templates/options.html:52 -msgid "Advanced Options" -msgstr "Aukera Aurreratuak" - -#: lib/bridgedb/templates/options.html:88 -msgid "No" -msgstr "Ez" - -#: lib/bridgedb/templates/options.html:89 -msgid "none" -msgstr "" - -#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the -#. beginning of words are present in your final translation. Thanks! -#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." -#: lib/bridgedb/templates/options.html:127 -#, python-format -msgid "%sY%ses!" -msgstr "%sB%sai!" - -#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the -#. beginning of words are present in your final translation. Thanks! -#. TRANSLATORS: Please do NOT translate the word "bridge"! -#: lib/bridgedb/templates/options.html:151 -#, python-format -msgid "%sG%set Bridges" -msgstr ""

1 0

[tor-messenger-build/master] Update directory path for ctypes-otr
by sukhbir＠torproject.org 13 Oct '15

13 Oct '15

commit 2d4cdd4681d5b07f08360d13198663eb17f6f0ca Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Oct 13 13:41:07 2015 -0400 Update directory path for ctypes-otr --- projects/tor-messenger/build.osx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-messenger/build.osx b/projects/tor-messenger/build.osx index f751a42..1b02d75 100644 --- a/projects/tor-messenger/build.osx +++ b/projects/tor-messenger/build.osx @@ -24,7 +24,7 @@ cd .. mkdir ctypes-otr cd ctypes-otr tar xf $rootdir/[% c('input_files_by_name/ctypes-otr') %] -mv ctypes-otr* $rootdir/Tor\ Messenger.app/Contents/Resources/extensions/ctypes-otr@tormessenger +mv ctypes-otr* $rootdir/Unnamed\ Messenger.app/Contents/Resources/extensions/ctypes-otr@tormessenger cd .. mkdir Unnamed\ Messenger.app/TorMessenger

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 13 Oct '15

13 Oct '15

commit 42b06441930ae13ca8eb8327b4ec7057addc4988 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 13 16:45:06 2015 +0000 Update translations for bridgedb_completed --- sr/LC_MESSAGES/bridgedb.po | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/sr/LC_MESSAGES/bridgedb.po b/sr/LC_MESSAGES/bridgedb.po index 917c343..aab19aa 100644 --- a/sr/LC_MESSAGES/bridgedb.po +++ b/sr/LC_MESSAGES/bridgedb.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2015-10-13 15:54+0000\n" +"PO-Revision-Date: 2015-10-13 16:39+0000\n" "Last-Translator: Lidija <llazic.bgd(a)gmail.com>\n" "Language-Team: Serbian (http://www.transifex.com/otf/torproject/language/sr/)\n" "MIME-Version: 1.0\n" @@ -36,7 +36,7 @@ msgstr "" #. "Tor Browser" #: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." -msgstr "Извините! Нешто се лоше десило са вашим захтевом." +msgstr "Извините! Догодила се грешка са вашим захтевом." #: bridgedb/https/templates/base.html:79 msgid "Report a Bug" @@ -48,7 +48,7 @@ msgstr "Изворни код" #: bridgedb/https/templates/base.html:85 msgid "Changelog" -msgstr "Promena loga" +msgstr "Промена лога" #: bridgedb/https/templates/base.html:88 msgid "Contact" @@ -64,7 +64,7 @@ msgstr "Прикажи QRCode" #: bridgedb/https/templates/bridges.html:52 msgid "QRCode for your bridge lines" -msgstr "QR код за ваше премошћиваче" +msgstr "QR код за ваше линије премошћивања" #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, @@ -83,7 +83,7 @@ msgstr "Дошло је до грешке при набавлјању вашег msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" " your bridge lines onto mobile and other devices." -msgstr "QR код садржи ваше премошћиваче. Скенирајет га са читаћем QR кода да бисте ископирали ваше премошћиваче на моблине као и на друге уређаје." +msgstr "QR код садржи ваше линије премошћивања. Скенирајет га са читаћем QR кода да бисте ископирали ваше линије премошћивања на моблине као и на друге уређаје." #: bridgedb/https/templates/bridges.html:131 msgid "There currently aren't any bridges available..." @@ -104,7 +104,7 @@ msgstr "Корак %s1%s" #: bridgedb/https/templates/index.html:13 #, python-format msgid "Download %s Tor Browser %s" -msgstr "Преузмите %s Тор прегледач %s" +msgstr "Преузмите %s прегледач Тор %s" #: bridgedb/https/templates/index.html:25 #, python-format @@ -124,7 +124,7 @@ msgstr "Корак %s3%s" #: bridgedb/https/templates/index.html:38 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "Сада %s додајте премошћиваче у Тор прегледач %s" +msgstr "Сада %s додајте премошћиваче у прегледач Тор%s" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -191,7 +191,7 @@ msgstr "Добродошли у BridgeDB!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". #: bridgedb/strings.py:55 msgid "Currently supported transport TYPEs:" -msgstr "Тренутно подржани transport TYPEs:" +msgstr "Тренутно подржани ТИП преноса:" #: bridgedb/strings.py:56 #, python-format @@ -228,7 +228,7 @@ msgid "" "difficult for anyone watching your internet traffic to determine that you are\n" "using Tor.\n" "\n" -msgstr "BridgeDB може обезбедити мостове са више %s типова Pluggable Transports %s,\nшто може помоћи прикривању ваших конекција са Тор Мрежом да би било коме ко\nпосматра ваш интенет саобраћај било теже да утврди да користите Тор.\n\n" +msgstr "BridgeDB може обезбедити премошћиваче са неколико %s типова прикључних преноса %s,\nшто може помоћи прикривању ваших конекција са Мрежом Тор, како би било\nкоме ко посматра ваш интенет саобраћај било теже да утврди да\nкористите Тор.\n\n" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #: bridgedb/strings.py:79 @@ -236,7 +236,7 @@ msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" -msgstr "Неки мостови са IPv6 адресама су такође доступни, мада неки Pluggable\n\nTransports нису компатибилни са IPv6.\n\n" +msgstr "Неки премошћивачи са IPv6 адресама су такође доступни, мада неки прикључиви\nпреноси нису компатибилни са IPv6.\n\n" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, @@ -250,7 +250,7 @@ msgid "" "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" "help to circumvent internet censorship in many cases.\n" "\n" -msgstr "Поред тога, BridgeDB има пуно најобичнијих мостова %s без икаквих\nPluggable Transports %s што можда не звучи толико кул, али они ипак\nу много случајева могу помоћи да се заобиђе интернет цензура.\n" +msgstr "Поред тога, BridgeDB има пуно најобичнијих премошћчивача %s без икаквих\nприкључних преноса %s што можда не звучи толико кул, али они ипак\nу много случајева могу помоћи да се заобиђе интернет цензура.\n" #: bridgedb/strings.py:101 msgid "What are bridges?" @@ -271,7 +271,7 @@ msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" "%s, %s or %s." -msgstr "Још један начин добијања мостова је да се пошаље и-мејл на %s. Узмите у обзир да\nморате послате и-мејл користећи адресу једног од следећих и-мејл провајдера.\n%s, %s или %s." +msgstr "Још један начин добијања премошћивача је да се пошаље и-мејл на %s. Узмите у обзир да\nморате послати и-мејл користећи адресу једног од следећих и-мејл провајдера.\n%s, %s или %s." #: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" @@ -356,30 +356,30 @@ msgid "" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" "you should be good to go! If you experience trouble, try clicking the 'Help'\n" "button in the 'Tor Network Settings' wizard for further assistance." -msgstr "Selektujte 'Yes' i onda kliknite na 'Next'. Da biste konfigurisali vaše nove mostove,\niskopirajte i pejstujte premošćivače u polje za unos teksta. Konačno, kliknite na\n'Connect', i spremni ste za polazak! Ako budete imali problema, kliknite na 'Help'\ndugme u 'Tor Network Settings' čarobnjaku da biste dobili dalju pomoć." +msgstr "Изаберите 'Да' и кликните на 'Следеће'. Да бисте конфигурисали своје нове премошћиваче, копирајте и\nналепите линије премошчивача у поље за унос текста. Коначно, кликните на 'конектуј се', i\nможете да почнете! Ако будете имали проблема, кликните на дугме 'Помоћ'\nу чаробњакз за подешавања мреже Тор за даљу помоћ." #: bridgedb/strings.py:167 msgid "Displays this message." -msgstr "Приказује ову слику." +msgstr "Приказује ову поруку." #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. #: bridgedb/strings.py:171 msgid "Request vanilla bridges." -msgstr "Zahtevati vanila mostove." +msgstr "Захтева базичне премошћиваче." #: bridgedb/strings.py:172 msgid "Request IPv6 bridges." -msgstr "Затражите IPv6 премошћиваче." +msgstr "Захтева IPv6 премошћиваче." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". #: bridgedb/strings.py:174 msgid "Request a Pluggable Transport by TYPE." -msgstr "Zahtevati Priključivi Transport po TIPU." +msgstr "Захтеба прикључиви пренос по ТИПУ." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". #: bridgedb/strings.py:177 msgid "Get a copy of BridgeDB's public GnuPG key." -msgstr "Добијте копију BridgeDB јавног GnuPG кључа." +msgstr "Добијте копију кључа BridgeDB јавног GnuPG."

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 13 Oct '15

13 Oct '15

commit 3ffd15f3bbf92e780f48778c048211e8054d8cc3 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 13 16:45:03 2015 +0000 Update translations for bridgedb --- sr/LC_MESSAGES/bridgedb.po | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/sr/LC_MESSAGES/bridgedb.po b/sr/LC_MESSAGES/bridgedb.po index 917c343..aab19aa 100644 --- a/sr/LC_MESSAGES/bridgedb.po +++ b/sr/LC_MESSAGES/bridgedb.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2015-10-13 15:54+0000\n" +"PO-Revision-Date: 2015-10-13 16:39+0000\n" "Last-Translator: Lidija <llazic.bgd(a)gmail.com>\n" "Language-Team: Serbian (http://www.transifex.com/otf/torproject/language/sr/)\n" "MIME-Version: 1.0\n" @@ -36,7 +36,7 @@ msgstr "" #. "Tor Browser" #: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." -msgstr "Извините! Нешто се лоше десило са вашим захтевом." +msgstr "Извините! Догодила се грешка са вашим захтевом." #: bridgedb/https/templates/base.html:79 msgid "Report a Bug" @@ -48,7 +48,7 @@ msgstr "Изворни код" #: bridgedb/https/templates/base.html:85 msgid "Changelog" -msgstr "Promena loga" +msgstr "Промена лога" #: bridgedb/https/templates/base.html:88 msgid "Contact" @@ -64,7 +64,7 @@ msgstr "Прикажи QRCode" #: bridgedb/https/templates/bridges.html:52 msgid "QRCode for your bridge lines" -msgstr "QR код за ваше премошћиваче" +msgstr "QR код за ваше линије премошћивања" #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, @@ -83,7 +83,7 @@ msgstr "Дошло је до грешке при набавлјању вашег msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" " your bridge lines onto mobile and other devices." -msgstr "QR код садржи ваше премошћиваче. Скенирајет га са читаћем QR кода да бисте ископирали ваше премошћиваче на моблине као и на друге уређаје." +msgstr "QR код садржи ваше линије премошћивања. Скенирајет га са читаћем QR кода да бисте ископирали ваше линије премошћивања на моблине као и на друге уређаје." #: bridgedb/https/templates/bridges.html:131 msgid "There currently aren't any bridges available..." @@ -104,7 +104,7 @@ msgstr "Корак %s1%s" #: bridgedb/https/templates/index.html:13 #, python-format msgid "Download %s Tor Browser %s" -msgstr "Преузмите %s Тор прегледач %s" +msgstr "Преузмите %s прегледач Тор %s" #: bridgedb/https/templates/index.html:25 #, python-format @@ -124,7 +124,7 @@ msgstr "Корак %s3%s" #: bridgedb/https/templates/index.html:38 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "Сада %s додајте премошћиваче у Тор прегледач %s" +msgstr "Сада %s додајте премошћиваче у прегледач Тор%s" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -191,7 +191,7 @@ msgstr "Добродошли у BridgeDB!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". #: bridgedb/strings.py:55 msgid "Currently supported transport TYPEs:" -msgstr "Тренутно подржани transport TYPEs:" +msgstr "Тренутно подржани ТИП преноса:" #: bridgedb/strings.py:56 #, python-format @@ -228,7 +228,7 @@ msgid "" "difficult for anyone watching your internet traffic to determine that you are\n" "using Tor.\n" "\n" -msgstr "BridgeDB може обезбедити мостове са више %s типова Pluggable Transports %s,\nшто може помоћи прикривању ваших конекција са Тор Мрежом да би било коме ко\nпосматра ваш интенет саобраћај било теже да утврди да користите Тор.\n\n" +msgstr "BridgeDB може обезбедити премошћиваче са неколико %s типова прикључних преноса %s,\nшто може помоћи прикривању ваших конекција са Мрежом Тор, како би било\nкоме ко посматра ваш интенет саобраћај било теже да утврди да\nкористите Тор.\n\n" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #: bridgedb/strings.py:79 @@ -236,7 +236,7 @@ msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" -msgstr "Неки мостови са IPv6 адресама су такође доступни, мада неки Pluggable\n\nTransports нису компатибилни са IPv6.\n\n" +msgstr "Неки премошћивачи са IPv6 адресама су такође доступни, мада неки прикључиви\nпреноси нису компатибилни са IPv6.\n\n" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, @@ -250,7 +250,7 @@ msgid "" "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" "help to circumvent internet censorship in many cases.\n" "\n" -msgstr "Поред тога, BridgeDB има пуно најобичнијих мостова %s без икаквих\nPluggable Transports %s што можда не звучи толико кул, али они ипак\nу много случајева могу помоћи да се заобиђе интернет цензура.\n" +msgstr "Поред тога, BridgeDB има пуно најобичнијих премошћчивача %s без икаквих\nприкључних преноса %s што можда не звучи толико кул, али они ипак\nу много случајева могу помоћи да се заобиђе интернет цензура.\n" #: bridgedb/strings.py:101 msgid "What are bridges?" @@ -271,7 +271,7 @@ msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" "%s, %s or %s." -msgstr "Још један начин добијања мостова је да се пошаље и-мејл на %s. Узмите у обзир да\nморате послате и-мејл користећи адресу једног од следећих и-мејл провајдера.\n%s, %s или %s." +msgstr "Још један начин добијања премошћивача је да се пошаље и-мејл на %s. Узмите у обзир да\nморате послати и-мејл користећи адресу једног од следећих и-мејл провајдера.\n%s, %s или %s." #: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" @@ -356,30 +356,30 @@ msgid "" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" "you should be good to go! If you experience trouble, try clicking the 'Help'\n" "button in the 'Tor Network Settings' wizard for further assistance." -msgstr "Selektujte 'Yes' i onda kliknite na 'Next'. Da biste konfigurisali vaše nove mostove,\niskopirajte i pejstujte premošćivače u polje za unos teksta. Konačno, kliknite na\n'Connect', i spremni ste za polazak! Ako budete imali problema, kliknite na 'Help'\ndugme u 'Tor Network Settings' čarobnjaku da biste dobili dalju pomoć." +msgstr "Изаберите 'Да' и кликните на 'Следеће'. Да бисте конфигурисали своје нове премошћиваче, копирајте и\nналепите линије премошчивача у поље за унос текста. Коначно, кликните на 'конектуј се', i\nможете да почнете! Ако будете имали проблема, кликните на дугме 'Помоћ'\nу чаробњакз за подешавања мреже Тор за даљу помоћ." #: bridgedb/strings.py:167 msgid "Displays this message." -msgstr "Приказује ову слику." +msgstr "Приказује ову поруку." #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. #: bridgedb/strings.py:171 msgid "Request vanilla bridges." -msgstr "Zahtevati vanila mostove." +msgstr "Захтева базичне премошћиваче." #: bridgedb/strings.py:172 msgid "Request IPv6 bridges." -msgstr "Затражите IPv6 премошћиваче." +msgstr "Захтева IPv6 премошћиваче." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". #: bridgedb/strings.py:174 msgid "Request a Pluggable Transport by TYPE." -msgstr "Zahtevati Priključivi Transport po TIPU." +msgstr "Захтеба прикључиви пренос по ТИПУ." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". #: bridgedb/strings.py:177 msgid "Get a copy of BridgeDB's public GnuPG key." -msgstr "Добијте копију BridgeDB јавног GnuPG кључа." +msgstr "Добијте копију кључа BridgeDB јавног GnuPG."

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 13 Oct '15

13 Oct '15

commit 76b2d40944d6483316003d5586329a5587bfb25d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 13 16:15:07 2015 +0000 Update translations for bridgedb_completed --- sr/LC_MESSAGES/bridgedb.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sr/LC_MESSAGES/bridgedb.po b/sr/LC_MESSAGES/bridgedb.po index f1b0c85..917c343 100644 --- a/sr/LC_MESSAGES/bridgedb.po +++ b/sr/LC_MESSAGES/bridgedb.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2015-10-13 15:42+0000\n" +"PO-Revision-Date: 2015-10-13 15:54+0000\n" "Last-Translator: Lidija <llazic.bgd(a)gmail.com>\n" "Language-Team: Serbian (http://www.transifex.com/otf/torproject/language/sr/)\n" "MIME-Version: 1.0\n" @@ -291,11 +291,11 @@ msgid "" "Try including as much info about your case as you can, including the list of\n" "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" "and any messages which Tor gave out, etc." -msgstr "Unesite što više informacija o vašem slučaju, uključujući: spisak\nmostova i priključivih transporta koje ste pokušali da koristite, verziju\nvašeg Tor Brauzera, bilo koju sliku koju vam je Tor izbacio, itd." +msgstr "Унесите што више информација о вашем случају, укључујући списак\nмостова и прикљуивих транспорта које сте покушали да користите, \nверзију вашег тор претраживача, било \nкоју поруку коју вам је Тор избацио, итд." #: bridgedb/strings.py:128 msgid "Here are your bridge lines:" -msgstr "Evo vaših premošćivača:" +msgstr "Ево Ваших линија премошћивача:" #: bridgedb/strings.py:129 msgid "Get Bridges!" @@ -333,14 +333,14 @@ msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" "page %s and then follow the instructions there for downloading and starting\n" "Tor Browser." -msgstr "Da biste uneli mostove u Tor Brauzer, prvo idite na %s Tor Brauzer\ndownload stranicu %s , a onda sledite uputstva za preuzimanje i \nstartovanje Tor Brauzera." +msgstr "Да бисте унели премошћиваче у претраживач Tor, први идите на страници %s за преузимање %s \nпретраживача Тор и тамо пратите упутства за преузимање и покретање претрачивача Тор." #. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:151 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" -msgstr "Када се 'Подешавања Тор мреже' дијалог појави, кликните 'Конфигуриши' и пратите упутства док не питају:" +msgstr "Када се дијалог 'Подешавања Тор мреже' појави, кликните 'Конфигуриши' и пратите упутства до питања:" #. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:155

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 13 Oct '15

13 Oct '15

commit 30f50bda3d289630c04632899df8ad3637123ae2 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 13 16:15:03 2015 +0000 Update translations for bridgedb --- sr/LC_MESSAGES/bridgedb.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sr/LC_MESSAGES/bridgedb.po b/sr/LC_MESSAGES/bridgedb.po index f1b0c85..917c343 100644 --- a/sr/LC_MESSAGES/bridgedb.po +++ b/sr/LC_MESSAGES/bridgedb.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2015-10-13 15:42+0000\n" +"PO-Revision-Date: 2015-10-13 15:54+0000\n" "Last-Translator: Lidija <llazic.bgd(a)gmail.com>\n" "Language-Team: Serbian (http://www.transifex.com/otf/torproject/language/sr/)\n" "MIME-Version: 1.0\n" @@ -291,11 +291,11 @@ msgid "" "Try including as much info about your case as you can, including the list of\n" "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" "and any messages which Tor gave out, etc." -msgstr "Unesite što više informacija o vašem slučaju, uključujući: spisak\nmostova i priključivih transporta koje ste pokušali da koristite, verziju\nvašeg Tor Brauzera, bilo koju sliku koju vam je Tor izbacio, itd." +msgstr "Унесите што више информација о вашем случају, укључујући списак\nмостова и прикљуивих транспорта које сте покушали да користите, \nверзију вашег тор претраживача, било \nкоју поруку коју вам је Тор избацио, итд." #: bridgedb/strings.py:128 msgid "Here are your bridge lines:" -msgstr "Evo vaših premošćivača:" +msgstr "Ево Ваших линија премошћивача:" #: bridgedb/strings.py:129 msgid "Get Bridges!" @@ -333,14 +333,14 @@ msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" "page %s and then follow the instructions there for downloading and starting\n" "Tor Browser." -msgstr "Da biste uneli mostove u Tor Brauzer, prvo idite na %s Tor Brauzer\ndownload stranicu %s , a onda sledite uputstva za preuzimanje i \nstartovanje Tor Brauzera." +msgstr "Да бисте унели премошћиваче у претраживач Tor, први идите на страници %s за преузимање %s \nпретраживача Тор и тамо пратите упутства за преузимање и покретање претрачивача Тор." #. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:151 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" -msgstr "Када се 'Подешавања Тор мреже' дијалог појави, кликните 'Конфигуриши' и пратите упутства док не питају:" +msgstr "Када се дијалог 'Подешавања Тор мреже' појави, кликните 'Конфигуриши' и пратите упутства до питања:" #. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:155

1 0

[tor-messenger-build/master] Rebrand Tor Messenger as Unnamed Messenger
by sukhbir＠torproject.org 13 Oct '15

13 Oct '15

commit 69c73e53b4f03fbf90eaaea14b0d9ec04420ca20 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Oct 13 12:08:12 2015 -0400 Rebrand Tor Messenger as Unnamed Messenger --- projects/instantbird/branding/about.png | Bin 9880 -> 10728 bytes projects/instantbird/branding/name.patch | 16 +- projects/instantbird/branding/osx.patch | 2 +- projects/tor-messenger/build | 16 +- projects/tor-messenger/build.osx | 14 +- projects/tor-messenger/config | 10 +- projects/tor-messenger/start-tor-messenger | 372 -------------------- projects/tor-messenger/start-tor-messenger.desktop | 29 +- projects/tor-messenger/start-unnamed-messenger | 372 ++++++++++++++++++++ projects/tor-messenger/tor-messenger.ico | Bin 23934 -> 0 bytes projects/tor-messenger/tor-messenger.nsi | 168 --------- projects/tor-messenger/unnamed-messenger.ico | Bin 0 -> 23934 bytes projects/tor-messenger/unnamed-messenger.nsi | 168 +++++++++ 13 files changed, 584 insertions(+), 583 deletions(-) diff --git a/projects/instantbird/branding/about.png b/projects/instantbird/branding/about.png index 5d7f579..8dbd586 100644 Binary files a/projects/instantbird/branding/about.png and b/projects/instantbird/branding/about.png differ diff --git a/projects/instantbird/branding/name.patch b/projects/instantbird/branding/name.patch index 378c6db..a8b7f29 100644 --- a/projects/instantbird/branding/name.patch +++ b/projects/instantbird/branding/name.patch @@ -10,8 +10,8 @@ index e5b5348..276722b 100755 -!define CompanyName "Instantbird" -!define URLInfoAbout "http://www.instantbird.com/" -!define URLUpdateInfo "http://www.instantbird.com/" -+!define BrandFullNameInternal "Tor Messenger" -+!define CompanyName "Tor Messenger" ++!define BrandFullNameInternal "Unnamed Messenger" ++!define CompanyName "Unnamed Messenger" +!define URLInfoAbout "https://www.torproject.org" +!define URLUpdateInfo "https://www.torproject.org" @@ -25,11 +25,11 @@ index c569ebb..2d6a5d8 100644 -<!ENTITY brandShortName "Instantbird"> -<!ENTITY brandFullName "Instantbird - Nightly"> -+<!ENTITY brandShortName "Tor Messenger"> -+<!ENTITY brandFullName "Tor Messenger - Alpha"> ++<!ENTITY brandShortName "Unnamed Messenger"> ++<!ENTITY brandFullName "Unnamed Messenger - Beta"> <!ENTITY brandMotto "'Cause geeks can also do magic!"> -<!ENTITY vendorShortName "Instantbird"> -+<!ENTITY vendorShortName "Tor Messenger"> ++<!ENTITY vendorShortName "Unnamed Messenger"> diff --git a/im/branding/messenger/locales/en-US/brand.properties b/im/branding/messenger/locales/en-US/brand.properties index f949ced..93528a3 100644 --- a/im/branding/messenger/locales/en-US/brand.properties @@ -41,6 +41,6 @@ index f949ced..93528a3 100644 -brandShortName=Instantbird -brandFullName=Instantbird - Nightly -vendorShortName=Instantbird -+brandShortName=Tor Messenger -+brandFullName=Tor Messenger - Alpha -+vendorShortName=Tor Messenger ++brandShortName=Unnamed Messenger ++brandFullName=Unnamed Messenger - Beta ++vendorShortName=Unnamed Messenger diff --git a/projects/instantbird/branding/osx.patch b/projects/instantbird/branding/osx.patch index 196d671..a64e751 100644 --- a/projects/instantbird/branding/osx.patch +++ b/projects/instantbird/branding/osx.patch @@ -6,4 +6,4 @@ diff --git a/im/branding/messenger/configure.sh b/im/branding/messenger/configur # file, You can obtain one at http://mozilla.org/MPL/2.0/. -MOZ_APP_DISPLAYNAME=Instantbird -+MOZ_APP_DISPLAYNAME="Tor Messenger" ++MOZ_APP_DISPLAYNAME="Unnamed Messenger" diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build index f51bf1f..d3d4c9b 100644 --- a/projects/tor-messenger/build +++ b/projects/tor-messenger/build @@ -20,11 +20,11 @@ tar xf [% c('input_files_by_name/bundle-data') %] -C bundle/Messenger/TorMesseng [% IF c("var/linux") %] tar xf [% c('input_files_by_name/gcc') %] -chmod 755 start-tor-messenger start-tor-messenger.desktop execdesktop +chmod 755 start-unnamed-messenger start-unnamed-messenger.desktop execdesktop -cp start-tor-messenger.desktop bundle/ -mv start-tor-messenger.desktop bundle/Messenger/ -mv start-tor-messenger bundle/Messenger/ +cp start-unnamed-messenger.desktop bundle/ +mv start-unnamed-messenger.desktop bundle/Messenger/ +mv start-unnamed-messenger bundle/Messenger/ mv execdesktop bundle/Messenger/ mkdir -p bundle/Messenger/lib @@ -52,13 +52,13 @@ mv tor-browser_en-US/Browser/TorBrowser/Tor tor-launcher(a)torproject.org/TorBrows mv tor-browser_en-US/Browser/TorBrowser/Data/Tor tor-launcher(a)torproject.org/TorBrowser/Data/Tor rm -Rf tor-browser_en-US cd ../../../ -mv bundle tor-messenger +mv bundle unnamed-messenger [% IF c('var/windows') -%] -makensis tor-messenger.nsi -mv tor-messenger-install.exe [% dest_dir _ '/' _ c('filename') %] +makensis unnamed-messenger.nsi +mv unnamed-messenger-install.exe [% dest_dir _ '/' _ c('filename') %] [% ELSE -%] [% c('tar', { - tar_src => [ 'tor-messenger' ], + tar_src => [ 'unnamed-messenger' ], tar_args => '-cJf ' _ dest_dir _ '/' _ c('filename'), }) %] [% END -%] diff --git a/projects/tor-messenger/build.osx b/projects/tor-messenger/build.osx index 16e9b47..f751a42 100644 --- a/projects/tor-messenger/build.osx +++ b/projects/tor-messenger/build.osx @@ -2,7 +2,7 @@ set -e rootdir=$(pwd) tar xf [% c('input_files_by_name/instantbird') %] -mv TorMessenger.app Tor\ Messenger.app +mv UnnamedMessenger.app Unnamed\ Messenger.app tar xf [% c('input_files_by_name/libdmg') %] export PATH="$(pwd)/libdmg-hfsplus:$PATH" @@ -18,7 +18,7 @@ sed -i 's/^ControlPort .*/ControlPort [% c("var/tor_control_port") %]/' TorBrows mkdir -p tor-launcher(a)torproject.org/TorBrowser/Data mv TorBrowser.app/TorBrowser/Tor tor-launcher(a)torproject.org/TorBrowser/Tor mv TorBrowser.app/TorBrowser/Data/Tor tor-launcher(a)torproject.org/TorBrowser/Data/Tor -mv tor-launcher(a)torproject.org $rootdir/Tor\ Messenger.app/Contents/Resources/extensions/ +mv tor-launcher(a)torproject.org $rootdir/Unnamed\ Messenger.app/Contents/Resources/extensions/ cd .. mkdir ctypes-otr @@ -27,17 +27,17 @@ tar xf $rootdir/[% c('input_files_by_name/ctypes-otr') %] mv ctypes-otr* $rootdir/Tor\ Messenger.app/Contents/Resources/extensions/ctypes-otr@tormessenger cd .. -mkdir Tor\ Messenger.app/TorMessenger -tar xf [% c('input_files_by_name/bundle-data') %] -C Tor\ Messenger.app/TorMessenger +mkdir Unnamed\ Messenger.app/TorMessenger +tar xf [% c('input_files_by_name/bundle-data') %] -C Unnamed\ Messenger.app/TorMessenger mkdir dmg -mv Tor\ Messenger.app dmg +mv Unnamed\ Messenger.app dmg cd dmg find . -executable -exec chmod 750 {} \; find . ! -executable -exec chmod 640 {} \; find . -type f | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" > ../filelist.txt find . -type l | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" >> ../filelist.txt -mkisofs -D -V "Tor Messenger" -no-pad -R -apple -o ../Tor\ Messenger-uncompressed.dmg -path-list ../filelist.txt -graft-points -gid 20 -dir-mode 0750 -new-dir-mode 0750 +mkisofs -D -V "Unnamed Messenger" -no-pad -R -apple -o ../Unnamed\ Messenger-uncompressed.dmg -path-list ../filelist.txt -graft-points -gid 20 -dir-mode 0750 -new-dir-mode 0750 cd .. -dmg dmg Tor\ Messenger-uncompressed.dmg [% dest_dir _ '/' _ c('filename') %] +dmg dmg Unnamed\ Messenger-uncompressed.dmg [% dest_dir _ '/' _ c('filename') %] diff --git a/projects/tor-messenger/config b/projects/tor-messenger/config index b85fda6..1e6a9d9 100644 --- a/projects/tor-messenger/config +++ b/projects/tor-messenger/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 version: 0.1.0b1 -filename: 'tor-messenger-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].[% c("var/filename_ext") %]' +filename: 'unnamed-messenger-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].[% c("var/filename_ext") %]' input_files: - name: instantbird project: instantbird @@ -15,13 +15,13 @@ input_files: - project: gcc name: gcc enable: '[% c("var/linux") %]' - - filename: start-tor-messenger - - filename: start-tor-messenger.desktop + - filename: start-unnamed-messenger + - filename: start-unnamed-messenger.desktop - filename: execdesktop - - filename: tor-messenger.nsi + - filename: unnamed-messenger.nsi enable: '[% c("var/windows") %]' - filename: cert_override.txt - - filename: tor-messenger.ico + - filename: unnamed-messenger.ico enable: '[% c("var/windows") %]' - project: libdmg-hfsplus name: libdmg diff --git a/projects/tor-messenger/start-tor-messenger b/projects/tor-messenger/start-tor-messenger deleted file mode 100755 index 6c85733..0000000 --- a/projects/tor-messenger/start-tor-messenger +++ /dev/null @@ -1,372 +0,0 @@ -#!/usr/bin/env bash -# -# This script is modified from the start-tor-browser script. -# -# GNU/Linux does not really require something like RelativeLink.c -# However, we do want to have the same look and feel with similar features. -# -# Copyright 2015 The Tor Project. See LICENSE for licensing information. - -complain_dialog_title="Tor Messenger" - -# First, make sure DISPLAY is set. If it isn't, we're hosed; scream -# at stderr and die. -if [ "x$DISPLAY" = "x" ]; then - echo "$complain_dialog_title must be run within the X Window System." >&2 - echo "Exiting." >&2 - exit 1 -fi - -# Second, make sure this script wasn't started as 'sh start-tor-messenger' or -# similar. -if [ "x$BASH" = "x" ]; then - echo "$complain_dialog_title should be started as './start-tor-messenger'" - echo "Exiting." >&2 - exit 1; -fi - -# Do not (try to) connect to the session manager -unset SESSION_MANAGER - -# Complain about an error, by any means necessary. -# Usage: complain message -# message must not begin with a dash. -complain () { - # Trim leading newlines, to avoid breaking formatting in some dialogs. - complain_message="`echo "$1" | sed '/./,$!d'`" - - # If we're being run in debug/verbose mode, complain to stderr. - if [ "$show_output" -eq 1 ]; then - echo "$complain_message" >&2 - return - fi - - # Otherwise, we're being run by a GUI program of some sort; - # try to pop up a message in the GUI in the nicest way - # possible. - # - # In mksh, non-existent commands return 127; I'll assume all - # other shells set the same exit code if they can't run a - # command. (xmessage returns 1 if the user clicks the WM - # close button, so we do need to look at the exact exit code, - # not just assume the command failed to display a message if - # it returns non-zero.) - - # First, try zenity. - zenity --error \ - --title="$complain_dialog_title" \ - --text="$complain_message" - if [ "$?" -ne 127 ]; then - return - fi - - # Try kdialog. - kdialog --title "$complain_dialog_title" \ - --error "$complain_message" - if [ "$?" -ne 127 ]; then - return - fi - - # Try xmessage. - xmessage -title "$complain_dialog_title" \ - -center \ - -buttons OK \ - -default OK \ - -xrm '*message.scrollVertical: Never' \ - "$complain_message" - if [ "$?" -ne 127 ]; then - return - fi - - # Try gxmessage. This one isn't installed by default on - # Debian with the default GNOME installation, so it seems to - # be the least likely program to have available, but it might - # be used by one of the 'lightweight' Gtk-based desktop - # environments. - gxmessage -title "$complain_dialog_title" \ - -center \ - -buttons GTK_STOCK_OK \ - -default OK \ - "$complain_message" - if [ "$?" -ne 127 ]; then - return - fi -} - -if [ "`id -u`" -eq 0 ]; then - complain "The Tor Messenger Bundle should not be run as root. Exiting." - exit 1 -fi - -tbb_usage () { - printf "\nTor Messenger Script Options\n" - printf " --verbose Display Tor and Instantbird output in the terminal\n" - printf " --log [file] Record Tor and Instantbird output in file (default: tor-messenger.log)\n" - printf " --detach Detach from terminal and run Tor Messenger in the background.\n" - printf " --register-app Register Tor Messenger as a desktop app for this user\n" - printf " --unregister-app Unregister Tor Messenger as a desktop app for this user\n" -} -log_output=0 -show_output=0 -detach=0 -show_usage=0 -register_desktop_app=0 -logfile=/dev/null -while : -do - case "$1" in - --detach) - detach=1 - shift - ;; - -v | --verbose | -d | --debug) - show_output=1 - verbose_arg="$2" - shift - ;; - -h | "-?" | --help | -help) - show_usage=1 - show_output=1 - shift - ;; - -l | --log) - if [ -z "$2" -o "${2:0:1}" == "-" ]; then - printf "Logging Tor Messenger debug information to tor-messenger.log\n" - logfile="../tor-messenger.log" - elif [ "${2:0:1}" == "/" -o "${2:0:1}" == "~" ]; then - printf "Logging Tor Messenger debug information to %s\n" "$2" - logfile="$2" - shift - else - printf "Logging Tor Messenger debug information to %s\n" "$2" - logfile="../$2" - shift - fi - log_output=1 - shift - ;; - --register-app) - register_desktop_app=1 - show_output=1 - shift - ;; - --unregister-app) - register_desktop_app=-1 - show_output=1 - shift - ;; - *) # No more options - break - ;; - esac -done - -# We can't detach and show output at the same time.. -if [ "$show_output" -eq 1 -a "$detach" -eq 1 ]; then - detach=0 -fi - -if [ "$show_output" -eq 0 ]; then - # If the user hasn't requested 'debug mode' or --help, close stdout and stderr, - # to keep Instantbird and the stuff loaded by/for it (including the - # system's shared-library loader) from printing messages to - # $HOME/.xsession-errors or other files. (Users wouldn't have seen - # messages there anyway.) - exec > "$logfile" - exec 2> "$logfile" -fi - -# If XAUTHORITY is unset, set it to its default value of $HOME/.Xauthority -# before we change HOME below. (See xauth(1) and #1945.) XDM and KDM rely -# on applications using this default value. -if [ -z "$XAUTHORITY" ]; then - XAUTHORITY=~/.Xauthority - export XAUTHORITY -fi - -# If this script is being run through a symlink, we need to know where -# in the filesystem the script itself is, not where the symlink is. -myname="$0" -if [ -L "$myname" ]; then - # XXX readlink is not POSIX, but is present in GNU coreutils - # and on FreeBSD. Unfortunately, the -f option (which follows - # a whole chain of symlinks until it reaches a non-symlink - # path name) is a GNUism, so we have to have a fallback for - # FreeBSD. Fortunately, FreeBSD has realpath instead; - # unfortunately, that's also non-POSIX and is not present in - # GNU coreutils. - # - # If this launcher were a C program, we could just use the - # realpath function, which *is* POSIX. Too bad POSIX didn't - # make that function accessible to shell scripts. - - # If realpath is available, use it; it Does The Right Thing. - possibly_my_real_name="`realpath "$myname" 2>/dev/null`" - if [ "$?" -eq 0 ]; then - myname="$possibly_my_real_name" - else - # realpath is not available; hopefully readlink -f works. - myname="`readlink -f "$myname" 2>/dev/null`" - if [ "$?" -ne 0 ]; then - # Ugh. - complain "start-tor-messenger cannot be run using a symlink on this operating system." - fi - fi -fi - -# Try to be agnostic to where we're being started from, chdir to where -# the script is. -mydir="`dirname "$myname"`" -test -d "$mydir" && cd "$mydir" - -# If ${PWD} results in a zero length string, we can try something else... -if [ ! "${PWD}" ]; then - # "hacking around some braindamage" - PWD="`pwd`" - surveysays="This system has a messed up shell.\n" -fi - -# This is a fix for an ibus issue on some Linux systems. See #9353 for more -# details. The symlink needs to be created before we change HOME. -if [ ! -d ".config/ibus" ]; then - mkdir -p .config/ibus - ln -nsf ~/.config/ibus/bus .config/ibus -fi - -# Fix up .desktop Icon and Exec Paths, and update the .desktop file from the -# canonical version if it was changed by the updater. -cp start-tor-messenger.desktop ../ -sed -i -e "s,^Name=.*,Name=Tor Messenger,g" ../start-tor-messenger.desktop -sed -i -e "s,^Icon=.*,Icon=$PWD/chrome/icons/default/default48.png,g" ../start-tor-messenger.desktop -sed -i -e "s,^Exec=.*,Exec=sh -c '\"$PWD/start-tor-messenger\" --detach || ([ ! -x \"$PWD/start-tor-messenger\" ] \&\& \"\$(dirname \"\$*\")\"/Messenger/start-tor-messenger --detach)' dummy %k,g" ../start-tor-messenger.desktop - -if [ "$register_desktop_app" -eq 1 ]; then - mkdir -p "$HOME/.local/share/applications/" - cp ../start-tor-messenger.desktop "$HOME/.local/share/applications/" - update-desktop-database "$HOME/.local/share/applications/" - printf "Tor Messenger has been registered as a desktop app for this user in ~/.local/share/applications/\n" - exit 0 -fi - -if [ "$register_desktop_app" -eq -1 ]; then - if [ -e "$HOME/.local/share/applications/start-tor-messenger.desktop" ]; then - rm -f "$HOME/.local/share/applications/start-tor-messenger.desktop" - update-desktop-database "$HOME/.local/share/applications/" - printf "Tor Messenger has been removed as a user desktop app (from ~/.local/share/applications/)\n" - else - printf "Tor Messenger does not appear to be a desktop app (not present in ~/.local/share/applications/)\n" - fi - exit 0 -fi - -HOME="${PWD}" -export HOME - -SYSARCHITECTURE=$(getconf LONG_BIT) -TORARCHITECTURE=$(expr "$(file extensions/tor-launcher(a)torproject.org/TorBrowser/Tor/tor)" : '.*ELF $[[:digit:]]*$') - -if [ $SYSARCHITECTURE -ne $TORARCHITECTURE ]; then - complain "Wrong architecture? 32-bit vs. 64-bit." - exit 1 -fi - -LD_LIBRARY_PATH="${HOME}/lib/:${HOME}/extensions/tor-launcher@torproject.org/TorBrowser/Tor:${HOME}/extensions/ctypes-otr@tormessenger/chrome/content" -export LD_LIBRARY_PATH - -function setControlPortPasswd() { - local ctrlPasswd=$1 - - if test -z "$ctrlPasswd" -o "$ctrlPasswd" = $'\"secret\"' ; then - unset TOR_CONTROL_PASSWD - return - fi - - if test "${ctrlPasswd:0:1}" = $'\"'; then # First 2 chars were '" - printf "Using system Tor process.\n" - export TOR_CONTROL_PASSWD - else - complain "There seems to have been a quoting problem with your \ -TOR_CONTROL_PASSWD environment variable." - cat <<EOF - -The Tor ControlPort password should be given inside double quotes, inside single -quotes, i.e. if the ControlPort password is “secret” (without curly quotes) then -we must start this script after setting the environment variable exactly like -this: - - \$ TOR_CONTROL_PASSWD='"secret"' $myname - -EOF - fi -} - -# Using a system-installed Tor process with Tor Messenger: -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# The Tor ControlPort password should be given inside double quotes, inside -# single quotes, i.e. if the ControlPort password is “secret” (without -# curly quotes) then we must set the environment variable *exactly* like -# this: -# -# TOR_CONTROL_PASSWD='"secret"' -# -# Yes, the variable MUST be double-quoted, then single-quoted, exactly as -# shown. This is used by TorButton and Tor Launcher to authenticate to Tor's -# ControlPort, and is necessary for using TB with a system-installed Tor. -# -# Additionally, if using a system-installed Tor, the following about:config -# options should be set (values in <> mean they are the value taken from your -# torrc): -# -# SETTING NAME VALUE -# extensions.torbutton.banned_ports [...],<SocksPort>,<ControlPort> -# extensions.torbutton.block_disk false -# extensions.torbutton.custom.socks_host 127.0.0.1 -# extensions.torbutton.custom.socks_port <SocksPort> -# extensions.torbutton.inserted_button true -# extensions.torbutton.launch_warning false -# extensions.torbutton.loglevel 2 -# extensions.torbutton.logmethod 0 -# extensions.torbutton.settings_method custom -# extensions.torbutton.socks_port <SocksPort> -# extensions.torbutton.use_privoxy false -# extensions.torlauncher.control_port <ControlPort> -# extensions.torlauncher.loglevel 2 -# extensions.torlauncher.logmethod 0 -# extensions.torlauncher.prompt_at_startup false -# extensions.torlauncher.start_tor false -# -# where the '[...]' in the banned_ports option means "leave anything that was -# already in the preference alone, just append the things specified after it". - -# Either set `TOR_CONTROL_PASSWD` before running ./start-tor-messenger, or put -# your password in the following line where the word “secret” is: -setControlPortPasswd ${TOR_CONTROL_PASSWD:='"secret"'} - -cd "${HOME}" - -# We pass all additional command-line arguments we get to Instantbird. -# -# The --class parameter was added to fix bug 11102. - -if [ "$show_usage" -eq 1 ]; then - # Display Instantbird help, then our help - TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./instantbird --class "Tor Messenger" \ - -profile TorMessenger/Data/Browser/profile.default --help 2>/dev/null - tbb_usage -elif [ "$detach" -eq 1 ] ; then - TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./instantbird --class "Tor Messenger" \ - -profile TorMessenger/Data/Browser/profile.default "${@}" > "$logfile" 2>&1 </dev/null & - disown "$!" -elif [ "$log_output" -eq 1 -a "$show_output" -eq 1 ]; then - TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./instantbird --class "Tor Messenger" \ - -profile TorMessenger/Data/Browser/profile.default "${@}" 2>&1 </dev/null | \ - tee "$logfile" -elif [ "$show_output" -eq 1 ]; then - TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./instantbird --class "Tor Messenger" \ - -profile TorMessenger/Data/Browser/profile.default "${@}" < /dev/null -else - TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./instantbird --class "Tor Messenger" \ - -profile TorMessenger/Data/Browser/profile.default "${@}" > "$logfile" 2>&1 </dev/null -fi - -exit $? diff --git a/projects/tor-messenger/start-tor-messenger.desktop b/projects/tor-messenger/start-tor-messenger.desktop index c0f6fdb..3c5f92f 100644 --- a/projects/tor-messenger/start-tor-messenger.desktop +++ b/projects/tor-messenger/start-tor-messenger.desktop @@ -1,22 +1,23 @@ #!/usr/bin/env ./Messenger/execdesktop # # This file is a self-modifying .desktop file that can be run from the shell. -# It preserves arguments and environment for the start-tor-messenger script. +# It preserves arguments and environment for the start-unnamed-messenger script. # -# Run './start-tor-messenger.desktop --help' to display the full set of options. +# Run './start-unnamed-messenger.desktop --help' to display the full set of options. # -# When invoked from the shell, this file must always be in a Tor Messenger root -# directory. When run from the file manager or desktop GUI, it is relocatable. +# When invoked from the shell, this file must always be in a Unnamed Messenger +# root directory. When run from the file manager or desktop GUI, it is +# relocatable. # # After first invocation, it will update itself with the absolute path to the # current TBB location, to support relocation of this .desktop file for GUI -# invocation. You can also add Tor Messenger to your desktop's application menu by -# running './start-tor-messenger.desktop --register-app' +# invocation. You can also add Unnamed Messenger to your desktop's application +# menu by running './start-unnamed-messenger.desktop --register-app' # -# If you use --register-app, and then relocate your TBB directory, Tor Messenger -# will no longer launch from your desktop's app launcher/dock. However, if you -# re-run --register-app from inside that new directory, the script will correct -# the absolute paths and re-register itself. +# If you use --register-app, and then relocate your TBB directory, Unnamed +# Messenger will no longer launch from your desktop's app launcher/dock. +# However, if you re-run --register-app from inside that new directory, the +# script will correct the absolute paths and re-register itself. # # This file will also still function if the path changes when TBB is used as a # portable app, so long as it is run directly from that new directory, either @@ -24,10 +25,10 @@ [Desktop Entry] Type=Application -Name=Tor Messenger Setup +Name=Unnamed Messenger Setup GenericName=Instant Messenger -Comment=Tor Messenger is +1 for privacy and -1 for mass surveillance +Comment=Unnamed Messenger is +1 for privacy and -1 for mass surveillance Categories=Network;Chat;Security; -Exec=sh -c '"$(dirname "$*")"/Messenger/start-tor-messenger --detach || ([ ! -x "$(dirname "$*")"/Messenger/start-tor-messenger ] && "$(dirname "$*")"/start-tor-messenger --detach)' dummy %k -X-TorMessenger-ExecShell=./Messenger/start-tor-messenger --detach +Exec=sh -c '"$(dirname "$*")"/Messenger/start-unnamed-messenger --detach || ([ ! -x "$(dirname "$*")"/Messenger/start-unnamed-messenger ] && "$(dirname "$*")"/start-unnamed-messenger --detach)' dummy %k +X-TorMessenger-ExecShell=./Messenger/start-unnamed-messenger --detach Icon=instant-messenger diff --git a/projects/tor-messenger/start-unnamed-messenger b/projects/tor-messenger/start-unnamed-messenger new file mode 100755 index 0000000..974330a --- /dev/null +++ b/projects/tor-messenger/start-unnamed-messenger @@ -0,0 +1,372 @@ +#!/usr/bin/env bash +# +# This script is modified from the start-tor-browser script. +# +# GNU/Linux does not really require something like RelativeLink.c +# However, we do want to have the same look and feel with similar features. +# +# Copyright 2015 The Tor Project. See LICENSE for licensing information. + +complain_dialog_title="Unnamed Messenger" + +# First, make sure DISPLAY is set. If it isn't, we're hosed; scream +# at stderr and die. +if [ "x$DISPLAY" = "x" ]; then + echo "$complain_dialog_title must be run within the X Window System." >&2 + echo "Exiting." >&2 + exit 1 +fi + +# Second, make sure this script wasn't started as 'sh start-unnamed-messenger' or +# similar. +if [ "x$BASH" = "x" ]; then + echo "$complain_dialog_title should be started as './start-unnamed-messenger'" + echo "Exiting." >&2 + exit 1; +fi + +# Do not (try to) connect to the session manager +unset SESSION_MANAGER + +# Complain about an error, by any means necessary. +# Usage: complain message +# message must not begin with a dash. +complain () { + # Trim leading newlines, to avoid breaking formatting in some dialogs. + complain_message="`echo "$1" | sed '/./,$!d'`" + + # If we're being run in debug/verbose mode, complain to stderr. + if [ "$show_output" -eq 1 ]; then + echo "$complain_message" >&2 + return + fi + + # Otherwise, we're being run by a GUI program of some sort; + # try to pop up a message in the GUI in the nicest way + # possible. + # + # In mksh, non-existent commands return 127; I'll assume all + # other shells set the same exit code if they can't run a + # command. (xmessage returns 1 if the user clicks the WM + # close button, so we do need to look at the exact exit code, + # not just assume the command failed to display a message if + # it returns non-zero.) + + # First, try zenity. + zenity --error \ + --title="$complain_dialog_title" \ + --text="$complain_message" + if [ "$?" -ne 127 ]; then + return + fi + + # Try kdialog. + kdialog --title "$complain_dialog_title" \ + --error "$complain_message" + if [ "$?" -ne 127 ]; then + return + fi + + # Try xmessage. + xmessage -title "$complain_dialog_title" \ + -center \ + -buttons OK \ + -default OK \ + -xrm '*message.scrollVertical: Never' \ + "$complain_message" + if [ "$?" -ne 127 ]; then + return + fi + + # Try gxmessage. This one isn't installed by default on + # Debian with the default GNOME installation, so it seems to + # be the least likely program to have available, but it might + # be used by one of the 'lightweight' Gtk-based desktop + # environments. + gxmessage -title "$complain_dialog_title" \ + -center \ + -buttons GTK_STOCK_OK \ + -default OK \ + "$complain_message" + if [ "$?" -ne 127 ]; then + return + fi +} + +if [ "`id -u`" -eq 0 ]; then + complain "The Unnamed Messenger Bundle should not be run as root. Exiting." + exit 1 +fi + +tbb_usage () { + printf "\nUnnamed Messenger Script Options\n" + printf " --verbose Display Tor and Instantbird output in the terminal\n" + printf " --log [file] Record Tor and Instantbird output in file (default: unnamed-messenger.log)\n" + printf " --detach Detach from terminal and run Unnamed Messenger in the background.\n" + printf " --register-app Register Unnamed Messenger as a desktop app for this user\n" + printf " --unregister-app Unregister Unnamed Messenger as a desktop app for this user\n" +} +log_output=0 +show_output=0 +detach=0 +show_usage=0 +register_desktop_app=0 +logfile=/dev/null +while : +do + case "$1" in + --detach) + detach=1 + shift + ;; + -v | --verbose | -d | --debug) + show_output=1 + verbose_arg="$2" + shift + ;; + -h | "-?" | --help | -help) + show_usage=1 + show_output=1 + shift + ;; + -l | --log) + if [ -z "$2" -o "${2:0:1}" == "-" ]; then + printf "Logging Unnamed Messenger debug information to unnamed-messenger.log\n" + logfile="../unnamed-messenger.log" + elif [ "${2:0:1}" == "/" -o "${2:0:1}" == "~" ]; then + printf "Logging Unnamed Messenger debug information to %s\n" "$2" + logfile="$2" + shift + else + printf "Logging Unnamed Messenger debug information to %s\n" "$2" + logfile="../$2" + shift + fi + log_output=1 + shift + ;; + --register-app) + register_desktop_app=1 + show_output=1 + shift + ;; + --unregister-app) + register_desktop_app=-1 + show_output=1 + shift + ;; + *) # No more options + break + ;; + esac +done + +# We can't detach and show output at the same time.. +if [ "$show_output" -eq 1 -a "$detach" -eq 1 ]; then + detach=0 +fi + +if [ "$show_output" -eq 0 ]; then + # If the user hasn't requested 'debug mode' or --help, close stdout and stderr, + # to keep Instantbird and the stuff loaded by/for it (including the + # system's shared-library loader) from printing messages to + # $HOME/.xsession-errors or other files. (Users wouldn't have seen + # messages there anyway.) + exec > "$logfile" + exec 2> "$logfile" +fi + +# If XAUTHORITY is unset, set it to its default value of $HOME/.Xauthority +# before we change HOME below. (See xauth(1) and #1945.) XDM and KDM rely +# on applications using this default value. +if [ -z "$XAUTHORITY" ]; then + XAUTHORITY=~/.Xauthority + export XAUTHORITY +fi + +# If this script is being run through a symlink, we need to know where +# in the filesystem the script itself is, not where the symlink is. +myname="$0" +if [ -L "$myname" ]; then + # XXX readlink is not POSIX, but is present in GNU coreutils + # and on FreeBSD. Unfortunately, the -f option (which follows + # a whole chain of symlinks until it reaches a non-symlink + # path name) is a GNUism, so we have to have a fallback for + # FreeBSD. Fortunately, FreeBSD has realpath instead; + # unfortunately, that's also non-POSIX and is not present in + # GNU coreutils. + # + # If this launcher were a C program, we could just use the + # realpath function, which *is* POSIX. Too bad POSIX didn't + # make that function accessible to shell scripts. + + # If realpath is available, use it; it Does The Right Thing. + possibly_my_real_name="`realpath "$myname" 2>/dev/null`" + if [ "$?" -eq 0 ]; then + myname="$possibly_my_real_name" + else + # realpath is not available; hopefully readlink -f works. + myname="`readlink -f "$myname" 2>/dev/null`" + if [ "$?" -ne 0 ]; then + # Ugh. + complain "start-unnamed-messenger cannot be run using a symlink on this operating system." + fi + fi +fi + +# Try to be agnostic to where we're being started from, chdir to where +# the script is. +mydir="`dirname "$myname"`" +test -d "$mydir" && cd "$mydir" + +# If ${PWD} results in a zero length string, we can try something else... +if [ ! "${PWD}" ]; then + # "hacking around some braindamage" + PWD="`pwd`" + surveysays="This system has a messed up shell.\n" +fi + +# This is a fix for an ibus issue on some Linux systems. See #9353 for more +# details. The symlink needs to be created before we change HOME. +if [ ! -d ".config/ibus" ]; then + mkdir -p .config/ibus + ln -nsf ~/.config/ibus/bus .config/ibus +fi + +# Fix up .desktop Icon and Exec Paths, and update the .desktop file from the +# canonical version if it was changed by the updater. +cp start-unnamed-messenger.desktop ../ +sed -i -e "s,^Name=.*,Name=Unnamed Messenger,g" ../start-tor-messenger.desktop +sed -i -e "s,^Icon=.*,Icon=$PWD/chrome/icons/default/default48.png,g" ../start-unnamed-messenger.desktop +sed -i -e "s,^Exec=.*,Exec=sh -c '\"$PWD/start-unnamed-messenger\" --detach || ([ ! -x \"$PWD/start-unnamed-messenger\" ] \&\& \"\$(dirname \"\$*\")\"/Messenger/start-unnamed-messenger --detach)' dummy %k,g" ../start-unnamed-messenger.desktop + +if [ "$register_desktop_app" -eq 1 ]; then + mkdir -p "$HOME/.local/share/applications/" + cp ../start-unnamed-messenger.desktop "$HOME/.local/share/applications/" + update-desktop-database "$HOME/.local/share/applications/" + printf "Unnamed Messenger has been registered as a desktop app for this user in ~/.local/share/applications/\n" + exit 0 +fi + +if [ "$register_desktop_app" -eq -1 ]; then + if [ -e "$HOME/.local/share/applications/start-unnamed-messenger.desktop" ]; then + rm -f "$HOME/.local/share/applications/start-unnamed-messenger.desktop" + update-desktop-database "$HOME/.local/share/applications/" + printf "Unnamed Messenger has been removed as a user desktop app (from ~/.local/share/applications/)\n" + else + printf "Unnamed Messenger does not appear to be a desktop app (not present in ~/.local/share/applications/)\n" + fi + exit 0 +fi + +HOME="${PWD}" +export HOME + +SYSARCHITECTURE=$(getconf LONG_BIT) +TORARCHITECTURE=$(expr "$(file extensions/tor-launcher(a)torproject.org/TorBrowser/Tor/tor)" : '.*ELF $[[:digit:]]*$') + +if [ $SYSARCHITECTURE -ne $TORARCHITECTURE ]; then + complain "Wrong architecture? 32-bit vs. 64-bit." + exit 1 +fi + +LD_LIBRARY_PATH="${HOME}/lib/:${HOME}/extensions/tor-launcher@torproject.org/TorBrowser/Tor:${HOME}/extensions/ctypes-otr@tormessenger/chrome/content" +export LD_LIBRARY_PATH + +function setControlPortPasswd() { + local ctrlPasswd=$1 + + if test -z "$ctrlPasswd" -o "$ctrlPasswd" = $'\"secret\"' ; then + unset TOR_CONTROL_PASSWD + return + fi + + if test "${ctrlPasswd:0:1}" = $'\"'; then # First 2 chars were '" + printf "Using system Tor process.\n" + export TOR_CONTROL_PASSWD + else + complain "There seems to have been a quoting problem with your \ +TOR_CONTROL_PASSWD environment variable." + cat <<EOF + +The Tor ControlPort password should be given inside double quotes, inside single +quotes, i.e. if the ControlPort password is “secret” (without curly quotes) then +we must start this script after setting the environment variable exactly like +this: + + \$ TOR_CONTROL_PASSWD='"secret"' $myname + +EOF + fi +} + +# Using a system-installed Tor process with Tor Messenger: +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# The Tor ControlPort password should be given inside double quotes, inside +# single quotes, i.e. if the ControlPort password is “secret” (without +# curly quotes) then we must set the environment variable *exactly* like +# this: +# +# TOR_CONTROL_PASSWD='"secret"' +# +# Yes, the variable MUST be double-quoted, then single-quoted, exactly as +# shown. This is used by TorButton and Tor Launcher to authenticate to Tor's +# ControlPort, and is necessary for using TB with a system-installed Tor. +# +# Additionally, if using a system-installed Tor, the following about:config +# options should be set (values in <> mean they are the value taken from your +# torrc): +# +# SETTING NAME VALUE +# extensions.torbutton.banned_ports [...],<SocksPort>,<ControlPort> +# extensions.torbutton.block_disk false +# extensions.torbutton.custom.socks_host 127.0.0.1 +# extensions.torbutton.custom.socks_port <SocksPort> +# extensions.torbutton.inserted_button true +# extensions.torbutton.launch_warning false +# extensions.torbutton.loglevel 2 +# extensions.torbutton.logmethod 0 +# extensions.torbutton.settings_method custom +# extensions.torbutton.socks_port <SocksPort> +# extensions.torbutton.use_privoxy false +# extensions.torlauncher.control_port <ControlPort> +# extensions.torlauncher.loglevel 2 +# extensions.torlauncher.logmethod 0 +# extensions.torlauncher.prompt_at_startup false +# extensions.torlauncher.start_tor false +# +# where the '[...]' in the banned_ports option means "leave anything that was +# already in the preference alone, just append the things specified after it". + +# Either set `TOR_CONTROL_PASSWD` before running ./start-tor-messenger, or put +# your password in the following line where the word “secret” is: +setControlPortPasswd ${TOR_CONTROL_PASSWD:='"secret"'} + +cd "${HOME}" + +# We pass all additional command-line arguments we get to Instantbird. +# +# The --class parameter was added to fix bug 11102. + +if [ "$show_usage" -eq 1 ]; then + # Display Instantbird help, then our help + TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./instantbird --class "Unnamed Messenger" \ + -profile TorMessenger/Data/Browser/profile.default --help 2>/dev/null + tbb_usage +elif [ "$detach" -eq 1 ] ; then + TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./instantbird --class "Unnamed Messenger" \ + -profile TorMessenger/Data/Browser/profile.default "${@}" > "$logfile" 2>&1 </dev/null & + disown "$!" +elif [ "$log_output" -eq 1 -a "$show_output" -eq 1 ]; then + TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./instantbird --class "Unnamed Messenger" \ + -profile TorMessenger/Data/Browser/profile.default "${@}" 2>&1 </dev/null | \ + tee "$logfile" +elif [ "$show_output" -eq 1 ]; then + TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./instantbird --class "Unnamed Messenger" \ + -profile TorMessenger/Data/Browser/profile.default "${@}" < /dev/null +else + TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./instantbird --class "Unnamed Messenger" \ + -profile TorMessenger/Data/Browser/profile.default "${@}" > "$logfile" 2>&1 </dev/null +fi + +exit $? diff --git a/projects/tor-messenger/tor-messenger.ico b/projects/tor-messenger/tor-messenger.ico deleted file mode 100644 index cce2759..0000000 Binary files a/projects/tor-messenger/tor-messenger.ico and /dev/null differ diff --git a/projects/tor-messenger/tor-messenger.nsi b/projects/tor-messenger/tor-messenger.nsi deleted file mode 100644 index eabe6f3..0000000 --- a/projects/tor-messenger/tor-messenger.nsi +++ /dev/null @@ -1,168 +0,0 @@ -;NSIS Installer for Tor Messenger -;Based on NSIS Installer for Tor Browser Bundle -;Written by Moritz Bartl -;released under Public Domain - -;-------------------------------- -;Modern" UI - - !include "MUI2.nsh" - -;-------------------------------- -;General - - ; location of Tor Messenger to put into installer - !define TBBSOURCE ".\tor-messenger\" - - Name "Tor Messenger" - OutFile "tor-messenger-install.exe" - - ;Default installation folder - InstallDir "$DESKTOP\Tor Messenger" - - ;Best (but slowest) compression - SetCompressor /SOLID lzma - SetCompressorDictSize 32 - - ;Request application privileges for Windows Vista - RequestExecutionLevel user - -;-------------------------------- -;Interface Configuration - - !define MUI_ICON "tor-messenger.ico" - !define MUI_ABORTWARNING - -;-------------------------------- -;Modern UI settings - !define MUI_FINISHPAGE_NOREBOOTSUPPORT ; we don't require a reboot - !define MUI_FINISHPAGE_RUN - !define MUI_FINISHPAGE_RUN_FUNCTION "StartTorMessenger" - !define MUI_FINISHPAGE_SHOWREADME ; misuse for option to create shortcut; less ugly than MUI_PAGE_COMPONENTS - !define MUI_FINISHPAGE_SHOWREADME_TEXT "&Add Start Menu && Desktop shortcuts" - !define MUI_FINISHPAGE_SHOWREADME_FUNCTION "CreateShortCuts" -;-------------------------------- -;Pages - - !define MUI_PAGE_CUSTOMFUNCTION_LEAVE CheckIfTargetDirectoryExists - !insertmacro MUI_PAGE_DIRECTORY - !insertmacro MUI_PAGE_INSTFILES - !insertmacro MUI_PAGE_FINISH - -;-------------------------------- -;Languages - - !insertmacro MUI_LANGUAGE "English" ;first language is the default language - !insertmacro MUI_LANGUAGE "French" - !insertmacro MUI_LANGUAGE "German" - !insertmacro MUI_LANGUAGE "Spanish" - !insertmacro MUI_LANGUAGE "SpanishInternational" - !insertmacro MUI_LANGUAGE "SimpChinese" - !insertmacro MUI_LANGUAGE "TradChinese" - !insertmacro MUI_LANGUAGE "Japanese" - !insertmacro MUI_LANGUAGE "Korean" - !insertmacro MUI_LANGUAGE "Italian" - !insertmacro MUI_LANGUAGE "Dutch" - !insertmacro MUI_LANGUAGE "Danish" - !insertmacro MUI_LANGUAGE "Swedish" - !insertmacro MUI_LANGUAGE "Norwegian" - !insertmacro MUI_LANGUAGE "NorwegianNynorsk" - !insertmacro MUI_LANGUAGE "Finnish" - !insertmacro MUI_LANGUAGE "Greek" - !insertmacro MUI_LANGUAGE "Russian" - !insertmacro MUI_LANGUAGE "Portuguese" - !insertmacro MUI_LANGUAGE "PortugueseBR" - !insertmacro MUI_LANGUAGE "Polish" - !insertmacro MUI_LANGUAGE "Ukrainian" - !insertmacro MUI_LANGUAGE "Czech" - !insertmacro MUI_LANGUAGE "Slovak" - !insertmacro MUI_LANGUAGE "Croatian" - !insertmacro MUI_LANGUAGE "Bulgarian" - !insertmacro MUI_LANGUAGE "Hungarian" - !insertmacro MUI_LANGUAGE "Thai" - !insertmacro MUI_LANGUAGE "Romanian" - !insertmacro MUI_LANGUAGE "Latvian" - !insertmacro MUI_LANGUAGE "Macedonian" - !insertmacro MUI_LANGUAGE "Estonian" - !insertmacro MUI_LANGUAGE "Turkish" - !insertmacro MUI_LANGUAGE "Lithuanian" - !insertmacro MUI_LANGUAGE "Slovenian" - !insertmacro MUI_LANGUAGE "Serbian" - !insertmacro MUI_LANGUAGE "SerbianLatin" - !insertmacro MUI_LANGUAGE "Arabic" - !insertmacro MUI_LANGUAGE "Farsi" - !insertmacro MUI_LANGUAGE "Hebrew" - !insertmacro MUI_LANGUAGE "Indonesian" - !insertmacro MUI_LANGUAGE "Mongolian" - !insertmacro MUI_LANGUAGE "Luxembourgish" - !insertmacro MUI_LANGUAGE "Albanian" - !insertmacro MUI_LANGUAGE "Breton" - !insertmacro MUI_LANGUAGE "Belarusian" - !insertmacro MUI_LANGUAGE "Icelandic" - !insertmacro MUI_LANGUAGE "Malay" - !insertmacro MUI_LANGUAGE "Bosnian" - !insertmacro MUI_LANGUAGE "Kurdish" - !insertmacro MUI_LANGUAGE "Irish" - !insertmacro MUI_LANGUAGE "Uzbek" - !insertmacro MUI_LANGUAGE "Galician" - !insertmacro MUI_LANGUAGE "Afrikaans" - !insertmacro MUI_LANGUAGE "Catalan" - !insertmacro MUI_LANGUAGE "Esperanto" - -;-------------------------------- -;Multi Language support: Read strings from separate file - -; !include torbrowser-langstrings.nsi - -;-------------------------------- -;Reserve Files - - ;If you are using solid compression, files that are required before - ;the actual installation should be stored first in the data block, - ;because this will make your installer start faster. - - !insertmacro MUI_RESERVEFILE_LANGDLL - -;-------------------------------- -;Installer Sections - -Section "Tor Messenger" SecTBB - - SetOutPath "$INSTDIR" - File /r "${TBBSOURCE}\*.*" - SetOutPath "$INSTDIR\Messenger" - CreateShortCut "$INSTDIR\Start Tor Messenger.lnk" "$INSTDIR\Messenger\instantbird.exe" - -SectionEnd - -Function CreateShortcuts - - CreateShortCut "$SMPROGRAMS\Start Tor Messenger.lnk" "$INSTDIR\Messenger\instantbird.exe" - CreateShortCut "$DESKTOP\Start Tor Messenger.lnk" "$INSTDIR\Messenger\instantbird.exe" - -FunctionEnd -;-------------------------------- -;Installer Functions - -Function .onInit - - !insertmacro MUI_LANGDLL_DISPLAY - -FunctionEnd - -;-------------------------------- -;Helper Functions - -Function CheckIfTargetDirectoryExists -${If} ${FileExists} "$INSTDIR\*.*" - MessageBox MB_YESNO "The destination directory already exists. You can try to upgrade Tor Messenger, but if you run into any problems, use a new directory instead. Continue?" IDYES NoAbort - Abort - NoAbort: -${EndIf} -FunctionEnd - - -Function StartTorMessenger -ExecShell "open" "$INSTDIR/Start Tor Messenger.lnk" -FunctionEnd - diff --git a/projects/tor-messenger/unnamed-messenger.ico b/projects/tor-messenger/unnamed-messenger.ico new file mode 100644 index 0000000..cce2759 Binary files /dev/null and b/projects/tor-messenger/unnamed-messenger.ico differ diff --git a/projects/tor-messenger/unnamed-messenger.nsi b/projects/tor-messenger/unnamed-messenger.nsi new file mode 100644 index 0000000..0f0e5cd --- /dev/null +++ b/projects/tor-messenger/unnamed-messenger.nsi @@ -0,0 +1,168 @@ +;NSIS Installer for Unnamed Messenger +;Based on NSIS Installer for Tor Browser Bundle +;Written by Moritz Bartl +;released under Public Domain + +;-------------------------------- +;Modern" UI + + !include "MUI2.nsh" + +;-------------------------------- +;General + + ; location of Unnamed Messenger to put into installer + !define TBBSOURCE ".\unnamed-messenger\" + + Name "Unnamed Messenger" + OutFile "unnamed-messenger-install.exe" + + ;Default installation folder + InstallDir "$DESKTOP\Unnamed Messenger" + + ;Best (but slowest) compression + SetCompressor /SOLID lzma + SetCompressorDictSize 32 + + ;Request application privileges for Windows Vista + RequestExecutionLevel user + +;-------------------------------- +;Interface Configuration + + !define MUI_ICON "unnamed-messenger.ico" + !define MUI_ABORTWARNING + +;-------------------------------- +;Modern UI settings + !define MUI_FINISHPAGE_NOREBOOTSUPPORT ; we don't require a reboot + !define MUI_FINISHPAGE_RUN + !define MUI_FINISHPAGE_RUN_FUNCTION "StartUnnamedMessenger" + !define MUI_FINISHPAGE_SHOWREADME ; misuse for option to create shortcut; less ugly than MUI_PAGE_COMPONENTS + !define MUI_FINISHPAGE_SHOWREADME_TEXT "&Add Start Menu && Desktop shortcuts" + !define MUI_FINISHPAGE_SHOWREADME_FUNCTION "CreateShortCuts" +;-------------------------------- +;Pages + + !define MUI_PAGE_CUSTOMFUNCTION_LEAVE CheckIfTargetDirectoryExists + !insertmacro MUI_PAGE_DIRECTORY + !insertmacro MUI_PAGE_INSTFILES + !insertmacro MUI_PAGE_FINISH + +;-------------------------------- +;Languages + + !insertmacro MUI_LANGUAGE "English" ;first language is the default language + !insertmacro MUI_LANGUAGE "French" + !insertmacro MUI_LANGUAGE "German" + !insertmacro MUI_LANGUAGE "Spanish" + !insertmacro MUI_LANGUAGE "SpanishInternational" + !insertmacro MUI_LANGUAGE "SimpChinese" + !insertmacro MUI_LANGUAGE "TradChinese" + !insertmacro MUI_LANGUAGE "Japanese" + !insertmacro MUI_LANGUAGE "Korean" + !insertmacro MUI_LANGUAGE "Italian" + !insertmacro MUI_LANGUAGE "Dutch" + !insertmacro MUI_LANGUAGE "Danish" + !insertmacro MUI_LANGUAGE "Swedish" + !insertmacro MUI_LANGUAGE "Norwegian" + !insertmacro MUI_LANGUAGE "NorwegianNynorsk" + !insertmacro MUI_LANGUAGE "Finnish" + !insertmacro MUI_LANGUAGE "Greek" + !insertmacro MUI_LANGUAGE "Russian" + !insertmacro MUI_LANGUAGE "Portuguese" + !insertmacro MUI_LANGUAGE "PortugueseBR" + !insertmacro MUI_LANGUAGE "Polish" + !insertmacro MUI_LANGUAGE "Ukrainian" + !insertmacro MUI_LANGUAGE "Czech" + !insertmacro MUI_LANGUAGE "Slovak" + !insertmacro MUI_LANGUAGE "Croatian" + !insertmacro MUI_LANGUAGE "Bulgarian" + !insertmacro MUI_LANGUAGE "Hungarian" + !insertmacro MUI_LANGUAGE "Thai" + !insertmacro MUI_LANGUAGE "Romanian" + !insertmacro MUI_LANGUAGE "Latvian" + !insertmacro MUI_LANGUAGE "Macedonian" + !insertmacro MUI_LANGUAGE "Estonian" + !insertmacro MUI_LANGUAGE "Turkish" + !insertmacro MUI_LANGUAGE "Lithuanian" + !insertmacro MUI_LANGUAGE "Slovenian" + !insertmacro MUI_LANGUAGE "Serbian" + !insertmacro MUI_LANGUAGE "SerbianLatin" + !insertmacro MUI_LANGUAGE "Arabic" + !insertmacro MUI_LANGUAGE "Farsi" + !insertmacro MUI_LANGUAGE "Hebrew" + !insertmacro MUI_LANGUAGE "Indonesian" + !insertmacro MUI_LANGUAGE "Mongolian" + !insertmacro MUI_LANGUAGE "Luxembourgish" + !insertmacro MUI_LANGUAGE "Albanian" + !insertmacro MUI_LANGUAGE "Breton" + !insertmacro MUI_LANGUAGE "Belarusian" + !insertmacro MUI_LANGUAGE "Icelandic" + !insertmacro MUI_LANGUAGE "Malay" + !insertmacro MUI_LANGUAGE "Bosnian" + !insertmacro MUI_LANGUAGE "Kurdish" + !insertmacro MUI_LANGUAGE "Irish" + !insertmacro MUI_LANGUAGE "Uzbek" + !insertmacro MUI_LANGUAGE "Galician" + !insertmacro MUI_LANGUAGE "Afrikaans" + !insertmacro MUI_LANGUAGE "Catalan" + !insertmacro MUI_LANGUAGE "Esperanto" + +;-------------------------------- +;Multi Language support: Read strings from separate file + +; !include torbrowser-langstrings.nsi + +;-------------------------------- +;Reserve Files + + ;If you are using solid compression, files that are required before + ;the actual installation should be stored first in the data block, + ;because this will make your installer start faster. + + !insertmacro MUI_RESERVEFILE_LANGDLL + +;-------------------------------- +;Installer Sections + +Section "Unnamed Messenger" SecTBB + + SetOutPath "$INSTDIR" + File /r "${TBBSOURCE}\*.*" + SetOutPath "$INSTDIR\Messenger" + CreateShortCut "$INSTDIR\Start Unnamed Messenger.lnk" "$INSTDIR\Messenger\instantbird.exe" + +SectionEnd + +Function CreateShortcuts + + CreateShortCut "$SMPROGRAMS\Start Unnamed Messenger.lnk" "$INSTDIR\Messenger\instantbird.exe" + CreateShortCut "$DESKTOP\Start Unnamed Messenger.lnk" "$INSTDIR\Messenger\instantbird.exe" + +FunctionEnd +;-------------------------------- +;Installer Functions + +Function .onInit + + !insertmacro MUI_LANGDLL_DISPLAY + +FunctionEnd + +;-------------------------------- +;Helper Functions + +Function CheckIfTargetDirectoryExists +${If} ${FileExists} "$INSTDIR\*.*" + MessageBox MB_YESNO "The destination directory already exists. You can try to upgrade Unnamed Messenger, but if you run into any problems, use a new directory instead. Continue?" IDYES NoAbort + Abort + NoAbort: +${EndIf} +FunctionEnd + + +Function StartUnnamedMessenger +ExecShell "open" "$INSTDIR/Start Unnamed Messenger.lnk" +FunctionEnd +

1 0