Skip to content

GitLab

Commit 6d8d81b4 authored by fv3rdugo's avatar fv3rdugo
Browse files

fix(i18n) 

issue #646

- Add <%=l missing in some strings
- Fix Uppercase changed previously
parent 4231c412
Hide whitespace changes
Inline Side-by-side
lib/Ravada/I18N/en.po
View file @ 6d8d81b4
......@@ -54,7 +54,7 @@ msgstr ""
msgid "Log Out"
msgstr ""
msgid "Available machines"
msgid "Available Machines"
msgstr ""
msgid "Help"
......@@ -249,7 +249,7 @@ msgstr ""
msgid "hide clones"
msgstr ""
msgid "For Spice redirection you'll need to install"
msgid "For Spice redirection you will need to install"
msgstr ""
msgid "in your computer."
......@@ -258,14 +258,14 @@ msgstr ""
msgid "Search in your distro, e.g. in Debian/Ubuntu with"
msgstr ""
msgid "You'll need to install"
msgid "You will 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 is "
"necessary to associate protocol with the app."
msgstr ""
......@@ -432,10 +432,10 @@ msgstr ""
msgid "monitoring"
msgstr ""
msgid "Are you sure you want to remove the base of"
msgid "Are you sure you want to remove the Base of"
msgstr ""
msgid "Are you sure you want to prepare the base of"
msgid "Are you sure you want to prepare the Base of"
msgstr ""
msgid "Are you sure you want to change the Public state of"
......@@ -558,6 +558,9 @@ msgstr ""
msgid "Changing Public State"
msgstr ""
msgid "Changing Base State"
msgstr ""
msgid "action"
msgstr ""
......@@ -611,3 +614,10 @@ msgstr ""
msgid "Current Password:"
msgstr ""
msgid "For more information, check"
msgstr ""
msgid "the Windows Clients documentation"
msgstr ""
templates/main/admin_machines.html.ep
View file @ 6d8d81b4
......@@ -129,7 +129,7 @@
<div style="float:right">
<a ng-show="hide_clones" ng-click="hideClones()"
class="label label-primary"
align="right">show clones</a>
align="right"><%=l 'show clones' %></a>
<a ng-show="!hide_clones" ng-click="hideClones()"
class="label label-primary"
align="right"><%=l 'hide clones' %></a>
......@@ -180,7 +180,7 @@
<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 Base State</h4>
<h4 class="modal-title"><%=l '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>
......@@ -189,9 +189,9 @@
<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>
<button type="button" class="btn btn-primary" ng-click="cancel_modal();action('machine','remove_base',machine.id)" ng-show="can_remove_base(machine)" data-dismiss="modal">Yes</button>
<button type="button" class="btn btn-primary" ng-click="cancel_modal();action('machine','prepare',machine.id)" ng-show="can_prepare_base(machine)" data-dismiss="modal">Yes</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();action('machine','remove_base',machine.id)" ng-show="can_remove_base(machine)" data-dismiss="modal"><%=l 'Yes' %></button>
<button type="button" class="btn btn-primary" ng-click="cancel_modal();action('machine','prepare',machine.id)" ng-show="can_prepare_base(machine)" data-dismiss="modal"><%=l 'Yes' %></button>
</div>
</div>
</div>
......@@ -216,7 +216,7 @@
</div>
<div class="modal-footer">
<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>
<button type="button" class="btn btn-primary" ng-click="cancel_modal();set_public(machine.id, machine.is_public==0)" data-dismiss="modal"><%=l 'Yes' %></button>
</div>
</div>
</div>
......@@ -299,7 +299,7 @@
<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 Base State</h4>
<h4 class="modal-title"><%=l 'Changing Base State' %></h4>
</div>
<div class="modal-body" ng-show="can_remove_base(child)">
<p><%=l 'Are you sure you want to remove the Base of' %> {{child.name}}?</p>
......@@ -308,9 +308,9 @@
<p><%=l 'Are you sure you want to prepare the Base of' %> {{child.name}}?</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-primary" ng-click="cancel_modal();action('machine','remove_base',child.id)" ng-show="can_remove_base(child)" data-dismiss="modal">Yes</button>
<button type="button" class="btn btn-primary" ng-click="cancel_modal();action('machine','prepare',child.id)" ng-show="can_prepare_base(child)" data-dismiss="modal">Yes</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();action('machine','remove_base',child.id)" ng-show="can_remove_base(child)" data-dismiss="modal"><%=l 'Yes' %></button>
<button type="button" class="btn btn-primary" ng-click="cancel_modal();action('machine','prepare',child.id)" ng-show="can_prepare_base(child)" data-dismiss="modal"><%=l 'Yes' %></button>
</div>
</div>
</div>
......@@ -333,8 +333,8 @@
<p><%=l 'Are you sure you want to change the Public state of' %> {{child.name}} to {{(child.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-primary" ng-click="cancel_modal();set_public(child.id, child.is_public==0)" data-dismiss="modal">Yes</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(child.id, child.is_public==0)" data-dismiss="modal"><%=l 'Yes' %></button>
</div>
</div>
</div>
......
templates/main/requirements.html.ep
View file @ 6d8d81b4
......@@ -14,18 +14,18 @@
<div class="panel-heading">
<hr>
<h2 class="text-center"><%=l 'Requirements' %></h2>
<i class="fab fa-linux fa-3x " aria-hidden="true"> GNU/Linux</i><br><br><p> <%=l 'For spice redirection you\'ll need to install' %><a target=_blank href="https://virt-manager.org/download/"> VirtViewer<i class="fa fa-link" aria-hidden="true"></i></a> <%=l 'in your computer.' %><br>
<i class="fab fa-linux fa-3x " aria-hidden="true"> GNU/Linux</i><br><br><p> <%=l 'For spice redirection you will need to install' %><a target=_blank href="https://virt-manager.org/download/"> VirtViewer<i class="fa fa-link" aria-hidden="true"></i></a> <%=l 'in your computer.' %><br>
<%=l 'Search in your distro, e.g. in Debian/Ubuntu with' %> <i><b>sudo apt-get install virt-viewer</b></i></p><br>
<i class="fab fa-windows fa-3x" aria-hidden="true"> Microsoft Windows </i>&copy;<br><br><p> <%=l 'You\'ll need to install' %>
<i class="fab fa-windows fa-3x" aria-hidden="true"> Microsoft Windows </i>&copy;<br><br><p> <%=l 'You will need to install' %>
<a target=_blank href="https://virt-manager.org/download/">VirtViewer<i class="fa fa-link" aria-hidden="true"></i> </a>
<%=l 'and USB drivers (' %><a href="https://www.spice-space.org/download/windows/usbdk/UsbDk_1.0.19_x64.msi">64 <i class="fa fa-download" aria-hidden="true"></i> </a><%=l 'or' %><a href="https://www.spice-space.org/download/windows/usbdk/UsbDk_1.0.19_x86.msi"> 32 <i class="fa fa-download" aria-hidden="true"></i> </a><%=l 'bits) in your computer.' %></p>
<p><%=l 'Be aware that in Windows, spice redirection is not automatically. It\'s necessary associate protocol with the app.' %><br>
<p><%=l 'Be aware that in Windows, spice redirection is not automatically. It is necessary associate protocol with the app.' %><br>
<%=l 'To make this possible, download' %><a target=_blank href="https://raw.githubusercontent.com/UPC/ravada/gh-pages/docs/docs/spice.reg"> spice.reg <i class="fa fa-download" aria-hidden="true"></i></a> <%=l 'or copy the following lines in an ASCII file and save with extension .reg, then execute the file.' %><br>
<p><%=l 'For more information, check ' %><a target=_blank href="http://ravada.readthedocs.io/en/latest/docs/windows_clients.html"><%=l 'the Windows Clients documentation' %></a>.</p><br>
<i class="fab fa-apple fa-3x " aria-hidden="true"> OS X</i>&copy;<br><br><p> <%=l 'For spice redirection you\'ll need to install' %> <a target=_blank href="http://people.freedesktop.org/~teuf/spice-gtk-osx/dmg/0.5.7/RemoteViewer-0.5.7-1.dmg">RemoteViewer <i class="fa fa-download" aria-hidden="true"></i></a> <%=l 'in your computer.' %><br></p>
<p><%=l 'For more information, check' %> <a target=_blank href="http://ravada.readthedocs.io/en/latest/docs/windows_clients.html"><%=l 'the Windows Clients documentation' %></a>.</p><br>
<i class="fab fa-apple fa-3x " aria-hidden="true"> OS X</i>&copy;<br><br><p> <%=l 'For spice redirection you will need to install' %> <a target=_blank href="http://people.freedesktop.org/~teuf/spice-gtk-osx/dmg/0.5.7/RemoteViewer-0.5.7-1.dmg">RemoteViewer <i class="fa fa-download" aria-hidden="true"></i></a> <%=l 'in your computer.' %><br></p>
</div>
</div>
</div>
......
Markdown is supported
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