[GRASS-dev] [GRASS-SVN] r73627 - grass/trunk/raster/r.stream.extract

Hi,

such commits would be good to backport to G76 (and probably also to
G74) release branch. Thanks for taking care about backports in
advance, Ma

st 31. 10. 2018 v 2:54 odesílatel <svn_grass@osgeo.org> napsal:

Author: hcho
Date: 2018-10-30 18:54:09 -0700 (Tue, 30 Oct 2018)
New Revision: 73627

Modified:
   grass/trunk/raster/r.stream.extract/cseg.c
Log:
r.stream.extract: Typo

Modified: grass/trunk/raster/r.stream.extract/cseg.c

--- grass/trunk/raster/r.stream.extract/cseg.c 2018-10-30 21:00:49 UTC (rev 73626)
+++ grass/trunk/raster/r.stream.extract/cseg.c 2018-10-31 01:54:09 UTC (rev 73627)
@@ -83,7 +83,7 @@
int cseg_get(CSEG *cseg, CELL *value, GW_LARGE_INT row, GW_LARGE_INT col)
{
     if (Segment_get(&(cseg->seg), value, row, col) < 0) {
- G_warning(_("Unabel to read segment file"));
+ G_warning(_("Unable to read segment file"));
        return -1;
     }
     return 0;

_______________________________________________
grass-commit mailing list
grass-commit@lists.osgeo.org
https://lists.osgeo.org/mailman/listinfo/grass-commit

--
Martin Landa
http://geo.fsv.cvut.cz/gwiki/Landa
http://gismentors.cz/mentors/landa

... and by doing so marking all translated strings as untranslated.
This exactly is a type of change that should NOT be backported – the
meaning of this string can be understood also when it is misspelled
and backporting would thus harm translations.

Māris.
trešd., 2018. g. 31. okt., plkst. 09:33 — lietotājs Martin Landa
(<landa.martin@gmail.com>) rakstīja:

Hi,

such commits would be good to backport to G76 (and probably also to
G74) release branch. Thanks for taking care about backports in
advance, Ma

st 31. 10. 2018 v 2:54 odesílatel <svn_grass@osgeo.org> napsal:
>
> Author: hcho
> Date: 2018-10-30 18:54:09 -0700 (Tue, 30 Oct 2018)
> New Revision: 73627
>
> Modified:
> grass/trunk/raster/r.stream.extract/cseg.c
> Log:
> r.stream.extract: Typo
>
> Modified: grass/trunk/raster/r.stream.extract/cseg.c
> ===================================================================
> --- grass/trunk/raster/r.stream.extract/cseg.c 2018-10-30 21:00:49 UTC (rev 73626)
> +++ grass/trunk/raster/r.stream.extract/cseg.c 2018-10-31 01:54:09 UTC (rev 73627)
> @@ -83,7 +83,7 @@
> int cseg_get(CSEG *cseg, CELL *value, GW_LARGE_INT row, GW_LARGE_INT col)
> {
> if (Segment_get(&(cseg->seg), value, row, col) < 0) {
> - G_warning(_("Unabel to read segment file"));
> + G_warning(_("Unable to read segment file"));
> return -1;
> }
> return 0;
>
> _______________________________________________
> grass-commit mailing list
> grass-commit@lists.osgeo.org
> https://lists.osgeo.org/mailman/listinfo/grass-commit

--
Martin Landa
http://geo.fsv.cvut.cz/gwiki/Landa
http://gismentors.cz/mentors/landa
_______________________________________________
grass-dev mailing list
grass-dev@lists.osgeo.org
https://lists.osgeo.org/mailman/listinfo/grass-dev

Hi,

st 31. 10. 2018 v 10:05 odesílatel Maris Nartiss <maris.gis@gmail.com> napsal:

... and by doing so marking all translated strings as untranslated.
This exactly is a type of change that should NOT be backported – the
meaning of this string can be understood also when it is misspelled
and backporting would thus harm translations.

it can be right for G74 release branch but for for G76 where typos
should be simply fixed. Ma

> > --- grass/trunk/raster/r.stream.extract/cseg.c 2018-10-30 21:00:49 UTC (rev 73626)
> > +++ grass/trunk/raster/r.stream.extract/cseg.c 2018-10-31 01:54:09 UTC (rev 73627)
> > @@ -83,7 +83,7 @@
> > int cseg_get(CSEG *cseg, CELL *value, GW_LARGE_INT row, GW_LARGE_INT col)
> > {
> > if (Segment_get(&(cseg->seg), value, row, col) < 0) {
> > - G_warning(_("Unabel to read segment file"));
> > + G_warning(_("Unable to read segment file"));
> > return -1;
> > }
> > return 0;
> >
> > _______________________________________________
> > grass-commit mailing list
> > grass-commit@lists.osgeo.org
> > https://lists.osgeo.org/mailman/listinfo/grass-commit
>
>
>
> --
> Martin Landa
> http://geo.fsv.cvut.cz/gwiki/Landa
> http://gismentors.cz/mentors/landa
> _______________________________________________
> grass-dev mailing list
> grass-dev@lists.osgeo.org
> https://lists.osgeo.org/mailman/listinfo/grass-dev

--
Martin Landa
http://geo.fsv.cvut.cz/gwiki/Landa
http://gismentors.cz/mentors/landa

Hmm… I never thought about backporting these changes… So just G76 should be fine then?

Huidae /hidɛ/

···

Huidae Cho, Ph.D., PE, M.ASCE, CFM, GISP
Open Source GIS Developer, GRASS GIS Development Team

Please wait.
First also the .po files need that update add I have done last time as well.
Then no translation will be broken.

Markus

Huidae Cho <grass4u@gmail.com> schrieb am Mi., 31. Okt. 2018, 15:06:

Hmm… I never thought about backporting these changes… So just G76 should be fine then?

Huidae /hidɛ/

On Wed, Oct 31, 2018 at 5:29 AM Martin Landa <landa.martin@gmail.com> wrote:

Hi,

st 31. 10. 2018 v 10:05 odesílatel Maris Nartiss <maris.gis@gmail.com> napsal:

… and by doing so marking all translated strings as untranslated.
This exactly is a type of change that should NOT be backported – the
meaning of this string can be understood also when it is misspelled
and backporting would thus harm translations.

it can be right for G74 release branch but for for G76 where typos
should be simply fixed. Ma

— grass/trunk/raster/r.stream.extract/cseg.c 2018-10-30 21:00:49 UTC (rev 73626)
+++ grass/trunk/raster/r.stream.extract/cseg.c 2018-10-31 01:54:09 UTC (rev 73627)
@@ -83,7 +83,7 @@
int cseg_get(CSEG *cseg, CELL *value, GW_LARGE_INT row, GW_LARGE_INT col)
{
if (Segment_get(&(cseg->seg), value, row, col) < 0) {

  • G_warning(_(“Unabel to read segment file”));
  • G_warning(_(“Unable to read segment file”));
    return -1;
    }
    return 0;

grass-commit mailing list
grass-commit@lists.osgeo.org
https://lists.osgeo.org/mailman/listinfo/grass-commit


Martin Landa
http://geo.fsv.cvut.cz/gwiki/Landa
http://gismentors.cz/mentors/landa


grass-dev mailing list
grass-dev@lists.osgeo.org
https://lists.osgeo.org/mailman/listinfo/grass-dev


Martin Landa
http://geo.fsv.cvut.cz/gwiki/Landa
http://gismentors.cz/mentors/landa

Huidae Cho, Ph.D., PE, M.ASCE, CFM, GISP
Open Source GIS Developer, GRASS GIS Development Team


grass-dev mailing list
grass-dev@lists.osgeo.org
https://lists.osgeo.org/mailman/listinfo/grass-dev

Markus,

What is the best way to test my translation? I know we have the transifex merge script, but that will overwrite the SVN version of the files, which can be accidentally checked in.

Regards,
Huidae

···

Huidae Cho, Ph.D., PE, M.ASCE, CFM, GISP
Open Source GIS Developer, GRASS GIS Development Team

On Wed, Oct 31, 2018 at 6:56 PM Huidae Cho <grass4u@gmail.com> wrote:

Markus,

What is the best way to test my translation?

Importantly when fixing typos in the English strings, please also edit
the respective .po files.
Note: this only applies to typos.

Still to be done for the last typo fixes.

I know we have the transifex merge script, but that will overwrite the SVN version of the files, which can be accidentally checked in.

I am running the transifex merge script usually in the RC release cycle.
But for local test it is fine. Since SVN commits work at directory
level, accidental commits can be more easily avoided than perhaps in
git.

Best
Markus

On Wed, Oct 31, 2018 at 10:05 AM Maris Nartiss <maris.gis@gmail.com> wrote:

... and by doing so marking all translated strings as untranslated.
This exactly is a type of change that should NOT be backported – the
meaning of this string can be understood also when it is misspelled
and backporting would thus harm translations.

... unless also the typo(s) are fixed in the respective
locale/po/grassXXXX_*.po files.

I have done that now (also last time of typo fixing).

So, the suggested procedure is (needs to be done separately on each
trunk/branch, the common simple backport procedure does not apply
here!):

1. fix message typo in C/Python code
2. do the same in the respective locale/po/grassXXXX_*.po files
3. deduplicate the messages:

for i in `ls grass*_*.po` ; do
    msguniq $i > tmp.$i
    rm -f $i
    mv tmp.$i $i
done

4. optionally merge in new translations from transifex:

  sh /path/to/grass-addons/tools/transifex_merge.sh

5. submit to SVN

Cheers
Markus

On Wed, Oct 31, 2018 at 6:56 PM Huidae Cho <grass4u@gmail.com> wrote:

Markus,

What is the best way to test my translation? I know we have the transifex merge script, but that will overwrite the SVN version of the files, which can be accidentally checked in.

Update for both trunk and relbranch76:
  - po files updated for r73627, r73628
  - transifex merge done

After local update, you can test translations.

Markus

Thanks Markus!

Regarding merging messages from transifex, do we have a designated developer who does that or can anyone merge and check in translations to svn?

Best,
Huidae


Huidae Cho, Ph.D., P.E., M.ASCE, CFM, GISP
Open Source GIS Developer, GRASS GIS Development Team
https://idea.isnew.info
Sent from my phone

On Thu, Nov 1, 2018, 1:56 PM Markus Neteler <neteler@osgeo.org wrote:

On Wed, Oct 31, 2018 at 6:56 PM Huidae Cho <grass4u@gmail.com> wrote:

Markus,

What is the best way to test my translation? I know we have the transifex merge script, but that will overwrite the SVN version of the files, which can be accidentally checked in.

Update for both trunk and relbranch76:

  • po files updated for r73627, r73628
  • transifex merge done

After local update, you can test translations.

Markus

Hi Huidae,

On Thu, Nov 1, 2018 at 9:12 PM Huidae Cho <grass4u@gmail.com> wrote:

Thanks Markus!

Regarding merging messages from transifex, do we have a designated developer who does that or can anyone merge and check in translations to svn?

Anyone with write access and knowing how to do it can do it :slight_smile:

I think that through the transifex script we are quite safe.

Best
Markus