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

Translated texts #191

Merged
merged 1 commit into from
Jun 17, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion client/methods/saveRoomName.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Meteor.methods
room = ChatRoom.findOne rid

if room.u._id isnt Meteor.userId() or room.t not in ['c', 'p']
throw new Meteor.Error 403, 'Not allowed'
throw new Meteor.Error 403, t('Not allowed')

name = _.slugify name

Expand Down
12 changes: 6 additions & 6 deletions client/views/app/chatWindowDashboard.html
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,12 @@ <h2>
{{/with}}
</div>
<div class="formatting-tips" aria-hidden="true" dir="auto">
<b>*bold*</b>
<i>_italics_</i>
<span>~<strike>strike</strike>~</span>
<code class="inline">`inline code`</code>
<code class="inline"><div class="hidden-br"><br></div>```<div class="hidden-br"><br></div><i class="icon-level-down"></i>multi<div class="hidden-br"><br></div><i class="icon-level-down"></i>line<div class="hidden-br"><br></div><i class="icon-level-down"></i>```</code>
<q><div class="hidden-br"><br></div>&gt;quote</q>
<b>*{{_ "bold"}}*</b>
<i>_{{_ "italics"}}_</i>
<span>~<strike>{{_ "strike"}}</strike>~</span>
<code class="inline">`{{_ "inline_code"}}`</code>
<code class="inline"><div class="hidden-br"><br></div>```<div class="hidden-br"><br></div><i class="icon-level-down"></i>{{_ "multi"}}<div class="hidden-br"><br></div><i class="icon-level-down"></i>{{_ "line"}}<div class="hidden-br"><br></div><i class="icon-level-down"></i>```</code>
<q><div class="hidden-br"><br></div>&gt;{{_ "quote"}}</q>
</div>
</form>
{{else}}
Expand Down
12 changes: 6 additions & 6 deletions client/views/app/sideNav/createChannelFlex.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ <h4>{{_ "Channels"}}</h4>
</header>
<div class="content">
<div class="wrapper">
<h4>{{_ "Create_new_channel" }}</h4>
<h4>{{_ "Create_new_public_channel" }}</h4>
<div class="input-line">
<label for="channel-name">{{_ "Name"}}</label>
<input type="text" id="channel-name" class="required" dir="auto">
</div>
<div class="input-line">
<label for="channel-members">Add Members</label>
<label for="channel-members">{{_ "Add_Members"}}</label>
{{> inputAutocomplete settings=autocompleteSettings id="channel-members" class="search" placeholder=tRoomMembers autocomplete="off"}}
<ul class="selected-users">
{{#each selectedUsers}}
Expand All @@ -22,15 +22,15 @@ <h4>{{_ "Create_new_channel" }}</h4>
</div>
{{#if error.fields}}
<div class="input-error">
<strong>Ops!</strong>
<strong>{{_ "Oops!"}}</strong>
{{#each error.fields}}
<p>The field {{.}} is required.</p>
<p>{{_ "The_field_is_required" .}}</p>
{{/each}}
</div>
{{/if}}
{{#if error.invalid}}
<div class="input-error">
<strong>Ops!</strong>
<strong>{{_ "Oops!"}}</strong>
{{{_ "Invalid_room_name" roomName}}}
</div>
{{/if}}
Expand All @@ -42,7 +42,7 @@ <h4>{{_ "Create_new_channel" }}</h4>
</div>
<footer>
<div>
<button class="button clean all">All channels</button>
<button class="button clean all">{{_ "All_channels"}}</button>
</div>
</footer>
</template>
2 changes: 1 addition & 1 deletion client/views/app/sideNav/listChannelsFlex.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ <h4>{{_ "Channels_list"}}</h4>
</div>
<footer>
<div>
<button class="button clean create">Create new</button>
<button class="button clean create">{{_ "Create_new"}}</button>
</div>
</footer>
</template>
4 changes: 2 additions & 2 deletions client/views/app/sideNav/privateGroupsFlex.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ <h4>{{_ "Private_Groups"}}</h4>
</header>
<div class="content">
<div class="wrapper">
<h4>Create a new private group</h4>
<h4>{{_ "Create_new_private_group"}}</h4>
<div class="input-line">
<label for="pvt-group-name">{{_ "Name"}}</label>
<input type="text" id="pvt-group-name" class="required" dir="auto">
Expand All @@ -24,7 +24,7 @@ <h4>Create a new private group</h4>
<div class="input-error">
<strong>Ops!</strong>
{{#each error}}
<p>The field {{error}} is required.</p>
<p>{{_ "The_field_is_required" error}}</p>
{{/each}}
</div>
{{/if}}
Expand Down
2 changes: 1 addition & 1 deletion client/views/avatar/prompt.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<form id="login-card" method='/'>
<header>
<h2>{{_ "Select_an_avatar"}}</h2>
<p>Select a service to login to load your picture or upload one directly from your computer</p>
<p>{{_ "Select_service_to_login"}}</p>
</header>
<div class="fields">
<div class='input-text active'>
Expand Down
2 changes: 1 addition & 1 deletion i18n/ar.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"Confirm_password" : "Confirm your password",
"Contact" : "Contact",
"Conversation" : "Conversation",
"Create_new_channel" : "Create a new public channel",
"Create_new_public_channel" : "Create a new public channel",
"Created_at" : "Created at",
"Direct_Messages" : "Direct Messages",
"edited" : "edited",
Expand Down
2 changes: 1 addition & 1 deletion i18n/de.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"Confirm_password" : "Passwort bestätigen",
"Contact" : "Kontakt",
"Conversation" : "Konversation",
"Create_new_channel" : "Erstelle einen neuen öffentlichen Channel",
"Create_new_public_channel" : "Erstelle einen neuen öffentlichen Channel",
"Created_at" : "Erstellt am",
"Direct_Messages" : "Private Nachrichten",
"edited" : "bearbeitet",
Expand Down
17 changes: 16 additions & 1 deletion i18n/en.i18n.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
{
"Access_online_demo" : "Access the online demo",
"Access_Online_Demo" : "Access the Online Demo",
"Add_Members" : "Add Members",
"Add_users" : "Add users",
"All_channels" : "All channels",
"and" : "and",
"are_also_typing" : "are also typing",
"are_typing" : "are typing",
Expand All @@ -10,6 +12,7 @@
"busy" : "busy",
"Busy" : "Busy",
"Back_to_login" : "Back to login",
"bold" : "bold",
"Cancel" : "Cancel",
"Change_avatar" : "Change avatar",
"Channels" : "Channels",
Expand All @@ -20,7 +23,9 @@
"Confirm_password" : "Confirm your password",
"Contact" : "Contact",
"Conversation" : "Conversation",
"Create_new_channel" : "Create a new public channel",
"Create_new" : "Create new",
"Create_new_public_channel" : "Create a new public channel",
"Create_new_private_group" : "Create a new private group",
"Created_at" : "Created at",
"Direct_Messages" : "Direct Messages",
"edited" : "edited",
Expand All @@ -36,6 +41,7 @@
"Have_your_own_chat" : "Have your own web chat. Developed with Meteor.com, the Rocket.Chat is a great solution for developers looking forward to build and evolve their own chat platform.",
"Hide_room" : "Hide room",
"History" : "History",
"inline_code": "inline_code",
"Invalid_confirm_pass" : "The password confirmation does not match password",
"Invalid_email" : "The e-mail entered is invalid",
"Invalid_name" : "The name must not be empty",
Expand All @@ -45,12 +51,14 @@
"Invisible" : "Invisible",
"is_also_typing" : "is also typing",
"is_typing" : "is typing",
"italics" : "italics",
"join" : "Join",
"Join_the_Community" : "Join the Community",
"Language" : "Language",
"Language_Version" : "English Version",
"Last_message" : "Last message",
"Leave_room" : "Leave room",
"line" : "line",
"Load_more" : "Load more",
"Loading_suggestion" : "Loading suggestions...",
"Login" : "Login",
Expand All @@ -62,6 +70,7 @@
"Members_placeholder" : "Members",
"More_channels" : "More channels",
"Msgs" : "Msgs",
"multi" : "multi",
"n_messages" : "%s messages",
"Name" : "Name",
"New_messages" : "New messages",
Expand All @@ -71,16 +80,19 @@
"No_favorites_yet" : "You haven't added any favorites yet.",
"No_groups_yet" : "You have no private groups yet.",
"No_permission_to_view_room" : "You don't have permission to view this room",
"Not_allowed" : "Not allowed",
"Not_found_or_not_allowed" : "Not Found or Not Allowed",
"Nothing_found" : "Nothing found",
"Online" : "Online",
"Oops!" : "Oops",
"Password" : "Password",
"Please_wait" : "Please wait",
"Powered_by" : "Powered by",
"Privacy" : "Privacy",
"Private_Groups" : "Private Groups",
"Proudly_developed" : "Proudly developed with Meteor",
"Quick_Search" : "Quick Search",
"quote" : "quote",
"Recents" : "Recents",
"Register" : "Register a new account",
"Remember_me" : "Remember me",
Expand All @@ -95,6 +107,7 @@
"See_only_online" : "Only online",
"Select_an_avatar" : "Select an avatar",
"Select_file" : "Select file",
"Select_service_to_login" : "Select a service to login to load your picture or upload one directly from your computer",
"Selected_users" : "Selected members",
"Send_confirmation_email" : "Send confirmation email",
"Send_Message" : "Send Message",
Expand All @@ -104,7 +117,9 @@
"Silence" : "Silence",
"since_creation" : "since %s",
"Start_of_conversation" : "Start of conversation",
"strike" : "strike",
"Submit" : "Submit",
"The_field_is_required": "The field %s is required.",
"Use_initials_avatar" : "Use your username initials",
"use_menu" : "Use the side menu to access your rooms and chats",
"Use_service_avatar" : "Use %s avatar",
Expand Down
2 changes: 1 addition & 1 deletion i18n/es.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"Confirm_password" : "Confirma tu contraseña",
"Contact" : "Contacto",
"Conversation" : "Conversación",
"Create_new_channel" : "Crear un nuevo canal público",
"Create_new_public_channel" : "Crear un nuevo canal público",
"Created_at" : "Creado en",
"Direct_Messages" : "Mensajes Directos",
"edited" : "Editado",
Expand Down
2 changes: 1 addition & 1 deletion i18n/fr.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"Confirm_password" : "Confirmez le mot de passe",
"Contact" : "Contact",
"Conversation" : "Conversation",
"Create_new_channel" : "Créez une nouveau canal publique",
"Create_new_public_channel" : "Créez une nouveau canal publique",
"Created_at" : "Créé le",
"Direct_Messages" : "Messages directs",
"edited" : "modifié",
Expand Down
2 changes: 1 addition & 1 deletion i18n/he.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"Confirm_password" : "אמת את הסיסמא",
"Contact" : "צור קשר",
"Conversation" : "שיחה",
"Create_new_channel" : "צור ערוץ ציבורי חדש",
"Create_new_public_channel" : "צור ערוץ ציבורי חדש",
"Created_at" : "נוצר ב-",
"Direct_Messages" : "הודעות ישירות",
"edited" : "נערך",
Expand Down
2 changes: 1 addition & 1 deletion i18n/hr.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"Confirm_password" : "Potvrdi svoju lozinku",
"Contact" : "Kontakt",
"Conversation" : "Razgovor",
"Create_new_channel" : "Stvori novi javni kanal",
"Create_new_public_channel" : "Stvori novi javni kanal",
"Created_at" : "Stvoreno u",
"Direct_Messages" : "Izravne Poruke",
"edited" : "uređeno",
Expand Down
2 changes: 1 addition & 1 deletion i18n/hu.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"Confirm_password" : "Ellenőrizd a jelszavad",
"Contact" : "Kapcsolat",
"Conversation" : "Beszélgetés",
"Create_new_channel" : "Create a new public channel",
"Create_new_public_channel" : "Create a new public channel",
"Created_at" : "Készült",
"Direct_Messages" : "Közvetlen üzenet",
"edited" : "szerkesztve",
Expand Down
2 changes: 1 addition & 1 deletion i18n/it.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"Confirm_password" : "Conferma la password",
"Contact" : "Contatto",
"Conversation" : "Conversazione",
"Create_new_channel" : "Crea un nuovo canale pubblico",
"Create_new_public_channel" : "Crea un nuovo canale pubblico",
"Created_at" : "Creato a",
"Direct_Messages" : "Messaggi diretti",
"edited" : "modificato",
Expand Down
2 changes: 1 addition & 1 deletion i18n/ja.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"Confirm_password" : "Confirm your password",
"Contact" : "Contact",
"Conversation" : "Conversation",
"Create_new_channel" : "Create a new public channel",
"Create_new_public_channel" : "Create a new public channel",
"Created_at" : "Created at",
"Direct_Messages" : "Direct Messages",
"edited" : "edited",
Expand Down
2 changes: 1 addition & 1 deletion i18n/ko.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"Confirm_password" : "암호를 확인하세요",
"Contact" : "접속",
"Conversation" : "대화",
"Create_new_channel" : "새 공용 채널 생성",
"Create_new_public_channel" : "새 공용 채널 생성",
"Created_at" : "제작",
"Direct_Messages" : "Direct Messages",
"edited" : "수정됨",
Expand Down
2 changes: 1 addition & 1 deletion i18n/pt.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"Confirm_password" : "Confirmar a senha",
"Contact" : "Contato",
"Conversation" : "Conversa",
"Create_new_channel" : "Criar um canal público",
"Create_new_public_channel" : "Criar um canal público",
"Created_at" : "Data criação",
"Direct_Messages" : "Mensagens Diretas",
"edited" : "editado",
Expand Down
2 changes: 1 addition & 1 deletion i18n/ru.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"Confirm_password" : "Подтвердить пароль",
"Contact" : "Контакт",
"Conversation" : "Диалог",
"Create_new_channel" : "Create a new public channel",
"Create_new_public_channel" : "Create a new public channel",
"Created_at" : "Создано в",
"Direct_Messages" : "Личные сообщения",
"edited" : "отредактировано",
Expand Down
2 changes: 1 addition & 1 deletion i18n/tr.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"Confirm_password" : "Parolanızı onaylayın",
"Contact" : "İletişim",
"Conversation" : "Sohbet",
"Create_new_channel" : "Yeni bir kanal oluştur",
"Create_new_public_channel" : "Yeni bir kanal oluştur",
"Created_at" : "Created at",
"Direct_Messages" : "Direkt Mesajlar",
"edited" : "düzenlendi",
Expand Down
2 changes: 1 addition & 1 deletion i18n/uk.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"Confirm_password" : "Підтвердіть ваш пароль",
"Contact" : "Контакти",
"Conversation" : "Розмова",
"Create_new_channel" : "Створити новий публічний канал",
"Create_new_public_channel" : "Створити новий публічний канал",
"Created_at" : "Створено у",
"Direct_Messages" : "Особисті повідомлення",
"edited" : "відредаговано",
Expand Down
2 changes: 1 addition & 1 deletion i18n/vi.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"Confirm_password" : "Confirm your password",
"Contact" : "Contact",
"Conversation" : "Conversation",
"Create_new_channel" : "Create a new public channel",
"Create_new_public_channel" : "Create a new public channel",
"Created_at" : "Created at",
"Direct_Messages" : "Direct Messages",
"edited" : "edited",
Expand Down
2 changes: 1 addition & 1 deletion i18n/zh.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"Confirm_password" : "确认密码",
"Contact" : "联系人",
"Conversation" : "谈话",
"Create_new_channel" : "创建一个新的公共频道",
"Create_new_public_channel" : "创建一个新的公共频道",
"Created_at" : "创建由",
"Direct_Messages" : "直接发送消息",
"edited" : "已编辑",
Expand Down