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

[translation/tor-messenger-facebookproperties] Update translations for tor-messenger-facebookproperties
by translation＠torproject.org 26 Oct '15

26 Oct '15

commit 3b72c094fe00ded5aadb2c06e9d47c412123293e Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 26 12:46:18 2015 +0000 Update translations for tor-messenger-facebookproperties --- lv/facebook.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lv/facebook.properties b/lv/facebook.properties index aaf7cdc..a72a1eb 100644 --- a/lv/facebook.properties +++ b/lv/facebook.properties @@ -2,6 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -connection.error.useUsernameNotEmailAddress=Please use your Facebook username, not an email address +connection.error.useUsernameNotEmailAddress=Lūdzu, izmantojiet savu Facebook lietotājvārdu, nevis e-pasta adresi -facebook.chat.name=Facebook Chat +facebook.chat.name=Facebook čats

1 0

[translation/tor-messenger-otrproperties_completed] Update translations for tor-messenger-otrproperties_completed
by translation＠torproject.org 26 Oct '15

26 Oct '15

commit 2cc84dfb854e5747b1c1d5057df7cdcf414002d1 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 26 05:16:34 2015 +0000 Update translations for tor-messenger-otrproperties_completed --- sv/otr.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv/otr.properties b/sv/otr.properties index 0b7d4c3..692ea88 100644 --- a/sv/otr.properties +++ b/sv/otr.properties @@ -11,7 +11,7 @@ msgevent.rcvdmsg_malformed=Vi tog emot ett felaktigt datameddelande från %S. msgevent.log_heartbeat_rcvd=Hjärtslag togs emot från %S. msgevent.log_heartbeat_sent=Hjärtslag skickades till %S. msgevent.rcvdmsg_general_err=Ett OTR-fel inträffade. -msgevent.rcvdmsg_unecrypted=Vi tog emot ett okrypterat meddelande från %S. +msgevent.rcvdmsg_unecrypted=Följande meddelande mottaget från %S var ej enkrypterat: %S msgevent.rcvdmsg_unrecognized=Vi tog emot ett oigenkännligt OTR-meddelande från %S. msgevent.rcvdmsg_for_other_instance=%S har skickat ett meddelande riktat till en annan session. Om du är inloggad flera gånger kan en annan session ha tagit emot meddelandet. context.gone_secure_private=Privat konversation med %S startad.

1 0

[translation/tor-messenger-otrproperties] Update translations for tor-messenger-otrproperties
by translation＠torproject.org 26 Oct '15

26 Oct '15

commit 1366f71130de40a47e70949e8846f27573df9573 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 26 05:16:31 2015 +0000 Update translations for tor-messenger-otrproperties --- sv/otr.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv/otr.properties b/sv/otr.properties index 34b2fe9..692ea88 100644 --- a/sv/otr.properties +++ b/sv/otr.properties @@ -11,7 +11,7 @@ msgevent.rcvdmsg_malformed=Vi tog emot ett felaktigt datameddelande från %S. msgevent.log_heartbeat_rcvd=Hjärtslag togs emot från %S. msgevent.log_heartbeat_sent=Hjärtslag skickades till %S. msgevent.rcvdmsg_general_err=Ett OTR-fel inträffade. -msgevent.rcvdmsg_unecrypted=The following message received from %S was not encrypted: %S +msgevent.rcvdmsg_unecrypted=Följande meddelande mottaget från %S var ej enkrypterat: %S msgevent.rcvdmsg_unrecognized=Vi tog emot ett oigenkännligt OTR-meddelande från %S. msgevent.rcvdmsg_for_other_instance=%S har skickat ett meddelande riktat till en annan session. Om du är inloggad flera gånger kan en annan session ha tagit emot meddelandet. context.gone_secure_private=Privat konversation med %S startad.

1 0

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

26 Oct '15

commit 071ecfbdfed6e2a6e5b53cd4f62fa1e3a4808df9 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 26 05:15:39 2015 +0000 Update translations for tor-launcher-network-settings --- ky/network-settings.dtd | 4 ++-- sv/network-settings.dtd | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ky/network-settings.dtd b/ky/network-settings.dtd index ef50668..fee491d 100644 --- a/ky/network-settings.dtd +++ b/ky/network-settings.dtd @@ -41,8 +41,8 @@ <!ENTITY torsettings.useProxy.address "Дарек:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.username "Колдонуучунун аты"> +<!ENTITY torsettings.useProxy.password "Сыр сөз:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> diff --git a/sv/network-settings.dtd b/sv/network-settings.dtd index 6ec3077..84b734f 100644 --- a/sv/network-settings.dtd +++ b/sv/network-settings.dtd @@ -2,7 +2,7 @@  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.prompt "Vänligen välj ett språk.">

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 26 Oct '15

26 Oct '15

commit 1bf5238c2c9b46513424feb8476efac5de43397e Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 26 05:15:23 2015 +0000 Update translations for tails-greeter --- ky/ky.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ky/ky.po b/ky/ky.po index 96863b5..738a510 100644 --- a/ky/ky.po +++ b/ky/ky.po @@ -7,10 +7,10 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-28 22:33+0200\n" -"PO-Revision-Date: 2014-05-29 08:53+0000\n" +"POT-Creation-Date: 2015-09-20 18:20+0200\n" +"PO-Revision-Date: 2015-10-26 04:51+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" -"Language-Team: Kirgyz (http://www.transifex.com/projects/p/torproject/language/ky/)\n" +"Language-Team: Kyrgyz (http://www.transifex.com/otf/torproject/language/ky/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -79,7 +79,7 @@ msgstr "" #: ../glade/optionswindow.glade.h:7 msgid "Password:" -msgstr "" +msgstr "Сырсөз:" #: ../glade/optionswindow.glade.h:8 msgid "Verify Password:" @@ -196,7 +196,7 @@ msgid "" "%(stderr)s" msgstr "" -#: ../tailsgreeter/langpanel.py:125 ../tailsgreeter/langpanel.py:152 -#: ../tailsgreeter/langpanel.py:185 +#: ../tailsgreeter/langpanel.py:123 ../tailsgreeter/langpanel.py:150 +#: ../tailsgreeter/langpanel.py:183 msgid "Other..." msgstr ""

1 0

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

26 Oct '15

commit c40933e37a4e0241a847043e1f7c4d81b67d8714 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 26 04:45:08 2015 +0000 Update translations for bridgedb_completed --- sv/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sv/LC_MESSAGES/bridgedb.po b/sv/LC_MESSAGES/bridgedb.po index 7a7c9b3..4671c38 100644 --- a/sv/LC_MESSAGES/bridgedb.po +++ b/sv/LC_MESSAGES/bridgedb.po @@ -17,7 +17,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-26 01:03+0000\n" +"PO-Revision-Date: 2015-10-26 04:38+0000\n" "Last-Translator: Emil Johansson <emil.a.johansson(a)gmail.com>\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" @@ -128,7 +128,7 @@ msgstr "Steg %s3%s" #: bridgedb/https/templates/index.html:38 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "Nu kan du %s lägga till bryggor i Tor Browser %s" +msgstr "Lägg nu till %s bryggorna till Tor %s" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks!

1 0

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

26 Oct '15

commit 0cc22b5512af1c62bce0728b4bf1ae724747619d Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 26 04:45:03 2015 +0000 Update translations for bridgedb --- sv/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sv/LC_MESSAGES/bridgedb.po b/sv/LC_MESSAGES/bridgedb.po index 7a7c9b3..4671c38 100644 --- a/sv/LC_MESSAGES/bridgedb.po +++ b/sv/LC_MESSAGES/bridgedb.po @@ -17,7 +17,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-26 01:03+0000\n" +"PO-Revision-Date: 2015-10-26 04:38+0000\n" "Last-Translator: Emil Johansson <emil.a.johansson(a)gmail.com>\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" @@ -128,7 +128,7 @@ msgstr "Steg %s3%s" #: bridgedb/https/templates/index.html:38 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "Nu kan du %s lägga till bryggor i Tor Browser %s" +msgstr "Lägg nu till %s bryggorna till Tor %s" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks!

1 0

[tor-messenger-build/master] Update cert_override.txt in tor-messenger/
by sukhbir＠torproject.org 26 Oct '15

26 Oct '15

commit 632e0b4fcdda3b0fb6296ac5c6c4c7859912d2ec Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sun Oct 25 23:02:00 2015 -0400 Update cert_override.txt in tor-messenger/ --- projects/tor-messenger/cert_override.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-messenger/cert_override.txt b/projects/tor-messenger/cert_override.txt index fbe9a6f..4e616f6 100644 --- a/projects/tor-messenger/cert_override.txt +++ b/projects/tor-messenger/cert_override.txt @@ -1,3 +1,3 @@ # PSM Certificate Override Settings file # This is a generated file! Do not edit. -jabber.ccc.de:5222 OID.2.16.840.1.101.3.4.2.1 63:0F:F6:2F:26:2E:2E:D3:52:4E:03:1F:39:1B:72:96:FD:09:9E:CA:10:64:76:88:74:C4:49:52:6F:94:A5:41 U AAAAAAAAAAAAAAADAAAAew308jB5MRAwDgYDVQQKEwdSb290IENBMR4wHAYDVQQL ExVodHRwOi8vd3d3LmNhY2VydC5vcmcxIjAgBgNVBAMTGUNBIENlcnQgU2lnbmlu ZyBBdXRob3JpdHkxITAfBgkqhkiG9w0BCQEWEnN1cHBvcnRAY2FjZXJ0Lm9yZw== +jabber.ccc.de:5222 OID.2.16.840.1.101.3.4.2.1 59:2F:46:18:35:27:AB:40:83:88:82:AB:4C:B4:AE:F4:E2:CF:91:60:74:AB:01:F9:BC:24:39:31:CA:5C:4E:D1 U AAAAAAAAAAAAAAADAAAAexFL3TB5MRAwDgYDVQQKEwdSb290IENBMR4wHAYDVQQL ExVodHRwOi8vd3d3LmNhY2VydC5vcmcxIjAgBgNVBAMTGUNBIENlcnQgU2lnbmlu ZyBBdXRob3JpdHkxITAfBgkqhkiG9w0BCQEWEnN1cHBvcnRAY2FjZXJ0Lm9yZw==

1 0

[tor-messenger-build/master] Bug 17346: Update Tor Messenger branding
by sukhbir＠torproject.org 26 Oct '15

26 Oct '15

commit 327c183f17910c545540d7d9882acc374d96203b Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sun Oct 25 22:45:35 2015 -0400 Bug 17346: Update Tor Messenger branding --- projects/instantbird/branding/about.png | Bin 10718 -> 9880 bytes projects/instantbird/branding/name.patch | 16 +- projects/instantbird/branding/osx.patch | 2 +- projects/tor-messenger/build | 16 +- projects/tor-messenger/build.osx | 16 +- projects/tor-messenger/config | 10 +- projects/tor-messenger/start-tor-messenger | 372 ++++++++++++++++++++ projects/tor-messenger/start-tor-messenger.desktop | 35 ++ projects/tor-messenger/start-unnamed-messenger | 372 -------------------- .../tor-messenger/start-unnamed-messenger.desktop | 34 -- projects/tor-messenger/tor-messenger.ico | Bin 0 -> 23934 bytes projects/tor-messenger/tor-messenger.nsi | 168 +++++++++ projects/tor-messenger/unnamed-messenger.ico | Bin 23934 -> 0 bytes projects/tor-messenger/unnamed-messenger.nsi | 168 --------- 14 files changed, 605 insertions(+), 604 deletions(-) diff --git a/projects/instantbird/branding/about.png b/projects/instantbird/branding/about.png index 99e5969..5d7f579 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 a8b7f29..b183212 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 "Unnamed Messenger" -+!define CompanyName "Unnamed Messenger" ++!define BrandFullNameInternal "Tor Messenger" ++!define CompanyName "Tor 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 "Unnamed Messenger"> -+<!ENTITY brandFullName "Unnamed Messenger - Beta"> ++<!ENTITY brandShortName "Tor Messenger"> ++<!ENTITY brandFullName "Tor Messenger - Beta"> <!ENTITY brandMotto "'Cause geeks can also do magic!"> -<!ENTITY vendorShortName "Instantbird"> -+<!ENTITY vendorShortName "Unnamed Messenger"> ++<!ENTITY vendorShortName "Tor 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=Unnamed Messenger -+brandFullName=Unnamed Messenger - Beta -+vendorShortName=Unnamed Messenger ++brandShortName=Tor Messenger ++brandFullName=Tor Messenger - Beta ++vendorShortName=Tor Messenger diff --git a/projects/instantbird/branding/osx.patch b/projects/instantbird/branding/osx.patch index a64e751..196d671 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="Unnamed Messenger" ++MOZ_APP_DISPLAYNAME="Tor Messenger" diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build index 352d1f9..40641e0 100644 --- a/projects/tor-messenger/build +++ b/projects/tor-messenger/build @@ -27,11 +27,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-unnamed-messenger start-unnamed-messenger.desktop execdesktop +chmod 755 start-tor-messenger start-tor-messenger.desktop execdesktop -cp start-unnamed-messenger.desktop bundle/ -mv start-unnamed-messenger.desktop bundle/Messenger/ -mv start-unnamed-messenger bundle/Messenger/ +cp start-tor-messenger.desktop bundle/ +mv start-tor-messenger.desktop bundle/Messenger/ +mv start-tor-messenger bundle/Messenger/ mv execdesktop bundle/Messenger/ mkdir -p bundle/Messenger/lib @@ -59,13 +59,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 unnamed-messenger +mv bundle tor-messenger [% IF c('var/windows') -%] -makensis unnamed-messenger.nsi -mv unnamed-messenger-install.exe [% dest_dir _ '/' _ c('filename') %] +makensis tor-messenger.nsi +mv tor-messenger-install.exe [% dest_dir _ '/' _ c('filename') %] [% ELSE -%] [% c('tar', { - tar_src => [ 'unnamed-messenger' ], + tar_src => [ 'tor-messenger' ], tar_args => '-cJf ' _ dest_dir _ '/' _ c('filename'), }) %] [% END -%] diff --git a/projects/tor-messenger/build.osx b/projects/tor-messenger/build.osx index 1b02d75..16e9b47 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 UnnamedMessenger.app Unnamed\ Messenger.app +mv TorMessenger.app Tor\ Messenger.app tar xf [% c('input_files_by_name/libdmg') %] export PATH="$(pwd)/libdmg-hfsplus:$PATH" @@ -18,26 +18,26 @@ 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/Unnamed\ Messenger.app/Contents/Resources/extensions/ +mv tor-launcher(a)torproject.org $rootdir/Tor\ Messenger.app/Contents/Resources/extensions/ cd .. mkdir ctypes-otr cd ctypes-otr tar xf $rootdir/[% c('input_files_by_name/ctypes-otr') %] -mv ctypes-otr* $rootdir/Unnamed\ Messenger.app/Contents/Resources/extensions/ctypes-otr@tormessenger +mv ctypes-otr* $rootdir/Tor\ Messenger.app/Contents/Resources/extensions/ctypes-otr@tormessenger cd .. -mkdir Unnamed\ Messenger.app/TorMessenger -tar xf [% c('input_files_by_name/bundle-data') %] -C Unnamed\ Messenger.app/TorMessenger +mkdir Tor\ Messenger.app/TorMessenger +tar xf [% c('input_files_by_name/bundle-data') %] -C Tor\ Messenger.app/TorMessenger mkdir dmg -mv Unnamed\ Messenger.app dmg +mv Tor\ 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 "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 +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 cd .. -dmg dmg Unnamed\ Messenger-uncompressed.dmg [% dest_dir _ '/' _ c('filename') %] +dmg dmg Tor\ Messenger-uncompressed.dmg [% dest_dir _ '/' _ c('filename') %] diff --git a/projects/tor-messenger/config b/projects/tor-messenger/config index b38a263..0e1073a 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: 'unnamed-messenger-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].[% c("var/filename_ext") %]' +filename: 'tor-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-unnamed-messenger - - filename: start-unnamed-messenger.desktop + - filename: start-tor-messenger + - filename: start-tor-messenger.desktop - filename: execdesktop - - filename: unnamed-messenger.nsi + - filename: tor-messenger.nsi enable: '[% c("var/windows") %]' - filename: cert_override.txt - - filename: unnamed-messenger.ico + - filename: tor-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 new file mode 100755 index 0000000..6c85733 --- /dev/null +++ b/projects/tor-messenger/start-tor-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="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 new file mode 100644 index 0000000..606cf32 --- /dev/null +++ b/projects/tor-messenger/start-tor-messenger.desktop @@ -0,0 +1,35 @@ +#!/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. +# +# Run './start-tor-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. +# +# 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' +# +# 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. +# +# 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 +# via the shell or via the file manager. + +[Desktop Entry] +Type=Application +Name=Tor Messenger Setup +GenericName=Instant Messenger +Comment=Tor 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 +Icon=instant-messenger diff --git a/projects/tor-messenger/start-unnamed-messenger b/projects/tor-messenger/start-unnamed-messenger deleted file mode 100755 index 4f98506..0000000 --- a/projects/tor-messenger/start-unnamed-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="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-unnamed-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/start-unnamed-messenger.desktop b/projects/tor-messenger/start-unnamed-messenger.desktop deleted file mode 100644 index 3c5f92f..0000000 --- a/projects/tor-messenger/start-unnamed-messenger.desktop +++ /dev/null @@ -1,34 +0,0 @@ -#!/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-unnamed-messenger script. -# -# 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 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 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, 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 -# via the shell or via the file manager. - -[Desktop Entry] -Type=Application -Name=Unnamed Messenger Setup -GenericName=Instant Messenger -Comment=Unnamed Messenger is +1 for privacy and -1 for mass surveillance -Categories=Network;Chat;Security; -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/tor-messenger.ico b/projects/tor-messenger/tor-messenger.ico new file mode 100644 index 0000000..cce2759 Binary files /dev/null and b/projects/tor-messenger/tor-messenger.ico differ diff --git a/projects/tor-messenger/tor-messenger.nsi b/projects/tor-messenger/tor-messenger.nsi new file mode 100644 index 0000000..eabe6f3 --- /dev/null +++ b/projects/tor-messenger/tor-messenger.nsi @@ -0,0 +1,168 @@ +;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 deleted file mode 100644 index cce2759..0000000 Binary files a/projects/tor-messenger/unnamed-messenger.ico and /dev/null differ diff --git a/projects/tor-messenger/unnamed-messenger.nsi b/projects/tor-messenger/unnamed-messenger.nsi deleted file mode 100644 index 0f0e5cd..0000000 --- a/projects/tor-messenger/unnamed-messenger.nsi +++ /dev/null @@ -1,168 +0,0 @@ -;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

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

