<html>
<head>
<meta content="text/html; charset=ISO-8859-1"
http-equiv="Content-Type">
</head>
<body bgcolor="#FFFFFF" text="#000000">
Meanwhile I paste my summary of the git commands, please
add/correct/criticize:<br>
<br>
<meta http-equiv="CONTENT-TYPE" content="text/html;
charset=ISO-8859-1">
<p style="margin-bottom: 0cm; font-weight: normal" align="JUSTIFY"><br>
</p>
<p style="margin-bottom: 0cm" align="JUSTIFY"><b>Step 1</b></p>
<p style="margin-bottom: 0cm" align="JUSTIFY"><span
style="font-weight: normal">G</span><span style="font-weight:
normal">et
an account on github.com</span></p>
<p style="margin-bottom: 0cm" align="JUSTIFY"><b>Step 2</b></p>
<p style="margin-bottom: 0cm; font-weight: normal" align="JUSTIFY">Search
for
QGIS-Documentation repository and fork the repository just
pushing the fork button.</p>
<p style="margin-bottom: 0cm" align="JUSTIFY"><b>Step 3</b></p>
<p style="margin-bottom: 0cm" align="JUSTIFY"><span
style="font-weight: normal">G</span><span style="font-weight:
normal">o
on the main page of the repository and click on </span><b>Settings</b><span
style="font-weight: normal">
and change the default branch from </span><b>master</b><span
style="font-weight: normal">
to </span><b>manual_en_v1.8</b></p>
<p style="margin-bottom: 0cm" align="JUSTIFY"><b>Step 4</b></p>
<p style="margin-bottom: 0cm; font-weight: normal" align="JUSTIFY">Now
you
should copy the repository on your computer; open a the terminal
and go in the folder in which you want and type:</p>
<p style="margin-bottom: 0cm" align="JUSTIFY"><b><span lang="en-US">
git
clone </span><a
href="https://github.com/*your_name_on_github*/QGIS-Documentation.git"><span
lang="en-US">https://github.com/*your_name_on_github*/QGIS-Documentation.git</span></a></b></p>
<p style="margin-bottom: 0cm; font-weight: normal" align="JUSTIFY">This
command
create an exactly copy of the QGIS-Documentation repository
on your computer.</p>
<p style="margin-bottom: 0cm" align="JUSTIFY"><b>Step 5</b></p>
<p style="margin-bottom: 0cm; font-weight: normal" align="JUSTIFY">In
the
terminal type </p>
<p style="margin-bottom: 0cm" align="JUSTIFY"><span
style="font-weight: normal"> </span><b>sh
scripts/pre_translate.sh en</b></p>
<p style="margin-bottom: 0cm" align="JUSTIFY"><span
style="font-weight: normal"> </span><b>en</b><span
style="font-weight: normal">
has to be changed in the abbreviation of your language, e.g. </span><b>it</b><span
style="font-weight: normal">
for </span><span style="font-weight: normal">Italian</span></p>
<p style="margin-bottom: 0cm" align="JUSTIFY"><b>Step 6</b></p>
<p style="margin-bottom: 0cm; font-weight: normal" align="JUSTIFY">Go
on
and translate the files with a translation tools like QT-Linguist.</p>
<p style="margin-bottom: 0cm" align="JUSTIFY"><b>Step 7</b></p>
<p style="margin-bottom: 0cm; font-weight: normal" align="JUSTIFY">When
you
are finished with the translations you can verify if the file is
correct. Simply run:</p>
<p style="margin-bottom: 0cm; font-weight: normal" align="JUSTIFY">
<b>sh
script/post_translate.sh en</b></p>
<p style="margin-bottom: 0cm; font-weight: normal" align="JUSTIFY">
change
<b>en</b> with your language</p>
<p style="margin-bottom: 0cm" align="JUSTIFY"><b>Step 8</b></p>
<p style="margin-bottom: 0cm; font-weight: normal" align="JUSTIFY">Now
you
have to add the changes. Open a terminal and type:</p>
<p style="margin-bottom: 0cm; font-weight: normal" align="JUSTIFY">
<b>git
add -f path_to_the_file.po</b></p>
<p style="margin-bottom: 0cm; font-weight: normal" align="JUSTIFY">And
you
have to add a comment to this file, type:</p>
<p style="margin-bottom: 0cm; font-weight: normal" align="JUSTIFY">
<b>git
commit -m “comment_here”</b></p>
<p style="margin-bottom: 0cm; font-weight: normal" align="JUSTIFY"><b>Step
</b><b>9</b></p>
<p style="margin-bottom: 0cm; font-weight: normal" align="JUSTIFY">The
translated
files are present only on your cloned repository. For sync
the cloned repository to the forked one type:</p>
<p style="margin-bottom: 0cm; font-weight: normal" align="JUSTIFY">
<b>git
push origin manual_en_v1.8</b></p>
<p style="margin-bottom: 0cm; font-weight: normal" align="JUSTIFY"><b>Step
</b><b>10</b></p>
<p style="margin-bottom: 0cm; font-weight: normal" align="JUSTIFY">If
you
go on your homepage of github.com you will see that you
repository has changed and the files you translated appear in the
folders.</p>
<p style="margin-bottom: 0cm; font-weight: normal" align="JUSTIFY">The
final
step is to sync your forked repository with the main one. Just
click on the button <b>pull request </b>and confirm. If you want
you
can add another comment to the file.</p>
<p style="margin-bottom: 0cm; font-weight: normal" align="JUSTIFY">When
the
maintainers of the master repository accept your request the
files will be merged with the original one. </p>
<p style="margin-bottom: 0cm" align="JUSTIFY"><b>Step 11</b></p>
<p style="margin-bottom: 0cm; font-weight: normal" align="JUSTIFY">Be
aware
that when you fork the main repository from github it's like
you take a picture of that. The updated made on the main
repository
will not appear neither on your forked repository nor in your
cloned
one. </p>
<p style="margin-bottom: 0cm; font-weight: normal" align="JUSTIFY">So
once
in a while you have to update both your repositories. Open a
terminal, go in the directory where you cloned the repository and
create a remote:</p>
<p style="margin-bottom: 0cm; font-variant: normal; font-style:
normal" align="JUSTIFY">
<font color="#000000"><font face="Arial"><font style="font-size:
10pt" size="2"><b> git
remote add upstream <a
href="https://github.com/qgis/QGIS-Documentation.git">https://github.com/qgis/QGIS-Documentation.git</a></b></font></font></font></p>
<p style="margin-bottom: 0cm; font-variant: normal; font-style:
normal; font-weight: normal" align="JUSTIFY">
<font color="#000000"><font face="Arial"><font style="font-size:
10pt" size="2">Update
the remote:</font></font></font></p>
<p style="margin-bottom: 0cm; font-variant: normal; font-style:
normal" align="JUSTIFY">
<font color="#000000"><font face="Arial"><font style="font-size:
10pt" size="2"><span style="font-weight: normal"> </span><b>git
fetch
upstream</b></font></font></font></p>
<p style="margin-bottom: 0cm; font-variant: normal; font-style:
normal" align="JUSTIFY">
<font color="#000000"><font face="Arial"><font style="font-size:
10pt" size="2"><span style="font-weight: normal">Copy
the updates from the upstream to the </span><span
style="font-weight: normal">manual_en_v1.8
branch</span></font></font></font></p>
<p style="margin-bottom: 0cm; font-variant: normal; font-style:
normal" align="JUSTIFY">
<font color="#000000"><font face="Arial"><font style="font-size:
10pt" size="2"><span lang="en-US"><span style="font-weight:
normal"> </span></span><b>git
rebase upstream/<span lang="en-US">manual_en_v1.8 branch</span></b></font></font></font></p>
<p style="margin-bottom: 0cm; font-variant: normal; font-style:
normal; font-weight: normal" align="JUSTIFY">
<font color="#000000"><font face="Arial"><font style="font-size:
10pt" size="2">Updates
are only on the cloned repository, so sync it with the fork
on
github.com</font></font></font></p>
<p style="margin-bottom: 0cm; font-variant: normal; font-style:
normal; font-weight: normal" align="JUSTIFY">
<font color="#000000"><font face="Arial"><font style="font-size:
10pt" size="2"><span lang="en-US"> </span><span
lang="en-US"><b>git
push origin manual_en_v1.8</b></span></font></font></font></p>
<p style="margin-bottom: 0cm; font-variant: normal; font-style:
normal; font-weight: normal" align="JUSTIFY">
<font color="#000000"><font face="Arial"><font style="font-size:
10pt" size="2"> </font></font></font></p>
<p style="margin-bottom: 0cm" align="JUSTIFY"><br>
</p>
<p style="margin-bottom: 0cm" align="JUSTIFY"><br>
</p>
<title></title>
<meta name="GENERATOR" content="LibreOffice 3.6 (Linux)">
<style type="text/css">
<!--
@page { margin: 2cm }
P { margin-bottom: 0.21cm }
A:link { so-language: zxx }
-->
</style><br>
</body>
</html>