diff options
| author | Xin Li <delphij@google.com> | 2017-11-06 13:19:41 -0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2017-11-06 13:19:41 -0800 |
| commit | 3640120a3ec645e5273f506905e100cef04a8771 (patch) | |
| tree | 56b062681ef8fe1b2e820ff8ea87a0fa28e2e9d9 /res | |
| parent | 15551d4618a06f202deb7f3bb8dd72dc6614e15a (diff) | |
| parent | e17c94c7b4157884cb6caf4393c2299241851baf (diff) | |
| download | Stk-3640120a3ec645e5273f506905e100cef04a8771.tar.gz | |
resolve merge conflicts of e17c94c to oc-mr1-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Iaacf9d494af871b24d6348a460065104a8a43f3e
Diffstat (limited to 'res')
| -rw-r--r-- | res/values-gu/strings.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml index 68bb773..a9f6d3b 100644 --- a/res/values-gu/strings.xml +++ b/res/values-gu/strings.xml @@ -33,7 +33,7 @@ <string name="stk_app_state" msgid="18582277302584082">"એપ્લિકેશનની સ્થિતિ"</string> <string name="enable_app" msgid="3701224550936728203">"સક્ષમ કરેલું"</string> <string name="disable_app" msgid="6725081975611415214">"અક્ષમ કરેલું"</string> - <string name="stk_dialog_title" msgid="6954825385456886726">"SIM ટૂલકિટ"</string> + <string name="stk_dialog_title" msgid="6954825385456886726">"સિમ ટૂલકિટ"</string> <string name="default_tone_dialog_msg" msgid="4595366992944391641">"ચલાવવા માટેનો ટોન"</string> <string name="default_open_channel_msg" msgid="2216070254100295924">"ચૅનલ ખોલીએ?"</string> <string name="default_send_data_msg" msgid="6011219698689931272">"ડેટા મોકલી રહ્યું છે"</string> |