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

[pups/master] new Issue model for stats
by colin＠torproject.org 18 May '14

18 May '14

commit 141493125e29668f9dee1ee0b05d960018eeddb5 Author: Sherief Alaa <sheriefalaa.w(a)gmail.com> Date: Sun May 18 01:37:21 2014 +0300 new Issue model for stats --- stats/models.py | 41 ++++++++++++++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 9 deletions(-) diff --git a/stats/models.py b/stats/models.py index 5880724..4e4d5b6 100644 --- a/stats/models.py +++ b/stats/models.py @@ -1,13 +1,36 @@ +# This file is part of Pups, a django/python project which contains +# web support tools +# +# Author: Sherief Alaa <sheriefalaa.w(a)gmail.com> +# +# Copyright: +# (c) 2014 Sherief Alaa. +# (c) 2014 The Tor Project, Inc. +# +# Pups is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Pups is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Pups. If not, see <http://www.gnu.org/licenses/>. + from django.db import models -# # Create your models here. +class Issue(models.Model): + issue_id = models.CharField(max_length=64) + text = models.TextField() + frequency = models.IntegerField() + created_by = models.CharField(max_length=64) + is_locked = models.BooleanField() + locked_by = models.CharField(max_length=64) + last_edited_by = models.CharField(max_length=64) -# class Question(models.Model): -# q_id -# text -# frequency -# created_by -# created_at -# last_edited_by -# is_locked + def __unicode__(self): + return u'ID: %s Owner: %s Text: %s' % (self.issue_id, self.owner, self.text)

1 0

[pups/master] new stats page style and code
by colin＠torproject.org 18 May '14

18 May '14

