Skip to content
This repository has been archived by the owner on Dec 28, 2021. It is now read-only.

Commit

Permalink
Merge branch '1.8-stable'
Browse files Browse the repository at this point in the history
  • Loading branch information
flynd committed Oct 28, 2013
2 parents 43ed8b6 + ea78347 commit b865be2
Show file tree
Hide file tree
Showing 25 changed files with 179 additions and 152 deletions.
11 changes: 11 additions & 0 deletions licq/doc/CHANGELOG
@@ -1,5 +1,16 @@
Change log for Licq.

New in 1.8.1
o Fixed crash when shutting down plugins
o Handle slashes in account/contact ids
o Fixed timestamp overflow problem causing CPU spin
o Build: Made Doxygen support optional
o Build: Fixed build problem with socks support
o Aosd: Update to build with GLib 2.36
o Qt4-Gui: Brought Turkish translation up to date
o Qt4-Gui: Fixed build problems with OS X


New in 1.8.0
o Fixed some memory leaks
o Removed console plugin (no longer maintained)
Expand Down
14 changes: 14 additions & 0 deletions licq/doc/README-1.8.1
@@ -0,0 +1,14 @@
LICQ v1.8.1 README
http://www.licq.org/
#Licq on irc.freenode.net

This is a bugfix release, mainly to solve some crashes and fix build problems.
This release also includes a big update of the Turkish translation.

For more information on what has changed since Licq 1.8.0, see doc/CHANGELOG.

For general information on how to build and run Licq, see doc/README.
For information about building and using the different plugins, see README or
doc/README for the respective plugins.

The Licq Team
38 changes: 19 additions & 19 deletions licq/po/be.po
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Licq\n"
"Report-Msgid-Bugs-To: licq-dev@googlegroups.com\n"
"POT-Creation-Date: 2013-08-12 17:26+0200\n"
"POT-Creation-Date: 2013-10-28 13:20+0100\n"
"PO-Revision-Date: 2008-02-25 20:37+0300\n"
"Last-Translator: Alexey Ivaniuk aka Varjat <varjat@gmail.com>\n"
"Language-Team: Belarussian language team <team@mova.org>\n"
Expand Down Expand Up @@ -440,12 +440,12 @@ msgstr "Адсутнічаю"
msgid "Backtrace (saved in %s):\n"
msgstr "Адладачная пасьлядоўнасьць (захавана ў %s):\n"

#: src/socket.cpp:582
#: src/socket.cpp:586
#, fuzzy
msgid "Cannot accept new connection, too many descriptors in use."
msgstr "Размова: Атрымана злучэньне."

#: src/socket.cpp:571
#: src/socket.cpp:575
#, c-format
msgid ""
"Cannot accept new connection:\n"
Expand All @@ -463,7 +463,7 @@ msgstr ""
msgid "Chat Request"
msgstr "Запрашэньне да размовы"

#: src/socket.cpp:320
#: src/socket.cpp:324
#, fuzzy, c-format
msgid "Connecting to %s:%i..."
msgstr "Злучэньне з %s а %s:%d."
Expand Down Expand Up @@ -603,7 +603,7 @@ msgid ""
"%s"
msgstr ""

#: src/socket.cpp:299
#: src/socket.cpp:303
#, c-format
msgid "Error when trying to resolve %s. getaddrinfo() returned %d."
msgstr ""
Expand Down Expand Up @@ -674,7 +674,7 @@ msgstr "Памылка перайменаваньня файла гісторы
msgid "Failed to retrive backtrace symbols"
msgstr ""

#: src/socket.cpp:334
#: src/socket.cpp:338
#, fuzzy
msgid "Failed to set port range for socket."
msgstr "Перадача файла: Сокет ня йснуе."
Expand All @@ -684,7 +684,7 @@ msgstr "Перадача файла: Сокет ня йснуе."
msgid "Failed to start local TCP server: %s"
msgstr "Нямагчыма стартаваць лякальны TCP-паслужнік: %s"

#: src/socket.cpp:406
#: src/socket.cpp:410
#, fuzzy, c-format
msgid ""
"Failed to start local server using IPv6 socket (falling back to IPv4):\n"
Expand Down Expand Up @@ -740,7 +740,7 @@ msgstr "HTTPS проксі вярнуў памылку з кодам: %d, тэк
msgid "Idle"
msgstr ""

