From fecf00a6a5a0d1212766bcbe17bd546875d35cbb Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sun, 8 Sep 2024 10:11:06 -0400 Subject: [PATCH 01/19] basewiki/bootstrap.local.css: footer now without bounds --- basewiki/bootstrap.local.css | 3 --- 1 file changed, 3 deletions(-) diff --git a/basewiki/bootstrap.local.css b/basewiki/bootstrap.local.css index 3b79167..9ec2b58 100644 --- a/basewiki/bootstrap.local.css +++ b/basewiki/bootstrap.local.css @@ -46,10 +46,7 @@ body { } .footer { position: absolute; - bottom: 0; width: 100%; - /* Set the fixed height of the footer here */ - height: 60px; background-color: #f5f5f5; } -- 2.47.2 From 41d32732f4b04972558d0187faf77be8ffde0e97 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sun, 8 Sep 2024 10:21:41 -0400 Subject: [PATCH 02/19] basewiki: bootstap.local.css: footer ul without bullet points and padding --- basewiki/bootstrap.local.css | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/basewiki/bootstrap.local.css b/basewiki/bootstrap.local.css index 9ec2b58..88c8438 100644 --- a/basewiki/bootstrap.local.css +++ b/basewiki/bootstrap.local.css @@ -124,6 +124,13 @@ code { /* list-style-type: none; */ } +.footer ul { + margin: inherit; + padding: 0; + height: inherit; + list-style-type: none; +} + /* limit main content to ~90 chars per line */ /* update: practical typography recommends 2-3 alphabets */ #content { -- 2.47.2 From 80886eb6efc5489b2a6a48d2c9d160404138abeb Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sun, 8 Sep 2024 10:28:16 -0400 Subject: [PATCH 03/19] content/footer: add link trees --- content/footer.fr.mo | Bin 685 -> 2376 bytes content/footer.fr.po | 101 ++++++++++++++++++++++++++++++++++++++---- content/footer.html | 53 +++++++++++++++++++--- content/footer.pot | 85 ++++++++++++++++++++++++++++++++--- content/index.pot | 2 +- content/join.pot | 2 +- content/platforms.pot | 2 +- content/sidebar.pot | 2 +- 8 files changed, 222 insertions(+), 25 deletions(-) diff --git a/content/footer.fr.mo b/content/footer.fr.mo index 9e346d8eac3ecd5470ad42a006ac91e1cbd0bd6c..26ce042284c8455106a7fab9eef9ca61d5ee27d3 100644 GIT binary patch literal 2376 zcmdUwO>Y}T7{@nI-b{f~-ruB=FBH&vH_n@F>WGpz1=?HfamV?yeGjBJO{3W z_k$XI2K)%L@t=bs_!T$<-UJ^5OGsJ=8Tb_V9{2)i#^YarR^N}{E$|jN1#N%a<#`XI z|L5JK{8JEfANr@kHSlrJ>i+v~~C$wEAAe;O@)(C3AHLJjnJ?0{0+=(_lNN(H=xQ zYdeRY2gbj#eOJ#%4&I#?vY#7fcKg&UcSVwrEHlY_=t(7GDzjjbjVFnuS+2*k^{{;G z{ItvlJk1g5Ce`N_{AezW{MqUGs$Z+u62D%p&edsVE{v1;!-+?$Q;!Se7%e{TXu6&Y zO$qC#Jf^Nn6VlD{ia(larA4_hN;0km_fsBG+ALqmqb$}Ug7{J9ERTA^loyK^=Yvt$ zqIV%u*nXaQOG+BV1T}~kjjX5MWo79gbKKh zyJA3BuOhnNSK4^3)~gh&9x={()Qb>#O$mt!t=5uCh^aPV-G6LSr`4Qm7;ubmL$loUd0G z=BH~eU`-gds&t2nsJ87DF?NT6AM~}lMzP6U%xl;Q_O+w*HtT4W_uc60Qte14vMi^G zgcFkmGkY%bqKHXmh;o&{wrtP6*&yRqxnj7kv7E~Wh= z6?jK%i(>u`I*0OZj<)TuC;r={GofUIjlX$m^9}zp4TK%^@pY)ds$q5359@wdW7A=y zTJyu%Ff3iCTbU_&|4VOJ!d=yZU?jKg4$t#QNz`KE4#Q6vj(lHb_&Q9gLpDL$ z+fey{(v;v82a#;}C8iloaEnxAhHP9S+U?w)kK%a!qiev61U@Qm@G=cZ3hi7&(-GG| zQfCmt(0{WH>k>v>&#fNp1-l&X)94nja;%a|JLql@tfSC*^x7Qf9L_Zu{G*6E@v^%$ zE|Yb^1ZBd)&N^J7jOGLU3vg3#<)U=>O%HOhRe9*vpP2sNy=3?)T!SS!)5HCYcwWdp X&P~SO1J^6=N?X6l>?5Xnn~w4~_KLX} literal 685 zcmchU%}yIJ5XTo(E_>wM!-zB9U6LHqB_JTsDpFAw8W0HO;OtHkgRxik09`4s(TCtx zsc+D}2akcojoE|`apc0tKaV}O|1V}z4h{`mMpSF=Q zBO4C}5j;x=nX~7Zljs%V7@b$vq_e6bWy9=;IK*pJ2gR-=Oy`v+ZPEAwjkUDd6iF*d z!tc_P=sRh=mSkND95Lf7IY!Y(d6`0i*ITlZ7ZP=3kY0{c7`br2x4-wAdo4=Bt~G>) zC99Hi68@sN)KZys$S2Zyq>ZEgSJ8gGSEnAK6MH7Ng)-w5+CxR*iTH*F-MpsEVxb6{ aQ7dYO!J8lb;66FaE%g6yp_J}Dt$GB)yV5xT diff --git a/content/footer.fr.po b/content/footer.fr.po index 1dba242..0949533 100644 --- a/content/footer.fr.po +++ b/content/footer.fr.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ilot.io\n" -"POT-Creation-Date: 2024-08-29 21:32-0400\n" -"PO-Revision-Date: 2024-08-29 21:33-0400\n" +"POT-Creation-Date: 2024-09-08 10:20-0400\n" +"PO-Revision-Date: 2024-09-08 10:28-0400\n" "Last-Translator: \n" "Language-Team: dev@ayakael.net\n" "Language: fr\n" @@ -17,12 +17,95 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 3.4.3\n" -#. type: Content of:

+#. type: Content of:

+msgid "Support" +msgstr "Soutient" + +#. type: Content of:

  • +msgid "[[FAQs|https://support.ilot.io/en/hc/706927618]]" +msgstr "[[FAQ|https://support.ilot.io/en/hc/706927618]]" + +#. type: Content of:

    • +msgid "[[Known issues|https://forge.ilot.io/ilot/-/projects/3|]]" +msgstr "[[Problèmes connus|https://forge.ilot.io/ilot/-/projects/3|]]" + +#. type: Content of:

      • +msgid "[[Support ticket|https://support.ilot.io/help/706927618]]" +msgstr "[[Soutient technique|https://support.ilot.io/help/706927618]]" + +#. type: Content of:

        • +msgid "[[Wiki|https://wiki.ilot.io]]" +msgstr "[[Wiki|https://wiki.ilot.io]]" + +#. type: Content of:

          • +msgid "[[Network Status|https://status.ilot.io]]" +msgstr "[[État du réseau|https://status.ilot.io]]" + +#. type: Content of:

            +msgid "Contribute" +msgstr "Contribuer" + +#. type: Content of:

            • +msgid "[[Become a member|join]]" +msgstr "[[Devenir membre|join]]" + +#. type: Content of:

              • +msgid "[[Join a work group]]" +msgstr "[[Rejoindre un groupe de travail]]" + +#. type: Content of:

                • +msgid "[[Donate]]" +msgstr "[[Fair un don]]" + +#. type: Content of:

                  • +msgid "[[Git Forge|https://forge.ilot.io/ilot/-/projects]]" +msgstr "[[Forge Git|https://forge.ilot.io/ilot/-/projects]]" + +#. type: Content of:

                    +msgid "About us" +msgstr "À propos de nous" + +#. type: Content of:

                    • +msgid "[[Contact]]" +msgstr "[[Contact]]" + +#. type: Content of:

                      • +msgid "[[Data and Privacy Policy]]" +msgstr "[[Politique des données]]" + +#. type: Content of:

                        • +msgid "[[Code of conduct|meta/code-of-conduct]]" +msgstr "[[Code de conduite|meta/code-of-conduct]]" + +#. type: Content of:

                          • +msgid "[[Licenses|meta/license]]" +msgstr "[[Licenses|meta/license]]" + +#. type: Content of:

                            +msgid "News" +msgstr "Nouvelles" + +#. type: Content of:

                            +msgid "Subscribe to our [[newsletter|https://notif.ilot.io/archive]]" +msgstr "S'abonner à notre [[liste de diffusion|https://notif.ilot.io/archive]]" + +#. type: Content of:

                            msgid "" -" Copyleft © 2024-2024 ilot [[CC-BY-SA|meta/" -"license]] Powered by " -"[[ikiwiki|http://ikiwiki.info/]]. " +" " msgstr "" -" Copyleft © 2024-2024 ilot [[CC-BY-SA|meta/" -"license]] Propulsé par " -"[[ikiwiki|http://ikiwiki.info/]]. " +" " + +#~ msgid "" +#~ " Copyleft © 2024-2024 ilot [[CC-BY-SA|meta/" +#~ "license]] Powered by " +#~ "[[ikiwiki|http://ikiwiki.info/]]. " +#~ msgstr "" +#~ " Copyleft © 2024-2024 ilot [[CC-BY-SA|meta/" +#~ "license]] Propulsé par " +#~ "[[ikiwiki|http://ikiwiki.info/]]. " diff --git a/content/footer.html b/content/footer.html index 1c07de6..3272f01 100644 --- a/content/footer.html +++ b/content/footer.html @@ -1,8 +1,49 @@

                            - - Copyleft © 2024-2024 ilot [[CC-BY-SA|meta/license]] - - - Powered by [[ikiwiki|http://ikiwiki.info/]]. - +

                            +
                            +
                            +
                            Support
                            + +
                              +
                            • [[FAQs|https://support.ilot.io/en/hc/706927618]]
                            • +
                            • [[Known issues|https://forge.ilot.io/ilot/-/projects/3|]]
                            • +
                            • [[Support ticket|https://support.ilot.io/help/706927618]]
                            • +
                            • [[Wiki|https://wiki.ilot.io]]
                            • +
                            • [[Network Status|https://status.ilot.io]]
                            • +
                            +
                            +
                            +
                            Contribute
                            + +
                              +
                            • [[Become a member|join]] +
                            • [[Join a work group]]
                            • +
                            • [[Donate]]
                            • +
                            • [[Git Forge|https://forge.ilot.io/ilot/-/projects]]
                            • +
                            +
                            +
                            +
                            About us
                            + +
                              +
                            • [[Contact]]
                            • +
                            • [[Data and Privacy Policy]]
                            • +
                            • [[Code of conduct|meta/code-of-conduct]]
                            • +
                            • [[Licenses|meta/license]]
                            • +
                            +
                            +
                            +
                            News
                            + +

                            Subscribe to our [[newsletter|https://notif.ilot.io/archive]]

                            + + + + + + + +
                            +
                            +

                            diff --git a/content/footer.pot b/content/footer.pot index ec14c7d..055cb9a 100644 --- a/content/footer.pot +++ b/content/footer.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2024-08-29 21:32-0400\n" +"POT-Creation-Date: 2024-09-08 10:20-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,9 +16,82 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#. type: Content of:

                            -msgid "" -" Copyleft © 2024-2024 ilot " -"[[CC-BY-SA|meta/license]] " -"Powered by [[ikiwiki|http://ikiwiki.info/]]. " +#. type: Content of:

                            +msgid "Support" +msgstr "" + +#. type: Content of:

                            • +msgid "[[FAQs|https://support.ilot.io/en/hc/706927618]]" +msgstr "" + +#. type: Content of:

                              • +msgid "[[Known issues|https://forge.ilot.io/ilot/-/projects/3|]]" +msgstr "" + +#. type: Content of:

                                • +msgid "[[Support ticket|https://support.ilot.io/help/706927618]]" +msgstr "" + +#. type: Content of:

                                  • +msgid "[[Wiki|https://wiki.ilot.io]]" +msgstr "" + +#. type: Content of:

                                    • +msgid "[[Network Status|https://status.ilot.io]]" +msgstr "" + +#. type: Content of:

                                      +msgid "Contribute" +msgstr "" + +#. type: Content of:

                                      • +msgid "[[Become a member|join]]" +msgstr "" + +#. type: Content of:

                                        • +msgid "[[Join a work group]]" +msgstr "" + +#. type: Content of:

                                          • +msgid "[[Donate]]" +msgstr "" + +#. type: Content of:

                                            • +msgid "[[Git Forge|https://forge.ilot.io/ilot/-/projects]]" +msgstr "" + +#. type: Content of:

                                              +msgid "About us" +msgstr "" + +#. type: Content of:

                                              • +msgid "[[Contact]]" +msgstr "" + +#. type: Content of:

                                                • +msgid "[[Data and Privacy Policy]]" +msgstr "" + +#. type: Content of:

                                                  • +msgid "[[Code of conduct|meta/code-of-conduct]]" +msgstr "" + +#. type: Content of:

                                                    • +msgid "[[Licenses|meta/license]]" +msgstr "" + +#. type: Content of:

                                                      +msgid "News" +msgstr "" + +#. type: Content of:

                                                      +msgid "Subscribe to our [[newsletter|https://notif.ilot.io/archive]]" +msgstr "" + +#. type: Content of:

                                                      +msgid "" +" " msgstr "" diff --git a/content/index.pot b/content/index.pot index 6cd3eb5..60c032e 100644 --- a/content/index.pot +++ b/content/index.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2024-08-09 21:13-0400\n" +"POT-Creation-Date: 2024-09-08 10:20-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/content/join.pot b/content/join.pot index 262e0ba..239f2a5 100644 --- a/content/join.pot +++ b/content/join.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2024-08-09 21:13-0400\n" +"POT-Creation-Date: 2024-09-08 10:20-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/content/platforms.pot b/content/platforms.pot index 32ddf14..8401acc 100644 --- a/content/platforms.pot +++ b/content/platforms.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2024-08-09 21:13-0400\n" +"POT-Creation-Date: 2024-09-08 10:20-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/content/sidebar.pot b/content/sidebar.pot index 67ea458..9e8cdd2 100644 --- a/content/sidebar.pot +++ b/content/sidebar.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2024-08-25 23:26-0400\n" +"POT-Creation-Date: 2024-09-08 10:20-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -- 2.47.2 From 6216d4350b48aac03b731906b6e553c0026629e5 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sun, 8 Sep 2024 10:30:59 -0400 Subject: [PATCH 04/19] content/sidebar: drop all but join and your files --- content/sidebar.fr.mo | Bin 945 -> 597 bytes content/sidebar.fr.po | 18 +----------------- content/sidebar.html | 4 ---- content/sidebar.pot | 18 +----------------- 4 files changed, 2 insertions(+), 38 deletions(-) diff --git a/content/sidebar.fr.mo b/content/sidebar.fr.mo index 7f99e22186e798cf392f58237f4f74df4001a159..f62f0dfc7016b08d065a49bd5fa6693f8bdcbe99 100644 GIT binary patch delta 130 zcmdnUew8Kmo)F7a1|VPtVi_Pd0b*7l_5orLNC4tIAWj5g4j{e&#NUAUCJ+~Z_>2q; z!a&-QiGcyggaaU#fqCNAQWmfL%)H5~7|ppXbqy>O3=OP|4K}}K)M1<)!Yl*;Hfa+P delta 478 zcmcc0vXQ<1o)F7a1|VPuVi_O~0b*_-?g3&D*a5_OK)e%(wSZWIk%55^NCyLH4j`Qb zqR+&d4lFEw0HZDJdwn($~++FUd^P%go6y z(aX%&PlQOv#xg`ld*tV))@0_Tq*j2rUiq1MU`9YrVo6$lQEoAq7hGCUkY7{+H?J7N zhntw1r=O9mZ*E{_X=H9@$Y?R~nmLz+u92yNk+GGL*=BJ@9Y!k>9OamtT$-Ah19R78 j2PRSP=xC6WQbBG4daMA&d5)PWsW{!1R)p*}3!r}hj(2pK diff --git a/content/sidebar.fr.po b/content/sidebar.fr.po index ee062a7..12f43da 100644 --- a/content/sidebar.fr.po +++ b/content/sidebar.fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ilot.io\n" "POT-Creation-Date: 2024-08-25 23:26-0400\n" -"PO-Revision-Date: 2024-08-25 23:26-0400\n" +"PO-Revision-Date: 2024-09-08 10:30-0400\n" "Last-Translator: \n" "Language-Team: dev@ayakael.net\n" "Language: fr\n" @@ -17,22 +17,6 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 3.4.3\n" -#. type: Content of:
                                                      • -msgid "[[Home|index]]" -msgstr "[[Accueil|index]]" - -#. type: Content of:
                                                        • -msgid "[[Platforms]]" -msgstr "[[Plateformes|platforms]]" - -#. type: Content of:
                                                          • -msgid "[[Archives|https://notif.ilot.io/archive]]" -msgstr "[[Archives|https://notif.ilot.io/archive]]" - -#. type: Content of:
                                                            • -msgid "[[Support|https://support.ilot.io/en/hc/706927618]]" -msgstr "[[Aide|https://support.ilot.io/fr/hc/706927618]]" - #. type: Content of:
                                                              • msgid "[[Join]]" msgstr "[[Se joindre|join]]" diff --git a/content/sidebar.html b/content/sidebar.html index 62ef689..1ae408b 100644 --- a/content/sidebar.html +++ b/content/sidebar.html @@ -1,9 +1,5 @@
                                                      -
                                                      Contribute
                                                      • [[Become a member|join]] -
                                                      • [[Join a work group]]
                                                      • -
                                                      • [[Donate]]
                                                      • [[Git Forge|https://forge.ilot.io/ilot/-/projects]]
                                                      @@ -27,10 +24,8 @@
                                                      • [[Contact]]
                                                      • -
                                                      • [[Data and Privacy Policy]]
                                                      • [[Code of conduct|meta/code-of-conduct]]
                                                      • [[Licenses|meta/license]]
                                                      • -
                                                      News
                                                      diff --git a/content/footer.pot b/content/footer.pot index 055cb9a..4d7d848 100644 --- a/content/footer.pot +++ b/content/footer.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2024-09-08 10:20-0400\n" +"POT-Creation-Date: 2024-09-08 10:46-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -25,7 +25,7 @@ msgid "[[FAQs|https://support.ilot.io/en/hc/706927618]]" msgstr "" #. type: Content of:

                                                      • -msgid "[[Known issues|https://forge.ilot.io/ilot/-/projects/3|]]" +msgid "[[Known issues|https://forge.ilot.io/ilot/-/projects/3]]" msgstr "" #. type: Content of:

                                                        • @@ -37,25 +37,13 @@ msgid "[[Wiki|https://wiki.ilot.io]]" msgstr "" #. type: Content of:

                                                          • -msgid "[[Network Status|https://status.ilot.io]]" -msgstr "" - -#. type: Content of:

                                                            -msgid "Contribute" +msgid "[[Network Status|https://status.ilot.io/status/ilot]]" msgstr "" #. type: Content of:

                                                            • msgid "[[Become a member|join]]" msgstr "" -#. type: Content of:

                                                              • -msgid "[[Join a work group]]" -msgstr "" - -#. type: Content of:

                                                                • -msgid "[[Donate]]" -msgstr "" - #. type: Content of:

                                                                  • msgid "[[Git Forge|https://forge.ilot.io/ilot/-/projects]]" msgstr "" @@ -68,10 +56,6 @@ msgstr "" msgid "[[Contact]]" msgstr "" -#. type: Content of:

                                                                    • -msgid "[[Data and Privacy Policy]]" -msgstr "" - #. type: Content of:

                                                                      • msgid "[[Code of conduct|meta/code-of-conduct]]" msgstr "" -- 2.47.2 From ac4455e9f479f1e65411d0f1123cc7a010519e04 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sun, 8 Sep 2024 12:20:13 -0400 Subject: [PATCH 06/19] content/sidebar: re-add old sidebar --- content/sidebar.fr.mo | Bin 597 -> 945 bytes content/sidebar.fr.po | 18 +++++++++++++++++- content/sidebar.html | 4 ++++ content/sidebar.pot | 18 +++++++++++++++++- 4 files changed, 38 insertions(+), 2 deletions(-) diff --git a/content/sidebar.fr.mo b/content/sidebar.fr.mo index f62f0dfc7016b08d065a49bd5fa6693f8bdcbe99..7f99e22186e798cf392f58237f4f74df4001a159 100644 GIT binary patch delta 478 zcmcc0vXQ<1o)F7a1|VPuVi_O~0b*_-?g3&D*a5_OK)e%(wSZWIk%55^NCyLH4j`Qb zqR+&d4lFEw0HZDJdwn($~++FUd^P%go6y z(aX%&PlQOv#xg`ld*tV))@0_Tq*j2rUiq1MU`9YrVo6$lQEoAq7hGCUkY7{+H?J7N zhntw1r=O9mZ*E{_X=H9@$Y?R~nmLz+u92yNk+GGL*=BJ@9Y!k>9OamtT$-Ah19R78 j2PRSP=xC6WQbBG4daMA&d5)PWsW{!1R)p*}3!r}hj(2pK delta 130 zcmdnUew8Kmo)F7a1|VPtVi_Pd0b*7l_5orLNC4tIAWj5g4j{e&#NUAUCJ+~Z_>2q; z!a&-QiGcyggaaU#fqCNAQWmfL%)H5~7|ppXbqy>O3=OP|4K}}K)M1<)!Yl*;Hfa+P diff --git a/content/sidebar.fr.po b/content/sidebar.fr.po index 12f43da..ee062a7 100644 --- a/content/sidebar.fr.po +++ b/content/sidebar.fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ilot.io\n" "POT-Creation-Date: 2024-08-25 23:26-0400\n" -"PO-Revision-Date: 2024-09-08 10:30-0400\n" +"PO-Revision-Date: 2024-08-25 23:26-0400\n" "Last-Translator: \n" "Language-Team: dev@ayakael.net\n" "Language: fr\n" @@ -17,6 +17,22 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 3.4.3\n" +#. type: Content of:
                                                                        • +msgid "[[Home|index]]" +msgstr "[[Accueil|index]]" + +#. type: Content of:
                                                                          • +msgid "[[Platforms]]" +msgstr "[[Plateformes|platforms]]" + +#. type: Content of:
                                                                            • +msgid "[[Archives|https://notif.ilot.io/archive]]" +msgstr "[[Archives|https://notif.ilot.io/archive]]" + +#. type: Content of:
                                                                              • +msgid "[[Support|https://support.ilot.io/en/hc/706927618]]" +msgstr "[[Aide|https://support.ilot.io/fr/hc/706927618]]" + #. type: Content of:
                                                                                • msgid "[[Join]]" msgstr "[[Se joindre|join]]" diff --git a/content/sidebar.html b/content/sidebar.html index 1ae408b..62ef689 100644 --- a/content/sidebar.html +++ b/content/sidebar.html @@ -1,5 +1,9 @@
                                                                      +
                                                                      Contribute
                                                                      • [[Become a member|join]]
                                                                      • [[Git Forge|https://forge.ilot.io/ilot/-/projects]]
                                                                      • +
                                                                      • [[Wiki|https://wiki.ilot.io]]
                                                                      About us
                                                                        -
                                                                      • [[Contact]]
                                                                      • [[Code of conduct|meta/code-of-conduct]]
                                                                      • [[Licenses|meta/license]]
                                                                      • +
                                                                      • [[Network Status|https://status.ilot.io/status/ilot]]
                                                                      News
                                                                      @@ -35,8 +35,10 @@ - - +
                                                                      + +
                                                                      +
                                                                      diff --git a/content/footer.pot b/content/footer.pot index 4d7d848..3db2c6e 100644 --- a/content/footer.pot +++ b/content/footer.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2024-09-08 10:46-0400\n" +"POT-Creation-Date: 2024-09-08 12:18-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -32,12 +32,8 @@ msgstr "" msgid "[[Support ticket|https://support.ilot.io/help/706927618]]" msgstr "" -#. type: Content of:

                                                                      • -msgid "[[Wiki|https://wiki.ilot.io]]" -msgstr "" - -#. type: Content of:

                                                                        • -msgid "[[Network Status|https://status.ilot.io/status/ilot]]" +#. type: Content of:

                                                                          +msgid "Contribute" msgstr "" #. type: Content of:

                                                                          • @@ -48,12 +44,12 @@ msgstr "" msgid "[[Git Forge|https://forge.ilot.io/ilot/-/projects]]" msgstr "" -#. type: Content of:

                                                                            -msgid "About us" +#. type: Content of:

                                                                            • +msgid "[[Wiki|https://wiki.ilot.io]]" msgstr "" -#. type: Content of:

                                                                              • -msgid "[[Contact]]" +#. type: Content of:

                                                                                +msgid "About us" msgstr "" #. type: Content of:

                                                                                • @@ -64,6 +60,10 @@ msgstr "" msgid "[[Licenses|meta/license]]" msgstr "" +#. type: Content of:

                                                                                  • +msgid "[[Network Status|https://status.ilot.io/status/ilot]]" +msgstr "" + #. type: Content of:

                                                                                    msgid "News" msgstr "" @@ -75,7 +75,17 @@ msgstr "" #. type: Content of:

                                                                                    msgid "" " " +"name=\"l\" value=\"9c490957-b50b-4162-898d-92259e350cd6\" />" +msgstr "" + +#. type: Content of:

                                                                                    +msgid "" +"" +msgstr "" + +#. type: Content of:

                                                                                    +msgid "" +"" msgstr "" -- 2.47.2 From 8b46a3a6b0a48cc39e0badf78fe1424d55030b1f Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sun, 8 Sep 2024 12:32:44 -0400 Subject: [PATCH 09/19] content/plaforms: move forge and wiki to auxillary platforms --- content/platforms.fr.mo | Bin 8783 -> 6248 bytes content/platforms.fr.po | 221 ++++++++++++++++++++++------------------ content/platforms.mdwn | 10 +- content/platforms.pot | 56 ++++------ 4 files changed, 145 insertions(+), 142 deletions(-) diff --git a/content/platforms.fr.mo b/content/platforms.fr.mo index c0d02208391058513352f771c78d207c1262465d..8fb67a1df9d7f0df166838d694327af2b083539f 100644 GIT binary patch delta 1037 zcmbtS&r1|h9RJSl`eQe#%}qDa#iw>Cs9nt<(+&kCbn4Qjh84#3tv(y)P4nI)gyF3^ zbbEEHKcFBw41sj$;vw>q5z!?AJB2~vB|3QMGqXx4;-xQq`SAVm-hAHYGw&~bA6)#} zo_S1&He?TS0eKkt1sMmkh&q9Nz!l^O@+InYy0IStAE37iw1L-~h(2Kcs+s62>iaE3 z0{FR=XaN0-IijTmnw;~6%ah~2>u7v=ZofOmE5et7R@EwVyeVAZ%XuCo$LIN^ z5_;F0cM)i?saDNOX&}1S=BLd@A2SpAZu2KsFxhNRN+@$IyKe5}&*aXX8XRFmr$>i} z%u@bil<#P>w&donIo`P*6}n%ix)VY7ezh55#S5|W`{>P;W}(ObNxuAyGX*hY(Qk!< znK#8jsD9anO3AVou2AuoA8T&gDipT^&OE99!+;<;A3MNf3;0eCZtz_?ZhOEr2so~o x delta 3504 zcmbVOO^6&t6t3M(V%+?hCCMt9Sc&MEVRtqz_=AEP{0$frjKRRLhMJz5nPPjYCSBFD z*&y~sL_7&i4q^nwgIN&-Hy1A+91#2g5eW(b@sNW`4gtZl->d5B-Ay798+vNGyZXKF zz4v|Z_3sCMcsl!aV%=GW<2Iak;XH?PlKzk22ghlwyRa@|eQb=ecd&j>=Q_q-8fEO= z4UFx@^_7i`eTIEo$Ag_OvA%`-m$3eb`_0Xa9l`ZOTNqPV-`vXBJ&a}S>Nfv}?Er$i zvGEbCd$FFt`Zv}ySZ~LAYCB_Z0KnT=860oh$=K&uZv)!HFgUmaCmwCTld;`cFJk=} z_y59r5!c`0=Bv2=a1UeOU}c>AWQ={gm$7}gzJe9c*fw0?8LMF(!8$yE(;vX#58z@5 zg0L_o!yoJMi$t(ZI1y-hAW7_2oVVaaA{df_bfgK-?;V+3f3R&5ksln{nH?6^nWoXN zb)4(jM`vcFt}Uo})ssynY9?vV(ACUv+sXT_iIj*>YUvhCGQWRrZi)-ul#$d%&hiE2I!eP%ERwcNcuO{ABAhas<91}a z-Bc^L$RiQQFz-5&*Xz&1USB3w-UNENZ*H!}k0#OrDZx_C$~bFrVYz_s*vUl0XJ2w> z_{)HV8&lZD6WI%IVdD@QP+ao{fwC$#6uxQ7n41=NiD)VcLyP!^X|P$1A958Kwp_LN zqDc{L8aH{%#IaeR8wqbGLN}+o1|E=_#B}+yB9aYb=BIq-!mdNwI)SZSE+W{_4wg0V zB_eVvl2b^Uf*Z1Gy&nV#CmDGuUa+AkB9XjftV1BkfAFewQ}(283hhu4IMR`{Qvr;} zSeT$U4#ft(5Aq&t1d9|_tmY-^r+Gv2Y8BwgLA9D8gpP_j{t*K7&x@zLv55DLmDu9J zmKj-z5O4@~N~I}yHe^_+!UB?pilR8Z#Pmcvu*%7(qYVgp&mtMtaX|)tlzgo>_Mjy-L(f7t)5DhP)=aj?WoA5Af3VLZlSduq{4N1l$ zatlFd(TJtxQdk8j5m+D^kgAtL1Co=-P*e70Y-GEZpi(0r zFp0>z2GOVFrm>hG-FR2 zHo&*QU~&+UNh{y8)S%IRhO%Wp9fj**nV5`@uN@e~KbAE7QXEr?(_L6X^ zbwTZm+$?CmARAUWADAWJNIpL*+OSGGLPKegT@8)mq-zUrk(`bo%pnO|(8!HE*Pvln zQ)WixA8*()USltVJFlPzQl;~=<9Fp3#{XCz8#^(YU!LI0KX2%b?e^`ogfFPM4$aKX zG9^kVNJUTm@U)uCjR`FiBgvwGa zOIf0}$mg(Mm-hZgTTda0!IG6CC7a#B68bl#5+X=X^NjAT>GRFO5>0_b#L5nq_^DK( z!K1%}a4EMELJXrdVy*=}DX-#uKMj|J~7)5AQG&jHz zcwEib!3V3Fd+eKgc;))71yF*72+&Uk=VS0EHp&{EX~ftB<%%4gzEP4^27rtq)~6~| zt$@oa-iJcaCeyx>XShvOAHwMyhu@;*56=B*>;gpf2LzS{C0QptbWeqi4e z2SrruLHh)Hb*2vXNztf4{`!vn8R`O)Xb-EcVvs=P1*yX;s5ODaSA#9;1U>YHipk-y zZ>`oQ&6v;`@D&E3;%z@zjumEu<0CX&K!j;aOmrk7ZP4>go92qr7_ME+DO83St~H)R zug()6LaNs>#>>>B5nnfJUi8wU?*(Mf4;l;{Uc^M8sIXz)fOzOJC4&}0xk5~`OY}rO z;TteWczy`2roT%dek8VD-*zpg_cu&#sj(Nr=%Iq-`zB|Wk55jFET7-{<>*J3C)Vu& k(=lnvP_CUjzwNs3aToyDatoqe87de%h5hpR+Ns0-0mOEzx&QzG diff --git a/content/platforms.fr.po b/content/platforms.fr.po index 820716d..7a43500 100644 --- a/content/platforms.fr.po +++ b/content/platforms.fr.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ilot.io\n" -"POT-Creation-Date: 2024-06-20 21:11-0400\n" -"PO-Revision-Date: 2024-06-20 21:22-0400\n" +"POT-Creation-Date: 2024-09-08 12:30-0400\n" +"PO-Revision-Date: 2024-09-08 12:31-0400\n" "Last-Translator: \n" "Language-Team: dev@ayakael.net\n" "Language: fr\n" @@ -29,62 +29,21 @@ msgstr "[[Le Cloud|https://cloud.ilot.io]]" #. type: Plain text msgid "" -"The Cloud is an instance of [[Nextcloud|https://nextcloud.com/]], a productivity " -"collaboration platform analogous to Google Drive. An **instance** is an autonomous " -"version of a web service. In Nextcloud's case, even though there exists an " -"official service maintained by the developpers, we are totally independant from " -"them. The only thing that ties us to the official instance is that we use the same " -"underlying technology, hosted on our own infrastructure." +"The Cloud is an instance of [[Nextcloud|https://nextcloud.com/]], a " +"productivity collaboration platform analogous to Google Drive. An " +"**instance** is an autonomous version of a web service. In Nextcloud's case, " +"even though there exists an official service maintained by the developpers, " +"we are totally independant from them. The only thing that ties us to the " +"official instance is that we use the same underlying technology, hosted on " +"our own infrastructure." msgstr "" -"Le Cloud est une instance de [[Nextcloud|https://nextcloud.com/]], une plateforme de " -"collaboration en matière de productivité analogue à Google Drive. Une **instance** " -"est une version autonome d'un service web. Dans le cas de Nextcloud, même s'il " -"existe un service officiel maintenu par les développeurs, nous sommes totalement " -"indépendants d'eux. La seule chose qui nous lie à l'instance officielle est que nous " -"utilisons la même technologie sous-jacente, hébergée sur notre propre infrastructure." - -#. type: Title # -#, no-wrap -msgid "[[The Wiki|https://wiki.ilot.io]]" -msgstr "[[Le Wiki|https://wiki.ilot.io]]" - -#. type: Plain text -msgid "" -"The Wiki is an instance of [[Wiki.JS|https://js.wiki/]], a wiki engine that acts as " -"a knowledge base for the community and for the membership. Since the membership is " -"engaged with various causes, we can expect this space to eventually become a " -"resource for those whose values matches ours." -msgstr "" -"Le Wiki est une instance de [[Wiki.JS|https://js.wiki/]], un moteur wiki qui agit " -"comme une base de connaissances pour la communauté et pour les membres. Comme les " -"membres sont engagés dans diverses causes, nous pouvons nous attendre à ce que cet " -"espace devienne une ressource pour ceux dont les valeurs correspondent aux nôtres." - -#. type: Title # -#, no-wrap -msgid "[[The Lab|https://lab.ilot.io]]" -msgstr "[[Le Lab|https://lab.ilot.io]]" - -#. type: Plain text -msgid "" -"The Lab is an instance of [[GitLab|https://en.wikipedia.org/wiki/GitLab]], a forge " -"based on Git that enables easier collaboration between developpers. As of now, it is " -"the main developpment space for ilot, thus it is more used by the technical working " -"group. If you are a developper, or use Git in your workflow, this is a cooperative " -"alternative to GitHub. If you are curious, all of our known issues our tracked " -"[[here|https://lab.ilot.io/ilot/issues/-/issues]]. Our very own website uses GitLab " -"Pages as its backend and its source-code can be found [[here|https://lab.ilot.io/" -"ilot/ilot.io]]." -msgstr "" -"Le Lab est une instance de [[GitLab|https://en.wikipedia.org/wiki/GitLab]], une " -"forge basée sur Git qui facilite la collaboration entre les développeurs. Pour " -"l'instant, c'est le principal espace de développement d'ilot, et il est donc plus " -"utilisé par le groupe de travail technique. Si vous êtes un développeur, ou si vous " -"utilisez Git dans votre travail, c'est une alternative coopérative à GitHub. Si vous " -"êtes curieux-ses, tous nos bogues informatiques connus sont suivis [[ici|https://lab." -"ilot.io/ilot/issues/-/issues]]. Notre propre site web utilise GitLab Pages comme " -"technology d'hébergement et son code source peut être trouvé [[ici|https://lab.ilot." -"io/ilot/ilot.io]]." +"Le Cloud est une instance de [[Nextcloud|https://nextcloud.com/]], une " +"plateforme de collaboration en matière de productivité analogue à Google " +"Drive. Une **instance** est une version autonome d'un service web. Dans le " +"cas de Nextcloud, même s'il existe un service officiel maintenu par les " +"développeurs, nous sommes totalement indépendants d'eux. La seule chose qui " +"nous lie à l'instance officielle est que nous utilisons la même technologie " +"sous-jacente, hébergée sur notre propre infrastructure." #. type: Title # #, no-wrap @@ -94,63 +53,125 @@ msgstr "Nos services auxiliaires" #. type: Plain text msgid "" "The following platforms are more there as a support role. They allow better " -"management of the other platforms, and they are here to give you an overview of our " -"infrastructure." +"management of the other platforms, and they are here to give you an overview " +"of our infrastructure." msgstr "" -"Les plates-formes suivantes ont plutôt un rôle de soutien. Elles permettent une " -"meilleure gestion des autres plateformes et sont là pour vous donner une vue " -"d'ensemble de notre infrastructure." +"Les plates-formes suivantes ont plutôt un rôle de soutien. Elles permettent " +"une meilleure gestion des autres plateformes et sont là pour vous donner une " +"vue d'ensemble de notre infrastructure." #. type: Bullet: '* ' msgid "" -"[[Auth|https://auth.ilot.io]], an instance of [[Authentik|https://goauthentik.io]], " -"is our unified authenticaton system. It is the service that allows a membre to " -"access all of our platforms using the same account. From this space, you can also " -"see all of the different spaces that you have access to. It is also through Auth " -"that you can change account settings, like your password or email." +"[[Auth|https://auth.ilot.io]], an instance of [[Authentik|https://" +"goauthentik.io]], is our unified authenticaton system. It is the service " +"that allows a membre to access all of our platforms using the same account. " +"From this space, you can also see all of the different spaces that you have " +"access to. It is also through Auth that you can change account settings, " +"like your password or email." msgstr "" -"[[Auth|https://auth.ilot.io]], une instance de [[Authentik|https://goauthentik.io]], " -"est notre système d'authentification unifié. C'est le service qui permet à un membre " -"d'accéder à toutes nos plateformes en utilisant le même compte. Depuis cet espace, " -"vous pouvez également voir tous les espaces auxquels vous avez accès. C'est " -"également via Auth que vous pouvez modifier les paramètres de votre compte, comme " -"votre mot de passe ou votre adresse électronique." +"[[Auth|https://auth.ilot.io]], une instance de [[Authentik|https://" +"goauthentik.io]], est notre système d'authentification unifié. C'est le " +"service qui permet à un membre d'accéder à toutes nos plateformes en " +"utilisant le même compte. Depuis cet espace, vous pouvez également voir tous " +"les espaces auxquels vous avez accès. C'est également via Auth que vous " +"pouvez modifier les paramètres de votre compte, comme votre mot de passe ou " +"votre adresse électronique." #. type: Bullet: '* ' msgid "" -"[[Support|https://support.ilot.io/en/hc/706927618]], an instance of [[Freescout|" -"https://freescout.net/]], is our technical support platform where you can find " -"guides on how to use ilot and where you can open support tickets. You can go [[here|" -"https://support.ilot.io/en/hc/706927618/3/how-to-request-help?category_id=3]] for " -"more details on how to ask for help." +"[[Support|https://support.ilot.io/en/hc/706927618]], an instance of " +"[[Freescout|https://freescout.net/]], is our technical support platform " +"where you can find guides on how to use ilot and where you can open support " +"tickets. You can go [[here|https://support.ilot.io/en/hc/706927618/3/how-to-" +"request-help?category_id=3]] for more details on how to ask for help." msgstr "" -"[[Support|https://support.ilot.io/en/hc/706927618]], une instance de [[Freescout|" -"https://freescout.net/]], est notre plateforme d'assistance technique où vous pouvez " -"trouver des guides sur l'utilisation d'ilot et où vous pouvez ouvrir des billets " -"d'assistance. Vous pouvez consulter [[here|https://support.ilot.io/fr/hc/706927618/3/" -"comment-faire-une-demande-de-soutien-technique?category_id=3]] pour plus de détails " -"sur la manière de demander de l'aide." +"[[Support|https://support.ilot.io/en/hc/706927618]], une instance de " +"[[Freescout|https://freescout.net/]], est notre plateforme d'assistance " +"technique où vous pouvez trouver des guides sur l'utilisation d'ilot et où " +"vous pouvez ouvrir des billets d'assistance. Vous pouvez consulter [[here|" +"https://support.ilot.io/fr/hc/706927618/3/comment-faire-une-demande-de-" +"soutien-technique?category_id=3]] pour plus de détails sur la manière de " +"demander de l'aide." #. type: Bullet: '* ' msgid "" -"[[Status|https://status.ilot.io]], an instance of [[Uptime-Kuma|https://github.com/" -"louislam/uptime-kuma]], allows us to keep track of the state of the network. If " -"something goes down, Status will alert the technical working group. If you have " -"issues connecting to any of our platforms, you can go there to see the state of the " -"network." +"[[Status|https://status.ilot.io]], an instance of [[Uptime-Kuma|https://" +"github.com/louislam/uptime-kuma]], allows us to keep track of the state of " +"the network. If something goes down, Status will alert the technical working " +"group. If you have issues connecting to any of our platforms, you can go " +"there to see the state of the network." msgstr "" -"[[Status|https://status.ilot.io]], une instance de [[Uptime-Kuma|https://github.com/" -"louislam/uptime-kuma]], nous permet de suivre l'état du réseau. Si quelque chose " -"tombe en panne, Status alertera le groupe de travail technique. Si vous avez des " -"difficultés à vous connecter à l'une de nos plateformes, vous pouvez aller voir " -"l'état du réseau." +"[[Status|https://status.ilot.io]], une instance de [[Uptime-Kuma|https://" +"github.com/louislam/uptime-kuma]], nous permet de suivre l'état du réseau. " +"Si quelque chose tombe en panne, Status alertera le groupe de travail " +"technique. Si vous avez des difficultés à vous connecter à l'une de nos " +"plateformes, vous pouvez aller voir l'état du réseau." #. type: Bullet: '* ' msgid "" -"[[Notif|https://notif.ilot.io/]], an instance of [[listmonk|https://listmonk.app/]], " -"allows the working groups to easily communicate with the rest of the membership in " -"case of announcements or technical issues" +"[[Notif|https://notif.ilot.io/]], an instance of [[listmonk|https://listmonk." +"app/]], allows the working groups to easily communicate with the rest of the " +"membership in case of announcements or technical issues" msgstr "" -"[[Notif|https://notif.ilot.io/]], une instance de [[listmonk|https://listmonk." -"app/]], permet aux groupes de travail de communiquer facilement avec le reste des " -"membres en cas d'annonces ou de problèmes techniques" +"[[Notif|https://notif.ilot.io/]], une instance de [[listmonk|https://" +"listmonk.app/]], permet aux groupes de travail de communiquer facilement " +"avec le reste des membres en cas d'annonces ou de problèmes techniques" + +#. type: Bullet: '* ' +msgid "" +"[[Forge|https://forge.ilot.io]], an instance of [[Forgejo|https://forgejo." +"org/]], is a forge based on git that is the main developpment space for " +"ilot. It is used to [[track our bugs|https://forge.ilot.io/ilot/issues/" +"issues]], [[compile our platforms|https://forge.ilot.io/ilot/iports]] and " +"[[power our website|https://forge.ilot.io/ilot/ilot.io]]" +msgstr "" +"[[Forge|https://forge.ilot.io]], une instance de [[Forgejo|https://forgejo." +"org/]], est une forge basée sur git qui est le principal espace de " +"développement d'ilot. Elle est utilisée pour [[suivre nos bugs|https://forge." +"ilot.io/ilot/issues/issues]], [[compiler nos plateformes|https://forge.ilot." +"io/ilot/iports]] et [[alimenter notre site web|https://forge.ilot.io/ilot/" +"ilot.io]]" + +#. type: Bullet: '* ' +msgid "" +"[[Wiki|https://wiki.ilot.io]], an instance of [[Wiki.JS|https://js.wiki/]], " +"is a wiki engine that acts as a knowledge base for the community and for the " +"membership. Since the membership is engaged with various causes, we can " +"expect this space to eventually become a resource for those whose values " +"matches ours." +msgstr "" +"[[Wiki|https://wiki.ilot.io]], une instance de [[Wiki.JS|https://js.wiki/]], " +"est un moteur wiki qui agit comme une base de connaissances pour la " +"communauté et pour les membres. Comme les membres sont engagés dans diverses " +"causes, nous pouvons nous attendre à ce que cet espace devienne une " +"ressource pour ceux dont les valeurs correspondent aux nôtres" + +#, no-wrap +#~ msgid "[[The Wiki|https://wiki.ilot.io]]" +#~ msgstr "[[Le Wiki|https://wiki.ilot.io]]" + +#, no-wrap +#~ msgid "[[The Lab|https://lab.ilot.io]]" +#~ msgstr "[[Le Lab|https://lab.ilot.io]]" + +#~ msgid "" +#~ "The Lab is an instance of [[GitLab|https://en.wikipedia.org/wiki/" +#~ "GitLab]], a forge based on Git that enables easier collaboration between " +#~ "developpers. As of now, it is the main developpment space for ilot, thus " +#~ "it is more used by the technical working group. If you are a developper, " +#~ "or use Git in your workflow, this is a cooperative alternative to GitHub. " +#~ "If you are curious, all of our known issues our tracked [[here|https://" +#~ "lab.ilot.io/ilot/issues/-/issues]]. Our very own website uses GitLab " +#~ "Pages as its backend and its source-code can be found [[here|https://lab." +#~ "ilot.io/ilot/ilot.io]]." +#~ msgstr "" +#~ "Le Lab est une instance de [[GitLab|https://en.wikipedia.org/wiki/" +#~ "GitLab]], une forge basée sur Git qui facilite la collaboration entre les " +#~ "développeurs. Pour l'instant, c'est le principal espace de développement " +#~ "d'ilot, et il est donc plus utilisé par le groupe de travail technique. " +#~ "Si vous êtes un développeur, ou si vous utilisez Git dans votre travail, " +#~ "c'est une alternative coopérative à GitHub. Si vous êtes curieux-ses, " +#~ "tous nos bogues informatiques connus sont suivis [[ici|https://lab.ilot." +#~ "io/ilot/issues/-/issues]]. Notre propre site web utilise GitLab Pages " +#~ "comme technology d'hébergement et son code source peut être trouvé [[ici|" +#~ "https://lab.ilot.io/ilot/ilot.io]]." diff --git a/content/platforms.mdwn b/content/platforms.mdwn index 2ce67a8..d6f6270 100644 --- a/content/platforms.mdwn +++ b/content/platforms.mdwn @@ -4,14 +4,6 @@ The Cloud is an instance of [[Nextcloud|https://nextcloud.com/]], a productivity collaboration platform analogous to Google Drive. An **instance** is an autonomous version of a web service. In Nextcloud's case, even though there exists an official service maintained by the developpers, we are totally independant from them. The only thing that ties us to the official instance is that we use the same underlying technology, hosted on our own infrastructure. -# [[The Wiki|https://wiki.ilot.io]] - -The Wiki is an instance of [[Wiki.JS|https://js.wiki/]], a wiki engine that acts as a knowledge base for the community and for the membership. Since the membership is engaged with various causes, we can expect this space to eventually become a resource for those whose values matches ours. - -# [[The Lab|https://lab.ilot.io]] - -The Lab is an instance of [[GitLab|https://en.wikipedia.org/wiki/GitLab]], a forge based on Git that enables easier collaboration between developpers. As of now, it is the main developpment space for ilot, thus it is more used by the technical working group. If you are a developper, or use Git in your workflow, this is a cooperative alternative to GitHub. If you are curious, all of our known issues our tracked [[here|https://lab.ilot.io/ilot/issues/-/issues]]. Our very own website uses GitLab Pages as its backend and its source-code can be found [[here|https://lab.ilot.io/ilot/ilot.io]]. - # Our Auxillary Services The following platforms are more there as a support role. They allow better management of the other platforms, and they are here to give you an overview of our infrastructure. @@ -20,3 +12,5 @@ The following platforms are more there as a support role. They allow better mana * [[Support|https://support.ilot.io/en/hc/706927618]], an instance of [[Freescout|https://freescout.net/]], is our technical support platform where you can find guides on how to use ilot and where you can open support tickets. You can go [[here|https://support.ilot.io/en/hc/706927618/3/how-to-request-help?category_id=3]] for more details on how to ask for help. * [[Status|https://status.ilot.io]], an instance of [[Uptime-Kuma|https://github.com/louislam/uptime-kuma]], allows us to keep track of the state of the network. If something goes down, Status will alert the technical working group. If you have issues connecting to any of our platforms, you can go there to see the state of the network. * [[Notif|https://notif.ilot.io/]], an instance of [[listmonk|https://listmonk.app/]], allows the working groups to easily communicate with the rest of the membership in case of announcements or technical issues +* [[Forge|https://forge.ilot.io]], an instance of [[Forgejo|https://forgejo.org/]], is a forge based on git that is the main developpment space for ilot. It is used to [[track our bugs|https://forge.ilot.io/ilot/issues/issues]], [[compile our platforms|https://forge.ilot.io/ilot/iports]] and [[power our website|https://forge.ilot.io/ilot/ilot.io]] +* [[Wiki|https://wiki.ilot.io]], an instance of [[Wiki.JS|https://js.wiki/]], is a wiki engine that acts as a knowledge base for the community and for the membership. Since the membership is engaged with various causes, we can expect this space to eventually become a resource for those whose values matches ours. diff --git a/content/platforms.pot b/content/platforms.pot index 8401acc..6ffcd14 100644 --- a/content/platforms.pot +++ b/content/platforms.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2024-09-08 10:20-0400\n" +"POT-Creation-Date: 2024-09-08 12:30-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -38,39 +38,6 @@ msgid "" "our own infrastructure." msgstr "" -#. type: Title # -#, markdown-text, no-wrap -msgid "[[The Wiki|https://wiki.ilot.io]]" -msgstr "" - -#. type: Plain text -#, markdown-text -msgid "" -"The Wiki is an instance of [[Wiki.JS|https://js.wiki/]], a wiki engine that " -"acts as a knowledge base for the community and for the membership. Since the " -"membership is engaged with various causes, we can expect this space to " -"eventually become a resource for those whose values matches ours." -msgstr "" - -#. type: Title # -#, markdown-text, no-wrap -msgid "[[The Lab|https://lab.ilot.io]]" -msgstr "" - -#. type: Plain text -#, markdown-text -msgid "" -"The Lab is an instance of [[GitLab|https://en.wikipedia.org/wiki/GitLab]], a " -"forge based on Git that enables easier collaboration between developpers. As " -"of now, it is the main developpment space for ilot, thus it is more used by " -"the technical working group. If you are a developper, or use Git in your " -"workflow, this is a cooperative alternative to GitHub. If you are curious, " -"all of our known issues our tracked " -"[[here|https://lab.ilot.io/ilot/issues/-/issues]]. Our very own website uses " -"GitLab Pages as its backend and its source-code can be found " -"[[here|https://lab.ilot.io/ilot/ilot.io]]." -msgstr "" - #. type: Title # #, markdown-text, no-wrap msgid "Our Auxillary Services" @@ -124,3 +91,24 @@ msgid "" "communicate with the rest of the membership in case of announcements or " "technical issues" msgstr "" + +#. type: Bullet: '* ' +#, markdown-text +msgid "" +"[[Forge|https://forge.ilot.io]], an instance of " +"[[Forgejo|https://forgejo.org/]], is a forge based on git that is the main " +"developpment space for ilot. It is used to [[track our " +"bugs|https://forge.ilot.io/ilot/issues/issues]], [[compile our " +"platforms|https://forge.ilot.io/ilot/iports]] and [[power our " +"website|https://forge.ilot.io/ilot/ilot.io]]" +msgstr "" + +#. type: Bullet: '* ' +#, markdown-text +msgid "" +"[[Wiki|https://wiki.ilot.io]], an instance of [[Wiki.JS|https://js.wiki/]], " +"is a wiki engine that acts as a knowledge base for the community and for the " +"membership. Since the membership is engaged with various causes, we can " +"expect this space to eventually become a resource for those whose values " +"matches ours." +msgstr "" -- 2.47.2 From c0910312cc634018c85c7a3803c01591ae99aec6 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sun, 8 Sep 2024 12:33:08 -0400 Subject: [PATCH 10/19] content/sidebar: keep only internal pages (index, platforms, join, etc) --- content/sidebar.fr.mo | Bin 945 -> 710 bytes content/sidebar.fr.po | 18 ++++++++---------- content/sidebar.html | 2 -- content/sidebar.pot | 10 +--------- 4 files changed, 9 insertions(+), 21 deletions(-) diff --git a/content/sidebar.fr.mo b/content/sidebar.fr.mo index 7f99e22186e798cf392f58237f4f74df4001a159..201f112645706d212b4617e87b6ef453ee6f3577 100644 GIT binary patch delta 170 zcmdnUevGyLo)F7a1|VPsVi_QI0b+I_&H-W&=m6q8AnpWWJ|O-9#2i4(&d9*P3#0{r z^fw?a2c!#tv?vn;gCLM@1Jc4kdIpe|1k!7OG*Af`fb3!cVrB*gHn0HG#I2>1Lm5>j cuVpmhveY%OP%t#IGB(=$no*Z=vNN+S0Ntn)?*IS* delta 398 zcmX@cx{ oGF31#wlXr?9K)!~s7|DXlUtb_fi^m3rljJuF0BZ~y4Y9-0NRFE7XSbN diff --git a/content/sidebar.fr.po b/content/sidebar.fr.po index ee062a7..864d253 100644 --- a/content/sidebar.fr.po +++ b/content/sidebar.fr.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ilot.io\n" -"POT-Creation-Date: 2024-08-25 23:26-0400\n" -"PO-Revision-Date: 2024-08-25 23:26-0400\n" +"POT-Creation-Date: 2024-09-08 12:28-0400\n" +"PO-Revision-Date: 2024-09-08 12:32-0400\n" "Last-Translator: \n" "Language-Team: dev@ayakael.net\n" "Language: fr\n" @@ -25,14 +25,6 @@ msgstr "[[Accueil|index]]" msgid "[[Platforms]]" msgstr "[[Plateformes|platforms]]" -#. type: Content of:
                                                                                    • -msgid "[[Archives|https://notif.ilot.io/archive]]" -msgstr "[[Archives|https://notif.ilot.io/archive]]" - -#. type: Content of:
                                                                                      • -msgid "[[Support|https://support.ilot.io/en/hc/706927618]]" -msgstr "[[Aide|https://support.ilot.io/fr/hc/706927618]]" - #. type: Content of:
                                                                                        • msgid "[[Join]]" msgstr "[[Se joindre|join]]" @@ -44,3 +36,9 @@ msgid "" msgstr "" "" + +#~ msgid "[[Archives|https://notif.ilot.io/archive]]" +#~ msgstr "[[Archives|https://notif.ilot.io/archive]]" + +#~ msgid "[[Support|https://support.ilot.io/en/hc/706927618]]" +#~ msgstr "[[Aide|https://support.ilot.io/fr/hc/706927618]]" diff --git a/content/sidebar.html b/content/sidebar.html index 62ef689..04d36e7 100644 --- a/content/sidebar.html +++ b/content/sidebar.html @@ -2,8 +2,6 @@
                                                                                    -
                                                                                    +
                                                                                    News

                                                                                    Subscribe to our [[newsletter|https://notif.ilot.io/archive]]

                                                                                    +
                                                                                    diff --git a/content/footer.pot b/content/footer.pot index c6ba41d..5ec6706 100644 --- a/content/footer.pot +++ b/content/footer.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2024-09-08 12:30-0400\n" +"POT-Creation-Date: 2024-09-08 12:45-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -- 2.47.2 From da86a9dd001bd82717572cc8d563101bfbee26af Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sun, 8 Sep 2024 12:47:03 -0400 Subject: [PATCH 15/19] bootstrap.local.css: make listmonk-form style match --- basewiki/bootstrap.local.css | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/basewiki/bootstrap.local.css b/basewiki/bootstrap.local.css index 2c697d2..47b5c6e 100644 --- a/basewiki/bootstrap.local.css +++ b/basewiki/bootstrap.local.css @@ -480,22 +480,26 @@ header h1::before { /* Footer */ .footer ul { - margin: inherit; - padding: 0; - height: inherit; - list-style-type: none; + margin: inherit; + padding: 0; + height: inherit; + list-style-type: none; } .footer h5 { - font-weight: bold; + font-weight: bold; } .footer li a { - color: #777; + color: #777; } .footer li { - color: #777; + color: #777; +} + +.footer p { + color: #777; } /* Listmonk form */ @@ -508,17 +512,23 @@ header h1::before { display: table-cell; width: 100%; } + +.listmonk-form a { + color: #777; + text-decoration-line: underline; +} + .listmonk-form .t > input { width: 100%; background: #f8f8f8; - color: #333; + color: #777; text-align: left; border-color: #ccc; } .listmonk-form button { background: #f8f8f8; - color: #333; + color: #777; border-color: #ccc; margin-top: -2px; margin-left: 12px; @@ -526,7 +536,7 @@ header h1::before { .listmonk-form button:hover { background: #e6e6e6; - color: #333; + color: #777; border-color: #ccc; } -- 2.47.2 From d80dc429a14595077aa1ffe69f32c599c7cc2c3d Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sun, 8 Sep 2024 12:49:48 -0400 Subject: [PATCH 16/19] content/platforms: fix cloud link --- content/platforms.fr.mo | Bin 6253 -> 6263 bytes content/platforms.fr.po | 8 ++++---- content/platforms.mdwn | 2 +- content/platforms.pot | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/content/platforms.fr.mo b/content/platforms.fr.mo index 5e02202b8dfa52d34cd6ee8a46454d092a7b1e82..8a7febb09a6c6c299f9322bed7ac9015e7ee11ad 100644 GIT binary patch delta 209 zcmaEB@ZDfSPQ3;L1A{Xc1A{pu149mw{s!bP;bvfv0MfI07#RKl#kTn9cz6zivD=A;%+W))YOyoOzH^K>p3MkW)> R&3Cz_xv{9*%qpJ22mnG{DwY5M delta 199 zcmexv@YY~LPQ5Y%1A{Xc1A{pu14BBH{s!dF=VoA#0MgTV7#RKl#n%Jr!$AHTJ_ZI^ zAYH)Ez;GQX-Up=XfOMK51H(0-_){SUhBzR9k1zwnNgypP%D|um5*K4&NCEOW#2FZX z6azC5a{w_AurUDbVqn<#F^!WqIVZm~MK3cazeF!He=@(g(&RPlf}7`XxiB&rn{Ix@ OEzOOpWHY~b1|tA-1tygM diff --git a/content/platforms.fr.po b/content/platforms.fr.po index 0c6097e..20f9d75 100644 --- a/content/platforms.fr.po +++ b/content/platforms.fr.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ilot.io\n" -"POT-Creation-Date: 2024-09-08 12:35-0400\n" -"PO-Revision-Date: 2024-09-08 12:35-0400\n" +"POT-Creation-Date: 2024-09-08 12:48-0400\n" +"PO-Revision-Date: 2024-09-08 12:49-0400\n" "Last-Translator: \n" "Language-Team: dev@ayakael.net\n" "Language: fr\n" @@ -24,8 +24,8 @@ msgstr "[[!meta title=\"Platformes\"]]\n" #. type: Title # #, no-wrap -msgid "[[The Cloud|https://cloud.ilot.io]]" -msgstr "[[Le Cloud|https://cloud.ilot.io]]" +msgid "[[The Cloud|https://ilot.io/apps/files]]" +msgstr "[[Le Cloud|https://ilot.io/apps/files]]" #. type: Plain text msgid "" diff --git a/content/platforms.mdwn b/content/platforms.mdwn index 2bba0f5..4fdee0e 100644 --- a/content/platforms.mdwn +++ b/content/platforms.mdwn @@ -1,6 +1,6 @@ [[!meta title="Platforms"]] -# [[The Cloud|https://cloud.ilot.io]] +# [[The Cloud|https://ilot.io/apps/files]] The Cloud is an instance of [[Nextcloud|https://nextcloud.com/]], a productivity collaboration platform analogous to Google Drive. An **instance** is an autonomous version of a web service. In Nextcloud's case, even though there exists an official service maintained by the developpers, we are totally independant from them. The only thing that ties us to the official instance is that we use the same underlying technology, hosted on our own infrastructure. diff --git a/content/platforms.pot b/content/platforms.pot index d823ca0..1ff64f2 100644 --- a/content/platforms.pot +++ b/content/platforms.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2024-09-08 12:36-0400\n" +"POT-Creation-Date: 2024-09-08 12:49-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -23,7 +23,7 @@ msgstr "" #. type: Title # #, markdown-text, no-wrap -msgid "[[The Cloud|https://cloud.ilot.io]]" +msgid "[[The Cloud|https://ilot.io/apps/files]]" msgstr "" #. type: Plain text -- 2.47.2 From 141b4c277b3ad1e392bcd209b8fff8217b263944 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sun, 8 Sep 2024 16:06:21 -0400 Subject: [PATCH 17/19] forgejo: use GitHub checkout --- .forgejo/workflows/cleanup.yaml | 2 +- .forgejo/workflows/deploy.yaml | 2 +- .forgejo/workflows/pages.yaml | 4 ++-- .forgejo/workflows/preview.yaml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.forgejo/workflows/cleanup.yaml b/.forgejo/workflows/cleanup.yaml index 69921a7..084cf3d 100644 --- a/.forgejo/workflows/cleanup.yaml +++ b/.forgejo/workflows/cleanup.yaml @@ -12,7 +12,7 @@ jobs: run: | apk add git nodejs jq coreutils curl tree gawk grep - name: Public repo pull - uses: actions/checkout@v4 + uses: https://github.com/actions/checkout@v4 with: fetch-depth: 0 token: ${{ secrets.PAGES_TOKEN }} diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index c82b4db..929cde1 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -18,7 +18,7 @@ jobs: with: ssh-private-key: ${{ secrets.PAGES_PRIVKEY }} - name: Repo pull - uses: actions/checkout@v4 + uses: https://github.com/actions/checkout@v4 with: fetch-depth: 0 - name: Website upload diff --git a/.forgejo/workflows/pages.yaml b/.forgejo/workflows/pages.yaml index de37353..5a05a58 100644 --- a/.forgejo/workflows/pages.yaml +++ b/.forgejo/workflows/pages.yaml @@ -13,12 +13,12 @@ jobs: run: | apk add git ikiwiki po4a perl-yaml-tiny tree nodejs - name: Repo pull - uses: actions/checkout@v4 + uses: https://github.com/actions/checkout@v4 with: fetch-depth: 1 token: ${{ secrets.PAGES_TOKEN }} - name: Public repo pull - uses: actions/checkout@v4 + uses: https://github.com/actions/checkout@v4 with: fetch-depth: 0 ref: public diff --git a/.forgejo/workflows/preview.yaml b/.forgejo/workflows/preview.yaml index 3ad603e..d54ae10 100644 --- a/.forgejo/workflows/preview.yaml +++ b/.forgejo/workflows/preview.yaml @@ -18,7 +18,7 @@ jobs: fetch-depth: 1 token: ${{ secrets.PAGES_TOKEN }} - name: Public repo pull - uses: actions/checkout@v4 + uses: https://github.com/actions/checkout@v4 with: fetch-depth: 0 ref: public -- 2.47.2 From c41eac465cfd82e1db2047737a36754efa577869 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sun, 8 Sep 2024 16:08:10 -0400 Subject: [PATCH 18/19] forgejo: use GitHub checkout, missing --- .forgejo/workflows/preview.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/preview.yaml b/.forgejo/workflows/preview.yaml index d54ae10..ca58fdd 100644 --- a/.forgejo/workflows/preview.yaml +++ b/.forgejo/workflows/preview.yaml @@ -13,7 +13,7 @@ jobs: apk add git ikiwiki po4a perl-yaml-tiny tree nodejs jq coreutils curl echo "GITHUB_PR_NAME=$(curl -Ls ${{ github.server_url }}/api/v1/repos/${{ github.repository }}/pulls/${{ github.ref_name }} | jq .title | tr ' ' '-' | tr -d ':' | tr -d '"' | tr '[:upper:]' '[:lower:]' | tr '/' '-')" >> $GITHUB_ENV - name: Repo pull - uses: actions/checkout@v4 + uses: https://github.com/actions/checkout@v4 with: fetch-depth: 1 token: ${{ secrets.PAGES_TOKEN }} -- 2.47.2 From c8e8d680708a608a95cd586a31ad64165a26c035 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sun, 8 Sep 2024 16:12:19 -0400 Subject: [PATCH 19/19] bootstrap.local.css: add padding-bottom to footer --- basewiki/bootstrap.local.css | 1 + 1 file changed, 1 insertion(+) diff --git a/basewiki/bootstrap.local.css b/basewiki/bootstrap.local.css index 47b5c6e..a9d06e2 100644 --- a/basewiki/bootstrap.local.css +++ b/basewiki/bootstrap.local.css @@ -47,6 +47,7 @@ body { .footer { position: absolute; width: 100%; + padding-bottom: 15px; background-color: #f5f5f5; } -- 2.47.2