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

Commit 43cdd51e authored by Xin Li's avatar Xin Li
Browse files

Merge 25Q1 (ab/BP1A.250305.020) to aosp-main-future 

Bug: 385190204
Merged-In: Id2a452e29218f9625d32a081ec8f0cf8508d2a0b
Change-Id: I7f313eb76eb8d8e59477f7bda550a412468263f8
parents 5513c3e2 7708fc82

res/values-af/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ 
    <string name="profile_quiet_mode_error_title" msgid="7126962749634841843">"<xliff:g id="PROFILE">%1$s</xliff:g> apps word gepouseer"</string>

    <string name="profile_quiet_mode_button" msgid="6791235010992920102">"Skakel <xliff:g id="PROFILE">%1$s</xliff:g> apps aan"</string>

    <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Kan nie werklêers kies nie"</string>

    <string name="cant_select_work_files_error_message" msgid="683480676150690641">"Jou IT-administrateur laat jou nie toe om van \'n persoonlike program af by werklêers in te gaan nie"</string>

    <string name="cant_select_work_files_error_message" msgid="683480676150690641">"Jou IT-administrateur laat jou nie toe om van \'n persoonlike app af by werklêers in te gaan nie"</string>

    <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Kan nie persoonlike lêers kies nie"</string>

    <string name="cant_select_personal_files_error_message" msgid="4105905035459118209">"Jou IT-administrateur laat jou nie toe om van \'n werkprogram af by persoonlike lêers in te gaan nie"</string>

    <string name="cant_select_cross_profile_files_error_title" msgid="17010948874969413">"Kan nie <xliff:g id="PROFILE">%1$s</xliff:g> lêers kies nie"</string>
@@ -286,7 +286,7 @@ 
    <string name="personal_tab" msgid="3878576287868528503">"Persoonlik"</string>

    <string name="work_tab" msgid="7265359366883747413">"Werk"</string>

    <string name="a11y_work" msgid="7504431382825242153">"Werk"</string>

    <string name="drag_from_another_app" msgid="8310249276199969905">"Jy kan nie lêers uit \'n ander program skuif nie."</string>

    <string name="drag_from_another_app" msgid="8310249276199969905">"Jy kan nie lêers uit \'n ander app skuif nie."</string>

    <string name="grid_mode_showing" msgid="2803166871485028508">"Wys tans in roostermodus."</string>

    <string name="list_mode_showing" msgid="1225413902295895166">"Wys tans in lysmodus."</string>

</resources>

res/values-iw/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ 
      <item quantity="two">לא ניתן היה למחוק <xliff:g id="COUNT_1">%1$d</xliff:g> פריטים</item>

      <item quantity="other">לא ניתן היה למחוק <xliff:g id="COUNT_1">%1$d</xliff:g> פריטים</item>

    </plurals>

    <string name="notification_touch_for_details" msgid="2385563502445129570">"יש להקיש להצגת הפרטים"</string>

    <string name="notification_touch_for_details" msgid="2385563502445129570">"יש ללחוץ להצגת הפרטים"</string>

    <string name="close" msgid="905969391788869975">"סגירה"</string>

    <plurals name="copy_failure_alert_content" formatted="false" msgid="5570549471912990536">

      <item quantity="one">הקבצים הבאים לא הועתקו: <xliff:g id="LIST_1">%1$s</xliff:g></item>

res/values-mk/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ 
    <string name="name_conflict" msgid="28407269328862986">"Датотека со истото име веќе постои."</string>

    <string name="authentication_required" msgid="8030880723643436099">"За да го прегледате адресаров, најавете се на <xliff:g id="NAME">%1$s</xliff:g>"</string>

    <string name="cant_display_content" msgid="8633226333229417237">"Не може да се прикаже содржината"</string>

    <string name="sign_in" msgid="6253762676723505592">"Најави се"</string>

    <string name="sign_in" msgid="6253762676723505592">"Најавете се"</string>

    <string name="new_archive_file_name" msgid="1604650338077249838">"архива<xliff:g id="EXTENSION">%s</xliff:g>"</string>

    <string name="overwrite_file_confirmation_message" msgid="2496109652768222716">"Да се презапише <xliff:g id="NAME">%1$s</xliff:g>?"</string>

    <string name="continue_in_background" msgid="1974214559047793331">"Продолжи во заднина"</string>