26 Oct '15

commit 911accec6217bffed10203c2bbf6a486bef30d79 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 26 01:15:08 2015 +0000 Update translations for bridgedb_completed --- sv/LC_MESSAGES/bridgedb.po | 335 ++++++++++++++++++++++---------------------- 1 file changed, 168 insertions(+), 167 deletions(-) diff --git a/sv/LC_MESSAGES/bridgedb.po b/sv/LC_MESSAGES/bridgedb.po index d99b5f5..7a7c9b3 100644 --- a/sv/LC_MESSAGES/bridgedb.po +++ b/sv/LC_MESSAGES/bridgedb.po @@ -15,14 +15,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-08-25 08:46+0000\n" -"Last-Translator: Peter Michanek <peter(a)michanek.se>\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-26 01:03+0000\n" +"Last-Translator: Emil Johansson <emil.a.johansson(a)gmail.com>\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\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: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -37,57 +38,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 "Något gick tyvärr fel med din förfrågan." -#: lib/bridgedb/strings.py:18 +#: bridgedb/https/templates/base.html:79 +msgid "Report a Bug" +msgstr "Rapportera en bugg" + +#: bridgedb/https/templates/base.html:82 +msgid "Source Code" +msgstr "Källkod" + +#: bridgedb/https/templates/base.html:85 +msgid "Changelog" +msgstr "Ändringslogg" + +#: bridgedb/https/templates/base.html:88 +msgid "Contact" +msgstr "Kontakt" + +#: bridgedb/https/templates/bridges.html:35 +msgid "Select All" +msgstr "Markera Allt" + +#: bridgedb/https/templates/bridges.html:40 +msgid "Show QRCode" +msgstr "Visa QR-kod" + +#: bridgedb/https/templates/bridges.html:52 +msgid "QRCode for your bridge lines" +msgstr "QR-kod för dina rader med bryggor" + +#. 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 "Bomber och granater, något gick snett!" + +#: bridgedb/https/templates/bridges.html:68 +msgid "It seems there was an error getting your QRCode." +msgstr "Det verkar som att ett fel orsakade problem att få din QR-kod." + +#: 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 "Denna QR-kod innehåller dina rader med bryggor. Skanna den med en QR-kodläsare för att kopiera dina rader med bryggor till mobila och andra enheter." + +#: bridgedb/https/templates/bridges.html:131 +msgid "There currently aren't any bridges available..." +msgstr "För närvarande finns inga bryggor tillgängliga..." + +#: bridgedb/https/templates/bridges.html:132 +#, python-format +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "Prova att %s gå tillbaka %s för att välja en annan typ av brygga!" + +#: bridgedb/https/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "Steg %s1%s" + +#: bridgedb/https/templates/index.html:13 +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "Ladda ner %s Tor Browser %s" + +#: bridgedb/https/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "Steg %s2%s" + +#: bridgedb/https/templates/index.html:27 +#, python-format +msgid "Get %s bridges %s" +msgstr "Skaffa %s bryggor %s" + +#: bridgedb/https/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "Steg %s3%s" + +#: bridgedb/https/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "Nu kan du %s lägga till bryggor i Tor Browser %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 "%sG%se mig bryggor!" + +#: bridgedb/https/templates/options.html:51 +msgid "Advanced Options" +msgstr "Avancerade inställningar" + +#: bridgedb/https/templates/options.html:86 +msgid "No" +msgstr "Nej" + +#: bridgedb/https/templates/options.html:87 +msgid "none" +msgstr "inget" + +#. 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 "%sJ%sa!" + +#. 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 "%sH%sämta Bridges" + +#: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" msgstr "[Detta är ett automatiskt meddelande; Var god svara ej]" -#: lib/bridgedb/strings.py:20 +#: bridgedb/strings.py:45 msgid "Here are your bridges:" msgstr "Här är dina bryggor:" -#: 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 "Du har överskridit din nivå. Ta det lugnt! Minsta tillåtna tiden mellan epost är %s timmar. Epost utöver detta kommer att ignoreras." -#: lib/bridgedb/strings.py:25 +#: bridgedb/strings.py:50 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" msgstr "KOMMANDOn: (kombinera KOMMANDOn för att ange flera val på en gång)" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". -#: lib/bridgedb/strings.py:28 +#: bridgedb/strings.py:53 msgid "Welcome to BridgeDB!" msgstr "Välkommen till BridgeDB!" #. 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 "För närvarande stöds följande transport TYPEs:" -#: lib/bridgedb/strings.py:31 +#: bridgedb/strings.py:56 #, python-format msgid "Hey, %s!" msgstr "Hej, %s!" -#: lib/bridgedb/strings.py:32 +#: bridgedb/strings.py:57 msgid "Hello, friend!" msgstr "Hej, kompis!" -#: 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 "Publika nycklar" #. 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" @@ -98,7 +224,7 @@ msgstr "Det här mailet skapades med hjälp av regnbågar, enhörningar och \net #. 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" @@ -109,7 +235,7 @@ msgid "" msgstr "BridgeDB kan tillhandahålla bryggor med flera %styper av Pluggable Transports%s,\nsom kan omforma din trafik till Tor Network, vilket gör det svårare för någon\nsom avlyssnar din internetuppkoppling att veta ifall du använder Tor.\n\n" #. 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" @@ -121,7 +247,7 @@ msgstr "Det finns några bryggor med IPv6-adresser tillgängliga, men vissa Plug #. 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" @@ -130,20 +256,20 @@ msgid "" "\n" msgstr "Dessutom har BridgeDB några alldeles vanliga bryggor %s utan Pluggable\nTransports %s vilket kanske inte låter så häftigt, men i många fall kan de \nfortfarande hjälpa dig med att kringgå internet-censur.\n\n" -#: lib/bridgedb/strings.py:76 +#: bridgedb/strings.py:101 msgid "What are bridges?" msgstr "Vad är bryggor?" -#: lib/bridgedb/strings.py:77 +#: bridgedb/strings.py:102 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." msgstr "%s Bryggor %s är Tor-reläer som hjälper dig kringgå censur." -#: lib/bridgedb/strings.py:82 +#: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" msgstr "Jag behöver ett alternativt sätt att skaffa bryggor på!" -#: 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" @@ -151,12 +277,12 @@ msgid "" "%s, %s or %s." msgstr "Ett annat sätt att få nya broar är att skicka e-post till %s. Du måste skicka mailet\nfrån en adress hos någon av följande e-postleverantörer:\n%s, %s eller %s." -#: lib/bridgedb/strings.py:90 +#: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" msgstr "Mina bryggor fungerar inte! Jag behöver hjälp!" #. 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 "Om Tor inte fungerar för dig så kan du e-posta %s." @@ -164,48 +290,48 @@ msgstr "Om Tor inte fungerar för dig så kan du e-posta %s." #. 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 "Försök att berätta så mycket om problemet som du kan, bland annat vilka\nbryggor och Pluggable Transports som du försökt använda, vilken version av Tor Browser du använder, vilka felmeddelanden som Tor visat, etc." -#: lib/bridgedb/strings.py:103 +#: bridgedb/strings.py:128 msgid "Here are your bridge lines:" msgstr "Här är dina rader med bryggor:" -#: lib/bridgedb/strings.py:104 +#: bridgedb/strings.py:129 msgid "Get Bridges!" msgstr "Skaffa Bryggor!" -#: lib/bridgedb/strings.py:108 +#: bridgedb/strings.py:133 msgid "Please select options for bridge type:" msgstr "Välj alternativ för typ av brygga:" -#: lib/bridgedb/strings.py:109 +#: bridgedb/strings.py:134 msgid "Do you need IPv6 addresses?" msgstr "Behöver du en IPv6-adress?" -#: lib/bridgedb/strings.py:110 +#: bridgedb/strings.py:135 #, python-format msgid "Do you need a %s?" msgstr "Behöver du %s?" -#: lib/bridgedb/strings.py:114 +#: bridgedb/strings.py:139 msgid "Your browser is not displaying images properly." msgstr "Din webbläsare visar inte bilder korrekt." -#: lib/bridgedb/strings.py:115 +#: bridgedb/strings.py:140 msgid "Enter the characters from the image above..." msgstr "Skriv in tecknen från bilden ovan..." -#: lib/bridgedb/strings.py:119 +#: bridgedb/strings.py:144 msgid "How to start using your bridges" msgstr "Hur du börjar använda dina bryggor" #. 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" @@ -214,21 +340,21 @@ msgid "" msgstr "För att ange bryggor i Tor Borwser, gå till nedladdningssidan %s Tor Browser %s och följ instruktionerna för att ladda ner och starta Tor Browser." #. 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 "När dialogen \"Nätverksinställningar för Tor\" visas, välj \"Konfigurera\" och följ\nstegen tills du kommer till frågan:" #. 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 "Blockerar eller filtrerar din Internetleverantör (ISP) anslutningar till Tor network?" #. 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" @@ -236,153 +362,28 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "Välj 'Ja' och klicka sedan på 'Nästa'. För att konfigurera nya bryggor, kopiera och klistra in bryggraderna i textrutan. Klicka slutligen på 'Anslut' och det borde vara klart för användning! Om du får problem, prova att klicka på 'Hjälp'-knappen i 'Tor Network Settings' för vidare hjälp." -#: lib/bridgedb/strings.py:142 +#: bridgedb/strings.py:167 msgid "Displays this message." msgstr "Visa detta meddelande." #. 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 "Leta efter vanliga bryggor." -#: lib/bridgedb/strings.py:147 +#: bridgedb/strings.py:172 msgid "Request IPv6 bridges." msgstr "Begär IPv6-bryggor" #. 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 "Leta efter en Pluggable Transport av en viss TYPE" #. 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 "Hämta en kopia av BridgeDB:s publika GnuPG-nyckel." - -#: lib/bridgedb/templates/base.html:89 -msgid "Report a Bug" -msgstr "Rapportera en bugg" - -#: lib/bridgedb/templates/base.html:92 -msgid "Source Code" -msgstr "Källkod" - -#: lib/bridgedb/templates/base.html:95 -msgid "Changelog" -msgstr "Ändringslogg" - -#: lib/bridgedb/templates/base.html:98 -msgid "Contact" -msgstr "Kontakt" - -#: lib/bridgedb/templates/bridges.html:81 -msgid "Select All" -msgstr "Markera Allt" - -#: lib/bridgedb/templates/bridges.html:87 -msgid "Show QRCode" -msgstr "Visa QR-kod" - -#: lib/bridgedb/templates/bridges.html:100 -msgid "QRCode for your bridge lines" -msgstr "QR-kod för dina rader med bryggor" - -#. 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 "Bomber och granater, nåt gick snett!" - -#: lib/bridgedb/templates/bridges.html:116 -msgid "It seems there was an error getting your QRCode." -msgstr "Det verkar som att ett fel orsakade problem att få din QR-kod." - -#: 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 "Denna QR-kod innehåller dina rader med bryggor. Skanna den med en QR-kodläsare för att kopiera dina rader med bryggor till mobila och andra enheter." - -#: lib/bridgedb/templates/bridges.html:181 -msgid "There currently aren't any bridges available..." -msgstr "För närvarande finns inga bryggor tillgängliga..." - -#: lib/bridgedb/templates/bridges.html:182 -#, python-format -msgid "" -" Perhaps you should try %s going back %s and choosing a different bridge " -"type!" -msgstr "Prova att %s gå tillbaka %s för att välja en annan typ av brygga!" - -#: lib/bridgedb/templates/index.html:11 -#, python-format -msgid "Step %s1%s" -msgstr "Steg %s1%s" - -#: lib/bridgedb/templates/index.html:13 -#, python-format -msgid "Download %s Tor Browser %s" -msgstr "Ladda ner %s Tor Browser %s" - -#: lib/bridgedb/templates/index.html:25 -#, python-format -msgid "Step %s2%s" -msgstr "Steg %s2%s" - -#: lib/bridgedb/templates/index.html:27 -#, python-format -msgid "Get %s bridges %s" -msgstr "Skaffa %s bryggor %s" - -#: lib/bridgedb/templates/index.html:36 -#, python-format -msgid "Step %s3%s" -msgstr "Steg %s3%s" - -#: lib/bridgedb/templates/index.html:38 -#, python-format -msgid "Now %s add the bridges to Tor Browser %s" -msgstr "Nu kan du %s lägga till bryggor i Tor Browser %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.) -#: lib/bridgedb/templates/options.html:38 -#, python-format -msgid "%sJ%sust give me bridges!" -msgstr "%sG%se mig bryggor!" - -#: lib/bridgedb/templates/options.html:52 -msgid "Advanced Options" -msgstr "Avancerade inställningar" - -#: lib/bridgedb/templates/options.html:88 -msgid "No" -msgstr "Nej" - -#: lib/bridgedb/templates/options.html:89 -msgid "none" -msgstr "inget" - -#. 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 "%sJ%sa!" - -#. 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 "%sH%sämta Bridges"

1 0