From eb73ed07b217743bf7a2c589f112657d60dd3cbb Mon Sep 17 00:00:00 2001 From: Francis Rowe Date: Sun, 24 May 2015 13:12:45 -0400 Subject: switch to gettext() - TODO: i18n --- (limited to 'site') diff --git a/site/common/snippets/where-share.php b/site/common/snippets/where-share.php new file mode 100644 index 0000000..5bebf05 --- /dev/null +++ b/site/common/snippets/where-share.php @@ -0,0 +1,19 @@ +
+ +

+

+ +

+ + +
\ No newline at end of file diff --git a/site/contrib/index.php b/site/contrib/index.php index c5b5c20..2a2a19e 100644 --- a/site/contrib/index.php +++ b/site/contrib/index.php @@ -28,7 +28,7 @@ - Libreboot project maintainers + <?php echo gettext("Libreboot project maintainers"); ?> @@ -38,10 +38,11 @@
-

Libreboot project maintainers

+

- List of project maintainers, and how to contact them. Back to homepage + +

@@ -50,35 +51,29 @@

Francis Rowe

- Main developer, manages the libreboot website and git repository. - He can be contacted on IRC (freenode) in #libreboot by the alias fchmmr, or - you can contact him by his email address info@gluglug.org.uk - (GPG). + + fchmmr, or you can contact him by his email address info@gluglug.org.uk (GPG)."); ?>

Michał Masłowski

- Maintains the libreboot bug tracker linked from the homepage. - Coreboot developer, responsible for porting new boards that are compatible with libreboot. - Contact him by his alias mtjm on the - libreboot IRC channel, or find contact information (including GPG keys) on his website http://mtjm.eu/ + + + mtjm on the libreboot IRC channel, or find contact information (including GPG keys) on his website http://mtjm.eu/"); ?>

Patrick "P. J." McDermott

- ProteanOS maintainer, responsible for maintaining ProteanOS builds on many libreboot - targets. His alias on the libreboot IRC channel is pehjota, or you can find contact information on - the ProteanOS website. + ProteanOS maintainer, responsible for maintaining ProteanOS builds on many libreboot targets."); ?> + pehjota, or you can find contact information on the ProteanOS website."); ?>

Lisa Maginnis

- FSF sysadmin, responsible for maintaining the libreboot and libreboot-dev mailing lists. - Contact nully in the libreboot IRC channel. + FSF sysadmin, responsible for maintaining the libreboot and libreboot-dev mailing lists."); ?> + nully in the libreboot IRC channel."); ?>

Steve Shenton

- Wrote the original ich9deblob utility (ich9gen is based on it), which was used to - remove the ME on ICH9-M - laptops (originally the ThinkPad X200, and later expanded to more laptops). Contact sgsit on - the libreboot IRC channel. + remove the ME on ICH9-M laptops (originally the ThinkPad X200, and later expanded to more laptops)."); ?> + sgsit on the libreboot IRC channel."); ?>

diff --git a/site/download/index.php b/site/download/index.php index d3fd58f..22ddc48 100644 --- a/site/download/index.php +++ b/site/download/index.php @@ -29,7 +29,7 @@ - Download libreboot + <?php echo gettext("Download libreboot"); ?> @@ -39,48 +39,46 @@
-

Download libreboot

+

-

Links to HTTP mirrors, rsync mirrors and git repositories. Download libreboot here.

+

- Back to home page +

-

GPG signing key

+

- Download the key:
+
$ gpg --recv-keys

- Download the SHA512 manifest and it's corresponding GPG signature - for the release that you are using, and put them in a directory. - Put the src, util and docs archives in the root of that directory, - alongside the SHA512 manifest file. - Put your ROM image archives under rom/ in that directory. - Put your crossgcc tarballs under crossgcc/ in that directory. + + + rom/ in that directory."); ?> + crossgcc/ in that directory."); ?>

- After you've done this, verify the SHA512 checksums:
+
$ sha512sum -c sha512sum.txt

- You can verify the downloaded SHA512 manifest as follows:
+
$ gpg --verify sha512sum.txt.sig

@@ -88,55 +86,54 @@
-

HTTP mirrors (releases)

+

- These releases are more rigorously tested. However, they might be - out of date compared to the current development snapshots. + +

- These archives are not updated very often, and will not receive any further changes. +

- Download libreboot from one of these mirrors. +

- The latest release has a version number of , - and was released on . + . + .

FTP mirrors

-

Rsync mirrors (for mirroring libreboot)

+

- Create a directory in your web server document root (e.g. libreboot/), - and add one of these to your crontab: +

0) { ?> -

Main rsync mirror:

+

$ rsync -avxP --delete --stats /path/to/docroot/libreboot/

1) { ?> -

Backup rsync mirrors:

+

- No mirrors available yet. +

- Are you running a mirror? Contact the libreboot project - (details are on the home page), and the link will be added here. +

-

Git repositories (development)

+

- The git repositories are intended for developing libreboot. - For a list of current tasks in libreboot, see ../docs/tasks.html. + + ../docs/tasks.html.

- Maintenance guides for libreboot can be found at - ../docs/maintain/index.html - and ../docs/git/index.html. + ../docs/maintain/index.html and ../docs/git/index.html."); ?>

-

How to download

+

- Firmware (coreboot distribution). This also contains the documentation:
+ This also contains the documentation:"); ?>
$ git clone

- website. The documentation is in the other repository linked above:
+ The documentation is in the other repository linked above:"); ?>
$ git clone

- You might not see a progress bar; it's still cloning, so just be patient. +

-

Submitting patches to libreboot

+

- The git documentation describes how to use git. + git documentation describes how to use git."); ?>

- Make sure that you configured git so that your name and email - address appear in the commits that you create:
+
$ git config --global user.name "Your Name"
$ git config --global user.email your@emailaddress.com

- The following is also useful:
+
$ git config --global core.editor nano
$ git config --global color.status auto
$ git config --global color.branch auto
@@ -216,89 +209,72 @@ $ git config --global color.diff auto

- Clone the git repository, and make your desired changes. You can make one or several commits (as many as you like). - Generally speaking, you should create separate commits on top of each other, for each kind of change. + + +

- Once you have made your change(s), you can use this to check the status:
+
$ git status

- If you are modifying an existing file, make sure to update the copyright license header - in that file; in source files or scripts, this would usually be at the top, and for documentation - it is typically at the bottom of the document. It is good practise to use your real name in the - commit logs.
- Example: Copyright (C) 20XX John Doe <john@doe.com> +
+ Copyright (C) 20XX John Doe <john@doe.com>"); ?>

- Generally speaking, using the same license as the file that you are modifying is much simpler. - If you are submitting new - files, please make sure that they are under a free license (copyleft preferred). - You can find a list on + + + https://www.gnu.org/licenses/license-list.html.

- The libreboot project will not accept - documentation released under the GNU Free Documentation License, because we do not want to endorse - or support the Invariant clauses that this license allows. Changes submitted under this - license will be rejected, even if it contains no Invariant sections + GNU Free Documentation License, because we do not want to endorse or support the Invariant clauses that this license allows. Changes submitted under this license will be rejected, even if it contains no Invariant sections."); ?>

- The status command will show any untracked files that you have. Add them using git add path/to/file. - You should also add any other files that are listed as modified in the git status. If there are deleted - files in the git status, you can use git rm path/to/file. As long as you have added all the untracked - files, it is generally easier to use:
+ git add path/to/file. You should also add any other files that are listed as modified in the git status. If there are deleted files in the git status, you can use git rm path/to/file. As long as you have added all the untracked files, it is generally easier to use:"); ?>
$ git commit -a
- (instead of git commit) + git commit)"); ?>

- If you need to make a change to the current commit, you can do so with:
+
$ git commit --amend
- or:
+
$ git commit -a --amend

- In your local git tree, you can use this to check your commits:
+
$ git log

- Shortened git logs showing the short commit ID and the commit title, plus info about what branch - you are on, and where all your remotes/heads are:
+
$ git config --global --add alias.lol "log --graph --decorate --pretty=oneline --abbrev-commit --all"
- From then on, you can use:
+
$ git lol
- This is like git log, but on steroids. + git log, but on steroids."); ?>

-

Method 1: host a repository

+

- One way of contribiting a patch for review is to host a repository containing your modified branch. - Give the checkout details to the libreboot project, along with information - on which commits in what branch contain your changes. - Contact the libreboot project using the details on the home page. +

-

Method 2: git format-patch -N

+

- Use this method (replace N with the number of commits that you made) and send the .patch files to the - libreboot project, along with details on what branch and revision these were - made on top of. - Contact the libreboot project using the details on the home page. +

-

Backup repositories

+

- Generally speaking, you should use the main repositories. These repositories are provided - as backups, in case the main repositories are down. +

-

Firmware (coreboot distribution)

+

-

Libreboot website

+

- Libreboot includes statically linked executables of utilities built from the libreboot source code. - These are built on in Trisquel GNU/Linux. There were links to - the Trisquel source ISO here, as a lazy way to provide CCS, but this was inefficient. Archives for - only those dependencies that comprise the CCS will be added here later instead. If you need CCS, - for now simply contact the libreboot project using the details on the home page, and the source for - the version of Trisquel used to build that release (whichever version it is) will be provided. You can - also get it on the Trisquel website. +

diff --git a/site/footer.php b/site/footer.php index 6e9fab5..6c5c969 100644 --- a/site/footer.php +++ b/site/footer.php @@ -18,10 +18,9 @@ */ ?>

- This page is released under GNU AGPLv3 or higher, - and available in a git repository. + GNU AGPLv3 or higher, and available in a git repository:"); ?> + .

- This website is hosted on a libreboot system, running a - fully libre GNU/Linux distribution. + fully libre GNU/Linux distribution."); ?>

diff --git a/site/github/index.php b/site/github/index.php index 560aac7..e3fddb3 100644 --- a/site/github/index.php +++ b/site/github/index.php @@ -28,7 +28,7 @@ - Please do not use GitHub! + <?php echo gettext("Please do not use GitHub!"); ?> @@ -38,85 +38,71 @@
-

Please do not use GitHub!

+

- Please do not use GitHub to host libreboot. - Libreboot is a free software project, so this is only a request, and not a restriction on the software. + +

- Don't use gitorious, either. + +

+

+

-

What's wrong with GitHub?

+

  • - GitHub itself is proprietary software (Tim reasons it's for business + [1])
  • - A patch[2] to - choose a license was received with some hostility. + 2] to choose a license was received with some hostility."); ?> +
    • +
  • +
    • -
  • Tim really likes to talk about freedom, but makes the following claims about the GPLv2/3:

- ...The GPL is not focused on freedom. It's too long. - Too many restrictions. -- Tom Preston-Werner OSCON2013 +

-

or how about:

+

- Notice that everything we keep closed has specific business value - that could be compromised by giving it away to our competitors. - -- Tom Preston-Werner's - blog + blog"); ?>

- GitHub simply uses Free Software for its own benefit, releasing source code under a free license - only when suited to it's business goals; they are quite happy to violate the rights of their users, for profit. +

- By contrast, the libreboot project adheres strictly to the goals of the Free Software movement, which - seeks to eliminate proprietary software to the point where all software is free. +

- The opinions expressed by Tom Preston-Werner of GitHub are incompatible with those of - the libreboot project. Users and developers of - free software - are strongly advised not to use GitHub, for any of their projects. + free software are strongly advised not to use GitHub, for any of their projects."); ?>

- -
-
    -
  • - Host your own repositories. This is exactly what libreboot does, - hosted on a machine that is running libreboot! You can use a frontend like - gitweb - for easy viewing by others. For code review, you can use an IRC channel, mailing lists and other - methods that allow mass collaboration. -
    • -
  • - Jason Self lists a few replacements on this page: - http://jxself.org/goodbye-gitorious.shtml -
    • -
+ + +

[1] @@ -138,12 +124,7 @@

- This text on this page was adapted from - http://librecmc.org/librecmc/wiki?name=github, - licensed under CC BY-SA 4.0 like the original. -

-

- Back to home page + http://librecmc.org/librecmc/wiki?name=github, licensed under CC BY-SA 4.0 like the original."); ?>

