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

Unverified Commit 9ac5f82d authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-15.0.0_r6' into staging/lineage-22.0_merge-android-15.0.0_r6 

Android 15.0.0 Release 6 (AP4A.241205.013)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ1IssgAKCRDorT+BmrEO
# eGpNAJ9YzB31hY+Fkng6t2P18xhS+MxUpACeIr356Z5imgBxiriH0rXVZ6U+0o0=
# =80JQ
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri Dec  6 00:44:02 2024 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 2469 signatures in the past
#      3 years.  Encrypted 4 messages in the past 2 years.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381  0964 E8AD 3F81 9AB1 0E78

# By Bill Yi
# Via Automerger Merge Worker (26) and others
* tag 'android-15.0.0_r6':
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE

Change-Id: I4bb0cb5c234ebc6e833ad2424caa0882ebbbb6b2
parents b4597b4f 0d4d67ae

res/values-be/strings.xml

+4 −4
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ 
    <string name="menu_addContactsToGroup" msgid="4549318978482280577">"Дадаць кантакты"</string>

    <string name="menu_removeFromGroup" msgid="8753799091967887958">"Выдаліць з меткі"</string>

    <string name="menu_new_group_action_bar" msgid="1670312283925872483">"Стварыць метку"</string>

    <string name="splitConfirmation" msgid="4750158900636307469">"Раз\'яднаць гэты кантакт на некалькі кантактаў?"</string>

    <string name="splitConfirmation_positive_button" msgid="3109235536045409854">"Раз\'яднаць"</string>

    <string name="splitConfirmation" msgid="4750158900636307469">"Раз’яднаць гэты кантакт на некалькі кантактаў?"</string>

    <string name="splitConfirmation_positive_button" msgid="3109235536045409854">"Раз’яднаць"</string>

    <string name="splitConfirmationWithPendingChanges" msgid="8617395780141069527">"Жадаеце захаваць змяненні, якія вы ўжо зрабілі, і развязаць гэты кантакт на некалькі кантактаў?"</string>

    <string name="splitConfirmationWithPendingChanges_positive_button" msgid="131293000921403021">"Захаваць і развязаць"</string>

    <string name="joinConfirmation" msgid="1245184431169363397">"Жадаеце захаваць змяненні, якія вы ўжо зрабілі, і спасылку на выбраны кантакт?"</string>
@@ -96,7 +96,7 @@ 
    <string name="emptyMainList" msgid="3266182207039677163">"Ваш спіс кантактаў пусты"</string>

    <string name="contactSavedNamedToast" msgid="3067050290584834386">"Кантакт <xliff:g id="DISPLAY_NAME">%s</xliff:g> захаваны"</string>

    <string name="contactSavedToast" msgid="4370392215196995301">"Кантакт захаваны"</string>

    <string name="contactUnlinkedToast" msgid="6791720274141804377">"Кантакты раз\'яднаны"</string>

    <string name="contactUnlinkedToast" msgid="6791720274141804377">"Кантакты раз’яднаны"</string>

    <string name="contactSavedErrorToast" msgid="3213619905154956918">"Не ўдалося захаваць змены кантакту"</string>

    <string name="contactUnlinkErrorToast" msgid="7289356996668886841">"Не ўдалося скасаваць сувязь з кантактам"</string>

    <string name="contactJoinErrorToast" msgid="1222155997933362787">"Не ўдалося звязаць кантакт"</string>
@@ -466,7 +466,7 @@ 
    <string name="account_filter_view_not_checked" msgid="5782705545786455847">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> - не пазначана"</string>

    <string name="description_search_video_call" msgid="1768558141309418755">"Пачаць відэавыклік"</string>

    <string name="description_delete_contact" msgid="8110643050235441400">"Выдаліць"</string>

    <string name="description_no_name_header" msgid="8596201864512339003">"Шматкроп\'е"</string>

    <string name="description_no_name_header" msgid="8596201864512339003">"Шматкроп’е"</string>

    <string name="dynamic_shortcut_disabled_message" msgid="8770462908102469878">"Гэта спалучэнне клавіш было адключана"</string>

    <string name="dynamic_shortcut_contact_removed_message" msgid="8331735243566193974">"Кантакт быў выдалены"</string>

    <string name="sim_import_button_text" msgid="2845608246304396009">"Імпартаваць"</string>

res/values-de/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -428,7 +428,7 @@ 
    <string name="settings_my_info_title" msgid="6236848378653551341">"Meine Daten"</string>

    <string name="set_up_profile" msgid="3554999219868611431">"Profil einrichten"</string>

    <string name="setting_about" msgid="2941859292287597555">"Über \"Kontakte\""</string>

    <string name="share_favorite_contacts" msgid="8208444020721686178">"Lieblingskontakte teilen"</string>

    <string name="share_favorite_contacts" msgid="8208444020721686178">"Bevorzugte Kontakte teilen"</string>

    <string name="share_contacts" msgid="2377773269568609796">"Alle Kontakte teilen"</string>

    <string name="share_contacts_failure" msgid="1348777470180064086">"Kontakte konnten nicht geteilt werden."</string>

    <string name="dialog_export" msgid="3497435010655060068">"Kontakte exportieren"</string>

