Skip to content

Conversation

@fdmarcin
Copy link
Contributor

@fdmarcin fdmarcin commented Nov 24, 2017

Also, updated CC licence link.

Copy link
Member

@hagenburger hagenburger left a comment

Choose a reason for hiding this comment

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

Hey @fdmarcin, thanks for your work. Could you please split this up into 2 separate pull requests? I can merge and deploy your meet up right away. For the Polish translation, we need would need to get feedback from other Polish speakers first.

@Xylakant
Copy link

ping @pestkownica

Marcin Sędłak-Jakubowski added 2 commits November 25, 2017 14:50
@fdmarcin
Copy link
Contributor Author

Done, @hagenburger. I'm leaving the translation here.


Podstawowym celem wszelkich konferencji i grup użytkowników powołujących się na ten Kodeks postępowania jest otwartość na jak największą liczbę osób o jak najbardziej urozmaiconych i różnorodnych korzeniach. Z tego powodu zobowiązujemy się do zapewnienia życzliwej, bezpiecznej i przyjaznej atmosfery wszystkim, bez względu na płeć, orientację seksualną, sprawność, pochodzenie etniczne, status społeczno-ekonomiczny i religię (lub jej brak).

https://creativecommons.org/licenses/by-sa/4.0/deed.pl
Copy link
Collaborator

Choose a reason for hiding this comment

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

I think this link might’ve gotten mis-pasted here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It totally was :) I'm blaming my middle mouse button.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Removed the link.

@chastell
Copy link
Collaborator

Thanks so much, @fdmarcin! The wording changes are great (I’m not sure about the extra commas, but they don’t bother me either). I’m only surprised by the extra link added in place of a paragraph break.

@chastell chastell mentioned this pull request Nov 26, 2017
4 tasks
@chastell
Copy link
Collaborator

@fdmarcin Looks good, thanks!

@hagenburger Should I merge this or would you like to wait for another review first?

@hagenburger
Copy link
Member

@chastell thanks for your feedback!

@1000miles @lauralindal @skade you recently discussed about processes when I wasn’t there. Did you set any rules on language reviews?

(Side node for all: The merge should use “Squash and merge”)

@chastell
Copy link
Collaborator

@hagenburger @1000miles @lauralindal @skade Argh, right, this is probably not the place to discuss this, but if there are clear rules what is mergeable by people like me (and when) I’d appreciate it a lot. ♥

(I merged #154 on a whim yesterday but maybe I shouldn’t have? I’m also not sure who has the power to (re)deploy the site; given that PR is not reflected in production I assume it’s not done automatically.)

@fdmarcin
Copy link
Contributor Author

Hi, has anything changed?

@fdmarcin
Copy link
Contributor Author

Hi, should anything be done with this, or can it be merged?
cc @hagenburger @chastell

@hagenburger
Copy link
Member

@fdmarcin if @chastell is fine with it, we can merge. Could you maybe rebase to master and solve the merge conflicts?

@fdmarcin
Copy link
Contributor Author

@hagenburger Is it okay now? I haven't done this before across forks instead of branches.

@hagenburger
Copy link
Member

I merged that into master manually. Thank you!

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants