Skip to content

Translated developer tools info page#4054

Merged
bramkragten merged 3 commits into
home-assistant:devfrom
springstan:translateInfoPage
Oct 19, 2019
Merged

Translated developer tools info page#4054
bramkragten merged 3 commits into
home-assistant:devfrom
springstan:translateInfoPage

Conversation

@springstan
Copy link
Copy Markdown
Member

Issue affected: #3429

Description:

  • added developer tools info page translations to src/translations/en.json
  • updated developer-tools-info.ts and system-health-card.ts accordingly

Result:
grafik

Comment on lines +39 to +40
? this.hass.localize("ui.panel.developer-tools.tabs.info.remove")
: this.hass.localize("ui.panel.developer-tools.tabs.info.set")
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Add these as variable in the default_ui translation

Copy link
Copy Markdown
Member Author

@springstan springstan Oct 19, 2019

Choose a reason for hiding this comment

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

Sure thing! Done 3b3ee0d

Copy link
Copy Markdown
Member

@bramkragten bramkragten left a comment

Choose a reason for hiding this comment

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

OK to merge when rebased.

@bramkragten
Copy link
Copy Markdown
Member

bramkragten commented Oct 19, 2019

That wasn't a rebase, but it does fix the merge conflict.
For a rebase:

If you haven't add the upstream remote yet:
git remote add upstream https://github.com/home-assistant/home-assistant-polymer.git

Rebase
git fetch upstream dev to pull the latest changes into a local dev branch
git rebase upstream/dev to put those changes into your feature branch before your changes and then apply your changes again

If there are conflicts:
Resolve the conflict(s) if there are any and save the file(s).
git add .
git rebase --continue

Push
After the rebase you have to force push:
git push origin --force

(If you give us the rights to push to your branch when you create a PR we can resolve the conflicts for you)

@bramkragten bramkragten merged commit 603240c into home-assistant:dev Oct 19, 2019
@springstan
Copy link
Copy Markdown
Member Author

@bramkragten thank you very much for the explanation. I am still learning git and its terminology so your explanation is greatly appreciated :)

@bramkragten bramkragten mentioned this pull request Oct 23, 2019
@github-actions github-actions Bot locked and limited conversation to collaborators Jul 6, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants