Merge branch 'develop' into release-0.5.2

2 files changed, 128 insertions, 30 deletions

diff --git a/app/src/main/res/values-no/strings-icsopenvpn.xml b/app/src/main/res/values-no/strings-icsopenvpn.xml
new file mode 100755
index 00000000..7a7dd124
--- /dev/null
+++ b/app/src/main/res/values-no/strings-icsopenvpn.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.net-->
+<!-- Generated by crowdin.net -->
+<resources>
+
+  <string name="address">Server adresse:</string>
+  <string name="port">Server port:</string>
+  <string name="location">Plassering</string>
+  <string name="select">velg</string>
+  <string name="cancel">Avbryt</string>
+  <string name="no_data">Ingen Data</string>
+  <string name="useLZO">LZO-komprimering</string>
+  <string name="client_no_certificate">Ingen sertifikat</string>
+  <string name="client_certificate_title">Klient sertifikat</string>
+  <string name="client_key_title">Klientsertifikat nøkkel</string>
+  <string name="client_pkcs12_title">PKCS12 fil</string>
+  <string name="ca_title">CA-sertifikat</string>
+  <string name="about">Om</string>
+  <string name="vpn_type">Type</string>
+  <string name="pkcs12pwquery">PKCS12 passord</string>
+  <string name="file_select">Velg&#8230;</string>
+  <string name="useTLSAuth">Bruke TLS-godkjenning</string>
+  <string name="tls_direction">TLS-retning</string>
+  <string name="ipv6_dialog_tile">Angi IPv6-adresse/nettmaske i CIDR format (f.eks 2000:dd::23/64)</string>
+  <string name="ipv4_dialog_title">Angi IPv6-adresse/nettmaske i CIDR format (f.eks 1.2.3.4/24)</string>
+  <string name="ipv4_address">IPv4-adresse</string>
+  <string name="ipv6_address">IPv6-adresse</string>
+  <string name="auth_username">Brukernavn</string>
+  <string name="auth_pwquery">Passord</string>
+  <string name="configure_the_vpn">Konfigurer VPN</string>
+  <string name="menu_add_profile">Legge til profil</string>
+  <string name="add_profile_name_prompt">Angi et navn som identifiserer den nye profilen</string>
+  <string name="profilename">Profilnavn</string>
+  <string name="no_error_found">Ingen feil funnet</string>
+  <string name="config_error_found">Feil i konfigurasjonen</string>
+  <string name="vpn_shortcut">OpenVPN snarvei</string>
+  <string name="vpn_launch_title">Koble til VPN</string>
+  <string name="random_host_prefix">Tilfeldig vert prefiks</string>
+  <string name="custom_config_title">Aktiver egendefinerte valg</string>
+  <string name="cancel_connection">Koble fra</string>
+  <string name="clear_log">Tøm logg</string>
+  <string name="title_cancel">Avbryt bekreftelse</string>
+  <string name="remove_vpn">Fjern VPN</string>
+  <string name="tls_auth_file">TLS-Auth-fil</string>
+  <string name="dns">DNS</string>
+  <string name="dns_override_summary">Bruk din egen DNS-server</string>
+  <string name="dns1_summary">DNS-Server som skal brukes.</string>
+  <string name="dns_server">DNS-server</string>
+  <string name="use_default_title">Bruk standard rute</string>
+  <string name="custom_routes_title">Egendefinert rute</string>
+  <string name="log_verbosity_level">Detaljnivå for Logging</string>
+  <string name="custom_options_title">Egendefinerte valg</string>
+  <string name="edit_vpn">Rediger VPN-innstillinger</string>
+  <string name="error">"Feil:"</string>
+  <string name="clear">Fjern</string>
+  <string name="version_info">%1$s %2$s</string>
+  <string name="send_logfile">Send loggfilen</string>
+  <string name="send">Send</string>
+  <string name="ics_openvpn_log_file">ICS OpenVPN loggfil</string>
+  <string name="tap_mode">Tap modus</string>
+  <string name="faq">FAQ</string>
+  <string name="copying_log_entries">Kopier loggoppføringer</string>
+  <string name="faq_shortcut">Snarvei til start</string>
+  <string name="encryption">Kryptering</string>
+  <string name="cipher_dialog_title">Angi krypteringsmetode</string>
+  <string name="settings_auth">Autentisering/kryptering</string>
+  <string name="file_explorer_tab">Filutforsker</string>
+  <string name="error_importing_file">Feil ved import av fil</string>
+  <string name="import_error_message">Kunne ikke importere filen fra filsystemet</string>
+  <string name="menu_import">Importer profil fra ovpn-fil</string>
+  <string name="menu_import_short">Importer</string>
+  <string name="import_content_resolve_error">Kan ikke lese profil for importering</string>
+  <string name="error_reading_config_file">Feil under lesing av config-filen</string>
+  <string name="add_profile">legg til profil</string>
+  <string name="import_could_not_open">Finner ikke filen %1$s nevnt i importert konfigurasjons fil</string>
+  <string name="importing_config">Importerer konfigurasjonsfilen fra kilde %1$s</string>
+  <string name="import_done">Ferdig med å lese konfigurasjons-filen.</string>
+  <string name="no_bind">Ingen lokale binding</string>
+  <string name="import_configuration_file">Importer konfigurasjonsfil</string>
+  <string name="faq_security_title">Sikkerhetsvurderinger</string>
+  <string name="import_vpn">Importer</string>
+  <string name="broken_image_cert_title">Feil ved visning av sertifikatvalg</string>
+  <string name="ipv4">IPv4</string>
+  <string name="ipv6">IPv6</string>
+  <string name="speed_waiting">Venter på tilstands melding&#8230;</string>
+  <string name="converted_profile">importert profil</string>
+  <string name="converted_profile_i">importert profilen %d</string>
+  <string name="broken_images">Ødelagte bilder</string>
+  <string name="pkcs12_file_encryption_key">PKCS12 Filkrypteringsnøkkel</string>
+  <string name="private_key_password">Privat nøkkel passord</string>
+  <string name="password">Passord</string>
+  <string name="file_icon">fil ikon</string>
+  <string name="tls_authentication">TLS-godkjenning</string>
+  <string name="generated_config">Generert konfigurasjon</string>
+  <string name="owner_fix">Fiks eierskap av /dev/tun</string>
+  <string name="edit_profile_title">Rediger \"%s\"</string>
+  <string name="building_configration">Lager konfigurasjon&#8230;</string>
+  <string name="netchange">Koble til på nytt ved nettverks endring</string>
+  <string name="netstatus">Nettverksstatus: %s</string>
+  <string name="select_file">Velg</string>
+  <string name="show_log_window">Vis logg-vindu</string>
+  <string name="mobile_info">Kjører på %1$s (%2$s) %3$s, Android API %4$d</string>
+  <string name="translationby">Norsk oversettelse av Jonny</string>
+  <string name="ipdns">IP og DNS</string>
+  <string name="basic">Grunnleggende</string>
+  <string name="routing">Ruting</string>
+  <string name="advanced">Avansert</string>
+  <string name="export_config_title">ICS Openvpn konfigurasjon</string>
+  <string name="faq_howto_title">Hurtigstart</string>
+  <string name="setting_loadtun_summary">Prøv å laste tun.ko kjernemodul før tilkobling. Krever at enheten er rootet.</string>
+  <string name="setting_loadtun">Last tun modul</string>
+  <string name="getproxy_error">Feil ved henting av proxy-innstillinger: %s</string>
+  <string name="using_proxy">Bruker proxy %1$s %2$d</string>
+  <string name="use_system_proxy">Bruk systemet proxy</string>
+  <string name="use_system_proxy_summary">Bruk global systemkonfigurasjon for HTTP/HTTPS proxy for å koble til.</string>
+  <string name="donatewithpaypal">Du kan &lt;a href=\"https://www.paypal.com/cgi-bin/webscr?hosted_button_id=R2M6ZP9AF25LS&amp;amp;cmd=_s-xclick\"&gt;donere med PayPal&lt;/a&gt; </string>
+  <string name="onbootrestart">Koble til på nytt ved restart</string>
+  <string name="ignore">Ignorer</string>
+  <string name="restart">Start på nytt</string>
+  <string name="configuration_changed">Konfigurasjon endret</string>
+  <string name="faq_duplicate_notification_title">Kopier varsler</string>
+  <string name="no_vpn_profiles_defined">Ingen VPN-profiler er definert.</string>
+  <string name="faq_routing_title">Ruting/grensesnitt-konfigurasjon</string>
+  <string name="persisttun_summary">Ikke gå tilbake til ingen VPN-tilkoblingen mens OpenVPN kobler til på nytt.</string>
+  <string name="openvpn_log">OpenVPN Logg</string>
+  <string name="import_config">Importer OpenVPN konfigurasjon</string>
+  <string name="battery_consumption_title">Batteriforbruk</string>
+</resources>
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index a363b2f9..500f5bcd 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -1,38 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="about">Om</string>
-  <string name="no_error_found">Ingen feil funnet</string>
-  <string name="config_error_found">Feil i konfigurasjonen</string>
-  <string name="vpn_launch_title">Koble til VPN</string>
-  <string name="cancel_connection">Koble fra</string>
-  <string name="clear_log">Tøm logg</string>
-  <string name="title_cancel">Avbryt bekreftelse</string>
-  <string name="edit_vpn">Rediger VPN-innstillinger</string>
-  <string name="error">"Feil:"</string>
-  <string name="clear">Fjern</string>
   <string name="info">info</string>
   <string name="show_connection_details">Vis Tilkoblingsdetaljer</string>
   <string name="dns_server_info">DNS-server: %s</string>
   <string name="dns_domain_info">DNS-domene: %s</string>
   <string name="routes_info">Ruter: %s</string>
-  <string name="version_info">%1$s %2$s</string>
-  <string name="send_logfile">Send loggfilen</string>
-  <string name="send">Send</string>
-  <string name="bitmask_openvpn_log_file">LEAP Android loggfil</string>
-  <string name="speed_waiting">Venter på tilstands melding...</string>
-  <string name="converted_profile">importert profil</string>
-  <string name="converted_profile_i">importert profilen %d</string>
-  <string name="error_empty_username">Brukernavnet kan ikke være tomt.</string>
-  <string name="pkcs12_file_encryption_key">PKCS12 Filkrypteringsnøkkel</string>
-  <string name="private_key_password">Privat nøkkel passord</string>
-  <string name="password">Passord</string>
-  <string name="building_configration">Lager konfigurasjon...</string>
-  <string name="netstatus">Nettverksstatus: %s</string>
-  <string name="mobile_info">Kjører på %1$s (%2$s) %3$s, Android API %4$d</string>
-  <string name="translationby">Norsk oversettelse av Jonny</string>
-  <string name="getproxy_error">Feil ved henting av proxy-innstillinger: %s</string>
-  <string name="using_proxy">Bruker proxy %1$s %2$d</string>
-  <string name="ignore">Ignorer</string>
-  <string name="restart">Start på nytt</string>
-  <string name="configuration_changed">Konfigurasjon endret</string>
 </resources>