Commit aaf2a990 authored by Martin's avatar Martin

Merge tag 'upstream/1.0.0-beta2' into debian/master

parents df4ec18a c0a26878
Gajim 0.99.2 (17 February 2018)
* Speed up DB querys on MAM sync
* Fix config file encoding
* Bug fixes
Gajim 0.99.1 (08 February 2018)
* Integrate HTTPUpload
......
environment:
matrix:
- MSYS: C:/msys64/mingw32
- MSYSTEM: MINGW32
branches:
only:
- master
- gajim_1.0
clone_depth: 1
# init:
# - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
install:
build_script:
- C:\msys64\usr\bin\pacman -Syuu --needed --noconfirm --ask=127
- ps: |
$env:MSYSTEM="MINGW32"
$env:TIME_STRING=(get-date -UFormat "%Y-%m-%d").ToString()
$env:BUILDROOT="C:\msys64\home\appveyor\gajim\win\_build_root"
......@@ -23,13 +22,10 @@ install:
C:\msys64\usr\bin\sh.exe --login -c $command
}
bash 'pacman -Sy --noconfirm git'
bash 'git clone C:/projects/gajim C:/msys64/home/appveyor/gajim'
bash 'C:/msys64/home/appveyor/gajim/win/build.sh'
Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim.exe" -FileName "Gajim-Master-$($env:TIME_STRING).exe"
Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim-Portable.exe" -FileName "Gajim-Portable-Master-$($env:TIME_STRING).exe"
build: off
Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim.exe" -FileName "Gajim-1.0.0-$($env:TIME_STRING).exe"
Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim-Portable.exe" -FileName "Gajim-Portable-1.0.0-$($env:TIME_STRING).exe"
# on_finish:
# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
......
......@@ -4,8 +4,8 @@ Install gajim flatpak repo
--------------------------
1. `flatpak --user remote-add --from gnome https://sdk.gnome.org/gnome.flatpakrepo`
1. `flatpak --user install gnome org.gnome.Platform//3.24`
1. `flatpak --user install gnome org.gnome.Sdk//3.24`
1. `flatpak --user install gnome org.gnome.Platform//3.26`
1. `flatpak --user install gnome org.gnome.Sdk//3.26`
1. `flatpak-builder --repo=repo directory gajim/org.gajim.Gajim.json`
1. `flatpak --user remote-add --no-gpg-verify repo repo`
1. `flatpak --user install repo org.gajim.Gajim`
......
import subprocess
__version__ = "0.99.1"
__version__ = "0.99.2"
try:
node = subprocess.Popen('git rev-parse --short=12 HEAD', shell=True,
......
......@@ -99,7 +99,7 @@ class HelperEvent:
def _generate_timestamp(self, tag):
# Make sure we use only int/float Epoch time
if not isinstance(tag, str):
if tag is None:
self.timestamp = time_time()
return
try:
......@@ -771,7 +771,7 @@ PresenceHelperEvent):
# XEP-0203
delay_tag = self.stanza.getTag('delay', namespace=nbxmpp.NS_DELAY2)
if delay_tag:
self._generate_timestamp(self.stanza.getTimestamp2())
self._generate_timestamp(self.stanza.timestamp)
# XEP-0319
self.idle_time = None
idle_tag = self.stanza.getTag('idle', namespace=nbxmpp.NS_IDLE)
......@@ -791,7 +791,7 @@ PresenceHelperEvent):
self.contact_nickname = x.getTagData('nickname')
elif namespace == nbxmpp.NS_DELAY and not self.timestamp:
# XEP-0091
self._generate_timestamp(self.stanza.getTimestamp())
self._generate_timestamp(self.stanza.timestamp)
elif namespace == 'http://delx.cjb.net/protocol/roster-subsync':
# see http://trac.gajim.org/ticket/326
agent = app.get_server_from_jid(self.jid)
......@@ -1401,7 +1401,7 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):
self.session.last_receive = time_time()
self._generate_timestamp(self.stanza.getTimestamp())
self._generate_timestamp(self.stanza.timestamp)
return True
......
......@@ -48,7 +48,7 @@ class OptionsParser:
def read(self):
try:
fd = open(self.__filename)
fd = open(self.__filename, encoding='utf-8')
except Exception:
if os.path.exists(self.__filename):
#we talk about a file
......@@ -251,6 +251,8 @@ class OptionsParser:
self.update_config_to_0982()
if old < [0, 98, 3] and new >= [0, 98, 3]:
self.update_config_to_0983()
if old < [0, 99, 2] and new >= [0, 99, 2]:
self.update_config_to_0992()
app.logger.init_vars()
app.logger.attach_cache_database()
......@@ -935,3 +937,12 @@ class OptionsParser:
elif password == "libsecret:":
app.config.set_per('accounts', account, 'password', '')
app.config.set('version', '0.98.3')
def update_config_to_0992(self):
self.call_sql(logger.LOG_DB_PATH,
'''
CREATE INDEX IF NOT EXISTS
idx_logs_stanza_id ON logs (stanza_id);
'''
)
app.config.set('version', '0.99.2')
......@@ -1312,11 +1312,11 @@ class AboutDialog(Gtk.AboutDialog):
self.add_credit_section(_('Past Developers'), const.DEVS_PAST)
self.add_credit_section(_('Artists'), const.ARTISTS)
thanks = const.THANKS
thanks = const.THANKS[:]
thanks.append('')
thanks.append(_('Last but not least'))
thanks.append(_('we would like to thank all the package maintainers.'))
self.add_credit_section('Thanks', thanks)
self.add_credit_section(_('Thanks'), thanks)
self.set_translator_credits(_('translator-credits'))
self.set_logo_icon_name('org.gajim.Gajim')
......
......@@ -41,6 +41,8 @@ import sys
import os
import signal
import locale
from urllib.parse import unquote
import gi
gi.require_version('GLib', '2.0')
gi.require_version('Gio', '2.0')
......@@ -49,6 +51,7 @@ gi.require_version('Gdk', '3.0')
gi.require_version('GObject', '2.0')
gi.require_version('Pango', '1.0')
from gi.repository import GLib, Gio, Gtk
from gajim.common import i18n
from gajim.common import logging_helpers
from gajim.common import crypto
......@@ -266,12 +269,20 @@ class GajimApplication(Gtk.Application):
self.interface.join_gc_minimal(None, jid)
elif cmd == 'roster':
self.activate_action('add-contact', GLib.Variant('s', jid))
elif cmd == 'message':
elif cmd.startswith('message'):
attributes = cmd.split(';')
message = None
for key in attributes:
if key.startswith('body'):
try:
message = unquote(key.split('=')[1])
except Exception:
app.log('uri_handler').error('Invalid URI: %s', cmd)
accounts = list(app.connections.keys())
if not accounts:
continue
if len(accounts) == 1:
app.interface.new_chat_from_jid(accounts[0], jid)
app.interface.new_chat_from_jid(accounts[0], jid, message)
else:
self.activate_action('start-chat')
start_chat_window = app.interface.instances['start_chat']
......
......@@ -469,31 +469,13 @@ class MessageWindow(object):
def show_icon(self):
window_mode = app.interface.msg_win_mgr.mode
icon = None
if window_mode == MessageWindowMgr.ONE_MSG_WINDOW_NEVER:
ctrl = self.get_active_control()
if not ctrl:
return
icon = ctrl.get_tab_image(count_unread=False)
elif window_mode == MessageWindowMgr.ONE_MSG_WINDOW_ALWAYS:
pass # keep default icon
elif window_mode == MessageWindowMgr.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER:
pass # keep default icon
elif window_mode == MessageWindowMgr.ONE_MSG_WINDOW_PERACCT:
pass # keep default icon
elif window_mode == MessageWindowMgr.ONE_MSG_WINDOW_PERTYPE:
icon = 'org.gajim.Gajim'
if window_mode in (MessageWindowMgr.ONE_MSG_WINDOW_PERTYPE,
MessageWindowMgr.ONE_MSG_WINDOW_NEVER):
if self.type_ == 'gc':
icon = gtkgui_helpers.get_iconset_name_for('muc-active')
else:
# chat, pm
icon = 'org.gajim.Gajim'
if icon:
if isinstance(icon, GdkPixbuf.Pixbuf):
self.window.set_icon(icon)
elif isinstance(icon, str):
self.window.set_icon_name(icon)
else:
self.window.set_icon(icon.get_pixbuf())
self.window.set_icon_name(icon)
def show_title(self, urgent=True, control=None):
"""
......
......@@ -244,10 +244,12 @@ class StatusIcon:
self.popup_menus.append(account_menu_for_chat_with)
for account in accounts_list:
account_label = app.config.get_per(
'accounts', account, 'account_label')
if app.account_is_connected(account):
# for chat_with
item = Gtk.MenuItem.new_with_label(
_('using account %s') % account)
_('using account %s') % account_label)
account_menu_for_chat_with.append(item)
item.connect('activate', self.on_new_chat, account)
......@@ -288,6 +290,8 @@ class StatusIcon:
self.popup_menus.append(account_menu_for_single_message)
for account in accounts_list:
account_label = app.config.get_per(
'accounts', account, 'account_label')
if app.connections[account].is_zeroconf or \
not app.account_is_connected(account):
continue
......@@ -295,14 +299,14 @@ class StatusIcon:
connected_accounts_with_private_storage += 1
# for single message
item = Gtk.MenuItem.new_with_label(
_('using account %s') % account)
_('using account %s') % account_label)
item.connect('activate',
self.on_single_message_menuitem_activate, account)
account_menu_for_single_message.append(item)
# join gc
gc_item = Gtk.MenuItem.new_with_label(
_('using account %s') % account)
_('using account %s') % account_label)
gc_sub_menu.append(gc_item)
gc_menuitem_menu = Gtk.Menu()
app.interface.roster.add_bookmarks_list(gc_menuitem_menu,
......
......@@ -188,7 +188,10 @@ class VcardWindow:
if entry_name in ('URL_label',
'EMAIL_WORK_USERID_label',
'EMAIL_HOME_USERID_label'):
widget.set_uri('mailto:' + value)
if entry_name == 'URL_label':
widget.set_uri(value)
else:
widget.set_uri('mailto:' + value)
widget.set_label(value)
self.xml.get_object(entry_name).show()
else:
......
{
"app-id": "org.gajim.Gajim",
"runtime": "org.gnome.Platform",
"runtime-version": "3.24",
"runtime-version": "3.26",
"sdk": "org.gnome.Sdk",
"command": "gajim",
"tags": ["nightly"],
"desktop-file-name-prefix": "(Nightly) ",
"finish-args": [
/* X11 + XShm access */
"--share=ipc",
......@@ -17,12 +15,9 @@
"--filesystem=home",
"--socket=system-bus"
],
"build-options" : {
"build-options": {
"cflags": "-O2 -g",
"cxxflags": "-O2 -g",
"env": {
"PYTHON": "python3"
}
"cxxflags": "-O2 -g"
},
"cleanup": [
"/include",
......@@ -58,8 +53,8 @@
"sources": [
{
"type": "archive",
"url": "https://pypi.python.org/packages/62/ea/f41d44e0a4222fe8317ffe1fe7a5c75ec71ca233b4067850567922f8b7be/cffi-1.11.3.tar.gz",
"sha256": "8456abb0f892eb7d545f9ce94f4ba78d651365b1a59f9ce9ae7b5325a95dc698"
"url": "https://files.pythonhosted.org/packages/10/f7/3b302ff34045f25065091d40e074479d6893882faef135c96f181a57ed06/cffi-1.11.4.tar.gz",
"sha256": "df9083a992b17a28cd4251a3f5c879e0198bb26c9e808c4647e0a18739f1d11d"
}
]
},
......@@ -132,8 +127,8 @@
"sources": [
{
"type": "archive",
"url": "https://pypi.python.org/packages/41/5f/6da80400340fd48ba4ae1c673be4dc3821ac06cd9821ea60f9c7d32a009f/setuptools-38.4.0.zip",
"sha256": "6501fc32f505ec5b3ed36ec65ba48f1b975f52cf2ea101c7b73a08583fd12f75"
"url": "https://files.pythonhosted.org/packages/6c/54/f7e9cea6897636a04e74c3954f0d8335cc38f7d01e27eec98026b049a300/setuptools-38.5.1.zip",
"sha256": "6425484c08e99a98a42209c25c3d325f749230b55284d66192784f941a7e6628"
}
]
},
......@@ -257,11 +252,21 @@
/* Zeroconf support */
{
"name": "avahi",
"cleanup": [ "/bin", "/lib/avahi", "/share" ],
"cleanup": [
"/bin",
"/lib/avahi",
"/share"
],
"config-opts": [
"--with-distro=none", "--disable-qt3", "--disable-qt4",
"--disable-libdaemon", "--disable-pygtk", "--disable-gdbm",
"--disable-mono", "--disable-monodoc", "--disable-manpages"
"--with-distro=none",
"--disable-qt3",
"--disable-qt4",
"--disable-libdaemon",
"--disable-pygtk",
"--disable-gdbm",
"--disable-mono",
"--disable-monodoc",
"--disable-manpages"
],
"sources": [
{
......@@ -271,6 +276,60 @@
}
]
},
/* OMEMO support */
{
"name": "protobuf",
"ensure-writable": [
"easy-install.pth",
"setuptools.pth"
],
"buildsystem": "simple",
"build-commands": [
"python3 setup.py install --prefix=/app"
],
"sources": [
{
"type": "archive",
"url": "https://files.pythonhosted.org/packages/14/03/ff5279abda7b46e9538bfb1411d42831b7e65c460d73831ed2445649bc02/protobuf-3.5.1.tar.gz",
"sha256": "95b78959572de7d7fafa3acb718ed71f482932ddddddbd29ba8319c10639d863"
}
]
},
{
"name": "python3-axolotl-curve25519",
"ensure-writable": [
"easy-install.pth"
],
"buildsystem": "simple",
"build-commands": [
"python3 setup.py install --prefix=/app"
],
"sources": [
{
"type": "archive",
"url": "https://files.pythonhosted.org/packages/69/e0/9605cac4c83c12d0bef5c2e9992f0bcbce4fae9a252899d545ccb7dc8717/python-axolotl-curve25519-0.1.tar.gz",
"sha256": "c559f6a5bf51e869325b36bd83c14cccd7dec1c6e7599e797f9ba27a72d339c0"
}
]
},
{
"name": "python3-axolotl",
"ensure-writable": [
"easy-install.pth",
"setuptools.pth"
],
"buildsystem": "simple",
"build-commands": [
"python3 setup.py install --prefix=/app"
],
"sources": [
{
"type": "archive",
"url": "https://files.pythonhosted.org/packages/7f/9d/410ce5c2322180cae7025e52e2f91f585d2be71f30ebbcfd605d2c9a1cd5/python-axolotl-0.1.39.tar.gz",
"sha256": "9af9c937d0d05ebea414f1be79ecc7517cc3541a77101941e6a2a71bdd2b6e25"
}
]
},
{
"name": "python3-nbxmpp",
"buildsystem": "simple",
......@@ -289,12 +348,19 @@
"name": "gajim",
"buildsystem": "simple",
"build-commands": [
"pip3 install --prefix=/app --no-deps ."
"pip3 install --prefix=/app ."
],
"sources": [
{
"type": "git",
"url": "https://dev.gajim.org/gajim/gajim.git"
"url": "https://dev.gajim.org/gajim/gajim.git",
"branch": "gajim_1.0"
},
{
"type": "archive",
"url": "https://ftp.gajim.org/plugins_1/plugin_installer.zip",
"sha256": "7d5dcd9a5e05d214ca85651784bda732aac3b5c363a6e23529e6e777f9d24d42",
"dest": "gajim/data/plugins/plugin_installer"
}
]
}
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.10.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-02-08 03:05+0000\n"
"POT-Creation-Date: 2018-02-09 03:06+0000\n"
"PO-Revision-Date: 2009-08-19 23:42+0200\n"
"Last-Translator: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>\n"
"Language-Team: Belarusian <i18n@mova.org>\n"
......@@ -873,7 +873,7 @@ msgid "JID"
msgstr "JID"
#: gajim/history_manager.py:157 gajim/history_manager.py:201
#: gajim/history_window.py:104
#: gajim/history_window.py:108
msgid "Date"
msgstr "Дата"
......@@ -883,7 +883,7 @@ msgid "Nickname"
msgstr "Мянушка"
#: gajim/history_manager.py:173 gajim/history_manager.py:208
#: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
#: gajim/history_window.py:116 gajim/data/gui/xml_console_window.ui:108
msgid "Message"
msgstr "Паведамленне"
......@@ -1339,7 +1339,7 @@ msgid "Without a connection, you can not synchronise your contacts."
msgstr "Вы не можаце змяніць пароль, не злучыўшыся з серверам."
#: gajim/dialogs.py:2631 gajim/dialogs.py:2702 gajim/dialogs.py:3812
#: gajim/history_window.py:96 gajim/disco.py:865 gajim/disco.py:1692
#: gajim/history_window.py:100 gajim/disco.py:865 gajim/disco.py:1692
#: gajim/disco.py:1977
msgid "Name"
msgstr "Назва"
......@@ -1399,27 +1399,27 @@ msgid "The passwords typed in both fields must be identical."
msgstr "Паролі ў абодвух палях павінны быць аднолькавымі."
#: gajim/dialogs.py:3139 gajim/notify.py:91
#: gajim/common/connection_handlers_events.py:2789
#: gajim/common/connection_handlers_events.py:2745
msgid "Contact Signed In"
msgstr "Чалавек прыйшоў"
#: gajim/dialogs.py:3141 gajim/notify.py:91
#: gajim/common/connection_handlers_events.py:2795
#: gajim/common/connection_handlers_events.py:2751
msgid "Contact Signed Out"
msgstr "Чалавек сышоў"
#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
#: gajim/common/connection_handlers_events.py:2609
#: gajim/common/connection_handlers_events.py:2565
msgid "New Message"
msgstr "Новае паведамленне"
#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
#: gajim/common/connection_handlers_events.py:2591
#: gajim/common/connection_handlers_events.py:2547
msgid "New Single Message"
msgstr "Новае асобнае паведамленне"
#: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
#: gajim/common/connection_handlers_events.py:2597
#: gajim/common/connection_handlers_events.py:2553
msgid "New Private Message"
msgstr "Новае прыватнае паведамленне"
......@@ -1452,7 +1452,7 @@ msgid "Groupchat Invitation"
msgstr "Запрашэнне ў групавую размову"
#: gajim/dialogs.py:3155 gajim/notify.py:93
#: gajim/common/connection_handlers_events.py:2783
#: gajim/common/connection_handlers_events.py:2739
msgid "Contact Changed Status"
msgstr "Чалавек змяніў стан"
......@@ -1822,7 +1822,7 @@ msgid "%(nick)s is now known as %(new_nick)s"
msgstr "%s змяніў мянушку на %s"
#: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
#: gajim/history_window.py:550 gajim/common/connection_handlers_events.py:2735
#, python-format
msgid "%(nick)s is now %(status)s"
msgstr "%(nick)s цяпер %(status)s"
......@@ -3263,44 +3263,44 @@ msgstr ""
msgid "Disconnect from the network"
msgstr ""
#: gajim/history_window.py:327
#: gajim/history_window.py:339
#, python-format
msgid "Conversation History with %s"
msgstr "Журнал размоў %s"
#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
#: gajim/history_window.py:361 gajim/data/gui/history_window.ui:7
msgid "Conversation History"
msgstr "Журнал размоў"
#: gajim/history_window.py:374
#: gajim/history_window.py:390 gajim/history_window.py:443
msgid "Disk Error"
msgstr ""
#: gajim/history_window.py:476
#: gajim/history_window.py:546
#, python-format
msgid "%(nick)s is now %(status)s: %(status_msg)s"
msgstr "%(nick)s цяпер %(status)s: %(status_msg)s"
#: gajim/history_window.py:487
#: gajim/history_window.py:557
#, fuzzy, python-format
msgid "Error: %s"
msgstr "Памылка: %s"
#: gajim/history_window.py:489
#: gajim/history_window.py:559
msgid "Error"
msgstr ""
#: gajim/history_window.py:491
#: gajim/history_window.py:561
#, python-format
msgid "Status is now: %(status)s: %(status_msg)s"
msgstr "Цяперашні стан: %(status)s: %(status_msg)s"
#: gajim/history_window.py:494
#: gajim/history_window.py:564
#, python-format
msgid "Status is now: %(status)s"
msgstr "Цяперашні стан: %(status)s"
#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
#: gajim/history_window.py:585 gajim/conversation_textview.py:1338
#, python-format
msgid "Subject: %s\n"
msgstr "Тэма: %s\n"
......@@ -3726,7 +3726,7 @@ msgid "Error %(code)s: %(msg)s"
msgstr "%(nickname)s: %(message)s"
#: gajim/gui_interface.py:470 gajim/gui_interface.py:486
#: gajim/common/connection_handlers_events.py:1420
#: gajim/common/connection_handlers_events.py:1376
#, fuzzy, python-format
msgid "error while sending %(message)s ( %(error)s )"
msgstr "памылка адпраўкі %s ( %s )"
......@@ -5125,7 +5125,7 @@ msgstr "Канец тыдня"
msgid "Weekend!"
msgstr "Выходныя!"
#: gajim/common/connection_handlers_events.py:352
#: gajim/common/connection_handlers_events.py:350
#, python-format
msgid ""
"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
......@@ -5135,62 +5135,62 @@ msgstr ""
"Выдаліце яго з дапамогай адмысловай праграмы, напр., http://jru.jabberstudio."
"org/"
#: gajim/common/connection_handlers_events.py:877
#: gajim/common/connection_handlers_events.py:833
#, python-format
msgid "unsubscribe request from %s"
msgstr "запыт адпіскі ад %s"
#: gajim/common/connection_handlers_events.py:977
#: gajim/common/connection_handlers_events.py:933
#, fuzzy
msgid "Room has been destroyed"
msgstr "Аўтарызацыя забраная"
#: gajim/common/connection_handlers_events.py:985
#: gajim/common/connection_handlers_events.py:941
#, python-format
msgid "You can join this room instead: %s"
msgstr ""
#: gajim/common/connection_handlers_events.py:1947
#: gajim/common/connection_handlers_events.py:1903
#, python-format
msgid "Unknown SSL error: %d"
msgstr ""
#: gajim/common/connection_handlers_events.py:2593
#: gajim/common/connection_handlers_events.py:2549
#, python-format
msgid "New Single Message from %(nickname)s"
msgstr "Новае асобнае паведамленне ад %(nickname)s"
#: gajim/common/connection_handlers_events.py:2599
#: gajim/common/connection_handlers_events.py:2555
#, python-format
msgid "New Private Message from group chat %s"
msgstr "Новае прыватнае паведамленне ў групавой размове %s"
#: gajim/common/connection_handlers_events.py:2602
#: gajim/common/connection_handlers_events.py:2558
#, python-format
msgid "%(nickname)s: %(message)s"
msgstr "%(nickname)s: %(message)s"
#: gajim/common/connection_handlers_events.py:2605
#: gajim/common/connection_handlers_events.py:2561
#, fuzzy, python-format
msgid "Messaged by %(nickname)s"
msgstr "Новае паведамленне ад %(nickname)s"
#: gajim/common/connection_handlers_events.py:2611
#: gajim/common/connection_handlers_events.py:2567
#, python-format
msgid "New Message from %(nickname)s"
msgstr "Новае паведамленне ад %(nickname)s"
#: gajim/common/connection_handlers_events.py:2777
#: gajim/common/connection_handlers_events.py:2733
#, python-format
msgid "%(nick)s Changed Status"
msgstr "%(nick)s змяніў стан"
#: gajim/common/connection_handlers_events.py:2785
#: gajim/common/connection_handlers_events.py:2741
#, python-format
msgid "%(nickname)s Signed In"
msgstr "%(nickname)s прыйшоў"
#: gajim/common/connection_handlers_events.py:2791
#: gajim/common/connection_handlers_events.py:2747
#, python-format
msgid "%(nickname)s Signed Out"
msgstr "%(nickname)s сышоў"
......@@ -8107,7 +8107,7 @@ msgid "Status:"
msgstr "Стан:"
#: gajim/data/gui/zeroconf_information_window.ui:89
#: gajim/data/gui/history_window.ui:197
#: gajim/data/gui/history_window.ui:290
msgid "_Log conversation history"
msgstr "_Весці журнал размоў"
......@@ -10482,6 +10482,11 @@ msgstr "Людзі"
msgid "Passphrase"
msgstr "Пароль"
#: gajim/data/gui/history_window.ui:38
#, fuzzy
msgid "Enter name / JID of contact or groupchat"
msgstr "Імя чалавека"
#: gajim/data/gui/history_window.ui:51
#, fuzzy
msgid "Search:"
......@@ -10495,7 +10500,7 @@ msgstr ""
msgid "Only searching within selected day"
msgstr ""
#: gajim/data/gui/history_window.ui:213
#: gajim/data/gui/history_window.ui:306
#, fuzzy
msgid "_Show status changes"
msgstr "_Пісаць у журнал паведамленні аб змене стану чалавека"
......@@ -11846,10 +11851,6 @@ msgstr "Памылка злучэння"
#~ msgid "View contact information (Ctrl+I)"
#~ msgstr "сочыць за размовай"
#, fuzzy
#~ msgid "Enter JID or Contact name"
#~ msgstr "Імя чалавека"
#, fuzzy
#~ msgid "Groupchat Histories"
#~ msgstr "Групавыя размовы"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.11.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-02-08 03:05+0000\n"
"POT-Creation-Date: 2018-02-09 03:06+0000\n"
"PO-Revision-Date: 2009-08-19 23:41+0200\n"
"Last-Translator: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>\n"
"Language-Team: Belarusian Latin <i18n@mova.org>\n"
......@@ -878,7 +878,7 @@ msgid "JID"
msgstr "JID"
#: gajim/history_manager.py:157 gajim/history_manager.py:201
#: gajim/history_window.py:104
#: gajim/history_window.py:108
msgid "Date"
msgstr "Data"
......@@ -888,7 +888,7 @@ msgid "Nickname"
msgstr "Mianuška"
#: gajim/history_manager.py:173 gajim/history_manager.py:208
#: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
#: gajim/history_window.py:116 gajim/data/gui/xml_console_window.ui:108
msgid "Message"
msgstr "Paviedamleńnie"
......@@ -1339,7 +1339,7 @@ msgid "Without a connection, you can not synchronise your contacts."
msgstr "Niemahčyma źmianić parol, nie dałučyŭšysia da servera."
#: gajim/dialogs.py:2631 gajim/dialogs.py:2702 gajim/dialogs.py:3812
#: gajim/history_window.py:96 gajim/disco.py:865 gajim/disco.py:1692
#: gajim/history_window.py:100 gajim/disco.py:865 gajim/disco.py:1692
#: gajim/disco.py:1977
msgid "Name"
msgstr "Nazva"
......@@ -1399,27 +1399,27 @@ msgid "The passwords typed in both fields must be identical."
msgstr "Parolu ŭ abodvuch palach nie pavinny roźnicca."
#: gajim/dialogs.py:3139 gajim/notify.py:91
#: gajim/common/connection_handlers_events.py:2789
#: gajim/common/connection_handlers_events.py:2745
msgid "Contact Signed In"
msgstr "Kantakt dałučyŭsia"