Merge pull request #9 from eighthave/reboot-and-reproducible

Reboot and reproducible

.gitignore

@@ -1,3 +1,4 @@
+assets/
 /external/bin/
 /external/include/
 /external/*-build-stamp
@@ -9,8 +10,13 @@
 bin
 gen
 native
+libs/jtorctl.jar
 local.properties
 builds
 /patches/*
 obj
 releases
+
+# ant build products
+build.xml
+proguard-project.txt

.gitmodules

@@ -1,30 +1,40 @@
 [submodule "external/tor"]
 	path = external/tor
 	url = https://git.torproject.org/git/tor.git
+	ignore = dirty
 [submodule "external/libevent"]
 	path = external/libevent
 	url = https://github.com/libevent/libevent.git
+	ignore = dirty
 [submodule "external/jtorctl"]
 	path = external/jtorctl
 	url = https://github.com/guardianproject/jtorctl
+	ignore = dirty
 [submodule "external/openssl"]
 	path = external/openssl
 	url = git://git.openssl.org/openssl
+	ignore = dirty
 [submodule "external/iptables"]
 	path = external/iptables
 	url = git://git.netfilter.org/iptables
+	ignore = dirty
 [submodule "external/superuser-commands"]
 	path = external/superuser-commands
 	url = https://github.com/dschuermann/superuser-commands.git
+	ignore = dirty
 [submodule "external/polipo"]
 	path = external/polipo
 	url = https://github.com/jech/polipo.git
+	ignore = dirty
 [submodule "external/badvpn"]
 	path = external/badvpn
 	url = https://github.com/guardianproject/badvpn.git
+	ignore = dirty
 [submodule "external/pluto"]
 	path = external/pluto
 	url = https://github.com/guardianproject/pluto.git
+	ignore = dirty
 [submodule "external/jsocks"]
 	path = external/jsocks
 	url = https://github.com/guardianproject/jsocks.git
+	ignore = dirty

BUILD

@@ -27,7 +27,7 @@ Be sure that you have all of the git submodules up-to-date:
 To begin building, from the Orbot root directory, you first need to build all
 external C/native dependencies:
 
-	export NDK_BASE={PATH TO YOUR NDK INSTALL}
+	export ANDROID_NDK_HOME={PATH TO YOUR NDK INSTALL}
 	make -C external
 
 At this point, you'll have Tor and Polipo binaries that can be run on an
@@ -54,7 +54,7 @@ into < 1M chunks because some Android devices don't like resources larger than
 
 Now build the Android app
 
-    ./update-ant-build
+    ./setup-ant
 	ant release
 
 This will produce an unsigned Tor package in ./bin/Orbot-unsigned.apk!

compare-to-official-release

@@ -0,0 +1,62 @@
+#!/bin/sh
+
+if [ $# -ne 2 ]; then
+    echo "Usage: $0 /path/to/Orbot-v15.0.1.apk /another/Orbot-v15.0.1.apk"
+    exit 1
+fi
+
+set -e
+set -x
+
+test -e "$1"
+test -e "$2"
+
+tmpdir=`mktemp -d /tmp/.compare-apks.XXXXXXXXXX`
+apk1=$(basename $1)
+apk2=$(basename $2)
+sourcedir1=$(cd `dirname $1` && pwd)
+sourcedir2=$(cd `dirname $2` && pwd)
+apkname1=`echo $apk1 | sed 's,\.apk$,,'`
+apkname2=`echo $apk2 | sed 's,\.apk$,,'`
+dir1=$tmpdir/`echo $(dirname $1) | sed 's,[/ ],_,g'`-$apkname1
+dir2=$tmpdir/`echo $(dirname $2) | sed 's,[/ ],_,g'`-$apkname2
+
+mkdir -p $dir1/zip
+cd $dir1/zip
+unzip "$sourcedir1/$apk1"
+cd ..
+apktool d --no-res --no-src "$sourcedir1/$apk1"
+mv "$apkname1" apktool
+# strip the full path to the zip for the comparison
+unzip -l "$sourcedir1/$apk1" | sed 's,^\(Archive:\s\s*\)/.*/,\1,' > $dir1/unzip-l.txt
+unzip -lv "$sourcedir1/$apk1" | sed 's,^\(Archive:\s\s*\)/.*/,\1,' > $dir1/unzip-lv.txt
+zipinfo -lv "$sourcedir1/$apk1" | sed 's,^\(Archive:\s\s*\)/.*/,\1,' > $dir1/zipinfo-lv.txt
+xxd "$sourcedir1/$apk1" > $dir1/xxd
+for f in $dir1/zip/assets/*/*; do
+    xxd $f > $dir1/xxd-$(basename $f)
+done
+
+mkdir -p $dir2/zip
+cd $dir2/zip
+unzip "$sourcedir2/$apk2"
+cd ..
+apktool d --no-res --no-src "$sourcedir2/$apk2"
+mv "$apkname2" apktool
+# strip the full path to the zip for the comparison
+unzip -l "$sourcedir2/$apk2" | sed 's,^\(Archive:\s\s*\)/.*/,\1,' > $dir2/unzip-l.txt
+unzip -lv "$sourcedir2/$apk2" | sed 's,^\(Archive:\s\s*\)/.*/,\1,' > $dir2/unzip-lv.txt
+zipinfo -lv "$sourcedir2/$apk2" | sed 's,^\(Archive:\s\s*\)/.*/,\1,' > $dir2/zipinfo-lv.txt
+xxd "$sourcedir2/$apk2" > $dir2/xxd
+for f in $dir2/zip/assets/*/*; do
+    xxd $f > $dir2/xxd-$(basename $f)
+done
+
+if which meld > /dev/null; then
+    meld $dir1 $dir2
+elif which opendiff > /dev/null; then
+    opendiff $dir1 $dir2
+else
+    echo "ERROR: meld or opendiff required for the comparison!"
+fi
+
+rm -rf $dir1 $dir2

custom_rules.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+
+  <target name="-getgitdetails" >
+    <exec executable="git" outputproperty="git.describe">
+      <arg value="describe"/>
+    </exec>
+    <exec executable="git" outputproperty="git.revision">
+      <arg value="rev-parse"/>
+      <arg value="HEAD"/>
+    </exec>
+  </target>
+
+  <target name="rename-release-with-version-number" depends="-getgitdetails">
+    <xmlproperty file="AndroidManifest.xml"
+                 prefix="themanifest"
+                 collapseAttributes="true"/>
+    <!--  see ${sdk.dir}/tools/ant/build.xml -set-release-mode -->
+    <property name="out.packaged.file"
+              location="${out.absolute.dir}/${ant.project.name}-v${git.describe}-unsigned.apk" />
+    <property name="out.final.file"
+              location="${out.absolute.dir}/${ant.project.name}-v${git.describe}.apk" />
+  </target>
+
+  <target name="-set-release-mode"
+          depends="rename-release-with-version-number,android_rules.-set-release-mode">
+    <echo message="target: ${build.target}"></echo>
+  </target>
+
+  <target name="-post-package" depends="-getgitdetails">
+    <property file="${sdk.dir}/tools/source.properties"/>
+    <property name="meta.inf.dir" value="${out.dir}/META-INF"/>
+    <property name="build.manifest.file" value="${meta.inf.dir}/BUILD.MF"/>
+    <mkdir dir="${meta.inf.dir}"/>
+    <manifest file="${build.manifest.file}">
+      <attribute name="Implementation-Package-Name" value="${themanifest.manifest.package}"/>
+      <attribute name="Implementation-Version-Name" value="${themanifest.manifest.android:versionName}"/>
+      <attribute name="Implementation-Version-Code" value="${themanifest.manifest.android:versionCode}"/>
+      <attribute name="Git-Revision" value="${git.revision}"/>
+      <attribute name="Android-SDK-Release" value="${Pkg.Revision}"/>
+      <attribute name="Android-SDK-Host-OS" value="${Archive.HostOs}"/>
+      <attribute name="Android-SDK-aapt" value="${aapt}"/>
+      <attribute name="Android-SDK-zipalign" value="${zipalign}"/>
+    </manifest>
+    <condition property="build.is.debug" value="true" else="false">
+      <equals arg1="${build.target}" arg2="debug" />
+    </condition>
+    <!-- adding BUILD.MF breaks debug builds, but not releases -->
+    <if condition="${build.is.debug}">
+      <else>
+        <jar update="true" destfile="${out.packaged.file}">
+          <fileset dir="${out.dir}" includes="META-INF/BUILD.MF"/>
+        </jar>
+      </else>
+    </if>
+  </target>
+</project>

external/Makefile

@@ -22,7 +22,7 @@ else
 endif
 
 # Android NDK setup
-NDK_BASE ?= /opt/android-ndk
+ANDROID_NDK_HOME ?= /opt/android-ndk
 NDK_PLATFORM_LEVEL ?= 16
 NDK_TOOLCHAIN_VERSION=4.8
 APP_ABI ?= armeabi
@@ -33,7 +33,7 @@ endif
 ifneq ($(filter arm64%, $(APP_ABI)),)
  NDK_ABI := arm64
 endif
-NDK_SYSROOT=$(NDK_BASE)/platforms/android-$(NDK_PLATFORM_LEVEL)/arch-$(NDK_ABI)
+NDK_SYSROOT=$(ANDROID_NDK_HOME)/platforms/android-$(NDK_PLATFORM_LEVEL)/arch-$(NDK_ABI)
 NDK_UNAME := $(shell uname -s | tr '[A-Z]' '[a-z]')
 ifneq ($(filter mips%, $(NDK_ABI)),)
  HOST := $(NDK_ABI)el-linux-android
@@ -55,11 +55,11 @@ NDK_TOOLCHAIN := $(HOST)-$(NDK_TOOLCHAIN_VERSION)
 ifneq ($(filter x86%, $(NDK_ABI)),)
  NDK_TOOLCHAIN := $(NDK_ABI)-$(NDK_TOOLCHAIN_VERSION)
 endif
-NDK_TOOLCHAIN_BASE=$(NDK_BASE)/toolchains/$(NDK_TOOLCHAIN)/prebuilt/$(NDK_UNAME)-$(NDK_PROCESSOR)
+NDK_TOOLCHAIN_BASE=$(ANDROID_NDK_HOME)/toolchains/$(NDK_TOOLCHAIN)/prebuilt/$(NDK_UNAME)-$(NDK_PROCESSOR)
 
 # include Android's build flags
 TARGET_ARCH_ABI = $(APP_ABI)
-include $(NDK_BASE)/toolchains/$(NDK_TOOLCHAIN)/setup.mk
+include $(ANDROID_NDK_HOME)/toolchains/$(NDK_TOOLCHAIN)/setup.mk
 
 CC := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-gcc --sysroot=$(NDK_SYSROOT)
 CXX := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-g++ --sysroot=$(NDK_SYSROOT)

fix-translations

@@ -0,0 +1,10 @@
+#!/bin/bash -x
+
+# Fix TypographyEllipsis programmatically
+sed -i 's/\.\.\./…/g' res/values*/*.xml
+
+# Replace "--" with an "em dash" character
+sed -i 's,\(\>[^\<]*\)--\([^\>]\),\1—\2,g' res/values*/*.xml
+
+# make sure apostrophes in strings are escaped
+sed -i "s,\(>[^<]*[^\\]\)',\1\\\\',gp" res/values*/*.xml

jenkins-build

@@ -0,0 +1,34 @@
+#!/bin/bash
+
+set -e
+set -x
+
+if [ -z $ANDROID_HOME ]; then
+    if [ -e ~/.android/bashrc ]; then
+        . ~/.android/bashrc
+    else
+        echo "ANDROID_HOME must be set!"
+        exit
+    fi
+fi
+
+if [ -z $ANDROID_NDK_HOME ]; then
+    if which ndk-build 2>&1 /dev/null; then
+        ANDROID_NDK_HOME=`which ndk-build |  sed 's,/ndk-build,,'`
+    else
+        echo "ANDROID_NDK_HOME not set and 'ndk-build' not in PATH"
+        exit
+    fi
+fi
+
+# reset version code/name to current date
+versionCodeDate=`date +%s`
+versionNameDate=`date +%Y-%m-%d_%H.%M.%S`
+
+sed -i \
+    -e "s,android:versionCode=\"[0-9][0-9]*\",android:versionCode=\"$versionCodeDate\"," \
+    -e "s,android:versionName=\"\([^\"][^\"]*\)\",android:versionName=\"\1.$versionNameDate\"," \
+    AndroidManifest.xml
+
+make -C external
+./setup-ant

make-release-build

@@ -0,0 +1,76 @@
+#!/bin/bash
+# bash is required because we need bash's printf to guarantee a cross-platform
+# timestamp format.
+
+set -e
+set -x
+
+# make sure we're on a signed tag that matches the version name
+versionName=`sed -n 's,.*versionName="\([^"]*\)".*,\1,p' AndroidManifest.xml`
+describe=`git describe`
+if [ $versionName != $describe ]; then
+    echo "WARNING: building $describe, which is not the latest release ($versionName)"
+else
+    # make a clearer warning above by putting this here
+    set +x
+    echo ""
+    echo ""
+    echo "Checking git tag signature for release build:"
+    git tag -v $versionName
+    echo ""
+    echo ""
+    set -x
+fi
+
+
+if [ -z $ANDROID_HOME ]; then
+    if [ -e ~/.android/bashrc ]; then
+        . ~/.android/bashrc
+    else
+        echo "ANDROID_HOME must be set!"
+        exit
+    fi
+fi
+
+projectroot=`pwd`
+projectname=`sed -n 's,.*name="app_name">\(.*\)<.*,\1,p' res/values/strings.xml`
+
+# standardize timezone to reduce build differences
+export TZ=UTC
+TIMESTAMP=`printf '%(%Y-%m-%d %H:%M:%S)T' \
+    $(git log -n1 --format=format:%at)`
+# run the clock at 5% speed, ant requires a moving clock
+TIMESTAMP_5=`printf '@%(%Y-%m-%d %H:%M:%S)T x0.05' \
+    $(git log -n1 --format=format:%at)`
+
+git reset --hard
+git clean -fdx
+git submodule foreach git reset --hard
+git submodule foreach git clean -fdx
+git submodule sync
+git submodule foreach git submodule sync
+git submodule update --init --recursive
+
+
+if [ -e ~/.android/ant.properties ]; then
+    cp ~/.android/ant.properties $projectroot/
+else
+    echo "skipping release ant.properties"
+fi
+
+faketime "$TIMESTAMP" make -C external
+
+./setup-ant
+faketime -f "$TIMESTAMP_5" ant release
+
+apk=$projectroot/bin/$projectname-v$describe.apk
+
+if which gpg > /dev/null; then
+    if [ -z "`gpg --list-secret-keys`" ]; then
+        echo "No GPG secret keys found, not signing APK"
+    else
+        gpg --armor --detach-sign $apk
+    fi
+else
+    echo "gpg not found, not signing APK"
+fi

res/layout/layout_wizard_tips.xml

@@ -63,15 +63,6 @@
         android:drawableLeft="@drawable/ic_duckduckgo"
         android:text="@string/wizard_tips_duckgo" />
     
-    <Button
-        android:id="@+id/WizardRootButtonInstallFirefox"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="left"
-        android:layout_marginTop="10px"
-        android:drawableLeft="@drawable/icon_firefox"
-        android:text="@string/wizard_tips_firefox" />
-    
     <Button
         android:id="@+id/WizardRootButtonInstallTwitter"
         android:layout_width="fill_parent"
@@ -106,7 +97,7 @@
         android:layout_gravity="left"
         android:layout_marginTop="10px"
         android:drawableLeft="@drawable/ic_play"
-        android:text="@string/wizard_tips_play" />
+        android:text="@string/wizard_tips_fdroid_org" />
     
 
 </LinearLayout>

res/values-ar/strings.xml

@@ -7,11 +7,11 @@
   <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
   <string name="control_permission_label">فعل و اوقف تور</string>
   <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">جاري تشغيل اوربوت...</string>
+  <string name="status_starting_up">جاري تشغيل اوربوت…</string>
   <string name="status_activated">متصل بشبكة تور</string>
   <string name="status_disabled">تم إيقاف اوربوت</string>
   <string name="status_shutting_down">جاري إغلاق اوربوت</string>
-  <string name="tor_process_starting">جاري تشغيل تور...</string>
+  <string name="tor_process_starting">جاري تشغيل تور…</string>
   <string name="tor_process_complete">كامل.</string>
   <string name="tor_process_waiting">انتظار.</string>
   <string name="not_anonymous_yet">تحذير: حركة مرورك ليست خفية حتي الآن! من فضلك قم بتكوين التطبيقات الخاصة بك لإستخدام بروكسي HTTP 127.0.0.1:8118 أو SOCK4A أو SOKS5 127.0.0.1:9050</string>
@@ -73,7 +73,7 @@
   <string name="wizard_tips_msg">التطبيقات التالية تم تطويرها حتي تعمل مع اوربوت. اضغط علي ما تريد تثبيتة علي جهازك الأن, أو يمكنك ان تجدهم لاحقاً علي جوجل بلاي, أو علي موقعنا GuardianProject.info أو من خلال F-Droid.org.</string>
   <string name="wizard_tips_proxy">إعدادات البروكسي - تعلم كيفية تكوين التطبيقات لتعمل مع اوربوت</string>
   <string name="wizard_tips_duckgo">تطبيق محرك البحث DuckDuckGo</string>
-  <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
+
   <string name="wizard_tips_twitter">اضبط البروكسي الخاص بتويتر إلي مستضيف \"localhost\" و المنفذ إلي 8118</string>
   <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
   <string name="wizard_proxy_help_info">إعدادات البروكسي</string>
@@ -96,12 +96,10 @@
   <string name="wizard_tips_title"> برامج معدة للعمل مع اوربوت</string>
   <string name="wizard_tips_orweb">Orweb: متصفح مصمّم للخصوصية و يعمل مع تور</string>
   <string name="wizard_tips_play">يمكنك الحصول علي جميع تطبيقات مشروع الجاردين على جوجل بلاي</string>
-  <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject
+
-</string>
+
-  <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
+
-	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
+
-    <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
-    <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
   <!--Transparent Proxy screen-->
   <string name="wizard_transproxy_title">بروكسي ضمني</string>
   <string name="wizard_transproxy_msg">هذه ستسمح للبرامج بالاتصال بشبكة تور تلقائياً دون اعداد مسبق.</string>
@@ -134,14 +132,14 @@
   <string name="pref_proxy_password_summary">كلمة مرور البروكسي (اختياري)</string>
   <string name="pref_proxy_password_dialog">ادخل كلمة مرور البروكسي</string>
   <string name="status">الحالة</string>
-  <string name="setting_up_full_transparent_proxying_">يتم إعداد بروكسي ضمني كامل...</string>
+  <string name="setting_up_full_transparent_proxying_">يتم إعداد بروكسي ضمني كامل…</string>
-  <string name="setting_up_app_based_transparent_proxying_">يتم إعداد البروكسي الضمني حسب البرامج...</string>
+  <string name="setting_up_app_based_transparent_proxying_">يتم إعداد البروكسي الضمني حسب البرامج…</string>
   <string name="transparent_proxying_enabled">البروكسي الضمني مُفعل</string>
   <string name="transproxy_enabled_for_tethering_">البروكسي الضمني جاهز للربط!</string>
   <string name="warning_error_starting_transparent_proxying_">تحذير: حصل خطأ بتشغيل البروكسي الضمني!</string>
   <string name="transproxy_rules_cleared">تم مسح قواعد البروكسي الضمني</string>
   <string name="couldn_t_start_tor_process_">لقد تعذر بدء تشغيل تور:</string>
-  <string name="setting_up_port_based_transparent_proxying_">يتم إعداد البروكسي الضمني حسب المنفذ...</string>
+  <string name="setting_up_port_based_transparent_proxying_">يتم إعداد البروكسي الضمني حسب المنفذ…</string>
   <string name="bridge_error">خطأ بالجسر</string>
   <string name="bridge_requires_ip">حتي تستطيع إستخدم ميزة الجسور، يجب عليك ادخال عنوان انترنت لجسر واحد علي الأقل.</string>
   <string name="send_email_for_bridges">أرسل بريد إلكتروني إلى bridges@torproject.org مع عبارة \"get bridges\" بداخل الرسالة من حساب بريد gmail.</string>
@@ -188,7 +186,7 @@
   <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">برامج من الطرف الثالث:</string>
   <string name="hidden_service_request">هناك برنامج يحاول فتح منفذ لخادم مخفي %S إلي شبكة تور. هذا السلوك آمن إذا كنت تثق بهذا البرنامج.</string>
-  <string name="found_existing_tor_process">عُثر علي عملية تور سابقة تعمل...</string>
+  <string name="found_existing_tor_process">عُثر علي عملية تور سابقة تعمل…</string>
   <string name="something_bad_happened">حصل خطأ ما. افحص السجل</string>
   <string name="hidden_service_on">الخدمات المخفية التي تعمل حالياً:</string>
   <string name="unable_to_read_hidden_service_name">غير قادر على قراءة اسم الخدمة المخفية</string>
@@ -205,5 +203,5 @@
   <string name="wizard_locale_title">اختار اللغة</string>
   <string name="wizard_locale_msg">إما ان تترك اللغة الافتراضية او إما ان تغير اللغة</string>
   <string name="btn_save_settings">حفظ الإعدادات</string>
-  <string name="no_internet_connection_tor">لا يوجد اتصال بالانترنت; تور في حالة استعداد...</string>
+  <string name="no_internet_connection_tor">لا يوجد اتصال بالانترنت; تور في حالة استعداد…</string>
 </resources>

res/values-az/strings.xml

@@ -7,11 +7,11 @@
   <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
   <string name="control_permission_label">Tor-u başlat və durdur</string>
   <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot başlayır...</string>
+  <string name="status_starting_up">Orbot başlayır…</string>
   <string name="status_activated">Tor şəbəkəsinə bağlandı</string>
   <string name="status_disabled">Orbot deaktivasiya edildi</string>
   <string name="status_shutting_down">Orbot söndürülür</string>
-  <string name="tor_process_starting">Tor müştərisi başlayır...</string>
+  <string name="tor_process_starting">Tor müştərisi başlayır…</string>
   <string name="tor_process_complete">tamamla.</string>
   <string name="tor_process_waiting">gözləyirik.</string>
   <string name="not_anonymous_yet">TƏHLÜKƏ: Sənin trafikin artıq anonim deyil! Lütfən, aplikasiyanı ya HTTP proksi 127.0.0.1:8118, ya SOCKS4A, ya da SOCKS5 proksi 127.0.0.1:9050 istifadə etmək üçün quraşdır.</string>
@@ -74,7 +74,7 @@
   <string name="wizard_tips_otrchat">ChatSecure - Android üçün təhlükəsiz mesajlaşma müştərisi</string>
   <string name="wizard_tips_proxy">Proksi Seçimləri - Aplikasiyaların Orbotla necə işləyəcəyini öyrən</string>
   <string name="wizard_tips_duckgo">DuckDuckGO Axtarış Qurğu aplikasiyası</string>
-  <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
+
   <string name="wizard_tips_twitter">\"Yerlihost\" və 8118 portuna sahiblik üçün Twitter proksini quraşdır</string>
   <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
   <string name="wizard_proxy_help_info">Proksi qurğuları</string>
@@ -96,15 +96,15 @@
   <!--TipsAndTricks screen-->
   <string name="wizard_tips_title">Orbot-a Açıq Aplikasiyalar</string>
   <string name="wizard_tips_gibberbot">ChatSecure: Çat aplikasiyasını Qeydsiz Şifrləmə ilə təhlükəsizləşdir</string>
-  <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string>
+
   <string name="wizard_tips_orweb">Orveb: Tor vasitəsilə işləyən təhlükəsizliyi gücləndirilmiş brauzer</string>
-  <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string>
+
   <string name="wizard_tips_play">Google Play-də bütün Guardian Layihə aplikasiyaları tap</string>
-  <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>
+
-  <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
+
-	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
+
-    <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
+
-    <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
+
   <!--Transparent Proxy screen-->
   <string name="wizard_transproxy_title">Şəffaf Proksiləmə</string>
   <string name="wizard_transproxy_msg">Bu heç bir konfiqurasiyaya ehtiyac olmadan aplikasiyalarının avtomatik olaraq Tor şəbəkəsi vasitəsilə işləməsini təmin edir.</string>
@@ -137,14 +137,14 @@
   <string name="pref_proxy_password_summary">Proksi Şifrə (istəyə bağlı)</string>
   <string name="pref_proxy_password_dialog">Proksi Şifrə Daxil et</string>
   <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Tam şəffaf proksiləmənin quraşdırılması...</string>
+  <string name="setting_up_full_transparent_proxying_">Tam şəffaf proksiləmənin quraşdırılması…</string>
-  <string name="setting_up_app_based_transparent_proxying_">Aplikasiya əsaslı şəffaf proksiləmənin quraşdırılması...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Aplikasiya əsaslı şəffaf proksiləmənin quraşdırılması…</string>
   <string name="transparent_proxying_enabled">Şəffaf proksiləmə AKTİVLƏŞDİRİLDİ</string>
   <string name="transproxy_enabled_for_tethering_">Bağlanma üçün TransProksi aktivləşdirildi!</string>
   <string name="warning_error_starting_transparent_proxying_">TƏHLÜKƏ: şəffaf proksiləmənin başlanmasında xəta!</string>
   <string name="transproxy_rules_cleared">TransProksi qaydalar təmizləndi</string>
   <string name="couldn_t_start_tor_process_">Tor prosesi başlana bilmədi:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Porta əsaslanmış proksiləmənin quraşdırılması...</string>
+  <string name="setting_up_port_based_transparent_proxying_">Porta əsaslanmış proksiləmənin quraşdırılması…</string>
   <string name="bridge_error">Körpü Xətası</string>
   <string name="bridge_requires_ip">Körpü funksiyasını istifadə etmək üçün ən azı bir körpü IP ünvanı əlavə etməlisən.</string>
   <string name="send_email_for_bridges">Gmail hesabından bridges@torproject.org ünvanına mətn hissəsində \"körpü əldə et\" sözləri yazılmaqla məktub göndər.</string>
@@ -191,7 +191,7 @@
   <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">Xidməti Quraşdırma:</string>
   <string name="hidden_service_request">Aplikasiya Tor şəbəkəsinə %S gizli server portu açmaq istəyir. Aplikasiyaya inandığın halda bu təhlükəsizdir.</string>
-  <string name="found_existing_tor_process">mövcud Tor prosesi tapıldı...</string>
+  <string name="found_existing_tor_process">mövcud Tor prosesi tapıldı…</string>
   <string name="something_bad_happened">Nə isə pis bir şey oldu. Girişi yoxla</string>
   <string name="hidden_service_on">burada gizli xidməti:</string>
   <string name="unable_to_read_hidden_service_name">gizli xidmət adını oxumağı deaktivləşdir</string>
@@ -208,7 +208,7 @@
   <string name="wizard_locale_title">Dil Seç</string>
   <string name="wizard_locale_msg">Olduğu kimi saxla, ya da mövcud dilə keç</string>
   <string name="btn_save_settings">Seçimləri Saxla</string>
-  <string name="no_internet_connection_tor">İnternet qoşulması; Tor gözləmə rejimindədir...</string>
+  <string name="no_internet_connection_tor">İnternet qoşulması; Tor gözləmə rejimindədir…</string>
   <string name="bandwidth_">Ötürmə qabiliyyəti:</string>
   <string name="down">aşağı</string>
   <string name="up">yuxarı</string>

res/values-bg/strings.xml

@@ -8,11 +8,11 @@
   <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
   <string name="control_permission_label">стартирай и стопирай Тор</string>
   <string name="tor_proxy_service_process">Tor прокси</string>
-  <string name="status_starting_up">Орбот стартира...</string>
+  <string name="status_starting_up">Орбот стартира…</string>
   <string name="status_activated">Свързан към Тор мрежата</string>
   <string name="status_disabled">Орбот е деактивиран</string>
   <string name="status_shutting_down">Орбот се изключва</string>
-  <string name="tor_process_starting">Стартиране на Тор клиент...</string>
+  <string name="tor_process_starting">Стартиране на Тор клиент…</string>
   <string name="tor_process_complete">завършено.</string>
   <string name="tor_process_waiting">изчакване.</string>
   <string name="not_anonymous_yet">ВНИМАНИЕ: Трафикът Ви не е анонимен! Моля конфигурирайте приложенията си да използват HTTP proxy 127.0.0.1:8118 или SOCKS4A или SOCKS5 proxy 127.0.0.1:9050</string>
@@ -77,7 +77,7 @@
   <string name="wizard_tips_otrchat">ChatSecure - Криптиран чат програма за Андроид</string>
   <string name="wizard_tips_proxy">Proxy Settings - Научете как да конфигурирате приложения да работят през Орбот</string>
   <string name="wizard_tips_duckgo">DuckDuckGo Търсачка</string>
-  <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
+
   <string name="wizard_tips_twitter">Нагласете проксито на Twitter на \"localhost\" и порт 8118</string>
   <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
   <string name="wizard_proxy_help_info">Прокси настройки</string>
@@ -99,15 +99,15 @@
   <!--TipsAndTricks screen-->
   <string name="wizard_tips_title">Приложения през Орбот</string>
   <string name="wizard_tips_gibberbot">ChatSecure: Криптирана чат програма с подръжка на Off-the-Record енкрипция.</string>
-  <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string>
+
   <string name="wizard_tips_orweb">Orweb: Браузър с повишена анонимност, който работи през Тор</string>
-  <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string>
+
   <string name="wizard_tips_play">Намери всики Guardin Project програми в Google Play</string>
-  <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>
+
-  <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
+
-	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
+
-    <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
+
-    <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
+
   <!--Transparent Proxy screen-->
   <string name="wizard_transproxy_title">Прозрачно прокси</string>
   <string name="wizard_transproxy_msg">Това позволява на приложенията Ви автоматично да използват мрежата на Тор без никаква конфигурация.</string>
@@ -140,14 +140,14 @@
   <string name="pref_proxy_password_summary">Прокси Парола (Незадължително)</string>
   <string name="pref_proxy_password_dialog">Въведи Прокси Парола</string>
   <string name="status">Статус</string>
-  <string name="setting_up_full_transparent_proxying_">Конфигуриране на напълно прозрачно прокси...</string>
+  <string name="setting_up_full_transparent_proxying_">Конфигуриране на напълно прозрачно прокси…</string>
-  <string name="setting_up_app_based_transparent_proxying_">Конфигуриране на прозрачно прокси на база приложение...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Конфигуриране на прозрачно прокси на база приложение…</string>
   <string name="transparent_proxying_enabled">Прозрачно прокси АКТИВНО</string>
   <string name="transproxy_enabled_for_tethering_">TransProxy е включен за Тетъринг!</string>
   <string name="warning_error_starting_transparent_proxying_">ВНИМАНИЕ: грешка при стартиране на прозрачно проски!</string>
   <string name="transproxy_rules_cleared">TransProxy правила изчистени</string>
   <string name="couldn_t_start_tor_process_">Неуспешно стартиране на Тор процес: </string>
-  <string name="setting_up_port_based_transparent_proxying_">Конфигуриране на прозрачно прокси на база порт...</string>
+  <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@torproject.org със съдържание \"get bridges\" в  и-мейл от акаунт в gmail.</string>
@@ -194,7 +194,7 @@
   <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">Софтуер на трети страни: </string>
   <string name="hidden_service_request">Приложение иска да отвори порт на скрит сървър %S към Тор мрежата. Безопасно е да се доверите на приложението.</string>
-  <string name="found_existing_tor_process">намерил си съвместим Tor проект...</string>
+  <string name="found_existing_tor_process">намерил си съвместим Tor проект…</string>
   <string name="something_bad_happened">Нещо лошо се случи. Проверете лога</string>
   <string name="hidden_service_on">Скрита услуга включена:</string>
   <string name="unable_to_read_hidden_service_name">не може да прочете име на скрита услуга</string>
@@ -211,7 +211,7 @@
   <string name="wizard_locale_title">Избери език</string>
   <string name="wizard_locale_msg">Остави по подразбиране или смени наличния език</string>
   <string name="btn_save_settings">Запази настройки</string>
-  <string name="no_internet_connection_tor">Няма интернет връзка; Тor е в режим на изчакване...</string>
+  <string name="no_internet_connection_tor">Няма интернет връзка; Тor е в режим на изчакване…</string>
   <string name="bandwidth_">Скорост:</string>
   <string name="down">теглене</string>
   <string name="up">изпращане</string>

res/values-bn-rBD/strings.xml

@@ -7,10 +7,10 @@
   <!--Warning screen-->
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
-  <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
+
-	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
+
-    <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
+
-    <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
+
   <!--Transparent Proxy screen-->
   <string name="default_bridges"></string>
 </resources>

res/values-bs/strings.xml

@@ -13,10 +13,10 @@
   <!--Warning screen-->
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
-  <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
+
-	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
+
-    <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
+
-    <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
+
   <!--Transparent Proxy screen-->
   <!--<string name="pref_use_whispercore">Use WhisperCore</string>
 <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>-->

res/values-ca/strings.xml

@@ -7,11 +7,11 @@
   <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
   <string name="control_permission_label">Inicia i atura Tor</string>
   <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">L\'Orbot s\'està iniciant...</string>
+  <string name="status_starting_up">L\'Orbot s\'està iniciant…</string>
   <string name="status_activated">Esteu connectat a la xarxa Tor</string>
   <string name="status_disabled">L\'Orbot està desactivat</string>
   <string name="status_shutting_down">L\'Orbot s\'està aturant</string>
-  <string name="tor_process_starting">S\'està iniciant el client Tor...</string>
+  <string name="tor_process_starting">S\'està iniciant el client Tor…</string>
   <string name="tor_process_complete">fet.</string>
   <string name="tor_process_waiting">s\'està esperant.</string>
   <string name="not_anonymous_yet">ATENCIÓ: El trànsit de la vostra connexió encara no és anònim! Heu de configurar les vostres aplicacions per utilitzar un proxy HTTP a 127.0.0.1:8118, o un proxy SOCKS4A o SOCKS5 a 127.0.0.1:9050</string>
@@ -23,13 +23,13 @@
   <string name="menu_apps">Apps</string>
   <string name="menu_start">Inicia</string>
   <string name="menu_stop">Atura</string>
-  <string name="menu_about">Quant a...</string>
+  <string name="menu_about">Quant a…</string>
   <string name="menu_wizard">Assistent</string>
   <string name="main_layout_download">Baixada</string>
   <string name="main_layout_upload">Pujada</string>
   <string name="button_help">Ajuda</string>
   <string name="button_close">Tanca</string>
-  <string name="button_about">Quant a...</string>
+  <string name="button_about">Quant a…</string>
   <string name="button_clear_log">Esborra el registre</string>
   <string name="menu_verify">Prova</string>
   <string name="menu_exit">Surt</string>
@@ -50,14 +50,14 @@
   <string name="status_install_fail">Els fitxers binaris de Tor no s\'han pogut instal·lar. Comproveu el registre i notifiqueu-ho a tor-assistants@torproject.org</string>
   <string name="title_error">Error de l\'aplicació</string>
   <string name="wizard_title">Us donem la benvinguda a l\'Orbot</string>
-  <string name="wizard_btn_tell_me_more">Quant a Orbot...</string>
+  <string name="wizard_btn_tell_me_more">Quant a Orbot…</string>
   <string name="btn_next">Següent</string>
   <string name="btn_back">Enrere</string>
   <string name="btn_finish">Fi</string>
   <string name="btn_okay">D\'acord</string>
   <string name="btn_cancel">Cancel·la</string>
   <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Alguns detalls de l\'Orbot...</string>
+  <string name="wizard_details">Alguns detalls de l\'Orbot…</string>
   <string name="wizard_permissions_root">Permís concedit</string>
   <string name="wizard_permissions_stock">Permisos de l\'Orbot</string>
   <string name="wizard_premissions_msg_root">Perfecte! Hem detectat que teniu els permisos root activats per a l\'Orbot. Utilitzarem aquesta capacitat amb sensatesa.</string>
@@ -74,7 +74,7 @@
   <string name="wizard_tips_otrchat">ChatSecure - Client de missatgeria instantània segura per a Android</string>
   <string name="wizard_tips_proxy">Proxy Settings - Aprèn a configurar aplicacions per a què funcionin amb l\'Orbot</string>
   <string name="wizard_tips_duckgo">DuckDuckGo - Aplicació de cerca al web</string>
