diff options
| author | Joey Rizzoli <joey@lineageos.it> | 2016-12-29 17:28:02 +0100 |
|---|---|---|
| committer | Abhisek Devkota <ciwrl@lineageos.org> | 2017-01-14 18:36:57 -0800 |
| commit | d1331884a16916a36b16ca4d53d4c72d2bda6738 (patch) | |
| tree | 3fe040402b001a5aa55b5bfd80a9089408158469 | |
| parent | 65d6ac1299720f8cc8e40cc8cc875fe3da2337dd (diff) | |
| download | packages_apps_SetupWizard-d1331884a16916a36b16ca4d53d4c72d2bda6738.tar.gz packages_apps_SetupWizard-d1331884a16916a36b16ca4d53d4c72d2bda6738.tar.bz2 packages_apps_SetupWizard-d1331884a16916a36b16ca4d53d4c72d2bda6738.zip | |
SetupWizard: rebrand to LineageOS
* Rebrand UI
* Add privacy guard to setup
* Disable Cyngn inc MOD platform and account setup
* Make privacy policy view-able again
Change-Id: Iacd60886992ca72d3f75bb21a905d612432751fc
Signed-off-by: Joey Rizzoli <joey@lineageos.it>
175 files changed, 1401 insertions, 1381 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 2ce4051..9bd0603 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -63,7 +63,7 @@ <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="23" /> <application android:label="@string/app_name" - android:icon="@drawable/icon" + android:icon="@mipmap/ic_launcher" android:theme="@style/Theme.Setup" android:uiOptions="none" android:taskAffinity="com.android.wizard" diff --git a/res/anim/slide_left.xml b/res/anim/slide_left.xml index 283638e..10d65e7 100644 --- a/res/anim/slide_left.xml +++ b/res/anim/slide_left.xml @@ -1,9 +1,22 @@ <?xml version="1.0" encoding="utf-8"?> -<set xmlns:android="http://schemas.android.com/apk/res/android"> - <objectAnimator android:duration="@android:integer/config_mediumAnimTime" - android:interpolator="@android:anim/accelerate_interpolator" - android:propertyName="x" - android:valueFrom="1280" - android:valueTo="0" - android:valueType="floatType"/> -</set> +<!-- + Copyright (C) 2015 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. +--> + +<translate xmlns:android="http://schemas.android.com/apk/res/android" + android:duration="300" + android:fromXDelta="0%" + android:toXDelta="-100%" + android:interpolator="@android:anim/decelerate_interpolator" /> diff --git a/res/anim/slide_right.xml b/res/anim/slide_right.xml index 49de7e9..b7365e9 100644 --- a/res/anim/slide_right.xml +++ b/res/anim/slide_right.xml @@ -1,9 +1,22 @@ <?xml version="1.0" encoding="utf-8"?> -<set xmlns:android="http://schemas.android.com/apk/res/android"> - <objectAnimator android:duration="@android:integer/config_mediumAnimTime" - android:interpolator="@android:anim/accelerate_interpolator" - android:propertyName="x" - android:valueFrom="0" - android:valueTo="-1280" - android:valueType="floatType"/> -</set> +<!-- + Copyright (C) 2015 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. +--> + +<translate xmlns:android="http://schemas.android.com/apk/res/android" + android:duration="300" + android:fromXDelta="-100%" + android:toXDelta="0%" + android:interpolator="@android:anim/decelerate_interpolator" /> diff --git a/res/drawable-hdpi/brand.png b/res/drawable-hdpi/brand.png Binary files differdeleted file mode 100755 index df120af..0000000 --- a/res/drawable-hdpi/brand.png +++ /dev/null diff --git a/res/drawable-hdpi/brand_finish.png b/res/drawable-hdpi/brand_finish.png Binary files differdeleted file mode 100755 index 5c126f5..0000000 --- a/res/drawable-hdpi/brand_finish.png +++ /dev/null diff --git a/res/drawable-hdpi/btn_mod_oobe.9.png b/res/drawable-hdpi/btn_mod_oobe.9.png Binary files differdeleted file mode 100644 index d97a67a..0000000 --- a/res/drawable-hdpi/btn_mod_oobe.9.png +++ /dev/null diff --git a/res/drawable-hdpi/cross.png b/res/drawable-hdpi/cross.png Binary files differdeleted file mode 100755 index ad8e5d9..0000000 --- a/res/drawable-hdpi/cross.png +++ /dev/null diff --git a/res/drawable-hdpi/icon.png b/res/drawable-hdpi/icon.png Binary files differdeleted file mode 100644 index 974c26b..0000000 --- a/res/drawable-hdpi/icon.png +++ /dev/null diff --git a/res/drawable-hdpi/powered_by.png b/res/drawable-hdpi/powered_by.png Binary files differdeleted file mode 100755 index 34a34aa..0000000 --- a/res/drawable-hdpi/powered_by.png +++ /dev/null diff --git a/res/drawable-hdpi/tick.png b/res/drawable-hdpi/tick.png Binary files differdeleted file mode 100755 index 1564a5b..0000000 --- a/res/drawable-hdpi/tick.png +++ /dev/null diff --git a/res/drawable-hdpi/timer.png b/res/drawable-hdpi/timer.png Binary files differdeleted file mode 100755 index 359045c..0000000 --- a/res/drawable-hdpi/timer.png +++ /dev/null diff --git a/res/drawable-mdpi/brand.png b/res/drawable-mdpi/brand.png Binary files differdeleted file mode 100755 index b1bb320..0000000 --- a/res/drawable-mdpi/brand.png +++ /dev/null diff --git a/res/drawable-mdpi/brand_finish.png b/res/drawable-mdpi/brand_finish.png Binary files differdeleted file mode 100755 index 06f1b56..0000000 --- a/res/drawable-mdpi/brand_finish.png +++ /dev/null diff --git a/res/drawable-mdpi/btn_mod_oobe.9.png b/res/drawable-mdpi/btn_mod_oobe.9.png Binary files differdeleted file mode 100644 index f71d859..0000000 --- a/res/drawable-mdpi/btn_mod_oobe.9.png +++ /dev/null diff --git a/res/drawable-mdpi/cross.png b/res/drawable-mdpi/cross.png Binary files differdeleted file mode 100755 index a5bca90..0000000 --- a/res/drawable-mdpi/cross.png +++ /dev/null diff --git a/res/drawable-mdpi/icon.png b/res/drawable-mdpi/icon.png Binary files differdeleted file mode 100644 index ae9b93d..0000000 --- a/res/drawable-mdpi/icon.png +++ /dev/null diff --git a/res/drawable-mdpi/powered_by.png b/res/drawable-mdpi/powered_by.png Binary files differdeleted file mode 100755 index 94b6843..0000000 --- a/res/drawable-mdpi/powered_by.png +++ /dev/null diff --git a/res/drawable-mdpi/tick.png b/res/drawable-mdpi/tick.png Binary files differdeleted file mode 100755 index 779b159..0000000 --- a/res/drawable-mdpi/tick.png +++ /dev/null diff --git a/res/drawable-mdpi/timer.png b/res/drawable-mdpi/timer.png Binary files differdeleted file mode 100755 index be27157..0000000 --- a/res/drawable-mdpi/timer.png +++ /dev/null diff --git a/res/drawable-xhdpi/brand.png b/res/drawable-xhdpi/brand.png Binary files differdeleted file mode 100755 index 38f04c5..0000000 --- a/res/drawable-xhdpi/brand.png +++ /dev/null diff --git a/res/drawable-xhdpi/brand_finish.png b/res/drawable-xhdpi/brand_finish.png Binary files differdeleted file mode 100755 index 5569224..0000000 --- a/res/drawable-xhdpi/brand_finish.png +++ /dev/null diff --git a/res/drawable-xhdpi/btn_mod_oobe.9.png b/res/drawable-xhdpi/btn_mod_oobe.9.png Binary files differdeleted file mode 100644 index b944ecc..0000000 --- a/res/drawable-xhdpi/btn_mod_oobe.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/cross.png b/res/drawable-xhdpi/cross.png Binary files differdeleted file mode 100755 index d5cac0a..0000000 --- a/res/drawable-xhdpi/cross.png +++ /dev/null diff --git a/res/drawable-xhdpi/icon.png b/res/drawable-xhdpi/icon.png Binary files differdeleted file mode 100644 index 55bede3..0000000 --- a/res/drawable-xhdpi/icon.png +++ /dev/null diff --git a/res/drawable-xhdpi/powered_by.png b/res/drawable-xhdpi/powered_by.png Binary files differdeleted file mode 100755 index dabc2e5..0000000 --- a/res/drawable-xhdpi/powered_by.png +++ /dev/null diff --git a/res/drawable-xhdpi/tick.png b/res/drawable-xhdpi/tick.png Binary files differdeleted file mode 100755 index 0e10e6d..0000000 --- a/res/drawable-xhdpi/tick.png +++ /dev/null diff --git a/res/drawable-xhdpi/timer.png b/res/drawable-xhdpi/timer.png Binary files differdeleted file mode 100755 index fcaa753..0000000 --- a/res/drawable-xhdpi/timer.png +++ /dev/null diff --git a/res/drawable-xxhdpi/brand.png b/res/drawable-xxhdpi/brand.png Binary files differdeleted file mode 100755 index fd370bb..0000000 --- a/res/drawable-xxhdpi/brand.png +++ /dev/null diff --git a/res/drawable-xxhdpi/brand_finish.png b/res/drawable-xxhdpi/brand_finish.png Binary files differdeleted file mode 100755 index 367bcff..0000000 --- a/res/drawable-xxhdpi/brand_finish.png +++ /dev/null diff --git a/res/drawable-xxhdpi/btn_mod_oobe.9.png b/res/drawable-xxhdpi/btn_mod_oobe.9.png Binary files differdeleted file mode 100644 index eddb5a7..0000000 --- a/res/drawable-xxhdpi/btn_mod_oobe.9.png +++ /dev/null diff --git a/res/drawable-xxhdpi/cross.png b/res/drawable-xxhdpi/cross.png Binary files differdeleted file mode 100755 index 9c47e16..0000000 --- a/res/drawable-xxhdpi/cross.png +++ /dev/null diff --git a/res/drawable-xxhdpi/powered_by.png b/res/drawable-xxhdpi/powered_by.png Binary files differdeleted file mode 100755 index 8bc0bb5..0000000 --- a/res/drawable-xxhdpi/powered_by.png +++ /dev/null diff --git a/res/drawable-xxhdpi/tick.png b/res/drawable-xxhdpi/tick.png Binary files differdeleted file mode 100755 index f398a15..0000000 --- a/res/drawable-xxhdpi/tick.png +++ /dev/null diff --git a/res/drawable-xxhdpi/timer.png b/res/drawable-xxhdpi/timer.png Binary files differdeleted file mode 100755 index c10cf8f..0000000 --- a/res/drawable-xxhdpi/timer.png +++ /dev/null diff --git a/res/drawable-xxxhdpi/brand.png b/res/drawable-xxxhdpi/brand.png Binary files differdeleted file mode 100755 index 37c6654..0000000 --- a/res/drawable-xxxhdpi/brand.png +++ /dev/null diff --git a/res/drawable-xxxhdpi/brand_finish.png b/res/drawable-xxxhdpi/brand_finish.png Binary files differdeleted file mode 100755 index aef7cb7..0000000 --- a/res/drawable-xxxhdpi/brand_finish.png +++ /dev/null diff --git a/res/drawable-xxxhdpi/btn_mod_oobe.9.png b/res/drawable-xxxhdpi/btn_mod_oobe.9.png Binary files differdeleted file mode 100644 index 2cf8eb2..0000000 --- a/res/drawable-xxxhdpi/btn_mod_oobe.9.png +++ /dev/null diff --git a/res/drawable-xxxhdpi/cross.png b/res/drawable-xxxhdpi/cross.png Binary files differdeleted file mode 100755 index 0a2800d..0000000 --- a/res/drawable-xxxhdpi/cross.png +++ /dev/null diff --git a/res/drawable-xxxhdpi/powered_by.png b/res/drawable-xxxhdpi/powered_by.png Binary files differdeleted file mode 100755 index 4121511..0000000 --- a/res/drawable-xxxhdpi/powered_by.png +++ /dev/null diff --git a/res/drawable-xxxhdpi/tick.png b/res/drawable-xxxhdpi/tick.png Binary files differdeleted file mode 100755 index 050fa9f..0000000 --- a/res/drawable-xxxhdpi/tick.png +++ /dev/null diff --git a/res/drawable-xxxhdpi/timer.png b/res/drawable-xxxhdpi/timer.png Binary files differdeleted file mode 100755 index ce844a2..0000000 --- a/res/drawable-xxxhdpi/timer.png +++ /dev/null diff --git a/res/drawable/cross.xml b/res/drawable/cross.xml new file mode 100644 index 0000000..5a1b3e4 --- /dev/null +++ b/res/drawable/cross.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (c) 2017 The LineageOS 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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + + <path + android:fillColor="@color/black" + android:pathData="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 +19 19 17.59 13.41 12z" /> + <path + android:pathData="M0 0h24v24H0z" /> +</vector> diff --git a/res/drawable/ic_check_mark.xml b/res/drawable/ic_check_mark.xml index a47cb4b..e977fbc 100644 --- a/res/drawable/ic_check_mark.xml +++ b/res/drawable/ic_check_mark.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- Copyright (c) 2015 The CyanogenMod Project + Copyright (c) 2017 The LineageOS Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,6 +22,6 @@ android:viewportHeight="24"> <path - android:fillColor="#7ED321" + android:fillColor="@color/accent" android:pathData="M9 16.2L4.8 12l-1.4 1.4L9 19 21 7l-1.4-1.4L9 16.2z" /> -</vector>
\ No newline at end of file +</vector> diff --git a/res/drawable/ic_chevron_left_wht.xml b/res/drawable/ic_chevron_left_wht.xml deleted file mode 100644 index b51cb23..0000000 --- a/res/drawable/ic_chevron_left_wht.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:viewportWidth="24" - android:viewportHeight="24"> - - <path - android:fillColor="@color/white" - android:pathData="M15.41,7.41L14,6l-6,6l6,6l1.41-1.41L10.83,12L15.41,7.41Z" /> -</vector> diff --git a/res/drawable/ic_chevron_right_wht.xml b/res/drawable/ic_chevron_right_wht.xml deleted file mode 100644 index 95b8160..0000000 --- a/res/drawable/ic_chevron_right_wht.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:viewportWidth="24" - android:viewportHeight="24"> - - <path - android:fillColor="@color/white" - android:pathData="M10,6L8.59,7.41L13.17,12l-4.58,4.59L10,18l6-6L10,6Z" /> -</vector> diff --git a/res/drawable/ic_datetime.xml b/res/drawable/ic_datetime.xml new file mode 100644 index 0000000..60ecaee --- /dev/null +++ b/res/drawable/ic_datetime.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (c) 2017 The LineageOS 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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + + <path + android:pathData="M0 0h24v24H0z" /> + <path + android:fillColor="@color/black" + android:pathData="M19 3h-1V1h-2v2H8V1H6v2H5c-1.11 0-1.99 .9 -1.99 2L3 19c0 1.1 .89 2 2 2h14c1.1 0 +2-.9 2-2V5c0-1.1-.9-2-2-2zm0 16H5V8h14v11zM7 10h5v5H7z" /> +</vector> diff --git a/res/drawable/ic_features.xml b/res/drawable/ic_features.xml new file mode 100644 index 0000000..6db917e --- /dev/null +++ b/res/drawable/ic_features.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (c) 2017 The LineageOS 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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + + <path + android:pathData="M0 0h24v24H0V0z" /> + <path + android:fillColor="@color/black" + android:pathData="M11.8 12.5v-1l1.1-.8c.1-.1 .1 -.2 .1 -.3l-1-1.7c-.1-.1-.2-.2-.3-.1l-1.3 .4 +c-.3-.2-.6-.4-.9-.5l-.2-1.3c0-.1-.1-.2-.3-.2H7c-.1 0-.2 .1 -.3 .2 l-.2 1.3c-.3 +.1 -.6 .3 -.9 .5 l-1.3-.5c-.1 0-.2 0-.3 .1 l-1 1.7c-.1 .1 0 .2 .1 .3l1.1 .8 +v1l-1.1 .8 c-.1 .2 -.1 .3 -.1 .4 l1 1.7c.1 .1 .2 .2 .3 .1 l1.4-.4c.3 .2 .6 .4 .9 +.5 l.2 1.3c-.1 .1 .1 .2 .2 .2 h2c.1 0 .2-.1 .3 -.2l.2-1.3c.3-.1 .6 -.3 .9 +-.5l1.3 .5 c.1 0 .2 0 .3-.1l1-1.7c.1-.1 0-.2-.1-.3l-1.1-.9zM8 14c-1.1 +0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zM19 1H9c-1.1 0-2 .9-2 +2v3h2V4h10v16H9v-2H7v3c0 1.1 .9 2 2 2h10c1.1 0 2-.9 2-2V3c0-1.1-.9-2-2-2z" /> +</vector> diff --git a/res/drawable/ic_fingerprint.xml b/res/drawable/ic_fingerprint.xml new file mode 100644 index 0000000..3a004d6 --- /dev/null +++ b/res/drawable/ic_fingerprint.xml @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (c) 2017 The LineageOS 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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + + <path + android:fillColor="@color/black" + android:pathData="M17.81 4.47c-.08 0-.16-.02-.23-.06C15.66 3.42 14 3 12.01 3c-1.98 0-3.86 .47 +-5.57 1.41-.24 .13 -.54 .04 -.68-.2-.13-.24-.04-.55 .2 -.68C7.82 2.52 9.86 2 +12.01 2c2.13 0 3.99 .47 6.03 1.52 .25 .13 .34 .43 .21 .67-.09 .18 -.26 .28 -.44 +.28 zM3.5 9.72c-.1 0-.2-.03-.29-.09-.23-.16-.28-.47-.12-.7 .99 -1.4 2.25-2.5 +3.75-3.27C9.98 4.04 14 4.03 17.15 5.65c1.5 .77 2.76 1.86 3.75 3.25 .16 .22 .11 +.54-.12 .7 -.23 .16 -.54 .11 +-.7-.12-.9-1.26-2.04-2.25-3.39-2.94-2.87-1.47-6.54-1.47-9.4 .01 -1.36 .7 -2.5 +1.7-3.4 2.96-.08 .14 -.23 .21 -.39 .21 zm6.25 12.07c-.13 +0-.26-.05-.35-.15-.87-.87-1.34-1.43-2.01-2.64-.69-1.23-1.05-2.73-1.05-4.34 +0-2.97 2.54-5.39 5.66-5.39s5.66 2.42 5.66 5.39c0 .28-.22 .5 -.5 .5 +s-.5-.22-.5-.5c0-2.42-2.09-4.39-4.66-4.39-2.57 0-4.66 1.97-4.66 4.39 0 1.44 .32 +2.77 .93 3.85 .64 1.15 1.08 1.64 1.85 2.42 .19 .2 .19 .51 0 .71-.11 .1 -.24 .15 +-.37 .15 zm7.17-1.85c-1.19 0-2.24-.3-3.1-.89-1.49-1.01-2.38-2.65-2.38-4.39 0-.28 +.22 -.5 .5 -.5s.5 .22 .5 .5 c0 1.41 .72 2.74 1.94 3.56 .71 .48 1.54 .71 2.54 .71 +.24 0 .64-.03 1.04-.1 .27 -.05 .53 .13 .58 .41 .05 .27-.13 .53 -.41 .58 -.57 .11 +-1.07 .12 -1.21 .12 zM14.91 22c-.04 +0-.09-.01-.13-.02-1.59-.44-2.63-1.03-3.72-2.1-1.4-1.39-2.17-3.24-2.17-5.22 +0-1.62 1.38-2.94 3.08-2.94 1.7 0 3.08 1.32 3.08 2.94 0 1.07 .93 1.94 2.08 +1.94s2.08-.87 2.08-1.94c0-3.77-3.25-6.83-7.25-6.83-2.84 0-5.44 1.58-6.61 +4.03-.39 .81 -.59 1.76-.59 2.8 0 .78 .07 2.01 .67 3.61 .1 .26-.03 .55 -.29 .64 +-.26 .1 -.55-.04-.64-.29-.49-1.31-.73-2.61-.73-3.96 0-1.2 .23 -2.29 .68 -3.24 +1.33-2.79 4.28-4.6 7.51-4.6 4.55 0 8.25 3.51 8.25 7.83 0 1.62-1.38 2.94-3.08 +2.94s-3.08-1.32-3.08-2.94c0-1.07-.93-1.94-2.08-1.94s-2.08 .87 -2.08 1.94c0 1.71 +.66 3.31 1.87 4.51 .95 .94 1.86 1.46 3.27 1.85 .27 .07 .42 .35 .35 .61-.05 .23 +-.26 .38 -.47 .38 z" /> + <path + android:pathData="M0 0h24v24H0z" /> +</vector> diff --git a/res/drawable/ic_locale.xml b/res/drawable/ic_locale.xml new file mode 100644 index 0000000..ed4def4 --- /dev/null +++ b/res/drawable/ic_locale.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (c) 2017 The LineageOS 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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + + <path + android:pathData="M0 0h24v24H0z" /> + <path + android:fillColor="@color/black" + android:pathData="M12.87 15.07l-2.54-2.51 .03 -.03c1.74-1.94 2.98-4.17 +3.71-6.53H17V4h-7V2H8v2H1v1.99h11.17C11.5 7.92 10.44 9.75 9 11.35 8.07 10.32 7.3 +9.19 6.69 8h-2c.73 1.63 1.73 3.17 2.98 4.56l-5.09 5.02L4 19l5-5 3.11 3.11 .76 +-2.04zM18.5 10h-2L12 22h2l1.12-3h4.75L21 22h2l-4.5-12zm-2.62 7l1.62-4.33L19.12 +17h-3.24z" /> +</vector> diff --git a/res/drawable/ic_location.xml b/res/drawable/ic_location.xml new file mode 100644 index 0000000..1ed1f43 --- /dev/null +++ b/res/drawable/ic_location.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (c) 2017 The LineageOS 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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + + <path + android:fillColor="@color/black" + android:pathData="M12 2C8.13 2 5 5.13 5 9c0 5.25 7 13 7 13s7-7.75 7-13c0-3.87-3.13-7-7-7zm0 +9.5c-1.38 0-2.5-1.12-2.5-2.5s1.12-2.5 2.5-2.5 2.5 1.12 2.5 2.5-1.12 2.5-2.5 2.5z" /> + <path + android:pathData="M0 0h24v24H0z" /> +</vector> diff --git a/res/drawable/ic_lock_screen.xml b/res/drawable/ic_lock_screen.xml new file mode 100644 index 0000000..dc90227 --- /dev/null +++ b/res/drawable/ic_lock_screen.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (c) 2017 The LineageOS 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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + + <path + android:pathData="M0 0h24v24H0z" /> + <path + android:fillColor="@color/black" + android:pathData="M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1 .9 2 2 +2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 +2-2 2zm3.1-9H8.9V6c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2z" /> +</vector> diff --git a/res/drawable/ic_logo_mod_title.xml b/res/drawable/ic_logo_mod_title.xml deleted file mode 100644 index c16fb76..0000000 --- a/res/drawable/ic_logo_mod_title.xml +++ /dev/null @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (c) 2016 Cyanogen, Inc. - 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. ---> -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="72dp" - android:height="16dp" - android:viewportWidth="72" - android:viewportHeight="16"> - - <path - android:name="ic_logo_mod_title" - android:fillColor="#000000" - android:pathData="M19.9097139,5.66053833 C19.9097139,2.54013671 17.3930434,4.53810596e-05 -14.2986968,4.53810596e-05 L0,4.53810596e-05 L0,15.9999319 L2.53412329,15.9999319 -L2.53412329,2.5567008 L8.68814203,2.5567008 L8.68814203,15.9999319 -L11.221803,15.9999319 L11.221803,2.5567008 L14.2986968,2.5567008 -C15.9954325,2.5567008 17.3755906,3.94933205 17.3755906,5.66053833 -L17.3755906,15.9999319 L19.9097139,15.9999319 L19.9097139,5.66053833 Z -M44.8456489,7.26108291 L44.8456489,6.32158153 L44.8456489,5.66049295 -C44.8456489,2.54020478 42.3287472,0 39.2346318,0 L31.9464123,0 C28.853106,0 -26.3363199,2.54020478 26.3363199,5.66049295 L26.3363199,6.93388547 -L26.3363199,7.26108291 L26.3363199,8.73891709 L26.3363199,9.19476983 -L26.3363199,10.3393936 C26.3363199,13.4595683 28.853106,16 31.9464123,16 -L39.2346318,16 C42.3287472,16 44.8456489,13.4595683 44.8456489,10.3393936 -L44.8456489,9.71290807 L44.8456489,8.73891709 L44.8456489,7.26108291 Z -M42.3111788,10.3393936 C42.3111788,12.0508268 40.9310208,13.4432311 -39.2346318,13.4432311 L31.9464123,13.4432311 C30.2502545,13.4432311 -28.8700964,12.0508268 28.8700964,10.3393936 L28.8700964,5.66049295 -C28.8700964,3.94928667 30.2502545,2.55676887 31.9464123,2.55676887 -L39.2346318,2.55676887 C40.9315987,2.55676887 42.3111788,3.94928667 -42.3111788,5.66049295 L42.3111788,10.3393936 Z M64.1708327,0 L51.2719428,0 -L51.2719428,16 L64.1708327,16 C67.2652948,16 69.7817342,13.4595683 -69.7817342,10.3393936 L69.7817342,5.66049295 C69.7817342,2.54020478 67.2652948,0 -64.1708327,0 Z M67.2477265,10.3393936 C67.2477265,12.0508268 -65.8674528,13.4432311 64.1708327,13.4432311 L53.8064129,13.4432311 -L53.8064129,2.55676887 L64.1708327,2.55676887 C65.8674528,2.55676887 -67.2477265,3.94928667 67.2477265,5.66049295 L67.2477265,10.3393936 Z" /> -</vector>
\ No newline at end of file diff --git a/res/drawable/ic_mobile_data.xml b/res/drawable/ic_mobile_data.xml new file mode 100644 index 0000000..f0e620e --- /dev/null +++ b/res/drawable/ic_mobile_data.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (c) 2017 The LineageOS 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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + + <path + android:fillColor="@color/black" + android:fillAlpha=".3" + android:pathData="M2 22h20V2z" /> + <path + android:fillColor="@color/black" + android:pathData="M17 7L2 22h15z" /> +</vector> diff --git a/res/drawable/ic_signal_0.xml b/res/drawable/ic_signal_0.xml index 2c93a12..fa4cd68 100644 --- a/res/drawable/ic_signal_0.xml +++ b/res/drawable/ic_signal_0.xml @@ -1,5 +1,6 @@ <!-- -Copyright (C) 2014 The Android Open Source Project + Copyright (C) 2014 The Android Open Source Project + Copyright (c) 2017 The LineageOS Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,6 +21,6 @@ Copyright (C) 2014 The Android Open Source Project android:viewportWidth="24.0" android:viewportHeight="24.0"> <path - android:fillColor="#FFFFFF" + android:fillColor="#e0e0e0" android:pathData="M2.000000,22.000000l20.000000,0.000000 0.000000,-20.000000z"/> </vector> diff --git a/res/drawable/ic_signal_1.xml b/res/drawable/ic_signal_1.xml index a797951..1479a3f 100644 --- a/res/drawable/ic_signal_1.xml +++ b/res/drawable/ic_signal_1.xml @@ -1,5 +1,6 @@ <!-- -Copyright (C) 2014 The Android Open Source Project + Copyright (C) 2014 The Android Open Source Project + Copyright (c) 2017 The LineageOS Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,7 +21,7 @@ Copyright (C) 2014 The Android Open Source Project android:viewportWidth="24.0" android:viewportHeight="24.0"> <path - android:fillColor="#FFFFFF" + android:fillColor="#e0e0e0" android:pathData="M2.000000,22.000000l20.000000,0.000000 0.000000,-20.000000z"/> <path android:fillColor="@color/accent" diff --git a/res/drawable/ic_signal_2.xml b/res/drawable/ic_signal_2.xml index f7f8b96..6739cc1 100644 --- a/res/drawable/ic_signal_2.xml +++ b/res/drawable/ic_signal_2.xml @@ -1,5 +1,6 @@ <!-- -Copyright (C) 2014 The Android Open Source Project + Copyright (C) 2014 The Android Open Source Project + Copyright (c) 2017 The LineageOS Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,7 +21,7 @@ Copyright (C) 2014 The Android Open Source Project android:viewportWidth="24.0" android:viewportHeight="24.0"> <path - android:fillColor="#FFFFFF" + android:fillColor="#e0e0e0" android:pathData="M2.000000,22.000000l20.000000,0.000000 0.000000,-20.000000z"/> <path android:fillColor="@color/accent" diff --git a/res/drawable/ic_signal_3.xml b/res/drawable/ic_signal_3.xml index a5abaae..57c617a 100644 --- a/res/drawable/ic_signal_3.xml +++ b/res/drawable/ic_signal_3.xml @@ -1,5 +1,6 @@ <!-- -Copyright (C) 2014 The Android Open Source Project + Copyright (C) 2014 The Android Open Source Project + Copyright (c) 2017 The LineageOS Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,7 +21,7 @@ Copyright (C) 2014 The Android Open Source Project android:viewportWidth="24.0" android:viewportHeight="24.0"> <path - android:fillColor="#FFFFFF" + android:fillColor="#e0e0e0" android:pathData="M2.000000,22.000000l20.000000,0.000000 0.000000,-20.000000z"/> <path android:fillColor="@color/accent" diff --git a/res/drawable/ic_signal_4.xml b/res/drawable/ic_signal_4.xml index fb2ada0..850c881 100644 --- a/res/drawable/ic_signal_4.xml +++ b/res/drawable/ic_signal_4.xml @@ -1,5 +1,6 @@ <!-- -Copyright (C) 2014 The Android Open Source Project + Copyright (C) 2014 The Android Open Source Project + Copyright (c) 2017 The LineageOS Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/res/drawable/ic_signal_no_signal.xml b/res/drawable/ic_signal_no_signal.xml index 98f15be..17e6088 100644 --- a/res/drawable/ic_signal_no_signal.xml +++ b/res/drawable/ic_signal_no_signal.xml @@ -1,5 +1,6 @@ <!-- -Copyright (C) 2014 The Android Open Source Project + Copyright (C) 2014 The Android Open Source Project + Copyright (c) 2017 The LineageOS Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,6 +21,6 @@ Copyright (C) 2014 The Android Open Source Project android:viewportWidth="24.0" android:viewportHeight="24.0"> <path - android:fillColor="#FFFFFF" + android:fillColor="#e0e0e0" android:pathData="M2.000000,22.000000l20.000000,0.000000L22.000000,2.000000L2.000000,22.000000zM20.000000,20.000000L6.800000,20.000000L20.000000,6.800000L20.000000,20.000000z"/> </vector> diff --git a/res/drawable/ic_sim.xml b/res/drawable/ic_sim.xml new file mode 100644 index 0000000..d4519d5 --- /dev/null +++ b/res/drawable/ic_sim.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (c) 2017 The LineageOS 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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + + <path + android:fillColor="@color/black" + android:pathData="M19.99 4c0-1.1-.89-2-1.99-2h-8L4 8v12c0 1.1 .9 2 2 2h12.01c1.1 0 1.99-.9 +1.99-2l-.01-16zM9 19H7v-2h2v2zm8 0h-2v-2h2v2zm-8-4H7v-4h2v4zm4 +4h-2v-4h2v4zm0-6h-2v-2h2v2zm4 2h-2v-4h2v4z" /> +</vector> diff --git a/res/drawable/img_oobe_hero.jpg b/res/drawable/img_oobe_hero.jpg Binary files differdeleted file mode 100644 index fab7d97..0000000 --- a/res/drawable/img_oobe_hero.jpg +++ /dev/null diff --git a/res/drawable/logo.xml b/res/drawable/logo.xml new file mode 100644 index 0000000..a17c0dd --- /dev/null +++ b/res/drawable/logo.xml @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (c) 2017 The LineageOS 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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="512dp" + android:height="320dp" + android:viewportWidth="512" + android:viewportHeight="320"> + + <path + android:fillColor="@color/accent" + android:pathData="M157.89,271.64a1.83,1.83,0,0,1-1.89-1.89V248.42h4.65v19.32H171v3.9Z" /> + <path + android:fillColor="@color/accent" + android:pathData="M185,271.64V248.42h4.68v23.22Z" /> + <path + android:fillColor="@color/accent" + android:pathData="M221.17,248.42h4.26v22a1.23,1.23,0,0,1-.67,1.09,3.17,3.17,0,0,1-1.67 .41 +,4,4,0,0,1-1.71-.29,3.11,3.11,0,0,1-1.12-1L210,256v15.61h-4.32v-21.5a1.56,1.56,0,0,1,.68-1.4,3.18,3.18,0,0,1,1.79-.46,3.59,3.59,0,0,1,1.9 +.39 ,5.91,5.91,0,0,1,1.41,1.56l9.72,13.59Z" /> + <path + android:fillColor="@color/accent" + android:pathData="M256.9,252.36H246.2v5.5h9.63v3.93H246.2v5.89H256.6v4H241.51V250.31a1.74,1.74,0,0,1,.59-1.37,2,2,0,0,1,1.4-.52h13.4Z" /> + <path + android:fillColor="@color/accent" + android:pathData="M286.38,271.64l-2-5.76h-8.49l-2,5.76h-4.85l7.87-21.5q.68-1.85,3.15-1.85t3.19,1.89l7.87,21.46ZM277.27,262h5.82l-2.93-8.62Z" /> + <path + android:fillColor="@color/accent" + android:pathData="M314.33,272a11,11,0,0,1-8.36-3.19,11.93,11.93,0,0,1-3.06-8.62,12.12,12.12,0,0,1,3.25-8.89,11.56,11.56,0,0,1,8.62-3.3,11.44,11.44,0,0,1,6,1.5,9,9,0,0,1,3.63,3.93l-3.74,2q-1.69-3.41-6-3.41a6.53,6.53,0,0,0-5.14,2.16,8.58,8.58,0,0,0-1.92,5.9,8.67,8.67,0,0,0,1.79,5.8,6.11,6.11,0,0,0,4.91,2.1,6.74,6.74,0,0,0,4.6-1.58,5.26,5.26,0,0,0,1.87-4h-5.89v-3.67h10.5v2.57a10.19,10.19,0,0,1-3.12,7.72A11.12,11.12,0,0,1,314.33,272Z" /> + <path + android:fillColor="@color/accent" + android:pathData="M356,252.36H345.3v5.5h9.63v3.93H345.3v5.89h10.41v4H340.62V250.31a1.74,1.74,0,0,1,.59-1.37,2,2,0,0,1,1.4-.52H356Z" /> + <path + android:fillColor="@color/accent" + android:pathData="M416,128a39.92,39.92,0,0,0-31.11,14.87l-1.5-.6A294.79,294.79,0,0,0,336,128.14s0-.09,0-.14a80,80,0,1,0-160,0s0,.09,0,.13l-1.72 +.38 a293.48,293.48,0,0,0-45.67,13.76l-1.5 .6 +a40,40,0,1,0,7.39,14.28h0a277.33,277.33,0,0,1,43.1-13,80,80,0,0,0,156.73,0,277.3,277.3,0,0,1,43.11,13h0A40,40,0,1,0,416,128ZM96,192a24,24,0,1,1,24-24A24,24,0,0,1,96,192Zm160,0a64,64,0,1,1,64-64A64.07,64.07,0,0,1,256,192Zm160,0a24,24,0,1,1,24-24A24,24,0,0,1,416,192ZM288,128a32,32,0,1,1-32-32A32,32,0,0,1,288,128Z" /> +</vector> diff --git a/res/drawable/mod_ready.xml b/res/drawable/mod_ready.xml deleted file mode 100644 index 459ff51..0000000 --- a/res/drawable/mod_ready.xml +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (c) 2016 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. ---> -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="256dp" - android:height="114dp" - android:viewportWidth="256" - android:viewportHeight="114"> - - <path android:fillColor="@color/white" - android:pathData="M40,113.7V77.1h14.3c7.5,0,12.3,4,12.3,11.1c0,6.2-3,9.4-8.6,10.6l8,14.9h-5.8l-7.7-14.5h-7.4v14.5H40z - M45.2,94.6h8.7 c4.6,0,7.5-1.9,7.5-6.3c0-4.2-2.5-6.4-7.5-6.4h-8.6v12.7H45.2z - M78.7,113.7V77.1h22.4V82H84v10.6h15.7v4.7H84V109h17.2v4.8 - L78.7,113.7L78.7,113.7z - M136.5,113.7L134,107h-15.7l-2.4,6.7h-5.4l13.2-36.6h5l13.2,36.6H136.5z - M126.1,84.7l-6.2,17.8h12.6 l-6.2-17.8H126.1z - M152.7,113.7V77.1h11.7c8.1,0,15.9,5.6,15.9,18.3c0,13.6-7.6,18.4-16.2,18.4L152.7,113.7L152.7,113.7z - M158,108.9 h5.9c6.9,0,10.8-3.8,10.8-13.6c0-8.8-4-13.4-10.5-13.4H158V108.9z - M198.8,113.7V98.3l-12-21.2h5.7l8.8,16.4h0.1l8.9-16.4h5.7 - l-12,21.2v15.4C204,113.7,198.8,113.7,198.8,113.7z - M73.1,20.8c0-11.3-9.2-20.5-20.6-20.5H0.2v58.1h9.3V9.5H32v48.8h9.3V9.5h11.3 - c6.2,0,11.3,5.1,11.3,11.3v37.5h9.3L73.1,20.8L73.1,20.8z - M164.5,26.6v-3.4v-2.4c0-11.3-9.2-20.5-20.6-20.5h-26.7 - c-11.3,0-20.5,9.2-20.5,20.5v4.6v1.2V32v1.7v4.2c0,11.3,9.2,20.5,20.5,20.5h26.7c11.3,0,20.6-9.2,20.6-20.5v-2.3V32V26.6z - M155.2,37.8c0,6.2-5.1,11.3-11.3,11.3h-26.7c-6.2,0-11.3-5.1-11.3-11.3v-17c0-6.2,5.1-11.3,11.3-11.3h26.7 - c6.2,0,11.3,5.1,11.3,11.3V37.8z - M235.2,0.3H188v58.1h47.2c11.3,0,20.6-9.2,20.6-20.5v-17C255.8,9.5,246.6,0.3,235.2,0.3z - M246.5,37.8c0,6.2-5.1,11.3-11.3,11.3h-38V9.5h38c6.2,0,11.3,5.1,11.3,11.3V37.8z" /> -</vector>
\ No newline at end of file diff --git a/res/drawable/tick.xml b/res/drawable/tick.xml new file mode 100644 index 0000000..c34dcc9 --- /dev/null +++ b/res/drawable/tick.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (c) 2017 The LineageOS 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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + + <path + android:pathData="M0 0h24v24H0z" /> + <path + android:fillColor="@color/black" + android:pathData="M9 16.2L4.8 12l-1.4 1.4L9 19 21 7l-1.4-1.4L9 16.2z" /> +</vector> diff --git a/res/drawable/timelapse.xml b/res/drawable/timelapse.xml new file mode 100644 index 0000000..5a1b3e4 --- /dev/null +++ b/res/drawable/timelapse.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (c) 2017 The LineageOS 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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + + <path + android:fillColor="@color/black" + android:pathData="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 +19 19 17.59 13.41 12z" /> + <path + android:pathData="M0 0h24v24H0z" /> +</vector> diff --git a/res/layout-land/logo_header.xml b/res/layout-land/logo_header.xml deleted file mode 100644 index 8bb5652..0000000 --- a/res/layout-land/logo_header.xml +++ /dev/null @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2015 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. ---> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/header" - android:layout_width="0px" - android:layout_height="match_parent" - android:layout_weight="1" - android:paddingTop="@dimen/header_logo_margin_top" - android:background="@color/primary" - style="@style/Header"> - - <ImageView - android:id="@+id/brand_logo" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/brand" - android:paddingLeft="@dimen/header_logo_margin_left" - android:paddingBottom="@dimen/header_logo_margin_bottom" - android:layout_alignParentTop="true"/> - - <ImageView - android:id="@+id/powered_by_logo" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/powered_by" - android:visibility="gone" - android:paddingLeft="@dimen/header_logo_margin_left" - android:paddingBottom="@dimen/header_logo_margin_bottom" - android:layout_below="@+id/brand_logo"/> - - <TextView - android:layout_width="match_parent" - android:layout_height="@dimen/page_title_height" - style="@style/PageTitle" /> - -</RelativeLayout>
\ No newline at end of file diff --git a/res/layout/header.xml b/res/layout-land/setup_locale.xml index e335b79..fd3d1aa 100644 --- a/res/layout/header.xml +++ b/res/layout-land/setup_locale.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - Copyright (C) 2015 The CyanogenMod Project + Copyright (C) 2017 The LineageOS Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -14,16 +14,18 @@ See the License for the specific language governing permissions and limitations under the License. --> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/header" - android:layout_width="match_parent" - android:layout_height="@dimen/header_height" - android:background="@color/header_bg" - style="@style/Header"> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent"> - <TextView - android:layout_width="match_parent" - android:layout_height="@dimen/page_title_height" - style="@style/PageTitle" /> + <include layout="@layout/header_condensed" /> -</RelativeLayout>
\ No newline at end of file + <com.cyanogenmod.setupwizard.ui.LocalePicker + android:id="@+id/locale_list" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:focusable="true" + android:focusableInTouchMode="true" + android:layout_centerInParent="true"/> +</LinearLayout> diff --git a/res/layout-land/setup_welcome_page.xml b/res/layout-land/setup_welcome_page.xml index a3afa51..3cdd08b 100644 --- a/res/layout-land/setup_welcome_page.xml +++ b/res/layout-land/setup_welcome_page.xml @@ -17,28 +17,16 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="horizontal" android:layout_width="match_parent" - android:layout_height="match_parent"> - - <include layout="@layout/logo_header" /> - - <RelativeLayout android:id="@+id/page" - android:layout_width="0px" - android:layout_height="match_parent" - android:layout_weight="1" - android:gravity="center" - android:paddingLeft="@dimen/content_margin_left" - android:paddingRight="@dimen/content_margin_left" - style="@style/PageContent"> - - <com.cyanogenmod.setupwizard.ui.LocalePicker - android:id="@+id/locale_list" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:minHeight="@dimen/min_locale_picker_height" - android:focusable="true" - android:focusableInTouchMode="true" - android:layout_centerInParent="true"/> - - </RelativeLayout> + android:layout_height="match_parent" + android:layout_gravity="center"> + + <ImageView + android:id="@+id/brand_logo" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:src="@drawable/logo" + android:adjustViewBounds="true" + android:scaleType="fitCenter" + android:padding="@dimen/content_margin_left"/> </LinearLayout> diff --git a/res/layout-land/sim_missing_page.xml b/res/layout-land/sim_missing_page.xml index df30314..f262adf 100644 --- a/res/layout-land/sim_missing_page.xml +++ b/res/layout-land/sim_missing_page.xml @@ -19,7 +19,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <include layout="@layout/header" /> + <include layout="@layout/header_condensed" /> <FrameLayout android:id="@+id/page" android:layout_width="match_parent" @@ -55,7 +55,3 @@ </LinearLayout> </FrameLayout> </LinearLayout> - - - - diff --git a/res/layout/button_bar.xml b/res/layout/button_bar.xml index ae3d42d..8b8256d 100644 --- a/res/layout/button_bar.xml +++ b/res/layout/button_bar.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2015 The CyanogenMod Project + Copyright (C) 2017 The LineageOS Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -24,13 +25,16 @@ <Button style="@style/ButtonBar.Left" android:id="@+id/prev_button" - android:layout_width="wrap_content" - android:layout_weight="1"/> + android:layout_width="0dp" + android:background="?android:attr/selectableItemBackground" + android:layout_weight="3"/> <Button style="@style/ButtonBar.Right" android:id="@+id/next_button" - android:layout_width="wrap_content" - android:text="@string/next" /> + android:layout_width="0dp" + android:background="?android:attr/selectableItemBackground" + android:text="@string/next" + android:layout_weight="2" /> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/res/layout/choose_data_sim_page.xml b/res/layout/choose_data_sim_page.xml index c93a89f..9bfebf1 100644 --- a/res/layout/choose_data_sim_page.xml +++ b/res/layout/choose_data_sim_page.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2015 The CyanogenMod Project + Copyright (C) 2017 The LineageOS Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,7 +20,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <include layout="@layout/header" /> + <include layout="@layout/header_condensed" /> <FrameLayout android:id="@+id/page" android:layout_width="match_parent" @@ -63,5 +64,3 @@ android:visibility="gone"/> </FrameLayout> </LinearLayout> - - diff --git a/res/layout/header_condensed.xml b/res/layout/header_condensed.xml index 9319836..b507b08 100644 --- a/res/layout/header_condensed.xml +++ b/res/layout/header_condensed.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2015 The CyanogenMod Project + Copyright (C) 2017 The LineageOS Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -15,15 +16,32 @@ limitations under the License. --> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/header" - android:layout_width="match_parent" - android:layout_height="@dimen/header_condensed_height" - android:background="@color/header_condensed_bg" - style="@style/Header"> + android:id="@+id/header" + android:layout_width="match_parent" + android:layout_height="@dimen/header_condensed_height" + android:paddingTop="48dp" + android:orientation="vertical"> + + <ImageView + android:id="@+id/header_icon" + android:layout_width="64dp" + android:layout_height="wrap_content" + android:paddingStart="8dp" + android:paddingEnd="8dp" + android:adjustViewBounds="true" + android:scaleType="centerInside" + android:visibility="gone" + android:contentDescription="@null" /> <TextView android:layout_width="match_parent" - android:layout_height="@dimen/page_title_height" + android:layout_height="64dp" + android:layout_toEndOf="@id/header_icon" + android:paddingEnd="8dp" + android:typeface="monospace" + android:gravity="center_vertical" + android:maxLines="1" + android:ellipsize="end" style="@style/PageTitle" /> -</RelativeLayout>
\ No newline at end of file +</RelativeLayout> diff --git a/res/layout/logo_header.xml b/res/layout/logo_header.xml deleted file mode 100644 index 8e55740..0000000 --- a/res/layout/logo_header.xml +++ /dev/null @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2015 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. ---> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/header" - android:layout_width="match_parent" - android:layout_height="@dimen/logo_header_height" - android:background="@color/primary" - style="@style/Header"> - - <ImageView - android:id="@+id/brand_logo" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/brand" - android:paddingLeft="@dimen/header_logo_margin_left" - android:paddingBottom="@dimen/header_logo_margin_bottom" - android:layout_above="@+id/powered_by_logo"/> - - <ImageView - android:id="@+id/powered_by_logo" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/powered_by" - android:visibility="gone" - android:paddingLeft="@dimen/header_logo_margin_left" - android:paddingBottom="@dimen/header_logo_margin_bottom" - android:layout_above="@android:id/title"/> - - <TextView - android:layout_width="match_parent" - android:layout_height="@dimen/page_title_height" - style="@style/PageTitle" /> - -</RelativeLayout>
\ No newline at end of file diff --git a/res/layout/mobile_data_settings.xml b/res/layout/mobile_data_settings.xml index a74b352..6e71bdf 100644 --- a/res/layout/mobile_data_settings.xml +++ b/res/layout/mobile_data_settings.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2013 The CyanogenMod Project + Copyright (C) 2017 The LineageOS Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,7 +20,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <include layout="@layout/header" /> + <include layout="@layout/header_condensed" /> <ProgressBar android:id="@+id/progress" @@ -102,4 +103,3 @@ </ScrollView> </FrameLayout> </LinearLayout> - diff --git a/res/layout/setup_cyanogen_services.xml b/res/layout/setup_cyanogen_services.xml index 3ab26c7..203376a 100644 --- a/res/layout/setup_cyanogen_services.xml +++ b/res/layout/setup_cyanogen_services.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2015 The CyanogenMod Project + Copyright (C) 2017 The LineageOS Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -209,7 +210,42 @@ android:text="@string/services_os_nav_keys_label"/> </LinearLayout> + + <LinearLayout + android:id="@+id/privacy_guard" + android:orientation="horizontal" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingLeft="@dimen/location_margin_left" + android:paddingRight="@dimen/content_margin_right" + android:background="?android:attr/selectableItemBackground" + android:clickable="true"> + + <CheckBox + android:id="@+id/privacy_guard_checkbox" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="top" + android:layout_marginTop="5dp" + android:duplicateParentState="true" + android:clickable="false" /> + + <TextView + android:id="@+id/privacy_guard_summary" + android:layout_width="0px" + android:layout_height="wrap_content" + android:layout_weight="1" + android:textSize="15sp" + android:lineSpacingExtra="@dimen/setup_line_spacing" + android:gravity="top" + android:layout_marginLeft="@dimen/location_text_margin_left" + android:layout_marginRight="@dimen/location_text_margin_right" + android:paddingBottom="@dimen/content_margin_bottom" + android:text="@string/services_os_privacy_guard"/> + + </LinearLayout> + </LinearLayout> </ScrollView> </FrameLayout> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/res/layout/setup_datetime_page.xml b/res/layout/setup_datetime_page.xml index b1bfb3f..47d9346 100644 --- a/res/layout/setup_datetime_page.xml +++ b/res/layout/setup_datetime_page.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2013 The CyanogenMod Project + Copyright (C) 2017 The LineageOS Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,7 +20,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <include layout="@layout/header" /> + <include layout="@layout/header_condensed" /> <FrameLayout android:id="@+id/page" android:layout_width="match_parent" @@ -109,4 +110,4 @@ </LinearLayout> </ScrollView> </FrameLayout> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/res/layout/setup_fingerprint.xml b/res/layout/setup_fingerprint.xml index 6af8519..4e9d319 100644 --- a/res/layout/setup_fingerprint.xml +++ b/res/layout/setup_fingerprint.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2015 The CyanogenMod Project + Copyright (C) 2017 The LineageOS Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,7 +20,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <include layout="@layout/header" /> + <include layout="@layout/header_condensed" /> <FrameLayout android:id="@+id/page" android:layout_width="match_parent" @@ -87,4 +88,4 @@ </LinearLayout> </ScrollView> </FrameLayout> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/res/layout/setup_finished_page.xml b/res/layout/setup_finished_page.xml index 0f96893..5429cba 100644 --- a/res/layout/setup_finished_page.xml +++ b/res/layout/setup_finished_page.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2013 The CyanogenMod Project + Copyright (C) 2017 The LineageOS Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -25,41 +26,16 @@ android:layout_weight="1"/> <ImageView - android:id="@+id/brand_logo" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:src="@drawable/brand_finish" - android:scaleType="centerInside" - android:padding="@dimen/content_margin_left"/> - - - - <TextView android:id="@+id/mod_welcome" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textSize="20sp" - android:layout_marginTop="105dp" - android:paddingLeft="@dimen/content_margin_left" - android:paddingRight="@dimen/content_margin_right" - android:text="@string/mod_welcome" - android:fontFamily="sans-serif-medium" - android:textColor="@color/white" - android:visibility="gone"/> - - - <TextView android:id="@+id/mod_desc" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textSize="16sp" - android:layout_marginTop="16dp" - android:paddingLeft="@dimen/content_margin_left" - android:paddingRight="@dimen/content_margin_right" - android:text="@string/mod_description" - android:textColor="@color/white" - android:visibility="gone"/> + android:id="@+id/brand_logo" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:src="@drawable/logo" + android:adjustViewBounds="true" + android:scaleType="fitCenter" + android:padding="@dimen/content_margin_left"/> <Space android:layout_width="match_parent" android:layout_height="0px" android:layout_weight="1"/> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/res/layout/setup_loading_page.xml b/res/layout/setup_loading_page.xml index 388095e..c65bbbf 100644 --- a/res/layout/setup_loading_page.xml +++ b/res/layout/setup_loading_page.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2015 The CyanogenMod Project + Copyright (C) 2017 The LineageOS Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,14 +20,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <include layout="@layout/header" /> + <include layout="@layout/header_condensed" /> <ProgressBar android:id="@+id/progressBar1" style="?android:attr/progressBarStyleHorizontal" android:indeterminateOnly="true" android:layout_width="match_parent" - android:layout_height="8dp" /> + android:layout_height="8dp" + android:paddingStart="0dp" + android:paddingEnd="0dp" /> <FrameLayout android:id="@+id/page" android:layout_width="match_parent" @@ -34,7 +37,3 @@ android:layout_weight="1" style="@style/PageContent"/> </LinearLayout> - - - - diff --git a/res/layout/setup_locale.xml b/res/layout/setup_locale.xml new file mode 100644 index 0000000..43074b1 --- /dev/null +++ b/res/layout/setup_locale.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2013 The CyanogenMod Project + Copyright (C) 2017 The LineageOS 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. +--> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <include layout="@layout/header_condensed" /> + + <RelativeLayout android:id="@+id/page" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" + android:gravity="center" + android:paddingLeft="@dimen/content_margin_left" + android:paddingRight="@dimen/content_margin_left" + style="@style/PageContent"> + + <com.cyanogenmod.setupwizard.ui.LocalePicker + android:id="@+id/locale_list" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:focusable="true" + android:focusableInTouchMode="true" + android:layout_alignParentBottom="true" + android:layout_centerHorizontal="true"/> + + </RelativeLayout> +</LinearLayout> diff --git a/res/layout/setup_lockscreen.xml b/res/layout/setup_lockscreen.xml index 20f06bd..25f7c01 100644 --- a/res/layout/setup_lockscreen.xml +++ b/res/layout/setup_lockscreen.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2015 The CyanogenMod Project + Copyright (C) 2017 The LineageOS Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,7 +20,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <include layout="@layout/header" /> + <include layout="@layout/header_condensed" /> <FrameLayout android:id="@+id/page" android:layout_width="match_parent" @@ -34,6 +35,8 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" + android:paddingStart="@dimen/content_margin_left" + android:paddingEnd="@dimen/content_margin_left" style="@style/PageContent"> <TextView @@ -41,21 +44,23 @@ android:layout_height="wrap_content" style="@style/PageSummaryText" android:textSize="16sp" - android:paddingLeft="@dimen/content_margin_left" android:layout_marginBottom="@dimen/summary_margin_bottom" android:paddingRight="@dimen/location_text_margin_right" android:text="@string/lockscreen_setup_summary" /> - <TextView + <Button android:id="@+id/setup_lockscreen" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingLeft="@dimen/content_margin_left" android:paddingRight="@dimen/location_text_margin_right" - android:gravity="center_vertical" + android:gravity="center" android:textSize="16sp" android:textAllCaps="true" - android:textColor="@color/accent" + android:textColor="@color/white" + android:background="@color/accent" + android:maxLines="1" + android:ellipsize="end" android:text="@string/lockscreen_setup_screen_lock_setup"/> </LinearLayout> diff --git a/res/layout/setup_modguide_page.xml b/res/layout/setup_modguide_page.xml deleted file mode 100644 index beec6eb..0000000 --- a/res/layout/setup_modguide_page.xml +++ /dev/null @@ -1,102 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2013 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. ---> -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@color/mod_yellow"> - - <FrameLayout - android:layout_width="match_parent" - android:layout_height="296dp"> - <ImageView - android:layout_width="match_parent" - android:layout_height="match_parent" - android:scaleType="centerCrop" - android:src="@drawable/img_oobe_hero" - tools:ignore="ContentDescription"/> - <ImageView - android:layout_width="140dp" - android:layout_height="32dp" - android:src="@drawable/ic_logo_mod_title" - android:tint="@color/white" - android:layout_marginTop="72dp" - android:layout_marginStart="24dp" - tools:ignore="ContentDescription"/> - </FrameLayout> - - <TextView android:id="@+id/mod_welcome" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:minHeight="20sp" - android:textSize="16sp" - android:fontFamily="sans-serif" - android:layout_marginTop="32dp" - android:paddingStart="24dp" - android:paddingEnd="24dp" - android:text="@string/mod_welcome" - android:textColor="@color/mod_title"/> - - <TextView android:id="@+id/mod_desc" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:fontFamily="sans-serif" - android:textSize="14sp" - android:lineSpacingExtra="6sp" - android:layout_marginTop="3dp" - android:paddingStart="24dp" - android:paddingEnd="24dp" - android:text="@string/mod_description" - android:textColor="@color/mod_description"/> - - <FrameLayout - android:layout_width="wrap_content" - android:layout_height="72dp" - android:minWidth="208dp" - android:layout_marginTop="25dp" - android:layout_marginStart="24dp" - android:background="@drawable/btn_mod_oobe"> - - <LinearLayout - android:id="@+id/explore_mod_guide" - android:layout_width="wrap_content" - android:layout_height="40dp" - android:minWidth="176dp" - android:orientation="horizontal"> - - <ImageView - android:layout_width="24dp" - android:layout_height="24dp" - android:src="@mipmap/ic_modguide" - android:layout_margin="8dp" - tools:ignore="ContentDescription"/> - - <TextView - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_marginStart="16dp" - android:layout_marginEnd="16dp" - android:gravity="center_vertical" - android:fontFamily="sans-serif" - android:text="@string/mod_explore" - android:textAllCaps="false" - android:textColor="@color/mod_title"/> - </LinearLayout> - </FrameLayout> -</LinearLayout> diff --git a/res/layout/setup_welcome_page.xml b/res/layout/setup_welcome_page.xml index c45e77e..a75c64d 100644 --- a/res/layout/setup_welcome_page.xml +++ b/res/layout/setup_welcome_page.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2013 The CyanogenMod Project + Copyright (C) 2017 The LineageOS Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -17,27 +18,24 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="match_parent"> - - <include layout="@layout/logo_header" /> - - <RelativeLayout android:id="@+id/page" - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" - android:gravity="center" - android:paddingLeft="@dimen/content_margin_left" - android:paddingRight="@dimen/content_margin_left" - style="@style/PageContent"> - - <com.cyanogenmod.setupwizard.ui.LocalePicker - android:id="@+id/locale_list" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:focusable="true" - android:focusableInTouchMode="true" - android:layout_centerInParent="true"/> - - </RelativeLayout> + android:layout_height="match_parent" + android:background="@color/primary"> + + <Space android:layout_width="match_parent" + android:layout_height="0px" + android:layout_weight="1"/> + + <ImageView + android:id="@+id/brand_logo" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:src="@drawable/logo" + android:adjustViewBounds="true" + android:scaleType="fitCenter" + android:padding="@dimen/content_margin_left"/> + + <Space android:layout_width="match_parent" + android:layout_height="0px" + android:layout_weight="1"/> </LinearLayout> diff --git a/res/layout/sim_missing_page.xml b/res/layout/sim_missing_page.xml index 8bd8607..3722dd1 100644 --- a/res/layout/sim_missing_page.xml +++ b/res/layout/sim_missing_page.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2015 The CyanogenMod Project + Copyright (C) 2017 The LineageOS Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,7 +20,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <include layout="@layout/header" /> + <include layout="@layout/header_condensed" /> <FrameLayout android:id="@+id/page" android:layout_width="match_parent" @@ -54,7 +55,3 @@ </LinearLayout> </FrameLayout> </LinearLayout> - - - - diff --git a/res/layout/terms_webview.xml b/res/layout/terms_webview.xml deleted file mode 100644 index cfd44a9..0000000 --- a/res/layout/terms_webview.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2013 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. ---> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <View - android:layout_height="match_parent" - android:layout_width="match_parent" - android:layout_weight="1" /> - </LinearLayout> - - <WebView - android:id="@+id/webview" - android:layout_width="match_parent" - android:layout_height="match_parent" /> -</FrameLayout> diff --git a/res/mipmap-hdpi/ic_launcher.png b/res/mipmap-hdpi/ic_launcher.png Binary files differnew file mode 100644 index 0000000..0a2f2e4 --- /dev/null +++ b/res/mipmap-hdpi/ic_launcher.png diff --git a/res/mipmap-hdpi/ic_modguide.png b/res/mipmap-hdpi/ic_modguide.png Binary files differdeleted file mode 100644 index a2fb4a4..0000000 --- a/res/mipmap-hdpi/ic_modguide.png +++ /dev/null diff --git a/res/mipmap-mdpi/ic_launcher.png b/res/mipmap-mdpi/ic_launcher.png Binary files differnew file mode 100644 index 0000000..35a64f8 --- /dev/null +++ b/res/mipmap-mdpi/ic_launcher.png diff --git a/res/mipmap-mdpi/ic_modguide.png b/res/mipmap-mdpi/ic_modguide.png Binary files differdeleted file mode 100644 index ad24eb6..0000000 --- a/res/mipmap-mdpi/ic_modguide.png +++ /dev/null diff --git a/res/mipmap-xhdpi/ic_launcher.png b/res/mipmap-xhdpi/ic_launcher.png Binary files differnew file mode 100644 index 0000000..9fe8069 --- /dev/null +++ b/res/mipmap-xhdpi/ic_launcher.png diff --git a/res/mipmap-xhdpi/ic_modguide.png b/res/mipmap-xhdpi/ic_modguide.png Binary files differdeleted file mode 100644 index 784589c..0000000 --- a/res/mipmap-xhdpi/ic_modguide.png +++ /dev/null diff --git a/res/mipmap-xxhdpi/ic_launcher.png b/res/mipmap-xxhdpi/ic_launcher.png Binary files differnew file mode 100644 index 0000000..a902466 --- /dev/null +++ b/res/mipmap-xxhdpi/ic_launcher.png diff --git a/res/mipmap-xxhdpi/ic_modguide.png b/res/mipmap-xxhdpi/ic_modguide.png Binary files differdeleted file mode 100644 index 7226819..0000000 --- a/res/mipmap-xxhdpi/ic_modguide.png +++ /dev/null diff --git a/res/mipmap-xxxhdpi/ic_launcher.png b/res/mipmap-xxxhdpi/ic_launcher.png Binary files differnew file mode 100644 index 0000000..805a89a --- /dev/null +++ b/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/res/mipmap-xxxhdpi/ic_modguide.png b/res/mipmap-xxxhdpi/ic_modguide.png Binary files differdeleted file mode 100644 index 3cc0d7f..0000000 --- a/res/mipmap-xxxhdpi/ic_modguide.png +++ /dev/null diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index 98ab363..96b722a 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -54,9 +54,9 @@ <string name="yes">Ja</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">Noodoproep</string> - <string name="setup_services">Cyanogen funksies</string> - <string name="services_explanation" product="tablet">Hierdie dienste werk vir jou om die vermoëns van jou tablet uit te brei. Data sal in ooreenkomstig gebruik word met Cyanogen\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> - <string name="services_explanation" product="default">Hierdie dienste werk vir jou om die vermoëns van jou foon uit te brei. Data sal in ooreenkomstig gebruik word met Cyanogen\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> + <string name="setup_services">LineageOS funksies</string> + <string name="services_explanation" product="tablet">Hierdie dienste werk vir jou om die vermoëns van jou tablet uit te brei. Data sal in ooreenkomstig gebruik word met LineageOS\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> + <string name="services_explanation" product="default">Hierdie dienste werk vir jou om die vermoëns van jou foon uit te brei. Data sal in ooreenkomstig gebruik word met LineageOS\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> <string name="services_privacy_policy">Privaatheid beleid</string> <string name="services_help_improve_cm">Help verbeter <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string> <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> deur outomaties diagnostiese en gebruikers data te stuur na Cyanogen. Hierdie inligting kan nie gebruik word om jou te identifiseer nie en help spanne werk op dinge soos battery lewe, program werkverrigting en nuwe <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> funksies.</string> @@ -67,7 +67,7 @@ <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> om SMS gesprekke met ander gebruikers te enkripteer met behulp van veilige SMS op \'n <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> toestel.</string> <string name="setup_unlock">Ontsluit</string> <string name="setup_device_locked">Die toestel is gesluit deur die gebruiker.</string> - <string name="setup_require_cyanogen_label"><b>Benodig jou Cyanogen wagwoord</b> om jou toestel te gebruik, selfs nadat \'n fabriek herstel gedoen is.</string> + <string name="setup_require_cyanogen_label"><b>Benodig jou wagwoord</b> om jou toestel te gebruik, selfs nadat \'n fabriek herstel gedoen is.</string> <string name="setup_device_locked_instructions"><i>Om hierdie funksie te aan/af te skakel, gaan asseblief na Instellings > Sekuriteit</i></string> <string name="setup_warning_skip_anyway">Sonder \'n Cyanogen bedryfstelsel rekening, sal jy nie in staat wees om:\n\nOm jou toestel met nuwe ikone, agtergronde en meer in die Temas program te verpersoonlik nie\n\nJou toestel te vind of op te spoor indien dit verlore gaan nie</string> <!-- Fingerprint setup --> diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index 6b5108e..5e85b18 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -53,7 +53,7 @@ <string name="yes">نعم</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g> شريحة</string> <string name="emergency_call">مكالمة طوارئ</string> - <string name="setup_services">ميزات Cyanogen</string> + <string name="setup_services">ميزات LineageOS</string> <string name="services_explanation" product="tablet">تعمل هذه الخدمات على توسيع نطاق إمكانيات الكمبيوتر اللوحي الخاص بك. ستُستخدم البيانات بحسب <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> <string name="services_explanation" product="default">تعمل هذه الخدمات على توسيع نطاق إمكانيات هاتفك. ستُستخدم البيانات بحسب <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> <string name="services_privacy_policy">سياسة الخصوصية</string> @@ -66,7 +66,7 @@ <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s </xliff:g> لتشفير المحادثات عبر الرسائل القصيرة مع المستخدمين الآخرين باستخدام شريحة SMS آمنة على جهاز <xliff:g id="name" example="CyanogenMod"> %2$s </xliff:g>.</string> <string name="setup_unlock">فتح القفل</string> <string name="setup_device_locked">هذا الجهاز تم قفله من قبل المستخدم.</string> - <string name="setup_require_cyanogen_label"><b>يتطلب كلمة مرور حساب Cyanogen OS </b>كي تتمكن من استخدام الجهاز حتى بعد إعادة تعيين المصنع.</string> + <string name="setup_require_cyanogen_label"><b>يتطلب كلمة مرور حساب </b>كي تتمكن من استخدام الجهاز حتى بعد إعادة تعيين المصنع.</string> <string name="setup_device_locked_instructions"><i>من أجل تشغيل/تعطيل هذه الميزة، الرجاء إذهب إلى إعدادات > الأمان</i></string> <string name="setup_warning_skip_anyway">بدون حساب Cyanogen OS لن تستطيع أن:\n\nتخصص هاتفك بأيقونات وخلفيات جديدة والمزيد في تطبيق السمات\n\nأو تحديد مكان هاتفك أو مسح ذاكرته عن بعد إذا فُقد</string> <!-- Fingerprint setup --> diff --git a/res/values-as-rIN/strings.xml b/res/values-as-rIN/strings.xml index 0a4e1a7..c779b43 100644 --- a/res/values-as-rIN/strings.xml +++ b/res/values-as-rIN/strings.xml @@ -53,9 +53,9 @@ <string name="yes">হয়</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">জৰুৰীকালীন কল</string> - <string name="setup_services">Cyanogen বৈশিষ্ট্যবোৰ</string> - <string name="services_explanation" product="tablet">এই সেৱাবোৰে আপোনাৰ টেবলেট কম্পিউটাৰৰ সক্ষমতা সম্প্ৰসাৰিত কৰিবলৈ কাম কৰে। ডাটা Cyanogen ৰ <xliff:g id="name" example="Privacy Policy">%s</xliff:g> অনুযায়ী ব্যৱহাৰ কৰা হ\'ব।</string> - <string name="services_explanation" product="default">এই সেৱাবোৰে আপোনাৰ ফোনৰ সক্ষমতা সম্প্ৰসাৰিত কৰিবলৈ কাম কৰে। ডাটা Cyanogen ৰ <xliff:g id="name" example="Privacy Policy">%s</xliff:g> অনুযায়ী ব্যৱহাৰ কৰা হ\'ব।</string> + <string name="setup_services">LineageOS বৈশিষ্ট্যবোৰ</string> + <string name="services_explanation" product="tablet">এই সেৱাবোৰে আপোনাৰ টেবলেট কম্পিউটাৰৰ সক্ষমতা সম্প্ৰসাৰিত কৰিবলৈ কাম কৰে। ডাটা LineageOS ৰ <xliff:g id="name" example="Privacy Policy">%s</xliff:g> অনুযায়ী ব্যৱহাৰ কৰা হ\'ব।</string> + <string name="services_explanation" product="default">এই সেৱাবোৰে আপোনাৰ ফোনৰ সক্ষমতা সম্প্ৰসাৰিত কৰিবলৈ কাম কৰে। ডাটা LineageOS ৰ <xliff:g id="name" example="Privacy Policy">%s</xliff:g> অনুযায়ী ব্যৱহাৰ কৰা হ\'ব।</string> <string name="services_privacy_policy">গোপনীয়তা নীতি</string> <string name="services_help_improve_cm">স্বয়ংক্ৰিয়ভাবে ডায়গনষ্টিক আৰু ব্যৱহাৰ ডাটা Cyanogen লৈ প্ৰেৰণ কৰি <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string> <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> উন্নত কৰাত সহায় কৰক এই তথ্য আপোনাক চিনাক্ত কৰিবলৈ ব্যৱহাৰ কৰিব পৰা নাযায় আৰু বেটাৰীৰ আয়ুস, এপ্প্ৰ কাৰ্যকাৰীতা আৰু নতুন <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> বৈশিষ্ট্যবোৰৰ ওপৰত কাম কৰি থকা দলবোৰক সহায় কৰে।</string> @@ -65,7 +65,7 @@ <string name="services_secure_sms_label"><xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> ডিভাইচত সুৰক্ষিত SMS ব্যৱহাৰ কৰি থকা আন ব্যৱহাৰকৰ্তাৰ সৈতে SMS কথোপকথন এনক্ৰিপ্ট কৰিবলৈ সুৰক্ষিত SMS <xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> ব্যৱহাৰ কৰক।</string> <string name="setup_unlock">আনলক</string> <string name="setup_device_locked">ডিভাইচটো ব্যৱহাৰকৰ্তাৰ দ্বাৰা লক কৰা হৈছে।</string> - <string name="setup_require_cyanogen_label">আনকি ফেক্টৰী ৰিছেটৰ পাছতো আপোনাৰ ডিভাইচটো ব্যৱহাৰ কৰিবলৈ <b>আপোনাৰ Cyanogen OS একাউণ্টৰ পাছৱৰ্ড প্ৰয়োজন</b>।</string> + <string name="setup_require_cyanogen_label">আনকি ফেক্টৰী ৰিছেটৰ পাছতো আপোনাৰ ডিভাইচটো ব্যৱহাৰ কৰিবলৈ <b>আপোনাৰ একাউণ্টৰ পাছৱৰ্ড প্ৰয়োজন</b>।</string> <string name="setup_device_locked_instructions"><i>এই বৈশিষ্ট্যটো অন/অফ কৰিবলৈ অনুগ্ৰহ কৰি ছেটিংচ > নিৰাপত্তা লৈ যাওক</i></string> <string name="setup_warning_skip_anyway">Cyanogen OS একাউণ্ট অবিহনে, আপুনি এইবোৰ কৰিবলৈ সক্ষম নহ\'ব:\n\nআপোনাৰ ফোনটো নতুন আইকন, ৱালপেপাৰ আৰু বিষয়বস্তুচ্ এপ্পৰ বহুতৰ সৈতে অনুকূলিত কৰিবলৈ\n\n আপোনাৰ ফোন হেৰালে অৱস্থান নিৰূপণ কৰিব বা দূৰৰ পৰাই আপোনাৰ ফোনটো মচি পেলাব</string> <!-- Fingerprint setup --> diff --git a/res/values-ast-rES/strings.xml b/res/values-ast-rES/strings.xml index 43f9926..6ca8f74 100644 --- a/res/values-ast-rES/strings.xml +++ b/res/values-ast-rES/strings.xml @@ -53,9 +53,9 @@ <string name="yes">Sí</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">Llamada d\'emerxencia</string> - <string name="setup_services">Carauterístiques de Cyanogen</string> - <string name="services_explanation" product="tablet">Estos servicios furrulen por ti pa estender les capacidaes de la tableta. Los datos usaránse acordies cola <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de Cyanogen.</string> - <string name="services_explanation" product="default">Estos servicios furrulen por ti pa estender les capacidaes del móvil. Los datos usaránse acordies cola <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de Cyanogen.</string> + <string name="setup_services">Carauterístiques de LineageOS</string> + <string name="services_explanation" product="tablet">Estos servicios furrulen por ti pa estender les capacidaes de la tableta. Los datos usaránse acordies cola <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de LineageOS.</string> + <string name="services_explanation" product="default">Estos servicios furrulen por ti pa estender les capacidaes del móvil. Los datos usaránse acordies cola <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de LineageOS.</string> <string name="services_privacy_policy">Política de privacidá</string> <string name="services_help_improve_cm">Ayudar a ameyorar <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string> <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> unviando automáticamente diagnósticos y usu de datos a Cyanogen. Esta información nun s\'usa pa indentificate y écha-yos un gabitu a los equipos pa trabayar en coses como\'l consumu de batería, el rindimientu d\'aplicaciones, y les nueves carauterístiques <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string> @@ -66,7 +66,7 @@ <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> pa cifrar conversaciones SMS con otros usuarios usando SMS seguru nun preséu <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string> <string name="setup_unlock">Desbloquiar</string> <string name="setup_device_locked">Esti preséu ta bloquiáu pol usuariu.</string> - <string name="setup_require_cyanogen_label"><b>Riquir la to contraseña de la cuenta Cyanogen OS</b> pa usar el to preséu incluso dempués de reafitalu.</string> + <string name="setup_require_cyanogen_label"><b>Riquir la to contraseña de la cuenta</b> pa usar el to preséu incluso dempués de reafitalu.</string> <string name="setup_device_locked_instructions"><i>Pa apagar/prender esta carauterística, por favor vete a Axustes > Seguranza</i></string> <string name="setup_warning_skip_anyway">Ensin una cuenta de Cyanogen OS, nun vas poder: \n\nPersonalizar el to teléfonu con iconos nuevos, fondos de pantalla y muncho más al traviés de l\'aplicación de temes\n\nDesaniciar el teléfonu llocalmente o de manera remota si se perdió</string> <!-- Fingerprint setup --> diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml index 808f263..fd70523 100644 --- a/res/values-az-rAZ/strings.xml +++ b/res/values-az-rAZ/strings.xml @@ -49,9 +49,9 @@ <string name="yes">Bəli</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">Fövqəladə vəziyyət zəngləri</string> - <string name="setup_services">Cyanogen özəllikləri</string> - <string name="services_explanation" product="tablet">Bu xidmətlər planşetinizin imkanlarını artırır. Verilənlər Cyanogen\'in <xliff:g id="name" example="Privacy Policy">%s</xliff:g>\'nə uyğun olaraq istifadə ediləcək.</string> - <string name="services_explanation" product="default">Bu xidmətlər telefonunuzun imkanlarını artırır. Verilənlər Cyanogen\'in <xliff:g id="name" example="Privacy Policy">%s</xliff:g>\'nə uyğun olaraq istifadə ediləcək.</string> + <string name="setup_services">LineageOS özəllikləri</string> + <string name="services_explanation" product="tablet">Bu xidmətlər planşetinizin imkanlarını artırır. Verilənlər LineageOS\'in <xliff:g id="name" example="Privacy Policy">%s</xliff:g>\'nə uyğun olaraq istifadə ediləcək.</string> + <string name="services_explanation" product="default">Bu xidmətlər telefonunuzun imkanlarını artırır. Verilənlər LineageOS\'in <xliff:g id="name" example="Privacy Policy">%s</xliff:g>\'nə uyğun olaraq istifadə ediləcək.</string> <string name="services_privacy_policy">Gizlilik Siyasəti</string> <string name="services_help_improve_cm"><xliff:g id="name" example="CyanogenMod">%s</xliff:g> təkmilləşməsinə kömək edin</string> <string name="services_metrics_label">Diaqnostika və istifadə verilənlərini Cyanogen\'ə göndərərək <xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g>. Bu məlumatlar kimliyinizdən istifadə məqsədilə götürülmür, ancaq batareya ömrü, tətbiq performansı və yeni <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> özəllikləri kimi mövzularda komandamızın işlərində istifadə olunur.</string> @@ -61,7 +61,7 @@ <string name="services_secure_sms_label"><xliff:g id="name" example="CyanogenMod">%1$s</xliff:g> cihazında digər istifadəçilərlə edilən söhbətlərinizi şifrələmək üçün <xliff:g id="name" example="Use secure SMS">%2$s</xliff:g>.</string> <string name="setup_unlock">Kilidi aç</string> <string name="setup_device_locked">Bu cihaz istifadəçisi tərəfindən kilidlənib.</string> - <string name="setup_require_cyanogen_label"><b>Cyanogen ƏS hesab şifrəsi lazımdır</b>ki, cihazınızı zavod tənzimləmələrinə sıfırladıqdan sonra istifadə edə biləsiz.</string> + <string name="setup_require_cyanogen_label"><b>hesab şifrəsi lazımdır</b>ki, cihazınızı zavod tənzimləmələrinə sıfırladıqdan sonra istifadə edə biləsiz.</string> <string name="setup_device_locked_instructions"><i>Bu özəlliyi açıb bağlamaq üçün, zəhmət olmasa Tənzimləmələr > Təhlükəsizlik bölməsinə gedin</i></string> <string name="setup_warning_skip_anyway">Cyanogen ƏS Hesabı olmadan, bunlar mümkün olmayacaq:\n\nTelefonunuzu Temalar tətbiqetməsindəki nişanlar, divar kağızları və daha çox elementlə özəlləşdirmək\n\nTelefonunuzu itirəndə, uzaqdan yerini tapmaq və ya içindəkiləri silmək</string> <!-- Fingerprint setup --> diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml index 120dde1..6d9d227 100644 --- a/res/values-be/strings.xml +++ b/res/values-be/strings.xml @@ -53,21 +53,21 @@ <string name="yes">Так</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">Экстранны выклік</string> - <string name="setup_services">Службы Cyanogen</string> - <string name="services_explanation" product="tablet">Гэтыя службы пашыраюць магчымасці вашага планшэта. Дадзеныя будуць выкарыстоўвацца ў адпаведнасці з <xliff:g id="name" example="Privacy Policy">%s</xliff:g> Cyanogen.</string> - <string name="services_explanation" product="default">Гэтыя службы пашыраюць магчымасці вашага тэлефона. Дадзеныя будуць выкарыстоўвацца ў адпаведнасці з <xliff:g id="name" example="Privacy Policy">%s</xliff:g> Cyanogen.</string> + <string name="setup_services">Службы LineageOS</string> + <string name="services_explanation" product="tablet">Гэтыя службы пашыраюць магчымасці вашага планшэта. Дадзеныя будуць выкарыстоўвацца ў адпаведнасці з <xliff:g id="name" example="Privacy Policy">%s</xliff:g> LineageOS.</string> + <string name="services_explanation" product="default">Гэтыя службы пашыраюць магчымасці вашага тэлефона. Дадзеныя будуць выкарыстоўвацца ў адпаведнасці з <xliff:g id="name" example="Privacy Policy">%s</xliff:g> LineageOS.</string> <string name="services_privacy_policy">Палітыка прыватнасці</string> <string name="services_help_improve_cm">Дапамагчы палепшыць <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string> - <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g>, аўтаматычна адпраўляючы дадзеныя дыягностыкі і выкарыстанні ў Cyanogen. Дадзеная інфармацыя не можа быць скарыстана для ідэнтыфікацыі вашай асобы, але можа дапамагчы ў працы над аптымізацыяй выдатку батарэі, паляпшэннем прадукцыйнасці дадаткаў, а таксама распрацоўцы новых функцый <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string> + <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g>, аўтаматычна адпраўляючы дадзеныя дыягностыкі і выкарыстанні ў LineageOS. Дадзеная інфармацыя не можа быць скарыстана для ідэнтыфікацыі вашай асобы, але можа дапамагчы ў працы над аптымізацыяй выдатку батарэі, паляпшэннем прадукцыйнасці дадаткаў, а таксама распрацоўцы новых функцый <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string> <string name="services_apply_theme">Ужыць тэму <xliff:g id="name" example="Material">%s</xliff:g></string> <string name="services_os_nav_keys_label"><b>Скарыстаць на экранные навігацыйныя кнопкі</b> заміж апаратных.</string> <string name="services_use_secure_sms">Выкарыстоўваць бяспечныя SMS</string> <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> для шыфравання паведамленняў, што перадаюцца іншым карыстачам прылад з<xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string> <string name="setup_unlock">Разблакаваць</string> <string name="setup_device_locked">Прылада была заблакавана карыстальнікам.</string> - <string name="setup_require_cyanogen_label"><b>Патрабаваць пароль акаўнта АС Cyanogen</b> доўжачы выкарыстанні прылады нават пасля выдалення ўсіх дадзеных.</string> + <string name="setup_require_cyanogen_label"><b>Патрабаваць пароль акаўнта</b> доўжачы выкарыстанні прылады нават пасля выдалення ўсіх дадзеных.</string> <string name="setup_device_locked_instructions"><i> Каб уключыць ці адключыць гэту функцыю, перайдзіце ў меню "Налады" > "Бяспека"</i></string> - <string name="setup_warning_skip_anyway">Без уліковага запісу Cyanogen вы не зможаце:\n\nПерсаналізоўваць тэлефон новымі шпалерамі, абразкамі і іншымі кампанентамі ў дадатку «Тэмы»\n\nЗнайсці ці выдалена скінуць налады на тэлефоне ў выпадку яго страты</string> + <string name="setup_warning_skip_anyway">Без уліковага запісу LineageOS вы не зможаце:\n\nПерсаналізоўваць тэлефон новымі шпалерамі, абразкамі і іншымі кампанентамі ў дадатку «Тэмы»\n\nЗнайсці ці выдалена скінуць налады на тэлефоне ў выпадку яго страты</string> <!-- Fingerprint setup --> <string name="settings_fingerprint_setup_title">Выбраць рэзервовы спосаб блакавання экрана</string> <string name="settings_fingerprint_setup_details">Абярыце спосаб блакавання экрана.</string> diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index f76280f..b33731e 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -54,9 +54,9 @@ <string name="yes">Да</string> <string name="data_sim_name">СИМ карта<xliff:g id="sub">%d </xliff:g> - <xliff:g id="name">%s </xliff:g></string> <string name="emergency_call">Спешни повиквания</string> - <string name="setup_services">Cyanogen характеристики</string> - <string name="services_explanation" product="tablet">Тези услуги работят за да разширят възможностите на таблета. Данните ще бъдат използвани в съгласие с Cyanogen в <xliff:g id="name" example="Privacy Policy">%s </xliff:g>.</string> - <string name="services_explanation" product="default">Тези услуги работят за да разширят възможностите на телефона. Данните ще бъдат използвани в съгласие с Cyanogen в <xliff:g id="name" example="Privacy Policy">%s </xliff:g>.</string> + <string name="setup_services">LineageOS характеристики</string> + <string name="services_explanation" product="tablet">Тези услуги работят за да разширят възможностите на таблета. Данните ще бъдат използвани в съгласие с LineageOS в <xliff:g id="name" example="Privacy Policy">%s </xliff:g>.</string> + <string name="services_explanation" product="default">Тези услуги работят за да разширят възможностите на телефона. Данните ще бъдат използвани в съгласие с LineageOS в <xliff:g id="name" example="Privacy Policy">%s </xliff:g>.</string> <string name="services_privacy_policy">Декларация за поверителност</string> <string name="services_help_improve_cm">Помогне за подобряване на <xliff:g id="name" example="CyanogenMod">%s </xliff:g></string> <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%s </xliff:g> от автоматичното изпращане на данни за диагностика и използване на Cyanogen. Тази информация не може да се използва за идентифицирането ви и служи да помага на екипите работещи над неща като живот на батерията, производителността на приложенията и нови функции в <xliff:g id="name" example="CyanogenMod"> %s </xliff:g>.</string> @@ -67,7 +67,7 @@ <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s </xliff:g> за криптиране на SMS разговори с други потребители използвайте сигурни SMS на <xliff:g id="name" example="CyanogenMod">%2$s </xliff:g> устройството.</string> <string name="setup_unlock">Отключи</string> <string name="setup_device_locked">Това устройство е заключено от потребителя.</string> - <string name="setup_require_cyanogen_label"><b>Изисква паролата на Cyanogen OS акаунта</b> за да използвате устройството дори след фабрично нулиране.</string> + <string name="setup_require_cyanogen_label"><b>Изисква паролата на акаунта</b> за да използвате устройството дори след фабрично нулиране.</string> <string name="setup_device_locked_instructions"><i>За да включите тази функция, изключено/включено, моля отидете на Настройки > Сигурност</i></string> <string name="setup_warning_skip_anyway">Без Cyanogen OS профил, няма да можете да: \n\nПерсонализирате телефона с нови икони, тапети и други чрез приложението за теми\n\nЛокално или отдалечено да изтриете всичко на телефона, ако го е загубите</string> <!-- Fingerprint setup --> diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index e3a79ff..da2dbad 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -54,9 +54,9 @@ <string name="yes">Sí</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">Trucada d\'emergència</string> - <string name="setup_services">Característiques Cyanogen</string> - <string name="services_explanation" product="tablet">Aquests serveis serveixen per ampliar les capacitats de la teva tauleta. Les dades s\'utilitzaran d\'acord amb la <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de Cyanogen.</string> - <string name="services_explanation" product="default">Aquests serveis serveixen per ampliar les capacitats del teu telèfon. Les dades s\'utilitzaran d\'acord amb la <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de Cyanogen.</string> + <string name="setup_services">Característiques LineageOS</string> + <string name="services_explanation" product="tablet">Aquests serveis serveixen per ampliar les capacitats de la teva tauleta. Les dades s\'utilitzaran d\'acord amb la <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de LineageOS.</string> + <string name="services_explanation" product="default">Aquests serveis serveixen per ampliar les capacitats del teu telèfon. Les dades s\'utilitzaran d\'acord amb la <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de LineageOS.</string> <string name="services_privacy_policy">Política de privacitat</string> <string name="services_help_improve_cm">Ajuda a millorar <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string> <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> enviant automàticament les dades de diagnòstic i d\'ús a Cyanogen. Aquesta informació no es pot utilitzar per identificar-te i dóna un cop de mà als equips que treballen en coses com la duració de les bateries, el rendiment de les aplicacions i noves característiques de <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string> @@ -67,7 +67,7 @@ <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> per xifrar les converses SMS amb altres usuaris mitjançant SMS segurs en un dispositiu <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string> <string name="setup_unlock">Desbloqueja</string> <string name="setup_device_locked">Aquest dispositiu ha estat bloquejat per l\'usuari.</string> - <string name="setup_require_cyanogen_label"><b>Demana la contrasenya del teu compte Cyanogen OS</b> per utilitzar el teu dispositiu, fins i tot després de restablir als ajustaments de fàbrica.</string> + <string name="setup_require_cyanogen_label"><b>Demana la contrasenya del teu compte</b> per utilitzar el teu dispositiu, fins i tot després de restablir als ajustaments de fàbrica.</string> <string name="setup_device_locked_instructions"><i>Per activar/desactivar aquesta característica, si us plau ves a Configuració > Seguretat</i></string> <string name="setup_warning_skip_anyway">Sense un compte Cyanogen OS, no podràs:\n\nPersonalitzar el teu telèfon amb noves icones, fons de pantalla i més en l\'aplicació de Temes\n\nLocalitzar o esborrar remotament el teu telèfon si el perds</string> <!-- Fingerprint setup --> diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index a491ecf..ff27db0 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -54,9 +54,9 @@ <string name="yes">Ano</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">Tísňové volání</string> - <string name="setup_services">Cyanogen funkce</string> - <string name="services_explanation" product="tablet">Tyto služby rozšířují funkce vašeho tabletu. Data budou použita v souladu se zásadami ochrany osobních údajů Cyanogen <xliff:g id="name" example="Privacy Policy">%s </xliff:g>.</string> - <string name="services_explanation" product="default">Tyto služby rozšiřují funkce vašeho telefonu. Data budou použita v souladu se zásadami ochrany osobních údajů Cyanogen <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> + <string name="setup_services">LineageOS funkce</string> + <string name="services_explanation" product="tablet">Tyto služby rozšířují funkce vašeho tabletu. Data budou použita v souladu se zásadami ochrany osobních údajů LineageOS <xliff:g id="name" example="Privacy Policy">%s </xliff:g>.</string> + <string name="services_explanation" product="default">Tyto služby rozšiřují funkce vašeho telefonu. Data budou použita v souladu se zásadami ochrany osobních údajů LineageOS <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> <string name="services_privacy_policy">Zásady ochrany osobních údajů</string> <string name="services_help_improve_cm">Pomozte zlepšovat <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string> <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> automatickým odesíláním diagnostických dat a dat o používání do Cyanogen. Tato data nelze použít pro Vaší identifikaci, ale pomohou vývojářskému týmu s informacemi o výdrži baterie, výkonu aplikací a vývoji nových vlastností pro <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string> @@ -67,7 +67,7 @@ <string name="services_secure_sms_label">Použijte aplikaci <xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> pro šifrované SMS a zabezpečenou komunikaci na zařízení <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string> <string name="setup_unlock">Odemknout</string> <string name="setup_device_locked">Toto zařízení bylo uzamčeno uživatelem.</string> - <string name="setup_require_cyanogen_label">Po obnovení továrního nastavení bude <b>vyžadováno heslo k Vašemu účtu Cyanogen OS</b>.</string> + <string name="setup_require_cyanogen_label">Po obnovení továrního nastavení bude <b>vyžadováno heslo k Vašemu účtu</b>.</string> <string name="setup_device_locked_instructions"><i>Pro zapnutí/vypnutí této funkce, přejděte do nastavení > Zabezpečení</i></string> <string name="setup_warning_skip_anyway">Bez účtu Cyanogen nebudete schopni:\n\nPřizpůsobit svůj telefon novými ikonami, tapetami a dalším z aplikace Motivy\n\nVzdáleně vyhledat nebo vymazat telefon v případě ztráty</string> <!-- Fingerprint setup --> diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index e6204a1..cb0563b 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -54,9 +54,9 @@ <string name="yes">Ja</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">Nødopkald</string> - <string name="setup_services">Cyanogen-funktioner</string> - <string name="services_explanation" product="tablet">Disse tjenester giver dig flere muligheder med din tablet. Data bliver anvendt i overensstemmelse med Cyanogens <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> - <string name="services_explanation" product="default">Disse tjenester giver dig flere muligheder med din telefon. Data bliver anvendt i overensstemmelse med Cyanogens <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> + <string name="setup_services">LineageOS-funktioner</string> + <string name="services_explanation" product="tablet">Disse tjenester giver dig flere muligheder med din tablet. Data bliver anvendt i overensstemmelse med LineageOS <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> + <string name="services_explanation" product="default">Disse tjenester giver dig flere muligheder med din telefon. Data bliver anvendt i overensstemmelse med LineageOS <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> <string name="services_privacy_policy">Privatlivspolitik</string> <string name="services_help_improve_cm">Hjælpe med at forbedre <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string> <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> ved automatisk at sende diagnosticerings- og brugsoplysninger til Cyanogen. Denne information kan ikke bruges til at identificere dig, men hjælper udviklerne i arbejdet med eksempelvis batterilevetid, ydeevne og nye <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> funktioner.</string> @@ -67,7 +67,7 @@ <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> til at kryptere SMS-samtaler med andre brugere ved hjælp af sikker SMS på en <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> enhed.</string> <string name="setup_unlock">Lås op</string> <string name="setup_device_locked">Denne enhed er blevet låst af brugeren.</string> - <string name="setup_require_cyanogen_label"><b>Kræver adgangskoden til din Cyanogen konto</b> for at bruge enheden, selv efter en nulstilling til fabriksindstillinger.</string> + <string name="setup_require_cyanogen_label"><b>Kræver adgangskoden til din konto</b> for at bruge enheden, selv efter en nulstilling til fabriksindstillinger.</string> <string name="setup_device_locked_instructions"><i>For at slå denne funktion til/fra, skal du gå til Indstillinger > Sikkerhed</i></string> <string name="setup_warning_skip_anyway">Uden en Cyanogen konto kan du ikke:\n\nTilpasse din telefon med nye ikoner, tapeter og meget mere i Tema app\'en\n\nFinde eller slette din telefon, hvis du mister den</string> <!-- Fingerprint setup --> diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 72cdfc7..29c552a 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -54,9 +54,9 @@ <string name="yes">Ja</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> – <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">Notruf</string> - <string name="setup_services">Cyanogen-Funktionen</string> - <string name="services_explanation" product="tablet">Diese Dienste werden verwendet, um die Funktionen Ihres Tablets zu erweitern. Die Daten werden in Übereinstimmung mit Cyanogens <xliff:g id="name" example="Privacy Policy">%s</xliff:g> verwendet.</string> - <string name="services_explanation" product="default">Diese Dienste werden verwendet, um die Funktionen Ihres Telefons zu erweitern. Die Daten werden in Übereinstimmung mit Cyanogens <xliff:g id="name" example="Privacy Policy">%s</xliff:g> verwendet.</string> + <string name="setup_services">LineageOS-Funktionen</string> + <string name="services_explanation" product="tablet">Diese Dienste werden verwendet, um die Funktionen Ihres Tablets zu erweitern. Die Daten werden in Übereinstimmung mit LineageOS <xliff:g id="name" example="Privacy Policy">%s</xliff:g> verwendet.</string> + <string name="services_explanation" product="default">Diese Dienste werden verwendet, um die Funktionen Ihres Telefons zu erweitern. Die Daten werden in Übereinstimmung mit LineageOS <xliff:g id="name" example="Privacy Policy">%s</xliff:g> verwendet.</string> <string name="services_privacy_policy">Datenschutzerklärung</string> <string name="services_help_improve_cm">Helfen Sie <xliff:g id="name" example="CyanogenMod">%s</xliff:g> zu verbessern</string> <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g>, indem Sie automatisch Diagnose-und Nutzungsdaten an CyanogenMod senden. Diese Informationen können nicht dazu verwendet werden, Sie zu identifizieren. Vielmehr helfen sie unserem Team bei der Arbeit an Dingen wie der Akkulaufzeit, der App-Leistung und <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>-Funktionen.</string> @@ -67,7 +67,7 @@ <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g>, um SMS-Konversationen mit anderen Benutzern auf einem <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>-Gerät zu verschlüsseln.</string> <string name="setup_unlock">Entsperren</string> <string name="setup_device_locked">Dieses Gerät wurde vom Benutzer gesperrt.</string> - <string name="setup_require_cyanogen_label"><b>Ihr Cyanogen OS-Konto-Passwort</b> wird auch nach einem Zurücksetzen auf Werkseinstellungen benötigt.</string> + <string name="setup_require_cyanogen_label"><b>Ihr Konto-Passwort</b> wird auch nach einem Zurücksetzen auf Werkseinstellungen benötigt.</string> <string name="setup_device_locked_instructions"><i>Um diese Funktion zu aktivieren/deaktivieren, gehen Sie zu Einstellungen > Sicherheit.</i></string> <string name="setup_warning_skip_anyway">Ohne ein Cyanogen OS-Konto ist Folgendes nicht möglich:\n\nAnpassen Ihres Telefons mit neuen Symbolen, Hintergründen und mehr in der Design-App \n\nLokalisieren bzw. remotes Löschen Ihres Telefons, falls Sie es verloren haben.</string> <!-- Fingerprint setup --> diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 494b1e0..5d30ba4 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -54,9 +54,9 @@ <string name="yes">Ναι</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">Κλήση έκτακτης ανάγκης</string> - <string name="setup_services">Χαρακτηριστικά Cyanogen</string> - <string name="services_explanation" product="tablet">Οι υπηρεσίες αυτές έχουν σκοπό να επεκτείνουν τις δυνατότητες του tablet σας. Τα δεδομένα θα χρησιμοποιηθούν σύμφωνα με την <xliff:g id="name" example="Privacy Policy">%s</xliff:g> της Cyanogen.</string> - <string name="services_explanation" product="default">Οι υπηρεσίες αυτές έχουν σκοπό να επεκτείνουν τις δυνατότητες του τηλεφώνου σας. Τα δεδομένα θα χρησιμοποιηθούν σύμφωνα με την <xliff:g id="name" example="Privacy Policy">%s</xliff:g> της Cyanogen.</string> + <string name="setup_services">Χαρακτηριστικά LineageOS</string> + <string name="services_explanation" product="tablet">Οι υπηρεσίες αυτές έχουν σκοπό να επεκτείνουν τις δυνατότητες του tablet σας. Τα δεδομένα θα χρησιμοποιηθούν σύμφωνα με την <xliff:g id="name" example="Privacy Policy">%s</xliff:g> της LineageOS.</string> + <string name="services_explanation" product="default">Οι υπηρεσίες αυτές έχουν σκοπό να επεκτείνουν τις δυνατότητες του τηλεφώνου σας. Τα δεδομένα θα χρησιμοποιηθούν σύμφωνα με την <xliff:g id="name" example="Privacy Policy">%s</xliff:g> της LineageOS.</string> <string name="services_privacy_policy">Πολιτική απορρήτου</string> <string name="services_help_improve_cm">Βοηθήστε στη βελτίωση του <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string> <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> στέλνοντας αυτόματα διαγνωστικά δεδομένα και στατιστικά χρήσης στη Cyanogen. Αυτές οι πληροφορίες δε μπορούν να χρησιμοποιηθούν για να σας αναγνωρίσουν και δίνουν ένα χέρι βοηθείας στις ομάδες που εργάζονται σε θέματα όπως η διάρκεια ζωής μπαταρίας, επιδόσεις εφαρμογών και νέα χαρακτηριστικά του <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string> @@ -67,7 +67,7 @@ <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> για να κρυπτογραφήσετε τις συνομιλίες SMS με άλλους χρήστες που χρησιμοποιούν ασφαλή SMS σε συσκευές <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string> <string name="setup_unlock">Ξεκλείδωμα</string> <string name="setup_device_locked">Αυτή η συσκευή έχει κλειδωθεί από το χρήστη.</string> - <string name="setup_require_cyanogen_label"><b>Απαίτηση του κωδικού πρόσβασης του λογαριασμού σας Cyanogen OS</b> για να χρησιμοποιήσετε τη συσκευή σας, ακόμα και μετά από επαναφορά εργοστασιακών ρυθμίσεων.</string> + <string name="setup_require_cyanogen_label"><b>Απαίτηση του κωδικού πρόσβασης του λογαριασμού σας</b> για να χρησιμοποιήσετε τη συσκευή σας, ακόμα και μετά από επαναφορά εργοστασιακών ρυθμίσεων.</string> <string name="setup_device_locked_instructions"><i>Για να ενεργοποιήσετε/απενεργοποιήσετε αυτή τη λειτουργία, παρακαλώ πηγαίνετε στις Ρυθμίσεις > Ασφάλεια</i></string> <string name="setup_warning_skip_anyway">Χωρίς ένα λογαριασμό Cyanogen OS, δεν θα είστε σε θέση να:\n\nΠροσαρμόσετε το τηλέφωνό σας με νέα εικονίδια, ταπετσαρίες και πολλά άλλα στην εφαρμογή Θεμάτων\n\nΕντοπίσετε ή διαγράψετε εξ αποστάσεως το τηλέφωνό σας εάν το χάσετε</string> <!-- Fingerprint setup --> diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml index 019270f..4254329 100644 --- a/res/values-en-rAU/strings.xml +++ b/res/values-en-rAU/strings.xml @@ -49,9 +49,9 @@ <string name="yes">Yes</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">Emergency call</string> - <string name="setup_services">Cyanogen features</string> - <string name="services_explanation" product="tablet">These services work for you to extend the capabilities of your tablet. Data will be used in accordance with Cyanogen\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> - <string name="services_explanation" product="default">These services work for you to extend the capabilities of your phone. Data will be used in accordance with Cyanogen\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> + <string name="setup_services">LineageOS features</string> + <string name="services_explanation" product="tablet">These services work for you to extend the capabilities of your tablet. Data will be used in accordance with LineageOS\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> + <string name="services_explanation" product="default">These services work for you to extend the capabilities of your phone. Data will be used in accordance with LineageOS\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> <string name="services_privacy_policy">Privacy Policy</string> <string name="services_help_improve_cm">Help improve <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string> <string name="services_apply_theme">Apply the <xliff:g id="name" example="Material">%s</xliff:g> theme</string> diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml index 13276bc..2ac0a4e 100644 --- a/res/values-en-rIN/strings.xml +++ b/res/values-en-rIN/strings.xml @@ -50,19 +50,19 @@ <string name="yes">Yes</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">Emergency call</string> - <string name="setup_services">Cyanogen features</string> - <string name="services_explanation" product="tablet">These services work for you to extend the capabilities of your tablet. Data will be used in accordance with Cyanogen\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> - <string name="services_explanation" product="default">These services work for you to extend the capabilities of your phone. Data will be used in accordance with Cyanogen\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> + <string name="setup_services">LineageOS features</string> + <string name="services_explanation" product="tablet">These services work for you to extend the capabilities of your tablet. Data will be used in accordance with LineageOS\' <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> + <string name="services_explanation" product="default">These services work for you to extend the capabilities of your phone. Data will be used in accordance with LineageOS\' <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> <string name="services_privacy_policy">Privacy Policy</string> <string name="services_help_improve_cm">Help improve <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string> - <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> by automatically sending diagnostic and usage data to Cyanogen. This information can’t be used to identify you and lends a hand to teams working on things like battery life, app performance, and new <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> features.</string> + <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> by automatically sending diagnostic and usage data to LineageOS. This information can’t be used to identify you and lends a hand to teams working on things like battery life, app performance, and new <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> features.</string> <string name="services_apply_theme">Apply the <xliff:g id="name" example="Material">%s</xliff:g> theme</string> <string name="services_os_nav_keys_label"><b>Use on screen navigation keys</b> instead of hardware keys.</string> <string name="services_use_secure_sms">Use secure SMS</string> <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> to encrypt SMS conversations with other users using secure SMS on a <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> device.</string> <string name="setup_unlock">Unlock</string> <string name="setup_device_locked">This device has been locked by the user.</string> - <string name="setup_require_cyanogen_label"><b>Require your Cyanogen OS account password</b> in order to use your device even after a factory reset.</string> + <string name="setup_require_cyanogen_label"><b>Require your account password</b> in order to use your device even after a factory reset.</string> <string name="setup_device_locked_instructions"><i>To turn this feature off/on, please go to Settings > Security</i></string> <string name="setup_warning_skip_anyway">Without a Cyanogen OS Account, you won\'t be able to:\n\nCustomize your phone with new icons, wallpapers and more in the Themes app\n\nLocate or remotely erase your phone if it\'s lost</string> <!-- Fingerprint setup --> diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index 9cd9614..8f79d14 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -53,9 +53,9 @@ <string name="yes">Sí</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">Llamada de emergencia</string> - <string name="setup_services">Características de Cyanogen</string> - <string name="services_explanation" product="tablet">Estos servicios sirven para extender las capacidades de la tableta. Se utilizarán datos de acuerdo a la <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de Cyanogen.</string> - <string name="services_explanation" product="default">Estos servicios sirven para extender las capacidades del teléfono. Se utilizarán datos de acuerdo a la <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de Cyanogen.</string> + <string name="setup_services">Características de LineageOS</string> + <string name="services_explanation" product="tablet">Estos servicios sirven para extender las capacidades de la tableta. Se utilizarán datos de acuerdo a la <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de LineageOS.</string> + <string name="services_explanation" product="default">Estos servicios sirven para extender las capacidades del teléfono. Se utilizarán datos de acuerdo a la <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de LineageOS.</string> <string name="services_privacy_policy">Política de privacidad</string> <string name="services_help_improve_cm">Ayuda a mejorar <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string> <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> enviando automáticamente diagnósticos de depuración y uso de datos a Cyanogen. Esta información no puede ser utilizada para identificarte y sirve para mejorar la vida útil de la batería, el rendimiento de la aplicación y el desarrollo de nuevas características desarrolladas por <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string> @@ -66,7 +66,7 @@ <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> para encriptar conversaciones SMS con otros usuarios utilizando SMS seguros en un dispositivo <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string> <string name="setup_unlock">Desbloquear</string> <string name="setup_device_locked">Este dispositivo ha sido bloqueado por el usuario.</string> - <string name="setup_require_cyanogen_label"><b>Se requiere la contraseña de tu cuenta Cyanogen OS</b> para poder utilizar el dispositivo incluso después de un restablecimiento de fábrica.</string> + <string name="setup_require_cyanogen_label"><b>Se requiere la contraseña de tu cuenta</b> para poder utilizar el dispositivo incluso después de un restablecimiento de fábrica.</string> <string name="setup_device_locked_instructions"><i>Para activar y desactivar esta función, ve a Ajustes > Seguridad</i></string> <string name="setup_warning_skip_anyway">Sin una cuenta de Cyanogen OS, no podrás: \n\nPersonalizar tu teléfono con nuevos iconos, fondos de pantalla y mucho más a través de la aplicación Temas\n\nLocalizar o formatear tu teléfono de manera remota si se ha perdido</string> <!-- Fingerprint setup --> diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index c9c097b..339d382 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -53,9 +53,9 @@ <string name="yes">Sí</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">Llamada de emergencia</string> - <string name="setup_services">Características de Cyanogen</string> - <string name="services_explanation" product="tablet">Estos servicios sirven para extender las capacidades del tablet. Se utilizarán datos de acuerdo a la <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de Cyanogen.</string> - <string name="services_explanation" product="default">Estos servicios sirven para extender las capacidades del teléfono. Se utilizarán datos de acuerdo a la <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de Cyanogen.</string> + <string name="setup_services">Características de LineageOS</string> + <string name="services_explanation" product="tablet">Estos servicios sirven para extender las capacidades del tablet. Se utilizarán datos de acuerdo a la <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de LineageOS.</string> + <string name="services_explanation" product="default">Estos servicios sirven para extender las capacidades del teléfono. Se utilizarán datos de acuerdo a la <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de LineageOS.</string> <string name="services_privacy_policy">Política de Privacidad</string> <string name="services_help_improve_cm">Ayuda a mejorar <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string> <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> enviando automáticamente diagnósticos de depuración y uso de datos a Cyanogen. Esta información no puede ser utilizada para identificarte, y sirve para ayudar a mejorar la vida de la batería, el rendimiento de la aplicación y el desarrollo de nuevas características desarrolladas por <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string> @@ -66,7 +66,7 @@ <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> para encriptar conversaciones SMS con otros usuarios utilizando SMS seguros en un dispositivo <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string> <string name="setup_unlock">Desbloquear</string> <string name="setup_device_locked">Este dispositivo ha sido bloqueado por el usuario.</string> - <string name="setup_require_cyanogen_label"><b>Se requiere la contraseña de tu cuenta Cyanogen OS</b> para poder utilizar el dispositivo incluso después de un restablecimiento de fábrica.</string> + <string name="setup_require_cyanogen_label"><b>Se requiere la contraseña de tu cuenta</b> para poder utilizar el dispositivo incluso después de un restablecimiento de fábrica.</string> <string name="setup_device_locked_instructions"><i>Para activar o desactivar esta función, ve a Ajustes > Seguridad</i></string> <string name="setup_warning_skip_anyway">Sin una cuenta de Cyanogen OS no podrás:\n\nPersonalizar tu teléfono con nuevos iconos, fondos de pantalla y mucho más a través de la aplicación de temas\n\nBorrar tu teléfono localmente o de manera remota si se ha perdido</string> <!-- Fingerprint setup --> diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml index 482450e..a576d6d 100644 --- a/res/values-et-rEE/strings.xml +++ b/res/values-et-rEE/strings.xml @@ -49,9 +49,9 @@ <string name="yes">Jah</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d </xliff:g> - <xliff:g id="name">%s </xliff:g></string> <string name="emergency_call">Hädaabinumbril helistamine</string> - <string name="setup_services">Cyanogen funktsioonid</string> - <string name="services_explanation" product="tablet">Need teenused töötavad sinu hüvanguks laiendades sinu tahvelarvuti võimalusi. Andmeid kasutatakse vastavalt Cyanogeni <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> - <string name="services_explanation" product="default">Need teenused töötavad sinu hüvanguks laiendades sinu nutitelefoni võimalusi. Andmeid kasutatakse vastavalt Cyanogeni <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> + <string name="setup_services">LineageOS funktsioonid</string> + <string name="services_explanation" product="tablet">Need teenused töötavad sinu hüvanguks laiendades sinu tahvelarvuti võimalusi. Andmeid kasutatakse vastavalt LineageOSi <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> + <string name="services_explanation" product="default">Need teenused töötavad sinu hüvanguks laiendades sinu nutitelefoni võimalusi. Andmeid kasutatakse vastavalt LineageOSi <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> <string name="services_privacy_policy">Privaatsuspoliitika</string> <string name="services_help_improve_cm">Aita parendada <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string> <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> saates automatselt diagnostika ja kasutamise infot Cyanogenile. Andmeid ei ole võimalik kasutada isiku tuvastamiseks. Teave aitab arendajatel muu hulgas parandada aku eluiga, rakenduste jõudlust ning arendada uusi <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> võimalusi.</string> @@ -61,7 +61,7 @@ <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> et krüpteerida SMS vestluseid teiste turvalise SMSi kasutajetga <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> seadmel.</string> <string name="setup_unlock">Ava lukustus</string> <string name="setup_device_locked">Seade on kasutaja poolt lukustatud.</string> - <string name="setup_require_cyanogen_label"><b>Nõua Cyanogen OS konto parooli</b>, et kasutada seadet ka peale tehase taastamist.</string> + <string name="setup_require_cyanogen_label"><b>Nõua konto parooli</b>, et kasutada seadet ka peale tehase taastamist.</string> <string name="setup_device_locked_instructions"><i>Funktsiooni sisse/välja lülitamiseks mine Seaded > Turvalisus</i></string> <string name="setup_warning_skip_anyway">Ilma Cyanogen OS kontota ei ole sul võimalik:\n\nkohandada oma telefoni ikoone, tasutapilte ja muud Themes rakenduses\n\nLeida või kaugelt puhastada oma kadunud seadet</string> <!-- Fingerprint setup --> diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml index 6337b10..41373fc 100644 --- a/res/values-eu-rES/strings.xml +++ b/res/values-eu-rES/strings.xml @@ -54,9 +54,9 @@ <string name="yes">Bai</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">Larrialdi deia</string> - <string name="setup_services">Cyanogen ezaugarriak</string> - <string name="services_explanation" product="tablet">Zerbitzu hauek tabletaren gaitasunak hobetzeko zure mesedetan egiten dute lan. Datuak Cyanogen <xliff:g id="name" example="Privacy Policy">%s</xliff:g> arabera erabiliko dira.</string> - <string name="services_explanation" product="default">Zerbitzu hauek telefonoaren gaitasunak hobetzeko zure mesedetan egiten dute lan. Datuak Cyanogen <xliff:g id="name" example="Privacy Policy">%s</xliff:g> arabera erabiliko dira.</string> + <string name="setup_services">LineageOS ezaugarriak</string> + <string name="services_explanation" product="tablet">Zerbitzu hauek tabletaren gaitasunak hobetzeko zure mesedetan egiten dute lan. Datuak LineageOS <xliff:g id="name" example="Privacy Policy">%s</xliff:g> arabera erabiliko dira.</string> + <string name="services_explanation" product="default">Zerbitzu hauek telefonoaren gaitasunak hobetzeko zure mesedetan egiten dute lan. Datuak LineageOS <xliff:g id="name" example="Privacy Policy">%s</xliff:g> arabera erabiliko dira.</string> <string name="services_privacy_policy">Pribatutasun politika</string> <string name="services_help_improve_cm">Lagundu <xliff:g id="name" example="CyanogenMod">%s</xliff:g> hobetzen</string> <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> automatikoki diagnostiko eta erabilera datuak bidaliz Cyanogeni. Informazio hau ezin da erabili zu identifikatzeko eta bateriaren iraupena, aplikazioen errendimendua, eta <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> ezaugarri berrietan lanean dabilen taldearentzat lagungarria da.</string> @@ -67,7 +67,7 @@ <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> gailu batean SMS segurua erabiltzen duten beste erabiltzaileekin dituzun SMS elkarrizketak zifratzeko.</string> <string name="setup_unlock">Desblokeatu</string> <string name="setup_device_locked">Erabiltzaileak gailu hau blokeatu du.</string> - <string name="setup_require_cyanogen_label"><b>Eskatu zure Cyanogen OS kontuaren pasahitza</b> gailua erabiltzeko lantegiko jatorrizko ezarpenetara berrezarri eta gero.</string> + <string name="setup_require_cyanogen_label"><b>Eskatu zure kontuaren pasahitza</b> gailua erabiltzeko lantegiko jatorrizko ezarpenetara berrezarri eta gero.</string> <string name="setup_device_locked_instructions"><i>Ezaugarri hau gaitu edo ezgaitzeko zoaz hona: Ezarpenak > Segurtasuna</i></string> <string name="setup_warning_skip_anyway">Cyanogen OS kontu bat gabe, ezin izango duzu:\n\nZure telefonoa ikono horma-irudi eta gai berriekin pertsonalizatu Gai aplikazioan\n\n.Telefonoa aurkitu eta ezabatu galtzen baduzu</string> <!-- Fingerprint setup --> diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 060b556..eca6188 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -54,9 +54,9 @@ <string name="yes">Kyllä</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">Hätäpuhelu</string> - <string name="setup_services">Cyanogen-ominaisuudet</string> - <string name="services_explanation" product="tablet">Nämä palvelut toimivat tablettisi ominaisuuksien parantamiseksi. Tietoja käytetään Cyanogenin <xliff:g id="name" example="Privacy Policy">%s</xliff:g> mukaisesti.</string> - <string name="services_explanation" product="default">Nämä palvelut toimivat puhelimesi ominaisuuksien parantamiseksi. Tietoja käytetään Cyanogenin <xliff:g id="name" example="Privacy Policy">%s</xliff:g> mukaisesti.</string> + <string name="setup_services">LineageOS-ominaisuudet</string> + <string name="services_explanation" product="tablet">Nämä palvelut toimivat tablettisi ominaisuuksien parantamiseksi. Tietoja käytetään LineageOSin <xliff:g id="name" example="Privacy Policy">%s</xliff:g> mukaisesti.</string> + <string name="services_explanation" product="default">Nämä palvelut toimivat puhelimesi ominaisuuksien parantamiseksi. Tietoja käytetään LineageOSin <xliff:g id="name" example="Privacy Policy">%s</xliff:g> mukaisesti.</string> <string name="services_privacy_policy">Tietosuojakäytännön</string> <string name="services_help_improve_cm">Auta parantamaan <xliff:g id="name" example="CyanogenMod">%s</xliff:g>ia</string> <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> lähettämällä vianmääritys- ja käyttötietoja Cyanogenille. Tietoja ei voi käyttää tunnistamiseen. Tiedot auttavat kehittäjiä muun muassa parantamaan akun kestoa, sovellusten suorituskykyä ja kehittämään <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>iin uusia ominaisuuksia.</string> @@ -67,7 +67,7 @@ <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> salataksesi tekstiviestikeskustelut muiden turvallisia tekstiviestejä ja <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>ia käyttävien henkilöiden kanssa.</string> <string name="setup_unlock">Avaa lukitus</string> <string name="setup_device_locked">Käyttäjä on lukinnut laitteen.</string> - <string name="setup_require_cyanogen_label"><b>Vaadi Cyanogen OS-tilin salasana</b> käyttääksesi laitetta myös tehdasasetusten palautuksen jälkeen.</string> + <string name="setup_require_cyanogen_label"><b>Vaadi tilin salasana</b> käyttääksesi laitetta myös tehdasasetusten palautuksen jälkeen.</string> <string name="setup_device_locked_instructions"><i>Poistaaksesi tämän ominaisuuden käytöstä/ottaaksesi käyttöön, mene Asetukset > Suojaus</i></string> <string name="setup_warning_skip_anyway">Ilman Cyanogen OS-tiliä, et voi:\n\nMukauttaa puhelintasi uusilla kuvakkeilla, taustakuvilla tai muilla käyttämällä Teemat-sovellusta\n\nPaikantaa tai etätyhjentää kadonnutta puhelintasi</string> <!-- Fingerprint setup --> diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index ee65d07..794886e 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -54,9 +54,9 @@ <string name="yes">Oui</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">Appel d\'urgence</string> - <string name="setup_services">Fonctionnalités Cyanogen</string> - <string name="services_explanation" product="tablet">Ces services fonctionnent pour étendre les fonctionnalités de votre tablette. Les données seront utilisées conformément à la <xliff:g id="name" example="Politique de confidentialité">%s</xliff:g> de Cyanogen.</string> - <string name="services_explanation" product="default">Ces services fonctionnent pour étendre les fonctionnalités de votre téléphone. Les données seront utilisées conformément à la <xliff:g id="name" example="Politique de confidentialité">%s</xliff:g> de Cyanogen.</string> + <string name="setup_services">Fonctionnalités LineageOS</string> + <string name="services_explanation" product="tablet">Ces services fonctionnent pour étendre les fonctionnalités de votre tablette. Les données seront utilisées conformément à la <xliff:g id="name" example="Politique de confidentialité">%s</xliff:g> de LineageOS.</string> + <string name="services_explanation" product="default">Ces services fonctionnent pour étendre les fonctionnalités de votre téléphone. Les données seront utilisées conformément à la <xliff:g id="name" example="Politique de confidentialité">%s</xliff:g> de LineageOS.</string> <string name="services_privacy_policy">Politique de confidentialité</string> <string name="services_help_improve_cm">Aider à améliorer <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string> <string name="services_metrics_label"><xliff:g id="name" example="Aider à l\'amélioration de CyanogenMod">%1$s</xliff:g> en envoyant automatiquement des données de diagnostics et d\'utilisation à Cyanogen. Ces informations ne peuvent pas être utilisées pour vous identifier et elles pourront aider les équipes qui travaillent sur des choses telles que la durée de vie de la batterie, les performances des applications et les nouvelles fonctionnalités de <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string> @@ -67,7 +67,7 @@ <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> pour crypter les conversations SMS avec les autres utilisateurs utilisant les SMS sécurisés sur leurs appareils <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string> <string name="setup_unlock">Déverrouiller</string> <string name="setup_device_locked">Cet appareil a été verrouillé par l\'utilisateur.</string> - <string name="setup_require_cyanogen_label"><b>Nécessite votre mot de passe du compte Cyanogen OS</b> afin d\'utiliser votre appareil même après une réinitialisation d\'usine.</string> + <string name="setup_require_cyanogen_label"><b>Nécessite votre mot de passe du compte</b> afin d\'utiliser votre appareil même après une réinitialisation d\'usine.</string> <string name="setup_device_locked_instructions"><i>Pour activer/désactiver cette fonction, veuillez vous rendre dans Paramètres > Sécurité</i></string> <string name="setup_warning_skip_anyway">Sans un compte Cyanogen OS, vous ne serez pas en mesure de :\n\nPersonnaliser votre téléphone avec de nouvelles icônes, fonds d\'écran et plus encore dans l\'application Thèmes\n\nLocaliser ou réinitialiser votre téléphone à distance s\'il est perdu</string> <!-- Fingerprint setup --> diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml index 35ad337..4ddfc93 100644 --- a/res/values-gl-rES/strings.xml +++ b/res/values-gl-rES/strings.xml @@ -54,9 +54,9 @@ <string name="yes">Si</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">Chamada de emerxencia</string> - <string name="setup_services">Características do Cyanogen</string> - <string name="services_explanation" product="tablet">Estes servizos serven para mellorar as capacidades da súa tableta. Os datos utilizaranse de acordo coa <xliff:g id="name" example="Política de privacidade">%s</xliff:g> de Cyanogen.</string> - <string name="services_explanation" product="default">Estes servizos serven para mellorar as capacidades do seu teléfono. Os datos utilizaranse de acordo coa <xliff:g id="name" example="Política de privacidade">%s</xliff:g> de Cyanogen.</string> + <string name="setup_services">Características do LineageOS</string> + <string name="services_explanation" product="tablet">Estes servizos serven para mellorar as capacidades da súa tableta. Os datos utilizaranse de acordo coa <xliff:g id="name" example="Política de privacidade">%s</xliff:g> de LineageOS.</string> + <string name="services_explanation" product="default">Estes servizos serven para mellorar as capacidades do seu teléfono. Os datos utilizaranse de acordo coa <xliff:g id="name" example="Política de privacidade">%s</xliff:g> de LineageOS.</string> <string name="services_privacy_policy">Política de privacidade</string> <string name="services_help_improve_cm">Axuda a mellorar <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string> <string name="services_metrics_label"><xliff:g id="name" example="Axuda a mellorar CyanogenMod">%1$s</xliff:g> enviando automaticamente diagnóstico e uso de datos a Cyanogen. Esta información non se pode utilizar para identificalo a vostede e acaba nas mans dos equipos que traballan en cousas como a duración da batería, rendemento das aplicacións e novas características de <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string> @@ -67,7 +67,7 @@ <string name="services_secure_sms_label"><xliff:g id="name" example="Utilizar SMS seguras">%1$s</xliff:g> para cifrar conversas por SMS con outros usuarios utilizando SMS seguras nun dispositivo <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string> <string name="setup_unlock">Desbloquear</string> <string name="setup_device_locked">Este dispositivo foi bloqueado polo usuario.</string> - <string name="setup_require_cyanogen_label"><b>Precísase o seu contrasinal do SO Cyanogen</b> para poder utilizar o seu dispositivo mesmo tras unha restauración de fábrica.</string> + <string name="setup_require_cyanogen_label"><b>Precísase o seu contrasinal</b> para poder utilizar o seu dispositivo mesmo tras unha restauración de fábrica.</string> <string name="setup_device_locked_instructions"><i>Para acender ou apagar esta funcionalidade, vaia a Configuración > Seguranza</i></string> <string name="setup_warning_skip_anyway">Sen unha conta Cyanogen OS, non poderá:\n\nPersonalizar o seu teléfono con novas iconas, fondos de pantallas, etc. na aplicación de temas\n\nAtopar ou borrar de forma remota o seu teléfono se o perde</string> <!-- Fingerprint setup --> diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml index 51a8466..8901f2d 100644 --- a/res/values-gu-rIN/strings.xml +++ b/res/values-gu-rIN/strings.xml @@ -53,9 +53,9 @@ <string name="yes">હા</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">કટોકટીનો કૉલ</string> - <string name="setup_services">Cyanogen ની સુવિધાઓ</string> - <string name="services_explanation" product="tablet">આ સેવાઓ તમારા ટૅબ્લેટની ક્ષમતાઓ વિસ્તારિત કરવાનું તમારા માટે કાર્ય કરે છે. ડેટાનો ઉપયોગ Cyanogen ના <xliff:g id="name" example="Privacy Policy">%s</xliff:g> અનુસાર થશે.</string> - <string name="services_explanation" product="default">આ સેવાઓ તમારા ફોનની ક્ષમતાઓ વિસ્તારિત કરવાનું તમારા માટે કાર્ય કરે છે. ડેટાનો ઉપયોગ Cyanogen ના <xliff:g id="name" example="Privacy Policy">%s</xliff:g> અનુસાર થશે.</string> + <string name="setup_services">LineageOS ની સુવિધાઓ</string> + <string name="services_explanation" product="tablet">આ સેવાઓ તમારા ટૅબ્લેટની ક્ષમતાઓ વિસ્તારિત કરવાનું તમારા માટે કાર્ય કરે છે. ડેટાનો ઉપયોગ LineageOS ના <xliff:g id="name" example="Privacy Policy">%s</xliff:g> અનુસાર થશે.</string> + <string name="services_explanation" product="default">આ સેવાઓ તમારા ફોનની ક્ષમતાઓ વિસ્તારિત કરવાનું તમારા માટે કાર્ય કરે છે. ડેટાનો ઉપયોગ LineageOS ના <xliff:g id="name" example="Privacy Policy">%s</xliff:g> અનુસાર થશે.</string> <string name="services_privacy_policy">ગોપનીયતા નીતિ સાથે સહમતિ દર્શાવો છો</string> <string name="services_help_improve_cm"><xliff:g id="name" example="CyanogenMod">%s</xliff:g>ના સુધારામાં મદદ કરો</string> <string name="services_metrics_label">સ્વયંચાલિત રીતે ડાયગ્નોસ્ટિક અને વપરાશ ડેટા Cyanogen ને મોકલીને<xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> . આ માહિતીનો ઉપયોગ તમને ઓળખવા માટે થઈ શકે નહીં અને એવી ટીમોને મદદરૂપ થશે જેઓ બૅટરી આવરદા, એપ્લિકેશન કામગીરી અને <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> ફીચરો પર કાર્ય કરતી હોય.</string> @@ -65,7 +65,7 @@ <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> અન્ય ઉપયોગકર્તાઓ સાથેના SMS વાર્તાલાપો <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> ડિવાઇસ પર એન્ક્રિપ્ટ કરશે જે સુરક્ષિત SMSનો ઉપયોગ કરીને કરશે.</string> <string name="setup_unlock">અનલૉક કરો</string> <string name="setup_device_locked">આ ડિવાઇસ ઉપયોગકર્તા દ્વારા લૉક કરવામાં આવી છે.</string> - <string name="setup_require_cyanogen_label"><b>ફેક્ટરી રિસેટ પછી તમારા Cyanogen OS ખાતાનો પાસવર્ડ</b> જરૂરી જેથી ફેક્ટરી રિસેટ પછી પણ તમારું ડિવાઇસ વાપરી શકાય.</string> + <string name="setup_require_cyanogen_label"><b>ફેક્ટરી રિસેટ પછી તમારા ખાતાનો પાસવર્ડ</b> જરૂરી જેથી ફેક્ટરી રિસેટ પછી પણ તમારું ડિવાઇસ વાપરી શકાય.</string> <string name="setup_device_locked_instructions"><i>આ ફીચર ઑફ/ઑન કરવા, કૃપા કરીને સેટિંગ્સ > સિક્યોરિટી પર જાવ</i></string> <string name="setup_warning_skip_anyway">Cyanogen OS ખાતા વિના, તમે આ બાબતો કરી શકશો નહીં:\n\nથીમ્સ ઍપમાં નવા આઇકૉન, વૉલપેપરો અને બીજી બધી બાબતોથી તમારા ફોનને કસ્ટમાઇઝ કરી શકશો નહીં\n\nજો તમારો ફોન ખોવાઇ જાય તો તે શોધો અથવા રિમોટ રીતે રદ કરો</string> <!-- Fingerprint setup --> diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index c108e11..0a8b2c8 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -54,9 +54,9 @@ <string name="yes">Da</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d </xliff:g> - <xliff:g id="name">%s </xliff:g></string> <string name="emergency_call">Hitan poziv</string> - <string name="setup_services">Cyanogenove značajke</string> - <string name="services_explanation" product="tablet">Ovi servisi rade za tebe da povećaju mogućnosti tvog tableta. Podaci će biti korišteni u suglasnosti sa Cyanogenovim <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> - <string name="services_explanation" product="default">Ovi servisi rade za tebe da povećaju mogućnosti tvog telefona. Podaci će biti korišteni u suglasnosti sa Cyanogenovim <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> + <string name="setup_services">LineageOS značajke</string> + <string name="services_explanation" product="tablet">Ovi servisi rade za tebe da povećaju mogućnosti tvog tableta. Podaci će biti korišteni u suglasnosti sa LineageOSovim <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> + <string name="services_explanation" product="default">Ovi servisi rade za tebe da povećaju mogućnosti tvog telefona. Podaci će biti korišteni u suglasnosti sa LineageOSovim <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> <string name="services_privacy_policy">Pravila privatnosti</string> <string name="services_help_improve_cm">Pomozite poboljšati <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string> <string name="services_metrics_label"><xliff:g id="name" example="Pomozite poboljšati CyanogenMod">%1$s</xliff:g> automatskim slanjem dijagnostike i korištenja podataka u Cyanogen. Ove informacije se neće koristiti za vašu identifikaciju i pomaže timovima koji rade na stvarima kao što su trajanje baterije, performanse aplikacija, i novim <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> karakteristikama.</string> @@ -67,7 +67,7 @@ <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> za zaštitu SMS razgovora s drugim korisnicima koristeći siguran SMS na<xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> uređaju.</string> <string name="setup_unlock">Otključaj</string> <string name="setup_device_locked">Uređaj je zaključao korisnik.</string> - <string name="setup_require_cyanogen_label"><b>Zahtijeva vašu Cyanogen lozinku</b>za korištenje vašeg uređaja čak i nakon resetiranja na tvorničke postavke.</string> + <string name="setup_require_cyanogen_label"><b>Zahtijeva vašu lozinku</b>za korištenje vašeg uređaja čak i nakon resetiranja na tvorničke postavke.</string> <string name="setup_device_locked_instructions"><i>Da bi isključili/uključili ovo, idite u Postavke > Privatnost</i></string> <string name="setup_warning_skip_anyway">Bez Cyanogen računa, nećete moći:\n\nPrilagoditi telefon s novim ikonama, pozadinama i ostalim u aplikaciji Teme\n\nLocirati ili obrisati telefon na daljinu ako ga izgubite</string> <!-- Fingerprint setup --> diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index 3740ac0..dfb059a 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -54,9 +54,9 @@ <string name="yes">Igen</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">Segélyhívás</string> - <string name="setup_services">Cyanogen funkciók</string> - <string name="services_explanation" product="tablet">Ezek a szolgáltatások azon dolgoznak, hogy kibővítsék az Ön táblagépe képességeit. Az adatok felhasználása a Cyanogen <xliff:g id="name" example="Privacy Policy">%s</xliff:g> alapján történik.</string> - <string name="services_explanation" product="default">Ezek a szolgáltatások azon dolgoznak, hogy kibővítsék az Ön telefonja képességeit. Az adatok felhasználása a Cyanogen <xliff:g id="name" example="Privacy Policy">%s</xliff:g> alapján történik.</string> + <string name="setup_services">LineageOS funkciók</string> + <string name="services_explanation" product="tablet">Ezek a szolgáltatások azon dolgoznak, hogy kibővítsék az Ön táblagépe képességeit. Az adatok felhasználása a LineageOS <xliff:g id="name" example="Privacy Policy">%s</xliff:g> alapján történik.</string> + <string name="services_explanation" product="default">Ezek a szolgáltatások azon dolgoznak, hogy kibővítsék az Ön telefonja képességeit. Az adatok felhasználása a LineageOS <xliff:g id="name" example="Privacy Policy">%s</xliff:g> alapján történik.</string> <string name="services_privacy_policy">Adatvédelmi nyilatkozat</string> <string name="services_help_improve_cm">Segítsen javítani <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string> <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> a Cyanogen részére történő automatikus diagnosztikai és használati adatok küldésével. Ez az információ nem használható az Ön beazonosítására, csupán segítséget nyújt a csapat számára például az akkumulátor használat, alkalmazás teljesítmény, és más új <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> funkciók fejlesztésében.</string> @@ -67,7 +67,7 @@ <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> az SMS beszélgetések titkosításához más olyan felhasználókkal, akik szintén biztonságos SMS-t használnak <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> eszközön.</string> <string name="setup_unlock">Feloldás</string> <string name="setup_device_locked">Ezt az eszközt a felhasználó zárolta.</string> - <string name="setup_require_cyanogen_label"><b>Cyanogen OS fiókjának jelszava szükséges</b> a készülék használatához, még a gyári beállítások visszaállítása után is.</string> + <string name="setup_require_cyanogen_label"><b>fiókjának jelszava szükséges</b> a készülék használatához, még a gyári beállítások visszaállítása után is.</string> <string name="setup_device_locked_instructions"><i>A szolgáltatás ki/be kapcsolásához, kérjük menjen ide: Beállítások > Biztonság</i></string> <string name="setup_warning_skip_anyway">Cyanogen OS fiók nélkül nem fog hozzáférni a következőkhöz:\n\nTelefon testreszabása új ikonokkal, háttérképekkel és egyebekkel a Téma kezelő alkalmazáson keresztül\n\nTelefon helyének maghatározása, vagy távolról való törlése, ha elveszett</string> <!-- Fingerprint setup --> diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index e587a37..6f6c1aa 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -54,9 +54,9 @@ <string name="yes">Ya</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">Panggilan darurat</string> - <string name="setup_services">Fitur Cyanogen</string> - <string name="services_explanation" product="tablet">Layanan ini bekerja untuk Anda untuk memperluas kemampuan perangkat tablet Anda. Data akan digunakan sesuai dengan sianogen di <xliff:g id="name" example="Privacy Policy">%s </xliff:g>.</string> - <string name="services_explanation" product="default">Layanan ini bekerja untuk Anda untuk memperluas kemampuan perangkat tablet Anda. Data akan digunakan sesuai dengan sianogen di <xliff:g id="name" example="Privacy Policy">%s </xliff:g>.</string> + <string name="setup_services">Fitur LineageOS</string> + <string name="services_explanation" product="tablet">Layanan ini bekerja untuk Anda untuk memperluas kemampuan perangkat tablet Anda. Data akan digunakan sesuai dengan LineageOS di <xliff:g id="name" example="Privacy Policy">%s </xliff:g>.</string> + <string name="services_explanation" product="default">Layanan ini bekerja untuk Anda untuk memperluas kemampuan perangkat tablet Anda. Data akan digunakan sesuai dengan LineageOS di <xliff:g id="name" example="Privacy Policy">%s </xliff:g>.</string> <string name="services_privacy_policy">Kebijakan privasi</string> <string name="services_help_improve_cm">Membantu meningkatkan <xliff:g id="name" example="CyanogenMod">%s </xliff:g></string> <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> dengan mengirim data diagnostik dan penggunaan ke Cyanogen secara otomatis. Informasi ini tidak dapat mengidentifikasi Anda, dan hanya berfungsi untuk membantu tim bekerja dengan hal-hal seperti masa pakai baterai, kinerja aplikasi, dan fitur <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> baru.</string> @@ -67,7 +67,7 @@ <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> untuk mengenkripsi percakapan SMS dengan pengguna lain menggunakan SMS aman pada perangkat <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string> <string name="setup_unlock">Buka kunci</string> <string name="setup_device_locked">Perangkat ini telah dikunci oleh pengguna.</string> - <string name="setup_require_cyanogen_label"><b>Memerlukan sandi akun Cyanogen OS</b> untuk dapat menggunakan perangkat meskipun setelah pengaturan ulang ke pabrik.</string> + <string name="setup_require_cyanogen_label"><b>Memerlukan sandi akun</b> untuk dapat menggunakan perangkat meskipun setelah pengaturan ulang ke pabrik.</string> <string name="setup_device_locked_instructions"><i>Untuk mengaktifkan/menonaktifkan fitur ini, silakan masuk ke Pengaturan > Keamanan</i></string> <string name="setup_warning_skip_anyway">Tanpa Akun Cyanogen OS, Anda tidak bisa:\n\nMenyesuaikan ponsel Anda dengan ikon, gambar latar baru dan masih banyak lagi di aplikasi Tema\n\nMencari atau menghapus data secara jarak jauh jika ponsel Anda hilang</string> <!-- Fingerprint setup --> diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index c10a7b2..b78a067 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -54,9 +54,9 @@ <string name="yes">Si</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">Chiamata di emergenza</string> - <string name="setup_services">Funzioni di Cyanogenmod</string> - <string name="services_explanation" product="tablet">Questi servizi funzionano per estendere le funzioni del tablet. I dati saranno utilizzati in accordo con <xliff:g id="name" example="Privacy Policy">%s</xliff:g>di Cyanogen.</string> - <string name="services_explanation" product="default">Questi servizi funzionano per estendere le funzioni del telefono. I dati saranno utilizzati in accordo con <xliff:g id="name" example="Privacy Policy">%s</xliff:g>di Cyanogen.</string> + <string name="setup_services">Funzioni di LineageOS</string> + <string name="services_explanation" product="tablet">Questi servizi funzionano per estendere le funzioni del tablet. I dati saranno utilizzati in accordo con <xliff:g id="name" example="Privacy Policy">%s</xliff:g>di LineageOS.</string> + <string name="services_explanation" product="default">Questi servizi funzionano per estendere le funzioni del telefono. I dati saranno utilizzati in accordo con <xliff:g id="name" example="Privacy Policy">%s</xliff:g>di LineageOS.</string> <string name="services_privacy_policy">Informativa sulla privacy</string> <string name="services_help_improve_cm">Aiuta a migliorare <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string> <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> inviando automaticamente dati diagnostici e di consumo agli svilupatori. Queste informazioni non possono essere utilizzate per identificare te e danno una mano ai team che lavorano su cose come la durata della batteria, performance delle app e nuove funzioni di <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string> @@ -67,7 +67,7 @@ <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> per criptare le conversazioni con gli altri utenti via SMS su un dispositivo <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string> <string name="setup_unlock">Sblocca</string> <string name="setup_device_locked">Questo dispositivo è stato bloccato dall\'utente.</string> - <string name="setup_require_cyanogen_label"><b>È necessaria la password del tuo account Cyanogen OS</b> al fine di utilizzare il dispositivo anche dopo il ripristino di fabbrica.</string> + <string name="setup_require_cyanogen_label"><b>È necessaria la password del tuo account</b> al fine di utilizzare il dispositivo anche dopo il ripristino di fabbrica.</string> <string name="setup_device_locked_instructions"><i>Per attivare e disattivare questa funzione, vai in Impostazioni > Sicurezza</i></string> <string name="setup_warning_skip_anyway">\"Senza un account Cyanogen OS, non sarai in grado di:\n\nPersonalizzare il telefono con nuove icone, sfondi ed altro ancora dall\'app Temi\n\nLocalizzare o formattare da remoto il telefono se viene smarrito\"</string> <!-- Fingerprint setup --> diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index 45e4d58..88a11a0 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -54,9 +54,9 @@ <string name="yes">כן</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">שיחת חירום</string> - <string name="setup_services">תכונות Cyanogen</string> - <string name="services_explanation" product="tablet">שירותים אלה פועלים עבורך כדי להרחיב את יכולות מכשיר הטאבלט שלך. המידע ישמש בכפוף ל<xliff:g id="name" example="Privacy Policy">%s</xliff:g> של Cyanogen.</string> - <string name="services_explanation" product="default">שירותים אלה עבורך כדי להרחיב את יכולותיו של הטלפון שלך. המידע ישמש בכפוף ל<xliff:g id="name" example="Privacy Policy">%s</xliff:g> של Cyanogen.</string> + <string name="setup_services">תכונות LineageOS</string> + <string name="services_explanation" product="tablet">שירותים אלה פועלים עבורך כדי להרחיב את יכולות מכשיר הטאבלט שלך. המידע ישמש בכפוף ל<xliff:g id="name" example="Privacy Policy">%s</xliff:g> של LineageOS.</string> + <string name="services_explanation" product="default">שירותים אלה עבורך כדי להרחיב את יכולותיו של הטלפון שלך. המידע ישמש בכפוף ל<xliff:g id="name" example="Privacy Policy">%s</xliff:g> של LineageOS.</string> <string name="services_privacy_policy">מדיניות הפרטיות</string> <string name="services_help_improve_cm">עזור בשיפור <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string> <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> על-ידי שליחת נתוני אבחון ושימוש אל Cyanogen. מידע זה לא יוכל לשמש כדי לזהותך, והוא תורם לצוותים העובדים על תחומים כמו חיי סוללה, ביצועים ותכונות חדשות ל-<xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string> @@ -67,7 +67,7 @@ <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> להצפנת שיחות SMS עם משתמשים אחרים באמצעות SMS מאובטח במכשיר <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string> <string name="setup_unlock">פתיחה</string> <string name="setup_device_locked">מכשיר זה ננעל על-ידי המשתמש.</string> - <string name="setup_require_cyanogen_label"><b>נדרשת סיסמת חשבון מערכת Cyanogen</b> על מנת להשתמש במכשירך, אפילו לאחר איפוס המכשיר להגדרות היצרן.</string> + <string name="setup_require_cyanogen_label"><b>נדרשת סיסמת חשבון מערכת</b> על מנת להשתמש במכשירך, אפילו לאחר איפוס המכשיר להגדרות היצרן.</string> <string name="setup_device_locked_instructions"><i>כדי להפעיל/לכבות אפשרות זו, גש להגדרות > אבטחה</i></string> <string name="setup_warning_skip_anyway">בלי חשבון מערכת Cyanogen, לא ניתן יהיה:\n\nלהתאים את מכשירך אישית עם סמלים, טפטים ועוד ביישום ערכות העיצוב\n\nלאתר או למחוק מרחוק את מכשירך במקרה של אובדן</string> <!-- Fingerprint setup --> diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 7a05f91..acbc55f 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -54,9 +54,9 @@ <string name="yes">はい</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">緊急通報</string> - <string name="setup_services">Cyanogenの機能</string> - <string name="services_explanation" product="tablet">これらのサービスはタブレットの機能を拡張するために動作します。データはCyanogenの<xliff:g id="name" example="Privacy Policy">%s</xliff:g>に従って使用されます。</string> - <string name="services_explanation" product="default">これらのサービスは携帯電話の機能を拡張するために動作します。データはCyanogenの<xliff:g id="name" example="Privacy Policy">%s</xliff:g>に従って使用されます。</string> + <string name="setup_services">LineageOSの機能</string> + <string name="services_explanation" product="tablet">これらのサービスはタブレットの機能を拡張するために動作します。データはLineageOSの<xliff:g id="name" example="Privacy Policy">%s</xliff:g>に従って使用されます。</string> + <string name="services_explanation" product="default">これらのサービスは携帯電話の機能を拡張するために動作します。データはLineageOSの<xliff:g id="name" example="Privacy Policy">%s</xliff:g>に従って使用されます。</string> <string name="services_privacy_policy">プライバシーポリシー</string> <string name="services_help_improve_cm"><xliff:g id="name" example="CyanogenMod">%s</xliff:g>の改善に協力します</string> <string name="services_metrics_label">診断と使用状況データを自動的にCyanogenに送信して、<xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g>。この情報は個人を特定するために使用されることはなく、電池持ち、アプリのパフォーマンス、<xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>の新機能などへの取り組みに活用されます。</string> @@ -67,7 +67,7 @@ <string name="services_secure_sms_label"><xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>端末でセキュアSMSを使用している他のユーザーとのSMSのスレッドを自動的に暗号化するために<xliff:g id="name" example="Use secure SMS">%1$s</xliff:g>。</string> <string name="setup_unlock">ロック解除</string> <string name="setup_device_locked">この端末はユーザーによってロックされています。</string> - <string name="setup_require_cyanogen_label">工場出荷時の状態にリセットした後でも、この端末を使用するには<b>Cyanogen OSアカウントのパスワードの入力が必要です</b>。</string> + <string name="setup_require_cyanogen_label">工場出荷時の状態にリセットした後でも、この端末を使用するには<b>アカウントのパスワードの入力が必要です</b>。</string> <string name="setup_device_locked_instructions"><i>この機能をOFF/ONするには、設定→プライバシーを開いてください</i></string> <string name="setup_warning_skip_anyway">Cyanogen OSアカウントがないと、以下のことができません:\n\nテーマアプリで新しいアイコンや壁紙などで携帯電話をカスタマイズする\n\n紛失時に携帯電話を探したり遠隔操作でデータを消去する</string> <!-- Fingerprint setup --> diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml index 4cf0bdc..8c63da6 100644 --- a/res/values-kn-rIN/strings.xml +++ b/res/values-kn-rIN/strings.xml @@ -53,9 +53,9 @@ <string name="yes">ಹೌದು</string> <string name="data_sim_name">ಸಿಮ್ <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">ತುರುಪರೀಸ್ಥಿತಿ ಕರೆ</string> - <string name="setup_services">Cyanogen ವೈಶಿಷ್ಟ್ಯಗಳು</string> - <string name="services_explanation" product="tablet">ಈ ಸೇವೆಗಳು ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ನ ಸಾಮಾರ್ಥ್ಯಗಳನ್ನು ವಿಸ್ತರಿಸಲು ನಿಮಗಾಗಿ ಕೆಲಸ ಮಾಡುತ್ತದೆ. ಡೇಟಾವನ್ನು Cyanogenನ <xliff:g id="name" example="Privacy Policy">%s</xliff:g> ಅನುಸಾರವಾಗಿ ಉಪಯೋಗಿಸಲಾಗುತ್ತದೆ.</string> - <string name="services_explanation" product="default">ಈ ಸೇವೆಗಳು ನಿಮ್ಮ ಫೋನ್ನ ಸಾಮಾರ್ಥ್ಯಗಳನ್ನು ವಿಸ್ತರಿಸಲು ನಿಮಗಾಗಿ ಕೆಲಸ ಮಾಡುತ್ತದೆ. ಡೇಟಾವನ್ನು Cyanogenನ <xliff:g id="name" example="Privacy Policy">%s</xliff:g> ಅನುಸಾರವಾಗಿ ಉಪಯೋಗಿಸಲಾಗುತ್ತದೆ.</string> + <string name="setup_services">LineageOS ವೈಶಿಷ್ಟ್ಯಗಳು</string> + <string name="services_explanation" product="tablet">ಈ ಸೇವೆಗಳು ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ನ ಸಾಮಾರ್ಥ್ಯಗಳನ್ನು ವಿಸ್ತರಿಸಲು ನಿಮಗಾಗಿ ಕೆಲಸ ಮಾಡುತ್ತದೆ. ಡೇಟಾವನ್ನು LineageOSನ <xliff:g id="name" example="Privacy Policy">%s</xliff:g> ಅನುಸಾರವಾಗಿ ಉಪಯೋಗಿಸಲಾಗುತ್ತದೆ.</string> + <string name="services_explanation" product="default">ಈ ಸೇವೆಗಳು ನಿಮ್ಮ ಫೋನ್ನ ಸಾಮಾರ್ಥ್ಯಗಳನ್ನು ವಿಸ್ತರಿಸಲು ನಿಮಗಾಗಿ ಕೆಲಸ ಮಾಡುತ್ತದೆ. ಡೇಟಾವನ್ನು LineageOSನ <xliff:g id="name" example="Privacy Policy">%s</xliff:g> ಅನುಸಾರವಾಗಿ ಉಪಯೋಗಿಸಲಾಗುತ್ತದೆ.</string> <string name="services_privacy_policy">ಗೌಪ್ಯತಾ ನೀತಿ</string> <string name="services_help_improve_cm"><xliff:g id="name" example="CyanogenMod">%s</xliff:g> ಸುಧಾರಿಸಲು ಸಹಕರಿಸಿ</string> <string name="services_metrics_label">Cyanogenಗೆ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ವಿಶ್ಲೇಷಣಾತ್ಮಕ ಮತ್ತು ಬಳಕೆಯ ಡೇಟಾವನ್ನು ಕಳುಹಿಸುವುದರಿಂದ <xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g>. ಈ ಮಾಹಿತಿಯನ್ನು ನಿಮ್ಮನ್ನು ಗುರುತಿಸುವುದಕ್ಕಾಗಿ ಉಪಯೋಗಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ ಮತ್ತು ಇದನ್ನು ಬ್ಯಾಟರಿ ಲೈಫ್, ಆಪ್ ಕಾರ್ಯಕ್ಷಮತೆ, ಮತ್ತು ಹೊಸ <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> ವೈಶಿಷ್ಟ್ಯಗಳಲ್ಲಿ ಕೆಲಸಮಾಡುವ ತಂಡಗಳಿಗೆ ನೀಡಲಾಗುವುದು.</string> @@ -65,7 +65,7 @@ <string name="services_secure_sms_label"><xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> ಸಾಧನದಲ್ಲಿ ಇತರೆ ಬಳಕೆದಾರರ ಜೊತೆಗಿನ ಎಸ್ಎಂಎಸ್ ಸಂಭಾಷಣೆಗಳನ್ನು ಸುರಕ್ಷಿತ ಎಸ್ಎಂಎಸ್ ಉಪಯೋಗಿಸಿ ಎನ್ಕ್ರಿಪ್ಟ್ ಮಾಡಲು <xliff:g id="name" example="Use secure SMS">%1$s</xliff:g>.</string> <string name="setup_unlock">ಅನ್ಲಾಕ್</string> <string name="setup_device_locked">ಸಾಧನವನ್ನು ಬಳಕೆದಾರನು ಲಾಕ್ ಮಾಡಿದ್ದಾರೆ.</string> - <string name="setup_require_cyanogen_label">ಫ್ಯಾಕ್ಟರಿ ಮರುಹೊಂದಿಸಿದ ನಂತರವೂ ನಿಮ್ಮ ಸಾಧನವನ್ನು ಉಪಯೋಗಿಸಲು <b>ನಿಮ್ಮ Cyanogen OS ಖಾತೆ ಪ್ರವೇಶಪದದ ಅಗತ್ಯವಿದೆ</b>.</string> + <string name="setup_require_cyanogen_label">ಫ್ಯಾಕ್ಟರಿ ಮರುಹೊಂದಿಸಿದ ನಂತರವೂ ನಿಮ್ಮ ಸಾಧನವನ್ನು ಉಪಯೋಗಿಸಲು <b>ನಿಮ್ಮ ಖಾತೆ ಪ್ರವೇಶಪದದ ಅಗತ್ಯವಿದೆ</b>.</string> <string name="setup_device_locked_instructions"><i>ಈ ವೈಶಿಷ್ಟ್ಯವನ್ನು ಆಫ್/ಆನ್ ಮಾಡಲು. ದಯವಿಟ್ಟು ಸೆಟ್ಟಿಂಗ್ಸ್ >: ಭದ್ರತೆಗೆ ಹೋಗಿ</i></string> <string name="setup_warning_skip_anyway">Cyanogen OS ಖಾತೆಯಿಲ್ಲದೆ, ನೀವು:\n\nನಿಮ್ಮ ಫೋನನ್ನು ಹೊಸ ಐಕಾನ್ಗಳು, ವಾಲ್ಪೇಪರ್ಗಳು ಮತ್ತು ಇನ್ನೂ ಹೆಚ್ಚಿನವುಗಳನ್ನು ಥೀಮ್ಸ್ ಆಪ್ನಿಂದ ಕಸ್ಟಮೈಸ್ ಮಾಡಲು\n\nಫೋನ್ ಕಳುವಾದಲ್ಲಿ ಪತ್ತೆಹಚ್ಚಲು ಅಥವಾ ಪರೋಕ್ಷವಾಗಿ ನಿಮ್ಮ ಫೋನ್ನನ್ನು ಅಳಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ</string> <!-- Fingerprint setup --> diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 7c6bf9d..0596ed7 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -53,9 +53,9 @@ <string name="yes">예</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">긴급 통화</string> - <string name="setup_services">Cyanogen 기능</string> - <string name="services_explanation" product="tablet">이 기능은 태블릿의 성능 향상을 위해 작동합니다. 수집된 데이터는 Cyanogen의 <xliff:g id="name" example="Privacy Policy">%s</xliff:g>에 따라 사용됩니다.</string> - <string name="services_explanation" product="default">이 기능은 휴대전화의 성능 향상을 위해 작동합니다. 수집된 데이터는 Cyanogen의 <xliff:g id="name" example="Privacy Policy">%s</xliff:g>에 따라 사용됩니다.</string> + <string name="setup_services">LineageOS 기능</string> + <string name="services_explanation" product="tablet">이 기능은 태블릿의 성능 향상을 위해 작동합니다. 수집된 데이터는 LineageOS의 <xliff:g id="name" example="Privacy Policy">%s</xliff:g>에 따라 사용됩니다.</string> + <string name="services_explanation" product="default">이 기능은 휴대전화의 성능 향상을 위해 작동합니다. 수집된 데이터는 LineageOS의 <xliff:g id="name" example="Privacy Policy">%s</xliff:g>에 따라 사용됩니다.</string> <string name="services_privacy_policy">개인 정보 보호 정책</string> <string name="services_help_improve_cm"><xliff:g id="name" example="CyanogenMod">%s</xliff:g>의 개발 지원</string> <string name="services_metrics_label">진단 및 사용 정보를 Cyanogen에 보내 <xliff:g id="name" example="CyanogenMod 개선을 도와주십시오">%1$s</xliff:g>. 이 정보는 배터리 수명, 앱 성능과 새 <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> 기능과 같이 사용자를 식별할 수 없는 정보입니다.</string> @@ -66,7 +66,7 @@ <string name="services_secure_sms_label"><xliff:g id="name" example="보안 SMS를 사용">%1$s</xliff:g>하여 <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>기기에서 보안 SMS를 사용하는 다른 사용자와의 SMS 대화를 암호화함.</string> <string name="setup_unlock">잠금 해제</string> <string name="setup_device_locked">이 기기는 사용자에 의해 잠겨 있습니다.</string> - <string name="setup_require_cyanogen_label">공장 초기화 후에도 기기를 사용하려면 <b>Cyanogen OS 계정의 비밀번호가 필요합니다</b> .</string> + <string name="setup_require_cyanogen_label">공장 초기화 후에도 기기를 사용하려면 <b>계정의 비밀번호가 필요합니다</b> .</string> <string name="setup_device_locked_instructions"><i>이 기능을 켜거나 끄려면, 설정 > 보안으로 이동하세요</i></string> <string name="setup_warning_skip_anyway">Cyanogen OS 계정이 없을 경우 사용할 수 없는 기능:\n\n 테마 앱을 통한 새로운 아이콘, 배경화면 등의 적용\n\n기기를 잃어버렸을 경우 기기 찾기 또는 원격 개인정보 삭제</string> diff --git a/res/values-lb/strings.xml b/res/values-lb/strings.xml index 8dd888a..a4c188b 100644 --- a/res/values-lb/strings.xml +++ b/res/values-lb/strings.xml @@ -49,9 +49,9 @@ <string name="yes">Jo</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">Noutruff</string> - <string name="setup_services">Cyanogen-Funktiounen</string> - <string name="services_explanation" product="tablet">Dës Servicer gi benotzt, fir d\'Funktioune vun denger Tablet z\'erweideren. D\'Date ginn an Iwwerastëmmung mat <xliff:g id="name" example="Privacy Policy">%s</xliff:g> vu Cyanogen benotzt.</string> - <string name="services_explanation" product="default">Dës Servicer gi benotzt, fir d\'Funktioune vun dengem Telefon z\'erweideren. D\'Date ginn an Iwwerastëmmung mat <xliff:g id="name" example="Privacy Policy">%s</xliff:g> vu Cyanogen benotzt.</string> + <string name="setup_services">LineageOS-Funktiounen</string> + <string name="services_explanation" product="tablet">Dës Servicer gi benotzt, fir d\'Funktioune vun denger Tablet z\'erweideren. D\'Date ginn an Iwwerastëmmung mat <xliff:g id="name" example="Privacy Policy">%s</xliff:g> vu LineageOS benotzt.</string> + <string name="services_explanation" product="default">Dës Servicer gi benotzt, fir d\'Funktioune vun dengem Telefon z\'erweideren. D\'Date ginn an Iwwerastëmmung mat <xliff:g id="name" example="Privacy Policy">%s</xliff:g> vu LineageOS benotzt.</string> <string name="services_privacy_policy">Dateschutzerklärung</string> <string name="services_help_improve_cm">Hëllef <xliff:g id="name" example="CyanogenMod">%s</xliff:g> ze verbesseren</string> <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> andeem s du automatesch Diagnos- a Benotzungsdaten u CyanogenMod schécks. Dës Informatioune kënnen net benotzt ginn, fir dech z\'identifiéieren. Et hëlleft eisen Equippen, déi u Saache wéi Akkulafzäit, App-Leeschtung oder un neie <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>-Funktioune schaffen.</string> @@ -61,7 +61,7 @@ <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g>, fir SMS-Konversatioune mat anere Benotzer op engem <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>-Apparat ze verschlësselen.</string> <string name="setup_unlock">Entspären</string> <string name="setup_device_locked">Dësen Apparat gouf duerch de Benotzer gespaart.</string> - <string name="setup_require_cyanogen_label"><b>D\'Passwuert vum Cyanogen-OS-Kont verlaange</b> fir däin Apparat ze benotzen, souguer no der Zrécksetzung op d\'Wierksastellungen.</string> + <string name="setup_require_cyanogen_label"><b>D\'Passwuert vum Kont verlaange</b> fir däin Apparat ze benotzen, souguer no der Zrécksetzung op d\'Wierksastellungen.</string> <string name="setup_device_locked_instructions"><i>Fir dës Funktioun z\'aktivéieren/desaktivéieren, géi op Astellungen > Sécherheet</i></string> <string name="setup_warning_skip_anyway">Ouni en Cyanogen-OS-Kont kanns du däin Telefon net:\n\nMat neie Symboler, Hannergrondbiller a méi an der Design-App upassen\n\nLokaliséieren oder läschen, wann s du e verluer hues</string> <!-- Fingerprint setup --> diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index 82e86b2..565b77d 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -49,9 +49,9 @@ <string name="yes">Taip</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">Pagalbos skambutis</string> - <string name="setup_services">„Cyanogen“ funkcijos</string> - <string name="services_explanation" product="tablet">Šios paslaugos dirba už jus, kad išplėstu jūsų planšetinio kompiuterio galimybes. Duomenys bus naudojami pagal „Cyanogen\'s“ <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> - <string name="services_explanation" product="default">Šios paslaugos dirba už jus, kad išplėstu jūsų telefono galimybes. Duomenys bus naudojami pagal „Cyanogen\'s“ <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> + <string name="setup_services">„LineageOS“ funkcijos</string> + <string name="services_explanation" product="tablet">Šios paslaugos dirba už jus, kad išplėstu jūsų planšetinio kompiuterio galimybes. Duomenys bus naudojami pagal „LineageOS\'s“ <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> + <string name="services_explanation" product="default">Šios paslaugos dirba už jus, kad išplėstu jūsų telefono galimybes. Duomenys bus naudojami pagal „LineageOS\'s“ <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> <string name="services_privacy_policy">Privatumo politika</string> <string name="services_help_improve_cm">Padėti tobulinti <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string> <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> automatiškai siunčiant diagnostikos ir naudojimo duomenis „Cyanogen“. Ši informacija negali būti naudojama jūsų identifikavimui, pateikti duomenys padės komandoms dirbančioms prie akumuliatoriaus veikimo laiko, programų našumo ir naujų <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> funkcijų.</string> @@ -61,7 +61,7 @@ <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g>, kad užšifruoti SMS pokalbius su kitais vartotojais, naudojančiais saugius SMS <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> įrenginyje.</string> <string name="setup_unlock">Atrakinti</string> <string name="setup_device_locked">Šis įrenginys buvo užrakintas naudotojo.</string> - <string name="setup_require_cyanogen_label"><b>Reikalauti jūsų „Cyanogen“ OS paskyros slaptažodžio</b> , kad būtų galima naudotis įrenginiu net ir po gamyklinių nustatymų iš naujo.</string> + <string name="setup_require_cyanogen_label"><b>Reikalauti jūsų paskyros slaptažodžio</b> , kad būtų galima naudotis įrenginiu net ir po gamyklinių nustatymų iš naujo.</string> <string name="setup_device_locked_instructions"><i>Kad išjungtumėte / įjungtumėte šią funkciją, eikite į Nustatymai > Sauga</i></string> <string name="setup_warning_skip_anyway">Be „Cyanogen“ OS paskyros, jums nebus suteikta galimybė:\n\nTemų programoje tinkinti savo telefoną su naujomis piktogramomis, ekrano fonais ir daugiau\n\nRasti arba nuotoliniu būdu ištrinti savo telefoną, jei jis yra prarastas</string> <!-- Fingerprint setup --> diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index 22382e6..8ad9067 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -49,9 +49,9 @@ <string name="yes">Jā</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">Ārkārtas zvans</string> - <string name="setup_services">Cyanogen iespējas</string> - <string name="services_explanation" product="tablet">Šie pakalpojumi darbojas, lai pavairotu Jūsu planšetdatora iespējas. Dati tiks izmantoti saskaņā ar Cyanogen <xliff:g id="name" example="Privātuma Politiku">%s</xliff:g>.</string> - <string name="services_explanation" product="default">Šie pakalpojumi darbojas, lai papildinātu Jūsu telefona iespējas. Dati tiks izmantoti saskaņā ar Cyanogen <xliff:g id="name" example="Privātuma Politiku">%s</xliff:g>.</string> + <string name="setup_services">LineageOS iespējas</string> + <string name="services_explanation" product="tablet">Šie pakalpojumi darbojas, lai pavairotu Jūsu planšetdatora iespējas. Dati tiks izmantoti saskaņā ar LineageOS <xliff:g id="name" example="Privātuma Politiku">%s</xliff:g>.</string> + <string name="services_explanation" product="default">Šie pakalpojumi darbojas, lai papildinātu Jūsu telefona iespējas. Dati tiks izmantoti saskaņā ar LineageOS <xliff:g id="name" example="Privātuma Politiku">%s</xliff:g>.</string> <string name="services_privacy_policy">Privātuma Politika</string> <string name="services_help_improve_cm">Palīdziet uzlabot <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string> <string name="services_metrics_label"><xliff:g id="name" example="Palīdziet uzlabot CyanogenMod">%1$s</xliff:g> automātiski sūtot diagnostikas informāciju un ierīces lietojumu uz Cyanogen serveriem. Šī informācija nevar tikt izmantota lai Jūs identificētu, bet gan palīdzēs komandām kas strādā pie baterijas taupīšana, lietotņu veiktspēja, jaunām <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> iespējām un citiem uzlabojumiem.</string> @@ -61,7 +61,7 @@ <string name="services_secure_sms_label"><xliff:g id="name" example="Izmantot drošu SIM">%1$s</xliff:g> lai šifrētu SMS sarunas ar citiem lietotājiem, kas arī izmanto šifrētas SMS <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> ierīcē.</string> <string name="setup_unlock">Atbloķēt</string> <string name="setup_device_locked">Šo ierīci lietotājs ir bloķējis.</string> - <string name="setup_require_cyanogen_label"><b>Pieprasiet savu Cyanogen OS konta paroli</b>, lai Jūs varētu izmantot ierīci arī pēc rūpnīcas datu atiestatīšanas.</string> + <string name="setup_require_cyanogen_label"><b>Pieprasiet savu konta paroli</b>, lai Jūs varētu izmantot ierīci arī pēc rūpnīcas datu atiestatīšanas.</string> <string name="setup_device_locked_instructions"><i>Lai izslēgtu/ieslēgtu šo iespēju, lūdzu dodieties uz Iestatījumi > Drošība</i></string> <string name="setup_warning_skip_anyway">Bez Cyanogen OS konta Jūs nevarēsiet:\n\nPielāgot Jūsu telefonu ar jaunam ikonām, ekrāntapetēm un vēl vairāk Tēmas lietotnē\n\nNoteikt atrašanās vietu un attālināti dzēst telefonu ja tas ir nozaudēts</string> <!-- Fingerprint setup --> diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml index 01ef2ec..e89ae67 100644 --- a/res/values-ml-rIN/strings.xml +++ b/res/values-ml-rIN/strings.xml @@ -53,9 +53,9 @@ <string name="yes">ഉണ്ട്</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">അടിയന്തര കോൾ</string> - <string name="setup_services">Cyanogen സവിശേഷതകൾ</string> - <string name="services_explanation" product="tablet">നിങ്ങളുടെ ടാബ്ലെറ്റിന്റെ ക്ഷമത വിപുലപ്പെടുത്താന് ഈ സേവനങ്ങൾ നിങ്ങള്ക്കായി പ്രവര്ത്തിക്കുന്നു. Cyanogen ന്റെ <xliff:g id="name" example="Privacy Policy">%s</xliff:g> ന് അനുസൃതമായി ഡാറ്റ ഉപയോഗിക്കുന്നതാണ്.</string> - <string name="services_explanation" product="default">നിങ്ങളുടെ ഫോണിന്റെ ക്ഷമത വിപുലപ്പെടുത്താന് ഈ സേവനങ്ങൾ നിങ്ങള്ക്കായി പ്രവര്ത്തിക്കുന്നു. Cyanogen ന്റെ <xliff:g id="name" example="Privacy Policy">%s</xliff:g> ന് അനുസൃതമായി ഡാറ്റ ഉപയോഗിക്കുന്നതാണ്.</string> + <string name="setup_services">LineageOS സവിശേഷതകൾ</string> + <string name="services_explanation" product="tablet">നിങ്ങളുടെ ടാബ്ലെറ്റിന്റെ ക്ഷമത വിപുലപ്പെടുത്താന് ഈ സേവനങ്ങൾ നിങ്ങള്ക്കായി പ്രവര്ത്തിക്കുന്നു. LineageOS ന്റെ <xliff:g id="name" example="Privacy Policy">%s</xliff:g> ന് അനുസൃതമായി ഡാറ്റ ഉപയോഗിക്കുന്നതാണ്.</string> + <string name="services_explanation" product="default">നിങ്ങളുടെ ഫോണിന്റെ ക്ഷമത വിപുലപ്പെടുത്താന് ഈ സേവനങ്ങൾ നിങ്ങള്ക്കായി പ്രവര്ത്തിക്കുന്നു. LineageOS ന്റെ <xliff:g id="name" example="Privacy Policy">%s</xliff:g> ന് അനുസൃതമായി ഡാറ്റ ഉപയോഗിക്കുന്നതാണ്.</string> <string name="services_privacy_policy">സ്വകാര്യതാനയം</string> <string name="services_help_improve_cm"><xliff:g id="name" example="CyanogenMod">%s</xliff:g> മെച്ചപ്പെടുത്താൻ സഹായിക്കുക</string> <string name="services_metrics_label">ഡയഗ്നോസ്റ്റിക്സ്, ഉപയോഗ ഡാറ്റ Cyanogen ലേക്ക് സ്വപ്രേരിതമായി അയക്കുന്നതിലൂടെ <xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g>. ഈ വിവരങ്ങൾ നിങ്ങളെ തിരിച്ചറിയുന്നതിനായി ഉപയോഗിക്കാൻ കഴിയില്ല, ബാറ്ററിയുടെ ആയുസ്സ്, ആപ്ലിക്കേഷൻ പ്രകടനം, പുതിയ <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> സവിശേഷതകൾ തുടങ്ങിയ കാര്യങ്ങളിൽ പ്രവർത്തിക്കുന്ന ടീമുകളെ ഇത് സഹായിക്കുന്നു</string> @@ -65,7 +65,7 @@ <string name="services_secure_sms_label">ഒരു <xliff:g id="name" example="Use secure SMS">%2$s</xliff:g> ഉപകരണത്തില് സുരക്ഷിത SMS ഉപയോഗിച്ച് മറ്റ് ഉപയോക്താക്കളുമായി SMS സംഭാഷണങ്ങൾ എൻക്രിപ്റ്റ് ചെയ്യുന്നതിന് <xliff:g id="name" example="CyanogenMod">%1$s</xliff:g>.</string> <string name="setup_unlock">അൺലോക്കുചെയ്യുക</string> <string name="setup_device_locked">ഈ ഉപകരണം ഉപയോക്താവ് ലോക്ക് ചെയ്തു.</string> - <string name="setup_require_cyanogen_label"><b>ഫാക്ടറി റീസെറ്റ് ചെയ്തതിന് ശേഷവും നിങ്ങളുടെ</b> ഉപകരണം ഉപയോഗിക്കാൻ നിങ്ങളുടെ Cyanogen OS പാസ്വേര്ഡ് ആവശ്യമാണ്.</string> + <string name="setup_require_cyanogen_label"><b>ഫാക്ടറി റീസെറ്റ് ചെയ്തതിന് ശേഷവും നിങ്ങളുടെ</b> ഉപകരണം ഉപയോഗിക്കാൻ നിങ്ങളുടെ പാസ്വേര്ഡ് ആവശ്യമാണ്.</string> <string name="setup_device_locked_instructions"><i>ഈ സവിശേഷത ഓഫ്/ഓൺ ചെയ്യുന്നതിന് ക്രമീകരണങ്ങൾ > സുരക്ഷ എന്നതിലേക്ക് പോകുക</i></string> <string name="setup_warning_skip_anyway">ഒരു Cyanogen OS അക്കൗണ്ട് ഇല്ലാതെ നിങ്ങള്ക്ക് ചെയ്യാനാവാത്തത്:\n\nപുതിയ ഐക്കണുകൾ, വാൾപേപ്പറുകൾ മറ്റും ഉപയോഗിച്ച് തീംസ് ആപ്ലിക്കേഷനില് നിങ്ങളുടെ ഫോണ് ഇഷ്ടാനുസൃതമാക്കുന്നത്\\n\nനിങ്ങളുടെ ഫോണ് നഷ്ടപ്പെടുകയാണെങ്കില് അതിന്റെ സ്ഥാനം കണ്ടെത്തി വിദൂരമായി അത് മായ്ക്കുന്നത്</string> <!-- Fingerprint setup --> diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml index f405a2c..d605ad0 100644 --- a/res/values-mr-rIN/strings.xml +++ b/res/values-mr-rIN/strings.xml @@ -53,9 +53,9 @@ <string name="yes">होय</string> <string name="data_sim_name">सिम <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">आणीबाणीचा कॉल</string> - <string name="setup_services">Cyanogen वैशिष्ट्ये</string> - <string name="services_explanation" product="tablet">तुमच्या टॅब्लेटवरील क्षमता विस्तारित करण्यासाठी ह्या सेवा तुमच्यासाठी काम करतात. Cyanogenच्या <xliff:g id="name" example="Privacy Policy">%s</xliff:g>नुसार डेटा वापरला जाईल.</string> - <string name="services_explanation" product="default">तुमच्या फोनवरील क्षमता विस्तारित करण्यासाठी ह्या सेवा तुमच्यासाठी काम करतात. Cyanogenच्या <xliff:g id="name" example="Privacy Policy">%s</xliff:g>नुसार डेटा वापरला जाईल.</string> + <string name="setup_services">LineageOS वैशिष्ट्ये</string> + <string name="services_explanation" product="tablet">तुमच्या टॅब्लेटवरील क्षमता विस्तारित करण्यासाठी ह्या सेवा तुमच्यासाठी काम करतात. LineageOSच्या <xliff:g id="name" example="Privacy Policy">%s</xliff:g>नुसार डेटा वापरला जाईल.</string> + <string name="services_explanation" product="default">तुमच्या फोनवरील क्षमता विस्तारित करण्यासाठी ह्या सेवा तुमच्यासाठी काम करतात. LineageOSच्या <xliff:g id="name" example="Privacy Policy">%s</xliff:g>नुसार डेटा वापरला जाईल.</string> <string name="services_privacy_policy">गुप्तता धोरण</string> <string name="services_help_improve_cm"><xliff:g id="name" example="CyanogenMod">%s</xliff:g>सुधारण्यासाठी मदत करा</string> <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> Cyanogen कडे निदानात्मक आणि वापर डेटा स्वयंचलितपणे पाठवून. तुम्हाला ओळखण्यासाठी ही माहिती वापरता येत नाही आणि बॅटरी आयु, अनुप्रयोगची कामगिरी आणि नवीन <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> वैशिष्ट्ये यांसारख्या गोष्टींवर काम करण्यासाठी संघांना हात देते.</string> @@ -65,7 +65,7 @@ <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> SMS संभाषणे <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> डिव्हाइसवर सुरक्षित SMS वापरणाऱ्या इतर वापरकर्त्यांसह एनक्रिप्ट करण्यासाठी.</string> <string name="setup_unlock">अनलॉक करा</string> <string name="setup_device_locked">हे डिव्हाइस वापरकर्त्याने लॉक केले आहे.</string> - <string name="setup_require_cyanogen_label">फॅक्टरी रीसेटनंतरही तुमचे डिव्हाइस वापरण्यासाठी <b>तुमचा Cyanogen OS खाते पासवर्ड आवश्यक आहे</b>.</string> + <string name="setup_require_cyanogen_label">फॅक्टरी रीसेटनंतरही तुमचे डिव्हाइस वापरण्यासाठी <b>तुमचा खाते पासवर्ड आवश्यक आहे</b>.</string> <string name="setup_device_locked_instructions"><i>हे वैशिष्ट्य बंद/चालू करण्यासाठी, कृपया सेटिंग्ज > सुरक्षा कडे जा</i></string> <string name="setup_warning_skip_anyway">Cyanogen OS खात्याशिवाय, तुम्हाला हे करता येणार नाही:\n\nनवीन प्रतीके, वॉलपेपर्स आणि अधिकसह थीम अनुप्रयोगमध्ये तुमचा फोन सानुकूल करा\n\nतुमचा फोन शोधणे किंवा तो हरवला असल्यास दूरस्थपणे खोडणे</string> <!-- Fingerprint setup --> diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index fec23eb..19c869b 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -54,9 +54,9 @@ <string name="yes">Ja</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d </xliff:g> - <xliff:g id="name">%s </xliff:g></string> <string name="emergency_call">Nødsamtale</string> - <string name="setup_services">Cyanogen funksjoner</string> - <string name="services_explanation" product="tablet">Disse tjenestene fungerer for deg ved å utvide funksjonaliteten til tableten. Dataene vil bli brukt i samsvar med Cyanogen\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> - <string name="services_explanation" product="default">Disse tjenestene fungere for deg ved å utvide funksjonene i telefonen. Dataene vil bli brukt i samsvar med Cyanogen\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> + <string name="setup_services">LineageOS funksjoner</string> + <string name="services_explanation" product="tablet">Disse tjenestene fungerer for deg ved å utvide funksjonaliteten til tableten. Dataene vil bli brukt i samsvar med LineageOS\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> + <string name="services_explanation" product="default">Disse tjenestene fungere for deg ved å utvide funksjonene i telefonen. Dataene vil bli brukt i samsvar med LineageOS\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> <string name="services_privacy_policy">Personvern</string> <string name="services_help_improve_cm">Hjelp til med å forbedre <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string> <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> ved å sende diagnostikk- og bruksdata automatisk til Cyanogen. Denne informasjonen kan ikke brukes til å identifisere deg, men hjelper de som jobber med ting som batteritid, appytelse og nye <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>-funksjoner.</string> @@ -67,7 +67,7 @@ <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> for å kryptere SMS-samtaler med andre brukere ved hjelp av sikker SMS på en <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>-enhet.</string> <string name="setup_unlock">Lås opp</string> <string name="setup_device_locked">Denne enheten er låst av brukeren.</string> - <string name="setup_require_cyanogen_label"><b>Krever passordet til Cyanogen OS konto</b> for å bruke enheten etter en fabrikkgjennoppretting.</string> + <string name="setup_require_cyanogen_label"><b>Krever passordet til konto</b> for å bruke enheten etter en fabrikkgjennoppretting.</string> <string name="setup_device_locked_instructions"><i>For å slå denne funksjonen av/på, kan du gå til Innstillinger > sikkerhet</i></string> <string name="setup_warning_skip_anyway">Uten en Cyanogen OS konto, vil du ikke kunne: \n\nEndre på telefonen med nye ikoner, bakgrunnsbilder og mer i temaer-app\n\nLokalisere eller eksternt slette telefonen hvis du har mistet den</string> <!-- Fingerprint setup --> diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 38f4cb6..152354e 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -54,9 +54,9 @@ <string name="yes">Ja</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">Noodoproep</string> - <string name="setup_services">Cyanogen-functies</string> - <string name="services_explanation" product="tablet">Deze diensten worden gebruikt om de mogelijkheden van uw tablet uit te breiden. Gegevens worden gebruikt conform de \'<xliff:g id="name" example="Privacy Policy">%s</xliff:g>\' van Cyanogen.</string> - <string name="services_explanation" product="default">Deze diensten worden gebruikt om de mogelijkheden van uw telefoon uit te breiden. Gegevens worden gebruikt conform de \'<xliff:g id="name" example="Privacy Policy">%s</xliff:g>\' van Cyanogen.</string> + <string name="setup_services">LineageOS-functies</string> + <string name="services_explanation" product="tablet">Deze diensten worden gebruikt om de mogelijkheden van uw tablet uit te breiden. Gegevens worden gebruikt conform de \'<xliff:g id="name" example="Privacy Policy">%s</xliff:g>\' van LineageOS.</string> + <string name="services_explanation" product="default">Deze diensten worden gebruikt om de mogelijkheden van uw telefoon uit te breiden. Gegevens worden gebruikt conform de \'<xliff:g id="name" example="Privacy Policy">%s</xliff:g>\' van LineageOS.</string> <string name="services_privacy_policy">Privacybeleid</string> <string name="services_help_improve_cm">Help mee met het verbeteren van <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string> <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> door automatisch diagnose- en verbruiksgegevens te verzenden naar Cyanogen. Deze informatie kan niet gebruikt worden om u te identificeren en helpt de teams om te werken aan zaken zoals levensduur van de accu, app-prestaties en nieuwe <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>-functies.</string> @@ -67,7 +67,7 @@ <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> om sms-gesprekken te versleutelen met anderen die ook beveiligde sms-berichten gebruiken op een <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>-apparaat.</string> <string name="setup_unlock">Ontgrendelen</string> <string name="setup_device_locked">Dit apparaat is vergrendeld door de gebruiker.</string> - <string name="setup_require_cyanogen_label"><b>Uw Cyanogen OS-accountwachtwoord vereisen</b> om het apparaat te gebruiken, zelfs na terugzetten naar fabrieksinstellingen.</string> + <string name="setup_require_cyanogen_label"><b>Uw accountwachtwoord vereisen</b> om het apparaat te gebruiken, zelfs na terugzetten naar fabrieksinstellingen.</string> <string name="setup_device_locked_instructions"><i>Om deze functie in of uit te schakelen, ga naar Instellingen > Beveiliging</i></string> <string name="setup_warning_skip_anyway">Zonder een Cyanogen OS-account kunt u niet:\n\nUw telefoon personaliseren met nieuwe pictogrammen, achtergronden en meer in de app Thema\'s\n\nUw telefoon lokaliseren of op afstand wissen wanneer u deze kwijt raakt</string> <!-- Fingerprint setup --> diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 4ba7c8a..0c95196 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -54,9 +54,9 @@ <string name="yes">Tak</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">Połączenie alarmowe</string> - <string name="setup_services">Funkcje Cyanogen</string> - <string name="services_explanation" product="tablet">Te usługi są uruchomione w celu rozszerzenia możliwości twojego tabletu. Dane będą używane zgodnie z Cyanogen <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> - <string name="services_explanation" product="default">Te usługi są uruchomione w celu rozszerzenia możliwości twojego telefonu. Dane będą używane zgodnie z Cyanogen <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> + <string name="setup_services">Funkcje LineageOS</string> + <string name="services_explanation" product="tablet">Te usługi są uruchomione w celu rozszerzenia możliwości twojego tabletu. Dane będą używane zgodnie z LineageOS <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> + <string name="services_explanation" product="default">Te usługi są uruchomione w celu rozszerzenia możliwości twojego telefonu. Dane będą używane zgodnie z LineageOS <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> <string name="services_privacy_policy">Polityka Prywatności</string> <string name="services_help_improve_cm">Pomóż ulepszać <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string> <string name="services_metrics_label"><xliff:g id="name" example="Pomóż nam w ulepszaniu CyanogenMod">%1$s</xliff:g> zezwalając na automatyczne przesyłanie danych diagnostycznych oraz użytkowania do Cyanogen. Te informacje nie będą mogły zostać użyte do identyfikacji i stanowią pomoc dla zespołów pracujących nad czasem pracy baterii, wydajnością aplikacji oraz nowymi funkcjami <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string> @@ -67,7 +67,7 @@ <string name="services_secure_sms_label"><xliff:g id="name" example="Użyj bezpiecznych SMS">%1$s</xliff:g>, aby prowadzić szyfrowane konwersacje z innymi użytkownikami korzystającymi z bezpiecznych SMS na urządzeniach z <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string> <string name="setup_unlock">Odblokuj</string> <string name="setup_device_locked">To urządzenie zostało zablokowane przez użytkownika.</string> - <string name="setup_require_cyanogen_label"><b>Wymaga hasła twojego konta Cyanogen OS</b>, aby korzystać z urządzenia, nawet po przywróceniu ustawień fabrycznych.</string> + <string name="setup_require_cyanogen_label"><b>Wymaga hasła twojego konta</b>, aby korzystać z urządzenia, nawet po przywróceniu ustawień fabrycznych.</string> <string name="setup_device_locked_instructions"><i>Aby włączyć/wyłączyć tę funkcję, przejdź do Ustawienia > Zabezpieczenia</i></string> <string name="setup_warning_skip_anyway">Bez Konta Cyanogen OS nie będziesz w stanie:\n\nDostosować swojego telefonu wybierając nowe ikony, tapety oraz więcej innych opcji w aplikacji Motywy\n\nZlokalizować lub zdalnie wymazać pamięć telefonu w przypadku zgubienia</string> <!-- Fingerprint setup --> diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml index 7b7b8bd..fbb158d 100644 --- a/res/values-pt-rBR/strings.xml +++ b/res/values-pt-rBR/strings.xml @@ -54,9 +54,9 @@ <string name="yes">Sim</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">Chamada de emergência</string> - <string name="setup_services">Recursos do Cyanogen</string> - <string name="services_explanation" product="tablet">Estes serviços trabalham para estender os recursos do seu tablet. Dados serão utilizados em conformidade com a <xliff:g id="name" example="Privacy Policy">%s</xliff:g> do Cyanogen.</string> - <string name="services_explanation" product="default">Estes serviços trabalham para estender os recursos do seu telefone. Dados serão utilizados em conformidade com o <xliff:g id="name" example="Privacy Policy">%s</xliff:g> do Cyanogen.</string> + <string name="setup_services">Recursos do LineageOS</string> + <string name="services_explanation" product="tablet">Estes serviços trabalham para estender os recursos do seu tablet. Dados serão utilizados em conformidade com a <xliff:g id="name" example="Privacy Policy">%s</xliff:g> do LineageOS.</string> + <string name="services_explanation" product="default">Estes serviços trabalham para estender os recursos do seu telefone. Dados serão utilizados em conformidade com o <xliff:g id="name" example="Privacy Policy">%s</xliff:g> do LineageOS.</string> <string name="services_privacy_policy">Política de Privacidade</string> <string name="services_help_improve_cm">Ajude a melhorar a <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string> <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> enviando automaticamente relatórios de uso de dados e diagnósticos para a Cyanogen. Esta informação não será usada para lhe identificar e ajuda as equipes responsáveis pela duração de bateria, desempenho dos aplicativos e novos recursos do <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string> @@ -67,7 +67,7 @@ <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> para criptografar conversas SMS com outros usuários que usam o SMS seguro em um dispositivo <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string> <string name="setup_unlock">Desbloquear</string> <string name="setup_device_locked">Este dispositivo foi bloqueado pelo usuário.</string> - <string name="setup_require_cyanogen_label"><b>Exigir a senha da conta Cyanogen</b> para usar o dispositivo mesmo depois da restauração de fábrica.</string> + <string name="setup_require_cyanogen_label"><b>Exigir a senha da conta</b> para usar o dispositivo mesmo depois da restauração de fábrica.</string> <string name="setup_device_locked_instructions"><i>Para ativar ou desativar este recurso, por favor vá para Configurações e Segurança</i></string> <string name="setup_warning_skip_anyway">Sem uma conta Cyanogen, você não poderá:\n\nPersonalizar seu celular com novos ícones, papéis de parede e muito mais no aplicativo Temas\n\nLocalizar ou apagar remotamente o seu telefone caso o perca</string> <!-- Fingerprint setup --> diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index a9e8caa..7db3f2c 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -54,9 +54,9 @@ <string name="yes">Sim</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">Chamada de emergência</string> - <string name="setup_services">Funcionalidades Cyanogen</string> - <string name="services_explanation" product="tablet">Estes serviços servem para ampliar os recursos do seu tablet. Os dados serão utilizados em conformidade com a <xliff:g id="name" example="Privacy Policy">%s</xliff:g> da Cyanogen.</string> - <string name="services_explanation" product="default">Estes serviços servem para ampliar os recursos do seu telefone. Os dados serão utilizados em conformidade com a <xliff:g id="name" example="Privacy Policy">%s</xliff:g> da Cyanogen.</string> + <string name="setup_services">Funcionalidades LineageOS</string> + <string name="services_explanation" product="tablet">Estes serviços servem para ampliar os recursos do seu tablet. Os dados serão utilizados em conformidade com a <xliff:g id="name" example="Privacy Policy">%s</xliff:g> da LineageOS.</string> + <string name="services_explanation" product="default">Estes serviços servem para ampliar os recursos do seu telefone. Os dados serão utilizados em conformidade com a <xliff:g id="name" example="Privacy Policy">%s</xliff:g> da LineageOS.</string> <string name="services_privacy_policy">Política de Privacidade</string> <string name="services_help_improve_cm">Ajude a melhorar a <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string> <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> enviando automaticamente dados de diagnóstico e utilização para a Cyanogen. Esta informação não pode ser usada para identificá-lo e ajuda as equipas de desenvolvimento a melhorarem coisas como a duração da bateria, o desempenho das aplicações e no desenvolvimento novos recursos para a <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string> @@ -67,7 +67,7 @@ <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> para encriptar conversas SMS com outros utilizadores que também utilizem este serviço num dispositivo com <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string> <string name="setup_unlock">Desbloquear</string> <string name="setup_device_locked">Este dispositivo foi bloqueado pelo utilizador.</string> - <string name="setup_require_cyanogen_label"><b>Exigir a palavra-passe da conta Cyanogen OS</b> para usar o dispositivo mesmo depois da reposição dos dados de fábrica.</string> + <string name="setup_require_cyanogen_label"><b>Exigir a palavra-passe da conta</b> para usar o dispositivo mesmo depois da reposição dos dados de fábrica.</string> <string name="setup_device_locked_instructions"><i>Para ativar ou desativar este recurso, por favor vá a Definições de Segurança</i></string> <string name="setup_warning_skip_anyway">Sem uma conta Cyanogen OS, não será capaz de: \n\nPersonalizar o telefone com novos ícones, imagens de fundo e muito mais na aplicação de Temas\n\nLocalizar ou apagar remotamente o seu telefone se estiver perdido</string> <!-- Fingerprint setup --> diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 07c93f8..929ccbb 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -53,9 +53,9 @@ <string name="yes">Da</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">Apel de urgenţă</string> - <string name="setup_services">Facilități Cyanogen</string> - <string name="services_explanation" product="tablet">Aceste servicii extind capacitățile tabletei dumneavoastră. Datele vor fi folosite în conformitate cu Cyanogen <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> - <string name="services_explanation" product="default">Aceste servicii extind capacitățile telefonului dumneavoastră. Datele vor fi folosite în conformitate cu Cyanogen <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> + <string name="setup_services">Facilități LineageOS</string> + <string name="services_explanation" product="tablet">Aceste servicii extind capacitățile tabletei dumneavoastră. Datele vor fi folosite în conformitate cu LineageOS <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> + <string name="services_explanation" product="default">Aceste servicii extind capacitățile telefonului dumneavoastră. Datele vor fi folosite în conformitate cu LineageOS <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> <string name="services_privacy_policy">Politica de confidențialitate</string> <string name="services_help_improve_cm">Ajută la îmbunătățirea <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string> <string name="services_apply_theme">Aplică tema <xliff:g id="name" example="Material">%s</xliff:g></string> @@ -63,7 +63,7 @@ <string name="services_use_secure_sms">Utilizează SMS securizat</string> <string name="setup_unlock">Deblocare</string> <string name="setup_device_locked">Acest dispozitiv a fost blocat de utilizator.</string> - <string name="setup_require_cyanogen_label"><b>Cere parola contului Cyanogen OS</b> pentru a utiliza aparatul dvs. chiar și după o resetare la setările din fabrică.</string> + <string name="setup_require_cyanogen_label"><b>Cere parola contului</b> pentru a utiliza aparatul dvs. chiar și după o resetare la setările din fabrică.</string> <string name="setup_device_locked_instructions"><i>Pentru a activa sau dezactiva această caracteristică, vă rugăm să mergeți la Setări > securitate</i></string> <string name="setup_warning_skip_anyway">Fără un cont de Cyanogen OS, nu veți putea să: \n\nPersonalizați telefonul cu noi pictograme, imagini de fundal și mai multe în aplicația de Teme\n\nLocalizați sau ștergeți de la distanță telefonul dacă e pierdut</string> <!-- Fingerprint setup --> diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 36b20a4..8b7eae2 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -54,9 +54,9 @@ <string name="yes">Да</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> — <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">Экстренный вызов</string> - <string name="setup_services">Службы Cyanogen</string> - <string name="services_explanation" product="tablet">Эти службы расширяют возможности планшета. Данные будут использоваться в соответствии с правилами Cyanogen: <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> - <string name="services_explanation" product="default">Эти службы расширяют возможности вашего телефона. Данные будут использоваться в соответствии с <xliff:g id="name" example="Privacy Policy">%s</xliff:g> Cyanogen.</string> + <string name="setup_services">Службы LineageOS</string> + <string name="services_explanation" product="tablet">Эти службы расширяют возможности планшета. Данные будут использоваться в соответствии с правилами LineageOS: <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> + <string name="services_explanation" product="default">Эти службы расширяют возможности вашего телефона. Данные будут использоваться в соответствии с <xliff:g id="name" example="Privacy Policy">%s</xliff:g> LineageOS.</string> <string name="services_privacy_policy">политикой конфиденциальности</string> <string name="services_help_improve_cm">Помочь улучшить <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string> <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g>, разрешив отправление данных диагностики в Cyanogen. Эта информация полностью анонимна и не может быть использована для вашей идентификации. Использование этих данных поможет в работе над энергосбережением, производительностью и многими деталями <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string> @@ -67,7 +67,7 @@ <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> для шифрования сообщений, передаваемых другим пользователям устройств с <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string> <string name="setup_unlock">Разблокировать</string> <string name="setup_device_locked">Устройство заблокировано пользователем.</string> - <string name="setup_require_cyanogen_label"><b>Требовать пароль аккаунта ОС Cyanogen</b> для использования устройства даже после удаления всех данных.</string> + <string name="setup_require_cyanogen_label"><b>Требовать пароль аккаунта</b> для использования устройства даже после удаления всех данных.</string> <string name="setup_device_locked_instructions"><i>Чтобы включить или отключить эту функцию, перейдите в меню «Настройки > Безопасность»</i></string> <string name="setup_warning_skip_anyway">Без аккаунта ОС Cyanogen вы не сможете:\n\nперсонализировать телефон новыми обоями, значками и другими компонентами в приложении «Темы»;\n\nнайти или удалённо сбросить настройки на телефоне в случае его потери.</string> <!-- Fingerprint setup --> diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index e80ca81..cc2fb94 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -54,9 +54,9 @@ <string name="yes">Áno</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">Tiesňový hovor</string> - <string name="setup_services">Funkcie Cyanogen</string> - <string name="services_explanation" product="tablet">Tieto služby sú určené pre vás a rozširujú možnosti vášho tabletu. Údaje sa použijú v súlade s Cyanogen <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> - <string name="services_explanation" product="default">Tieto služby sú určené pre vás a rozširujú možnosti vášho telefónu. Údaje sa použijú v súlade s Cyanogen <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> + <string name="setup_services">Funkcie LineageOS</string> + <string name="services_explanation" product="tablet">Tieto služby sú určené pre vás a rozširujú možnosti vášho tabletu. Údaje sa použijú v súlade s LineageOS <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> + <string name="services_explanation" product="default">Tieto služby sú určené pre vás a rozširujú možnosti vášho telefónu. Údaje sa použijú v súlade s LineageOS <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> <string name="services_privacy_policy">Ochrana osobných údajov</string> <string name="services_help_improve_cm">Pomôcť vylepšovať <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string> <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> automatickým zasielaním diagnostických údajov a údajov o používaní do Cyanogenu. Tieto informácie sa nepoužijú na vašu identifikáciu, ale pomôžu tímom pracujúcim na výdrži, výkone aplikácií a nových funkciách <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string> @@ -67,7 +67,7 @@ <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> pre šifrovanie SMS konverzácií s ostatnými používateľmi prostredníctvom zabezpečených SMS na zariadení s <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string> <string name="setup_unlock">Odomknúť</string> <string name="setup_device_locked">Toto zariadenie bolo uzamknuté používateľom.</string> - <string name="setup_require_cyanogen_label"><b>Vyžadovať heslo vášho účtu Cyanogen OS</b> na použitie vášho zariadenia aj po obnove továrenských nastavení.</string> + <string name="setup_require_cyanogen_label"><b>Vyžadovať heslo vášho účtu</b> na použitie vášho zariadenia aj po obnove továrenských nastavení.</string> <string name="setup_device_locked_instructions"><i>Na vypnutie/zapnutie tejto funkcie prejdite do Nastavenia > Zabezpečenie</i></string> <string name="setup_warning_skip_anyway">Bez účtu Cyanogen OS nebudete môcť:\n\nPrispôsobiť si telefón s novými ikonami, tapetami a ďalším obsahom z aplikácie Témy\n\nNájsť alebo vzdialene vymazať váš telefón po jeho strate</string> <!-- Fingerprint setup --> @@ -87,7 +87,7 @@ <string name="lockscreen_setup_screen_lock_setup">Nastaviť kód PIN, gesto alebo heslo</string> <!-- MOD stuff --> <string name="mod_welcome">Zariadenie je pripravené na použitie MODov</string> - <string name="mod_description">MODy urýchľujú, zefektívňujú a uľahčujú používanie telefónu. V tejto príručke môžete nájsť nové režimy, + <string name="mod_description">MODy urýchľujú, zefektívňujú a uľahčujú používanie telefónu. V tejto príručke môžete nájsť nové režimy, naučiť sa čo robia, povoliť ich alebo zakázať.</string> <string name="mod_explore">Preskúmať sprievodcu MODov</string> </resources> diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index 0a06005..570b4f6 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -54,9 +54,9 @@ <string name="yes">Da</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">Klic v sili</string> - <string name="setup_services">Značilnosti Cyanogen</string> - <string name="services_explanation" product="tablet">Te storitve vam omogočajo, da razširite zmogljivosti svoje tablice. Podatki se uporabijo v skladu s <xliff:g id="name" example="Privacy Policy">%s </xliff:g> Cyanogen.</string> - <string name="services_explanation" product="default">Te storitve vam omogočajo, da razširite zmogljivosti svojega telefona. Podatki se uporabijo v skladu s <xliff:g id="name" example="Privacy Policy">%s </xliff:g> Cyanogen.</string> + <string name="setup_services">Značilnosti LineageOS</string> + <string name="services_explanation" product="tablet">Te storitve vam omogočajo, da razširite zmogljivosti svoje tablice. Podatki se uporabijo v skladu s <xliff:g id="name" example="Privacy Policy">%s </xliff:g> LineageOS.</string> + <string name="services_explanation" product="default">Te storitve vam omogočajo, da razširite zmogljivosti svojega telefona. Podatki se uporabijo v skladu s <xliff:g id="name" example="Privacy Policy">%s </xliff:g> LineageOS.</string> <string name="services_privacy_policy">Pravilnikom o zasebnosti</string> <string name="services_help_improve_cm">Pomagajte izboljšati <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string> <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> s samodejnim pošiljanjem diagnostičnih podatkov in podatkov uporabe Cyanogenu. Ti podatki se ne uporabljajo za vaše prepoznavanje in ekipi pomagajo pri izboljšanju npr. življenjske dobe baterije, zmogljivosti aplikacij in novih značilnosti <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string> @@ -67,7 +67,7 @@ <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g>, da šifrirate pogovore SMS z drugimi uporabniki z uporabo varnih SMS-ov na napravi <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string> <string name="setup_unlock">Odkleni</string> <string name="setup_device_locked">To napravo je zaklenil uporabnik.</string> - <string name="setup_require_cyanogen_label"><b>Zahtevajte svoje geslo računa Cyanogen OS</b>, da uporabite svojo napravo tudi po ponastavitvi na tovarniške vrednosti.</string> + <string name="setup_require_cyanogen_label"><b>Zahtevajte svoje geslo računa</b>, da uporabite svojo napravo tudi po ponastavitvi na tovarniške vrednosti.</string> <string name="setup_device_locked_instructions"><i>Za vklop/izklop te značilnosti pojdite v Nastavitve > Varnost</i></string> <string name="setup_warning_skip_anyway">Brez računa Cyanogen OS ne boste mogli: \n\nPrilagoditi svojega telefona z novimi ikonami, ozadji in več v aplikaciji za teme\n\nNajti ali oddaljeno izbrisati telefona, če ste ga izgubili</string> <!-- Fingerprint setup --> diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index 9dffc5d..0ff234e 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -54,9 +54,9 @@ <string name="yes">Да</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">Хитан позив</string> - <string name="setup_services">Cyanogen карактеристике</string> - <string name="services_explanation" product="tablet">Ови сервиси раде за тебе да повећају могућности твог таблета. Подаци ће бити коришћени у сагласности са Cyanogen-овим <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> - <string name="services_explanation" product="default">Ови сервиси раде за тебе да повећају могућности твог телефона. Подаци ће бити коришћени у сагласности са Cyanogen-овим <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> + <string name="setup_services">LineageOS карактеристике</string> + <string name="services_explanation" product="tablet">Ови сервиси раде за тебе да повећају могућности твог таблета. Подаци ће бити коришћени у сагласности са LineageOS-овим <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> + <string name="services_explanation" product="default">Ови сервиси раде за тебе да повећају могућности твог телефона. Подаци ће бити коришћени у сагласности са LineageOS-овим <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> <string name="services_privacy_policy">Политика приватности</string> <string name="services_help_improve_cm">Помозите да побољшамо <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string> <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> аутоматским слањем дијагностике и коришћења података у Cyanogen. Ове информације се неће користити за вашу идентификацију и далазе у руку да тимова који раде на стварима као што су трајање батерије, перформансе апликација, и новим <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> карактеристикама.</string> @@ -67,7 +67,7 @@ <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> да заштитиш SMS преписку са другим корисницима користећи безбедан SMS на <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> уређају.</string> <string name="setup_unlock">Откључај</string> <string name="setup_device_locked">Овај уређај је закључао корисник.</string> - <string name="setup_require_cyanogen_label"><b>Захтева твоју лозинку Cyanogen налога</b> да би користио свој уређај чак и после ресетовања на фабрички.</string> + <string name="setup_require_cyanogen_label"><b>Захтева твоју лозинку налога</b> да би користио свој уређај чак и после ресетовања на фабрички.</string> <string name="setup_device_locked_instructions"><i>Да би искључио/укључио ово, иди на Подешавања > Приватност</i></string> <string name="setup_warning_skip_anyway">Без Cyanogen налога, нећеш моћи да:\n\nПрилагодиш телефон са новим иконама, тапетама и осталим у апликацији тема\n\nЛоцираш или обришеш телефон на даљину ако га изгубиш</string> <!-- Fingerprint setup --> diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index eb34629..4917cd0 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -54,9 +54,9 @@ <string name="yes">Ja</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">Nödsamtal</string> - <string name="setup_services">Cyanogen-funktioner</string> - <string name="services_explanation" product="tablet">Dessa tjänster ger dig fler användningsområden för din surfplatta. Datat kommer användas i överensstämmelse med Cyanogens <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> - <string name="services_explanation" product="default">Dessa tjänster ger dig fler användningsområden för din telefon. Datat kommer användas i överensstämmelse med Cyanogens <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> + <string name="setup_services">LineageOS-funktioner</string> + <string name="services_explanation" product="tablet">Dessa tjänster ger dig fler användningsområden för din surfplatta. Datat kommer användas i överensstämmelse med LineageOSs <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> + <string name="services_explanation" product="default">Dessa tjänster ger dig fler användningsområden för din telefon. Datat kommer användas i överensstämmelse med LineageOSs <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> <string name="services_privacy_policy">Sekretesspolicy</string> <string name="services_help_improve_cm">Hjälp till att förbättra <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string> <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> genom att automatiskt skicka diagnostisk och användningsdata till Cyanogen. Denna information kan inte användas för att identifiera dig och kan hjälpa team att arbeta på saker så som batteritid, app-prestanda, och nya<xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> funktioner.</string> @@ -66,7 +66,7 @@ <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> för att kryptera SMS-konversationer med andra användare med hjälp av säkra SMS på en<xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> enhet.</string> <string name="setup_unlock">Lås upp</string> <string name="setup_device_locked">Denna enhet har blivit låst av användaren.</string> - <string name="setup_require_cyanogen_label"><b>Kräver lösenordet till ditt Cyanogen-konto</b> för att använda enheten, även efter en fabriksåterställning.</string> + <string name="setup_require_cyanogen_label"><b>Kräver lösenordet till ditt konto</b> för att använda enheten, även efter en fabriksåterställning.</string> <string name="setup_device_locked_instructions"><i>För att slå av/på denna funktion, gå till Inställningar > Säkerhet</i></string> <string name="setup_warning_skip_anyway">Utan ett Cyanogen-konto kan du inte:\n\nAnpassa din telefon med nya ikoner, bakgrundsbilder med mer i Tema-applikationen\n\nLokalisera eller radera din telefon, om du förlorar den</string> <!-- Fingerprint setup --> diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml index 574e8b8..5deeb64 100644 --- a/res/values-ta-rIN/strings.xml +++ b/res/values-ta-rIN/strings.xml @@ -53,9 +53,9 @@ <string name="yes">அனுமதிக்கப்பட்டது</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">அவசரகால அழைப்பு</string> - <string name="setup_services">Cyanogen அம்சங்கள்</string> - <string name="services_explanation" product="tablet">இந்த சேவைகள் உங்கள் டேப்ளட்டின் திறன்களை விரிவுபடுத்துவதற்காக உங்களுக்காக பணிசெய்கின்றன. தரவானது Cyanogenஇன் <xliff:g id="name" example="Privacy Policy">%s</xliff:g>க்கு இணங்கி பயன்படுத்தப்படும்.</string> - <string name="services_explanation" product="default">இந்த சேவைகள் உங்கள் தொலைப்பேசியின் திறன்களை விரிவுபடுத்துவதற்காக உங்களுக்காக பணிசெய்கின்றன. தரவானது Cyanogenஇன் <xliff:g id="name" example="Privacy Policy">%s</xliff:g>க்கு இணங்கி பயன்படுத்தப்படும்.</string> + <string name="setup_services">LineageOS அம்சங்கள்</string> + <string name="services_explanation" product="tablet">இந்த சேவைகள் உங்கள் டேப்ளட்டின் திறன்களை விரிவுபடுத்துவதற்காக உங்களுக்காக பணிசெய்கின்றன. தரவானது LineageOSஇன் <xliff:g id="name" example="Privacy Policy">%s</xliff:g>க்கு இணங்கி பயன்படுத்தப்படும்.</string> + <string name="services_explanation" product="default">இந்த சேவைகள் உங்கள் தொலைப்பேசியின் திறன்களை விரிவுபடுத்துவதற்காக உங்களுக்காக பணிசெய்கின்றன. தரவானது LineageOSஇன் <xliff:g id="name" example="Privacy Policy">%s</xliff:g>க்கு இணங்கி பயன்படுத்தப்படும்.</string> <string name="services_privacy_policy">தனியுரிமைக் கொள்கை</string> <string name="services_help_improve_cm">மேம்படுத்த உதவுங்கள் <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string> <string name="services_metrics_label">தானியக்கமாக பகுப்பாய்வு மற்றும் பயன் தரவை Cyanogenக்கு அனுப்புவதன் மூலம் <xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g>. இந்த தகவல் உங்களை அடையாளம் காண பயன்படுத்தப்பட முடியாது மற்றும் மின்கலன் ஆயுள், பயன்பாட்டின் செயல்திறன் மற்றும் புதிய <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> அம்சங்கள் போன்ற விடயங்களில் பணிசெய்யும் குழுக்களுக்கு ஒரு உதவிக்கரம் நீட்டும்.</string> @@ -65,7 +65,7 @@ <string name="services_secure_sms_label">பாதுகாப்பான SMSஐ <xliff:g id="name" example="Use secure SMS">%2$s</xliff:g> சாதனத்தில் பிற பயனர்களோடு SMS உரையாடல்களை <xliff:g id="name" example="CyanogenMod">%1$s</xliff:g> குறியாக்கவுள்ளது.</string> <string name="setup_unlock">தடைநீக்கு</string> <string name="setup_device_locked">இந்த சாதனமானது பயனரால் பூட்டப்பட்டது.</string> - <string name="setup_require_cyanogen_label"><b>ஒரு தொழிற்சாலை மீட்டமைப்புக்கு பிறகும் உங்கள் Cyanogen OS கணக்கு</b> கடவுச்சொல் தேவைப்படுகிறது.</string> + <string name="setup_require_cyanogen_label"><b>ஒரு தொழிற்சாலை மீட்டமைப்புக்கு பிறகும் உங்கள் கணக்கு</b> கடவுச்சொல் தேவைப்படுகிறது.</string> <string name="setup_device_locked_instructions"><i>இந்த அம்சத்தை ஆஃப்/ஆன் செய்ய, தயவுசெய்து செல்லுங்கள் அமைப்புகள் > பாதுகாப்பு</i></string> <string name="setup_warning_skip_anyway">ஒரு Cyanogen OS கணக்கு இல்லாமல்,உங்களால் இவற்றை செய்ய முடியாது: \n\n உங்கள் தொலைப்பேசியை புதிய படவுருக்கள், வால்பேப்பர்கள் மற்றும் கருப்பொருள் பயன்பாட்டிலுள்ள பலவற்றால் தனிப்பயனாக்க\n\n உங்கள் தொலைப்பேசி தொலைந்துவிட்டால் அதை கண்டறிய அல்லது தொலைநிலையில் அழிக்க</string> <!-- Fingerprint setup --> diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index d8b102d..ab4fc09 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -53,9 +53,9 @@ <string name="yes">ใช่</string> <string name="data_sim_name">ซิม <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">โทรฉุกเฉิน</string> - <string name="setup_services">คุณสมบัติของ Cyanogen</string> - <string name="services_explanation" product="tablet">บริการเหล่านี้ทำงานเพื่อเพิ่มความสามารถให้แท็บเล็ตของคุณได้ ข้อมูลจะถูกใช้ตาม <xliff:g id="name" example="Privacy Policy">%s</xliff:g> ของ Cyanogen</string> - <string name="services_explanation" product="default">บริการเหล่านี้ทำงานเพื่อขยายความสามารถของโทรศัพท์ของคุณได้ ข้อมูลจะถูกใช้ตาม <xliff:g id="name" example="Privacy Policy">%s</xliff:g> ของ Cyanogen</string> + <string name="setup_services">คุณสมบัติของ LineageOS</string> + <string name="services_explanation" product="tablet">บริการเหล่านี้ทำงานเพื่อเพิ่มความสามารถให้แท็บเล็ตของคุณได้ ข้อมูลจะถูกใช้ตาม <xliff:g id="name" example="Privacy Policy">%s</xliff:g> ของ LineageOS</string> + <string name="services_explanation" product="default">บริการเหล่านี้ทำงานเพื่อขยายความสามารถของโทรศัพท์ของคุณได้ ข้อมูลจะถูกใช้ตาม <xliff:g id="name" example="Privacy Policy">%s</xliff:g> ของ LineageOS</string> <string name="services_privacy_policy">นโยบายความเป็นส่วนตัว</string> <string name="services_help_improve_cm">ช่วยปรับปรุง <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string> <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> ด้วยการส่งข้อมูลการวินิจฉัยและข้อมูลการใช้ให้กับ Cyanogen โดยอัตโนมัติ ข้อมูลนี้จะไม่สามารถนำไปใช้เพื่อระบุตัวตนของคุณและให้การช่วยเหลือทีมที่กำลังทำงานเกี่ยวกับช่วงอายุของแบตเตอร์รี่ ประสิทธิภาพการทำงานของแอพ และคุณสมบัติ <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> ใหม่</string> @@ -66,7 +66,7 @@ <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> เพื่อเข้ารหัสการสนทนาผ่าน SMS กับผู้ใช้คนอื่น ๆ โดยใช้ SMS แบบที่มีการเข้ารหัสบนอุปกรณ์ที่มี <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> ติดตั้ง</string> <string name="setup_unlock">ปลดล็อค</string> <string name="setup_device_locked">อุปกรณ์นี้ถูกล็อคโดยผู้ใช้</string> - <string name="setup_require_cyanogen_label"><b>กรุณาใส่รหัสผ่านบัญชี Cyanogen OS</b> เพื่อใช่อุปกรณ์แม้ในกรณีหลังการคืนค่าโรงงานแล้วก็ตาม</string> + <string name="setup_require_cyanogen_label"><b>กรุณาใส่รหัสผ่านบัญชี</b> เพื่อใช่อุปกรณ์แม้ในกรณีหลังการคืนค่าโรงงานแล้วก็ตาม</string> <string name="setup_device_locked_instructions"><i>เพื่อปิด/เปิดคุณสมบัตินี้ กรุณาไปที่ การตั้งค่า > ความปลอดภัย</i></string> <string name="setup_warning_skip_anyway">หากไม่มีบัญชี Cyanogen OS คุณจะไม่สามารถ:\n\nปรับแต่งโทรศัพท์โดยใช้ไอคอน ภาพหน้าจอใหม่ ๆ และคุณสมบัติอื่น ๆ เพิ่มเติมในแอปรูปแบบธีม\n\nค้นหาหรือลบข้อมูลระยะไกลหากอุปกรณ์สูญหาย</string> <!-- Fingerprint setup --> diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 6712a71..ccc5980 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -53,9 +53,9 @@ <string name="yes">Evet</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">Acil durum çağrısı</string> - <string name="setup_services">Cyanogen özellikleri</string> - <string name="services_explanation" product="tablet">Bu hizmetler tabletinizin yeteneklerini arttırır. Veriler Cyanogen\'in <xliff:g id="name" example="Privacy Policy">%s</xliff:g> ilkelerine uygun olarak kullanılacaktır.</string> - <string name="services_explanation" product="default">Bu hizmetler telefonunuzun yeteneklerini arttırır. Veriler, Cyanogen\'in <xliff:g id="name" example="Privacy Policy">%s</xliff:g> ilkelerine uygun olarak kullanılacaktır.</string> + <string name="setup_services">LineageOS özellikleri</string> + <string name="services_explanation" product="tablet">Bu hizmetler tabletinizin yeteneklerini arttırır. Veriler LineageOS\'in <xliff:g id="name" example="Privacy Policy">%s</xliff:g> ilkelerine uygun olarak kullanılacaktır.</string> + <string name="services_explanation" product="default">Bu hizmetler telefonunuzun yeteneklerini arttırır. Veriler, LineageOS\'in <xliff:g id="name" example="Privacy Policy">%s</xliff:g> ilkelerine uygun olarak kullanılacaktır.</string> <string name="services_privacy_policy">Gizlilik Politikası</string> <string name="services_help_improve_cm"><xliff:g id="name" example="CyanogenMod">%s</xliff:g> gelişimine yardım edin</string> <string name="services_metrics_label">Tanılama ve kullanım verilerini Cyanogen\'e göndererek <xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g>. Bu bilgiler kimliğinizi ortaya çıkaracak şekilde kullanılmaz ancak pil ömrü, uygulama performansı ve yeni <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> özellikleri gibi konulardaki ekip çalışmalarında kullanılır.</string> @@ -66,7 +66,7 @@ <string name="services_secure_sms_label"><xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> cihazında güvenli SMS kullanan diğer kullanıcılarla olan SMS sohbetlerinizi şifrelemek için <xliff:g id="name" example="Use secure SMS">%1$s</xliff:g>.</string> <string name="setup_unlock">Kilidi kaldır</string> <string name="setup_device_locked">Bu cihaz kullanıcı tarafından kilitlenmiş.</string> - <string name="setup_require_cyanogen_label">Cihazınızı fabrika ayarlarına sıfırlandıktan sonra kullanabilmeniz için <b>Cyanogen OS hesap şifresi gerekir</b>.</string> + <string name="setup_require_cyanogen_label">Cihazınızı fabrika ayarlarına sıfırlandıktan sonra kullanabilmeniz için <b>hesap şifresi gerekir</b>.</string> <string name="setup_device_locked_instructions"><i>Bu özelliği açıp kapatmak için lütfen Ayarlar > Güvenlik bölümüne gidin</i></string> <string name="setup_warning_skip_anyway">Cyanogen OS Hesabı olmadan, aşağıdakiler mümkün olmayacaktır:\n\nTelefonunuzu yeni simgeler, duvar kağıtları ve Temalar uygulamasındaki daha fazla ögeyle özelleştirmek\n\nTelefonunuzu kaybedince uzaktan konumunu bulmak veya içeriğini silmek</string> <!-- Fingerprint setup --> diff --git a/res/values-ug/strings.xml b/res/values-ug/strings.xml index 308e228..0513877 100644 --- a/res/values-ug/strings.xml +++ b/res/values-ug/strings.xml @@ -53,7 +53,7 @@ <string name="yes">ھەئە</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">جىددىي چاقىرىش</string> - <string name="setup_services">Cyanogen ئىقتىدارلىرى</string> + <string name="setup_services">LineageOS ئىقتىدارلىرى</string> <string name="services_explanation" product="tablet">بۇ مۇلازىمەتلەر تاختا كومپىيوتېرىڭىزنىڭ ئىقتىدارىنى كېڭەيتىشكە ئىشلىتىلىدۇ. سانلىق مەلۇمات <xliff:g id="name" example="Privacy Policy">%s</xliff:g> گە ئاساسەن ئىشلىتىلىدۇ.</string> <string name="services_explanation" product="default">بۇ مۇلازىمەتلەر تېلېفونىڭىزنىڭ ئىقتىدارىنى كېڭەيتىشكە ئىشلىتىلىدۇ. سانلىق مەلۇمات <xliff:g id="name" example="Privacy Policy">%s</xliff:g> گە ئاساسەن ئىشلىتىلىدۇ.</string> <string name="services_privacy_policy">شەخسىيەت تەدبىرى</string> @@ -65,7 +65,7 @@ <string name="services_secure_sms_label">سىزنىڭ <xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> ئۈسكىنىڭىزدە<xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> ئىلە باشقىلار بىلەن بولغان پاراڭغا پارول سېلىنىدۇ.</string> <string name="setup_unlock">قۇلۇپ ئېچىش</string> <string name="setup_device_locked">بۇ ئۈسكىنى باشقىلار قۇلۇپلاپ قويغان.</string> - <string name="setup_require_cyanogen_label">ئۈسكىنى زاۋۇتتىن چىققان ھالەتكە قايتۇرغان تەقدىردىمۇ، <b>سىزنىڭ Cyanogen OS ھېساباتى پارولىنى كىرگۈرۈش تەلەپ قىلىنىدۇ</b>.</string> + <string name="setup_require_cyanogen_label">ئۈسكىنى زاۋۇتتىن چىققان ھالەتكە قايتۇرغان تەقدىردىمۇ، <b>سىزنىڭ ھېساباتى پارولىنى كىرگۈرۈش تەلەپ قىلىنىدۇ</b>.</string> <string name="setup_device_locked_instructions"><i>بۇ ئىقىتىدارنى ئېچىپ تاقاش ئۈچۈن، تەڭشەكلەر> بىخەتەرلىككە كىرىڭ</i></string> <string name="setup_warning_skip_anyway">\"ئەگەر Cyanogen OS ھېساباتى قۇرمىسىڭىز، سىز: \n\n باش تېمىنى ئىشلىتىپ يېڭى سىنبەلگە، تەگلىك ۋە باشقا خاسلىقنى ئىشلىتەلمەيسىز\n\n ئورۇن بەلگىلىيەلمەيسىز ياكى يوقالغان تېلېفوننى تازىلىيالمايسىز\"</string> <!-- Fingerprint setup --> diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 813d47d..f853a88 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -49,7 +49,7 @@ <string name="yes">Так</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">Екстрений виклик</string> - <string name="setup_services">Особливості Cyanogen</string> + <string name="setup_services">Особливості LineageOS</string> <string name="services_explanation" product="tablet">Ці послуги створено, щоб розширити можливості Вашого пристрою. Особисті дані буде використано у відповідності до <xliff:g id="name" example="Privacy Policy">%s </xliff:g>.</string> <string name="services_explanation" product="default">Ці послуги створено, щоб розширити можливості Вашого пристрою. Особисті дані буде використано у відповідності до <xliff:g id="name" example="Privacy Policy">%s </xliff:g>.</string> <string name="services_privacy_policy">Політика Конфіденційності</string> @@ -62,7 +62,7 @@ <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> для шифрування SMS-переписки з іншими користувачами<xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string> <string name="setup_unlock">Розблокувати</string> <string name="setup_device_locked">Цей пристрій заблоковано користувачем.</string> - <string name="setup_require_cyanogen_label"><b>Необхідний пароль Cyanogen OS</b> для використання Вашого пристрою навіть після скидання до заводських налаштувань.</string> + <string name="setup_require_cyanogen_label"><b>Необхідний пароль </b> для використання Вашого пристрою навіть після скидання до заводських налаштувань.</string> <string name="setup_device_locked_instructions"><i>Щоб увімкнути/вимкнути цю функцію, будь ласка, перейдіть до Налаштування > Безпека</i></string> <string name="setup_warning_skip_anyway">Без облікового запису ОС Cyanogen, Ви не зможете:\n\nДодати індивідуальності телефону за допомогою нових іконок, шпалер тощо у програмі \"Теми\",\n\nвиявити місцезнаходження пристрою чи віддалено стерти дані, у випадку його втрати</string> <!-- Fingerprint setup --> diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index efcd836..15baaf1 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -53,9 +53,9 @@ <string name="yes">Có</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">Cuộc gọi khẩn cấp</string> - <string name="setup_services">Tính năng Cyanogen</string> - <string name="services_explanation" product="tablet">Những dịch vụ này giúp mở rộng khả năng của máy tính bảng của bạn. Dữ liệu sẽ được sử dụng theo <xliff:g id="name" example="Privacy Policy">%s</xliff:g> của Cyanogen.</string> - <string name="services_explanation" product="default">Những dịch vụ này giúp mở rộng khả năng của điện thoại của bạn. Dữ liệu sẽ được sử dụng theo <xliff:g id="name" example="Privacy Policy">%s</xliff:g> của Cyanogen.</string> + <string name="setup_services">Tính năng LineageOS</string> + <string name="services_explanation" product="tablet">Những dịch vụ này giúp mở rộng khả năng của máy tính bảng của bạn. Dữ liệu sẽ được sử dụng theo <xliff:g id="name" example="Privacy Policy">%s</xliff:g> của LineageOS.</string> + <string name="services_explanation" product="default">Những dịch vụ này giúp mở rộng khả năng của điện thoại của bạn. Dữ liệu sẽ được sử dụng theo <xliff:g id="name" example="Privacy Policy">%s</xliff:g> của LineageOS.</string> <string name="services_privacy_policy">Chính sách về quyền riêng tư</string> <string name="services_help_improve_cm">Giúp cải thiện <xliff:g id="name" example="CyanogenMod">%s </xliff:g></string> <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> bằng cách tự động gửi dữ liệu chẩn đoán và sử dụng đến Cyanogen. Thông tin này không được sử dụng để nhận dạng bạn và giúp nhóm thực hiện những thứ như tuổi thọ pin, hiệu suất ứng dụng và các tính năng <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> mới.</string> @@ -66,7 +66,7 @@ <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> để mã hóa các cuộc trò chuyện qua tin nhắn SMS với những người dùng khác bằng cách sử dụng tin nhắn SMS an toàn trên thiết bị <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string> <string name="setup_unlock">Mở khóa</string> <string name="setup_device_locked">Thiết bị này đã bị khoá bởi người dùng.</string> - <string name="setup_require_cyanogen_label"><b>Yêu cầu mật khẩu tài khoản hệ điều hành Cyanogen</b> để sử dụng thiết bị của bạn ngay cả sau khi thiết lập lại cài đặt của nhà sản xuất.</string> + <string name="setup_require_cyanogen_label"><b>Yêu cầu mật khẩu tài khoản hệ điều hành</b> để sử dụng thiết bị của bạn ngay cả sau khi thiết lập lại cài đặt của nhà sản xuất.</string> <string name="setup_device_locked_instructions"><i>Để bật/tắt tính năng này, hãy truy cập Cài đặt > bảo mật</i></string> <string name="setup_warning_skip_anyway">Không có tài khoản Cyanogen OS, bạn sẽ không thể:\n\nTùy chỉnh điện thoại với những biểu tượng, hình nền và nhiều thứ khác trong ứng dụng Chủ đề\n\nĐịnh vị hoặc xoá điện thoại của bạn từ xa nếu bị mất</string> <!-- Fingerprint setup --> diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 3e422c1..1ff7aed 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -54,9 +54,9 @@ <string name="yes">是</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">紧急电话</string> - <string name="setup_services">Cyanogen 功能</string> - <string name="services_explanation" product="tablet">这些服务用于扩展您的平板电脑的功能。数据将根据 Cyanogen 的 <xliff:g id="name" example="Privacy Policy">%s</xliff:g> 使用。</string> - <string name="services_explanation" product="default">这些服务用于扩展您的手机的功能。数据将根据 Cyanogen 的 <xliff:g id="name" example="Privacy Policy">%s</xliff:g> 使用。</string> + <string name="setup_services">LineageOS 功能</string> + <string name="services_explanation" product="tablet">这些服务用于扩展您的平板电脑的功能。数据将根据 LineageOS 的 <xliff:g id="name" example="Privacy Policy">%s</xliff:g> 使用。</string> + <string name="services_explanation" product="default">这些服务用于扩展您的手机的功能。数据将根据 LineageOS 的 <xliff:g id="name" example="Privacy Policy">%s</xliff:g> 使用。</string> <string name="services_privacy_policy">隐私政策</string> <string name="services_help_improve_cm">帮助完善 <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string> <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> 通过自动发送诊断和使用数据给 Cyanogen。这些信息不会被用于识别您的身份，而是用于帮助团队致力于诸如电池寿命、应用性能和新 <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> 功能。</string> @@ -67,7 +67,7 @@ <string name="services_secure_sms_label">在您的 <xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> 设备上 <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> 来加密您与其他用户的短信会话。</string> <string name="setup_unlock">解锁</string> <string name="setup_device_locked">此设备的持有者锁定了该设备。</string> - <string name="setup_require_cyanogen_label">即使您的设备被恢复出厂设置，<b>也要求输入您的 Cyanogen OS 帐户密码</b>。</string> + <string name="setup_require_cyanogen_label">即使您的设备被恢复出厂设置，<b>也要求输入您的 帐户密码</b>。</string> <string name="setup_device_locked_instructions"><i>要开启或关闭此功能，请进入设置 > 安全</i></string> <string name="setup_warning_skip_anyway">“如果不创建 Cyanogen OS 帐户，您将：\n\n无法使用主题应用来使用新的图标、壁纸和其他内容来自定义您的手机\n\n无法定位或擦除遗失的手机”</string> <!-- Fingerprint setup --> diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml index 203365a..8995313 100644 --- a/res/values-zh-rHK/strings.xml +++ b/res/values-zh-rHK/strings.xml @@ -48,9 +48,9 @@ <string name="yes">是</string> <string name="data_sim_name">SIM 卡 <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">緊急電話</string> - <string name="setup_services">Cyanogen 功能</string> - <string name="services_explanation" product="tablet">這些服務用來增強您的平板電腦功能。資料將根據 Cyanogen 的 <xliff:g id="name" example="Privacy Policy">%s</xliff:g> 來使用。</string> - <string name="services_explanation" product="default">這些服務用來增強您的手機功能。資料將根據 Cyanogen 的 <xliff:g id="name" example="Privacy Policy">%s</xliff:g> 來使用。</string> + <string name="setup_services">LineageOS 功能</string> + <string name="services_explanation" product="tablet">這些服務用來增強您的平板電腦功能。資料將根據 LineageOS 的 <xliff:g id="name" example="Privacy Policy">%s</xliff:g> 來使用。</string> + <string name="services_explanation" product="default">這些服務用來增強您的手機功能。資料將根據 LineageOS 的 <xliff:g id="name" example="Privacy Policy">%s</xliff:g> 來使用。</string> <string name="services_help_improve_cm">協助改善 <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string> <string name="services_metrics_label">透過自動傳送診斷及使用資料給 Cyanogen 來<xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> 。這些資料不會被用於識別您的身份，而是用於幫助團隊致力於電池壽命、應用程式性能和增加<xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>的新功能等方面。</string> <string name="services_apply_theme">套用 <xliff:g id="name" example="Material">%s</xliff:g> 主題</string> @@ -58,7 +58,7 @@ <string name="services_use_secure_sms">使用加密短訊</string> <string name="services_secure_sms_label">在<xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>裝置上<xliff:g id="name" example="Use secure SMS">%1$s</xliff:g>來加密您與其他人的短訊。</string> <string name="setup_unlock">解鎖</string> - <string name="setup_require_cyanogen_label">即使恢復原廠設定後，您<b>仍須輸入 Cyanogen OS 帳戶密碼</b>才能使用此裝置。</string> + <string name="setup_require_cyanogen_label">即使恢復原廠設定後，您<b>仍須輸入 帳戶密碼</b>才能使用此裝置。</string> <string name="setup_device_locked_instructions"><i>如要開啟/關閉此功能，請至設定 > 安全性</i></string> <string name="setup_warning_skip_anyway">如果不創建 Cyanogen OS 帳戶，您將會：\n\n無法套用主題應用程式內的新圖示、牆紙和其他內容以自訂手機\n\n無法定位或在遺失手機時遠端清除手機內容</string> <!-- Fingerprint setup --> diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index cb0daf1..87f1220 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -35,8 +35,8 @@ <string name="setup_current_time">目前時間</string> <string name="sim_missing_summary" product="tablet">您的平板電腦中未發現 SIM 卡。若要插入一張 SIM 卡，請查閱您的裝置附贈的說明。</string> <string name="sim_missing_summary" product="default">您的手機中未發現 SIM 卡。若要插入一張 SIM 卡，請查閱您的裝置附贈的說明。</string> - <string name="choose_data_sim_summary" product="tablet">您想要使用哪一張 SIM 卡作為行動數據？ 所選擇的 SIM 卡可能產生費用，因為它將用於設定您的平板電腦。</string> - <string name="choose_data_sim_summary" product="default">您想要使用哪一張 SIM 卡作為行動數據？ 所選擇的 SIM 卡可能產生費用，因為它將用於設定您的手機。</string> + <string name="choose_data_sim_summary" product="tablet">您想要使用哪一張 SIM 卡作為行動數據? 所選擇的 SIM 卡可能產生費用，因為它將用於設定您的平板電腦。</string> + <string name="choose_data_sim_summary" product="default">您想要使用哪一張 SIM 卡作為行動數據? 所選擇的 SIM 卡可能產生費用，因為它將用於設定您的手機。</string> <string name="date_time_summary">如果需要的話，請調整您的時區及日期與時間</string> <string name="backup_data_summary"><b>備份</b>應用程式資料、Wi-Fi 密碼及其他設定到 Google 伺服器</string> <string name="other_services_summary">啟用這些服務讓 Google 來為您工作，您可以在任何時候開啟或關閉。您的資料將依照 Google 的 <xliff:g id="name" example="Privacy Policy">%s</xliff:g> 來使用。</string> @@ -49,14 +49,14 @@ <string name="setup_mobile_data">啟用行動數據</string> <string name="setup_mobile_data_no_service">沒有服務</string> <string name="setup_mobile_data_emergency_only">僅可撥打緊急電話</string> - <string name="enable_mobile_data_summary">您想在設定過程中使用行動數據嗎？使用行動數據可能會產生傳輸費用。</string> + <string name="enable_mobile_data_summary">是否想在設定過程中啟用行動數據？啟用行動數據可能會被收取費用。</string> <string name="no">否</string> <string name="yes">是</string> <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string> <string name="emergency_call">緊急電話</string> - <string name="setup_services">Cyanogen 功能</string> - <string name="services_explanation" product="tablet">這些服務用來增強您的平板電腦的功能。資料將根據 Cyanogen 的 <xliff:g id="name" example="Privacy Policy">%s</xliff:g> 來使用。</string> - <string name="services_explanation" product="default">這些服務用來增強您的手機的功能。資料將根據 Cyanogen 的 <xliff:g id="name" example="Privacy Policy">%s</xliff:g> 來使用。</string> + <string name="setup_services">LineageOS 功能</string> + <string name="services_explanation" product="tablet">這些服務用來增強您的平板電腦的功能。資料將根據 LineageOS 的 <xliff:g id="name" example="Privacy Policy">%s</xliff:g> 來使用。</string> + <string name="services_explanation" product="default">這些服務用來增強您的手機的功能。資料將根據 LineageOS 的 <xliff:g id="name" example="Privacy Policy">%s</xliff:g> 來使用。</string> <string name="services_privacy_policy">隱私權政策</string> <string name="services_help_improve_cm">協助改善 <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string> <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> 通過自動發送診斷及使用資料給 Cyanogen。這些資料不會被用於識別您的身份，而是用於幫助團隊致力於諸如電池壽命、應用程式性能和新的 <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> 功能。</string> @@ -67,7 +67,7 @@ <string name="services_secure_sms_label">在您的 <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> 裝置上 <xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> 來加密您與其他人的簡訊。</string> <string name="setup_unlock">解鎖</string> <string name="setup_device_locked">已被使用者鎖定此裝置。</string> - <string name="setup_require_cyanogen_label"><b>需要您的 Cyanogen OS 帳戶密碼</b> 即可使用您的裝置，即使在重設裝置之後。</string> + <string name="setup_require_cyanogen_label"><b>需要您的 帳戶密碼</b>以使用您的裝置，即使在重設裝置之後。</string> <string name="setup_device_locked_instructions"><i>如要開啟/關閉此功能，請到設定 > 安全性</i></string> <string name="setup_warning_skip_anyway">如果不建立 Cyanogen OS 帳戶，您將無法：\n\n使用主題來套用新的圖示、桌布和其他內容來客製化您的手機\n\n在手機遺失時定位手機或清除手機上的個人資料</string> <!-- Fingerprint setup --> @@ -84,7 +84,7 @@ <string name="settings_lockscreen_setup_details">您希望如何鎖定螢幕?</string> <string name="lockscreen_setup_title">保護您的手機</string> <string name="lockscreen_setup_summary"><b>保護這個裝置</b>，並需要輸入 PIN 碼、解鎖圖形或密碼解除螢幕鎖定</string> - <string name="lockscreen_setup_screen_lock_setup">設定 PIN 碼 、解鎖圖形或密碼</string> + <string name="lockscreen_setup_screen_lock_setup">設定 PIN、解鎖圖形或密碼</string> <!-- MOD stuff --> <string name="mod_welcome">您的裝置已準備好使用模組</string> <string name="mod_description">模組可使您的電話更快速、更智慧、以及更容易使用。在這個指南中，您將可以探索新的模組，學習它們做些什麼，並可以啟用或停用它們。</string> diff --git a/res/values/colors.xml b/res/values/colors.xml index ed7e190..98020f4 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2013 The CyanogenMod Project + Copyright (C) 2017 The LineageOS Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -15,25 +16,20 @@ limitations under the License. --> <resources> - <color name="black">#000000</color> + <color name="black">#21272b</color> <color name="white">#ffffff</color> - <color name="page_background">#efefef</color> + <color name="page_background">#e4e7e9</color> - <color name="primary">#00B1E5</color> - <color name="primary_dark">#00A2E5</color> - <color name="accent">#009789</color> + <color name="primary">@color/page_background</color> + <color name="primary_dark">#c2c5c7</color> + <color name="accent">#167C80</color> <color name="primary_text">#8a000000</color> - <color name="secondary_text">#727272</color> + <color name="secondary_text">#42000000</color> <color name="button_bar_text_enabled">#ff1e1e1e</color> <color name="button_bar_text_disabled">#321e1e1e</color> <color name="divider">#40000000</color> <color name="header_bg">@color/primary</color> - <color name="header_condensed_bg">@color/primary_dark</color> - <color name="button_bar_background">#e4e7e8</color> - <color name="fingerprint_setup_text_color">#356bc4</color> - - <color name="mod_yellow">#f5d328</color> - <color name="mod_title">#dd000000</color> - <color name="mod_description">#89000000</color> - <color name="mod_button_bar_background">#d7b923</color> + <color name="header_condensed_bg">@color/primary</color> + <color name="button_bar_background">@color/primary</color> + <color name="fingerprint_setup_text_color">#167C80</color> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 47d72e5..c104d33 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2013-2015 The CyanogenMod Project + Copyright (C) 2017 The LineageOS Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -17,12 +18,9 @@ <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_name">Setup Wizard</string> <string name="product_name" translatable="false">cyanogenmod</string> - <string name="os_name" translatable="false">CyanogenMod</string> + <string name="os_name" translatable="false">LineageOS</string> <string name="default_theme_name" translatable="false">Material</string> - <string name="cm_account_type" translatable="false">com.cyanogenmod.account</string> - <string name="cm_account_package_name" translatable="false">com.cyanogenmod.account</string> - <string name="next">Next</string> <string name="skip">Skip</string> <string name="start">Start</string> @@ -32,6 +30,7 @@ <string name="setup_complete">Setup is complete</string> <string name="setup_welcome">Welcome</string> + <string name="setup_locale">Language</string> <string name="setup_wifi">Select Wi-Fi</string> <string name="setup_sim_missing">SIM card missing</string> <string name="setup_choose_data_sim">Choose a SIM for data</string> @@ -69,23 +68,21 @@ <string name="emergency_call">Emergency call</string> - <string name="setup_services">Cyanogen features</string> - <string name="services_explanation" product="tablet">These services work for you to extend the capabilities of your tablet. Data will be used in accordance with Cyanogen\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> - <string name="services_explanation" product="default">These services work for you to extend the capabilities of your phone. Data will be used in accordance with Cyanogen\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> + <string name="setup_services">LineageOS features</string> + <string name="services_explanation" product="tablet">These services work for you to extend the capabilities of your tablet. Data will be used in accordance with LineageOS\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> + <string name="services_explanation" product="default">These services work for you to extend the capabilities of your phone. Data will be used in accordance with LineageOS\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string> <string name="services_privacy_policy">Privacy Policy</string> <string name="services_help_improve_cm">Help improve <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string> - <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> by automatically sending diagnostic and usage data to Cyanogen. This information can’t be used to identify you and lends a hand to teams working on things like battery life, app performance, and new <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> features.</string> + <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> by automatically sending diagnostic and usage data to LineageOS. This information can’t be used to identify you and lends a hand to teams working on things like battery life, app performance, and new <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> features.</string> <string name="services_apply_theme">Apply the <xliff:g id="name" example="Material">%s</xliff:g> theme</string> <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> enabling a unique visual style for your icons, wallpaper and more.</string> <string name="services_os_nav_keys_label"><b>Use on screen navigation keys</b> instead of hardware keys.</string> - <string name="services_use_secure_sms">Use secure SMS</string> - <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> to encrypt SMS conversations with other users using secure SMS on a <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> device.</string> + <string name="services_os_privacy_guard"><b>Enable Privacy guard</b> to make your personal data such as contacts, messages or call logs not available for newly installed apps</string> <string name="setup_unlock">Unlock</string> <string name="setup_device_locked">This device has been locked by the user.</string> - <string name="setup_require_cyanogen_label"><b>Require your Cyanogen OS account password</b> in order to use your device even after a factory reset.</string> + <string name="setup_require_cyanogen_label"><b>Require your account password</b> in order to use your device even after a factory reset.</string> <string name="setup_device_locked_instructions"><i>To turn this feature off/on, please go to Settings > Security</i></string> - <string name="setup_warning_skip_anyway">Without a Cyanogen OS Account, you won\'t be able to:\n\nCustomize your phone with new icons, wallpapers and more in the Themes app\n\nLocate or remotely erase your phone if it\'s lost</string> <!-- Fingerprint setup --> <string name="settings_fingerprint_setup_title">Select backup screen lock type</string> @@ -102,11 +99,6 @@ <string name="settings_lockscreen_setup_details">How would you like to lock your screen?</string> <string name="lockscreen_setup_title">Protect your phone</string> <string name="lockscreen_setup_summary"><b>Protect this device</b> and require a PIN, pattern, or password to unlock the screen</string> - <string name="lockscreen_setup_screen_lock_setup">Set up PIN, pattern or password</string> - - <!-- MOD stuff --> - <string name="mod_welcome">Your device is MOD Ready</string> - <string name="mod_description">Mods make your phone faster, smarter, and easier to use. In this guide, you can discover new mods, learn what they do, and enable or disable them.</string> - <string name="mod_explore">Explore MOD Guide</string> + <string name="lockscreen_setup_screen_lock_setup">Set up</string> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index f381000..02da1ac 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -26,6 +26,7 @@ <item name="android:textColorLink">@color/accent</item> <item name="android:statusBarColor">@android:color/transparent</item> <item name="android:windowAnimationStyle">@style/ActivityAnimations</item> + <item name="android:windowLightStatusBar">true</item> <item name="localePickerStyle">@style/LocaleWidget.Material.LocalePicker</item> </style> @@ -40,10 +41,6 @@ <item name="android:taskToBackExitAnimation">@anim/translucent_exit</item> </style> - <style name="Header"> - <item name="android:elevation">4dp</item> - </style> - <style name="PageContainer"> <item name="android:textColor">@color/primary_text</item> <item name="android:background">@color/page_background</item> @@ -56,12 +53,8 @@ <style name="PageTitle"> <item name="android:id">@android:id/title</item> - <item name="android:textSize">22sp</item> - <item name="android:textColor">@color/white</item> - <item name="android:background">@color/primary_dark</item> - <item name="android:layout_alignParentBottom">true</item> - <item name="android:gravity">left|center_vertical</item> - <item name="android:paddingLeft">@dimen/header_title_margin_left</item> + <item name="android:textSize">20sp</item> + <item name="android:textColor">@color/black</item> </style> <style name="PageSummaryText"> diff --git a/src/com/cyanogenmod/setupwizard/SetupWizardApp.java b/src/com/cyanogenmod/setupwizard/SetupWizardApp.java index a327b38..f16dd9d 100644 --- a/src/com/cyanogenmod/setupwizard/SetupWizardApp.java +++ b/src/com/cyanogenmod/setupwizard/SetupWizardApp.java @@ -64,6 +64,7 @@ public class SetupWizardApp extends Application { private static final String[] THEME_PACKAGES = { "org.cyanogenmod.theme.chooser", + "org.cyanogenmod.theme.chooser2", "com.cyngn.theme.chooser", "com.cyngn.themestore" }; diff --git a/src/com/cyanogenmod/setupwizard/setup/BluetoothSetupPage.java b/src/com/cyanogenmod/setupwizard/setup/BluetoothSetupPage.java index 915abec..d1532ac 100644 --- a/src/com/cyanogenmod/setupwizard/setup/BluetoothSetupPage.java +++ b/src/com/cyanogenmod/setupwizard/setup/BluetoothSetupPage.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2015 The CyanogenMod Project + * Copyright (C) 2017 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -81,6 +82,10 @@ public class BluetoothSetupPage extends SetupPage { return R.string.loading; } + @Override + public int getIconResId() { + return -1; + } @Override public void doLoadAction(FragmentManager fragmentManager, int action) { diff --git a/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java b/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java index 7a20c58..3226044 100644 --- a/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java +++ b/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java @@ -51,6 +51,8 @@ public class CMSetupWizardData extends AbstractSetupData { pages.add(new BluetoothSetupPage(mContext, this)); } pages.add(new WelcomePage(mContext, this)); + pages.add(new LocalePage(mContext, this)); + pages.add(new DateTimePage(mContext, this)); if (SetupWizardUtils.hasWifi(mContext)) { pages.add(new WifiSetupPage(mContext, this)); } @@ -70,19 +72,13 @@ public class CMSetupWizardData extends AbstractSetupData { if (hasGMS) { pages.add(new GmsAccountPage(mContext, this)); } - if (!SetupWizardUtils.hasLeanback(mContext) && - SetupWizardUtils.isPackageInstalled(mContext, - mContext.getString(R.string.cm_account_package_name))) { - pages.add(new CyanogenServicesPage(mContext, this).setHidden(true)); - } + pages.add(new OtherSettingsPage(mContext, this).setHidden(!hasGMS)); if (SetupWizardUtils.hasFingerprint(mContext) && SetupWizardUtils.isOwner()) { pages.add(new FingerprintSetupPage(mContext, this)); } else if (SetupWizardUtils.frpEnabled(mContext)) { pages.add(new ScreenLockSetupPage(mContext, this)); } pages.add(new CyanogenSettingsPage(mContext, this)); - pages.add(new OtherSettingsPage(mContext, this).setHidden(!hasGMS)); - pages.add(new DateTimePage(mContext, this)); pages.add(new FinishPage(mContext, this)); return new PageList(pages.toArray(new SetupPage[pages.size()])); } @@ -94,15 +90,13 @@ public class CMSetupWizardData extends AbstractSetupData { showHideDataSimPage(); showHideSimMissingPage(); showHideMobileDataPage(); - updateWelcomePage(); + updateLocalePage(); } else if (intent.getAction() .equals(ConnectivityManager.CONNECTIVITY_ACTION)) { showHideMobileDataPage(); - showHideAccountPages(); - } else if (intent.getAction() + } else if (intent.getAction() .equals(TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED)) { showHideMobileDataPage(); - showHideAccountPages(); } else if (intent.getAction().equals(Intent.ACTION_TIMEZONE_CHANGED) || intent.getAction().equals(TelephonyIntents.ACTION_NETWORK_SET_TIMEZONE)) { mTimeZoneSet = true; @@ -114,14 +108,6 @@ public class CMSetupWizardData extends AbstractSetupData { } } - private void showHideAccountPages() { - boolean isConnected = SetupWizardUtils.isNetworkConnected(mContext); - CyanogenServicesPage cyanogenServicesPage = - (CyanogenServicesPage) getPage(CyanogenServicesPage.TAG); - if (cyanogenServicesPage != null) { - cyanogenServicesPage.setHidden(!isConnected); - } - } private void showHideSimMissingPage() { SimCardMissingPage simCardMissingPage = @@ -161,10 +147,10 @@ public class CMSetupWizardData extends AbstractSetupData { } } - private void updateWelcomePage() { - WelcomePage welcomePage = (WelcomePage) getPage(WelcomePage.TAG); - if (welcomePage != null) { - welcomePage.simChanged(); + private void updateLocalePage() { + LocalePage localePage = (LocalePage) getPage(LocalePage.TAG); + if (localePage != null) { + localePage.simChanged(); } } diff --git a/src/com/cyanogenmod/setupwizard/setup/ChooseDataSimPage.java b/src/com/cyanogenmod/setupwizard/setup/ChooseDataSimPage.java index adca459..3b9a5c9 100644 --- a/src/com/cyanogenmod/setupwizard/setup/ChooseDataSimPage.java +++ b/src/com/cyanogenmod/setupwizard/setup/ChooseDataSimPage.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2014 The CyanogenMod Project + * Copyright (C) 2017 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -85,6 +86,10 @@ public class ChooseDataSimPage extends SetupPage { return R.string.setup_choose_data_sim; } + @Override + public int getIconResId() { + return R.drawable.ic_sim; + } public static class ChooseDataSimFragment extends SetupPageFragment { diff --git a/src/com/cyanogenmod/setupwizard/setup/CyanogenServicesPage.java b/src/com/cyanogenmod/setupwizard/setup/CyanogenServicesPage.java deleted file mode 100644 index e71dd79..0000000 --- a/src/com/cyanogenmod/setupwizard/setup/CyanogenServicesPage.java +++ /dev/null @@ -1,163 +0,0 @@ -/* - * Copyright (C) 2013 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. - */ - -package com.cyanogenmod.setupwizard.setup; - -import android.accounts.AccountManager; -import android.accounts.AccountManagerCallback; -import android.accounts.AccountManagerFuture; -import android.accounts.AuthenticatorException; -import android.accounts.OperationCanceledException; -import android.app.Activity; -import android.app.ActivityOptions; -import android.app.Fragment; -import android.app.FragmentManager; -import android.content.Context; -import android.content.Intent; -import android.os.Bundle; -import android.util.Log; - -import com.cyanogenmod.setupwizard.R; -import com.cyanogenmod.setupwizard.SetupWizardApp; -import com.cyanogenmod.setupwizard.cmstats.SetupStats; -import com.cyanogenmod.setupwizard.ui.LoadingFragment; -import com.cyanogenmod.setupwizard.util.SetupWizardUtils; - -import java.io.IOException; - -public class CyanogenServicesPage extends SetupPage { - - public static final String TAG = "CyanogenServicesPage"; - - private Fragment mFragment; - - public CyanogenServicesPage(Context context, SetupDataCallbacks callbacks) { - super(context, callbacks); - } - - @Override - public Fragment getFragment(FragmentManager fragmentManager, int action) { - mFragment = fragmentManager.findFragmentByTag(getKey()); - if (mFragment == null) { - Bundle args = new Bundle(); - args.putString(Page.KEY_PAGE_ARGUMENT, getKey()); - args.putInt(Page.KEY_PAGE_ACTION, action); - mFragment = new LoadingFragment(); - mFragment.setArguments(args); - } - return mFragment; - } - - @Override - public String getKey() { - return TAG; - } - - @Override - public int getTitleResId() { - return R.string.loading; - } - - @Override - public int getNextButtonTitleResId() { - return R.string.skip; - } - - @Override - public void doLoadAction(FragmentManager fragmentManager, int action) { - if (action == Page.ACTION_PREVIOUS) { - getCallbacks().onPreviousPage(); - } else { - if (!SetupWizardUtils.accountExists(mContext, - mContext.getString(R.string.cm_account_type))) { - super.doLoadAction(fragmentManager, action); - launchCyanogenAccountSetup(); - } else { - getCallbacks().onNextPage(); - } - } - } - - @Override - public boolean onActivityResult(int requestCode, int resultCode, Intent data) { - if (requestCode == SetupWizardApp.REQUEST_CODE_SETUP_CYANOGEN) { - if (resultCode == Activity.RESULT_OK || resultCode == Activity.RESULT_FIRST_USER) { - SetupStats.addEvent(SetupStats.Categories.EXTERNAL_PAGE_LOAD, - SetupStats.Action.EXTERNAL_PAGE_RESULT, - SetupStats.Label.CYANOGEN_ACCOUNT, - resultCode == Activity.RESULT_OK ? "success" : "skipped"); - if (SetupWizardUtils.accountExists(mContext, - mContext.getString(R.string.cm_account_type))) { - if (SetupWizardUtils.isDeviceLocked()) { - ((SetupWizardApp) mContext.getApplicationContext()).setIsAuthorized(true); - } - setHidden(true); - } - getCallbacks().onNextPage(); - } else if (resultCode == Activity.RESULT_CANCELED) { - SetupStats.addEvent(SetupStats.Categories.EXTERNAL_PAGE_LOAD, - SetupStats.Action.EXTERNAL_PAGE_RESULT, - SetupStats.Label.CYANOGEN_ACCOUNT, "canceled"); - getCallbacks().onPreviousPage(); - } - } - return true; - } - - private void launchCyanogenAccountSetup() { - Bundle bundle = new Bundle(); - bundle.putBoolean(SetupWizardApp.EXTRA_FIRST_RUN, true); - bundle.putBoolean(SetupWizardApp.EXTRA_SHOW_BUTTON_BAR, true); - bundle.putBoolean(SetupWizardApp.EXTRA_USE_IMMERSIVE, true); - AccountManager.get(mContext) - .addAccount(mContext.getString(R.string.cm_account_type), null, null, bundle, - null, new AccountManagerCallback<Bundle>() { - @Override - public void run(AccountManagerFuture<Bundle> future) { - boolean error = false; - try { - Bundle result = future.getResult(); - Intent intent = result - .getParcelable(AccountManager.KEY_INTENT); - ActivityOptions options = - ActivityOptions.makeCustomAnimation(mContext, - android.R.anim.fade_in, - android.R.anim.fade_out); - SetupStats - .addEvent(SetupStats.Categories.EXTERNAL_PAGE_LOAD, - SetupStats.Action.EXTERNAL_PAGE_LAUNCH, - SetupStats.Label.PAGE, - SetupStats.Label.CYANOGEN_ACCOUNT); - mFragment.startActivityForResult(intent, - SetupWizardApp.REQUEST_CODE_SETUP_CYANOGEN, - options.toBundle()); - } catch (OperationCanceledException e) { - error = true; - } catch (IOException e) { - error = true; - } catch (AuthenticatorException e) { - Log.e(TAG, "Error launching cm account", e); - error = true; - } finally { - if (error && getCallbacks(). - isCurrentPage(CyanogenServicesPage.this)) { - getCallbacks().onNextPage(); - } - } - } - }, null); - } -} diff --git a/src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java b/src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java index 03a04b6..866371d 100644 --- a/src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java +++ b/src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2013 The CyanogenMod Project + * Copyright (C) 2017 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -58,8 +59,9 @@ public class CyanogenSettingsPage extends SetupPage { public static final String DISABLE_NAV_KEYS = "disable_nav_keys"; public static final String KEY_APPLY_DEFAULT_THEME = "apply_default_theme"; public static final String KEY_BUTTON_BACKLIGHT = "pre_navbar_button_backlight"; + public static final String KEY_PRIVACY_GUARD = "privacy_guard_default"; - public static final String PRIVACY_POLICY_URI = "https://cyngn.com/oobe-legal?hideHeader=1"; + public static final String PRIVACY_POLICY_URI = "http://lineageos.org/legal"; public CyanogenSettingsPage(Context context, SetupDataCallbacks callbacks) { super(context, callbacks); @@ -88,6 +90,11 @@ public class CyanogenSettingsPage extends SetupPage { return R.string.setup_services; } + @Override + public int getIconResId() { + return R.drawable.ic_features; + } + private static void writeDisableNavkeysOption(Context context, boolean enabled) { final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); @@ -126,6 +133,7 @@ public class CyanogenSettingsPage extends SetupPage { }); handleEnableMetrics(); handleDefaultThemeSetup(); + handlePrivacyGuard(); } private void handleEnableMetrics() { @@ -156,6 +164,15 @@ public class CyanogenSettingsPage extends SetupPage { } } + private void handlePrivacyGuard() { + Bundle mPrivacyData = getData(); + if (mPrivacyData != null && mPrivacyData.containsKey(KEY_PRIVACY_GUARD)) { + CMSettings.Secure.putInt(mContext.getContentResolver(), + CMSettings.Secure.PRIVACY_GUARD_DEFAULT, + mPrivacyData.getBoolean(KEY_PRIVACY_GUARD) ? 1 : 0); + } + } + private static boolean hideKeyDisabler(Context ctx) { final CMHardwareManager hardware = CMHardwareManager.getInstance(ctx); return !hardware.isSupported(CMHardwareManager.FEATURE_KEY_DISABLE); @@ -179,9 +196,11 @@ public class CyanogenSettingsPage extends SetupPage { private View mMetricsRow; private View mDefaultThemeRow; private View mNavKeysRow; + private View mPrivacyGuardRow; private CheckBox mMetrics; private CheckBox mDefaultTheme; private CheckBox mNavKeys; + private CheckBox mPrivacyGuard; private boolean mHideNavKeysRow = false; private boolean mHideThemeRow = false; @@ -214,6 +233,15 @@ public class CyanogenSettingsPage extends SetupPage { } }; + private View.OnClickListener mPrivacyGuardClickListener = new View.OnClickListener() { + @Override + public void onClick(View view) { + boolean checked = !mPrivacyGuard.isChecked(); + mPrivacyGuard.setChecked(checked); + mPage.getData().putBoolean(KEY_PRIVACY_GUARD, checked); + } + }; + @Override protected void initializePage() { String privacy_policy = getString(R.string.services_privacy_policy); @@ -222,8 +250,10 @@ public class CyanogenSettingsPage extends SetupPage { ClickableSpan clickableSpan = new ClickableSpan() { @Override public void onClick(View textView) { - final Intent intent = new Intent(SetupWizardApp.ACTION_VIEW_LEGAL); - intent.setData(Uri.parse(PRIVACY_POLICY_URI)); + // At this point of the setup, the device has already been unlocked (if frp + // had been enabled), so there should be no issues regarding security + final Intent intent = new Intent(Intent.ACTION_VIEW, + Uri.parse(PRIVACY_POLICY_URI)); try { getActivity().startActivity(intent); } catch (Exception e) { @@ -303,6 +333,12 @@ public class CyanogenSettingsPage extends SetupPage { isKeyDisablerActive(getActivity()); mNavKeys.setChecked(navKeysDisabled); } + + mPrivacyGuardRow = mRootView.findViewById(R.id.privacy_guard); + mPrivacyGuardRow.setOnClickListener(mPrivacyGuardClickListener); + mPrivacyGuard = (CheckBox) mRootView.findViewById(R.id.privacy_guard_checkbox); + mPrivacyGuard.setChecked(CMSettings.Secure.getInt(getActivity().getContentResolver(), + CMSettings.Secure.PRIVACY_GUARD_DEFAULT, 0) == 1); } @Override diff --git a/src/com/cyanogenmod/setupwizard/setup/DateTimePage.java b/src/com/cyanogenmod/setupwizard/setup/DateTimePage.java index 7a5922b..f42240f 100644 --- a/src/com/cyanogenmod/setupwizard/setup/DateTimePage.java +++ b/src/com/cyanogenmod/setupwizard/setup/DateTimePage.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2013 The CyanogenMod Project + * Copyright (C) 2017 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -96,6 +97,11 @@ public class DateTimePage extends SetupPage { return R.string.setup_datetime; } + @Override + public int getIconResId() { + return R.drawable.ic_datetime; + } + public static class DateTimeFragment extends SetupPageFragment implements TimePickerDialog.OnTimeSetListener, DatePickerDialog.OnDateSetListener { diff --git a/src/com/cyanogenmod/setupwizard/setup/FingerprintSetupPage.java b/src/com/cyanogenmod/setupwizard/setup/FingerprintSetupPage.java index 890a4f6..8d78127 100644 --- a/src/com/cyanogenmod/setupwizard/setup/FingerprintSetupPage.java +++ b/src/com/cyanogenmod/setupwizard/setup/FingerprintSetupPage.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2013 The CyanogenMod Project + * Copyright (C) 2017 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -68,6 +69,11 @@ public class FingerprintSetupPage extends SetupPage { } @Override + public int getIconResId() { + return R.drawable.ic_fingerprint; + } + + @Override public boolean onActivityResult(int requestCode, int resultCode, Intent data) { if (SetupWizardApp.REQUEST_CODE_SETUP_FINGERPRINT == requestCode) { if (resultCode == Activity.RESULT_OK) { diff --git a/src/com/cyanogenmod/setupwizard/setup/FinishPage.java b/src/com/cyanogenmod/setupwizard/setup/FinishPage.java index 3cb5a3f..2a7e0e7 100644 --- a/src/com/cyanogenmod/setupwizard/setup/FinishPage.java +++ b/src/com/cyanogenmod/setupwizard/setup/FinishPage.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2013 The CyanogenMod Project + * Copyright (C) 2017 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,16 +41,12 @@ public class FinishPage extends SetupPage { public static final String TAG = "FinishPage"; - private static final int WHAT_EXPLORE_MOD_GUIDE = 1; private static final String KEY_MESSENGER = "key_messenger"; - private static final String MODGUIDE_PACKAGE_NAME = "com.cyngn.modguide"; private FinishFragment mFinishFragment; - private final boolean mShowingModGuide; public FinishPage(Context context, SetupDataCallbacks callbacks) { super(context, callbacks); - mShowingModGuide = SetupWizardUtils.canHasModMOD(context); } @Override @@ -78,10 +75,6 @@ public class FinishPage extends SetupPage { @Override public void handleMessage(final Message msg) { - final FinishPage page = mPage.get(); - if ((page != null) && (msg.what == WHAT_EXPLORE_MOD_GUIDE)) { - page.doExploreModGuide(); - } } } @@ -91,13 +84,13 @@ public class FinishPage extends SetupPage { } @Override - public int getButtonBarBackgroundColorId() { - return mShowingModGuide ? R.color.mod_button_bar_background : R.color.primary; + public int getTitleResId() { + return R.string.setup_complete; } @Override - public int getTitleResId() { - return R.string.setup_complete; + public int getIconResId() { + return -1; } @Override @@ -106,55 +99,24 @@ public class FinishPage extends SetupPage { return true; } - private void doExploreModGuide() { - final SetupWizardActivity activity = - (SetupWizardActivity) mFinishFragment.getActivity(); - final Intent intent = - activity.getPackageManager().getLaunchIntentForPackage(MODGUIDE_PACKAGE_NAME); - activity.setFinishIntent(intent); - getCallbacks().onFinish(); - } - @Override public int getNextButtonTitleResId() { - return mShowingModGuide ? R.string.done : R.string.start; + return R.string.start; } public static class FinishFragment extends SetupPageFragment { - private boolean mShowingModGuide; - @Override protected void initializePage() { final Activity activity = getActivity(); - if (!mShowingModGuide || (activity == null)) { + if (activity == null) { return; } - mRootView.findViewById(R.id.explore_mod_guide) - .setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - final Messenger messenger = getArguments().getParcelable(KEY_MESSENGER); - if (messenger == null) { - return; - } - final Message message = Message.obtain(); - message.what = WHAT_EXPLORE_MOD_GUIDE; - try { - messenger.send(message); - } catch (final RemoteException e) { - Log.e(TAG, "Couldn't send message to start MOD Guide", e); - } - } - }); } @Override protected int getLayoutResource() { - final Context context = getContext(); - mShowingModGuide = (context != null) && SetupWizardUtils.canHasModMOD(context); - return mShowingModGuide ? - R.layout.setup_modguide_page : R.layout.setup_finished_page; + return R.layout.setup_finished_page; } } diff --git a/src/com/cyanogenmod/setupwizard/setup/GmsAccountPage.java b/src/com/cyanogenmod/setupwizard/setup/GmsAccountPage.java index 436da08..747765e 100644 --- a/src/com/cyanogenmod/setupwizard/setup/GmsAccountPage.java +++ b/src/com/cyanogenmod/setupwizard/setup/GmsAccountPage.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2013 The CyanogenMod Project + * Copyright (C) 2017 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -92,6 +93,11 @@ public class GmsAccountPage extends SetupPage { } @Override + public int getIconResId() { + return -1; + } + + @Override public int getNextButtonTitleResId() { return R.string.skip; } diff --git a/src/com/cyanogenmod/setupwizard/setup/LocalePage.java b/src/com/cyanogenmod/setupwizard/setup/LocalePage.java new file mode 100644 index 0000000..e9717a5 --- /dev/null +++ b/src/com/cyanogenmod/setupwizard/setup/LocalePage.java @@ -0,0 +1,348 @@ +/* + * Copyright (C) 2013 The CyanogenMod Project + * Copyright (C) 2017 The LineageOS 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. + */ + +package com.cyanogenmod.setupwizard.setup; + +import android.accounts.AccountManager; +import android.accounts.AccountManagerCallback; +import android.accounts.AccountManagerFuture; +import android.app.Activity; +import android.app.ActivityOptions; +import android.app.Fragment; +import android.app.FragmentManager; +import android.content.Context; +import android.content.Intent; +import android.content.res.Configuration; +import android.content.res.Resources; +import android.os.AsyncTask; +import android.os.Bundle; +import android.os.Handler; +import android.telephony.SubscriptionInfo; +import android.telephony.SubscriptionManager; +import android.telephony.TelephonyManager; +import android.util.Log; +import android.view.View; +import android.widget.ArrayAdapter; +import android.widget.NumberPicker; +import android.widget.Toast; + +import com.android.internal.telephony.MccTable; +import com.cyanogenmod.setupwizard.R; +import com.cyanogenmod.setupwizard.SetupWizardApp; +import com.cyanogenmod.setupwizard.cmstats.SetupStats; +import com.cyanogenmod.setupwizard.ui.LocalePicker; +import com.cyanogenmod.setupwizard.ui.SetupPageFragment; +import com.cyanogenmod.setupwizard.util.SetupWizardUtils; + +import java.util.List; +import java.util.Locale; + +public class LocalePage extends SetupPage { + + public static final String TAG = "LocalePage"; + + private LocaleFragment mLocaleFragment; + + public LocalePage(Context context, SetupDataCallbacks callbacks) { + super(context, callbacks); + } + + @Override + public Fragment getFragment(FragmentManager fragmentManager, int action) { + mLocaleFragment = (LocaleFragment)fragmentManager.findFragmentByTag(getKey()); + if (mLocaleFragment == null) { + Bundle args = new Bundle(); + args.putString(Page.KEY_PAGE_ARGUMENT, getKey()); + args.putInt(Page.KEY_PAGE_ACTION, action); + mLocaleFragment = new LocaleFragment(); + mLocaleFragment.setArguments(args); + } + return mLocaleFragment; + } + + @Override + public int getTitleResId() { + return R.string.setup_locale; + } + + @Override + public int getIconResId() { + return R.drawable.ic_locale; + } + + @Override + public boolean doNextAction() { + if (isLocked()) { + confirmCyanogenCredentials(mLocaleFragment); + return true; + } else { + if (mLocaleFragment != null) { + mLocaleFragment.sendLocaleStats(); + } + return super.doNextAction(); + } + } + + @Override + public boolean onActivityResult(int requestCode, int resultCode, Intent data) { + if (requestCode == SetupWizardApp.REQUEST_CODE_UNLOCK) { + if (resultCode == Activity.RESULT_OK) { + ((SetupWizardApp) mContext.getApplicationContext()).setIsAuthorized(true); + getCallbacks().onNextPage(); + return true; + } + } + return false; + } + + @Override + public String getKey() { + return TAG; + } + + @Override + public int getNextButtonTitleResId() { + if (isLocked()) { + return R.string.setup_unlock; + } else { + return R.string.next; + } + } + + private void confirmCyanogenCredentials(final Fragment fragment) { + AccountManager accountManager = AccountManager.get(mContext); + accountManager.editProperties(SetupWizardApp.ACCOUNT_TYPE_CYANOGEN, null, + new AccountManagerCallback<Bundle>() { + public void run(AccountManagerFuture<Bundle> f) { + try { + Bundle b = f.getResult(); + Intent i = b.getParcelable(AccountManager.KEY_INTENT); + i.putExtra(SetupWizardApp.EXTRA_FIRST_RUN, true); + i.putExtra(SetupWizardApp.EXTRA_SHOW_BUTTON_BAR, true); + i.putExtra(SetupWizardApp.EXTRA_USE_IMMERSIVE, true); + i.putExtra(SetupWizardApp.EXTRA_LOGIN_FOR_KILL_SWITCH, true); + fragment.startActivityForResult(i, + SetupWizardApp.REQUEST_CODE_UNLOCK); + } catch (Throwable t) { + Log.e(getKey(), "confirmCredentials failed", t); + } + } + }, null); + } + + private boolean isLocked() { + boolean isAuthorized = ((SetupWizardApp) mContext.getApplicationContext()).isAuthorized(); + if (SetupWizardUtils.isDeviceLocked()) { + return !isAuthorized; + } + return false; + } + + public void simChanged() { + if (mLocaleFragment != null) { + mLocaleFragment.fetchAndUpdateSimLocale(); + } + } + + public static class LocaleFragment extends SetupPageFragment { + + private ArrayAdapter<com.android.internal.app.LocalePicker.LocaleInfo> mLocaleAdapter; + private Locale mInitialLocale; + private Locale mCurrentLocale; + private int[] mAdapterIndices; + private boolean mIgnoreSimLocale; + private LocalePicker mLanguagePicker; + private FetchUpdateSimLocaleTask mFetchUpdateSimLocaleTask; + private final Handler mHandler = new Handler(); + private boolean mPendingLocaleUpdate; + private boolean mPaused = true; + + private final Runnable mUpdateLocale = new Runnable() { + public void run() { + if (mCurrentLocale != null) { + mLanguagePicker.setEnabled(false); + com.android.internal.app.LocalePicker.updateLocale(mCurrentLocale); + } + } + }; + + @Override + protected void initializePage() { + mLanguagePicker = (LocalePicker) mRootView.findViewById(R.id.locale_list); + loadLanguages(); + } + + private void loadLanguages() { + mLocaleAdapter = com.android.internal.app.LocalePicker.constructAdapter(getActivity(), + R.layout.locale_picker_item, R.id.locale); + mCurrentLocale = mInitialLocale = Locale.getDefault(); + fetchAndUpdateSimLocale(); + mAdapterIndices = new int[mLocaleAdapter.getCount()]; + int currentLocaleIndex = 0; + String [] labels = new String[mLocaleAdapter.getCount()]; + for (int i=0; i<mAdapterIndices.length; i++) { + com.android.internal.app.LocalePicker.LocaleInfo localLocaleInfo = + mLocaleAdapter.getItem(i); + Locale localLocale = localLocaleInfo.getLocale(); + if (localLocale.equals(mCurrentLocale)) { + currentLocaleIndex = i; + } + mAdapterIndices[i] = i; + labels[i] = localLocaleInfo.getLabel(); + } + mLanguagePicker.setDisplayedValues(labels); + mLanguagePicker.setMaxValue(labels.length - 1); + mLanguagePicker.setValue(currentLocaleIndex); + mLanguagePicker.setDescendantFocusability(NumberPicker.FOCUS_BLOCK_DESCENDANTS); + mLanguagePicker.setOnValueChangedListener(new LocalePicker.OnValueChangeListener() { + public void onValueChange(LocalePicker picker, int oldVal, int newVal) { + setLocaleFromPicker(); + } + }); + mLanguagePicker.setOnScrollListener(new LocalePicker.OnScrollListener() { + @Override + public void onScrollStateChange(LocalePicker view, int scrollState) { + if (scrollState == SCROLL_STATE_TOUCH_SCROLL) { + mIgnoreSimLocale = true; + } + } + }); + } + + private void setLocaleFromPicker() { + mIgnoreSimLocale = true; + int i = mAdapterIndices[mLanguagePicker.getValue()]; + final com.android.internal.app.LocalePicker.LocaleInfo localLocaleInfo = mLocaleAdapter.getItem(i); + onLocaleChanged(localLocaleInfo.getLocale()); + } + + private void onLocaleChanged(Locale paramLocale) { + mLanguagePicker.setEnabled(true); + Resources localResources = getActivity().getResources(); + Configuration localConfiguration1 = localResources.getConfiguration(); + Configuration localConfiguration2 = new Configuration(); + localConfiguration2.locale = paramLocale; + localResources.updateConfiguration(localConfiguration2, null); + localResources.updateConfiguration(localConfiguration1, null); + mHandler.removeCallbacks(mUpdateLocale); + mCurrentLocale = paramLocale; + mHandler.postDelayed(mUpdateLocale, 1000); + } + + @Override + protected int getLayoutResource() { + return R.layout.setup_locale; + } + + public void sendLocaleStats() { + if (!mCurrentLocale.equals(mInitialLocale)) { + SetupStats.addEvent(SetupStats.Categories.SETTING_CHANGED, + SetupStats.Action.CHANGE_LOCALE, SetupStats.Label.LOCALE, + mCurrentLocale.getDisplayName()); + } + } + + public void fetchAndUpdateSimLocale() { + if (mIgnoreSimLocale || isDetached()) { + return; + } + if (mPaused) { + mPendingLocaleUpdate = true; + return; + } + if (mFetchUpdateSimLocaleTask != null) { + mFetchUpdateSimLocaleTask.cancel(true); + } + mFetchUpdateSimLocaleTask = new FetchUpdateSimLocaleTask(); + mFetchUpdateSimLocaleTask.execute(); + } + + private class FetchUpdateSimLocaleTask extends AsyncTask<Void, Void, Locale> { + @Override + protected Locale doInBackground(Void... params) { + Locale locale = null; + Activity activity = getActivity(); + if (activity != null) { + // If the sim is currently pin locked, return + TelephonyManager telephonyManager = (TelephonyManager) + activity.getSystemService(Context.TELEPHONY_SERVICE); + int state = telephonyManager.getSimState(); + if(state == TelephonyManager.SIM_STATE_PIN_REQUIRED || + state == TelephonyManager.SIM_STATE_PUK_REQUIRED) { + return null; + } + + final SubscriptionManager subscriptionManager = + SubscriptionManager.from(activity); + List<SubscriptionInfo> activeSubs = + subscriptionManager.getActiveSubscriptionInfoList(); + if (activeSubs == null || activeSubs.isEmpty()) { + return null; + } + + // Fetch locale for active sim's MCC + int mcc = activeSubs.get(0).getMcc(); + locale = MccTable.getLocaleFromMcc(activity, mcc, null); + + // If that fails, fall back to preferred languages reported + // by the sim + if (locale == null) { + String localeString = telephonyManager.getLocaleFromDefaultSim(); + if (localeString != null) { + locale = Locale.forLanguageTag(localeString); + + } + } + } + return locale; + } + + @Override + protected void onPostExecute(Locale simLocale) { + if (simLocale != null && !simLocale.equals(mCurrentLocale)) { + if (!mIgnoreSimLocale && !isDetached()) { + String label = getString(R.string.sim_locale_changed, + simLocale.getDisplayName()); + Toast.makeText(getActivity(), label, Toast.LENGTH_SHORT).show(); + onLocaleChanged(simLocale); + mIgnoreSimLocale = true; + } + } + } + } + + @Override + public void onPause() { + super.onPause(); + mPaused = true; + } + + @Override + public void onResume() { + super.onResume(); + mPaused = false; + if (mLanguagePicker != null) { + mLanguagePicker.setEnabled(true); + } + if (mPendingLocaleUpdate) { + mPendingLocaleUpdate = false; + fetchAndUpdateSimLocale(); + } + } + } + +} diff --git a/src/com/cyanogenmod/setupwizard/setup/MobileDataPage.java b/src/com/cyanogenmod/setupwizard/setup/MobileDataPage.java index 95d5912..f9a66e2 100644 --- a/src/com/cyanogenmod/setupwizard/setup/MobileDataPage.java +++ b/src/com/cyanogenmod/setupwizard/setup/MobileDataPage.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2013 The CyanogenMod Project + * Copyright (C) 2017 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -75,6 +76,11 @@ public class MobileDataPage extends SetupPage { return R.string.setup_mobile_data; } + @Override + public int getIconResId() { + return R.drawable.ic_mobile_data; + } + public static class MobileDataFragment extends SetupPageFragment { private ViewGroup mPageView; diff --git a/src/com/cyanogenmod/setupwizard/setup/OtherSettingsPage.java b/src/com/cyanogenmod/setupwizard/setup/OtherSettingsPage.java index 7ed23dc..5c0b91d 100644 --- a/src/com/cyanogenmod/setupwizard/setup/OtherSettingsPage.java +++ b/src/com/cyanogenmod/setupwizard/setup/OtherSettingsPage.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2015 The CyanogenMod Project + * Copyright (C) 2017 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -62,11 +63,12 @@ public class OtherSettingsPage extends SetupPage { @Override public int getTitleResId() { - if (SetupWizardUtils.hasGMS(mContext)) { - return R.string.setup_other; - } else { - return R.string.setup_location; - } + return R.string.setup_location; + } + + @Override + public int getIconResId() { + return R.drawable.ic_location; } public static class OtherSettingsFragment extends SetupPageFragment { diff --git a/src/com/cyanogenmod/setupwizard/setup/Page.java b/src/com/cyanogenmod/setupwizard/setup/Page.java index 9e48a1b..da27485 100644 --- a/src/com/cyanogenmod/setupwizard/setup/Page.java +++ b/src/com/cyanogenmod/setupwizard/setup/Page.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2013 The CyanogenMod Project + * Copyright (C) 2017 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,6 +32,7 @@ public interface Page { public String getKey(); public int getTitleResId(); + public int getIconResId(); public int getButtonBarBackgroundColorId(); public int getPrevButtonTitleResId(); public int getNextButtonTitleResId(); diff --git a/src/com/cyanogenmod/setupwizard/setup/ScreenLockSetupPage.java b/src/com/cyanogenmod/setupwizard/setup/ScreenLockSetupPage.java index 3c9da33..abbb2de 100644 --- a/src/com/cyanogenmod/setupwizard/setup/ScreenLockSetupPage.java +++ b/src/com/cyanogenmod/setupwizard/setup/ScreenLockSetupPage.java @@ -1,6 +1,7 @@ /* * Copyright (C) 2013 The CyanogenMod Project - * + * Copyright (C) 2017 The LineageOS 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 @@ -23,8 +24,8 @@ import android.app.FragmentManager; import android.content.Context; import android.content.Intent; import android.os.Bundle; +import android.widget.Button; import android.view.View; -import android.widget.TextView; import com.cyanogenmod.setupwizard.R; import com.cyanogenmod.setupwizard.SetupWizardApp; import com.cyanogenmod.setupwizard.cmstats.SetupStats; @@ -67,6 +68,11 @@ public class ScreenLockSetupPage extends SetupPage { } @Override + public int getIconResId() { + return R.drawable.ic_lock_screen; + } + + @Override public boolean onActivityResult(int requestCode, int resultCode, Intent data) { if (SetupWizardApp.REQUEST_CODE_SETUP_LOCKSCREEN == requestCode) { if (resultCode == Activity.RESULT_OK || resultCode == Activity.RESULT_FIRST_USER) { @@ -78,11 +84,11 @@ public class ScreenLockSetupPage extends SetupPage { public static class LockscreenSetupFragment extends SetupPageFragment { - private TextView mSetupLockscreen; + private Button mSetupLockscreen; @Override protected void initializePage() { - mSetupLockscreen = (TextView) mRootView.findViewById(R.id.setup_lockscreen); + mSetupLockscreen = (Button) mRootView.findViewById(R.id.setup_lockscreen); mSetupLockscreen.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/src/com/cyanogenmod/setupwizard/setup/SimCardMissingPage.java b/src/com/cyanogenmod/setupwizard/setup/SimCardMissingPage.java index 36b4a32..b487f9a 100644 --- a/src/com/cyanogenmod/setupwizard/setup/SimCardMissingPage.java +++ b/src/com/cyanogenmod/setupwizard/setup/SimCardMissingPage.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2014 The CyanogenMod Project + * Copyright (C) 2017 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -62,11 +63,15 @@ public class SimCardMissingPage extends SetupPage { } @Override + public int getIconResId() { + return R.drawable.ic_sim; + } + + @Override public int getNextButtonTitleResId() { return R.string.skip; } - public static class SimCardMissingFragment extends SetupPageFragment { @Override diff --git a/src/com/cyanogenmod/setupwizard/setup/WelcomePage.java b/src/com/cyanogenmod/setupwizard/setup/WelcomePage.java index 460a0ac..2e63085 100644 --- a/src/com/cyanogenmod/setupwizard/setup/WelcomePage.java +++ b/src/com/cyanogenmod/setupwizard/setup/WelcomePage.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 The CyanogenMod Project + * Copyright (C) 2017 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,39 +16,19 @@ package com.cyanogenmod.setupwizard.setup; -import android.accounts.AccountManager; -import android.accounts.AccountManagerCallback; -import android.accounts.AccountManagerFuture; import android.app.Activity; import android.app.ActivityOptions; import android.app.Fragment; import android.app.FragmentManager; import android.content.Context; import android.content.Intent; -import android.content.res.Configuration; import android.content.res.Resources; -import android.os.AsyncTask; import android.os.Bundle; -import android.os.Handler; -import android.telephony.SubscriptionInfo; -import android.telephony.SubscriptionManager; -import android.telephony.TelephonyManager; -import android.util.Log; -import android.view.View; -import android.widget.ArrayAdapter; -import android.widget.NumberPicker; -import android.widget.Toast; -import com.android.internal.telephony.MccTable; import com.cyanogenmod.setupwizard.R; import com.cyanogenmod.setupwizard.SetupWizardApp; import com.cyanogenmod.setupwizard.cmstats.SetupStats; -import com.cyanogenmod.setupwizard.ui.LocalePicker; import com.cyanogenmod.setupwizard.ui.SetupPageFragment; -import com.cyanogenmod.setupwizard.util.SetupWizardUtils; - -import java.util.List; -import java.util.Locale; public class WelcomePage extends SetupPage { @@ -77,20 +57,17 @@ public class WelcomePage extends SetupPage { @Override public int getTitleResId() { - return R.string.setup_welcome; + return R.string.os_name; + } + + @Override + public int getIconResId() { + return -1; } @Override public boolean doNextAction() { - if (isLocked()) { - confirmCyanogenCredentials(mWelcomeFragment); - return true; - } else { - if (mWelcomeFragment != null) { - mWelcomeFragment.sendLocaleStats(); - } - return super.doNextAction(); - } + return super.doNextAction(); } @Override @@ -129,11 +106,7 @@ public class WelcomePage extends SetupPage { @Override public int getNextButtonTitleResId() { - if (isLocked()) { - return R.string.setup_unlock; - } else { - return R.string.next; - } + return R.string.next; } @Override @@ -141,229 +114,16 @@ public class WelcomePage extends SetupPage { return R.string.emergency_call; } - private void confirmCyanogenCredentials(final Fragment fragment) { - AccountManager accountManager = AccountManager.get(mContext); - accountManager.editProperties(SetupWizardApp.ACCOUNT_TYPE_CYANOGEN, null, - new AccountManagerCallback<Bundle>() { - public void run(AccountManagerFuture<Bundle> f) { - try { - Bundle b = f.getResult(); - Intent i = b.getParcelable(AccountManager.KEY_INTENT); - i.putExtra(SetupWizardApp.EXTRA_FIRST_RUN, true); - i.putExtra(SetupWizardApp.EXTRA_SHOW_BUTTON_BAR, true); - i.putExtra(SetupWizardApp.EXTRA_USE_IMMERSIVE, true); - i.putExtra(SetupWizardApp.EXTRA_LOGIN_FOR_KILL_SWITCH, true); - fragment.startActivityForResult(i, - SetupWizardApp.REQUEST_CODE_UNLOCK); - } catch (Throwable t) { - Log.e(getKey(), "confirmCredentials failed", t); - } - } - }, null); - } - - private boolean isLocked() { - boolean isAuthorized = ((SetupWizardApp) mContext.getApplicationContext()).isAuthorized(); - if (SetupWizardUtils.isDeviceLocked()) { - return !isAuthorized; - } - return false; - } - - public void simChanged() { - if (mWelcomeFragment != null) { - mWelcomeFragment.fetchAndUpdateSimLocale(); - } - } - public static class WelcomeFragment extends SetupPageFragment { - private ArrayAdapter<com.android.internal.app.LocalePicker.LocaleInfo> mLocaleAdapter; - private Locale mInitialLocale; - private Locale mCurrentLocale; - private int[] mAdapterIndices; - private boolean mIgnoreSimLocale; - private LocalePicker mLanguagePicker; - private FetchUpdateSimLocaleTask mFetchUpdateSimLocaleTask; - private final Handler mHandler = new Handler(); - private boolean mPendingLocaleUpdate; - private boolean mPaused = true; - - private final Runnable mUpdateLocale = new Runnable() { - public void run() { - if (mCurrentLocale != null) { - mLanguagePicker.setEnabled(false); - com.android.internal.app.LocalePicker.updateLocale(mCurrentLocale); - } - } - }; - @Override protected void initializePage() { - mLanguagePicker = (LocalePicker) mRootView.findViewById(R.id.locale_list); - loadLanguages(); - final boolean brandedDevice = getResources().getBoolean( - R.bool.branded_device); - if (brandedDevice) { - mRootView.findViewById(R.id.powered_by_logo).setVisibility(View.VISIBLE); - } - } - - private void loadLanguages() { - mLocaleAdapter = com.android.internal.app.LocalePicker.constructAdapter(getActivity(), R.layout.locale_picker_item, R.id.locale); - mCurrentLocale = mInitialLocale = Locale.getDefault(); - fetchAndUpdateSimLocale(); - mAdapterIndices = new int[mLocaleAdapter.getCount()]; - int currentLocaleIndex = 0; - String [] labels = new String[mLocaleAdapter.getCount()]; - for (int i=0; i<mAdapterIndices.length; i++) { - com.android.internal.app.LocalePicker.LocaleInfo localLocaleInfo = mLocaleAdapter.getItem(i); - Locale localLocale = localLocaleInfo.getLocale(); - if (localLocale.equals(mCurrentLocale)) { - currentLocaleIndex = i; - } - mAdapterIndices[i] = i; - labels[i] = localLocaleInfo.getLabel(); - } - mLanguagePicker.setDisplayedValues(labels); - mLanguagePicker.setMaxValue(labels.length - 1); - mLanguagePicker.setValue(currentLocaleIndex); - mLanguagePicker.setDescendantFocusability(NumberPicker.FOCUS_BLOCK_DESCENDANTS); - mLanguagePicker.setOnValueChangedListener(new LocalePicker.OnValueChangeListener() { - public void onValueChange(LocalePicker picker, int oldVal, int newVal) { - setLocaleFromPicker(); - } - }); - mLanguagePicker.setOnScrollListener(new LocalePicker.OnScrollListener() { - @Override - public void onScrollStateChange(LocalePicker view, int scrollState) { - if (scrollState == SCROLL_STATE_TOUCH_SCROLL) { - mIgnoreSimLocale = true; - } - } - }); - } - - private void setLocaleFromPicker() { - mIgnoreSimLocale = true; - int i = mAdapterIndices[mLanguagePicker.getValue()]; - final com.android.internal.app.LocalePicker.LocaleInfo localLocaleInfo = mLocaleAdapter.getItem(i); - onLocaleChanged(localLocaleInfo.getLocale()); - } - - private void onLocaleChanged(Locale paramLocale) { - mLanguagePicker.setEnabled(true); - Resources localResources = getActivity().getResources(); - Configuration localConfiguration1 = localResources.getConfiguration(); - Configuration localConfiguration2 = new Configuration(); - localConfiguration2.locale = paramLocale; - localResources.updateConfiguration(localConfiguration2, null); - localResources.updateConfiguration(localConfiguration1, null); - mHandler.removeCallbacks(mUpdateLocale); - mCurrentLocale = paramLocale; - mHandler.postDelayed(mUpdateLocale, 1000); } @Override protected int getLayoutResource() { return R.layout.setup_welcome_page; } - - public void sendLocaleStats() { - if (!mCurrentLocale.equals(mInitialLocale)) { - SetupStats.addEvent(SetupStats.Categories.SETTING_CHANGED, - SetupStats.Action.CHANGE_LOCALE, SetupStats.Label.LOCALE, - mCurrentLocale.getDisplayName()); - } - } - - public void fetchAndUpdateSimLocale() { - if (mIgnoreSimLocale || isDetached()) { - return; - } - if (mPaused) { - mPendingLocaleUpdate = true; - return; - } - if (mFetchUpdateSimLocaleTask != null) { - mFetchUpdateSimLocaleTask.cancel(true); - } - mFetchUpdateSimLocaleTask = new FetchUpdateSimLocaleTask(); - mFetchUpdateSimLocaleTask.execute(); - } - - private class FetchUpdateSimLocaleTask extends AsyncTask<Void, Void, Locale> { - @Override - protected Locale doInBackground(Void... params) { - Locale locale = null; - Activity activity = getActivity(); - if (activity != null) { - // If the sim is currently pin locked, return - TelephonyManager telephonyManager = (TelephonyManager) - activity.getSystemService(Context.TELEPHONY_SERVICE); - int state = telephonyManager.getSimState(); - if(state == TelephonyManager.SIM_STATE_PIN_REQUIRED || - state == TelephonyManager.SIM_STATE_PUK_REQUIRED) { - return null; - } - - final SubscriptionManager subscriptionManager = - SubscriptionManager.from(activity); - List<SubscriptionInfo> activeSubs = - subscriptionManager.getActiveSubscriptionInfoList(); - if (activeSubs == null || activeSubs.isEmpty()) { - return null; - } - - // Fetch locale for active sim's MCC - int mcc = activeSubs.get(0).getMcc(); - locale = MccTable.getLocaleFromMcc(activity, mcc, null); - - // If that fails, fall back to preferred languages reported - // by the sim - if (locale == null) { - String localeString = telephonyManager.getLocaleFromDefaultSim(); - if (localeString != null) { - locale = Locale.forLanguageTag(localeString); - - } - } - } - return locale; - } - - @Override - protected void onPostExecute(Locale simLocale) { - if (simLocale != null && !simLocale.equals(mCurrentLocale)) { - if (!mIgnoreSimLocale && !isDetached()) { - String label = getString(R.string.sim_locale_changed, - simLocale.getDisplayName()); - Toast.makeText(getActivity(), label, Toast.LENGTH_SHORT).show(); - onLocaleChanged(simLocale); - mIgnoreSimLocale = true; - } - } - } - } - - @Override - public void onPause() { - super.onPause(); - mPaused = true; - } - - @Override - public void onResume() { - super.onResume(); - mPaused = false; - if (mLanguagePicker != null) { - mLanguagePicker.setEnabled(true); - } - if (mPendingLocaleUpdate) { - mPendingLocaleUpdate = false; - fetchAndUpdateSimLocale(); - } - } } } diff --git a/src/com/cyanogenmod/setupwizard/setup/WifiSetupPage.java b/src/com/cyanogenmod/setupwizard/setup/WifiSetupPage.java index 2d8084a..051cbc3 100644 --- a/src/com/cyanogenmod/setupwizard/setup/WifiSetupPage.java +++ b/src/com/cyanogenmod/setupwizard/setup/WifiSetupPage.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2013 The CyanogenMod Project + * Copyright (C) 2017 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -146,6 +147,10 @@ public class WifiSetupPage extends SetupPage { return R.string.loading; } + @Override + public int getIconResId() { + return -1; + } @Override public void doLoadAction(FragmentManager fragmentManager, int action) { diff --git a/src/com/cyanogenmod/setupwizard/ui/SetupPageFragment.java b/src/com/cyanogenmod/setupwizard/ui/SetupPageFragment.java index b0df440..2ec8e3a 100644 --- a/src/com/cyanogenmod/setupwizard/ui/SetupPageFragment.java +++ b/src/com/cyanogenmod/setupwizard/ui/SetupPageFragment.java @@ -23,6 +23,7 @@ import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.ImageView; import android.widget.TextView; import com.cyanogenmod.setupwizard.R; @@ -37,6 +38,7 @@ public abstract class SetupPageFragment extends Fragment { protected Page mPage; protected View mRootView; protected TextView mTitleView; + protected ImageView mIconView; protected ViewGroup mHeaderView; @Override @@ -52,7 +54,8 @@ public abstract class SetupPageFragment extends Fragment { Bundle savedInstanceState) { mRootView = inflater.inflate(getLayoutResource(), container, false); mTitleView = (TextView) mRootView.findViewById(android.R.id.title); - mHeaderView = (ViewGroup ) mRootView.findViewById(R.id.header); + mHeaderView = (ViewGroup) mRootView.findViewById(R.id.header); + mIconView = (ImageView) mRootView.findViewById(R.id.header_icon); initializePage(); return mRootView; } @@ -84,6 +87,13 @@ public abstract class SetupPageFragment extends Fragment { if (mTitleView != null) { mTitleView.setText(mPage.getTitleResId()); } + if (mIconView != null) { + int mResId = mPage.getIconResId(); + if (mResId != -1) { + mIconView.setImageResource(mResId); + mIconView.setVisibility(View.VISIBLE); + } + } mCallbacks.onPageLoaded(mPage); getActivity().startPostponedEnterTransition(); } diff --git a/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java b/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java index cf56631..4782b36 100644 --- a/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java +++ b/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java @@ -287,21 +287,11 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks, null, null, null); } final Resources resources = getResources(); - if (mSetupData.isLastPage()) { - mNextButton.setCompoundDrawablesWithIntrinsicBounds(null, null, - getDrawable(R.drawable.ic_chevron_right_wht), null); - mNextButton.setTextColor(resources.getColor(R.color.white)); - mPrevButton.setCompoundDrawablesWithIntrinsicBounds( - getDrawable(R.drawable.ic_chevron_left_wht), null, - null, null); - mPrevButton.setTextColor(resources.getColor(R.color.white)); - } else { - mButtonBar.setBackgroundResource(R.color.button_bar_background); - mNextButton.setCompoundDrawablesWithIntrinsicBounds(null, null, - getDrawable(R.drawable.ic_chevron_right_dark), null); - mNextButton.setTextColor(resources.getColorStateList(R.color.button_bar_text)); - mPrevButton.setTextColor(resources.getColorStateList(R.color.button_bar_text)); - } + mButtonBar.setBackgroundResource(R.color.button_bar_background); + mNextButton.setCompoundDrawablesWithIntrinsicBounds(null, null, + getDrawable(R.drawable.ic_chevron_right_dark), null); + mNextButton.setTextColor(resources.getColorStateList(R.color.button_bar_text)); + mPrevButton.setTextColor(resources.getColorStateList(R.color.button_bar_text)); } @Override diff --git a/src/com/cyanogenmod/setupwizard/ui/WebViewDialogFragment.java b/src/com/cyanogenmod/setupwizard/ui/WebViewDialogFragment.java deleted file mode 100644 index 46f22ae..0000000 --- a/src/com/cyanogenmod/setupwizard/ui/WebViewDialogFragment.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Copyright (C) 2013 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. - */ - -package com.cyanogenmod.setupwizard.ui; - -import android.app.AlertDialog; -import android.app.Dialog; -import android.app.DialogFragment; -import android.content.DialogInterface; -import android.os.Bundle; -import android.view.View; -import android.webkit.WebView; -import android.webkit.WebViewClient; - -import com.cyanogenmod.setupwizard.R; - -public class WebViewDialogFragment extends DialogFragment { - - public static String TAG = WebViewDialogFragment.class.getSimpleName(); - - private View mRootView; - private WebView mWebView; - private String mUri; - private Dialog mDialog; - - public static WebViewDialogFragment newInstance() { - return new WebViewDialogFragment(); - } - - public WebViewDialogFragment() { - - } - - public WebViewDialogFragment setUri(String uri) { - mUri = uri; - return this; - } - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setRetainInstance(true); - mRootView = getActivity().getLayoutInflater().inflate(R.layout.terms_webview, null, false); - mWebView = (WebView)mRootView.findViewById(R.id.webview); - mWebView.setWebViewClient(new WebViewClient() { - @Override - public boolean shouldOverrideUrlLoading(WebView view, String url) { - return false; - } - }); - mWebView.getSettings().setJavaScriptEnabled(true); - mWebView.getSettings().setUseWideViewPort(true); - mWebView.loadUrl(mUri); - } - - @Override - public Dialog onCreateDialog(Bundle savedInstanceState) { - if (mDialog == null) { - mDialog =new AlertDialog.Builder(getActivity()) - .setView(mRootView) - .setCancelable(false) - .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialogInterface, int i) { - dialogInterface.dismiss(); - } - }) - .create(); - } - return mDialog; - } -} - diff --git a/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java b/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java index 1b6a3ee..34961a9 100644 --- a/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java +++ b/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java @@ -50,7 +50,6 @@ public class SetupWizardUtils { private static final String TAG = SetupWizardUtils.class.getSimpleName(); public static final String GOOGLE_SETUPWIZARD_PACKAGE = "com.google.android.setupwizard"; - private static final String MODMOD_PACKAGE = "com.cyanogen.ambient.core"; private SetupWizardUtils(){} @@ -203,14 +202,6 @@ public class SetupWizardUtils { ConnectionResult.SERVICE_MISSING; } - /** - * The assumption here is that if ambient core is present, we have MODs. - * In the future we will link against the SDK and use the util there. - */ - public static boolean canHasModMOD(Context context) { - return isPackageInstalled(context, MODMOD_PACKAGE); - } - public static boolean accountExists(Context context, String accountType) { return AccountManager.get(context).getAccountsByType(accountType).length > 0; } |
