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

Commit 67883d3e authored by Lokesh Kumar Goel's avatar Lokesh Kumar Goel Committed by Android Build Coastguard Worker
Browse files

Revert "Import translations. DO NOT MERGE ANYWHERE"

This reverts commit 5e7f8d8a.

Reason for revert: coastguard doesn't flag the resource file CLs as already merged. Instead cherry-picked it again causing build failure with error:

frameworks/base/packages/SystemUI/res/values-zh-rCN/strings.xml:966: error: duplicate value for resource 'string/controls_media_empty_title' with config 'zh-rCN'.
frameworks/base/packages/SystemUI/res/values-zh-rCN/strings.xml:966: error: resource previously defined here.
frameworks/base/packages/SystemUI/res/values-zh-rCN/strings.xml: error: file failed to compile

BUG:296960974
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:202164834a9139bdf1ec1e53b65c3911002f2909)
Merged-In: I20fe50d806dc799328da7a594cfd42b5c20b4f02
Change-Id: I20fe50d806dc799328da7a594cfd42b5c20b4f02
parent 84dd6452
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -963,7 +963,6 @@
    <string name="media_ttt_default_device_type" msgid="4457646436153370169">"tablet"</string>
    <string name="media_transfer_receiver_content_description_unknown_app" msgid="7381771464846263667">"Saai jou media uit"</string>
    <string name="media_transfer_receiver_content_description_with_app_name" msgid="8555975056850659389">"Saai tans <xliff:g id="APP_LABEL">%1$s</xliff:g> uit"</string>
    <string name="controls_media_empty_title" msgid="8296102892421573325">"<xliff:g id="APP_NAME">%1$s</xliff:g> loop tans"</string>
    <string name="controls_error_timeout" msgid="794197289772728958">"Onaktief, gaan program na"</string>
    <string name="controls_error_removed" msgid="6675638069846014366">"Nie gekry nie"</string>
    <string name="controls_error_removed_title" msgid="1207794911208047818">"Kontrole is nie beskikbaar nie"</string>
+0 −1
Original line number Diff line number Diff line
@@ -963,7 +963,6 @@
    <string name="media_ttt_default_device_type" msgid="4457646436153370169">"ጡባዊ"</string>
    <string name="media_transfer_receiver_content_description_unknown_app" msgid="7381771464846263667">"የእርስዎን ሚዲያ cast በማድረግ ላይ"</string>
    <string name="media_transfer_receiver_content_description_with_app_name" msgid="8555975056850659389">"<xliff:g id="APP_LABEL">%1$s</xliff:g>ን Cast በማድረግ ላይ"</string>
    <string name="controls_media_empty_title" msgid="8296102892421573325">"<xliff:g id="APP_NAME">%1$s</xliff:g> እያሄደ ነው"</string>
    <string name="controls_error_timeout" msgid="794197289772728958">"ንቁ ያልኾነ፣ መተግበሪያን ይፈትሹ"</string>
    <string name="controls_error_removed" msgid="6675638069846014366">"አልተገኘም"</string>
    <string name="controls_error_removed_title" msgid="1207794911208047818">"መቆጣጠሪያ አይገኝም"</string>
+0 −1
Original line number Diff line number Diff line
@@ -963,7 +963,6 @@
    <string name="media_ttt_default_device_type" msgid="4457646436153370169">"جهاز لوحي"</string>
    <string name="media_transfer_receiver_content_description_unknown_app" msgid="7381771464846263667">"بثّ الوسائط"</string>
    <string name="media_transfer_receiver_content_description_with_app_name" msgid="8555975056850659389">"جارٍ بثّ \"<xliff:g id="APP_LABEL">%1$s</xliff:g>\""</string>
    <string name="controls_media_empty_title" msgid="8296102892421573325">"\"<xliff:g id="APP_NAME">%1$s</xliff:g>\" قيد التشغيل"</string>
    <string name="controls_error_timeout" msgid="794197289772728958">"غير نشط، تحقّق من التطبيق."</string>
    <string name="controls_error_removed" msgid="6675638069846014366">"لم يتم العثور عليه."</string>
    <string name="controls_error_removed_title" msgid="1207794911208047818">"عنصر التحكّم غير متوفّر"</string>
+0 −1
Original line number Diff line number Diff line
@@ -963,7 +963,6 @@
    <string name="media_ttt_default_device_type" msgid="4457646436153370169">"টেবলেট"</string>
    <string name="media_transfer_receiver_content_description_unknown_app" msgid="7381771464846263667">"আপোনাৰ মিডিয়া কাষ্ট কৰি থকা হৈছে"</string>
    <string name="media_transfer_receiver_content_description_with_app_name" msgid="8555975056850659389">"<xliff:g id="APP_LABEL">%1$s</xliff:g> কাষ্ট কৰি থকা হৈছে"</string>
    <string name="controls_media_empty_title" msgid="8296102892421573325">"<xliff:g id="APP_NAME">%1$s</xliff:g> চলি আছে"</string>
    <string name="controls_error_timeout" msgid="794197289772728958">"সক্ৰিয় নহয়, এপ্‌টো পৰীক্ষা কৰক"</string>
    <string name="controls_error_removed" msgid="6675638069846014366">"বিচাৰি পোৱা নগ’ল"</string>
    <string name="controls_error_removed_title" msgid="1207794911208047818">"নিয়ন্ত্ৰণটো উপলব্ধ নহয়"</string>
+0 −1
Original line number Diff line number Diff line
@@ -963,7 +963,6 @@
    <string name="media_ttt_default_device_type" msgid="4457646436153370169">"planşet"</string>
    <string name="media_transfer_receiver_content_description_unknown_app" msgid="7381771464846263667">"Medianız yayımlanır"</string>
    <string name="media_transfer_receiver_content_description_with_app_name" msgid="8555975056850659389">"<xliff:g id="APP_LABEL">%1$s</xliff:g> yayımlanır"</string>
    <string name="controls_media_empty_title" msgid="8296102892421573325">"<xliff:g id="APP_NAME">%1$s</xliff:g> işləyir"</string>
    <string name="controls_error_timeout" msgid="794197289772728958">"Aktiv deyil, tətbiqi yoxlayın"</string>
    <string name="controls_error_removed" msgid="6675638069846014366">"Tapılmadı"</string>
    <string name="controls_error_removed_title" msgid="1207794911208047818">"Nəzarət əlçatan deyil"</string>
Loading