commit b973671b8801d8af361ac21ee056b644eacb601b Author: Sherief Alaa <sheriefalaa.w(a)gmail.com> Date: Sun May 18 01:33:42 2014 +0300 new stats page style and code --- static/css/stats.css | 23 +++++++++ static/js/stats.js | 120 ++++++++++++++++++++++++++++---------------- stats/templates/stats.html | 41 +++++++++------ 3 files changed, 126 insertions(+), 58 deletions(-) diff --git a/static/css/stats.css b/static/css/stats.css new file mode 100644 index 0000000..0afa04c --- /dev/null +++ b/static/css/stats.css @@ -0,0 +1,23 @@ +input[type=text] { + width: 900px; + display: inline-block; +} + +input[type=text][name=counter]{ + width: 50px; +} + +.clear { + margin: 5px; +} + +.issue_text { + width: 75%; + float: left; +} + +.options { + width: 25%; + float: right; + margin-right: -25px; +} \ No newline at end of file diff --git a/static/js/stats.js b/static/js/stats.js index 5116a30..f5dde69 100644 --- a/static/js/stats.js +++ b/static/js/stats.js @@ -1,76 +1,106 @@ -$(document).ready (function (){ +// This file is part of Pups, a django/python project which contains +// web support tools +// +// Author: Sherief Alaa <sheriefalaa.w(a)gmail.com> +// +// Copyright: +// (c) 2014 Sherief Alaa. +// (c) 2014 The Tor Project, Inc. +// +// Pups is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Pups is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Pups. If not, see <http://www.gnu.org/licenses/>. + +var current_issue_edit_id; - // New question event listener - $("#savenewq").click(function() { +$(document).ready (function (){ + $("#save_issue").click(function() { - if ($("#newqtext").val() == '') { + if ($("#new_issue_text").val() == '') { alert ('Please enter something'); return false; } - var uid = generateUUID(); - var quid = "'" + uid + "'"; // Wrapped in quotes to make things cleaner. - - // Send question text to sqlite + NewIssue(); + }); - // Create a new question - $("#questions").append('<div id="id-' + uid + '"></div>'); + $("#save_edit").click(function() { - $("#id-"+uid).append('<input id="qtext-' + uid + '" class="form-control" name="qtext" type="text" value="'+ $("#newqtext").val() +'" readonly>'); - $("#id-"+uid).append('<input id="qtextedit-'+ uid +'" class="form-control" style="display:none;" type="text" size="85" value="">'); - $("#id-"+uid).append('<input id="save-'+ uid +'" style="display:none;" class="btn btn-danger" type="button" value="Save" onClick="saveEdit('+quid+');">'); - $("#id-"+uid).append('<input id="cancel-'+ uid +'" style="display:none;" class="btn btn-default" type="button" value="Cancel"onClick="cancelEdit('+quid+');">'); - $("#id-"+uid).append('<input id="counter-' + uid + '" class="form-control" name="counter" type="text" size="4" value="" readonly>'); - $("#id-"+uid).append('<input id="plus-' + uid + '" class="btn btn-default" type="button" value="+1" onClick="counter('+quid+');">'); - $("#id-"+uid).append('<input id="edit-' + uid + '" class="btn btn-default" type="button" value="Edit" style="display:inline-block" onClick="editq('+quid+');" >'); - $("#id-"+uid).append('<input id="del-' + uid + '" class="btn btn-danger" type="button" value="Delete" onClick="deleteq('+quid+');">'); + SaveEdit(current_issue_edit_id); + }); + $("#close_edit").click(function() { - // Clear question to avoid replication by mistake. - $("#newqtext").val(""); + CancelEdit(current_issue_edit_id); }); }); +function NewIssue() { + + var uid = generateUUID(); + var quoted_uid = "'" + uid + "'"; // Wrapped in quotes to make things cleaner. + + // Send question text to sqlite + + // Create a new question + $("#issues").append( + '<div class="clear"></div>' + +'<div id="issue-' + uid + '" class="row"></div>'); + $("#issue-" + uid).append( + '<div id="issue_text-' + uid + '" name="issue_text" class="col-md-9">' + $("#new_issue_text").val() + '</div>' + +'<div class="options">' + +'<input id="counter-' + uid + '" class="form-control" name="counter" type="text" size="4" value="" readonly>' + +'<button id="plus-' + uid + '" class="btn btn-default" onclick="counter(' + quoted_uid + ');">+1</button>' + +'<button id="edit-' + uid + '" class="btn btn-default" data-toggle="modal" data-target="#EditIssue" onclick="edit_issue(' + quoted_uid + ')">Edit</button>' + +'<input id="del-' + uid + '" class="btn btn-danger" type="button" value="Delete" onclick="DeleteIssue(' + quoted_uid + ');">' + +'</div>'); + + // Clear question to avoid replication by mistake. + $("#new_issue_text").val(""); +} + // Edit a question -function editq(uid) { - $('#qtext-' + uid).hide(); - $('#qtextedit-' + uid).val($('#qtext-' + uid).val()); - $('#qtextedit-'+ uid).css('display','inline-block'); - $('#counter-'+ uid).css('display','inline-block'); - $('#save-'+ uid).css('display','inline-block'); - $('#cancel-'+ uid).css('display','inline-block'); +function edit_issue(quoted_uid) { + + // Lock issue in db + + // Let the user edit issue + $("#edit_text").val($("#issue_text-" + quoted_uid).text()); + current_issue_edit_id = quoted_uid; } -function saveEdit(uid) { +function SaveEdit(quoted_uid) { - // Should send changes to sqlite + $("#EditIssue").modal('hide'); + // Should send changes to sqlite and unclock db // Save locally for UI - $('#qtext-' + uid).val( $('#qtextedit-' + uid).val() ); - $('#qtextedit-'+ uid).css('display','none'); - $('#save-'+ uid).css('display','none'); - $('#cancel-'+ uid).css('display','none'); - $('#qtext-' + uid).show(); } -function cancelEdit(uid) { - $('#qtextedit-'+ uid).css('display','none'); - $('#save-'+ uid).css('display','none'); - $('#cancel-'+ uid).css('display','none'); - $('#qtext-' + uid).show(); +function CancelEdit(quoted_uid) { + // unlock issue in db } // Delete a question -function deleteq(uid) { +function DeleteIssue(uid) { if (confirmBox()) { // Send a delete request to sqlite - // Remove the div from the page - $("#del-" + uid).parent().remove(); + // Remove issue from db and html + $("#issue-" + uid).remove(); } } @@ -79,6 +109,12 @@ function counter(uid) { // Send a +1 to sqlite + // lock the button to avoid double +1s + + // wait for success callback + + // if callback returns a failure alert DB error + // Increase the counter by 1 if ($("#counter-" + uid).val() == "") $("#counter-" + uid).val("1"); diff --git a/stats/templates/stats.html b/stats/templates/stats.html index 9257d81..5fc1c03 100755 --- a/stats/templates/stats.html +++ b/stats/templates/stats.html @@ -4,20 +4,8 @@ {% block extra_css %} <link rel="stylesheet" type="text/css" href="/static/css/bootstrap.min.css"> <link rel="stylesheet" type="text/css" href="/static/css/bootstrap-theme.min.css"> + <link rel="stylesheet" type="text/css" href="/static/css/stats.css"> <link rel="stylesheet" type="text/css" href="/static/css/footer.css"> - - <style type="text/css"> - - input[type=text] { - width: 600px; - display: inline-block; - } - - input[type=text][name=counter]{ - width: 60px; - } - - </style> {% endblock extra_css %} {% block script %} <script type="text/javascript" src="/static/js/jquery.min.js"></script> @@ -28,9 +16,30 @@ {% block content %} {% include "nav_bar.html" %} <div id="newq"> - <input id="newqtext" class="form-control" placeholder="Warning: This is not ready yet!" type="text" style="display: inline-block;"> - <input id="savenewq" class="btn btn-default" type="button" value="Save"> + <input id="new_issue_text" class="form-control" placeholder="Warning: This is not ready yet!" type="text" style="display: inline-block;"> + <input id="save_issue" class="btn btn-default" type="button" value="Save"> </div> - <div id="questions"></div> + +<div id="issues"></div> + +  + <div class="modal fade" id="EditIssue" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false"> + <div class="modal-dialog"> + <div class="modal-content"> + <div class="modal-header"> + <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> + <h4 class="modal-title" id="myModalLabel">Edit issue</h4> + </div> + <div class="modal-body"> + <textarea id="edit_text" rows="8" cols="65"></textarea> + </div> + <div class="modal-footer"> + <button type="button" class="btn btn-default" data-dismiss="modal" id="close_edit">Close</button> + <button type="button" class="btn btn-primary" id="save_edit">Save changes</button> + </div> + </div> + </div> + </div> + {% include "footer.html" %} {% endblock content %} \ No newline at end of file

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 18 May '14

18 May '14

commit c48fce8d1ec2754b69de500eab65c65afcf61822 Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 18 06:45:12 2014 +0000 Update translations for torcheck_completed --- id/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/id/torcheck.po b/id/torcheck.po index 9a2c357..d693898 100644 --- a/id/torcheck.po +++ b/id/torcheck.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-05-18 06:10+0000\n" +"PO-Revision-Date: 2014-05-18 06:21+0000\n" "Last-Translator: Mohamad Hasan Al Banna\n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/torproject/language/id/)\n" "MIME-Version: 1.0\n"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 18 May '14

18 May '14

commit 0b8407f8df968151033a2eef73a4ad4619a91e3c Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 18 06:45:09 2014 +0000 Update translations for torcheck --- id/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/id/torcheck.po b/id/torcheck.po index 9a2c357..d693898 100644 --- a/id/torcheck.po +++ b/id/torcheck.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-05-18 06:10+0000\n" +"PO-Revision-Date: 2014-05-18 06:21+0000\n" "Last-Translator: Mohamad Hasan Al Banna\n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/torproject/language/id/)\n" "MIME-Version: 1.0\n"

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 18 May '14

