Commit 722b5f1d authored by fv3rdugo's avatar fv3rdugo
Browse files

[#646] fix(locales)

All the tests passed
- Update msgid strings
- Fix inconsistencies
- Now transifex use this en.po
parent 36fb552b
......@@ -56,9 +56,6 @@ msgstr "No es pot preparar o eliminar la base. La màquina te"
msgid "Clone/s"
msgstr "clon/s"
msgid "NEW"
msgstr "NOUS"
msgid "Users List"
msgstr "Llista d'usuaris"
......@@ -546,4 +543,4 @@ msgid "Are you sure you want to prepare the base of"
msgstr "Estàs segur de voler fer base a"
msgid "Are you sure you want to change the Public state of"
msgstr "Estàs segur de voler canviar l'estat Public de "
\ No newline at end of file
msgstr "Estàs segur de voler canviar l\'estat Public de"
......@@ -49,9 +49,6 @@ msgstr "Basis kann nicht vorbereitet werden, entferne oder lösche die Basis"
msgid "Clone/s"
msgstr "Klone"
msgid "New"
msgstr "Neu"
msgid "Users List"
msgstr "Benutzerliste"
......
......@@ -45,15 +45,9 @@ msgstr ""
msgid "Clone"
msgstr ""
msgid "Can't prepare base, remove base or delete. Machine has"
msgstr ""
msgid "Clone/s"
msgstr ""
msgid "New"
msgstr ""
msgid "Users List"
msgstr ""
......@@ -102,6 +96,24 @@ msgstr ""
msgid "Catalan"
msgstr ""
msgid "Galician"
msgstr ""
msgid "French"
msgstr ""
msgid "Hindi"
msgstr ""
msgid "Indonesian"
msgstr ""
msgid "Persian"
msgstr ""
msgid "Japanese"
msgstr ""
msgid "New Password:"
msgstr ""
......@@ -192,16 +204,13 @@ msgstr ""
msgid "Messages"
msgstr ""
msgid "Admin tools"
msgid "messages"
msgstr ""
msgid "Remove base"
msgstr ""
msgid "Public"
msgid "Admin tools"
msgstr ""
msgid "New Base"
msgid "Remove base"
msgstr ""
msgid "Restore"
......@@ -210,12 +219,6 @@ msgstr ""
msgid "Hibernate"
msgstr ""
msgid "Action"
msgstr ""
msgid "Will remove all the contents of the machine"
msgstr ""
msgid "Are you sure?"
msgstr ""
......@@ -237,23 +240,23 @@ msgstr ""
msgid "Show/hide clones"
msgstr ""
msgid "For Spice redirection you'll need to install"
msgid "For Spice redirection you\'ll need to install"
msgstr ""
msgid "on your computer."
msgid "in your computer."
msgstr ""
msgid "Search in your distro, e.g. in Debian/Ubuntu with"
msgstr ""
msgid "You'll need to install"
msgid "You\'ll need to install"
msgstr ""
msgid "and USB drivers ("
msgstr ""
msgid ""
"Be aware that in Windows, Spice redirection is not automatic. It's "
"Be aware that in Windows, Spice redirection is not automatic. It\'s "
"necessary to associate protocol with the app."
msgstr ""
......@@ -286,9 +289,6 @@ msgstr ""
msgid "Start session"
msgstr ""
msgid "Login with Intranet UPC's username."
msgstr ""
msgid "bits) in your computer."
msgstr ""
......@@ -394,7 +394,7 @@ msgstr ""
msgid "Machine name is required."
msgstr ""
msgid "Machine name can't exceed 20 characters."
msgid "Machine name can\'t exceed 20 characters."
msgstr ""
msgid "Backend selection is required."
......@@ -430,4 +430,124 @@ msgid "Are you sure you want to prepare the base of"
msgstr ""
msgid "Are you sure you want to change the Public state of"
msgstr ""
\ No newline at end of file
msgstr ""
msgid "Search"
msgstr ""
msgid "There are no public bases available in this system."
msgstr ""
msgid "There are no machines available in this system."
msgstr ""
msgid "Create one."
msgstr ""
msgid "not public"
msgstr ""
msgid "User Settings"
msgstr ""
msgid "Create a new account"
msgstr ""
msgid "Username"
msgstr ""
msgid "Password"
msgstr ""
msgid "Confirm Password"
msgstr ""
msgid "Hide Private"
msgstr ""
msgid "Show All"
msgstr ""
msgid "Shutting down ..."
msgstr ""
msgid "It may take a couple of minutes."
msgstr ""
msgid "Hybernating ..."
msgstr ""
msgid "Description"
msgstr ""
msgid "Rename"
msgstr ""
msgid "Options"
msgstr ""
msgid "Drivers"
msgstr ""
msgid "Graphics"
msgstr ""
msgid "Remove Machine"
msgstr ""
msgid "System overview"
msgstr ""
msgid "Danger Zone"
msgstr ""
msgid "Once you delete the machine, there is no going back. Please be certain."
msgstr ""
msgid "Danger"
msgstr ""
msgid "This will remove all the contents of the machine"
msgstr ""
msgid "This action can\'t be undone"
msgstr ""
msgid "Are you sure ?"
msgstr ""
msgid "Yes, remove"
msgstr ""
msgid "Virtual machine"
msgstr ""
msgid "removed"
msgstr ""
msgid "This will remove all the"
msgstr ""
msgid "clones of the machine"
msgstr ""
msgid "Yes, remove all the clones"
msgstr ""
msgid "This virtual machine can\'t be removed because it has"
msgstr ""
msgid "clones"
msgstr ""
msgid "This machine has not Graphics parameters!"
msgstr ""
msgid "recommended"
msgstr ""
msgid "to"
msgstr ""
msgid "Changing Public State"
msgstr ""
......@@ -55,9 +55,6 @@ msgstr "No se puede preparar o eliminar la base. La máquina tiene"
msgid "Clone/s"
msgstr "clon/es"
msgid "NEW"
msgstr "NUEVOS"
msgid "Users List"
msgstr "Lista de usuarios"
......@@ -558,4 +555,4 @@ msgid "Are you sure you want to prepare the base of"
msgstr "Estás seguro de querer convertir en base a"
msgid "Are you sure you want to change the Public state of"
msgstr "Estás seguro de querer cambiar el estado publico de"
\ No newline at end of file
msgstr "Estás seguro de querer cambiar el estado publico de"
......@@ -61,9 +61,6 @@ msgstr "عدم توانایی در آماده سازی پایگاه"
msgid "Clone/s"
msgstr "همسان ها"
msgid "NEW"
msgstr "جدید"
msgid "Users List"
msgstr "لیست کاربرها"
......
......@@ -57,9 +57,6 @@ msgstr "La base ne peut pas être préparée, supprimée ou effacée. La machine
msgid "Clone/s"
msgstr "Clone(s)"
msgid "NEW"
msgstr "NOUVEAU"
msgid "Users List"
msgstr "Liste d'utilisateurs"
......
......@@ -53,9 +53,6 @@ msgstr "Non se pode preparar ou eliminar a base. A máquina ten"
msgid "Clone/s"
msgstr "Clon/s"
msgid "NEW"
msgstr "NOVOS"
msgid "Users List"
msgstr "Lista de usuarios"
......
......@@ -54,9 +54,6 @@ msgstr "आधार तैयार नहीं कर सकते, आधा
msgid "Clone/s"
msgstr "क्लोन"
msgid "NEW"
msgstr "नया"
msgid "Users List"
msgstr "उपयोगकर्ता की सूची"
......
......@@ -56,9 +56,6 @@ msgstr "Tidak Bisa Mempersiapkan Basis, Buang Basis atau Hapus. Mesin telah"
msgid "Clone/s"
msgstr "Klon/s"
msgid "NEW"
msgstr "BARU"
msgid "Users List"
msgstr "Daftar Pengguna"
......
......@@ -53,9 +53,6 @@ msgstr "私はベースを準備することはできません。 ベースを
msgid "Clone/s"
msgstr "クローン"
msgid "NEW"
msgstr "新しい"
msgid "Users List"
msgstr "ユーザーリスト"
......
......@@ -54,9 +54,6 @@ msgstr "Não é possível Preparar Base, Remover Base ou Deletar. A Máquina tem
msgid "Clone/s"
msgstr "Clone/s"
msgid "NEW"
msgstr "NOVO"
msgid "Users List"
msgstr "Lista de Usuários"
......
......@@ -11,7 +11,7 @@
<div class="page-header">
<div class="panel panel-default">
<div class="panel-heading">
<h2><%= l 'Create a new account' %>
<h2><%=l 'Create a new account' %>
</h2>
</div>
%= include '/ng-templates/new_user'
......
......@@ -183,10 +183,10 @@
<h4 class="modal-title">Changing Base State</h4>
</div>
<div class="modal-body" ng-show="can_remove_base(machine)">
<p><%=l 'Are you sure you want to remove the Base of' %> {{machine.name}}?</p>
<p><%=l 'Are you sure you want to remove the base of' %> {{machine.name}}?</p>
</div>
<div class="modal-body" ng-show="can_prepare_base(machine)">
<p><%=l 'Are you sure you want to prepare the Base of' %> {{machine.name}}?</p>
<p><%=l 'Are you sure you want to prepare the base of' %> {{machine.name}}?</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal" ng-click="cancel_modal()">No</button>
......@@ -209,13 +209,13 @@
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title">Changing Public State</h4>
<h4 class="modal-title"><%=l 'Changing Public State' %></h4>
</div>
<div class="modal-body">
<p><%=l 'Are you sure you want to change the Public state of' %> {{machine.name}} to {{(machine.is_public==0)}}?</p>
<p><%=l 'Are you sure you want to change the Public state of' %> {{machine.name}} <%=l 'to' %> {{(machine.is_public==0)}}?</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal" ng-click="cancel_modal()">No</button>
<button type="button" class="btn btn-default" data-dismiss="modal" ng-click="cancel_modal()"><%=l 'No' %></button>
<button type="button" class="btn btn-primary" ng-click="cancel_modal();set_public(machine.id, machine.is_public==0)" data-dismiss="modal">Yes</button>
</div>
</div>
......
......@@ -33,9 +33,9 @@
% if ($user->is_admin && $public_bases && $private_bases) {
<div ng-cloak>
<a ng-click="toggle_only_public()" class="label label-primary"
align="right" ng-show="!only_public">Hide Private</a>
align="right" ng-show="!only_public"><%=l 'Hide Private' %></a>
<a ng-click="toggle_only_public()" class="label label-primary"
align="right" ng-show="only_public">Show All</a>
align="right" ng-show="only_public"><%=l 'Show All' %></a>
% }
</div>
......@@ -112,12 +112,12 @@
><%=l 'Yes' %></a>
</div>
<div ng-show="host_shutdown == <%= $machine->{id_clone} %>">
<b>Shutting down ... </b>
It may take a couple of minutes.
<b><%=l 'Shutting down ...' %></b>
<%=l 'It may take a couple of minutes.' %>
</div>
<div ng-show="host_hybernate== <%= $machine->{id_clone} %>">
<b>Hybernating ... </b>
It may take a couple of minutes.
<b><%=l 'Hybernating ...' %></b>
<%=l 'It may take a couple of minutes.' %>
</div>
% }
......
<ul class="nav nav-tabs" id="myTab">
% if ($USER->can_change_settings ) {
<li class="nav active"><a href="#description" data-toggle="tab">Description</a></li>
<li class="nav active"><a href="#description" data-toggle="tab"><%=l 'Description' %></a></li>
% }
% if ($USER->can_change_settings ) {
<li class="nav"><a href="#rename" data-toggle="tab">Rename</a></li>
<li class="nav"><a href="#rename" data-toggle="tab"><%=l 'Rename' %></a></li>
% }
% if ($USER->can_change_settings ) {
<li class="nav"><a href="#options" data-toggle="tab">Options</a></li>
<li class="nav"><a href="#options" data-toggle="tab"><%=l 'Options' %></a></li>
% }
% if ($USER->can_change_settings && $domain->drivers) {
<li class="nav"><a href="#drivers" data-toggle="tab">Drivers</a></li>
<li class="nav"><a href="#drivers" data-toggle="tab"><%=l 'Drivers' %></a></li>
% }
% if ($USER->can_change_settings) {
<li class="nav"><a href="#screenshot" data-toggle="tab">Screenshot</a></li>
<li class="nav"><a href="#screenshot" data-toggle="tab"><%=l 'Screenshot' %></a></li>
% }
% if ($domain->drivers && $USER->can_change_settings) {
<li class="nav"><a href="#graphics" data-toggle="tab">Graphics</a></li>
<li class="nav"><a href="#graphics" data-toggle="tab"><%=l 'Graphics' %></a></li>
% }
% if ($USER->can_clone_all){
<li class="nav"><a href="#copy" data-toggle="tab">Copy</a></li>
<li class="nav"><a href="#copy" data-toggle="tab"><%=l 'Copy' %></a></li>
% }
% if ( $USER->can_remove || $USER->can_remove_clone_all ) {
<li class="nav"><a href="#remove" data-toggle="tab">Remove Machine</a></li>
<li class="nav"><a href="#remove" data-toggle="tab"><%=l 'Remove Machine' %></a></li>
% }
% if ( $monitoring && $USER->is_admin ) {
<li class="nav"><a href="#monitoring" data-toggle="tab">System overview</a></li>
<li class="nav"><a href="#monitoring" data-toggle="tab"><%=l 'System overview' %></a></li>
% }
</ul>
......@@ -6,7 +6,7 @@
% }
% my $driver = $domain->drivers("image");
<div ng-show="<%= !defined ($domain->get_driver("image")) %>" class="alert alert-danger">
<strong>This machine has not Graphics parameters!</strong>
<strong><%=l 'This machine has not Graphics parameters!' %></strong>
</div>
% my %recomend = (
% image => 'auto_glz'
......@@ -16,7 +16,7 @@
% ,streaming => 'filter'
% );
<div class="row">
<div class="col-md-6"></div><div class="col-md-1"><i>recommended</i></div>
<div class="col-md-6"></div><div class="col-md-1"><i><%=l 'recommended' %></i></div>
</div>
<form class="form-horizontal" action="<%= $action %>" method="post">
% for my $driver_name (qw(image jpeg zlib playback streaming)) {
......
......@@ -2,8 +2,7 @@
<div class="panel-body nav--danger">
<div class="panel panel-warning" ng-show="showmachine.has_clones">
<div class="panel-heading">
This virtual machine can't be removed because it
has {{showmachine.has_clones}} clones.
<%=l 'This virtual machine can\'t be removed because it has' %> {{showmachine.has_clones}} <%=l 'clones' %>.
<ul>
% for my $clone (sort @$list_clones) {
<li><%= $clone %></li>
......@@ -14,9 +13,9 @@
<div ng-show="!domain_remove_done">
<h2 class="Subhead-heading">
Danger Zone
<%=l 'Danger Zone' %>
</h2>
<span class="text">Once you delete the machine, there is no going back. Please be certain.</span><br>
<span class="text"><%=l 'Once you delete the machine, there is no going back. Please be certain.' %></span><br>
% if ($USER->can_remove_clone_all) {
<a ng-show="showmachine.has_clones > 0" type="button" class="btn btn-danger"
ng-click="domain_remove_clones=1"
......@@ -28,42 +27,39 @@
<a type="button" class="btn btn-danger"
ng-hide="showmachine.has_clones > 0"
ng-click="domain_remove=1"
>
<%=l 'Remove' %>
><%=l 'Remove' %>
</a>
% }
</div>
<div ng-show="domain_remove">
<span class="text-danger"><b>Danger</b>.
This will remove all the contents of the machine
<span class="text-danger"><b><%=l 'Danger' %></b>.
<%=l 'This will remove all the contents of the machine' %>
<i><%= $domain->name %></i>.
<b>This action can't be undone</b>.
Are you sure ? </span><br/>
<b><%=l 'This action can\'t be undone' %></b>.
<%=l 'Are you sure ?'%></span><br/>
<a type="button" class="btn btn-danger"
ng-click="domain_remove=0"
>No</a>
ng-click="domain_remove=0"><%=l 'No' %></a>
<a type="button" class="btn btn-warning"
ng-click="remove(<%= $domain->id %>);domain_remove=0;domain_remove_done=1;" onclick = "location='/'"
>Yes, remove {{showmachine.name}}</a>
><%=l 'Yes, remove'%> {{showmachine.name}}</a>
</div><!-- del domain remove -->
<div ng-show="domain_remove_clones">
<b>Danger</b>.
This will remove all the {{showmachine.has_clones}} clones of the
machine <i><%= $domain->name %></i>.
<b>This action can't be undone</b>.
Are you sure ? <br/>
<b><%=l 'Danger'%></b>.
<%=l 'This will remove all the'%> {{showmachine.has_clones}} <%=l 'clones of the machine' %><i><%= $domain->name %></i>.
<b><%=l 'This action can\'t be undone' %></b>.
<%=l 'Are you sure ?'%><br/>
<a type="button" class="btn btn-danger"
ng-click="domain_remove_clones=0"
>No</a>
><%=l 'No' %></a>
<a type="button" class="btn btn-warning"
ng-click="remove_clones(<%= $domain->id %>);domain_remove_clones=0;"
<a type="button" class="btn btn-warning" ng-click="remove_clones(<%= $domain->id %>);domain_remove_clones=0;" onclick = "location='/'"
>Yes, remove all the clones</a>
><%=l 'Yes, remove all the clones' %></a>
</div><!-- del domain remove clones-->
<div ng-show="domain_remove_done">
Virtual Machine <b>{{showmachine.name}}</b> removed.
<%=l 'Virtual Machine' %><b>{{showmachine.name}}</b> <%=l 'removed' %>.
</div>
</div>
......@@ -118,7 +118,7 @@
<strong><%=l "Error" %></strong> <%=l 'Machine name is required.' %>
</div>
<div ng-show="new_machineForm.name.$error.maxlength" class="alert alert-warning fade in">
<strong><%=l 'Error' %></strong> <%=l "Machine name can't exceed 20 characters." %>
<strong><%=l 'Error' %></strong> <%=l "Machine name can\'t exceed 20 characters." %>
</div>
</div>
<div ng-show="new_machineForm.$submitted || new_machineForm.backend.$touched">
......
<div class="panel panel-default">
<div class="panel-heading">
<h3><%=l 'Please enter the following information to create the account.' =%></h3>
<h3><%=l 'Please enter the following information to create the account.' %></h3>
</div>
<div class="panel-body">
<form name="new_userForm" role="form" method="post" action="/users/register" novalidate>
<div class="from-group">
<label for="username">Username</label>
<label for="username"><%=l 'Username' %></label>
<input class="form-control" ng-model="username" placeholder="Enter Username" type="text" ng-maxlength="20" ng-minlength="5" name="username" ng-pattern="/^[a-zA-Z0-9_.-]*$/" id="username" required=""><br/>
</div>
<div class="from-group">
<label for="password">Password</label>
<label for="password"><%=l 'Password' %></label>
<input class="form-control" ng-model="password" placeholder="Enter Password" type="password" ng-maxlength="20" ng-minlength="5" name="password" ng-pattern="/^[a-zA-Z0-9]*$/" id="password" required=""><br/>
</div>
<div class="from-group">
<label for="password">Confirm Password</label>
<label for="password"><%=l 'Confirm Password' %></label>
<input class="form-control" ng-model="cpassword" placeholder="Confirm Password" type="password" ng-maxlength="20" ng-minlength="5" name="cpassword" ng-pattern="/^[a-zA-Z0-9]*$/" id="confirm_password" onkeyup="checkPass(); return false;" required><span id="confirmMessage" class="confirmMessage"></span><br/>
</div> <body>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment