commit d21ff80d69b326d004ad3fafb62798808d6d2220
Author: n8fr8 <[email protected]>
Date:   Thu Jan 4 14:39:40 2018 -0500

    update strings and code for switching Locale in app
---
 .../main/java/org/torproject/android/OrbotApp.java |  16 +-
 .../org/torproject/android/OrbotMainActivity.java  |  19 +-
 .../org/torproject/android/settings/Languages.java |  25 ++-
 .../torproject/android/settings/LocaleHelper.java  |  89 +++++++++
 .../android/settings/SettingsPreferences.java      |  27 ++-
 .../ui/hiddenservices/ClientCookiesActivity.java   |   8 +
 .../ui/hiddenservices/HiddenServicesActivity.java  |   8 +
 .../ui/onboarding/BridgeWizardActivity.java        |   7 +
 .../android/ui/onboarding/OnboardingActivity.java  |   8 +
 app/src/main/res/layout/layout_main.xml            |   8 +-
 app/src/main/res/values-da/strings.xml             |  20 +-
 app/src/main/res/values-es-rAR/strings.xml         | 180 ++++++++++++++++-
 app/src/main/res/values-et/strings.xml             |  11 +-
 app/src/main/res/values-eu/strings.xml             |  29 ++-
 app/src/main/res/values-gl/strings.xml             |  23 ++-
 app/src/main/res/values-ms-rMY/strings.xml         |  11 +-
 app/src/main/res/values-ms/strings.xml             |   9 +-
 app/src/main/res/values-pt/strings.xml             |  14 +-
 app/src/main/res/values-si-rLK/strings.xml         |  11 +-
 app/src/main/res/values-tl/strings.xml             |  14 +-
 app/src/main/res/xml-fa/preferences.xml            | 221 +++++++++++++++++++++
 app/src/main/res/xml/preferences.xml               |   3 +-
 description/et.xlf                                 |  12 ++
 description/hy-rAM.xlf                             |  11 +
 24 files changed, 692 insertions(+), 92 deletions(-)

diff --git a/app/src/main/java/org/torproject/android/OrbotApp.java 
b/app/src/main/java/org/torproject/android/OrbotApp.java
index fd06934b..0b86d5b6 100644
--- a/app/src/main/java/org/torproject/android/OrbotApp.java
+++ b/app/src/main/java/org/torproject/android/OrbotApp.java
@@ -28,6 +28,7 @@ import org.torproject.android.service.TorService;
 import org.torproject.android.service.util.Prefs;
 
 import org.torproject.android.settings.Languages;
+import org.torproject.android.settings.LocaleHelper;
 
 import java.util.Locale;
 import java.util.Set;
@@ -40,7 +41,6 @@ public class OrbotApp extends Application implements 
OrbotConstants
     @Override
     public void onCreate() {
         super.onCreate();
-        Prefs.setContext(this);
 
         Languages.setup(OrbotMainActivity.class, R.string.menu_settings);
         Languages.setLanguage(this, Prefs.getDefaultLocale(), true);
@@ -52,12 +52,18 @@ public class OrbotApp extends Application implements 
OrbotConstants
     }
 
     @Override
+    protected void attachBaseContext(Context base) {
+        Prefs.setContext(base);
+        super.attachBaseContext(LocaleHelper.onAttach(base, "en"));
+    }
+
+    @Override
     public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
-        Log.i(TAG, "onConfigurationChanged " + newConfig.locale.getLanguage());
-        Languages.setLanguage(this, Prefs.getDefaultLocale(), true);
+       //Log.i(TAG, "onConfigurationChanged " + 
newConfig.locale.getLanguage());
+    //    Languages.setLanguage(this, Prefs.getDefaultLocale(), true);
     }
-       
+       /**
     public static void forceChangeLanguage(Activity activity) {
         Intent intent = activity.getIntent();
         if (intent == null) // when launched as LAUNCHER
@@ -67,7 +73,7 @@ public class OrbotApp extends Application implements 
OrbotConstants
         activity.overridePendingTransition(0, 0);
         activity.startActivity(intent);
         activity.overridePendingTransition(0, 0);
-    }
+    }**/
 
     public static Languages getLanguages(Activity activity) {
         return Languages.get(activity);
diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java 
b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
index a0037066..059e4273 100644
--- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java
+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
@@ -21,6 +21,7 @@ import org.torproject.android.service.util.Prefs;
 import org.torproject.android.service.TorService;
 import org.torproject.android.service.TorServiceConstants;
 import org.torproject.android.service.util.TorServiceUtils;
+import org.torproject.android.settings.LocaleHelper;
 import org.torproject.android.settings.SettingsPreferences;
 import org.torproject.android.ui.AppManagerActivity;
 import org.torproject.android.ui.onboarding.BridgeWizardActivity;
@@ -128,7 +129,11 @@ public class OrbotMainActivity extends AppCompatActivity
     private static final int MESSAGE_TRAFFIC_COUNT = 2;
 
        public final static String INTENT_ACTION_REQUEST_HIDDEN_SERVICE = 
"org.torproject.android.REQUEST_HS_PORT";
-       public final static String INTENT_ACTION_REQUEST_START_TOR = 
"org.torproject.android.START_TOR";        
+       public final static String INTENT_ACTION_REQUEST_START_TOR = 
"org.torproject.android.START_TOR";
+
+
+    PulsatorLayout mPulsator;
+
 
     //this is needed for backwards compat back to Android 2.3.*
     @SuppressLint("NewApi")
@@ -403,9 +408,11 @@ public class OrbotMainActivity extends AppCompatActivity
 
     }
 
-    PulsatorLayout mPulsator;
+    @Override
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(LocaleHelper.onAttach(base));
+    }
 
-    
    /*
     * Create the UI Options Menu (non-Javadoc)
     * @see android.app.Activity#onCreateOptionsMenu(android.view.Menu)
@@ -888,7 +895,11 @@ public class OrbotMainActivity extends AppCompatActivity
 
         if (request == REQUEST_SETTINGS && response == RESULT_OK)
         {
-            OrbotApp.forceChangeLanguage(this);
+            if (data != null && 
(!TextUtils.isEmpty(data.getStringExtra("locale")))) {
+                LocaleHelper.setLocale(getApplicationContext(), 
Prefs.getDefaultLocale());
+                finish();
+                startActivity(new Intent(this,OrbotMainActivity.class));
+            }
         }
         else if (request == REQUEST_VPN)
         {
diff --git a/app/src/main/java/org/torproject/android/settings/Languages.java 
b/app/src/main/java/org/torproject/android/settings/Languages.java
index dabddea2..90ad805c 100644
--- a/app/src/main/java/org/torproject/android/settings/Languages.java
+++ b/app/src/main/java/org/torproject/android/settings/Languages.java
@@ -156,18 +156,25 @@ public class Languages {
             }
         }
 
-        final Resources resources = 
contextWrapper.getBaseContext().getResources();
-        Configuration config = resources.getConfiguration();
-        if (Build.VERSION.SDK_INT >= 17) {
-            config.setLocale(locale);
-        } else {
-            config.locale = locale;
-        }
-        resources.updateConfiguration(config, resources.getDisplayMetrics());
-        Locale.setDefault(locale);
+        setLocale(contextWrapper, locale);
 
     }
 
+    @SuppressWarnings("deprecation")
+    private static void setLocale(final ContextWrapper contextWrapper, Locale 
locale){
+        Resources resources = contextWrapper.getResources();
+        Configuration configuration = resources.getConfiguration();
+        DisplayMetrics displayMetrics = resources.getDisplayMetrics();
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1){
+            configuration.setLocale(locale);
+            
contextWrapper.getApplicationContext().createConfigurationContext(configuration);
+        }
+        else{
+            configuration.locale=locale;
+            resources.updateConfiguration(configuration,displayMetrics);
+        }
+    }
+
     /**
      * Force reload the {@link Activity to make language changes take effect.}
      *
diff --git 
a/app/src/main/java/org/torproject/android/settings/LocaleHelper.java 
b/app/src/main/java/org/torproject/android/settings/LocaleHelper.java
new file mode 100644
index 00000000..4d5f79d7
--- /dev/null
+++ b/app/src/main/java/org/torproject/android/settings/LocaleHelper.java
@@ -0,0 +1,89 @@
+package org.torproject.android.settings;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.os.Build;
+import android.preference.PreferenceManager;
+
+import org.torproject.android.service.util.Prefs;
+
+import java.util.Locale;
+
+/**
+ * This class is used to change your application locale and persist this 
change for the next time
+ * that your app is going to be used.
+ * <p/>
+ * You can also change the locale of your application on the fly by using the 
setLocale method.
+ * <p/>
+ * Created by gunhansancar on 07/10/15.
+ * https://gunhansancar.com/change-language-programmatically-in-android/
+ */
+public class LocaleHelper {
+
+    private static final String SELECTED_LANGUAGE = 
"Locale.Helper.Selected.Language";
+
+    public static Context onAttach(Context context) {
+        String lang = getPersistedData(context, 
Locale.getDefault().getLanguage());
+        return setLocale(context, lang);
+    }
+
+    public static Context onAttach(Context context, String defaultLanguage) {
+        String lang = getPersistedData(context, defaultLanguage);
+        return setLocale(context, lang);
+    }
+
+    public static String getLanguage(Context context) {
+        return getPersistedData(context, Locale.getDefault().getLanguage());
+    }
+
+    public static Context setLocale(Context context, String language) {
+        persist(context, language);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            return updateResources(context, language);
+        }
+
+        return updateResourcesLegacy(context, language);
+    }
+
+    private static String getPersistedData(Context context, String 
defaultLanguage) {
+        return Prefs.getDefaultLocale();
+    }
+
+    private static void persist(Context context, String language) {
+        Prefs.setDefaultLocale(language);
+    }
+
+    @TargetApi(Build.VERSION_CODES.N)
+    private static Context updateResources(Context context, String language) {
+        Locale locale = new Locale(language);
+        Locale.setDefault(locale);
+
+        Configuration configuration = 
context.getResources().getConfiguration();
+        configuration.setLocale(locale);
+        configuration.setLayoutDirection(locale);
+
+        return context.createConfigurationContext(configuration);
+    }
+
+    @SuppressWarnings("deprecation")
+    private static Context updateResourcesLegacy(Context context, String 
language) {
+        Locale locale = new Locale(language);
+        Locale.setDefault(locale);
+
+        Resources resources = context.getResources();
+
+        Configuration configuration = resources.getConfiguration();
+        configuration.locale = locale;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+            configuration.setLayoutDirection(locale);
+        }
+
+        resources.updateConfiguration(configuration, 
resources.getDisplayMetrics());
+
+        return context;
+    }
+}
\ No newline at end of file
diff --git 
a/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java 
b/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java
index 42e09da1..d79055b4 100644
--- a/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java
+++ b/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java
@@ -4,6 +4,7 @@
 package org.torproject.android.settings;
 
 import android.content.Context;
+import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.ListPreference;
@@ -21,7 +22,7 @@ import java.util.Locale;
 
 
 public class SettingsPreferences 
-               extends PreferenceActivity implements OnPreferenceClickListener 
{
+               extends PreferenceActivity  {
     private static final String TAG = "SettingsPreferences";
 
        private ListPreference prefLocale = null;
@@ -34,7 +35,6 @@ public class SettingsPreferences
         SharedPreferences prefs = 
TorServiceUtils.getSharedPrefs(getApplicationContext());
 
         prefLocale = (ListPreference) findPreference("pref_default_locale");
-        prefLocale.setOnPreferenceClickListener(this);
         Languages languages = Languages.get(this);
         prefLocale.setEntries(languages.getAllNames());
         prefLocale.setEntryValues(languages.getSupportedLocales());
@@ -43,27 +43,24 @@ public class SettingsPreferences
             @Override
             public boolean onPreferenceChange(Preference preference, Object 
newValue) {
                 String language = (String) newValue;
-                if (preference == prefLocale) {
-                    OrbotApp app = (OrbotApp) getApplication();
-                    Languages.setLanguage(app, language, true);
-                    Prefs.setDefaultLocale(language);
-                    OrbotApp.forceChangeLanguage(SettingsPreferences.this);
-                }
+                Prefs.setDefaultLocale(language);
+                LocaleHelper.setLocale(getApplicationContext(), language);
+                Intent intentResult = new Intent();
+                intentResult.putExtra("locale",language);
+                setResult(RESULT_OK,intentResult);
+                finish();
                 return false;
             }
         });
 
-
-        
     }
 
-       public boolean onPreferenceClick(Preference preference) {
-               
-               setResult(RESULT_OK);
 
+    @Override
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(LocaleHelper.onAttach(base));
+    }
 
-               return true;
-       }
 
 
 }
diff --git 
a/app/src/main/java/org/torproject/android/ui/hiddenservices/ClientCookiesActivity.java
 
b/app/src/main/java/org/torproject/android/ui/hiddenservices/ClientCookiesActivity.java
index a766a5c7..e6939800 100644
--- 
a/app/src/main/java/org/torproject/android/ui/hiddenservices/ClientCookiesActivity.java
+++ 
b/app/src/main/java/org/torproject/android/ui/hiddenservices/ClientCookiesActivity.java
@@ -2,6 +2,7 @@ package org.torproject.android.ui.hiddenservices;
 
 import android.content.ContentResolver;
 import android.content.ContentValues;
+import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.database.ContentObserver;
@@ -24,6 +25,7 @@ import com.google.zxing.integration.android.IntentResult;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.torproject.android.R;
+import org.torproject.android.settings.LocaleHelper;
 import org.torproject.android.ui.hiddenservices.adapters.ClientCookiesAdapter;
 import org.torproject.android.ui.hiddenservices.dialogs.AddCookieDialog;
 import org.torproject.android.ui.hiddenservices.dialogs.CookieActionsDialog;
@@ -100,6 +102,12 @@ public class ClientCookiesActivity extends 
AppCompatActivity {
 
     }
 
+
+    @Override
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(LocaleHelper.onAttach(base));
+    }
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.cookie_menu, menu);
diff --git 
a/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java
 
b/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java
index f6445588..d7c1f313 100644
--- 
a/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java
+++ 
b/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java
@@ -2,6 +2,7 @@ package org.torproject.android.ui.hiddenservices;
 
 
 import android.content.ContentResolver;
+import android.content.Context;
 import android.content.pm.PackageManager;
 import android.database.ContentObserver;
 import android.database.Cursor;
@@ -21,6 +22,7 @@ import android.widget.Spinner;
 import android.widget.Toast;
 
 import org.torproject.android.R;
+import org.torproject.android.settings.LocaleHelper;
 import org.torproject.android.ui.hiddenservices.adapters.OnionListAdapter;
 import org.torproject.android.ui.hiddenservices.dialogs.HSActionsDialog;
 import org.torproject.android.ui.hiddenservices.dialogs.HSDataDialog;
@@ -105,6 +107,12 @@ public class HiddenServicesActivity extends 
AppCompatActivity {
         });
     }
 
+
+    @Override
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(LocaleHelper.onAttach(base));
+    }
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.hs_menu, menu);
diff --git 
a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
 
b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
index 501bb897..82ff5fea 100644
--- 
a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
+++ 
b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
@@ -2,6 +2,7 @@ package org.torproject.android.ui.onboarding;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
@@ -24,6 +25,7 @@ import org.torproject.android.R;
 import org.torproject.android.service.OrbotConstants;
 import org.torproject.android.service.TorServiceConstants;
 import org.torproject.android.service.util.Prefs;
+import org.torproject.android.settings.LocaleHelper;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -88,6 +90,11 @@ public class BridgeWizardActivity extends AppCompatActivity {
     }
 
     @Override
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(LocaleHelper.onAttach(base));
+    }
+
+    @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == android.R.id.home)
         {
diff --git 
a/app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java
 
b/app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java
index 6d91f55d..ca1cc494 100644
--- 
a/app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java
+++ 
b/app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java
@@ -1,5 +1,6 @@
 package org.torproject.android.ui.onboarding;
 
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
@@ -9,6 +10,7 @@ import android.view.View;
 import com.github.paolorotolo.appintro.AppIntro;
 
 import org.torproject.android.R;
+import org.torproject.android.settings.LocaleHelper;
 import org.torproject.android.ui.AppManagerActivity;
 import org.torproject.android.vpn.VPNEnableActivity;
 
@@ -84,4 +86,10 @@ public class OnboardingActivity extends AppIntro {
         super.onSlideChanged(oldFragment, newFragment);
         // Do something when the slide changes.
     }
+
+
+    @Override
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(LocaleHelper.onAttach(base));
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_main.xml 
b/app/src/main/res/layout/layout_main.xml
index 2e29b298..f729a500 100644
--- a/app/src/main/res/layout/layout_main.xml
+++ b/app/src/main/res/layout/layout_main.xml
@@ -117,7 +117,7 @@
         android:id="@+id/spinnerCountry"
         android:layout_width="165dp"
         android:layout_height="wrap_content"
-        android:layout_margin="12dp"
+        android:layout_margin="9dp"
 
         />
 
@@ -140,9 +140,9 @@
             android:layout_width="140dp"
             android:layout_height="wrap_content"
             android:text="@string/apps_mode"
-            android:layout_margin="12dp"
+            android:layout_margin="9dp"
             android:layout_gravity="center"
-            app:switchPadding="9dp"
+            app:switchPadding="3dp"
 
             />
     </LinearLayout>
@@ -258,7 +258,7 @@
             android:text="@string/use_bridges"
             android:layout_margin="3dp"
             android:singleLine="true"
-            app:switchPadding="9dp"
+            app:switchPadding="3dp"
             android:gravity="center_vertical"
             />
     </LinearLayout>
diff --git a/app/src/main/res/values-da/strings.xml 
b/app/src/main/res/values-da/strings.xml
index 2c63a078..311a1c55 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot er en gratis og åben 
proxy-applikation, der gør det muligt at anvende internettet mere sikkert fra 
andre programmer. Orbot bruger Tor til at kryptere internettrafikken, og 
skjuler den ved at sende den gennem serverere, lokaliseret i hele verden. Tor 
er gratis og åben software, der kan hjælpe dig mod netværksovervågning 
kaldet trafikanalyse, der kan true din personlige frihed, dit privatliv, 
handelsaktivitet og forhold.</string>
@@ -11,6 +11,7 @@
   <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">TorServe lukker ned</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>
@@ -23,6 +24,7 @@
   <string name="menu_start">Start</string>
   <string name="menu_stop">Stop</string>
   <string name="menu_about">Om</string>
+  <string name="menu_promo_apps">FÃ¥ apps...</string>
   <string name="main_layout_download">Henter</string>
   <string name="main_layout_upload">Sender</string>
   <string name="button_help">Hjælp</string>
@@ -31,6 +33,8 @@
   <string name="button_clear_log">Ryd log</string>
   <string name="menu_verify">Tjek</string>
   <string name="menu_exit">Afslut</string>
+  <string name="menu_scan">Skan BridgeQR</string>
+  <string name="menu_share_bridge">Del BridgeQR</string>
   <string name="press_to_start">- hold nede for start -</string>
   <string name="pref_trans_proxy_group">Transparent proxy (kræver 
Root)</string>
   <string name="pref_trans_proxy_title">Transparent proxy</string>
@@ -107,6 +111,7 @@
   <string name="pref_entrance_node">Indgangspunkter til Tor netværket</string>
   <string name="pref_entrance_node_summary">Fingeraftryk, servernavne, lande 
og adresser for første hop</string>
   <string name="pref_entrance_node_dialog">Indtast indgangspunkter</string>
+  <string name="pref_allow_background_starts_title">Tillad baggrunds 
starts</string>
   <string name="pref_proxy_title">Udgående netværksproxy (Valgfri)</string>
   <string name="pref_proxy_type_title">Udgående proxy-type</string>
   <string name="pref_proxy_type_summary">Protokol til proxy serveren: HTTP, 
HTTPS, Socks4, Socks5</string>
@@ -149,7 +154,6 @@
   <string name="bridges">Broer</string>
   <string name="use_bridges">Brug broer</string>
   <string name="bridges_obfuscated">Skjulte broer</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Slå 
alternative indgangspunkter til Tor netværket til</string>
   <string name="enable_if_configured_bridges_are_obfuscated_bridges">Aktiver 
hvis de indstillede broer er skjulte broer</string>
   <string name="ip_address_and_port_of_bridges">IP adresser og porte på 
broer</string>
   <string name="enter_bridge_addresses">Indtast bro-adresser</string>
@@ -178,7 +182,6 @@
   <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">Tredjeparts-software:</string>
   <string name="tor_version">Tor: https://www.torproject.org</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="something_bad_happened">Noget slemt er sket. Check 
loggen</string>
   <string name="hidden_service_on">skjult service på:</string>
@@ -200,4 +203,15 @@
   <string name="btn_save_settings">Gem Indstillinger</string>
   <string name="no_internet_connection_tor">Ingen internetforbindelse; Tor er 
på standby...</string>
   <string name="bandwidth_">BÃ¥ndbredde:</string>
+  <string name="down">Ned</string>
+  <string name="up">Op</string>
+  <string name="menu_verify_browser">Browser</string>
+  <string name="menu_vpn">Apps</string>
+  <string name="hidden_services">Skjulte tjenester</string>
+  <string name="title_activity_hidden_services">Skjulte tjenester</string>
+  <string name="menu_hidden_services">Skjulte tjenester</string>
+  <string name="save">Gem</string>
+  <string name="name">Navn</string>
+  <string name="disable">Deaktivere</string>
+  <string name="enable">Aktiver</string>
 </resources>
diff --git a/app/src/main/res/values-es-rAR/strings.xml 
b/app/src/main/res/values-es-rAR/strings.xml
index b921a402..5ec50372 100644
--- a/app/src/main/res/values-es-rAR/strings.xml
+++ b/app/src/main/res/values-es-rAR/strings.xml
@@ -1,19 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot es una aplicación de proxy gratuita 
que le permite a otras aplicaciones utilizar Internet de forma segura. Tor 
encripta tu trafico de Internet y lo oculta rebotandolo a través de una serie 
de ordenadores alrededor del mundo. Tor es un software gratuito y una red 
abierta que te ayuda a defenderte contra una forma de vigilancia de red que 
amenaza la libertad personal y la privacidad, actividades confidenciales de 
negocios y relaciones, y la seguridad de estado conocida como análisis de 
trafico.</string>
   <string name="internal_web_url">http://orbot/</string>
   <string name="default_web_url">http://check.torproject.org</string>
   <string name="secure_default_web_url">https://check.torproject.org</string>
   <string 
name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">reiniciar Tor</string>
+  <string name="control_permission_label">iniciar y parar Tor</string>
   <string name="tor_proxy_service_process">torproxyservice</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_disabled">Orbot está desactivado</string>
+  <string name="status_shutting_down">El servicio de Tor se esta 
cerrando</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="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="tor_process_complete">completo.</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 SOCKS5 proxy 127.0.0.1:9050</string>
   <string name="menu_home">Inicio</string>
   <string name="menu_browse">Navegar</string>
   <string name="menu_settings">Configuración</string>
@@ -22,18 +24,31 @@
   <string name="menu_start">Iniciar</string>
   <string name="menu_stop">Detener</string>
   <string name="menu_about">Acerca de</string>
+  <string name="menu_promo_apps">Obtener aplicaciones...</string>
   <string name="main_layout_download">Descargar</string>
   <string name="main_layout_upload">Subir</string>
   <string name="button_help">Ayuda</string>
   <string name="button_close">Cerrar</string>
   <string name="button_about">Acerca de</string>
   <string name="button_clear_log">Borrar Registros</string>
-  <string name="menu_verify">Chequear</string>
+  <string name="menu_verify">Comprobar</string>
   <string name="menu_exit">Salir</string>
-  <string name="pref_trans_proxy_group">Proxying Transparente (Requiere 
Root)</string>
-  <string name="pref_trans_proxy_title">Proxying Transparente</string>
+  <string name="menu_scan">Escanea código QR</string>
+  <string name="menu_share_bridge">Compartir el código QR</string>
+  <string name="press_to_start">- manten apretado para comenzar -</string>
+  <string name="pref_trans_proxy_group">Proxy Transparente (Requiere 
Root)</string>
+  <string name="pref_trans_proxy_title">Proxy Transparente</string>
   <string name="pref_trans_proxy_summary">Torificación Automática de 
Aplicaciones</string>
   <string name="pref_transparent_all_title">Torear Todo</string>
+  <string name="pref_transparent_all_summary">trafico de proxy para todas las 
aplicaciones a traves de Tor</string>
+  <string name="pref_transparent_port_fallback_title">puerto de proxy no 
disponible</string>
+  <string name="pref_transparent_port_fallback_summary">CUIDADO: Elude puertos 
comunes (80,443, etc). *USE SOLO* si el modo \"TODO\" o \"APLIACION\" no 
funciona.</string>
+  <string name="pref_transparent_port_title">lista de puerto</string>
+  <string name="pref_transparent_port_summary">lista de puertos de proxy. *USE 
SOLO* si el modo \"TODO\" o \"APLICACIÓN\" no funciona </string>
+  <string name="pref_transparent_port_dialog">Ingresar puertos al 
proxy</string>
+  <string name="pref_has_root">solicitar acceso root</string>
+  <string name="pref_has_root_summary">solicitar acceso root para 
transparentar el proxy</string>
+  <string name="status_install_success">Tor binario  instalado 
correctamente</string>
   <string name="status_install_fail">Los archivos binarios Tor no pudieron ser 
instalado. Compruebe el registro y notificar a 
[email protected]</string>
   <string name="title_error">Error de la aplicación</string>
   <string name="wizard_title">Orbot</string>
@@ -45,25 +60,168 @@
   <string name="btn_cancel">Cancelar</string>
   <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">Algunos detalles de Orbot</string>
+  <string name="wizard_permissions_root">Permiso concedido</string>
+  <string name="wizard_permissions_stock">Permisos de Orbot</string>
+  <string name="wizard_premissions_msg_root">Excelente! hemos detectamos que 
tienes  permisos de root habilitados para Orbot.  Usaremos este poder 
sabiamente.</string>
+  <string name="wizard_permissions_msg_stock">Si bien no es necesario, Orbot 
puede convertirse en una herramienta más potente si tu dispositivo tiene 
acceso root. ¡Utiliza el botón de abajo para otorgar a Orbot 
superpoderes!</string>
+  <string name="wizard_permissions_no_root">Si no tienes acceso root o no 
tienes idea de lo que estamos hablando, solo asegúrate de usar aplicaciones 
que puedan trabajar con Orbot.</string>
+  <string name="wizard_permissions_consent">Lo entiendo y prefiero continuar 
sin Superusuario</string>
+  <string name="wizard_permission_enable_root">Permitir root para 
Orbot</string>
+  <string name="wizard_configure">configurar la Torificacion</string>
+  <string name="wizard_configure_msg">Orbot te da la opción de rutear todos 
los tráficos de las aplicaciones a traves de Tor o de elegir las aplicaciones 
individualmente.</string>
+  <string name="wizard_configure_all">Proxy para todas las aplicaciones a 
traves de Tor</string>
+  <string name="wizard_configure_select_apps">Seleccionar individualmente las 
aplicaciones para Tor</string>
+  <string name="wizard_tips_tricks">Aplicaciones habilitadas para 
orbot</string>
+  <string name="wizard_tips_msg">Las siguientes aplicaciones se desarrollaron 
para trabajar con Orbot. Haga click en cada botón para instalarlas ahora o las 
puedes encontrar mas tarde en Google Play en la pagina de GuardianProject.info 
o a traves de F-Droid.org</string>
+  <string name="wizard_tips_otrchat">Chat Seguro - Mensajeria instantánea 
segura para Android</string>
+  <string name="wizard_tips_proxy">Configuración de Proxy - Aprenda como 
configurar las aplicaciones para que funcionen con Orbot</string>
+  <string name="wizard_tips_duckgo">DuckDuckGo aplicacion de motor de 
busqueda</string>
+  <string name="wizard_tips_twitter">Establecer proxy de Twitter para alojar 
\"localhost\" y el puerto 8118</string>
+  <string name="wizard_tips_story_maker">Creador de historias - realice una 
historia y desela a Tor para seguridad</string>
+  <string 
name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
+  <string name="wizard_proxy_help_info">configuración de proxy</string>
+  <string name="wizard_proxy_help_msg">Si la aplicación de Android que estas 
usando puede soportar el uso de HTTP o el proxy SCOKS, entonces podes 
configurarla para conectarte con Orbot y usar Tor.\n\n\n .La configuración 
host es  127.0.0.1 o \"localhost\", para HTTP, la configuración de puerto es 
8118. Para SOCKS, el proxy es 9050. Deberías usar SOCKS4A o SOCKS5 si es 
posible. \n \n\n\n Puedes aprender mas acerca del proxy en Android a través de 
las preguntas frecuentes en: http://tinyurl.com/proxyandroid\n .</string>
   <string name="wizard_final">Orbot está listo!</string>
+  <string name="wizard_final_msg">Millones de personas al rededor del mundo 
usan Tor por diferentes razones. \n\n periodistas y bloggers, defensores de los 
derechos humanos, agentes de ley, soldados, corporaciones, ciudadanos de 
regímenes represivos, y  ciudadanos normales... y ahora tu también estas 
listo!.</string>
+  <string name="wizard_exit_at_first_screen_toast">Por favor configura Orbot  
antes de empezar a usarlo</string>
   <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">Estas conectado satisfactoriamente a la 
red Tor - pero esto NO significa que tu dispositivo esta seguro. Tu puedes usar 
el botón de Navegador para probar tu conexión. \n\n Visitanos en 
https://guardianproject.info/apps/orbot o mándanos un email para saber mas a 
[email protected].</string>
+  <string name="tor_check">Esto abrirá su navegador web a 
https://check.torproject.org para ver si Orbot probablemente está configurado 
y está conectado a Tor.</string>
+  <string name="pref_hs_group">Servicio de hosting oculto</string>
   <string name="pref_general_group">General</string>
+  <string name="pref_start_boot_title">Arrancar Orbot al inicio</string>
+  <string name="pref_start_boot_summary">Inicie automáticamente Orbot y 
conecte Tor cuando el dispositivo android arranque.</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot lleva Tor a Android! \n\n Tor te ayuda 
a defenderte contra el filtrado de contenido, análisis de tráfico y 
vigilancia de red que amenazan la privacidad, la información confidencial y 
las relaciones personales. \n\n Este asistente le ayudará a configurar Orbot y 
Tor en su dispositivo.</string>
   <!--Warning screen-->
+  <string name="wizard_warning_title">Cuidado</string>
+  <string name="wizard_warning_msg">Simplemente instalando Orbot no se 
anonimizará tu trafico móvil. \n\n Debes configurar apropiadamente Orbot,  tu 
dispositivo y otras aplicaciones para usar satisfactoriamente Tor.</string>
   <!--Permissions screen-->
+  <string name="wizard_permissions_title">Permisos</string>
+  <string name="wizard_permissions_root_msg1">Opcionalmente puedes tener 
acceso a Orbot \'Superusuario\' para activar funciones avanzadas, como Proxy 
transparente.</string>
+  <string name="wizard_permissions_root_msg2">Si no quieres hacer esto, por 
favor asegúrate de usar las aplicaciones hechas para usar Orbot.</string>
+  <string name="wizard_permissions_no_root_msg">Su dispositivo no parece estar 
ruteado, proporcionar acceso root o tener acceso \"superusuario\". \n\n Por 
favor pruebe el modo \"aplicaciones\" en la pantalla principal.</string>
   <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Aplicaciones habilitadas para Orbot</string>
+  <string name="wizard_tips_gibberbot">ChatSeguro: aplicación de chat seguro 
con el cifrado sin registro</string>
+  <string name="wizard_tips_orweb">Orfox: Navegar con privacidad que funciona 
con Tor</string>
+  <string name="wizard_tips_play">Encuentra todas las aplicaciones de Guardian 
Project en Google Play</string>
+  <string name="wizard_tips_fdroid">Encuentra todas las aplicaciones de 
Guardian Project en F-Droid</string>
+  <string name="wizard_tips_fdroid_org">Encuentra todas las aplicaciones de 
Guardian Project en https://f-droid.org</string>
   <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Proxying Transparente</string>
+  <string name="wizard_transproxy_title">Proxy Transparente</string>
+  <string name="wizard_transproxy_msg">Esto permite que tus aplicaciones se 
ejecuten automáticamente a través de la red Tor sin ninguna 
configuración.</string>
+  <string name="wizard_transproxy_hint">(Marque esta casilla si no tiene idea 
de lo que estamos hablando)</string>
+  <string name="wizard_transproxy_none">ninguno</string>
+  <string name="pref_transparent_tethering_title">Anclaje a red Tor</string>
+  <string name="pref_transparent_tethering_summary">Activar Tor Proxy 
transparente para dispositivos Wifi y USB conectados (requiere 
reiniciar)</string>
+  <string name="button_grant_superuser">Solicitar acceso Superusuario</string>
+  <string name="pref_select_apps">seleccionar aplicaciones</string>
+  <string name="pref_select_apps_summary">Elija aplicaciones para rutear a 
través de Tor</string>
+  <string name="pref_node_configuration">configuracion del nodo</string>
+  <string name="pref_node_configuration_summary">Estas son configuraciones 
avanzadas que pueden reducir tu anonimato</string>
+  <string name="pref_entrance_node">Nodos de entrada</string>
+  <string name="pref_entrance_node_summary">Huellas dactilares, apodos, 
países y direcciones para el primer salto</string>
+  <string name="pref_entrance_node_dialog">Introduzca los nodos de 
entrada</string>
+  <string name="pref_allow_background_starts_title">Permitir inicio de 
fondo</string>
+  <string name="pref_allow_background_starts_summary">Deje que cualquier 
aplicación indique a Orbot que inicie Tor y servicios relacionados</string>
+  <string name="button_proxy_all">proxy todo</string>
+  <string name="button_proxy_none">proxy nada</string>
+  <string name="button_invert_selection">invertir seleccion</string>
+  <string name="pref_proxy_title">red de proxy de salida (opcional)</string>
+  <string name="pref_proxy_type_title">tipo de proxy de salida</string>
+  <string name="pref_proxy_type_summary">Protocolo a utilizar para el servidor 
proxy: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">introduzca el tipo de proxy</string>
+  <string name="pref_proxy_host_title">host de proxy de salida</string>
+  <string name="pref_proxy_host_summary">nombre de host del servidor proxy 
</string>
+  <string name="pref_proxy_host_dialog">ingresar host proxy</string>
+  <string name="pref_proxy_port_title">puerto proxy externo</string>
+  <string name="pref_proxy_port_summary">puerto del servidor proxy</string>
+  <string name="pref_proxy_port_dialog">introduzca el puerto proxy</string>
+  <string name="pref_proxy_username_title">nombre de usuario de proxy de 
salida</string>
+  <string name="pref_proxy_username_summary">nombre de usuario de proxy 
(opcional)</string>
+  <string name="pref_proxy_username_dialog">ingrese nombre de usuario de 
proxy</string>
+  <string name="pref_proxy_password_title">contraseña de proxy de 
salida</string>
+  <string name="pref_proxy_password_summary">contraseña de proxy 
(opcional)</string>
   <string name="pref_proxy_password_dialog">Ingrese contraseña Proxy</string>
+  <string name="status">estado</string>
+  <string name="setting_up_full_transparent_proxying_">Configuración de proxy 
transparente completa ...</string>
+  <string name="setting_up_app_based_transparent_proxying_">configuracion de 
aplicaciones de proxy transparente</string>
+  <string name="transparent_proxying_enabled">proxy transparente 
habilitado</string>
+  <string name="transproxy_enabled_for_tethering_">transproxy habilitado para 
tethering</string>
+  <string name="warning_error_starting_transparent_proxying_">CUIDADO: error 
al iniciar proxy transparente</string>
+  <string name="transproxy_rules_cleared">Las reglas de transproxy se 
borran</string>
+  <string name="couldn_t_start_tor_process_">no se pudo iniciar Tor</string>
+  <string name="privoxy_is_running_on_port_">Polipo se esta ejecutando en el 
puerto</string>
+  <string name="setting_up_port_based_transparent_proxying_">Configuración de 
proxy basados en puertos...</string>
+  <string name="bridge_error">Error de puente</string>
+  <string name="bridge_requires_ip">Para utilizar la función puente, debe 
introducir al menos una dirección IP de puente.</string>
+  <string name="send_email_for_bridges">Envia un email a 
[email protected] con la linea \"get bridges\" por si mismo en el cuerpo 
del correo de una cuenta de gmail</string>
+  <string name="error">Error</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">La 
configuración de las direcciones alcanzables causó una excepción.</string>
+  <string name="your_relay_settings_caused_an_exception_">Su configuración de 
retransmisión provocó una excepción.</string>
+  <string name="exit_nodes">nodos de salida</string>
+  <string 
name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">huellas 
dactilares, apodos, paises y direcciones para el ultimo salto</string>
+  <string name="enter_exit_nodes">ingrese nodos de salida</string>
+  <string name="exclude_nodes">excluir nodos</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">huellas 
digitales, usuarios, paises y direcciones para excluir</string>
+  <string name="enter_exclude_nodes">ingrese nodos excluidos</string>
+  <string name="strict_nodes">nodos estrictos</string>
+  <string name="use_only_these_specified_nodes">utilice *solo* estos nodos 
especificos </string>
+  <string name="bridges">puentes</string>
+  <string name="use_bridges">usar puentes</string>
+  <string name="bridges_obfuscated">puentes ofuscados</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Activar 
si los puentes configurados son puentes ofuscados</string>
+  <string name="ip_address_and_port_of_bridges">direccion IP y puerto de 
puentes</string>
+  <string name="enter_bridge_addresses">introduzca las direcciones de 
puente</string>
+  <string name="relays">retransmitir</string>
+  <string name="relaying">retransmision </string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Habilite su 
dispositivo para que sea retransmision sin salida</string>
+  <string name="relay_port">puerto de retransmision</string>
+  <string name="listening_port_for_your_tor_relay">puerto de escucha para la 
retransmision de Tor</string>
+  <string name="enter_or_port">entrar puerto OR</string>
+  <string name="relay_nickname">apodo de retransmision</string>
+  <string name="the_nickname_for_your_tor_relay">el apodo para tu 
retransmision de Tor</string>
+  <string name="enter_a_custom_relay_nickname">Introduzca un apodo de 
retransmisión personalizado</string>
+  <string name="reachable_addresses">direcciones alcanzables</string>
+  <string 
name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Ejecutar 
como un cliente detrás de un firewall con políticas restrictivas</string>
+  <string name="reachable_ports">puertos alcanzables</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Puertos 
accesibles detrás de un firewall restrictivo</string>
   <string name="enter_ports">Ingresar puertos</string>
+  <string name="enable_hidden_services">Servicio de hosting oculto</string>
+  <string name="run_servers_accessible_via_the_tor_network">Permitir que el 
servidor en el dispositivo sea accesible a través de la red Tor</string>
+  <string name="enter_localhost_ports_for_hidden_services">Ingrese puertos 
host locales para servicios ocultos</string>
+  <string name="hidden_service_ports">puertos de servicio ocultos</string>
+  <string 
name="the_addressable_name_for_your_hidden_service_generated_automatically_">El 
nombre direccionable para su servicio oculto (generado 
automáticamente)</string>
+  <string 
name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">habilitar 
registro de depuración para salida (debe usar adb o aLogCat para 
visualizar)</string>
+  <string 
name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
   <string name="the_tor_license">La Licencia de Tor</string>
   <string name="https_torproject_org">https://torproject.org</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: 
http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: 
https://github.com/jech/polipo</string>
   <string name="unable_to_start_tor">No se puede iniciar Tor:</string>
   <string name="default_bridges"></string>
   <string name="wizard_locale_title">Elegir el lenguaje</string>
   <string name="btn_save_settings">Guardar configuración</string>
   <string name="bandwidth_">Ancho de banda:</string>
+  <string name="menu_verify_browser">Navegador</string>
   <string name="menu_use_chatsecure">Usar ChatSecure</string>
-  <string name="install_apps_">Instalar apps?</string>
+  <string name="permission_manage_tor_description">Habilitar esta aplicación 
para que controle el servicio de Tor</string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_dnsport_title">Puerto DNS Tor</string>
+  <string name="pref_dnsport_dialog">Configuración del Puerto DNS</string>
+  <string name="menu_vpn">Apps</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="get_bridges_email">Email</string>
+  <string name="get_bridges_web">Web</string>
+  <string name="activate">Activar</string>
+  <string name="install_orweb">Instalar Orfox</string>
+  <string name="save">Guardar</string>
+  <string name="name">Nombre</string>
+  <string name="disable">Deshabilitar</string>
 </resources>
diff --git a/app/src/main/res/values-et/strings.xml 
b/app/src/main/res/values-et/strings.xml
index 9ef3be46..5dddc943 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot on vabalt kasutatav proxy rakendus, mis 
võimaldab teistel rakendustel Interneti turvalisemat kasutust. Orbot 
krüpteerib ja peidab teie Internetiliikluse Tor abil paljude maailma arvutite 
vahel põrgatades. Tor on vaba tarkvara ja vaba võrgustik mis aitab teil 
kaitsta oma privaatsust, vabadust, konfidentsiaalset äritegevust, suhteid ja 
riiklikku julgeolekut arvutivõrgus toimuva liikluse analüüsi eest.</string>
   <string name="internal_web_url">http://orbot/</string>
   <string 
name="default_web_url">http://check.torproject.orghttp://check.torproject.org</string>
   <string name="secure_default_web_url">https://check.torproject.org</string>
@@ -10,6 +11,7 @@
   <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_complete">valmis.</string>
   <string name="tor_process_waiting">ootel.</string>
@@ -150,7 +152,6 @@
   <string name="bridges">Sillad</string>
   <string name="use_bridges">Kasuta sildu</string>
   <string name="bridges_obfuscated">Varjatud sillad</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Luba Tor 
võrgustiku alternatiivseid sisendsõlmi</string>
   <string name="enable_if_configured_bridges_are_obfuscated_bridges">Luba siis 
kui seadistatud sillad on varjatud sillad</string>
   <string name="ip_address_and_port_of_bridges">Sildade IP aadressid ja 
pordinumbrid</string>
   <string name="enter_bridge_addresses">Sisestage silla aadressid</string>
@@ -178,7 +179,6 @@
   <string name="the_tor_license">Tor litsents</string>
   <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="something_bad_happened">Juhtus midagi halba. Kontrollige 
logi</string>
   <string name="hidden_service_on">varjatud teenused:</string>
@@ -204,7 +204,10 @@
   <string name="menu_use_chatsecure">Kasutage ChatSecure\'t</string>
   <string name="permission_manage_tor_label">Hallake Tor\'i</string>
   <string name="permission_manage_tor_description">Lubage sellel rakendusel 
hallata Tor teenust</string>
-  <string name="install_apps_">Paigaldada rakendusi?</string>
   <string name="no_network_connectivity_putting_tor_to_sleep_">Interneti 
ühendus puudub. Panen Tori magama...</string>
   <string name="network_connectivity_is_good_waking_tor_up_">Interneti 
ühendus hea. Äratan Tori üles...</string>
+  <string name="menu_vpn">Rakendused</string>
+  <string name="save">Salvesta</string>
+  <string name="name">Name</string>
+  <string name="enable">Luba</string>
 </resources>
diff --git a/app/src/main/res/values-eu/strings.xml 
b/app/src/main/res/values-eu/strings.xml
index 198c6121..3a49d2f5 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">Orbot</string>
   <string name="internal_web_url">http://orbot/</string>
@@ -10,6 +10,7 @@
   <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">TorService itzaltzen ari da</string>
   <string name="tor_process_starting">Tor bezeroa hasten...</string>
   <string name="tor_process_complete">eginda.</string>
   <string name="tor_process_waiting">itxaroten.</string>
@@ -22,6 +23,7 @@
   <string name="menu_start">Abiarazi</string>
   <string name="menu_stop">Gelditu</string>
   <string name="menu_about">Honi buruz</string>
+  <string name="menu_promo_apps">Eskuratu aplikazioak...</string>
   <string name="main_layout_download">Deskargatu</string>
   <string name="main_layout_upload">Igo</string>
   <string name="button_help">Laguntza</string>
@@ -30,6 +32,8 @@
   <string name="button_clear_log">Zerrenda Garbitu</string>
   <string name="menu_verify">Egiaztatu</string>
   <string name="menu_exit">Irten</string>
+  <string name="menu_scan">Eskaneatu BridgeQR</string>
+  <string name="menu_share_bridge">Partekatu BridgeQR</string>
   <string name="press_to_start">- sakatu luze hasteko -</string>
   <string name="pref_trans_proxy_group">Proxyatze Gardena (Root behar 
du)</string>
   <string name="pref_trans_proxy_title">Proxyatze Gardena</string>
@@ -75,6 +79,7 @@
   <string 
name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
   <string name="wizard_proxy_help_info">Proxy Ezarpenak</string>
   <string name="wizard_final">Orbot prest dago!</string>
+  <string name="wizard_exit_at_first_screen_toast">Mesedez konfiguratu Orbot 
erabiltzen hasi baino lehen!</string>
   <!--END Welcome Wizard strings (DJH)-->
   <string name="tor_check">Honek https://check.torproject.org web 
nabigatzailean irekiko du Orbot konfiguratuta eta Tor-era konektatuta zauden 
antzemateko.</string>
   <string name="pref_hs_group">Ezkutuko Zerbitzuak</string>
@@ -93,6 +98,8 @@
   <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="wizard_tips_play">Google Play-n Guardiak Proiektuko aplikazio 
guztiak bilatu</string>
+  <string name="wizard_tips_fdroid">Bilatu Guardian Project aplikazio guztiak 
F-Droid-en</string>
+  <string name="wizard_tips_fdroid_org">Bilatu Guardian Project aplikazio 
guztiak https://f-droid.org</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>
@@ -150,7 +157,6 @@
   <string name="bridges">Zubiak</string>
   <string name="use_bridges">Zubiak erabili</string>
   <string name="bridges_obfuscated">Nahasitako Zubiak</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Tor 
sarera sartzeko nodo alternatiboak gaitu</string>
   <string name="enable_if_configured_bridges_are_obfuscated_bridges">Gaitu 
konfiguratutako zubiak nahasitako zubiak badira</string>
   <string name="ip_address_and_port_of_bridges">IP helbidea eta zubien 
portua</string>
   <string name="enter_bridge_addresses">Sartu Zubi Helbideak</string>
@@ -175,14 +181,13 @@
   <string 
name="the_addressable_name_for_your_hidden_service_generated_automatically_">zure
 eskutuko zerbitzuaren izen atzigarria (automatikoki sortuta)</string>
   <string 
name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">arazketarako 
logak gaitu (adb edo aLogCat erabili ikusteko)</string>
   <string name="project_home">Proiektuaren etxea(k):</string>
+  <string 
name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
   <string name="the_tor_license">Tor Lizentzia</string>
   <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">3.-Ataleko-Softwarea:</string>
   <string name="tor_version">Tor: https://www.torproject.org</string>
   <string name="libevent_version">LibEvent v2.0.21: 
http://www.monkey.org/~provos/libevent/</string>
   <string name="polipo_version">Polipo v1.1.9: 
https://github.com/jech/polipo</string>
-  <string name="iptables_version">IPtables v1.4.21: 
http://www.netfilter.org</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="something_bad_happened">Zerbait txarra gertatu da. Begiratu 
logetan</string>
   <string name="hidden_service_on">ezkutuko zerbitzua hemen:</string>
@@ -195,6 +200,7 @@
   <string name="pref_use_persistent_notifications_title">Jakinarazpenetan 
beti</string>
   <string name="notification_using_bridges">Zubiak gaituta!</string>
   <string name="default_bridges"></string>
+  <string name="set_locale_title">Hizkuntza</string>
   <string name="set_locale_summary">Aukeratu Orbotentzako lokala eta 
hizkuntza</string>
   <string name="wizard_locale_title">Hizkuntza aukeratu</string>
   <string name="wizard_locale_msg">Lehenetsia utzi edo uneko hizkuntzara 
aldatu</string>
@@ -207,12 +213,25 @@
   <string name="pref_disable_network_title">Sareko lokartze automatikorik 
ez</string>
   <string name="pref_disable_network_summary">Jarri Tor lotan internet 
atzigarri ez dagoenean</string>
   <string name="newnym">ChatSecure - Andriodentzako berehalako mezulari bezero 
ziurra</string>
+  <string name="menu_verify_browser">Nabigatzailea</string>
   <string name="menu_use_chatsecure">ChatSecure erabili</string>
   <string name="permission_manage_tor_label">Tor kudeatu</string>
   <string name="permission_manage_tor_description">Gaitu app hau Tor zerbitzua 
kontrolatzeko</string>
-  <string name="install_apps_">App-ak instalatu?</string>
+  <string name="pref_dnsport_title">Tor DNS Portua</string>
+  <string name="your_tor_public_ips_">Zure Tor Public IPak:</string>
+  <string name="menu_vpn">Aplikazioak</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
+  <string name="restart_orbot_to_use_this_bridge_">Mesedez berrabiarazi Orbot 
aldaketak aktibatzeko</string>
   <string name="menu_qr">QR Kodeak</string>
+  <string name="install_orweb">Instalatu Orfox</string>
   <string name="standard_browser">Nabigatzaile Estandarra</string>
+  <string name="hidden_services">Ezkutuko Zerbitzuak</string>
+  <string name="title_activity_hidden_services">Ezkutuko Zerbitzuak</string>
+  <string name="menu_hidden_services">Ezkutuko Zerbitzuak</string>
+  <string name="save">Gorde</string>
+  <string name="name">Izena</string>
+  <string name="please_restart_Orbot_to_enable_the_changes">Mesedez 
berrabiarazi Orbot aldaketak aktibatzeko</string>
 </resources>
diff --git a/app/src/main/res/values-gl/strings.xml 
b/app/src/main/res/values-gl/strings.xml
index 8496d4b6..6c3dda55 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot é unha aplicación de proxy libre que 
permite a outras aplicacións usar a internet dun xeito máis seguro. Orbot usa 
Tor para encriptar o teu tráfico de internet ocultando e rebotándoo a través 
dunha serie de ordenadores ao redor do mundo. Tor é software libre e unha rede 
aberta que axuda a defenderte contra unha forma de vixiancia na rede que ameaza 
a liberdade e privacidade persoal, actividades confidenciáis de negocios e 
relacións, e estado de seguridade coñecido como análise de tráfico.</string>
@@ -11,6 +11,7 @@
   <string name="status_starting_up">Orbot está a se iniciar...</string>
   <string name="status_activated">Conectado á rede Tor</string>
   <string name="status_disabled">Orbot está desactivado</string>
+  <string name="status_shutting_down">O ServizoTor estase pechando</string>
   <string name="tor_process_starting">Iniciando cliente Tor...</string>
   <string name="tor_process_complete">completado.</string>
   <string name="tor_process_waiting">á espera.</string>
@@ -23,6 +24,7 @@
   <string name="menu_start">Iniciar</string>
   <string name="menu_stop">Deter</string>
   <string name="menu_about">Sobre</string>
+  <string name="menu_promo_apps">Obter apps...</string>
   <string name="main_layout_download">Descargar</string>
   <string name="main_layout_upload">Cargar</string>
   <string name="button_help">Axuda</string>
@@ -31,6 +33,8 @@
   <string name="button_clear_log">Limpar rexistro</string>
   <string name="menu_verify">Comprobar</string>
   <string name="menu_exit">Saír </string>
+  <string name="menu_scan">Escanear BridgeQR</string>
+  <string name="menu_share_bridge">Compartir BridgeQR</string>
   <string name="press_to_start">- toque longo para comezar-</string>
   <string name="pref_trans_proxy_group">Proxyficación transparente (cómpre 
ser root)</string>
   <string name="pref_trans_proxy_title">Proxyficación transparente</string>
@@ -75,8 +79,13 @@
   <string name="wizard_tips_twitter">Axustar o host para proxy de Twitter a 
\"localhost\" e porto 8118</string>
   <string 
name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
   <string name="wizard_proxy_help_info">Axustes do proxy</string>
+  <string name="wizard_proxy_help_msg">Se o aplicativo de Android que está a 
utilizar admite o uso de un proxy HTTP ou SOCKS, entón pode configuralo para 
que se conecte a Orbot e utilizar Tor.\n\n\n Os axustes do proxy son 127.0.0.1 
ou \"localhost\" como servidor. No proxy HTTP o porto é o 8118. Para SOCKS en 
9050. Debería utilizar SOCKS4A OU SOCKS5 se fose posible.\n \n\n\n Vostede 
pode aprender máis sobre cómo utilizar un proxy en Android nas nosas PMF en:
+http://tinyurl.com/proxyandroid\n </string>
   <string name="wizard_final">Orbot está listo!</string>
+  <string name="wizard_final_msg">Millóns de personas utilizan Tor en todo o 
mundo por múltiples razóns.\n\nXornalistas e blogueiras, defensoras dos 
dereitos humanos, fiscáis, soldados, empresas, cidadáns baixo reximes 
opresivos, e cidadáns normais... e agora vostede tamén pode!</string>
+  <string name="wizard_exit_at_first_screen_toast">Por favor, configure Orbot 
antes de comezar a utilizalo!</string>
   <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">Vostede conectouse correctamente a rede 
Tor - mais esto NON significa que o seu dispositivo é seguro. Pode utilizar o 
bótón \'Navegador\' para comprobar a súa conexión. \n\nVisítenos en 
https://guardianproject.info/apps/orbot ou envíenos un correo electrónico a 
[email protected] para saber máis.</string>
   <string name="tor_check">Isto abrirá no seu navegador 
https://check.torproject.org para ver se Obrbot está configurado probablemente 
e se está conectado a Tor.</string>
   <string name="pref_hs_group">Aloxamento Oculto de Servizo</string>
   <string name="pref_general_group">Xeral</string>
@@ -151,7 +160,6 @@
   <string name="bridges">Pontes</string>
   <string name="use_bridges">Usar Pontes</string>
   <string name="bridges_obfuscated">Pontes Ofuscadas</string>
-  <string 
name="enable_alternate_entrance_nodes_into_the_tor_network">Habilitar nodos 
alternativos de entrada á rede Tor</string>
   <string name="enable_if_configured_bridges_are_obfuscated_bridges">Habilitar 
se oas pontes configuradas son pontes ofuscadas</string>
   <string name="ip_address_and_port_of_bridges">Dirección IP e porto das 
pontes</string>
   <string name="enter_bridge_addresses">Introduza Direccións das 
Pontes</string>
@@ -179,7 +187,6 @@
   <string name="the_tor_license">A Licencia de Tor</string>
   <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">Software de Terceiros:</string>
-  <string name="hidden_service_request">Un aplicativo quere abrir o porto do 
servidor oculto %S na rede Tor. Isto é seguro se confía no 
aplicativo.</string>
   <string name="found_existing_tor_process">atopado proceso Tor 
existente...</string>
   <string name="something_bad_happened">Algo malo pasou. Comprobe o 
rexistro</string>
   <string name="hidden_service_on">servizo oculto en:</string>
@@ -205,5 +212,13 @@
   <string name="menu_use_chatsecure">Usar ChatSecure</string>
   <string name="permission_manage_tor_label">Xestionar Tor</string>
   <string name="permission_manage_tor_description">Hablitar este aplicativo 
para controlar o servicio Tor</string>
-  <string name="install_apps_">Instalar aplicativos?</string>
+  <string name="menu_vpn">Apps</string>
+  <string name="get_bridges_email">Email</string>
+  <string name="hidden_services">Servizos agochados</string>
+  <string name="title_activity_hidden_services">Servizos agochados</string>
+  <string name="menu_hidden_services">Servizos agochados</string>
+  <string name="save">Gardar</string>
+  <string name="name">Nome</string>
+  <string name="done">Feito!</string>
+  <string name="disable">Inhabilitar</string>
 </resources>
diff --git a/app/src/main/res/values-ms-rMY/strings.xml 
b/app/src/main/res/values-ms-rMY/strings.xml
index e281414a..e3241746 100644
--- a/app/src/main/res/values-ms-rMY/strings.xml
+++ b/app/src/main/res/values-ms-rMY/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">Orbot</string>
   <string name="internal_web_url">http://orbot/</string>
@@ -148,7 +148,6 @@
   <string name="bridges">Jambatan</string>
   <string name="use_bridges">Guna Jambatan</string>
   <string name="bridges_obfuscated">Jambatan Keliru</string>
-  <string 
name="enable_alternate_entrance_nodes_into_the_tor_network">Membolehkan nod 
pintu masuk ganti ke Rangkaian Tor</string>
   <string name="enable_if_configured_bridges_are_obfuscated_bridges">Benarkan 
jika konfigurasi jambatan adalah jambatan keliru</string>
   <string name="ip_address_and_port_of_bridges">Alamat IP dan pelabuhan 
jambatan</string>
   <string name="enter_bridge_addresses">Masukkan Alamat Jambatan</string>
@@ -176,7 +175,6 @@
   <string name="the_tor_license">Lesen Tor</string>
   <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">3rd-Party-Software: </string>
-  <string name="hidden_service_request">Satu aplikasi mahu membuka port 
tersembunyi %S pada rangkaian Tor. Ia selamat jika anda percaya pada aplikasi 
itu.</string>
   <string name="found_existing_tor_process">Proses Tor sedia ada 
ditemui..</string>
   <string name="something_bad_happened">Sesuatu yang buruk berlaku. Semak 
log.</string>
   <string name="hidden_service_on">port tersembunyi pada:</string>
@@ -193,4 +191,11 @@
   <string name="wizard_locale_title">Pilih Bahasa</string>
   <string name="wizard_locale_msg">Biar default atau ubah ke bahasa 
sekarang</string>
   <string name="btn_save_settings">Simpan Tetapan</string>
+  <string name="bandwidth_">Jalur Lebar:</string>
+  <string name="menu_vpn">Apps</string>
+  <string name="hidden_services">Perkhidmatan tersembunyi</string>
+  <string name="title_activity_hidden_services">Perkhidmatan 
tersembunyi</string>
+  <string name="menu_hidden_services">Perkhidmatan tersembunyi</string>
+  <string name="save">Simpan</string>
+  <string name="name">Nama</string>
 </resources>
diff --git a/app/src/main/res/values-ms/strings.xml 
b/app/src/main/res/values-ms/strings.xml
index c327e579..3caddf4a 100644
--- a/app/src/main/res/values-ms/strings.xml
+++ b/app/src/main/res/values-ms/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">Orbot</string>
   <string name="internal_web_url">http://orbot/</string>
@@ -20,7 +20,6 @@
   <string name="menu_settings">Tetapan</string>
   <string name="menu_log">Log</string>
   <string name="menu_info">Bantuan</string>
-  <string name="menu_apps">Apps</string>
   <string name="menu_start">Mula</string>
   <string name="menu_stop">Henti</string>
   <string name="menu_about">Tentang</string>
@@ -55,7 +54,6 @@
   <string name="btn_cancel">Batal</string>
   <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">Maklumat Orbot</string>
-  <string name="wizard_details_msg">Orbot merupakan aplikasi sumber terbuka 
yang mengandungi Tor, LibEvent dan Privoxy. Ia menyediakan seorang proksi HTTP 
tempatan (8118) dan proksi SOCKS (9050) ke dalam rangkaian Tor. Orbot juga 
mempunyai keupayaan, pada peranti berakar umbi, untuk menghantar semua trafik 
internet melalui Tor.</string>
   <string name="wizard_permissions_root">Kebenaran disahkan</string>
   <string name="wizard_permissions_stock">Kebenaran Orbot</string>
   <string name="wizard_premissions_msg_root">Bagus! Kami mendapati anda ada 
akses root yang dibenarkan untuk Orbot. Kami akan gunakan kuasa ini dengan 
bijak.</string>
@@ -148,7 +146,6 @@
   <string name="bridges">Jambatan</string>
   <string name="use_bridges">Guna Jambatan</string>
   <string name="bridges_obfuscated">Jambatan Keliru</string>
-  <string 
name="enable_alternate_entrance_nodes_into_the_tor_network">Membolehkan nod 
pintu masuk ganti ke Rangkaian Tor</string>
   <string name="enable_if_configured_bridges_are_obfuscated_bridges">Benarkan 
jika konfigurasi jambatan adalah jambatan keliru</string>
   <string name="ip_address_and_port_of_bridges">Alamat IP dan pelabuhan 
jambatan</string>
   <string name="enter_bridge_addresses">Masukkan Alamat Jambatan</string>
@@ -177,7 +174,6 @@
   <string name="the_tor_license">Lesen Tor</string>
   <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">3rd-Party-Software: </string>
-  <string name="hidden_service_request">Satu aplikasi mahu membuka port 
tersembunyi %S pada rangkaian Tor. Ia selamat jika anda percaya pada aplikasi 
itu.</string>
   <string name="found_existing_tor_process">Proses Tor sedia ada 
ditemui..</string>
   <string name="something_bad_happened">Sesuatu yang buruk berlaku. Semak 
log.</string>
   <string name="hidden_service_on">port tersembunyi pada:</string>
@@ -196,5 +192,6 @@
   <string name="wizard_locale_msg">Biar default atau ubah ke bahasa 
sekarang</string>
   <string name="powered_by">Dijana oleh Projek Tor</string>
   <string name="btn_save_settings">Simpan Tetapan</string>
-  <string name="menu_vpn">Apps</string>
+  <string name="save">Simpan</string>
+  <string name="name">Nama</string>
 </resources>
diff --git a/app/src/main/res/values-pt/strings.xml 
b/app/src/main/res/values-pt/strings.xml
index 69f7a770..fd97061c 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">Orbot</string>
   <string name="internal_web_url">http://orbot/</string>
@@ -134,8 +134,6 @@
   <string name="tor_version">Tor: https://www.torproject.org</string>
   <string name="libevent_version">LibEvent v2.0.21: 
http://www.monkey.org/~provos/libevent/</string>
   <string name="polipo_version">Polipo v1.1.9: 
https://github.com/jech/polipo</string>
-  <string name="iptables_version">IPtables v1.4.21: 
http://www.netfilter.org</string>
-  <string name="hidden_service_request">Uma app pretende abrir a porta %S do 
servidor ocultado para a rede Tor. Isto é seguro, se confiar na app.</string>
   <string name="found_existing_tor_process">encontrado o processo Tor 
existente...</string>
   <string name="something_bad_happened">Aconteceu algo de mau. Verifique o 
registo de eventos.</string>
   <string name="hidden_service_on">serviço ocultado em:</string>
@@ -159,7 +157,6 @@
   <string name="menu_use_chatsecure">Usar ChatSecure</string>
   <string name="permission_manage_tor_label">Gerir Tor</string>
   <string name="permission_manage_tor_description">Ative esta app para 
controlar o serviço Tor</string>
-  <string name="install_apps_">Instalar apps?</string>
   <string name="no_network_connectivity_putting_tor_to_sleep_">Nenhuma 
conetividade de rede. A hibernar Tor…</string>
   <string name="network_connectivity_is_good_waking_tor_up_">A conetividade de 
rede é boa. A iniciar Tor…</string>
   <string name="updating_settings_in_tor_service">a atualizar as definições 
no serviço Tor</string>
@@ -167,6 +164,7 @@
   <string name="pref_dnsport_title">Porta DNS Tor</string>
   <string name="your_tor_public_ips_">Os seus IPs Públicos Tor:</string>
   <string name="app_conflict">Conflito de App</string>
+  <string name="menu_vpn">Apps</string>
   <string name="kbps">kbps</string>
   <string name="mbps">mbps</string>
   <string name="kb">KB</string>
@@ -178,4 +176,12 @@
   <string name="activate">Ativar</string>
   <string name="send_email">Enviar Mensagem</string>
   <string name="standard_browser">Navegador Padrão</string>
+  <string name="hidden_services">Serviços ocultos</string>
+  <string name="title_activity_hidden_services">Serviços ocultos</string>
+  <string name="menu_hidden_services">Serviços ocultos</string>
+  <string name="save">Guardar</string>
+  <string name="name">Nome</string>
+  <string name="done">Concluído!</string>
+  <string name="disable">Desativar</string>
+  <string name="enable">Ativar</string>
 </resources>
diff --git a/app/src/main/res/values-si-rLK/strings.xml 
b/app/src/main/res/values-si-rLK/strings.xml
index e4dc474e..06072aa2 100644
--- a/app/src/main/res/values-si-rLK/strings.xml
+++ b/app/src/main/res/values-si-rLK/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot යනු අනෙකුත් අ
ැප්ස් හට වඩා අාරක්ෂාකාරීව අ
න්තර්ජාලෙය් සැරිසැරීමට ඉඩ 
සලසාදෙන  නොමිලේ 
ලබාදෙන්නාවූ ප්රොක්සි 
සේවාවකි. එය Tor යොදාගනිමින් 
ඔබගේ අන්තර්ජාල ගනුදෙනු 
ඛේතනය කරයි එමෙන්ම එය ලොව 
වටා වූ අනෙකුත් සමාන්තර පරිගනක 
හරහා ගෙනයමින්  ඔබගේ අ
න්තර්ජාල ගනුදෙනු සඟවා තබාගනී. 
Tor යනු </string>
   <string name="internal_web_url">http://orbot/</string>
   <string name="default_web_url">http://check.torproject.org</string>
   <string name="secure_default_web_url">https://check.torproject.org</string>
@@ -142,7 +143,6 @@
   <string name="bridges">සේතු</string>
   <string name="use_bridges">සේතු භාවිතා කරන්න 
</string>
   <string name="bridges_obfuscated">සේතු අදුරු 
කරන්න </string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Tor 
ජාලයට විකල්ප ඇතුළු විමේ නොඩු 
සබල කරන්න </string>
   <string 
name="enable_if_configured_bridges_are_obfuscated_bridges">වින්‍යාස
 කර ඇති සේතු අදුරු කල සේතු නම් 
ඒවා සබල කරන්න </string>
   <string name="ip_address_and_port_of_bridges">IP ලිපිනය හා 
සේතුවල පෝට</string>
   <string name="enter_bridge_addresses">සේතු ලිපිනයන් 
ඇතුළු කරන්න </string>
@@ -170,7 +170,6 @@
   <string name="the_tor_license">Tor බලපත්‍රය</string>
   <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">3 වන පාර්ශව 
මෘදුකාංග</string>
-  <string name="hidden_service_request">යොමුවකට 
සැගවුණු සේවාදායක %S පෝටය Tor 
ජාලයට විවෘත කිරීමට උවමනාය. 
මෙය සුරක්ෂිතවන්නේ ඔබ මෙම 
යොමුව විශ්වාස කරනවා නම්  
පමණි.</string>
   <string name="found_existing_tor_process">පවතින Tor 
ක්‍රියාවලි හමුවිය...</string>
   <string name="something_bad_happened">යම් නොමනා 
දෙයක් සිදුවිය. ලොගය පරික්ෂා 
කර බලන්න </string>
   <string name="hidden_service_on">සැගවුණු සේවා 
පිහිටන්නේ:</string>
@@ -187,4 +186,10 @@
   <string name="wizard_locale_title">භාෂාව තෝරන්න 
</string>
   <string name="wizard_locale_msg">සම්මතය අතහැර 
වර්තමාන භාෂාවට මාරුවෙන්න </string>
   <string name="btn_save_settings">සිටුවම් 
සුරැකින්න</string>
+  <string name="menu_vpn">යෙදුම් </string>
+  <string name="hidden_services">සැගවුණු සේවා </string>
+  <string name="title_activity_hidden_services">සැගවුණු 
සේවා </string>
+  <string name="menu_hidden_services">සැගවුණු සේවා 
</string>
+  <string name="save">සුරකින්න</string>
+  <string name="name">නම</string>
 </resources>
diff --git a/app/src/main/res/values-tl/strings.xml 
b/app/src/main/res/values-tl/strings.xml
index 25b99db0..92f605a1 100644
--- a/app/src/main/res/values-tl/strings.xml
+++ b/app/src/main/res/values-tl/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">Orbot</string>
   <string name="internal_web_url">http://orbot/</string>
@@ -19,7 +19,6 @@
   <string name="menu_settings">Settings</string>
   <string name="menu_log">Tala</string>
   <string name="menu_info">Tulong</string>
-  <string name="menu_apps">VPN</string>
   <string name="menu_start">Simulan</string>
   <string name="menu_stop">Ihinto</string>
   <string name="menu_about">Tungkol</string>
@@ -57,7 +56,6 @@
   <string name="btn_cancel">Kanselahin</string>
   <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">Ilang detalye sa Orbot</string>
-  <string name="wizard_details_msg">Ang Orbot ay isang open-source application 
na naglalaman ng Tor, LibEvent at Polipo. Ito ay nagbibigay ng local HTTP proxy 
(8118) at SOCKS proxy (9050) sa Tor network. Ang Orbot ay nagbibigay din ng 
kakayahan, sa mga rooted device, na ipadala ang lahat ng trapiko sa internet sa 
pamamagitan  ng Tor.</string>
   <string name="wizard_permissions_root">Napahintulotan na</string>
   <string name="wizard_permissions_stock">Pahintulot ng Orbot</string>
   <string name="wizard_premissions_msg_root">Mahusay! Natuklasan namin na 
mayroon pahintulot ang Orbot para sa root. Gagamitin namin ito ng 
mabuti.</string>
@@ -166,7 +164,6 @@
   <string name="bridges">Bridges</string>
   <string name="use_bridges">Gumamit ng Bridges</string>
   <string name="bridges_obfuscated">Obfuscated Bridges</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">I-enable 
ang kahaliling entrance nodes sa Tor Network</string>
   <string name="enable_if_configured_bridges_are_obfuscated_bridges">I-enable 
kung ang naisaayos na bridges ay obfuscated bridges</string>
   <string name="ip_address_and_port_of_bridges">IP address at port ng 
bridges</string>
   <string name="enter_bridge_addresses">Ilagay ang Bridge Addresses</string>
@@ -199,9 +196,6 @@
   <string name="tor_version">Tor: https://www.torproject.org</string>
   <string name="libevent_version">LibEvent v2.0.21: 
http://www.monkey.org/~provos/libevent/</string>
   <string name="polipo_version">Polipo v1.1.9: 
https://github.com/jech/polipo</string>
-  <string name="iptables_version">IPtables v1.4.21: 
http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v1.0.1q: 
http://www.openssl.org</string>
-  <string name="hidden_service_request">May app na gustong buksan ang 
nakatagong server port %S sa Tor network. Ito ay ligtas kung pinagkakatiwalaan 
ang app.</string>
   <string name="found_existing_tor_process"> nakakita ng umiiral na Tor 
process...</string>
   <string name="something_bad_happened">May nangyaring masama. Tingnan ang 
log</string>
   <string name="hidden_service_on">nakatagong serbisyo sa:</string>
@@ -233,7 +227,7 @@
   <string name="menu_verify_browser">Browser</string>
   <string name="menu_use_chatsecure">Gamitin ang ChatSecure</string>
   <string name="permission_manage_tor_label">Manage Tor</string>
-  <string name="menu_vpn">VPN</string>
+  <string name="menu_vpn">Apps</string>
   <string name="kbps">kbps</string>
   <string name="mbps">mbps</string>
   <string name="kb">KB</string>
@@ -241,9 +235,9 @@
   <string name="get_bridges_email">Email</string>
   <string name="get_bridges_web">Web</string>
   <string name="activate">Activate</string>
-  <string name="apps_mode">Apps VPN Mode</string>
   <string name="send_email">Send Email</string>
   <string name="install_orweb">I-install ang Orfox</string>
   <string name="standard_browser">Standard Browser</string>
-  <string name="vpn_default_world">Mundo</string>
+  <string name="save">I-save</string>
+  <string name="name">Name</string>
 </resources>
diff --git a/app/src/main/res/xml-fa/preferences.xml 
b/app/src/main/res/xml-fa/preferences.xml
new file mode 100644
index 00000000..ebdc3dc6
--- /dev/null
+++ b/app/src/main/res/xml-fa/preferences.xml
@@ -0,0 +1,221 @@
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android";>
+
+<PreferenceCategory android:title="@string/pref_general_group">
+<CheckBoxPreference 
+android:defaultValue="true" 
+android:key="pref_start_boot"
+android:title="@string/pref_start_boot_title"
+android:summary="@string/pref_start_boot_summary"
+android:enabled="true"/>
+
+<CheckBoxPreference
+android:defaultValue="true" 
+android:key="pref_persistent_notifications"
+android:summary="@string/pref_use_persistent_notifications"
+android:enabled="true" 
+android:title="@string/pref_use_persistent_notifications_title"/>
+
+<CheckBoxPreference
+android:defaultValue="true" 
+android:key="pref_expanded_notifications"
+android:summary="@string/pref_use_expanded_notifications"
+android:enabled="true" 
+android:title="@string/pref_use_expanded_notifications_title"/>
+
+<CheckBoxPreference
+android:defaultValue="true" 
+android:key="pref_allow_background_starts"
+android:summary="@string/pref_allow_background_starts_summary"
+android:title="@string/pref_allow_background_starts_title"/>
+
+ <ListPreference android:title="@string/set_locale_title"
+   android:key="pref_default_locale"
+   android:summary="@string/set_locale_summary"
+   android:defaultValue="fa">
+ </ListPreference>
+
+</PreferenceCategory>
+<PreferenceCategory android:title="@string/pref_node_configuration"
+ android:summary="@string/pref_node_configuration_summary">
+ 
+<EditTextPreference android:key="pref_entrance_nodes"
+android:title="@string/pref_entrance_node"
+android:summary="@string/pref_entrance_node_summary"
+android:dialogTitle="@string/pref_entrance_node_dialog"
+/>
+<EditTextPreference android:key="pref_exit_nodes"
+android:title="@string/exit_nodes"
+android:summary="@string/fingerprints_nicks_countries_and_addresses_for_the_last_hop"
+android:dialogTitle="@string/enter_exit_nodes"
+/>
+<EditTextPreference android:key="pref_exclude_nodes"
+android:title="@string/exclude_nodes"
+android:summary="@string/fingerprints_nicks_countries_and_addresses_to_exclude"
+android:dialogTitle="@string/enter_exclude_nodes"
+/>
+
+<CheckBoxPreference android:defaultValue="false" 
+android:title="@string/strict_nodes" android:key="pref_strict_nodes" 
+android:summary="@string/use_only_these_specified_nodes"/>
+
+</PreferenceCategory> 
+<PreferenceCategory android:title="@string/bridges">
+
+<CheckBoxPreference android:defaultValue="true"
+android:title="@string/use_bridges" android:key="pref_bridges_enabled" 
+android:summary="@string/enable_alternate_entrance_nodes_into_the_tor_network"/>
+
+<EditTextPreference android:key="pref_bridges_list"
+android:title="@string/bridges"
+android:summary="@string/ip_address_and_port_of_bridges"
+android:dialogTitle="@string/enter_bridge_addresses"
+android:defaultValue="meek"
+android:inputType="textMultiLine|textNoSuggestions"
+/>
+
+</PreferenceCategory>
+
+<PreferenceCategory android:title="@string/relays">
+<CheckBoxPreference android:key="pref_or"
+android:defaultValue="false"
+android:title="@string/relaying"
+android:summary="@string/enable_your_device_to_be_a_non_exit_relay"
+android:enabled="true"
+/>
+
+<EditTextPreference android:key="pref_or_port"
+android:defaultValue="9001"
+android:title="@string/relay_port"
+android:summary="@string/listening_port_for_your_tor_relay"
+android:dialogTitle="@string/enter_or_port"
+/>
+
+<EditTextPreference android:key="pref_or_nickname"
+android:defaultValue="OrbotRelay"
+android:title="@string/relay_nickname"
+android:summary="@string/the_nickname_for_your_tor_relay"
+android:dialogTitle="@string/enter_a_custom_relay_nickname"
+/>
+
+</PreferenceCategory>
+
+<PreferenceCategory android:title="ReachableAddresses">
+<CheckBoxPreference
+android:key="pref_reachable_addresses"
+android:defaultValue="false"
+android:title="@string/reachable_addresses"
+android:summary="@string/run_as_a_client_behind_a_firewall_with_restrictive_policies"
+android:enabled="true"></CheckBoxPreference>
+
+<EditTextPreference
+android:key="pref_reachable_addresses_ports"
+android:defaultValue="*:80,*:443"
+android:title="@string/reachable_ports"
+android:summary="@string/ports_reachable_behind_a_restrictive_firewall"
+android:dialogTitle="@string/enter_ports"
+/>
+</PreferenceCategory>
+
+<PreferenceCategory android:title="Isolation">
+<CheckBoxPreference
+android:key="pref_isolate_dest"
+android:defaultValue="false"
+android:title="@string/pref_isolate_dest"
+android:summary="@string/pref_isolate_dest_summary"
+android:enabled="true"></CheckBoxPreference>
+</PreferenceCategory>
+
+<PreferenceCategory android:title="ConnectionPadding">
+<CheckBoxPreference
+android:key="pref_connection_padding"
+android:defaultValue="false"
+android:title="@string/pref_connection_padding"
+android:summary="@string/pref_connection_padding_summary"
+android:enabled="true"></CheckBoxPreference>
+<CheckBoxPreference
+android:key="pref_reduced_connection_padding"
+android:defaultValue="true"
+android:title="@string/pref_reduced_connection_padding"
+android:summary="@string/pref_reduced_connection_padding_summary"
+android:enabled="true"></CheckBoxPreference>
+</PreferenceCategory>
+
+
+<PreferenceCategory android:title="@string/pref_proxy_title">
+<EditTextPreference android:key="pref_proxy_type"
+android:title="@string/pref_proxy_type_title"
+android:summary="@string/pref_proxy_type_summary"
+android:dialogTitle="@string/pref_proxy_type_dialog"
+/>
+<EditTextPreference android:key="pref_proxy_host"
+android:title="@string/pref_proxy_host_title"
+android:summary="@string/pref_proxy_host_summary"
+android:dialogTitle="@string/pref_proxy_host_dialog"
+/>
+<EditTextPreference android:key="pref_proxy_port"
+android:title="@string/pref_proxy_port_title"
+android:summary="@string/pref_proxy_port_summary"
+android:dialogTitle="@string/pref_proxy_port_dialog"
+/>
+
+<EditTextPreference android:key="pref_proxy_username"
+android:title="@string/pref_proxy_username_title"
+android:summary="@string/pref_proxy_username_summary"
+android:dialogTitle="@string/pref_proxy_username_dialog"
+/>
+<EditTextPreference android:key="pref_proxy_password"
+android:title="@string/pref_proxy_password_title"
+android:summary="@string/pref_proxy_password_summary"
+android:dialogTitle="@string/pref_proxy_password_dialog"
+/>
+</PreferenceCategory>
+
+<PreferenceCategory android:title="Debug">
+    
+    <EditTextPreference android:key="pref_socks"
+android:title="@string/pref_socks_title"
+android:summary="@string/pref_socks_summary"
+android:dialogTitle="@string/pref_socks_dialog"
+android:defaultValue="9050"
+/>
+    
+      <EditTextPreference android:key="pref_transport"
+android:title="@string/pref_transport_title"
+android:summary="@string/pref_transport_summary"
+android:dialogTitle="@string/pref_transport_dialog"
+android:defaultValue="9040"
+/>
+      
+        <EditTextPreference android:key="pref_dnsport"
+android:title="@string/pref_dnsport_title"
+android:summary="@string/pref_dnsport_summary"
+android:dialogTitle="@string/pref_dnsport_dialog"
+android:defaultValue="5400"
+/>
+    
+  <EditTextPreference android:key="pref_custom_torrc"
+android:title="@string/pref_torrc_title"
+android:summary="@string/pref_torrc_summary"
+android:dialogTitle="@string/pref_torrc_dialog"
+/>
+
+
+<CheckBoxPreference
+android:key="pref_enable_logging"
+android:defaultValue="false"
+android:title="Debug Log"
+android:summary="@string/enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_"
+android:enabled="true"
+/>
+
+
+
+<CheckBoxPreference
+android:defaultValue="true" 
+android:key="pref_disable_network"
+android:summary="@string/pref_disable_network_summary"
+android:enabled="true" 
+android:title="@string/pref_disable_network_title"/>
+
+</PreferenceCategory>
+</PreferenceScreen>
diff --git a/app/src/main/res/xml/preferences.xml 
b/app/src/main/res/xml/preferences.xml
index 3efc1c44..7b3e5de5 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -110,7 +110,7 @@ 
android:summary="@string/enable_alternate_entrance_nodes_into_the_tor_network"/>
 android:title="@string/bridges"
 android:summary="@string/ip_address_and_port_of_bridges"
 android:dialogTitle="@string/enter_bridge_addresses"
-android:defaultValue="@string/default_bridges"
+android:defaultValue=""
 android:inputType="textMultiLine|textNoSuggestions"
 />
 
@@ -238,7 +238,6 @@ android:defaultValue="5400"
 android:title="@string/pref_torrc_title"
 android:summary="@string/pref_torrc_summary"
 android:dialogTitle="@string/pref_torrc_dialog"
-android:defaultValue=""
 />
 
 
diff --git a/description/et.xlf b/description/et.xlf
index ef79bac4..7efe20d8 100644
--- a/description/et.xlf
+++ b/description/et.xlf
@@ -6,17 +6,21 @@
     <body>
       <trans-unit id="title" maxwidth="30" size-unit="char">
         <source>Orbot</source>
+        <target>Orbot</target>
         <note from="developer">This is limited by Google to 30 
characters</note>
       </trans-unit>
       <trans-unit id="shortdescription" maxwidth="80" size-unit="char">
         <source>Protect your privacy with this proxy with Tor</source>
+        <target>Kaitse oma privaatsust selle Tori puhverserveriga</target>
         <note from="developer">This is limited by Google to 80 
characters</note>
       </trans-unit>
       <trans-unit id="intro">
         <source>Orbot is a free proxy app that empowers other apps to use the 
internet more securely. Orbot uses Tor to encrypt your Internet traffic and 
then hides it by bouncing through a series of computers around the world. Tor 
is free software and an open network that helps you defend against a form of 
network surveillance that threatens personal freedom and privacy, confidential 
business activities and relationships, and state security known as traffic 
analysis.</source>
+        <target>Orbot on vabalt kasutatav proxy rakendus, mis võimaldab 
teistel rakendustel Interneti turvalisemat kasutust. Orbot krüpteerib ja 
peidab teie Internetiliikluse Tor abil paljude maailma arvutite vahel 
põrgatades. Tor on vaba tarkvara ja vaba võrgustik mis aitab teil kaitsta oma 
privaatsust, vabadust, konfidentsiaalset äritegevust, suhteid ja riiklikku 
julgeolekut arvutivõrgus toimuva liikluse analüüsi eest.</target>
       </trans-unit>
       <trans-unit id="intro2">
         <source>Orbot is the only app that creates a truly private internet 
connection. As the New York Times writes, “when a communication arrives from 
Tor, you can never know where or whom it’s from.” Tor won the 2012 
Electronic Frontier Foundation (EFF) Pioneer Award.</source>
+        <target>Orbot on ainus rakendus mis loob tõeliselt turvalise 
Internetiühenduse. Tsiteerides New York Times'it: &quot;kui andmevahetus 
saabub Tor kaudu, on selle allikat võimatu tuvastada.&quot; Tor võitis 2012 
aastal Electronic Frontier Foundation (EFF) Pioneer Award auhinna.</target>
       </trans-unit>
       <trans-unit id="intro2">
         <source>ACCEPT NO SUBSTITUTES: Orbot is the safest way to use the 
Internet on Android. Period. Orbot bounces your encrypted traffic several times 
through computers around the world, instead of connecting you directly like 
VPNs and proxies. This process takes a little longer, but the strongest privacy 
and identity protection available is worth the wait.</source>
@@ -37,29 +41,37 @@ IT’S OFFICIAL: This is the official version of the Tor 
onion routing service f
       </trans-unit>
       <trans-unit id="expertrootmode">
         <source>***Expert Root Mode***</source>
+        <target>***Eksperdi root režiim***</target>
       </trans-unit>
       <trans-unit id="universalmode">
         <source>UNIVERSAL MODE: Orbot can be configured to transparently proxy 
all of your Internet traffic through Tor. You can also choose which specific 
apps you want to use through Tor.</source>
+        <target>UNIVERSAALREŽIIM: Saate seadistada Orboti nii et kogu teie 
Internetiliiklus suunatakse läbipaistvalt läbi Tor võrgustiku, kuid saate 
valida ka millised kindlad rakendused peavad Tor'i kasutama.</target>
       </trans-unit>
       <trans-unit id="wespeakyourlanguage">
         <source>★ WE SPEAK YOUR LANGUAGE: Orbot is available for friends who 
speak:</source>
+        <target>★ Me räägime teie keelt: Orbot on saadaval sõpradele kes 
räägivad:</target>
       </trans-unit>
       <trans-unit id="languagelist" translate="no">
         <source>العربية, azərbaycanca, български, català, 
Čeština, dansk, Deutsch, Ελληνικά, English, español, eesti, euskara, 
فارسی, suomi, français, galego, hrvatski, magyar, עברית, íslenska, 
italiano, 日本語, 한국어, lietuvių, latviešu, Македонци, 
Bahasa Melayu, Nederlands, norsk, polski, português, Русский, 
slovenčina, slovenščina, српски, svenska, Türkçe, 
українська, Tagalog, Tiếng Việt, 中文(简体), 
中文(台灣)</source>
+        <target>العربية, azərbaycanca, български, català, 
Čeština, dansk, Deutsch, Ελληνικά, English, español, eesti, euskara, 
فارسی, suomi, français, galego, hrvatski, magyar, עברית, íslenska, 
italiano, 日本語, 한국어, lietuvių, latviešu, Македонци, 
Bahasa Melayu, Nederlands, norsk, polski, português, Русский, 
slovenčina, slovenščina, српски, svenska, Türkçe, 
українська, Tagalog, Tiếng Việt, 中文(简体), 
中文(台灣)</target>
         <note from="developer">Do not translate the names of the languages, 
leave them just like this.</note>
       </trans-unit>
       <trans-unit id="helptranslate">
         <source>Don’t see your language? Join us and help translate the 
app:</source>
+        <target>Ei näe enda keelt? Liitu meiega ja aita meil 
tõlkida:</target>
       </trans-unit>
       <trans-unit id="helptranslateurl" translate="no">
         <source>https://www.transifex.com/projects/p/orbot</source>
+        <target>https://www.transifex.com/projects/p/orbot</target>
         <note from="developer">Do not translate this.</note>
       </trans-unit>
       <trans-unit id="learnmore">
         <source>***Learn More***</source>
+        <target>***Vaata veel***</target>
       </trans-unit>
       <trans-unit id="aboutus">
         <source>★ ABOUT US: Guardian Project is a group of developers that 
make secure mobile apps and open-source code for a better tomorrow</source>
+        <target>MEIST: Guardian Project on arendajate rühm, kes kirjutab 
turvalisi moobiilirakendusi ja vabavaralist koodi helgema homse heaks.</target>
       </trans-unit>
       <trans-unit id="ourwebsite">
         <source>★ OUR WEBSITE: https://GuardianProject.info</source>
diff --git a/description/hy-rAM.xlf b/description/hy-rAM.xlf
index 174685e9..2d40da0f 100644
--- a/description/hy-rAM.xlf
+++ b/description/hy-rAM.xlf
@@ -6,6 +6,7 @@
     <body>
       <trans-unit id="title" maxwidth="30" size-unit="char">
         <source>Orbot</source>
+        <target>Orbot</target>
         <note from="developer">This is limited by Google to 30 
characters</note>
       </trans-unit>
       <trans-unit id="shortdescription" maxwidth="80" size-unit="char">
@@ -43,38 +44,48 @@ IT’S OFFICIAL: This is the official version of the Tor 
onion routing service f
       </trans-unit>
       <trans-unit id="wespeakyourlanguage">
         <source>★ WE SPEAK YOUR LANGUAGE: Orbot is available for friends who 
speak:</source>
+        <target>★ ՄԵՆՔ ԽՈՍՈՒՄ ԵՆՔ ՔՈ ԼԵԶՎՈՎ: Orbot֊ը 
հասանելի է մեր ընկերներին ովքեր խոսում 
Õ¥Õ¶:</target>
       </trans-unit>
       <trans-unit id="languagelist" translate="no">
         <source>العربية, azərbaycanca, български, català, 
Čeština, dansk, Deutsch, Ελληνικά, English, español, eesti, euskara, 
فارسی, suomi, français, galego, hrvatski, magyar, עברית, íslenska, 
italiano, 日本語, 한국어, lietuvių, latviešu, Македонци, 
Bahasa Melayu, Nederlands, norsk, polski, português, Русский, 
slovenčina, slovenščina, српски, svenska, Türkçe, 
українська, Tagalog, Tiếng Việt, 中文(简体), 
中文(台灣)</source>
+        <target>العربية, azərbaycanca, български, català, 
Čeština, dansk, Deutsch, Ελληνικά, English, español, eesti, euskara, 
فارسی, suomi, français, galego, hrvatski, magyar, עברית, íslenska, 
italiano, 日本語, 한국어, lietuvių, latviešu, Македонци, 
Bahasa Melayu, Nederlands, norsk, polski, português, Русский, 
slovenčina, slovenščina, српски, svenska, Türkçe, 
українська, Tagalog, Tiếng Việt, 中文(简体), 中文(台灣), 
հայերեն</target>
         <note from="developer">Do not translate the names of the languages, 
leave them just like this.</note>
       </trans-unit>
       <trans-unit id="helptranslate">
         <source>Don’t see your language? Join us and help translate the 
app:</source>
+        <target>Չէ՞ս տեսնում քո լեզուն։ Միացիր 
մեզ և օգնիր թարգմանել հավելվածը։</target>
       </trans-unit>
       <trans-unit id="helptranslateurl" translate="no">
         <source>https://www.transifex.com/projects/p/orbot</source>
+        <target>https://www.transifex.com/projects/p/orbot</target>
         <note from="developer">Do not translate this.</note>
       </trans-unit>
       <trans-unit id="learnmore">
         <source>***Learn More***</source>
+        <target>***Ô»Õ´Õ¡Õ¶Õ¡Õ¬ Õ¡Õ¾Õ¥Õ¬Õ«Õ¶***</target>
       </trans-unit>
       <trans-unit id="aboutus">
         <source>★ ABOUT US: Guardian Project is a group of developers that 
make secure mobile apps and open-source code for a better tomorrow</source>
       </trans-unit>
       <trans-unit id="ourwebsite">
         <source>★ OUR WEBSITE: https://GuardianProject.info</source>
+        <target>★ Մեր կայքը: https://GuardianProject.info</target>
       </trans-unit>
       <trans-unit id="abouttor">
         <source>★ ABOUT TOR: https://TorProject.org</source>
+        <target>★TOR֊ի ՄԱՍԻՆ: https://TorProject.org</target>
       </trans-unit>
       <trans-unit id="ontwitter">
         <source>★ ON TWITTER: https://twitter.com/guardianproject</source>
+        <target>★ TWITTER֊ում: 
https://twitter.com/guardianproject</target>
       </trans-unit>
       <trans-unit id="freesoftware">
         <source>★ FREE SOFTWARE: Orbot is free software. Take a look at our 
source code, or join the community to make it better:</source>
+        <target>★ ԱԶԱՏ ԾՐԱԳԻՐ։ Orbot֊ը ազատ ծրագիր 
է։ Նայիր կոդը կամ միացիր խմբին այն 
բարելավելու։</target>
       </trans-unit>
       <trans-unit id="gitrepo" translate="no">
         <source>https://gitweb.torproject.org/orbot.git</source>
+        <target>https://gitweb.torproject.org/orbot.git</target>
         <note from="developer">Do not translate this.</note>
       </trans-unit>
       <trans-unit id="messageus">



_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

Reply via email to