Merge branch 'master' into staging

# Conflicts:
#	CHANGELOG.md
#	README.md
#	fpakman/__init__.py
#	fpakman/app.py
#	fpakman/core/controller.py
#	fpakman/core/flatpak.py
#	fpakman/core/model.py
#	fpakman/core/system.py
#	fpakman/resources/locale/en
#	fpakman/resources/locale/es
#	fpakman/resources/locale/pt
#	fpakman/view/qt/about.py
#	fpakman/view/qt/apps_table.py
#	fpakman/view/qt/history.py
#	fpakman/view/qt/systray.py
#	fpakman/view/qt/thread.py
#	fpakman/view/qt/window.py
This commit is contained in:
Vinicius Moreira
2019-07-13 11:22:58 -03:00
3 changed files with 3 additions and 3 deletions

View File

@@ -75,4 +75,4 @@ description=description
type=type
installed=installed
others=others
internet.required=Internet connection is required
internet.required=Internet connection is required

View File

@@ -76,4 +76,4 @@ description=descripción
type=tipo
installed=instalado
others=otros
internet.required=Se requiere conexión a internet
internet.required=Se requiere conexión a internet

View File

@@ -76,4 +76,4 @@ description=descrição
type=tipo
installed=instalado
others=outros
internet.required=É necessário estar conectado a Internet
internet.required=É necessário estar conectado a Internet