18 May '14

commit 6d4967d3333e73ec185224ce575778f73bedb2bc Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 18 06:15:14 2014 +0000 Update translations for torcheck_completed --- id/torcheck.po | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/id/torcheck.po b/id/torcheck.po index a1dc3f4..9a2c357 100644 --- a/id/torcheck.po +++ b/id/torcheck.po @@ -4,6 +4,7 @@ # Translators: # brain90 <gibransyah(a)gmail.com>, 2012 # brain90 <gibransyah(a)gmail.com>, 2012 +# Mohamad Hasan Al Banna, 2014 # Jaya Wijaya <SecretCommission(a)tormail.org>, 2012 # Jaya Wijaya <SecretCommission(a)tormail.org>, 2012 # bedouin <slamet.badwi(a)gmail.com>, 2014 @@ -13,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-03-26 07:01+0000\n" -"Last-Translator: bedouin <slamet.badwi(a)gmail.com>\n" +"PO-Revision-Date: 2014-05-18 06:10+0000\n" +"Last-Translator: Mohamad Hasan Al Banna\n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/torproject/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -98,3 +99,6 @@ msgstr "Javascript aktif." msgid "JavaScript is disabled." msgstr "Javascript Nonaktif" + +msgid "However, it does not appear to be the Tor Browser Bundle." +msgstr "Akan tetapi, itu tidak terlihat akan menjadi Tor Browser Bundle."

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 18 May '14

