Skip to content

Commit

Permalink
Merge branch 'release-0.5.5' back into master
Browse files Browse the repository at this point in the history
  • Loading branch information
naxuroqa committed Apr 23, 2020
2 parents 5fbef8a + 46de011 commit 93da8b3
Show file tree
Hide file tree
Showing 13 changed files with 817 additions and 947 deletions.
51 changes: 31 additions & 20 deletions com.github.naxuroqa.venom.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
app-id: com.github.naxuroqa.venom
runtime: org.gnome.Platform
runtime-version: '3.28'
runtime-version: '3.36'
sdk: org.gnome.Sdk
command: venom
copy-icon: true
Expand All @@ -22,30 +22,41 @@ cleanup-commands:
- rm -rf /app/lib/enchant-2/{*.a,*.la}
- rm -rf /app/share/{vala,man,gir-1.0}
build-options:
cflags: -O3 -DSQLITE_HAS_CODEC
cxxflags: -O3
no-debuginfo: true
modules:
- name: tcl
subdir: unix
build-options:
no-debuginfo: true
cleanup:
- /bin
- /lib
- /man
sources:
- type: archive
url: https://downloads.sourceforge.net/project/tcl/Tcl/8.6.10/tcl8.6.10-src.tar.gz
sha256: 5196dbf6638e3df8d5c87b5815c8c2b758496eb6f0e41446596c9a4e638d87ed
- name: sqlcipher
rm-configure: true
cleanup:
- /bin
config-opts:
- --enable-tempstore=yes
- --disable-tcl
build-options:
cflags: -DSQLITE_HAS_CODEC
ldflags: -lcrypto
sources:
- type: git
url: https://github.com/sqlcipher/sqlcipher
tag: v4.0.1
commit: 27d58453c6e56c3dd85e02bca379161bc69c746a
tag: v4.3.0
commit: ece66fdcbb6b43876d25e8e6308991a097fa8661
disable-fsckobjects: true
- type: script
dest-filename: autogen.sh
commands:
- AUTOMAKE="automake --foreign" autoreconf -vfi
- name: libsodium
sources:
- type: git
url: https://github.com/jedisct1/libsodium
tag: 1.0.17
commit: b732443c442239c2e0184820e9b23cca0de0828c
tag: 1.0.18
commit: 4f5e89fa84ce1d178a6765b8b46f2b6f91216677
- name: toxcore
buildsystem: cmake
config-opts:
Expand All @@ -54,8 +65,8 @@ modules:
sources:
- type: git
url: https://github.com/toktok/c-toxcore
tag: v0.2.9
commit: 98b754e1f22220f10196760389371dba6d139c6f
tag: v0.2.11
commit: 30b9369b01859e7c57687129ba2a481aa2bc48b8
- name: libgee
build-options:
env:
Expand All @@ -64,19 +75,19 @@ modules:
sources:
- type: git
url: https://gitlab.gnome.org/GNOME/libgee
tag: 0.20.1
commit: 57e4c8a08d61ab77bbec310a3a1621e6bf3111cb
tag: 0.20.3
commit: 56b10bc2c272f345536709f0abdaf857ba1b4080
- name: enchant
sources:
- type: archive
url: https://github.com/AbiWord/enchant/releases/download/v2.2.3/enchant-2.2.3.tar.gz
sha256: abd8e915675cff54c0d4da5029d95c528362266557c61c7149d53fa069b8076d
url: https://github.com/AbiWord/enchant/releases/download/v2.2.8/enchant-2.2.8.tar.gz
sha256: c7b5e2853f0dd0b1aafea2f9e071941affeec3a76df8e3f6d67a718c89293555
- name: gspell
sources:
- type: git
url: https://gitlab.gnome.org/GNOME/gspell
tag: 1.8.1
commit: ba03499234037861e01ce1e83075e8a32b9790f3
tag: 1.8.3
commit: 3522ddd143a0e5a89ac9c35e3d96beeb8cf8e965
- name: venom
builddir: true
buildsystem: meson
Expand Down
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
project('venom', ['vala', 'c'],
license: 'GPL3+',
version: '0.5.4'
version: '0.5.5'
)

i18n = import('i18n')
Expand Down
30 changes: 15 additions & 15 deletions po/de.po
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
msgid ""
msgstr ""
"Project-Id-Version: Venom\n"
"Report-Msgid-Bugs-To: \n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-12-01 13:43+0100\n"
"PO-Revision-Date: 2018-12-05 21:09+0000\n"
"PO-Revision-Date: 2020-04-22 06:28+0000\n"
"Last-Translator: naxuroqa <[email protected]>\n"
"Language-Team: German <https://hosted.weblate.org/projects/venom/"
"translations/de/>\n"
Expand All @@ -12,7 +12,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 3.4-dev\n"
"X-Generator: Weblate 4.0.2-dev\n"

