Merge branch 'testing' into unstable

This commit is contained in:
Alexandre Aubin 2018-05-06 16:50:34 +00:00
commit c7eba1a1b7
2 changed files with 7 additions and 1 deletions

6
debian/changelog vendored
View file

@ -1,3 +1,9 @@
yunohost-admin (2.7.12) stable; urgency=low
* Bumping version number for stable release
-- Alexandre Aubin <alex.aubin@mailoo.org> Sun, 06 May 2018 16:47:05 +0000
yunohost-admin (2.7.11) testing; urgency=low yunohost-admin (2.7.11) testing; urgency=low
* [i18n] Updated translations for French, Arabic, Dutch, Occitan and Spanish * [i18n] Updated translations for French, Arabic, Dutch, Occitan and Spanish

View file

@ -292,7 +292,7 @@
"tools_reboot": "Reboot your server", "tools_reboot": "Reboot your server",
"tools_reboot_btn": "Reboot", "tools_reboot_btn": "Reboot",
"tools_reboot_done": "Rebooting...", "tools_reboot_done": "Rebooting...",
"tools_rebooting": "Your server is rebooting. To return on the web administration interface you need to wait your server to be up. You can check that by refreshing regularly this page (F5).", "tools_rebooting": "Your server is rebooting. To return to the web administration interface you need to wait for your server to be up. You can check that by refreshing this page (F5).",
"tools_shutdown": "Shutdown your server", "tools_shutdown": "Shutdown your server",
"tools_shutdown_btn": "Shutdown", "tools_shutdown_btn": "Shutdown",
"tools_shutdown_done": "Shutting down...", "tools_shutdown_done": "Shutting down...",