diff options
| author | Baligh Uddin <baligh@google.com> | 2014-05-21 15:34:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-21 15:34:11 +0000 |
| commit | ef2b35cc2e87058ead622bd1858d358690c201fd (patch) | |
| tree | f76ec5b3784607ee6f302b5a876230478d00877f /core/res | |
| parent | 6099fd21e190ffdf8e03ba6d96cce0d53c2765fd (diff) | |
| parent | e5762bc2b4a803eb11847047547fa7473e1fedc9 (diff) | |
| download | frameworks_base-ef2b35cc2e87058ead622bd1858d358690c201fd.zip frameworks_base-ef2b35cc2e87058ead622bd1858d358690c201fd.tar.gz frameworks_base-ef2b35cc2e87058ead622bd1858d358690c201fd.tar.bz2 | |
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/values-am/strings.xml | 4 | ||||
| -rw-r--r-- | core/res/res/values-zh-rCN/strings.xml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/res/res/values-am/strings.xml b/core/res/res/values-am/strings.xml index 52feff1..9c524fc 100644 --- a/core/res/res/values-am/strings.xml +++ b/core/res/res/values-am/strings.xml @@ -116,7 +116,7 @@ <string name="fcError" msgid="3327560126588500777">"የተያያዥ ችግር ወይም ትክከል ያልሆነኮድ ባህሪ።"</string> <string name="httpErrorOk" msgid="1191919378083472204">"እሺ"</string> <string name="httpError" msgid="7956392511146698522">"የአውታረ መረብ ስህተት ነበር።"</string> - <string name="httpErrorLookup" msgid="4711687456111963163">"ዩ አር ኤል ማግኘት አልተቻለም።"</string> + <string name="httpErrorLookup" msgid="4711687456111963163">"ዩአርኤል ማግኘት አልተቻለም።"</string> <string name="httpErrorUnsupportedAuthScheme" msgid="6299980280442076799">"የድረገፁ ማረጋገጫ ሙሉ ምስርት አይደገፍም።"</string> <string name="httpErrorAuth" msgid="1435065629438044534">"ማረጋገጥ አልተቻለም።"</string> <string name="httpErrorProxyAuth" msgid="1788207010559081331">"ማረጋገጫ በእጅ አዙር አገልጋይ በኩል አልተሳካም።"</string> @@ -331,7 +331,7 @@ <string name="permlab_getTopActivityInfo" msgid="2537922311411546016">"የአሁኑ የመተግበሪያ መረጃ ያግኙ"</string> <string name="permdesc_getTopActivityInfo" msgid="2512448855496067131">"ያዢው በማያ ገጹ ፊት ላይ ስላለው የአሁኑ መተግበሪያ የግል መረጃ እንዲያመጣ ያስችለዋል።"</string> <string name="permlab_runSetActivityWatcher" msgid="892239094867182656">"ሁሉንም መተግበሪያ ማስነሻ አሳይ እና ተቆጣጠር"</string> - <string name="permdesc_runSetActivityWatcher" msgid="6003603162578577406">"እንቅስቃሴዎችን ስርዓቱ እንዴት እንደሚያስጀምር ለመከታተል እና ለመቆጣጠር ለመተግበሪያው ይፈቅዳሉ፡፡ ተንኮል አዘል መተግበሪያዎች የስርዓቱን ክብረ ገመና ሙሉለሙሉ ሊያጋልጡ ይችላሉ፡፡ ይህ ፍቃድ የሚያስፈልገው ለግንባታ ብቻ ነው፤ ለመደበኛ አጠቃቀም ፈጽሞ አይደለም፡፡"</string> + <string name="permdesc_runSetActivityWatcher" msgid="6003603162578577406">"እንቅስቃሴዎችን ስርዓቱ እንዴት እንደሚያስጀምር ለመከታተል እና ለመቆጣጠር ለመተግበሪያው ይፈቅዳሉ፡፡ ተንኮል አዘል መተግበሪያዎች የስርዓቱን ግላዊነት ሙሉለሙሉ ሊያጋልጡ ይችላሉ፡፡ ይህ ፍቃድ የሚያስፈልገው ለግንባታ ብቻ ነው፤ ለመደበኛ አጠቃቀም ፈጽሞ አይደለም፡፡"</string> <string name="permlab_broadcastPackageRemoved" msgid="2576333434893532475">"አካታች የተወገደለት ስርጭት ላክ"</string> <string name="permdesc_broadcastPackageRemoved" msgid="6621901216207931089">"የመተግበሪያ ፓኬጅ መወገዱን ማሳወቂያዎችን ለማሰራጨት ለመተግበሪያው ይፈቅዳሉ፡፡ ማንኛውንም እየሄደ ያለን ሌላ መተግበሪያ ለመግደል ተንኮል አዘል መተግበሪያዎች ይሄንን ሊጠቀሙት ይችላሉ፡፡"</string> <string name="permlab_broadcastSmsReceived" msgid="5689095009030336593">"የ SMS ደርስዋል ስርጭት ላክ"</string> diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml index 7a151bc..0f18844 100644 --- a/core/res/res/values-zh-rCN/strings.xml +++ b/core/res/res/values-zh-rCN/strings.xml @@ -1390,8 +1390,8 @@ <string name="share" msgid="1778686618230011964">"分享"</string> <string name="find" msgid="4808270900322985960">"查找"</string> <string name="websearch" msgid="4337157977400211589">"网页搜索"</string> - <string name="find_next" msgid="5742124618942193978">"查找下一个"</string> - <string name="find_previous" msgid="2196723669388360506">"查找上一个"</string> + <string name="find_next" msgid="5742124618942193978">"下一条结果"</string> + <string name="find_previous" msgid="2196723669388360506">"上一条结果"</string> <string name="gpsNotifTicker" msgid="5622683912616496172">"来自<xliff:g id="NAME">%s</xliff:g>的定位请求"</string> <string name="gpsNotifTitle" msgid="5446858717157416839">"定位请求"</string> <string name="gpsNotifMessage" msgid="1374718023224000702">"请求人：<xliff:g id="NAME">%1$s</xliff:g>（<xliff:g id="SERVICE">%2$s</xliff:g>）"</string> |