Commit Graph

972 Commits (6d2b3dfb87e5faf766bec9e4ef81833f60a244b3)

Author SHA1 Message Date
harald 16dfca5407 Upload files to 'site/content'
Norwegian bokmål (NB) translation of PMPC
2017-10-16 19:47:25 +02:00
harald e97a33754b Upload files to 'site/languages'
Norwegian bokmål (NB) translation of PMPC
2017-10-16 19:46:24 +02:00
harald 5b058d7e3b Upload files to 'site/static/video-subs/webvtt'
Norwegian bokmål (NB) translation of PMPC
2017-10-16 19:45:20 +02:00
harald e10ecd956b Upload files to 'site/static/video-subs/srt'
Norwegian bokmål (NB) translation of PMPC
2017-10-16 19:44:40 +02:00
erik.ds c7455f5fc1 Add Allmend and saregune 2017-10-12 19:09:08 +02:00
erik.ds d787614772 Add Allmend and saregune 2017-10-12 19:05:41 +02:00
carmenbianca 1165230a1e Merge branch 'master' of dig-ark/website-PT into master 2017-10-08 21:41:11 +02:00
drsspam 73b78e9679 fixed a mistake 2017-10-08 20:26:46 +01:00
Carmen Bianca Bakker 4222860e86
Merge remote-tracking branch 'upstream/master' 2017-10-06 21:34:21 +02:00
Carmen Bianca Bakker db26be797f
typo 2017-10-06 21:33:50 +02:00
erik.ds 352617df6f Add ASL (Br), FAImaison, Tor Project 2017-10-06 18:51:14 +02:00
erik.ds 92e18c9474 Add ASL (Br), FAImaison, Tor Project 2017-10-06 18:50:57 +02:00
Carmen Bianca Bakker 8d9ca4af9a
Merge branch 'trans-it' 2017-10-06 10:42:15 +02:00
Carmen Bianca Bakker 9c6577e113
Tiny fixes 2017-10-06 10:41:51 +02:00
Carmen Bianca Bakker 76bf8a2c2b
Fix suggested by @taringamberini 2017-10-06 10:40:33 +02:00
Sebastiano Pistore 2f9a1afa4e Merge branch 'master' of https://git.fsfe.org/pmpc/website
# Conflicts solved:
#	site/build/build.sh
#	site/content/privacy.sv.md
#	site/languages/strings.sv.toml
#	site/layouts/partials/functions/video_fsfe.html
2017-10-05 20:00:38 +02:00
tomnor d9f8f02d91 pmpc_sv.srt: add "egna" to match original better 2017-10-05 19:15:58 +02:00
Florian Snow 5a2cf6a039 Keep campaign name in English in translations 2017-10-05 14:58:59 +02:00
Florian Snow 201819377b Add new subtitle tracks to HTML 2017-10-05 14:57:18 +02:00
Carmen Bianca Bakker 4eac54d4ed
Merge branch 'Danish' 2017-10-05 11:36:55 +02:00
Carmen Bianca Bakker 3552c9928d
Small fixes for Danish 2017-10-05 11:35:56 +02:00
Carmen Bianca Bakker f9eefb4e3e
Merge branch 'trans-pt' 2017-10-05 11:29:01 +02:00
Joni Silva 45323db362 Algumas alterações minimas mas importantes em quatro ficheiros. 2017-10-03 16:13:02 +00:00
Carmen Bianca Bakker 7cb0a06ea9
Merge branch 'trans-eo' 2017-10-03 15:14:21 +02:00
Carmen Bianca Bakker bca13c428b
Kiu gvatas la gvatistojn?
Proofread the proofreading
2017-10-03 15:07:50 +02:00
Carmen Bianca Bakker 4534d814b8
oops 2017-10-03 12:40:44 +02:00
Carmen Bianca Bakker fedf1cced6
Proofread strings.eo.toml 2017-10-03 12:37:21 +02:00
Tirifto 753858a58b Finished translation of strings.eo.toml 2017-10-03 11:06:17 +02:00
Mikkel Kirkgaard Nielsen e1e245655e
Uncapitalize "fri og open source software"
As per wordlist.da and discussion in #179.
2017-10-02 02:23:34 +02:00
Mikkel Kirkgaard Nielsen 558453f622 Merge branch 'master' of https://git.fsfe.org/pmpc/website into Danish 2017-10-02 01:40:45 +02:00
carmenbianca 93df0cce58 Merge branch 'privacy-rev' of carmenbianca/website into trans-eo 2017-09-30 14:43:33 +02:00
Carmen Bianca Bakker cb1cfaeeff
poliso → politiko 2017-09-30 14:42:54 +02:00
carmenbianca b03d44a435 Merge branch 'srt-rev' of carmenbianca/website into trans-eo 2017-09-30 14:40:01 +02:00
Carmen Bianca Bakker 773dcba1b4
compiled webvtt 2017-09-30 14:37:44 +02:00
Carmen Bianca Bakker 1b33478f20
Corrected corrections 2017-09-30 14:35:09 +02:00
Carmen Bianca Bakker 2e9cdfa310
Merge branch 'sv-subs' 2017-09-30 14:21:41 +02:00
Carmen Bianca Bakker 1a5c194318
add swedish webvtt 2017-09-30 14:20:38 +02:00
carmenbianca 0fffd06340 Merge branch 'sv-update' of tomnor/website-SE into master 2017-09-30 14:05:23 +02:00
Carmen Bianca Bakker 524dd20e70
Merge branch 'trans-hu' 2017-09-30 14:02:13 +02:00
Carmen Bianca Bakker 61e9c20552
Added Hungarian to build.sh 2017-09-30 14:01:26 +02:00
tomnor d7b87439fe [SV] hemsida -> webbsida (proof read) 2017-09-30 00:03:45 +02:00
tomnor e054e2f551 pmpc_sv.srt: proof read 2017-09-29 23:52:21 +02:00
tomnor 52a746a6eb pmpc_sv.srt: citation marks, capitalize and word change 2017-09-29 22:04:04 +02:00
tomnor bb99fa6a00 Merge branch 'master' into sv-subs 2017-09-29 21:39:57 +02:00
tomnor 6ddfe0519d pmpc_sv.srt: typo and utebasket --> gatubasket 2017-09-29 21:36:52 +02:00
Sebastiano Pistore 7d695ef042 update to latest version 2017-09-29 17:31:05 +02:00
Gergely Székely c3975ff261 Translating the yaml files 2017-09-28 19:41:41 +02:00
Carmen Bianca Bakker 34a9afba7b
kunhavigon → kunhavigadon 2017-09-28 17:29:06 +02:00
Carmen Bianca Bakker 2a104571a6
Proofread subtitles
TODO: Compile vtt from corrections
2017-09-28 17:08:39 +02:00
Carmen Bianca Bakker 8f89e2799f
Proofread privacy.eo.md 2017-09-28 16:37:11 +02:00
carmenbianca 838e4e5a91 Merge branch 'openletter-rev' of carmenbianca/website into trans-eo 2017-09-28 16:19:59 +02:00
Carmen Bianca Bakker 2150f4de22
Added VideoLAN to organisations 2017-09-28 13:00:00 +02:00
Mikkel Kirkgaard Nielsen 9de04a9af3 Merge remote-tracking branch 'upstream/master' into Danish 2017-09-28 03:24:22 +02:00
tomnor 93701b2108 pmpc_sv.srt: done 2017-09-27 23:35:15 +02:00
Carmen Bianca Bakker 4b3857a1d6
<Tirifto>: Forigu la komon! 2017-09-27 22:31:46 +02:00
Carmen Bianca Bakker 43a14d6a79
do away with doublespace 2017-09-27 21:49:08 +02:00
Carmen Bianca Bakker 9543114e81
la plej eble efikan 2017-09-27 21:26:49 +02:00
Carmen Bianca Bakker 3d6a18b7d0
postulantan 2017-09-27 20:58:55 +02:00
Carmen Bianca Bakker a6be78c1aa
organizaĵo 2017-09-27 20:26:25 +02:00
Carmen Bianca Bakker e73fd03cd1
Revise openletter.eo.md 2017-09-27 20:08:21 +02:00
Tirifto 831595122d Merge remote branch 'origin/trans-eo' 2017-09-27 19:17:33 +02:00
Tirifto bbafe6edae Added Esperanto subtitles for the video.
Signed-off-by: Tirifto <tirifto@posteo.cz>
2017-09-27 19:16:47 +02:00
Carmen Bianca Bakker 02febfe35c
Merge remote-tracking branch 'origin/trans-eo' into trans-eo 2017-09-27 14:54:30 +02:00
Tirifto 35689deed7 Translated share buttons.
Fortunately the warning comments stopped me from translating the service
names, too.
2017-09-27 14:13:51 +02:00
Tirifto 8c4cad54f3 Added privacy.eo.md 2017-09-27 11:17:21 +02:00
Carmen Bianca Bakker 1420a66da4
80 character limit
This makes it easier to write and read on both narrow and wide screens,
and makes it much much easier to do diffs between lines.

e.g., if I change one word in a very long line, it's not very easy to
see what changed.  But if it's changed in a shorter line, it's easier to
see.

See also:

https://www.smashingmagazine.com/2014/09/balancing-line-length-font-size-responsive-web-design/

And probably some more resources.
2017-09-27 10:58:53 +02:00
Carmen Bianca Bakker f8948418a3
More fixes, mostly stylistic 2017-09-26 18:46:52 +02:00
Carmen Bianca Bakker 9aa396ba72
eldono → eldonado 2017-09-26 18:46:14 +02:00
Tirifto a8456ca96e Merge remote branch 'origin/trans-eo' 2017-09-26 18:22:07 +02:00
Tirifto e371bdef3d Translated the open letter. 2017-09-26 18:20:31 +02:00
Tirifto a079e97e2e Correction and improvement.
Some words were corrected for errors, others were changed for better
look and sound, or easier understanding.
2017-09-26 18:18:12 +02:00
Carmen Bianca Bakker 0e46797b12
This seems nicer 2017-09-26 18:06:16 +02:00
Carmen Bianca Bakker 9a207442d0
More translations 2017-09-26 17:41:46 +02:00
Carmen Bianca Bakker 064e896328
Added partial translation of strings.eo.toml 2017-09-26 14:26:47 +02:00
Carmen Bianca Bakker 0d672c13c5
Typo 2017-09-26 13:53:19 +02:00
Carmen Bianca Bakker 3b8956e9c5
Added all-signatures.eo.md 2017-09-26 13:51:55 +02:00
Carmen Bianca Bakker f319d5a05b
Added confirm.eo.md 2017-09-26 13:27:50 +02:00
max.mehl 214864bb92
Include subtitle 2017-09-26 12:18:33 +02:00
Jonke Suhr 1457d6b27c Merge branch 'master' of git.fsfe.org:pmpc/website 2017-09-26 09:18:00 +02:00
Jonke Suhr 064de07cc2 add joomla 2017-09-26 09:17:53 +02:00
Mikkel Kirkgaard Nielsen 23c333811a Address most of the review issues mentioned by @tohojo in #179
* Substitute "instans"/"administration" with "institution"
* More use of English campaign name as per instructions in TRANSLATE.md
* Some decluttering of text in privacy.da.md
* Don't use just "repræsentant", sounds more like a salesperson
* Fix a copy'n'wasted link
2017-09-26 04:07:05 +02:00
Mikkel Kirkgaard Nielsen aba63b2bf0 Merge remote-tracking branch 'upstream/master' into Danish
Fixed conflict in language list of build.sh (sv added).
2017-09-26 02:09:30 +02:00
max.mehl 560f0cddfe
Implement link changes of 44f1bdbd6b in SV translations 2017-09-26 01:59:37 +02:00
max.mehl 6a8cc5c906
Sort languages alphabetically and improve style for active language. Fixes #181 2017-09-26 01:33:38 +02:00
max.mehl 17fed92aa1
Increase space between language rows 2017-09-26 01:15:34 +02:00
tomnor 72abfb2d9d
confirm.sv.md: fix typo 2017-09-26 00:34:51 +02:00
tomnor 650dbf4865
build.sh: put sv in alphabetic order 2017-09-26 00:34:51 +02:00
tomnor 4d4560cb5c
confirm.sv.md: done 2017-09-26 00:34:51 +02:00
tomnor f945a372ec
[sv]: proof read
openletter.sv.md
privacy.sv.md
strings.sv.toml
2017-09-26 00:34:50 +02:00
tomnor 912b0ff4fd
strings.sv.toml: svårt -> krångligt 2017-09-26 00:34:50 +02:00
tomnor d6f1e64f5f
build.sh: add sv 2017-09-26 00:34:50 +02:00
tomnor 9a4898b27d
strings.sv.toml: remove exclamation mark 2017-09-26 00:34:50 +02:00
tomnor e6dba0a1d5
strings.sv.toml: remove duplicate 2017-09-26 00:34:50 +02:00
tomnor b099cef07d
strings.sv.toml: done 2017-09-26 00:34:49 +02:00
tomnor 03489b36ed
share/sv: done 2017-09-26 00:34:49 +02:00
tomnor 88fd8dd626
openletter.sv.md: keep campaign name english 2017-09-26 00:34:49 +02:00
tomnor 604cc5bec0
success.sv.md: done 2017-09-26 00:34:49 +02:00
tomnor 69fe9200f7
all-signatures.sv.md: done 2017-09-26 00:34:48 +02:00
tomnor a258b93478
openletter.sv.md: done 2017-09-26 00:34:48 +02:00
Tomas Nordin 56ef443e95
privacy.sv.md: done 2017-09-26 00:34:48 +02:00
max.mehl 9485a6cc4f
Merge branch 'master' into pr/184 2017-09-26 00:20:29 +02:00
max.mehl 6c73720d97
Move ES strings file to correct location 2017-09-26 00:18:55 +02:00
Gergely Székely 33e2c0ef27 Hungarian translation by László Kardos and Gergely Székely 2017-09-25 18:52:15 +02:00
Erik Da Silva 2c2489901c add Wikimedia France 2017-09-25 17:43:22 +02:00
Erik Da Silva 52879043dc add correction to file name for Openstreetmap France 2017-09-25 16:51:18 +02:00
Erik Da Silva 6f65a85356 add Openstreetmap France 2017-09-25 16:46:22 +02:00
Erik Da Silva b1c632a451 add dfri 2017-09-25 16:39:24 +02:00
Jonke Suhr 44f1bdbd6b revert free software definition link back to fsfe summary page 2017-09-25 16:35:48 +02:00
Jonke Suhr 2807675d1d Merge branch 'master' of git.fsfe.org:pmpc/website 2017-09-25 15:43:56 +02:00
Jonke Suhr b96242e5e5 add flossk and ils 2017-09-25 15:43:49 +02:00
Max Mehl 37993abb26 Merge branch 'limit-orgs' of max.mehl/pmpc-website into master 2017-09-25 15:04:55 +02:00
Max Mehl 40ec4f5c1b Merge branch 'master' of tekrei/website into master 2017-09-25 14:56:21 +02:00
Erik Da Silva c06136fdf3
add share buttons in [es] 2017-09-25 14:47:26 +02:00
Erik Da Silva 37e130c25e
Add confirm message for ES translation 2017-09-25 14:47:26 +02:00
Erik Da Silva dc54ab27cc
Add Spanish [es] translation for strings, privacy, all signatures and success 2017-09-25 14:47:22 +02:00
Jonke Suhr 4025b156b8 add hermes 2017-09-25 13:05:17 +02:00
Jonke Suhr b594c50837 add doteveryone 2017-09-25 13:02:06 +02:00
Jonke Suhr 475d7dfe8a add la quadrature du net 2017-09-25 12:18:24 +02:00
Carmen Bianca Bakker e3702ced01
Put list of languages in alpabetical order 2017-09-25 08:36:39 +02:00
Carmen Bianca Bakker 99f588a7bc
Translated success.eo.md 2017-09-24 21:21:23 +02:00
T. E. Kalayci b43a90d93a [TR] added VTT file 2017-09-24 10:18:29 +02:00
Carmen Bianca Bakker 00a931b965
Add Esperanto to list of languages in build.sh 2017-09-24 00:01:51 +02:00
Mikkel Kirkgaard Nielsen 8294416d05
Merge remote-tracking branch 'upstream/master' into Danish
Fixed conflict in language list in build.sh.
2017-09-23 22:07:49 +02:00
T. E. Kalayci 85c1dd9c08 [TR] subtitle translation to Turkish 2017-09-23 21:11:42 +02:00
Mikkel Kirkgaard Nielsen 20abcc6bbd
Add Danish translation of website
Parsability tested using Hugo v0.27.1.
2017-09-23 19:05:57 +02:00
Alpha e3d25e800c Added files for the portuguese translation 2017-09-22 19:30:17 +01:00
Alpha 6c2850b811 Added files for the portuguese translation 2017-09-22 19:24:00 +01:00
Jonke Suhr 1c21e604e1 add aptivate, openbit, plone and technologiestiftung berlin 2017-09-22 13:38:10 +02:00
SebastianoPistore c8c4003923 - Improvement of privacy doc (I think).
- Little revision on other pages.
- Translation of "Italian" on subtitle languages selection.
2017-09-22 11:47:19 +02:00
Jonke Suhr 8ceab617d9 add wikimedia italia 2017-09-22 10:32:25 +02:00
Florian Snow f8348e8611 Do not enable subtitles by default
In the past, not all browsers provided a UI for turning subtitles on
and off so turning them on by default was the best solution.  Now, all
major browsers implement a proper UI for subtitles, so the default
should be subtitles off which is what most users would expect.
2017-09-21 18:56:00 +02:00
Florian Snow 44f21bb203 Remove srt tracks for video element
Current browsers support WebVTT subtitles and also placing srt
subtitles there just makes the selection menu too long.  In the past,
it was a good idea to include both because it was not clear yet which
system browsers would support, but it should not be necessary anymore.
2017-09-21 18:54:02 +02:00
Florian Snow 301bc9645b Fix WebVTT subtitle files
Some of the WebVTT subtitle files contained syntax errors.  Without
those, current browsers should display the subtitles correctly.

closes #155
2017-09-21 18:49:47 +02:00
Jonke Suhr 108a1e2dc6 Merge branch 'master' of git.fsfe.org:pmpc/website 2017-09-21 15:49:00 +02:00
Jonke Suhr 1c5b30379f add libreitalia 2017-09-21 15:48:56 +02:00
erik.ds 8694f9d9aa Add [es] to available languages 2017-09-21 15:25:21 +02:00
max.mehl eb08bd0826
Fix Adullact img name 2017-09-21 00:08:21 +02:00
max.mehl dc1fc25c4b
Make list of organisations expandable 2017-09-21 00:02:13 +02:00
Jonke Suhr 739fd59b48 fix adullact name 2017-09-20 18:28:25 +02:00
Erik Da Silva f2738fb84b Merge from 'master'
Merge branch 'master' of git.fsfe.org:pmpc/website
2017-09-20 18:17:36 +02:00
Erik Da Silva 2d4bc20142 Add iisl 2017-09-20 18:16:33 +02:00
Jonke Suhr d0029c8e32 Merge branch 'master' of git.fsfe.org:pmpc/website
merge from upstream
2017-09-20 17:51:38 +02:00
Jonke Suhr 4ae6c1c5d7 add adullact, aquilenet, fossasia, gnusolidario, gvsig, slovenskodigital 2017-09-20 17:51:24 +02:00
Max Mehl a98cd34cae Merge branch 'more-robust-build' of max.mehl/pmpc-website into master 2017-09-20 17:34:05 +02:00
Florian Snow d177871e89 Fix HTML 5 subtitles
closes #155
2017-09-20 17:00:36 +02:00
max.mehl 01acc62526
Add meta keywords to head 2017-09-20 15:48:00 +02:00
Jonke Suhr ca9b41816a add galpon 2017-09-20 15:06:49 +02:00
Jonke Suhr 9a9593aa6a add galpon 2017-09-20 15:01:17 +02:00
Max Mehl 1f60072698 Merge branch 'master' of jordimas/website into master 2017-09-20 12:07:00 +02:00
Erik Da Silva 818dbf3127 added GreekLUG to organisations 2017-09-20 11:15:30 +02:00
Erik Da Silva 72c74432a3 add GreekLUG 2017-09-20 11:11:22 +02:00
Jordi Mas 1c23c2207f Fix missing bracket in Catalan translation 2017-09-20 07:36:55 +02:00
Max Mehl a01b21728e Merge branch 'master' of tekrei/website into master 2017-09-20 00:32:58 +02:00
Max Mehl 01baa31e8b Merge branch 'slovak_subtitles' of floriansnow/pmpc-website into master 2017-09-20 00:30:47 +02:00
max.mehl 005290ddb5
Try build 3 times before failing with exit code 1 2017-09-20 00:20:46 +02:00
Jonke Suhr d6489e9daf add apti, facil, openmedia and software heritage 2017-09-19 22:06:25 +02:00
T. E. Kalayci c88d3d2bb6 Merge remote-tracking branch 'upstream/master' 2017-09-19 21:59:11 +02:00
Jonke Suhr 605b493523 add epicenterworks, gentoo, softcatala and wpia 2017-09-19 20:42:54 +02:00
T. E. Kalayci 8513cbf919 [TR] small updates to the Turkish translation 2017-09-19 19:48:06 +02:00
Florian Snow 128064e21f Add Slovak subtitles to video HTML 2017-09-19 18:53:26 +02:00
Erik Da Silva 5bb238f208 Add Framasoft and Mageia to json 2017-09-19 18:26:13 +02:00
Jordi Mas d93c4f6440 Minor fixes to Catalan translation 2017-09-19 18:24:23 +02:00
Erik Da Silva 0c53a054a2 add Framasoft and Mageia logos and names 2017-09-19 18:20:51 +02:00
max.mehl d0f564d639
Comment out AWS copy because it takes much time and we shouldn't need it any longer 2017-09-19 17:46:29 +02:00
max.mehl 85336ead0c
Show language-dependent video for selected languages
Currently, this is only valid for DE but it can be easily extended
2017-09-19 12:27:42 +02:00
Jonke Suhr df3a1dc29d add do-foss org 2017-09-19 10:44:24 +02:00
Florian Snow 451dffc552 Add WebVTT version of Slovak subtitles 2017-09-19 07:11:27 +02:00
Tibor Repček df8793fb91 Update Slovak subtitles 2017-09-19 07:05:06 +02:00
Jonke Suhr 33bca86adc Merge branch 'master' of git.fsfe.org:pmpc/website 2017-09-18 19:27:46 +02:00
Jonke Suhr 0afd237d05 add waag society 2017-09-18 19:27:24 +02:00
Erik Da Silva 7bfec5ebb5 resize AFUL logo 2017-09-18 19:21:28 +02:00
Erik Da Silva 8483ba71f1 added AFUL logo and name 2017-09-18 19:17:03 +02:00
max.mehl 248c6ba698
Outsource non-JS CSS to not mess with JS behaviour 2017-09-18 17:56:44 +02:00
max.mehl 7b4c98d8be
Make hamburger menu work on small screens with JS disabled
Thanks to Paul for helping with that in #39
2017-09-18 17:42:18 +02:00
max.mehl 56852ef5b8
Add Gnome to supporting organisations
Provided via patch by Tobias Mueller
2017-09-18 17:05:27 +02:00
Max Mehl 7882b25a83 Merge branch 'master' of blues-man/website into master 2017-09-18 16:39:53 +02:00
max.mehl 56a949d57a
Translate 'Greek' to Greek 2017-09-18 16:37:15 +02:00
max.mehl 84e342dbfc
Merge branch 'master' into pr/156 2017-09-18 16:36:24 +02:00
suhrj 23df70225b add open knowledge international org 2017-09-18 15:48:34 +02:00
suhrj 62367621dd add open knowledge international logo 2017-09-18 15:46:10 +02:00
Nikos Roussos 8957ad5585
Add Greek translation 2017-09-18 16:45:38 +03:00
suhrj 17cc8bc624 add creative commons org 2017-09-18 15:17:45 +02:00
suhrj 9ebfa7929b add creative commons logo 2017-09-18 15:15:35 +02:00
Natale Vinto ba92b39e0e Update supporting organizations string with a better translation
Apart of the missing plural "organizzazione/organizzazioni" it
would be better to rely on the word "aderenti=adherents" rather
than "supportanti" which sounds not very good.

Another word suiatble could be "signatarie"
2017-09-18 14:26:42 +02:00
Max Mehl 5d25c4e5f5 Merge branch 'master' of jordimas/website into master 2017-09-18 11:32:46 +02:00
max.mehl 9f25dde52c
Change baseurl to fix sitemaps
We need to check whether there are sick side effects due to this but this cannot be done in the local build
2017-09-18 11:03:52 +02:00
max.mehl c03ef6cf9e
Switch from Vimeo to FSFE download server to serve video 2017-09-18 10:56:39 +02:00
max.mehl 26da277464
Add string for google webmaster tools verification
We need this to check the site's SEO status. It still doesn't appear in the search results
2017-09-18 10:47:44 +02:00
Jordi Mas a1f47dc0e3 GNU social 2017-09-17 23:34:08 +02:00
Jordi Mas 5c9c5550a2 Fix to Catalan translation 2017-09-17 23:21:40 +02:00
max.mehl b6251d0af8 merge modified PR #149 with master 2017-09-17 23:12:12 +02:00
max.mehl 3811a259af some bugfixes, and adding TR to build file 2017-09-17 23:05:11 +02:00
Jordi Mas f1c8033842 Minor fixes 2017-09-17 15:43:24 +02:00
Jordi Mas 5ca5558d4b Missing translation 2017-09-17 14:31:56 +02:00
Jordi Mas f42d9d272c Small fixes 2017-09-17 14:18:53 +02:00
Florian Snow 170273bcf3 Make style and formatting consistent with other languages 2017-09-17 12:30:24 +02:00
Jordi Mas fdf1122374 Fixes 2017-09-17 10:56:40 +02:00
Florian Snow 5e3315c1a2 Replace tag line with English version 2017-09-17 09:58:34 +02:00
Tibor Repček 1fc2f66e70 Add Slovak subtitles 2017-09-17 09:52:11 +02:00
Jordi Mas a5a87c1e1f Small fix 2017-09-16 23:37:34 +02:00
Jordi Mas 1922dc2981 Social networks 2017-09-16 23:33:34 +02:00
Jordi Mas 55a871886c Form texts 2017-09-16 23:27:16 +02:00
Jordi Mas 8d435c2e02 Catalan open letter 2017-09-16 23:02:23 +02:00
Jordi Mas addfb09e49 Privacy in Catalan 2017-09-16 22:01:13 +02:00
Jordi Mas 400ca90ed9 Catalan translation for strings.ca.toml 2017-09-16 21:02:57 +02:00
Jordi Mas 7d6717a4e3 Add Catalan 2017-09-16 19:29:57 +02:00
Max Mehl 33a26d5560 Merge branch 'master' of taringamberini/website into master 2017-09-16 12:46:08 +02:00
suhrj dd986e171c add open state foundation org 2017-09-16 11:54:42 +02:00
suhrj 5abfae67e6 upload open state foundation logo 2017-09-16 11:52:31 +02:00
suhrj dba35a46a6 Reduce okbe logo file size 2017-09-16 11:43:20 +02:00
suhrj c1ac93e772 Delete 'site/static/img/organisations/okbe.png' 2017-09-16 11:42:42 +02:00
suhrj da8bb4f902 add open knowledge belgium org 2017-09-16 11:38:07 +02:00
suhrj 0d19aa7cde upload open knowledge belgium logo 2017-09-16 11:34:12 +02:00
taringamberini 298eef6b4c Uniform to "la tutela della privacy"
The original English text:

    This right helps support other fundamental freedoms like
    freedom of speech, press and privacy.

