From 0ec2da54f8e5fd0faa85aebe1a9ea502a775b703 Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Thu, 25 May 2017 16:42:18 +0000 Subject: [PATCH] Revert "Fixing string not correctly marked as non-translatable" This reverts commit 477b8cc1b457b66a432f3a2fe062b76127860108. Change-Id: I114f89c20d735d0e17cc93e8f78876bf8a388a6a --- res/values-bn-rBD/config.xml | 12 ++++++++++++ res/values-bn/config.xml | 13 +++++++++++++ res/values-gu-rIN/config.xml | 12 ++++++++++++ res/values-gu/config.xml | 13 +++++++++++++ res/values-kn-rIN/config.xml | 12 ++++++++++++ res/values-kn/config.xml | 13 +++++++++++++ res/values-ml-rIN/config.xml | 12 ++++++++++++ res/values-ml/config.xml | 13 +++++++++++++ res/values-mr-rIN/config.xml | 12 ++++++++++++ res/values-mr/config.xml | 13 +++++++++++++ res/values-ne-rNP/config.xml | 12 ++++++++++++ res/values-ne/config.xml | 13 +++++++++++++ res/values-pa-rIN/config.xml | 12 ++++++++++++ res/values-pa/config.xml | 13 +++++++++++++ res/values-sw600dp/config.xml | 4 ++++ res/values-sw720dp/config.xml | 11 +++++++++++ res/values-te-rIN/config.xml | 12 ++++++++++++ res/values-te/config.xml | 13 +++++++++++++ res/values-ur-rPK/config.xml | 12 ++++++++++++ res/values-ur/config.xml | 13 +++++++++++++ res/values/config.xml | 21 ++++++++++----------- res/values/strings.xml | 9 --------- 22 files changed, 250 insertions(+), 20 deletions(-) create mode 100644 res/values-bn-rBD/config.xml create mode 100644 res/values-bn/config.xml create mode 100644 res/values-gu-rIN/config.xml create mode 100644 res/values-gu/config.xml create mode 100644 res/values-kn-rIN/config.xml create mode 100644 res/values-kn/config.xml create mode 100644 res/values-ml-rIN/config.xml create mode 100644 res/values-ml/config.xml create mode 100644 res/values-mr-rIN/config.xml create mode 100644 res/values-mr/config.xml create mode 100644 res/values-ne-rNP/config.xml create mode 100644 res/values-ne/config.xml create mode 100644 res/values-pa-rIN/config.xml create mode 100644 res/values-pa/config.xml create mode 100644 res/values-sw600dp/config.xml create mode 100644 res/values-sw720dp/config.xml create mode 100644 res/values-te-rIN/config.xml create mode 100644 res/values-te/config.xml create mode 100644 res/values-ur-rPK/config.xml create mode 100644 res/values-ur/config.xml diff --git a/res/values-bn-rBD/config.xml b/res/values-bn-rBD/config.xml new file mode 100644 index 0000000000..7ee78d01b5 --- /dev/null +++ b/res/values-bn-rBD/config.xml @@ -0,0 +1,12 @@ + + + + + "M50,0L100,0 100,100 0,100 0,0z" + "M50,0 C10,0 0,10 0,50 0,90 10,100 50,100 90,100 100,90 100,50 100,10 90,0 50,0 Z" + "M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0" + "M50,0A50,50,0,0 1 100,50 L100,85 A15,15,0,0 1 85,100 L50,100 A50,50,0,0 1 50,0z" + + + diff --git a/res/values-bn/config.xml b/res/values-bn/config.xml new file mode 100644 index 0000000000..56f98c3563 --- /dev/null +++ b/res/values-bn/config.xml @@ -0,0 +1,13 @@ + + + + + "M50,0L100,0 100,100 0,100 0,0z" + "M50,0L80,0 A20,20,0,0 1 100,20 L100,80 A20,20,0,0 1 80,100 L20,100 A20,20,0,0 1 0,80 L 0,20 A20,20,0,0 1 20,0z" + "M50,0 C10,0 0,10 0,50 0,90 10,100 50,100 90,100 100,90 100,50 100,10 90,0 50,0 Z" + "M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0" + "M50,0A50,30 0,0,1 100,30V70A50,30 0,0,1 0,70V30A50,30 0,0,1 50,0z" + + + diff --git a/res/values-gu-rIN/config.xml b/res/values-gu-rIN/config.xml new file mode 100644 index 0000000000..7ee78d01b5 --- /dev/null +++ b/res/values-gu-rIN/config.xml @@ -0,0 +1,12 @@ + + + + + "M50,0L100,0 100,100 0,100 0,0z" + "M50,0 C10,0 0,10 0,50 0,90 10,100 50,100 90,100 100,90 100,50 100,10 90,0 50,0 Z" + "M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0" + "M50,0A50,50,0,0 1 100,50 L100,85 A15,15,0,0 1 85,100 L50,100 A50,50,0,0 1 50,0z" + + + diff --git a/res/values-gu/config.xml b/res/values-gu/config.xml new file mode 100644 index 0000000000..56f98c3563 --- /dev/null +++ b/res/values-gu/config.xml @@ -0,0 +1,13 @@ + + + + + "M50,0L100,0 100,100 0,100 0,0z" + "M50,0L80,0 A20,20,0,0 1 100,20 L100,80 A20,20,0,0 1 80,100 L20,100 A20,20,0,0 1 0,80 L 0,20 A20,20,0,0 1 20,0z" + "M50,0 C10,0 0,10 0,50 0,90 10,100 50,100 90,100 100,90 100,50 100,10 90,0 50,0 Z" + "M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0" + "M50,0A50,30 0,0,1 100,30V70A50,30 0,0,1 0,70V30A50,30 0,0,1 50,0z" + + + diff --git a/res/values-kn-rIN/config.xml b/res/values-kn-rIN/config.xml new file mode 100644 index 0000000000..7ee78d01b5 --- /dev/null +++ b/res/values-kn-rIN/config.xml @@ -0,0 +1,12 @@ + + + + + "M50,0L100,0 100,100 0,100 0,0z" + "M50,0 C10,0 0,10 0,50 0,90 10,100 50,100 90,100 100,90 100,50 100,10 90,0 50,0 Z" + "M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0" + "M50,0A50,50,0,0 1 100,50 L100,85 A15,15,0,0 1 85,100 L50,100 A50,50,0,0 1 50,0z" + + + diff --git a/res/values-kn/config.xml b/res/values-kn/config.xml new file mode 100644 index 0000000000..56f98c3563 --- /dev/null +++ b/res/values-kn/config.xml @@ -0,0 +1,13 @@ + + + + + "M50,0L100,0 100,100 0,100 0,0z" + "M50,0L80,0 A20,20,0,0 1 100,20 L100,80 A20,20,0,0 1 80,100 L20,100 A20,20,0,0 1 0,80 L 0,20 A20,20,0,0 1 20,0z" + "M50,0 C10,0 0,10 0,50 0,90 10,100 50,100 90,100 100,90 100,50 100,10 90,0 50,0 Z" + "M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0" + "M50,0A50,30 0,0,1 100,30V70A50,30 0,0,1 0,70V30A50,30 0,0,1 50,0z" + + + diff --git a/res/values-ml-rIN/config.xml b/res/values-ml-rIN/config.xml new file mode 100644 index 0000000000..7ee78d01b5 --- /dev/null +++ b/res/values-ml-rIN/config.xml @@ -0,0 +1,12 @@ + + + + + "M50,0L100,0 100,100 0,100 0,0z" + "M50,0 C10,0 0,10 0,50 0,90 10,100 50,100 90,100 100,90 100,50 100,10 90,0 50,0 Z" + "M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0" + "M50,0A50,50,0,0 1 100,50 L100,85 A15,15,0,0 1 85,100 L50,100 A50,50,0,0 1 50,0z" + + + diff --git a/res/values-ml/config.xml b/res/values-ml/config.xml new file mode 100644 index 0000000000..56f98c3563 --- /dev/null +++ b/res/values-ml/config.xml @@ -0,0 +1,13 @@ + + + + + "M50,0L100,0 100,100 0,100 0,0z" + "M50,0L80,0 A20,20,0,0 1 100,20 L100,80 A20,20,0,0 1 80,100 L20,100 A20,20,0,0 1 0,80 L 0,20 A20,20,0,0 1 20,0z" + "M50,0 C10,0 0,10 0,50 0,90 10,100 50,100 90,100 100,90 100,50 100,10 90,0 50,0 Z" + "M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0" + "M50,0A50,30 0,0,1 100,30V70A50,30 0,0,1 0,70V30A50,30 0,0,1 50,0z" + + + diff --git a/res/values-mr-rIN/config.xml b/res/values-mr-rIN/config.xml new file mode 100644 index 0000000000..7ee78d01b5 --- /dev/null +++ b/res/values-mr-rIN/config.xml @@ -0,0 +1,12 @@ + + + + + "M50,0L100,0 100,100 0,100 0,0z" + "M50,0 C10,0 0,10 0,50 0,90 10,100 50,100 90,100 100,90 100,50 100,10 90,0 50,0 Z" + "M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0" + "M50,0A50,50,0,0 1 100,50 L100,85 A15,15,0,0 1 85,100 L50,100 A50,50,0,0 1 50,0z" + + + diff --git a/res/values-mr/config.xml b/res/values-mr/config.xml new file mode 100644 index 0000000000..56f98c3563 --- /dev/null +++ b/res/values-mr/config.xml @@ -0,0 +1,13 @@ + + + + + "M50,0L100,0 100,100 0,100 0,0z" + "M50,0L80,0 A20,20,0,0 1 100,20 L100,80 A20,20,0,0 1 80,100 L20,100 A20,20,0,0 1 0,80 L 0,20 A20,20,0,0 1 20,0z" + "M50,0 C10,0 0,10 0,50 0,90 10,100 50,100 90,100 100,90 100,50 100,10 90,0 50,0 Z" + "M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0" + "M50,0A50,30 0,0,1 100,30V70A50,30 0,0,1 0,70V30A50,30 0,0,1 50,0z" + + + diff --git a/res/values-ne-rNP/config.xml b/res/values-ne-rNP/config.xml new file mode 100644 index 0000000000..7ee78d01b5 --- /dev/null +++ b/res/values-ne-rNP/config.xml @@ -0,0 +1,12 @@ + + + + + "M50,0L100,0 100,100 0,100 0,0z" + "M50,0 C10,0 0,10 0,50 0,90 10,100 50,100 90,100 100,90 100,50 100,10 90,0 50,0 Z" + "M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0" + "M50,0A50,50,0,0 1 100,50 L100,85 A15,15,0,0 1 85,100 L50,100 A50,50,0,0 1 50,0z" + + + diff --git a/res/values-ne/config.xml b/res/values-ne/config.xml new file mode 100644 index 0000000000..56f98c3563 --- /dev/null +++ b/res/values-ne/config.xml @@ -0,0 +1,13 @@ + + + + + "M50,0L100,0 100,100 0,100 0,0z" + "M50,0L80,0 A20,20,0,0 1 100,20 L100,80 A20,20,0,0 1 80,100 L20,100 A20,20,0,0 1 0,80 L 0,20 A20,20,0,0 1 20,0z" + "M50,0 C10,0 0,10 0,50 0,90 10,100 50,100 90,100 100,90 100,50 100,10 90,0 50,0 Z" + "M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0" + "M50,0A50,30 0,0,1 100,30V70A50,30 0,0,1 0,70V30A50,30 0,0,1 50,0z" + + + diff --git a/res/values-pa-rIN/config.xml b/res/values-pa-rIN/config.xml new file mode 100644 index 0000000000..7ee78d01b5 --- /dev/null +++ b/res/values-pa-rIN/config.xml @@ -0,0 +1,12 @@ + + + + + "M50,0L100,0 100,100 0,100 0,0z" + "M50,0 C10,0 0,10 0,50 0,90 10,100 50,100 90,100 100,90 100,50 100,10 90,0 50,0 Z" + "M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0" + "M50,0A50,50,0,0 1 100,50 L100,85 A15,15,0,0 1 85,100 L50,100 A50,50,0,0 1 50,0z" + + + diff --git a/res/values-pa/config.xml b/res/values-pa/config.xml new file mode 100644 index 0000000000..56f98c3563 --- /dev/null +++ b/res/values-pa/config.xml @@ -0,0 +1,13 @@ + + + + + "M50,0L100,0 100,100 0,100 0,0z" + "M50,0L80,0 A20,20,0,0 1 100,20 L100,80 A20,20,0,0 1 80,100 L20,100 A20,20,0,0 1 0,80 L 0,20 A20,20,0,0 1 20,0z" + "M50,0 C10,0 0,10 0,50 0,90 10,100 50,100 90,100 100,90 100,50 100,10 90,0 50,0 Z" + "M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0" + "M50,0A50,30 0,0,1 100,30V70A50,30 0,0,1 0,70V30A50,30 0,0,1 50,0z" + + + diff --git a/res/values-sw600dp/config.xml b/res/values-sw600dp/config.xml new file mode 100644 index 0000000000..eb9af97938 --- /dev/null +++ b/res/values-sw600dp/config.xml @@ -0,0 +1,4 @@ + + true + true + diff --git a/res/values-sw720dp/config.xml b/res/values-sw720dp/config.xml new file mode 100644 index 0000000000..94cffcb551 --- /dev/null +++ b/res/values-sw720dp/config.xml @@ -0,0 +1,11 @@ + + true + true + + + + 90 + + + false + diff --git a/res/values-te-rIN/config.xml b/res/values-te-rIN/config.xml new file mode 100644 index 0000000000..7ee78d01b5 --- /dev/null +++ b/res/values-te-rIN/config.xml @@ -0,0 +1,12 @@ + + + + + "M50,0L100,0 100,100 0,100 0,0z" + "M50,0 C10,0 0,10 0,50 0,90 10,100 50,100 90,100 100,90 100,50 100,10 90,0 50,0 Z" + "M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0" + "M50,0A50,50,0,0 1 100,50 L100,85 A15,15,0,0 1 85,100 L50,100 A50,50,0,0 1 50,0z" + + + diff --git a/res/values-te/config.xml b/res/values-te/config.xml new file mode 100644 index 0000000000..56f98c3563 --- /dev/null +++ b/res/values-te/config.xml @@ -0,0 +1,13 @@ + + + + + "M50,0L100,0 100,100 0,100 0,0z" + "M50,0L80,0 A20,20,0,0 1 100,20 L100,80 A20,20,0,0 1 80,100 L20,100 A20,20,0,0 1 0,80 L 0,20 A20,20,0,0 1 20,0z" + "M50,0 C10,0 0,10 0,50 0,90 10,100 50,100 90,100 100,90 100,50 100,10 90,0 50,0 Z" + "M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0" + "M50,0A50,30 0,0,1 100,30V70A50,30 0,0,1 0,70V30A50,30 0,0,1 50,0z" + + + diff --git a/res/values-ur-rPK/config.xml b/res/values-ur-rPK/config.xml new file mode 100644 index 0000000000..7ee78d01b5 --- /dev/null +++ b/res/values-ur-rPK/config.xml @@ -0,0 +1,12 @@ + + + + + "M50,0L100,0 100,100 0,100 0,0z" + "M50,0 C10,0 0,10 0,50 0,90 10,100 50,100 90,100 100,90 100,50 100,10 90,0 50,0 Z" + "M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0" + "M50,0A50,50,0,0 1 100,50 L100,85 A15,15,0,0 1 85,100 L50,100 A50,50,0,0 1 50,0z" + + + diff --git a/res/values-ur/config.xml b/res/values-ur/config.xml new file mode 100644 index 0000000000..56f98c3563 --- /dev/null +++ b/res/values-ur/config.xml @@ -0,0 +1,13 @@ + + + + + "M50,0L100,0 100,100 0,100 0,0z" + "M50,0L80,0 A20,20,0,0 1 100,20 L100,80 A20,20,0,0 1 80,100 L20,100 A20,20,0,0 1 0,80 L 0,20 A20,20,0,0 1 20,0z" + "M50,0 C10,0 0,10 0,50 0,90 10,100 50,100 90,100 100,90 100,50 100,10 90,0 50,0 Z" + "M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0" + "M50,0A50,30 0,0,1 100,30V70A50,30 0,0,1 0,70V30A50,30 0,0,1 50,0z" + + + diff --git a/res/values/config.xml b/res/values/config.xml index a467a5cccd..8f2590abc4 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -19,23 +19,22 @@ - + - M50,0L100,0 100,100 0,100 0,0z - M50,0 C10,0 0,10 0,50 0,90 10,100 50,100 90,100 100,90 100,50 100,10 90,0 50,0 Z - M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0 - M50,0A50,50,0,0 1 100,50 L100,85 A15,15,0,0 1 85,100 L50,100 A50,50,0,0 1 50,0z + M50,0L100,0 100,100 0,100 0,0z + M50,0 C10,0 0,10 0,50 0,90 10,100 50,100 90,100 100,90 100,50 100,10 90,0 50,0 Z + M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0 + M50,0A50,50,0,0 1 100,50 L100,85 A15,15,0,0 1 85,100 L50,100 A50,50,0,0 1 50,0z - + @string/icon_shape_system_default - @string/icon_shape_square - @string/icon_shape_squircle - @string/icon_shape_circle - @string/icon_shape_teardrop + Square + Squircle + Circle + Teardrop - diff --git a/res/values/strings.xml b/res/values/strings.xml index 24a7b881ab..3648e1516d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -188,15 +188,6 @@ Change icon shape Use system default - - Square - - Squircle - - Circle - - Teardrop - Applying icon shape changes