#: src/inifile.cpp:229
#: src/inifile.cpp:239
#, fuzzy, c-format
msgid ""
"IniFile: I/O error, failed to create file.\n"
Expand All @@ -751,7 +751,7 @@ msgstr ""
"Файл: %s\n"
"Памылка: %i"

#: src/inifile.cpp:91 src/inifile.cpp:211
#: src/inifile.cpp:101 src/inifile.cpp:221
#, fuzzy, c-format
msgid ""
"IniFile: I/O error, failed to get file size.\n"
Expand All @@ -762,7 +762,7 @@ msgstr ""
"Файл: %s\n"
"Памылка: %i"

#: src/inifile.cpp:81
#: src/inifile.cpp:91
#, fuzzy, c-format
msgid ""
"IniFile: I/O error, failed to open file.\n"
Expand All @@ -773,7 +773,7 @@ msgstr ""
"Файл: %s\n"
"Памылка: %i"

#: src/inifile.cpp:112
#: src/inifile.cpp:122
#, fuzzy, c-format
msgid ""
"IniFile: I/O error, failed to read file.\n"
Expand All @@ -784,7 +784,7 @@ msgstr ""
"Файл: %s\n"
"Памылка: %i"

#: src/inifile.cpp:251
#: src/inifile.cpp:261
#, fuzzy, c-format
msgid ""
"IniFile: I/O error, failed to replace file.\n"
Expand All @@ -795,7 +795,7 @@ msgstr ""
"Файл: %s\n"
"Памылка: %i"

#: src/inifile.cpp:240
#: src/inifile.cpp:250
#, fuzzy, c-format
msgid ""
"IniFile: I/O error, failed to write file.\n"
Expand All @@ -806,17 +806,17 @@ msgstr ""
"Файл: %s\n"
"Памылка: %i"

#: src/inifile.cpp:532
#: src/inifile.cpp:542
#, c-format
msgid "Internal Error: IniFile::get, key=%s, data.type=%s"
msgstr ""

#: src/inifile.cpp:669
#: src/inifile.cpp:679
#, c-format
msgid "Internal Error: IniFile::set, key=%s, data.type=%s"
msgstr ""

#: src/socket.cpp:171
#: src/socket.cpp:175
msgid "Internal error"
msgstr "Унутраная памылка"

Expand Down Expand Up @@ -955,7 +955,7 @@ msgstr "Ніколі"
msgid "New Email from"
msgstr "Зьвесткі аб пошце"

#: src/socket.cpp:163
#: src/socket.cpp:167
msgid "No error detected"
msgstr "Памылкі ня знойдзены"

Expand Down Expand Up @@ -1086,12 +1086,12 @@ msgstr ""
msgid "SMS"
msgstr "СМС"

#: src/socket.cpp:765
#: src/socket.cpp:769
#, c-format
msgid "SSL_connect error %d, SSL_%d"
msgstr ""

#: src/socket.cpp:761
#: src/socket.cpp:765
#, c-format
msgid "SSL_connect error = %lx, %s:%i"
msgstr ""
Expand Down
38 changes: 19 additions & 19 deletions licq/po/de.po
Expand Up @@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: licq-dev@googlegroups.com\n"
"POT-Creation-Date: 2013-08-12 17:26+0200\n"
"POT-Creation-Date: 2013-10-28 13:20+0100\n"
"PO-Revision-Date: 2010-09-20 22:18+0200\n"
"Last-Translator: Arne Schmitz <arne.schmitz@gmx.net>\n"
"Language-Team: Deutsch <de@li.org>\n"
Expand Down Expand Up @@ -441,12 +441,12 @@ msgstr "Abwesend"
msgid "Backtrace (saved in %s):\n"
msgstr "Rückverfolgung (gespeichert in %s):\n"

#: src/socket.cpp:582
#: src/socket.cpp:586
msgid "Cannot accept new connection, too many descriptors in use."
msgstr ""
"Kann neue Verbindung nicht annehmen, zu viele Deskriptoren in Benutzung."

#: src/socket.cpp:571
#: src/socket.cpp:575
#, c-format
msgid ""
"Cannot accept new connection:\n"
Expand All @@ -466,7 +466,7 @@ msgstr ""
msgid "Chat Request"
msgstr "Chatanfrage"

#: src/socket.cpp:320
#: src/socket.cpp:324
#, c-format
msgid "Connecting to %s:%i..."
msgstr "Verbindungsaufbau zu %s:%i..."
Expand Down Expand Up @@ -604,7 +604,7 @@ msgid ""
"%s"
msgstr ""

