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

Commit 1fae3cf2 authored by Kristian Monsen's avatar Kristian Monsen Committed by Android (Google) Code Review
Browse files

Merge "Merge Chromium at 10.0.634.0: Add autofill fax string"

parents 50f7fb9c a014db7f

core/java/android/webkit/L10nUtils.java

+2 −1
Original line number Diff line number Diff line
@@ -69,7 +69,8 @@ public class L10nUtils { 
        com.android.internal.R.string.autofill_card_number_re,              // IDS_AUTOFILL_CARD_NUMBER_RE

        com.android.internal.R.string.autofill_expiration_month_re,         // IDS_AUTOFILL_EXPIRATION_MONTH_RE

        com.android.internal.R.string.autofill_expiration_date_re,          // IDS_AUTOFILL_EXPIRATION_DATE_RE

        com.android.internal.R.string.autofill_card_ignored_re              // IDS_AUTOFILL_CARD_IGNORED_RE

        com.android.internal.R.string.autofill_card_ignored_re,             // IDS_AUTOFILL_CARD_IGNORED_RE

        com.android.internal.R.string.autofill_fax_re                       // IDS_AUTOFILL_FAX_RE

    };



    private static Context mApplicationContext;

core/res/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -1998,6 +1998,9 @@ 
    <!-- Do not translate. Regex used by AutoFill. -->

    <string name="autofill_card_ignored_re">^card</string>



    <!-- Do not translate. Regex used by AutoFill. -->

    <string name="autofill_fax_re">fax<!-- fr-FR -->|télécopie|telecopie<!-- ja-JP -->|ファックス<!-- ru -->|факс<!-- zh-CN -->|传真<!-- zh-TW -->|傳真</string>



    <!-- Title of an application permission, listed so the user can choose whether

        they want to allow the application to do this. -->

    <string name="permlab_readHistoryBookmarks">read Browser\'s history and bookmarks</string>