Skip to content

Commit

Permalink
make gdpr translatable, update translations
Browse files Browse the repository at this point in the history
  • Loading branch information
r10s committed Jan 28, 2019
1 parent 9310652 commit bb65862
Show file tree
Hide file tree
Showing 103 changed files with 1,999 additions and 281 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
_site/
.sass-cache/
.jekyll-metadata
.*.swp

# ignore private scripts and directories, eg. jekyll-build-local.prv.sh
*.prv*
Expand Down
15 changes: 14 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ Testing changes
and execute `jekyll serve --destination <path-to-build-dir>`
in the source directory.


Directory structure
--------------------------------------------------------------------------------

Expand All @@ -60,6 +61,7 @@ Directory structure

- `/assets/css` - CSS and layout specific images and files here.


Translate the website
--------------------------------------------------------------------------------

Expand All @@ -82,6 +84,16 @@ To **add a new language**, the followinging steps are required once:
- check the language selection in `/index.html`
and in `/_includes/footer-languages.html`.

To **add a new page**:

- create the source as `en/<name>.md`

- modify `tools/.tx/config` as needed
and create dir `translations/delta-chat-pages.<name>po/`

- run `cd tools; ./t-dance push`


Further Hints
--------------------------------------------------------------------------------

Expand All @@ -107,9 +119,10 @@ Further Hints

- Finally: Have fun :-)


License
--------------------------------------------------------------------------------

Licensed under the GPLv3, see LICENSE file for details.

Copyright © 2017, 2018 Delta Chat contributors
Copyright © 2017-2019 Delta Chat contributors
2 changes: 1 addition & 1 deletion ca/blog.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-01-27 01:15+0200\n"
"POT-Creation-Date: 2019-01-28 00:32+0200\n"
"PO-Revision-Date: 2018-03-23 12:38+0000\n"
"Last-Translator: Calbasi <joan@calbasi.net>, 2018\n"
"Language-Team: Catalan (https://www.transifex.com/delta-chat/teams/76181/ca/)\n"
Expand Down
2 changes: 1 addition & 1 deletion ca/contribute.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-01-27 01:15+0200\n"
"POT-Creation-Date: 2019-01-28 00:32+0200\n"
"PO-Revision-Date: 2018-03-23 12:39+0000\n"
"Last-Translator: Calbasi <joan@calbasi.net>, 2018\n"
"Language-Team: Catalan (https://www.transifex.com/delta-chat/teams/76181/ca/)\n"
Expand Down
2 changes: 1 addition & 1 deletion ca/download.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-01-27 01:15+0200\n"
"POT-Creation-Date: 2019-01-28 00:32+0200\n"
"PO-Revision-Date: 2018-03-23 12:39+0000\n"
"Last-Translator: Calbasi <joan@calbasi.net>, 2018\n"
"Language-Team: Catalan (https://www.transifex.com/delta-chat/teams/76181/ca/)\n"
Expand Down
45 changes: 44 additions & 1 deletion ca/gdpr.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,47 @@ title: GDPR
layout: default-ca
---

{% include gdpr-international.md %}


<!-- GENERATED FILE -- DO NOT EDIT -->



# Privacy by Design

