Merge remote-tracking branch 'upstream/master' into page-translation-da

# Conflicts:
#	CHANGELOG.md
merge-requests/64/head
fhdk 2017-03-23 10:52:08 +01:00
commit b508b9bcb6
2 changed files with 6 additions and 3 deletions

View File

@ -1,8 +1,11 @@
# 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.x] - 2017-03-21 ## [0.4.13] - 2017-03-23
- Page translations for da ### Added
- Locales: RU translation.
### Fixed
- Locale loading
## [0.4.12] - 2017-03-13 ## [0.4.12] - 2017-03-13
### Added ### Added

View File

@ -523,7 +523,7 @@ We, the Manjaro Developers, hope that you will enjoy using Manjaro as much as we
<property name="type_hint">dialog</property> <property name="type_hint">dialog</property>
<property name="transient_for">window</property> <property name="transient_for">window</property>
<property name="program_name">Manjaro Hello</property> <property name="program_name">Manjaro Hello</property>
<property name="version">0.4.12</property> <property name="version">0.4.13</property>
<property name="comments" translatable="yes">Welcome screen for Manjaro</property> <property name="comments" translatable="yes">Welcome screen for Manjaro</property>
<property name="website">https://github.com/Huluti/manjaro-hello</property> <property name="website">https://github.com/Huluti/manjaro-hello</property>
<property name="website_label">GitHub</property> <property name="website_label">GitHub</property>