[arch-commits] Commit in gajim/trunk (PKGBUILD gajim-drill.patch)
Eric Bélanger
eric at archlinux.org
Sun Oct 5 20:19:51 UTC 2014
Date: Sunday, October 5, 2014 @ 22:19:51
Author: eric
Revision: 223891
upgpkg: gajim 0.16-1
Upstream update, Update patch
Modified:
gajim/trunk/PKGBUILD
gajim/trunk/gajim-drill.patch
-------------------+
PKGBUILD | 13 -
gajim-drill.patch | 468 ++++++++++++++++++++++++++++------------------------
2 files changed, 265 insertions(+), 216 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-10-05 19:56:43 UTC (rev 223890)
+++ PKGBUILD 2014-10-05 20:19:51 UTC (rev 223891)
@@ -2,8 +2,8 @@
# Maintainer: Eric Bélanger <eric at archlinux.org>
pkgname=gajim
-pkgver=0.15.4
-pkgrel=2
+pkgver=0.16
+pkgrel=1
pkgdesc="A full featured and easy to use Jabber client"
arch=('any')
url="http://www.gajim.org/"
@@ -22,10 +22,9 @@
'python2-docutils: for RST generator support'
'gupnp-igd: for UPnP-IGD support')
install=gajim.install
-DLAGENTS=('http::/usr/bin/curl -kfLC - --retry 3 --retry-delay 3 -o %o %u')
-source=(http://www.gajim.org/downloads/${pkgver%.*}/gajim-${pkgver}.tar.bz2 gajim-drill.patch)
-sha1sums=('ffa597e1de7aaf9ca0120fda89fd2ff279068956'
- 'aba73d11ca2594e9f1c5c88734273f80ae79e7ad')
+source=(http://www.gajim.org/downloads/${pkgver}/gajim-${pkgver}.tar.bz2 gajim-drill.patch)
+sha1sums=('d2983f7a4e0a33d1a4eb2e603207125e277aa756'
+ 'e4c06bdbaf23df6b7e6090dd52425a86f3a44358')
prepare() {
cd ${pkgname}-${pkgver}
@@ -41,6 +40,4 @@
package() {
cd ${pkgname}-${pkgver}
make DESTDIR="${pkgdir}" install
- # FS#38723
- rm "${pkgdir}"/usr/share/gajim/data/other/cacerts.pem
}
Modified: gajim-drill.patch
===================================================================
--- gajim-drill.patch 2014-10-05 19:56:43 UTC (rev 223890)
+++ gajim-drill.patch 2014-10-05 20:19:51 UTC (rev 223891)
@@ -1,7 +1,7 @@
-diff -Naur old/po/be.po new/po/be.po
---- old/po/be.po 2013-03-18 22:41:50.747592943 +1100
-+++ new/po/be.po 2013-03-18 22:46:19.578638708 +1100
-@@ -8491,11 +8491,11 @@
+diff -Naur gajim-0.16-orig/po/be at latin.po gajim-0.16/po/be at latin.po
+--- gajim-0.16-orig/po/be at latin.po 2014-10-05 16:07:08.910296643 -0400
++++ gajim-0.16/po/be at latin.po 2014-10-05 16:07:30.183595453 -0400
+@@ -8757,11 +8757,11 @@
msgstr ""
#: ../src/features_window.py:80
@@ -15,10 +15,10 @@
msgstr ""
#: ../src/features_window.py:82
-diff -Naur old/po/be at latin.po new/po/be at latin.po
---- old/po/be at latin.po 2013-03-18 22:41:50.750926289 +1100
-+++ new/po/be at latin.po 2013-03-18 22:46:19.588638750 +1100
-@@ -8515,11 +8515,11 @@
+diff -Naur gajim-0.16-orig/po/be.po gajim-0.16/po/be.po
+--- gajim-0.16-orig/po/be.po 2014-10-05 16:07:08.920296627 -0400
++++ gajim-0.16/po/be.po 2014-10-05 16:07:30.186928779 -0400
+@@ -8732,11 +8732,11 @@
msgstr ""
#: ../src/features_window.py:80
@@ -32,10 +32,10 @@
msgstr ""
#: ../src/features_window.py:82
-diff -Naur old/po/bg.po new/po/bg.po
---- old/po/bg.po 2013-03-18 22:41:50.750926289 +1100
-+++ new/po/bg.po 2013-03-18 22:46:19.601972134 +1100
-@@ -8412,11 +8412,11 @@
+diff -Naur gajim-0.16-orig/po/bg.po gajim-0.16/po/bg.po
+--- gajim-0.16-orig/po/bg.po 2014-10-05 16:07:08.910296643 -0400
++++ gajim-0.16/po/bg.po 2014-10-05 16:07:30.190262105 -0400
+@@ -8669,11 +8669,11 @@
msgstr "Възможност за свързване към сървъри, които използват записи SRV."
#: ../src/features_window.py:80
@@ -50,10 +50,10 @@
msgstr ""
#: ../src/features_window.py:82
-diff -Naur old/po/br.po new/po/br.po
---- old/po/br.po 2013-03-18 22:41:50.750926289 +1100
-+++ new/po/br.po 2013-03-18 22:46:19.615305519 +1100
-@@ -8494,11 +8494,11 @@
+diff -Naur gajim-0.16-orig/po/br.po gajim-0.16/po/br.po
+--- gajim-0.16-orig/po/br.po 2014-10-05 16:07:08.910296643 -0400
++++ gajim-0.16/po/br.po 2014-10-05 16:07:30.193595433 -0400
+@@ -8723,11 +8723,11 @@
msgstr ""
#: ../src/features_window.py:80
@@ -67,10 +67,10 @@
msgstr ""
#: ../src/features_window.py:82
-diff -Naur old/po/cs.po new/po/cs.po
---- old/po/cs.po 2013-03-18 22:41:50.750926289 +1100
-+++ new/po/cs.po 2013-03-18 22:46:19.628638904 +1100
-@@ -8325,12 +8325,12 @@
+diff -Naur gajim-0.16-orig/po/cs.po gajim-0.16/po/cs.po
+--- gajim-0.16-orig/po/cs.po 2014-10-05 16:07:08.916963299 -0400
++++ gajim-0.16/po/cs.po 2014-10-05 16:07:30.196928762 -0400
+@@ -8594,12 +8594,12 @@
msgstr "Schopnost připojit se na servery používající SRV záznamy."
#: ../src/features_window.py:80
@@ -87,10 +87,10 @@
#: ../src/features_window.py:82
msgid "Spell Checker"
-diff -Naur old/po/da.po new/po/da.po
---- old/po/da.po 2013-03-18 22:41:50.750926289 +1100
-+++ new/po/da.po 2013-03-18 22:46:19.638638942 +1100
-@@ -8312,12 +8312,12 @@
+diff -Naur gajim-0.16-orig/po/da.po gajim-0.16/po/da.po
+--- gajim-0.16-orig/po/da.po 2014-10-05 16:07:08.923629956 -0400
++++ gajim-0.16/po/da.po 2014-10-05 16:07:30.196928762 -0400
+@@ -8623,12 +8623,12 @@
msgstr "Evnen til at tilslutte til servere som bruger SRV poster."
#: ../src/features_window.py:80
@@ -107,10 +107,10 @@
#: ../src/features_window.py:82
msgid "Spell Checker"
-diff -Naur old/po/de.po new/po/de.po
---- old/po/de.po 2013-03-18 22:41:50.750926289 +1100
-+++ new/po/de.po 2013-03-18 22:46:19.651972327 +1100
-@@ -8448,12 +8448,12 @@
+diff -Naur gajim-0.16-orig/po/de.po gajim-0.16/po/de.po
+--- gajim-0.16-orig/po/de.po 2014-10-05 16:07:08.910296643 -0400
++++ gajim-0.16/po/de.po 2014-10-05 16:07:30.200262090 -0400
+@@ -8723,12 +8723,12 @@
msgstr "Ermöglicht Verbindungen zu Servern, die SRV-DNS-Einträge verwenden."
#: ../src/features_window.py:80
@@ -127,10 +127,10 @@
#: ../src/features_window.py:82
msgid "Spell Checker"
-diff -Naur old/po/el.po new/po/el.po
---- old/po/el.po 2013-03-18 22:41:50.750926289 +1100
-+++ new/po/el.po 2013-03-18 22:46:19.661972366 +1100
-@@ -8564,11 +8564,11 @@
+diff -Naur gajim-0.16-orig/po/el.po gajim-0.16/po/el.po
+--- gajim-0.16-orig/po/el.po 2014-10-05 16:07:08.913629972 -0400
++++ gajim-0.16/po/el.po 2014-10-05 16:07:30.203595419 -0400
+@@ -8803,11 +8803,11 @@
msgstr ""
#: ../src/features_window.py:80
@@ -144,10 +144,10 @@
msgstr ""
#: ../src/features_window.py:82
-diff -Naur old/po/en_GB.po new/po/en_GB.po
---- old/po/en_GB.po 2013-03-18 22:41:50.750926289 +1100
-+++ new/po/en_GB.po 2013-03-18 22:46:19.671972404 +1100
-@@ -8242,12 +8242,12 @@
+diff -Naur gajim-0.16-orig/po/en_GB.po gajim-0.16/po/en_GB.po
+--- gajim-0.16-orig/po/en_GB.po 2014-10-05 16:07:08.910296643 -0400
++++ gajim-0.16/po/en_GB.po 2014-10-05 16:07:30.203595419 -0400
+@@ -8565,12 +8565,12 @@
msgstr "Ability to connect to servers which are using SRV records."
#: ../src/features_window.py:80
@@ -164,10 +164,10 @@
#: ../src/features_window.py:82
msgid "Spell Checker"
-diff -Naur old/po/eo.po new/po/eo.po
---- old/po/eo.po 2013-03-18 22:41:50.750926289 +1100
-+++ new/po/eo.po 2013-03-18 22:46:19.685305789 +1100
-@@ -8486,11 +8486,11 @@
+diff -Naur gajim-0.16-orig/po/eo.po gajim-0.16/po/eo.po
+--- gajim-0.16-orig/po/eo.po 2014-10-05 16:07:08.920296627 -0400
++++ gajim-0.16/po/eo.po 2014-10-05 16:07:30.206928746 -0400
+@@ -8724,11 +8724,11 @@
msgstr ""
#: ../src/features_window.py:80
@@ -181,10 +181,10 @@
msgstr ""
#: ../src/features_window.py:82
-diff -Naur old/po/es.po new/po/es.po
---- old/po/es.po 2013-03-18 22:41:50.750926289 +1100
-+++ new/po/es.po 2013-03-18 22:46:19.695305827 +1100
-@@ -8303,12 +8303,12 @@
+diff -Naur gajim-0.16-orig/po/es.po gajim-0.16/po/es.po
+--- gajim-0.16-orig/po/es.po 2014-10-05 16:07:08.916963299 -0400
++++ gajim-0.16/po/es.po 2014-10-05 16:07:30.210262074 -0400
+@@ -8534,12 +8534,12 @@
msgstr "Posibilidad de conectar a servidores que usen registros SRV"
#: ../src/features_window.py:80
@@ -201,10 +201,10 @@
#: ../src/features_window.py:82
msgid "Spell Checker"
-diff -Naur old/po/eu.po new/po/eu.po
---- old/po/eu.po 2013-03-18 22:41:50.750926289 +1100
-+++ new/po/eu.po 2013-03-18 22:46:19.708639212 +1100
-@@ -8512,11 +8512,11 @@
+diff -Naur gajim-0.16-orig/po/eu.po gajim-0.16/po/eu.po
+--- gajim-0.16-orig/po/eu.po 2014-10-05 16:07:08.913629972 -0400
++++ gajim-0.16/po/eu.po 2014-10-05 16:07:30.210262074 -0400
+@@ -8744,11 +8744,11 @@
msgstr ""
#: ../src/features_window.py:80
@@ -218,10 +218,10 @@
msgstr ""
#: ../src/features_window.py:82
-diff -Naur old/po/fr.po new/po/fr.po
---- old/po/fr.po 2013-03-18 22:41:50.750926289 +1100
-+++ new/po/fr.po 2013-03-18 22:46:19.718639251 +1100
-@@ -8402,12 +8402,12 @@
+diff -Naur gajim-0.16-orig/po/fr.po gajim-0.16/po/fr.po
+--- gajim-0.16-orig/po/fr.po 2014-10-05 16:07:08.920296627 -0400
++++ gajim-0.16/po/fr.po 2014-10-05 16:07:30.213595402 -0400
+@@ -8618,12 +8618,12 @@
"Possibilité de se connecter à des serveurs qui utilisent des entrées SRV."
#: ../src/features_window.py:80
@@ -238,10 +238,10 @@
#: ../src/features_window.py:82
msgid "Spell Checker"
-diff -Naur old/po/gl.po new/po/gl.po
---- old/po/gl.po 2013-03-18 22:41:50.754259636 +1100
-+++ new/po/gl.po 2013-03-18 22:46:19.731972635 +1100
-@@ -8540,11 +8540,11 @@
+diff -Naur gajim-0.16-orig/po/gl.po gajim-0.16/po/gl.po
+--- gajim-0.16-orig/po/gl.po 2014-10-05 16:07:08.916963299 -0400
++++ gajim-0.16/po/gl.po 2014-10-05 16:07:30.216928729 -0400
+@@ -8773,11 +8773,11 @@
msgstr ""
#: ../src/features_window.py:80
@@ -255,10 +255,10 @@
msgstr ""
#: ../src/features_window.py:82
-diff -Naur old/po/he.po new/po/he.po
---- old/po/he.po 2013-03-18 22:41:50.754259636 +1100
-+++ new/po/he.po 2013-03-18 22:46:19.741972674 +1100
-@@ -8825,12 +8825,12 @@
+diff -Naur gajim-0.16-orig/po/he.po gajim-0.16/po/he.po
+--- gajim-0.16-orig/po/he.po 2014-10-05 16:07:08.913629972 -0400
++++ gajim-0.16/po/he.po 2014-10-05 16:07:30.216928729 -0400
+@@ -8758,12 +8758,12 @@
msgstr "יכולת להתחבר אל שרתים המשתמשים ברשומות SRV."
#: ../src/features_window.py:80
@@ -269,16 +269,16 @@
#: ../src/features_window.py:81
-msgid "Requires nslookup to use SRV records."
--msgstr "יש צורך בהתקנת nslookup גדי לעשות שימוש ברשומות SRV."
+-msgstr "יש צורך בהתקנת nslookup כדי לעשות שימוש ברשומות SRV."
+msgid "Requires drill to use SRV records."
-+msgstr "יש צורך בהתקנת drill גדי לעשות שימוש ברשומות SRV."
++msgstr "יש צורך בהתקנת drill כדי לעשות שימוש ברשומות SRV."
#: ../src/features_window.py:82
msgid "Spell Checker"
-diff -Naur old/po/hr.po new/po/hr.po
---- old/po/hr.po 2013-03-18 22:41:50.754259636 +1100
-+++ new/po/hr.po 2013-03-18 22:46:19.755306058 +1100
-@@ -8344,12 +8344,12 @@
+diff -Naur gajim-0.16-orig/po/hr.po gajim-0.16/po/hr.po
+--- gajim-0.16-orig/po/hr.po 2014-10-05 16:07:08.913629972 -0400
++++ gajim-0.16/po/hr.po 2014-10-05 16:07:30.220262057 -0400
+@@ -8619,12 +8619,12 @@
msgstr "Mogućnost spajanja na poslužitelje koji koriste SRV spise."
#: ../src/features_window.py:80
@@ -295,30 +295,30 @@
#: ../src/features_window.py:82
msgid "Spell Checker"
-diff -Naur old/po/hu.po new/po/hu.po
---- old/po/hu.po 2013-03-18 22:41:50.754259636 +1100
-+++ new/po/hu.po 2013-03-18 22:46:19.765306097 +1100
-@@ -7591,12 +7591,12 @@
- msgstr "Képesség hogy SRV bejegyzéseket használó szerverekhez lehessen csatlakozni."
+diff -Naur gajim-0.16-orig/po/hu.po gajim-0.16/po/hu.po
+--- gajim-0.16-orig/po/hu.po 2014-10-05 16:07:08.916963299 -0400
++++ gajim-0.16/po/hu.po 2014-10-05 16:07:30.220262057 -0400
+@@ -8757,12 +8757,12 @@
+ "Képesség hogy SRV bejegyzéseket használó szerverekhez lehessen csatlakozni."
- #: ../src/features_window.py:79
+ #: ../src/features_window.py:80
-msgid "Requires dnsutils."
-msgstr "dnsutils szükséges hozzá."
+msgid "Requires ldns."
+msgstr "ldns szükséges hozzá."
- #: ../src/features_window.py:80
+ #: ../src/features_window.py:81
-msgid "Requires nslookup to use SRV records."
-msgstr "nslookup szükséges hogy SRV bejegyzéseket lehessen használni."
+msgid "Requires drill to use SRV records."
+msgstr "drill szükséges hogy SRV bejegyzéseket lehessen használni."
- #: ../src/features_window.py:81
+ #: ../src/features_window.py:82
msgid "Spell Checker"
-diff -Naur old/po/it.po new/po/it.po
---- old/po/it.po 2013-03-18 22:41:50.754259636 +1100
-+++ new/po/it.po 2013-03-18 22:46:19.775306135 +1100
-@@ -8308,12 +8308,12 @@
+diff -Naur gajim-0.16-orig/po/it.po gajim-0.16/po/it.po
+--- gajim-0.16-orig/po/it.po 2014-10-05 16:07:08.920296627 -0400
++++ gajim-0.16/po/it.po 2014-10-05 16:07:30.223595386 -0400
+@@ -8608,12 +8608,12 @@
msgstr "Possibilità di connettersi ai server che usano record SRV."
#: ../src/features_window.py:80
@@ -335,10 +335,10 @@
#: ../src/features_window.py:82
msgid "Spell Checker"
-diff -Naur old/po/ja.po new/po/ja.po
---- old/po/ja.po 2013-03-18 22:41:50.754259636 +1100
-+++ new/po/ja.po 2013-03-18 22:46:19.785306174 +1100
-@@ -8274,12 +8274,12 @@
+diff -Naur gajim-0.16-orig/po/ja.po gajim-0.16/po/ja.po
+--- gajim-0.16-orig/po/ja.po 2014-10-05 16:07:08.916963299 -0400
++++ gajim-0.16/po/ja.po 2014-10-05 16:07:30.226928714 -0400
+@@ -8491,12 +8491,12 @@
msgstr "SRV レコードを使うサーバーとの接続を可能にします。"
#: ../src/features_window.py:80
@@ -355,10 +355,10 @@
#: ../src/features_window.py:82
msgid "Spell Checker"
-diff -Naur old/po/kk.po new/po/kk.po
---- old/po/kk.po 2013-03-18 22:41:50.754259636 +1100
-+++ new/po/kk.po 2013-03-18 22:46:19.795306213 +1100
-@@ -8281,12 +8281,12 @@
+diff -Naur gajim-0.16-orig/po/kk.po gajim-0.16/po/kk.po
+--- gajim-0.16-orig/po/kk.po 2014-10-05 16:07:08.916963299 -0400
++++ gajim-0.16/po/kk.po 2014-10-05 16:07:30.226928714 -0400
+@@ -8537,12 +8537,12 @@
msgstr "Серверлерге SRV жазбасын қолданып байланыс орнату мүмкіндігі."
#: ../src/features_window.py:80
@@ -375,10 +375,10 @@
#: ../src/features_window.py:82
msgid "Spell Checker"
-diff -Naur old/po/lt.po new/po/lt.po
---- old/po/lt.po 2013-03-18 22:41:50.754259636 +1100
-+++ new/po/lt.po 2013-03-18 22:46:19.808639597 +1100
-@@ -8111,11 +8111,11 @@
+diff -Naur gajim-0.16-orig/po/lt.po gajim-0.16/po/lt.po
+--- gajim-0.16-orig/po/lt.po 2014-10-05 16:07:08.913629972 -0400
++++ gajim-0.16/po/lt.po 2014-10-05 16:07:30.230262041 -0400
+@@ -8363,11 +8363,11 @@
msgstr ""
#: ../src/features_window.py:80
@@ -392,10 +392,10 @@
msgstr ""
#: ../src/features_window.py:82
-diff -Naur old/po/nb.po new/po/nb.po
---- old/po/nb.po 2013-03-18 22:41:50.754259636 +1100
-+++ new/po/nb.po 2013-03-18 22:46:19.818639636 +1100
-@@ -8325,12 +8325,12 @@
+diff -Naur gajim-0.16-orig/po/nb.po gajim-0.16/po/nb.po
+--- gajim-0.16-orig/po/nb.po 2014-10-05 16:07:08.920296627 -0400
++++ gajim-0.16/po/nb.po 2014-10-05 16:07:30.230262041 -0400
+@@ -8596,12 +8596,12 @@
msgstr "Evne til å koble til servere som bruker SRV records."
#: ../src/features_window.py:80
@@ -412,10 +412,10 @@
#: ../src/features_window.py:82
msgid "Spell Checker"
-diff -Naur old/po/nl.po new/po/nl.po
---- old/po/nl.po 2013-03-18 22:41:50.754259636 +1100
-+++ new/po/nl.po 2013-03-18 22:46:19.831973020 +1100
-@@ -8535,11 +8535,11 @@
+diff -Naur gajim-0.16-orig/po/nl.po gajim-0.16/po/nl.po
+--- gajim-0.16-orig/po/nl.po 2014-10-05 16:07:08.910296643 -0400
++++ gajim-0.16/po/nl.po 2014-10-05 16:07:30.233595369 -0400
+@@ -8767,11 +8767,11 @@
msgstr ""
#: ../src/features_window.py:80
@@ -429,10 +429,10 @@
msgstr ""
#: ../src/features_window.py:82
-diff -Naur old/po/no.po new/po/no.po
---- old/po/no.po 2013-03-18 22:41:50.754259636 +1100
-+++ new/po/no.po 2013-03-18 22:46:19.841973058 +1100
-@@ -8325,12 +8325,12 @@
+diff -Naur gajim-0.16-orig/po/no.po gajim-0.16/po/no.po
+--- gajim-0.16-orig/po/no.po 2014-10-05 16:07:08.913629972 -0400
++++ gajim-0.16/po/no.po 2014-10-05 16:07:30.233595369 -0400
+@@ -8596,12 +8596,12 @@
msgstr "Evne til å koble til servere som bruker SRV records."
#: ../src/features_window.py:80
@@ -449,30 +449,50 @@
#: ../src/features_window.py:82
msgid "Spell Checker"
-diff -Naur old/po/pl.po new/po/pl.po
---- old/po/pl.po 2013-03-18 22:41:50.754259636 +1100
-+++ new/po/pl.po 2013-03-18 22:46:19.855306443 +1100
-@@ -8337,12 +8337,12 @@
- msgstr "Możliwość połączenia z serwerami, które używają rekordów SRV."
+diff -Naur gajim-0.16-orig/po/pl.po gajim-0.16/po/pl.po
+--- gajim-0.16-orig/po/pl.po 2014-10-05 16:07:08.913629972 -0400
++++ gajim-0.16/po/pl.po 2014-10-05 16:07:30.236928698 -0400
+@@ -8280,12 +8280,12 @@
+ msgstr "Możliwość połączenia z serwerami, które używają rekordów SRV."
+
+ #: ../src/features_window.py:80
+-msgid "Requires dnsutils."
+-msgstr "Wymaga dnsutils."
++msgid "Requires ldns."
++msgstr "Wymaga ldns."
+
+ #: ../src/features_window.py:81
+-msgid "Requires nslookup to use SRV records."
+-msgstr "Wymaga nslookup."
++msgid "Requires drill to use SRV records."
++msgstr "Wymaga drill."
+
+ #: ../src/features_window.py:82
+ msgid "Spell Checker"
+diff -Naur gajim-0.16-orig/po/pt_BR.po gajim-0.16/po/pt_BR.po
+--- gajim-0.16-orig/po/pt_BR.po 2014-10-05 16:07:08.916963299 -0400
++++ gajim-0.16/po/pt_BR.po 2014-10-05 16:07:30.240262025 -0400
+@@ -8644,12 +8644,12 @@
+ msgstr "Habilidade de conectar a servidores que estão usando registros SRV."
#: ../src/features_window.py:80
-msgid "Requires dnsutils."
--msgstr "Wymaga dnsutils."
+-msgstr "Requer dnsutils."
+msgid "Requires ldns."
-+msgstr "Wymaga ldns."
++msgstr "Requer ldns."
#: ../src/features_window.py:81
-msgid "Requires nslookup to use SRV records."
--msgstr "Wymaga nslookup."
+-msgstr "Requer nslookup para usar registros SRV."
+msgid "Requires drill to use SRV records."
-+msgstr "Wymaga drill."
++msgstr "Requer drill para usar registros SRV."
#: ../src/features_window.py:82
msgid "Spell Checker"
-diff -Naur old/po/pt.po new/po/pt.po
---- old/po/pt.po 2013-03-18 22:41:50.754259636 +1100
-+++ new/po/pt.po 2013-03-18 22:46:19.865306482 +1100
-@@ -8510,11 +8510,11 @@
+diff -Naur gajim-0.16-orig/po/pt.po gajim-0.16/po/pt.po
+--- gajim-0.16-orig/po/pt.po 2014-10-05 16:07:08.916963299 -0400
++++ gajim-0.16/po/pt.po 2014-10-05 16:07:30.240262025 -0400
+@@ -8742,11 +8742,11 @@
msgstr ""
#: ../src/features_window.py:80
@@ -486,30 +506,10 @@
msgstr ""
#: ../src/features_window.py:82
-diff -Naur old/po/pt_BR.po new/po/pt_BR.po
---- old/po/pt_BR.po 2013-03-18 22:41:50.757592982 +1100
-+++ new/po/pt_BR.po 2013-03-18 22:46:19.878639867 +1100
-@@ -8331,12 +8331,12 @@
- msgstr "Habilidade de conectar a servidores que estão usando registros SRV."
-
- #: ../src/features_window.py:80
--msgid "Requires dnsutils."
--msgstr "Requer dnsutils."
-+msgid "Requires ldns."
-+msgstr "Requer ldns."
-
- #: ../src/features_window.py:81
--msgid "Requires nslookup to use SRV records."
--msgstr "Requer nslookup para usar registros SRV."
-+msgid "Requires drill to use SRV records."
-+msgstr "Requer drill para usar registros SRV."
-
- #: ../src/features_window.py:82
- msgid "Spell Checker"
-diff -Naur old/po/ru.po new/po/ru.po
---- old/po/ru.po 2013-03-18 22:41:50.757592982 +1100
-+++ new/po/ru.po 2013-03-18 22:46:19.888639905 +1100
-@@ -8285,12 +8285,12 @@
+diff -Naur gajim-0.16-orig/po/ru.po gajim-0.16/po/ru.po
+--- gajim-0.16-orig/po/ru.po 2014-10-05 16:07:08.920296627 -0400
++++ gajim-0.16/po/ru.po 2014-10-05 16:07:30.243595353 -0400
+@@ -8562,12 +8562,12 @@
msgstr "Возможность соединяться с серверами, использующими SRV записи."
#: ../src/features_window.py:80
@@ -526,10 +526,10 @@
#: ../src/features_window.py:82
msgid "Spell Checker"
-diff -Naur old/po/sk.po new/po/sk.po
---- old/po/sk.po 2013-03-18 22:41:50.757592982 +1100
-+++ new/po/sk.po 2013-03-18 22:46:19.901973290 +1100
-@@ -8220,12 +8220,12 @@
+diff -Naur gajim-0.16-orig/po/sk.po gajim-0.16/po/sk.po
+--- gajim-0.16-orig/po/sk.po 2014-10-05 16:07:08.910296643 -0400
++++ gajim-0.16/po/sk.po 2014-10-05 16:07:30.243595353 -0400
+@@ -8490,12 +8490,12 @@
msgstr "Schopnosť pripojiť sa k serverom, ktoré používajú SRV protokoly."
#: ../src/features_window.py:80
@@ -546,50 +546,50 @@
#: ../src/features_window.py:82
msgid "Spell Checker"
-diff -Naur old/po/sr.po new/po/sr.po
---- old/po/sr.po 2013-03-18 22:41:50.757592982 +1100
-+++ new/po/sr.po 2013-03-18 22:46:19.911973328 +1100
-@@ -8321,12 +8321,12 @@
- msgstr "Даје могућност конекције на сервере који користе SRV записе."
+diff -Naur gajim-0.16-orig/po/sr at Latn.po gajim-0.16/po/sr at Latn.po
+--- gajim-0.16-orig/po/sr at Latn.po 2014-10-05 16:07:08.910296643 -0400
++++ gajim-0.16/po/sr at Latn.po 2014-10-05 16:07:30.246928681 -0400
+@@ -8604,12 +8604,12 @@
+ msgstr "Daje mogućnost konekcije na servere koji koriste SRV zapise."
#: ../src/features_window.py:80
-msgid "Requires dnsutils."
--msgstr "Захтева dnsutils."
+-msgstr "Zahteva dnsutils."
+msgid "Requires ldns."
-+msgstr "Захтева ldns."
++msgstr "Zahteva ldns."
#: ../src/features_window.py:81
-msgid "Requires nslookup to use SRV records."
--msgstr "Захтева nslookup да бисте користили SRV записе."
+-msgstr "Zahteva nslookup da biste koristili SRV zapise."
+msgid "Requires drill to use SRV records."
-+msgstr "Захтева drill да бисте користили SRV записе."
++msgstr "Zahteva drill da biste koristili SRV zapise."
#: ../src/features_window.py:82
msgid "Spell Checker"
-diff -Naur old/po/sr at Latn.po new/po/sr at Latn.po
---- old/po/sr at Latn.po 2013-03-18 22:41:50.757592982 +1100
-+++ new/po/sr at Latn.po 2013-03-18 22:46:19.921973367 +1100
-@@ -8333,12 +8333,12 @@
- msgstr "Daje mogućnost konekcije na servere koji koriste SRV zapise."
+diff -Naur gajim-0.16-orig/po/sr.po gajim-0.16/po/sr.po
+--- gajim-0.16-orig/po/sr.po 2014-10-05 16:07:08.906963315 -0400
++++ gajim-0.16/po/sr.po 2014-10-05 16:07:30.246928681 -0400
+@@ -8593,12 +8593,12 @@
+ msgstr "Даје могућност конекције на сервере који користе SRV записе."
#: ../src/features_window.py:80
-msgid "Requires dnsutils."
--msgstr "Zahteva dnsutils."
+-msgstr "Захтева dnsutils."
+msgid "Requires ldns."
-+msgstr "Zahteva ldns."
++msgstr "Захтева ldns."
#: ../src/features_window.py:81
-msgid "Requires nslookup to use SRV records."
--msgstr "Zahteva nslookup da biste koristili SRV zapise."
+-msgstr "Захтева nslookup да бисте користили SRV записе."
+msgid "Requires drill to use SRV records."
-+msgstr "Zahteva drill da biste koristili SRV zapise."
++msgstr "Захтева drill да бисте користили SRV записе."
#: ../src/features_window.py:82
msgid "Spell Checker"
-diff -Naur old/po/sv.po new/po/sv.po
---- old/po/sv.po 2013-03-18 22:41:50.757592982 +1100
-+++ new/po/sv.po 2013-03-18 22:46:19.935306752 +1100
-@@ -8259,12 +8259,12 @@
+diff -Naur gajim-0.16-orig/po/sv.po gajim-0.16/po/sv.po
+--- gajim-0.16-orig/po/sv.po 2014-10-05 16:07:08.910296643 -0400
++++ gajim-0.16/po/sv.po 2014-10-05 16:07:30.250262009 -0400
+@@ -8515,12 +8515,12 @@
msgstr "Möjlighet att ansluta till servrar som använder SRV-poster."
#: ../src/features_window.py:80
@@ -606,27 +606,27 @@
#: ../src/features_window.py:82
msgid "Spell Checker"
-diff -Naur old/po/tr.po new/po/tr.po
---- old/po/tr.po 2013-03-18 22:41:50.757592982 +1100
-+++ new/po/tr.po 2013-03-18 22:46:19.945306790 +1100
-@@ -7160,11 +7160,11 @@
+diff -Naur gajim-0.16-orig/po/tr.po gajim-0.16/po/tr.po
+--- gajim-0.16-orig/po/tr.po 2014-10-05 16:07:08.920296627 -0400
++++ gajim-0.16/po/tr.po 2014-10-05 16:07:30.250262009 -0400
+@@ -8519,11 +8519,11 @@
- #: ../src/features_window.py:78
+ #: ../src/features_window.py:80
#, fuzzy
-msgid "Requires dnsutils."
+msgid "Requires ldns."
msgstr " (yetki gerektirir)"
- #: ../src/features_window.py:79
+ #: ../src/features_window.py:81
-msgid "Requires nslookup to use SRV records."
+msgid "Requires drill to use SRV records."
msgstr ""
- #: ../src/features_window.py:80
-diff -Naur old/po/uk.po new/po/uk.po
---- old/po/uk.po 2013-03-18 22:41:50.757592982 +1100
-+++ new/po/uk.po 2013-03-18 22:46:19.955306828 +1100
-@@ -8395,12 +8395,12 @@
+ #: ../src/features_window.py:82
+diff -Naur gajim-0.16-orig/po/uk.po gajim-0.16/po/uk.po
+--- gajim-0.16-orig/po/uk.po 2014-10-05 16:07:08.920296627 -0400
++++ gajim-0.16/po/uk.po 2014-10-05 16:07:30.253595337 -0400
+@@ -8610,12 +8610,12 @@
msgstr "Можливість з’єднання з серверами, які використовують записи SRV."
#: ../src/features_window.py:80
@@ -643,10 +643,10 @@
#: ../src/features_window.py:82
msgid "Spell Checker"
-diff -Naur old/po/zh_CN.po new/po/zh_CN.po
---- old/po/zh_CN.po 2013-03-18 22:41:50.757592982 +1100
-+++ new/po/zh_CN.po 2013-03-18 22:46:19.965306867 +1100
-@@ -8062,12 +8062,12 @@
+diff -Naur gajim-0.16-orig/po/zh_CN.po gajim-0.16/po/zh_CN.po
+--- gajim-0.16-orig/po/zh_CN.po 2014-10-05 16:07:08.920296627 -0400
++++ gajim-0.16/po/zh_CN.po 2014-10-05 16:07:30.253595337 -0400
+@@ -8338,12 +8338,12 @@
msgstr "连接到有 SRV 记录的服务器的能力。"
#: ../src/features_window.py:80
@@ -663,10 +663,10 @@
#: ../src/features_window.py:82
msgid "Spell Checker"
-diff -Naur old/po/zh_TW.po new/po/zh_TW.po
---- old/po/zh_TW.po 2013-03-18 22:41:50.757592982 +1100
-+++ new/po/zh_TW.po 2013-03-18 22:46:19.975306905 +1100
-@@ -8068,12 +8068,12 @@
+diff -Naur gajim-0.16-orig/po/zh_TW.po gajim-0.16/po/zh_TW.po
+--- gajim-0.16-orig/po/zh_TW.po 2014-10-05 16:07:08.913629972 -0400
++++ gajim-0.16/po/zh_TW.po 2014-10-05 16:07:30.256928665 -0400
+@@ -8345,12 +8345,12 @@
msgstr "連線到有 SRV 記錄的伺服器的能力。"
#: ../src/features_window.py:80
@@ -683,19 +683,21 @@
#: ../src/features_window.py:82
msgid "Spell Checker"
-diff -Naur old/src/common/resolver.py new/src/common/resolver.py
---- old/src/common/resolver.py 2013-03-18 22:41:50.760926328 +1100
-+++ new/src/common/resolver.py 2013-03-18 23:23:58.732962768 +1100
-@@ -53,7 +53,7 @@
- if USE_LIBASYNCNS:
- return LibAsyncNSResolver()
- else:
+diff -Naur gajim-0.16-orig/src/common/resolver.py gajim-0.16/src/common/resolver.py
+--- gajim-0.16-orig/src/common/resolver.py 2014-10-05 16:07:08.923629956 -0400
++++ gajim-0.16/src/common/resolver.py 2014-10-05 16:10:49.923271276 -0400
+@@ -57,8 +57,8 @@
+ if helpers.is_in_path('host'):
+ log.info('Using HostResolver')
+ return HostResolver(idlequeue)
+- log.info('Using NSLookupResolver')
- return NSLookupResolver(idlequeue)
++ log.info('Using DrillResolver')
+ return DrillResolver(idlequeue)
class CommonResolver():
def __init__(self):
-@@ -166,11 +166,11 @@
+@@ -171,11 +171,11 @@
return True
@@ -710,7 +712,7 @@
"""
def __init__(self, idlequeue):
-@@ -180,7 +180,7 @@
+@@ -185,7 +185,7 @@
def parse_srv_result(self, fqdn, result):
"""
@@ -719,7 +721,25 @@
'host', 'port','weight', 'priority' corresponding to the found srv hosts
"""
if os.name == 'nt':
-@@ -250,18 +250,15 @@
+@@ -194,7 +194,7 @@
+ return self._parse_srv_result_posix(fqdn, result)
+
+ def _parse_srv_result_nt(self, fqdn, result):
+- # output from win32 nslookup command
++ # output from win32 drill command
+ if not result:
+ return []
+ hosts = []
+@@ -243,7 +243,7 @@
+ return hosts
+
+ def _parse_srv_result_posix(self, fqdn, result):
+- # typical output of bind-tools nslookup command:
++ # typical output of bind-tools drill command:
+ # _xmpp-client._tcp.jabber.org service = 30 30 5222 jabber.org.
+ if not result:
+ return []
+@@ -255,18 +255,15 @@
continue
domain = None
if line.startswith(fqdn):
@@ -742,44 +762,76 @@
if len(props) < 4:
continue
prio, weight, port, host = props[-4:]
-@@ -278,21 +275,21 @@
+@@ -283,15 +280,15 @@
return hosts
- def _on_ready(self, host, type, result):
+ def _on_ready(self, host, type_, result):
- # nslookup finished, parse the result and call the handlers
+ # drill finished, parse the result and call the handlers
result_list = self.parse_srv_result(host, result)
- CommonResolver._on_ready(self, host, type, result_list)
+ CommonResolver._on_ready(self, host, type_, result_list)
- def start_resolve(self, host, type):
+ def start_resolve(self, host, type_):
"""
- Spawn new nslookup process and start waiting for results
+ Spawn new drill process and start waiting for results
"""
-- ns = NsLookup(self._on_ready, host, type)
-+ ns = Drill(self._on_ready, host, type)
+- ns = NsLookup(self._on_ready, host, type_)
++ ns = Drill(self._on_ready, host, type_)
ns.set_idlequeue(self.idlequeue)
ns.commandtimeout = 20
ns.start()
+@@ -326,10 +323,10 @@
+ continue
+ domain = None
+ if line.startswith(fqdn):
+- domain = fqdn # For nslookup 9.5
++ domain = fqdn
+ elif helpers.decode_string(line).startswith(ufqdn):
+ line = helpers.decode_string(line)
+- domain = ufqdn # For nslookup 9.6
++ domain = ufqdn
+ if domain:
+ # add 4 for ' has' after domain name
+ rest = line[len(domain)+4:].split('record')
+@@ -361,14 +358,14 @@
+ def start_resolve(self, host, type_):
+ """
+- Spawn new nslookup process and start waiting for results
++ Spawn new drill process and start waiting for results
+ """
+ ns = Host(self._on_ready, host, type_)
+ ns.set_idlequeue(self.idlequeue)
+ ns.commandtimeout = 20
+ ns.start()
-class NsLookup(IdleCommand):
+class Drill(IdleCommand):
- def __init__(self, on_result, host='_xmpp-client', type='srv'):
+ def __init__(self, on_result, host='_xmpp-client', type_='srv'):
IdleCommand.__init__(self, on_result)
self.commandtimeout = 10
-@@ -309,7 +306,7 @@
+@@ -385,7 +382,7 @@
return
def _compose_command_args(self):
-- return ['nslookup', '-type=' + self.type, self.host]
-+ return ['drill', self.type, self.host]
+- return ['nslookup', '-type=' + self.type_, self.host]
++ return ['drill', self.type_, self.host]
def _return_result(self):
if self.result_handler:
-diff -Naur old/src/features_window.py new/src/features_window.py
---- old/src/features_window.py 2013-03-18 22:41:50.760926328 +1100
-+++ new/src/features_window.py 2013-03-18 22:42:20.431042771 +1100
+@@ -393,7 +390,7 @@
+ self.result_handler = None
+
+
+-class Host(NsLookup):
++class Host(Drill):
+ def _compose_command_args(self):
+ return ['host', '-t', self.type_, self.host]
+
+diff -Naur gajim-0.16-orig/src/features_window.py gajim-0.16/src/features_window.py
+--- gajim-0.16-orig/src/features_window.py 2014-10-05 16:07:08.926963283 -0400
++++ gajim-0.16/src/features_window.py 2014-10-05 16:07:30.256928665 -0400
@@ -77,8 +77,8 @@
_('Feature not available under Windows.')),
_('SRV'): (self.srv_available,
@@ -791,7 +843,7 @@
_('Spell Checker'): (self.speller_available,
_('Spellchecking of composed messages.'),
_('Requires libgtkspell.'),
-@@ -219,7 +219,7 @@
+@@ -215,7 +215,7 @@
def srv_available(self):
if os.name == 'nt':
return True
More information about the arch-commits
mailing list