From d81be51faaee398c282356248e3ce1a36d0b46da Mon Sep 17 00:00:00 2001
From: Carlo von lynX <lynX@time.to.get.psyced.org>
Date: Wed, 29 Jun 2016 21:50:20 +0000
Subject: Merge remote-tracking branch 'origin/master'

---
 po/de.po    | 2 +-
 po/es.po    | 2 +-
 po/fr.po    | 2 +-
 po/sv.po    | 2 +-
 po/vi.po    | 2 +-
 po/zh_CN.po | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'po')

diff --git a/po/de.po b/po/de.po
index d4db75759..03bdd5299 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7666,7 +7666,7 @@ msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
 #: src/transport/gnunet-transport.c:1978
-msgid "disconnect to a peer"
+msgid "disconnect from a peer"
 msgstr "Verbindung zu einem Knoten trennen"
 
 #: src/transport/gnunet-transport.c:1981
diff --git a/po/es.po b/po/es.po
index 454e1e534..cc031daf2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7935,7 +7935,7 @@ msgstr "medir cómo de rápido recibimos datos de todos los pares (hasta CTRL-C)
 
 #: src/transport/gnunet-transport.c:1978
 #, fuzzy
-msgid "disconnect to a peer"
+msgid "disconnect from a peer"
 msgstr "conectar a un par"
 
 #: src/transport/gnunet-transport.c:1981
diff --git a/po/fr.po b/po/fr.po
index 6bf8c1a33..3479212a5 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7356,7 +7356,7 @@ msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
 #: src/transport/gnunet-transport.c:1978
-msgid "disconnect to a peer"
+msgid "disconnect from a peer"
 msgstr ""
 
 #: src/transport/gnunet-transport.c:1981
diff --git a/po/sv.po b/po/sv.po
index a64532c2a..b448fc116 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7745,7 +7745,7 @@ msgstr ""
 
 #: src/transport/gnunet-transport.c:1978
 #, fuzzy
-msgid "disconnect to a peer"
+msgid "disconnect from a peer"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
 #: src/transport/gnunet-transport.c:1981
diff --git a/po/vi.po b/po/vi.po
index 4ebb3a67d..84f3b040d 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7813,7 +7813,7 @@ msgstr ""
 
 #: src/transport/gnunet-transport.c:1978
 #, fuzzy
-msgid "disconnect to a peer"
+msgid "disconnect from a peer"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
 #: src/transport/gnunet-transport.c:1981
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 16b34291d..bce9e7fc7 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7517,7 +7517,7 @@ msgstr ""
 
 #: src/transport/gnunet-transport.c:1978
 #, fuzzy
-msgid "disconnect to a peer"
+msgid "disconnect from a peer"
 msgstr "初始化“%s”服务失败。\n"
 
 #: src/transport/gnunet-transport.c:1981
-- 
cgit v1.2.3