- tor-commits - lists.torproject.org

[orbot/master] add .gitlab-ci.yml setup with errorprone
by n8fr8＠torproject.org 22 Mar '19

22 Mar '19

commit 6ba0ceccbde67310c22fc9fa4e0dc88d932740f5 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Wed Mar 20 10:44:02 2019 +0100 add .gitlab-ci.yml setup with errorprone --- .gitlab-ci.yml | 54 +++++++++++++++++++++++++++++++++++++++++++++++++ tools/errorprone.gradle | 25 +++++++++++++++++++++++ 2 files changed, 79 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 00000000..9a09b8b4 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,54 @@ +image: registry.gitlab.com/fdroid/ci-images-client:latest + +cache: + paths: + - .gradle/wrapper + - .gradle/caches + +stages: + - test + - deploy + +before_script: + - export GRADLE_USER_HOME=$PWD/.gradle + - export ANDROID_COMPILE_SDK=`sed -n 's,.*compileSdkVersion\s*$[0-9][0-9]*$.*,\1,p' app/build.gradle` + - alias sdkmanager="sdkmanager --no_https" + - echo y | sdkmanager + "platforms;android-${ANDROID_COMPILE_SDK}" + "$(sed -nE 's,.*buildToolsVersion *.([0-9.]+).*,build-tools;\1,p' app/build.gradle)" + "build-tools;23.0.3" > /dev/null + +.test-template: &test-template + artifacts: + name: "${CI_PROJECT_PATH}_${CI_JOB_STAGE}_${CI_COMMIT_REF_NAME}_${CI_COMMIT_SHA}" + paths: + - "logcat.txt" + - "*/build/reports" + - "*/build/outputs/*ml" + - "*/build/outputs/apk" + expire_in: 1 week + when: on_failure + after_script: + - echo "Download debug artifacts from https://gitlab.com/${CI_PROJECT_PATH}/-/jobs" + +# Run the most important first. Then we can decide whether to ignore +# the style tests if the rest of the more meaningful tests pass. +test: + stage: test + <<: *test-template + script: + # print lint errors/warnings to build log + - sed -i 's,\s*textReport .*,\ttextReport true,g' */build.gradle + # 'assemble' everything and run all checks that do not require a device/emulator + - ./gradlew build -PdisablePreDex + +errorprone: + stage: test + script: + - for f in */build.gradle; do cat tools/errorprone.gradle >> $f; done + - ./gradlew assembleDebug -PdisablePreDex + +after_script: + # this file changes every time but should not be cached + - rm -f $GRADLE_USER_HOME/caches/modules-2/modules-2.lock + - rm -fr $GRADLE_USER_HOME/caches/*/plugin-resolution/ diff --git a/tools/errorprone.gradle b/tools/errorprone.gradle new file mode 100644 index 00000000..ea43695f --- /dev/null +++ b/tools/errorprone.gradle @@ -0,0 +1,25 @@ + +buildscript { + repositories { + maven { + url "https://plugins.gradle.org/m2/" + } + } + dependencies { + classpath "net.ltgt.gradle:gradle-errorprone-plugin:0.0.16" + } +} + +apply plugin: "net.ltgt.errorprone" + +tasks.withType(JavaCompile) { + options.compilerArgs += [ + '-XepAllDisabledChecksAsWarnings', + '-Xep:Var:OFF', + '-XepExcludedPaths:.*/build/generated/.*', + ] +} + +configurations.errorprone { + resolutionStrategy.force 'com.google.errorprone:error_prone_core:2.2.0' +}

1 0

[orbot/master] build gradle to 4.4.1, and make gradlew verify the download
by n8fr8＠torproject.org 22 Mar '19

22 Mar '19

commit 3face00a66874afb793470922e381a9e463b116c Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Wed Mar 20 10:12:11 2019 +0100 build gradle to 4.4.1, and make gradlew verify the download 4.4.1 is the version reproducibly built in Debian/buster: https://packages.debian.org/buster/gradle --- gradle/wrapper/gradle-wrapper.jar | Bin 53636 -> 54333 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 72 ++++++++++++++++++------------- gradlew.bat | 14 ++---- 4 files changed, 48 insertions(+), 42 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 13372aef..99340b4a 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 72adb233..07794598 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Apr 19 23:56:48 EDT 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip +distributionSha256Sum=e7cf7d1853dfc30c1c44f571d3919eeeedef002823b66b6a988d27e919686389 diff --git a/gradlew b/gradlew index 9d82f789..cccdd3d5 100755 --- a/gradlew +++ b/gradlew @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh ############################################################################## ## @@ -6,20 +6,38 @@ ## ############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> $.*$$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn ( ) { +warn () { echo "$*" } -die ( ) { +die () { echo echo "$*" echo @@ -30,6 +48,7 @@ die ( ) { cygwin=false msys=false darwin=false +nonstop=false case "`uname`" in CYGWIN* ) cygwin=true @@ -40,26 +59,11 @@ case "`uname`" in MINGW* ) msys=true ;; + NONSTOP* ) + nonstop=true + ;; esac -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> $.*$$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -85,7 +89,7 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then MAX_FD_LIMIT=`ulimit -H -n` if [ $? -eq 0 ] ; then if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then @@ -150,11 +154,19 @@ if $cygwin ; then esac fi -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " } -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index aec99730..e95643d6 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -8,14 +8,14 @@ @rem Set local scope for the variables with windows NT shell if "%OS%"=="Windows_NT" setlocal -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - set DIRNAME=%~dp0 if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome @@ -46,10 +46,9 @@ echo location of your Java installation. goto fail :init -@rem Get command-line arguments, handling Windowz variants +@rem Get command-line arguments, handling Windows variants if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args :win9xME_args @rem Slurp the command line arguments. @@ -60,11 +59,6 @@ set _SKIP=2 if "x%~1" == "x" goto execute set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ :execute @rem Setup the command line

1 0

[orbot/master] Merge pull request #200 from eighthave/fastlane-supply
by n8fr8＠torproject.org 22 Mar '19

22 Mar '19

commit 76796fea83ef7efe3e33f6f5862fd71171a70cdd Merge: f93c11e7 6ba0cecc Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Mar 21 15:53:37 2019 -0400 Merge pull request #200 from eighthave/fastlane-supply move app store materials into fdroid/fastlane format .gitlab-ci.yml | 54 ++++++++++++++++ compare-to-official-release | 62 ------------------ gradle/wrapper/gradle-wrapper.jar | Bin 53636 -> 54333 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 72 ++++++++++++--------- gradlew.bat | 14 ++-- jenkins-build | 37 ----------- metadata/af/short_description.txt | 1 + metadata/am/short_description.txt | 1 + metadata/ar/short_description.txt | 1 + metadata/ar/title.txt | 1 + metadata/bg/short_description.txt | 1 + metadata/ca/short_description.txt | 1 + metadata/cs/short_description.txt | 1 + metadata/de/full_description.txt | 26 ++++++++ metadata/de/short_description.txt | 1 + metadata/de/title.txt | 1 + metadata/el/short_description.txt | 1 + metadata/en-US/full_description.txt | 25 +++++++ .../en-US/images/featureGraphic.png | Bin .../en-US/images/icon.png | Bin .../phoneScreenshots}/device-2018-01-05-122015.png | Bin .../phoneScreenshots}/device-2018-01-05-122035.png | Bin .../phoneScreenshots}/device-2018-01-05-122111.png | Bin .../phoneScreenshots}/device-2018-01-05-122301.png | Bin .../phoneScreenshots}/device-2018-01-05-122310.png | Bin .../phoneScreenshots}/device-2018-01-05-122314.png | Bin .../phoneScreenshots}/device-2018-01-05-122344.png | Bin metadata/en-US/short_description.txt | 1 + metadata/es/full_description.txt | 27 ++++++++ metadata/et/short_description.txt | 1 + .../phoneScreenshots}/device-2018-01-05-123814.png | Bin .../phoneScreenshots}/device-2018-01-05-123828.png | Bin .../phoneScreenshots}/device-2018-01-05-123836.png | Bin .../phoneScreenshots}/device-2018-01-05-123908.png | Bin .../phoneScreenshots}/device-2018-01-05-124039.png | Bin .../phoneScreenshots}/device-2018-01-05-124045.png | Bin .../phoneScreenshots}/device-2018-01-05-124052.png | Bin .../phoneScreenshots}/device-2018-01-05-124059.png | Bin metadata/fi/short_description.txt | 1 + metadata/fr/full_description.txt | 26 ++++++++ metadata/hi/short_description.txt | 1 + metadata/hr/short_description.txt | 1 + metadata/hu/short_description.txt | 1 + metadata/id/short_description.txt | 1 + metadata/it/short_description.txt | 1 + metadata/ja/short_description.txt | 1 + metadata/ko/short_description.txt | 1 + metadata/lt/short_description.txt | 1 + metadata/lv/short_description.txt | 1 + metadata/nl/short_description.txt | 1 + metadata/no/short_description.txt | 1 + metadata/pl/short_description.txt | 1 + metadata/pt-BR/full_description.txt | 26 ++++++++ metadata/pt-PT/full_description.txt | 26 ++++++++ metadata/ro/short_description.txt | 1 + metadata/ru/short_description.txt | 1 + metadata/ru/title.txt | 1 + metadata/sk/short_description.txt | 1 + metadata/sl/short_description.txt | 1 + metadata/sv/short_description.txt | 1 + metadata/sw/short_description.txt | 1 + metadata/th/short_description.txt | 1 + metadata/tr/full_description.txt | 26 ++++++++ metadata/uk/short_description.txt | 1 + metadata/vi/full_description.txt | 26 ++++++++ metadata/vi/short_description.txt | 1 + metadata/vi/title.txt | 1 + setup-ant | 28 -------- tools/check-fastlane-whitespace.py | 15 +++++ tools/errorprone.gradle | 25 +++++++ web_hi_res_512.png | Bin 46595 -> 0 bytes 72 files changed, 386 insertions(+), 169 deletions(-)

1 0

[orbot/master] updated to SDK 28, added android.permission.FOREGROUND_SERVICE permission
by n8fr8＠torproject.org 22 Mar '19

22 Mar '19

