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

Commit a0e971df authored by Geoff Mendal's avatar Geoff Mendal Committed by Android (Google) Code Review
Browse files

Merge "Probably broke the build."

parents 3e9d0a8d ba0acb7d

res/values-af/arrays.xml

+0 −1
Original line number Diff line number Diff line
@@ -196,7 +196,6 @@ 
  <string-array name="wifi_proxy_settings">

    <item msgid="4473276491748503377">"Geen"</item>

    <item msgid="8673874894887358090">"Handmatig"</item>

    <item msgid="168893341855953140">"Instaan-outo-opstelling"</item>

  </string-array>

  <string-array name="emergency_tone_entries">

    <item msgid="5165439859689033665">"Af"</item>

res/values-af/strings.xml

+39 −25
Original line number Diff line number Diff line
@@ -90,9 +90,9 @@ 
    <string name="battery_info_screen_on" msgid="376277447175613889">"Skerm AAN tyd:"</string>

    <string name="battery_info_status_unknown" msgid="196130600938058547">"Onbekend"</string>

    <string name="battery_info_status_charging" msgid="1705179948350365604">"Laai"</string>

    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"Laai tans op WS"</string>

    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"Laai tans oor USB"</string>

    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"Laai tans draadloos"</string>

    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>

    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>

    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(draadloos)"</string>

    <string name="battery_info_status_discharging" msgid="310932812698268588">"Laai nie"</string>

    <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Laai nie"</string>

    <string name="battery_info_status_full" msgid="2824614753861462808">"Vol"</string>
@@ -203,7 +203,7 @@ 
    <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Die poortveld moet leeg wees as die gasheerveld leeg is."</string>

    <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Die poort wat jy ingevoer het, is nie geldig nie."</string>

    <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Die HTTP-instaanbediener word deur die blaaier gebruik, maar kan nie deur die ander programme gebruik word nie."</string>

    <string name="proxy_url_title" msgid="7185282894936042359">"PAC-URL: "</string>

    <string name="proxy_url" msgid="2523518669129974654">"PAC-URL: "</string>

    <string name="radio_info_signal_location_label" msgid="16475158265551708">"Ligging:"</string>

    <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Naburige CID:"</string>

    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Selinligting:"</string>
@@ -317,6 +317,7 @@ 
    <string name="owner_info_settings_title" msgid="2723190010708381889">"Eienaar se inligting"</string>

    <string name="security_enable_widgets_title" msgid="2754833397070967846">"Aktiveer legstukke"</string>

    <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Gedeaktiveer deur administrateur"</string>

    <string name="nfc_unlock_title" msgid="8827035651970841825">"NFC-ontsluit"</string>

    <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>

    <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Voer teks in om op die sluitskerm te wys"</string>

    <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Wys gebruikerinligting op sluitskerm"</string>
@@ -569,7 +570,8 @@ 
    <string name="wifi_menu_connect" msgid="4996220309848349408">"Koppel aan netwerk"</string>

    <string name="wifi_menu_forget" msgid="8736964302477327114">"Vergeet netwerk"</string>

    <string name="wifi_menu_modify" msgid="2068554918652440105">"Wysig netwerk"</string>

    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Skryf na NFC-merker"</string>

    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->

    <skip />

    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Om beskikbare netwerke te sien, skakel Wi-Fi aan."</string>

    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Soek tans vir Wi-Fi-netwerke…"</string>

    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Jy het nie toestemming om die Wi-Fi-netwerk te verander nie."</string>
@@ -618,7 +620,8 @@ 
    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS beskikbaar)"</string>

    <string name="wifi_secured_first_item" msgid="4072076186051083451">"Beveilig met <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>

    <string name="wifi_secured_second_item" msgid="1326000076939056265">", beveilig met <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>

    <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Voer jou netwerkwagwoord in"</string>

    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->

    <skip />

    <string name="wifi_security_none" msgid="7985461072596594400">"Geen"</string>

    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Om liggingsakkuraatheid te verbeter en vir ander doele, wil <xliff:g id="APP_NAME">%1$s</xliff:g> netwerkskandering aanskakel, selfs wanneer Wi-Fi af is.\n\n Laat dit toe vir alle programme wat wil skandeer?"</string>

    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Laat toe"</string>
@@ -735,10 +738,13 @@ 
    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Verwissel outomaties van oriëntasie wanneer foon draai"</string>

    <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Wissel oriëntasie outomaties wanneer tablet gedraai word"</string>

    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Verwissel outomaties van oriëntasie wanneer foon draai"</string>

    <string name="brightness" msgid="8480105032417444275">"Helderheidsvlak"</string>

    <!-- no translation found for brightness (8480105032417444275) -->

    <skip />

    <string name="brightness_summary" msgid="838917350127550703">"Verstel die helderheid van die skerm"</string>

    <string name="auto_brightness_title" msgid="6341042882350279391">"Aanpasbare helderheid"</string>

    <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimaliseer helderheidsvlak vir die beskikbare lig"</string>

    <!-- no translation found for auto_brightness_title (6341042882350279391) -->

    <skip />

    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->

    <skip />

    <string name="screen_timeout" msgid="4351334843529712571">"Slaap"</string>

    <string name="screen_timeout_summary" msgid="327761329263064327">"Na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> se onaktiwiteit"</string>

    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Muurpapier"</string>
