spalencsar/bearhub
1
0
Fork 0
mirror of https://github.com/spalencsar/bearhub.git synced 2026-07-07 00:04:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into staging

Browse Source 
# 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
parent 5ca3ee1ad8 2d837804e3
commit 6723e6be65
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fpakman/resources/locale/en
View File

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

2
fpakman/resources/locale/es
View File

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

2
fpakman/resources/locale/pt
View File

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