#: src/socket.cpp:299
#: src/socket.cpp:303
#, c-format
msgid "Error when trying to resolve %s. getaddrinfo() returned %d."
msgstr ""
Expand Down Expand Up @@ -674,7 +674,7 @@ msgstr "Konnte Datei nicht lesen (%s): %s."
msgid "Failed to retrive backtrace symbols"
msgstr "Konnte Backtrace-Symbole nicht laden"

#: src/socket.cpp:334
#: src/socket.cpp:338
msgid "Failed to set port range for socket."
msgstr "Konnte Port für Socket nicht festlegen."

Expand All @@ -683,7 +683,7 @@ msgstr "Konnte Port für Socket nicht festlegen."
msgid "Failed to start local TCP server: %s"
msgstr "Lokaler TCP-Server lies sich nicht starten: %s"

#: src/socket.cpp:406
#: src/socket.cpp:410
#, c-format
msgid ""
"Failed to start local server using IPv6 socket (falling back to IPv4):\n"
Expand Down Expand Up @@ -738,7 +738,7 @@ msgstr "HTTPS-Proxy gab einen Fehlercode zurück: %d, Fehlerzeichenkette: %s"
msgid "Idle"
msgstr "Untätig"

#: src/inifile.cpp:229
#: src/inifile.cpp:239
#, c-format
msgid ""
"IniFile: I/O error, failed to create file.\n"
Expand All @@ -749,7 +749,7 @@ msgstr ""
"Datei: %s\n"
"Fehler: %i"

#: src/inifile.cpp:91 src/inifile.cpp:211
#: src/inifile.cpp:101 src/inifile.cpp:221
#, c-format
msgid ""
"IniFile: I/O error, failed to get file size.\n"
Expand All @@ -760,7 +760,7 @@ msgstr ""
"Datei: %s\n"
"Fehlercode: %i"

#: src/inifile.cpp:81
#: src/inifile.cpp:91
#, c-format
msgid ""
"IniFile: I/O error, failed to open file.\n"
Expand All @@ -771,7 +771,7 @@ msgstr ""
"Datei: %s\n"
"Fehler: %i"

#: src/inifile.cpp:112
#: src/inifile.cpp:122
#, c-format
msgid ""
"IniFile: I/O error, failed to read file.\n"
Expand All @@ -782,7 +782,7 @@ msgstr ""
"Datei: %s\n"
"Fehler: %i"

#: src/inifile.cpp:251
#: src/inifile.cpp:261
#, c-format
msgid ""
"IniFile: I/O error, failed to replace file.\n"
Expand All @@ -793,7 +793,7 @@ msgstr ""
"Datei: %s\n"
"Fehler: %i"

#: src/inifile.cpp:240
#: src/inifile.cpp:250
#, c-format
msgid ""
"IniFile: I/O error, failed to write file.\n"
Expand All @@ -804,17 +804,17 @@ msgstr ""
"Datei: %s\n"
"Fehler: %i"

#: src/inifile.cpp:532
#: src/inifile.cpp:542
#, c-format
msgid "Internal Error: IniFile::get, key=%s, data.type=%s"
msgstr "Interner Fehler: IniFile::get, key=%s, data.type=%s"

#: src/inifile.cpp:669
#: src/inifile.cpp:679
#, c-format
msgid "Internal Error: IniFile::set, key=%s, data.type=%s"
msgstr "Interner Fehler: IniFile::set, key=%s, data.type=%s"

#: src/socket.cpp:171
#: src/socket.cpp:175
msgid "Internal error"
msgstr "Interner Fehler"

Expand Down Expand Up @@ -947,7 +947,7 @@ msgstr "Nie"
msgid "New Email from"
msgstr "Neue Email von"

#: src/socket.cpp:163
#: src/socket.cpp:167
msgid "No error detected"
msgstr "Kein Fehler entdeckt"

Expand Down Expand Up @@ -1080,12 +1080,12 @@ msgstr ""
msgid "SMS"
msgstr "SMS"

#: src/socket.cpp:765
#: src/socket.cpp:769
#, c-format
msgid "SSL_connect error %d, SSL_%d"
msgstr "SSL_connct Fehler %d, SSL_%d"

#: src/socket.cpp:761
#: src/socket.cpp:765
#, c-format
msgid "SSL_connect error = %lx, %s:%i"
msgstr "SSL_connet Fehler = %lx, %s:%i"
Expand Down

0 comments on commit b865be2

Please sign in to comment.