18 May '14

commit 920f67b74b5902dc4537145e428e57b1ab70596f Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 18 06:15:09 2014 +0000 Update translations for torcheck --- id/torcheck.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/id/torcheck.po b/id/torcheck.po index d6a502c..9a2c357 100644 --- a/id/torcheck.po +++ b/id/torcheck.po @@ -4,6 +4,7 @@ # Translators: # brain90 <gibransyah(a)gmail.com>, 2012 # brain90 <gibransyah(a)gmail.com>, 2012 +# Mohamad Hasan Al Banna, 2014 # Jaya Wijaya <SecretCommission(a)tormail.org>, 2012 # Jaya Wijaya <SecretCommission(a)tormail.org>, 2012 # bedouin <slamet.badwi(a)gmail.com>, 2014 @@ -13,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-05-06 08:21+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-05-18 06:10+0000\n" +"Last-Translator: Mohamad Hasan Al Banna\n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/torproject/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -100,4 +101,4 @@ msgid "JavaScript is disabled." msgstr "Javascript Nonaktif" msgid "However, it does not appear to be the Tor Browser Bundle." -msgstr "" +msgstr "Akan tetapi, itu tidak terlihat akan menjadi Tor Browser Bundle."

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 18 May '14

18 May '14

commit 1d1e1a52518ba40ba2758c17aa50ba8d01ba5a80 Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 18 00:45:03 2014 +0000 Update translations for bridgedb --- de/LC_MESSAGES/bridgedb.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/de/LC_MESSAGES/bridgedb.po b/de/LC_MESSAGES/bridgedb.po index 884e5bd..b999941 100644 --- a/de/LC_MESSAGES/bridgedb.po +++ b/de/LC_MESSAGES/bridgedb.po @@ -12,7 +12,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: 2014-05-16 18:39+0000\n" -"PO-Revision-Date: 2014-05-18 00:14+0000\n" +"PO-Revision-Date: 2014-05-18 00:31+0000\n" "Last-Translator: unknwon_anonymous <jackjohnson0001(a)yahoo.com>\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" @@ -193,13 +193,13 @@ msgstr "Wie man Bridges verwendet" msgid "" "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" "Browser download page %s to start Tor Browser." -msgstr "" +msgstr "Um Bridges zum Tor Browser hinzuzufügen, folge der Anleitung auf der\n%s Tor Browser Download-Seite %s um den Tor Browser zu starten." #: lib/bridgedb/strings.py:108 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" -msgstr "" +msgstr "Wenn der 'Tor Netzwerk Einstellungen'-Dialog erscheint, klicke 'Konfigurieren' \nund folge dem Wizard bis er fragt: " #: lib/bridgedb/strings.py:111 msgid "" @@ -221,7 +221,7 @@ msgstr "Diese Nachricht anzeigen." #: lib/bridgedb/strings.py:123 msgid "Request vanilla bridges." -msgstr "" +msgstr "Vanilla Bridges anfordern." #: lib/bridgedb/strings.py:124 msgid "Request IPv6 bridges." @@ -254,7 +254,7 @@ msgstr "Kontakt" #: lib/bridgedb/templates/bridges.html:65 msgid "Uh oh, spaghettios!" -msgstr "" +msgstr "Uh oh, Spaghettios!" #: lib/bridgedb/templates/bridges.html:70 msgid "There currently aren't any bridges available..." @@ -265,7 +265,7 @@ msgstr "Im Moment sind keine Bridges verfügbar..." msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " "type!" -msgstr "" +msgstr "Möglicherweise solltest du versuchen %s zurück zu gehen %s und einen anderen Bridge-Typ auszuwählen!" #: lib/bridgedb/templates/index.html:11 #, python-format

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 18 May '14