diff --git a/site/gitorious/index.php b/site/gitorious/index.php index f5d337b..86097c7 100644 --- a/site/gitorious/index.php +++ b/site/gitorious/index.php @@ -28,7 +28,7 @@ - Please do not use Gitorious! + <?php echo gettext("Please do not use Gitorious or GitLab!"); ?> @@ -38,107 +38,66 @@
-

Please do not use Gitorious or GitLab!

+

- Please do not use Gitorious or GitLab to host libreboot. - Libreboot is a free software project, so this is only a request, and not a restriction on the software. + +

- Don't use github, either. + +

+

+

-

What's wrong with Gitorious?

+

  • - They have completely sold us out - to a company whose main business model is proprietary software. + completely sold us out to a company whose main business model is proprietary software."); ?>
  • - Gitorious is now owned by GitLab. GitLab is essentially the same as GitHub; there is a - free (libre) version of GitLab, but this is bait-and-switch for their so-called enterprise - version which is proprietary software. + + enterprise version which is proprietary software."); ?>
  • - The GitLab site itself also runs on a proprietary version of GitLab. GitLab has the same - rotten attitude - as GitHub when it comes to free software. + + rotten attitude as GitHub when it comes to free software."); ?>
  • - GitLab is permissively licensed, which means that it completely lacks copyleft. - Anyone (including the main GitLab upstream) can re-release a proprietary version - and completely refuse to give out source code. + +
  • - GitLab CEO Sytse Sijbrandij has the same attitude - as the github CEO, regarding GPL, quote "We're very happy with the MIT since it has the least amount of restrictions for everyone. But we respect your opinion and hope you will consider contributing to GitLab in the future." - -- the statement was made by him in response to a question asking about copyleft in GitLab, and more specifically about AGPL (which - the gitorious software was released under). + attitude as the github CEO, regarding GPL, quote "We're very happy with the MIT since it has the least amount of restrictions for everyone. But we respect your opinion and hope you will consider contributing to GitLab in the future." -- the statement was made by him in response to a question asking about copyleft in GitLab, and more specifically about AGPL (which the gitorious software was released under)."); ?>

- Gitorious now simply uses Free Software for its own benefit, releasing source code under a free license - only when suited to it's business goals; they are quite happy to violate the rights of their users, for profit - (since they are now part of GitLab, which has been doing so for quite some time). +

- The old gitorious website was however run by fully AGPL licensed software, which you could - self-host. This page is anti-gitorious-company. Gitorious (software) will most likely be forked. +

- By contrast, the libreboot project adheres strictly to the goals of the Free Software movement, which - seeks to eliminate proprietary software to the point where all software is free. +

- The proprietary developments in GitLab are unacceptable to - the libreboot project. Users and developers of - free software - are strongly advised not to use GitLab or Gitorious, for any of their projects. + free software are strongly advised not to use GitLab or Gitorious, for any of their projects."); ?>

- -
- -

Where should I host and share my code?

-

- Here are a few examples: -

-
    -
  • - Host your own repositories. This is exactly what libreboot does, - hosted on a machine that is running libreboot! You can use a frontend like - gitweb - for easy viewing by others. For code review, you can use an IRC channel, mailing lists and other - methods that allow mass collaboration. -
    • -
  • - Jason Self lists a few replacements on this page: - http://jxself.org/goodbye-gitorious.shtml -
    • -
-
- -
- -

- Jason Self also posted his own article here: http://jxself.org/goodbye-gitorious.shtml -

- -

- Back to home page -

- -
+
diff --git a/site/index.php b/site/index.php index 0472174..9d4e2a5 100644 --- a/site/index.php +++ b/site/index.php @@ -28,7 +28,7 @@ - Libreboot project + <?php echo gettext("Libreboot project"); ?> @@ -40,57 +40,57 @@

" />

-

Libreboot project

+

- Libreboot is a free (libre) - BIOS/UEFI replacement for your computer. Based on coreboot, the aim is to distribute - low-level boot firmware that is 100% free software, and to make coreboot easy to use. + free (libre) BIOS/UEFI replacement for your computer. Based on coreboot, the aim is to distribute low-level boot firmware that is 100% free software, and to make coreboot easy to use."); + ?>

-

Download libreboot

+

-

Support

+

-

Contact information

+

-- cgit v0.9.1