Patchwork [STABLE] i18n: fix fatal errors in translation files

login
register
mail settings
Submitter Simon Heimberg
Date Oct. 18, 2013, 9:52 p.m.
Message ID <fb9e58fe3d54a3d903d1.1382133145@lapsi.heimberg.home>
Download mbox | patch
Permalink /patch/2791/
State Superseded, archived
Headers show

Comments

Simon Heimberg - Oct. 18, 2013, 9:52 p.m.
# HG changeset patch
# User Simon Heimberg <simohe@besonet.ch>
# Date 1382133063 -7200
# Node ID fb9e58fe3d54a3d903d1884fc65fe4823671e6ba
# Parent  559f0220b4bb99d0f511d40a1f2ca78276e819bd
i18n: fix fatal errors in translation files

Updating de.po and pt_BR.po has failed with a fatal error.
Wagner Bruna - Oct. 19, 2013, 1:59 p.m.
Em 18-10-2013 18:52, Simon Heimberg escreveu:
> # HG changeset patch
> # User Simon Heimberg <simohe@besonet.ch>
> # Date 1382133063 -7200
> # Node ID fb9e58fe3d54a3d903d1884fc65fe4823671e6ba
> # Parent  559f0220b4bb99d0f511d40a1f2ca78276e819bd
> i18n: fix fatal errors in translation files

I can't apply this patch on current i18n, stable or default heads
(rejects on both files). Also, this context:

> diff -r 559f0220b4bb -r fb9e58fe3d54 i18n/pt_BR.po
> --- a/i18n/pt_BR.po	Fre Okt 18 23:07:02 2013 +0200
> +++ b/i18n/pt_BR.po	Fre Okt 18 23:51:03 2013 +0200
> @@ -20980,6 +20980,7 @@
>  "    o caminho para um repositório local ou a URI de um repositório\n"
>  "    remoto."
>  
> +msgid ""
>  "Files\n"
>  "\"\"\"\"\""
>  msgstr ""

seems odd: the hg.1.gendoc.txt include is missing:

http://selenic.com/hg/rev/1c2c08642681#l1.1041

So I guess you've got some kind of local breakage.

Best regards,
Wagner
Simon Heimberg - Oct. 21, 2013, 4:54 a.m.
Am 19.10.2013 15:59, schrieb Wagner Bruna:
> Em 18-10-2013 18:52, Simon Heimberg escreveu:
>> # HG changeset patch
>> # User Simon Heimberg <simohe@besonet.ch>
>> # Date 1382133063 -7200
>> # Node ID fb9e58fe3d54a3d903d1884fc65fe4823671e6ba
>> # Parent  559f0220b4bb99d0f511d40a1f2ca78276e819bd
>> i18n: fix fatal errors in translation files
> I can't apply this patch on current i18n, stable or default heads
> (rejects on both files). Also, this context:
You are totally right, I broke this myself in a local change before. I 
was convinced that the problem was there before and did not check. I am 
sorry and thank your very much for trying to apply this hard.
>> diff -r 559f0220b4bb -r fb9e58fe3d54 i18n/pt_BR.po
>> --- a/i18n/pt_BR.po	Fre Okt 18 23:07:02 2013 +0200
>> +++ b/i18n/pt_BR.po	Fre Okt 18 23:51:03 2013 +0200
>> @@ -20980,6 +20980,7 @@
>>   "    o caminho para um repositório local ou a URI de um repositório\n"
>>   "    remoto."
>>   
>> +msgid ""
>>   "Files\n"
>>   "\"\"\"\"\""
>>   msgstr ""
> seems odd: the hg.1.gendoc.txt include is missing:
>
> http://selenic.com/hg/rev/1c2c08642681#l1.1041
>
> So I guess you've got some kind of local breakage.
>
> Best regards,
> Wagner

Patch

diff -r 559f0220b4bb -r fb9e58fe3d54 i18n/de.po
--- a/i18n/de.po	Fre Okt 18 23:07:02 2013 +0200
+++ b/i18n/de.po	Fre Okt 18 23:51:03 2013 +0200
@@ -5946,7 +5946,6 @@ 
 "    Ohne Angabe der QUELLE wird standardmäßig der 'default'-Pfad genutzt.\n"
 "    Siehe Hilfe zu 'paths' zu Pfad-Kurznamen und 'urls' für erlaubte\n"
 "    Formate für die Quellangabe."
-msgstr ""
 
 #: hgext/largefiles/__init__.py:537 mercurial/commands.py:537
 #: mercurial/commands.py:3992
diff -r 559f0220b4bb -r fb9e58fe3d54 i18n/pt_BR.po
--- a/i18n/pt_BR.po	Fre Okt 18 23:07:02 2013 +0200
+++ b/i18n/pt_BR.po	Fre Okt 18 23:51:03 2013 +0200
@@ -20980,6 +20980,7 @@ 
 "    o caminho para um repositório local ou a URI de um repositório\n"
 "    remoto."
 
+msgid ""
 "Files\n"
 "\"\"\"\"\""
 msgstr ""