diff --git a/pages/01.home/home.es.md b/pages/01.home/home.es.md new file mode 100644 index 00000000..77af1fa8 --- /dev/null +++ b/pages/01.home/home.es.md @@ -0,0 +1,25 @@ +--- +title: Inicio +content: + items: + '@taxonomy': + category: [topic] + order: + by: default + dir: asc + pagination: true +--- + +### Bienvenid@s al sitio de Manuales y Tutoriales de Disroot. + +El objetivo principal de este sitio es orientarte a través de los varios servicios de **Disroot**. + +Cubrir todos los servicios, con todas las características provistas por **Disroot**, para todas las plataformas y/o Sistemas Operativos es un proyecto muy ambicioso, que demanda mucho tiempo y requiere mucho trabajo. Pensamos que podría ser beneficioso no solo para nuestros usuarios y usuarias (disrooters) sino para toda comunidad de Software Libre y de Código Abierto que use los mismos programas o similares. + +Para hacerlo, toda ayuda de los y las disrooters es siempre necesaria y bienvenida. Así que, si piensas que falta un tutorial, que no la información no es correcta o puede mejorarse, por favor, contáctanos o (mejor aún) empieza a escribir una guía o tutorial tú mismo.
+ +Utilizamos **[Git](https://es.wikipedia.org/wiki/Git)**, así que podrías simplemente enviar un "*pull request*" (*petición de validación*) a nuestro repositorio. Si no estás familiarizada/o con esta herramienta, puedes enviar cambios o sugerencias via Etherpad o correo electrónico. [**Aquí**](/contribute/git) hay una guía muy simple de git.
+ +Adicionalmente, estamos construyendo un glosario para ayudar a todos aquellos que no están familiarizados con algunos términos y conceptos. Puedes verlo [aquí](/glossary). + +Comencemos... diff --git a/pages/06.Contribute/00.ways2contribute/docs.en.md b/pages/06.Contribute/00.ways2contribute/docs.en.md index a62bced2..0aa72f15 100644 --- a/pages/06.Contribute/00.ways2contribute/docs.en.md +++ b/pages/06.Contribute/00.ways2contribute/docs.en.md @@ -1,5 +1,5 @@ --- -title: How-to Contribute: Choose the way +title: "How-to Contribute: Choose the way" published: true visible: true updated: @@ -32,6 +32,8 @@ Through the forum you can upload, write or share a how-to and also make suggesti You can communicate with us at our **Disroot** How-To's XMPP Room.

**Technical level required**: very basic. ---- +### [Disroot Translations](/contribute/translations_procedure) +If you want to collaborate by translating **Disroot HowTo** to your language, please, check this guide. ### [Disroot's How-To style guide](/contribute/styleguide) Some basic guidelines about the content and style criteria for the how-to's. diff --git a/pages/06.Contribute/06.Translations_procedure/docs.en.md b/pages/06.Contribute/06.Translations_procedure/docs.en.md new file mode 100644 index 00000000..0ee34a28 --- /dev/null +++ b/pages/06.Contribute/06.Translations_procedure/docs.en.md @@ -0,0 +1,82 @@ +--- +title: Translation Procedure +published: true +visible: true +updated: +taxonomy: + category: + - docs + tags: + - contribute + - style +page-toc: + active: true +--- +# Why a translation procedure? +We think that the possibility of making information accessible to all in their own languages is fundamental in order to encourage and promote collective thoughts and actions. So coordinating the amount of information to be translated is an important task. + +The translations procedure consist of **four** main steps. + +## First: One-time steps +1. Register an account at https://git.fosscommunity.in/users/sign_in +2. Open a terminal and start git
+`git init`
+ +3. Setup the git username and email
+`git config --global user.email user@email`
+`git config --global user.name "User Name"`
+ + +## Second: Selecting a section to be translated +1. Login at [**Disroot Translations Board**](https://board.disroot.org/project/fede-disroot-translations/timeline) +2. Select the **Epic** (*the set of User Stories*) corresponding to the language into which you are going to translate +3. Select the **User Story** (*the section to be translated*) and **assign** it to yourself
+ +![](en/assign.gif) + +## Third: Working on translations +1. **Clone the Disroot Howto repository**
+ a. Navigate to the folder where you're going work in (or open the terminal in the folder)
+ b. Clone the repository
+ `git clone https://git.fosscommunity.in/disroot/howto` +2. **Open Atom text editor**
+ a. Go to **File**, select **Add Project Folder** and browse to the folder where the project was cloned.
+![](en/atom_interface1.png)
+ b. Create a branch (the branch should have this format: site_section.to.be.translated_LAnguage
+ For example:
+ howto_contribute_git_ES
+ howto_email_webmail_IT
![](en/branch_01.gif)
+ c. Start working on the translations
+ d. Save as "filename.your-language-code.md"
+ For example, if you were working on a french translation of a file named as "docs.md", you have to save it as "docs.fr.md" + +3. **Sending the translation**
+ Once your work is done, you'll have to "commit" your changes. A commit is a set of files created of modified. To commit your changes need to:
+ a. Make sure all files are saved
+ b. Stage all the files you've modified and want to commit to the server
+ c. Write a commit message (a short and very specific summary of what has been changed)
+ d. Hit **Commit** button
+ + ![](en/commit.gif)
+ + Once the files are commited, you have to "push" (send) them to the server:
+ e. Open **Push/Pull** popup window
+![](en/pull_push.png)
+ + f. Press **Push**
+ + ![](en/push.gif)
+ +## Fourth: Requesting the merge of the Translations +Final step is to request the merge of your work into the master branch. This means that once your finished and sent the translation, you need to request **Disroot Translation Team** to check if it's all right to finally add it to the site.
+1. Login to https://git.fosscommunity.in
+ At the top right you'll see a **Create Merge Request** button that will open the merge request form, click on it +2. Add a title +3. Add a descripton +4. Make sure the source branch is the one you want to merge from (the one you've been working on) +5. Make sure the target branch is the one you want to merge to (usually Master branch) +6. Check the box **Delete source branch when merge request is accepted** if you're completely sure your work is done, this way chances of confusing subsequent translations are avoided. + +If there's any issue, Admins could request you to correct something. Once all the corrections are made and the documentation meets the **Disroot** guidelines, your merge request will be pulled to the master. + +To have a better overview on working with git and Atom, please check [**this tutorial**](https://howto.disroot.org/en/contribute/git/how-to-use-git). diff --git a/pages/06.Contribute/06.Translations_procedure/en/assign.gif b/pages/06.Contribute/06.Translations_procedure/en/assign.gif new file mode 100644 index 00000000..cec73c17 Binary files /dev/null and b/pages/06.Contribute/06.Translations_procedure/en/assign.gif differ diff --git a/pages/06.Contribute/06.Translations_procedure/en/atom-pull.gif b/pages/06.Contribute/06.Translations_procedure/en/atom-pull.gif new file mode 100755 index 00000000..821020b4 Binary files /dev/null and b/pages/06.Contribute/06.Translations_procedure/en/atom-pull.gif differ diff --git a/pages/06.Contribute/06.Translations_procedure/en/atom1.png b/pages/06.Contribute/06.Translations_procedure/en/atom1.png new file mode 100755 index 00000000..b7024bb0 Binary files /dev/null and b/pages/06.Contribute/06.Translations_procedure/en/atom1.png differ diff --git a/pages/06.Contribute/06.Translations_procedure/en/atom_interface1.png b/pages/06.Contribute/06.Translations_procedure/en/atom_interface1.png new file mode 100755 index 00000000..a0172081 Binary files /dev/null and b/pages/06.Contribute/06.Translations_procedure/en/atom_interface1.png differ diff --git a/pages/06.Contribute/06.Translations_procedure/en/branch_01.gif b/pages/06.Contribute/06.Translations_procedure/en/branch_01.gif new file mode 100755 index 00000000..8c18f0b3 Binary files /dev/null and b/pages/06.Contribute/06.Translations_procedure/en/branch_01.gif differ diff --git a/pages/06.Contribute/06.Translations_procedure/en/commit.gif b/pages/06.Contribute/06.Translations_procedure/en/commit.gif new file mode 100755 index 00000000..4eb948cc Binary files /dev/null and b/pages/06.Contribute/06.Translations_procedure/en/commit.gif differ diff --git a/pages/06.Contribute/06.Translations_procedure/en/git-merge_request.gif b/pages/06.Contribute/06.Translations_procedure/en/git-merge_request.gif new file mode 100755 index 00000000..5bc4f3ba Binary files /dev/null and b/pages/06.Contribute/06.Translations_procedure/en/git-merge_request.gif differ diff --git a/pages/06.Contribute/06.Translations_procedure/en/git-request_access.png b/pages/06.Contribute/06.Translations_procedure/en/git-request_access.png new file mode 100755 index 00000000..6a9d392f Binary files /dev/null and b/pages/06.Contribute/06.Translations_procedure/en/git-request_access.png differ diff --git a/pages/06.Contribute/06.Translations_procedure/en/howto-duplicate1.gif b/pages/06.Contribute/06.Translations_procedure/en/howto-duplicate1.gif new file mode 100755 index 00000000..a05836e3 Binary files /dev/null and b/pages/06.Contribute/06.Translations_procedure/en/howto-duplicate1.gif differ diff --git a/pages/06.Contribute/06.Translations_procedure/en/note.png b/pages/06.Contribute/06.Translations_procedure/en/note.png new file mode 100644 index 00000000..e4ba6a4e Binary files /dev/null and b/pages/06.Contribute/06.Translations_procedure/en/note.png differ diff --git a/pages/06.Contribute/06.Translations_procedure/en/publish.png b/pages/06.Contribute/06.Translations_procedure/en/publish.png new file mode 100644 index 00000000..a0ac4d11 Binary files /dev/null and b/pages/06.Contribute/06.Translations_procedure/en/publish.png differ diff --git a/pages/06.Contribute/06.Translations_procedure/en/pull_push.png b/pages/06.Contribute/06.Translations_procedure/en/pull_push.png new file mode 100755 index 00000000..cd4bae92 Binary files /dev/null and b/pages/06.Contribute/06.Translations_procedure/en/pull_push.png differ diff --git a/pages/06.Contribute/06.Translations_procedure/en/push.gif b/pages/06.Contribute/06.Translations_procedure/en/push.gif new file mode 100644 index 00000000..a4deb946 Binary files /dev/null and b/pages/06.Contribute/06.Translations_procedure/en/push.gif differ diff --git a/pages/06.Contribute/06.Styleguide/docs.en.md b/pages/06.Contribute/07.Styleguide/docs.en.md similarity index 100% rename from pages/06.Contribute/06.Styleguide/docs.en.md rename to pages/06.Contribute/07.Styleguide/docs.en.md diff --git a/pages/06.Contribute/06.Styleguide/docs.en.md.bak b/pages/06.Contribute/07.Styleguide/docs.en.md.bak similarity index 100% rename from pages/06.Contribute/06.Styleguide/docs.en.md.bak rename to pages/06.Contribute/07.Styleguide/docs.en.md.bak diff --git a/pages/06.Contribute/06.Styleguide/en/commodore.jpg b/pages/06.Contribute/07.Styleguide/en/commodore.jpg similarity index 100% rename from pages/06.Contribute/06.Styleguide/en/commodore.jpg rename to pages/06.Contribute/07.Styleguide/en/commodore.jpg diff --git a/pages/06.Contribute/06.Styleguide/en/licensing-pic.png b/pages/06.Contribute/07.Styleguide/en/licensing-pic.png similarity index 100% rename from pages/06.Contribute/06.Styleguide/en/licensing-pic.png rename to pages/06.Contribute/07.Styleguide/en/licensing-pic.png diff --git a/pages/06.Contribute/06.Styleguide/en/name_of_folder_full_of_media_files/example_1.png b/pages/06.Contribute/07.Styleguide/en/name_of_folder_full_of_media_files/example_1.png similarity index 100% rename from pages/06.Contribute/06.Styleguide/en/name_of_folder_full_of_media_files/example_1.png rename to pages/06.Contribute/07.Styleguide/en/name_of_folder_full_of_media_files/example_1.png diff --git a/pages/06.Contribute/06.Styleguide/en/thing2.jpg b/pages/06.Contribute/07.Styleguide/en/thing2.jpg similarity index 100% rename from pages/06.Contribute/06.Styleguide/en/thing2.jpg rename to pages/06.Contribute/07.Styleguide/en/thing2.jpg