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

Commit 880eb9a5 authored by Romain Hunault's avatar Romain Hunault
Browse files

Merge branch 'cm-14.1' into eelo-0.1

parents 7e0edf02 c25e34df

res/values-af/strings.xml

+2 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ 
<!--Generated by crowdin.com-->

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

<!--

<!--

	Copyright (C) 2015 The CyanogenMod Project

	Copyright (C) 2015 The CyanogenMod Project

	          (C) 2017 The LineageOS Project

	Copyright (C) 2017-2018 The LineageOS Project





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

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

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

	you may not use this file except in compliance with the License.
@@ -432,6 +432,7 @@ 
  <!-- Status bar - icon blacklist -->

  <!-- Status bar - icon blacklist -->

  <string name="status_bar_icons_title">Statusbalkikone</string>

  <string name="status_bar_icons_title">Statusbalkikone</string>

  <string name="status_bar_icons_summary">Beheer watter status balk ikone word getoon</string>

  <string name="status_bar_icons_summary">Beheer watter status balk ikone word getoon</string>

  <!-- Status bar - Network Traffic -->

  <!-- Protected apps -->

  <!-- Protected apps -->

  <string name="protected_apps_manager_title">Beskermde programme</string>

  <string name="protected_apps_manager_title">Beskermde programme</string>

  <string name="protected_apps_manager_summary">Bestuur watter toepassings is verberg agter \'n veilige slot</string>

  <string name="protected_apps_manager_summary">Bestuur watter toepassings is verberg agter \'n veilige slot</string>

res/values-am/strings.xml

+2 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ 
<!--Generated by crowdin.com-->

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

<!--

<!--

	Copyright (C) 2015 The CyanogenMod Project

	Copyright (C) 2015 The CyanogenMod Project

	          (C) 2017 The LineageOS Project

	Copyright (C) 2017-2018 The LineageOS Project





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

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

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

	you may not use this file except in compliance with the License.
@@ -59,6 +59,7 @@ 
  <!-- Status bar - Battery percentage -->

  <!-- Status bar - Battery percentage -->

  <!-- Status bar - Brightness -->

  <!-- Status bar - Brightness -->

  <!-- Status bar - icon blacklist -->

  <!-- Status bar - icon blacklist -->

  <!-- Status bar - Network Traffic -->

  <!-- Protected apps -->

  <!-- Protected apps -->

  <!-- Contributors cloud activity -->

  <!-- Contributors cloud activity -->

  <!-- Anonymous Statistics #CM -->

  <!-- Anonymous Statistics #CM -->

res/values-ar/strings.xml

+2 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ 
<!--Generated by crowdin.com-->

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

<!--

<!--

	Copyright (C) 2015 The CyanogenMod Project

	Copyright (C) 2015 The CyanogenMod Project

	          (C) 2017 The LineageOS Project

	Copyright (C) 2017-2018 The LineageOS Project





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

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

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

	you may not use this file except in compliance with the License.
@@ -59,6 +59,7 @@ 
  <!-- Status bar - Battery percentage -->

  <!-- Status bar - Battery percentage -->

  <!-- Status bar - Brightness -->

  <!-- Status bar - Brightness -->

  <!-- Status bar - icon blacklist -->

  <!-- Status bar - icon blacklist -->

  <!-- Status bar - Network Traffic -->

  <!-- Protected apps -->

  <!-- Protected apps -->

  <!-- Contributors cloud activity -->

  <!-- Contributors cloud activity -->

  <!-- Anonymous Statistics #CM -->

  <!-- Anonymous Statistics #CM -->

res/values-as-rIN/strings.xml

+2 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ 
<!--Generated by crowdin.com-->

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

<!--

<!--

	Copyright (C) 2015 The CyanogenMod Project

	Copyright (C) 2015 The CyanogenMod Project

	          (C) 2017 The LineageOS Project

	Copyright (C) 2017-2018 The LineageOS Project





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

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

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

	you may not use this file except in compliance with the License.
@@ -59,6 +59,7 @@ 
  <!-- Status bar - Battery percentage -->

  <!-- Status bar - Battery percentage -->

  <!-- Status bar - Brightness -->

  <!-- Status bar - Brightness -->

  <!-- Status bar - icon blacklist -->

  <!-- Status bar - icon blacklist -->

  <!-- Status bar - Network Traffic -->

  <!-- Protected apps -->

  <!-- Protected apps -->

  <!-- Contributors cloud activity -->

  <!-- Contributors cloud activity -->

  <!-- Anonymous Statistics #CM -->

  <!-- Anonymous Statistics #CM -->

res/values-ast-rES/strings.xml

+2 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ 
<!--Generated by crowdin.com-->

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

<!--

<!--

	Copyright (C) 2015 The CyanogenMod Project

	Copyright (C) 2015 The CyanogenMod Project

	          (C) 2017 The LineageOS Project

	Copyright (C) 2017-2018 The LineageOS Project





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

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

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

	you may not use this file except in compliance with the License.
@@ -318,6 +318,7 @@ 
  <!-- Status bar - icon blacklist -->

  <!-- Status bar - icon blacklist -->

  <string name="status_bar_icons_title">Iconos de barra d\'estáu</string>

  <string name="status_bar_icons_title">Iconos de barra d\'estáu</string>

  <string name="status_bar_icons_summary">Contola qu\'iconos de la barra d\'estáu s\'amuesen</string>

  <string name="status_bar_icons_summary">Contola qu\'iconos de la barra d\'estáu s\'amuesen</string>

  <!-- Status bar - Network Traffic -->

  <!-- Protected apps -->

  <!-- Protected apps -->

  <string name="protected_apps_manager_title">Aplicaciones protexíes</string>

  <string name="protected_apps_manager_title">Aplicaciones protexíes</string>

  <string name="protected_apps_manager_summary">Xestiona qu\'aplicaciones s\'anubren darrera d\'un bloquéu de seguranza</string>

  <string name="protected_apps_manager_summary">Xestiona qu\'aplicaciones s\'anubren darrera d\'un bloquéu de seguranza</string>