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

Already on GitHub? Sign in to your account

Copy the patches from openSUSE to main branch #56

Merged
merged 6 commits into from Sep 23, 2012

Conversation

Projects
None yet
4 participants
Contributor

stoecker commented Sep 19, 2012

Some cleanups and patches developed in openSUSE package. I try to unify these with main fb, so patches aren't required anymore.

Owner

kthakore commented Sep 19, 2012

Do these german translations make sense?

On Wed, Sep 19, 2012 at 6:26 PM, stoecker notifications@github.com wrote:

Some cleanups and patches developed in openSUSE package. I try to unify

these with main fb, so patches aren't required anymore.

You can merge this Pull Request by running:

git pull https://github.com/stoecker/frozen-bubble master

Or view, comment on, or merge it at:

#56
Commit Summary

  • fix german translation (patch from openSuSE -
    frozen-bubble-2.212-ger…
  • add translation string and addition info (patch from openSuSE -
    froze…
  • display original keys when changing keys (patch from openSuSE -
    froze…
  • fix changing keys display and allow to deactivate joysticks

File Changes

  • M bin/frozen-bubble (60)
  • M share/locale/de.po (8)

Patch Links

Contributor

stoecker commented Sep 20, 2012

For me they do and I'm native German speaker for a long time now (nearly my whole life, escept maybe 1 and a half year :-).

One text was translated in wrong context, the others are using strange quote signs, which aren't displayed correctly.

Owner

kthakore commented Sep 20, 2012

Cool! I am not native German but Tobias is so trust him to check the patch.
:)

Kartik Thakore

On 2012-09-20, at 1:53 AM, stoecker notifications@github.com wrote:

For me they do and I'm native German speaker for a long time now (nearly my
whole life, escept maybe 1 and a half year :-).

One text was translated in wrong context, the others are using strange
quote signs, which aren't displayed correctly.


Reply to this email directly or view it on
GitHubhttps://github.com/kthakore/frozen-bubble/pull/56#issuecomment-8717434.

Contributor

stoecker commented Sep 20, 2012

Well, I'm new to the git-based development (I'm a bit old school). I only see you and me in the mails. Where do I see who your question is meant to be answered.

P.S. Any change to get 2.2.1 out of beta state after two years?

Owner

kthakore commented Sep 20, 2012

I cc'd Tobias to the email I get from github. Give me your email and I will
cc it too. As for beta status that will depend on the original author of
frozen bubble. I will cc him too!

Kartik Thakore

On 2012-09-20, at 2:07 AM, stoecker notifications@github.com wrote:

Well, I'm new to the git-based development (I'm a bit old school). I only
see you and me in the mails. Where do I see who your question is meant to
be answered.

P.S. Any change to get 2.2.1 out of beta state after two years?


Reply to this email directly or view it on
GitHubhttps://github.com/kthakore/frozen-bubble/pull/56#issuecomment-8717637.

Contributor

stoecker commented Sep 20, 2012

My email is: "github at dstoecker.de".

Seems I need to contact him every now and then. I also was the one who finally convinced him to create his first git repository and make a release adding some of the patches I had at this time :-)

Collaborator

gcottenc commented Sep 20, 2012

Ahah I read these
Le 20 sept. 2012 08:15, "stoecker" notifications@github.com a écrit :

My email is: "github at dstoecker.de".

Seems I need to contact him every now and then. I also was the one who
finally convinced him to create his first git repository and make a release
adding some of the patches I had at this time :-)


Reply to this email directly or view it on GitHubhttps://github.com/kthakore/frozen-bubble/pull/56#issuecomment-8717732.

Collaborator

FROGGS commented Sep 20, 2012

Hi, the patches look good esxcept https://github.com/stoecker/frozen-bubble/commit/a76ffd9bd1733c80456aaeb05fa5a8c594774018 , why were the messages reformatted?
IMO its not a good style to patch more than 6000 lines just because one sentense was wrong.

Contributor

stoecker commented Sep 20, 2012

I did a new xgettext run as new strings have been added and at least one was missing. I tried to make the results as small as possible, but gettext is not really designed to produce small patch files. Anyway from time to time the line numbers should be updated or they get worthless :-)

Contributor

stoecker commented Sep 23, 2012

Accepting this? Then I could continue the RPM's for openSUSE and fixing the remaining build issues.

Collaborator

FROGGS commented Sep 23, 2012

Are you going to test it and rerelease?

-------- Ursprüngliche Nachricht --------
Betreff: Re: [frozen-bubble] Copy the patches from openSUSE to main branch (#56)
Von: stoecker notifications@github.com
An: kthakore/frozen-bubble frozen-bubble@noreply.github.com
Cc: Tobias Leich email@froggs.de

Accepting this? Then I could continue the RPM's for openSUSE and fixing the remaining build issues.


Reply to this email directly or view it on GitHub:
#56 (comment)

Contributor

stoecker commented Sep 23, 2012

In case you mean me: Current code is tested to work fine here. Remaining issue for me is to get locale installation working properly - for openSUSE I move the locale file and the data files to proper places, which requires some patches which I did not supply here.

Collaborator

FROGGS commented Sep 23, 2012

Ohh, I meant kartik. If he doesnt have time I can do that too.

stoecker notifications@github.com hat geschrieben:

In case you mean me: Current code is tested to work fine here. Remaining issue for me is to get locale installation working properly - for openSUSE I move the locale file and the data files to proper places, which requires some patches which I did not supply here.


Reply to this email directly or view it on GitHub:
#56 (comment)

Owner

kthakore commented Sep 23, 2012

we also gotta make the version not beta

On Sun, Sep 23, 2012 at 9:26 AM, Tobias Leich notifications@github.comwrote:

Are you going to test it and rerelease?

-------- Ursprüngliche Nachricht --------
Betreff: Re: [frozen-bubble] Copy the patches from openSUSE to main branch
(#56)
Von: stoecker notifications@github.com
An: kthakore/frozen-bubble frozen-bubble@noreply.github.com
Cc: Tobias Leich email@froggs.de

Accepting this? Then I could continue the RPM's for openSUSE and fixing
the remaining build issues.


Reply to this email directly or view it on GitHub:
#56 (comment)


Reply to this email directly or view it on GitHubhttps://github.com/kthakore/frozen-bubble/pull/56#issuecomment-8798430.

Owner

kthakore commented Sep 23, 2012

Ok testing now

@kthakore kthakore added a commit that referenced this pull request Sep 23, 2012

@kthakore kthakore Merge pull request #56 from stoecker/master
Copy the patches from openSUSE to main branch
a21738d

@kthakore kthakore merged commit a21738d into kthakore:master Sep 23, 2012

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