Merge lp:~dholbach/help-app/translations-fixes into lp:~ubuntu-touch-coreapps-drivers/help-app/trunk

[Daniel Holbach]

[lp:~dholbach/help-app/translations-fixes]

71. By Daniel Holbach on 2015-03-05

rewrite links in Spanish translations

[David Planella (dpm)]

Tested it to work fine.

review: Approve

=== modified file 'edit-here/po/es.po'
--- edit-here/po/es.po	2015-03-05 06:06:56 +0000
+++ edit-here/po/es.po	2015-03-05 09:35:04 +0000
@@ -2,7 +2,7 @@
 # Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
 # This file is distributed under the same license as the ubuntu-devices-help package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
-#
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: ubuntu-devices-help\n"
@@ -14,13 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Launchpad (build 17374)\n"
 "X-Launchpad-Export-Date: 2015-03-05 06:06+0000\n"
-"X-Generator: Launchpad (build 17374)\n"
-
-#. type: Plain text
-#: content/pages/faq.md:2
-msgid "Title: Get your questions answered."
-msgstr ""
 
 #. type: Plain text
 #: content/pages/faq.md:5
@@ -34,7 +29,7 @@
 #. type: Bullet: '  * '
 #: content/pages/faq.md:7
 msgid "[Apps]({filename}apps.md)"
-msgstr ""
+msgstr "[Apps]({filename}apps.es.md)"
 
 #. type: Bullet: '  * '
 #: content/pages/faq.md:7
@@ -42,18 +37,13 @@
 msgstr ""
 
 #. type: Plain text
-#: content/pages/index.md:2
-msgid "Title: Welcome to Help for Ubuntu for devices!"
-msgstr ""
-
-#. type: Plain text
 #: content/pages/index.md:5
 msgid ""
 "The world-wide Ubuntu community wants to give you the best possible "
 "experience on your Ubuntu device. This is why we collected:"
 msgstr ""
-"La comunidad mundial de Ubuntu quiere ofrecerle la mejor experiencia posible "
-"en su dispositivo con Ubuntu. Por ello hemos recopilado:"
+"La comunidad mundial de Ubuntu quiere ofrecerle la mejor experiencia posible"
+" en su dispositivo con Ubuntu. Por ello hemos recopilado:"
 
 #. type: Bullet: '  * '
 #: content/pages/index.md:9
@@ -79,17 +69,12 @@
 #: content/pages/index.md:12
 #, no-wrap
 msgid "[Take me to the FAQ!]({filename}faq.md)  \n"
-msgstr ""
+msgstr "[Take me to the FAQ!]({filename}faq.es.md)  \n"
 
 #. type: Plain text
 #: content/pages/index.md:14
 msgid "[Get in touch]({filename}get-in-touch.md)"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/apps.md:2
-msgid "Title: FAQ - Apps"
-msgstr ""
+msgstr "[Get in touch]({filename}get-in-touch.es.md)"
 
 #. type: Plain text
 #: content/pages/apps.md:5
@@ -128,11 +113,6 @@
 msgstr ""
 
 #. type: Plain text
-#: content/pages/get-in-touch.md:2
-msgid "Title: Get in touch"
-msgstr ""
-
-#. type: Plain text
 #: content/pages/get-in-touch.md:7
 #, no-wrap
 msgid ""
@@ -151,3 +131,35 @@
 "out about all the individual teams in Ubuntu, what they do, where they hang "
 "out and how to get involved."
 msgstr ""
+
+#. type: Plain text
+#: content/pages/faq.md:2
+msgid "Get your questions answered."
+msgstr ""
+
+#. type: Plain text
+#: content/pages/index.md:2
+msgid "Welcome to Help for Ubuntu for devices!"
+msgstr ""
+
+#. type: Plain text
+#: content/pages/apps.md:2
+msgid "FAQ - Apps"
+msgstr ""
+
+#. type: Plain text
+#: content/pages/get-in-touch.md:2
+msgid "Get in touch"
+msgstr ""
+
+#~ msgid "Title: Get your questions answered."
+#~ msgstr ""
+
+#~ msgid "Title: Welcome to Help for Ubuntu for devices!"
+#~ msgstr ""
+
+#~ msgid "Title: FAQ - Apps"
+#~ msgstr ""
+
+#~ msgid "Title: Get in touch"
+#~ msgstr ""

=== modified file 'edit-here/po/help.pot'
--- edit-here/po/help.pot	2015-03-03 12:37:30 +0000
+++ edit-here/po/help.pot	2015-03-05 09:35:04 +0000
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-02-26 15:28+0100\n"
+"POT-Creation-Date: 2015-03-05 10:31+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"

=== modified file 'edit-here/translations.py'
--- edit-here/translations.py	2015-03-05 08:14:09 +0000
+++ edit-here/translations.py	2015-03-05 09:35:04 +0000
@@ -57,7 +57,7 @@
         return ret
 
     def gettextize(self, document_fns, pot_file):
-        args = []
+        args = copy.copy(self.default_args)
         for document_fn in document_fns:
             args += ['-m', document_fn]
         args += [
@@ -82,6 +82,9 @@
         self.po_fn = po_fn
         self.pofile = polib.pofile(po_fn)
 
+    def reread(self):
+        self.pofile = polib.pofile(self.po_fn)
+
     def merge(self, pot_file_ob):
         self.pofile.merge(pot_file_ob)
 
@@ -107,9 +110,11 @@
         results = {}
         for entry in self.find_in_msgid('Title: '):
             if entry.msgid.startswith('Title: '):
-                if entry.linenum != 1:
-                    print('Title line "%s" found, but at linenum "%s", '
-                          'not 1.' % (entry.msgid, entry.linenum))
+                where = entry.occurrences[0][0]
+                first_line = open(where).readline().strip()
+                if entry.msgid != first_line:
+                    print('Title line "%s" found, but not on the first line '
+                          'of "%s".' % (entry.msgid, entry.linenum))
                     return False
                 entry.msgid = entry.msgid.replace('Title: ', '')
                 fn = entry.occurrences[0][0]
@@ -176,6 +181,7 @@
     def generate_pot_file(self, documents):
         if not self.po4a.gettextize(documents.docs, self.pot_fn):
             return False
+        self.pot_file_ob.reread()
         if not self.pot_file_ob.replace_title_lines():
             return False
         for po_fn in self.langs: