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

Commit 1b574fdf authored by Prerepa Viswanadham's avatar Prerepa Viswanadham Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'mwd-merge-050415' into mnc-dev 

* changes:
  Merge commit 'b6f59f4' into master_merge
  Merge commit 'f6db0ce' into master_merge
  Merge commit '17455a3' into master_merge
  Merge commit 'b4d5b32' into master_merge
  Merge commit 'a1a2fa7' into master_merge
  Merge commit '8dfdb98' into master_merge
  Merge commit 'eba66c3' into master_merge
parents d1993769 8812685f

res/values-gu-rIN/strings.xml

+5 −3
Original line number Diff line number Diff line
@@ -65,9 +65,11 @@ 
      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ફાઇલો કૉપિ કરી રહ્યાં છે.</item>

    </plurals>

    <string name="copy_preparing" msgid="3896202461003039386">"કૉપિ માટે તૈયારી કરી રહ્યું છે…"</string>

    <!-- no translation found for copy_error_notification_title (5267616889076217261) -->

    <plurals name="copy_error_notification_title" formatted="false" msgid="5267616889076217261">

      <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ફાઇલો કૉપિ કરી શકાઈ નથી</item>

      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ફાઇલો કૉપિ કરી શકાઈ નથી</item>

    </plurals>

    <string name="notification_touch_for_details" msgid="4483108577842961665">"વિગતો જોવા માટે ટચ કરો"</string>

    <string name="retry" msgid="7564024179122207376">"ફરી પ્રયાસ કરો"</string>

    <!-- no translation found for copy_failure_alert_content (3715575000297709082) -->

    <skip />

    <string name="copy_failure_alert_content" msgid="3715575000297709082">"આ ફાઇલો કૉપિ કરી નહોતી: <xliff:g id="LIST">%1$s</xliff:g>"</string>

</resources>

res/values-pa-rIN/strings.xml

+5 −3
Original line number Diff line number Diff line
@@ -65,9 +65,11 @@ 
      <item quantity="other"> <xliff:g id="COUNT_1">%1$d</xliff:g> ਫਾਈਲਾਂ ਕਾਪੀ ਕਰ ਰਿਹਾ ਹੈ।</item>

    </plurals>

    <string name="copy_preparing" msgid="3896202461003039386">"ਕਾਪੀ ਲਈ ਤਿਆਰ ਕਰ ਰਿਹਾ ਹੈ…"</string>

    <!-- no translation found for copy_error_notification_title (5267616889076217261) -->

    <plurals name="copy_error_notification_title" formatted="false" msgid="5267616889076217261">

      <item quantity="one"> <xliff:g id="COUNT_1">%1$d</xliff:g> ਫ਼ਾਈਲਾਂ ਦੀ ਪ੍ਰਤੀਲਿਪੀ ਨਹੀਂ ਬਣਾ ਸਕਿਆ</item>

      <item quantity="other"> <xliff:g id="COUNT_1">%1$d</xliff:g> ਫ਼ਾਈਲਾਂ ਦੀ ਪ੍ਰਤੀਲਿਪੀ ਨਹੀਂ ਬਣਾ ਸਕਿਆ</item>

    </plurals>

    <string name="notification_touch_for_details" msgid="4483108577842961665">"ਵੇਰਵੇ ਵੇਖਣ ਲਈ ਸਪਰਸ਼ ਕਰੋ"</string>

    <string name="retry" msgid="7564024179122207376">"ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ"</string>

    <!-- no translation found for copy_failure_alert_content (3715575000297709082) -->

    <skip />

    <string name="copy_failure_alert_content" msgid="3715575000297709082">"ਇਹਨਾਂ ਫ਼ਾਈਲਾਂ ਦੀ ਪ੍ਰਤੀਲਿਪੀ ਨਹੀਂ ਬਣਾਈ ਗਈ: <xliff:g id="LIST">%1$s</xliff:g>"</string>

</resources>

res/values-sq-rAL/strings.xml

+5 −3
Original line number Diff line number Diff line
@@ -65,9 +65,11 @@ 
      <item quantity="one">Po kopjon <xliff:g id="COUNT_0">%1$d</xliff:g> skedar.</item>

    </plurals>

    <string name="copy_preparing" msgid="3896202461003039386">"Po përgatitet për kopjimin…"</string>

    <!-- no translation found for copy_error_notification_title (5267616889076217261) -->

    <plurals name="copy_error_notification_title" formatted="false" msgid="5267616889076217261">

      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> skedarë nuk mund të kopjoheshin</item>

      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> skedar nuk mund të kopjohej</item>

    </plurals>

    <string name="notification_touch_for_details" msgid="4483108577842961665">"Prek për të parë detajet"</string>

    <string name="retry" msgid="7564024179122207376">"Provo përsëri"</string>

    <!-- no translation found for copy_failure_alert_content (3715575000297709082) -->

    <skip />

    <string name="copy_failure_alert_content" msgid="3715575000297709082">"Këta skedarë nuk u kopjuan: <xliff:g id="LIST">%1$s</xliff:g>"</string>

</resources>