July 2014 - tor-commits - lists.torproject.org

[tor-browser-spec/master] Separate the recommended versions update into two steps.
by mikeperry＠torproject.org 25 Jul '14

25 Jul '14

commit 67c6be5cd7aae458bbfc0edd82073d437c523f53 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Jul 25 17:16:45 2014 -0700 Separate the recommended versions update into two steps. First add the new one, then remove the old one. --- processes/ReleaseProcess | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/processes/ReleaseProcess b/processes/ReleaseProcess index ea1929e..a2a7a44 100644 --- a/processes/ReleaseProcess +++ b/processes/ReleaseProcess @@ -64,6 +64,16 @@ cp -a $TORBROWSER_VERSION /srv/www-master.torproject.org/htdocs/dist/torbrowser/ /home/mirroradm/bin/trigger-mirrors +#. Add $TORBROWSER_VERSION to recommended-versions file in torbrowser.git +# (Don't remove old version yet) + cd torbrowser + git checkout master + torsocks git pull origin + vim ./build-scripts/recommended-versions + git commit build-scripts/recommended-versions + torsocks git push origin master:master + cd .. + #. Update website's torbrowser versions file cd website torsocks svn up . @@ -72,21 +82,19 @@ ./publish cd .. -#. Update recommended-versions file in torbrowser.git +#. Create blog post from changelog +# XXX: Template? +# See https://blog.torproject.org/blog/tor-browser-352-released for now +# Don't forget to link to Mozilla's security advisories if this is a security +# update, or Nadim will yell at you. + +#. Remove old version from recommended-versions file in torbrowser.git cd torbrowser - git checkout maint-2.4 + git checkout master torsocks git pull origin vim ./build-scripts/recommended-versions git commit build-scripts/recommended-versions - git checkout master - torsocks git pull origin - git merge maint-2.4 - torsocks git push origin maint-2.4:maint-2.4 torsocks git push origin master:master cd .. -#. Create blog post from changelog -# XXX: Template? -# See https://blog.torproject.org/blog/tor-browser-352-released for now -# Don't forget to link to Mozilla's security advisories if this is a security -# update, or Nadim will yell at you. +

1 0

[tor-browser-bundle/master] Add 3.6.2 and 3.6.3 back in to master branch changelog.
by mikeperry＠torproject.org 25 Jul '14

25 Jul '14

commit 6887900b9109b6b8f26c4a7738605a9b8bc332e3 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Jul 25 16:26:14 2014 -0700 Add 3.6.2 and 3.6.3 back in to master branch changelog. --- Bundle-Data/Docs/ChangeLog.txt | 47 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index ae14c46..ef2dd84 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser Bundle 4.0-alpha-1 -- Jul 9 2014 +Tor Browser Bundle 4.0-alpha-1 -- Jul 29 2014 * All Platforms * Include the Meek Pluggable Transport (version 0.9) (Bug 10935) * Update Firefox to 24.7.0esr @@ -24,6 +24,51 @@ Tor Browser Bundle 4.0-alpha-1 -- Jul 9 2014 * Bug 11102: Set Window Class to "Tor Browser" to aid in Desktop navigation * Bug 12249: Don't create PT debug files anymore +Tor Browser Bundle 3.6.3 -- Jul 24 2014 + * All Platforms + * Update Firefox to 24.7.0esr + * Update obfsproxy to 0.2.12 + * Update FTE to 0.2.17 + * Update NoScript to 2.6.8.33 + * Update HTTPS Everywhere to 3.5.3 + * Bug 12673: Update FTE bridges + * Update Torbutton to 1.6.11.0 + * Bug 12221: Remove obsolete Javascript components from the toggle era + * Bug 10819: Bind new third party isolation pref to Torbutton security UI + * Bug 9268: Fix some window resizing corner cases with DPI and taskbar size. + * Linux: + * Bug 11102: Set Window Class to "Tor Browser" to aid in Desktop navigation + * Bug 12249: Don't create PT debug files anymore + +Tor Browser Bundle 3.6.2 -- Jun 9 2014 + * All Platforms + * Update Firefox to 24.6.0esr + * Update OpenSSL to 1.0.1h + * Update NoScript to 2.6.8.28 + * Update Tor to 0.2.4.22 + * Update Tor Launcher to 0.2.5.5 + * Bug 10425: Provide geoip6 file location to Tor process + * Bug 11754: Remove untranslated locales that were dropped from Transifex + * Bug 11772: Set Proxy Type menu correctly after restart + * Bug 11699: Change &#160 to   in UI elements + * Update Torbutton to 1.6.10.0 + * Bug 11510: about:tor should not report success if tor proxy is unreachable + * Bug 11783: Avoid b.webProgress error when double-clicking on New Identity + * Bug 11722: Add hidden pref to force remote Tor check + * Bug 11763: Fix pref dialog double-click race that caused settings to be reset + * Bug 11629: Support proxies with Pluggable Transports + * Updates FTEProxy to 0.2.15 + * Updates obfsproxy to 0.2.9 + * Backported Tor Patches: + * Bug 11654: Fix malformed log message in bug11156 patch. + * Bug 10425: Add in Tor's geoip6 files to the bundle distribution + * Bugs 11834 and 11835: Include Pluggable Transport documentation + * Bug 9701: Prevent ClipBoardCache from writing to disk. + * Bug 12146: Make the CONNECT Host header the same as the Request-URI. + * Bug 12212: Disable deprecated webaudio API + * Bug 11253: Turn on TLS 1.1 and 1.2. + * Bug 11817: Don't send startup time information to Mozilla. + Tor Browser Bundle 3.6.1 -- May 6 2014 * All Platforms * Update HTTPS-Everywhere to 3.5.1

1 0

[bridgedb/develop] Fix two unittests for RTL rendering broken by Arabic translation changes.
by isis＠torproject.org 25 Jul '14

25 Jul '14

