Merge "Refactor ApfTest to use more Mockito mocking" into main am: ae7610da57 am: 0d89c20f47 Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/3157997 Change-Id: Ic6311b744013c61a057a9cf9b20717725676ef7c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 32d423b..22591f0 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml
@@ -22,5 +22,5 @@ <string name="notification_channel_description_network_venue_info" msgid="5131499595382733605">"Εμφανίζονται ειδοποιήσεις για να υποδείξουν ότι το δίκτυο διαθέτει σελίδα πληροφοριών για τον τόπο."</string> <string name="connected" msgid="4563643884927480998">"Συνδέθηκε"</string> <string name="tap_for_info" msgid="6849746325626883711">"Συνδέθηκε/Πατήστε για προβολή του ιστοτόπου"</string> - <string name="application_label" msgid="1322847171305285454">"Διαχειριστής δικτύου"</string> + <string name="application_label" msgid="1322847171305285454">"Διαχείριση δικτύου"</string> </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index b595a9e..451d8c3 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml
@@ -21,6 +21,6 @@ <string name="notification_channel_name_network_venue_info" msgid="6526543187249265733">"اطلاعات محل شبکه"</string> <string name="notification_channel_description_network_venue_info" msgid="5131499595382733605">"اعلانهایی که نمایش داده میشوند تا نشان دهند شبکه صفحه اطلاعات محل دارد"</string> <string name="connected" msgid="4563643884927480998">"متصل"</string> - <string name="tap_for_info" msgid="6849746325626883711">"متصل شد / برای مشاهده وبسایت ضربه بزنید"</string> + <string name="tap_for_info" msgid="6849746325626883711">"متصل شد / برای مشاهده وبسایت تکضرب بزنید"</string> <string name="application_label" msgid="1322847171305285454">"مدیر شبکه"</string> </resources>