Merge remote-tracking branch 'weblate/master'

diff --git a/HOWTO.md b/HOWTO.md
index fb2d93f2240ca448159a2ed82b6b0ffbda1cfdcc..0de9858da361cd59e12e799d4f4ba926ba1c614a 100644 (file)
--- a/HOWTO.md
+++ b/HOWTO.md
@@ -118,7 +118,7 @@ with it, and we need to find ways to do several improvements. However,
 the following command will give you a good glimpse on how your
 finished translation looks:
 
-    po4a-translate -f text -m MadewithCreativeCommonsup-to-dateversion.md -p po/es/mwcc.po -l MadewithCreativeCommonsup-to-dateversion.es.md -l MadewithCreativeCommonsup-to-dateversion.es.md -L utf8 -M utf8 -k 20
+    po4a-translate -f text -m MadewithCreativeCommonsmostup-to-dateversion.md -p po/es/mwcc.po -l MadewithCreativeCommonsmostup-to-dateversion.es.md -l MadewithCreativeCommonsmostup-to-dateversion.es.md -L utf8 -M utf8 -k 20
 
 What does it all mean?
 
@@ -126,7 +126,7 @@ What does it all mean?
 
 The base format to/from which the translation is done is plain text.
 
-       -m MadewithCreativeCommonsup-to-dateversion.md
+       -m MadewithCreativeCommonsmostup-to-dateversion.md
 
 The name of your source document.
 
@@ -134,7 +134,7 @@ The name of your source document.
 
 Which translation to use. In this case, Spanish translation.
 
-       -l MadewithCreativeCommonsup-to-dateversion.es.md
+       -l MadewithCreativeCommonsmostup-to-dateversion.es.md
 
 Filename to use for the created translation. Do note that I'm
 specifying a name that implies Spanish.

diff --git a/Makefile b/Makefile
index 85b7c7a7ce35d678ce4ecc6e4342814c9aad9fa6..5c71457f87bf91360a90a8d2f58291a78f22a4e9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,8 +18,10 @@ LANGS = es nl nb
 
 all: pdf
 
+distclean: clean
+       rm -f $(SOURCE).md
 clean:
-       rm -f $(SOURCE).pdf $(SOURCE).xml $(SOURCE).md
+       rm -f $(SOURCE).pdf $(SOURCE).xml
        for LANG in $(LANGS); do \
            rm -f $(SOURCE).$$LANG.pdf $(SOURCE).$$LANG.xml $(SOURCE).$$LANG.md ;\
         done
@@ -46,7 +48,10 @@ po/mwcc.pot: $(SOURCE).md
        done
 
 $(SOURCE).es.md: $(SOURCE).md po/es/mwcc.po
-       po4a-translate -f text -m $(SOURCE).md -p po/es/mwcc.po -l $@ -l $@ -L utf8 -M utf8 -k 20
+       po4a-translate -f text -m $(SOURCE).md -p po/es/mwcc.po -l $@ -l $@ -L utf8 -M utf8 -k 0
+
+$(SOURCE).nb.md: $(SOURCE).md po/nb/mwcc.po
+       po4a-translate -f text -m $(SOURCE).md -p po/nb/mwcc.po -l $@ -l $@ -L utf8 -M utf8 -k 0
 
 %.xml: %.md
        pandoc -s -o $@ $(PANDOC_OPTS) $^