commit a5d4e5949cac9d8f17418f6b7f225b1400acab6c Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jul 25 23:08:36 2014 +0000 Fix two unittests for RTL rendering broken by Arabic translation changes. --- lib/bridgedb/test/test_HTTPServer.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/bridgedb/test/test_HTTPServer.py b/lib/bridgedb/test/test_HTTPServer.py index 91ab17e..c6b521f 100644 --- a/lib/bridgedb/test/test_HTTPServer.py +++ b/lib/bridgedb/test/test_HTTPServer.py @@ -597,7 +597,7 @@ class WebResourceBridgesTests(unittest.TestCase): self.assertSubstring("direction: rtl", page) self.assertSubstring( # "I need an alternative way to get bridges!" - "انا بحاجة إلى وسيلة بديلة للحصول على الجسور!", page) + "أحتاج إلى وسيلة بديلة للحصول على bridges", page) for bridgeLine in self.parseBridgesFromHTMLPage(page): # Check that each bridge line had the expected number of fields: @@ -618,8 +618,7 @@ class WebResourceBridgesTests(unittest.TestCase): self.assertSubstring("direction: rtl", page) self.assertSubstring( # "I need an alternative way to get bridges!" - "به یک راه دیگر برای دریافت پل‌ها احتیاج دارم!", - page) + "أحتاج إلى وسيلة بديلة للحصول على bridges", page) for bridgeLine in self.parseBridgesFromHTMLPage(page): # Check that each bridge line had the expected number of fields:

1 0

r26894: {website} Bump TBB version (website/trunk/include)
by Mike Perry 25 Jul '14

25 Jul '14

Author: mikeperry Date: 2014-07-25 22:15:47 +0000 (Fri, 25 Jul 2014) New Revision: 26894 Modified: website/trunk/include/versions.wmi Log: Bump TBB version Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2014-07-25 20:40:33 UTC (rev 26893) +++ website/trunk/include/versions.wmi 2014-07-25 22:15:47 UTC (rev 26894) @@ -23,10 +23,10 @@ <define-tag version-osx-ppc-stable whitespace=delete>0.2.3.25</define-tag> <define-tag version-osx-ppc-alpha whitespace=delete>0.2.4.17-rc</define-tag> -<define-tag version-torbrowserbundledir whitespace=delete>3.6.2</define-tag> -<define-tag version-torbrowserbundlebetadir whitespace=delete>3.6.2</define-tag> +<define-tag version-torbrowserbundledir whitespace=delete>3.6.3</define-tag> +<define-tag version-torbrowserbundlebetadir whitespace=delete>3.6.3</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>3.6.2</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>3.6.3</define-tag> <define-tag version-torbrowserbundlebeta whitespace=delete>3.6-beta-2</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.1e</define-tag> @@ -37,8 +37,8 @@ <define-tag version-torbrowser-vidalia whitespace=delete>0.2.21</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>3.6.2</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>3.6.2</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>3.6.3</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>3.6.3</define-tag> <define-tag version-torbrowserbundlelinux32beta whitespace=delete>3.6-beta-2</define-tag> <define-tag version-torbrowserbundlelinux64beta whitespace=delete>3.6-beta-2</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> @@ -47,7 +47,7 @@ <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.5.2</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.21</define-tag> -<define-tag version-torbrowserbundleosx32 whitespace=delete>3.6.2</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>3.6.3</define-tag> <define-tag version-torbrowserbundleosx64 whitespace=delete>2.3.25-15</define-tag> <define-tag version-torbrowserbundleosx32beta whitespace=delete>3.6-beta-2</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.4.19</define-tag>

1 0

[torbrowser/master] Add 3.6.3 to recommended versions list.
by mikeperry＠torproject.org 25 Jul '14

25 Jul '14

commit 4e6e4843515fc1c76cde1f109bf36ede31adca2a Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Jul 25 15:15:09 2014 -0700 Add 3.6.3 to recommended versions list. --- build-scripts/recommended-versions | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 4e3cfa1..6373f36 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,5 +1,8 @@ [ "3.6.2-Linux", "3.6.2-MacOS", -"3.6.2-Windows" +"3.6.2-Windows", +"3.6.3-Linux", +"3.6.3-MacOS", +"3.6.3-Windows" ]

1 0

[bridgedb/develop] Update translation: fr_CA
by isis＠torproject.org 25 Jul '14

25 Jul '14

commit 245eed08299f4ebec7d39fe70ec11b6409f5f19e Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jul 25 07:40:07 2014 +0000 Update translation: fr_CA * THANKS TO yahoe.001 --- lib/bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po | 132 +++++++++++++---------- 1 file changed, 78 insertions(+), 54 deletions(-) diff --git a/lib/bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po index fb9aac7..01a5ee7 100644 --- a/lib/bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po @@ -3,17 +3,17 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: -# lunar <lunar(a)torproject.org>, 2013 +# Lunar <lunar(a)torproject.org>, 2013 # mehditaileb <mehditaileb(a)liberte-info.net>, 2011 # Onizuka, 2013 -# Alain-Olivier Breysse, 2014 +# yahoe.001, 2014 msgid "" 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: 2014-05-16 18:39+0000\n" -"PO-Revision-Date: 2014-05-29 15:20+0000\n" -"Last-Translator: Alain-Olivier Breysse\n" +"POT-Creation-Date: 2014-06-06 21:46+0000\n" +"PO-Revision-Date: 2014-07-19 17:51+0000\n" +"Last-Translator: yahoe.001\n" "Language-Team: French (Canada) (http://www.transifex.com/projects/p/torproject/language/fr_CA/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,19 +24,16 @@ msgstr "" #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in #. any string (regardless of capitalization and/or punctuation): -#. "bridge" -#. "bridges" #. "BridgeDB" #. "pluggable transport" #. "pluggable transports" #. "obfs2" #. "obfs3" #. "scramblesuit" -#. "fte" +#. "fteproxy" #. "Tor" #. "Tor Browser" -#. "TBB" -#: lib/bridgedb/HTTPServer.py:124 +#: lib/bridgedb/HTTPServer.py:121 msgid "Sorry! Something went wrong with your request." msgstr "Désolé! Quelque chose a mal tourné avec votre requête." @@ -60,39 +57,44 @@ msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" msgstr "COMMANDES : (combinez les COMMANDES pour spécifier plusieurs options simultanément)" -#: lib/bridgedb/strings.py:27 +#. TRANSLATORS: Please DO NOT translate the word "BridgeDB". +#: lib/bridgedb/strings.py:28 msgid "Welcome to BridgeDB!" msgstr "Bienvenue à BridgeDB!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". -#: lib/bridgedb/strings.py:29 +#: lib/bridgedb/strings.py:30 msgid "Currently supported transport TYPEs:" msgstr "TYPES de transport pris en charge présentement :" -#: lib/bridgedb/strings.py:30 +#: lib/bridgedb/strings.py:31 #, python-format msgid "Hey, %s!" msgstr "Allô, %s!" -#: lib/bridgedb/strings.py:31 +#: lib/bridgedb/strings.py:32 msgid "Hello, friend!" msgstr "Bonjour l'ami!" -#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100 +#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 msgid "Public Keys" msgstr "Clefs publiques" #. 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:36 +#: lib/bridgedb/strings.py:37 #, python-format msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." msgstr "Ce courriel a été généré avec des arcs en ciel, des unicornes et des paillettes pour %s le %s à %s." -#: lib/bridgedb/strings.py:42 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. 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 #, python-format msgid "" "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" @@ -102,14 +104,20 @@ msgid "" "\n" msgstr "BridgeDB peut fournir des ponts avec plusieurs %stypes de transports enfichable%s,\npouvant aider à obscurcir vos connexions au réseau Tor, rendant difficile pour\nquiconque surveillant votre trafic Internet de déterminer que vous\nutilisez Tor.\n\n" -#: lib/bridgedb/strings.py:48 +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#: lib/bridgedb/strings.py:54 msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" msgstr "Des ponts avec des adresses IPv6 sont aussi disponibles, bien que des transports\nenfichables ne soient pas compatibles avec IPv6.\n\n" -#: lib/bridgedb/strings.py:52 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, +#. 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 #, python-format msgid "" "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" @@ -118,20 +126,20 @@ msgid "" "\n" msgstr "De plus, BridgeDB comportent de nombreux ponts %s traditionnels sans\ntransport enfichable %s qui peuvent quand même aider à contourner\nla censure Internet dans bien des cas.\n\n" -#: lib/bridgedb/strings.py:65 +#: lib/bridgedb/strings.py:76 msgid "What are bridges?" msgstr "Que sont les ponts?" -#: lib/bridgedb/strings.py:66 +#: lib/bridgedb/strings.py:77 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." msgstr "%s Les ponts %s sont des relais Tor qui vous aident à contourner la censure." -#: lib/bridgedb/strings.py:71 +#: lib/bridgedb/strings.py:82 msgid "I need an alternative way of getting bridges!" msgstr "J'ai besoin d'une alternative pour obtenir des ponts!" -#: lib/bridgedb/strings.py:72 +#: lib/bridgedb/strings.py:83 #, python-format msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" @@ -139,75 +147,83 @@ msgid "" "%s or %s." msgstr "Une autre façon d'obtenir des ponts est d'envoyer un courriel à %s. Veuillez prendre\nnote que vous devez utiliser une adresse d'un des fournisseurs de courriel suivants :\n%s ou %s." -#: lib/bridgedb/strings.py:79 +#: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" msgstr "Mes ponts ne fonctionnent pas, j'ai besoin d'aide!" -#: lib/bridgedb/strings.py:80 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:92 #, python-format msgid "If your Tor doesn't work, you should email %s." msgstr "Si votre Tor ne fonctionne pas, vous devriez envoyer un courriel à %s." -#: lib/bridgedb/strings.py:81 +#. 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 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 "Essayez d'inclure autant d'infos sur votre cas que possible, incluant la liste de\nponts et de transports enfichables que vous avez essayé d'utiliser, votre version du\nnavigateur Tor et tout message donné par Tor, etc..." +msgstr "Essayez d'inclure autant d'infos sur votre cas que possible, incluant la liste de\nponts et de transports enfichables que vous avez essayé d'utiliser, votre version du\nnavigateur Tor et tout message donné par Tor, etc." -#: lib/bridgedb/strings.py:88 +#: lib/bridgedb/strings.py:103 msgid "Here are your bridge lines:" msgstr "Voici vos lignes de ponts :" -#: lib/bridgedb/strings.py:89 +#: lib/bridgedb/strings.py:104 msgid "Get Bridges!" msgstr "Obtenir des ponts!" -#: lib/bridgedb/strings.py:93 +#: lib/bridgedb/strings.py:108 msgid "Please select options for bridge type:" msgstr "Veuillez choisir des options pour le type de ponts :" -#: lib/bridgedb/strings.py:94 +#: lib/bridgedb/strings.py:109 msgid "Do you need IPv6 addresses?" msgstr "Avez-vous besoin d'adresses IPv6?" -#: lib/bridgedb/strings.py:95 +#: lib/bridgedb/strings.py:110 #, python-format msgid "Do you need a %s?" msgstr "Avez-vous besoin d'un %s?" -#: lib/bridgedb/strings.py:99 +#: lib/bridgedb/strings.py:114 msgid "Your browser is not displaying images properly." msgstr "Votre navigateur n'affiche pas les images correctement." -#: lib/bridgedb/strings.py:100 +#: lib/bridgedb/strings.py:115 msgid "Enter the characters from the image above..." msgstr "Saisir les caractères inscrits sur l'image ci-dessus..." -#: lib/bridgedb/strings.py:104 +#: lib/bridgedb/strings.py:119 msgid "How to start using your bridges" msgstr "Comment commencer à utiliser vos ponts" -#: lib/bridgedb/strings.py:105 +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#: lib/bridgedb/strings.py:121 #, python-format msgid "" "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" "Browser download page %s to start Tor Browser." msgstr "Pour saisir vos ponts dans le navigateur Tor, suivez les instructions\nsur la %s page de téléchargement du navigateur Tor %s pour démarrer le navigateur Tor." -#: lib/bridgedb/strings.py:108 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:125 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" msgstr "Quand la fenêtre « Paramètres réseau de Tor » s'affiche, cliquez sur « Configurer » et\nsuivez l'assistant jusqu'à ce qu'il demande :" -#: lib/bridgedb/strings.py:111 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:129 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" msgstr "Votre fournisseur de service Internet (FSI) bloque-t-il ou censure-t-il\nvos connexions au réseau Tor?" -#: lib/bridgedb/strings.py:114 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:133 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" @@ -215,24 +231,29 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "Sélectionnez « Oui » et ensuite cliquez sur « Suivant ». Pour configurer vos\nnouveaux ponts, copiez et collez vos lignes de ponts dans la boîte de saisie\nde texte. Enfin cliquez sur « Connecter » et vous devriez avoir fini! Si vous éprouvez\ndes problèmes, essayez de cliquez sur le bouton « Aide » dans l'assistant des\n« Paramètres du réseau Tor » pour un un soutien supplémentaire." -#: lib/bridgedb/strings.py:122 +#: lib/bridgedb/strings.py:141 msgid "Displays this message." msgstr "Affiche ce message." -#: lib/bridgedb/strings.py:123 +#. 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:145 msgid "Request vanilla bridges." msgstr "Demander des ponts traditionnels." -#: lib/bridgedb/strings.py:124 +#: lib/bridgedb/strings.py:146 msgid "Request IPv6 bridges." msgstr "Demander des ponts IPv6." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:126 +#: lib/bridgedb/strings.py:148 msgid "Request a Pluggable Transport by TYPE." msgstr "Demander un transport enfichable par TYPE." -#: lib/bridgedb/strings.py:127 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "GnuPG". +#: lib/bridgedb/strings.py:151 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "Obtenir une copie de la clef GnuPG publique de BridgeDB." @@ -252,15 +273,19 @@ msgstr "Journal des changements" msgid "Contact" msgstr "Contact" -#: lib/bridgedb/templates/bridges.html:65 +#. 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:66 msgid "Uh oh, spaghettios!" msgstr "Une erreur est survenue!" -#: lib/bridgedb/templates/bridges.html:70 +#: lib/bridgedb/templates/bridges.html:72 msgid "There currently aren't any bridges available..." msgstr "Il n'y a présentement aucun pont disponible..." -#: lib/bridgedb/templates/bridges.html:71 +#: lib/bridgedb/templates/bridges.html:73 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " @@ -301,28 +326,27 @@ msgstr "Maintenant, %s ajoutez les ponts au navigateur Tor %s" #. beginning of words are present in your final translation. Thanks! #. (These are used to insert HTML5 underlining tags, to mark accesskeys #. for disabled users.) -#. TRANSLATORS: Please do NOT translate the word "bridges"! -#: lib/bridgedb/templates/options.html:39 +#: lib/bridgedb/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" msgstr "Donnez-moi %sj%suste des ponts! " -#: lib/bridgedb/templates/options.html:53 +#: lib/bridgedb/templates/options.html:52 msgid "Advanced Options" msgstr "Options avancées" -#: lib/bridgedb/templates/options.html:89 +#: lib/bridgedb/templates/options.html:88 msgid "No" msgstr "Non" -#: lib/bridgedb/templates/options.html:90 +#: lib/bridgedb/templates/options.html:89 msgid "none" msgstr "aucun" #. 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:131 +#: lib/bridgedb/templates/options.html:130 #, python-format msgid "%sY%ses!" msgstr "%sO%sui!" @@ -330,7 +354,7 @@ msgstr "%sO%sui!" #. 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:155 +#: lib/bridgedb/templates/options.html:154 #, python-format msgid "%sG%set Bridges" msgstr "%sO%sbtenir des ponts"

1 0

[bridgedb/develop] Update translation: he
by isis＠torproject.org 25 Jul '14

25 Jul '14

commit 6b42ae5d9013feb95e3bf3eeae70bbd92e74923a Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jul 25 07:41:02 2014 +0000 Update translation: he * THANKS TO Elifelet. --- lib/bridgedb/i18n/he/LC_MESSAGES/bridgedb.po | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/bridgedb/i18n/he/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/he/LC_MESSAGES/bridgedb.po index 2c00bfb..f700478 100644 --- a/lib/bridgedb/i18n/he/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/he/LC_MESSAGES/bridgedb.po @@ -5,15 +5,17 @@ # Translators: # Translators: # aharonoosh <aharonoosh1(a)gmail.com>, 2012 +# Elifelet <arab.with.nargila(a)gmail.com>, 2014 # GenghisKhan <genghiskhan(a)gmx.ca>, 2013 -# static172 <static.172(a)gmail.com>, 2012 +# Kunda, 2014 +# Cuvint Chofschy <static.172(a)gmail.com>, 2012 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-03-27 21:41+0000\n" -"PO-Revision-Date: 2013-07-21 06:40+0000\n" -"Last-Translator: GenghisKhan <genghiskhan(a)gmx.ca>\n" +"PO-Revision-Date: 2014-01-30 12:30+0000\n" +"Last-Translator: Kunda\n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/torproject/language/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,7 +32,7 @@ msgstr "מהם גשרים?" #, python-format msgid "" "%s Bridge relays %s are Tor relays that help you circumvent censorship." -msgstr "%s ממסרי גשר %s הינם ממסרי Tor אשר מסייעים לך להערים על צנזורה." +msgstr "%s ממסרי גשר %s הינם ממסרי Tor אשר מסייעים לך לעקוף צנזורה." #: lib/bridgedb/templates/base.html:39 msgid "I need an alternative way of getting bridges!" @@ -54,7 +56,7 @@ msgid "" "If your Tor doesn't work, you should email %s. Try including as much info " "about your case as you can, including the list of bridges you used, the " "bundle filename/version you used, the messages that Tor gave out, etc." -msgstr "אם Tor לא עובד אצלך, עליך לשלוח דוא״ל אל %s. נסה לכלול כמה שיותר מידע אודות המקרה שלך כלל שביכולתך לעשות כן, כולל את רשימת הגשרים אשר השתמשת בה, שם הקובץ/גרסא של האגודה (bundle) שהשתמשת, ההודעות אשר Tor מסר וכו׳." +msgstr "אם Tor לא עובד אצלך, עליך לשלוח דוא״ל אל %s. נסה לכלול כמה שיותר מידע אודות המקרה שלך ככל שביכולתך לעשות כן, כולל את רשימת הגשרים אשר השתמשת בה, שם הקובץ/גרסא של האגודה (bundle) שהשתמשת, ההודעות אשר Tor מסר וכו׳." #: lib/bridgedb/templates/bridges.html:10 msgid "" @@ -82,7 +84,7 @@ msgstr "צעד 1" #: lib/bridgedb/templates/index.html:8 #, python-format msgid "Get %s Tor Browser Bundle %s" -msgstr "השג את %s Tor Browser Bundle %s" +msgstr "השג את %s חבילת הדפדפן של Tor %s" #: lib/bridgedb/templates/index.html:13 msgid "Step 2"

1 0

[bridgedb/develop] Update translation: hu
by isis＠torproject.org 25 Jul '14

25 Jul '14

commit e5585a21ad9f2a95f6451f472f941eea1ba63b5a Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jul 25 07:42:22 2014 +0000 Update translation: hu * THANKS TO Blackywantscookies, and Cerbo. --- lib/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po | 364 ++++++++++++++++++++++---- 1 file changed, 311 insertions(+), 53 deletions(-) diff --git a/lib/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po index 7fa4bde..d11c31b 100644 --- a/lib/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po @@ -1,18 +1,19 @@ # Translations template for BridgeDB. -# Copyright (C) 2013 ORGANIZATION +# Copyright (C) 2014 'The Tor Project, Inc.' # This file is distributed under the same license as the BridgeDB project. # # Translators: -# Translators: +# Blackywantscookies <gaborcika111(a)gmail.com>, 2014 +# Cerbo <taiurin(a)gmail.com>, 2014 # vargaviktor <viktor.varga(a)gmail.com>, 2013 # vargaviktor <viktor.varga(a)gmail.com>, 2011 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2013-03-27 21:41+0000\n" -"PO-Revision-Date: 2013-10-01 16:28+0000\n" -"Last-Translator: vargaviktor <viktor.varga(a)gmail.com>\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" +"POT-Creation-Date: 2014-06-06 21:46+0000\n" +"PO-Revision-Date: 2014-06-24 14:51+0000\n" +"Last-Translator: Blackywantscookies <gaborcika111(a)gmail.com>\n" "Language-Team: Hungarian (http://www.transifex.com/projects/p/torproject/language/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,82 +22,339 @@ msgstr "" "Language: hu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/bridgedb/templates/base.html:33 +#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in +#. any string (regardless of capitalization and/or punctuation): +#. "BridgeDB" +#. "pluggable transport" +#. "pluggable transports" +#. "obfs2" +#. "obfs3" +#. "scramblesuit" +#. "fteproxy" +#. "Tor" +#. "Tor Browser" +#: lib/bridgedb/HTTPServer.py:121 +msgid "Sorry! Something went wrong with your request." +msgstr "Elnézést! Valami balul sült el a kérésed közben." + +#: lib/bridgedb/strings.py:18 +msgid "[This is an automated message; please do not reply.]" +msgstr "[Ez egy automata levél, kérjük ne válaszoljon.]" + +#: lib/bridgedb/strings.py:20 +msgid "Here are your bridges:" +msgstr "Itt vannak a hídjaid:" + +#: lib/bridgedb/strings.py:22 +#, 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 "Ön túllépte a megadott mérték határt. Kérünk lassítson le! A minimum idő email-ek között\n%s óra. Minden további emailt ez az idő alatt elutasítunk." + +#: lib/bridgedb/strings.py:25 +msgid "" +"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" +msgstr "COMMANDs: (kombinálja COMMANDs-okat hogy többféle opciót adhasson meg egyszerre)" + +#. TRANSLATORS: Please DO NOT translate the word "BridgeDB". +#: lib/bridgedb/strings.py:28 +msgid "Welcome to BridgeDB!" +msgstr "Üdvözöl a BridgeDB!" + +#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". +#: lib/bridgedb/strings.py:30 +msgid "Currently supported transport TYPEs:" +msgstr "Jelenleg támogatott átviteli típusok: " + +#: lib/bridgedb/strings.py:31 +#, python-format +msgid "Hey, %s!" +msgstr "Hé, %s!" + +#: lib/bridgedb/strings.py:32 +msgid "Hello, friend!" +msgstr "Hello!" + +#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 +msgid "Public Keys" +msgstr "Nyilvános kulcsok" + +#. 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 +#, python-format +msgid "" +"This email was generated with rainbows, unicorns, and sparkles\n" +"for %s on %s at %s." +msgstr "Ez az email szivárványokkal, unikornisokkal, és ragyogásokkal volt generálva\n%s -nek %s -án %s -kor." + +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. 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 +#, python-format +msgid "" +"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" +"which can help obfuscate your connections to the Tor Network, making it more\n" +"difficult for anyone watching your internet traffic to determine that you are\n" +"using Tor.\n" +"\n" +msgstr "BridgeDB hidakat tud bisztosítani számos %stípusával a Pluggable Transports%s -nak\namely segíti a kapcsolataidat összekeverni a Tor Network -ben, ezzel sokkal\nnehezebbé teszi akárkinek hogy megnézze az internet forgalmadat és hogy meghatározzák hogy Tor -t használsz.\n\n" + +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#: lib/bridgedb/strings.py:54 +msgid "" +"Some bridges with IPv6 addresses are also available, though some Pluggable\n" +"Transports aren't IPv6 compatible.\n" +"\n" +msgstr "Néhány híd IPv6 címekkel is elérhető, habár négány Pluggable\nTransports nem IPv6 kompatibilis.\n\n" + +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, +#. 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 +#, python-format +msgid "" +"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" +"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 "Ezen felül, BridgeDB -nek van sok régi módi \"vanília\" hídjai %s melyek Csatlakoztatható Szállítók %s nélkül vannak\nmely talán nem hallatszik szuperül, de ők még mindig\ntudnak segíteni kikerülni az internet cenzúráját.\n\n" + +#: lib/bridgedb/strings.py:76 msgid "What are bridges?" msgstr "Mik is a Hidak?" -#: lib/bridgedb/templates/base.html:34 +#: lib/bridgedb/strings.py:77 #, python-format -msgid "" -"%s Bridge relays %s are Tor relays that help you circumvent censorship." -msgstr "%s Híd kapcsolók %s Tor kapcsolók, amelyek a cenzorálás megkerülésére használhatók." +msgid "%s Bridges %s are Tor relays that help you circumvent censorship." +msgstr "A %s Hidak %s azok Tor relék, melyek segítik önt a cenzúra elkerülésében." -#: lib/bridgedb/templates/base.html:39 +#: lib/bridgedb/strings.py:82 msgid "I need an alternative way of getting bridges!" msgstr "Szükségem van egy alternatív módra a Hidak beszerzéséhez!" -#: lib/bridgedb/templates/base.html:40 +#: lib/bridgedb/strings.py:83 #, python-format msgid "" -"Another way to find public bridge addresses is to send an email (from a %s " -"or a %s address) to %s with the line 'get bridges' by itself in the body of " -"the mail." -msgstr "Másik lehetőség publikus hidak beszerzésére, ha küld egy emailt (a %s vagy %s címről) a %s címree, a 'get bridges' sorral a levél törzsében." +"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 or %s." +msgstr "Másik módszer hidak beszerzésére email küldésével lehetséges a %s címre. \nKérem vegye figyelembe azt hogy az email küldéséhez használjon egyet az alábbi email szolgáltatók közül. \n%s vagy %s" -#: lib/bridgedb/templates/base.html:48 +#: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" msgstr "A Hídjaim nem működnek! Segítségre van szükségem!" -#: lib/bridgedb/templates/base.html:49 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:92 #, python-format +msgid "If your Tor doesn't work, you should email %s." +msgstr "Ha a Tor böngésződ nem működik, akkor küldj egy email-t %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 msgid "" -"If your Tor doesn't work, you should email %s. Try including as much info " -"about your case as you can, including the list of bridges you used, the " -"bundle filename/version you used, the messages that Tor gave out, etc." -msgstr "Ha a Tor nem működik írnia kell a %s címre. Próbáljon meg amennyi információt csak lehet belefoglalni, beleértve a használt hidak listáját is, a csomag fájlnevét/verzióját amit használt, az üzenetet amit a Tor adott ki, stb." +"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 "Probáljon minél több információt megadn amennyit csak tud, beleértve a listáját \na %s hidaknak és Pluggable Transports -nak, amelyet használni próbált, A Tor Browser verzióját,\nés minden üzenetet melyet Tor adott ki, stb." + +#: lib/bridgedb/strings.py:103 +msgid "Here are your bridge lines:" +msgstr "Itt vannak a híd soraid:" + +#: lib/bridgedb/strings.py:104 +msgid "Get Bridges!" +msgstr "Hidak szerzése!" + +#: lib/bridgedb/strings.py:108 +msgid "Please select options for bridge type:" +msgstr "Kérem, válasszon opciót a híd típushoz:" + +#: lib/bridgedb/strings.py:109 +msgid "Do you need IPv6 addresses?" +msgstr "Kellenek önnek IPv6 címek?" + +#: lib/bridgedb/strings.py:110 +#, python-format +msgid "Do you need a %s?" +msgstr "Szüksége van egy %s?" -#: lib/bridgedb/templates/bridges.html:10 +#: lib/bridgedb/strings.py:114 +msgid "Your browser is not displaying images properly." +msgstr "Ez a böngésző nem jeleníti meg a képeket rendesen." + +#: lib/bridgedb/strings.py:115 +msgid "Enter the characters from the image above..." +msgstr "Adja meg a karaktereket amik a fenti képen láthatóak ..." + +#: lib/bridgedb/strings.py:119 +msgid "How to start using your bridges" +msgstr "Hogyan kezdjük használni a hidat " + +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#: lib/bridgedb/strings.py:121 +#, python-format msgid "" -"To use the above lines, go to Vidalia's Network settings page, and click " -"\"My ISP blocks connections to the Tor network\". Then add each bridge " -"address one at a time." -msgstr "A fenti sorok használatához menjen a Vidalia Hálózati beállítások oldalára, majd kattintson \"Az internetszolgáltatóm blokkolja a Tor hálózathoz kapcsolódást\" opcióra. Utána egyesével adja hozzá a hídcímeket." +"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" +"Browser download page %s to start Tor Browser." +msgstr "A hidak megadásához a Tor Browser -hez, kövese az utasításokat a %s Tor\nBrowser letöltés oldalán %s a Tor Browser indításához." + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:125 +msgid "" +"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" +"the wizard until it asks:" +msgstr "Amikor a 'Tor Hálózati Beállítások' dialógus felugrik, kattintson a 'Konfigurálás'-ra és kövesse\na varászlót amíg az kéri hogy:" + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:129 +msgid "" +"Does your Internet Service Provider (ISP) block or otherwise censor connections\n" +"to the Tor network?" +msgstr "Blokkolja vagy cenzúrázza az ön internet szolgáltatója (ISP) a kapcsolatokat\na Tor hálózatához?" + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:133 +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" +"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 "Válassza hogy 'Igen' és utána kattintson a 'Következő\"-re. Az ön új hidjai konfigurásához, másolja\nés illessze be a Híd sorokat a felugró ablakba. Végül, kattintson 'Kapcsolódás'-ra, és \nmár készen is van. Ha valamilyen hibát tapasztal, próbáljon a 'Segítség'\n gombra kattintani a 'Tor hálózati beállítások' varázslóban a tobábbi segítségért." + +#: lib/bridgedb/strings.py:141 +msgid "Displays this message." +msgstr "Megjeleníti ezt az ütenetet." + +#. 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:145 +msgid "Request vanilla bridges." +msgstr "Nem csatlakoztatható szállító híd kérelme." + +#: lib/bridgedb/strings.py:146 +msgid "Request IPv6 bridges." +msgstr "IPV6 híd kérése." + +#. TRANSLATORS: Please DO NOT translate the word the word "TYPE". +#: lib/bridgedb/strings.py:148 +msgid "Request a Pluggable Transport by TYPE." +msgstr "Egy csatlakoztatható szállító kérelme TYPE szerint." + +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "GnuPG". +#: lib/bridgedb/strings.py:151 +msgid "Get a copy of BridgeDB's public GnuPG key." +msgstr "Másolat szertése a BridgeDB's publikus GnuPG kulcsából." + +#: lib/bridgedb/templates/base.html:91 +msgid "Report a Bug" +msgstr "Hiba jelentése" + +#: lib/bridgedb/templates/base.html:93 +msgid "Source Code" +msgstr "Forrás kód" -#: lib/bridgedb/templates/bridges.html:13 -msgid "No bridges currently available" -msgstr "Nincsen elérhető híd." +#: lib/bridgedb/templates/base.html:96 +msgid "Changelog" +msgstr "Változások" -#: lib/bridgedb/templates/captcha.html:6 -msgid "Upgrade your browser to Firefox" -msgstr "Frissítse a böngészőjét Firefox-ra" +#: lib/bridgedb/templates/base.html:98 +msgid "Contact" +msgstr "Kapcsolat" -#: lib/bridgedb/templates/captcha.html:8 -msgid "Type the two words" -msgstr "Írja be a két szót" +#. 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:66 +msgid "Uh oh, spaghettios!" +msgstr "Hoppá!" -#: lib/bridgedb/templates/index.html:6 -msgid "Step 1" -msgstr "1. lépés" +#: lib/bridgedb/templates/bridges.html:72 +msgid "There currently aren't any bridges available..." +msgstr "Jelenleg nincsenek rendelkezésre álló hidak..." -#: lib/bridgedb/templates/index.html:8 +#: lib/bridgedb/templates/bridges.html:73 #, python-format -msgid "Get %s Tor Browser Bundle %s" -msgstr "Szerezzen %s Tor böngésző csomagot %s" +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "Talán megpróbálhatnál %s vissza menni %s és másik Híd típust választani." + +#: lib/bridgedb/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "Lépés %s1%s" #: lib/bridgedb/templates/index.html:13 -msgid "Step 2" -msgstr "2. lépés" +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "Letöltés %s Tor Böngésző %s" -#: lib/bridgedb/templates/index.html:15 +#: lib/bridgedb/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "Lépés %s2%s" + +#: lib/bridgedb/templates/index.html:27 #, python-format msgid "Get %s bridges %s" -msgstr "Szerezzen be %s hidat %s" +msgstr "%s Hidak %s szertése" + +#: lib/bridgedb/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "Lépés %s3%s" -#: lib/bridgedb/templates/index.html:19 -msgid "Step 3" -msgstr "3. lépés" +#: lib/bridgedb/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "Most %s a hidak hozzáadása a Tor Böngészőhöz %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 "%sC%ssak adjál már nekem hidakat!" + +#: lib/bridgedb/templates/options.html:52 +msgid "Advanced Options" +msgstr "Haladó beállítások" + +#: lib/bridgedb/templates/options.html:88 +msgid "No" +msgstr "Nem" + +#: lib/bridgedb/templates/options.html:89 +msgid "none" +msgstr "Semmi" + +#. 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:130 +#, python-format +msgid "%sY%ses!" +msgstr "%sS%szeretnék!" -#: lib/bridgedb/templates/index.html:21 +#. 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:154 #, python-format -msgid "Now %s add the bridges to Tor %s" -msgstr "Most %s hozzáadja a hidakat a Tor %s-hez." +msgid "%sG%set Bridges" +msgstr "%sS%szerezni Bridge -et!"

1 0

[bridgedb/develop] Update translation: hr_HR
by isis＠torproject.org 25 Jul '14

25 Jul '14

commit 3b220eecf8332de498c56f880a7f6390c2cd6c8f Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jul 25 07:41:42 2014 +0000 Update translation: hr_HR * THANKS TO Ana B. --- lib/bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po | 362 +++++++++++++++++++---- 1 file changed, 309 insertions(+), 53 deletions(-) diff --git a/lib/bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po index b4f04ab..af52bb1 100644 --- a/lib/bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po @@ -1,19 +1,18 @@ # Translations template for BridgeDB. -# Copyright (C) 2013 ORGANIZATION +# Copyright (C) 2014 'The Tor Project, Inc.' # This file is distributed under the same license as the BridgeDB project. # # Translators: -# Translators: -# dlb031 <abuljan031(a)gmail.com>, 2013 +# Ana B, 2013-2014 # Armando Vega <synaan(a)gmail.com>, 2012 # gogo <trebelnik2(a)gmail.com>, 2012 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2013-03-27 21:41+0000\n" -"PO-Revision-Date: 2013-07-31 07:38+0000\n" -"Last-Translator: dlb031 <abuljan031(a)gmail.com>\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" +"POT-Creation-Date: 2014-06-06 21:46+0000\n" +"PO-Revision-Date: 2014-06-30 13:01+0000\n" +"Last-Translator: Ana B\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,82 +21,339 @@ msgstr "" "Language: hr_HR\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -#: lib/bridgedb/templates/base.html:33 +#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in +#. any string (regardless of capitalization and/or punctuation): +#. "BridgeDB" +#. "pluggable transport" +#. "pluggable transports" +#. "obfs2" +#. "obfs3" +#. "scramblesuit" +#. "fteproxy" +#. "Tor" +#. "Tor Browser" +#: lib/bridgedb/HTTPServer.py:121 +msgid "Sorry! Something went wrong with your request." +msgstr "Oprostite! Nešto je pošlo po krivu s Vašim zahtjevom." + +#: lib/bridgedb/strings.py:18 +msgid "[This is an automated message; please do not reply.]" +msgstr "[Ovo je automatizirana poruka; molimo ne odgovarati.]" + +#: lib/bridgedb/strings.py:20 +msgid "Here are your bridges:" +msgstr "Ovdje su vaši mostovi:" + +#: lib/bridgedb/strings.py:22 +#, 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 "Prešli ste limit. Molimo usporite! Minimum vremena između emailova je %s sati. Svi daljnji emailovi tijekom ovog vremenskog perioda bit će ignorirani." + +#: lib/bridgedb/strings.py:25 +msgid "" +"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" +msgstr "COMMANDs: (kombinirajte COMMANDs kako bi naznačili više opcija istovremeno)" + +#. TRANSLATORS: Please DO NOT translate the word "BridgeDB". +#: lib/bridgedb/strings.py:28 +msgid "Welcome to BridgeDB!" +msgstr "Dobrodošli u BridgeDB!" + +#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". +#: lib/bridgedb/strings.py:30 +msgid "Currently supported transport TYPEs:" +msgstr "Trenutno podržani transport TYPEs:" + +#: lib/bridgedb/strings.py:31 +#, python-format +msgid "Hey, %s!" +msgstr "Bok, %s!" + +#: lib/bridgedb/strings.py:32 +msgid "Hello, friend!" +msgstr "Bok, prijatelju!" + +#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 +msgid "Public Keys" +msgstr "Javni ključevi" + +#. 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 +#, python-format +msgid "" +"This email was generated with rainbows, unicorns, and sparkles\n" +"for %s on %s at %s." +msgstr "Ovaj email sastavljen je s dugama, jednorozima i iskricama za %s na %s u %s." + +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. 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 +#, python-format +msgid "" +"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" +"which can help obfuscate your connections to the Tor Network, making it more\n" +"difficult for anyone watching your internet traffic to determine that you are\n" +"using Tor.\n" +"\n" +msgstr "BridgeDB nudi mostove s različitim %stipovima Pluggable Transports%s\nkoji mogu pomutiti vaše veze s Tor Network, čineći težim\nda itko tko prati vaš internet promet vidi da\nkoristite Tor.\n" + +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#: lib/bridgedb/strings.py:54 +msgid "" +"Some bridges with IPv6 addresses are also available, though some Pluggable\n" +"Transports aren't IPv6 compatible.\n" +"\n" +msgstr "Neki mostovi s IPv6 adresama su također dostupni, no neki Pluggable \nTransports nisu kompatibilni s IPv6.\n\n" + +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, +#. 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 +#, python-format +msgid "" +"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" +"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 "Nadalje, BridgeDB ima mnoštvo dobrih, starih mostova %s bez ikakvih\nPluggable Transports %s koji možda ne zvuče prezanimljivo, ali mogu\npomoći zaobići internet cenzuru u mnogo slučajeva.\n" + +#: lib/bridgedb/strings.py:76 msgid "What are bridges?" msgstr "Što su mostovi?" -#: lib/bridgedb/templates/base.html:34 +#: lib/bridgedb/strings.py:77 #, python-format -msgid "" -"%s Bridge relays %s are Tor relays that help you circumvent censorship." -msgstr "%s Mostni releji %s su Tor releji koji vam pomažu zaobići cenzuru." +msgid "%s Bridges %s are Tor relays that help you circumvent censorship." +msgstr "%s Mostovi %s su Tor releji koji vam pomažu zaobići cenzuru." -#: lib/bridgedb/templates/base.html:39 +#: lib/bridgedb/strings.py:82 msgid "I need an alternative way of getting bridges!" msgstr "Trebam alternativni način dobivanja mostova!" -#: lib/bridgedb/templates/base.html:40 +#: lib/bridgedb/strings.py:83 #, python-format msgid "" -"Another way to find public bridge addresses is to send an email (from a %s " -"or a %s address) to %s with the line 'get bridges' by itself in the body of " -"the mail." -msgstr "Još jedan način za pronalazak javnih mostnih adresa je poslati email (sa %s ili %s adrese) da %s samo s rečenicom 'dobiti mostove' u sadržaju maila." +"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 or %s." +msgstr "Još jedan način za dobiti mostove je da pošaljete email na %s. Imajte na umu da morate\nposlati email koristeći adresu jednog od sljedećih email providera:\n%s ili %s." -#: lib/bridgedb/templates/base.html:48 +#: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" msgstr "Moji mostovi ne rade! Treba mi pomoć!" -#: lib/bridgedb/templates/base.html:49 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:92 #, python-format +msgid "If your Tor doesn't work, you should email %s." +msgstr "Ako vaš Tor ne radi, pošaljite email na %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 msgid "" -"If your Tor doesn't work, you should email %s. Try including as much info " -"about your case as you can, including the list of bridges you used, the " -"bundle filename/version you used, the messages that Tor gave out, etc." -msgstr "Ako vaš Tor ne radi, pošaljite email na %s. Probajte uključiti što više informacija o svom slučaju, uključujući popis mostova koje ste koristili, bunde ime datoteke/verziju koju ste koristili, poruke koje je slao Tor, itd." +"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 "Pokušajte naznačiti što više informacija o vašem slučaju, uključujući popis\nmostova i Pluggable Transports koje ste pokušali koristiti, verziju vašeg Tor Browsera,\ni bilo kakve poruke koje je Tor izbacio, itd." + +#: lib/bridgedb/strings.py:103 +msgid "Here are your bridge lines:" +msgstr "Ovdje su linije vaših mostova:" + +#: lib/bridgedb/strings.py:104 +msgid "Get Bridges!" +msgstr "Dobijte Mostove!" + +#: lib/bridgedb/strings.py:108 +msgid "Please select options for bridge type:" +msgstr "Molimo odaberite opcije za tip mosta:" + +#: lib/bridgedb/strings.py:109 +msgid "Do you need IPv6 addresses?" +msgstr "Trebaju li vam IPv6 adrese?" + +#: lib/bridgedb/strings.py:110 +#, python-format +msgid "Do you need a %s?" +msgstr "Trebate li %s?" -#: lib/bridgedb/templates/bridges.html:10 +#: lib/bridgedb/strings.py:114 +msgid "Your browser is not displaying images properly." +msgstr "Vaš preglednik ima problema s prikazivanjem slika." + +#: lib/bridgedb/strings.py:115 +msgid "Enter the characters from the image above..." +msgstr "Unesite znakove sa slike iznad..." + +#: lib/bridgedb/strings.py:119 +msgid "How to start using your bridges" +msgstr "Kako početi koristite vaše mostove" + +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#: lib/bridgedb/strings.py:121 +#, python-format msgid "" -"To use the above lines, go to Vidalia's Network settings page, and click " -"\"My ISP blocks connections to the Tor network\". Then add each bridge " -"address one at a time." -msgstr "Za korištenje gore navedenih redova, posjetite stranicu Mrežnih Postavki u VIdaliji, te kliknite \"Moj ISP blokira veze prema Tor mreži\". Onda dodajte sve mostne adrese jednu po jednu." +"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" +"Browser download page %s to start Tor Browser." +msgstr "Kako bi unijeli mostove u Tor Browser, slijedite upute na %s Tor\nBrowser download stranici %s da bi pokrenuli Tor Browser." + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:125 +msgid "" +"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" +"the wizard until it asks:" +msgstr "Kada iskoči prozorčić 'Tor Mrežne Postavke', kliknite 'Konfiguriraj' i slijedite\nčarobnjaka dok ne upita:" + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:129 +msgid "" +"Does your Internet Service Provider (ISP) block or otherwise censor connections\n" +"to the Tor network?" +msgstr "Blokira li vaš Internet Service Provider (ISP) ili ikako cenzurira veze\ns Tor mrežom?" + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:133 +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" +"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 "Odaberite 'Da', a zatim 'Sljedeće'. Da bi konfigurirali vaše nove mostove, kopirajte i \nzalijepite linije mostova u kućicu za unos teksta. Na kraju, kliknite 'Spoji se', i \nsve bi trebalo biti u redu! Ako naiđete na probleme, probajte kliknuti dugme 'Pomoć'\nu 'Tor Mrežne Postavke' čarobnjaku za daljnju pomoć." + +#: lib/bridgedb/strings.py:141 +msgid "Displays this message." +msgstr "Prikazuje ovu poruku." + +#. 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:145 +msgid "Request vanilla bridges." +msgstr "Zatraži dobre, stare mostove." + +#: lib/bridgedb/strings.py:146 +msgid "Request IPv6 bridges." +msgstr "Zatraži IPv6 mostove." + +#. TRANSLATORS: Please DO NOT translate the word the word "TYPE". +#: lib/bridgedb/strings.py:148 +msgid "Request a Pluggable Transport by TYPE." +msgstr "Zatraži Pluggable Transport od TYPE." + +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "GnuPG". +#: lib/bridgedb/strings.py:151 +msgid "Get a copy of BridgeDB's public GnuPG key." +msgstr "Dobij kopiju BridgeDB javnog GnuPG ključa." + +#: lib/bridgedb/templates/base.html:91 +msgid "Report a Bug" +msgstr "Prijavi Greški" + +#: lib/bridgedb/templates/base.html:93 +msgid "Source Code" +msgstr "Izvorni Kod" -#: lib/bridgedb/templates/bridges.html:13 -msgid "No bridges currently available" -msgstr "Nema trenutno dostupnih mostova" +#: lib/bridgedb/templates/base.html:96 +msgid "Changelog" +msgstr "Changelog" -#: lib/bridgedb/templates/captcha.html:6 -msgid "Upgrade your browser to Firefox" -msgstr "Nadogradite vaš preglednik na Firefox" +#: lib/bridgedb/templates/base.html:98 +msgid "Contact" +msgstr "Kontakt" -#: lib/bridgedb/templates/captcha.html:8 -msgid "Type the two words" -msgstr "Napišite ove dvije riječi" +#. 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:66 +msgid "Uh oh, spaghettios!" +msgstr "O ne, greška!" -#: lib/bridgedb/templates/index.html:6 -msgid "Step 1" -msgstr "Korak 1" +#: lib/bridgedb/templates/bridges.html:72 +msgid "There currently aren't any bridges available..." +msgstr "Trenutno nema dostupnih mostova..." -#: lib/bridgedb/templates/index.html:8 +#: lib/bridgedb/templates/bridges.html:73 #, python-format -msgid "Get %s Tor Browser Bundle %s" -msgstr "Dobijte %s Tor Preglednički Paket %s" +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "Možda se trebate %s vratiti nazad %s i odabrati neki drugi tip mosta!" + +#: lib/bridgedb/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "Korak %s1%s" #: lib/bridgedb/templates/index.html:13 -msgid "Step 2" -msgstr "Korak 2" +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "Preuzmi %s Tor Browser %s" -#: lib/bridgedb/templates/index.html:15 +#: lib/bridgedb/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "Korak %s2%s" + +#: lib/bridgedb/templates/index.html:27 #, python-format msgid "Get %s bridges %s" msgstr "Dobijte %s mostove %s" -#: lib/bridgedb/templates/index.html:19 -msgid "Step 3" -msgstr "Korak 3" +#: lib/bridgedb/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "Korak %s3%s" + +#: lib/bridgedb/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "Sad %s dodaj mostove u 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 "%sS%samo mi daj mostove!" + +#: lib/bridgedb/templates/options.html:52 +msgid "Advanced Options" +msgstr "Napredne Opcije" + +#: lib/bridgedb/templates/options.html:88 +msgid "No" +msgstr "Ne" + +#: lib/bridgedb/templates/options.html:89 +msgid "none" +msgstr "ništa" + +#. 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:130 +#, python-format +msgid "%sY%ses!" +msgstr "%sD%sa!" -#: lib/bridgedb/templates/index.html:21 +#. 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:154 #, python-format -msgid "Now %s add the bridges to Tor %s" -msgstr "Sad %s dodajte mostove na Tor %s" +msgid "%sG%set Bridges" +msgstr "%sD%sobij Bridges"

1 0

[bridgedb/develop] Update translation: km
by isis＠torproject.org 25 Jul '14

25 Jul '14

commit 5c21c1d0b1e21891dad3861a47c8c95e8a571369 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jul 25 07:43:22 2014 +0000 Update translation: km * THANKS TO Seng Sutha, Sokhem Khoem, and Sok Sophea. --- lib/bridgedb/i18n/km/LC_MESSAGES/bridgedb.po | 374 ++++++++++++++++++++++---- 1 file changed, 316 insertions(+), 58 deletions(-) diff --git a/lib/bridgedb/i18n/km/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/km/LC_MESSAGES/bridgedb.po index 8ae3ca8..95a26bc 100644 --- a/lib/bridgedb/i18n/km/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/km/LC_MESSAGES/bridgedb.po @@ -1,18 +1,19 @@ # Translations template for BridgeDB. -# Copyright (C) 2013 ORGANIZATION +# Copyright (C) 2014 'The Tor Project, Inc.' # This file is distributed under the same license as the BridgeDB project. # # Translators: -# Translators: -# soksophea <sksophea(a)gmail.com>, 2014 -# soksophea <sksophea(a)gmail.com>, 2013 +# Seng Sutha <sutha(a)open.org.kh>, 2014 +# Sokhem Khoem <sokhem(a)open.org.kh>, 2014 +# Sok Sophea <sksophea(a)gmail.com>, 2014 +# Sok Sophea <sksophea(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2013-03-27 21:41+0000\n" -"PO-Revision-Date: 2014-02-07 02:29+0000\n" -"Last-Translator: Sutha <sutha(a)open.org.kh>\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" +"POT-Creation-Date: 2014-06-06 21:46+0000\n" +"PO-Revision-Date: 2014-06-10 02:50+0000\n" +"Last-Translator: Sokhem Khoem <sokhem(a)open.org.kh>\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,82 +22,339 @@ msgstr "" "Language: km\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: lib/bridgedb/templates/base.html:33 -msgid "What are bridges?" -msgstr "តើប្រ៊ីតជាអ្វី?" +#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in +#. any string (regardless of capitalization and/or punctuation): +#. "BridgeDB" +#. "pluggable transport" +#. "pluggable transports" +#. "obfs2" +#. "obfs3" +#. "scramblesuit" +#. "fteproxy" +#. "Tor" +#. "Tor Browser" +#: lib/bridgedb/HTTPServer.py:121 +msgid "Sorry! Something went wrong with your request." +msgstr "សូមទោស! អ្វីមួយមានកំហុសជាមួយសំណើរបស់អ្នក។" + +#: lib/bridgedb/strings.py:18 +msgid "[This is an automated message; please do not reply.]" +msgstr "[នេះជាសារស្វ័យប្រវត្តិ; សូមកុំឆ្លើយតប។]" + +#: lib/bridgedb/strings.py:20 +msgid "Here are your bridges:" +msgstr "នេះជាប៊្រីដ្យរបស់អ្នក៖" + +#: lib/bridgedb/strings.py:22 +#, 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 "You have exceeded the rate limit. Please slow down! The minimum time between\nemails is %s hours. All further emails during this time period will be ignored." + +#: lib/bridgedb/strings.py:25 +msgid "" +"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" +msgstr "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" + +#. TRANSLATORS: Please DO NOT translate the word "BridgeDB". +#: lib/bridgedb/strings.py:28 +msgid "Welcome to BridgeDB!" +msgstr "ស្វាគមន៍មកកាន់ BridgeDB!" + +#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". +#: lib/bridgedb/strings.py:30 +msgid "Currently supported transport TYPEs:" +msgstr "បច្ចុប្បន្នករផ្ទេរបានគាំទ្រ TYPEs ៖" + +#: lib/bridgedb/strings.py:31 +#, python-format +msgid "Hey, %s!" +msgstr "ហេ, %s!" + +#: lib/bridgedb/strings.py:32 +msgid "Hello, friend!" +msgstr "សួស្ដី, មិត្តភ័ក្ដិ!" + +#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 +msgid "Public Keys" +msgstr "សោសាធារណៈ" + +#. 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 +#, python-format +msgid "" +"This email was generated with rainbows, unicorns, and sparkles\n" +"for %s on %s at %s." +msgstr "អ៊ីមែលនេះត្រូវបានបង្កើតឡើងជាមួយ rainbows, unicorns, និង sparkles\nសម្រាប់ %s លើ %s នៅ %s ។" -#: lib/bridgedb/templates/base.html:34 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. 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 #, python-format msgid "" -"%s Bridge relays %s are Tor relays that help you circumvent censorship." -msgstr "%s ប្រ៊ីតបញ្ជូនបន្ត %s គឺ Tor បញ្ជូនបន្តដែលជួយអ្នកបញ្ចៀសការរិះគន់។" +"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" +"which can help obfuscate your connections to the Tor Network, making it more\n" +"difficult for anyone watching your internet traffic to determine that you are\n" +"using Tor.\n" +"\n" +msgstr "BridgeDB មិនអាចផ្ដល់ប៊្រីដ្យជាមួយប្រភេទ %stypes មួយចំនួននៃ Pluggable Transports%s,\nដែលអាចជួយ obfuscate ការតភ្ជាប់របស់អ្នកទៅកាន់បណ្ដាញ Tor , ធ្វើឲ្យវាមានភាពពិបាកសម្រាប់មើលចរាចរណ៍របស់អ្នកក្នុងការកំណត់ថាអ្នកកំពុងប្រើ Tor ។\n\n" + +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#: lib/bridgedb/strings.py:54 +msgid "" +"Some bridges with IPv6 addresses are also available, though some Pluggable\n" +"Transports aren't IPv6 compatible.\n" +"\n" +msgstr "Some bridges with IPv6 addresses are also available, though some Pluggable\nTransports aren't IPv6 compatible.\n\n" -#: lib/bridgedb/templates/base.html:39 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, +#. 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 +#, python-format +msgid "" +"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" +"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 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\nPluggable Transports %s which maybe doesn't sound as cool, but they can still\nhelp to circumvent internet censorship in many cases.\n\n" + +#: lib/bridgedb/strings.py:76 +msgid "What are bridges?" +msgstr "តើប្រ៊ីដ្យជាអ្វី?" + +#: lib/bridgedb/strings.py:77 +#, python-format +msgid "%s Bridges %s are Tor relays that help you circumvent censorship." +msgstr "%s Bridges %s are Tor relays that help you circumvent censorship." + +#: lib/bridgedb/strings.py:82 msgid "I need an alternative way of getting bridges!" -msgstr "ខ្ញុំត្រូវការវិធីសាស្ត្រឆ្លាស់គ្នានៃការទទួលបានប្រ៊ីត!" +msgstr "ខ្ញុំត្រូវការវិធីសាស្ត្រឆ្លាស់គ្នានៃការទទួលបានប្រ៊ីដ្យ!" -#: lib/bridgedb/templates/base.html:40 +#: lib/bridgedb/strings.py:83 #, python-format msgid "" -"Another way to find public bridge addresses is to send an email (from a %s " -"or a %s address) to %s with the line 'get bridges' by itself in the body of " -"the mail." -msgstr "វិធីផ្សេងទៀតដើម្បីរកមើលអាសយដ្ឋានប្រ៊ីតសាធារណៈគឺ ការផ្ញើអ៊ីមែល (ពីអាសយដ្ឋាន %s ឬ %s) ទៅកាន់ %s ដែលមានបន្ទាត់អក្សរ 'get bridges' នៅក្នុងតួនៃអ៊ីមែល។" +"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 or %s." +msgstr "Another way to get bridges is to send an email to %s. Please note that you must\nsend the email using an address from one of the following email providers:\n%s or %s." -#: lib/bridgedb/templates/base.html:48 +#: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" -msgstr "ប្រ៊ីតរបស់ខ្ញុំមិនដំណើរការ! ខ្ញុំត្រូវការជំនួយ!" +msgstr "ប្រ៊ីដ្យរបស់ខ្ញុំមិនដំណើរការ! ខ្ញុំត្រូវការជំនួយ!" -#: lib/bridgedb/templates/base.html:49 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:92 #, python-format +msgid "If your Tor doesn't work, you should email %s." +msgstr "ប្រសិនបើ Tor របស់អ្នកមិនដំណើរការ, អ្នកគួរតែអ៊ីមែល %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 msgid "" -"If your Tor doesn't work, you should email %s. Try including as much info " -"about your case as you can, including the list of bridges you used, the " -"bundle filename/version you used, the messages that Tor gave out, etc." -msgstr "បើ Tor របស់អ្នកមិនដំណើរការទេ អ្នកគួរតែផ្ញើអ៊ីមែលទៅ %s។ ដោយព្យាយាមរួមបញ្ចូលព័ត៌មានអំពីករណីរបស់អ្នកឲ្យបានច្រើន រួមបញ្ចូលបញ្ជីប្រ៊ីតដែលអ្នកបានប្រើ បាច់ឈ្មោះឯកសារ/កំណែដែលអ្នកបានប្រើ សារដែល Tor បានបោះបង់។ល។" +"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 "Try including as much info about your case as you can, including the list of\nbridges and Pluggable Transports you tried to use, your Tor Browser version,\nand any messages which Tor gave out, etc." + +#: lib/bridgedb/strings.py:103 +msgid "Here are your bridge lines:" +msgstr "នេះជាតំណប៊្រីដ្យរបស់អ្នក៖" + +#: lib/bridgedb/strings.py:104 +msgid "Get Bridges!" +msgstr "ទទួលយកប៊្រីដ្យ!" + +#: lib/bridgedb/strings.py:108 +msgid "Please select options for bridge type:" +msgstr "សូមជ្រើសជម្រើសសម្រាប់ប្រភេទប៊្រីដ្យ៖" + +#: lib/bridgedb/strings.py:109 +msgid "Do you need IPv6 addresses?" +msgstr "តើអ្នកត្រូវការអាសយដ្ឋាន IPv6 ឬ?" + +#: lib/bridgedb/strings.py:110 +#, python-format +msgid "Do you need a %s?" +msgstr "តើអ្នកត្រូវការ %s?" -#: lib/bridgedb/templates/bridges.html:10 +#: lib/bridgedb/strings.py:114 +msgid "Your browser is not displaying images properly." +msgstr "កម្មវិធីអ៊ីនធឺណិតរបស់អ្នកមិនកំពុងបង្ហាញរូបភាពដោយត្រឹមត្រូវឡើយ។" + +#: lib/bridgedb/strings.py:115 +msgid "Enter the characters from the image above..." +msgstr "បញ្ចូលតួអក្សរពីរូបភាពខាងលើ..." + +#: lib/bridgedb/strings.py:119 +msgid "How to start using your bridges" +msgstr "របៀបចាប់ផ្ដើមប្រើប៊្រីដ្យរបស់អ្នក" + +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#: lib/bridgedb/strings.py:121 +#, python-format msgid "" -"To use the above lines, go to Vidalia's Network settings page, and click " -"\"My ISP blocks connections to the Tor network\". Then add each bridge " -"address one at a time." -msgstr "ដើម្បីប្រើបន្ទាត់អក្សរខាងលើ អ្នកត្រូវទៅកាន់ទំព័រការកំណត់បណ្ដាញរបស់ Vidalia រួចចុច \"ISP របស់ខ្ញុំទប់ស្កាត់ការតភ្ជាប់ទៅកាន់បណ្ដាញ Tor\" ។ បន្ទាប់មកបន្ថែមអាសយដ្ឋានប្រ៊ីតម្ដងមួយៗ។" +"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" +"Browser download page %s to start Tor Browser." +msgstr "ដើម្បីបញ្ចូលប៊្រីដ្យទៅកាន់ Tor Browser, អនុវត្តសេចក្ដីណែនាំនៅលើទំព័រ %s Tor\nBrowser %s ដើម្បីចាប់ផ្ដើម Tor Browser ។" + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:125 +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:129 +msgid "" +"Does your Internet Service Provider (ISP) block or otherwise censor connections\n" +"to the Tor network?" +msgstr "Does your Internet Service Provider (ISP) block or otherwise censor connections\nto the Tor network?" + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:133 +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" +"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 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\npaste the bridge lines into the text input box. Finally, click 'Connect', and\nyou should be good to go! If you experience trouble, try clicking the 'Help'\nbutton in the 'Tor Network Settings' wizard for further assistance." + +#: lib/bridgedb/strings.py:141 +msgid "Displays this message." +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. +#: lib/bridgedb/strings.py:145 +msgid "Request vanilla bridges." +msgstr "ស្នើប៊្រីដ្យមូលដ្ឋាន។" + +#: lib/bridgedb/strings.py:146 +msgid "Request IPv6 bridges." +msgstr "ស្នើប៊្រីដ្យ IPv6 ។" + +#. TRANSLATORS: Please DO NOT translate the word the word "TYPE". +#: lib/bridgedb/strings.py:148 +msgid "Request a Pluggable Transport by TYPE." +msgstr "ស្នើការផ្ទេរដែលអាចដោតបានតាមរយៈ TYPE ។" + +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "GnuPG". +#: lib/bridgedb/strings.py:151 +msgid "Get a copy of BridgeDB's public GnuPG key." +msgstr "Get a copy of BridgeDB's public GnuPG key." + +#: lib/bridgedb/templates/base.html:91 +msgid "Report a Bug" +msgstr "របាយការណ៍កំហុស" + +#: lib/bridgedb/templates/base.html:93 +msgid "Source Code" +msgstr "កូដប្រភព" -#: lib/bridgedb/templates/bridges.html:13 -msgid "No bridges currently available" -msgstr "បច្ចុប្បន្នមិនមានប្រ៊ីត" +#: lib/bridgedb/templates/base.html:96 +msgid "Changelog" +msgstr "Changelog" -#: lib/bridgedb/templates/captcha.html:6 -msgid "Upgrade your browser to Firefox" -msgstr "ធ្វើបច្ចុប្បន្នភាពកម្មវិធីអ៊ីនធឺណិតរបស់អ្នកទៅ Firefox" +#: lib/bridgedb/templates/base.html:98 +msgid "Contact" +msgstr "ទំនាក់ទំនង" -#: lib/bridgedb/templates/captcha.html:8 -msgid "Type the two words" -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:66 +msgid "Uh oh, spaghettios!" +msgstr "Uh oh, spaghettios!" -#: lib/bridgedb/templates/index.html:6 -msgid "Step 1" -msgstr "ជំហានទី១" +#: lib/bridgedb/templates/bridges.html:72 +msgid "There currently aren't any bridges available..." +msgstr "បច្ចុប្បន្នមិនមានប៊្រីដ្យមួយចំនួនឡើយ..." -#: lib/bridgedb/templates/index.html:8 +#: lib/bridgedb/templates/bridges.html:73 #, python-format -msgid "Get %s Tor Browser Bundle %s" -msgstr "យក %s បាច់កម្មវិធីអ៊ីនធឺណិត Tor %s" +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr " ប្រហែលជាអ្នកគួរតែព្យាយាម %s ត្រឡប់ទៅកាន់ %s ហើយជ្រើសប្រភេទប្រ៊ីដ្យផ្សេង!" + +#: lib/bridgedb/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "ជំហាន %s1%s" #: lib/bridgedb/templates/index.html:13 -msgid "Step 2" -msgstr "ជំហានទី២" +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "ទាញយក %s Tor Browser %s" -#: lib/bridgedb/templates/index.html:15 +#: lib/bridgedb/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "ជំហាន %s2%s" + +#: lib/bridgedb/templates/index.html:27 #, python-format msgid "Get %s bridges %s" -msgstr "យក %s ប្រ៊ីត %s" +msgstr "យក %s ប្រ៊ីដ្យ %s" + +#: lib/bridgedb/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "ជំហាន %s3%s" -#: lib/bridgedb/templates/index.html:19 -msgid "Step 3" -msgstr "ជំហានទី៣" +#: lib/bridgedb/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "ឥឡូវ %s បន្ថែមប៊្រីដ្យទៅកាន់ 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 "%sJ%sust ផ្ដល់ឲ្យខ្ញុំនូវប៊្រីដ្យ!" + +#: lib/bridgedb/templates/options.html:52 +msgid "Advanced Options" +msgstr "ជម្រើសកម្រិតខ្ពស់" + +#: lib/bridgedb/templates/options.html:88 +msgid "No" +msgstr "ទេ" + +#: 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:130 +#, python-format +msgid "%sY%ses!" +msgstr "%sY%ses!" -#: lib/bridgedb/templates/index.html:21 +#. 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:154 #, python-format -msgid "Now %s add the bridges to Tor %s" -msgstr "ឥឡូវ %s បន្ថែមប្រ៊ីតទៅកាន់ Tor %s" +msgid "%sG%set Bridges" +msgstr "%sG%set ប៊្រីដ្យ"

1 0