tor-commits
Threads by month
- ----- 2025 -----
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
April 2019
- 18 participants
- 3314 discussions

[tor-browser/tor-browser-60.6.1esr-8.5-1] fixup! Bug 28329 - Part 1. Add new Tor resources
by gk@torproject.org 11 Apr '19
by gk@torproject.org 11 Apr '19
11 Apr '19
commit be91c6f0a5cba14a7ba0e17682b158ada97667be
Author: Matthew Finkel <Matthew.Finkel(a)gmail.com>
Date: Tue Apr 9 17:53:01 2019 +0000
fixup! Bug 28329 - Part 1. Add new Tor resources
---
mobile/android/app/src/main/res/drawable/tor_spinning_onion.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mobile/android/app/src/main/res/drawable/tor_spinning_onion.xml b/mobile/android/app/src/main/res/drawable/tor_spinning_onion.xml
index 6bcc52f87f93..e0909237886c 100644
--- a/mobile/android/app/src/main/res/drawable/tor_spinning_onion.xml
+++ b/mobile/android/app/src/main/res/drawable/tor_spinning_onion.xml
@@ -3,7 +3,7 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<vector android:height="24dp" android:viewportHeight="289"
- android:viewportWidth="247" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+ android:viewportWidth="249" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M100.02,44.97C96.2,31.15 83.92,21.59 69.91,21.51V0c16.52,0 32.07,7.97 41.98,21.51V0h20.99v21.51C142.78,7.97 158.33,0 174.85,0v21.51c-14.01,0.08 -26.29,9.63 -30.12,23.45C203.49,54.97 41.26,54.97 100.02,44.97z"/>
<path android:fillColor="#FF000000" android:pathData="M123.92,52.47c-62.22,0 -112.65,50.44 -112.65,112.65c0,62.22 50.44,112.65 112.65,112.65V52.47z"/>
<path android:fillColor="#FF000000" android:pathData="M123.92,266.51c56,0 101.39,-45.39 101.39,-101.39c0,-56 -45.39,-101.39 -101.39,-101.39S22.53,109.13 22.53,165.12C22.53,221.12 67.92,266.51 123.92,266.51zM123.92,289.04C55.48,289.04 0,233.56 0,165.12S55.48,41.2 123.92,41.2s123.92,55.48 123.92,123.92S192.36,289.04 123.92,289.04z"/>
1
0

[tor-browser/tor-browser-60.6.1esr-8.5-1] fixup! Bug 28329 - Part 4. Add new Tor Bootstrapping and configuration screens
by gk@torproject.org 11 Apr '19
by gk@torproject.org 11 Apr '19
11 Apr '19
commit 8b16afa5b647078a22a862360f4764bce82760ca
Author: Matthew Finkel <Matthew.Finkel(a)gmail.com>
Date: Fri Mar 22 13:43:30 2019 +0000
fixup! Bug 28329 - Part 4. Add new Tor Bootstrapping and configuration screens
Bug 29858 - Load onboarding panels after bootstrapping is completed.
---
mobile/android/base/java/org/mozilla/gecko/BrowserApp.java | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
index f8af42f09b5f..dce3dc1548c2 100644
--- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
@@ -1363,10 +1363,10 @@ public class BrowserApp extends GeckoApp
if (!IntentUtils.getIsInAutomationFromEnvironment(intent)) {
if (mTorNeedsStart) {
showTorBootstrapPager();
+ } else {
+ // We can't show the first run experience until Gecko has finished initialization (bug 1077583).
+ checkFirstrun(this, intent);
}
-
- // We can't show the first run experience until Gecko has finished initialization (bug 1077583).
- checkFirstrun(this, intent);
}
}
@@ -3138,6 +3138,11 @@ public class BrowserApp extends GeckoApp
// If we finished, then Tor bootstrapped 100%
mTorNeedsStart = false;
+
+ // When bootstrapping completes, check if the Firstrun (onboarding) screens
+ // should be shown.
+ final SafeIntent intent = new SafeIntent(getIntent());
+ checkFirstrun(BrowserApp.this, intent);
}
});
}
1
0

[tor-browser/tor-browser-60.6.1esr-8.5-1] fixup! Bug 28329 - Part 4. Add new Tor Bootstrapping and configuration screens
by gk@torproject.org 11 Apr '19
by gk@torproject.org 11 Apr '19
11 Apr '19
commit 7b5f5ee887cd6fd865e86784ad536b4c0136ce83
Author: Matthew Finkel <Matthew.Finkel(a)gmail.com>
Date: Tue Apr 9 17:52:28 2019 +0000
fixup! Bug 28329 - Part 4. Add new Tor Bootstrapping and configuration screens
---
.../app/src/main/res/layout/tor_bootstrap.xml | 9 +-
.../base/java/org/mozilla/gecko/BrowserApp.java | 2 +-
.../gecko/torbootstrap/TorBootstrapPanel.java | 203 +++++++++++++++++----
.../mozilla/gecko/torbootstrap/TorPreferences.java | 13 +-
4 files changed, 176 insertions(+), 51 deletions(-)
diff --git a/mobile/android/app/src/main/res/layout/tor_bootstrap.xml b/mobile/android/app/src/main/res/layout/tor_bootstrap.xml
index ce2b1c910a44..af9c7d11d3f2 100644
--- a/mobile/android/app/src/main/res/layout/tor_bootstrap.xml
+++ b/mobile/android/app/src/main/res/layout/tor_bootstrap.xml
@@ -74,13 +74,10 @@
android:tint="#ffffffff"
android:layout_height="wrap_content"
android:layout_width="match_parent"
- android:layout_marginTop="130dp"
android:layout_marginBottom="37dp"
- android:layout_marginRight="95dp"
- android:layout_marginLeft="95dp"
+ android:layout_marginRight="10dp"
+ android:layout_marginLeft="10dp"
android:layout_centerHorizontal="true"
android:layout_below="@id/tor_bootstrap_settings_gear"
- android:layout_above="@id/tor_bootstrap_last_status_message"
- android:paddingLeft="20dp"
- android:paddingRight="20dp"/>
+ android:layout_above="@id/tor_bootstrap_last_status_message" />
</RelativeLayout>
diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
index dce3dc1548c2..006d5c11f210 100644
--- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
@@ -3134,7 +3134,7 @@ public class BrowserApp extends GeckoApp
// When the content loaded in the background (such as about:tor),
// it was loaded while mBrowserChrome was GONE. We should refresh the
// height now so the page is rendered correctly.
- Tabs.getInstance().getSelectedTab().doReload(false);
+ Tabs.getInstance().getSelectedTab().doReload(true);
// If we finished, then Tor bootstrapped 100%
mTorNeedsStart = false;
diff --git a/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorBootstrapPanel.java b/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorBootstrapPanel.java
index 8d42b13a2a8e..2ee4c2528691 100644
--- a/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorBootstrapPanel.java
+++ b/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorBootstrapPanel.java
@@ -7,7 +7,6 @@ package org.mozilla.gecko.torbootstrap;
import android.app.Activity;
import android.content.Intent;
-import android.graphics.drawable.Animatable2;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Bundle;
@@ -16,6 +15,7 @@ import android.support.v4.content.LocalBroadcastManager;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.TextView;
@@ -44,6 +44,8 @@ public class TorBootstrapPanel extends FirstrunPanel implements TorBootstrapLogg
protected Activity mActContext;
protected TorBootstrapPager.TorBootstrapController mBootstrapController;
+ private ViewTreeLayoutListener mViewTreeLayoutListener;
+
// These are used by the background AlphaChanging thread for dynamically changing
// the alpha value of the Onion during bootstrap.
private int mOnionCurrentAlpha = 255;
@@ -85,6 +87,155 @@ public class TorBootstrapPanel extends FirstrunPanel implements TorBootstrapLogg
}
}
+ // Android tries scaling the image as a square. Create a modified ViewPort via padding
+ // top, left, right, and bottom such that the image aspect ratio is correct.
+ private void setOnionImgLayout() {
+ if (mRoot == null) {
+ Log.i(LOGTAG, "setOnionImgLayout: mRoot is null");
+ return;
+ }
+
+ ImageView onionImg = (ImageView) mRoot.findViewById(R.id.tor_bootstrap_onion);
+ if (onionImg == null) {
+ Log.i(LOGTAG, "setOnionImgLayout: onionImg is null");
+ return;
+ }
+
+ // Dimensions of the SVG. If the image is ever changed, update these values. The
+ // SVG viewport is 2dp wider due to clipping.
+ final double imgHeight = 289.;
+ final double imgWidth = 247.;
+
+ // Dimensions of the current ImageView
+ final int currentHeight = onionImg.getHeight();
+ final int currentWidth = onionImg.getWidth();
+
+ // If we only consider one dimension of the image, calculate the expected value
+ // of the other dimension (width vs. height).
+ final int expectedHeight = (int) (currentWidth*imgHeight/imgWidth);
+ final int expectedWidth = (int) (currentHeight*imgWidth/imgHeight);
+
+ // Set current values as default.
+ int newWidth = currentWidth;
+ int newHeight = currentHeight;
+
+ Log.d(LOGTAG, "Current Top=" + onionImg.getTop());
+ Log.d(LOGTAG, "Current Height=" + currentHeight);
+ Log.d(LOGTAG, "Current Width=" + currentWidth);
+ Log.d(LOGTAG, "Expected height=" + expectedHeight);
+ Log.d(LOGTAG, "Expected width=" + expectedWidth);
+
+ // Configure the width or height based on its expected value. This is based on
+ // the intuition that:
+ // - If the device is in portrait mode, then the device's height is (likely)
+ // greater than its width. When this is the case, then:
+ // - The image's View object is likely using all available vertical area
+ // (but the image is bounded by the width of the device due to
+ // maintaining the scaling factor).
+ // - However, the height and width of the graphic are equal (because
+ // Android enforces this).
+ // - The width should be less than the height (this is a property of
+ // the image itself).
+ // - The width should be proportional to the imgHeight and imgWidth
+ // defined above.
+ // Adjust the height when the current width is less than the expected width.
+ // The width is the limiting-factor, therefore choose the height proportional
+ // to the current width.
+ //
+ // - The opposite is likely true when the device is in landscape mode with
+ // respect to the height and width. Adjust the width when the height is less
+ // than the expected height. The height is the limiting-factor, therefore
+ // choose the width proportional to the current height.
+ //
+ // Subtract 1 from the expected value as a way of accounting for rounding
+ // error.
+ if (currentWidth < (expectedWidth - 1)) {
+ newHeight = expectedHeight;
+ } else if (currentHeight < (expectedHeight - 1)) {
+ newWidth = expectedWidth;
+ }
+
+ Log.d(LOGTAG, "New height=" + newHeight);
+ Log.d(LOGTAG, "New width=" + newWidth);
+
+ // Define the padding as the available space between the current height (as it
+ // is displayed to the user) and the new height (as it was calculated above).
+ int verticalPadding = currentHeight - newHeight;
+ int sidePadding = currentWidth - newWidth;
+ int leftPadding = 0;
+ int topPadding = 0;
+ int bottomPadding = 0;
+ int rightPadding = 0;
+
+ // If the width of the image is greater than 600dp, then cap it at 702x600 (HxW).
+ // Furthermore, if the width is "near" 600dp (within 100dp), then decrease the
+ // dimensions to 468x400 dp. This should "look" better on lower-resolution
+ // devices.
+ final int MAXIMUM_WIDTH = 600;
+ final int distanceFromMaxWidth = newWidth - MAXIMUM_WIDTH;
+ final boolean isNearMaxWidth = Math.abs(distanceFromMaxWidth) < 100;
+ if ((newWidth > MAXIMUM_WIDTH) || isNearMaxWidth) {
+ if (isNearMaxWidth) {
+ // If newWidth is near MAX_WIDTH, then add additional padding (therefore
+ // decreasing the width by an additional 200dp).
+ sidePadding += 200;
+ }
+
+ final int paddingSpaceAvailable = (distanceFromMaxWidth > 0) ? distanceFromMaxWidth : 0;
+ sidePadding += paddingSpaceAvailable;
+
+ final int newWidthWithoutPadding = currentWidth - sidePadding;
+
+ final int newHeightWithoutPadding = (int) (newWidthWithoutPadding*imgHeight/imgWidth);
+
+ Log.d(LOGTAG, "New width without padding=" + newWidthWithoutPadding);
+ Log.d(LOGTAG, "New height without padding=" + newHeightWithoutPadding);
+
+ verticalPadding = currentHeight - newHeightWithoutPadding;
+ }
+
+ Log.d(LOGTAG, "New top padding=" + verticalPadding);
+ Log.d(LOGTAG, "New side padding=" + sidePadding);
+
+ if (verticalPadding < 0) {
+ Log.i(LOGTAG, "vertical padding is " + verticalPadding);
+ verticalPadding = 0;
+ } else {
+ // Place 4/5 of padding at top, and 1/5 of padding at bottom.
+ topPadding = (int) (verticalPadding*4)/5;
+ bottomPadding = (int) verticalPadding/5;
+ }
+
+ if (sidePadding < 0) {
+ Log.i(LOGTAG, "side padding is " + sidePadding);
+ leftPadding = 0;
+ rightPadding = 0;
+ } else {
+ // Divide the padding equally on the left and right side.
+ leftPadding = (int) sidePadding/2;
+ rightPadding = leftPadding;
+ }
+
+ // Create a padding-box around the image and let Android fill the box with
+ // the image. Android will scale the width and height independently, so the
+ // end result should be a correctly-sized graphic.
+ onionImg.setPadding(leftPadding, topPadding, rightPadding, bottomPadding);
+
+ // Separately scale x- and y-dimension.
+ onionImg.setScaleType(ImageView.ScaleType.FIT_XY);
+
+ // Invalidate the view because the image disappears (is not redrawn) sometimes when
+ // the screen is rotated.
+ onionImg.invalidate();
+ }
+
+ private class ViewTreeLayoutListener implements ViewTreeObserver.OnGlobalLayoutListener {
+ @Override
+ public void onGlobalLayout() {
+ TorBootstrapPanel.this.setOnionImgLayout();
+ }
+ }
+
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstance) {
mRoot = (ViewGroup) inflater.inflate(R.layout.tor_bootstrap, container, false);
@@ -121,6 +272,12 @@ public class TorBootstrapPanel extends FirstrunPanel implements TorBootstrapLogg
TorLogEventListener.addLogger(this);
+ // Add a callback for notification when the layout is complete and all components
+ // are measured. Waiting until the layout is complete is necessary before we correctly
+ // set the size of the onion. Cache the listener so we may remove it later.
+ mViewTreeLayoutListener = new ViewTreeLayoutListener();
+ mRoot.getViewTreeObserver().addOnGlobalLayoutListener(mViewTreeLayoutListener);
+
return mRoot;
}
@@ -193,6 +350,9 @@ public class TorBootstrapPanel extends FirstrunPanel implements TorBootstrapLogg
mOnionAlphaChangerRunning = false;
}
close();
+
+ // Remove the listener when we're done
+ mRoot.getViewTreeObserver().removeOnGlobalLayoutListener(mViewTreeLayoutListener);
}
}
@@ -281,9 +441,9 @@ public class TorBootstrapPanel extends FirstrunPanel implements TorBootstrapLogg
Log.i(LOGTAG, "mChangeOnionAlphaThread.getState(): is terminated");
mChangeOnionAlphaThread = null;
} else {
- // Don't null the reference in this case because then we'll start another
- // background thread. We are currently in an unknown state, simply set
- // the Running flag as false.
+ // The reference is not nulled in this case because another
+ // background thread would start otherwise. The thread is currently in
+ // an unknown state, simply set the Running flag as false.
Log.w(LOGTAG, "We're in an unexpected state. mChangeOnionAlphaThread.getState(): " + mChangeOnionAlphaThread.getState());
synchronized(mOnionAlphaChangerLock) {
@@ -302,7 +462,7 @@ public class TorBootstrapPanel extends FirstrunPanel implements TorBootstrapLogg
// Synchronization across threads should not be necessary because there
// shouldn't be any other threads relying on mOnionAlphaChangerRunning.
- // We do this purely for safety.
+ // Do this purely for safety.
synchronized(mOnionAlphaChangerLock) {
mOnionAlphaChangerRunning = true;
}
@@ -317,7 +477,7 @@ public class TorBootstrapPanel extends FirstrunPanel implements TorBootstrapLogg
Log.w(LOGTAG, "startBootstrapping: mRoot is null?");
return;
}
- // We're starting bootstrap, transition into the bootstrapping-tor-panel
+ // Start bootstrap process and transition into the bootstrapping-tor-panel
Button connectButton = mRoot.findViewById(R.id.tor_bootstrap_connect);
if (connectButton == null) {
Log.w(LOGTAG, "startBootstrapping: connectButton is null?");
@@ -326,17 +486,7 @@ public class TorBootstrapPanel extends FirstrunPanel implements TorBootstrapLogg
ImageView onionImg = (ImageView) mRoot.findViewById(R.id.tor_bootstrap_onion);
- // Replace the current non-animated image with the animation
- onionImg.setImageResource(R.drawable.tor_spinning_onion);
-
Drawable drawableOnion = onionImg.getDrawable();
- if (Build.VERSION.SDK_INT >= 23 && drawableOnion instanceof Animatable2) {
- Animatable2 spinningOnion = (Animatable2) drawableOnion;
- // Begin spinning
- spinningOnion.start();
- } else {
- Log.i(LOGTAG, "Animatable2 is not supported (or bad inheritance), version: " + Build.VERSION.SDK_INT);
- }
mOnionCurrentAlpha = 255;
// The onion should have 100% alpha, begin decreasing it.
@@ -388,27 +538,6 @@ public class TorBootstrapPanel extends FirstrunPanel implements TorBootstrapLogg
Drawable drawableOnion = onionImg.getDrawable();
- // If the connect button wasn't pressed previously, then this object is
- // not an animation (it is most likely a BitmapDrawable). Only manipulate
- // it when it is an Animatable2.
- if (Build.VERSION.SDK_INT >= 23 && drawableOnion instanceof Animatable2) {
- Animatable2 spinningOnion = (Animatable2) drawableOnion;
- // spinningOnion is null if we didn't previously call startBootstrapping.
- // If we reach here and spinningOnion is null, then there is likely a bug
- // because stopBootstrapping() is called only when the user selects the
- // gear button and we should only reach this block if the user pressed the
- // connect button (thus creating and enabling the animation) and then
- // pressing the gear button. Therefore, if the drawableOnion is an
- // Animatable2, then spinningOnion should be non-null.
- if (spinningOnion != null) {
- spinningOnion.stop();
-
- onionImg.setImageResource(R.drawable.tor_spinning_onion);
- }
- } else {
- Log.i(LOGTAG, "Animatable2 is not supported (or bad inheritance), version: " + Build.VERSION.SDK_INT);
- }
-
// Reset the onion's alpha value.
onionImg.setImageAlpha(255);
diff --git a/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java b/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java
index 9a8468292e7d..87ce1ec4bec6 100644
--- a/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java
+++ b/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java
@@ -342,7 +342,7 @@ public class TorPreferences extends AppCompatPreferenceActivity {
Log.i(LOGTAG, "disableBridges: bridgesProvide is not null");
pref = bridgesProvide;
} else {
- Log.w(LOGTAG, "disableBridges: all the expected preferences are is null?");
+ Log.w(LOGTAG, "disableBridges: all of the expected preferences are null?");
return;
}
@@ -396,7 +396,7 @@ public class TorPreferences extends AppCompatPreferenceActivity {
// such that it is synchronized with the widget.
final SwitchPreference bridgesEnabled = (SwitchPreference) TorNetworkBridgesEnabledPreference.this.findPreference(PREFS_BRIDGES_ENABLED);
if (bridgesEnabled == null) {
- Log.w(LOGTAG, "onCreate: bridgesEnabled is null?");
+ Log.w(LOGTAG, "onClick: bridgesEnabled is null?");
return;
}
@@ -422,11 +422,10 @@ public class TorPreferences extends AppCompatPreferenceActivity {
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
- setTitle(R.string.pref_tor_network_title);
final SwitchPreference bridgesEnabled = (SwitchPreference) findPreference(PREFS_BRIDGES_ENABLED);
if (bridgesEnabled == null) {
- Log.w(LOGTAG, "onCreate: bridgesEnabled is null?");
+ Log.w(LOGTAG, "onViewCreated: bridgesEnabled is null?");
return;
}
@@ -927,9 +926,9 @@ public class TorPreferences extends AppCompatPreferenceActivity {
}
if (bridgesLine2 != null) {
- // If bridgesLine1 was not null, then append a newline.
Log.i(LOGTAG, "bridgesLine2 is not null.");
if (bridgesLines != null) {
+ // If bridgesLine1 was not null, then append a newline.
bridgesLines += "\n" + bridgesLine2;
} else {
bridgesLines = bridgesLine2;
@@ -937,9 +936,9 @@ public class TorPreferences extends AppCompatPreferenceActivity {
}
if (bridgesLine3 != null) {
- // If bridgesLine1 was not null, then append a newline.
Log.i(LOGTAG, "bridgesLine3 is not null.");
if (bridgesLines != null) {
+ // If bridgesLine1 or bridgesLine2 were not null, then append a newline.
bridgesLines += "\n" + bridgesLine3;
} else {
bridgesLines = bridgesLine3;
@@ -954,11 +953,11 @@ public class TorPreferences extends AppCompatPreferenceActivity {
}
if (bridgesLines == null) {
- Log.i(LOGTAG, "provideBridge is empty. Disabling.");
// If provided bridges are null/empty, then only disable all bridges if
// the user did not select a built-in bridge
String configuredBuiltinBridges = getBridges(bridgesProvide.getSharedPreferences(), PREFS_BRIDGES_TYPE);
if (configuredBuiltinBridges == null) {
+ Log.i(LOGTAG, "Custom bridges are empty. Disabling.");
disableBridges(this);
}
return;
1
0

[tor-browser/tor-browser-60.6.1esr-8.5-1] fixup! Bug 28329 - Part 4. Add new Tor Bootstrapping and configuration screens
by gk@torproject.org 11 Apr '19
by gk@torproject.org 11 Apr '19
11 Apr '19
commit fd7cccb3f4a908ff38edfefc36b194666c886f69
Author: Matthew Finkel <Matthew.Finkel(a)gmail.com>
Date: Tue Apr 2 20:59:30 2019 +0000
fixup! Bug 28329 - Part 4. Add new Tor Bootstrapping and configuration screens
Bug 29982 - Adding additional safe guards
---
.../mozilla/gecko/torbootstrap/TorPreferences.java | 42 +++++++++++++++++-----
1 file changed, 34 insertions(+), 8 deletions(-)
diff --git a/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java b/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java
index 32a3bed3e685..9a8468292e7d 100644
--- a/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java
+++ b/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java
@@ -15,6 +15,7 @@ import android.preference.Preference;
import android.preference.PreferenceFragment;
import android.preference.PreferenceScreen;
import android.preference.SwitchPreference;
+import android.support.v7.app.ActionBar;
import android.text.style.ClickableSpan;
import android.text.SpannableString;
import android.text.Spanned;
@@ -138,7 +139,9 @@ public class TorPreferences extends AppCompatPreferenceActivity {
// Save the current preference when the app is minimized or swiped away.
@Override
public void onStop() {
- mFrag.onSaveState();
+ if (mFrag != null) {
+ mFrag.onSaveState();
+ }
super.onStop();
}
@@ -163,7 +166,9 @@ public class TorPreferences extends AppCompatPreferenceActivity {
// the back button
@Override
public void onBackPressed() {
- mFrag.onSaveState();
+ if (mFrag != null) {
+ mFrag.onSaveState();
+ }
super.onBackPressed();
}
@@ -200,7 +205,7 @@ public class TorPreferences extends AppCompatPreferenceActivity {
// https://android.googlesource.com/platform/frameworks/base/+/6af15ebcfec64d0…
@Override
public boolean onOptionsItemSelected(MenuItem item) {
- if (item.getItemId() == android.R.id.home) {
+ if (item != null && item.getItemId() == android.R.id.home) {
Log.i(LOGTAG, "onOptionsItemSelected(): Home");
onNavigateUp();
return true;
@@ -214,8 +219,8 @@ public class TorPreferences extends AppCompatPreferenceActivity {
protected TorPreferences mTorPrefAct;
@Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
+ public void onActivityCreated(Bundle savedInstanceState) {
+ super.onActivityCreated(savedInstanceState);
// This is only ever a TorPreferences
mTorPrefAct = (TorPreferences) getActivity();
@@ -317,6 +322,11 @@ public class TorPreferences extends AppCompatPreferenceActivity {
// Disable the bridges.enabled Preference
protected void disableBridges(PreferenceFragment frag) {
+ if (frag == null) {
+ Log.w(LOGTAG, "disableBridges: frag is null");
+ return;
+ }
+
SwitchPreference bridgesEnabled = (SwitchPreference) frag.findPreference(PREFS_BRIDGES_ENABLED);
Preference bridgesType = frag.findPreference(PREFS_BRIDGES_TYPE);
Preference bridgesProvide = frag.findPreference(PREFS_BRIDGES_PROVIDE);
@@ -349,7 +359,14 @@ public class TorPreferences extends AppCompatPreferenceActivity {
// Set the current title
protected void setTitle(int resId) {
- mTorPrefAct.getSupportActionBar().setTitle(resId);
+ ActionBar actionBar = mTorPrefAct.getSupportActionBar();
+
+ if (actionBar == null) {
+ Log.w(LOGTAG, "setTitle: actionBar is null");
+ return;
+ }
+
+ actionBar.setTitle(resId);
}
}
@@ -446,6 +463,8 @@ public class TorPreferences extends AppCompatPreferenceActivity {
public void onChildViewAdded(View parent, View child) {
Log.i(LOGTAG, "onChildViewAdded: Adding ListView child view");
+ setTitle(R.string.pref_tor_network_title);
+
// Make sure the Switch widget is synchronized with the preference
final Switch bridgesEnabledSwitch =
(Switch) parent.findViewById(android.R.id.switch_widget);
@@ -541,6 +560,11 @@ public class TorPreferences extends AppCompatPreferenceActivity {
// If PREFS_BRIDGES_PROVIDE is not null, then true
// Else false
private boolean isBridgeProvided(SwitchPreference bridgesEnabled) {
+ if (bridgesEnabled == null) {
+ Log.i(LOGTAG, "isBridgeProvided: bridgesEnabled is null");
+ return false;
+ }
+
if (!bridgesEnabled.isChecked()) {
Log.i(LOGTAG, "isBridgeProvided: bridgesEnabled is not checked");
return false;
@@ -572,7 +596,6 @@ public class TorPreferences extends AppCompatPreferenceActivity {
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
- setTitle(R.string.pref_tor_select_a_bridge_title);
ListView lv = getListView(view);
if (lv == null) {
@@ -585,6 +608,8 @@ public class TorPreferences extends AppCompatPreferenceActivity {
@Override
public void onChildViewAdded(View parent, View child) {
+ setTitle(R.string.pref_tor_select_a_bridge_title);
+
// Set the previously chosen RadioButton as checked
final RadioGroup group = getBridgeTypeRadioGroup();
if (group == null) {
@@ -828,7 +853,6 @@ public class TorPreferences extends AppCompatPreferenceActivity {
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
- setTitle(R.string.pref_tor_provide_a_bridge_title);
ListView lv = getListView(view);
if (lv == null) {
Log.i(LOGTAG, "onViewCreated: ListView not found");
@@ -847,6 +871,8 @@ public class TorPreferences extends AppCompatPreferenceActivity {
lv.setOnHierarchyChangeListener(new ViewGroup.OnHierarchyChangeListener() {
@Override
public void onChildViewAdded(View parent, View child) {
+ setTitle(R.string.pref_tor_provide_a_bridge_title);
+
// If we have a bridge line saved for this pref,
// then show the user
setBridgeProvideText(parent);
1
0

[tor-browser/tor-browser-60.6.1esr-8.5-1] fixup! Bug 28329 - Part 4. Add new Tor Bootstrapping and configuration screens
by gk@torproject.org 11 Apr '19
by gk@torproject.org 11 Apr '19
11 Apr '19
commit d3ea3528ce2cde0675d297ea934090c77f4b5f76
Author: Matthew Finkel <Matthew.Finkel(a)gmail.com>
Date: Mon Apr 1 21:39:53 2019 +0000
fixup! Bug 28329 - Part 4. Add new Tor Bootstrapping and configuration screens
Bug 29906 Add API-level guard
---
.../org/mozilla/gecko/torbootstrap/TorBootstrapPanel.java | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorBootstrapPanel.java b/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorBootstrapPanel.java
index 584c0fc3cdde..8d42b13a2a8e 100644
--- a/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorBootstrapPanel.java
+++ b/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorBootstrapPanel.java
@@ -106,11 +106,16 @@ public class TorBootstrapPanel extends FirstrunPanel implements TorBootstrapLogg
}
});
- // This should be declared in the xml layout, however there is a bug
- // preventing this (the XML attribute isn't actually defined in the
- // SDK).
- // https://issuetracker.google.com/issues/37036728
- connectButton.setClipToOutline(true);
+ if (Build.VERSION.SDK_INT > 20) {
+ // Round the button's edges, but only on API 21+. Earlier versions
+ // do not support this.
+ //
+ // This should be declared in the xml layout, however there is a bug
+ // preventing this (the XML attribute isn't actually defined in the
+ // SDK).
+ // https://issuetracker.google.com/issues/37036728
+ connectButton.setClipToOutline(true);
+ }
configureGearCogClickHandler();
1
0

[translation/tba-torbrowserstringsdtd] Update translations for tba-torbrowserstringsdtd
by translation@torproject.org 11 Apr '19
by translation@torproject.org 11 Apr '19
11 Apr '19
commit 02a24cc47b9e55b54a3ffb9178e082a246dee973
Author: Translation commit bot <translation(a)torproject.org>
Date: Thu Apr 11 07:47:42 2019 +0000
Update translations for tba-torbrowserstringsdtd
---
sk/torbrowser_strings.dtd | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/sk/torbrowser_strings.dtd b/sk/torbrowser_strings.dtd
index 4ddf27da3..d3e7916f9 100644
--- a/sk/torbrowser_strings.dtd
+++ b/sk/torbrowser_strings.dtd
@@ -24,22 +24,22 @@
<!ENTITY firstrun_onionservices_message "Služby Onion sú stránky, ktoré končia koncovkou .onion a poskytujú extra ochranu svojim vydavateľom a návštevníkom, vrátane zabudovaných bezpečnostných prvkov týkajúcich sa cenzúry. Služby Onion umožňujú komukoľvek poskytovať obsah a služby anonymne.">
<!ENTITY firstrun_onionservices_next "Začnite s objavovaním">
-<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_swipe_for_logs "Potiahnite doľava na zobrazenie Tor záznamov">
<!ENTITY tor_bootstrap_connect "Pripojiť">
-<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+<!ENTITY tor_bootstrap_starting_status "Pripájame sa na Tor sieť...">
<!ENTITY pref_tor_network_title "Sieť">
-<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
-<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+<!ENTITY pref_tor_select_a_bridge_title "Zvoľte Premostenie">
+<!ENTITY pref_tor_provide_a_bridge_title "Pridať Premostenie">
<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
-<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
-<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet tu je cenzúrovaný">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Ťuknite na konfiguráciu premostenia pre pripojenie do siete Tor">
-<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
-<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Poskytnúť mauálne známe premostenie.">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Zvoľte Premostenie">
<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "adresa:port">
1
0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation@torproject.org 11 Apr '19
by translation@torproject.org 11 Apr '19
11 Apr '19
commit a9f5cad518b52479d7e6ba39b0fba363ec660add
Author: Translation commit bot <translation(a)torproject.org>
Date: Thu Apr 11 07:46:40 2019 +0000
Update translations for tails-misc_completed
---
sk.po | 897 ++++++++++++++++++++++++++++++++++++++++++------------------------
1 file changed, 569 insertions(+), 328 deletions(-)
diff --git a/sk.po b/sk.po
index ae8b6d73c..fa17fbd90 100644
--- a/sk.po
+++ b/sk.po
@@ -5,32 +5,33 @@
# Translators:
# elo, 2014
# FooBar <thewired(a)riseup.net>, 2015
+# Marek Čápek <capek.marek(a)gmail.com>, 2019
# Michal Slovák <michalslovak2(a)hotmail.com>, 2013
# Roman 'Kaktuxista' Benji <romanbeno273(a)gmail.com>, 2014
# Stanislav Tomáš <stanislav.tomas(a)hotmail.sk>, 2015
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-05 22:32+0200\n"
-"PO-Revision-Date: 2015-08-04 20:56+0000\n"
-"Last-Translator: Stanislav Tomáš <stanislav.tomas(a)hotmail.sk>\n"
+"POT-Creation-Date: 2019-04-06 14:00+0200\n"
+"PO-Revision-Date: 2019-04-11 07:43+0000\n"
+"Last-Translator: Marek Čápek <capek.marek(a)gmail.com>\n"
"Language-Team: Slovak (http://www.transifex.com/otf/torproject/language/sk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: sk\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n"
-#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:43
+#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:39
msgid "Tor is ready"
msgstr "Tor je pripravený"
-#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:44
+#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:40
msgid "You can now access the Internet."
msgstr "Teraz môžete pristupovať k Internetu."
-#: config/chroot_local-includes/etc/whisperback/config.py:64
+#: config/chroot_local-includes/etc/whisperback/config.py:69
#, python-format
msgid ""
"<h1>Help us fix your bug!</h1>\n"
@@ -47,308 +48,397 @@ msgid ""
"</p>\n"
msgstr "<h1>Pomôžte nám opraviť vašu chybu!</h1>\n<p>Čítajte <a href=\"%s\">naše inštrukcie pre nahlásenie chyby</a>.</p>\n<p><strong>Nevkladajte viac osobných údajov ako je\nnevyhnutné!</strong></p>\n<h2>O poskytovaní emailovej adresy nám</h2>\n<p>\nPoskytnutie emailovej adresy nám umožňuje kontaktovať vás aby sme objasnili problém. Toto\nje potrebné pre obrovské množstvo, väčšina \nhlásení, ktoré dostávame, pričom najviac bez akýchkoľvek kontaktných údajov, je nepoužiteľná. Na druhej strane to taktiež poskytuje\npríležitosť špehom, ako vášmu emailovému či internetovému poskytovateľovi,\nsi potvrdiť, že\npoužívate Tails.\n</p>\n"
-#: config/chroot_local-includes/usr/local/bin/electrum:14
+#: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:51
+msgid ""
+"You can install additional software automatically from your persistent "
+"storage when starting Tails."
+msgstr "Môžete inštalovať doplnkový softvér automaticky z Vášho Trvalého úložiska keď Tails naštartuje."
+
+#: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:77
+msgid ""
+"The following software is installed automatically from your persistent "
+"storage when starting Tails."
+msgstr "Nasledujúci softvér bude automaticky nainštalovaný z Vášho Trvalého úložiska keď Tails naštartuje."
+
+#: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:135
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:173
+msgid ""
+"To add more, install some software using <a "
+"href=\"synaptic.desktop\">Synaptic Package Manager</a> or <a "
+"href=\"org.gnome.Terminal.desktop\">APT on the command line</a>."
+msgstr "Ak chcete pridať viac, nainštalujte ďalší softvér pomocou <a href=\"synaptic.desktop\">Správcu baličkov Synaptic</a> alebo <a href=\"org.gnome.Terminal.desktop\">APT v príkazovom riadku</a>."
+
+#: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:154
+msgid "_Create persistent storage"
+msgstr "_Vytvoriť Trvalé úložisko"
+
+#: config/chroot_local-includes/usr/local/bin/electrum:57
msgid "Persistence is disabled for Electrum"
msgstr "Zotrvačnosť je pre Electrum vypnutá"
-#: config/chroot_local-includes/usr/local/bin/electrum:16
+#: config/chroot_local-includes/usr/local/bin/electrum:59
msgid ""
"When you reboot Tails, all of Electrum's data will be lost, including your "
"Bitcoin wallet. It is strongly recommended to only run Electrum when its "
"persistence feature is activated."
msgstr "Keď reštartujete Tails všetky údaje z Electrum-u budú stratené, vrátane vašej Bitcoin-ovej peňaženky. Je preto hlboko odporúčané spúšťať Electrum vtedy keď je funkcia zotrvačnosti aktivovaná."
-#: config/chroot_local-includes/usr/local/bin/electrum:18
+#: config/chroot_local-includes/usr/local/bin/electrum:60
msgid "Do you want to start Electrum anyway?"
msgstr "Chcete spustiť napriek tomu Electrum?"
-#: config/chroot_local-includes/usr/local/bin/electrum:20
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:36
+#: config/chroot_local-includes/usr/local/bin/electrum:63
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "_Spustiť"
-#: config/chroot_local-includes/usr/local/bin/electrum:21
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/bin/electrum:64
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "_Ukončiť"
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:136
-msgid "OpenPGP encryption applet"
-msgstr "OpenPGP šifrovací aplet"
-
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:139
-msgid "Exit"
-msgstr "Ukončiť"
-
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:141
-msgid "About"
-msgstr "O aplikácií"
-
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:192
-msgid "Encrypt Clipboard with _Passphrase"
-msgstr "Šifrovať schránku s _prístupovým heslom"
-
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:195
-msgid "Sign/Encrypt Clipboard with Public _Keys"
-msgstr "Prihlásiť/Šifrovať schránku s verejnými _kľúčmi"
-
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:200
-msgid "_Decrypt/Verify Clipboard"
-msgstr "_Dešifrovať/Overiť schránku"
-
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:204
-msgid "_Manage Keys"
-msgstr "_manažovať kľúče"
-
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:208
-msgid "_Open Text Editor"
-msgstr "_Otvoriť textový editor"
-
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:252
-msgid "The clipboard does not contain valid input data."
-msgstr "Schránka neobsahuje platné vstupné dáta."
-
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:303
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:305
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:307
-msgid "Unknown Trust"
-msgstr "Neznáma dôvera"
-
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:309
-msgid "Marginal Trust"
-msgstr "Okrajová dôvera"
+#: config/chroot_local-includes/usr/local/bin/keepassx:17
+#, sh-format
+msgid ""
+"<b><big>Do you want to rename your <i>KeePassX</i> database?</big></b>\n"
+"\n"
+"You have a <i>KeePassX</i> database in your <i>Persistent</i> folder:\n"
+"\n"
+"<i>${filename}</i>\n"
+"\n"
+"Renaming it to <i>keepassx.kdbx</i> would allow <i>KeePassX</i> to open it automatically in the future."
+msgstr "<b><big>Chcete premenovať vašu <i>KeePassX</i> databázu?</big>\n</b>\n\nMáte <i>KeePassX</i> databázu v <i>Trvalom</i> adresári:\n\n<i>${názovsúboru}</i>\n\nPremenovaním na <i>keepaasx.kdbx</i> dovolí aplikácii <i>KeePassX</i> jej automatické otvorenie v budúcnosti."
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:311
-msgid "Full Trust"
-msgstr "Plná dôvera"
+#: config/chroot_local-includes/usr/local/bin/keepassx:25
+msgid "Rename"
+msgstr "Premenovať"
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:313
-msgid "Ultimate Trust"
-msgstr "Maximálna dôvera"
+#: config/chroot_local-includes/usr/local/bin/keepassx:26
+msgid "Keep current name"
+msgstr "Ponechať aktuálny názov"
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:366
-msgid "Name"
-msgstr "Meno"
+#: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:21
+msgid "su is disabled. Please use sudo instead."
+msgstr "su je vypnutý. Prosím použite namiesto toho sudo"
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:367
-msgid "Key ID"
-msgstr "ID kľúča"
+#: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:75
+msgid "Lock screen"
+msgstr "Zamknúť obrazovku"
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:368
-msgid "Status"
-msgstr "Stav"
+#: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:79
+msgid "Suspend"
+msgstr "Uspať"
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:400
-msgid "Fingerprint:"
-msgstr "Odtlačok:"
+#: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:83
+msgid "Restart"
+msgstr "Reštart"
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:403
-msgid "User ID:"
-msgid_plural "User IDs:"
-msgstr[0] "ID užívateľa"
-msgstr[1] "ID užívateľov:"
-msgstr[2] "ID užívateľov:"
+#: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:87
+msgid "Power Off"
+msgstr "Vypnúť"
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:433
-msgid "None (Don't sign)"
-msgstr "Žiadne (nepodpisovať)"
+#: config/chroot_local-includes/usr/local/bin/tails-about:22
+#: ../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:1
+msgid "Tails"
+msgstr "Tails"
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:496
-msgid "Select recipients:"
-msgstr "Zvoľte si príjemcov:"
+#: config/chroot_local-includes/usr/local/bin/tails-about:25
+#: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:1
+msgid "About Tails"
+msgstr "O Tails"
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:504
-msgid "Hide recipients"
-msgstr "Skryť príjemcov"
+#: config/chroot_local-includes/usr/local/bin/tails-about:35
+msgid "The Amnesic Incognito Live System"
+msgstr "Amnesic Incognito Live System"
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:507
+#: config/chroot_local-includes/usr/local/bin/tails-about:36
+#, python-format
msgid ""
-"Hide the user IDs of all recipients of an encrypted message. Otherwise "
-"anyone that sees the encrypted message can see who the recipients are."
-msgstr "Skryť uživateľské ID všetkých príjemcov šifrovanej správy. V opačnom prípade každý, kto túto správu zazrie, bude schopný odhaliť ich identitu."
-
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:513
-msgid "Sign message as:"
-msgstr "Podpísať správu ako:"
-
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:517
-msgid "Choose keys"
-msgstr "Zvoľte si kľúče"
+"Build information:\n"
+"%s"
+msgstr "Informácie o builde:\n%s"
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:557
-msgid "Do you trust these keys?"
-msgstr "Dôverujete týmto kľúčom?"
+#: config/chroot_local-includes/usr/local/bin/tails-about:54
+msgid "not available"
+msgstr "nie je dostupný"
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:560
-msgid "The following selected key is not fully trusted:"
-msgid_plural "The following selected keys are not fully trusted:"
-msgstr[0] "Nasledujúci zvolený kľúč nie je plne dôveryhodný:"
-msgstr[1] "Nasledujúce zvolené kľúče nie sú plne dôveryhodne:"
-msgstr[2] "Nasledujúce zvolené kľúče nie sú plne dôveryhodne:"
-
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:578
-msgid "Do you trust this key enough to use it anyway?"
-msgid_plural "Do you trust these keys enough to use them anyway?"
-msgstr[0] "Napriek tomu dôverujete tomuto kľúču tak, že ho hodláte použiť?"
-msgstr[1] "Napriek tomu dôverujete týmto kľúčom tak, že ich hodláte použiť?"
-msgstr[2] "Napriek tomu dôverujete týmto kľúčom tak, že ich hodláte použiť?"
-
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:591
-msgid "No keys selected"
-msgstr "Neboli zvolené žiadne kľúče"
-
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:593
+#. Translators: Don't translate {details}, it's a placeholder and will
+#. be replaced.
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:150
+#, python-brace-format
msgid ""
-"You must select a private key to sign the message, or some public keys to "
-"encrypt the message, or both."
-msgstr "Na podpísanie správy si musíte zvoliť súkromný kľúč alebo nejaké verejné kľúče pre jej zašifrovanie, prípadne oboje."
+"{details} Please check your list of additional software or read the system "
+"log to understand the problem."
+msgstr "{details} Prosím preverte zoznam doplnkového softvéru alebo prečítajte log systému na porozumenie problému."
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:621
-msgid "No keys available"
-msgstr "Nie sú dostupné žiadne kľúče."
-
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:623
-msgid ""
-"You need a private key to sign messages or a public key to encrypt messages."
-msgstr "Potrebujete súkromný kľúč na podpísanie správ alebo verejný kľúč na ich šifrovanie."
-
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:751
-msgid "GnuPG error"
-msgstr "GnuPG chyba"
-
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:772
-msgid "Therefore the operation cannot be performed."
-msgstr "Operácia teda nemohla byť vykonaná."
-
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:822
-msgid "GnuPG results"
-msgstr "GnuPG výsledky"
-
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:828
-msgid "Output of GnuPG:"
-msgstr "Výstup GnuPG:"
-
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:853
-msgid "Other messages provided by GnuPG:"
-msgstr "Ostatné správy poskytnuté GnuPG:"
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:155
+msgid ""
+"Please check your list of additional software or read the system log to "
+"understand the problem."
+msgstr "Prosím preverte zoznam doplnkového softvéru alebo prečítajte log systému na porozumenie problému."
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:159
+msgid "Show Log"
+msgstr "Zobraziť Log"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:159
+msgid "Configure"
+msgstr "Konfigurácia"
+
+#. Translators: Don't translate {beginning} or {last}, they are
+#. placeholders and will be replaced.
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:225
+#, python-brace-format
+msgid "{beginning} and {last}"
+msgstr "{žačiatok} and {posledné}"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:226
+msgid ", "
+msgstr ","
+
+#. Translators: Don't translate {packages}, it's a placeholder and will
+#. be replaced.
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:292
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:322
+#, python-brace-format
+msgid "Add {packages} to your additional software?"
+msgstr "Pridať {balíky} medzi Váš dodatočný softvér?"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:294
+msgid ""
+"To install it automatically from your persistent storage when starting "
+"Tails."
+msgstr "Nasledujúci softvér bude automaticky nainštalovaný z Vášho Trvalého úložiska keď Tails naštartuje."
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:296
+msgid "Install Every Time"
+msgstr "Inštalovať vždy pri spustení"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:297
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:328
+msgid "Install Only Once"
+msgstr "Inštalovať iba raz"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:303
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:333
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:374
+msgid "The configuration of your additional software failed."
+msgstr "Konfigurácia Vašeho dodatočnéhu softvéru zlyhala."
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:324
+msgid ""
+"To install it automatically when starting Tails, you can create a persistent"
+" storage and activate the <b>Additional Software</b> feature."
+msgstr "Na automatickú inštaláciu keď sa spúšťa Tails, musíte vytvoriť Trvalé úložisko a aktivovať funkciu <b>Doplnkový softvér</b>."
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:327
+msgid "Create Persistent Storage"
+msgstr "Vytvoriť Trvalé úložisko"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:335
+msgid "Creating your persistent storage failed."
+msgstr "Vytvorenie Trvalého úložiska zlyhalo."
+
+#. Translators: Don't translate {packages}, it's a placeholder and
+#. will be replaced.
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:344
+#, python-brace-format
+msgid "You could install {packages} automatically when starting Tails"
+msgstr "Mohli by ste inštalovať {balíčky} automaticky keď Tails naštartuje"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:347
+msgid ""
+"To do so, you need to run Tails from a USB stick installed using <i>Tails "
+"Installer</i>."
+msgstr "Na vykonanie, musíte spustiť Tails z USB kľúča, nainštalovaného pomocou <i>Tails Inštalátora</i>."
+
+#. Translators: Don't translate {packages}, it's a placeholder and will be
+#. replaced.
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:362
+#, python-brace-format
+msgid "Remove {packages} from your additional software?"
+msgstr "Odstrániť {baíky} z Vášho doplnkového softvéru?"
+
+#. Translators: Don't translate {packages}, it's a placeholder
+#. and will be replaced.
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
+#, python-brace-format
+msgid "This will stop installing {packages} automatically."
+msgstr "Týmto prestanú byť {balíky} automaticky nainštalované."
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:368
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:156
+msgid "Remove"
+msgstr "Odstrániť"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:369
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "Zrušiť"
-#: config/chroot_local-includes/usr/local/lib/shutdown-helper-applet:39
-msgid "Shutdown Immediately"
-msgstr "Okamžite vypnúť"
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:547
+msgid "Installing your additional software from persistent storage..."
+msgstr "Inštaluje sa Váš doplnkový softvér z Trvalého úložiska..."
-#: config/chroot_local-includes/usr/local/lib/shutdown-helper-applet:40
-msgid "Reboot Immediately"
-msgstr "Okamžite rebootovať"
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:549
+msgid "This can take several minutes."
+msgstr "Môže to trvať niekoľko minút."
-#: config/chroot_local-includes/usr/local/bin/tails-about:16
-msgid "not available"
-msgstr "nie je dostupný"
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:562
+msgid "The installation of your additional software failed"
+msgstr "Inštalácia Vášho doplnkového softvéru zlyhala."
-#: config/chroot_local-includes/usr/local/bin/tails-about:19
-#: ../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:1
-msgid "Tails"
-msgstr "Tails"
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:577
+msgid "Additional software installed successfully"
+msgstr "Doplnkový softvér bol úspešne nainštalovaný."
-#: config/chroot_local-includes/usr/local/bin/tails-about:24
-msgid "The Amnesic Incognito Live System"
-msgstr "Amnesic Incognito Live System"
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:597
+msgid "The check for upgrades of your additional software failed"
+msgstr "Overenie aktualizácií Vášho doplnkového softvéru zlyhalo."
-#: config/chroot_local-includes/usr/local/bin/tails-about:25
-#, python-format
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:599
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:607
msgid ""
-"Build information:\n"
-"%s"
-msgstr "Informácie o builde:\n%s"
+"Please check your network connection, restart Tails, or read the system log "
+"to understand the problem."
+msgstr "Prosím preverte vaše sieťové pripojenie, reštartujete Tails alebo prečítajte systémový záznam pre porozumenie problému."
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:606
+msgid "The upgrade of your additional software failed"
+msgstr "Aktualizácia Vášho doplnkového softvéru zlyhala."
+
+#: config/chroot_local-includes/usr/local/lib/tails-additional-software-notify:39
+msgid "Documentation"
+msgstr "Dokumentácia"
+
+#. Translators: Don't translate {package}, it's a placeholder and will be
+#. replaced.
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:96
+#, python-brace-format
+msgid ""
+"Remove {package} from your additional software? This will stop installing "
+"the package automatically."
+msgstr "Odstrániť {balík} z Vášho doplnkového softvéru? Týmto bude automatická inštalácia balíku zastavená."
+
+#. Translators: Don't translate {pkg}, it's a placeholder and will be
+#. replaced.
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:107
+#, python-brace-format
+msgid "Failed to remove {pkg}"
+msgstr "Odtránenie {pkg} zlyhalo"
+
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:124
+msgid "Failed to read additional software configuration"
+msgstr "Načítanie konfigurácie doplnkového softvéru zlyhalo"
+
+#. Translators: Don't translate {package}, it's a placeholder and will be
+#. replaced.
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:154
+#, python-brace-format
+msgid "Stop installing {package} automatically"
+msgstr "Zastaviť automatickú inštaláciu {package}"
+
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:180
+msgid ""
+"To do so, install some software using <a href=\"synaptic.desktop\">Synaptic "
+"Package Manager</a> or <a href=\"org.gnome.Terminal.desktop\">APT on the "
+"command line</a>."
+msgstr "Ak chcete pridať viac, inštalujte ďalší softvér pomocou <a href=\"synaptic.desktop\">Správcu baličkov Synaptic</a> alebo <a href=\"org.gnome.Terminal.desktop\">APT v príkazovom riadku</a>."
-#: config/chroot_local-includes/usr/local/bin/tails-about:27
-#: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:1
-msgid "About Tails"
-msgstr "O Tails"
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:189
+msgid ""
+"To do so, unlock your persistent storage when starting Tails and install "
+"some software using <a href=\"synaptic.desktop\">Synaptic Package "
+"Manager</a> or <a href=\"org.gnome.Terminal.desktop\">APT on the command "
+"line</a>."
+msgstr "Ak chcete pridať viac, odomknite Trvalé úložisko keď sa spustí Tails a inštalujte ďalší softvér pomocou <a href=\"synaptic.desktop\">Správcu baličkov Synaptic</a> alebo <a href=\"org.gnome.Terminal.desktop\">APT v príkazovom riadku</a>."
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:118
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:124
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:128
-msgid "Your additional software"
-msgstr "Váš dodatočný softvér"
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:199
+msgid ""
+"To do so, create a persistent storage and install some software using <a "
+"href=\"synaptic.desktop\">Synaptic Package Manager</a> or <a "
+"href=\"org.gnome.Terminal.desktop\">APT on the command line</a>."
+msgstr "Ak chcete pridať viac, vytvorte Trvalé úložisko a inštalujte ďalší softvér pomocou <a href=\"synaptic.desktop\">Správcu baličkov Synaptic</a> alebo <a href=\"org.gnome.Terminal.desktop\">APT v príkazovom riadku</a>."
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:119
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:129
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:207
msgid ""
-"The upgrade failed. This might be due to a network problem. Please check "
-"your network connection, try to restart Tails, or read the system log to "
-"understand better the problem."
-msgstr "Aktualizácia zlyhala. Môže to byť spôsobené problémom siete. Prosíme skontrolujte si vaše sieťové pripojenie, pokúste sa reštartovať Tails, alebo si prečítajte systémový log za účelom lepšieho porozumenia problému."
+"To do so, install Tails on a USB stick using <a href=\"tails-"
+"installer.desktop\">Tails Installer</a> and create a persistent storage."
+msgstr "Ak tak chcete, nainštalujte Tails na USB kľúč použitím <a href=\"tails-installer.desktop\">Tails Inštalátora</a> a vytvorte Trvalé úložisko."
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125
-msgid "The upgrade was successful."
-msgstr "Aktualizácia prebehla úspešne."
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:254
+msgid "[package not available]"
+msgstr "[balíček nedostupný]"
-#: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:52
+#: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:52
msgid "Synchronizing the system's clock"
msgstr "Synchronizácia systémových hodín"
-#: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:53
+#: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:53
msgid ""
"Tor needs an accurate clock to work properly, especially for Hidden "
"Services. Please wait..."
msgstr "Tor vyžaduje presné hodiny pre korektné fungovanie, obzvlášť pre Hidden Services. Prosíme počkajte..."
-#: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:87
+#: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:87
msgid "Failed to synchronize the clock!"
msgstr "Synchronizácia hodín zlyhala!"
-#: config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector:38
-msgid "Network connection blocked?"
-msgstr "Sieťové pripojenie blokované?"
-
-#: config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector:40
-msgid ""
-"It looks like you are blocked from the network. This may be related to the "
-"MAC spoofing feature. For more information, see the <a "
-"href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html#blocked\\\">MAC"
-" spoofing documentation</a>."
-msgstr "Vyzerá to, že máte zablokovaný prístup k sieti. To môže súvisieť s funkciou MAC spoofing. Pre viac informácii si pozrite <a href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html#blocked\\\">MAC spoofing dokumentáciu </a>."
-
-#: config/chroot_local-includes/usr/local/bin/tails-security-check:151
+#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Táto verzia Tails má známe bezpečnostné problémy:"
-#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:37
+#: config/chroot_local-includes/usr/local/bin/tails-security-check:134
+msgid "Known security issues"
+msgstr "Známe bezpečnostné hrozby"
+
+#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:52
#, sh-format
msgid "Network card ${nic} disabled"
msgstr "Sieťová karta ${nic} vypnutá"
-#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:38
+#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:53
#, sh-format
msgid ""
"MAC spoofing failed for network card ${nic_name} (${nic}) so it is temporarily disabled.\n"
-"You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>."
-msgstr "MAC spoofing zlyhal pre sieťovú kartu ${nic_name} (${nic}), takže je dočasne vypnutá.\nMožno by ste si radšej reštartovali Tails a vypli MAC spoofing. Pozrite si <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>dokumentáciu</a>."
+"You might prefer to restart Tails and disable MAC spoofing."
+msgstr "Predstieranie MAC adresy - MAC spoofing zlyhalo pre sieťovú kartu ${nic_name} (${nic}) , takže je dočasne neaktívna.\nMožno by ste mali dať prednosť reštartovaniu Tails a vypnúť predstieranie MAC adresy."
-#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:47
+#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:62
msgid "All networking disabled"
msgstr "Všetky sieťové funkcie vypnuté"
-#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:48
+#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:63
#, sh-format
msgid ""
"MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n"
-"You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>."
-msgstr "MAC spoofing zlyhal pre sieťovú kartu ${nic_name} (${nic}). Obnova chýb taktiež zlyhala, čo má za následok vypnutie všetkých sieťových funkcii. \nMožno by ste si radšej reštartovali Tails a vypli MAC spoofing. Pozrite si <a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en.html'>dokumentáciu</a>."
+"You might prefer to restart Tails and disable MAC spoofing."
+msgstr "Predstieranie MAC adresy - MAC spoofing zlyhalo pre sieťovú kartu ${nic_name} (${nic}). Obnova po chybe taktiež zlyhala, takže všetky siete sú neaktívne.\nMožno by ste mali dať prednosť reštartovaniu Tails a vypnúť predstieranie MAC adresy."
-#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:19
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:22
-msgid "error:"
-msgstr "chyba:"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:110
+msgid "Lock Screen"
+msgstr "Zamknúť obrazovku"
-#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:20
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:23
-msgid "Error"
-msgstr "Chyba"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:125
+msgid "Screen Locker"
+msgstr "Zamykač obrazovky"
-#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:40
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:131
+msgid "Set up a password to unlock the screen."
+msgstr "Nastaviť heslo na odomknutie obrazovky."
+
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:136
+msgid "Password"
+msgstr "Heslo"
+
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:142
+msgid "Confirm"
+msgstr "Potvrdiť"
+
+#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:35
msgid ""
-"<b>Not enough memory available to check for upgrades.</b>\n"
+"\"<b>Not enough memory available to check for upgrades.</b>\n"
"\n"
"Make sure this system satisfies the requirements for running Tails.\n"
"See file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n"
@@ -356,146 +446,255 @@ msgid ""
"Try to restart Tails to check for upgrades again.\n"
"\n"
"Or do a manual upgrade.\n"
-"See https://tails.boum.org/doc/first_steps/upgrade#manual"
-msgstr "<b>Nie je dostatok voľnej pamäte pre kontrolu aktualizácii.</b>\n\nUistite sa, že systém spĺňa všetky požiadavky nevyhnutné pre spustenie Tails.\nPozrite si súbor file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nSkúste reštartovať Tails a skontrolovať aktualizácie znova.\n\nAlebo tak učiňte manuálne.\nViac informácii https://tails.boum.org/doc/first_steps/upgrade#manual"
+"See https://tails.boum.org/doc/first_steps/upgrade#manual\""
+msgstr "<b>Nie je dostatok voľnej pamäte pre kontrolu aktualizácii.</b>\n\nUistite sa, že systém spĺňa všetky požiadavky nevyhnutné pre spustenie Tails.\nPozrite si súbor file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nSkúste reštartovať Tails a skontrolovať aktualizácie znova.\n\nAlebo tak učinte manuálne.\nViac informácii https://tails.boum.org/doc/first_steps/upgrade#manual"
-#: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:53
+#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:72
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
+msgid "error:"
+msgstr "chyba:"
+
+#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
+msgid "Error"
+msgstr "Chyba"
+
+#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:71
msgid "Warning: virtual machine detected!"
msgstr "Varovanie: bol detegovaný virtuálny stroj!"
-#: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:55
+#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:74
+msgid "Warning: non-free virtual machine detected!"
+msgstr "Upozornenie: bol objavený virtuány stroj!"
+
+#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:77
msgid ""
"Both the host operating system and the virtualization software are able to "
-"monitor what you are doing in Tails."
-msgstr "Aj hostujúci operačný systém aj virtualizačný softvér budú schopné monitorovať vašu aktivitu v Tails."
+"monitor what you are doing in Tails. Only free software can be considered "
+"trustworthy, for both the host operating system and the virtualization "
+"software."
+msgstr "Operačný systém ako aj softvér pre virtualizáciu môžu monitorovať Vašu aktivitu v Tails. Len voľne šíriteľný softvér je možné považovať za dôveryhodný pre operačný systém aj virtualizačný softvér."
-#: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:57
-msgid ""
-"<a "
-"href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html#security'>Learn"
-" more...</a>"
-msgstr "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html#security'>Dozvedieť sa viac...</a>"
+#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:81
+msgid "Learn more"
+msgstr "Zistite viac"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
msgid "Tor is not ready"
msgstr "Tor nie je pripravený"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
msgid "Tor is not ready. Start Tor Browser anyway?"
msgstr "Tor nie je pripravený. Spustiť Tor Browser aj tak?"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:45
msgid "Start Tor Browser"
msgstr "Spustiť Tor Browser"
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
-msgid "Cancel"
-msgstr "Zrušiť"
+#: config/chroot_local-includes/usr/share/gnome-shell/extensions/torstatus@tails.boum.org/extension.js:40
+msgid "Tor"
+msgstr "Tor"
+
+#: config/chroot_local-includes/usr/share/gnome-shell/extensions/torstatus@tails.boum.org/extension.js:55
+msgid "Open Onion Circuits"
+msgstr "Otvoriť Onion Okruhy"
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:33
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
msgid "Do you really want to launch the Unsafe Browser?"
msgstr "Naozaj chcete spustiť Unsafe Browser?"
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
msgid ""
-"Network activity within the Unsafe Browser is <b>not anonymous</b>. Only use"
-" the Unsafe Browser if necessary, for example if you have to login or "
+"Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
+"use the Unsafe Browser if necessary, for example\\nif you have to login or "
"register to activate your Internet connection."
-msgstr "Sieťová aktivita v rámci Unsafe Browsera <b> nie je anonymná </b>. Použite ho iba vtedy, ak je to nevyhnutné, napr. ak sa musíte prihlásiť alebo registrovať za účelom aktivácie vášho pripojenia k Internetu."
+msgstr "Sieťová aktivita v rámci nezabezpečeného prehliadača <b>nie je anonymná</b>.\\nPoužívajte nezabezpečený prehliadač len v prípade nutnosti, napríklad \\n ak sa musíte prihlásiť alebo registrovať kvôli aktivácii Vášho internetového spojenia."
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:47
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
msgid "Starting the Unsafe Browser..."
msgstr "Spúšťa sa Unsafe Browser..."
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
msgid "This may take a while, so please be patient."
msgstr "Toto môže chvíľu trvať, buďte preto prosím trpezlivý."
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:53
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
msgid "Shutting down the Unsafe Browser..."
msgstr "Vypína sa Unsafe Browser..."
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
msgid ""
"This may take a while, and you may not restart the Unsafe Browser until it "
"is properly shut down."
msgstr "Toto môže chvíľu trvať, a pokiaľ sa korektne nevypne, nebudete ho môcť reštartovať."
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:66
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
msgid "Failed to restart Tor."
msgstr "Nepodarilo sa reštartovať Tor."
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:85
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
#: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
msgid "Unsafe Browser"
msgstr "Unsafe Browser"
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:93
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:91
msgid ""
"Another Unsafe Browser is currently running, or being cleaned up. Please "
"retry in a while."
msgstr "Aktuálne je spustený ďalší Unsafe Browser, prípadne prebieha jeho čistenie. Prosíme skúste to znovu neskôr."
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:105
-msgid ""
-"NetworkManager passed us garbage data when trying to deduce the clearnet DNS"
-" server."
-msgstr "NetworkManager nám odovzdal nežiadúce údaje keď sa pokúšal odvodiť clearnet servera DNS."
-
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:115
-msgid ""
-"No DNS server was obtained through DHCP or manually configured in "
-"NetworkManager."
-msgstr "Pomocou DHCP alebo konfigurácie v NetworkManageri nebol získaný žiadny DNS server."
-
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:123
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:99
msgid "Failed to setup chroot."
msgstr "Nepodarilo sa nastaviť chroot."
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:129
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:104
msgid "Failed to configure browser."
msgstr "Zlyhalo pri nastavovaní prehliadača."
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:134
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:110
+msgid ""
+"No DNS server was obtained through DHCP or manually configured in "
+"NetworkManager."
+msgstr "Pomocou DHCP alebo konfigurácie v NetworkManageri nebol získaný žiadny DNS server."
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:121
msgid "Failed to run browser."
msgstr "Zlyhalo pri spúšťaní prehliadača. "
-#: config/chroot_local-includes/usr/local/sbin/tails-i2p:31
-msgid "I2P failed to start"
-msgstr "I2P sa nepodarilo spustiť."
-
-#: config/chroot_local-includes/usr/local/sbin/tails-i2p:32
+#. Translators: Don't translate {volume_label} or {volume_size},
+#. they are placeholders and will be replaced.
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#, python-brace-format
+msgid "{volume_label} ({volume_size})"
+msgstr "{volume_label} ({volume_size})"
+
+#. Translators: Don't translate {partition_name} or {partition_size},
+#. they are placeholders and will be replaced.
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#, python-brace-format
+msgid "{partition_name} ({partition_size})"
+msgstr "{partition_name} ({partition_size})"
+
+#. Translators: Don't translate {volume_size}, it's a placeholder
+#. and will be replaced.
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#, python-brace-format
+msgid "{volume_size} Volume"
+msgstr "{volume_size} Volume"
+
+#. Translators: Don't translate {volume_name}, it's a placeholder and
+#. will be replaced.
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#, python-brace-format
+msgid "{volume_name} (Read-Only)"
+msgstr "{volume_name} (Read-Only)"
+
+#. Translators: Don't translate {partition_name} and {container_path}, they
+#. are placeholders and will be replaced.
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#, python-brace-format
+msgid "{partition_name} in {container_path}"
+msgstr "{partition_name} in {container_path}"
+
+#. Translators: Don't translate {volume_name} and {path_to_file_container},
+#. they are placeholders and will be replaced. You should only have to
+#. translate
+#. this string if it makes sense to reverse the order of the placeholders.
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#, python-brace-format
+msgid "{volume_name} – {path_to_file_container}"
+msgstr "{volume_name} – {path_to_file_container}"
+
+#. Translators: Don't translate {partition_name} and {drive_name}, they
+#. are placeholders and will be replaced.
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#, python-brace-format
+msgid "{partition_name} on {drive_name}"
+msgstr "{partition_name} on {drive_name}"
+
+#. Translators: Don't translate {volume_name} and {drive_name},
+#. they are placeholders and will be replaced. You should only have to
+#. translate
+#. this string if it makes sense to reverse the order of the placeholders.
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#, python-brace-format
+msgid "{volume_name} – {drive_name}"
+msgstr "{volume_name} – {drive_name}"
+
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+msgid "Wrong passphrase or parameters"
+msgstr "Nesprávne heslo alebo parametre"
+
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+msgid "Error unlocking volume"
+msgstr "Chyba pri odomknutí oblasti"
+
+#. Translators: Don't translate {volume_name} or {error_message},
+#. they are placeholder and will be replaced.
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#, python-brace-format
msgid ""
-"Something went wrong when I2P was starting. Check the logs in /var/log/i2p "
-"for more information."
-msgstr "Niečo sa stalo pri štarte I2P. Skontrolujte logy vo /var/log/i2p pre viac informacií."
+"Couldn't unlock volume {volume_name}:\n"
+"{error_message}"
+msgstr "Nepodarilo sa odomknúť oblasť {volume_name}:\n{error_message}"
+
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py:83
+msgid "No file containers added"
+msgstr "Neboli pridané žiadne kontajnery súborov"
+
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py:98
+msgid "No VeraCrypt devices detected"
+msgstr "Neboli detekované žiadne zariadenia VeraCrypt"
-#: config/chroot_local-includes/usr/local/sbin/tails-i2p:43
-msgid "I2P's router console is ready"
-msgstr "Konzola I2P routera je priravená."
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:114
+msgid "Container already added"
+msgstr "Kontajner už bol pridaný"
-#: config/chroot_local-includes/usr/local/sbin/tails-i2p:44
-msgid "You can now access I2P's router console on http://127.0.0.1:7657."
-msgstr "Konzola I2P routera je teraz dostupná na http://127.0.0.1:7657."
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:115
+#, python-format
+msgid "The file container %s should already be listed."
+msgstr "Súborový kontajner %s by mal byť uz v zozanme."
-#: config/chroot_local-includes/usr/local/sbin/tails-i2p:49
-msgid "I2P is not ready"
-msgstr "I2P nieje pripravený"
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:131
+msgid "Container opened read-only"
+msgstr "Kontajner bol otvorený iba na čítanie."
-#: config/chroot_local-includes/usr/local/sbin/tails-i2p:50
+#. Translators: Don't translate {path}, it's a placeholder and will be
+#. replaced.
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:133
+#, python-brace-format
msgid ""
-"Eepsite tunnel not built within six minutes. Check the router console at "
-"http://127.0.0.1:7657/logs or the logs in /var/log/i2p for more information."
-" Reconnect to the network to try again."
-msgstr "Eeepsite tunnel nebol skompilovaný do 6 minut. Skontrolujte konzolu routera na http://127.0.0.1:7657/logs alebo logy vo /var/log/i2p pre viac informácií. Pripojte sa na sieť na skúsenie znova."
+"The file container {path} could not be opened with write access. It was opened read-only instead. You will not be able to modify the content of the container.\n"
+"{error_message}"
+msgstr "Súborový kontajner {path} nebohol byť otvorený s prístupom zápisu. Bol otvorený iba na čítanie. Nebudete môcť upravovať obsah kontajneru.\n{error_message}"
+
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:138
+msgid "Error opening file"
+msgstr "Chyba pri otvorení súboru"
-#: config/chroot_local-includes/usr/local/sbin/tails-i2p:60
-msgid "I2P is ready"
-msgstr "I2P je pripravený"
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:160
+msgid "Not a VeraCrypt container"
+msgstr "Neplatný kontajner VeraCrypt"
-#: config/chroot_local-includes/usr/local/sbin/tails-i2p:61
-msgid "You can now access services on I2P."
-msgstr "Teraz možte používať služby na I2P."
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:161
+#, python-format
+msgid "The file %s does not seem to be a VeraCrypt container."
+msgstr "Súbor %s sa nezdá byť kontajner VeraCrypt."
+
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:163
+msgid "Failed to add container"
+msgstr "Chyba pri pidaní kontajneru."
+
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:164
+#, python-format
+msgid ""
+"Could not add file container %s: Timeout while waiting for loop setup.Please"
+" try using the <i>Disks</i> application instead."
+msgstr "Nepodarilo sa pridať súborový kontajner %s: Čas vypršal počas cyklu nastavenia. Prosím vyskúšajte aplikcáciu <i>Disks</i>."
+
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:209
+msgid "Choose File Container"
+msgstr "Zvoľ súborový kontajner"
#: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
msgid "Report an error"
@@ -510,34 +709,10 @@ msgstr "Tails dokumentácia"
msgid "Learn how to use Tails"
msgstr "Naučte sa ako používať Tails"
-#: ../config/chroot_local-includes/usr/share/applications/i2p-browser.desktop.in.h:1
-msgid "Anonymous overlay network browser"
-msgstr "Anonmny overlay prehliadač siete."
-
-#: ../config/chroot_local-includes/usr/share/applications/i2p-browser.desktop.in.h:2
-msgid "I2P Browser"
-msgstr "I2P Prehliadač"
-
#: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:2
msgid "Learn more about Tails"
msgstr "Dozvedieť sa viac o Tails"
-#: ../config/chroot_local-includes/usr/share/applications/tails-reboot.desktop.in.h:1
-msgid "Reboot"
-msgstr "Reboot"
-
-#: ../config/chroot_local-includes/usr/share/applications/tails-reboot.desktop.in.h:2
-msgid "Immediately reboot computer"
-msgstr "Okamžite rebootovať počítač"
-
-#: ../config/chroot_local-includes/usr/share/applications/tails-shutdown.desktop.in.h:1
-msgid "Power Off"
-msgstr "Vypnúť"
-
-#: ../config/chroot_local-includes/usr/share/applications/tails-shutdown.desktop.in.h:2
-msgid "Immediately shut down computer"
-msgstr "Okamžite vypnúť počítač"
-
#: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:1
msgid "Tor Browser"
msgstr "Prehliadač Tor"
@@ -554,6 +729,72 @@ msgstr "Surfovať World Wide Web bez anonymity"
msgid "Unsafe Web Browser"
msgstr "Unsafe Web Browser"
+#: ../config/chroot_local-includes/usr/share/applications/unlock-veracrypt-volumes.desktop.in.h:1
+msgid "Unlock VeraCrypt Volumes"
+msgstr "Odomknutie oblastí VeraCrypt"
+
+#: ../config/chroot_local-includes/usr/share/applications/unlock-veracrypt-volumes.desktop.in.h:2
+msgid "Mount VeraCrypt encrypted file containers and devices"
+msgstr "Pripojiť šifrované súborové kontajnery a zariadenia VeraCrypt"
+
+#: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
+msgid "Additional Software"
+msgstr "Ďalší softvér"
+
+#: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:2
+msgid ""
+"Configure the additional software installed from your persistent storage "
+"when starting Tails"
+msgstr "Konfigurovať doplnkový softvér inštalovaný z Vášho Trvalého úložiska keď Tails naštartuje."
+
#: ../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:2
msgid "Tails specific tools"
msgstr "Špecifické nástroje pre Tails"
+
+#: ../config/chroot_local-includes/usr/share/polkit-1/actions/org.boum.tails.root-terminal.policy.in.h:1
+msgid "To start a Root Terminal, you need to authenticate."
+msgstr "Pre spustenie Root Terminálu, musíte sa autentifikovať."
+
+#: ../config/chroot_local-includes/usr/share/polkit-1/actions/org.boum.tails.additional-software.policy.in.h:1
+msgid "Remove an additional software package"
+msgstr "Odstrániť balíček doplnkového softvéru"
+
+#: ../config/chroot_local-includes/usr/share/polkit-1/actions/org.boum.tails.additional-software.policy.in.h:2
+msgid ""
+"Authentication is required to remove a package from your additional software"
+" ($(command_line))"
+msgstr "Vyžadovaná autentifikácia pre ostránenie balíšku z Vášho doplnkového softvéru ($(command_line))"
+
+#: ../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/main.ui.in:61
+msgid "File Containers"
+msgstr "Súborové kontajnery"
+
+#: ../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/main.ui.in:80
+msgid "_Add"
+msgstr "_Pridať"
+
+#: ../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/main.ui.in:86
+msgid "Add a file container"
+msgstr "Pridať súborový kontajner"
+
+#: ../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/main.ui.in:103
+msgid "Partitions and Drives"
+msgstr "Partície a Zväzky"
+
+#: ../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/main.ui.in:121
+msgid ""
+"This application is not affiliated with or endorsed by the VeraCrypt project"
+" or IDRIX."
+msgstr "Táto aplikácia nie je pridružená alebo schválená VeraCrypt projektom alebo IDRIX."
+
+#: ../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/volume.ui.in:38
+msgid "Lock this volume"
+msgstr "Zamknúť túto oblasť"
+
+#: ../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/volume.ui.in:61
+msgid "Detach this volume"
+msgstr "Odpojiť túto oblasť"
+
+#: ../config/chroot_local-includes/usr/local/share/mime/packages/unlock-veracrypt-volumes.xml.in.h:1
+msgid "TrueCrypt/VeraCrypt container"
+msgstr "TrueCrypt/VeraCrypt kontajner"
1
0

[translation/tails-misc] Update translations for tails-misc
by translation@torproject.org 11 Apr '19
by translation@torproject.org 11 Apr '19
11 Apr '19
commit b8d7d466535ec7acada4fba3640154815706dacf
Author: Translation commit bot <translation(a)torproject.org>
Date: Thu Apr 11 07:46:34 2019 +0000
Update translations for tails-misc
---
sk.po | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/sk.po b/sk.po
index 10d57c700..fa17fbd90 100644
--- a/sk.po
+++ b/sk.po
@@ -14,7 +14,7 @@ msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-04-06 14:00+0200\n"
-"PO-Revision-Date: 2019-04-11 07:02+0000\n"
+"PO-Revision-Date: 2019-04-11 07:43+0000\n"
"Last-Translator: Marek Čápek <capek.marek(a)gmail.com>\n"
"Language-Team: Slovak (http://www.transifex.com/otf/torproject/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -690,11 +690,11 @@ msgstr "Chyba pri pidaní kontajneru."
msgid ""
"Could not add file container %s: Timeout while waiting for loop setup.Please"
" try using the <i>Disks</i> application instead."
-msgstr ""
+msgstr "Nepodarilo sa pridať súborový kontajner %s: Čas vypršal počas cyklu nastavenia. Prosím vyskúšajte aplikcáciu <i>Disks</i>."
#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:209
msgid "Choose File Container"
-msgstr ""
+msgstr "Zvoľ súborový kontajner"
#: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
msgid "Report an error"
@@ -731,11 +731,11 @@ msgstr "Unsafe Web Browser"
#: ../config/chroot_local-includes/usr/share/applications/unlock-veracrypt-volumes.desktop.in.h:1
msgid "Unlock VeraCrypt Volumes"
-msgstr ""
+msgstr "Odomknutie oblastí VeraCrypt"
#: ../config/chroot_local-includes/usr/share/applications/unlock-veracrypt-volumes.desktop.in.h:2
msgid "Mount VeraCrypt encrypted file containers and devices"
-msgstr ""
+msgstr "Pripojiť šifrované súborové kontajnery a zariadenia VeraCrypt"
#: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
msgid "Additional Software"
@@ -745,7 +745,7 @@ msgstr "Ďalší softvér"
msgid ""
"Configure the additional software installed from your persistent storage "
"when starting Tails"
-msgstr ""
+msgstr "Konfigurovať doplnkový softvér inštalovaný z Vášho Trvalého úložiska keď Tails naštartuje."
#: ../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:2
msgid "Tails specific tools"
@@ -753,48 +753,48 @@ msgstr "Špecifické nástroje pre Tails"
#: ../config/chroot_local-includes/usr/share/polkit-1/actions/org.boum.tails.root-terminal.policy.in.h:1
msgid "To start a Root Terminal, you need to authenticate."
-msgstr ""
+msgstr "Pre spustenie Root Terminálu, musíte sa autentifikovať."
#: ../config/chroot_local-includes/usr/share/polkit-1/actions/org.boum.tails.additional-software.policy.in.h:1
msgid "Remove an additional software package"
-msgstr ""
+msgstr "Odstrániť balíček doplnkového softvéru"
#: ../config/chroot_local-includes/usr/share/polkit-1/actions/org.boum.tails.additional-software.policy.in.h:2
msgid ""
"Authentication is required to remove a package from your additional software"
" ($(command_line))"
-msgstr ""
+msgstr "Vyžadovaná autentifikácia pre ostránenie balíšku z Vášho doplnkového softvéru ($(command_line))"
#: ../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/main.ui.in:61
msgid "File Containers"
-msgstr ""
+msgstr "Súborové kontajnery"
#: ../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/main.ui.in:80
msgid "_Add"
-msgstr ""
+msgstr "_Pridať"
#: ../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/main.ui.in:86
msgid "Add a file container"
-msgstr ""
+msgstr "Pridať súborový kontajner"
#: ../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/main.ui.in:103
msgid "Partitions and Drives"
-msgstr ""
+msgstr "Partície a Zväzky"
#: ../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/main.ui.in:121
msgid ""
"This application is not affiliated with or endorsed by the VeraCrypt project"
" or IDRIX."
-msgstr ""
+msgstr "Táto aplikácia nie je pridružená alebo schválená VeraCrypt projektom alebo IDRIX."
#: ../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/volume.ui.in:38
msgid "Lock this volume"
-msgstr ""
+msgstr "Zamknúť túto oblasť"
#: ../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/volume.ui.in:61
msgid "Detach this volume"
-msgstr ""
+msgstr "Odpojiť túto oblasť"
#: ../config/chroot_local-includes/usr/local/share/mime/packages/unlock-veracrypt-volumes.xml.in.h:1
msgid "TrueCrypt/VeraCrypt container"
-msgstr ""
+msgstr "TrueCrypt/VeraCrypt kontajner"
1
0

[translation/tails-misc] Update translations for tails-misc
by translation@torproject.org 11 Apr '19
by translation@torproject.org 11 Apr '19
11 Apr '19
commit 361e92810e8353d9fc05c1e1980bf0734a32d14a
Author: Translation commit bot <translation(a)torproject.org>
Date: Thu Apr 11 07:16:36 2019 +0000
Update translations for tails-misc
---
sk.po | 54 +++++++++++++++++++++++++++---------------------------
1 file changed, 27 insertions(+), 27 deletions(-)
diff --git a/sk.po b/sk.po
index b473c506c..10d57c700 100644
--- a/sk.po
+++ b/sk.po
@@ -14,7 +14,7 @@ msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-04-06 14:00+0200\n"
-"PO-Revision-Date: 2019-04-11 06:46+0000\n"
+"PO-Revision-Date: 2019-04-11 07:02+0000\n"
"Last-Translator: Marek Čápek <capek.marek(a)gmail.com>\n"
"Language-Team: Slovak (http://www.transifex.com/otf/torproject/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -365,11 +365,11 @@ msgstr "Ak chcete pridať viac, vytvorte Trvalé úložisko a inštalujte ďalš
msgid ""
"To do so, install Tails on a USB stick using <a href=\"tails-"
"installer.desktop\">Tails Installer</a> and create a persistent storage."
-msgstr ""
+msgstr "Ak tak chcete, nainštalujte Tails na USB kľúč použitím <a href=\"tails-installer.desktop\">Tails Inštalátora</a> a vytvorte Trvalé úložisko."
#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:254
msgid "[package not available]"
-msgstr ""
+msgstr "[balíček nedostupný]"
#: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:52
msgid "Synchronizing the system's clock"
@@ -422,7 +422,7 @@ msgstr "Zamknúť obrazovku"
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:125
msgid "Screen Locker"
-msgstr ""
+msgstr "Zamykač obrazovky"
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:131
msgid "Set up a password to unlock the screen."
@@ -447,7 +447,7 @@ msgid ""
"\n"
"Or do a manual upgrade.\n"
"See https://tails.boum.org/doc/first_steps/upgrade#manual\""
-msgstr ""
+msgstr "<b>Nie je dostatok voľnej pamäte pre kontrolu aktualizácii.</b>\n\nUistite sa, že systém spĺňa všetky požiadavky nevyhnutné pre spustenie Tails.\nPozrite si súbor file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nSkúste reštartovať Tails a skontrolovať aktualizácie znova.\n\nAlebo tak učinte manuálne.\nViac informácii https://tails.boum.org/doc/first_steps/upgrade#manual"
#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:72
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
@@ -497,7 +497,7 @@ msgstr "Tor"
#: config/chroot_local-includes/usr/share/gnome-shell/extensions/torstatus@tails.boum.org/extension.js:55
msgid "Open Onion Circuits"
-msgstr ""
+msgstr "Otvoriť Onion Okruhy"
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
msgid "Do you really want to launch the Unsafe Browser?"
@@ -566,35 +566,35 @@ msgstr "Zlyhalo pri spúšťaní prehliadača. "
#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
#, python-brace-format
msgid "{volume_label} ({volume_size})"
-msgstr ""
+msgstr "{volume_label} ({volume_size})"
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
#, python-brace-format
msgid "{partition_name} ({partition_size})"
-msgstr ""
+msgstr "{partition_name} ({partition_size})"
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
#, python-brace-format
msgid "{volume_size} Volume"
-msgstr ""
+msgstr "{volume_size} Volume"
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
#, python-brace-format
msgid "{volume_name} (Read-Only)"
-msgstr ""
+msgstr "{volume_name} (Read-Only)"
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
#, python-brace-format
msgid "{partition_name} in {container_path}"
-msgstr ""
+msgstr "{partition_name} in {container_path}"
#. Translators: Don't translate {volume_name} and {path_to_file_container},
#. they are placeholders and will be replaced. You should only have to
@@ -603,14 +603,14 @@ msgstr ""
#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
-msgstr ""
+msgstr "{volume_name} – {path_to_file_container}"
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{partition_name} on {drive_name}"
-msgstr ""
+msgstr "{partition_name} on {drive_name}"
#. Translators: Don't translate {volume_name} and {drive_name},
#. they are placeholders and will be replaced. You should only have to
@@ -619,15 +619,15 @@ msgstr ""
#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
#, python-brace-format
msgid "{volume_name} – {drive_name}"
-msgstr ""
+msgstr "{volume_name} – {drive_name}"
#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
msgid "Wrong passphrase or parameters"
-msgstr ""
+msgstr "Nesprávne heslo alebo parametre"
#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
msgid "Error unlocking volume"
-msgstr ""
+msgstr "Chyba pri odomknutí oblasti"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
@@ -636,28 +636,28 @@ msgstr ""
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
-msgstr ""
+msgstr "Nepodarilo sa odomknúť oblasť {volume_name}:\n{error_message}"
#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py:83
msgid "No file containers added"
-msgstr ""
+msgstr "Neboli pridané žiadne kontajnery súborov"
#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py:98
msgid "No VeraCrypt devices detected"
-msgstr ""
+msgstr "Neboli detekované žiadne zariadenia VeraCrypt"
#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:114
msgid "Container already added"
-msgstr ""
+msgstr "Kontajner už bol pridaný"
#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:115
#, python-format
msgid "The file container %s should already be listed."
-msgstr ""
+msgstr "Súborový kontajner %s by mal byť uz v zozanme."
#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:131
msgid "Container opened read-only"
-msgstr ""
+msgstr "Kontajner bol otvorený iba na čítanie."
#. Translators: Don't translate {path}, it's a placeholder and will be
#. replaced.
@@ -666,24 +666,24 @@ msgstr ""
msgid ""
"The file container {path} could not be opened with write access. It was opened read-only instead. You will not be able to modify the content of the container.\n"
"{error_message}"
-msgstr ""
+msgstr "Súborový kontajner {path} nebohol byť otvorený s prístupom zápisu. Bol otvorený iba na čítanie. Nebudete môcť upravovať obsah kontajneru.\n{error_message}"
#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:138
msgid "Error opening file"
-msgstr ""
+msgstr "Chyba pri otvorení súboru"
#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:160
msgid "Not a VeraCrypt container"
-msgstr ""
+msgstr "Neplatný kontajner VeraCrypt"
#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:161
#, python-format
msgid "The file %s does not seem to be a VeraCrypt container."
-msgstr ""
+msgstr "Súbor %s sa nezdá byť kontajner VeraCrypt."
#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:163
msgid "Failed to add container"
-msgstr ""
+msgstr "Chyba pri pidaní kontajneru."
#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:164
#, python-format
1
0

[tor-browser/tor-browser-60.6.1esr-8.5-1] fixup! Bug 29768: Introduce new features to users
by gk@torproject.org 11 Apr '19
by gk@torproject.org 11 Apr '19
11 Apr '19
commit d8163c5fe45122f4e7fa98b77e37a5736421edb9
Author: Kathy Brade <brade(a)pearlcrescent.com>
Date: Wed Apr 10 14:57:02 2019 -0400
fixup! Bug 29768: Introduce new features to users
Fixes #30104.
---
.../content/img/figure_tor-security-level.png | Bin 12185 -> 10888 bytes
.../extensions/onboarding/content/onboarding.css | 6 ------
2 files changed, 6 deletions(-)
diff --git a/browser/extensions/onboarding/content/img/figure_tor-security-level.png b/browser/extensions/onboarding/content/img/figure_tor-security-level.png
index 5c7b8c5635fe..4f940ea008ef 100644
Binary files a/browser/extensions/onboarding/content/img/figure_tor-security-level.png and b/browser/extensions/onboarding/content/img/figure_tor-security-level.png differ
diff --git a/browser/extensions/onboarding/content/onboarding.css b/browser/extensions/onboarding/content/onboarding.css
index ed7ef9e2add8..3bd1b4df7017 100644
--- a/browser/extensions/onboarding/content/onboarding.css
+++ b/browser/extensions/onboarding/content/onboarding.css
@@ -396,12 +396,6 @@
transform: scaleX(-1);
}
-/* The image contained in figure_tor-security-level.png contains English text;
- * therefore it should not be flipped when the document direction is RTL. */
-#onboarding-tour-tor-security-update-8-5-page > .onboarding-tour-content > img:dir(rtl) {
- transform: scaleX(1);
-}
-
.onboarding-tour-content > iframe {
width: 100%;
height: 100%;
1
0