From 413e7689990867ae727bc5624787acf7aa789796 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Wed, 17 Dec 2014 17:05:35 +0100 Subject: Update/clarify copyright. --HG-- branch : public extra : source : a453e026590faae1a1842b98d367654fbde63fcb --- .idea/copyright/ics_openvpn_gpl.xml | 4 ++-- doc/LICENSE.txt | 23 ++++++++++++++++++++++ main/src/main/AndroidManifest.xml | 2 +- main/src/main/assets/full_licenses.html | 9 +++++++-- .../main/java/de/blinkt/openvpn/FileProvider.java | 2 +- .../src/main/java/de/blinkt/openvpn/LaunchVPN.java | 2 +- .../java/de/blinkt/openvpn/OnBootReceiver.java | 2 +- .../main/java/de/blinkt/openvpn/VpnProfile.java | 2 +- .../blinkt/openvpn/activities/ConfigConverter.java | 2 +- .../blinkt/openvpn/activities/CreateShortcuts.java | 2 +- .../blinkt/openvpn/activities/DisconnectVPN.java | 2 +- .../de/blinkt/openvpn/activities/FileSelect.java | 2 +- .../de/blinkt/openvpn/activities/LogWindow.java | 2 +- .../de/blinkt/openvpn/activities/MainActivity.java | 2 +- .../blinkt/openvpn/activities/VPNPreferences.java | 2 +- .../java/de/blinkt/openvpn/api/APIVpnProfile.java | 2 +- .../de/blinkt/openvpn/api/ExternalAppDatabase.java | 2 +- .../blinkt/openvpn/api/ExternalOpenVPNService.java | 2 +- .../openvpn/api/GrantPermissionsActivity.java | 2 +- .../openvpn/api/SecurityRemoteException.java | 2 +- .../main/java/de/blinkt/openvpn/core/CIDRIP.java | 2 +- .../java/de/blinkt/openvpn/core/ConfigParser.java | 2 +- .../blinkt/openvpn/core/DeviceStateReceiver.java | 2 +- .../blinkt/openvpn/core/ICSOpenVPNApplication.java | 2 +- .../java/de/blinkt/openvpn/core/NativeUtils.java | 2 +- .../java/de/blinkt/openvpn/core/NetworkSpace.java | 2 +- .../de/blinkt/openvpn/core/OpenVPNManagement.java | 2 +- .../de/blinkt/openvpn/core/OpenVPNService.java | 2 +- .../java/de/blinkt/openvpn/core/OpenVPNThread.java | 2 +- .../openvpn/core/OpenVpnManagementThread.java | 2 +- .../java/de/blinkt/openvpn/core/PRNGFixes.java | 2 +- .../de/blinkt/openvpn/core/ProfileManager.java | 2 +- .../de/blinkt/openvpn/core/ProxyDetection.java | 2 +- .../de/blinkt/openvpn/core/VPNLaunchHelper.java | 2 +- .../java/de/blinkt/openvpn/core/VpnStatus.java | 2 +- .../java/de/blinkt/openvpn/core/X509Utils.java | 2 +- .../de/blinkt/openvpn/fragments/AboutFragment.java | 2 +- .../de/blinkt/openvpn/fragments/FaqFragment.java | 2 +- .../blinkt/openvpn/fragments/FaqViewAdapter.java | 2 +- .../openvpn/fragments/FileSelectionFragment.java | 2 +- .../blinkt/openvpn/fragments/GeneralSettings.java | 2 +- .../de/blinkt/openvpn/fragments/InlineFileTab.java | 2 +- .../de/blinkt/openvpn/fragments/LogFragment.java | 2 +- .../fragments/OpenVpnPreferencesFragment.java | 2 +- .../blinkt/openvpn/fragments/SendDumpFragment.java | 2 +- .../openvpn/fragments/Settings_Authentication.java | 2 +- .../blinkt/openvpn/fragments/Settings_Basic.java | 2 +- .../de/blinkt/openvpn/fragments/Settings_IP.java | 2 +- .../blinkt/openvpn/fragments/Settings_Obscure.java | 2 +- .../blinkt/openvpn/fragments/Settings_Routing.java | 2 +- .../openvpn/fragments/ShowConfigFragment.java | 2 +- .../java/de/blinkt/openvpn/fragments/Utils.java | 2 +- .../blinkt/openvpn/fragments/VPNProfileList.java | 2 +- .../de/blinkt/openvpn/views/FileSelectLayout.java | 2 +- .../blinkt/openvpn/views/RemoteCNPreference.java | 2 +- .../java/de/blinkt/openvpn/views/SeekBarTicks.java | 2 +- .../main/res/layout-sw600dp-port/log_fragment.xml | 2 +- main/src/main/res/layout-sw600dp/log_fragment.xml | 2 +- main/src/main/res/layout/about.xml | 2 +- main/src/main/res/layout/basic_settings.xml | 2 +- main/src/main/res/layout/config_converter.xml | 2 +- main/src/main/res/layout/faq.xml | 2 +- main/src/main/res/layout/faqcard.xml | 2 +- main/src/main/res/layout/file_dialog.xml | 2 +- main/src/main/res/layout/file_dialog_inline.xml | 2 +- main/src/main/res/layout/file_dialog_main.xml | 2 +- main/src/main/res/layout/file_dialog_row.xml | 2 +- main/src/main/res/layout/fragment_senddump.xml | 2 +- main/src/main/res/layout/log_fragment.xml | 2 +- main/src/main/res/layout/log_silders.xml | 2 +- main/src/main/res/layout/log_window.xml | 2 +- main/src/main/res/layout/tlsremote.xml | 2 +- main/src/main/res/layout/userpass.xml | 2 +- main/src/main/res/layout/viewconfig.xml | 2 +- main/src/main/res/layout/vpn_profile_list.xml | 2 +- main/src/main/res/layout/vpnstatus.xml | 2 +- main/src/main/res/menu/configmenu.xml | 2 +- main/src/main/res/menu/import_menu.xml | 2 +- main/src/main/res/menu/logmenu.xml | 2 +- main/src/main/res/menu/vpnpreferences_menu.xml | 2 +- main/src/main/res/values-ca/arrays.xml | 5 +++++ main/src/main/res/values-ca/strings.xml | 5 +++-- main/src/main/res/values-cs/arrays.xml | 5 +++++ main/src/main/res/values-cs/strings.xml | 5 +++-- main/src/main/res/values-de/arrays.xml | 5 +++++ main/src/main/res/values-de/strings.xml | 5 +++-- main/src/main/res/values-es/arrays.xml | 5 +++++ main/src/main/res/values-es/strings.xml | 5 +++-- main/src/main/res/values-et/arrays.xml | 5 +++++ main/src/main/res/values-et/strings.xml | 5 +++-- main/src/main/res/values-fr/arrays.xml | 5 +++++ main/src/main/res/values-fr/strings.xml | 5 +++-- main/src/main/res/values-hu/arrays.xml | 5 +++++ main/src/main/res/values-hu/strings.xml | 5 +++-- main/src/main/res/values-in/arrays.xml | 5 +++++ main/src/main/res/values-in/strings.xml | 5 +++-- main/src/main/res/values-it/arrays.xml | 5 +++++ main/src/main/res/values-it/strings.xml | 5 +++-- main/src/main/res/values-ja/arrays.xml | 5 +++++ main/src/main/res/values-ja/strings.xml | 5 +++-- main/src/main/res/values-ko/arrays.xml | 5 +++++ main/src/main/res/values-ko/strings.xml | 5 +++-- main/src/main/res/values-nl/arrays.xml | 5 +++++ main/src/main/res/values-nl/strings.xml | 5 +++-- main/src/main/res/values-no/arrays.xml | 5 +++++ main/src/main/res/values-no/strings.xml | 5 +++-- main/src/main/res/values-pl/arrays.xml | 5 +++++ main/src/main/res/values-pl/strings.xml | 5 +++-- main/src/main/res/values-pt/arrays.xml | 5 +++++ main/src/main/res/values-pt/strings.xml | 5 +++-- main/src/main/res/values-ro/arrays.xml | 5 +++++ main/src/main/res/values-ro/strings.xml | 5 +++-- main/src/main/res/values-ru/arrays.xml | 5 +++++ main/src/main/res/values-ru/strings.xml | 5 +++-- main/src/main/res/values-sv/arrays.xml | 5 +++++ main/src/main/res/values-sv/strings.xml | 5 +++-- main/src/main/res/values-sw600dp/dimens.xml | 5 +++++ main/src/main/res/values-sw600dp/styles.xml | 5 +++++ main/src/main/res/values-tr/arrays.xml | 5 +++++ main/src/main/res/values-tr/strings.xml | 5 +++-- main/src/main/res/values-uk/arrays.xml | 5 +++++ main/src/main/res/values-uk/strings.xml | 5 +++-- main/src/main/res/values-v21/colours.xml | 9 +++++++++ main/src/main/res/values-v21/refs.xml | 2 +- main/src/main/res/values-v21/styles.xml | 2 +- main/src/main/res/values-zh-rCN/arrays.xml | 5 +++++ main/src/main/res/values-zh-rCN/strings.xml | 5 +++-- main/src/main/res/values-zh-rTW/arrays.xml | 5 +++++ main/src/main/res/values-zh-rTW/strings.xml | 5 +++-- main/src/main/res/values/arrays.xml | 2 +- main/src/main/res/values/attrs.xml | 2 +- main/src/main/res/values/colours.xml | 2 +- main/src/main/res/values/dimens.xml | 2 +- main/src/main/res/values/refs.xml | 2 +- main/src/main/res/values/styles.xml | 2 +- main/src/main/res/values/untranslatable.xml | 2 +- main/src/main/res/xml/general_settings.xml | 2 +- main/src/main/res/xml/vpn_authentification.xml | 2 +- main/src/main/res/xml/vpn_ipsettings.xml | 2 +- main/src/main/res/xml/vpn_obscure.xml | 2 +- main/src/main/res/xml/vpn_routing.xml | 2 +- 141 files changed, 318 insertions(+), 139 deletions(-) create mode 100644 main/src/main/res/values-v21/colours.xml diff --git a/.idea/copyright/ics_openvpn_gpl.xml b/.idea/copyright/ics_openvpn_gpl.xml index fba81870..fb4d0809 100644 --- a/.idea/copyright/ics_openvpn_gpl.xml +++ b/.idea/copyright/ics_openvpn_gpl.xml @@ -1,8 +1,8 @@ - diff --git a/doc/LICENSE.txt b/doc/LICENSE.txt index f023ce64..c87fb7a4 100644 --- a/doc/LICENSE.txt +++ b/doc/LICENSE.txt @@ -5,8 +5,31 @@ The source code needed to control OpenVPN for Android from another app (the remo Copyright (c) 2012-2014, Arne Schwabe All rights reserved. + +The name ics-openvpn and OpenVPN for Android refer to the same program. +OpenVPN for Android is distributed under the GPL license version 2 (see Below) +with the following clarification/additional terms of what constitues "deriviate work": + +Using/including any part of ics-openvpn, especially using/including any part of the +de.blinkt.openvpn class hierarchy, creates derivative work of ics-openvpn. +The normal definitions of derivative additionally apply. + If you need a non GPLv2 license of the source please contact me. +Special exception for linking ics-openvpn with OpenSSL: + +In addition, as a special exception, Arne Schwabe gives +permission to link the code of this program with the OpenSSL +library (or with modified versions of OpenSSL that use the same +license as OpenSSL), and distribute linked combinations including +the two. You must obey the GNU General Public License in all +respects for all of the code used other than OpenSSL. If you modify +this file, you may extend this exception to your version of the +file, but you are not obligated to do so. If you do not wish to +do so, delete this exception statement from your version + + + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 diff --git a/main/src/main/AndroidManifest.xml b/main/src/main/AndroidManifest.xml index 3b0908d5..ff99f22b 100644 --- a/main/src/main/AndroidManifest.xml +++ b/main/src/main/AndroidManifest.xml @@ -2,7 +2,7 @@

OpenVPN for Android

The name ics-openvpn and OpenVPN for Android refer to the same program. OpenVPN for Android is distributed under the GPL license version 2 (see Below) -

+with the following clarification/additional terms of what constitues "deriviate work":

+ +

Using/including any part of ics-openvpn, especially using/including any part of the +de.blinkt.openvpn class hierarchy, creates derivative work of ics-openvpn. +Aadditionally, the normal definitions of derivative work apply.

+

Special exception for linking ics-openvpn with OpenSSL:

In addition, as a special exception, Arne Schwabe gives diff --git a/main/src/main/java/de/blinkt/openvpn/FileProvider.java b/main/src/main/java/de/blinkt/openvpn/FileProvider.java index 41ef805f..70e09302 100644 --- a/main/src/main/java/de/blinkt/openvpn/FileProvider.java +++ b/main/src/main/java/de/blinkt/openvpn/FileProvider.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn; diff --git a/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java b/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java index a0763337..40e11eb6 100644 --- a/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java +++ b/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn; diff --git a/main/src/main/java/de/blinkt/openvpn/OnBootReceiver.java b/main/src/main/java/de/blinkt/openvpn/OnBootReceiver.java index a9c458db..bc8385a2 100644 --- a/main/src/main/java/de/blinkt/openvpn/OnBootReceiver.java +++ b/main/src/main/java/de/blinkt/openvpn/OnBootReceiver.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn; diff --git a/main/src/main/java/de/blinkt/openvpn/VpnProfile.java b/main/src/main/java/de/blinkt/openvpn/VpnProfile.java index 6a3f6312..6f21a847 100644 --- a/main/src/main/java/de/blinkt/openvpn/VpnProfile.java +++ b/main/src/main/java/de/blinkt/openvpn/VpnProfile.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn; diff --git a/main/src/main/java/de/blinkt/openvpn/activities/ConfigConverter.java b/main/src/main/java/de/blinkt/openvpn/activities/ConfigConverter.java index bf558221..e292e382 100644 --- a/main/src/main/java/de/blinkt/openvpn/activities/ConfigConverter.java +++ b/main/src/main/java/de/blinkt/openvpn/activities/ConfigConverter.java @@ -1,7 +1,7 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.activities; diff --git a/main/src/main/java/de/blinkt/openvpn/activities/CreateShortcuts.java b/main/src/main/java/de/blinkt/openvpn/activities/CreateShortcuts.java index fc475a4a..24d3e68f 100644 --- a/main/src/main/java/de/blinkt/openvpn/activities/CreateShortcuts.java +++ b/main/src/main/java/de/blinkt/openvpn/activities/CreateShortcuts.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.activities; diff --git a/main/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java b/main/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java index 905180e8..b9668b29 100644 --- a/main/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java +++ b/main/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.activities; diff --git a/main/src/main/java/de/blinkt/openvpn/activities/FileSelect.java b/main/src/main/java/de/blinkt/openvpn/activities/FileSelect.java index 139d2e85..6f779e20 100644 --- a/main/src/main/java/de/blinkt/openvpn/activities/FileSelect.java +++ b/main/src/main/java/de/blinkt/openvpn/activities/FileSelect.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.activities; diff --git a/main/src/main/java/de/blinkt/openvpn/activities/LogWindow.java b/main/src/main/java/de/blinkt/openvpn/activities/LogWindow.java index dc0e96b8..579f9dde 100644 --- a/main/src/main/java/de/blinkt/openvpn/activities/LogWindow.java +++ b/main/src/main/java/de/blinkt/openvpn/activities/LogWindow.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.activities; diff --git a/main/src/main/java/de/blinkt/openvpn/activities/MainActivity.java b/main/src/main/java/de/blinkt/openvpn/activities/MainActivity.java index 1d6d3c8f..1124fe47 100644 --- a/main/src/main/java/de/blinkt/openvpn/activities/MainActivity.java +++ b/main/src/main/java/de/blinkt/openvpn/activities/MainActivity.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.activities; diff --git a/main/src/main/java/de/blinkt/openvpn/activities/VPNPreferences.java b/main/src/main/java/de/blinkt/openvpn/activities/VPNPreferences.java index 8026b10e..1f022545 100644 --- a/main/src/main/java/de/blinkt/openvpn/activities/VPNPreferences.java +++ b/main/src/main/java/de/blinkt/openvpn/activities/VPNPreferences.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.activities; diff --git a/main/src/main/java/de/blinkt/openvpn/api/APIVpnProfile.java b/main/src/main/java/de/blinkt/openvpn/api/APIVpnProfile.java index ce7b0cfc..7637f57f 100644 --- a/main/src/main/java/de/blinkt/openvpn/api/APIVpnProfile.java +++ b/main/src/main/java/de/blinkt/openvpn/api/APIVpnProfile.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.api; diff --git a/main/src/main/java/de/blinkt/openvpn/api/ExternalAppDatabase.java b/main/src/main/java/de/blinkt/openvpn/api/ExternalAppDatabase.java index 6af752d7..580d8b0b 100644 --- a/main/src/main/java/de/blinkt/openvpn/api/ExternalAppDatabase.java +++ b/main/src/main/java/de/blinkt/openvpn/api/ExternalAppDatabase.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.api; diff --git a/main/src/main/java/de/blinkt/openvpn/api/ExternalOpenVPNService.java b/main/src/main/java/de/blinkt/openvpn/api/ExternalOpenVPNService.java index 06b116fe..a3974f54 100644 --- a/main/src/main/java/de/blinkt/openvpn/api/ExternalOpenVPNService.java +++ b/main/src/main/java/de/blinkt/openvpn/api/ExternalOpenVPNService.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.api; diff --git a/main/src/main/java/de/blinkt/openvpn/api/GrantPermissionsActivity.java b/main/src/main/java/de/blinkt/openvpn/api/GrantPermissionsActivity.java index 74dae3bb..ce4e598d 100644 --- a/main/src/main/java/de/blinkt/openvpn/api/GrantPermissionsActivity.java +++ b/main/src/main/java/de/blinkt/openvpn/api/GrantPermissionsActivity.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.api; diff --git a/main/src/main/java/de/blinkt/openvpn/api/SecurityRemoteException.java b/main/src/main/java/de/blinkt/openvpn/api/SecurityRemoteException.java index e3e74f0d..96e46dc3 100644 --- a/main/src/main/java/de/blinkt/openvpn/api/SecurityRemoteException.java +++ b/main/src/main/java/de/blinkt/openvpn/api/SecurityRemoteException.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.api; diff --git a/main/src/main/java/de/blinkt/openvpn/core/CIDRIP.java b/main/src/main/java/de/blinkt/openvpn/core/CIDRIP.java index ac9a8ccb..e525abd5 100644 --- a/main/src/main/java/de/blinkt/openvpn/core/CIDRIP.java +++ b/main/src/main/java/de/blinkt/openvpn/core/CIDRIP.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.core; diff --git a/main/src/main/java/de/blinkt/openvpn/core/ConfigParser.java b/main/src/main/java/de/blinkt/openvpn/core/ConfigParser.java index 0d8230b7..9e99ba55 100644 --- a/main/src/main/java/de/blinkt/openvpn/core/ConfigParser.java +++ b/main/src/main/java/de/blinkt/openvpn/core/ConfigParser.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.core; diff --git a/main/src/main/java/de/blinkt/openvpn/core/DeviceStateReceiver.java b/main/src/main/java/de/blinkt/openvpn/core/DeviceStateReceiver.java index e89b8349..c2341aae 100644 --- a/main/src/main/java/de/blinkt/openvpn/core/DeviceStateReceiver.java +++ b/main/src/main/java/de/blinkt/openvpn/core/DeviceStateReceiver.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.core; diff --git a/main/src/main/java/de/blinkt/openvpn/core/ICSOpenVPNApplication.java b/main/src/main/java/de/blinkt/openvpn/core/ICSOpenVPNApplication.java index 1c92bf5e..89a98241 100644 --- a/main/src/main/java/de/blinkt/openvpn/core/ICSOpenVPNApplication.java +++ b/main/src/main/java/de/blinkt/openvpn/core/ICSOpenVPNApplication.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.core; diff --git a/main/src/main/java/de/blinkt/openvpn/core/NativeUtils.java b/main/src/main/java/de/blinkt/openvpn/core/NativeUtils.java index 6d7ffdf2..66ae908e 100644 --- a/main/src/main/java/de/blinkt/openvpn/core/NativeUtils.java +++ b/main/src/main/java/de/blinkt/openvpn/core/NativeUtils.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.core; diff --git a/main/src/main/java/de/blinkt/openvpn/core/NetworkSpace.java b/main/src/main/java/de/blinkt/openvpn/core/NetworkSpace.java index edd21ed2..fd3dee92 100644 --- a/main/src/main/java/de/blinkt/openvpn/core/NetworkSpace.java +++ b/main/src/main/java/de/blinkt/openvpn/core/NetworkSpace.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.core; diff --git a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNManagement.java b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNManagement.java index e90c16d1..1f28c77d 100644 --- a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNManagement.java +++ b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNManagement.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.core; diff --git a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java index abc40aa7..29771168 100644 --- a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java +++ b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.core; diff --git a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java index 58c995a8..890f3408 100644 --- a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java +++ b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.core; diff --git a/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java b/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java index bcbf9dc2..ddc134b5 100644 --- a/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java +++ b/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.core; diff --git a/main/src/main/java/de/blinkt/openvpn/core/PRNGFixes.java b/main/src/main/java/de/blinkt/openvpn/core/PRNGFixes.java index bca0a4ab..a788426a 100644 --- a/main/src/main/java/de/blinkt/openvpn/core/PRNGFixes.java +++ b/main/src/main/java/de/blinkt/openvpn/core/PRNGFixes.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.core;/* diff --git a/main/src/main/java/de/blinkt/openvpn/core/ProfileManager.java b/main/src/main/java/de/blinkt/openvpn/core/ProfileManager.java index 2a26152e..1ebc0a57 100644 --- a/main/src/main/java/de/blinkt/openvpn/core/ProfileManager.java +++ b/main/src/main/java/de/blinkt/openvpn/core/ProfileManager.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.core; diff --git a/main/src/main/java/de/blinkt/openvpn/core/ProxyDetection.java b/main/src/main/java/de/blinkt/openvpn/core/ProxyDetection.java index f6dc61e6..ffebdb50 100644 --- a/main/src/main/java/de/blinkt/openvpn/core/ProxyDetection.java +++ b/main/src/main/java/de/blinkt/openvpn/core/ProxyDetection.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.core; diff --git a/main/src/main/java/de/blinkt/openvpn/core/VPNLaunchHelper.java b/main/src/main/java/de/blinkt/openvpn/core/VPNLaunchHelper.java index 8b0b951f..d250ea01 100644 --- a/main/src/main/java/de/blinkt/openvpn/core/VPNLaunchHelper.java +++ b/main/src/main/java/de/blinkt/openvpn/core/VPNLaunchHelper.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.core; diff --git a/main/src/main/java/de/blinkt/openvpn/core/VpnStatus.java b/main/src/main/java/de/blinkt/openvpn/core/VpnStatus.java index c3aea78a..8bf3a443 100644 --- a/main/src/main/java/de/blinkt/openvpn/core/VpnStatus.java +++ b/main/src/main/java/de/blinkt/openvpn/core/VpnStatus.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.core; diff --git a/main/src/main/java/de/blinkt/openvpn/core/X509Utils.java b/main/src/main/java/de/blinkt/openvpn/core/X509Utils.java index a8f8d39e..671be297 100644 --- a/main/src/main/java/de/blinkt/openvpn/core/X509Utils.java +++ b/main/src/main/java/de/blinkt/openvpn/core/X509Utils.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.core; diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/AboutFragment.java b/main/src/main/java/de/blinkt/openvpn/fragments/AboutFragment.java index 95d6287a..f233540b 100644 --- a/main/src/main/java/de/blinkt/openvpn/fragments/AboutFragment.java +++ b/main/src/main/java/de/blinkt/openvpn/fragments/AboutFragment.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.fragments; diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/FaqFragment.java b/main/src/main/java/de/blinkt/openvpn/fragments/FaqFragment.java index 541aa42f..f8e80a4c 100644 --- a/main/src/main/java/de/blinkt/openvpn/fragments/FaqFragment.java +++ b/main/src/main/java/de/blinkt/openvpn/fragments/FaqFragment.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.fragments; diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/FaqViewAdapter.java b/main/src/main/java/de/blinkt/openvpn/fragments/FaqViewAdapter.java index f667d798..28c12eae 100644 --- a/main/src/main/java/de/blinkt/openvpn/fragments/FaqViewAdapter.java +++ b/main/src/main/java/de/blinkt/openvpn/fragments/FaqViewAdapter.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.fragments; diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/FileSelectionFragment.java b/main/src/main/java/de/blinkt/openvpn/fragments/FileSelectionFragment.java index 2a356a18..fe6f66b0 100644 --- a/main/src/main/java/de/blinkt/openvpn/fragments/FileSelectionFragment.java +++ b/main/src/main/java/de/blinkt/openvpn/fragments/FileSelectionFragment.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.fragments; diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/GeneralSettings.java b/main/src/main/java/de/blinkt/openvpn/fragments/GeneralSettings.java index 6bde7135..47988847 100644 --- a/main/src/main/java/de/blinkt/openvpn/fragments/GeneralSettings.java +++ b/main/src/main/java/de/blinkt/openvpn/fragments/GeneralSettings.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.fragments; diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/InlineFileTab.java b/main/src/main/java/de/blinkt/openvpn/fragments/InlineFileTab.java index 17c355bf..27fa2a83 100644 --- a/main/src/main/java/de/blinkt/openvpn/fragments/InlineFileTab.java +++ b/main/src/main/java/de/blinkt/openvpn/fragments/InlineFileTab.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.fragments; diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java b/main/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java index d9e8ed50..3465cd4b 100644 --- a/main/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java +++ b/main/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.fragments; diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/OpenVpnPreferencesFragment.java b/main/src/main/java/de/blinkt/openvpn/fragments/OpenVpnPreferencesFragment.java index d34c381d..d0539bf9 100644 --- a/main/src/main/java/de/blinkt/openvpn/fragments/OpenVpnPreferencesFragment.java +++ b/main/src/main/java/de/blinkt/openvpn/fragments/OpenVpnPreferencesFragment.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.fragments; diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/SendDumpFragment.java b/main/src/main/java/de/blinkt/openvpn/fragments/SendDumpFragment.java index 83c483fc..3777e55c 100644 --- a/main/src/main/java/de/blinkt/openvpn/fragments/SendDumpFragment.java +++ b/main/src/main/java/de/blinkt/openvpn/fragments/SendDumpFragment.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.fragments; diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Authentication.java b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Authentication.java index 4d2bd508..a286a688 100644 --- a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Authentication.java +++ b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Authentication.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.fragments; diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Basic.java b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Basic.java index 26efcc6b..52e8d784 100644 --- a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Basic.java +++ b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Basic.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.fragments; diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_IP.java b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_IP.java index bb48c5b5..504c9984 100644 --- a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_IP.java +++ b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_IP.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.fragments; diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Obscure.java b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Obscure.java index 7a1730fd..8c3db416 100644 --- a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Obscure.java +++ b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Obscure.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.fragments; diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Routing.java b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Routing.java index 36b14ee1..b677a01c 100644 --- a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Routing.java +++ b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Routing.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.fragments; diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/ShowConfigFragment.java b/main/src/main/java/de/blinkt/openvpn/fragments/ShowConfigFragment.java index 00b4a363..11a4842c 100644 --- a/main/src/main/java/de/blinkt/openvpn/fragments/ShowConfigFragment.java +++ b/main/src/main/java/de/blinkt/openvpn/fragments/ShowConfigFragment.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.fragments; diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/Utils.java b/main/src/main/java/de/blinkt/openvpn/fragments/Utils.java index c1ae41fc..2408956c 100644 --- a/main/src/main/java/de/blinkt/openvpn/fragments/Utils.java +++ b/main/src/main/java/de/blinkt/openvpn/fragments/Utils.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.fragments; diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/VPNProfileList.java b/main/src/main/java/de/blinkt/openvpn/fragments/VPNProfileList.java index c6ea08e5..e4911a41 100644 --- a/main/src/main/java/de/blinkt/openvpn/fragments/VPNProfileList.java +++ b/main/src/main/java/de/blinkt/openvpn/fragments/VPNProfileList.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.fragments; diff --git a/main/src/main/java/de/blinkt/openvpn/views/FileSelectLayout.java b/main/src/main/java/de/blinkt/openvpn/views/FileSelectLayout.java index 31e2216e..60cbff2b 100644 --- a/main/src/main/java/de/blinkt/openvpn/views/FileSelectLayout.java +++ b/main/src/main/java/de/blinkt/openvpn/views/FileSelectLayout.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.views; diff --git a/main/src/main/java/de/blinkt/openvpn/views/RemoteCNPreference.java b/main/src/main/java/de/blinkt/openvpn/views/RemoteCNPreference.java index cc01455c..7c0b99c9 100644 --- a/main/src/main/java/de/blinkt/openvpn/views/RemoteCNPreference.java +++ b/main/src/main/java/de/blinkt/openvpn/views/RemoteCNPreference.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.views; diff --git a/main/src/main/java/de/blinkt/openvpn/views/SeekBarTicks.java b/main/src/main/java/de/blinkt/openvpn/views/SeekBarTicks.java index e25c2859..82378b00 100644 --- a/main/src/main/java/de/blinkt/openvpn/views/SeekBarTicks.java +++ b/main/src/main/java/de/blinkt/openvpn/views/SeekBarTicks.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.views; diff --git a/main/src/main/res/layout-sw600dp-port/log_fragment.xml b/main/src/main/res/layout-sw600dp-port/log_fragment.xml index 2f5c774d..33a895eb 100644 --- a/main/src/main/res/layout-sw600dp-port/log_fragment.xml +++ b/main/src/main/res/layout-sw600dp-port/log_fragment.xml @@ -1,7 +1,7 @@

diff --git a/main/src/main/res/menu/import_menu.xml b/main/src/main/res/menu/import_menu.xml index dab5422e..2973e460 100644 --- a/main/src/main/res/menu/import_menu.xml +++ b/main/src/main/res/menu/import_menu.xml @@ -1,7 +1,7 @@ diff --git a/main/src/main/res/menu/logmenu.xml b/main/src/main/res/menu/logmenu.xml index d8322d83..a588081d 100644 --- a/main/src/main/res/menu/logmenu.xml +++ b/main/src/main/res/menu/logmenu.xml @@ -1,7 +1,7 @@ diff --git a/main/src/main/res/menu/vpnpreferences_menu.xml b/main/src/main/res/menu/vpnpreferences_menu.xml index bc988363..3be376ce 100644 --- a/main/src/main/res/menu/vpnpreferences_menu.xml +++ b/main/src/main/res/menu/vpnpreferences_menu.xml @@ -1,7 +1,7 @@ diff --git a/main/src/main/res/values-ca/arrays.xml b/main/src/main/res/values-ca/arrays.xml index 6be74bb5..4c87cce1 100755 --- a/main/src/main/res/values-ca/arrays.xml +++ b/main/src/main/res/values-ca/arrays.xml @@ -1,4 +1,9 @@ + + diff --git a/main/src/main/res/values-ca/strings.xml b/main/src/main/res/values-ca/strings.xml index 6aac659d..3da268e4 100755 --- a/main/src/main/res/values-ca/strings.xml +++ b/main/src/main/res/values-ca/strings.xml @@ -1,9 +1,10 @@ - + + OpenVPN per Android diff --git a/main/src/main/res/values-cs/arrays.xml b/main/src/main/res/values-cs/arrays.xml index 1f44d20f..bb6b15a4 100755 --- a/main/src/main/res/values-cs/arrays.xml +++ b/main/src/main/res/values-cs/arrays.xml @@ -1,4 +1,9 @@ + + diff --git a/main/src/main/res/values-cs/strings.xml b/main/src/main/res/values-cs/strings.xml index 26093fce..33445939 100755 --- a/main/src/main/res/values-cs/strings.xml +++ b/main/src/main/res/values-cs/strings.xml @@ -1,9 +1,10 @@ - + + OpenVPN pro Android diff --git a/main/src/main/res/values-de/arrays.xml b/main/src/main/res/values-de/arrays.xml index f91cfa70..fa0d4f6c 100755 --- a/main/src/main/res/values-de/arrays.xml +++ b/main/src/main/res/values-de/arrays.xml @@ -1,4 +1,9 @@ + + diff --git a/main/src/main/res/values-de/strings.xml b/main/src/main/res/values-de/strings.xml index a800951e..7ede063e 100755 --- a/main/src/main/res/values-de/strings.xml +++ b/main/src/main/res/values-de/strings.xml @@ -1,9 +1,10 @@ - + + OpenVPN für Android diff --git a/main/src/main/res/values-es/arrays.xml b/main/src/main/res/values-es/arrays.xml index b0df3aa5..1e5180a5 100755 --- a/main/src/main/res/values-es/arrays.xml +++ b/main/src/main/res/values-es/arrays.xml @@ -1,4 +1,9 @@ + + diff --git a/main/src/main/res/values-es/strings.xml b/main/src/main/res/values-es/strings.xml index 1eb501d6..d80c842b 100755 --- a/main/src/main/res/values-es/strings.xml +++ b/main/src/main/res/values-es/strings.xml @@ -1,9 +1,10 @@ - + + OpenVPN para Android diff --git a/main/src/main/res/values-et/arrays.xml b/main/src/main/res/values-et/arrays.xml index 41319316..5daa1600 100755 --- a/main/src/main/res/values-et/arrays.xml +++ b/main/src/main/res/values-et/arrays.xml @@ -1,4 +1,9 @@ + + diff --git a/main/src/main/res/values-et/strings.xml b/main/src/main/res/values-et/strings.xml index 3dc5a354..401fb1c7 100755 --- a/main/src/main/res/values-et/strings.xml +++ b/main/src/main/res/values-et/strings.xml @@ -1,9 +1,10 @@ - + + OpenVPN Androidile diff --git a/main/src/main/res/values-fr/arrays.xml b/main/src/main/res/values-fr/arrays.xml index 6177a05b..492c8ed6 100755 --- a/main/src/main/res/values-fr/arrays.xml +++ b/main/src/main/res/values-fr/arrays.xml @@ -1,4 +1,9 @@ + + diff --git a/main/src/main/res/values-fr/strings.xml b/main/src/main/res/values-fr/strings.xml index 5685ed45..f7168cef 100755 --- a/main/src/main/res/values-fr/strings.xml +++ b/main/src/main/res/values-fr/strings.xml @@ -1,9 +1,10 @@ - + + "OpenVPN pour Android" diff --git a/main/src/main/res/values-hu/arrays.xml b/main/src/main/res/values-hu/arrays.xml index 4dbe9f14..fe022aae 100755 --- a/main/src/main/res/values-hu/arrays.xml +++ b/main/src/main/res/values-hu/arrays.xml @@ -1,4 +1,9 @@ + + diff --git a/main/src/main/res/values-hu/strings.xml b/main/src/main/res/values-hu/strings.xml index 4700a72d..f59fd184 100755 --- a/main/src/main/res/values-hu/strings.xml +++ b/main/src/main/res/values-hu/strings.xml @@ -1,9 +1,10 @@ - + + OpenVPN Androidhoz diff --git a/main/src/main/res/values-in/arrays.xml b/main/src/main/res/values-in/arrays.xml index 56064645..4f3ad693 100755 --- a/main/src/main/res/values-in/arrays.xml +++ b/main/src/main/res/values-in/arrays.xml @@ -1,4 +1,9 @@ + + diff --git a/main/src/main/res/values-in/strings.xml b/main/src/main/res/values-in/strings.xml index 4b6baff2..f3a3a8c5 100755 --- a/main/src/main/res/values-in/strings.xml +++ b/main/src/main/res/values-in/strings.xml @@ -1,9 +1,10 @@ - + + OpenVPN untuk Android diff --git a/main/src/main/res/values-it/arrays.xml b/main/src/main/res/values-it/arrays.xml index 4d6b401c..2eb3a335 100755 --- a/main/src/main/res/values-it/arrays.xml +++ b/main/src/main/res/values-it/arrays.xml @@ -1,4 +1,9 @@ + + diff --git a/main/src/main/res/values-it/strings.xml b/main/src/main/res/values-it/strings.xml index 0a0963b8..e0712893 100755 --- a/main/src/main/res/values-it/strings.xml +++ b/main/src/main/res/values-it/strings.xml @@ -1,9 +1,10 @@ - + + OpenVPN per Android diff --git a/main/src/main/res/values-ja/arrays.xml b/main/src/main/res/values-ja/arrays.xml index 38dfb8b0..5197d369 100755 --- a/main/src/main/res/values-ja/arrays.xml +++ b/main/src/main/res/values-ja/arrays.xml @@ -1,4 +1,9 @@ + + diff --git a/main/src/main/res/values-ja/strings.xml b/main/src/main/res/values-ja/strings.xml index 9a5a9e58..6fca174b 100755 --- a/main/src/main/res/values-ja/strings.xml +++ b/main/src/main/res/values-ja/strings.xml @@ -1,9 +1,10 @@ - + + OpenVPN for Android diff --git a/main/src/main/res/values-ko/arrays.xml b/main/src/main/res/values-ko/arrays.xml index 88c4a100..8cf766c8 100755 --- a/main/src/main/res/values-ko/arrays.xml +++ b/main/src/main/res/values-ko/arrays.xml @@ -1,4 +1,9 @@ + + diff --git a/main/src/main/res/values-ko/strings.xml b/main/src/main/res/values-ko/strings.xml index bd9e93a5..82a83236 100755 --- a/main/src/main/res/values-ko/strings.xml +++ b/main/src/main/res/values-ko/strings.xml @@ -1,9 +1,10 @@ - + + 안드로이드용 OpenVPN diff --git a/main/src/main/res/values-nl/arrays.xml b/main/src/main/res/values-nl/arrays.xml index 33e55e62..e8911976 100755 --- a/main/src/main/res/values-nl/arrays.xml +++ b/main/src/main/res/values-nl/arrays.xml @@ -1,4 +1,9 @@ + + diff --git a/main/src/main/res/values-nl/strings.xml b/main/src/main/res/values-nl/strings.xml index f36da72f..7e36ce26 100755 --- a/main/src/main/res/values-nl/strings.xml +++ b/main/src/main/res/values-nl/strings.xml @@ -1,9 +1,10 @@ - + + OpenVPN voor Android diff --git a/main/src/main/res/values-no/arrays.xml b/main/src/main/res/values-no/arrays.xml index 8104ecbf..111ba266 100755 --- a/main/src/main/res/values-no/arrays.xml +++ b/main/src/main/res/values-no/arrays.xml @@ -1,4 +1,9 @@ + + diff --git a/main/src/main/res/values-no/strings.xml b/main/src/main/res/values-no/strings.xml index 26869374..b5f7aebb 100755 --- a/main/src/main/res/values-no/strings.xml +++ b/main/src/main/res/values-no/strings.xml @@ -1,9 +1,10 @@ - + + OpenVPN for Android diff --git a/main/src/main/res/values-pl/arrays.xml b/main/src/main/res/values-pl/arrays.xml index ab51b044..847daf03 100755 --- a/main/src/main/res/values-pl/arrays.xml +++ b/main/src/main/res/values-pl/arrays.xml @@ -1,4 +1,9 @@ + + diff --git a/main/src/main/res/values-pl/strings.xml b/main/src/main/res/values-pl/strings.xml index ec7294b7..650f2eb1 100755 --- a/main/src/main/res/values-pl/strings.xml +++ b/main/src/main/res/values-pl/strings.xml @@ -1,9 +1,10 @@ - + + OpenVPN dla Androida diff --git a/main/src/main/res/values-pt/arrays.xml b/main/src/main/res/values-pt/arrays.xml index e531bb80..1a79a83a 100755 --- a/main/src/main/res/values-pt/arrays.xml +++ b/main/src/main/res/values-pt/arrays.xml @@ -1,4 +1,9 @@ + + diff --git a/main/src/main/res/values-pt/strings.xml b/main/src/main/res/values-pt/strings.xml index 9b63b9ac..55ecb403 100755 --- a/main/src/main/res/values-pt/strings.xml +++ b/main/src/main/res/values-pt/strings.xml @@ -1,9 +1,10 @@ - + + OpenVPN para Android diff --git a/main/src/main/res/values-ro/arrays.xml b/main/src/main/res/values-ro/arrays.xml index 0806aafe..3d6dff8d 100755 --- a/main/src/main/res/values-ro/arrays.xml +++ b/main/src/main/res/values-ro/arrays.xml @@ -1,4 +1,9 @@ + + diff --git a/main/src/main/res/values-ro/strings.xml b/main/src/main/res/values-ro/strings.xml index aa3bb71a..8f3e469d 100755 --- a/main/src/main/res/values-ro/strings.xml +++ b/main/src/main/res/values-ro/strings.xml @@ -1,9 +1,10 @@ - + + OpenVPN pentru Android diff --git a/main/src/main/res/values-ru/arrays.xml b/main/src/main/res/values-ru/arrays.xml index b80bf859..2e56edac 100755 --- a/main/src/main/res/values-ru/arrays.xml +++ b/main/src/main/res/values-ru/arrays.xml @@ -1,4 +1,9 @@ + + diff --git a/main/src/main/res/values-ru/strings.xml b/main/src/main/res/values-ru/strings.xml index 8b9ca566..02b60f45 100755 --- a/main/src/main/res/values-ru/strings.xml +++ b/main/src/main/res/values-ru/strings.xml @@ -1,9 +1,10 @@ - + + OpenVPN для Android diff --git a/main/src/main/res/values-sv/arrays.xml b/main/src/main/res/values-sv/arrays.xml index c8cc1503..22f291fc 100755 --- a/main/src/main/res/values-sv/arrays.xml +++ b/main/src/main/res/values-sv/arrays.xml @@ -1,4 +1,9 @@ + + diff --git a/main/src/main/res/values-sv/strings.xml b/main/src/main/res/values-sv/strings.xml index 65eb8ada..bb3ead45 100755 --- a/main/src/main/res/values-sv/strings.xml +++ b/main/src/main/res/values-sv/strings.xml @@ -1,9 +1,10 @@ - + + OpenVPN för Android diff --git a/main/src/main/res/values-sw600dp/dimens.xml b/main/src/main/res/values-sw600dp/dimens.xml index b83bb856..94a120d1 100644 --- a/main/src/main/res/values-sw600dp/dimens.xml +++ b/main/src/main/res/values-sw600dp/dimens.xml @@ -1,4 +1,9 @@ + + true diff --git a/main/src/main/res/values-sw600dp/styles.xml b/main/src/main/res/values-sw600dp/styles.xml index de0bb55d..c320388d 100644 --- a/main/src/main/res/values-sw600dp/styles.xml +++ b/main/src/main/res/values-sw600dp/styles.xml @@ -1,4 +1,9 @@ + + 16dp diff --git a/main/src/main/res/values-tr/arrays.xml b/main/src/main/res/values-tr/arrays.xml index 0d16b532..fbbdcecd 100755 --- a/main/src/main/res/values-tr/arrays.xml +++ b/main/src/main/res/values-tr/arrays.xml @@ -1,4 +1,9 @@ + + diff --git a/main/src/main/res/values-tr/strings.xml b/main/src/main/res/values-tr/strings.xml index 1dc1815a..5f438bea 100755 --- a/main/src/main/res/values-tr/strings.xml +++ b/main/src/main/res/values-tr/strings.xml @@ -1,9 +1,10 @@ - + + Android için OpenVPN diff --git a/main/src/main/res/values-uk/arrays.xml b/main/src/main/res/values-uk/arrays.xml index 996ceeb7..34fbc5d4 100755 --- a/main/src/main/res/values-uk/arrays.xml +++ b/main/src/main/res/values-uk/arrays.xml @@ -1,4 +1,9 @@ + + diff --git a/main/src/main/res/values-uk/strings.xml b/main/src/main/res/values-uk/strings.xml index 0a4f10f9..ebd15ce1 100755 --- a/main/src/main/res/values-uk/strings.xml +++ b/main/src/main/res/values-uk/strings.xml @@ -1,9 +1,10 @@ - + + OpenVPN для Android diff --git a/main/src/main/res/values-v21/colours.xml b/main/src/main/res/values-v21/colours.xml new file mode 100644 index 00000000..1fedf7b9 --- /dev/null +++ b/main/src/main/res/values-v21/colours.xml @@ -0,0 +1,9 @@ + + + + + #5C6BC0 + \ No newline at end of file diff --git a/main/src/main/res/values-v21/refs.xml b/main/src/main/res/values-v21/refs.xml index 45651362..76b5c20f 100644 --- a/main/src/main/res/values-v21/refs.xml +++ b/main/src/main/res/values-v21/refs.xml @@ -1,7 +1,7 @@ diff --git a/main/src/main/res/values-v21/styles.xml b/main/src/main/res/values-v21/styles.xml index 892b6cb0..12926e79 100644 --- a/main/src/main/res/values-v21/styles.xml +++ b/main/src/main/res/values-v21/styles.xml @@ -1,7 +1,7 @@ diff --git a/main/src/main/res/values-zh-rCN/arrays.xml b/main/src/main/res/values-zh-rCN/arrays.xml index 2b526678..5fb7dfb9 100755 --- a/main/src/main/res/values-zh-rCN/arrays.xml +++ b/main/src/main/res/values-zh-rCN/arrays.xml @@ -1,4 +1,9 @@ + + diff --git a/main/src/main/res/values-zh-rCN/strings.xml b/main/src/main/res/values-zh-rCN/strings.xml index 82d2e144..61fa075e 100755 --- a/main/src/main/res/values-zh-rCN/strings.xml +++ b/main/src/main/res/values-zh-rCN/strings.xml @@ -1,9 +1,10 @@ - + + OpenVPN for Android diff --git a/main/src/main/res/values-zh-rTW/arrays.xml b/main/src/main/res/values-zh-rTW/arrays.xml index 58c64235..029d8435 100755 --- a/main/src/main/res/values-zh-rTW/arrays.xml +++ b/main/src/main/res/values-zh-rTW/arrays.xml @@ -1,4 +1,9 @@ + + diff --git a/main/src/main/res/values-zh-rTW/strings.xml b/main/src/main/res/values-zh-rTW/strings.xml index 05edb138..3dd4ff2f 100755 --- a/main/src/main/res/values-zh-rTW/strings.xml +++ b/main/src/main/res/values-zh-rTW/strings.xml @@ -1,9 +1,10 @@ - + + OpenVPN for Android diff --git a/main/src/main/res/values/arrays.xml b/main/src/main/res/values/arrays.xml index b4eeafbd..4f1e5042 100644 --- a/main/src/main/res/values/arrays.xml +++ b/main/src/main/res/values/arrays.xml @@ -1,7 +1,7 @@ diff --git a/main/src/main/res/values/attrs.xml b/main/src/main/res/values/attrs.xml index 9e973f06..9bc2317c 100644 --- a/main/src/main/res/values/attrs.xml +++ b/main/src/main/res/values/attrs.xml @@ -2,7 +2,7 @@ diff --git a/main/src/main/res/values/colours.xml b/main/src/main/res/values/colours.xml index 89fb41dd..7028885a 100644 --- a/main/src/main/res/values/colours.xml +++ b/main/src/main/res/values/colours.xml @@ -1,7 +1,7 @@ diff --git a/main/src/main/res/values/dimens.xml b/main/src/main/res/values/dimens.xml index 9a53fe4c..9b43bd12 100644 --- a/main/src/main/res/values/dimens.xml +++ b/main/src/main/res/values/dimens.xml @@ -1,7 +1,7 @@ diff --git a/main/src/main/res/values/refs.xml b/main/src/main/res/values/refs.xml index c7b0d717..4944a992 100644 --- a/main/src/main/res/values/refs.xml +++ b/main/src/main/res/values/refs.xml @@ -1,7 +1,7 @@ diff --git a/main/src/main/res/values/styles.xml b/main/src/main/res/values/styles.xml index a60e29b8..0c295df2 100644 --- a/main/src/main/res/values/styles.xml +++ b/main/src/main/res/values/styles.xml @@ -1,7 +1,7 @@ diff --git a/main/src/main/res/values/untranslatable.xml b/main/src/main/res/values/untranslatable.xml index 03c8d9ce..629514a0 100644 --- a/main/src/main/res/values/untranslatable.xml +++ b/main/src/main/res/values/untranslatable.xml @@ -1,7 +1,7 @@ diff --git a/main/src/main/res/xml/general_settings.xml b/main/src/main/res/xml/general_settings.xml index 5e40b429..25a3a8ed 100644 --- a/main/src/main/res/xml/general_settings.xml +++ b/main/src/main/res/xml/general_settings.xml @@ -1,7 +1,7 @@ diff --git a/main/src/main/res/xml/vpn_authentification.xml b/main/src/main/res/xml/vpn_authentification.xml index bc1c3807..cea54b8f 100644 --- a/main/src/main/res/xml/vpn_authentification.xml +++ b/main/src/main/res/xml/vpn_authentification.xml @@ -1,7 +1,7 @@ diff --git a/main/src/main/res/xml/vpn_ipsettings.xml b/main/src/main/res/xml/vpn_ipsettings.xml index 97f34de9..25a6de46 100644 --- a/main/src/main/res/xml/vpn_ipsettings.xml +++ b/main/src/main/res/xml/vpn_ipsettings.xml @@ -1,7 +1,7 @@ diff --git a/main/src/main/res/xml/vpn_obscure.xml b/main/src/main/res/xml/vpn_obscure.xml index 6368d57d..2d5269c5 100644 --- a/main/src/main/res/xml/vpn_obscure.xml +++ b/main/src/main/res/xml/vpn_obscure.xml @@ -1,7 +1,7 @@ -- cgit v1.2.3