search

codler / Battery-Time-Remaining

Show battery time remaining in Mac OS X 10.8+ Mountain Lion and Mavericks
http://yap.nu/battery-time-remaining/
Other
412 stars 72 forks source link

Polish localization #37

Closed alamilar closed 12 years ago

alamilar commented 12 years ago

Hey, I've created Polish localization for the app, hope you will enjoy it :). //I'm pretty new to github, hope I've done everything correctly, but please, dont shout at me ;).

codler commented 12 years ago

Thank you for the Polish localization! It looks good. Just a few things and it will be perfect. The InfoPlist.strings file is not needed and if you want you can convert Localizable.strings to UTF-16 or I can convert. Lastly when it is done please rebase to one commit.

codler commented 12 years ago

Could you rebase plz?

alamilar commented 12 years ago

Sorry, I've recently got pretty busy (and have only 3G connection right now) and I forgot to tell you, that I can't rebase it. I'm pretty new to git, so surely I'm doing something wrong. When I try to use merge command, git says "Already up to date", so with "rebase" command. I haven't found much usefull informations about my problem on the net. Could you please give me some help with it :)? Much appreciated :).

codler commented 12 years ago

I am not good at rebase either. Ive only done it once long time ago so I dont remember exactly. I think easiest is to copy Localizable.strings file outside repo, then you make a hard reset, then move back Localizable.strings, then commit and force push.

To make a hard reset: git reset --hard HEAD@{X} (replace X with a number, you can find the number here git reflog) To force push git push -f

or you could fork again.

I could make the commit myself, but I want to give proper credits in repo thats why.