[PATCH] Update to it.po

[PATCH] Update to it.po

[Paolo Ciarrocchi]

Some fairly simply changes to it.po


Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>
---

Shawn,
a simple make in the git-gui-i18n repository fails with the following msg:
paolo@paolo-desktop:~/git-gui-i18n$ make
GITGUI_VERSION = 0.9.GITGUI-dirty
    * new locations or Tcl/Tk interpreter
    GEN git-gui
    INDEX lib/
    MSGFMT    po/bg.msg 391 translated.
    MSGFMT    po/de.msg 383 translated, 5 fuzzy, 3 untranslated.
    MSGFMT    po/es.msg 122 translated, 269 untranslated.
    MSGFMT    po/fr.msg 391 translated.
    MSGFMT    po/hu.msg 391 translated.
    MSGFMT    po/it.msg make: *** [po/it.msg] Error 1

Before and after the following patch :-)

 po/it.po |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/po/it.po b/po/it.po
index 197e6fa..aa3ed13 100644
--- a/po/it.po
+++ b/po/it.po
@@ -10,12 +10,12 @@ msgstr ""
 "Project-Id-Version: git-gui\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-03-14 07:18+0100\n"
-"PO-Revision-Date: 2008-03-17 14:12+0100\n"
-"Last-Translator: Michele Ballabio <barra_cuda@katamail.com>\n"
+"PO-Revision-Date: 2008-08-03 11:59+0200\n"
+"Last-Translator: Paolo Ciarrocchi <Paolo.Ciarrocchi@gmail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: 8bit"
 
 #: git-gui.sh:41 git-gui.sh:634 git-gui.sh:648 git-gui.sh:661 git-gui.sh:744
 #: git-gui.sh:763
@@ -1022,7 +1022,7 @@ msgstr "Calcolo oggetti"
 
 #: lib/choose_repository.tcl:628
 msgid "buckets"
-msgstr ""
+msgstr "buckets"
 
 #: lib/choose_repository.tcl:652
 #, tcl-format
@@ -1910,16 +1910,14 @@ msgid "Spell checker silently failed on startup"
 msgstr "Il correttore ortografico ha riportato un errore all'avvio"
 
 #: lib/spellcheck.tcl:80
-#, fuzzy
 msgid "Unrecognized spell checker"
-msgstr "Correttore ortografico sconosciuto"
+msgstr "Correttore ortografico non riconosciuto"
 
 #: lib/spellcheck.tcl:180
 msgid "No Suggestions"
 msgstr "Nessun suggerimento"
 
 #: lib/spellcheck.tcl:381
-#, fuzzy
 msgid "Unexpected EOF from spell checker"
 msgstr "Il correttore ortografico ha mandato un EOF inaspettato"
 
@@ -1994,3 +1992,4 @@ msgstr "Utilizza 'thin pack' (per connessioni lente)"
 #: lib/transport.tcl:168
 msgid "Include tags"
 msgstr "Includi etichette"
+
-- 
1.5.6.rc1.21.g03300

[PATCH] git-gui: add a part about format strings in po/README

[Michele Ballabio]

This should help tranlators that need to reorder words and strings.
Original explanation by Christian Stimming.

Also remove unneeded backslashes.

Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
---

On Sunday 03 August 2008, Paolo Ciarrocchi wrote:
> Shawn,
> a simple make in the git-gui-i18n repository fails with the following msg:
> paolo@paolo-desktop:~/git-gui-i18n$ make
> GITGUI_VERSION = 0.9.GITGUI-dirty
>     * new locations or Tcl/Tk interpreter
>     GEN git-gui
>     INDEX lib/
>     MSGFMT    po/bg.msg 391 translated.
>     MSGFMT    po/de.msg 383 translated, 5 fuzzy, 3 untranslated.
>     MSGFMT    po/es.msg 122 translated, 269 untranslated.
>     MSGFMT    po/fr.msg 391 translated.
>     MSGFMT    po/hu.msg 391 translated.
>     MSGFMT    po/it.msg make: *** [po/it.msg] Error 1
> 
> Before and after the following patch :-)

I think that's this commit: c6fb29db5a50df150280b641d3c2a6703589b529
(Fixed usage of positional parameters in it.po and ja.po).
It didn't fix anything and was harmful instead.

Maybe this patch could be useful.

 po/README |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/po/README b/po/README
index 5e77a7d..595bbf5 100644
--- a/po/README
+++ b/po/README
@@ -101,7 +101,7 @@ matching msgid lines.  A few tips:
    "printf()"-like functions.  Make sure "%s", "%d", and "%%" in your
    translated messages match the original.
 
-   When you have to change the order of words, you can add "<number>\$"
+   When you have to change the order of words, you can add "<number>$"
    between '%' and the conversion ('s', 'd', etc.) to say "<number>-th
    parameter to the format string is used at this point".  For example,
    if the original message is like this:
@@ -111,12 +111,17 @@ matching msgid lines.  A few tips:
    and if for whatever reason your translation needs to say weight first
    and then length, you can say something like:
 
-	"WEIGHT IS %2\$d, LENGTH IS %1\$d"
+	"WEIGHT IS %2$d, LENGTH IS %1$d"
 
-   The reason you need a backslash before dollar sign is because
-   this is a double quoted string in Tcl language, and without
-   it the letter introduces a variable interpolation, which you
-   do not want here.
+   A format specification with a '*' (asterisk) refers to *two* arguments
+   instead of one, hence the succeeding argument number is two higher
+   instead of one. So, a message like this
+
+	"%s ... %*i of %*i %s (%3i%%)"
+
+   is equivalent to
+
+	"%1$s ... %2$*i of %4$*i %6$s (%7$3i%%)"
 
  - A long message can be split across multiple lines by ending the
    string with a double quote, and starting another string on the next
-- 
1.6.0.rc1

Re: [PATCH] Update to it.po

[Michele Ballabio]

[-- Attachment #1: Type: text/plain, Size: 587 bytes --]

On Sunday 03 August 2008, Paolo Ciarrocchi wrote:
> Some fairly simply changes to it.po
> 
> 
> Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>
> ---

[...]

>  po/it.po |   13 ++++++-------
>  1 files changed, 6 insertions(+), 7 deletions(-)

BTW, I think you posted a patch against git-gui-i18n.git, but that repo is
way behind git-gui.git and not updated for a while.

Here is a patch against current master (attached to prevent encoding issues).

The strings missing translation now is "Buckets". I know what
it means but I can't came up with a translation that I like.

[-- Attachment #2: 0001-git-gui-update-po-it.po.patch.gz --]
[-- Type: application/x-gzip, Size: 8749 bytes --]

Re: [PATCH] Update to it.po

[Paolo Ciarrocchi]

On Sun, Aug 3, 2008 at 1:49 PM, Michele Ballabio
<barra_cuda@katamail.com> wrote:
> On Sunday 03 August 2008, Paolo Ciarrocchi wrote:
>> Some fairly simply changes to it.po
>>
>>
>> Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>
>> ---
>
> [...]
>
>>  po/it.po |   13 ++++++-------
>>  1 files changed, 6 insertions(+), 7 deletions(-)
>
> BTW, I think you posted a patch against git-gui-i18n.git, but that repo is
> way behind git-gui.git and not updated for a while.

Ops... I thought that was still the right process...

> Here is a patch against current master (attached to prevent encoding issues).
>
> The strings missing translation now is "Buckets". I know what
> it means but I can't came up with a translation that I like.

Confused. Even in the repo i used buckets was the only missing translation.
If you look at my patch:

 #: lib/choose_repository.tcl:628
 msgid "buckets"
-msgstr ""
+msgstr "buckets"

you'll notice that we agree on not translating that word :)

That said, I'd like too see the following hunk be part of your patch as well:
 #: lib/spellcheck.tcl:80
-#, fuzzy
 msgid "Unrecognized spell checker"
-msgstr "Correttore ortografico sconosciuto"
+msgstr "Correttore ortografico non riconosciuto"

Can you please clarify how you are working on the po file?
I was used to use gtransalator and I'm a bit confused by hunks like
the following:
-#: lib/option.tcl:192
+#: lib/option.tcl:194

Thanks.


-- 
Paolo
http://paolo.ciarrocchi.googlepages.com/

Re: [PATCH] Update to it.po

[Michele Ballabio]

[-- Attachment #1: Type: text/plain, Size: 1844 bytes --]

On Sunday 03 August 2008, Paolo Ciarrocchi wrote:
> > Here is a patch against current master (attached to prevent encoding issues).
> >
> > The strings missing translation now is "Buckets". I know what
> > it means but I can't came up with a translation that I like.
> 
> Confused. Even in the repo i used buckets was the only missing translation.
> If you look at my patch:
> 
>  #: lib/choose_repository.tcl:628
>  msgid "buckets"
> -msgstr ""
> +msgstr "buckets"
> 
> you'll notice that we agree on not translating that word :)

Ok, but translating it with "buckets" has no real sense since it is not
commonly used in Italian, IMO. I'd leave it empty (the default English
word - "buckets" - will show up anyway) and hope that someone will come up
with an idea :)

> That said, I'd like too see the following hunk be part of your patch as well:
>  #: lib/spellcheck.tcl:80
> -#, fuzzy
>  msgid "Unrecognized spell checker"
> -msgstr "Correttore ortografico sconosciuto"
> +msgstr "Correttore ortografico non riconosciuto"

Ok, done in this version (attached).

> Can you please clarify how you are working on the po file?
> I was used to use gtransalator and I'm a bit confused by hunks like
> the following:
> -#: lib/option.tcl:192
> +#: lib/option.tcl:194

Some explanation is in po/README. The workflow is/should be:
  * normal development in git-gui.git happens
  * nearing a release, Shawn updates po/git-gui.pot
  * all translators update their po/*.po files with

	$ msgmerge -U po/it.po po/git-gui.pot

    where "it" is an example. This command updates strings and line numbers
    in the .po file (as in the two lines you quoted), and adds "fuzzy"
    to old/machine-guessed translations.
  * now the translator can use his tool of choice (but nearly any editor
    should do) to search for fuzzy or new strings and update it all.

[-- Attachment #2: 0001-git-gui-update-po-it.po.patch.gz --]
[-- Type: application/x-gzip, Size: 8766 bytes --]