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

Commit 6b64bcf7 authored by Xin Li's avatar Xin Li
Browse files

resolve merge conflicts of 3e0e9f8a to oc-mr1-dev-plus-aosp

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I0bd86c50a1baea9d34c897d4be2bf784f2002178
parents 80c80607 3e0e9f8a
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -111,11 +111,11 @@
    <string name="outbound_noti_title" msgid="8051906709452260849">"Partilha por Bluetooth: ficheiros enviados"</string>
    <string name="inbound_noti_title" msgid="4143352641953027595">"Partilha por Bluetooth: ficheiros recebidos"</string>
    <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
      <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> sem êxito.</item>
      <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> sem êxito.</item>
      <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> sem êxito.</item>
    </plurals>
    <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
      <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> com êxito, %2$s</item>
      <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> com êxito, %2$s</item>
      <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> com êxito, %2$s</item>
    </plurals>
    <string name="transfer_menu_clear_all" msgid="790017462957873132">"Limpar lista"</string>
+0 −0

File mode changed from 100755 to 100644.

+0 −0

File mode changed from 100755 to 100644.

+0 −0

File mode changed from 100755 to 100644.

+0 −0

File mode changed from 100755 to 100644.

Loading