Skip to content

Fr backtranslation#1702

Merged
hansu merged 45 commits intoLinuxCNC:masterfrom
silopolis:fr_backtranslation
Apr 10, 2022
Merged

Fr backtranslation#1702
hansu merged 45 commits intoLinuxCNC:masterfrom
silopolis:fr_backtranslation

Conversation

@silopolis
Copy link
Contributor

@silopolis silopolis commented Apr 5, 2022

Tentative PR for english docs edits and french "backtranslations"

@silopolis
Copy link
Contributor Author

silopolis commented Apr 5, 2022

I don't understand why this PR include commits before "common/ en edits from fr migration" which is the first I did after branching master ???

@hansu
Copy link
Member

hansu commented Apr 5, 2022

I don't understand why this PR include commits before "common/ en edits from fr migration" which is the first I did after branching master ???

Because this commit is a merge from another branch which includes the other changes.

@silopolis
Copy link
Contributor Author

silopolis commented Apr 5, 2022 via email

@petterreinholdtsen
Copy link
Collaborator

petterreinholdtsen commented Apr 6, 2022

This patch remove trailing space from adoc table cells, which will break building with po4a older than version 0.66.

@petterreinholdtsen petterreinholdtsen mentioned this pull request Apr 6, 2022
Merged
@hansu
Copy link
Member

hansu commented Apr 6, 2022

Le mar. 5 avr. 2022 à 23:00, Hans @.***> a écrit :
Because this commit is a merge from another branch which includes the other changes.
How is that? I branched from master and cheery picked my commits from petter's translate-po4a-migration branch?

I don't know, but it is displayed as a merge for me.
grafik

@silopolis silopolis force-pushed the fr_backtranslation branch from 720c3a8 to eac33d9 Compare April 6, 2022 08:13
@smoe
Copy link
Collaborator

smoe commented Apr 6, 2022

Just in case you are wondering, you need to scroll up a bit to find the error:

asciidoc -f ../docs/src/xhtml11.conf \
	 -f ../docs/src/asciidoc-dont-replace-arrows.conf \
	 -f ../docs/src/source-highlight/emc-langs-source-highlight.conf \
	 -a "source_highlight_dir=../docs/src/source-highlight/local" \
	 -a linkcss \
	 -a 'scriptsdir=../' -a 'stylesdir=../' \
         -a "scriptdir=../docs/src/" \
         -a "relindir=gcode" \
         -a "linksfile=objects/xref_en.links" \
	 -a stylesheet=linuxcnc.css \
	 -d book -a toc -a numbered -b xhtml11 ../docs/src/gcode/tool-compensation.adoc || (X=$?; rm -f ../docs/src/gcode/tool-compensation.html; exit $X)
asciidoc: WARNING: overview.adoc: line 721: missing section: [[gcode:functions]][[gcode:unary-operations]]
asciidoc -f ../docs/src/xhtml11.conf \
asciidoc: ERROR: overview.adoc: line 919: illegal style name: [cap:modal-groups]][[tbl:gcodes-modal-groups]
	 -f ../docs/src/asciidoc-dont-replace-arrows.conf \
make: *** [../docs/src/Submakefile:483: ../docs/src/gcode/overview.html] Error 1

On my small laptop that I edited the documentation on I was admittedly a few times just pushing to the build demon to get it built for me. You can run this locally with

make -C src docs

and there are times when it builds locally but not on github. I can chime in when desperation takes the overhand (which I consider to be a physiological response to those missing anchors).

Steffen

@silopolis
Copy link
Contributor Author

silopolis commented Apr 6, 2022

Looks like after a 2 hours fight I managed to cleanup this commit.
Rebased again on master and GitLens interactive rebase was very helpful to drop superfluous commits.

@smoe thanks for the build hints ! Just pushed first tentative fixes at build errors and warnings...

Will give local building a try after this... And reach out to any of yall if drawning ':D Thanks again for your support.

@petterreinholdtsen your tables fix (#1698) should now be cleanly mergeable on this.

@silopolis silopolis force-pushed the fr_backtranslation branch from 10a798f to 1347e8c Compare April 6, 2022 09:00
@hansu
Copy link
Member

hansu commented Apr 6, 2022 •
edited
Loading

overview.adoc:916

- [[cap:modal-groups]][[tbl:gcodes-modal-groups]]
+ [[cap:modal-groups]]
+ [[tbl:gcodes-modal-groups]]

@silopolis
Copy link
Contributor Author

silopolis commented Apr 6, 2022

overview.adoc:916

- [[cap:modal-groups]][[tbl:gcodes-modal-groups]]
+ [[cap:modal-groups]]
+ [[tbl:gcodes-modal-groups]]

Only had fixed warnings 😛

@silopolis silopolis force-pushed the fr_backtranslation branch from 1347e8c to 78eb18b Compare April 6, 2022 10:22
@smoe
Copy link
Collaborator

smoe commented Apr 6, 2022

Not too bad! You reintroduced a bad link to the Spanish files, though :) I just copied the messages over here for your convenience.

cp -f ../src/hal/user_comps/mb2hal/mb2hal_HOWTO.ini ../docs/html/drivers/
touch .html-images-stamp
touch .htmldoc-stamp
Can't check links: Content-Type for <file:///home/runner/work/linuxcnc/linuxcnc/src/.htmldoc-stamp> is 'text/plain'.
###
### language: French
### all links are good!
###
Can't check links: Content-Type for <file:///home/runner/work/linuxcnc/linuxcnc/src/.htmldoc-stamp> is 'text/plain'.
###
### language: Hungarian
### all links are good!
###
***
Processing	file:///home/runner/work/linuxcnc/linuxcnc/docs/html/gcode_vi.html
List of broken links and other issues:
file:///home/runner/work/linuxcnc/linuxcnc/docs/html/gcode/overview.html	
  Line: 168
  Code: 200 (no message)
 To do: Some of the links to this resource point to broken URI fragments
	(such as index.html#fragment).
The following fragments need to be fixed:
	gcode:debug                   	Line: 168
*** warning: bad links found in Vietnamese docs!
Can't check links: Content-Type for <file:///home/runner/work/linuxcnc/linuxcnc/src/.htmldoc-stamp> is 'text/plain'.
***
make: *** [../docs/src/Submakefile:309: checkref_vi] Error 1
make: *** Waiting for unfinished jobs....
***

*** warning: bad links found in Spanish docs!
***
make: *** [../docs/src/Submakefile:303: checkref_es] Error 1
Processing	file:///home/runner/work/linuxcnc/linuxcnc/docs/html/gcode_es.html

List of broken links and other issues:
file:///home/runner/work/linuxcnc/linuxcnc/docs/html/gcode/overview.html	
  Line: 169
  Code: 200 (no message)
 To do: Some of the links to this resource point to broken URI fragments
	(such as index.html#fragment).
The following fragments need to be fixed:
	gcode:debug                   	Line: 169
Can't check links: Content-Type for <file:///home/runner/work/linuxcnc/linuxcnc/src/.htmldoc-stamp> is 'text/plain'.
***

*** warning: bad links found in English docs!
***
Processing	file:///home/runner/work/linuxcnc/linuxcnc/docs/html/gcode/o-code.html
make: *** [../docs/src/Submakefile:294: checkref_en] Error 1

List of broken links and other issues:
file:///home/runner/work/linuxcnc/linuxcnc/docs/html/gcode/o-code.html	
  Line: 422
The following fragments need to be fixed:
	gcode:functions               	Line: 422

Processing	file:///home/runner/work/linuxcnc/linuxcnc/docs/html/gcode/overview.html
List of broken links and other issues:
file:///home/runner/work/linuxcnc/linuxcnc/docs/html/gcode/overview.html	
 Lines: 170, 197, 345, 459, 767

The following fragments need to be fixed:
	cap:modal-groups              	Lines: 170, 197
	gcode:functions               	Lines: 345, 767
	sub:system-parameters         	Line: 459

Processing	file:///home/runner/work/linuxcnc/linuxcnc/docs/html/hal/basic-hal.html

List of broken links and other issues:
file:///home/runner/work/linuxcnc/linuxcnc/docs/html/hal/basic-hal.html	
  Line: 342
The following fragments need to be fixed:
	sub:net                       	Line: 342

Processing	file:///home/runner/work/linuxcnc/linuxcnc/docs/html/hal/parallel-port.html
List of broken links and other issues:
file:///home/runner/work/linuxcnc/linuxcnc/docs/html/hal/parallel-port.html	
  Line: 412
The following fragments need to be fixed:
	sec:stepgen-parameters        	Line: 412

Processing	file:///home/runner/work/linuxcnc/linuxcnc/docs/html/gui/pyvcp.html
List of broken links and other issues:
file:///home/runner/work/linuxcnc/linuxcnc/docs/html/gui/pyvcp.html	
  Line: 538
The following fragments need to be fixed:
	pyvcp-colors                  	Line: 538

Processing	file:///home/runner/work/linuxcnc/linuxcnc/docs/html/gui/pyvcp-examples.html

List of broken links and other issues:
file:///home/runner/work/linuxcnc/linuxcnc/docs/html/gui/pyvcp-examples.html	
 Lines: 129, 585
The following fragments need to be fixed:
	sec:Documentation-des-widgets 	Line: 129
	sub:net                       	Line: 585

Processing	file:///home/runner/work/linuxcnc/linuxcnc/docs/html/lathe/lathe-user.html

List of broken links and other issues:
file:///home/runner/work/linuxcnc/linuxcnc/docs/html/lathe/lathe-user.html	
  Line: 128

The following fragments need to be fixed:
	axis:tool-touch-off           	Line: 128

Processing	file:///home/runner/work/linuxcnc/linuxcnc/docs/html/motion/tweaking-steppers.html

List of broken links and other issues:
file:///home/runner/work/linuxcnc/linuxcnc/docs/html/motion/tweaking-steppers.html	
  Line: 61
The following fragments need to be fixed:
	cha:latency-testing           	Line: 61

Processing	file:///home/runner/work/linuxcnc/linuxcnc/docs/html/remap/remap.html
List of broken links and other issues:
file:///home/runner/work/linuxcnc/linuxcnc/docs/html/remap/remap.html	
  Line: 357
The following fragments need to be fixed:
	gcode:functions               	Line: 357

Processing	file:///home/runner/work/linuxcnc/linuxcnc/docs/html/user/user-intro.html
List of broken links and other issues:
file:///home/runner/work/linuxcnc/linuxcnc/docs/html/user/user-intro.html	
  Line: 294
The following fragments need to be fixed:
	cha:TkLinuxCNC                	Line: 294

Processing	file:///home/runner/work/linuxcnc/linuxcnc/docs/html/gcode.html
file:///home/runner/work/linuxcnc/linuxcnc/docs/html/gcode/overview.html	
  Line: 170
  Code: 200 (no message)
The following fragments need to be fixed:
	gcode:debug                   	Line: 170

@silopolis
Copy link
Contributor Author

silopolis commented Apr 6, 2022 •
edited
Loading

Not too bad!

Isn't it ?! 😅

You reintroduced a bad link to the Spanish files, though :) I just copied the messages over here for your convenience.

Arf... Thanks 👍
Had to get out for lunch. Back on it until I kill it. No surrendering 💪

PS: after a couple of missing build deps (libgtk-3-dev python3-tk python3-lxml) and finding the adequate configure option, I'm building locally ATM...

@smoe
Copy link
Collaborator

smoe commented Apr 6, 2022

Hm. dpkg-buildpackage tells you if you have all the build-deps.

@silopolis
More tries at fixing anchors
add37af 
Still 5 of them to kill but have to take a break before I punch
the screen !
@silopolis
Copy link
Contributor Author

silopolis commented Apr 6, 2022

OK guys just pushed again with still 5 anchors issues. Time for a break, deep breathing... and a couple of beers ! 🤯

@hansu
Copy link
Member

hansu commented Apr 6, 2022

Ok, but don't take too many beers I am waaaaiiting...
No, I am just kidding ;-). But it would be nice if you don't do force push up from now. I based by branch at the tip of your branch...

@silopolis
Copy link
Contributor Author

silopolis commented Apr 6, 2022 via email

@silopolis silopolis force-pushed the fr_backtranslation branch from 069b648 to 666723b Compare April 10, 2022 17:54
@hansu
Copy link
Member

hansu commented Apr 10, 2022 •
edited
Loading

@silopolis silopolis force-pushed the fr_backtranslation branch from 069b648 to 666723b 11 minutes ago

What have you done?

@hansu
Copy link
Member

hansu commented Apr 10, 2022

@silopolis silopolis force-pushed the fr_backtranslation branch from 069b648 to 666723b 11 minutes ago

Thank you that you destroyed my work of half my Sunday!

@silopolis
Copy link
Contributor Author

silopolis commented Apr 10, 2022 via email

@hansu
Copy link
Member

hansu commented Apr 10, 2022 •
edited
Loading

Ah you rebased on master, right?
But didn't we say to do take care of this later? We should do things step by step as we are man involved people here...

Fortunately I didn't fetch/pull your branch. So the easiest would be to force push the copy of your branch from https://github.com/hansu/linuxcnc/tree/fr_backtranslation to your branch

@silopolis silopolis force-pushed the fr_backtranslation branch from 666723b to 069b648 Compare April 10, 2022 18:32
@silopolis
Copy link
Contributor Author

silopolis commented Apr 10, 2022

Ah you rebased on master, right?

Yes, that's what I did ! I "always" rebase.

But didn't we say to do take care of this later?

Thought that was OK that I rebase on master, merge your PR, cherry-pick @smoe 's commit to leave you mergeable branch in a snap !

We should do things step by step as we are man involved people here...

For sure !

Fortunately I didn't fetch/pull your branch. So the easiest would be to force push the copy of your branch from https://github.com/hansu/linuxcnc/tree/fr_backtranslation to your branch

Reverted back to before merging and force pushed to hopefully rewind and recover your work
Hope that will be OK

@hansu
Copy link
Member

hansu commented Apr 10, 2022

Thought that was OK that I rebase on master, merge your PR, cherry-pick @smoe 's commit to leave you mergeable branch in a snap !

Which commit of @smoe?
My idea was to do it in this order

  1. merge PR14
  2. revert the Chris' commit on master
  3. merge this PR
  4. merge Petters PR
  5. re-apply Chris' changes on master

and somewhere in between Steffens cherry-picks

Reverted back to before merging and force pushed to hopefully rewind and recover your work
Hope that will be OK

Yes, that seems to have fixed it. Thanks

@hansu hansu mentioned this pull request Apr 10, 2022
Merged
@silopolis
Copy link
Contributor Author

silopolis commented Apr 10, 2022 via email

@hansu
Copy link
Member

hansu commented Apr 10, 2022

  1. merge hansu's PR14 here
  2. cherry-pick @smoe 's commit to re-enable glossaries
  3. (revert Chris' commit)
  4. merge this branch into master
  5. merge Petter's PR holding migration tooling and po4a tool chain

I mean we can skip 3. as it doesn't leads to conflicts.
That would just destroy a bit of your work on this file to unify the structure of the different languages. I think if we apply it later if wouldn't affect the po file generation.

@hansu hansu merged commit a5ac97a into LinuxCNC:master Apr 10, 2022
@hansu
Copy link
Member

hansu commented Apr 10, 2022

i created the branch https://github.com/LinuxCNC/linuxcnc/tree/docs-devel and
reverted Chris' commit and merged petters branch.
In some hours we can hopefully see the result in http://linuxcnc.org/docs/scratch/html/

@smoe
Copy link
Collaborator

smoe commented Apr 10, 2022

Many thanks for the interim merge to master. Somehow I feel that all of a sudden about everyone wants to commit something to the documentation :)

I just rebased to master (afterhaving rebased to silopolis' branch before) and somehow I feel that this is all starting to get a bit difficult. @silopolis , when you start po4a-syncing file, please ping me, so you know my workflow.

@smoe
Copy link
Collaborator

smoe commented Apr 10, 2022

The day ends.

$ grep -c msgid po/Documentation-new_es.po
3674
$ grep -c msgid po/Documentation_es.po 
7460

I had a look at those "translate-units". These look reasonable. So, unless we dramatically increase the coverage now with this second iteration, we likely should have started with those we already have.

@smoe
Copy link
Collaborator

smoe commented Apr 11, 2022

@silopolis , @hansu
Hello, hello,
I am not exactly sure about what means of communication we have now since this branch was merged. Someone should create a new PR :) I still need to figure out why my current branch does not build these days, but then again, I do not ultimately care, I must admit.
My syncing of En with Es is now in the gcode directory. I think this should speed up a bit now. There was quite a number of changes required that can only mean I did not touch those files before. So I must have moved them between directories? It is all a bit weird. Or I made many syntax corrections to the English only in the past that I did not do to the Spanish version (the English now does look better).

@silopolis
Copy link
Contributor Author

silopolis commented Apr 11, 2022 via email

@silopolis
Copy link
Contributor Author

silopolis commented Apr 11, 2022 via email

@hansu
Copy link
Member

hansu commented Apr 11, 2022

For me it would be nice to have a chat like slack or mattermost whatever, what provides a history on the server

@silopolis
Copy link
Contributor Author

silopolis commented Apr 11, 2022 via email

@silopolis
Copy link
Contributor Author

silopolis commented Oct 11, 2022 via email

@petterreinholdtsen
Copy link
Collaborator

petterreinholdtsen commented Oct 11, 2022 via email

@silopolis
Copy link
Contributor Author

silopolis commented Oct 11, 2022 via email

@silopolis
Copy link
Contributor Author

silopolis commented Oct 11, 2022 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@smoe smoe smoe left review comments

@hansu hansu hansu left review comments

Assignees

No one assigned

Labels

documentation po4a

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@silopolis @hansu @petterreinholdtsen @smoe