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

Commit 54781990 authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

Merge branch 'master' of... 

Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base
parents b5bb02cd ec85c9bb

packages/PrintSpooler/res/values-km-rKH/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ 
  </plurals>

    <string name="cancel" msgid="4373674107267141885">"បោះបង់"</string>

    <string name="restart" msgid="2472034227037808749">"ចាប់ផ្ដើម​ឡើងវិញ"</string>

    <string name="no_connection_to_printer" msgid="2159246915977282728">"គ្មាន​​​ការ​ភ្ជាប់​ទៅ​ម៉ាស៊ីន​បោះពុម្ព​"</string>

    <string name="no_connection_to_printer" msgid="2159246915977282728">"គ្មាន​​​ការ​ភ្ជាប់​ទៅ​ម៉ាស៊ីន​បោះពុម្ព"</string>

    <string name="reason_unknown" msgid="5507940196503246139">"មិន​ស្គាល់"</string>

    <string name="printer_unavailable" msgid="2434170617003315690">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> – មិន​អាច​ប្រើ​បាន"</string>

  <string-array name="color_mode_labels">

packages/PrintSpooler/res/values-my-rMM/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -43,8 +43,8 @@ 
    <string name="collapse_handle" msgid="6886637989442507451">"ခေါက်ရန် လက်"</string>

    <string name="print_button" msgid="645164566271246268">"စာထုတ်ရန်"</string>

    <string name="savetopdf_button" msgid="2976186791686924743">"PDF သို့ သိမ်းဆည်းခဲ့"</string>

    <string name="print_options_expanded" msgid="6944679157471691859">"ပရင့်ထုတ် ရွေးစရာများကို ချဲ့ထား"</string>

    <string name="print_options_collapsed" msgid="7455930445670414332">"ပရင့်ထုတ် ရွေးစရာများကို ခေါက်ထား"</string>

    <string name="print_options_expanded" msgid="6944679157471691859">"ပရင့်ထုတ် ရွေးစရာများကို ချဲ့ထား"</string>

    <string name="print_options_collapsed" msgid="7455930445670414332">"ပရင့်ထုတ် ရွေးစရာများကို ခေါက်ထား"</string>

    <string name="search" msgid="5421724265322228497">"ရှာဖွေခြင်း"</string>

    <string name="all_printers_label" msgid="3178848870161526399">"စာထုတ်စက် အားလုံး"</string>

    <string name="add_print_service_label" msgid="5356702546188981940">"ဆားဗစ် အသစ်ထည့်ရန်"</string>
@@ -85,5 +85,5 @@ 
    <string name="print_error_default_message" msgid="8602678405502922346">"ဆော်ရီး၊ အဲဒါ အလုပ်မဖြစ်ခဲ့ပါ။ ထပ် စမ်းပါ။"</string>

    <string name="print_error_retry" msgid="1426421728784259538">"ထပ်စမ်း"</string>

    <string name="print_error_printer_unavailable" msgid="8985614415253203381">"ဒီပရင်တာမှာ ယခုအချိန်မှာ မရနိုင်ပါ။"</string>

    <string name="print_preparing_preview" msgid="3939930735671364712">"အစမ်းကြည့်ရန် ပြင်ဆင်နေ…"</string>

    <string name="print_preparing_preview" msgid="3939930735671364712">"အစမ်းကြည့်ရန် ပြင်ဆင်နေ…"</string>

</resources>