commit 2a76b7af3d76c16586b32e85c4f375c839017ed6 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Mar 22 12:27:45 2019 -0400 updated to SDK 28, added android.permission.FOREGROUND_SERVICE permission --- app/build.gradle | 14 +++++++------- app/src/main/AndroidManifest.xml | 1 + jsocksAndroid/build.gradle | 6 +++--- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 44b80600..6b59a43d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 27 - buildToolsVersion '27.0.3' + compileSdkVersion 28 + buildToolsVersion '28.0.3' defaultConfig { applicationId "org.torproject.android" minSdkVersion 16 - targetSdkVersion 27 + targetSdkVersion 28 } lintOptions { checkReleaseBuilds false @@ -33,9 +33,9 @@ android { dimension "free" minSdkVersion 16 applicationId 'org.torproject.android' - targetSdkVersion 27 - versionCode 16050200 - versionName '16.0.5-RC-2-tor-0.3.4.9' + targetSdkVersion 28 + versionCode 16060001 + versionName '16.0.6-BETA-1-tor-0.3.5.8' archivesBaseName = "Orbot-$versionName" } } @@ -69,7 +69,7 @@ android { dependencies { implementation 'com.android.support.constraint:constraint-layout:1.1.3' implementation project(':orbotservice') - implementation 'com.android.support:design:27.1.1' + implementation 'com.android.support:design:28.0.0' implementation 'pl.bclogic:pulsator4droid:1.0.3' implementation 'com.github.apl-devs:appintro:v4.2.2' implementation 'com.github.javiersantos:AppUpdater:2.6.4' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 56db8266..ea90afe7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -5,6 +5,7 @@ android:installLocation="auto"> <uses-permission android:name="android.permission.INTERNET" /> + <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> diff --git a/jsocksAndroid/build.gradle b/jsocksAndroid/build.gradle index 7ac21e4e..a6215bf0 100644 --- a/jsocksAndroid/build.gradle +++ b/jsocksAndroid/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 27 - buildToolsVersion '27.0.3' + compileSdkVersion 28 + buildToolsVersion '28.0.3' defaultConfig { minSdkVersion 16 - targetSdkVersion 27 + targetSdkVersion 28 } buildTypes {

1 0

[orbot/master] update gradle tools
by n8fr8＠torproject.org 22 Mar '19

22 Mar '19

commit 22d5ffdf8bc3d51bb014e319d9f1e6b2ecb3e840 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Mar 22 12:19:17 2019 -0400 update gradle tools --- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 07794598..57678c30 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ +#Fri Mar 22 11:47:03 EDT 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip -distributionSha256Sum=e7cf7d1853dfc30c1c44f571d3919eeeedef002823b66b6a988d27e919686389 +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-all.zip

1 0

[orbot/master] updating to tor-0.3.5.8-rc to add support for Android Q
by n8fr8＠torproject.org 22 Mar '19

22 Mar '19

commit 455757726d519ac56cd53eaed29c3abef25707d4 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Mar 22 12:19:27 2019 -0400 updating to tor-0.3.5.8-rc to add support for Android Q --- .../org/torproject/android/OrbotMainActivity.java | 4 ++-- orbotservice/build.gradle | 2 +- .../org/torproject/android/service/TorService.java | 23 +++++++++------------- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index e18711b1..9676abc9 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -523,7 +523,7 @@ public class OrbotMainActivity extends AppCompatActivity String version = ""; try { - version = getPackageManager().getPackageInfo(getPackageName(), 0).versionName + " (Tor " + TorService.TOR_VERSION + ")"; + version = getPackageManager().getPackageInfo(getPackageName(), 0).versionName + " (Tor " + TorService.BINARY_TOR_VERSION + ")"; } catch (NameNotFoundException e) { version = "Version Not Found"; } @@ -1203,7 +1203,7 @@ public class OrbotMainActivity extends AppCompatActivity } else if (torStatus == TorServiceConstants.STATUS_OFF) { imgStatus.setImageResource(R.drawable.toroff); - lblStatus.setText("Tor v" + TorService.TOR_VERSION); + lblStatus.setText("Tor v" + TorService.BINARY_TOR_VERSION); mBtnStart.setText(R.string.menu_start); mPulsator.start(); diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle index cebbd502..c9f0e8a4 100644 --- a/orbotservice/build.gradle +++ b/orbotservice/build.gradle @@ -27,7 +27,7 @@ android { dependencies { implementation project(':jsocksAndroid') - implementation 'org.torproject:tor-android-binary:0.3.5.6-rc' + implementation 'org.torproject:tor-android-binary:0.3.5.8-rc' implementation 'com.android.support:appcompat-v7:27.1.1' implementation 'com.jrummyapps:android-shell:1.0.1' implementation fileTree(dir: 'libs', include: ['.so']) diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java index 47da56c3..f87c0a10 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -78,12 +78,10 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeoutException; -import static org.torproject.android.binary.TorServiceConstants.BINARY_TOR_VERSION; - public class TorService extends Service implements TorServiceConstants, OrbotConstants { - public final static String TOR_VERSION = org.torproject.android.binary.TorServiceConstants.BINARY_TOR_VERSION; + public final static String BINARY_TOR_VERSION = org.torproject.android.binary.TorServiceConstants.BINARY_TOR_VERSION; private String mCurrentStatus = STATUS_OFF; private final static int CONTROL_SOCKET_TIMEOUT = 0; @@ -124,7 +122,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon public static File appCacheHome; public static File fileTor; - // public static File filePolipo; public static File fileObfsclient; public static File fileTorRc; private File mHSBasePath; @@ -591,17 +588,15 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon logNotice("checking binary version: " + version); TorResourceInstaller installer = new TorResourceInstaller(this, appBinHome); - - if (version == null || (!version.equals(BINARY_TOR_VERSION)) || (!fileTor.exists())) - { - logNotice("upgrading binaries to latest version: " + BINARY_TOR_VERSION); - - boolean success = installer.installResources(); - - if (success) - prefs.edit().putString(PREF_BINARY_TOR_VERSION_INSTALLED,BINARY_TOR_VERSION).apply(); - } + logNotice("upgrading binaries to latest version: " + BINARY_TOR_VERSION); + + fileTor = installer.installResources(); + + if (fileTor != null && fileTor.canExecute()) + prefs.edit().putString(PREF_BINARY_TOR_VERSION_INSTALLED,BINARY_TOR_VERSION).apply(); + + fileTorRc = installer.getTorrcFile(); OtherResourceInstaller oInstaller = new OtherResourceInstaller(this, appBinHome); oInstaller.installResources();

1 0

[orbot/master] fixed strings with two many \\ escapes
by n8fr8＠torproject.org 22 Mar '19

22 Mar '19

commit fb14c76c3a75977af9e86887b54dad5d15ae254e Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Mar 22 12:27:36 2019 -0400 fixed strings with two many \\ escapes --- app/src/main/res/values-be/strings.xml | 20 ++++++++++---------- app/src/main/res/values-en-rGB/poestrings.xml | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml index c4ff8ec9..5d375da3 100644 --- a/app/src/main/res/values-be/strings.xml +++ b/app/src/main/res/values-be/strings.xml @@ -43,9 +43,9 @@ <string name="pref_transparent_all_title">Накіроўваць усё праз Tor</string> <string name="pref_transparent_all_summary">Накіроўваць трафік усіх дадаткаў праз Tor</string> <string name="pref_transparent_port_fallback_title">Рэзервовы порт проксі</string> - <string name="pref_transparent_port_fallback_summary">ПАПЯРЭДЖАННЕ: абыходзіць агульныя парты (80, 443 і г. д.). *ВЫКАРЫСТОЎВАЦЬ ТОЛЬКІ* калі рэжымы \\'Усё\\' ці \\'Дадатак\\' не працуюць.</string> + <string name="pref_transparent_port_fallback_summary">ПАПЯРЭДЖАННЕ: абыходзіць агульныя парты (80, 443 і г. д.). *ВЫКАРЫСТОЎВАЦЬ ТОЛЬКІ* калі рэжымы \'Усё\' ці \'Дадатак\' не працуюць.</string> <string name="pref_transparent_port_title">Спіс партоў</string> - <string name="pref_transparent_port_summary">Спіс партоў для проксікацыі. *ВЫКАРЫСТОЎВАЦЬ ТОЛЬКІ* калі рэжымы \\'Усё\\' ці \\'Дадатак\\' не працуюць.</string> + <string name="pref_transparent_port_summary">Спіс партоў для проксікацыі. *ВЫКАРЫСТОЎВАЦЬ ТОЛЬКІ* калі рэжымы \'Усё\' ці \'Дадатак\' не працуюць.</string> <string name="pref_transparent_port_dialog">Увядзіце парты для проксіфацыі</string> <string name="pref_has_root">Запытаць root-доступ</string> <string name="pref_has_root_summary">Запытаць root-доступ для празрыстай проксіфацыі</string> @@ -78,16 +78,16 @@ <string name="wizard_tips_otrchat">ChatSecure - абаронены памен паведамленнямі ў Android</string> <string name="wizard_tips_proxy">Налады проксі: даведайцеся, як наладзіць дадаткі для працы з Orbot</string> <string name="wizard_tips_duckgo">Дадатак пошукавай сістэмы DuckDuckGo</string> - <string name="wizard_tips_twitter">Twitter падтрымлівае http-проксі \\"localhost:8118\\"</string> + <string name="wizard_tips_twitter">Twitter падтрымлівае http-проксі \"localhost:8118\"</string> <string name="wizard_tips_story_maker">StoryMaker - напішыце апавяданне і пакіньце яго Tor для забеспячэння бяспекі!</string> <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Налады проксі</string> - <string name="wizard_proxy_help_msg">Калі выкарыстоўваны вамі дадатак для Android падтрымлівае HTTP ці SOCKS-проксі, то вы можаце наладзіць яго на падключэнне да Orbot і выкарыстанне Tor.\n\n\nЗначэнне хаста - 127.0.0.1 ці \\"localhost\\". Для HTTP нумар порта - 8118. Для SOCKS-проксі - 9050. Па магчымасці выкарыстоўвайце SOCKS4A ці SOCKS5.\n \n\n\nВы можаце даведацца больш пра працу праз проксі на Android, прачытаўшы гэты FAQ: http://tinyurl.com/proxyandroid\n </string> + <string name="wizard_proxy_help_msg">Калі выкарыстоўваны вамі дадатак для Android падтрымлівае HTTP ці SOCKS-проксі, то вы можаце наладзіць яго на падключэнне да Orbot і выкарыстанне Tor.\n\n\nЗначэнне хаста - 127.0.0.1 ці \"localhost\". Для HTTP нумар порта - 8118. Для SOCKS-проксі - 9050. Па магчымасці выкарыстоўвайце SOCKS4A ці SOCKS5.\n \n\n\nВы можаце даведацца больш пра працу праз проксі на Android, прачытаўшы гэты FAQ: http://tinyurl.com/proxyandroid\n </string> <string name="wizard_final">Orbot гатоў да выкарыстання!</string> <string name="wizard_final_msg">Мільёны людзей ва ўсім свеце выкарыстоўваюць Tor па розных прычынах. Журналісты і блогеры, праваабаронцы, супрацоўнікі праваахоўных органаў, салдаты, карпарацыі, грамадзяне краін з рэпрэсіўным рэжымам і проста звычайныя грамадзяне..., а зараз гатовы і вы!</string> <string name="wizard_exit_at_first_screen_toast">Калі ласка, наладзьце Orbot перш чым прыступіць да выкарыстання!</string>  - <string name="connect_first_time">Вы паспяхова далучыліся да сеткі Tor, але гэта НЕ значыць, што ваша прылада бяспечная. Вы можаце скарыстацца функцыяй \\'Праверка\\' з меню, каб пратэставаць ваш браўзар.\n\nНаведаеце наш сайт https://guardianproject.info/apps/orbot ці адпраўце ліст на адрас help(a)guardianproject.info, каб даведацца больш.</string> + <string name="connect_first_time">Вы паспяхова далучыліся да сеткі Tor, але гэта НЕ значыць, што ваша прылада бяспечная. Вы можаце скарыстацца функцыяй \'Праверка\' з меню, каб пратэставаць ваш браўзар.\n\nНаведаеце наш сайт https://guardianproject.info/apps/orbot ці адпраўце ліст на адрас help(a)guardianproject.info, каб даведацца больш.</string> <string name="tor_check">Гэта прывядзе да запуску браўзара, абранага на вашай прыладзе па змаўчанні, і падключэнню да сайта https://check.torproject.org дзеля праверкі правільнасці працы Orbot і вызначэння, ці падключаны вы да сеткі Tor.</string> <string name="pref_hs_group">Схаваныя службы</string> <string name="pref_general_group">Агульныя</string> @@ -101,9 +101,9 @@ <string name="wizard_warning_msg">Сама па сабе ўсталёўка Orbot не зробіць аўтаматычна ваш мабільны трафік ананімным.\n\n Вы павінны правільна наладзіць Orbot, вашу прыладу і іншыя дадаткі, што б паспяхова выкарыстоўваць Tor.</string>  <string name="wizard_permissions_title">Дазволы</string> - <string name="wizard_permissions_root_msg1">Вы гэтак жа можаце па жаданні даць Orbot правы \\'Суперкарыстача\\' для доступу да дадатковых магчымасцяў тыпу празрыстай проксіфацыі.</string> - <string name="wizard_permissions_root_msg2">Здаецца, ваша прылада не мае root-правоў і не прапануе доступ \\'Суперкарыстача\\'.\n\nКалі ласка, паспрабуйце рэжым \\'Дадаткі\\' на галоўным экране.</string> - <string name="wizard_permissions_no_root_msg">Здаецца, ваша прылада не мае root-правоў і не прапануе доступ \\'Суперкарыстача\\'.\n\n Калі ласка, паспрабуйце рэжым \\'Дадаткі\\' на галоўным экране.</string> + <string name="wizard_permissions_root_msg1">Вы гэтак жа можаце па жаданні даць Orbot правы \'Суперкарыстача\' для доступу да дадатковых магчымасцяў тыпу празрыстай проксіфацыі.</string> + <string name="wizard_permissions_root_msg2">Здаецца, ваша прылада не мае root-правоў і не прапануе доступ \'Суперкарыстача\'.\n\nКалі ласка, паспрабуйце рэжым \'Дадаткі\' на галоўным экране.</string> + <string name="wizard_permissions_no_root_msg">Здаецца, ваша прылада не мае root-правоў і не прапануе доступ \'Суперкарыстача\'.\n\n Калі ласка, паспрабуйце рэжым \'Дадаткі\' на галоўным экране.</string>  <string name="wizard_tips_title">Дадаткі, што працуюць з Orbot</string> <string name="wizard_tips_gibberbot">ChatSecure: дадатак для бяспечнага ліставання з прыватным шыфраваннем</string> @@ -159,7 +159,7 @@ <string name="setting_up_port_based_transparent_proxying_">Усталёўка заснаванай на партах празрыстай проксіфацыі...</string> <string name="bridge_error">Памылка моста</string> <string name="bridge_requires_ip">Для выкарыстання трэба задаць IP-адрас прынамсі аднаго моста.</string> - <string name="send_email_for_bridges">Адпраўце ліст на адрас bridges(a)torproject.org з радком \\"get bridges\\" у целе паведамлення з уліковага запісу GMail.</string> + <string name="send_email_for_bridges">Адпраўце ліст на адрас bridges(a)torproject.org з радком \"get bridges\" у целе паведамлення з уліковага запісу GMail.</string> <string name="error">Памылка</string> <string name="your_reachableaddresses_settings_caused_an_exception_">Вашы налады даступных адрасоў выклікалі вынятак!</string> <string name="your_relay_settings_caused_an_exception_">Вашы налады рэтранслятара выклікалі вынятак!</string> @@ -285,7 +285,7 @@ <string name="apps_mode">VPN-рэжым</string> <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Вы можаце дазволіць дадаткам праходзіць праз Tor з дапамогай убудаванай VPN-сеткі Orbot.\n\nГэта не зробіць вас ананімным, але гэта дапаможа прайсці праз брандмаўэры.</string> <string name="send_email">Адправіць ліст</string> - <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Вы можаце атрымаць адрас моста па электроннай пошце, з сайта ці шляхам сканавання QR-кода. Абярыце \\"Эл. пошта\\" ці \\"Сайт\\" ніжэй, каб запытаць адрас моста.\n\nАтрыманы адрас скапіюйце і ўстаўце яго ў падзеле налад Orbot \\"Масты\\", пасля чаго перазапусціце дадатак.</string> + <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Вы можаце атрымаць адрас моста па электроннай пошце, з сайта ці шляхам сканавання QR-кода. Абярыце \"Эл. пошта\" ці \"Сайт\" ніжэй, каб запытаць адрас моста.\n\nАтрыманы адрас скапіюйце і ўстаўце яго ў падзеле налад Orbot \"Масты\", пасля чаго перазапусціце дадатак.</string> <string name="install_orweb">Усталяваць Orfox</string> <string name="standard_browser">Стандартны браўзар</string> <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">НАТАТКА: на прыладах Intel X86/Atom працуюць толькі стандартныя масты Tor</string> diff --git a/app/src/main/res/values-en-rGB/poestrings.xml b/app/src/main/res/values-en-rGB/poestrings.xml index 62663670..d09c7d6a 100644 --- a/app/src/main/res/values-en-rGB/poestrings.xml +++ b/app/src/main/res/values-en-rGB/poestrings.xml @@ -14,7 +14,7 @@ <string name="action_more">TELL ME MORE</string> <string name="vpn_setup">You can enable any app to go through Tor using our built-in VPN.</string> - <string name="vpn_setup_sub">This won\\'t make you anonymous, but it will help get through firewalls.</string> + <string name="vpn_setup_sub">This won\'t make you anonymous, but it will help get through firewalls.</string> <string name="action_vpn_choose">CHOOSE APPS</string> <string name="status_connected">Connected!</string>

1 0

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 22 Mar '19

22 Mar '19

commit 973156c79aae82c36f1b6edc5e24c40c71e92cb7 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 22 16:20:43 2019 +0000 Update translations for whisperback_completed --- sk/sk.po | 113 +++++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 67 insertions(+), 46 deletions(-) diff --git a/sk/sk.po b/sk/sk.po index d75971939..5dba690a9 100644 --- a/sk/sk.po +++ b/sk/sk.po @@ -3,21 +3,22 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Juraj Cigáň <kusavica(a)gmail.com>, 2019 # Michal D. <momoali007(a)googlemail.com>, 2013 # Michal Slovák <michalslovak2(a)hotmail.com>, 2013 msgid "" msgstr "" -"Project-Id-Version: The Tor Project\n" +"Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-16 19:54+0100\n" -"PO-Revision-Date: 2016-03-21 16:28+0000\n" -"Last-Translator: Michal Slovák <michalslovak2(a)hotmail.com>\n" +"POT-Creation-Date: 2018-06-11 17:17+0200\n" +"PO-Revision-Date: 2019-03-22 16:13+0000\n" +"Last-Translator: Juraj Cigáň <kusavica(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" #. XXX use a better exception #: ../whisperBack/whisperback.py:56 @@ -25,12 +26,12 @@ msgstr "" msgid "Invalid contact email: %s" msgstr "Neplatný kontaktny email: %s" -#: ../whisperBack/whisperback.py:73 +#: ../whisperBack/whisperback.py:74 #, python-format msgid "Invalid contact OpenPGP key: %s" msgstr "Neplatný kontaktný OpenPGP kľúč: %s" -#: ../whisperBack/whisperback.py:75 +#: ../whisperBack/whisperback.py:76 msgid "Invalid contact OpenPGP public key block" msgstr "Neplatný blok verejného OpenPGP kľúča" @@ -38,43 +39,59 @@ msgstr "Neplatný blok verejného OpenPGP kľúča" #, python-format msgid "" "The %s variable was not found in any of the configuration files " -"/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" -msgstr "%s premenná nebola nájdená v žiadnych konfiguračných súboroch /etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" +"/etc/whisperback/config.py, ~/.whisperback/config.py, or ./config.py" +msgstr "Premenná %s sa nenašla v žiadnom konfiguračnom súbore z /etc/whisperback/config.py, ~/.whisperback/config.py ani ./config.py" -#: ../whisperBack/gui.py:148 +#: ../whisperBack/gui.py:111 +msgid "Name of the affected software" +msgstr "Názov softvéru" + +#: ../whisperBack/gui.py:113 +msgid "Exact steps to reproduce the error" +msgstr "Kroky na reprodukovanie chyby" + +#: ../whisperBack/gui.py:115 +msgid "Actual result and description of the error" +msgstr "Skutočný výsledok a popis chyby" + +#: ../whisperBack/gui.py:117 +msgid "Desired result" +msgstr "Požadovaný výsledok" + +#: ../whisperBack/gui.py:130 msgid "Unable to load a valid configuration." msgstr "Nie je možné načítať validnú konfiguraciu." -#: ../whisperBack/gui.py:214 +#: ../whisperBack/gui.py:166 msgid "Sending mail..." msgstr "Odosielam mail..." -#: ../whisperBack/gui.py:215 +#: ../whisperBack/gui.py:167 msgid "Sending mail" msgstr "Odosielam mail" #. pylint: disable=C0301 -#: ../whisperBack/gui.py:217 +#: ../whisperBack/gui.py:169 msgid "This could take a while..." msgstr "Toto môže biť na dlhšie..." -#: ../whisperBack/gui.py:232 -msgid "The contact email adress doesn't seem valid." -msgstr "Kontaktná emailová adresa sa nezdá but správna." +#: ../whisperBack/gui.py:185 +msgid "The contact email address doesn't seem valid." +msgstr "Táto e-mailová adresa sa nezdá byť správna." -#: ../whisperBack/gui.py:249 +#: ../whisperBack/gui.py:202 msgid "Unable to send the mail: SMTP error." msgstr "Nie je možné odoslať správu: chyba SMTP" -#: ../whisperBack/gui.py:251 +#: ../whisperBack/gui.py:204 msgid "Unable to connect to the server." msgstr "Nedá sa pripojiť na server." -#: ../whisperBack/gui.py:253 +#: ../whisperBack/gui.py:206 msgid "Unable to create or to send the mail." msgstr "Správa sa nedá vytvoriť ani poslať." -#: ../whisperBack/gui.py:256 +#: ../whisperBack/gui.py:209 msgid "" "\n" "\n" @@ -83,20 +100,20 @@ msgid "" "If it does not work, you will be offered to save the bug report." msgstr "\n\nSpráva o chybe sa nedá poslať, zrejme z dôvodu problémov so sieťou. Prosím, pokúste sa znovu pripojiť do siete a kliknite znova na tlačidlo poslať.\n\nAk to nefunguje, bude Vám ponúknutá možnosť uložiť správu o chybe." -#: ../whisperBack/gui.py:269 +#: ../whisperBack/gui.py:222 msgid "Your message has been sent." msgstr "Vaša správa bola odoslaná." -#: ../whisperBack/gui.py:276 +#: ../whisperBack/gui.py:229 msgid "An error occured during encryption." msgstr "Nastala chyba počas šifrovania." -#: ../whisperBack/gui.py:296 +#: ../whisperBack/gui.py:249 #, python-format msgid "Unable to save %s." msgstr "Nie je možné uložiť %s." -#: ../whisperBack/gui.py:319 +#: ../whisperBack/gui.py:272 #, python-format msgid "" "The bug report could not be sent, likely due to network problems.\n" @@ -106,33 +123,33 @@ msgid "" "Do you want to save the bug report to a file?" msgstr "Správa o chybe nemôže byť odoslaná, zrejme kvôli sieťovým problémom.\n\nNamiesto toho môžete uložiť správu o chybe ako súbor na USB kľúč a skúsiť nám ju poslať na %s z Vášho emailového účtu prostredníctvom iného operačného systému. Majte však na pamäti, že takto poslaná správa nebude anonymná, ak nepodniknete iné kroky na jej zabezpečenie (napr. použitím Toru so vzdialeným emailovým účtom).\n\nChcete uložiť správu o chybe do súboru?" -#: ../whisperBack/gui.py:379 ../data/whisperback.ui.h:21 +#: ../whisperBack/gui.py:332 ../data/whisperback.ui.h:21 msgid "WhisperBack" msgstr "WhisperBack" -#: ../whisperBack/gui.py:380 ../data/whisperback.ui.h:2 +#: ../whisperBack/gui.py:333 ../data/whisperback.ui.h:2 msgid "Send feedback in an encrypted mail." msgstr "Poslať odozvu v zašifrovanej správe." -#: ../whisperBack/gui.py:383 -msgid "Copyright © 2009-2012 Tails developpers (tails(a)boum.org)" -msgstr "Copyright © 2009-2012 Tails developpers (tails(a)boum.org)" +#: ../whisperBack/gui.py:336 +msgid "Copyright © 2009-2018 Tails developers (tails(a)boum.org)" +msgstr "Copyright © 2009-2018 vývojári Tails (tails(a)boum.org)" -#: ../whisperBack/gui.py:384 +#: ../whisperBack/gui.py:337 msgid "Tails developers <tails(a)boum.org>" msgstr "Vývojári Tails <tails(a)boum.org>" -#: ../whisperBack/gui.py:385 +#: ../whisperBack/gui.py:338 msgid "translator-credits" msgstr "prekladatelia" -#: ../whisperBack/gui.py:412 +#: ../whisperBack/gui.py:370 msgid "This doesn't seem to be a valid URL or OpenPGP key." msgstr "Toto nie je platná URL adresa ani OpenPGP kľúč." #: ../data/whisperback.ui.h:1 -msgid "Copyright © 2009-2012 tails(a)boum.org" -msgstr "Copyright © 2009-2012 tails(a)boum.org" +msgid "Copyright © 2009-2018 tails(a)boum.org" +msgstr "Copyright © 2009-2018 tails(a)boum.org" #: ../data/whisperback.ui.h:3 msgid "https://tails.boum.org/" @@ -141,7 +158,7 @@ msgstr "https://tails.boum.org/" #: ../data/whisperback.ui.h:4 msgid "" "WhisperBack - Send feedback in an encrypted mail\n" -"Copyright (C) 2009-2012 Tails developers <tails(a)boum.org>\n" +"Copyright (C) 2009-2018 Tails developers <tails(a)boum.org>\n" "\n" "This program is free software; you can redistribute it and/or modify\n" "it under the terms of the GNU General Public License as published by\n" @@ -155,7 +172,7 @@ msgid "" "\n" "You should have received a copy of the GNU General Public License\n" "along with this program. If not, see <http://www.gnu.org/licenses/>.\n" -msgstr "WhisperBack - Pošlite Vašu odzvu v zašifrovanej správe\nCopyright (C) 2009-2012 Vývojári Tails <tails(a)boum.org>\n\nTento program je slobodným softvérom; môžete ho šíriť a/alebo ho upravovať\npod podmienkou dodržania licencie GNU General Public License zverejnenej\nnadáciou Free Software Foundation; buď vo verzii 3 tejto licencie, alebo (ak\nchcete), v ktorejkoľvek jej novšej verzií.\n\nTento program je šírený v nádeji, že bude užitočný, ale\nBEZ AKEJKOĽVEK ZÁRUKY; i bez implicitnej záruky\nPREDAJNOSTI alebo VHODNOSTI NA KONKRÉTNY ÚČEL. Pozri GNU\nGeneral Public License pre viac informácií.\n\nSpolu s programom by ste mali dostať kópiu GNU General Public License.\nAk ste ju nedostali, pozrite <http://www.gnu.org/licenses/>.\n" +msgstr "WhisperBack - odošlite spätnú väzbu zašifrovanou formou\nCopyright (C) 2009-2018 vývojári Tails <tails(a)boum.org>\n\nTento program je slobodný softvér - môžete ho šíriť a/alebo\nupravovať za podmienok licencie GNU General Public License\nzverejnenej organizáciou Free Software Foundation. Riaďte sa verziou 3\nalebo akoukoľvek novšou.\n\nTento program je šírený s nádejou, že bude užitočný.\nJe však BEZ AKEJKOĽVEK ZÁRUKY; bez výslovnej záruky\nOBCHODOVATEĽNOSTI či VHODNOSTI NA URČITÝ ÚČEL. Podrobnosti nájdete v GNU\nGeneral Public License.\n\nKópia licencie GNU General Public License by mala byť priložená\nk tomuto programu. Ak ju nemáte, nájdete ju na <http://www.gnu.org/licenses/>.\n" #: ../data/whisperback.ui.h:20 msgid "" @@ -172,29 +189,33 @@ msgid "Bug description" msgstr "Popis chyby" #: ../data/whisperback.ui.h:24 -msgid "Optional email address to contact you" -msgstr "Vhodná emailová adresa, na ktorej Vás môžeme kontaktovať" +msgid "Help:" +msgstr "Pomocník:" #: ../data/whisperback.ui.h:25 +msgid "Read our bug reporting guidelines." +msgstr "Prečítajte si naše pokyny na hlásenie chýb." + +#: ../data/whisperback.ui.h:26 +msgid "Email address (if you want an answer from us)" +msgstr "E-mailová adresa (ak od nás chcete odpoveď)" + +#: ../data/whisperback.ui.h:27 msgid "optional PGP key" msgstr "voliteľný PGP kľúč" -#: ../data/whisperback.ui.h:26 +#: ../data/whisperback.ui.h:28 msgid "Technical details to include" msgstr "Technické podrobnosti na priloženie" -#: ../data/whisperback.ui.h:27 +#: ../data/whisperback.ui.h:29 msgid "headers" msgstr "hlavičky" -#: ../data/whisperback.ui.h:28 +#: ../data/whisperback.ui.h:30 msgid "debugging info" msgstr "informácie o ladení" -#: ../data/whisperback.ui.h:29 -msgid "Help" -msgstr "Pomocník" - -#: ../data/whisperback.ui.h:30 +#: ../data/whisperback.ui.h:31 msgid "Send" msgstr "Poslať"

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 22 Mar '19

22 Mar '19

commit ae7c89357530405b40bc6d10185eba1cc2ec95be Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 22 16:20:36 2019 +0000 Update translations for whisperback --- sk/sk.po | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/sk/sk.po b/sk/sk.po index e1936c87d..5dba690a9 100644 --- a/sk/sk.po +++ b/sk/sk.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Juraj Cigáň <kusavica(a)gmail.com>, 2019 # Michal D. <momoali007(a)googlemail.com>, 2013 # Michal Slovák <michalslovak2(a)hotmail.com>, 2013 msgid "" @@ -10,8 +11,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-06-11 17:17+0200\n" -"PO-Revision-Date: 2019-01-15 12:20+0000\n" -"Last-Translator: erinm\n" +"PO-Revision-Date: 2019-03-22 16:13+0000\n" +"Last-Translator: Juraj Cigáň <kusavica(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" @@ -39,15 +40,15 @@ msgstr "Neplatný blok verejného OpenPGP kľúča" msgid "" "The %s variable was not found in any of the configuration files " "/etc/whisperback/config.py, ~/.whisperback/config.py, or ./config.py" -msgstr "" +msgstr "Premenná %s sa nenašla v žiadnom konfiguračnom súbore z /etc/whisperback/config.py, ~/.whisperback/config.py ani ./config.py" #: ../whisperBack/gui.py:111 msgid "Name of the affected software" -msgstr "" +msgstr "Názov softvéru" #: ../whisperBack/gui.py:113 msgid "Exact steps to reproduce the error" -msgstr "" +msgstr "Kroky na reprodukovanie chyby" #: ../whisperBack/gui.py:115 msgid "Actual result and description of the error" @@ -76,7 +77,7 @@ msgstr "Toto môže biť na dlhšie..." #: ../whisperBack/gui.py:185 msgid "The contact email address doesn't seem valid." -msgstr "" +msgstr "Táto e-mailová adresa sa nezdá byť správna." #: ../whisperBack/gui.py:202 msgid "Unable to send the mail: SMTP error." @@ -132,7 +133,7 @@ msgstr "Poslať odozvu v zašifrovanej správe." #: ../whisperBack/gui.py:336 msgid "Copyright © 2009-2018 Tails developers (tails(a)boum.org)" -msgstr "" +msgstr "Copyright © 2009-2018 vývojári Tails (tails(a)boum.org)" #: ../whisperBack/gui.py:337 msgid "Tails developers <tails(a)boum.org>" @@ -148,7 +149,7 @@ msgstr "Toto nie je platná URL adresa ani OpenPGP kľúč." #: ../data/whisperback.ui.h:1 msgid "Copyright © 2009-2018 tails(a)boum.org" -msgstr "" +msgstr "Copyright © 2009-2018 tails(a)boum.org" #: ../data/whisperback.ui.h:3 msgid "https://tails.boum.org/" @@ -171,7 +172,7 @@ msgid "" "\n" "You should have received a copy of the GNU General Public License\n" "along with this program. If not, see <http://www.gnu.org/licenses/>.\n" -msgstr "" +msgstr "WhisperBack - odošlite spätnú väzbu zašifrovanou formou\nCopyright (C) 2009-2018 vývojári Tails <tails(a)boum.org>\n\nTento program je slobodný softvér - môžete ho šíriť a/alebo\nupravovať za podmienok licencie GNU General Public License\nzverejnenej organizáciou Free Software Foundation. Riaďte sa verziou 3\nalebo akoukoľvek novšou.\n\nTento program je šírený s nádejou, že bude užitočný.\nJe však BEZ AKEJKOĽVEK ZÁRUKY; bez výslovnej záruky\nOBCHODOVATEĽNOSTI či VHODNOSTI NA URČITÝ ÚČEL. Podrobnosti nájdete v GNU\nGeneral Public License.\n\nKópia licencie GNU General Public License by mala byť priložená\nk tomuto programu. Ak ju nemáte, nájdete ju na <http://www.gnu.org/licenses/>.\n" #: ../data/whisperback.ui.h:20 msgid "" @@ -189,15 +190,15 @@ msgstr "Popis chyby" #: ../data/whisperback.ui.h:24 msgid "Help:" -msgstr "" +msgstr "Pomocník:" #: ../data/whisperback.ui.h:25 msgid "Read our bug reporting guidelines." -msgstr "" +msgstr "Prečítajte si naše pokyny na hlásenie chýb." #: ../data/whisperback.ui.h:26 msgid "Email address (if you want an answer from us)" -msgstr "" +msgstr "E-mailová adresa (ak od nás chcete odpoveď)" #: ../data/whisperback.ui.h:27 msgid "optional PGP key"

1 0

[translation/torbutton-securitylevelproperties_completed] Update translations for torbutton-securitylevelproperties_completed
by translation＠torproject.org 22 Mar '19

22 Mar '19

commit 4a8587d867bfb4edad14fe0340ad5b216a58a116 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 22 16:19:46 2019 +0000 Update translations for torbutton-securitylevelproperties_completed --- sk/securitylevel.properties | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/sk/securitylevel.properties b/sk/securitylevel.properties new file mode 100644 index 000000000..98d0b268d --- /dev/null +++ b/sk/securitylevel.properties @@ -0,0 +1,22 @@ +securityLevel.securityLevel = Úroveň zabezpečenia +securityLevel.customWarning = Vlastné +securityLevel.overview = Vypne určité funkcie webových stránok, ktoré môžu byť použité na kompromitáciu vašej bezpečnosti alebo anonymity. +securityLevel.standard.level = Štandardné +securityLevel.standard.tooltip = Úroveň bezpečnosti: Štandardná +securityLevel.standard.summary = Všetky funkcie Toru a webovej stránky sú aktivované. +securityLevel.safer.level = Bezpečnejšie +securityLevel.safer.tooltip = Úroveň bezpečnosti: Bezpečnejšia +securityLevel.safer.summary = Vypne funkcie webových stránok, ktoré sú často nebezpečné, čím môže obmedziť fungovanie niektorých stránok. +securityLevel.safer.description1 = JavaScript je zakázaný na stránkach nepoužívajúcich HTTPS +securityLevel.safer.description2 = Niektoré písma a matematické symboly sú zakázané +securityLevel.safer.description3 = Zvuk a video (HTML5) sú nastavené na spustenie po kliknutí. +securityLevel.safest.level = Najbezpečnejšie +securityLevel.safest.tooltip = Úroveň bezpečnosti: Najbezpečnejšia +securityLevel.safest.summary = Povolí len funkcie webových stránok nutné pre statické stránky a základné služby. Tieto zmeny ovplyvnia obrázky, médiá a skripty. +securityLevel.safest.description1 = JavaScript je v základnom nastavení zakázaný na všetkých stránkach. +securityLevel.safest.description2 = Niektoré písma, ikony, matematické symboly a obrázky sú zakázané. +securityLevel.safest.description3 = Zvuk a video (HTML5) sú nastavené na spustenie po kliknutí. +securityLevel.custom.summary = Upravili ste nastavenia prehliadača do neobvyklej podoby. Za účelom bezpečnosti a ochrany súkromia vám odporúčame použiť jeden z predvolených úrovní zabezpečenia. +securityLevel.learnMore = Zistite viac +securityLevel.restoreDefaults = Obnoviť pôvodné nastavenia +securityLevel.advancedSecuritySettings = Pokročilé nastavenie zabezpečenia…

1 0