search

disk91 / helium-chirpstack-community

Glue between helium and chirpstack
20 stars 6 forks source link

More en translations clean-up #90

Closed DeflateAwning closed 8 months ago

DeflateAwning commented 8 months ago

Thanks again for merging my changes from yesterday! Here's a few more that got missed or that I came up with during the review.

Take a look at the meld tool with git for doing diffs, if you have to do this sort of merge much. It's super helpful. 

sudo apt install meld # or equivalent for your system

# run once to set the configuration
git config --global diff.tool meld

# run to do a diff on two branches
git difftool -d en-translations..master

# diff a branch (left) to your current working copy (right)
git difftool -d en-translations
 # (then you can modify the current working copy and keep which lines you like right in the meld editor

Thanks again for the acknowledgement in the README :)

disk91 commented 8 months ago

Thank you, I'll review and merge shortly

disk91 commented 8 months ago

I've merge the delta manually, not the most efficient way for sure but I don't want the xxxx Adm to be changed by xxxx Admin as the space is not really large in the menu and this is only seen by admin. I should have been merged and reapply a modification on these 2-3 label, would have been more efficient... let's progress in 2024 with pull request merging ;) thank you for your contribution and happy new year !