[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r3329: Bring the auto-updates branch up to date. (in vidalia/branches/auto-updates: . debian debian/po pkg pkg/osx pkg/win32 pkg/win32/es pkg/win32/fr pkg/win32/ro src/vidalia src/vidalia/config src/vidalia/i18n/hu src/vidalia/i18n/ro src/vidalia/log src/vidalia/network src/vidalia/res src/vidalia/res/128x128 src/vidalia/res/16x16 src/vidalia/res/22x22 src/vidalia/res/32x32 src/vidalia/res/48x48 src/vidalia/res/icons)
Author: edmanm
Date: 2008-11-20 21:04:34 -0500 (Thu, 20 Nov 2008)
New Revision: 3329
Added:
vidalia/branches/auto-updates/debian/
vidalia/branches/auto-updates/debian/FAQ
vidalia/branches/auto-updates/debian/README.Debian
vidalia/branches/auto-updates/debian/changelog
vidalia/branches/auto-updates/debian/compat
vidalia/branches/auto-updates/debian/config
vidalia/branches/auto-updates/debian/control
vidalia/branches/auto-updates/debian/copyright
vidalia/branches/auto-updates/debian/docs
vidalia/branches/auto-updates/debian/menu
vidalia/branches/auto-updates/debian/po/
vidalia/branches/auto-updates/debian/po/POTFILES.in
vidalia/branches/auto-updates/debian/po/ca.po
vidalia/branches/auto-updates/debian/po/de.po
vidalia/branches/auto-updates/debian/po/es.po
vidalia/branches/auto-updates/debian/po/fi.po
vidalia/branches/auto-updates/debian/po/fr.po
vidalia/branches/auto-updates/debian/po/it.po
vidalia/branches/auto-updates/debian/po/pt.po
vidalia/branches/auto-updates/debian/po/ru.po
vidalia/branches/auto-updates/debian/po/templates.pot
vidalia/branches/auto-updates/debian/po/zh_CN.po
vidalia/branches/auto-updates/debian/postinst
vidalia/branches/auto-updates/debian/rules
vidalia/branches/auto-updates/debian/templates
vidalia/branches/auto-updates/debian/vidalia.desktop
vidalia/branches/auto-updates/debian/vidalia.xpm
vidalia/branches/auto-updates/debian/watch
vidalia/branches/auto-updates/pkg/osx/background.png
vidalia/branches/auto-updates/pkg/osx/bundle-background.png
vidalia/branches/auto-updates/pkg/osx/nonbundle-ds_store
vidalia/branches/auto-updates/pkg/win32/msi-header.bmp
vidalia/branches/auto-updates/pkg/win32/msi-welcome.bmp
vidalia/branches/auto-updates/pkg/win32/vidalia.wxs.in
vidalia/branches/auto-updates/src/vidalia/res/16x16/status-green.png
vidalia/branches/auto-updates/src/vidalia/res/16x16/status-orange.png
vidalia/branches/auto-updates/src/vidalia/res/16x16/status-red.png
vidalia/branches/auto-updates/src/vidalia/res/22x22/status-green.png
vidalia/branches/auto-updates/src/vidalia/res/22x22/status-orange.png
vidalia/branches/auto-updates/src/vidalia/res/22x22/status-red.png
vidalia/branches/auto-updates/src/vidalia/res/22x22/vidalia.png
vidalia/branches/auto-updates/src/vidalia/res/32x32/status-green.png
vidalia/branches/auto-updates/src/vidalia/res/32x32/status-orange.png
vidalia/branches/auto-updates/src/vidalia/res/32x32/status-red.png
vidalia/branches/auto-updates/src/vidalia/res/48x48/status-green.png
vidalia/branches/auto-updates/src/vidalia/res/48x48/status-orange.png
vidalia/branches/auto-updates/src/vidalia/res/48x48/status-red.png
vidalia/branches/auto-updates/src/vidalia/res/48x48/vidalia.png
vidalia/branches/auto-updates/src/vidalia/res/icons/status-green.icns
vidalia/branches/auto-updates/src/vidalia/res/icons/status-orange.icns
vidalia/branches/auto-updates/src/vidalia/res/icons/status-red.icns
Removed:
vidalia/branches/auto-updates/debian/FAQ
vidalia/branches/auto-updates/debian/README.Debian
vidalia/branches/auto-updates/debian/changelog
vidalia/branches/auto-updates/debian/compat
vidalia/branches/auto-updates/debian/config
vidalia/branches/auto-updates/debian/control
vidalia/branches/auto-updates/debian/copyright
vidalia/branches/auto-updates/debian/docs
vidalia/branches/auto-updates/debian/menu
vidalia/branches/auto-updates/debian/po/
vidalia/branches/auto-updates/debian/po/POTFILES.in
vidalia/branches/auto-updates/debian/po/ca.po
vidalia/branches/auto-updates/debian/po/de.po
vidalia/branches/auto-updates/debian/po/es.po
vidalia/branches/auto-updates/debian/po/fi.po
vidalia/branches/auto-updates/debian/po/fr.po
vidalia/branches/auto-updates/debian/po/it.po
vidalia/branches/auto-updates/debian/po/pt.po
vidalia/branches/auto-updates/debian/po/ru.po
vidalia/branches/auto-updates/debian/po/templates.pot
vidalia/branches/auto-updates/debian/po/zh_CN.po
vidalia/branches/auto-updates/debian/postinst
vidalia/branches/auto-updates/debian/rules
vidalia/branches/auto-updates/debian/templates
vidalia/branches/auto-updates/debian/vidalia.desktop
vidalia/branches/auto-updates/debian/vidalia.xpm
vidalia/branches/auto-updates/debian/watch
vidalia/branches/auto-updates/src/vidalia/res/16x16/tor-off.png
vidalia/branches/auto-updates/src/vidalia/res/16x16/tor-on.png
vidalia/branches/auto-updates/src/vidalia/res/16x16/tor-starting.png
vidalia/branches/auto-updates/src/vidalia/res/16x16/tor-stopping.png
vidalia/branches/auto-updates/src/vidalia/res/22x22/tor-off.png
vidalia/branches/auto-updates/src/vidalia/res/22x22/tor-on.png
vidalia/branches/auto-updates/src/vidalia/res/22x22/tor-starting.png
vidalia/branches/auto-updates/src/vidalia/res/22x22/tor-stopping.png
vidalia/branches/auto-updates/src/vidalia/res/32x32/tor-off.png
vidalia/branches/auto-updates/src/vidalia/res/32x32/tor-on.png
vidalia/branches/auto-updates/src/vidalia/res/32x32/tor-starting.png
vidalia/branches/auto-updates/src/vidalia/res/32x32/tor-stopping.png
vidalia/branches/auto-updates/src/vidalia/res/48x48/tor-off.png
vidalia/branches/auto-updates/src/vidalia/res/48x48/tor-on.png
vidalia/branches/auto-updates/src/vidalia/res/48x48/tor-starting.png
vidalia/branches/auto-updates/src/vidalia/res/48x48/tor-stopping.png
vidalia/branches/auto-updates/src/vidalia/res/icons/tor-off.icns
vidalia/branches/auto-updates/src/vidalia/res/icons/tor-on.icns
vidalia/branches/auto-updates/src/vidalia/res/icons/tor-starting.icns
vidalia/branches/auto-updates/src/vidalia/res/icons/tor-stopping.icns
Modified:
vidalia/branches/auto-updates/CHANGELOG
vidalia/branches/auto-updates/INSTALL
vidalia/branches/auto-updates/pkg/package.sh
vidalia/branches/auto-updates/pkg/win32/CMakeLists.txt
vidalia/branches/auto-updates/pkg/win32/es/vidalia_es.po
vidalia/branches/auto-updates/pkg/win32/fr/vidalia_fr.po
vidalia/branches/auto-updates/pkg/win32/ro/vidalia_ro.po
vidalia/branches/auto-updates/src/vidalia/CMakeLists.txt
vidalia/branches/auto-updates/src/vidalia/config/advancedpage.cpp
vidalia/branches/auto-updates/src/vidalia/config/advancedpage.ui
vidalia/branches/auto-updates/src/vidalia/config/networksettings.cpp
vidalia/branches/auto-updates/src/vidalia/config/torsettings.cpp
vidalia/branches/auto-updates/src/vidalia/config/torsettings.h
vidalia/branches/auto-updates/src/vidalia/i18n/hu/qt_hu.po
vidalia/branches/auto-updates/src/vidalia/i18n/hu/vidalia_hu.po
vidalia/branches/auto-updates/src/vidalia/i18n/ro/qt_ro.po
vidalia/branches/auto-updates/src/vidalia/i18n/ro/vidalia_ro.po
vidalia/branches/auto-updates/src/vidalia/log/logtreewidget.cpp
vidalia/branches/auto-updates/src/vidalia/log/messagelog.ui
vidalia/branches/auto-updates/src/vidalia/mainwindow.cpp
vidalia/branches/auto-updates/src/vidalia/network/netviewer.cpp
vidalia/branches/auto-updates/src/vidalia/network/netviewer.h
vidalia/branches/auto-updates/src/vidalia/network/netviewer.ui
vidalia/branches/auto-updates/src/vidalia/network/routerlistwidget.cpp
vidalia/branches/auto-updates/src/vidalia/network/routerlistwidget.h
vidalia/branches/auto-updates/src/vidalia/res/128x128/vidalia-logo.png
vidalia/branches/auto-updates/src/vidalia/res/icons/vidalia.icns
vidalia/branches/auto-updates/src/vidalia/res/icons/vidalia.ico
vidalia/branches/auto-updates/src/vidalia/res/vidalia.qrc
vidalia/branches/auto-updates/src/vidalia/vidalia.desktop
Log:
Bring the auto-updates branch up to date.
Modified: vidalia/branches/auto-updates/CHANGELOG
===================================================================
--- vidalia/branches/auto-updates/CHANGELOG 2008-11-20 04:37:44 UTC (rev 3328)
+++ vidalia/branches/auto-updates/CHANGELOG 2008-11-21 02:04:34 UTC (rev 3329)
@@ -1,6 +1,31 @@
0.2.0 xx-xxx-2008
+ o Support changing UI languages without having to restart Vidalia.
+ o Remove support for configuring Tor's User and Group options in the
+ Advanced settings page.
+ o Add tooltips to tree items in the help browser's table of contents. Some
+ of the help topic labels are a bit long.
+ o Switch to a simpler About dialog and move the license information to a
+ separate HTML-formatted display.
+ o Include new Vidalia graphics in the Windows Vidalia and bundle installers.
+ The graphics were created by dr|z3d.
+ o Support building with Visual Studio again.
+ o Add a Debian package structure from dererk.
+ o Updated Czech, Polish, Romanian and Turkish transations.
+0.1.10 02-Nov-2008
+ o Add a prettier dialog for prompting people for their control port password
+ that also includes a checkbox for whether the user wants Vidalia to remember
+ the entered password, a Help button, and a Reset button (Windows only).
+ o Fix a crash bug that occurred when the user clicks 'Clear' in the message
+ log toolbar followed by 'Save All'. (Ticket #434)
+ o Uncheck the Torbutton options by default in the Windows bundle installer
+ if Firefox is not installed. (Ticket #421)
+ o Add an Windows bundle installer page that warns the user that they should
+ install Firefox, if it looks like they haven't already done so. (Ticket
+ #421)
+
+
0.1.9 02-Sep-2008
o Create the control panel's menubar as a parentless QMenuBar, so it is
visible even if the control panel is not the topmost window. (Ticket #286)
Modified: vidalia/branches/auto-updates/INSTALL
===================================================================
--- vidalia/branches/auto-updates/INSTALL 2008-11-20 04:37:44 UTC (rev 3328)
+++ vidalia/branches/auto-updates/INSTALL 2008-11-21 02:04:34 UTC (rev 3329)
@@ -67,6 +67,9 @@
mkdir build && cd build
cmake -G "MinGW Makefiles" ..
+ There should be no spaces in the path to your build directory. Otherwise,
+ Vidalia will fail to build.
+
3. Compile Vidalia by running:
mingw32-make
Copied: vidalia/branches/auto-updates/debian (from rev 3328, vidalia/trunk/debian)
Deleted: vidalia/branches/auto-updates/debian/FAQ
Copied: vidalia/branches/auto-updates/debian/FAQ (from rev 3328, vidalia/trunk/debian/FAQ)
===================================================================
--- vidalia/branches/auto-updates/debian/FAQ (rev 0)
+++ vidalia/branches/auto-updates/debian/FAQ 2008-11-21 02:04:34 UTC (rev 3329)
@@ -0,0 +1,116 @@
+Frequently Asked Questions
+==========================
+
+ 1. General
+ 1. What is Vidalia?
+ 2. Does Vidalia run on my operating system?
+ 3. How can I find out when new Vidalia releases are available?
+ 4. Where can I get additional support for Vidalia?
+ 2. Running
+ 1. I installed Vidalia/Tor/Privoxy. Now what?
+ 2. Can I run Vidalia from a USB drive?
+ 3. Can Vidalia "attach" to an existing Tor process?
+ 4. Why do I see connections to geoip.vidalia-project.net in my network map?
+ 5. Can I run a relay without worrying about abuse complaints?
+ 3. Common problems
+ 1. When I try to start Tor I get an error message in Vidalia's message log ...
+
+
+1.General
+=========
+
+1.1 What is Vidalia?
+--------------------
+
+Vidalia is a GUI for Tor, making it easy for you to run, monitor, and configure your installation of Tor. It lets you start and stop Tor, as well as letting you know when things go wrong. Vidalia also lets you see how much bandwidth Tor is using and can even help you set up your own Tor server.
+
+
+1.2 Does Vidalia run on my operating system?
+-------------------------------------------
+
+Vidalia is a cross-platform GUI built using the Qt GUI toolkit. Vidalia should run on any platform supported by Qt, which includes (but is not necessarily limited to):
+
+ * Windows 95/98/Me, NT4, 2000, XP, and Vista
+ * Mac OS X Panther (10.3), Tiger (10.4), and Leopard (10.5)
+ * Linux or other Unix variants running the X Window system.
+
+
+1.3 How can I find out when new Vidalia releases are available?
+---------------------------------------------------------------
+
+Vidalia is still under active development and we tend to put out a new release approximately every 1-2 months. You can subscribe to our Trac RSS feed to learn when we have put out a new release. We also announce new releases on our homepage and on our download page.
+
+
+1.4 Where can I get additional support for Vidalia?
+---------------------------------------------------
+
+First, read through this FAQ and also search the documentation on our wiki. If you prefer IRC, you can find us in #vidalia on irc.oftc.net. Otherwise, we have a vidalia-users mailing list set up for Vidalia users to help out and answer each others' questions.
+
+
+2 Running
+=========
+
+2.1 I installed Vidalia/Tor/Privoxy. Now what?
+----------------------------------------------
+
+Now you need to configure your applications to send their traffic through Tor. Scott Squires has created an extension for Firefox called Torbutton that lets you easily toggle your browser's use of Tor. You might also check out FoxTor for a similar Firefox extension.
+
+See the Torify How-To for information on configuring several other applications to use Tor. The Tor documentation for Windows, Mac OS X, or Linux/BSD/Unix might be useful for you, as well.
+
+
+2.2 Can I run Vidalia from a USB drive?
+---------------------------------------
+
+Yes! You can run Vidalia from a USB drive, perhaps for a portable Tor/Vidalia/Polipo or Tor/Vidalia/Privoxy combination, by using Vidalia's -datadir command-line argument. The -datadir argument tells Vidalia where you would like it to store all of its configuration and application data. For example, you might have a batch file on your USB drive that starts Vidalia as follows:
+
+vidalia -datadir "."
+
+The above line would tell Vidalia to use the current working directory as its data directory. You can also configure Vidalia to look for a Tor executable and configuration file (torrc) on your USB drive using Vidalia's Settings dialog or editing Vidalia's configuration file (vidalia.conf).
+
+If you want to run the Windows version of Vidalia from a USB drive, you may also need to copy mingwm10.dll from a Vidalia or MinGW package onto your USB drive in the same directory as vidalia.exe.
+
+
+2.3 Can Vidalia "attach" to an existing Tor process?
+----------------------------------------------------
+
+Yes. Before Vidalia starts its own Tor process, it always first checks to see if it can connect to the control port of an existing Tor process. All you need to do is enable a control port on the Tor you already have running, and Vidalia will connect to it instead of starting its own Tor process. You first need to open your `torrc` in a text editor. Then, add the following line on a line by itself anywhere in your torrc:
+
+ ControlPort 9051
+
+You will also likely want to set a password for your control port to limit what applications are allowed to connect to it. To do so, you first need to open up a terminal or command prompt and run the following command (you may need to cd to the location of your Tor executable):
+
+# tor --hash-password mypassword
+
+Replace "mypassword" with whatever password you would like to use for your control port. The last line of output from the above command will contain a string that starts with "16:" and is followed by a long string letters and numbers. This string is a hash of the password you supplied as an argument to the --hash-password command above. Copy this entire string, and then add a HashedControlPassword line to your torrc similar to the following:
+
+ "HashedControlPassword 16:816172DEB125A9CA603A6A8A5C16D0642DA4556E4EC417E6B9AAC9AF0D"
+
+Save your torrc changes and either restart or "HUP" your Tor process to reload your configuration. Then you can click 'Start Tor' in Vidalia, which will connect to your Tor process and then prompt you to enter your original control password ("mypassword" in the example above).
+
+
+
+2.4 Why do I see connections to geoip.vidalia-project.net in my network map?
+----------------------------------------------------------------------------
+
+Vidalia 0.0.5 added a network map feature that lets you see where in the world your traffic is going. To be able to map Tor relay IP addresses to approximate geographic locations, we use the GeoLite City database from MaxMind. Unfortunately, the database is around 24MB and shipping it alongside the Vidalia binary would be unreasonable. Consequently, we host the database on our servers and created a small perl script interface to it, allowing Vidalia clients to query the database via standard HTTP GET or POST requests.
+
+All communication between Vidalia and our servers is done over Tor, so our servers do not know who is making the requests. Additionally, no identifying information is included in the requests. Of course, you can verify this by looking at the source code, such as geoipresolver.cpp and torsocket.cpp. We also have a specification for the format of our geographic information requests and responses.
+
+
+2.5 Can I run a relay without worrying about abuse complaints?
+--------------------------------------------------------------
+
+Tor relay operators can specify which services and/or ports clients are allowed to access from their relay. From Vidalia's Exit Policies tab, you can select what services you want to allow clients to access from your relay. Vidalia's help documentation explains what each exit policy option means. By default, Tor relays allow access to many popular services, but restricts some (such as port 25) due to the potential for abuse. Tor's FAQ has more information for relay operators on how to avoid abuse complaints.
+
+Rather than running a normal, public Tor relay, you might also consider running a bridge relay. Some Internet Service Providers (ISPs) attempt to prevent users from accessing the Tor network by blocking connections to known Tor relays. Bridge relays (or bridges for short) are relays that help these censored users access the Tor network. Unlike other Tor relays, bridges are not listed in the same public directories as normal relays. Since there is no complete public list of them, even if your ISP is filtering connections to all the known Tor relays, they probably won't be able to block all the bridges.
+
+
+3 Common problems
+=================
+
+3.1 When I try to start Tor I get an error message in Vidalia's message log that says, "Failed to parse/validate config: Failed to bind one of the listener ports." What's that mean?
+-----------------------
+
+This error message typically means you already have a Tor process running that does not have an open control port. When Vidalia tried to start its own Tor process, Vidalia's Tor process conflicted with your existing Tor process. On Windows, you can look in your Task Manager for a process called tor.exe, select it, and then click "End Process" to terminate your Tor process. On most other operating systems, the ps and kill commands can help you find and terminate your existing Tor process. Then you can simply click 'Start Tor' in Vidalia, and Vidalia will start a new Tor process with the necessary arguments that allow Vidalia to communicate with and control Tor.
+
+If you would like Vidalia to connect to your existing Tor instead of starting a new Tor process, see the FAQ entry above on configuring a control port and password for your existing Tor process.
Deleted: vidalia/branches/auto-updates/debian/README.Debian
Copied: vidalia/branches/auto-updates/debian/README.Debian (from rev 3328, vidalia/trunk/debian/README.Debian)
===================================================================
--- vidalia/branches/auto-updates/debian/README.Debian (rev 0)
+++ vidalia/branches/auto-updates/debian/README.Debian 2008-11-21 02:04:34 UTC (rev 3329)
@@ -0,0 +1,53 @@
+Vidalia for Debian
+------------------
+
+There are currently two ways of communication supported between
+Tor daemon (carried with 'tor' package), and Vidalia interface:
+
+1. Letting Vidalia start Tor process by its own.
+ ---------------------------------------------
+
+ This is default option on debconf while configuring vidalia package
+ (easy reconfigurable by running 'dpkg-reconfigure vidalia').
+
+ This option implies that you have to manually disable Tor
+ starting automatically on every reboot, as shown below:
+
+ # update-rc.d -f tor remove
+ Removing any system startup links for /etc/init.d/tor ...
+ /etc/rc0.d/K20tor
+ /etc/rc1.d/K20tor
+ /etc/rc2.d/S20tor
+ /etc/rc3.d/S20tor
+ /etc/rc4.d/S20tor
+ /etc/rc5.d/S20tor
+ /etc/rc6.d/K20tor
+
+ You can create all the symlinks back by using:
+ # update-rc.d tor defaults
+
+
+2. Enable Tor to use a control port to communicate with Vidalia.
+ -------------------------------------------------------------
+
+ This can be easily done by editing Tor configuration file, by default
+ '/etc/tor/torrc', adding or uncommenting the 'ControlPort=9051' option,
+ and adding the proper value to 'HashedControlPassword', as shown below:
+
+ # tor --hash-password SOME_PASSWORD_HERE
+ Sep 17 18:48:49.421 [notice] Tor v0.2.0.30 (r15956). This is experimental software. Do not rely on it for strong anonymity. (Running on Linux x86_64)
+ 16:167F667A98F859D2600BD708B48B95343FEF7800B479E2AA4284ACF029
+
+ You will have to have something like this:
+
+ # grep Control /etc/tor/torrc
+ ControlPort 9051
+ HashedControlPassword 16:167F667A98F859D2600BD708B48B95343FEF7800B479E2AA4284ACF029
+
+ Then start/restart Tor daemon and then run Vidalia GUI.
+ It will ask Tor what auth modes it accepts and if everything is OK,
+ You will be asked for the password, in the example, 'SOME_PASSWORD_HERE'
+ (as you pass it with --hash-password, not the hash).
+
+
+ -- Ulises Vitulli <uvitulli@xxxxxxxxx> Wed, 17 Sep 2008 17:24:06 -0300
Deleted: vidalia/branches/auto-updates/debian/changelog
Copied: vidalia/branches/auto-updates/debian/changelog (from rev 3328, vidalia/trunk/debian/changelog)
===================================================================
--- vidalia/branches/auto-updates/debian/changelog (rev 0)
+++ vidalia/branches/auto-updates/debian/changelog 2008-11-21 02:04:34 UTC (rev 3329)
@@ -0,0 +1,32 @@
+vidalia (0.1.9-3) unstable; urgency=low
+
+ * Fixing missing copyright holders.
+
+ -- Ulises Vitulli <uvitulli@xxxxxxxxx> Mon, 27 Oct 2008 12:20:26 -0200
+
+vidalia (0.1.9-2) unstable; urgency=low
+
+ * Moved Pre-depens with debconf to Depends
+
+ -- Ulises Vitulli <uvitulli@xxxxxxxxx> Sun, 28 Sep 2008 20:04:44 +0200
+
+vidalia (0.1.9-1) unstable; urgency=low
+
+ [ Vern Sun ]
+ * Initial release (Closes: #405431).
+
+ [ Ulises Vitulli ]
+ * Added README.Debian and FAQ.txt.
+ * Added menu and .desktop files.
+ * Added vidalia.xpm icon (provided by upstream).
+ * Debconf translations:
+ - Spanish.
+ - Catalan.
+ - Russian.
+ - Finnish.
+ - Italian.
+ - French.
+ - German.
+ - Portuguese.
+
+ -- Ulises Vitulli <uvitulli@xxxxxxxxx> Sat, 20 Sep 2008 05:45:56 -0300
Deleted: vidalia/branches/auto-updates/debian/compat
Copied: vidalia/branches/auto-updates/debian/compat (from rev 3328, vidalia/trunk/debian/compat)
===================================================================
--- vidalia/branches/auto-updates/debian/compat (rev 0)
+++ vidalia/branches/auto-updates/debian/compat 2008-11-21 02:04:34 UTC (rev 3329)
@@ -0,0 +1 @@
+5
Deleted: vidalia/branches/auto-updates/debian/config
Copied: vidalia/branches/auto-updates/debian/config (from rev 3328, vidalia/trunk/debian/config)
===================================================================
--- vidalia/branches/auto-updates/debian/config (rev 0)
+++ vidalia/branches/auto-updates/debian/config 2008-11-21 02:04:34 UTC (rev 3329)
@@ -0,0 +1,41 @@
+#!/bin/sh -e
+#DEBHELPER#
+
+. /usr/share/debconf/confmodule
+
+seen='false'
+askuser() {
+ question='vidalia/info'
+ db_fset $question seen false
+ db_input high $question || true
+ db_go || true
+ db_get $question
+}
+
+if [ "$1" = "configure" ]; then
+ if dpkg -l tor > /dev/null 2>&1; then
+ # installed
+ if [ -e '/var/run/tor/tor.pid' ]; then
+ # and already running
+ askuser
+ seen='true'
+ if [ "$RET" = "true" ]; then
+ invoke-rc.d --force tor stop
+ fi
+ fi
+ fi
+
+ if pgrep -x tor > /dev/null 2>&1; then
+ # still running?? (e.g. chroot)
+ if [ "$seen" = "false" ]; then
+ askuser
+ if [ "$RET" = "true" ]; then
+ echo -n "Stopping tor daemon: "
+ pkill -x tor > /dev/null && echo "tor." || echo 'Failed!'
+ fi
+ fi
+ fi
+ db_stop
+fi
+
+exit 0
Deleted: vidalia/branches/auto-updates/debian/control
Copied: vidalia/branches/auto-updates/debian/control (from rev 3328, vidalia/trunk/debian/control)
===================================================================
--- vidalia/branches/auto-updates/debian/control (rev 0)
+++ vidalia/branches/auto-updates/debian/control 2008-11-21 02:04:34 UTC (rev 3329)
@@ -0,0 +1,20 @@
+Source: vidalia
+Section: net
+Priority: extra
+Maintainer: Vern Sun <s5unty@xxxxxxxxx>
+Uploaders: Ulises Vitulli <uvitulli@xxxxxxxxx>
+Build-Depends: debhelper (>= 5), autotools-dev, libqt4-dev (>= 4.1.0), po-debconf (>= 1.0), cmake (>= 2.4.8), libssl-dev (>= 0.9.8g)
+Standards-Version: 3.8.0
+Homepage: http://www.vidalia-project.net
+
+Package: vidalia
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>=1.5.11) | debconf-2.0
+Recommends: tor
+Suggests: iceweasel-torbutton
+Description: controller GUI for the Tor software
+ Vidalia allows you to start and stop Tor, view the status of Tor at a glance,
+ and monitor Tor's bandwidth usage. Vidalia also makes it easy to contribute to
+ the Tor network by helping you setup a Tor server, if you wish. To find more
+ information about what Tor is and how to use it, see the Tor homepage:
+ https://www.torproject.org/
Deleted: vidalia/branches/auto-updates/debian/copyright
Copied: vidalia/branches/auto-updates/debian/copyright (from rev 3328, vidalia/trunk/debian/copyright)
===================================================================
--- vidalia/branches/auto-updates/debian/copyright (rev 0)
+++ vidalia/branches/auto-updates/debian/copyright 2008-11-21 02:04:34 UTC (rev 3329)
@@ -0,0 +1,508 @@
+This is Debian's prepackaged version of Vidalia, controller GUI for the Tor
+software.
+
+Original source has been downloaded from:
+
+ http://www.vidalia-project.net/dist/vidalia-0.1.9.tar.gz
+
+The following copyright notices apply to most of the program. Some modules are
+under different licenses, or in the public domain.
+
+Please note that this is by no means an exhaustive list of all the persons who
+have been contributing to this program. Please see the credits for a (probably
+still non complete) list of the persons who have been helpful with the
+development of this program.
+
+Copyright (C) 2006-2007, Matt Edman <edmanm@xxxxxxxxxxxxxxxxxxx>
+Copyright (C) 2006-2007, Justin Hipple <hipplej@xxxxxxxxxxxxxxxxxxx>
+Copyright (C) 2005, Hvard Tautra Knutsen <havtknut@xxxxxxxxxx>
+Copyright (C) 2001-2007, Roger Dingledine
+Copyright (C) 2004-2007, Nick Mathewson
+Copyright (C) 1998, Todd C. Miller <Todd.Miller@xxxxxxxxxxxxx>
+Copyright (C) 2007, Steven J. Murdoch <Steven.Murdoch@xxxxxxxxxxxx>
+
+ This program 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 2 of the License, or
+ (at your option) any later version.
+===================================================================
+
+Vidalia is distributed under the following license:
+
+Copyright (C) 2006, Matt Edman, Justin Hipple
+
+This program 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 2
+of the License, or (at your option) any later version.
+
+This program 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.
+
+
+ _OpenSSL exception_
+
+0. Definitions
+
+"Vidalia" means Vidalia software licensed under version 2 or any later
+version of the GNU General Public License (collectively, "GPL"), or a
+work based on such software and licensed under the GPL.
+
+"OpenSSL" means OpenSSL toolkit software distributed by the OpenSSL
+Project and licensed under the OpenSSL Licenses, or a work based on such
+software and licensed under the OpenSSL Licenses.
+
+"OpenSSL Licenses" means the OpenSSL License and Original SSLeay License
+under which the OpenSSL Project distributes the OpenSSL toolkit software,
+as those licenses appear in the file LICENSE-OPENSSL.
+
+1. Exception
+
+You have permission to copy, modify, propagate, and distribute a work
+formed by combining OpenSSL with Vidalia, or a work derivative of such a
+combination, even if such copying, modification, propagation, or
+distribution would otherwise violate the terms of the GPL. You must
+comply with the GPL in all respects for all of the code used other than
+OpenSSL.
+
+You may include this OpenSSL Exception and its grant of permissions when
+you distribute Vidalia. Inclusion of this notice with such a
+distribution constitutes a grant of such permission. If you do not wish
+to grant these permissions, remove this section entitled "OpenSSL
+Exception" from your distribution.
+===================================================================
+
+trayicon_x11.cpp is derived from systemtray.cpp from QMPDClient, licensed
+as follows:
+
+QMPDClient - An MPD client written in Qt 4.
+Copyright (C) 2005 Håvard Tautra Knutsen <havtknut@xxxxxxxxxx>
+
+This program 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 2
+of the License, or (at your option) any later version.
+
+This program 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.
+===================================================================
+
+Some of the help documentation text used in Vidalia is derived from the TorFAQ
+Wiki <http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ>. It is licensed
+under the MIT license as follows:
+
+ Copyright (c) 2003-2006 Roger Dingledine
+ Copyright (c) 2004-2005 Nick Mathewson
+ Copyright (c) 2004 Douglas F. Calvert
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+===============================================================================
+
+There are two licenses, one for the C library software, and one for
+the database.
+
+SOFTWARE LICENSE (C library)
+
+The GeoIP C Library is licensed under the LGPL. For details see
+the COPYING file.
+
+OPEN DATA LICENSE (GeoLite Country and GeoLite City databases)
+
+Copyright (c) 2008 MaxMind, Inc. All Rights Reserved.
+
+All advertising materials and documentation mentioning features or use of
+this database must display the following acknowledgment:
+"This product includes GeoLite data created by MaxMind, available from
+http://maxmind.com/";
+
+Redistribution and use with or without modification, are permitted provided
+that the following conditions are met:
+1. Redistributions must retain the above copyright notice, this list of
+conditions and the following disclaimer in the documentation and/or other
+materials provided with the distribution.
+2. All advertising materials and documentation mentioning features or use of
+this database must display the following acknowledgement:
+"This product includes GeoLite data created by MaxMind, available from
+http://maxmind.com/";
+3. "MaxMind" may not be used to endorse or promote products derived from this
+database without specific prior written permission.
+
+THIS DATABASE IS PROVIDED BY MAXMIND.COM ``AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL MAXMIND.COM BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+DATABASE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+===============================================================================
+
+License of zlib.h and zconf.h:
+
+ Interface of the 'zlib' general purpose compression library version 1.2.3,
+ July 18th, 2005
+
+ Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Jean-loup Gailly Mark Adler
+ jloup@xxxxxxxx madler@xxxxxxxxxxxxxxxxxx
+
+
+ The data format used by the zlib library is described by RFCs (Request for
+ Comments) 1950 to 1952 in the files http://www.ietf.org/rfc/rfc1950.txt
+ (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
+===============================================================================
+
+License of FindOpenSSL.cmake:
+
+ It incorporates work covered by the following copyright and
+ permission notice:
+
+ Copyright (c) 2006, Alexander Neundorf, <neundorf@xxxxxxx>
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+ * Neither the names of the copyright owners nor the names of its
+ contributors may be used to endorse or promote products derived from this
+ software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+===============================================================================
+
+License of crypto.cpp and crypto.h
+
+ Pseudorandom number generation support in this file is derived from
+ Tor's crypto.[ch]. Tor is distributed under this license.
+
+ Copyright (c) 2001-2004, Roger Dingledine
+ Copyright (c) 2004-2007, Roger Dingledine, Nick Mathewson
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following disclaimer
+ in the documentation and/or other materials provided with the
+ distribution.
+
+ * Neither the names of the copyright owners nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+==============================================================================
+
+License of zlibbytearray.cpp and zlibbytearray.h:
+
+ Zlib support in this class is derived from Tor's torgzip.[ch].
+ Tor is distributed under this license:
+
+ Copyright (c) 2001-2004, Roger Dingledine
+ Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following disclaimer
+ in the documentation and/or other materials provided with the
+ distribution.
+
+ * Neither the names of the copyright owners nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+==============================================================================
+
+License of bsdqueue.h:
+
+ Copyright (c) 1991, 1993
+ The Regents of the University of California. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the University nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+==============================================================================
+
+License of igd_desc_parse.c, igd_desc_parse.h, minisoap.c, minisoap.h,
+ minissdpc.c, minissdpc.h, miniupnpc.c, miniupnpc.h, miniupnpcmodule.c,
+ miniwget.c, miniwget.h, minixml.c, minixml.h, upnpcommands.c, upnpcommands.h,
+ upnperrors.c, upnperrors.h, upnpreplyparse.c and upnpreplyparse.h
+
+ Copyright (c) 2005-2007, Thomas BERNARD
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials
+ provided with the distribution.
+
+ * Neither the names of the copyright owners nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+==============================================================================
+
+Vidalia incorporates icons from KDE's Oxygen icon theme. It is
+licensed as follows:
+
+ Copyright (C) 2007 David Vignoni <david@xxxxxxxxxxxxx>
+ Copyright (C) 2007 Johann Ollivier Lapeyre <johann@xxxxxxxxxxxxxxxx>
+ Copyright (C) 2007 Kenneth Wimer <kwwii@xxxxxxxxxxxxxx>
+ Copyright (C) 2007 Nuno Fernades Pinheiro <nf.pinheiro@xxxxxxxxx>
+ Copyright (C) 2007 Riccardo Iaconelli <riccardo@xxxxxxxxxxxxxxxx>
+ Copyright (C) 2007 David Miller <miller@xxxxxxxxxxxxxxxx>
+
+and others
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 3 of the License, or (at your option) any later version.
+
+This library 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
+Library General Public License for more details.
+==============================================================================
+
+License of default.action and privoxy.config:
+
+ Copyright (C) 2001-2006 Privoxy Developers http://privoxy.org
+
+Privoxy is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License, version 2, as published
+by the Free Software Foundation.
+==============================================================================
+
+License of buildmpkg.sh.in and TorPostFlight:
+
+ This files are part of Vidalia, and are subject to the license terms found in
+ this copyright file.
+
+ buildmpkg.sh.in is derived from contrib/osx/package.sh from Tor
+ (https://www.torproject.org), licensed as follows:
+
+ Copyright (c) 2001-2004, Roger Dingledine
+ Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
+ Copyright (c) 2008, Andrew Lewman
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following disclaimer
+ in the documentation and/or other materials provided with the
+ distribution.
+
+ * Neither the names of the copyright owners nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+==============================================================================
+Tor is distributed under this license:
+
+Copyright (c) 2001-2004, Roger Dingledine
+Copyright (c) 2004-2007, Roger Dingledine, Nick Mathewson
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+ * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+
+ * Neither the names of the copyright owners nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+If you got Tor as a static binary with OpenSSL included, then you should know:
+ "This product includes software developed by the OpenSSL Project
+ for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+==============================================================================
+
+License of src/common/strlcat.c and src/common/strlcpy.c:
+
+ Copyright (c) 1998 Todd C. Miller <Todd.Miller@xxxxxxxxxxxxx>
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+==============================================================================
+
+
+On Debian systems, the complete text of the GNU General Public Licenses can be
+found in `/usr/share/common-licenses/'.
Deleted: vidalia/branches/auto-updates/debian/docs
Copied: vidalia/branches/auto-updates/debian/docs (from rev 3328, vidalia/trunk/debian/docs)
===================================================================
--- vidalia/branches/auto-updates/debian/docs (rev 0)
+++ vidalia/branches/auto-updates/debian/docs 2008-11-21 02:04:34 UTC (rev 3329)
@@ -0,0 +1,3 @@
+README
+CREDITS
+debian/FAQ
Deleted: vidalia/branches/auto-updates/debian/menu
Copied: vidalia/branches/auto-updates/debian/menu (from rev 3328, vidalia/trunk/debian/menu)
===================================================================
--- vidalia/branches/auto-updates/debian/menu (rev 0)
+++ vidalia/branches/auto-updates/debian/menu 2008-11-21 02:04:34 UTC (rev 3329)
@@ -0,0 +1,6 @@
+?package(vidalia):needs="X11"\
+ hints="Vidalia,Tor,Routing,Network Routing,Anonymous,Kde4,Onion"\
+ section="Applications/System/Security"\
+ title="Vidalia-Tor Onion Routing GUI"\
+ command="/usr/bin/vidalia"\
+ icon="/usr/share/pixmaps/vidalia.xpm"
Copied: vidalia/branches/auto-updates/debian/po (from rev 3328, vidalia/trunk/debian/po)
Deleted: vidalia/branches/auto-updates/debian/po/POTFILES.in
Copied: vidalia/branches/auto-updates/debian/po/POTFILES.in (from rev 3328, vidalia/trunk/debian/po/POTFILES.in)
===================================================================
--- vidalia/branches/auto-updates/debian/po/POTFILES.in (rev 0)
+++ vidalia/branches/auto-updates/debian/po/POTFILES.in 2008-11-21 02:04:34 UTC (rev 3329)
@@ -0,0 +1 @@
+[type: gettext/rfc822deb] templates
Deleted: vidalia/branches/auto-updates/debian/po/ca.po
Copied: vidalia/branches/auto-updates/debian/po/ca.po (from rev 3328, vidalia/trunk/debian/po/ca.po)
===================================================================
--- vidalia/branches/auto-updates/debian/po/ca.po (rev 0)
+++ vidalia/branches/auto-updates/debian/po/ca.po 2008-11-21 02:04:34 UTC (rev 3329)
@@ -0,0 +1,48 @@
+# Copyright (C) 2008 UlisesVitulli
+# This file is distributed under the same license as the Vidalia package.
+# Ulises Vitulli <uvitulli@xxxxxxxxx>
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: 0.1.9-1\n"
+"Report-Msgid-Bugs-To: vidalia@xxxxxxxxxxxxxxxxxxx\n"
+"POT-Creation-Date: 2008-09-18 00:31-0300\n"
+"PO-Revision-Date: 2008-09-17 16:17-0300\n"
+"Last-Translator: Ulises Vitulli <uvitulli@xxxxxxxxx>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"Do you want to stop the existing Tor process and let Vidalia start Tor?"
+msgstr ""
+"Voleu parar l'actual execució de Tor i permetre que Vidalia engegue Tor?"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"It looks like there is a Tor process already running. If you want to start "
+"Tor using Vidalia, you might have to stop the existing Tor process. "
+"Otherwise you will have to enable 'ControlPort' option into Tor as explained "
+"in the documentation carried with this package ('/usr/share/doc/vidalia/"
+"README.Debian')."
+msgstr ""
+"Pareix que encara està en marxa el Tor. Si voleu engegar Tor amb el Vidalia,"
+"hauríeu de detindre el procés de Tor què està en execució.Si no, haureu "
+"d'engegar l'opció «ControlPort» a Tor,tal com s'explica a la documentació que "
+"suministra aquest paquet(/usr/share/doc/vidalia/README.Debian)"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"Note that if you choose to let Vidalia start Tor, you will have to manually "
+"disable Tor starting automatically on every reboot (See 'README.Debian')."
+msgstr ""
+"Adoneu-vos que si trieu que Vidalia engegue Tor, haureu de deshabilitar de forma "
+"manual l'engegat de Tor automàtic a cada reinici (Vegeu «README.Debian»)."
Deleted: vidalia/branches/auto-updates/debian/po/de.po
Copied: vidalia/branches/auto-updates/debian/po/de.po (from rev 3328, vidalia/trunk/debian/po/de.po)
===================================================================
--- vidalia/branches/auto-updates/debian/po/de.po (rev 0)
+++ vidalia/branches/auto-updates/debian/po/de.po 2008-11-21 02:04:34 UTC (rev 3329)
@@ -0,0 +1,50 @@
+# Translation of vidalia debconf templates to German
+# Copyright (C) Helge Kreutzmann <debian@xxxxxxxxxxxxx>, 2008.
+# This file is distributed under the same license as the vidalia package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: vidalia\n"
+"Report-Msgid-Bugs-To: vidalia@xxxxxxxxxxxxxxxxxxx\n"
+"POT-Creation-Date: 2008-09-18 15:32-0300\n"
+"PO-Revision-Date: 2008-09-19 20:34+0200\n"
+"Last-Translator: Helge Kreutzmann <debian@xxxxxxxxxxxxx>\n"
+"Language-Team: de <debian-l10n-german@xxxxxxxxxxxxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid "Do you want to stop the existing Tor process and let Vidalia start Tor?"
+msgstr ""
+"Möchten Sie den vorhandenen Tor-Prozess anhalten und Tor von Vidalia starten "
+"lassen?"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"It looks like there is a Tor process already running. If you want to start "
+"Tor using Vidalia, you might have to stop the existing Tor process. "
+"Otherwise you will have to enable 'ControlPort' option into Tor as explained "
+"in the documentation carried with this package ('/usr/share/doc/vidalia/"
+"README.Debian')."
+msgstr ""
+"Ein Tor-Prozess scheint bereits zu laufen. Falls Sie Tor mittels Vidalia "
+"starten wollen, müssen Sie den vorhandenen Tor-Prozess anhalten. Andernfalls "
+"müssen Sie die Option »ControlPort« in Tor aktivieren, wie dies in der "
+"Dokumentation in diesem Paket (»/usr/share/doc/vidalia/README.Debian«) "
+"beschrieben ist."
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"Note that if you choose to let Vidalia start Tor, you will have to manually "
+"disable Tor starting automatically on every reboot (See 'README.Debian')."
+msgstr ""
+"Beachten Sie, dass Sie Tor manuell nach jedem Systemstart beenden müssen, "
+"falls Sie hier entscheiden, dass Tor durch Vidalia gestartet werden soll "
+"(lesen Sie »README.Debian«)."
Deleted: vidalia/branches/auto-updates/debian/po/es.po
Copied: vidalia/branches/auto-updates/debian/po/es.po (from rev 3328, vidalia/trunk/debian/po/es.po)
===================================================================
--- vidalia/branches/auto-updates/debian/po/es.po (rev 0)
+++ vidalia/branches/auto-updates/debian/po/es.po 2008-11-21 02:04:34 UTC (rev 3329)
@@ -0,0 +1,49 @@
+# Copyright (C) 2008 UlisesVitulli
+# This file is distributed under the same license as the Vidalia package.
+# Ulises Vitulli <uvitulli@xxxxxxxxx>
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: 0.1.9-1\n"
+"Report-Msgid-Bugs-To: vidalia@xxxxxxxxxxxxxxxxxxx\n"
+"POT-Creation-Date: 2008-09-18 00:31-0300\n"
+"PO-Revision-Date: 2008-09-17 16:17-0300\n"
+"Last-Translator: Ulises Vitulli <uvitulli@xxxxxxxxx>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"Do you want to stop the existing Tor process and let Vidalia start Tor?"
+msgstr ""
+"¿Desea detener el proceso Tor existente y dejar que Vidalia lo inicie?"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"It looks like there is a Tor process already running. If you want to start "
+"Tor using Vidalia, you might have to stop the existing Tor process. "
+"Otherwise you will have to enable 'ControlPort' option into Tor as explained "
+"in the documentation carried with this package ('/usr/share/doc/vidalia/"
+"README.Debian')."
+msgstr ""
+" Parece que hay un proceso Tor ya en marcha. Si desea iniciar Tor utilizando "
+"Vidalia, tendrá que detener el proceso actual de Tor. De lo contrario tendrá "
+"que activar la opción 'ControlPort' de Tor tal y como se explica en la "
+"documentación que acompaña este paquete ('/usr/share/doc/vidalia/README."
+"Debian')."
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"Note that if you choose to let Vidalia start Tor, you will have to manually "
+"disable Tor starting automatically on every reboot (See 'README.Debian')."
+msgstr ""
+"Tenga en cuenta que si decide dejar que Vidalia sea quien inicie Tor, tendrá "
+"que manualmente desactivar el inicio automático de Tor (Ver 'README.Debian')."
Deleted: vidalia/branches/auto-updates/debian/po/fi.po
Copied: vidalia/branches/auto-updates/debian/po/fi.po (from rev 3328, vidalia/trunk/debian/po/fi.po)
===================================================================
--- vidalia/branches/auto-updates/debian/po/fi.po (rev 0)
+++ vidalia/branches/auto-updates/debian/po/fi.po 2008-11-21 02:04:34 UTC (rev 3329)
@@ -0,0 +1,52 @@
+# Copyright (C) 2008 Esko Arajärvi <edu@xxxxxx>
+# This file is distributed under the same license as the Vidalia package.
+# Esko Arajärvi <edu@xxxxxx>
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: vidalia\n"
+"Report-Msgid-Bugs-To: vidalia@xxxxxxxxxxxxxxxxxxx\n"
+"POT-Creation-Date: 2008-09-18 15:32-0300\n"
+"PO-Revision-Date: \n"
+"Last-Translator: Esko Arajärvi <edu@xxxxxx>\n"
+"Language-Team: Finnish <debian-l10n-finnish@xxxxxxxxxxxxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Finnish\n"
+"X-Poedit-Country: FINLAND\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid "Do you want to stop the existing Tor process and let Vidalia start Tor?"
+msgstr ""
+"Tulisiko olemassa oleva Tor-prosessi keskeyttää ja käynnistää Tor Vidalian "
+"avulla?"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"It looks like there is a Tor process already running. If you want to start "
+"Tor using Vidalia, you might have to stop the existing Tor process. "
+"Otherwise you will have to enable 'ControlPort' option into Tor as explained "
+"in the documentation carried with this package ('/usr/share/doc/vidalia/"
+"README.Debian')."
+msgstr ""
+"Näyttää siltä, että Tor-prosessi on jo käynnissä. Jos Tor halutaan "
+"käynnistää Vidalian avulla, olemassa oleva Tor-prosessi täytyy ehkä "
+"keskeyttää. Muussa tapauksessa Torin valitsin ”ControlPort” täytyy ottaa "
+"käyttöön paketin dokumentaatiossa kerrotulla tavalla (tiedostossa /usr/share/"
+"doc/vidalia/README.Debian). "
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"Note that if you choose to let Vidalia start Tor, you will have to manually "
+"disable Tor starting automatically on every reboot (See 'README.Debian')."
+msgstr ""
+"Jos Tor käynnistetään Vidalialla, täytyy Torin automaattinen käynnistyminen "
+"järjestelmän käynnistymisen yhteydessä ottaa pois käytöstä. (Katso tiedostoa "
+"README.Debian.)"
Deleted: vidalia/branches/auto-updates/debian/po/fr.po
Copied: vidalia/branches/auto-updates/debian/po/fr.po (from rev 3328, vidalia/trunk/debian/po/fr.po)
===================================================================
--- vidalia/branches/auto-updates/debian/po/fr.po (rev 0)
+++ vidalia/branches/auto-updates/debian/po/fr.po 2008-11-21 02:04:34 UTC (rev 3329)
@@ -0,0 +1,52 @@
+# Translation of vidalia debconf templates to French
+# Copyright (C) 2008 Christian Perrier <bubulle@xxxxxxxxxx>
+# This file is distributed under the same license as the vidalia package.
+#
+# Christian Perrier <bubulle@xxxxxxxxxx>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: fr\n"
+"Report-Msgid-Bugs-To: vidalia@xxxxxxxxxxxxxxxxxxx\n"
+"POT-Creation-Date: 2008-09-18 15:32-0300\n"
+"PO-Revision-Date: 2008-09-19 07:18+0200\n"
+"Last-Translator: Christian Perrier <bubulle@xxxxxxxxxx>\n"
+"Language-Team: French <debian-l10n-french@xxxxxxxxxxxxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid "Do you want to stop the existing Tor process and let Vidalia start Tor?"
+msgstr ""
+"Faut-il interrompre le processus Tor en cours et laisser Vidalia démarrer "
+"Tor ?"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"It looks like there is a Tor process already running. If you want to start "
+"Tor using Vidalia, you might have to stop the existing Tor process. "
+"Otherwise you will have to enable 'ControlPort' option into Tor as explained "
+"in the documentation carried with this package ('/usr/share/doc/vidalia/"
+"README.Debian')."
+msgstr ""
+"Un processus Tor semble être en cours d'exécution. Si vous souhaitez lancer "
+"Tor avec Vidalia, il peut être nécessaire d'interrompre ce processus. Dans "
+"le cas contraire, vous devrez activer l'option « ControlPort » de Tor, selon "
+"les instructions fournies avec ce paquet dans le fichier usr/share/doc/"
+"vidalia/README.Debian."
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"Note that if you choose to let Vidalia start Tor, you will have to manually "
+"disable Tor starting automatically on every reboot (See 'README.Debian')."
+msgstr ""
+"Veuillez noter que si vous choisissez de lancer Tor avec Vidalia, il sera "
+"nécessaire de désactiver le lancement automatique de Tor au démarrage du "
+"système (comme expliqué dans le fichier README.Debian)."
Deleted: vidalia/branches/auto-updates/debian/po/it.po
Copied: vidalia/branches/auto-updates/debian/po/it.po (from rev 3328, vidalia/trunk/debian/po/it.po)
===================================================================
--- vidalia/branches/auto-updates/debian/po/it.po (rev 0)
+++ vidalia/branches/auto-updates/debian/po/it.po 2008-11-21 02:04:34 UTC (rev 3329)
@@ -0,0 +1,47 @@
+# Copyright (C) 2008 Vincenzo Campanella
+# This file is distributed under the same license as the Vidalia package.
+# Vincenzo Campanella <vinz65@xxxxxxxxx>
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: 0.1.9-1\n"
+"Report-Msgid-Bugs-To: vidalia@xxxxxxxxxxxxxxxxxxx\n"
+"POT-Creation-Date: 2008-09-18 15:32-0300\n"
+"PO-Revision-Date: 2008-09-17 16:17-0300\n"
+"Last-Translator: Vincenzo Campanella <vinz65@xxxxxxxxx>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid "Do you want to stop the existing Tor process and let Vidalia start Tor?"
+msgstr "Vuoi arrestare il processo di Tor esistente e che Vidalia avvii Tor?"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"It looks like there is a Tor process already running. If you want to start "
+"Tor using Vidalia, you might have to stop the existing Tor process. "
+"Otherwise you will have to enable 'ControlPort' option into Tor as explained "
+"in the documentation carried with this package ('/usr/share/doc/vidalia/"
+"README.Debian')."
+msgstr ""
+"Sembra che ci sia già un processo di Tor in esecuzione. Se vuoi avviare Tor "
+"utilizzando Vidalia, dovresti arrestare il processo di Tor in esecuzione. In "
+"caso contrario dovrai abilitare l'opzione 'ControlPort' in Tor come "
+"illustrato nella documentazione allegata a questo pacchetto ('usr/share/doc/"
+"vidalia/README.Debian')."
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"Note that if you choose to let Vidalia start Tor, you will have to manually "
+"disable Tor starting automatically on every reboot (See 'README.Debian')."
+msgstr ""
+"Nota che se scegli che Vidalia avvii Tor, dovrai disabilitare manualmente "
+"l'esecuzione automatica di Tor ad ogni riavvio (vedi 'README.Debian')."
Deleted: vidalia/branches/auto-updates/debian/po/pt.po
Copied: vidalia/branches/auto-updates/debian/po/pt.po (from rev 3328, vidalia/trunk/debian/po/pt.po)
===================================================================
--- vidalia/branches/auto-updates/debian/po/pt.po (rev 0)
+++ vidalia/branches/auto-updates/debian/po/pt.po 2008-11-21 02:04:34 UTC (rev 3329)
@@ -0,0 +1,51 @@
+# translation of vidalia debconf to Portuguese
+# Copyright (C) 2008 Américo Monteiro
+# This file is distributed under the same license as the vidalia package.
+#
+# Américo Monteiro <a_monteiro@xxxxxxxxxx>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: vidalia 0.1.9-1\n"
+"Report-Msgid-Bugs-To: vidalia@xxxxxxxxxxxxxxxxxxx\n"
+"POT-Creation-Date: 2008-09-18 15:32-0300\n"
+"PO-Revision-Date: 2008-09-19 21:35+0100\n"
+"Last-Translator: Américo Monteiro <a_monteiro@xxxxxxxxxx>\n"
+"Language-Team: Portuguese <traduz@xxxxxxxxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid "Do you want to stop the existing Tor process and let Vidalia start Tor?"
+msgstr ""
+"Deseja parar o processo Tor existente e deixar o Vidalia iniciar o Tor?"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"It looks like there is a Tor process already running. If you want to start "
+"Tor using Vidalia, you might have to stop the existing Tor process. "
+"Otherwise you will have to enable 'ControlPort' option into Tor as explained "
+"in the documentation carried with this package ('/usr/share/doc/vidalia/"
+"README.Debian')."
+msgstr ""
+"Parece que já existe um processo Tor a correr. Se você deseja iniciar o Tor "
+"usando o Vidalia, você poderá ter que parar o processo Tor existente. Caso "
+"contrário você terá que activar a opção 'ControlPort' no Tor como está "
+"explicado na documentação que acompanha este pacote ('/usr/share/doc/vidalia/"
+"README.Debian')."
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"Note that if you choose to let Vidalia start Tor, you will have to manually "
+"disable Tor starting automatically on every reboot (See 'README.Debian')."
+msgstr ""
+"Note que se você deseja que o Vidalia inicie o Tor, você terá que desactivar "
+"manualmente o arranque automático do Tor a cada arranque da máquina (veja "
+"'README.Debian')."
Deleted: vidalia/branches/auto-updates/debian/po/ru.po
Copied: vidalia/branches/auto-updates/debian/po/ru.po (from rev 3328, vidalia/trunk/debian/po/ru.po)
===================================================================
--- vidalia/branches/auto-updates/debian/po/ru.po (rev 0)
+++ vidalia/branches/auto-updates/debian/po/ru.po 2008-11-21 02:04:34 UTC (rev 3329)
@@ -0,0 +1,51 @@
+# translation of ru.po to Russian
+# Copyright (C) 2008 Yuri Kozlov
+# This file is distributed under the same license as the vidalia package.
+#
+# Yuri Kozlov <kozlov.y@xxxxxxxxx>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: ru\n"
+"Report-Msgid-Bugs-To: vidalia@xxxxxxxxxxxxxxxxxxx\n"
+"POT-Creation-Date: 2008-09-18 15:32-0300\n"
+"PO-Revision-Date: 2008-09-18 23:02+0400\n"
+"Last-Translator: Yuri Kozlov <kozlov.y@xxxxxxxxx>\n"
+"Language-Team: Russian <debian-l10n-russian@xxxxxxxxxxxxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid "Do you want to stop the existing Tor process and let Vidalia start Tor?"
+msgstr "Остановить работающий процесс Tor и позволить Vidalia запустить Tor?"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"It looks like there is a Tor process already running. If you want to start "
+"Tor using Vidalia, you might have to stop the existing Tor process. "
+"Otherwise you will have to enable 'ControlPort' option into Tor as explained "
+"in the documentation carried with this package ('/usr/share/doc/vidalia/"
+"README.Debian')."
+msgstr ""
+"Кажется, что процесс Tor уже запущен. Если вы хотите запустить Tor используя "
+"Vidalia, то нужно остановить работающий процесс Tor. Или же вы можете "
+"включить параметр 'ControlPort' в Tor (см. документацию по этому пакету, "
+"файл /usr/share/doc/vidalia/README.Debian)."
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"Note that if you choose to let Vidalia start Tor, you will have to manually "
+"disable Tor starting automatically on every reboot (See 'README.Debian')."
+msgstr ""
+"Заметим, что если вы выберете запуск Tor с помощью Vidalia, то вам нужно "
+"самостоятельно выключить автоматический запуск Tor при включении машины (см. "
+"'README.Debian')."
Deleted: vidalia/branches/auto-updates/debian/po/templates.pot
Copied: vidalia/branches/auto-updates/debian/po/templates.pot (from rev 3328, vidalia/trunk/debian/po/templates.pot)
===================================================================
--- vidalia/branches/auto-updates/debian/po/templates.pot (rev 0)
+++ vidalia/branches/auto-updates/debian/po/templates.pot 2008-11-21 02:04:34 UTC (rev 3329)
@@ -0,0 +1,41 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: vidalia@xxxxxxxxxxxxxxxxxxx\n"
+"POT-Creation-Date: 2008-09-18 15:32-0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid "Do you want to stop the existing Tor process and let Vidalia start Tor?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"It looks like there is a Tor process already running. If you want to start "
+"Tor using Vidalia, you might have to stop the existing Tor process. "
+"Otherwise you will have to enable 'ControlPort' option into Tor as explained "
+"in the documentation carried with this package ('/usr/share/doc/vidalia/"
+"README.Debian')."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"Note that if you choose to let Vidalia start Tor, you will have to manually "
+"disable Tor starting automatically on every reboot (See 'README.Debian')."
+msgstr ""
Deleted: vidalia/branches/auto-updates/debian/po/zh_CN.po
Copied: vidalia/branches/auto-updates/debian/po/zh_CN.po (from rev 3328, vidalia/trunk/debian/po/zh_CN.po)
===================================================================
--- vidalia/branches/auto-updates/debian/po/zh_CN.po (rev 0)
+++ vidalia/branches/auto-updates/debian/po/zh_CN.po 2008-11-21 02:04:34 UTC (rev 3329)
@@ -0,0 +1,47 @@
+# Copyright (C) 2008 Vern Sun
+# This file is distributed under the same license as the Vidalia package.
+# Vern Sun <s5unty@xxxxxxxxx>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia 0.1.0\n"
+"Report-Msgid-Bugs-To: vidalia@xxxxxxxxxxxxxxxxxxx\n"
+"POT-Creation-Date: 2008-09-18 00:31-0300\n"
+"PO-Revision-Date: 2008-05-21 21:26+0800\n"
+"Last-Translator: Vern Sun <s5unty@xxxxxxxxx>\n"
+"Language-Team: Simplified Chinese <debian-chinese-gb@xxxxxxxxxxxxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"Do you want to stop the existing Tor process and let Vidalia start Tor?"
+msgstr "您希望停止正在运行的 Tor 进程并且让 Vidalia 启动 Tor 吗？"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"It looks like there is a Tor process already running. If you want to start "
+"Tor using Vidalia, you might have to stop the existing Tor process. "
+"Otherwise you will have to enable 'ControlPort' option into Tor as explained "
+"in the documentation carried with this package ('/usr/share/doc/vidalia/"
+"README.Debian')."
+msgstr ""
+"看起来这里已经有一个 Tor 程序正在运行。如果您想用 Vidalia 启动 Tor，您或许要"
+"停止当前正在运行的 Tor 程序。否则您应该像本软件包提供的说明('/usr/share/doc/"
+"vidalia/README.Debian')那样启用 Tor 的 'ControlPort' 选项。"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"Note that if you choose to let Vidalia start Tor, you will have to manually "
+"disable Tor starting automatically on every reboot (See 'README.Debian')."
+msgstr ""
+"请注意如果您选择让 Vidalia 启动 Tor，那么您应该手工禁止 Tor 在每次计算机重启"
+"时自动运行 (请参考 'README.Debian')。"
+
Deleted: vidalia/branches/auto-updates/debian/postinst
Copied: vidalia/branches/auto-updates/debian/postinst (from rev 3328, vidalia/trunk/debian/postinst)
===================================================================
--- vidalia/branches/auto-updates/debian/postinst (rev 0)
+++ vidalia/branches/auto-updates/debian/postinst 2008-11-21 02:04:34 UTC (rev 3329)
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+#DEBHELPER#
+
+. /usr/share/debconf/confmodule
+
+db_stop
+exit 0
Deleted: vidalia/branches/auto-updates/debian/rules
Copied: vidalia/branches/auto-updates/debian/rules (from rev 3328, vidalia/trunk/debian/rules)
===================================================================
--- vidalia/branches/auto-updates/debian/rules (rev 0)
+++ vidalia/branches/auto-updates/debian/rules 2008-11-21 02:04:34 UTC (rev 3329)
@@ -0,0 +1,89 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+
+configure: configure-stamp
+configure-stamp:
+ dh_testdir
+ touch configure-stamp
+
+build: build-stamp
+
+build-stamp:
+ dh_testdir
+ mkdir -p debian/build;
+ cd debian/build; \
+ cmake ../.. -DCMAKE_INSTALL_PREFIX=/usr; \
+ make
+ touch $@
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp CMakeCache.txt doc/Doxyfile \
+ doc/vidalia.1 src/vidalia/res/vidalia_win.rc
+ rm -rf debian/build CMakeFiles
+ for f in src/vidalia/i18n/*.qm; do\
+ rm -rf $$f; \
+ done
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs usr/share/pixmaps
+ # Install the package
+ cd debian/build; \
+ make install DESTDIR=$(CURDIR)/debian/vidalia
+ dh_install debian/vidalia.xpm usr/share/pixmaps
+ dh_install debian/vidalia.desktop usr/share/applications
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installdocs
+ dh_installchangelogs CHANGELOG
+ dh_installman doc/vidalia.1
+ dh_installdebconf
+ dh_installmenu
+ dh_desktop
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
Deleted: vidalia/branches/auto-updates/debian/templates
Copied: vidalia/branches/auto-updates/debian/templates (from rev 3328, vidalia/trunk/debian/templates)
===================================================================
--- vidalia/branches/auto-updates/debian/templates (rev 0)
+++ vidalia/branches/auto-updates/debian/templates 2008-11-21 02:04:34 UTC (rev 3329)
@@ -0,0 +1,11 @@
+Template: vidalia/info
+Type: boolean
+Default: true
+_Description: Do you want to stop the existing Tor process and let Vidalia start Tor?
+ It looks like there is a Tor process already running. If you want to start Tor
+ using Vidalia, you might have to stop the existing Tor process. Otherwise you
+ will have to enable 'ControlPort' option into Tor as explained in the documentation
+ carried with this package ('/usr/share/doc/vidalia/README.Debian').
+ .
+ Note that if you choose to let Vidalia start Tor, you will have to manually disable
+ Tor starting automatically on every reboot (See 'README.Debian').
Deleted: vidalia/branches/auto-updates/debian/vidalia.desktop
Copied: vidalia/branches/auto-updates/debian/vidalia.desktop (from rev 3328, vidalia/trunk/debian/vidalia.desktop)
===================================================================
--- vidalia/branches/auto-updates/debian/vidalia.desktop (rev 0)
+++ vidalia/branches/auto-updates/debian/vidalia.desktop 2008-11-21 02:04:34 UTC (rev 3329)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=Vidalia
+GenericName=GUI controller for Tor Onion Routing Network
+Comment=GUI controller for Tor Onion Routing Network
+Exec=/usr/bin/vidalia
+Terminal=false
+Type=Application
+Icon=/usr/share/pixmaps/vidalia.xpm
+Categories=Network;Qt;Security;
Deleted: vidalia/branches/auto-updates/debian/vidalia.xpm
Copied: vidalia/branches/auto-updates/debian/vidalia.xpm (from rev 3328, vidalia/trunk/debian/vidalia.xpm)
===================================================================
--- vidalia/branches/auto-updates/debian/vidalia.xpm (rev 0)
+++ vidalia/branches/auto-updates/debian/vidalia.xpm 2008-11-21 02:04:34 UTC (rev 3329)
@@ -0,0 +1,150 @@
+/* XPM */
+static char *vidalia[] = {
+/* columns rows colors chars-per-pixel */
+"30 30 114 2",
+" c #010101",
+". c #0A0A0A",
+"X c #131313",
+"o c #1B1B1B",
+"O c #242424",
+"+ c #2C2C2C",
+"@ c #333333",
+"# c #373A37",
+"$ c #3B3C3B",
+"% c #196919",
+"& c #205D20",
+"* c #324132",
+"= c #3B4E3B",
+"- c #246724",
+"; c #3C6D3C",
+": c #434343",
+"> c #454A45",
+", c #4B4B4B",
+"< c #4A534A",
+"1 c #545454",
+"2 c #5B5C5B",
+"3 c #476847",
+"4 c #5B625B",
+"5 c #587858",
+"6 c #636463",
+"7 c #606B60",
+"8 c #6B6B6B",
+"9 c #657A65",
+"0 c #6F766F",
+"q c #737473",
+"w c #707D70",
+"e c #7B7B7B",
+"r c #078907",
+"t c #039303",
+"y c #009C00",
+"u c #0C9E0C",
+"i c #119411",
+"p c #03A103",
+"a c #03AB02",
+"s c #09A409",
+"d c #10A90F",
+"f c #01B300",
+"g c #0DB20C",
+"h c #0DB80C",
+"j c #10B60F",
+"k c #19A619",
+"l c #13B912",
+"z c #28A528",
+"x c #2AA92A",
+"c c #3BB63B",
+"v c #3EC03D",
+"b c #479747",
+"n c #5C945C",
+"m c #599A59",
+"M c #40B940",
+"N c #58A758",
+"B c #54B754",
+"V c #6D816D",
+"C c #679B67",
+"Z c #6C9A6C",
+"A c #738473",
+"S c #788478",
+"D c #7F8A7F",
+"F c #6FA26F",
+"G c #60BA60",
+"H c #6AB76A",
+"J c #5BCD5A",
+"K c #6ACC69",
+"L c #7FCE7E",
+"P c #828282",
+"I c #848A84",
+"U c #8C8C8C",
+"Y c #929392",
+"T c #969896",
+"R c #9C9D9C",
+"E c #9BAA9B",
+"W c gray65",
+"Q c #A3ABA3",
+"! c #ACACAC",
+"~ c #ACB0AC",
+"^ c #B4B4B4",
+"/ c #B9B9B9",
+"( c #96C296",
+") c #96CD96",
+"_ c #A5C3A5",
+"` c #A3CFA3",
+"' c #A8C6A8",
+"] c #ADC8AD",
+"[ c #B4CCB4",
+"{ c #B8C7B8",
+"} c #BDCEBD",
+"| c #B4D3B4",
+" . c #B4D8B4",
+".. c #BADCBA",
+"X. c #C4C4C4",
+"o. c #C2CBC2",
+"O. c #CCCCCC",
+"+. c #C3D3C3",
+"@. c #C0DDC0",
+"#. c #CBDCCB",
+"$. c #D4D4D4",
+"%. c #DDDDDD",
+"&. c #C7E4C7",
+"*. c #CFE1CF",
+"=. c #D3EBD3",
+"-. c #DFE5DF",
+";. c #D8EAD8",
+":. c #D5F1D5",
+">. c #DBF1DB",
+",. c #E4E4E4",
+"<. c #ECECEC",
+"1. c #E5F6E5",
+"2. c gray94",
+"3. c None",
+/* pixels */
+"3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.",
+"3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.",
+"3.3.3.3.3.3.3.3.3.3.3. o + + o 3.3.3.3.3.3.3.3.3.3.3.",
+"3.3.3.3.3.3.3.3.3. 1 W ,.,.%.%.%.$.R , 3.3.3.3.3.3.3.3.3.",
+"3.3.3.3.3.3.3. , $.%.T 6 8 1 , 6 6 U X./ : 3.3.3.3.3.3.3.",
+"3.3.3.3.3.3.. Y <.U 2 > , 4 9 V 7 , , 2 e O.P . 3.3.3.3.3.3.",
+"3.3.3.3.3.. ! $.1 < < n ) :.1.1.>.` F w q 1 / Y . 3.3.3.3.3.",
+"3.3.3.3. Y $.1 $ ; B =.] S q q I [ >.G Z I 1 ^ q 3.3.3.3.",
+"3.3.3.3., %., # - c =.2 , 1 2 6 2 1 8 ;.M m T 1 ^ $ 3.3.3.3.",
+"3.3.3.. O.P > & p &.> + # : > , > : # 2 ..d C R q Y 3.3.3.",
+"3.3.3.1 O.2 * t J D . o O + @ @ @ + O o Q v u Q 8 R @ 3.3.3.",
+"3.3. R U > % a .o . X o o o o o X . $ ( f N ~ q 6 3.3.",
+"3.3. O.6 # r f #. . . . +.f k O.1 e 3.3.",
+"3.3.o $.6 = y h } +.l a { 2 P . 3.3.",
+"3.3.+ O.6 3 p | Y 4 *.j _ 8 e X 3.3.",
+"3.3.+ O.6 5 s +. o.j ' 8 8 X 3.3.",
+"3.3.o O.6 A y @.. . +.a +., , . 3.3.",
+"3.3. X.6 U i K 0 4 L k %.@ # 3.3.",
+"3.3. U P Y b a #.o . #.g H X.> O 3.3.",
+"3.3.3.: ^ 8 E z #.O o #.x #.2 : X 3.3.3.",
+"3.3.3. R q W o.O O -.O., @ 3.3.3.",
+"3.3.3.3.# W 1 X.2 8 <., : X 3.3.3.3.",
+"3.3.3.3. 6 Y 1 O.P . . Y <., : O 3.3.3.3.",
+"3.3.3.3.3.. 8 P , X.O.6 o o 8 ,.%.: : O 3.3.3.3.3.",
+"3.3.3.3.3.3. , e 2 2 X.%.O./ / O.2.%.6 , : O 3.3.3.3.3.3.",
+"3.3.3.3.3.3.3. O 1 1 , @ , 6 6 2 @ , : @ X 3.3.3.3.3.3.3.",
+"3.3.3.3.3.3.3.3.3. X O @ $ > , $ @ O X 3.3.3.3.3.3.3.3.3.",
+"3.3.3.3.3.3.3.3.3.3.3. . . . 3.3.3.3.3.3.3.3.3.3.3.",
+"3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.",
+"3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3."
+};
Deleted: vidalia/branches/auto-updates/debian/watch
Copied: vidalia/branches/auto-updates/debian/watch (from rev 3328, vidalia/trunk/debian/watch)
===================================================================
--- vidalia/branches/auto-updates/debian/watch (rev 0)
+++ vidalia/branches/auto-updates/debian/watch 2008-11-21 02:04:34 UTC (rev 3329)
@@ -0,0 +1,3 @@
+version=3
+
+http://vidalia-project.net:8001/vidalia/vidalia-(.*)\.tar\.gz
Copied: vidalia/branches/auto-updates/pkg/osx/background.png (from rev 3328, vidalia/trunk/pkg/osx/background.png)
===================================================================
(Binary files differ)
Copied: vidalia/branches/auto-updates/pkg/osx/bundle-background.png (from rev 3328, vidalia/trunk/pkg/osx/bundle-background.png)
===================================================================
(Binary files differ)
Copied: vidalia/branches/auto-updates/pkg/osx/nonbundle-ds_store (from rev 3328, vidalia/trunk/pkg/osx/nonbundle-ds_store)
===================================================================
(Binary files differ)
Modified: vidalia/branches/auto-updates/pkg/package.sh
===================================================================
--- vidalia/branches/auto-updates/pkg/package.sh 2008-11-20 04:37:44 UTC (rev 3328)
+++ vidalia/branches/auto-updates/pkg/package.sh 2008-11-21 02:04:34 UTC (rev 3329)
@@ -11,10 +11,8 @@
## the terms described in the LICENSE file.
##
-
# Builds distribution packages for various platforms.
-
# Check for proper script arguments
if [ "$#" -eq 0 ]
then
@@ -22,7 +20,6 @@
exit 1
fi
-
# Make the distribution depending on what type was requested
case "$1" in
#
@@ -48,11 +45,15 @@
# OS X .dmg
#
"osx")
- cp -R ../src/vidalia/Vidalia.app ../
+ mkdir ../LEGAL ../.background
+ cp -R ../README ../src/vidalia/Vidalia.app ../
+ cp osx/background.png ../.background/
+ cp osx/nonbundle-ds_store ../.DS_Store
+ cp ../CREDITS ../CHANGELOG ../Vidalia.app/
+ cp ../LICENSE ../LICENSE-GPLV2 ../LICENSE-GPLV3 ../LICENSE-LGPLV3 ../LICENSE-OPENSSL ../LEGAL/
+ cp -R ../LEGAL ../Vidalia.app/
srcdir="../"
- srcfiles="Vidalia.app README CREDITS CHANGELOG"
- srcfiles="$srcfiles LICENSE LICENSE-GPLV2 LICENSE-GPLV3"
- srcfiles="$srcfiles LICENSE-LGPLV3 LICENSE-OPENSSL"
+ srcfiles="Vidalia.app README LEGAL .background .DS_Store"
osx/builddmg.sh "$srcdir" "$srcfiles"
;;
@@ -62,7 +63,7 @@
"osx-bundle")
if [ $# -ne 4 ]
then
- echo "Usage: $0 osx-bundle <path-to-tor> <path-to-polipo> <path-to-torbutton>"
+ echo "Usage: $0 osx-bundle <path-to-tor> <path-to-polipo> <path-to-torbutton-file>"
exit 1
fi
torpath="$2"
Modified: vidalia/branches/auto-updates/pkg/win32/CMakeLists.txt
===================================================================
--- vidalia/branches/auto-updates/pkg/win32/CMakeLists.txt 2008-11-20 04:37:44 UTC (rev 3328)
+++ vidalia/branches/auto-updates/pkg/win32/CMakeLists.txt 2008-11-21 02:04:34 UTC (rev 3329)
@@ -41,7 +41,12 @@
${CMAKE_CURRENT_BINARY_DIR}/vidalia.nsi
@ONLY
)
-
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/vidalia.wxs.in
+ ${CMAKE_CURRENT_BINARY_DIR}/vidalia.wxs
+ @ONLY
+)
+
if (CONFIGURE_BUNDLE_NSI)
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/vidalia-bundle.nsi.in
Modified: vidalia/branches/auto-updates/pkg/win32/es/vidalia_es.po
===================================================================
--- vidalia/branches/auto-updates/pkg/win32/es/vidalia_es.po 2008-11-20 04:37:44 UTC (rev 3328)
+++ vidalia/branches/auto-updates/pkg/win32/es/vidalia_es.po 2008-11-21 02:04:34 UTC (rev 3329)
@@ -3,8 +3,8 @@
"Project-Id-Version: Vidalia Windows Installers\n"
"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2008-07-18 08:57+0000\n"
-"Last-Translator: Mfr <mfr@xxxxxxxxxxxxxxx>\n"
+"PO-Revision-Date: 2008-09-16 08:15+0000\n"
+"Last-Translator: Susan Neni Meiro <y57ctq_translation@xxxxxxxxxxxxx>\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -36,21 +36,32 @@
"\n"
"$_CLICK"
msgstr ""
-"Este procedimiento le guiara a través de la instalación de Tor, Vidalia, "
+"Este asistente le guiará a través de la instalación de Tor, Vidalia, "
"Privoxy, y Torbutton.\n"
"\n"
+"Tor es un sistema para anonimizar Internet, ayudándolo a anonimizar su "
+"navegación Web y publicaciones, mensajería instantánea, IRC, y más. Vidalia "
+"es una interfaz de usuario que le ayuda a controlar, monotorizar y "
+"configurar Tor.\n"
+"\n"
+"Privoxy es un proxy de filtrado de web que proteje su privacidad y ayuda a "
+"eliminar publicidad, banners y popups.\n"
+"\n"
+"Torbutton es una extensión para Firefox que le permite habilitar o "
+"deshabilitar rapidamente la navegación anónima por la web.\n"
+"\n"
"Si ha instalado previamente Tor, Vidalia, Privoxy, o Firefox, por favor "
-"asegúrese que no se estén ejecutando antes de continuar esta instalación.\n"
+"asegúrese que no se estén ejecutando antes de continuar con la instalación.\n"
"\n"
"$_CLICK"
msgctxt "BundleWelcomeTitle"
msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
-msgstr "Bienvenido al procedimiento de instalación de ${BUNDLE_NAME}"
+msgstr "Bienvenido al asistente de instalación de ${BUNDLE_NAME}"
msgctxt "BundleLinkText"
msgid "${TOR_NAME} installation documentation"
-msgstr "documentación de instalación de ${TOR_NAME}"
+msgstr "Documentación de instalación de ${TOR_NAME}"
msgctxt "BundleFinishText"
msgid ""
@@ -64,19 +75,21 @@
"Por favor vea https://www.torproject.org/docs/tor-doc-windows para aprender "
"como configurar sus aplicaciones para que usen Tor.\n"
"\n"
-"Si instalo Torbutton, necesitara reiniciar Firefox."
+"Si instaló Torbutton, necesitará reiniciar Firefox."
msgctxt "BundleRunNow"
msgid "Run installed components now"
-msgstr "Ejecutar los componentes instalados"
+msgstr "Ejecutar los componentes instalados ahora"
msgctxt "VidaliaGroupDesc"
msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
msgstr ""
+"Vidalia es una interfaz de usuario que le ayuda a controlar, monitorizar y "
+"configurar Tor."
msgctxt "VidaliaUninstDesc"
msgid "Remove ${VIDALIA_DESC}."
-msgstr ""
+msgstr "Eliminar ${VIDALIA_DESC}."
msgctxt "VidaliaSetupCaption"
msgid "${VIDALIA_NAME} setup"
@@ -89,37 +102,40 @@
"\n"
"$_CLICK"
msgstr ""
-"Este procedimiento le guiara a través de la instalación de ${VIDALIA_DESC}.\n"
+"Este asistente le guiará a través de la instalación de Vidalia, una interfaz "
+"de usuario que le ayuda a controlar, monotorizar y configurar Tor.\n"
"\n"
"$_CLICK"
msgctxt "VidaliaWelcomeTitle"
msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
-msgstr "Bienvenido al procedimiento de instalación de ${VIDALIA_NAME}"
+msgstr "Bienvenido al asistente de instalación de ${VIDALIA_NAME}"
msgctxt "VidaliaLinkText"
msgid "${VIDALIA_NAME} homepage"
-msgstr "Pagina de internet de ${VIDALIA_NAME}"
+msgstr "Pagina de Internet de ${VIDALIA_NAME}"
msgctxt "VidaliaAppDesc"
msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
msgstr ""
+"Vidalia es una interfaz de usuario que le ayuda a controlar, monitorizar y "
+"configurar Tor."
msgctxt "VidaliaStartup"
msgid "Run At Startup"
-msgstr ""
+msgstr "Ejecutar al inciar sesión"
msgctxt "VidaliaStartupDesc"
msgid "Automatically run ${VIDALIA_NAME} at startup."
-msgstr "Automaticamente ejecutar ${VIDALIA_NAME} al iniciar sesión."
+msgstr "Ejecutar automáticamente ${VIDALIA_NAME} al iniciar sesión."
msgctxt "VidaliaShortcuts"
msgid "Add to Start Menu"
-msgstr ""
+msgstr "Añadir al menú Inicio"
msgctxt "VidaliaShortcutsDesc"
msgid "Add ${VIDALIA_NAME} to your Start menu."
-msgstr "Agregar ${VIDALIA_NAME} a su Menu Inicio."
+msgstr "Añadir ${VIDALIA_NAME} al menú Inicio."
msgctxt "VidaliaRunNow"
msgid "Run ${VIDALIA_NAME}"
@@ -130,10 +146,12 @@
"Tor is a system for using the Internet anonymously, helping you anonymize "
"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
+"Tor es un sistema para anonimizar Internet, ayudándolo a anonimizar su "
+"navegación Web y publicaciones, mensajería instantánea, IRC, y más."
msgctxt "TorUninstDesc"
msgid "Remove ${TOR_DESC}."
-msgstr ""
+msgstr "Eliminar ${TOR_DESC}."
msgctxt "TorAppDesc"
msgid "Install ${TOR_DESC}."
@@ -145,14 +163,13 @@
"$\n"
"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
-"Ya tiene un archivo de configuración de Tor.$\n"
+"Se ha encontrado una configuración de Tor.$\n"
"$\n"
-"¿Desea sobreescribirlo con el archivo de configuración de muestra "
-"predeterminado?"
+"¿Desea sobrescribirla con la configuración predeterminada?"
msgctxt "TorDocumentation"
msgid "Documentation"
-msgstr "Documentació"
+msgstr "Documentación"
msgctxt "TorDocumentationDesc"
msgid "Install ${TOR_NAME} documentation."
@@ -160,21 +177,23 @@
msgctxt "TorShortcuts"
msgid "Add to Start Menu"
-msgstr ""
+msgstr "Añadir al menú Inicio"
msgctxt "TorShortcutsDesc"
msgid "Add ${TOR_NAME} to your Start menu."
-msgstr "Agregar ${TOR_NAME} a su Menu Inicio."
+msgstr "Añadir ${TOR_NAME} al menú Inicio"
msgctxt "PrivoxyGroupDesc"
msgid ""
"Privoxy is a filtering web proxy that protects your privacy and helps remove "
"ads, banners, and popups."
msgstr ""
+"Privoxy es un proxy de filtrado de web que protege su privacidad y ayuda a "
+"eliminar publicidad, banners y popups."
msgctxt "PrivoxyUninstDesc"
msgid "Remove ${PRIVOXY_DESC}."
-msgstr ""
+msgstr "Eliminar ${PRIVOXY_DESC}."
msgctxt "PrivoxyAppDesc"
msgid "Install ${PRIVOXY_DESC}."
@@ -182,11 +201,11 @@
msgctxt "PrivoxyShortcuts"
msgid "Add to Start Menu"
-msgstr "Agregar al Menu Inicio"
+msgstr "Añadir al menú Inicio"
msgctxt "PrivoxyShortcutsDesc"
msgid "Add ${PRIVOXY_NAME} to your Start menu."
-msgstr "Agregar ${PRIVOXY_NAME} a su Menu Inicio."
+msgstr "Añadir ${PRIVOXY_NAME} a al menú Inicio."
msgctxt "PrivoxyStartup"
msgid "Run At Startup"
@@ -194,17 +213,19 @@
msgctxt "PrivoxyStartupDesc"
msgid "Automatically run ${PRIVOXY_NAME} at startup."
-msgstr "Automaticamente ejecutar ${PRIVOXY_NAME} al iniciar sesión."
+msgstr "Ejecutar automáticamente ${PRIVOXY_NAME} al iniciar sesión."
msgctxt "TorbuttonGroupDesc"
msgid ""
"Torbutton is a Firefox extension that allows you to quickly enable or "
"disable anonymous web browsing."
msgstr ""
+"Torbutton es una extensión para Firefox que le permite habilitar o "
+"deshabilitar rápidamente la navegación anónima por la web."
msgctxt "TorbuttonUninstDesc"
msgid "Remove ${TORBUTTON_DESC}."
-msgstr ""
+msgstr "Eliminar ${TORBUTTON_DESC}."
msgctxt "TorbuttonAppDesc"
msgid "Install ${TORBUTTON_DESC}."
@@ -212,11 +233,11 @@
msgctxt "TorbuttonAddToFirefox"
msgid "Add to Firefox"
-msgstr "Adgregar a Firefox"
+msgstr "Añadir a Firefox"
msgctxt "TorbuttonAddToFirefoxDesc"
msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
-msgstr "Agregar la extensión ${TORBUTTON_DESC} a Firefox."
+msgstr "Añadir la extensión ${TORBUTTON_DESC} a Firefox."
msgctxt "TorbuttonFirefoxNotFound"
msgid "Firefox was not found on your system. Not installing Torbutton."
@@ -224,11 +245,11 @@
msgctxt "AppData"
msgid "Application Data"
-msgstr ""
+msgstr "Datos de la aplicación"
msgctxt "AppDataUninstDesc"
msgid "Remove saved application data and configuration files."
-msgstr ""
+msgstr "Eliminar archivos de configuración y datos de la aplicación guardados."
msgctxt "LanguageCode"
msgid "en"
@@ -236,12 +257,14 @@
msgctxt "FirefoxWarningPageTitle"
msgid "Firefox is not installed"
-msgstr ""
+msgstr "Firefox no está instalado"
msgctxt "FirefoxWarningPageSubtitle"
msgid ""
"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
+"Le recomendamos que instale Firefox antes de continuar, para mayor "
+"seguridad."
msgctxt "FirefoxWarningPageUpperText"
msgid ""
@@ -253,6 +276,13 @@
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
+"El navegador Mozilla Firefox no está instalado en el ordenador.\n"
+"Podrá usar otros navegadores, como Internet Explorer, pero\n"
+"es más sencillo el uso con Firefox, el cual también realiza un buen trabajo\n"
+"protegiendo su anonimato.\n"
+"\n"
+"Si quiere instalar Firefox, por favor pulse Cancelar, luego diríjase\n"
+"a la web de descarga de Firefox en"
msgctxt "FirefoxWarningPageLowerText"
msgid ""
@@ -262,3 +292,8 @@
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+"Cuando termines la instalación de Firefox, puedes lanzar de nuevo\n"
+"el instalador de Tor.\n"
+"\n"
+"O, si prefieres instalar Tor sin Firefox, simplemente\n"
+"pulse Continuar."
Modified: vidalia/branches/auto-updates/pkg/win32/fr/vidalia_fr.po
===================================================================
--- vidalia/branches/auto-updates/pkg/win32/fr/vidalia_fr.po 2008-11-20 04:37:44 UTC (rev 3328)
+++ vidalia/branches/auto-updates/pkg/win32/fr/vidalia_fr.po 2008-11-21 02:04:34 UTC (rev 3329)
@@ -3,7 +3,7 @@
"Project-Id-Version: Vidalia\n"
"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2008-09-14 15:58+0000\n"
+"PO-Revision-Date: 2008-11-19 23:27+0000\n"
"Last-Translator: Mfr <mfr@xxxxxxxxxxxxxxx>\n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
"MIME-Version: 1.0\n"
@@ -289,7 +289,6 @@
"Si vous voulez intaller Firefox, merci de presser Annuler, puis allez\n"
"sur la page de téléchargement de Firefox"
-#, fuzzy
msgctxt "FirefoxWarningPageLowerText"
msgid ""
"When you are done installing Firefox, you can once again run the\n"
Copied: vidalia/branches/auto-updates/pkg/win32/msi-header.bmp (from rev 3328, vidalia/trunk/pkg/win32/msi-header.bmp)
===================================================================
(Binary files differ)
Copied: vidalia/branches/auto-updates/pkg/win32/msi-welcome.bmp (from rev 3328, vidalia/trunk/pkg/win32/msi-welcome.bmp)
===================================================================
(Binary files differ)
Modified: vidalia/branches/auto-updates/pkg/win32/ro/vidalia_ro.po
===================================================================
--- vidalia/branches/auto-updates/pkg/win32/ro/vidalia_ro.po 2008-11-20 04:37:44 UTC (rev 3328)
+++ vidalia/branches/auto-updates/pkg/win32/ro/vidalia_ro.po 2008-11-21 02:04:34 UTC (rev 3329)
@@ -3,8 +3,8 @@
"Project-Id-Version: Vidalia\n"
"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2008-07-17 03:06+0000\n"
-"Last-Translator: Matt <edmanm@xxxxxxxxxxxxxxxxxxx>\n"
+"PO-Revision-Date: 2008-11-02 22:56+0000\n"
+"Last-Translator: Tiberiu Cristea <zugurudumba@xxxxxxxxx>\n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,11 @@
msgid "${BUNDLE_NAME} setup"
msgstr "Instalare ${BUNDLE_NAME}"
+# "supliment Firefox" este terminologia folosita de Mozilla in interfata in limba romana a mozilla.org. De aceea am preferat aceasta exprimare in locul "extensie Firefox".
+#
+# Pe viitor, incercati ca in traduceri, atunci cand va adresati utiliyatorului, sa folositi persoana a II-a plural si nu singular.
+#
+# De asemenea, evitati articularea inutila a numelor proprii, de exemplu "Tor-ului". "Tor" e mai corect, mai curat si mai simplu.
msgctxt "BundleWelcomeText"
msgid ""
"This wizard will guide you through the installation of Tor, Vidalia, "
@@ -37,32 +42,32 @@
"\n"
"$_CLICK"
msgstr ""
-"Acest vrajitor te va ghida prin instalarea Tor-ului, Vidaliei, Privoxy-ului, "
-"si Torbutton.\n"
+"Acest program vă va ghida prin instalarea Tor, Vidalia, Privoxy şi "
+"Torbutton.\n"
"\n"
-"Tor este un sistem pentru folosirea anonima a Internetului, ajutându-te la "
-"anonimizarea navigarii pe Internet, mesageriei instantanee, IRC, si multe "
-"altele. Vidalia este o interfata care te ajuta la controlarea, "
-"monitorizarea, si configurarea Tor-ului.\n"
+"Tor este un sistem pentru folosirea în mod anonim a Internetului, ce vă "
+"ajută la anonimizarea navigării pe internet, mesageriei instant, IRC şi "
+"multe altele. Vidalia este o interfaţă grafică ce vă ajută să controlaţi, "
+"monitorizaţi şi configuraţi Tor.\n"
"\n"
-"Privoxy este un proxy web pentru filtrare care îti protejeaza intimitatea si "
-"ajuta la înlaturarea reclamelor, bannerelor, si popup-urilor.\n"
+"Privoxy este un proxy web pentru filtrare care îţi protejează intimitatea şi "
+"ajută la înlăturarea reclamelor, bannerelor şi ferestrelor de tip pop-up.\n"
"\n"
-"Torbutton este o extensie Firefox care îti permite rapid sa activezi sau "
-"dezactiva navigarea anonima.\n"
+"Torbutton este un supliment Firefox care vă permite activarea sau "
+"dezactivarea rapidă a Tor.\n"
"\n"
-"Daca ai instalat în trecut Tor, Vidalia, Privoxy sau Firefox, te rog fi "
-"sigur ca ele nu ruleaza, înainte de a continua cu aceasta instalare.\n"
+"Daca aţi instalat în trecut Tor, Vidalia, Privoxy sau Firefox, vă rugăm să "
+"vă asiguraţi că acestea nu rulează, înainte de a continua cu instalarea.\n"
"\n"
"$_CLICK"
msgctxt "BundleWelcomeTitle"
msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
-msgstr "Bine ai venit la Vrajitorul de Instalare ${BUNDLE_NAME}"
+msgstr "Bine aţi venit la instalarea ${BUNDLE_NAME}"
msgctxt "BundleLinkText"
msgid "${TOR_NAME} installation documentation"
-msgstr "Instalarea documentatiei ${TOR_NAME}"
+msgstr "Instalarea documentaţiei ${TOR_NAME}"
msgctxt "BundleFinishText"
msgid ""
@@ -72,25 +77,25 @@
"\n"
"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
-"Instalarea este completa.\n"
-"Vezi https://www.torproject.org/docs/tor-doc-windows pentru a învata cum sa "
-"configurezi aplicatiile pentru a folosi Tor.\n"
+"Instalarea s-a terminat cu succes.\n"
+"Vă rugăm vizitaţi https://www.torproject.org/docs/tor-doc-windows pentru a "
+"învăţa cum să configuraţi diferite aplicaţii pentru folosirea Tor.\n"
"\n"
-"Daca ai instalat Torbutton, trebuie sa repornesti Firefox."
+"Daca aţi instalat Torbutton, este nevoie să reporniţi Firefox."
msgctxt "BundleRunNow"
msgid "Run installed components now"
-msgstr "Ruleaza acum componentele instalate"
+msgstr "Porneşte acum componentele instalate"
msgctxt "VidaliaGroupDesc"
msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
msgstr ""
-"Vidalia este o interfata care te ajuta la controlarea, monitorizarea, si "
-"configurarea Tor-ului."
+"Vidalia este o interfaţă grafică ce vă ajută să controlaţi, monitorizaţi şi "
+"configuraţi Tor."
msgctxt "VidaliaUninstDesc"
msgid "Remove ${VIDALIA_DESC}."
-msgstr "Înlatura ${VIDALIA_DESC}."
+msgstr "Înlătură ${VIDALIA_DESC}."
msgctxt "VidaliaSetupCaption"
msgid "${VIDALIA_NAME} setup"
@@ -103,61 +108,61 @@
"\n"
"$_CLICK"
msgstr ""
-"Acest vrajitor te va ghida prin instalarea Vidaliei, o interfata care te "
-"ajuta la controlarea, monitorizarea, si configurarea Tor-ului.\n"
+"Acest program vă va ghida prin instalarea Vidalia, un program ce vă ajută să "
+"controlaţi, monitorizaţi şi configuraţi Tor.\n"
"\n"
"$_CLICK"
msgctxt "VidaliaWelcomeTitle"
msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
-msgstr "Bine ai venit la Vrajitorul de Instalare ${VIDALIA_NAME}"
+msgstr "Bine aţi venit la instalarea ${VIDALIA_NAME}"
msgctxt "VidaliaLinkText"
msgid "${VIDALIA_NAME} homepage"
-msgstr "Pagina ${VIDALIA_NAME}"
+msgstr "Site-ul oficial ${VIDALIA_NAME}"
msgctxt "VidaliaAppDesc"
msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
msgstr ""
-"Vidalia este o interfata care te ajuta la controlarea, monitorizarea, si "
-"configurarea Tor-ului."
+"Vidalia este o interfaţă grafică ce vă ajută să controlaţi, monitorizaţi şi "
+"configuraţi Tor."
msgctxt "VidaliaStartup"
msgid "Run At Startup"
-msgstr "Ruleaza la pornirea calculatorului"
+msgstr "Porneşte odată cu sistemul de operare"
msgctxt "VidaliaStartupDesc"
msgid "Automatically run ${VIDALIA_NAME} at startup."
-msgstr "Ruleaza automat ${VIDALIA_NAME} la pornire."
+msgstr "Rulează automat ${VIDALIA_NAME} la pornire."
msgctxt "VidaliaShortcuts"
msgid "Add to Start Menu"
-msgstr "Adauga în Start Menu"
+msgstr "Adaugă în meniul Start"
msgctxt "VidaliaShortcutsDesc"
msgid "Add ${VIDALIA_NAME} to your Start menu."
-msgstr "Adauga ${VIDALIA_NAME} în meniul Start."
+msgstr "Adaugă ${VIDALIA_NAME} în meniul Start."
msgctxt "VidaliaRunNow"
msgid "Run ${VIDALIA_NAME}"
-msgstr "Ruleaza ${VIDALIA_NAME} acum"
+msgstr "Porneşte ${VIDALIA_NAME}"
msgctxt "TorGroupDesc"
msgid ""
"Tor is a system for using the Internet anonymously, helping you anonymize "
"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
-"Tor este un sistem pentru folosirea anonima a Internetului, ajutându-te la "
-"anonimizarea navigarii pe Internet, mesageriei instantanee, IRC, si multe "
+"Tor este un sistem pentru folosirea în mod anonim a internetului, ce vă "
+"ajută la anonimizarea navigării pe web, mesageriei instant, IRC şi multe "
"altele."
msgctxt "TorUninstDesc"
msgid "Remove ${TOR_DESC}."
-msgstr "Înlatura ${TOR_DESC}."
+msgstr "Înlătură ${TOR_DESC}."
msgctxt "TorAppDesc"
msgid "Install ${TOR_DESC}."
-msgstr "Instaleaza ${TOR_DESC}."
+msgstr "Instalează ${TOR_DESC}."
msgctxt "TorAskOverwriteTorrc"
msgid ""
@@ -165,93 +170,95 @@
"$\n"
"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
-"Ai deja un fisier de configurare pentru Tor.$\n"
+"Există deja un fişier de configurare pentru Tor.$\n"
"$\n"
-"Vrei sa îl rescri cu un fisier implicit de configurare?"
+"Doriţi să îl suprascrieţi cu un fişier implicit de configurare?"
msgctxt "TorDocumentation"
msgid "Documentation"
-msgstr "Documentatie"
+msgstr "Documentaţie"
msgctxt "TorDocumentationDesc"
msgid "Install ${TOR_NAME} documentation."
-msgstr "Instaleza documentatia ${TOR_NAME}."
+msgstr "Instalează documentaţia ${TOR_NAME}."
msgctxt "TorShortcuts"
msgid "Add to Start Menu"
-msgstr "Adauga în Start Menu"
+msgstr "Adaugă în meniul Start"
msgctxt "TorShortcutsDesc"
msgid "Add ${TOR_NAME} to your Start menu."
-msgstr "Adauga ${TOR_NAME} în meniul Start."
+msgstr "Adaugă ${TOR_NAME} în meniul Start."
msgctxt "PrivoxyGroupDesc"
msgid ""
"Privoxy is a filtering web proxy that protects your privacy and helps remove "
"ads, banners, and popups."
msgstr ""
-"Privoxy este un proxy web pentru filtrare care îti protejeaza intimitatea si "
-"ajuta la înlaturarea reclamelor, bannerelor, si popup-urilor."
+"Privoxy este un proxy web pentru filtrare care vă protejează intimitatea şi "
+"ajută la înlăturarea reclamelor, bannerelor şi ferestrelor de tip pop-up."
msgctxt "PrivoxyUninstDesc"
msgid "Remove ${PRIVOXY_DESC}."
-msgstr "Înlatura ${PRIVOXY_DESC}."
+msgstr "Înlătură ${PRIVOXY_DESC}."
msgctxt "PrivoxyAppDesc"
msgid "Install ${PRIVOXY_DESC}."
-msgstr "Instaleaza ${PRIVOXY_DESC}."
+msgstr "Instalează ${PRIVOXY_DESC}."
msgctxt "PrivoxyShortcuts"
msgid "Add to Start Menu"
-msgstr "Adauga în Start Menu"
+msgstr "Adaugă în meniul Start"
msgctxt "PrivoxyShortcutsDesc"
msgid "Add ${PRIVOXY_NAME} to your Start menu."
-msgstr "Adauga ${PRIVOXY_NAME} în meniul Start."
+msgstr "Adaugă ${PRIVOXY_NAME} în meniul Start."
msgctxt "PrivoxyStartup"
msgid "Run At Startup"
-msgstr "Ruleaza la pornire"
+msgstr "Porneşte odată cu sistemul de operare"
msgctxt "PrivoxyStartupDesc"
msgid "Automatically run ${PRIVOXY_NAME} at startup."
-msgstr "Ruleaza automat ${PRIVOXY_NAME} la pornire."
+msgstr "Rulează ${PRIVOXY_NAME} la pornire."
msgctxt "TorbuttonGroupDesc"
msgid ""
"Torbutton is a Firefox extension that allows you to quickly enable or "
"disable anonymous web browsing."
msgstr ""
-"Torbutton este o extensie Firefox care îti permite rapid sa activezi sau "
-"dezactiva navigarea anonima."
+"Torbutton este un supliment Firefox care vă permite activarea sau "
+"dezactivarea rapidă a Tor."
msgctxt "TorbuttonUninstDesc"
msgid "Remove ${TORBUTTON_DESC}."
-msgstr "Înlatura ${TORBUTTON_DESC}."
+msgstr "Înlătură ${TORBUTTON_DESC}."
msgctxt "TorbuttonAppDesc"
msgid "Install ${TORBUTTON_DESC}."
-msgstr "Instaleaza ${TORBUTTON_DESC}."
+msgstr "Instalează ${TORBUTTON_DESC}."
msgctxt "TorbuttonAddToFirefox"
msgid "Add to Firefox"
-msgstr "Adauga în Firefox"
+msgstr "Adaugă la Firefox"
msgctxt "TorbuttonAddToFirefoxDesc"
msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
-msgstr "Adauga extensia ${TORBUTTON_DESC} în Firefox."
+msgstr "Adaugă suplimentul ${TORBUTTON_DESC} la Firefox."
msgctxt "TorbuttonFirefoxNotFound"
msgid "Firefox was not found on your system. Not installing Torbutton."
-msgstr "Firefox nu a fost gasit pe sistemul tau. Nu instalez Torbutton."
+msgstr ""
+"Firefox nu a fost găsit pe sistemul dumneavoastră. Torbutton nu va fi "
+"instalat."
msgctxt "AppData"
msgid "Application Data"
-msgstr "Application Data"
+msgstr "Date aplicaţie"
msgctxt "AppDataUninstDesc"
msgid "Remove saved application data and configuration files."
-msgstr "Remove saved application data and configuration files."
+msgstr "Înlătură datele salvate şi fişierele de configurare a aplicaţiei."
msgctxt "LanguageCode"
msgid "en"
@@ -259,12 +266,14 @@
msgctxt "FirefoxWarningPageTitle"
msgid "Firefox is not installed"
-msgstr ""
+msgstr "Firefox nu este instalat."
msgctxt "FirefoxWarningPageSubtitle"
msgid ""
"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
+"Vă recomandăm să instalaţi Firefox înainte să continuaţi, pentru o siguranţă "
+"sporită."
msgctxt "FirefoxWarningPageUpperText"
msgid ""
@@ -276,6 +285,13 @@
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
+"Navigatorul Mozilla Firefox nu este instalat pe computerul dumneavoastră.\n"
+"Tor va funcţiona cu alte navigatoare, precum Internet Explorer, dar\n"
+"este mai uşor de folosit cu Firefox, care protejează mai bine\n"
+"anonimitatea dumneavoastră.\n"
+"\n"
+"Dacă doriţi să instalaţi Firefox, apăsaţi Revocare, apoi vizitaţi\n"
+" pagina oficială a Firefox, la"
msgctxt "FirefoxWarningPageLowerText"
msgid ""
@@ -285,3 +301,8 @@
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
+"După ce Firefox a fost instalat cu success, puteţi rula încă o dată\n"
+"programul de instalare Tor.\n"
+"\n"
+"Dacă preferaţi să instalaţi Tor fără Firefox,\n"
+"apăsaţi Înainte pentru a continua."
Copied: vidalia/branches/auto-updates/pkg/win32/vidalia.wxs.in (from rev 3328, vidalia/trunk/pkg/win32/vidalia.wxs.in)
===================================================================
--- vidalia/branches/auto-updates/pkg/win32/vidalia.wxs.in (rev 0)
+++ vidalia/branches/auto-updates/pkg/win32/vidalia.wxs.in 2008-11-21 02:04:34 UTC (rev 3329)
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="Windows-1252" ?>
+<!--
+ $Id$
+
+ 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.vidalia-project.net/. No part of Vidalia, including this file,
+ may be copied, modified, propagated, or distributed except according to
+ the terms described in the LICENSE file.
+
+ Compile with:
+ candle.exe vidalia.wxs
+ light.exe vidalia.wixobj -out vidalia.msi -ext C:\Path\to\Wix\bin\WixUIExtension.dll
+ -->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>
+ <Product Name="Vidalia @VERSION@" Id="B3C22D59-D907-4559-9569-92AAA34DB6F0"
+ Language="1033" Codepage="1252"
+ Version="@VER_MAJOR@.@VER_MINOR@.@VER_PATCH@"
+ Manufacturer="vidalia-project.net"
+ UpgradeCode="B7FBFE11-D7CA-4895-A1FB-1D7E065E4D04">
+
+ <Package Id="*" Keywords="Installer"
+ Description="Vidalia @VERSION@ Installer"
+ Manufacturer="vidalia-project.net"
+ InstallerVersion="100" Compressed="yes"
+ Languages="1033" SummaryCodepage="1252" />
+
+ <Media Id="1" Cabinet="Vidalia.cab" CompressionLevel="high"
+ EmbedCab="yes" DiskPrompt="CD-ROM #1" />
+ <Property Id="DiskPrompt" Value="Vidalia @VERSION@ Installation [1]" />
+
+ <Directory Id="TARGETDIR" Name="SourceDir">
+ <Directory Id="ProgramFilesFolder" Name="ProgramFilesDir">
+ <Directory Id="INSTALLDIR" Name="Vidalia">
+
+ <!-- Main Vidalia application files -->
+ <Component Id="VidaliaExecutable" Guid="*">
+ <File Id="VidaliaExe" DiskId="1"
+ Name="vidalia.exe" Source="@Vidalia_BINARY_DIR@\src\vidalia\vidalia.exe" />
+ </Component>
+
+ <!-- Vidalia-related documents -->
+ <Component Id="VidaliaDocuments" Guid="6A51C86C-A7D4-407f-9B84-7ADCE016E939">
+ <File Id="VidaliaReadme" DiskId="1"
+ Name="README" Source="@Vidalia_SOURCE_DIR@\README" />
+ <File Id="VidaliaCredits" DiskId="1"
+ Name="CREDITS" Source="@Vidalia_SOURCE_DIR@\CREDITS" />
+ <File Id="VidaliaChangeLog" DiskId="1"
+ Name="CHANGELOG" Source="@Vidalia_SOURCE_DIR@\CHANGELOG" />
+ <File Id="VidaliaLicense" DiskId="1"
+ Name="LICENSE" Source="@Vidalia_SOURCE_DIR@\LICENSE" />
+ <File Id="VidaliaLicenseGplV2" DiskId="1"
+ Name="LICENSE-GPLV2" Source="@Vidalia_SOURCE_DIR@\LICENSE-GPLV2" />
+ <File Id="VidaliaLicenseGplV3" DiskId="1"
+ Name="LICENSE-GPLV3" Source="@Vidalia_SOURCE_DIR@\LICENSE-GPLV3" />
+ <File Id="VidaliaLicenseLgplV3" DiskId="1"
+ Name="LICENSE-LGPLV3" Source="@Vidalia_SOURCE_DIR@\LICENSE-LGPLV3" />
+ <File Id="VidaliaLicenseOpenSSL" DiskId="1"
+ Name="LICENSE-OPENSSL" Source="@Vidalia_SOURCE_DIR@\LICENSE-OPENSSL" />
+ </Component>
+
+ <!-- Qt-related library files -->
+ <Component Id="QtLibrary" Guid="00F354CB-B313-4100-8900-11293A66B385">
+ <File Id="QtCore4Dll" DiskId="1"
+ Name="QtCore4.dll" Source="@QT_BINARY_DIR@\QtCore4.dll" />
+ <File Id="QtGui4Dll" DiskId="1"
+ Name="QtGui4.dll" Source="@QT_BINARY_DIR@\QtGui4.dll" />
+ <File Id="QtNetwork4Dll" DiskId="1"
+ Name="QtNetwork4.dll" Source="@QT_BINARY_DIR@\QtNetwork4.dll" />
+ <File Id="QtXml4Dll" DiskId="1"
+ Name="QtXml4.dll" Source="@QT_BINARY_DIR@\QtXml4.dll" />
+ </Component>
+
+ <!-- MinGW-related library files -->
+ <Component Id="MinGWLibrary" Guid="2287E844-F9CD-4129-8BD0-50D071698194">
+ <File Id="MinGWDll" DiskId="1"
+ Name="mingwm10.dll" Source="@MINGW_BINARY_DIR@\mingwm10.dll" />
+ </Component>
+
+ <!-- OpenSSL-related library files -->
+ <Component Id="OpenSSLLibrary" Guid="C3EDC2EC-D0B1-452a-83A6-85B0BC94735B">
+ <File Id="ssleay32dll" DiskId="1"
+ Name="ssleay32.dll" Source="@OPENSSL_BINARY_DIR@\ssleay32.dll" />
+ </Component>
+ </Directory>
+ </Directory>
+
+ <Directory Id="ProgramMenuFolder" Name="Programs">
+ <Directory Id="ShortcutFolder" Name="Vidalia">
+ <Component Id="AddVidaliaToStartMenu" Guid="0F2CEE2C-8730-432e-8A8F-E49AF78AF28C">
+ <RegistryKey Root="HKCU" Key="Software\Vidalia" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="StartMenuShortcut" Value="1" Type="integer" KeyPath="yes" />
+ </RegistryKey>
+ <Shortcut Id="VidaliaStartMenuShortcut"
+ Name="Vidalia" Target="[INSTALLDIR]vidalia.exe"
+ Directory="ShortcutFolder" WorkingDirectory="INSTALLDIR"
+ Icon="vidalia.ico" IconIndex="0" />
+ <RemoveFolder Id="RemoveShortcutFolder" On="uninstall" />
+ </Component>
+ </Directory>
+ </Directory>
+
+ <Directory Id="DesktopFolder" Name="Desktop">
+ <Component Id="AddVidaliaToDesktop" Guid="A7688EE5-4EDE-4429-A2D9-C8B9BD85AB5A">
+ <RegistryKey Root="HKCU" Key="Software\Vidalia" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="DesktopShortcut" Value="1" Type="integer" KeyPath="yes" />
+ </RegistryKey>
+ <Shortcut Id="VidaliaDesktopShortcut"
+ Name="Vidalia" Target="[INSTALLDIR]vidalia.exe"
+ Directory="DesktopFolder" WorkingDirectory="INSTALLDIR"
+ Icon="vidalia.ico" IconIndex="0" />
+ </Component>
+ </Directory>
+
+ <Component Id="AddToStartupItems" Guid="E7BC3F3C-86BA-4a08-966C-F3F8D8CB3AF4">
+ <RegistryKey Root="HKCU"
+ Key="Software\Microsoft\Windows\CurrentVersion\Run"
+ Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="Vidalia" Value='"[INSTALLDIR]vidalia.exe"' Type="string" />
+ </RegistryKey>
+ </Component>
+ </Directory>
+
+ <!-- Build up the feature hierarchy -->
+ <Feature Id="Complete" Title="Vidalia"
+ Level="1" Display="expand" ConfigurableDirectory="INSTALLDIR"
+ Description="Vidalia is application that helps you control, monitor, and configure the Tor software.">
+ <Feature Id="MainApplication" Title="Vidalia @VERSION@"
+ AllowAdvertise="no" Absent="disallow" Level="1"
+ Description="Main application">
+ <ComponentRef Id="VidaliaExecutable" />
+ <ComponentRef Id="VidaliaDocuments" />
+ <ComponentRef Id="QtLibrary" />
+ <ComponentRef Id="MinGWLibrary" />
+ <ComponentRef Id="OpenSSLLibrary" />
+ </Feature>
+ <Feature Id="Shortcuts" Title="Shortcuts"
+ AllowAdvertise="no" Absent="allow" Level="1"
+ Description="Add a shortcut to Vidalia to your Start menu or Desktop.">
+ <Feature Id="StartMenuShortcuts" Title="Add to Start menu"
+ AllowAdvertise="no" Absent="allow" Level="1"
+ Description="Add Vidalia to your Start menu">
+ <ComponentRef Id="AddVidaliaToStartMenu" />
+ </Feature>
+ <Feature Id="DesktopShortcuts" Title="Add to Desktop"
+ AllowAdvertise="no" Absent="allow" Level="1"
+ Description="Add Vidalia to your Desktop">
+ <ComponentRef Id="AddVidaliaToDesktop" />
+ </Feature>
+ <Feature Id="RunAtStartup" Title="Run at Startup"
+ AllowAdvertise="no" Absent="allow" Level="1"
+ Description="Run Vidalia automatically when your system starts">
+ <ComponentRef Id="AddToStartupItems" />
+ </Feature>
+ </Feature>
+ </Feature>
+
+ <!-- Set the UI options -->
+ <UIRef Id="WixUI_Mondo" />
+ <Icon Id="vidalia.ico" SourceFile="@Vidalia_SOURCE_DIR@\src\vidalia\res\icons\vidalia.ico" />
+ <WixVariable Id="WixUIBannerBmp" Value="@Vidalia_SOURCE_DIR@\pkg\win32\msi-header.bmp" />
+ <WixVariable Id="WixUIDialogBmp" Value="@Vidalia_SOURCE_DIR@\pkg\win32\msi-welcome.bmp" />
+ </Product>
+</Wix>
Modified: vidalia/branches/auto-updates/src/vidalia/CMakeLists.txt
===================================================================
--- vidalia/branches/auto-updates/src/vidalia/CMakeLists.txt 2008-11-20 04:37:44 UTC (rev 3328)
+++ vidalia/branches/auto-updates/src/vidalia/CMakeLists.txt 2008-11-21 02:04:34 UTC (rev 3329)
@@ -301,6 +301,10 @@
install(TARGETS ${vidalia_BIN} DESTINATION bin)
if(NOT WIN32 AND NOT APPLE)
install(FILES vidalia.desktop DESTINATION share/applications)
+ install(FILES res/48x48/vidalia.png
+ DESTINATION share/icons/hicolor/48x48/apps)
+ install(FILES res/22x22/vidalia.png
+ DESTINATION share/icons/hicolor/22x22/apps)
endif(NOT WIN32 AND NOT APPLE)
Modified: vidalia/branches/auto-updates/src/vidalia/config/advancedpage.cpp
===================================================================
--- vidalia/branches/auto-updates/src/vidalia/config/advancedpage.cpp 2008-11-20 04:37:44 UTC (rev 3328)
+++ vidalia/branches/auto-updates/src/vidalia/config/advancedpage.cpp 2008-11-21 02:04:34 UTC (rev 3329)
@@ -54,7 +54,6 @@
/* Hide platform specific features */
#if defined(Q_WS_WIN)
- ui.grpPermissions->setVisible(false);
#if 0
ui.grpService->setVisible(TorService::isSupported());
#endif
@@ -139,9 +138,7 @@
_settings->setControlAddress(controlAddress);
_settings->setControlPort(ui.lineControlPort->text().toUShort());
- _settings->setUser(ui.lineUser->text());
- _settings->setGroup(ui.lineGroup->text());
-
+
_settings->setAuthenticationMethod(authMethod);
_settings->setUseRandomPassword(ui.chkRandomPassword->isChecked());
if (authMethod == TorSettings::PasswordAuth
@@ -166,9 +163,7 @@
ui.lineControlPort->setText(QString::number(_settings->getControlPort()));
ui.lineTorConfig->setText(_settings->getTorrc());
ui.lineTorDataDirectory->setText(_settings->getDataDirectory());
- ui.lineUser->setText(_settings->getUser());
- ui.lineGroup->setText(_settings->getGroup());
-
+
ui.cmbAuthMethod->setCurrentIndex(
authMethodToIndex(_settings->getAuthenticationMethod()));
ui.chkRandomPassword->setChecked(_settings->useRandomPassword());
Modified: vidalia/branches/auto-updates/src/vidalia/config/advancedpage.ui
===================================================================
--- vidalia/branches/auto-updates/src/vidalia/config/advancedpage.ui 2008-11-20 04:37:44 UTC (rev 3328)
+++ vidalia/branches/auto-updates/src/vidalia/config/advancedpage.ui 2008-11-21 02:04:34 UTC (rev 3329)
@@ -323,90 +323,6 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="grpPermissions" >
- <property name="minimumSize" >
- <size>
- <width>0</width>
- <height>0</height>
- </size>
- </property>
- <property name="contextMenuPolicy" >
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="title" >
- <string>Permissions</string>
- </property>
- <layout class="QVBoxLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <layout class="QHBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <widget class="QLabel" name="label_3" >
- <property name="contextMenuPolicy" >
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="text" >
- <string>Run as User:</string>
- </property>
- <property name="indent" >
- <number>8</number>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLineEdit" name="lineUser" >
- <property name="contextMenuPolicy" >
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="toolTip" >
- <string>Vidalia will run with this User's permissions</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <widget class="QLabel" name="label_9" >
- <property name="contextMenuPolicy" >
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="text" >
- <string>Run as Group:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLineEdit" name="lineGroup" >
- <property name="toolTip" >
- <string>Vidalia will run with this Group's permissions</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- </item>
- <item>
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
@@ -431,8 +347,6 @@
<tabstop>btnBrowseTorConfig</tabstop>
<tabstop>lineTorDataDirectory</tabstop>
<tabstop>btnBrowseTorDataDirectory</tabstop>
- <tabstop>lineUser</tabstop>
- <tabstop>lineGroup</tabstop>
</tabstops>
<resources/>
<connections/>
Modified: vidalia/branches/auto-updates/src/vidalia/config/networksettings.cpp
===================================================================
--- vidalia/branches/auto-updates/src/vidalia/config/networksettings.cpp 2008-11-20 04:37:44 UTC (rev 3328)
+++ vidalia/branches/auto-updates/src/vidalia/config/networksettings.cpp 2008-11-21 02:04:34 UTC (rev 3329)
@@ -61,17 +61,21 @@
conf.insert(SETTING_REACHABLE_ADDRESSES,
(getFascistFirewall() ?
localValue(SETTING_REACHABLE_ADDRESSES).toStringList().join(",") : ""));
-
- conf.insert(SETTING_HTTP_PROXY,
- (getUseHttpProxy() ? localValue(SETTING_HTTP_PROXY).toString() : ""));
+
+ if (getUseHttpProxy())
+ conf.insert(SETTING_HTTP_PROXY, localValue(SETTING_HTTP_PROXY).toString());
+ else
+ conf.insert(SETTING_HTTP_PROXY, "");
conf.insert(SETTING_HTTP_PROXY_AUTH,
localValue(SETTING_HTTP_PROXY_AUTH).toString());
-
- conf.insert(SETTING_HTTPS_PROXY,
- (getUseHttpsProxy() ? localValue(SETTING_HTTPS_PROXY).toString() : ""));
+
+ if (getUseHttpProxy() && getUseHttpsProxy())
+ conf.insert(SETTING_HTTPS_PROXY, localValue(SETTING_HTTPS_PROXY).toString());
+ else
+ conf.insert(SETTING_HTTPS_PROXY, "");
conf.insert(SETTING_HTTPS_PROXY_AUTH,
localValue(SETTING_HTTPS_PROXY_AUTH).toString());
-
+
if (getUseBridges()) {
/* We want to always enable TunnelDirConns and friends when using
* bridge relays. */
@@ -83,7 +87,7 @@
conf.insert(SETTING_TUNNEL_DIR_CONNS, "0");
conf.insert(SETTING_PREFER_TUNNELED_DIR_CONNS, "0");
}
-
+
if (torVersion >= 0x020003) {
/* Do the bridge stuff only on Tor >= 0.2.0.3-alpha */
QStringList bridges = localValue(SETTING_BRIDGE_LIST).toStringList();
Modified: vidalia/branches/auto-updates/src/vidalia/config/torsettings.cpp
===================================================================
--- vidalia/branches/auto-updates/src/vidalia/config/torsettings.cpp 2008-11-20 04:37:44 UTC (rev 3328)
+++ vidalia/branches/auto-updates/src/vidalia/config/torsettings.cpp 2008-11-21 02:04:34 UTC (rev 3329)
@@ -45,8 +45,6 @@
/* Arguments we can pass to Tor on the command-line */
#define TOR_ARG_CONTROL_PORT "ControlPort"
#define TOR_ARG_TORRC "-f"
-#define TOR_ARG_USER "User"
-#define TOR_ARG_GROUP "Group"
#define TOR_ARG_DATA_DIRECTORY "DataDirectory"
#define TOR_ARG_HASHED_PASSWORD "HashedControlPassword"
#define TOR_ARG_COOKIE_AUTH "CookieAuthentication"
@@ -74,8 +72,6 @@
setDefault(SETTING_CONTROL_ADDR, "127.0.0.1");
setDefault(SETTING_CONTROL_PORT, 9051);
setDefault(SETTING_AUTH_METHOD, toString(DEFAULT_AUTH_METHOD));
- setDefault(SETTING_TOR_USER, "");
- setDefault(SETTING_TOR_GROUP, "");
setDefault(SETTING_DATA_DIRECTORY, "");
setDefault(SETTING_CONTROL_PASSWORD, "");
setDefault(SETTING_USE_RANDOM_PASSWORD, true);
@@ -169,38 +165,6 @@
setValue(SETTING_TORRC, torrc);
}
-/** Returns the user used when running Tor. The user is specified as an
- * argument to Tor, which will setuid to this user. */
-QString
-TorSettings::getUser() const
-{
- return value(SETTING_TOR_USER).toString();
-}
-
-/** Sets the user used when running Tor. The user is specified as an argument
- * to Tor, which will setuid to this user. */
-void
-TorSettings::setUser(const QString &user)
-{
- setValue(SETTING_TOR_USER, user);
-}
-
-/** Returns the group used when running Tor. The group is specified as an
- * argument to Tor, which will setgid to this group. */
-QString
-TorSettings::getGroup() const
-{
- return value(SETTING_TOR_GROUP).toString();
-}
-
-/** Sets the group used when running Tor. The group is specified as an
- * argument to Tor, which will setgid to this group. */
-void
-TorSettings::setGroup(const QString &group)
-{
- setValue(SETTING_TOR_GROUP, group);
-}
-
/** Get the address or hostname used to connect to Tor */
QHostAddress
TorSettings::getControlAddress() const
Modified: vidalia/branches/auto-updates/src/vidalia/config/torsettings.h
===================================================================
--- vidalia/branches/auto-updates/src/vidalia/config/torsettings.h 2008-11-20 04:37:44 UTC (rev 3328)
+++ vidalia/branches/auto-updates/src/vidalia/config/torsettings.h 2008-11-21 02:04:34 UTC (rev 3329)
@@ -85,16 +85,6 @@
AuthenticationMethod getAuthenticationMethod() const;
/** Sets the authentication method used when starting Tor to <b>method</b>.*/
void setAuthenticationMethod(AuthenticationMethod method);
-
- /** Get which user will be used to run Tor. */
- QString getUser() const;
- /** Set which user will be used to run Tor. */
- void setUser(const QString &user);
-
- /** Get which group will be used to run Tor. */
- QString getGroup() const;
- /** Set which group will be used to run Tor. */
- void setGroup(const QString &group);
/** Generates a random control password consisting of PASSWORD_LEN
* characters. */
Modified: vidalia/branches/auto-updates/src/vidalia/i18n/hu/qt_hu.po
===================================================================
--- vidalia/branches/auto-updates/src/vidalia/i18n/hu/qt_hu.po 2008-11-20 04:37:44 UTC (rev 3328)
+++ vidalia/branches/auto-updates/src/vidalia/i18n/hu/qt_hu.po 2008-11-21 02:04:34 UTC (rev 3329)
@@ -3,355 +3,355 @@
"Project-Id-Version: Vidalia\n"
"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2008-08-20 03:25+0000\n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2008-11-12 19:51+0000\n"
+"Last-Translator: kabbe agoston <kabbe@xxxxxxx>\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Vidalia ts2po 0.2\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 1.1.0\n"
#: qaccessibleobject.cpp:348
msgctxt "QApplication"
msgid "Activate"
-msgstr ""
+msgstr "Aktíválás"
#: qmessagebox.h:319
msgctxt "QApplication"
msgid "Executable '%1' requires Qt %2, found Qt %3."
-msgstr ""
+msgstr "A '%1' állomány a Qt %2 -t igényli. Jelenleg Qt %3 van a gépen."
#: qmessagebox.h:321
msgctxt "QApplication"
msgid "Incompatible Qt Library Error"
-msgstr ""
+msgstr "Qt könyvtár hiba"
#: qapplication.cpp:2095
msgctxt "QApplication"
msgid "QT_LAYOUT_DIRECTION"
-msgstr ""
+msgstr "QT_LAYOUT_DIRECTION"
#: qaccessibleobject.cpp:350
msgctxt "QApplication"
msgid "Activates the program's main window"
-msgstr ""
+msgstr "Aktíválja a progam fõ ablakát"
#: qmessagebox.cpp:2104
msgctxt "QDialogButtonBox"
msgid "OK"
-msgstr ""
+msgstr "OK"
#: qdialogbuttonbox.cpp:528
msgctxt "QDialogButtonBox"
msgid "Save"
-msgstr ""
+msgstr "Mentés"
#: qdialogbuttonbox.cpp:531
msgctxt "QDialogButtonBox"
msgid "Open"
-msgstr ""
+msgstr "Megnyitás"
#: qdialogbuttonbox.cpp:534
msgctxt "QDialogButtonBox"
msgid "Cancel"
-msgstr ""
+msgstr "Mégse"
#: qdialogbuttonbox.cpp:537
msgctxt "QDialogButtonBox"
msgid "Close"
-msgstr ""
+msgstr "Bezár"
#: qdialogbuttonbox.cpp:540
msgctxt "QDialogButtonBox"
msgid "Apply"
-msgstr ""
+msgstr "Alkalmaz"
#: qdialogbuttonbox.cpp:543
msgctxt "QDialogButtonBox"
msgid "Reset"
-msgstr ""
+msgstr "Visszaállít"
#: qdialogbuttonbox.cpp:546
msgctxt "QDialogButtonBox"
msgid "Help"
-msgstr ""
+msgstr "Súgó"
#: qdialogbuttonbox.cpp:550
msgctxt "QDialogButtonBox"
msgid "Don't Save"
-msgstr ""
+msgstr "Ne mentse"
#: qdialogbuttonbox.cpp:554
msgctxt "QDialogButtonBox"
msgid "Discard"
-msgstr ""
+msgstr "Elvetés"
#: qdialogbuttonbox.cpp:557
msgctxt "QDialogButtonBox"
msgid "&Yes"
-msgstr ""
+msgstr "&Igen"
#: qdialogbuttonbox.cpp:560
msgctxt "QDialogButtonBox"
msgid "Yes to &All"
-msgstr ""
+msgstr "Igen &Mindet"
#: qdialogbuttonbox.cpp:563
msgctxt "QDialogButtonBox"
msgid "&No"
-msgstr ""
+msgstr "&Nem"
#: qdialogbuttonbox.cpp:566
msgctxt "QDialogButtonBox"
msgid "N&o to All"
-msgstr ""
+msgstr "Egyiket &Sem"
#: qdialogbuttonbox.cpp:569
msgctxt "QDialogButtonBox"
msgid "Save All"
-msgstr ""
+msgstr "Minden mentése"
#: qdialogbuttonbox.cpp:572
msgctxt "QDialogButtonBox"
msgid "Abort"
-msgstr ""
+msgstr "Elvetés"
#: qdialogbuttonbox.cpp:575
msgctxt "QDialogButtonBox"
msgid "Retry"
-msgstr ""
+msgstr "Újra"
#: qdialogbuttonbox.cpp:578
msgctxt "QDialogButtonBox"
msgid "Ignore"
-msgstr ""
+msgstr "Kihagyás"
#: qdialogbuttonbox.cpp:581
msgctxt "QDialogButtonBox"
msgid "Restore Defaults"
-msgstr ""
+msgstr "Alapértékek visszaállítása"
#: qdialogbuttonbox.cpp:552
msgctxt "QDialogButtonBox"
msgid "Close without Saving"
-msgstr ""
+msgstr "Bezárás mentés nélkül"
#: qdialogbuttonbox.cpp:525
msgctxt "QDialogButtonBox"
msgid "&OK"
-msgstr ""
+msgstr "&OK"
#: qdirmodel.cpp:423
msgctxt "QDirModel"
msgid "Name"
-msgstr ""
+msgstr "Név"
#: qdirmodel.cpp:424
msgctxt "QDirModel"
msgid "Size"
-msgstr ""
+msgstr "Méret"
#: qdirmodel.cpp:427
msgctxt "QDirModel"
msgid "Kind"
-msgstr ""
+msgstr "Fajta"
#: qdirmodel.cpp:429
msgctxt "QDirModel"
msgid "Type"
-msgstr ""
+msgstr "Típus"
#: qdirmodel.cpp:435
msgctxt "QDirModel"
msgid "Date Modified"
-msgstr ""
+msgstr "Módosítás ideje"
#: qfiledialog_win.cpp:126
msgctxt "QFileDialog"
msgid "All Files (*)"
-msgstr ""
+msgstr "Minden Fájl (*)"
#: qfiledialog.cpp:881
msgctxt "QFileDialog"
msgid "Directories"
-msgstr ""
+msgstr "Könyvtárak"
#: qfiledialog.cpp:2408
msgctxt "QFileDialog"
msgid "&Open"
-msgstr ""
+msgstr "&Megnyitás"
#: qfiledialog.cpp:919
msgctxt "QFileDialog"
msgid "&Save"
-msgstr ""
+msgstr "M&entés"
#: qfiledialog.cpp:435
msgctxt "QFileDialog"
msgid "Open"
-msgstr ""
+msgstr "Megnyitás"
#: qfiledialog.cpp:1670
msgctxt "QFileDialog"
msgid "%1 already exists.Do you want to replace it?"
-msgstr ""
+msgstr "%1 már létezik. Kívánja felülírni?"
#: qfiledialog.cpp:1690
msgctxt "QFileDialog"
msgid "%1File not found.Please verify the correct file name was given."
-msgstr ""
+msgstr "%1 nem létezik. Ellenõrizze, hogy pontosan adta meg a nevet."
#: qdirmodel.cpp:833
msgctxt "QFileDialog"
msgid "My Computer"
-msgstr ""
+msgstr "Sajátgép"
#: qfiledialog.cpp:462
msgctxt "QFileDialog"
msgid "&Rename"
-msgstr ""
+msgstr "&Átnevezés"
#: qfiledialog.cpp:463
msgctxt "QFileDialog"
msgid "&Delete"
-msgstr ""
+msgstr "&Törlés"
#: qfiledialog.cpp:464
msgctxt "QFileDialog"
msgid "Show &hidden files"
-msgstr ""
+msgstr "&Rejtett fájlok mutatása"
#: ui_qfiledialog.h:264
msgctxt "QFileDialog"
msgid "Back"
-msgstr ""
+msgstr "Vissza"
#: ui_qfiledialog.h:274
msgctxt "QFileDialog"
msgid "Parent Directory"
-msgstr ""
+msgstr "Fel"
#: ui_qfiledialog.h:284
msgctxt "QFileDialog"
msgid "List View"
-msgstr ""
+msgstr "Lista nézet"
#: ui_qfiledialog.h:289
msgctxt "QFileDialog"
msgid "Detail View"
-msgstr ""
+msgstr "Részletes nézet"
#: ui_qfiledialog.h:292
msgctxt "QFileDialog"
msgid "Files of type:"
-msgstr ""
+msgstr "Típus fájljai:"
#: qfiledialog.cpp:883
msgctxt "QFileDialog"
msgid "Directory:"
-msgstr ""
+msgstr "Könyvtár:"
#: qfiledialog.cpp:2476
msgctxt "QFileDialog"
msgid ""
"%1Directory not found.Please verify the correct directory name was given."
-msgstr ""
+msgstr "%1 könyvtár nem létezik. Ellenõrizze, hogy jól adta-e meg a nevet."
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
msgid "'%1' is write protected.Do you want to delete it anyway?"
-msgstr ""
+msgstr "'%1' írásvédett. Mégis kívánja törölni?"
#: qfiledialog.cpp:2286
msgctxt "QFileDialog"
msgid "Are sure you want to delete '%1'?"
-msgstr ""
+msgstr "Biztos hogy kívánja törölni ezt: '%1' ?"
#: qfiledialog.cpp:2299
msgctxt "QFileDialog"
msgid "Could not delete directory."
-msgstr ""
+msgstr "A könyvtár törlése sikertelen."
#: qfiledialog_win.cpp:128
msgctxt "QFileDialog"
msgid "All Files (*.*)"
-msgstr ""
+msgstr "Minden fájl (*.*)"
#: qfiledialog.cpp:437
msgctxt "QFileDialog"
msgid "Save As"
-msgstr ""
+msgstr "Mentés másként"
#: qfileiconprovider.cpp:379
msgctxt "QFileDialog"
msgid "Drive"
-msgstr ""
+msgstr "Meghajtó"
#: qfileiconprovider.cpp:383
msgctxt "QFileDialog"
msgid "File"
-msgstr ""
+msgstr "Fájl"
#: qfileiconprovider.cpp:412
msgctxt "QFileDialog"
msgid "Unknown"
-msgstr ""
+msgstr "Ismeretlen"
#: qfiledialog.cpp:439
msgctxt "QFileDialog"
msgid "Find Directory"
-msgstr ""
+msgstr "Könyvtár keresése"
#: qfiledialog.cpp:458
msgctxt "QFileDialog"
msgid "Show "
-msgstr ""
+msgstr "Mutasd"
#: ui_qfiledialog.h:269
msgctxt "QFileDialog"
msgid "Forward"
-msgstr ""
+msgstr "Elõre"
#: qfiledialog.cpp:2137
msgctxt "QFileDialog"
msgid "New Folder"
-msgstr ""
+msgstr "Új könyvtár"
#: qfiledialog.cpp:465
msgctxt "QFileDialog"
msgid "&New Folder"
-msgstr ""
+msgstr "&Új könyvtár"
#: qfiledialog.cpp:917
msgctxt "QFileDialog"
msgid "&Choose"
-msgstr ""
+msgstr "&Kiválaszt"
#: qsidebar.cpp:388
msgctxt "QFileDialog"
msgid "Remove"
-msgstr ""
+msgstr "Töröl"
#: qfiledialog.cpp:886
msgctxt "QFileDialog"
msgid "File &name:"
-msgstr ""
+msgstr "Fájl &név: "
#: ui_qfiledialog.h:261
msgctxt "QFileDialog"
msgid "Look in:"
-msgstr ""
+msgstr "Nézzen a: "
#: ui_qfiledialog.h:279
msgctxt "QFileDialog"
msgid "Create New Folder"
-msgstr ""
+msgstr "Új könyvtár létrehozása"
#: qfilesystemmodel.cpp:761
msgctxt "QFileSystemModel"
msgid "Invalid filename"
-msgstr ""
+msgstr "Érvénytelen fájlnév"
#: qfilesystemmodel.cpp:763
msgctxt "QFileSystemModel"
@@ -359,63 +359,65 @@
"<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer "
"characters or no punctuations marks."
msgstr ""
+"<b>A \"%1\" név nem használható.</b><p>Próbálja kevesebb karakterrel, vagy "
+"speciális karakterek nélkül."
#: qfilesystemmodel.cpp:832
msgctxt "QFileSystemModel"
msgid "Name"
-msgstr ""
+msgstr "Név"
#: qfilesystemmodel.cpp:834
msgctxt "QFileSystemModel"
msgid "Size"
-msgstr ""
+msgstr "Méret"
#: qfilesystemmodel.cpp:838
msgctxt "QFileSystemModel"
msgid "Kind"
-msgstr ""
+msgstr "Fajta"
#: qfilesystemmodel.cpp:840
msgctxt "QFileSystemModel"
msgid "Type"
-msgstr ""
+msgstr "Típus"
#: qfilesystemmodel.cpp:847
msgctxt "QFileSystemModel"
msgid "Date Modified"
-msgstr ""
+msgstr "Módosítás ideje"
#: qfilesystemmodel_p.h:198
msgctxt "QFileSystemModel"
msgid "My Computer"
-msgstr ""
+msgstr "Sajátgép"
#: qfilesystemmodel_p.h:200
msgctxt "QFileSystemModel"
msgid "Computer"
-msgstr ""
+msgstr "Számítógép"
#: qfilesystemmodel.cpp:677
msgctxt "QFileSystemModel"
msgid "%1 TB"
-msgstr ""
+msgstr "%1 TB"
#: qfilesystemmodel.cpp:679
msgctxt "QFileSystemModel"
msgid "%1 GB"
-msgstr ""
+msgstr "%1 GB"
#: qfilesystemmodel.cpp:681
msgctxt "QFileSystemModel"
msgid "%1 MB"
-msgstr ""
+msgstr "%1 MB"
#: qfilesystemmodel.cpp:683
msgctxt "QFileSystemModel"
msgid "%1 KB"
-msgstr ""
+msgstr "%1 KB"
#: qfilesystemmodel.cpp:684
msgctxt "QFileSystemModel"
msgid "%1 bytes"
-msgstr ""
+msgstr "%1 bájt"
Modified: vidalia/branches/auto-updates/src/vidalia/i18n/hu/vidalia_hu.po
===================================================================
--- vidalia/branches/auto-updates/src/vidalia/i18n/hu/vidalia_hu.po 2008-11-20 04:37:44 UTC (rev 3328)
+++ vidalia/branches/auto-updates/src/vidalia/i18n/hu/vidalia_hu.po 2008-11-21 02:04:34 UTC (rev 3329)
@@ -3,14 +3,14 @@
"Project-Id-Version: Vidalia\n"
"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
"POT-Creation-Date: 2008-07-02 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: \n"
+"PO-Revision-Date: 2008-11-12 19:48+0000\n"
+"Last-Translator: kabbe agoston <kabbe@xxxxxxx>\n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-"X-Generator: Vidalia ts2po 0.2\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 1.1.0\n"
#: aboutdialog.ui:25
msgctxt "AboutDialog"
@@ -25,7 +25,7 @@
#: aboutdialog.ui:234
msgctxt "AboutDialog"
msgid "Tor"
-msgstr "Tor"
+msgstr "TOR"
#: aboutdialog.ui:156
msgctxt "AboutDialog"
@@ -40,7 +40,7 @@
#: aboutdialog.ui:244
msgctxt "AboutDialog"
msgid "Tor Version"
-msgstr "Tor verzió"
+msgstr "TOR verzió"
#: aboutdialog.ui:88
msgctxt "AboutDialog"
@@ -52,15 +52,19 @@
msgid "<Not Running>"
msgstr "<Nem fut>"
+# Kerüljük a magyar hosszú ő és ű (valamint a nagy Ő és Ű használatát, mivel azok nem standard ASCII karakterek és bonyodalmat okozhatnak!
+# Az egyszerûség kedvéért használjunk helyettük õ-t és û-t ! Kösz !
+#
+# Please avoid the usage of hungarian long ő and ű characters due to they don't fit in the standard ASCII table. Use õ and û instead ! THX !
#: aboutdialog.cpp:64
msgctxt "AboutDialog"
msgid "<Unavailable>"
-msgstr ""
+msgstr "<Nem elérhetõ>"
#: advancedpage.ui:28
msgctxt "AdvancedPage"
msgid "Control Port"
-msgstr "Vezérlõ port"
+msgstr "Kontroll port"
#: advancedpage.ui:318
msgctxt "AdvancedPage"
@@ -75,13 +79,17 @@
#: advancedpage.ui:360
msgctxt "AdvancedPage"
msgid "Run as User:"
-msgstr "Fusson a következõ felhasználó nevében:"
+msgstr "Futtatás mint:"
#: advancedpage.ui:373
msgctxt "AdvancedPage"
msgid "Vidalia will run with this User's permissions"
msgstr "A Vidalia a megadott felhasználó jogosultságaival fog futni"
+# Kerüljük a magyar hosszú ő és ű (valamint a nagy Ő és Ű használatát, mivel azok nem standard ASCII karakterek és bonyodalmat okozhatnak!
+# Az egyszerûség kedvéért használjunk helyettük õ-t és û-t ! Kösz !
+#
+# Please avoid the usage of hungarian long ő and ű characters due to they don't fit in the standard ASCII table. Use õ and û instead ! THX !
#: advancedpage.ui:393
msgctxt "AdvancedPage"
msgid "Run as Group:"
@@ -95,74 +103,78 @@
#: advancedpage.cpp:221
msgctxt "AdvancedPage"
msgid "Select Tor Configuration File"
-msgstr "Tor konfigurációs fájl kiválasztása"
+msgstr "TOR Konfigurációs Fájl kiválasztása"
#: advancedpage.cpp:285
msgctxt "AdvancedPage"
msgid "Unable to remove Tor Service"
-msgstr ""
+msgstr "Jelenleg a TOR szolgáltatás nem lekapcsolható"
#: advancedpage.cpp:296
msgctxt "AdvancedPage"
msgid "Unable to install Tor Service"
-msgstr ""
+msgstr "Jelenleg a TOR szolgáltatás nem elindítható"
#: advancedpage.cpp:297
msgctxt "AdvancedPage"
msgid "Vidalia was unable to install the Tor service."
-msgstr ""
+msgstr "A TOR szolgáltatás telepítése sikertelen."
#: advancedpage.cpp:234
msgctxt "AdvancedPage"
msgid "File Not Found"
-msgstr ""
+msgstr "A fájl nem található"
#: advancedpage.cpp:236
msgctxt "AdvancedPage"
msgid "%1 does not exist. Would you like to create it?"
-msgstr ""
+msgstr "%1 nem létezik. Kívánja létrehozni?"
#: advancedpage.cpp:247
msgctxt "AdvancedPage"
msgid "Failed to Create File"
-msgstr ""
+msgstr "Fájl létrehozása sikertelen"
#: advancedpage.cpp:248
msgctxt "AdvancedPage"
msgid "Unable to create %1 [%2]"
-msgstr ""
+msgstr "Nem lehet létrehozni %1-t [%2]"
#: advancedpage.cpp:287
msgctxt "AdvancedPage"
msgid "Vidalia was unable to remove the Tor service."
""
"You may need to remove it manually."
-msgstr ""
+msgstr "A Vidalia nem tudta lekapcsolni a TOR-t. Kézzel kell majd bezárni."
+# Kerüljük a magyar hosszú ő és ű (valamint a nagy Ő és Ű használatát, mivel azok nem standard ASCII karakterek és bonyodalmat okozhatnak!
+# Az egyszerûség kedvéért használjunk helyettük õ-t és û-t ! Kösz !
+#
+# Please avoid the usage of hungarian long ő and ű characters due to they don't fit in the standard ASCII table. Use õ and û instead ! THX !
#: advancedpage.cpp:103
msgctxt "AdvancedPage"
msgid "'%1' is not a valid IP address."
-msgstr ""
+msgstr "'%1' egy nem létezõ IP cím."
#: advancedpage.ui:157
msgctxt "AdvancedPage"
msgid ":"
-msgstr ""
+msgstr ":"
#: advancedpage.cpp:114
msgctxt "AdvancedPage"
msgid "You selected 'Password' authentication, but did not specify a password."
-msgstr ""
+msgstr "Kiválasztotta a Jelszavas bejelentkezést, de nem adott meg jelszót."
#: advancedpage.cpp:263
msgctxt "AdvancedPage"
msgid "Select a Directory to Use for Tor Data"
-msgstr ""
+msgstr "Válasszon egy könyvtárat a TOR adatok tárolásához"
#: advancedpage.ui:48
msgctxt "AdvancedPage"
msgid "Authentication:"
-msgstr ""
+msgstr "Ellenõrzés:"
#: advancedpage.ui:58
msgctxt "AdvancedPage"
@@ -172,22 +184,22 @@
#: advancedpage.ui:91
msgctxt "AdvancedPage"
msgid "Cookie"
-msgstr ""
+msgstr "Süti"
#: advancedpage.ui:96
msgctxt "AdvancedPage"
msgid "Password"
-msgstr ""
+msgstr "Jelszó"
#: advancedpage.ui:111
msgctxt "AdvancedPage"
msgid "Randomly Generate"
-msgstr ""
+msgstr "Jelszó véletlenszerû létrehozása"
#: advancedpage.ui:86
msgctxt "AdvancedPage"
msgid "None"
-msgstr ""
+msgstr "Nincs"
#: advancedpage.cpp:34
msgctxt "AdvancedPage"
@@ -197,32 +209,32 @@
#: advancedpage.ui:240
msgctxt "AdvancedPage"
msgid "Start the Tor software with the specified configuration file (torrc)"
-msgstr ""
+msgstr "TOR indítása a 'torrc' konfigurációs fájllal"
#: advancedpage.ui:259
msgctxt "AdvancedPage"
msgid "Select path to your configuration file"
-msgstr ""
+msgstr "Adja meg a konfigurációs fájl helyét"
#: advancedpage.ui:275
msgctxt "AdvancedPage"
msgid "Data Directory"
-msgstr ""
+msgstr "Adat könyvtár"
#: advancedpage.ui:296
msgctxt "AdvancedPage"
msgid "Store data for the Tor software in the following directory"
-msgstr ""
+msgstr "TOR adatok tárolása a következõ könyvtárban"
#: advancedpage.ui:315
msgctxt "AdvancedPage"
msgid "Select the directory used to store data for the Tor software"
-msgstr ""
+msgstr "Válassza ki a könytárat melyet a TOR adatok tárolására fog használni"
#: advancedpage.ui:219
msgctxt "AdvancedPage"
msgid "Tor Configuration File"
-msgstr ""
+msgstr "TOR Konfigurációs Fájl"
#: appearancepage.ui:31
msgctxt "AppearancePage"
@@ -232,12 +244,13 @@
#: appearancepage.ui:52
msgctxt "AppearancePage"
msgid "Choose the language used in Vidalia"
-msgstr "Válassza ki a Vidalia-ban használatos nyelvet"
+msgstr "Vidalia nyelve"
#: appearancepage.ui:84
msgctxt "AppearancePage"
msgid "Changes to language will only take effect after restarting Vidalia!"
-msgstr "A nyelvben történt változtatások csak a Vidalia újraindításakor fognak érvényesülni!"
+msgstr ""
+"A nyelvi változtatások csak a Vidalia újraindításakor fognak érvényesülni!"
#: appearancepage.ui:100
msgctxt "AppearancePage"
@@ -247,7 +260,7 @@
#: appearancepage.ui:134
msgctxt "AppearancePage"
msgid "Choose Vidalia's interface style"
-msgstr "Válassza ki a Vidalia felületének stílusát"
+msgstr "Vidalia külalakja"
#: appearancepage.cpp:23
msgctxt "AppearancePage"
@@ -262,7 +275,7 @@
#: bwgraph.ui:40
msgctxt "BandwidthGraph"
msgid "Show Settings"
-msgstr "Beállítások megmutatása"
+msgstr "Beállítások megjelenítése"
#: bwgraph.ui:63
msgctxt "BandwidthGraph"
@@ -357,7 +370,7 @@
#: circuititem.cpp:39
msgctxt "CircuitItem"
msgid "<Path Empty>"
-msgstr "<Út üres>"
+msgstr "<Üres ösvény>"
#: circuitlistwidget.cpp:37
msgctxt "CircuitListWidget"
@@ -372,17 +385,17 @@
#: circuitlistwidget.cpp:72
msgctxt "CircuitListWidget"
msgid "Zoom to Circuit"
-msgstr ""
+msgstr "Kapcsolatra közelítés"
#: circuitlistwidget.cpp:74
msgctxt "CircuitListWidget"
msgid "Close Circuit (Del)"
-msgstr ""
+msgstr "Ösvény lekapcsolása (Del)"
#: circuitlistwidget.cpp:95
msgctxt "CircuitListWidget"
msgid "Close Stream (Del)"
-msgstr ""
+msgstr "Adás megszakítása (Del)"
#: configdialog.cpp:72
msgctxt "ConfigDialog"
@@ -417,27 +430,27 @@
#: configdialog.cpp:76
msgctxt "ConfigDialog"
msgid "Network"
-msgstr ""
+msgstr "Hálózat"
#: configdialog.cpp:174
msgctxt "ConfigDialog"
msgid "Error Saving Settings"
-msgstr ""
+msgstr "Hiba adatmentés közben"
#: configdialog.cpp:176
msgctxt "ConfigDialog"
msgid "Vidalia was unable to save your %1 settings."
-msgstr ""
+msgstr "A %1 beállítás mentése sikertelen."
#: configdialog.cpp:203
msgctxt "ConfigDialog"
msgid "Error Applying Settings"
-msgstr ""
+msgstr "Hiba lealkalmazás közben"
#: configdialog.cpp:205
msgctxt "ConfigDialog"
msgid "Vidalia was unable to apply your %1 settings to Tor."
-msgstr ""
+msgstr "A %1 TOR beállítás lealkalmazása sikertelen."
#: configdialog.cpp:56
msgctxt "ConfigDialog"
@@ -447,22 +460,22 @@
#: configdialog.cpp:80
msgctxt "ConfigDialog"
msgid "Sharing"
-msgstr ""
+msgstr "Megosztás"
#: configdialog.cpp:84
msgctxt "ConfigDialog"
msgid "Services"
-msgstr ""
+msgstr "Folyamatok"
#: controlconnection.cpp:319
msgctxt "ControlConnection"
msgid "Control socket is not connected."
-msgstr ""
+msgstr "A Vezérlõ socket nem kapcsolódott."
#: controlconnection.cpp:131
msgctxt "ControlConnection"
msgid "Vidalia was unable to connect to Tor. (%1)"
-msgstr ""
+msgstr "Nem sikerült a TOR-hoz kapcsolódni. (%1)"
#: controlsocket.cpp:61
msgctxt "ControlSocket"
@@ -482,7 +495,7 @@
#: controlsocket.cpp:51
msgctxt "ControlSocket"
msgid "Control socket is not connected."
-msgstr ""
+msgstr "A Vezérlõ socket nem kapcsolódott."
#: generalpage.ui:115
msgctxt "GeneralPage"
@@ -492,7 +505,7 @@
#: generalpage.cpp:72
msgctxt "GeneralPage"
msgid "Select Path to Tor"
-msgstr "Tor elérési útjának megadása"
+msgstr "TOR elérési útjának megadása"
#: generalpage.cpp:59
msgctxt "GeneralPage"
@@ -507,47 +520,47 @@
#: generalpage.cpp:95
msgctxt "GeneralPage"
msgid "You must specify the name of your Tor executable."
-msgstr ""
+msgstr "Meg kell határoznia a TOR indítófájl nevét."
#: generalpage.cpp:82
msgctxt "GeneralPage"
msgid "Select Proxy Executable"
-msgstr ""
+msgstr "Proxy indítófájl kiválasztása"
#: generalpage.cpp:103
msgctxt "GeneralPage"
msgid "The proxy arguments specified are not properly formatted."
-msgstr ""
+msgstr "A Proxy kapcsolói nem megfelelõen vannak beállítva."
#: generalpage.ui:22
msgctxt "GeneralPage"
msgid "Start Vidalia when my system starts"
-msgstr ""
+msgstr "Vidalia indítása a rendszerrel"
#: generalpage.ui:75
msgctxt "GeneralPage"
msgid "Start a proxy application when Vidalia starts"
-msgstr ""
+msgstr "Proxy program indítása a Vidaliával"
#: generalpage.ui:97
msgctxt "GeneralPage"
msgid "Proxy Executable"
-msgstr ""
+msgstr "Proxy indítófájl elérési útvonala"
#: generalpage.ui:129
msgctxt "GeneralPage"
msgid "Command Line Arguments:"
-msgstr ""
+msgstr "Parancssori kapcsolók:"
#: generalpage.ui:63
msgctxt "GeneralPage"
msgid "Start the Tor software when Vidalia starts"
-msgstr ""
+msgstr "TOR indítása a Vidaliával"
#: generalpage.ui:38
msgctxt "GeneralPage"
msgid "Tor Executable"
-msgstr ""
+msgstr "TOR indítófájl elérési útvonala"
#: graphframe.cpp:237
msgctxt "GraphFrame"
@@ -587,12 +600,12 @@
#: helpbrowser.ui:174
msgctxt "HelpBrowser"
msgid "Find Previous"
-msgstr "Elõzõ megtalálása"
+msgstr "Elõzõ keresése"
#: helpbrowser.ui:187
msgctxt "HelpBrowser"
msgid "Find Next"
-msgstr "Következõ megtalálása"
+msgstr "Következõ keresése"
#: helpbrowser.ui:221
msgctxt "HelpBrowser"
@@ -617,7 +630,7 @@
#: helpbrowser.ui:405
msgctxt "HelpBrowser"
msgid "Found Documents"
-msgstr "Megtalált dokumentumok"
+msgstr "Talált dokumentumok"
#: helpbrowser.ui:484
msgctxt "HelpBrowser"
@@ -749,27 +762,35 @@
#: helptextbrowser.cpp:72
msgctxt "HelpTextBrowser"
msgid "Opening External Link"
-msgstr ""
+msgstr "Külsõ hivatkozás megnyitása"
#: helptextbrowser.cpp:76
msgctxt "HelpTextBrowser"
msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
msgstr ""
+"A Vidalia meg tudja nyitni ezt a hivatkozást az alapértelmezett böngészõben. "
+"Ha a böngészõ nincs jelenleg a TOR beállításaihoz igazítva, a kapcsolat nem "
+"lesz titkos !"
#: helptextbrowser.cpp:78
msgctxt "HelpTextBrowser"
msgid "Do you want Vidalia to open the link in your Web browser?"
msgstr ""
+"Kívánja, hogy a Vidalia megnyissa ezt a hivatkozást az alapértelmezett "
+"böngészõben?"
#: helptextbrowser.cpp:88
msgctxt "HelpTextBrowser"
msgid "Unable to Open Link"
-msgstr ""
+msgstr "A hivatkozást nem lehet megnyitni"
#: helptextbrowser.cpp:90
msgctxt "HelpTextBrowser"
msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
msgstr ""
+"A Vidalia nem tudta megnyitni a kiválasztott hivatkozást a böngészõben. "
+"Próbálja meg <b>Másol</b>ni a hivatkozást és <b>Beilleszt</b>eni a böngészõ "
+"URL sávjába."
#: logevent.cpp:57
msgctxt "LogEvent"
@@ -854,7 +875,7 @@
#: mainwindow.cpp:414
msgctxt "MainWindow"
msgid "Tor"
-msgstr "Tor"
+msgstr "TOR"
#: mainwindow.cpp:419
msgctxt "MainWindow"
@@ -869,7 +890,7 @@
#: mainwindow.cpp:831
msgctxt "MainWindow"
msgid "Error Starting Tor"
-msgstr "Hiba a Tor indításával"
+msgstr "Hiba a TOR indításával"
#: mainwindow.cpp:397
msgctxt "MainWindow"
@@ -879,9 +900,9 @@
#: mainwindow.cpp:834
msgctxt "MainWindow"
msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
-msgstr "A Vidalia nem tudta elindítani a Tor-t. Ellenõrizd"
-"a beállításaidat, hogy jól van-e megadva a Tor futtatható állományának neve és elérési"
-"útja."
+msgstr ""
+"A Vidalia nem tudta elindítani a TOR-t. Ellenõrizze a beállításait, hogy jól "
+"van-e megadva a TOR indítófájl neve és elérési útja."
#: mainwindow.ui:380
msgctxt "MainWindow"
@@ -891,7 +912,7 @@
#: mainwindow.cpp:320
msgctxt "MainWindow"
msgid "Network Map"
-msgstr ""
+msgstr "Hálózat térkép"
#: mainwindow.cpp:1331
msgctxt "MainWindow"
@@ -901,184 +922,190 @@
#: mainwindow.cpp:399
msgctxt "MainWindow"
msgid "Ctrl+I"
-msgstr ""
+msgstr "CTRL+I"
#: mainwindow.cpp:1334
msgctxt "MainWindow"
msgid "All subsequent connections will appear to be different than your old connections."
-msgstr "Minden további kapcsolat a régi kapcsolataidtól"
+msgstr ""
+"Ösvények újrakiépítve.Minden további kapcsolat a régi kapcsolataitól "
"különbözõként fog szerepelni."
#: mainwindow.cpp:1349
msgctxt "MainWindow"
msgid "Failed to Create New Identity"
-msgstr "Nem sikerült az új identitás létrehozása"
+msgstr "Új identitás létrehozása sikertelen"
#: mainwindow.ui:168
msgctxt "MainWindow"
msgid "Tor is not running"
-msgstr ""
+msgstr "TOR lekapcsolva"
#: mainwindow.cpp:643
msgctxt "MainWindow"
msgid "Tor is shutting down"
-msgstr ""
+msgstr "TOR lekapcsolása folyamatban..."
#: mainwindow.ui:19
msgctxt "MainWindow"
msgid "Vidalia Control Panel"
-msgstr ""
+msgstr "Vidalia vezérlõpult"
#: mainwindow.ui:218
msgctxt "MainWindow"
msgid "Vidalia Shortcuts"
-msgstr ""
+msgstr "Vidalia Parancsikonok"
#: mainwindow.ui:243
msgctxt "MainWindow"
msgid "Setup Relaying"
-msgstr ""
+msgstr "Elosztás beállítása"
#: mainwindow.ui:256
msgctxt "MainWindow"
msgid "View the Network"
-msgstr ""
+msgstr "Hálózat megtekintése"
#: mainwindow.ui:259
msgctxt "MainWindow"
msgid "View a map of the Tor network"
-msgstr ""
+msgstr "TOR hálózati térkép megtekintése"
#: mainwindow.ui:272
msgctxt "MainWindow"
msgid "Use a New Identity"
-msgstr ""
+msgstr "Új identitás használata"
#: mainwindow.ui:275
msgctxt "MainWindow"
msgid "Make subsequent connections appear new"
-msgstr ""
+msgstr "Létezõ kapcsolatok újként való feltüntetése"
#: mainwindow.ui:370
msgctxt "MainWindow"
msgid "View help documentation"
-msgstr ""
+msgstr "Súgó megtekintése"
#: mainwindow.ui:433
msgctxt "MainWindow"
msgid "View version and license information"
-msgstr ""
+msgstr "Verzió és licensz információk megtekintése"
#: mainwindow.ui:446
msgctxt "MainWindow"
msgid "Exit Vidalia"
-msgstr ""
+msgstr "Kilépés a Vidaliából"
#: mainwindow.ui:498
msgctxt "MainWindow"
msgid "Show this window on startup"
-msgstr ""
+msgstr "Megjelenítés indításkor"
#: mainwindow.ui:517
msgctxt "MainWindow"
msgid "Hide"
-msgstr ""
+msgstr "Elrejtés"
#: mainwindow.ui:520
msgctxt "MainWindow"
msgid "Hide this window"
-msgstr ""
+msgstr "Ablak elrejtése"
#: mainwindow.cpp:327
msgctxt "MainWindow"
msgid "Control Panel"
-msgstr ""
+msgstr "Vezérlõpult"
#: mainwindow.cpp:400
msgctxt "MainWindow"
msgid "Ctrl+P"
-msgstr ""
+msgstr "CTRL+P"
#: mainwindow.cpp:1047
msgctxt "MainWindow"
msgid "Cookie Authentication Required"
-msgstr ""
+msgstr "Süti ellenõrzés szükséges"
#: mainwindow.cpp:1052
msgctxt "MainWindow"
msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
msgstr ""
+"Kívánja kiválasztani kézzel a következõ állományt: 'control_auth_cookie' ?"
#: mainwindow.cpp:1109
msgctxt "MainWindow"
msgid "Error Registering for Events"
-msgstr ""
+msgstr "Hiba az Események bejegyzésekor"
#: mainwindow.cpp:1145
msgctxt "MainWindow"
msgid "Password Authentication Required"
-msgstr ""
+msgstr "Jelszó ellenõrzés szükséges"
#: mainwindow.cpp:1164
msgctxt "MainWindow"
msgid "Please check your control port authentication settings."
-msgstr ""
+msgstr "Ellenõrizze a kontroll port bejelentkezési beállításait !"
#: mainwindow.cpp:1146
msgctxt "MainWindow"
msgid "Please enter your control password (not the hash):"
-msgstr ""
+msgstr "Adja meg a kontroll jelszót: "
#: mainwindow.cpp:910
msgctxt "MainWindow"
msgid "Relaying is Enabled"
-msgstr ""
+msgstr "Elosztás bekapcsolva"
#: mainwindow.cpp:482
msgctxt "MainWindow"
msgid "Error starting web browser"
-msgstr ""
+msgstr "Hiba a böngészõ indításakor"
#: mainwindow.cpp:483
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured web browser"
-msgstr ""
+msgstr "A beállított böngészõ indítása sikertelen"
#: mainwindow.cpp:1268
msgctxt "MainWindow"
msgid "Tor Update Available"
-msgstr ""
+msgstr "A legújabb TOR verzió elérhetõ"
#: mainwindow.cpp:1271
msgctxt "MainWindow"
msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
msgstr ""
+"A TOR jelenleg telepített verziója lejárt, vagy nem ajánlatos továbbá "
+"használni. Látogasson el a TOR weboldalára a legfrissebb verzióért !"
#: mainwindow.cpp:1271
msgctxt "MainWindow"
msgid "Tor website: %1"
-msgstr ""
+msgstr "TOR weboldal: %1"
#: mainwindow.cpp:517
msgctxt "MainWindow"
msgid "Error starting proxy server"
-msgstr ""
+msgstr "Hiba a proxy kiszolgáló indításakor"
#: mainwindow.cpp:518
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured proxy server"
-msgstr ""
+msgstr "A beállított proxy kiszolgáló indítása sikertelen"
#: mainwindow.cpp:641
msgctxt "MainWindow"
msgid "Your relay is shutting down."
"Click 'Stop' again to stop your relay now."
msgstr ""
+"Elosztás lekapcsolása folyamatban. Kattintson újra a 'Stop'-ra ha azonnal "
+"meg kívánja szakítani a kapcsolatokat."
#: mainwindow.cpp:878
msgctxt "MainWindow"
msgid "Connection Error"
-msgstr ""
+msgstr "Kapcsolódási hiba"
#: mainwindow.cpp:915
msgctxt "MainWindow"
@@ -1086,21 +1113,24 @@
""
"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
+"Az Elosztás jelenleg fut. Az elosztások azonnali leállítása váratlanul "
+"lekapcsolja a jelenleg kapcsolódott klienseket. Kíván idõt hagyni a "
+"klienseknek új Ösvények kiépítéséhez ?"
#: mainwindow.cpp:937
msgctxt "MainWindow"
msgid "Error Shutting Down"
-msgstr ""
+msgstr "Hiba a lekapcsoláskor"
#: mainwindow.cpp:938
msgctxt "MainWindow"
msgid "Vidalia was unable to stop the Tor software."
-msgstr ""
+msgstr "A TOR leállítása sikertelen."
#: mainwindow.cpp:969
msgctxt "MainWindow"
msgid "Unexpected Error"
-msgstr ""
+msgstr "Váratlan hiba"
#: mainwindow.cpp:973
msgctxt "MainWindow"
@@ -1108,46 +1138,50 @@
""
"Please check the message log for recent warning or error messages."
msgstr ""
+"A TOR váratlanul leállt. Ellenõrizze a napló bejegyzések figyelmeztetõ- és "
+"hibaüzeneteit."
#: mainwindow.cpp:1050
msgctxt "MainWindow"
msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
-msgstr ""
+msgstr "A TOR egy bejelentkezõ süti elküldését kéri, de nem található."
#: mainwindow.cpp:1059
msgctxt "MainWindow"
msgid "Data Directory"
-msgstr ""
+msgstr "Adat könyvtár"
#: mainwindow.cpp:1061
msgctxt "MainWindow"
msgid "Control Cookie (control_auth_cookie)"
-msgstr ""
+msgstr "Kontroll süti (control_auth_cookie)"
#: mainwindow.cpp:1111
msgctxt "MainWindow"
msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
msgstr ""
+"Nem sikerült a Vidaliát kifogástalanul elindítani, ezért bizonyos funkciói "
+"várhatóan nem fognak rendeltetésszerûen mûködni."
#: mainwindow.cpp:1160
msgctxt "MainWindow"
msgid "Authentication Error"
-msgstr ""
+msgstr "Ellenõrzési hiba"
#: mainwindow.cpp:1162
msgctxt "MainWindow"
msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
+msgstr "TOR ellenõrzött beléptetése sikertelen. (%1)"
#: mainwindow.cpp:1398
msgctxt "MainWindow"
msgid "Port Forwarding Failed"
-msgstr ""
+msgstr "Port továbbítás sikertelen"
#: mainwindow.cpp:1399
msgctxt "MainWindow"
msgid "Vidalia was unable to configure automatic port forwarding."
-msgstr ""
+msgstr "Automata Port továbbítás beállítása sikertelen."
#: mainwindow.ui:49
msgctxt "MainWindow"
@@ -1157,182 +1191,182 @@
#: mainwindow.ui:246
msgctxt "MainWindow"
msgid "Set up a relay and help the network grow"
-msgstr ""
+msgstr "Elosztás beállítása és a TOR hálózat sebességének növelése"
#: mainwindow.ui:307
msgctxt "MainWindow"
msgid "View recent bandwidth usage"
-msgstr ""
+msgstr "Sávszélesség statisztika megtekintése"
#: mainwindow.ui:320
msgctxt "MainWindow"
msgid "View log message history"
-msgstr ""
+msgstr "Naplóbejegyzések megtekintése"
#: mainwindow.ui:383
msgctxt "MainWindow"
msgid "Configure Vidalia"
-msgstr ""
+msgstr "Vidalia konfigurációja"
#: mainwindow.ui:233
msgctxt "MainWindow"
msgid "Start Tor"
-msgstr ""
+msgstr "TOR indítása"
#: mainwindow.cpp:495
msgctxt "MainWindow"
msgid "Error starting IM client"
-msgstr ""
+msgstr "Hiba az IM (azonnali üzenetküldõ) program indításakor"
#: mainwindow.cpp:496
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured IM client"
-msgstr ""
+msgstr "A beállított IM program indítása sikertelen"
#: mainwindow.cpp:534
msgctxt "MainWindow"
msgid "Connecting to a relay directory"
-msgstr ""
+msgstr "Csatlakozás egy Elosztó címtárhoz"
#: mainwindow.cpp:538
msgctxt "MainWindow"
msgid "Establishing an encrypted directory connection"
-msgstr ""
+msgstr "Titkosított címtárkapcsolat létrehozása"
#: mainwindow.cpp:541
msgctxt "MainWindow"
msgid "Retrieving network status"
-msgstr ""
+msgstr "Hálózat státuszának lekérdezése"
#: mainwindow.cpp:544
msgctxt "MainWindow"
msgid "Loading network status"
-msgstr ""
+msgstr "Hálózat státuszának betöltése"
#: mainwindow.cpp:547
msgctxt "MainWindow"
msgid "Loading authority certificates"
-msgstr ""
+msgstr "Biztonsági ellenõrzõk betöltése"
#: mainwindow.cpp:550
msgctxt "MainWindow"
msgid "Requesting relay information"
-msgstr ""
+msgstr "Elosztási adatok lekérdezése"
#: mainwindow.cpp:553
msgctxt "MainWindow"
msgid "Loading relay information"
-msgstr ""
+msgstr "Elosztási adatok betöltése"
#: mainwindow.cpp:1100
msgctxt "MainWindow"
msgid "Connecting to the Tor network"
-msgstr ""
+msgstr "Kapcsolódás a TOR hálózathoz"
#: mainwindow.cpp:560
msgctxt "MainWindow"
msgid "Establishing a Tor circuit"
-msgstr ""
+msgstr "TOR kapcsolat felépítése"
#: mainwindow.cpp:1235
msgctxt "MainWindow"
msgid "Connected to the Tor network!"
-msgstr ""
+msgstr "TOR kapcsolódva !"
#: mainwindow.cpp:567
msgctxt "MainWindow"
msgid "Unrecognized startup status"
-msgstr ""
+msgstr "Felismerhetetlen indítási státusz"
#: mainwindow.cpp:574
msgctxt "MainWindow"
msgid "miscellaneous"
-msgstr ""
+msgstr "egyebek"
#: mainwindow.cpp:577
msgctxt "MainWindow"
msgid "identity mismatch"
-msgstr ""
+msgstr "identitás eltérés"
#: mainwindow.cpp:580
msgctxt "MainWindow"
msgid "done"
-msgstr ""
+msgstr "kész"
#: mainwindow.cpp:583
msgctxt "MainWindow"
msgid "connection refused"
-msgstr ""
+msgstr "kapcsolódás visszautasítva"
#: mainwindow.cpp:586
msgctxt "MainWindow"
msgid "connection timeout"
-msgstr ""
+msgstr "a kapcsolódási idõ letelt"
#: mainwindow.cpp:589
msgctxt "MainWindow"
msgid "read/write error"
-msgstr ""
+msgstr "írás/olvasás hiba"
#: mainwindow.cpp:592
msgctxt "MainWindow"
msgid "no route to host"
-msgstr ""
+msgstr "nincs út a kiszolgálóhoz"
#: mainwindow.cpp:595
msgctxt "MainWindow"
msgid "insufficient resources"
-msgstr ""
+msgstr "elfogytak az erõforrások"
#: mainwindow.cpp:598
msgctxt "MainWindow"
msgid "unknown"
-msgstr ""
+msgstr "ismeretlen"
#: mainwindow.cpp:600
msgctxt "MainWindow"
msgid " failed (%1)"
-msgstr ""
+msgstr "nem sikerült (%1)"
#: mainwindow.cpp:648
msgctxt "MainWindow"
msgid "Stop Tor Now"
-msgstr ""
+msgstr "TOR azonnali leállítása"
#: mainwindow.cpp:650
msgctxt "MainWindow"
msgid "Stop Tor"
-msgstr ""
+msgstr "TOR leállítása"
#: mainwindow.cpp:666
msgctxt "MainWindow"
msgid "Starting the Tor software"
-msgstr ""
+msgstr "TOR indítása"
#: mainwindow.ui:75
msgctxt "MainWindow"
msgid "Starting Tor"
-msgstr ""
+msgstr "TOR indítása"
#: mainwindow.cpp:677
msgctxt "MainWindow"
msgid "Tor is Running"
-msgstr ""
+msgstr "TOR kapcsolódva"
#: mainwindow.cpp:868
msgctxt "MainWindow"
msgid "Connecting to Tor"
-msgstr ""
+msgstr "TOR kapcsolódása"
#: mainwindow.cpp:1027
msgctxt "MainWindow"
msgid "Authenticating to Tor"
-msgstr ""
+msgstr "TOR beléptetése"
#: messagelog.ui:19
msgctxt "MessageLog"
msgid "Message Log"
-msgstr "Log üzenetek"
+msgstr "Log üzenetek (Napló)"
#: messagelog.ui:66
msgctxt "MessageLog"
@@ -1422,8 +1456,7 @@
#: messagelog.ui:466
msgctxt "MessageLog"
msgid "Set maximum number of messages to display"
-msgstr "A megjelenítendõ üzenetek maximális számának"
-"megadása"
+msgstr "A megjelenítendõ üzenetek maximális számának megadása"
#: messagelog.ui:477
msgctxt "MessageLog"
@@ -1513,8 +1546,7 @@
#: messagelog.ui:601
msgctxt "MessageLog"
msgid "Find all messages containing the search text (Ctrl+F)"
-msgstr "Minden, az adott szöveget tartalmazó üzenet"
-"megkeresése (Ctrl+F)"
+msgstr "Minden, az adott szöveget tartalmazó üzenet megkeresése (Ctrl+F)"
#: messagelog.ui:604
msgctxt "MessageLog"
@@ -1525,15 +1557,15 @@
msgctxt "MessageLog"
msgid "Messages that appear when something has "
"gone very wrong and Tor cannot proceed."
-msgstr "Olyan üzenetek, amelyek akkor keletkeznek, amikor"
-"valami nagyon rosszul sült el és a Tor nem tud tovább haladni."
+msgstr ""
+"Olyan üzenetek, amelyek akkor keletkeznek, amikor valami nagyon rosszul sült "
+"el és a TOR nem tud tovább haladni."
#: messagelog.cpp:139
msgctxt "MessageLog"
msgid "Messages that only appear when "
"something has gone wrong with Tor."
-msgstr "Csak a Tor hibás mûködése esetén keletkezõ"
-"üzenetek."
+msgstr "Csak a TOR hibás mûködése esetén keletkezõ üzenetek."
#: messagelog.cpp:143
msgctxt "MessageLog"
@@ -1541,22 +1573,21 @@
"during normal Tor operation and are "
"not considered errors, but you may "
"care about."
-msgstr "Normális Tor mûködés során ritkán keletkezõ log"
-"üzenetek, amelyek nem hibák, de nem árt foglalkoznod velük."
+msgstr ""
+"Normális TOR mûködés során ritkán keletkezõ log üzenetek, amelyek nem hibák, "
+"de nem árt foglalkoznod velük."
#: messagelog.cpp:145
msgctxt "MessageLog"
msgid "Messages that appear frequently "
"during normal Tor operation."
-msgstr "Normális Tor mûködés során gyakran keletkezõ log"
-"üzenetek."
+msgstr "Normális TOR mûködés során gyakran keletkezõ log üzenetek."
#: messagelog.cpp:147
msgctxt "MessageLog"
msgid "Hyper-verbose messages primarily of "
"interest to Tor developers."
-msgstr "Nagyon részletes üzenetek, fõleg Tor fejelsztõk"
-"részére."
+msgstr "Nagyon részletes üzenetek, fõleg TOR fejlesztõk részére."
#: messagelog.cpp:192
msgctxt "MessageLog"
@@ -1631,73 +1662,69 @@
#: messagelog.cpp:193
msgctxt "MessageLog"
msgid "Vidalia was unable to register for Tor's log events."
-msgstr "A Vidalia nem tudta regisztrálni a Tor log"
-"eseményeit."
+msgstr "A Vidalia nem tudta regisztrálni a TOR log eseményeit."
#: messagelog.cpp:313
msgctxt "MessageLog"
msgid "Cannot write file %1"
""
"%2."
-msgstr "Nem írható a %1 állomány"
-""
-"%2."
+msgstr "Nem írható a %1 állomány %2."
#: messagelog.cpp:209
msgctxt "MessageLog"
msgid "Vidalia was unable to open the specified log file."
-msgstr "A Vidalia nem tudta megnyitni a megadott log"
-"állományt."
+msgstr "A Vidalia nem tudta megnyitni a megadott log állományt."
#: messagelog.ui:573
msgctxt "MessageLog"
msgid "F1"
-msgstr ""
+msgstr "F1"
#: messagelog.cpp:303
msgctxt "MessageLog"
msgid "Text Files (*.txt)"
-msgstr ""
+msgstr "Szöveges állományok (*.txt)"
#: messagelog.cpp:230
msgctxt "MessageLog"
msgid "Log Filename Required"
-msgstr ""
+msgstr "Log állománynév szükséges"
#: messagelog.cpp:232
msgctxt "MessageLog"
msgid "You must enter a filename to be able to save log messages to a file."
-msgstr ""
+msgstr "Meg kell adnia egy állománynevet a naplózás elmentéséhez."
#: messagelog.ui:297
msgctxt "MessageLog"
msgid "Message Log History"
-msgstr ""
+msgstr "Üzenet napló"
#: messagelog.ui:318
msgctxt "MessageLog"
msgid "Number of messages to display in the message log window"
-msgstr ""
+msgstr "Naplóban egyidejûleg megjeleníthetõ log üzenetek száma"
#: messagelog.ui:337
msgctxt "MessageLog"
msgid "messages"
-msgstr ""
+msgstr "üzenetek"
#: messagelog.ui:356
msgctxt "MessageLog"
msgid "Always Save New Log Messages"
-msgstr ""
+msgstr "Mindig mentse az új üzeneteket"
#: messagelog.ui:394
msgctxt "MessageLog"
msgid "Enable automatically saving all new log messages to a file"
-msgstr ""
+msgstr "Új üzenetek automatikus mentésének bekapcsolása"
#: messagelog.ui:397
msgctxt "MessageLog"
msgid "Automatically save new log messages to a file"
-msgstr ""
+msgstr "Mindig mentse automatikusan az új üzeneteket"
#: netviewer.ui:236
msgctxt "NetViewer"
@@ -1712,7 +1739,7 @@
#: netviewer.ui:270
msgctxt "NetViewer"
msgid "Close"
-msgstr "Lezár"
+msgstr "Bezár"
#: netviewer.ui:287
msgctxt "NetViewer"
@@ -1752,12 +1779,12 @@
#: netviewer.ui:245
msgctxt "NetViewer"
msgid "Ctrl+R"
-msgstr ""
+msgstr "CTRL+R"
#: netviewer.ui:262
msgctxt "NetViewer"
msgid "F1"
-msgstr ""
+msgstr "F1"
#: netviewer.ui:279
msgctxt "NetViewer"
@@ -1767,7 +1794,7 @@
#: netviewer.ui:296
msgctxt "NetViewer"
msgid "+"
-msgstr ""
+msgstr "+"
#: netviewer.ui:313
msgctxt "NetViewer"
@@ -1777,112 +1804,117 @@
#: netviewer.ui:321
msgctxt "NetViewer"
msgid "Zoom To Fit"
-msgstr ""
+msgstr "Optimális közelítés"
#: netviewer.ui:327
msgctxt "NetViewer"
msgid "Zooms to fit all currently displayed circuits"
-msgstr ""
+msgstr "Közelítés a megjelenített ösvényekre"
#: netviewer.ui:330
msgctxt "NetViewer"
msgid "Ctrl+Z"
-msgstr ""
+msgstr "Ctrl+Z"
#: netviewer.ui:24
msgctxt "NetViewer"
msgid "Tor Network Map"
-msgstr ""
+msgstr "TOR hálózati térkép"
#: netviewer.ui:242
msgctxt "NetViewer"
msgid "Refresh the list of Tor relays and connections"
-msgstr ""
+msgstr "TOR Elosztások és kapcsolatok listájának frissítése"
#: networkpage.cpp:34
msgctxt "NetworkPage"
msgid "Network"
-msgstr ""
+msgstr "Hálózat"
#: networkpage.cpp:186
msgctxt "NetworkPage"
msgid "Invalid Bridge"
-msgstr ""
+msgstr "Érvénytelen Hídkapcsolat"
#: networkpage.cpp:187
msgctxt "NetworkPage"
msgid "The specified bridge identifier is not valid."
-msgstr ""
+msgstr "A megadott Hídkapcsolat azonosító érvénytelen."
#: networkpage.cpp:234
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
-msgstr ""
+msgstr "Másolás (Ctrl+C)"
#: networkpage.cpp:265
msgctxt "NetworkPage"
msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
msgstr ""
+"Meg kell adni mind vagy egy IP címet, vagy egy állomásnevet (host) és egy "
+"portot , ahhoz, hogy a TOR ezen a proxy-n keresztül kapcsolódjon az "
+"Internethez."
#: networkpage.cpp:271
msgctxt "NetworkPage"
msgid "You must specify one or more ports to which your firewall allows you to connect."
msgstr ""
+"Meg kell adni egy vagy több olyan portot, amelyek engedélyezve (nyitva) "
+"vannak a tûzfalban."
#: networkpage.cpp:307
msgctxt "NetworkPage"
msgid "'%1' is not a valid port number."
-msgstr ""
+msgstr "A következõ port érvénytelen: '%1' "
#: networkpage.ui:28
msgctxt "NetworkPage"
msgid "I use a proxy to access the Internet"
-msgstr ""
+msgstr "Proxy-t használok az Internetre való kapcsolódáshoz"
#: networkpage.ui:58
msgctxt "NetworkPage"
msgid "Proxy Settings"
-msgstr ""
+msgstr "Proxy beállítások"
#: networkpage.ui:70
msgctxt "NetworkPage"
msgid "HTTP Proxy:"
-msgstr ""
+msgstr "HTTP Proxy:"
#: networkpage.ui:80
msgctxt "NetworkPage"
msgid "Username:"
-msgstr ""
+msgstr "Felhasználónév: "
#: networkpage.ui:90
msgctxt "NetworkPage"
msgid "Use this proxy for HTTPS also"
-msgstr ""
+msgstr "Ezen proxy használata a https:// kapcsolatokhoz is"
#: networkpage.ui:108
msgctxt "NetworkPage"
msgid "Password:"
-msgstr ""
+msgstr "Jelszó: "
#: networkpage.ui:135
msgctxt "NetworkPage"
msgid "Port:"
-msgstr ""
+msgstr "Port: "
#: networkpage.ui:179
msgctxt "NetworkPage"
msgid "My firewall only lets me connect to certain ports"
-msgstr ""
+msgstr "A tûzfalam csak néhány porton engedélyez kapcsolódást"
#: networkpage.ui:203
msgctxt "NetworkPage"
msgid "Firewall Settings"
-msgstr ""
+msgstr "Tûzfal beállítások"
#: networkpage.ui:215
msgctxt "NetworkPage"
msgid "Allowed Ports:"
-msgstr ""
+msgstr "Engedélyezett portok: "
#: networkpage.ui:225
msgctxt "NetworkPage"
@@ -1892,52 +1924,60 @@
#: networkpage.ui:238
msgctxt "NetworkPage"
msgid "My ISP blocks connections to the Tor network"
-msgstr ""
+msgstr "A szolgáltatóm blokkolja a TOR-t"
#: networkpage.ui:295
msgctxt "NetworkPage"
msgid "Add a Bridge:"
-msgstr ""
+msgstr "Hídkapcsolat hozzáadása: "
#: networkpage.ui:383
msgctxt "NetworkPage"
msgid "Remove the selected bridges from the list"
-msgstr ""
+msgstr "Hídkapcsolat eltávolítása a listából"
#: networkpage.ui:399
msgctxt "NetworkPage"
msgid "Copy the selected bridges to the clipboard"
-msgstr ""
+msgstr "A kiválasztott Hídkapcsolat vágólapra másolása"
#: networkpage.ui:318
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
-msgstr ""
+msgstr "<a href=\"bridges.finding\">Hogyan találhatok Hídkapcsolatokat?</a>"
#: networkpage.ui:25
msgctxt "NetworkPage"
msgid "Check if your local network requires a proxy to access the Internet"
msgstr ""
+"Tegye be a pipát, ha a helyi hálózata proxy-t igényel az Internethez való "
+"kapcsolódáshoz"
#: networkpage.ui:176
msgctxt "NetworkPage"
msgid "Check to only connect to relays using ports allowed by your firewall"
msgstr ""
+"Kizárólag olyan Elosztókhoz való kapcsolódás, amelyek a tûzfalam nyitott "
+"portjaira vannak konfigurálva"
#: networkpage.ui:235
msgctxt "NetworkPage"
msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
msgstr ""
+"Címtár lekérdezések titkosítása és opcionálisan, Hídkapcsolatok használata a "
+"TOR-hoz való kapcsolódáshoz"
#: networkpage.ui:262
msgctxt "NetworkPage"
msgid "Bridge Settings"
-msgstr ""
+msgstr "Hídkapcsolatok beállításai"
#: networkpage.ui:274
msgctxt "NetworkPage"
msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
msgstr ""
+"A TOR jelenleg futó verziója nem támogatja a Hídkapcsolatokat.<br>A "
+"címtárlista le- és feltöltése azonban titkosított lesz."
#: policy.cpp:167
msgctxt "Policy"
@@ -1997,22 +2037,22 @@
#: routerdescriptorview.cpp:60
msgctxt "RouterDescriptorView"
msgid "%1 days "
-msgstr ""
+msgstr "%1 nap"
#: routerdescriptorview.cpp:63
msgctxt "RouterDescriptorView"
msgid "%1 hours "
-msgstr ""
+msgstr "%1 óra"
#: routerdescriptorview.cpp:66
msgctxt "RouterDescriptorView"
msgid "%1 mins "
-msgstr ""
+msgstr "%1 perc"
#: routerdescriptorview.cpp:69
msgctxt "RouterDescriptorView"
msgid "%1 secs"
-msgstr ""
+msgstr "%1 másodperc"
#: routerlistitem.cpp:83
msgctxt "RouterListItem"
@@ -2032,22 +2072,22 @@
#: routerlistwidget.cpp:31
msgctxt "RouterListWidget"
msgid "Relay"
-msgstr ""
+msgstr "Elosztás"
#: routerlistwidget.cpp:58
msgctxt "RouterListWidget"
msgid "Zoom to Relay"
-msgstr ""
+msgstr "Elosztókra szûkítés"
#: routerlistwidget.cpp:151
msgctxt "RouterListWidget"
msgid "%1 relays online"
-msgstr ""
+msgstr "%1 Elosztó kapcsolódva"
#: serverpage.ui:32
msgctxt "ServerPage"
msgid "Relay traffic for the Tor network"
-msgstr "A Tor hálózat forgalmának közvetítése"
+msgstr "A TOR hálózat forgalmának közvetítése (Elosztás)"
#: serverpage.ui:234
msgctxt "ServerPage"
@@ -2057,7 +2097,7 @@
#: serverpage.ui:267
msgctxt "ServerPage"
msgid "Directory Port Number"
-msgstr "Címtár port száma"
+msgstr "Címtár portja"
#: serverpage.ui:380
msgctxt "ServerPage"
@@ -2082,142 +2122,146 @@
#: serverpage.ui:620
msgctxt "ServerPage"
msgid "Long-term average bandwidth limit"
-msgstr ""
+msgstr "Hosszútávú átlagos sávszélesség korlátozás"
#: serverpage.ui:591
msgctxt "ServerPage"
msgid "Average Rate"
-msgstr ""
+msgstr "Átlagos sávszélesség"
#: serverpage.ui:708
msgctxt "ServerPage"
msgid "KB/s"
-msgstr ""
+msgstr "KB/s"
#: serverpage.ui:695
msgctxt "ServerPage"
msgid "Peak bandwidth rate limit"
-msgstr ""
+msgstr "Sávszélesség-korlátozás maximuma"
#: serverpage.ui:666
msgctxt "ServerPage"
msgid "Maximum Rate"
-msgstr ""
+msgstr "Maximum sebesség"
#: serverpage.ui:502
msgctxt "ServerPage"
msgid "Show help topic on bandwidth rate limits"
-msgstr ""
+msgstr "Sávszélesség-korlátozással kapcsolatos súgó témák megjelenítése"
#: serverpage.ui:76
msgctxt "ServerPage"
msgid "Basic Settings"
-msgstr ""
+msgstr "Alap beállítások"
#: serverpage.ui:400
msgctxt "ServerPage"
msgid "Bandwidth Limits"
-msgstr ""
+msgstr "Sávszélesség-korlátozások"
#: serverpage.ui:435
msgctxt "ServerPage"
msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
msgstr ""
+"Gyors letöltés, de lassú feltöltés esetén adja meg a feltöltési sebességét "
+"itt."
#: serverpage.ui:456
msgctxt "ServerPage"
msgid "Select the entry that most closely resembles your Internet connection"
-msgstr ""
+msgstr "Válassza ki az Internet-sebességéhez legközelebb álló értéket"
#: serverpage.ui:466
msgctxt "ServerPage"
msgid "Cable/DSL 256 Kbps"
-msgstr ""
+msgstr "Kábel/DSL 256 Kbps"
#: serverpage.ui:471
msgctxt "ServerPage"
msgid "Cable/DSL 512 Kbps"
-msgstr ""
+msgstr "Kábel/DSL 512 Kbps"
#: serverpage.ui:476
msgctxt "ServerPage"
msgid "Cable/DSL 768 Kbps"
-msgstr ""
+msgstr "Kábel/DSL 768 Kbps"
#: serverpage.ui:481
msgctxt "ServerPage"
msgid "T1/Cable/DSL 1.5 Mbps"
-msgstr ""
+msgstr "T1/Kábel/DSL 1.5 Mbps"
#: serverpage.ui:486
msgctxt "ServerPage"
msgid "> 1.5 Mbps"
-msgstr ""
+msgstr "több mint 1.5 Mbps"
#: serverpage.ui:491
msgctxt "ServerPage"
msgid "Custom"
-msgstr ""
+msgstr "Egyéni"
#: serverpage.ui:802
msgctxt "ServerPage"
msgid "Ports 6660 - 6669 and 6697"
-msgstr ""
+msgstr "Portok: 6660 - 6669 és 6697"
#: serverpage.ui:805
msgctxt "ServerPage"
msgid "Internet Relay Chat (IRC)"
-msgstr ""
+msgstr "IRC chat"
#: serverpage.ui:815
msgctxt "ServerPage"
msgid "Ports 110, 143, 993 and 995"
-msgstr ""
+msgstr "Portok: 110, 143, 993 és 995"
#: serverpage.ui:818
msgctxt "ServerPage"
msgid "Retrieve Mail (POP, IMAP)"
-msgstr ""
+msgstr "Levél fogadása (POP, IMAP)"
#: serverpage.ui:828
msgctxt "ServerPage"
msgid "Ports unspecified by other checkboxes"
-msgstr ""
+msgstr "Portok melyek egyébként nincsenek máshol bejelölve"
#: serverpage.ui:831
msgctxt "ServerPage"
msgid "Misc Other Services"
-msgstr ""
+msgstr "Egyéb Szolgáltatások"
#: serverpage.ui:844
msgctxt "ServerPage"
msgid "Instant Messaging (IM)"
-msgstr ""
+msgstr "IM (azonnali üzenetküldõk)"
#: serverpage.ui:854
msgctxt "ServerPage"
msgid "Port 443"
-msgstr ""
+msgstr "443-as port"
#: serverpage.ui:857
msgctxt "ServerPage"
msgid "Secure Websites (SSL)"
-msgstr ""
+msgstr "Biztonságos (https) weblapok"
#: serverpage.ui:867
msgctxt "ServerPage"
msgid "Port 80"
-msgstr ""
+msgstr "80-as port"
#: serverpage.ui:870
msgctxt "ServerPage"
msgid "Websites"
-msgstr ""
+msgstr "Weboldalak"
#: serverpage.ui:737
msgctxt "ServerPage"
msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
msgstr ""
+"A maximum Internetsebességnek nagyobbnak kell lennie, mint az átlagosnak, de "
+"mindkét érték minimum 20 KB/s lehet."
#: serverpage.cpp:68
msgctxt "ServerPage"
@@ -2227,118 +2271,132 @@
#: serverpage.cpp:133
msgctxt "ServerPage"
msgid "Bridge Support Unavailable"
-msgstr ""
+msgstr "A Hídkapcsolat támogatás nem elérhetõ"
#: serverpage.cpp:136
msgctxt "ServerPage"
msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
msgstr ""
+"Ön beállította a TOR-t Hídkapcsolati Elosztóként,blokkolt felhasználók TOR-"
+"hoz kapcsolódásának segítéséhez, viszont ez a TOR verzió nem támogatja a "
+"Hídkapcsolati Elosztást."
#: serverpage.cpp:138
msgctxt "ServerPage"
msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
msgstr ""
+"Frissítse a TOR-t vagy állítsa be hagyományos forgalom-Elosztóként "
+"(közvetítõként)."
#: serverpage.cpp:256
msgctxt "ServerPage"
msgid "You must specify at least a relay nickname and port."
-msgstr ""
+msgstr "Minimum egy Elosztónevet és a portot meg kell adnia."
#: serverpage.ui:91
msgctxt "ServerPage"
msgid "Relay Port:"
-msgstr ""
+msgstr "Közvetítõ port:"
#: serverpage.ui:204
msgctxt "ServerPage"
msgid "Email address at which you may be reached if there is a"
"problem with your relay. You might also include your PGP or GPG fingerprint."
msgstr ""
+"E-mail cím, amelyen elérhetõ, ha bármi gond adódna az Elosztásával. "
+"Ugyancsak itt érdemes egy PGP vagy egy GPG digitális azonosítókulcsot is "
+"megadni."
#: serverpage.ui:113
msgctxt "ServerPage"
msgid "Mirror the Relay Directory "
-msgstr ""
+msgstr "Elosztócímtárak tükrözése"
#: serverpage.cpp:192
msgctxt "ServerPage"
msgid "Your bridge relay is not running."
-msgstr ""
+msgstr "A Hídkapcsolati Elosztása nem fut."
#: serverpage.ui:39
msgctxt "ServerPage"
msgid "Help censored users reach the Tor network (Tor 0.2.0.8-alpha or newer)"
msgstr ""
+"Blokkolt felhasználók segítése a TOR hálózathoz való kapcsolódához (TOR "
+"0.2.0.8-alfa vagy újabb)"
#: serverpage.ui:337
msgctxt "ServerPage"
msgid "Name of your relay"
-msgstr ""
+msgstr "Az Elosztó neve"
#: serverpage.ui:370
msgctxt "ServerPage"
msgid "Port on which users and other relays can communicate with your relay"
msgstr ""
+"A port, amelyen más felhasználók és Elosztók kommunikálnak az Ön "
+"közvetítésével"
#: serverpage.ui:1005
msgctxt "ServerPage"
msgid "Let others access your bridge by giving them this line:"
msgstr ""
+"Ezen sort adja meg másoknak, akiket szeretne hozzásegíteni a "
+"Hídkapcsolatával a TOR hálózathoz:"
#: serverpage.ui:1029
msgctxt "ServerPage"
msgid "This is the identity of your bridge relay that you can give to other people"
-msgstr ""
+msgstr "Ez az Ön Hídkapcsolati azonosítója, amelyet megadhat másoknak"
#: serverpage.ui:1051
msgctxt "ServerPage"
msgid "Copy your bridge relay's identity to the clipboard"
-msgstr ""
+msgstr "A Hídkapcsolati azonosító vágólapra másolása"
#: serverpage.ui:841
msgctxt "ServerPage"
msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
-msgstr ""
+msgstr "Portok: 706, 1863, 5050, 5190, 5222, 5223, 8300 és 8888"
#: serverpage.ui:25
msgctxt "ServerPage"
msgid "Run as a client only"
-msgstr ""
+msgstr "Csak kliens indítása"
#: serverpage.ui:110
msgctxt "ServerPage"
msgid "Enable to mirror the relay directory"
-msgstr ""
+msgstr "Az Elosztócímtár tükrözésének bekapcsolása"
#: serverpage.ui:139
msgctxt "ServerPage"
msgid "Attempt to automatically configure port forwarding"
-msgstr ""
+msgstr "Port továbbítás automatikus konfigurálásának indítása"
#: serverpage.ui:154
msgctxt "ServerPage"
msgid "Test"
-msgstr ""
+msgstr "Teszt"
#: serverpage.ui:969
msgctxt "ServerPage"
msgid "What Internet resources should users be able to access from your relay?"
-msgstr ""
+msgstr "Mely típusú Internet-kapcsolatokat engedélyezi a felhasználóknak?"
#: serverpage.ui:164
msgctxt "ServerPage"
msgid "Show help topic on port forwarding"
-msgstr ""
+msgstr "Port továbbítással kapcsolatos súgó témakörök megtekintése"
#: servicepage.cpp:27
msgctxt "ServicePage"
msgid "Services"
-msgstr ""
+msgstr "Szolgáltatások"
#: servicepage.cpp:109
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
-msgstr ""
+msgstr "Hiba minden futó szolgáltatás lekapcsolásakor"
#: servicepage.cpp:590
msgctxt "ServicePage"
@@ -2348,87 +2406,91 @@
#: servicepage.cpp:445
msgctxt "ServicePage"
msgid "Please select a Service."
-msgstr ""
+msgstr "Válasszon egy szolgáltatást."
#: servicepage.cpp:451
msgctxt "ServicePage"
msgid "Select Service Directory"
-msgstr ""
+msgstr "Szolgáltatás könyvtár kiválasztása"
#: servicepage.cpp:540
msgctxt "ServicePage"
msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr ""
+msgstr "A Virtuális port csak érvényes (1..65535) számokat tartalmazhat"
#: servicepage.cpp:571
msgctxt "ServicePage"
msgid "Target may only contain address:port, address, or port."
msgstr ""
+"A cél megadási szintaktikája csak a következõ lehet:<br>IP cím:port vagy "
+"csak IP cím, vagy csak port."
#: servicepage.cpp:591
msgctxt "ServicePage"
msgid "Directory already in use by another service."
-msgstr ""
+msgstr "A könyvár már használatban van egy másik szolgáltatás által."
#: servicepage.ui:19
msgctxt "ServicePage"
msgid "Form"
-msgstr ""
+msgstr "Forma"
#: servicepage.ui:31
msgctxt "ServicePage"
msgid "Provided Hidden Services"
-msgstr ""
+msgstr "Megadott Rejtett Szolgáltatások"
#: servicepage.ui:56
msgctxt "ServicePage"
msgid "Onion Address"
-msgstr ""
+msgstr "Onion cím"
#: servicepage.ui:61
msgctxt "ServicePage"
msgid "Virtual Port"
-msgstr ""
+msgstr "Virtuális Port"
#: servicepage.ui:66
msgctxt "ServicePage"
msgid "Target"
-msgstr ""
+msgstr "Cél"
#: servicepage.ui:71
msgctxt "ServicePage"
msgid "Directory Path"
-msgstr ""
+msgstr "Könyvtár Útvonal"
#: servicepage.ui:76
msgctxt "ServicePage"
msgid "Enabled"
-msgstr ""
+msgstr "Státusz"
#: servicepage.ui:84
msgctxt "ServicePage"
msgid "Add new service to list"
-msgstr ""
+msgstr "Új szolgáltatás felvétele a listába"
#: servicepage.ui:97
msgctxt "ServicePage"
msgid "Remove selected service from list"
-msgstr ""
+msgstr "Kiválasztott szolgáltatás eltávolítása a listából"
#: servicepage.ui:110
msgctxt "ServicePage"
msgid "Copy onion address of selected service to clipboard"
-msgstr ""
+msgstr "A kiválasztott szolgáltatás .onion címének vágólapra másolása"
#: servicepage.ui:123
msgctxt "ServicePage"
msgid "Browse in local file system and choose directory for selected service"
-msgstr ""
+msgstr "A kiválasztott szolgáltatás helyének kitallózása a Sajátgépben"
#: servicepage.cpp:116
msgctxt "ServicePage"
msgid "Please configure at least a service directory and a virtual port for each service you want to save. Remove the other ones."
msgstr ""
+"Adjon meg minimum egy szolgáltatás könyvtárat és egy portot minden "
+"elmentendõ szolgáltatáshoz, a többit pedig törölje."
#: stream.cpp:118
msgctxt "Stream"
@@ -2473,97 +2535,97 @@
#: stream.cpp:126
msgctxt "Stream"
msgid "Remapped"
-msgstr ""
+msgstr "Újratérképezve"
#: torprocess.cpp:107
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
-msgstr "%1 folyamatot nem sikerült leállítani. [%2]"
+msgstr "%1 folyamat leállítása sikertelen. [%2]"
#: torservice.cpp:143
msgctxt "TorService"
msgid "The Tor service is not installed."
-msgstr ""
+msgstr "A TOR szolgáltatás nincs telepítve."
#: torservice.cpp:161
msgctxt "TorService"
msgid "Unable to start the Tor service."
-msgstr ""
+msgstr "TOR szolgáltatás indítása sikertelen."
#: torsettings.cpp:107
msgctxt "TorSettings"
msgid "Failed to hash the control password."
-msgstr ""
+msgstr "Kontroll jelszó ellenõrzõ-végösszegének létrehozása sikertelen."
#: upnpcontrol.cpp:139
msgctxt "UPNPControl"
msgid "Success"
-msgstr ""
+msgstr "Siker"
#: upnpcontrol.cpp:141
msgctxt "UPNPControl"
msgid "No UPnP-enabled devices found"
-msgstr ""
+msgstr "Nem található UPnP eszköz"
#: upnpcontrol.cpp:143
msgctxt "UPNPControl"
msgid "No valid UPnP-enabled Internet gateway devices found"
-msgstr ""
+msgstr "Nem található UPnP támogatású Internet Átjáró eszköz"
#: upnpcontrol.cpp:145
msgctxt "UPNPControl"
msgid "WSAStartup failed"
-msgstr ""
+msgstr "WSA elindítása sikertelen"
#: upnpcontrol.cpp:147
msgctxt "UPNPControl"
msgid "Failed to add a port mapping"
-msgstr ""
+msgstr "Port térképezés hozzáadása sikertelen"
#: upnpcontrol.cpp:149
msgctxt "UPNPControl"
msgid "Failed to retrieve a port mapping"
-msgstr ""
+msgstr "Port térképezés fogadása sikertelen"
#: upnpcontrol.cpp:151
msgctxt "UPNPControl"
msgid "Failed to remove a port mapping"
-msgstr ""
+msgstr "Port térképezés eltávolítása sikertelen"
#: upnpcontrol.cpp:153
msgctxt "UPNPControl"
msgid "Unknown error"
-msgstr ""
+msgstr "Ismeretlen hiba"
#: upnptestdialog.cpp:112
msgctxt "UPNPTestDialog"
msgid "Discovering UPnP-enabled devices"
-msgstr ""
+msgstr "Bekapcsolt UPnP eszközök felderítése"
#: upnptestdialog.cpp:117
msgctxt "UPNPTestDialog"
msgid "Updating directory port mapping"
-msgstr ""
+msgstr "Címtár térképezés frissítése"
#: upnptestdialog.cpp:122
msgctxt "UPNPTestDialog"
msgid "Updating relay port mapping"
-msgstr ""
+msgstr "Elosztó térképezés frissítése"
#: upnptestdialog.cpp:127
msgctxt "UPNPTestDialog"
msgid "Test completed successfully!"
-msgstr ""
+msgstr "A teszt sikerült !"
#: upnptestdialog.ui:13
msgctxt "UPNPTestDialog"
msgid "Testing UPnP Support"
-msgstr ""
+msgstr "UPnP támogatás tesztelése"
#: upnptestdialog.ui:92
msgctxt "UPNPTestDialog"
msgid "Testing Universal Plug & Play Support"
-msgstr ""
+msgstr "Universal Plug & Play támogatás tesztelése"
#: vmessagebox.cpp:77
msgctxt "VMessageBox"
@@ -2608,12 +2670,12 @@
#: vmessagebox.cpp:85
msgctxt "VMessageBox"
msgid "Continue"
-msgstr ""
+msgstr "Folytatás"
#: vmessagebox.cpp:86
msgctxt "VMessageBox"
msgid "Quit"
-msgstr ""
+msgstr "Kilépés"
#: vmessagebox.cpp:87
msgctxt "VMessageBox"
@@ -2641,64 +2703,65 @@
""
"Would you like to continue starting Vidalia?"
msgstr ""
+"Egy másik Vidalia már valószínûleg fut. Ha valóban nincs futó Vidalia a "
+"háttérben folytathatja. Kívánja folytatni a Vidalia indítását?"
#: main.cpp:74
msgctxt "Vidalia"
msgid "Invalid Argument"
-msgstr ""
+msgstr "Érvénytelen kapcsoló"
#: vidalia.cpp:166
msgctxt "Vidalia"
msgid "Displays this usage message and exits."
-msgstr ""
+msgstr "Megjeleníti ezt az üzenetet és kilép."
#: vidalia.cpp:168
msgctxt "Vidalia"
msgid "Resets ALL stored Vidalia settings."
-msgstr ""
+msgstr "Visszaállít minden tárolt Vidalia beállítást."
#: vidalia.cpp:170
msgctxt "Vidalia"
msgid "Sets the directory Vidalia uses for data files."
-msgstr ""
+msgstr "Beállítja a könyvtárat melyben a Vidalia adatokat tárol."
#: vidalia.cpp:172
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's pidfile."
-msgstr ""
+msgstr "Beállítja a nevét és a helyét a Vidalia pid-állományának."
#: vidalia.cpp:174
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's logfile."
-msgstr ""
+msgstr "Beállítja a nevét és a helyét a Vidalia logjának (naplójának)."
#: vidalia.cpp:177
msgctxt "Vidalia"
msgid "Sets the verbosity of Vidalia's logging."
-msgstr ""
+msgstr "Beállítja a Vidalia naplózásának összetettségét."
#: vidalia.cpp:180
msgctxt "Vidalia"
msgid "Sets Vidalia's interface style."
-msgstr ""
+msgstr "Beállítja a Vidalia kinézetét."
#: vidalia.cpp:183
msgctxt "Vidalia"
msgid "Sets Vidalia's language."
-msgstr ""
+msgstr "Beállítja a Vidalia nyelvét."
#: vidalia.cpp:187
msgctxt "Vidalia"
msgid "Vidalia Usage Information"
-msgstr ""
+msgstr "Vidalia használati útmutató"
#: vidalia.cpp:248
msgctxt "Vidalia"
msgid "Invalid log level specified: "
-msgstr ""
+msgstr "Érvénytelen naplózási szint:"
#: vidalia.cpp:254
msgctxt "Vidalia"
msgid "Unable to open log file '%1': %2"
-msgstr ""
-
+msgstr "A '%1' napló megnyitása sikertelen: %2"
Modified: vidalia/branches/auto-updates/src/vidalia/i18n/ro/qt_ro.po
===================================================================
--- vidalia/branches/auto-updates/src/vidalia/i18n/ro/qt_ro.po 2008-11-20 04:37:44 UTC (rev 3328)
+++ vidalia/branches/auto-updates/src/vidalia/i18n/ro/qt_ro.po 2008-11-21 02:04:34 UTC (rev 3329)
@@ -3,356 +3,360 @@
"Project-Id-Version: Vidalia\n"
"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2008-08-20 03:25+0000\n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2008-11-01 14:34+0000\n"
+"Last-Translator: Matt <edmanm@xxxxxxxxxxxxxxxxxxx>\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
-"20)) ? 1 : 2;\n"
-"X-Generator: Vidalia ts2po 0.2\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);\n"
+"X-Generator: Pootle 1.1.0\n"
#: qaccessibleobject.cpp:348
msgctxt "QApplication"
msgid "Activate"
-msgstr ""
+msgstr "Activează"
#: qmessagebox.h:319
msgctxt "QApplication"
msgid "Executable '%1' requires Qt %2, found Qt %3."
-msgstr ""
+msgstr "Executabilul '%1' are nevoie de Qt %2, a fost găsit Qt %3."
#: qmessagebox.h:321
msgctxt "QApplication"
msgid "Incompatible Qt Library Error"
-msgstr ""
+msgstr "Eroare, biblioteca Qt este incompatibilă"
#: qapplication.cpp:2095
msgctxt "QApplication"
msgid "QT_LAYOUT_DIRECTION"
-msgstr ""
+msgstr "LTR"
#: qaccessibleobject.cpp:350
msgctxt "QApplication"
msgid "Activates the program's main window"
-msgstr ""
+msgstr "Activează fereastra principală a programului"
#: qmessagebox.cpp:2104
msgctxt "QDialogButtonBox"
msgid "OK"
-msgstr ""
+msgstr "OK"
#: qdialogbuttonbox.cpp:528
msgctxt "QDialogButtonBox"
msgid "Save"
-msgstr ""
+msgstr "Salvează"
#: qdialogbuttonbox.cpp:531
msgctxt "QDialogButtonBox"
msgid "Open"
-msgstr ""
+msgstr "Deschide"
#: qdialogbuttonbox.cpp:534
msgctxt "QDialogButtonBox"
msgid "Cancel"
-msgstr ""
+msgstr "Revocare"
#: qdialogbuttonbox.cpp:537
msgctxt "QDialogButtonBox"
msgid "Close"
-msgstr ""
+msgstr "Închide"
#: qdialogbuttonbox.cpp:540
msgctxt "QDialogButtonBox"
msgid "Apply"
-msgstr ""
+msgstr "Aplică"
#: qdialogbuttonbox.cpp:543
msgctxt "QDialogButtonBox"
msgid "Reset"
-msgstr ""
+msgstr "Reiniţializează"
#: qdialogbuttonbox.cpp:546
msgctxt "QDialogButtonBox"
msgid "Help"
-msgstr ""
+msgstr "Ajutor"
#: qdialogbuttonbox.cpp:550
msgctxt "QDialogButtonBox"
msgid "Don't Save"
-msgstr ""
+msgstr "Nu salva"
#: qdialogbuttonbox.cpp:554
msgctxt "QDialogButtonBox"
msgid "Discard"
-msgstr ""
+msgstr "Renunţă"
#: qdialogbuttonbox.cpp:557
msgctxt "QDialogButtonBox"
msgid "&Yes"
-msgstr ""
+msgstr "&Da"
#: qdialogbuttonbox.cpp:560
msgctxt "QDialogButtonBox"
msgid "Yes to &All"
-msgstr ""
+msgstr "Da la &toate"
#: qdialogbuttonbox.cpp:563
msgctxt "QDialogButtonBox"
msgid "&No"
-msgstr ""
+msgstr "&Nu"
#: qdialogbuttonbox.cpp:566
msgctxt "QDialogButtonBox"
msgid "N&o to All"
-msgstr ""
+msgstr "N&u la toate"
#: qdialogbuttonbox.cpp:569
msgctxt "QDialogButtonBox"
msgid "Save All"
-msgstr ""
+msgstr "Salvează pe toate"
#: qdialogbuttonbox.cpp:572
msgctxt "QDialogButtonBox"
msgid "Abort"
-msgstr ""
+msgstr "Renunţă"
#: qdialogbuttonbox.cpp:575
msgctxt "QDialogButtonBox"
msgid "Retry"
-msgstr ""
+msgstr "Încearcă din nou"
#: qdialogbuttonbox.cpp:578
msgctxt "QDialogButtonBox"
msgid "Ignore"
-msgstr ""
+msgstr "Ignoră"
#: qdialogbuttonbox.cpp:581
msgctxt "QDialogButtonBox"
msgid "Restore Defaults"
-msgstr ""
+msgstr "Setări implicite"
#: qdialogbuttonbox.cpp:552
msgctxt "QDialogButtonBox"
msgid "Close without Saving"
-msgstr ""
+msgstr "Închide fără a salva"
#: qdialogbuttonbox.cpp:525
msgctxt "QDialogButtonBox"
msgid "&OK"
-msgstr ""
+msgstr "&OK"
#: qdirmodel.cpp:423
msgctxt "QDirModel"
msgid "Name"
-msgstr ""
+msgstr "Nume"
#: qdirmodel.cpp:424
msgctxt "QDirModel"
msgid "Size"
-msgstr ""
+msgstr "Mărime"
#: qdirmodel.cpp:427
msgctxt "QDirModel"
msgid "Kind"
-msgstr ""
+msgstr "Categorie"
#: qdirmodel.cpp:429
msgctxt "QDirModel"
msgid "Type"
-msgstr ""
+msgstr "Tip"
#: qdirmodel.cpp:435
msgctxt "QDirModel"
msgid "Date Modified"
-msgstr ""
+msgstr "Data ultimei modificări"
#: qfiledialog_win.cpp:126
msgctxt "QFileDialog"
msgid "All Files (*)"
-msgstr ""
+msgstr "Toate fişierele (*)"
#: qfiledialog.cpp:881
msgctxt "QFileDialog"
msgid "Directories"
-msgstr ""
+msgstr "Directoare"
#: qfiledialog.cpp:2408
msgctxt "QFileDialog"
msgid "&Open"
-msgstr ""
+msgstr "&Deschide"
#: qfiledialog.cpp:919
msgctxt "QFileDialog"
msgid "&Save"
-msgstr ""
+msgstr "&Salvează"
#: qfiledialog.cpp:435
msgctxt "QFileDialog"
msgid "Open"
-msgstr ""
+msgstr "Deschide"
#: qfiledialog.cpp:1670
msgctxt "QFileDialog"
msgid "%1 already exists.Do you want to replace it?"
-msgstr ""
+msgstr "%1 există deja. Doriţi să-l înlocuiţi?"
#: qfiledialog.cpp:1690
msgctxt "QFileDialog"
msgid "%1File not found.Please verify the correct file name was given."
msgstr ""
+"%1Fişierul nu a fost găsit. Verificaţi numele fişierului şi încercaţi din "
+"nou."
#: qdirmodel.cpp:833
msgctxt "QFileDialog"
msgid "My Computer"
-msgstr ""
+msgstr "Computerul meu"
#: qfiledialog.cpp:462
msgctxt "QFileDialog"
msgid "&Rename"
-msgstr ""
+msgstr "&Redenumeşte"
#: qfiledialog.cpp:463
msgctxt "QFileDialog"
msgid "&Delete"
-msgstr ""
+msgstr "&Şterge"
#: qfiledialog.cpp:464
msgctxt "QFileDialog"
msgid "Show &hidden files"
-msgstr ""
+msgstr "Arată &fişierele ascunse"
#: ui_qfiledialog.h:264
msgctxt "QFileDialog"
msgid "Back"
-msgstr ""
+msgstr "Înapoi"
#: ui_qfiledialog.h:274
msgctxt "QFileDialog"
msgid "Parent Directory"
-msgstr ""
+msgstr "Directorul superior"
#: ui_qfiledialog.h:284
msgctxt "QFileDialog"
msgid "List View"
-msgstr ""
+msgstr "Vizualizare listă"
#: ui_qfiledialog.h:289
msgctxt "QFileDialog"
msgid "Detail View"
-msgstr ""
+msgstr "Vizualizare detaliată"
#: ui_qfiledialog.h:292
msgctxt "QFileDialog"
msgid "Files of type:"
-msgstr ""
+msgstr "Fişiere de tipul:"
#: qfiledialog.cpp:883
msgctxt "QFileDialog"
msgid "Directory:"
-msgstr ""
+msgstr "Director:"
#: qfiledialog.cpp:2476
msgctxt "QFileDialog"
msgid ""
"%1Directory not found.Please verify the correct directory name was given."
msgstr ""
+"%1Directorul nu a fost găsit. Verificaţi numele directorului şi încercaţi "
+"din nou."
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
msgid "'%1' is write protected.Do you want to delete it anyway?"
-msgstr ""
+msgstr "'%1' e protejat la scriere. Doriţi să-l ştergeţi oricum?"
#: qfiledialog.cpp:2286
msgctxt "QFileDialog"
msgid "Are sure you want to delete '%1'?"
-msgstr ""
+msgstr "Sunteţi sigur că doriţi să ştergeţi '%1'?"
#: qfiledialog.cpp:2299
msgctxt "QFileDialog"
msgid "Could not delete directory."
-msgstr ""
+msgstr "Directorul nu a putut fi şters."
#: qfiledialog_win.cpp:128
msgctxt "QFileDialog"
msgid "All Files (*.*)"
-msgstr ""
+msgstr "Toate fişierele (*.*)"
#: qfiledialog.cpp:437
msgctxt "QFileDialog"
msgid "Save As"
-msgstr ""
+msgstr "Salvează ca"
#: qfileiconprovider.cpp:379
msgctxt "QFileDialog"
msgid "Drive"
-msgstr ""
+msgstr "Drive"
#: qfileiconprovider.cpp:383
msgctxt "QFileDialog"
msgid "File"
-msgstr ""
+msgstr "Fişier"
#: qfileiconprovider.cpp:412
msgctxt "QFileDialog"
msgid "Unknown"
-msgstr ""
+msgstr "Necunoscut"
#: qfiledialog.cpp:439
msgctxt "QFileDialog"
msgid "Find Directory"
-msgstr ""
+msgstr "Găseşte director"
#: qfiledialog.cpp:458
msgctxt "QFileDialog"
msgid "Show "
-msgstr ""
+msgstr "Arată "
#: ui_qfiledialog.h:269
msgctxt "QFileDialog"
msgid "Forward"
-msgstr ""
+msgstr "Înainte"
#: qfiledialog.cpp:2137
msgctxt "QFileDialog"
msgid "New Folder"
-msgstr ""
+msgstr "Director nou"
#: qfiledialog.cpp:465
msgctxt "QFileDialog"
msgid "&New Folder"
-msgstr ""
+msgstr "&Director nou"
#: qfiledialog.cpp:917
msgctxt "QFileDialog"
msgid "&Choose"
-msgstr ""
+msgstr "&Alege"
#: qsidebar.cpp:388
msgctxt "QFileDialog"
msgid "Remove"
-msgstr ""
+msgstr "Şterge"
#: qfiledialog.cpp:886
msgctxt "QFileDialog"
msgid "File &name:"
-msgstr ""
+msgstr "Nume &fişier:"
#: ui_qfiledialog.h:261
msgctxt "QFileDialog"
msgid "Look in:"
-msgstr ""
+msgstr "Vezi în:"
#: ui_qfiledialog.h:279
msgctxt "QFileDialog"
msgid "Create New Folder"
-msgstr ""
+msgstr "Creează director nou"
#: qfilesystemmodel.cpp:761
msgctxt "QFileSystemModel"
msgid "Invalid filename"
-msgstr ""
+msgstr "Nume de fişier invalid"
#: qfilesystemmodel.cpp:763
msgctxt "QFileSystemModel"
@@ -360,63 +364,65 @@
"<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer "
"characters or no punctuations marks."
msgstr ""
+"<b>Numele \"%1\" nu poate fi folosit.</b><p>Folosiţi alt nume, cu mai puţine "
+"litere or sau fără semne de punctuaţie."
#: qfilesystemmodel.cpp:832
msgctxt "QFileSystemModel"
msgid "Name"
-msgstr ""
+msgstr "Nume"
#: qfilesystemmodel.cpp:834
msgctxt "QFileSystemModel"
msgid "Size"
-msgstr ""
+msgstr "Mărime"
#: qfilesystemmodel.cpp:838
msgctxt "QFileSystemModel"
msgid "Kind"
-msgstr ""
+msgstr "Categorie"
#: qfilesystemmodel.cpp:840
msgctxt "QFileSystemModel"
msgid "Type"
-msgstr ""
+msgstr "Tip"
#: qfilesystemmodel.cpp:847
msgctxt "QFileSystemModel"
msgid "Date Modified"
-msgstr ""
+msgstr "Data ultimei modificări"
#: qfilesystemmodel_p.h:198
msgctxt "QFileSystemModel"
msgid "My Computer"
-msgstr ""
+msgstr "Computerul meu"
#: qfilesystemmodel_p.h:200
msgctxt "QFileSystemModel"
msgid "Computer"
-msgstr ""
+msgstr "Computer"
#: qfilesystemmodel.cpp:677
msgctxt "QFileSystemModel"
msgid "%1 TB"
-msgstr ""
+msgstr "%1 TO"
#: qfilesystemmodel.cpp:679
msgctxt "QFileSystemModel"
msgid "%1 GB"
-msgstr ""
+msgstr "%1 GO"
#: qfilesystemmodel.cpp:681
msgctxt "QFileSystemModel"
msgid "%1 MB"
-msgstr ""
+msgstr "%1 MO"
#: qfilesystemmodel.cpp:683
msgctxt "QFileSystemModel"
msgid "%1 KB"
-msgstr ""
+msgstr "%1 KO"
#: qfilesystemmodel.cpp:684
msgctxt "QFileSystemModel"
msgid "%1 bytes"
-msgstr ""
+msgstr "%1 octeţi"
Modified: vidalia/branches/auto-updates/src/vidalia/i18n/ro/vidalia_ro.po
===================================================================
--- vidalia/branches/auto-updates/src/vidalia/i18n/ro/vidalia_ro.po 2008-11-20 04:37:44 UTC (rev 3328)
+++ vidalia/branches/auto-updates/src/vidalia/i18n/ro/vidalia_ro.po 2008-11-21 02:04:34 UTC (rev 3329)
@@ -3,14 +3,15 @@
"Project-Id-Version: Vidalia\n"
"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
"POT-Creation-Date: 2008-07-02 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: \n"
+"PO-Revision-Date: 2008-11-03 12:35+0000\n"
+"Last-Translator: Tiberiu Cristea <zugurudumba@xxxxxxxxx>\n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-"X-Generator: Vidalia ts2po 0.2\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);\n"
+"X-Generator: Pootle 1.1.0\n"
#: aboutdialog.ui:25
msgctxt "AboutDialog"
@@ -105,7 +106,7 @@
#: advancedpage.cpp:236
msgctxt "AdvancedPage"
msgid "%1 does not exist. Would you like to create it?"
-msgstr "%1 nu a fost găsit. Doriţi ca acest element să fie creat?"
+msgstr "%1 nu există. Doriţi ca acest element să fie creat?"
#: advancedpage.cpp:247
msgctxt "AdvancedPage"
@@ -115,17 +116,17 @@
#: advancedpage.cpp:248
msgctxt "AdvancedPage"
msgid "Unable to create %1 [%2]"
-msgstr "%1 nu a putu fi creat. [%2]"
+msgstr "%1 nu a putut fi creat. [%2]"
#: advancedpage.cpp:285
msgctxt "AdvancedPage"
msgid "Unable to remove Tor Service"
-msgstr "Nu s-a putut elimina serviciul Tor"
+msgstr "Serviciul Tor nu a putut fi eliminat"
#: advancedpage.cpp:296
msgctxt "AdvancedPage"
msgid "Unable to install Tor Service"
-msgstr "Nu s-a reuşit instalarea serviciului Tor"
+msgstr "Serviciul Tor nu a putut fi instalat"
#: advancedpage.cpp:297
msgctxt "AdvancedPage"
@@ -184,12 +185,12 @@
#: advancedpage.ui:111
msgctxt "AdvancedPage"
msgid "Randomly Generate"
-msgstr "Generează arbitrar"
+msgstr "Generează aleator"
#: advancedpage.ui:86
msgctxt "AdvancedPage"
msgid "None"
-msgstr "Nici unul"
+msgstr "Fără autentificare"
#: advancedpage.cpp:34
msgctxt "AdvancedPage"
@@ -199,7 +200,8 @@
#: advancedpage.ui:240
msgctxt "AdvancedPage"
msgid "Start the Tor software with the specified configuration file (torrc)"
-msgstr "Porneşte Tor cu fişierul de configurare specificat (torrc)"
+msgstr ""
+"Tor foloseşte acest fişier de configurare (torrc) atunci când este lansat"
#: advancedpage.ui:259
msgctxt "AdvancedPage"
@@ -214,12 +216,12 @@
#: advancedpage.ui:296
msgctxt "AdvancedPage"
msgid "Store data for the Tor software in the following directory"
-msgstr "Stochează datele Tor în următorul director"
+msgstr "Datele Tor sunt stocate în acest director"
#: advancedpage.ui:315
msgctxt "AdvancedPage"
msgid "Select the directory used to store data for the Tor software"
-msgstr "Alege directorul Tor de stocare a datelor"
+msgstr "Alegeţi directorul de stocare a datelor Tor"
#: advancedpage.ui:219
msgctxt "AdvancedPage"
@@ -229,7 +231,7 @@
#: appearancepage.ui:31
msgctxt "AppearancePage"
msgid "Language"
-msgstr "Limba"
+msgstr "Limbă"
#: appearancepage.ui:52
msgctxt "AppearancePage"
@@ -259,7 +261,7 @@
#: bwgraph.ui:16
msgctxt "BandwidthGraph"
msgid "Tor Bandwidth Usage"
-msgstr "Statistici lăţime de bandă"
+msgstr "Statistici trafic"
#: bwgraph.ui:40
msgctxt "BandwidthGraph"
@@ -289,7 +291,7 @@
#: bwgraph.ui:443
msgctxt "BandwidthGraph"
msgid "Save"
-msgstr "Salvează"
+msgstr "Salvare"
#: bwgraph.ui:450
msgctxt "BandwidthGraph"
@@ -299,7 +301,7 @@
#: bwgraph.cpp:160
msgctxt "BandwidthGraph"
msgid "Since:"
-msgstr "Se contorizează din:"
+msgstr "Se contorizează din"
#: bwgraph.ui:368
msgctxt "BandwidthGraph"
@@ -334,7 +336,7 @@
#: circuit.cpp:90
msgctxt "Circuit"
msgid "Open"
-msgstr "Deschide"
+msgstr "Deschis"
#: circuit.cpp:91
msgctxt "Circuit"
@@ -549,7 +551,7 @@
#: generalpage.ui:38
msgctxt "GeneralPage"
msgid "Tor Executable"
-msgstr "Fişierul executabil al Tor"
+msgstr "Fişierul executabil Tor"
#: graphframe.cpp:237
msgctxt "GraphFrame"
@@ -589,12 +591,12 @@
#: helpbrowser.ui:174
msgctxt "HelpBrowser"
msgid "Find Previous"
-msgstr "Găseşte înapoi"
+msgstr "Căutare înapoi"
#: helpbrowser.ui:187
msgctxt "HelpBrowser"
msgid "Find Next"
-msgstr "Găseşte înainte"
+msgstr "Căutare înainte"
#: helpbrowser.ui:221
msgctxt "HelpBrowser"
@@ -609,12 +611,12 @@
#: helpbrowser.ui:305
msgctxt "HelpBrowser"
msgid "Help Topics"
-msgstr "Ajutor"
+msgstr "Categorii"
#: helpbrowser.ui:350
msgctxt "HelpBrowser"
msgid "Search"
-msgstr "Căutare"
+msgstr "Caută"
#: helpbrowser.ui:405
msgctxt "HelpBrowser"
@@ -689,7 +691,7 @@
#: helpbrowser.ui:552
msgctxt "HelpBrowser"
msgid "Close Vidalia Help"
-msgstr "Închide centrul de ajutor Vidalia"
+msgstr "Închide centrul de asistenţă Vidalia"
#: helpbrowser.ui:555
msgctxt "HelpBrowser"
@@ -729,12 +731,12 @@
#: helpbrowser.ui:362
msgctxt "HelpBrowser"
msgid "Searching for:"
-msgstr "Se caută:"
+msgstr "Introduceţi un termen sau mai mulţi:"
#: helpbrowser.cpp:134
msgctxt "HelpBrowser"
msgid "Supplied XML file is not a valid Contents document."
-msgstr "Fişierul XML furnizat nu este un fişier de cuprins valid."
+msgstr "Fişierul furnizat nu este un fişier valid XML de cuprins."
#: helpbrowser.cpp:426
msgctxt "HelpBrowser"
@@ -744,26 +746,26 @@
#: helptextbrowser.cpp:54
msgctxt "HelpTextBrowser"
msgid "Error opening help file: "
-msgstr "Eroare la deschiderea fişierului cu documentaţia ajutătoare: "
+msgstr "Eroare la deschiderea fişierului documentaţie: "
#: helptextbrowser.cpp:72
msgctxt "HelpTextBrowser"
msgid "Opening External Link"
-msgstr "Deschide legătură externă"
+msgstr "Se deschide legătură externă"
#: helptextbrowser.cpp:76
msgctxt "HelpTextBrowser"
msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
msgstr ""
-"Vidalia poate deschide în navigatorul dumneavoastră web implicit legătura pe "
-"care aţi ales-o. Dacă navigatorul dumneavoastră nu este configurat pentru a "
-"folosi Tor, atunci cererea nu va fi anonimă."
+"Vidalia poate deschide legătura pe care aţi ales-o cu navigatorul "
+"dumneavoastră web implicit. Dacă navigatorul dumneavoastră nu este "
+"configurat pentru a folosi Tor, atunci cererea nu va fi anonimă."
#: helptextbrowser.cpp:78
msgctxt "HelpTextBrowser"
msgid "Do you want Vidalia to open the link in your Web browser?"
msgstr ""
-"Doriţi ca Vidalia să deschidă legătura în navigatorul dumneavoastră web?"
+"Doriţi ca Vidalia să deschidă legătura cu navigatorul dumneavoastră web?"
#: helptextbrowser.cpp:88
msgctxt "HelpTextBrowser"
@@ -795,7 +797,7 @@
#: logevent.cpp:60
msgctxt "LogEvent"
msgid "Warning"
-msgstr "Atenţie!"
+msgstr "Atenţionare"
#: logevent.cpp:61
msgctxt "LogEvent"
@@ -820,7 +822,7 @@
#: mainwindow.ui:304
msgctxt "MainWindow"
msgid "Bandwidth Graph"
-msgstr "Graficul lăţimii de bandă"
+msgstr "Informaţii trafic"
#: mainwindow.ui:317
msgctxt "MainWindow"
@@ -830,7 +832,7 @@
#: mainwindow.ui:367
msgctxt "MainWindow"
msgid "Help"
-msgstr "Ajutor"
+msgstr "Asistenţă"
#: mainwindow.cpp:394
msgctxt "MainWindow"
@@ -912,7 +914,7 @@
#: mainwindow.cpp:1334
msgctxt "MainWindow"
msgid "All subsequent connections will appear to be different than your old connections."
-msgstr "Toate noile conexiuni vor apare ca fiind diferite faţă de cele vechi."
+msgstr "Toate conexiunile noi vor apare ca fiind diferite faţă de cele vechi."
#: mainwindow.cpp:1349
msgctxt "MainWindow"
@@ -937,7 +939,7 @@
#: mainwindow.ui:218
msgctxt "MainWindow"
msgid "Vidalia Shortcuts"
-msgstr "Scurtături pentru Vidalia"
+msgstr "Comenzi rapide"
#: mainwindow.ui:243
msgctxt "MainWindow"
@@ -1037,7 +1039,7 @@
#: mainwindow.cpp:910
msgctxt "MainWindow"
msgid "Relaying is Enabled"
-msgstr "Modul relaz este activat"
+msgstr "Modul relay este activat"
#: mainwindow.cpp:482
msgctxt "MainWindow"
@@ -1059,12 +1061,12 @@
msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
msgstr ""
"Versiunea curentă Tor este depăşită şi nu mai este recomandată. Vizitaţi "
-"saitul Tor pentru a descărca cea mai recentă versiune."
+"site-ul Tor pentru a descărca cea mai recentă versiune."
#: mainwindow.cpp:1271
msgctxt "MainWindow"
msgid "Tor website: %1"
-msgstr "Saitul Tor: %1"
+msgstr "Site-ul Tor: %1"
#: mainwindow.cpp:517
msgctxt "MainWindow"
@@ -1096,7 +1098,7 @@
"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
"Aveţi activat modul relay. Oprirea relay-ului va întrerupe toate conexiunile "
-"celor conectaţi la acest relay. Aţi dori să închideţi acest relay treptat "
+"celor conectaţi la acest relay. Aţi dori să închideţi acest relay treptat, "
"astfel încât să daţi clienţilor conectaţi posibilitatea de a găsi un nou "
"relay?"
@@ -1113,7 +1115,7 @@
#: mainwindow.cpp:969
msgctxt "MainWindow"
msgid "Unexpected Error"
-msgstr "Eroare neaşteptată"
+msgstr "Eroare inopinată"
#: mainwindow.cpp:973
msgctxt "MainWindow"
@@ -1129,7 +1131,7 @@
msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
msgstr ""
"Tor cere Vidalia transmiterea unui cookie de autentificare, dar Vidalia nu a "
-"putu găsi unul."
+"putut găsi unul."
#: mainwindow.cpp:1059
msgctxt "MainWindow"
@@ -1181,13 +1183,12 @@
#: mainwindow.ui:307
msgctxt "MainWindow"
msgid "View recent bandwidth usage"
-msgstr ""
-"Vezi istoricul recent al modului în care a fost folosită lăţimea de bandă"
+msgstr "Istoricul recent al traficului"
#: mainwindow.ui:320
msgctxt "MainWindow"
msgid "View log message history"
-msgstr "Vezi istoricul jurnalului"
+msgstr "Vizualizare jurnal"
#: mainwindow.ui:383
msgctxt "MainWindow"
@@ -1213,7 +1214,7 @@
#: mainwindow.cpp:534
msgctxt "MainWindow"
msgid "Connecting to a relay directory"
-msgstr "Se conectează la un director relay"
+msgstr "Conectare la un director relay"
#: mainwindow.cpp:538
msgctxt "MainWindow"
@@ -1248,7 +1249,7 @@
#: mainwindow.cpp:1100
msgctxt "MainWindow"
msgid "Connecting to the Tor network"
-msgstr "Se conectează la reţeaua Tor"
+msgstr "Conctare la reţeaua Tor"
#: mainwindow.cpp:560
msgctxt "MainWindow"
@@ -1328,7 +1329,7 @@
#: mainwindow.cpp:666
msgctxt "MainWindow"
msgid "Starting the Tor software"
-msgstr "Porniţi Tor"
+msgstr "Se lansează Tor"
#: mainwindow.ui:75
msgctxt "MainWindow"
@@ -1343,12 +1344,12 @@
#: mainwindow.cpp:868
msgctxt "MainWindow"
msgid "Connecting to Tor"
-msgstr "Se conectează la Tor"
+msgstr "Conectare la Tor"
#: mainwindow.cpp:1027
msgctxt "MainWindow"
msgid "Authenticating to Tor"
-msgstr "Se autentifică faţă de Tor"
+msgstr "Autentificare faţă de Tor"
#: messagelog.ui:19
msgctxt "MessageLog"
@@ -1408,7 +1409,7 @@
#: messagelog.ui:233
msgctxt "MessageLog"
msgid "Warning"
-msgstr "Atenţie"
+msgstr "Atenţionare"
#: messagelog.ui:249
msgctxt "MessageLog"
@@ -1438,7 +1439,7 @@
#: messagelog.ui:463
msgctxt "MessageLog"
msgid "History Size..."
-msgstr "Dimensiune istoric"
+msgstr "Dimensiune istoric..."
#: messagelog.ui:466
msgctxt "MessageLog"
@@ -1453,7 +1454,7 @@
#: messagelog.ui:480
msgctxt "MessageLog"
msgid "Clear all messages from the Message Log (Ctrl+E)"
-msgstr "Şterge toate mesajele din Jurnal (Ctrl+E)"
+msgstr "Şterge toate mesajele din jurnal (Ctrl+E)"
#: messagelog.ui:483
msgctxt "MessageLog"
@@ -1683,7 +1684,7 @@
msgid "You must enter a filename to be able to save log messages to a file."
msgstr ""
"Trebuie să introduceţi un nume de fişier pentru a putea salva mesajele din "
-"jurnal într-un fişier."
+"jurnal."
#: messagelog.ui:297
msgctxt "MessageLog"
@@ -1823,12 +1824,12 @@
#: networkpage.cpp:186
msgctxt "NetworkPage"
msgid "Invalid Bridge"
-msgstr "Pod invalid"
+msgstr "Bridge invalid"
#: networkpage.cpp:187
msgctxt "NetworkPage"
msgid "The specified bridge identifier is not valid."
-msgstr "Identificatorul specificat al podului nu este valid."
+msgstr "Identificatorul specificat al bridge-ului nu este valid."
#: networkpage.cpp:234
msgctxt "NetworkPage"
@@ -1872,7 +1873,7 @@
#: networkpage.ui:80
msgctxt "NetworkPage"
msgid "Username:"
-msgstr "Nume de utilizator:"
+msgstr "Nume utilizator:"
#: networkpage.ui:90
msgctxt "NetworkPage"
@@ -1917,54 +1918,54 @@
#: networkpage.ui:295
msgctxt "NetworkPage"
msgid "Add a Bridge:"
-msgstr "Adaugă un pod:"
+msgstr "Adaugă un bridge relay:"
#: networkpage.ui:383
msgctxt "NetworkPage"
msgid "Remove the selected bridges from the list"
-msgstr "Elimină podurile alese din listă"
+msgstr "Elimină bridge relay-urile alese din listă"
#: networkpage.ui:399
msgctxt "NetworkPage"
msgid "Copy the selected bridges to the clipboard"
-msgstr "Copiază podurile alese în clipboard"
+msgstr "Copiază bridge relay-urile alese în clipboard"
#: networkpage.ui:318
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
-msgstr "<a href=\"bridges.finding\">Cum găsesc un pod?</a>"
+msgstr "<a href=\"bridges.finding\">Cum găsesc un bridge relay?</a>"
#: networkpage.ui:25
msgctxt "NetworkPage"
msgid "Check if your local network requires a proxy to access the Internet"
msgstr ""
-"Bifează pentru a verifica dacă reţeaua locală necesită un proxy pentru a "
+"Bifaţi aici dacă reţeaua dumneavoastră locală necesită un proxy pentru a "
"accesa internetul"
#: networkpage.ui:176
msgctxt "NetworkPage"
msgid "Check to only connect to relays using ports allowed by your firewall"
msgstr ""
-"Bifează pentru a folosi numai conexiuni către relay-uri ce folosesc porturi "
-"permise de firewall-ul meu"
+"Bifaţi aici pentru a folosi numai conexiuni către relay-uri ce folosesc "
+"porturi permise de firewall-ul dumneavoastră"
#: networkpage.ui:235
msgctxt "NetworkPage"
msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
msgstr ""
-"Bifează pentru a cripta cererile către director şi, opţional, a folosi "
-"relay-uri pod pentru a accesa reţeaua Tor."
+"Bifaţi aici pentru a cripta cererile către director şi, opţional, pentru a "
+"folosi bridge relay-uri pentru a accesa reţeaua Tor."
#: networkpage.ui:262
msgctxt "NetworkPage"
msgid "Bridge Settings"
-msgstr "Setări pod"
+msgstr "Setări bridge relay"
#: networkpage.ui:274
msgctxt "NetworkPage"
msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
msgstr ""
-"Versiunea Tor pe care o folosiţi nu are suport pentru poduri. "
+"Versiunea Tor pe care o folosiţi nu are suport pentru bridge-uri. "
"<br>Conexiunile către director vor fi, totuşi, criptate."
#: policy.cpp:167
@@ -2135,7 +2136,7 @@
#: serverpage.ui:502
msgctxt "ServerPage"
msgid "Show help topic on bandwidth rate limits"
-msgstr "Asistenţă pentru limitarea lăţimii de bandă"
+msgstr "Asistenţă pentru limitarea traficului"
#: serverpage.ui:76
msgctxt "ServerPage"
@@ -2145,7 +2146,7 @@
#: serverpage.ui:400
msgctxt "ServerPage"
msgid "Bandwidth Limits"
-msgstr "Limitări ale lăţimii de bandă"
+msgstr "Limitări de trafic"
#: serverpage.ui:435
msgctxt "ServerPage"
@@ -2157,8 +2158,7 @@
#: serverpage.ui:456
msgctxt "ServerPage"
msgid "Select the entry that most closely resembles your Internet connection"
-msgstr ""
-"Alegeţi conexiunea cea mai similară cu conexiunea dumneavoastră la internet"
+msgstr "Alegeţi o conexiune similară cu conexiunea dumneavoastră la internet"
#: serverpage.ui:466
msgctxt "ServerPage"
@@ -2208,7 +2208,7 @@
#: serverpage.ui:818
msgctxt "ServerPage"
msgid "Retrieve Mail (POP, IMAP)"
-msgstr "Obţine poştă electronică (POP, IMAP)"
+msgstr "Poştă electronică (POP, IMAP)"
#: serverpage.ui:828
msgctxt "ServerPage"
@@ -2233,7 +2233,7 @@
#: serverpage.ui:857
msgctxt "ServerPage"
msgid "Secure Websites (SSL)"
-msgstr "Saituri sigure (SSL)"
+msgstr "Site-uri sigure (SSL)"
#: serverpage.ui:867
msgctxt "ServerPage"
@@ -2243,7 +2243,7 @@
#: serverpage.ui:870
msgctxt "ServerPage"
msgid "Websites"
-msgstr "Saituri"
+msgstr "Site-uri"
#: serverpage.ui:737
msgctxt "ServerPage"
@@ -2260,14 +2260,15 @@
#: serverpage.cpp:133
msgctxt "ServerPage"
msgid "Bridge Support Unavailable"
-msgstr "Suport pentru poduri indisponibil"
+msgstr "Suport pentru bridge relay-uri este indisponibil"
#: serverpage.cpp:136
msgctxt "ServerPage"
msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
msgstr ""
-"Aţi configurat Tor să se comporte ca un pod pentru utilizatorii cenzuraţi, "
-"însă versiunea dumneavoastră de Tor nu oferă suport pentru poduri."
+"Aţi configurat Tor să se comporte ca un bridge relay pentru utilizatorii "
+"cenzuraţi, însă versiunea dumneavoastră de Tor nu oferă suport pentru astfel "
+"de relay-uri."
#: serverpage.cpp:138
msgctxt "ServerPage"
@@ -2296,12 +2297,12 @@
#: serverpage.ui:113
msgctxt "ServerPage"
msgid "Mirror the Relay Directory "
-msgstr "Sait alternativ pentru directorul relay "
+msgstr "Site alternativ pentru directorul relay "
#: serverpage.cpp:192
msgctxt "ServerPage"
msgid "Your bridge relay is not running."
-msgstr "Relay-ul dumneavoastră nu rulează."
+msgstr "Bridge relay-ul dumneavoastră este oprit."
#: serverpage.ui:39
msgctxt "ServerPage"
@@ -2325,7 +2326,9 @@
#: serverpage.ui:1005
msgctxt "ServerPage"
msgid "Let others access your bridge by giving them this line:"
-msgstr "Permite accesul altora la pod dându-le această linie:"
+msgstr ""
+"Pentru ca alţii să acceseze bridge relay-ul dumneavoastră, au nevoie de "
+"textul de mai jos:"
#: serverpage.ui:1029
msgctxt "ServerPage"
@@ -2367,14 +2370,12 @@
#: serverpage.ui:969
msgctxt "ServerPage"
msgid "What Internet resources should users be able to access from your relay?"
-msgstr ""
-"Ce resurse internet vor putea accesa utilizatorii conectaţi la relay-ul "
-"dumneavoastră?"
+msgstr "Alegeţi resursele internet accesibile prin relay-ul dumneavoastră:"
#: serverpage.ui:164
msgctxt "ServerPage"
msgid "Show help topic on port forwarding"
-msgstr "Documentaţie despre port forwarding"
+msgstr "Asistenţă pentru port forwarding"
#: servicepage.ui:31
msgctxt "ServicePage"
@@ -2431,7 +2432,7 @@
#: servicepage.cpp:109
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
-msgstr "Eroare la încercarea de a şterge serviciile"
+msgstr "Eroare la încercarea de a şterge toate serviciile"
#: servicepage.cpp:590
msgctxt "ServicePage"
@@ -2441,7 +2442,7 @@
#: servicepage.cpp:451
msgctxt "ServicePage"
msgid "Select Service Directory"
-msgstr "Alege directorul de servicii"
+msgstr "Alegere director de servicii"
#: servicepage.cpp:445
msgctxt "ServicePage"
@@ -2489,7 +2490,7 @@
#: stream.cpp:120
msgctxt "Stream"
msgid "Resolving"
-msgstr "Resolving"
+msgstr "Se caută"
#: stream.cpp:121
msgctxt "Stream"
@@ -2569,7 +2570,7 @@
#: upnpcontrol.cpp:147
msgctxt "UPNPControl"
msgid "Failed to add a port mapping"
-msgstr "Maparea unui port a eşuat"
+msgstr "Eroare la maparea portului"
#: upnpcontrol.cpp:149
msgctxt "UPNPControl"
@@ -2639,7 +2640,7 @@
#: vmessagebox.cpp:81
msgctxt "VMessageBox"
msgid "Help"
-msgstr "Ajutor"
+msgstr "Asistenţă"
#: vmessagebox.cpp:82
msgctxt "VMessageBox"
@@ -2659,12 +2660,12 @@
#: vmessagebox.cpp:85
msgctxt "VMessageBox"
msgid "Continue"
-msgstr "Contunuă"
+msgstr "Continuare"
#: vmessagebox.cpp:86
msgctxt "VMessageBox"
msgid "Quit"
-msgstr "Termină"
+msgstr "Revocare"
#: vmessagebox.cpp:87
msgctxt "VMessageBox"
Modified: vidalia/branches/auto-updates/src/vidalia/log/logtreewidget.cpp
===================================================================
--- vidalia/branches/auto-updates/src/vidalia/log/logtreewidget.cpp 2008-11-20 04:37:44 UTC (rev 3328)
+++ vidalia/branches/auto-updates/src/vidalia/log/logtreewidget.cpp 2008-11-21 02:04:34 UTC (rev 3329)
@@ -101,6 +101,7 @@
LogTreeWidget::clearMessages()
{
/* Clear the messages */
+ _itemHistory.clear();
clear();
}
Modified: vidalia/branches/auto-updates/src/vidalia/log/messagelog.ui
===================================================================
--- vidalia/branches/auto-updates/src/vidalia/log/messagelog.ui 2008-11-20 04:37:44 UTC (rev 3328)
+++ vidalia/branches/auto-updates/src/vidalia/log/messagelog.ui 2008-11-21 02:04:34 UTC (rev 3329)
@@ -703,7 +703,7 @@
<sender>actionClear</sender>
<signal>triggered()</signal>
<receiver>lstMessages</receiver>
- <slot>clear()</slot>
+ <slot>clearMessages()</slot>
</connection>
<connection>
<sender>chkEnableLogFile</sender>
Modified: vidalia/branches/auto-updates/src/vidalia/mainwindow.cpp
===================================================================
--- vidalia/branches/auto-updates/src/vidalia/mainwindow.cpp 2008-11-20 04:37:44 UTC (rev 3328)
+++ vidalia/branches/auto-updates/src/vidalia/mainwindow.cpp 2008-11-21 02:04:34 UTC (rev 3329)
@@ -47,31 +47,31 @@
#define IMG_STOP_TOR_16 ":/images/16x16/media-playback-stop.png"
#define IMG_START_TOR_48 ":/images/48x48/media-playback-start.png"
#define IMG_STOP_TOR_48 ":/images/48x48/media-playback-stop.png"
-#define IMG_TOR_STOPPED_48 ":/images/48x48/tor-off.png"
-#define IMG_TOR_RUNNING_48 ":/images/48x48/tor-on.png"
-#define IMG_TOR_STARTING_48 ":/images/48x48/tor-starting.png"
-#define IMG_TOR_STOPPING_48 ":/images/48x48/tor-stopping.png"
+#define IMG_TOR_STOPPED_48 ":/images/48x48/status-red.png"
+#define IMG_TOR_RUNNING_48 ":/images/48x48/status-green.png"
+#define IMG_TOR_STARTING_48 ":/images/48x48/status-orange.png"
+#define IMG_TOR_STOPPING_48 ":/images/48x48/status-orange.png"
/* Decide which of our four sets of tray icons to use. */
#if defined(Q_WS_WIN)
/* QSystemTrayIcon on Windows wants 16x16 .png files */
-#define IMG_TOR_STOPPED ":/images/16x16/tor-off.png"
-#define IMG_TOR_RUNNING ":/images/16x16/tor-on.png"
-#define IMG_TOR_STARTING ":/images/16x16/tor-starting.png"
-#define IMG_TOR_STOPPING ":/images/16x16/tor-stopping.png"
+#define IMG_TOR_STOPPED ":/images/16x16/status-red.png"
+#define IMG_TOR_RUNNING ":/images/16x16/status-green.png"
+#define IMG_TOR_STARTING ":/images/16x16/status-orange.png"
+#define IMG_TOR_STOPPING ":/images/16x16/status-orange.png"
#elif defined(Q_WS_MAC)
/* On Mac, we always go straight to Carbon to load our dock images
* from .icns files */
-#define IMG_TOR_STOPPED "tor-off"
-#define IMG_TOR_RUNNING "tor-on"
-#define IMG_TOR_STARTING "tor-starting"
-#define IMG_TOR_STOPPING "tor-stopping"
+#define IMG_TOR_STOPPED "status-red"
+#define IMG_TOR_RUNNING "status-green"
+#define IMG_TOR_STARTING "status-orange"
+#define IMG_TOR_STOPPING "status-orange"
#else
/* On X11, we just use always the 22x22 .png files */
-#define IMG_TOR_STOPPED ":/images/22x22/tor-off.png"
-#define IMG_TOR_RUNNING ":/images/22x22/tor-on.png"
-#define IMG_TOR_STARTING ":/images/22x22/tor-starting.png"
-#define IMG_TOR_STOPPING ":/images/22x22/tor-stopping.png"
+#define IMG_TOR_STOPPED ":/images/22x22/status-red.png"
+#define IMG_TOR_RUNNING ":/images/22x22/status-green.png"
+#define IMG_TOR_STARTING ":/images/22x22/status-orange.png"
+#define IMG_TOR_STOPPING ":/images/22x22/status-orange.png"
#endif
/** Only allow 'New Identity' to be clicked once every 10 seconds. */
@@ -841,26 +841,15 @@
_useSavedPassword = true;
}
args << "HashedControlPassword"
- << TorSettings::hashPassword(_controlPassword)
- << "CookieAuthentication" << "0";
+ << TorSettings::hashPassword(_controlPassword);
break;
case TorSettings::CookieAuth:
- args << "CookieAuthentication" << "1"
- << "HashedControlPassword" << "";
+ args << "CookieAuthentication" << "1";
break;
default:
- args << "CookieAuthentication" << "0"
- << "HashedControlPassword" << "";
+ args << "CookieAuthentication" << "0";
}
- /* Add custom user and group information (if specified) */
- QString user = settings.getUser();
- if (!user.isEmpty())
- args << "User" << user;
- QString group = settings.getGroup();
- if (!group.isEmpty())
- args << "Group" << group;
-
/* This doesn't get set to false until Tor is actually up and running, so we
* don't yell at users twice if their Tor doesn't even start, due to the fact
* that QProcess::stopped() is emitted even if the process didn't even
Modified: vidalia/branches/auto-updates/src/vidalia/network/netviewer.cpp
===================================================================
--- vidalia/branches/auto-updates/src/vidalia/network/netviewer.cpp 2008-11-20 04:37:44 UTC (rev 3328)
+++ vidalia/branches/auto-updates/src/vidalia/network/netviewer.cpp 2008-11-21 02:04:34 UTC (rev 3329)
@@ -90,8 +90,8 @@
/* Connect the necessary slots and signals */
connect(ui.actionHelp, SIGNAL(triggered()), this, SLOT(help()));
connect(ui.actionRefresh, SIGNAL(triggered()), this, SLOT(refresh()));
- connect(ui.treeRouterList, SIGNAL(routerSelected(RouterDescriptor)),
- this, SLOT(routerSelected(RouterDescriptor)));
+ connect(ui.treeRouterList, SIGNAL(routerSelected(QList<RouterDescriptor>)),
+ this, SLOT(routerSelected(QList<RouterDescriptor>)));
connect(ui.treeRouterList, SIGNAL(zoomToRouter(QString)),
_map, SLOT(zoomToRouter(QString)));
connect(ui.treeCircuitList, SIGNAL(circuitSelected(Circuit)),
@@ -408,14 +408,20 @@
ui.textRouterInfo->display(routers);
}
-/** Called when the user selects a router from the router list. */
+/** Called when the user selects one or more routers from the router list. */
void
-NetViewer::routerSelected(const RouterDescriptor &router)
+NetViewer::routerSelected(const QList<RouterDescriptor> &routers)
{
_map->deselectAll();
ui.textRouterInfo->clear();
- ui.textRouterInfo->display(router);
- _map->selectRouter(router.id());
+ ui.textRouterInfo->display(routers);
+
+ /* XXX: Ideally we would also be able to select multiple pinpoints on the
+ * map. But our current map sucks and you can't even tell when one is
+ * selected anyway. Worry about this when we actually get to Marble.
+ */
+ if (routers.size() == 1)
+ _map->selectRouter(routers[0].id());
}
/** If there are any IPs in the resolve queue, do the request now. */
Modified: vidalia/branches/auto-updates/src/vidalia/network/netviewer.h
===================================================================
--- vidalia/branches/auto-updates/src/vidalia/network/netviewer.h 2008-11-20 04:37:44 UTC (rev 3328)
+++ vidalia/branches/auto-updates/src/vidalia/network/netviewer.h 2008-11-21 02:04:34 UTC (rev 3329)
@@ -66,8 +66,8 @@
void circuitSelected(const Circuit &circuit);
/** Called when an IP has been resolved to geographic information. */
void resolved(int id, const QList<GeoIp> &geoips);
- /** Called when the user selects a router in the list. */
- void routerSelected(const RouterDescriptor &router);
+ /** Called when the user selects one or more routers in the list. */
+ void routerSelected(const QList<RouterDescriptor> &routers);
/** Handles when we get connected to Tor network */
void onAuthenticated();
/** Handles when we get disconnected from Tor network */
Modified: vidalia/branches/auto-updates/src/vidalia/network/netviewer.ui
===================================================================
--- vidalia/branches/auto-updates/src/vidalia/network/netviewer.ui 2008-11-20 04:37:44 UTC (rev 3328)
+++ vidalia/branches/auto-updates/src/vidalia/network/netviewer.ui 2008-11-21 02:04:34 UTC (rev 3329)
@@ -64,7 +64,7 @@
</size>
</property>
<property name="contextMenuPolicy" >
- <enum>Qt::CustomContextMenu</enum>
+ <enum>Qt::DefaultContextMenu</enum>
</property>
<property name="statusTip" >
<string/>
@@ -75,6 +75,9 @@
<property name="sortingEnabled" >
<bool>true</bool>
</property>
+ <property name="selectionMode" >
+ <enum>QAbstractItemView::ExtendedSelection</enum>
+ </property>
</widget>
<widget class="QSplitter" name="splitter3" >
<property name="sizePolicy" >
Modified: vidalia/branches/auto-updates/src/vidalia/network/routerlistwidget.cpp
===================================================================
--- vidalia/branches/auto-updates/src/vidalia/network/routerlistwidget.cpp 2008-11-20 04:37:44 UTC (rev 3328)
+++ vidalia/branches/auto-updates/src/vidalia/network/routerlistwidget.cpp 2008-11-21 02:04:34 UTC (rev 3329)
@@ -15,11 +15,13 @@
*/
#include <QHeaderView>
+#include <QClipboard>
#include <vidalia.h>
#include "routerlistwidget.h"
#define IMG_ZOOM ":/images/22x22/page-zoom.png"
+#define IMG_COPY ":/images/22x22/edit-copy.png"
RouterListWidget::RouterListWidget(QWidget *parent)
@@ -53,26 +55,86 @@
* context menu will be displayed providing a list of actions, including
* zooming in on the server. */
void
-RouterListWidget::customContextMenuRequested(const QPoint &pos)
+RouterListWidget::contextMenuEvent(QContextMenuEvent *event)
{
- QMenu menu(this);
+ QAction *action;
+ QMenu *menu, *copyMenu;
+ QList<QTreeWidgetItem *> selected;
- /* Find out which (if any) router in the list is selected */
- RouterListItem *item = dynamic_cast<RouterListItem *>(itemAt(pos));
- if (!item)
+ selected = selectedItems();
+ if (! selected.size())
return;
-
- /* Set up the context menu */
- QAction *zoomAction =
- new QAction(QIcon(IMG_ZOOM), tr("Zoom to Relay"), &menu);
- menu.addAction(zoomAction);
-
- /* Display the menu and find out which (if any) action was selected */
- QAction *action = menu.exec(mapToGlobal(pos));
- if (action == zoomAction)
- emit zoomToRouter(item->id());
+
+ menu = new QMenu();
+ copyMenu = menu->addMenu(QIcon(IMG_COPY), tr("Copy"));
+ action = copyMenu->addAction(tr("Nickname"));
+ connect(action, SIGNAL(triggered()), this, SLOT(copySelectedNicknames()));
+
+ action = copyMenu->addAction(tr("Fingerprint"));
+ connect(action, SIGNAL(triggered()), this, SLOT(copySelectedFingerprints()));
+
+ action = menu->addAction(QIcon(IMG_ZOOM), tr("Zoom to Relay"));
+ if (selected.size() > 1)
+ action->setEnabled(false);
+ else
+ connect(action, SIGNAL(triggered()), this, SLOT(zoomToSelectedRelay()));
+
+ menu->exec(event->globalPos());
+ delete menu;
}
+/** Copies the nicknames for all currently selected relays to the clipboard.
+ * Nicknames are formatted as a comma-delimited list, suitable for doing
+ * dumb things with your torrc. */
+void
+RouterListWidget::copySelectedNicknames()
+{
+ QString text;
+
+ foreach (QTreeWidgetItem *item, selectedItems()) {
+ RouterListItem *relay = dynamic_cast<RouterListItem *>(item);
+ if (relay)
+ text.append(relay->name() + ",");
+ }
+ if (text.length()) {
+ text.remove(text.length()-1, 1);
+ vApp->clipboard()->setText(text);
+ }
+}
+
+/** Copies the fingerprints for all currently selected relays to the
+ * clipboard. Fingerprints are formatted as a comma-delimited list, suitable
+ * for doing dumb things with your torrc. */
+void
+RouterListWidget::copySelectedFingerprints()
+{
+ QString text;
+
+ foreach (QTreeWidgetItem *item, selectedItems()) {
+ RouterListItem *relay = dynamic_cast<RouterListItem *>(item);
+ if (relay)
+ text.append("$" + relay->id() + ",");
+ }
+ if (text.length()) {
+ text.remove(text.length()-1, 1);
+ vApp->clipboard()->setText(text);
+ }
+}
+
+/** Emits a zoomToRouter() signal containing the fingerprint of the
+ * currently selected relay. */
+void
+RouterListWidget::zoomToSelectedRelay()
+{
+ QList<QTreeWidgetItem *> selected = selectedItems();
+ if (selected.size() != 1)
+ return;
+
+ RouterListItem *relay = dynamic_cast<RouterListItem *>(selected[0]);
+ if (relay)
+ emit zoomToRouter(relay->id());
+}
+
/** Deselects all currently selected routers. */
void
RouterListWidget::deselectAll()
@@ -166,12 +228,14 @@
void
RouterListWidget::onSelectionChanged()
{
- RouterDescriptor rd;
- QList<QTreeWidgetItem *> items = selectedItems();
+ QList<RouterDescriptor> descriptors;
- if (items.count() > 0) {
- rd = ((RouterListItem *)items[0])->descriptor();
+ foreach (QTreeWidgetItem *item, selectedItems()) {
+ RouterListItem *relay = dynamic_cast<RouterListItem *>(item);
+ if (relay)
+ descriptors << relay->descriptor();
}
- emit routerSelected(rd);
+ if (descriptors.count() > 0)
+ emit routerSelected(descriptors);
}
Modified: vidalia/branches/auto-updates/src/vidalia/network/routerlistwidget.h
===================================================================
--- vidalia/branches/auto-updates/src/vidalia/network/routerlistwidget.h 2008-11-20 04:37:44 UTC (rev 3328)
+++ vidalia/branches/auto-updates/src/vidalia/network/routerlistwidget.h 2008-11-21 02:04:34 UTC (rev 3329)
@@ -18,6 +18,7 @@
#define _ROUTERLISTWIDGET_H
#include <QHash>
+#include <QList>
#include <QMenu>
#include <QObject>
#include <QAction>
@@ -32,7 +33,7 @@
class RouterListWidget : public QTreeWidget
{
Q_OBJECT
-
+
public:
/** Columns in the list. */
enum Columns {
@@ -44,7 +45,7 @@
/** Default constructor. */
RouterListWidget(QWidget *parent = 0);
-
+
/** Adds a new descriptor the list. */
void addRouter(RouterDescriptor rd);
/** Finds the list item whose key ID matches <b>id</b>. Returns 0 if not
@@ -57,24 +58,35 @@
signals:
/** Emitted when the user selects a router from the list. */
- void routerSelected(RouterDescriptor rd);
+ void routerSelected(QList<RouterDescriptor> rd);
/** Emitted when the user selects a router to zoom in on. */
void zoomToRouter(QString id);
-
+
public slots:
/** Clears the list of router items. */
void clearRouters();
-
+
private slots:
/** Called when the user clicks on an item in the list. */
void onSelectionChanged();
- /** Called when the user requests a context menu for some router in the
- * list. */
- void customContextMenuRequested(const QPoint &pos);
+ /** Copies the nicknames for all currently selected relays to the clipboard.
+ * Nicknames are formatted as a comma-delimited list, suitable for doing
+ * dumb things with your torrc. */
+ void copySelectedNicknames();
+ /** Copies the fingerprints for all currently selected relays to the
+ * clipboard. Fingerprints are formatted as a comma-delimited list, suitable
+ * for doing dumb things with your torrc. */
+ void copySelectedFingerprints();
+ /** Emits a zoomToRouter() signal containing the fingerprint of the
+ * currently selected relay. */
+ void zoomToSelectedRelay();
protected:
/** Called when the user presses a key while the list has focus. */
void keyPressEvent(QKeyEvent *event);
+ /** Displays a context menu for the user when they right-click on the
+ * widget. */
+ virtual void contextMenuEvent(QContextMenuEvent *event);
private:
/** Maps a server ID to that server's list item. */
Modified: vidalia/branches/auto-updates/src/vidalia/res/128x128/vidalia-logo.png
===================================================================
(Binary files differ)
Copied: vidalia/branches/auto-updates/src/vidalia/res/16x16/status-green.png (from rev 3328, vidalia/trunk/src/vidalia/res/16x16/status-green.png)
===================================================================
(Binary files differ)
Copied: vidalia/branches/auto-updates/src/vidalia/res/16x16/status-orange.png (from rev 3328, vidalia/trunk/src/vidalia/res/16x16/status-orange.png)
===================================================================
(Binary files differ)
Copied: vidalia/branches/auto-updates/src/vidalia/res/16x16/status-red.png (from rev 3328, vidalia/trunk/src/vidalia/res/16x16/status-red.png)
===================================================================
(Binary files differ)
Deleted: vidalia/branches/auto-updates/src/vidalia/res/16x16/tor-off.png
Deleted: vidalia/branches/auto-updates/src/vidalia/res/16x16/tor-on.png
Deleted: vidalia/branches/auto-updates/src/vidalia/res/16x16/tor-starting.png
Deleted: vidalia/branches/auto-updates/src/vidalia/res/16x16/tor-stopping.png
Copied: vidalia/branches/auto-updates/src/vidalia/res/22x22/status-green.png (from rev 3328, vidalia/trunk/src/vidalia/res/22x22/status-green.png)
===================================================================
(Binary files differ)
Copied: vidalia/branches/auto-updates/src/vidalia/res/22x22/status-orange.png (from rev 3328, vidalia/trunk/src/vidalia/res/22x22/status-orange.png)
===================================================================
(Binary files differ)
Copied: vidalia/branches/auto-updates/src/vidalia/res/22x22/status-red.png (from rev 3328, vidalia/trunk/src/vidalia/res/22x22/status-red.png)
===================================================================
(Binary files differ)
Deleted: vidalia/branches/auto-updates/src/vidalia/res/22x22/tor-off.png
Deleted: vidalia/branches/auto-updates/src/vidalia/res/22x22/tor-on.png
Deleted: vidalia/branches/auto-updates/src/vidalia/res/22x22/tor-starting.png
Deleted: vidalia/branches/auto-updates/src/vidalia/res/22x22/tor-stopping.png
Copied: vidalia/branches/auto-updates/src/vidalia/res/22x22/vidalia.png (from rev 3328, vidalia/trunk/src/vidalia/res/22x22/vidalia.png)
===================================================================
(Binary files differ)
Copied: vidalia/branches/auto-updates/src/vidalia/res/32x32/status-green.png (from rev 3328, vidalia/trunk/src/vidalia/res/32x32/status-green.png)
===================================================================
(Binary files differ)
Copied: vidalia/branches/auto-updates/src/vidalia/res/32x32/status-orange.png (from rev 3328, vidalia/trunk/src/vidalia/res/32x32/status-orange.png)
===================================================================
(Binary files differ)
Copied: vidalia/branches/auto-updates/src/vidalia/res/32x32/status-red.png (from rev 3328, vidalia/trunk/src/vidalia/res/32x32/status-red.png)
===================================================================
(Binary files differ)
Deleted: vidalia/branches/auto-updates/src/vidalia/res/32x32/tor-off.png
Deleted: vidalia/branches/auto-updates/src/vidalia/res/32x32/tor-on.png
Deleted: vidalia/branches/auto-updates/src/vidalia/res/32x32/tor-starting.png
Deleted: vidalia/branches/auto-updates/src/vidalia/res/32x32/tor-stopping.png
Copied: vidalia/branches/auto-updates/src/vidalia/res/48x48/status-green.png (from rev 3328, vidalia/trunk/src/vidalia/res/48x48/status-green.png)
===================================================================
(Binary files differ)
Copied: vidalia/branches/auto-updates/src/vidalia/res/48x48/status-orange.png (from rev 3328, vidalia/trunk/src/vidalia/res/48x48/status-orange.png)
===================================================================
(Binary files differ)
Copied: vidalia/branches/auto-updates/src/vidalia/res/48x48/status-red.png (from rev 3328, vidalia/trunk/src/vidalia/res/48x48/status-red.png)
===================================================================
(Binary files differ)
Deleted: vidalia/branches/auto-updates/src/vidalia/res/48x48/tor-off.png
Deleted: vidalia/branches/auto-updates/src/vidalia/res/48x48/tor-on.png
Deleted: vidalia/branches/auto-updates/src/vidalia/res/48x48/tor-starting.png
Deleted: vidalia/branches/auto-updates/src/vidalia/res/48x48/tor-stopping.png
Copied: vidalia/branches/auto-updates/src/vidalia/res/48x48/vidalia.png (from rev 3328, vidalia/trunk/src/vidalia/res/48x48/vidalia.png)
===================================================================
(Binary files differ)
Copied: vidalia/branches/auto-updates/src/vidalia/res/icons/status-green.icns (from rev 3328, vidalia/trunk/src/vidalia/res/icons/status-green.icns)
===================================================================
(Binary files differ)
Copied: vidalia/branches/auto-updates/src/vidalia/res/icons/status-orange.icns (from rev 3328, vidalia/trunk/src/vidalia/res/icons/status-orange.icns)
===================================================================
(Binary files differ)
Copied: vidalia/branches/auto-updates/src/vidalia/res/icons/status-red.icns (from rev 3328, vidalia/trunk/src/vidalia/res/icons/status-red.icns)
===================================================================
(Binary files differ)
Deleted: vidalia/branches/auto-updates/src/vidalia/res/icons/tor-off.icns
Deleted: vidalia/branches/auto-updates/src/vidalia/res/icons/tor-on.icns
Deleted: vidalia/branches/auto-updates/src/vidalia/res/icons/tor-starting.icns
Deleted: vidalia/branches/auto-updates/src/vidalia/res/icons/tor-stopping.icns
Modified: vidalia/branches/auto-updates/src/vidalia/res/icons/vidalia.icns
===================================================================
(Binary files differ)
Modified: vidalia/branches/auto-updates/src/vidalia/res/icons/vidalia.ico
===================================================================
(Binary files differ)
Modified: vidalia/branches/auto-updates/src/vidalia/res/vidalia.qrc
===================================================================
--- vidalia/branches/auto-updates/src/vidalia/res/vidalia.qrc 2008-11-20 04:37:44 UTC (rev 3328)
+++ vidalia/branches/auto-updates/src/vidalia/res/vidalia.qrc 2008-11-21 02:04:34 UTC (rev 3329)
@@ -18,13 +18,12 @@
<file>16x16/media-playback-stop.png</file>
<file>16x16/preferences-desktop-notification.png</file>
<file>16x16/preferences-system.png</file>
+ <file>16x16/status-green.png</file>
+ <file>16x16/status-orange.png</file>
+ <file>16x16/status-red.png</file>
<file>16x16/system-help.png</file>
<file>16x16/system-run.png</file>
<file>16x16/tor-logo.png</file>
- <file>16x16/tor-off.png</file>
- <file>16x16/tor-on.png</file>
- <file>16x16/tor-starting.png</file>
- <file>16x16/tor-stopping.png</file>
<file>16x16/utilities-log-viewer.png</file>
<file>16x16/utilities-system-monitor.png</file>
<file>16x16/view-media-artist.png</file>
@@ -43,11 +42,10 @@
<file>22x22/list-remove.png</file>
<file>22x22/page-zoom.png</file>
<file>22x22/preferences-system.png</file>
+ <file>22x22/status-green.png</file>
+ <file>22x22/status-orange.png</file>
+ <file>22x22/status-red.png</file>
<file>22x22/system-help.png</file>
- <file>22x22/tor-off.png</file>
- <file>22x22/tor-on.png</file>
- <file>22x22/tor-starting.png</file>
- <file>22x22/tor-stopping.png</file>
<file>22x22/utilities-system-monitor.png</file>
</qresource>
<qresource prefix="/images">
@@ -71,13 +69,12 @@
<file>32x32/preferences-system-network.png</file>
<file>32x32/preferences-system-network-sharing.png</file>
<file>32x32/services.png</file>
+ <file>32x32/status-green.png</file>
+ <file>32x32/status-orange.png</file>
+ <file>32x32/status-red.png</file>
<file>32x32/system-help.png</file>
<file>32x32/system-software-update.png</file>
<file>32x32/tor-logo.png</file>
- <file>32x32/tor-off.png</file>
- <file>32x32/tor-on.png</file>
- <file>32x32/tor-starting.png</file>
- <file>32x32/tor-stopping.png</file>
<file>32x32/utilities-log-viewer.png</file>
<file>32x32/utilities-system-monitor.png</file>
<file>32x32/view-refresh.png</file>
@@ -94,10 +91,9 @@
<file>48x48/modem.png</file>
<file>48x48/network-workgroup.png</file>
<file>48x48/preferences-system-network-sharing.png</file>
- <file>48x48/tor-off.png</file>
- <file>48x48/tor-on.png</file>
- <file>48x48/tor-starting.png</file>
- <file>48x48/tor-stopping.png</file>
+ <file>48x48/status-green.png</file>
+ <file>48x48/status-orange.png</file>
+ <file>48x48/status-red.png</file>
<file>48x48/view-media-artist.png</file>
</qresource>
<qresource prefix="/images">
Modified: vidalia/branches/auto-updates/src/vidalia/vidalia.desktop
===================================================================
--- vidalia/branches/auto-updates/src/vidalia/vidalia.desktop 2008-11-20 04:37:44 UTC (rev 3328)
+++ vidalia/branches/auto-updates/src/vidalia/vidalia.desktop 2008-11-21 02:04:34 UTC (rev 3329)
@@ -2,6 +2,7 @@
Type=Application
Exec=vidalia
Name=Vidalia
+Icon=vidalia.png
GenericName=Tor GUI
Terminal=false
Categories=Network;Qt