Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16fdabbc authored by Eric Fischer's avatar Eric Fischer Committed by Android Git Automerger
Browse files

Merge branch 'ics-aah-exp' of ssh://android-git:29418/platform/frameworks/base into ics-aah-exp

parents 8806d5c9 69cd3c39
Loading
Loading
Loading
Loading
+5 −10
Original line number Diff line number Diff line
@@ -26,8 +26,7 @@
    <string name="gigabyteShort" msgid="3259882455212193214">"GB"</string>
    <string name="terabyteShort" msgid="231613018159186962">"TB"</string>
    <string name="petabyteShort" msgid="5637816680144990219">"PB"</string>
    <!-- no translation found for fileSizeSuffix (9164292791500531949) -->
    <skip />
    <string name="fileSizeSuffix" msgid="9164292791500531949">"<xliff:g id="NUMBER">%1$s</xliff:g><xliff:g id="UNIT">%2$s</xliff:g>"</string>
    <string name="untitled" msgid="6071602020171759109">"&lt;tidak bertajuk&gt;"</string>
    <string name="ellipsis" msgid="7899829516048813237">"..."</string>
    <string name="ellipsis_two_dots" msgid="1228078994866030736">"‥"</string>
@@ -667,8 +666,7 @@
    <string name="lockscreen_password_wrong" msgid="6237443657358168819">"Maaf, cuba lagi"</string>
    <string name="lockscreen_plugged_in" msgid="8057762828355572315">"Mengecas, (<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>)"</string>
    <string name="lockscreen_charged" msgid="4938930459620989972">"Sudah dicas."</string>
    <!-- no translation found for lockscreen_battery_short (4477264849386850266) -->
    <skip />
    <string name="lockscreen_battery_short" msgid="4477264849386850266">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
    <string name="lockscreen_low_battery" msgid="1482873981919249740">"Sambungkan pengecas anda."</string>
    <string name="lockscreen_missing_sim_message_short" msgid="7381499217732227295">"Tiada kad SIM."</string>
    <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Tiada kad SIM dalam tablet."</string>
@@ -717,10 +715,8 @@
    <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string>
    <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string>
    <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string>
    <!-- no translation found for hour_ampm (4584338083529355982) -->
    <skip />
    <!-- no translation found for hour_cap_ampm (2083465992940444366) -->
    <skip />
    <string name="hour_ampm" msgid="4584338083529355982">"<xliff:g id="HOUR">%-l</xliff:g><xliff:g id="AMPM">%P</xliff:g>"</string>
    <string name="hour_cap_ampm" msgid="2083465992940444366">"<xliff:g id="HOUR">%-l</xliff:g><xliff:g id="AMPM">%p</xliff:g>"</string>
    <string name="factorytest_failed" msgid="5410270329114212041">"Ujian kilang gagal"</string>
    <string name="factorytest_not_system" msgid="4435201656767276723">"Tindakan FACTORY_TEST hanya disokong untuk pakej yang dipasangkan dalam /system/app."</string>
    <string name="factorytest_no_action" msgid="872991874799998561">"Tiada pakej yang menyediakan tindakan FACTORY_TEST ditemui."</string>
@@ -732,8 +728,7 @@
    <string name="double_tap_toast" msgid="1068216937244567247">"Petua: ketik dua kali untuk mengezum masuk dan keluar."</string>
    <string name="autofill_this_form" msgid="1272247532604569872">"AutoIsi"</string>
    <string name="setup_autofill" msgid="8154593408885654044">"Sediakan AutoIsi"</string>
    <!-- no translation found for autofill_address_name_separator (6350145154779706772) -->
    <skip />
    <string name="autofill_address_name_separator" msgid="6350145154779706772">" "</string>
    <string name="autofill_address_summary_name_format" msgid="3268041054899214945">"$1$2$3"</string>
    <string name="autofill_address_summary_separator" msgid="7483307893170324129">", "</string>
    <string name="autofill_address_summary_format" msgid="4874459455786827344">"$1$2$3"</string>