March 2012 - tor-commits - lists.torproject.org

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 24 Mar '12

24 Mar '12

commit 3c4fb19c988adcc10b94ac8f1e00c0f8a6f41103 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 24 19:15:12 2012 +0000 Update translations for vidalia_alpha --- fa/vidalia_fa.po | 88 +++++++++++++++++++++++++++--------------------------- 1 files changed, 44 insertions(+), 44 deletions(-) diff --git a/fa/vidalia_fa.po b/fa/vidalia_fa.po index 8e11879..0e1e892 100644 --- a/fa/vidalia_fa.po +++ b/fa/vidalia_fa.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-03-24 18:09+0000\n" +"PO-Revision-Date: 2012-03-24 19:14+0000\n" "Last-Translator: ms2222 <slander_mo(a)hotmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -510,15 +510,15 @@ msgstr "سوکت کنترل وصل نیست." msgctxt "ControlSocket" msgid "Error sending control command. [%1]" -msgstr "" +msgstr "خطا در ارسال دستورات کنترل[%1]" msgctxt "ControlSocket" msgid "Socket disconnected while attempting to read a line of data." -msgstr "" +msgstr "در حال تلاش برای خواندن یک خط از داده ها سوکت قطع شد" msgctxt "ControlSocket" msgid "Invalid control reply. [%1]" -msgstr "" +msgstr "پاسخ کنترلی نامعتبر. ‪[%1]‬" msgctxt "CountryInfo" msgid "Afghanistan" @@ -630,7 +630,7 @@ msgstr "" msgctxt "CountryInfo" msgid "Central African Republic" -msgstr "" +msgstr "جمهوری آفریقای مرکزی" msgctxt "CountryInfo" msgid "Chad" @@ -694,7 +694,7 @@ msgstr "" msgctxt "CountryInfo" msgid "Dominica" -msgstr "" +msgstr "دومنيكن" msgctxt "CountryInfo" msgid "Dominican Republic" @@ -738,7 +738,7 @@ msgstr "" msgctxt "CountryInfo" msgid "Georgia" -msgstr "" +msgstr "گرجستان" msgctxt "CountryInfo" msgid "Germany" @@ -898,7 +898,7 @@ msgstr "مولداوی" msgctxt "CountryInfo" msgid "Monaco" -msgstr "" +msgstr "موناكو" msgctxt "CountryInfo" msgid "Mongolia" @@ -946,7 +946,7 @@ msgstr "نیجر" msgctxt "CountryInfo" msgid "Nigeria" -msgstr "" +msgstr "نيجريه" msgctxt "CountryInfo" msgid "Norway" @@ -962,7 +962,7 @@ msgstr "پاکستان" msgctxt "CountryInfo" msgid "Palau" -msgstr "" +msgstr "پالائو" msgctxt "CountryInfo" msgid "Palestine" @@ -990,15 +990,15 @@ msgstr "" msgctxt "CountryInfo" msgid "Poland" -msgstr "" +msgstr "لهستان" msgctxt "CountryInfo" msgid "Portugal" -msgstr "" +msgstr "پرتغال" msgctxt "CountryInfo" msgid "Qatar" -msgstr "" +msgstr "قطر" msgctxt "CountryInfo" msgid "Romania" @@ -1226,7 +1226,7 @@ msgstr "آلبانیا" msgctxt "CountryInfo" msgid "Algeria" -msgstr "" +msgstr "الجزيره" msgctxt "CountryInfo" msgid "Austria" @@ -1302,7 +1302,7 @@ msgstr "لیبی" msgctxt "CountryInfo" msgid "Maldives" -msgstr "" +msgstr "مالديو" msgctxt "CountryInfo" msgid "Mexico" @@ -1391,19 +1391,19 @@ msgstr "مسیر تور را انتخاب کن" msgctxt "GeneralPage" msgid "You must specify the name of your Tor executable." -msgstr "" +msgstr "شما میبایست نام فایل اجرایی تُر را مشخص کنید." msgctxt "GeneralPage" msgid "Start Vidalia when my system starts" -msgstr "" +msgstr "آغاز ویدالیا زمانی که سیستم من روشن شد" msgctxt "GeneralPage" msgid "Browse" -msgstr "" +msgstr "انتخاب فایل" msgctxt "GeneralPage" msgid "Tor" -msgstr "" +msgstr "تُر" msgctxt "GeneralPage" msgid "Software Updates" @@ -1411,7 +1411,7 @@ msgstr "به روزرسانی های نرم افزار" msgctxt "GeneralPage" msgid "Check for new software updates automatically" -msgstr "" +msgstr "بررسی خودکار برای به روز رسانی‌های جدید" msgctxt "GeneralPage" msgid "Check Now" @@ -1423,19 +1423,19 @@ msgstr "بصورت اتوماتیک به تور وصل شو" msgctxt "GraphFrame" msgid "%1 KB/s" -msgstr "" +msgstr "%1 کیلوبایت در ثانیه" msgctxt "GraphFrame" msgid "%1 KB" -msgstr "" +msgstr "%1 کیلو بایت" msgctxt "GraphFrame" msgid "%1 MB" -msgstr "" +msgstr "%1 مگا‌بایت" msgctxt "GraphFrame" msgid "%1 GB" -msgstr "" +msgstr "%1 گیگا‌بایت" msgctxt "GraphFrame" msgid "Recv:" @@ -1451,19 +1451,19 @@ msgstr "" msgctxt "HelpBrowser" msgid "Search reached end of document" -msgstr "" +msgstr "جستجو به انتهای مطالب رسید" msgctxt "HelpBrowser" msgid "Search reached start of document" -msgstr "" +msgstr "حستجو به ابتدای مطالب رسید" msgctxt "HelpBrowser" msgid "Text not found in document" -msgstr "" +msgstr "متن مورد نظر در سند پیدا نشد" msgctxt "HelpBrowser" msgid "Found %1 results" -msgstr "" +msgstr "%1 نتیجه پیدا شد" msgctxt "HelpBrowser" msgid "Vidalia Help" @@ -1475,7 +1475,7 @@ msgstr "Back" msgctxt "HelpBrowser" msgid "Move to previous page (Backspace)" -msgstr "" +msgstr "حرکت به صفحه‌ قبلی (Backspace)" msgctxt "HelpBrowser" msgid "Backspace" @@ -1604,63 +1604,63 @@ msgstr "خطا در بازکردن فایل راهنما:" msgctxt "LicenseDialog" msgid "License Information" -msgstr "" +msgstr "اطلاعات مجوز" msgctxt "LicenseDialog" msgid "License" -msgstr "" +msgstr "مجوز" msgctxt "LicenseDialog" msgid "Credits" -msgstr "" +msgstr "اعتبارات" msgctxt "LogEvent" msgid "Debug" -msgstr "" +msgstr "خطا زدایی" msgctxt "LogEvent" msgid "Info" -msgstr "" +msgstr "اطلاعات" msgctxt "LogEvent" msgid "Notice" -msgstr "" +msgstr "توجه" msgctxt "LogEvent" msgid "Warning" -msgstr "" +msgstr "هشدار" msgctxt "LogEvent" msgid "Error" -msgstr "" +msgstr "خطا" msgctxt "LogEvent" msgid "Unknown" -msgstr "" +msgstr "ناشناخته" msgctxt "LogTreeItem" msgid "Debug" -msgstr "" +msgstr "خطا زدایی" msgctxt "LogTreeItem" msgid "Info" -msgstr "" +msgstr "اطلاعات" msgctxt "LogTreeItem" msgid "Notice" -msgstr "" +msgstr "توجه" msgctxt "LogTreeItem" msgid "Warning" -msgstr "" +msgstr "هشدار" msgctxt "LogTreeItem" msgid "Error" -msgstr "" +msgstr "خطا" msgctxt "LogTreeItem" msgid "Unknown" -msgstr "" +msgstr "انا" msgctxt "MainWindow" msgid "Start Tor"

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 24 Mar '12

24 Mar '12

commit 6e4b1c0ceca05f01173d00bbb9ae0baa57b33526 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 24 18:15:12 2012 +0000 Update translations for vidalia_alpha --- fa/vidalia_fa.po | 96 +++++++++++++++++++++++++++--------------------------- 1 files changed, 48 insertions(+), 48 deletions(-) diff --git a/fa/vidalia_fa.po b/fa/vidalia_fa.po index 226bff0..8e11879 100644 --- a/fa/vidalia_fa.po +++ b/fa/vidalia_fa.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-03-24 17:27+0000\n" +"PO-Revision-Date: 2012-03-24 18:09+0000\n" "Last-Translator: ms2222 <slander_mo(a)hotmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -1030,7 +1030,7 @@ msgstr "" msgctxt "CountryInfo" msgid "San Marino" -msgstr "" +msgstr "سن مارینو" msgctxt "CountryInfo" msgid "Sao Tome & Principe" @@ -1042,11 +1042,11 @@ msgstr "" msgctxt "CountryInfo" msgid "Senegal" -msgstr "" +msgstr "سنگال" msgctxt "CountryInfo" msgid "Serbia" -msgstr "" +msgstr "صربستان" msgctxt "CountryInfo" msgid "Seychelles" @@ -1098,11 +1098,11 @@ msgstr "" msgctxt "CountryInfo" msgid "Swaziland" -msgstr "" +msgstr "سوئیس" msgctxt "CountryInfo" msgid "Sweden" -msgstr "" +msgstr "سوئد" msgctxt "CountryInfo" msgid "Switzerland" @@ -1194,7 +1194,7 @@ msgstr "واتیکان" msgctxt "CountryInfo" msgid "Venezuela" -msgstr "" +msgstr "ونزوئلا" msgctxt "CountryInfo" msgid "Vietnam" @@ -1254,51 +1254,51 @@ msgstr "" msgctxt "CountryInfo" msgid "Greece" -msgstr "" +msgstr "یونان" msgctxt "CountryInfo" msgid "Guam" -msgstr "" +msgstr "گوام" msgctxt "CountryInfo" msgid "Hungary" -msgstr "" +msgstr "مجارستان" msgctxt "CountryInfo" msgid "Iceland" -msgstr "" +msgstr "ایسلند" msgctxt "CountryInfo" msgid "India" -msgstr "" +msgstr "هند" msgctxt "CountryInfo" msgid "Indonesia" -msgstr "" +msgstr "اندونزی" msgctxt "CountryInfo" msgid "Iran" -msgstr "" +msgstr "ایران" msgctxt "CountryInfo" msgid "Iraq" -msgstr "" +msgstr "عراق" msgctxt "CountryInfo" msgid "Ireland" -msgstr "" +msgstr "ایرلند" msgctxt "CountryInfo" msgid "Korea, North" -msgstr "" +msgstr "کره شمالی" msgctxt "CountryInfo" msgid "Korea, South" -msgstr "" +msgstr "کره جنوبی" msgctxt "CountryInfo" msgid "Libya" -msgstr "" +msgstr "لیبی" msgctxt "CountryInfo" msgid "Maldives" @@ -1306,41 +1306,41 @@ msgstr "" msgctxt "CountryInfo" msgid "Mexico" -msgstr "" +msgstr "مکزیک" msgctxt "CountryInfo" msgid "Myanmar" -msgstr "" +msgstr "میانمار" msgctxt "CountryInfo" msgid "Taiwan" -msgstr "" +msgstr "تایوان" msgctxt "CrashReportDialog" msgid "Submit a Crash Report" -msgstr "" +msgstr "ارسال گزارش سقوط" msgctxt "CrashReportDialog" msgid "Vidalia encountered an error and needed to close" -msgstr "" +msgstr "ویدالیا با یک خطا روبرو شده و نیاز به بسته شدن دارد" msgctxt "CrashReportDialog" msgid "Restart Vidalia" -msgstr "" +msgstr "شروع دوباره ویدالیا" msgctxt "CrashReportDialog" msgid "Don't Restart" -msgstr "" +msgstr "شروع دوباره نکن" msgctxt "CrashReportDialog" msgid "Unable to restart Vidalia" -msgstr "" +msgstr "ویدالیا قادر به شروع دوباره نیست" msgctxt "CrashReportDialog" msgid "" "We were unable to automatically restart Vidalia. Please restart Vidalia " "manually." -msgstr "" +msgstr "ما قادر به شروع دوباره ویدالیا نیستیم.لطفا به صورت دستی ویدالیا را دوباره شروع کنید" msgctxt "CrashReportDialog" msgid "Please fill a ticket in:" @@ -1383,11 +1383,11 @@ msgstr "" msgctxt "GeneralPage" msgid "Executables (*.exe)" -msgstr "" +msgstr "اجرایی ها(*.exe)" msgctxt "GeneralPage" msgid "Select Path to Tor" -msgstr "" +msgstr "مسیر تور را انتخاب کن" msgctxt "GeneralPage" msgid "You must specify the name of your Tor executable." @@ -1668,75 +1668,75 @@ msgstr "" msgctxt "MainWindow" msgid "Exit" -msgstr "" +msgstr "خروج" msgctxt "MainWindow" msgid "Bandwidth Graph" -msgstr "" +msgstr "نمودار پهنای باند" msgctxt "MainWindow" msgid "Message Log" -msgstr "" +msgstr "گزارش پیام ها" msgctxt "MainWindow" msgid "Network Map" -msgstr "" +msgstr "نقشه شبکه" msgctxt "MainWindow" msgid "Control Panel" -msgstr "" +msgstr "تابلوی کنترل" msgctxt "MainWindow" msgid "Settings" -msgstr "" +msgstr "تنظیمات" msgctxt "MainWindow" msgid "About" -msgstr "" +msgstr "درباره" msgctxt "MainWindow" msgid "Help" -msgstr "" +msgstr "کمک" msgctxt "MainWindow" msgid "Tor" -msgstr "" +msgstr "تُر" msgctxt "MainWindow" msgid "View" -msgstr "" +msgstr "نمایش" msgctxt "MainWindow" msgid "Connecting to a relay directory" -msgstr "" +msgstr "اتصال به یک فهرست بازپخش" msgctxt "MainWindow" msgid "Establishing an encrypted directory connection" -msgstr "" +msgstr "برپایی یک اتصال فهرست رمزبندی شده" msgctxt "MainWindow" msgid "Retrieving network status" -msgstr "" +msgstr "بازیابی وضیعت شبکه" msgctxt "MainWindow" msgid "Loading network status" -msgstr "" +msgstr "بارگذاری وضیعت شبکه" msgctxt "MainWindow" msgid "Loading authority certificates" -msgstr "" +msgstr "بارگذاری مجوز ها" msgctxt "MainWindow" msgid "Requesting relay information" -msgstr "" +msgstr "درخواست اطلاعات باز پخش" msgctxt "MainWindow" msgid "Loading relay information" -msgstr "" +msgstr "بارگذاری اطلاعات بازپخش" msgctxt "MainWindow" msgid "Connecting to the Tor network" -msgstr "" +msgstr "درحال اتصال به شبکه تُر" msgctxt "MainWindow" msgid "Establishing a Tor circuit"

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 24 Mar '12

24 Mar '12

commit 89f3a558f0d7e5a2b607af8963b11badd1069827 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 24 17:45:11 2012 +0000 Update translations for vidalia_alpha --- fa/vidalia_fa.po | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/fa/vidalia_fa.po b/fa/vidalia_fa.po index 4526f87..226bff0 100644 --- a/fa/vidalia_fa.po +++ b/fa/vidalia_fa.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-03-22 10:31+0000\n" +"PO-Revision-Date: 2012-03-24 17:27+0000\n" "Last-Translator: ms2222 <slander_mo(a)hotmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -582,7 +582,7 @@ msgstr "" msgctxt "CountryInfo" msgid "Bolivia" -msgstr "" +msgstr "بولیوی" msgctxt "CountryInfo" msgid "Bosnia & Herzegovina" @@ -602,7 +602,7 @@ msgstr "" msgctxt "CountryInfo" msgid "Bulgaria" -msgstr "" +msgstr "بلغارستان" msgctxt "CountryInfo" msgid "Burkina Faso" @@ -614,7 +614,7 @@ msgstr "" msgctxt "CountryInfo" msgid "Cambodia" -msgstr "" +msgstr "کامبوج" msgctxt "CountryInfo" msgid "Cameroon" @@ -746,7 +746,7 @@ msgstr "آلمان" msgctxt "CountryInfo" msgid "Ghana" -msgstr "" +msgstr "غنا" msgctxt "CountryInfo" msgid "Grenada" @@ -802,7 +802,7 @@ msgstr "اردن" msgctxt "CountryInfo" msgid "Kazakhstan" -msgstr "" +msgstr "قزاقستان" msgctxt "CountryInfo" msgid "Kenya" @@ -822,7 +822,7 @@ msgstr "" msgctxt "CountryInfo" msgid "Laos" -msgstr "" +msgstr "لائوس" msgctxt "CountryInfo" msgid "Latvia" @@ -894,7 +894,7 @@ msgstr "" msgctxt "CountryInfo" msgid "Moldova" -msgstr "" +msgstr "مولداوی" msgctxt "CountryInfo" msgid "Monaco" @@ -1002,11 +1002,11 @@ msgstr "" msgctxt "CountryInfo" msgid "Romania" -msgstr "" +msgstr "رومانی" msgctxt "CountryInfo" msgid "Russia" -msgstr "" +msgstr "روسیه" msgctxt "CountryInfo" msgid "Rwanda"

1 0

[vidalia/alpha] Make relative paths relative to Vidalia's binary path
by chiiph＠torproject.org 24 Mar '12

24 Mar '12

commit d718bfe5b91ab7f944727e1f34c8f1717818f2f1 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sat Mar 24 12:58:04 2012 -0300 Make relative paths relative to Vidalia's binary path --- src/vidalia/MainWindow.cpp | 7 ++++++- src/vidalia/config/TorSettings.cpp | 12 ++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index c0321d5..b203b84 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -635,6 +635,8 @@ MainWindow::start() /* Specify Tor's data directory, if different from the default */ QString dataDirectory = settings.getDataDirectory(); + if(QDir(dataDirectory).isRelative()) + dataDirectory = QCoreApplication::applicationDirPath() + "/" + dataDirectory; QString expDataDirectory = expand_filename(dataDirectory); if(settings.getControlMethod() == ControlMethod::Port) { @@ -681,7 +683,10 @@ MainWindow::start() * start. */ _isIntentionalExit = true; /* Kick off the Tor process */ - _torControl->start(settings.getExecutable(), args); + QString torExecutable = settings.getExecutable(); + if(QDir(QFileInfo(torExecutable).filePath()).isRelative()) + torExecutable = QCoreApplication::applicationDirPath() + "/" + torExecutable; + _torControl->start(torExecutable, args); QString errmsg; while(not _torControl->isRunning()) { diff --git a/src/vidalia/config/TorSettings.cpp b/src/vidalia/config/TorSettings.cpp index 0a7b2d1..fe7e4c1 100644 --- a/src/vidalia/config/TorSettings.cpp +++ b/src/vidalia/config/TorSettings.cpp @@ -202,7 +202,11 @@ TorSettings::getTorrc() const TorControl *tc = torControl(); if (tc && tc->isConnected() && tc->getInfo("config-file", torrc)) return QDir::convertSeparators(torrc); - return QDir::convertSeparators(localValue(SETTING_TORRC).toString()); + + torrc = localValue(SETTING_TORRC).toString(); + if(QDir(QFileInfo(torrc).filePath()).isRelative()) + torrc = QCoreApplication::applicationDirPath() + "/" + torrc; + return QDir::convertSeparators(torrc); } /** Sets the torrc that will be used when starting Tor. @@ -222,7 +226,11 @@ TorSettings::getDefaultsTorrc() const // TorControl *tc = torControl(); // if (tc && tc->isConnected() && tc->getInfo("config-file", torrc)) // return QDir::convertSeparators(torrc); - return QDir::convertSeparators(localValue(SETTING_DEFAULTS_TORRC).toString()); + + torrc = localValue(SETTING_DEFAULTS_TORRC).toString(); + if(QDir(QFileInfo(torrc).filePath()).isRelative()) + torrc = QCoreApplication::applicationDirPath() + "/" + torrc; + return QDir::convertSeparators(torrc); } /** Sets the defaults torrc that will be used when starting Tor.

1 0

[vidalia/alpha] option to filter message log by search term
by chiiph＠torproject.org 24 Mar '12

24 Mar '12

commit 69f9bd84027043bfd87f749d4e61ccd5bdfdb1c1 Author: Sebastian Baginski <sebthestampede(a)gmail.com> Date: Sat Mar 24 00:51:49 2012 +0100 option to filter message log by search term --- changes/bug2733 | 2 + src/vidalia/CMakeLists.txt | 1 + src/vidalia/log/LogFilter.cpp | 241 +++++++++++++++++++++++++++++++++++++ src/vidalia/log/LogFilter.h | 70 +++++++++++ src/vidalia/log/LogTreeWidget.cpp | 16 ++- src/vidalia/log/LogTreeWidget.h | 13 +- src/vidalia/log/MessageLog.cpp | 65 ++++++++++- src/vidalia/log/MessageLog.h | 14 ++- src/vidalia/log/MessageLog.ui | 29 ++++- 9 files changed, 428 insertions(+), 23 deletions(-) diff --git a/changes/bug2733 b/changes/bug2733 new file mode 100644 index 0000000..c11dcb6 --- /dev/null +++ b/changes/bug2733 @@ -0,0 +1,2 @@ + o Add option to use search query as message log filter. Fixes + ticket 2733. \ No newline at end of file diff --git a/src/vidalia/CMakeLists.txt b/src/vidalia/CMakeLists.txt index c399df0..86f755a 100644 --- a/src/vidalia/CMakeLists.txt +++ b/src/vidalia/CMakeLists.txt @@ -303,6 +303,7 @@ set(vidalia_SRCS ${vidalia_SRCS} log/StatusEventItem.cpp log/StatusEventItemDelegate.cpp log/StatusEventWidget.cpp + log/LogFilter.cpp ) qt4_wrap_cpp(vidalia_SRCS log/LogFile.h diff --git a/src/vidalia/log/LogFilter.cpp b/src/vidalia/log/LogFilter.cpp new file mode 100644 index 0000000..d7b64d6 --- /dev/null +++ b/src/vidalia/log/LogFilter.cpp @@ -0,0 +1,241 @@ +/* +** This file is part of Vidalia, and is subject to the license terms in the +** LICENSE file, found in the top level directory of this distribution. If you +** did not receive the LICENSE file with this file, you may obtain it from the +** Vidalia source package distributed by the Vidalia Project at +** http://www.torproject.org/projects/vidalia.html. No part of Vidalia, +** including this file, may be copied, modified, propagated, or distributed +** except according to the terms described in the LICENSE file. +*/ + +/* +** \file LogFilter.cpp +** \brief Object used to filter message log history +*/ + +#include "LogFilter.h" +#include <QStack> + +/** Constructor taking severity as argument. */ +LogFilter::LogFilter(uint filter) + : _filter(filter) +{ +} + +/** Default destructor. */ +LogFilter::~LogFilter() +{ +} + +/** Evaluate if message should be included into log history. + * \param type Message severity + * \param message Message + */ +bool +LogFilter::eval(tc::Severity type, const QString &message) const +{ + Q_UNUSED(message); + return (_filter & (uint)type); +} + +/** Constructor regular expression and severity. */ +LogFilterRegExp::LogFilterRegExp(const QRegExp &exp, uint filter) + :LogFilter(filter) + ,_regExp(exp) +{ + +} + +/** Evaluate if message should be included into log history. + * \param type Message severity + * \param message Message + */ +bool +LogFilterRegExp::eval(tc::Severity type, const QString &message) const +{ + if (LogFilter::eval(type, message)) + return _regExp.isValid() ? message.contains(_regExp) : true; + return false; +} + +/** Helper class for search expression tree. */ +class LogFilterSearchTerm::ExpTree { +public: + ExpTree(const QString& value=QString()) + { + _value = value; + _left = NULL; + _right = NULL; + _invert = false; + } + + ~ExpTree() + { + if (_left) + delete _left; + if (_right) + delete _right; + } + + bool eval(const QString& input) + { + if (_value.isEmpty()) + return true; + bool result; + if (_value == "|") { + if (!_left || !_right) + return false; + result = _left->eval(input) || _right->eval(input); + } else if (_value == "&") { + if (!_left || !_right) + return false; + result = _left->eval(input) && _right->eval(input); + } else { + result = input.contains(_value); + } + return _invert ? !result : result; + } + +private: + /** Stores the value of this node, can be a string or operator. */ + QString _value; + /** Remembers if the result of this node evaluation should be inverted. */ + bool _invert; + /** Left child node. */ + ExpTree * _left; + /** Right child node. */ + ExpTree * _right; + + friend class LogFilterSearchTerm; +}; + +/** Constructor taking search term and severity as arguments. */ +LogFilterSearchTerm::LogFilterSearchTerm(const QString &term, uint filter) + :LogFilter(filter) + ,_expressionTree(NULL) +{ + parseString(term); +} + +/** Default destructor. */ +LogFilterSearchTerm::~LogFilterSearchTerm() +{ + if (_expressionTree) + delete _expressionTree; +} + +/** Evaluate if message should be included into log history. + * \param type Message severity + * \param msg Message + */ +bool +LogFilterSearchTerm::eval(tc::Severity type, const QString &msg) const +{ + if (LogFilter::eval(type, msg)) + return _expressionTree->eval(msg); + return false; +} + +/** Helper method that inserts string into list and clears it. */ +void +addToQueue(QList<QString>& queue, QString& token) +{ + if (!token.isEmpty()) { + queue.append(token); + token.clear(); + } +} + +/** Helper method used to parse input string and create regular expression. + * It uses 'Shunting-yard algorithm' to build reverse polish notation of + * the input expression. This output is then converted to expression tree + * for evaluation. + */ +void +LogFilterSearchTerm::parseString(const QString& input) +{ + QStack<QString> stack; /* Stack for operators */ + QList<QString> outputQueue; /* RPN output */ + QString pattern = input; + pattern.replace("OR","|"); + pattern.replace("AND","&"); + pattern.replace("NOT","!"); + + /* Step 1: create RPN of input expression. */ + QString token; + foreach (const QChar& c, pattern) { + if (c.isSpace()) + continue; + if (c=='!' || c=='&' || c=='|') { + addToQueue(outputQueue, token); + /* Checking operator precedence with op on top of the stack. */ + while (!stack.isEmpty()) { + QString op = stack.top(); + if (c=='&' || c=='|') { + if (op=="!") { + addToQueue(outputQueue, op); + stack.pop(); + } else { + break; + } + } else { + break; + } + } + stack.push(c); + } else if (c=='(') { + addToQueue(outputQueue, token); + stack.push(c); + } else if (c==')') { + addToQueue(outputQueue, token); + while (!stack.isEmpty()) { + QString tmp = stack.pop(); + if (tmp=="(") { + break; + } else { + addToQueue(outputQueue, tmp); + } + } + } else { + token += c; + } + } + addToQueue(outputQueue, token); + while (!stack.isEmpty()) { + QString top = stack.pop(); + addToQueue(outputQueue, top); + } + + /* Step 2: convert RPN expression to binary tree. */ + QStack<ExpTree*> tree; + foreach (QString s, outputQueue) { + if (s == "!") { + if (tree.isEmpty()) { + break; + } + ExpTree * top = tree.top(); + top->_invert = !top->_invert; + } else if (s == "&" || s == "|") { + if (tree.count() < 2) { + qDeleteAll(tree); + tree.clear(); + break; + } + ExpTree * node = new ExpTree(s); + node->_left = tree.pop(); + node->_right = tree.pop(); + tree.push(node); + } else { + tree.push(new ExpTree(s)); + } + } + if (_expressionTree) + delete _expressionTree; + /* If everything is ok, there should be only one item left on stack */ + if (tree.count() == 1) { + _expressionTree = tree.top(); + } else { + qDeleteAll(tree); + _expressionTree = new ExpTree(); + } +} diff --git a/src/vidalia/log/LogFilter.h b/src/vidalia/log/LogFilter.h new file mode 100644 index 0000000..f1bb415 --- /dev/null +++ b/src/vidalia/log/LogFilter.h @@ -0,0 +1,70 @@ +/* +** This file is part of Vidalia, and is subject to the license terms in the +** LICENSE file, found in the top level directory of this distribution. If you +** did not receive the LICENSE file with this file, you may obtain it from the +** Vidalia source package distributed by the Vidalia Project at +** http://www.torproject.org/projects/vidalia.html. No part of Vidalia, +** including this file, may be copied, modified, propagated, or distributed +** except according to the terms described in the LICENSE file. +*/ + +/* +** \file LogFilter.h +** \brief Object used to filter message log history +*/ + +#ifndef _LOGFILTER_H +#define _LOGFILTER_H + +#include "tcglobal.h" +#include <QRegExp> + +/** Base class for objects used to filter log history. */ +class LogFilter { + +public: + /** Constructor taking severity filter as argument. */ + LogFilter(uint filter); + virtual ~LogFilter(); + /** Method used to evaluate given log message. */ + virtual bool eval(tc::Severity type, const QString& message) const; + +private: + /** Stores severity filter */ + uint _filter; +}; + + +/** Message filter based on regular expression. */ +class LogFilterRegExp : public LogFilter { + +public: + LogFilterRegExp(const QRegExp& exp, uint filter); + bool eval(tc::Severity type, const QString &message) const; + +private: + /** Stores regular expression used to filter messages. */ + QRegExp _regExp; +}; + + +/** Message filter based on simple search query. */ +class LogFilterSearchTerm : public LogFilter { + +public: + LogFilterSearchTerm(const QString& term, uint filter); + ~LogFilterSearchTerm(); + bool eval(tc::Severity type, const QString &message) const; + +private: + class ExpTree; + + /** Helper method used to create expression tree from given query. */ + void parseString(const QString& input); + + /** Stores the expression tree for filtering messages. */ + ExpTree * _expressionTree; +}; + +#endif + diff --git a/src/vidalia/log/LogTreeWidget.cpp b/src/vidalia/log/LogTreeWidget.cpp index eb20bea..2b8aeb2 100644 --- a/src/vidalia/log/LogTreeWidget.cpp +++ b/src/vidalia/log/LogTreeWidget.cpp @@ -60,7 +60,7 @@ LogTreeWidget::verticalSliderReleased() /** Cast a QList of QTreeWidgetItem pointers to a list of LogTreeWidget * pointers. There really must be a better way to do this. */ QList<LogTreeItem *> -LogTreeWidget::qlist_cast(QList<QTreeWidgetItem *> inlist) +LogTreeWidget::qlist_cast(QList<QTreeWidgetItem *> inlist) const { QList<LogTreeItem *> outlist; foreach (QTreeWidgetItem *item, inlist) { @@ -71,7 +71,7 @@ LogTreeWidget::qlist_cast(QList<QTreeWidgetItem *> inlist) /** Sorts the list of pointers to log tree items by timestamp. */ QList<LogTreeItem *> -LogTreeWidget::qlist_sort(QList<LogTreeItem *> inlist) +LogTreeWidget::qlist_sort(QList<LogTreeItem *> inlist) const { QMap<quint32, LogTreeItem *> outlist; foreach (LogTreeItem *item, inlist) { @@ -106,7 +106,7 @@ LogTreeWidget::clearMessages() /** Returns a list of all currently selected items. */ QStringList -LogTreeWidget::selectedMessages() +LogTreeWidget::selectedMessages() const { QStringList messages; @@ -123,7 +123,7 @@ LogTreeWidget::selectedMessages() /** Returns a list of all items in the tree. */ QStringList -LogTreeWidget::allMessages() +LogTreeWidget::allMessages() const { QStringList messages; @@ -229,12 +229,16 @@ LogTreeWidget::addLogTreeItem(LogTreeItem *item) /** Filters the message log based on the given filter. */ void -LogTreeWidget::filter(uint filter) +LogTreeWidget::filter(LogFilter * filter) { + if (!filter) { + return; + } int itemsShown = 0; for (int i = _itemHistory.size()-1; i >= 0; i--) { LogTreeItem *item = _itemHistory.at(i); - if ((itemsShown < _maxItemCount) && (filter & item->severity())) { + tc::Severity type = item->severity(); + if ((itemsShown < _maxItemCount) && filter->eval(type,item->message())) { itemsShown++; } else { int itemIndex = indexOfTopLevelItem(item); diff --git a/src/vidalia/log/LogTreeWidget.h b/src/vidalia/log/LogTreeWidget.h index 298038d..c87f3d4 100644 --- a/src/vidalia/log/LogTreeWidget.h +++ b/src/vidalia/log/LogTreeWidget.h @@ -17,6 +17,7 @@ #define _LOGTREEWIDGET_H #include "LogTreeItem.h" +#include "LogFilter.h" #include "TorControl.h" @@ -44,9 +45,9 @@ public: LogTreeWidget(QWidget *parent = 0); /** Returns a list of all currently selected messages. */ - QStringList selectedMessages(); + QStringList selectedMessages() const; /** Returns a list of all messages in the tree. */ - QStringList allMessages(); + QStringList allMessages() const; /** Deselects all currently selected messages. */ void deselectAll(); @@ -55,8 +56,8 @@ public: /** Sets the maximum number of items in the tree. */ void setMaximumMessageCount(int max); /** Filters the log according to the specified filter. */ - void filter(uint filter); - + void filter(LogFilter * filter); + /** Adds a log item to the tree. */ LogTreeItem* log(tc::Severity severity, const QString &message); @@ -79,9 +80,9 @@ private: /** Adds item as a top-level item in the tree. */ void addLogTreeItem(LogTreeItem *item); /** Casts a QList of one pointer type to another. */ - QList<LogTreeItem *> qlist_cast(QList<QTreeWidgetItem *> inlist); + QList<LogTreeItem *> qlist_cast(QList<QTreeWidgetItem *> inlist) const; /** Sortrs a QList of pointers to tree items. */ - QList<LogTreeItem *> qlist_sort(QList<LogTreeItem *> inlist); + QList<LogTreeItem *> qlist_sort(QList<LogTreeItem *> inlist) const; /**< List of pointers to all log message items currently in the tree. */ QList<LogTreeItem *> _itemHistory; diff --git a/src/vidalia/log/MessageLog.cpp b/src/vidalia/log/MessageLog.cpp index 2da0d32..f4bfe07 100644 --- a/src/vidalia/log/MessageLog.cpp +++ b/src/vidalia/log/MessageLog.cpp @@ -30,6 +30,7 @@ /* Message log settings */ #define SETTING_MSG_FILTER "MessageFilter" +#define SETTING_FILTER_TERM "MessageFilterSearchTerm" #define SETTING_MAX_MSG_COUNT "MaxMsgCount" #define SETTING_ENABLE_LOGFILE "EnableLogFile" #define SETTING_LOGFILE "LogFile" @@ -45,6 +46,7 @@ #else #define DEFAULT_LOGFILE (QDir::homePath() + "/.tor/tor-log.txt") #endif +#define DEFAULT_FILTER_TERM "" #define ADD_TO_FILTER(f,v,b) (f = ((b) ? ((f) | (v)) : ((f) & ~(v)))) @@ -58,6 +60,7 @@ */ MessageLog::MessageLog(QStatusBar *st, QWidget *parent) : VidaliaTab(tr("Message Log"), "MessageLog", parent), + _logFilter(NULL), _statusBar(st) { /* Invoke Qt Designer generated QObject setup routine */ @@ -89,6 +92,8 @@ MessageLog::MessageLog(QStatusBar *st, QWidget *parent) MessageLog::~MessageLog() { _logFile.close(); + if (_logFilter) + delete _logFilter; } /** Binds events (signals) to actions (slots). */ @@ -162,6 +167,13 @@ MessageLog::setToolTips() "during normal Tor operation.")); ui.chkTorDebug->setToolTip(tr("Hyper-verbose messages primarily of \n" "interest to Tor developers.")); + ui.chkFilterSearch->setToolTip(tr("Custom filter based on search term.")); + ui.lineSearchTerm->setToolTip(tr("Here you can type a search term used \n" + "to filter log messages. Recognized " + "keywords: \nNOT, AND, OR.\n" + "You can use brackets for grouping.\n" + "To input regular expression in perl\n" + "syntax, use \\r prefix.")); } /** Called when the user changes the UI translation. */ @@ -201,9 +213,16 @@ MessageLog::loadSettings() ui.chkTorDebug->setChecked(_filter & tc::DebugSeverity); registerLogEvents(); + /* Load custom search term filter */ + const QString term = getSetting(SETTING_FILTER_TERM, DEFAULT_FILTER_TERM) + .toString(); + ui.chkFilterSearch->setChecked(!term.isEmpty()); + ui.lineSearchTerm->setText(term); + buildMessageFilter(term); + /* Filter the message log */ QApplication::setOverrideCursor(Qt::WaitCursor); - ui.listMessages->filter(_filter); + ui.listMessages->filter(_logFilter); QApplication::restoreOverrideCursor(); } @@ -290,9 +309,17 @@ MessageLog::saveSettings() saveSetting(SETTING_MSG_FILTER, filter); registerLogEvents(); + /* Save search term filter */ + QString term; + if (ui.chkFilterSearch->isChecked()) { + term = ui.lineSearchTerm->text(); + } + saveSetting(SETTING_FILTER_TERM, term); + buildMessageFilter(term); + /* Filter the message log */ QApplication::setOverrideCursor(Qt::WaitCursor); - ui.listMessages->filter(_filter); + ui.listMessages->filter(_logFilter); QApplication::restoreOverrideCursor(); /* Hide the settings frame and reset toggle button*/ @@ -438,6 +465,18 @@ MessageLog::find() } } +/** Tests if message should be added to the Message History. + * \param severity The message's severity type. + * \param message The log message to be tested. + */ +bool +MessageLog::testMessage(tc::Severity severity, const QString &message) const +{ + if (_logFilter) + return _logFilter->eval(severity, message); + return true; +} + /** Writes a message to the Message History and tags it with * the proper date, time and type. * \param type The message's severity type. @@ -448,7 +487,7 @@ MessageLog::log(tc::Severity type, const QString &message) { setUpdatesEnabled(false); /* Only add the message if it's not being filtered out */ - if (_filter & (uint)type) { + if (testMessage(type, message)) { /* Add the message to the list and scroll to it if necessary. */ LogTreeItem *item = ui.listMessages->log(type, message); @@ -477,3 +516,23 @@ MessageLog::help() emit helpRequested("log"); } +/** Create regular expression used to filter incoming log messages. + * \param input String used to create reg exp. + */ +void +MessageLog::buildMessageFilter(const QString &input) +{ + if (_logFilter) + delete _logFilter; + + if (input.isEmpty()) { + _logFilter = new LogFilter(_filter); + } else if (input.startsWith("\\r")) { + QString pattern = input; + pattern.remove(0,2); + const QRegExp rx(pattern.trimmed(), Qt::CaseSensitive, QRegExp::RegExp); + _logFilter = new LogFilterRegExp(rx, _filter); + } else { + _logFilter = new LogFilterSearchTerm(input, _filter); + } +} diff --git a/src/vidalia/log/MessageLog.h b/src/vidalia/log/MessageLog.h index 2cb5936..67772e5 100644 --- a/src/vidalia/log/MessageLog.h +++ b/src/vidalia/log/MessageLog.h @@ -78,16 +78,22 @@ private: void save(const QStringList &messages); /** Rotates the log file based on the filename and the current logging status. */ bool rotateLogFile(const QString &filename); + /** Test if given log message should be included into message history. */ + bool testMessage(tc::Severity severity, const QString& message) const; + /** Create filter for log messages. */ + void buildMessageFilter(const QString& input); /** A pointer to a TorControl object, used to register for log events */ TorControl* _torControl; /** A VidaliaSettings object that handles getting/saving settings **/ VidaliaSettings* _settings; - /** Stores the current message filter */ + /** Stores the current message severity filter */ uint _filter; - /** Set to true if we will log all messages to a file. */ - bool _enableLogging; - /* The log file used to store log messages. */ + /** Stores message filter */ + LogFilter* _logFilter; + /** Set to true if we will log all messages to a file. */ + bool _enableLogging; + /** The log file used to store log messages. */ LogFile _logFile; QStatusBar *_statusBar; diff --git a/src/vidalia/log/MessageLog.ui b/src/vidalia/log/MessageLog.ui index c72c0ba..029e933 100644 --- a/src/vidalia/log/MessageLog.ui +++ b/src/vidalia/log/MessageLog.ui @@ -6,7 +6,7 @@ <rect> <x>0</x> <y>0</y> - <width>534</width> + <width>540</width> <height>521</height> </rect> </property> @@ -155,7 +155,7 @@ </layout> </item> <item row="0" column="0" rowspan="2"> - <widget class="QGroupBox" name="groupBox"> + <widget class="QGroupBox" name="grpLogFilter"> <property name="contextMenuPolicy"> <enum>Qt::NoContextMenu</enum> </property> @@ -251,11 +251,32 @@ </property> </widget> </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QCheckBox" name="chkFilterSearch"> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="lineSearchTerm"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + </widget> + </item> + </layout> + </item> </layout> </widget> </item> <item row="0" column="1"> - <widget class="QGroupBox" name="grou"> + <widget class="QGroupBox" name="grpLogHistory"> <property name="contextMenuPolicy"> <enum>Qt::NoContextMenu</enum> </property> @@ -308,7 +329,7 @@ </widget> </item> <item row="1" column="1" colspan="2"> - <widget class="QGroupBox" name="groupBox_2"> + <widget class="QGroupBox" name="grpSaveNewLog"> <property name="contextMenuPolicy"> <enum>Qt::NoContextMenu</enum> </property>

1 0

[vidalia/alpha] Inform the error code when unable to open torrc file
by chiiph＠torproject.org 24 Mar '12

24 Mar '12

commit d5d4601a95c3e6a2cf61598aa599d6588e83793e Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sat Mar 24 12:58:46 2012 -0300 Inform the error code when unable to open torrc file --- src/vidalia/config/TorrcDialog.cpp | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/vidalia/config/TorrcDialog.cpp b/src/vidalia/config/TorrcDialog.cpp index 537c161..abc7bb7 100644 --- a/src/vidalia/config/TorrcDialog.cpp +++ b/src/vidalia/config/TorrcDialog.cpp @@ -107,7 +107,8 @@ TorrcDialog::loadTorrc() } while(!line.isNull()); ui.teditTorrc->setText(text); } else { - QMessageBox::critical(this, tr("Error"), tr("An error ocurred while opening torrc file")); + QMessageBox::critical(this, tr("Error"), tr("An error ocurred while opening torrc file: %1") + .arg(file.error())); } }

1 0

[vidalia/alpha] Make the new Message Log UI integrate better with the rest of the dialog
by chiiph＠torproject.org 24 Mar '12

24 Mar '12

commit 86f09729bfafe3b1945d56dd4110f1ee56a44144 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sat Mar 24 12:55:44 2012 -0300 Make the new Message Log UI integrate better with the rest of the dialog Also disable the search line edit explicitly at load --- src/vidalia/log/MessageLog.cpp | 2 + src/vidalia/log/MessageLog.ui | 388 +++++++++++++++++++++++++--------------- 2 files changed, 244 insertions(+), 146 deletions(-) diff --git a/src/vidalia/log/MessageLog.cpp b/src/vidalia/log/MessageLog.cpp index f4bfe07..e352d86 100644 --- a/src/vidalia/log/MessageLog.cpp +++ b/src/vidalia/log/MessageLog.cpp @@ -217,6 +217,8 @@ MessageLog::loadSettings() const QString term = getSetting(SETTING_FILTER_TERM, DEFAULT_FILTER_TERM) .toString(); ui.chkFilterSearch->setChecked(!term.isEmpty()); + ui.lineSearchTerm->setEnabled(!term.isEmpty()); + ui.lineSearchTerm->setText(term); buildMessageFilter(term); diff --git a/src/vidalia/log/MessageLog.ui b/src/vidalia/log/MessageLog.ui index 029e933..7b8e05a 100644 --- a/src/vidalia/log/MessageLog.ui +++ b/src/vidalia/log/MessageLog.ui @@ -6,17 +6,20 @@ <rect> <x>0</x> <y>0</y> - <width>540</width> - <height>521</height> + <width>671</width> + <height>626</height> </rect> </property> <property name="windowTitle"> <string notr="true"/> </property> - <layout class="QVBoxLayout" name="verticalLayout_2"> - <item> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> + <layout class="QGridLayout" name="gridLayout_2"> + <item row="1" column="2"> + <layout class="QGridLayout" name="gridLayout_3"> + <property name="horizontalSpacing"> + <number>0</number> + </property> + <item row="0" column="1"> <widget class="LogTreeWidget" name="listMessages"> <property name="contextMenuPolicy"> <enum>Qt::NoContextMenu</enum> @@ -59,13 +62,13 @@ </column> </widget> </item> - <item> + <item row="1" column="1"> <widget class="QFrame" name="frmSettings"> <property name="enabled"> <bool>true</bool> </property> <property name="sizePolicy"> - <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> @@ -73,13 +76,13 @@ <property name="minimumSize"> <size> <width>520</width> - <height>183</height> + <height>261</height> </size> </property> <property name="maximumSize"> <size> - <width>520</width> - <height>183</height> + <width>800</width> + <height>261</height> </size> </property> <property name="contextMenuPolicy"> @@ -101,107 +104,91 @@ <property name="spacing"> <number>3</number> </property> - <item row="0" column="2"> - <layout class="QHBoxLayout" name="_2"> - <item> - <spacer> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item> - <layout class="QVBoxLayout" name="_3"> - <item> - <widget class="QPushButton" name="btnSaveSettings"> - <property name="contextMenuPolicy"> - <enum>Qt::NoContextMenu</enum> - </property> - <property name="toolTip"> - <string>Saves the current Message Log settings</string> - </property> - <property name="text"> - <string>Save Settings</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="btnCancelSettings"> - <property name="minimumSize"> - <size> - <width>90</width> - <height>0</height> - </size> - </property> - <property name="contextMenuPolicy"> - <enum>Qt::NoContextMenu</enum> - </property> - <property name="toolTip"> - <string>Cancels changes made to settings</string> - </property> - <property name="text"> - <string>Cancel</string> - </property> - </widget> - </item> - </layout> - </item> - </layout> - </item> - <item row="0" column="0" rowspan="2"> - <widget class="QGroupBox" name="grpLogFilter"> + <item row="1" column="1"> + <widget class="QGroupBox" name="grpLogHistory"> <property name="contextMenuPolicy"> <enum>Qt::NoContextMenu</enum> </property> <property name="title"> - <string>Message Filter</string> + <string>Message Log History</string> </property> - <layout class="QVBoxLayout" name="_4"> + <layout class="QHBoxLayout" name="_5"> <item> - <widget class="QCheckBox" name="chkTorErr"> + <widget class="QSpinBox" name="spnbxMaxCount"> + <property name="minimumSize"> + <size> + <width>50</width> + <height>0</height> + </size> + </property> <property name="contextMenuPolicy"> <enum>Qt::NoContextMenu</enum> </property> <property name="toolTip"> - <string/> + <string>Number of messages to display in the message log window</string> </property> - <property name="whatsThis"> - <string/> + <property name="alignment"> + <set>Qt::AlignRight</set> </property> - <property name="text"> - <string>Error</string> + <property name="minimum"> + <number>1</number> </property> - <property name="icon"> - <iconset resource="../res/vidalia.qrc"> - <normaloff>:/images/16x16/emblem-important.png</normaloff>:/images/16x16/emblem-important.png</iconset> + <property name="maximum"> + <number>99999</number> </property> </widget> </item> <item> - <widget class="QCheckBox" name="chkTorWarn"> + <widget class="QLabel" name="lblMessageCount"> <property name="contextMenuPolicy"> <enum>Qt::NoContextMenu</enum> </property> - <property name="toolTip"> - <string/> - </property> <property name="text"> - <string>Warning</string> + <string>messages</string> </property> - <property name="icon"> - <iconset resource="../res/vidalia.qrc"> - <normaloff>:/images/16x16/dialog-warning.png</normaloff>:/images/16x16/dialog-warning.png</iconset> + <property name="textFormat"> + <enum>Qt::AutoText</enum> + </property> + <property name="alignment"> + <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> </property> </widget> </item> - <item> - <widget class="QCheckBox" name="chkTorNote"> + </layout> + </widget> + </item> + <item row="0" column="1" colspan="2"> + <widget class="QGroupBox" name="grpLogFilter"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>170</height> + </size> + </property> + <property name="contextMenuPolicy"> + <enum>Qt::NoContextMenu</enum> + </property> + <property name="title"> + <string>Message Filter</string> + </property> + <layout class="QGridLayout" name="_2"> + <property name="sizeConstraint"> + <enum>QLayout::SetDefaultConstraint</enum> + </property> + <item row="8" column="3"> + <widget class="QCheckBox" name="chkTorInfo"> + <property name="minimumSize"> + <size> + <width>87</width> + <height>20</height> + </size> + </property> <property name="contextMenuPolicy"> <enum>Qt::NoContextMenu</enum> </property> @@ -209,33 +196,48 @@ <string/> </property> <property name="text"> - <string>Notice</string> + <string>Info</string> </property> <property name="icon"> <iconset resource="../res/vidalia.qrc"> - <normaloff>:/images/16x16/preferences-desktop-notification.png</normaloff>:/images/16x16/preferences-desktop-notification.png</iconset> + <normaloff>:/images/16x16/dialog-information.png</normaloff>:/images/16x16/dialog-information.png</iconset> </property> </widget> </item> - <item> - <widget class="QCheckBox" name="chkTorInfo"> + <item row="6" column="1" colspan="2"> + <widget class="QCheckBox" name="chkTorErr"> + <property name="minimumSize"> + <size> + <width>124</width> + <height>20</height> + </size> + </property> <property name="contextMenuPolicy"> <enum>Qt::NoContextMenu</enum> </property> <property name="toolTip"> <string/> </property> + <property name="whatsThis"> + <string/> + </property> <property name="text"> - <string>Info</string> + <string>Error</string> </property> <property name="icon"> <iconset resource="../res/vidalia.qrc"> - <normaloff>:/images/16x16/dialog-information.png</normaloff>:/images/16x16/dialog-information.png</iconset> + <normaloff>:/images/16x16/emblem-important.png</normaloff>:/images/16x16/emblem-important.png</iconset> </property> </widget> </item> - <item> + <item row="6" column="3"> <widget class="QCheckBox" name="chkTorDebug"> + <property name="minimumSize"> + <size> + <width>87</width> + <height>20</height> + </size> + </property> <property name="contextMenuPolicy"> <enum>Qt::NoContextMenu</enum> </property> @@ -251,84 +253,146 @@ </property> </widget> </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout"> - <item> - <widget class="QCheckBox" name="chkFilterSearch"> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item> - <widget class="QLineEdit" name="lineSearchTerm"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - </widget> - </item> - </layout> + <item row="2" column="1" colspan="5"> + <widget class="QLineEdit" name="lineSearchTerm"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>590</width> + <height>22</height> + </size> + </property> + </widget> </item> - </layout> - </widget> - </item> - <item row="0" column="1"> - <widget class="QGroupBox" name="grpLogHistory"> - <property name="contextMenuPolicy"> - <enum>Qt::NoContextMenu</enum> - </property> - <property name="title"> - <string>Message Log History</string> - </property> - <layout class="QHBoxLayout" name="_5"> - <item> - <widget class="QSpinBox" name="spnbxMaxCount"> + <item row="7" column="3"> + <widget class="QCheckBox" name="chkTorNote"> <property name="minimumSize"> <size> - <width>50</width> - <height>0</height> + <width>87</width> + <height>20</height> </size> </property> <property name="contextMenuPolicy"> <enum>Qt::NoContextMenu</enum> </property> <property name="toolTip"> - <string>Number of messages to display in the message log window</string> - </property> - <property name="alignment"> - <set>Qt::AlignRight</set> + <string/> </property> - <property name="minimum"> - <number>1</number> + <property name="text"> + <string>Notice</string> </property> - <property name="maximum"> - <number>99999</number> + <property name="icon"> + <iconset resource="../res/vidalia.qrc"> + <normaloff>:/images/16x16/preferences-desktop-notification.png</normaloff>:/images/16x16/preferences-desktop-notification.png</iconset> </property> </widget> </item> - <item> - <widget class="QLabel" name="lblMessageCount"> + <item row="7" column="1" colspan="2"> + <widget class="QCheckBox" name="chkTorWarn"> + <property name="minimumSize"> + <size> + <width>124</width> + <height>20</height> + </size> + </property> <property name="contextMenuPolicy"> <enum>Qt::NoContextMenu</enum> </property> + <property name="toolTip"> + <string/> + </property> <property name="text"> - <string>messages</string> + <string>Warning</string> </property> - <property name="textFormat"> - <enum>Qt::AutoText</enum> + <property name="icon"> + <iconset resource="../res/vidalia.qrc"> + <normaloff>:/images/16x16/dialog-warning.png</normaloff>:/images/16x16/dialog-warning.png</iconset> </property> - <property name="alignment"> - <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> + </widget> + </item> + <item row="1" column="1"> + <widget class="QCheckBox" name="chkFilterSearch"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>114</width> + <height>20</height> + </size> + </property> + <property name="text"> + <string>Filter by term:</string> </property> </widget> </item> + <item row="7" column="4"> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>1</height> + </size> + </property> + </spacer> + </item> + <item row="6" column="5" rowspan="3"> + <layout class="QVBoxLayout" name="_3"> + <item> + <widget class="QPushButton" name="btnSaveSettings"> + <property name="minimumSize"> + <size> + <width>125</width> + <height>32</height> + </size> + </property> + <property name="contextMenuPolicy"> + <enum>Qt::NoContextMenu</enum> + </property> + <property name="toolTip"> + <string>Saves the current Message Log settings</string> + </property> + <property name="text"> + <string>Save Settings</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="btnCancelSettings"> + <property name="minimumSize"> + <size> + <width>125</width> + <height>32</height> + </size> + </property> + <property name="contextMenuPolicy"> + <enum>Qt::NoContextMenu</enum> + </property> + <property name="toolTip"> + <string>Cancels changes made to settings</string> + </property> + <property name="text"> + <string>Cancel</string> + </property> + </widget> + </item> + </layout> + </item> </layout> </widget> </item> - <item row="1" column="1" colspan="2"> + <item row="1" column="2"> <widget class="QGroupBox" name="grpSaveNewLog"> <property name="contextMenuPolicy"> <enum>Qt::NoContextMenu</enum> @@ -385,8 +449,24 @@ </layout> </widget> </item> + <item row="0" column="0"> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>0</width> + <height>40</height> + </size> + </property> + </spacer> + </item> </layout> </item> + <item row="0" column="2"> + <layout class="QVBoxLayout" name="verticalLayout"/> + </item> </layout> <action name="actionMessage_Filters"> <property name="text"> @@ -614,5 +694,21 @@ </hint> </hints> </connection> + <connection> + <sender>chkFilterSearch</sender> + <signal>toggled(bool)</signal> + <receiver>lineSearchTerm</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>82</x> + <y>238</y> + </hint> + <hint type="destinationlabel"> + <x>284</x> + <y>265</y> + </hint> + </hints> + </connection> </connections> </ui>

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 24 Mar '12

24 Mar '12

commit f2a969a57372347e02e015780f64c66c51ed916a Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 24 16:15:12 2012 +0000 Update translations for vidalia_alpha --- eu/vidalia_eu.po | 66 +++++++++++++++++++++++++++--------------------------- 1 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eu/vidalia_eu.po b/eu/vidalia_eu.po index 10340fb..850c27c 100644 --- a/eu/vidalia_eu.po +++ b/eu/vidalia_eu.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-03-24 15:44+0000\n" +"PO-Revision-Date: 2012-03-24 15:59+0000\n" "Last-Translator: Antxon Baldarra <baldarra(a)euskalerria.org>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -1365,11 +1365,11 @@ msgstr "aplikazioak talka egin baino lehenago egiten ari zinenaren deskribapenar msgctxt "DebugDialog" msgid "Plugin debug output" -msgstr "" +msgstr "Plugin arazte irteera" msgctxt "DebugDialog" msgid "Plugin Output" -msgstr "" +msgstr "Plugin Irteera" msgctxt "DebugDialog" msgid "Syntax Errors" @@ -2022,7 +2022,7 @@ msgstr "Zirkuitu berria" msgctxt "MainWindow" msgid "Debug output" -msgstr "" +msgstr "Arazte irteera" msgctxt "MainWindow" msgid "Panic!" @@ -2516,7 +2516,7 @@ msgstr "Egoera" msgctxt "NetViewer" msgid "<a href=\"server.offline\">Why is my relay offline?</a>" -msgstr "" +msgstr "<a href=\"server.offline\">Zergatik dago nire errelea lineaz kanpo?</a>" msgctxt "NetViewer" msgid "" @@ -2678,7 +2678,7 @@ msgstr "Zubi bat edo gehiago zehaztu behar duzu." msgctxt "PluginEngine" msgid "WARNING: %1 doesn't have an info file." -msgstr "" +msgstr "ABISUA: %1 ez du informazio fitxategirik." msgctxt "PluginWrapper" msgid "%1: Processing..." @@ -2688,55 +2688,55 @@ msgctxt "PluginWrapper" msgid "" "%4: ERROR: Line: %1 - Column: %2\n" "%3" -msgstr "" +msgstr "%4: AKATSA: Lerroa: %1 - Zutabea: %2\n%3" msgctxt "PluginWrapper" msgid "%1: Error opening file %2" -msgstr "" +msgstr "%1: Akatsa %2 fitxategia irekitzerakoan" msgctxt "PluginWrapper" msgid "%2: ERROR: Cannot open %1" -msgstr "" +msgstr "%2: AKATSA: Ezin da %1 ireki" msgctxt "PluginWrapper" msgid "%2: ERROR: Parsing %1" -msgstr "" +msgstr "%2: AKATSA: %1 analizatzean" msgctxt "PluginWrapper" msgid "" "Line: %1 - Column: %2\n" "Message: %3" -msgstr "" +msgstr "Lerroa: %1 - Zutabea: %2\nMezua: %3" msgctxt "PluginWrapper" msgid "%1: Starting..." -msgstr "" +msgstr "%1: Abiarazten..." msgctxt "PluginWrapper" msgid "%1: Stoping..." -msgstr "" +msgstr "%1: Gelditzen..." msgctxt "PluginWrapper" msgid "%1: WARNING: doesn't have a GUI, and buildGUI() was called" -msgstr "" +msgstr "%1: ABISUA: ez du GUIrik, eta buildGUI() deitu da" msgctxt "PluginWrapper" msgid "" "%2:\n" "*** Exception in line %1" -msgstr "" +msgstr "%2:\n*** Salbuespena %1 lerroan" msgctxt "PluginWrapper" msgid "*** Backtrace:" -msgstr "" +msgstr "*** Atze-traza:" msgctxt "PluginWrapper" msgid "(untitled)" -msgstr "" +msgstr "(izengabea)" msgctxt "PluginWrapper" msgid "Error: buildGUI() failed for plugin %1" -msgstr "" +msgstr "Akatsa: builfGUI()k %1 pluginarentzat hust egin du" msgctxt "Policy" msgid "accept" @@ -2758,7 +2758,7 @@ msgctxt "QObject" msgid "" "Failed to set %1:\n" "Reason: %2" -msgstr "" +msgstr "Huts %1 ezartzerakoan:\nArrazoia: %2" msgctxt "QObject" msgid "" @@ -2774,7 +2774,7 @@ msgstr "" msgctxt "QObject" msgid "Vidalia was unable to save the options to the torrc file." -msgstr "" +msgstr "Vidaliak ezin izan ditu torrc fitxategiarentzako aukerak gorde." msgctxt "RouterDescriptor" msgid "Online" @@ -3220,23 +3220,23 @@ msgstr "hilabete" msgctxt "ServerPage" msgid "Enable accounting" -msgstr "" +msgstr "Kontabilitatea gaitu" msgctxt "ServerPage" msgid "h:mm" -msgstr "" +msgstr "o:mm" msgctxt "ServerPage" msgid "at" -msgstr "" +msgstr "gan" msgctxt "ServerPage" msgid "per" -msgstr "" +msgstr "gatik" msgctxt "ServerPage" msgid "bytes" -msgstr "" +msgstr "byteak" msgctxt "ServerPage" msgid "KB" @@ -3252,15 +3252,15 @@ msgstr "GB" msgctxt "ServerPage" msgid "TB" -msgstr "" +msgstr "TB" msgctxt "ServerPage" msgid "Push no more than" -msgstr "" +msgstr "Ez bultzatu hau baino gehiago " msgctxt "ServerPage" msgid "time" -msgstr "" +msgstr "denbora" msgctxt "StatusEventWidget" msgid "Copy to Clipboard" @@ -3567,19 +3567,19 @@ msgstr "Vidaliak ez du Tor abiarazi. Abiarazi duzun interfazetik gelditu behar d msgctxt "TorControl" msgid "Start failed: %1" -msgstr "" +msgstr "Hasierak huts egin du: %1" msgctxt "TorControl" msgid "Process finished: ExitCode=%1" -msgstr "" +msgstr "Prozesua amaitu da: ExitCode=%1" msgctxt "TorControl" msgid "Connection failed: %1" -msgstr "" +msgstr "Konexioak huts egin du: %1" msgctxt "TorControl" msgid "Disconnected" -msgstr "" +msgstr "Deskonektatuta" msgctxt "TorProcess" msgid "Process %1 failed to stop. [%2]" @@ -3879,7 +3879,7 @@ msgstr "Ezin izan da '%1' erregistro fitxategia ireki: %2" msgctxt "Vidalia" msgid "Value required for parameter :" -msgstr "" +msgstr "Parametroarentzako beharrezko balioa:" msgctxt "Vidalia" msgid "Invalid language code specified:"

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 24 Mar '12

24 Mar '12

commit 335108dc1cd35a8caa832a5b24830a579699885a Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 24 15:45:13 2012 +0000 Update translations for vidalia_alpha --- eu/vidalia_eu.po | 84 +++++++++++++++++++++++++++--------------------------- 1 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eu/vidalia_eu.po b/eu/vidalia_eu.po index bdb60a7..10340fb 100644 --- a/eu/vidalia_eu.po +++ b/eu/vidalia_eu.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-03-22 09:01+0000\n" +"PO-Revision-Date: 2012-03-24 15:44+0000\n" "Last-Translator: Antxon Baldarra <baldarra(a)euskalerria.org>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -195,37 +195,37 @@ msgstr "Hautatu Tor socket bidea erabiltzeko fitxategi bat" msgctxt "AdvancedPage" msgid "Configure ControlPort automatically" -msgstr "" +msgstr "ControlPort automatikoki konfiguratu" msgctxt "AdvancedPage" msgid "" "WARNING: If you hand pick the password it will be saved as plain text" " in Vidalia's configuration file. Using a random password is safer." -msgstr "" +msgstr "ABISUA: Pasahitza eskuz idatzi baduzu testu arrunt bezala gordeko da Vidaliaren konfigurazio fitxategian. Ausazko pasahitz bat erabiltzea seguruagoa da." msgctxt "AdvancedPage" msgid "Panic" -msgstr "" +msgstr "Ikara" msgctxt "AdvancedPage" msgid "" "WARNING: The panic button will erease the application if pressed" -msgstr "" +msgstr "ABISUA: Ikara botoia sakatzeak aplikazioa ezabatuko du" msgctxt "AdvancedPage" msgid "Enable panic button" -msgstr "" +msgstr "Ikara botoia gaitu" msgctxt "AdvancedPage" msgid "Panic path:" -msgstr "" +msgstr "Ikara bidea:" msgctxt "AdvancedPage" msgid "" "You've checked the autoconfiguration option for the ControlPort, but " "provided no Data Directory. Please add one, or uncheck the \"Configure " "ControlPort automatically\" option." -msgstr "" +msgstr "ControlPorterako autokonfigurazio aukera gaitu duzu, baina ez duzu Datu Direktoriorik eman. Mesedez gehitu bat, edo ezgaitu \"ControlPort automatikoki konfiguratu\" aukera." msgctxt "AdvancedPage" msgid "" @@ -236,7 +236,7 @@ msgstr "Vidaliak ezin izan du Tor zerbitzua kendu.\\n\n\\n\nEskuz kendu beharko msgctxt "AdvancedPage" msgid "Select a Directory to Use for Panic" -msgstr "" +msgstr "Hautatu Direktorio bat Ikara erabiltzeko" msgctxt "AppearancePage" msgid "Language" @@ -261,19 +261,19 @@ msgstr "Vidaliak ezin izan du aukeratutako hizkuntza itzulpena kargatu." msgctxt "AppearancePage" msgid "" "System Icon Preferences (changes will take effect when you restart Vidalia)" -msgstr "" +msgstr "Sistemaren Ikono Hobespenak (aldaketak Vidalia berrabiarazten duzunean izango dute eragina)" msgctxt "AppearancePage" msgid "Show the Tray Icon and Dock Icon (default)" -msgstr "" +msgstr "Erakutsi Erretilu eta Kai Ikonoak (lehenetsia)" msgctxt "AppearancePage" msgid "Hide the Tray Icon" -msgstr "" +msgstr "Ezkutatu Erretilu Ikonoa" msgctxt "AppearancePage" msgid "Hide the Dock Icon" -msgstr "" +msgstr "Ezkutatu Kai Ikonoa" msgctxt "BandwidthGraph" msgid "Since:" @@ -1342,26 +1342,26 @@ msgstr "Ezin izan dugu Vidalia automatikoki berrabiarazi. Mesedez Vidalia eskuz msgctxt "CrashReportDialog" msgid "Please fill a ticket in:" -msgstr "" +msgstr "Mesedez bete ezazu tiket bat:" msgctxt "CrashReportDialog" msgid "" "<a " "href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>" -msgstr "" +msgstr "<a href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>" msgctxt "CrashReportDialog" msgid "" "A crash report has been created that you can send to the Vidalia developers " "to help identify and fix the problem. The submitted report does not contain " "any personally identifying information." -msgstr "" +msgstr "Vidalia garatzaileak arazoa identifikatzen eta konpontzen lagunduko dituen eta bidali dezakezun talka txosten bat sortu da. Aurkeztutako txostenak ez du inolako informazio pertsonalik." msgctxt "CrashReportDialog" msgid "" "with a description of what you were doing before the application crashed, " "along with the following files corresponding to the crash report:" -msgstr "" +msgstr "aplikazioak talka egin baino lehenago egiten ari zinenaren deskribapenarekin, talka txostenari dagokion hurrengo fitxategiekin:" msgctxt "DebugDialog" msgid "Plugin debug output" @@ -1373,11 +1373,11 @@ msgstr "" msgctxt "DebugDialog" msgid "Syntax Errors" -msgstr "" +msgstr "Sintaxi Akatsak" msgctxt "DebugDialog" msgid "Exceptions" -msgstr "" +msgstr "Salbuespenak" msgctxt "GeneralPage" msgid "Executables (*.exe)" @@ -2008,7 +2008,7 @@ msgstr "" msgctxt "MainWindow" msgid "Panic is enabled" -msgstr "" +msgstr "Ikara gaituta dago" msgctxt "MainWindow" msgid "" @@ -2018,7 +2018,7 @@ msgstr "" msgctxt "MainWindow" msgid "New Circuit" -msgstr "" +msgstr "Zirkuitu berria" msgctxt "MainWindow" msgid "Debug output" @@ -2026,7 +2026,7 @@ msgstr "" msgctxt "MainWindow" msgid "Panic!" -msgstr "" +msgstr "Ikara!" msgctxt "MainWindow" msgid "Reattach tabs" @@ -2034,17 +2034,17 @@ msgstr "" msgctxt "MainWindow" msgid "Plugins" -msgstr "" +msgstr "Pluginak" msgctxt "MainWindow" msgid "Your clock is wrong" -msgstr "" +msgstr "Zure erlojua oker dago" msgctxt "MainWindow" msgid "" "Your computer's clock is wrong, tor may not work as expected. Please check " "the Message Log for more information." -msgstr "" +msgstr "Zure ordenagailuaren erlojua oker dago, baliteke torek espero bezala ez ibiltzea. Mesedez ikusi Mezu Erregistroa informazio gehiago lortzeko." msgctxt "MainWindow" msgid "" @@ -2052,14 +2052,14 @@ msgid "" "\n" "Here's the last error message:\n" " %2" -msgstr "" +msgstr "Vidaliak ez daki nola Tori hitzegin fitxategi honetara ezin daitekeelako sartu: %1\n\nHemen duzu azken akats mezua:\n%2" msgctxt "MainWindow" msgid "" "It seems Tor has stopped running since Vidalia started it.\n" "\n" "See the Advanced Message Log for more information." -msgstr "" +msgstr "Badirudi Tor Vidaliak hasi duenetik gelditu dela.\n\nIkusi Mezu Erregistro Aurreratua informazioa gehiago lortzeko." msgctxt "MainWindow" msgid "" @@ -2081,17 +2081,17 @@ msgstr "huts egin du (%1)" msgctxt "MainWindow" msgid "(probably Telnet)" -msgstr "" +msgstr "(ziurrenik Telnet)" msgctxt "MainWindow" msgid "(probably an email client)" -msgstr "" +msgstr "(ziurrenik email bezero bat)" msgctxt "MainWindow" msgid "" "One of your applications %1 appears to be making a potentially unencrypted " "and unsafe connection to port %2." -msgstr "" +msgstr "Antza denez zure aplikazioren bat %1 enkriptatu gabeko eta arrisku handiko konexio bat egiten ari da %2 portuan." msgctxt "MainWindow" msgid "" @@ -2526,15 +2526,15 @@ msgstr "" msgctxt "NetViewer" msgid "Exit circuits" -msgstr "" +msgstr "Irteera zirkuituak" msgctxt "NetViewer" msgid "Internal circuits" -msgstr "" +msgstr "Barne zirkuituak" msgctxt "NetViewer" msgid "Hidden Service circuits" -msgstr "" +msgstr "Zerbitzu Ezkutu zirkuituak" msgctxt "NetworkPage" msgid "Copy (Ctrl+C)" @@ -2674,7 +2674,7 @@ msgstr "HTTP / HTTPS" msgctxt "NetworkPage" msgid "You must specify one or more bridges." -msgstr "" +msgstr "Zubi bat edo gehiago zehaztu behar duzu." msgctxt "PluginEngine" msgid "WARNING: %1 doesn't have an info file." @@ -2682,7 +2682,7 @@ msgstr "" msgctxt "PluginWrapper" msgid "%1: Processing..." -msgstr "" +msgstr "%1: Prozesatzen..." msgctxt "PluginWrapper" msgid "" @@ -2748,7 +2748,7 @@ msgstr "ezetsi" msgctxt "QDialogButtonBox" msgid "OK" -msgstr "" +msgstr "Ados" msgctxt "QObject" msgid "There were some settings that Vidalia wasn't able to apply together" @@ -3208,15 +3208,15 @@ msgstr "Zure errelearekin arazoren bat badago baliteke email bat helbide honetar msgctxt "ServerPage" msgid "day" -msgstr "" +msgstr "egun" msgctxt "ServerPage" msgid "week" -msgstr "" +msgstr "aste" msgctxt "ServerPage" msgid "month" -msgstr "" +msgstr "hilabete" msgctxt "ServerPage" msgid "Enable accounting" @@ -3240,15 +3240,15 @@ msgstr "" msgctxt "ServerPage" msgid "KB" -msgstr "" +msgstr "KB" msgctxt "ServerPage" msgid "MB" -msgstr "" +msgstr "MB" msgctxt "ServerPage" msgid "GB" -msgstr "" +msgstr "GB" msgctxt "ServerPage" msgid "TB"