@@ -990,7 +996,7 @@ 
    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Verander SMS-program?"</string>

    <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Gebruik <xliff:g id="NEW_APP">%1$s</xliff:g> in plaas van <xliff:g id="CURRENT_APP">%2$s</xliff:g> as jou SMS-program?"</string>

    <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Gebruik <xliff:g id="NEW_APP">%s</xliff:g> as jou SMS-program?"</string>

    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Onbekende SIM-operateur"</string>

    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Onbekende SIM-operateur"</string>

    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s het geen bekende voorsieningwebwerf nie"</string>

    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Steek asseblief SIM-kaart in en herbegin"</string>

    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Koppel asseblief aan die internet"</string>
@@ -1322,8 +1328,10 @@ 
    <string name="enable_adb" msgid="7982306934419797485">"USB-ontfouting"</string>

    <string name="enable_adb_summary" msgid="4881186971746056635">"In ontfoutmodus wanneer USB gekoppel is"</string>

    <string name="clear_adb_keys" msgid="4038889221503122743">"Herroep USB-onfoutingmagtigings"</string>

    <string name="bugreport_in_power" msgid="7923901846375587241">"Kortpad na foutverslag"</string>

    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"Wys \'n knoppie in Kitsinstellings om \'n foutverslag te doen"</string>

    <!-- no translation found for bugreport_in_power (7923901846375587241) -->

    <skip />

    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->

    <skip />

    <string name="keep_screen_on" msgid="1146389631208760344">"Bly wakker"</string>

    <string name="keep_screen_on_summary" msgid="2173114350754293009">"Skerm sal nooit slaap terwyl laai nie"</string>

    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Aktiveer Bluetooth HCI-loerloglêer"</string>
@@ -1332,9 +1340,7 @@ 
    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Kies looptyd"</string>

    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Herlaai om looptyd van <xliff:g id="OLD">%1$s</xliff:g> na <xliff:g id="NEW">%2$s</xliff:g> te verander?"</string>

    <string name="wifi_display_certification" msgid="8611569543791307533">"Draadlose skermsertifisering"</string>

    <string name="wifi_verbose_logging" msgid="4770164061102202747">"Aktiveer WiFi verbose loginskrywing"</string>

    <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Wys opsies vir draadlose skermsertifisering"</string>

    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Verhoog Wifi-loginskrywingsvlak, wys per SSID RSSI in WiFi Kieser"</string>

    <string name="allow_mock_location" msgid="2787962564578664888">"Laat skynliggings toe"</string>

    <string name="allow_mock_location_summary" msgid="317615105156345626">"Laat skynliggings toe"</string>

    <string name="adb_warning_title" msgid="6234463310896563253">"Laat USB-ontfouting toe?"</string>
@@ -1492,11 +1498,6 @@ 
    <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Sein van mobiele netwerk"</string>

    <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->

    <skip />

    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>

    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> vm."</string>

    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> nm."</string>

    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>/<xliff:g id="MONTH">%2$d</xliff:g>"</string>

    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>

    <string name="awake" msgid="387122265874485088">"Toestel se wakkertyd"</string>

    <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi betyds"</string>

    <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi betyds"</string>
@@ -2060,7 +2061,7 @@ 
    <string name="global_font_change_title" msgid="1887126466191012035">"Verander lettergrootte"</string>

    <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Tik en betaal"</string>

    <string name="nfc_payment_no_apps" msgid="2481080809791416010">"Betaal met net \'n tik"</string>

    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"Bevoordeel program op voorgrond"</string>

    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"Bevoordeel voorgrondprogram"</string>

    <string name="nfc_payment_learn_more" msgid="5583407773744324447">"Kom meer te wete"</string>

    <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"Vind programme"</string>

    <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Stel as jou voorkeur?"</string>