#: src/undo/TextBufferUndoBinding.vala:169
msgid "_Redo"
Expand Down Expand Up @@ -85,11 +85,11 @@ msgstr "Gestern um %s"

#: src/core/R.vala:70
msgid "Tox User"
msgstr "Tox Nutzer"
msgstr "Tox-Nutzer"

#: src/core/Application.vala:37
msgid "Set level of messages to log"
msgstr "Setze das Niveau für Protokollmeldungen"
msgstr "Das Niveau für Protokollmeldungen setzen"

#: src/core/Application.vala:37
msgid "<loglevel>"
Expand All @@ -101,23 +101,23 @@ msgstr "Zeige Versionsnummer"

#: src/core/Application.vala:39
msgid "Show preferences"
msgstr "Öffne Einstellungen"
msgstr "Einstellungen öffnen"

#: src/core/Application.vala:73
msgid "Settings"
msgstr "Einstellungen"

#: src/viewmodel/ContactListViewModel.vala:102
msgid "New conference…"
msgstr "Neue Konferenz…"
msgstr "Neue Konferenz …"

#: src/viewmodel/ContactListViewModel.vala:115
msgid "Invite to conference…"
msgstr "Lade zu Konferenz ein…"
msgstr "Zu Konferenz einladen …"

#: src/viewmodel/ContactListViewModel.vala:121
msgid "Leave conference"
msgstr "Verlasse Konferenz"
msgstr "Konferenz verlassen"

#: src/viewmodel/ContactListViewModel.vala:121
msgid "Remove friend"
Expand Down Expand Up @@ -187,7 +187,7 @@ msgstr "Nachricht empfangen ✓"

#: src/tox/ToxMessage.vala:53 src/tox/ConferenceMessage.vala:57
msgid "me"
msgstr "Ich"
msgstr "ich"

#: src/tox/ToxAdapterFriendListener.vala:29
#, c-format
Expand Down Expand Up @@ -280,19 +280,19 @@ msgstr "Verpacker"

#: src/view/AboutDialog.vala:51 data/com.github.naxuroqa.venom.desktop.in:4
msgid "A modern Tox client for the Linux desktop"
msgstr "Ein moderner Tox Client für den Linux Desktop"
msgstr "Ein moderner Tox-Client für den Linux-Desktop"

#: src/view/AboutDialog.vala:52
msgid "Copyright © 2013-2018 Venom authors and contributors"
msgstr "Copyright © 2013-2018 Venom Authoren und Mitwirkende"
msgstr "Copyright © 2013-2018 Authoren und Mitwirkende von Venom"

#: src/view/AboutDialog.vala:56
msgid "translator-credits"
msgstr "Spixi <[email protected]>, naxuroqa <[email protected]>"

#: src/view/WelcomeWidget.vala:129
msgid "A new kind of instant messaging"
msgstr "Sichere Kommunikation für jedermann"
msgstr "Eine neue Art von Nachrichtensofortversand"

#: src/view/WelcomeWidget.vala:137
msgid "Chat with your friends and family without anyone else listening in."
Expand All @@ -301,11 +301,11 @@ msgstr "Plaudere mit deinen Freunden und Familie ohne dass jemand mithört."
#: src/view/WelcomeWidget.vala:138
#, c-format
msgid "Now with 50% less bugs."
msgstr "Jetzt mit 50% weniger bugs."
msgstr "Jetzt mit 50 % weniger Bugs."

#: src/view/WelcomeWidget.vala:139
msgid "Generating witty dialog…"
msgstr "Generiere lustige Nachrichten…"
msgstr "Witzige Dialoge werden generiert …"

#: src/view/WelcomeWidget.vala:140
msgid "Thank you for using Venom."
Expand Down
12 changes: 8 additions & 4 deletions po/es.po
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
msgid ""
msgstr ""
"Project-Id-Version: Venom\n"
"Report-Msgid-Bugs-To: \n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-12-01 13:43+0100\n"
"PO-Revision-Date: 2019-03-26 21:39+0000\n"
"Last-Translator: Rui Mendes <[email protected]>\n"
"Language-Team: Spanish <https://hosted.weblate.org/projects/venom/"
"translations/es/>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: POEditor.com\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 3.6-dev\n"

#: src/undo/TextBufferUndoBinding.vala:169
msgid "_Redo"
Expand Down Expand Up @@ -87,7 +91,7 @@ msgstr "Usuario de Tox"

#: src/core/Application.vala:37
msgid "Set level of messages to log"
msgstr "Establecer el nivel de mensajes para iniciar sesión"
msgstr "Establecer el nivel de mensajes para registrar"

#: src/core/Application.vala:37
msgid "<loglevel>"
Expand Down
Loading

0 comments on commit 93da8b3

Please sign in to comment.