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

Commit d0b632af authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/cm-14.1' into v1-nougat

parents a47cc475 b4da5d3a

res/values-ar/cm_strings.xml

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

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

<!--

/*

* Copyright (C) 2013 The Android Open Source Project

res/values-ast-rES/cm_strings.xml

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

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

<!--

/*

* Copyright (C) 2013 The Android Open Source Project
@@ -21,5 +20,4 @@ 
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="which_wallpaper_option_home_screen_cm">Pantalla d\'aniciu</string>

    <string name="which_wallpaper_option_lock_screen_cm">Pantalla de bloquéu</string>

    <string name="which_wallpaper_option_home_screen_and_lock_screen_cm">Pantalles d\'aniciu y bloquéu</string>

</resources>

res/values-es-rCO/cm_strings.xml→res/values-az/cm_strings.xml

+3 −4
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

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

<!--

/*

* Copyright (C) 2013 The Android Open Source Project
@@ -19,7 +18,7 @@ 
*/

-->

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

  <!-- Option for setting the wallpaper only on the home screen. -->

  <!-- Option for setting the wallpaper only on the lock screen. -->

  <!-- Option for setting the wallpaper on both the home screen and lock screen. -->

    <string name="which_wallpaper_option_home_screen_cm">Əsas ekran</string>

    <string name="which_wallpaper_option_lock_screen_cm">Kilid ekranı</string>

    <string name="which_wallpaper_option_home_screen_and_lock_screen_cm">Əsas ekran və kilid ekranı</string>

</resources>

res/values-bg/cm_strings.xml

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

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

<!--

/*

* Copyright (C) 2013 The Android Open Source Project

res/values-br-rFR/strings.xml

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

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

<!--

/*

* Copyright (C) 2013 The Android Open Source 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">

  <!-- Button label on Wallpaper picker screen; user selects this button to set a specific wallpaper -->

  <!-- Error message when an image is selected as a wallpaper,

         but the wallpaper picker cannot load it -->

  <!-- Error message when an image is selected as a wallpaper,

         but the wallpaper cropper cannot load it. The user will

         usually see this when using another app and trying to set

         an image as the wallpaper -->

  <!-- Error message when an image is selected as a wallpaper,

         but something goes wrong when the user clicks "Set wallpaper" -->

  <!-- Shown when wallpapers are selected in Wallpaper picker -->

  <!-- String indicating how many media item(s) is(are) selected

            eg. 1 selected [CHAR LIMIT=30] -->

  <!-- Accessibility string used as a label for a particular wallpaper in the Wallpaper Picker list.

         e.g. "Wallpaper 3 of 10" -->

  <!-- Accessibility string used to announce that a wallpaper has been selected. -->

  <!-- Label on button to delete wallpaper(s) -->

  <!-- Label on button in Wallpaper Picker to pick an image -->

  <!-- Option in "Select wallpaper from" dialog box -->

  <!-- Title of activity for cropping wallpapers -->

  <!-- Option for setting the wallpaper only on the home screen. -->

  <!-- Option for setting the wallpaper only on the lock screen. -->

  <!-- Option for setting the wallpaper on both the home screen and lock screen. -->

</resources>