@@ -2095,6 +2096,18 @@ 
    <string name="user_image_take_photo" msgid="1280274310152803669">"Neem foto"</string>

    <string name="user_image_choose_photo" msgid="7940990613897477057">"Kies foto vanuit galery"</string>

    <string name="regulatory_info_text" msgid="5623087902354026557"></string>

    <string name="lock_settings_nfc_title" msgid="33998875572836425">"NFC-skermslot-instellings"</string>

    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Saamgebinde merkers"</string>

    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Geaktiveer"</string>

    <string name="start_nfc_pairing" msgid="5363319136364735698">"Bind met \'n merker saam"</string>

    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NFC-saambind-aktiwiteit"</string>

    <string name="pairing_button_title" msgid="7411638037556429744">"Bind nou saam"</string>

    <string name="status_no_ring_detected" msgid="838954925249421062">"Sit die merker plat op \'n tafel en sit die foon bo-op"</string>

    <string name="status_device_paired" msgid="4916932520416516526">"Merker en foon suksesvol saamgebind. Jy\'s klaar!"</string>

    <string name="status_error_invalid_device" msgid="5045003971535647259">"Die merker wat voorsien is, kan nie gebruik word om jou foon te ontsluit nie"</string>

    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Kon nie met jou merker saambind nie, probeer asseblief weer"</string>

    <string name="enable_nfc" msgid="5234514241098808766">"NFC is nie geaktiveer nie en word vereis vir NFC-ontsluit. Skakel NFC asseblief aan."</string>

    <string name="ok" msgid="3651563352754792958">"NFC-instellings"</string>

    <string name="dashboard_title" msgid="5453710313046681820">"Instellings"</string>

    <string name="search_results_title" msgid="1796252422574886932">"Instellings"</string>

    <string name="search_menu" msgid="7053532283559077164">"Soek"</string>
@@ -2102,7 +2115,8 @@ 
    <string name="search_recents_queries_label" msgid="2128811638532309069">"Onlangse soektogte"</string>

    <string name="search_results_label" msgid="4163304782363526148">"Resultate"</string>

    <string name="keywords_wifi" msgid="8947676711698613374">"wifi Wi-Fi netwerk verbinding"</string>

    <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Stel Wi-Fi-NFC-merker op"</string>

    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->

    <skip />

    <string name="write_tag" msgid="8571858602896222537">"Skryf"</string>

    <string name="status_awaiting_tap" msgid="2130145523773160617">"Tik \'n merker om te skryf …"</string>

    <string name="status_invalid_password" msgid="2575271864572897406">"Ongeldige wagwoord, probeer weer."</string>
@@ -2114,10 +2128,8 @@ 
    <string name="media_volume_option_title" msgid="2811531786073003825">"Mediavolume"</string>

    <string name="alarm_volume_option_title" msgid="8219324421222242421">"Wekkervolume"</string>

    <string name="ring_volume_option_title" msgid="6767101703671248309">"Luivolume"</string>

    <string name="notification_volume_option_title" msgid="6064656124416882130">"Kennisgewingvolume"</string>

    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Moenie steur nie"</string>

    <string name="ringer_mode_title" msgid="7489457312298627735">"Wanneer oproepe en kennisgewings opdaag"</string>

    <string name="ringer_mode_title_novoice" msgid="4628028304587795604">"Wanneer kennisgewings opdaag"</string>

    <string name="ringer_mode_audible" msgid="4196661772746371017">"Lui"</string>

    <string name="ringer_mode_vibrate" msgid="3381276665087695839">"Vibreer pleks van om te lui"</string>

    <string name="ringer_mode_silent" msgid="4812605852723880795">"Moenie lui of vibreer nie"</string>
@@ -2189,6 +2201,8 @@ 
    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Programkennisgewings"</string>

    <string name="notification_app_settings_button" msgid="6685640230371477485">"Kennisgewingsinstellings"</string>

    <string name="device_feedback" msgid="3238056036766293294">"Stuur terugvoer oor hierdie toestel"</string>

    <string name="switch_on_text" msgid="1124106706920572386">"Aan"</string>

    <string name="switch_off_text" msgid="1139356348100829659">"Af"</string>

    <!-- no translation found for switch_on_text (1124106706920572386) -->

    <skip />

    <!-- no translation found for switch_off_text (1139356348100829659) -->

    <skip />

</resources>

res/values-am/arrays.xml

+0 −1
Original line number Diff line number Diff line
@@ -196,7 +196,6 @@ 
  <string-array name="wifi_proxy_settings">

    <item msgid="4473276491748503377">"አንዱም"</item>

    <item msgid="8673874894887358090">"መመሪያ"</item>

    <item msgid="168893341855953140">"የተኪ ራስ-ውቅር"</item>

  </string-array>

  <string-array name="emergency_tone_entries">

    <item msgid="5165439859689033665">"ውጪ"</item>

res/values-am/strings.xml

+107 −60

File changed.

Preview size limit exceeded, changes collapsed.

res/values-ar/arrays.xml

+0 −1
Original line number Diff line number Diff line
@@ -196,7 +196,6 @@ 
  <string-array name="wifi_proxy_settings">

    <item msgid="4473276491748503377">"لا شيء"</item>

    <item msgid="8673874894887358090">"يدويًا"</item>

    <item msgid="168893341855953140">"تهيئة تلقائية للوكيل"</item>

  </string-array>

  <string-array name="emergency_tone_entries">

    <item msgid="5165439859689033665">"إيقاف"</item>