Merge lp:~carsteng/ubuntu-docs/trusty into lp:ubuntu-docs/trusty

[Carsten Gerlach]

entry in sources.list updated from »saucy« to »trusty«

in the sources.list should now be »trusty« instead of »saucy«

[Gunnar Hjalmarsson (gunnarhj)]

Hi Carsten!

You know that doc string freeze has passed, don't you?
https://wiki.ubuntu.com/DocumentationStringFreeze

So my first thought was that this can't be dealt with before the 14.04 release.

But then I realized that it makes no sense for the translators to change those particular strings, so I'm going to merge it, and add a couple of things that make the strings explicitly nontranslatable.

Maybe that's what you thought in the first place. Or you are just lucky. ;-)

review: Approve

[Doug Smythies (dsmythies)]

Even though we are past string freeze, this one should be fine to merge in. The strings are within code tags and are not translatable anyhow. Although I do observe that often the same string is set as the translation, I suppose to it get off the "untranslated" list. The issue is that we typically never re-import the .POT file after string freeze, so this wouldn't get into the other languages anyhow

review: Approve

[Carsten Gerlach (carsteng)]

Doug, the strings are translatable, see https://translations.launchpad.net/ubuntu/trusty/+source/ubuntu-docs/+pots/ubuntu-help/de/223/+translate and https://translations.launchpad.net/ubuntu/trusty/+source/ubuntu-docs/+pots/ubuntu-help/de/228/+translate

But it is good, that Gunnar will mark them as untranslatable. This will reduce the work of the translators.

By the way, there are some other strings which should IMHO also untranslatable, like names of contributors, see https://translations.launchpad.net/ubuntu/trusty/+source/ubuntu-docs/+pots/ubuntu-help/de/4/+translate, https://translations.launchpad.net/ubuntu/trusty/+source/ubuntu-docs/+pots/ubuntu-help/de/5/+translate and https://translations.launchpad.net/ubuntu/trusty/+source/ubuntu-docs/+pots/ubuntu-help/de/6/+translate

[Kevin Godby (godbyk)]

In some of the updated .page files, we've marked the email addresses as untranslatable.

The only reason I could think of having the names be translatable is in case they need to be transliterated to a different alphabet/orthography.

[lp:~carsteng/ubuntu-docs/trusty]

398. By Carsten Gerlach on 2014-03-23

addremove-sources.page: saucy replaced with trusty in sources.list entries.

[Gunnar Hjalmarsson (gunnarhj)]

Just merged...

@Doug: Nothing prevents us from importing the template again, does it?

@Carsten: Yeah, there are a lot of such strings that occur in the PO files for no reasonable reason. A suitable project to take on later on.

@Kevin: Would /etc/apt/sources.list be happy with e.g. Chinese? I suspect not.

[Kevin Godby (godbyk)]

This shouldn't prevent us from importing the template again, since we're moving strings instead of adding them.

/etc/apt/sources.list doesn't contain names like 'Gunnar Hjalmarasson'. But the Chinese might like to transliterate Gunnar to hanzi.

[Gunnar Hjalmarsson (gunnarhj)]

On 2014-03-23 21:53, Kevin Godby wrote:
> But the Chinese might like to transliterate Gunnar to hanzi.

They just dare! ;-)

[Doug Smythies (dsmythies)]

"Doug, the strings are translatable, see "
O.K. what I meant to say was that they have to verbatim what was originally written.
Anyway, I see that Gunnar set them to untranslatable, which is the proper solution.

"@Doug: Nothing prevents us from importing the template again, does it?" Matt East cautioned me against it, but I can not recall why. Give me some time to try to find my notes. (I could also be recalling incorrectly.)

=== modified file 'ubuntu-help/C/addremove-sources.page'
--- ubuntu-help/C/addremove-sources.page	2014-01-06 21:56:33 +0000
+++ ubuntu-help/C/addremove-sources.page	2014-03-23 19:31:00 +0000
@@ -67,7 +67,7 @@
         similar to:
       </p>
       <p>
-        <code>deb http://archive.ubuntu.com/ubuntu/ saucy main</code>
+        <code>deb http://archive.ubuntu.com/ubuntu/ trusty main</code>
       </p>
     </item>
     <item>
@@ -99,7 +99,7 @@
       <gui>Add</gui> and enter:
     </p>
     <p>
-      <code>deb http://archive.canonical.com/ubuntu saucy partner</code>
+      <code>deb http://archive.canonical.com/ubuntu trusty partner</code>
     </p>
     <p>
       Click <gui>Add Source</gui> then close the Software Sources window. Wait a