From: Soren Stoutner Date: Thu, 15 Mar 2018 21:18:04 +0000 (-0700) Subject: Add a Bookmarks tab to the Guide. https://redmine.stoutner.com/issues/247 X-Git-Tag: v2.9~11 X-Git-Url: https://gitweb.stoutner.com/?a=commitdiff_plain;h=a645a62dec2fb33103ad53dca0fdc88077f660b4;p=PrivacyBrowserAndroid.git Add a Bookmarks tab to the Guide. https://redmine.stoutner.com/issues/247 --- diff --git a/app/src/main/assets/de/guide_bookmarks_dark.html b/app/src/main/assets/de/guide_bookmarks_dark.html new file mode 100644 index 00000000..1fe8f8ef --- /dev/null +++ b/app/src/main/assets/de/guide_bookmarks_dark.html @@ -0,0 +1,38 @@ + + + + + + + + + + +

Bookmarks

+ +

Bookmarks can be accessed in a drawer layout by swiping from the right of the screen.

+ + + +

Tapping the top floating action button loads the bookmarks activity, which has advanced options like moving and deleting bookmarks. + From the bookmarks activity, there is an option to load the bookmarks database view. This shows the bookmarks as they exist in the SQLite database. + This will mostly be useful for troubleshooting problems with importing + and exporting bookmarks once those features are added.

+ + \ No newline at end of file diff --git a/app/src/main/assets/de/guide_bookmarks_light.html b/app/src/main/assets/de/guide_bookmarks_light.html new file mode 100644 index 00000000..d47ee662 --- /dev/null +++ b/app/src/main/assets/de/guide_bookmarks_light.html @@ -0,0 +1,38 @@ + + + + + + + + + + +

Bookmarks

+ +

Bookmarks can be accessed in a drawer layout by swiping from the right of the screen.

+ + + +

Tapping the top floating action button loads the bookmarks activity, which has advanced options like moving and deleting bookmarks. + From the bookmarks activity, there is an option to load the bookmarks database view. This shows the bookmarks as they exist in the SQLite database. + This will mostly be useful for troubleshooting problems with importing + and exporting bookmarks once those features are added.

+ + \ No newline at end of file diff --git a/app/src/main/assets/de/images/bookmarks.png b/app/src/main/assets/de/images/bookmarks.png new file mode 100644 index 00000000..1c9925f6 Binary files /dev/null and b/app/src/main/assets/de/images/bookmarks.png differ diff --git a/app/src/main/assets/en/guide_bookmarks_dark.html b/app/src/main/assets/en/guide_bookmarks_dark.html new file mode 100644 index 00000000..d405ed4d --- /dev/null +++ b/app/src/main/assets/en/guide_bookmarks_dark.html @@ -0,0 +1,38 @@ + + + + + + + + + + +

Bookmarks

+ +

Bookmarks can be accessed in a drawer layout by swiping from the right of the screen.

+ + + +

Tapping the top floating action button loads the bookmarks activity, which has advanced options like moving and deleting bookmarks. + From the bookmarks activity, there is an option to load the bookmarks database view. This shows the bookmarks as they exist in the SQLite database. + This will mostly be useful for troubleshooting problems with importing + and exporting bookmarks once those features are added.

+ + \ No newline at end of file diff --git a/app/src/main/assets/en/guide_bookmarks_light.html b/app/src/main/assets/en/guide_bookmarks_light.html new file mode 100644 index 00000000..4f70b795 --- /dev/null +++ b/app/src/main/assets/en/guide_bookmarks_light.html @@ -0,0 +1,38 @@ + + + + + + + + + + +

Bookmarks

+ +

Bookmarks can be accessed in a drawer layout by swiping from the right of the screen.

+ + + +

Tapping the top floating action button loads the bookmarks activity, which has advanced options like moving and deleting bookmarks. + From the bookmarks activity, there is an option to load the bookmarks database view. This shows the bookmarks as they exist in the SQLite database. + This will mostly be useful for troubleshooting problems with importing + and exporting bookmarks once those features are added.

+ + \ No newline at end of file diff --git a/app/src/main/assets/en/images/bookmarks.png b/app/src/main/assets/en/images/bookmarks.png new file mode 100644 index 00000000..3870913d Binary files /dev/null and b/app/src/main/assets/en/images/bookmarks.png differ diff --git a/app/src/main/assets/en/images/ic_bookmark_border_blue_dark.png b/app/src/main/assets/en/images/ic_bookmark_border_blue_dark.png new file mode 100644 index 00000000..d7cc3f99 Binary files /dev/null and b/app/src/main/assets/en/images/ic_bookmark_border_blue_dark.png differ diff --git a/app/src/main/assets/en/images/ic_bookmark_border_blue_light.png b/app/src/main/assets/en/images/ic_bookmark_border_blue_light.png new file mode 100644 index 00000000..1240c102 Binary files /dev/null and b/app/src/main/assets/en/images/ic_bookmark_border_blue_light.png differ diff --git a/app/src/main/assets/es/about_changelog_dark.html b/app/src/main/assets/es/about_changelog_dark.html index 605d8142..9c0c1cd1 100644 --- a/app/src/main/assets/es/about_changelog_dark.html +++ b/app/src/main/assets/es/about_changelog_dark.html @@ -3,20 +3,20 @@ Translation 2017-2018 Jose A. León Becerra. Copyright assigned to Soren Stoutner . - Este archivo es parte de Navegador Privado (Privacy Browser) . + This file is part of Privacy Browser . - Navegador Privado (Privacy Browser) es software libre: puedes redistribuirlo y/o modificarlo - bajo los términos de la Licencia Pública General GNU, como se ha publicado por - la Fundación del Software Libre, tanto la versión 3 de la Licencia, o - (a su opción) cualquier versión posterior. + Privacy Browser is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - Navegador Privado (Privacy Browser) es distribuído con la esperanza de que será útil, - pero SIN NINGUNA GARANTÍA; ni siquiera la garantía implícita de - MERCANTILIDAD o APTITUD PARA UN PROPÓSITO PARTICULAR. Vea la - Licencia Pública General para más detalles. + Privacy Browser is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - Usted debería haber recibido una copia de la Licencia Pública General GNU - junto con Navegador Privado (Privacy Browser). Si no es así, vea . --> + You should have received a copy of the GNU General Public License + along with Privacy Browser. If not, see . --> diff --git a/app/src/main/assets/es/about_changelog_light.html b/app/src/main/assets/es/about_changelog_light.html index f494f875..0fa89d4b 100644 --- a/app/src/main/assets/es/about_changelog_light.html +++ b/app/src/main/assets/es/about_changelog_light.html @@ -3,20 +3,20 @@ Translation 2017-2018 Jose A. León Becerra . Copyright assigned to Soren Stoutner . - Este archivo es parte de Navegador Privado (Privacy Browser) . + This file is part of Privacy Browser . - Navegador Privado (Privacy Browser) es software libre: puedes redistribuirlo y/o modificarlo - bajo los términos de la Licencia Pública General GNU, como se ha publicado por - la Fundación del Software Libre, tanto la versión 3 de la Licencia, o - (a su opción) cualquier versión posterior. + Privacy Browser is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - Navegador Privado (Privacy Browser) es distribuído con la esperanza de que será útil, - pero SIN NINGUNA GARANTÍA; ni siquiera la garantía implícita de - MERCANTILIDAD o APTITUD PARA UN PROPÓSITO PARTICULAR. Vea la - Licencia Pública General para más detalles. + Privacy Browser is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - Usted debería haber recibido una copia de la Licencia Pública General GNU - junto con Navegador Privado (Privacy Browser). Si no es así, vea . --> + You should have received a copy of the GNU General Public License + along with Privacy Browser. If not, see . --> diff --git a/app/src/main/assets/es/about_permissions_dark.html b/app/src/main/assets/es/about_permissions_dark.html index d65ec9f6..20e27a1e 100644 --- a/app/src/main/assets/es/about_permissions_dark.html +++ b/app/src/main/assets/es/about_permissions_dark.html @@ -3,20 +3,20 @@ Translation 2017 Jose A. León Becerra. Copyright assigned to Soren Stoutner . - Este archivo es parte de Navegador Privado (Privacy Browser) . + This file is part of Privacy Browser . - Navegador Privado (Privacy Browser) es software libre: puedes redistribuirlo y/o modificarlo - bajo los términos de la Licencia Pública General GNU, como se ha publicado por - la Fundación del Software Libre, tanto la versión 3 de la Licencia, o - (a su opción) cualquier versión posterior. + Privacy Browser is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - Navegador Privado (Privacy Browser) es distribuído con la esperanza de que será útil, - pero SIN NINGUNA GARANTÍA; ni siquiera la garantía implícita de - MERCANTILIDAD o APTITUD PARA UN PROPÓSITO PARTICULAR. Vea la - Licencia Pública General para más detalles. + Privacy Browser is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - Usted debería haber recibido una copia de la Licencia Pública General GNU - junto con Navegador Privado (Privacy Browser). Si no es así, vea . --> + You should have received a copy of the GNU General Public License + along with Privacy Browser. If not, see . --> diff --git a/app/src/main/assets/es/about_permissions_light.html b/app/src/main/assets/es/about_permissions_light.html index 67a7dfe0..a6734a1d 100644 --- a/app/src/main/assets/es/about_permissions_light.html +++ b/app/src/main/assets/es/about_permissions_light.html @@ -3,21 +3,20 @@ Translation 2017 Jose A. León Becerra. Copyright assigned to Soren Stoutner . - Este archivo es parte de Navegador Privado (Privacy Browser) . + This file is part of Privacy Browser . - Navegador Privado (Privacy Browser) es software libre: puedes redistribuirlo y/o modificarlo - bajo los términos de la Licencia Pública General GNU, como se ha publicado por - la Fundación del Software Libre, tanto la versión 3 de la Licencia, o - (a su opción) cualquier versión posterior. + Privacy Browser is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - Navegador Privado (Privacy Browser) es distribuído con la esperanza de que será útil, - pero SIN NINGUNA GARANTÍA; ni siquiera la garantía implícita de - MERCANTILIDAD o APTITUD PARA UN PROPÓSITO PARTICULAR. Vea la - Licencia Pública General para más detalles. - - Usted debería haber recibido una copia de la Licencia Pública General GNU - junto con Navegador Privado (Privacy Browser). Si no es así, vea . --> + Privacy Browser is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + You should have received a copy of the GNU General Public License + along with Privacy Browser. If not, see . --> diff --git a/app/src/main/assets/es/about_privacy_policy_dark.html b/app/src/main/assets/es/about_privacy_policy_dark.html index 7d7d86f2..d586ff37 100644 --- a/app/src/main/assets/es/about_privacy_policy_dark.html +++ b/app/src/main/assets/es/about_privacy_policy_dark.html @@ -3,20 +3,20 @@ Translation 2017 Jose A. León Becerra. Copyright assigned to Soren Stoutner . - Este archivo es parte de Navegador Privado (Privacy Browser) . + This file is part of Privacy Browser . - Navegador Privado (Privacy Browser) es software libre: puedes redistribuirlo y/o modificarlo - bajo los términos de la Licencia Pública General GNU, como se ha publicado por - la Fundación del Software Libre, tanto la versión 3 de la Licencia, o - (a su opción) cualquier versión posterior. + Privacy Browser is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - Navegador Privado (Privacy Browser) es distribuído con la esperanza de que será útil, - pero SIN NINGUNA GARANTÍA; ni siquiera la garantía implícita de - MERCANTILIDAD o APTITUD PARA UN PROPÓSITO PARTICULAR. Vea la - Licencia Pública General para más detalles. + Privacy Browser is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - Usted debería haber recibido una copia de la Licencia Pública General GNU - junto con Navegador Privado (Privacy Browser). Si no es así, vea . --> + You should have received a copy of the GNU General Public License + along with Privacy Browser. If not, see . --> diff --git a/app/src/main/assets/es/about_privacy_policy_light.html b/app/src/main/assets/es/about_privacy_policy_light.html index 7266fdc0..cf53c36c 100644 --- a/app/src/main/assets/es/about_privacy_policy_light.html +++ b/app/src/main/assets/es/about_privacy_policy_light.html @@ -3,20 +3,20 @@ Translation 2017 Jose A. León Becerra. Copyright assigned to Soren Stoutner . - Este archivo es parte de Navegador Privado (Privacy Browser) . + This file is part of Privacy Browser . - Navegador Privado (Privacy Browser) es software libre: puedes redistribuirlo y/o modificarlo - bajo los términos de la Licencia Pública General GNU, como se ha publicado por - la Fundación del Software Libre, tanto la versión 3 de la Licencia, o - (a su opción) cualquier versión posterior. + Privacy Browser is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - Navegador Privado (Privacy Browser) es distribuído con la esperanza de que será útil, - pero SIN NINGUNA GARANTÍA; ni siquiera la garantía implícita de - MERCANTILIDAD o APTITUD PARA UN PROPÓSITO PARTICULAR. Vea la - Licencia Pública General para más detalles. + Privacy Browser is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - Usted debería haber recibido una copia de la Licencia Pública General GNU - junto con Navegador Privado (Privacy Browser). Si no es así, vea . --> + You should have received a copy of the GNU General Public License + along with Privacy Browser. If not, see . --> diff --git a/app/src/main/assets/es/guide_bookmarks_dark.html b/app/src/main/assets/es/guide_bookmarks_dark.html new file mode 100644 index 00000000..8ffbf6f3 --- /dev/null +++ b/app/src/main/assets/es/guide_bookmarks_dark.html @@ -0,0 +1,40 @@ + + + + + + + + + + +

Bookmarks

+ +

Bookmarks can be accessed in a drawer layout by swiping from the right of the screen.

+ + + +

Tapping the top floating action button loads the bookmarks activity, which has advanced options like moving and deleting bookmarks. + From the bookmarks activity, there is an option to load the bookmarks database view. This shows the bookmarks as they exist in the SQLite database. + This will mostly be useful for troubleshooting problems with importing + and exporting bookmarks once those features are added.

+ + \ No newline at end of file diff --git a/app/src/main/assets/es/guide_bookmarks_light.html b/app/src/main/assets/es/guide_bookmarks_light.html new file mode 100644 index 00000000..40b697b8 --- /dev/null +++ b/app/src/main/assets/es/guide_bookmarks_light.html @@ -0,0 +1,40 @@ + + + + + + + + + + +

Bookmarks

+ +

Bookmarks can be accessed in a drawer layout by swiping from the right of the screen.

+ + + +

Tapping the top floating action button loads the bookmarks activity, which has advanced options like moving and deleting bookmarks. + From the bookmarks activity, there is an option to load the bookmarks database view. This shows the bookmarks as they exist in the SQLite database. + This will mostly be useful for troubleshooting problems with importing + and exporting bookmarks once those features are added.

+ + \ No newline at end of file diff --git a/app/src/main/assets/es/guide_javascript_dark.html b/app/src/main/assets/es/guide_javascript_dark.html index 7da39f45..882345bb 100644 --- a/app/src/main/assets/es/guide_javascript_dark.html +++ b/app/src/main/assets/es/guide_javascript_dark.html @@ -3,20 +3,20 @@ Translation 2017 Jose A. León Becerra. Copyright assigned to Soren Stoutner . - Este archivo es parte de Navegador Privado (Privacy Browser) . + This file is part of Privacy Browser . - Navegador Privado (Privacy Browser) es software libre: puedes redistribuirlo y/o modificarlo - bajo los términos de la Licencia Pública General GNU, como se ha publicado por - la Fundación del Software Libre, tanto la versión 3 de la Licencia, o - (a su opción) cualquier versión posterior. + Privacy Browser is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - Navegador Privado (Privacy Browser) es distribuído con la esperanza de que será útil, - pero SIN NINGUNA GARANTÍA; ni siquiera la garantía implícita de - MERCANTILIDAD o APTITUD PARA UN PROPÓSITO PARTICULAR. Vea la - Licencia Pública General para más detalles. + Privacy Browser is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - Usted debería haber recibido una copia de la Licencia Pública General GNU - junto con Navegador Privado (Privacy Browser). Si no es así, vea . --> + You should have received a copy of the GNU General Public License + along with Privacy Browser. If not, see . --> diff --git a/app/src/main/assets/es/guide_javascript_light.html b/app/src/main/assets/es/guide_javascript_light.html index fccb5776..0c1f02b7 100644 --- a/app/src/main/assets/es/guide_javascript_light.html +++ b/app/src/main/assets/es/guide_javascript_light.html @@ -3,20 +3,20 @@ Translation 2017 Jose A. León Becerra. Copyright assigned to Soren Stoutner . - Este archivo es parte de Navegador Privado (Privacy Browser) . + This file is part of Privacy Browser . - Navegador Privado (Privacy Browser) es software libre: puedes redistribuirlo y/o modificarlo - bajo los términos de la Licencia Pública General GNU, como se ha publicado por - la Fundación del Software Libre, tanto la versión 3 de la Licencia, o - (a su opción) cualquier versión posterior. + Privacy Browser is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - Navegador Privado (Privacy Browser) es distribuído con la esperanza de que será útil, - pero SIN NINGUNA GARANTÍA; ni siquiera la garantía implícita de - MERCANTILIDAD o APTITUD PARA UN PROPÓSITO PARTICULAR. Vea la - Licencia Pública General para más detalles. + Privacy Browser is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - Usted debería haber recibido una copia de la Licencia Pública General GNU - junto con Navegador Privado (Privacy Browser). Si no es así, vea . --> + You should have received a copy of the GNU General Public License + along with Privacy Browser. If not, see . --> diff --git a/app/src/main/assets/es/guide_local_storage_dark.html b/app/src/main/assets/es/guide_local_storage_dark.html index b93a07ef..0e759b50 100644 --- a/app/src/main/assets/es/guide_local_storage_dark.html +++ b/app/src/main/assets/es/guide_local_storage_dark.html @@ -3,20 +3,20 @@ Translation 2017 Jose A. León Becerra. Copyright assigned to Soren Stoutner . - Este archivo es parte de Navegador Privado (Privacy Browser) . + This file is part of Privacy Browser . - Navegador Privado (Privacy Browser) es software libre: puedes redistribuirlo y/o modificarlo - bajo los términos de la Licencia Pública General GNU, como se ha publicado por - la Fundación del Software Libre, tanto la versión 3 de la Licencia, o - (a su opción) cualquier versión posterior. + Privacy Browser is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - Navegador Privado (Privacy Browser) es distribuído con la esperanza de que será útil, - pero SIN NINGUNA GARANTÍA; ni siquiera la garantía implícita de - MERCANTILIDAD o APTITUD PARA UN PROPÓSITO PARTICULAR. Vea la - Licencia Pública General para más detalles. + Privacy Browser is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - Usted debería haber recibido una copia de la Licencia Pública General GNU - junto con Navegador Privado (Privacy Browser). Si no es así, vea . --> + You should have received a copy of the GNU General Public License + along with Privacy Browser. If not, see . --> diff --git a/app/src/main/assets/es/guide_local_storage_light.html b/app/src/main/assets/es/guide_local_storage_light.html index 07077eb8..9bdf2749 100644 --- a/app/src/main/assets/es/guide_local_storage_light.html +++ b/app/src/main/assets/es/guide_local_storage_light.html @@ -3,20 +3,20 @@ Translation 2017 Jose A. León Becerra. Copyright assigned to Soren Stoutner . - Este archivo es parte de Navegador Privado (Privacy Browser) . + This file is part of Privacy Browser . - Navegador Privado (Privacy Browser) es software libre: puedes redistribuirlo y/o modificarlo - bajo los términos de la Licencia Pública General GNU, como se ha publicado por - la Fundación del Software Libre, tanto la versión 3 de la Licencia, o - (a su opción) cualquier versión posterior. + Privacy Browser is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - Navegador Privado (Privacy Browser) es distribuído con la esperanza de que será útil, - pero SIN NINGUNA GARANTÍA; ni siquiera la garantía implícita de - MERCANTILIDAD o APTITUD PARA UN PROPÓSITO PARTICULAR. Vea la - Licencia Pública General para más detalles. + Privacy Browser is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - Usted debería haber recibido una copia de la Licencia Pública General GNU - junto con Navegador Privado (Privacy Browser). Si no es así, vea . --> + You should have received a copy of the GNU General Public License + along with Privacy Browser. If not, see . --> diff --git a/app/src/main/assets/es/guide_overview_dark.html b/app/src/main/assets/es/guide_overview_dark.html index 312f4cc8..10e059a5 100644 --- a/app/src/main/assets/es/guide_overview_dark.html +++ b/app/src/main/assets/es/guide_overview_dark.html @@ -3,20 +3,20 @@ Translation 2017 Jose A. León Becerra. Copyright assigned to Soren Stoutner . - Este archivo es parte de Navegador Privado (Privacy Browser) . + This file is part of Privacy Browser . - Navegador Privado (Privacy Browser) es software libre: puedes redistribuirlo y/o modificarlo - bajo los términos de la Licencia Pública General GNU, como se ha publicado por - la Fundación del Software Libre, tanto la versión 3 de la Licencia, o - (a su opción) cualquier versión posterior. + Privacy Browser is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - Navegador Privado (Privacy Browser) es distribuído con la esperanza de que será útil, - pero SIN NINGUNA GARANTÍA; ni siquiera la garantía implícita de - MERCANTILIDAD o APTITUD PARA UN PROPÓSITO PARTICULAR. Vea la - Licencia Pública General para más detalles. + Privacy Browser is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - Usted debería haber recibido una copia de la Licencia Pública General GNU - junto con Navegador Privado (Privacy Browser). Si no es así, vea . --> + You should have received a copy of the GNU General Public License + along with Privacy Browser. If not, see . --> diff --git a/app/src/main/assets/es/guide_overview_light.html b/app/src/main/assets/es/guide_overview_light.html index c84cae28..a2f918b3 100644 --- a/app/src/main/assets/es/guide_overview_light.html +++ b/app/src/main/assets/es/guide_overview_light.html @@ -3,20 +3,20 @@ Translation 2017 Jose A. León Becerra. Copyright assigned to Soren Stoutner . - Este archivo es parte de Navegador Privado (Privacy Browser) . + This file is part of Privacy Browser . - Navegador Privado (Privacy Browser) es software libre: puedes redistribuirlo y/o modificarlo - bajo los términos de la Licencia Pública General GNU, como se ha publicado por - la Fundación del Software Libre, tanto la versión 3 de la Licencia, o - (a su opción) cualquier versión posterior. + Privacy Browser is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - Navegador Privado (Privacy Browser) es distribuído con la esperanza de que será útil, - pero SIN NINGUNA GARANTÍA; ni siquiera la garantía implícita de - MERCANTILIDAD o APTITUD PARA UN PROPÓSITO PARTICULAR. Vea la - Licencia Pública General para más detalles. + Privacy Browser is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - Usted debería haber recibido una copia de la Licencia Pública General GNU - junto con Navegador Privado (Privacy Browser). Si no es así, vea . --> + You should have received a copy of the GNU General Public License + along with Privacy Browser. If not, see . --> diff --git a/app/src/main/assets/es/guide_tor_dark.html b/app/src/main/assets/es/guide_tor_dark.html index 028d0141..2f1164e0 100644 --- a/app/src/main/assets/es/guide_tor_dark.html +++ b/app/src/main/assets/es/guide_tor_dark.html @@ -3,20 +3,20 @@ Translation 2017 Jose A. León Becerra. Copyright assigned to Soren Stoutner . - Este archivo es parte de Navegador Privado (Privacy Browser) . + This file is part of Privacy Browser . - Navegador Privado (Privacy Browser) es software libre: puedes redistribuirlo y/o modificarlo - bajo los términos de la Licencia Pública General GNU, como se ha publicado por - la Fundación del Software Libre, tanto la versión 3 de la Licencia, o - (a su opción) cualquier versión posterior. + Privacy Browser is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - Navegador Privado (Privacy Browser) es distribuído con la esperanza de que será útil, - pero SIN NINGUNA GARANTÍA; ni siquiera la garantía implícita de - MERCANTILIDAD o APTITUD PARA UN PROPÓSITO PARTICULAR. Vea la - Licencia Pública General para más detalles. + Privacy Browser is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - Usted debería haber recibido una copia de la Licencia Pública General GNU - junto con Navegador Privado (Privacy Browser). Si no es así, vea . --> + You should have received a copy of the GNU General Public License + along with Privacy Browser. If not, see . --> diff --git a/app/src/main/assets/es/guide_tor_light.html b/app/src/main/assets/es/guide_tor_light.html index 0a13c981..6691e9a0 100644 --- a/app/src/main/assets/es/guide_tor_light.html +++ b/app/src/main/assets/es/guide_tor_light.html @@ -3,20 +3,20 @@ Translation 2017 Jose A. León Becerra. Copyright assigned to Soren Stoutner . - Este archivo es parte de Navegador Privado (Privacy Browser) . + This file is part of Privacy Browser . - Navegador Privado (Privacy Browser) es software libre: puedes redistribuirlo y/o modificarlo - bajo los términos de la Licencia Pública General GNU, como se ha publicado por - la Fundación del Software Libre, tanto la versión 3 de la Licencia, o - (a su opción) cualquier versión posterior. + Privacy Browser is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - Navegador Privado (Privacy Browser) es distribuído con la esperanza de que será útil, - pero SIN NINGUNA GARANTÍA; ni siquiera la garantía implícita de - MERCANTILIDAD o APTITUD PARA UN PROPÓSITO PARTICULAR. Vea la - Licencia Pública General para más detalles. + Privacy Browser is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - Usted debería haber recibido una copia de la Licencia Pública General GNU - junto con Navegador Privado (Privacy Browser). Si no es así, vea . --> + You should have received a copy of the GNU General Public License + along with Privacy Browser. If not, see . --> diff --git a/app/src/main/assets/es/guide_tracking_ids_dark.html b/app/src/main/assets/es/guide_tracking_ids_dark.html index 262fffc6..b6b53893 100644 --- a/app/src/main/assets/es/guide_tracking_ids_dark.html +++ b/app/src/main/assets/es/guide_tracking_ids_dark.html @@ -3,20 +3,20 @@ Translation 2017 Jose A. León Becerra. Copyright assigned to Soren Stoutner . - Este archivo es parte de Navegador Privado (Privacy Browser) . + This file is part of Privacy Browser . - Navegador Privado (Privacy Browser) es software libre: puedes redistribuirlo y/o modificarlo - bajo los términos de la Licencia Pública General GNU, como se ha publicado por - la Fundación del Software Libre, tanto la versión 3 de la Licencia, o - (a su opción) cualquier versión posterior. + Privacy Browser is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - Navegador Privado (Privacy Browser) es distribuído con la esperanza de que será útil, - pero SIN NINGUNA GARANTÍA; ni siquiera la garantía implícita de - MERCANTILIDAD o APTITUD PARA UN PROPÓSITO PARTICULAR. Vea la - Licencia Pública General para más detalles. + Privacy Browser is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - Usted debería haber recibido una copia de la Licencia Pública General GNU - junto con Navegador Privado (Privacy Browser). Si no es así, vea . --> + You should have received a copy of the GNU General Public License + along with Privacy Browser. If not, see . --> diff --git a/app/src/main/assets/es/guide_tracking_ids_light.html b/app/src/main/assets/es/guide_tracking_ids_light.html index cad070ab..f9665fe4 100644 --- a/app/src/main/assets/es/guide_tracking_ids_light.html +++ b/app/src/main/assets/es/guide_tracking_ids_light.html @@ -3,20 +3,20 @@ Translation 2017 Jose A. León Becerra. Copyright assigned to Soren Stoutner . - Este archivo es parte de Navegador Privado (Privacy Browser) . + This file is part of Privacy Browser . - Navegador Privado (Privacy Browser) es software libre: puedes redistribuirlo y/o modificarlo - bajo los términos de la Licencia Pública General GNU, como se ha publicado por - la Fundación del Software Libre, tanto la versión 3 de la Licencia, o - (a su opción) cualquier versión posterior. + Privacy Browser is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - Navegador Privado (Privacy Browser) es distribuído con la esperanza de que será útil, - pero SIN NINGUNA GARANTÍA; ni siquiera la garantía implícita de - MERCANTILIDAD o APTITUD PARA UN PROPÓSITO PARTICULAR. Vea la - Licencia Pública General para más detalles. + Privacy Browser is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - Usted debería haber recibido una copia de la Licencia Pública General GNU - junto con Navegador Privado (Privacy Browser). Si no es así, vea . --> + You should have received a copy of the GNU General Public License + along with Privacy Browser. If not, see . --> diff --git a/app/src/main/assets/es/guide_user_agent_dark.html b/app/src/main/assets/es/guide_user_agent_dark.html index f634429c..dd4ccc2d 100644 --- a/app/src/main/assets/es/guide_user_agent_dark.html +++ b/app/src/main/assets/es/guide_user_agent_dark.html @@ -3,20 +3,20 @@ Translation 2017 Jose A. León Becerra. Copyright assigned to Soren Stoutner . - Este archivo es parte de Navegador Privado (Privacy Browser) . + This file is part of Privacy Browser . - Navegador Privado (Privacy Browser) es software libre: puedes redistribuirlo y/o modificarlo - bajo los términos de la Licencia Pública General GNU, como se ha publicado por - la Fundación del Software Libre, tanto la versión 3 de la Licencia, o - (a su opción) cualquier versión posterior. + Privacy Browser is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - Navegador Privado (Privacy Browser) es distribuído con la esperanza de que será útil, - pero SIN NINGUNA GARANTÍA; ni siquiera la garantía implícita de - MERCANTILIDAD o APTITUD PARA UN PROPÓSITO PARTICULAR. Vea la - Licencia Pública General para más detalles. + Privacy Browser is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - Usted debería haber recibido una copia de la Licencia Pública General GNU - junto con Navegador Privado (Privacy Browser). Si no es así, vea . --> + You should have received a copy of the GNU General Public License + along with Privacy Browser. If not, see . --> diff --git a/app/src/main/assets/es/guide_user_agent_light.html b/app/src/main/assets/es/guide_user_agent_light.html index 8f7a2e52..f041ea86 100644 --- a/app/src/main/assets/es/guide_user_agent_light.html +++ b/app/src/main/assets/es/guide_user_agent_light.html @@ -3,20 +3,20 @@ Translation 2017 Jose A. León Becerra. Copyright assigned to Soren Stoutner . - Este archivo es parte de Navegador Privado (Privacy Browser) . + This file is part of Privacy Browser . - Navegador Privado (Privacy Browser) es software libre: puedes redistribuirlo y/o modificarlo - bajo los términos de la Licencia Pública General GNU, como se ha publicado por - la Fundación del Software Libre, tanto la versión 3 de la Licencia, o - (a su opción) cualquier versión posterior. + Privacy Browser is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - Navegador Privado (Privacy Browser) es distribuído con la esperanza de que será útil, - pero SIN NINGUNA GARANTÍA; ni siquiera la garantía implícita de - MERCANTILIDAD o APTITUD PARA UN PROPÓSITO PARTICULAR. Vea la - Licencia Pública General para más detalles. + Privacy Browser is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - Usted debería haber recibido una copia de la Licencia Pública General GNU - junto con Navegador Privado (Privacy Browser). Si no es así, vea . --> + You should have received a copy of the GNU General Public License + along with Privacy Browser. If not, see . --> diff --git a/app/src/main/assets/es/images/bookmarks.png b/app/src/main/assets/es/images/bookmarks.png new file mode 100644 index 00000000..38a5c594 Binary files /dev/null and b/app/src/main/assets/es/images/bookmarks.png differ diff --git a/app/src/main/assets/it/guide_bookmarks_dark.html b/app/src/main/assets/it/guide_bookmarks_dark.html new file mode 100644 index 00000000..8c18b53a --- /dev/null +++ b/app/src/main/assets/it/guide_bookmarks_dark.html @@ -0,0 +1,40 @@ + + + + + + + + + + +

