Skip to content

[FIX] Formal pronouns and some small mistakes in German texts#9067

Merged
rodrigok merged 2 commits intoRocketChat:developfrom
1and1:fix-german-formal-pronouns
Feb 14, 2018
Merged

[FIX] Formal pronouns and some small mistakes in German texts#9067
rodrigok merged 2 commits intoRocketChat:developfrom
1and1:fix-german-formal-pronouns

Conversation

@AmShaegar13
Copy link
Copy Markdown
Contributor

@rodrigok rodrigok added this to the 0.61.0 milestone Jan 20, 2018
@rodrigok
Copy link
Copy Markdown
Member

@AmShaegar13 could you fix he conflicts?

@AmShaegar13 AmShaegar13 force-pushed the fix-german-formal-pronouns branch from 00306f7 to 4cd0307 Compare January 22, 2018 10:40
@AmShaegar13
Copy link
Copy Markdown
Contributor Author

@rodrigok fixed. Didn't know this one was still open.

@rodrigok rodrigok modified the milestones: 0.61.0, 0.61.1 Jan 22, 2018
@AmShaegar13 AmShaegar13 force-pushed the fix-german-formal-pronouns branch from 4cd0307 to 09ec9ec Compare January 30, 2018 18:13
@AmShaegar13
Copy link
Copy Markdown
Contributor Author

@rodrigok could you please merge? I just rebased again but I would like to not fix merge conflicts again.

@rodrigok rodrigok changed the title [FIX] Fix formal pronouns and some small mistakes in German texts [FIX] Formal pronouns and some small mistakes in German texts Feb 14, 2018
@rodrigok rodrigok merged commit eedd3c3 into RocketChat:develop Feb 14, 2018
rodrigok added a commit that referenced this pull request Feb 14, 2018
[FIX] Formal pronouns and some small mistakes in German texts
@soundstorm
Copy link
Copy Markdown
Contributor

@rodrigok I liked the informal german - but adding a second language file for german would mess things up due to higher maintenance, right?

@rodrigok rodrigok mentioned this pull request Feb 28, 2018
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.

3 participants