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.

Sign up for GitHub

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

Jump to bottom

Add some missing ES translations #16120

Merged
merged 4 commits into from
Mar 21, 2020
Merged

Add some missing ES translations #16120

merged 4 commits into from
Mar 21, 2020

Conversation

ivanape
Copy link
Contributor

@ivanape ivanape commented Jan 2, 2020 •
edited
Loading

Update ES translations

gabriellsh
gabriellsh requested changes Jan 3, 2020
View reviewed changes
Copy link
Member

@gabriellsh gabriellsh left a comment

Choose a reason for hiding this comment

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

Thank you very much for the help! Please take a look at the comments so we can add this change as soon as possible. (Keep an eye out for unnecessary whitespaces, you can enable "Render whitespace" in VSCode to help you visualize it better)

packages/rocketchat-i18n/i18n/es.i18n.json Outdated Show resolved Hide resolved
packages/rocketchat-i18n/i18n/es.i18n.json Outdated Show resolved Hide resolved
packages/rocketchat-i18n/i18n/es.i18n.json Outdated Show resolved Hide resolved
packages/rocketchat-i18n/i18n/es.i18n.json Outdated Show resolved Hide resolved
ivanape and others added 2 commits January 3, 2020 15:12
@ivanape
Review after @gabriellsh comments
f73cdc2
@gabriellsh
Removed Whitespaces
7e4465c 
Removed some added whitespaces in order to preserve content history better.
@CLAassistant
Copy link

CLA assistant check
All committers have signed the CLA.

@rodrigok rodrigok changed the title [I18N] Update ES translations Add some missing ES translations Mar 21, 2020
@rodrigok rodrigok merged commit 2152a56 into RocketChat:develop Mar 21, 2020
ggazzo added a commit that referenced this pull request Mar 21, 2020
@ggazzo
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into dm/m…
f7fe0be 
…ultiple-users

* 'develop' of github.com:RocketChat/Rocket.Chat: (35 commits)
  Change license version requested (#16956)
  Synchronize saml roles to local user (#16158)
  Fix: Padding required in the Facebook Messenger option in Livechat (#16202)
  Add some missing ES translations (#16120)
  Adding margin to click to load text (#16210)
  [FIX] Explicitly set text of confirmation button (#16138)
  Redirected to home when a room has been deleted instead of getting broken link(blank page) of deleted room (#16227)
  Fixed translate variable in ArchiveRoom Modal (#16310)
  [FIX] Display user status along with icon (#16875)
  [FIX] users.setStatus and user from params (#16128)
  Update cypress to version 4.0.2 (#16685)
  [FIX] Text formatted to remain within button even on screen resize  (#14136)
  fix(slack-bridge): messages doesn't send to slack after renaming channel (#16565)
  [NEW] Route to get updated roles after a date (#16610)
  [FIX] Removed Reply in DM from livechat rooms (#16957)
  Update presence package (#16786)
  [NEW] Enterprise Edition (#16944)
  Add an index to the name field for omnichannel department (#16953)
  [FIX] Login with LinkedIn not mapping name and picture correctly (#16955)
  [IMPROVE] Allow login of non LDAP users when LDAP is enabled (#16949)
  ...
ggazzo added a commit that referenced this pull request Mar 21, 2020
@ggazzo
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into dm/m…
82439cf 
…ultiple-users

* 'develop' of github.com:RocketChat/Rocket.Chat: (35 commits)
  Change license version requested (#16956)
  Synchronize saml roles to local user (#16158)
  Fix: Padding required in the Facebook Messenger option in Livechat (#16202)
  Add some missing ES translations (#16120)
  Adding margin to click to load text (#16210)
  [FIX] Explicitly set text of confirmation button (#16138)
  Redirected to home when a room has been deleted instead of getting broken link(blank page) of deleted room (#16227)
  Fixed translate variable in ArchiveRoom Modal (#16310)
  [FIX] Display user status along with icon (#16875)
  [FIX] users.setStatus and user from params (#16128)
  Update cypress to version 4.0.2 (#16685)
  [FIX] Text formatted to remain within button even on screen resize  (#14136)
  fix(slack-bridge): messages doesn't send to slack after renaming channel (#16565)
  [NEW] Route to get updated roles after a date (#16610)
  [FIX] Removed Reply in DM from livechat rooms (#16957)
  Update presence package (#16786)
  [NEW] Enterprise Edition (#16944)
  Add an index to the name field for omnichannel department (#16953)
  [FIX] Login with LinkedIn not mapping name and picture correctly (#16955)
  [IMPROVE] Allow login of non LDAP users when LDAP is enabled (#16949)
  ...
ggazzo added a commit that referenced this pull request Mar 21, 2020
@ggazzo
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into dm/m…
f4a71e8 
…ultiple-users

* 'develop' of github.com:RocketChat/Rocket.Chat: (35 commits)
  Change license version requested (#16956)
  Synchronize saml roles to local user (#16158)
  Fix: Padding required in the Facebook Messenger option in Livechat (#16202)
  Add some missing ES translations (#16120)
  Adding margin to click to load text (#16210)
  [FIX] Explicitly set text of confirmation button (#16138)
  Redirected to home when a room has been deleted instead of getting broken link(blank page) of deleted room (#16227)
  Fixed translate variable in ArchiveRoom Modal (#16310)
  [FIX] Display user status along with icon (#16875)
  [FIX] users.setStatus and user from params (#16128)
  Update cypress to version 4.0.2 (#16685)
  [FIX] Text formatted to remain within button even on screen resize  (#14136)
  fix(slack-bridge): messages doesn't send to slack after renaming channel (#16565)
  [NEW] Route to get updated roles after a date (#16610)
  [FIX] Removed Reply in DM from livechat rooms (#16957)
  Update presence package (#16786)
  [NEW] Enterprise Edition (#16944)
  Add an index to the name field for omnichannel department (#16953)
  [FIX] Login with LinkedIn not mapping name and picture correctly (#16955)
  [IMPROVE] Allow login of non LDAP users when LDAP is enabled (#16949)
  ...
@sampaiodiego sampaiodiego mentioned this pull request Apr 9, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gabriellsh gabriellsh gabriellsh approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ivanape @CLAassistant @gabriellsh @rodrigok