update translations from Transifex

79 files changed, 6574 insertions, 9586 deletions

diff --git a/po/am.po b/po/am.po
index 03a60a1..adb0b77 100644
--- a/po/am.po
+++ b/po/am.po
@@ -3,90 +3,21 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# samson <[email protected]>, 2013
+# samson <[email protected]>, 2013,2015
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-26 22:51+0200\n"
-"PO-Revision-Date: 2013-06-14 01:38+0000\n"
-"Last-Translator: samson <[email protected]>\n"
-"Language-Team: Amharic (http://www.transifex.com/projects/p/MATE/language/am/)\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: monsta <[email protected]>\n"
+"Language-Team: Amharic (http://www.transifex.com/mate/MATE/language/am/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: am\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../data/desktop_mate_file_sharing.schemas.in.h:1
-msgid "Share Public directory over the network"
-msgstr ""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr ""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:3
-msgid "When to require passwords"
-msgstr ""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:4
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr ""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:5
-msgid "Share Public directory over Bluetooth"
-msgstr ""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:6
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr ""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:7
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr ""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:8
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr ""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:9
-msgid ""
-"Whether Bluetooth clients need to pair with the computer to send files."
-msgstr ""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr ""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:11
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr ""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:12
-msgid "When to accept files sent over Bluetooth"
-msgstr ""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:13
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr ""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr ""
-
 #: ../data/file-share-properties.ui.h:1
 msgid "Personal File Sharing Preferences"
 msgstr ""
@@ -139,8 +70,16 @@ msgstr "ፋይሎች _መቀበያ:"
 msgid "_Notify about received files"
 msgstr ""
 
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
+
 #: ../data/mate-user-share-properties.desktop.in.h:1
-#: ../data/mate-user-share.desktop.in.in.h:1 ../src/caja-share-bar.c:162
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "የግል ፋይል ማካፈያ "
 
@@ -148,63 +87,81 @@ msgstr "የግል ፋይል ማካፈያ "
 msgid "Preferences for sharing of files"
 msgstr ""
 
-#: ../data/mate-user-share.desktop.in.in.h:2
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr ""
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "ምርጫዎችን ማስነሻ "
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr ""
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr ""
 
-#: ../src/caja-share-bar.c:187
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr ""
+
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr ""
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr ""
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
 msgstr ""
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
 msgstr ""
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
 msgstr ""
 
-#: ../src/file-share-properties.c:436
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr ""
+
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "ምክንያት የለም "
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "የእርዳታ ይዞታዎችን ማሳየት አልተቻለም "
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr ""
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "በፍጹም "
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "ፋይሎች በሚጻፉ ጊዜ "
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "ሁልጊዜ "
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
-msgstr ""
+msgstr "አካሎችን ለ ማዘጋጃ ብቻ"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "ጠይቀኝ "
 
@@ -217,36 +174,36 @@ msgstr "ጠይቀኝ "
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "%s's የሕዝብ ፋይሎች "
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "%s's የሕዝብ ፋይሎች በ %s"
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
-msgstr ""
+msgstr "እርስዎ ተቀብለዋል \"%s\" በ ብሉቱዝ"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
-msgstr ""
+msgstr "እርስዎ ፋይል ተቀብለዋል"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "ፋይል መክፈቻ"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
-msgstr ""
+msgstr "ፋይል ማሳያ"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
-msgstr ""
+msgstr "የ ፋይሉ ሂደት ተጠናቋል"
diff --git a/po/ar.po b/po/ar.po
index 12c535c..3a8979d 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -5,90 +5,21 @@
 # Translators:
 # Automatically generated, 2006,2009
 # Khaled Hosny <[email protected]>, 2009-2010
-# moceap <[email protected]>, 2013
+# Mosaab Alzoubi <[email protected]>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-26 22:51+0200\n"
-"PO-Revision-Date: 2013-10-05 15:43+0000\n"
-"Last-Translator: mauron\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/MATE/language/ar/)\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: monsta <[email protected]>\n"
+"Language-Team: Arabic (http://www.transifex.com/mate/MATE/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: ../data/desktop_mate_file_sharing.schemas.in.h:1
-msgid "Share Public directory over the network"
-msgstr "دليل المشاركة العام عبر الشبكة"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr "إذا ضُبط كصحيح، فإن مجلد العام في دليل منزل المستخدمين سيشارك عبر الشبكة عندما يلج المستخدم."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:3
-msgid "When to require passwords"
-msgstr "متى يتم طلب كلمات المرور"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:4
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr "متى يتم طلب كلمة المرور. القيم الممكنة هي \"never\", \"on_write\", و \"always\"."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:5
-msgid "Share Public directory over Bluetooth"
-msgstr "دليل المشاركة العام عبر البلوتوث"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:6
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr "إذا ضُبط كصحيح، فإن مجلد العام في دليل منزل المستخدمين سيشارك عبر البلوتوث عندما يلج المستخدم."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:7
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "فيما إذا كان يسمح لعملاء البلوتوث بكتابة الملفات."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:8
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr "فيما إذا كان يسمح لعملاء البلوتوث بكتابة الملفات، أو مشاركة الملفات للقراءة فقط."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:9
-msgid ""
-"Whether Bluetooth clients need to pair with the computer to send files."
-msgstr "فيما إذا كان عملاء البلوتوث يحتاجون الارتباط بالحاسوب لإرسال الملفات."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "فيما إذا كان عملاء البلوتوث يستطيعون إرسال الملفات باستخدام ObexPush."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:11
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr "إذا ضُبط كصحيح، فسوف ترسل أجهزة البلوتوث الملفات إلى دليل تنزيلات المستخدم عند الولوج."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:12
-msgid "When to accept files sent over Bluetooth"
-msgstr "متى أقبل الملفات المرسلة عبر البلوتوث"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:13
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr "متى تقبل الملفات المرسلة عبر البلوتوث. القيم الممكنة هي \"always\"، و\"bonded\"، و \"ask\"."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "فيما إذا كان يشعِر عن الملفات المتلقاة."
-
 #: ../data/file-share-properties.ui.h:1
 msgid "Personal File Sharing Preferences"
 msgstr "تفضيلات مشاركة الملفات الشخصية"
@@ -141,8 +72,16 @@ msgstr "ا_قبل الملفات: "
 msgid "_Notify about received files"
 msgstr "أ_شعِر عن الملفات المتلقاة"
 
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
+
 #: ../data/mate-user-share-properties.desktop.in.h:1
-#: ../data/mate-user-share.desktop.in.in.h:1 ../src/caja-share-bar.c:162
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "مشاركة الملفات الشخصية"
 
@@ -150,63 +89,81 @@ msgstr "مشاركة الملفات الشخصية"
 msgid "Preferences for sharing of files"
 msgstr "تفضيلات مشاركة الملفات"
 
-#: ../data/mate-user-share.desktop.in.in.h:2
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "شغّل مشاركة الملفات الشخصية إذا كانت مفعلة"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "تفضيلات التشغيل"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr ""
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr ""
 
-#: ../src/caja-share-bar.c:187
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr ""
+
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "شغّل تفضيلات مشاركة الملفات الشخصية"
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "تعذّر تشغيل تفضيلات مشاركة الملفات الشخصية"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "يمكنك مشاركة الملفات واستقبالها في هذا المجلد"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr ""
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "يمكنك مشاركة الملفات في هذا المجلد عبر الشبكة أو بلوتوث"
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr ""
+
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr ""
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "يمكنك استقبال الملفات في هذا المجلد عبر الشبكة أو بلوتوث"
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr ""
 
-#: ../src/file-share-properties.c:436
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "لا سبب"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "تعذر عرض محتويات المساعدة."
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "تعذر بناء الواجهة."
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "أبدًا"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "عند كتابة الملفات"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "دائمًا"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "فقط للأجهزة المعدّة"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "اسأل"
 
@@ -219,36 +176,36 @@ msgstr "اسأل"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "ملفات %s العامة"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "ملفات %s العامة على %s"
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "لقد تلقيت \"%s\" عبر البلوتوث"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "لقد تلقيت ملفًا"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "افتح الملف"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "أظهر الملف"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "اكتمل استلام الملف"
diff --git a/po/as.po b/po/as.po
index c77ad40..8ad677d 100644
--- a/po/as.po
+++ b/po/as.po
@@ -1,207 +1,167 @@
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
-# Amitakhya Phukan <[email protected]>, 2009.
+# 
+# Translators:
+# Amitakhya Phukan <[email protected]>, 2009
 msgid ""
 msgstr ""
-"Project-Id-Version: as\n"
-"Report-Msgid-Bugs-To: http://bugzilla.mateorg/enter_bug."
-"cgi?product=mateuser-share&component=general\n"
-"POT-Creation-Date: 2009-06-26 10:10+0000\n"
-"PO-Revision-Date: 2009-09-19 16:26+0530\n"
-"Last-Translator: \n"
-"Language-Team: Assamese <>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: monsta <[email protected]>\n"
+"Language-Team: Assamese (http://www.transifex.com/mate/MATE/language/as/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 0.2\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:1
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr ""
-"মান সত্য হলে, লগ-ইন কৰা হলে ব্লু-টুথ ডিভাইসৰ পৰা ব্যৱহাৰকাৰীদেৰ Downloads "
-"ডিৰেক্টৰিত নথিপত্ৰ স্থানান্তৰ কৰা যাবে ।"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr ""
-"মান সত্য হলে, ব্যৱহাৰকাৰী লগ-ইন কৰলে ব্যৱহাৰকাৰীৰ ব্যক্তিগত ডিৰেক্টৰিত উপস্থিত "
-"Public ডিৰেক্টৰিটি ব্লু-টুথ ডিভাইসেৰ মাধ্যমে যৌথ ব্যৱহাৰেৰৰ বাবে উপস্থিত কৰা যাবে ।"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:3
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr ""
-"মান সত্য হলে, ব্যৱহাৰকাৰী লগ-ইন কৰলে ব্যৱহাৰকাৰীৰ ব্যক্তিগত ডিৰেক্টৰিত উপস্থিত "
-"Public ডিৰেক্টৰিটি নেটৱৰ্কেৰ মাধ্যমে যৌথ ব্যৱহাৰেৰৰ বাবে উপস্থিত কৰা যাবে ।"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:4
-msgid "Share Public directory over Bluetooth"
-msgstr "যৌথ ব্যৱহাৰেৰ বাবে ব্লু-টুথেৰ মাধ্যমে Public ডিৰেক্টৰি উপলব্ধ কৰা হ'ব"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:5
-msgid "Share Public directory over the network"
-msgstr "যৌথ ব্যৱহাৰেৰ বাবে নেটৱৰ্কেৰ মাধ্যমে Public ডিৰেক্টৰি উপলব্ধ কৰা হ'ব"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:6
-msgid "When to accept files sent over Bluetooth"
-msgstr "ব্লু-টুথেৰ মাধ্যমে উপলব্ধ নথিপত্ৰ কখন গ্ৰহণ কৰা হ'ব"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:7
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\", \"bonded_trusted\" and \"ask\"."
-msgstr ""
-"ব্লু-টুথেৰ মাধ্যমে উপলব্ধ নথিপত্ৰ কখন গ্ৰহণ কৰা হ'ব । সম্ভাব্য মান হল: \"always "
-"(সদায়ে)"
-"\", \"যুক্ত\", \"bonded_যুক্ত আৰু বিশ্বস্ত\" আৰু \"ask (জিজ্ঞাসা)\" ।"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:8
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr ""
-"গুপ্তশব্দ উল্লেখেৰ অনুৰোধ কখন কৰা হ'ব । সম্ভাব্য মান হল: \"never (কেতিয়াও না)\", "
-"\"on_write (লেখাৰ সময়)\", আৰু \"always (সদায়ে)\" ।"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:9
-msgid "When to require passwords"
-msgstr "গুপ্তশব্দ কখন আবশ্যক হ'ব"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "ObexPush-ৰ সাহায্যে ব্লু-টিথ ক্লায়েন্ট দ্বাৰা নথিপত্ৰ পাঠানো সম্ভব হ'ব নে নাই ।"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:11
-msgid "Whether Bluetooth clients need to pair with the computer to send files."
-msgstr ""
-"নথিপত্ৰ পাঠানোৰ বাবে, ব্লু-টুথ ক্লায়েন্ট দ্বাৰা কখন একটি কম্পিউটাৰেৰ সাথে যুগ্মভাবে "
-"সঞ্চালন কৰা আবশ্যক ।"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:12
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr ""
-"ব্লু-টুথ ক্লায়েন্ট দ্বাৰা নথিপত্ৰ লেখা সম্ভব হ'ব না কি অকল পাঠযোগ্য অনুমতি সহ "
-"নথিপত্ৰৰ যৌথ "
-"ব্যৱহাৰ কৰা যাবে ।"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:13
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "ব্লু-টুথ ক্লায়েন্টেৰ বাবে নথিপত্ৰে লেখাৰ অনুমতি উপস্থিত থাকিব নে নাই ।"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "নতুন প্ৰাপ্ত নথিপত্ৰ সম্পৰ্কে সূচনা প্ৰদান কৰা হ'ব নে নাই ।"
+"Language: as\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/file-share-properties.ui.h:1
-msgid "<b>Receive Files over Bluetooth</b>"
-msgstr "<b>ব্লু-টুথেৰ মাধ্যমে নথিপত্ৰ গ্ৰহণ কৰা হ'ব</b>"
+msgid "Personal File Sharing Preferences"
+msgstr "নথিপত্ৰৰ যৌথ ব্যৱহাৰ সংক্ৰান্ত পছন্দৰ মান"
 
 #: ../data/file-share-properties.ui.h:2
-msgid "<b>Share Files over Bluetooth</b>"
-msgstr "<b>ব্লু-টুথেৰ মাধ্যমে যৌথৰূপে নথিপত্ৰ ব্যৱহাৰ কৰা হ'ব</b>"
-
-#: ../data/file-share-properties.ui.h:3
 msgid "<b>Share Files over the Network</b>"
 msgstr "<b>নেটৱৰ্কেৰ মাধ্যমে যৌথৰূপে নথিপত্ৰ ব্যৱহাৰ কৰা হ'ব</b>"
 
+#: ../data/file-share-properties.ui.h:3
+msgid "_Share public files on network"
+msgstr "যৌথ ব্যৱহাৰেৰ বাবে নেটৱৰ্কেৰ মাধ্যমে সাৰ্বজনীন নথিপত্ৰ উপলব্ধ কৰা হ'ব"
+
 #: ../data/file-share-properties.ui.h:4
-msgid "Allo_w remote devices to delete files"
-msgstr "দূৰবৰ্তী ডিভাইস দ্বাৰা নথিপত্ৰ মুছে ফেলাৰ অনুমতি প্ৰদান কৰা হ'ব (_w)"
+msgid "_Password:"
+msgstr "গুপ্তশব্দ: (_P)"
 
 #: ../data/file-share-properties.ui.h:5
-#| msgid "File Sharing Preferences"
-msgid "Personal File Sharing Preferences"
-msgstr "নথিপত্ৰৰ যৌথ ব্যৱহাৰ সংক্ৰান্ত পছন্দৰ মান"
+msgid "_Require password:"
+msgstr "গুপ্তশব্দ আবশ্যক: (_R)"
 
 #: ../data/file-share-properties.ui.h:6
-msgid "Receive files in _Downloads folder over Bluetooth"
-msgstr "ব্লু-টুথেৰ মাধ্যমে উপলব্ধ নথিপত্ৰ Downloads ফোল্ডাৰে সংৰক্ষণ কৰা হ'ব (_D)"
+msgid "<b>Share Files over Bluetooth</b>"
+msgstr "<b>ব্লু-টুথেৰ মাধ্যমে যৌথৰূপে নথিপত্ৰ ব্যৱহাৰ কৰা হ'ব</b>"
 
 #: ../data/file-share-properties.ui.h:7
-msgid "Require re_mote devices to bond with this computer"
-msgstr "দূৰবৰ্তী ডিভাইসেৰ ক্ষেত্ৰে এই কম্পিউটাৰেৰ সাথে সংযোগ স্থাপন কৰা আবশ্যক (_m)"
-
-#: ../data/file-share-properties.ui.h:8
 msgid "Share public files over _Bluetooth"
 msgstr "যৌথ ব্যৱহাৰেৰ বাবে ব্লু-টুথেৰ মাধ্যমে সাৰ্বজনীন উপলব্ধ কৰা হ'ব (_B)"
 
+#: ../data/file-share-properties.ui.h:8
+msgid "Allo_w remote devices to delete files"
+msgstr "দূৰবৰ্তী ডিভাইস দ্বাৰা নথিপত্ৰ মুছে ফেলাৰ অনুমতি প্ৰদান কৰা হ'ব (_w)"
+
 #: ../data/file-share-properties.ui.h:9
-msgid "_Accept files: "
-msgstr "নথিপত্ৰ গ্ৰহণ কৰা হ'ব: (_A)"
+msgid "Require re_mote devices to bond with this computer"
+msgstr "দূৰবৰ্তী ডিভাইসেৰ ক্ষেত্ৰে এই কম্পিউটাৰেৰ সাথে সংযোগ স্থাপন কৰা আবশ্যক (_m)"
 
 #: ../data/file-share-properties.ui.h:10
-msgid "_Notify about received files"
-msgstr "নতুন প্ৰাপ্ত নথিপত্ৰ সম্পৰ্কে সূচনা প্ৰদান কৰা হ'ব (_N)"
+msgid "<b>Receive Files over Bluetooth</b>"
+msgstr "<b>ব্লু-টুথেৰ মাধ্যমে নথিপত্ৰ গ্ৰহণ কৰা হ'ব</b>"
 
 #: ../data/file-share-properties.ui.h:11
-msgid "_Password:"
-msgstr "গুপ্তশব্দ: (_P)"
+msgid "Receive files in _Downloads folder over Bluetooth"
+msgstr "ব্লু-টুথেৰ মাধ্যমে উপলব্ধ নথিপত্ৰ Downloads ফোল্ডাৰে সংৰক্ষণ কৰা হ'ব (_D)"
 
 #: ../data/file-share-properties.ui.h:12
-msgid "_Require password:"
-msgstr "গুপ্তশব্দ আবশ্যক: (_R)"
+msgid "_Accept files: "
+msgstr "নথিপত্ৰ গ্ৰহণ কৰা হ'ব: (_A)"
 
 #: ../data/file-share-properties.ui.h:13
-msgid "_Share public files on network"
-msgstr "যৌথ ব্যৱহাৰেৰ বাবে নেটৱৰ্কেৰ মাধ্যমে সাৰ্বজনীন নথিপত্ৰ উপলব্ধ কৰা হ'ব"
+msgid "_Notify about received files"
+msgstr "নতুন প্ৰাপ্ত নথিপত্ৰ সম্পৰ্কে সূচনা প্ৰদান কৰা হ'ব (_N)"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
 
-#: ../data/mateuser-share-properties.desktop.in.h:1
-#: ../data/mateuser-share.desktop.in.in.h:2
+#: ../data/mate-user-share-properties.desktop.in.h:1
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "ব্যক্তিগত নথিপত্ৰৰ যৌথ ব্যৱহাৰ"
 
-#: ../data/mateuser-share-properties.desktop.in.h:2
-#| msgid "Preferences for sharing of personal files"
+#: ../data/mate-user-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "ব্যক্তিগত নথিপত্ৰৰ যৌথ ব্যৱহাৰ সংক্ৰান্ত পছন্দৰ মান"
 
-#: ../data/mateuser-share.desktop.in.in.h:1
-#| msgid "Launch User Sharing if enabled"
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "সক্ৰিয় থাকিলে, User Sharing আৰম্ভ কৰা হ'ব"
 
-#: ../src/file-share-properties.c:435
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr ""
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr ""
+
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr ""
+
+#: ../src/caja-share-bar.c:121
+msgid "Launch Personal File Sharing Preferences"
+msgstr ""
+
+#: ../src/share-extension.c:73
+msgid "Unable to launch the Personal File Sharing preferences"
+msgstr ""
+
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr ""
+
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr ""
+
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr ""
+
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr ""
+
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "বিনা কাৰণে"
 
-#: ../src/file-share-properties.c:463
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "সাহায্যেৰ সূচী প্ৰদৰ্শন কৰা সম্ভব হয়নি ।"
 
-#: ../src/file-share-properties.c:503
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "ইন্টাৰফেস নিৰ্মাণ কৰতে ব্যৰ্থ ।"
 
-#: ../src/file-share-properties.c:543
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "কেতিয়াও নহয়"
 
-#: ../src/file-share-properties.c:546
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "নথিপত্ৰ লেখাৰ সময়"
 
-#: ../src/file-share-properties.c:549 ../src/file-share-properties.c:572
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "সদায়ে"
 
-#: ../src/file-share-properties.c:575
-msgid "Only for Bonded devices"
-msgstr "অকল যুক্ত ডিভাইসেৰ ক্ষেত্ৰে"
-
-#: ../src/file-share-properties.c:578
-msgid "Only for Bonded and Trusted devices"
-msgstr "অকল যুক্ত আৰু বিশ্বস্ত ডিভাইসেৰ ক্ষেত্ৰে"
+#: ../src/file-share-properties.c:580
+msgid "Only for set up devices"
+msgstr ""
 
-#: ../src/file-share-properties.c:583
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "জিজ্ঞাসা কৰা হ'ব"
 
@@ -214,40 +174,36 @@ msgstr "জিজ্ঞাসা কৰা হ'ব"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "%s-ৰ সাৰ্বজনীন নথিপত্ৰ"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "%s-ৰ %s-এ উপস্থিত সাৰ্বজনীন নথিপত্ৰ"
 
-#: ../src/http.c:372
-msgid "Please log in as the user guest"
-msgstr "অনুগ্ৰহ কৰে অতিথি ব্যৱহাৰকাৰী ৰূপে লগ-ইন কৰুন"
-
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:138
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "ব্লু-টুথেৰ মাধ্যমে আপনি \"%s\" প্ৰাপ্ত কৰেছেন"
 
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "আপনি একটি নথিপত্ৰ প্ৰাপ্ত কৰেছেন"
 
-#: ../src/obexpush.c:151
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "নথিপত্ৰ খোলক"
 
-#: ../src/obexpush.c:155
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "নথিপত্ৰ প্ৰকাশ কৰা হ'ব"
 
-#~ msgid "User Sharing"
-#~ msgstr "যৌথ ব্যবহাৰেৰ সামগ্ৰী"
-
+#: ../src/obexpush.c:169
+msgid "File reception complete"
+msgstr ""
diff --git a/po/ast.po b/po/ast.po
index b591303..a9deaf9 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -3,91 +3,22 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Ḷḷumex03 <[email protected]>, 2014
+# Ḷḷumex03 <[email protected]>, 2014
 # Xandru <[email protected]>, 2010
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-26 22:51+0200\n"
-"PO-Revision-Date: 2014-06-13 10:06+0000\n"
-"Last-Translator: Ḷḷumex03 <[email protected]>\n"
-"Language-Team: Asturian (http://www.transifex.com/projects/p/MATE/language/ast/)\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: monsta <[email protected]>\n"
+"Language-Team: Asturian (http://www.transifex.com/mate/MATE/language/ast/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ast\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/desktop_mate_file_sharing.schemas.in.h:1
-msgid "Share Public directory over the network"
-msgstr "Compartir el direutoriu «Públicu» per rede"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr "Si esto ye verdá, el direutoriu «Públicu» nel direutoriu personal de los usuarios compartiráse pela rede cuando l'usuariu anicie sesión."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:3
-msgid "When to require passwords"
-msgstr "Cuando requerir contraseñes"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:4
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr "Cuándo entrugar por contraseñes. Les opciones posibles son: \"never\" (enxamás), \"on_write\" (al escribir) y \"always\" (siempres)."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:5
-msgid "Share Public directory over Bluetooth"
-msgstr "Compartir el direutoriu «Públicu» per Bluetooth"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:6
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr "Si esto ye verdá, el direutoriu «Públicu» nel direutoriu personal del usuariu compartiráse per Bluetooth cuando l'usuariu anicie sesión."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:7
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "Indica si se permite escribir ficheros a los veceros per Bluetooth"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:8
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr "Indica si se permite escribir ficheros a los veceros per Bluetooth, o compartir los ficheros de namái llectura."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:9
-msgid ""
-"Whether Bluetooth clients need to pair with the computer to send files."
-msgstr "Si los veceros Bluetooth necesiten emparexase col equipu pa unviar ficheros."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "Si los veceros Bluetooth puen unviar ficheros usando ObexPush."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:11
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr "Si esto ye verdá, los preseos Bluetooth puen unviar ficheros al direutoriu Descargues del usuariu cuando anicie sesión."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:12
-msgid "When to accept files sent over Bluetooth"
-msgstr "Cuándo aceutar ficheros unviaos per Bluetooth"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:13
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr "Cuándo aceutar ficheros unviaos per Bluetooth. Los valores posibles son: «always» (siempres), «bonded» (vinculaos) y «ask» (entrugar)."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "Si hai que notificar tocante a los ficheros nuevos recibíos."
-
 #: ../data/file-share-properties.ui.h:1
 msgid "Personal File Sharing Preferences"
 msgstr "Preferencies de compartición de ficheros personales"
@@ -140,8 +71,16 @@ msgstr "_Aceutar ficheros: "
 msgid "_Notify about received files"
 msgstr "_Notificar tocante a los ficheros recibíos"
 
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
+
 #: ../data/mate-user-share-properties.desktop.in.h:1
-#: ../data/mate-user-share.desktop.in.in.h:1 ../src/caja-share-bar.c:162
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "Compartición de ficheros personales"
 
@@ -149,63 +88,81 @@ msgstr "Compartición de ficheros personales"
 msgid "Preferences for sharing of files"
 msgstr "Preferencies pa la compartición de ficheros"
 
-#: ../data/mate-user-share.desktop.in.in.h:2
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Llanzar la compartición de ficheros personales si ta activáu"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "Llanzar les preferencies"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr ""
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr ""
 
-#: ../src/caja-share-bar.c:187
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr ""
+
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Llanzar les preferencies de compartición de ficheros personales"
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "Nun puen llanzase les preferencies de compartición de ficheros personales"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "Pues compartir ficheros dende esta carpeta y recibilos nella"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr ""
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "Pues compartir ficheros nesta carpeta al traviés de la rede y Bluetooth"
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr ""
+
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr ""
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "Pues recibir ficheros al traviés de Bluetooth nesta carpeta"
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr ""
 
-#: ../src/file-share-properties.c:436
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "Ensin razón"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "Nun pudo amosase'l conteníu de l'ayuda"
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "Nun pudo construyise la interfaz."
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "Enxamás"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "Cuando s'escriban ficheros"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "Siempres"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "Namái pa preseos configuraos"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "Entrugar"
 
@@ -218,36 +175,36 @@ msgstr "Entrugar"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "Ficheros públicos de %s"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "Ficheros públicos de %s en %s"
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "Recibiesti «%s» per Bluetooth"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "Recibiesti un ficheru"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "Abrir ficheru"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "Amosar ficheru"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "Completóse la receición de ficheros"
diff --git a/po/be.po b/po/be.po
index 5d615c2..1d809ab 100644
--- a/po/be.po
+++ b/po/be.po
@@ -8,84 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-26 22:51+0200\n"
-"PO-Revision-Date: 2015-03-20 12:10+0000\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
 "Last-Translator: Mihail Varantsou <[email protected]>\n"
-"Language-Team: Belarusian (http://www.transifex.com/projects/p/MATE/language/be/)\n"
+"Language-Team: Belarusian (http://www.transifex.com/mate/MATE/language/be/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: be\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:1
-msgid "Share Public directory over the network"
-msgstr "Адкрыць супольны доступ да каталогу Public праз сетку"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr "Калі ісціна, пры ўваходзе карыстальнікаў у сістэму будзе адкрывацца доступ да каталогу Public у іх хатнім каталогу праз сетку."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:3
-msgid "When to require passwords"
-msgstr "Калі запытваць паролі"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:4
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr "Калі пытацца на паролі. Магчымыя значэнні: \"never\", \"on_write\" і \"always\"."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:5
-msgid "Share Public directory over Bluetooth"
-msgstr "Адкрыць супольны доступ да каталогу Public праз Bluetooth"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:6
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr "Калі ісціна, пры ўваходзе карыстальнікаў у сістэму будзе адкрывацца доступ да каталогу Public у іх хатнім каталогу праз Bluetooth."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:7
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "Ці дазволіць Bluetooth-кліентам запісваць файлы."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:8
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr "Дазволіць Bluetooth-кліентам запісваць файлы ці толькі чытаць."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:9
-msgid ""
-"Whether Bluetooth clients need to pair with the computer to send files."
-msgstr "Ці патрабаваць ад Bluetooth-кліентаў рабіць звязванне з камп'ютарам, каб даслаць файлы."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "Ці дазволіць Bluetooth-кліентам дасылаць файлы з дапамогай ObexPush."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:11
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr "Калі ісціна, Bluetooth-прылады могуць дасылаць файлы ў каталог Downloads карыстальніка пасля яго ўваходу ў сістэму."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:12
-msgid "When to accept files sent over Bluetooth"
-msgstr "Калі згаджацца на прыём файлаў праз Bluetooth"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:13
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr "Калі згаджацца на прыём файлаў праз Bluetooth. Магчымыя значэнні: \"always\", \"bonded\" і \"ask\"."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "Ці абвяшчаць пра атрыманыя файлы"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #: ../data/file-share-properties.ui.h:1
 msgid "Personal File Sharing Preferences"
@@ -139,8 +70,16 @@ msgstr "_Прымаць файлы: "
 msgid "_Notify about received files"
 msgstr "_Абвяшчаць пра атрыманыя файлы"
 
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr "Супольны доступ"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr "Інтэгруецца з Супольным доступам"
+
 #: ../data/mate-user-share-properties.desktop.in.h:1
-#: ../data/mate-user-share.desktop.in.in.h:1 ../src/caja-share-bar.c:162
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "Супольны доступ да асабістых файлаў"
 
@@ -148,63 +87,81 @@ msgstr "Супольны доступ да асабістых файлаў"
 msgid "Preferences for sharing of files"
 msgstr "Настáўленні супольнага доступу"
 
-#: ../data/mate-user-share.desktop.in.in.h:2
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr "Супольны доступ obexftp"
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Адкрыць супольны доступ да асабістых файлаў, калі ўключана"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "Настáўленні запуску"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr "Супольны доступ obexpush"
 
-#: ../src/caja-share-bar.c:187
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr "Супольны доступ webdav"
+
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr "Настáўленні"
+
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Адкрыць настáўленні супольнага доступу да асабістых файлаў"
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "Не выйшла адкрыць настáўленні супольнага доступу да асабістых файлаў"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "Праз гэты каталог можна дзяліцца файламі і атрымліваць файлы ў яго"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr "Можа быць выкарыстаны, каб дзяліцца ці атрымліваць файлы"
+
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr "Можна адкрыць доступ па сетцы ці Bluetooth"
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "Праз гэты каталог можна дзяліцца файламі праз сетку і Bluetooth"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr "Можна адкрыць доступ па сетцы"
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "У гэты каталог можна атрымліваць файлы праз Bluetooth"
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr "Можа быць выкарыстаны, каб атрымліваць файлы па Bluetooth"
 
-#: ../src/file-share-properties.c:436
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "Без прычыны"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "Не выйшла паказаць даведку."
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "Не выйшла стварыць інтэрфейс."
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "Ніколі"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "Пры запісванні файлаў"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "Заўсёды"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "Толькі для падлучаных прылад"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "Пытацца"
 
@@ -217,36 +174,36 @@ msgstr "Пытацца"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "Публічныя файлы %s"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "Публічныя файлы %s на %s"
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "Файл \"%s\" атрыманы праз Bluetooth"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "Файл атрыманы"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "Адкрыць"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "Паказаць"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "Атрыманне файла завершана"
diff --git a/po/bg.po b/po/bg.po
index a077c57..45163f0 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,226 +1,168 @@
-# Bulgarian translation of mateuser-share po-file.
-# Copyright (C) 2005, 2009, 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the mateuser-share package.
-# Rostislav Raykov <[email protected]>, 2005.
-# Alexander Shopov <[email protected]>, 2009, 2010.
-#
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Alexander Shopov <[email protected]>, 2009, 2010
+# Rostislav Raykov <[email protected]>, 2005
 msgid ""
 msgstr ""
-"Project-Id-Version: mateuser-share master\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-25 23:32+0200\n"
-"PO-Revision-Date: 2010-01-25 23:32+0200\n"
-"Last-Translator: Alexander Shopov <[email protected]>\n"
-"Language-Team: Bulgarian <[email protected]>\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: monsta <[email protected]>\n"
+"Language-Team: Bulgarian (http://www.transifex.com/mate/MATE/language/bg/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:1
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr ""
-"Ако е истина, отдалечени устройства ще могат да пращат файлове по Bluetooth "
-"към папката на потребителя „Свалени“, когато той е влезнал в системата."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr ""
-"Ако е истина, публичната папка в домашната на потребителя ще бъде споделена "
-"по Bluetooth, когато той е влезнал в системата."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:3
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr ""
-"Ако е истина, публичната папка в домашната на потребителя ще бъде споделена "
-"по мрежата, когато той е влезнал в системата."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:4
-msgid "Share Public directory over Bluetooth"
-msgstr "Споделяне на публичната папка по Bluetooth"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:5
-msgid "Share Public directory over the network"
-msgstr "Споделяне на публичната папка по мрежата"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:6
-msgid "When to accept files sent over Bluetooth"
-msgstr "Дали да се приемат файлове по Bluetooth"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:7
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr ""
-"Кога да се приемат файлове по Bluetooth. Възможните опции са: "
-"„always“ (винаги), „bonded“ (от изрично свързани устройства) и „ask“ (питане "
-"всеки път)."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:8
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr ""
-"Кога да се пита за пароли. Възможните опции са: „never“ (никога), "
-"„on_write“ (при запис), „always“ (винаги)."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:9
-msgid "When to require passwords"
-msgstr "Кога да се изискват пароли?"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "Дали клиентите по Bluetooth могат да изпращат файлове чрез ObexPush."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:11
-msgid "Whether Bluetooth clients need to pair with the computer to send files."
-msgstr ""
-"Дали клиентите по Bluetooth трябва изрично да се свържат към компютъра, за "
-"да пращат файлове."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:12
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr ""
-"Дали клиентите по Bluetooth да могат да записват файлове или да се дадат "
-"права само за четене."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:13
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "Дали клиентите по Bluetooth могат да записват файлове."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "Дали да се известява при получаване на файл."
+"Language: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/file-share-properties.ui.h:1
-msgid "<b>Receive Files over Bluetooth</b>"
-msgstr "<b>Приемане на файлове по Bluetooth</b>"
+msgid "Personal File Sharing Preferences"
+msgstr "Настройки на споделянето на личните файлове"
 
 #: ../data/file-share-properties.ui.h:2
-msgid "<b>Share Files over Bluetooth</b>"
-msgstr "<b>Споделяне на файлове по Bluetooth</b>"
-
-#: ../data/file-share-properties.ui.h:3
 msgid "<b>Share Files over the Network</b>"
 msgstr "<b>Споделяне на файлове по мрежата</b>"
 
+#: ../data/file-share-properties.ui.h:3
+msgid "_Share public files on network"
+msgstr "_Споделяне на публичните файлове по мрежата"
+
 #: ../data/file-share-properties.ui.h:4
-msgid "Allo_w remote devices to delete files"
-msgstr "_Позволяване на отдалечените устройства да трият файлове"
+msgid "_Password:"
+msgstr "_Парола:"
 
 #: ../data/file-share-properties.ui.h:5
-msgid "Personal File Sharing Preferences"
-msgstr "Настройки на споделянето на личните файлове"
+msgid "_Require password:"
+msgstr "_Изискване на парола:"
 
 #: ../data/file-share-properties.ui.h:6
-msgid "Receive files in _Downloads folder over Bluetooth"
-msgstr "Файловете получени от Bluetooth да се запазват в папка „_Свалени“"
+msgid "<b>Share Files over Bluetooth</b>"
+msgstr "<b>Споделяне на файлове по Bluetooth</b>"
 
 #: ../data/file-share-properties.ui.h:7
-msgid "Require re_mote devices to bond with this computer"
-msgstr ""
-"_Изискване отдалечените устройства изрично да се свързват с този компютър"
-
-#: ../data/file-share-properties.ui.h:8
 msgid "Share public files over _Bluetooth"
 msgstr "Споделяне на пу_бличните файлове по Bluetooth"
 
+#: ../data/file-share-properties.ui.h:8
+msgid "Allo_w remote devices to delete files"
+msgstr "_Позволяване на отдалечените устройства да трият файлове"
+
 #: ../data/file-share-properties.ui.h:9
-msgid "_Accept files: "
-msgstr "_Приемане на файлове: "
+msgid "Require re_mote devices to bond with this computer"
+msgstr "_Изискване отдалечените устройства изрично да се свързват с този компютър"
 
 #: ../data/file-share-properties.ui.h:10
-msgid "_Notify about received files"
-msgstr "_Уведомяване при получаване на файлове"
+msgid "<b>Receive Files over Bluetooth</b>"
+msgstr "<b>Приемане на файлове по Bluetooth</b>"
 
 #: ../data/file-share-properties.ui.h:11
-msgid "_Password:"
-msgstr "_Парола:"
+msgid "Receive files in _Downloads folder over Bluetooth"
+msgstr "Файловете получени от Bluetooth да се запазват в папка „_Свалени“"
 
 #: ../data/file-share-properties.ui.h:12
-msgid "_Require password:"
-msgstr "_Изискване на парола:"
+msgid "_Accept files: "
+msgstr "_Приемане на файлове: "
 
 #: ../data/file-share-properties.ui.h:13
-msgid "_Share public files on network"
-msgstr "_Споделяне на публичните файлове по мрежата"
+msgid "_Notify about received files"
+msgstr "_Уведомяване при получаване на файлове"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
 
-#: ../data/mateuser-share-properties.desktop.in.h:1
-#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
+#: ../data/mate-user-share-properties.desktop.in.h:1
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "Споделяне на файлове"
 
-#: ../data/mateuser-share-properties.desktop.in.h:2
+#: ../data/mate-user-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Настройки за споделянето на файлове"
 
-#: ../data/mateuser-share.desktop.in.in.h:1
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Стартиране на споделянето на файлове, ако е позволено"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "Настройки на споделянето"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr ""
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr ""
+
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr "Настройки"
 
-#: ../src/caja-share-bar.c:187
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Настройки на споделянето на личните файлове"
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "Настройките на споделянето на личните файлове не могат да се стартират"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
 msgstr ""
-"Можете да споделяте файловете в тази папка и да получавате файлове в нея"
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "Можете да споделяте файловете в тази папка по мрежата и Bluetooth"
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr ""
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "Можете да получавате файлове по Bluetooth в тази папка"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr ""
 
-#: ../src/file-share-properties.c:436
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr ""
+
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "Без причина"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "Съдържанието на помощта не може да бъде показано."
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "Интерфейсът не може да бъде изграден."
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "Никога"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "При запис на файлове"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "Винаги"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "Само при настроени устройства"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "Питане"
 
@@ -233,40 +175,36 @@ msgstr "Питане"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "Публичните файлове на %s"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "Публичните файлове на %s върху %s"
 
-#: ../src/http.c:372
-msgid "Please log in as the user guest"
-msgstr "Влезте като гост (потребител guest)"
-
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "Получихте „%s“ по Bluetooth"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "Получихте файл"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "Отваряне на файл"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "Показване на файл"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "Файлът е получен"
diff --git a/po/bn.po b/po/bn.po
index d41fa8d..27df125 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -1,262 +1,169 @@
-# Bengali translation for mateuser-share
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
-# Runa Bhattacharjee <[email protected]>, 2009.
-# Israt Jahan <[email protected]>, 2009.
-# Sadia Afroz <[email protected]>, 2010.
-#
+# 
+# Translators:
+# Israt Jahan <[email protected]>, 2009
+# runab <[email protected]>, 2009
+# Sadia Afroz <[email protected]>, 2010
 msgid ""
 msgstr ""
-"Project-Id-Version: bn\n"
-"Report-Msgid-Bugs-To: http://bugzilla.mateorg/enter_bug.cgi?product=mate"
-"user-share&component=general\n"
-"POT-Creation-Date: 2010-03-23 17:10+0000\n"
-"PO-Revision-Date: 2010-01-24 11:12+0600\n"
-"Last-Translator: Sadia Afroz <[email protected]>\n"
-"Language-Team: Bengali <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: monsta <[email protected]>\n"
+"Language-Team: Bengali (http://www.transifex.com/mate/MATE/language/bn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"Language: bn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-# Translated by sadia
-#: ../data/desktop_matefile_sharing.schemas.in.h:1
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr ""
-"মান true (সত্য) হলে, লগইন করার পর ব্লু-টুথ ডিভাইস ব্যবহারকারীর ডাউনলোড ডিরেক্টরিতে "
-"ফাইল প্রেরণ করতে পারে।"
-
-# Translated by sadia
-#: ../data/desktop_matefile_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr ""
-"মান true (সত্য) হলে, ব্যবহারকারী লগইন করলে ব্যবহারকারীর প্রধান ডিরেক্টরির মধ্যে "
-"উপস্থিত পাবলিক ডিরেক্টরিটি ব্লু-টুথের মাধ্যমে শেয়ার করা যাবে।"
-
-# Translated by sadia
-#: ../data/desktop_matefile_sharing.schemas.in.h:3
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr ""
-"মান true (সত্য) হলে, ব্যবহারকারী লগইন করলে ব্যবহারকারীর প্রধান ডিরেক্টরির মধ্যে "
-"উপস্থিত পাবলিক ডিরেক্টরিটি নেটওয়ার্কের মাধ্যমে শেয়ার করা যাবে।"
-
-# Translated by sadia
-#: ../data/desktop_matefile_sharing.schemas.in.h:4
-msgid "Share Public directory over Bluetooth"
-msgstr "পাবলিক ডিরেক্টরি ব্লু-টুথের মাধ্যমে শেয়ার করা হবে"
-
-# Translated by sadia
-#: ../data/desktop_matefile_sharing.schemas.in.h:5
-msgid "Share Public directory over the network"
-msgstr "পাবলিক ডিরেক্টরি নেটওয়ার্কের মাধ্যমে শেয়ার করা হবে"
-
-# Translated by sadia
-#: ../data/desktop_matefile_sharing.schemas.in.h:6
-msgid "When to accept files sent over Bluetooth"
-msgstr "ব্লু-টুথের মাধ্যমে প্রেরিত ফাইল কখন গ্রহণ করা হবে"
-
-# Translated by sadia
-#: ../data/desktop_matefile_sharing.schemas.in.h:7
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr ""
-"ব্লু-টুথের মাধ্যমে প্রেরিত ফাইল কখন গ্রহণ করা হবে। সম্ভাব্য মান হলো: \"সর্বদা\", "
-"\"সংযুক্ত করা হবে\",  ও \"জিজ্ঞাসা করা হবে\"।"
-
-# Translated by sadia
-#: ../data/desktop_matefile_sharing.schemas.in.h:8
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr ""
-"পাসওয়ার্ড কখন জানতে চাওয়া হবে। সম্ভাব্য মান হলো: \"কখনো না\", \"লেখার সময় (_w)"
-"\", ও \"সর্বদা\"।"
-
-# Translated by sadia
-#: ../data/desktop_matefile_sharing.schemas.in.h:9
-msgid "When to require passwords"
-msgstr "কখন পাসওয়ার্ড প্রয়োজন হবে"
-
-# Translated by sadia
-#: ../data/desktop_matefile_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "ObexPush এর সাহায্যে ব্লু-টুথ ক্লায়েন্টরা ফাইল পাঠাতে পারবেন কি না।"
-
-# Translated by sadia
-#: ../data/desktop_matefile_sharing.schemas.in.h:11
-msgid "Whether Bluetooth clients need to pair with the computer to send files."
-msgstr "ফাইল পাঠানোর জন্য ব্লু-টুথ ক্লায়েন্টদের কম্পিউটারের সাথে যুক্ত হতে হবে কিনা।"
-
-# Translated by sadia
-#: ../data/desktop_matefile_sharing.schemas.in.h:12
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr ""
-"ব্লু-টুথ ক্লায়েন্টরা শেয়ারকৃত ফাইল শুধুমাত্র পাঠ করতে পারবে, না কি তাদের লেখারও অনুমতি "
-"দেয়া হবে।"
-
-# Translated by sadia
-#: ../data/desktop_matefile_sharing.schemas.in.h:13
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "ব্লু-টুথ ক্লায়েন্টেদের ফাইলে লেখার অনুমতি দেয়া হবে কি না।"
-
-# Translated by sadia
-#: ../data/desktop_matefile_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "নতুন গৃহীত ফাইল সম্পর্কে ঘোষনা প্রদান করা হবে কি না।"
-
 #: ../data/file-share-properties.ui.h:1
-msgid "<b>Receive Files over Bluetooth</b>"
-msgstr "<b>ব্লু-টুথের মাধ্যমে ফাইল গ্রহণ করা হবে</b>"
+msgid "Personal File Sharing Preferences"
+msgstr "ব্যক্তিগত ফাইল শেয়ারকরণের পছন্দসমূহ"
 
-# Translated by sadia
 #: ../data/file-share-properties.ui.h:2
-msgid "<b>Share Files over Bluetooth</b>"
-msgstr "<b>ব্লু-টুথের মাধ্যমে ফাইল শেয়ার করা হবে</b>"
-
-# Translated by sadia
-#: ../data/file-share-properties.ui.h:3
 msgid "<b>Share Files over the Network</b>"
 msgstr "<b>নেটওয়ার্কের মাধ্যমে ফাইল শেয়ার করা হবে</b>"
 
-# Translated by sadia
+#: ../data/file-share-properties.ui.h:3
+msgid "_Share public files on network"
+msgstr "নেটওয়ার্কে পাবলিক ফাইল শেয়ার করা হবে (_S)"
+
 #: ../data/file-share-properties.ui.h:4
-msgid "Allo_w remote devices to delete files"
-msgstr "দূরবর্তী ডিভাইসগুলোকে ফাইল মুছে ফেলার অনুমতি প্রদান করা হবে (_w)"
+msgid "_Password:"
+msgstr "পাসওয়ার্ড: (_P)"
 
-# Translated by sadia
 #: ../data/file-share-properties.ui.h:5
-msgid "Personal File Sharing Preferences"
-msgstr "ব্যক্তিগত ফাইল শেয়ারকরণের পছন্দসমূহ"
+msgid "_Require password:"
+msgstr "পাসওয়ার্ড আবশ্যক: (_R)"
 
-# Translated by sadia
 #: ../data/file-share-properties.ui.h:6
-msgid "Receive files in _Downloads folder over Bluetooth"
-msgstr "ব্লু-টুথের মাধ্যমে গৃহীত ফাইলসমূহ ডাউনলোড ফোল্ডারে সংরক্ষণ করা হবে (_D)"
+msgid "<b>Share Files over Bluetooth</b>"
+msgstr "<b>ব্লু-টুথের মাধ্যমে ফাইল শেয়ার করা হবে</b>"
 
-# Translated by sadia
 #: ../data/file-share-properties.ui.h:7
-msgid "Require re_mote devices to bond with this computer"
-msgstr "দূরবর্তী ডিভাইসগুলো এই কম্পিউটারের সাথে যুক্ত করা আবশ্যক (_m)"
-
-# Translated by sadia
-#: ../data/file-share-properties.ui.h:8
 msgid "Share public files over _Bluetooth"
 msgstr "ব্লু-টুথের মাধ্যমে পাবলিক ফাইল শেয়ার করা হবে (_B)"
 
-# Translated by sadia
+#: ../data/file-share-properties.ui.h:8
+msgid "Allo_w remote devices to delete files"
+msgstr "দূরবর্তী ডিভাইসগুলোকে ফাইল মুছে ফেলার অনুমতি প্রদান করা হবে (_w)"
+
 #: ../data/file-share-properties.ui.h:9
-msgid "_Accept files: "
-msgstr "ফাইল গ্রহণ করা হবে: (_A)"
+msgid "Require re_mote devices to bond with this computer"
+msgstr "দূরবর্তী ডিভাইসগুলো এই কম্পিউটারের সাথে যুক্ত করা আবশ্যক (_m)"
 
-# Translated by sadia
 #: ../data/file-share-properties.ui.h:10
-msgid "_Notify about received files"
-msgstr "গৃহীত ফাইল সম্পর্কে ঘোষনা প্রদান করা হবে (_N)"
+msgid "<b>Receive Files over Bluetooth</b>"
+msgstr "<b>ব্লু-টুথের মাধ্যমে ফাইল গ্রহণ করা হবে</b>"
 
-# Translated by sadia
 #: ../data/file-share-properties.ui.h:11
-msgid "_Password:"
-msgstr "পাসওয়ার্ড: (_P)"
+msgid "Receive files in _Downloads folder over Bluetooth"
+msgstr "ব্লু-টুথের মাধ্যমে গৃহীত ফাইলসমূহ ডাউনলোড ফোল্ডারে সংরক্ষণ করা হবে (_D)"
 
-# Translated by sadia
 #: ../data/file-share-properties.ui.h:12
-msgid "_Require password:"
-msgstr "পাসওয়ার্ড আবশ্যক: (_R)"
+msgid "_Accept files: "
+msgstr "ফাইল গ্রহণ করা হবে: (_A)"
 
-# Translated by sadia
 #: ../data/file-share-properties.ui.h:13
-msgid "_Share public files on network"
-msgstr "নেটওয়ার্কে পাবলিক ফাইল শেয়ার করা হবে (_S)"
+msgid "_Notify about received files"
+msgstr "গৃহীত ফাইল সম্পর্কে ঘোষনা প্রদান করা হবে (_N)"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
 
-# Translated by sadia
-#: ../data/mateuser-share-properties.desktop.in.h:1
-#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
+
+#: ../data/mate-user-share-properties.desktop.in.h:1
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "ব্যক্তিগত ফাইল শেয়ারকরণ"
 
-# Translated by sadia
-#: ../data/mateuser-share-properties.desktop.in.h:2
+#: ../data/mate-user-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "ফাইল শেয়ারকরণের পছন্দসমূহ"
 
-# Translated by sadia
-#: ../data/mateuser-share.desktop.in.in.h:1
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "সক্রিয় করা থাকলে, ব্যক্তিগতভাবে শেয়ারকৃত ফাইল চালু করা হবে"
 
-# Translated by sadia
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "পছন্দসমূহ চালু করা হবে"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr ""
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr ""
+
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr ""
 
-# Translated by sadia
-#: ../src/caja-share-bar.c:187
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "ব্যক্তিগতভাবে শেয়ারকৃত ফাইলের পছন্দসমূহ চালু করা হবে"
 
-# Translated by sadia
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "ব্যক্তিগতভাবে শেয়ারকৃত ফাইলের পছন্দসমূহ চালু করতে ব্যর্থ"
 
-# Translated by sadia
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "এই ফোল্ডার থেকে আপনি ফাইল শেয়ার করতে পারেন এবং গ্রহণও করতে পারেন"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr ""
 
-# Translated by sadia
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "এই ফোল্ডার থেকে আপনি নেটওয়ার্ক ও ব্লুটুথের মাধ্যমে ফাইল শেয়ার করতে পারেন"
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr ""
 
-# Translated by sadia
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "এই ফোল্ডারে আপনি ব্লুটুথের মাধ্যমে ফাইল গ্রহণ করতে পারেন "
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr ""
+
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr ""
 
-#: ../src/file-share-properties.c:436
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "বিনা কারণে"
 
-# Translated by sadia
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "সহায়িকার বিষয়বস্তু প্রদর্শন করা সম্ভব হয়নি।"
 
-# Translated by sadia
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "ইন্টারফেস নির্মাণ করা যায়নি।"
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "কখনো না"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "ফাইল লেখার সময়"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "সর্বদা"
 
-# Translated by sadia
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "শুধুমাত্র ডিভাইস সেট আপের জন্য"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "জিজ্ঞাসা করা হবে"
 
@@ -269,47 +176,36 @@ msgstr "জিজ্ঞাসা করা হবে"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "%s এর পাবলিক ফাইল"
 
-# Translated by sadia
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "%s-এর পাবলিক ফাইল %s-এ"
 
-# Translated by sadia
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "ব্লু-টুথের মাধ্যমে আপনি \"%s\" গ্রহণ করেছেন"
 
-# Translated by sadia
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "আপনি একটি ফাইল গ্রহণ করেছেন"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "ফাইল খুলুন"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "ফাইল প্রকাশ করা হবে"
 
-# Translated by sadia
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "ফাইল গ্রহণ প্রক্রিয়া সম্পন্ন"
-
-# Translated by sadia
-#~ msgid "Please log in as the user guest"
-#~ msgstr "অনুগ্রহ করে অতিথি ব্যবহারকারী হিসেবে লগইন করুন"
-
-#~ msgid "Only for Bonded and Trusted devices"
-#~ msgstr "শুধুমাত্র Bonded (যুক্ত) ও Trusted (বিশ্বস্ত) ডিভাইসের ক্ষেত্রে"
diff --git a/po/bn_IN.po b/po/bn_IN.po
index ed46f31..28ab788 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -1,225 +1,167 @@
-# translation of bn_IN.po to Bengali INDIA
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
-# Runa Bhattacharjee <[email protected]>, 2009, 2010.
+# 
+# Translators:
+# runab <[email protected]>, 2009, 2010
 msgid ""
 msgstr ""
-"Project-Id-Version: bn_IN\n"
-"Report-Msgid-Bugs-To: http://bugzilla.mateorg/enter_bug.cgi?product=mateuser-share&component=general\n"
-"POT-Creation-Date: 2010-09-18 15:56+0000\n"
-"PO-Revision-Date: 2010-09-21 13:53+0530\n"
-"Last-Translator: Runa Bhattacharjee <[email protected]>\n"
-"Language-Team: Bengali INDIA <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: monsta <[email protected]>\n"
+"Language-Team: Bengali (India) (http://www.transifex.com/mate/MATE/language/bn_IN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"Language: bn_IN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/desktop_matefile_sharing.schemas.in.h:1
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr ""
-"মান true (সত্য) হলে, লগ-ইন করা হলে ব্লু-টুথ ডিভাইস থেকে ব্যবহারকারীদের Downloads "
-"ডিরেক্টরির মধ্যে ফাইল স্থানান্তর করা যাবে।"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr ""
-"মান true (সত্য) হলে, ব্যবহারকারী লগ-ইন করলে ব্যবহারকারীর ব্যক্তিগত ডিরেক্টরির মধ্যে "
-"উপস্থিত Public ডিরেক্টরিটি ব্লু-টুথ ডিভাইসের মাধ্যমে যৌথ ব্যবহারেরর জন্য উপস্থিত করা "
-"যাবে।"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:3
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr ""
-"মান true (সত্য) হলে, ব্যবহারকারী লগ-ইন করলে ব্যবহারকারীর ব্যক্তিগত ডিরেক্টরির মধ্যে "
-"উপস্থিত Public ডিরেক্টরিটি নেটওয়ার্কের মাধ্যমে যৌথ ব্যবহারেরর জন্য উপস্থিত করা যাবে।"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:4
-msgid "Share Public directory over Bluetooth"
-msgstr "যৌথ ব্যবহারের জন্য ব্লু-টুথের মাধ্যমে Public ডিরেক্টরি উপলব্ধ করা হবে"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:5
-msgid "Share Public directory over the network"
-msgstr "যৌথ ব্যবহারের জন্য নেটওয়ার্কের মাধ্যমে Public ডিরেক্টরি উপলব্ধ করা হবে"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:6
-msgid "When to accept files sent over Bluetooth"
-msgstr "ব্লু-টুথের মাধ্যমে উপলব্ধ ফাইল কখন গ্রহণ করা হবে"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:7
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr ""
-"ব্লু-টুথের মাধ্যমে উপলব্ধ ফাইল কখন গ্রহণ করা হবে। সম্ভাব্য মান হল: \"always (সর্বদা)"
-"\", \"bonded (যুক্ত)\", ও \"ask (জিজ্ঞাসা)\"।"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:8
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr ""
-"পাসওয়ার্ড উল্লেখের অনুরোধ কখন করা হবে। সম্ভাব্য মান হল: \"never (কখনো না)\", "
-"\"on_write (লেখার সময়)\", ও \"always (সর্বদা)\"।"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:9
-msgid "When to require passwords"
-msgstr "পাসওয়ার্ড কখন আবশ্যক হবে"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "ObexPush-র সাহায্যে ব্লু-টিথ ক্লায়েন্ট দ্বারা ফাইল পাঠানো সম্ভব হবে কি না।"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:11
-msgid "Whether Bluetooth clients need to pair with the computer to send files."
-msgstr ""
-"ফাইল পাঠানোর জন্য, ব্লু-টুথ ক্লায়েন্ট দ্বারা কখন একটি কম্পিউটারের সাথে যুগ্মভাবে "
-"সঞ্চালন করা আবশ্যক।"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:12
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr ""
-"ব্লু-টুথ ক্লায়েন্ট দ্বারা ফাইল লেখা সম্ভব হবে না কি শুধুমাত্র পাঠযোগ্য অনুমতি সহ ফাইলের "
-"যৌথ ব্যবহার করা যাবে।"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:13
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "ব্লু-টুথ ক্লায়েন্টের জন্য ফাইলে লেখার অনুমতি উপস্থিত থাকবে কি না।"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "নতুন প্রাপ্ত ফাইল সম্পর্কে সূচনা প্রদান করা হবে কি না।"
-
 #: ../data/file-share-properties.ui.h:1
-msgid "<b>Receive Files over Bluetooth</b>"
-msgstr "<b>ব্লু-টুথের মাধ্যমে ফাইল গ্রহণ করা হবে</b>"
+msgid "Personal File Sharing Preferences"
+msgstr "ব্যক্তিগত ফাইলের যৌথ ব্যবহার সংক্রান্ত পছন্দসই মান"
 
 #: ../data/file-share-properties.ui.h:2
-msgid "<b>Share Files over Bluetooth</b>"
-msgstr "<b>ব্লু-টুথের মাধ্যমে যৌথরূপে ফাইল ব্যবহার করা হবে</b>"
-
-#: ../data/file-share-properties.ui.h:3
 msgid "<b>Share Files over the Network</b>"
 msgstr "<b>নেটওয়ার্কের মাধ্যমে যৌথরূপে ফাইল ব্যবহার করা হবে</b>"
 
+#: ../data/file-share-properties.ui.h:3
+msgid "_Share public files on network"
+msgstr "যৌথ ব্যবহারের জন্য নেটওয়ার্কের মাধ্যমে সার্বজনীন ফাইল উপলব্ধ করা হবে"
+
 #: ../data/file-share-properties.ui.h:4
-msgid "Allo_w remote devices to delete files"
-msgstr "দূরবর্তী ডিভাইস দ্বারা ফাইল মুছে ফেলার অনুমতি প্রদান করা হবে (_w)"
+msgid "_Password:"
+msgstr "পাসওয়ার্ড: (_P)"
 
 #: ../data/file-share-properties.ui.h:5
-msgid "Personal File Sharing Preferences"
-msgstr "ব্যক্তিগত ফাইলের যৌথ ব্যবহার সংক্রান্ত পছন্দসই মান"
+msgid "_Require password:"
+msgstr "পাসওয়ার্ড আবশ্যক: (_R)"
 
 #: ../data/file-share-properties.ui.h:6
-msgid "Receive files in _Downloads folder over Bluetooth"
-msgstr "ব্লু-টুথের মাধ্যমে উপলব্ধ ফাইল Downloads ফোল্ডারে সংরক্ষণ করা হবে (_D)"
+msgid "<b>Share Files over Bluetooth</b>"
+msgstr "<b>ব্লু-টুথের মাধ্যমে যৌথরূপে ফাইল ব্যবহার করা হবে</b>"
 
 #: ../data/file-share-properties.ui.h:7
-msgid "Require re_mote devices to bond with this computer"
-msgstr "দূরবর্তী ডিভাইসের ক্ষেত্রে এই কম্পিউটারের সাথে সংযোগ স্থাপন করা আবশ্যক (_m)"
-
-#: ../data/file-share-properties.ui.h:8
 msgid "Share public files over _Bluetooth"
 msgstr "যৌথ ব্যবহারের জন্য ব্লু-টুথের মাধ্যমে সার্বজনীন উপলব্ধ করা হবে (_B)"
 
+#: ../data/file-share-properties.ui.h:8
+msgid "Allo_w remote devices to delete files"
+msgstr "দূরবর্তী ডিভাইস দ্বারা ফাইল মুছে ফেলার অনুমতি প্রদান করা হবে (_w)"
+
 #: ../data/file-share-properties.ui.h:9
-msgid "_Accept files: "
-msgstr "ফাইল গ্রহণ করা হবে: (_A)"
+msgid "Require re_mote devices to bond with this computer"
+msgstr "দূরবর্তী ডিভাইসের ক্ষেত্রে এই কম্পিউটারের সাথে সংযোগ স্থাপন করা আবশ্যক (_m)"
 
 #: ../data/file-share-properties.ui.h:10
-msgid "_Notify about received files"
-msgstr "নতুন প্রাপ্ত ফাইল সম্পর্কে সূচনা প্রদান করা হবে (_N)"
+msgid "<b>Receive Files over Bluetooth</b>"
+msgstr "<b>ব্লু-টুথের মাধ্যমে ফাইল গ্রহণ করা হবে</b>"
 
 #: ../data/file-share-properties.ui.h:11
-msgid "_Password:"
-msgstr "পাসওয়ার্ড: (_P)"
+msgid "Receive files in _Downloads folder over Bluetooth"
+msgstr "ব্লু-টুথের মাধ্যমে উপলব্ধ ফাইল Downloads ফোল্ডারে সংরক্ষণ করা হবে (_D)"
 
 #: ../data/file-share-properties.ui.h:12
-msgid "_Require password:"
-msgstr "পাসওয়ার্ড আবশ্যক: (_R)"
+msgid "_Accept files: "
+msgstr "ফাইল গ্রহণ করা হবে: (_A)"
 
 #: ../data/file-share-properties.ui.h:13
-msgid "_Share public files on network"
-msgstr "যৌথ ব্যবহারের জন্য নেটওয়ার্কের মাধ্যমে সার্বজনীন ফাইল উপলব্ধ করা হবে"
+msgid "_Notify about received files"
+msgstr "নতুন প্রাপ্ত ফাইল সম্পর্কে সূচনা প্রদান করা হবে (_N)"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
 
-#: ../data/mateuser-share-properties.desktop.in.h:1
-#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
+
+#: ../data/mate-user-share-properties.desktop.in.h:1
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "ব্যক্তিগত ফাইলের যৌথ ব্যবহার"
 
-#: ../data/mateuser-share-properties.desktop.in.h:2
+#: ../data/mate-user-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "ফাইলের যৌথ ব্যবহার সংক্রান্ত পছন্দসই মান"
 
-#: ../data/mateuser-share.desktop.in.in.h:1
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "সক্রিয় থাকলে, ব্যক্তিগত ফাইলের যৌথ ব্যবহার আরম্ভ করা হবে"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "পছন্দসই বৈশিষ্ট্য আরম্ভ করা হবে"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr ""
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr ""
+
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr ""
 
-#: ../src/caja-share-bar.c:187
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "ব্যক্তিগত ফাইলের যৌথ ব্যবহার সংক্রান্ত পছন্দের বৈশিষ্ট্য আরম্ভ করা হবে"
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "ব্যক্তিগত ফাইলের যৌথ ব্যবহার সংক্রান্ত পছন্দের বৈশিষ্ট্য আরম্ভ করতে ব্যর্থ"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "এই ফোল্ডারের ফাইল অন্যদের জন্য উপলব্ধ করা যাবে ও এই ফোল্ডারে ফাইল প্রাপ্ত করা যাবে"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr ""
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
 msgstr ""
-"নেটওয়ার্ক ও ব্লু-টুথের মাধ্যমে এই ফোল্ডারের মধ্যে অন্তর্ভুক্ত ফাইল যৌথরূপে ব্যবহার করা "
-"যাবে"
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "ব্লু-টুথের মাধ্যমে এই ফোল্ডারের মধ্যে ফাইল প্রাপ্ত করা যাবে"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr ""
 
-#: ../src/file-share-properties.c:436
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr ""
+
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "বিনা কারণে"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "সাহায্যের সূচী প্রদর্শন করা সম্ভব হয়নি।"
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "ইন্টারফেস নির্মাণ করতে ব্যর্থ।"
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "কখনো না"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "ফাইল লেখার সময়"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "সর্বদা"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "শুধুমাত্র প্রস্তুত করা ডিভাইসের ক্ষেত্রে"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "জিজ্ঞাসা করা হবে"
 
@@ -232,37 +174,36 @@ msgstr "জিজ্ঞাসা করা হবে"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "%s-র সার্বজনীন ফাইল"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "%s-র %s-এ উপস্থিত সার্বজনীন ফাইল"
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "ব্লু-টুথের মাধ্যমে আপনি \"%s\" প্রাপ্ত করেছেন"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "আপনি একটি ফাইল প্রাপ্ত করেছেন"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "ফাইল খুলুন"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "ফাইল প্রকাশ করা হবে"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "ফাইল গ্রহণ করা হয়েছে"
-
diff --git a/po/br.po b/po/br.po
index 057d226..323180b 100644
--- a/po/br.po
+++ b/po/br.po
@@ -1,197 +1,167 @@
-# Breton translation for mateuser-share
-# Copyright (c) 2010 The Gnome Project
-# This file is distributed under the same license as the mateuser-share package.
-#
-# Alan Monfort <[email protected]>, 2010.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Alan Monfort <[email protected]>, 2010,2015
 msgid ""
 msgstr ""
-"Project-Id-Version: mateuser-share\n"
-"Report-Msgid-Bugs-To: http://bugzilla.mateorg/enter_bug.cgi?product=mateuser-share&component=general\n"
-"POT-Creation-Date: 2010-06-27 09:51+0000\n"
-"PO-Revision-Date: 2010-07-13 19:42+0100\n"
-"Last-Translator: Denis <[email protected]>\n"
-"Language-Team: Brenux <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: Alan Monfort <[email protected]>\n"
+"Language-Team: Breton (http://www.transifex.com/mate/MATE/language/br/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:1
-msgid "If this is true, Bluetooth devices can send files to the user's Downloads directory when logged in."
-msgstr "Mar GWIR e vez kaset restroù gant an trobarzhelloù Bluetooth da gavlec'hiad Pellgargañ an arveriad pa vez kennasket."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:2
-msgid "If this is true, the Public directory in the users home directory will be shared over Bluetooth when the user is logged in."
-msgstr "Mar GWIR e vo rannet ar c'havlec'hiad foran e kavlec'hiad personel an arveriaded dre vBluetooth pa vez kennasket an arveriad."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:3
-msgid "If this is true, the Public directory in the users home directory will be shared over the network when the user is logged in."
-msgstr "Mar GWIR e vo rannet ar c'havlec'hiad foran e kavlec'hiad personel an arveriaded dre ar rouedad pa vez kennasket an arveriad."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:4
-msgid "Share Public directory over Bluetooth"
-msgstr "Rannañ ar c'havlec'hiad foran dre vBluetooth"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:5
-msgid "Share Public directory over the network"
-msgstr "Rannañ ar c'havlec'hiad foran dre ar rouedad"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:6
-msgid "When to accept files sent over Bluetooth"
-msgstr "Pegoulz asantiñ restroù kaset dre vBluetooth"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:7
-msgid "When to accept files sent over Bluetooth. Possible values are \"always\", \"bonded\" and \"ask\"."
-msgstr "Pegoulz asantiñ restroù kaset dre vBluetooth. Ar gwerzhioù zo \"always\" (bepred), \"bonded\" (mar ereet) hag \"ask\" (goulenn)."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:8
-msgid "When to ask for passwords. Possible values are \"never\", \"on_write\", and \"always\"."
-msgstr "Pegoulz goulenn ur ger-tremen. Ar gwerzhioù zo \"never\", (morse) \"on_write\" (gant ar skritur) hag \"always\" (bepred)."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:9
-msgid "When to require passwords"
-msgstr "Pegoulz azgoulenn ar gerioù-tremen"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "Menegiñ a ra hag-eñ e vo kaset restroù gant arvalion Bluetooth en ur ober gant ObexPush."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:11
-msgid "Whether Bluetooth clients need to pair with the computer to send files."
-msgstr "Menegiñ a ra hag-eñ ez eo ret da arvalion Bluetooth bezañ liammet gant an urzhiataer a-benn kas restroù."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:12
-msgid "Whether to allow Bluetooth clients to write files, or share the files read-only."
-msgstr "Menegiñ a ra hag-eñ ez eo aotreet arvalion Bluetooth da skrivañ restroù pe rannañ ar restroù e mod lenn nemetken."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:13
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "Menegiñ a ra hag-eñ ez eo aotreet arvalion Bluetooth da skrivañ restroù."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "Menegiñ a ra hag-eñ e vo kemennet a-fet restroù nevez degemeret"
+"Language: br\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: ../data/file-share-properties.ui.h:1
-msgid "<b>Receive Files over Bluetooth</b>"
-msgstr "<b>Degemer restroù dre vBluetooth</b>"
+msgid "Personal File Sharing Preferences"
+msgstr "Gwellvezioù a-fet rannañ restroù personel"
 
 #: ../data/file-share-properties.ui.h:2
-msgid "<b>Share Files over Bluetooth</b>"
-msgstr "<b>Rannañ restroù dre vBluetooth</b>"
-
-#: ../data/file-share-properties.ui.h:3
 msgid "<b>Share Files over the Network</b>"
 msgstr "<b>Rannañ restroù dre ar rouedad</b>"
 
+#: ../data/file-share-properties.ui.h:3
+msgid "_Share public files on network"
+msgstr "_Rannañ restroù foran dre ar rouedad"
+
 #: ../data/file-share-properties.ui.h:4
-msgid "Allo_w remote devices to delete files"
-msgstr "Aotren an trobarzhelloù a-benn da zilemel restroù"
+msgid "_Password:"
+msgstr "_Ger-tremen :"
 
 #: ../data/file-share-properties.ui.h:5
-msgid "Personal File Sharing Preferences"
-msgstr "Gwellvezioù a-fet rannañ restroù personel"
+msgid "_Require password:"
+msgstr "_Azgoulenn ur ger-tremen :"
 
 #: ../data/file-share-properties.ui.h:6
-msgid "Receive files in _Downloads folder over Bluetooth"
-msgstr "Degemer restroù en teuliad Pellgargadurioù dre vBluetooth"
+msgid "<b>Share Files over Bluetooth</b>"
+msgstr "<b>Rannañ restroù dre vBluetooth</b>"
 
 #: ../data/file-share-properties.ui.h:7
-msgid "Require re_mote devices to bond with this computer"
-msgstr "Azgoulenn ma vo liammet an trobarzhelloù a-bell gant an urzhiataer-mañ"
-
-#: ../data/file-share-properties.ui.h:8
 msgid "Share public files over _Bluetooth"
 msgstr "Rannañ restroù foran dre v_Bluetooth"
 
+#: ../data/file-share-properties.ui.h:8
+msgid "Allo_w remote devices to delete files"
+msgstr "Aotren an trobarzhelloù da zilemel restroù"
+
 #: ../data/file-share-properties.ui.h:9
-msgid "_Accept files: "
-msgstr "_Asantiñ ar restroù : "
+msgid "Require re_mote devices to bond with this computer"
+msgstr "Azgoulenn ma vo liammet an trobarzhelloù a-bell gant an urzhiataer-mañ"
 
 #: ../data/file-share-properties.ui.h:10
-msgid "_Notify about received files"
-msgstr "_Kemenn a-fet restroù degemeret"
+msgid "<b>Receive Files over Bluetooth</b>"
+msgstr "<b>Degemer restroù dre vBluetooth</b>"
 
 #: ../data/file-share-properties.ui.h:11
-msgid "_Password:"
-msgstr "_Ger-tremen :"
+msgid "Receive files in _Downloads folder over Bluetooth"
+msgstr "_Degemer restroù en teuliad Pellgargadurioù dre vBluetooth"
 
 #: ../data/file-share-properties.ui.h:12
-msgid "_Require password:"
-msgstr "_Azgoulenn ur ger-tremen :"
+msgid "_Accept files: "
+msgstr "_Asantiñ ar restroù : "
 
 #: ../data/file-share-properties.ui.h:13
-msgid "_Share public files on network"
-msgstr "Rannañ restroù foran dre ar rouedad"
+msgid "_Notify about received files"
+msgstr "_Kemenn a-fet restroù degemeret"
 
-#: ../data/mateuser-share-properties.desktop.in.h:1
-#: ../data/mateuser-share.desktop.in.in.h:2
-#: ../src/caja-share-bar.c:162
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr "Rannadur an arveriad"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr "Enframmañ a ra gant rannadur an arveriad"
+
+#: ../data/mate-user-share-properties.desktop.in.h:1
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
-msgstr "Rannadur restroù foran"
+msgstr "Rannadur restroù personel"
 
-#: ../data/mateuser-share-properties.desktop.in.h:2
+#: ../data/mate-user-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Gwellvezioù a-fet rannañ restroù"
 
-#: ../data/mateuser-share.desktop.in.in.h:1
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr "Obexftp evit rannadur restroù personel"
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Loc'hañ ar rannadur restroù personel mar bez gweredekaet"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "Gwellvezioù al loc'hañ"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr "Obepush evit rannadur restroù personel"
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr "Webdav evit rannadur restroù personel"
 
-#: ../src/caja-share-bar.c:187
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr "Gwellvezioù"
+
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Loc'hañ ar gwellvezioù a-fet rannadur restroù personel"
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
-msgstr "N'eo ket goust da loc'hañ ar gwellvezioù a-fet rannadur restroù personel"
+msgstr "N'eo ket gouest da loc'hañ ar gwellvezioù a-fet rannadur restroù personel"
+
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr "Arveret e vez evit rannañ pe zegemer restroù"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "Rannet e vez restroù diouzh an ha degemer restroù ennañ"
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr "Rannet e vez dre ar rouedad pe vBluetooth"
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "Rannet e vez restroù diouzh an teuliad-mañ dre ar rouedad ha Bluetooth"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr "Rannet e vez dre ar rouedad"
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "Degemerez e vez restroù dre vBluetooth en teuliad-mañ"
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr "Arveret e vez evit degemer restroù dre vBluetooth"
 
-#: ../src/file-share-properties.c:436
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "Abeg ebet"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
-msgstr "N'hall ket skrammañ endalc'hadoù ar skoazell"
+msgstr "N'hall ket skrammañ endalc'hadoù ar skoazell."
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
-msgstr "N'hall ket sevel ar c'hetal"
+msgstr "N'hall ket sevel ar c'hetal."
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "Morse"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "Pa vez o skrivañ restroù"
 
-#: ../src/file-share-properties.c:572
-#: ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "Bepred"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "Evit an trobarzhelloù bet kefluniet hepken"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "Goulenn"
 
@@ -204,54 +174,36 @@ msgstr "Goulenn"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "Restroù foran %s"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "Restroù foran %s war %s"
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "Degemeret hoc'h eus \"%s\" dre vBluetooth"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "Degemeret hoc'h eus ur restr"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "Digeriñ ur restr"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
-msgstr "Deskouez ar restr"
+msgstr "Diskouez ar restr"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "Echu eo degemer ar restr"
-
-#~ msgid ""
-#~ "This feature cannot be enabled because the required packages are not "
-#~ "installed on your system"
-#~ msgstr ""
-#~ "Ar mollad-mañ n'hall ket bezañ gweredekaet rak n'eo ket bet staliet ar "
-#~ "pakadoù ret war ho reizhiad"
-#~ msgid "You have received the file “%s” over Bluetooth."
-#~ msgstr "Degemeret hoc'h eus ar restr \"%s\" dre vBluetooth."
-#~ msgid "File Received"
-#~ msgstr "Restr degemeret"
-#~ msgid "Open"
-#~ msgstr "Digeriñ"
-#~ msgid "Reveal"
-#~ msgstr "Diskouez"
-#~ msgid "OK"
-#~ msgstr "Mat eo"
-
diff --git a/po/ca.po b/po/ca.po
index 30a6ee5..111c877 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,226 +1,168 @@
-# Catalan translation of mateuser-share.
-# Copyright (C) 2005, 2006 The mateuser-share's copyright holder
-# This file is distributed under the same license as the
-#    mateuser-share package.
-#
-# Gil Forcada <[email protected]>, 2005, 2006, 2008, 2009, 2010.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Gil Forcada <[email protected]>, 2005, 2006, 2008, 2009, 2010
+# Robert Antoni Buj i Gelonch <[email protected]>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: mateuser-share\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-13 18:00+0100\n"
-"PO-Revision-Date: 2010-03-13 18:00+0100\n"
-"Last-Translator: Gil Forcada <[email protected]>\n"
-"Language-Team: Catalan <[email protected]>\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: Robert Antoni Buj i Gelonch <[email protected]>\n"
+"Language-Team: Catalan (http://www.transifex.com/mate/MATE/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:1
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr ""
-"Si és cert, els dispositius Bluetooth poden enviar fitxers a la carpeta de "
-"baixades de l'usuari quan aquest usuari hagi entrat."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr ""
-"Si és cert, la carpeta Públic de la carpeta d'inici de l'usuari es "
-"compartirà a través del Bluetooth quan aquest hagi entrat."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:3
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr ""
-"Si és cert, la carpeta Públic de la carpeta d'inici de cada usuari es "
-"compartirà a través de la xarxa quan l'usuari entri."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:4
-msgid "Share Public directory over Bluetooth"
-msgstr "Comparteix la carpeta Públic a través del Bluetooth"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:5
-msgid "Share Public directory over the network"
-msgstr "Comparteix la carpeta Públic a través de la xarxa"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:6
-msgid "When to accept files sent over Bluetooth"
-msgstr "Quan s'han d'acceptar fitxers enviats a través del Bluetooth"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:7
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr ""
-"Quan s'hagin d'acceptar fitxers a través del Bluetooth. Els possibles valors "
-"són «always» (sempre), «bonded» (vinculat) i «ask» (pregunta)."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:8
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr ""
-"Quan s'ha de demanar contrasenya. Els possibles valors són «never» (mai), "
-"«on_write» (en escriure), i «always» (sempre)."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:9
-msgid "When to require passwords"
-msgstr "Quan s'ha de demanar contrasenya"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "Si els clients del Bluetooth poden enviar fitxers amb ObexPush."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:11
-msgid "Whether Bluetooth clients need to pair with the computer to send files."
-msgstr ""
-"Si cal que els clients del Bluetooth s'aparellin amb l'ordinador per a poder "
-"enviar fitxers."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:12
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr ""
-"Si es permet escriure fitxers als clients del Bluetooth, o si només es "
-"compartiran en mode lectura."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:13
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "Si es permet escriure fitxers als clients del Bluetooth."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "Si s'ha de notificar sobre els fitxers rebuts nous."
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/file-share-properties.ui.h:1
-msgid "<b>Receive Files over Bluetooth</b>"
-msgstr "<b>Recepció de fitxers a través del Bluetooth</b>"
+msgid "Personal File Sharing Preferences"
+msgstr "Preferències de la compartició de fitxers personals"
 
 #: ../data/file-share-properties.ui.h:2
-msgid "<b>Share Files over Bluetooth</b>"
-msgstr "<b>Compartició de fitxers a través del Bluetooth</b>"
-
-#: ../data/file-share-properties.ui.h:3
 msgid "<b>Share Files over the Network</b>"
 msgstr "<b>Compartició de fitxers a través de la xarxa</b>"
 
+#: ../data/file-share-properties.ui.h:3
+msgid "_Share public files on network"
+msgstr "_Comparteix els fitxers públics a la xarxa"
+
 #: ../data/file-share-properties.ui.h:4
-msgid "Allo_w remote devices to delete files"
-msgstr "Permet que els dispositius remots suprimeixin _fitxers"
+msgid "_Password:"
+msgstr "_Contrasenya:"
 
 #: ../data/file-share-properties.ui.h:5
-msgid "Personal File Sharing Preferences"
-msgstr "Preferències de la compartició de fitxers personals"
+msgid "_Require password:"
+msgstr "_Requereix contrasenya:"
 
 #: ../data/file-share-properties.ui.h:6
-msgid "Receive files in _Downloads folder over Bluetooth"
-msgstr ""
-"Desa els fitxers rebuts a través del Bluetooth a la carpeta de _baixades"
+msgid "<b>Share Files over Bluetooth</b>"
+msgstr "<b>Compartició de fitxers a través del Bluetooth</b>"
 
 #: ../data/file-share-properties.ui.h:7
-msgid "Require re_mote devices to bond with this computer"
-msgstr "Requereix que els dispositius _remots es vinculin amb aquest ordinador"
-
-#: ../data/file-share-properties.ui.h:8
 msgid "Share public files over _Bluetooth"
 msgstr "Comparteix els fitxers públics a través del _Bluetooth"
 
+#: ../data/file-share-properties.ui.h:8
+msgid "Allo_w remote devices to delete files"
+msgstr "Permet que els dispositius remots suprimeixin _fitxers"
+
 #: ../data/file-share-properties.ui.h:9
-msgid "_Accept files: "
-msgstr "_Accepta els fitxers: "
+msgid "Require re_mote devices to bond with this computer"
+msgstr "Requereix que els dispositius _remots es vinculin amb aquest ordinador"
 
 #: ../data/file-share-properties.ui.h:10
-msgid "_Notify about received files"
-msgstr "_Notifica en rebre fitxers"
+msgid "<b>Receive Files over Bluetooth</b>"
+msgstr "<b>Recepció de fitxers a través del Bluetooth</b>"
 
 #: ../data/file-share-properties.ui.h:11
-msgid "_Password:"
-msgstr "_Contrasenya:"
+msgid "Receive files in _Downloads folder over Bluetooth"
+msgstr "Desa els fitxers rebuts a través del Bluetooth a la carpeta de _baixades"
 
 #: ../data/file-share-properties.ui.h:12
-msgid "_Require password:"
-msgstr "_Requereix contrasenya:"
+msgid "_Accept files: "
+msgstr "_Accepta els fitxers: "
 
 #: ../data/file-share-properties.ui.h:13
-msgid "_Share public files on network"
-msgstr "_Comparteix els fitxers públics a la xarxa"
+msgid "_Notify about received files"
+msgstr "_Notifica en rebre fitxers"
 
-#: ../data/mateuser-share-properties.desktop.in.h:1
-#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr "Comparticions de l'usuari"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr "S'integra amb user-share"
+
+#: ../data/mate-user-share-properties.desktop.in.h:1
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "Compartició de fitxers personals"
 
-#: ../data/mateuser-share-properties.desktop.in.h:2
+#: ../data/mate-user-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Preferències per a compartir fitxers"
 
-#: ../data/mateuser-share.desktop.in.in.h:1
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr "Compartició de fitxers personals obexftp"
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Executa la compartició de fitxers personals si està habilitat"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "Inicia les preferències"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr "Compartició de fitxers personals obexpush"
 
-#: ../src/caja-share-bar.c:187
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr "Compartició de fitxers personals webdav"
+
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr "Preferències"
+
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Inicia les preferències de la compartició de fitxers personals"
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
-msgstr ""
-"No s'ha pogut iniciar les preferències de la compartició de fitxers personals"
+msgstr "No s'ha pogut iniciar les preferències de la compartició de fitxers personals"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "Podeu compartir fitxers des d'aquesta carpeta i rebre'n-hi"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr "Es pot utilitzar per compartir o rebre fitxers"
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr ""
-"Podeu compartir fitxers des d'aquesta carpeta a través de la xarxa i de "
-"Bluetooth"
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr "Es pot compartir a través de la xarxa o per Bluetooth"
+
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr "Es pot compartir a través de la xarxa"
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "Podeu rebre fitxers en aquesta carpeta a través de Bluetooth"
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr "Es pot utilitzar per rebre fitxers a través de Bluetooth"
 
-#: ../src/file-share-properties.c:436
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "Cap motiu"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "No s'ha pogut mostrar l'ajuda."
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "No s'ha pogut construir la interfície."
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "Mai"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "Quan s'escriguin fitxers"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "Sempre"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "Només per a dispositius configurats"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "Pregunta"
 
@@ -233,45 +175,36 @@ msgstr "Pregunta"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "Fitxers públics de %s"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "Fitxers públics de %s a %s"
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "Heu rebut «%s» a través del Bluetooth"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "Heu rebut un fitxer"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "Obre el fitxer"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "Revela el fitxer"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "S'ha completat la recepció del fitxer"
-
-#~ msgid "Only for Bonded and Trusted devices"
-#~ msgstr "Només per a dispositius vinculats i de confiança"
-
-#~ msgid "Please log in as the user guest"
-#~ msgstr "Entreu com a usuari convidat"
-
-#~ msgid "User Sharing"
-#~ msgstr "Compartició d'usuari"
diff --git a/po/[email protected] b/po/[email protected]
index 65100e5..8d2af8a 100644
--- a/po/[email protected]
+++ b/po/[email protected]
@@ -1,227 +1,167 @@
-# Catalan translation of mateuser-share.
-# Copyright (C) 2005, 2006 The mateuser-share's copyright holder
-# This file is distributed under the same license as the
-#    mateuser-share package.
-#
-# Gil Forcada <[email protected]>, 2005, 2006, 2008, 2009, 2010.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Gil Forcada <[email protected]>, 2005, 2006, 2008, 2009, 2010
 msgid ""
 msgstr ""
-"Project-Id-Version: mateuser-share\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-29 01:28+0100\n"
-"PO-Revision-Date: 2010-03-13 18:00+0100\n"
-"Last-Translator: Gil Forcada <[email protected]>\n"
-"Language-Team: Catalan <[email protected]>\n"
-"Language: ca\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: monsta <[email protected]>\n"
+"Language-Team: Catalan (Valencian) (http://www.transifex.com/mate/MATE/language/ca@valencia/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:1
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr ""
-"Si és cert, els dispositius Bluetooth poden enviar fitxers a la carpeta de "
-"baixades de l'usuari quan este usuari haja entrat."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr ""
-"Si és cert, la carpeta Públic de la carpeta d'inici de l'usuari es "
-"compartirà a través del Bluetooth quan este haja entrat."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:3
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr ""
-"Si és cert, la carpeta Públic de la carpeta d'inici de cada usuari es "
-"compartirà a través de la xarxa quan l'usuari entri."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:4
-msgid "Share Public directory over Bluetooth"
-msgstr "Comparteix la carpeta Públic a través del Bluetooth"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:5
-msgid "Share Public directory over the network"
-msgstr "Comparteix la carpeta Públic a través de la xarxa"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:6
-msgid "When to accept files sent over Bluetooth"
-msgstr "Quan s'han d'acceptar fitxers enviats a través del Bluetooth"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:7
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr ""
-"Quan s'hagen d'acceptar fitxers a través del Bluetooth. Els possibles valors "
-"són «always» (sempre), «bonded» (vinculat) i «ask» (pregunta)."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:8
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr ""
-"Quan s'ha de demanar contrasenya. Els possibles valors són «never» (mai), "
-"«on_write» (en escriure), i «always» (sempre)."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:9
-msgid "When to require passwords"
-msgstr "Quan s'ha de demanar contrasenya"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "Si els clients del Bluetooth poden enviar fitxers amb ObexPush."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:11
-msgid "Whether Bluetooth clients need to pair with the computer to send files."
-msgstr ""
-"Si cal que els clients del Bluetooth s'aparellin amb l'ordinador per a poder "
-"enviar fitxers."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:12
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr ""
-"Si es permet escriure fitxers als clients del Bluetooth, o si només es "
-"compartiran en mode lectura."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:13
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "Si es permet escriure fitxers als clients del Bluetooth."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "Si s'ha de notificar sobre els fitxers rebuts nous."
+"Language: ca@valencia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/file-share-properties.ui.h:1
-msgid "<b>Receive Files over Bluetooth</b>"
-msgstr "<b>Recepció de fitxers a través del Bluetooth</b>"
+msgid "Personal File Sharing Preferences"
+msgstr "Preferències de la compartició de fitxers personals"
 
 #: ../data/file-share-properties.ui.h:2
-msgid "<b>Share Files over Bluetooth</b>"
-msgstr "<b>Compartició de fitxers a través del Bluetooth</b>"
-
-#: ../data/file-share-properties.ui.h:3
 msgid "<b>Share Files over the Network</b>"
 msgstr "<b>Compartició de fitxers a través de la xarxa</b>"
 
+#: ../data/file-share-properties.ui.h:3
+msgid "_Share public files on network"
+msgstr "_Comparteix els fitxers públics a la xarxa"
+
 #: ../data/file-share-properties.ui.h:4
-msgid "Allo_w remote devices to delete files"
-msgstr "Permet que els dispositius remots suprimisquen _fitxers"
+msgid "_Password:"
+msgstr "_Contrasenya:"
 
 #: ../data/file-share-properties.ui.h:5
-msgid "Personal File Sharing Preferences"
-msgstr "Preferències de la compartició de fitxers personals"
+msgid "_Require password:"
+msgstr "_Requereix contrasenya:"
 
 #: ../data/file-share-properties.ui.h:6
-msgid "Receive files in _Downloads folder over Bluetooth"
-msgstr ""
-"Alça els fitxers rebuts a través del Bluetooth a la carpeta de _baixades"
+msgid "<b>Share Files over Bluetooth</b>"
+msgstr "<b>Compartició de fitxers a través del Bluetooth</b>"
 
 #: ../data/file-share-properties.ui.h:7
-msgid "Require re_mote devices to bond with this computer"
-msgstr "Requereix que els dispositius _remots es vinculin amb este ordinador"
-
-#: ../data/file-share-properties.ui.h:8
 msgid "Share public files over _Bluetooth"
 msgstr "Comparteix els fitxers públics a través del _Bluetooth"
 
+#: ../data/file-share-properties.ui.h:8
+msgid "Allo_w remote devices to delete files"
+msgstr "Permet que els dispositius remots suprimisquen _fitxers"
+
 #: ../data/file-share-properties.ui.h:9
-msgid "_Accept files: "
-msgstr "_Accepta els fitxers: "
+msgid "Require re_mote devices to bond with this computer"
+msgstr "Requereix que els dispositius _remots es vinculin amb este ordinador"
 
 #: ../data/file-share-properties.ui.h:10
-msgid "_Notify about received files"
-msgstr "_Notifica en rebre fitxers"
+msgid "<b>Receive Files over Bluetooth</b>"
+msgstr "<b>Recepció de fitxers a través del Bluetooth</b>"
 
 #: ../data/file-share-properties.ui.h:11
-msgid "_Password:"
-msgstr "_Contrasenya:"
+msgid "Receive files in _Downloads folder over Bluetooth"
+msgstr "Alça els fitxers rebuts a través del Bluetooth a la carpeta de _baixades"
 
 #: ../data/file-share-properties.ui.h:12
-msgid "_Require password:"
-msgstr "_Requereix contrasenya:"
+msgid "_Accept files: "
+msgstr "_Accepta els fitxers: "
 
 #: ../data/file-share-properties.ui.h:13
-msgid "_Share public files on network"
-msgstr "_Comparteix els fitxers públics a la xarxa"
+msgid "_Notify about received files"
+msgstr "_Notifica en rebre fitxers"
 
-#: ../data/mateuser-share-properties.desktop.in.h:1
-#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
+
+#: ../data/mate-user-share-properties.desktop.in.h:1
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "Compartició de fitxers personals"
 
-#: ../data/mateuser-share-properties.desktop.in.h:2
+#: ../data/mate-user-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Preferències per a compartir fitxers"
 
-#: ../data/mateuser-share.desktop.in.in.h:1
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Executa la compartició de fitxers personals si està habilitat"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "Inicia les preferències"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr ""
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr ""
 
-#: ../src/caja-share-bar.c:187
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr ""
+
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Inicia les preferències de la compartició de fitxers personals"
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
+msgstr "No s'ha pogut iniciar les preferències de la compartició de fitxers personals"
+
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
 msgstr ""
-"No s'ha pogut iniciar les preferències de la compartició de fitxers personals"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "Podeu compartir fitxers des d'esta carpeta i rebre'n-hi"
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr ""
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
 msgstr ""
-"Podeu compartir fitxers des d'esta carpeta a través de la xarxa i de "
-"Bluetooth"
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "Podeu rebre fitxers en esta carpeta a través de Bluetooth"
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr ""
 
-#: ../src/file-share-properties.c:436
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "Cap motiu"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "No s'ha pogut mostrar l'ajuda."
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "No s'ha pogut construir la interfície."
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "Mai"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "Quan s'escriguen fitxers"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "Sempre"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "Només per a dispositius configurats"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "Pregunta"
 
@@ -234,45 +174,36 @@ msgstr "Pregunta"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "Fitxers públics de %s"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "Fitxers públics de %s a %s"
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "Heu rebut «%s» a través del Bluetooth"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "Heu rebut un fitxer"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "Obri el fitxer"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "Revela el fitxer"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "S'ha completat la recepció del fitxer"
-
-#~ msgid "Only for Bonded and Trusted devices"
-#~ msgstr "Només per a dispositius vinculats i de confiança"
-
-#~ msgid "Please log in as the user guest"
-#~ msgstr "Entreu com a usuari convidat"
-
-#~ msgid "User Sharing"
-#~ msgstr "Compartició d'usuari"
diff --git a/po/cmn.po b/po/cmn.po
index 8397b49..e785043 100644
--- a/po/cmn.po
+++ b/po/cmn.po
@@ -5,90 +5,21 @@
 # Translators:
 # Chao-Hsiung Liao <[email protected]>, 2009
 # Kevin Tse <[email protected]>, 2005
-# Wei-Lun Chao <[email protected]>, 2012-2013
+# 趙惟倫 <[email protected]>, 2012-2013
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-26 22:51+0200\n"
-"PO-Revision-Date: 2013-11-21 07:10+0000\n"
-"Last-Translator: Wei-Lun Chao <[email protected]>\n"
-"Language-Team: Chinese (Mandarin) (http://www.transifex.com/projects/p/MATE/language/cmn/)\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: monsta <[email protected]>\n"
+"Language-Team: Chinese (Mandarin) (http://www.transifex.com/mate/MATE/language/cmn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cmn\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/desktop_mate_file_sharing.schemas.in.h:1
-msgid "Share Public directory over the network"
-msgstr "以網路分享公用目錄"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr "如果設定為 true，使用者的家目錄裡之公用目錄會在他/她登入時透過網路分享出來。"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:3
-msgid "When to require passwords"
-msgstr "何時需要密碼"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:4
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr "何時會詢問密碼。可能的數值是「never」(永不)、「on_write」(寫入時)和「always」(永遠)。"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:5
-msgid "Share Public directory over Bluetooth"
-msgstr "以藍牙分享公用目錄"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:6
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr "如果設定為 true，使用者的家目錄裡之公用目錄會在他/她登入時透過藍牙分享出來。"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:7
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "是否允許藍牙客戶端寫入檔案。"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:8
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr "是否允許藍牙客戶端寫入檔案，或以唯讀方式分享檔案。"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:9
-msgid ""
-"Whether Bluetooth clients need to pair with the computer to send files."
-msgstr "藍牙客戶端是否需要與電腦配對才能傳送檔案。"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "藍牙客戶端是否可以使用 ObexPush 傳送檔案。"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:11
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr "如果設定為 true，藍牙裝置就可以在使用者登入時傳送檔案到他的下載目錄中。"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:12
-msgid "When to accept files sent over Bluetooth"
-msgstr "何時接受透過藍牙傳送的檔案"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:13
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr "何時接受透過藍牙傳送的檔案。可能的數值是「always」(永遠)、「bonded」(已配對)、「bonded_trusted」(已配對且信任)和「ask」(詢問)。"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "是否通知有最新接收到的檔案。"
-
 #: ../data/file-share-properties.ui.h:1
 msgid "Personal File Sharing Preferences"
 msgstr "個人檔案分享偏好設定"
@@ -141,8 +72,16 @@ msgstr "接受檔案(_A):"
 msgid "_Notify about received files"
 msgstr "通知有接收檔案(_N)"
 
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
+
 #: ../data/mate-user-share-properties.desktop.in.h:1
-#: ../data/mate-user-share.desktop.in.in.h:1 ../src/caja-share-bar.c:162
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "個人檔案分享"
 
@@ -150,63 +89,81 @@ msgstr "個人檔案分享"
 msgid "Preferences for sharing of files"
 msgstr "用於分享個人檔案的偏好設定"
 
-#: ../data/mate-user-share.desktop.in.in.h:2
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "若啟用則執行個人檔案分享"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "執行偏好設定"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr ""
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr ""
 
-#: ../src/caja-share-bar.c:187
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr ""
+
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "執行個人檔案分享偏好設定"
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "無法執行個人檔案分享偏好設定"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "您可以分享這個資料夾中的檔案或接收檔案到資料夾裡"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr ""
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "您可以透過網路和藍牙分享這個資料夾中的檔案"
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr ""
+
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr ""
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "您可以透過藍牙接收檔案到這個資料夾裡"
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr ""
 
-#: ../src/file-share-properties.c:436
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "沒有原因"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "無法顯示求助文件的內容。"
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "無法建立介面。"
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "永不"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "當寫入至檔案"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "經常"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "只有設定的裝置"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "詢問"
 
@@ -219,36 +176,36 @@ msgstr "詢問"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "%s 的公用檔案"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "%s 的公用檔案於 %s"
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "您已經透過藍牙接收到「%s」"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "您已經接收到檔案"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "開啟檔案"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "顯示檔案"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "檔案接收已完成"
diff --git a/po/cs.po b/po/cs.po
index a39c087..e599464 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,233 +1,174 @@
-# Czech translation of mateuser-share.
-# Copyright (C) 2005, 2006, 2009 the author(s) of mateuser-share.
-# Copyright (C) 2005, 2006 Miloslav Trmac <[email protected]>.
-# Copyright (C) 2009 Martin Picek <[email protected]>.
-# This file is distributed under the same license as the mateuser-share package.
-#
-# Miloslav Trmac <[email protected]>, 2005, 2006.
-# Martin Picek <[email protected]>, 2009.
-# Petr Kovar <[email protected]>, 2009.
-# Marek Černocký <[email protected]>, 2009, 2010.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Marek Černocký <[email protected]>, 2009, 2010
+# Martin Kříž <[email protected]>, 2015
+# Martin Picek <[email protected]>, 2009
+# Miloslav Trmač <[email protected]>, 2005, 2006
+# Petr Kovar <[email protected]>, 2009
 msgid ""
 msgstr ""
-"Project-Id-Version: mateuser-share mate2-28\n"
-"Report-Msgid-Bugs-To: http://bugzilla.mateorg/enter_bug.cgi?product=mate"
-"user-share&component=general\n"
-"POT-Creation-Date: 2010-03-06 12:47+0000\n"
-"PO-Revision-Date: 2010-03-07 12:39+0100\n"
-"Last-Translator: Marek Černocký <[email protected]>\n"
-"Language-Team: Czech <matecs-list@mateorg>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: Martin Kříž <[email protected]>\n"
+"Language-Team: Czech (http://www.transifex.com/mate/MATE/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Poedit-Language: Czech\n"
-"X-Poedit-SourceCharset: utf-8\n"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:1
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr ""
-"Je-li toto zaškrtnuto, zařízení Bluetooth mohou posílat soubory do "
-"uživatelova adresáře pro stahování, pokud je uživatel přihlášen."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr ""
-"Je-li toto zaškrtnuto, adresář Veřejné v uživatelově domovském adresáři bude "
-"sdílen přes Bluetooth, pokud je uživatel přihlášen."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:3
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr ""
-"Je-li toto zaškrtnuto, adresář Veřejné v uživatelově domovském adresáři bude "
-"sdílen přes síť, pokud je uživatel přihlášen."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:4
-msgid "Share Public directory over Bluetooth"
-msgstr "Sdílet adresář Veřejné přes Bluetooth"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:5
-msgid "Share Public directory over the network"
-msgstr "Sdílet adresář Veřejné přes síť"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:6
-msgid "When to accept files sent over Bluetooth"
-msgstr "Kdy přijímat soubory posílané přes Bluetooth"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:7
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr ""
-"Kdy přijímat soubory poslané přes Bluetooth. Možné hodnoty jsou: „always“, "
-"„bonded“ a „ask“."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:8
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr ""
-"Kdy se ptát na hesla. Možné hodnoty jsou „never“, „on_write“ a „always“."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:9
-msgid "When to require passwords"
-msgstr "Kdy vyžadovat hesla"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "Jestli klienti Bluetooth mohou posílat soubory pomocí ObexPush."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:11
-msgid "Whether Bluetooth clients need to pair with the computer to send files."
-msgstr ""
-"Jestli je k posílání souborů klienty Bluetooth vyžadováno, aby byli klienti "
-"spárováni s počítačem."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:12
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr ""
-"Jestli povolit klientům Bluetooth zapisování do souborů, nebo sdílet soubory "
-"jen ke čtení."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:13
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "Jestli povolit klientům Bluetooth zapisování do souborů."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "Jestli oznamovat, že byly přijaty nové soubory."
 
 #: ../data/file-share-properties.ui.h:1
-msgid "<b>Receive Files over Bluetooth</b>"
-msgstr "<b>Příjem souborů přes Bluetooth</b>"
+msgid "Personal File Sharing Preferences"
+msgstr "Nastavení sdílení osobních souborů"
 
 #: ../data/file-share-properties.ui.h:2
-msgid "<b>Share Files over Bluetooth</b>"
-msgstr "<b>Sdílení souborů přes Bluetooth</b>"
-
-#: ../data/file-share-properties.ui.h:3
 msgid "<b>Share Files over the Network</b>"
 msgstr "<b>Sdílení souborů přes síť</b>"
 
+#: ../data/file-share-properties.ui.h:3
+msgid "_Share public files on network"
+msgstr "Sdílet veřejné soubory přes _síť"
+
 #: ../data/file-share-properties.ui.h:4
-msgid "Allo_w remote devices to delete files"
-msgstr "Povolit vzdáleným počítačům _mazat soubory"
+msgid "_Password:"
+msgstr "_Heslo:"
 
 #: ../data/file-share-properties.ui.h:5
-msgid "Personal File Sharing Preferences"
-msgstr "Nastavení sdílení osobních souborů"
+msgid "_Require password:"
+msgstr "_Vyžadovat heslo:"
 
 #: ../data/file-share-properties.ui.h:6
-msgid "Receive files in _Downloads folder over Bluetooth"
-msgstr "Soubory poslané přes Bluetooth přijímat do _adresáře pro stahování"
+msgid "<b>Share Files over Bluetooth</b>"
+msgstr "<b>Sdílení souborů přes Bluetooth</b>"
 
 #: ../data/file-share-properties.ui.h:7
-msgid "Require re_mote devices to bond with this computer"
-msgstr "Vyžadovat od vzdálených zařízení, aby se svázaly s tí_mto počítačem"
-
-#: ../data/file-share-properties.ui.h:8
 msgid "Share public files over _Bluetooth"
 msgstr "Sdílet veřejné soubory přes _Bluetooth"
 
+#: ../data/file-share-properties.ui.h:8
+msgid "Allo_w remote devices to delete files"
+msgstr "Povolit vzdáleným počítačům _mazat soubory"
+
 #: ../data/file-share-properties.ui.h:9
-msgid "_Accept files: "
-msgstr "_Přijímat soubory: "
+msgid "Require re_mote devices to bond with this computer"
+msgstr "Vyžadovat od vzdálených zařízení, aby se svázaly s tí_mto počítačem"
 
 #: ../data/file-share-properties.ui.h:10
-msgid "_Notify about received files"
-msgstr "_Oznamovat přijaté soubory"
+msgid "<b>Receive Files over Bluetooth</b>"
+msgstr "<b>Příjem souborů přes Bluetooth</b>"
 
 #: ../data/file-share-properties.ui.h:11
-msgid "_Password:"
-msgstr "_Heslo:"
+msgid "Receive files in _Downloads folder over Bluetooth"
+msgstr "Soubory poslané přes Bluetooth přijímat do _adresáře pro stahování"
 
 #: ../data/file-share-properties.ui.h:12
-msgid "_Require password:"
-msgstr "_Vyžadovat heslo:"
+msgid "_Accept files: "
+msgstr "_Přijímat soubory: "
 
 #: ../data/file-share-properties.ui.h:13
-msgid "_Share public files on network"
-msgstr "Sdílet veřejné soubory přes _síť"
+msgid "_Notify about received files"
+msgstr "_Oznamovat přijaté soubory"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr "Uživatelské Sdílení"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr "Integruje se s uživatelským-sdílením"
 
-#: ../data/mateuser-share-properties.desktop.in.h:1
-#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
+#: ../data/mate-user-share-properties.desktop.in.h:1
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "Sdílení osobních souborů"
 
-#: ../data/mateuser-share-properties.desktop.in.h:2
+#: ../data/mate-user-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Nastavení sdílení souborů"
 
-#: ../data/mateuser-share.desktop.in.in.h:1
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr "Sdílení osobních souborů obexftp"
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Je-li povoleno, spustit Sdílení osobních souborů"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "Předvolby spouštění"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr "Sdílení osobních souborů obexpush"
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr "Sdílení osobních souborů WebDAV"
+
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr "Předvolby"
 
-#: ../src/caja-share-bar.c:187
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Předvolby spouštění Sdílení osobních souborů"
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "Nelze spustit předvolby Sdílení osobních souborů"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "Můžete sdílet soubory z této složky a přijímat do ní soubory"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr "Může být použito pro sdílení nebo přijímání souborů"
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "Můžete sdílet soubory z této složky přes síť a přes Bluetooth"
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr "Mohou být sdíleny přes síť nebo pomocí Bluetooth"
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "Můžete do této složky přes Bluetooth přijímat soubory"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr "Mohou být sdíleny po síti"
 
-#: ../src/file-share-properties.c:436
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr "Může být použit k přijímání souborů přes Bluetooth"
+
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "Žádný důvod"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "Nepodařilo se zobrazit témata nápovědy."
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "Rozhraní se nepodařilo sestavit."
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "Nikdy"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "Při zapisování do souborů"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "Vždy"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "Pouze pro nastavená zařízení"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "Zeptat se"
 
-# Sigh...
 #. Translators: The %s will get filled in with the user name
 #. of the user, to form a genitive. If this is difficult to
 #. translate correctly so that it will work correctly in your
@@ -237,38 +178,36 @@ msgstr "Zeptat se"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "Veřejné soubory uživatele %s"
 
-# Sigh...
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "Veřejné soubory uživatele %s na %s"
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "Přes Bluetooth vám přišel soubor „%s“"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "Přišel vám soubor"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "Otevřít soubor"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "Zobrazit soubor"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "Příjem souboru dokončen"
-
diff --git a/po/da.po b/po/da.po
index 37bcd64..808a7b8 100644
--- a/po/da.po
+++ b/po/da.po
@@ -3,91 +3,22 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Joe Hansen <[email protected]>, 2013
+# Joe Hansen <[email protected]>, 2013,2015
 # Martin Willemoes Hansen <[email protected]>, 2005
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-26 22:51+0200\n"
-"PO-Revision-Date: 2013-04-16 15:37+0000\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
 "Last-Translator: Joe Hansen <[email protected]>\n"
-"Language-Team: Danish (http://www.transifex.com/projects/p/MATE/language/da/)\n"
+"Language-Team: Danish (http://www.transifex.com/mate/MATE/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/desktop_mate_file_sharing.schemas.in.h:1
-msgid "Share Public directory over the network"
-msgstr "Del offentlig mappe på netværket"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr "Hvis denne er true, vil den offentlige mappe i brugerens hjemmemappe blive delt, når brugeren er logget ind."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:3
-msgid "When to require passwords"
-msgstr "Hvornår der kræves adgangskode"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:4
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr "Hvornår skal der spørges om adgangskode. Valgmuligheder: »never«, »on_write«, »always«."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:5
-msgid "Share Public directory over Bluetooth"
-msgstr "Del offentlig mappe over Bluetooth"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:6
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr "Hvis denne er true, vil den offentlige mappe i brugerens hjemmemappe blive delt over Bluetooth, når brugeren er logget ind."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:7
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "Hvorvidt Bluetooth-klienter har tilladelse til at skrive filer."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:8
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr "Hvorvidt Bluetooth-klienter har tilladelse til at skrive filer, eller dele filer skrivebeskyttet."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:9
-msgid ""
-"Whether Bluetooth clients need to pair with the computer to send files."
-msgstr "Hvorvidt Bluetooth-klienter skal danne par med computeren for at sende filer."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "Hvorvidt Bluetooth-klienter kan sende filer ved brug af ObexPush."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:11
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr "Hvis denne er true, kan Bluetooth-enheder sende filer til brugerens downloadmappe når brugeren er logget ind."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:12
-msgid "When to accept files sent over Bluetooth"
-msgstr "Hvornår filer sendt over Bluetooth skal accepteres"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:13
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr "Hvornår filer sendt over Bluetooth accepteres. Valgmuligheder: »always«, »bonded«, »ask«."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "Hvorvidt der påmindes om nyligt modtagne filer."
-
 #: ../data/file-share-properties.ui.h:1
 msgid "Personal File Sharing Preferences"
 msgstr "Personlige fildelingsindstillinger"
@@ -140,8 +71,16 @@ msgstr "_Accepter filer: "
 msgid "_Notify about received files"
 msgstr "_Påmind om modtagne filer"
 
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr "Brugerdeling"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr "Integrerer sig med bruger-deling"
+
 #: ../data/mate-user-share-properties.desktop.in.h:1
-#: ../data/mate-user-share.desktop.in.in.h:1 ../src/caja-share-bar.c:162
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "Personlig fildeling"
 
@@ -149,63 +88,81 @@ msgstr "Personlig fildeling"
 msgid "Preferences for sharing of files"
 msgstr "Indstillinger for deling af filer"
 
-#: ../data/mate-user-share.desktop.in.in.h:2
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr "Personlig fildeling obexftp"
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Start personlig fildeling hvis aktiveret"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "Start indstillinger"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr "Personlig fildeling obexpush"
 
-#: ../src/caja-share-bar.c:187
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr "Personlig fildeling webdav"
+
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr "Præferencer"
+
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Start indstillinger for personlig fildeling"
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "Kan ikke starte indstillinger for personlig fildeling"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "Du kan dele filer fra denne mappe og modtage filer i den"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr "Kan bruges til at dele eller modtage filer"
+
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr "Kan deles over netværket eller Bluetooth"
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "Du kan dele filer fra denne mappe over netværket og Bluetooth"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr "Kan deles over netværket"
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "Du kan modtage filer via Bluetooth til denne mappe"
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr "Kan bruges til at modtager filer over Bluetooth"
 
-#: ../src/file-share-properties.c:436
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "Ingen grund"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "Kunne ikke vise hjælpeindholdet."
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "Kunne ikke bygge grænsefladen."
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "Aldrig"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "Når der skrives til filer"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "Altid"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "Kun for enheder, der er sat op"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "Spørg"
 
@@ -218,36 +175,36 @@ msgstr "Spørg"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
-msgstr "%s's offentlige filer"
+msgstr "%ss offentlige filer"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "%ss offentlige filer på %s"
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
-msgstr "Du modtog \"%s\" via Bluetooth"
+msgstr "Du modtog »%s« via Bluetooth"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "Du modtog en fil"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "Åbn fil"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "Afslør fil"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "Filmodtagelse fuldført"
diff --git a/po/de.po b/po/de.po
index a91df77..9c3409f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,93 +4,27 @@
 # 
 # Translators:
 # Christian <[email protected]>, 2009, 2010
+# Franco Della-Monica <[email protected]>, 2015
+# Franco Della-Monica <[email protected]>, 2015
 # Frank Arnold <[email protected]>, 2005
 # Hendrik Richter <hendrikr@mateorg>, 2007
 # Mario Blättermann <mariobl@mateorg>, 2009, 2010
-# Tobias Bannert <[email protected]>, 2014
+# Tobias Bannert <[email protected]>, 2014-2015
+# Xpistian <[email protected]>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-26 22:51+0200\n"
-"PO-Revision-Date: 2014-10-12 16:56+0000\n"
-"Last-Translator: Tobias Bannert <[email protected]>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/MATE/language/de/)\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: Franco Della-Monica <[email protected]>\n"
+"Language-Team: German (http://www.transifex.com/mate/MATE/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/desktop_mate_file_sharing.schemas.in.h:1
-msgid "Share Public directory over the network"
-msgstr "Öffentlichen Ordner im Netzwerk freigeben"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr "Wenn eingestellt, wird der öffentliche Ordner, im persönlichen Ordner, im Netzwerk freigegeben, sobald der Benutzer angemeldet ist."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:3
-msgid "When to require passwords"
-msgstr "Wann Passwörter erforderlich sind"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:4
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr "Wann nach Passwörtern gefragt wird. Mögliche Werte sind »never« (nie), »on_write« (beim Schreiben) und »always« (immer)."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:5
-msgid "Share Public directory over Bluetooth"
-msgstr "Öffentlichen Ordner über Bluetooth freigeben"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:6
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr "Wenn eingestellt, wird der öffentliche Ordner, im persönlichen Ordner, über Bluetooth freigegeben, sobald der Benutzer angemeldet ist."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:7
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "Legt fest, ob Bluetooth-Programme Dateien schreiben dürfen."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:8
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr "Legt fest, ob Bluetooth-Programme Dateien schreiben oder nur lesen dürfen."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:9
-msgid ""
-"Whether Bluetooth clients need to pair with the computer to send files."
-msgstr "Legt fest, ob sich Bluetooth-Programme an den Rechner koppeln müssen, um Dateien zu senden."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "Legt fest, ob Bluetooth-Programme Dateien mit ObexPush senden dürfen"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:11
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr "Wenn eingestellt, dürfen Bluetooth-Geräte Dateien in den Download-Ordner des Benutzers senden."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:12
-msgid "When to accept files sent over Bluetooth"
-msgstr "Wann über Bluetooth gesendete Dateien angenommen werden"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:13
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr "Gibt an, wann über Bluetooth gesendete Dateien angenommen werden. Mögliche Werte sind »always« (immer), »bonded« (verbunden) und »ask« (nachfragen)."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "Legt fest, ob über neu empfangene Dateien informiert werden soll."
-
 #: ../data/file-share-properties.ui.h:1
 msgid "Personal File Sharing Preferences"
 msgstr "Einstellungen zur persönlichen Dateifreigabe"
@@ -143,8 +77,16 @@ msgstr "Dateien _annehmen:"
 msgid "_Notify about received files"
 msgstr "Über _empfangene Dateien benachrichtigen"
 
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr "Nutzerfreigabe"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr "verbindet sich mit Nutzerfreigabe"
+
 #: ../data/mate-user-share-properties.desktop.in.h:1
-#: ../data/mate-user-share.desktop.in.in.h:1 ../src/caja-share-bar.c:162
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "Persönliche Dateifreigabe"
 
@@ -152,63 +94,81 @@ msgstr "Persönliche Dateifreigabe"
 msgid "Preferences for sharing of files"
 msgstr "Einstellungen zur Freigabe von Dateien"
 
-#: ../data/mate-user-share.desktop.in.in.h:2
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr "Persönliche Dateifreigabe obexftp"
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Persönliche Dateifreigabe starten, wenn aktiv"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "Einstellungen aufrufen"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr "Persönliche Dateifreigabe obexpush"
 
-#: ../src/caja-share-bar.c:187
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr "Persönliche Dateifreigabe webdav"
+
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr "Einstellungen"
+
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Einstellungen zur persönlichen Dateifreigabe aufrufen"
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "Einstellungen zur persönlichen Dateifreigabe konnten nicht aufgerufen werden"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "Sie können Dateien in diesem Ordner freigeben und Dateien in diesem Ordner empfangen"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr "Erlaubt das Freigeben oder Empfangen von Dateien"
+
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr "Dateien in diesem Ordner können über das Netzwerk oder über Bluetooth freigegeben werden"
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "Sie können Dateien in diesem Ordner über das Netzwerk und über Bluetooth freigeben"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr "Dateien in diesem Ordner können über das Netzwerk freigegeben werden"
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "Sie können Dateien über Bluetooth in diesem Ordner empfangen"
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr "Erlaubt das Empfangen von Dateien über Bluetooth"
 
-#: ../src/file-share-properties.c:436
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "Kein Grund"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "Das Hilfedokument konnte nicht angezeigt werden."
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "Die Oberfläche konnte nicht erstellt werden."
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "Niemals"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "Beim Schreiben von Dateien"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "Immer"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "Nur für eingerichtete Geräte"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "Nachfragen"
 
@@ -221,36 +181,36 @@ msgstr "Nachfragen"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "Öffentliche Dateien von %s"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "Öffentliche Dateien von %s auf %s"
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "Sie haben »%s« über Bluetooth erhalten"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "Sie haben eine Datei erhalten"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "Datei öffnen"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "Datei zeigen"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "Dateiempfang ist abgeschlossen"
diff --git a/po/dz.po b/po/dz.po
index a91f0fb..20e1c31 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -1,79 +1,168 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: mateuser-share.HEAD.pot\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-01 03:50+0100\n"
-"PO-Revision-Date: 2006-11-02 12:22+0530\n"
-"Last-Translator: norbu <[email protected]>\n"
-"Language-Team: Dzongkha <[email protected]>\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: monsta <[email protected]>\n"
+"Language-Team: Dzongkha (http://www.transifex.com/mate/MATE/language/dz/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"X-Poedit-Language: Dzongkha\n"
-"X-Poedit-Country: BHUTAN\n"
-"X-Poedit-SourceCharset: utf-8\n"
+"Language: dz\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../desktop_matefile_sharing.schemas.in.h:1
-msgid "If this is true, the Public directory in the users home directory will be shared when the user is logged in."
-msgstr "འ་ནི་འདི་བདེན་པ་ཨིན་པ་ཅིན་ ལག་ལེན་པའི་ཁྱིམ་སྣོད་ཐོ་འདི་ནང་གི་ མི་མང་གི་སྣོད་ཐོ་འདི་ ལག་ལེན་པ་འདི་ནང་བསྐྱོད་འབད་ཡོད་པའི་སྐབས་ རུབ་སྤྱོད་འབད་འོང་།"
+#: ../data/file-share-properties.ui.h:1
+msgid "Personal File Sharing Preferences"
+msgstr ""
 
-#: ../desktop_matefile_sharing.schemas.in.h:2
-msgid "Share Public directory"
-msgstr "མི་མང་གི་སྣོད་ཐོ་རུབ་སྤྱོད་འབད་"
+#: ../data/file-share-properties.ui.h:2
+msgid "<b>Share Files over the Network</b>"
+msgstr ""
 
-#: ../desktop_matefile_sharing.schemas.in.h:3
-msgid "When to ask for passwords. Possible values are \"never\", \"on_write\", and \"always\"."
-msgstr "ཆོག་ཡིག་ཚུ་གི་དོན་ལུ་ནམ་འདྲི་ནི་ཨིན་ན། འབད་ཚུགས་པའི་གནས་གོང་ \"never\"  \"on_write\"  དང་ \"always\" ཚུ་ཨིན།"
+#: ../data/file-share-properties.ui.h:3
+msgid "_Share public files on network"
+msgstr ""
 
-#: ../desktop_matefile_sharing.schemas.in.h:4
-msgid "When to require passwords"
-msgstr "ཆོག་ཡིག་ཚུ་ནམ་དགོཔ་ཨིན་ན་"
+#: ../data/file-share-properties.ui.h:4
+msgid "_Password:"
+msgstr "ཆོག་ཡིག་:(_P)"
 
-#: ../file-share-properties.c:290
-msgid "Never"
-msgstr "ནམ་ཡང་"
+#: ../data/file-share-properties.ui.h:5
+msgid "_Require password:"
+msgstr "དགོས་མཁོ་ཡོད་པའི་ཆོག་ཡིག་: (_R)"
 
-#: ../file-share-properties.c:293
-msgid "When writing files"
-msgstr "ཡིག་སྣོད་ཚུ་རྩོམ་སྒྲིག་འབད་བའི་སྐབས་"
+#: ../data/file-share-properties.ui.h:6
+msgid "<b>Share Files over Bluetooth</b>"
+msgstr ""
 
-#: ../file-share-properties.c:296
-msgid "Always"
-msgstr "ཨ་རྟག་རང་"
+#: ../data/file-share-properties.ui.h:7
+msgid "Share public files over _Bluetooth"
+msgstr ""
 
-#: ../file-share-properties.glade.h:1
-msgid "<b>Share Files</b>"
-msgstr "<b>ཡིག་སྣོད་ཚུ་རུབ་སྤྱོད་འབད་</b>"
+#: ../data/file-share-properties.ui.h:8
+msgid "Allo_w remote devices to delete files"
+msgstr ""
 
-#: ../file-share-properties.glade.h:2
-msgid "File Sharing Preferences"
-msgstr "ཡིག་སྣོད་རུབ་སྤྱོད་འབད་ནིའི་དགའ་གདམ་ཚུ་"
+#: ../data/file-share-properties.ui.h:9
+msgid "Require re_mote devices to bond with this computer"
+msgstr ""
 
-#: ../file-share-properties.glade.h:3
-msgid "Share Public files on network"
-msgstr "ཡོངགས་འབྲེལ་གུ་ལུ་ མི་མང་གི་ཡིག་སྣོད་ཚུ་རུབ་སྤྱོད་འབད་"
+#: ../data/file-share-properties.ui.h:10
+msgid "<b>Receive Files over Bluetooth</b>"
+msgstr ""
 
-#: ../file-share-properties.glade.h:4
-msgid "_Password:"
-msgstr "ཆོག་ཡིག་:(_P)"
+#: ../data/file-share-properties.ui.h:11
+msgid "Receive files in _Downloads folder over Bluetooth"
+msgstr ""
 
-#: ../file-share-properties.glade.h:5
-msgid "_Require password:"
-msgstr "དགོས་མཁོ་ཡོད་པའི་ཆོག་ཡིག་: (_R)"
+#: ../data/file-share-properties.ui.h:12
+msgid "_Accept files: "
+msgstr ""
+
+#: ../data/file-share-properties.ui.h:13
+msgid "_Notify about received files"
+msgstr ""
 
-#: ../mateuser-share-properties.desktop.in.h:1
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
+
+#: ../data/mate-user-share-properties.desktop.in.h:1
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "རང་དོན་གྱི་ཡིག་སྣོད་རུབ་སྤྱོད་འབད་ནི་"
 
-#: ../mateuser-share-properties.desktop.in.h:2
-msgid "Preferences for sharing of personal files"
-msgstr "རང་དོན་གྱི་ཡིག་སྣོད་ཚུ་གི་རུབ་སྤྱོད་འབད་ནིའི་དོན་ལུ་ དགའ་གདམ་ཚུ་"
+#: ../data/mate-user-share-properties.desktop.in.h:2
+msgid "Preferences for sharing of files"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
+msgid "Launch Personal File Sharing if enabled"
+msgstr ""
+
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr ""
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr ""
+
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr ""
+
+#: ../src/caja-share-bar.c:121
+msgid "Launch Personal File Sharing Preferences"
+msgstr ""
+
+#: ../src/share-extension.c:73
+msgid "Unable to launch the Personal File Sharing preferences"
+msgstr ""
+
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr ""
+
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr ""
+
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr ""
+
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr ""
+
+#: ../src/file-share-properties.c:417
+msgid "No reason"
+msgstr ""
+
+#: ../src/file-share-properties.c:445
+msgid "Could not display the help contents."
+msgstr ""
+
+#: ../src/file-share-properties.c:507
+msgid "Could not build interface."
+msgstr ""
+
+#: ../src/file-share-properties.c:547
+msgid "Never"
+msgstr "ནམ་ཡང་"
+
+#: ../src/file-share-properties.c:550
+msgid "When writing files"
+msgstr "ཡིག་སྣོད་ཚུ་རྩོམ་སྒྲིག་འབད་བའི་སྐབས་"
+
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
+msgid "Always"
+msgstr "ཨ་རྟག་རང་"
+
+#: ../src/file-share-properties.c:580
+msgid "Only for set up devices"
+msgstr ""
+
+#: ../src/file-share-properties.c:585
+msgid "Ask"
+msgstr ""
 
 #. Translators: The %s will get filled in with the user name
 #. of the user, to form a genitive. If this is difficult to
@@ -84,15 +173,36 @@ msgstr "རང་དོན་གྱི་ཡིག་སྣོད་ཚུ་ག
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../user_share.c:130
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "%s གི་མི་མང་ཡིག་སྣོད་ཚུ་"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../user_share.c:134
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "%s གི་མི་མང་ཡིག་སྣོད་ཚུ་ %s གུ་"
 
+#. Translators: %s is the name of the filename received
+#: ../src/obexpush.c:136
+#, c-format
+msgid "You received \"%s\" via Bluetooth"
+msgstr ""
+
+#: ../src/obexpush.c:138
+msgid "You received a file"
+msgstr ""
+
+#: ../src/obexpush.c:148
+msgid "Open File"
+msgstr ""
+
+#: ../src/obexpush.c:152
+msgid "Reveal File"
+msgstr ""
+
+#: ../src/obexpush.c:169
+msgid "File reception complete"
+msgstr ""
diff --git a/po/el.po b/po/el.po
index fc852bf..56e15a1 100644
--- a/po/el.po
+++ b/po/el.po
@@ -1,232 +1,169 @@
-# translation of el.po to Greek
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
-# Kostas Papadimas <pkst@mateorg>, 2005.
-# Giannis Katsampirhs <[email protected]>, 2008.
-#
-# Pierros Papadeas <[email protected]>, 2009, 2010.
+# 
+# Translators:
+# Giannis Katsampirhs <[email protected]>, 2008
+# Kostas Papadimas <pkst@mateorg>, 2005
+# Pierros Papadeas <[email protected]>, 2009, 2010
 msgid ""
 msgstr ""
-"Project-Id-Version: el\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-01 19:02+0100\n"
-"PO-Revision-Date: 2010-02-27 22:27+0100\n"
-"Last-Translator: Pierros Papadeas <[email protected]>\n"
-"Language-Team: Greek <team@mategr>\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: monsta <[email protected]>\n"
+"Language-Team: Greek (http://www.transifex.com/mate/MATE/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.3.1\n"
+"Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-Language: Greek\n"
-"X-Poedit-Country: GREECE\n"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:1
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr ""
-"Αν είναι αληθές, οι συσκευές bluetooth θα μπορούν να στέλνουν αρχεία στον "
-"κατάλογο Λήψεις του χρήστη, όποτε ο χρήστης είναι συνδεδεμένος."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr ""
-"Αν είναι αληθές, θα γίνεται κοινή χρήση του Δημόσιου καταλόγου του χρήστη "
-"μέσω bluetooth, όποτε ο χρήστης είναι συνδεδεμένος."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:3
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr ""
-"Αν είναι αληθές, θα γίνεται κοινή χρήση του Δημόσιου καταλόγου του χρήστη "
-"μέσω του δικτύου, όποτε ο χρήστης είναι συνδεδεμένος."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:4
-msgid "Share Public directory over Bluetooth"
-msgstr "Κοινή χρήση δημόσιου καταλόγου μέσω bluetooth"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:5
-msgid "Share Public directory over the network"
-msgstr "Κοινή χρήση δημόσιου καταλόγου μέσω του δικτύου"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:6
-msgid "When to accept files sent over Bluetooth"
-msgstr "Πότε θα γίνεται αποδοχή των αρχείων που στέλνονται μέσω bluetooth"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:7
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr ""
-"Πότε θα γίνεται αποδοχή των αρχείων που στέλνονται μέσω bluetooth. Οι "
-"πιθανές τιμές είναι \"always\" (πάντα), \"bonded\" (συζευγμένες συσκευές), "
-"\"bonded_trusted\" (συζευγμένες και έμπιστες) και \"ask\" (ερώτηση)."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:8
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr ""
-"Ποτέ θα απαιτείται κωδικός. Οι πιθανές τιμές είναι \"never\" (ποτέ), "
-"\"on_write\" (για εγγραφή), και \"always\" (πάντα)."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:9
-msgid "When to require passwords"
-msgstr "Πότε θα απαιτούνται κωδικοί"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr ""
-"Αν οι πελάτες bluetooth θα μπορούν να στέλνουν αρχεία χρησιμοποιώντας το "
-"obexPush."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:11
-msgid "Whether Bluetooth clients need to pair with the computer to send files."
-msgstr ""
-"Αν οι πελάτες bluetooth θα πρέπει να είναι συζευγμένοι με τον υπολογιστή για "
-"να μπορούν να στέλνουν αρχεία."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:12
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr ""
-"Αν θα επιτρέπεται στους πελάτες bluetooth να εγγράφουν αρχεία, ή θα τους "
-"επιτρέπεται μόνο η ανάγνωση αρχείων."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:13
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "Αν θα επιτρέπεται στους πελάτες bluetooth να εγγράφουν αρχεία."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "Αν θα εμφανίζεται ειδοποίηση όποτε λαμβάνονται αρχεία."
 
 #: ../data/file-share-properties.ui.h:1
-msgid "<b>Receive Files over Bluetooth</b>"
-msgstr "<b>Λήψη αρχείων μέσω bluetooth</b>"
+msgid "Personal File Sharing Preferences"
+msgstr "Προτιμήσεις κοινής χρήσης προσωπικών αρχείων"
 
 #: ../data/file-share-properties.ui.h:2
-msgid "<b>Share Files over Bluetooth</b>"
-msgstr "<b>Κοινή χρήση αρχείων μέσω bluetooth</b>"
-
-#: ../data/file-share-properties.ui.h:3
 msgid "<b>Share Files over the Network</b>"
 msgstr "<b>Κοινή χρήση αρχείων μέσω δικτύου</b>"
 
+#: ../data/file-share-properties.ui.h:3
+msgid "_Share public files on network"
+msgstr "_Κοινή χρήση δημόσιων αρχείων μέσω δικτύου"
+
 #: ../data/file-share-properties.ui.h:4
-msgid "Allo_w remote devices to delete files"
-msgstr "Να _επιτρέπεται σε απομακρυσμένες συσκευές να διαγράφουν αρχεία"
+msgid "_Password:"
+msgstr "_Κωδικός:"
 
 #: ../data/file-share-properties.ui.h:5
-msgid "Personal File Sharing Preferences"
-msgstr "Προτιμήσεις κοινής χρήσης προσωπικών αρχείων"
+msgid "_Require password:"
+msgstr "Α_παιτείται κωδικός:"
 
 #: ../data/file-share-properties.ui.h:6
-msgid "Receive files in _Downloads folder over Bluetooth"
-msgstr "Λήψη αρχείων μέσω bluetooth στο φάκελο _Λήψεις"
+msgid "<b>Share Files over Bluetooth</b>"
+msgstr "<b>Κοινή χρήση αρχείων μέσω bluetooth</b>"
 
 #: ../data/file-share-properties.ui.h:7
-msgid "Require re_mote devices to bond with this computer"
-msgstr "Υποχρεωτική σύζευξη των _απομακρυσμένων συσκευών με τον υπολογιστή"
-
-#: ../data/file-share-properties.ui.h:8
 msgid "Share public files over _Bluetooth"
 msgstr "Κοινή χρήση δημόσιων αρχείων μέσω _Βluetooth"
 
+#: ../data/file-share-properties.ui.h:8
+msgid "Allo_w remote devices to delete files"
+msgstr "Να _επιτρέπεται σε απομακρυσμένες συσκευές να διαγράφουν αρχεία"
+
 #: ../data/file-share-properties.ui.h:9
-msgid "_Accept files: "
-msgstr "Αποδο_χή αρχείων: "
+msgid "Require re_mote devices to bond with this computer"
+msgstr "Υποχρεωτική σύζευξη των _απομακρυσμένων συσκευών με τον υπολογιστή"
 
 #: ../data/file-share-properties.ui.h:10
-msgid "_Notify about received files"
-msgstr "Εμφάνιση _ειδοποιήσεων λήψης αρχείων"
+msgid "<b>Receive Files over Bluetooth</b>"
+msgstr "<b>Λήψη αρχείων μέσω bluetooth</b>"
 
 #: ../data/file-share-properties.ui.h:11
-msgid "_Password:"
-msgstr "_Κωδικός:"
+msgid "Receive files in _Downloads folder over Bluetooth"
+msgstr "Λήψη αρχείων μέσω bluetooth στο φάκελο _Λήψεις"
 
 #: ../data/file-share-properties.ui.h:12
-msgid "_Require password:"
-msgstr "Α_παιτείται κωδικός:"
+msgid "_Accept files: "
+msgstr "Αποδο_χή αρχείων: "
 
 #: ../data/file-share-properties.ui.h:13
-msgid "_Share public files on network"
-msgstr "_Κοινή χρήση δημόσιων αρχείων μέσω δικτύου"
+msgid "_Notify about received files"
+msgstr "Εμφάνιση _ειδοποιήσεων λήψης αρχείων"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
 
-#: ../data/mateuser-share-properties.desktop.in.h:1
-#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
+
+#: ../data/mate-user-share-properties.desktop.in.h:1
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "Κοινή χρήση προσωπικών αρχείων"
 
-#: ../data/mateuser-share-properties.desktop.in.h:2
+#: ../data/mate-user-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Προτιμήσεις κοινής χρήσης αρχείων"
 
-#: ../data/mateuser-share.desktop.in.in.h:1
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Εκκίνηση κοινής χρήσης προσωπικών αρχείων, αν είναι ενεργοποιημένη"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "Εκκίνηση προτιμήσεων"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr ""
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr ""
+
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr ""
 
-#: ../src/caja-share-bar.c:187
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Εκκίνηση προτιμήσεων κοινής χρήσης προσωπικών αρχείων"
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "Αδυναμία εκκίνησης προτιμήσεων κοινής χρήσης προσωπικών αρχείων"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
 msgstr ""
-"Μπορείτε να μοιράζεστε τα αρχεία αυτού του φακέλου ή να λαμβάνετε αρχεία σε "
-"αυτόν."
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
 msgstr ""
-"Μπορείτε να μοιράζεστε τα αρχεία αυτού του φακέλου μέσω δικτύου ή bluetooth"
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "Μπορείτε να λαμβάνετε αρχεία μέσω bluetooth σε αυτόν τον φάκελο"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr ""
+
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr ""
 
-#: ../src/file-share-properties.c:436
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "Χωρίς αιτιολογία"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "Αδυναμία εμφάνισης περιεχομένου βοήθειας."
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "Αδυναμία δημιουργίας περιβάλλοντος."
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "Ποτέ"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "Κατά την εγγραφή αρχείων"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "Πάντα"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "Μόνο για συζευγμένες συσκευές"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "Ερώτηση"
 
@@ -239,45 +176,36 @@ msgstr "Ερώτηση"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "Δημόσια αρχεία%.0s"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "Δημόσια αρχεία του/της %.0s στο %s"
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "Λάβατε το \"%s\" μέσω bluetooth"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "Λάβατε ένα αρχείο"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "Άνοιγμα Αρχείου"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "Εμφάνιση Αρχείου"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "Ολοκληρώθηκε η λήψη του αρχείου"
-
-#~ msgid "User Sharing"
-#~ msgstr "Διανομή από το χρήστη"
-
-#~ msgid "Please log in as the user guest"
-#~ msgstr "Παρακαλώ συνδεθείτε ως χρήστης guest"
-
-#~ msgid "Only for Bonded and Trusted devices"
-#~ msgstr "Μόνο για συσκευές που συνθέθηκαν και συσκευές εμπιστοσύνης"
diff --git a/po/en_AU.po b/po/en_AU.po
index f0086bf..31f2657 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -3,91 +3,23 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Michael Findlay <[email protected]>, 2012
-# Michael Findlay <[email protected]>, 2012
+# Michael Findlay <[email protected]>, 2012
+# Michael Findlay <[email protected]>, 2012
+# Michael Findlay <[email protected]>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-26 22:51+0200\n"
-"PO-Revision-Date: 2014-09-06 05:35+0000\n"
-"Last-Translator: Michael Findlay <[email protected]>\n"
-"Language-Team: English (Australia) (http://www.transifex.com/projects/p/MATE/language/en_AU/)\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: Michael Findlay <[email protected]>\n"
+"Language-Team: English (Australia) (http://www.transifex.com/mate/MATE/language/en_AU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: en_AU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/desktop_mate_file_sharing.schemas.in.h:1
-msgid "Share Public directory over the network"
-msgstr "Share Public directory over the network"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr "If this is true, the Public directory in the users home directory will be shared over the network when the user is logged in."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:3
-msgid "When to require passwords"
-msgstr "When to require passwords"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:4
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr "When to ask for passwords. Possible values are \"never\", \"on_write\", and \"always\"."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:5
-msgid "Share Public directory over Bluetooth"
-msgstr "Share Public directory over Bluetooth"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:6
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr "If this is true, the Public directory in the users home directory will be shared over Bluetooth when the user is logged in."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:7
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "Whether to allow Bluetooth clients to write files."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:8
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr "Whether to allow Bluetooth clients to write files, or share the files read-only."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:9
-msgid ""
-"Whether Bluetooth clients need to pair with the computer to send files."
-msgstr "Whether Bluetooth clients need to pair with the computer to send files."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "Whether Bluetooth clients can send files using ObexPush."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:11
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr "If this is true, Bluetooth devices can send files to the user's Downloads directory when logged in."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:12
-msgid "When to accept files sent over Bluetooth"
-msgstr "When to accept files sent over Bluetooth"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:13
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr "When to accept files sent over Bluetooth. Possible values are \"always\", \"bonded\" and \"ask\"."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "Whether to notify about newly received files."
-
 #: ../data/file-share-properties.ui.h:1
 msgid "Personal File Sharing Preferences"
 msgstr "Personal File Sharing Preferences"
@@ -140,8 +72,16 @@ msgstr "_Accept files: "
 msgid "_Notify about received files"
 msgstr "_Notify about received files"
 
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr "User Share"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr "Integrates with user-share"
+
 #: ../data/mate-user-share-properties.desktop.in.h:1
-#: ../data/mate-user-share.desktop.in.in.h:1 ../src/caja-share-bar.c:162
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "Personal File Sharing"
 
@@ -149,63 +89,81 @@ msgstr "Personal File Sharing"
 msgid "Preferences for sharing of files"
 msgstr "Preferences for sharing of files"
 
-#: ../data/mate-user-share.desktop.in.in.h:2
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr "Personal File Sharing obexftp"
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Launch Personal File Sharing if enabled"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "Launch Preferences"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr "Personal File Sharing obexpush"
 
-#: ../src/caja-share-bar.c:187
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr "Personal File Sharing webdav"
+
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr "Preferences"
+
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Launch Personal File Sharing Preferences"
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "Unable to launch the Personal File Sharing preferences"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "You can share files from this folder and receive files to it"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr "May be used to share or receive files"
+
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr "May be shared over the network or Bluetooth"
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "You can share files from this folder over the network and Bluetooth"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr "May be shared over the network"
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "You can receive files over Bluetooth into this folder"
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr "May be used to receive files over Bluetooth"
 
-#: ../src/file-share-properties.c:436
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "No reason"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "Could not display the help contents."
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "Could not build interface."
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "Never"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "When writing files"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "Always"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "Only for set up devices"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "Ask"
 
@@ -218,36 +176,36 @@ msgstr "Ask"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "%s's public files"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "%s's public files on %s"
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "You received \"%s\" via Bluetooth"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "You received a file"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "Open File"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "Reveal File"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "File reception complete"
diff --git a/po/en_CA.po b/po/en_CA.po
index 02d2fbf..75c34ca 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -1,84 +1,169 @@
-# Canadian English translation for mateuser-share
-# Copyright (C) 2005 Adam Weinberger and the GNOME Foundation
-# This file is distributed under the same licence as the mateuser-share package.
-# Adam Weinberger <adamw@mateorg>, 2005.
-#
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Adam Weinberger <adamw@mateorg>, 2005
 msgid ""
 msgstr ""
-"Project-Id-Version: mateuser-share\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-17 21:19-0500\n"
-"PO-Revision-Date: 2005-02-04 20:13-0400\n"
-"Last-Translator: Adam Weinberger <adamw@mateorg>\n"
-"Language-Team: Canadian English <adamw@mateorg>\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: monsta <[email protected]>\n"
+"Language-Team: English (Canada) (http://www.transifex.com/mate/MATE/language/en_CA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: en_CA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: desktop_matefile_sharing.schemas.in.h:1
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared when the user is logged in."
+#: ../data/file-share-properties.ui.h:1
+msgid "Personal File Sharing Preferences"
 msgstr ""
-"If this is true, the Public directory in the user's home directory will be "
-"shared when the user is logged in."
 
-#: desktop_matefile_sharing.schemas.in.h:2
-msgid "Share Public directory"
-msgstr "Share Public directory"
+#: ../data/file-share-properties.ui.h:2
+msgid "<b>Share Files over the Network</b>"
+msgstr ""
 
-#: desktop_matefile_sharing.schemas.in.h:3
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
+#: ../data/file-share-properties.ui.h:3
+msgid "_Share public files on network"
 msgstr ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
 
-#: desktop_matefile_sharing.schemas.in.h:4
-msgid "When to require passwords"
-msgstr "When to require passwords"
+#: ../data/file-share-properties.ui.h:4
+msgid "_Password:"
+msgstr "_Password:"
 
-#: file-share-properties.c:290
-msgid "Never"
-msgstr "Never"
+#: ../data/file-share-properties.ui.h:5
+msgid "_Require password:"
+msgstr "_Require password:"
 
-#: file-share-properties.c:293
-msgid "When writing files"
-msgstr "When writing files"
+#: ../data/file-share-properties.ui.h:6
+msgid "<b>Share Files over Bluetooth</b>"
+msgstr ""
 
-#: file-share-properties.c:296
-msgid "Always"
-msgstr "Always"
+#: ../data/file-share-properties.ui.h:7
+msgid "Share public files over _Bluetooth"
+msgstr ""
 
-#: file-share-properties.glade.h:1
-msgid "<b>Share Files</b>"
-msgstr "<b>Share Files</b>"
+#: ../data/file-share-properties.ui.h:8
+msgid "Allo_w remote devices to delete files"
+msgstr ""
 
-#: file-share-properties.glade.h:2
-msgid "File Sharing Preferences"
-msgstr "File Sharing Preferences"
+#: ../data/file-share-properties.ui.h:9
+msgid "Require re_mote devices to bond with this computer"
+msgstr ""
 
-#: file-share-properties.glade.h:3
-msgid "Share Public files on network"
-msgstr "Share Public files on network"
+#: ../data/file-share-properties.ui.h:10
+msgid "<b>Receive Files over Bluetooth</b>"
+msgstr ""
 
-#: file-share-properties.glade.h:4
-msgid "_Password:"
-msgstr "_Password:"
+#: ../data/file-share-properties.ui.h:11
+msgid "Receive files in _Downloads folder over Bluetooth"
+msgstr ""
 
-#: file-share-properties.glade.h:5
-msgid "_Require password:"
-msgstr "_Require password:"
+#: ../data/file-share-properties.ui.h:12
+msgid "_Accept files: "
+msgstr ""
+
+#: ../data/file-share-properties.ui.h:13
+msgid "_Notify about received files"
+msgstr ""
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
 
-#: mateuser-share-properties.desktop.in.h:1
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
+
+#: ../data/mate-user-share-properties.desktop.in.h:1
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "Personal File Sharing"
 
-#: mateuser-share-properties.desktop.in.h:2
-msgid "Preferences for sharing of personal files"
-msgstr "Preferences for sharing of personal files"
+#: ../data/mate-user-share-properties.desktop.in.h:2
+msgid "Preferences for sharing of files"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
+msgid "Launch Personal File Sharing if enabled"
+msgstr ""
+
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr ""
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr ""
+
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr ""
+
+#: ../src/caja-share-bar.c:121
+msgid "Launch Personal File Sharing Preferences"
+msgstr ""
+
+#: ../src/share-extension.c:73
+msgid "Unable to launch the Personal File Sharing preferences"
+msgstr ""
+
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr ""
+
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr ""
+
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr ""
+
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr ""
+
+#: ../src/file-share-properties.c:417
+msgid "No reason"
+msgstr ""
+
+#: ../src/file-share-properties.c:445
+msgid "Could not display the help contents."
+msgstr ""
+
+#: ../src/file-share-properties.c:507
+msgid "Could not build interface."
+msgstr ""
+
+#: ../src/file-share-properties.c:547
+msgid "Never"
+msgstr "Never"
+
+#: ../src/file-share-properties.c:550
+msgid "When writing files"
+msgstr "When writing files"
+
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
+msgid "Always"
+msgstr "Always"
+
+#: ../src/file-share-properties.c:580
+msgid "Only for set up devices"
+msgstr ""
+
+#: ../src/file-share-properties.c:585
+msgid "Ask"
+msgstr ""
 
 #. Translators: The %s will get filled in with the user name
 #. of the user, to form a genitive. If this is difficult to
@@ -89,7 +174,36 @@ msgstr "Preferences for sharing of personal files"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: user_share.c:125
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "%s's public files"
+
+#. Translators: This is similar to the string before, only it
+#. has the hostname in it too.
+#: ../src/http.c:133
+#, c-format
+msgid "%s's public files on %s"
+msgstr ""
+
+#. Translators: %s is the name of the filename received
+#: ../src/obexpush.c:136
+#, c-format
+msgid "You received \"%s\" via Bluetooth"
+msgstr ""
+
+#: ../src/obexpush.c:138
+msgid "You received a file"
+msgstr ""
+
+#: ../src/obexpush.c:148
+msgid "Open File"
+msgstr ""
+
+#: ../src/obexpush.c:152
+msgid "Reveal File"
+msgstr ""
+
+#: ../src/obexpush.c:169
+msgid "File reception complete"
+msgstr ""
diff --git a/po/en_GB.po b/po/en_GB.po
index e0f09c1..05abdb6 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Andi Chandler <[email protected]>, 2015
 # Bruce Cowan <[email protected]>, 2010
 # David Lodge <[email protected]>, 2005, 2009
 # pwithnall <[email protected]>, 2009, 2010
@@ -10,85 +11,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-26 22:51+0200\n"
-"PO-Revision-Date: 2014-10-24 16:17+0000\n"
-"Last-Translator: Martin Wimpress <[email protected]>\n"
-"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/MATE/language/en_GB/)\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: Andi Chandler <[email protected]>\n"
+"Language-Team: English (United Kingdom) (http://www.transifex.com/mate/MATE/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/desktop_mate_file_sharing.schemas.in.h:1
-msgid "Share Public directory over the network"
-msgstr "Share Public directory over the network"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr "If this is true, the Public directory in the user's home directory will be shared over the network when the user is logged in."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:3
-msgid "When to require passwords"
-msgstr "When to require passwords"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:4
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr "When to ask for passwords. Possible values are \"never\", \"on_write\", and \"always\"."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:5
-msgid "Share Public directory over Bluetooth"
-msgstr "Share Public directory over Bluetooth"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:6
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr "If this is true, the Public directory in the user's home directory will be shared over Bluetooth when the user is logged in."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:7
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "Whether to allow Bluetooth clients to write files."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:8
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr "Whether to allow Bluetooth clients to write files, or share the files read-only."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:9
-msgid ""
-"Whether Bluetooth clients need to pair with the computer to send files."
-msgstr "Whether Bluetooth clients need to pair with the computer to send files."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "Whether Bluetooth clients can send files using ObexPush."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:11
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr "If this is true, Bluetooth devices can send files to the user's Downloads directory when the user is logged in."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:12
-msgid "When to accept files sent over Bluetooth"
-msgstr "When to accept files sent over Bluetooth"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:13
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr "When to accept files sent over Bluetooth. Possible values are \"always\", \"bonded\" and \"ask\"."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "Whether to notify about newly received files."
-
 #: ../data/file-share-properties.ui.h:1
 msgid "Personal File Sharing Preferences"
 msgstr "Personal File Sharing Preferences"
@@ -141,8 +73,16 @@ msgstr "_Accept files: "
 msgid "_Notify about received files"
 msgstr "_Notify about received files"
 
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr "User Share"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr "Integrates with user-share"
+
 #: ../data/mate-user-share-properties.desktop.in.h:1
-#: ../data/mate-user-share.desktop.in.in.h:1 ../src/caja-share-bar.c:162
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "Personal File Sharing"
 
@@ -150,63 +90,81 @@ msgstr "Personal File Sharing"
 msgid "Preferences for sharing of files"
 msgstr "Preferences for sharing of files"
 
-#: ../data/mate-user-share.desktop.in.in.h:2
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr "Personal File Sharing obexftp"
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Launch Personal File Sharing if enabled"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "Launch Preferences"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr "Personal File Sharing obexpush"
 
-#: ../src/caja-share-bar.c:187
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr "Personal File Sharing webdav"
+
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr "Preferences"
+
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Launch Personal File Sharing Preferences"
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "Unable to launch the Personal File Sharing Preferences"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "You can share files from this folder and receive files to it"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr "May be used to share or receive files"
+
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr "May be shared over the network or Bluetooth"
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "You can share files from this folder over the network and Bluetooth"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr "May be shared over the network"
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "You can receive files over Bluetooth into this folder"
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr "May be used to receive files over Bluetooth"
 
-#: ../src/file-share-properties.c:436
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "No reason"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "Could not display the help contents."
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "Could not build interface."
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "Never"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "When writing files"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "Always"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "Only for set up devices"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "Ask"
 
@@ -219,36 +177,36 @@ msgstr "Ask"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "%s's public files"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "%s's public files on %s"
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "You received \"%s\" via Bluetooth"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "You received a file"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "Open File"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "Reveal File"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "File reception complete"
diff --git a/po/eo.po b/po/eo.po
index 30e8694..734210c 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -1,223 +1,168 @@
-# Esperanto translation for mateuser-share
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the mateuser-share package.
-# Aisano <>, 2010.
-# Kristjan SCHMIDT <[email protected]>, 2010.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Aisano <>, 2010
+# kristjan <[email protected]>, 2010
 msgid ""
 msgstr ""
-"Project-Id-Version: mateuser-share\n"
-"Report-Msgid-Bugs-To: http://bugzilla.mateorg/enter_bug.cgi?product=mate"
-"user-share&component=general\n"
-"POT-Creation-Date: 2010-06-27 03:44+0000\n"
-"PO-Revision-Date: 2010-06-27 11:47+0200\n"
-"Last-Translator: Kristjan SCHMIDT <[email protected]>\n"
-"Language-Team: Esperanto <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: monsta <[email protected]>\n"
+"Language-Team: Esperanto (http://www.transifex.com/mate/MATE/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-27 09:44+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:1
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr ""
-"Se tio estas vera, Bluetooth-aparatoj povas sendi dosierojn al la "
-"elŝutdosierujo de la uzanto, kiam tiu estas ensalutinta."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr ""
-"Se tio estas vera, la \"Publika\" dosierujo en la hejma dosierujo de la "
-"uzanto estas komunigita tra Bluetooth, kiam la uzanto estas ensalutinta."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:3
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr ""
-"Se tio estas vera, la dosierujo \"Publika\" en la hejma dosierujo de la "
-"uzanto estas komunigita tra la reto, kiam la uzanto estas ensalutinta."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:4
-msgid "Share Public directory over Bluetooth"
-msgstr "Komunigi la dosierujon \"Publika\" tra Bluetooth"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:5
-msgid "Share Public directory over the network"
-msgstr "Komunigi la dosierujon \"Publika\" tra la reto"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:6
-msgid "When to accept files sent over Bluetooth"
-msgstr "Kiam akcepti dosierojn senditajn tra Bluetooth"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:7
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr ""
-"Kiam akcepti dosierojn senditajn tra Bluetooth. Eblaj valoroj estas \"always"
-"\" (ĉiam), \"bonded\" (ligitajn) kaj \"ask\" (demandi)."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:8
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr ""
-"Kiam peti pasvortojn. Eblaj valoroj estas \"never\" (neniam), \"on_write"
-"\" (\"por_skribi\") kaj \"always\" (ĉiam)."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:9
-msgid "When to require passwords"
-msgstr "Kiam postuli pasvortojn."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "Ĉu Bluetooth-klientoj povas sendi dosierojn tra ObexPush."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:11
-msgid "Whether Bluetooth clients need to pair with the computer to send files."
-msgstr ""
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:12
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr ""
-"Ĉu permesi al Bluetooth-kliento skribi dosierojn aŭ legi komunigitajn "
-"dosierojn."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:13
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "Ĉu permesi al Bluetooth-kliento skribi dosierojn."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "Ĉu atentigi pri alvenantaj dosieroj."
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/file-share-properties.ui.h:1
-msgid "<b>Receive Files over Bluetooth</b>"
-msgstr "<b>Ricevi dosierojn tra Bluetooth</b>"
+msgid "Personal File Sharing Preferences"
+msgstr ""
 
 #: ../data/file-share-properties.ui.h:2
-msgid "<b>Share Files over Bluetooth</b>"
-msgstr "<b>Komunigi dosierojn tra Bluetooth</b>"
-
-#: ../data/file-share-properties.ui.h:3
 msgid "<b>Share Files over the Network</b>"
 msgstr "<b>Komunigi dosierojn tra la reto</b>"
 
-#: ../data/file-share-properties.ui.h:4
-msgid "Allo_w remote devices to delete files"
+#: ../data/file-share-properties.ui.h:3
+msgid "_Share public files on network"
 msgstr ""
 
+#: ../data/file-share-properties.ui.h:4
+msgid "_Password:"
+msgstr "_Pasvorto:"
+
 #: ../data/file-share-properties.ui.h:5
-msgid "Personal File Sharing Preferences"
-msgstr ""
+msgid "_Require password:"
+msgstr "_Bezonata pasvorto:"
 
 #: ../data/file-share-properties.ui.h:6
-msgid "Receive files in _Downloads folder over Bluetooth"
-msgstr ""
+msgid "<b>Share Files over Bluetooth</b>"
+msgstr "<b>Komunigi dosierojn tra Bluetooth</b>"
 
 #: ../data/file-share-properties.ui.h:7
-msgid "Require re_mote devices to bond with this computer"
+msgid "Share public files over _Bluetooth"
 msgstr ""
 
 #: ../data/file-share-properties.ui.h:8
-msgid "Share public files over _Bluetooth"
+msgid "Allo_w remote devices to delete files"
 msgstr ""
 
 #: ../data/file-share-properties.ui.h:9
-msgid "_Accept files: "
-msgstr "_Akcepti dosierojn: "
+msgid "Require re_mote devices to bond with this computer"
+msgstr ""
 
 #: ../data/file-share-properties.ui.h:10
-msgid "_Notify about received files"
-msgstr ""
+msgid "<b>Receive Files over Bluetooth</b>"
+msgstr "<b>Ricevi dosierojn tra Bluetooth</b>"
 
 #: ../data/file-share-properties.ui.h:11
-msgid "_Password:"
-msgstr "_Pasvorto:"
+msgid "Receive files in _Downloads folder over Bluetooth"
+msgstr ""
 
 #: ../data/file-share-properties.ui.h:12
-msgid "_Require password:"
-msgstr "_Bezonata pasvorto:"
+msgid "_Accept files: "
+msgstr "_Akcepti dosierojn: "
 
 #: ../data/file-share-properties.ui.h:13
-msgid "_Share public files on network"
+msgid "_Notify about received files"
 msgstr ""
 
-#: ../data/mateuser-share-properties.desktop.in.h:1
-#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
+
+#: ../data/mate-user-share-properties.desktop.in.h:1
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr ""
 
-#: ../data/mateuser-share-properties.desktop.in.h:2
+#: ../data/mate-user-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr ""
 
-#: ../data/mateuser-share.desktop.in.in.h:1
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr ""
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr ""
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
 msgstr ""
 
-#: ../src/caja-share-bar.c:187
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr ""
+
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr ""
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr ""
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
 msgstr ""
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
 msgstr ""
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
 msgstr ""
 
-#: ../src/file-share-properties.c:436
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr ""
+
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "Sen kialo"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr ""
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr ""
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "Neniam"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr ""
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "Ĉiam"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr ""
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "Demandi"
 
@@ -230,48 +175,36 @@ msgstr "Demandi"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr ""
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr ""
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr ""
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "Vi ricevis dosieron"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "Malfermi dosieron"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "Ralkaŝi dosieron"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr ""
-
-#~ msgid "File Received"
-#~ msgstr "Ricevis dosieron"
-
-#~ msgid "Open"
-#~ msgstr "Malfermi"
-
-#~ msgid "Reveal"
-#~ msgstr "Malkaŝi"
-
-#~ msgid "OK"
-#~ msgstr "Bone"
diff --git a/po/es.po b/po/es.po
index 6f59acf..72813cb 100644
--- a/po/es.po
+++ b/po/es.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 # Andres Sanchez <[email protected]>, 2016
+# Benjamin Perez Carrillo <[email protected]>, 2016
 # Francisco Javier F. Serrador <[email protected]>, 2005, 2006
 # Jorge González <[email protected]>, 200, 2009
 msgid ""
@@ -11,8 +12,8 @@ msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-11-06 15:07+0300\n"
-"PO-Revision-Date: 2016-02-12 17:45+0000\n"
-"Last-Translator: Andres Sanchez <[email protected]>\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: Benjamin Perez Carrillo <[email protected]>\n"
 "Language-Team: Spanish (http://www.transifex.com/mate/MATE/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -74,11 +75,11 @@ msgstr "_Notificar acerca de los archivos recibidos"
 
 #: ../data/libcaja-user-share.caja-extension.in.in.h:1
 msgid "User Share"
-msgstr ""
+msgstr "Usuario compartido"
 
 #: ../data/libcaja-user-share.caja-extension.in.in.h:2
 msgid "Integrates with user-share"
-msgstr ""
+msgstr "Se une a usuario compartido"
 
 #: ../data/mate-user-share-properties.desktop.in.h:1
 #: ../src/caja-share-bar.c:103
diff --git a/po/et.po b/po/et.po
index 8214a14..76e90dc 100644
--- a/po/et.po
+++ b/po/et.po
@@ -4,91 +4,22 @@
 # 
 # Translators:
 # Ivar Smolin <okul linux ee>, 2009
-# Ivar Smolin <[email protected]>, 2014
+# Ivar Smolin <[email protected]>, 2014-2015
 # Mattias Põldaru <mahfiaz gmail com>, 2010
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-26 22:51+0200\n"
-"PO-Revision-Date: 2014-09-13 07:28+0000\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
 "Last-Translator: Ivar Smolin <[email protected]>\n"
-"Language-Team: Estonian (http://www.transifex.com/projects/p/MATE/language/et/)\n"
+"Language-Team: Estonian (http://www.transifex.com/mate/MATE/language/et/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: et\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/desktop_mate_file_sharing.schemas.in.h:1
-msgid "Share Public directory over the network"
-msgstr "Failide jagamine võrku"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr "Kui määratud, siis on kasutaja kodukataloogis asuv avalik kataloog jagatud kasutaja sisselogimise ajal võrku."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:3
-msgid "When to require passwords"
-msgstr "Millal nõutakse paroole"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:4
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr "Millal peab paroole küsima. Võimalikud väärtused on \"never\" (mitte kunagi), \"on_write\" (kirjutamisel), ja \"always\" (alati)."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:5
-msgid "Share Public directory over Bluetooth"
-msgstr "Failide jagamine Bluetoothi kaudu"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:6
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr "Kui määratud, siis on kasutaja kodukataloogis asuv avalik kataloog jagatud kasutaja sisselogimise ajal Bluetoothi liidese kaudu."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:7
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "Kas Bluetoothi klientidel on lubatud faile kirjutada."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:8
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr "Kas Bluetoothi klientidel on lubatud faile kirjutada või on failid ainult lugemiseks."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:9
-msgid ""
-"Whether Bluetooth clients need to pair with the computer to send files."
-msgstr "Kas Bluetoothi kliendid peavad failide saatmiseks olema arvutiga paardunud."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "Kas Bluetoothi klientidel on lubatud ObexPushi abil faile saata."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:11
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr "Kui määratud, siis võivad Bluetooth seadmed kasutaja sisselogimise ajal saata faile kasutaja allalaadimiste kataloogi."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:12
-msgid "When to accept files sent over Bluetooth"
-msgstr "Millal Bluetoothi kaudu saadetud failidega nõustutakse"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:13
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr "Millal Bluetoothi kaudu saadetud failidega nõustutakse. Võimalikud väärtused on \"always\" (alati), \"bonded\" (ainult paardunud seadmete korral) ja \"ask\" (nõustumise kohta küsitakse kasutajalt)."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "Kas uutest vastuvõetud failidest antakse teada."
-
 #: ../data/file-share-properties.ui.h:1
 msgid "Personal File Sharing Preferences"
 msgstr "Isiklike failide jagamise eelistused"
@@ -141,8 +72,16 @@ msgstr "Failidega _nõustutakse:"
 msgid "_Notify about received files"
 msgstr "Vastuvõetud failidest _teavitatakse"
 
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
+
 #: ../data/mate-user-share-properties.desktop.in.h:1
-#: ../data/mate-user-share.desktop.in.in.h:1 ../src/caja-share-bar.c:162
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "Isiklike failide jagamine"
 
@@ -150,63 +89,81 @@ msgstr "Isiklike failide jagamine"
 msgid "Preferences for sharing of files"
 msgstr "Failide jagamise eelistused"
 
-#: ../data/mate-user-share.desktop.in.in.h:2
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Isiklike failide jagamise avamine, kui see on lubatud"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "Eelistuste avamine"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr ""
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr ""
 
-#: ../src/caja-share-bar.c:187
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr "Eelistused"
+
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Isiklike failide jagamise eelistuste avamine"
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "Isiklike failide jagamise eelistusi pole võimalik avada"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "Sellest kataloogist jagatakse faile, samuti pannakse sinna vastuvõetud failid"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr ""
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "Selle kataloogi failid jagatakse võrku ja üle Bluetoothi"
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr ""
+
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr ""
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "Sellesse kataloogi pannakse Bluetoothi kaudu vastuvõetud failid"
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr ""
 
-#: ../src/file-share-properties.c:436
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "Põhjendus puudub"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "Abiteabe sisu pole võimalik kuvada."
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "Liidest pole võimalik ehitada."
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "Mitte kunagi"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "Failide kirjutamiseks"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "Alati"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "Ainult seadistatud seadmete korral"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "Küsitakse kasutajalt"
 
@@ -219,36 +176,36 @@ msgstr "Küsitakse kasutajalt"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "Kasutaja %s avalikud failid"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "Kasutaja %s avalikud failid hostil %s"
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "Sa võtsid Bluetoothi kaudu vastu faili \"%s\""
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "Sulle saadeti fail"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "Ava fail"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "Ava kataloog"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "Faili vastuvõtmine on lõpetatud"
diff --git a/po/eu.po b/po/eu.po
index b68b1a4..ba471dc 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1,224 +1,167 @@
-# translation of eu.po to Basque
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
-# Iñaki Larrañaga Murgoitio <[email protected]>, 2008, 2009, 2010.
+# 
+# Translators:
+# Iñaki Larrañaga Murgoitio <[email protected]>, 2008, 2009, 2010
 msgid ""
 msgstr ""
-"Project-Id-Version: eu\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-12 15:56+0100\n"
-"PO-Revision-Date: 2010-03-23 18:16+0100\n"
-"Last-Translator: Iñaki Larrañaga Murgoitio <[email protected]>\n"
-"Language-Team: Basque <[email protected]>\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: monsta <[email protected]>\n"
+"Language-Team: Basque (http://www.transifex.com/mate/MATE/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/desktop_matefile_sharing.schemas.in.h:1
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr ""
-"'true' gisa (egia) ezartzen bada, Bluetooth gailuek fitxategiak bidal "
-"ditzakete erabiltzailearen 'Deskargak' direktoriora saioa hastean."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr ""
-"'true' gisa (egia) ezartzen bada, erabiltzaileen karpeta nagusiko direktorio "
-"publikoa partekatu egingo da Bluetooth bidez erabiltzaileak saioa hasten "
-"duenean."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:3
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr ""
-"'true' gisa (egia) ezartzen bada, erabiltzaileen karpeta nagusiko direktorio "
-"publikoa partekatu egingo da sarean zehar erabiltzaileak saioa hasten "
-"duenean."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:4
-msgid "Share Public directory over Bluetooth"
-msgstr "Partekatu direktorio publikoa Bluetooth bidez"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:5
-msgid "Share Public directory over the network"
-msgstr "Partekatu direktorio publikoa sarean zehar"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:6
-msgid "When to accept files sent over Bluetooth"
-msgstr "Noiz onartu Bluetooth bidez bidalitako fitxategiak"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:7
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr ""
-"Noiz onartu Bluetooth bidez bidalitako fitxategiak. Balio erabilgarriak: "
-"\"always\" (beti), \"bonded\" (lotuta), eta \"ask\" (galdetu)."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:8
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr ""
-"Noiz eskatu pasahitza. Balio erabilgarriak: \"never\" (inoiz ere ez), "
-"\"on_write\" (idaztean), eta \"always\" (beti)."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:9
-msgid "When to require passwords"
-msgstr "Noiz eskatu pasahitza"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "Bluetooth bezeroek fitxategiak bidal ditzaketen ObexPush erabiliz ala ez."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:11
-msgid "Whether Bluetooth clients need to pair with the computer to send files."
-msgstr ""
-"Bluetooth bezeroek ordenagailuarekin parekatu behar diren ala ez fitxategiak "
-"bidaltzeko."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:12
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr ""
-"Bluetooth bezeroei fitxategiak idaztea baimendu behar zaien, edo irakurtzeko "
-"soilik diren fitxategiak partekatzea."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:13
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "Bluetooth bezeroei fitxategiak idaztea baimendu behar zaien ala ez."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "Jaso berri diren fitxategiei buruz jakinarazi behar den ala ez."
-
 #: ../data/file-share-properties.ui.h:1
-msgid "<b>Receive Files over Bluetooth</b>"
-msgstr "<b>Jaso fitxategiak Bluetooth bidez</b>"
+msgid "Personal File Sharing Preferences"
+msgstr "Fitxategi pertsonalak partekatzearen hobespenak"
 
 #: ../data/file-share-properties.ui.h:2
-msgid "<b>Share Files over Bluetooth</b>"
-msgstr "<b>Partekatu fitxategiak Bluetooth bidez</b>"
-
-#: ../data/file-share-properties.ui.h:3
 msgid "<b>Share Files over the Network</b>"
 msgstr "<b>Partekatu fitxategiak sarean zehar</b>"
 
+#: ../data/file-share-properties.ui.h:3
+msgid "_Share public files on network"
+msgstr "_Partekatu fitxategi publikoak sarean"
+
 #: ../data/file-share-properties.ui.h:4
-msgid "Allo_w remote devices to delete files"
-msgstr "_Baimendu urruneko gailuek fitxategiak ezabatzea"
+msgid "_Password:"
+msgstr "_Pasahitza:"
 
 #: ../data/file-share-properties.ui.h:5
-msgid "Personal File Sharing Preferences"
-msgstr "Fitxategi pertsonalak partekatzearen hobespenak"
+msgid "_Require password:"
+msgstr "_Eskatu pasahitza:"
 
 #: ../data/file-share-properties.ui.h:6
-msgid "Receive files in _Downloads folder over Bluetooth"
-msgstr "Jaso fitxategiak _Deskargak karpetan Bluetooth bidez"
+msgid "<b>Share Files over Bluetooth</b>"
+msgstr "<b>Partekatu fitxategiak Bluetooth bidez</b>"
 
 #: ../data/file-share-properties.ui.h:7
-msgid "Require re_mote devices to bond with this computer"
-msgstr "Derrigortu _urruneko gailuei ordenagailu honekin lotzea"
-
-#: ../data/file-share-properties.ui.h:8
 msgid "Share public files over _Bluetooth"
 msgstr "Partekatu fitxategi publikoak _Bluetooth bidez"
 
+#: ../data/file-share-properties.ui.h:8
+msgid "Allo_w remote devices to delete files"
+msgstr "_Baimendu urruneko gailuek fitxategiak ezabatzea"
+
 #: ../data/file-share-properties.ui.h:9
-msgid "_Accept files: "
-msgstr "_Onartu fitxategiak: "
+msgid "Require re_mote devices to bond with this computer"
+msgstr "Derrigortu _urruneko gailuei ordenagailu honekin lotzea"
 
 #: ../data/file-share-properties.ui.h:10
-msgid "_Notify about received files"
-msgstr "_Jakinarazi fitxategiak jasotzean"
+msgid "<b>Receive Files over Bluetooth</b>"
+msgstr "<b>Jaso fitxategiak Bluetooth bidez</b>"
 
 #: ../data/file-share-properties.ui.h:11
-msgid "_Password:"
-msgstr "_Pasahitza:"
+msgid "Receive files in _Downloads folder over Bluetooth"
+msgstr "Jaso fitxategiak _Deskargak karpetan Bluetooth bidez"
 
 #: ../data/file-share-properties.ui.h:12
-msgid "_Require password:"
-msgstr "_Eskatu pasahitza:"
+msgid "_Accept files: "
+msgstr "_Onartu fitxategiak: "
 
 #: ../data/file-share-properties.ui.h:13
-msgid "_Share public files on network"
-msgstr "_Partekatu fitxategi publikoak sarean"
+msgid "_Notify about received files"
+msgstr "_Jakinarazi fitxategiak jasotzean"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
 
-#: ../data/mateuser-share-properties.desktop.in.h:1
-#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
+
+#: ../data/mate-user-share-properties.desktop.in.h:1
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "Fitxategi pertsonalak partekatzea"
 
-#: ../data/mateuser-share-properties.desktop.in.h:2
+#: ../data/mate-user-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Fitxategiak partekatzeko hobespenak"
 
-#: ../data/mateuser-share.desktop.in.in.h:1
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Abiarazi fitxategi pertsonalak partekatzea gaituta badago"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "Abiarazi hobespenak"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr ""
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr ""
+
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr ""
 
-#: ../src/caja-share-bar.c:187
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Fitxategi pertsonalak partekatzearen hobespenak abiarazi"
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "Ezin da fitxategi pertsonalak partekatzearen hobespenak abiarazi"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "Karpeta honetako fitxategiak partekatu eta bertan jaso ditzakezu fitxategiak ere"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr ""
+
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr ""
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "Karpeta honetako fitxategiak partekatu ditzakezu sarea eta Bluetooth bidez"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr ""
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "Bluetooth bidez fitxategiak jaso ditzakezu karpeta honetara"
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr ""
 
-#: ../src/file-share-properties.c:436
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "Ez dago arrazoirik"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "Ezin izan da laguntzako edukia bistaratu."
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "Ezin izan da interfazea eraiki."
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "Inoiz ez"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "Fitxategiak idaztean"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "Beti"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "Konfiguratutako gailuetan soilik"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "Galdetu"
 
@@ -231,37 +174,36 @@ msgstr "Galdetu"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "%s(r)en fitxategi publikoak"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "%s(r)en fitxategi publikoak (%s-(e)n)"
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "\"'%s\" jaso duzu Bluetooth bidez"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "Fitxategi bat jaso duzu"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "Ireki fitxategia"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "Errebelatu fitxategia"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "Fitxategi-harrera burutu da"
-
diff --git a/po/fi.po b/po/fi.po
index fe6dd45..fb4554e 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,222 +1,166 @@
-# Finnish translations for mateuser-share package.
-# Copyright (C) 2005-2009 Free Software Foundation, Inc.
-# This file is distributed under the same license as the package.
-# Tommi Vainikainen <[email protected]>, 2005-2010.
-# Ilkka Tuohela <[email protected]>, 2006-2009.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: mateuser-share\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-19 14:40+0200\n"
-"PO-Revision-Date: 2010-03-19 14:40+0200\n"
-"Last-Translator: Tommi Vainikainen <[email protected]>\n"
-"Language-Team: Finnish <[email protected]>\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: monsta <[email protected]>\n"
+"Language-Team: Finnish (http://www.transifex.com/mate/MATE/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/desktop_matefile_sharing.schemas.in.h:1
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr ""
-"Jos tosi, bluetooth-laitteet voivat lähettää tiedostoja käyttäjän Noudot-"
-"kansioon, kun käyttäjä on kirjatutunut sisään."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr ""
-"Jos tämä on tosi, kansio ”Julkinen” käyttäjän kotihakemistosta jaetaan "
-"Bluetooth-verkossa, kun käyttäjä on kirjautuneena sisään."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:3
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr ""
-"Jos tämä on tosi, kansio ”Julkinen” käyttäjän kotihakemistosta jaetaan "
-"verkossa, kun käyttäjä on kirjautuneena sisään."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:4
-msgid "Share Public directory over Bluetooth"
-msgstr "Jaa julkinen kansio bluetooth-verkossa"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:5
-msgid "Share Public directory over the network"
-msgstr "Jaa julkinen kansio verkossa"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:6
-msgid "When to accept files sent over Bluetooth"
-msgstr "Milloin bluetoothin yli lähetetyt tiedostot hyväksytään"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:7
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr ""
-"Milloin Bluetoothin yli lähetetyt tiedostot hyväksytään. Mahdolliset arvot "
-"ovat: ”always”, ”bonded” ja ”ask”."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:8
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr ""
-"Milloin kysytään salasanoja. Mahdolliset arvot ovat: ”never” (ei koskaan), "
-"”on_write” (kirjoitettaessa) ja ”always” (aina)."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:9
-msgid "When to require passwords"
-msgstr "Milloin vaaditaan salasanat"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "Voivatko bluetooth-asiakkaat lähettää tiedostoja ObexPush:illa."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:11
-msgid "Whether Bluetooth clients need to pair with the computer to send files."
-msgstr ""
-"Tuleeko bluetooth-asiakkaiden pariutua tietokoneen kanssa lähettääkseen "
-"tiedostoja."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:12
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr ""
-"Sallitaanko bluetooth-asiakkaiden kirjoittaa tiedostoja vai vain lukea "
-"jaettuja tiedostoja."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:13
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "Sallitaanko bluetooth-käyttäjien kirjoittaa tiedostoja."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "Huomautetaanko vastaanotetuista tiedostoista."
-
 #: ../data/file-share-properties.ui.h:1
-msgid "<b>Receive Files over Bluetooth</b>"
-msgstr "<b>Tiedostojen vastaanotto bluetoothilla</b>"
+msgid "Personal File Sharing Preferences"
+msgstr "Henkilökohtaisten tiedostojen jaon asetukset"
 
 #: ../data/file-share-properties.ui.h:2
-msgid "<b>Share Files over Bluetooth</b>"
-msgstr "<b>Tiedostojen jako bluetoothilla</b>"
-
-#: ../data/file-share-properties.ui.h:3
 msgid "<b>Share Files over the Network</b>"
 msgstr "<b>Jaa tiedostoja verkon yli</b>"
 
+#: ../data/file-share-properties.ui.h:3
+msgid "_Share public files on network"
+msgstr "_Jaa julkiset tiedostot verkossa"
+
 #: ../data/file-share-properties.ui.h:4
-msgid "Allo_w remote devices to delete files"
-msgstr "_Salli etälaitteiden poistaa tiedostoja"
+msgid "_Password:"
+msgstr "_Salasana:"
 
 #: ../data/file-share-properties.ui.h:5
-msgid "Personal File Sharing Preferences"
-msgstr "Henkilökohtaisten tiedostojen jaon asetukset"
+msgid "_Require password:"
+msgstr "_Vaadi salasana:"
 
 #: ../data/file-share-properties.ui.h:6
-msgid "Receive files in _Downloads folder over Bluetooth"
-msgstr "Vastaanota tiedostoja bluetoothin avulla _Noudot-kansioon"
+msgid "<b>Share Files over Bluetooth</b>"
+msgstr "<b>Tiedostojen jako bluetoothilla</b>"
 
 #: ../data/file-share-properties.ui.h:7
-msgid "Require re_mote devices to bond with this computer"
-msgstr "Vaadi _laitteilta sidosta tähän tietokoneeseen"
-
-#: ../data/file-share-properties.ui.h:8
 msgid "Share public files over _Bluetooth"
 msgstr "Jaa julkiset tiedostot _bluetoothilla"
 
+#: ../data/file-share-properties.ui.h:8
+msgid "Allo_w remote devices to delete files"
+msgstr "_Salli etälaitteiden poistaa tiedostoja"
+
 #: ../data/file-share-properties.ui.h:9
-msgid "_Accept files: "
-msgstr "H_yväksy tiedostot: "
+msgid "Require re_mote devices to bond with this computer"
+msgstr "Vaadi _laitteilta sidosta tähän tietokoneeseen"
 
 #: ../data/file-share-properties.ui.h:10
-msgid "_Notify about received files"
-msgstr "_Huomauta vastaanotetuista tiedostoista"
+msgid "<b>Receive Files over Bluetooth</b>"
+msgstr "<b>Tiedostojen vastaanotto bluetoothilla</b>"
 
 #: ../data/file-share-properties.ui.h:11
-msgid "_Password:"
-msgstr "_Salasana:"
+msgid "Receive files in _Downloads folder over Bluetooth"
+msgstr "Vastaanota tiedostoja bluetoothin avulla _Noudot-kansioon"
 
 #: ../data/file-share-properties.ui.h:12
-msgid "_Require password:"
-msgstr "_Vaadi salasana:"
+msgid "_Accept files: "
+msgstr "H_yväksy tiedostot: "
 
 #: ../data/file-share-properties.ui.h:13
-msgid "_Share public files on network"
-msgstr "_Jaa julkiset tiedostot verkossa"
+msgid "_Notify about received files"
+msgstr "_Huomauta vastaanotetuista tiedostoista"
 
-#: ../data/mateuser-share-properties.desktop.in.h:1
-#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
+
+#: ../data/mate-user-share-properties.desktop.in.h:1
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "Omien tiedostojen jako"
 
-#: ../data/mateuser-share-properties.desktop.in.h:2
+#: ../data/mate-user-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Asetukset tiedostojen jakamiselle"
 
-#: ../data/mateuser-share.desktop.in.in.h:1
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Käynnistä henkilökohtaisten tiedoston jako, jos käytössä"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "Käynnistysasetukset"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr ""
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr ""
 
-#: ../src/caja-share-bar.c:187
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr "Asetukset"
+
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Käynnistä henkilökohtaisten tiedostojen jaon asetukset"
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "Ei voitu käynnistää henkilökohtaisten tiedostojen jaon asetuksia"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "Voit jakaa tiedostoja tästä kansiosta ja vastaanottaa niitä sinne"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr ""
+
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr ""
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "Voit jakaa tiedostoja tästä kansiosta verkon ja Bluetoothin yli"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr ""
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "voit vastaanottaa tiedostoja Bluetoothin yli tähän kansioon"
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr ""
 
-#: ../src/file-share-properties.c:436
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "Ei syytä"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "Ei voitu näyttää ohjeen sisältöä."
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "Käyttöliittymää ei voitu luoda."
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "Ei koskaan"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "Kirjoitettaessa tiedostoja"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "Aina"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "Vain käyttöön otetut laitteet"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "Kysy"
 
@@ -229,45 +173,36 @@ msgstr "Kysy"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "Käyttäjän %s julkiset tiedostot"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "Käyttäjän %s julkiset tiedostot palvelimella %s"
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "Vastaanotit tiedoston ”%s” bluetoothilla"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "Vastaanotit tiedoston"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "Avaa tiedosto"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "Paljasta tiedosto"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "Tiedoston vastaanotto valmis"
-
-#~ msgid "Only for Bonded and Trusted devices"
-#~ msgstr "Vain sidotut ja luotetut laitteet"
-
-#~ msgid "Please log in as the user guest"
-#~ msgstr "Kirjaudu sisään käyttäjänä guest"
-
-#~ msgid "User Sharing"
-#~ msgstr "Käyttäjän tiedostojen jako"
diff --git a/po/fr.po b/po/fr.po
index bad9c94..8f6c801 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-11-06 15:07+0300\n"
-"PO-Revision-Date: 2016-01-28 21:20+0000\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
 "Last-Translator: yoplait <[email protected]>\n"
 "Language-Team: French (http://www.transifex.com/mate/MATE/language/fr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/po/ga.po b/po/ga.po
index 8d24a32..9d9a03f 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -1,210 +1,167 @@
-# Irish translations for mateuser-share package.
-# Copyright (C) 2009 Free Software Foundation, Inc.
-# This file is distributed under the same license as the mateuser-share package.
-# Seán de Búrca <[email protected]>, 2009.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Seán de Búrca <[email protected]>, 2009
 msgid ""
 msgstr ""
-"Project-Id-Version: mateuser-share\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-20 09:51-0600\n"
-"PO-Revision-Date: 2009-08-21 03:21-0600\n"
-"Last-Translator: Seán de Búrca <[email protected]>\n"
-"Language-Team: Irish <[email protected]>\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: monsta <[email protected]>\n"
+"Language-Team: Irish (http://www.transifex.com/mate/MATE/language/ga/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=5; plural=n==1 ? 0 : (n%10==1 || n%10==2) ? 1 : (n%"
-"10>=3 && n%10<= 6) ? 2 : ((n%10>=7 && n%10<=9) || n==10) ? 3 : 4;\n"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:1
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr ""
-"Má tá sé seo fíor, is féidir le gléasanna Bluetooth comhaid a sheoladh go "
-"dtí comhadlann \"Íosluchtuithe\" an úsáideora nuair atá an t-úsáideoir "
-"logáilte isteach."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr ""
-"Má tá sé seo fíor, comhroinntear an chomhadlann \"Poiblí\" i gcomhadlann "
-"bhaile an úsáideora trí Bluetooth nuair atá an t-úsáideoir logáilte isteach."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:3
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr ""
-"Má tá sé seo fíor, comhroinntear an chomhadlann \"Poiblí\" i gcomhadlann "
-"bhaile an úsáideora tríd an líonra nuair atá an t-úsáideoir logáilte isteach."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:4
-msgid "Share Public directory over Bluetooth"
-msgstr "Comhroinn an chomhadlann \"Poiblí\" trí Bluetooth"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:5
-msgid "Share Public directory over the network"
-msgstr "Comhroinn an chomhadlann \"Poiblí\" tríd an líonra"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:6
-msgid "When to accept files sent over Bluetooth"
-msgstr "An t-am le glacadh le comhaid seolta trí Bluetooth"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:7
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\", \"bonded_trusted\" and \"ask\"."
-msgstr ""
-"An t-am le glacadh le comhaid seolta trí Bluetooth. Is iad na luachanna a "
-"d'fhéadfadh a bheith ann ná \"always\", \"bonded\", \"bonded_trusted\", agus "
-"\"ask\"."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:8
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr ""
-"An t-am le hiarr focail faire. Is iad na luachanna a d'fhéadfadh a bheith "
-"ann ná \"never\", \"on_write\", agus \"always\"."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:9
-msgid "When to require passwords"
-msgstr "An t-am focail faire le héileamh"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr ""
-"Cé acu an bhfuil cliaint Bluetooth in ann comhaid a sheoladh trí ObexPush nó "
-"nach bhfuil."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:11
-msgid "Whether Bluetooth clients need to pair with the computer to send files."
-msgstr ""
-"Cé acu an bhfuil gá ag cliaint Bluetooth le péireáil leis an ríomhaire chun "
-"comhaid a sheoladh nó nach bhfuil."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:12
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr ""
-"Cé acu a cheadófar do chliaint Bluetooth comhaid a scríobh, nó na comhaid a "
-"chomhroinnt inléite-amháin."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:13
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr ""
-"Cé acu a cheadófar do chliaint Bluetooth comhaid a scríobh, nó nach "
-"gceadófar."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr ""
-"Cé acu a chuirfear in iúl maidir le comhaid faighte go nua, nó nach "
-"gcuirfear."
+"Language: ga\n"
+"Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : 4);\n"
 
 #: ../data/file-share-properties.ui.h:1
-msgid "<b>Receive Files over Bluetooth</b>"
-msgstr "<b>Faigh Comhaid trí Bluetooth</b>"
+msgid "Personal File Sharing Preferences"
+msgstr "Sainroghanna Chomhroinnt Chomhad Pearsanta"
 
 #: ../data/file-share-properties.ui.h:2
-msgid "<b>Share Files over Bluetooth</b>"
-msgstr "<b>Comhroinn Comhaid trí Bluetooth</b>"
-
-#: ../data/file-share-properties.ui.h:3
 msgid "<b>Share Files over the Network</b>"
 msgstr "<b>Comhroinn Comhaid Tríd an Líonra</b>"
 
+#: ../data/file-share-properties.ui.h:3
+msgid "_Share public files on network"
+msgstr "_Comhroinn comhaid poiblí ar an líonra"
+
 #: ../data/file-share-properties.ui.h:4
-msgid "Allo_w remote devices to delete files"
-msgstr "Ceadaigh _scriosadh comhad do ghléasanna cianda"
+msgid "_Password:"
+msgstr "_Focal faire:"
 
 #: ../data/file-share-properties.ui.h:5
-msgid "Personal File Sharing Preferences"
-msgstr "Sainroghanna Chomhroinnt Chomhad Pearsanta"
+msgid "_Require password:"
+msgstr "Focal faire de _dhíth:"
 
 #: ../data/file-share-properties.ui.h:6
-msgid "Receive files in _Downloads folder over Bluetooth"
-msgstr "Faigh comhaid san fhillteán \"Í_osluchtuithe\" trí Bluetooth"
+msgid "<b>Share Files over Bluetooth</b>"
+msgstr "<b>Comhroinn Comhaid trí Bluetooth</b>"
 
 #: ../data/file-share-properties.ui.h:7
-msgid "Require re_mote devices to bond with this computer"
-msgstr "Ceangal _gléasanna cianda leis an ríomhaire seo de dhíth"
-
-#: ../data/file-share-properties.ui.h:8
 msgid "Share public files over _Bluetooth"
 msgstr "Comhroinn comhaid poiblí trí _Bluetooth"
 
+#: ../data/file-share-properties.ui.h:8
+msgid "Allo_w remote devices to delete files"
+msgstr "Ceadaigh _scriosadh comhad do ghléasanna cianda"
+
 #: ../data/file-share-properties.ui.h:9
-msgid "_Accept files: "
-msgstr "_Glac le comhaid:"
+msgid "Require re_mote devices to bond with this computer"
+msgstr "Ceangal _gléasanna cianda leis an ríomhaire seo de dhíth"
 
 #: ../data/file-share-properties.ui.h:10
-msgid "_Notify about received files"
-msgstr "Cuir in _iúl maidir le comhaid faighte"
+msgid "<b>Receive Files over Bluetooth</b>"
+msgstr "<b>Faigh Comhaid trí Bluetooth</b>"
 
 #: ../data/file-share-properties.ui.h:11
-msgid "_Password:"
-msgstr "_Focal faire:"
+msgid "Receive files in _Downloads folder over Bluetooth"
+msgstr "Faigh comhaid san fhillteán \"Í_osluchtuithe\" trí Bluetooth"
 
 #: ../data/file-share-properties.ui.h:12
-msgid "_Require password:"
-msgstr "Focal faire de _dhíth:"
+msgid "_Accept files: "
+msgstr "_Glac le comhaid:"
 
 #: ../data/file-share-properties.ui.h:13
-msgid "_Share public files on network"
-msgstr "_Comhroinn comhaid poiblí ar an líonra"
+msgid "_Notify about received files"
+msgstr "Cuir in _iúl maidir le comhaid faighte"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
 
-#: ../data/mateuser-share-properties.desktop.in.h:1
-#: ../data/mateuser-share.desktop.in.in.h:2
+#: ../data/mate-user-share-properties.desktop.in.h:1
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "Comhroinnt Chomhad Pearsanta"
 
-#: ../data/mateuser-share-properties.desktop.in.h:2
+#: ../data/mate-user-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Sainroghanna ar chomhroinnt chomhad"
 
-#: ../data/mateuser-share.desktop.in.in.h:1
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Tosaigh Comhroinnt Chomhad Pearsanta má chumasaithe"
 
-#: ../src/file-share-properties.c:435
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr ""
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr ""
+
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr ""
+
+#: ../src/caja-share-bar.c:121
+msgid "Launch Personal File Sharing Preferences"
+msgstr ""
+
+#: ../src/share-extension.c:73
+msgid "Unable to launch the Personal File Sharing preferences"
+msgstr ""
+
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr ""
+
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr ""
+
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr ""
+
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr ""
+
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "Gan chúis"
 
-#: ../src/file-share-properties.c:463
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "Níorbh fhéidir inneachar cabhrach a thaispeáint."
 
-#: ../src/file-share-properties.c:503
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "Níorbh fhéidir comhéadan a thógáil."
 
-#: ../src/file-share-properties.c:543
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "Riamh"
 
-#: ../src/file-share-properties.c:546
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "Agus comhaid á scríobh"
 
-#: ../src/file-share-properties.c:549 ../src/file-share-properties.c:572
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "I gCónaí"
 
-#: ../src/file-share-properties.c:575
-msgid "Only for Bonded devices"
-msgstr "Do ghléasanna Nasctha amháin"
-
-#: ../src/file-share-properties.c:578
-msgid "Only for Bonded and Trusted devices"
-msgstr "Do ghléasanna Nasctha agus Iontaofa amháin"
+#: ../src/file-share-properties.c:580
+msgid "Only for set up devices"
+msgstr ""
 
-#: ../src/file-share-properties.c:583
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "Fiafraigh"
 
@@ -217,36 +174,36 @@ msgstr "Fiafraigh"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "comhaid poiblí %s"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "comhaid poiblí %s ar %s"
 
-#: ../src/http.c:372
-msgid "Please log in as the user guest"
-msgstr "Logáil isteach mar an t-úsáideoir guest le do thoil"
-
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:138
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "Fuair tú \"%s\" trí Bluetooth"
 
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "Fuair tú comhad"
 
-#: ../src/obexpush.c:151
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "Oscail Comhad"
 
-#: ../src/obexpush.c:155
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "Nocht Comhad"
+
+#: ../src/obexpush.c:169
+msgid "File reception complete"
+msgstr ""
diff --git a/po/gl.po b/po/gl.po
index 71ee9a4..249c01f 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -9,91 +9,22 @@
 # Ignacio Casal Quinteiro <[email protected]>, 2007, 2008
 # Ignacio Casal Quinteiro <[email protected]>, 2005, 2006
 # Mancomún - Centro de Referencia e Servizos de Software Libre <[email protected]>, 2009
-# mbouzada <[email protected]>, 2013
+# Miguel Anxo Bouzada <[email protected]>, 2013
 # Suso Baleato <[email protected]>, 2009
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-26 22:51+0200\n"
-"PO-Revision-Date: 2013-03-30 10:38+0000\n"
-"Last-Translator: mbouzada <[email protected]>\n"
-"Language-Team: Galician (http://www.transifex.com/projects/p/MATE/language/gl/)\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: monsta <[email protected]>\n"
+"Language-Team: Galician (http://www.transifex.com/mate/MATE/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/desktop_mate_file_sharing.schemas.in.h:1
-msgid "Share Public directory over the network"
-msgstr "Compartir o cartafol público na rede"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr "Se está definido a «true», o cartafol Público no cartafol persoal de usuario compartirase na rede cando o usuario estea conectado."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:3
-msgid "When to require passwords"
-msgstr "Cando requirir os contrasinais"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:4
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr "Cando hai que pedir os contrasinais. Os valores posíbeis son «nunca», «en_escritura», e «sempre»."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:5
-msgid "Share Public directory over Bluetooth"
-msgstr "Compartir o cartafol público mediante o Bluetooth"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:6
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr "Se está definido a «true», o cartafol Público no cartafol persoal dos usuarios compartirase mediante Bluetooth cando o usuario estea conectado."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:7
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "Se se lles permite aos clientes Bluetooth escribir ficheiros."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:8
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr "Se se lles permite aos clientes de Bluetooth escribir ficheiros ou compartir os ficheiros de só lectura."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:9
-msgid ""
-"Whether Bluetooth clients need to pair with the computer to send files."
-msgstr "Se os clientes do Bluetooth precisan estar emparellados co computador para enviar ficheiros."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "Se os clientes do Bluetooth poden enviar ficheiros usando o ObexPush."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:11
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr "Se está definido a «true», os dispositivos Bluetooth poden enviar ficheiros ao cartafol Descargas do usuario cando estea conectado."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:12
-msgid "When to accept files sent over Bluetooth"
-msgstr "Cando aceptar os ficheiros enviados mediante Bluetooth"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:13
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr "Cando aceptar os ficheiros enviados mediante Bluetooth. Os valores posíbeis son «sempre», «ligado» e «preguntar»."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "Se hai que informar sobre os ficheiros recibidos recentemente."
-
 #: ../data/file-share-properties.ui.h:1
 msgid "Personal File Sharing Preferences"
 msgstr "Preferencias de compartir ficheiros"
@@ -146,8 +77,16 @@ msgstr "_Aceptar ficheiros: "
 msgid "_Notify about received files"
 msgstr "_Informar sobre os ficheiros recibidos"
 
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
+
 #: ../data/mate-user-share-properties.desktop.in.h:1
-#: ../data/mate-user-share.desktop.in.in.h:1 ../src/caja-share-bar.c:162
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "Compartir ficheiros persoais"
 
@@ -155,63 +94,81 @@ msgstr "Compartir ficheiros persoais"
 msgid "Preferences for sharing of files"
 msgstr "Preferencias para compartir ficheiros"
 
-#: ../data/mate-user-share.desktop.in.in.h:2
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Iniciar Compartir ficheiros persoais, se está activado"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "Preferencias de inicio"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr ""
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr ""
 
-#: ../src/caja-share-bar.c:187
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr ""
+
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Iniciar as Preferencias de compartir ficheiros persoais"
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "Non é posíbel iniciar as Preferencias de compartir ficheiros persoais"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "Vostede pode compartir ficheiros desde o seu cartafol e recibir ficheiros cara el"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr ""
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "Vostede pode compartir ficheiros desde o seu cartafol pola rede ou mediante Bluetooth"
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr ""
+
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr ""
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "Vostede pode recibir ficheiros por Bluetooth neste cartafol"
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr ""
 
-#: ../src/file-share-properties.c:436
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "Non hai motivo"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "Non foi posíbel mostrar os contidos da axuda."
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "Non foi posíbel construír a interface."
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "Nunca"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "Ao escribir os ficheiros"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "Sempre"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "Só para os dispositivos configurados"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "Preguntar"
 
@@ -224,36 +181,36 @@ msgstr "Preguntar"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "Ficheiros públicos de %s"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "Ficheiros públicos de %s en %s"
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "Recibiu «%s» mediante Bluetooth"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "Recibiu un ficheiro"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "Abrir o ficheiro"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "Amosar o ficheiro"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "Completouse a recepción do ficheiro"
diff --git a/po/gu.po b/po/gu.po
index 48b7226..6a3b43f 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -1,224 +1,168 @@
-# translation of mateuser-share.master.gu.po to Gujarati
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
-#
-# Ankit Patel <[email protected]>, 2006.
-# Sweta Kothari <[email protected]>, 2009, 2010.
+# 
+# Translators:
+# Ankit Patel <[email protected]>, 2006
+# sweta <[email protected]>, 2009, 2010
 msgid ""
 msgstr ""
-"Project-Id-Version: mateuser-share.master.gu\n"
-"Report-Msgid-Bugs-To: http://bugzilla.mateorg/enter_bug.cgi?product=mateuser-share&component=general\n"
-"POT-Creation-Date: 2009-12-14 21:47+0000\n"
-"PO-Revision-Date: 2010-02-05 16:41+0530\n"
-"Last-Translator: Sweta Kothari <[email protected]>\n"
-"Language-Team: Gujarati\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: monsta <[email protected]>\n"
+"Language-Team: Gujarati (http://www.transifex.com/mate/MATE/language/gu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"\n"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:1
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr ""
-"જો આ ખરું હોય, તો વપરાશકર્તાઓ ડાઉનલોડ ડિરેક્ટરીમાં બ્લુટુથ ઉપકરણો એ ફાઇલો ને મોકલી શકે "
-"છે જ્યારે વપરાશકર્તા પ્રવેશ કરે."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr ""
-"જો આ ખરું હોય, તો વપરાશકર્તાઓ ઘર ડિરેક્ટરીમાંની જાહેર ડિરેક્ટરી બ્લુટુથ પર વહેંચાશે જ્યારે "
-"વપરાશકર્તા પ્રવેશ કરે."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:3
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr ""
-"જો આ ખરું હોય, તો વપરાશકર્તાઓ ઘર ડિરેક્ટરીમાંની જાહેર ડિરેક્ટરી નેટવર્ક પર વહેંચાશે જ્યારે "
-"વપરાશકર્તા પ્રવેશ કરે."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:4
-msgid "Share Public directory over Bluetooth"
-msgstr "બ્લુટુથ પર જાહેર ડિરેક્ટરી વહેંચો"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:5
-msgid "Share Public directory over the network"
-msgstr "નેટવર્ક પર જાહેર ડિરેક્ટરીને વહેંચો"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:6
-msgid "When to accept files sent over Bluetooth"
-msgstr "ક્યારે બ્લુટુથ પર મોકલેલ ફાઇલોને સ્વીકારો છો"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:7
-#| msgid ""
-#| "When to accept files sent over Bluetooth. Possible values are \"always\", "
-#| "\"bonded\", \"bonded_trusted\" and \"ask\"."
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr "ક્યારે બ્લૂટુથ પર મોકલેલ ફાઇલોને સ્વીકારો છો. શક્ય કિંમતો \"always\", \"bonded\", અને \"ask\" છે."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:8
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr "પાસવર્ડો માટે ક્યારે પૂછવું. \"ક્યારેય નહિં\", \"લખવા પર\", અને \"હંમેશા\" શક્ય કિંમતો છે."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:9
-msgid "When to require passwords"
-msgstr "ક્યારે પાસવર્ડો જરૂરી છે"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "ક્યાંતો ObexPush ની મદદથી બ્લુટુથ ક્લાઇન્ટો ફાઇલો ને મોકલી શકે છે."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:11
-msgid "Whether Bluetooth clients need to pair with the computer to send files."
-msgstr "ક્યાંતો ફાઇલો ને મોકલવા માટે કૉમ્પયુટર સાથે બ્લુટુથ ક્લાઇન્ટોને જોડીની જરૂર છે."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:12
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr ""
-"ક્યાંતો ફાઇલો ને લખવા માટે બ્લુટુથ ક્લાઇન્ટોને પરવાનગી આપો. અથવા ફક્ત વાંચી શકાય તેવી "
-"ફાઇલોને વહેંચો."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:13
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "ક્યાંતો ફાઇલો ને લખવા માટે બ્લુટુથ ક્લાઇન્ટોને પરવાનગી આપો."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "ક્યાંતો નવી મેળવેલ ફાઇલો વિશે સૂચિત કરો."
+"Language: gu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/file-share-properties.ui.h:1
-msgid "<b>Receive Files over Bluetooth</b>"
-msgstr "<b>બ્લુટુથ પર ફાઇલો ને મેળવો</b>"
+msgid "Personal File Sharing Preferences"
+msgstr "વ્યક્તિગત ફાઈલ વહેંચણી પસંદગીઓ"
 
 #: ../data/file-share-properties.ui.h:2
-msgid "<b>Share Files over Bluetooth</b>"
-msgstr "<b>બ્લુટુથ પર ફાઈલો વહેંચો</b>"
-
-#: ../data/file-share-properties.ui.h:3
 msgid "<b>Share Files over the Network</b>"
 msgstr "<b>નેટવર્ક પર ફાઈલો વહેંચો</b>"
 
+#: ../data/file-share-properties.ui.h:3
+msgid "_Share public files on network"
+msgstr "નેટવર્ક પર જાહેર ફાઈલો વહેંચો (_S)"
+
 #: ../data/file-share-properties.ui.h:4
-msgid "Allo_w remote devices to delete files"
-msgstr "ફાઇલોને કાઢવા માટે દૂરસ્થ ઉપકરણોની પરવાનગી લો (_w)"
+msgid "_Password:"
+msgstr "પાસવર્ડ (_P):"
 
 #: ../data/file-share-properties.ui.h:5
-msgid "Personal File Sharing Preferences"
-msgstr "વ્યક્તિગત ફાઈલ વહેંચણી પસંદગીઓ"
+msgid "_Require password:"
+msgstr "જરૂરી પાસવર્ડ (_R):"
 
 #: ../data/file-share-properties.ui.h:6
-msgid "Receive files in _Downloads folder over Bluetooth"
-msgstr "બ્લુટુથ પર ડાઉનલોડ ફોલ્ડરમાં ફાઇલોને મેળવો (_D)"
+msgid "<b>Share Files over Bluetooth</b>"
+msgstr "<b>બ્લુટુથ પર ફાઈલો વહેંચો</b>"
 
 #: ../data/file-share-properties.ui.h:7
-msgid "Require re_mote devices to bond with this computer"
-msgstr "આ કૉમ્પ્યુટર સાથે જોડાવા માટે દૂરસ્થ ઉપકરણો ની જરૂર છે (_m)"
-
-#: ../data/file-share-properties.ui.h:8
 msgid "Share public files over _Bluetooth"
 msgstr "બ્લુટુથ પર જાહેર ફાઈલો વહેંચો (_B)"
 
+#: ../data/file-share-properties.ui.h:8
+msgid "Allo_w remote devices to delete files"
+msgstr "ફાઇલોને કાઢવા માટે દૂરસ્થ ઉપકરણોની પરવાનગી લો (_w)"
+
 #: ../data/file-share-properties.ui.h:9
-msgid "_Accept files: "
-msgstr "ફાઇલો ને સ્વીકારો (_A): "
+msgid "Require re_mote devices to bond with this computer"
+msgstr "આ કૉમ્પ્યુટર સાથે જોડાવા માટે દૂરસ્થ ઉપકરણો ની જરૂર છે (_m)"
 
 #: ../data/file-share-properties.ui.h:10
-msgid "_Notify about received files"
-msgstr "મળેલ ફાઇલો વિશે સૂચિત કરો (_N)"
+msgid "<b>Receive Files over Bluetooth</b>"
+msgstr "<b>બ્લુટુથ પર ફાઇલો ને મેળવો</b>"
 
 #: ../data/file-share-properties.ui.h:11
-msgid "_Password:"
-msgstr "પાસવર્ડ (_P):"
+msgid "Receive files in _Downloads folder over Bluetooth"
+msgstr "બ્લુટુથ પર ડાઉનલોડ ફોલ્ડરમાં ફાઇલોને મેળવો (_D)"
 
 #: ../data/file-share-properties.ui.h:12
-msgid "_Require password:"
-msgstr "જરૂરી પાસવર્ડ (_R):"
+msgid "_Accept files: "
+msgstr "ફાઇલો ને સ્વીકારો (_A): "
 
 #: ../data/file-share-properties.ui.h:13
-msgid "_Share public files on network"
-msgstr "નેટવર્ક પર જાહેર ફાઈલો વહેંચો (_S)"
+msgid "_Notify about received files"
+msgstr "મળેલ ફાઇલો વિશે સૂચિત કરો (_N)"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
 
-#: ../data/mateuser-share-properties.desktop.in.h:1
-#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
+#: ../data/mate-user-share-properties.desktop.in.h:1
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "ખાનગી ફાઈલ વહેંચણી"
 
-#: ../data/mateuser-share-properties.desktop.in.h:2
+#: ../data/mate-user-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "ફાઇલોની વહેંચણી માટે પસંદગીઓ"
 
-#: ../data/mateuser-share.desktop.in.in.h:1
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "વ્યક્તિગત ફાઇલ વહેંચણીને પ્રકાશિત કરો જો સક્રિય હોય તો"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "શરૂ કરવાની પસંદગીઓ"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr ""
 
-#: ../src/caja-share-bar.c:187
-#| msgid "Personal File Sharing Preferences"
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr ""
+
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr ""
+
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "વ્યક્તિગત ફાઈલ વહેંચણી પસંદગીઓને શરૂ કરો"
 
-#: ../src/share-extension.c:82
-#| msgid "Personal File Sharing Preferences"
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "વ્યક્તિગત ફાઈલ વહેંચણી પસંદગીઓ ને શરૂ કરવાનું અસમર્થ"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "આ ફાઇલમાંથી તમે ફાઇલોને વહેંચી શકો છો અને તેની માટે ફાઇલોને મેળવો"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr ""
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "નેટવર્ક અને બ્લૂટુથ પર આ ફોલ્ડર માંથી ફાઇલોને તમે વહેંચી શકો છો"
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr ""
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "આ ફોલ્ડરમાં બ્લૂટુથ પર ફાઇલોને મેળવી શકો છો"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr ""
+
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr ""
 
-#: ../src/file-share-properties.c:436
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "કારણ નથી"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "મદદ સમાવિષ્ટો ને દર્શાવી શકાયુ નહિં."
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "ઇન્ટરફેસ ને બિલ્ડ કરી શકાયુ નહિં."
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "ક્યારેય નહિં"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "જ્યારે ફાઈલો લખી રહ્યા હોય"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "હંમેશા"
 
-#: ../src/file-share-properties.c:598
-#| msgid "Only for Bonded devices"
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "ફક્ત ઉપકરણોનાં સુયોજન માટે"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "પૂછો"
 
@@ -231,41 +175,36 @@ msgstr "પૂછો"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "%s ની જાહેર ફાઈલો"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "%s ની %s પર જાહેર ફાઈલો"
 
-#: ../src/http.c:372
-msgid "Please log in as the user guest"
-msgstr "વપરાશકર્તા મહેમાન તરીકે મહેરબાની કરીને પ્રવેશો"
-
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "તમને બ્લુટુથ મારફતે \"%s\" મળેલ છે"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "તમને ફાઇલ મળેલ છે"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "ફાઇલને ખોલો"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "ફાઇલને બતાવો"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "ફાઇલ રિસેપ્શન સમાપ્ત"
-
diff --git a/po/he.po b/po/he.po
index 09d8d38..c3db16c 100644
--- a/po/he.po
+++ b/po/he.po
@@ -1,218 +1,167 @@
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Yair Hershkovitz, 2008.
-#
+# 
+# Translators:
+# Yair Hershkovitz, 2008
 msgid ""
 msgstr ""
-"Project-Id-Version: 1\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 04:10+0300\n"
-"PO-Revision-Date: 2010-05-30 04:14+0200\n"
-"Last-Translator: Yaron Shahrabani <[email protected]>\n"
-"Language-Team: he\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: monsta <[email protected]>\n"
+"Language-Team: Hebrew (http://www.transifex.com/mate/MATE/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:1
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:3
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:4
-msgid "Share Public directory over Bluetooth"
-msgstr "Share Public directory over Bluetooth"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:5
-msgid "Share Public directory over the network"
-msgstr "Share Public directory over the network"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:6
-msgid "When to accept files sent over Bluetooth"
-msgstr "When to accept files sent over Bluetooth"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:7
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:8
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:9
-msgid "When to require passwords"
-msgstr "When to require passwords"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "Whether Bluetooth clients can send files using ObexPush."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:11
-msgid "Whether Bluetooth clients need to pair with the computer to send files."
-msgstr ""
-"Whether Bluetooth clients need to pair with the computer to send files."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:12
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:13
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "Whether to allow Bluetooth clients to write files."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "Whether to notify about newly received files."
+"Language: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/file-share-properties.ui.h:1
-msgid "<b>Receive Files over Bluetooth</b>"
-msgstr "<b>קבל קבצים דרך Bluetooth</b>"
+msgid "Personal File Sharing Preferences"
+msgstr "העדפות לשיתוף קבצים אישיים"
 
 #: ../data/file-share-properties.ui.h:2
-msgid "<b>Share Files over Bluetooth</b>"
-msgstr "<b>שתף קבצים דרך Bluetooth</b>"
-
-#: ../data/file-share-properties.ui.h:3
 msgid "<b>Share Files over the Network</b>"
 msgstr "<b>שתף קבצים ברשת</b>"
 
+#: ../data/file-share-properties.ui.h:3
+msgid "_Share public files on network"
+msgstr "_שיתוף קבצים ציבוריים ברשת"
+
 #: ../data/file-share-properties.ui.h:4
-msgid "Allo_w remote devices to delete files"
-msgstr "_אפשר להתקנים מרוחקים למחוק קבצים"
+msgid "_Password:"
+msgstr "ססמה:"
 
 #: ../data/file-share-properties.ui.h:5
-msgid "Personal File Sharing Preferences"
-msgstr "העדפות לשיתוף קבצים אישיים"
+msgid "_Require password:"
+msgstr "_דרישת סיסמה:"
 
 #: ../data/file-share-properties.ui.h:6
-msgid "Receive files in _Downloads folder over Bluetooth"
-msgstr "קבל _קבצים אל תיקיית ההורדות דרך Bluetooth"
+msgid "<b>Share Files over Bluetooth</b>"
+msgstr "<b>שתף קבצים דרך Bluetooth</b>"
 
 #: ../data/file-share-properties.ui.h:7
-msgid "Require re_mote devices to bond with this computer"
-msgstr "דרוש מהתקנים מרוחקים ליצור _איגוד עם מחשב זה"
-
-#: ../data/file-share-properties.ui.h:8
 msgid "Share public files over _Bluetooth"
 msgstr "שיתוף קבצים _ציבוריים דרך Bluetooth"
 
+#: ../data/file-share-properties.ui.h:8
+msgid "Allo_w remote devices to delete files"
+msgstr "_אפשר להתקנים מרוחקים למחוק קבצים"
+
 #: ../data/file-share-properties.ui.h:9
-msgid "_Accept files: "
-msgstr "_קבלת קבצים:"
+msgid "Require re_mote devices to bond with this computer"
+msgstr "דרוש מהתקנים מרוחקים ליצור _איגוד עם מחשב זה"
 
 #: ../data/file-share-properties.ui.h:10
-msgid "_Notify about received files"
-msgstr "ה_ודעה אודות קבצים שהתקבלו"
+msgid "<b>Receive Files over Bluetooth</b>"
+msgstr "<b>קבל קבצים דרך Bluetooth</b>"
 
 #: ../data/file-share-properties.ui.h:11
-msgid "_Password:"
-msgstr "ססמה:"
+msgid "Receive files in _Downloads folder over Bluetooth"
+msgstr "קבל _קבצים אל תיקיית ההורדות דרך Bluetooth"
 
 #: ../data/file-share-properties.ui.h:12
-msgid "_Require password:"
-msgstr "_דרישת סיסמה:"
+msgid "_Accept files: "
+msgstr "_קבלת קבצים:"
 
 #: ../data/file-share-properties.ui.h:13
-msgid "_Share public files on network"
-msgstr "_שיתוף קבצים ציבוריים ברשת"
+msgid "_Notify about received files"
+msgstr "ה_ודעה אודות קבצים שהתקבלו"
 
-#: ../data/mateuser-share-properties.desktop.in.h:1
-#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
+
+#: ../data/mate-user-share-properties.desktop.in.h:1
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "שיתוף קבצים אישיים"
 
-#: ../data/mateuser-share-properties.desktop.in.h:2
+#: ../data/mate-user-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "העדפות לשיתוף קבצים"
 
-#: ../data/mateuser-share.desktop.in.in.h:1
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "טעינת שיתוף קבצים אישיים אם פעיל"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "העדפות הטעינה"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr ""
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr ""
 
-#: ../src/caja-share-bar.c:187
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr "העדפות"
+
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "טעינת העדפות שיתוף הקבצים האישיים"
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "לא ניתן לטעון את העדפות שיתוף הקבצים האישיים"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "ניתן לשתף קבצים מתיקייה זו ולקבל אליה קבצים"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr ""
+
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr ""
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "ניתן לשתף קבצים בתוך הרשת ודרך Bluetooth"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr ""
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "ניתן לקבל קבצים באמצעות Bluetooth לתיקייה זו"
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr ""
 
-#: ../src/file-share-properties.c:436
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "ללא סיבה"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "לא ניתן להציג את תכני העזרה"
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "לא ניתן לבנות את המנשק."
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "לעולם לא"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "בכתיבת קבצים"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "תמיד"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "רק עבור התקנים שהותקנו"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "הצגת שאלה"
 
@@ -225,45 +174,36 @@ msgstr "הצגת שאלה"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "הקבצים הציבוריים של %s"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "הקבצים הציבוריים של %s על %s"
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "קיבלת \"%s\" דרך Bluetooth"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "קבלת קובץ"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "פתיחת קובץ"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "גילוי קובץ"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "קבלת הקובץ הושלמה"
-
-#~ msgid "Only for Bonded and Trusted devices"
-#~ msgstr "רק עבור התקנים מאוגדים ומהימנים"
-
-#~ msgid "Please log in as the user guest"
-#~ msgstr "אנא התחבר כאורח"
-
-#~ msgid "User Sharing"
-#~ msgstr "שיתוף משתמשים"
diff --git a/po/hi.po b/po/hi.po
index 5342446..eda49e9 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -10,85 +10,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-26 22:51+0200\n"
-"PO-Revision-Date: 2014-03-08 14:45+0000\n"
-"Last-Translator: Sadgamaya <[email protected]>\n"
-"Language-Team: Hindi (http://www.transifex.com/projects/p/MATE/language/hi/)\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: monsta <[email protected]>\n"
+"Language-Team: Hindi (http://www.transifex.com/mate/MATE/language/hi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/desktop_mate_file_sharing.schemas.in.h:1
-msgid "Share Public directory over the network"
-msgstr "संजाल पर सार्वजनिक निर्देशिका साझा करें"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr "यदि यह सही है, उपयोक्ता घर निर्देशिका में सार्वजनिक निर्देशिका को संजाल पर साझा करना है जब उपयोक्ता लॉगिन होता है."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:3
-msgid "When to require passwords"
-msgstr "कब कूटशब्द जरूरी है"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:4
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr "कब कूटशब्द के लिए पूछना है. संभावित मान हैं \"never\", \"on_write\", और \"always\"."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:5
-msgid "Share Public directory over Bluetooth"
-msgstr "ब्लूटूथ पर सार्वजनिक निर्देशिका साझा करें"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:6
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr "यदि यह सही है, उपयोक्ता घर निर्देशिका में सार्वजनिक निर्देशिका को ब्लूटूथ पर साझा करना है जब उपयोक्ता लॉगिन होता है."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:7
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "क्या ब्लूटूथ क्लाइंड को फाइल लिखने के लिए स्वीकृति देनी है."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:8
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr "क्या ब्लूटूथ क्लाइंड को फाइल लिखने के लिए स्वीकृति देनी है, या केवल पठन योग्य फाइलें साझा करें."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:9
-msgid ""
-"Whether Bluetooth clients need to pair with the computer to send files."
-msgstr "क्या ब्लूटूथ क्लाइंड कंप्यूटर के साथ फाइलें भेजने के लिए किसी जोड़े की जरूरत है."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "क्या ब्लूटूथ क्लाइंट को ObexPush के प्रयोग से फाइलें भेज सकता है."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:11
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr "यदि यह सही है, ब्लूटूथ युक्ति उपयोक्ता के डाउनलोड निर्देशिका में भेज सकता है जब लॉगिन हो."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:12
-msgid "When to accept files sent over Bluetooth"
-msgstr "कब ब्लूटूथ पर भेजे फाइलों को स्वीकार करना है"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:13
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr "जब ब्लूटूथ पर भेजे फाइलों को स्वीकार करना है. संभावित मान \"हमेशा\", \"बंधी\" व \"पूछें\" हैं."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "क्या हाल में प्राप्त फाइलों के बारे में अधिसूचित करना है."
-
 #: ../data/file-share-properties.ui.h:1
 msgid "Personal File Sharing Preferences"
 msgstr "निजी फ़ाइल साझा वरीयता"
@@ -141,8 +72,16 @@ msgstr "फाइल स्वीकारें (_A): "
 msgid "_Notify about received files"
 msgstr "प्राप्त फाइल के बारे में अधिसूचित करें (_N)"
 
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
+
 #: ../data/mate-user-share-properties.desktop.in.h:1
-#: ../data/mate-user-share.desktop.in.in.h:1 ../src/caja-share-bar.c:162
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "निजी फ़ाइल साझा"
 
@@ -150,63 +89,81 @@ msgstr "निजी फ़ाइल साझा"
 msgid "Preferences for sharing of files"
 msgstr "फाइलों के साझा के लिए वरीयता"
 
-#: ../data/mate-user-share.desktop.in.in.h:2
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "निजी फ़ाइल साझा लॉन्च करें यदि सक्रिय किया गया है"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "वरीयताएं चलओ"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr ""
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr ""
 
-#: ../src/caja-share-bar.c:187
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr ""
+
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "निजी फ़ाइल साझा वरीयताएं चलओ"
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "निजी फ़ाइल साझा वरीयताएं नहीं चलासकें"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "आप इस फोल्डर से फ़ाइलें सांझा व प्रतिग्रहण कर सकते हैं"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr ""
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "आप नेटवर्क और ब्लूटूथ पर इस फ़ोल्डर से फ़ाइलें साझा कर सकते हैं"
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr ""
+
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr ""
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "आप इस फ़ोल्डर में ब्लूटूथ पर से फ़ाइलों का प्रतिग्रहण कर सकते हैं"
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr ""
 
-#: ../src/file-share-properties.c:436
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "कोई कारण नहीं"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "मदद सामग्री नहीं दिखा सका."
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "अंतरफलक नहीं बना सका."
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "कभी नहीं"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "फाइल लिखने के दौरान"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "हमेशा"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "केवल व्यवस्तीत उपकरणों के लिए"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "पूछें"
 
@@ -219,36 +176,36 @@ msgstr "पूछें"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "%s की सार्वजनिक फाइल"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "%s की सार्वजनिक फाइल %s पर है"
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "आपने \"%s\" ब्लूटूथ से पाया"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "आपने कोई फाइल प्राप्त किया"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "फ़ाइल खोलें"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "फाइल खोलें"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "फाइल प्रतिग्रहण सम्पूर्ण"
diff --git a/po/hr.po b/po/hr.po
index 3ce42c9..bdb62ee 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -3,90 +3,28 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Armen <[email protected]>, 2012
 # Ivica  Kolić <[email protected]>, 2013
+# Kristoffer Grundström <[email protected]>, 2015
+# Mattias A, 2015
+# Mattias OKFSE, 2015
+# Piotr Szotkowski <[email protected]>, 2011
+# semden <[email protected]>, 2012
+# Владимир Александрович <[email protected]>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-26 22:51+0200\n"
-"PO-Revision-Date: 2014-05-18 18:40+0000\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
 "Last-Translator: Mislav E. Lukšić <[email protected]>\n"
-"Language-Team: Croatian (http://www.transifex.com/projects/p/MATE/language/hr/)\n"
+"Language-Team: Croatian (http://www.transifex.com/mate/MATE/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: ../data/desktop_mate_file_sharing.schemas.in.h:1
-msgid "Share Public directory over the network"
-msgstr "Dijeli javni direktorij preko mreže"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr "Ako je ovo istina, Javni direktorij u korisničkoj osobnoj mapi će biti djeljen preko mreže kada je korisnik prijavljen."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:3
-msgid "When to require passwords"
-msgstr "Kada zahtijevati zaporke"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:4
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr "Kada tražiti zaporke. Moguće zadanosti su \"nikada\", \"u_pisanju\" i \"uvijek\"."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:5
-msgid "Share Public directory over Bluetooth"
-msgstr "Dijeli javni direktorij preko bluetootha"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:6
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr "Ako je ovo istinito, javni direktorij u osobnom direktoriju korisnika bit će dijeljen preko bluetootha kada je korisnik prijavljen."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:7
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "Treba li klijentima bluetootha dopustiti zapisivanje datoteka."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:8
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr "Treba li klijentima bluetootha dopustiti zapisivanje datoteka ili dijeljenje datoteka samo za čitanje."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:9
-msgid ""
-"Whether Bluetooth clients need to pair with the computer to send files."
-msgstr "Trebaju li se klijenti bluetootha upariti s računalom za slanje datoteka."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "Mogu li klijenti bluetootha slati datoteke koristeći ObexPush."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:11
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr "Ako je ovo istinito, uređaji s bluetoothom mogu slati datoteke u korisnikov direktorij preuzimanja kada je prijavljen."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:12
-msgid "When to accept files sent over Bluetooth"
-msgstr "Kada prihvatiti datoteke poslane preko bluetootha"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:13
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr "Kada prihvatiti datoteke poslane preko bluetootha. Moguće zadanosti su \"uvijek\", \"spojeno\" i \"upitaj\"."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "Treba li obavijestiti o novoprimljenim datotekama."
-
 #: ../data/file-share-properties.ui.h:1
 msgid "Personal File Sharing Preferences"
 msgstr "Prilagodbe osobnog dijeljenja datoteka"
@@ -105,15 +43,15 @@ msgstr "_Zaporka:"
 
 #: ../data/file-share-properties.ui.h:5
 msgid "_Require password:"
-msgstr "_Potrebna je zaporka:"
+msgstr "_Zahtijevaj zaporku:"
 
 #: ../data/file-share-properties.ui.h:6
 msgid "<b>Share Files over Bluetooth</b>"
-msgstr "<b>Dijeli datoteke preko bluetootha</b>"
+msgstr "<b>Dijeli datoteke putem bluetootha</b>"
 
 #: ../data/file-share-properties.ui.h:7
 msgid "Share public files over _Bluetooth"
-msgstr "Dijeli javne datoteke preko _bluetootha"
+msgstr "Dijeli javne datoteke putem _bluetootha"
 
 #: ../data/file-share-properties.ui.h:8
 msgid "Allo_w remote devices to delete files"
@@ -125,11 +63,11 @@ msgstr "Zatraži od ud_aljenih uređaja spajanje s ovim računalom"
 
 #: ../data/file-share-properties.ui.h:10
 msgid "<b>Receive Files over Bluetooth</b>"
-msgstr "<b>Primi datoteke preko bluetootha</b>"
+msgstr "<b>Primi datoteke putem bluetootha</b>"
 
 #: ../data/file-share-properties.ui.h:11
 msgid "Receive files in _Downloads folder over Bluetooth"
-msgstr "Primi datoteke u_mapu preuzimanja preko bluetootha"
+msgstr "Primi datoteke u_mapu preuzimanja putem bluetootha"
 
 #: ../data/file-share-properties.ui.h:12
 msgid "_Accept files: "
@@ -139,8 +77,16 @@ msgstr "_Prihvati datoteke:"
 msgid "_Notify about received files"
 msgstr "_Obavijesti o primljenim datotekama"
 
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr "Korisničko dijeljenje"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr "Spaja se s user-share"
+
 #: ../data/mate-user-share-properties.desktop.in.h:1
-#: ../data/mate-user-share.desktop.in.in.h:1 ../src/caja-share-bar.c:162
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "Osobno dijeljenje datoteka"
 
@@ -148,63 +94,81 @@ msgstr "Osobno dijeljenje datoteka"
 msgid "Preferences for sharing of files"
 msgstr "Prilagodbe za dijeljenje datoteka"
 
-#: ../data/mate-user-share.desktop.in.in.h:2
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr "Osobno dijeljenje datoteka obexftp"
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Pokreni osobno dijeljenje datoteka ako je omogućeno"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "Pokreni prilagodbe"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr "Osobno dijeljenje datoteka obexpush"
 
-#: ../src/caja-share-bar.c:187
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr "Osobno dijeljenje datoteka webdav"
+
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr "Prilagodbe"
+
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Pokreni prilagodbe osobnog dijeljenja datoteka"
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "Nije moguće pokrenuti prilagodbe osobnog dijeljenja datoteka"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "Možeš dijeliti datoteke iz ove mape i primati ih u nju"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr "Može se koristiti za dijeljenje ili primanje datoteka"
+
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr "Može se dijeliti putem mreže ili bluetootha"
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "Možeš dijeliti datoteke iz ove mape preko mreže i bluetootha"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr "Može se dijeliti putem mreže"
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "Možeš primati datoteke preko bluetootha u ovu mapu"
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr "Može se koristiti za primanje datoteka putem bluetootha"
 
-#: ../src/file-share-properties.c:436
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "Nema osnove"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
-msgstr "Nije bilo moguće prikazati sadržaj pomoći."
+msgstr "Nije moguće prikazati sadržaj pomoći."
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
-msgstr "Nije bilo moguće stvoriti sučelje."
+msgstr "Nije moguće stvoriti sučelje."
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "Nikada"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
-msgstr "Kada zapisivati datoteke"
+msgstr "Kada se zapisuju datoteke"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "Uvijek"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "Samo za postavljanje uređaja"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "Pitaj"
 
@@ -217,36 +181,36 @@ msgstr "Pitaj"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "Javne datoteke od %s"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "Javne datoteke od %s na %s"
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "Dovršen prijam \"%s\" putem bluetootha"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "Datoteka je primljena"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "Otvori datoteku"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "Otkrij datoteku"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "Primanje datoteke dovršeno"
diff --git a/po/hu.po b/po/hu.po
index 9eca2ab..d359dbe 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,223 +1,170 @@
-# Hungarian translation of mateuser-share
-# This file is distributed under the same license as the mateuser-share package.
-# Copyright (C) 2005, 2008, 2009, 2010, Free Software Foundation, Inc.
-#
-# Szabolcs Varga <shirokuma at shirokuma dot hu>, 2005.
-# Gabor Kelemen <kelemeng at matedot hu>, 2005, 2006, 2008, 2009, 2010.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Gabor Kelemen <kelemeng at matedot hu>, 2005-2006,2008-2010
+# kami911 <[email protected]>, 2015
+# Rezső Páder <[email protected]>, 2015
+# Szabolcs Varga <shirokuma at shirokuma dot hu>, 2005
 msgid ""
 msgstr ""
-"Project-Id-Version: mateuser-share master\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-05 21:40+0100\n"
-"PO-Revision-Date: 2010-03-05 19:26+0100\n"
-"Last-Translator: Gabor Kelemen <kelemeng at matedot hu>\n"
-"Language-Team: Hungarian <mateat fsf dot hu>\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: kami911 <[email protected]>\n"
+"Language-Team: Hungarian (http://www.transifex.com/mate/MATE/language/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:1
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr ""
-"Ha ez az érték igaz, akkor Bluetooth eszközök fájlokat küldhetnek a "
-"felhasználó Letöltések könyvtárába, ha a felhasználó bejelentkezett."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr ""
-"Ha ez az érték igaz, akkor a felhasználó saját könyvtárában a Nyilvános "
-"könyvtár Bluetooth-on keresztül megosztásra kerül, ha a felhasználó "
-"bejelentkezett."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:3
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr ""
-"Ha ez az érték igaz, akkor a felhasználók saját könyvtárában a Nyilvános "
-"könyvtár a hálózaton megosztásra kerül, ha a felhasználó bejelentkezett."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:4
-msgid "Share Public directory over Bluetooth"
-msgstr "A Nyilvános könyvtár megosztása Bluetooth-on"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:5
-msgid "Share Public directory over the network"
-msgstr "A Nyilvános mappa megosztása a hálózaton"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:6
-msgid "When to accept files sent over Bluetooth"
-msgstr "A Bluetooth-on küldött fájlok elfogadása"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:7
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr ""
-"A Bluetooth-on küldött fájlok elfogadása. A lehetséges értékek: "
-"„always” (mindig) „bonded” (párosítva) és „ask” (kérdezzen)."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:8
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr ""
-"Mikor történjen a jelszavak bekérése. A lehetséges értékek: „never” (soha), "
-"„on_write” (íráskor) és „always” (mindig)."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:9
-msgid "When to require passwords"
-msgstr "Mikor történjen a jelszavak bekérése"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "A Bluetooth kliensek küldhetnek-e fájlokat az ObexPush használatával."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:11
-msgid "Whether Bluetooth clients need to pair with the computer to send files."
-msgstr ""
-"A Bluetooth klienseket kell-e párosítani a számítógéppel a fájlok küldéséhez."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:12
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr ""
-"A Bluetooth klienseknek engedélyezett-e a fájlok írása, vagy a fájlok "
-"írásvédetten osztandók meg."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:13
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "A Bluetooth klienseknek engedélyezett-e a fájlok írása."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "Küldendő-e értesítés az újonnan fogadott fájlokról."
+"Language: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/file-share-properties.ui.h:1
-msgid "<b>Receive Files over Bluetooth</b>"
-msgstr "<b>Fájlok fogadása Bluetooth-on</b>"
+msgid "Personal File Sharing Preferences"
+msgstr "Személyes fájlmegosztás beállításai"
 
 #: ../data/file-share-properties.ui.h:2
-msgid "<b>Share Files over Bluetooth</b>"
-msgstr "<b>Fájlok megosztása Bluetooth-on</b>"
-
-#: ../data/file-share-properties.ui.h:3
 msgid "<b>Share Files over the Network</b>"
 msgstr "<b>Fájlok megosztása a hálózaton</b>"
 
+#: ../data/file-share-properties.ui.h:3
+msgid "_Share public files on network"
+msgstr "Nyilvános fájlok megosztása a _hálózaton"
+
 #: ../data/file-share-properties.ui.h:4
-msgid "Allo_w remote devices to delete files"
-msgstr "Fájlok _törlésének engedélyezése távoli eszközöknek"
+msgid "_Password:"
+msgstr "_Jelszó:"
 
 #: ../data/file-share-properties.ui.h:5
-msgid "Personal File Sharing Preferences"
-msgstr "Személyes fájlmegosztás beállításai"
+msgid "_Require password:"
+msgstr "Jelszó _kötelező:"
 
 #: ../data/file-share-properties.ui.h:6
-msgid "Receive files in _Downloads folder over Bluetooth"
-msgstr "Fájlok fogadása a _Letöltések mappába Bluetooth-on"
+msgid "<b>Share Files over Bluetooth</b>"
+msgstr "<b>Fájlok megosztása Bluetooth-on</b>"
 
 #: ../data/file-share-properties.ui.h:7
-msgid "Require re_mote devices to bond with this computer"
-msgstr "Távoli _eszközök a számítógéppel való párosításának megkövetelése"
-
-#: ../data/file-share-properties.ui.h:8
 msgid "Share public files over _Bluetooth"
 msgstr "_Nyilvános fájlok megosztása Bluetooth-on"
 
+#: ../data/file-share-properties.ui.h:8
+msgid "Allo_w remote devices to delete files"
+msgstr "Fájlok _törlésének engedélyezése távoli eszközöknek"
+
 #: ../data/file-share-properties.ui.h:9
-msgid "_Accept files: "
-msgstr "_Fájlok elfogadása: "
+msgid "Require re_mote devices to bond with this computer"
+msgstr "Távoli _eszközök a számítógéppel való párosításának megkövetelése"
 
 #: ../data/file-share-properties.ui.h:10
-msgid "_Notify about received files"
-msgstr "Értesítés f_ogadott fájlokról"
+msgid "<b>Receive Files over Bluetooth</b>"
+msgstr "<b>Fájlok fogadása Bluetooth-on</b>"
 
 #: ../data/file-share-properties.ui.h:11
-msgid "_Password:"
-msgstr "_Jelszó:"
+msgid "Receive files in _Downloads folder over Bluetooth"
+msgstr "Fájlok fogadása a _Letöltések mappába Bluetooth-on"
 
 #: ../data/file-share-properties.ui.h:12
-msgid "_Require password:"
-msgstr "Jelszó _kötelező:"
+msgid "_Accept files: "
+msgstr "_Fájlok elfogadása: "
 
 #: ../data/file-share-properties.ui.h:13
-msgid "_Share public files on network"
-msgstr "Nyilvános fájlok megosztása a _hálózaton"
+msgid "_Notify about received files"
+msgstr "Értesítés f_ogadott fájlokról"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr "Felhasználói megosztás"
 
-#: ../data/mateuser-share-properties.desktop.in.h:1
-#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr "Beépül a elhasználói megosztásba"
+
+#: ../data/mate-user-share-properties.desktop.in.h:1
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "Személyes fájlmegosztás"
 
-#: ../data/mateuser-share-properties.desktop.in.h:2
+#: ../data/mate-user-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Fájlmegosztás beállításai"
 
-#: ../data/mateuser-share.desktop.in.in.h:1
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr "Személyes fájlmegosztás (obexftp)"
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Személyes fájlmegosztás indítása, ha engedélyezett"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "Beállítások indítása"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr "Személyes fájlmegosztás (obexpush)"
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr "Személyes fájlmegosztás (webdav)"
 
-#: ../src/caja-share-bar.c:187
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr "Beállítások"
+
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Személyes fájlmegosztás beállításainak indítása"
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "A Személyes fájlmegosztás beállításai nem indítható"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "Megoszthatja a mappa fájljait, és fájlokat fogadhat bele"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr "Fájlok megosztására vagy fogadására használható"
+
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr "Megosztható a hálózaton vagy Bluetooth-on"
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "Megoszthatja a mappa fájljait a hálózaton és Bluetooth-on"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr "Megosztható a hálózaton"
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "Fájlokat fogadhat a mappába Bluetooth-on keresztül"
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr "Fájlok fogadására használható Bluetooth-on"
 
-#: ../src/file-share-properties.c:436
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "Nincs ok"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "Nem lehet megjeleníteni a súgótartalmat."
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "A felület nem építhető fel."
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "Soha"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "Fájlok írásakor"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "Mindig"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "Csak párosított eszközöknek"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "Kérdezzen"
 
@@ -230,36 +177,36 @@ msgstr "Kérdezzen"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "%s nyilvános fájljai"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "%s nyilvános fájljai ezen: %s"
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "„%s” érkezett Bluetooth-on"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "Fájl érkezett"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "Fájl megnyitása"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "Fájl felfedése"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "Fájlfogadás kész"
diff --git a/po/hy.po b/po/hy.po
index 33c9f5e..ebfcb2e 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-11-06 15:07+0300\n"
-"PO-Revision-Date: 2016-01-18 14:01+0000\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
 "Last-Translator: Siranush <[email protected]>\n"
 "Language-Team: Armenian (http://www.transifex.com/mate/MATE/language/hy/)\n"
 "MIME-Version: 1.0\n"
diff --git a/po/id.po b/po/id.po
index 6729d91..97d7e5b 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1,198 +1,169 @@
-# Indonesian translation for mateuser-share.
-# Copyright (C) 2010 mateuser-share's COPYRIGHT HOLDER
-# This file is distributed under the same license as the mateuser-share package.
-# Ekasari <[email protected]>, 2010.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Ekasari <[email protected]>, 2010
+# hpiece 8 <[email protected]>, 2016
+# Willy Sudiarto Raharjo <[email protected]>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: mateuser-share master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.mateorg/enter_bug.cgi?product=mateuser-share&component=general\n"
-"POT-Creation-Date: 2010-04-21 21:17+0000\n"
-"PO-Revision-Date: 2010-04-23 15:44+0700\n"
-"Last-Translator: Andika Triwidada <[email protected]>\n"
-"Language-Team: GNOME Indonesian Translation Team <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: Willy Sudiarto Raharjo <[email protected]>\n"
+"Language-Team: Indonesian (http://www.transifex.com/mate/MATE/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Indonesian\n"
-"X-Poedit-Country: Indonesia\n"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:1
-msgid "If this is true, Bluetooth devices can send files to the user's Downloads directory when logged in."
-msgstr "Jika ini benar, perangkat Bluetooth dapat mengirim berkas-berkas ke direktori Downloads pengguna ketika login."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:2
-msgid "If this is true, the Public directory in the users home directory will be shared over Bluetooth when the user is logged in."
-msgstr "Jika ini benar, direktori Publik pada direktori home pengguna akan dibagi melalui Bluetooth bila pengguna tersebut login."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:3
-msgid "If this is true, the Public directory in the users home directory will be shared over the network when the user is logged in."
-msgstr "Jika ini benar, direktori Publik pada direktori home pengguna akan berbagi melalui jaringan ketika pengguna login."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:4
-msgid "Share Public directory over Bluetooth"
-msgstr "Berbagi direktori Publik melalui Bluetooth"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:5
-msgid "Share Public directory over the network"
-msgstr "Berbagi direktori Publik melalui jaringan"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:6
-msgid "When to accept files sent over Bluetooth"
-msgstr "Kapan menerima berkas yang dikirim melalui Bluetooth"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:7
-msgid "When to accept files sent over Bluetooth. Possible values are \"always\", \"bonded\" and \"ask\"."
-msgstr "Kapan menerima berkas yang dikirim melalui Bluetooth. nilai-nilai yang mungkin adalah \"never\" (selalu), \"bonded\" (terikat) dan \"ask\" (bertanya)."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:8
-msgid "When to ask for passwords. Possible values are \"never\", \"on_write\", and \"always\"."
-msgstr "Kapan meminta kata kunci. nilai-nilai yang mungkin adalah \"never\" (tidak pernah), \"on_write\" (saat menulis), dan \"always\" (selalu)."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:9
-msgid "When to require passwords"
-msgstr "Kapan meminta kata kunci"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "Apakah klien Bluetooth dapat mengirim berkas-berkas menggunakan ObexPush."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:11
-msgid "Whether Bluetooth clients need to pair with the computer to send files."
-msgstr "Apakah klien Bluetooth perlu dipasangkan dengan komputer untuk mengirimkan berkas-berkas."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:12
-msgid "Whether to allow Bluetooth clients to write files, or share the files read-only."
-msgstr "Apakah memperbolehkan klien Bluetooth untuk menulis berkas, atau berbagi berkas hanya untuk baca."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:13
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "Apakah memungkinkan klien Bluetooth untuk menulis berkas."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "Apakah akan memberitahu tentang berkas yang baru diterima."
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/file-share-properties.ui.h:1
-msgid "<b>Receive Files over Bluetooth</b>"
-msgstr "<b>Menerima Berkas melalui Bluetooth</b>"
+msgid "Personal File Sharing Preferences"
+msgstr "Preferensi Berbagi Berkas Personal"
 
 #: ../data/file-share-properties.ui.h:2
-msgid "<b>Share Files over Bluetooth</b>"
-msgstr "<b>Berbagi Berkas melalui Bluetooth</b>"
-
-#: ../data/file-share-properties.ui.h:3
 msgid "<b>Share Files over the Network</b>"
 msgstr "<b>Berbagi Berkas melalui Jaringan</b>"
 
+#: ../data/file-share-properties.ui.h:3
+msgid "_Share public files on network"
+msgstr "_Berbagi berkas publik pada jaringan "
+
 #: ../data/file-share-properties.ui.h:4
-msgid "Allo_w remote devices to delete files"
-msgstr "M_engijinkan perangkat remote untuk menghapus berkas"
+msgid "_Password:"
+msgstr "_Kata sandi:"
 
 #: ../data/file-share-properties.ui.h:5
-msgid "Personal File Sharing Preferences"
-msgstr "Preferensi Berbagi Berkas Personal"
+msgid "_Require password:"
+msgstr "_Memerlukan kata sandi:"
 
 #: ../data/file-share-properties.ui.h:6
-msgid "Receive files in _Downloads folder over Bluetooth"
-msgstr "Menerima berkas dalam folder _Downloads melalui Bluetooth"
+msgid "<b>Share Files over Bluetooth</b>"
+msgstr "<b>Berbagi Berkas melalui Bluetooth</b>"
 
 #: ../data/file-share-properties.ui.h:7
-msgid "Require re_mote devices to bond with this computer"
-msgstr "Perlu perangkat re_mote untuk ikatan dengan komputer ini"
-
-#: ../data/file-share-properties.ui.h:8
 msgid "Share public files over _Bluetooth"
 msgstr "Berbagi berkas publik melalui _Bluetooth"
 
+#: ../data/file-share-properties.ui.h:8
+msgid "Allo_w remote devices to delete files"
+msgstr "M_engijinkan perangkat remote untuk menghapus berkas"
+
 #: ../data/file-share-properties.ui.h:9
-msgid "_Accept files: "
-msgstr "Terim_a berkas:"
+msgid "Require re_mote devices to bond with this computer"
+msgstr "Perlu perangkat re_mote untuk ikatan dengan komputer ini"
 
 #: ../data/file-share-properties.ui.h:10
-msgid "_Notify about received files"
-msgstr "Memberitahuka_n tentang berkas yang diterima"
+msgid "<b>Receive Files over Bluetooth</b>"
+msgstr "<b>Menerima Berkas melalui Bluetooth</b>"
 
 #: ../data/file-share-properties.ui.h:11
-msgid "_Password:"
-msgstr "_Kata sandi:"
+msgid "Receive files in _Downloads folder over Bluetooth"
+msgstr "Menerima berkas dalam folder _Downloads melalui Bluetooth"
 
 #: ../data/file-share-properties.ui.h:12
-msgid "_Require password:"
-msgstr "_Memerlukan kata sandi:"
+msgid "_Accept files: "
+msgstr "Terim_a berkas:"
 
 #: ../data/file-share-properties.ui.h:13
-msgid "_Share public files on network"
-msgstr "_Berbagi berkas publik pada jaringan "
+msgid "_Notify about received files"
+msgstr "Memberitahuka_n tentang berkas yang diterima"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr "Share Pengguna"
 
-#: ../data/mateuser-share-properties.desktop.in.h:1
-#: ../data/mateuser-share.desktop.in.in.h:2
-#: ../src/caja-share-bar.c:162
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr "Integrasikan dengan user-share"
+
+#: ../data/mate-user-share-properties.desktop.in.h:1
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "Berbagi Berkas Pribadi"
 
-#: ../data/mateuser-share-properties.desktop.in.h:2
+#: ../data/mate-user-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Preferensi untuk berbagi berkas"
 
-#: ../data/mateuser-share.desktop.in.in.h:1
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr "Share Berkas Pribadi obexftp"
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Luncurkan Berbagi Berkas Pribadi  jika diaktifkan "
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "Preferensi Peluncuran"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr "Share Berkas Pribadi obexpush"
 
-#: ../src/caja-share-bar.c:187
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr "Share Berkas Pribadi webdav"
+
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr "Preferensi"
+
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Luncurkan Preferensi Berbagi Berkas Pribadi"
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "Tidak dapat meluncurkan preferensi Berbagi Berkas Pribadi"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "Anda dapat berbagi dan menerima berkas dari folder ini"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr "Boleh digunakan untuk berbagi atau menerima berkas"
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "Anda dapat berbagi berkas dari folder ini melalui jaringan dan Bluetooth"
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr "Boleh dibagikan melalui jaringan atau Bluetooth"
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "Anda dapat menerima berkas melalui Bluetooth ke dalam folder ini"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr "Boleh dibagikan melalui jaringan"
 
-#: ../src/file-share-properties.c:436
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr "Boleh digunakan untuk menerima berkas melalui Bluetooth"
+
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "Tidak ada alasan"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "Tidak dapat menampilkan isi bantuan."
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "Tidak dapat membangun antarmuka."
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "Tak pernah"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "Saat penulisan berkas"
 
-#: ../src/file-share-properties.c:572
-#: ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "Selalu"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "Hanya untuk perangkat yang telah ditata"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "Bertanya"
 
@@ -205,37 +176,36 @@ msgstr "Bertanya"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "Berkas publik milik %s  "
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "Berkas publik milik %s pada %s"
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "Anda menerima \"%s\" melalui Bluetooth"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "Anda menerima sebuah berkas"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "Buka Berkas"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "Perlihatkan Berkas"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "Penerimaan berkas lengkap"
-
diff --git a/po/is.po b/po/is.po
index 69d32fa..83f9ff3 100644
--- a/po/is.po
+++ b/po/is.po
@@ -8,84 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-26 22:51+0200\n"
-"PO-Revision-Date: 2014-02-16 06:52+0000\n"
-"Last-Translator: Sveinn í Felli <[email protected]>\n"
-"Language-Team: Icelandic (http://www.transifex.com/projects/p/MATE/language/is/)\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: monsta <[email protected]>\n"
+"Language-Team: Icelandic (http://www.transifex.com/mate/MATE/language/is/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: is\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:1
-msgid "Share Public directory over the network"
-msgstr ""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr ""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:3
-msgid "When to require passwords"
-msgstr ""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:4
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr ""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:5
-msgid "Share Public directory over Bluetooth"
-msgstr ""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:6
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr ""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:7
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr ""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:8
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr ""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:9
-msgid ""
-"Whether Bluetooth clients need to pair with the computer to send files."
-msgstr ""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr ""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:11
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr ""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:12
-msgid "When to accept files sent over Bluetooth"
-msgstr ""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:13
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr ""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr ""
+"Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
 
 #: ../data/file-share-properties.ui.h:1
 msgid "Personal File Sharing Preferences"
@@ -139,8 +70,16 @@ msgstr ""
 msgid "_Notify about received files"
 msgstr ""
 
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
+
 #: ../data/mate-user-share-properties.desktop.in.h:1
-#: ../data/mate-user-share.desktop.in.in.h:1 ../src/caja-share-bar.c:162
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr ""
 
@@ -148,63 +87,81 @@ msgstr ""
 msgid "Preferences for sharing of files"
 msgstr ""
 
-#: ../data/mate-user-share.desktop.in.in.h:2
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr ""
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
 msgstr ""
 
-#: ../src/caja-share-bar.c:187
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr ""
+
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr "Stillingar"
+
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr ""
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr ""
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr ""
+
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
 msgstr ""
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
 msgstr ""
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
 msgstr ""
 
-#: ../src/file-share-properties.c:436
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "Engin ástæða"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "Gat ekki birt hjálparskjöl."
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "Gat ekki hlaðið inn viðmóti"
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "Aldrei"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "Þegar skrár eru skrifaðar"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "Ávallt"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr ""
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "Spyrja"
 
@@ -217,36 +174,36 @@ msgstr "Spyrja"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr ""
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr ""
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr ""
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr ""
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "Opna skrá"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr ""
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index 77b00bd..16af8ac 100644
--- a/po/it.po
+++ b/po/it.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-11-06 15:07+0300\n"
-"PO-Revision-Date: 2016-01-25 18:11+0000\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
 "Last-Translator: Marco Bartolucci <[email protected]>\n"
 "Language-Team: Italian (http://www.transifex.com/mate/MATE/language/it/)\n"
 "MIME-Version: 1.0\n"
diff --git a/po/ja.po b/po/ja.po
index 77b1e9b..b0583b7 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,224 +1,169 @@
-# mateuser-share ja.po.
-# Copyright (C) 2005,2007-2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the mateuser-share package.
-# Takeshi AIHANA <[email protected]>, 2005,2007-2009.
-# Hideki Yamane (Debian-JP) <[email protected]>, 2009.
-# Takayuki KUSANO <[email protected]>, 2010.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# ABE Tsunehiko, 2016
+# Hideki Yamane <[email protected]>, 2009
+# Takayuki KUSANO <[email protected]>, 2010
 msgid ""
 msgstr ""
-"Project-Id-Version: mateuser-share master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.mateorg/enter_bug.cgi?product=mate"
-"user-share&component=general\n"
-"POT-Creation-Date: 2010-09-07 18:34+0000\n"
-"PO-Revision-Date: 2010-09-17 13:18+0900\n"
-"Last-Translator: Takayuki KUSANO <[email protected]>\n"
-"Language-Team: Japanese <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: ABE Tsunehiko\n"
+"Language-Team: Japanese (http://www.transifex.com/mate/MATE/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:1
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr ""
-"TRUE にすると、ユーザがログインした後に Bluetooth デバイスがユーザのダウン"
-"ロード・フォルダにファイルを送信できるようになります。"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr ""
-"TRUE にすると、ユーザがログインした後にユーザのホーム・フォルダにある Public "
-"フォルダが Bluetooth のデバイスによって共有されるようになります。"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:3
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr ""
-"TRUE にすると、ユーザがログインした後にユーザのホーム・フォルダにある Public "
-"フォルダがネットワークのデバイスによって共有されるようになります。"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:4
-msgid "Share Public directory over Bluetooth"
-msgstr "Public フォルダを Bluetooth デバイス上で共有するかどうか"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:5
-msgid "Share Public directory over the network"
-msgstr "Public フォルダをネットワーク上で共有するかどうか"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:6
-msgid "When to accept files sent over Bluetooth"
-msgstr "Bluetooth でファイルを送信できる時期"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:7
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr ""
-"いつ Bluetooth 経由で送信されたファイルの受信を許可するか。設定可能な値: "
-"\"always\"、\"bonded\"、\"ask\"。"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:8
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr ""
-"いつパスワードを問い合わせるか。設定可能な値: \"never\"、\"on_write\"、"
-"\"always\"。"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:9
-msgid "When to require passwords"
-msgstr "パスワードを要求する時期"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr ""
-"Bluetooth のクライアントが ObexPush を使ってファイルを送信できるかどうか"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:11
-msgid "Whether Bluetooth clients need to pair with the computer to send files."
-msgstr ""
-"Bluetooth のクライアントがファイルを送信するためにコンピュータとペアになるべ"
-"きかどうか"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:12
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr ""
-"Bluetooth のクライアントでファイルを書き込んだり、読み込み専用のファイルを共"
-"有できるようにするかどうかです。"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:13
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "Bluetooth のクライアントがファイルを作成できるかどうか"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "新たに受信したファイルについて通知するかどうか"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/file-share-properties.ui.h:1
-msgid "<b>Receive Files over Bluetooth</b>"
-msgstr "<b>Bluetooth を使ったファイルの受信</b>"
+msgid "Personal File Sharing Preferences"
+msgstr "個人的なファイルの共有の設定"
 
 #: ../data/file-share-properties.ui.h:2
-msgid "<b>Share Files over Bluetooth</b>"
-msgstr "<b>Bluetooth 越しのファイル共有</b>"
-
-#: ../data/file-share-properties.ui.h:3
 msgid "<b>Share Files over the Network</b>"
 msgstr "<b>ネットワーク越しのファイル共有</b>"
 
+#: ../data/file-share-properties.ui.h:3
+msgid "_Share public files on network"
+msgstr "ネットワーク越しにファイルを共有する(_S)"
+
 #: ../data/file-share-properties.ui.h:4
-msgid "Allo_w remote devices to delete files"
-msgstr "リモートのデバイスからファイルを削除できるようにする(_W)"
+msgid "_Password:"
+msgstr "パスワード(_P):"
 
 #: ../data/file-share-properties.ui.h:5
-msgid "Personal File Sharing Preferences"
-msgstr "個人のファイルを共有の設定"
+msgid "_Require password:"
+msgstr "パスワード要求の時期(_R):"
 
 #: ../data/file-share-properties.ui.h:6
-msgid "Receive files in _Downloads folder over Bluetooth"
-msgstr "Bluetooth 越しに受信したファイルをダウンロード・フォルダに格納する(_D)"
+msgid "<b>Share Files over Bluetooth</b>"
+msgstr "<b>Bluetooth 越しのファイル共有</b>"
 
 #: ../data/file-share-properties.ui.h:7
-msgid "Require re_mote devices to bond with this computer"
-msgstr "リモートのデバイスとこのコンピュータをペアにする(_M)"
-
-#: ../data/file-share-properties.ui.h:8
 msgid "Share public files over _Bluetooth"
 msgstr "Bluetooth 越しにファイルを共有する(_B)"
 
+#: ../data/file-share-properties.ui.h:8
+msgid "Allo_w remote devices to delete files"
+msgstr "リモートのデバイスからファイルを削除できるようにする(_W)"
+
 #: ../data/file-share-properties.ui.h:9
-msgid "_Accept files: "
-msgstr "許可するファイル(_A): "
+msgid "Require re_mote devices to bond with this computer"
+msgstr "リモートのデバイスとこのコンピュータをペアにする(_M)"
 
 #: ../data/file-share-properties.ui.h:10
-msgid "_Notify about received files"
-msgstr "ファイルを受信したら通知する(_N)"
+msgid "<b>Receive Files over Bluetooth</b>"
+msgstr "<b>Bluetooth を使ったファイルの受信</b>"
 
 #: ../data/file-share-properties.ui.h:11
-msgid "_Password:"
-msgstr "パスワード(_P):"
+msgid "Receive files in _Downloads folder over Bluetooth"
+msgstr "Bluetooth 越しに受信したファイルをダウンロードフォルダに格納する(_D)"
 
 #: ../data/file-share-properties.ui.h:12
-msgid "_Require password:"
-msgstr "パスワード要求の時期(_R):"
+msgid "_Accept files: "
+msgstr "許可するファイル(_A): "
 
 #: ../data/file-share-properties.ui.h:13
-msgid "_Share public files on network"
-msgstr "ネットワーク越しにファイルを共有する(_S)"
+msgid "_Notify about received files"
+msgstr "ファイルを受信したら通知する(_N)"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
 
-#: ../data/mateuser-share-properties.desktop.in.h:1
-#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
+
+#: ../data/mate-user-share-properties.desktop.in.h:1
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "個人的なファイルの共有"
 
-#: ../data/mateuser-share-properties.desktop.in.h:2
+#: ../data/mate-user-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "個人的なファイルの共有機能を設定します"
 
-#: ../data/mateuser-share.desktop.in.in.h:1
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr "obexftp によるファイルの共有"
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "個人的なファイルの共有機能を起動します (可能な場合)"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "設定を開く"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr "obexpush によるファイルの共有"
 
-#: ../src/caja-share-bar.c:187
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr "webdav によるファイルの共有"
+
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr "設定"
+
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
-msgstr "個人的なファイルの共有を開く"
+msgstr "個人的なファイルの共有の設定を開く"
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
-msgstr "個人的なファイルの共有設定を起動できません"
+msgstr "個人的なファイルの共有の設定を起動できません"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "このフォルダのファイル共有とフォルダへのファイルの受信ができます"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr ""
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "ネットワークと Bluetooth 経由でこのフォルダのファイルを共有できます"
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr ""
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "このフォルダに Bluetooth 経由でファイルを受信できます"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr ""
 
-#: ../src/file-share-properties.c:436
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr ""
+
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "原因不明"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "ヘルプを表示できませんでした"
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "インタフェースを構築できませんでした"
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "確認しない"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "ファイル書き込み時"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "常に"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "設定したデバイスのみ"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "問い合わせる"
 
@@ -231,39 +176,36 @@ msgstr "問い合わせる"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "%s の公開ファイル"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
-msgstr "%s@%s の公開ファイル"
+msgstr "%s (%s 上) の公開ファイル"
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "Bluetooh 経由で \"%s\" を受信しました"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "ファイルを受信しました"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "ファイルを開く"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "ファイルを表示する"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "ファイルの受信が完了しました"
-
-#~ msgid "Please log in as the user guest"
-#~ msgstr "ゲストユーザでログインしてください"
diff --git a/po/kk.po b/po/kk.po
index cb0970d..ef412f4 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -8,85 +8,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-26 22:51+0200\n"
-"PO-Revision-Date: 2014-10-31 06:15+0000\n"
-"Last-Translator: Baurzhan Muftakhidinov <[email protected]>\n"
-"Language-Team: Kazakh (http://www.transifex.com/projects/p/MATE/language/kk/)\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: monsta <[email protected]>\n"
+"Language-Team: Kazakh (http://www.transifex.com/mate/MATE/language/kk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: kk\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/desktop_mate_file_sharing.schemas.in.h:1
-msgid "Share Public directory over the network"
-msgstr ""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr ""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:3
-msgid "When to require passwords"
-msgstr "Парольдерді қашан талап ету керек"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:4
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr "Парольдерді қашан талап ету керек. Мүмкін мәндері \"never\", \"on_write\", және \"always\"."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:5
-msgid "Share Public directory over Bluetooth"
-msgstr ""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:6
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr ""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:7
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr ""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:8
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr ""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:9
-msgid ""
-"Whether Bluetooth clients need to pair with the computer to send files."
-msgstr ""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "Bluetooth клиенттері ObexPush арқылы файлдарды жібере ала ма."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:11
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr "Ақиқат болса, Bluetooth құрылғылары пайдаланушы жүйеге кіріп тұрған кезде файлдарды оның Жүктемелер бумасына жібере алады."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:12
-msgid "When to accept files sent over Bluetooth"
-msgstr "Bluetooth арқылы файлдарды қашан қабылдау керек"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:13
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr "Bluetooth арқылы файлдарды қашан қабылдау керек. Мүмкін мәндері \"always\", \"bonded\" және \"ask\"."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "Жаңа қабылданған файлдар жөнінде хабарлау керек пе."
-
 #: ../data/file-share-properties.ui.h:1
 msgid "Personal File Sharing Preferences"
 msgstr ""
@@ -139,8 +70,16 @@ msgstr ""
 msgid "_Notify about received files"
 msgstr ""
 
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
+
 #: ../data/mate-user-share-properties.desktop.in.h:1
-#: ../data/mate-user-share.desktop.in.in.h:1 ../src/caja-share-bar.c:162
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "Жеке файлдармен бөлісу"
 
@@ -148,63 +87,81 @@ msgstr "Жеке файлдармен бөлісу"
 msgid "Preferences for sharing of files"
 msgstr ""
 
-#: ../data/mate-user-share.desktop.in.in.h:2
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Іске қосулы болса, жеке файлдармен бөлісуді жөнелту"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr ""
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr ""
+
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
 msgstr ""
 
-#: ../src/caja-share-bar.c:187
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr ""
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr ""
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr ""
+
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
 msgstr ""
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
 msgstr ""
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
 msgstr ""
 
-#: ../src/file-share-properties.c:436
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr ""
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr ""
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr ""
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "Ешқашан"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr ""
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "Әрқашан"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr ""
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr ""
 
@@ -217,36 +174,36 @@ msgstr ""
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "%s-ң жеке файлдары"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "%s-ң жеке файлдары, %s жерінде"
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "Сізге Bluetooth арқылы \"%s\" қабылдадыңыз"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "Сіз файлды қабылдадыңыз"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "Файлды ашу"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "Файлды анықтау"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "Файлдарды қабылдау аяқталды"
diff --git a/po/kn.po b/po/kn.po
index 801a4a0..26a50d5 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -1,222 +1,167 @@
-# translation of mateuser-share.master.kn.po to Kannada
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
-# Shankar Prasad <[email protected]>, 2009, 2010.
+# 
+# Translators:
+# shankar <[email protected]>, 2009, 2010
 msgid ""
 msgstr ""
-"Project-Id-Version: mateuser-share.master.kn\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-21 14:22+0530\n"
-"PO-Revision-Date: 2010-04-21 14:24+0530\n"
-"Last-Translator: Shankar Prasad <[email protected]>\n"
-"Language-Team: kn-IN <>\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: monsta <[email protected]>\n"
+"Language-Team: Kannada (http://www.transifex.com/mate/MATE/language/kn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:1
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr ""
-"true ಆದಲ್ಲಿ, ಬಳಕೆದಾರರು ಪ್ರವೇಶಿಸಿದಾಗ ಬ್ಲೂಟೂತ್ ಸಾಧನಗಳು ಕಡತಗಳನ್ನು ಅವರ ಡೌನ್‌ಲೋಡ್‌ ಕೋಶಕ್ಕೆ "
-"ಕಳುಹಿಸುತ್ತದೆ."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr ""
-"ಇದು true ಆದಲ್ಲಿ, ಬಳಕೆದಾರರು ಒಳಗೆ ಪ್ರವೇಶಿಸಿದಾಗ ಬಳಕೆದಾರರ ನೆಲೆ ಕಡತಕೋಶದಲ್ಲಿನ "
-"ಸಾರ್ವಜನಿಕ ಕೋಶವನ್ನು ಬ್ಲೂಟೂತ್ ಮೂಲಕ ಹಂಚಲ್ಪಡುತ್ತದೆ."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:3
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr ""
-"ಇದು true ಆದಲ್ಲಿ, ಬಳಕೆದಾರರು ಒಳಗೆ ಪ್ರವೇಶಿಸಿದಾಗ ಬಳಕೆದಾರರ ನೆಲೆ ಕಡತಕೋಶದಲ್ಲಿನ "
-"ಸಾರ್ವಜನಿಕ ಕೋಶವನ್ನು ಜಾಲಬಂಧದ ಮೂಲಕ ಹಂಚಲ್ಪಡುತ್ತದೆ."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:4
-msgid "Share Public directory over Bluetooth"
-msgstr "ಬ್ಲೂಟೂತ್ ಮೂಲಕ ಸಾರ್ವಜನಿಕ ಕೋಶವನ್ನು ಹಂಚಿಕೊಳ್ಳಿ"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:5
-msgid "Share Public directory over the network"
-msgstr "ಜಾಲಬಂಧದ ಮೂಲಕ ಸಾರ್ವಜನಿಕ ಕೋಶವನ್ನು ಹಂಚಿಕೊಳ್ಳಿ"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:6
-msgid "When to accept files sent over Bluetooth"
-msgstr "ಬ್ಲೂಟೂತ್‌ನಲ್ಲಿ ಕಳುಹಿಸಲಾದ ಕಡತಗಳನ್ನು ಯಾವಾಗ ಅಂಗೀಕರಿಸಬೇಕು"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:7
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr ""
-"ಬ್ಲೂಟೂತ್‌ನಲ್ಲಿ ಕಳುಹಿಸಲಾದ ಕಡತಗಳನ್ನು ಯಾವಾಗ ಅಂಗೀಕರಿಸಬೇಕು. ಸಾಧ್ಯವಿರುವ ಮೌಲ್ಯಗಳೆಂದರೆ "
-"\"always\", \"bonded\", ಹಾಗು \"ask\"."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:8
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr ""
-"ಯಾವಾಗ ಗುಪ್ತಪದಗಳಿಗಾಗಿ ಕೇಳಬೇಕು. ಸಾಧ್ಯವಿರುವ ಮೌಲ್ಯಗಳೆಂದರೆ \"never\", \"on_write\", "
-"ಹಾಗು \"always\"."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:9
-msgid "When to require passwords"
-msgstr "ಗುಪ್ತಪದಗಳ ಅಗತ್ಯವಿದ್ದಾಗ"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "ಬ್ಲೂಟೂತ್ ಕ್ಲೈಂಟ್‌ಗಳು ObexPush ಅನ್ನು ಬಳಸಿಕೊಂಡು ಕಡತಗಳನ್ನು ಕಳುಹಿಸಬಹುದೆ."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:11
-msgid "Whether Bluetooth clients need to pair with the computer to send files."
-msgstr "ಕಡತಗಳನ್ನು ಕಳುಹಿಸಲು ಬ್ಲೂಟೂತ್ ಕ್ಲೈಂಟ್‌ಗಳು ಗಣಕದೊಂದಿಗೆ ಜೋಡಿ ಮಾಡಲ್ಪಡಬೇಕೆ."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:12
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr ""
-"ಬ್ಲೂಟೂತ್ ಕ್ಲೈಂಟ್‌ಗಳು ಕಡತಗಳಿಗೆ ಬರೆಯುವುದನ್ನು ಅನುಮತಿಸಬೇಕೆ ಅಥವ ಕೇವಲ ಓದಲು ಮಾತ್ರವಾದ "
-"ಸ್ಥಿತಿಯಲ್ಲಿ ಹಂಚಿಕೊಳ್ಳಬೇಕೆ."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:13
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "ಬ್ಲೂಟೂತ್ ಕ್ಲೈಂಟ್‌ಗಳು ಕಡತಗಳಿಗೆ ಬರೆಯುವುದನ್ನು ಅನುಮತಿಸಬೇಕೆ."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "ಹೊಸದಾಗಿ ಸ್ವೀಕರಿಸಲಾದ ಕಡತಗಳ ಬಗ್ಗೆ ಸೂಚನೆ ನೀಡಬೇಕೆ."
+"Language: kn\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/file-share-properties.ui.h:1
-msgid "<b>Receive Files over Bluetooth</b>"
-msgstr "<b>ಬ್ಲೂಟೂತ್‌ನ ಮೂಲಕ ಕಡತಗಳನ್ನು ಸ್ವೀಕರಿಸು</b>"
+msgid "Personal File Sharing Preferences"
+msgstr "ವೈಯಕ್ತಿಕ ಕಡತ ಹಂಚಿಕೆಯ ಆದ್ಯತೆಗಳು"
 
 #: ../data/file-share-properties.ui.h:2
-msgid "<b>Share Files over Bluetooth</b>"
-msgstr "<b>ಬ್ಲೂಟೂತ್‌ನ ಮೂಲಕ ಕಡತಗಳನ್ನು ಹಂಚು</b>"
-
-#: ../data/file-share-properties.ui.h:3
 msgid "<b>Share Files over the Network</b>"
 msgstr "<b>ಜಾಲಬಂಧದ ಮೂಲಕ ಕಡತಗಳನ್ನು ಹಂಚು</b>"
 
+#: ../data/file-share-properties.ui.h:3
+msgid "_Share public files on network"
+msgstr "ಸಾರ್ವಜನಿಕೆ ಕಡತಗಳನ್ನು ಜಾಲಬಂಧದಲ್ಲಿ ಹಂಚಿಕೊ(_S)"
+
 #: ../data/file-share-properties.ui.h:4
-msgid "Allo_w remote devices to delete files"
-msgstr "ದೂರಸ್ಥ ಸಾಧನಗಳು ಕಡತಗಳನ್ನು ಅಳಿಸುವುದನ್ನು ಅನುಮತಿಸು(_w)"
+msgid "_Password:"
+msgstr "ಗುಪ್ತಪದ(_P):"
 
 #: ../data/file-share-properties.ui.h:5
-msgid "Personal File Sharing Preferences"
-msgstr "ವೈಯಕ್ತಿಕ ಕಡತ ಹಂಚಿಕೆಯ ಆದ್ಯತೆಗಳು"
+msgid "_Require password:"
+msgstr "ಗುಪ್ತಪದದ ಅಗತ್ಯವಿದೆ(_R):"
 
 #: ../data/file-share-properties.ui.h:6
-msgid "Receive files in _Downloads folder over Bluetooth"
-msgstr "ಬ್ಲೂಟೂತ್‌ ಮೂಲಕ ಕಡತಗಳನ್ನು ಡೌನ್‌ಲೋಡ್ ಕಡತಕೋಶಕ್ಕೆ ಸ್ವೀಕರಿಸು(_D)"
+msgid "<b>Share Files over Bluetooth</b>"
+msgstr "<b>ಬ್ಲೂಟೂತ್‌ನ ಮೂಲಕ ಕಡತಗಳನ್ನು ಹಂಚು</b>"
 
 #: ../data/file-share-properties.ui.h:7
-msgid "Require re_mote devices to bond with this computer"
-msgstr "ದೂರಸ್ಥ ಸಾಧನಗಳು ಈ ಗಣಕದೊಂದಿಗೆ ಜೋಡಿಸಲ್ಪಡುವ ಅಗತ್ಯವಿದೆ(_m)"
-
-#: ../data/file-share-properties.ui.h:8
 msgid "Share public files over _Bluetooth"
 msgstr "ಬ್ಲೂಟೂತ್‌ನ ಮೂಲಕ ಸಾರ್ವಜನಿಕ ಕಡತಗಳನ್ನು ಹಂಚಿಕೊಳ್ಳಿ(_B)"
 
+#: ../data/file-share-properties.ui.h:8
+msgid "Allo_w remote devices to delete files"
+msgstr "ದೂರಸ್ಥ ಸಾಧನಗಳು ಕಡತಗಳನ್ನು ಅಳಿಸುವುದನ್ನು ಅನುಮತಿಸು(_w)"
+
 #: ../data/file-share-properties.ui.h:9
-msgid "_Accept files: "
-msgstr "ಕಡತಗಳನ್ನು ಅಂಗೀಕರಿಸು(_A): "
+msgid "Require re_mote devices to bond with this computer"
+msgstr "ದೂರಸ್ಥ ಸಾಧನಗಳು ಈ ಗಣಕದೊಂದಿಗೆ ಜೋಡಿಸಲ್ಪಡುವ ಅಗತ್ಯವಿದೆ(_m)"
 
 #: ../data/file-share-properties.ui.h:10
-msgid "_Notify about received files"
-msgstr "ಸ್ವೀಕರಿಸಲಾದ ಕಡತಗಳ ಬಗ್ಗೆ ಸೂಚನೆ ನೀಡು(_N)"
+msgid "<b>Receive Files over Bluetooth</b>"
+msgstr "<b>ಬ್ಲೂಟೂತ್‌ನ ಮೂಲಕ ಕಡತಗಳನ್ನು ಸ್ವೀಕರಿಸು</b>"
 
 #: ../data/file-share-properties.ui.h:11
-msgid "_Password:"
-msgstr "ಗುಪ್ತಪದ(_P):"
+msgid "Receive files in _Downloads folder over Bluetooth"
+msgstr "ಬ್ಲೂಟೂತ್‌ ಮೂಲಕ ಕಡತಗಳನ್ನು ಡೌನ್‌ಲೋಡ್ ಕಡತಕೋಶಕ್ಕೆ ಸ್ವೀಕರಿಸು(_D)"
 
 #: ../data/file-share-properties.ui.h:12
-msgid "_Require password:"
-msgstr "ಗುಪ್ತಪದದ ಅಗತ್ಯವಿದೆ(_R):"
+msgid "_Accept files: "
+msgstr "ಕಡತಗಳನ್ನು ಅಂಗೀಕರಿಸು(_A): "
 
 #: ../data/file-share-properties.ui.h:13
-msgid "_Share public files on network"
-msgstr "ಸಾರ್ವಜನಿಕೆ ಕಡತಗಳನ್ನು ಜಾಲಬಂಧದಲ್ಲಿ ಹಂಚಿಕೊ(_S)"
+msgid "_Notify about received files"
+msgstr "ಸ್ವೀಕರಿಸಲಾದ ಕಡತಗಳ ಬಗ್ಗೆ ಸೂಚನೆ ನೀಡು(_N)"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
 
-#: ../data/mateuser-share-properties.desktop.in.h:1
-#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
+
+#: ../data/mate-user-share-properties.desktop.in.h:1
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "ವೈಯಕ್ತಿಕ ಕಡತ ಹಂಚಿಕೆ"
 
-#: ../data/mateuser-share-properties.desktop.in.h:2
+#: ../data/mate-user-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "ಕಡತಗಳನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ಆದ್ಯತೆಗಳು"
 
-#: ../data/mateuser-share.desktop.in.in.h:1
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "ಶಕ್ತಗೊಂಡಿದ್ದಲ್ಲಿ ವೈಯಕ್ತಿಕ ಕಡತ ಹಂಚಿಕೆಯನ್ನು ಆರಂಭಿಸು"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "ಆದ್ಯತೆಗಳನ್ನು ಆರಂಭಿಸು"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr ""
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr ""
+
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr "ಆದ್ಯತೆಗಳು"
 
-#: ../src/caja-share-bar.c:187
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "ವೈಯಕ್ತಿಕ ಕಡತ ಹಂಚಿಕೆಯ ಆದ್ಯತೆಗಳನ್ನು ಆರಂಭಿಸಿ"
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "ವೈಯಕ್ತಿಕ ಕಡತ ಹಂಚಿಕೆಯ ಆದ್ಯತೆಗಳನ್ನು ಆರಂಭಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "ಈ ಕಡತಕೋಶದಿಂದ ನೀವು ಕಡತಗಳನ್ನು ಬೇರೊಬ್ಬರೊಂದಿಗೆ ಹಂಚಿಕೊಳ್ಳಬಹುದು ಹಾಗು ಸ್ವೀಕರಿಸಬಹುದು"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr ""
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
 msgstr ""
-"ಈ ಕಡತಕೋಶದಿಂದ ನೀವು ಕಡತಗಳನ್ನು ಬೇರೊಬ್ಬರೊಂದಿಗೆ ಜಾಲಬಂಧ ಹಾಗು ಬ್ಲೂಟೂತ್ ಮೂಲಕ "
-"ಹಂಚಿಕೊಳ್ಳಬಹುದು"
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "ಬ್ಲೂಟೂತ್ ಮೂಲಕ ಈ ಕಡತಕೋಶಕ್ಕೆ ನೀವು ಕಡತಗಳನ್ನು ಸ್ವೀಕರಿಸಬಹುದು"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr ""
+
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr ""
 
-#: ../src/file-share-properties.c:436
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "ಯಾವುದೆ ಕಾರಣ ಇಲ್ಲ"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "ನೆರವಿನ ವಿಷಯಗಳನ್ನು ತೋರಿಸಲಾಗಲಿಲ್ಲ."
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "ಸಂಪರ್ಕಸಾಧನವನ್ನು ನಿರ್ಮಿಸಲಾಗಲಿಲ್ಲ."
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "ಎಂದೂ ಬೇಡ"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "ಕಡತಗಳನ್ನು ಬರೆಯುವಾಗ"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "ಯಾವಾಗಲೂ"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "ಕೇವಲ ಸಿದ್ಧಗೊಳಿಸಲಾದ ಸಾಧನಗಳಿಂದ ಮಾತ್ರ"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "ಅನುಮತಿಯನ್ನು ಕೇಳು"
 
@@ -229,42 +174,36 @@ msgstr "ಅನುಮತಿಯನ್ನು ಕೇಳು"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "%s ನ ಸಾರ್ವಜನಿಕ ಕಡತಗಳು"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "%s ನ ಸಾರ್ವಜನಿಕ ಕಡತಗಳು %s ನಲ್ಲಿವೆ"
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "ಬ್ಲೂಟೂತ್‌ನ ಮೂಲಕ ನಿಮಗೆ \"%s\" ಬಂದಿದೆ"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "ನೀವು ಕಡತವನ್ನು ಸ್ವೀಕರಿಸಿದ್ದೀರಿ"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "ಕಡತವನ್ನು ತೆರೆ"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "ಕಡತವನ್ನು ತೋರಿಸು"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "ಕಡತ ಸ್ವೀಕರಣೆ ಪೂರ್ತಿಗೊಂಡಿದೆ"
-
-#~ msgid "Only for Bonded and Trusted devices"
-#~ msgstr "ಕೇವಲ ಬದ್ಧವಾದ ಹಾಗು ನಂಬಿಕಾರ್ಹ ಸಾಧನಗಳಿಂದ ಮಾತ್ರ"
-
-#~ msgid "Please log in as the user guest"
-#~ msgstr "ದಯವಿಟ್ಟು ಬಳಕೆದಾರ ಅತಿಥಿಯಾಗಿ ಪ್ರವೇಶಿಸಿ"
diff --git a/po/ko.po b/po/ko.po
index 4fa2a8a..495aada 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,91 +5,22 @@
 # Translators:
 # Changwoo Ryu <[email protected]>, 2009, 2010
 # Namhyung Kim <[email protected]>, 2007
-# Darkcircle <[email protected]>, 2014
+# Seong-ho Cho <[email protected]>, 2014-2015
 # Young-Ho Cha <ganadist at mizi.com>, 2005, 2007
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-26 22:51+0200\n"
-"PO-Revision-Date: 2014-01-13 10:15+0000\n"
-"Last-Translator: Darkcircle <[email protected]>\n"
-"Language-Team: Korean (http://www.transifex.com/projects/p/MATE/language/ko/)\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: Seong-ho Cho <[email protected]>\n"
+"Language-Team: Korean (http://www.transifex.com/mate/MATE/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/desktop_mate_file_sharing.schemas.in.h:1
-msgid "Share Public directory over the network"
-msgstr "공개 디렉터리를 네트워크를 통해 공유"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr "참이면, 사용자가 로그인했을 때 홈 디렉토리의 공개 디렉터리를 공유합니다."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:3
-msgid "When to require passwords"
-msgstr "암호가 필요한 경우"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:4
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr "언제 암호를 물어볼 지 지정합니다. 가능한 값은 \"never\", \"on_write\", \"always\"입니다."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:5
-msgid "Share Public directory over Bluetooth"
-msgstr "공개 디렉터리를 블루투스를 통해 공유"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:6
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr "참이면, 사용자가 로그인하면 홈 디렉토리의 공개 디렉터리를 블루투스를 통해 공유합니다."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:7
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "블루투스 클라이언트의 파일 쓰기를 허용할 지 여부입니다."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:8
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr "블루투스 클라이언트의 파일 쓰기를 허용할 지, 아니면 읽기 전용으로만 공유할 지 여부입니다."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:9
-msgid ""
-"Whether Bluetooth clients need to pair with the computer to send files."
-msgstr "블루투스 클라이언트가 파일을 보낼 때 컴퓨터에 연결해야 하는 지 여부입니다."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "블루투스 클라이언트가 ObexPush를 사용해 파일을 보낼 수 있는 지 여부입니다."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:11
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr "참이면, 사용자가 로그인하면 블루투스를 통해 \"다운로드\" 디렉터리로 파일을 보낼 수 있습니다."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:12
-msgid "When to accept files sent over Bluetooth"
-msgstr "블루투스를 통해 보낸 파일 허용하는 방법"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:13
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr "언제 블루투스를 통해 보낸 파일을 받아들일지 지정. 가능한 값은 \"always\", \"bonded\", \"ask\"."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "새로 받은 파일을 알릴 지 여부."
-
 #: ../data/file-share-properties.ui.h:1
 msgid "Personal File Sharing Preferences"
 msgstr "개인 파일 공유 기본 설정"
@@ -142,8 +73,16 @@ msgstr "파일 허용(_A): "
 msgid "_Notify about received files"
 msgstr "받은 파일 알리기(_N)"
 
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr "사용자 공유"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr "user-share과 통합했습니다"
+
 #: ../data/mate-user-share-properties.desktop.in.h:1
-#: ../data/mate-user-share.desktop.in.in.h:1 ../src/caja-share-bar.c:162
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "개인 파일 공유"
 
@@ -151,63 +90,81 @@ msgstr "개인 파일 공유"
 msgid "Preferences for sharing of files"
 msgstr "파일 공유에 대한 기본 설정"
 
-#: ../data/mate-user-share.desktop.in.in.h:2
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr "obexftp로 공유하는 개인 파일"
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "사용자 공유를 (사용할 경우) 시작합니다"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "기본 설정 실행"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr "obexpush로 공유하는 개인 파일"
 
-#: ../src/caja-share-bar.c:187
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr "webdav로 공유하는 개인 파일"
+
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr "기본 설정"
+
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "개인 파일 공유 기본 설정을 실행합니다"
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "개인 파일 공유 기본 설정을 실행할 수 없습니다"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "폴더의 파일을 공유하고 파일을 여기에 받을 수 있습니다"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr "파일을 공유하거나 받을때 사용합니다"
+
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr "파일을 네트워크 또는 블루투스로 공유합니다"
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "폴더의 파일을 네트워크와 블루투스를 통해 공유할 수 있습니다"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr "네트워크로 공유합니다 "
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "블루투스를 통해 받은 파일을 이 폴더에 받을 수 있습니다"
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr "블루투스로 파일을 받을 떄 사용합니다"
 
-#: ../src/file-share-properties.c:436
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "이유 없음"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "도움말 차례를 표시할 수 없습니다."
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "인터페이스를 만들 수 없습니다."
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "없음"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "파일을 쓸 때"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "항상"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "설정한 장치만"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "물어보기"
 
@@ -220,36 +177,36 @@ msgstr "물어보기"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "%s의 공용 파일"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "%2$s에 있는 %1$s의 공용 파일"
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "블루투스를 통해 \"%s\" 파일을 받았습니다"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "파일을 받았습니다"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "파일 열기"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "파일 보기"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "파일 받기를 마쳤습니다"
diff --git a/po/ky.po b/po/ky.po
index 9ec9d13..a5a3ce8 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -8,85 +8,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-26 22:51+0200\n"
-"PO-Revision-Date: 2013-03-20 19:16+0000\n"
-"Last-Translator: chingis\n"
-"Language-Team: Kirgyz (http://www.transifex.com/projects/p/MATE/language/ky/)\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: monsta <[email protected]>\n"
+"Language-Team: Kyrgyz (http://www.transifex.com/mate/MATE/language/ky/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ky\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/desktop_mate_file_sharing.schemas.in.h:1
-msgid "Share Public directory over the network"
-msgstr ""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr ""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:3
-msgid "When to require passwords"
-msgstr ""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:4
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr ""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:5
-msgid "Share Public directory over Bluetooth"
-msgstr ""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:6
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr ""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:7
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr ""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:8
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr ""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:9
-msgid ""
-"Whether Bluetooth clients need to pair with the computer to send files."
-msgstr ""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr ""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:11
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr ""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:12
-msgid "When to accept files sent over Bluetooth"
-msgstr ""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:13
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr ""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr ""
-
 #: ../data/file-share-properties.ui.h:1
 msgid "Personal File Sharing Preferences"
 msgstr ""
@@ -139,8 +70,16 @@ msgstr ""
 msgid "_Notify about received files"
 msgstr ""
 
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
+
 #: ../data/mate-user-share-properties.desktop.in.h:1
-#: ../data/mate-user-share.desktop.in.in.h:1 ../src/caja-share-bar.c:162
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr ""
 
@@ -148,63 +87,81 @@ msgstr ""
 msgid "Preferences for sharing of files"
 msgstr ""
 
-#: ../data/mate-user-share.desktop.in.in.h:2
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr ""
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
 msgstr ""
 
-#: ../src/caja-share-bar.c:187
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr ""
+
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr ""
+
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr ""
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr ""
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr ""
+
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
 msgstr ""
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
 msgstr ""
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
 msgstr ""
 
-#: ../src/file-share-properties.c:436
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "Себеп жок"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr ""
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr ""
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "Эч качан"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr ""
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "Дайыма"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr ""
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr ""
 
@@ -217,36 +174,36 @@ msgstr ""
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr ""
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr ""
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr ""
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr ""
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "Файлды ачуу"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr ""
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr ""
diff --git a/po/lt.po b/po/lt.po
index 2578f47..cc043c5 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-11-06 15:07+0300\n"
-"PO-Revision-Date: 2016-02-15 19:25+0000\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
 "Last-Translator: Moo\n"
 "Language-Team: Lithuanian (http://www.transifex.com/mate/MATE/language/lt/)\n"
 "MIME-Version: 1.0\n"
@@ -74,7 +74,7 @@ msgstr "Į_spėti apie gautus failus"
 
 #: ../data/libcaja-user-share.caja-extension.in.in.h:1
 msgid "User Share"
-msgstr ""
+msgstr "Naudotojo viešiniai"
 
 #: ../data/libcaja-user-share.caja-extension.in.in.h:2
 msgid "Integrates with user-share"
diff --git a/po/lv.po b/po/lv.po
index f5d350a..aad0510 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -1,224 +1,167 @@
-# Latvian translation for mateuser-share.
-# Copyright (C) 2010 mateuser-share's COPYRIGHT HOLDER
-# This file is distributed under the same license as the mateuser-share package.
-#
-# Peteris Krisjanis <[email protected]>, 2010.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Pēteris Krišjānis <[email protected]>, 2010
 msgid ""
 msgstr ""
-"Project-Id-Version: mateuser-share master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.mateorg/enter_bug."
-"cgi?product=mateuser-share&component=general\n"
-"POT-Creation-Date: 2010-03-07 15:44+0000\n"
-"PO-Revision-Date: 2010-03-08 11:39+0200\n"
-"Last-Translator: Peteris Krisjanis <[email protected]>\n"
-"Language-Team: Latviešu <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: monsta <[email protected]>\n"
+"Language-Team: Latvian (http://www.transifex.com/mate/MATE/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
-"X-Generator: Lokalize 1.0\n"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:1
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr ""
-"Ja patiess, Bluetooth ierīces var sūtīt failus uz lietotāja 'Lejupielādes' "
-"direktoriju, kad lietotājs būs pieteicies."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr ""
-"Ja patiess, 'Publiskie' direktorija lietotāja mājas direktorijā tiks "
-"koplietota "
-"izmantojot Bluetooth, kad lietotājs būs pieteicies."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:3
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr ""
-"Ja patiess, 'Publiskie' direktorija lietotāja mājasdirektorijā tiks koplietota "
-"izmantojot tīklu, kad lietotājs būs pieteicies."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:4
-msgid "Share Public directory over Bluetooth"
-msgstr "Koplietot 'Publiskie' direktoriju izmantojot Bluetooth"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:5
-msgid "Share Public directory over the network"
-msgstr "Koplietot 'Publiskie' direktoriju izmantojot tīklu"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:6
-msgid "When to accept files sent over Bluetooth"
-msgstr "Kad akceptēt saņemtos failus izmantojot Bluetooth"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:7
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr ""
-"Kad akceptēt saņemtos failus izmantojot Bluetooth. Iespējamās vērtības ir "
-"\"always\", \"bonded\" un \"ask\"."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:8
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr ""
-"Kad prasīt paroli. Iespējamās vērtības ir \"never\", \"on_write\" un "
-"\"always\"."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:9
-msgid "When to require passwords"
-msgstr "Vai pieprasīt paroles"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "Vai Bluetooth klienti var sūtīt failus izmantojot ObexPush."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:11
-msgid "Whether Bluetooth clients need to pair with the computer to send files."
-msgstr "Vai Bluetooth klientiem jābūt sapārotiem ar datoru, lai nosūtītu failus."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:12
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr ""
-"Vai atļaut Bluetooth klientiem rakstīt failus, vai koplietot failus tikai "
-"lasīšanas "
-"režīmā."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:13
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "Vai atļaut Bluetooth klientiem rakstīt failus."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "Vai informēt par tikko saņemtiem failiem."
 
 #: ../data/file-share-properties.ui.h:1
-msgid "<b>Receive Files over Bluetooth</b>"
-msgstr "<b>Saņemt failus izmantojot Bluetooth</b>"
+msgid "Personal File Sharing Preferences"
+msgstr "Personiskās failu koplietošanas iestatījumi"
 
 #: ../data/file-share-properties.ui.h:2
-msgid "<b>Share Files over Bluetooth</b>"
-msgstr "<b>Koplietot failus izmantojot Bluetooth</b>"
-
-#: ../data/file-share-properties.ui.h:3
 msgid "<b>Share Files over the Network</b>"
 msgstr "<b>Koplietot failus izmantojot tīklu</b>"
 
+#: ../data/file-share-properties.ui.h:3
+msgid "_Share public files on network"
+msgstr "_Koplietot publiskos failus tīklā"
+
 #: ../data/file-share-properties.ui.h:4
-msgid "Allo_w remote devices to delete files"
-msgstr "Atļau_t attālinātajām ierīcēm dzēst failus"
+msgid "_Password:"
+msgstr "_Parole:"
 
 #: ../data/file-share-properties.ui.h:5
-msgid "Personal File Sharing Preferences"
-msgstr "Personiskās failu koplietošanas iestatījumi"
+msgid "_Require password:"
+msgstr "Piep_rasīt paroli:"
 
 #: ../data/file-share-properties.ui.h:6
-msgid "Receive files in _Downloads folder over Bluetooth"
-msgstr "Izmantojot Bluetooth, saņemt failus '_Lejupielādes' mapē"
+msgid "<b>Share Files over Bluetooth</b>"
+msgstr "<b>Koplietot failus izmantojot Bluetooth</b>"
 
 #: ../data/file-share-properties.ui.h:7
-msgid "Require re_mote devices to bond with this computer"
-msgstr "Pieprasīt, lai attālinātās ierīces būtu sapārotas ar šo datoru"
-
-#: ../data/file-share-properties.ui.h:8
 msgid "Share public files over _Bluetooth"
 msgstr "Koplietot publiskos failus izmantojot _Bluetooth"
 
+#: ../data/file-share-properties.ui.h:8
+msgid "Allo_w remote devices to delete files"
+msgstr "Atļau_t attālinātajām ierīcēm dzēst failus"
+
 #: ../data/file-share-properties.ui.h:9
-msgid "_Accept files: "
-msgstr "_Apstiprināt failus:"
+msgid "Require re_mote devices to bond with this computer"
+msgstr "Pieprasīt, lai attālinātās ierīces būtu sapārotas ar šo datoru"
 
 #: ../data/file-share-properties.ui.h:10
-msgid "_Notify about received files"
-msgstr "_Informēt par saņemtajiem failiem"
+msgid "<b>Receive Files over Bluetooth</b>"
+msgstr "<b>Saņemt failus izmantojot Bluetooth</b>"
 
 #: ../data/file-share-properties.ui.h:11
-msgid "_Password:"
-msgstr "_Parole:"
+msgid "Receive files in _Downloads folder over Bluetooth"
+msgstr "Izmantojot Bluetooth, saņemt failus '_Lejupielādes' mapē"
 
 #: ../data/file-share-properties.ui.h:12
-msgid "_Require password:"
-msgstr "Piep_rasīt paroli:"
+msgid "_Accept files: "
+msgstr "_Apstiprināt failus:"
 
 #: ../data/file-share-properties.ui.h:13
-msgid "_Share public files on network"
-msgstr "_Koplietot publiskos failus tīklā"
+msgid "_Notify about received files"
+msgstr "_Informēt par saņemtajiem failiem"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
 
-#: ../data/mateuser-share-properties.desktop.in.h:1
-#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
+
+#: ../data/mate-user-share-properties.desktop.in.h:1
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "Personiskā failu koplietošana"
 
-#: ../data/mateuser-share-properties.desktop.in.h:2
+#: ../data/mate-user-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Failu koplietošanas iestatījumi"
 
-#: ../data/mateuser-share.desktop.in.in.h:1
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Palaist personiskās failu koplietošanu (ja tā ir ieslēgta)"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "Atvērt iestatījumus"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr ""
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr ""
+
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr ""
 
-#: ../src/caja-share-bar.c:187
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Atvērt personiskās failu koplietošanas iestatījumus"
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "Neizdevās atvērt personiskās failu koplietošanas iestatījumus"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "Jūs varat koplietot failus no šīs mapes un saņemt failus tajā."
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr ""
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
 msgstr ""
-"Jūs varat koplietot failus no šīs mapes izmantojot lokālo tīklu un Bluetooth"
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "Jūs varat saņemt failus šajā mapē izmantojot Bluetooth"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr ""
 
-#: ../src/file-share-properties.c:436
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr ""
+
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "Bez iemesla"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "Neizdevās attēlot palīdzības saturu."
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "Neizdevās izveidot saskarni."
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "Nekad"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "Rakstot failus"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "Vienmēr"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "Tikai no iestatītajām ierīcēm"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "Vaicā"
 
@@ -231,37 +174,36 @@ msgstr "Vaicā"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "%s publiskie faili"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "%s publiskie faili %s"
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "Jūs saņēmāt \"%s\" izmantojot Bluetooth"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "Jūs saņēmāt failu"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "Atvērt failu"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "Atsegt failu"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "Faila uztveršana pabeigta"
-
diff --git a/po/mai.po b/po/mai.po
index b2e50b5..11940ff 100644
--- a/po/mai.po
+++ b/po/mai.po
@@ -1,188 +1,167 @@
-# translation of mateuser-share.master.po to Maithili
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
-# Sangeeta Kumari <[email protected]>, 2009.
+# 
+# Translators:
+# Sangeeta Kumari <[email protected]>, 2009
 msgid ""
 msgstr ""
-"Project-Id-Version: mateuser-share.master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.mateorg/enter_bug.cgi?product=mateuser-share&component=general\n"
-"POT-Creation-Date: 2009-09-11 00:59+0000\n"
-"PO-Revision-Date: 2009-09-11 20:45+0530\n"
-"Last-Translator: Sangeeta Kumari <[email protected]>\n"
-"Language-Team: Maithili <maithili.sf.net>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: monsta <[email protected]>\n"
+"Language-Team: Maithili (http://www.transifex.com/mate/MATE/language/mai/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n\n"
+"Language: mai\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/desktop_matefile_sharing.schemas.in.h:1
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
+#: ../data/file-share-properties.ui.h:1
+msgid "Personal File Sharing Preferences"
 msgstr ""
 
-#: ../data/desktop_matefile_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
+#: ../data/file-share-properties.ui.h:2
+msgid "<b>Share Files over the Network</b>"
 msgstr ""
 
-#: ../data/desktop_matefile_sharing.schemas.in.h:3
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
+#: ../data/file-share-properties.ui.h:3
+msgid "_Share public files on network"
 msgstr ""
 
-#: ../data/desktop_matefile_sharing.schemas.in.h:4
-msgid "Share Public directory over Bluetooth"
-msgstr ""
+#: ../data/file-share-properties.ui.h:4
+msgid "_Password:"
+msgstr "कूटशब्द (_P):"
 
-#: ../data/desktop_matefile_sharing.schemas.in.h:5
-msgid "Share Public directory over the network"
+#: ../data/file-share-properties.ui.h:5
+msgid "_Require password:"
 msgstr ""
 
-#: ../data/desktop_matefile_sharing.schemas.in.h:6
-msgid "When to accept files sent over Bluetooth"
+#: ../data/file-share-properties.ui.h:6
+msgid "<b>Share Files over Bluetooth</b>"
 msgstr ""
 
-#: ../data/desktop_matefile_sharing.schemas.in.h:7
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\", \"bonded_trusted\" and \"ask\"."
+#: ../data/file-share-properties.ui.h:7
+msgid "Share public files over _Bluetooth"
 msgstr ""
 
-#: ../data/desktop_matefile_sharing.schemas.in.h:8
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
+#: ../data/file-share-properties.ui.h:8
+msgid "Allo_w remote devices to delete files"
 msgstr ""
 
-#: ../data/desktop_matefile_sharing.schemas.in.h:9
-msgid "When to require passwords"
+#: ../data/file-share-properties.ui.h:9
+msgid "Require re_mote devices to bond with this computer"
 msgstr ""
 
-#: ../data/desktop_matefile_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
+#: ../data/file-share-properties.ui.h:10
+msgid "<b>Receive Files over Bluetooth</b>"
 msgstr ""
 
-#: ../data/desktop_matefile_sharing.schemas.in.h:11
-msgid "Whether Bluetooth clients need to pair with the computer to send files."
+#: ../data/file-share-properties.ui.h:11
+msgid "Receive files in _Downloads folder over Bluetooth"
 msgstr ""
 
-#: ../data/desktop_matefile_sharing.schemas.in.h:12
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
+#: ../data/file-share-properties.ui.h:12
+msgid "_Accept files: "
 msgstr ""
 
-#: ../data/desktop_matefile_sharing.schemas.in.h:13
-msgid "Whether to allow Bluetooth clients to write files."
+#: ../data/file-share-properties.ui.h:13
+msgid "_Notify about received files"
 msgstr ""
 
-#: ../data/desktop_matefile_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
 msgstr ""
 
-#: ../data/file-share-properties.ui.h:1
-msgid "<b>Receive Files over Bluetooth</b>"
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
 msgstr ""
 
-#: ../data/file-share-properties.ui.h:2
-msgid "<b>Share Files over Bluetooth</b>"
-msgstr ""
-
-#: ../data/file-share-properties.ui.h:3
-msgid "<b>Share Files over the Network</b>"
+#: ../data/mate-user-share-properties.desktop.in.h:1
+#: ../src/caja-share-bar.c:103
+msgid "Personal File Sharing"
 msgstr ""
 
-#: ../data/file-share-properties.ui.h:4
-msgid "Allo_w remote devices to delete files"
+#: ../data/mate-user-share-properties.desktop.in.h:2
+msgid "Preferences for sharing of files"
 msgstr ""
 
-#: ../data/file-share-properties.ui.h:5
-msgid "Personal File Sharing Preferences"
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
 msgstr ""
 
-#: ../data/file-share-properties.ui.h:6
-msgid "Receive files in _Downloads folder over Bluetooth"
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
+msgid "Launch Personal File Sharing if enabled"
 msgstr ""
 
-#: ../data/file-share-properties.ui.h:7
-msgid "Require re_mote devices to bond with this computer"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
 msgstr ""
 
-#: ../data/file-share-properties.ui.h:8
-msgid "Share public files over _Bluetooth"
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
 msgstr ""
 
-#: ../data/file-share-properties.ui.h:9
-msgid "_Accept files: "
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
 msgstr ""
 
-#: ../data/file-share-properties.ui.h:10
-msgid "_Notify about received files"
+#: ../src/caja-share-bar.c:121
+msgid "Launch Personal File Sharing Preferences"
 msgstr ""
 
-#: ../data/file-share-properties.ui.h:11
-msgid "_Password:"
-msgstr "कूटशब्द (_P):"
-
-#: ../data/file-share-properties.ui.h:12
-msgid "_Require password:"
+#: ../src/share-extension.c:73
+msgid "Unable to launch the Personal File Sharing preferences"
 msgstr ""
 
-#: ../data/file-share-properties.ui.h:13
-msgid "_Share public files on network"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
 msgstr ""
 
-#: ../data/mateuser-share-properties.desktop.in.h:1
-#: ../data/mateuser-share.desktop.in.in.h:2
-msgid "Personal File Sharing"
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
 msgstr ""
 
-#: ../data/mateuser-share-properties.desktop.in.h:2
-msgid "Preferences for sharing of files"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
 msgstr ""
 
-#: ../data/mateuser-share.desktop.in.in.h:1
-msgid "Launch Personal File Sharing if enabled"
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
 msgstr ""
 
-#: ../src/file-share-properties.c:435
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "कोनो कारण नहि"
 
-#: ../src/file-share-properties.c:463
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr ""
 
-#: ../src/file-share-properties.c:503
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr ""
 
-#: ../src/file-share-properties.c:543
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "कहियो नहि"
 
-#: ../src/file-share-properties.c:546
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr ""
 
-#: ../src/file-share-properties.c:549 ../src/file-share-properties.c:572
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "हरदम"
 
-#: ../src/file-share-properties.c:575
-msgid "Only for Bonded devices"
+#: ../src/file-share-properties.c:580
+msgid "Only for set up devices"
 msgstr ""
 
-#: ../src/file-share-properties.c:578
-msgid "Only for Bonded and Trusted devices"
-msgstr ""
-
-#: ../src/file-share-properties.c:583
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "पूछू"
 
@@ -195,37 +174,36 @@ msgstr "पूछू"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr ""
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr ""
 
-#: ../src/http.c:372
-msgid "Please log in as the user guest"
-msgstr ""
-
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:138
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr ""
 
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr ""
 
-#: ../src/obexpush.c:151
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "फाइल खोलू"
 
-#: ../src/obexpush.c:155
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr ""
 
+#: ../src/obexpush.c:169
+msgid "File reception complete"
+msgstr ""
diff --git a/po/mk.po b/po/mk.po
index bc16c97..89f480d 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -1,76 +1,169 @@
-# translation of mk.po to Macedonian
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
-# Арангел Ангов <[email protected]>, 2005.
-#
+# 
+# Translators:
+# Арангел Ангов <[email protected]>, 2005
 msgid ""
 msgstr ""
-"Project-Id-Version: mk\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-14 19:38+0000\n"
-"PO-Revision-Date: 2005-08-14 23:28+0200\n"
-"Last-Translator: Арангел Ангов <[email protected]>\n"
-"Language-Team: Macedonian <[email protected]>\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: monsta <[email protected]>\n"
+"Language-Team: Macedonian (http://www.transifex.com/mate/MATE/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.10\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: ../desktop_matefile_sharing.schemas.in.h:1
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared when the user is logged in."
+#: ../data/file-share-properties.ui.h:1
+msgid "Personal File Sharing Preferences"
 msgstr ""
-"Ако е точно, јавниот директориум во домашниот директориум на корисниците "
-"ќе биде споделен по најавата на корисникот."
 
-#: ../desktop_matefile_sharing.schemas.in.h:2
-msgid "Share Public directory"
-msgstr "Сподели јавен директориум"
+#: ../data/file-share-properties.ui.h:2
+msgid "<b>Share Files over the Network</b>"
+msgstr ""
 
-#: ../desktop_matefile_sharing.schemas.in.h:3
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
+#: ../data/file-share-properties.ui.h:3
+msgid "_Share public files on network"
+msgstr ""
+
+#: ../data/file-share-properties.ui.h:4
+msgid "_Password:"
+msgstr "_Лозинка:"
+
+#: ../data/file-share-properties.ui.h:5
+msgid "_Require password:"
+msgstr "_Потребна е лозинка:"
+
+#: ../data/file-share-properties.ui.h:6
+msgid "<b>Share Files over Bluetooth</b>"
+msgstr ""
+
+#: ../data/file-share-properties.ui.h:7
+msgid "Share public files over _Bluetooth"
+msgstr ""
+
+#: ../data/file-share-properties.ui.h:8
+msgid "Allo_w remote devices to delete files"
+msgstr ""
+
+#: ../data/file-share-properties.ui.h:9
+msgid "Require re_mote devices to bond with this computer"
+msgstr ""
+
+#: ../data/file-share-properties.ui.h:10
+msgid "<b>Receive Files over Bluetooth</b>"
+msgstr ""
+
+#: ../data/file-share-properties.ui.h:11
+msgid "Receive files in _Downloads folder over Bluetooth"
+msgstr ""
+
+#: ../data/file-share-properties.ui.h:12
+msgid "_Accept files: "
+msgstr ""
+
+#: ../data/file-share-properties.ui.h:13
+msgid "_Notify about received files"
+msgstr ""
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
+
+#: ../data/mate-user-share-properties.desktop.in.h:1
+#: ../src/caja-share-bar.c:103
+msgid "Personal File Sharing"
+msgstr ""
+
+#: ../data/mate-user-share-properties.desktop.in.h:2
+msgid "Preferences for sharing of files"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
+msgid "Launch Personal File Sharing if enabled"
+msgstr ""
+
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr ""
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
 msgstr ""
-"Кога да бара лозинки. Можни вредности се \"никогаш\", \"при запишување\" и "
-"\"секогаш\"."
 
-#: ../desktop_matefile_sharing.schemas.in.h:4
-msgid "When to require passwords"
-msgstr "Кога да бара лозинки"
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr ""
+
+#: ../src/caja-share-bar.c:121
+msgid "Launch Personal File Sharing Preferences"
+msgstr ""
+
+#: ../src/share-extension.c:73
+msgid "Unable to launch the Personal File Sharing preferences"
+msgstr ""
+
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr ""
+
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr ""
+
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr ""
 
-#: ../file-share-properties.c:290
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr ""
+
+#: ../src/file-share-properties.c:417
+msgid "No reason"
+msgstr ""
+
+#: ../src/file-share-properties.c:445
+msgid "Could not display the help contents."
+msgstr ""
+
+#: ../src/file-share-properties.c:507
+msgid "Could not build interface."
+msgstr ""
+
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "Никогаш"
 
-#: ../file-share-properties.c:293
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "Кога се запишуваат датотеки"
 
-#: ../file-share-properties.c:296
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "Секогаш"
 
-#: ../file-share-properties.glade.h:1
-msgid "<b>Share Files</b>"
-msgstr "<b>Споделени датотеки</b>"
-
-#: ../file-share-properties.glade.h:2
-msgid "File Sharing Preferences"
-msgstr "Преференци за споделување на датотеки"
-
-#: ../file-share-properties.glade.h:3
-msgid "Share Public files on network"
-msgstr "Сподели датотеки јавно на мрежата"
-
-#: ../file-share-properties.glade.h:4
-msgid "_Password:"
-msgstr "_Лозинка:"
+#: ../src/file-share-properties.c:580
+msgid "Only for set up devices"
+msgstr ""
 
-#: ../file-share-properties.glade.h:5
-msgid "_Require password:"
-msgstr "_Потребна е лозинка:"
+#: ../src/file-share-properties.c:585
+msgid "Ask"
+msgstr ""
 
 #. Translators: The %s will get filled in with the user name
 #. of the user, to form a genitive. If this is difficult to
@@ -81,8 +174,36 @@ msgstr "_Потребна е лозинка:"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../user_share.c:157
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "Јавни датотеки на %s"
 
+#. Translators: This is similar to the string before, only it
+#. has the hostname in it too.
+#: ../src/http.c:133
+#, c-format
+msgid "%s's public files on %s"
+msgstr ""
+
+#. Translators: %s is the name of the filename received
+#: ../src/obexpush.c:136
+#, c-format
+msgid "You received \"%s\" via Bluetooth"
+msgstr ""
+
+#: ../src/obexpush.c:138
+msgid "You received a file"
+msgstr ""
+
+#: ../src/obexpush.c:148
+msgid "Open File"
+msgstr ""
+
+#: ../src/obexpush.c:152
+msgid "Reveal File"
+msgstr ""
+
+#: ../src/obexpush.c:169
+msgid "File reception complete"
+msgstr ""
diff --git a/po/ml.po b/po/ml.po
index c559387..7e343f1 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -1,227 +1,167 @@
-# translation of ml.po to
-# translation of mateuser-share.master.ml.po to
-# translation of mateuser-share.HEAD.ml.po to
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Ani Peter <[email protected]>, 2009
-#
+# 
+# Translators:
+# Ani Peter <[email protected]>, 2009
 msgid ""
 msgstr ""
-"Project-Id-Version: ml\n"
-"Report-Msgid-Bugs-To: http://bugzilla.mateorg/enter_bug.cgi?product=mateuser-share&component=general\n"
-"POT-Creation-Date: 2010-03-27 19:35+0000\n"
-"PO-Revision-Date: 2010-04-08 17:01+0530\n"
-"Last-Translator: \n"
-"Language-Team:  <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: monsta <[email protected]>\n"
+"Language-Team: Malayalam (http://www.transifex.com/mate/MATE/language/ml/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"Language: ml\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"\n"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:1
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr ""
-"ഇതു് ട്രൂ ആണു് എങ്കില്‍, ലോഗിന്‍ ചെയ്യുമ്പോള്‍, ബ്ലൂടുത് ഡിവൈസുകള്‍ക്കു് ഉപയോക്താവിന്റെ ഡൌണ്‍ലോട് "
-"ഡയറക്ടറിയിലേക്കു് ഫയലുകള്‍ അയയ്ക്കാം."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr ""
-"ഇതു് true ആണെങ്കില്‍, ഉപയോക്താവ് ലോഗിന്‍ ചെയ്യുമ്പോള്‍, ഹോം ഡയറക്ടറിയിലുള്ള പബ്ലിക് ഡയറക്ടറി "
-"ബ്ലൂടൂത് വഴി പങ്കിടുന്നു."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:3
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr ""
-"ഇതു് true ആണെങ്കില്‍, ഉപയോക്താവ് ലോഗിന്‍ ചെയ്യുമ്പോള്‍, ഹോം ഡയറക്ടറിയിലുള്ള പബ്ലിക് ഡയറക്ടറി "
-"നെറ്റ്‌വര്‍ക്ക് വഴി പങ്കിടുന്നു."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:4
-msgid "Share Public directory over Bluetooth"
-msgstr "ബ്ലൂടൂതില്‍ പബ്ലിക് ഡയറക്ടറി പങ്കിടുക"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:5
-msgid "Share Public directory over the network"
-msgstr "നെറ്റ്‌വര്‍ക്കില്‍ പബ്ലിക് ഡയറക്ടറി പങ്കിടുക"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:6
-msgid "When to accept files sent over Bluetooth"
-msgstr "ബ്ലൂടൂത് വഴി എപ്പോഴാണു് ഫയലുകള്‍ സ്വീകരിക്കേണ്ടതു്. "
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:7
-#| msgid ""
-#| "When to accept files sent over Bluetooth. Possible values are \"always\", "
-#| "\"bonded\", \"bonded_trusted\" and \"ask\"."
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr ""
-"ബ്ലൂടൂത് വഴി എപ്പോഴാണു് ഫയലുകള്‍ സ്വീകരിക്കേണ്ടതു്. സാധ്യമായ മൂല്ല്യങ്ങള്‍ \"always\", "
-"\"bonded\",  \"ask\"."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:8
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr ""
-"പാസ്‌വേര്‍ഡുകള്‍ക്കായി ആവശ്യപ്പെടണമോ എന്നു്. സാധ്യമായ മൂല്ല്യങ്ങള്‍ \"never\", \"on_write\", "
-"\"always\"."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:9
-msgid "When to require passwords"
-msgstr "പാസ്‌വേര്‍ഡുകള്‍ എപ്പോഴാണു് ആവശ്യപ്പടേണ്ടതു്"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "ബ്ലൂട്ടുത് ക്ലൈന്റുകള്‍ക്കു് ObexPush ഉപയോഗിച്ചു് ഫയലുകള്‍ അയയ്ക്കുവാന്‍ സാധിക്കുമോ."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:11
-msgid "Whether Bluetooth clients need to pair with the computer to send files."
-msgstr "ബ്ലൂട്ടുത് ക്ലൈന്റുകള്‍ക്കു് ഫയലുകള്‍ അയയ്ക്കുന്നതിനായി മറ്റൊരു കമ്പ്യൂട്ടറുമായി ഒത്തുപോകണമോ."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:12
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr "ബ്ലൂടൂത് ക്ലൈന്റുകളെ ഫയലുകള്‍ എഴുതുന്നതിനോ, റീഡ് ഒണ്‍ലി ആയി ഫയലുകള്‍ പങ്കിടുന്നതിനോ അനുവദിക്കണമോ എന്നു്."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:13
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "ഫയലുകള്‍ എഴുതുന്നതിനായി ബ്ലൂടൂത് ക്ലൈന്റുകളെ അനുവദിക്കണമോ എന്നു്."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "പുതുതായി ലഭ്യമാകുന്ന ഫയലുകളെപ്പറ്റി അറിയിക്കണമോ എന്നു്."
 
 #: ../data/file-share-properties.ui.h:1
-msgid "<b>Receive Files over Bluetooth</b>"
-msgstr "<b>ബ്ലൂടൂത് വഴി ഫയലുകള്‍ ലഭ്യമാകുക</b>"
+msgid "Personal File Sharing Preferences"
+msgstr "സ്വകാര്യ ഫയല്‍ പങ്കിടുന്നതിനുള്ള മുന്‍ഗണനകള്‍"
 
 #: ../data/file-share-properties.ui.h:2
-msgid "<b>Share Files over Bluetooth</b>"
-msgstr "<b>ബ്ലൂടൂത് വഴി ഫയലുകള്‍ പങ്കിടുക</b>"
-
-#: ../data/file-share-properties.ui.h:3
 msgid "<b>Share Files over the Network</b>"
 msgstr "<b>നെറ്റ്‌വര്‍ക്കില്‍ ഫയലുകള്‍ പങ്കിടുക</b>"
 
+#: ../data/file-share-properties.ui.h:3
+msgid "_Share public files on network"
+msgstr "പബ്ലിക് ഫയലുകള്‍ നെറ്റ്‌വര്‍ക്കില്‍ _പങ്കിടുക"
+
 #: ../data/file-share-properties.ui.h:4
-msgid "Allo_w remote devices to delete files"
-msgstr "ഫയലുകള്‍ നീക്കം ചെയ്യുന്നതിനായി റിമോട്ട് ഡിവൈസുകളെ _അനുവദിക്കുക."
+msgid "_Password:"
+msgstr "_പാസ്‌വേര്‍ഡ്:"
 
 #: ../data/file-share-properties.ui.h:5
-msgid "Personal File Sharing Preferences"
-msgstr "സ്വകാര്യ ഫയല്‍ പങ്കിടുന്നതിനുള്ള മുന്‍ഗണനകള്‍"
+msgid "_Require password:"
+msgstr "പാസ്‌വേര്‍ഡ് _ആവശ്യമുണ്ടു്:"
 
 #: ../data/file-share-properties.ui.h:6
-msgid "Receive files in _Downloads folder over Bluetooth"
-msgstr "ബ്ലൂടൂതിലുള്ള _Downloads ഫോള്‍ഡറില്‍ ഫയലുകള്‍ ലഭ്യമാക്കുക"
+msgid "<b>Share Files over Bluetooth</b>"
+msgstr "<b>ബ്ലൂടൂത് വഴി ഫയലുകള്‍ പങ്കിടുക</b>"
 
 #: ../data/file-share-properties.ui.h:7
-msgid "Require re_mote devices to bond with this computer"
-msgstr "ഈ കമ്പ്യൂട്ടറുമായി ചേര്‍ന്നുപോകുന്നതിനായി _റിമോട്ട് ഡിവൈസുകള്‍ ആവശ്യമുണ്ടു്"
-
-#: ../data/file-share-properties.ui.h:8
 msgid "Share public files over _Bluetooth"
 msgstr "_ബ്ലൂടൂത് വഴി പബ്ലിക് ഫയലുകള്‍ പങ്കിടുക"
 
+#: ../data/file-share-properties.ui.h:8
+msgid "Allo_w remote devices to delete files"
+msgstr "ഫയലുകള്‍ നീക്കം ചെയ്യുന്നതിനായി റിമോട്ട് ഡിവൈസുകളെ _അനുവദിക്കുക."
+
 #: ../data/file-share-properties.ui.h:9
-msgid "_Accept files: "
-msgstr "ഫയലുകള്‍ _സ്വീകരിക്കുക:"
+msgid "Require re_mote devices to bond with this computer"
+msgstr "ഈ കമ്പ്യൂട്ടറുമായി ചേര്‍ന്നുപോകുന്നതിനായി _റിമോട്ട് ഡിവൈസുകള്‍ ആവശ്യമുണ്ടു്"
 
 #: ../data/file-share-properties.ui.h:10
-msgid "_Notify about received files"
-msgstr "ലഭ്യമായ ഫയലുകളെക്കുറിച്ചു് _അറിയിക്കുക"
+msgid "<b>Receive Files over Bluetooth</b>"
+msgstr "<b>ബ്ലൂടൂത് വഴി ഫയലുകള്‍ ലഭ്യമാകുക</b>"
 
 #: ../data/file-share-properties.ui.h:11
-msgid "_Password:"
-msgstr "_പാസ്‌വേര്‍ഡ്:"
+msgid "Receive files in _Downloads folder over Bluetooth"
+msgstr "ബ്ലൂടൂതിലുള്ള _Downloads ഫോള്‍ഡറില്‍ ഫയലുകള്‍ ലഭ്യമാക്കുക"
 
 #: ../data/file-share-properties.ui.h:12
-msgid "_Require password:"
-msgstr "പാസ്‌വേര്‍ഡ് _ആവശ്യമുണ്ടു്:"
+msgid "_Accept files: "
+msgstr "ഫയലുകള്‍ _സ്വീകരിക്കുക:"
 
 #: ../data/file-share-properties.ui.h:13
-msgid "_Share public files on network"
-msgstr "പബ്ലിക് ഫയലുകള്‍ നെറ്റ്‌വര്‍ക്കില്‍ _പങ്കിടുക"
+msgid "_Notify about received files"
+msgstr "ലഭ്യമായ ഫയലുകളെക്കുറിച്ചു് _അറിയിക്കുക"
 
-#: ../data/mateuser-share-properties.desktop.in.h:1
-#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
+
+#: ../data/mate-user-share-properties.desktop.in.h:1
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "സ്വകാര്യ ഫയല്‍ പങ്കിടല്‍"
 
-#: ../data/mateuser-share-properties.desktop.in.h:2
+#: ../data/mate-user-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "ഫയലുകള്‍ പങ്കിടുന്നതിനുള്ള മുന്‍ഗണനകള്‍"
 
-#: ../data/mateuser-share.desktop.in.in.h:1
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "പ്രവര്‍ത്തന സജ്ജമെങ്കില്‍ സ്വകാര്യ ഫയല്‍ പങ്കിടല്‍ ലഭ്യമാക്കുക"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "മുന്‍ഗണനകള്‍ ലഭ്യമാക്കുക"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr ""
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr ""
 
-#: ../src/caja-share-bar.c:187
-#| msgid "Personal File Sharing Preferences"
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr ""
+
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "സ്വകാര്യ ഫയല്‍ പങ്കിടുന്നതിനുള്ള മുന്‍ഗണനകള്‍ ലഭ്യമാക്കുക"
 
-#: ../src/share-extension.c:82
-#| msgid "Personal File Sharing Preferences"
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "സ്വകാര്യ ഫയല്‍ പങ്കിടുന്നതിനുള്ള മുന്‍ഗണനകള്‍ ലഭ്യമാക്കുവാന്‍ സാധ്യമല്ല"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "ഈ ഫോള്‍ഡറില്‍ നിന്നും നിങ്ങള്‍ക്കു് ഫയലുകള്‍ പങ്കിടുവാനും അതിലേക്കു് അയയ്ക്കുവാനും സാധിക്കുന്നു"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr ""
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "നെറ്റ്‌വര്‍ക്ക് അല്ലെങ്കില്‍ ബ്ലൂടൂത് വഴി ഈ ഫോള്‍ഡറില്‍ നിന്നും നിങ്ങള്‍ക്കു് ഫയലുകള്‍ പങ്കിടുവാനും സാധിക്കുന്നു"
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr ""
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "ബ്ലൂടൂത് വഴി നിങ്ങള്‍ക്കു് ഈ ഫോള്‍ഡറില്‍ ഫയലുകള്‍ ലഭ്യമാക്കാം"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr ""
 
-#: ../src/file-share-properties.c:436
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr ""
+
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "കാരണമില്ല"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "സഹായത്തിനുള്ള വിശദാംശങ്ങള്‍ ലഭ്യമാക്കുവാന്‍ സാധിച്ചില്ല."
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "ഇന്റര്‍ഫെയിസ് നിര്‍മ്മിക്കുവാന്‍ സാധിച്ചില്ല."
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "ഒരിക്കലും വേണ്ട"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "ഫയലുകളിലേക്കു് ഡേറ്റാ സൂക്ഷിക്കുമ്പോള്‍"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "എപ്പോഴും"
 
-#: ../src/file-share-properties.c:598
-#| msgid "Only for Bonded devices"
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "സജ്ജമാക്കിയ ഡിവൈസുകള്‍ക്കു് മാത്രം"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "ചോദിക്കുക"
 
@@ -234,37 +174,36 @@ msgstr "ചോദിക്കുക"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "%s'-നുള്ള പബ്ലിക് ഫയലുകള്‍"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "%s'-നുള്ള പബ്ലിക് ഫയലുകള്‍ - %s-ല്‍"
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "നിങ്ങള്‍ക്കു് ബ്ലൂടൂത് വഴി \"%s\" ലഭിച്ചിരിക്കുന്നു."
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "നിങ്ങള്‍ക്കു് ഒരു ഫയല്‍ ലഭിച്ചിരിക്കുന്നു"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "ഫയല്‍ തുറക്കുക"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "ഫയല്‍ കാണിക്കുക"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "ഫയല്‍ റിസപ്ഷന്‍ പൂര്‍ത്തിയാക്കി"
-
diff --git a/po/mr.po b/po/mr.po
index ea0ffbc..0cc9b70 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -10,85 +10,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-26 22:51+0200\n"
-"PO-Revision-Date: 2014-06-21 14:57+0000\n"
-"Last-Translator: Vaibhav S Dalvi <[email protected]>\n"
-"Language-Team: Marathi (http://www.transifex.com/projects/p/MATE/language/mr/)\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: monsta <[email protected]>\n"
+"Language-Team: Marathi (http://www.transifex.com/mate/MATE/language/mr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: mr\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/desktop_mate_file_sharing.schemas.in.h:1
-msgid "Share Public directory over the network"
-msgstr "जाळं वरील Public डिरेक्ट्री सहभागीय करा"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr "खरे असल्यास, प्रवेश केल्यावर वापरकर्त्याची मुख्य डिरेक्ट्री अंतर्गत Public डिरेक्ट्री जाळंवर सहभागीय केले जाईल."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:3
-msgid "When to require passwords"
-msgstr "परवलीचा शब्दाची आवश्यकता कधी पडते"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:4
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr "परवलीचा शब्द करीता कधी विचारायचे. संभाव्य मूल्य खालिल नुरूप आहे \"never\", \"on_write\", व\"always\"."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:5
-msgid "Share Public directory over Bluetooth"
-msgstr "Bluetooth वरील Public डिरेक्ट्री सहभागीय करा"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:6
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr "खरे असल्यास, प्रवेश केल्यावर वापरकर्त्याची मुख्य डिरेक्ट्री अंतर्गत Public डिरेक्ट्री Bluetooth वर सहभागीय केले जाईल."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:7
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "Bluetooth क्लाऐंटला फाइल लेखन करीता परवानगी द्यायची का."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:8
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr "Bluetooth क्लाऐंटला फाइल लेखन, किंवा केवळ-वाचनीय या नुरूप सहभागीय करण्यास परवानगी द्यायची का."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:9
-msgid ""
-"Whether Bluetooth clients need to pair with the computer to send files."
-msgstr "फाइल पाठवण्याकरीता Bluetooth क्लाऐंटला संगणकाशी जुळविण्याची आवश्यकता आहे का."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "ObexPush चा वापर करून Bluetooth क्लाऐंट फाइल पाठवू शकतो का."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:11
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr "खरे असल्यास, प्रवेश केल्यावर Bluetooth साधन वापरकर्त्याचे डाऊनलोड डिरेक्ट्री करीता फाइल पाठवू शकते."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:12
-msgid "When to accept files sent over Bluetooth"
-msgstr "Bluetooth वरील फाइलं कधी स्वीकारायचे"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:13
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr "Bluetooth वरील फाइलं कधी स्वीकारायचे. संभाव्य मुल्ये \"always\", \"bonded\" आणि \"ask\"."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "नवीन प्राप्य फाइल विषयी सूचीत करायचे का."
-
 #: ../data/file-share-properties.ui.h:1
 msgid "Personal File Sharing Preferences"
 msgstr "व्यक्तिगत फाइल शेअरींग पसंती"
@@ -141,8 +72,16 @@ msgstr "फाइलं स्वीकारा (_A): "
 msgid "_Notify about received files"
 msgstr "प्राप्य फाइलं विषयी सूचीत करा (_N)"
 
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
+
 #: ../data/mate-user-share-properties.desktop.in.h:1
-#: ../data/mate-user-share.desktop.in.in.h:1 ../src/caja-share-bar.c:162
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "वैयक्तिक फाइल सहभागीय करा"
 
@@ -150,63 +89,81 @@ msgstr "वैयक्तिक फाइल सहभागीय करा"
 msgid "Preferences for sharing of files"
 msgstr "फाइल शेअर करण्यासाठी पसंती"
 
-#: ../data/mate-user-share.desktop.in.in.h:2
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "कार्यक्षम असल्यास व्यक्तिगत फाइल शेअरींग प्रक्षेपीत करा"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "प्राधान्यक्रम सुरु करा"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr ""
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr ""
 
-#: ../src/caja-share-bar.c:187
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr ""
+
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "व्यक्तिगत फाइल शेअरींग पसंती सुरु करा"
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "व्यक्तिगत फाइल शेअरींग पसंती सुरु करू शकले नाही"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "तुम्ही या फोल्डरमधून फ़ाइल्स देऊ आणि घेऊ शकता "
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr ""
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "तुम्ही या फोल्डरमधून फ़ाइल्स संजाळ आणि ब्लुटूथवर देऊ आणि घेऊ शकता "
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr ""
+
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr ""
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "तुम्ही या फोल्डरमधून फ़ाइल्स ब्लुटूथवर घेऊ शकता "
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr ""
 
-#: ../src/file-share-properties.c:436
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "कारण नाही"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "मदत अंतर्भूत माहिती प्रदर्शित करण्यास अशक्य."
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "संवाद बांधणी शक्य नाही."
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "कधिच नाही"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "फाइल लिहीतेवेळी"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "नेहमी"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "फक्त सेट केलेल्या साधनांसाठी"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "विचारा"
 
@@ -219,36 +176,36 @@ msgstr "विचारा"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "%s चे public फाइल"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "%2$s वरील %1$s चे public फाइल"
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "तुमच्याकडे Bluetooth द्वारे \"%s\" प्राप्त झाले"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "तुम्हाला फाइल प्राप्त झाले"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "फाइल उघडा"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "फाइल निश्चित करा"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr ""
diff --git a/po/ms.po b/po/ms.po
index 0f5da3d..aa263d5 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -3,90 +3,21 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# abuyop <[email protected]>, 2013
+# abuyop <[email protected]>, 2013,2015
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-26 22:51+0200\n"
-"PO-Revision-Date: 2013-07-09 07:59+0000\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
 "Last-Translator: abuyop <[email protected]>\n"
-"Language-Team: Malay (http://www.transifex.com/projects/p/MATE/language/ms/)\n"
+"Language-Team: Malay (http://www.transifex.com/mate/MATE/language/ms/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ms\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/desktop_mate_file_sharing.schemas.in.h:1
-msgid "Share Public directory over the network"
-msgstr "Kongsi direktori Awam menerusi rangkaian"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr "Jika ini benar, direktori Awam dalam direktori rumah pengguna akan dikongsi menerusi rangkaian bila pengguna mendaftar masuk."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:3
-msgid "When to require passwords"
-msgstr "Bila memerlukan kata laluan"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:4
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr "Bila hendak menanya kata lauan. Nilai yang mungkin adalah \"never\", \"on_write\", dan \"always\"."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:5
-msgid "Share Public directory over Bluetooth"
-msgstr "Kongsi direktori Awam menerusi Bluetooth"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:6
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr "Jika ini benar, direktori Awam dalam direktori rumah pengguna akan dikongsi melalui Bluettoh bila pengguna telah mendaftar masuk."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:7
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "Sama ada hendak benarkan klien Bluetooth menulis fail."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:8
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr "Sama ada benarkan klien Bluetooth menulis fail, atau kongsi fail baca-sahaja."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:9
-msgid ""
-"Whether Bluetooth clients need to pair with the computer to send files."
-msgstr "Sama ada klien Bluetooth perlu dipasangkan dengan komputer untuk menghantar fail."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "Sama ada hendak benarkan klien Bluetooth menghantar fail menggunakan ObexPush."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:11
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr "Jika ini benar, peranti Bluetooth boleh menghantar fail ke direktori Muat Turun Pengguna bila mendaftar masuk."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:12
-msgid "When to accept files sent over Bluetooth"
-msgstr "Bila hendak menerima fail yang dihantar menerusi Bluetooth"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:13
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr "Bila menerima fail yang dihantar menerusi Bluetooth. Nilai yang mungkin adalah \"always\", \"bonded\" dan \"ask\"."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "Sam ada hendak dimaklum mengenai fail yang baru sahaja diterima."
-
 #: ../data/file-share-properties.ui.h:1
 msgid "Personal File Sharing Preferences"
 msgstr "Keutamaan Perkongsian Fail Peribadi"
@@ -139,8 +70,16 @@ msgstr "_Terima fail:"
 msgid "_Notify about received files"
 msgstr "_Maklum mengenai fail diterima"
 
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr "Kongsi Pengguna"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr "Sepadukan dengan kongs-pengguna"
+
 #: ../data/mate-user-share-properties.desktop.in.h:1
-#: ../data/mate-user-share.desktop.in.in.h:1 ../src/caja-share-bar.c:162
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "Perkongsian Fail Peribadi"
 
@@ -148,63 +87,81 @@ msgstr "Perkongsian Fail Peribadi"
 msgid "Preferences for sharing of files"
 msgstr "Keutamaan untuk perkongsian fail"
 
-#: ../data/mate-user-share.desktop.in.in.h:2
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr "Perkongsian Fail Peribadi obexftp"
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Lacar Perkongsian Fail Peribadi jika dibenarkan"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "Lancar Keutamaan"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr "Perkongsian Fail Peribadi obexpush"
 
-#: ../src/caja-share-bar.c:187
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr "Perkongsian Fail Peribadi webdav"
+
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr "Keutamaan"
+
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Lancar Keutamaan Perkongsian Fail Peribadi"
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "Tidak dapat lancarkan keutamaan Perkongsian Fail Peribadi"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "Anda boleh kongsi fail dari folder ini dan terima fail kepadanya"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr "Mungkin digunakan untuk kongsi atau terima fail"
+
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr "Mungkin dikongsi melalui rangkaian atau Bluetooth"
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "Anda boleh kongsi fail dari folder ini melalui rangkaian dan Bluetooth"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr "Mungkin dikongsi melalui rangkaian"
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "Anda boleh kongsi fail melalui Bluetooth ke dalam folder ini"
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr "Mungkin digunakan untuk terima fail melalui Bluetooth"
 
-#: ../src/file-share-properties.c:436
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "Tiada sebab"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "Tidak dapat papar kandungan bantuan."
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "Tidak dapat bina antaramuka"
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "Tidak Sesekali"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "Bila menulis fail"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "Sentiasa"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "Hanya untuk persediaan peranti"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "Tanya"
 
@@ -217,36 +174,36 @@ msgstr "Tanya"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "fail awam %s"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "Fail awam %s dalam %s"
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "Anda telah menerima \"%s\" melalui Bluetooth"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "Anda telah menerima satu fail"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "Buka Fail"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "Dedah Fail"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "Penerimaan fail selesai"
diff --git a/po/nb.po b/po/nb.po
index 987b5bc..aa9806d 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Allan Nordhøy <[email protected]>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-11-06 15:07+0300\n"
-"PO-Revision-Date: 2016-02-10 19:57+0000\n"
-"Last-Translator: Vlad Orlov <[email protected]>\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: Allan Nordhøy <[email protected]>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/mate/MATE/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -71,11 +72,11 @@ msgstr "Varsle om _mottatte filer"
 
 #: ../data/libcaja-user-share.caja-extension.in.in.h:1
 msgid "User Share"
-msgstr ""
+msgstr "Brukerdeling"
 
 #: ../data/libcaja-user-share.caja-extension.in.in.h:2
 msgid "Integrates with user-share"
-msgstr ""
+msgstr "Integrerer med bruker-deling"
 
 #: ../data/mate-user-share-properties.desktop.in.h:1
 #: ../src/caja-share-bar.c:103
@@ -88,7 +89,7 @@ msgstr "Brukervalg for deling av filer"
 
 #: ../data/mate-user-share-obexftp.desktop.in.in.h:1
 msgid "Personal File Sharing obexftp"
-msgstr ""
+msgstr "Personlig fildeling obexftp"
 
 #: ../data/mate-user-share-obexftp.desktop.in.in.h:2
 #: ../data/mate-user-share-obexpush.desktop.in.in.h:2
@@ -98,11 +99,11 @@ msgstr "Start brukerdeling hvis aktivert"
 
 #: ../data/mate-user-share-obexpush.desktop.in.in.h:1
 msgid "Personal File Sharing obexpush"
-msgstr ""
+msgstr "Personlig fildeling obexpush"
 
 #: ../data/mate-user-share-webdav.desktop.in.in.h:1
 msgid "Personal File Sharing webdav"
-msgstr ""
+msgstr "Personlig fildeling webdav"
 
 #: ../src/caja-share-bar.c:117
 msgid "Preferences"
@@ -118,19 +119,19 @@ msgstr "Kan ikke starte brukervalg for deling av personlige filer"
 
 #: ../src/share-extension.c:179
 msgid "May be used to share or receive files"
-msgstr ""
+msgstr "Kan brukes til å dele eller motta filer over Blåtann"
 
 #: ../src/share-extension.c:181
 msgid "May be shared over the network or Bluetooth"
-msgstr ""
+msgstr "Kan deles over nettverk eller Blåtann"
 
 #: ../src/share-extension.c:184
 msgid "May be shared over the network"
-msgstr ""
+msgstr "Kan deles over nettverket"
 
 #: ../src/share-extension.c:190
 msgid "May be used to receive files over Bluetooth"
-msgstr ""
+msgstr "Kan brukes til å motta filer over Blåtann"
 
 #: ../src/file-share-properties.c:417
 msgid "No reason"
diff --git a/po/ne.po b/po/ne.po
index b7d7c1a..1b05e4b 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -15,7 +15,7 @@ msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-11-06 15:07+0300\n"
-"PO-Revision-Date: 2016-01-10 22:29+0000\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
 "Last-Translator: Sven Keeter <[email protected]>\n"
 "Language-Team: Nepali (http://www.transifex.com/mate/MATE/language/ne/)\n"
 "MIME-Version: 1.0\n"
diff --git a/po/nl.po b/po/nl.po
index 2885708..944a7f7 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,234 +1,172 @@
-# Dutch translation of mateuser-share.
-#
-# This file is distributed under the same license as the mateuser-share package.
-#
-# Tino Meinen <[email protected]>, 2005–2006
-# Wouter Bolsterlee <wbolster@mateorg>, 2010.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# René Devers <[email protected]>, 2015
+# Volluta <[email protected]>, 2015
+# Wouter Bolsterlee <wbolster@mateorg>, 2010
 msgid ""
 msgstr ""
-"Project-Id-Version: mateuser-share\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-20 17:46+0100\n"
-"PO-Revision-Date: 2010-03-20 17:46+0100\n"
-"Last-Translator: Wouter Bolsterlee <wbolster@mateorg>\n"
-"Language-Team: Dutch <[email protected]>\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: Volluta <[email protected]>\n"
+"Language-Team: Dutch (http://www.transifex.com/mate/MATE/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-
-# ingelogd/aangemeld
-# aangemeld bij wat, zou je je kunnen afvragen
-#: ../data/desktop_matefile_sharing.schemas.in.h:1
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr ""
-"Indien ingeschakeld kunnen Bluetooth-apparaten bestanden versturen naar de "
-"Downloadmap van de aangemelde gebruiker."
-
-# ingelogd/aangemeld
-# aangemeld bij wat, zou je je kunnen afvragen
-#: ../data/desktop_matefile_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr ""
-"Indien ingeschakeld worden bestanden in de publieke gebruikersmap gedeeld "
-"via Bluetooth wanneer de gebruiker aangemeld is."
-
-# ingelogd/aangemeld
-# aangemeld bij wat, zou je je kunnen afvragen
-#: ../data/desktop_matefile_sharing.schemas.in.h:3
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr ""
-"Indien ingeschakeld worden bestanden in de publieke gebruikersmap gedeeld "
-"via het netwerk wanneer de gebruiker aangemeld is."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:4
-msgid "Share Public directory over Bluetooth"
-msgstr "Publieke map delen via Bluetooth"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:5
-msgid "Share Public directory over the network"
-msgstr "Publieke bestanden delen op het netwerk"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:6
-msgid "When to accept files sent over Bluetooth"
-msgstr "Wanneer via Bluetooth verzonden bestanden te accepteren"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:7
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr ""
-"Wanneer via Bluetooth verzonden bestanden worden geaccepteerd. Mogelijke "
-"waarden zijn ‘always’, ‘bonded’ en ‘ask’."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:8
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr ""
-"Wanneer er om wachtwoorden moet worden gevraagd, mogelijke opties: \"never"
-"\" (nooit), \"on_write\" (bij schrijven), \"always\" (altijd)"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:9
-msgid "When to require passwords"
-msgstr "Wanneer wachtwoorden worden geeist"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "Of Bluetooth-clients bestanden kunnen sturen via ObexPush."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:11
-msgid "Whether Bluetooth clients need to pair with the computer to send files."
-msgstr ""
-"Of Bluetooth-clients gekoppeld moetebn zijn met de computer om bestanden te "
-"kunnen sturen."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:12
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr ""
-"Of Bluetooth-clients bestanden kunnen schrijven, of enkel bestanden als "
-"alleen-lezen kunnen delen."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:13
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "Of Bluetooth-clients bestanden mogen schrijven."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr ""
-"Of de gebruiker gewaarschuwd moet worden bij nieuw ontvangen bestanden."
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/file-share-properties.ui.h:1
-msgid "<b>Receive Files over Bluetooth</b>"
-msgstr "<b>Bestanden ontvangen via Bluetooth</b>"
+msgid "Personal File Sharing Preferences"
+msgstr "Voorkeuren persoonlijke bestanden delen"
 
 #: ../data/file-share-properties.ui.h:2
-msgid "<b>Share Files over Bluetooth</b>"
-msgstr "<b>Bestanden delen via Bluetooth</b>"
-
-#: ../data/file-share-properties.ui.h:3
 msgid "<b>Share Files over the Network</b>"
 msgstr "<b>Bestanden delen op het netwerk</b>"
 
+#: ../data/file-share-properties.ui.h:3
+msgid "_Share public files on network"
+msgstr "_Publieke bestanden delen op het netwerk"
+
 #: ../data/file-share-properties.ui.h:4
-msgid "Allo_w remote devices to delete files"
-msgstr "Andere apparaten toestaan bestanden te ver_wijderen"
+msgid "_Password:"
+msgstr "_Wachtwoord:"
 
 #: ../data/file-share-properties.ui.h:5
-msgid "Personal File Sharing Preferences"
-msgstr "Voorkeuren persoonlijke bestanden delen"
+msgid "_Require password:"
+msgstr "Wachtwoord _vereisen:"
 
 #: ../data/file-share-properties.ui.h:6
-msgid "Receive files in _Downloads folder over Bluetooth"
-msgstr "Bestanden in _Download-map ontvangen via Bluetooth"
+msgid "<b>Share Files over Bluetooth</b>"
+msgstr "<b>Bestanden delen via Bluetooth</b>"
 
 #: ../data/file-share-properties.ui.h:7
-msgid "Require re_mote devices to bond with this computer"
-msgstr "Vereisen dat andere apparaten _aankoppelen met deze computer"
-
-#: ../data/file-share-properties.ui.h:8
 msgid "Share public files over _Bluetooth"
 msgstr "Publieke bestanden delen via _Bluetooth"
 
+#: ../data/file-share-properties.ui.h:8
+msgid "Allo_w remote devices to delete files"
+msgstr "Andere apparaten toestaan bestanden te ver_wijderen"
+
 #: ../data/file-share-properties.ui.h:9
-msgid "_Accept files: "
-msgstr "Bestanden _accepteren: "
+msgid "Require re_mote devices to bond with this computer"
+msgstr "Vereisen dat andere apparaten _aankoppelen met deze computer"
 
 #: ../data/file-share-properties.ui.h:10
-msgid "_Notify about received files"
-msgstr "_Waarschuwen bij ontvangen bestanden"
+msgid "<b>Receive Files over Bluetooth</b>"
+msgstr "<b>Bestanden ontvangen via Bluetooth</b>"
 
 #: ../data/file-share-properties.ui.h:11
-msgid "_Password:"
-msgstr "_Wachtwoord:"
+msgid "Receive files in _Downloads folder over Bluetooth"
+msgstr "Bestanden in _Download-map ontvangen via Bluetooth"
 
 #: ../data/file-share-properties.ui.h:12
-msgid "_Require password:"
-msgstr "Wachtwoord _vereisen:"
+msgid "_Accept files: "
+msgstr "Bestanden _accepteren: "
 
 #: ../data/file-share-properties.ui.h:13
-msgid "_Share public files on network"
-msgstr "_Publieke bestanden delen op het netwerk"
+msgid "_Notify about received files"
+msgstr "_Waarschuwen bij ontvangen bestanden"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr "User Share"
 
-# persoonlijk/uw
-#: ../data/mateuser-share-properties.desktop.in.h:1
-#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr "Integreert met user-share"
+
+#: ../data/mate-user-share-properties.desktop.in.h:1
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "Uw bestanden delen"
 
-#: ../data/mateuser-share-properties.desktop.in.h:2
+#: ../data/mate-user-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Voorkeuren voor het delen van uw bestanden"
 
-#: ../data/mateuser-share.desktop.in.in.h:1
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr "Persoonlijke Bestanden Delen obexftp"
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "‘Persoonlijke bestanden delen’ opstarten indien ingeschakeld"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "Voorkeuren opstarten"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr "Persoonlijke Bestanden Delen obexpush"
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr "Persoonlijke Bestanden Delen webdav"
 
-#: ../src/caja-share-bar.c:187
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr "Voorkeuren"
+
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Voorkeuren voor persoonlijke bestanden delen openen"
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "Kon de voorkeuren voor persoonlijke bestanden delen niet openen"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "U kunt bestanden in deze map delen en er bestanden ontvangen"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr "Kan gebruikt worden om bestanden te delen of te ontvangen "
+
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr "Kan gedeeld worden via het netwerk of Bluetooth"
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "U kunt bestanden in deze map via het netwerk en via Bluetooth delen"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr "Kan gedeeld worden via het netwerk"
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "U kunt in deze map bestanden via Bluetooth ontvangen"
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr "Kan gebruikt worden om bestanden te ontvangen via Bluetooth"
 
-#: ../src/file-share-properties.c:436
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "Geen reden"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "Kon hulp niet weergeven."
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "Kon interface niet bouwen."
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "Nooit"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "Bij het schrijven van bestanden"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "Altijd"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "Alleen voor ingestelde apparaten"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "Vragen"
 
-# gedeelde/publieke
 #. Translators: The %s will get filled in with the user name
 #. of the user, to form a genitive. If this is difficult to
 #. translate correctly so that it will work correctly in your
@@ -238,46 +176,36 @@ msgstr "Vragen"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "%s's publieke bestanden"
 
-# publieke/gedeelde
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "%s's publieke bestanden op %s"
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "U heeft ‘%s’ via Bluetooth ontvangen"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "U heeft een bestand ontvangen"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "Bestand openen"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "Bestand tonen"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "Bestandsoverdracht compleet"
-
-#~ msgid "User Sharing"
-#~ msgstr "Persoonlijke bestanden delen"
-
-#~ msgid "Please log in as the user guest"
-#~ msgstr "Gelieve in te loggen als gebruiker ‘guest’"
-
-#~ msgid "Only for Bonded and Trusted devices"
-#~ msgstr "Alleen voro gekoppelde en vertrouwde apparaten"
diff --git a/po/nn.po b/po/nn.po
index 24317a3..a0dc3af 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -1,221 +1,167 @@
-# Norwegian Nynorsk translation for mateuser-share.
-# Copyright (C) 2010 mateuser-share's COPYRIGHT HOLDER
-# This file is distributed under the same license as the mateuser-share package.
-# Torstein Adolf Winterseth <[email protected]>, 2010.
-# Torstein Adolf Winterseth <[email protected]>, 2010.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Torstein Adolf Winterseth <[email protected]>, 2010
 msgid ""
 msgstr ""
-"Project-Id-Version: mateuser-share master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.mateorg/enter_bug.cgi?product=mate"
-"user-share&component=general\n"
-"POT-Creation-Date: 2010-03-30 20:22+0000\n"
-"PO-Revision-Date: 2010-04-03 12:57+0200\n"
-"Last-Translator: Torstein Adolf Winterseth <[email protected]>\n"
-"Language-Team: Norwegian Nynorsk <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: monsta <[email protected]>\n"
+"Language-Team: Norwegian Nynorsk (http://www.transifex.com/mate/MATE/language/nn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/desktop_matefile_sharing.schemas.in.h:1
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr ""
-"Om denne er sann så vil blåtanneiningar kunne senda filer til "
-"nedlastningsmappa til brukaren når han er logga på."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr ""
-"Om denne er sann så vil den offentlege mappa i heimemappa til brukaren verta "
-"delt over blåtann når brukaren er logga på."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:3
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr ""
-"Om denne er sann så vil den offentlege mappa i heimemappa til brukaren verta "
-"delt over nettverket når brukaren er logga på."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:4
-msgid "Share Public directory over Bluetooth"
-msgstr "Del den offentlege mappa over blåtann"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:5
-msgid "Share Public directory over the network"
-msgstr "Del den offentlege mappa over nettverket"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:6
-msgid "When to accept files sent over Bluetooth"
-msgstr "Når filer sendt over blåtann skal godtakast"
-
-# «bonded»?
-#: ../data/desktop_matefile_sharing.schemas.in.h:7
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr ""
-"Når filer sendt over blåtann skal godtakast. Moglege verdiar er "
-"«always» (alltid), «bonded» (bunde) og «ask» (spør)."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:8
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr ""
-"Når passord skal spørjast etter. Moglege verdiar er «never» (aldri), "
-"«on_write» (under tilskriving) og «always» (alltid)."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:9
-msgid "When to require passwords"
-msgstr "Når passord skal spørjast etter"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "Om blåtannklientar kan senda filer ved bruk av ObexPush."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:11
-msgid "Whether Bluetooth clients need to pair with the computer to send files."
-msgstr "Om blåtannklientar må para med datamaskina for å senda filer"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:12
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr ""
-"Om blåtannklientar kan skriva filer, eller berre dela filene med berre-"
-"lesbar-løyve."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:13
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "Om blåtannklientar kan skriva filer."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "Om det skal sendast varsel om nyleg mottekne filer."
-
 #: ../data/file-share-properties.ui.h:1
-msgid "<b>Receive Files over Bluetooth</b>"
-msgstr "<b>Tek imot filer over blåtann</b>"
+msgid "Personal File Sharing Preferences"
+msgstr "Personleg delingsinnstillingar"
 
 #: ../data/file-share-properties.ui.h:2
-msgid "<b>Share Files over Bluetooth</b>"
-msgstr "<b>Del filer over blåtann</b>"
-
-#: ../data/file-share-properties.ui.h:3
 msgid "<b>Share Files over the Network</b>"
 msgstr "<b>Del filer over nettverket</b>"
 
+#: ../data/file-share-properties.ui.h:3
+msgid "_Share public files on network"
+msgstr "_Del offentlege filer på nettverket"
+
 #: ../data/file-share-properties.ui.h:4
-msgid "Allo_w remote devices to delete files"
-msgstr "_Tillat eksterne einingar å sletta filer"
+msgid "_Password:"
+msgstr "_Passord:"
 
 #: ../data/file-share-properties.ui.h:5
-msgid "Personal File Sharing Preferences"
-msgstr "Personleg delingsinnstillingar"
+msgid "_Require password:"
+msgstr "_Krev passord:"
 
 #: ../data/file-share-properties.ui.h:6
-msgid "Receive files in _Downloads folder over Bluetooth"
-msgstr "Motta filer i _nedlastningsmappa over blåtann"
+msgid "<b>Share Files over Bluetooth</b>"
+msgstr "<b>Del filer over blåtann</b>"
 
 #: ../data/file-share-properties.ui.h:7
-msgid "Require re_mote devices to bond with this computer"
-msgstr "Krev at _eksterne einingar må bindast med denne maskina"
-
-#: ../data/file-share-properties.ui.h:8
 msgid "Share public files over _Bluetooth"
 msgstr "Del offentlege filer over _blåtann"
 
+#: ../data/file-share-properties.ui.h:8
+msgid "Allo_w remote devices to delete files"
+msgstr "_Tillat eksterne einingar å sletta filer"
+
 #: ../data/file-share-properties.ui.h:9
-msgid "_Accept files: "
-msgstr "_Ta imot filer:"
+msgid "Require re_mote devices to bond with this computer"
+msgstr "Krev at _eksterne einingar må bindast med denne maskina"
 
 #: ../data/file-share-properties.ui.h:10
-msgid "_Notify about received files"
-msgstr "_Varsla om motekne filer"
+msgid "<b>Receive Files over Bluetooth</b>"
+msgstr "<b>Tek imot filer over blåtann</b>"
 
 #: ../data/file-share-properties.ui.h:11
-msgid "_Password:"
-msgstr "_Passord:"
+msgid "Receive files in _Downloads folder over Bluetooth"
+msgstr "Motta filer i _nedlastningsmappa over blåtann"
 
 #: ../data/file-share-properties.ui.h:12
-msgid "_Require password:"
-msgstr "_Krev passord:"
+msgid "_Accept files: "
+msgstr "_Ta imot filer:"
 
 #: ../data/file-share-properties.ui.h:13
-msgid "_Share public files on network"
-msgstr "_Del offentlege filer på nettverket"
+msgid "_Notify about received files"
+msgstr "_Varsla om motekne filer"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
 
-#: ../data/mateuser-share-properties.desktop.in.h:1
-#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
+
+#: ../data/mate-user-share-properties.desktop.in.h:1
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "Personleg fildeling"
 
-#: ../data/mateuser-share-properties.desktop.in.h:2
+#: ../data/mate-user-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Innstillingar for deling av filer"
 
-#: ../data/mateuser-share.desktop.in.in.h:1
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Køyr personleg fildeling om slått på"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "Køyr innstillingar"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr ""
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr ""
+
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr ""
 
-#: ../src/caja-share-bar.c:187
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Køyr personleg fildelingsinnstillingar"
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "Klarte ikkje å køyra dei personleg delingsinnstillingar"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "Du kan dela og motta filer i denne mappa"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr ""
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "Du kan dela filer frå denne mappa over nettverket og blåtann"
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr ""
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "Du kan ta imot filer over blåtann til denne mappa"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr ""
+
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr ""
 
-#: ../src/file-share-properties.c:436
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "Ingen grunn"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "Klarte ikkje visa hjelpeinnhald"
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "Klarte ikkje byggja grensesnitt."
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "Aldri"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "Når filer skrivast"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "Alltid"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "Berre for oppsette einingar"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "Spør"
 
@@ -228,36 +174,36 @@ msgstr "Spør"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "%ss offentlege filer"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "%ss offentlege filer på %s"
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "Du mottok «%s» via blåtann"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "Du mottok ei fil"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "Opna fil"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "Openbar fil"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "Mottaking av fil fullførd"
diff --git a/po/oc.po b/po/oc.po
index e9b0632..1de9944 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -1,181 +1,166 @@
-# Translation of oc.po to Occitan
-# Occitan translation of mateuser-share.
-# Copyright (C) 2005-2006, 2007 Free Software Foundation, Inc.
-# This file is distributed under the same license as the mateuser-share package.
-#
-# Yannig Marchegay (Kokoyaya) <[email protected]>, 2006-2008
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: oc\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-02 08:59+0200\n"
-"PO-Revision-Date: 2007-11-20 14:31+0100\n"
-"Last-Translator: Yannig Marchegay (Kokoyaya) <[email protected]>\n"
-"Language-Team: Occitan <[email protected]>\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: monsta <[email protected]>\n"
+"Language-Team: Occitan (post 1500) (http://www.transifex.com/mate/MATE/language/oc/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: oc\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../data/desktop_matefile_sharing.schemas.in.h:1
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
+#: ../data/file-share-properties.ui.h:1
+msgid "Personal File Sharing Preferences"
 msgstr ""
 
-#: ../data/desktop_matefile_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
+#: ../data/file-share-properties.ui.h:2
+msgid "<b>Share Files over the Network</b>"
 msgstr ""
 
-#: ../data/desktop_matefile_sharing.schemas.in.h:3
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
+#: ../data/file-share-properties.ui.h:3
+msgid "_Share public files on network"
 msgstr ""
 
-#: ../data/desktop_matefile_sharing.schemas.in.h:4
-msgid "Share Public directory over Bluetooth"
-msgstr ""
+#: ../data/file-share-properties.ui.h:4
+msgid "_Password:"
+msgstr "Mot de _pas :"
 
-#: ../data/desktop_matefile_sharing.schemas.in.h:5
-msgid "Share Public directory over the network"
+#: ../data/file-share-properties.ui.h:5
+msgid "_Require password:"
 msgstr ""
 
-#: ../data/desktop_matefile_sharing.schemas.in.h:6
-msgid "When to accept files sent over Bluetooth"
-msgstr ""
+#: ../data/file-share-properties.ui.h:6
+msgid "<b>Share Files over Bluetooth</b>"
+msgstr "<b>Partejar de fichièrs amb Bluetooth</b>"
 
-#: ../data/desktop_matefile_sharing.schemas.in.h:7
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\", \"bonded_trusted\" and \"ask\"."
+#: ../data/file-share-properties.ui.h:7
+msgid "Share public files over _Bluetooth"
 msgstr ""
 
-#: ../data/desktop_matefile_sharing.schemas.in.h:8
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
+#: ../data/file-share-properties.ui.h:8
+msgid "Allo_w remote devices to delete files"
 msgstr ""
 
-#: ../data/desktop_matefile_sharing.schemas.in.h:9
-msgid "When to require passwords"
+#: ../data/file-share-properties.ui.h:9
+msgid "Require re_mote devices to bond with this computer"
 msgstr ""
 
-#: ../data/desktop_matefile_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
+#: ../data/file-share-properties.ui.h:10
+msgid "<b>Receive Files over Bluetooth</b>"
 msgstr ""
 
-#: ../data/desktop_matefile_sharing.schemas.in.h:11
-msgid "Whether Bluetooth clients need to pair with the computer to send files."
+#: ../data/file-share-properties.ui.h:11
+msgid "Receive files in _Downloads folder over Bluetooth"
 msgstr ""
 
-#: ../data/desktop_matefile_sharing.schemas.in.h:12
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
+#: ../data/file-share-properties.ui.h:12
+msgid "_Accept files: "
 msgstr ""
 
-#: ../data/desktop_matefile_sharing.schemas.in.h:13
-msgid "Whether to allow Bluetooth clients to write files."
+#: ../data/file-share-properties.ui.h:13
+msgid "_Notify about received files"
 msgstr ""
 
-#: ../data/desktop_matefile_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
 msgstr ""
 
-#: ../data/file-share-properties.glade.h:1
-msgid "<b>Receive Files over Bluetooth</b>"
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
 msgstr ""
 
-#
-#: ../data/file-share-properties.glade.h:2
-msgid "<b>Share Files over Bluetooth</b>"
-msgstr "<b>Partejar de fichièrs amb Bluetooth</b>"
-
-#
-#: ../data/file-share-properties.glade.h:3
-msgid "<b>Share Files over the network</b>"
-msgstr "<b>Partejar de fichièrs sus la ret</b>"
+#: ../data/mate-user-share-properties.desktop.in.h:1
+#: ../src/caja-share-bar.c:103
+msgid "Personal File Sharing"
+msgstr ""
 
-#: ../data/file-share-properties.glade.h:4
-msgid "Accept files: "
+#: ../data/mate-user-share-properties.desktop.in.h:2
+msgid "Preferences for sharing of files"
 msgstr ""
 
-#: ../data/file-share-properties.glade.h:5
-msgid "Allow remote devices to delete files"
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
 msgstr ""
 
-#: ../data/file-share-properties.glade.h:6
-msgid "File Sharing Preferences"
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
+msgid "Launch Personal File Sharing if enabled"
 msgstr ""
 
-#: ../data/file-share-properties.glade.h:7
-msgid "Notify about received files"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
 msgstr ""
 
-#: ../data/file-share-properties.glade.h:8
-msgid "Receive files in Downloads folder over Bluetooth"
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
 msgstr ""
 
-#: ../data/file-share-properties.glade.h:9
-msgid "Require remote devices to bond with this computer"
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr "Preferéncias"
+
+#: ../src/caja-share-bar.c:121
+msgid "Launch Personal File Sharing Preferences"
 msgstr ""
 
-#: ../data/file-share-properties.glade.h:10
-msgid "Share Public files on network"
+#: ../src/share-extension.c:73
+msgid "Unable to launch the Personal File Sharing preferences"
 msgstr ""
 
-#: ../data/file-share-properties.glade.h:11
-msgid "Share Public files over Bluetooth"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
 msgstr ""
 
-#: ../data/file-share-properties.glade.h:12
-msgid "_Password:"
-msgstr "Mot de _pas :"
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr ""
 
-#: ../data/file-share-properties.glade.h:13
-msgid "_Require password:"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
 msgstr ""
 
-#: ../data/mateuser-share-properties.desktop.in.h:1
-msgid "Personal File Sharing"
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
 msgstr ""
 
-#: ../data/mateuser-share-properties.desktop.in.h:2
-msgid "Preferences for sharing of personal files"
+#: ../src/file-share-properties.c:417
+msgid "No reason"
 msgstr ""
 
-#: ../data/mateuser-share.desktop.in.in.h:1
-msgid "Launch User Sharing if enabled"
+#: ../src/file-share-properties.c:445
+msgid "Could not display the help contents."
 msgstr ""
 
-#: ../data/mateuser-share.desktop.in.in.h:2
-msgid "User Sharing"
+#: ../src/file-share-properties.c:507
+msgid "Could not build interface."
 msgstr ""
 
-#: ../src/file-share-properties.c:493
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "Jamai"
 
-#: ../src/file-share-properties.c:496
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr ""
 
-#: ../src/file-share-properties.c:499 ../src/file-share-properties.c:522
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "Totjorn"
 
-#: ../src/file-share-properties.c:525
-msgid "Only for Bonded devices"
-msgstr ""
-
-#: ../src/file-share-properties.c:528
-msgid "Only for Paired and Trusted devices"
+#: ../src/file-share-properties.c:580
+msgid "Only for set up devices"
 msgstr ""
 
-#: ../src/file-share-properties.c:533
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr ""
 
@@ -188,14 +173,36 @@ msgstr ""
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:137
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr ""
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:141
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr ""
+
+#. Translators: %s is the name of the filename received
+#: ../src/obexpush.c:136
+#, c-format
+msgid "You received \"%s\" via Bluetooth"
+msgstr ""
+
+#: ../src/obexpush.c:138
+msgid "You received a file"
+msgstr ""
+
+#: ../src/obexpush.c:148
+msgid "Open File"
+msgstr ""
+
+#: ../src/obexpush.c:152
+msgid "Reveal File"
+msgstr ""
+
+#: ../src/obexpush.c:169
+msgid "File reception complete"
+msgstr ""
diff --git a/po/or.po b/po/or.po
index 016f93b..5e43334 100644
--- a/po/or.po
+++ b/po/or.po
@@ -1,206 +1,167 @@
-# translation of mateuser-share.master.or.po to Oriya
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
-# Manoj Kumar Giri <[email protected]>, 2009.
+# 
+# Translators:
+# Manoj Kumar Giri <[email protected]>, 2009
 msgid ""
 msgstr ""
-"Project-Id-Version: mateuser-share.master.or\n"
-"Report-Msgid-Bugs-To: http://bugzilla.mateorg/enter_bug.cgi?product=mateuser-share&component=general\n"
-"POT-Creation-Date: 2009-06-26 10:10+0000\n"
-"PO-Revision-Date: 2009-09-17 20:34+0530\n"
-"Last-Translator: Manoj Kumar Giri <[email protected]>\n"
-"Language-Team: Oriya <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: monsta <[email protected]>\n"
+"Language-Team: Oriya (http://www.transifex.com/mate/MATE/language/or/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=2; plural=(n!=1);\n\n"
-"\n"
-"\n"
-"\n"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:1
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr ""
-"ଯଦି ଏହା true, ଚାଳକ ମୂଖ୍ୟ ପଞ୍ଜିକାରେ ସାର୍ବଜନିକ ଡିରେକ୍ଟୋରୀ ଚାଳକ ଲଗଇନ ହେବାମାତ୍ରେ ଆହରଣ "
-"ଡିରେକ୍ଟୋରୀ ମାଧ୍ଯମରେ ସହଭାଗ ହୋଇଥାଏ।"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr ""
-"ଯଦି ଏହା true, ଚାଳକ ମୂଖ୍ୟ ପଞ୍ଜିକାରେ ସାର୍ବଜନିକ ଡିରେକ୍ଟୋରୀ ଚାଳକ ଲଗଇନ ହେବାମାତ୍ରେ ବ୍ଲୁଟୁଥ "
-"ମାଧ୍ଯମରେ ସହଭାଗ ହୋଇଥାଏ।"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:3
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr ""
-"ଯଦି ଏହା true, ଚାଳକ ମୂଖ୍ୟ ପଞ୍ଜିକାରେ ସାର୍ବଜନିକ ଡିରେକ୍ଟୋରୀ ନେଟୱର୍କରେ ଚାଳକ ଲଗଇନ ହେବାମାତ୍ରେ "
-"ସହଭାଗ ହୋଇଥାଏ।"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:4
-msgid "Share Public directory over Bluetooth"
-msgstr "ବ୍ଲୁଟୁଥ ଉପରେ ସାର୍ବଜନିକ ଡିରେକ୍ଟୋରୀକୁ ସହଭାଗ କରନ୍ତୁ"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:5
-msgid "Share Public directory over the network"
-msgstr "ନେଟୱର୍କ ଉପରେ ସାର୍ବଜନିକ ଡିରେକ୍ଟୋରୀକୁ ସହଭାଗ କରନ୍ତୁ"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:6
-msgid "When to accept files sent over Bluetooth"
-msgstr "ବ୍ଲୁଟୁଥ ଉପରେ ପଠାଯାଇଥିବା ଫାଇଲଗୁଡ଼ିକୁ କେତେବେଳେ ଗ୍ରହଣ କରିବା ଉଚିତ"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:7
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\", \"bonded_trusted\" and \"ask\"."
-msgstr ""
-"ବ୍ଲୁଟୁଥ ଉପରେ ପଠାଯାଇଥିବା ଫାଇଲଗୁଡ଼ିକୁ କେତେବେଳେ ଗ୍ରହଣ କରିବା ଉଚିତ। ସମ୍ଭାବ୍ୟ ମୂଲ୍ୟଗୁଡ଼ିକ ହେଉଛି "
-"\"always\", \"bonded\", \"bonded_trusted\" ଏବଂ \"ask\"।"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:8
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr ""
-"ପ୍ରବେଶ ସଂକେତ ପାଇଁ କେତେବେଳେ ପଚାରିବା ଉଚିତ। ସମ୍ଭାବ୍ୟ ମୂଲ୍ୟଗୁଡ଼ିକ ହେଉଛି \"never\", \"on_write"
-"\", ଏବଂ\"always\"।"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:9
-msgid "When to require passwords"
-msgstr "ପ୍ରବେଶ ସଂକେତ କେତେବେଳେ ଆବଶ୍ୟକ"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "ObexPush ବ୍ୟବହାର କରି ବ୍ୱୁଟୁଥ ଗ୍ରାହକ ମାନେ ଫାଇଲଗୁଡ଼ିକୁ ପଠାଇବା ଉଚିତ କି।"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:11
-msgid "Whether Bluetooth clients need to pair with the computer to send files."
-msgstr "ଫାଇଲ ପଠାଇବା ପାଇଁ ବ୍ୱୁଟୁଥ ଗ୍ରାହକମାନଙ୍କୁ କମ୍ପୁଟର ସହିତ ଯୋଡ଼ିହେବା ଉଚିତ କି।"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:12
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr ""
-"ଫାଇଲ ଲେଖିବା ପାଇଁ ବ୍ୱୁଟୁଥ ଫାଇଲଗୁଡ଼ିକୁ ଅନୁମତି ଦେବା ଉଚିତ କି, କିମ୍ବା କେବଳ ପଠନୀୟ ଫାଇଲଗୁଡ଼ିକୁ ସହଭାଗ "
-"କରନ୍ତୁ।"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:13
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "ବ୍ଲୁଟୁଥ ଗ୍ରାହକମାନଙ୍କୁ ଫାଇଲ ଲେଖିବା ପାଇଁ ଅନୁମତି ଦେବା ଉଚିତ କି।"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "ନୂତନ ଭାବରେ ଗ୍ରହଣ କରାଯାଇଥିବା ଫାଇଲଗୁଡ଼ିକ ବିଷୟରେ ବିଜ୍ଞପ୍ତି ଦେବା ଉଚିତ କି।"
+"Language: or\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/file-share-properties.ui.h:1
-msgid "<b>Receive Files over Bluetooth</b>"
-msgstr "<b>ବ୍ଲୁଟୁଥ ଉପରେ ଫାଇଲଗୁଡ଼ିକୁ ଗ୍ରହଣ କରନ୍ତୁ</b>"
+msgid "Personal File Sharing Preferences"
+msgstr "ବ୍ୟକ୍ତିଗତ ଫାଇଲ ସହଭାଗ ପସନ୍ଦଗୁଡ଼ିକ"
 
 #: ../data/file-share-properties.ui.h:2
-msgid "<b>Share Files over Bluetooth</b>"
-msgstr "<b>ବ୍ଲୁଟୁଥ ଉପରେ ଫାଇଲଗୁଡ଼ିକୁ ସହଭାଗ କରନ୍ତୁ</b>"
-
-#: ../data/file-share-properties.ui.h:3
 msgid "<b>Share Files over the Network</b>"
 msgstr "<b>ନେଟୱର୍କ ଉପରେ ଫାଇଲଗୁଡ଼ିକୁ ସହଭାଗ କରନ୍ତୁ</b>"
 
+#: ../data/file-share-properties.ui.h:3
+msgid "_Share public files on network"
+msgstr "ନେଟୱର୍କରେ ସାର୍ବଜନିକ ଫାଇଲଗୁଡ଼ିକୁ ସହଭାଗ କରନ୍ତୁ (_S)"
+
 #: ../data/file-share-properties.ui.h:4
-msgid "Allo_w remote devices to delete files"
-msgstr "ସୂଦୂର ଉଫକରଣକୁ ଫାଇଲ ଅପସାରଣ କରିବା ପାଇଁ ଅନୁମତି ଦିଅନ୍ତୁ (_w)"
+msgid "_Password:"
+msgstr "ପ୍ରବେଶ ସଂଙ୍କେତ (_P):"
 
 #: ../data/file-share-properties.ui.h:5
-#| msgid "File Sharing Preferences"
-msgid "Personal File Sharing Preferences"
-msgstr "ବ୍ୟକ୍ତିଗତ ଫାଇଲ ସହଭାଗ ପସନ୍ଦଗୁଡ଼ିକ"
+msgid "_Require password:"
+msgstr "ପ୍ରବେଶ ସଂକେତ ଆବଶ୍ୟକ (_R):"
 
 #: ../data/file-share-properties.ui.h:6
-msgid "Receive files in _Downloads folder over Bluetooth"
-msgstr "ବ୍ଲୁଟୁଥ ଉପରେ ଆହରଣ ଫୋଲଡରରେ ଫାଇଲଗୁଡ଼ିକୁ ଗ୍ରହଣ କରିଥାଏ (_D)"
+msgid "<b>Share Files over Bluetooth</b>"
+msgstr "<b>ବ୍ଲୁଟୁଥ ଉପରେ ଫାଇଲଗୁଡ଼ିକୁ ସହଭାଗ କରନ୍ତୁ</b>"
 
 #: ../data/file-share-properties.ui.h:7
-msgid "Require re_mote devices to bond with this computer"
-msgstr "ଏହି କମ୍ପୁଟର ସହିତ ବାନ୍ଧିହେବା ପାଇଁ ସୂଦୂର ଉପକରଣ ଆବଶ୍ୟକ (_m)"
-
-#: ../data/file-share-properties.ui.h:8
 msgid "Share public files over _Bluetooth"
 msgstr "ବ୍ଲୁଟୁଥ ଉପରେ ସାର୍ବଜନିକ ଫାଇଲଗୁଡ଼ିକୁ ସହଭାଗ କରନ୍ତୁ (_B)"
 
+#: ../data/file-share-properties.ui.h:8
+msgid "Allo_w remote devices to delete files"
+msgstr "ସୂଦୂର ଉଫକରଣକୁ ଫାଇଲ ଅପସାରଣ କରିବା ପାଇଁ ଅନୁମତି ଦିଅନ୍ତୁ (_w)"
+
 #: ../data/file-share-properties.ui.h:9
-msgid "_Accept files: "
-msgstr "ଫାଇଲ ଗ୍ରହଣ କରନ୍ତୁ (_A):"
+msgid "Require re_mote devices to bond with this computer"
+msgstr "ଏହି କମ୍ପୁଟର ସହିତ ବାନ୍ଧିହେବା ପାଇଁ ସୂଦୂର ଉପକରଣ ଆବଶ୍ୟକ (_m)"
 
 #: ../data/file-share-properties.ui.h:10
-msgid "_Notify about received files"
-msgstr "ଗ୍ରହଣ କରାଯାଇଥିବା ଫାଇଲଗୁଡ଼ିକ ବିଷୟରେ ବିଜ୍ଞପ୍ତି ଦିଅନ୍ତୁ (_N)"
+msgid "<b>Receive Files over Bluetooth</b>"
+msgstr "<b>ବ୍ଲୁଟୁଥ ଉପରେ ଫାଇଲଗୁଡ଼ିକୁ ଗ୍ରହଣ କରନ୍ତୁ</b>"
 
 #: ../data/file-share-properties.ui.h:11
-msgid "_Password:"
-msgstr "ପ୍ରବେଶ ସଂଙ୍କେତ (_P):"
+msgid "Receive files in _Downloads folder over Bluetooth"
+msgstr "ବ୍ଲୁଟୁଥ ଉପରେ ଆହରଣ ଫୋଲଡରରେ ଫାଇଲଗୁଡ଼ିକୁ ଗ୍ରହଣ କରିଥାଏ (_D)"
 
 #: ../data/file-share-properties.ui.h:12
-msgid "_Require password:"
-msgstr "ପ୍ରବେଶ ସଂକେତ ଆବଶ୍ୟକ (_R):"
+msgid "_Accept files: "
+msgstr "ଫାଇଲ ଗ୍ରହଣ କରନ୍ତୁ (_A):"
 
 #: ../data/file-share-properties.ui.h:13
-msgid "_Share public files on network"
-msgstr "ନେଟୱର୍କରେ ସାର୍ବଜନିକ ଫାଇଲଗୁଡ଼ିକୁ ସହଭାଗ କରନ୍ତୁ (_S)"
+msgid "_Notify about received files"
+msgstr "ଗ୍ରହଣ କରାଯାଇଥିବା ଫାଇଲଗୁଡ଼ିକ ବିଷୟରେ ବିଜ୍ଞପ୍ତି ଦିଅନ୍ତୁ (_N)"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
 
-#: ../data/mateuser-share-properties.desktop.in.h:1
-#: ../data/mateuser-share.desktop.in.in.h:2
+#: ../data/mate-user-share-properties.desktop.in.h:1
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "ବ୍ୟକ୍ତିଗତ ଫାଇଲ ସହଭାଗ"
 
-#: ../data/mateuser-share-properties.desktop.in.h:2
-#| msgid "Preferences for sharing of personal files"
+#: ../data/mate-user-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "ଫାଇଲଗୁଡ଼ିକୁ ସହଭାଗ କରିବା ପାଇଁ ପସନ୍ଦ"
 
-#: ../data/mateuser-share.desktop.in.in.h:1
-#| msgid "Launch User Sharing if enabled"
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "ଯଦି ସକ୍ରିୟ ଥାଏ ତେବେ ବ୍ୟକ୍ତିଗତ ଫାଇଲ ସହଭାଗକୁ ଆରମ୍ଭ କରନ୍ତୁ"
 
-#: ../src/file-share-properties.c:435
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr ""
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr ""
+
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr ""
+
+#: ../src/caja-share-bar.c:121
+msgid "Launch Personal File Sharing Preferences"
+msgstr ""
+
+#: ../src/share-extension.c:73
+msgid "Unable to launch the Personal File Sharing preferences"
+msgstr ""
+
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr ""
+
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr ""
+
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr ""
+
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr ""
+
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "କୌଣସି କାରଣ ନାହିଁ"
 
-#: ../src/file-share-properties.c:463
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "ସହାୟତା ସୂଚୀକୁ ଦର୍ଶାଇ ହେବ ନାହିଁ।"
 
-#: ../src/file-share-properties.c:503
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "ଅନ୍ତରାପୃଷ୍ଠ ନିର୍ମାଣ କରିହେବ ନାହିଁ।"
 
-#: ../src/file-share-properties.c:543
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "କେବେ ନୁହେଁ"
 
-#: ../src/file-share-properties.c:546
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "ଫାଇଲ ଲେଖିବା ସମୟରେ"
 
-#: ../src/file-share-properties.c:549 ../src/file-share-properties.c:572
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "ସର୍ବଦା"
 
-#: ../src/file-share-properties.c:575
-msgid "Only for Bonded devices"
-msgstr "କେବଳ ବାନ୍ଧିହୋଇଥିବା ଉପକରଣଗୁଡ଼ିକ ପାଇଁ"
-
-#: ../src/file-share-properties.c:578
-msgid "Only for Bonded and Trusted devices"
-msgstr "କେବଳ ବାନ୍ଧିହୋଇଥିବା ଏବଂ ବିଶ୍ୱସ୍ଥ ଉପକରଣଗୁଡ଼ିକ ପାଇଁ"
+#: ../src/file-share-properties.c:580
+msgid "Only for set up devices"
+msgstr ""
 
-#: ../src/file-share-properties.c:583
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "ପଚାର"
 
@@ -213,37 +174,36 @@ msgstr "ପଚାର"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "%sର ସାର୍ବଜନିକ ଫାଇଲଗୁଡ଼ିକ"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "%s ଉପରେ %sର ସାର୍ବଜନିକ ଫାଇଲଗୁଡ଼ିକ"
 
-#: ../src/http.c:372
-msgid "Please log in as the user guest"
-msgstr "ଅତିଥି ଚାଳକ ଭାବରେ ଲରଇନ କରନ୍ତୁ"
-
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:138
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "ଆପଣ ବ୍ଲୁଟୁଥ ମାଧ୍ଯମରେ \"%s\" କୁ ଗ୍ରହଣ କରିଛନ୍ତି"
 
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "ଆପଣ ଗୋଟିଏ ଫାଇଲ ଗ୍ରହଣ କରିଛନ୍ତି"
 
-#: ../src/obexpush.c:151
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "ଫାଇଲକୁ ଖୋଲନ୍ତୁ"
 
-#: ../src/obexpush.c:155
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "ଫାଇଲ ପ୍ରକଟକରନ୍ତୁ"
 
+#: ../src/obexpush.c:169
+msgid "File reception complete"
+msgstr ""
diff --git a/po/pa.po b/po/pa.po
index 7de011a..e836797 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -1,224 +1,168 @@
-# translation of mateuser-share.HEAD.po to Punjabi
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
-#
-# Amanpreet Singh Alam <[email protected]>, 2005, 2006, 2009.
-# A S Alam <[email protected]>, 2009, 2010.
+# 
+# Translators:
+# Amanpreet Singh Alam <[email protected]>, 2005, 2006, 2009
+# A S Alam <[email protected]>, 2009, 2010
 msgid ""
 msgstr ""
-"Project-Id-Version: mateuser-share.HEAD\n"
-"Report-Msgid-Bugs-To: http://bugzilla.mateorg/enter_bug."
-"cgi?product=mateuser-share&component=general\n"
-"POT-Creation-Date: 2010-02-22 13:30+0000\n"
-"PO-Revision-Date: 2010-03-21 20:12+0530\n"
-"Last-Translator: A S Alam <[email protected]>\n"
-"Language-Team: Punjabi/Panjabi <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: monsta <[email protected]>\n"
+"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/mate/MATE/language/pa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
+"Language: pa\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/desktop_matefile_sharing.schemas.in.h:1
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr ""
-"ਜੇ ਸਹੀਂ ਹੈ ਤਾਂ ਬਲਿਊਟੁੱਥ ਜੰਤਰ ਯੂਜ਼ਰ ਦੇ ਲਾਗਇਨ ਹੋਣ ਨਾਲ ਉਸ ਦੇ ਡਾਊਨਲੋਡ ਡਾਇਰੈਕਟਰੀ ਵਿੱਚ ਫਾਇਲਾਂ ਭੇਜ "
-"ਸਕਦੇ ਹਨ।"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr ""
-"ਜੇ ਸਹੀਂ ਹੈ ਤਾਂ ਯੂਜ਼ਰ ਦੀ ਘਰ ਡਾਇਰੈਕਟਰੀ ਵਿੱਚ ਪਬਲਿਕ ਡਾਇਰੈਕਟਰੀ ਨੂੰ ਬਲਿਊਟੁੱਥ ਉੱਤੇ ਸਾਂਝੀ ਕੀਤਾ "
-"ਜਾਵੇਗਾ, ਜਦੋਂ ਵੀ ਯੂਜ਼ਰ ਲਾਗਇਨ ਹੋਵੇਗਾ।"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:3
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr ""
-"ਜੇ ਸਹੀਂ ਹੈ ਤਾਂ ਯੂਜ਼ਰ ਦੀ ਘਰ ਡਾਇਰੈਕਟਰੀ ਵਿੱਚ ਪਬਲਿਕ ਡਾਇਰੈਕਟਰੀ ਨੂੰ ਨੈੱਟਵਰਕ ਉੱਤੇ ਸਾਂਝੀ ਕੀਤਾ ਜਾਵੇਗਾ, "
-"ਜਦੋਂ ਵੀ ਯੂਜ਼ਰ ਲਾਗਇਨ ਹੋਵੇਗਾ।"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:4
-msgid "Share Public directory over Bluetooth"
-msgstr "ਬਲਿਊਟੁੱਥ ਉੱਤੇ ਸਾਂਝੀ ਪਬਲਿਕ ਡਾਇਰੈਕਟਰੀ"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:5
-msgid "Share Public directory over the network"
-msgstr "ਨੈੱਟਵਰਕ ਉੱਤੇ ਸਾਂਝੀ ਪਬਲਿਕ ਡਾਇਰੈਕਟਰੀ"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:6
-msgid "When to accept files sent over Bluetooth"
-msgstr "ਜਦੋਂ ਬਲਿਊਟੁੱਥ ਉੱਤੇ ਭੇਜੀਆਂ ਫਾਇਲਾਂ ਪ੍ਰਾਪਤ ਕਰਨੀਆਂ ਹੋਣ"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:7
-#| msgid ""
-#| "When to accept files sent over Bluetooth. Possible values are \"always\", "
-#| "\"bonded\", \"bonded_trusted\" and \"ask\"."
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr ""
-"ਜਦੋਂ ਬਲਿਊਟੁੱਥ ਉੱਤੇ ਭੇਜੀਆਂ ਫਾਇਲਾਂ ਪ੍ਰਾਪਤ ਕਰਨੀਆਂ ਹੋਣ ਤਾਂ ਸੰਭਵ ਮੁੱਲ ਹਨ \"always\", \"bonded\", "
-"\"ask\""
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:8
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr "ਜਦੋਂ ਪਾਸਵਰਡ ਪੁੱਛਿਆ ਜਾਵੇ ਤਾਂ ਸੰਭਵ ਮੁੱਲ ਹਨ \"never\", \"on_write\", ਅਤੇ \"always\"।"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:9
-msgid "When to require passwords"
-msgstr "ਜਦੋਂ ਪਾਸਵਰਪ ਲੋੜੀਦਾ ਹੋਵੇ"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "ਕੀ ਬਲਿਊਟੁੱਥ ਕਲਾਇਟਾਂ ਨੂੰ ObexPush ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਫਾਇਲਾਂ ਭੇਜ ਸਕਦੇ ਹੋ।"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:11
-msgid "Whether Bluetooth clients need to pair with the computer to send files."
-msgstr "ਕੀ ਬਲਿਊਟੁੱਥ ਕਲਾਇਟਾਂ ਨੂੰ ਫਾਇਲਾਂ ਭੇਜਣ ਲਈ ਕੰਪਿਊਟਰ ਨਾਲ ਪੇਅਰ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:12
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr "ਕੀ ਬਲਿਊਟੁੱਥ ਕਲਾਇਟਾਂ ਨੂੰ ਫਾਇਲਾਂ ਲਿਖਣ ਦੇਣਾ ਹੈ ਜਾਂ ਫਾਇਲਾਂ ਕੇਵਲ ਪੜ੍ਹਨ ਲਈ ਸਾਂਝੀਆਂ ਕਰਨ"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:13
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "ਕੀ ਬਲਿਊਟੁੱਥ ਕਲਾਇਟਾਂ ਨੂੰ ਫਾਇਲਾਂ ਲਿਖਣ ਦੇਣੀਆਂ ਹਨ।"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "ਕੀ ਨਵੀਆਂ ਮਿਲੀਆਂ ਫਾਇਲਾਂ ਲਈ ਸੂਚਨਾ ਦੇਣੀ ਹੈ।"
-
 #: ../data/file-share-properties.ui.h:1
-msgid "<b>Receive Files over Bluetooth</b>"
-msgstr "<b>ਬਲਿਊਟੁੱਥ ਉੱਤੇ ਫਾਇਲਾਂ ਲੈਣੀਆਂ ਹੋਣ</b>"
+msgid "Personal File Sharing Preferences"
+msgstr "ਨਿੱਜੀ ਫਾਇਲ ਸਾਂਝ ਪਸੰਦ"
 
 #: ../data/file-share-properties.ui.h:2
-msgid "<b>Share Files over Bluetooth</b>"
-msgstr "<b>ਬਲਿਊਟੁੱਥ ਉੱਤੇ ਫਾਇਲਾਂ ਸਾਂਝੀਆਂ</b>"
-
-#: ../data/file-share-properties.ui.h:3
 msgid "<b>Share Files over the Network</b>"
 msgstr "<b>ਨੈੱਟਵਰਕ ਉੱਤੇ ਫਾਇਲਾਂ ਸਾਂਝੀਆਂ</b>"
 
+#: ../data/file-share-properties.ui.h:3
+msgid "_Share public files on network"
+msgstr "ਨੈੱਟਵਰਕ ਉੱਤੇ ਸਾਂਝੀਆਂ ਪਬਲਿਕ ਫਾਇਲਾਂ(_S)"
+
 #: ../data/file-share-properties.ui.h:4
-msgid "Allo_w remote devices to delete files"
-msgstr "ਰਿਮੋਟ ਜੰਤਰਾਂ ਨੂੰ ਫਾਇਲਾਂ ਹਟਾਉਣ ਦਿਓ(_w)"
+msgid "_Password:"
+msgstr "ਪਾਸਵਰਡ(_P):"
 
 #: ../data/file-share-properties.ui.h:5
-msgid "Personal File Sharing Preferences"
-msgstr "ਨਿੱਜੀ ਫਾਇਲ ਸਾਂਝ ਪਸੰਦ"
+msgid "_Require password:"
+msgstr "ਲੋੜੀਦਾ ਪਾਸਵਰਡ(_R):"
 
 #: ../data/file-share-properties.ui.h:6
-msgid "Receive files in _Downloads folder over Bluetooth"
-msgstr "ਬਲਿਊਟੁੱਥ ਰਾਹੀਂ ਮਿਲੀਆਂ ਫਾਇਲਾਂ ਨੂੰ ਡਾਊਨਲੋਡ (_Download) ਫੋਲਡਰ ਵਿੱਚ ਲਵੋ"
+msgid "<b>Share Files over Bluetooth</b>"
+msgstr "<b>ਬਲਿਊਟੁੱਥ ਉੱਤੇ ਫਾਇਲਾਂ ਸਾਂਝੀਆਂ</b>"
 
 #: ../data/file-share-properties.ui.h:7
-msgid "Require re_mote devices to bond with this computer"
-msgstr "ਇਸ ਕੰਪਿਊਟਰ ਨਾਲ ਜੋੜਨ (ਬੌਂਡ) ਲਈ ਰਿਮੋਟ ਜੰਤਰ ਲੋੜੀਦੇ ਹਨ"
-
-#: ../data/file-share-properties.ui.h:8
 msgid "Share public files over _Bluetooth"
 msgstr "ਬਲਿਊਟੁੱਥ ਰਾਹੀਂ ਸਾਂਝੀਆਂ ਪਬਲਿਕ ਫਾਇਲਾਂ(_B)"
 
+#: ../data/file-share-properties.ui.h:8
+msgid "Allo_w remote devices to delete files"
+msgstr "ਰਿਮੋਟ ਜੰਤਰਾਂ ਨੂੰ ਫਾਇਲਾਂ ਹਟਾਉਣ ਦਿਓ(_w)"
+
 #: ../data/file-share-properties.ui.h:9
-msgid "_Accept files: "
-msgstr "ਫਾਇਲਾਂ ਮਨਜ਼ੂਰ(_A):"
+msgid "Require re_mote devices to bond with this computer"
+msgstr "ਇਸ ਕੰਪਿਊਟਰ ਨਾਲ ਜੋੜਨ (ਬੌਂਡ) ਲਈ ਰਿਮੋਟ ਜੰਤਰ ਲੋੜੀਦੇ ਹਨ"
 
 #: ../data/file-share-properties.ui.h:10
-msgid "_Notify about received files"
-msgstr "ਲਈਆਂ ਫਾਇਲਾਂ ਬਾਰੇ ਸੂਚਨਾ ਲਵੋ(_N)"
+msgid "<b>Receive Files over Bluetooth</b>"
+msgstr "<b>ਬਲਿਊਟੁੱਥ ਉੱਤੇ ਫਾਇਲਾਂ ਲੈਣੀਆਂ ਹੋਣ</b>"
 
 #: ../data/file-share-properties.ui.h:11
-msgid "_Password:"
-msgstr "ਪਾਸਵਰਡ(_P):"
+msgid "Receive files in _Downloads folder over Bluetooth"
+msgstr "ਬਲਿਊਟੁੱਥ ਰਾਹੀਂ ਮਿਲੀਆਂ ਫਾਇਲਾਂ ਨੂੰ ਡਾਊਨਲੋਡ (_Download) ਫੋਲਡਰ ਵਿੱਚ ਲਵੋ"
 
 #: ../data/file-share-properties.ui.h:12
-msgid "_Require password:"
-msgstr "ਲੋੜੀਦਾ ਪਾਸਵਰਡ(_R):"
+msgid "_Accept files: "
+msgstr "ਫਾਇਲਾਂ ਮਨਜ਼ੂਰ(_A):"
 
 #: ../data/file-share-properties.ui.h:13
-msgid "_Share public files on network"
-msgstr "ਨੈੱਟਵਰਕ ਉੱਤੇ ਸਾਂਝੀਆਂ ਪਬਲਿਕ ਫਾਇਲਾਂ(_S)"
+msgid "_Notify about received files"
+msgstr "ਲਈਆਂ ਫਾਇਲਾਂ ਬਾਰੇ ਸੂਚਨਾ ਲਵੋ(_N)"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
 
-#: ../data/mateuser-share-properties.desktop.in.h:1
-#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
+
+#: ../data/mate-user-share-properties.desktop.in.h:1
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "ਨਿੱਜੀ ਫਾਇਲ ਸਾਂਝ"
 
-#: ../data/mateuser-share-properties.desktop.in.h:2
+#: ../data/mate-user-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "ਫਾਇਲਾਂ ਸਾਂਝੀਆਂ ਕਰਨ ਲਈ ਪਸੰਦ"
 
-#: ../data/mateuser-share.desktop.in.in.h:1
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "ਜੇ ਚਾਲੂ ਹੋਵੇ ਤਾਂ ਨਿੱਜੀ ਫਾਇਲ ਸਾਂਝ ਚਲਾਓ"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "ਪਸੰਦ ਚਲਾਓ"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr ""
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr ""
+
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr ""
 
-#: ../src/caja-share-bar.c:187
-#| msgid "Personal File Sharing Preferences"
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "ਨਿੱਜੀ ਫਾਇਲ ਸ਼ੇਅਰਿੰਗ ਪਸੰਦ ਚਲਾਓ"
 
-#: ../src/share-extension.c:82
-#| msgid "Personal File Sharing Preferences"
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "ਨਿੱਜੀ ਫਾਇਲ ਸਾਂਝ ਪਸੰਦ ਚਲਾਉਣ ਲਈ ਅਸਮਰੱਥ"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "ਤੁਸੀਂ ਇਸ ਫੋਲਡਰ ਤੋਂ ਫਾਇਲਾਂ ਸਾਂਝੀਆਂ ਕਰ ਸਕਦੇ ਹੋ ਅਤੇ ਇਸ ਤੋਂ ਫਾਇਲਾਂ ਲੈ ਸਕਦੇ ਹੋ"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr ""
+
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr ""
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "ਤੁਸੀਂ ਇਹ ਫੋਲਡਰ ਤੋਂ ਫਾਇਲਾਂ ਨੂੰ ਨੈੱਟਵਰਕ ਅਤੇ ਬਲਿਊਟੁੱਥ ਰਾਹੀਂ ਸਾਂਝੀਆਂ ਕਰ ਸਕਦੇ ਹੋ"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr ""
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "ਤੁਸੀਂ ਬਲਿਊਟੁੱਥ ਰਾਹੀਂ ਫਾਇਲਾਂ ਨੂੰ ਇਸ ਫੋਲਡਰ ਵਿੱਚ ਲੈ ਸਕਦੇ ਹੋ"
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr ""
 
-#: ../src/file-share-properties.c:436
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "ਕੋਈ ਕਾਰਨ ਨਹੀਂ"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "ਮੱਦਦ ਸਮੱਗਰੀ ਵੇਖਾਈ ਨਹੀਂ ਜਾ ਸਕੀ।"
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "ਬਿਲਡ ਇੰਟਰਫੇਸ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "ਕਦੇ ਨਹੀਂ"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "ਫਾਇਲਾਂ ਲਿਖਣ ਸਮੇਂ"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "ਹਮੇਸ਼ਾ"
 
-#: ../src/file-share-properties.c:598
-#| msgid "Only for Bonded devices"
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "ਸੈਟਅੱਪ ਕੀਤੇ ਜੰਤਰਾਂ ਲਈ ਹੀ"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "ਪੁੱਛੋ"
 
@@ -231,48 +175,36 @@ msgstr "ਪੁੱਛੋ"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "%s ਦੀਆਂ ਪਬਲਿਕ ਫਾਇਲਾਂ"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "%s ਦੀਆਂ %s ਉੱਤੇ ਪਬਲਿਕ ਫਾਇਲਾਂ"
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "ਤੁਸੀਂ ਬਲਿਊਟੁੱਥ ਰਾਹੀਂ \"%s\" ਲਏ"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "ਇੱਕ ਫਾਇਲ ਮਿਲੀ"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "ਫਾਇਲ ਖੋਲ੍ਹੋ"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "ਫਾਇਲ ਰੀਵੀਲ"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "ਫਾਇਲ ਪ੍ਰਾਪਤੀ ਪੂਰੀ"
-
-#~ msgid "Only for Bonded and Trusted devices"
-#~ msgstr "ਕੇਵਲ ਬਾਊਂਡ ਅਤੇ ਟਰੱਸਟ ਕੀਤੇ ਜੰਤਰ ਹੀ"
-
-#~ msgid "Please log in as the user guest"
-#~ msgstr "ਮਹਿਮਾਨ ਯੂਜ਼ਰ ਵਲੋਂ ਲਾਗਇਨ ਕਰੋ ਜੀ"
-
-#~ msgid "User Sharing"
-#~ msgstr "ਯੂਜ਼ਰ ਸਾਂਝ"
-
-#~ msgid "gtk-help"
-#~ msgstr "gtk-help"
diff --git a/po/pl.po b/po/pl.po
index 44dc5c0..4287972 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,228 +1,168 @@
-# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-# Aviary.pl
-# Jeśli masz jakiekolwiek uwagi odnoszące się do tłumaczenia lub chcesz
-# pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas:
-# [email protected]
-# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Darek Witkowski, 2016
+# Piotr Strębski <[email protected]>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: mateuser-share\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-22 16:49+0100\n"
-"PO-Revision-Date: 2010-02-22 16:35+0100\n"
-"Last-Translator: Piotr Drąg <[email protected]>\n"
-"Language-Team: Polish <[email protected]>\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: Darek Witkowski\n"
+"Language-Team: Polish (http://www.transifex.com/mate/MATE/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2);\n"
-"X-Poedit-Language: Polish\n"
-"X-Poedit-Country: Poland\n"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:1
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr ""
-"Jeśli ustawione na \"true\", urządzenia Bluetooth mogą wysyłać pliki do "
-"katalogu Pobrane użytkownika po zalogowaniu."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr ""
-"Jeśli ustawione na \"true\", katalog Publiczny w katalogu domowym "
-"użytkownika będzie współdzielony przez Bluetooth, gdy ten użytkownik się "
-"zaloguje."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:3
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr ""
-"Jeśli ustawione na \"true\", katalog Publiczny w katalogu domowym "
-"użytkownika będzie współdzielony, gdy ten użytkownik się zaloguje."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:4
-msgid "Share Public directory over Bluetooth"
-msgstr "Współdzielenie katalogu Publiczny przez Bluetooth"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:5
-msgid "Share Public directory over the network"
-msgstr "Współdzielenie katalogu Publiczny przez sieć"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:6
-msgid "When to accept files sent over Bluetooth"
-msgstr "Kiedy akceptować pliki wysyłane przez Bluetooth"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:7
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr ""
-"Kiedy akceptować pliki wysyłane przez Bluetooth. Możliwe wartości to  "
-"\"always\" (zawsze), \"bonded\" (tylko od powiązanych) i \"ask\" (zawsze "
-"pytaj)."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:8
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr ""
-"Kiedy pytać o hasła. Możliwe wartości to \"never\" (nigdy), \"on_write"
-"\" (podczas próby zapisu) i \"always\" (zawsze)."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:9
-msgid "When to require passwords"
-msgstr "Kiedy wymagać haseł"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr ""
-"Określa, czy zdalne klienty Bluetooth mogą wysyłać pliki używając OBEX Push."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:11
-msgid "Whether Bluetooth clients need to pair with the computer to send files."
-msgstr ""
-"Określa, czy zdalne klienty Bluetooth muszą być powiązane z komputerem, aby "
-"wysyłać pliki."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:12
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr ""
-"Określa, czy zdalne klienty Bluetooth mogą zapisywać pliki, czy współdzielić "
-"pliki tylko do odczytu."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:13
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "Określa, czy zdalne klienty Bluetooth mogą zapisywać pliki."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "Określa, czy powiadamiać o pobieranych plikach."
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: ../data/file-share-properties.ui.h:1
-msgid "<b>Receive Files over Bluetooth</b>"
-msgstr "<b>Pobieranie plików przez Bluetooth</b>"
+msgid "Personal File Sharing Preferences"
+msgstr "Preferencje współdzielenia osobistych plików"
 
 #: ../data/file-share-properties.ui.h:2
-msgid "<b>Share Files over Bluetooth</b>"
-msgstr "<b>Współdzielenie plików przez Bluetooth</b>"
-
-#: ../data/file-share-properties.ui.h:3
 msgid "<b>Share Files over the Network</b>"
 msgstr "<b>Współdzielenie plików przez sieć</b>"
 
+#: ../data/file-share-properties.ui.h:3
+msgid "_Share public files on network"
+msgstr "Współdzielenie plików publicznych w _sieci"
+
 #: ../data/file-share-properties.ui.h:4
-msgid "Allo_w remote devices to delete files"
-msgstr "_Zezwolenie na usuwanie plików przez zdalne urządzenia"
+msgid "_Password:"
+msgstr "_Hasło:"
 
 #: ../data/file-share-properties.ui.h:5
-msgid "Personal File Sharing Preferences"
-msgstr "Preferencje współdzielenia osobistych plików"
+msgid "_Require password:"
+msgstr "_Wymaganie hasła:"
 
 #: ../data/file-share-properties.ui.h:6
-msgid "Receive files in _Downloads folder over Bluetooth"
-msgstr "Odbieranie plików przez Bluetooth do katalogu _Pobrane"
+msgid "<b>Share Files over Bluetooth</b>"
+msgstr "<b>Współdzielenie plików przez Bluetooth</b>"
 
 #: ../data/file-share-properties.ui.h:7
-msgid "Require re_mote devices to bond with this computer"
-msgstr "Wy_maganie powiązania zdalnych urządzeń z tym komputerem"
-
-#: ../data/file-share-properties.ui.h:8
 msgid "Share public files over _Bluetooth"
 msgstr "Współdzielenie plików publicznych przez _Bluetooth"
 
+#: ../data/file-share-properties.ui.h:8
+msgid "Allo_w remote devices to delete files"
+msgstr "_Zezwolenie na usuwanie plików przez zdalne urządzenia"
+
 #: ../data/file-share-properties.ui.h:9
-msgid "_Accept files: "
-msgstr "Ak_ceptowanie plików:"
+msgid "Require re_mote devices to bond with this computer"
+msgstr "Wy_maganie powiązania zdalnych urządzeń z tym komputerem"
 
 #: ../data/file-share-properties.ui.h:10
-msgid "_Notify about received files"
-msgstr "P_owiadamianie o odebranych plikach"
+msgid "<b>Receive Files over Bluetooth</b>"
+msgstr "<b>Pobieranie plików przez Bluetooth</b>"
 
 #: ../data/file-share-properties.ui.h:11
-msgid "_Password:"
-msgstr "_Hasło:"
+msgid "Receive files in _Downloads folder over Bluetooth"
+msgstr "Odbieranie plików przez Bluetooth do katalogu _Pobrane"
 
 #: ../data/file-share-properties.ui.h:12
-msgid "_Require password:"
-msgstr "_Wymaganie hasła:"
+msgid "_Accept files: "
+msgstr "Ak_ceptowanie plików:"
 
 #: ../data/file-share-properties.ui.h:13
-msgid "_Share public files on network"
-msgstr "Współdzielenie plików publicznych w _sieci"
+msgid "_Notify about received files"
+msgstr "P_owiadamianie o odebranych plikach"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr "Udział Użytkownika"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr "Integruje się z udziałem użytkownika"
 
-#: ../data/mateuser-share-properties.desktop.in.h:1
-#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
+#: ../data/mate-user-share-properties.desktop.in.h:1
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "Współdzielenie osobistych plików"
 
-#: ../data/mateuser-share-properties.desktop.in.h:2
+#: ../data/mate-user-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Preferencje współdzielenia plików"
 
-#: ../data/mateuser-share.desktop.in.in.h:1
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr "Osobiste Współdzielenie Plików obexftp"
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Uruchamia współdzielenie osobistych plików, jeśli włączone"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "Uruchom preferencje"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr "Osobiste Współdzielenie Plików obexpush"
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr "Osobiste Współdzielenie Plików webdav"
+
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr "Preferencje"
 
-#: ../src/caja-share-bar.c:187
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Uruchamia preferencje współdzielenia osobistych plików"
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "Nie można uruchomić preferencji współdzielenia osobistych plików"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "Można współdzielić pliki z tego katalogu i odbierać do niego pliki"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr "Może być używane do współdzielenia i otrzymywania plików"
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "Można współdzielić pliki z tego katalogu przez sieć i Bluetooth"
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr "Może być współdzielone przez sieć lub Bluetooth"
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "Można odbierać pliki przez Bluetooth do tego katalogu"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr "Może być współdzielone przez sieć"
 
-#: ../src/file-share-properties.c:436
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr "Może być używane do otrzymywania plików przez Bluetooth"
+
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "Brak powodu"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "Nie można wyświetlić zawartości pomocy."
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "Nie można utworzyć interfejsu."
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "Nigdy"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "Podczas zapisywania plików"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "Zawsze"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "Tylko dla ustawionych urządzeń"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "Pytanie"
 
@@ -235,39 +175,36 @@ msgstr "Pytanie"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "Pliki publiczne użytkownika %s"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "Pliki publiczne użytkownika %s na %s"
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "Odebrano plik \"%s\" przez Bluetooth"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "Odebrano plik"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "Otwórz plik"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "Wyświetl plik"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "Ukończono odbiór pliku"
-
-#~ msgid "Please log in as the user guest"
-#~ msgstr "Proszę się zalogować jako gość (użytkownik \"guest\")"
diff --git a/po/pt.po b/po/pt.po
index d579838..cbffe4f 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -4,91 +4,22 @@
 # 
 # Translators:
 # André Neves <[email protected]>, 2007
-# Carlos Moreira <[email protected]>, 2014
+# crolidge, 2014
 # Duarte Loreto <[email protected]>, 2009, 2010
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-26 22:51+0200\n"
-"PO-Revision-Date: 2014-12-08 00:00+0000\n"
-"Last-Translator: Carlos Moreira <[email protected]>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/MATE/language/pt/)\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: monsta <[email protected]>\n"
+"Language-Team: Portuguese (http://www.transifex.com/mate/MATE/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/desktop_mate_file_sharing.schemas.in.h:1
-msgid "Share Public directory over the network"
-msgstr "Partilhar o directório \"Public\" pela rede"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr "Se definido como verdadeiro, o directório \"Public\" na pasta pessoal do utilizador será partilhado pela rede quando o utilizador estiver numa sessão."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:3
-msgid "When to require passwords"
-msgstr "Quando exigir senhas"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:4
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr "Quando perguntar por senhas. Valores possíveis são \"never\" (nunca), \"on_write\" (ao gravar), e \"always\" (sempre)."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:5
-msgid "Share Public directory over Bluetooth"
-msgstr "Partilhar o directório \"Public\" por Bluetooth"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:6
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr "Se definido como verdadeiro, o directório \"Public\" na pasta pessoal do utilizador será partilhado por Bluetooth quando o utilizador estiver numa sessão."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:7
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "Se permitir ou não que os clientes Bluetooth tenham permissões de escrita."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:8
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr "Se permitir ou não que clientes Bluetooth tenham permissões de escrita ou partilhar os ficheiros em modo apenas de leitura."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:9
-msgid ""
-"Whether Bluetooth clients need to pair with the computer to send files."
-msgstr "Se os clientes Bluetooth precisão ou não de emparelhar com o computador para enviar ficheiros."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "Se os clientes Bluetooth podem ou não enviar ficheiros utilizando ObexPush."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:11
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr "Se definido como verdadeiro, dispositivos Bluetooth podem enviar ficheiros para o directório de Downloads do utilizador estiver numa sessão."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:12
-msgid "When to accept files sent over Bluetooth"
-msgstr "Quando aceitar ficheiros enviados por Bluetooth"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:13
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr "Quando aceitar ficheiros enviados por Bluetooth. Valores possíveis são \"always\", \"bonded\" e \"ask\"."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "Se notificar ou não de novos ficheiros recebidos."
-
 #: ../data/file-share-properties.ui.h:1
 msgid "Personal File Sharing Preferences"
 msgstr "Preferências de Partilha de Ficheiros Pessoais"
@@ -141,8 +72,16 @@ msgstr "_Aceitar ficheiros: "
 msgid "_Notify about received files"
 msgstr "_Notificar de ficheiros recebidos"
 
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
+
 #: ../data/mate-user-share-properties.desktop.in.h:1
-#: ../data/mate-user-share.desktop.in.in.h:1 ../src/caja-share-bar.c:162
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "Partilha de Ficheiros Pessoais"
 
@@ -150,63 +89,81 @@ msgstr "Partilha de Ficheiros Pessoais"
 msgid "Preferences for sharing of files"
 msgstr "Preferências para a partilha de ficheiros"
 
-#: ../data/mate-user-share.desktop.in.in.h:2
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Inicia a Partilha de Ficheiros Pessoais, se activa"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "Preferências de Iniciação"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr ""
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr ""
 
-#: ../src/caja-share-bar.c:187
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr ""
+
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Preferências de Iniciação da Partilha de Ficheiros Pessoais"
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "Incapaz de iniciar as preferências de Partilha de Ficheiros Pessoais"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "Pode partilhar ficheiros a partir desta pasta e nela receber ficheiros"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr ""
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "Pode partilhar ficheiros a partir desta pasta através da rede e Bluetooth"
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr ""
+
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr ""
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "Pode receber nesta pasta ficheiros enviados por Bluetooth"
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr ""
 
-#: ../src/file-share-properties.c:436
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "Nenhum motivo"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "Incapaz de apresentar o conteúdo da ajuda."
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "Incapaz de construir o interface."
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "Nunca"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "Ao gravar ficheiros"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "Sempre"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "Apenas para dispositivos emparelhados"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "Perguntar"
 
@@ -219,36 +176,36 @@ msgstr "Perguntar"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "Ficheiros públicos de %s"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "Ficheiros públicos de %s em %s"
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "Recebeu \"%s\" por Bluetooth"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "Recebeu um ficheiro"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "Abrir o Ficheiro"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "Revelar o Ficheiro"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "Receção do ficheiro concluída"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index fa83704..53edb4e 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,226 +1,171 @@
-# Brazilian Portuguese translation of evolution-mapi.
-# Copyright (C) 2008-2009 Free Software Foundation, Inc.
-# This file is distributed under the same license as the evolution-mapi package.
-# Taylon Silmer <[email protected]>, 2009.
-# Fabrício Godoy <[email protected]>, 2009.
-# Djavan Fagundes <[email protected]>, 2009.
-# André Gondim <[email protected]>, 2009.
-# Djavan Fagundes <[email protected]>, 2009.
-#
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# André Gondim <[email protected]>, 2009
+# dnoway <[email protected]>, 2009
+# Fabrício Godoy <[email protected]>, 2009
+# Taylon Silmer <[email protected]>, 2009
+# Victor Gonçalves <[email protected]>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: mateuser-share\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 08:09-0300\n"
-"PO-Revision-Date: 2009-10-24 14:25-0200\n"
-"Last-Translator: Flamarion Jorge <[email protected]>\n"
-"Language-Team: Brazilian Portuguese <matept_br-list@mateorg>\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: Victor Gonçalves <[email protected]>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/mate/MATE/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../data/desktop_matefile_sharing.schemas.in.h:1
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr ""
-"Se isto for true, dispositivos Bluetooth podem enviar arquivos para o "
-"diretório de download do usuário quando estiver conectado."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr ""
-"Se isto for true, o diretório público no diretório pessoal do usuário será "
-"compartilhado pelo Bluetooth quando o usuário estiver conectado."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:3
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr ""
-"Se isto for true, o diretório público no diretório pessoal do usuário será "
-"compartilhado pela rede quado o usuário estiver conectado."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:4
-msgid "Share Public directory over Bluetooth"
-msgstr "Compartilhar diretório público pelo Bluetooth"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:5
-msgid "Share Public directory over the network"
-msgstr "Compartilhar diretório público pela rede"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:6
-msgid "When to accept files sent over Bluetooth"
-msgstr "Quando aceitar arquivos enviados pelo Bluetooth"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:7
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr ""
-"Quando aceitar arquivos enviados pelo Bluetooth. Valores possíveis são "
-"\"always\", \"bonded\", \"bonded_trusted\" e \"ask\"."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:8
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr ""
-"Quando perguntar por senhas. Valores possíveis são \"never\", \"on_write\", "
-"e \"always\"."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:9
-msgid "When to require passwords"
-msgstr "Quando exigir senhas"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "Clientes Bluetooth podem enviar arquivos usando ObexPush."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:11
-msgid "Whether Bluetooth clients need to pair with the computer to send files."
-msgstr "Emparelhar clientes Bluetooth com o computador para enviar arquivos."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:12
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr ""
-"Permitir clientes Bluetooth gravar arquivos, ou compartilhar arquivos "
-"somente para leitura."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:13
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "Permitir clientes Bluetooth gravar arquivos."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "Notificar sobre arquivos recebidos recentemente."
-
 #: ../data/file-share-properties.ui.h:1
-msgid "<b>Receive Files over Bluetooth</b>"
-msgstr "<b>Receber arquivos pelo Bluetooth</b>"
+msgid "Personal File Sharing Preferences"
+msgstr "Preferências de compartilhamento de arquivos pessoais"
 
 #: ../data/file-share-properties.ui.h:2
-msgid "<b>Share Files over Bluetooth</b>"
-msgstr "<b>Compartilhar arquivos pelo Bluetooth</b>"
-
-#: ../data/file-share-properties.ui.h:3
 msgid "<b>Share Files over the Network</b>"
 msgstr "<b>Compartilhar arquivos pela rede</b>"
 
+#: ../data/file-share-properties.ui.h:3
+msgid "_Share public files on network"
+msgstr "_Compartilhar arquivos públicos na rede"
+
 #: ../data/file-share-properties.ui.h:4
-msgid "Allo_w remote devices to delete files"
-msgstr "Acei_tar dispositivos remotos apagar arquivos"
+msgid "_Password:"
+msgstr "_Senha:"
 
 #: ../data/file-share-properties.ui.h:5
-msgid "Personal File Sharing Preferences"
-msgstr "Preferências de compartilhamento de arquivos pessoais"
+msgid "_Require password:"
+msgstr "_Exigir senha:"
 
 #: ../data/file-share-properties.ui.h:6
-msgid "Receive files in _Downloads folder over Bluetooth"
-msgstr "Receber arquivos na pasta _Downloads pelo Bluetooth"
+msgid "<b>Share Files over Bluetooth</b>"
+msgstr "<b>Compartilhar arquivos pelo Bluetooth</b>"
 
 #: ../data/file-share-properties.ui.h:7
-msgid "Require re_mote devices to bond with this computer"
-msgstr "Exigir dispositovs re_motos emparelhar com este computador"
-
-#: ../data/file-share-properties.ui.h:8
 msgid "Share public files over _Bluetooth"
 msgstr "Compartilhar arquivos públicos pelo _Bluetooth"
 
+#: ../data/file-share-properties.ui.h:8
+msgid "Allo_w remote devices to delete files"
+msgstr "Acei_tar dispositivos remotos apagar arquivos"
+
 #: ../data/file-share-properties.ui.h:9
-msgid "_Accept files: "
-msgstr "_Aceitar arquivos: "
+msgid "Require re_mote devices to bond with this computer"
+msgstr "Exigir dispositovs re_motos emparelhar com este computador"
 
 #: ../data/file-share-properties.ui.h:10
-msgid "_Notify about received files"
-msgstr "_Notificar sobre arquivos recebidos"
+msgid "<b>Receive Files over Bluetooth</b>"
+msgstr "<b>Receber arquivos pelo Bluetooth</b>"
 
 #: ../data/file-share-properties.ui.h:11
-msgid "_Password:"
-msgstr "_Senha:"
+msgid "Receive files in _Downloads folder over Bluetooth"
+msgstr "Receber arquivos na pasta _Downloads pelo Bluetooth"
 
 #: ../data/file-share-properties.ui.h:12
-msgid "_Require password:"
-msgstr "_Exigir senha:"
+msgid "_Accept files: "
+msgstr "_Aceitar arquivos: "
 
 #: ../data/file-share-properties.ui.h:13
-msgid "_Share public files on network"
-msgstr "_Compartilhar arquivos públicos na rede"
+msgid "_Notify about received files"
+msgstr "_Notificar sobre arquivos recebidos"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr "Compartilhamentos do Usuário"
 
-#: ../data/mateuser-share-properties.desktop.in.h:1
-#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr "Integra com o Compartilhamento do Usuário"
+
+#: ../data/mate-user-share-properties.desktop.in.h:1
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "Compartilhamento de arquivos pessoais"
 
-#: ../data/mateuser-share-properties.desktop.in.h:2
+#: ../data/mate-user-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Preferências para compartilhamento de arquivos"
 
-#: ../data/mateuser-share.desktop.in.in.h:1
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr "Compartilhamento de Arquivo Pessoal obexftp"
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Lança compartilhamento de arquivos pessoais se habilitado"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "Lançar preferências"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr "Compartilhamento de Arquivo Pessoal obexpush"
 
-#: ../src/caja-share-bar.c:187
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr "Compartilhamento de Arquivo Pessoal webdav"
+
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr "Preferências"
+
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Lançar preferências de compartilhamento de arquivos pessoais"
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
-msgstr ""
-"Não foi possível lançar as preferências de compartilhamento de arquivos "
-"pessoais"
+msgstr "Não foi possível lançar as preferências de compartilhamento de arquivos pessoais"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "Você pode compartilhar arquivos desta pasta e receber arquivos nela"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr "Pode ser usado para compartilhar ou receber arquivos"
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "Você pode compartilhar arquivos desta pasta pela rede e Bluetooth"
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr "Pode ser compartilhado pela rede ou Bluetooth"
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "Você pode receber arquivos pelo Bluetooth dentro desta pasta"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr "Pode ser compartilhado pela rede"
 
-#: ../src/file-share-properties.c:436
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr "Pode ser usado para receber arquivos via Bluetooth"
+
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "Sem razão"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "Não foi possível exibir o conteúdo de ajuda."
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "Não foi possível construir a interface."
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "Nunca"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "Ao escrever arquivos"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "Sempre"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "Somente para dispositivos configurados"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "Perguntar"
 
@@ -233,254 +178,36 @@ msgstr "Perguntar"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "Arquivos públicos de %s"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "Arquivos públicos de %s em %s"
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "Você recebeu \"%s\" pelo Bluetooth"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "Você recebeu um arquivo"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "Abrir arquivo"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "Revelar arquivo"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "Recebimento de arquivo completo"
-
-#~ msgid "Please log in as the user guest"
-#~ msgstr "Por favor inicie a sessão como usuário convidado"
-
-#~ msgid "Only for Bonded and Trusted devices"
-#~ msgstr "Somente para dispositivos emparelhados e confiáveis"
-
-#~ msgid "Enter Password for %s@%s"
-#~ msgstr "Digite a senha para %s@%s"
-
-#~ msgid "Select username"
-#~ msgstr "Selecionar nome de usuário"
-
-#~ msgid "Full name"
-#~ msgstr "Nome completo"
-
-#~ msgid "User name"
-#~ msgstr "Nome de usuário"
-
-#~ msgid ""
-#~ "Server, username and domain name cannot be empty. Please fill them with "
-#~ "correct values."
-#~ msgstr ""
-#~ "Servidor, nome de usuário e nome do domínio não podem estar vazios. Por "
-#~ "favor, preencha-os com os valores corretos."
-
-#~ msgid "Authentication finished successfully."
-#~ msgstr "Autenticação concluída com sucesso."
-
-#~ msgid "Authentication failed."
-#~ msgstr "Falha na autenticação."
-
-#~ msgid "_Domain name:"
-#~ msgstr "Nome de _domínio:"
-
-#~ msgid "_Authenticate"
-#~ msgstr "_Autenticar"
-
-#~ msgid "_Location:"
-#~ msgstr "_Localização:"
-
-#~ msgid "_Folder size"
-#~ msgstr "_Tamanho da pasta"
-
-#~ msgid "Folder"
-#~ msgstr "Pasta"
-
-#~ msgid "Size"
-#~ msgstr "Tamanho"
-
-#~ msgid "Unable to retrive folder size information"
-#~ msgstr "Não é possível recuperar as informações de tamanho da pasta"
-
-#~ msgid "Folder Size"
-#~ msgstr "Tamanho da pasta"
-
-#~ msgid "Fetching folder list ..."
-#~ msgstr "Obtendo lista de pastas ..."
-
-#~ msgid "Miscelleneous"
-#~ msgstr "Diversos"
-
-#~ msgid "View the size of all Exchange folders"
-#~ msgstr "Ver o tamanho de todas as pastas do Exchange"
-
-#~ msgid "Folders Size"
-#~ msgstr "Tamanho das pastas"
-
-#~ msgid "Exchange Settings"
-#~ msgstr "Configurações do Exchange"
-
-#~ msgid "Loading items in folder %s"
-#~ msgstr "Carregando itens na pasta %s"
-
-#~ msgid "Error fetching changes from the server."
-#~ msgstr "Erro ao obter as alterações do servidor."
-
-#~ msgid "Could not create cache file"
-#~ msgstr "Não foi possível criar o arquivo de cache"
-
-#~ msgid "Could not create thread for populating cache"
-#~ msgstr "Não foi possível criar a discussão para preencher o cache"
-
-#~ msgid ""
-#~ "Support for modifying single instances of a recurring appointment is not "
-#~ "yet implemented. No change was made to the appointment on the server."
-#~ msgstr ""
-#~ "O suporte para modificar instâncias únicas de um compromisso recorrente "
-#~ "ainda não foi implementado. Nenhuma alteração para o compromisso foi "
-#~ "feita no servidor."
-
-#~ msgid "Updating local summary cache for new messages in %s"
-#~ msgstr ""
-#~ "Atualizando resumo de informações locais para as novas mensagens em %s"
-
-#~ msgid "Retrieving message IDs from server for %s"
-#~ msgstr "Recuperando IDs das mensagens do servidor para %s"
-
-#~ msgid "Removing deleted messages from cache in %s"
-#~ msgstr "Removendo mensagens deletadas do cache em %s"
-
-#~ msgid "This message is not available in offline mode."
-#~ msgstr "Esta mensagem não está disponível no modo off-line."
-
-#~ msgid "Fetching summary information for new messages in %s"
-#~ msgstr "Extraindo resumo de informações para as novas mensagens em %s"
-
-#~ msgid "Fetching items failed"
-#~ msgstr "Falha ao extrair itens"
-
-#~ msgid ""
-#~ "Cannot get message: %s\n"
-#~ "  %s"
-#~ msgstr ""
-#~ "Não foi possível obter a mensagem: %s\n"
-#~ "  %s"
-
-#~ msgid "No such message"
-#~ msgstr "Não existe tal mensagem"
-
-#~ msgid "Message fetching cancelled by user."
-#~ msgstr "Extração da mensagem cancelada pelo usuário."
-
-#~ msgid "Cannot get message %s: %s"
-#~ msgstr "Não foi possível obter a mensagem %s: %s"
-
-#~ msgid "Could not get message"
-#~ msgstr "Não foi possível obter a mensagem"
-
-#~| msgid "Cannot create new folder `%s'"
-#~ msgid "Cannot append message to folder '%s'"
-#~ msgstr "Não foi possível anexar a mensagem à pasta \"%s\""
-
-#~ msgid "Offline. '%s'"
-#~ msgstr "\"%s\" desconectado. "
-
-#~ msgid "Could not load summary for %s"
-#~ msgstr "Não foi possível carregar o resumo para %s"
-
-#~ msgid "Checking for new mail"
-#~ msgstr "Verificando por novas mensagens"
-
-#~ msgid "C_heck for new messages in all folders"
-#~ msgstr "_Verificar por novas mensagens em todas as pastas"
-
-#~ msgid "Options"
-#~ msgstr "Opções"
-
-#~ msgid "Automatically synchroni_ze account locally"
-#~ msgstr "Sincroni_zar automaticamente a conta localmente"
-
-#~ msgid "_Apply filters to new messages in Inbox on this server"
-#~ msgstr ""
-#~ "_Aplicar filtros às novas mensagens na caixa de entrada deste servidor"
-
-#~ msgid "Check new messages for _Junk contents"
-#~ msgstr "Verificar se as novas mensagens contém _spam"
-
-#~ msgid "Only check for Junk messag_es in the Inbox folder"
-#~ msgstr "Verificar na caixa de entrada se as mensag_ens contém spam"
-
-#~ msgid "For accessing Microsoft Exchange / OpenChange servers using MAPI"
-#~ msgstr "Para acessar servidores Microsoft Exchange / OpenChange usando MAPI"
-
-#~ msgid ""
-#~ "This option will connect to the Openchange server using a plaintext "
-#~ "password."
-#~ msgstr ""
-#~ "Esta opção irá conectar ao servidor Openchange usando uma senha em texto "
-#~ "puro."
-
-#~ msgid "Favorites"
-#~ msgstr "Favoritos"
-
-#~ msgid "All Public Folders"
-#~ msgstr "Todas as pastas públicas"
-
-#~ msgid "Exchange MAPI server %s"
-#~ msgstr "Servidor Exchange MAPI %s"
-
-#~ msgid "Exchange MAPI service for %s on %s"
-#~ msgstr "Trocar o serviço MAPI para %s em %s"
-
-#~ msgid "%s Please enter the MAPI password for %s@%s"
-#~ msgstr "%s Por favor, digite a senha MAPI para %s@%s"
-
-#~ msgid "You did not enter a password."
-#~ msgstr "Você não digitou uma senha."
-
-#~ msgid "Unable to authenticate to Exchange MAPI server."
-#~ msgstr "Não foi possível autenticar no servidor Exchange MAPI."
-
-#~ msgid "Cannot create MAPI folders in offline mode."
-#~ msgstr "Não é possível criar uma pasta MAPI no modo offline."
-
-#~ msgid "Cannot create new folder `%s'"
-#~ msgstr "Não é possível criar a nova pasta \"%s\""
-
-#~ msgid "Cannot rename MAPI folder `%s'. Folder does not exist."
-#~ msgstr "Não é possível renomear a pasta MAPI \"%s\". A pasta não existe."
-
-#~ msgid "Cannot rename MAPI default folder `%s' to `%s'."
-#~ msgstr "Não é possível renomear a pasta padrão MAPI \"%s\" para \"%s\"."
-
-#~ msgid "Cannot rename MAPI folder `%s' to `%s'"
-#~ msgstr "Não é possível renomear a pasta MAPI \"%s\" para \"%s\""
-
-#~ msgid "Folder list not available in offline mode."
-#~ msgstr "Lista de pastas não disponível no modo offline."
-
-#~ msgid "Global Address List / Active Directory"
-#~ msgstr "Lista Global de Endereços (GAL) / Active Directory"
-
-#~ msgid "_Global Catalog server name:"
-#~ msgstr "Nome do servidor de Catálogo _Global:"
-
-#~ msgid "_Limit number of GAL responses: %s"
-#~ msgstr "_Limitar número de respostas do GAL: %s"
diff --git a/po/ro.po b/po/ro.po
index 26e97dd..319e868 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,228 +1,169 @@
-# This file is distributed under the same license as the mateuser-share package.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
 # Adi Roiban https://launchpad.net/~adiroiban, 2009
-# Lucian Adrian Grijincu <[email protected]>, 2009.
+# Daniel <[email protected]>, 2015
+# Lucian Adrian Grijincu <[email protected]>, 2009
 msgid ""
 msgstr ""
-"Project-Id-Version: mateuser-share\n"
-"Report-Msgid-Bugs-To: http://bugzilla.mateorg/enter_bug.cgi?product=mate"
-"user-share&component=general\n"
-"POT-Creation-Date: 2009-11-26 14:39+0000\n"
-"PO-Revision-Date: 2009-11-19 16:17+0300\n"
-"Last-Translator: Lucian Adrian Grijincu <[email protected]>\n"
-"Language-Team: Romanian Gnome Team <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: Daniel <[email protected]>\n"
+"Language-Team: Romanian (http://www.transifex.com/mate/MATE/language/ro/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ro\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
-"20)) ? 1 : 2);;\n"
-"X-Generator: Virtaal 0.4.0\n"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:1
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr ""
-"La activare, dispozitivele Bluetooth pot trimite fișiere în dosarul "
-"„Descărcări” când utilizatorul este autentificat."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr ""
-"La activare, dosarul „Public” din dosarul personal al utilizatorului va fi "
-"partajat prin Bluetooth când utilizatorul este autentificat."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:3
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr ""
-"La activare, dosarul „Public” din dosarul personal al utilizatorului va fi "
-"partajat prin rețea când utilizatorul este autentificat."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:4
-msgid "Share Public directory over Bluetooth"
-msgstr "Partajează prin Bluetooth dosarul „Public”"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:5
-msgid "Share Public directory over the network"
-msgstr "Partajează în rețea dosarul „Public”"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:6
-msgid "When to accept files sent over Bluetooth"
-msgstr "Când să fie acceptate fișierele trimise prin Bluetooth"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:7
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr ""
-"Când să fie acceptate fișierele trimise prin Bluetooth. Valorile posibile "
-"sunt „always”, „bonded” și „ask”."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:8
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr ""
-"Când să se ceară parole. Valorile posibile sunt „never”, „on_write” și "
-"„always”."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:9
-msgid "When to require passwords"
-msgstr "Când să se ceară parole"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr ""
-"Specifică dacă clienții Bluetooth pot trimite fișiere folosind ObexPush."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:11
-msgid "Whether Bluetooth clients need to pair with the computer to send files."
-msgstr ""
-"Specifică dacă clienții Bluetooth trebuie să se asocieze cu acest calculator "
-"pentru a trimite fișiere."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:12
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr ""
-"Specifică dacă se permite scrierea de fișiere clienților Bluetooth sau "
-"dacăfișierele să fie partajate doar pentru citire."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:13
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "Dacă se permite scrierea de fișiere clienților Bluetooth."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "Dacă să se notifice noile fișiere primite."
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
 #: ../data/file-share-properties.ui.h:1
-msgid "<b>Receive Files over Bluetooth</b>"
-msgstr "<b>Primire de fișiere prin Bluetooth</b>"
+msgid "Personal File Sharing Preferences"
+msgstr "Preferințe partajare fișiere personale"
 
 #: ../data/file-share-properties.ui.h:2
-msgid "<b>Share Files over Bluetooth</b>"
-msgstr "<b>Partajare de fișiere prin Bluetooth</b>"
-
-#: ../data/file-share-properties.ui.h:3
 msgid "<b>Share Files over the Network</b>"
 msgstr "<b>Partajare de fișiere în rețea</b>"
 
+#: ../data/file-share-properties.ui.h:3
+msgid "_Share public files on network"
+msgstr "Partajare de fișiere publice în _rețea"
+
 #: ../data/file-share-properties.ui.h:4
-msgid "Allo_w remote devices to delete files"
-msgstr "_Permite dispozitivelor la distanță să șteargă fișiere"
+msgid "_Password:"
+msgstr "_Parolă:"
 
 #: ../data/file-share-properties.ui.h:5
-msgid "Personal File Sharing Preferences"
-msgstr "Preferințe partajare fișiere personale"
+msgid "_Require password:"
+msgstr "Necesită pa_rolă:"
 
 #: ../data/file-share-properties.ui.h:6
-msgid "Receive files in _Downloads folder over Bluetooth"
-msgstr "Primește fișiere prin Bluetooth în dosarul _Descărcări"
+msgid "<b>Share Files over Bluetooth</b>"
+msgstr "<b>Partajare de fișiere prin Bluetooth</b>"
 
 #: ../data/file-share-properties.ui.h:7
-msgid "Require re_mote devices to bond with this computer"
-msgstr "_Cere dispozitivelor la distanță să se asocieze cu acest calculator"
-
-#: ../data/file-share-properties.ui.h:8
 msgid "Share public files over _Bluetooth"
 msgstr "Partajați fișiere publice prin _Bluetooth"
 
+#: ../data/file-share-properties.ui.h:8
+msgid "Allo_w remote devices to delete files"
+msgstr "_Permite dispozitivelor la distanță să șteargă fișiere"
+
 #: ../data/file-share-properties.ui.h:9
-msgid "_Accept files: "
-msgstr "_Acceptă fișiere:"
+msgid "Require re_mote devices to bond with this computer"
+msgstr "_Cere dispozitivelor la distanță să se asocieze cu acest calculator"
 
 #: ../data/file-share-properties.ui.h:10
-msgid "_Notify about received files"
-msgstr "_Notifică fișierele primite"
+msgid "<b>Receive Files over Bluetooth</b>"
+msgstr "<b>Primire de fișiere prin Bluetooth</b>"
 
 #: ../data/file-share-properties.ui.h:11
-msgid "_Password:"
-msgstr "_Parolă:"
+msgid "Receive files in _Downloads folder over Bluetooth"
+msgstr "Primește fișiere prin Bluetooth în dosarul _Descărcări"
 
 #: ../data/file-share-properties.ui.h:12
-msgid "_Require password:"
-msgstr "Necesită pa_rolă:"
+msgid "_Accept files: "
+msgstr "_Acceptă fișiere:"
 
 #: ../data/file-share-properties.ui.h:13
-msgid "_Share public files on network"
-msgstr "Partajare de fișiere publice în _rețea"
+msgid "_Notify about received files"
+msgstr "_Notifică fișierele primite"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
 
-#: ../data/mateuser-share-properties.desktop.in.h:1
-#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
+#: ../data/mate-user-share-properties.desktop.in.h:1
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "Partajare de fișiere personale"
 
-#: ../data/mateuser-share-properties.desktop.in.h:2
+#: ../data/mate-user-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Preferințe pentru partajarea fișierelor"
 
-#: ../data/mateuser-share.desktop.in.in.h:1
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "La activare, pornește partajarea de fișiere personale"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "Preferințe lansare"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr ""
 
-#: ../src/caja-share-bar.c:187
-msgid "Launch Personal File Sharing Preferences"
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
 msgstr ""
-"Lansează o fereastră de configurare a preferințelor partajării fișierelor "
-"personale"
 
-#: ../src/share-extension.c:82
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr "Preferințe"
+
+#: ../src/caja-share-bar.c:121
+msgid "Launch Personal File Sharing Preferences"
+msgstr "Lansează o fereastră de configurare a preferințelor partajării fișierelor personale"
+
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
-msgstr ""
-"Nu s-a putut lansa fereastra de configurare a preferințelor partajării "
-"fișierelor personale"
+msgstr "Nu s-a putut lansa fereastra de configurare a preferințelor partajării fișierelor personale"
+
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr "Poate fi folosită pentru a partaja și primi fișiere"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "Puteți partaja fișiere din acest dosar și puteți primi fișiere în el"
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr "Poate fi partajat în rețea sau prin Bluetooth"
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "Puteți partaja fișiere din acest dosar peste rețea sau prin Bluetooth"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr "Poate fi partajat în rețea"
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "Puteți primi fișiere prin Bluetooth în acest dosar"
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr "Poate fi folosit pentru a primi fișiere prin Bluetooth"
 
-#: ../src/file-share-properties.c:436
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "Fără motiv"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "Nu s-a putut afișa conținutul ajutorului."
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "Nu s-a putut construi interfața."
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "Niciodată"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "La scrierea fișierelor"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "Întotdeauna"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "Doar pentru dispozitivele configurate"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "Întreabă"
 
@@ -235,43 +176,36 @@ msgstr "Întreabă"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "Fișierele publice ale utilizatorului %s"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "Fișierele publice ale utilizatorului %s pe %s"
 
-#: ../src/http.c:372
-msgid "Please log in as the user guest"
-msgstr "Autentificați-vă ca utilizator oaspete"
-
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "Ați primit „%s” prin Bluetooth"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "Ați primit un fișier"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "Deschide fișier"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "Dezvăluie fișier"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "Fișierele au fost recepționate complet"
-
-#~ msgid "Only for Bonded and Trusted devices"
-#~ msgstr "Doar pentru dispozitivele asociate și de încredere"
diff --git a/po/ru.po b/po/ru.po
index 9b06242..32ebb41 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -3,89 +3,22 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# AlexL <[email protected]>, 2015
+# Михаил Ильинский <[email protected]>, 2015
 # Leonid Kanter <[email protected]>, 2006, 2010
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-26 22:51+0200\n"
-"PO-Revision-Date: 2013-03-11 19:48+0000\n"
-"Last-Translator: Alexei Sorokin <[email protected]>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/MATE/language/ru/)\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: AlexL <[email protected]>\n"
+"Language-Team: Russian (http://www.transifex.com/mate/MATE/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:1
-msgid "Share Public directory over the network"
-msgstr "Сделать файлы в каталоге Public общими через для доступа по сети"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr "Если этот параметр установлен, файлы в каталоге Public пользователя станут доступны по сети, когда он войдёт в систему."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:3
-msgid "When to require passwords"
-msgstr "Когда запрашивать пароли"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:4
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr "Когда запрашивать пароль. Возможные значения «never», «on_write», и «always»."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:5
-msgid "Share Public directory over Bluetooth"
-msgstr "Сделать файлы в каталоге Public общими через для доступа через Bluetooth"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:6
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr "Если этот параметр установлен, файлы в каталоге Public пользователя станут доступны через Bluetooth, когда пользователь войдёт в систему."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:7
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "Разрешить клиентам Bluetooth записывать файлы."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:8
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr "Будут ли клиенты Bluetooth записывать файлы или файлы будут доступны только для чтения."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:9
-msgid ""
-"Whether Bluetooth clients need to pair with the computer to send files."
-msgstr "Требовать от клиентов Bluetooth соединения с компьютером для передачи файлов."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "Разрешить клиентам Bluetooth посылать файлы с помощью ObexPush."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:11
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr "Если этот параметр установлен, устройства Bluetooth могут отправлять файлы в каталог Downloads пользователя после его входа в систему."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:12
-msgid "When to accept files sent over Bluetooth"
-msgstr "Действие при приёме файлов, отправленных через Bluetooth"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:13
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr "Действие при получении файлов по протоколу Bluetooth. Возможные значения: «always», «bonded», «bonded_trusted» и «ask»."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "Сообщать о получаемых файлах"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #: ../data/file-share-properties.ui.h:1
 msgid "Personal File Sharing Preferences"
@@ -139,8 +72,16 @@ msgstr "_Принимать файлы:"
 msgid "_Notify about received files"
 msgstr "И_звещать пользователя о получаемых файлах"
 
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr "Общий доступ к личным файлам"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr "Интегрируется с общим доступом к личным файлам"
+
 #: ../data/mate-user-share-properties.desktop.in.h:1
-#: ../data/mate-user-share.desktop.in.in.h:1 ../src/caja-share-bar.c:162
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "Общий доступ к личным файлам"
 
@@ -148,63 +89,81 @@ msgstr "Общий доступ к личным файлам"
 msgid "Preferences for sharing of files"
 msgstr "Параметры общего доступа к файлам"
 
-#: ../data/mate-user-share.desktop.in.in.h:2
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr "Общий доступ к личным файлам obexftp"
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Открыть общий доступ к личным файлам, если включено"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "Параметры запуска"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr "Общий доступ к личным файлам obexpush"
 
-#: ../src/caja-share-bar.c:187
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr "Общий доступ к личным файлам webdav"
+
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr "Параметры"
+
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Открыть параметры общего доступа к личным файлам"
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "Не удаётся открыть параметры общего доступа к личным файлам"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "Вы не можете открыть доступ к файлам из этой папки и принимать в неё файлы"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr "Может использоваться для обмена файлами"
+
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr "Может быть передана по сети или блютуз"
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "Вы можете сделать файлы из этой папки доступными по сети и протоколу Bluetooth"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr "Может быть передана по сети"
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "Вы можете получать файлы по протоколу Bluetooth в эту папку"
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr "Может использоваться для получения файлов по Bluetooth"
 
-#: ../src/file-share-properties.c:436
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "Нет причины"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "Не удалось отобразить справочную информацию."
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "Не удалось создать интерфейс пользователя."
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "Никогда"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "При записи файлов"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "Всегда"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "Только для подключённых устройств"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "Спрашивать пользователя"
 
@@ -217,36 +176,36 @@ msgstr "Спрашивать пользователя"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "Общие файлы пользователя %s"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "Общие файлы пользователя %s на %s"
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "Через Bluetooth получен файл «%s»"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "Получен файл"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "Открыть файл"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "Показать файл"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "Получение файла завершено"
diff --git a/po/rw.po b/po/rw.po
index 2de13c7..31b3b71 100644
--- a/po/rw.po
+++ b/po/rw.po
@@ -1,105 +1,175 @@
-# translation of mateuser-share to Kinyarwanda.
-# Copyright (C) 2005 Free Software Foundation, Inc.
-# This file is distributed under the same license as the mateuser-share package.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Augustin KIBERWA  <[email protected]>, 2005
+# Carole Karema <[email protected]>, 2005
+# JEAN BAPTISTE NGENDAHAYO <[email protected]>, 2005
+# Noëlla Mupole <[email protected]>, 2005
+# Philibert Ndandali  <[email protected]>, 2005
 # Steve Murphy <[email protected]>, 2005
-# Steve performed initial rough translation from compendium built from translations provided by the following translators:
-# Philibert Ndandali  <[email protected]>, 2005.
-# Viateur MUGENZI <[email protected]>, 2005.
-# Noëlla Mupole <[email protected]>, 2005.
-# Carole Karema <[email protected]>, 2005.
-# JEAN BAPTISTE NGENDAHAYO <[email protected]>, 2005.
-# Augustin KIBERWA  <[email protected]>, 2005.
-# Donatien NSENGIYUMVA <[email protected]>, 2005..
-#
+# Viateur MUGENZI <[email protected]>, 2005
 msgid ""
 msgstr ""
-"Project-Id-Version: mateuser-share HEAD\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-04-01 15:20-0700\n"
-"PO-Revision-Date: 2005-03-31 20:55-0700\n"
-"Last-Translator: Steve Murphy <[email protected]>\n"
-"Language-Team: Kinyarwanda <[email protected]>\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: monsta <[email protected]>\n"
+"Language-Team: Kinyarwanda (http://www.transifex.com/mate/MATE/language/rw/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"ULL NAME <EMAIL@ADDRESS>\n"
+"Language: rw\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: desktop_matefile_sharing.schemas.in.h:1
-#, fuzzy
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared when the user is logged in."
+#: ../data/file-share-properties.ui.h:1
+msgid "Personal File Sharing Preferences"
 msgstr ""
-"iyi ni NIBYO i bushyinguro in i Ku Ntangiriro bushyinguro Ryari: i Ukoresha: "
-"ni in"
 
-#: desktop_matefile_sharing.schemas.in.h:2
-#, fuzzy
-msgid "Share Public directory"
-msgstr "bushyinguro"
+#: ../data/file-share-properties.ui.h:2
+msgid "<b>Share Files over the Network</b>"
+msgstr ""
 
-#: desktop_matefile_sharing.schemas.in.h:3
-#, fuzzy
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr "Kuri kugirango Amagambo banga Uduciro Nta narimwe Na Buri gihe"
-
-#: desktop_matefile_sharing.schemas.in.h:4
-#, fuzzy
-msgid "When to require passwords"
-msgstr "Kuri Amagambo banga"
-
-# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# officecfg/registry\schema\org\openoffice\Office\Common.xcs:....Security.Scripting.OfficeBasic..0.text
-# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Content.Update.Link..2.text
-#: file-share-properties.c:290
+#: ../data/file-share-properties.ui.h:3
+msgid "_Share public files on network"
+msgstr ""
+
+#: ../data/file-share-properties.ui.h:4
+msgid "_Password:"
+msgstr ""
+
+#: ../data/file-share-properties.ui.h:5
+msgid "_Require password:"
+msgstr ""
+
+#: ../data/file-share-properties.ui.h:6
+msgid "<b>Share Files over Bluetooth</b>"
+msgstr ""
+
+#: ../data/file-share-properties.ui.h:7
+msgid "Share public files over _Bluetooth"
+msgstr ""
+
+#: ../data/file-share-properties.ui.h:8
+msgid "Allo_w remote devices to delete files"
+msgstr ""
+
+#: ../data/file-share-properties.ui.h:9
+msgid "Require re_mote devices to bond with this computer"
+msgstr ""
+
+#: ../data/file-share-properties.ui.h:10
+msgid "<b>Receive Files over Bluetooth</b>"
+msgstr ""
+
+#: ../data/file-share-properties.ui.h:11
+msgid "Receive files in _Downloads folder over Bluetooth"
+msgstr ""
+
+#: ../data/file-share-properties.ui.h:12
+msgid "_Accept files: "
+msgstr ""
+
+#: ../data/file-share-properties.ui.h:13
+msgid "_Notify about received files"
+msgstr ""
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
+
+#: ../data/mate-user-share-properties.desktop.in.h:1
+#: ../src/caja-share-bar.c:103
+msgid "Personal File Sharing"
+msgstr ""
+
+#: ../data/mate-user-share-properties.desktop.in.h:2
+msgid "Preferences for sharing of files"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
+msgid "Launch Personal File Sharing if enabled"
+msgstr ""
+
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr ""
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr ""
+
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr ""
+
+#: ../src/caja-share-bar.c:121
+msgid "Launch Personal File Sharing Preferences"
+msgstr ""
+
+#: ../src/share-extension.c:73
+msgid "Unable to launch the Personal File Sharing preferences"
+msgstr ""
+
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr ""
+
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr ""
+
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr ""
+
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr ""
+
+#: ../src/file-share-properties.c:417
+msgid "No reason"
+msgstr ""
+
+#: ../src/file-share-properties.c:445
+msgid "Could not display the help contents."
+msgstr ""
+
+#: ../src/file-share-properties.c:507
+msgid "Could not build interface."
+msgstr ""
+
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "Nta narimwe"
 
-#: file-share-properties.c:293
-#, fuzzy
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
-msgstr "Idosiye"
-
-# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# officecfg/registry\schema\org\openoffice\Office\Common.xcs:....Security.Scripting.OfficeBasic..2.text
-# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Content.Update.Link..0.text
-# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Wizard.Letter.Print.Sender..0.text
-# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Wizard.Letter.Print.Logo..0.text
-#: file-share-properties.c:296
+msgstr ""
+
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "Buri gihe"
 
-#: file-share-properties.glade.h:1
-#, fuzzy
-msgid "<b>Share Files</b>"
-msgstr "<B B"
-
-#: file-share-properties.glade.h:2
-#, fuzzy
-msgid "File Sharing Preferences"
-msgstr "Idosiye"
-
-#: file-share-properties.glade.h:3
-#, fuzzy
-msgid "Share Public files on network"
-msgstr "Idosiye ku urusobe"
-
-# basctl/source\basicide\moduldlg.src:RID_TP_LIBS.RID_PB_PASSWORD.text
-#: file-share-properties.glade.h:4
-#, fuzzy
-msgid "_Password:"
-msgstr "Ijambobanga..."
+#: ../src/file-share-properties.c:580
+msgid "Only for set up devices"
+msgstr ""
 
-#: file-share-properties.glade.h:5
-#, fuzzy
-msgid "_Require password:"
-msgstr "Ijambobanga..."
+#: ../src/file-share-properties.c:585
+msgid "Ask"
+msgstr ""
 
 #. Translators: The %s will get filled in with the user name
 #. of the user, to form a genitive. If this is difficult to
@@ -110,7 +180,36 @@ msgstr "Ijambobanga..."
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: user_share.c:157
-#, fuzzy, c-format
+#: ../src/http.c:129
+#, c-format
 msgid "%s's public files"
-msgstr "%s'S Rusange Idosiye"
+msgstr ""
+
+#. Translators: This is similar to the string before, only it
+#. has the hostname in it too.
+#: ../src/http.c:133
+#, c-format
+msgid "%s's public files on %s"
+msgstr ""
+
+#. Translators: %s is the name of the filename received
+#: ../src/obexpush.c:136
+#, c-format
+msgid "You received \"%s\" via Bluetooth"
+msgstr ""
+
+#: ../src/obexpush.c:138
+msgid "You received a file"
+msgstr ""
+
+#: ../src/obexpush.c:148
+msgid "Open File"
+msgstr ""
+
+#: ../src/obexpush.c:152
+msgid "Reveal File"
+msgstr ""
+
+#: ../src/obexpush.c:169
+msgid "File reception complete"
+msgstr ""
diff --git a/po/sk.po b/po/sk.po
index ebe49bf..5d289b9 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-11-06 15:07+0300\n"
-"PO-Revision-Date: 2016-01-17 12:54+0000\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
 "Last-Translator: Dušan Kazik <[email protected]>\n"
 "Language-Team: Slovak (http://www.transifex.com/mate/MATE/language/sk/)\n"
 "MIME-Version: 1.0\n"
diff --git a/po/sl.po b/po/sl.po
index e8f27f2..fd20f34 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -3,90 +3,21 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# jierro <[email protected]>, 2013
+# Damir Jerovšek <[email protected]>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-26 22:51+0200\n"
-"PO-Revision-Date: 2014-02-19 18:36+0000\n"
-"Last-Translator: jierro <[email protected]>\n"
-"Language-Team: Slovenian (http://www.transifex.com/projects/p/MATE/language/sl/)\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: monsta <[email protected]>\n"
+"Language-Team: Slovenian (http://www.transifex.com/mate/MATE/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
-#: ../data/desktop_mate_file_sharing.schemas.in.h:1
-msgid "Share Public directory over the network"
-msgstr "Souporaba javne mape preko omrežja"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr "Možnost omogoča, da bo javna mapa v uporabnikovi domači mapi v souporabi preko omrežja, ko je uporabnik prijavljen v sistem."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:3
-msgid "When to require passwords"
-msgstr "Kdaj zahtevati gesla"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:4
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr "Kdaj zahtevati geslo. Mogoče vrednosti so \"never\" (nikoli), \"on_write\" (med pisanjem) in \"always\" (vedno)."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:5
-msgid "Share Public directory over Bluetooth"
-msgstr "Souporaba javne mape preko povezave Bluetooth"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:6
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr "Možnost omogoča, da je javna mapa v uporabnikovi domači mapi v souporabi preko povezave Bluetooth, ko je uporabnik prijavljen v sistem."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:7
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "Možnost omogoča, da odjemalci Bluetootha lahko zapisujejo datoteke."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:8
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr "Možnost omogoča, da Bluetooth odjemalci zapisujejo datoteke ali souporabljajo datoteke, ki so le za branje."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:9
-msgid ""
-"Whether Bluetooth clients need to pair with the computer to send files."
-msgstr "Možnost omogoča, da se morajo odjemalci Bluetootha najprej povezati z računalnikom za pošiljanje datotek."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "Možnost omogoča, da odjemalci Bluetootha pošiljajo datoteke preko sistema ObexPush."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:11
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr "Možnost omogoča, da naprave Bluetooth pošiljajo datoteke v uporabnikovo mapo prejetih datotek, ko je uporabnik prijavljen v sistem."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:12
-msgid "When to accept files sent over Bluetooth"
-msgstr "Kdaj sprejeti datoteke poslane preko Bluetootha."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:13
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr "Kdaj naj bodo sprejete datoteke poslane preko bluetootha? Mogoče vrednosti so \"always\" (vedno), \"bonded\" (ob povezavi) in \"ask\" (vprašaj)."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "Možnost omogoča, da sistem obvesti o novo prispelih datotekah."
-
 #: ../data/file-share-properties.ui.h:1
 msgid "Personal File Sharing Preferences"
 msgstr "Možnosti souporabe osebnih datotek"
@@ -139,8 +70,16 @@ msgstr "_Sprejmi datoteke: "
 msgid "_Notify about received files"
 msgstr "_Obvesti o prejetih datotekah"
 
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
+
 #: ../data/mate-user-share-properties.desktop.in.h:1
-#: ../data/mate-user-share.desktop.in.in.h:1 ../src/caja-share-bar.c:162
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "Souporaba osebnih datotek"
 
@@ -148,63 +87,81 @@ msgstr "Souporaba osebnih datotek"
 msgid "Preferences for sharing of files"
 msgstr "Možnosti souporabe datotek"
 
-#: ../data/mate-user-share.desktop.in.in.h:2
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Zaženi souporabo osebnih datotek, kadar je ta omogočena"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "Možnosti zagona"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr ""
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr ""
 
-#: ../src/caja-share-bar.c:187
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr ""
+
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Zagon možnosti souporabe osebnih datotek"
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "Ni mogoče zagnati možnosti osebne souporabe datotek"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "Datoteke iz te mape lahko souporabljate in hkrati v to mapo prejemate nove datoteke"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr ""
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "Datoteke iz te mape lahko souporabljate preko omrežja in preko Bluetootha"
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr ""
+
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr ""
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "Datoteke, prejete preko Bluetooth vmesnika, lahko prejemate v to mapo"
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr ""
 
-#: ../src/file-share-properties.c:436
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "Brez razloga"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "Ni mogoče prikazati vsebine pomoči."
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "Ni mogoče izgraditi vmesnika."
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "Nikoli"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "Med pisanjem datotek"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "Vedno"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "Le za nastavljene naprave"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "Vprašaj"
 
@@ -217,36 +174,36 @@ msgstr "Vprašaj"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "Javne datoteke osebe %s"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "Javne datoteke osebe %s na %s"
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "Prejeli ste datoteko \"%s\" preko Bluetootha"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "Prejeli ste datoteko"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "Odpri datoteko"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "Razkrij datoteko"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "Prejemanje datoteke je končano"
diff --git a/po/sq.po b/po/sq.po
index 0b1fc3c..6308f53 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -1,75 +1,169 @@
-# Përkthimi i mesazheve të mateuser-share në shqip
-# Copyright (C) 2005 Free Software Foundation, Inc.
-# This file is distributed under the same license as the mateuser-share package.
-# Elian Myftiu <[email protected]>, 2005.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Elian Myftiu <[email protected]>, 2005
 msgid ""
 msgstr ""
-"Project-Id-Version: mateuser-share HEAD\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-07 13:03+0200\n"
-"PO-Revision-Date: 2005-09-07 19:05+0200\n"
-"Last-Translator: Elian Myftiu <[email protected]>\n"
-"Language-Team: Albanian <[email protected]>\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: monsta <[email protected]>\n"
+"Language-Team: Albanian (http://www.transifex.com/mate/MATE/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sq\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../desktop_matefile_sharing.schemas.in.h:1
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared when the user is logged in."
+#: ../data/file-share-properties.ui.h:1
+msgid "Personal File Sharing Preferences"
 msgstr ""
-"Nëse e vërtetë, directory Public në directory e shtëpisë së përdoruesve do "
-"të jetë e përbashkët me të tjerë kur përdoruesi nis sesionin e tij."
 
-#: ../desktop_matefile_sharing.schemas.in.h:2
-msgid "Share Public directory"
-msgstr "Ndaj skedarin Public me të tjerë"
+#: ../data/file-share-properties.ui.h:2
+msgid "<b>Share Files over the Network</b>"
+msgstr ""
 
-#: ../desktop_matefile_sharing.schemas.in.h:3
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
+#: ../data/file-share-properties.ui.h:3
+msgid "_Share public files on network"
+msgstr ""
+
+#: ../data/file-share-properties.ui.h:4
+msgid "_Password:"
+msgstr "_Fjalëkalimi:"
+
+#: ../data/file-share-properties.ui.h:5
+msgid "_Require password:"
+msgstr "_Kërko fjalëkalimin:"
+
+#: ../data/file-share-properties.ui.h:6
+msgid "<b>Share Files over Bluetooth</b>"
+msgstr ""
+
+#: ../data/file-share-properties.ui.h:7
+msgid "Share public files over _Bluetooth"
+msgstr ""
+
+#: ../data/file-share-properties.ui.h:8
+msgid "Allo_w remote devices to delete files"
+msgstr ""
+
+#: ../data/file-share-properties.ui.h:9
+msgid "Require re_mote devices to bond with this computer"
+msgstr ""
+
+#: ../data/file-share-properties.ui.h:10
+msgid "<b>Receive Files over Bluetooth</b>"
+msgstr ""
+
+#: ../data/file-share-properties.ui.h:11
+msgid "Receive files in _Downloads folder over Bluetooth"
+msgstr ""
+
+#: ../data/file-share-properties.ui.h:12
+msgid "_Accept files: "
+msgstr ""
+
+#: ../data/file-share-properties.ui.h:13
+msgid "_Notify about received files"
+msgstr ""
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
+
+#: ../data/mate-user-share-properties.desktop.in.h:1
+#: ../src/caja-share-bar.c:103
+msgid "Personal File Sharing"
+msgstr ""
+
+#: ../data/mate-user-share-properties.desktop.in.h:2
+msgid "Preferences for sharing of files"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
+msgid "Launch Personal File Sharing if enabled"
+msgstr ""
+
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr ""
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
 msgstr ""
-"Kur duhet kërkuar fjalëkalimi. Vlerat e mundëshme janë \"never\", \"on_write\", "
-"dhe \"always\"."
 
-#: ../desktop_matefile_sharing.schemas.in.h:4
-msgid "When to require passwords"
-msgstr "Kur kërkon fjalëkalime"
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr ""
+
+#: ../src/caja-share-bar.c:121
+msgid "Launch Personal File Sharing Preferences"
+msgstr ""
+
+#: ../src/share-extension.c:73
+msgid "Unable to launch the Personal File Sharing preferences"
+msgstr ""
+
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr ""
+
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr ""
+
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr ""
 
-#: ../file-share-properties.c:290
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr ""
+
+#: ../src/file-share-properties.c:417
+msgid "No reason"
+msgstr ""
+
+#: ../src/file-share-properties.c:445
+msgid "Could not display the help contents."
+msgstr ""
+
+#: ../src/file-share-properties.c:507
+msgid "Could not build interface."
+msgstr ""
+
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "Asnjëherë"
 
-#: ../file-share-properties.c:293
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "Kur shkruan skeda"
 
-#: ../file-share-properties.c:296
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "Gjithmonë"
 
-#: ../file-share-properties.glade.h:1
-msgid "<b>Share Files</b>"
-msgstr "<b>Ndaj Skeda me të Tjerë</b>"
-
-#: ../file-share-properties.glade.h:2
-msgid "File Sharing Preferences"
-msgstr "Preferimet e Ndarjes së Skedave"
-
-#: ../file-share-properties.glade.h:3
-msgid "Share Public files on network"
-msgstr "Ndaj skedat e Public në rrjet me të tjerë"
-
-#: ../file-share-properties.glade.h:4
-msgid "_Password:"
-msgstr "_Fjalëkalimi:"
+#: ../src/file-share-properties.c:580
+msgid "Only for set up devices"
+msgstr ""
 
-#: ../file-share-properties.glade.h:5
-msgid "_Require password:"
-msgstr "_Kërko fjalëkalimin:"
+#: ../src/file-share-properties.c:585
+msgid "Ask"
+msgstr ""
 
 #. Translators: The %s will get filled in with the user name
 #. of the user, to form a genitive. If this is difficult to
@@ -80,8 +174,36 @@ msgstr "_Kërko fjalëkalimin:"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../user_share.c:157
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "Skedat publike të %s"
 
+#. Translators: This is similar to the string before, only it
+#. has the hostname in it too.
+#: ../src/http.c:133
+#, c-format
+msgid "%s's public files on %s"
+msgstr ""
+
+#. Translators: %s is the name of the filename received
+#: ../src/obexpush.c:136
+#, c-format
+msgid "You received \"%s\" via Bluetooth"
+msgstr ""
+
+#: ../src/obexpush.c:138
+msgid "You received a file"
+msgstr ""
+
+#: ../src/obexpush.c:148
+msgid "Open File"
+msgstr ""
+
+#: ../src/obexpush.c:152
+msgid "Reveal File"
+msgstr ""
+
+#: ../src/obexpush.c:169
+msgid "File reception complete"
+msgstr ""
diff --git a/po/sr.po b/po/sr.po
index 4d5b00d..17228b7 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -8,85 +8,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-26 22:51+0200\n"
-"PO-Revision-Date: 2014-11-16 13:38+0000\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
 "Last-Translator: Мирослав Николић <[email protected]>\n"
-"Language-Team: Serbian (http://www.transifex.com/projects/p/MATE/language/sr/)\n"
+"Language-Team: Serbian (http://www.transifex.com/mate/MATE/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../data/desktop_mate_file_sharing.schemas.in.h:1
-msgid "Share Public directory over the network"
-msgstr "Дели фасциклу „Јавно“ преко мреже"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr "Ако је изабрано, фасцикла „Јавно“ у корисничкој личној фасцикли биће дељена преко мреже када је корисник пријављен."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:3
-msgid "When to require passwords"
-msgstr "Када да захтева лозинку"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:4
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr "Када ће захтевати унос лозинке. Могуће вредности су „never“ (никада), „on_write“ (при упису) и „always“ (увек)."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:5
-msgid "Share Public directory over Bluetooth"
-msgstr "Дели фасциклу „Јавно“ преко блутут везе"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:6
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr "Ако је изабрано, фасцикла „Јавно“ у корисничкој личној фасцикли биће дељена преко блутута када је корисник пријављен."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:7
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "Да ли блутут клијенти могу да уписују датотеке."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:8
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr "Одређује да ли блутут клијенти могу да уписују датотеке или се датотеке деле само као неуписиве."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:9
-msgid ""
-"Whether Bluetooth clients need to pair with the computer to send files."
-msgstr "Да ли блутут клијенти морају бити упарени са рачунаром за слање датотека."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "Да ли блутут клијенти могу послати датотеке користећи Обекс гурање."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:11
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr "Ако је изабрано, блутут уређаји могу да шаљу датотеке у корисникову фасциклу за преузимања када је пријављен."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:12
-msgid "When to accept files sent over Bluetooth"
-msgstr "Када да прихвати датотека послате преко блутут везе"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:13
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr "Одређује када је дозвољено прихватање датотека са блутут везе. Могуће вредности су „always“ (увек), „bonded“ (упарени) и „ask“ (питај)."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "Да ли да обавести о ново примљеним датотекама."
-
 #: ../data/file-share-properties.ui.h:1
 msgid "Personal File Sharing Preferences"
 msgstr "Поставке дељења личних датотека"
@@ -139,8 +70,16 @@ msgstr "_Прихвати датотеке: "
 msgid "_Notify about received files"
 msgstr "_Обавести о примљеним датотекама"
 
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr "Корисничко дељење"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr "Обједињује се са корисничким дељењем"
+
 #: ../data/mate-user-share-properties.desktop.in.h:1
-#: ../data/mate-user-share.desktop.in.in.h:1 ../src/caja-share-bar.c:162
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "Дељење личних датотека"
 
@@ -148,63 +87,81 @@ msgstr "Дељење личних датотека"
 msgid "Preferences for sharing of files"
 msgstr "Поставке за дељење датотека"
 
-#: ../data/mate-user-share.desktop.in.in.h:2
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr "Обексфтп дељења личних датотека"
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Покреће дељење личних датотека ако је омогућено"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "Покрени поставке"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr "Обексгурни дељења личних датотека"
 
-#: ../src/caja-share-bar.c:187
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr "Вебдав дељења личних датотека"
+
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr "Поставке"
+
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Покреће поставке за дељење личних датотека"
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "Не могу да покренем поставке за дељење личних датотека"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "Можете делити датотеке из ове фасцикле и чувати примљене датотеке у њу"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr "Може да се користи за дељење или примање датотека"
+
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr "Може да се дели преко мреже или блутутом"
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "Можете делити датотеке из ове фасцикле преко мреже или блутута"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr "Може да се дели преко мреже"
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "Можете чувати примљене блутут датотеке у ову фасциклу"
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr "Може да се користи за примање датотека путем блутута"
 
-#: ../src/file-share-properties.c:436
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "Без разлога"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "Не могу да прикажем садржај помоћи."
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "Не могу да изградим сучеље."
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "Никад"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "При упису датотека"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "Увек"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "Само за упарене уређаје"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "Питај"
 
@@ -217,36 +174,36 @@ msgstr "Питај"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "Јавне датотеке корисника „%s“"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "Јавне датотеке корисника „%s“ на рачунару „%s“"
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "Примили сте „%s“ преко блутут везе"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "Примили сте датотеку"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "Отвори датотеку"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "Прикажи датотеку"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "Пријем датотеке је завршен"
diff --git a/po/[email protected] b/po/[email protected]
index 3937fbe..05ee970 100644
--- a/po/[email protected]
+++ b/po/[email protected]
@@ -1,231 +1,166 @@
-# Serbian translation of caja
-# Courtesy of Prevod.org team (http://prevod.org/) -- 2009.
-#
-# This file is distributed under the same license as the mateuser-share package.
-#
-# Maintainer: Goran Rakić <[email protected]>
-# Previous translators:
-#    Ivan Bulatović <[email protected]>
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: mateuser-share\n"
-"Report-Msgid-Bugs-To: http://bugzilla.mateorg/enter_bug.cgi?product=mate"
-"user-share&component=general\n"
-"POT-Creation-Date: 2010-02-22 13:30+0000\n"
-"PO-Revision-Date: 2010-03-07 17:36+0100\n"
-"Last-Translator: Goran Rakic <[email protected]>\n"
-"Language-Team: Serbian (sr) <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: monsta <[email protected]>\n"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/mate/MATE/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4;    plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 :    n"
-"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:1
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr ""
-"Blutut uređaji mogu poslati daoteke u korisničku fasciklu „Preuzeto“ kada je "
-"korisnik prijavljen."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr ""
-"Fascikla „Javno“ u korisničkoj fascikli je deljena preko blutut veze kada je "
-"korisnik prijavljen."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:3
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr ""
-"Fascikla „Javno“ u korisničkoj fasckili je deljena preko mreže kada je "
-"korisnik prijavljen."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:4
-msgid "Share Public directory over Bluetooth"
-msgstr "Deli fasciklu „Javno“ preko blutut veze"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:5
-msgid "Share Public directory over the network"
-msgstr "Deli fasciklu „Javno“ preko mreže"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:6
-msgid "When to accept files sent over Bluetooth"
-msgstr "Dozvoljeno prihvatanje datoteka sa blutut veze"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:7
-#| msgid ""
-#| "When to accept files sent over Bluetooth. Possible values are \"always\", "
-#| "\"bonded\", \"bonded_trusted\" and \"ask\"."
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr ""
-"Određuje kada je dozvoljeno prihvatanje datoteka sa blutut veze. Moguće "
-"vrednosti su „always“ (uvek), „bonded“ (upareni) i „ask“ (pitaj)."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:8
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr ""
-"Određuje kada je zahtevan unos lozinke. Moguće vrednosti su "
-"„never“ (nikada), „on_write“ (pri upisu) i „always“ (uvek)."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:9
-msgid "When to require passwords"
-msgstr "Zahtevan unos lozinke"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "Blutut klijenti mogu poslati datoteke kroz „ObexPush“"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:11
-msgid "Whether Bluetooth clients need to pair with the computer to send files."
-msgstr "Blutut klijenti moraju biti upareni sa računarom za slanje datoteka."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:12
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr ""
-"Određuje da li blutut klijenti mogu da upisuju datoteke ili se datoteke dele "
-"samo kao neupisive."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:13
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "Blutut klijenti mogu da upisuju datoteke."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "Obavesti o novim primljenim datotekama."
+"Language: sr@latin\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: ../data/file-share-properties.ui.h:1
-msgid "<b>Receive Files over Bluetooth</b>"
-msgstr "<b>Prijem datoteka preko blututa</b>"
+msgid "Personal File Sharing Preferences"
+msgstr "Postavke deljenja ličnih datoteka"
 
 #: ../data/file-share-properties.ui.h:2
-msgid "<b>Share Files over Bluetooth</b>"
-msgstr "<b>Deljenje datoteka preko blututa</b>"
-
-#: ../data/file-share-properties.ui.h:3
 msgid "<b>Share Files over the Network</b>"
 msgstr "<b>Deljenje datoteka preko mreže</b>"
 
+#: ../data/file-share-properties.ui.h:3
+msgid "_Share public files on network"
+msgstr "Deli javne datoteke preko _mreže"
+
 #: ../data/file-share-properties.ui.h:4
-msgid "Allo_w remote devices to delete files"
-msgstr "Udaljeni uređaji mogu da _brišu datoteke"
+msgid "_Password:"
+msgstr "_Lozinka:"
 
 #: ../data/file-share-properties.ui.h:5
-msgid "Personal File Sharing Preferences"
-msgstr "Postavke deljenja ličnih datoteka"
+msgid "_Require password:"
+msgstr "_Neophodna lozinka:"
 
 #: ../data/file-share-properties.ui.h:6
-msgid "Receive files in _Downloads folder over Bluetooth"
-msgstr "Primi datoteke preko blututa u fasciklu „Primljeno“"
+msgid "<b>Share Files over Bluetooth</b>"
+msgstr "<b>Deljenje datoteka preko blututa</b>"
 
 #: ../data/file-share-properties.ui.h:7
-msgid "Require re_mote devices to bond with this computer"
-msgstr "Traži uparivanje udaljenih uređaja sa računarom"
-
-#: ../data/file-share-properties.ui.h:8
 msgid "Share public files over _Bluetooth"
 msgstr "Deli javne datoteke preko _blututa"
 
+#: ../data/file-share-properties.ui.h:8
+msgid "Allo_w remote devices to delete files"
+msgstr "Udaljeni uređaji mogu da _brišu datoteke"
+
 #: ../data/file-share-properties.ui.h:9
-msgid "_Accept files: "
-msgstr "_Prihvati datoteke: "
+msgid "Require re_mote devices to bond with this computer"
+msgstr "Traži uparivanje udaljenih uređaja sa računarom"
 
 #: ../data/file-share-properties.ui.h:10
-msgid "_Notify about received files"
-msgstr "_Obavesti o primljenim datotekama"
+msgid "<b>Receive Files over Bluetooth</b>"
+msgstr "<b>Prijem datoteka preko blututa</b>"
 
 #: ../data/file-share-properties.ui.h:11
-msgid "_Password:"
-msgstr "_Lozinka:"
+msgid "Receive files in _Downloads folder over Bluetooth"
+msgstr "Primi datoteke preko blututa u fasciklu „Primljeno“"
 
 #: ../data/file-share-properties.ui.h:12
-msgid "_Require password:"
-msgstr "_Neophodna lozinka:"
+msgid "_Accept files: "
+msgstr "_Prihvati datoteke: "
 
 #: ../data/file-share-properties.ui.h:13
-msgid "_Share public files on network"
-msgstr "Deli javne datoteke preko _mreže"
+msgid "_Notify about received files"
+msgstr "_Obavesti o primljenim datotekama"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
 
-#: ../data/mateuser-share-properties.desktop.in.h:1
-#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
+#: ../data/mate-user-share-properties.desktop.in.h:1
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "Deljenje ličnih datoteka"
 
-#: ../data/mateuser-share-properties.desktop.in.h:2
+#: ../data/mate-user-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Postavke za deljenje datoteka"
 
-#: ../data/mateuser-share.desktop.in.in.h:1
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Pokreće deljenje ličnih datoteka ako je omogućeno"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "Pokreni postavke"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr ""
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr ""
+
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr ""
 
-#: ../src/caja-share-bar.c:187
-#| msgid "Personal File Sharing Preferences"
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Pokreće postavke za deljenje ličnih datoteka"
 
-#: ../src/share-extension.c:82
-#| msgid "Personal File Sharing Preferences"
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "Ne mogu da pokrenem postavke za deljenje ličnih datoteka"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "Možete deliti datoteke iz ove fascikle i čuvati primljene datoteke u nju"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr ""
+
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr ""
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "Možete deliti datoteke iz ove fascikle preko mreže ili blututa"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr ""
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "Možete čuvati primljene blutut datoteke u ovu fasciklu"
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr ""
 
-#: ../src/file-share-properties.c:436
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "Bez razloga"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "Ne mogu da prikažem sadržaj pomoći."
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "Ne mogu da izgradim sučelje."
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "Nikad"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "Pri upisu datoteka"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "Uvek"
 
-#: ../src/file-share-properties.c:598
-#| msgid "Only for Bonded devices"
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "Samo za uparene uređaje"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "Pitaj"
 
@@ -238,45 +173,36 @@ msgstr "Pitaj"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "Javne datoteke korisnika „%s“"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "Javne datoteke korisnika „%s“ na računaru „%s“"
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "Priimili ste „%s“ preko blutut veze"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "Primili ste datoteku"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "Otvori datoteku"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "Prikaži datoteku"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "Prijem datoteke je završen"
-
-#~ msgid "Only for Bonded and Trusted devices"
-#~ msgstr "Samo za uparene i poverljive uređaje"
-
-#~ msgid "Please log in as the user guest"
-#~ msgstr "Prijavite se kao korisnik „guest“"
-
-#~ msgid "User Sharing"
-#~ msgstr "Korisničko deljenje"
diff --git a/po/sv.po b/po/sv.po
index 5f49657..17794be 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,203 +1,172 @@
-# Swedish messages for mateuser-share.
-# Copyright (C) 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
-# Christian Rose <[email protected]>, 2005.
-# Daniel Nylander <[email protected]>, 2006, 2008, 2009, 2010.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Christian Rose <[email protected]>, 2005
+# Daniel Nylander <[email protected]>, 2006, 2008, 2009, 2010
+# Henrik Mattsson-Mårn <[email protected]>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: mateuser-share\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-19 19:35+0100\n"
-"PO-Revision-Date: 2010-03-19 19:35+0100\n"
-"Last-Translator: Daniel Nylander <[email protected]>\n"
-"Language-Team: Swedish <[email protected]>\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: Henrik Mattsson-Mårn <[email protected]>\n"
+"Language-Team: Swedish (http://www.transifex.com/mate/MATE/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:1
-msgid "If this is true, Bluetooth devices can send files to the user's Downloads directory when logged in."
-msgstr "Om detta är sant kan blåtandsenheter skicka filer till användarens katalog Hämtat när användaren är inloggad."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:2
-msgid "If this is true, the Public directory in the users home directory will be shared over Bluetooth when the user is logged in."
-msgstr "Om detta är sant kommer den publika katalogen i användarens hemkatalog att delas ut över Bluetooth när användaren är inloggad."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:3
-msgid "If this is true, the Public directory in the users home directory will be shared over the network when the user is logged in."
-msgstr "Om detta är sant kommer den publika katalogen i användarens hemkatalog att delas ut på nätverket när användaren är inloggad."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:4
-msgid "Share Public directory over Bluetooth"
-msgstr "Dela ut publik katalog över Bluetooth"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:5
-msgid "Share Public directory over the network"
-msgstr "Dela ut publik katalog över nätverket"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:6
-msgid "When to accept files sent over Bluetooth"
-msgstr "När filer skickade över Bluetooth ska accepteras"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:7
-msgid "When to accept files sent over Bluetooth. Possible values are \"always\", \"bonded\" and \"ask\"."
-msgstr "När filer som skickas över Bluetooth ska accepteras. Möjliga värden är \"always\" (alltid), \"bonded\" (ihopparad) och \"ask\" (fråga)."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:8
-msgid "When to ask for passwords. Possible values are \"never\", \"on_write\", and \"always\"."
-msgstr "När lösenord ska efterfrågas. Möjliga värden är \"never\" (aldrig), \"on_write\" (vid skrivning) och \"always\" (alltid)."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:9
-msgid "When to require passwords"
-msgstr "När lösenord ska krävas"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "Huruvida blåtandsklienter kan skicka filer med ObexPush."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:11
-msgid "Whether Bluetooth clients need to pair with the computer to send files."
-msgstr "Huruvida blåtandsklienter behöver paras ihop med datorn för att skicka filer."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:12
-msgid "Whether to allow Bluetooth clients to write files, or share the files read-only."
-msgstr "Huruvida blåtandsklienter ska tillåtas att skriva filer, eller dela ut filerna skrivskyddade."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:13
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "Huruvida blåtandsklienter ska tillåtas att skriva filer."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "Huruvida notifiering om nyligen mottagna filer ska göras."
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/file-share-properties.ui.h:1
-msgid "<b>Receive Files over Bluetooth</b>"
-msgstr "<b>Ta emot filer över Bluetooth</b>"
+msgid "Personal File Sharing Preferences"
+msgstr "Inställningar för personlig filutdelning"
 
 #: ../data/file-share-properties.ui.h:2
-msgid "<b>Share Files over Bluetooth</b>"
-msgstr "<b>Dela ut filer över Bluetooth</b>"
-
-#: ../data/file-share-properties.ui.h:3
 msgid "<b>Share Files over the Network</b>"
 msgstr "<b>Dela ut filer över nätverket</b>"
 
+#: ../data/file-share-properties.ui.h:3
+msgid "_Share public files on network"
+msgstr "_Dela ut publika filer på nätverket"
+
 #: ../data/file-share-properties.ui.h:4
-msgid "Allo_w remote devices to delete files"
-msgstr "Till_åt fjärrenheter att ta bort filer"
+msgid "_Password:"
+msgstr "_Lösenord:"
 
 #: ../data/file-share-properties.ui.h:5
-msgid "Personal File Sharing Preferences"
-msgstr "Inställningar för personlig filutdelning"
+msgid "_Require password:"
+msgstr "_Kräv lösenord:"
 
 #: ../data/file-share-properties.ui.h:6
-msgid "Receive files in _Downloads folder over Bluetooth"
-msgstr "Ta emot filer i mappen _Hämtat över Bluetooth"
+msgid "<b>Share Files over Bluetooth</b>"
+msgstr "<b>Dela ut filer över Bluetooth</b>"
 
 #: ../data/file-share-properties.ui.h:7
-msgid "Require re_mote devices to bond with this computer"
-msgstr "Kräv att fjärrenheter _paras ihop med denna dator"
-
-#: ../data/file-share-properties.ui.h:8
 msgid "Share public files over _Bluetooth"
 msgstr "Dela ut publika filer över _Bluetooth"
 
+#: ../data/file-share-properties.ui.h:8
+msgid "Allo_w remote devices to delete files"
+msgstr "Till_åt fjärrenheter att ta bort filer"
+
 #: ../data/file-share-properties.ui.h:9
-msgid "_Accept files: "
-msgstr "_Acceptera filer: "
+msgid "Require re_mote devices to bond with this computer"
+msgstr "Kräv att fjärrenheter _paras ihop med denna dator"
 
 #: ../data/file-share-properties.ui.h:10
-msgid "_Notify about received files"
-msgstr "_Notifiera om mottagna filer"
+msgid "<b>Receive Files over Bluetooth</b>"
+msgstr "<b>Ta emot filer över Bluetooth</b>"
 
 #: ../data/file-share-properties.ui.h:11
-msgid "_Password:"
-msgstr "_Lösenord:"
+msgid "Receive files in _Downloads folder over Bluetooth"
+msgstr "Ta emot filer i mappen _Hämtat över Bluetooth"
 
 #: ../data/file-share-properties.ui.h:12
-msgid "_Require password:"
-msgstr "_Kräv lösenord:"
+msgid "_Accept files: "
+msgstr "_Acceptera filer: "
 
 #: ../data/file-share-properties.ui.h:13
-msgid "_Share public files on network"
-msgstr "_Dela ut publika filer på nätverket"
+msgid "_Notify about received files"
+msgstr "_Notifiera om mottagna filer"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
 
-#: ../data/mateuser-share-properties.desktop.in.h:1
-#: ../data/mateuser-share.desktop.in.in.h:2
-#: ../src/caja-share-bar.c:162
+#: ../data/mate-user-share-properties.desktop.in.h:1
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "Utdelning av personliga filer"
 
-#: ../data/mateuser-share-properties.desktop.in.h:2
+#: ../data/mate-user-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Inställningar för utdelning av filer"
 
-#: ../data/mateuser-share.desktop.in.in.h:1
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Starta personlig filutdelning om aktiverat"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "Starta inställningar"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr ""
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr ""
 
-#: ../src/caja-share-bar.c:187
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr "Inställningar"
+
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Starta Inställningar för personlig filutdelning"
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "Kunde inte starta Inställningar för personlig filutdelning"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "Du kan dela ut filer från denna mapp och ta emot filer till den"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr ""
+
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr ""
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "Du kan dela ut filer från denna mapp över nätverket och Bluetooth"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr "Kan delas över nätverket"
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "Du kan ta emot filer över Bluetooth till denna mapp"
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr ""
 
-#: ../src/file-share-properties.c:436
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "Ingen anledning"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "Kunde inte visa hjälpinnehållet."
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "Kunde inte bygga gränssnittet."
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "Aldrig"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "När filer skrivs"
 
-#: ../src/file-share-properties.c:572
-#: ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "Alltid"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "Endast för konfigurerade enheter"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "Fråga"
 
-# Vi undviker på detta sätt problemen som "%ss publika filer" skulle
-# skapat, exempelvis "Alexs publika filer" eller "Markuss publika filer".
-# Se även http://bugzilla.mateorg/show_bug.cgi?id=163652
-#
 #. Translators: The %s will get filled in with the user name
 #. of the user, to form a genitive. If this is difficult to
 #. translate correctly so that it will work correctly in your
@@ -207,67 +176,36 @@ msgstr "Fråga"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "%.0sPublika filer"
 
-# Vi undviker på detta sätt problemen som "%ss publika filer" skulle
-# skapat, exempelvis "Alexs publika filer" eller "Markuss publika filer".
-# Se även http://bugzilla.mateorg/show_bug.cgi?id=163652
-#
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "%.0sPublika filer på %s"
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "Du tog emot \"%s\" via Bluetooth"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "Du tog emot en fil"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "Öppna fil"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "Visa fil"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "Filmottagningen är färdig"
-
-#~ msgid "Please log in as the user guest"
-#~ msgstr "Logga in som användaren guest"
-#~ msgid "Only for Bonded and Trusted devices"
-#~ msgstr "Endast för ihopparade och pålitliga enheter"
-#~ msgid "User Sharing"
-#~ msgstr "Användarutdelning"
-#~ msgid ""
-#~ "If this is true, the Public directory in the users home dir will be "
-#~ "shared when the user is logged in."
-#~ msgstr ""
-#~ "Om detta är sant kommer den publika katalogen i användarens hemkatalog "
-#~ "att delas när användaren är inloggad."
-#~ msgid "When to ask for passwords, possible options: never, on_write, always"
-#~ msgstr ""
-#~ "När lösenord ska efterfrågas. Möjliga alternativ: never, on_write, always"
-#~ msgid "Share files"
-#~ msgstr "Dela filer"
-#~ msgid "Password:"
-#~ msgstr "Lösenord:"
-#~ msgid "_Password"
-#~ msgstr "_Lösenord"
-#~ msgid "Password"
-#~ msgstr "Lösenord"
-#~ msgid "_Require password"
-#~ msgstr "_Kräv lösenord"
-
diff --git a/po/ta.po b/po/ta.po
index ff75b5b..af14752 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -1,220 +1,168 @@
-# translation of mateuser-share.HEAD.po to Tamil
-# translation of mateuser-share.HEAD.po to
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
-# Dr.T.vasudevan <[email protected]>, 2009.
-# Dr.T.Vasudevan <[email protected]>, 2009.
+# 
+# Translators:
+# Dr.T.vasudevan <[email protected]>, 2009
+# Dr.T.Vasudevan <[email protected]>, 2009
 msgid ""
 msgstr ""
-"Project-Id-Version: mateuser-share.HEAD\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-23 21:45+0530\n"
-"PO-Revision-Date: 2009-10-23 21:51+0530\n"
-"Last-Translator: Dr.T.Vasudevan <[email protected]>\n"
-"Language-Team: Tamil <[email protected]>\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: monsta <[email protected]>\n"
+"Language-Team: Tamil (http://www.transifex.com/mate/MATE/language/ta/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 0.3\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:1
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr ""
-"இது உண்மை எனில் உள்நுழையும் போது ப்ளூடூத் சாதனங்கள்  பயனர்  தரவிறக்கங்கள் அடைவுக்கு "
-"கோப்புகளை அனுப்ப இயலும்"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr ""
-"இது உண்மை எனில் பயனர்  உள்நுழைந்துள்ள போது   பயனரின்  இல்ல அடைவில் உள்ள பொதுவான அடைவு "
-"ப்ளூடூத் சாதனங்கள்  மூலம் பகிரப்படும்"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:3
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr ""
-"இது உண்மை எனில் பயனர்  உள்நுழைந்துள்ள போது   பயனரின்  இல்ல அடைவில் உள்ள பொதுவான அடைவு "
-"வலைபின்னல்  மூலம் பகிரப்படும்"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:4
-msgid "Share Public directory over Bluetooth"
-msgstr "பொது அடைவை ப்ளூடூத் மூலம் பகிர்க"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:5
-msgid "Share Public directory over the network"
-msgstr "பொது அடைவை வலைப்பின்னல் மூலம் பகிர்க"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:6
-msgid "When to accept files sent over Bluetooth"
-msgstr "எப்போது கோப்புக்களை ப்ளூடூத் மூலம் பகிர்வது"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:7
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr ""
-"எப்போது கோப்புக்களை ப்ளூடூத் மூலம் பகிர்வது. செல்லுபடியாகும் மதிப்புகள்  \"எப்போதும்\", "
-"\"பிணையப்பட்ட\", மற்றும் \"கேள்\"."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:8
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr ""
-"எப்போது கடவுச்சொல் கேட்க வேண்டும். செல்லுபடியாகும் மதிப்புகள்   \"எப்போதுமில்லை\", "
-"\"எழுதும்போது\", மற்றும் \"எப்போதும்\"."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:9
-msgid "When to require passwords"
-msgstr "எப்போது கடவுச்சொல் தேவை"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "ப்ளூடூத் சார்ந்தோன்கள் கோப்புகளை ஒபெக்ஸ் புஷ் மூலம் அனுப்பலாமா"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:11
-msgid "Whether Bluetooth clients need to pair with the computer to send files."
-msgstr "ப்ளூடூத் சார்ந்தோன்கள் கோப்புகளை அனுப்ப கணினியுடன் சேர வேண்டுமா"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:12
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr "ப்ளூடூத் சார்ந்தோன்கள் கோப்புகளை எழுத அனுமதிக்கலாமா அல்லது கோப்புகள் படிக்க மட்டுமா"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:13
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "ப்ளூடூத் சார்ந்தோன்கள் கோப்புகளை எழுத அனுமதிக்கலாமா."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "புதிதாக பெற்ற கோப்புக்களை பற்றி அறிவிக்கவா"
+"Language: ta\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/file-share-properties.ui.h:1
-msgid "<b>Receive Files over Bluetooth</b>"
-msgstr "<b> கோப்புகளை ப்ளூடூத் மூலம் பெறுக</b>"
+msgid "Personal File Sharing Preferences"
+msgstr "தனிப்பட்ட கோப்பு பகிர விருப்பங்கள்"
 
 #: ../data/file-share-properties.ui.h:2
-msgid "<b>Share Files over Bluetooth</b>"
-msgstr "<b> கோப்புகளை ப்ளூடூத் மூலம் பகிர்க</b>"
-
-#: ../data/file-share-properties.ui.h:3
 msgid "<b>Share Files over the Network</b>"
 msgstr "<b> கோப்புகளை வலைப்பின்னல் மூலம் பகிர்க</b>"
 
+#: ../data/file-share-properties.ui.h:3
+msgid "_Share public files on network"
+msgstr "(_S) கோப்புகளை வலைப்பின்னல் மூலம் பகிர்க"
+
 #: ../data/file-share-properties.ui.h:4
-msgid "Allo_w remote devices to delete files"
-msgstr "(_w) தொலை சாதனங்களை கோப்புக்களை நீக்க அனுமதி"
+msgid "_Password:"
+msgstr "(_P) கடவுச்சொல்:"
 
 #: ../data/file-share-properties.ui.h:5
-msgid "Personal File Sharing Preferences"
-msgstr "தனிப்பட்ட கோப்பு பகிர விருப்பங்கள்"
+msgid "_Require password:"
+msgstr "(_R) கடவுச்சொல் தேவை:"
 
 #: ../data/file-share-properties.ui.h:6
-msgid "Receive files in _Downloads folder over Bluetooth"
-msgstr "(_D) ப்ளூடூத் மூலம் வரும் கோப்புகளை  தரவிறக்கங்கள் அடைவில் பெறுக"
+msgid "<b>Share Files over Bluetooth</b>"
+msgstr "<b> கோப்புகளை ப்ளூடூத் மூலம் பகிர்க</b>"
 
 #: ../data/file-share-properties.ui.h:7
-msgid "Require re_mote devices to bond with this computer"
-msgstr "தொலை சாதனங்களை கணினியுடன் சேர வேண்டு"
-
-#: ../data/file-share-properties.ui.h:8
 msgid "Share public files over _Bluetooth"
 msgstr "(_B) பொது கோப்புகளை ப்ளூடூத் மூலம் பகிர்க"
 
+#: ../data/file-share-properties.ui.h:8
+msgid "Allo_w remote devices to delete files"
+msgstr "(_w) தொலை சாதனங்களை கோப்புக்களை நீக்க அனுமதி"
+
 #: ../data/file-share-properties.ui.h:9
-msgid "_Accept files: "
-msgstr "(_A) கோப்புகளை ஏற்றுக்கொள்: "
+msgid "Require re_mote devices to bond with this computer"
+msgstr "தொலை சாதனங்களை கணினியுடன் சேர வேண்டு"
 
 #: ../data/file-share-properties.ui.h:10
-msgid "_Notify about received files"
-msgstr "(_N) பெற்ற  கோப்புகளை பற்றி அறிவி"
+msgid "<b>Receive Files over Bluetooth</b>"
+msgstr "<b> கோப்புகளை ப்ளூடூத் மூலம் பெறுக</b>"
 
 #: ../data/file-share-properties.ui.h:11
-msgid "_Password:"
-msgstr "(_P) கடவுச்சொல்:"
+msgid "Receive files in _Downloads folder over Bluetooth"
+msgstr "(_D) ப்ளூடூத் மூலம் வரும் கோப்புகளை  தரவிறக்கங்கள் அடைவில் பெறுக"
 
 #: ../data/file-share-properties.ui.h:12
-msgid "_Require password:"
-msgstr "(_R) கடவுச்சொல் தேவை:"
+msgid "_Accept files: "
+msgstr "(_A) கோப்புகளை ஏற்றுக்கொள்: "
 
 #: ../data/file-share-properties.ui.h:13
-msgid "_Share public files on network"
-msgstr "(_S) கோப்புகளை வலைப்பின்னல் மூலம் பகிர்க"
+msgid "_Notify about received files"
+msgstr "(_N) பெற்ற  கோப்புகளை பற்றி அறிவி"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
 
-#: ../data/mateuser-share-properties.desktop.in.h:1
-#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:167
+#: ../data/mate-user-share-properties.desktop.in.h:1
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "அந்தரங்க கோப்பு பகிர்தல்"
 
-#: ../data/mateuser-share-properties.desktop.in.h:2
+#: ../data/mate-user-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "கோப்புகள் பகிர்வதில் விருப்பங்கள் "
 
-#: ../data/mateuser-share.desktop.in.in.h:1
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "செயல் படுத்தி இருந்தால் அந்தரங்க கோப்பு பகிர்தலை  ஆரம்பி "
 
-#: ../src/caja-share-bar.c:179
-msgid "Launch Preferences"
-msgstr "விருப்பங்களை ஆரம்பி"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr ""
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr ""
+
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr ""
 
-#: ../src/caja-share-bar.c:193
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "தனிப்பட்ட கோப்பு பகிர்தல் விருப்பங்களை ஆரம்பி"
 
-#: ../src/share-extension.c:81
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "தனிப்பட்ட கோப்பு பகிர்தல் விருப்பங்களை ஆரம்பிக்க முடியவில்லை"
 
-#: ../src/share-extension.c:166
-msgid "You can share files from this folder and receive files to it"
-msgstr "இந்த அடைவிலிருந்து கோப்புகளை பெறவும் பகிரவும் இயலும்"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr ""
+
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr ""
 
-#: ../src/share-extension.c:168
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "இந்த அடைவிலிருந்து கோப்புகளை வலைப்பின்னல் மற்றும் ப்ளூடூத் மூலம் பகிர இயலும்"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr ""
 
-#: ../src/share-extension.c:170
-msgid "You can receive files over Bluetooth into this folder"
-msgstr " கோப்புகளை ப்ளூடூத் மூலம் இந்த அடைவில் பெற இயலும்"
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr ""
 
-#: ../src/file-share-properties.c:435
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "காரணம் இல்லை"
 
-#: ../src/file-share-properties.c:463
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "உதவி உள்ளடகத்தை காட்ட இயலவில்லை"
 
-#: ../src/file-share-properties.c:503
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "இடைமுகத்தை உருவாக்க இயலவில்லை"
 
-#: ../src/file-share-properties.c:543
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "ஒரு போதும் இல்லை"
 
-#: ../src/file-share-properties.c:546
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "கோப்புகளை எழுதும்போது"
 
-#: ../src/file-share-properties.c:549 ../src/file-share-properties.c:572
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "எப்போதும்"
 
-#: ../src/file-share-properties.c:575
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "அமைத்த சாதனங்களுக்கு மட்டும் "
 
-#: ../src/file-share-properties.c:580
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "கேள்"
 
@@ -227,46 +175,36 @@ msgstr "கேள்"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "%s' இன் பொது கோப்புகள்"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "%s' இன் பொது கோப்புகள் %s இல்"
 
-#: ../src/http.c:372
-msgid "Please log in as the user guest"
-msgstr "தயவு செய்து விருந்தினர் பயனராக உள்நுழை"
-
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr " \"%s\"  ஐ ப்ளூடூத் வழியாக பெற்றீர்கள்"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "நீங்கள் ஒரு கோப்பை பெற்றீர்கள்"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "கோப்பை திறக்கவும்"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "கோப்பை காட்டுக"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "கோப்பு பெறுதல் முடிந்தது"
-
-#~ msgid "Only for Bonded and Trusted devices"
-#~ msgstr "பிணைத்த மற்றும் நம்பப்பட்ட சாதனங்களுக்கு  மட்டும்"
-
-#~ msgid "User Sharing"
-#~ msgstr "பயனர் பகிர்தல்"
diff --git a/po/te.po b/po/te.po
index 132ed20..471de2e 100644
--- a/po/te.po
+++ b/po/te.po
@@ -1,203 +1,167 @@
-# translation of mateuser-share.master.te.po to Telugu
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
-# Krishna Babu K <[email protected]>, 2009.
+# 
+# Translators:
+# Krishnababu Krothapalli <[email protected]>, 2009
 msgid ""
 msgstr ""
-"Project-Id-Version: mateuser-share.master.te\n"
-"Report-Msgid-Bugs-To: http://bugzilla.mateorg/enter_bug.cgi?product=mateuser-share&component=general\n"
-"POT-Creation-Date: 2009-06-26 10:10+0000\n"
-"PO-Revision-Date: 2009-09-17 18:00+0530\n"
-"Last-Translator: Krishna Babu K <[email protected]>\n"
-"Language-Team: Telugu <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: monsta <[email protected]>\n"
+"Language-Team: Telugu (http://www.transifex.com/mate/MATE/language/te/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n\n"
-"\n"
-"\n"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:1
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr "ఇది నిజమైతే, లాగిన్ అయినప్పుడు బ్లూటూత్ పరికరాలు దస్త్రాలను వినియోగదారి డౌన్‌లోడ్సు డైరెక్టరీకు పంపగలగుతాయి."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr ""
-"నిజమైతే, వినియోగదారి లాగినైవున్నప్పుడు బ్లూటూత్ ద్వారా వినియోగదారి డైరెక్టరీనందలి పబ్లిక్ డైరెక్టరీ "
-"పంచుకొనబడుతుంది."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:3
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr ""
-"నిజమైతే, వినియోగదారి లాగినైవున్నప్పుడు నెట్వర్కు ద్వారా వినియోగదారి డైరెక్టరీనందలి పబ్లిక్ డైరెక్టరీ "
-"పంచుకొనబడుతుంది."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:4
-msgid "Share Public directory over Bluetooth"
-msgstr "బ్లూటూత్ ద్వారా పబ్లిక్ డైరెక్టరీను పంచుకొనుము"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:5
-msgid "Share Public directory over the network"
-msgstr "పబ్లిక్ డైరెక్టరీను నెట్వర్కునందు పంచుకొనుము"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:6
-msgid "When to accept files sent over Bluetooth"
-msgstr "బ్లూటూత్ ద్వారా పంపిన దస్త్రములను యెప్పుడు ఆమోదించాలి"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:7
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\", \"bonded_trusted\" and \"ask\"."
-msgstr ""
-"బ్లూటూత్ ద్వారా పంపిన దస్త్రములు యెప్పుడు ఆమోదించాలి. సాధ్యమగు విలువలు \"always\", \"bonded"
-"\", \"bonded_trusted\" మరియు \"ask\"."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:8
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr ""
-"సంకేతపదముల కొరకు యెప్పుడు అడగాలి. సాధ్యమగు విలువలు \"never\", \"on_write\", మరియు "
-"\"always\"."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:9
-msgid "When to require passwords"
-msgstr "సంకేతపదములు యెప్పుడు అవసరము"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "బ్లూటూత్ కక్షిదారులు దస్త్రములను ObexPush వుపయోగించి పంపించగలగాలా."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:11
-msgid "Whether Bluetooth clients need to pair with the computer to send files."
-msgstr "దస్త్రములను పంపుటకు బ్లూటూత్ కక్షిదారులు కంప్యూటర్‌తో జత ఏర్పరుచుకోవాలా."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:12
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr ""
-"బ్లూటూత్ కక్షిదారులను దస్త్రములను వ్రాయుటకు అనుమతించాలా, లేక చదువుటకు-మాత్రమే దస్త్రములను "
-"పంచుకొనవలెనా."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:13
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "బ్లూటూత్ కక్షిదారులను దస్త్రములను వ్రాయుటకు అనుమతించాలా."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "కొత్తగా స్వీకరించిన దస్త్రముల గురించి తెలియజెప్పవలెనా."
+"Language: te\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/file-share-properties.ui.h:1
-msgid "<b>Receive Files over Bluetooth</b>"
-msgstr "<b>బ్లూటూత్ ద్వారా దస్త్రములను స్వీకరించుము</b>"
+msgid "Personal File Sharing Preferences"
+msgstr "వ్యక్తిగత ఫైలు భాగస్వామ్యపు అభీష్టాలు"
 
 #: ../data/file-share-properties.ui.h:2
-msgid "<b>Share Files over Bluetooth</b>"
-msgstr "<b>బ్లూటూత్ ద్వారా దస్త్రములను పంచుకొనుము</b>"
-
-#: ../data/file-share-properties.ui.h:3
 msgid "<b>Share Files over the Network</b>"
 msgstr "<b>నెట్వర్కు ద్వారా దస్త్రములను పంచుకొనుము</b>"
 
+#: ../data/file-share-properties.ui.h:3
+msgid "_Share public files on network"
+msgstr "నెట్వర్కునందు పబ్లిక్ దస్త్రములను పంచుకొనుము (_S)"
+
 #: ../data/file-share-properties.ui.h:4
-msgid "Allo_w remote devices to delete files"
-msgstr "దస్త్రములను తొలగించుటకు దూరస్థ పరికరములను అనుమతించుము (_w)"
+msgid "_Password:"
+msgstr "సంకేతపదం(_P):"
 
 #: ../data/file-share-properties.ui.h:5
-#| msgid "File Sharing Preferences"
-msgid "Personal File Sharing Preferences"
-msgstr "వ్యక్తిగత ఫైలు భాగస్వామ్యపు అభీష్టాలు"
+msgid "_Require password:"
+msgstr "సంకేతపదము అవసరము (_R):"
 
 #: ../data/file-share-properties.ui.h:6
-msgid "Receive files in _Downloads folder over Bluetooth"
-msgstr "బ్లూటూత్ నందు డౌన్‌లోడ్సు ఫోల్డర్‌లో దస్త్రములను స్వీకరించుము (_D)"
+msgid "<b>Share Files over Bluetooth</b>"
+msgstr "<b>బ్లూటూత్ ద్వారా దస్త్రములను పంచుకొనుము</b>"
 
 #: ../data/file-share-properties.ui.h:7
-msgid "Require re_mote devices to bond with this computer"
-msgstr "ఈ కంప్యూటర్‌తో బందనం యేర్పరుచుటకు దూరస్థ(రిమోట్) పరికరాలు అవసరము (_m)"
-
-#: ../data/file-share-properties.ui.h:8
 msgid "Share public files over _Bluetooth"
 msgstr "బ్లూటూత్ నందు పబ్లిక్ దస్త్రములను పంచుకొనుము (_B)"
 
+#: ../data/file-share-properties.ui.h:8
+msgid "Allo_w remote devices to delete files"
+msgstr "దస్త్రములను తొలగించుటకు దూరస్థ పరికరములను అనుమతించుము (_w)"
+
 #: ../data/file-share-properties.ui.h:9
-msgid "_Accept files: "
-msgstr "దస్త్రములను ఆమోదించుము (_A):"
+msgid "Require re_mote devices to bond with this computer"
+msgstr "ఈ కంప్యూటర్‌తో బందనం యేర్పరుచుటకు దూరస్థ(రిమోట్) పరికరాలు అవసరము (_m)"
 
 #: ../data/file-share-properties.ui.h:10
-msgid "_Notify about received files"
-msgstr "స్వీకరించిన దస్త్రముల గురించి తెలియజెప్పుము (_N)"
+msgid "<b>Receive Files over Bluetooth</b>"
+msgstr "<b>బ్లూటూత్ ద్వారా దస్త్రములను స్వీకరించుము</b>"
 
 #: ../data/file-share-properties.ui.h:11
-msgid "_Password:"
-msgstr "సంకేతపదం(_P):"
+msgid "Receive files in _Downloads folder over Bluetooth"
+msgstr "బ్లూటూత్ నందు డౌన్‌లోడ్సు ఫోల్డర్‌లో దస్త్రములను స్వీకరించుము (_D)"
 
 #: ../data/file-share-properties.ui.h:12
-msgid "_Require password:"
-msgstr "సంకేతపదము అవసరము (_R):"
+msgid "_Accept files: "
+msgstr "దస్త్రములను ఆమోదించుము (_A):"
 
 #: ../data/file-share-properties.ui.h:13
-msgid "_Share public files on network"
-msgstr "నెట్వర్కునందు పబ్లిక్ దస్త్రములను పంచుకొనుము (_S)"
+msgid "_Notify about received files"
+msgstr "స్వీకరించిన దస్త్రముల గురించి తెలియజెప్పుము (_N)"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
 
-#: ../data/mateuser-share-properties.desktop.in.h:1
-#: ../data/mateuser-share.desktop.in.in.h:2
+#: ../data/mate-user-share-properties.desktop.in.h:1
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "వ్యక్తిగత దస్త్ర భాగస్వామ్యం"
 
-#: ../data/mateuser-share-properties.desktop.in.h:2
-#| msgid "Preferences for sharing of personal files"
+#: ../data/mate-user-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "ఫైళ్ళను భాగస్వామ్యపరచుటకు అభీష్టాలు"
 
-#: ../data/mateuser-share.desktop.in.in.h:1
-#| msgid "Launch User Sharing if enabled"
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "చేతనపరిస్తే వ్యక్తిగత ఫైళ్ళ భాగస్వామ్యమును ఆరంభిస్తుంది"
 
-#: ../src/file-share-properties.c:435
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr ""
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr ""
+
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr ""
+
+#: ../src/caja-share-bar.c:121
+msgid "Launch Personal File Sharing Preferences"
+msgstr ""
+
+#: ../src/share-extension.c:73
+msgid "Unable to launch the Personal File Sharing preferences"
+msgstr ""
+
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr ""
+
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr ""
+
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr ""
+
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr ""
+
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "ఏ కారణంలేదు"
 
-#: ../src/file-share-properties.c:463
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "సహాయ సారములను ప్రదర్శించలేక పోయింది."
 
-#: ../src/file-share-properties.c:503
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "ఇంటర్ఫేస్‌ను నిర్మించలేక పోయింది."
 
-#: ../src/file-share-properties.c:543
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "ఎప్పటికివద్దు"
 
-#: ../src/file-share-properties.c:546
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "దస్త్రములను వ్రాయుచున్నప్పుడు"
 
-#: ../src/file-share-properties.c:549 ../src/file-share-properties.c:572
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "ఎల్లప్పుడు"
 
-#: ../src/file-share-properties.c:575
-msgid "Only for Bonded devices"
-msgstr "బందనమేర్పడిన పరికరముల కొరకు మాత్రమే"
-
-#: ../src/file-share-properties.c:578
-msgid "Only for Bonded and Trusted devices"
-msgstr "బందనమేర్పడిన మరియు నమ్మిన పరికరములకు మాత్రమే"
+#: ../src/file-share-properties.c:580
+msgid "Only for set up devices"
+msgstr ""
 
-#: ../src/file-share-properties.c:583
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "అడుగు"
 
@@ -210,37 +174,36 @@ msgstr "అడుగు"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "%sయొక్క పబ్లిక్ దస్త్రములు"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "%2$s పైన %1$sయొక్క పబ్లిక్ దస్త్రములు"
 
-#: ../src/http.c:372
-msgid "Please log in as the user guest"
-msgstr "దయచేసి అతిధి వినియోగదారిలా లాగిన్ అవ్వండి"
-
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:138
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "మీరు \"%s\"ను బ్లూటూత్ ద్వారా పొందినారు"
 
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "మీరు వొక దస్త్రమును పొందినారు"
 
-#: ../src/obexpush.c:151
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "దస్త్రాన్ని తెరువుము"
 
-#: ../src/obexpush.c:155
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "దస్త్రమును బయటపెట్టుము"
 
+#: ../src/obexpush.c:169
+msgid "File reception complete"
+msgstr ""
diff --git a/po/th.po b/po/th.po
index f753b2f..5ba499c 100644
--- a/po/th.po
+++ b/po/th.po
@@ -1,219 +1,167 @@
-# Thai translation of mateuser-share.
-# Copyright (C) 2009-2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the mateuser-share package.
-# Manatsawin <[email protected]>, 2009.
-# Theppitak Karoonboonyanan <[email protected]>, 2009-2010.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Manatsawin <[email protected]>, 2009
 msgid ""
 msgstr ""
-"Project-Id-Version: mateuser-share\n"
-"Report-Msgid-Bugs-To: http://bugzilla.mateorg/enter_bug.cgi?product=mate"
-"user-share&component=general\n"
-"POT-Creation-Date: 2009-12-14 21:47+0000\n"
-"PO-Revision-Date: 2010-02-07 21:59+0700\n"
-"Last-Translator: Theppitak Karoonboonyanan <[email protected]>\n"
-"Language-Team: Thai <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: monsta <[email protected]>\n"
+"Language-Team: Thai (http://www.transifex.com/mate/MATE/language/th/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:1
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr ""
-"หากเป็นจริง อุปกรณ์บลูทูทจะสามารถส่งแฟ้มไปยังไดเรกทอรี \"ดาวน์โหลด\" "
-"ของผู้ใช้ได้เมื่อเข้าสู่ระบบแล้ว"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr ""
-"หากเป็นจริง ไดเรกทอรี \"Public\" "
-"ในไดเรกทอรีบ้านของผู้ใช้จะถูกเปิดให้ใช้ร่วมทางบลูทูทเมื่อผู้ใช้เข้าสู่ระบบ"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:3
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr ""
-"หากเป็นจริง ไดเรกทอรี \"Public\" "
-"ในไดเรกทอรีบ้านของผู้ใช้จะถูกเปิดให้ใช้ร่วมในเครือข่ายเมื่อผู้ใช้เข้าสู่ระบบ"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:4
-msgid "Share Public directory over Bluetooth"
-msgstr "เปิดไดเรกทอรี \"Public\" ให้ใช้ร่วมทางบลูทูท"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:5
-msgid "Share Public directory over the network"
-msgstr "เปิดไดเรกทอรี \"Public\" ให้ใช้ร่วมในเครือข่าย"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:6
-msgid "When to accept files sent over Bluetooth"
-msgstr "จะรับแฟ้มที่ส่งทางบลูทูทเมื่อใด"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:7
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr ""
-"จะรับแฟ้มที่ส่งทางบลูทูทเมื่อใด ค่าที่เป็นไปได้คือ \"always\" (รับเสมอ), \"bonded"
-"\" (เฉพาะจากอุปกรณ์ที่จับคู่ไว้) และ \"ask\" (ถามก่อนรับ)"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:8
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr ""
-"จะถามรหัสผ่านเมื่อใด ค่าที่เป็นไปได้คือ \"never\" (ไม่ถาม), \"on_write\" (เมื่อจะเขียน) "
-"และ \"always\" (ถามเสมอ)"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:9
-msgid "When to require passwords"
-msgstr "ถามรหัสผ่านเมื่อใด"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "ลูกข่ายบลูทูทสามารถส่งแฟ้มโดยใช้ ObexPush ได้หรือไม่"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:11
-msgid "Whether Bluetooth clients need to pair with the computer to send files."
-msgstr "ลูกข่ายบลูทูทต้องจับคู่กับคอมพิวเตอร์ก่อนจะส่งแฟ้มหรือไม่"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:12
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr "อนุญาตให้ลูกข่ายบลูทูทเขียนแฟ้มหรือไม่ หรือแค่เพียงให้อ่านได้เท่านั้น"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:13
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "อนุญาตให้ลูกข่ายบลูทูทเขียนแฟ้มหรือไม่"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "ต้องการให้แจ้งเตือนเมื่อได้รับแฟ้มหรือไม่"
+"Language: th\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/file-share-properties.ui.h:1
-msgid "<b>Receive Files over Bluetooth</b>"
-msgstr "<b>รับแฟ้มทางบลูทูท</b>"
+msgid "Personal File Sharing Preferences"
+msgstr "ปรับแต่งการแบ่งปันแฟ้มส่วนตัว"
 
 #: ../data/file-share-properties.ui.h:2
-msgid "<b>Share Files over Bluetooth</b>"
-msgstr "<b>แบ่งปันแฟ้มทางบลูทูท</b>"
-
-#: ../data/file-share-properties.ui.h:3
 msgid "<b>Share Files over the Network</b>"
 msgstr "<b>แบ่งปันแฟ้มทางเครือข่าย</b>"
 
+#: ../data/file-share-properties.ui.h:3
+msgid "_Share public files on network"
+msgstr "แ_บ่งปันแฟ้มสาธารณะในเครือข่าย"
+
 #: ../data/file-share-properties.ui.h:4
-msgid "Allo_w remote devices to delete files"
-msgstr "_อนุญาตให้อุปกรณ์ระยะไกลลบแฟ้ม"
+msgid "_Password:"
+msgstr "รหัส_ผ่าน:"
 
 #: ../data/file-share-properties.ui.h:5
-msgid "Personal File Sharing Preferences"
-msgstr "ปรับแต่งการแบ่งปันแฟ้มส่วนตัว"
+msgid "_Require password:"
+msgstr "_ต้องการรหัสผ่าน:"
 
 #: ../data/file-share-properties.ui.h:6
-msgid "Receive files in _Downloads folder over Bluetooth"
-msgstr "รับแฟ้มในโฟลเดอร์ดา_วน์โหลดผ่านบลูทูท"
+msgid "<b>Share Files over Bluetooth</b>"
+msgstr "<b>แบ่งปันแฟ้มทางบลูทูท</b>"
 
 #: ../data/file-share-properties.ui.h:7
-msgid "Require re_mote devices to bond with this computer"
-msgstr "อุปกรณ์ระ_ยะไกลต้องจับคู่กับคอมพิวเตอร์ก่อน"
-
-#: ../data/file-share-properties.ui.h:8
 msgid "Share public files over _Bluetooth"
 msgstr "แบ่งปันแฟ้มสาธารณะผ่าน_บลูทูท"
 
+#: ../data/file-share-properties.ui.h:8
+msgid "Allo_w remote devices to delete files"
+msgstr "_อนุญาตให้อุปกรณ์ระยะไกลลบแฟ้ม"
+
 #: ../data/file-share-properties.ui.h:9
-msgid "_Accept files: "
-msgstr "_รับแฟ้ม:"
+msgid "Require re_mote devices to bond with this computer"
+msgstr "อุปกรณ์ระ_ยะไกลต้องจับคู่กับคอมพิวเตอร์ก่อน"
 
 #: ../data/file-share-properties.ui.h:10
-msgid "_Notify about received files"
-msgstr "แ_จ้งเตือนเกี่ยวกับแฟ้มที่ได้รับ"
+msgid "<b>Receive Files over Bluetooth</b>"
+msgstr "<b>รับแฟ้มทางบลูทูท</b>"
 
 #: ../data/file-share-properties.ui.h:11
-msgid "_Password:"
-msgstr "รหัส_ผ่าน:"
+msgid "Receive files in _Downloads folder over Bluetooth"
+msgstr "รับแฟ้มในโฟลเดอร์ดา_วน์โหลดผ่านบลูทูท"
 
 #: ../data/file-share-properties.ui.h:12
-msgid "_Require password:"
-msgstr "_ต้องการรหัสผ่าน:"
+msgid "_Accept files: "
+msgstr "_รับแฟ้ม:"
 
 #: ../data/file-share-properties.ui.h:13
-msgid "_Share public files on network"
-msgstr "แ_บ่งปันแฟ้มสาธารณะในเครือข่าย"
+msgid "_Notify about received files"
+msgstr "แ_จ้งเตือนเกี่ยวกับแฟ้มที่ได้รับ"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
 
-#: ../data/mateuser-share-properties.desktop.in.h:1
-#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
+#: ../data/mate-user-share-properties.desktop.in.h:1
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "แบ่งปันแฟ้มส่วนตัว"
 
-#: ../data/mateuser-share-properties.desktop.in.h:2
+#: ../data/mate-user-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "ปรับแต่งค่าการแบ่งปันแฟ้ม"
 
-#: ../data/mateuser-share.desktop.in.in.h:1
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "เรียกใช้การแบ่งปันแฟ้มส่วนตัวหากถูกเปิดใช้"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "เรียกเครื่องมือปรับแต่ง"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr ""
 
-#: ../src/caja-share-bar.c:187
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr ""
+
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr "การตั้งค่า"
+
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "เรียกเครื่องมือปรับแต่งการแบ่งปันแฟ้มส่วนตัว"
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "ไม่สามารถเรียกเครื่องมือปรับแต่งการแบ่งปันแฟ้มส่วนตัว"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "คุณสามารถแบ่งปันแฟ้มได้จากโฟลเดอร์นี้ และใช้โฟลเดอร์นี้รับแฟ้มได้"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr ""
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "คุณสามารถแบ่งปันแฟ้มได้จากโฟลเดอร์นี้ ผ่านเครือข่ายและบลูทูท"
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr ""
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "คุณสามารถใช้โฟลเดอร์นี้รับแฟ้มได้ ผ่านเครือข่ายบลูทูท"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr ""
 
-#: ../src/file-share-properties.c:436
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr ""
+
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "ไม่ทราบเหตุผล"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "ไม่สามารถแสดงวิธีใช้"
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "ไม่สามารถสร้างส่วนติดต่อผู้ใช้"
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "ไม่"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "เมื่อเขียนแฟ้ม"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "เสมอ"
 
-# ใน Windows ใช้คำว่า pair ครับ
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "เฉพาะอุปกรณ์ที่ตั้งค่าไว้"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "ถาม"
 
@@ -226,46 +174,36 @@ msgstr "ถาม"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "แฟ้มสาธารณะของ %s"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "แฟ้มสาธารณะของ %s ที่ %s"
 
-#: ../src/http.c:372
-msgid "Please log in as the user guest"
-msgstr "โปรดเข้าระบบในนามผู้ใช้ guest"
-
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "คุณได้รับแฟ้ม \"%s\" ผ่านทางบลูทูท"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "คุณได้รับแฟ้ม"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "เปิดแฟ้ม"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "แสดงแฟ้ม"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "รับแฟ้มเสร็จสมบูรณ์แล้ว"
-
-#~ msgid "Only for Bonded and Trusted devices"
-#~ msgstr "เฉพาะอุปกรณ์ที่จับคู่ไว้และเชื่อถือ"
-
-#~ msgid "User Sharing"
-#~ msgstr "การแบ่งปันแฟ้มของผู้ใช้"
diff --git a/po/tr.po b/po/tr.po
index 4dc2709..66374e8 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,202 +1,169 @@
-# translation of mateuser-share to Turkish
-# Copyright (C) 2007
-# This file is distributed under the same license as the mateuser-share package.
-#
-# Baris Cicek <[email protected]>, 2007.
-# Baris Cicek <[email protected]>, 2009.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Baris Cicek <[email protected]>, 2007, 2009
+# Butterfly <[email protected]>, 2015
+# mauron, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: mateuser-share\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-10 00:28+0300\n"
-"PO-Revision-Date: 2009-09-10 00:29+0300\n"
-"Last-Translator: Baris Cicek <[email protected]>\n"
-"Language-Team: Turkish <mateturk@mateorg>\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: Butterfly <[email protected]>\n"
+"Language-Team: Turkish (http://www.transifex.com/mate/MATE/language/tr/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=1; plural=0;\n"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:1
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr ""
-"Eğer bu true ise, Bluetooth aygıtları kullanıcının İndirilenler dizinine "
-"giriş yaptığında dosya gönderebilecekler."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr ""
-"Eğer bu true ise, kullanıcı başlangıç dizininde bulunan Genel dizini "
-"kullanıcı giriş yaptığında Bluetooth üzerinden paylaştırılacak."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:3
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr ""
-"Eğer bu true ise, kullanıcı başlangıç dizininde bulunan Genel dizini "
-"kullanıcı giriş yaptığında ağ üzerinden paylaştırılacak."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:4
-msgid "Share Public directory over Bluetooth"
-msgstr "Bluetooth Üzerinden Genel Dizinini Paylaştır"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:5
-msgid "Share Public directory over the network"
-msgstr "Ağ Üzerinden Genel Dizinini Paylaştır"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:6
-msgid "When to accept files sent over Bluetooth"
-msgstr "Bluetooth üzerinden gönderilen dosyaların ne zaman kabul edileceği"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:7
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\", \"bonded_trusted\" and \"ask\"."
-msgstr ""
-"Bluetooth üzerinden gönderilen dosyaların ne zaman kabul edileceği. Geçerli "
-"değerler \"always\" , \"bonded\", \"bonded_trusted\" ve \"ask\"."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:8
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr ""
-"Parola sor seçildiğinde. Geçerli değerler \"never\" (asla), \"on_write"
-"\" (yazıldığında), ve \"always\" (her zaman)."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:9
-msgid "When to require passwords"
-msgstr "Ne zaman parola gerektiği"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "Bluetooth istemcilerinin ObexPush kullanarak dosya gönderebilmeleri."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:11
-msgid "Whether Bluetooth clients need to pair with the computer to send files."
-msgstr ""
-"Bluetooth istemcilerinin dosya gönderebilmek için bir bilgisayar ile "
-"eşleşmelerine gerek olması."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:12
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr ""
-"Bluetooth istemcilerinin dosyalara yazabilmeleri ya da dosyaları salt-okunur "
-"olarak paylaşmaları."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:13
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "Bluetooth istemcilerin dosyalara yazmasına izin verilmesi."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "Yeni alınan dosyalar hakkında bildirimde bulunulması."
+"Language: tr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: ../data/file-share-properties.ui.h:1
-msgid "<b>Receive Files over Bluetooth</b>"
-msgstr "<b>Dosyaları Bluetooth Üzerinden Al</b>"
+msgid "Personal File Sharing Preferences"
+msgstr "Kişisel Dosya Paylaşma Tercihleri"
 
 #: ../data/file-share-properties.ui.h:2
-msgid "<b>Share Files over Bluetooth</b>"
-msgstr "<b>Dosyaları Bluetooth Üzerinden Paylaştır</b>"
-
-#: ../data/file-share-properties.ui.h:3
 msgid "<b>Share Files over the Network</b>"
 msgstr "<b>Dosyaları Ağ Üzerinden Paylaştır</b>"
 
+#: ../data/file-share-properties.ui.h:3
+msgid "_Share public files on network"
+msgstr "Genel dosyaları _ağ üzerinden paylaştır"
+
 #: ../data/file-share-properties.ui.h:4
-msgid "Allo_w remote devices to delete files"
-msgstr "Uzaktaki aygıtların dosya _silebilmelerine izin ver"
+msgid "_Password:"
+msgstr "_Parola:"
 
 #: ../data/file-share-properties.ui.h:5
-msgid "Personal File Sharing Preferences"
-msgstr "Kişisel Dosya Paylaşma Tercihleri"
+msgid "_Require password:"
+msgstr "_Parola gerektir:"
 
 #: ../data/file-share-properties.ui.h:6
-msgid "Receive files in _Downloads folder over Bluetooth"
-msgstr "Dosyaları Bluetooth üzerinden İ_ndirilenler klasörüne al"
+msgid "<b>Share Files over Bluetooth</b>"
+msgstr "<b>Dosyaları Bluetooth Üzerinden Paylaştır</b>"
 
 #: ../data/file-share-properties.ui.h:7
-msgid "Require re_mote devices to bond with this computer"
-msgstr "_Uzaktaki aygıtların bu bilgisayar ile bağlanmış olmalarını gerektir"
-
-#: ../data/file-share-properties.ui.h:8
 msgid "Share public files over _Bluetooth"
 msgstr "Genel dosyaları _Bluetooth üzerinden paylaştır"
 
+#: ../data/file-share-properties.ui.h:8
+msgid "Allo_w remote devices to delete files"
+msgstr "Uzaktaki aygıtların dosya _silebilmelerine izin ver"
+
 #: ../data/file-share-properties.ui.h:9
-msgid "_Accept files: "
-msgstr "_Dosyaları kabul et: "
+msgid "Require re_mote devices to bond with this computer"
+msgstr "_Uzaktaki aygıtların bu bilgisayar ile bağlanmış olmalarını gerektir"
 
 #: ../data/file-share-properties.ui.h:10
-msgid "_Notify about received files"
-msgstr "Alınan _dosyaları bildir"
+msgid "<b>Receive Files over Bluetooth</b>"
+msgstr "<b>Dosyaları Bluetooth Üzerinden Al</b>"
 
 #: ../data/file-share-properties.ui.h:11
-msgid "_Password:"
-msgstr "_Parola:"
+msgid "Receive files in _Downloads folder over Bluetooth"
+msgstr "Dosyaları Bluetooth üzerinden İ_ndirilenler klasörüne al"
 
 #: ../data/file-share-properties.ui.h:12
-msgid "_Require password:"
-msgstr "_Parola gerektir:"
+msgid "_Accept files: "
+msgstr "_Dosyaları kabul et: "
 
 #: ../data/file-share-properties.ui.h:13
-msgid "_Share public files on network"
-msgstr "Genel dosyaları _ağ üzerinden paylaştır"
+msgid "_Notify about received files"
+msgstr "Alınan _dosyaları bildir"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr "Kullanıcı Paylaşımı"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr "Kullanıcı-paylaşımı ile bütünleştir"
 
-#: ../data/mateuser-share-properties.desktop.in.h:1
-#: ../data/mateuser-share.desktop.in.in.h:2
+#: ../data/mate-user-share-properties.desktop.in.h:1
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "Kişisel Dosya Paylaşımı"
 
-#: ../data/mateuser-share-properties.desktop.in.h:2
+#: ../data/mate-user-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Dosyaların paylaşımı için tercihler"
 
-#: ../data/mateuser-share.desktop.in.in.h:1
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr "Kişisel Dosya Paylaşımı obexftp"
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Eğer etkinse Kişisel Kullanıcı Paylaşımını başlat"
 
-#: ../src/file-share-properties.c:435
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr "Kişisel Dosya Paylaşımı obexpush"
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr "Kişisel Dosya Paylaşımı webdav"
+
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr "Tercihler"
+
+#: ../src/caja-share-bar.c:121
+msgid "Launch Personal File Sharing Preferences"
+msgstr "Kişisel Dosya Paylaşımı Tercihlerini Başlat"
+
+#: ../src/share-extension.c:73
+msgid "Unable to launch the Personal File Sharing preferences"
+msgstr "Kişisel Dosya Paylaşımı tercihleri başlatılamadı"
+
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr "Paylaşmak veya dosya almak için kullanılabilir"
+
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr "Network ya da Bluetooth üzerinden paylaşım olabilir"
+
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr "Network üzerinden paylaşım olabilir"
+
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr "Bluetooth üzerinden dosya almak için kullanılabilir"
+
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "Sebep yok"
 
-#: ../src/file-share-properties.c:463
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "Yardım içeriği gösterilemedi."
 
-#: ../src/file-share-properties.c:503
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "Arayüz inşa edilemedi."
 
-#: ../src/file-share-properties.c:543
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "Asla"
 
-#: ../src/file-share-properties.c:546
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "Dosya yazılmaya çalışıldığında"
 
-#: ../src/file-share-properties.c:549 ../src/file-share-properties.c:572
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "Her zaman"
 
-#: ../src/file-share-properties.c:575
-msgid "Only for Bonded devices"
-msgstr "Sadece Bağlı aygıtlar için"
-
-#: ../src/file-share-properties.c:578
-msgid "Only for Bonded and Trusted devices"
-msgstr "Sadece Bağlı ve Güvenilir aygıtlar için"
+#: ../src/file-share-properties.c:580
+msgid "Only for set up devices"
+msgstr "Sadece kurulu cihazlar için"
 
-#: ../src/file-share-properties.c:583
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "Sor"
 
@@ -209,39 +176,36 @@ msgstr "Sor"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "%s kullanıcısının genel dosyaları"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "%s kullanıcısının %s üzerindeki genel dosyaları"
 
-#: ../src/http.c:372
-msgid "Please log in as the user guest"
-msgstr "Kullanıcı guest olarak giriş yapın"
-
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:138
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "Bluetooth aracılığıyla \"%s\" aldınız"
 
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "Bir dosya aldınız"
 
-#: ../src/obexpush.c:151
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "Dosya Aç"
 
-#: ../src/obexpush.c:155
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "Dosyayı Göster"
 
-#~ msgid "User Sharing"
-#~ msgstr "Kullanıcı Paylaşımı"
+#: ../src/obexpush.c:169
+msgid "File reception complete"
+msgstr "Dosya alımı tamamlandı"
diff --git a/po/ug.po b/po/ug.po
index 5c463f5..1d81be8 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -1,208 +1,167 @@
-# Uighur translation for mateuser-share
-# Copyright (C) 2005,2007-2009 Free Software Foundation, Inc.
-# This file is distributed under the same license as the mateuser-share package.
-# Gheyret Kenji <[email protected]>, 2010.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Gheyret Kenji <[email protected]>, 2010
 msgid ""
 msgstr ""
-"Project-Id-Version: mateuser-share master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.mateorg/enter_bug.cgi?product=mateuser-share&component=general\n"
-"POT-Creation-Date: 2010-11-13 21:29+0000\n"
-"PO-Revision-Date: 2009-02-27 08:32+0900\n"
-"Last-Translator: Gheyret Kenji <[email protected]>\n"
-"Language-Team: Uyghur Computer Science Association <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: monsta <[email protected]>\n"
+"Language-Team: Uighur (http://www.transifex.com/mate/MATE/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:1
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr "TRUE تاللانسا، ئىشلەتكۈچى كىرگەندىن كېيىن Bluetooth ئۈسكۈنىسى ئىشلەتكۈچىنىڭ مۇندەرىجىسىگە ھۆججەت ئەۋەتىدۇ."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr "TRUE تاللانسا، ئىشلەتكۈچى كىرگەندىن كېيىن ئىشلەتكۈچىنىڭ مۇندەرىجىسى ئىچىدىكى  Public مۇندەرىجىسى Bluetooth ئۈسكۈنىسى ئارقىلىق ھەمبەھىر قىلىنىدۇ."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:3
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr "TRUE تاللانسا، ئىشلەتكۈچى كىرگەندىن كېيىن ئىشلەتكۈچىنىڭ مۇندەرىجىسى ئىچىدىكى  Public مۇندەرىجىسى تور ئارقىلىق ھەمبەھىر قىلىنىدۇ."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:4
-msgid "Share Public directory over Bluetooth"
-msgstr "Public مۇندەرىجىسىنى Bluetooth ئۈسكۈنىسى ئارقىلىق ھەمبەھىر قىلىش"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:5
-msgid "Share Public directory over the network"
-msgstr "Public مۇندەرىجىسىنى تور ئارقىلىق ھەمبەھىر قىلىش"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:6
-msgid "When to accept files sent over Bluetooth"
-msgstr "Bluetooth ئارقىلىق ھۆججەت ئەۋەتىدىغان ۋاقىت."
-
-# FIXME: 原文がおかしいと思われる。「bonded」はもう存在しない。
-# "Only for set up devices"=「設定したデバイスのみ」が適当？
-#: ../data/desktop_matefile_sharing.schemas.in.h:7
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr "Bluetooth ئارقىلىق ھۆججەت ئەۋەتىدىغان ۋاقىتنى بەلگىلەڭ. بەلگىلىگىلى بولىدىغان قىممەتلەر: \"ھەمىشە\"،\"بېكىتىلگەن ئۈسكىنە\"، \"سوراش\"."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:8
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr "ئىمنى سورايدىغان ۋاقىت. بەلگىلىگىلى بولىدىغان قىممەتلەر: \"سورىمىسۇن\"،\"ھۆججەتنى ساقلايدىغان ۋاقىتتا\"،\"ھەمىشە\""
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:9
-msgid "When to require passwords"
-msgstr "ئىم تەلەپ قىلىدىغان ۋاقىت"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "Bluetooth client پروگراممىلىرى ObexPush نى ئىشلىتىپ ھۆججەت ئەۋەتەلەمدۇ يوق."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:11
-msgid "Whether Bluetooth clients need to pair with the computer to send files."
-msgstr "Bluetooth client پروگراممىلىرى ھۆججەت ئەۋەتىلىدىغان چاغدا كومپيۇتېر بىلەن ھەمكارلىشامدۇ يوق."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:12
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr "Bluetooth client پروگراممىلىرى ھۆججەتكە يازالامدۇ، ئوقۇشقىلا بولىدىغان ھۆججەتنى ھەمبەھىر قىلالامدۇ يوق."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:13
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "Bluetooth client پروگراممىلىرى ھۆججەتكە يازالامدۇ يوق."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "يېڭى ھۆججەت قوبۇل قىلغاندا ئۇقتۇرۇش قىلامدۇ يوق."
+"Language: ug\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/file-share-properties.ui.h:1
-msgid "<b>Receive Files over Bluetooth</b>"
-msgstr "<b>Bluetooth ئارقىلىق ھۆججەت قوبۇل قىلىش</b>"
+msgid "Personal File Sharing Preferences"
+msgstr "خۇسۇسىي ھۆججەت ھەمبەھىرى تەڭشىكى"
 
 #: ../data/file-share-properties.ui.h:2
-msgid "<b>Share Files over Bluetooth</b>"
-msgstr "<b>Bluetooth ئارقىلىق ھۆججەت ھەمبەھىر قىلىش</b>"
-
-#: ../data/file-share-properties.ui.h:3
 msgid "<b>Share Files over the Network</b>"
 msgstr "<b>تور ئارقىلىق ھۆججەت ھەمبەھىر قىلىش</b>"
 
+#: ../data/file-share-properties.ui.h:3
+msgid "_Share public files on network"
+msgstr "توردا ئاممىۋى ھۆججەتلەرنى ھەمبەھىر قىل(_S)"
+
 #: ../data/file-share-properties.ui.h:4
-msgid "Allo_w remote devices to delete files"
-msgstr "يىراقتىكى ئۈسكۈنىلەرنىڭ ھۆججەت ئۆچۈرۈشىگە رۇخسەت قىلىش(_W)"
+msgid "_Password:"
+msgstr "ئىم(_P):"
 
 #: ../data/file-share-properties.ui.h:5
-msgid "Personal File Sharing Preferences"
-msgstr "خۇسۇسىي ھۆججەت ھەمبەھىرى تەڭشىكى"
+msgid "_Require password:"
+msgstr "ئىم تەلەپ قىلىش(_R):"
 
 #: ../data/file-share-properties.ui.h:6
-msgid "Receive files in _Downloads folder over Bluetooth"
-msgstr "Bluetooth ئارقىلىق قوبۇل قىلغان ھۆججەتلەرنى چۈشۈرۈش مۇندەرىجىسىگە قويۇش(_D)"
+msgid "<b>Share Files over Bluetooth</b>"
+msgstr "<b>Bluetooth ئارقىلىق ھۆججەت ھەمبەھىر قىلىش</b>"
 
 #: ../data/file-share-properties.ui.h:7
-msgid "Require re_mote devices to bond with this computer"
-msgstr "يىراقتىكى ئۈسكۈنە بىلەن بۇ كومپيۇتېر ھەمكارلىشىشىنى تەلەپ قىلىش(_M)"
-
-#: ../data/file-share-properties.ui.h:8
 msgid "Share public files over _Bluetooth"
 msgstr "Bluetooth ئارقىلىق ئاممىۋى ھۆججەتلەرنى ھەمبەھىر قىلىش(_B)"
 
+#: ../data/file-share-properties.ui.h:8
+msgid "Allo_w remote devices to delete files"
+msgstr "يىراقتىكى ئۈسكۈنىلەرنىڭ ھۆججەت ئۆچۈرۈشىگە رۇخسەت قىلىش(_W)"
+
 #: ../data/file-share-properties.ui.h:9
-msgid "_Accept files: "
-msgstr "رۇخسەت قىلىنغان ھۆججەتلەر(_A): "
+msgid "Require re_mote devices to bond with this computer"
+msgstr "يىراقتىكى ئۈسكۈنە بىلەن بۇ كومپيۇتېر ھەمكارلىشىشىنى تەلەپ قىلىش(_M)"
 
 #: ../data/file-share-properties.ui.h:10
-msgid "_Notify about received files"
-msgstr "ھۆججەت قوبۇل قىلغاندا ئۇقتۇرۇش قىلىش(_N)"
+msgid "<b>Receive Files over Bluetooth</b>"
+msgstr "<b>Bluetooth ئارقىلىق ھۆججەت قوبۇل قىلىش</b>"
 
 #: ../data/file-share-properties.ui.h:11
-msgid "_Password:"
-msgstr "ئىم(_P):"
+msgid "Receive files in _Downloads folder over Bluetooth"
+msgstr "Bluetooth ئارقىلىق قوبۇل قىلغان ھۆججەتلەرنى چۈشۈرۈش مۇندەرىجىسىگە قويۇش(_D)"
 
 #: ../data/file-share-properties.ui.h:12
-msgid "_Require password:"
-msgstr "ئىم تەلەپ قىلىش(_R):"
+msgid "_Accept files: "
+msgstr "رۇخسەت قىلىنغان ھۆججەتلەر(_A): "
 
 #: ../data/file-share-properties.ui.h:13
-msgid "_Share public files on network"
-msgstr "توردا ئاممىۋى ھۆججەتلەرنى ھەمبەھىر قىل(_S)"
+msgid "_Notify about received files"
+msgstr "ھۆججەت قوبۇل قىلغاندا ئۇقتۇرۇش قىلىش(_N)"
 
-#: ../data/mateuser-share-properties.desktop.in.h:1
-#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
+
+#: ../data/mate-user-share-properties.desktop.in.h:1
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "خۇسۇسىي ھۆججەت ھەمبەھىرى"
 
-#: ../data/mateuser-share-properties.desktop.in.h:2
+#: ../data/mate-user-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "خۇسۇسىي ھۆججەت ھەمبەھىرىنىڭ تەڭشىكى"
 
-#: ../data/mateuser-share.desktop.in.in.h:1
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "خۇسۇسىي ھۆججەت ھەمبەھىرى ئىناۋەتلىك بولسا ئىجرا قىلىش"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "تەڭشەكنى ئىجرا قىلىش"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr ""
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr ""
 
-#: ../src/caja-share-bar.c:187
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr ""
+
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "خۇسۇسىي ھۆججەت ھەمبەھىرىنىڭ تەڭشىكىنى ئىجرا قىلىش"
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "خۇسۇسىي ھۆججەت ھەمبەھىرىنىڭ تەڭشىكىنى ئىجرا قىلغىلى بولمىدى"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "بۇ مۇندەرىجىدىكى ھۆججەتلەرنى ھەمبەھىر قىلالايسىز ۋە قوبۇل قىلغان ھۆججەتلەرنى بۇ يەرگە قويالايسىز."
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr ""
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "بۇ مۇندەرىجىدىكى ھۆججەتلەرنى Bluetooth ياكى تور ئارقىلىق ھەمبەھىر قىلالايسىز"
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr ""
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "بۇ مۇندەرىجىگە Bluetooth ئارقىلىق قوبۇل قىلىنغان ھۆججەتلەر قويۇلىدۇ"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr ""
 
-#: ../src/file-share-properties.c:436
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr ""
+
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "سەۋەبسىز"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "ياردەم ئۇچۇرلىرىنى كۆرسەتكىلى بولمىدى."
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "interface قۇرغىلى بولمىدى."
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "ھەرگىز"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "ھۆججەتلەرگە يازغاندا"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "ھەمىشە"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "بېكىتىلگەن ئۈسكۈنىلەرلا"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "كۆرۈشۈپ بېقىڭ"
 
@@ -215,39 +174,36 @@ msgstr "كۆرۈشۈپ بېقىڭ"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "%s نىڭ ئاممىۋى ھۆججەتلىرى"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "%s@%s نىڭ ئاممىۋى ھۆججەتلىرى"
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "Bluetooh نى ئىشلىتىپ \"%s\" نى قوبۇل قىلدىڭىز"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "بىر ھۆججەت قوبۇل قىلدىڭىز"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "ھۆججەت ئېچىش"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "ھۆججەت كۆرسىتىش"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "ھۆججەت قوبۇل قىلىش تاماملاندى."
-
-#~ msgid "Please log in as the user guest"
-#~ msgstr "مېھمان سۈپىتىدە سىستېمىغا كىرىڭ"
diff --git a/po/uk.po b/po/uk.po
index 9af0e3e..3c444f9 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -4,90 +4,22 @@
 # 
 # Translators:
 # wanderlust <[email protected]>, 2009
-# Koljan1970 <[email protected]>, 2013
+# Микола Ткач <[email protected]>, 2013,2015
+# Шаповалов Анатолій Романович <[email protected]>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-26 22:51+0200\n"
-"PO-Revision-Date: 2013-06-20 14:48+0000\n"
-"Last-Translator: Koljan1970 <[email protected]>\n"
-"Language-Team: Ukrainian (http://www.transifex.com/projects/p/MATE/language/uk/)\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: Микола Ткач <[email protected]>\n"
+"Language-Team: Ukrainian (http://www.transifex.com/mate/MATE/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../data/desktop_mate_file_sharing.schemas.in.h:1
-msgid "Share Public directory over the network"
-msgstr "Зробити файли у каталозі Public спільними для доступу з мережі"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr "Якщо відмічено, файли у каталозі Public користувача стануть доступні у мережі, коли він увійде у систему."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:3
-msgid "When to require passwords"
-msgstr "Коли вимагати пароль"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:4
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr "Коли запитувати пароль. Можливі значення «never», «on_write», та «always»."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:5
-msgid "Share Public directory over Bluetooth"
-msgstr "Зробити файли у каталозі Public спільними для доступу через Bluetooth"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:6
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr "Якщо встановлено, файли у каталозі Public користувача стануть доступні через Bluetooth, коли користувач увійде до системи."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:7
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "Дозволити клієнтам Bluetooth записувати файли."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:8
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr "Чи будуть клієнти Bluetooth записувати файли та файли будуть доступні лише для читання."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:9
-msgid ""
-"Whether Bluetooth clients need to pair with the computer to send files."
-msgstr "Вимагати від клієнтів Bluetooth з'єднання з комп'ютером для передачі файлів."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "Дозволити клієнтам Bluetooth надсилати файли за допомогою ObexPush."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:11
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr "Якщо відмічено, пристрої Bluetooth можуть надсилати файли у каталог Downloads користувача після його входу у систему."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:12
-msgid "When to accept files sent over Bluetooth"
-msgstr "Дії при отриманні файлів, надісланих через Bluetooth"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:13
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr "Дії при отриманні файлів через Bluetooth. Можливі значення: «always», «bonded», та «ask»."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "Повідомляти про отримувані файли"
-
 #: ../data/file-share-properties.ui.h:1
 msgid "Personal File Sharing Preferences"
 msgstr "Параметри спільного доступу до особистих файлів"
@@ -140,8 +72,16 @@ msgstr "П_риймати файли:"
 msgid "_Notify about received files"
 msgstr "_Сповіщати користувача про отримувані файли"
 
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr "Загальне"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr "Інтегрується з загальним"
+
 #: ../data/mate-user-share-properties.desktop.in.h:1
-#: ../data/mate-user-share.desktop.in.in.h:1 ../src/caja-share-bar.c:162
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "Спільний доступ до особистих файлів"
 
@@ -149,63 +89,81 @@ msgstr "Спільний доступ до особистих файлів"
 msgid "Preferences for sharing of files"
 msgstr "Параметри спільного доступу до файлів"
 
-#: ../data/mate-user-share.desktop.in.in.h:2
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr "Персональний загальний доступ до файлів obexftp"
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Увімкнути спільний доступ, якщо можливо"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "Відкрити параметри"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr "Персональний загальний доступ до файлів obexpush"
 
-#: ../src/caja-share-bar.c:187
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr "Персональний загальний доступ до файлів webdav"
+
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr "Налаштування"
+
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Параметри спільного доступу до особистих файлів"
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "Не вдається відкрити параметри спільного доступу до особистих файлів"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "Ви можете надавати спільний доступ до файлів у цій теці"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr "Може використовуватися для відправки або отримання файлів"
+
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr "Може надавати спільний доступ через мережу чи Bluetooth"
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "Ви можете надавати спільний доступ до файлів у цій теці з мережі чи Bluetooth"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr "Може надавати спільний доступ через мережу"
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "Ви можете отримувати файли з Bluetooth у цю теку"
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr "Може використовуватися для отримання файлів через Bluetooth"
 
-#: ../src/file-share-properties.c:436
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "Немає причини"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "Не вдається показати довідку."
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "Не вдається створити інтерфейс користувача"
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "Ніколи"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "При записі файлів"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "Завжди"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "Лише для налаштованих пристроїв"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "Запитувати"
 
@@ -218,36 +176,36 @@ msgstr "Запитувати"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "Спільні файли %s"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "Спільні файли %s на %s"
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "Через Bluetooth отримано файл «%s»"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "Отримано файл"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "Відкрити файл"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "Показати файл"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "Отримання файлу завершено"
diff --git a/po/ur.po b/po/ur.po
index ba4c439..f3a9274 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -10,85 +10,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-26 22:51+0200\n"
-"PO-Revision-Date: 2013-06-03 11:38+0000\n"
-"Last-Translator: mauron\n"
-"Language-Team: Urdu (http://www.transifex.com/projects/p/MATE/language/ur/)\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: monsta <[email protected]>\n"
+"Language-Team: Urdu (http://www.transifex.com/mate/MATE/language/ur/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ur\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/desktop_mate_file_sharing.schemas.in.h:1
-msgid "Share Public directory over the network"
-msgstr "عوامی ڈائریکٹری نیٹ ورک پر شیئر کریں"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr "اگر یہ فعال ہو، جب صارف لاگ ان ہوگا صارف کی گھر کی ڈائریکٹری بذریعہ بلیوٹوتھ نیٹ ورک پر شیئر کردی جائے گی."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:3
-msgid "When to require passwords"
-msgstr "پاس ورڈ کب درکار ہوں"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:4
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr "پاس ورڈ کے لیے کب پوچھا جائے. ممکنہ قدریں ہیں \"کبھی نہیں\", \"لکھنے_پر\", اور \"ہمیشہ\""
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:5
-msgid "Share Public directory over Bluetooth"
-msgstr "عوامی ڈائریکٹری بذریعہ بلیوٹوتھ شیئر کریں"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:6
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr "اگر یہ فعال ہو، جب صارف لاگ ان ہوگا صارف کی گھر کی ڈائریکٹری کی عوامی ڈائریکٹری بذریعہ بلیوٹوتھ شیئر کردی جائے گی."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:7
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "کیا بلیوٹوتھ موکلوں کو فائلیں لکھنے کی اجازت ہے."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:8
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr "کیا بلیوٹوتھ موکلوں کو فائلیں لکھنے کی اجازت ہے، یا صرف پڑھنے کے قابل فائلیں شیئر کرنے کی اجازت ہے."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:9
-msgid ""
-"Whether Bluetooth clients need to pair with the computer to send files."
-msgstr "کیا فائلیں ارسال کرنے کے لیے بلیوٹوتھ موکلوں کو کمپیوٹر سے جڑنے کی ضرورت ہے."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "کیا بلیوٹوتھ موکل ObexPush کو استعمال کرتے ہوئے فائلیں ارسال کریں."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:11
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr "اگر یہ فعال ہو، لاگ ان پر بلیوٹوتھ آلہ صارف کی ڈاؤنلوڈ ڈائریکٹری میں فائلیں ارسال کر سکے گا."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:12
-msgid "When to accept files sent over Bluetooth"
-msgstr "بلیوٹوتھ کے ذریعے بھیجی گئی فائلیں کب قبول کی جائیں"
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:13
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr "بلیوٹوتھ کے ذریعے بھیجی گئی فائلیں کب قبول کی جائیں. ممکنہ قدریں ہیں \"ہمیشہ\", \"پیوستہ\" اور \"پوچھیں\"."
-
-#: ../data/desktop_mate_file_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "کیا نئے موصول کردہ فائلوں کی اطلاع دی جائے."
-
 #: ../data/file-share-properties.ui.h:1
 msgid "Personal File Sharing Preferences"
 msgstr "ذاتی فائل شیئرنگ ترجیحات"
@@ -141,8 +72,16 @@ msgstr "فائلیں _قبول کریں:"
 msgid "_Notify about received files"
 msgstr "موصولہ فائلوں کے بارے _مطلع کریں"
 
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
+
 #: ../data/mate-user-share-properties.desktop.in.h:1
-#: ../data/mate-user-share.desktop.in.in.h:1 ../src/caja-share-bar.c:162
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "ذاتی فائل شیئرنگ"
 
@@ -150,63 +89,81 @@ msgstr "ذاتی فائل شیئرنگ"
 msgid "Preferences for sharing of files"
 msgstr "ترجیحات برائے فائل شیئرنگ"
 
-#: ../data/mate-user-share.desktop.in.in.h:2
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "ذاتی فائل شیئرنگ چلائیں اگر فعال ہو"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "چلانے کی ترجیحات"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr ""
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr ""
 
-#: ../src/caja-share-bar.c:187
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr ""
+
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "ذاتی فائل شیئرنگ کی ترجیحات چلائیں"
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "ذاتی فائل شیئرنگ کی ترجیحات چلانے سے قاصر"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "آپ اس فولڈر سے فائلیں شیئر کر سکتے ہیں اور اس میں وصول کر سکتے ہیں"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr ""
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "آپ اس فولڈر کی فائلیں نیٹ ورک اور بلیوٹوتھ کے ذریعے شیئر کر سکتے ہیں"
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr ""
+
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr ""
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "آپ اس فولڈر میں بذریعہ بلیوٹوتھ فائلیں وصول کر سکتے ہیں"
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr ""
 
-#: ../src/file-share-properties.c:436
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "کوئی وجہ نہیں"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "ہدایات کا مواد نہیں دکھایا جاسکتا."
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "مواجہ نہیں بنایا جاسکتا."
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "کبھی نہیں"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "جب فائلیں لکھی جارہی ہوں"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "ہمیشہ"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "صرف آلات مرتب کرنے کے لیے"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "پوچھیں"
 
@@ -219,36 +176,36 @@ msgstr "پوچھیں"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "%s کی عوامی فائلیں"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "%s کی عوامی فائلیں %s پر"
 
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "آپ نے بلیوٹوتھ کے ذریعے \"%s\" وصول کی ہے"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "آپ نے فائل وصول کی ہے"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "فائل کھولیں"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "فائل ظاہر کریں"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "فائل کی وصولیابی مکمل ہوئی"
diff --git a/po/vi.po b/po/vi.po
index af4330e..5fd5919 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -1,239 +1,169 @@
-# Vietnamese translation for GNOME User Share.
-# Copyright © 2009 GNOME i18n Project for Vietnamese.
-# Clytie Siddall <[email protected]>, 2005-2009.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: mateuser-share TRUNK\n"
-"Report-Msgid-Bugs-To: http://bugzilla.mateorg/enter_bug.cgi?product=mate"
-"user-share&component=general\n"
-"POT-Creation-Date: 2009-01-31 14:14+0000\n"
-"PO-Revision-Date: 2009-02-07 16:48+1030\n"
-"Last-Translator: Clytie Siddall <[email protected]>\n"
-"Language-Team: Vietnamese <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: monsta <[email protected]>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/mate/MATE/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LocFactoryEditor 1.8\n"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:1
-#| msgid ""
-#| "If this is true, the Public directory in the users home directory will be "
-#| "shared when the user is logged in."
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr ""
-"Nếu đúng thì thiết bị Bluetooth có khả năng gửi tập tin cho thư mục Tải Về (Downloads) của người dùng khi họ được đăng nhập."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:2
-#| msgid ""
-#| "If this is true, the Public directory in the users home directory will be "
-#| "shared when the user is logged in."
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr ""
-"Nếu đúng thì thư mục Công (Public) trong thư mục chính của người dùng sẽ được chia sẻ "
-"thông qua Bluetooth khi họ được đăng nhập."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:3
-#| msgid ""
-#| "If this is true, the Public directory in the users home directory will be "
-#| "shared when the user is logged in."
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr ""
-"Nếu đúng thì thư mục Công (Public) trong thư mục chính của người dùng sẽ được chia sẻ "
-"qua mạng khi họ được đăng nhập."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:4
-#| msgid "Share Public directory"
-msgid "Share Public directory over Bluetooth"
-msgstr "Chia sẻ thư mục Công qua Bluetooth"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:5
-#| msgid "Share Public files on network"
-msgid "Share Public directory over the network"
-msgstr "Chia sẻ tập tin Công qua mạng"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:6
-msgid "When to accept files sent over Bluetooth"
-msgstr "Khi nào nên chấp nhận tập tin gửi qua Bluetooth"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:7
-#| msgid ""
-#| "When to ask for passwords. Possible values are \"never\", \"on_write\", "
-#| "and \"always\"."
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\", \"bonded_trusted\" and \"ask\"."
-msgstr ""
-"Khi nào nên chấp nhận tập tin gửi qua Bluetooth. GIá trị có thể:\n"
-" • always		lúc nào cũng làm\n"
-" • bonded	được cam kết\n"
-" • bonded trusted	được cam kết và tin cậy\n"
-" • ask		hỏi."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:8
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr ""
-"Khi nào nên yêu cầu mật khẩu. Giá trị có thể:\n"
-" • never		không bao giờ\n"
-" • on_write	khi ghi\n"
-" • always		lúc nào cũng làm."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:9
-msgid "When to require passwords"
-msgstr "Khi nào nên yêu cầu mật khẩu"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "Ứng dụng khách Bluetooth có khả năng gửi tập tin dùng ObexPush, hay không."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:11
-msgid "Whether Bluetooth clients need to pair with the computer to send files."
-msgstr "Ứng dụng khách Bluetooth cần kết đôi với máy tính để gửi tập tin, hay không."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:12
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr "Có nên cho phép ứng dụng khách Bluetooth ghi tập tin, hoặc chia sẻ tập tin chỉ-đọc."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:13
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "Có nên cho phép ứng dụng khách Bluetooth ghi tập tin hay không."
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "Có nên thông báo về tập tin mới nhận hay không."
 
 #: ../data/file-share-properties.ui.h:1
-msgid "<b>Receive Files over Bluetooth</b>"
-msgstr "<b>Nhận tập tin qua Bluetooth</b>"
+msgid "Personal File Sharing Preferences"
+msgstr ""
 
 #: ../data/file-share-properties.ui.h:2
-#| msgid "<b>Share Files</b>"
-msgid "<b>Share Files over Bluetooth</b>"
-msgstr "<b>Chia sẻ tập tin qua Bluetooth</b>"
-
-#: ../data/file-share-properties.ui.h:3
-#| msgid "<b>Share Files</b>"
 msgid "<b>Share Files over the Network</b>"
 msgstr "<b>Chia sẻ tập tin qua mạng</b>"
 
+#: ../data/file-share-properties.ui.h:3
+msgid "_Share public files on network"
+msgstr "Chia _sẻ tập tin công trên mạng"
+
 #: ../data/file-share-properties.ui.h:4
-msgid "Allo_w remote devices to delete files"
-msgstr "Cho phép thiết bị từ xa xoá tập tin"
+msgid "_Password:"
+msgstr "_Mật khẩu :"
 
 #: ../data/file-share-properties.ui.h:5
-msgid "File Sharing Preferences"
-msgstr "Tuỳ thích Chia sẻ Tập tin"
+msgid "_Require password:"
+msgstr "_Yêu cầu mật khẩu :"
 
 #: ../data/file-share-properties.ui.h:6
-msgid "Receive files in _Downloads folder over Bluetooth"
-msgstr "Nhận tập tin trong thư mục _Tải Về qua Bluetooth"
+msgid "<b>Share Files over Bluetooth</b>"
+msgstr "<b>Chia sẻ tập tin qua Bluetooth</b>"
 
 #: ../data/file-share-properties.ui.h:7
-msgid "Require re_mote devices to bond with this computer"
-msgstr "Yêu cầu thiết bị từ xa ca_m kết với máy tính này"
-
-#: ../data/file-share-properties.ui.h:8
-#| msgid "Share Public files on network"
 msgid "Share public files over _Bluetooth"
 msgstr "Chia sẻ tập tin công qua Bluetooth"
 
+#: ../data/file-share-properties.ui.h:8
+msgid "Allo_w remote devices to delete files"
+msgstr "Cho phép thiết bị từ xa xoá tập tin"
+
 #: ../data/file-share-properties.ui.h:9
-msgid "_Accept files: "
-msgstr "Chấ_p nhận tập tin:"
+msgid "Require re_mote devices to bond with this computer"
+msgstr "Yêu cầu thiết bị từ xa ca_m kết với máy tính này"
 
 #: ../data/file-share-properties.ui.h:10
-msgid "_Notify about received files"
-msgstr "Báo về tập tin mới _nhận"
+msgid "<b>Receive Files over Bluetooth</b>"
+msgstr "<b>Nhận tập tin qua Bluetooth</b>"
 
 #: ../data/file-share-properties.ui.h:11
-msgid "_Password:"
-msgstr "_Mật khẩu :"
+msgid "Receive files in _Downloads folder over Bluetooth"
+msgstr "Nhận tập tin trong thư mục _Tải Về qua Bluetooth"
 
 #: ../data/file-share-properties.ui.h:12
-msgid "_Require password:"
-msgstr "_Yêu cầu mật khẩu :"
+msgid "_Accept files: "
+msgstr "Chấ_p nhận tập tin:"
 
 #: ../data/file-share-properties.ui.h:13
-#| msgid "Share Public files on network"
-msgid "_Share public files on network"
-msgstr "Chia _sẻ tập tin công trên mạng"
+msgid "_Notify about received files"
+msgstr "Báo về tập tin mới _nhận"
 
-#: ../data/file-share-properties.ui.h:14
-msgid "gtk-help"
-msgstr "gtk-help"
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
 
-#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mate-user-share-properties.desktop.in.h:1
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "Chia sẻ Tập tin Cá nhân"
 
-#: ../data/mateuser-share-properties.desktop.in.h:2
-msgid "Preferences for sharing of personal files"
-msgstr "Tuỳ thích về chức năng chia sẻ tập tin cá nhân"
+#: ../data/mate-user-share-properties.desktop.in.h:2
+msgid "Preferences for sharing of files"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
+msgid "Launch Personal File Sharing if enabled"
+msgstr ""
+
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr ""
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr ""
 
-#: ../data/mateuser-share.desktop.in.in.h:1
-msgid "Launch User Sharing if enabled"
-msgstr "Khởi chạy Chia sẻ Người dùng nếu được bật"
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr ""
 
-#: ../data/mateuser-share.desktop.in.in.h:2
-#| msgid "Personal File Sharing"
-msgid "User Sharing"
-msgstr "Chia sẻ Người dùng"
+#: ../src/caja-share-bar.c:121
+msgid "Launch Personal File Sharing Preferences"
+msgstr ""
+
+#: ../src/share-extension.c:73
+msgid "Unable to launch the Personal File Sharing preferences"
+msgstr ""
+
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr ""
+
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr ""
+
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr ""
 
-#: ../src/file-share-properties.c:35
-#: ../src/http.c:250
-msgid "Please log in as the user guest"
-msgstr "Hãy đăng nhập là người dùng khách"
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr ""
 
-#: ../src/file-share-properties.c:435
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "Không có lý do"
 
-#: ../src/file-share-properties.c:463
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "Không thể hiển thị nội dung trợ giúp."
 
-#: ../src/file-share-properties.c:503
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "Không thể xây dựng giao diện."
 
-#: ../src/file-share-properties.c:543
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "Không bao giờ"
 
-#: ../src/file-share-properties.c:546
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "Khi ghi tập tin"
 
-#: ../src/file-share-properties.c:549
-#: ../src/file-share-properties.c:572
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "Lúc nào cũng làm"
 
-#: ../src/file-share-properties.c:575
-msgid "Only for Bonded devices"
-msgstr "Chỉ cho thiết bị Cam kết"
-
-#: ../src/file-share-properties.c:578
-msgid "Only for Bonded and Trusted devices"
-msgstr "Chỉ cho thiết bị Cam kết và Tin cậy"
+#: ../src/file-share-properties.c:580
+msgid "Only for set up devices"
+msgstr ""
 
-#: ../src/file-share-properties.c:583
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "Hỏi"
 
-#: ../src/http.c:121
-#, c-format
 #. Translators: The %s will get filled in with the user name
 #. of the user, to form a genitive. If this is difficult to
 #. translate correctly so that it will work correctly in your
@@ -243,30 +173,36 @@ msgstr "Hỏi"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
+#: ../src/http.c:129
+#, c-format
 msgid "%s's public files"
 msgstr "Các tập tin công của %s"
 
-#: ../src/http.c:125
-#, c-format
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
+#: ../src/http.c:133
+#, c-format
 msgid "%s's public files on %s"
 msgstr "Các tập tin công của %s trên %s"
 
-#: ../src/obexpush.c:138
-#, c-format
 #. Translators: %s is the name of the filename received
+#: ../src/obexpush.c:136
+#, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "Mới nhận « %s » qua Bluetooth"
 
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "Mới nhận tập tin"
 
-#: ../src/obexpush.c:154
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "Mở tập tin"
 
-#: ../src/obexpush.c:158
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "Hiện tập tin"
+
+#: ../src/obexpush.c:169
+msgid "File reception complete"
+msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c49c50e..f21203c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,211 +1,172 @@
-# mateuser-share的简体中文翻译.
-# Copyright (C) 2009 Free Software Foundation, Inc.
-# This file is distributed under the same license as the mateuser-share package.
-# Funda Wang <[email protected]>, 2005, 2009.
-# 甘露(Gan Lu) <[email protected]>, 2009.
-# Hinker <[email protected]>, 2009.
-# Aron Xu <[email protected]>, 2009.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Aron Xu <[email protected]>, 2009
+# Funda Wang <[email protected]>, 2005,2009
+# Hinker <[email protected]>, 2009
+# 甘 露 <[email protected]>, 2009
+# 甘 露 <[email protected]>, 2009
+# Mingcong Bai <[email protected]>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: mateuser-share master\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 17:31+0800\n"
-"PO-Revision-Date: 2009-11-14 17:34+0800\n"
-"Last-Translator: Aron Xu <[email protected]>\n"
-"Language-Team: Chinese (simplified) <[email protected]>\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: Mingcong Bai <[email protected]>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/mate/MATE/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:1
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr "如果为真(true)，则用户登录时，蓝牙设备能发送文件到用户的“下载“目录。"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr "如果为真(true)，则用户登录时，用户主目录中的“公开”目录将在蓝牙中共享。"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:3
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr "如果为真(true)，则用户登录时，用户主目录中的“公开”目录将在网络中共享。"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:4
-msgid "Share Public directory over Bluetooth"
-msgstr "在蓝牙中共享“公开“目录"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:5
-msgid "Share Public directory over the network"
-msgstr "在网络中共享“公开“目录"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:6
-msgid "When to accept files sent over Bluetooth"
-msgstr "何时接收通过蓝牙发送的文件"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:7
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr ""
-"何时接受通过蓝牙发送的文件，可能的选项"
-"是“always”、“bonded”、“bonded_trusted”和“ask”。"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:8
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr "何时询问密码，可供选择的选项是：“never”、“on_write”和“always”。"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:9
-msgid "When to require passwords"
-msgstr "何时请求密码"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "蓝牙客户是否能使用 ObexPus 发送文件。"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:11
-msgid "Whether Bluetooth clients need to pair with the computer to send files."
-msgstr "蓝牙客户要发送文件是否需要先和电脑配对。"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:12
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr "是否允许蓝牙客户写入文件，还是只允许读取共享文件。"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:13
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "是否允许蓝牙客户写入文件。"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "是否通知关于新收到的文件。"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/file-share-properties.ui.h:1
-msgid "<b>Receive Files over Bluetooth</b>"
-msgstr "<b>接收通过蓝牙发送的文件</b>"
+msgid "Personal File Sharing Preferences"
+msgstr "个人文件共享选项"
 
 #: ../data/file-share-properties.ui.h:2
-msgid "<b>Share Files over Bluetooth</b>"
-msgstr "<b>在蓝牙中共享文件</b>"
-
-#: ../data/file-share-properties.ui.h:3
 msgid "<b>Share Files over the Network</b>"
 msgstr "<b>在网络中共享文件</b>"
 
+#: ../data/file-share-properties.ui.h:3
+msgid "_Share public files on network"
+msgstr "在网络中共享公开文件(_S)"
+
 #: ../data/file-share-properties.ui.h:4
-msgid "Allo_w remote devices to delete files"
-msgstr "允许远端设备删除文件(_W)"
+msgid "_Password:"
+msgstr "密码(_P)："
 
 #: ../data/file-share-properties.ui.h:5
-msgid "Personal File Sharing Preferences"
-msgstr "个人文件共享选项"
+msgid "_Require password:"
+msgstr "要求密码(_R)"
 
 #: ../data/file-share-properties.ui.h:6
-msgid "Receive files in _Downloads folder over Bluetooth"
-msgstr "接收通过蓝牙发送的文件到“下载“文件夹中(_D)"
+msgid "<b>Share Files over Bluetooth</b>"
+msgstr "<b>在蓝牙中共享文件</b>"
 
 #: ../data/file-share-properties.ui.h:7
-msgid "Require re_mote devices to bond with this computer"
-msgstr "要求远端设备与本电脑绑定"
-
-#: ../data/file-share-properties.ui.h:8
 msgid "Share public files over _Bluetooth"
 msgstr "在蓝牙中共享公开文件(_B)"
 
+#: ../data/file-share-properties.ui.h:8
+msgid "Allo_w remote devices to delete files"
+msgstr "允许远端设备删除文件(_W)"
+
 #: ../data/file-share-properties.ui.h:9
-msgid "_Accept files: "
-msgstr "接收文件(_A)："
+msgid "Require re_mote devices to bond with this computer"
+msgstr "要求远端设备与本电脑绑定"
 
 #: ../data/file-share-properties.ui.h:10
-msgid "_Notify about received files"
-msgstr "通知关于已收到的文件(_N)"
+msgid "<b>Receive Files over Bluetooth</b>"
+msgstr "<b>接收通过蓝牙发送的文件</b>"
 
 #: ../data/file-share-properties.ui.h:11
-msgid "_Password:"
-msgstr "密码(_P)："
+msgid "Receive files in _Downloads folder over Bluetooth"
+msgstr "接收通过蓝牙发送的文件到“下载“文件夹中(_D)"
 
 #: ../data/file-share-properties.ui.h:12
-msgid "_Require password:"
-msgstr "要求密码(_R)"
+msgid "_Accept files: "
+msgstr "接收文件(_A)："
 
 #: ../data/file-share-properties.ui.h:13
-msgid "_Share public files on network"
-msgstr "在网络中共享公开文件(_S)"
+msgid "_Notify about received files"
+msgstr "通知关于已收到的文件(_N)"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr "用户共享"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr "集成于用户共享"
 
-#: ../data/mateuser-share-properties.desktop.in.h:1
-#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
+#: ../data/mate-user-share-properties.desktop.in.h:1
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "个人文件共享"
 
-#: ../data/mateuser-share-properties.desktop.in.h:2
+#: ../data/mate-user-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "文件共享选项"
 
-#: ../data/mateuser-share.desktop.in.in.h:1
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr "个人文件共享 obexftp"
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "如果已启用则启动个人文件共享"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "启动首选项"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr "个人文件共享 obexpush"
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr "个人文件共享 webdav"
+
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr "首选项"
 
-#: ../src/caja-share-bar.c:187
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "个人文件共享选项"
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "无法启动个人文件共享选项"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "您可以使用此文件夹共享文件"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr "可用于分享或接收文件"
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "您可以通过网络或蓝牙共享此文件夹"
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr "可通过网络或蓝牙共享"
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "您可以通过蓝牙向此文件夹接收文件"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr "可以通过网络共享"
 
-#: ../src/file-share-properties.c:435
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr "可用于通过蓝牙接收文件"
+
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "无原因"
 
-#: ../src/file-share-properties.c:463
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "无法显示帮助目录。"
 
-#: ../src/file-share-properties.c:503
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "无法创建界面。"
 
-#: ../src/file-share-properties.c:543
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "从不"
 
-#: ../src/file-share-properties.c:546
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "写入文件时"
 
-#: ../src/file-share-properties.c:549 ../src/file-share-properties.c:572
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "总是"
 
-#: ../src/file-share-properties.c:575
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "仅对绑定的设备"
 
-#: ../src/file-share-properties.c:580
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "询问"
 
@@ -218,49 +179,36 @@ msgstr "询问"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "%s 的公开文件"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "%s 在 %s 上的公开文件"
 
-#: ../src/http.c:372
-msgid "Please log in as the user guest"
-msgstr "请作为访客登录"
-
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "你通过蓝牙收到了“%s”"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "你收到了一个文件"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "打开文件"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "显示文件"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "文件接收完成"
-
-#~ msgid "Only for Bonded and Trusted devices"
-#~ msgstr "仅对绑定且信任的设备"
-
-#~ msgid "gtk-help"
-#~ msgstr "gtk-help"
-
-#~ msgid "User Sharing"
-#~ msgstr "用户共享"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 27c6281..99b543a 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -1,210 +1,168 @@
-# Chinese (Hong Kong) translation of mateuser-share.HEAD
-# Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc.
-# Kevin Tse <[email protected]>, 2005.
-# Chao-Hsiung Liao <[email protected]>, 2009.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Chao-Hsiung Liao <[email protected]>, 2009
+# Kevin Tse <[email protected]>, 2005
 msgid ""
 msgstr ""
-"Project-Id-Version: mateuser-share 2.28.0\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-16 10:13+0800\n"
-"PO-Revision-Date: 2010-02-16 10:14+0800\n"
-"Last-Translator: Chao-Hsiung Liao <[email protected]>\n"
-"Language-Team: Chinese (Hong Kong) <[email protected]>\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: monsta <[email protected]>\n"
+"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/mate/MATE/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_TW\n"
+"Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Virtaal 0.4.0\n"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:1
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr "如果設定為 true，藍牙裝置就可以在使用者登入時傳送檔案到他的下載目錄中。"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr "如果設定為 true，使用者的家目錄裏之公用目錄會在他/她登入時透過藍牙分享出來。"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:3
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr "如果設定為 true，使用者的家目錄裏之公用目錄會在他/她登入時透過網絡分享出來。"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:4
-msgid "Share Public directory over Bluetooth"
-msgstr "以藍牙分享公用目錄"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:5
-msgid "Share Public directory over the network"
-msgstr "以網絡分享公用目錄"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:6
-msgid "When to accept files sent over Bluetooth"
-msgstr "何時接受透過藍牙傳送的檔案"
-
-# (pofilter) gconf: do not translate gconf attribute: "always", "bonded", "bonded_trusted", "ask"
-#: ../data/desktop_matefile_sharing.schemas.in.h:7
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr "何時接受透過藍牙傳送的檔案。可能的數值是「always」(永遠)、「bonded」(已配對)、「bonded_trusted」(已配對且信任)和「ask」(詢問)。"
-
-# (pofilter) gconf: do not translate gconf attribute: "never", "on_write", "always"
-#: ../data/desktop_matefile_sharing.schemas.in.h:8
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr "何時會詢問密碼。可能的數值是「never」(永不)、「on_write」(寫入時)和「always」(永遠)。"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:9
-msgid "When to require passwords"
-msgstr "何時需要密碼"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "藍牙客戶端是否可以使用 ObexPush 傳送檔案。"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:11
-msgid "Whether Bluetooth clients need to pair with the computer to send files."
-msgstr "藍牙客戶端是否需要與電腦配對才能傳送檔案。"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:12
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr "是否允許藍牙客戶端寫入檔案，或以唯讀方式分享檔案。"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:13
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "是否允許藍牙客戶端寫入檔案。"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "是否通知有最新接收到的檔案。"
 
 #: ../data/file-share-properties.ui.h:1
-msgid "<b>Receive Files over Bluetooth</b>"
-msgstr "<b>透過藍牙接收檔案</b>"
+msgid "Personal File Sharing Preferences"
+msgstr "個人檔案分享偏好設定"
 
 #: ../data/file-share-properties.ui.h:2
-msgid "<b>Share Files over Bluetooth</b>"
-msgstr "<b>以藍牙分享檔案</b>"
-
-#: ../data/file-share-properties.ui.h:3
 msgid "<b>Share Files over the Network</b>"
 msgstr "<b>以網絡分享檔案</b>"
 
+#: ../data/file-share-properties.ui.h:3
+msgid "_Share public files on network"
+msgstr "以網絡分享公用檔案(_S)"
+
 #: ../data/file-share-properties.ui.h:4
-msgid "Allo_w remote devices to delete files"
-msgstr "允許遠端裝置刪除檔案(_W)"
+msgid "_Password:"
+msgstr "密碼(_P):"
 
 #: ../data/file-share-properties.ui.h:5
-msgid "Personal File Sharing Preferences"
-msgstr "個人檔案分享偏好設定"
+msgid "_Require password:"
+msgstr "需要密碼(_R):"
 
 #: ../data/file-share-properties.ui.h:6
-msgid "Receive files in _Downloads folder over Bluetooth"
-msgstr "透過藍牙接收檔案到下載資料夾(_D)"
+msgid "<b>Share Files over Bluetooth</b>"
+msgstr "<b>以藍牙分享檔案</b>"
 
 #: ../data/file-share-properties.ui.h:7
-msgid "Require re_mote devices to bond with this computer"
-msgstr "要求遠端裝置與這個電腦配對(_M)"
-
-#: ../data/file-share-properties.ui.h:8
 msgid "Share public files over _Bluetooth"
 msgstr "以藍牙分享公用檔案(_B)"
 
+#: ../data/file-share-properties.ui.h:8
+msgid "Allo_w remote devices to delete files"
+msgstr "允許遠端裝置刪除檔案(_W)"
+
 #: ../data/file-share-properties.ui.h:9
-msgid "_Accept files: "
-msgstr "接受檔案(_A):"
+msgid "Require re_mote devices to bond with this computer"
+msgstr "要求遠端裝置與這個電腦配對(_M)"
 
 #: ../data/file-share-properties.ui.h:10
-msgid "_Notify about received files"
-msgstr "通知有接收檔案(_N)"
+msgid "<b>Receive Files over Bluetooth</b>"
+msgstr "<b>透過藍牙接收檔案</b>"
 
 #: ../data/file-share-properties.ui.h:11
-msgid "_Password:"
-msgstr "密碼(_P):"
+msgid "Receive files in _Downloads folder over Bluetooth"
+msgstr "透過藍牙接收檔案到下載資料夾(_D)"
 
 #: ../data/file-share-properties.ui.h:12
-msgid "_Require password:"
-msgstr "需要密碼(_R):"
+msgid "_Accept files: "
+msgstr "接受檔案(_A):"
 
 #: ../data/file-share-properties.ui.h:13
-msgid "_Share public files on network"
-msgstr "以網絡分享公用檔案(_S)"
+msgid "_Notify about received files"
+msgstr "通知有接收檔案(_N)"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr ""
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr ""
 
-#: ../data/mateuser-share-properties.desktop.in.h:1
-#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
+#: ../data/mate-user-share-properties.desktop.in.h:1
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "個人檔案分享"
 
-#: ../data/mateuser-share-properties.desktop.in.h:2
+#: ../data/mate-user-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "用於分享個人檔案的偏好設定"
 
-#: ../data/mateuser-share.desktop.in.in.h:1
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr ""
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "若啟用則執行個人檔案分享"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "執行偏好設定"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr ""
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr ""
 
-#: ../src/caja-share-bar.c:187
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr ""
+
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "執行個人檔案分享偏好設定"
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "無法執行個人檔案分享偏好設定"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "你可以分享這個資料夾中的檔案或接收檔案到資料夾裏"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr ""
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "你可以透過網絡和藍牙分享這個資料夾中的檔案"
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr ""
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "你可以透過藍牙接收檔案到這個資料夾裏"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr ""
 
-#: ../src/file-share-properties.c:436
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr ""
+
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "沒有原因"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "無法顯示求助文件的內容。"
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "無法建立介面。"
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "永不"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "當寫入至檔案"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "經常"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "只有設定的裝置"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "詢問"
 
@@ -217,49 +175,36 @@ msgstr "詢問"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "%s 的公用檔案"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "%s 的公用檔案於 %s"
 
-#: ../src/http.c:372
-msgid "Please log in as the user guest"
-msgstr "請以使用者訪客登入"
-
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "你已經透過藍牙接收到「%s」"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "你已經接收到檔案"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "開啟檔案"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "顯示檔案"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "檔案接收已完成"
-
-#~ msgid "Only for Bonded and Trusted devices"
-#~ msgstr "只允許繫結與受信任的裝置"
-
-#~ msgid "User Sharing"
-#~ msgstr "使用者分享"
-
-#~ msgid "gtk-help"
-#~ msgstr "gtk-help"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 211a43e..94bab63 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,217 +1,170 @@
-# Traditional Chinese translation of mateuser-share.HEAD
-# Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc.
-# Kevin Tse <[email protected]>, 2005.
-# Chao-Hsiung Liao <[email protected]>, 2009.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Chao-Hsiung Liao <[email protected]>, 2009
+# Jeff Huang <[email protected]>, 2015
+# Kevin Tse <[email protected]>, 2005
+# 趙惟倫 <[email protected]>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: mateuser-share 2.28.0\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-16 10:13+0800\n"
-"PO-Revision-Date: 2010-02-15 17:19+0800\n"
-"Last-Translator: Chao-Hsiung Liao <[email protected]>\n"
-"Language-Team: Chinese (traditional)\n"
+"POT-Creation-Date: 2015-11-06 15:07+0300\n"
+"PO-Revision-Date: 2016-04-08 10:15+0000\n"
+"Last-Translator: Jeff Huang <[email protected]>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/mate/MATE/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Virtaal 0.4.0\n"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:1
-msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr ""
-"如果設定為 true，藍牙裝置就可以在使用者登入時傳送檔案到他的下載目錄中。"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr ""
-"如果設定為 true，使用者的家目錄裡之公用目錄會在他/她登入時透過藍牙分享出來。"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:3
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr ""
-"如果設定為 true，使用者的家目錄裡之公用目錄會在他/她登入時透過網路分享出來。"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:4
-msgid "Share Public directory over Bluetooth"
-msgstr "以藍牙分享公用目錄"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:5
-msgid "Share Public directory over the network"
-msgstr "以網路分享公用目錄"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:6
-msgid "When to accept files sent over Bluetooth"
-msgstr "何時接受透過藍牙傳送的檔案"
-
-# (pofilter) gconf: do not translate gconf attribute: "always", "bonded", "bonded_trusted", "ask"
-#: ../data/desktop_matefile_sharing.schemas.in.h:7
-msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
-msgstr ""
-"何時接受透過藍牙傳送的檔案。可能的數值是「always」(永遠)、「bonded」(已配"
-"對)、「bonded_trusted」(已配對且信任)和「ask」(詢問)。"
-
-# (pofilter) gconf: do not translate gconf attribute: "never", "on_write", "always"
-#: ../data/desktop_matefile_sharing.schemas.in.h:8
-msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr ""
-"何時會詢問密碼。可能的數值是「never」(永不)、「on_write」(寫入時)和「always」"
-"(永遠)。"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:9
-msgid "When to require passwords"
-msgstr "何時需要密碼"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "藍牙客戶端是否可以使用 ObexPush 傳送檔案。"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:11
-msgid "Whether Bluetooth clients need to pair with the computer to send files."
-msgstr "藍牙客戶端是否需要與電腦配對才能傳送檔案。"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:12
-msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr "是否允許藍牙客戶端寫入檔案，或以唯讀方式分享檔案。"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:13
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "是否允許藍牙客戶端寫入檔案。"
-
-#: ../data/desktop_matefile_sharing.schemas.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "是否通知有最新接收到的檔案。"
 
 #: ../data/file-share-properties.ui.h:1
-msgid "<b>Receive Files over Bluetooth</b>"
-msgstr "<b>透過藍牙接收檔案</b>"
+msgid "Personal File Sharing Preferences"
+msgstr "個人檔案分享偏好設定"
 
 #: ../data/file-share-properties.ui.h:2
-msgid "<b>Share Files over Bluetooth</b>"
-msgstr "<b>以藍牙分享檔案</b>"
-
-#: ../data/file-share-properties.ui.h:3
 msgid "<b>Share Files over the Network</b>"
 msgstr "<b>以網路分享檔案</b>"
 
+#: ../data/file-share-properties.ui.h:3
+msgid "_Share public files on network"
+msgstr "以網路分享公用檔案(_S)"
+
 #: ../data/file-share-properties.ui.h:4
-msgid "Allo_w remote devices to delete files"
-msgstr "允許遠端裝置刪除檔案(_W)"
+msgid "_Password:"
+msgstr "密碼(_P):"
 
 #: ../data/file-share-properties.ui.h:5
-msgid "Personal File Sharing Preferences"
-msgstr "個人檔案分享偏好設定"
+msgid "_Require password:"
+msgstr "需要密碼(_R):"
 
 #: ../data/file-share-properties.ui.h:6
-msgid "Receive files in _Downloads folder over Bluetooth"
-msgstr "透過藍牙接收檔案到下載資料夾(_D)"
+msgid "<b>Share Files over Bluetooth</b>"
+msgstr "<b>以藍牙分享檔案</b>"
 
 #: ../data/file-share-properties.ui.h:7
-msgid "Require re_mote devices to bond with this computer"
-msgstr "要求遠端裝置與這個電腦配對(_M)"
-
-#: ../data/file-share-properties.ui.h:8
 msgid "Share public files over _Bluetooth"
 msgstr "以藍牙分享公用檔案(_B)"
 
+#: ../data/file-share-properties.ui.h:8
+msgid "Allo_w remote devices to delete files"
+msgstr "允許遠端裝置刪除檔案(_W)"
+
 #: ../data/file-share-properties.ui.h:9
-msgid "_Accept files: "
-msgstr "接受檔案(_A):"
+msgid "Require re_mote devices to bond with this computer"
+msgstr "要求遠端裝置與這個電腦配對(_M)"
 
 #: ../data/file-share-properties.ui.h:10
-msgid "_Notify about received files"
-msgstr "通知有接收檔案(_N)"
+msgid "<b>Receive Files over Bluetooth</b>"
+msgstr "<b>透過藍牙接收檔案</b>"
 
 #: ../data/file-share-properties.ui.h:11
-msgid "_Password:"
-msgstr "密碼(_P):"
+msgid "Receive files in _Downloads folder over Bluetooth"
+msgstr "透過藍牙接收檔案到下載資料夾(_D)"
 
 #: ../data/file-share-properties.ui.h:12
-msgid "_Require password:"
-msgstr "需要密碼(_R):"
+msgid "_Accept files: "
+msgstr "接受檔案(_A):"
 
 #: ../data/file-share-properties.ui.h:13
-msgid "_Share public files on network"
-msgstr "以網路分享公用檔案(_S)"
+msgid "_Notify about received files"
+msgstr "通知有接收檔案(_N)"
 
-#: ../data/mateuser-share-properties.desktop.in.h:1
-#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
+#: ../data/libcaja-user-share.caja-extension.in.in.h:1
+msgid "User Share"
+msgstr "使用者分享"
+
+#: ../data/libcaja-user-share.caja-extension.in.in.h:2
+msgid "Integrates with user-share"
+msgstr "與 user-share 整合"
+
+#: ../data/mate-user-share-properties.desktop.in.h:1
+#: ../src/caja-share-bar.c:103
 msgid "Personal File Sharing"
 msgstr "個人檔案分享"
 
-#: ../data/mateuser-share-properties.desktop.in.h:2
+#: ../data/mate-user-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "用於分享個人檔案的偏好設定"
 
-#: ../data/mateuser-share.desktop.in.in.h:1
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:1
+msgid "Personal File Sharing obexftp"
+msgstr "個人檔案分享 obexftp"
+
+#: ../data/mate-user-share-obexftp.desktop.in.in.h:2
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:2
+#: ../data/mate-user-share-webdav.desktop.in.in.h:2
 msgid "Launch Personal File Sharing if enabled"
 msgstr "若啟用則執行個人檔案分享"
 
-#: ../src/caja-share-bar.c:174
-msgid "Launch Preferences"
-msgstr "執行偏好設定"
+#: ../data/mate-user-share-obexpush.desktop.in.in.h:1
+msgid "Personal File Sharing obexpush"
+msgstr "個人檔案分享 obexpush"
+
+#: ../data/mate-user-share-webdav.desktop.in.in.h:1
+msgid "Personal File Sharing webdav"
+msgstr "個人檔案分享 webdav"
+
+#: ../src/caja-share-bar.c:117
+msgid "Preferences"
+msgstr "偏好設定"
 
-#: ../src/caja-share-bar.c:187
+#: ../src/caja-share-bar.c:121
 msgid "Launch Personal File Sharing Preferences"
 msgstr "執行個人檔案分享偏好設定"
 
-#: ../src/share-extension.c:82
+#: ../src/share-extension.c:73
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "無法執行個人檔案分享偏好設定"
 
-#: ../src/share-extension.c:173
-msgid "You can share files from this folder and receive files to it"
-msgstr "您可以分享這個資料夾中的檔案或接收檔案到資料夾裡"
+#: ../src/share-extension.c:179
+msgid "May be used to share or receive files"
+msgstr "可用以分享或接收檔案"
 
-#: ../src/share-extension.c:175
-msgid "You can share files from this folder over the network and Bluetooth"
-msgstr "您可以透過網路和藍牙分享這個資料夾中的檔案"
+#: ../src/share-extension.c:181
+msgid "May be shared over the network or Bluetooth"
+msgstr "可以透過網路或藍牙分享"
 
-#: ../src/share-extension.c:177
-msgid "You can receive files over Bluetooth into this folder"
-msgstr "您可以透過藍牙接收檔案到這個資料夾裡"
+#: ../src/share-extension.c:184
+msgid "May be shared over the network"
+msgstr "可以透過網路分享"
 
-#: ../src/file-share-properties.c:436
+#: ../src/share-extension.c:190
+msgid "May be used to receive files over Bluetooth"
+msgstr "可用以從藍牙接收檔案"
+
+#: ../src/file-share-properties.c:417
 msgid "No reason"
 msgstr "沒有原因"
 
-#: ../src/file-share-properties.c:464
+#: ../src/file-share-properties.c:445
 msgid "Could not display the help contents."
 msgstr "無法顯示求助文件的內容。"
 
-#: ../src/file-share-properties.c:524
+#: ../src/file-share-properties.c:507
 msgid "Could not build interface."
 msgstr "無法建立介面。"
 
-#: ../src/file-share-properties.c:566
+#: ../src/file-share-properties.c:547
 msgid "Never"
 msgstr "永不"
 
-#: ../src/file-share-properties.c:569
+#: ../src/file-share-properties.c:550
 msgid "When writing files"
 msgstr "當寫入至檔案"
 
-#: ../src/file-share-properties.c:572 ../src/file-share-properties.c:595
+#: ../src/file-share-properties.c:553 ../src/file-share-properties.c:577
 msgid "Always"
 msgstr "經常"
 
-#: ../src/file-share-properties.c:598
+#: ../src/file-share-properties.c:580
 msgid "Only for set up devices"
 msgstr "只有設定的裝置"
 
-#: ../src/file-share-properties.c:603
+#: ../src/file-share-properties.c:585
 msgid "Ask"
 msgstr "詢問"
 
@@ -224,49 +177,36 @@ msgstr "詢問"
 #. which will match the user name string passed by the C code,
 #. but not put the user name in the final string. This is to
 #. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:134
+#: ../src/http.c:129
 #, c-format
 msgid "%s's public files"
 msgstr "%s 的公用檔案"
 
 #. Translators: This is similar to the string before, only it
 #. has the hostname in it too.
-#: ../src/http.c:138
+#: ../src/http.c:133
 #, c-format
 msgid "%s's public files on %s"
 msgstr "%s 的公用檔案於 %s"
 
-#: ../src/http.c:372
-msgid "Please log in as the user guest"
-msgstr "請以使用者訪客登入"
-
 #. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:140
+#: ../src/obexpush.c:136
 #, c-format
 msgid "You received \"%s\" via Bluetooth"
 msgstr "您已經透過藍牙接收到「%s」"
 
-#: ../src/obexpush.c:142
+#: ../src/obexpush.c:138
 msgid "You received a file"
 msgstr "您已經接收到檔案"
 
-#: ../src/obexpush.c:153
+#: ../src/obexpush.c:148
 msgid "Open File"
 msgstr "開啟檔案"
 
-#: ../src/obexpush.c:157
+#: ../src/obexpush.c:152
 msgid "Reveal File"
 msgstr "顯示檔案"
 
-#: ../src/obexpush.c:174
+#: ../src/obexpush.c:169
 msgid "File reception complete"
 msgstr "檔案接收已完成"
-
-#~ msgid "Only for Bonded and Trusted devices"
-#~ msgstr "只允許繫結與受信任的裝置"
-
-#~ msgid "User Sharing"
-#~ msgstr "使用者分享"
-
-#~ msgid "gtk-help"
-#~ msgstr "gtk-help"