Merge pull request #1 from Huluti/master

merge upstream
merge-requests/64/head
Bernhard Landauer 2016-12-27 17:38:43 +01:00 committed by GitHub
commit c4d99420fa
8 changed files with 633 additions and 498 deletions

View File

@ -1,6 +1,6 @@
_pkgname=manjaro-hello _pkgname=manjaro-hello
pkgname=${_pkgname}-git pkgname=${_pkgname}-git
pkgver=0.3.1 pkgver=0.4.1
pkgrel=1 pkgrel=1
pkgdesc="A tool providing access to documentation and support for new Manjaro users." pkgdesc="A tool providing access to documentation and support for new Manjaro users."
url="https://github.com/Huluti/${_pkgname}" url="https://github.com/Huluti/${_pkgname}"

View File

@ -1,6 +1,28 @@
# Change Log # Change Log
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
## [0.4.1] - 2016-12-27
### Added
- Spanish translation.
### Changed
- Russian translation.
## [0.4] - 2016-12-27
### Added
- Support of autostart in i3.
- Disable home button on welcome page.
- Tooltips on social and header buttons.
- Russian translation.
### Changed
- Make creating new pages easier.
- Label of install button.
- German translation.
### Fixed
- Window blocking during call of installer.
## [0.3.1] - 2016-12-23 ## [0.3.1] - 2016-12-23
### Fixed ### Fixed
- Button icons are not always displayed. - Button icons are not always displayed.
@ -8,7 +30,9 @@ All notable changes to this project will be documented in this file.
## [0.3] - 2016-12-23 ## [0.3] - 2016-12-23
### Added ### Added
- Icons for links buttons. - Icons for links buttons.
- German launcher's description from @Photon89. - German launcher's description.
### Changed
- Use logo from manjaro-icons if available. - Use logo from manjaro-icons if available.
### Fixed ### Fixed
@ -27,8 +51,8 @@ All notable changes to this project will be documented in this file.
## [0.2] - 2016-12-21 ## [0.2] - 2016-12-21
First stable version. First stable version.
### Added ### Added
- Polish translation from @napcok. - Polish translation.
- German translation from @Photon89. - German translation.
### Fixed ### Fixed
- Locale detection. - Locale detection.

0
launch.sh 100644 → 100755
View File

View File

@ -8,5 +8,6 @@ Exec=/usr/bin/manjaro-hello
Icon=/usr/share/manjaro-hello/data/img/manjaro.png Icon=/usr/share/manjaro-hello/data/img/manjaro.png
Comment=A tool providing access to documentation and support for new Manjaro users. Comment=A tool providing access to documentation and support for new Manjaro users.
Comment[de]=Ein Tool für schnellen Zugriff auf Support und Dokumentation für neue Manjaro-Nutzer. Comment[de]=Ein Tool für schnellen Zugriff auf Support und Dokumentation für neue Manjaro-Nutzer.
Comment[es]=Una herramienta que provee acceso a la documentación y soporte para nuevos usuarios de Manjaro.
Comment[fr]=Outil d'accès à la documentation et support aux nouveaux utilisateurs de Manjaro. Comment[fr]=Outil d'accès à la documentation et support aux nouveaux utilisateurs de Manjaro.
Comment[ru]=Средство доступа к документации и поддержке для новых пользователей Manjaro. Comment[ru]=Средство доступа к документации и поддержке для новых пользователей Manjaro.

117
po/es.po 100644
View File

@ -0,0 +1,117 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# Chazy Chaz <how2hack@hotmail.es>, 2016.
#
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-12-27 10:10+0100\n"
"PO-Revision-Date: 2016-12-27 10:10+0100\n"
"Last-Translator: Chazy Chaz <how2hack@hotmail.es>\n"
"Language-Team: \n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: ../ui/manjaro-hello.glade:7 ../ui/manjaro-hello.glade:523
msgid "About"
msgstr "Acerca de"
#: ../ui/manjaro-hello.glade:12
msgid "Welcome screen for Manjaro"
msgstr "Pantalla de bienvenida para Manjaro"
#: ../ui/manjaro-hello.glade:14
msgid "Github"
msgstr "Github"
#: ../ui/manjaro-hello.glade:100
msgid "Welcome to Manjaro!"
msgstr "Bienvenido a Manjaro"
#: ../ui/manjaro-hello.glade:117
msgid ""
"Thank you for joining our community!\n"
"\n"
"We, the Manjaro Developers, hope that you will enjoy using Manjaro as much "
"as we enjoy building it. The links below will help you get started with your "
"new operating system. So enjoy the experience, and don't hesitate to send us "
"your feedback."
msgstr ""
"¡Gracias por unirte a nuestra comunidad!\n"
"\n"
"Nosotros, los Desarrolladores de Manjaro, esperamos que disfrutes usando Manjaro "
"tanto como nosotros disfrutamos construyendolo. Los links de abajo te ayudarán a "
"empezar con tu nuevo sistema opeartivo. Disfruta de la experiencia, y no dudes en "
"enviarnos tus comentarios."
#: ../ui/manjaro-hello.glade:134
msgid "DOCUMENTATION"
msgstr "DOCUMENTACIÓN"
#: ../ui/manjaro-hello.glade:148
msgid "SUPPORT"
msgstr "SOPORTE"
#: ../ui/manjaro-hello.glade:162
msgid "PROJECT"
msgstr "PROYECTO"
#: ../ui/manjaro-hello.glade:174
msgid "Read me"
msgstr "Leeme"
#: ../ui/manjaro-hello.glade:188
msgid "Release info"
msgstr "Información"
#: ../ui/manjaro-hello.glade:202
msgid "Wiki"
msgstr "Wiki"
#: ../ui/manjaro-hello.glade:216
msgid "Get involved"
msgstr "Participa con nosotros"
#: ../ui/manjaro-hello.glade:230
msgid "Forums"
msgstr "Foros"
#: ../ui/manjaro-hello.glade:244
msgid "Chat room"
msgstr "Sala de chat"
#: ../ui/manjaro-hello.glade:258
msgid "Mailling lists"
msgstr "Listas de correo"
#: ../ui/manjaro-hello.glade:272
msgid "Build Manjaro"
msgstr "Construye Manjaro"
#: ../ui/manjaro-hello.glade:286
msgid "Donate"
msgstr "Donar"
#: ../ui/manjaro-hello.glade:402
msgid "Launch at start"
msgstr "Abrir al inicio"
#: ../ui/manjaro-hello.glade:434
msgid "INSTALLATION"
msgstr "INSTALACIÓN"
#: ../ui/manjaro-hello.glade:446
msgid "Launch installer"
msgstr "Abrir instalador"
#: ../ui/manjaro-hello.glade:495
msgid "Home"
msgstr "Inicio"
#: ../src/manjaro_hello.py:241
msgid "Can't load page."
msgstr "No se puede cargar la página"

View File

@ -47,7 +47,7 @@ msgstr ""
"\n" "\n"
"Мы, разработчики Manjaro, надеемся, что пользуясь Manjaro, Вы будете " "Мы, разработчики Manjaro, надеемся, что пользуясь Manjaro, Вы будете "
"испытыватьтакое же удовольствие, какое мы испытывали, создавая его. " "испытыватьтакое же удовольствие, какое мы испытывали, создавая его. "
"Представленные нижессылки помогут Вам начать использование новой " "Представленные ниже ссылки помогут Вам начать использование новой "
"операционной системы.Наслаждайтесь ее работой и не стесняйтесь оставлять " "операционной системы.Наслаждайтесь ее работой и не стесняйтесь оставлять "
"свои отзывы о ней." "свои отзывы о ней."
@ -109,11 +109,11 @@ msgstr "УСТАНОВКА"
#: ../ui/manjaro-hello.glade:446 #: ../ui/manjaro-hello.glade:446
msgid "Launch installer" msgid "Launch installer"
msgstr "" msgstr "Запустить"
#: ../ui/manjaro-hello.glade:495 #: ../ui/manjaro-hello.glade:495
msgid "Home" msgid "Home"
msgstr "" msgstr "В начало"
#: ../src/manjaro_hello.py:241 #: ../src/manjaro_hello.py:241
msgid "Can't load page." msgid "Can't load page."

View File

@ -78,7 +78,7 @@ class ManjaroHello():
self.builder.get_object("stack").add_named(scrolled_window, page + "page") self.builder.get_object("stack").add_named(scrolled_window, page + "page")
# Init translation # Init translation
self.locales = ("de", "en", "fr", "pl", "ru") # supported locales self.locales = ("de", "en", "es", "fr", "pl", "ru") # supported locales
self.default_locale = "en" self.default_locale = "en"
self.sys_locale = locale.getdefaultlocale()[0] self.sys_locale = locale.getdefaultlocale()[0]
self.default_texts = {} self.default_texts = {}
@ -256,7 +256,6 @@ class ManjaroHello():
self.set_autostart(autostart) self.set_autostart(autostart)
elif name == "about": elif name == "about":
dialog = self.builder.get_object("aboutdialog") dialog = self.builder.get_object("aboutdialog")
dialog.set_transient_for(self.window)
dialog.run() dialog.run()
dialog.hide() dialog.hide()

View File

