- tor-commits - lists.torproject.org

[torbrowser/master] Rebase to Firefox 10.
by erinn＠torproject.org 02 Feb '12

02 Feb '12

commit b4780f07d6af74ee72d2e63aa032cf614b71c310 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Feb 1 16:54:29 2012 -0800 Rebase to Firefox 10. --- ...nents.interfaces-lookupMethod-from-conten.patch | 24 ++++++------ ...0002-Make-Permissions-Manager-memory-only.patch | 24 ++++++------ ...-Make-Intermediate-Cert-Store-memory-only.patch | 12 +++--- ...th-headers-before-the-modify-request-obse.patch | 15 ++++---- .../firefox/0005-Add-a-string-based-cacheKey.patch | 14 ++++---- ...6-Randomize-HTTP-pipeline-order-and-depth.patch | 30 ++++++++-------- .../0007-Block-all-plugins-except-flash.patch | 20 +++++----- ...ontent-pref-service-memory-only-clearable.patch | 12 +++--- ...owser-exit-when-not-launched-from-Vidalia.patch | 8 ++-- .../0010-Disable-SSL-Session-ID-tracking.patch | 6 ++-- ...observer-event-to-close-persistent-connec.patch | 21 ++++++----- ...e-client-values-only-to-CSS-Media-Queries.patch | 18 +++++----- ...13-Limit-the-number-of-fonts-per-document.patch | 36 ++++++++++---------- 13 files changed, 121 insertions(+), 119 deletions(-) diff --git a/src/current-patches/firefox/0001-Block-Components.interfaces-lookupMethod-from-conten.patch b/src/current-patches/firefox/0001-Block-Components.interfaces-lookupMethod-from-conten.patch index de0903c..ba0da28 100644 --- a/src/current-patches/firefox/0001-Block-Components.interfaces-lookupMethod-from-conten.patch +++ b/src/current-patches/firefox/0001-Block-Components.interfaces-lookupMethod-from-conten.patch @@ -1,7 +1,7 @@ -From 658f53653a37767802d9cd992b8dd58d7503ea1b Mon Sep 17 00:00:00 2001 -From: Mike Perry <mikeperry-git(a)fscked.org> -Date: Mon, 20 Jun 2011 17:07:41 -0700 -Subject: [PATCH 01/12] Block Components.interfaces,lookupMethod from content +From 67b86f0c22070cbf86112174ae1e2ce6d6a36dee Mon Sep 17 00:00:00 2001 +From: Mike Perry <mikeperry-git(a)torproject.org> +Date: Wed, 1 Feb 2012 15:40:40 -0800 +Subject: [PATCH 01/13] Block Components.interfaces,lookupMethod from content This patch removes the ability of content script to access Components.interfaces.* as well as call or access Components.lookupMethod. @@ -16,14 +16,14 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=429070 https://trac.torproject.org/projects/tor/ticket/2873 https://trac.torproject.org/projects/tor/ticket/2874 --- - js/src/xpconnect/src/xpccomponents.cpp | 8 ++++++-- + js/xpconnect/src/XPCComponents.cpp | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) -diff --git a/js/src/xpconnect/src/xpccomponents.cpp b/js/src/xpconnect/src/xpccomponents.cpp -index ca38e47..34175a5 100644 ---- a/js/src/xpconnect/src/xpccomponents.cpp -+++ b/js/src/xpconnect/src/xpccomponents.cpp -@@ -4431,7 +4431,9 @@ nsXPCComponents::CanCreateWrapper(const nsIID * iid, char **_retval) +diff --git a/js/xpconnect/src/XPCComponents.cpp b/js/xpconnect/src/XPCComponents.cpp +index 3bcbf91..d5c020a 100644 +--- a/js/xpconnect/src/XPCComponents.cpp ++++ b/js/xpconnect/src/XPCComponents.cpp +@@ -4456,7 +4456,9 @@ nsXPCComponents::CanCreateWrapper(const nsIID * iid, char **_retval) NS_IMETHODIMP nsXPCComponents::CanCallMethod(const nsIID * iid, const PRUnichar *methodName, char **_retval) { @@ -34,7 +34,7 @@ index ca38e47..34175a5 100644 *_retval = xpc_CheckAccessList(methodName, allowed); return NS_OK; } -@@ -4440,7 +4442,9 @@ nsXPCComponents::CanCallMethod(const nsIID * iid, const PRUnichar *methodName, c +@@ -4465,7 +4467,9 @@ nsXPCComponents::CanCallMethod(const nsIID * iid, const PRUnichar *methodName, c NS_IMETHODIMP nsXPCComponents::CanGetProperty(const nsIID * iid, const PRUnichar *propertyName, char **_retval) { @@ -46,5 +46,5 @@ index ca38e47..34175a5 100644 return NS_OK; } -- -1.7.3.4 +1.7.5.4 diff --git a/src/current-patches/firefox/0002-Make-Permissions-Manager-memory-only.patch b/src/current-patches/firefox/0002-Make-Permissions-Manager-memory-only.patch index fcc3802..ecd1e32 100644 --- a/src/current-patches/firefox/0002-Make-Permissions-Manager-memory-only.patch +++ b/src/current-patches/firefox/0002-Make-Permissions-Manager-memory-only.patch @@ -1,7 +1,7 @@ -From b390a17593f20c837facf0b9da1ee4696697f1b6 Mon Sep 17 00:00:00 2001 -From: Mike Perry <mikeperry-git(a)fscked.org> -Date: Mon, 20 Jun 2011 17:07:56 -0700 -Subject: [PATCH 02/12] Make Permissions Manager memory-only +From 193c50c03aa61eef5415d0476467c22941022a11 Mon Sep 17 00:00:00 2001 +From: Mike Perry <mikeperry-git(a)torproject.org> +Date: Wed, 1 Feb 2012 15:45:16 -0800 +Subject: [PATCH 02/13] Make Permissions Manager memory-only This patch exposes a pref 'permissions.memory_only' that properly isolates the permissions manager to memory, which is responsible for all user specified @@ -16,7 +16,7 @@ https://trac.torproject.org/projects/tor/ticket/2950 1 files changed, 31 insertions(+), 3 deletions(-) diff --git a/extensions/cookie/nsPermissionManager.cpp b/extensions/cookie/nsPermissionManager.cpp -index d72b794..b89887e 100644 +index 67eb216..12cc7cf 100644 --- a/extensions/cookie/nsPermissionManager.cpp +++ b/extensions/cookie/nsPermissionManager.cpp @@ -58,6 +58,10 @@ @@ -31,7 +31,7 @@ index d72b794..b89887e 100644 static nsPermissionManager *gPermissionManager = nsnull; @@ -203,6 +207,11 @@ nsPermissionManager::Init() - mObserverService->AddObserver(this, "profile-do-change", PR_TRUE); + mObserverService->AddObserver(this, "profile-do-change", true); } + nsCOMPtr<nsIPrefBranch2> pbi = do_GetService(NS_PREFSERVICE_CONTRACTID); @@ -42,11 +42,11 @@ index d72b794..b89887e 100644 if (IsChildProcess()) { // Get the permissions from the parent process InfallibleTArray<IPC::Permission> perms; -@@ -251,8 +260,18 @@ nsPermissionManager::InitDB(PRBool aRemoveFile) +@@ -251,8 +260,18 @@ nsPermissionManager::InitDB(bool aRemoveFile) if (!storage) return NS_ERROR_UNEXPECTED; -+ PRBool memory_db = false; ++ bool memory_db = false; + nsCOMPtr<nsIPrefBranch> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID); + if (prefs) { + prefs->GetBoolPref("permissions.memory_only", &memory_db); @@ -61,9 +61,9 @@ index d72b794..b89887e 100644 + } NS_ENSURE_SUCCESS(rv, rv); - PRBool ready; -@@ -262,7 +281,11 @@ nsPermissionManager::InitDB(PRBool aRemoveFile) - rv = permissionsFile->Remove(PR_FALSE); + bool ready; +@@ -262,7 +281,11 @@ nsPermissionManager::InitDB(bool aRemoveFile) + rv = permissionsFile->Remove(false); NS_ENSURE_SUCCESS(rv, rv); - rv = storage->OpenDatabase(permissionsFile, getter_AddRefs(mDBConn)); @@ -90,5 +90,5 @@ index d72b794..b89887e 100644 // or is going away because the application is shutting down. if (!nsCRT::strcmp(someData, NS_LITERAL_STRING("shutdown-cleanse").get())) { -- -1.7.3.4 +1.7.5.4 diff --git a/src/current-patches/firefox/0003-Make-Intermediate-Cert-Store-memory-only.patch b/src/current-patches/firefox/0003-Make-Intermediate-Cert-Store-memory-only.patch index e921f7d..ec575bc 100644 --- a/src/current-patches/firefox/0003-Make-Intermediate-Cert-Store-memory-only.patch +++ b/src/current-patches/firefox/0003-Make-Intermediate-Cert-Store-memory-only.patch @@ -1,7 +1,7 @@ -From 93a3a1886d34e5f73a385726c22ecfc4e72598a3 Mon Sep 17 00:00:00 2001 +From 5d72233faeba1745962f55fa09fe2f537eda93ec Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri, 19 Aug 2011 17:58:23 -0700 -Subject: [PATCH 03/12] Make Intermediate Cert Store memory-only. +Subject: [PATCH 03/13] Make Intermediate Cert Store memory-only. This patch makes the intermediate SSL cert store exist in memory only. @@ -12,15 +12,15 @@ https://trac.torproject.org/projects/tor/ticket/2949 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp -index 5bb09ae..737715d 100644 +index a08c4ef..0ec3713 100644 --- a/security/manager/ssl/src/nsNSSComponent.cpp +++ b/security/manager/ssl/src/nsNSSComponent.cpp -@@ -1732,8 +1732,21 @@ nsNSSComponent::InitializeNSS(PRBool showWarningBox) +@@ -1730,8 +1730,21 @@ nsNSSComponent::InitializeNSS(bool showWarningBox) // Ubuntu 8.04, which loads any nonexistent "<configdir>/libnssckbi.so" as // "/usr/lib/nss/libnssckbi.so". PRUint32 init_flags = NSS_INIT_NOROOTINIT | NSS_INIT_OPTIMIZESPACE; - SECStatus init_rv = ::NSS_Initialize(profileStr.get(), "", "", -+ PRBool nocertdb = false; ++ bool nocertdb = false; + mPrefBranch->GetBoolPref("security.nocertdb", &nocertdb); + + // XXX: We can also do the the following to only disable the certdb. @@ -39,5 +39,5 @@ index 5bb09ae..737715d 100644 if (init_rv != SECSuccess) { PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS r/w in %s\n", profileStr.get())); -- -1.7.3.4 +1.7.5.4 diff --git a/src/current-patches/firefox/0004-Add-HTTP-auth-headers-before-the-modify-request-obse.patch b/src/current-patches/firefox/0004-Add-HTTP-auth-headers-before-the-modify-request-obse.patch index c0b2070..44dfccc 100644 --- a/src/current-patches/firefox/0004-Add-HTTP-auth-headers-before-the-modify-request-obse.patch +++ b/src/current-patches/firefox/0004-Add-HTTP-auth-headers-before-the-modify-request-obse.patch @@ -1,7 +1,8 @@ -From f30579c50a6915314a470579da533f53200e61d8 Mon Sep 17 00:00:00 2001 +From 6dc27a50e06bca139a07546f94a827f1fdb762b7 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri, 2 Sep 2011 15:33:20 -0700 -Subject: [PATCH 04/12] Add HTTP auth headers before the modify-request observer. +Subject: [PATCH 04/13] Add HTTP auth headers before the modify-request + observer. Otherwise, how are we supposed to modify them? @@ -11,10 +12,10 @@ Thanks to Georg Koppen for spotting both the problem and this fix. 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp -index 3f9d049..945bc0d 100644 +index dec2a83..4c5e759 100644 --- a/netwerk/protocol/http/nsHttpChannel.cpp +++ b/netwerk/protocol/http/nsHttpChannel.cpp -@@ -291,9 +291,6 @@ nsHttpChannel::Connect(PRBool firstTime) +@@ -316,9 +316,6 @@ nsHttpChannel::Connect(bool firstTime) return NS_ERROR_DOCUMENT_NOT_CACHED; } @@ -24,7 +25,7 @@ index 3f9d049..945bc0d 100644 if (mLoadFlags & LOAD_NO_NETWORK_IO) { return NS_ERROR_DOCUMENT_NOT_CACHED; } -@@ -3665,6 +3662,9 @@ nsHttpChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *context) +@@ -3701,6 +3698,9 @@ nsHttpChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *context) AddCookiesToRequest(); @@ -34,7 +35,7 @@ index 3f9d049..945bc0d 100644 // notify "http-on-modify-request" observers gHttpHandler->OnModifyRequest(this); -@@ -4741,7 +4741,10 @@ nsHttpChannel::DoAuthRetry(nsAHttpConnection *conn) +@@ -4795,7 +4795,10 @@ nsHttpChannel::DoAuthRetry(nsAHttpConnection *conn) // this authentication attempt (bug 84794). // TODO: save cookies from auth response and send them here (bug 572151). AddCookiesToRequest(); @@ -47,5 +48,5 @@ index 3f9d049..945bc0d 100644 gHttpHandler->OnModifyRequest(this); -- -1.7.3.4 +1.7.5.4 diff --git a/src/current-patches/firefox/0005-Add-a-string-based-cacheKey.patch b/src/current-patches/firefox/0005-Add-a-string-based-cacheKey.patch index 87941e2..822033a 100644 --- a/src/current-patches/firefox/0005-Add-a-string-based-cacheKey.patch +++ b/src/current-patches/firefox/0005-Add-a-string-based-cacheKey.patch @@ -1,7 +1,7 @@ -From 65410adb53fafe4ec717ab464cdefee3cdd35708 Mon Sep 17 00:00:00 2001 +From a06818f3a358e6c4502b944ecd264fd2ccaff5bf Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri, 2 Sep 2011 20:47:02 -0700 -Subject: [PATCH 05/12] Add a string-based cacheKey. +Subject: [PATCH 05/13] Add a string-based cacheKey. Used for isolating cache according to same-origin policy. --- @@ -29,10 +29,10 @@ index 2da46d6..4ee5774 100644 * may fail if the disk cache is not present. The value of this attribute * is usually only settable during the processing of a channel's diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp -index 945bc0d..9e838d8 100644 +index 4c5e759..6205d62 100644 --- a/netwerk/protocol/http/nsHttpChannel.cpp +++ b/netwerk/protocol/http/nsHttpChannel.cpp -@@ -2356,6 +2356,12 @@ nsHttpChannel::AssembleCacheKey(const char *spec, PRUint32 postID, +@@ -2389,6 +2389,12 @@ nsHttpChannel::AssembleCacheKey(const char *spec, PRUint32 postID, cacheKey.Append(buf); } @@ -45,7 +45,7 @@ index 945bc0d..9e838d8 100644 if (!cacheKey.IsEmpty()) { cacheKey.AppendLiteral("uri="); } -@@ -4641,6 +4647,22 @@ nsHttpChannel::SetCacheForOfflineUse(PRBool value) +@@ -4695,6 +4701,22 @@ nsHttpChannel::SetCacheForOfflineUse(bool value) } NS_IMETHODIMP @@ -69,7 +69,7 @@ index 945bc0d..9e838d8 100644 { value = mOfflineCacheClientID; diff --git a/netwerk/protocol/http/nsHttpChannel.h b/netwerk/protocol/http/nsHttpChannel.h -index 6e0f360..9df9e38 100644 +index 88ce469..53538cf 100644 --- a/netwerk/protocol/http/nsHttpChannel.h +++ b/netwerk/protocol/http/nsHttpChannel.h @@ -303,6 +303,7 @@ private: @@ -81,5 +81,5 @@ index 6e0f360..9df9e38 100644 // auth specific data nsCOMPtr<nsIHttpChannelAuthProvider> mAuthProvider; -- -1.7.3.4 +1.7.5.4 diff --git a/src/current-patches/firefox/0006-Randomize-HTTP-pipeline-order-and-depth.patch b/src/current-patches/firefox/0006-Randomize-HTTP-pipeline-order-and-depth.patch index 2935289..de40bfe 100644 --- a/src/current-patches/firefox/0006-Randomize-HTTP-pipeline-order-and-depth.patch +++ b/src/current-patches/firefox/0006-Randomize-HTTP-pipeline-order-and-depth.patch @@ -1,7 +1,7 @@ -From 797fecf94e73e4f65fa8fdd58e0980e0d79ec092 Mon Sep 17 00:00:00 2001 -From: Mike Perry <mikeperry-git(a)fscked.org> -Date: Tue, 8 Nov 2011 17:34:54 -0800 -Subject: [PATCH 06/12] Randomize HTTP pipeline order and depth. +From 755f71320538b0a813807cc3f4076dd20cbe9849 Mon Sep 17 00:00:00 2001 +From: Mike Perry <mikeperry-git(a)torproject.org> +Date: Wed, 1 Feb 2012 16:05:22 -0800 +Subject: [PATCH 06/13] Randomize HTTP pipeline order and depth. This is an experimental defense against http://lorre.uni.lu/~andriy/papers/acmccs-wpes11-fingerprinting.pdf @@ -14,7 +14,7 @@ https://blog.torproject.org/blog/experimental-defense-website-traffic-finge… 2 files changed, 81 insertions(+), 1 deletions(-) diff --git a/netwerk/protocol/http/nsHttpConnectionMgr.cpp b/netwerk/protocol/http/nsHttpConnectionMgr.cpp -index 3bb2b55..89ec350 100644 +index 23ef893..bba456d 100644 --- a/netwerk/protocol/http/nsHttpConnectionMgr.cpp +++ b/netwerk/protocol/http/nsHttpConnectionMgr.cpp @@ -94,6 +94,11 @@ nsHttpConnectionMgr::nsHttpConnectionMgr() @@ -29,7 +29,7 @@ index 3bb2b55..89ec350 100644 } nsHttpConnectionMgr::~nsHttpConnectionMgr() -@@ -856,7 +861,7 @@ nsHttpConnectionMgr::DispatchTransaction(nsConnectionEntry *ent, +@@ -865,7 +870,7 @@ nsHttpConnectionMgr::DispatchTransaction(nsConnectionEntry *ent, nsHttpPipeline *pipeline = nsnull; if (conn->SupportsPipelining() && (caps & NS_HTTP_ALLOW_PIPELINING)) { LOG((" looking to build pipeline...\n")); @@ -38,11 +38,11 @@ index 3bb2b55..89ec350 100644 trans = pipeline; } -@@ -929,6 +934,77 @@ nsHttpConnectionMgr::BuildPipeline(nsConnectionEntry *ent, - return PR_TRUE; +@@ -938,6 +943,77 @@ nsHttpConnectionMgr::BuildPipeline(nsConnectionEntry *ent, + return true; } -+PRBool ++bool +nsHttpConnectionMgr::BuildRandomizedPipeline(nsConnectionEntry *ent, + nsAHttpTransaction *firstTrans, + nsHttpPipeline **result) @@ -117,7 +117,7 @@ index 3bb2b55..89ec350 100644 nsHttpConnectionMgr::ProcessNewTransaction(nsHttpTransaction *trans) { diff --git a/netwerk/protocol/http/nsHttpConnectionMgr.h b/netwerk/protocol/http/nsHttpConnectionMgr.h -index d6dba79..c6e295f 100644 +index cdf21a9..9647225 100644 --- a/netwerk/protocol/http/nsHttpConnectionMgr.h +++ b/netwerk/protocol/http/nsHttpConnectionMgr.h @@ -48,6 +48,7 @@ @@ -128,15 +128,15 @@ index d6dba79..c6e295f 100644 #include "nsIObserver.h" #include "nsITimer.h" -@@ -275,6 +276,7 @@ private: +@@ -276,6 +277,7 @@ private: nsresult DispatchTransaction(nsConnectionEntry *, nsAHttpTransaction *, PRUint8 caps, nsHttpConnection *); - PRBool BuildPipeline(nsConnectionEntry *, nsAHttpTransaction *, nsHttpPipeline **); -+ PRBool BuildRandomizedPipeline(nsConnectionEntry *, nsAHttpTransaction *, nsHttpPipeline **); + bool BuildPipeline(nsConnectionEntry *, nsAHttpTransaction *, nsHttpPipeline **); ++ bool BuildRandomizedPipeline(nsConnectionEntry *, nsAHttpTransaction *, nsHttpPipeline **); nsresult ProcessNewTransaction(nsHttpTransaction *); nsresult EnsureSocketThreadTargetIfOnline(); void ClosePersistentConnections(nsConnectionEntry *ent); -@@ -352,6 +354,8 @@ private: +@@ -353,6 +355,8 @@ private: PRUint64 mTimeOfNextWakeUp; // Timer for next pruning of dead connections. nsCOMPtr<nsITimer> mTimer; @@ -146,5 +146,5 @@ index d6dba79..c6e295f 100644 // // the connection table -- -1.7.3.4 +1.7.5.4 diff --git a/src/current-patches/firefox/0007-Block-all-plugins-except-flash.patch b/src/current-patches/firefox/0007-Block-all-plugins-except-flash.patch index c8d55f8..ef83185 100644 --- a/src/current-patches/firefox/0007-Block-all-plugins-except-flash.patch +++ b/src/current-patches/firefox/0007-Block-all-plugins-except-flash.patch @@ -1,7 +1,7 @@ -From 2954118c9ab70d2e1c4d983a8f101b3a237461bb Mon Sep 17 00:00:00 2001 -From: Mike Perry <mikeperry-git(a)fscked.org> -Date: Wed, 28 Sep 2011 13:24:20 -0700 -Subject: [PATCH 07/12] Block all plugins except flash. +From 7d6e270e1a05e1fe57d069b9859c9b51904db33e Mon Sep 17 00:00:00 2001 +From: Mike Perry <mikeperry-git(a)torproject.org> +Date: Wed, 1 Feb 2012 15:50:15 -0800 +Subject: [PATCH 07/13] Block all plugins except flash. We cannot use the @mozilla.org/extensions/blocklist;1 service, because we actually want to stop plugins from ever entering the browser's process space @@ -17,11 +17,11 @@ on a better way. Until then, it is delta-darwinism for us. 2 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp -index 8578d56..3fbae53 100644 +index 729c9ef..1f4652d 100644 --- a/dom/plugins/base/nsPluginHost.cpp +++ b/dom/plugins/base/nsPluginHost.cpp -@@ -1964,6 +1964,35 @@ PRBool nsPluginHost::IsDuplicatePlugin(nsPluginTag * aPluginTag) - return PR_FALSE; +@@ -1965,6 +1965,35 @@ bool nsPluginHost::IsDuplicatePlugin(nsPluginTag * aPluginTag) + return false; } +PRBool nsPluginHost::GhettoBlacklist(nsIFile *pluginFile) @@ -56,7 +56,7 @@ index 8578d56..3fbae53 100644 typedef NS_NPAPIPLUGIN_CALLBACK(char *, NP_GETMIMEDESCRIPTION)(void); nsresult nsPluginHost::ScanPluginsDirectory(nsIFile *pluginsDir, -@@ -2085,6 +2114,10 @@ nsresult nsPluginHost::ScanPluginsDirectory(nsIFile *pluginsDir, +@@ -2086,6 +2115,10 @@ nsresult nsPluginHost::ScanPluginsDirectory(nsIFile *pluginsDir, continue; } @@ -68,7 +68,7 @@ index 8578d56..3fbae53 100644 if (!pluginTag) { nsPluginFile pluginFile(localfile); diff --git a/dom/plugins/base/nsPluginHost.h b/dom/plugins/base/nsPluginHost.h -index 1cfd59b..7d83c20 100644 +index 39a8891..c262abf 100644 --- a/dom/plugins/base/nsPluginHost.h +++ b/dom/plugins/base/nsPluginHost.h @@ -278,6 +278,8 @@ private: @@ -81,5 +81,5 @@ index 1cfd59b..7d83c20 100644 // and removes it from the cache. void RemoveCachedPluginsInfo(const char *filePath, -- -1.7.3.4 +1.7.5.4 diff --git a/src/current-patches/firefox/0008-Make-content-pref-service-memory-only-clearable.patch b/src/current-patches/firefox/0008-Make-content-pref-service-memory-only-clearable.patch index 6473b13..ac91170 100644 --- a/src/current-patches/firefox/0008-Make-content-pref-service-memory-only-clearable.patch +++ b/src/current-patches/firefox/0008-Make-content-pref-service-memory-only-clearable.patch @@ -1,7 +1,7 @@ -From e14ab520ed4e012dbeb051eb9320e59f06873674 Mon Sep 17 00:00:00 2001 +From 23a09d0a6def1e2f7190177a875ab5a85c5da7b7 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu, 8 Sep 2011 08:40:17 -0700 -Subject: [PATCH 08/12] Make content pref service memory-only + clearable +Subject: [PATCH 08/13] Make content pref service memory-only + clearable This prevents random urls from being inserted into content-prefs.sqllite in the profile directory as content prefs change (includes site-zoom and perhaps @@ -11,10 +11,10 @@ other site prefs?). 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/toolkit/components/contentprefs/nsContentPrefService.js b/toolkit/components/contentprefs/nsContentPrefService.js -index 0d12b36..494515b 100644 +index adfb650..1619d5f 100644 --- a/toolkit/components/contentprefs/nsContentPrefService.js +++ b/toolkit/components/contentprefs/nsContentPrefService.js -@@ -1183,7 +1183,7 @@ ContentPrefService.prototype = { +@@ -1240,7 +1240,7 @@ ContentPrefService.prototype = { var dbConnection; @@ -23,7 +23,7 @@ index 0d12b36..494515b 100644 dbConnection = this._dbCreate(dbService, dbFile); else { try { -@@ -1231,7 +1231,7 @@ ContentPrefService.prototype = { +@@ -1288,7 +1288,7 @@ ContentPrefService.prototype = { }, _dbCreate: function ContentPrefService__dbCreate(aDBService, aDBFile) { @@ -33,5 +33,5 @@ index 0d12b36..494515b 100644 try { this._dbCreateSchema(dbConnection); -- -1.7.3.4 +1.7.5.4 diff --git a/src/current-patches/firefox/0009-Make-Tor-Browser-exit-when-not-launched-from-Vidalia.patch b/src/current-patches/firefox/0009-Make-Tor-Browser-exit-when-not-launched-from-Vidalia.patch index 11d3cdf..3dc98ed 100644 --- a/src/current-patches/firefox/0009-Make-Tor-Browser-exit-when-not-launched-from-Vidalia.patch +++ b/src/current-patches/firefox/0009-Make-Tor-Browser-exit-when-not-launched-from-Vidalia.patch @@ -1,7 +1,7 @@ -From 84286ac84d1973747f9ff541df90ed79c34ed443 Mon Sep 17 00:00:00 2001 +From b9c2e8d93cf62ea8f8fec63f0db955d8d0c4bc24 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)fscked.org> Date: Sun, 9 Oct 2011 22:50:07 -0700 -Subject: [PATCH 09/12] Make Tor Browser exit when not launched from Vidalia +Subject: [PATCH 09/13] Make Tor Browser exit when not launched from Vidalia Turns out the Windows 7 UI encourages users to "dock" their Tor Browser app for easy relaunch. If they manage to do this, we should fail closed rather @@ -16,7 +16,7 @@ actually be common. 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js -index e78919d..c1e90f3 100644 +index a463fac..4480050 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -1217,6 +1217,21 @@ function BrowserStartup() { @@ -42,5 +42,5 @@ index e78919d..c1e90f3 100644 if (uriToLoad instanceof Ci.nsISupportsArray) { let count = uriToLoad.Count(); -- -1.7.3.4 +1.7.5.4 diff --git a/src/current-patches/firefox/0010-Disable-SSL-Session-ID-tracking.patch b/src/current-patches/firefox/0010-Disable-SSL-Session-ID-tracking.patch index 53553f1..8722540 100644 --- a/src/current-patches/firefox/0010-Disable-SSL-Session-ID-tracking.patch +++ b/src/current-patches/firefox/0010-Disable-SSL-Session-ID-tracking.patch @@ -1,7 +1,7 @@ -From 5e8424690ef1d9f5c38dbf87811f82fa92e29eb5 Mon Sep 17 00:00:00 2001 +From 8bfcf12fe59b7b9940830446bf331729f5c86b3d Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed, 7 Dec 2011 19:36:38 -0800 -Subject: [PATCH 10/12] Disable SSL Session ID tracking. +Subject: [PATCH 10/13] Disable SSL Session ID tracking. We can't easily bind SSL Session ID tracking to url bar domain, so we have to disable them to satisfy @@ -24,5 +24,5 @@ index 2e6f9ed..c8a993b 100644 PR_FALSE, /* v2CompatibleHello */ /* now defaults to off in NSS 3.13 */ PR_TRUE, /* detectRollBack */ -- -1.7.3.4 +1.7.5.4 diff --git a/src/current-patches/firefox/0011-Provide-an-observer-event-to-close-persistent-connec.patch b/src/current-patches/firefox/0011-Provide-an-observer-event-to-close-persistent-connec.patch index 0b67cd6..7d91c66 100644 --- a/src/current-patches/firefox/0011-Provide-an-observer-event-to-close-persistent-connec.patch +++ b/src/current-patches/firefox/0011-Provide-an-observer-event-to-close-persistent-connec.patch @@ -1,7 +1,8 @@ -From f29be5f0e41e9915bcd15b692685bebce9d33f91 Mon Sep 17 00:00:00 2001 -From: Mike Perry <mikeperry-git(a)fscked.org> -Date: Wed, 7 Dec 2011 20:05:19 -0800 -Subject: [PATCH 11/12] Provide an observer event to close persistent connections +From befcfaff647b1e09722d100fbf2dadcc22cfdc2b Mon Sep 17 00:00:00 2001 +From: Mike Perry <mikeperry-git(a)torproject.org> +Date: Wed, 1 Feb 2012 15:53:28 -0800 +Subject: [PATCH 11/13] Provide an observer event to close persistent + connections We need to prevent linkability across "New Identity", which includes closing keep-alive connections. @@ -10,18 +11,18 @@ keep-alive connections. 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/netwerk/protocol/http/nsHttpHandler.cpp b/netwerk/protocol/http/nsHttpHandler.cpp -index f79f23e..ed70ecd 100644 +index f21598e..f3bf6af 100644 --- a/netwerk/protocol/http/nsHttpHandler.cpp +++ b/netwerk/protocol/http/nsHttpHandler.cpp @@ -321,6 +321,7 @@ nsHttpHandler::Init() - mObserverService->AddObserver(this, "net:clear-active-logins", PR_TRUE); - mObserverService->AddObserver(this, NS_PRIVATE_BROWSING_SWITCH_TOPIC, PR_TRUE); - mObserverService->AddObserver(this, "net:prune-dead-connections", PR_TRUE); + mObserverService->AddObserver(this, "net:clear-active-logins", true); + mObserverService->AddObserver(this, NS_PRIVATE_BROWSING_SWITCH_TOPIC, true); + mObserverService->AddObserver(this, "net:prune-dead-connections", true); + mObserverService->AddObserver(this, "net:prune-all-connections", PR_TRUE); } return NS_OK; -@@ -1611,6 +1612,12 @@ nsHttpHandler::Observe(nsISupports *subject, +@@ -1481,6 +1482,12 @@ nsHttpHandler::Observe(nsISupports *subject, mConnMgr->PruneDeadConnections(); } } @@ -35,5 +36,5 @@ index f79f23e..ed70ecd 100644 return NS_OK; } -- -1.7.3.4 +1.7.5.4 diff --git a/src/current-patches/firefox/0012-Provide-client-values-only-to-CSS-Media-Queries.patch b/src/current-patches/firefox/0012-Provide-client-values-only-to-CSS-Media-Queries.patch index 7253f9c..d3e636b 100644 --- a/src/current-patches/firefox/0012-Provide-client-values-only-to-CSS-Media-Queries.patch +++ b/src/current-patches/firefox/0012-Provide-client-values-only-to-CSS-Media-Queries.patch @@ -1,7 +1,7 @@ -From e4586005446c57161e14adc153aa5890f5694223 Mon Sep 17 00:00:00 2001 +From b5c42aa7668ac12b034cc1806ae1dc48732fa9b5 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue, 20 Dec 2011 21:02:49 -0800 -Subject: [PATCH 12/12] Provide client values only to CSS Media Queries +Subject: [PATCH 12/13] Provide client values only to CSS Media Queries Also disable a bunch of Mozilla extensions that smell like they are fingerprintable. @@ -13,10 +13,10 @@ https://www.torproject.org/projects/torbrowser/design/#fingerprinting-linka… 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/layout/style/nsMediaFeatures.cpp b/layout/style/nsMediaFeatures.cpp -index 9a65c8e..d633dd1 100644 +index 6eca06e..c68f191 100644 --- a/layout/style/nsMediaFeatures.cpp +++ b/layout/style/nsMediaFeatures.cpp -@@ -381,14 +381,14 @@ nsMediaFeatures::features[] = { +@@ -383,14 +383,14 @@ nsMediaFeatures::features[] = { nsMediaFeature::eMinMaxAllowed, nsMediaFeature::eLength, { nsnull }, @@ -33,7 +33,7 @@ index 9a65c8e..d633dd1 100644 }, { &nsGkAtoms::orientation, -@@ -409,7 +409,7 @@ nsMediaFeatures::features[] = { +@@ -411,7 +411,7 @@ nsMediaFeatures::features[] = { nsMediaFeature::eMinMaxAllowed, nsMediaFeature::eIntRatio, { nsnull }, @@ -42,7 +42,7 @@ index 9a65c8e..d633dd1 100644 }, { &nsGkAtoms::color, -@@ -455,6 +455,7 @@ nsMediaFeatures::features[] = { +@@ -457,6 +457,7 @@ nsMediaFeatures::features[] = { }, // Mozilla extensions @@ -50,7 +50,7 @@ index 9a65c8e..d633dd1 100644 { &nsGkAtoms::_moz_device_pixel_ratio, nsMediaFeature::eMinMaxAllowed, -@@ -467,7 +468,7 @@ nsMediaFeatures::features[] = { +@@ -469,7 +470,7 @@ nsMediaFeatures::features[] = { nsMediaFeature::eMinMaxNotAllowed, nsMediaFeature::eEnumerated, { kOrientationKeywords }, @@ -59,7 +59,7 @@ index 9a65c8e..d633dd1 100644 }, { &nsGkAtoms::_moz_is_resource_document, -@@ -588,6 +589,7 @@ nsMediaFeatures::features[] = { +@@ -590,6 +591,7 @@ nsMediaFeatures::features[] = { { nsnull }, GetWindowsTheme }, @@ -68,5 +68,5 @@ index 9a65c8e..d633dd1 100644 { nsnull, -- -1.7.3.4 +1.7.5.4 diff --git a/src/current-patches/firefox/0013-Limit-the-number-of-fonts-per-document.patch b/src/current-patches/firefox/0013-Limit-the-number-of-fonts-per-document.patch index 989d072..4ae2487 100644 --- a/src/current-patches/firefox/0013-Limit-the-number-of-fonts-per-document.patch +++ b/src/current-patches/firefox/0013-Limit-the-number-of-fonts-per-document.patch @@ -1,6 +1,6 @@ -From 27c2a4a72504fe9a08cbfdf2210b05263bd693dd Mon Sep 17 00:00:00 2001 -From: Mike Perry <mikeperry-git(a)fscked.org> -Date: Tue, 27 Dec 2011 15:28:22 -0600 +From 4ed1e1c2372216cfcf377b369a9d44bb9f60ee14 Mon Sep 17 00:00:00 2001 +From: Mike Perry <mikeperry-git(a)torproject.org> +Date: Wed, 1 Feb 2012 16:01:21 -0800 Subject: [PATCH 13/13] Limit the number of fonts per document. We create two prefs: @@ -23,19 +23,19 @@ https://www.torproject.org/projects/torbrowser/design/#fingerprinting-linka… 3 files changed, 119 insertions(+), 3 deletions(-) diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp -index 0d5b1ce..ab9a7ba 100644 +index e1587db..9690d9c 100644 --- a/layout/base/nsPresContext.cpp +++ b/layout/base/nsPresContext.cpp @@ -98,6 +98,8 @@ - #include "nsIFrameMessageManager.h" #include "FrameLayerBuilder.h" #include "nsDOMMediaQueryList.h" + #include "nsSMILAnimationController.h" +#include "nsString.h" +#include "nsUnicharUtils.h" - #ifdef MOZ_SMIL - #include "nsSMILAnimationController.h" -@@ -707,6 +709,10 @@ nsPresContext::GetUserPreferences() + #ifdef IBMBIDI + #include "nsBidiPresUtils.h" +@@ -706,6 +708,10 @@ nsPresContext::GetUserPreferences() // * use fonts? mUseDocumentFonts = Preferences::GetInt("browser.display.use_document_fonts") != 0; @@ -46,7 +46,7 @@ index 0d5b1ce..ab9a7ba 100644 // * replace backslashes with Yen signs? (bug 245770) mEnableJapaneseTransform = -@@ -1306,6 +1312,100 @@ nsPresContext::GetDefaultFont(PRUint8 aFontID) const +@@ -1300,6 +1306,100 @@ nsPresContext::GetDefaultFont(PRUint8 aFontID) const return font; } @@ -148,7 +148,7 @@ index 0d5b1ce..ab9a7ba 100644 nsPresContext::SetFullZoom(float aZoom) { diff --git a/layout/base/nsPresContext.h b/layout/base/nsPresContext.h -index 2b09cc0..fe8a926 100644 +index ecd01d8..552a69a 100644 --- a/layout/base/nsPresContext.h +++ b/layout/base/nsPresContext.h @@ -548,6 +548,13 @@ public: @@ -165,7 +165,7 @@ index 2b09cc0..fe8a926 100644 PRInt32 MinFontSize() const { return NS_MAX(mMinFontSize, mMinimumFontSizePref); } -@@ -1123,6 +1130,8 @@ protected: +@@ -1117,6 +1124,8 @@ protected: PRUint32 mInterruptChecksToSkip; mozilla::TimeStamp mReflowStartTime; @@ -175,10 +175,10 @@ index 2b09cc0..fe8a926 100644 unsigned mHasPendingInterrupt : 1; unsigned mInterruptsEnabled : 1; diff --git a/layout/style/nsRuleNode.cpp b/layout/style/nsRuleNode.cpp -index a791723..5d65984 100644 +index 27336bf..827585a 100644 --- a/layout/style/nsRuleNode.cpp +++ b/layout/style/nsRuleNode.cpp -@@ -3087,6 +3087,7 @@ nsRuleNode::ComputeFontData(void* aStartStruct, +@@ -3091,6 +3091,7 @@ nsRuleNode::ComputeFontData(void* aStartStruct, // See if there is a minimum font-size constraint to honor nscoord minimumFontSize = mPresContext->MinFontSize(); @@ -186,7 +186,7 @@ index a791723..5d65984 100644 if (minimumFontSize < 0) minimumFontSize = 0; -@@ -3098,10 +3099,10 @@ nsRuleNode::ComputeFontData(void* aStartStruct, +@@ -3102,10 +3103,10 @@ nsRuleNode::ComputeFontData(void* aStartStruct, // We only need to know this to determine if we have to use the // document fonts (overriding the useDocumentFonts flag), or to // determine if we have to override the minimum font-size constraint. @@ -194,12 +194,12 @@ index a791723..5d65984 100644 + if (mPresContext->IsChrome()) { // if we are not using document fonts, but this is a XUL document, // then we use the document fonts anyway -- useDocumentFonts = PR_TRUE; +- useDocumentFonts = true; + isXUL = PR_TRUE; minimumFontSize = 0; } -@@ -3116,9 +3117,13 @@ nsRuleNode::ComputeFontData(void* aStartStruct, +@@ -3120,9 +3121,13 @@ nsRuleNode::ComputeFontData(void* aStartStruct, // generic? nsFont::GetGenericID(font->mFont.name, &generic); @@ -214,7 +214,7 @@ index a791723..5d65984 100644 // Extract the generic from the specified font family... nsAutoString genericName; if (!font->mFont.EnumerateFamilies(ExtractGeneric, &genericName)) { -@@ -3154,6 +3159,8 @@ nsRuleNode::ComputeFontData(void* aStartStruct, +@@ -3158,6 +3163,8 @@ nsRuleNode::ComputeFontData(void* aStartStruct, minimumFontSize, font); } @@ -224,5 +224,5 @@ index a791723..5d65984 100644 } -- -1.7.3.4 +1.7.5.4

