Commit a5e62488 authored by anonym's avatar anonym

Unfuzzy PO files changed by refs: #17005.

I used this hacky approach:

    git diff 6b9e13f1^..origin/master  -- *.po > lots-of-fuzzy.patch
    patch -R -p1 < lots-of-fuzzy.patch
    git commit

So I undid all the PO changes of #17005. The idea is to unfuzzy
lots-of-fuzzy.patch and then apply this patch instead, and then squash
those changes into the "revert" commit we made above, turning it into
the commit I'm writing right now.

The fuzzy cases I care aboute looke like this:

    -#, no-wrap
    -msgid "Online anonymity and censorship circumvention\n"
    +#, fuzzy, no-wrap
    +#| msgid "Online anonymity and censorship circumvention\n"
    +msgid "Online anonymity and censorship circumvention"
     msgstr "Onlineanonymität und Zensurumgehung\n"

and should be transformed into this:

     #, no-wrap
    -msgid "Online anonymity and censorship circumvention\n"
    +msgid "Online anonymity and censorship circumvention"
    -msgstr "Onlineanonymität und Zensurumgehung\n"
    +msgstr "Onlineanonymität und Zensurumgehung"

Behold this ugly state machine (my favored way of solving these kind
of problems in small steps without having to think much about the
whole problem):

    out = open('unfuzzy.patch', 'w')
    state = 0
    fuzzy_buf = ''
    unfuzzy_buf = ''
    File.read('lots-of-fuzzy.patch').each_line do |line|
      line = line.chomp
      fuzzy_buf   += line + "\n"
      if    state == 0 && line == '-#, no-wrap'
        state = 1
        unfuzzy_buf += " #, no-wrap\n"
      elsif state == 1 && /^-msgid ".*\\n"/.match(line)
        state = 2
        unfuzzy_buf += line + "\n"
      elsif state == 1 && line == '-msgstr ""'
        ;
      elsif state == 2 && line == '+#, fuzzy, no-wrap'
        state = 3
      elsif state == 3 && /^\+#| msgid ".*\\n"/.match(line)
        state = 4
      elsif state == 4 && /^\+msgid ".*"/.match(line)
        state = 5
        unfuzzy_buf += line + "\n"
      elsif state == 5 && /^ msgstr ".*\\n"/.match(line)
        state = 6
        unfuzzy_buf += "-" + line[1..] + "\n"
        unfuzzy_buf += "+" + line[1..-4] + '"' + "\n"
      elsif state == 6 && /^\s*$/.match(line)
        state = 0
        # Eh, so in total the above transformations mean that our hunk
        # results in one less line, so the diff offset is off by one =>
        # bad patch! So we just add a line that we easily can remove
        # later. :)
        unfuzzy_buf += "+########sdf9s7d87fyusdf98sd7f098sd7f09sduf09uj######\n"
        unfuzzy_buf += line + "\n"
        out.write(unfuzzy_buf)
        fuzzy_buf = ''
        unfuzzy_buf = ''
      else
        state = 0
        out.write(fuzzy_buf)
        fuzzy_buf = ''
        unfuzzy_buf = ''
      end
    end

Then I applied unfuzzy.patch and used sed to kill the weird lines I
had to introduce (see above):

    pattern="########sdf9s7d87fyusdf98sd7f098sd7f09sduf09uj######"
    for f in $(git grep -l ${pattern}); do
        sed -i "/${pattern}/d" ${f}
    done