@ -2,47 +2,6 @@
<!-- Generated with glade 3.20.0 --> <!-- Generated with glade 3.20.0 -->
<interface> <interface>
<requires lib="gtk+" version="3.20"/> <requires lib="gtk+" version="3.20"/>
<object class="GtkAboutDialog" id="aboutdialog">
<property name="can_focus">False</property>
<property name="title" translatable="yes">About</property>
<property name="type_hint">dialog</property>
<property name="program_name">Manjaro Hello</property>
<property name="version">0.3.1</property>
<property name="comments" translatable="yes">Welcome screen for Manjaro</property>
<property name="website">https://github.com/Huluti/manjaro-hello</property>
<property name="website_label" translatable="yes">Github</property>
<property name="authors">Hugo Posnic</property>
<property name="translator_credits">Michael Kogan [de]
Daniel Napora [pl]
Ilya Ostapenko [ru]</property>
<property name="logo_icon_name"/>
<property name="license_type">gpl-3-0</property>
<child internal-child="vbox">
<object class="GtkBox">
<property name="can_focus">True</property>
<property name="has_focus">True</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child internal-child="action_area">
<object class="GtkButtonBox">
<property name="can_focus">False</property>
<property name="layout_style">end</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<placeholder/>
</child>
</object>
</child>
<child>
<placeholder/>
</child>
</object>
<object class="GtkImage" id="homeicon"> <object class="GtkImage" id="homeicon">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
@ -59,10 +18,6 @@ Ilya Ostapenko [ru]</property>
<property name="window_position">center</property> <property name="window_position">center</property>
<property name="has_resize_grip">True</property> <property name="has_resize_grip">True</property>
<signal name="delete-event" handler="on_delete_window" swapped="no"/> <signal name="delete-event" handler="on_delete_window" swapped="no"/>
<child>
<object class="GtkGrid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child> <child>
<object class="GtkStack" id="stack"> <object class="GtkStack" id="stack">
<property name="visible">True</property> <property name="visible">True</property>
@ -411,7 +366,6 @@ We, the Manjaro Developers, hope that you will enjoy using Manjaro as much as we
<property name="name">autostart</property> <property name="name">autostart</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="halign">end</property>
<signal name="notify::active" handler="on_action_clicked" swapped="no"/> <signal name="notify::active" handler="on_action_clicked" swapped="no"/>
</object> </object>
<packing> <packing>
@ -471,12 +425,6 @@ We, the Manjaro Developers, hope that you will enjoy using Manjaro as much as we
</packing> </packing>
</child> </child>
</object> </object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
</object>
</child> </child>
<child type="titlebar"> <child type="titlebar">
<object class="GtkHeaderBar" id="headerbar"> <object class="GtkHeaderBar" id="headerbar">
@ -503,6 +451,7 @@ We, the Manjaro Developers, hope that you will enjoy using Manjaro as much as we
<items> <items>
<item id="de">Deutsch (Deutschland)</item> <item id="de">Deutsch (Deutschland)</item>
<item id="en">English (United States)</item> <item id="en">English (United States)</item>
<item id="es">Español (España)</item>
<item id="fr">Français (France)</item> <item id="fr">Français (France)</item>
<item id="pl">Polski (Polska)</item> <item id="pl">Polski (Polska)</item>
<item id="ru">Pусский (Россия)</item> <item id="ru">Pусский (Россия)</item>
@ -531,4 +480,49 @@ We, the Manjaro Developers, hope that you will enjoy using Manjaro as much as we
</object> </object>
</child> </child>
</object> </object>
<object class="GtkAboutDialog" id="aboutdialog">
<property name="can_focus">False</property>
<property name="title" translatable="yes">About</property>
<property name="type_hint">dialog</property>
<property name="transient_for">window</property>
<property name="program_name">Manjaro Hello</property>
<property name="version">0.4.1</property>
<property name="comments" translatable="yes">Welcome screen for Manjaro</property>
<property name="website">https://github.com/Huluti/manjaro-hello</property>
<property name="website_label" translatable="yes">Github</property>
<property name="authors">Hugo Posnic</property>
<property name="translator_credits">Michael Kogan [de]
Bernhard Landauer [de]
Gabriel Blanca [es]
Hugo Posnic [fr]
Daniel Napora [pl]
Ilya Ostapenko [ru]</property>
<property name="logo_icon_name"/>
<property name="license_type">gpl-3-0</property>
<child internal-child="vbox">
<object class="GtkBox">
<property name="can_focus">True</property>
<property name="has_focus">True</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child internal-child="action_area">
<object class="GtkButtonBox">
<property name="can_focus">False</property>
<property name="layout_style">end</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<placeholder/>
</child>
</object>
</child>
<child>
<placeholder/>
</child>
</object>
</interface> </interface>