diff --git a/news/nl/nl-201906.en.xhtml b/news/nl/nl-201906.en.xhtml index 0685fa4306..2edb24e5f2 100644 --- a/news/nl/nl-201906.en.xhtml +++ b/news/nl/nl-201906.en.xhtml @@ -12,14 +12,15 @@

Last month, Google blacklisted and blocked Huawei from accessing all its proprietary components of the Android mobile operating system. The California based tech giant had to comply with the executive order issued by the U.S. government to effectively ban all American companies from trading with Huawei. While the Chinese telco will not have access to the Google's proprietary components, it will nevertheless be able to use those parts of the Android's operating system available under the open source licence, which is free for anyone to use. This highlights the importance that Free Software has for users, public bodies, and businesses. The Free Software Foundation Europe presented three essential lessons from this case:

-

1. Free Software enables control over technology.

-

- The more important technology becomes in our daily lives, the more relevant Free Software becomes for individual users.

+
    +
  1. Free Software enables control over technology: The more important technology becomes in our daily lives, the more relevant Free Software becomes for individual users.
    2. -

    2. The EU is overly reliant on foreign sources of technology.

    -

    - The European Union and its members states should invest in Free Software development and focus on supporting local Free Software organisations and businesses. This can foster greater technological independence for the EU economy.

    +
  2. The EU is overly reliant on foreign sources of technology: The European Union and its members states should invest in Free Software development and focus on supporting local Free Software organisations and businesses. This can foster greater technological independence for the EU economy.
    3. + +
  3. Free Software gives companies technological independence.: A company that uses proprietary software is dependent on such software's vendor and the government that regulates it. The best strategy for a company to avoid this is to use as much Free Software as possible in their supply chains.
    4. + +
-

3. Free Software gives companies technological independence.

-

- A company that uses proprietary software is dependent on such software's vendor and the government that regulates it. The best strategy for a company to avoid this is to use as much Free Software as possible in their supply chains.

Read more details about these lessons in our press release.

@@ -31,7 +32,7 @@ While the Chinese telco will not have access to the Google's proprietary compone

As with every month, we are trying to spread the word and help individuals and organisations understand what Free Software is and how Free Software contributes to freedom, transparency, and self-determination. If you are interested in seeing us in action and join our cause, keep in mind the following dates and locations in the coming few months:

- Some of the people behind fixing the FSFE's website during the 2nd web-a-thon for the year + Some of the people behind fixing the FSFE's website during the 2nd web-a-thon for the year
Some of the people behind fixing the FSFE's website during the 2nd web-a-thon for the year
@@ -59,7 +60,7 @@ While the Chinese telco will not have access to the Google's proprietary compone
- Lucas Lasota at the Libre Graphics Meetings in Saarbrücken + Lucas Lasota at the Libre Graphics Meetings in Saarbrücken
Lucas Lasota at the Libre Graphics Meetings in Saarbrücken
@@ -77,7 +78,7 @@ While the Chinese telco will not have access to the Google's proprietary compone
- Matthias Kirschner keynote at OW2 in Paris + Matthias Kirschner keynote at OW2 in Paris
Matthias Kirschner keynote at OW2 in Paris
@@ -95,21 +96,11 @@ While the Chinese telco will not have access to the Google's proprietary compone -
- Alexander Sander and Galia Mancheva talk PMPC and Copyright at the Libertybits Free Software event in Sofia, Bulgaria -
Alexander Sander and Galia Mancheva talk PMPC and Copyright at the Libertybits Free Software event in Sofia, Bulgaria
-
- - -
- Matthias giving a lecture at the University of Tübingen -
Matthias Kirschner giving a lecture at the University of Tübingen
-
+

Get Active

