Skip to content

Commit

Permalink
Merge branch 'release-0.5.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
naxuroqa committed Jan 22, 2019
2 parents e7fc324 + 28df523 commit 5fbef8a
Show file tree
Hide file tree
Showing 10 changed files with 1,109 additions and 61 deletions.
65 changes: 65 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
---
version: 2
jobs:
build:
docker:
- image: ubuntu:18.04
steps:
- checkout
- run:
name: Add vala-team/ppa
command: |
apt update
apt install -y software-properties-common gnupg
add-apt-repository ppa:vala-team/ppa -y
- run:
name: Install dependencies
command: apt update
&& apt install -y
clang
cmake
libconfig-dev
libgtest-dev
libopus-dev
libsodium-dev
libvpx-dev
pkg-config
libgee-0.8-dev
libgspell-1-dev
libgtk-3-dev
libjson-glib-dev
libsoup2.4-dev
libsqlcipher-dev
libcanberra-dev
libgstreamer1.0-dev
libgstreamer-plugins-base1.0-dev
valac
python3-pip
wget
- run:
name: Install meson
command: pip3 install meson ninja
- run:
name: Build and install toxcore
command: |
wget "https://github.com/TokTok/c-toxcore/archive/v0.2.9.tar.gz"
tar -xzf v0.2.9.tar.gz
cd c-toxcore-0.2.9
cmake -DCMAKE_INSTALL_PREFIX=/usr
make
make install
cd ..
- run:
name: Configure
command: meson build
- run:
name: Build
command: ninja -C build
- run:
name: Test
command: ninja -C build test
workflows:
version: 2
build:
jobs:
- build
33 changes: 22 additions & 11 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,30 +1,41 @@
FROM ubuntu:latest
FROM ubuntu:18.04

RUN \
apt update && \
apt install -y software-properties-common gnupg && \
add-apt-repository ppa:vala-team/ppa -y

RUN \
apt-get update && \
apt-get -y upgrade && \
apt-get install -y \
build-essential \
clang \
cmake \
libgtk-3-dev \
libjson-glib-dev \
libconfig-dev \
libgtest-dev \
libopus-dev \
libsodium-dev \
libsoup2.4-dev \
libsqlcipher-dev \
libvpx-dev \
pkg-config \
libgee-0.8-dev \
libgspell-1-dev \
libgtk-3-dev \
libjson-glib-dev \
libsoup2.4-dev \
libsqlcipher-dev \
libcanberra-dev \
meson \
libgstreamer1.0-dev \
libgstreamer-plugins-base1.0-dev \
valac \
python3-pip \
wget

RUN pip3 install meson ninja

