diff options
author | Paul Westbrook <pwestbro@google.com> | 2014-11-02 20:47:24 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-02 20:47:24 +0000 |
commit | 19c35f5f574a1ccf1447c17d55cb1828d09ab140 (patch) | |
tree | e2c58211da8cb61625eb37c4bffa279dd7f4b4ab | |
parent | 2ca250a9b7cdf835bb86dd8e926d71e23c6a1f37 (diff) | |
parent | 1c0662f998ab83976e5eba544d366876e28e8968 (diff) | |
download | android_packages_apps_Email-19c35f5f574a1ccf1447c17d55cb1828d09ab140.tar.gz android_packages_apps_Email-19c35f5f574a1ccf1447c17d55cb1828d09ab140.tar.bz2 android_packages_apps_Email-19c35f5f574a1ccf1447c17d55cb1828d09ab140.zip |
am 1c0662f9: fix bad merge
* commit '1c0662f998ab83976e5eba544d366876e28e8968':
fix bad merge
-rw-r--r-- | res/values-km-rKH/strings.xml | 16 | ||||
-rw-r--r-- | res/values-lo-rLA/strings.xml | 6 |
2 files changed, 0 insertions, 22 deletions
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml index e96f0eb7e..05cb31a43 100644 --- a/res/values-km-rKH/strings.xml +++ b/res/values-km-rKH/strings.xml @@ -253,15 +253,6 @@ <string name="system_account_create_failed" msgid="2248313263003927725">"មិនអាចបង្កើតគណនី។ សូមព្យាយាមម្ដងទៀត។"</string> <string name="device_admin_label" msgid="3335272972461391415">"អ៊ីមែល"</string> <string name="device_admin_description" msgid="4299378570982520839">"បើកគោលនយោបាយសុវត្ថិភាពម៉ាស៊ីនមេដែលបានបញ្ជាក់"</string> -<<<<<<< HEAD - <string name="settings_activity_title" msgid="4787565736829092053">"កំណត់"</string> - <string name="header_label_general_preferences" msgid="2924944721204930254">"ការកំណត់ទូទៅ"</string> - <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"បញ្ជាក់មុនពេលលុប"</string> - <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"បញ្ជាក់មុនពេលផ្ញើ"</string> - <string name="more_than_999" msgid="4088200269333058889">"999+"</string> - <string name="search_hint" msgid="3491349343647799436">"ស្វែងរកអ៊ីមែល"</string> -======= ->>>>>>> 19809304 <string name="policy_dont_allow_camera" msgid="8821533827628900689">"មិនអនុញ្ញាតឲ្យប្រើម៉ាស៊ីនថតរបស់ឧបករណ៍"</string> <string name="policy_require_password" msgid="3556860917024612396">"ត្រូវការពាក្យសម្ងាត់ឧបករណ៍"</string> <string name="policy_password_history" msgid="9001177390979112746">"ដាក់កម្រិតប្រើពាក្យសម្ងាត់ថ្មីៗឡើងវិញ"</string> @@ -275,15 +266,8 @@ <string name="quick_4" msgid="216066940197616025">"រៀបចំកិច្ចប្រជុំ ដើម្បីពិភាក្សារឿងនេះ។"</string> <string name="require_manual_sync_message" msgid="7361932179783481686">"បានបិទការធ្វើសមកាលកម្មផ្ទៃខាងក្រោយសម្រាប់គណនីនេះខណៈពេលនៅក្រៅប្រទេស។"</string> <string name="confirm_response" msgid="6764021931370809514">"កំពុងផ្ញើការឆ្លើយតប..."</string> -<<<<<<< HEAD - <string name="no_conversations" msgid="3785854971159919343">"គ្មានសារ។"</string> - <string name="imap_name" msgid="1267915719183915252">"IMAP"</string> - <string name="pop3_name" msgid="1235910677527117862">"POP3"</string> - <string name="folder_picker_title" msgid="5906275472176731605">"កម្មវិធីជ្រើសថត"</string> -======= <string name="imap_name" msgid="8285222985908214985">"ផ្ទាល់ខ្លួន (IMAP)"</string> <string name="pop3_name" msgid="6653484706414263493">"ផ្ទាល់ខ្លួន (POP3)"</string> ->>>>>>> 19809304 <string name="trash_folder_selection_title" msgid="686039558899469073">"ជ្រើសថតធុងសំរាមម៉ាស៊ីនមេសម្រាប់ <xliff:g id="ACCOUNT">%s</xliff:g>"</string> <string name="sent_folder_selection_title" msgid="9207482909822072856">"ជ្រើសថតធាតុបានផ្ញើដោយម៉ាស៊ីនមេសម្រាប់ <xliff:g id="ACCOUNT">%s</xliff:g>"</string> <string name="account_waiting_for_folders_msg" msgid="8848194305692897677">"កំពុងផ្ទុកបញ្ជីថត ..."</string> diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml index 22294bb38..95dd6dd9d 100644 --- a/res/values-lo-rLA/strings.xml +++ b/res/values-lo-rLA/strings.xml @@ -252,13 +252,7 @@ <string name="mailbox_settings_activity_title_with_mailbox" msgid="5547676392298186906">"ຕົວເລືອກການຊິ້ງຂໍ້ມູນ (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string> <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"ຊິ້ງຂໍ້ມູນໂຟນເດີນີ້"</string> <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"ຂໍ້ຄວາມທັງໝົດຈະຖືກດາວໂຫລດເມື່ອມີການເຊື່ອມຕໍ່ອິນເຕີເນັດ"</string> -<<<<<<< HEAD - <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"ຈຳນວນມື້ຂອງເມວທີ່ຕ້ອງຊິ້ງຂໍ້ມູນ"</string> - <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"ຮູບຜູ່ສົ່ງ"</string> - <string name="provider_note_live" msgid="4289035326060391547">"ມີແຕ່ບາງບັນຊີ \"Plus\" ທີ່ມີການເຂົ້າເຖິງ POP ທີ່ອະນຸຍາດໃຫ້ໂປຣແກຣມນີ້ເຊື່ອມຕໍ່. ຫາກທ່ານບໍ່ສາມາດເຂົ້າສູ່ລະບົບດ້ວຍທີ່ຢູ່ອີເມວ ແລະລະຫັດຜ່ານທີ່ຖືກຕ້ອງໄດ້, ໝາຍຄວາມວ່າທ່ານອາດບໍ່ມີບັນຊີ \"Plus\" ແບບເສຍເງິນ. ໃຫ້ເປີດໂປຣແກຣມທ່ອງເວັບເພື່ອເຂົ້າເຖິງບັນຊີອີເມວເຫຼົ່ານີ້."</string> -======= <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"ຈຳນວນມື້ຂອງອີເມວທີ່ຕ້ອງການຊິ້ງຂໍ້ມູນ"</string> ->>>>>>> 19809304 <string name="provider_note_t_online" msgid="1596701148051980218">"ກ່ອນທີ່ຈະຕິດຕັ້ງບັນຊີອີເມວ, ໃຫ້ເຂົ້າຊົມເວັບໄຊ T-Online ແລະ ສ້າງລະຫັດຜ່ານສຳລັບການເຂົ້າເຖິງອີເມວ POP3 ກ່ອນ."</string> <string name="exchange_name" msgid="3793803477985438102">"ອົງກອນ"</string> <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string> |