18 May '14

commit f0f66cf45c355b86ecd861089576f5fbd1cc02df Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 18 00:15:03 2014 +0000 Update translations for bridgedb --- de/LC_MESSAGES/bridgedb.po | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/de/LC_MESSAGES/bridgedb.po b/de/LC_MESSAGES/bridgedb.po index 74bff41..884e5bd 100644 --- a/de/LC_MESSAGES/bridgedb.po +++ b/de/LC_MESSAGES/bridgedb.po @@ -12,7 +12,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: 2014-05-16 18:39+0000\n" -"PO-Revision-Date: 2014-05-17 23:42+0000\n" +"PO-Revision-Date: 2014-05-18 00:14+0000\n" "Last-Translator: unknwon_anonymous <jackjohnson0001(a)yahoo.com>\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" @@ -53,12 +53,12 @@ msgstr "Hier sind Ihre Brücken:" 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 "" +msgstr "Du hast das Abstimmungs-Limit überschritten. Immer mit der Ruhe. Der minimale Abstand zwischen Mails beträgt %s Stunden. Während dieser Zeit werden alle weiteren Mails ignoriert." #: lib/bridgedb/strings.py:25 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" -msgstr "" +msgstr "COMMANDs: (kombiniere COMMANDs um mehrere Optionen gleichzeitig anzugeben)" #: lib/bridgedb/strings.py:27 msgid "Welcome to BridgeDB!" @@ -90,7 +90,7 @@ msgstr "Öffentliche Schlüssel" msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." -msgstr "" +msgstr "Diese E-Mail wurde für %s am %s um %s mit Regenbogen, Einhörnern und Glitzer generiert." #: lib/bridgedb/strings.py:42 #, python-format @@ -125,7 +125,7 @@ msgstr "Was sind Brücken?" #: lib/bridgedb/strings.py:66 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." -msgstr "" +msgstr "%s Bridges %s sind Tor Relays, die dir helfen Zensur zu umgehen." #: lib/bridgedb/strings.py:71 msgid "I need an alternative way of getting bridges!" @@ -137,7 +137,7 @@ msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" "%s or %s." -msgstr "" +msgstr "Eine weitere Möglichkeit Bridges zu bekommen ist, eine E-Mail an %s zu senden. Bitte beachte, dass du die E-Mail von einem der folgenden Provider senden musst: %s oder %s." #: lib/bridgedb/strings.py:79 msgid "My bridges don't work! I need help!" @@ -146,7 +146,7 @@ msgstr "Meine Brücken funktionieren nicht! Ich brauche Hilfe!" #: lib/bridgedb/strings.py:80 #, python-format msgid "If your Tor doesn't work, you should email %s." -msgstr "" +msgstr "Sollte dein Tor nicht funktionieren, schicke eine E-Mail an %s." #: lib/bridgedb/strings.py:81 msgid "" @@ -165,11 +165,11 @@ msgstr "Brücken erhalten!" #: lib/bridgedb/strings.py:93 msgid "Please select options for bridge type:" -msgstr "" +msgstr "Bitte wähle Optionen für den Bridge-Typ:" #: lib/bridgedb/strings.py:94 msgid "Do you need IPv6 addresses?" -msgstr "" +msgstr "Benötigst du IPv6 Adressen?" #: lib/bridgedb/strings.py:95 #, python-format @@ -178,7 +178,7 @@ msgstr "" #: lib/bridgedb/strings.py:99 msgid "Your browser is not displaying images properly." -msgstr "" +msgstr "Bilder werden in deinem Browser nicht ordnungsgemäß dargestellt." #: lib/bridgedb/strings.py:100 msgid "Enter the characters from the image above..." @@ -186,7 +186,7 @@ msgstr "Bitte die Zeichen aus dem oberen Bild eingeben." #: lib/bridgedb/strings.py:104 msgid "How to start using your bridges" -msgstr "" +msgstr "Wie man Bridges verwendet" #: lib/bridgedb/strings.py:105 #, python-format @@ -205,7 +205,7 @@ msgstr "" msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" -msgstr "" +msgstr "Blockiert oder zensiert dein Provider (ISP) Verbindungen zum Tor-Netzwerk?" #: lib/bridgedb/strings.py:114 msgid "" @@ -225,7 +225,7 @@ msgstr "" #: lib/bridgedb/strings.py:124 msgid "Request IPv6 bridges." -msgstr "" +msgstr "IPv6 Bridges anfordern." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". #: lib/bridgedb/strings.py:126 @@ -234,7 +234,7 @@ msgstr "" #: lib/bridgedb/strings.py:127 msgid "Get a copy of BridgeDB's public GnuPG key." -msgstr "" +msgstr "Hole dir eine Kopie des öffentlichen GnuPG Schlüssels der BridgeDB." #: lib/bridgedb/templates/base.html:91 msgid "Report a Bug" @@ -258,7 +258,7 @@ msgstr "" #: lib/bridgedb/templates/bridges.html:70 msgid "There currently aren't any bridges available..." -msgstr "" +msgstr "Im Moment sind keine Bridges verfügbar..." #: lib/bridgedb/templates/bridges.html:71 #, python-format

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 18 May '14

