diff options
author | Eric Erfanian <erfanian@google.com> | 2017-08-31 06:57:16 -0700 |
---|---|---|
committer | Roland Levillain <rpl@google.com> | 2017-09-04 18:05:19 +0100 |
commit | fc0eb8ccebcc7846db5e8b5c5430070055679bfa (patch) | |
tree | a8a23c3202e4161ffd57a71095a404db1bcf5735 /java/com/android/dialer/dialpadview/res/values/strings.xml | |
parent | ea7b4dc89590ffa3332766a531e0eab6ffb9aebd (diff) |
Update Dialer source to latest internal Google revision.
Previously, Android's Dialer app was developed in an internal Google
source control system and only exported to public during AOSP drops.
The Dialer team is now switching to a public development model similar
to the telephony team.
This CL represents all internal Google changes that were committed to
Dialer between the public O release and today's tip of tree on internal
master. This CL squashes those changes into a single commit.
In subsequent changes, changes will be exported on a per-commit basis.
(cherry picked from commit 2ca4318cc1ee57dda907ba2069bd61d162b1baef
and amended to match paths of dependencies under
prebuilts/maven_repo/bumptech/com/github/bumptech/glide/.)
This CL was generated using these commands from a repository at
stage-stage-master at revision ea7b4dc89590ffa3332766a531e0eab6ffb9aebd
("Merge "Update Dialer source to latest internal Google revision." am: c39ea3c55f -s ours"):
git diff --binary 2ca4318cc1ee57dda907ba2069bd61d162b1baef | git apply -R --index
git commit -c 2ca4318cc1ee57dda907ba2069bd61d162b1baef
Test: make, flash install, run
Change-Id: I529aaeb88535b9533c0ae4ef4e6c1222d4e0f1c8
PiperOrigin-RevId: 167068436
Diffstat (limited to 'java/com/android/dialer/dialpadview/res/values/strings.xml')
-rw-r--r-- | java/com/android/dialer/dialpadview/res/values/strings.xml | 59 |
1 files changed, 58 insertions, 1 deletions
diff --git a/java/com/android/dialer/dialpadview/res/values/strings.xml b/java/com/android/dialer/dialpadview/res/values/strings.xml index 920e6e25c..b3e92f1d9 100644 --- a/java/com/android/dialer/dialpadview/res/values/strings.xml +++ b/java/com/android/dialer/dialpadview/res/values/strings.xml @@ -14,7 +14,7 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License --> -<resources> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="dialpad_star_number" translatable="false">*</string> <string name="dialpad_pound_number" translatable="false">#</string> @@ -50,4 +50,61 @@ --> <string name="description_voicemail_button">voicemail</string> + <!-- String describing the Dial ImageButton + + Used by AccessibilityService to announce the purpose of the button. + --> + <string name="description_dial_button">dial</string> + + <!-- Dialog message which is shown when the user tries to check voicemail + while the system is in airplane mode. The user cannot access to + voicemail service in Airplane mode. [CHAR LIMI=NONE] --> + <string name="dialog_voicemail_airplane_mode_message">To call voicemail, first turn off Airplane mode.</string> + + <!-- Dialog message which is shown when the user tries to check voicemail + while the system isn't ready for the access. [CHAR LIMIT=NONE] --> + <string name="dialog_voicemail_not_ready_message">To set up voicemail, go to Menu > Settings.</string> + + <!-- Menu items for dialpad options as part of Pause and Wait ftr [CHAR LIMIT=30] --> + <string name="add_2sec_pause">Add 2-sec pause</string> + <string name="add_wait">Add wait</string> + + <!-- Item label: jump to the in-call DTMF dialpad. + (Part of a list of options shown in the dialer when another call + is already in progress.) --> + <string name="dialer_useDtmfDialpad">Use touch tone keypad</string> + + <!-- Item label: jump to the in-call UI. + (Part of a list of options shown in the dialer when another call + is already in progress.) --> + <string name="dialer_returnToInCallScreen">Return to call in progress</string> + + <!-- Item label: use the Dialer's keypad to add another call. + (Part of a list of options shown in the dialer when another call + is already in progress.) --> + <string name="dialer_addAnotherCall">Add call</string> + + <!-- The title of a dialog that displays the IMEI of the phone --> + <string name="imei">IMEI</string> + + <!-- The title of a dialog that displays the MEID of the CDMA phone --> + <string name="meid">MEID</string> + + <!-- Dialog text displayed when loading a phone number from the SIM card for speed dial --> + <string name="simContacts_emptyLoading">Loading from SIM card\u2026</string> + + <!-- Dialog title displayed when loading a phone number from the SIM card for speed dial --> + <string name="simContacts_title">SIM card contacts</string> + + <!-- Menu item used to call a contact, containing the number of the contact to call --> + <string name="menu_callNumber">Call <xliff:g id="number">%s</xliff:g></string> + + + <!-- Regular expression for prohibiting certain phone numbers in dialpad. + Ignored if empty. --> + <string name="config_prohibited_phone_number_regexp" translatable="false"></string> + + <!-- Dialog message which is shown when the user tries to make a phone call + to prohibited phone numbers [CHAR LIMIT=NONE] --> + <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Can\'t call this number</string> </resources> |