コミット: 913048291a7e5df6c61217ff0e2cea8e4d45e77a - packages-apps-Settings (git)

packages/apps/Settings

コミットメタ情報

• リビジョン: 913048291a7e5df6c61217ff0e2cea8e4d45e77a (tree)
• 日時: 2011-12-19 14:42:47
• 作者: Patrick Ferguson <padraigf65@gmai...>
• コミッター: Chih-Wei Huang

ログメッセージ

add back 'Never Timeout' to Screen timeout of Display settings

変更サマリ

• modified: res/values-ar/arrays.xml
• modified: res/values-bg/arrays.xml
• modified: res/values-ca/arrays.xml
• modified: res/values-cs/arrays.xml
• modified: res/values-da/arrays.xml
• modified: res/values-de/arrays.xml
• modified: res/values-el/arrays.xml
• modified: res/values-en-rGB/arrays.xml
• modified: res/values-es-rUS/arrays.xml
• modified: res/values-es/arrays.xml
• modified: res/values-fa/arrays.xml
• modified: res/values-fi/arrays.xml
• modified: res/values-fr/arrays.xml
• modified: res/values-hr/arrays.xml
• modified: res/values-hu/arrays.xml
• modified: res/values-in/arrays.xml
• modified: res/values-it/arrays.xml
• modified: res/values-iw/arrays.xml
• modified: res/values-ja/arrays.xml
• modified: res/values-ko/arrays.xml
• modified: res/values-lt/arrays.xml
• modified: res/values-lv/arrays.xml
• modified: res/values-nb/arrays.xml
• modified: res/values-nl/arrays.xml
• modified: res/values-pl/arrays.xml
• modified: res/values-pt-rPT/arrays.xml
• modified: res/values-pt/arrays.xml
• modified: res/values-ro/arrays.xml
• modified: res/values-ru/arrays.xml
• modified: res/values-sk/arrays.xml
• modified: res/values-sl/arrays.xml
• modified: res/values-sr/arrays.xml
• modified: res/values-sv/arrays.xml
• modified: res/values-th/arrays.xml
• modified: res/values-tl/arrays.xml
• modified: res/values-tr/arrays.xml
• modified: res/values-uk/arrays.xml
• modified: res/values-vi/arrays.xml
• modified: res/values-zh-rCN/arrays.xml
• modified: res/values-zh-rTW/arrays.xml
• modified: res/values/arrays.xml

差分

--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -47,6 +47,7 @@
     <item msgid="7489864775127957179">"5 دقائق"</item>
     <item msgid="2314124409517439288">"10 دقائق"</item>
     <item msgid="6864027152847611413">"30 دقيقة"</item>
+    <item msgid="1781492122915870416">"أبدا المهلة"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"فورًا"</item>

--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -47,6 +47,7 @@
     <item msgid="7489864775127957179">"5 минути"</item>
     <item msgid="2314124409517439288">"10 минути"</item>
     <item msgid="6864027152847611413">"30 минути"</item>
+    <item msgid="1781492122915870416">"никога изчакване"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"незабавно"</item>

--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -47,6 +47,7 @@
     <item msgid="7489864775127957179">"5 minuts"</item>
     <item msgid="2314124409517439288">"10 minuts"</item>
     <item msgid="6864027152847611413">"30 minuts"</item>
+    <item msgid="1781492122915870416">"mai temps d'espera"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"immediatament"</item>

--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -47,6 +47,7 @@
     <item msgid="7489864775127957179">"5 minut"</item>
     <item msgid="2314124409517439288">"10 minut"</item>
     <item msgid="6864027152847611413">"30 minut"</item>
+    <item msgid="1781492122915870416">"Nevypínat"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"okamžitě"</item>

--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -47,6 +47,7 @@
     <item msgid="7489864775127957179">"5 minutter"</item>
     <item msgid="2314124409517439288">"10 minutter"</item>
     <item msgid="6864027152847611413">"30 minutter"</item>
+    <item msgid="1781492122915870416">"Lad der aldrig opstå timeout"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"med det samme"</item>

