diff options
| author | Gilles Debunne <debunne@google.com> | 2010-08-23 11:42:24 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-23 11:42:24 -0700 |
| commit | 5989f4edc5ba74d59412a1966a8e977cfebe79df (patch) | |
| tree | 8b3e089a8156fddb1344de2f3b4bea5630684c4c /core/res | |
| parent | a1f1174b396cda7bdff469a2e974a737600c5eb0 (diff) | |
| parent | 252b36379fedd0c91125679170a56d080d05ae9f (diff) | |
| download | frameworks_base-5989f4edc5ba74d59412a1966a8e977cfebe79df.zip frameworks_base-5989f4edc5ba74d59412a1966a8e977cfebe79df.tar.gz frameworks_base-5989f4edc5ba74d59412a1966a8e977cfebe79df.tar.bz2 | |
Merge "resolved conflicts for merge of a842d143 to master"
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/values-en-rAU/strings.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values-en-rSG/strings.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values-en-rUS/strings.xml | 2 |
3 files changed, 0 insertions, 6 deletions
diff --git a/core/res/res/values-en-rAU/strings.xml b/core/res/res/values-en-rAU/strings.xml index 3de378b..1cbfbba 100644 --- a/core/res/res/values-en-rAU/strings.xml +++ b/core/res/res/values-en-rAU/strings.xml @@ -1079,11 +1079,9 @@ <skip /> <!-- no translation found for cut (5845613239192595662) --> <skip /> - <!-- no translation found for cutAll (4474519683293791451) --> <skip /> <!-- no translation found for copy (8603721575469529820) --> <skip /> - <!-- no translation found for copyAll (4777548804630476932) --> <skip /> <!-- no translation found for paste (6458036735811828538) --> <skip /> diff --git a/core/res/res/values-en-rSG/strings.xml b/core/res/res/values-en-rSG/strings.xml index 2ec6b0b..09a8490 100644 --- a/core/res/res/values-en-rSG/strings.xml +++ b/core/res/res/values-en-rSG/strings.xml @@ -1074,11 +1074,9 @@ <skip /> <!-- no translation found for cut (5845613239192595662) --> <skip /> - <!-- no translation found for cutAll (4474519683293791451) --> <skip /> <!-- no translation found for copy (8603721575469529820) --> <skip /> - <!-- no translation found for copyAll (4777548804630476932) --> <skip /> <!-- no translation found for paste (6458036735811828538) --> <skip /> diff --git a/core/res/res/values-en-rUS/strings.xml b/core/res/res/values-en-rUS/strings.xml index 05f30fc..fdc0d69 100644 --- a/core/res/res/values-en-rUS/strings.xml +++ b/core/res/res/values-en-rUS/strings.xml @@ -1115,11 +1115,9 @@ <skip /> <!-- no translation found for cut (5845613239192595662) --> <skip /> - <!-- no translation found for cutAll (4474519683293791451) --> <skip /> <!-- no translation found for copy (8603721575469529820) --> <skip /> - <!-- no translation found for copyAll (4777548804630476932) --> <skip /> <!-- no translation found for paste (6458036735811828538) --> <skip /> |