1 0

[torbrowser/master] add openssl patch that allows it to build with a 10.5 SDK
by erinn＠torproject.org 02 Feb '12

02 Feb '12

commit 75661153f23556f4303522f3d569ececba83af50 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Feb 3 00:51:19 2012 +0100 add openssl patch that allows it to build with a 10.5 SDK --- build-scripts/osx.mk | 3 ++ .../openssl/0001-Build-OpenSSL-with-10.5-SDK.patch | 35 ++++++++++++++++++++ 2 files changed, 38 insertions(+), 0 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index a06200d..4a13151 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -59,6 +59,9 @@ build-zlib: OPENSSL_DIR=$(FETCH_DIR)/openssl-$(OPENSSL_VER) OPENSSL_OPTS=-no-rc5 -no-md2 -no-man shared zlib -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -L$(BUILT_DIR)/lib -I$(BUILT_DIR)/include build-openssl: + cp ../src/current-patches/openssl/*patch $(OPENSSL_DIR) + cp patch-any-src.sh $(OPENSSL_DIR) + cd $(OPENSSL_DIR) && ./patch-any-src.sh ifeq (x86_64,$(ARCH_TYPE)) cd $(OPENSSL_DIR) && ./Configure darwin64-x86_64-cc $(OPENSSL_OPTS) else diff --git a/src/current-patches/openssl/0001-Build-OpenSSL-with-10.5-SDK.patch b/src/current-patches/openssl/0001-Build-OpenSSL-with-10.5-SDK.patch new file mode 100644 index 0000000..b3ba7d9 --- /dev/null +++ b/src/current-patches/openssl/0001-Build-OpenSSL-with-10.5-SDK.patch @@ -0,0 +1,35 @@ +From e966e8ee358c4dff1aa25a71af72c215ec3f2d4a Mon Sep 17 00:00:00 2001 +From: Erinn Clark <erinn(a)torproject.org> +Date: Fri, 6 Jan 2012 16:06:55 +0100 +Subject: [PATCH] Make it possible to build OpenSSL on OS X with a 10.5 SDK + +--- + Configure | 5 ++++- + 1 files changed, 4 insertions(+), 1 deletions(-) + +diff --git a/Configure b/Configure +index 7941c93..d70b6eb 100755 +--- a/Configure ++++ b/Configure +@@ -816,7 +816,7 @@ PROCESS_ARGS: + } + elsif (/^[-+]/) + { +- if (/^-[lL](.*)$/ or /^-Wl,/) ++ if (/^-[lL](.*)$/ or /^-Wl,/ or /^-isysroot/) + { + $libs.=$_." "; + } +@@ -867,6 +867,9 @@ PROCESS_ARGS: + eval "\$table{\$1} = \"$2\""; # allow $xxx constructs in the string + $target=$1; + } ++ elsif (/^\//) { ++ $libs .= $_." "; ++ } + else + { + die "target already defined - $target (offending arg: $_)\n" if ($target ne ""); +-- +1.7.7.4 +

1 0

[torbrowser/master] bump all tbb versions to 2.2.35-5 for firefox, openssl, qt, noscript, and https-everywhere updates
by erinn＠torproject.org 02 Feb '12

02 Feb '12

commit 0a9fb84816e8825303a8a6acccc4ab9ed696348b Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Feb 3 00:49:03 2012 +0100 bump all tbb versions to 2.2.35-5 for firefox, openssl, qt, noscript, and https-everywhere updates --- README.LINUX-2.2 | 10 +++++----- README.OSX-2.2 | 10 +++++----- README.WIN-2.2 | 13 ++++++------- build-scripts/linux.mk | 2 +- build-scripts/versions.mk | 8 ++++---- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 13 +++++++++++++ changelog.osx-2.2 | 12 ++++++++++++ changelog.windows-2.2 | 14 ++++++++++++++ 9 files changed, 61 insertions(+), 23 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index fa8278a..3466964 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -4,12 +4,12 @@ Tor Browser Bundle for GNU/Linux Included applications --------------------- -Vidalia 0.2.15 (with Qt 4.6.2) -Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.5 and openssl-1.0.0f) -Firefox (Aurora) 9.0.1 +Vidalia 0.2.15 (with Qt 4.7.4) +Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.5 and openssl-1.0.0g) +Firefox 10.0 \_ Torbutton 1.4.5.1 - |_ NoScript 2.2.5 - |_ HTTPS-Everywhere 1.2.1 + |_ NoScript 2.2.8 + |_ HTTPS-Everywhere 1.2.2 Usage ----- diff --git a/README.OSX-2.2 b/README.OSX-2.2 index f5b4363..56fb53a 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -4,12 +4,12 @@ Tor Browser Bundle for Mac OS X Included applications --------------------- -Vidalia 0.2.15 (with Qt 4.6.2) -Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.5 and openssl-1.0.0f) -Firefox (Aurora) 9.0.1 +Vidalia 0.2.15 (with Qt 4.7.4) +Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.5 and openssl-1.0.0g) +Firefox 10.0 \_ Torbutton 1.4.5.1 - |_ NoScript 2.2.5 - |_ HTTPS-Everywhere 1.2.1 + |_ NoScript 2.2.8 + |_ HTTPS-Everywhere 1.2.2 Usage ----- diff --git a/README.WIN-2.2 b/README.WIN-2.2 index 6fa63a6..b586bd5 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -4,13 +4,12 @@ Tor Browser Bundle for Windows Included applications --------------------- -Vidalia 0.2.15 (with Qt 4.6.2) -Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.5 and openssl-1.0.0f) -FirefoxPortable 9.0.1 - \_ Firefox (Aurora) 9.0.1 - \_ Torbutton 1.4.5.1 - |_ NoScript 2.2.5 - |_ HTTPS-Everywhere 1.2.1 +Vidalia 0.2.15 (with Qt 4.7.4) +Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.5 and openssl-1.0.0g) +Firefox 10.0 + \_ Torbutton 1.4.5.1 + |_ NoScript 2.2.8 + |_ HTTPS-Everywhere 1.2.2 Usage ----- diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 594e4d7..c8cfc88 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -36,7 +36,7 @@ include $(PWD)/versions.mk ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=4 +BUILD_NUM=5 PLATFORM=Linux ## Location of directory for source unpacking diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index ec85656..1ee01eb 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -2,12 +2,12 @@ RELEASE_VER=2.2.35 -HTTPSEVERY_VER=1.2.1 -FIREFOX_VER=9.0.1 +HTTPSEVERY_VER=1.2.2 +FIREFOX_VER=10.0 LIBEVENT_VER=2.0.16-stable LIBPNG_VER=1.4.8 -NOSCRIPT_VER=2.2.5 -OPENSSL_VER=1.0.0f +NOSCRIPT_VER=2.2.8 +OPENSSL_VER=1.0.0g OTR_VER=3.2.0 PIDGIN_VER=2.6.4 QT_VER=4.6.2 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 159f1b2..a8ddb91 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -31,7 +31,7 @@ ## Include versions include $(PWD)/versions.mk -BUILD_NUM=4 +BUILD_NUM=5 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index fb5e57c..cef8906 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,16 @@ +Tor Browser Bundle (2.2.35-5); suite=linux + + * Update Firefox to 10.0 + * Update Qt to 4.7.4 + * Update OpenSSL to 1.0.0g + * Update HTTPS Everywhere to 1.2.2 + * Update NoScript to 2.2.8 + * New Firefox patches + - Limit the number of fonts per document + * Put documentation in remove-shared-lib-symlinks debug dumps (closes: #4984) + + -- Erinn Clark <erinn(a)torproject.org> Fri Feb 3 00:17:09 CET 2012 + Tor Browser Bundle (2.2.35-4); suite=linux * Update OpenSSL to 1.0.0f diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index a327aaf..80a7d10 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,15 @@ +Tor Browser Bundle (2.2.35-5); suite=osx + + * Update Firefox to 10.0 + * Update Qt to 4.7.4 + * Update OpenSSL to 1.0.0g + * Update HTTPS Everywhere to 1.2.2 + * Update NoScript to 2.2.8 + * New Firefox patches + - Limit the number of fonts per document + + -- Erinn Clark <erinn(a)torproject.org> Fri Feb 3 00:14:24 CET 2012 + Tor Browser Bundle (2.2.35-4); suite=osx * Update OpenSSL to 1.0.0f diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index 36fd885..c465b79 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,17 @@ +Tor Browser Bundle (2.2.35-5); suite=windows + + * Update Firefox to 10.0 + * Update Qt to 4.7.4 + * Update OpenSSL to 1.0.0g + * Update HTTPS Everywhere to 1.2.2 + * Update NoScript to 2.2.8 + * New Firefox patches + - Limit the number of fonts per document + * Make sure mozconfig always gets copied into the Firefox build directory + (closes: #4879) + + -- Erinn Clark <erinn(a)torproject.org> Fri Feb 3 00:17:05 CET 2012 + Tor Browser Bundle (2.2.35-4); suite=windows * Update OpenSSL to 1.0.0f

1 0

[torbrowser/master] fix some path names since this is the stable branch
by erinn＠torproject.org 02 Feb '12

02 Feb '12

commit 2474a46bae381d165477732226a9c5762fa5e6fc Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Feb 3 00:49:43 2012 +0100 fix some path names since this is the stable branch --- build-scripts/osx.mk | 10 +++++----- build-scripts/versions.mk | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 8f31ec8..a06200d 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -20,7 +20,7 @@ ### make -f osx.mk build-all-binaries ### make -f osx.mk all-compressed-bundles ### ... -### Look in tbbosx-alpha-dist/ for your files. +### Look in tbbosx-dist/ for your files. ### ### See LICENSE for licensing information ### @@ -36,14 +36,14 @@ include $(PWD)/versions.mk ## Architecture ARCH_TYPE=i386 -BUILD_NUM=4 +BUILD_NUM=5 PLATFORM=MacOS ## Location of directory for source unpacking -FETCH_DIR=$(PWD)/build-alpha-$(ARCH_TYPE) +FETCH_DIR=$(PWD)/build-$(ARCH_TYPE) ## Location of directory for prefix/destdir/compiles/etc BUILT_DIR=$(FETCH_DIR)/built -TBB_FINAL=$(BUILT_DIR)/tbbosx-alpha-dist +TBB_FINAL=$(BUILT_DIR)/tbbosx-dist source-dance: fetch-source unpack-source echo "We're ready for building now." @@ -154,7 +154,7 @@ DEST=generic-bundle NAME=TorBrowser ## Where shall we put the finished files for distribution? -DISTDIR=tbbosx-alpha-dist +DISTDIR=tbbosx-dist ## Version and name of the compressed bundle (also used for source) VERSION=$(RELEASE_VER)-$(BUILD_NUM)-dev diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 1ee01eb..5eac8db 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -106,7 +106,7 @@ unpack-libevent: cd $(FETCH_DIR) && tar -xvzf $(LIBEVENT_PACKAGE) unpack-tor: - -rm -rf $(FETCH_DIR)/tor-$(TOR-VER) + -rm -rf $(FETCH_DIR)/tor-$(TOR_VER) cd $(FETCH_DIR) && tar -xvzf $(TOR_PACKAGE) unpack-firefox:

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 02 Feb '12

02 Feb '12

commit 8f16b7c65cdfc751ca529753373a47ac69d3c79a Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 2 20:45:03 2012 +0000 Update translations for orbot --- values-it/strings.xml | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/values-it/strings.xml b/values-it/strings.xml index e3a949a..ba46e52 100644 --- a/values-it/strings.xml +++ b/values-it/strings.xml @@ -39,9 +39,9 @@ <string name="pref_transparent_all_title">Tor ovunqe</string> <string name="pref_transparent_all_summary">Traffico proxy di tutte le app attraverso Tor</string> <string name="pref_transparent_port_fallback_title">Fallback porte proxy</string> - <string name="pref_transparent_port_fallback_summary"></string> + <string name="pref_transparent_port_fallback_summary">ATTENZIONE: Aggira le porte comuni (80, 443, ecc). *USARE SOLO* se le modalità \'All\' o \'App\' non funzionano.</string> <string name="pref_transparent_port_title">Elenco porte</string> - <string name="pref_transparent_port_summary"></string> + <string name="pref_transparent_port_summary">Lista di porte per cui fare proxy. *USARE SOLO* se le modalità \'All\' o \'App\' non funzionano.</string> <string name="pref_transparent_port_dialog">Inserisci porte da proxare</string> <string name="pref_has_root">Richiesto accesso root</string> <string name="pref_has_root_summary">Richiede il root per il proxying trasparente</string> @@ -66,7 +66,7 @@ <string name="wizard_permission_enable_root">Concedi permessi root a Orbot</string> <string name="wizard_configure">Configura Torification</string> <string name="wizard_configure_msg">Orbot dà la possibilità di instradare tutto il traffico delle applicazioni tramite Tor o scegliere le applicazioni singolarmente.</string> - <string name="wizard_configure_all"></string> + <string name="wizard_configure_all">Usa Tor come proxy per tutte le applicazioni.</string> <string name="wizard_configure_select_apps">Seleziona singole app per Tor</string> <string name="wizard_tips_tricks">App abilitate per Orbot</string> <string name="wizard_tips_msg">Ti invitiamo a scaricare &amp; usare app che possono connettersi direttamente a Orbot. Fai click sui pulsanti qui sotto per installare.</string> @@ -87,9 +87,9 @@ Visita il nostro sito web https://guardianproject.info/apps/orbot o invia una ma <string name="pref_general_group">Generale</string> <string name="pref_start_boot_title">Avvia Orbot al boot</string> <string name="pref_start_boot_summary">Avvia automaticamente Orbot e connetti Tor quando il dispositivo Android viene avviato</string> - <string name="wizard_title_msg"></string> + <string name="wizard_title_msg">Orbot porta Tor su Android!\n\nTor ti aiuta a difenderti da filtraggio di contenuti, analisi del traffico e sorveglianza della rete che minacciano la privacy, informazioni personali e relazioni personali.\n\nQuesta procedura guidata ti aiuterà a configurare Orbot e Tor sul tuo dispositivo.</string> <string name="wizard_warning_title">Attenzione</string> - <string name="wizard_warning_msg"></string> + <string name="wizard_warning_msg">La semplice installazione di Orbot non renderà anonimo il tuo traffico di rete mobile.\n\nDevi configurare correttamente Orbot, il tuo dispositivo e le altre applicazioni per usare Tor.</string> <string name="wizard_permissions_title">Permessi</string> <string name="wizard_permissions_root_msg1"></string> <string name="wizard_permissions_root_msg2"></string>

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 02 Feb '12

02 Feb '12

commit 445595ed4c5c82c7d39856f73076fe55bc1c28c5 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 2 20:15:02 2012 +0000 Update translations for bridgedb --- eo/bridgedb.po | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/eo/bridgedb.po b/eo/bridgedb.po index fe1873d..c0983de 100644 --- a/eo/bridgedb.po +++ b/eo/bridgedb.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <eeemsi(a)googlemail.com>, 2012. # trio <trio(a)esperanto.org>, 2011. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-01-01 07:48-0800\n" -"PO-Revision-Date: 2011-03-22 16:45+0000\n" -"Last-Translator: trio <trio(a)esperanto.org>\n" +"PO-Revision-Date: 2012-02-02 20:10+0000\n" +"Last-Translator: identity <eeemsi(a)googlemail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -59,6 +60,11 @@ msgid "" "lots of bridge addresses, you must send this request from an email address at\n" "one of the following domains:" msgstr "" +"Alia vojo por trovi adreson de publika ponto estas sendi retposxtmesagxon al" +" bridges(a)torproject.org kun nur la linio \"get bridges\" en la korpo de la " +"mesagxo. Tamen, por malfaciligi la malkovro de multon da pontoj al " +"atakantoj, vi devas sendi la peton el retposxtadreso cxe unu el la sekvaj " +"retregionoj:" #: lib/bridgedb/I18n.py:41 msgid "[This is an automated message; please do not reply.]" @@ -71,6 +77,10 @@ msgid "" "will change every few days, so check back periodically if you need more\n" "bridge addresses." msgstr "" +"Alia vojo por trovi adreson de publika ponto estas viziti " +"https://bridges.torproject.org/. La respondoj, kiujn vi ricevos de tiu " +"pagxo, sxangxigxas preskaux tage, do kontrolu ofte se vi bezonas pliajn " +"pontadresojn." #: lib/bridgedb/I18n.py:48 msgid "(no bridges currently available)"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 02 Feb '12

02 Feb '12

commit 73541d23c78cbdd4a200f9c00962459182655d95 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 2 15:45:16 2012 +0000 Update translations for vidalia --- pt_BR/qt_pt_BR.po | 53 +++++++++++++++++++++++++++-------------------------- 1 files changed, 27 insertions(+), 26 deletions(-) diff --git a/pt_BR/qt_pt_BR.po b/pt_BR/qt_pt_BR.po index bba6fe3..0c69e51 100644 --- a/pt_BR/qt_pt_BR.po +++ b/pt_BR/qt_pt_BR.po @@ -1,14 +1,15 @@ # # Translators: # <amimyself(a)live.co.uk>, 2011. +# Filipe <nfscp(a)walla.com>, 2012. # runasand <runa.sandvik(a)gmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2008-08-20 03:25+0000\n" -"PO-Revision-Date: 2011-09-01 02:56+0000\n" -"Last-Translator: translator420 <amimyself(a)live.co.uk>\n" +"PO-Revision-Date: 2012-02-02 15:27+0000\n" +"Last-Translator: Filipe <nfscp(a)walla.com>\n" "Language-Team: none\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,7 +21,7 @@ msgstr "" #: qaccessibleobject.cpp:348 msgctxt "QApplication" msgid "Activate" -msgstr "Ativar" +msgstr "Activar" #: qmessagebox.h:319 msgctxt "QApplication" @@ -35,12 +36,12 @@ msgstr "Biblioteca Qt incompatível" #: qapplication.cpp:2095 msgctxt "QApplication" msgid "QT_LAYOUT_DIRECTION" -msgstr "Direção_de_Layout_QT" +msgstr "Direcção_de_Layout_QT" #: qaccessibleobject.cpp:350 msgctxt "QApplication" msgid "Activates the program's main window" -msgstr "Ativa a janela principal do programa" +msgstr "Activa a janela principal do programa" #: qmessagebox.cpp:2104 msgctxt "QDialogButtonBox" @@ -50,7 +51,7 @@ msgstr "OK" #: qdialogbuttonbox.cpp:528 msgctxt "QDialogButtonBox" msgid "Save" -msgstr "Salvar" +msgstr "Gravar" #: qdialogbuttonbox.cpp:531 msgctxt "QDialogButtonBox" @@ -85,7 +86,7 @@ msgstr "Ajuda" #: qdialogbuttonbox.cpp:550 msgctxt "QDialogButtonBox" msgid "Don't Save" -msgstr "Não salvar" +msgstr "Não gravar" #: qdialogbuttonbox.cpp:554 msgctxt "QDialogButtonBox" @@ -115,7 +116,7 @@ msgstr "Não a Todas" #: qdialogbuttonbox.cpp:569 msgctxt "QDialogButtonBox" msgid "Save All" -msgstr "Salvar Tudo" +msgstr "Gravar Tudo" #: qdialogbuttonbox.cpp:572 msgctxt "QDialogButtonBox" @@ -140,7 +141,7 @@ msgstr "Restaurar padrão" #: qdialogbuttonbox.cpp:552 msgctxt "QDialogButtonBox" msgid "Close without Saving" -msgstr "Fechar sem salvar" +msgstr "Fechar sem gravar" #: qdialogbuttonbox.cpp:525 msgctxt "QDialogButtonBox" @@ -180,7 +181,7 @@ msgstr "Todos arquivos (*)" #: qfiledialog.cpp:881 msgctxt "QFileDialog" msgid "Directories" -msgstr "Diretórios" +msgstr "Directórios" #: qfiledialog.cpp:2408 msgctxt "QFileDialog" @@ -190,7 +191,7 @@ msgstr "&Abrir" #: qfiledialog.cpp:919 msgctxt "QFileDialog" msgid "&Save" -msgstr "&Salvar" +msgstr "&Gravar" #: qfiledialog.cpp:435 msgctxt "QFileDialog" @@ -215,12 +216,12 @@ msgid "" msgstr "" "%1\n" "Arquivo não encontrado.\n" -"Por favor verifique se o nome do arquivo foi corretamente informado." +"Por favor verifique se o nome do arquivo foi correctamente introduzido." #: qdirmodel.cpp:833 msgctxt "QFileDialog" msgid "My Computer" -msgstr "Meu Computador" +msgstr "O Meu Computador" #: qfiledialog.cpp:462 msgctxt "QFileDialog" @@ -230,7 +231,7 @@ msgstr "&Renomear" #: qfiledialog.cpp:463 msgctxt "QFileDialog" msgid "&Delete" -msgstr "&Deletar" +msgstr "&Apagar" #: qfiledialog.cpp:464 msgctxt "QFileDialog" @@ -245,7 +246,7 @@ msgstr "Voltar" #: ui_qfiledialog.h:274 msgctxt "QFileDialog" msgid "Parent Directory" -msgstr "Diretório Acima" +msgstr "Directório Acima" #: ui_qfiledialog.h:284 msgctxt "QFileDialog" @@ -265,7 +266,7 @@ msgstr "Arquivos do tipo:" #: qfiledialog.cpp:883 msgctxt "QFileDialog" msgid "Directory:" -msgstr "Diretório:" +msgstr "Directório:" #: qfiledialog.cpp:2476 msgctxt "QFileDialog" @@ -275,8 +276,8 @@ msgid "" "Please verify the correct directory name was given." msgstr "" "%1\n" -"Diretório não encontrado.\n" -"Por favor verifique se o nome do diretório foi corretamente informado." +"Directório não encontrado.\n" +"Por favor verifique se o nome do directório foi corretamente introduzido." #: qfiledialog.cpp:2281 msgctxt "QFileDialog" @@ -285,17 +286,17 @@ msgid "" "Do you want to delete it anyway?" msgstr "" "'%1' é protegido contra cópia.\n" -"Você quer deletá-lo ainda assim?" +"Você quer realmente apagá-lo ?" #: qfiledialog.cpp:2286 msgctxt "QFileDialog" msgid "Are sure you want to delete '%1'?" -msgstr "Tem certeza de que deseja deletar '%1'?" +msgstr "Tem certeza de que deseja apagar '%1'?" #: qfiledialog.cpp:2299 msgctxt "QFileDialog" msgid "Could not delete directory." -msgstr "Não foi possível deletar o diretório." +msgstr "Não foi possível apagar o diretório." #: qfiledialog_win.cpp:128 msgctxt "QFileDialog" @@ -305,7 +306,7 @@ msgstr "Todos Arquivos (*.*)" #: qfiledialog.cpp:437 msgctxt "QFileDialog" msgid "Save As" -msgstr "Salvar Como" +msgstr "Gravar Como" #: qfileiconprovider.cpp:379 msgctxt "QFileDialog" @@ -325,7 +326,7 @@ msgstr "Desconhecido" #: qfiledialog.cpp:439 msgctxt "QFileDialog" msgid "Find Directory" -msgstr "Encontrar Diretório" +msgstr "Encontrar Directório" #: qfiledialog.cpp:458 msgctxt "QFileDialog" @@ -383,8 +384,8 @@ msgid "" "The name \"%1\" can not be used.Try using another name, with fewer" " characters or no punctuations marks." msgstr "" -"O nome \"%1\" não pode ser usado.Tente um nome com menos letras ou" -" sem pontuação." +"O nome \"%1\" não pode ser usado.Tente um nome com menos " +"caracteres ou sem pontuação." #: qfilesystemmodel.cpp:832 msgctxt "QFileSystemModel" @@ -414,7 +415,7 @@ msgstr "Última modificação" #: qfilesystemmodel_p.h:198 msgctxt "QFileSystemModel" msgid "My Computer" -msgstr "Meu computador" +msgstr "O Meu computador" #: qfilesystemmodel_p.h:200 msgctxt "QFileSystemModel"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 02 Feb '12

02 Feb '12

commit fd35c54bf02cfec331a0cf785dbfa20105f163fe Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 2 10:45:17 2012 +0000 Update translations for vidalia --- sk/vidalia_sk.po | 122 +++++++++++++++++++++++++++--------------------------- 1 files changed, 61 insertions(+), 61 deletions(-) diff --git a/sk/vidalia_sk.po b/sk/vidalia_sk.po index 4d3f73a..c34eb9f 100644 --- a/sk/vidalia_sk.po +++ b/sk/vidalia_sk.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-02-02 10:14+0000\n" +"PO-Revision-Date: 2012-02-02 10:33+0000\n" "Last-Translator: martinstrucel <martin.strucel(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -1756,23 +1756,23 @@ msgstr "Požiadavka na odovzdanie informácie" msgctxt "MainWindow" msgid "Loading relay information" -msgstr "" +msgstr "Nahrávanie informácie" msgctxt "MainWindow" msgid "Connecting to the Tor network" -msgstr "" +msgstr "Pripájanie do Tor siete" msgctxt "MainWindow" msgid "Establishing a Tor circuit" -msgstr "" +msgstr "Nastavuje sa Tor okruh" msgctxt "MainWindow" msgid "Connected to the Tor network!" -msgstr "" +msgstr "Pripojené do siete Tor!" msgctxt "MainWindow" msgid "Unrecognized startup status" -msgstr "" +msgstr "Nerozpoznaný stav štartovania" msgctxt "MainWindow" msgid "miscellaneous" @@ -2484,7 +2484,7 @@ msgstr "Zavriem mapu siete" msgctxt "NetViewer" msgid "Esc" -msgstr "" +msgstr "Esc" msgctxt "NetViewer" msgid "Zoom In" @@ -2496,7 +2496,7 @@ msgstr "Priblížim mapu siete" msgctxt "NetViewer" msgid "+" -msgstr "" +msgstr "+" msgctxt "NetViewer" msgid "Zoom Out" @@ -2508,7 +2508,7 @@ msgstr "Oddialim mapu siete" msgctxt "NetViewer" msgid "-" -msgstr "" +msgstr "-" msgctxt "NetViewer" msgid "Zoom To Fit" @@ -2520,43 +2520,43 @@ msgstr "Priblížim, aby sa zmestili všetky aktuálne zobrazené okruhy" msgctxt "NetViewer" msgid "Ctrl+Z" -msgstr "" +msgstr "Ctrl+Z" msgctxt "NetViewer" msgid "Relay Not Found" -msgstr "" +msgstr "Prenos nebol nájdený" msgctxt "NetViewer" msgid "No details on the selected relay are available." -msgstr "" +msgstr "Podrobnosti pre daný prenos neboli nájdené." msgctxt "NetViewer" msgid "Unknown" -msgstr "" +msgstr "Neznáme" msgctxt "NetViewer" msgid "Full Screen" -msgstr "" +msgstr "Celá obrazovka" msgctxt "NetViewer" msgid "View the network map as a full screen window" -msgstr "" +msgstr "Zobraziť mapu siete v okne na celú obrazovku" msgctxt "NetViewer" msgid "Ctrl+F" -msgstr "" +msgstr "Ctrl+F" msgctxt "NetworkPage" msgid "Invalid Bridge" -msgstr "" +msgstr "Nesprávny most" msgctxt "NetworkPage" msgid "The specified bridge identifier is not valid." -msgstr "" +msgstr "Zadaný identifikátor mosta nie je platný." msgctxt "NetworkPage" msgid "Copy (Ctrl+C)" -msgstr "" +msgstr "Kopírovať (Ctrl+C)" msgctxt "NetworkPage" msgid "" @@ -2596,7 +2596,7 @@ msgstr "Heslo?" msgctxt "NetworkPage" msgid "Port:" -msgstr "" +msgstr "Port:" msgctxt "NetworkPage" msgid "Check to only connect to relays using ports allowed by your firewall" @@ -2614,11 +2614,11 @@ msgstr "Nastavenie firewallu" msgctxt "NetworkPage" msgid "Allowed Ports:" -msgstr "" +msgstr "Povolené porty:" msgctxt "NetworkPage" msgid "80, 443" -msgstr "" +msgstr "80, 443" msgctxt "NetworkPage" msgid "" @@ -2698,83 +2698,83 @@ msgstr "" msgctxt "Policy" msgid "accept" -msgstr "" +msgstr "akceptovať" msgctxt "Policy" msgid "reject" -msgstr "" +msgstr "zamietnúť" msgctxt "RouterDescriptor" msgid "Online" -msgstr "" +msgstr "Zapojený" msgctxt "RouterDescriptor" msgid "Hibernating" -msgstr "" +msgstr "Hybernácia" msgctxt "RouterDescriptor" msgid "Offline" -msgstr "" +msgstr "Odpojený" msgctxt "RouterDescriptorView" msgid "Location:" -msgstr "" +msgstr "Lokalita:" msgctxt "RouterDescriptorView" msgid "IP Address:" -msgstr "" +msgstr "IP adresa:" msgctxt "RouterDescriptorView" msgid "Platform:" -msgstr "" +msgstr "Platforma:" msgctxt "RouterDescriptorView" msgid "Bandwidth:" -msgstr "" +msgstr "Šírka pásma:" msgctxt "RouterDescriptorView" msgid "Uptime:" -msgstr "" +msgstr "Čas chodu:" msgctxt "RouterDescriptorView" msgid "Last Updated:" -msgstr "" +msgstr "Naposledy aktualizované:" msgctxt "RouterDescriptorView" msgid "Copy" -msgstr "" +msgstr "Kopírovať" msgctxt "RouterInfoDialog" msgid "Hibernating" -msgstr "" +msgstr "Hybernovať" msgctxt "RouterInfoDialog" msgid "Online" -msgstr "" +msgstr "Zapojený" msgctxt "RouterInfoDialog" msgid "Offline" -msgstr "" +msgstr "Odpojený" msgctxt "RouterInfoDialog" msgid "Unknown" -msgstr "" +msgstr "Neznámy" msgctxt "RouterInfoDialog" msgid "Relay Details" -msgstr "" +msgstr "Podrobnosti o prenose" msgctxt "RouterInfoDialog" msgid "Summary" -msgstr "" +msgstr "Zhrnutie" msgctxt "RouterInfoDialog" msgid "Name:" -msgstr "" +msgstr "Meno:" msgctxt "RouterInfoDialog" msgid "Status:" -msgstr "" +msgstr "Stav:" msgctxt "RouterInfoDialog" msgid "Location:" @@ -2932,27 +2932,27 @@ msgstr "" msgctxt "ServerPage" msgid "Cable/DSL 256 Kbps" -msgstr "" +msgstr "Cable/DSL 256 Kbps" msgctxt "ServerPage" msgid "Cable/DSL 512 Kbps" -msgstr "" +msgstr "Cable/DSL 512 Kbps" msgctxt "ServerPage" msgid "Cable/DSL 768 Kbps" -msgstr "" +msgstr "Cable/DSL 768 Kbps" msgctxt "ServerPage" msgid "T1/Cable/DSL 1.5 Mbps" -msgstr "" +msgstr "T1/Cable/DSL 1.5 Mbps" msgctxt "ServerPage" msgid "> 1.5 Mbps" -msgstr "" +msgstr "> 1.5 Mbps" msgctxt "ServerPage" msgid "Custom" -msgstr "" +msgstr "Vlastné" msgctxt "ServerPage" msgid "Select the entry that most closely resembles your Internet connection" @@ -2972,7 +2972,7 @@ msgstr "" msgctxt "ServerPage" msgid "KB/s" -msgstr "" +msgstr "KB/s" msgctxt "ServerPage" msgid "Maximum Rate" @@ -2994,19 +2994,19 @@ msgstr "" msgctxt "ServerPage" msgid "Ports 6660 - 6669 and 6697" -msgstr "" +msgstr "Porty 6660 - 6669 a 6697" msgctxt "ServerPage" msgid "Internet Relay Chat (IRC)" -msgstr "" +msgstr "Internet Relay Chat (IRC)" msgctxt "ServerPage" msgid "Ports 110, 143, 993 and 995" -msgstr "" +msgstr "Porty 110, 143, 993 a 995" msgctxt "ServerPage" msgid "Retrieve Mail (POP, IMAP)" -msgstr "" +msgstr "Príjem emailov (POP, IMAP)" msgctxt "ServerPage" msgid "Ports unspecified by other checkboxes" @@ -3018,27 +3018,27 @@ msgstr "" msgctxt "ServerPage" msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888" -msgstr "" +msgstr "Porty 706, 1863, 5050, 5190, 5222, 5223, 8300 a 8888" msgctxt "ServerPage" msgid "Instant Messaging (IM)" -msgstr "" +msgstr "Instant Messaging (IM)" msgctxt "ServerPage" msgid "Port 443" -msgstr "" +msgstr "Port 443" msgctxt "ServerPage" msgid "Secure Websites (SSL)" -msgstr "" +msgstr "Bezpečné webstránky (SSL)" msgctxt "ServerPage" msgid "Port 80" -msgstr "" +msgstr "Port 80" msgctxt "ServerPage" msgid "Websites" -msgstr "" +msgstr "Webstránky" msgctxt "ServerPage" msgid "Show help topic on exit policies" @@ -3142,11 +3142,11 @@ msgstr "" msgctxt "ServicePage" msgid "Error" -msgstr "" +msgstr "Chyba" msgctxt "ServicePage" msgid "Please select a Service." -msgstr "" +msgstr "Prosím vyberte službu" msgctxt "ServicePage" msgid "Select Service Directory"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 02 Feb '12

02 Feb '12

commit a863f79f7352067dc4057f433bdecc64202dc5be Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 2 10:15:15 2012 +0000 Update translations for vidalia --- sk/vidalia_sk.po | 340 +++++++++++++++++++++++++++--------------------------- 1 files changed, 170 insertions(+), 170 deletions(-) diff --git a/sk/vidalia_sk.po b/sk/vidalia_sk.po index a319e00..4d3f73a 100644 --- a/sk/vidalia_sk.po +++ b/sk/vidalia_sk.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-02-02 09:45+0000\n" +"PO-Revision-Date: 2012-02-02 10:14+0000\n" "Last-Translator: martinstrucel <martin.strucel(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -498,419 +498,419 @@ msgstr "Armenia" msgctxt "CountryInfo" msgid "Australia" -msgstr "" +msgstr "Australia" msgctxt "CountryInfo" msgid "Azerbaijan" -msgstr "" +msgstr "Azerbaijan" msgctxt "CountryInfo" msgid "Bahamas" -msgstr "" +msgstr "Bahamas" msgctxt "CountryInfo" msgid "Bangladesh" -msgstr "" +msgstr "Bangladesh" msgctxt "CountryInfo" msgid "Barbados" -msgstr "" +msgstr "Barbados" msgctxt "CountryInfo" msgid "Belarus" -msgstr "" +msgstr "Belarus" msgctxt "CountryInfo" msgid "Belgium" -msgstr "" +msgstr "Belgium" msgctxt "CountryInfo" msgid "Belize" -msgstr "" +msgstr "Belize" msgctxt "CountryInfo" msgid "Bhutan" -msgstr "" +msgstr "Bhutan" msgctxt "CountryInfo" msgid "Bolivia" -msgstr "" +msgstr "Bolivia" msgctxt "CountryInfo" msgid "Bosnia & Herzegovina" -msgstr "" +msgstr "Bosnia & Herzegovina" msgctxt "CountryInfo" msgid "Botswana" -msgstr "" +msgstr "Botswana" msgctxt "CountryInfo" msgid "Brazil" -msgstr "" +msgstr "Brazil" msgctxt "CountryInfo" msgid "Brunei Darussalam" -msgstr "" +msgstr "Brunei Darussalam" msgctxt "CountryInfo" msgid "Bulgaria" -msgstr "" +msgstr "Bulgaria" msgctxt "CountryInfo" msgid "Burkina Faso" -msgstr "" +msgstr "Burkina Faso" msgctxt "CountryInfo" msgid "Burundi" -msgstr "" +msgstr "Burundi" msgctxt "CountryInfo" msgid "Cambodia" -msgstr "" +msgstr "Cambodia" msgctxt "CountryInfo" msgid "Cameroon" -msgstr "" +msgstr "Cameroon" msgctxt "CountryInfo" msgid "Canada" -msgstr "" +msgstr "Canada" msgctxt "CountryInfo" msgid "Cape Verde" -msgstr "" +msgstr "Cape Verde" msgctxt "CountryInfo" msgid "Central African Republic" -msgstr "" +msgstr "Central African Republic" msgctxt "CountryInfo" msgid "Chad" -msgstr "" +msgstr "Chad" msgctxt "CountryInfo" msgid "Chile" -msgstr "" +msgstr "Chile" msgctxt "CountryInfo" msgid "China" -msgstr "" +msgstr "China" msgctxt "CountryInfo" msgid "Colombia" -msgstr "" +msgstr "Colombia" msgctxt "CountryInfo" msgid "Comoros" -msgstr "" +msgstr "Comoros" msgctxt "CountryInfo" msgid "Congo, The Democratic Republic of the" -msgstr "" +msgstr "Congo, The Democratic Republic of the" msgctxt "CountryInfo" msgid "Congo" -msgstr "" +msgstr "Congo" msgctxt "CountryInfo" msgid "Costa Rica" -msgstr "" +msgstr "Costa Rica" msgctxt "CountryInfo" msgid "Cote dâIvoire" -msgstr "" +msgstr "Cote dâIvoire" msgctxt "CountryInfo" msgid "Croatia" -msgstr "" +msgstr "Croatia" msgctxt "CountryInfo" msgid "Cuba" -msgstr "" +msgstr "Cuba" msgctxt "CountryInfo" msgid "Cyprus" -msgstr "" +msgstr "Cyprus" msgctxt "CountryInfo" msgid "Czech Republic" -msgstr "" +msgstr "Czech Republic" msgctxt "CountryInfo" msgid "Denmark" -msgstr "" +msgstr "Denmark" msgctxt "CountryInfo" msgid "Djibouti" -msgstr "" +msgstr "Djibouti" msgctxt "CountryInfo" msgid "Dominica" -msgstr "" +msgstr "Dominica" msgctxt "CountryInfo" msgid "Dominican Republic" -msgstr "" +msgstr "Dominican Republic" msgctxt "CountryInfo" msgid "Ecuador" -msgstr "" +msgstr "Ecuador" msgctxt "CountryInfo" msgid "Egypt" -msgstr "" +msgstr "Egypt" msgctxt "CountryInfo" msgid "El Salvador" -msgstr "" +msgstr "El Salvador" msgctxt "CountryInfo" msgid "Equatorial Guinea" -msgstr "" +msgstr "Equatorial Guinea" msgctxt "CountryInfo" msgid "Eritrea" -msgstr "" +msgstr "Eritrea" msgctxt "CountryInfo" msgid "Estonia" -msgstr "" +msgstr "Estonia" msgctxt "CountryInfo" msgid "France" -msgstr "" +msgstr "France" msgctxt "CountryInfo" msgid "Gabon" -msgstr "" +msgstr "Gabon" msgctxt "CountryInfo" msgid "Gambia" -msgstr "" +msgstr "Gambia" msgctxt "CountryInfo" msgid "Georgia" -msgstr "" +msgstr "Georgia" msgctxt "CountryInfo" msgid "Germany" -msgstr "" +msgstr "Germany" msgctxt "CountryInfo" msgid "Ghana" -msgstr "" +msgstr "Ghana" msgctxt "CountryInfo" msgid "Grenada" -msgstr "" +msgstr "Grenada" msgctxt "CountryInfo" msgid "Guatemala" -msgstr "" +msgstr "Guatemala" msgctxt "CountryInfo" msgid "Guinea" -msgstr "" +msgstr "Guinea" msgctxt "CountryInfo" msgid "Guinea-Bissau" -msgstr "" +msgstr "Guinea-Bissau" msgctxt "CountryInfo" msgid "Guyana" -msgstr "" +msgstr "Guyana" msgctxt "CountryInfo" msgid "Hong Kong" -msgstr "" +msgstr "Hong Kong" msgctxt "CountryInfo" msgid "Haiti" -msgstr "" +msgstr "Haiti" msgctxt "CountryInfo" msgid "Honduras" -msgstr "" +msgstr "Honduras" msgctxt "CountryInfo" msgid "Israel" -msgstr "" +msgstr "Israel" msgctxt "CountryInfo" msgid "Italy" -msgstr "" +msgstr "Italy" msgctxt "CountryInfo" msgid "Jamaica" -msgstr "" +msgstr "Jamaica" msgctxt "CountryInfo" msgid "Japan" -msgstr "" +msgstr "Japan" msgctxt "CountryInfo" msgid "Jordan" -msgstr "" +msgstr "Jordan" msgctxt "CountryInfo" msgid "Kazakhstan" -msgstr "" +msgstr "Kazakhstan" msgctxt "CountryInfo" msgid "Kenya" -msgstr "" +msgstr "Kenya" msgctxt "CountryInfo" msgid "Kiribati" -msgstr "" +msgstr "Kiribati" msgctxt "CountryInfo" msgid "Kuwait" -msgstr "" +msgstr "Kuwait" msgctxt "CountryInfo" msgid "Kyrgyzstan" -msgstr "" +msgstr "Kyrgyzstan" msgctxt "CountryInfo" msgid "Laos" -msgstr "" +msgstr "Laos" msgctxt "CountryInfo" msgid "Latvia" -msgstr "" +msgstr "Latvia" msgctxt "CountryInfo" msgid "Lebanon" -msgstr "" +msgstr "Lebanon" msgctxt "CountryInfo" msgid "Lesotho" -msgstr "" +msgstr "Lesotho" msgctxt "CountryInfo" msgid "Liberia" -msgstr "" +msgstr "Liberia" msgctxt "CountryInfo" msgid "Liechtenstein" -msgstr "" +msgstr "Liechtenstein" msgctxt "CountryInfo" msgid "Lithuania" -msgstr "" +msgstr "Lithuania" msgctxt "CountryInfo" msgid "Luxembourg" -msgstr "" +msgstr "Luxembourg" msgctxt "CountryInfo" msgid "Macedonia" -msgstr "" +msgstr "Macedonia" msgctxt "CountryInfo" msgid "Madagascar" -msgstr "" +msgstr "Madagascar" msgctxt "CountryInfo" msgid "Malawi" -msgstr "" +msgstr "Malawi" msgctxt "CountryInfo" msgid "Malaysia" -msgstr "" +msgstr "Malaysia" msgctxt "CountryInfo" msgid "Mali" -msgstr "" +msgstr "Mali" msgctxt "CountryInfo" msgid "Malta" -msgstr "" +msgstr "Malta" msgctxt "CountryInfo" msgid "Marshall Islands" -msgstr "" +msgstr "Marshall Islands" msgctxt "CountryInfo" msgid "Mauritania" -msgstr "" +msgstr "Mauritania" msgctxt "CountryInfo" msgid "Mauritius" -msgstr "" +msgstr "Mauritius" msgctxt "CountryInfo" msgid "Micronesia" -msgstr "" +msgstr "Micronesia" msgctxt "CountryInfo" msgid "Moldova" -msgstr "" +msgstr "Moldova" msgctxt "CountryInfo" msgid "Monaco" -msgstr "" +msgstr "Monaco" msgctxt "CountryInfo" msgid "Mongolia" -msgstr "" +msgstr "Mongolia" msgctxt "CountryInfo" msgid "Montenegro" -msgstr "" +msgstr "Montenegro" msgctxt "CountryInfo" msgid "Morocco" -msgstr "" +msgstr "Morocco" msgctxt "CountryInfo" msgid "Mozambique" -msgstr "" +msgstr "Mozambique" msgctxt "CountryInfo" msgid "Namibia" -msgstr "" +msgstr "Namibia" msgctxt "CountryInfo" msgid "Nauru" -msgstr "" +msgstr "Nauru" msgctxt "CountryInfo" msgid "Nepal" -msgstr "" +msgstr "Nepal" msgctxt "CountryInfo" msgid "Netherlands" -msgstr "" +msgstr "Netherlands" msgctxt "CountryInfo" msgid "New Zealand" -msgstr "" +msgstr "New Zealand" msgctxt "CountryInfo" msgid "Nicaragua" -msgstr "" +msgstr "Nicaragua" msgctxt "CountryInfo" msgid "Niger" -msgstr "" +msgstr "Niger" msgctxt "CountryInfo" msgid "Nigeria" -msgstr "" +msgstr "Nigeria" msgctxt "CountryInfo" msgid "Norway" -msgstr "" +msgstr "Norway" msgctxt "CountryInfo" msgid "Oman" -msgstr "" +msgstr "Oman" msgctxt "CountryInfo" msgid "Pakistan" -msgstr "" +msgstr "Pakistan" msgctxt "CountryInfo" msgid "Palau" @@ -954,43 +954,43 @@ msgstr "" msgctxt "CountryInfo" msgid "Romania" -msgstr "" +msgstr "Romania" msgctxt "CountryInfo" msgid "Russia" -msgstr "" +msgstr "Russia" msgctxt "CountryInfo" msgid "Rwanda" -msgstr "" +msgstr "Rwanda" msgctxt "CountryInfo" msgid "Saint Kitts & Nevis" -msgstr "" +msgstr "Saint Kitts & Nevis" msgctxt "CountryInfo" msgid "Saint Lucia" -msgstr "" +msgstr "Saint Lucia" msgctxt "CountryInfo" msgid "Saint Vincent & the Grenadines" -msgstr "" +msgstr "Saint Vincent & the Grenadines" msgctxt "CountryInfo" msgid "Samoa" -msgstr "" +msgstr "Samoa" msgctxt "CountryInfo" msgid "San Marino" -msgstr "" +msgstr "San Marino" msgctxt "CountryInfo" msgid "Sao Tome & Principe" -msgstr "" +msgstr "Sao Tome & Principe" msgctxt "CountryInfo" msgid "Saudi Arabia" -msgstr "" +msgstr "Saudi Arabia" msgctxt "CountryInfo" msgid "Senegal" @@ -1034,43 +1034,43 @@ msgstr "" msgctxt "CountryInfo" msgid "Spain" -msgstr "" +msgstr "Spain" msgctxt "CountryInfo" msgid "Sri Lanka" -msgstr "" +msgstr "Sri Lanka" msgctxt "CountryInfo" msgid "Sudan" -msgstr "" +msgstr "Sudan" msgctxt "CountryInfo" msgid "Suriname" -msgstr "" +msgstr "Suriname" msgctxt "CountryInfo" msgid "Swaziland" -msgstr "" +msgstr "Swaziland" msgctxt "CountryInfo" msgid "Sweden" -msgstr "" +msgstr "Sweden" msgctxt "CountryInfo" msgid "Switzerland" -msgstr "" +msgstr "Switzerland" msgctxt "CountryInfo" msgid "Syria" -msgstr "" +msgstr "Syria" msgctxt "CountryInfo" msgid "Tajikistan" -msgstr "" +msgstr "Tajikistan" msgctxt "CountryInfo" msgid "Tanzania" -msgstr "" +msgstr "Tanzania" msgctxt "CountryInfo" msgid "Thailand" @@ -1198,75 +1198,75 @@ msgstr "" msgctxt "CountryInfo" msgid "Fiji" -msgstr "" +msgstr "Fiji" msgctxt "CountryInfo" msgid "Finland" -msgstr "" +msgstr "Finland" msgctxt "CountryInfo" msgid "Greece" -msgstr "" +msgstr "Greece" msgctxt "CountryInfo" msgid "Guam" -msgstr "" +msgstr "Guam" msgctxt "CountryInfo" msgid "Hungary" -msgstr "" +msgstr "Hungary" msgctxt "CountryInfo" msgid "Iceland" -msgstr "" +msgstr "Iceland" msgctxt "CountryInfo" msgid "India" -msgstr "" +msgstr "India" msgctxt "CountryInfo" msgid "Indonesia" -msgstr "" +msgstr "Indonesia" msgctxt "CountryInfo" msgid "Iran" -msgstr "" +msgstr "Iran" msgctxt "CountryInfo" msgid "Iraq" -msgstr "" +msgstr "Iraq" msgctxt "CountryInfo" msgid "Ireland" -msgstr "" +msgstr "Ireland" msgctxt "CountryInfo" msgid "Korea, North" -msgstr "" +msgstr "Korea, North" msgctxt "CountryInfo" msgid "Korea, South" -msgstr "" +msgstr "Korea, South" msgctxt "CountryInfo" msgid "Libya" -msgstr "" +msgstr "Libya" msgctxt "CountryInfo" msgid "Maldives" -msgstr "" +msgstr "Maldives" msgctxt "CountryInfo" msgid "Mexico" -msgstr "" +msgstr "Mexico" msgctxt "CountryInfo" msgid "Myanmar" -msgstr "" +msgstr "Myanmar" msgctxt "CountryInfo" msgid "Taiwan" -msgstr "" +msgstr "Taiwan" msgctxt "CrashReportDialog" msgid "Submit a Crash Report" @@ -1354,7 +1354,7 @@ msgstr "Spustiť program Tora zo spustením Vidalia" msgctxt "GeneralPage" msgid "Tor" -msgstr "" +msgstr "Tor" msgctxt "GeneralPage" msgid "Proxy Application (optional)" @@ -1382,19 +1382,19 @@ msgstr "Skontrolovať" msgctxt "GraphFrame" msgid "%1 KB/s" -msgstr "" +msgstr "%1 KB/s" msgctxt "GraphFrame" msgid "%1 KB" -msgstr "" +msgstr "%1 KB" msgctxt "GraphFrame" msgid "%1 MB" -msgstr "" +msgstr "%1 MB" msgctxt "GraphFrame" msgid "%1 GB" -msgstr "" +msgstr "%1 GB" msgctxt "GraphFrame" msgid "Recv:" @@ -1438,7 +1438,7 @@ msgstr "Prejdem na predchádzajúcu stránku (Backspace)" msgctxt "HelpBrowser" msgid "Backspace" -msgstr "" +msgstr "Backspace" msgctxt "HelpBrowser" msgid "Forward" @@ -1450,11 +1450,11 @@ msgstr "Prejdem na ďalšiu stránku (Shift+Backspace)" msgctxt "HelpBrowser" msgid "Shift+Backspace" -msgstr "" +msgstr "Shift+Backspace" msgctxt "HelpBrowser" msgid "Home" -msgstr "" +msgstr "Home" msgctxt "HelpBrowser" msgid "Move to the Home page (Ctrl+H)" @@ -1462,7 +1462,7 @@ msgstr "Prejdem na domovskú stránku (Ctrl+H)" msgctxt "HelpBrowser" msgid "Ctrl+H" -msgstr "" +msgstr "Ctrl+H" msgctxt "HelpBrowser" msgid "Find" @@ -1474,7 +1474,7 @@ msgstr "Vyhľadám slová alebo frázy na aktuálnej stránke (Ctrl+F)" msgctxt "HelpBrowser" msgid "Ctrl+F" -msgstr "" +msgstr "Ctrl+F" msgctxt "HelpBrowser" msgid "Close" @@ -1486,7 +1486,7 @@ msgstr "Zavriem pomoc Vidalia" msgctxt "HelpBrowser" msgid "Esc" -msgstr "" +msgstr "Esc" msgctxt "HelpBrowser" msgid "Find:" @@ -1584,7 +1584,7 @@ msgstr "Ladiť" msgctxt "LogEvent" msgid "Info" -msgstr "" +msgstr "Info" msgctxt "LogEvent" msgid "Notice" @@ -1668,39 +1668,39 @@ msgstr "Nová identita" msgctxt "MainWindow" msgid "Ctrl+T" -msgstr "" +msgstr "Ctrl+T" msgctxt "MainWindow" msgid "Ctrl+B" -msgstr "" +msgstr "Ctrl+B" msgctxt "MainWindow" msgid "Ctrl+L" -msgstr "" +msgstr "Ctrl+L" msgctxt "MainWindow" msgid "Ctrl+N" -msgstr "" +msgstr "Ctrl+N" msgctxt "MainWindow" msgid "Ctrl+?" -msgstr "" +msgstr "Ctrl+?" msgctxt "MainWindow" msgid "Ctrl+I" -msgstr "" +msgstr "Ctrl+I" msgctxt "MainWindow" msgid "Ctrl+P" -msgstr "" +msgstr "Ctrl+P" msgctxt "MainWindow" msgid "Tor" -msgstr "" +msgstr "Tor" msgctxt "MainWindow" msgid "View" -msgstr "" +msgstr "Zobraziť" msgctxt "MainWindow" msgid "Vidalia Help" @@ -1732,27 +1732,27 @@ msgstr "Ľutujeme ale Vidalia sa nepodarilo spustiť nastavený proxy server" msgctxt "MainWindow" msgid "Connecting to a relay directory" -msgstr "" +msgstr "Pripájanie k prenosu adresára" msgctxt "MainWindow" msgid "Establishing an encrypted directory connection" -msgstr "" +msgstr "Establishing an encrypted directory connection" msgctxt "MainWindow" msgid "Retrieving network status" -msgstr "" +msgstr "Príjem stavu siete" msgctxt "MainWindow" msgid "Loading network status" -msgstr "" +msgstr "Nahrávanie stavu siete" msgctxt "MainWindow" msgid "Loading authority certificates" -msgstr "" +msgstr "Nahrávanie autorizačných certifikátov" msgctxt "MainWindow" msgid "Requesting relay information" -msgstr "" +msgstr "Požiadavka na odovzdanie informácie" msgctxt "MainWindow" msgid "Loading relay information"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 02 Feb '12

02 Feb '12

commit cde34bb784f1f538bd76fec7e734c376b3c4b700 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 2 09:45:17 2012 +0000 Update translations for vidalia --- sk/vidalia_sk.po | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/sk/vidalia_sk.po b/sk/vidalia_sk.po index c706cd2..a319e00 100644 --- a/sk/vidalia_sk.po +++ b/sk/vidalia_sk.po @@ -1,13 +1,14 @@ # # Translators: +# <martin.strucel(a)gmail.com>, 2012. # runasand <runa.sandvik(a)gmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-01-07 16:59+0000\n" -"Last-Translator: brahma <brahma(a)zoznam.sk>\n" +"PO-Revision-Date: 2012-02-02 09:45+0000\n" +"Last-Translator: martinstrucel <martin.strucel(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -473,27 +474,27 @@ msgstr "Neplatná riadiaca odpoveď. [%1]" msgctxt "CountryInfo" msgid "Afghanistan" -msgstr "" +msgstr "Afghanistan" msgctxt "CountryInfo" msgid "Andorra" -msgstr "" +msgstr "Andorra" msgctxt "CountryInfo" msgid "Angola" -msgstr "" +msgstr "Angola" msgctxt "CountryInfo" msgid "Antigua & Barbuda" -msgstr "" +msgstr "Antigua & Barbuda" msgctxt "CountryInfo" msgid "Argentina" -msgstr "" +msgstr "Argentina" msgctxt "CountryInfo" msgid "Armenia" -msgstr "" +msgstr "Armenia" msgctxt "CountryInfo" msgid "Australia"

1 0