and squashed, and now we have 1386 fewer fuzzy strings, yay! And
po_lint does not complain, which seems like a good sign. :)
parent 44c4ffe8
......@@ -88,10 +88,9 @@ msgid "<a id=\"tor\"></a>\n"
msgstr "<a id=\"tor\"></a>\n"
#. type: Title =
#, fuzzy, no-wrap
#| msgid "Online anonymity and censorship circumvention\n"
#, no-wrap
msgid "Online anonymity and censorship circumvention"
msgstr "Onlineanonymität und Zensurumgehung\n"
msgstr "Onlineanonymität und Zensurumgehung"
#. type: Plain text
msgid "Tor"
......@@ -218,10 +217,9 @@ msgid "<a id=\"amnesia\"></a>\n"
msgstr "<a id=\"amnesia\"></a>\n"
#. type: Title =
#, fuzzy, no-wrap
#| msgid "Use anywhere but leave no trace\n"
#, no-wrap
msgid "Use anywhere but leave no trace"
msgstr "Überall nutzen, ohne Spuren zu hinterlassen\n"
msgstr "Überall nutzen, ohne Spuren zu hinterlassen"
#. type: Plain text
msgid ""
......@@ -272,10 +270,9 @@ msgid "<a id=\"cryptography\"></a>\n"
msgstr "<a id=\"cryptography\"></a>\n"
#. type: Title =
#, fuzzy, no-wrap
#| msgid "State-of-the-art cryptographic tools\n"
#, no-wrap
msgid "State-of-the-art cryptographic tools"
msgstr "Kryptographische Werkzeuge auf dem aktuellen Stand der Technik\n"
msgstr "Kryptographische Werkzeuge auf dem aktuellen Stand der Technik"
#. type: Plain text
msgid ""
......@@ -354,10 +351,9 @@ msgstr ""
"encryption_and_privacy]]"
#. type: Title =
#, fuzzy, no-wrap
#| msgid "What's next?\n"
#, no-wrap
msgid "What's next?"
msgstr "Was kommt als Nächstes?\n"
msgstr "Was kommt als Nächstes?"
#. type: Plain text
msgid "To continue discovering Tails, you can now read:"
......@@ -413,20 +409,18 @@ msgstr ""
"Veröffentlichungstermine, Treffen und andere Ereignisse."
#. type: Title =
#, fuzzy, no-wrap
#| msgid "Press and media\n"
#, no-wrap
msgid "Press and media"
msgstr "Presse und Medien\n"
msgstr "Presse und Medien"
#. type: Plain text
msgid "See [[Press and media information|press]]."
msgstr "Lesen Sie die [[Medien- und Presseinformationen|press]]."
#. type: Title =
#, fuzzy, no-wrap
#| msgid "Social Contract\n"
#, no-wrap
msgid "Social Contract"
msgstr "Sozialvertrag\n"
msgstr "Sozialvertrag"
#. type: Plain text
msgid ""
......@@ -436,10 +430,9 @@ msgstr ""
"social_contract]]."
#. type: Title =
#, fuzzy, no-wrap
#| msgid "Acknowledgments and similar projects\n"
#, no-wrap
msgid "Acknowledgments and similar projects"
msgstr "Danksagungen und ähnliche Projekte\n"
msgstr "Danksagungen und ähnliche Projekte"
#. type: Plain text
msgid ""
......@@ -450,10 +443,9 @@ msgstr ""
"acknowledgments_and_similar_projects]]."
#. type: Title =
#, fuzzy, no-wrap
#| msgid "Contact\n"
#, no-wrap
msgid "Contact"
msgstr "Kontakt\n"
msgstr "Kontakt"
#. type: Plain text
msgid "See the [[contact page|about/contact]]."
......
......@@ -86,10 +86,9 @@ msgid "<a id=\"tor\"></a>\n"
msgstr "<a id=\"tor\"></a>\n"
#. type: Title =
#, fuzzy, no-wrap
#| msgid "Online anonymity and censorship circumvention\n"
#, no-wrap
msgid "Online anonymity and censorship circumvention"
msgstr "Anonimato online y elusión de censura\n"
msgstr "Anonimato online y elusión de censura"
#. type: Plain text
msgid "Tor"
......@@ -213,10 +212,9 @@ msgid "<a id=\"amnesia\"></a>\n"
msgstr "<a id=\"amnesia\"></a>\n"
#. type: Title =
#, fuzzy, no-wrap
#| msgid "Use anywhere but leave no trace\n"
#, no-wrap
msgid "Use anywhere but leave no trace"
msgstr "Úsalo donde sea sin dejar rastro\n"
msgstr "Úsalo donde sea sin dejar rastro"
#. type: Plain text
msgid ""
......@@ -263,10 +261,9 @@ msgid "<a id=\"cryptography\"></a>\n"
msgstr "<a id=\"cryptography\"></a>\n"
#. type: Title =
#, fuzzy, no-wrap
#| msgid "State-of-the-art cryptographic tools\n"
#, no-wrap
msgid "State-of-the-art cryptographic tools"
msgstr "Herramientas criptográficas de alto nivel\n"
msgstr "Herramientas criptográficas de alto nivel"
#. type: Plain text
msgid ""
......@@ -341,10 +338,9 @@ msgstr ""
"encryption_and_privacy]]"
#. type: Title =
#, fuzzy, no-wrap
#| msgid "What's next?\n"
#, no-wrap
msgid "What's next?"
msgstr "¿Qué sigue?\n"
msgstr "¿Qué sigue?"
#. type: Plain text
msgid "To continue discovering Tails, you can now read:"
......@@ -400,20 +396,18 @@ msgstr ""
"lanzamiento, encuentros y otros eventos."
#. type: Title =
#, fuzzy, no-wrap
#| msgid "Press and media\n"
#, no-wrap
msgid "Press and media"
msgstr "Prensa y medios\n"
msgstr "Prensa y medios"
#. type: Plain text
msgid "See [[Press and media information|press]]."
msgstr "Mira la [[información de prensa y medios|press]]."
#. type: Title =
#, fuzzy, no-wrap
#| msgid "Social Contract\n"
#, no-wrap
msgid "Social Contract"
msgstr "Contrato Social\n"
msgstr "Contrato Social"
#. type: Plain text
msgid ""
......@@ -422,10 +416,9 @@ msgstr ""
"Lee nuestro [[Contrato Social|contribute/working_together/social_contract]]."
#. type: Title =
#, fuzzy, no-wrap
#| msgid "Acknowledgments and similar projects\n"
#, no-wrap
msgid "Acknowledgments and similar projects"
msgstr "Agradecimientos y proyectos similares\n"
msgstr "Agradecimientos y proyectos similares"
#. type: Plain text
msgid ""
......@@ -436,10 +429,9 @@ msgstr ""
"acknowledgments_and_similar_projects]]."
#. type: Title =
#, fuzzy, no-wrap
#| msgid "Contact\n"
#, no-wrap
msgid "Contact"
msgstr "Contacta\n"
msgstr "Contacta"
#. type: Plain text
msgid "See the [[contact page|about/contact]]."
......
......@@ -93,10 +93,9 @@ msgid "<a id=\"tor\"></a>\n"
msgstr "<a id=\"tor\"></a>\n"
#. type: Title =
#, fuzzy, no-wrap
#| msgid "Online anonymity and censorship circumvention\n"
#, no-wrap
msgid "Online anonymity and censorship circumvention"
msgstr "ناشناس ماندن آنلاین و دور زدن سانسور\n"
msgstr "ناشناس ماندن آنلاین و دور زدن سانسور"
#. type: Plain text
msgid "Tor"
......@@ -236,10 +235,9 @@ msgid "<a id=\"amnesia\"></a>\n"
msgstr "<a id=\"فراموشی\"></a>\n"
#. type: Title =
#, fuzzy, no-wrap
#| msgid "Use anywhere but leave no trace\n"
#, no-wrap
msgid "Use anywhere but leave no trace"
msgstr "همه‌جا استفاده کنید، اما اثری به جا نگذارید.\n"
msgstr "همه‌جا استفاده کنید، اما اثری به جا نگذارید."
#. type: Plain text
#, fuzzy
......@@ -304,10 +302,9 @@ msgid "<a id=\"cryptography\"></a>\n"
msgstr "<a id=\"رمزنگاری\"></a>\n"
#. type: Title =
#, fuzzy, no-wrap
#| msgid "State-of-the-art cryptographic tools\n"
#, no-wrap
msgid "State-of-the-art cryptographic tools"
msgstr "بهترین ابزارهای رمزنگاری\n"
msgstr "بهترین ابزارهای رمزنگاری"
#. type: Plain text
msgid ""
......@@ -387,10 +384,9 @@ msgstr ""
"[[دربارهٔ این ابزارها، در مستندات بیشتر بخوانید.|doc/encryption_and_privacy]]"
#. type: Title =
#, fuzzy, no-wrap
#| msgid "What's next?\n"
#, no-wrap
msgid "What's next?"
msgstr "دیگر چه؟\n"
msgstr "دیگر چه؟"
#. type: Plain text
msgid "To continue discovering Tails, you can now read:"
......@@ -454,10 +450,9 @@ msgstr ""
"[[تقویم|contribute/calendar]] شامل تاریخ‌های انتشار، جلسات و برنامه‌های دیگر."
#. type: Title =
#, fuzzy, no-wrap
#| msgid "Press and media\n"
#, no-wrap
msgid "Press and media"
msgstr "رسانه‌ها و خبرگزاری‌ها\n"
msgstr "رسانه‌ها و خبرگزاری‌ها"
#. type: Plain text
msgid "See [[Press and media information|press]]."
......@@ -474,10 +469,9 @@ msgid ""
msgstr ""
#. type: Title =
#, fuzzy, no-wrap
#| msgid "Acknowledgments and similar projects\n"
#, no-wrap
msgid "Acknowledgments and similar projects"
msgstr "قدردانی‌ها و پروژه‌های مشابه\n"
msgstr "قدردانی‌ها و پروژه‌های مشابه"
#. type: Plain text
msgid ""
......
......@@ -86,10 +86,9 @@ msgid "<a id=\"tor\"></a>\n"
msgstr "<a id=\"tor\"></a>\n"
#. type: Title =
#, fuzzy, no-wrap
#| msgid "Online anonymity and censorship circumvention\n"
#, no-wrap
msgid "Online anonymity and censorship circumvention"
msgstr "Anonymat en ligne et contournement de la censure\n"
msgstr "Anonymat en ligne et contournement de la censure"
#. type: Plain text
msgid "Tor"
......@@ -215,10 +214,9 @@ msgid "<a id=\"amnesia\"></a>\n"
msgstr "<a id=\"amnesia\"></a>\n"
#. type: Title =
#, fuzzy, no-wrap
#| msgid "Use anywhere but leave no trace\n"
#, no-wrap
msgid "Use anywhere but leave no trace"
msgstr "Utilisez le partout, ne laissez pas de traces\n"
msgstr "Utilisez le partout, ne laissez pas de traces"
#. type: Plain text
msgid ""
......@@ -267,10 +265,9 @@ msgid "<a id=\"cryptography\"></a>\n"
msgstr "<a id=\"cryptography\"></a>\n"
#. type: Title =
#, fuzzy, no-wrap
#| msgid "State-of-the-art cryptographic tools\n"
#, no-wrap
msgid "State-of-the-art cryptographic tools"
msgstr "Le top des outils de cryptographie\n"
msgstr "Le top des outils de cryptographie"
#. type: Plain text
msgid ""
......@@ -345,10 +342,9 @@ msgstr ""
"encryption_and_privacy]]"
#. type: Title =
#, fuzzy, no-wrap
#| msgid "What's next?\n"
#, no-wrap
msgid "What's next?"
msgstr "Et ensuite ?\n"
msgstr "Et ensuite ?"
#. type: Plain text
msgid "To continue discovering Tails, you can now read:"
......@@ -404,20 +400,18 @@ msgstr ""
"versions, des réunions et autres événements."
#. type: Title =
#, fuzzy, no-wrap
#| msgid "Press and media\n"
#, no-wrap
msgid "Press and media"
msgstr "Presse et médias\n"
msgstr "Presse et médias"
#. type: Plain text
msgid "See [[Press and media information|press]]."
msgstr "Voir [[la rubrique presse et médias|press]]."
#. type: Title =
#, fuzzy, no-wrap
#| msgid "Social Contract\n"
#, no-wrap
msgid "Social Contract"
msgstr "Contrat social\n"
msgstr "Contrat social"
#. type: Plain text
msgid ""
......@@ -425,10 +419,9 @@ msgid ""
msgstr "Lisez notre [[contrat social|news/social_contract]]."
#. type: Title =
#, fuzzy, no-wrap
#| msgid "Acknowledgments and similar projects\n"
#, no-wrap
msgid "Acknowledgments and similar projects"
msgstr "Remerciements et projets similaires\n"
msgstr "Remerciements et projets similaires"
#. type: Plain text
msgid ""
......@@ -439,10 +432,9 @@ msgstr ""
"acknowledgments_and_similar_projects]]."
#. type: Title =
#, fuzzy, no-wrap
#| msgid "Contact\n"
#, no-wrap
msgid "Contact"
msgstr "Contact\n"
msgstr "Contact"
#. type: Plain text
msgid "See the [[contact page|about/contact]]."
......
......@@ -88,10 +88,9 @@ msgid "<a id=\"tor\"></a>\n"
msgstr "<a id=\"tor\"></a>\n"
#. type: Title =
#, fuzzy, no-wrap
#| msgid "Online anonymity and censorship circumvention\n"
#, no-wrap
msgid "Online anonymity and censorship circumvention"
msgstr "Anonimato online e aggiramento della censura\n"
msgstr "Anonimato online e aggiramento della censura"
#. type: Plain text
msgid "Tor"
......@@ -215,10 +214,9 @@ msgid "<a id=\"amnesia\"></a>\n"
msgstr "<a id=\"amnesia\"></a>\n"
#. type: Title =
#, fuzzy, no-wrap
#| msgid "Use anywhere but leave no trace\n"
#, no-wrap
msgid "Use anywhere but leave no trace"
msgstr "Usalo ovunque, senza lasciare traccia\n"
msgstr "Usalo ovunque, senza lasciare traccia"
#. type: Plain text
msgid ""
......@@ -267,10 +265,9 @@ msgid "<a id=\"cryptography\"></a>\n"
msgstr "<a id=\"cryptography\"></a>\n"
#. type: Title =
#, fuzzy, no-wrap
#| msgid "State-of-the-art cryptographic tools\n"
#, no-wrap
msgid "State-of-the-art cryptographic tools"
msgstr "Strumenti crittografici all'avanguardia\n"
msgstr "Strumenti crittografici all'avanguardia"
#. type: Plain text
msgid ""
......@@ -346,10 +343,9 @@ msgstr ""
"encryption_and_privacy]]"
#. type: Title =
#, fuzzy, no-wrap
#| msgid "What's next?\n"
#, no-wrap
msgid "What's next?"
msgstr "E dopo?\n"
msgstr "E dopo?"
#. type: Plain text
msgid "To continue discovering Tails, you can now read:"
......@@ -406,20 +402,18 @@ msgstr ""
"prossimi rilasci, delle riunioni e di altri eventi."
#. type: Title =
#, fuzzy, no-wrap
#| msgid "Press and media\n"
#, no-wrap
msgid "Press and media"
msgstr "Stampa e altri media\n"
msgstr "Stampa e altri media"
#. type: Plain text
msgid "See [[Press and media information|press]]."
msgstr "Vedere gli [[articoli di stampa e altri media|press]]."
#. type: Title =
#, fuzzy, no-wrap
#| msgid "Social Contract\n"
#, no-wrap
msgid "Social Contract"
msgstr "Contratto sociale\n"
msgstr "Contratto sociale"
#. type: Plain text
msgid ""
......@@ -427,10 +421,9 @@ msgid ""
msgstr "Leggi il nostro [[contratto sociale|news/social_contract]]."
#. type: Title =
#, fuzzy, no-wrap
#| msgid "Acknowledgments and similar projects\n"
#, no-wrap
msgid "Acknowledgments and similar projects"
msgstr "Ringraziamenti e progetti simili\n"
msgstr "Ringraziamenti e progetti simili"
#. type: Plain text
msgid ""
......@@ -441,10 +434,9 @@ msgstr ""
"acknowledgments_and_similar_projects]]."
#. type: Title =
#, fuzzy, no-wrap
#| msgid "Contact\n"
#, no-wrap
msgid "Contact"
msgstr "Contatti\n"
msgstr "Contatti"
#. type: Plain text
msgid "See the [[contact page|about/contact]]."
......
......@@ -90,10 +90,9 @@ msgid "<a id=\"tor\"></a>\n"
msgstr "<a id=\"tor\"></a>\n"
#. type: Title =
#, fuzzy, no-wrap
#| msgid "Online anonymity and censorship circumvention\n"
#, no-wrap
msgid "Online anonymity and censorship circumvention"
msgstr "Anonimato online e quebra de censura\n"
msgstr "Anonimato online e quebra de censura"
#. type: Plain text
msgid "Tor"
......@@ -216,10 +215,9 @@ msgid "<a id=\"amnesia\"></a>\n"
msgstr "<a id=\"amnesia\"></a>\n"
#. type: Title =
#, fuzzy, no-wrap
#| msgid "Use anywhere but leave no trace\n"
#, no-wrap
msgid "Use anywhere but leave no trace"
msgstr "Use em qualquer lugar sem deixar rastros\n"
msgstr "Use em qualquer lugar sem deixar rastros"
#. type: Plain text
msgid ""
......@@ -268,10 +266,9 @@ msgid "<a id=\"cryptography\"></a>\n"
msgstr "<a id=\"cryptography\"></a>\n"
#. type: Title =
#, fuzzy, no-wrap
#| msgid "State-of-the-art cryptographic tools\n"
#, no-wrap
msgid "State-of-the-art cryptographic tools"
msgstr "Ferramentas criptográficas de alto nível\n"
msgstr "Ferramentas criptográficas de alto nível"
#. type: Plain text
msgid ""
......@@ -346,10 +343,9 @@ msgstr ""
"encryption_and_privacy]]"
#. type: Title =
#, fuzzy, no-wrap
#| msgid "What's next?\n"
#, no-wrap
msgid "What's next?"
msgstr "O que vem a seguir?\n"
msgstr "O que vem a seguir?"
#. type: Plain text
msgid "To continue discovering Tails, you can now read:"
......@@ -403,20 +399,18 @@ msgstr ""
"reuniões e outros eventos."
#. type: Title =
#, fuzzy, no-wrap
#| msgid "Press and media\n"
#, no-wrap
msgid "Press and media"
msgstr "Imprensa e mídia\n"
msgstr "Imprensa e mídia"
#. type: Plain text
msgid "See [[Press and media information|press]]."
msgstr "Veja as [[informações na imprensa e na mídia|press]]."
#. type: Title =
#, fuzzy, no-wrap
#| msgid "Social Contract\n"
#, no-wrap
msgid "Social Contract"
msgstr "Contrato Social\n"
msgstr "Contrato Social"
#. type: Plain text