diff options
| author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-11-23 06:51:34 +0100 |
|---|---|---|
| committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-11-23 06:51:34 +0100 |
| commit | 45bc4b754b3a89d39caac8f9b58b14182c67ecf6 (patch) | |
| tree | 5c052d202b6c9ce9219b5c97167319677a9889f4 /overlay/packages | |
| parent | 8dc38ab89576751c794f2a8a675628f38718f246 (diff) | |
| parent | 214d003a47e7fe2962df667c5d65bce92a21a40e (diff) | |
| download | device_samsung_tuna-45bc4b754b3a89d39caac8f9b58b14182c67ecf6.zip device_samsung_tuna-45bc4b754b3a89d39caac8f9b58b14182c67ecf6.tar.gz device_samsung_tuna-45bc4b754b3a89d39caac8f9b58b14182c67ecf6.tar.bz2 | |
Merge remote-tracking branch 'remotes/google/jb-mr1-release' into HEAD
Conflicts:
audio/audio_hw.c
init.tuna.rc
overlay/frameworks/base/core/res/res/xml/storage_list.xml
recovery/Android.mk
Change-Id: I0b13c6b5e61ea709b0e9aaa1c7b798684b33873a
Diffstat (limited to 'overlay/packages')
4 files changed, 16 insertions, 18 deletions
diff --git a/overlay/packages/apps/Settings/res/values-cs/arrays.xml b/overlay/packages/apps/Settings/res/values-cs/arrays.xml index 266d10e..265da14 100644 --- a/overlay/packages/apps/Settings/res/values-cs/arrays.xml +++ b/overlay/packages/apps/Settings/res/values-cs/arrays.xml @@ -21,11 +21,11 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string-array name="screen_timeout_entries"> - <item msgid="5314770629356662739">"15 s."</item> - <item msgid="8672738773876256432">"30 s."</item> - <item msgid="465923292941002466">"1 min."</item> - <item msgid="7955177189296850016">"2 min."</item> - <item msgid="1244255986255344525">"5 min."</item> - <item msgid="294890536998091748">"10 min."</item> + <item msgid="5314770629356662739">"15 sekund"</item> + <item msgid="8672738773876256432">"30 sekund"</item> + <item msgid="465923292941002466">"1 minuta"</item> + <item msgid="7955177189296850016">"2 minuty"</item> + <item msgid="1244255986255344525">"5 minut"</item> + <item msgid="294890536998091748">"10 minut"</item> </string-array> </resources> diff --git a/overlay/packages/apps/Settings/res/values-fa/arrays.xml b/overlay/packages/apps/Settings/res/values-fa/arrays.xml index bf95ca8..71915a9 100644 --- a/overlay/packages/apps/Settings/res/values-fa/arrays.xml +++ b/overlay/packages/apps/Settings/res/values-fa/arrays.xml @@ -21,11 +21,11 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string-array name="screen_timeout_entries"> - <item msgid="5314770629356662739">"15 ثانیه"</item> - <item msgid="8672738773876256432">"30 ثانیه"</item> - <item msgid="465923292941002466">"1 دقیقه"</item> - <item msgid="7955177189296850016">"2 دقیقه"</item> - <item msgid="1244255986255344525">"5 دقیقه"</item> - <item msgid="294890536998091748">"10 دقیقه"</item> + <item msgid="5314770629356662739">"۱۵ ثانیه"</item> + <item msgid="8672738773876256432">"۳۰ ثانیه"</item> + <item msgid="465923292941002466">"۱ دقیقه"</item> + <item msgid="7955177189296850016">"۲ دقیقه"</item> + <item msgid="1244255986255344525">"۵ دقیقه"</item> + <item msgid="294890536998091748">"۱۰ دقیقه"</item> </string-array> </resources> diff --git a/overlay/packages/apps/Settings/res/values-nb/arrays.xml b/overlay/packages/apps/Settings/res/values-nb/arrays.xml index c5db781..a365905 100644 --- a/overlay/packages/apps/Settings/res/values-nb/arrays.xml +++ b/overlay/packages/apps/Settings/res/values-nb/arrays.xml @@ -23,9 +23,9 @@ <string-array name="screen_timeout_entries"> <item msgid="5314770629356662739">"15 sekunder"</item> <item msgid="8672738773876256432">"30 sekunder"</item> - <item msgid="465923292941002466">"Ett minutt"</item> - <item msgid="7955177189296850016">"To minutter"</item> - <item msgid="1244255986255344525">"Fem minutter"</item> - <item msgid="294890536998091748">"Ti minutter"</item> + <item msgid="465923292941002466">"1 minutt"</item> + <item msgid="7955177189296850016">"2 minutter"</item> + <item msgid="1244255986255344525">"5 minutter"</item> + <item msgid="294890536998091748">"10 minutter"</item> </string-array> </resources> diff --git a/overlay/packages/apps/Settings/res/values/bools.xml b/overlay/packages/apps/Settings/res/values/bools.xml index 711eb51..b5e8b7b 100644 --- a/overlay/packages/apps/Settings/res/values/bools.xml +++ b/overlay/packages/apps/Settings/res/values/bools.xml @@ -17,6 +17,4 @@ <resources> <!-- Show dock settings when docked --> <bool name="has_dock_settings">true</bool> - <!-- Enable user management --> - <bool name="enable_user_management">true</bool> </resources> |