have to be translated the same way all over the site.
2017-09-16 10:44:37 +02:00
taringamberini 5e906e24c9 Merge branch 'master' of https://git.fsfe.org/pmpc/website 2017-09-16 10:01:01 +02:00
taringamberini 208394b33e Merge branch 'master' of https://git.fsfe.org/taringamberini/website 2017-09-16 09:49:19 +02:00
Jonas Oberg ea6bb2df76 Re-added copy to aws for now. 2017-09-15 21:03:20 +02:00
suhrj 8ba813b25c add ow2 org 2017-09-15 20:37:22 +02:00
suhrj f17068dd51 Add ow2 logo 2017-09-15 20:35:40 +02:00
suhrj 2d599e1270 Merge branch 'fix-url' of schiessle/pmpc-website into master 2017-09-15 19:37:43 +02:00
suhrj 52642d2d3a add free knowledge institute org 2017-09-15 17:08:30 +02:00
suhrj 6bc8e38dcf add free knowledge institute logo 2017-09-15 17:06:18 +02:00
Bjoern Schiessle 49d3402dfc
fix url for soit.sk 2017-09-15 13:33:22 +02:00
tekrei c0eee66ee3 [TR] fixed wrapping 2017-09-15 11:45:08 +02:00
tekrei 99305dffad [TR] added privacy file translation 2017-09-15 11:43:17 +02:00
Max Mehl 91f48f83c4 Merge branch 'country-list-complete' of max.mehl/pmpc-website into master 2017-09-15 10:56:18 +02:00
Sebastiano Pistore 1cc2493d0b traduzione per twitter 2017-09-15 10:50:04 +02:00
Sebastiano Pistore f331fd8491 aggiornamento trad 2017-09-15 10:46:31 +02:00
Sebastiano Pistore 796e2a8f2f corretta doppia 2017-09-15 10:43:11 +02:00
tekrei c431138a6b [TR] fixed strings file 2017-09-15 10:41:23 +02:00
suhrj 218094ac78 Add SOIT organisation 2017-09-15 10:30:52 +02:00
suhrj d0bb4975f1 upload soit logo 2017-09-15 10:27:33 +02:00
Carmen Bianca Bakker abf936b4a5
Added Italian links 2017-09-15 08:24:52 +02:00
Carmen Bianca Bakker e57d335be1
Merge remote-tracking branch 'taringamberini/master' 2017-09-15 08:19:44 +02:00
tekrei e51b19f436 [TR] Turkish translation of the PMPC 2017-09-15 00:45:04 +02:00
taringamberini ba36d598e6 Merge branch 'master' of https://git.fsfe.org/pmpc/website 2017-09-14 23:50:38 +02:00
taringamberini e600a1d07f Uniform some words among various documents 2017-09-14 23:38:32 +02:00
taringamberini 7ab9fc0aae Merge branch 'fea-120-add-italian-to-hugo' 2017-09-14 23:19:27 +02:00
taringamberini cf4f90956a Merge branch 'tra-it-openletter' 2017-09-14 23:18:51 +02:00
Nico Rikken 4bbe03774a fix(nl): signature count
The signature count, and associated bold markup was missing from the Dutch
translation. This commit fixes this issue.
2017-09-14 23:17:36 +02:00
taringamberini 18d66dfd5f Proofread mte90's all-signature translation 2017-09-14 22:59:10 +02:00
taringamberini 4b611b5162 Add mte90's all-signature translation 2017-09-14 22:56:19 +02:00
taringamberini 74b11a9e55 Proofread mte90's confirm translation 2017-09-14 22:55:21 +02:00
taringamberini e2725102f2 Add mte90's confirm translation 2017-09-14 22:53:51 +02:00
taringamberini 83e72e0b86 Merge branch 'proofreading-privacy' 2017-09-14 22:47:03 +02:00
taringamberini 1bab8009b3 Fix minor grammar errors 2017-09-14 22:46:42 +02:00
taringamberini 019ee8c0a7 Accept Sebastiano proofreading 2017-09-14 22:40:08 +02:00
taringamberini b013a7ccf4 Fix misplaced bracket 2017-09-14 22:20:18 +02:00
taringamberini ca02e95be9 Merge branch 'proofreading-success' 2017-09-14 22:12:41 +02:00
max.mehl caea1567cc Use all sovereign countries for country selector in form 2017-09-14 22:11:27 +02:00
taringamberini cff4ecf8c0 Merge branch 'master' of https://git.fsfe.org/pmpc/website 2017-09-14 22:08:23 +02:00
max.mehl d246589941 remove aws clone due to errors 2017-09-14 21:13:44 +02:00
max.mehl a14226d1de Let label enclose checkbox again, it looks nicer on small screens 2017-09-14 20:44:06 +02:00
max.mehl eebea6550f Fix checked->checkbox and set color to initial 2017-09-14 20:40:03 +02:00
max.mehl e589997499 Change color of checkbox to make it visible on Firefox Mobile 2017-09-14 20:34:55 +02:00
max.mehl ca6ee2e32d Fix wrong path to VTT files 2017-09-14 17:36:23 +02:00
max.mehl 8c28e08ee8 Mirror subtitles to git repo and add the to local video partial 2017-09-14 17:29:51 +02:00
max.mehl 5d635703c7 Enclose checkboxes by divs. Working on #145 2017-09-14 17:13:25 +02:00
max.mehl e6969912db Separate checkboxes and labels. WIP #145 2017-09-14 17:06:05 +02:00
max.mehl c1eae53e2e Add 'for' attribute to form labels (#145) 2017-09-14 16:40:46 +02:00
max.mehl 8696fa2648 Merge PR #139 and use a different logo 2017-09-14 12:51:32 +02:00
max.mehl d5bc6727be Make Debian logo transparent 2017-09-14 12:46:26 +02:00
Max Mehl e59836c643 Merge branch 'kde' of carmenbianca/website into master 2017-09-14 11:38:26 +02:00
Max Mehl e685ae1dd1 Merge branch 'case-insensitive-orgs-sort' of max.mehl/pmpc-website into master 2017-09-14 11:38:07 +02:00
max.mehl 224e7563a8 Sort organisations in a case-insensitive way and undo f9f31cf887. Fixes #88 2017-09-14 11:36:33 +02:00
Carmen Bianca Bakker 0ba0655a83
Rename K Desktop Environment to KDE e.V.
"K Desktop Environment" is no longer used by KDE to identify themselves.
2017-09-14 10:51:25 +02:00
Guido Günther b8dc671c46 Don't fail if AWS upload credentials aren't there 2017-09-14 09:49:57 +02:00
Guido Günther b34b0e01c5 Add Debian 2017-09-14 09:30:34 +02:00
taringamberini a6b497b769 Proofread Stefano translation 2017-09-13 23:03:50 +02:00
taringamberini 0d9685fbb3 Proofread Michele translation 2017-09-13 22:23:03 +02:00
taringamberini eae9bf72f7 Merge branch 'master' of https://git.fsfe.org/pmpc/website 2017-09-13 21:27:09 +02:00
max.mehl df3e917dbf Remove and alter some meta lines to avoid errors in Facebook sharing debugger 2017-09-13 21:11:28 +02:00
max.mehl 155745cf1d Resize image to max. 100px height 2017-09-13 17:51:24 +02:00
erik.ds e13e679b89 Updated Open Labs and CCT to list 2017-09-13 17:32:03 +02:00
erik.ds bbeb31a16a Uploaded Open Labs logo 2017-09-13 17:31:29 +02:00
erik.ds 682d077516 deleted old open lab logo 2017-09-13 17:30:56 +02:00
erik.ds 470a09f931 Added CCT logo in png 2017-09-13 17:28:49 +02:00
erik.ds afa855d991 Deleted svg format file 2017-09-13 17:28:12 +02:00
erik.ds a68e8efbff Added Open Labs and CCT logos 2017-09-13 17:22:12 +02:00
erik.ds b87a5ffb06 Deleted error in open labs logo 2017-09-13 17:16:11 +02:00
max.mehl 38a806ad05 Limit to 150x100 instead if we need larger images somewhen 2017-09-13 17:12:29 +02:00
max.mehl 81a8d3f23b Resize organisation images to save space 2017-09-13 17:06:37 +02:00
erik.ds 17d3f4374e Added FIfF and FFKP 2017-09-13 16:18:02 +02:00
erik.ds e6cfd3556e Added FIfF and FFKP 2017-09-13 16:15:06 +02:00
Max Mehl c28ea30608 Fix typos in German strings 2017-09-13 15:01:32 +02:00
max.mehl 0b1d480f38 remove trailing space between text and URL 2017-09-13 12:22:49 +02:00
Max Mehl a0096ed79c Merge branch 'improve-social-links' of max.mehl/pmpc-website into master 2017-09-13 12:02:55 +02:00
max.mehl 04c2600211 use language-dependent links for sharing buttons 2017-09-13 12:01:04 +02:00
Max Mehl ad6bbf59c7 Improve grammar
"sound" would be OK, too, but "sounds" is more common
2017-09-13 11:52:46 +02:00
max.mehl 34d75ac2b1 fix wrong strings 2017-09-13 10:22:24 +02:00
max.mehl d548ff32f5 update URL to EN version 2017-09-13 10:07:33 +02:00
Max Mehl f7aebb729a Merge branch 'translation/th_tw2' of max.mehl/pmpc-website into master 2017-09-13 10:00:15 +02:00
max.mehl 5aa2270f0e translate two missing strings 2017-09-13 09:59:40 +02:00
erik.ds 20bcc1ee51 Updated french website version
declaration de vie privee --> politique de confidentialite
2017-09-13 09:45:55 +02:00
Carmen Bianca Bakker 94b16a7e0d
Fix translation error 2017-09-13 09:45:36 +02:00
Max Mehl 7c6a3ca4f1 Merge branch 'remove-auth' of max.mehl/pmpc-website into master 2017-09-13 09:23:36 +02:00
max.mehl 501b1dbe92 remove http basic auth and deprecated rules 2017-09-13 09:22:16 +02:00
erik.ds de6bd0ac94 Updated success french 2017-09-13 08:39:28 +02:00
erik.ds 91973b6018 Updated success e-mail in French 2017-09-13 08:36:50 +02:00
erik.ds 14955aca04 Added French privacy policy 2017-09-13 08:31:34 +02:00
Carmen Bianca Bakker 349fb0fcab
Replace "license" with "licence" 2017-09-13 06:52:53 +02:00
suhrj acda2754f9 changed wording in accordance with open letter wording 2017-09-13 01:07:24 +02:00
suhrj 7f7bedddf4 improve "ugly" wording
see https://git.fsfe.org/pmpc/website/issues/90#issuecomment-529
2017-09-13 00:51:49 +02:00
Carmen Bianca Bakker 2eecb462c2
My very best attempt at French, "and" > "et"
Please someone proofread this
2017-09-13 00:07:42 +02:00
Carmen Bianca Bakker c8fc688b79
Added French data files 2017-09-13 00:01:34 +02:00
Carmen Bianca Bakker 5424789d69
More Dutch fixes 2017-09-12 23:20:33 +02:00
Carmen Bianca Bakker d920e9420f
Proofread Dutch open letter by André 2017-09-12 23:12:09 +02:00
taringamberini 19773b9b23 Merge branch 'tra-it-118-openletter'
Closes pmpc/website#118
2017-09-12 23:07:35 +02:00
taringamberini 028a21b88f Translate openletter.en in Italian
pmpc/website#118
2017-09-12 23:07:04 +02:00
taringamberini 6e21a3f7f5 Translate strings.XX in Italian
pmpc/website#120
2017-09-12 23:04:22 +02:00
taringamberini 855e1d8014 Translate share buttons in Italian
pmpc/website#120
2017-09-12 21:59:11 +02:00
taringamberini 1d2cb7e831 Add Italian to build script
pmpc/website#120
2017-09-12 21:47:56 +02:00
erik.ds 81d118eced Added fr translation of mail confirmation 2017-09-12 21:37:18 +02:00
suhrj 81e2237930 Correct usage: "locked in" (not "locked down")
I propose that this can be changed without issue, because all translators have found their own way of conveying this message in their translatiosn anyway.
2017-09-12 21:37:18 +02:00
max.mehl 050ab8377f exchange open graph/twitter share graphic 2017-09-12 21:37:18 +02:00
erik.ds 8b13743287 Added french for email 2017-09-12 21:37:17 +02:00
suhrj c6abe0e9ff add portuguese translation of open letter 2017-09-12 21:37:17 +02:00
erik.ds ae3644031a Uploaded French translation 2017-09-12 21:37:17 +02:00
suhrj 160a33d463 add spanish translation of open letter 2017-09-12 21:37:17 +02:00
erik.ds c2ef9133e7 Updated french website and fixed 2017-09-12 21:37:17 +02:00
max.mehl 34fc86b4a5 remove unneeded scipt 2017-09-12 20:54:30 +02:00
max.mehl 8bcc8718b2 use fsfe.org share script for the buttons to reduce PHP dependency 2017-09-12 20:50:54 +02:00
Max Mehl 826bd2e896 Merge branch 'translation/de' of max.mehl/pmpc-website into master 2017-09-12 18:46:17 +02:00
max.mehl 540d95bbf3 include proposed changes by Jonke 2017-09-12 18:44:49 +02:00
max.mehl 633cd47209 rename zh_TW to zh_tw for Hugo stupidity reasons 2017-09-12 18:25:26 +02:00
max.mehl 954f88bef9 translations made by Frankling Weng 2017-09-12 18:18:24 +02:00
erik.ds 02038469db Added fr translation of mail confirmation 2017-09-12 17:39:50 +02:00
Max Mehl c94ce03b4d Merge branch 'locked-in' of max.mehl/pmpc-website into master 2017-09-12 17:33:26 +02:00
max.mehl e3b6f65e0f exchange open graph/twitter share graphic 2017-09-12 17:25:20 +02:00
max.mehl f70301788d translate missing parts 2017-09-12 17:05:44 +02:00
max.mehl 7d92d7a255 proofread German translations and translate large parts of test 2017-09-12 16:17:19 +02:00
erik.ds dd4aba7db9 Added french for email 2017-09-12 16:17:14 +02:00
suhrj 6881cc6bab add portuguese translation of open letter 2017-09-12 16:06:23 +02:00
erik.ds c592da7c7c Uploaded French translation 2017-09-12 16:03:22 +02:00
suhrj 38b2d32327 add spanish translation of open letter 2017-09-12 15:48:42 +02:00
erik.ds 03d1df9d92 Updated french website and fixed 2017-09-12 15:18:40 +02:00
erik.ds 3a08e82d11 Added Open Rights Group to list 2017-09-12 14:46:01 +02:00
erik.ds 196d526212 Added Open Rights Group 2017-09-12 14:45:11 +02:00
Max Mehl 032de7ccfe Merge branch 'css-bugfixes' of max.mehl/pmpc-website into master 2017-09-12 14:34:52 +02:00
max.mehl d305c4106c include CSS improvements for form by Björn
Source is this commit: daae94c151
2017-09-12 14:33:12 +02:00
erik.ds 1d794694a3 Updated OpenSUSE logo 2017-09-12 14:32:29 +02:00
erik.ds b1d0e54e7f Deleted old OpenSUSE logo 2017-09-12 14:31:59 +02:00
max.mehl b561ba4ad3 Revert "add blueprints for zh_TW translation, still to be translated"
This reverts commit b78626c45f.
2017-09-12 14:20:34 +02:00
Max Mehl 7af84a8de9 Merge branch 'vimeo-backup' of max.mehl/pmpc-website into master 2017-09-12 14:17:11 +02:00
erik.ds 954d2db738 Added Expose Facts logo 2017-09-12 14:15:04 +02:00
erik.ds ad167ab0a7 Updated Ansol 2017-09-12 14:11:45 +02:00
max.mehl 298e618001 use vimeo as primary video solution, and provide easy switch back to fsfe download server 2017-09-12 14:11:13 +02:00
erik.ds 889a9e3674 Updated name of OSBA 2017-09-12 14:05:07 +02:00
erik.ds ade39b4f04 Took out Freedom of the Press while waiting for confirmation 2017-09-12 13:21:56 +02:00
erik.ds f9e530bed7 Added Digitale Gesellschaft , Courage Found, Freedom of the Press and ExposeFacts to the list 2017-09-12 13:06:27 +02:00
erik.ds d08d2585d0 Added Digitale Gesellschaft to the list 2017-09-12 13:05:46 +02:00
Carmen Bianca Bakker b4a18ff70a
Fix link 2017-09-12 11:24:49 +02:00
Carmen Bianca Bakker 8d5122f4e0
Fix link to CC licence 2017-09-12 11:17:30 +02:00
Carmen Bianca Bakker 2faf7e7cc5
Scratch that; provide TODO instructions 2017-09-12 11:06:36 +02:00
Carmen Bianca Bakker 20a3d51af5
Fix link 2017-09-12 11:05:36 +02:00
Carmen Bianca Bakker fb5ae53e0a
Added strings.fr.toml 2017-09-12 10:59:41 +02:00
Carmen Bianca Bakker d725b3d8ed
Revert "Added Baguette strings"
This reverts commit c241660a2d.
2017-09-12 10:57:27 +02:00
Carmen Bianca Bakker c241660a2d
Added Baguette strings 2017-09-12 10:50:11 +02:00
Jonas Oberg d84eb3a19a Fixing syntax checking 2017-09-12 09:59:04 +02:00
Jonas Oberg 8d046f2c76 Merge branch 'master' of https://git.fsfe.org/pmpc/website 2017-09-12 09:57:16 +02:00
Jonas Oberg 3f7bb3c7ba Plan b, upload to aws in preparation. 2017-09-12 09:56:30 +02:00
Carmen Bianca Bakker 67c9f7e473
Translate forgotten sentence 2017-09-12 09:33:32 +02:00
erik.ds 6dacac5f1d Added April to list 2017-09-12 09:31:56 +02:00
Carmen Bianca Bakker 93bc04ec22
Merge branch 'fs-def' 2017-09-12 09:29:06 +02:00
Carmen Bianca Bakker 10fcde04c9
Add fs definition reference 2017-09-12 09:28:00 +02:00
erik.ds 78bf2e6509 Added April logo 2017-09-12 09:26:53 +02:00
Carmen Bianca Bakker d284ce94c5
Add Dutch translation for demand 2017-09-12 09:23:07 +02:00
Carmen Bianca Bakker fd26c06f83
Add Dutch open letter 2017-09-12 09:20:36 +02:00
max.mehl a952b3ecf8 improve CSS of various links. fixes #95 2017-09-11 22:47:51 +02:00
max.mehl 2f757871cc make links under additional sign form introduced in #105 work by rewriting them relatively 2017-09-11 21:59:45 +02:00
max.mehl 87ec59cd99 add sign box under open letter on sub-page. Fixes #87. Not perfect though 2017-09-11 21:00:02 +02:00
max.mehl 88ec9a5d68 increase visibility of open letter link by separating it from demand and some CSS markup 2017-09-11 20:28:49 +02:00
suhrj ea1f550a66 merging fix by mk which i had forgotten 2017-09-11 19:00:16 +02:00
max.mehl b26e7d8a0c float left for hamburger menu up to 999px 2017-09-11 18:35:38 +02:00
max.mehl 6b0462644d various css bug fixes and improvements 2017-09-11 18:32:25 +02:00
max.mehl 65ee55735b Merge branch 'master' of https://git.fsfe.org/pmpc/website into css-bugfixes 2017-09-11 18:27:02 +02:00
suhrj d6fcd24a6f changed wording at request of partner organization 2017-09-11 17:14:10 +02:00
max.mehl b78626c45f add blueprints for zh_TW translation, still to be translated 2017-09-11 15:50:07 +02:00
erik.ds f98eecbe87 Added OpenLabs, Public Software and GFOSS to list 2017-09-11 12:16:46 +02:00
erik.ds ab8572a3f2 Added OpenLabs, Public Software and GFOSS logos 2017-09-11 12:11:11 +02:00
suhrj 467c6194c1 corrected weird wording 2017-09-11 11:54:08 +02:00
suhrj a405d96799 changed link to fsfe mission page instead of free software definition page 2017-09-11 11:52:11 +02:00
suhrj 6ccb53850c fix small grammar mistake 2017-09-11 11:34:18 +02:00
Carmen Bianca Bakker 3153160616
[skip-ci] Another typo 2017-09-11 11:13:16 +02:00
Carmen Bianca Bakker 82d84c2d85
Typo 2017-09-11 11:12:19 +02:00
Carmen Bianca Bakker cf77aa1a14
(Almost) finish Dutch transations of strings.toml 2017-09-11 10:17:11 +02:00
Carmen Bianca Bakker 8b92de46d3
Change «jij» to «u» in Dutch translation 2017-09-11 09:57:55 +02:00
Carmen Bianca Bakker b228f1d007
Updated privacy.nl.md translation 2017-09-11 09:17:51 +02:00
max.mehl c8fcb2ea86 reinstate pass protection and remove sign.php references 2017-09-09 12:17:20 +02:00
max.mehl 838d937de2 test removal of http auth 2017-09-09 12:13:41 +02:00
Carmen Bianca Bakker 3f8dc2d71c
Added Dutch to language list 2017-09-08 20:44:09 +02:00
suhrj 0893da4738 Complete German translation of strings 2017-09-08 20:16:51 +02:00
suhrj 5131a55bb0 Update link to newer page 2017-09-08 17:02:30 +02:00
suhrj b5997c0f01 Update link to newer page 2017-09-08 17:02:04 +02:00
suhrj 5ff8afe31b Update link to newer page 2017-09-08 17:01:07 +02:00
Carmen Bianca Bakker b73a5a9c87
Use correct English text to translate 2017-09-08 16:35:40 +02:00
Carmen Bianca Bakker 28b766c871
publiek → openbaar 2017-09-08 16:34:52 +02:00
Carmen Bianca Bakker f5e1777fbc
Typo 2017-09-08 16:34:29 +02:00
Carmen Bianca Bakker d98e56a933
Remove English line from Dutch strings 2017-09-08 16:33:10 +02:00
Carmen Bianca Bakker f98e6c17bd
Mimic changes in bd4dbcc748 2017-09-08 16:21:22 +02:00