Skip to content
New issue

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

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] fix german translation #6790

Merged

Conversation

sscholl
Copy link
Contributor

@sscholl sscholl commented Apr 25, 2017

@RocketChat/core

This is just a small fix of a translation. The old translation indicates, that all users are affected by a test email.

@CLAassistant
Copy link

CLAassistant commented Apr 25, 2017

CLA assistant check
All committers have signed the CLA.

@engelgabriel engelgabriel merged commit 9b4a7d2 into RocketChat:develop Apr 26, 2017
@engelgabriel engelgabriel added this to the 0.56.0 milestone Apr 26, 2017
Syirrus pushed a commit to Syirrus/Rocket.Chat that referenced this pull request Apr 28, 2017
…nto clarapy-v4

* 'develop' of https://github.com/RocketChat/Rocket.Chat: (218 commits)
  fix starredMessages.js
  remove coffee file
  Update starredMessages.js
  LingoHub Update 🚀
  createToken - tested if the generated token is valid
  createToken just receive userId
  Anonymous Write: Fix permissions
  AccountBox: Show username instead of name when name is not available
  create a method 'create token'
  Missing useful fields in admin user list RocketChat#5110
  Missing useful fields in admin user list RocketChat#5110
  fix german translation (RocketChat#6790)
  [FIX] Improve and correct Iframe Integration help text (RocketChat#6793)
  Fixed 😄 test
  Quoted and replied messages should retain the alias when displaying the message.
  Hide users tryping if on iframe
  Wait for iframe setting to start sending postMessages
  Try to directly install screen share extension
  [NEW] Option to allow to signup as anonymous
  Fix RocketChat#6787, run the user update function in the api as the calling user
  ...

# Conflicts:
#	.meteor/versions
#	packages/rocketchat-lib/server/startup/settings.coffee
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.

None yet

3 participants