--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -47,6 +47,7 @@
     <item msgid="7489864775127957179">"5 Minuten"</item>
     <item msgid="2314124409517439288">"10 Minuten"</item>
     <item msgid="6864027152847611413">"30 Minuten"</item>
+    <item msgid="1781492122915870416">"Kein Timeout"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"sofort"</item>

--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml
@@ -47,6 +47,7 @@
     <item msgid="7489864775127957179">"5 λεπτά"</item>
     <item msgid="2314124409517439288">"10 λεπτά"</item>
     <item msgid="6864027152847611413">"30 λεπτά"</item>
+    <item msgid="1781492122915870416">"Να μην λήγει ποτέ ο χρόνος σύνδεσης"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"άμεσα"</item>

--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -47,6 +47,7 @@
     <item msgid="7489864775127957179">"5 minutes"</item>
     <item msgid="2314124409517439288">"10 minutes"</item>
     <item msgid="6864027152847611413">"30 minutes"</item>
+    <item msgid="1781492122915870416">"Never timeout"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"immediately"</item>

--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -47,6 +47,7 @@
     <item msgid="7489864775127957179">"5 minutos"</item>
     <item msgid="2314124409517439288">"10 minutos"</item>
     <item msgid="6864027152847611413">"30 minutos"</item>
+    <item msgid="1781492122915870416">"Nunca se debe agotar el tiempo de espera"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"inmediatamente"</item>

--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -47,6 +47,7 @@
     <item msgid="7489864775127957179">"5 minutos"</item>
     <item msgid="2314124409517439288">"10 minutos"</item>
     <item msgid="6864027152847611413">"30 minutos"</item>
+    <item msgid="1781492122915870416">"Tiempo de espera ilimitado"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"inmediatamente"</item>

--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -47,6 +47,7 @@
     <item msgid="7489864775127957179">"5 دقیقه"</item>
     <item msgid="2314124409517439288">"10 دقیقه"</item>
     <item msgid="6864027152847611413">"30 دقیقه"</item>
+    <item msgid="1781492122915870416">"فاصله هرگز"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"بلافاصله"</item>

--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@ -47,6 +47,7 @@
     <item msgid="7489864775127957179">"5 minuuttia"</item>
     <item msgid="2314124409517439288">"10 minuuttia"</item>
     <item msgid="6864027152847611413">"30 minuuttia"</item>
+    <item msgid="1781492122915870416">"koskaan aikakatkaisu"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"heti"</item>

--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -47,6 +47,7 @@
     <item msgid="7489864775127957179">"5 minutes"</item>
     <item msgid="2314124409517439288">"10 minutes"</item>
     <item msgid="6864027152847611413">"30 minutes"</item>
+    <item msgid="1781492122915870416">"Ne jamais désactiver"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"immédiatement"</item>

--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -47,6 +47,7 @@
     <item msgid="7489864775127957179">"5 minuta"</item>
     <item msgid="2314124409517439288">"10 minuta"</item>
     <item msgid="6864027152847611413">"30 minuta"</item>
+    <item msgid="1781492122915870416">"nikada timeout"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"odmah"</item>

--- a/res/values-hu/arrays.xml
+++ b/res/values-hu/arrays.xml
@@ -47,6 +47,7 @@
     <item msgid="7489864775127957179">"5 perc"</item>
     <item msgid="2314124409517439288">"10 perc"</item>
     <item msgid="6864027152847611413">"30 perc"</item>
+    <item msgid="1781492122915870416">"soha nem timeout"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"azonnal"</item>

--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -47,6 +47,7 @@
     <item msgid="7489864775127957179">"5 menit"</item>
     <item msgid="2314124409517439288">"10 menit"</item>
     <item msgid="6864027152847611413">"30 menit"</item>
+    <item msgid="1781492122915870416">"pernah habis"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"segera"</item>

--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -47,6 +47,7 @@
     <item msgid="7489864775127957179">"5 minuti"</item>
     <item msgid="2314124409517439288">"10 minuti"</item>
     <item msgid="6864027152847611413">"30 minuti"</item>
