Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added missing translations (Italian) #4300

Closed

Conversation

silvio-didonna
Copy link
Contributor

No description provided.

@silvio-didonna silvio-didonna changed the title Added missing translations Added missing translations (Italian) Jul 14, 2016
#if LCD_WIDTH > 19
#define MSG_INFO_PRINT_COUNT "Contat. stampa"
#define MSG_INFO_FINISHED_PRINTS "Finiti "
#define MSG_INFO_PRINT_TIME "Tempo totale"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These 3 strings are meant to align. Please add a trailing space to each of the two the shorter strings.

Copy link
Contributor Author

@silvio-didonna silvio-didonna Jul 16, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@thinkyhead Please check if it is ok now.

@silvio-didonna
Copy link
Contributor Author

Why have you closed this pull request?
I made the modifications suggested.

There is some errors in my PR?

@jbrazio
Copy link
Contributor

jbrazio commented Jul 17, 2016

@tnw513 look at #4329, it was a rebase of this one so it could be merged.

@silvio-didonna
Copy link
Contributor Author

I see, but why an other PR? I've made a mistake?
Probably I miss something in how git rebase works. In this case why "rebase" and not "merge"?

@jbrazio
Copy link
Contributor

jbrazio commented Jul 18, 2016

"Rebase" must be done in the command line git and basically means that you want to update your working tree to the latest RCBugfix (the base) and then re-apply your changes on top of it.

If you look at the #4329 the change credit is still assign to your username, so it's exactly the same thing as merging this one but some times we cannot automatically merge changes using the Github web interface due to conflicts. We could ask the person to rebase the PR or in this case we do it ourselves.

@jbrazio jbrazio modified the milestone: 1.1.0 Jul 18, 2016
@silvio-didonna
Copy link
Contributor Author

Ok, perfect.
I'll rebase it next time, so you do not have to do more work than needed.

No problem for credit, it's only a translation :)

@jbrazio
Copy link
Contributor

jbrazio commented Jul 18, 2016

Just to make it all clear. :-D

@silvio-didonna silvio-didonna deleted the FixLangIt branch July 24, 2016 14:33
drewmoseley pushed a commit to drewmoseley/Marlin that referenced this pull request Feb 10, 2024
No change in memory
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants