Re: [bug-gettext] [PATCH] Incorporate PODIFF feature into gettext-tools

[Daiki Ueno]

Hi Alexander,

Alexander Potashev <address@hidden> writes:

> I've got too little time to try this program. Could you please post a
> podiff output sample so we can evaluate its practicality and compare
> to other diffing tools

Find below the sample output.  I used different versions of eo.po from:

http://translationproject.org/PO-files/eo/gettext-runtime-0.18.eo.po
http://translationproject.org/PO-files/eo/gettext-runtime-0.18.2.eo.po

as input.

> (I use Pology's poediff, for example).

Thanks for the information.  I didn't know poediff and the output looks
pretty nice.  Here are some good things I observed:

- poediff's output is in PO format (I like this because that makes it
  easy to apply styles/colors in gettext).

- poediff always shows entire msgid/msgstr pair, while PODIFF may split
  it into separate hunks due to the limitation of diff.

- poediff marks the state change with special translator comment,
  like "#. ediff: state {-fuzzy-}".

- poediff produces word-based diff for each msgstr.

Maybe we could steal some of those ideas.  I also think it might be
informative if there is a header comment contains statistics like
diffstat.

Regards,
-- 
Daiki Ueno

--- /tmp/podiff.ssCOOO  2014-03-02 08:33:26.594581140 +0900
+++ /tmp/podiff.UA5J2K  2014-03-02 08:33:26.594581140 +0900
@@ -1,13 +1,15 @@
 msgid ""
-msgstr "Project-Id-Version: gettext-runtime 0.16.2-pre5\n"
+msgstr "Project-Id-Version: gettext-runtime 0.18.2\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2010-05-09 13:18+0200\n"
-"PO-Revision-Date: 2007-10-16 10:18+0100\n"
-"Last-Translator: D. Dale Gulledge <address@hidden>\n"
+"POT-Creation-Date: 2012-12-25 14:19+0900\n"
+"PO-Revision-Date: 2013-10-30 16:17-0300\n"
+"Last-Translator: Felipe Castro <address@hidden>\n"
 "Language-Team: Esperanto <address@hidden>\n"
+"Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.5.4\n"
 
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               eligi informon pri la versio kaj eliri\n"
@@ -60,37 +62,37 @@
 "ŜEL-FORMATO\n"
 
 msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: nevalida opcio -- %c\n"
+msgstr "%s: nevalida modifilo -- '%c'\n"
 
 msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: la opcio '%c%s' ne prenas argumenton\n"
+msgstr "%s: la modifilo '%c%s' ne prenas argumenton\n"
 
-msgid "%s: option '%s' is ambiguous\n"
-msgstr "%s: la opcio '%s' estas dubasenca\n"
+msgid "%s: option '%s' is ambiguous; possibilities:"
+msgstr "%s: la modifilo '%s' estas plursenca; ebloj:"
 
 msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: la opcio '--%s' ne prenas argumenton\n"
+msgstr "%s: la modifilo '--%s' ne prenas argumenton\n"
 
 msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: la opcio '%s' bezonas argumenton\n"
+msgstr "%s: la modifilo '%s' bezonas argumenton\n"
 
 msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: la opcio '-W %s' ne prenas argumenton\n"
+msgstr "%s: la modifilo '-W %s' ne prenas argumenton\n"
 
 msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: la opcio '-W %s' estas dubasenca\n"
+msgstr "%s: la modifilo '-W %s' estas plursenca\n"
 
 msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: la opcio '%s' bezonas argumenton\n"
+msgstr "%s: la modifilo '-W %s' bezonas argumenton\n"
 
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: opcio bezonas argumenton -- %c\n"
+msgstr "%s: la modifilo bezonas argumenton -- '%c'\n"
 
 msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: nerekonata opcio '%c%s'\n"
+msgstr "%s: nerekonata modifilo '%c%s'\n"
 
 msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: nerekonata opcio '--%s'\n"
+msgstr "%s: nerekonata modifilo '--%s'\n"
 
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
@@ -100,7 +102,7 @@
 "<http://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr "Kopirajto (C) %s Free Software Foundation, Inc.\n"
+msgstr "Kopirajto © %s Free Software Foundation, Inc.\n"
 "Rajtigilo GPLv3+: GNU GPL, versio 3 aŭ posta "
 "<http://gnu.org/licenses/gpl.html>\n"
 "Ĉi tio estas libera programo; vi estas libera ŝanĝi kaj redistribui "
@@ -135,7 +137,7 @@
 "the\n"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the `echo' command.\n"
+"When used with the -s option the program behaves like the 'echo' command.\n"
 "But it does not simply copy its arguments to stdout.  Instead those "
 "messages\n"
 "found in the selected catalog are translated.\n"
@@ -144,7 +146,7 @@
 "TEXTDOMAIN\n"
 "estas uzata. Se la mesaĝkatalogo ne estas trovita en la kutima dosierujo,\n"
 "alia dosierujo povas esti specifita per la media variablo TEXTDOMAINDIR.\n"
-"Uzate kun la opcio -s, la programo kondutas kiel la komando 'echo'.\n"
+"Uzate kun la modifilo -s, la programo kondutas kiel la komando 'echo'.\n"
 "Tamen, ĝi ne simple kopias siajn argumentojn al la normala eligo;\n"
 "anstataŭe, tiuj mesaĝoj trovitaj en la elektita katalogo estas "
 "tradukataj.\n"
@@ -178,7 +180,7 @@
 msgid "Substitutes the values of environment variables.\n"
 msgstr "Substituas la valorojn de mediaj variabloj.\n"
 
-msgid "Try `%s --help' for more information.\n"
+msgid "Try '%s --help' for more information.\n"
 msgstr "Provu '%s --help' por pli da informoj.\n"
 
 msgid "Ulrich Drepper"
@@ -188,15 +190,15 @@
 msgstr "Nekonata sistemeraro"
 
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
-msgstr "Uzado: %s [OPCIO] [ŜEL-FORMATO]\n"
+msgstr "Uzado: %s [MODIFILO] [ŜEL-FORMATO]\n"
 
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
-msgstr "Uzado: %s [OPCIO] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
+msgstr "Uzado: %s [MODIFILO] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 
 msgid "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
 "or:    %s [OPTION] -s [MSGID]...\n"
-msgstr "Uzado: %s [OPCIO] [[TEXTDOMAIN] MSGID]\n"
-"aŭ:    %s [OPCIO] -s [MSGID]...\n"
+msgstr "Uzado: %s [MODIFILO] [[TEXTDOMAIN] MSGID]\n"
+"aŭ:    %s [MODIFILO] -s [MSGID]...\n"
 
 msgid "When --variables is used, standard input is ignored, and the output "
 "consists\n"