Merge branch 'staging' into modules

# Conflicts:
#	fpakman/core/flatpak/controller.py
#	fpakman/core/flatpak/flatpak.py
#	fpakman/resources/locale/en
#	fpakman/resources/locale/es
#	fpakman/resources/locale/pt
This commit is contained in:
Vinicius Moreira
2019-07-30 17:37:36 -03:00
4 changed files with 7 additions and 3 deletions

View File

@@ -74,4 +74,4 @@ version.latest=latest version
version.installed_outdated=the installed version is outdated
version.unknown=not informed
app.name=application name
warning=warning
warning=warning

View File

@@ -75,4 +75,4 @@ version.latest=versión más reciente
version.installed_outdated=la versión instalada está desactualizada
version.unknown=versión no informada
app.name=nombre del aplicativo
warning=aviso
warning=aviso

View File

@@ -75,4 +75,4 @@ version.latest=versão mais recente
version.installed_outdated=a versão instalada está desatualizada
version.unknown=versão não informada
app.name=nome do aplicativo
warning=aviso
warning=aviso