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

Commit 423818e2 authored by Brint E. Kriebel's avatar Brint E. Kriebel
Browse files

Merge branch 'cm-11.0' into stable/cm-11.0

parents 1bebd9e5 1a4a2c79

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
        android:description="@string/permdesc_bluetoothWhitelist"

        android:protectionLevel="signature" />



    <!--  Allows receiving handover status broadcasts from Bluetooth -->,

    <!--  Allows receiving handover status broadcasts from Bluetooth -->

    <permission android:name="com.android.permission.HANDOVER_STATUS"

        android:label="@string/permlab_handoverStatus"

        android:description="@string/permdesc_handoverStatus"

res/values-af/cm_caf.xml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--Generated by crowdin.net-->

<!--

     Copyright (C) 2014 The CyanogenMod Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

  <string name="empty_file_notification_sent">Bluetooth-deel: Ontvanger verwerp leë lêer <xliff:g id="file">%1$s</xliff:g></string>

  <string name="format_progress_text">%1$d%%</string>

</resources>

res/values-eu/cm_caf.xml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--Generated by crowdin.net-->

<!--

     Copyright (C) 2014 The CyanogenMod Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

  <string name="empty_file_notification_sent">Bluetooth: <xliff:g id="file">%1$s</xliff:g> fitxategi hutsa ukatua izan da</string>

  <string name="format_progress_text">%1$d%%</string>

</resources>

res/values-hr/cm_caf.xml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--Generated by crowdin.net-->

<!--

     Copyright (C) 2014 The CyanogenMod Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

  <string name="empty_file_notification_sent">Bluetooth djeljenje: Odbijena prazna datoteka <xliff:g id="file">%1$s</xliff:g></string>

  <string name="format_progress_text">%1$d%%</string>

</resources>

res/values-ja/cm_caf.xml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--Generated by crowdin.net-->

<!--

     Copyright (C) 2014 The CyanogenMod Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

  <string name="empty_file_notification_sent">Bluetooth共有: リモートは長さ0のファイル<xliff:g id="file">%1$s</xliff:g>を拒否しました</string>

  <string name="format_progress_text">%1$d%%</string>

</resources>