+    <item msgid="1781492122915870416">"Mai timeout"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"immediatamente"</item>

--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -47,6 +47,7 @@
     <item msgid="7489864775127957179">"5 דקות"</item>
     <item msgid="2314124409517439288">"10 דקות"</item>
     <item msgid="6864027152847611413">"30 דקות"</item>
+    <item msgid="1781492122915870416">"מעולם לא פסק זמן"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"מיד"</item>

--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -47,6 +47,7 @@
     <item msgid="7489864775127957179">"5分"</item>
     <item msgid="2314124409517439288">"10分"</item>
     <item msgid="6864027152847611413">"30分"</item>
+    <item msgid="1781492122915870416">"常時点灯"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"すぐ"</item>

--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -47,6 +47,7 @@
     <item msgid="7489864775127957179">"5분"</item>
     <item msgid="2314124409517439288">"10분"</item>
     <item msgid="6864027152847611413">"30분"</item>
+    <item msgid="1781492122915870416">"시간제한 없음"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"즉시"</item>

--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -47,6 +47,7 @@
     <item msgid="7489864775127957179">"5 min."</item>
     <item msgid="2314124409517439288">"10 min."</item>
     <item msgid="6864027152847611413">"30 min."</item>
+    <item msgid="1781492122915870416">"niekada timeout"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"nedelsiant"</item>

--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml
@@ -47,6 +47,7 @@
     <item msgid="7489864775127957179">"5 minūtes"</item>
     <item msgid="2314124409517439288">"10 minūtes"</item>
     <item msgid="6864027152847611413">"30 minūtes"</item>
+    <item msgid="1781492122915870416">"nekad timeout"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"nekavējoties"</item>

--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -47,6 +47,7 @@
     <item msgid="7489864775127957179">"5 minutter"</item>
     <item msgid="2314124409517439288">"10 minutter"</item>
     <item msgid="6864027152847611413">"30 minutter"</item>
+    <item msgid="1781492122915870416">"Aldri slå av"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"umiddelbart"</item>

--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -47,6 +47,7 @@
     <item msgid="7489864775127957179">"5 minuten"</item>
     <item msgid="2314124409517439288">"10 minuten"</item>
     <item msgid="6864027152847611413">"30 minuten"</item>
+    <item msgid="1781492122915870416">"Nooit time-out"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"onmiddellijk"</item>

--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -47,6 +47,7 @@
     <item msgid="7489864775127957179">"5 min"</item>
     <item msgid="2314124409517439288">"10 min"</item>
     <item msgid="6864027152847611413">"30 min"</item>
+    <item msgid="1781492122915870416">"Nigdy nie wygaszaj"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"natychmiast"</item>

--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -47,6 +47,7 @@
     <item msgid="7489864775127957179">"5 minutos"</item>
     <item msgid="2314124409517439288">"10 minutos"</item>
     <item msgid="6864027152847611413">"30 minutos"</item>
+    <item msgid="1781492122915870416">"Nunca esgotar tempo"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"imediatamente"</item>

--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -47,6 +47,7 @@
     <item msgid="7489864775127957179">"5 minutos"</item>
     <item msgid="2314124409517439288">"10 minutos"</item>
     <item msgid="6864027152847611413">"30 minutos"</item>
+    <item msgid="1781492122915870416">"Nunca esgotar o tempo limite"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"imediatamente"</item>

--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -47,6 +47,7 @@
     <item msgid="7489864775127957179">"5 minute"</item>
     <item msgid="2314124409517439288">"10 minute"</item>
     <item msgid="6864027152847611413">"30 de minute"</item>
+    <item msgid="1781492122915870416">"niciodată timeout"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"imediat"</item>

--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -47,6 +47,7 @@
     <item msgid="7489864775127957179">"5 минут"</item>
     <item msgid="2314124409517439288">"10 мин"</item>
     <item msgid="6864027152847611413">"30 мин"</item>
+    <item msgid="1781492122915870416">"Не отключать"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"немедленно"</item>