@@ -61,17 +66,21 @@ pdf: $(SOURCE).pdf
 %.tex: %.xml
        dblatex -t tex -b xetex $^
        perl -p -i -e 's/\[latin1\]\{inputenc\}/[utf8]{inputenc}\n\\usepackage[spanish]{babel}/; \
+               s/\\setcounter\{tocdepth\}.*/\\setcounter{tocdepth}{1}/; \
+               s/\\setcounter\{secnumdepth\}.*/\\setcounter{secnumdepth}{-1}/; \
                s/\\caption\\end/\\caption{} \\end/; \
+               s!\\maketitle!\\input{extra/es/cover.tex}!; \
                s/\\author\{and\}/\\author{Paul Stacey \\and Sarah Hinchliff Pearson}/; \
                s/\\DBKinditem\{\\writtenby\}\{and\}/\\DBKinditem{\writtenby}{Paul Stacey and Sarah Hinchliff Pearson}/; \
-               s/\\part\{(Prefacio|Introducción)\}/\\chapter*{$$1} \\addcontentsline{toc}{chapter}{$$1}/; \
-               s/\\section\{Notas\}/\\section*{Notas}/; \
-               s/(Vínculos Web)/\\section*{$$1}/; \
-               s/^\s*(Modelo de ingresos|Fecha de la entrevista|Entrevistad(?:o|a|os|as))/\\textbf{$$1}/;' $@
-       perl -p -i -e '$$work=1 if /chapter.Arduino/; $$work=0 if /chapter.Bibliografía/; \
+               s/\\listoffigures//; \
+               s/\\part\{(Foreword|Prefacio|Introduction|Introducción)\}/\\chapter*{$$1} \\addcontentsline{toc}{chapter}{$$1}/; \
+               s/\\section\{(Notes|Notas)\}/\\section*{$$1}/; \
+               s/(Web links?|Vínculos Web)/\\section*{$$1}/; \
+               s/^\s*(Revenue model|Interview date|Interviewees?|(Modelo de ingresos|Fecha de la entrevista|Entrevistad(?:o|a|os|as)))/\\textbf{$$1}/;' $@
+       perl -p -i -e '$$work=1 if /chapter.Arduino/; $$work=0 if /chapter.(Bibliography|Bibliografía)/; \
                next unless $$work; \
                s/(\\label\{[-\.\wáéíóúñ]+\}\\hyperlabel\{[-\.\wáéíóúñ]+\}%)/$$1\n\\begin{quote}/i; \
-               s/(Perfil escrito por.+)/$$1\n\\end{quote}/' $@
+               s/(Profile written by.+|Perfil escrito por.+)/$$1\n\\end{quote}/' $@
 
 XMLLINTOPTS = --nonet --noout  --xinclude --postvalid
 lint: $(SOURCE).xml

diff --git a/docs/andres_delgado.pdf b/docs/andres_delgado.pdf
new file mode 100644 (file)
index 0000000..0b9b381
Binary files /dev/null and b/docs/andres_delgado.pdf differ

diff --git a/docs/evelin_heider.pdf b/docs/evelin_heider.pdf
new file mode 100644 (file)
index 0000000..720fa57
Binary files /dev/null and b/docs/evelin_heider.pdf differ

diff --git a/extra/es/cover.tex b/extra/es/cover.tex
new file mode 100644 (file)
index 0000000..060549f
--- /dev/null
+++ b/extra/es/cover.tex
@@ -0,0 +1,18 @@
+\begin{titlepage}
+  \thispagestyle{empty}
+  \begin{center}
+    ~ \vfill
+    \Huge
+    \textsc{Hecho con Creative Commons}
+    \vskip 2cm
+    \Large
+    Paul Stacey y Sarah Hinchliff Pearson
+    \vskip 1cm
+    \large
+    Traducción:\\
+    Luis Enrique Amaya González, Gunnar Eyal Wolf Iszaevich, \\
+    Leonardo Arias Fonseca, Evelin (?), Andrés Delgado
+  \end{center}
+
+  \vfill \eject
+\end{titlepage}

diff --git a/po/es/mwcc.po b/po/es/mwcc.po
index 25ab416a67c96c2b92b66e41dec2b442b8579c88..3885187a4714dcc49b5141cda697f6395ffbc473 100644 (file)
--- a/po/es/mwcc.po
+++ b/po/es/mwcc.po
@@ -4031,7 +4031,7 @@ msgstr ""
 #. type: Plain text
 #: MadewithCreativeCommonsmostup-to-dateversion.md:1682
 msgid "#### Market-based revenue streams"
-msgstr "#### Flujos de ganancia basados en el mercado"
+msgstr "#### Flujos de ingresos basados en el mercado"
 
 #. type: Plain text
 #: MadewithCreativeCommonsmostup-to-dateversion.md:1689
@@ -4428,7 +4428,7 @@ msgstr ""
 #. type: Plain text
 #: MadewithCreativeCommonsmostup-to-dateversion.md:1848
 msgid "#### Reciprocity-based revenue streams"
-msgstr "#### Flujos de ganancia basados en el mercado"
+msgstr "#### Flujos de ingresos basados en la reciprocidad"
 
 #. type: Plain text
 #: MadewithCreativeCommonsmostup-to-dateversion.md:1853