1 0

[translation/vidalia_completed] Update translations for vidalia_completed
by translation＠torproject.org 24 Mar '12

24 Mar '12

commit 1938f2942f59e5f5121a8cd0b262a326e2b87a9f Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 24 15:45:11 2012 +0000 Update translations for vidalia_completed --- eu/vidalia_eu.po | 109 ++++++++++++++++++++++++++++++++++------------------- 1 files changed, 70 insertions(+), 39 deletions(-) diff --git a/eu/vidalia_eu.po b/eu/vidalia_eu.po index 63ef4da..3f8bf01 100644 --- a/eu/vidalia_eu.po +++ b/eu/vidalia_eu.po @@ -1,4 +1,4 @@ -# Translators: +# # Translators: # Antxon Baldarra <baldarra(a)euskalerria.org>, 2012. # <baldarra(a)euskalerria.org>, 2011, 2012. @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-03-13 17:21+0000\n" +"POT-Creation-Date: 2012-03-21 17:52+0000\n" +"PO-Revision-Date: 2012-03-24 15:37+0000\n" "Last-Translator: Antxon Baldarra <baldarra(a)euskalerria.org>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -200,6 +200,13 @@ msgstr "ControlPort automatikoki konfiguratu" msgctxt "AdvancedPage" msgid "" +"You've checked the autoconfiguration option for the ControlPort, but " +"provided no Data Directory. Please add one, or uncheck the \"Configure " +"ControlPort automatically\" option." +msgstr "ControlPorterako autokonfigurazio aukera gaitu duzu, baina ez duzu Datu Direktoriorik eman. Mesedez gehitu bat, edo ezgaitu \"ControlPort automatikoki konfiguratu\" aukera." + +msgctxt "AdvancedPage" +msgid "" "Vidalia was unable to remove the Tor service.\n" "\n" "You may need to remove it manually." @@ -225,6 +232,23 @@ msgctxt "AppearancePage" msgid "Vidalia was unable to load the selected language translation." msgstr "Vidaliak ezin izan du aukeratutako hizkuntza itzulpena kargatu." +msgctxt "AppearancePage" +msgid "" +"System Icon Preferences (changes will take effect when you restart Vidalia)" +msgstr "Sistemaren Ikono Hobespenak (aldaketak Vidalia berrabiarazten duzunean izango dute eragina)" + +msgctxt "AppearancePage" +msgid "Show the Tray Icon and Dock Icon (default)" +msgstr "Erakutsi Erretilu eta Kai Ikonoak (lehenetsia)" + +msgctxt "AppearancePage" +msgid "Hide the Tray Icon" +msgstr "Ezkutatu Erretilu Ikonoa" + +msgctxt "AppearancePage" +msgid "Hide the Dock Icon" +msgstr "Ezkutatu Kai Ikonoa" + msgctxt "BandwidthGraph" msgid "Since:" msgstr "Noiztik:" @@ -1750,10 +1774,6 @@ msgid "Connected to the Tor network!" msgstr "Tor sarera konektatuta!" msgctxt "MainWindow" -msgid "Unrecognized startup status" -msgstr "Abio egoera ezezaguna" - -msgctxt "MainWindow" msgid "miscellaneous" msgstr "hainbat" @@ -2065,6 +2085,24 @@ msgid "" msgstr "Konexio honen bitartez bidalitako edozer kontrola daiteke. Mesedez egiaztatu zure aplikazioaren konfigurazioa eta enkriptatutako protokoloak bakarrik erabili, SSL bezala, ahal izanez gero." msgctxt "MainWindow" +msgid "Bootstrapping torrc from %1 to %2" +msgstr "%1 etik %2 ra torrc abio-uhaltzen" + +msgctxt "MainWindow" +msgid "(probably Telnet)" +msgstr "(ziurrenik Telnet)" + +msgctxt "MainWindow" +msgid "(probably an email client)" +msgstr "(ziurrenik email bezero bat)" + +msgctxt "MainWindow" +msgid "" +"One of your applications %1 appears to be making a potentially unencrypted " +"and unsafe connection to port %2." +msgstr "Antza denez zure aplikazioren bat %1 enkriptatu gabeko eta arrisku handiko konexio bat egiten ari da %2 portuan." + +msgctxt "MainWindow" msgid "failed (%1)" msgstr "huts egin du (%1)" @@ -2075,8 +2113,19 @@ msgid "" msgstr "Zure errelea itzaltzen ari da orain.\nSakatu 'Gelditu' berriz zure errelea orain gelditzeko." msgctxt "MainWindow" -msgid "Bootstrapping torrc from %1 to %2" -msgstr "%1 etik %2 ra torrc abio-uhaltzen" +msgid "" +"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n" +"\n" +"Here's the last error message:\n" +"%2" +msgstr "Vidaliak ez daki nola Tori hitzegin fitxategi honetara ezin daitekeelako sartu: %1\n\nHemen duzu azken akats mezua:\n%2" + +msgctxt "MainWindow" +msgid "" +"It seems Tor has stopped running since Vidalia started it.\n" +"\n" +"See the Advanced Message Log for more information." +msgstr "Badirudi Tor Vidaliak hasi duenetik gelditu dela.\n\nIkusi Mezu Erregistro Aurreratua informazioa gehiago lortzeko." msgctxt "MainWindow" msgid "" @@ -2092,20 +2141,6 @@ msgid "" "Please check the message log for recent warning or error messages." msgstr "Vidaliak Tor softwarea ustekabean irten dela detektatu du.\n\nMesedez begiratu mezu erregistroan azkeneko ohar edo akats mezuak." -msgctxt "MainWindow" -msgid "(probably Telnet)" -msgstr "(ziurrenik Telnet)" - -msgctxt "MainWindow" -msgid "(probably an email client)" -msgstr "(ziurrenik email bezero bat)" - -msgctxt "MainWindow" -msgid "" -"One of your applications %1 appears to be making a potentially unencrypted " -"and unsafe connection to port %2." -msgstr "Antza denez zure aplikazioren bat %1 enkriptatu gabeko eta arrisku handiko konexio bat egiten ari da %2 portuan." - msgctxt "MessageLog" msgid "Error Setting Filter" msgstr "Huts Filtroa ezartzerakoan" @@ -2518,14 +2553,6 @@ msgid "Ctrl+F" msgstr "Ktrl+F" msgctxt "NetworkPage" -msgid "Invalid Bridge" -msgstr "Baliogabeko Zubia" - -msgctxt "NetworkPage" -msgid "The specified bridge identifier is not valid." -msgstr "Zehaztutako zubi identifikatzailea ez da baliogarria." - -msgctxt "NetworkPage" msgid "Copy (Ctrl+C)" msgstr "Kopiatu (Ktrl+C)" @@ -2658,13 +2685,13 @@ msgid "SOCKS 5" msgstr "SOCKS 5" msgctxt "NetworkPage" -msgid "HTTP" -msgstr "HTTP" - -msgctxt "NetworkPage" msgid "HTTP / HTTPS" msgstr "HTTP / HTTPS" +msgctxt "NetworkPage" +msgid "You must specify one or more bridges." +msgstr "Zubi bat edo gehiago zehaztu behar duzu." + msgctxt "Policy" msgid "accept" msgstr "onartu" @@ -2842,10 +2869,6 @@ msgid "Run as a client only" msgstr "Bezero bezala exekutatu" msgctxt "ServerPage" -msgid "Relay traffic for the Tor network" -msgstr "Errele trafikoa Tor sarearentzat" - -msgctxt "ServerPage" msgid "Relay Port:" msgstr "Errele Portua:" @@ -3090,6 +3113,14 @@ msgid "Automatically distribute my bridge address" msgstr "Nire zubi helbidea automatikoki banatu" msgctxt "ServerPage" +msgid "Relay traffic for the Tor network (exit relay)" +msgstr "Tor sarearentzako trafikoa erreleatu (irteera errelea)" + +msgctxt "ServerPage" +msgid "Relay traffic inside the Tor network (non-exit relay)" +msgstr "Tor sarearen barruan trafikoa erreleatu (ez-irteera errelea)" + +msgctxt "ServerPage" msgid "Mirror the Relay Directory" msgstr "Errele Direktorioa ispilatu"

1 0