res/values-gu/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
    <string name="shortcut_add_contact" msgid="7949342235528657981">"સંપર્ક ઉમેરો"</string>

    <string name="shortcutContact" msgid="8009736387364461511">"સંપર્ક"</string>

    <string name="shortcutDialContact" msgid="155367248069127153">"સીધું જ ડાયલ"</string>

    <string name="shortcutMessageContact" msgid="9123517151981679277">"સીધો જ સંદેશ"</string>

    <string name="shortcutMessageContact" msgid="9123517151981679277">"ડિરેક્ટ મેસેજ"</string>

    <string name="shortcutActivityTitle" msgid="5407832911005090417">"સંપર્ક પસંદ કરો"</string>

    <string name="contactInsertOrEditActivityTitle" msgid="1788154962629911262">"સંપર્કમાં ઉમેરો"</string>

    <string name="contactPickerActivityTitle" msgid="1842634991247618890">"સંપર્ક પસંદ કરો"</string>
@@ -114,7 +114,7 @@ 
    <string name="groupSomeContactsNoEmailsToast" msgid="2142963883699535155">"કેટલાક સંપર્કોની પાસે ઇમેઇલ્સ નથી."</string>

    <string name="groupSomeContactsNoPhonesToast" msgid="2454029254458875746">"કેટલાક સંપર્કોની પાસે ફોન નંબર્સ નથી."</string>

    <string name="menu_sendEmailOption" msgid="8600335923636486825">"ઇમેઇલ મોકલો"</string>

    <string name="menu_sendMessageOption" msgid="8051852013078110910">"સંદેશ મોકલો"</string>

    <string name="menu_sendMessageOption" msgid="8051852013078110910">"મેસેજ મોકલો"</string>

    <string name="pickerSelectContactsActivityTitle" msgid="8265907544009447967">"સંપર્કો પસંદ કરો"</string>

    <string name="send_to_selection" msgid="3655197947726443720">"મોકલો"</string>

    <string name="listFoundAllContactsZero" msgid="1933842282916988563">"સંપર્કો નથી"</string>
@@ -273,7 +273,7 @@ 
    <string name="sms_work_pager" msgid="8827367747655005608">"કાર્યાલયના પેજર પર ટેક્સ્ટ કરો"</string>

    <string name="sms_assistant" msgid="245045451580096547">"<xliff:g id="ASSISTANT">%s</xliff:g> ને ટેક્સ્ટ કરો"</string>

    <string name="sms_mms" msgid="7395133080765833725">"MMS પર ટેક્સ્ટ કરો"</string>

    <string name="sms_by_shortcut" msgid="4682340916268521006">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (સંદેશ મોકલો)"</string>

    <string name="sms_by_shortcut" msgid="4682340916268521006">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (મેસેજ મોકલો)"</string>

    <string name="description_video_call" msgid="4956825008907720371">"વિડિઓ કૉલ કરો"</string>

    <string name="clearFrequentsConfirmation_title" msgid="9194415661170740437">"વારંવાર સંપર્ક કરેલા સાફ કરીએ?"</string>

    <string name="clearFrequentsConfirmation" msgid="2120741757522063938">"તમે સંપર્કો અને ફોન ઍપ્લિકેશનોમાં વારંવાર સંપર્ક કરેલ સૂચિને સાફ કરશો અને ઇમેઇલ ઍપ્લિકેશનોને તમારી સંબોધન પસંદગીઓને શરૂઆતથી જાણવા માટે ફરજ પાડશો."</string>

res/values-is/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -481,7 +481,7 @@ 
    <string name="dismiss_sync_alert" msgid="4057176963960104786">"Hunsa"</string>

    <string name="account_sync_off" msgid="6187683798342006021">"Slökkt er á samstillingu reiknings. Ýttu til að kveikja á henni."</string>

    <string name="turn_auto_sync_on_dialog_title" msgid="3812155064863594938">"Kveikja á sjálfvirkri samstillingu?"</string>

    <string name="turn_auto_sync_on_dialog_body" msgid="5386810641905184682">"Breytingar sem þú gerir á öllum forritum og reikningum, ekki bara Google tengiliðum, verða uppfærðar á netinu og í tækjunum þínum."</string>

    <string name="turn_auto_sync_on_dialog_body" msgid="5386810641905184682">"Breytingar sem þú gerir á öllum forritum og reikningum, ekki bara Google-tengiliðum, verða uppfærðar á netinu og í tækjunum þínum."</string>

    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="5575717918836806519">"Kveikja"</string>

    <string name="connection_error_message" msgid="7446131881946138093">"Engin tenging"</string>

    <string name="single_sim_display_label" msgid="264062966309455515">"SIM"</string>

res/values-km/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ 
    <string name="menu_add_contact" msgid="5822356185421997656">"បញ្ចូល​ទៅក្នុងទំនាក់ទំនង"</string>

    <string name="menu_add_contacts" msgid="7114262784903366463">"បន្ថែម"</string>

    <string name="title_share_via" msgid="3300082736229182956">"{count,plural, =1{ចែលរំលែក​ទំនាក់ទំនង​តាមរយៈ}other{ចែលរំលែក​ទំនាក់ទំនង​តាមរយៈ}}"</string>

    <string name="dialog_new_group_account" msgid="4326402875327788728">"ជ្រើសគណនី"</string>

    <string name="dialog_new_group_account" msgid="4326402875327788728">"ជ្រើសរើសគណនី"</string>

    <string name="group_name_dialog_insert_title" msgid="5495572488613178283">"បង្កើតស្លាក"</string>

    <string name="group_name_dialog_update_title" msgid="3955919589366745101">"ប្ដូរឈ្មោះស្លាក"</string>

    <string name="group_name_dialog_hint" msgid="6023999218213062973">"ឈ្មោះស្លាក"</string>