resolve merge conflicts of b6d709ce to master

<?xml version="1.0" encoding="UTF-8"?>

<resources xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="app_name" msgid="5934709770924185752">"Prijava na zaštitnom portalu"</string>

    <string name="action_use_network" msgid="6076184727448466030">"Koristi ovu mrežu kakva jeste"</string>

    <string name="action_do_not_use_network" msgid="4577366536956516683">"Ne koristi ovu mrežu"</string>

    <string name="action_bar_label" msgid="917235635415966620">"Prijava na mrežu"</string>

    <string name="action_bar_title" msgid="5645564790486983117">"Prijava na %1$s"</string>

    <string name="ssl_error_warning" msgid="6653188881418638872">"Mreža kojoj pokušavate pristupiti ima sigurnosnih problema."</string>

    <string name="ssl_error_example" msgid="647898534624078900">"Naprimjer, stranica za prijavu možda ne pripada prikazanoj organizaciji."</string>

    <string name="ssl_error_continue" msgid="6492718244923937110">"Ipak nastavi preko preglednika"</string>

    <string name="ssl_error_untrusted" msgid="1496280318271264520">"Ova potvrda ne potiče iz pouzdanog izvora."</string>

    <string name="ssl_error_mismatch" msgid="3060364165934822383">"Naziv web lokacije se ne podudara s nazivom na potvrdi."</string>

    <string name="ssl_error_expired" msgid="1501588340716182495">"Ova potvrda je istekla."</string>

    <string name="ssl_error_not_yet_valid" msgid="8648649030525886924">"Ova potvrda još uvijek nije važeća."</string>

    <string name="ssl_error_date_invalid" msgid="88425990680059223">"Ova potvrda sadrži nevažeći datum."</string>

    <string name="ssl_error_invalid" msgid="2540546515565633432">"Ova potvrda je nevažeća."</string>

    <string name="ssl_error_unknown" msgid="4405203446079465859">"Nepoznata greška potvrde."</string>

    <string name="ssl_security_warning_title" msgid="8768539813847504404">"Sigurnosno upozorenje"</string>

    <string name="ssl_error_view_certificate" msgid="5722652540168339333">"Prikaži potvrdu"</string>

    <string name="ok" msgid="2817931639040794018">"Uredu"</string>

    <string name="page_info_address" msgid="1261481517455692363">"Adresa:"</string>

    <string name="page_info" msgid="4416941086705172545">"Informacije o stranici"</string>

</resources>

<?xml version="1.0" encoding="UTF-8"?>

<resources xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="app_name" msgid="5934709770924185752">"CaptivePortalLogin"</string>

    <string name="action_use_network" msgid="6076184727448466030">"Netzwerk im Istzustand verwenden"</string>

    <string name="action_do_not_use_network" msgid="4577366536956516683">"Netzwerk nicht verwenden"</string>

    <string name="action_bar_label" msgid="917235635415966620">"Im Netzwerk anmelden"</string>

    <string name="action_bar_title" msgid="5645564790486983117">"In %1$s anmelden"</string>

    <string name="ssl_error_warning" msgid="6653188881418638872">"Im Netzwerk, zu dem du eine Verbindung herstellen möchtest, liegen Sicherheitsprobleme vor."</string>

    <string name="ssl_error_example" msgid="647898534624078900">"Beispiel: Die Log-in-Seite gehört eventuell nicht zur angezeigten Organisation."</string>

    <string name="ssl_error_continue" msgid="6492718244923937110">"Trotzdem in einem Browser fortfahren"</string>

    <string name="ssl_error_untrusted" msgid="1496280318271264520">"Dieses Zertifikat stammt nicht von einer vertrauenswürdigen Stelle."</string>

    <string name="ssl_error_mismatch" msgid="3060364165934822383">"Der Name der Website stimmt nicht mit dem Namen auf dem Zertifikat überein."</string>

    <string name="ssl_error_expired" msgid="1501588340716182495">"Dieses Zertifikat ist abgelaufen."</string>

    <string name="ssl_error_not_yet_valid" msgid="8648649030525886924">"Dieses Zertifikat ist noch nicht gültig."</string>

    <string name="ssl_error_date_invalid" msgid="88425990680059223">"Dieses Zertifikat hat ein ungültiges Datum."</string>

    <string name="ssl_error_invalid" msgid="2540546515565633432">"Dieses Zertifikat ist ungültig."</string>

    <string name="ssl_error_unknown" msgid="4405203446079465859">"Unbekannter Zertifikatfehler."</string>

    <string name="ssl_security_warning_title" msgid="8768539813847504404">"Sicherheitswarnung"</string>

    <string name="ssl_error_view_certificate" msgid="5722652540168339333">"Zertifikat ansehen"</string>

    <string name="ok" msgid="2817931639040794018">"Ok"</string>

    <string name="page_info_address" msgid="1261481517455692363">"Adresse:"</string>

    <string name="page_info" msgid="4416941086705172545">"Seiteninformationen"</string>

</resources>

// Copyright (C) 2016 The Android Open Source Project

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//      http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.

android_library {

    name: "ExtServices-core",

     srcs: [

         "src/**/*.java",

     ],

     resource_dirs: [

         "res",

     ],

     manifest: "AndroidManifest.xml",

}

android_app {

    name: "ExtServices",

    srcs: ["src/**/*.java"],

    platform_apis: true,

    certificate: "platform",

    optimize: {

        proguard_flags_files: ["proguard.proguard"],

    },

    privileged: true,

    min_sdk_version: "28",

}

//

// Copyright (C) 2019 The Android Open Source Project

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//      http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.

//

java_library {

    name: "net-tests-utils",

    srcs: [

        "src/**/*.java",

        "src/**/*.kt",

    ],

    static_libs: [

        "kotlin-test",

    ],

}