-  <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
+
   <string name="wizard_tips_twitter">Estableix el proxy de Twitter a l\'amfitrió «localhost» i port 8118</string>
   <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
   <string name="wizard_proxy_help_info">Proxy Settings</string>
@@ -96,15 +96,15 @@
   <!--TipsAndTricks screen-->
   <string name="wizard_tips_title">Aplicacions dissenyades per a l\'Orbot</string>
   <string name="wizard_tips_gibberbot">ChatSecure: Aplicació de xat segur amb encriptació confidencial.</string>
-  <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string>
+
   <string name="wizard_tips_orweb">Orweb: Navegador amb privacitat millorada que funciona a través de Tor</string>
-  <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string>
+
   <string name="wizard_tips_play">Trobareu totes les aplicacions de Guardian Project a Google Play Store</string>
-  <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>
+
-  <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
+
-	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
+
-    <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
+
-    <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
+
   <!--Transparent Proxy screen-->
   <string name="wizard_transproxy_title">Servidor intermediari transparent</string>
   <string name="wizard_transproxy_msg">Això permet que les vostres aplicacions es connectin a través de la xarxa Tor sense haver de configurar res.</string>
@@ -137,14 +137,14 @@
   <string name="pref_proxy_password_summary">Contrasenya del servidor intermediari (opcional)</string>
   <string name="pref_proxy_password_dialog">Introduïu la contrasenya del servidor intermediari</string>
   <string name="status">Estat</string>
-  <string name="setting_up_full_transparent_proxying_">S\'està configurant el servidor intermediari transparent complet...</string>
+  <string name="setting_up_full_transparent_proxying_">S\'està configurant el servidor intermediari transparent complet…</string>
-  <string name="setting_up_app_based_transparent_proxying_">S\'està configurant el servidor intermediari transparent per apps...</string>
+  <string name="setting_up_app_based_transparent_proxying_">S\'està configurant el servidor intermediari transparent per apps…</string>
   <string name="transparent_proxying_enabled">S\'ha ACTIVAT el servidor intermediari transparent</string>
   <string name="transproxy_enabled_for_tethering_">S\'ha activat el servidor intermediari per la compartició de xarxa</string>
   <string name="warning_error_starting_transparent_proxying_">ATENCIÓ: hi ha hagut un error en iniciar el servidor intermediari transparent</string>
   <string name="transproxy_rules_cleared">S\'han esborrat les regles del servidor intermediari transparent</string>
   <string name="couldn_t_start_tor_process_">No s\'ha pogut iniciar el procés Tor:</string>
-  <string name="setting_up_port_based_transparent_proxying_">S\'està configurant el servidor intermediari transparent per ports...</string>
+  <string name="setting_up_port_based_transparent_proxying_">S\'està configurant el servidor intermediari transparent per ports…</string>
   <string name="bridge_error">Hi ha hagut un error de pont</string>
   <string name="bridge_requires_ip">Per poder utilitzar la funcionalitat de pont, cal que introduïu almenys una adreça IP de pont.</string>
   <string name="send_email_for_bridges">Envieu un correu a bridges@torproject.org amb la línia «get bridges» sola al cos del missatge des d\'un compte de gmail.</string>
@@ -191,7 +191,7 @@
   <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">Programari de terceres parts:</string>
   <string name="hidden_service_request">Una aplicació vol obrir el port %S de servei ocult a la xarxa Tor. Això és segur si confieu en l\'aplicació.</string>
-  <string name="found_existing_tor_process">s\'ha trobat un procés Tor existent...</string>
+  <string name="found_existing_tor_process">s\'ha trobat un procés Tor existent…</string>
   <string name="something_bad_happened">Ha fallat alguna cosa. Comproveu el registre</string>
   <string name="hidden_service_on">servei ocult a:</string>
   <string name="unable_to_read_hidden_service_name">ha estat impossible llegir el nom del servei ocult</string>
@@ -208,7 +208,7 @@
   <string name="wizard_locale_title">Tria la llengua</string>
   <string name="wizard_locale_msg">Deixa-ho per defecte o canvia la llengua actual</string>
   <string name="btn_save_settings">Desa els paràmetres</string>
-  <string name="no_internet_connection_tor">No hi ha connexió a internet; Tor resta a l\'espera...</string>
+  <string name="no_internet_connection_tor">No hi ha connexió a internet; Tor resta a l\'espera…</string>
   <string name="bandwidth_">Ample de banda:</string>
   <string name="down">baixada</string>
   <string name="up">pujada</string>

res/values-cs-rCZ/strings.xml

@@ -7,11 +7,11 @@
   <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
   <string name="control_permission_label">spustit a vypnout Tor</string>
   <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot se spouští...</string>
+  <string name="status_starting_up">Orbot se spouští…</string>
   <string name="status_activated">Připojen k síti Tor</string>
   <string name="status_disabled">Orbot je deaktivován</string>
   <string name="status_shutting_down">Orbot se vypíná</string>
-  <string name="tor_process_starting">Startuji Tor klienta...</string>
+  <string name="tor_process_starting">Startuji Tor klienta…</string>
   <string name="tor_process_complete">hotovo.</string>
   <string name="tor_process_waiting">čekám.</string>
   <string name="not_anonymous_yet">VAROVÁNÍ: Vaše komunikace ještě není anonymní! Prosím nastavte vašim aplikacím HTTP proxy 127.0.0.1:8118 nebo SOCKS4A či SOCKS5 proxy 172.0.0.1:9050</string>
@@ -74,7 +74,7 @@
   <string name="wizard_tips_otrchat">ChatSecure - Bezpečný instant messaging klient pro Android</string>
   <string name="wizard_tips_proxy">Proxy Nastavení - Naučte se, jak nastavit aplikace, aby pracovaly s Orbotem</string>
   <string name="wizard_tips_duckgo">Aplikace DuckDuckGo pro vyhledávací engine</string>
-  <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
+
   <string name="wizard_tips_twitter">Nastavit Twitter proxy na host \"localhost\" a port 8118</string>
   <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
   <string name="wizard_proxy_help_info">Nastavení Proxy</string>
@@ -96,15 +96,15 @@
   <!--TipsAndTricks screen-->
   <string name="wizard_tips_title">Orbot-povolené aplikace</string>
   <string name="wizard_tips_gibberbot">ChatSecure: Bezpečná chatovací aplikace s technologií Off-the-Record Encryption</string>
-  <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string>
+
   <string name="wizard_tips_orweb">Orweb: webový prohlížeč s rozšířeným soukromím pracující přes Tor</string>
-  <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string>
+
   <string name="wizard_tips_play">Najděte všechny aplikace Guardian Projektu na Obchodu Play</string>
-  <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>
+
-  <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
+
-	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
+
-    <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
+
-    <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
+
   <!--Transparent Proxy screen-->
   <string name="wizard_transproxy_title">Transparentní proxy</string>
   <string name="wizard_transproxy_msg">Toto povolí aplikacím automaticky běžet přes Tor síť bez jakéhokoliv nastavování.</string>
@@ -138,13 +138,13 @@
   <string name="pref_proxy_password_dialog">Zadejte Proxy heslo</string>
   <string name="status">Stav</string>
   <string name="setting_up_full_transparent_proxying_">Nastavuji transparentní proxy…</string>
-  <string name="setting_up_app_based_transparent_proxying_">Nastavení na aplikacích založené transparentní proxy...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Nastavení na aplikacích založené transparentní proxy…</string>
   <string name="transparent_proxying_enabled">Transparentní proxy POVOLENA</string>
   <string name="transproxy_enabled_for_tethering_">Transparentní proxy povolena pro Tethering!</string>
   <string name="warning_error_starting_transparent_proxying_">VAROVÁNÍ: chyba při startu transparentní proxy!</string>
   <string name="transproxy_rules_cleared">Pravidla TransProxy vymazána</string>
   <string name="couldn_t_start_tor_process_">Nelze spustit Tor proces:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Nastavení na portu založené transparentní proxy...</string>
+  <string name="setting_up_port_based_transparent_proxying_">Nastavení na portu založené transparentní proxy…</string>
   <string name="bridge_error">Chyba bridge</string>
   <string name="bridge_requires_ip">Pro použití bridge musíte zadat minimálné jednu IP adresu bridge.</string>
   <string name="send_email_for_bridges">Zašlete email pouze s řádkem \"get bridges\" v obsahu zprávy z vašeho gmail účtu na adresu bridges@torproject.org</string>
@@ -208,7 +208,7 @@
   <string name="wizard_locale_title">Zvolte jazyk</string>
   <string name="wizard_locale_msg">Ponechat standartní, nebo přepnout stávající jazyk</string>
   <string name="btn_save_settings">Uložit nastavení</string>
-  <string name="no_internet_connection_tor">Žádné připojení k internetu; Tor je ve standby režimu...</string>
+  <string name="no_internet_connection_tor">Žádné připojení k internetu; Tor je ve standby režimu…</string>
   <string name="bandwidth_">Šířka pásma:</string>
   <string name="down">stahování</string>
   <string name="up">nahrávání</string>

res/values-cs/strings.xml

@@ -7,11 +7,11 @@
   <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
   <string name="control_permission_label">spustit a vypnout Tor</string>
   <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot se spouští...</string>
+  <string name="status_starting_up">Orbot se spouští…</string>
   <string name="status_activated">Připojen k síti Tor</string>
   <string name="status_disabled">\"Orbot je deaktivován</string>
   <string name="status_shutting_down">Orbot se vypíná</string>
-  <string name="tor_process_starting">Startuji Tor klienta...</string>
+  <string name="tor_process_starting">Startuji Tor klienta…</string>
   <string name="tor_process_complete">hotovo.</string>
   <string name="tor_process_waiting">čekám.</string>
   <string name="not_anonymous_yet">VAROVÁNÍ: Vaše komunikace ještě není anonymní! Prosím nastavte vašim aplikacím HTTP proxy 127.0.0.1:8118 nebo SOCKS4A či SOCKS5 proxy 172.0.0.1:9050</string>
@@ -64,11 +64,11 @@
   <string name="wizard_warning_title">Varování</string>
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
-  <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string>
+
-  <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
+
-	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
+
-    <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
+
-    <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
+
   <!--Transparent Proxy screen-->
   <string name="wizard_transproxy_title">Transparentní proxy</string>
   <string name="wizard_transproxy_none">Není</string>

res/values-cy/strings.xml

@@ -7,7 +7,7 @@
   <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
   <string name="control_permission_label">cychwyn a stopio Tor</string>
   <string name="tor_proxy_service_process">gwasanaethdirpwrytor</string>
-  <string name="status_starting_up">Mae Orbot yn cychwyn...</string>
+  <string name="status_starting_up">Mae Orbot yn cychwyn…</string>
   <string name="status_activated">Wedi cysylltu â rhwydwaith Tor</string>
   <string name="status_shutting_down">Mae Orbot yn cau</string>
   <string name="tor_process_starting">Yn cychwyn cleient Tor</string>
@@ -60,10 +60,10 @@
   <string name="wizard_warning_title">Rhybudd</string>
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
-  <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
+
-	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
+
-    <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
+
-    <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
+
   <!--Transparent Proxy screen-->
   <string name="wizard_transproxy_title">Dirprwyo\'n dryloyw</string>
   <string name="wizard_transproxy_none">Dim</string>

res/values-da/strings.xml

@@ -7,11 +7,11 @@
   <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
   <string name="control_permission_label">start og stop Tor</string>
   <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot starter op ...</string>
+  <string name="status_starting_up">Orbot starter op …</string>
   <string name="status_activated">Der er forbindelse til Tor-netværket</string>
   <string name="status_disabled">Orbot er slået fra</string>
   <string name="status_shutting_down">Orbot lukker ned</string>
-  <string name="tor_process_starting">Starter Tor klienten...</string>
+  <string name="tor_process_starting">Starter Tor klienten…</string>
   <string name="tor_process_complete">udført.</string>
   <string name="tor_process_waiting">afventer.</string>
   <string name="not_anonymous_yet">ADVARSEL: Din trafik er ikke endnu ikke anonym! Konfigurér venligst dine programmer, så de bruger HTTP proxy 127.0.0.1:8118 eller SOCKS4A eller SOCKS5-proxy 127.0.0.1:9050</string>
@@ -73,7 +73,7 @@
   <string name="wizard_tips_msg">De nedenstående programmer er udviklet for at fungere med Orbot. Klik hver knap for at installere nu. Ellers kan de senere findes på Google play, på hjemmesiden GuardianProject.info eller via F-Droid.org.</string>
   <string name="wizard_tips_proxy">Proxy indstillinger - Lær hvordan du konfigurerer apps til at fungere med Orbot</string>
   <string name="wizard_tips_duckgo">DuckDuckGo søgemaskine-programmet</string>
-  <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
+
   <string name="wizard_tips_twitter">Indstil Twitter proxyen til værten \"localhost\" og port 8118</string>
   <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
   <string name="wizard_proxy_help_info">Proxy-indstillinger</string>
@@ -96,11 +96,11 @@
   <string name="wizard_tips_title">Orbot-aktiverede apps</string>
   <string name="wizard_tips_orweb">Orweb: Privatlivs-forbedret browser der virker gennem Tor</string>
   <string name="wizard_tips_play">Find alle Guardian Project programmer på Google Play</string>
-  <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>
+
-  <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
+
-	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
+
-    <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
+
-    <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
+
   <!--Transparent Proxy screen-->
   <string name="wizard_transproxy_title">Transperant Proxying</string>
   <string name="wizard_transproxy_msg">Dette tillader at dine apps automatisk kører gennem Tor netværket uden nogen konfiguration.</string>
@@ -133,14 +133,14 @@
   <string name="pref_proxy_password_summary">Adgangskode for udgående proxy (Valgfri)</string>
   <string name="pref_proxy_password_dialog">Indtast proxy-kodeordet</string>
   <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Opsætter total, gennemsigtig proxy...</string>
+  <string name="setting_up_full_transparent_proxying_">Opsætter total, gennemsigtig proxy…</string>
-  <string name="setting_up_app_based_transparent_proxying_">Opsætter program-afhængig transparent proxy...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Opsætter program-afhængig transparent proxy…</string>
   <string name="transparent_proxying_enabled">Transparent proxying AKTIVERET</string>
   <string name="transproxy_enabled_for_tethering_">TransProxy slået til for internetdeling!</string>
   <string name="warning_error_starting_transparent_proxying_">ADVARSEL: fejl under start af den gennemsigtige proxy!</string>
   <string name="transproxy_rules_cleared">Indstillinger for TransProxy er nulstillet</string>
   <string name="couldn_t_start_tor_process_">Kunne ikke starte Tor processen:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Opsætter port-baseret gennemsigtig proxy...</string>
+  <string name="setting_up_port_based_transparent_proxying_">Opsætter port-baseret gennemsigtig proxy…</string>
   <string name="bridge_error">Fejl ved Bro</string>
   <string name="bridge_requires_ip">For at kunne bruge bro-komponenten, skal du indaste mindst én IP-adresse på en bro.</string>
   <string name="send_email_for_bridges">Send en e-mail til bridges@torproject.org med teksten \"get bridges\" alene i mailens tekstfelt fra en gmail-konto.</string>
@@ -187,7 +187,7 @@
   <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">Tredjeparts-software:</string>
   <string name="hidden_service_request">Et program vil åbne den skjulte server-port %S til Tor netværket. Dette er sikkert hvis du stoler på programmet.</string>
-  <string name="found_existing_tor_process">fandt eksisterende Tor process...</string>
+  <string name="found_existing_tor_process">fandt eksisterende Tor process…</string>
   <string name="something_bad_happened">Noget slemt er sket. Check loggen</string>
   <string name="hidden_service_on">skjult service på:</string>
   <string name="unable_to_read_hidden_service_name">ikke i stand til at læse navnet på den skjulte service</string>
@@ -204,5 +204,5 @@
   <string name="wizard_locale_title">Vælg sprog</string>
   <string name="wizard_locale_msg">Behold standardindstilling eller skift det nuværende sprog</string>
   <string name="btn_save_settings">Gem Indstillinger</string>
-  <string name="no_internet_connection_tor">Ingen internetforbindelse; Tor er på standby...</string>
+  <string name="no_internet_connection_tor">Ingen internetforbindelse; Tor er på standby…</string>
 </resources>

res/values-de-rAT/strings.xml

@@ -7,10 +7,10 @@
   <!--Warning screen-->
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
-  <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
+
-	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
+
-    <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
+
-    <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
+
   <!--Transparent Proxy screen-->
   <string name="default_bridges"></string>
 </resources>

res/values-de/strings.xml

@@ -74,11 +74,11 @@
   <string name="wizard_tips_otrchat">ChatSecure - Ein sicheres Sofortnachrichtenprogramm für Android</string>
   <string name="wizard_tips_proxy">Vermittlungseinstellungen - Lernen, wie Sie Anwendungen so konfigurieren, dass sie mit Orbot zusammenarbeiten.</string>
   <string name="wizard_tips_duckgo">Duckduckgo-Suchmaschinen-App</string>
-  <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
+
-  <string name="wizard_tips_firefox">Proxy Mobile Add-on für Firefox (https://guardianproject.info/apps/firefoxprivacy)</string>
+
-  <string name="proxymob_setup_url">https://guardianproject.info/apps/firefoxprivacy</string>
+
   <string name="wizard_tips_twitter">Twitter-Proxy auf den Rechner »localhost« und Port 8118 einstellen</string>
-  <string name="story_maker_url">https://play.google.com/store/apps/details?id=info.guardianproject.mrapp</string>
+
   <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
   <string name="wizard_proxy_help_info">Vermittlungseinstellungen</string>
   <string name="wizard_final">Orbot ist bereit!</string>
@@ -100,15 +100,15 @@
   <!--TipsAndTricks screen-->
   <string name="wizard_tips_title">Orbot aktivierte Anwendungen</string>
   <string name="wizard_tips_gibberbot">ChatSecure: Sichere Unterhaltungsanwendung mit vertraulicher Verschlüsselung</string>
-  <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string>
+
   <string name="wizard_tips_orweb">Orweb: Ein im Datenschutz erweiterter Browser, der durch Tor arbeitet</string>
-  <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string>
+
   <string name="wizard_tips_play">Alle Guardian Project-Anwendungen im Google Play Store finden</string>
-  <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>
+
-  <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
+
-	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
+
-    <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
+
-    <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
+
   <!--Transparent Proxy screen-->
   <string name="wizard_transproxy_title">Transparente Vermittlung</string>
   <string name="wizard_transproxy_msg">Dieses ermöglicht es Ihren Anwendungen automatisch das Tor Netzwerk zu verwenden ohne dieses konfigurieren zu müssen.</string>
@@ -249,7 +249,7 @@
   <string name="pref_torrc_summary">NUR FÜR EXPERTEN: torrc-Konfigurationszeilen direkt eingeben</string>
   <string name="pref_torrc_dialog">Benutzerdefinierte Torrc</string>
   <string name="wizard_tips_martus">Mobile Martus - Benetech-Anwendung zur Menschenrechtsdokumentierung</string>
-  <string name="martus_url">https://play.google.com/store/apps/details?id=org.martus.android</string>
+
   <string name="your_tor_public_ips_">Ihre öffentlichen IPs für Tor:</string>
   <string name="app_conflict">Anwendungskonflikt</string>
   <string name="pref_transproxy_refresh_title">Automatische Transproxy-Aktualisierung</string>

res/values-el/strings.xml

@@ -11,8 +11,8 @@
   <string name="status_activated">Συνδέθηκε στο δίκτυο Tor</string>
   <string name="status_disabled">\"Το Orbot είναι Απενεργοποιημένο</string>
   <string name="status_shutting_down">Το Orbot θα τερματίσει</string>
-  <string name="tor_process_starting">Εκκίνηση του πελάτη Tor...</string>
+  <string name="tor_process_starting">Εκκίνηση του πελάτη Tor…</string>
-  <string name="tor_process_complete">ολοκληρώθηκε...</string>
+  <string name="tor_process_complete">ολοκληρώθηκε…</string>
   <string name="tor_process_waiting">αναμονή</string>
   <string name="not_anonymous_yet">ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Η κυκλοφορία σας δεν είναι ακόμη ανώνυμη! Ρυθμίστε τις εφαρμογές σας ώστε να χρησιμοποιούν ως πληρεξούσιο HTTP 127.0.0.1:8118 ή SOCKS5 127.0.0.1:9050</string>
   <string name="menu_home">Αρχική</string>
@@ -74,7 +74,7 @@
   <string name="wizard_tips_otrchat">ChatSecure - Εφαρμογή ασφαλούς ανταλλαγής άμεσων μηνυμάτων για Android</string>
   <string name="wizard_tips_proxy">Ρυθμίσεις proxy: Μάθετε πώς θα ρυθμίσετε τις εφαρμογές ώστε να λειτουργούν με το Orbot</string>
   <string name="wizard_tips_duckgo">Εφαρμογή Μηχανής Αναζήτησης Duckduckgo</string>
-  <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
+
   <string name="wizard_tips_twitter">Το Twitter υποστηρίζει http proxy localhost:8118</string>
   <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
   <string name="wizard_proxy_help_info">Ρυθμίσεις proxy</string>
@@ -96,15 +96,15 @@
   <!--TipsAndTricks screen-->
   <string name="wizard_tips_title">Εφαρμογές συμβατές με Orbot</string>
   <string name="wizard_tips_gibberbot">ChatSecure: Ασφαλές chat app με Off-the-Record κρυπτογράφηση</string>
-  <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string>
+
   <string name="wizard_tips_orweb">Orweb - Περιηγητής ιστού με ενισχυμένη ασφάλεια που είναι συμβατό με Tor</string>
-  <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string>
+
   <string name="wizard_tips_play">Βρες όλες τις εφαρμογές Guardian Project στο Google Play</string>
-  <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>
+
-  <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
+
-	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
+
-    <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
+
-    <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
+
   <!--Transparent Proxy screen-->
   <string name="wizard_transproxy_title">Διαφανής μεσολάβηση διακομιστή</string>
   <string name="wizard_transproxy_msg">Το στοιχείο αυτό επιτρέπει στις εφαρμογές σας να λειτουργούν μέσω του δικτύου Tor χωρίς κάποια ρύθμιση.</string>
@@ -144,7 +144,7 @@
   <string name="warning_error_starting_transparent_proxying_">ΠΡΟΕΙΔΟΠΟΙΗΣΗ: σφάλμα κατά την εκκίνηση της διαφανούς μεσολάβησης διακομιστή!</string>
   <string name="transproxy_rules_cleared">Οι ρυθμίσεις του TransProxy απομακρύνθηκαν</string>
   <string name="couldn_t_start_tor_process_">Αδυναμία εκκίνησης της διεργασίας Tor:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Ρύθμιση της διαφανούς μεσολάβησης διακομιστή κατά θύρα...</string>
+  <string name="setting_up_port_based_transparent_proxying_">Ρύθμιση της διαφανούς μεσολάβησης διακομιστή κατά θύρα…</string>
   <string name="bridge_error">Σφάλμα γέφυρας</string>
   <string name="bridge_requires_ip">Για να χρησιμοποιήσετε το στοιχείο γέφυρας, πρέπει να εισάγετε την διεύθυνση ΙΡ τουλάχιστον μιας γέφυρας.</string>
   <string name="send_email_for_bridges">Μέσω ενός λογαριασμού gmai στείλτε ένα μήνυμα στην διεύθυνση bridges@torproject.org με την φαση \"get bridges\" μόνη της στο σώμα το μηνύματος.</string>
@@ -191,7 +191,7 @@
   <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">Λογισμικό τρίτων:</string>
   <string name="hidden_service_request">Κάποια εφαρμογή προσπαθεί να ανοίξει την κρυφή θύρα διακομιστή %S στο δίκτυο Tor. Πρόκειται για ασφαλή ενέργεια, εφόσον γνωρίζετε την εφαρμογή.</string>
-  <string name="found_existing_tor_process">αναζήτηση διεργασιών Tor...</string>
+  <string name="found_existing_tor_process">αναζήτηση διεργασιών Tor…</string>
   <string name="something_bad_happened">Κάτι κακό συνέβη. Ελέγξτε τις καταγραφές</string>
   <string name="hidden_service_on">ενεργοποιημένη κρυφή υπηρεσία:</string>
   <string name="unable_to_read_hidden_service_name">αδυναμία ανάγνωσης του ονόματος της κρυφής υπηρεσίας</string>
@@ -208,7 +208,7 @@
   <string name="wizard_locale_title">Επιλέξτε γλώσσα</string>
   <string name="wizard_locale_msg">Παραμείνετε στην αρχική ή αλλάξτε την τρέχουσα γλώσσα</string>
   <string name="btn_save_settings">Αποθήκευση ρυθμίσεων</string>
-  <string name="no_internet_connection_tor">Δεν υπάρχει σύνδεση με το διαδίκτυο, το Tor είναι σε αναμονή...</string>
+  <string name="no_internet_connection_tor">Δεν υπάρχει σύνδεση με το διαδίκτυο, το Tor είναι σε αναμονή…</string>
   <string name="bandwidth_">Εύρος ζώνης:</string>
   <string name="down">κατέβασμα</string>
   <string name="up">ανέβασμα</string>

res/values-en-rGB/strings.xml

@@ -8,10 +8,10 @@
   <!--Warning screen-->
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
-  <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
+
-	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
+
-    <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
+
-    <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
+
   <!--Transparent Proxy screen-->
   <!--<string name="pref_use_whispercore">Use WhisperCore</string>
 <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>-->

res/values-eo/strings.xml

@@ -7,11 +7,11 @@
   <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
   <string name="control_permission_label">ŝalti kaj malŝalti Tor</string>
   <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot ŝaltiĝas...</string>
+  <string name="status_starting_up">Orbot ŝaltiĝas…</string>
   <string name="status_activated">Konektita al Tor-reto</string>
   <string name="status_disabled">Orbot estas malaktivigita</string>
   <string name="status_shutting_down">Orbot malŝaltiĝas</string>
-  <string name="tor_process_starting">Ŝaltiĝas Tor-kliento...</string>
+  <string name="tor_process_starting">Ŝaltiĝas Tor-kliento…</string>
   <string name="tor_process_complete">kompleta.</string>
   <string name="tor_process_waiting">atendas.</string>
   <string name="not_anonymous_yet">ATENTIGO: Via trafiko ankoraŭ ne estas anonima! Bonvolu agordi viajn aplikaĵojn por uzi HTTP-prokurilon 127.0.0.1:8118 aŭ SOCKS4A- aŭ SOCKS5-prokurilo 127.0.0.1:9050</string>
@@ -57,7 +57,7 @@
   <string name="wizard_tips_tricks">Aplikaĵoj permesitaj por Orbot</string>
   <string name="wizard_tips_otrchat">ChatSecutre - Sekura tujmesaĝilo por Android</string>
   <string name="wizard_tips_proxy">Agordoj de prokurilo - Lernu kiel agordi aplikaĵojn por kunlabori kun Orbot</string>
-  <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
+
   <string name="wizard_tips_twitter">Agordi prokurilon por Twitter je adreso \"localhost\" kaj pordo 8118</string>
   <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
   <string name="wizard_proxy_help_info">Retperant‐agordoj</string>
@@ -76,14 +76,14 @@
   <string name="wizard_permissions_root_msg2">Se vi ne volas fari tion, bonvolu certiĝi ke eblas agordi aplikaĵojn por kunlabori kun Orbot</string>
   <!--TipsAndTricks screen-->
   <string name="wizard_tips_title">Aplikaĵoj permesitaj por Orbot</string>
-  <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string>
+
-  <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string>
+
   <string name="wizard_tips_play">Trovu ĉiujn aplikaĵojn de Guardian Project ĉe Google Play</string>
-  <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>
+
-  <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
+
-	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
+
-    <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
+
-    <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
+
   <!--Transparent Proxy screen-->
   <string name="wizard_transproxy_hint">(Marku ĉi tiun butonon se vi ne scias pri kio ni parolas)</string>
   <string name="wizard_transproxy_none">Neniom</string>
@@ -140,7 +140,7 @@
   <string name="project_home">Retpaĝaro(j) de la Projekto:</string>
   <string name="the_tor_license">The Tor License</string>
   <string name="https_torproject_org">https://torproject.org</string>
-  <string name="found_existing_tor_process">trovi ekzistantan Tor-procedon...</string>
+  <string name="found_existing_tor_process">trovi ekzistantan Tor-procedon…</string>
   <string name="hidden_service_on">kaŝitaj servoj je:</string>
   <string name="unable_to_read_hidden_service_name">ne eblas legi nomon de la kaŝita servo</string>
   <string name="unable_to_start_tor">Ne eblas startigi Tor:</string>

res/values-es-rAR/strings.xml

@@ -7,13 +7,13 @@
   <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
   <string name="control_permission_label">reiniciar Tor</string>
   <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot está iniciándose...</string>
+  <string name="status_starting_up">Orbot está iniciándose…</string>
   <string name="status_activated">Conectado a la red Tor</string>
   <string name="status_disabled">\"Orbot está Desactivado</string>
   <string name="status_shutting_down">Orbot se está apagando</string>
-  <string name="tor_process_starting">Iniciando el cliente Tor...</string>
+  <string name="tor_process_starting">Iniciando el cliente Tor…</string>
   <string name="tor_process_complete">Completar</string>
-  <string name="tor_process_waiting">esperando...</string>
+  <string name="tor_process_waiting">esperando…</string>
   <string name="not_anonymous_yet">CIUDADO: Tu tráfico no es anónimo aún! Por favor configura tus aplicaciones para que usen el HTTP proxy 127.0.0.1:8118 o SOCKS4A o el proxy SOCKS5 127.0.0.1:9050</string>
   <string name="menu_home">Inicio</string>
   <string name="menu_browse">Navegar</string>
@@ -56,10 +56,10 @@
   <!--Warning screen-->
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
-  <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
+
-	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
+
-    <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
+
-    <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
+
   <!--Transparent Proxy screen-->
   <string name="wizard_transproxy_title">Proxying Transparente</string>
   <string name="pref_proxy_password_dialog">Ingrese contraseña Proxy</string>

res/values-es/strings.xml

@@ -8,11 +8,11 @@
   <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
   <string name="control_permission_label">iniciar y detener Tor</string>
   <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot está iniciandose...</string>
+  <string name="status_starting_up">Orbot está iniciandose…</string>
   <string name="status_activated">Conectado a la red Tor</string>
   <string name="status_disabled">Orbot está desactivado</string>
   <string name="status_shutting_down">Orbot se está cerrando</string>
-  <string name="tor_process_starting">Iniciando cliente Tor...</string>
+  <string name="tor_process_starting">Iniciando cliente Tor…</string>
   <string name="tor_process_complete">completado.</string>
   <string name="tor_process_waiting">en espera.</string>
   <string name="not_anonymous_yet">ADVERTENCIA: ¡Su tráfico no es anónimo aún! Configure sus aplicaciones para utilizar proxy HTTP 127.0.0.1:8118, o proxy SOCKS4A o SOCKS5 127.0.0.1:9050 (o podría habilitar la proxyficación transparente si su dispositivo está rooteado)</string>
@@ -78,17 +78,17 @@
   <string name="wizard_tips_otrchat">ChatSecure - Cliente de mensajería instantánea segura para Android</string>
   <string name="wizard_tips_proxy">Preferencias para proxy - aprenda cómo configurar aplicaciones para que trabajen con Orbot</string>
   <string name="wizard_tips_duckgo">Aplicación del motor de búsqueda DuckDuckGo</string>
-  <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
+
-  <string name="wizard_tips_firefox">Complemento Proxy Mobile para Firefox (https://guardianproject.info/apps/firefoxprivacy)</string>
+
-  <string name="proxymob_setup_url">https://guardianproject.info/apps/firefoxprivacy</string>
+
   <string name="wizard_tips_twitter">Configure por proxy la aplicación de Twitter en localhost:8118</string>
   <string name="wizard_tips_story_maker">StoryMaker - ¡Elabore una historia y déjesela a Tor por seguridad!</string>
-  <string name="story_maker_url">https://play.google.com/store/apps/details?id=info.guardianproject.mrapp&amp;hl=es</string>
+
   <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
   <string name="wizard_proxy_help_info">Preferencias para proxy</string>
   <string name="wizard_proxy_help_msg">Si la aplicación Android que está utilizando puede soportar el uso de un proxy (interpuesto) HTTP o SOCKS, entonces puede configurarla para que conecte a Orbot y use Tor.\n\n\nLa configuración del servidor es 127.0.0.1 o \"localhost\". Para HTTP, la configuración del puerto es 8118. Para SOCKS, el proxy está en el 9050. Debe utilizar la configuración para SOCKS4A o SOCKS5 si es posible.\n\n\n\nPuede aprender más acerca de proxyficación en Android a través de las preguntas frecuentes (FAQ) en: http://tinyurl.com/proxyandroid\n </string>
   <string name="wizard_final">¡Orbot está listo!</string>
-  <string name="wizard_final_msg">Millones de personas por todo el mundo usan Tor por una amplia variedad de razones.\n\nPeriodistas y blogueros, defensores de los derechos humanos, funcionarios judiciales, corporaciones, ciudadanos bajo regímenes represivos, y simples ciudadanos corrientes... ¡y ahora usted también está listo!</string>
+  <string name="wizard_final_msg">Millones de personas por todo el mundo usan Tor por una amplia variedad de razones.\n\nPeriodistas y blogueros, defensores de los derechos humanos, funcionarios judiciales, corporaciones, ciudadanos bajo regímenes represivos, y simples ciudadanos corrientes… ¡y ahora usted también está listo!</string>
   <string name="wizard_exit_at_first_screen_toast">¡Por favor, configure Orbot antes para poder comenzar a usarlo!</string>
   <!--END Welcome Wizard strings (DJH)-->
   <string name="connect_first_time">Ha conectado con éxito a la red Tor - pero esto NO significa que su dispositivo sea seguro. Puede usar la opción \'Comprobar\' del menú para poner a prueba su navegador. \n\nVisítenos en https://guardianproject.info/apps/orbot o envíenos un correo a help@guardianproject.info para aprender más.</string>
@@ -111,22 +111,22 @@
   <!--TipsAndTricks screen-->
   <string name="wizard_tips_title">Aplicaciones habilitadas para Orbot</string>
   <string name="wizard_tips_gibberbot">ChatSecure: Aplicación de chat segura con cifrado Off-The-Record (OTR)</string>
-  <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string>
+
   <string name="wizard_tips_orweb">Orweb - navegador de privacidad-mejorada que funciona a través de Tor</string>
-  <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string>
+
   <string name="wizard_tips_play">Descubre todas las aplicaciones de Guardian Project en Google Play</string>
-  <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>
+
-  <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
+
-	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
+
-    <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
+
-    <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
+
   <!--Transparent Proxy screen-->
   <string name="wizard_transproxy_title">Proxyficación transparente</string>
   <string name="wizard_transproxy_msg">Permite que sus aplicaciones se ejecuten automáticamente a través de la red Tor sin realizar configuración alguna.</string>
   <string name="wizard_transproxy_hint">(Marque esta casilla si no tiene idea de qué estamos hablando)</string>
   <string name="wizard_transproxy_none">Ninguno</string>
   <string name="pref_transparent_tethering_title">Tor tethering</string>
-  <string name="pref_transparent_tethering_summary">Habilita la proxyficación transparente de Tor para dispositivos tethered (dispositivos móviles \"amarrados\", pasarela a Internet para otros dispositivos conectados a ellos mediante Wifi, USB o Bluetooth) -- (requiere reinicio)</string>
+  <string name="pref_transparent_tethering_summary">Habilita la proxyficación transparente de Tor para dispositivos tethered (dispositivos móviles \"amarrados\", pasarela a Internet para otros dispositivos conectados a ellos mediante Wifi, USB o Bluetooth) — (requiere reinicio)</string>
   <string name="button_grant_superuser">Solicitar permisos de superusuario</string>
   <string name="pref_select_apps">Seleccionar aplicaciones</string>
   <string name="pref_select_apps_summary">Escoja las aplicaciones a redirigir través de Tor</string>
@@ -156,15 +156,15 @@ direcciones (o rangos). No prevalecen sobre las configuraciones de exclusión de
   <string name="pref_proxy_password_summary">Contraseña en el proxy (opcional)</string>
   <string name="pref_proxy_password_dialog">Introduzca contraseña en el proxy</string>
   <string name="status">Estado</string>
-  <string name="setting_up_full_transparent_proxying_">Estableciendo proxyficación transparente completa... </string>
+  <string name="setting_up_full_transparent_proxying_">Estableciendo proxyficación transparente completa… </string>
-  <string name="setting_up_app_based_transparent_proxying_">Estableciendo proxyficación transparente por aplicaciones... </string>
+  <string name="setting_up_app_based_transparent_proxying_">Estableciendo proxyficación transparente por aplicaciones… </string>
   <string name="transparent_proxying_enabled">Proxyficación transparente ACTIVADA</string>
   <string name="transproxy_enabled_for_tethering_">¡TransProxy (proxyficación transparente) habilitado para tethering (pasarela)!</string>
   <string name="warning_error_starting_transparent_proxying_">ADVERTENCIA: ¡Error al iniciar la proxyficación transparente!</string>
   <string name="transproxy_rules_cleared">Reglas de TransProxy (proxyficación transparente) borradas</string>
   <string name="couldn_t_start_tor_process_">No se pudo iniciar el proceso de Tor: </string>
   <string name="privoxy_is_running_on_port_">Polipo se está ejecutando en el puerto:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Estableciendo proxyficación transparente por puertos... </string>
+  <string name="setting_up_port_based_transparent_proxying_">Estableciendo proxyficación transparente por puertos… </string>
   <string name="bridge_error">Error de bridge (repetidor puente)</string>
   <string name="bridge_requires_ip">Para utilizar la función bridge (repetidor puente, acceso a Tor de publicitación restringida), debe introducir al menos una dirección IP de bridge.</string>
   <string name="send_email_for_bridges">Envíe un correo a bridges@torproject.org incluyendo en el cuerpo del mensaje una línea sólo con \"get bridges\", desde una cuenta con dominio gmail.com, yahoo.com o yahoo.cn (que soportan DKIM)</string>
@@ -217,7 +217,7 @@ direcciones (o rangos). No prevalecen sobre las configuraciones de exclusión de
   <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
   <string name="openssl_version">OpenSSL v1.0.1i: http://www.openssl.org</string>
   <string name="hidden_service_request">Una aplicación está intentando abrir el puerto %S de servicio oculto hacia la red Tor. Esto es seguro si su aplicación es de su confianza.</string>
-  <string name="found_existing_tor_process">Se encontró un proceso de Tor ya existente...</string>
+  <string name="found_existing_tor_process">Se encontró un proceso de Tor ya existente…</string>
   <string name="something_bad_happened">Hubo algún tipo de problema. Compruebe el registro (log)</string>
   <string name="hidden_service_on">Servicio oculto en:</string>
   <string name="unable_to_read_hidden_service_name">No fue posible leer el nombre del servicio oculto</string>
@@ -237,7 +237,7 @@ direcciones (o rangos). No prevalecen sobre las configuraciones de exclusión de
   <string name="wizard_locale_msg">Deje el predeterminado o cambie de idioma</string>
   <string name="powered_by">impulsado por Tor</string>
   <string name="btn_save_settings">Guardar configuración</string>
-  <string name="no_internet_connection_tor">Sin conexión a Internet; Tor está en espera...</string>
+  <string name="no_internet_connection_tor">Sin conexión a Internet; Tor está en espera…</string>
   <string name="bandwidth_">Ancho de banda:</string>
   <string name="down">bajada</string>
   <string name="up">subida</string>
@@ -250,8 +250,8 @@ direcciones (o rangos). No prevalecen sobre las configuraciones de exclusión de
   <string name="permission_manage_tor_description">Habilita esta aplicación para controlar el servicio Tor</string>
   <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">No parece que tenga Orweb instalado. ¿Quiere ayuda con eso, o simplemente deberíamos abrir el navegador?</string>
   <string name="install_apps_">¿Instalar aplicaciones?</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">Sin conectividad a la red. Poniendo Tor a dormir...</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Sin conectividad a la red. Poniendo Tor a dormir…</string>
-  <string name="network_connectivity_is_good_waking_tor_up_">La conectividad a la red es buena. Despertando Tor...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">La conectividad a la red es buena. Despertando Tor…</string>
   <string name="updating_settings_in_tor_service">actualizando la configuración en el servicio Tor</string>
   <string name="pref_socks_title">SOCKS de Tor</string>
   <string name="pref_socks_summary">Puerto sobre el que Tor ofrece su proxy SOCKS (por defecto: 9050 o 0 para deshabilitarlo)</string>
@@ -266,7 +266,7 @@ direcciones (o rangos). No prevalecen sobre las configuraciones de exclusión de
   <string name="pref_torrc_summary">SÓLO EXPERTOS: Introduzca directamente las líneas de configuración en el fichero torrc</string>
   <string name="pref_torrc_dialog">torrc personalizado</string>
   <string name="wizard_tips_martus">Martus Móvil - Aplicación de documentación de derechos humanos de Benetech</string>
-  <string name="martus_url">https://play.google.com/store/apps/details?id=org.martus.android&amp;hl=es</string>
+
   <string name="your_tor_public_ips_">Las IPs públicas de su Tor:</string>
   <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Por favor, deshabilite esta aplicación en Android-&gt;Configuración-&gt;Aplicaciones si está teniendo problemas con Orbot:</string>
   <string name="app_conflict">Conflicto de la aplicación</string>

res/values-et/strings.xml

@@ -7,11 +7,11 @@
   <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
   <string name="control_permission_label">käivita ja peata Tor</string>
   <string name="tor_proxy_service_process">torproxyteenus</string>
-  <string name="status_starting_up">Orbot käivitub...</string>
+  <string name="status_starting_up">Orbot käivitub…</string>
   <string name="status_activated">Ühendatud Tor võrgustikku</string>
   <string name="status_disabled">Orbot deaktiveeritud</string>
   <string name="status_shutting_down">Orbot lülitub välja</string>
-  <string name="tor_process_starting">Tor kliendi käivitamine...</string>
+  <string name="tor_process_starting">Tor kliendi käivitamine…</string>
   <string name="tor_process_complete">valmis.</string>
   <string name="tor_process_waiting">ootel.</string>
   <string name="not_anonymous_yet">HOIATUS: Teie liiklus pole veel anonüümne! Palun seadistage oma rakendused nii et need kasutaksid HTTP proxy\'t 127.0.0.1:8118 või SOCKS4A või SOCKS5 proxy\'t 127.0.0.1:9050</string>
@@ -74,7 +74,7 @@
   <string name="wizard_tips_otrchat">ChatSecure - Turvaline kiirsõnumiklient Androidile</string>
   <string name="wizard_tips_proxy">Proxy seaded - Õpi kuidas seadistada rakendusi töötama koos Orbot\'iga</string>
   <string name="wizard_tips_duckgo">DuckDuckGo otsingumootori rakendus</string>
-  <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
+
   <string name="wizard_tips_twitter">Seadistage Twitteri proxy server \"localhost\" ja port 8118</string>
   <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
   <string name="wizard_proxy_help_info">Proxyseaded</string>
@@ -96,15 +96,15 @@
   <!--TipsAndTricks screen-->
   <string name="wizard_tips_title">Orbot\'ile mõeldud rakendused</string>
   <string name="wizard_tips_gibberbot">ChatSecure: Turvaline vestlusrakendus Off-the-Record krüptoga</string>
-  <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string>
+
   <string name="wizard_tips_orweb">Orweb: Kõrgendatud privaatsusega veebisirvik mis töötab läbi Tor\'i</string>
-  <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string>
+
   <string name="wizard_tips_play">Kõik Guardian Project rakendused on leitavad ka Google Play kaudu</string>
-  <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>
+
-  <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
+
-	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
+
-    <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
+
-    <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
+
   <!--Transparent Proxy screen-->
   <string name="wizard_transproxy_title">Läbipaistev Proxy</string>
   <string name="wizard_transproxy_msg">Saate kõik rakendused suunata iseeneslikult Tor kaudu, lisaseadistusteta.</string>
@@ -137,14 +137,14 @@
   <string name="pref_proxy_password_summary">Proxy salasõna (Valikuline)</string>
   <string name="pref_proxy_password_dialog">Sisestage proxy salasõna</string>
   <string name="status">Olek</string>
-  <string name="setting_up_full_transparent_proxying_">Täisläbipaistva proxy seadistamine...</string>
+  <string name="setting_up_full_transparent_proxying_">Täisläbipaistva proxy seadistamine…</string>
-  <string name="setting_up_app_based_transparent_proxying_">Rakenduspõhise läbipaistva proxy seadistamine...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Rakenduspõhise läbipaistva proxy seadistamine…</string>
   <string name="transparent_proxying_enabled">Läbipaistev proxy LUBATUD</string>
   <string name="transproxy_enabled_for_tethering_">LäbivProxy lõastamine lubatud!</string>
   <string name="warning_error_starting_transparent_proxying_">Hoiatus: viga läbipaistva proxy käivitamisel!</string>
   <string name="transproxy_rules_cleared">LäbivProxy seaded nullitud</string>
   <string name="couldn_t_start_tor_process_">Tor protsessi käivitamine ebaõnnestus:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Pordipõhise läbipaistva proxy seadistamine...</string>
+  <string name="setting_up_port_based_transparent_proxying_">Pordipõhise läbipaistva proxy seadistamine…</string>
   <string name="bridge_error">Silla viga</string>
   <string name="bridge_requires_ip">Silla võimaluse kasutamiseks peate sisestama vähemalt ühe silla IP aadressi.</string>
   <string name="send_email_for_bridges">Saatke e-kiri oma gmail kontolt aadressile bridges@torproject.org mis sisaldab ainult ühte rida \"get bridges\".</string>
@@ -191,7 +191,7 @@
   <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">Kolmanda osapoole tarkvara:</string>
   <string name="hidden_service_request">Üks rakendus soovib avada varjatud teenuse porti %S Tor võrgustikule. See on turvaline kui te usaldate seda rakendust.</string>
-  <string name="found_existing_tor_process">leidus töötav Tor protsess...</string>
+  <string name="found_existing_tor_process">leidus töötav Tor protsess…</string>
   <string name="something_bad_happened">Juhtus midagi halba. Kontrollige logi</string>
   <string name="hidden_service_on">varjatud teenused:</string>
   <string name="unable_to_read_hidden_service_name">ei õnnestu lugeda varjatud teenuse nime</string>
@@ -208,7 +208,7 @@
   <string name="wizard_locale_title">Valige keel</string>
   <string name="wizard_locale_msg">Jätkake vaikeväärtusega või vahetage kehtiv keel</string>
   <string name="btn_save_settings">Salvesta seaded</string>
-  <string name="no_internet_connection_tor">Puudub Internetiühendus; Tor on ooteolekus...</string>
+  <string name="no_internet_connection_tor">Puudub Internetiühendus; Tor on ooteolekus…</string>
   <string name="bandwidth_">Ribalaius:</string>
   <string name="down">alla</string>
   <string name="up">üles</string>

res/values-eu/strings.xml

@@ -7,11 +7,11 @@
   <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
   <string name="control_permission_label">Tor abiarazi eta gelditu</string>
   <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot abiarazten ari da...</string>
+  <string name="status_starting_up">Orbot abiarazten ari da…</string>
   <string name="status_activated">Tor sarera konektatuta</string>
   <string name="status_disabled">\"Orbot desaktibatuta dago</string>
   <string name="status_shutting_down">Orbot itzaltzen ari da</string>
-  <string name="tor_process_starting">Tor bezeroa hasten...</string>
+  <string name="tor_process_starting">Tor bezeroa hasten…</string>
   <string name="tor_process_complete">eginda.</string>
   <string name="tor_process_waiting">itxaroten.</string>
   <string name="not_anonymous_yet">ABISUA: Zure trafikoa ez da anonimoa oraindik! Mesedez konfigura itzazu zure aplikazioak 127.0.0.1:8118 HTTP proxya edo 127.0.0.1:9050 SOCKS4 edo SOCKS5 proxyak erabiltzeko</string>
@@ -74,7 +74,7 @@
   <string name="wizard_tips_otrchat">ChatSecure - Andriodentzako berehalako mezulari bezero ziurra</string>
   <string name="wizard_tips_proxy">Proxy Ezarpenak - Ikasi zure aplikazioak Orbotekin funtziona dezaten nola konfiguratu</string>
   <string name="wizard_tips_duckgo">DuckDuckGo Bilaketa Motorraren appa</string>
-  <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
+
   <string name="wizard_tips_twitter">Twittereko proxyaren ostalarian \"localhost\" jarri eta portuan 8118</string>
   <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
   <string name="wizard_proxy_help_info">Proxy Ezarpenak</string>
@@ -96,15 +96,15 @@
   <!--TipsAndTricks screen-->
   <string name="wizard_tips_title">Orbot-Gaitutako Aplikazioak</string>
   <string name="wizard_tips_gibberbot">ChatSecure: Txat aplikazio segurua Off-the-Record enkriptazioarekin.</string>
-  <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string>
+
   <string name="wizard_tips_orweb">Orweb - Tor bidez lan egiten duen pribatutasun-hobetua duen nabigatzailea</string>
-  <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string>
+
   <string name="wizard_tips_play">Google Play-n Guardiak Proiektuko aplikazio guztiak bilatu</string>
-  <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>
+
-  <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
+
-	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
+
-    <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
+
-    <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
+
   <!--Transparent Proxy screen-->
   <string name="wizard_transproxy_title">Proxyatze Gardena</string>
   <string name="wizard_transproxy_msg">Honek zure aplikazioak konfiguratu beharrik Tor saretik joatea ahalbidetzen du.</string>
@@ -137,14 +137,14 @@
   <string name="pref_proxy_password_summary">Proxy pasahitza (Aukerazkoa)</string>
   <string name="pref_proxy_password_dialog">Sartu proxy pasahitza</string>
   <string name="status">Egoera</string>
-  <string name="setting_up_full_transparent_proxying_">Guztientzako proxy gardena martxan ezartzen...</string>
+  <string name="setting_up_full_transparent_proxying_">Guztientzako proxy gardena martxan ezartzen…</string>
-  <string name="setting_up_app_based_transparent_proxying_">Aplikazioetan oinarritutako proxy transparentea ezartzen...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Aplikazioetan oinarritutako proxy transparentea ezartzen…</string>
   <string name="transparent_proxying_enabled">Proxyatze gardena GAITUTA</string>
   <string name="transproxy_enabled_for_tethering_">Proxy gardena gaituta Tethering-ean!</string>
   <string name="warning_error_starting_transparent_proxying_">ABISUA: akatsa proxyatze gardena hasterakoan!</string>
   <string name="transproxy_rules_cleared">Proxy gardeneko erregelak garbituta</string>
   <string name="couldn_t_start_tor_process_">Ezin izan da Tor prozesua hasi:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Portuetan oinarritutako proxy gardena ezartzen...</string>
+  <string name="setting_up_port_based_transparent_proxying_">Portuetan oinarritutako proxy gardena ezartzen…</string>
   <string name="bridge_error">Zubi Akatsa</string>
   <string name="bridge_requires_ip">Zubi ezaiugarria erabiltzeko gutxienez zubi baten IP helbidea sartu behar duzu.</string>
   <string name="send_email_for_bridges">Gmail kontutik bridges@torproject.org helbidera eposta bat bidali gorputzean \"get bridges\" lerroa duena.</string>
@@ -191,7 +191,7 @@
   <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">3.-Ataleko-Softwarea:</string>
   <string name="hidden_service_request">Aplikazio batek ezkutuko zerbitzariko %S portua ireki nau du Tor sarera. Segurua da aplikazioaz fidatzen bazara.</string>
-  <string name="found_existing_tor_process">Aurreko Tor prozesua topatuta...</string>
+  <string name="found_existing_tor_process">Aurreko Tor prozesua topatuta…</string>
   <string name="something_bad_happened">Zerbait txarra gertatu da. Begiratu logetan</string>
   <string name="hidden_service_on">ezkutuko zerbitzua hemen:</string>
   <string name="unable_to_read_hidden_service_name">ezkutuko zerbitzuare izena ezin da irakurri</string>
@@ -208,7 +208,7 @@
   <string name="wizard_locale_title">Hizkuntza aukeratu</string>
   <string name="wizard_locale_msg">Lehenetsia utzi edo uneko hizkuntzara aldatu</string>
   <string name="btn_save_settings">Ezarpenak gorde</string>
-  <string name="no_internet_connection_tor">Internet konexiorik ez; Tor itxaroten dago...</string>
+  <string name="no_internet_connection_tor">Internet konexiorik ez; Tor itxaroten dago…</string>
   <string name="bandwidth_">Banda zabalera:</string>
   <string name="down">behera</string>
   <string name="up">gora</string>

res/values-fa/strings.xml

@@ -7,11 +7,11 @@
   <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
   <string name="control_permission_label">شروع و پایان تور</string>
   <string name="tor_proxy_service_process">سرويس پروکسی تور</string>
-  <string name="status_starting_up">ربات پیازی درحال آغاز است...</string>
+  <string name="status_starting_up">ربات پیازی درحال آغاز است…</string>
   <string name="status_activated">پیوسته به شبکه تور</string>
   <string name="status_disabled">ربات پیازی غیرفعال شده است.</string>
   <string name="status_shutting_down">ربات پیازی در حال بسته شدن است.</string>
-  <string name="tor_process_starting">شروع کلاینت تور...</string>
+  <string name="tor_process_starting">شروع کلاینت تور…</string>
   <string name="tor_process_complete">تمام.</string>
   <string name="tor_process_waiting">در حال انتظار.</string>
   <string name="not_anonymous_yet">هشدار: فعالیت شما هنوز \"گمنام\" نیست! لطفن اپلیکیشن خود را تنظیم کنید تا از HTTP پروکسی 127.0.0.1:8118 و یا SOCKS4A و یا SOCKS5 پروکسی 127.0.01:9050 استفاده کند.</string>
@@ -76,12 +76,12 @@
   <string name="wizard_tips_otrchat">ChatSecure - برنامه امن ارسال پیغام فوری برای اندروئید</string>
   <string name="wizard_tips_proxy">تنظیمات پروکسی - یادگیری تنظیم اپلیکیشن ها برای کار با ربات پیازی</string>
   <string name="wizard_tips_duckgo">اپلیکیشن موتور جستجوی داک داک گو</string>
-  <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
+
-  <string name="wizard_tips_firefox">افزوده پروکسی موبایل برای فایرفاکس (https://guardianproject.info/apps/firefoxprivacy)</string>
+
-  <string name="proxymob_setup_url">https://guardianproject.info/apps/firefoxprivacy</string>
+
   <string name="wizard_tips_twitter">توییتر از \"http proxy \"localhost:8118 پشتیبانی می کند</string>
   <string name="wizard_tips_story_maker">StoryMaker - ساختن یک داستان و ترک آن به Tor برای امنیت!</string>
-  <string name="story_maker_url">https://play.google.com/store/apps/details?id=info.guardianproject.mrapp</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_final">ربات پیازی آماده استفاده میباشد!</string>
@@ -103,15 +103,15 @@
   <!--TipsAndTricks screen-->
   <string name="wizard_tips_title">  اپلیکیشنهایی که ربات پیازی روی آنها فعال است</string>
   <string name="wizard_tips_gibberbot">ChatSecure:برنامه امن گفتگوی محرمانه با قابلیت رمزگزاری</string>
-  <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string>
+
   <string name="wizard_tips_orweb">مرورگر پیازی: مرورگر طراحی شده برای حفظ حریم خصوصی و افزونساز ربات پیازی</string>
-  <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string>
+
   <string name="wizard_tips_play">تمامي برنامه هاي Guardian Project را در Google Play پيدا كنيد.</string>
-  <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>
+
-  <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
+
-	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
+
-    <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
+
-    <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
+
   <!--Transparent Proxy screen-->
   <string name="wizard_transproxy_title">پروکسی کردن شفاف</string>
   <string name="wizard_transproxy_msg">این به برنامه ها به شما اجازه میدهد که بدون هیچ تنظیمی، بصورت خودکار از طریق شبکه تور اجرا شوند</string>
@@ -147,15 +147,15 @@
   <string name="pref_proxy_password_summary">رمز عبور پروکسی(اختیاری)</string>
   <string name="pref_proxy_password_dialog">رمز عبور پروکسی را وارد نمایید</string>
   <string name="status">وضعیت</string>
-  <string name="setting_up_full_transparent_proxying_">نصب پروکسی کاملن شفاف...</string>
+  <string name="setting_up_full_transparent_proxying_">نصب پروکسی کاملن شفاف…</string>
-  <string name="setting_up_app_based_transparent_proxying_">نصب پروکسی شفاف مبتنی بر برنامه...</string>
+  <string name="setting_up_app_based_transparent_proxying_">نصب پروکسی شفاف مبتنی بر برنامه…</string>
   <string name="transparent_proxying_enabled">پروکسی شفاف فعال است</string>
   <string name="transproxy_enabled_for_tethering_">TransProxy برای Tethering فعال شده است!</string>
   <string name="warning_error_starting_transparent_proxying_">هشدار: خطا در هنگام راه اندازی پروکسی شفاف!</string>
   <string name="transproxy_rules_cleared">قوانین TransProxy پاک شدند</string>
   <string name="couldn_t_start_tor_process_"> تور نتواست اجرا شود:</string>
   <string name="privoxy_is_running_on_port_">Polipo در حال اجرا است در پورت:</string>
-  <string name="setting_up_port_based_transparent_proxying_">نصب پروکسی شفاف مبتنی بر پورت...</string>
+  <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">از یک حساب کاربری جیمیل، ایمیلی با متن \"get bridges\" به آدرس bridges@torproject.org بفرستید.</string>
@@ -208,7 +208,7 @@
   <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
   <string name="openssl_version">OpenSSL v1.0.1i: http://www.openssl.org</string>
   <string name="hidden_service_request">یک اپلیکیشن میخواهد پورت %S سرویس مخفی را به شبکه تور باز کند. اگر به این اپلیکیشن اعتماد دارید این بی خطر است.</string>
-  <string name="found_existing_tor_process">یک تور درحال اجرا پیدا شد...</string>
+  <string name="found_existing_tor_process">یک تور درحال اجرا پیدا شد…</string>
   <string name="something_bad_happened">اتفاق بدی افتاد. وقایع ثبت شده را چک کنید</string>
   <string name="hidden_service_on">سرویس مخفی روی:</string>
   <string name="unable_to_read_hidden_service_name">ناتوان در خواندن نام سرویس مخفی</string>
@@ -241,8 +241,8 @@
   <string name="permission_manage_tor_description">این برنامه بتواند سرویس تور را مدیریت کند</string>
   <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">بنظر میرسد برنامه Orweb  نصب نشده است. آیا کمکی برای نصب میخواهید یا فقط مرورگر باز شود؟</string>
   <string name="install_apps_">برنامه نصب شود؟</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">بدون اتصال به شبکه می باشد. قرار دادن Tor در خواب ...</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">بدون اتصال به شبکه می باشد. قرار دادن Tor در خواب …</string>
-  <string name="network_connectivity_is_good_waking_tor_up_">اتصال به شبکه خوب است. بیداری Tor تا ...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">اتصال به شبکه خوب است. بیداری Tor تا …</string>
   <string name="updating_settings_in_tor_service">به روز رسانی تنظیمات در سرویس Tor</string>
   <string name="pref_socks_title">Tor SOCKS</string>
   <string name="pref_socks_dialog">پیکربندی پورت SOCKS</string>
@@ -253,7 +253,7 @@
   <string name="pref_dnsport_dialog">پیکربندی پورت DNS</string>
   <string name="pref_torrc_title">پیکربندی سفارشی Torrc</string>
   <string name="pref_torrc_dialog">سفارشی Torrc</string>
-  <string name="martus_url">https://play.google.com/store/apps/details?id=org.martus.android</string>
+
   <string name="your_tor_public_ips_">IP های عمومی Tor شما:</string>
   <string name="app_conflict">تعارض برنامه</string>
   <string name="pref_transproxy_refresh_title">خودکار تازه کردن Transproxy</string>