18 May '14

commit 4a65ea3900f6c57b8769ec6c20f184f087e89636 Author: Translation commit bot <translation(a)torproject.org> Date: Sat May 17 23:45:03 2014 +0000 Update translations for bridgedb --- de/LC_MESSAGES/bridgedb.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/de/LC_MESSAGES/bridgedb.po b/de/LC_MESSAGES/bridgedb.po index e82300e..74bff41 100644 --- a/de/LC_MESSAGES/bridgedb.po +++ b/de/LC_MESSAGES/bridgedb.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# unknwon_anonymous <jackjohnson0001(a)yahoo.com>, 2014 # Locke <locke(a)dena-design.de>, 2011 # to_ba, 2013 # to_ba, 2014 @@ -11,8 +12,8 @@ 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-17 16:16+0000\n" -"Last-Translator: to_ba\n" +"PO-Revision-Date: 2014-05-17 23:42+0000\n" +"Last-Translator: unknwon_anonymous <jackjohnson0001(a)yahoo.com>\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -66,7 +67,7 @@ msgstr "Willkommen bei der Brückendatenbank!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". #: lib/bridgedb/strings.py:29 msgid "Currently supported transport TYPEs:" -msgstr "" +msgstr "Im Moment unterstützte transport TYPEs:" #: lib/bridgedb/strings.py:30 #, python-format