RUN rm -rf /var/lib/apt/lists/*

RUN wget "https://github.com/TokTok/c-toxcore/archive/v0.2.8.tar.gz" && \
tar -xzf v0.2.8.tar.gz && \
cd c-toxcore-0.2.8 && \
RUN wget "https://github.com/TokTok/c-toxcore/archive/v0.2.9.tar.gz" && \
tar -xzf v0.2.9.tar.gz && \
cd c-toxcore-0.2.9 && \
cmake -DCMAKE_INSTALL_PREFIX=/usr && \
make && \
make install && \
Expand Down
16 changes: 8 additions & 8 deletions com.github.naxuroqa.venom.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ modules:
sources:
- type: git
url: https://github.com/sqlcipher/sqlcipher
tag: v3.4.2
commit: c6f709fca81c910ba133aaf6330c28e01ccfe5f8
tag: v4.0.1
commit: 27d58453c6e56c3dd85e02bca379161bc69c746a
disable-fsckobjects: true
- type: script
dest-filename: autogen.sh
Expand All @@ -44,8 +44,8 @@ modules:
sources:
- type: git
url: https://github.com/jedisct1/libsodium
tag: 1.0.16
commit: 675149b9b8b66ff44152553fb3ebf9858128363d
tag: 1.0.17
commit: b732443c442239c2e0184820e9b23cca0de0828c
- name: toxcore
buildsystem: cmake
config-opts:
Expand All @@ -54,8 +54,8 @@ modules:
sources:
- type: git
url: https://github.com/toktok/c-toxcore
tag: v0.2.8
commit: 3f35a84968f100e1e6d3c9df467fd3c82a9ebb13
tag: v0.2.9
commit: 98b754e1f22220f10196760389371dba6d139c6f
- name: libgee
build-options:
env:
Expand All @@ -69,8 +69,8 @@ modules:
- name: enchant
sources:
- type: archive
url: https://github.com/AbiWord/enchant/releases/download/v2.1.3/enchant-2.1.3.tar.gz
sha256: 086f37cdecd42eacd0e1dc291f5410d9ca2c5ed2cd9cd9367729e3d2d18a8550
url: https://github.com/AbiWord/enchant/releases/download/v2.2.3/enchant-2.2.3.tar.gz
sha256: abd8e915675cff54c0d4da5029d95c528362266557c61c7149d53fa069b8076d
- name: gspell
sources:
- type: git
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.3'
version: '0.5.4'
)

i18n = import('i18n')
Expand Down
1 change: 1 addition & 0 deletions po/LINGUAS
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ pt
pt_BR
ru
zh_CN
zh_Hant
38 changes: 20 additions & 18 deletions po/pl.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ msgstr ""
"Project-Id-Version: Venom\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-12-01 13:43+0100\n"
"PO-Revision-Date: 2018-12-10 17:09+0000\n"
"Last-Translator: naxuroqa <[email protected]>\n"
"PO-Revision-Date: 2019-01-19 12:21+0000\n"
"Last-Translator: Allan Nordhøy <[email protected]>\n"
"Language-Team: Polish <https://hosted.weblate.org/projects/venom/"
"translations/pl/>\n"
"Language: pl\n"
Expand Down Expand Up @@ -506,7 +506,7 @@ msgstr "Mowa"

#: src/ui/create_groupchat_widget.ui:252
msgid "<small>Select a conference type</small>"
msgstr "<małe>Wybierz typ konferencji</niewielkie>."
msgstr "<small>Wybierz typ konferencji</small>."

#: src/ui/create_groupchat_widget.ui:299
#, fuzzy
Expand Down Expand Up @@ -689,8 +689,9 @@ msgid "Enter a Tox ID or URI here"
msgstr "Wpisz tu Tox ID lub Tox URI"

#: src/ui/add_contact_widget.ui:222
#, fuzzy
msgid "<small>Enter your friends Tox ID</small>"
msgstr "<małe>Enter your friends Tox ID</small>."
msgstr "<small>Enter your friends Tox ID</small>"

#: src/ui/add_contact_widget.ui:254
#, fuzzy
Expand All @@ -705,7 +706,7 @@ msgstr ""

#: src/ui/add_contact_widget.ui:302
msgid "<small>Send your friend a short message</small>"
msgstr "<mały>Wyślij swojemu przyjacielowi krótką wiadomość</niewielki>."
msgstr "<small>Wyślij swojemu przyjacielowi krótką wiadomość</small>."

#: src/ui/add_contact_widget.ui:333
#, fuzzy
Expand Down Expand Up @@ -799,15 +800,15 @@ msgstr "Ciemny motyw"

#: src/ui/settings_widget.ui:348
msgid "<small>Use a dark variant of the theme</small>"
msgstr "<mały>Użyj ciemnego wariantu tematu</niewielki>."
msgstr "<small>Użyj ciemnego wariantu tematu</small>."

#: src/ui/settings_widget.ui:404
msgid "Animations"
msgstr "Animacje"

#: src/ui/settings_widget.ui:417
msgid "<small>Turn on animated transitions</small>"
msgstr "<mały>Powrót na animowanych przejściach</niewielki>"
msgstr "<small>Powrót na animowanych przejściach</small>."

#: src/ui/settings_widget.ui:473
#, fuzzy
Expand All @@ -816,7 +817,7 @@ msgstr "Zadzwoń do kontaktu"

#: src/ui/settings_widget.ui:486
msgid "<small>Show contacts in a compact format</small>"
msgstr "<małe>Pokaż kontakty w kompaktowym formacie</niewielkie>"
msgstr "<small>Pokaż kontakty w kompaktowym formacie</small>."

#: src/ui/settings_widget.ui:542
msgid "Spellcheck"
Expand All @@ -832,15 +833,15 @@ msgstr "Dźwięki"

#: src/ui/settings_widget.ui:712
msgid "<small>Play sounds on new notifications</small>"
msgstr "<małe>Odtwarzaj dźwięki na nowych powiadomieniach</niewielkie>"
msgstr "<small>Odtwarzaj dźwięki na nowych powiadomieniach</small>."

#: src/ui/settings_widget.ui:768
msgid "While Busy"
msgstr "Podczas gdy zajęty"

#: src/ui/settings_widget.ui:781
msgid "<small>Receive notifications even while you are busy</small>"
msgstr "<małe>Odbieraj powiadomienia nawet wtedy, gdy jesteś zajęty</niemałe>."
msgstr "<small>Odbieraj powiadomienia nawet wtedy, gdy jesteś zajęty</small>."

#: src/ui/settings_widget.ui:866
msgid "Tray icon"
Expand All @@ -852,7 +853,7 @@ msgstr "Minimalizuj"

#: src/ui/settings_widget.ui:940
msgid "<small>Minimize to tray instead of close</small>"
msgstr "<małe>Minimalizuj do tacy zamiast zamykać</niewielkie>"
msgstr "<small>Minimalizuj do tacy zamiast zamykać</small>."

#: src/ui/settings_widget.ui:1025
msgid "Privacy"
Expand All @@ -874,7 +875,7 @@ msgstr "Trzymaj historię przez"

#: src/ui/settings_widget.ui:1150
msgid "<small>Store your sent and received messages</small>"
msgstr "<małe>Sklep swoje wysłane i otrzymane wiadomości</niewielkie>."
msgstr "<small>Sklep swoje wysłane i otrzymane wiadomości</small>."

#: src/ui/settings_widget.ui:1281
msgid "<b>Connection</b>"
Expand Down Expand Up @@ -909,12 +910,13 @@ msgid "Hole punching"
msgstr "Wykrawanie otworów"

#: src/ui/settings_widget.ui:1543
#, fuzzy
msgid ""
"<small>Enable UDP <a href=\"https://en.wikipedia.org/wiki/"
"Hole_punching_(networking)\">hole punching</a></small>"
msgstr ""
"<małe>Enable UDP <a href=\"https://en.wikipedia.org/wiki/"
"Hole_punching_(networking)\">hole punching</a></a></small>>."
"<small>Enable UDP <a href=\"https://en.wikipedia.org/wiki/"
"Hole_punching_(networking)\">hole punching</a></small>"

#: src/ui/settings_widget.ui:1681
msgid "Update bootstrap nodes"
Expand Down Expand Up @@ -945,15 +947,15 @@ msgstr "Ustawienia"

#: src/ui/settings_widget.ui:2000
msgid "<small>Use custom proxy settings</small>"
msgstr "<małe>Używaj niestandardowych ustawień proxy</niewielkie>>."
msgstr "<small>Używaj niestandardowych ustawień proxy</small>."

#: src/ui/settings_widget.ui:2041
msgid "Host"
msgstr "Host"

#: src/ui/settings_widget.ui:2084
msgid "<small>Set a SOCKS5 proxy to connect to</small>"
msgstr "<mały>Ustawiamy proxy SOCKS5 do łączenia się z</niemały>"
msgstr "<small>Ustawiamy proxy SOCKS5 do łączenia się z</small>."

#: src/ui/friend_info_widget.ui:171
msgid "Remove from your friends list"
Expand All @@ -970,8 +972,8 @@ msgstr "Zresetuj alias"
#: src/ui/friend_info_widget.ui:254
msgid "<small>Set a custom alias to quickly find your friends</small>"
msgstr ""
"<mały>Ustaw niestandardowy alias, aby szybko znaleźć swoich "
"przyjaciół</mały>."
"<mały>Ustaw niestandardowy alias, aby szybko znaleźć swoich przyjaciół</"
"mały>."

#: src/ui/friend_info_widget.ui:364
msgid "Auto accept conference invites"
Expand Down
Loading

0 comments on commit 5fbef8a

Please sign in to comment.