- **Confidentiality**: End-to-end encryption by default, by implementing [Autocrypt
Level 1](https://autocrypt.org).

- **Data minimization**: No alignment or uploading of the address-book content.

- **Data avoidance**: No Delta Chat server, no processing of personal data.


# Further Compliance to the GDPR

- Does not require any **consent** (article 7 GDPR) from the users or their contacts (data subjects), because no address-book-data is transmitted.

- Can be used **without requiring a contract or instructions** from any controller (organisation), because no additional third party will process the E-Mail related personal data.

# How data controllers (organizations) benefit from using Delta Chat in complying to the GDPR

- Creates **no additional information requirements** for the controller towards direct or indirect data subjects
regarding any collection of address-book-data, article 13, 14 GDPR.

- Needs **no data protection impact assessment** to be carry out for Delta Chat (Article 35 GDPR), because it processes no particular additional data beyond E-Mail messenging.

- Adding Delta Chat's privacy measures to the
**record of processing activities** can have a positive impact
on eventual **evidence documentation**, (article 30 GDPR)
as well as on the **data protection certification process**, Article 25 (3), 42 GDPR.

- The **record of processing activities** linked to the messenger-communication is
reduced to identifying the email-providers and recording their activities, Article 30 (2) GDPR.

- Remaining risks to the rights and freedoms of natural persons
are generally also limited to the communication data processed
by the controller and the email providers.


This statement reflects the General Data Protection Regulation (GDPR) as of 16.05.2018.

114 changes: 114 additions & 0 deletions ca/gdpr.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
# Translators:
# Björn Petersen <r10s@b44t.com>, 2019
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-01-28 00:32+0200\n"
"PO-Revision-Date: 2019-01-27 23:24+0000\n"
"Last-Translator: Björn Petersen <r10s@b44t.com>, 2019\n"
"Language-Team: Catalan (https://www.transifex.com/delta-chat/teams/76181/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Translate Toolkit 2.2.5\n"

#: ../en/gdpr.md:5
msgid ""
"---\n"
"title: GDPR and Privacy\n"
"layout: default-en\n"
"---"
msgstr ""
"---\n"
"title: GDPR\n"
"layout: default-ca\n"
"---"

#: ../en/gdpr.md:7
msgid "# Privacy by Design"
msgstr ""

#: ../en/gdpr.md:10
msgid ""
"- **Confidentiality**: End-to-end encryption by default, by implementing [Autocrypt\n"
" Level 1](https://autocrypt.org)."
msgstr ""

#: ../en/gdpr.md:12
msgid ""
"- **Data minimization**: No alignment or uploading of the address-book "
"content."
msgstr ""

#: ../en/gdpr.md:14
msgid ""
"- **Data avoidance**: No Delta Chat server, no processing of personal data."
msgstr ""

#: ../en/gdpr.md:17
msgid "# Further Compliance to the GDPR "
msgstr ""

#: ../en/gdpr.md:19
msgid ""
"- Does not require any **consent** (article 7 GDPR) from the users or their "
"contacts (data subjects), because no address-book-data is transmitted."
msgstr ""

#: ../en/gdpr.md:21
msgid ""
"- Can be used **without requiring a contract or instructions** from any "
"controller (organisation), because no additional third party will process "
"the E-Mail related personal data. "
msgstr ""

#: ../en/gdpr.md:23
msgid ""
"# How data controllers (organizations) benefit from using Delta Chat in "
"complying to the GDPR"
msgstr ""

#: ../en/gdpr.md:26
msgid ""
"- Creates **no additional information requirements** for the controller towards direct or indirect data subjects \n"
" regarding any collection of address-book-data, article 13, 14 GDPR."
msgstr ""

#: ../en/gdpr.md:28
msgid ""
"- Needs **no data protection impact assessment** to be carry out for Delta "
"Chat (Article 35 GDPR), because it processes no particular additional data "
"beyond E-Mail messenging."
msgstr ""

#: ../en/gdpr.md:33
msgid ""
"- Adding Delta Chat's privacy measures to the \n"
" **record of processing activities** can have a positive impact \n"
" on eventual **evidence documentation**, (article 30 GDPR) \n"
" as well as on the **data protection certification process**, Article 25 (3), 42 GDPR."
msgstr ""

#: ../en/gdpr.md:36
msgid ""
"- The **record of processing activities** linked to the messenger-communication is\n"
" reduced to identifying the email-providers and recording their activities, Article 30 (2) GDPR."
msgstr ""

#: ../en/gdpr.md:40
msgid ""
"- Remaining risks to the rights and freedoms of natural persons \n"
" are generally also limited to the communication data processed \n"
" by the controller and the email providers."
msgstr ""

#: ../en/gdpr.md:43
msgid ""
"This statement reflects the General Data Protection Regulation (GDPR) as of "
"16.05.2018."
msgstr ""
2 changes: 1 addition & 1 deletion ca/help.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-01-27 01:15+0200\n"
"POT-Creation-Date: 2019-01-28 00:32+0200\n"
"PO-Revision-Date: 2018-03-23 12:39+0000\n"
"Last-Translator: Calbasi <joan@calbasi.net>, 2018\n"
"Language-Team: Catalan (https://www.transifex.com/delta-chat/teams/76181/ca/)\n"
Expand Down
2 changes: 1 addition & 1 deletion ca/imprint.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-01-27 01:15+0200\n"
"POT-Creation-Date: 2019-01-28 00:32+0200\n"
"PO-Revision-Date: 2018-03-23 12:40+0000\n"
"Last-Translator: Calbasi <joan@calbasi.net>, 2018\n"
"Language-Team: Catalan (https://www.transifex.com/delta-chat/teams/76181/ca/)\n"
Expand Down
2 changes: 1 addition & 1 deletion ca/index.po
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-01-27 01:15+0200\n"
"POT-Creation-Date: 2019-01-28 00:32+0200\n"
"PO-Revision-Date: 2018-03-23 12:35+0000\n"
"Last-Translator: Björn Petersen <r10s@b44t.com>, 2018\n"
"Language-Team: Catalan (https://www.transifex.com/delta-chat/teams/76181/ca/)\n"
Expand Down
2 changes: 1 addition & 1 deletion ca/references.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-01-27 01:15+0200\n"
"POT-Creation-Date: 2019-01-28 00:32+0200\n"
"PO-Revision-Date: 2018-04-21 22:06+0000\n"
"Last-Translator: Calbasi <joan@calbasi.net>, 2018\n"
"Language-Team: Catalan (https://www.transifex.com/delta-chat/teams/76181/ca/)\n"
Expand Down
2 changes: 1 addition & 1 deletion de/blog.po
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-01-27 01:15+0200\n"
"POT-Creation-Date: 2019-01-28 00:32+0200\n"
"PO-Revision-Date: 2018-03-23 12:38+0000\n"
"Last-Translator: Björn Petersen <r10s@b44t.com>, 2018\n"
"Language-Team: German (https://www.transifex.com/delta-chat/teams/76181/de/)\n"
Expand Down
2 changes: 1 addition & 1 deletion de/contribute.po
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-01-27 01:15+0200\n"
"POT-Creation-Date: 2019-01-28 00:32+0200\n"
"PO-Revision-Date: 2018-03-23 12:39+0000\n"
"Last-Translator: Björn Petersen <r10s@b44t.com>, 2018\n"
"Language-Team: German (https://www.transifex.com/delta-chat/teams/76181/de/)\n"
Expand Down
2 changes: 1 addition & 1 deletion de/download.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ layout: default-de
<img src="../assets/home/get-it-on-gplay.png" alt="Get it on Google Play" width="200" style="float:right; filter: opacity(.3) grayscale(100%);" />
[<img style="float:right" src="../assets/home/get-it-on-fdroid.png" alt="Get it on F-Droid" width="200" />](https://f-droid.org/app/com.b44t.messenger)

Delta/Android is the most feature-rich and stable DeltaChat app.
Delta/Android ist die funktionsreichste und stabilste Delta Chat App.

* [Download from F-Droid](https://f-droid.org/app/com.b44t.messenger)
* [Download APK](https://github.com/deltachat/deltachat-android/releases) (experienced users only)
Expand Down
7 changes: 4 additions & 3 deletions de/download.po
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
# Translators:
# Björn Petersen <r10s@b44t.com>, 2018
# violoncello.ch, 2019
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-01-27 01:15+0200\n"
"POT-Creation-Date: 2019-01-28 00:32+0200\n"
"PO-Revision-Date: 2018-03-23 12:39+0000\n"
"Last-Translator: Björn Petersen <r10s@b44t.com>, 2018\n"
"Last-Translator: violoncello.ch, 2019\n"
"Language-Team: German (https://www.transifex.com/delta-chat/teams/76181/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -43,7 +44,7 @@ msgstr ""

#: ../en/download.md:12
msgid "Delta/Android is the most feature-rich and stable DeltaChat app. "
msgstr ""
msgstr "Delta/Android ist die funktionsreichste und stabilste Delta Chat App."

#: ../en/download.md:16
msgid ""
Expand Down
Loading

0 comments on commit bb65862

Please sign in to comment.