1 0

[tor-ramdisk/master] Add stack protector to kernel configs for amd64 and i686
by blueness＠torproject.org 18 May '14

18 May '14

commit 6bf885301e4caa9e8269f9704cb3c5eb736e97f2 Author: Anthony G. Basile <blueness(a)gentoo.org> Date: Sat May 17 17:45:30 2014 -0400 Add stack protector to kernel configs for amd64 and i686 --- configs/kernel-3.14.4.x86.config | 8 +++++++- configs/kernel-3.14.4.x86_64.config | 25 ++++++++++++++++++------- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/configs/kernel-3.14.4.x86.config b/configs/kernel-3.14.4.x86.config index 6e7c490..f9969d4 100644 --- a/configs/kernel-3.14.4.x86.config +++ b/configs/kernel-3.14.4.x86.config @@ -201,7 +201,13 @@ CONFIG_HAVE_CMPXCHG_LOCAL=y CONFIG_HAVE_CMPXCHG_DOUBLE=y CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y -# CONFIG_CC_STACKPROTECTOR is not set +CONFIG_HAVE_CC_STACKPROTECTOR=y +CONFIG_CC_STACKPROTECTOR=y +# CONFIG_CC_STACKPROTECTOR_NONE is not set +CONFIG_CC_STACKPROTECTOR_REGULAR=y +# CONFIG_CC_STACKPROTECTOR_STRONG is not set +CONFIG_HAVE_CONTEXT_TRACKING=y +CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y CONFIG_HAVE_ARCH_SOFT_DIRTY=y diff --git a/configs/kernel-3.14.4.x86_64.config b/configs/kernel-3.14.4.x86_64.config index d215d4e..7b39300 100644 --- a/configs/kernel-3.14.4.x86_64.config +++ b/configs/kernel-3.14.4.x86_64.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.13.8 Kernel Configuration +# Linux/x86 3.14.4 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -131,7 +131,6 @@ CONFIG_NAMESPACES=y # CONFIG_USER_NS is not set # CONFIG_PID_NS is not set # CONFIG_NET_NS is not set -# CONFIG_UIDGID_STRICT_TYPE_CHECKS is not set # CONFIG_SCHED_AUTOGROUP is not set # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_RELAY is not set @@ -205,6 +204,11 @@ CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y CONFIG_HAVE_CMPXCHG_LOCAL=y CONFIG_HAVE_CMPXCHG_DOUBLE=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y +CONFIG_HAVE_CC_STACKPROTECTOR=y +CONFIG_CC_STACKPROTECTOR=y +# CONFIG_CC_STACKPROTECTOR_NONE is not set +CONFIG_CC_STACKPROTECTOR_REGULAR=y +# CONFIG_CC_STACKPROTECTOR_STRONG is not set CONFIG_HAVE_CONTEXT_TRACKING=y CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y @@ -337,6 +341,7 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 # CONFIG_CLEANCACHE is not set # CONFIG_CMA is not set # CONFIG_ZBUD is not set +# CONFIG_ZSMALLOC is not set # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set CONFIG_X86_RESERVE_LOW=64 CONFIG_MTRR=y @@ -348,7 +353,6 @@ CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_RANDOM=y CONFIG_X86_SMAP=y # CONFIG_SECCOMP is not set -# CONFIG_CC_STACKPROTECTOR is not set CONFIG_HZ_100=y # CONFIG_HZ_250 is not set # CONFIG_HZ_300 is not set @@ -602,6 +606,7 @@ CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y # Intel MIC Card Driver # # CONFIG_INTEL_MIC_CARD is not set +# CONFIG_GENWQE is not set CONFIG_HAVE_IDE=y # CONFIG_IDE is not set @@ -907,6 +912,7 @@ CONFIG_KEYBOARD_ATKBD=y # Hardware I/O ports # CONFIG_SERIO=y +CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y CONFIG_SERIO_I8042=y # CONFIG_SERIO_SERPORT is not set # CONFIG_SERIO_CT82C710 is not set @@ -1006,6 +1012,7 @@ CONFIG_I2C_ALGOBIT=y # # I2C system bus drivers (mostly embedded / system-on-chip) # +# CONFIG_I2C_DESIGNWARE_PLATFORM is not set # CONFIG_I2C_DESIGNWARE_PCI is not set # CONFIG_I2C_EG20T is not set # CONFIG_I2C_OCORES is not set @@ -1217,6 +1224,7 @@ CONFIG_BCMA_POSSIBLE=y # CONFIG_MFD_88PM800 is not set # CONFIG_MFD_88PM805 is not set # CONFIG_MFD_88PM860X is not set +# CONFIG_MFD_MAX14577 is not set # CONFIG_MFD_MAX77686 is not set # CONFIG_MFD_MAX77693 is not set # CONFIG_MFD_MAX8907 is not set @@ -1236,6 +1244,7 @@ CONFIG_BCMA_POSSIBLE=y # CONFIG_MFD_STMPE is not set # CONFIG_MFD_SYSCON is not set # CONFIG_MFD_TI_AM335X_TSCADC is not set +# CONFIG_MFD_LP3943 is not set # CONFIG_MFD_LP8788 is not set # CONFIG_MFD_PALMAS is not set # CONFIG_TPS6105X is not set @@ -1325,6 +1334,7 @@ CONFIG_RTC_INTF_DEV=y # CONFIG_RTC_DRV_RS5C372 is not set # CONFIG_RTC_DRV_ISL1208 is not set # CONFIG_RTC_DRV_ISL12022 is not set +# CONFIG_RTC_DRV_ISL12057 is not set # CONFIG_RTC_DRV_X1205 is not set # CONFIG_RTC_DRV_PCF2127 is not set # CONFIG_RTC_DRV_PCF8523 is not set @@ -1422,7 +1432,7 @@ CONFIG_CLKBLD_I8253=y # CONFIG_VME_BUS is not set # CONFIG_PWM is not set # CONFIG_IPACK_BUS is not set -# CONFIG_RESET_CONTROLLER is not set +CONFIG_RESET_CONTROLLER=y # CONFIG_FMC is not set # @@ -1441,7 +1451,7 @@ CONFIG_FIRMWARE_MEMMAP=y # CONFIG_DCDBAS is not set # CONFIG_DMIID is not set # CONFIG_DMI_SYSFS is not set -# CONFIG_ISCSI_IBFT_FIND is not set +CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y # CONFIG_GOOGLE_FIRMWARE is not set # @@ -1595,7 +1605,7 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y CONFIG_DEBUG_MEMORY_INIT=y # CONFIG_DEBUG_PER_CPU_MAPS is not set CONFIG_HAVE_DEBUG_STACKOVERFLOW=y -# CONFIG_DEBUG_STACKOVERFLOW is not set +CONFIG_DEBUG_STACKOVERFLOW=y CONFIG_HAVE_ARCH_KMEMCHECK=y # CONFIG_KMEMCHECK is not set # CONFIG_DEBUG_SHIRQ is not set @@ -1607,6 +1617,7 @@ CONFIG_HAVE_ARCH_KMEMCHECK=y # CONFIG_DETECT_HUNG_TASK is not set # CONFIG_PANIC_ON_OOPS is not set CONFIG_PANIC_ON_OOPS_VALUE=0 +CONFIG_PANIC_TIMEOUT=0 # CONFIG_SCHED_DEBUG is not set # CONFIG_SCHEDSTATS is not set # CONFIG_TIMER_STATS is not set @@ -2044,6 +2055,6 @@ CONFIG_CPU_RMAP=y CONFIG_DQL=y CONFIG_NLATTR=y CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y -# CONFIG_AVERAGE is not set +CONFIG_AVERAGE=y # CONFIG_CORDIC is not set # CONFIG_DDR is not set

1 0