Bookmarks

+ +

Bookmarks can be accessed in a drawer layout by swiping from the right of the screen.

+ + + +

Tapping the top floating action button loads the bookmarks activity, which has advanced options like moving and deleting bookmarks. + From the bookmarks activity, there is an option to load the bookmarks database view. This shows the bookmarks as they exist in the SQLite database. + This will mostly be useful for troubleshooting problems with importing + and exporting bookmarks once those features are added.

+ + \ No newline at end of file diff --git a/app/src/main/assets/it/guide_bookmarks_light.html b/app/src/main/assets/it/guide_bookmarks_light.html new file mode 100644 index 00000000..8936f775 --- /dev/null +++ b/app/src/main/assets/it/guide_bookmarks_light.html @@ -0,0 +1,40 @@ + + + + + + + + + + +

Bookmarks

+ +

Bookmarks can be accessed in a drawer layout by swiping from the right of the screen.

+ + + +

Tapping the top floating action button loads the bookmarks activity, which has advanced options like moving and deleting bookmarks. + From the bookmarks activity, there is an option to load the bookmarks database view. This shows the bookmarks as they exist in the SQLite database. + This will mostly be useful for troubleshooting problems with importing + and exporting bookmarks once those features are added.

+ + \ No newline at end of file diff --git a/app/src/main/assets/it/images/bookmarks.png b/app/src/main/assets/it/images/bookmarks.png new file mode 100644 index 00000000..67f0d01e Binary files /dev/null and b/app/src/main/assets/it/images/bookmarks.png differ diff --git a/app/src/main/assets/ru/guide_bookmarks_dark.html b/app/src/main/assets/ru/guide_bookmarks_dark.html new file mode 100644 index 00000000..1fe8f8ef --- /dev/null +++ b/app/src/main/assets/ru/guide_bookmarks_dark.html @@ -0,0 +1,38 @@ + + + + + + + + + + +

Bookmarks

+ +

Bookmarks can be accessed in a drawer layout by swiping from the right of the screen.

+ + + +

Tapping the top floating action button loads the bookmarks activity, which has advanced options like moving and deleting bookmarks. + From the bookmarks activity, there is an option to load the bookmarks database view. This shows the bookmarks as they exist in the SQLite database. + This will mostly be useful for troubleshooting problems with importing + and exporting bookmarks once those features are added.

+ + \ No newline at end of file diff --git a/app/src/main/assets/ru/guide_bookmarks_light.html b/app/src/main/assets/ru/guide_bookmarks_light.html new file mode 100644 index 00000000..d47ee662 --- /dev/null +++ b/app/src/main/assets/ru/guide_bookmarks_light.html @@ -0,0 +1,38 @@ + + + + + + + + + + +

Bookmarks

+ +

Bookmarks can be accessed in a drawer layout by swiping from the right of the screen.

+ + + +

Tapping the top floating action button loads the bookmarks activity, which has advanced options like moving and deleting bookmarks. + From the bookmarks activity, there is an option to load the bookmarks database view. This shows the bookmarks as they exist in the SQLite database. + This will mostly be useful for troubleshooting problems with importing + and exporting bookmarks once those features are added.

+ + \ No newline at end of file diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/GuideActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/GuideActivity.java index a419ff91..3e45bedc 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/GuideActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/GuideActivity.java @@ -76,7 +76,7 @@ public class GuideActivity extends AppCompatActivity { @Override // Get the count of the number of tabs. public int getCount() { - return 8; + return 9; } @Override @@ -107,6 +107,9 @@ public class GuideActivity extends AppCompatActivity { case 7: return getString(R.string.tracking_ids); + case 8: + return getString(R.string.bookmarks); + default: return ""; } @@ -118,5 +121,4 @@ public class GuideActivity extends AppCompatActivity { return GuideTabFragment.createTab(tab); } } - } diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/GuideTabFragment.java b/app/src/main/java/com/stoutner/privacybrowser/fragments/GuideTabFragment.java index a89ced02..96cdb3b7 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/fragments/GuideTabFragment.java +++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/GuideTabFragment.java @@ -1,5 +1,5 @@ /* - * Copyright © 2016-2017 Soren Stoutner . + * Copyright © 2016-2018 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -21,6 +21,7 @@ package com.stoutner.privacybrowser.fragments; import android.annotation.SuppressLint; import android.os.Bundle; +import android.support.annotation.NonNull; import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; @@ -55,13 +56,16 @@ public class GuideTabFragment extends Fragment { // Run the default commands. super.onCreate(savedInstanceState); + // Remove the lint warning that `getArguments()` might be null. + assert getArguments() != null; + // Store the tab number in a class variable. tabNumber = getArguments().getInt("Tab"); } @SuppressLint("SetJavaScriptEnabled") @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { // Setting false at the end of inflater.inflate does not attach the inflated layout as a child of container. The fragment will take care of attaching the root automatically. View tabLayout = inflater.inflate(R.layout.bare_webview, container, false); @@ -107,6 +111,10 @@ public class GuideTabFragment extends Fragment { case 7: tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/guide_tracking_ids_dark.html"); break; + + case 8: + tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/guide_bookmarks_dark.html"); + break; } } else { // The light theme is applied. // Tab numbers start at 0. @@ -142,10 +150,13 @@ public class GuideTabFragment extends Fragment { case 7: tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/guide_tracking_ids_light.html"); break; + + case 8: + tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/guide_bookmarks_light.html"); } } // Return the formatted `tabLayout`. return tabLayout; } -} +} \ No newline at end of file diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index af6d44dc..b9cb3046 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -3,22 +3,22 @@ + You should have received a copy of the GNU General Public License + along with Privacy Browser. If not, see . --> diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 38108f07..685254bf 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -3,7 +3,7 @@ + You should have received a copy of the GNU General Public License + along with Privacy Browser. If not, see . --> Privacy Browser Настройки Privacy Browser - + ru --> Режим приватности