Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index e50e8f8..634a9ee 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -171,7 +171,7 @@
<item quantity="other">Διαγραφή <xliff:g id="COUNT">^1</xliff:g> στοιχείων…</item>
<item quantity="one">Διαγραφή στοιχείου…</item>
</plurals>
- <string name="transcode_denied" msgid="6760546817138288976">"Η εφαρμογή <xliff:g id="APP_NAME">%s</xliff:g> δεν έχει δυνατότητα επεξεργασία αρχείων μέσων"</string>
+ <string name="transcode_denied" msgid="6760546817138288976">"Η εφαρμογή <xliff:g id="APP_NAME">%s</xliff:g> δεν έχει δυνατότητα επεξεργασίας αρχείων μέσων"</string>
<string name="transcode_processing_cancelled" msgid="5340383917746945590">"Η επεξεργασία μέσων ακυρώθηκε"</string>
<string name="transcode_processing_error" msgid="8921643164508407874">"Σφάλμα επεξεργασίας μέσων"</string>
<string name="transcode_processing_success" msgid="447288876429730122">"Η επεξεργασία μέσων ολοκληρώθηκε επιτυχώς"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index deb3250..664c8eb 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -171,7 +171,7 @@
<item quantity="one">درحال حذف <xliff:g id="COUNT">^1</xliff:g> مورد…</item>
<item quantity="other">درحال حذف <xliff:g id="COUNT">^1</xliff:g> مورد…</item>
</plurals>
- <string name="transcode_denied" msgid="6760546817138288976">"<xliff:g id="APP_NAME">%s</xliff:g> نمیتواند فایلهای رسانهای را پردازش کند"</string>
+ <string name="transcode_denied" msgid="6760546817138288976">"<xliff:g id="APP_NAME">%s</xliff:g> نمیتواند فایلهای رسانهای را پردازش کند"</string>
<string name="transcode_processing_cancelled" msgid="5340383917746945590">"پردازش رسانه لغو شد"</string>
<string name="transcode_processing_error" msgid="8921643164508407874">"خطای پردازش رسانه"</string>
<string name="transcode_processing_success" msgid="447288876429730122">"پردازش رسانه باموفقیت انجام شد"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 5881984..28584be 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -171,7 +171,7 @@
<item quantity="one"><xliff:g id="COUNT">^1</xliff:g> आइटम मिटाया जा रहा है…</item>
<item quantity="other"><xliff:g id="COUNT">^1</xliff:g> आइटम मिटाए जा रहे हैं…</item>
</plurals>
- <string name="transcode_denied" msgid="6760546817138288976">"<xliff:g id="APP_NAME">%s</xliff:g> मीडिया फ़ाइलों को प्रोसेस नहीं कर सकता"</string>
+ <string name="transcode_denied" msgid="6760546817138288976">"<xliff:g id="APP_NAME">%s</xliff:g> ऐप्लिकेशन, मीडिया फ़ाइलों को प्रोसेस नहीं कर सकता"</string>
<string name="transcode_processing_cancelled" msgid="5340383917746945590">"मीडिया को प्रोसेस करने की कार्रवाई रद्द की गई"</string>
<string name="transcode_processing_error" msgid="8921643164508407874">"मीडिया को प्रोसेस करने में गड़बड़ी हुई"</string>
<string name="transcode_processing_success" msgid="447288876429730122">"मीडिया को प्रोसेस कर लिया गया"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index ca1da24..6595c3b 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -171,7 +171,7 @@
<item quantity="one"><xliff:g id="COUNT">^1</xliff:g> ಐಟಂಗಳನ್ನು ಅಳಿಸಲಾಗುತ್ತಿದೆ…</item>
<item quantity="other"><xliff:g id="COUNT">^1</xliff:g> ಐಟಂಗಳನ್ನು ಅಳಿಸಲಾಗುತ್ತಿದೆ…</item>
</plurals>
- <string name="transcode_denied" msgid="6760546817138288976">"<xliff:g id="APP_NAME">%s</xliff:g> ಮಾಧ್ಯಮ ಫೈಲ್ಗಳನ್ನು ಪ್ರಕ್ರಿಯೆಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
+ <string name="transcode_denied" msgid="6760546817138288976">"<xliff:g id="APP_NAME">%s</xliff:g> ಗೆ ಮಾಧ್ಯಮ ಫೈಲ್ಗಳನ್ನು ಪ್ರಕ್ರಿಯೆಗೊಳಿಸಲು ಸಾಧ್ಯವಾಗದು"</string>
<string name="transcode_processing_cancelled" msgid="5340383917746945590">"ಮಾಧ್ಯಮ ಪ್ರಕ್ರಿಯೆಗೊಳಿಸುವಿಕೆ ರದ್ದುಗೊಂಡಿದೆ"</string>
<string name="transcode_processing_error" msgid="8921643164508407874">"ಮಾಧ್ಯಮ ಪ್ರಕ್ರಿಯೆಗೊಳಿಸುವಿಕೆ ದೋಷ"</string>
<string name="transcode_processing_success" msgid="447288876429730122">"ಮಾಧ್ಯಮ ಪ್ರಕ್ರಿಯೆಗೊಳಿಸುವಿಕೆ ಯಶಸ್ವಿಯಾಗಿದೆ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index afb14cc..db82767 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -171,7 +171,7 @@
<item quantity="other">항목 <xliff:g id="COUNT">^1</xliff:g>개 삭제 중…</item>
<item quantity="one">항목 삭제 중…</item>
</plurals>
- <string name="transcode_denied" msgid="6760546817138288976">"<xliff:g id="APP_NAME">%s</xliff:g>에서 미디어 파일을 처리할 수 없습니다"</string>
+ <string name="transcode_denied" msgid="6760546817138288976">"<xliff:g id="APP_NAME">%s</xliff:g>에서 미디어 파일을 처리할 수 없습니다."</string>
<string name="transcode_processing_cancelled" msgid="5340383917746945590">"미디어 처리 취소됨"</string>
<string name="transcode_processing_error" msgid="8921643164508407874">"미디어 처리 오류"</string>
<string name="transcode_processing_success" msgid="447288876429730122">"미디어 처리 성공"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index fc0ea6b..1950e7e 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -239,7 +239,7 @@
<item quantity="other">Odstraňuje sa <xliff:g id="COUNT">^1</xliff:g> položiek…</item>
<item quantity="one">Odstraňuje sa položka…</item>
</plurals>
- <string name="transcode_denied" msgid="6760546817138288976">"<xliff:g id="APP_NAME">%s</xliff:g> nemôže spracúvať súbory médií"</string>
+ <string name="transcode_denied" msgid="6760546817138288976">"<xliff:g id="APP_NAME">%s</xliff:g> nemôže spracovať súbory médií"</string>
<string name="transcode_processing_cancelled" msgid="5340383917746945590">"Spracúvanie médií bolo zrušené"</string>
<string name="transcode_processing_error" msgid="8921643164508407874">"Pri spracúvaní médií sa vyskytla chyba"</string>
<string name="transcode_processing_success" msgid="447288876429730122">"Médiá boli úspešne spracované"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 63488cf..cddbb63 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -171,7 +171,7 @@
<item quantity="other"><xliff:g id="COUNT">^1</xliff:g> آئٹمز حذف کئے جا رہے ہیں…</item>
<item quantity="one">آئٹم حذف کیا جا رہا ہے…</item>
</plurals>
- <string name="transcode_denied" msgid="6760546817138288976">"<xliff:g id="APP_NAME">%s</xliff:g> میڈیا کی فائلز پر کارروائی نہیں کر سکتی"</string>
+ <string name="transcode_denied" msgid="6760546817138288976">"<xliff:g id="APP_NAME">%s</xliff:g> میڈیا فائلز پر کارروائی نہیں کر سکتی"</string>
<string name="transcode_processing_cancelled" msgid="5340383917746945590">"میڈیا پر کارروائی منسوخ ہو گئی"</string>
<string name="transcode_processing_error" msgid="8921643164508407874">"میڈیا پر کارروائی کرنے میں خرابی"</string>
<string name="transcode_processing_success" msgid="447288876429730122">"میڈیا پر کارروائی کامیاب ہو گئی"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index b1f7f7f..0950c2d 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -171,7 +171,7 @@
<item quantity="other">正在删除 <xliff:g id="COUNT">^1</xliff:g> 项内容…</item>
<item quantity="one">正在删除内容…</item>
</plurals>
- <string name="transcode_denied" msgid="6760546817138288976">"<xliff:g id="APP_NAME">%s</xliff:g>无法处理媒体文件"</string>
+ <string name="transcode_denied" msgid="6760546817138288976">"“<xliff:g id="APP_NAME">%s</xliff:g>”无法处理媒体文件"</string>
<string name="transcode_processing_cancelled" msgid="5340383917746945590">"已取消处理媒体内容"</string>
<string name="transcode_processing_error" msgid="8921643164508407874">"处理媒体内容时出错"</string>
<string name="transcode_processing_success" msgid="447288876429730122">"已成功处理媒体内容"</string>
diff --git a/src/com/android/providers/media/TranscodeHelper.java b/src/com/android/providers/media/TranscodeHelper.java
index c500bf6..251420f 100644
--- a/src/com/android/providers/media/TranscodeHelper.java
+++ b/src/com/android/providers/media/TranscodeHelper.java
@@ -573,7 +573,7 @@
/**
* @return 0 or >0 representing whether we should transcode or not.
* 0 means we should not transcode, otherwise we should transcode and the value is the
- * reason that will be logged to westworld as a transcode reason. Possible values are:
+ * reason that will be logged to statsd as a transcode reason. Possible values are:
* <ul>
* <li>MediaProviderStatsLog.TRANSCODING_DATA__ACCESS_REASON__SYSTEM_DEFAULT=1
* <li>MediaProviderStatsLog.TRANSCODING_DATA__ACCESS_REASON__SYSTEM_CONFIG=2
diff --git a/src/com/android/providers/media/metrics/TranscodeMetrics.java b/src/com/android/providers/media/metrics/TranscodeMetrics.java
index ec6a685..4c4e1d8 100644
--- a/src/com/android/providers/media/metrics/TranscodeMetrics.java
+++ b/src/com/android/providers/media/metrics/TranscodeMetrics.java
@@ -152,7 +152,7 @@
return STATS_DATA_SAMPLE_LIMIT;
}
- /** This is the data to populate the proto shared to westworld. */
+ /** This is the data to populate the proto shared with statsd. */
static final class TranscodingStatsData {
private final String mRequestorPackage;
private final short mAccessType;