--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -47,6 +47,7 @@
     <item msgid="7489864775127957179">"5 minút"</item>
     <item msgid="2314124409517439288">"10 minút"</item>
     <item msgid="6864027152847611413">"30 minút"</item>
+    <item msgid="1781492122915870416">"nikdy timeout"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"okamžite"</item>

--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -47,6 +47,7 @@
     <item msgid="7489864775127957179">"5 minut"</item>
     <item msgid="2314124409517439288">"10 minut"</item>
     <item msgid="6864027152847611413">"30 minut"</item>
+    <item msgid="1781492122915870416">"nikoli timeout"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"takoj"</item>

--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml
@@ -47,6 +47,7 @@
     <item msgid="7489864775127957179">"5 минута"</item>
     <item msgid="2314124409517439288">"10 минута"</item>
     <item msgid="6864027152847611413">"30 минута"</item>
+    <item msgid="1781492122915870416">"Никада Тимеоут"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"одмах"</item>

--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -47,6 +47,7 @@
     <item msgid="7489864775127957179">"5 minuter"</item>
     <item msgid="2314124409517439288">"10 minuter"</item>
     <item msgid="6864027152847611413">"30 minuter"</item>
+    <item msgid="1781492122915870416">"Ingen tidsgräns"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"omedelbart"</item>

--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -47,6 +47,7 @@
     <item msgid="7489864775127957179">"5 นาที"</item>
     <item msgid="2314124409517439288">"10 นาที"</item>
     <item msgid="6864027152847611413">"30 นาที"</item>
+    <item msgid="1781492122915870416">"ไม่เคยหมดเวลา"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"ทันที"</item>

--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml
@@ -47,6 +47,7 @@
     <item msgid="7489864775127957179">"5 minuto"</item>
     <item msgid="2314124409517439288">"10 minuto"</item>
     <item msgid="6864027152847611413">"30 minuto"</item>
+    <item msgid="1781492122915870416">"hindi kailanman Timeout"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"agad"</item>

--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -47,6 +47,7 @@
     <item msgid="7489864775127957179">"5 dakika"</item>
     <item msgid="2314124409517439288">"10 dakika"</item>
     <item msgid="6864027152847611413">"30 dakika"</item>
+    <item msgid="1781492122915870416">"Asla zaman aşımına uğrama"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"derhal"</item>

--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -47,6 +47,7 @@
     <item msgid="7489864775127957179">"5 хвилин"</item>
     <item msgid="2314124409517439288">"10 хвилин"</item>
     <item msgid="6864027152847611413">"30 хвилин"</item>
+    <item msgid="1781492122915870416">"ніколи не вийшло"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"відразу"</item>

--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -47,6 +47,7 @@
     <item msgid="7489864775127957179">"5 phút"</item>
     <item msgid="2314124409517439288">"10 phút"</item>
     <item msgid="6864027152847611413">"30 phút"</item>
+    <item msgid="1781492122915870416">"không bao giờ Timeout"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"ngay lập tức"</item>

--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -47,6 +47,7 @@
     <item msgid="7489864775127957179">"5 分钟"</item>
     <item msgid="2314124409517439288">"10 分钟"</item>
     <item msgid="6864027152847611413">"30 分钟"</item>
+    <item msgid="1781492122915870416">"从不待机"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"无延迟"</item>

--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -47,6 +47,7 @@
     <item msgid="7489864775127957179">"5 分鐘"</item>
     <item msgid="2314124409517439288">"10 分鐘"</item>
     <item msgid="6864027152847611413">"30 分鐘"</item>
+    <item msgid="1781492122915870416">"從不逾時"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"立即"</item>

--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -81,6 +81,7 @@
         <item>5 minutes</item>
         <item>10 minutes</item>
         <item>30 minutes</item>
+        <item>Never Timeout</item>
     </string-array>
 
     <!-- Do not translate. -->
@@ -99,6 +100,8 @@
         <item>600000</item>
         <!-- Do not translate. -->
         <item>1800000</item>
+        <!-- Do not translate. -->
+        <item>-1</item>
     </string-array>
     
     <!-- Security settings.  The delay after screen is turned off until device locks.