diff --git a/picturebase/2017-06-R2D2-with-IloveFS.txt b/picturebase/2017-06-R2D2-with-IloveFS.txt deleted file mode 100644 index a775e033b1..0000000000 --- a/picturebase/2017-06-R2D2-with-IloveFS.txt +++ /dev/null @@ -1,7 +0,0 @@ -- Year: 2017 -- Author: André Klöpfel -- License: free to use (CC0) -- Contact: kloepfel@mailbox.org -- Additional remarks: the picture was made at the FSFE booth at the Maker Faire in Berlin (June 2017) -- so far has been used (at/for/inside): - diff --git a/picturebase/HOWTO-use-the-picturebase.txt b/picturebase/HOWTO-use-the-picturebase.txt new file mode 100644 index 0000000000..cd0c9ccc00 --- /dev/null +++ b/picturebase/HOWTO-use-the-picturebase.txt @@ -0,0 +1,113 @@ +Welcome to the FSFE's picturebase + +Please put all pictures in here using the following scheme: + + +# Quality +Pictures should be uploaded in the best quality and dimensions available. It is easy to downscale any picture but impossible to upscale dimensions. Consider to GIMP your pictures befor uploading to improve their visual appearance. + + +# 800-pixel-web-Version +Any picture you like to use embedded in fsfe.org should be downscaled to a width of 800 pixels with the same name as your picture but added a "-800px" in the end of the file name. This allows us to embedding this downscaled picture for faster page-loads of fsfe.org and in the same time immediately access the original picture if wanted. +Example: +* /booths/201807-booth-at-rmll.jpg +* /booths/201807-booth-at-rmll-800px.jpg + + +# Filenames +Filename are a big help to get an info about a picture without the need to open it. All files should start with the year and most probably also with the month when the picture was taken. +Example: +* /events/201905-webathon-group-picture.jpg + +In case of a graphic it should include the year the grapic was taken +Example: +* /campaigns/ilovefs/2019-ilovefs-artwork-Elektrollart.jpeg + +depending on the folder the picture is archived in, the filenames also follow a certain scheme that is explained in the next section where the content of these folders is explained as well. + + +# Topical Folders + +we have topical folders inside the picturebase to help find pictures when in need. Please read through the following information to understand where to put your picture. + +Sometimes pictures can be in two folder, for example a group-picture shot during a FSFE event qualifies for the /events/ folder as well as the /people/ folder. You have to chose one of the folders then, please do not put them in both! + +As a general help to decide where to put them you should follow the approach to go from the most concrete topical folder to the broader one. More concrete are +- booths (booths only) +- campaigns (specific campaigns inside) +- events (only fsfe-events) +- fundraising (only fundraising relevant pictures here) +- onstage (only pictures of fsfe people giving talks, workshops etc) + +More broader folders are: +- graphics +- miscellaneous +- people (but only fsfe-people!) +all of which collect pictures that do not fit in the other categories. + + +## booths +In this folder all pictures should be about a booth and vice versa: Booth pictures with people or without people, in the morning or at night ... +Please give all pictures in here the following name: +* YYYYMM-booth-at-EVENTNAME +(YYYY means year and MM means month) +Example: +* /booths/201807-booth-at-rmll.jpg + +## campaigns +Pictures that are about a specific campaign end up in their corresponding subfolder of the campaigns-folder. +Please give all pictures in here the following name: +* YYYYMM-SHORTNAMEOFCAMPAIGN-CONTENT +(YYYY means year and MM means month) +Example: +* /campaigns/ilovefs/201801-pmpc-brochure-people.jpg + +## events +Pictures that are about an event BY THE FSFE should end up here. Community meetings, web-a-thons, GA-meetings etc. Please do not put pictures here of events, the FSFE has been but not organised itself. +Please give all pictures in here the following name: +* YYYYMM-NAMEOFEVENT-CONTENT +(YYYY means year and MM means month) +Example: +* /events/201905-webathon-group-picture.jpg + +## fundraising +Put all pictures and graphics in here that are to be used for fundraising specifically. +Please give all pictures in here the following name: +* YYYY-NAMEOFPERSONORCONTENT-PIXELINWIDTH +(YYYY means year and MM means month) +Example: +* /fundraising/2019-Francesca-Bria-1200x900.en.png + +## graphics +Put all pictures in here that are pure graphics and not to be used in the contexts of the other folders. For example logos that we use on our pages or informational graphics. + +## miscelleanous +Put all pictures and graphics in here that fit in no other folder. +Please give all pictures in here the following name: +* YYYY-CONTENT +(YYYY means year and MM means month) +Example: +* /miscellaneous/2018-cryptie-video-poster.jpg + +## onstage +Pur all pictures here where FSFE affiliated people are on stage or in spotlight, giving a talk, a workhop etc. +Please give all pictures in here the following name: +* YYYY-SURNAME-LASTNAME-CONTENT +(YYYY means year and MM means month) +Example: +* /onstage/201906_Matthias_Kirschner_OW2con_Paris.jpg + + +## people +Put all pictures in here that show people as their main content, individually or in groups, but only fsfe-people! If we have a group picture by friends that we use in a context, we put them in miscelleanous, like for example: /miscelleanous/201610-pica-pica-hacklab.JPG +Please give all pictures in here the following name: +* YYYY-SURNAME-LASTNAME-CONTENT +(YYYY means year and MM means month) +Example: +* /people/2011-isabell-drost-fromm.jpg + + + + + + diff --git a/picturebase/about.txt b/picturebase/about.txt deleted file mode 100644 index 23321fd019..0000000000 --- a/picturebase/about.txt +++ /dev/null @@ -1,21 +0,0 @@ -this will become the database for the pictures to be used on fsfe.org that will be filled and organised in the upcoming weeks by Erik with Susanne. - -For now, in short: ALL pictures we use on our webpage in the long run shall end up in "picturebase" or in a subfolder. - -Subfolders will be made by categories. This will be - booths - all pictures that include a booth - people - pictures of individual people or groups that are associated with FSFE - events - all events by fsfe, community-meet-ups, summits, GA-meetings etc - community - pictures by and with our community - -all pictues in all categories shall use the following name-scheme: YEAR-MONTH-SHORT-NAME-AND-USE-KEYWORDS.jpg -For each item please put a .txt-file with the EXACT same name in this repository -where you leave the following information inside: -- Year: -- Author: (single or group) -- License: -- Contact: (for any question/feedback) -- Additional remarks: (if any) -- so far has been used (at/for/inside): - -If you scale the original image for any reason (most probably for web-publishing), then reuse the name with the suffix NAME-000px with 000 being the amount of the pixel in width of the image. diff --git a/picturebase/people/201906_Lucas_Lasota_Saarbrucken-horizontal.png b/picturebase/onstage/201906_Lucas_Lasota_Saarbrucken-horizontal.png similarity index 100% rename from picturebase/people/201906_Lucas_Lasota_Saarbrucken-horizontal.png rename to picturebase/onstage/201906_Lucas_Lasota_Saarbrucken-horizontal.png diff --git a/picturebase/people/201906_Lucas_Lasota_Saarbrucken-horizontal_800pxl.png b/picturebase/onstage/201906_Lucas_Lasota_Saarbrucken-horizontal_800px.png similarity index 100% rename from picturebase/people/201906_Lucas_Lasota_Saarbrucken-horizontal_800pxl.png rename to picturebase/onstage/201906_Lucas_Lasota_Saarbrucken-horizontal_800px.png diff --git a/picturebase/people/201906_Matthias_Kirschner_OW2con_Paris.jpg b/picturebase/onstage/201906_Matthias_Kirschner_OW2con_Paris.jpg similarity index 100% rename from picturebase/people/201906_Matthias_Kirschner_OW2con_Paris.jpg rename to picturebase/onstage/201906_Matthias_Kirschner_OW2con_Paris.jpg diff --git a/picturebase/people/201906_Matthias_Kirschner_OW2con_Paris_800pxl.jpg b/picturebase/onstage/201906_Matthias_Kirschner_OW2con_Paris_800pxl.jpg similarity index 100% rename from picturebase/people/201906_Matthias_Kirschner_OW2con_Paris_800pxl.jpg rename to picturebase/onstage/201906_Matthias_Kirschner_OW2con_Paris_800pxl.jpg diff --git a/picturebase/usage-index-and-information.ods b/picturebase/usage-index-and-information.ods deleted file mode 100644 index 6ee6719b95..0000000000 Binary files a/picturebase/usage-index-and-information.ods and /dev/null differ