[chronojump] Updated intltool-update to current perl versions and howto_translate.txt

[Xavier de Blas <xaviblas src gnome org>]

commit e348d531da1cb4f9a2c53d63f272e3860f880467
Author: Xavier de Blas <xaviblas gmail com>
Date:   Mon Jun 8 10:31:41 2020 +0200

    Updated intltool-update to current perl versions and howto_translate.txt

 howto_translate.txt | 26 +++++++++++++++-----------
 po/intltool-update  | 20 ++++++++++----------
 2 files changed, 25 insertions(+), 21 deletions(-)
---
diff --git a/howto_translate.txt b/howto_translate.txt
index 185cc9c1..302abd7c 100644
--- a/howto_translate.txt
+++ b/howto_translate.txt
@@ -35,28 +35,32 @@ Changed also the mail of es translator, and: "Project-Id-Version: es\n"
 
 for ** UPDATE ** , i do:
 
-1.- check for missing files
-chronojump/po $ ./intltool-update -m
-
-2.- add missing files to POTFILES.in
-if all are needed:
-chronojump/po $ cat missing >> POTFILES.in
-if some not, add them to POTFILES.skip
+/* 
+ * this is not needed, is not working, and its done automatically on git constantly by Piotr Drąg (being a 
person or a script, who knows)
+ *
+ * 1 OLD .- check for missing files
+ * chronojump/po $ ./intltool-update -m
+ *
+ * 2 OLD .- add missing files to POTFILES.in
+ * if all are needed:
+ * chronojump/po $ cat missing >> POTFILES.in
+ * if some not, add them to POTFILES.skip
+*/
 
-3.- check creating a .pot (creates chronojump.pot)
+1.- check creating a .pot (creates chronojump.pot)
 chronojump/po $ intltool-update -p
 
-4.- merge chronojump.pot with old catalan translation
+2.- merge chronojump.pot with old catalan translation
 mv ca.po ca_old.po
 msgmerge -o ca.po ca_old.po chronojump.pot
 
 mv es.po es_old.po
 msgmerge -o es.po es_old.po chronojump.pot
 
-5.- edit the ca.po with a multipurpose editor like vim, or a po editor like poedit
+3.- edit the ca.po with a multipurpose editor like vim, or a po editor like poedit
 poedit it's better because it fast finds what needs to be translated
 
-6.- make, sudo make install
+4.- make, sudo make install
 ---------
 ---------
 
diff --git a/po/intltool-update b/po/intltool-update
index 3cfd6a55..bdee488d 100755
--- a/po/intltool-update
+++ b/po/intltool-update
@@ -1066,7 +1066,7 @@ sub SubstituteVariable
        }
     }
 
-    if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)
+    if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/)
     {
        my $rest = $3;
        my $untouched = $1;
@@ -1194,10 +1194,10 @@ sub FindPackageName
        $name    =~ s/\(+$//g;
        $version =~ s/\(+$//g;
 
-       $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
-       $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
-       $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
-       $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
+       $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
+       $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
+       $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
+       $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
     }
 
     if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m)
@@ -1223,11 +1223,11 @@ sub FindPackageName
        $version =~ s/\(+$//g;
         $bugurl  =~ s/\(+$//g if (defined $bugurl);
 
-       $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
-       $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
-       $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
-       $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
-        $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/);
+       $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
+       $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
+       $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
+       $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
+        $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+}?/);
     }
 
     # \s makes this not work, why?