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

[IMPROVE] Add missing translation keys. #12722

Merged
merged 3 commits into from
Dec 20, 2018
Merged

[IMPROVE] Add missing translation keys. #12722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
384e82e
Add missing translation keys.
ura14h Nov 25, 2018
bd8ca3e
Merge branch 'develop' into ura14h-patch-i18n
ura14h Nov 29, 2018
e1b1ec0
Merge branch 'develop' into ura14h-patch-i18n
ura14h Dec 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/rocketchat-apps/client/admin/appManage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,8 +275,8 @@ <h2> {{_ "Settings"}} </h2>
</div>
{{> CodeMirror name=id options=getEditorOptions code=value }}
<div class="buttons">
<button class="button primary button-fullscreen">Full Screen</button>
<button class="button primary button-restore">Exit Full Screen</button>
<button class="button primary button-fullscreen">{{_ "Full_Screen"}}</button>
<button class="button primary button-restore">{{_ "Exit_Full_Screen"}}</button>
</div>
</div>
{{/if}}
Expand Down
4 changes: 4 additions & 0 deletions packages/rocketchat-i18n/i18n/en.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1194,6 +1194,7 @@
"Exclude_pinned": "Exclude pinned messages",
"except_pinned": "(except those that are pinned)",
"Execute_Synchronization_Now": "Execute Synchronization Now",
"Exit_Full_Screen": "Exit Full Screen",
"Export_My_Data": "Export My Data",
"expression": "Expression",
"Extended": "Extended",
Expand All @@ -1202,6 +1203,7 @@
"Facebook_Page": "Facebook Page",
"False": "False",
"Favorite_Rooms": "Enable Favorite Rooms",
"Favorite": "Favorite",
"Favorites": "Favorites",
"Feature_Depends_on_Livechat_Visitor_navigation_as_a_message_to_be_enabled": "This feature depends on \"Send Visitor Navigation History as a Message\" to be enabled.",
"Features_Enabled": "Features Enabled",
Expand Down Expand Up @@ -1297,6 +1299,7 @@
"From": "From",
"From_Email": "From Email",
"From_email_warning": "<b>Warning</b>: The field <b>From</b> is subject to your mail server settings.",
"Full_Screen": "Full Screen",
"Gaming": "Gaming",
"General": "General",
"github_no_public_email": "You don't have any email as public email in your GitHub account",
Expand Down Expand Up @@ -2736,6 +2739,7 @@
"unarchive-room": "Unarchive Room",
"unarchive-room_description": "Permission to unarchive channels",
"Unblock_User": "Unblock User",
"Unfavorite": "Unfavorite",
"Unignore": "Unignore",
"Uninstall": "Uninstall",
"Unmute_someone_in_room": "Unmute someone in the room",
Expand Down
4 changes: 2 additions & 2 deletions packages/rocketchat-integrations/client/views/integrationsIncoming.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@
</div>
{{> CodeMirror name="script" options=editorOptions code=data.script }}
<div class="buttons">
<button class="button primary button-fullscreen">Full Screen</button>
<button class="button primary button-restore">Exit Full Screen</button>
<button class="button primary button-fullscreen">{{_ "Full_Screen"}}</button>
<button class="button primary button-restore">{{_ "Exit_Full_Screen"}}</button>
</div>
</div>
{{#if data.scriptError}}
Expand Down
4 changes: 2 additions & 2 deletions packages/rocketchat-integrations/client/views/integrationsOutgoing.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@
</div>
{{> CodeMirror name="script" options=editorOptions code=data.script }}
<div class="buttons">
<button class="button primary button-fullscreen">Full Screen</button>
<button class="button primary button-restore">Exit Full Screen</button>
<button class="button primary button-fullscreen">{{_ "Full_Screen"}}</button>
<button class="button primary button-restore">{{_ "Exit_Full_Screen"}}</button>
</div>
</div>
{{#if data.scriptError}}
Expand Down
4 changes: 2 additions & 2 deletions packages/rocketchat-ui-admin/client/admin.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,8 @@
{{> CodeMirror name=_id options=getEditorOptions code=value }}
{{setEditorOnBlur _id}}
<div class="buttons">
<button class="rc-button rc-button--primary button-fullscreen">Full Screen</button>
<button class="rc-button rc-button--primary button-restore">Exit Full Screen</button>
<button class="rc-button rc-button--primary button-fullscreen">{{_ "Full_Screen"}}</button>
<button class="rc-button rc-button--primary button-restore">{{_ "Exit_Full_Screen"}}</button>
</div>
</div>
{{/if}}
Expand Down