Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 151ef234 authored by Nihar Thakkar's avatar Nihar Thakkar
Browse files

Merge remote-tracking branch 'origin/bitfireAT/master' 

# Conflicts:
#	build.gradle
parents cb7f4adc 4e9e2088

build.gradle

+10 −10
Original line number Diff line number Diff line 


buildscript {

    ext.kotlin_version = '1.2.50'

    ext.dokka_version = '0.9.16'

    ext.kotlin_version = '1.2.71'

    ext.dokka_version = '0.9.17'



    repositories {

        jcenter()
@@ -9,7 +9,7 @@ buildscript { 
    }



    dependencies {

        classpath 'com.android.tools.build:gradle:3.1.3'

        classpath 'com.android.tools.build:gradle:3.2.0'

        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

        classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:${dokka_version}"

    }
@@ -25,12 +25,12 @@ apply plugin: 'kotlin-android' 
apply plugin: 'org.jetbrains.dokka-android'



android {

    compileSdkVersion 27

    buildToolsVersion '27.0.3'

    compileSdkVersion 28

    buildToolsVersion '28.0.3'



    defaultConfig {

        minSdkVersion 23

        targetSdkVersion 27

        minSdkVersion 14

        targetSdkVersion 28

    }



    lintOptions {
@@ -44,10 +44,10 @@ android { 
}



dependencies {

    api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"



    api 'com.android.support:appcompat-v7:27.1.1'

    api 'com.android.support:cardview-v7:27.1.1'

    implementation 'com.android.support:appcompat-v7:28.0.0'

    implementation 'com.android.support:cardview-v7:28.0.0'



    androidTestImplementation 'com.android.support.test:runner:1.0.2'

    androidTestImplementation 'com.android.support.test:rules:1.0.2'

gradle/wrapper/gradle-wrapper.properties

+1 −1
Original line number Diff line number Diff line
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME 
distributionPath=wrapper/dists

zipStoreBase=GRADLE_USER_HOME

zipStorePath=wrapper/dists

distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
 
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-all.zip

src/main/res/values-ar/strings.xml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<resources>



    <string name="certificate_notification_connection_security">أمن الاتصال</string>

    <string name="certificate_notification_user_interaction">فضلاً راجع الشهادة</string>



    <string name="service_rejected_temporarily">الشهادة مرفوضة مؤقتاً</string>



    <string name="trust_certificate_unknown_certificate_found">عثر cert4android على شهادة غير معروفة.  هل تريد الوثوق بها؟</string>

    <string name="trust_certificate_x509_certificate_details">تفاصيل شهادة X509</string>

    <string name="trust_certificate_issued_for">صادرة لـ</string>

    <string name="trust_certificate_issued_by">جهة الإصدار</string>

    <string name="trust_certificate_validity_period">مدة الصلاحية</string>

    <string name="trust_certificate_validity_period_value">%1$s - %2$s (لن يتم تنفيذها)</string>

    <string name="trust_certificate_fingerprints">البصمات</string>

    <string name="trust_certificate_fingerprint_verified">لقد قمت بالتحقق يدوياً من كامل البصمة.</string>

    <string name="trust_certificate_accept">موافق</string>

    <string name="trust_certificate_reject">أرفض</string>

    <string name="trust_certificate_reset_info">يمكنك إعادة ضبط كل الشهادات المخصصة في إعدادات التطبيق.</string>



</resources>
 
 No newline at end of file