Updated help and po directories.

89 files changed, 2805 insertions, 2592 deletions

diff --git a/help/C/mate-user-share.xml b/help/C/mate-user-share.xml
new file mode 100644
index 0000000..7a3047e
--- /dev/null
+++ b/help/C/mate-user-share.xml
@@ -0,0 +1,202 @@
+<?xml version="1.0"?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ 
+  <!ENTITY appversion "2.26">
+  <!ENTITY app "mate-user-share">
+]>
+
+<article id="index" lang="en">
+  <articleinfo>
+	 <title>Personal File Sharing Manual</title>
+	 <copyright>
+		<year>2009</year>
+		<holder>Red Hat, Inc.</holder>
+         </copyright>
+
+	 <xi:include href="legal.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	 <authorgroup>
+           <author role="maintainer">
+             <firstname>Matthias</firstname>
+             <surname>Clasen</surname>
+           </author>
+	 </authorgroup>
+
+<!-- According to GNU FDL, revision history is mandatory if you are -->
+<!-- modifying/reusing someone else's document.  If not, you can omit it. -->
+	 <revhistory>
+		<revision>
+		  <revnumber>1.0</revnumber>
+		  <date>2009</date>
+		  <revdescription>
+			 <para role="author">Matthias Clasen <email>[email protected]</email></para>
+		  </revdescription>
+		</revision>
+	 </revhistory>
+	 <releaseinfo>This manual describes version &appversion; of &app;.</releaseinfo>
+	 <legalnotice>
+		<title>Feedback</title>
+		<para>To report a bug or make a suggestion regarding the &app; application or this manual, follow the directions in the <ulink url="ghelp:user-guide?feedback-bugs" type="help">GNOME Feedback Page</ulink>.</para>
+	 </legalnotice>
+    <abstract role="description">
+      <para>&app; is a session service that enables easy sharing of files
+      between several computers.</para>
+    </abstract>
+  </articleinfo>
+  <indexterm><primary>mate-user-share</primary></indexterm>
+  <indexterm><primary>file sharing</primary></indexterm>
+  <indexterm><primary>sharing</primary></indexterm>
+
+  <sect1 id="mate-user-share-intro">
+	 <title>Introduction</title>
+	 <para>
+		&app; is a session service that exports the contents of the <filename>Public</filename> folder in your home directory, so that they can easily be accessed from other computers on the same local network. On the other computers, the shared folder will appear with a name like '<replaceable>user</replaceable>'s shared files' in the <application>caja</application> Network window, where <replaceable>user</replaceable> will be replaced by your user name.
+	 </para>
+	 <para>
+		&app; uses a WebDAV server to share the <filename>Public</filename> folder, and advertises the share on the local network using mDNS.
+	 </para>
+         <para>
+		Additionally, &app; can make the shared files available via ObexFTP over Bluetooth, and receive files that are sent to your computer via Bluetooth via ObexPush.
+         </para>
+  </sect1>
+
+  <sect1 id="mate-user-share-getting-started">
+    <title>Getting started</title>
+
+    <sect2 id="mate-user-share-start">
+       <title>Starting &app;</title>
+
+       <para>
+         The &app; service is normally started by <application>mate-session</application> when you log in. You can change this by opening <menuchoice><guimenu>Preferences</guimenu><guimenu>Startup Applications</guimenu></menuchoice> in the <guimenu>System</guimenu> menu, and modifying the 'User Sharing' entry in the list of startup programs.
+       </para>
+
+       <para>
+         To configure various aspects of file sharing, use the File Sharing Preferences, which can be found in the <guimenu>System</guimenu> menu under
+         <menuchoice><guimenu>Preferences</guimenu><guimenu>Personal File Sharing</guimenu></menuchoice>.
+       </para>
+       <figure id="file-sharing-preferences">
+         <title>File Sharing Preferences</title>
+         <screenshot>
+           <mediaobject>
+             <imageobject>
+               <imagedata fileref="figures/file-sharing-preferences.png" format="PNG"/>
+             </imageobject>
+           </mediaobject>
+         </screenshot>
+       </figure>
+ 
+     </sect2>
+     <sect2 id="mate-user-share-enabling-sharing">
+       <title>Enabling file sharing over the network</title>
+       <para>
+         Open the File Sharing Preferences using
+         <menuchoice><guimenu>Preferences</guimenu><guimenu>Personal File Sharing</guimenu></menuchoice> in the <guimenu>System</guimenu> menu.  
+       </para>
+       <figure id="sharing-over-the-network">
+         <title>Share Files over the Network</title>
+         <screenshot>
+           <mediaobject>
+             <imageobject>
+               <imagedata fileref="figures/sharing-over-the-network.png" format="PNG"/>
+             </imageobject>
+           </mediaobject>
+         </screenshot>
+       </figure>
+       <para>
+	       To enable file sharing via WebDAV, use the <guilabel>Share public files on network</guilabel> checkbox. When file sharing it enabled, the controls for password protection allow to set a password that needs to be specified before a user on another computer is granted access to the shared files. 
+	 <note><para>Some firewall configurations on the local machine might cause problems with the advertisment, as well as the access to the shared files. Consult your system administrator for more details.</para></note>
+         <itemizedlist>
+           <listitem>
+              <para>
+                Select <guilabel>Never</guilabel> to allow everybody to 
+                freely read or write files in the shared folder.
+              </para>
+           </listitem>
+           <listitem>
+              <para>
+                Select <guilabel>Always</guilabel> to require the password 
+                to read or write files in the shared folder.
+              </para>
+           </listitem>
+           <listitem>
+              <para>
+                Select <guilabel>When writing files</guilabel> to allow everybody
+                to freely read files in the shared folder, but require the
+                password when writing files.
+              </para>
+           </listitem>
+         </itemizedlist>
+        <note><para>When you set a password, you have to give the password to all users that you want to have access to the shared files. Therefore, you should use a password that is different from other passwords you use.</para></note>
+       </para>  
+     </sect2>
+
+     <sect2 id="mate-user-share-enabling-bluetooth">
+       <title>Enabling file sharing over Bluetooth</title>
+       <para>
+         Open the File Sharing Preferences using
+         <menuchoice><guimenu>Preferences</guimenu><guimenu>Personal File Sharing</guimenu></menuchoice> in the <guimenu>System</guimenu> menu.  
+       </para>
+       <figure id="sharing-over-bluetooth">
+         <title>Share Files over Bluetooth</title>
+         <screenshot>
+           <mediaobject>
+             <imageobject>
+               <imagedata fileref="figures/sharing-over-bluetooth.png" format="PNG"/>
+             </imageobject>
+           </mediaobject>
+         </screenshot>
+       </figure>
+       <para>
+         To enable file sharing via Bluetooth, use the <guilabel>Share public files over Bluetooth</guilabel> checkbox.
+         To allow remote Bluetooth devices to delete files in your shared folder, use the <guilabel>Allow remote devices to delete files</guilabel> checkbox.
+         To allow remote Bluetooth devices to access your shared files even when they are not bonded with your computer, use the <guilabel>Require remote devices to pair with this computer</guilabel> checkbox.
+         <note><para>When you allow unbonded remote devices to access your shared files, anybody with a Bluetooth-enabled cell phone in the vicinity of your computer can access and perhaps even modify your shared files.
+         </para></note>
+       </para>
+     </sect2>
+
+     <sect2 id="mate-user-share-bluetooth-receiving">
+       <title>Receiving Files over Bluetooth</title>
+       <para>
+         Open the File Sharing Preferences using
+         <menuchoice><guimenu>Preferences</guimenu><guimenu>Personal File Sharing</guimenu></menuchoice> in the <guimenu>System</guimenu> menu.  
+       </para>
+       <figure id="receiving-over-bluetooth">
+         <title>Receive Files over Bluetooth</title>
+         <screenshot>
+           <mediaobject>
+             <imageobject>
+               <imagedata fileref="figures/receiving-over-bluetooth.png" format="PNG"/>
+             </imageobject>
+           </mediaobject>
+         </screenshot>
+       </figure>
+       <para>
+         To let remote Bluetooth devices send files to your computer, use the <guilabel>Receive files in Downloads folder over Bluetooth</guilabel> checkbox. Received files will be stored in the <filename>Downloads</filename> folder in your home directory. When receiving files is enabled, the <guilabel>Accept files</guilabel> selection allows you to determine which remote devices are allowed to send files.
+          <itemizedlist>
+            <listitem>
+              <para>
+                 Select <guilabel>Always</guilabel> to allow any remote device to send files.
+              </para>
+            </listitem>
+            <listitem>
+              <para>
+                  Select <guilabel>Only for Bonded devices</guilabel> to accept files only from bonded devices.
+		  <note><para>Bonded devices are the ones that were connected to your computer, and had to enter a PIN code to connect to or from.</para></note>
+                    
+	      </para>
+            </listitem>
+            <listitem>
+              <para>
+                  Select <guilabel>Only for Bonded and Trusted devices</guilabel> to accept files only from bonded devices.
+		  <note><para>Devices can be marked as trusted in the <application>bluetooth-properties</application>'s <guilabel>Known devices</guilabel> section.</para></note>
+              </para>
+            </listitem>
+          </itemizedlist>
+        </para>
+        <para>
+          Use the <guilabel>Notify about received files</guilabel> checkbox to select whether you want to be notified whenever a file is received via Bluetooth.
+       </para>
+     </sect2>
+  </sect1>
+
+</article>
diff --git a/help/Makefile.am b/help/Makefile.am
index b5a2099..86e0f87 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,7 +1,7 @@
-include $(top_srcdir)/gnome-doc-utils.make
+include $(top_srcdir)/mate-doc-utils.make
 dist-hook: doc-dist-hook
 
-DOC_MODULE = gnome-user-share
+DOC_MODULE = mate-user-share
 DOC_ENTITIES =
 DOC_INCLUDES = legal.xml
 DOC_FIGURES = figures/file-sharing-preferences.png \
diff --git a/help/ca/ca.po b/help/ca/ca.po
index df6d9c4..0f9385f 100644
--- a/help/ca/ca.po
+++ b/help/ca/ca.po
@@ -1,10 +1,10 @@
-# Traducció del gnome-user-share de l'equip de Softcatalà.
+# Traducció del mateuser-share de l'equip de Softcatalà.
 # Copyright © 2009 Free Software Foundation, Inc.
 # Joan Duran <[email protected]>, 2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share\n"
+"Project-Id-Version: mateuser-share\n"
 "POT-Creation-Date: 2009-03-09 15:44+0000\n"
 "PO-Revision-Date: 2009-03-09 21:48+0100\n"
 "Last-Translator: Joan Duran <[email protected]>\n"
@@ -115,7 +115,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:81(None)
+#: C/mateuser-share.xml:81(None)
 msgid ""
 "@@image: 'figures/file-sharing-preferences.png'; "
 "md5=7ae616b8043b36be1f4943ba06d8a5ed"
@@ -125,7 +125,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:99(None)
+#: C/mateuser-share.xml:99(None)
 msgid ""
 "@@image: 'figures/sharing-over-the-network.png'; "
 "md5=ee8b44eb1290e4d1ae9b1e8fe8501860"
@@ -135,7 +135,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:143(None)
+#: C/mateuser-share.xml:143(None)
 msgid ""
 "@@image: 'figures/sharing-over-bluetooth.png'; "
 "md5=0a950502b42b1e7fdb9a57d5017e919c"
@@ -145,7 +145,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:168(None)
+#: C/mateuser-share.xml:168(None)
 msgid ""
 "@@image: 'figures/receiving-over-bluetooth.png'; "
 "md5=f292daef06767f39e346b222d3c448be"
@@ -153,88 +153,88 @@ msgstr ""
 "@@image: 'figures/receiving-over-bluetooth.png'; "
 "md5=f292daef06767f39e346b222d3c448be"
 
-#: C/gnome-user-share.xml:10(title)
+#: C/mateuser-share.xml:10(title)
 msgid "Personal File Sharing Manual"
 msgstr "Manual de la compartició de fitxers personals"
 
-#: C/gnome-user-share.xml:12(year) C/gnome-user-share.xml:29(date)
+#: C/mateuser-share.xml:12(year) C/mateuser-share.xml:29(date)
 msgid "2009"
 msgstr "2009"
 
-#: C/gnome-user-share.xml:13(holder)
+#: C/mateuser-share.xml:13(holder)
 msgid "Red Hat, Inc."
 msgstr "Red Hat, Inc."
 
-#: C/gnome-user-share.xml:19(firstname)
+#: C/mateuser-share.xml:19(firstname)
 msgid "Matthias"
 msgstr "Matthias"
 
-#: C/gnome-user-share.xml:20(surname)
+#: C/mateuser-share.xml:20(surname)
 msgid "Clasen"
 msgstr "Clasen"
 
-#: C/gnome-user-share.xml:28(revnumber)
+#: C/mateuser-share.xml:28(revnumber)
 msgid "1.0"
 msgstr "1.0"
 
-#: C/gnome-user-share.xml:31(para)
+#: C/mateuser-share.xml:31(para)
 msgid "Matthias Clasen <email>[email protected]</email>"
 msgstr "Matthias Clasen <email>[email protected]</email>"
 
-#: C/gnome-user-share.xml:35(releaseinfo)
-msgid "This manual describes version 2.26 of gnome-user-share."
-msgstr "Aquest manual descriu la versió 2.26 del gnome-user-share."
+#: C/mateuser-share.xml:35(releaseinfo)
+msgid "This manual describes version 2.26 of mateuser-share."
+msgstr "Aquest manual descriu la versió 2.26 del mateuser-share."
 
-#: C/gnome-user-share.xml:37(title)
+#: C/mateuser-share.xml:37(title)
 msgid "Feedback"
 msgstr "Comentaris"
 
-#: C/gnome-user-share.xml:38(para)
+#: C/mateuser-share.xml:38(para)
 msgid ""
-"To report a bug or make a suggestion regarding the gnome-user-share "
+"To report a bug or make a suggestion regarding the mateuser-share "
 "application or this manual, follow the directions in the <ulink url=\"ghelp:"
 "user-guide?feedback-bugs\" type=\"help\">GNOME Feedback Page</ulink>."
 msgstr ""
-"Per a informar d'un error o fer algun suggeriment sobre l'aplicació gnome-"
+"Per a informar d'un error o fer algun suggeriment sobre l'aplicació mate"
 "user-share o aquest manual, seguiu les indicacions a la <ulink url=\"ghelp:"
 "user-guide?feedback-bugs\" type=\"help\">pàgina de comentaris del GNOME</"
 "ulink>."
 
-#: C/gnome-user-share.xml:41(para)
+#: C/mateuser-share.xml:41(para)
 msgid ""
-"gnome-user-share is a session service that enables easy sharing of files "
+"mateuser-share is a session service that enables easy sharing of files "
 "between several computers."
 msgstr ""
-"El gnome-user-share és un servei de sessió que habilita la compartició "
+"El mateuser-share és un servei de sessió que habilita la compartició "
 "senzilla de fitxers entre diversos ordinadors."
 
-#: C/gnome-user-share.xml:45(primary)
-msgid "gnome-user-share"
-msgstr "gnome-user-share"
+#: C/mateuser-share.xml:45(primary)
+msgid "mateuser-share"
+msgstr "mateuser-share"
 
-#: C/gnome-user-share.xml:46(primary)
+#: C/mateuser-share.xml:46(primary)
 msgid "file sharing"
 msgstr "compartició de fitxers"
 
-#: C/gnome-user-share.xml:47(primary)
+#: C/mateuser-share.xml:47(primary)
 msgid "sharing"
 msgstr "compartició"
 
-#: C/gnome-user-share.xml:50(title)
+#: C/mateuser-share.xml:50(title)
 msgid "Introduction"
 msgstr "Introducció"
 
-#: C/gnome-user-share.xml:51(para)
+#: C/mateuser-share.xml:51(para)
 msgid ""
-"gnome-user-share is a session service that exports the contents of the "
+"mateuser-share is a session service that exports the contents of the "
 "<filename>Public</filename> folder in your home directory, so that they can "
 "easily be accessed from other computers on the same local network. On the "
 "other computers, the shared folder will appear with a name like "
 "'<replaceable>user</replaceable>'s shared files' in the "
-"<application>nautilus</application> Network window, where <replaceable>user</"
+"<application>caja</application> Network window, where <replaceable>user</"
 "replaceable> will be replaced by your user name."
 msgstr ""
-"El gnome-user-share és un servei de sessió que exporta el contingut de la "
+"El mateuser-share és un servei de sessió que exporta el contingut de la "
 "carpeta <filename>Públic</filename> del directori d'usuari, de manera que "
 "s'hi pot accedir fàcilment des d'altres ordinadors de la mateixa xarxa "
 "local. En els altres ordinadors, la carpeta compartida apareixerà amb un nom "
@@ -242,48 +242,48 @@ msgstr ""
 "finestra de xarxa del <application>Nautilus</application>, on "
 "<replaceable>usuari</replaceable> serà reemplaçat pel vostre nom d'usuari."
 
-#: C/gnome-user-share.xml:54(para)
+#: C/mateuser-share.xml:54(para)
 msgid ""
-"gnome-user-share uses a WebDAV server to share the <filename>Public</"
+"mateuser-share uses a WebDAV server to share the <filename>Public</"
 "filename> folder, and advertises the share on the local network using mDNS."
 msgstr ""
-"El gnome-user-share utilitza un servidor WebDAV per a compartir la carpeta "
+"El mateuser-share utilitza un servidor WebDAV per a compartir la carpeta "
 "<filename>Públic</filename> i notifica la compartició a la xarxa local "
 "utilitzant el mDNS."
 
-#: C/gnome-user-share.xml:57(para)
+#: C/mateuser-share.xml:57(para)
 msgid ""
-"Additionally, gnome-user-share can make the shared files available via "
+"Additionally, mateuser-share can make the shared files available via "
 "ObexFTP over Bluetooth, and receive files that are sent to your computer via "
 "Bluetooth via ObexPush."
 msgstr ""
-"A més, el gnome-user-share pot fer que els fitxers compartits estiguin "
+"A més, el mateuser-share pot fer que els fitxers compartits estiguin "
 "disponibles a través de l'ObexFTP sobre Bluetooth i pot rebre fitxers que "
 "s'enviïn al vostre ordinador mitjançant Bluetooth."
 
-#: C/gnome-user-share.xml:63(title)
+#: C/mateuser-share.xml:63(title)
 msgid "Getting started"
 msgstr "Primers passos"
 
-#: C/gnome-user-share.xml:66(title)
-msgid "Starting gnome-user-share"
-msgstr "Com iniciar el gnome-user-share"
+#: C/mateuser-share.xml:66(title)
+msgid "Starting mateuser-share"
+msgstr "Com iniciar el mateuser-share"
 
-#: C/gnome-user-share.xml:68(para)
+#: C/mateuser-share.xml:68(para)
 msgid ""
-"The gnome-user-share service is normally started by <application>gnome-"
+"The mateuser-share service is normally started by <application>mate"
 "session</application> when you log in. You can change this by opening "
 "<menuchoice><guimenu>Preferences</guimenu><guimenu>Sessions</guimenu></"
 "menuchoice> in the <guimenu>System</guimenu> menu, and modifying the 'User "
 "Sharing' entry in the list of startup programs."
 msgstr ""
-"El servei gnome-user-share normalment és iniciat pel <application>gnome-"
+"El servei mateuser-share normalment és iniciat pel <application>mate"
 "session</application> quan entreu. Podeu canviar-ho obrint "
 "<menuchoice><guimenu>Preferències</guimenu><guimenu>Sessions</guimenu></"
 "menuchoice> al menú <guimenu>Sistema</guimenu> i modificant l'entrada "
 "«Compartició d'usuari» a la llista de programes d'inici."
 
-#: C/gnome-user-share.xml:72(para)
+#: C/mateuser-share.xml:72(para)
 msgid ""
 "To configure various aspects of file sharing, use the File Sharing "
 "Preferences, which can be found in the <guimenu>System</guimenu> menu under "
@@ -295,16 +295,16 @@ msgstr ""
 "<guimenu>Sistema</guimenu> sota <menuchoice><guimenu>Preferències</"
 "guimenu><guimenu>Compartició de fitxers personals</guimenu></menuchoice>."
 
-#: C/gnome-user-share.xml:77(title)
+#: C/mateuser-share.xml:77(title)
 msgid "File Sharing Preferences"
 msgstr "Preferències de la compartició de fitxers"
 
-#: C/gnome-user-share.xml:89(title)
+#: C/mateuser-share.xml:89(title)
 msgid "Enabling file sharing over the network"
 msgstr "Com habilitar la compartició de fitxers a través de la xarxa"
 
-#: C/gnome-user-share.xml:90(para) C/gnome-user-share.xml:134(para)
-#: C/gnome-user-share.xml:159(para)
+#: C/mateuser-share.xml:90(para) C/mateuser-share.xml:134(para)
+#: C/mateuser-share.xml:159(para)
 msgid ""
 "Open the File Sharing Preferences using <menuchoice><guimenu>Preferences</"
 "guimenu><guimenu>Personal File Sharing</guimenu></menuchoice> in the "
@@ -314,11 +314,11 @@ msgstr ""
 "<menuchoice><guimenu>Preferències</guimenu><guimenu>Compartició de fitxers "
 "personals</guimenu></menuchoice> al menú <guimenu>Sistema</guimenu>."
 
-#: C/gnome-user-share.xml:95(title)
+#: C/mateuser-share.xml:95(title)
 msgid "Share Files over the Network"
 msgstr "Compartició de fitxers a través de la xarxa"
 
-#: C/gnome-user-share.xml:106(para)
+#: C/mateuser-share.xml:106(para)
 msgid ""
 "Some firewall configurations on the local machine might cause problems with "
 "the advertisment, as well as the access to the shared files. Consult your "
@@ -328,7 +328,7 @@ msgstr ""
 "problemes amb la notificació, com també a l'accés als fitxers compartits. "
 "Per a obtenir-ne més detalls consulteu l'administrador del sistema."
 
-#: C/gnome-user-share.xml:109(para)
+#: C/mateuser-share.xml:109(para)
 msgid ""
 "Select <guilabel>Never</guilabel> to allow everybody to freely read or write "
 "files in the shared folder."
@@ -336,7 +336,7 @@ msgstr ""
 "Seleccioneu <guilabel>Mai</guilabel> per a permetre que tothom pugui llegir "
 "o escriure fitxers lliurement a la carpeta compartida."
 
-#: C/gnome-user-share.xml:115(para)
+#: C/mateuser-share.xml:115(para)
 msgid ""
 "Select <guilabel>Always</guilabel> to require the password to read or write "
 "files in the shared folder."
@@ -344,7 +344,7 @@ msgstr ""
 "Seleccioneu <guilabel>Sempre</guilabel> per a sol·licitar la contrasenya per "
 "a llegir o escriure fitxers a la carpeta compartida."
 
-#: C/gnome-user-share.xml:121(para)
+#: C/mateuser-share.xml:121(para)
 msgid ""
 "Select <guilabel>When writing files</guilabel> to allow everybody to freely "
 "read files in the shared folder, but require the password when writing files."
@@ -353,7 +353,7 @@ msgstr ""
 "tothom llegir fitxers lliurement a la carpeta compartida, però sol·licitar "
 "contrasenya per a escriure'ls."
 
-#: C/gnome-user-share.xml:128(para)
+#: C/mateuser-share.xml:128(para)
 msgid ""
 "When you set a password, you have to give the password to all users that you "
 "want to have access to the shared files. Therefore, you should use a "
@@ -363,7 +363,7 @@ msgstr ""
 "que vulgueu que tinguin accés als fitxers compartits. Per això, hauríeu "
 "d'utilitzar una contrasenya diferent de les altres que utilitzeu normalment."
 
-#: C/gnome-user-share.xml:104(para)
+#: C/mateuser-share.xml:104(para)
 msgid ""
 "To enable file sharing via WebDAV, use the <guilabel>Share public files on "
 "network</guilabel> checkbox. When file sharing it enabled, the controls for "
@@ -378,15 +378,15 @@ msgstr ""
 "s'ha d'especificar abans de permetre l'accés als fitxers compartits a un "
 "usuari d'un altre ordinador. <placeholder-1/><placeholder-2/><placeholder-3/>"
 
-#: C/gnome-user-share.xml:133(title)
+#: C/mateuser-share.xml:133(title)
 msgid "Enabling file sharing over Bluetooth"
 msgstr "Com habilitar la compartició de fitxers a través del Bluetooth"
 
-#: C/gnome-user-share.xml:139(title)
+#: C/mateuser-share.xml:139(title)
 msgid "Share Files over Bluetooth"
 msgstr "Compartició de fitxers a través del Bluetooth"
 
-#: C/gnome-user-share.xml:152(para)
+#: C/mateuser-share.xml:152(para)
 msgid ""
 "When you allow unbonded remote devices to access your shared files, anybody "
 "with a Bluetooth-enabled cell phone in the vicinity of your computer can "
@@ -398,7 +398,7 @@ msgstr ""
 "modificar- als fitxers compartits."
 
 # FIXME: per al darrer canvi cal corregir també la interfície d'usuari (dpm)
-#: C/gnome-user-share.xml:148(para)
+#: C/mateuser-share.xml:148(para)
 msgid ""
 "To enable file sharing via Bluetooth, use the <guilabel>Share public files "
 "over Bluetooth</guilabel> checkbox. To allow remote Bluetooth devices to "
@@ -418,22 +418,22 @@ msgstr ""
 "utilitzeu la casella de selecció <guilabel>Cal que els dispositius remots "
 "estiguin vinculats a aquest ordinador</guilabel>. <placeholder-1/>"
 
-#: C/gnome-user-share.xml:158(title)
+#: C/mateuser-share.xml:158(title)
 msgid "Receiving Files over Bluetooth"
 msgstr "Com rebre fitxers a través del Bluetooth"
 
-#: C/gnome-user-share.xml:164(title)
+#: C/mateuser-share.xml:164(title)
 msgid "Receive Files over Bluetooth"
 msgstr "Recepció de fitxers a través del Bluetooth"
 
-#: C/gnome-user-share.xml:177(para)
+#: C/mateuser-share.xml:177(para)
 msgid ""
 "Select <guilabel>Always</guilabel> to allow any remote device to send files."
 msgstr ""
 "Seleccioneu <guilabel>Sempre</guilabel> per a permetre que qualsevol "
 "dispositiu remot enviï fitxers."
 
-#: C/gnome-user-share.xml:184(para)
+#: C/mateuser-share.xml:184(para)
 msgid ""
 "Bonded devices are the ones that were connected to your computer, and had to "
 "enter a PIN code to connect to or from."
@@ -441,7 +441,7 @@ msgstr ""
 "Els dispositius vinculats són aquells que estan connectats al vostre "
 "ordinador i en els quals heu d'introduir un codi PIN per a connectar-vos-hi."
 
-#: C/gnome-user-share.xml:182(para)
+#: C/mateuser-share.xml:182(para)
 msgid ""
 "Select <guilabel>Only for Bonded devices</guilabel> to accept files only "
 "from bonded devices. <placeholder-1/>"
@@ -449,7 +449,7 @@ msgstr ""
 "Seleccioneu <guilabel>Només per a dispositius vinculats</guilabel> per a "
 "acceptar fitxers només de dispositius vinculats. <placeholder-1/>"
 
-#: C/gnome-user-share.xml:191(para)
+#: C/mateuser-share.xml:191(para)
 msgid ""
 "Devices can be marked as trusted in the <application>bluetooth-properties</"
 "application>'s <guilabel>Known devices</guilabel> section."
@@ -458,7 +458,7 @@ msgstr ""
 "<guilabel>Dispositius coneguts</guilabel> del <application>bluetooth-"
 "properties</application>."
 
-#: C/gnome-user-share.xml:189(para)
+#: C/mateuser-share.xml:189(para)
 msgid ""
 "Select <guilabel>Only for Bonded and Trusted devices</guilabel> to accept "
 "files only from bonded devices. <placeholder-1/>"
@@ -468,7 +468,7 @@ msgstr ""
 "<placeholder-1/>"
 
 # FIXME: hi ha un canvi que requereix l'actualització d'una cadena de la interfície d'usuari (dpm)
-#: C/gnome-user-share.xml:173(para)
+#: C/mateuser-share.xml:173(para)
 msgid ""
 "To let remote Bluetooth devices send files to your computer, use the "
 "<guilabel>Receive files in Downloads folder over Bluetooth</guilabel> "
@@ -485,7 +485,7 @@ msgstr ""
 "<guilabel>Accepta els fitxers</guilabel> us permetrà determinar quins "
 "dispositius remots tenen permís per a enviar fitxers. <placeholder-1/>"
 
-#: C/gnome-user-share.xml:196(para)
+#: C/mateuser-share.xml:196(para)
 msgid ""
 "Use the <guilabel>Notify about received files</guilabel> checkbox to select "
 "whether you want to be notified whenever a file is received via Bluetooth."
@@ -495,6 +495,6 @@ msgstr ""
 "fitxer mitjançant Bluetooth."
 
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: C/gnome-user-share.xml:0(None)
+#: C/mateuser-share.xml:0(None)
 msgid "translator-credits"
 msgstr "Joan Duran <[email protected]>, 2009"
diff --git a/help/cs/cs.po b/help/cs/cs.po
index 406d7a7..14977f8 100644
--- a/help/cs/cs.po
+++ b/help/cs/cs.po
@@ -1,16 +1,16 @@
-# Czech translation of gnome-user-share documentation.
+# Czech translation of mateuser-share documentation.
 # This file is distributed under the same license as the GNOME Documentation Project.
 #
-# Martin Picek <[email protected]>, 2009.
+# Martin Picek <[email protected]>, 2009.
 # Marek Černocký <[email protected]>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share gnome-2-28\n"
+"Project-Id-Version: mateuser-share mate2-28\n"
 "POT-Creation-Date: 2010-09-21 08:24+0000\n"
 "PO-Revision-Date: 2010-09-25 00:02+0200\n"
 "Last-Translator: Marek Černocký <[email protected]>\n"
-"Language-Team: Czech <[email protected]>\n"
+"Language-Team: Czech <matecs-list@mateorg>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -116,7 +116,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:81(None)
+#: C/mateuser-share.xml:81(None)
 msgid ""
 "@@image: 'figures/file-sharing-preferences.png'; "
 "md5=7ae616b8043b36be1f4943ba06d8a5ed"
@@ -126,7 +126,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:99(None)
+#: C/mateuser-share.xml:99(None)
 msgid ""
 "@@image: 'figures/sharing-over-the-network.png'; "
 "md5=ee8b44eb1290e4d1ae9b1e8fe8501860"
@@ -136,7 +136,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:143(None)
+#: C/mateuser-share.xml:143(None)
 msgid ""
 "@@image: 'figures/sharing-over-bluetooth.png'; "
 "md5=0a950502b42b1e7fdb9a57d5017e919c"
@@ -146,7 +146,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:168(None)
+#: C/mateuser-share.xml:168(None)
 msgid ""
 "@@image: 'figures/receiving-over-bluetooth.png'; "
 "md5=f292daef06767f39e346b222d3c448be"
@@ -154,88 +154,88 @@ msgstr ""
 "@@image: 'figures/receiving-over-bluetooth.png'; "
 "md5=f292daef06767f39e346b222d3c448be"
 
-#: C/gnome-user-share.xml:10(title)
+#: C/mateuser-share.xml:10(title)
 msgid "Personal File Sharing Manual"
 msgstr "Příručka ke sdílení osobních souborů"
 
-#: C/gnome-user-share.xml:12(year) C/gnome-user-share.xml:29(date)
+#: C/mateuser-share.xml:12(year) C/mateuser-share.xml:29(date)
 msgid "2009"
 msgstr "2009"
 
-#: C/gnome-user-share.xml:13(holder)
+#: C/mateuser-share.xml:13(holder)
 msgid "Red Hat, Inc."
 msgstr "Red Hat, Inc."
 
-#: C/gnome-user-share.xml:19(firstname)
+#: C/mateuser-share.xml:19(firstname)
 msgid "Matthias"
 msgstr "Matthias"
 
-#: C/gnome-user-share.xml:20(surname)
+#: C/mateuser-share.xml:20(surname)
 msgid "Clasen"
 msgstr "Clasen"
 
-#: C/gnome-user-share.xml:28(revnumber)
+#: C/mateuser-share.xml:28(revnumber)
 msgid "1.0"
 msgstr "1.0"
 
-#: C/gnome-user-share.xml:31(para)
+#: C/mateuser-share.xml:31(para)
 msgid "Matthias Clasen <email>[email protected]</email>"
 msgstr "Matthias Clasen <email>[email protected]</email>"
 
-#: C/gnome-user-share.xml:35(releaseinfo)
-msgid "This manual describes version 2.26 of gnome-user-share."
-msgstr "Tato uživatelská příručka popisuje gnome-user-share ve verzi 2.26."
+#: C/mateuser-share.xml:35(releaseinfo)
+msgid "This manual describes version 2.26 of mateuser-share."
+msgstr "Tato uživatelská příručka popisuje mateuser-share ve verzi 2.26."
 
-#: C/gnome-user-share.xml:37(title)
+#: C/mateuser-share.xml:37(title)
 msgid "Feedback"
 msgstr "Ohlasy"
 
-#: C/gnome-user-share.xml:38(para)
+#: C/mateuser-share.xml:38(para)
 msgid ""
-"To report a bug or make a suggestion regarding the gnome-user-share "
+"To report a bug or make a suggestion regarding the mateuser-share "
 "application or this manual, follow the directions in the <ulink url=\"ghelp:"
 "user-guide?feedback-bugs\" type=\"help\">GNOME Feedback Page</ulink>."
 msgstr ""
 "Pokud chcete oznámit chybu nebo navrhnout vylepšení vztahující se k aplikaci "
-"gnome-user-share nebo této příručce, postupujte dle instrukcí na <ulink url="
+"mateuser-share nebo této příručce, postupujte dle instrukcí na <ulink url="
 "\"ghelp:user-guide?feedback-bugs\" type=\"help\">stránce s ohlasy na GNOME</"
 "ulink>."
 
-#: C/gnome-user-share.xml:41(para)
+#: C/mateuser-share.xml:41(para)
 msgid ""
-"gnome-user-share is a session service that enables easy sharing of files "
+"mateuser-share is a session service that enables easy sharing of files "
 "between several computers."
 msgstr ""
-"gnome-user-share je služba sezení, která umožňuje snadné sdílení souborů "
+"mateuser-share je služba sezení, která umožňuje snadné sdílení souborů "
 "mezi několika počítači."
 
-#: C/gnome-user-share.xml:45(primary)
-msgid "gnome-user-share"
-msgstr "gnome-user-share"
+#: C/mateuser-share.xml:45(primary)
+msgid "mateuser-share"
+msgstr "mateuser-share"
 
-#: C/gnome-user-share.xml:46(primary)
+#: C/mateuser-share.xml:46(primary)
 msgid "file sharing"
 msgstr "sdílení souborů"
 
-#: C/gnome-user-share.xml:47(primary)
+#: C/mateuser-share.xml:47(primary)
 msgid "sharing"
 msgstr "sdílení"
 
-#: C/gnome-user-share.xml:50(title)
+#: C/mateuser-share.xml:50(title)
 msgid "Introduction"
 msgstr "Úvod"
 
-#: C/gnome-user-share.xml:51(para)
+#: C/mateuser-share.xml:51(para)
 msgid ""
-"gnome-user-share is a session service that exports the contents of the "
+"mateuser-share is a session service that exports the contents of the "
 "<filename>Public</filename> folder in your home directory, so that they can "
 "easily be accessed from other computers on the same local network. On the "
 "other computers, the shared folder will appear with a name like "
 "'<replaceable>user</replaceable>'s shared files' in the "
-"<application>nautilus</application> Network window, where <replaceable>user</"
+"<application>caja</application> Network window, where <replaceable>user</"
 "replaceable> will be replaced by your user name."
 msgstr ""
-"gnome-user-share je služba sezení, která exportuje obsah adresáře "
+"mateuser-share je služba sezení, která exportuje obsah adresáře "
 "<filename>Veřejné</filename> z vašeho domovského adresáře tak, aby mohl být "
 "snadno přístupný z ostatních počítačů ve vaší lokální síti. Na ostatních "
 "počítačích bude sdílený adresář zobrazen v okně Síť aplikace "
@@ -243,48 +243,48 @@ msgstr ""
 "soubory uživatele <replaceable>Uživatel</replaceable>“, kde výraz "
 "<replaceable>Uživatel</replaceable> bude nahrazen vaším uživatelským jménem."
 
-#: C/gnome-user-share.xml:54(para)
+#: C/mateuser-share.xml:54(para)
 msgid ""
-"gnome-user-share uses a WebDAV server to share the <filename>Public</"
+"mateuser-share uses a WebDAV server to share the <filename>Public</"
 "filename> folder, and advertises the share on the local network using mDNS."
 msgstr ""
-"Ke sdílení adresáře <filename>Veřejné</filename> používá gnome-user-share "
+"Ke sdílení adresáře <filename>Veřejné</filename> používá mateuser-share "
 "server WebDAV a na lokální síti jej ostatním počítačům „nabízí“ "
 "prostředictvím mDNS."
 
-#: C/gnome-user-share.xml:57(para)
+#: C/mateuser-share.xml:57(para)
 msgid ""
-"Additionally, gnome-user-share can make the shared files available via "
+"Additionally, mateuser-share can make the shared files available via "
 "ObexFTP over Bluetooth, and receive files that are sent to your computer via "
 "Bluetooth via ObexPush."
 msgstr ""
-"gnome-user-share navíc umí sdílené soubory zpřístupnit po Bluetooth pomocí "
+"mateuser-share navíc umí sdílené soubory zpřístupnit po Bluetooth pomocí "
 "ObexFTP a přijímat je pomocí ObexPush."
 
-#: C/gnome-user-share.xml:63(title)
+#: C/mateuser-share.xml:63(title)
 msgid "Getting started"
 msgstr "Začínáme"
 
-#: C/gnome-user-share.xml:66(title)
-msgid "Starting gnome-user-share"
-msgstr "Spuštění gnome-user-share"
+#: C/mateuser-share.xml:66(title)
+msgid "Starting mateuser-share"
+msgstr "Spuštění mateuser-share"
 
-#: C/gnome-user-share.xml:68(para)
+#: C/mateuser-share.xml:68(para)
 msgid ""
-"The gnome-user-share service is normally started by <application>gnome-"
+"The mateuser-share service is normally started by <application>mate"
 "session</application> when you log in. You can change this by opening "
 "<menuchoice><guimenu>Preferences</guimenu><guimenu>Startup Applications</"
 "guimenu></menuchoice> in the <guimenu>System</guimenu> menu, and modifying "
 "the 'User Sharing' entry in the list of startup programs."
 msgstr ""
-"Služba gnome-user-share je běžně spouštěna pomocí <application>gnome-"
+"Služba mateuser-share je běžně spouštěna pomocí <application>mate"
 "session</application> ve chvíli, kdy se přihlásíte. Toto můžete nastavit "
 "otevřením <menuchoice><guimenu>Předvolby</guimenu><guimenu>Aplikace "
 "spouštěné při přihlášení</guimenu></menuchoice> v nabídce <guimenu>Systém</"
 "guimenu> a úpravou položky „Sdílení osobních souborů“ v seznamu programů "
 "spouštěných po přihlášení."
 
-#: C/gnome-user-share.xml:72(para)
+#: C/mateuser-share.xml:72(para)
 msgid ""
 "To configure various aspects of file sharing, use the File Sharing "
 "Preferences, which can be found in the <guimenu>System</guimenu> menu under "
@@ -296,16 +296,16 @@ msgstr ""
 "guimenu><guimenu>Volby</guimenu><guimenu>Sdílení osobních souborů</guimenu></"
 "menuchoice>."
 
-#: C/gnome-user-share.xml:77(title)
+#: C/mateuser-share.xml:77(title)
 msgid "File Sharing Preferences"
 msgstr "Nastavení sdílení souborů"
 
-#: C/gnome-user-share.xml:89(title)
+#: C/mateuser-share.xml:89(title)
 msgid "Enabling file sharing over the network"
 msgstr "Povolení sdílení souborů po síti"
 
-#: C/gnome-user-share.xml:90(para) C/gnome-user-share.xml:134(para)
-#: C/gnome-user-share.xml:159(para)
+#: C/mateuser-share.xml:90(para) C/mateuser-share.xml:134(para)
+#: C/mateuser-share.xml:159(para)
 msgid ""
 "Open the File Sharing Preferences using <menuchoice><guimenu>Preferences</"
 "guimenu><guimenu>Personal File Sharing</guimenu></menuchoice> in the "
@@ -315,11 +315,11 @@ msgstr ""
 "souborů</guimenu></menuchoice> z nabídky <guimenu>Systém</guimenu> otevřete "
 "Nastavení sdílení souborů."
 
-#: C/gnome-user-share.xml:95(title)
+#: C/mateuser-share.xml:95(title)
 msgid "Share Files over the Network"
 msgstr "Sdílení souborů po síti"
 
-#: C/gnome-user-share.xml:106(para)
+#: C/mateuser-share.xml:106(para)
 msgid ""
 "Some firewall configurations on the local machine might cause problems with "
 "the advertisment, as well as the access to the shared files. Consult your "
@@ -329,7 +329,7 @@ msgstr ""
 "nabízením sdílených souborů i s přístupem k nim. Kontaktujte svého správce "
 "systému, chcete-li se dovědět více informací."
 
-#: C/gnome-user-share.xml:109(para)
+#: C/mateuser-share.xml:109(para)
 msgid ""
 "Select <guilabel>Never</guilabel> to allow everybody to freely read or write "
 "files in the shared folder."
@@ -337,7 +337,7 @@ msgstr ""
 "Zvolte <guilabel>Nikdy</guilabel>, chcete-li všem povolit libovolné čtení a "
 "upravování souborů ve vašem sdíleném adresáři."
 
-#: C/gnome-user-share.xml:115(para)
+#: C/mateuser-share.xml:115(para)
 msgid ""
 "Select <guilabel>Always</guilabel> to require the password to read or write "
 "files in the shared folder."
@@ -345,7 +345,7 @@ msgstr ""
 "Zvolte <guilabel>Vždy</guilabel>, aby zadání hesla bylo vyžadováno při čtení "
 "i upravování souborů ve vašem sdíleném adresáři."
 
-#: C/gnome-user-share.xml:121(para)
+#: C/mateuser-share.xml:121(para)
 msgid ""
 "Select <guilabel>When writing files</guilabel> to allow everybody to freely "
 "read files in the shared folder, but require the password when writing files."
@@ -354,7 +354,7 @@ msgstr ""
 "povolit libovolné čtení souborů ve vašem sdíleném adresáři, ale upravování "
 "souborů chcete podmínit zadáním hesla."
 
-#: C/gnome-user-share.xml:128(para)
+#: C/mateuser-share.xml:128(para)
 msgid ""
 "When you set a password, you have to give the password to all users that you "
 "want to have access to the shared files. Therefore, you should use a "
@@ -364,7 +364,7 @@ msgstr ""
 "přístup ke sdíleným souborům. Proto byste měli nastavit heslo, které je "
 "odlišné od dalších hesel, která už používáte."
 
-#: C/gnome-user-share.xml:104(para)
+#: C/mateuser-share.xml:104(para)
 msgid ""
 "To enable file sharing via WebDAV, use the <guilabel>Share public files on "
 "network</guilabel> checkbox. When file sharing it enabled, the controls for "
@@ -378,15 +378,15 @@ msgstr ""
 "heslo, které musí uživatel na jiném počítači zadat, aby mohl přistupovat k "
 "vašim sdíleným souborům. <placeholder-1/><placeholder-2/><placeholder-3/>"
 
-#: C/gnome-user-share.xml:133(title)
+#: C/mateuser-share.xml:133(title)
 msgid "Enabling file sharing over Bluetooth"
 msgstr "Povolení sdílení souborů po Bluetooth"
 
-#: C/gnome-user-share.xml:139(title)
+#: C/mateuser-share.xml:139(title)
 msgid "Share Files over Bluetooth"
 msgstr "Sdílení souborů po Bluetooth"
 
-#: C/gnome-user-share.xml:152(para)
+#: C/mateuser-share.xml:152(para)
 msgid ""
 "When you allow unbonded remote devices to access your shared files, anybody "
 "with a Bluetooth-enabled cell phone in the vicinity of your computer can "
@@ -396,7 +396,7 @@ msgstr ""
 "souborům, kdokoli s mobilním telefonem s Bluetooth v blízkosti vašeho "
 "počítače může přistupovat k vašim souborům a možná je i měnit."
 
-#: C/gnome-user-share.xml:148(para)
+#: C/mateuser-share.xml:148(para)
 msgid ""
 "To enable file sharing via Bluetooth, use the <guilabel>Share public files "
 "over Bluetooth</guilabel> checkbox. To allow remote Bluetooth devices to "
@@ -415,22 +415,22 @@ msgstr ""
 "zaškrtávací políčko <guilabel>Požadovat po vzdálených zařízeních spárování s "
 "počítačem</guilabel>. <placeholder-1/>"
 
-#: C/gnome-user-share.xml:158(title)
+#: C/mateuser-share.xml:158(title)
 msgid "Receiving Files over Bluetooth"
 msgstr "Přijímání souborů po Bluetooth"
 
-#: C/gnome-user-share.xml:164(title)
+#: C/mateuser-share.xml:164(title)
 msgid "Receive Files over Bluetooth"
 msgstr "Přijímání souborů po Bluetooth"
 
-#: C/gnome-user-share.xml:177(para)
+#: C/mateuser-share.xml:177(para)
 msgid ""
 "Select <guilabel>Always</guilabel> to allow any remote device to send files."
 msgstr ""
 "Zvolte <guilabel>Vždy</guilabel>, chcete-li povolit všem vzdáleným zařízením "
 "posílat soubory."
 
-#: C/gnome-user-share.xml:184(para)
+#: C/mateuser-share.xml:184(para)
 msgid ""
 "Bonded devices are the ones that were connected to your computer, and had to "
 "enter a PIN code to connect to or from."
@@ -438,7 +438,7 @@ msgstr ""
 "Svázaná zařízení jsou taková zařízení, která byla připojena k vašemu "
 "počítači a zadala kód PIN."
 
-#: C/gnome-user-share.xml:182(para)
+#: C/mateuser-share.xml:182(para)
 msgid ""
 "Select <guilabel>Only for Bonded devices</guilabel> to accept files only "
 "from bonded devices. <placeholder-1/>"
@@ -446,7 +446,7 @@ msgstr ""
 "Zaškrtněte <guilabel>Pouze ze svázaných zařízení</guilabel>, chcete-li "
 "přijímat soubory pouze od svázaných zařízení. <placeholder-1/>"
 
-#: C/gnome-user-share.xml:191(para)
+#: C/mateuser-share.xml:191(para)
 msgid ""
 "Devices can be marked as trusted in the <application>bluetooth-properties</"
 "application>'s <guilabel>Known devices</guilabel> section."
@@ -454,7 +454,7 @@ msgstr ""
 "Počítače mohou být označeny jako důvěryhodné v sekci <guilabel>Známé "
 "počítače</guilabel> aplikace <application>bluetooth-properties</application>."
 
-#: C/gnome-user-share.xml:189(para)
+#: C/mateuser-share.xml:189(para)
 msgid ""
 "Select <guilabel>Only for Bonded and Trusted devices</guilabel> to accept "
 "files only from bonded devices. <placeholder-1/>"
@@ -463,7 +463,7 @@ msgstr ""
 "chcete-li přijímat soubory pouze ze svázaných a důvěryhodných zařízení. "
 "<placeholder-1/>"
 
-#: C/gnome-user-share.xml:173(para)
+#: C/mateuser-share.xml:173(para)
 msgid ""
 "To let remote Bluetooth devices send files to your computer, use the "
 "<guilabel>Receive files in Downloads folder over Bluetooth</guilabel> "
@@ -480,7 +480,7 @@ msgstr ""
 "můžete určit, jaká vzdálená zařízení vám mohou posílat soubory. <placeholder-"
 "1/>"
 
-#: C/gnome-user-share.xml:196(para)
+#: C/mateuser-share.xml:196(para)
 msgid ""
 "Use the <guilabel>Notify about received files</guilabel> checkbox to select "
 "whether you want to be notified whenever a file is received via Bluetooth."
@@ -489,7 +489,7 @@ msgstr ""
 "chcete-li být informováni o přijetí souboru po Bluetooth."
 
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
-#: C/gnome-user-share.xml:0(None)
+#: C/mateuser-share.xml:0(None)
 msgid "translator-credits"
-msgstr "Martin Picek <[email protected]>, 2009"
+msgstr "Martin Picek <[email protected]>, 2009"
 
diff --git a/help/de/de.po b/help/de/de.po
index b651612..b486f20 100644
--- a/help/de/de.po
+++ b/help/de/de.po
@@ -1,13 +1,13 @@
-# German translation of the gnome-user-share manual.
-# Mario Blättermann <[email protected]>, 2009, 2010.
+# German translation of the mateuser-share manual.
+# Mario Blättermann <mariobl@mateorg>, 2009, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "POT-Creation-Date: 2009-12-14 21:47+0000\n"
 "PO-Revision-Date: 2010-01-17 13:21+0100\n"
-"Last-Translator: Mario Blättermann <[email protected]>\n"
-"Language-Team: German <[email protected]>\n"
+"Last-Translator: Mario Blättermann <mariobl@mateorg>\n"
+"Language-Team: German <matede@mateorg>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -120,7 +120,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:81(None)
+#: C/mateuser-share.xml:81(None)
 msgid ""
 "@@image: 'figures/file-sharing-preferences.png'; "
 "md5=7ae616b8043b36be1f4943ba06d8a5ed"
@@ -130,7 +130,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:99(None)
+#: C/mateuser-share.xml:99(None)
 msgid ""
 "@@image: 'figures/sharing-over-the-network.png'; "
 "md5=ee8b44eb1290e4d1ae9b1e8fe8501860"
@@ -140,7 +140,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:143(None)
+#: C/mateuser-share.xml:143(None)
 msgid ""
 "@@image: 'figures/sharing-over-bluetooth.png'; "
 "md5=0a950502b42b1e7fdb9a57d5017e919c"
@@ -150,7 +150,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:168(None)
+#: C/mateuser-share.xml:168(None)
 msgid ""
 "@@image: 'figures/receiving-over-bluetooth.png'; "
 "md5=f292daef06767f39e346b222d3c448be"
@@ -158,47 +158,47 @@ msgstr ""
 "@@image: 'figures/receiving-over-bluetooth.png'; "
 "md5=f292daef06767f39e346b222d3c448be"
 
-#: C/gnome-user-share.xml:10(title)
+#: C/mateuser-share.xml:10(title)
 msgid "Personal File Sharing Manual"
 msgstr "»Persönliche Dateifreigabe«-Handbuch"
 
-#: C/gnome-user-share.xml:12(year) C/gnome-user-share.xml:29(date)
+#: C/mateuser-share.xml:12(year) C/mateuser-share.xml:29(date)
 msgid "2009"
 msgstr "2009"
 
-#: C/gnome-user-share.xml:13(holder)
+#: C/mateuser-share.xml:13(holder)
 msgid "Red Hat, Inc."
 msgstr "Red Hat, Inc."
 
-#: C/gnome-user-share.xml:19(firstname)
+#: C/mateuser-share.xml:19(firstname)
 msgid "Matthias"
 msgstr "Matthias"
 
-#: C/gnome-user-share.xml:20(surname)
+#: C/mateuser-share.xml:20(surname)
 msgid "Clasen"
 msgstr "Clasen"
 
-#: C/gnome-user-share.xml:28(revnumber)
+#: C/mateuser-share.xml:28(revnumber)
 msgid "1.0"
 msgstr "1.0"
 
-#: C/gnome-user-share.xml:31(para)
+#: C/mateuser-share.xml:31(para)
 msgid "Matthias Clasen <email>[email protected]</email>"
 msgstr "Matthias Clasen <email>[email protected]</email>"
 
-#: C/gnome-user-share.xml:35(releaseinfo)
-msgid "This manual describes version 2.26 of gnome-user-share."
+#: C/mateuser-share.xml:35(releaseinfo)
+msgid "This manual describes version 2.26 of mateuser-share."
 msgstr ""
 "Dieses Handbuch beschreibt Version 2.26 der <application>Persönlichen "
 "Dateifreigabe</application>."
 
-#: C/gnome-user-share.xml:37(title)
+#: C/mateuser-share.xml:37(title)
 msgid "Feedback"
 msgstr "Rückmeldungen"
 
-#: C/gnome-user-share.xml:38(para)
+#: C/mateuser-share.xml:38(para)
 msgid ""
-"To report a bug or make a suggestion regarding the gnome-user-share "
+"To report a bug or make a suggestion regarding the mateuser-share "
 "application or this manual, follow the directions in the <ulink url=\"ghelp:"
 "user-guide?feedback-bugs\" type=\"help\">GNOME Feedback Page</ulink>."
 msgstr ""
@@ -208,39 +208,39 @@ msgstr ""
 "feedback-bugs\" type=\"help\">Abschnitt Rückmeldungen des Benutzerhandbuchs</"
 "ulink>.\""
 
-#: C/gnome-user-share.xml:41(para)
+#: C/mateuser-share.xml:41(para)
 msgid ""
-"gnome-user-share is a session service that enables easy sharing of files "
+"mateuser-share is a session service that enables easy sharing of files "
 "between several computers."
 msgstr ""
 "Die <application>Persönliche Dateifreigabe</application> ist ein "
 "Sitzungsdienst, der das einfache Freigeben von Dateien zur Nutzung auf "
 "mehreren Rechnern ermöglicht."
 
-#: C/gnome-user-share.xml:45(primary)
-msgid "gnome-user-share"
-msgstr "gnome-user-share"
+#: C/mateuser-share.xml:45(primary)
+msgid "mateuser-share"
+msgstr "mateuser-share"
 
-#: C/gnome-user-share.xml:46(primary)
+#: C/mateuser-share.xml:46(primary)
 msgid "file sharing"
 msgstr "Dateifreigabe"
 
-#: C/gnome-user-share.xml:47(primary)
+#: C/mateuser-share.xml:47(primary)
 msgid "sharing"
 msgstr "Freigabe"
 
-#: C/gnome-user-share.xml:50(title)
+#: C/mateuser-share.xml:50(title)
 msgid "Introduction"
 msgstr "Einführung"
 
-#: C/gnome-user-share.xml:51(para)
+#: C/mateuser-share.xml:51(para)
 msgid ""
-"gnome-user-share is a session service that exports the contents of the "
+"mateuser-share is a session service that exports the contents of the "
 "<filename>Public</filename> folder in your home directory, so that they can "
 "easily be accessed from other computers on the same local network. On the "
 "other computers, the shared folder will appear with a name like "
 "'<replaceable>user</replaceable>'s shared files' in the "
-"<application>nautilus</application> Network window, where <replaceable>user</"
+"<application>caja</application> Network window, where <replaceable>user</"
 "replaceable> will be replaced by your user name."
 msgstr ""
 "Die <application>Persönliche Dateifreigabe</application> ist ein "
@@ -252,18 +252,18 @@ msgstr ""
 "<application>Nautilus</application>, wobei <replaceable>Benutzer</"
 "replaceable> durch Ihren Benutzernamen ersetzt wird."
 
-#: C/gnome-user-share.xml:54(para)
+#: C/mateuser-share.xml:54(para)
 msgid ""
-"gnome-user-share uses a WebDAV server to share the <filename>Public</"
+"mateuser-share uses a WebDAV server to share the <filename>Public</"
 "filename> folder, and advertises the share on the local network using mDNS."
 msgstr ""
 "Die <application>Persönliche Dateifreigabe</application> benutzt zur Freigabe "
 "des Ordners <filename>Öffentlich</filename> einen WebDAV-Server und "
 "veröffentlicht die Freigabe im lokalen Netzwerk unter Verwendung von mDNS."
 
-#: C/gnome-user-share.xml:57(para)
+#: C/mateuser-share.xml:57(para)
 msgid ""
-"Additionally, gnome-user-share can make the shared files available via "
+"Additionally, mateuser-share can make the shared files available via "
 "ObexFTP over Bluetooth, and receive files that are sent to your computer via "
 "Bluetooth via ObexPush."
 msgstr ""
@@ -272,30 +272,30 @@ msgstr ""
 "Empfang von zu Ihrem Rechner per Bluetooth über ObexPush gesendeten Dateien "
 "ist ebenfalls möglich."
 
-#: C/gnome-user-share.xml:63(title)
+#: C/mateuser-share.xml:63(title)
 msgid "Getting started"
 msgstr "Erste Schritte"
 
-#: C/gnome-user-share.xml:66(title)
-msgid "Starting gnome-user-share"
+#: C/mateuser-share.xml:66(title)
+msgid "Starting mateuser-share"
 msgstr "Persönliche Dateifreigabe starten"
 
-#: C/gnome-user-share.xml:68(para)
+#: C/mateuser-share.xml:68(para)
 msgid ""
-"The gnome-user-share service is normally started by <application>gnome-"
+"The mateuser-share service is normally started by <application>mate"
 "session</application> when you log in. You can change this by opening "
 "<menuchoice><guimenu>Preferences</guimenu><guimenu>Startup Applications</"
 "guimenu></menuchoice> in the <guimenu>System</guimenu> menu, and modifying "
 "the 'User Sharing' entry in the list of startup programs."
 msgstr ""
 "Der Dienst zur <application>Persönliche Dateifreigabe</application> wird "
-"normalerweise bereits durch <application>gnome-session</application> nach "
+"normalerweise bereits durch <application>matesession</application> nach "
 "Ihrer Anmeldung gestartet. Sie können dies ändern, indem Sie "
 "<menuchoice><guimenu>Einstellungen</guimenu><guimenu>Startprogramme</"
 "guimenu></menuchoice> im Menü  <guimenu>System</guimenu> öffnen. Ändern Sie "
 "hier den Eintrag »Benutzerfreigabe« in der Liste der Startprogramme."
 
-#: C/gnome-user-share.xml:72(para)
+#: C/mateuser-share.xml:72(para)
 msgid ""
 "To configure various aspects of file sharing, use the File Sharing "
 "Preferences, which can be found in the <guimenu>System</guimenu> menu under "
@@ -307,16 +307,16 @@ msgstr ""
 "<menuchoice><guimenu>Einstellungen</guimenu><guimenu>Persönliche "
 "Dateifreigabe</guimenu></menuchoice>."
 
-#: C/gnome-user-share.xml:77(title)
+#: C/mateuser-share.xml:77(title)
 msgid "File Sharing Preferences"
 msgstr "Einstellungen zur Freigabe persönlicher Dateien"
 
-#: C/gnome-user-share.xml:89(title)
+#: C/mateuser-share.xml:89(title)
 msgid "Enabling file sharing over the network"
 msgstr "Aktivieren der Dateifreigabe über das Netzwerk"
 
-#: C/gnome-user-share.xml:90(para) C/gnome-user-share.xml:134(para)
-#: C/gnome-user-share.xml:159(para)
+#: C/mateuser-share.xml:90(para) C/mateuser-share.xml:134(para)
+#: C/mateuser-share.xml:159(para)
 msgid ""
 "Open the File Sharing Preferences using <menuchoice><guimenu>Preferences</"
 "guimenu><guimenu>Personal File Sharing</guimenu></menuchoice> in the "
@@ -326,11 +326,11 @@ msgstr ""
 "<menuchoice><guimenu>Einstellungen</guimenu><guimenu>Persönliche "
 "Dateifreigabe</guimenu></menuchoice>."
 
-#: C/gnome-user-share.xml:95(title)
+#: C/mateuser-share.xml:95(title)
 msgid "Share Files over the Network"
 msgstr "Dateifreigabe über das Netzwerk"
 
-#: C/gnome-user-share.xml:106(para)
+#: C/mateuser-share.xml:106(para)
 msgid ""
 "Some firewall configurations on the local machine might cause problems with "
 "the advertisment, as well as the access to the shared files. Consult your "
@@ -340,7 +340,7 @@ msgstr ""
 "sowohl bei der Anzeige als auch beim Zugriff auf die freigegebenen Dateien "
 "verursachen. Fragen Sie Ihren Systemverwalter nach Einzelheiten hierzu."
 
-#: C/gnome-user-share.xml:109(para)
+#: C/mateuser-share.xml:109(para)
 msgid ""
 "Select <guilabel>Never</guilabel> to allow everybody to freely read or write "
 "files in the shared folder."
@@ -348,7 +348,7 @@ msgstr ""
 "Wählen Sie <guilabel>Niemals</guilabel>, um jedem das Lesen oder Schreiben "
 "von Dateien im öffentlichen Ordner zu erlauben."
 
-#: C/gnome-user-share.xml:115(para)
+#: C/mateuser-share.xml:115(para)
 msgid ""
 "Select <guilabel>Always</guilabel> to require the password to read or write "
 "files in the shared folder."
@@ -356,7 +356,7 @@ msgstr ""
 "Wählen Sie <guilabel>Immer</guilabel>, um festzulegen, dass zum Lesen oder "
 "Schreiben von Dateien im öffentlichen Ordner das Passwort erforderlich ist."
 
-#: C/gnome-user-share.xml:121(para)
+#: C/mateuser-share.xml:121(para)
 msgid ""
 "Select <guilabel>When writing files</guilabel> to allow everybody to freely "
 "read files in the shared folder, but require the password when writing files."
@@ -365,7 +365,7 @@ msgstr ""
 "Lesen von Dateien im öffentlichen Ordner zu erlauben. Für das Schreiben von "
 "Dateien ist in diesem Fall das Passwort erforderlich."
 
-#: C/gnome-user-share.xml:128(para)
+#: C/mateuser-share.xml:128(para)
 msgid ""
 "When you set a password, you have to give the password to all users that you "
 "want to have access to the shared files. Therefore, you should use a password "
@@ -376,7 +376,7 @@ msgstr ""
 "ist ratsam, hierfür ein Passwort zu verwenden, dass sich von Ihren anderen "
 "Passwörtern unterscheidet."
 
-#: C/gnome-user-share.xml:104(para)
+#: C/mateuser-share.xml:104(para)
 msgid ""
 "To enable file sharing via WebDAV, use the <guilabel>Share public files on "
 "network</guilabel> checkbox. When file sharing it enabled, the controls for "
@@ -391,15 +391,15 @@ msgstr ""
 "Benutzers auf die freigegebenen Dateien erforderlich ist. <placeholder-1/"
 "><placeholder-2/><placeholder-3/>"
 
-#: C/gnome-user-share.xml:133(title)
+#: C/mateuser-share.xml:133(title)
 msgid "Enabling file sharing over Bluetooth"
 msgstr "Aktivieren der Dateifreigabe über Bluetooth"
 
-#: C/gnome-user-share.xml:139(title)
+#: C/mateuser-share.xml:139(title)
 msgid "Share Files over Bluetooth"
 msgstr "Dateifreigabe über Bluetooth"
 
-#: C/gnome-user-share.xml:152(para)
+#: C/mateuser-share.xml:152(para)
 msgid ""
 "When you allow unbonded remote devices to access your shared files, anybody "
 "with a Bluetooth-enabled cell phone in the vicinity of your computer can "
@@ -410,7 +410,7 @@ msgstr ""
 "aktivierte Mobiltelefon, der sich im Bereich Ihres Rechners befindet, auf "
 "Ihre freigegebenen Dateien zugreifen und diese eventuell auch verändern."
 
-#: C/gnome-user-share.xml:148(para)
+#: C/mateuser-share.xml:148(para)
 msgid ""
 "To enable file sharing via Bluetooth, use the <guilabel>Share public files "
 "over Bluetooth</guilabel> checkbox. To allow remote Bluetooth devices to "
@@ -430,22 +430,22 @@ msgstr ""
 "das Ankreuzfeld <guilabel>Das Verbinden entfernter Geräte mit diesem Computer "
 "voraussetzen</guilabel>. <placeholder-1/>"
 
-#: C/gnome-user-share.xml:158(title)
+#: C/mateuser-share.xml:158(title)
 msgid "Receiving Files over Bluetooth"
 msgstr "Empfangen von Dateien über Bluetooth"
 
-#: C/gnome-user-share.xml:164(title)
+#: C/mateuser-share.xml:164(title)
 msgid "Receive Files over Bluetooth"
 msgstr "Empfangen von Dateien über Bluetooth"
 
-#: C/gnome-user-share.xml:177(para)
+#: C/mateuser-share.xml:177(para)
 msgid ""
 "Select <guilabel>Always</guilabel> to allow any remote device to send files."
 msgstr ""
 "Wählen Sie <guilabel>Immer</guilabel>, um jedem entfernten Gerät das Senden "
 "von Dateien zu erlauben."
 
-#: C/gnome-user-share.xml:184(para)
+#: C/mateuser-share.xml:184(para)
 msgid ""
 "Bonded devices are the ones that were connected to your computer, and had to "
 "enter a PIN code to connect to or from."
@@ -454,7 +454,7 @@ msgstr ""
 "wobei die Eingabe einer PIN für die Verbindung vom und zum Gerät erforderlich "
 "ist."
 
-#: C/gnome-user-share.xml:182(para)
+#: C/mateuser-share.xml:182(para)
 msgid ""
 "Select <guilabel>Only for Bonded devices</guilabel> to accept files only from "
 "bonded devices. <placeholder-1/>"
@@ -462,7 +462,7 @@ msgstr ""
 "Wählen Sie <guilabel>Nur für verbundene Geräte</guilabel>, um Dateien nur von "
 "verbundenen Geräten zu akzeptieren."
 
-#: C/gnome-user-share.xml:191(para)
+#: C/mateuser-share.xml:191(para)
 msgid ""
 "Devices can be marked as trusted in the <application>bluetooth-properties</"
 "application>'s <guilabel>Known devices</guilabel> section."
@@ -471,7 +471,7 @@ msgstr ""
 "<application>Bluetooth-Einstellungen</application> als vertrauenswürdig "
 "markiert werden."
 
-#: C/gnome-user-share.xml:189(para)
+#: C/mateuser-share.xml:189(para)
 msgid ""
 "Select <guilabel>Only for Bonded and Trusted devices</guilabel> to accept "
 "files only from bonded devices. <placeholder-1/>"
@@ -480,7 +480,7 @@ msgstr ""
 "guilabel>, um Dateien nur von vertrauenswürdig verbundenen Geräten zu "
 "akzeptieren. <placeholder-1/>"
 
-#: C/gnome-user-share.xml:173(para)
+#: C/mateuser-share.xml:173(para)
 msgid ""
 "To let remote Bluetooth devices send files to your computer, use the "
 "<guilabel>Receive files in Downloads folder over Bluetooth</guilabel> "
@@ -497,7 +497,7 @@ msgstr ""
 "Auswahl von <guilabel>Dateien akzeptieren</guilabel>, welchen entfernten "
 "Geräten das Senden von Dateien erlaubt werden soll. <placeholder-1/>"
 
-#: C/gnome-user-share.xml:196(para)
+#: C/mateuser-share.xml:196(para)
 msgid ""
 "Use the <guilabel>Notify about received files</guilabel> checkbox to select "
 "whether you want to be notified whenever a file is received via Bluetooth."
@@ -507,6 +507,6 @@ msgstr ""
 "über Bluetooth benachrichtigt werden wollen."
 
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
-#: C/gnome-user-share.xml:0(None)
+#: C/mateuser-share.xml:0(None)
 msgid "translator-credits"
-msgstr "Mario Blättermann <[email protected]>, 2009, 2010"
+msgstr "Mario Blättermann <mariobl@mateorg>, 2009, 2010"
diff --git a/help/el/el.po b/help/el/el.po
index f894967..e48a2a5 100644
--- a/help/el/el.po
+++ b/help/el/el.po
@@ -1,12 +1,12 @@
 # Fotis Tsamis <[email protected]>, 2009.
-# Simos Xenitellis <[email protected]>, 2010.
+# Simos Xenitellis <simos@mateorg>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "POT-Creation-Date: 2009-10-21 11:54+0000\n"
 "PO-Revision-Date: 2010-03-29 01:22+0300\n"
-"Last-Translator: Simos Xenitellis <[email protected]>\n"
-"Language-Team: Greek <[email protected]>\n"
+"Last-Translator: Simos Xenitellis <simos@mateorg>\n"
+"Language-Team: Greek <team@mategr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -113,7 +113,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:81(None)
+#: C/mateuser-share.xml:81(None)
 msgid ""
 "@@image: 'figures/file-sharing-preferences.png'; "
 "md5=7ae616b8043b36be1f4943ba06d8a5ed"
@@ -123,7 +123,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:99(None)
+#: C/mateuser-share.xml:99(None)
 msgid ""
 "@@image: 'figures/sharing-over-the-network.png'; "
 "md5=ee8b44eb1290e4d1ae9b1e8fe8501860"
@@ -133,7 +133,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:143(None)
+#: C/mateuser-share.xml:143(None)
 msgid ""
 "@@image: 'figures/sharing-over-bluetooth.png'; "
 "md5=0a950502b42b1e7fdb9a57d5017e919c"
@@ -143,7 +143,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:168(None)
+#: C/mateuser-share.xml:168(None)
 msgid ""
 "@@image: 'figures/receiving-over-bluetooth.png'; "
 "md5=f292daef06767f39e346b222d3c448be"
@@ -151,138 +151,138 @@ msgstr ""
 "@@image: 'figures/receiving-over-bluetooth.png'; "
 "md5=f292daef06767f39e346b222d3c448be"
 
-#: C/gnome-user-share.xml:10(title)
+#: C/mateuser-share.xml:10(title)
 msgid "Personal File Sharing Manual"
 msgstr "Εγχειρίδιο κοινής χρήσης αρχείων"
 
-#: C/gnome-user-share.xml:12(year) C/gnome-user-share.xml:29(date)
+#: C/mateuser-share.xml:12(year) C/mateuser-share.xml:29(date)
 msgid "2009"
 msgstr "2009"
 
-#: C/gnome-user-share.xml:13(holder)
+#: C/mateuser-share.xml:13(holder)
 msgid "Red Hat, Inc."
 msgstr "Red Hat, Inc."
 
-#: C/gnome-user-share.xml:19(firstname)
+#: C/mateuser-share.xml:19(firstname)
 msgid "Matthias"
 msgstr "Matthias"
 
-#: C/gnome-user-share.xml:20(surname)
+#: C/mateuser-share.xml:20(surname)
 msgid "Clasen"
 msgstr "Clasen"
 
-#: C/gnome-user-share.xml:28(revnumber)
+#: C/mateuser-share.xml:28(revnumber)
 msgid "1.0"
 msgstr "1.0"
 
-#: C/gnome-user-share.xml:31(para)
+#: C/mateuser-share.xml:31(para)
 msgid "Matthias Clasen <email>[email protected]</email>"
 msgstr "Matthias Clasen <email>[email protected]</email>"
 
-#: C/gnome-user-share.xml:35(releaseinfo)
-msgid "This manual describes version 2.26 of gnome-user-share."
-msgstr "Αυτό το εγχειρίδιο περιγράφει την έκδοση 2.26 του gnome-user-share."
+#: C/mateuser-share.xml:35(releaseinfo)
+msgid "This manual describes version 2.26 of mateuser-share."
+msgstr "Αυτό το εγχειρίδιο περιγράφει την έκδοση 2.26 του mateuser-share."
 
-#: C/gnome-user-share.xml:37(title)
+#: C/mateuser-share.xml:37(title)
 msgid "Feedback"
 msgstr "Ανάδραση"
 
-#: C/gnome-user-share.xml:38(para)
+#: C/mateuser-share.xml:38(para)
 msgid ""
-"To report a bug or make a suggestion regarding the gnome-user-share "
+"To report a bug or make a suggestion regarding the mateuser-share "
 "application or this manual, follow the directions in the <ulink url=\"ghelp:"
 "user-guide?feedback-bugs\" type=\"help\">GNOME Feedback Page</ulink>."
 msgstr ""
 "Για να αναφέρετε ένα σφάλμα ή να κάνετε μια πρόταση σχετικά με την εφαρμογή "
-"gnome-user-share ή αυτό το εγχειρίδιο, ακολουθήστε τις οδηγίες στη <ulink "
+"mateuser-share ή αυτό το εγχειρίδιο, ακολουθήστε τις οδηγίες στη <ulink "
 "url=\"ghelp:user-guide?feedback-bugs\" type=\"help\">Σελίδα ανάδρασης του "
 "GNOME</ulink>."
 
-#: C/gnome-user-share.xml:41(para)
+#: C/mateuser-share.xml:41(para)
 msgid ""
-"gnome-user-share is a session service that enables easy sharing of files "
+"mateuser-share is a session service that enables easy sharing of files "
 "between several computers."
 msgstr ""
-"Το gnome-user-share είναι μια υπηρεσία συνεδρίας που καθιστά εύκολη την "
+"Το mateuser-share είναι μια υπηρεσία συνεδρίας που καθιστά εύκολη την "
 "κοινή χρήση αρχείων μεταξύ πολλών υπολογιστών."
 
-#: C/gnome-user-share.xml:45(primary)
-msgid "gnome-user-share"
-msgstr "gnome-user-share"
+#: C/mateuser-share.xml:45(primary)
+msgid "mateuser-share"
+msgstr "mateuser-share"
 
-#: C/gnome-user-share.xml:46(primary)
+#: C/mateuser-share.xml:46(primary)
 msgid "file sharing"
 msgstr "κοινή χρήση αρχείων"
 
-#: C/gnome-user-share.xml:47(primary)
+#: C/mateuser-share.xml:47(primary)
 msgid "sharing"
 msgstr "κοινή χρήση"
 
-#: C/gnome-user-share.xml:50(title)
+#: C/mateuser-share.xml:50(title)
 msgid "Introduction"
 msgstr "Εισαγωγή"
 
-#: C/gnome-user-share.xml:51(para)
+#: C/mateuser-share.xml:51(para)
 msgid ""
-"gnome-user-share is a session service that exports the contents of the "
+"mateuser-share is a session service that exports the contents of the "
 "<filename>Public</filename> folder in your home directory, so that they can "
 "easily be accessed from other computers on the same local network. On the "
 "other computers, the shared folder will appear with a name like "
 "'<replaceable>user</replaceable>'s shared files' in the "
-"<application>nautilus</application> Network window, where <replaceable>user</"
+"<application>caja</application> Network window, where <replaceable>user</"
 "replaceable> will be replaced by your user name."
 msgstr ""
-"Το gnome-user-share είναι μια υπηρεσία που εξάγει τα περιεχομένα του φακέλου "
+"Το mateuser-share είναι μια υπηρεσία που εξάγει τα περιεχομένα του φακέλου "
 "<filename>Δημόσιο</filename> του αρχικού (προσωπικού) σας καταλόγου, ώστε να "
 "μπορούν να προσπελασθούν εύκολα από άλλους υπολογιστές στο ίδιο τοπικό "
 "δίκτυο. Στους άλλους υπολογιστές, ο κοινόχρηστος φάκελος θα εμφανίζεται με "
 "ένα όνομα όπως 'κοινόχρηστα αρχεία του <replaceable>user</replaceable>' στο "
-"παράθυρο Δίκτυο του περιηγή αρχείων <application>nautilus</application>, "
+"παράθυρο Δίκτυο του περιηγή αρχείων <application>caja</application>, "
 "όπου το <replaceable>user</replaceable> θα έχει αντικατασταθεί από το όνομα "
 "χρήστη σας."
 
-#: C/gnome-user-share.xml:54(para)
+#: C/mateuser-share.xml:54(para)
 msgid ""
-"gnome-user-share uses a WebDAV server to share the <filename>Public</"
+"mateuser-share uses a WebDAV server to share the <filename>Public</"
 "filename> folder, and advertises the share on the local network using mDNS."
 msgstr ""
-"Το gnome-user-share χρησιμοποιεί ένα εξυπηρετητή WebDAV για κάνει "
+"Το mateuser-share χρησιμοποιεί ένα εξυπηρετητή WebDAV για κάνει "
 "κοινόχρηστο το φάκελο <filename>Δημόσιο</filename> και κοινοποιεί την κοινή "
 "χρήση στο τοπικό δίκτυο χρησιμοποιώντας το mDNS."
 
-#: C/gnome-user-share.xml:57(para)
+#: C/mateuser-share.xml:57(para)
 msgid ""
-"Additionally, gnome-user-share can make the shared files available via "
+"Additionally, mateuser-share can make the shared files available via "
 "ObexFTP over Bluetooth, and receive files that are sent to your computer via "
 "Bluetooth via ObexPush."
 msgstr ""
-"Επιλέον, το gnome-user-share μπορεί να κάνει τα κοινόχρηστα αρχεία διαθέσιμα "
+"Επιλέον, το mateuser-share μπορεί να κάνει τα κοινόχρηστα αρχεία διαθέσιμα "
 "με ObexFTP μέσω Bluetooth, και να λαμβάνει αρχεία που αποστέλλονται στον "
 "υπολογιστή σας μέσω Bluetooth με το ObexPush."
 
-#: C/gnome-user-share.xml:63(title)
+#: C/mateuser-share.xml:63(title)
 msgid "Getting started"
 msgstr "Ξεκινώντας"
 
-#: C/gnome-user-share.xml:66(title)
-msgid "Starting gnome-user-share"
-msgstr "Εκκίνηση του gnome-user-share"
+#: C/mateuser-share.xml:66(title)
+msgid "Starting mateuser-share"
+msgstr "Εκκίνηση του mateuser-share"
 
-#: C/gnome-user-share.xml:68(para)
+#: C/mateuser-share.xml:68(para)
 #| msgid ""
-#| "The gnome-user-share service is normally started by <application>gnome-"
+#| "The mateuser-share service is normally started by <application>mate"
 #| "session</application> when you log in. You can change this by opening "
 #| "<menuchoice><guimenu>Preferences</guimenu><guimenu>Sessions</guimenu></"
 #| "menuchoice> in the <guimenu>System</guimenu> menu, and modifying the "
 #| "'User Sharing' entry in the list of startup programs."
 msgid ""
-"The gnome-user-share service is normally started by <application>gnome-"
+"The mateuser-share service is normally started by <application>mate"
 "session</application> when you log in. You can change this by opening "
 "<menuchoice><guimenu>Preferences</guimenu><guimenu>Startup Applications</"
 "guimenu></menuchoice> in the <guimenu>System</guimenu> menu, and modifying "
 "the 'User Sharing' entry in the list of startup programs."
 msgstr ""
-"Η υπηρεσία gnome-user-share ξεκινά τυπικά από το <application>gnome-"
+"Η υπηρεσία mateuser-share ξεκινά τυπικά από το <application>mate"
 "session</application> όταν κατά τη σύνδεσή σας στο σύστημα. Αυτό μπορεί να "
 "αλλάξει ανοίγοντας το "
 "<menuchoice><guimenu>Προτιμήσεις</guimenu><guimenu>Προγράμματα εκκίνησης<"
@@ -290,7 +290,7 @@ msgstr ""
 "menuchoice> από το μενού <guimenu>Σύστημα</guimenu> και τροποποιώντας την "
 "καταχώρηση 'Κοινή χρήση' στη λίστα της εκκίνησης προγραμμάτων."
 
-#: C/gnome-user-share.xml:72(para)
+#: C/mateuser-share.xml:72(para)
 msgid ""
 "To configure various aspects of file sharing, use the File Sharing "
 "Preferences, which can be found in the <guimenu>System</guimenu> menu under "
@@ -302,16 +302,16 @@ msgstr ""
 "<guimenu>Σύστημα</guimenu> στο <guimenu>Προτιμήσεις</guimenu> <guimenu>Κοινή "
 "χρήση προσωπικών αρχείων</guimenu>."
 
-#: C/gnome-user-share.xml:77(title)
+#: C/mateuser-share.xml:77(title)
 msgid "File Sharing Preferences"
 msgstr "Προτιμήσεις κοινής χρήσης αρχείων"
 
-#: C/gnome-user-share.xml:89(title)
+#: C/mateuser-share.xml:89(title)
 msgid "Enabling file sharing over the network"
 msgstr "Ενεργοποίηση κοινής χρήσης αρχείων μέσω του δικτύου"
 
-#: C/gnome-user-share.xml:90(para) C/gnome-user-share.xml:134(para)
-#: C/gnome-user-share.xml:159(para)
+#: C/mateuser-share.xml:90(para) C/mateuser-share.xml:134(para)
+#: C/mateuser-share.xml:159(para)
 msgid ""
 "Open the File Sharing Preferences using <menuchoice><guimenu>Preferences</"
 "guimenu><guimenu>Personal File Sharing</guimenu></menuchoice> in the "
@@ -321,11 +321,11 @@ msgstr ""
 "<menuchoice><guimenu>Προτιμήσεις</guimenu><guimenu>Κοινή χρήση αρχείων</"
 "guimenu></menuchoice> στο μενού <guimenu>Σύστημα</guimenu>."
 
-#: C/gnome-user-share.xml:95(title)
+#: C/mateuser-share.xml:95(title)
 msgid "Share Files over the Network"
 msgstr "Κοινή χρήση αρχείων μέσω δικτύου"
 
-#: C/gnome-user-share.xml:106(para)
+#: C/mateuser-share.xml:106(para)
 msgid ""
 "Some firewall configurations on the local machine might cause problems with "
 "the advertisment, as well as the access to the shared files. Consult your "
@@ -336,7 +336,7 @@ msgstr ""
 "αρχεία. Συμβουλευτείτε το διαχειριστή του συστήματός σας για περισσότερες "
 "λεπτομέρειες."
 
-#: C/gnome-user-share.xml:109(para)
+#: C/mateuser-share.xml:109(para)
 msgid ""
 "Select <guilabel>Never</guilabel> to allow everybody to freely read or write "
 "files in the shared folder."
@@ -344,7 +344,7 @@ msgstr ""
 "Επιλέξτε <guilabel>Ποτέ</guilabel> για να επιτρέψετε σε όλους να διαβάζουν ή "
 "να γράφουν ελεύθερα αρχεία στον κοινόχρηστο φάκελο."
 
-#: C/gnome-user-share.xml:115(para)
+#: C/mateuser-share.xml:115(para)
 msgid ""
 "Select <guilabel>Always</guilabel> to require the password to read or write "
 "files in the shared folder."
@@ -352,7 +352,7 @@ msgstr ""
 "Επιλέξτε <guilabel>Πάντα</guilabel> για να ζητείται ο κωδικός πρόσβασης για "
 "προβολή ή εγγραφή αρχείων στον κοινόχρηστο φάκελο."
 
-#: C/gnome-user-share.xml:121(para)
+#: C/mateuser-share.xml:121(para)
 msgid ""
 "Select <guilabel>When writing files</guilabel> to allow everybody to freely "
 "read files in the shared folder, but require the password when writing files."
@@ -361,7 +361,7 @@ msgstr ""
 "όλους να διαβάζουν ελεύθερα αρχεία του κοινόχρηστου φακέλου αλλά να ζητείται "
 "ο κωδικός πρόσβασης κατά την εγγραφή αρχείων."
 
-#: C/gnome-user-share.xml:128(para)
+#: C/mateuser-share.xml:128(para)
 msgid ""
 "When you set a password, you have to give the password to all users that you "
 "want to have access to the shared files. Therefore, you should use a "
@@ -372,7 +372,7 @@ msgstr ""
 "να χρησιμοποιήσετε διαφορετικό κωδικό από άλλους κωδικούς που τυχόν "
 "χρησιμοποιείτε."
 
-#: C/gnome-user-share.xml:104(para)
+#: C/mateuser-share.xml:104(para)
 msgid ""
 "To enable file sharing via WebDAV, use the <guilabel>Share public files on "
 "network</guilabel> checkbox. When file sharing it enabled, the controls for "
@@ -387,15 +387,15 @@ msgstr ""
 "πριν ένας χρήστης σε άλλο υπολογιστή μπορεί να προσπελάσει τα κοινόχρηστα "
 "αρχεία. <placeholder-1/><placeholder-2/><placeholder-3/>"
 
-#: C/gnome-user-share.xml:133(title)
+#: C/mateuser-share.xml:133(title)
 msgid "Enabling file sharing over Bluetooth"
 msgstr "Ενεργοποίηση κοινής χρήσης αρχείων μέσω Bluetooth"
 
-#: C/gnome-user-share.xml:139(title)
+#: C/mateuser-share.xml:139(title)
 msgid "Share Files over Bluetooth"
 msgstr "Κοινή χρήση αρχείων μέσω Bluetooth"
 
-#: C/gnome-user-share.xml:152(para)
+#: C/mateuser-share.xml:152(para)
 msgid ""
 "When you allow unbonded remote devices to access your shared files, anybody "
 "with a Bluetooth-enabled cell phone in the vicinity of your computer can "
@@ -406,7 +406,7 @@ msgstr ""
 "ενεργοποιημένο το Bluetooth και βρίσκεται στην εμβέλεια του υπολογιστή σας "
 "μπορεί να προσπελάσει και πιθανώς να τροποποιήσει τα κοινόχρηστα αρχεία σας."
 
-#: C/gnome-user-share.xml:148(para)
+#: C/mateuser-share.xml:148(para)
 msgid ""
 "To enable file sharing via Bluetooth, use the <guilabel>Share public files "
 "over Bluetooth</guilabel> checkbox. To allow remote Bluetooth devices to "
@@ -426,22 +426,22 @@ msgstr ""
 "το κουτάκι <guilabel>Υποχρεωτική σύζευξη των απομακρυσμένων συσκευών με αυτό "
 "τον υπολογιστή</guilabel>. <placeholder-1/>"
 
-#: C/gnome-user-share.xml:158(title)
+#: C/mateuser-share.xml:158(title)
 msgid "Receiving Files over Bluetooth"
 msgstr "Λήψη αρχείων μέσω Bluetooth"
 
-#: C/gnome-user-share.xml:164(title)
+#: C/mateuser-share.xml:164(title)
 msgid "Receive Files over Bluetooth"
 msgstr "Λήψη αρχείων μέσω Bluetooth"
 
-#: C/gnome-user-share.xml:177(para)
+#: C/mateuser-share.xml:177(para)
 msgid ""
 "Select <guilabel>Always</guilabel> to allow any remote device to send files."
 msgstr ""
 "Επιλέξτε <guilabel>Πάντα</guilabel> για να επιτρέψετε σε οποιαδήποτε "
 "απομακρυσμένη συσκευή να στέλνει αρχεία."
 
-#: C/gnome-user-share.xml:184(para)
+#: C/mateuser-share.xml:184(para)
 msgid ""
 "Bonded devices are the ones that were connected to your computer, and had to "
 "enter a PIN code to connect to or from."
@@ -449,7 +449,7 @@ msgstr ""
 "Συζευγμένες είναι οι συσκευές που ήταν συνδεδεμένες στον υπολογιστή σας και "
 "έπρεπε να εισάγωουν ένα κωδικό PIN για να συνδεθούν."
 
-#: C/gnome-user-share.xml:182(para)
+#: C/mateuser-share.xml:182(para)
 msgid ""
 "Select <guilabel>Only for Bonded devices</guilabel> to accept files only "
 "from bonded devices. <placeholder-1/>"
@@ -457,7 +457,7 @@ msgstr ""
 "Ειπλέξτε <guilabel>Μόνο για συζευγμένες συσκευές</guilabel> για να "
 "αποδέχεστε αρχεία μόνο από συζευγμένες συσκευές. <placeholder-1/>"
 
-#: C/gnome-user-share.xml:191(para)
+#: C/mateuser-share.xml:191(para)
 msgid ""
 "Devices can be marked as trusted in the <application>bluetooth-properties</"
 "application>'s <guilabel>Known devices</guilabel> section."
@@ -466,7 +466,7 @@ msgstr ""
 "<guilabel>Γνωστές συσκευές</guilabel> της εφαρμογής <application>bluetooth-"
 "properties</application>."
 
-#: C/gnome-user-share.xml:189(para)
+#: C/mateuser-share.xml:189(para)
 msgid ""
 "Select <guilabel>Only for Bonded and Trusted devices</guilabel> to accept "
 "files only from bonded devices. <placeholder-1/>"
@@ -474,7 +474,7 @@ msgstr ""
 "Επιλέξτε <guilabel>Μόνο για συζευγμένες και γνωστές συσκευές</guilabel> για "
 "να δέχεστε αρχεία μόνο από συζευγμένες συσκευές. <placeholder-1/>"
 
-#: C/gnome-user-share.xml:173(para)
+#: C/mateuser-share.xml:173(para)
 msgid ""
 "To let remote Bluetooth devices send files to your computer, use the "
 "<guilabel>Receive files in Downloads folder over Bluetooth</guilabel> "
@@ -491,7 +491,7 @@ msgstr ""
 "guilabel> σας επιτρέπει να καθορίσετε σε ποιες απομακρυσμένες συσκευές "
 "επιτρέπεται η αποστολή αρχείων."
 
-#: C/gnome-user-share.xml:196(para)
+#: C/mateuser-share.xml:196(para)
 msgid ""
 "Use the <guilabel>Notify about received files</guilabel> checkbox to select "
 "whether you want to be notified whenever a file is received via Bluetooth."
@@ -501,11 +501,11 @@ msgstr ""
 "Bluetooth."
 
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
-#: C/gnome-user-share.xml:0(None)
+#: C/mateuser-share.xml:0(None)
 msgid "translator-credits"
 msgstr ""
 "Ελληνική μεταφραστική ομάδα GNOME\n"
 "  Μιχάλης Κοτσαρίνης <[email protected]>\n"
 "\n"
-"Για περισσότερα δείτε http://www.gnome.gr/"
+"Για περισσότερα δείτε http://www.mategr/"
 
diff --git a/help/en_GB/en_GB.po b/help/en_GB/en_GB.po
index 6d37405..91ae147 100644
--- a/help/en_GB/en_GB.po
+++ b/help/en_GB/en_GB.po
@@ -1,12 +1,12 @@
-# English (British) translation for gnome-user-share
+# English (British) translation for mateuser-share
 # Copyright (C) 2009 Philip Withnall
-# This file is distributed under the same license as the gnome-user-share package.
+# This file is distributed under the same license as the mateuser-share package.
 # Philip Withnall <[email protected]>, 2009.
 # Jen Ockwell <[email protected]>, 2009
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share\n"
+"Project-Id-Version: mateuser-share\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-03-13 22:40+0000\n"
 "PO-Revision-Date: 2009-03-14 10:45+0000\n"
@@ -116,7 +116,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:81(None)
+#: C/mateuser-share.xml:81(None)
 msgid ""
 "@@image: 'figures/file-sharing-preferences.png'; "
 "md5=7ae616b8043b36be1f4943ba06d8a5ed"
@@ -126,7 +126,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:99(None)
+#: C/mateuser-share.xml:99(None)
 msgid ""
 "@@image: 'figures/sharing-over-the-network.png'; "
 "md5=ee8b44eb1290e4d1ae9b1e8fe8501860"
@@ -136,7 +136,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:143(None)
+#: C/mateuser-share.xml:143(None)
 msgid ""
 "@@image: 'figures/sharing-over-bluetooth.png'; "
 "md5=0a950502b42b1e7fdb9a57d5017e919c"
@@ -146,7 +146,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:168(None)
+#: C/mateuser-share.xml:168(None)
 msgid ""
 "@@image: 'figures/receiving-over-bluetooth.png'; "
 "md5=f292daef06767f39e346b222d3c448be"
@@ -154,87 +154,87 @@ msgstr ""
 "@@image: 'figures/receiving-over-bluetooth.png'; "
 "md5=f292daef06767f39e346b222d3c448be"
 
-#: C/gnome-user-share.xml:10(title)
+#: C/mateuser-share.xml:10(title)
 msgid "Personal File Sharing Manual"
 msgstr "Personal File Sharing Manual"
 
-#: C/gnome-user-share.xml:12(year) C/gnome-user-share.xml:29(date)
+#: C/mateuser-share.xml:12(year) C/mateuser-share.xml:29(date)
 msgid "2009"
 msgstr "2009"
 
-#: C/gnome-user-share.xml:13(holder)
+#: C/mateuser-share.xml:13(holder)
 msgid "Red Hat, Inc."
 msgstr "Red Hat, Inc."
 
-#: C/gnome-user-share.xml:19(firstname)
+#: C/mateuser-share.xml:19(firstname)
 msgid "Matthias"
 msgstr "Matthias"
 
-#: C/gnome-user-share.xml:20(surname)
+#: C/mateuser-share.xml:20(surname)
 msgid "Clasen"
 msgstr "Clasen"
 
-#: C/gnome-user-share.xml:28(revnumber)
+#: C/mateuser-share.xml:28(revnumber)
 msgid "1.0"
 msgstr "1.0"
 
-#: C/gnome-user-share.xml:31(para)
+#: C/mateuser-share.xml:31(para)
 msgid "Matthias Clasen <email>[email protected]</email>"
 msgstr "Matthias Clasen <email>[email protected]</email>"
 
-#: C/gnome-user-share.xml:35(releaseinfo)
-msgid "This manual describes version 2.26 of gnome-user-share."
-msgstr "This manual describes version 2.26 of gnome-user-share."
+#: C/mateuser-share.xml:35(releaseinfo)
+msgid "This manual describes version 2.26 of mateuser-share."
+msgstr "This manual describes version 2.26 of mateuser-share."
 
-#: C/gnome-user-share.xml:37(title)
+#: C/mateuser-share.xml:37(title)
 msgid "Feedback"
 msgstr "Feedback"
 
-#: C/gnome-user-share.xml:38(para)
+#: C/mateuser-share.xml:38(para)
 msgid ""
-"To report a bug or make a suggestion regarding the gnome-user-share "
+"To report a bug or make a suggestion regarding the mateuser-share "
 "application or this manual, follow the directions in the <ulink url=\"ghelp:"
 "user-guide?feedback-bugs\" type=\"help\">GNOME Feedback Page</ulink>."
 msgstr ""
-"To report a bug or make a suggestion regarding the gnome-user-share "
+"To report a bug or make a suggestion regarding the mateuser-share "
 "application or this manual, follow the directions in the <ulink url=\"ghelp:"
 "user-guide?feedback-bugs\" type=\"help\">GNOME Feedback Page</ulink>."
 
-#: C/gnome-user-share.xml:41(para)
+#: C/mateuser-share.xml:41(para)
 msgid ""
-"gnome-user-share is a session service that enables easy sharing of files "
+"mateuser-share is a session service that enables easy sharing of files "
 "between several computers."
 msgstr ""
-"<application>gnome-user-share</application> is a session service that "
+"<application>mateuser-share</application> is a session service that "
 "enables easy sharing of files between several computers."
 
-#: C/gnome-user-share.xml:45(primary)
-msgid "gnome-user-share"
-msgstr "gnome-user-share"
+#: C/mateuser-share.xml:45(primary)
+msgid "mateuser-share"
+msgstr "mateuser-share"
 
-#: C/gnome-user-share.xml:46(primary)
+#: C/mateuser-share.xml:46(primary)
 msgid "file sharing"
 msgstr "file sharing"
 
-#: C/gnome-user-share.xml:47(primary)
+#: C/mateuser-share.xml:47(primary)
 msgid "sharing"
 msgstr "sharing"
 
-#: C/gnome-user-share.xml:50(title)
+#: C/mateuser-share.xml:50(title)
 msgid "Introduction"
 msgstr "Introduction"
 
-#: C/gnome-user-share.xml:51(para)
+#: C/mateuser-share.xml:51(para)
 msgid ""
-"gnome-user-share is a session service that exports the contents of the "
+"mateuser-share is a session service that exports the contents of the "
 "<filename>Public</filename> folder in your home directory, so that they can "
 "easily be accessed from other computers on the same local network. On the "
 "other computers, the shared folder will appear with a name like "
 "'<replaceable>user</replaceable>'s shared files' in the "
-"<application>nautilus</application> Network window, where <replaceable>user</"
+"<application>caja</application> Network window, where <replaceable>user</"
 "replaceable> will be replaced by your user name."
 msgstr ""
-"<application>gnome-user-share</application> is a session service that "
+"<application>mateuser-share</application> is a session service that "
 "exports the contents of the <filename>Public</filename> folder in your home "
 "directory, so that they can easily be accessed from other computers on the "
 "same local network. On the other computers, the shared folder will appear "
@@ -243,48 +243,48 @@ msgstr ""
 "application> Network window, where <replaceable>user</replaceable> will be "
 "replaced by your username."
 
-#: C/gnome-user-share.xml:54(para)
+#: C/mateuser-share.xml:54(para)
 msgid ""
-"gnome-user-share uses a WebDAV server to share the <filename>Public</"
+"mateuser-share uses a WebDAV server to share the <filename>Public</"
 "filename> folder, and advertises the share on the local network using mDNS."
 msgstr ""
-"<application>gnome-user-share</application> uses a WebDAV server to share "
+"<application>mateuser-share</application> uses a WebDAV server to share "
 "the <filename class=\"directory\">Public</filename> folder, and advertises "
 "the share on the local network using mDNS."
 
-#: C/gnome-user-share.xml:57(para)
+#: C/mateuser-share.xml:57(para)
 msgid ""
-"Additionally, gnome-user-share can make the shared files available via "
+"Additionally, mateuser-share can make the shared files available via "
 "ObexFTP over Bluetooth, and receive files that are sent to your computer via "
 "Bluetooth via ObexPush."
 msgstr ""
-"Additionally, <application>gnome-user-share</application> can make the "
+"Additionally, <application>mateuser-share</application> can make the "
 "shared files available via ObexFTP over Bluetooth, and receive files that "
 "are sent to your computer via Bluetooth via ObexPush."
 
-#: C/gnome-user-share.xml:63(title)
+#: C/mateuser-share.xml:63(title)
 msgid "Getting started"
 msgstr "Getting started"
 
-#: C/gnome-user-share.xml:66(title)
-msgid "Starting gnome-user-share"
-msgstr "Starting gnome-user-share"
+#: C/mateuser-share.xml:66(title)
+msgid "Starting mateuser-share"
+msgstr "Starting mateuser-share"
 
-#: C/gnome-user-share.xml:68(para)
+#: C/mateuser-share.xml:68(para)
 msgid ""
-"The gnome-user-share service is normally started by <application>gnome-"
+"The mateuser-share service is normally started by <application>mate"
 "session</application> when you log in. You can change this by opening "
 "<menuchoice><guimenu>Preferences</guimenu><guimenu>Sessions</guimenu></"
 "menuchoice> in the <guimenu>System</guimenu> menu, and modifying the 'User "
 "Sharing' entry in the list of startup programs."
 msgstr ""
-"The <application>gnome-user-share</application> service is normally started "
-"by <application>gnome-session</application> when you log in. You can change "
+"The <application>mateuser-share</application> service is normally started "
+"by <application>matesession</application> when you log in. You can change "
 "this by opening <menuchoice><guimenu>Preferences</guimenu><guimenu>Sessions</"
 "guimenu></menuchoice> in the <guimenu>System</guimenu> menu, and modifying "
 "the <guilabel>User Sharing</guilabel> entry in the list of startup programs."
 
-#: C/gnome-user-share.xml:72(para)
+#: C/mateuser-share.xml:72(para)
 msgid ""
 "To configure various aspects of file sharing, use the File Sharing "
 "Preferences, which can be found in the <guimenu>System</guimenu> menu under "
@@ -296,16 +296,16 @@ msgstr ""
 "<menuchoice><guimenu>Preferences</guimenu><guimenu>Personal File Sharing</"
 "guimenu></menuchoice>."
 
-#: C/gnome-user-share.xml:77(title)
+#: C/mateuser-share.xml:77(title)
 msgid "File Sharing Preferences"
 msgstr "File Sharing Preferences"
 
-#: C/gnome-user-share.xml:89(title)
+#: C/mateuser-share.xml:89(title)
 msgid "Enabling file sharing over the network"
 msgstr "Enabling file sharing over the network"
 
-#: C/gnome-user-share.xml:90(para) C/gnome-user-share.xml:134(para)
-#: C/gnome-user-share.xml:159(para)
+#: C/mateuser-share.xml:90(para) C/mateuser-share.xml:134(para)
+#: C/mateuser-share.xml:159(para)
 msgid ""
 "Open the File Sharing Preferences using <menuchoice><guimenu>Preferences</"
 "guimenu><guimenu>Personal File Sharing</guimenu></menuchoice> in the "
@@ -315,11 +315,11 @@ msgstr ""
 "guimenu><guimenu>Personal File Sharing</guimenu></menuchoice> in the "
 "<guimenu>System</guimenu> menu."
 
-#: C/gnome-user-share.xml:95(title)
+#: C/mateuser-share.xml:95(title)
 msgid "Share Files over the Network"
 msgstr "Share Files over the Network"
 
-#: C/gnome-user-share.xml:106(para)
+#: C/mateuser-share.xml:106(para)
 msgid ""
 "Some firewall configurations on the local machine might cause problems with "
 "the advertisment, as well as the access to the shared files. Consult your "
@@ -329,7 +329,7 @@ msgstr ""
 "the advertisement, as well as the access to the shared files. Consult your "
 "system administrator for more details."
 
-#: C/gnome-user-share.xml:109(para)
+#: C/mateuser-share.xml:109(para)
 msgid ""
 "Select <guilabel>Never</guilabel> to allow everybody to freely read or write "
 "files in the shared folder."
@@ -337,7 +337,7 @@ msgstr ""
 "Select <guilabel>Never</guilabel> to allow everybody to freely read or write "
 "files in the shared folder."
 
-#: C/gnome-user-share.xml:115(para)
+#: C/mateuser-share.xml:115(para)
 msgid ""
 "Select <guilabel>Always</guilabel> to require the password to read or write "
 "files in the shared folder."
@@ -345,7 +345,7 @@ msgstr ""
 "Select <guilabel>Always</guilabel> to require the password to read or write "
 "files in the shared folder."
 
-#: C/gnome-user-share.xml:121(para)
+#: C/mateuser-share.xml:121(para)
 msgid ""
 "Select <guilabel>When writing files</guilabel> to allow everybody to freely "
 "read files in the shared folder, but require the password when writing files."
@@ -353,7 +353,7 @@ msgstr ""
 "Select <guilabel>When writing files</guilabel> to allow everybody to freely "
 "read files in the shared folder, but require the password when writing files."
 
-#: C/gnome-user-share.xml:128(para)
+#: C/mateuser-share.xml:128(para)
 msgid ""
 "When you set a password, you have to give the password to all users that you "
 "want to have access to the shared files. Therefore, you should use a "
@@ -363,7 +363,7 @@ msgstr ""
 "want to have access to the shared files. Therefore, you should use a "
 "password that is different from other passwords you use."
 
-#: C/gnome-user-share.xml:104(para)
+#: C/mateuser-share.xml:104(para)
 msgid ""
 "To enable file sharing via WebDAV, use the <guilabel>Share public files on "
 "network</guilabel> checkbox. When file sharing it enabled, the controls for "
@@ -377,15 +377,15 @@ msgstr ""
 "before a user on another computer is granted access to the shared files. "
 "<placeholder-1/><placeholder-2/><placeholder-3/>"
 
-#: C/gnome-user-share.xml:133(title)
+#: C/mateuser-share.xml:133(title)
 msgid "Enabling file sharing over Bluetooth"
 msgstr "Enabling file sharing over Bluetooth"
 
-#: C/gnome-user-share.xml:139(title)
+#: C/mateuser-share.xml:139(title)
 msgid "Share Files over Bluetooth"
 msgstr "Share Files over Bluetooth"
 
-#: C/gnome-user-share.xml:152(para)
+#: C/mateuser-share.xml:152(para)
 msgid ""
 "When you allow unbonded remote devices to access your shared files, anybody "
 "with a Bluetooth-enabled cell phone in the vicinity of your computer can "
@@ -395,7 +395,7 @@ msgstr ""
 "with a Bluetooth-enabled mobile phone in the vicinity of your computer can "
 "access and perhaps even modify your shared files."
 
-#: C/gnome-user-share.xml:148(para)
+#: C/mateuser-share.xml:148(para)
 msgid ""
 "To enable file sharing via Bluetooth, use the <guilabel>Share public files "
 "over Bluetooth</guilabel> checkbox. To allow remote Bluetooth devices to "
@@ -413,21 +413,21 @@ msgstr ""
 "use the <guilabel>Require remote devices to pair with this computer</"
 "guilabel> checkbox. <placeholder-1/>"
 
-#: C/gnome-user-share.xml:158(title)
+#: C/mateuser-share.xml:158(title)
 msgid "Receiving Files over Bluetooth"
 msgstr "Receiving Files over Bluetooth"
 
-#: C/gnome-user-share.xml:164(title)
+#: C/mateuser-share.xml:164(title)
 msgid "Receive Files over Bluetooth"
 msgstr "Receive Files over Bluetooth"
 
-#: C/gnome-user-share.xml:177(para)
+#: C/mateuser-share.xml:177(para)
 msgid ""
 "Select <guilabel>Always</guilabel> to allow any remote device to send files."
 msgstr ""
 "Select <guilabel>Always</guilabel> to allow any remote device to send files."
 
-#: C/gnome-user-share.xml:184(para)
+#: C/mateuser-share.xml:184(para)
 msgid ""
 "Bonded devices are the ones that were connected to your computer, and had to "
 "enter a PIN code to connect to or from."
@@ -435,7 +435,7 @@ msgstr ""
 "Bonded devices are the ones that were connected to your computer, and had to "
 "enter a PIN code to connect to it."
 
-#: C/gnome-user-share.xml:182(para)
+#: C/mateuser-share.xml:182(para)
 msgid ""
 "Select <guilabel>Only for Bonded devices</guilabel> to accept files only "
 "from bonded devices. <placeholder-1/>"
@@ -443,7 +443,7 @@ msgstr ""
 "Select <guilabel>Only for Bonded devices</guilabel> to accept files only "
 "from bonded devices. <placeholder-1/>"
 
-#: C/gnome-user-share.xml:191(para)
+#: C/mateuser-share.xml:191(para)
 msgid ""
 "Devices can be marked as trusted in the <application>bluetooth-properties</"
 "application>'s <guilabel>Known devices</guilabel> section."
@@ -451,7 +451,7 @@ msgstr ""
 "Devices can be marked as trusted in the <application>bluetooth-properties</"
 "application>'s <guilabel>Known devices</guilabel> section."
 
-#: C/gnome-user-share.xml:189(para)
+#: C/mateuser-share.xml:189(para)
 msgid ""
 "Select <guilabel>Only for Bonded and Trusted devices</guilabel> to accept "
 "files only from bonded devices. <placeholder-1/>"
@@ -459,7 +459,7 @@ msgstr ""
 "Select <guilabel>Only for Bonded and Trusted devices</guilabel> to accept "
 "files only from bonded devices. <placeholder-1/>"
 
-#: C/gnome-user-share.xml:173(para)
+#: C/mateuser-share.xml:173(para)
 msgid ""
 "To let remote Bluetooth devices send files to your computer, use the "
 "<guilabel>Receive files in Downloads folder over Bluetooth</guilabel> "
@@ -475,7 +475,7 @@ msgstr ""
 "the <guilabel>Accept files</guilabel> selection allows you to determine "
 "which remote devices are allowed to send files. <placeholder-1/>"
 
-#: C/gnome-user-share.xml:196(para)
+#: C/mateuser-share.xml:196(para)
 msgid ""
 "Use the <guilabel>Notify about received files</guilabel> checkbox to select "
 "whether you want to be notified whenever a file is received via Bluetooth."
@@ -484,7 +484,7 @@ msgstr ""
 "whether you want to be notified whenever a file is received via Bluetooth."
 
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: C/gnome-user-share.xml:0(None)
+#: C/mateuser-share.xml:0(None)
 msgid "translator-credits"
 msgstr ""
 "Philip Withnall <[email protected]>, 2009\n"
diff --git a/help/es/es.po b/help/es/es.po
index bc81b29..15e11c5 100644
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -1,12 +1,12 @@
-# translation of gnome-user-share-help.master.po to Español
-# Jorge González <[email protected]>, 2009.
+# translation of mateuser-share-help.master.po to Español
+# Jorge González <[email protected]>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share-help.master\n"
+"Project-Id-Version: mateuser-share-help.master\n"
 "POT-Creation-Date: 2009-10-21 11:54+0000\n"
 "PO-Revision-Date: 2009-11-04 20:26+0100\n"
-"Last-Translator: Jorge González <[email protected]>\n"
-"Language-Team: Español <[email protected]>\n"
+"Last-Translator: Jorge González <[email protected]>\n"
+"Language-Team: Español <matees-list@mateorg>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -114,7 +114,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:81(None)
+#: C/mateuser-share.xml:81(None)
 msgid ""
 "@@image: 'figures/file-sharing-preferences.png'; "
 "md5=7ae616b8043b36be1f4943ba06d8a5ed"
@@ -124,7 +124,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:99(None)
+#: C/mateuser-share.xml:99(None)
 msgid ""
 "@@image: 'figures/sharing-over-the-network.png'; "
 "md5=ee8b44eb1290e4d1ae9b1e8fe8501860"
@@ -134,7 +134,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:143(None)
+#: C/mateuser-share.xml:143(None)
 msgid ""
 "@@image: 'figures/sharing-over-bluetooth.png'; "
 "md5=0a950502b42b1e7fdb9a57d5017e919c"
@@ -144,7 +144,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:168(None)
+#: C/mateuser-share.xml:168(None)
 msgid ""
 "@@image: 'figures/receiving-over-bluetooth.png'; "
 "md5=f292daef06767f39e346b222d3c448be"
@@ -152,45 +152,45 @@ msgstr ""
 "@@image: 'figures/receiving-over-bluetooth.png'; "
 "md5=f292daef06767f39e346b222d3c448be"
 
-#: C/gnome-user-share.xml:10(title)
+#: C/mateuser-share.xml:10(title)
 msgid "Personal File Sharing Manual"
 msgstr "Manual de Compartición de archivos personales"
 
-#: C/gnome-user-share.xml:12(year) C/gnome-user-share.xml:29(date)
+#: C/mateuser-share.xml:12(year) C/mateuser-share.xml:29(date)
 msgid "2009"
 msgstr "2009"
 
-#: C/gnome-user-share.xml:13(holder)
+#: C/mateuser-share.xml:13(holder)
 msgid "Red Hat, Inc."
 msgstr "Red Hat, Inc."
 
-#: C/gnome-user-share.xml:19(firstname)
+#: C/mateuser-share.xml:19(firstname)
 msgid "Matthias"
 msgstr "Matthias"
 
-#: C/gnome-user-share.xml:20(surname)
+#: C/mateuser-share.xml:20(surname)
 msgid "Clasen"
 msgstr "Clasen"
 
-#: C/gnome-user-share.xml:28(revnumber)
+#: C/mateuser-share.xml:28(revnumber)
 msgid "1.0"
 msgstr "1.0"
 
-#: C/gnome-user-share.xml:31(para)
+#: C/mateuser-share.xml:31(para)
 msgid "Matthias Clasen <email>[email protected]</email>"
 msgstr "Matthias Clasen <email>[email protected]</email>"
 
-#: C/gnome-user-share.xml:35(releaseinfo)
-msgid "This manual describes version 2.26 of gnome-user-share."
+#: C/mateuser-share.xml:35(releaseinfo)
+msgid "This manual describes version 2.26 of mateuser-share."
 msgstr "Este manual describe la versión 2.26 de Compartición de archivos personales."
 
-#: C/gnome-user-share.xml:37(title)
+#: C/mateuser-share.xml:37(title)
 msgid "Feedback"
 msgstr "Comentarios"
 
-#: C/gnome-user-share.xml:38(para)
+#: C/mateuser-share.xml:38(para)
 msgid ""
-"To report a bug or make a suggestion regarding the gnome-user-share "
+"To report a bug or make a suggestion regarding the mateuser-share "
 "application or this manual, follow the directions in the <ulink url=\"ghelp:"
 "user-guide?feedback-bugs\" type=\"help\">GNOME Feedback Page</ulink>."
 msgstr ""
@@ -199,38 +199,38 @@ msgstr ""
 "la <ulink url=\"ghelp:user-guide?feedback-bugs\" type=\"help\">Página de "
 "comentarios de GNOME</ulink>."
 
-#: C/gnome-user-share.xml:41(para)
+#: C/mateuser-share.xml:41(para)
 msgid ""
-"gnome-user-share is a session service that enables easy sharing of files "
+"mateuser-share is a session service that enables easy sharing of files "
 "between several computers."
 msgstr ""
 "Compartición de archivos personales es un servicio de sesión que activa la "
 "compartición sencilla de archivos entre varios equipos."
 
-#: C/gnome-user-share.xml:45(primary)
-msgid "gnome-user-share"
-msgstr "gnome-user-share"
+#: C/mateuser-share.xml:45(primary)
+msgid "mateuser-share"
+msgstr "mateuser-share"
 
-#: C/gnome-user-share.xml:46(primary)
+#: C/mateuser-share.xml:46(primary)
 msgid "file sharing"
 msgstr "compartición de archivos"
 
-#: C/gnome-user-share.xml:47(primary)
+#: C/mateuser-share.xml:47(primary)
 msgid "sharing"
 msgstr "compartir"
 
-#: C/gnome-user-share.xml:50(title)
+#: C/mateuser-share.xml:50(title)
 msgid "Introduction"
 msgstr "Introducción"
 
-#: C/gnome-user-share.xml:51(para)
+#: C/mateuser-share.xml:51(para)
 msgid ""
-"gnome-user-share is a session service that exports the contents of the "
+"mateuser-share is a session service that exports the contents of the "
 "<filename>Public</filename> folder in your home directory, so that they can "
 "easily be accessed from other computers on the same local network. On the "
 "other computers, the shared folder will appear with a name like "
 "'<replaceable>user</replaceable>'s shared files' in the "
-"<application>nautilus</application> Network window, where <replaceable>user</"
+"<application>caja</application> Network window, where <replaceable>user</"
 "replaceable> will be replaced by your user name."
 msgstr ""
 "Compartición de archivos personales es un servicio de sesión que exporta el "
@@ -242,18 +242,18 @@ msgstr ""
 "donde <replaceable>usuario</replaceable> se reemplazará por su nombre de "
 "usuario."
 
-#: C/gnome-user-share.xml:54(para)
+#: C/mateuser-share.xml:54(para)
 msgid ""
-"gnome-user-share uses a WebDAV server to share the <filename>Public</"
+"mateuser-share uses a WebDAV server to share the <filename>Public</"
 "filename> folder, and advertises the share on the local network using mDNS."
 msgstr ""
 "Compartición de archivos personales usa un servidor WebDAV para compartir la "
 "carpeta <filename>Public</filename> y publica la compartición en la red "
 "local usando mDNS."
 
-#: C/gnome-user-share.xml:57(para)
+#: C/mateuser-share.xml:57(para)
 msgid ""
-"Additionally, gnome-user-share can make the shared files available via "
+"Additionally, mateuser-share can make the shared files available via "
 "ObexFTP over Bluetooth, and receive files that are sent to your computer via "
 "Bluetooth via ObexPush."
 msgstr ""
@@ -261,35 +261,35 @@ msgstr ""
 "compartidos estén disponibles a través de ObexFTP sobre Bluetooth, y recibir "
 "archivos enviados a su equipo a través de ObexPush sobre Bluetooth."
 
-#: C/gnome-user-share.xml:63(title)
+#: C/mateuser-share.xml:63(title)
 msgid "Getting started"
 msgstr "Para empezar"
 
-#: C/gnome-user-share.xml:66(title)
-msgid "Starting gnome-user-share"
+#: C/mateuser-share.xml:66(title)
+msgid "Starting mateuser-share"
 msgstr "Iniciar Compartición de archivos personales"
 
-#: C/gnome-user-share.xml:68(para)
+#: C/mateuser-share.xml:68(para)
 #| msgid ""
-#| "The gnome-user-share service is normally started by <application>gnome-"
+#| "The mateuser-share service is normally started by <application>mate"
 #| "session</application> when you log in. You can change this by opening "
 #| "<menuchoice><guimenu>Preferences</guimenu><guimenu>Sessions</guimenu></"
 #| "menuchoice> in the <guimenu>System</guimenu> menu, and modifying the "
 #| "'User Sharing' entry in the list of startup programs."
 msgid ""
-"The gnome-user-share service is normally started by <application>gnome-"
+"The mateuser-share service is normally started by <application>mate"
 "session</application> when you log in. You can change this by opening "
 "<menuchoice><guimenu>Preferences</guimenu><guimenu>Startup Applications</"
 "guimenu></menuchoice> in the <guimenu>System</guimenu> menu, and modifying "
 "the 'User Sharing' entry in the list of startup programs."
 msgstr ""
 "Generalmente el servicio Compartición de archivos personales lo inicia "
-"<application>gnome-session</application> al iniciar su sesión. Puede cambiar "
+"<application>matesession</application> al iniciar su sesión. Puede cambiar "
 "esto abriendo <menuchoice><guimenu>Preferencias</guimenu><guimenu>Aplicaciones al inicio</"
 "guimenu></menuchoice> en el menú <guimenu>Sistema</guimenu>, y modificar la "
 "entrada «Comparticiones de usuario» en la lista de programas de inicio."
 
-#: C/gnome-user-share.xml:72(para)
+#: C/mateuser-share.xml:72(para)
 msgid ""
 "To configure various aspects of file sharing, use the File Sharing "
 "Preferences, which can be found in the <guimenu>System</guimenu> menu under "
@@ -301,16 +301,16 @@ msgstr ""
 "<guimenu>Sistema</guimenu> bajo <menuchoice><guimenu>Preferencias</"
 "guimenu><guimenu>Compartición de archivos personales</guimenu></menuchoice>."
 
-#: C/gnome-user-share.xml:77(title)
+#: C/mateuser-share.xml:77(title)
 msgid "File Sharing Preferences"
 msgstr "Preferencias de compartición de archivos"
 
-#: C/gnome-user-share.xml:89(title)
+#: C/mateuser-share.xml:89(title)
 msgid "Enabling file sharing over the network"
 msgstr "Activar la compartición de archivos en la red"
 
-#: C/gnome-user-share.xml:90(para) C/gnome-user-share.xml:134(para)
-#: C/gnome-user-share.xml:159(para)
+#: C/mateuser-share.xml:90(para) C/mateuser-share.xml:134(para)
+#: C/mateuser-share.xml:159(para)
 msgid ""
 "Open the File Sharing Preferences using <menuchoice><guimenu>Preferences</"
 "guimenu><guimenu>Personal File Sharing</guimenu></menuchoice> in the "
@@ -320,11 +320,11 @@ msgstr ""
 "<menuchoice><guimenu>Preferencias</guimenu><guimenu>Compartición de archivos "
 "personales</guimenu></menuchoice> en el menú <guimenu>Sistema</guimenu>."
 
-#: C/gnome-user-share.xml:95(title)
+#: C/mateuser-share.xml:95(title)
 msgid "Share Files over the Network"
 msgstr "Compartir archivos en la red"
 
-#: C/gnome-user-share.xml:106(para)
+#: C/mateuser-share.xml:106(para)
 msgid ""
 "Some firewall configurations on the local machine might cause problems with "
 "the advertisment, as well as the access to the shared files. Consult your "
@@ -335,7 +335,7 @@ msgstr ""
 "compartidos. Consulte con el administrador de su sistema para obtener más "
 "detalles."
 
-#: C/gnome-user-share.xml:109(para)
+#: C/mateuser-share.xml:109(para)
 msgid ""
 "Select <guilabel>Never</guilabel> to allow everybody to freely read or write "
 "files in the shared folder."
@@ -343,7 +343,7 @@ msgstr ""
 "Seleccione <guilabel>Nunca</guilabel> para permitir que todo el mundo pueda "
 "leer o escribir archivos en la carpetas compartidas."
 
-#: C/gnome-user-share.xml:115(para)
+#: C/mateuser-share.xml:115(para)
 msgid ""
 "Select <guilabel>Always</guilabel> to require the password to read or write "
 "files in the shared folder."
@@ -351,7 +351,7 @@ msgstr ""
 "Seleccione <guilabel>Siempre</guilabel> para requerir contraseña para leer o "
 "escribir archivos en la carpetas compartidas."
 
-#: C/gnome-user-share.xml:121(para)
+#: C/mateuser-share.xml:121(para)
 msgid ""
 "Select <guilabel>When writing files</guilabel> to allow everybody to freely "
 "read files in the shared folder, but require the password when writing files."
@@ -360,7 +360,7 @@ msgstr ""
 "el mundo pueda leer libremente archivos en las carpetas compartidas, pero se "
 "requiera una contraseña al escribir archivos."
 
-#: C/gnome-user-share.xml:128(para)
+#: C/mateuser-share.xml:128(para)
 msgid ""
 "When you set a password, you have to give the password to all users that you "
 "want to have access to the shared files. Therefore, you should use a "
@@ -370,7 +370,7 @@ msgstr ""
 "los usuarios a los que quiera permitir el acceso a sus archivos compartidos. "
 "Por ello, debería usar una contraseña diferente de aquellas que use."
 
-#: C/gnome-user-share.xml:104(para)
+#: C/mateuser-share.xml:104(para)
 msgid ""
 "To enable file sharing via WebDAV, use the <guilabel>Share public files on "
 "network</guilabel> checkbox. When file sharing it enabled, the controls for "
@@ -385,15 +385,15 @@ msgstr ""
 "el acceso a los archivos compartidos a otro equipo. <placeholder-1/"
 "><placeholder-2/><placeholder-3/>"
 
-#: C/gnome-user-share.xml:133(title)
+#: C/mateuser-share.xml:133(title)
 msgid "Enabling file sharing over Bluetooth"
 msgstr "Activar la compartición por Bluetooth"
 
-#: C/gnome-user-share.xml:139(title)
+#: C/mateuser-share.xml:139(title)
 msgid "Share Files over Bluetooth"
 msgstr "Compartir archivos por Bluetooth"
 
-#: C/gnome-user-share.xml:152(para)
+#: C/mateuser-share.xml:152(para)
 msgid ""
 "When you allow unbonded remote devices to access your shared files, anybody "
 "with a Bluetooth-enabled cell phone in the vicinity of your computer can "
@@ -403,7 +403,7 @@ msgstr ""
 "compartidos, cualquiera con un teléfono Bluetooth cerca de su equipo puede "
 "acceder e incluso modificar sus archivos compartidos."
 
-#: C/gnome-user-share.xml:148(para)
+#: C/mateuser-share.xml:148(para)
 msgid ""
 "To enable file sharing via Bluetooth, use the <guilabel>Share public files "
 "over Bluetooth</guilabel> checkbox. To allow remote Bluetooth devices to "
@@ -423,21 +423,21 @@ msgstr ""
 "selección <guilabel>Requerir que los dispositivos remotos se vinculen con "
 "este equipo</guilabel>.  <placeholder-1/>"
 
-#: C/gnome-user-share.xml:158(title)
+#: C/mateuser-share.xml:158(title)
 msgid "Receiving Files over Bluetooth"
 msgstr "Recibir archivos por Bluetooth"
 
-#: C/gnome-user-share.xml:164(title)
+#: C/mateuser-share.xml:164(title)
 msgid "Receive Files over Bluetooth"
 msgstr "Recibir archivos por Bluetooth"
 
-#: C/gnome-user-share.xml:177(para)
+#: C/mateuser-share.xml:177(para)
 msgid "Select <guilabel>Always</guilabel> to allow any remote device to send files."
 msgstr ""
 "Seleccione <guilabel>Siempre</guilabel> para permitir que cualquier "
 "dispositivo remoto envíe archivos."
 
-#: C/gnome-user-share.xml:184(para)
+#: C/mateuser-share.xml:184(para)
 msgid ""
 "Bonded devices are the ones that were connected to your computer, and had to "
 "enter a PIN code to connect to or from."
@@ -445,7 +445,7 @@ msgstr ""
 "Los dispositivos vinculados son aquellos que se conectaron con su equipo y "
 "hubo que introducir un código PIN para conectarse con ellos o a ellos."
 
-#: C/gnome-user-share.xml:182(para)
+#: C/mateuser-share.xml:182(para)
 msgid ""
 "Select <guilabel>Only for Bonded devices</guilabel> to accept files only "
 "from bonded devices. <placeholder-1/>"
@@ -453,7 +453,7 @@ msgstr ""
 "Seleccione <guilabel>Sólo para dispositivos vinculados</guilabel> para "
 "aceptar archivos sólo de dispositivos vinculados. <placeholder-1/>"
 
-#: C/gnome-user-share.xml:191(para)
+#: C/mateuser-share.xml:191(para)
 msgid ""
 "Devices can be marked as trusted in the <application>bluetooth-properties</"
 "application>'s <guilabel>Known devices</guilabel> section."
@@ -462,7 +462,7 @@ msgstr ""
 "<guilabel>Dispositivos conocidos</guilabel> de <application>Preferencias de "
 "Bluetooth</application>."
 
-#: C/gnome-user-share.xml:189(para)
+#: C/mateuser-share.xml:189(para)
 msgid ""
 "Select <guilabel>Only for Bonded and Trusted devices</guilabel> to accept "
 "files only from bonded devices. <placeholder-1/>"
@@ -471,7 +471,7 @@ msgstr ""
 "guilabel> para aceptar archivos sólo de dispositivos vinculados. "
 "<placeholder-1/>"
 
-#: C/gnome-user-share.xml:173(para)
+#: C/mateuser-share.xml:173(para)
 msgid ""
 "To let remote Bluetooth devices send files to your computer, use the "
 "<guilabel>Receive files in Downloads folder over Bluetooth</guilabel> "
@@ -488,7 +488,7 @@ msgstr ""
 "guilabel> le permitirá determinar qué dispositivos remotos pueden enviar "
 "archivos. <placeholder-1/>"
 
-#: C/gnome-user-share.xml:196(para)
+#: C/mateuser-share.xml:196(para)
 msgid ""
 "Use the <guilabel>Notify about received files</guilabel> checkbox to select "
 "whether you want to be notified whenever a file is received via Bluetooth."
@@ -498,7 +498,7 @@ msgstr ""
 "se reciba un archivo a través de Bluetooth."
 
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
-#: C/gnome-user-share.xml:0(None)
+#: C/mateuser-share.xml:0(None)
 msgid "translator-credits"
-msgstr "Jorge González <[email protected]>, 2009"
+msgstr "Jorge González <[email protected]>, 2009"
 
diff --git a/help/fr/fr.po b/help/fr/fr.po
index b3e982a..5d7236b 100644
--- a/help/fr/fr.po
+++ b/help/fr/fr.po
@@ -1,6 +1,6 @@
-# French translation of gnome-user-share documentation.
+# French translation of mateuser-share documentation.
 # Copyright (C) 2009 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gnome-user-share
+# This file is distributed under the same license as the mateuser-share
 # documentation package.
 #
 # Claude Paroz <[email protected]>, 2009.
@@ -8,11 +8,11 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share doc fr\n"
+"Project-Id-Version: mateuser-share doc fr\n"
 "POT-Creation-Date: 2009-10-21 11:54+0000\n"
 "PO-Revision-Date: 2009-03-24 23:51+0100\n"
 "Last-Translator: Bruno Brouard <[email protected]>\n"
-"Language-Team: GNOME French Team <[email protected]>\n"
+"Language-Team: GNOME French Team <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -119,7 +119,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:81(None)
+#: C/mateuser-share.xml:81(None)
 msgid ""
 "@@image: 'figures/file-sharing-preferences.png'; "
 "md5=7ae616b8043b36be1f4943ba06d8a5ed"
@@ -129,7 +129,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:99(None)
+#: C/mateuser-share.xml:99(None)
 msgid ""
 "@@image: 'figures/sharing-over-the-network.png'; "
 "md5=ee8b44eb1290e4d1ae9b1e8fe8501860"
@@ -139,7 +139,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:143(None)
+#: C/mateuser-share.xml:143(None)
 msgid ""
 "@@image: 'figures/sharing-over-bluetooth.png'; "
 "md5=0a950502b42b1e7fdb9a57d5017e919c"
@@ -149,7 +149,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:168(None)
+#: C/mateuser-share.xml:168(None)
 msgid ""
 "@@image: 'figures/receiving-over-bluetooth.png'; "
 "md5=f292daef06767f39e346b222d3c448be"
@@ -157,88 +157,88 @@ msgstr ""
 "@@image: 'figures/receiving-over-bluetooth.png'; "
 "md5=f292daef06767f39e346b222d3c448be"
 
-#: C/gnome-user-share.xml:10(title)
+#: C/mateuser-share.xml:10(title)
 msgid "Personal File Sharing Manual"
 msgstr "Manuel du partage de fichiers personnels"
 
-#: C/gnome-user-share.xml:12(year) C/gnome-user-share.xml:29(date)
+#: C/mateuser-share.xml:12(year) C/mateuser-share.xml:29(date)
 msgid "2009"
 msgstr "2009"
 
-#: C/gnome-user-share.xml:13(holder)
+#: C/mateuser-share.xml:13(holder)
 msgid "Red Hat, Inc."
 msgstr "Red Hat, Inc."
 
-#: C/gnome-user-share.xml:19(firstname)
+#: C/mateuser-share.xml:19(firstname)
 msgid "Matthias"
 msgstr "Matthias"
 
-#: C/gnome-user-share.xml:20(surname)
+#: C/mateuser-share.xml:20(surname)
 msgid "Clasen"
 msgstr "Clasen"
 
-#: C/gnome-user-share.xml:28(revnumber)
+#: C/mateuser-share.xml:28(revnumber)
 msgid "1.0"
 msgstr "1.0"
 
-#: C/gnome-user-share.xml:31(para)
+#: C/mateuser-share.xml:31(para)
 msgid "Matthias Clasen <email>[email protected]</email>"
 msgstr "Matthias Clasen <email>[email protected]</email>"
 
-#: C/gnome-user-share.xml:35(releaseinfo)
-msgid "This manual describes version 2.26 of gnome-user-share."
-msgstr "Ce manuel documente la version 2.26 de gnome-user-share."
+#: C/mateuser-share.xml:35(releaseinfo)
+msgid "This manual describes version 2.26 of mateuser-share."
+msgstr "Ce manuel documente la version 2.26 de mateuser-share."
 
-#: C/gnome-user-share.xml:37(title)
+#: C/mateuser-share.xml:37(title)
 msgid "Feedback"
 msgstr "Votre avis"
 
-#: C/gnome-user-share.xml:38(para)
+#: C/mateuser-share.xml:38(para)
 msgid ""
-"To report a bug or make a suggestion regarding the gnome-user-share "
+"To report a bug or make a suggestion regarding the mateuser-share "
 "application or this manual, follow the directions in the <ulink url=\"ghelp:"
 "user-guide?feedback-bugs\" type=\"help\">GNOME Feedback Page</ulink>."
 msgstr ""
 "Pour rapporter une anomalie ou émettre une suggestion concernant "
-"l'application gnome-user-share ou ce manuel, procédez comme indiqué sur la "
+"l'application mateuser-share ou ce manuel, procédez comme indiqué sur la "
 "<ulink url=\"ghelp:user-guide?feedback-bugs\" type=\"help\">page de "
 "réactions sur GNOME</ulink>."
 
-#: C/gnome-user-share.xml:41(para)
+#: C/mateuser-share.xml:41(para)
 msgid ""
-"gnome-user-share is a session service that enables easy sharing of files "
+"mateuser-share is a session service that enables easy sharing of files "
 "between several computers."
 msgstr ""
-"gnome-user-share est un service de session qui permet de partager facilement "
+"mateuser-share est un service de session qui permet de partager facilement "
 "des fichiers entre plusieurs ordinateurs."
 
-#: C/gnome-user-share.xml:45(primary)
-msgid "gnome-user-share"
-msgstr "gnome-user-share"
+#: C/mateuser-share.xml:45(primary)
+msgid "mateuser-share"
+msgstr "mateuser-share"
 
-#: C/gnome-user-share.xml:46(primary)
+#: C/mateuser-share.xml:46(primary)
 msgid "file sharing"
 msgstr "partage de fichiers"
 
-#: C/gnome-user-share.xml:47(primary)
+#: C/mateuser-share.xml:47(primary)
 msgid "sharing"
 msgstr "partage"
 
-#: C/gnome-user-share.xml:50(title)
+#: C/mateuser-share.xml:50(title)
 msgid "Introduction"
 msgstr "Introduction"
 
-#: C/gnome-user-share.xml:51(para)
+#: C/mateuser-share.xml:51(para)
 msgid ""
-"gnome-user-share is a session service that exports the contents of the "
+"mateuser-share is a session service that exports the contents of the "
 "<filename>Public</filename> folder in your home directory, so that they can "
 "easily be accessed from other computers on the same local network. On the "
 "other computers, the shared folder will appear with a name like "
 "'<replaceable>user</replaceable>'s shared files' in the "
-"<application>nautilus</application> Network window, where <replaceable>user</"
+"<application>caja</application> Network window, where <replaceable>user</"
 "replaceable> will be replaced by your user name."
 msgstr ""
-"gnome-user-share est un service de session qui exporte le contenu du dossier "
+"mateuser-share est un service de session qui exporte le contenu du dossier "
 "<filename>Public</filename> de votre dossier personnel, afin que l'on puisse "
 "facilement accéder aux fichiers qui s'y trouvent depuis d'autres ordinateurs "
 "du réseau local. Sur les autres ordinateurs, le nom du dossier partagé "
@@ -247,49 +247,49 @@ msgstr ""
 "application>, où <replaceable>utilisateur</replaceable> est remplacé par "
 "votre nom d'utilisateur."
 
-#: C/gnome-user-share.xml:54(para)
+#: C/mateuser-share.xml:54(para)
 msgid ""
-"gnome-user-share uses a WebDAV server to share the <filename>Public</"
+"mateuser-share uses a WebDAV server to share the <filename>Public</"
 "filename> folder, and advertises the share on the local network using mDNS."
 msgstr ""
-"gnome-user-share utilise un serveur WebDAV pour partager le dossier "
+"mateuser-share utilise un serveur WebDAV pour partager le dossier "
 "<filename>Public</filename> et il publie le partage sur le réseau local en "
 "utilisant mDNS."
 
-#: C/gnome-user-share.xml:57(para)
+#: C/mateuser-share.xml:57(para)
 msgid ""
-"Additionally, gnome-user-share can make the shared files available via "
+"Additionally, mateuser-share can make the shared files available via "
 "ObexFTP over Bluetooth, and receive files that are sent to your computer via "
 "Bluetooth via ObexPush."
 msgstr ""
-"De plus, gnome-user-share peut aussi rendre disponible les fichiers partagés "
+"De plus, mateuser-share peut aussi rendre disponible les fichiers partagés "
 "par ObexFTP sur Bluetooth et recevoir les fichiers envoyés par Bluetooth à "
 "votre ordinateur via ObexPush."
 
-#: C/gnome-user-share.xml:63(title)
+#: C/mateuser-share.xml:63(title)
 msgid "Getting started"
 msgstr "Premiers pas"
 
-#: C/gnome-user-share.xml:66(title)
-msgid "Starting gnome-user-share"
-msgstr "Lancement de gnome-user-share"
+#: C/mateuser-share.xml:66(title)
+msgid "Starting mateuser-share"
+msgstr "Lancement de mateuser-share"
 
-#: C/gnome-user-share.xml:68(para)
+#: C/mateuser-share.xml:68(para)
 msgid ""
-"The gnome-user-share service is normally started by <application>gnome-"
+"The mateuser-share service is normally started by <application>mate"
 "session</application> when you log in. You can change this by opening "
 "<menuchoice><guimenu>Preferences</guimenu><guimenu>Startup Applications</"
 "guimenu></menuchoice> in the <guimenu>System</guimenu> menu, and modifying "
 "the 'User Sharing' entry in the list of startup programs."
 msgstr ""
-"Le service gnome-user-share est normalement lancé par <application>gnome-"
+"Le service mateuser-share est normalement lancé par <application>mate"
 "session</application> lors de votre connexion. Vous pouvez changer cela en "
 "ouvrant <menuchoice><guimenu>Préférences</guimenu><guimenu>Applications au démarrage</"
 "guimenu></menuchoice> dans le menu <guimenu>Système</guimenu> et en "
 "modifiant la ligne « Partage utilisateur » dans la liste des programmes au "
 "démarrage."
 
-#: C/gnome-user-share.xml:72(para)
+#: C/mateuser-share.xml:72(para)
 msgid ""
 "To configure various aspects of file sharing, use the File Sharing "
 "Preferences, which can be found in the <guimenu>System</guimenu> menu under "
@@ -301,16 +301,16 @@ msgstr ""
 "<guimenu>Système</guimenu>, sous <menuchoice><guimenu>Préférences</"
 "guimenu><guimenu>Partage de fichiers personnels</guimenu></menuchoice>."
 
-#: C/gnome-user-share.xml:77(title)
+#: C/mateuser-share.xml:77(title)
 msgid "File Sharing Preferences"
 msgstr "Préférences du partage de fichiers"
 
-#: C/gnome-user-share.xml:89(title)
+#: C/mateuser-share.xml:89(title)
 msgid "Enabling file sharing over the network"
 msgstr "Activation du partage de fichiers sur le réseau"
 
-#: C/gnome-user-share.xml:90(para) C/gnome-user-share.xml:134(para)
-#: C/gnome-user-share.xml:159(para)
+#: C/mateuser-share.xml:90(para) C/mateuser-share.xml:134(para)
+#: C/mateuser-share.xml:159(para)
 msgid ""
 "Open the File Sharing Preferences using <menuchoice><guimenu>Preferences</"
 "guimenu><guimenu>Personal File Sharing</guimenu></menuchoice> in the "
@@ -320,11 +320,11 @@ msgstr ""
 "<menuchoice><guimenu>Préférences</guimenu><guimenu>Partage de fichiers "
 "personnels</guimenu></menuchoice> dans le menu <guimenu>Système</guimenu>."
 
-#: C/gnome-user-share.xml:95(title)
+#: C/mateuser-share.xml:95(title)
 msgid "Share Files over the Network"
 msgstr "Partage de fichiers sur le réseau"
 
-#: C/gnome-user-share.xml:106(para)
+#: C/mateuser-share.xml:106(para)
 msgid ""
 "Some firewall configurations on the local machine might cause problems with "
 "the advertisment, as well as the access to the shared files. Consult your "
@@ -334,7 +334,7 @@ msgstr ""
 "posent problème pour la publication et pour l'accès aux fichiers partagés. "
 "Consultez votre administrateur système pour plus de détails."
 
-#: C/gnome-user-share.xml:109(para)
+#: C/mateuser-share.xml:109(para)
 msgid ""
 "Select <guilabel>Never</guilabel> to allow everybody to freely read or write "
 "files in the shared folder."
@@ -342,7 +342,7 @@ msgstr ""
 "Choisissez <guilabel>Jamais</guilabel> pour permettre à tout le monde de "
 "lire et écrire librement des fichiers dans le dossier partagé."
 
-#: C/gnome-user-share.xml:115(para)
+#: C/mateuser-share.xml:115(para)
 msgid ""
 "Select <guilabel>Always</guilabel> to require the password to read or write "
 "files in the shared folder."
@@ -350,7 +350,7 @@ msgstr ""
 "Choisissez <guilabel>Toujours</guilabel> pour exiger le mot de passe avant "
 "de pouvoir lire et écrire des fichiers dans le dossier partagé."
 
-#: C/gnome-user-share.xml:121(para)
+#: C/mateuser-share.xml:121(para)
 msgid ""
 "Select <guilabel>When writing files</guilabel> to allow everybody to freely "
 "read files in the shared folder, but require the password when writing files."
@@ -360,7 +360,7 @@ msgstr ""
 "exiger le mot de passe s'ils souhaitent écrire (créer, modifier ou effacer) "
 "des fichiers."
 
-#: C/gnome-user-share.xml:128(para)
+#: C/mateuser-share.xml:128(para)
 msgid ""
 "When you set a password, you have to give the password to all users that you "
 "want to have access to the shared files. Therefore, you should use a "
@@ -371,7 +371,7 @@ msgstr ""
 "conséquent, vous devez utiliser un mot de passe différent des autres mots de "
 "passe que vous utilisez."
 
-#: C/gnome-user-share.xml:104(para)
+#: C/mateuser-share.xml:104(para)
 msgid ""
 "To enable file sharing via WebDAV, use the <guilabel>Share public files on "
 "network</guilabel> checkbox. When file sharing it enabled, the controls for "
@@ -386,15 +386,15 @@ msgstr ""
 "partir d'un autre ordinateur. <placeholder-1/><placeholder-2/><placeholder-3/"
 ">"
 
-#: C/gnome-user-share.xml:133(title)
+#: C/mateuser-share.xml:133(title)
 msgid "Enabling file sharing over Bluetooth"
 msgstr "Activation du partage de fichiers par Bluetooth"
 
-#: C/gnome-user-share.xml:139(title)
+#: C/mateuser-share.xml:139(title)
 msgid "Share Files over Bluetooth"
 msgstr "Partage de fichiers par Bluetooth"
 
-#: C/gnome-user-share.xml:152(para)
+#: C/mateuser-share.xml:152(para)
 msgid ""
 "When you allow unbonded remote devices to access your shared files, anybody "
 "with a Bluetooth-enabled cell phone in the vicinity of your computer can "
@@ -405,7 +405,7 @@ msgstr ""
 "ordinateur avec un téléphone portable où Bluetooth est activé peut accéder "
 "et peut-être même modifier vos fichiers partagés."
 
-#: C/gnome-user-share.xml:148(para)
+#: C/mateuser-share.xml:148(para)
 msgid ""
 "To enable file sharing via Bluetooth, use the <guilabel>Share public files "
 "over Bluetooth</guilabel> checkbox. To allow remote Bluetooth devices to "
@@ -425,22 +425,22 @@ msgstr ""
 "que les périphériques externes se lient à cet ordinateur</guilabel>. "
 "<placeholder-1/>"
 
-#: C/gnome-user-share.xml:158(title)
+#: C/mateuser-share.xml:158(title)
 msgid "Receiving Files over Bluetooth"
 msgstr "Réception de fichiers par Bluetooth"
 
-#: C/gnome-user-share.xml:164(title)
+#: C/mateuser-share.xml:164(title)
 msgid "Receive Files over Bluetooth"
 msgstr "Réception de fichiers par Bluetooth"
 
-#: C/gnome-user-share.xml:177(para)
+#: C/mateuser-share.xml:177(para)
 msgid ""
 "Select <guilabel>Always</guilabel> to allow any remote device to send files."
 msgstr ""
 "Choisissez <guilabel>Toujours</guilabel> pour permettre à n'importe quel "
 "périphérique externe d'envoyer des fichiers."
 
-#: C/gnome-user-share.xml:184(para)
+#: C/mateuser-share.xml:184(para)
 msgid ""
 "Bonded devices are the ones that were connected to your computer, and had to "
 "enter a PIN code to connect to or from."
@@ -448,7 +448,7 @@ msgstr ""
 "Les périphériques liés sont ceux qui ont déjà été connectés à votre "
 "ordinateur ce qui a nécessité la saisie d'un code PIN lors de leur connexion."
 
-#: C/gnome-user-share.xml:182(para)
+#: C/mateuser-share.xml:182(para)
 msgid ""
 "Select <guilabel>Only for Bonded devices</guilabel> to accept files only "
 "from bonded devices. <placeholder-1/>"
@@ -457,7 +457,7 @@ msgstr ""
 "n'accepter que les fichiers en provenance de périphériques liés. "
 "<placeholder-1/>"
 
-#: C/gnome-user-share.xml:191(para)
+#: C/mateuser-share.xml:191(para)
 msgid ""
 "Devices can be marked as trusted in the <application>bluetooth-properties</"
 "application>'s <guilabel>Known devices</guilabel> section."
@@ -466,7 +466,7 @@ msgstr ""
 "<guilabel>Périphériques connus</guilabel> de <application>bluetooth-"
 "properties</application>."
 
-#: C/gnome-user-share.xml:189(para)
+#: C/mateuser-share.xml:189(para)
 msgid ""
 "Select <guilabel>Only for Bonded and Trusted devices</guilabel> to accept "
 "files only from bonded devices. <placeholder-1/>"
@@ -475,7 +475,7 @@ msgstr ""
 "guilabel> pour n'accepter que les fichiers des périphériques de confiance et "
 "liés. <placeholder-1/>"
 
-#: C/gnome-user-share.xml:173(para)
+#: C/mateuser-share.xml:173(para)
 msgid ""
 "To let remote Bluetooth devices send files to your computer, use the "
 "<guilabel>Receive files in Downloads folder over Bluetooth</guilabel> "
@@ -493,7 +493,7 @@ msgstr ""
 "périphériques distants sont autorisés à envoyer des fichiers. <placeholder-1/"
 ">"
 
-#: C/gnome-user-share.xml:196(para)
+#: C/mateuser-share.xml:196(para)
 msgid ""
 "Use the <guilabel>Notify about received files</guilabel> checkbox to select "
 "whether you want to be notified whenever a file is received via Bluetooth."
@@ -503,7 +503,7 @@ msgstr ""
 "Bluetooth."
 
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
-#: C/gnome-user-share.xml:0(None)
+#: C/mateuser-share.xml:0(None)
 msgid "translator-credits"
 msgstr ""
 "Claude Paroz <[email protected]>, 2009\n"
diff --git a/help/it/it.po b/help/it/it.po
index 8f94ea8..899af82 100644
--- a/help/it/it.po
+++ b/help/it/it.po
@@ -1,12 +1,12 @@
-# Italian translation of gnome-user-share manual
+# Italian translation of mateuser-share manual
 # Copyright (C) 2009 The Free Software Foundation, Inc.
-# This file is distributed under the same license as the gnome-system-tool package
+# This file is distributed under the same license as the matesystem-tool package
 # Sergio Durzu <[email protected]>, 2009
 #
 # Milo Casagrande <[email protected]>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share 2.26\n"
+"Project-Id-Version: mateuser-share 2.26\n"
 "POT-Creation-Date: 2009-04-17 11:53+0000\n"
 "PO-Revision-Date: 2009-08-16 17:11+0200\n"
 "Last-Translator: Milo Casagrande <[email protected]>\n"
@@ -108,7 +108,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:81(None)
+#: C/mateuser-share.xml:81(None)
 msgid ""
 "@@image: 'figures/file-sharing-preferences.png'; "
 "md5=7ae616b8043b36be1f4943ba06d8a5ed"
@@ -116,7 +116,7 @@ msgstr "Fatto."
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:99(None)
+#: C/mateuser-share.xml:99(None)
 msgid ""
 "@@image: 'figures/sharing-over-the-network.png'; "
 "md5=ee8b44eb1290e4d1ae9b1e8fe8501860"
@@ -124,7 +124,7 @@ msgstr "Fatto."
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:143(None)
+#: C/mateuser-share.xml:143(None)
 msgid ""
 "@@image: 'figures/sharing-over-bluetooth.png'; "
 "md5=0a950502b42b1e7fdb9a57d5017e919c"
@@ -132,52 +132,52 @@ msgstr "Fatto."
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:168(None)
+#: C/mateuser-share.xml:168(None)
 msgid ""
 "@@image: 'figures/receiving-over-bluetooth.png'; "
 "md5=f292daef06767f39e346b222d3c448be"
 msgstr "Fatto."
 
-#: C/gnome-user-share.xml:10(title)
+#: C/mateuser-share.xml:10(title)
 msgid "Personal File Sharing Manual"
 msgstr "Manuale di Condivisione di file personali"
 
-#: C/gnome-user-share.xml:12(year) C/gnome-user-share.xml:29(date)
+#: C/mateuser-share.xml:12(year) C/mateuser-share.xml:29(date)
 msgid "2009"
 msgstr "2009"
 
-#: C/gnome-user-share.xml:13(holder)
+#: C/mateuser-share.xml:13(holder)
 msgid "Red Hat, Inc."
 msgstr "Red Hat, Inc."
 
-#: C/gnome-user-share.xml:19(firstname)
+#: C/mateuser-share.xml:19(firstname)
 msgid "Matthias"
 msgstr "Matthias"
 
-#: C/gnome-user-share.xml:20(surname)
+#: C/mateuser-share.xml:20(surname)
 msgid "Clasen"
 msgstr "Clasen"
 
-#: C/gnome-user-share.xml:28(revnumber)
+#: C/mateuser-share.xml:28(revnumber)
 msgid "1.0"
 msgstr "1.0"
 
-#: C/gnome-user-share.xml:31(para)
+#: C/mateuser-share.xml:31(para)
 msgid "Matthias Clasen <email>[email protected]</email>"
 msgstr "Matthias Clasen <email>[email protected]</email>"
 
-#: C/gnome-user-share.xml:35(releaseinfo)
-msgid "This manual describes version 2.26 of gnome-user-share."
+#: C/mateuser-share.xml:35(releaseinfo)
+msgid "This manual describes version 2.26 of mateuser-share."
 msgstr ""
 "Questo manuale riguarda la versione 2.26 di Condivisione di file personali"
 
-#: C/gnome-user-share.xml:37(title)
+#: C/mateuser-share.xml:37(title)
 msgid "Feedback"
 msgstr "Commenti"
 
-#: C/gnome-user-share.xml:38(para)
+#: C/mateuser-share.xml:38(para)
 msgid ""
-"To report a bug or make a suggestion regarding the gnome-user-share "
+"To report a bug or make a suggestion regarding the mateuser-share "
 "application or this manual, follow the directions in the <ulink url=\"ghelp:"
 "user-guide?feedback-bugs\" type=\"help\">GNOME Feedback Page</ulink>."
 msgstr ""
@@ -186,41 +186,41 @@ msgstr ""
 "url=\"ghelp:user-guide?feedback-bugs\" type=\"help\">pagina dei commenti di "
 "GNOME</ulink>."
 
-#: C/gnome-user-share.xml:41(para)
+#: C/mateuser-share.xml:41(para)
 msgid ""
-"gnome-user-share is a session service that enables easy sharing of files "
+"mateuser-share is a session service that enables easy sharing of files "
 "between several computers."
 msgstr ""
 "L'applicazione Condivisione di file personali è un servizio di sessione che "
 "abilita una facile condivisione di file tra diversi computer."
 
-#: C/gnome-user-share.xml:45(primary)
-msgid "gnome-user-share"
-msgstr "gnome-user-share"
+#: C/mateuser-share.xml:45(primary)
+msgid "mateuser-share"
+msgstr "mateuser-share"
 
-#: C/gnome-user-share.xml:46(primary)
+#: C/mateuser-share.xml:46(primary)
 msgid "file sharing"
 msgstr "condivisione file"
 
-#: C/gnome-user-share.xml:47(primary)
+#: C/mateuser-share.xml:47(primary)
 msgid "sharing"
 msgstr "condivisione"
 
-#: C/gnome-user-share.xml:50(title)
+#: C/mateuser-share.xml:50(title)
 msgid "Introduction"
 msgstr "Introduzione"
 
-#: C/gnome-user-share.xml:51(para)
+#: C/mateuser-share.xml:51(para)
 msgid ""
-"gnome-user-share is a session service that exports the contents of the "
+"mateuser-share is a session service that exports the contents of the "
 "<filename>Public</filename> folder in your home directory, so that they can "
 "easily be accessed from other computers on the same local network. On the "
 "other computers, the shared folder will appear with a name like "
 "'<replaceable>user</replaceable>'s shared files' in the "
-"<application>nautilus</application> Network window, where <replaceable>user</"
+"<application>caja</application> Network window, where <replaceable>user</"
 "replaceable> will be replaced by your user name."
 msgstr ""
-"L'applicazione gnome-user-share un servizio di sessione che esporta i "
+"L'applicazione mateuser-share un servizio di sessione che esporta i "
 "contenuti della cartella <filename>Pubblici</filename> nella cartella home "
 "dell'utente, così che possano essere facilmente accessibili da altri "
 "computer nella stessa rete locale. Negli altri computer, la cartella "
@@ -229,18 +229,18 @@ msgstr ""
 "replaceable>», dove <replaceable>utente</replaceable> sarà sostituito dal "
 "nome dell'utente."
 
-#: C/gnome-user-share.xml:54(para)
+#: C/mateuser-share.xml:54(para)
 msgid ""
-"gnome-user-share uses a WebDAV server to share the <filename>Public</"
+"mateuser-share uses a WebDAV server to share the <filename>Public</"
 "filename> folder, and advertises the share on the local network using mDNS."
 msgstr ""
-"L'applicazione gnome-user-share di file personali utilizza un server WebDAV "
+"L'applicazione mateuser-share di file personali utilizza un server WebDAV "
 "per condividere la cartella <filename>Pubblici</filename> e notifica la "
 "condivisione nella rete locale utilizzando mDNS."
 
-#: C/gnome-user-share.xml:57(para)
+#: C/mateuser-share.xml:57(para)
 msgid ""
-"Additionally, gnome-user-share can make the shared files available via "
+"Additionally, mateuser-share can make the shared files available via "
 "ObexFTP over Bluetooth, and receive files that are sent to your computer via "
 "Bluetooth via ObexPush."
 msgstr ""
@@ -248,30 +248,30 @@ msgstr ""
 "disponibili i file condivisi via ObexFTP tramite Bluetooth e ricevere file "
 "che sono mandati al computer tramite Bluetooth con ObexPush."
 
-#: C/gnome-user-share.xml:63(title)
+#: C/mateuser-share.xml:63(title)
 msgid "Getting started"
 msgstr "Per iniziare"
 
-#: C/gnome-user-share.xml:66(title)
-msgid "Starting gnome-user-share"
+#: C/mateuser-share.xml:66(title)
+msgid "Starting mateuser-share"
 msgstr "Avviare Condivisione di file personali"
 
-#: C/gnome-user-share.xml:68(para)
+#: C/mateuser-share.xml:68(para)
 msgid ""
-"The gnome-user-share service is normally started by <application>gnome-"
+"The mateuser-share service is normally started by <application>mate"
 "session</application> when you log in. You can change this by opening "
 "<menuchoice><guimenu>Preferences</guimenu><guimenu>Sessions</guimenu></"
 "menuchoice> in the <guimenu>System</guimenu> menu, and modifying the 'User "
 "Sharing' entry in the list of startup programs."
 msgstr ""
 "Il servizio Condivisione di file personali è normalmente avviato da "
-"<application>gnome-session</application> quando si effettua l'accesso. È "
+"<application>matesession</application> quando si effettua l'accesso. È "
 "possibile modificare questa modalità di avvio scegliendo "
 "<menuchoice><guimenu>Preferenze</guimenu><guimenu>Sessione</guimenu></"
 "menuchoice> dal menù <guimenu>Sistema</guimenu> e modificare la voce "
 "«Condivisione utente» nell'elenco dei programmi da eseguire all'avvio."
 
-#: C/gnome-user-share.xml:72(para)
+#: C/mateuser-share.xml:72(para)
 msgid ""
 "To configure various aspects of file sharing, use the File Sharing "
 "Preferences, which can be found in the <guimenu>System</guimenu> menu under "
@@ -283,16 +283,16 @@ msgstr ""
 "<menuchoice><guimenu>Sistema</guimenu><guimenu>Preferenze</"
 "guimenu><guimenu>Condivisione file personali</guimenu></menuchoice>."
 
-#: C/gnome-user-share.xml:77(title)
+#: C/mateuser-share.xml:77(title)
 msgid "File Sharing Preferences"
 msgstr "Preferenze di condivisione dei file"
 
-#: C/gnome-user-share.xml:89(title)
+#: C/mateuser-share.xml:89(title)
 msgid "Enabling file sharing over the network"
 msgstr "Abilitare la condivisione di file attraverso la rete"
 
-#: C/gnome-user-share.xml:90(para) C/gnome-user-share.xml:134(para)
-#: C/gnome-user-share.xml:159(para)
+#: C/mateuser-share.xml:90(para) C/mateuser-share.xml:134(para)
+#: C/mateuser-share.xml:159(para)
 msgid ""
 "Open the File Sharing Preferences using <menuchoice><guimenu>Preferences</"
 "guimenu><guimenu>Personal File Sharing</guimenu></menuchoice> in the "
@@ -302,11 +302,11 @@ msgstr ""
 "<menuchoice><guimenu>Preferenze</guimenu><guimenu>Condivisione di file "
 "personali</guimenu></menuchoice> dal menù <guimenu>Sistema</guimenu>."
 
-#: C/gnome-user-share.xml:95(title)
+#: C/mateuser-share.xml:95(title)
 msgid "Share Files over the Network"
 msgstr "Condividere file attraverso la Rete"
 
-#: C/gnome-user-share.xml:106(para)
+#: C/mateuser-share.xml:106(para)
 msgid ""
 "Some firewall configurations on the local machine might cause problems with "
 "the advertisment, as well as the access to the shared files. Consult your "
@@ -316,7 +316,7 @@ msgstr ""
 "alla notifica, come all'accesso ai file condivisi. Consultare "
 "l'amministratore del sistema per ulteriori dettagli."
 
-#: C/gnome-user-share.xml:109(para)
+#: C/mateuser-share.xml:109(para)
 msgid ""
 "Select <guilabel>Never</guilabel> to allow everybody to freely read or write "
 "files in the shared folder."
@@ -324,7 +324,7 @@ msgstr ""
 "Selezionare <guilabel>Mai</guilabel> per permettere a tutti di leggere o "
 "scrivere file nella cartella condivisa."
 
-#: C/gnome-user-share.xml:115(para)
+#: C/mateuser-share.xml:115(para)
 msgid ""
 "Select <guilabel>Always</guilabel> to require the password to read or write "
 "files in the shared folder."
@@ -332,7 +332,7 @@ msgstr ""
 "Selezionare <guilabel>Sempre</guilabel> per richiedere la password per "
 "leggere o scrivere file nella cartella condivisa."
 
-#: C/gnome-user-share.xml:121(para)
+#: C/mateuser-share.xml:121(para)
 msgid ""
 "Select <guilabel>When writing files</guilabel> to allow everybody to freely "
 "read files in the shared folder, but require the password when writing files."
@@ -341,7 +341,7 @@ msgstr ""
 "tutti di leggere liberamente i file nella cartella condivisa e per "
 "richiedere la password per scrivere i file."
 
-#: C/gnome-user-share.xml:128(para)
+#: C/mateuser-share.xml:128(para)
 msgid ""
 "When you set a password, you have to give the password to all users that you "
 "want to have access to the shared files. Therefore, you should use a "
@@ -351,7 +351,7 @@ msgstr ""
 "utenti a cui si vuole dare accesso ai file condivisi. Pertanto, si dovrebbe "
 "usare una password diversa rispetto alle altre password utilizzate."
 
-#: C/gnome-user-share.xml:104(para)
+#: C/mateuser-share.xml:104(para)
 msgid ""
 "To enable file sharing via WebDAV, use the <guilabel>Share public files on "
 "network</guilabel> checkbox. When file sharing it enabled, the controls for "
@@ -366,15 +366,15 @@ msgstr ""
 "prima che un utente di un altro computer abbia l'autorizzazione ad accedere "
 "ai file condivisi. <placeholder-1/><placeholder-2/><placeholder-3/>"
 
-#: C/gnome-user-share.xml:133(title)
+#: C/mateuser-share.xml:133(title)
 msgid "Enabling file sharing over Bluetooth"
 msgstr "Abilitare la condivisione dei file tramite Bluetooth"
 
-#: C/gnome-user-share.xml:139(title)
+#: C/mateuser-share.xml:139(title)
 msgid "Share Files over Bluetooth"
 msgstr "Condividere file attraverso Bluetooth"
 
-#: C/gnome-user-share.xml:152(para)
+#: C/mateuser-share.xml:152(para)
 msgid ""
 "When you allow unbonded remote devices to access your shared files, anybody "
 "with a Bluetooth-enabled cell phone in the vicinity of your computer can "
@@ -384,7 +384,7 @@ msgstr ""
 "condivisi, chiunque con un telefono cellulare con il Bluetooth attivo nelle "
 "vicinanze del computer può accedere e forse modificare i file condivisi."
 
-#: C/gnome-user-share.xml:148(para)
+#: C/mateuser-share.xml:148(para)
 msgid ""
 "To enable file sharing via Bluetooth, use the <guilabel>Share public files "
 "over Bluetooth</guilabel> checkbox. To allow remote Bluetooth devices to "
@@ -404,22 +404,22 @@ msgstr ""
 "ai dispositivi remoti di associarsi con questo computer</guilabel>. "
 "<placeholder-1/>"
 
-#: C/gnome-user-share.xml:158(title)
+#: C/mateuser-share.xml:158(title)
 msgid "Receiving Files over Bluetooth"
 msgstr "Ricevere file tramite Bluetooth"
 
-#: C/gnome-user-share.xml:164(title)
+#: C/mateuser-share.xml:164(title)
 msgid "Receive Files over Bluetooth"
 msgstr "Ricevere file tramite Bluetooth"
 
-#: C/gnome-user-share.xml:177(para)
+#: C/mateuser-share.xml:177(para)
 msgid ""
 "Select <guilabel>Always</guilabel> to allow any remote device to send files."
 msgstr ""
 "Selezionare <guilabel>Sempre</guilabel> per permettere a qualsiasi "
 "dispositivo remoto di mandare file."
 
-#: C/gnome-user-share.xml:184(para)
+#: C/mateuser-share.xml:184(para)
 msgid ""
 "Bonded devices are the ones that were connected to your computer, and had to "
 "enter a PIN code to connect to or from."
@@ -427,7 +427,7 @@ msgstr ""
 "I dispositivi associati sono quelli che sono stati connessi al computer e "
 "per cui è stato necessario inserire un codice PIN per connettervisi."
 
-#: C/gnome-user-share.xml:182(para)
+#: C/mateuser-share.xml:182(para)
 msgid ""
 "Select <guilabel>Only for Bonded devices</guilabel> to accept files only "
 "from bonded devices. <placeholder-1/>"
@@ -435,7 +435,7 @@ msgstr ""
 "Selezionare <guilabel>Solo per dispositivi associati</guilabel> per "
 "accettare file solo da dispositivi associati. <placeholder-1/>"
 
-#: C/gnome-user-share.xml:191(para)
+#: C/mateuser-share.xml:191(para)
 msgid ""
 "Devices can be marked as trusted in the <application>bluetooth-properties</"
 "application>'s <guilabel>Known devices</guilabel> section."
@@ -444,7 +444,7 @@ msgstr ""
 "<guilabel>Dispositivi conosciuti</guilabel> delle <application>Proprietà "
 "Bluetooth</application>."
 
-#: C/gnome-user-share.xml:189(para)
+#: C/mateuser-share.xml:189(para)
 msgid ""
 "Select <guilabel>Only for Bonded and Trusted devices</guilabel> to accept "
 "files only from bonded devices. <placeholder-1/>"
@@ -452,7 +452,7 @@ msgstr ""
 "Selezionare <guilabel>Solo per dispositivi associati e sicuri</guilabel> per "
 "accettare file solo da dispositvi associati. <placeholder-1/>"
 
-#: C/gnome-user-share.xml:173(para)
+#: C/mateuser-share.xml:173(para)
 msgid ""
 "To let remote Bluetooth devices send files to your computer, use the "
 "<guilabel>Receive files in Downloads folder over Bluetooth</guilabel> "
@@ -469,7 +469,7 @@ msgstr ""
 "<guilabel>Accettare file</guilabel> permette di indicare quali dispositivi "
 "remoti hanno il permesso di mandare file. <placeholder-1/>"
 
-#: C/gnome-user-share.xml:196(para)
+#: C/mateuser-share.xml:196(para)
 msgid ""
 "Use the <guilabel>Notify about received files</guilabel> checkbox to select "
 "whether you want to be notified whenever a file is received via Bluetooth."
@@ -479,6 +479,6 @@ msgstr ""
 "si è ricevuto un file tramite Bluetooth."
 
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: C/gnome-user-share.xml:0(None)
+#: C/mateuser-share.xml:0(None)
 msgid "translator-credits"
 msgstr "Sergio Durzu <[email protected]>, 2009"
diff --git a/help/mate-user-share.omf.in b/help/mate-user-share.omf.in
new file mode 100644
index 0000000..f82137b
--- /dev/null
+++ b/help/mate-user-share.omf.in
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<omf>
+  <resource>
+    <subject category="MATE|Internet"/>
+    <type>
+      user's guide
+    </type>
+    <relation seriesid="04f734df-8acb-c0b2-8ba6-5dc2193da6ae60"/>
+    <rights type="GNU FDL" license.version="1.1" holder="Red Hat, Inc."/>
+  </resource>        
+</omf>
diff --git a/help/po/sl.po b/help/po/sl.po
index 1762058..0a5b05e 100644
--- a/help/po/sl.po
+++ b/help/po/sl.po
@@ -1,16 +1,16 @@
-# Slovenian translations for gnome-user-share help.
-# Copyright (C) 2009 gnome-user-share COPYRIGHT HOLDER
-# This file is distributed under the same license as the gnome-user-share package.
+# Slovenian translations for mateuser-share help.
+# Copyright (C) 2009 mateuser-share COPYRIGHT HOLDER
+# This file is distributed under the same license as the mateuser-share package.
 #
 # Ime Priimek <email>, leto
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share help master\n"
+"Project-Id-Version: mateuser-share help master\n"
 "POT-Creation-Date: 2010-10-11 14:49+0000\n"
 "PO-Revision-Date: 2010-10-13 11:35+0100\n"
-"Last-Translator: Matej Urbančič <[email protected]>\n"
-"Language-Team: Slovenian GNOME Translation Team <[email protected]>\n"
+"Last-Translator: Matej Urbančič <[email protected]>\n"
+"Language-Team: Slovenian GNOME Translation Team <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -41,213 +41,213 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:81(None)
+#: C/mateuser-share.xml:81(None)
 msgid "@@image: 'figures/file-sharing-preferences.png'; md5=7ae616b8043b36be1f4943ba06d8a5ed"
 msgstr "@@image: 'figures/file-sharing-preferences.png'; md5=7ae616b8043b36be1f4943ba06d8a5ed"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:99(None)
+#: C/mateuser-share.xml:99(None)
 msgid "@@image: 'figures/sharing-over-the-network.png'; md5=ee8b44eb1290e4d1ae9b1e8fe8501860"
 msgstr "@@image: 'figures/sharing-over-the-network.png'; md5=ee8b44eb1290e4d1ae9b1e8fe8501860"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:143(None)
+#: C/mateuser-share.xml:143(None)
 msgid "@@image: 'figures/sharing-over-bluetooth.png'; md5=0a950502b42b1e7fdb9a57d5017e919c"
 msgstr "@@image: 'figures/sharing-over-bluetooth.png'; md5=0a950502b42b1e7fdb9a57d5017e919c"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:168(None)
+#: C/mateuser-share.xml:168(None)
 msgid "@@image: 'figures/receiving-over-bluetooth.png'; md5=f292daef06767f39e346b222d3c448be"
 msgstr "@@image: 'figures/receiving-over-bluetooth.png'; md5=f292daef06767f39e346b222d3c448be"
 
-#: C/gnome-user-share.xml:10(title)
+#: C/mateuser-share.xml:10(title)
 msgid "Personal File Sharing Manual"
 msgstr ""
 
-#: C/gnome-user-share.xml:12(year)
-#: C/gnome-user-share.xml:29(date)
+#: C/mateuser-share.xml:12(year)
+#: C/mateuser-share.xml:29(date)
 msgid "2009"
 msgstr "2009"
 
-#: C/gnome-user-share.xml:13(holder)
+#: C/mateuser-share.xml:13(holder)
 msgid "Red Hat, Inc."
 msgstr ""
 
-#: C/gnome-user-share.xml:19(firstname)
+#: C/mateuser-share.xml:19(firstname)
 msgid "Matthias"
 msgstr ""
 
-#: C/gnome-user-share.xml:20(surname)
+#: C/mateuser-share.xml:20(surname)
 msgid "Clasen"
 msgstr ""
 
-#: C/gnome-user-share.xml:28(revnumber)
+#: C/mateuser-share.xml:28(revnumber)
 msgid "1.0"
 msgstr "1.0"
 
-#: C/gnome-user-share.xml:31(para)
+#: C/mateuser-share.xml:31(para)
 msgid "Matthias Clasen <email>[email protected]</email>"
 msgstr ""
 
-#: C/gnome-user-share.xml:35(releaseinfo)
-msgid "This manual describes version 2.26 of gnome-user-share."
+#: C/mateuser-share.xml:35(releaseinfo)
+msgid "This manual describes version 2.26 of mateuser-share."
 msgstr ""
 
-#: C/gnome-user-share.xml:37(title)
+#: C/mateuser-share.xml:37(title)
 msgid "Feedback"
 msgstr ""
 
-#: C/gnome-user-share.xml:38(para)
-msgid "To report a bug or make a suggestion regarding the gnome-user-share application or this manual, follow the directions in the <ulink url=\"ghelp:user-guide?feedback-bugs\" type=\"help\">GNOME Feedback Page</ulink>."
+#: C/mateuser-share.xml:38(para)
+msgid "To report a bug or make a suggestion regarding the mateuser-share application or this manual, follow the directions in the <ulink url=\"ghelp:user-guide?feedback-bugs\" type=\"help\">GNOME Feedback Page</ulink>."
 msgstr ""
 
-#: C/gnome-user-share.xml:41(para)
-msgid "gnome-user-share is a session service that enables easy sharing of files between several computers."
+#: C/mateuser-share.xml:41(para)
+msgid "mateuser-share is a session service that enables easy sharing of files between several computers."
 msgstr ""
 
-#: C/gnome-user-share.xml:45(primary)
-msgid "gnome-user-share"
+#: C/mateuser-share.xml:45(primary)
+msgid "mateuser-share"
 msgstr ""
 
-#: C/gnome-user-share.xml:46(primary)
+#: C/mateuser-share.xml:46(primary)
 msgid "file sharing"
 msgstr ""
 
-#: C/gnome-user-share.xml:47(primary)
+#: C/mateuser-share.xml:47(primary)
 msgid "sharing"
 msgstr ""
 
-#: C/gnome-user-share.xml:50(title)
+#: C/mateuser-share.xml:50(title)
 msgid "Introduction"
 msgstr ""
 
-#: C/gnome-user-share.xml:51(para)
-msgid "gnome-user-share is a session service that exports the contents of the <filename>Public</filename> folder in your home directory, so that they can easily be accessed from other computers on the same local network. On the other computers, the shared folder will appear with a name like '<replaceable>user</replaceable>'s shared files' in the <application>nautilus</application> Network window, where <replaceable>user</replaceable> will be replaced by your user name."
+#: C/mateuser-share.xml:51(para)
+msgid "mateuser-share is a session service that exports the contents of the <filename>Public</filename> folder in your home directory, so that they can easily be accessed from other computers on the same local network. On the other computers, the shared folder will appear with a name like '<replaceable>user</replaceable>'s shared files' in the <application>caja</application> Network window, where <replaceable>user</replaceable> will be replaced by your user name."
 msgstr ""
 
-#: C/gnome-user-share.xml:54(para)
-msgid "gnome-user-share uses a WebDAV server to share the <filename>Public</filename> folder, and advertises the share on the local network using mDNS."
+#: C/mateuser-share.xml:54(para)
+msgid "mateuser-share uses a WebDAV server to share the <filename>Public</filename> folder, and advertises the share on the local network using mDNS."
 msgstr ""
 
-#: C/gnome-user-share.xml:57(para)
-msgid "Additionally, gnome-user-share can make the shared files available via ObexFTP over Bluetooth, and receive files that are sent to your computer via Bluetooth via ObexPush."
+#: C/mateuser-share.xml:57(para)
+msgid "Additionally, mateuser-share can make the shared files available via ObexFTP over Bluetooth, and receive files that are sent to your computer via Bluetooth via ObexPush."
 msgstr ""
 
-#: C/gnome-user-share.xml:63(title)
+#: C/mateuser-share.xml:63(title)
 msgid "Getting started"
 msgstr ""
 
-#: C/gnome-user-share.xml:66(title)
-msgid "Starting gnome-user-share"
+#: C/mateuser-share.xml:66(title)
+msgid "Starting mateuser-share"
 msgstr ""
 
-#: C/gnome-user-share.xml:68(para)
-msgid "The gnome-user-share service is normally started by <application>gnome-session</application> when you log in. You can change this by opening <menuchoice><guimenu>Preferences</guimenu><guimenu>Startup Applications</guimenu></menuchoice> in the <guimenu>System</guimenu> menu, and modifying the 'User Sharing' entry in the list of startup programs."
+#: C/mateuser-share.xml:68(para)
+msgid "The mateuser-share service is normally started by <application>matesession</application> when you log in. You can change this by opening <menuchoice><guimenu>Preferences</guimenu><guimenu>Startup Applications</guimenu></menuchoice> in the <guimenu>System</guimenu> menu, and modifying the 'User Sharing' entry in the list of startup programs."
 msgstr ""
 
-#: C/gnome-user-share.xml:72(para)
+#: C/mateuser-share.xml:72(para)
 msgid "To configure various aspects of file sharing, use the File Sharing Preferences, which can be found in the <guimenu>System</guimenu> menu under <menuchoice><guimenu>Preferences</guimenu><guimenu>Personal File Sharing</guimenu></menuchoice>."
 msgstr ""
 
-#: C/gnome-user-share.xml:77(title)
+#: C/mateuser-share.xml:77(title)
 msgid "File Sharing Preferences"
 msgstr ""
 
-#: C/gnome-user-share.xml:89(title)
+#: C/mateuser-share.xml:89(title)
 msgid "Enabling file sharing over the network"
 msgstr ""
 
-#: C/gnome-user-share.xml:90(para)
-#: C/gnome-user-share.xml:134(para)
-#: C/gnome-user-share.xml:159(para)
+#: C/mateuser-share.xml:90(para)
+#: C/mateuser-share.xml:134(para)
+#: C/mateuser-share.xml:159(para)
 msgid "Open the File Sharing Preferences using <menuchoice><guimenu>Preferences</guimenu><guimenu>Personal File Sharing</guimenu></menuchoice> in the <guimenu>System</guimenu> menu."
 msgstr ""
 
-#: C/gnome-user-share.xml:95(title)
+#: C/mateuser-share.xml:95(title)
 msgid "Share Files over the Network"
 msgstr ""
 
-#: C/gnome-user-share.xml:106(para)
+#: C/mateuser-share.xml:106(para)
 msgid "Some firewall configurations on the local machine might cause problems with the advertisment, as well as the access to the shared files. Consult your system administrator for more details."
 msgstr ""
 
-#: C/gnome-user-share.xml:109(para)
+#: C/mateuser-share.xml:109(para)
 msgid "Select <guilabel>Never</guilabel> to allow everybody to freely read or write files in the shared folder."
 msgstr ""
 
-#: C/gnome-user-share.xml:115(para)
+#: C/mateuser-share.xml:115(para)
 msgid "Select <guilabel>Always</guilabel> to require the password to read or write files in the shared folder."
 msgstr ""
 
-#: C/gnome-user-share.xml:121(para)
+#: C/mateuser-share.xml:121(para)
 msgid "Select <guilabel>When writing files</guilabel> to allow everybody to freely read files in the shared folder, but require the password when writing files."
 msgstr ""
 
-#: C/gnome-user-share.xml:128(para)
+#: C/mateuser-share.xml:128(para)
 msgid "When you set a password, you have to give the password to all users that you want to have access to the shared files. Therefore, you should use a password that is different from other passwords you use."
 msgstr ""
 
-#: C/gnome-user-share.xml:104(para)
+#: C/mateuser-share.xml:104(para)
 msgid "To enable file sharing via WebDAV, use the <guilabel>Share public files on network</guilabel> checkbox. When file sharing it enabled, the controls for password protection allow to set a password that needs to be specified before a user on another computer is granted access to the shared files. <placeholder-1/><placeholder-2/><placeholder-3/>"
 msgstr ""
 
-#: C/gnome-user-share.xml:133(title)
+#: C/mateuser-share.xml:133(title)
 msgid "Enabling file sharing over Bluetooth"
 msgstr ""
 
-#: C/gnome-user-share.xml:139(title)
+#: C/mateuser-share.xml:139(title)
 msgid "Share Files over Bluetooth"
 msgstr ""
 
-#: C/gnome-user-share.xml:152(para)
+#: C/mateuser-share.xml:152(para)
 msgid "When you allow unbonded remote devices to access your shared files, anybody with a Bluetooth-enabled cell phone in the vicinity of your computer can access and perhaps even modify your shared files."
 msgstr ""
 
-#: C/gnome-user-share.xml:148(para)
+#: C/mateuser-share.xml:148(para)
 msgid "To enable file sharing via Bluetooth, use the <guilabel>Share public files over Bluetooth</guilabel> checkbox. To allow remote Bluetooth devices to delete files in your shared folder, use the <guilabel>Allow remote devices to delete files</guilabel> checkbox. To allow remote Bluetooth devices to access your shared files even when they are not bonded with your computer, use the <guilabel>Require remote devices to pair with this computer</guilabel> checkbox. <placeholder-1/>"
 msgstr ""
 
-#: C/gnome-user-share.xml:158(title)
+#: C/mateuser-share.xml:158(title)
 msgid "Receiving Files over Bluetooth"
 msgstr ""
 
-#: C/gnome-user-share.xml:164(title)
+#: C/mateuser-share.xml:164(title)
 msgid "Receive Files over Bluetooth"
 msgstr ""
 
-#: C/gnome-user-share.xml:177(para)
+#: C/mateuser-share.xml:177(para)
 msgid "Select <guilabel>Always</guilabel> to allow any remote device to send files."
 msgstr ""
 
-#: C/gnome-user-share.xml:184(para)
+#: C/mateuser-share.xml:184(para)
 msgid "Bonded devices are the ones that were connected to your computer, and had to enter a PIN code to connect to or from."
 msgstr ""
 
-#: C/gnome-user-share.xml:182(para)
+#: C/mateuser-share.xml:182(para)
 msgid "Select <guilabel>Only for Bonded devices</guilabel> to accept files only from bonded devices. <placeholder-1/>"
 msgstr ""
 
-#: C/gnome-user-share.xml:191(para)
+#: C/mateuser-share.xml:191(para)
 msgid "Devices can be marked as trusted in the <application>bluetooth-properties</application>'s <guilabel>Known devices</guilabel> section."
 msgstr ""
 
-#: C/gnome-user-share.xml:189(para)
+#: C/mateuser-share.xml:189(para)
 msgid "Select <guilabel>Only for Bonded and Trusted devices</guilabel> to accept files only from bonded devices. <placeholder-1/>"
 msgstr ""
 
-#: C/gnome-user-share.xml:173(para)
+#: C/mateuser-share.xml:173(para)
 msgid "To let remote Bluetooth devices send files to your computer, use the <guilabel>Receive files in Downloads folder over Bluetooth</guilabel> checkbox. Received files will be stored in the <filename>Downloads</filename> folder in your home directory. When receiving files is enabled, the <guilabel>Accept files</guilabel> selection allows you to determine which remote devices are allowed to send files. <placeholder-1/>"
 msgstr ""
 
-#: C/gnome-user-share.xml:196(para)
+#: C/mateuser-share.xml:196(para)
 msgid "Use the <guilabel>Notify about received files</guilabel> checkbox to select whether you want to be notified whenever a file is received via Bluetooth."
 msgstr ""
 
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
-#: C/gnome-user-share.xml:0(None)
+#: C/mateuser-share.xml:0(None)
 msgid "translator-credits"
 msgstr ""
 
diff --git a/help/pt_BR/pt_BR.po b/help/pt_BR/pt_BR.po
index e91425e..c3b6da7 100644
--- a/help/pt_BR/pt_BR.po
+++ b/help/pt_BR/pt_BR.po
@@ -1,16 +1,16 @@
-# Brazilian Portuguese translation for gnome-user-share.
-# Copyright (C) 2010 gnome-user-share's COPYRIGHT HOLDER
-# This file is distributed under the same license as the gnome-user-share package.
+# Brazilian Portuguese 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.
 # Marcelo  Rodrigues <[email protected]>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share master\n"
+"Project-Id-Version: mateuser-share master\n"
 "POT-Creation-Date: 2010-10-29 00:33+0000\n"
 "PO-Revision-Date: 2010-09-27 15:39+0000\n"
 "Last-Translator: Marcelo Rodrigues Pires Filho <[email protected]."
 "br>\n"
-"Language-Team: Brazilian Portuguese <[email protected]>\n"
+"Language-Team: Brazilian Portuguese <matept_br-list@mateorg>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -118,7 +118,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:81(None)
+#: C/mateuser-share.xml:81(None)
 msgid ""
 "@@image: 'figures/file-sharing-preferences.png'; "
 "md5=7ae616b8043b36be1f4943ba06d8a5ed"
@@ -128,7 +128,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:99(None)
+#: C/mateuser-share.xml:99(None)
 msgid ""
 "@@image: 'figures/sharing-over-the-network.png'; "
 "md5=ee8b44eb1290e4d1ae9b1e8fe8501860"
@@ -138,7 +138,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:143(None)
+#: C/mateuser-share.xml:143(None)
 msgid ""
 "@@image: 'figures/sharing-over-bluetooth.png'; "
 "md5=0a950502b42b1e7fdb9a57d5017e919c"
@@ -148,7 +148,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:168(None)
+#: C/mateuser-share.xml:168(None)
 msgid ""
 "@@image: 'figures/receiving-over-bluetooth.png'; "
 "md5=f292daef06767f39e346b222d3c448be"
@@ -156,137 +156,137 @@ msgstr ""
 "@@image: 'figures/receiving-over-bluetooth.png'; "
 "md5=f292daef06767f39e346b222d3c448be"
 
-#: C/gnome-user-share.xml:10(title)
+#: C/mateuser-share.xml:10(title)
 msgid "Personal File Sharing Manual"
 msgstr "Manual de Compartilhamento de Arquivos Pessoais"
 
-#: C/gnome-user-share.xml:12(year) C/gnome-user-share.xml:29(date)
+#: C/mateuser-share.xml:12(year) C/mateuser-share.xml:29(date)
 msgid "2009"
 msgstr "2009"
 
-#: C/gnome-user-share.xml:13(holder)
+#: C/mateuser-share.xml:13(holder)
 msgid "Red Hat, Inc."
 msgstr "Red Hat, Inc."
 
-#: C/gnome-user-share.xml:19(firstname)
+#: C/mateuser-share.xml:19(firstname)
 msgid "Matthias"
 msgstr "Matthias"
 
-#: C/gnome-user-share.xml:20(surname)
+#: C/mateuser-share.xml:20(surname)
 msgid "Clasen"
 msgstr "Clasen"
 
-#: C/gnome-user-share.xml:28(revnumber)
+#: C/mateuser-share.xml:28(revnumber)
 msgid "1.0"
 msgstr "1.0"
 
-#: C/gnome-user-share.xml:31(para)
+#: C/mateuser-share.xml:31(para)
 msgid "Matthias Clasen <email>[email protected]</email>"
 msgstr "Matthias Clasen <email>[email protected]</email>"
 
-#: C/gnome-user-share.xml:35(releaseinfo)
-msgid "This manual describes version 2.26 of gnome-user-share."
-msgstr "Este manual descreve a versão 2.26 do gnome-user-share."
+#: C/mateuser-share.xml:35(releaseinfo)
+msgid "This manual describes version 2.26 of mateuser-share."
+msgstr "Este manual descreve a versão 2.26 do mateuser-share."
 
-#: C/gnome-user-share.xml:37(title)
+#: C/mateuser-share.xml:37(title)
 msgid "Feedback"
 msgstr "Feedback"
 
-#: C/gnome-user-share.xml:38(para)
+#: C/mateuser-share.xml:38(para)
 msgid ""
-"To report a bug or make a suggestion regarding the gnome-user-share "
+"To report a bug or make a suggestion regarding the mateuser-share "
 "application or this manual, follow the directions in the <ulink url=\"ghelp:"
 "user-guide?feedback-bugs\" type=\"help\">GNOME Feedback Page</ulink>."
 msgstr ""
 "Para reportar uma falha ou fazer uma sugestão a respeito do aplicação do "
-"gnome-user-share ou este manual, siga as direções no <ulink url=\"ghelp:user-"
+"mateuser-share ou este manual, siga as direções no <ulink url=\"ghelp:user-"
 "guide?feedback-bugs\" type=\"help\">Página de feedback do GNOME</ulink>."
 
-#: C/gnome-user-share.xml:41(para)
+#: C/mateuser-share.xml:41(para)
 msgid ""
-"gnome-user-share is a session service that enables easy sharing of files "
+"mateuser-share is a session service that enables easy sharing of files "
 "between several computers."
 msgstr ""
-"gnome-user-share é um serviço de sessão que possibilita o compartilhamento "
+"mateuser-share é um serviço de sessão que possibilita o compartilhamento "
 "de arquivos entre diversos computadores."
 
-#: C/gnome-user-share.xml:45(primary)
-msgid "gnome-user-share"
-msgstr "gnome-user-share"
+#: C/mateuser-share.xml:45(primary)
+msgid "mateuser-share"
+msgstr "mateuser-share"
 
-#: C/gnome-user-share.xml:46(primary)
+#: C/mateuser-share.xml:46(primary)
 msgid "file sharing"
 msgstr "compartilhamento de arquivos"
 
-#: C/gnome-user-share.xml:47(primary)
+#: C/mateuser-share.xml:47(primary)
 msgid "sharing"
 msgstr "compartilhamento"
 
-#: C/gnome-user-share.xml:50(title)
+#: C/mateuser-share.xml:50(title)
 msgid "Introduction"
 msgstr "Introdução"
 
-#: C/gnome-user-share.xml:51(para)
+#: C/mateuser-share.xml:51(para)
 msgid ""
-"gnome-user-share is a session service that exports the contents of the "
+"mateuser-share is a session service that exports the contents of the "
 "<filename>Public</filename> folder in your home directory, so that they can "
 "easily be accessed from other computers on the same local network. On the "
 "other computers, the shared folder will appear with a name like "
 "'<replaceable>user</replaceable>'s shared files' in the "
-"<application>nautilus</application> Network window, where <replaceable>user</"
+"<application>caja</application> Network window, where <replaceable>user</"
 "replaceable> will be replaced by your user name."
 msgstr ""
-"gnome-user-share é um serviço de sessão que exporta conteúdo da pasta "
+"mateuser-share é um serviço de sessão que exporta conteúdo da pasta "
 "<filename>Pública</filename> para seu diretório home, para que este conteúdo "
 "possa ser facilmente acessado de outros computadores na mesma rede local. "
 "Nos outros computadores, a pasta compartilhada aparecera com um nome "
 "parecido com 'arquivos compartilhados do <replaceable>usuário</replaceable>' "
-"na janela de rede do <application>nautilus</application>, onde "
+"na janela de rede do <application>caja</application>, onde "
 "<replaceable>usuário</replaceable> será substituído pelo nome do usuário."
 
-#: C/gnome-user-share.xml:54(para)
+#: C/mateuser-share.xml:54(para)
 msgid ""
-"gnome-user-share uses a WebDAV server to share the <filename>Public</"
+"mateuser-share uses a WebDAV server to share the <filename>Public</"
 "filename> folder, and advertises the share on the local network using mDNS."
 msgstr ""
-"O gnome-user-share usa um servidor WebDAV para compartilhar a pasta "
+"O mateuser-share usa um servidor WebDAV para compartilhar a pasta "
 "<filename>Public</filename>, e anuncia o compartilhamento na rede local "
 "usando mDNS."
 
-#: C/gnome-user-share.xml:57(para)
+#: C/mateuser-share.xml:57(para)
 msgid ""
-"Additionally, gnome-user-share can make the shared files available via "
+"Additionally, mateuser-share can make the shared files available via "
 "ObexFTP over Bluetooth, and receive files that are sent to your computer via "
 "Bluetooth via ObexPush."
 msgstr ""
-"Adicionalmente, o gnome-user-share pode tornar arquivos compartilhados "
+"Adicionalmente, o mateuser-share pode tornar arquivos compartilhados "
 "disponíveis via ObexFTP por Bluetooth, e receber arquivos que são enviados "
 "ao seu computador por Bluetooth via ObexPush."
 
-#: C/gnome-user-share.xml:63(title)
+#: C/mateuser-share.xml:63(title)
 msgid "Getting started"
 msgstr "Iniciando"
 
-#: C/gnome-user-share.xml:66(title)
-msgid "Starting gnome-user-share"
-msgstr "Iniciando o gnome-user-share"
+#: C/mateuser-share.xml:66(title)
+msgid "Starting mateuser-share"
+msgstr "Iniciando o mateuser-share"
 
-#: C/gnome-user-share.xml:68(para)
+#: C/mateuser-share.xml:68(para)
 msgid ""
-"The gnome-user-share service is normally started by <application>gnome-"
+"The mateuser-share service is normally started by <application>mate"
 "session</application> when you log in. You can change this by opening "
 "<menuchoice><guimenu>Preferences</guimenu><guimenu>Startup Applications</"
 "guimenu></menuchoice> in the <guimenu>System</guimenu> menu, and modifying "
 "the 'User Sharing' entry in the list of startup programs."
 msgstr ""
-"O serviço gnome-user-share é normalmente iniciado por <application>gnome-"
+"O serviço mateuser-share é normalmente iniciado por <application>mate"
 "session</application> quando você entra no sistema. você pode mudar isto "
 "abrindo <menuchoice><guimenu>Preferências</guimenu><guimenu>Aplicativos de "
 "sessão</guimenu></menuchoice> no menu <guimenu>Sistema</guimenu>, e "
 "modificando a opção 'Compartilhamento de arquivos' na lista de programas "
 "iniciais."
 
-#: C/gnome-user-share.xml:72(para)
+#: C/mateuser-share.xml:72(para)
 msgid ""
 "To configure various aspects of file sharing, use the File Sharing "
 "Preferences, which can be found in the <guimenu>System</guimenu> menu under "
@@ -299,16 +299,16 @@ msgstr ""
 "guimenu><guimenu>Compartilhamento de arquivos pessoais</guimenu></"
 "menuchoice>."
 
-#: C/gnome-user-share.xml:77(title)
+#: C/mateuser-share.xml:77(title)
 msgid "File Sharing Preferences"
 msgstr "Preferências de compartilhamento de arquivos"
 
-#: C/gnome-user-share.xml:89(title)
+#: C/mateuser-share.xml:89(title)
 msgid "Enabling file sharing over the network"
 msgstr "Habilitando compartilhamento de arquivos na rede"
 
-#: C/gnome-user-share.xml:90(para) C/gnome-user-share.xml:134(para)
-#: C/gnome-user-share.xml:159(para)
+#: C/mateuser-share.xml:90(para) C/mateuser-share.xml:134(para)
+#: C/mateuser-share.xml:159(para)
 msgid ""
 "Open the File Sharing Preferences using <menuchoice><guimenu>Preferences</"
 "guimenu><guimenu>Personal File Sharing</guimenu></menuchoice> in the "
@@ -318,11 +318,11 @@ msgstr ""
 "<menuchoice><guimenu>Preferências</guimenu><guimenu>Compatilhamento de "
 "Arquivos pessoais</guimenu></menuchoice> no menu <guimenu>Sistema</guimenu>."
 
-#: C/gnome-user-share.xml:95(title)
+#: C/mateuser-share.xml:95(title)
 msgid "Share Files over the Network"
 msgstr "Compartilhar arquivos na rede"
 
-#: C/gnome-user-share.xml:106(para)
+#: C/mateuser-share.xml:106(para)
 msgid ""
 "Some firewall configurations on the local machine might cause problems with "
 "the advertisment, as well as the access to the shared files. Consult your "
@@ -332,7 +332,7 @@ msgstr ""
 "com a exibição, assim como ao acesso de arquivos compartilhados. Consulte "
 "seu administrador de sistema para mais detalhes."
 
-#: C/gnome-user-share.xml:109(para)
+#: C/mateuser-share.xml:109(para)
 msgid ""
 "Select <guilabel>Never</guilabel> to allow everybody to freely read or write "
 "files in the shared folder."
@@ -340,7 +340,7 @@ msgstr ""
 "Selecione <guilabel>Nunca</guilabel> para permitir a todos acessar e "
 "escrever livremente arquivos numa pasta compartilhada."
 
-#: C/gnome-user-share.xml:115(para)
+#: C/mateuser-share.xml:115(para)
 msgid ""
 "Select <guilabel>Always</guilabel> to require the password to read or write "
 "files in the shared folder."
@@ -348,7 +348,7 @@ msgstr ""
 "Selecione <guilabel>Sempre</guilabel> para requisitar a senha para ler ou "
 "escrever arquivos numa pasta compartilhada."
 
-#: C/gnome-user-share.xml:121(para)
+#: C/mateuser-share.xml:121(para)
 msgid ""
 "Select <guilabel>When writing files</guilabel> to allow everybody to freely "
 "read files in the shared folder, but require the password when writing files."
@@ -357,7 +357,7 @@ msgstr ""
 "todos que leiam livremente arquivos na pasta compartilhada, mas requisite "
 "senha quando escrever arquivos."
 
-#: C/gnome-user-share.xml:128(para)
+#: C/mateuser-share.xml:128(para)
 msgid ""
 "When you set a password, you have to give the password to all users that you "
 "want to have access to the shared files. Therefore, you should use a "
@@ -367,7 +367,7 @@ msgstr ""
 "que você quer que tenham acesso aos seus arquivos compartilhados. Assim, "
 "você deve usar uma senha diferente de outras senhas que você use."
 
-#: C/gnome-user-share.xml:104(para)
+#: C/mateuser-share.xml:104(para)
 msgid ""
 "To enable file sharing via WebDAV, use the <guilabel>Share public files on "
 "network</guilabel> checkbox. When file sharing it enabled, the controls for "
@@ -382,15 +382,15 @@ msgstr ""
 "usuário em outro computador tenha o acesso permitido a arquivos "
 "compartilhados. <placeholder-1/><placeholder-2/><placeholder-3/>"
 
-#: C/gnome-user-share.xml:133(title)
+#: C/mateuser-share.xml:133(title)
 msgid "Enabling file sharing over Bluetooth"
 msgstr "Habilitando o compartilhamento de arquivos por Bluetooth"
 
-#: C/gnome-user-share.xml:139(title)
+#: C/mateuser-share.xml:139(title)
 msgid "Share Files over Bluetooth"
 msgstr "Compartilhe Arquivos por Bluetooth"
 
-#: C/gnome-user-share.xml:152(para)
+#: C/mateuser-share.xml:152(para)
 msgid ""
 "When you allow unbonded remote devices to access your shared files, anybody "
 "with a Bluetooth-enabled cell phone in the vicinity of your computer can "
@@ -400,7 +400,7 @@ msgstr ""
 "compartilhados, qualquer um com um celular com Bluetooth no alcance de seu "
 "computador pode acessar e talvez até modificar seus arquivos compartilhados."
 
-#: C/gnome-user-share.xml:148(para)
+#: C/mateuser-share.xml:148(para)
 msgid ""
 "To enable file sharing via Bluetooth, use the <guilabel>Share public files "
 "over Bluetooth</guilabel> checkbox. To allow remote Bluetooth devices to "
@@ -420,22 +420,22 @@ msgstr ""
 "dispositivos remotos pareiem com esse computador</guilabel>.  "
 "<placeholder-1/>"
 
-#: C/gnome-user-share.xml:158(title)
+#: C/mateuser-share.xml:158(title)
 msgid "Receiving Files over Bluetooth"
 msgstr "Recebendo Arquivos por Bluetooth"
 
-#: C/gnome-user-share.xml:164(title)
+#: C/mateuser-share.xml:164(title)
 msgid "Receive Files over Bluetooth"
 msgstr "Receba Arquivos por Bluetooth"
 
-#: C/gnome-user-share.xml:177(para)
+#: C/mateuser-share.xml:177(para)
 msgid ""
 "Select <guilabel>Always</guilabel> to allow any remote device to send files."
 msgstr ""
 "Selecione <guilabel>Sempre</guilabel> para permitir qualquer dispositivo "
 "remoto enviar arquivos."
 
-#: C/gnome-user-share.xml:184(para)
+#: C/mateuser-share.xml:184(para)
 msgid ""
 "Bonded devices are the ones that were connected to your computer, and had to "
 "enter a PIN code to connect to or from."
@@ -444,7 +444,7 @@ msgstr ""
 "computador, e tiveram que entrar com um código PIN para se conectar com ele "
 "ou dele."
 
-#: C/gnome-user-share.xml:182(para)
+#: C/mateuser-share.xml:182(para)
 msgid ""
 "Select <guilabel>Only for Bonded devices</guilabel> to accept files only "
 "from bonded devices. <placeholder-1/>"
@@ -452,7 +452,7 @@ msgstr ""
 "Selecione <guilabel>Apenas para dispositivos interligados</guilabel> para "
 "aceitar arquivos apenas de dispositivos interligados. <placeholder-1/>"
 
-#: C/gnome-user-share.xml:191(para)
+#: C/mateuser-share.xml:191(para)
 msgid ""
 "Devices can be marked as trusted in the <application>bluetooth-properties</"
 "application>'s <guilabel>Known devices</guilabel> section."
@@ -461,7 +461,7 @@ msgstr ""
 "sessão <application>propriedades de bluetooth</ application> dentro "
 "de <guilabel>Dispositivos conhecidos</guilabel>."
 
-#: C/gnome-user-share.xml:189(para)
+#: C/mateuser-share.xml:189(para)
 msgid ""
 "Select <guilabel>Only for Bonded and Trusted devices</guilabel> to accept "
 "files only from bonded devices. <placeholder-1/>"
@@ -470,7 +470,7 @@ msgstr ""
 "guilabel> para aceitar arquivos apenas de dispositivos interligados. "
 "<placeholder-1/>"
 
-#: C/gnome-user-share.xml:173(para)
+#: C/mateuser-share.xml:173(para)
 msgid ""
 "To let remote Bluetooth devices send files to your computer, use the "
 "<guilabel>Receive files in Downloads folder over Bluetooth</guilabel> "
@@ -487,7 +487,7 @@ msgstr ""
 "permite que você determine quais dispositivos remotos são permitidos a "
 "enviar arquivos. <placeholder-1/>"
 
-#: C/gnome-user-share.xml:196(para)
+#: C/mateuser-share.xml:196(para)
 msgid ""
 "Use the <guilabel>Notify about received files</guilabel> checkbox to select "
 "whether you want to be notified whenever a file is received via Bluetooth."
@@ -497,7 +497,7 @@ msgstr ""
 "Bluetooth."
 
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
-#: C/gnome-user-share.xml:0(None)
+#: C/mateuser-share.xml:0(None)
 msgid "translator-credits"
 msgstr "Marcelo Rodrigues Pires Filho <[email protected]>, 2010"
 
diff --git a/help/ro/ro.po b/help/ro/ro.po
index 7a485f8..4c0c7e8 100644
--- a/help/ro/ro.po
+++ b/help/ro/ro.po
@@ -1,15 +1,15 @@
-# Romanian translation for gnome-user-share.
-# Copyright (C) 2010 gnome-user-share's COPYRIGHT HOLDER
-# This file is distributed under the same license as the gnome-user-share package.
+# Romanian 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.
 # Daniel Șerbănescu <[email protected]>, 2010.
 # Lucian Adrian Grijincu <[email protected]>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share master\n"
+"Project-Id-Version: mateuser-share master\n"
 "POT-Creation-Date: 2010-09-27 15:39+0000\n"
 "PO-Revision-Date: 2010-10-11 17:47+0300\n"
 "Last-Translator: Lucian Adrian Grijincu <[email protected]>\n"
-"Language-Team: Romanian Gnome Team <[email protected]>\n"
+"Language-Team: Romanian Gnome Team <[email protected]>\n"
 "Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -120,7 +120,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:81(None)
+#: C/mateuser-share.xml:81(None)
 msgid ""
 "@@image: 'figures/file-sharing-preferences.png'; "
 "md5=7ae616b8043b36be1f4943ba06d8a5ed"
@@ -130,7 +130,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:99(None)
+#: C/mateuser-share.xml:99(None)
 msgid ""
 "@@image: 'figures/sharing-over-the-network.png'; "
 "md5=ee8b44eb1290e4d1ae9b1e8fe8501860"
@@ -140,7 +140,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:143(None)
+#: C/mateuser-share.xml:143(None)
 msgid ""
 "@@image: 'figures/sharing-over-bluetooth.png'; "
 "md5=0a950502b42b1e7fdb9a57d5017e919c"
@@ -150,7 +150,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:168(None)
+#: C/mateuser-share.xml:168(None)
 msgid ""
 "@@image: 'figures/receiving-over-bluetooth.png'; "
 "md5=f292daef06767f39e346b222d3c448be"
@@ -158,139 +158,139 @@ msgstr ""
 "@@image: 'figures/receiving-over-bluetooth.png'; "
 "md5=36d19cc30ebfec357855be4c30a2be94"
 
-#: C/gnome-user-share.xml:10(title)
+#: C/mateuser-share.xml:10(title)
 msgid "Personal File Sharing Manual"
 msgstr "Manual Partajare fișiere cu caracter personal"
 
-#: C/gnome-user-share.xml:12(year) C/gnome-user-share.xml:29(date)
+#: C/mateuser-share.xml:12(year) C/mateuser-share.xml:29(date)
 msgid "2009"
 msgstr "2009"
 
-#: C/gnome-user-share.xml:13(holder)
+#: C/mateuser-share.xml:13(holder)
 msgid "Red Hat, Inc."
 msgstr "Red Hat, Inc"
 
-#: C/gnome-user-share.xml:19(firstname)
+#: C/mateuser-share.xml:19(firstname)
 msgid "Matthias"
 msgstr "Matthias"
 
-#: C/gnome-user-share.xml:20(surname)
+#: C/mateuser-share.xml:20(surname)
 msgid "Clasen"
 msgstr "Clasen"
 
-#: C/gnome-user-share.xml:28(revnumber)
+#: C/mateuser-share.xml:28(revnumber)
 msgid "1.0"
 msgstr "1.0"
 
-#: C/gnome-user-share.xml:31(para)
+#: C/mateuser-share.xml:31(para)
 msgid "Matthias Clasen <email>[email protected]</email>"
 msgstr "Matthias Clasen <email>[email protected]</email>"
 
-#: C/gnome-user-share.xml:35(releaseinfo)
-msgid "This manual describes version 2.26 of gnome-user-share."
-msgstr "Acest manual descrie versiunea 2.26 a lui gnome-user-share."
+#: C/mateuser-share.xml:35(releaseinfo)
+msgid "This manual describes version 2.26 of mateuser-share."
+msgstr "Acest manual descrie versiunea 2.26 a lui mateuser-share."
 
-#: C/gnome-user-share.xml:37(title)
+#: C/mateuser-share.xml:37(title)
 msgid "Feedback"
 msgstr "Sugestii"
 
-#: C/gnome-user-share.xml:38(para)
+#: C/mateuser-share.xml:38(para)
 msgid ""
-"To report a bug or make a suggestion regarding the gnome-user-share "
+"To report a bug or make a suggestion regarding the mateuser-share "
 "application or this manual, follow the directions in the <ulink url=\"ghelp:"
 "user-guide?feedback-bugs\" type=\"help\">GNOME Feedback Page</ulink>."
 msgstr ""
 "Pentru a raporta o eroare sau a face o sugestie în privința aplicației "
-"gnome-user-share sau asupra acestui manual, urmați sfaturile de pe <ulink "
-"url=\"ghelp:gnome-feedback\" type=\"help\">pagina de sugestii GNOME</ulink>."
+"mateuser-share sau asupra acestui manual, urmați sfaturile de pe <ulink "
+"url=\"ghelp:matefeedback\" type=\"help\">pagina de sugestii GNOME</ulink>."
 
-#: C/gnome-user-share.xml:41(para)
+#: C/mateuser-share.xml:41(para)
 msgid ""
-"gnome-user-share is a session service that enables easy sharing of files "
+"mateuser-share is a session service that enables easy sharing of files "
 "between several computers."
 msgstr ""
-"gnome-user-social este un serviciu de sesiune care permite partajarea simplă "
+"mateuser-social este un serviciu de sesiune care permite partajarea simplă "
 "a fișierelor între mai multe calculatoare."
 
-#: C/gnome-user-share.xml:45(primary)
-msgid "gnome-user-share"
-msgstr "gnome-user-share"
+#: C/mateuser-share.xml:45(primary)
+msgid "mateuser-share"
+msgstr "mateuser-share"
 
-#: C/gnome-user-share.xml:46(primary)
+#: C/mateuser-share.xml:46(primary)
 msgid "file sharing"
 msgstr "partajare fișiere"
 
-#: C/gnome-user-share.xml:47(primary)
+#: C/mateuser-share.xml:47(primary)
 msgid "sharing"
 msgstr "partajare"
 
-#: C/gnome-user-share.xml:50(title)
+#: C/mateuser-share.xml:50(title)
 msgid "Introduction"
 msgstr "Introducere"
 
-#: C/gnome-user-share.xml:51(para)
+#: C/mateuser-share.xml:51(para)
 msgid ""
-"gnome-user-share is a session service that exports the contents of the "
+"mateuser-share is a session service that exports the contents of the "
 "<filename>Public</filename> folder in your home directory, so that they can "
 "easily be accessed from other computers on the same local network. On the "
 "other computers, the shared folder will appear with a name like "
 "'<replaceable>user</replaceable>'s shared files' in the "
-"<application>nautilus</application> Network window, where <replaceable>user</"
+"<application>caja</application> Network window, where <replaceable>user</"
 "replaceable> will be replaced by your user name."
 msgstr ""
-"gnome-user-share este un serviciu de sesiune care exportă conținutul "
+"mateuser-share este un serviciu de sesiune care exportă conținutul "
 "dosarului <filename>Public</filename> din dosarul personal, astfel încât să "
 "poată fi accesat cu ușurință de pe alte calculatoare din aceeași rețea "
 "locală. Pe celelalte calculatoare din rețea, dosarul partajat va apărea în "
-"fereastra de rețea a aplicației <application>nautilus</application> cu un "
+"fereastra de rețea a aplicației <application>caja</application> cu un "
 "nume de genul „Fișiere partajate de <replaceable>utilizator</replaceable>”, "
 "unde <replaceable>utilizator</replaceable> va fi înlocuit cu numele "
 "dumneavoastră de utilizator."
 
-#: C/gnome-user-share.xml:54(para)
+#: C/mateuser-share.xml:54(para)
 msgid ""
-"gnome-user-share uses a WebDAV server to share the <filename>Public</"
+"mateuser-share uses a WebDAV server to share the <filename>Public</"
 "filename> folder, and advertises the share on the local network using mDNS."
 msgstr ""
-"gnome-user-share utilizează un server WebDAV pentru a partaja dosarul "
+"mateuser-share utilizează un server WebDAV pentru a partaja dosarul "
 "<filename>Public</filename>, și anunță elementele partajate pe rețeaua "
 "locală utilizând mDNS."
 
-#: C/gnome-user-share.xml:57(para)
+#: C/mateuser-share.xml:57(para)
 msgid ""
-"Additionally, gnome-user-share can make the shared files available via "
+"Additionally, mateuser-share can make the shared files available via "
 "ObexFTP over Bluetooth, and receive files that are sent to your computer via "
 "Bluetooth via ObexPush."
 msgstr ""
-"În plus, gnome-user-share poate face disponibile fișierele partajate prin "
+"În plus, mateuser-share poate face disponibile fișierele partajate prin "
 "intermediul ObexFTP prin Bluetooth, și poate primi fișierele care sunt "
 "trimise calculatorului dumneavoastră prin Bluetooth, prin intermediul "
 "ObexPush."
 
-#: C/gnome-user-share.xml:63(title)
+#: C/mateuser-share.xml:63(title)
 msgid "Getting started"
 msgstr "Primii pași"
 
-#: C/gnome-user-share.xml:66(title)
-msgid "Starting gnome-user-share"
-msgstr "Pornirea gnome-user-share"
+#: C/mateuser-share.xml:66(title)
+msgid "Starting mateuser-share"
+msgstr "Pornirea mateuser-share"
 
-#: C/gnome-user-share.xml:68(para)
+#: C/mateuser-share.xml:68(para)
 msgid ""
-"The gnome-user-share service is normally started by <application>gnome-"
+"The mateuser-share service is normally started by <application>mate"
 "session</application> when you log in. You can change this by opening "
 "<menuchoice><guimenu>Preferences</guimenu><guimenu>Startup Applications</"
 "guimenu></menuchoice> in the <guimenu>System</guimenu> menu, and modifying "
 "the 'User Sharing' entry in the list of startup programs."
 msgstr ""
-"Serviciul gnome-user-share este în mod normal pornit de <application>gnome-"
+"Serviciul mateuser-share este în mod normal pornit de <application>mate"
 "sesion</application> atunci când vă autentificați. Puteți schimba acest "
 "lucru prin deschiderea meniului <menuchoice><guimenu>Sistem</guimenu><guimen"
 "u>Preferinţe</guimenu><guimenu>Aplicații pornite după "
 "autentificare</guimenu></menuchoice> și modificați intrarea „Partajare de "
 "fișiere personale” din lista de programe pornite după autentificare."
 
-#: C/gnome-user-share.xml:72(para)
+#: C/mateuser-share.xml:72(para)
 msgid ""
 "To configure various aspects of file sharing, use the File Sharing "
 "Preferences, which can be found in the <guimenu>System</guimenu> menu under "
@@ -302,16 +302,16 @@ msgstr ""
 "><guimenu>Sistem</guimenu><guimenu>Preferințe</guimenu><guimenu>Partajare de "
 "fișiere personale</guimenu></menuchoice> ."
 
-#: C/gnome-user-share.xml:77(title)
+#: C/mateuser-share.xml:77(title)
 msgid "File Sharing Preferences"
 msgstr "Preferințe pentru partajarea de fișiere"
 
-#: C/gnome-user-share.xml:89(title)
+#: C/mateuser-share.xml:89(title)
 msgid "Enabling file sharing over the network"
 msgstr "Activarea partajării de fișiere în rețea"
 
-#: C/gnome-user-share.xml:90(para) C/gnome-user-share.xml:134(para)
-#: C/gnome-user-share.xml:159(para)
+#: C/mateuser-share.xml:90(para) C/mateuser-share.xml:134(para)
+#: C/mateuser-share.xml:159(para)
 msgid ""
 "Open the File Sharing Preferences using <menuchoice><guimenu>Preferences</"
 "guimenu><guimenu>Personal File Sharing</guimenu></menuchoice> in the "
@@ -321,11 +321,11 @@ msgstr ""
 "uimenu>Sistem</guimenu><guimenu>Preferințe</guimenu><guimenu>Partajare de "
 "fișiere personale</guimenu></menuchoice>."
 
-#: C/gnome-user-share.xml:95(title)
+#: C/mateuser-share.xml:95(title)
 msgid "Share Files over the Network"
 msgstr "Partajare de fișiere în rețea"
 
-#: C/gnome-user-share.xml:106(para)
+#: C/mateuser-share.xml:106(para)
 msgid ""
 "Some firewall configurations on the local machine might cause problems with "
 "the advertisment, as well as the access to the shared files. Consult your "
@@ -335,7 +335,7 @@ msgstr ""
 "cauza probleme la publicarea și accesarea fișierelor partajate. Consultați "
 "administratorul de sistem pentru mai multe detalii."
 
-#: C/gnome-user-share.xml:109(para)
+#: C/mateuser-share.xml:109(para)
 msgid ""
 "Select <guilabel>Never</guilabel> to allow everybody to freely read or write "
 "files in the shared folder."
@@ -343,7 +343,7 @@ msgstr ""
 "Selectați <guilabel>Niciodată</guilabel> pentru a permite fiecăruia să "
 "citească sau să scrie fișiere în folderul partajat."
 
-#: C/gnome-user-share.xml:115(para)
+#: C/mateuser-share.xml:115(para)
 msgid ""
 "Select <guilabel>Always</guilabel> to require the password to read or write "
 "files in the shared folder."
@@ -351,7 +351,7 @@ msgstr ""
 "Selectați <guilabel>Întotdeauna</guilabel> pentru a fi necesară parola "
 "pentru a citi sau scrie în dosarul partajat."
 
-#: C/gnome-user-share.xml:121(para)
+#: C/mateuser-share.xml:121(para)
 msgid ""
 "Select <guilabel>When writing files</guilabel> to allow everybody to freely "
 "read files in the shared folder, but require the password when writing files."
@@ -360,7 +360,7 @@ msgstr ""
 "tuturor să citească liber fișierele din dosarul partajat, dar să necesite "
 "parola pentru a le scrie."
 
-#: C/gnome-user-share.xml:128(para)
+#: C/mateuser-share.xml:128(para)
 msgid ""
 "When you set a password, you have to give the password to all users that you "
 "want to have access to the shared files. Therefore, you should use a "
@@ -370,7 +370,7 @@ msgstr ""
 "vor acces la fișierele partajate. Prin urmare, ar trebui să utilizați o "
 "parolă diferită de celelalte parole pe care le utilizați."
 
-#: C/gnome-user-share.xml:104(para)
+#: C/mateuser-share.xml:104(para)
 msgid ""
 "To enable file sharing via WebDAV, use the <guilabel>Share public files on "
 "network</guilabel> checkbox. When file sharing it enabled, the controls for "
@@ -385,15 +385,15 @@ msgstr ""
 "înainte ca un utilizator de pe alt calculator să aibă acces la fișierele "
 "partajate. <placeholder-1/><placeholder-2/><placeholder-3/>"
 
-#: C/gnome-user-share.xml:133(title)
+#: C/mateuser-share.xml:133(title)
 msgid "Enabling file sharing over Bluetooth"
 msgstr "Activarea partajării de fișiere prin Bluetooth"
 
-#: C/gnome-user-share.xml:139(title)
+#: C/mateuser-share.xml:139(title)
 msgid "Share Files over Bluetooth"
 msgstr "Partajați fișiere prin Bluetooth"
 
-#: C/gnome-user-share.xml:152(para)
+#: C/mateuser-share.xml:152(para)
 msgid ""
 "When you allow unbonded remote devices to access your shared files, anybody "
 "with a Bluetooth-enabled cell phone in the vicinity of your computer can "
@@ -404,7 +404,7 @@ msgstr ""
 "calculatorului dumneavoastră poate accesa și chiar modifica fișierele "
 "partajate."
 
-#: C/gnome-user-share.xml:148(para)
+#: C/mateuser-share.xml:148(para)
 msgid ""
 "To enable file sharing via Bluetooth, use the <guilabel>Share public files "
 "over Bluetooth</guilabel> checkbox. To allow remote Bluetooth devices to "
@@ -424,22 +424,22 @@ msgstr ""
 "bifare <guilabel>Cere dispozitivelor la distanță să se asocieze cu acest "
 "calculator</guilabel>. <placeholder-1/>"
 
-#: C/gnome-user-share.xml:158(title)
+#: C/mateuser-share.xml:158(title)
 msgid "Receiving Files over Bluetooth"
 msgstr "Primirea fișierelor prin Bluetooth"
 
-#: C/gnome-user-share.xml:164(title)
+#: C/mateuser-share.xml:164(title)
 msgid "Receive Files over Bluetooth"
 msgstr "Primire Fișiere prin Bluetooth"
 
-#: C/gnome-user-share.xml:177(para)
+#: C/mateuser-share.xml:177(para)
 msgid ""
 "Select <guilabel>Always</guilabel> to allow any remote device to send files."
 msgstr ""
 "Selectați <guilabel>Întotdeauna</guilabel> pentru a permite oricărui "
 "dispozitiv de la distanță să trimită fișiere."
 
-#: C/gnome-user-share.xml:184(para)
+#: C/mateuser-share.xml:184(para)
 msgid ""
 "Bonded devices are the ones that were connected to your computer, and had to "
 "enter a PIN code to connect to or from."
@@ -447,7 +447,7 @@ msgstr ""
 "Dispozitivele asociate sunt cele care au fost conectate la calculator, și "
 "pentru care ați introdus un cod PIN pentru a le conecta."
 
-#: C/gnome-user-share.xml:182(para)
+#: C/mateuser-share.xml:182(para)
 msgid ""
 "Select <guilabel>Only for Bonded devices</guilabel> to accept files only "
 "from bonded devices. <placeholder-1/>"
@@ -455,7 +455,7 @@ msgstr ""
 "Selectați <guilabel>Doar pentru dispozitivele asociate</guilabel> pentru a "
 "accepta fișiere numai de la dispozitivele asociate. <placeholder-1/>"
 
-#: C/gnome-user-share.xml:191(para)
+#: C/mateuser-share.xml:191(para)
 msgid ""
 "Devices can be marked as trusted in the <application>bluetooth-properties</"
 "application>'s <guilabel>Known devices</guilabel> section."
@@ -463,7 +463,7 @@ msgstr ""
 "Dispozitivele pot fi marcate „de încredere” în secția <guilabel>Dispozitive "
 "cunoscute<guilabel> din <application>bluetooth-properties</application>."
 
-#: C/gnome-user-share.xml:189(para)
+#: C/mateuser-share.xml:189(para)
 msgid ""
 "Select <guilabel>Only for Bonded and Trusted devices</guilabel> to accept "
 "files only from bonded devices. <placeholder-1/>"
@@ -472,7 +472,7 @@ msgstr ""
 "guilabel> pentru a accepta fișiere numai de la dispozitivele asociate și de "
 "încredere. <placeholder-1/>"
 
-#: C/gnome-user-share.xml:173(para)
+#: C/mateuser-share.xml:173(para)
 msgid ""
 "To let remote Bluetooth devices send files to your computer, use the "
 "<guilabel>Receive files in Downloads folder over Bluetooth</guilabel> "
@@ -489,7 +489,7 @@ msgstr ""
 "fișiere</guilabel> vă permite să determinați care dintre dispozitive au "
 "dreptul să trimită fișiere. <placeholder-1/>"
 
-#: C/gnome-user-share.xml:196(para)
+#: C/mateuser-share.xml:196(para)
 msgid ""
 "Use the <guilabel>Notify about received files</guilabel> checkbox to select "
 "whether you want to be notified whenever a file is received via Bluetooth."
@@ -499,6 +499,6 @@ msgstr ""
 "este primit prin Bluetooth."
 
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
-#: C/gnome-user-share.xml:0(None)
+#: C/mateuser-share.xml:0(None)
 msgid "translator-credits"
 msgstr "Daniel Șerbănescu <[email protected]>, 2010"
diff --git a/help/sl/sl.po b/help/sl/sl.po
index 1762058..0a5b05e 100644
--- a/help/sl/sl.po
+++ b/help/sl/sl.po
@@ -1,16 +1,16 @@
-# Slovenian translations for gnome-user-share help.
-# Copyright (C) 2009 gnome-user-share COPYRIGHT HOLDER
-# This file is distributed under the same license as the gnome-user-share package.
+# Slovenian translations for mateuser-share help.
+# Copyright (C) 2009 mateuser-share COPYRIGHT HOLDER
+# This file is distributed under the same license as the mateuser-share package.
 #
 # Ime Priimek <email>, leto
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share help master\n"
+"Project-Id-Version: mateuser-share help master\n"
 "POT-Creation-Date: 2010-10-11 14:49+0000\n"
 "PO-Revision-Date: 2010-10-13 11:35+0100\n"
-"Last-Translator: Matej Urbančič <[email protected]>\n"
-"Language-Team: Slovenian GNOME Translation Team <[email protected]>\n"
+"Last-Translator: Matej Urbančič <[email protected]>\n"
+"Language-Team: Slovenian GNOME Translation Team <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -41,213 +41,213 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:81(None)
+#: C/mateuser-share.xml:81(None)
 msgid "@@image: 'figures/file-sharing-preferences.png'; md5=7ae616b8043b36be1f4943ba06d8a5ed"
 msgstr "@@image: 'figures/file-sharing-preferences.png'; md5=7ae616b8043b36be1f4943ba06d8a5ed"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:99(None)
+#: C/mateuser-share.xml:99(None)
 msgid "@@image: 'figures/sharing-over-the-network.png'; md5=ee8b44eb1290e4d1ae9b1e8fe8501860"
 msgstr "@@image: 'figures/sharing-over-the-network.png'; md5=ee8b44eb1290e4d1ae9b1e8fe8501860"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:143(None)
+#: C/mateuser-share.xml:143(None)
 msgid "@@image: 'figures/sharing-over-bluetooth.png'; md5=0a950502b42b1e7fdb9a57d5017e919c"
 msgstr "@@image: 'figures/sharing-over-bluetooth.png'; md5=0a950502b42b1e7fdb9a57d5017e919c"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:168(None)
+#: C/mateuser-share.xml:168(None)
 msgid "@@image: 'figures/receiving-over-bluetooth.png'; md5=f292daef06767f39e346b222d3c448be"
 msgstr "@@image: 'figures/receiving-over-bluetooth.png'; md5=f292daef06767f39e346b222d3c448be"
 
-#: C/gnome-user-share.xml:10(title)
+#: C/mateuser-share.xml:10(title)
 msgid "Personal File Sharing Manual"
 msgstr ""
 
-#: C/gnome-user-share.xml:12(year)
-#: C/gnome-user-share.xml:29(date)
+#: C/mateuser-share.xml:12(year)
+#: C/mateuser-share.xml:29(date)
 msgid "2009"
 msgstr "2009"
 
-#: C/gnome-user-share.xml:13(holder)
+#: C/mateuser-share.xml:13(holder)
 msgid "Red Hat, Inc."
 msgstr ""
 
-#: C/gnome-user-share.xml:19(firstname)
+#: C/mateuser-share.xml:19(firstname)
 msgid "Matthias"
 msgstr ""
 
-#: C/gnome-user-share.xml:20(surname)
+#: C/mateuser-share.xml:20(surname)
 msgid "Clasen"
 msgstr ""
 
-#: C/gnome-user-share.xml:28(revnumber)
+#: C/mateuser-share.xml:28(revnumber)
 msgid "1.0"
 msgstr "1.0"
 
-#: C/gnome-user-share.xml:31(para)
+#: C/mateuser-share.xml:31(para)
 msgid "Matthias Clasen <email>[email protected]</email>"
 msgstr ""
 
-#: C/gnome-user-share.xml:35(releaseinfo)
-msgid "This manual describes version 2.26 of gnome-user-share."
+#: C/mateuser-share.xml:35(releaseinfo)
+msgid "This manual describes version 2.26 of mateuser-share."
 msgstr ""
 
-#: C/gnome-user-share.xml:37(title)
+#: C/mateuser-share.xml:37(title)
 msgid "Feedback"
 msgstr ""
 
-#: C/gnome-user-share.xml:38(para)
-msgid "To report a bug or make a suggestion regarding the gnome-user-share application or this manual, follow the directions in the <ulink url=\"ghelp:user-guide?feedback-bugs\" type=\"help\">GNOME Feedback Page</ulink>."
+#: C/mateuser-share.xml:38(para)
+msgid "To report a bug or make a suggestion regarding the mateuser-share application or this manual, follow the directions in the <ulink url=\"ghelp:user-guide?feedback-bugs\" type=\"help\">GNOME Feedback Page</ulink>."
 msgstr ""
 
-#: C/gnome-user-share.xml:41(para)
-msgid "gnome-user-share is a session service that enables easy sharing of files between several computers."
+#: C/mateuser-share.xml:41(para)
+msgid "mateuser-share is a session service that enables easy sharing of files between several computers."
 msgstr ""
 
-#: C/gnome-user-share.xml:45(primary)
-msgid "gnome-user-share"
+#: C/mateuser-share.xml:45(primary)
+msgid "mateuser-share"
 msgstr ""
 
-#: C/gnome-user-share.xml:46(primary)
+#: C/mateuser-share.xml:46(primary)
 msgid "file sharing"
 msgstr ""
 
-#: C/gnome-user-share.xml:47(primary)
+#: C/mateuser-share.xml:47(primary)
 msgid "sharing"
 msgstr ""
 
-#: C/gnome-user-share.xml:50(title)
+#: C/mateuser-share.xml:50(title)
 msgid "Introduction"
 msgstr ""
 
-#: C/gnome-user-share.xml:51(para)
-msgid "gnome-user-share is a session service that exports the contents of the <filename>Public</filename> folder in your home directory, so that they can easily be accessed from other computers on the same local network. On the other computers, the shared folder will appear with a name like '<replaceable>user</replaceable>'s shared files' in the <application>nautilus</application> Network window, where <replaceable>user</replaceable> will be replaced by your user name."
+#: C/mateuser-share.xml:51(para)
+msgid "mateuser-share is a session service that exports the contents of the <filename>Public</filename> folder in your home directory, so that they can easily be accessed from other computers on the same local network. On the other computers, the shared folder will appear with a name like '<replaceable>user</replaceable>'s shared files' in the <application>caja</application> Network window, where <replaceable>user</replaceable> will be replaced by your user name."
 msgstr ""
 
-#: C/gnome-user-share.xml:54(para)
-msgid "gnome-user-share uses a WebDAV server to share the <filename>Public</filename> folder, and advertises the share on the local network using mDNS."
+#: C/mateuser-share.xml:54(para)
+msgid "mateuser-share uses a WebDAV server to share the <filename>Public</filename> folder, and advertises the share on the local network using mDNS."
 msgstr ""
 
-#: C/gnome-user-share.xml:57(para)
-msgid "Additionally, gnome-user-share can make the shared files available via ObexFTP over Bluetooth, and receive files that are sent to your computer via Bluetooth via ObexPush."
+#: C/mateuser-share.xml:57(para)
+msgid "Additionally, mateuser-share can make the shared files available via ObexFTP over Bluetooth, and receive files that are sent to your computer via Bluetooth via ObexPush."
 msgstr ""
 
-#: C/gnome-user-share.xml:63(title)
+#: C/mateuser-share.xml:63(title)
 msgid "Getting started"
 msgstr ""
 
-#: C/gnome-user-share.xml:66(title)
-msgid "Starting gnome-user-share"
+#: C/mateuser-share.xml:66(title)
+msgid "Starting mateuser-share"
 msgstr ""
 
-#: C/gnome-user-share.xml:68(para)
-msgid "The gnome-user-share service is normally started by <application>gnome-session</application> when you log in. You can change this by opening <menuchoice><guimenu>Preferences</guimenu><guimenu>Startup Applications</guimenu></menuchoice> in the <guimenu>System</guimenu> menu, and modifying the 'User Sharing' entry in the list of startup programs."
+#: C/mateuser-share.xml:68(para)
+msgid "The mateuser-share service is normally started by <application>matesession</application> when you log in. You can change this by opening <menuchoice><guimenu>Preferences</guimenu><guimenu>Startup Applications</guimenu></menuchoice> in the <guimenu>System</guimenu> menu, and modifying the 'User Sharing' entry in the list of startup programs."
 msgstr ""
 
-#: C/gnome-user-share.xml:72(para)
+#: C/mateuser-share.xml:72(para)
 msgid "To configure various aspects of file sharing, use the File Sharing Preferences, which can be found in the <guimenu>System</guimenu> menu under <menuchoice><guimenu>Preferences</guimenu><guimenu>Personal File Sharing</guimenu></menuchoice>."
 msgstr ""
 
-#: C/gnome-user-share.xml:77(title)
+#: C/mateuser-share.xml:77(title)
 msgid "File Sharing Preferences"
 msgstr ""
 
-#: C/gnome-user-share.xml:89(title)
+#: C/mateuser-share.xml:89(title)
 msgid "Enabling file sharing over the network"
 msgstr ""
 
-#: C/gnome-user-share.xml:90(para)
-#: C/gnome-user-share.xml:134(para)
-#: C/gnome-user-share.xml:159(para)
+#: C/mateuser-share.xml:90(para)
+#: C/mateuser-share.xml:134(para)
+#: C/mateuser-share.xml:159(para)
 msgid "Open the File Sharing Preferences using <menuchoice><guimenu>Preferences</guimenu><guimenu>Personal File Sharing</guimenu></menuchoice> in the <guimenu>System</guimenu> menu."
 msgstr ""
 
-#: C/gnome-user-share.xml:95(title)
+#: C/mateuser-share.xml:95(title)
 msgid "Share Files over the Network"
 msgstr ""
 
-#: C/gnome-user-share.xml:106(para)
+#: C/mateuser-share.xml:106(para)
 msgid "Some firewall configurations on the local machine might cause problems with the advertisment, as well as the access to the shared files. Consult your system administrator for more details."
 msgstr ""
 
-#: C/gnome-user-share.xml:109(para)
+#: C/mateuser-share.xml:109(para)
 msgid "Select <guilabel>Never</guilabel> to allow everybody to freely read or write files in the shared folder."
 msgstr ""
 
-#: C/gnome-user-share.xml:115(para)
+#: C/mateuser-share.xml:115(para)
 msgid "Select <guilabel>Always</guilabel> to require the password to read or write files in the shared folder."
 msgstr ""
 
-#: C/gnome-user-share.xml:121(para)
+#: C/mateuser-share.xml:121(para)
 msgid "Select <guilabel>When writing files</guilabel> to allow everybody to freely read files in the shared folder, but require the password when writing files."
 msgstr ""
 
-#: C/gnome-user-share.xml:128(para)
+#: C/mateuser-share.xml:128(para)
 msgid "When you set a password, you have to give the password to all users that you want to have access to the shared files. Therefore, you should use a password that is different from other passwords you use."
 msgstr ""
 
-#: C/gnome-user-share.xml:104(para)
+#: C/mateuser-share.xml:104(para)
 msgid "To enable file sharing via WebDAV, use the <guilabel>Share public files on network</guilabel> checkbox. When file sharing it enabled, the controls for password protection allow to set a password that needs to be specified before a user on another computer is granted access to the shared files. <placeholder-1/><placeholder-2/><placeholder-3/>"
 msgstr ""
 
-#: C/gnome-user-share.xml:133(title)
+#: C/mateuser-share.xml:133(title)
 msgid "Enabling file sharing over Bluetooth"
 msgstr ""
 
-#: C/gnome-user-share.xml:139(title)
+#: C/mateuser-share.xml:139(title)
 msgid "Share Files over Bluetooth"
 msgstr ""
 
-#: C/gnome-user-share.xml:152(para)
+#: C/mateuser-share.xml:152(para)
 msgid "When you allow unbonded remote devices to access your shared files, anybody with a Bluetooth-enabled cell phone in the vicinity of your computer can access and perhaps even modify your shared files."
 msgstr ""
 
-#: C/gnome-user-share.xml:148(para)
+#: C/mateuser-share.xml:148(para)
 msgid "To enable file sharing via Bluetooth, use the <guilabel>Share public files over Bluetooth</guilabel> checkbox. To allow remote Bluetooth devices to delete files in your shared folder, use the <guilabel>Allow remote devices to delete files</guilabel> checkbox. To allow remote Bluetooth devices to access your shared files even when they are not bonded with your computer, use the <guilabel>Require remote devices to pair with this computer</guilabel> checkbox. <placeholder-1/>"
 msgstr ""
 
-#: C/gnome-user-share.xml:158(title)
+#: C/mateuser-share.xml:158(title)
 msgid "Receiving Files over Bluetooth"
 msgstr ""
 
-#: C/gnome-user-share.xml:164(title)
+#: C/mateuser-share.xml:164(title)
 msgid "Receive Files over Bluetooth"
 msgstr ""
 
-#: C/gnome-user-share.xml:177(para)
+#: C/mateuser-share.xml:177(para)
 msgid "Select <guilabel>Always</guilabel> to allow any remote device to send files."
 msgstr ""
 
-#: C/gnome-user-share.xml:184(para)
+#: C/mateuser-share.xml:184(para)
 msgid "Bonded devices are the ones that were connected to your computer, and had to enter a PIN code to connect to or from."
 msgstr ""
 
-#: C/gnome-user-share.xml:182(para)
+#: C/mateuser-share.xml:182(para)
 msgid "Select <guilabel>Only for Bonded devices</guilabel> to accept files only from bonded devices. <placeholder-1/>"
 msgstr ""
 
-#: C/gnome-user-share.xml:191(para)
+#: C/mateuser-share.xml:191(para)
 msgid "Devices can be marked as trusted in the <application>bluetooth-properties</application>'s <guilabel>Known devices</guilabel> section."
 msgstr ""
 
-#: C/gnome-user-share.xml:189(para)
+#: C/mateuser-share.xml:189(para)
 msgid "Select <guilabel>Only for Bonded and Trusted devices</guilabel> to accept files only from bonded devices. <placeholder-1/>"
 msgstr ""
 
-#: C/gnome-user-share.xml:173(para)
+#: C/mateuser-share.xml:173(para)
 msgid "To let remote Bluetooth devices send files to your computer, use the <guilabel>Receive files in Downloads folder over Bluetooth</guilabel> checkbox. Received files will be stored in the <filename>Downloads</filename> folder in your home directory. When receiving files is enabled, the <guilabel>Accept files</guilabel> selection allows you to determine which remote devices are allowed to send files. <placeholder-1/>"
 msgstr ""
 
-#: C/gnome-user-share.xml:196(para)
+#: C/mateuser-share.xml:196(para)
 msgid "Use the <guilabel>Notify about received files</guilabel> checkbox to select whether you want to be notified whenever a file is received via Bluetooth."
 msgstr ""
 
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
-#: C/gnome-user-share.xml:0(None)
+#: C/mateuser-share.xml:0(None)
 msgid "translator-credits"
 msgstr ""
 
diff --git a/help/sv/sv.po b/help/sv/sv.po
index eb68a46..e4ddbfb 100644
--- a/help/sv/sv.po
+++ b/help/sv/sv.po
@@ -31,221 +31,221 @@ msgstr "DOKUMENTET OCH MODIFIERADE VERSIONER AV DOKUMENTET TILLHANDAHÅLLS UNDER
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:81(None)
+#: C/mateuser-share.xml:81(None)
 msgid "@@image: 'figures/file-sharing-preferences.png'; md5=7ae616b8043b36be1f4943ba06d8a5ed"
 msgstr "@@image: 'figures/file-sharing-preferences.png'; md5=7ae616b8043b36be1f4943ba06d8a5ed"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:99(None)
+#: C/mateuser-share.xml:99(None)
 msgid "@@image: 'figures/sharing-over-the-network.png'; md5=ee8b44eb1290e4d1ae9b1e8fe8501860"
 msgstr "@@image: 'figures/sharing-over-the-network.png'; md5=ee8b44eb1290e4d1ae9b1e8fe8501860"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:143(None)
+#: C/mateuser-share.xml:143(None)
 msgid "@@image: 'figures/sharing-over-bluetooth.png'; md5=0a950502b42b1e7fdb9a57d5017e919c"
 msgstr "@@image: 'figures/sharing-over-bluetooth.png'; md5=0a950502b42b1e7fdb9a57d5017e919c"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:168(None)
+#: C/mateuser-share.xml:168(None)
 msgid "@@image: 'figures/receiving-over-bluetooth.png'; md5=f292daef06767f39e346b222d3c448be"
 msgstr "@@image: 'figures/receiving-over-bluetooth.png'; md5=f292daef06767f39e346b222d3c448be"
 
-#: C/gnome-user-share.xml:10(title)
+#: C/mateuser-share.xml:10(title)
 msgid "Personal File Sharing Manual"
 msgstr "Handbok för personlig filutdelning"
 
-#: C/gnome-user-share.xml:12(year)
-#: C/gnome-user-share.xml:29(date)
+#: C/mateuser-share.xml:12(year)
+#: C/mateuser-share.xml:29(date)
 msgid "2009"
 msgstr "2009"
 
-#: C/gnome-user-share.xml:13(holder)
+#: C/mateuser-share.xml:13(holder)
 msgid "Red Hat, Inc."
 msgstr "Red Hat, Inc."
 
-#: C/gnome-user-share.xml:19(firstname)
+#: C/mateuser-share.xml:19(firstname)
 msgid "Matthias"
 msgstr "Matthias"
 
-#: C/gnome-user-share.xml:20(surname)
+#: C/mateuser-share.xml:20(surname)
 msgid "Clasen"
 msgstr "Clasen"
 
-#: C/gnome-user-share.xml:28(revnumber)
+#: C/mateuser-share.xml:28(revnumber)
 msgid "1.0"
 msgstr "1.0"
 
-#: C/gnome-user-share.xml:31(para)
+#: C/mateuser-share.xml:31(para)
 msgid "Matthias Clasen <email>[email protected]</email>"
 msgstr "Matthias Clasen <email>[email protected]</email>"
 
-#: C/gnome-user-share.xml:35(releaseinfo)
+#: C/mateuser-share.xml:35(releaseinfo)
 #| msgid ""
-#| "This manual describes version 2.26 of <application>gnome-user-share</"
+#| "This manual describes version 2.26 of <application>mateuser-share</"
 #| "application>."
-msgid "This manual describes version 2.26 of gnome-user-share."
-msgstr "Denna handbok beskriver version 2.26 av gnome-user-share."
+msgid "This manual describes version 2.26 of mateuser-share."
+msgstr "Denna handbok beskriver version 2.26 av mateuser-share."
 
-#: C/gnome-user-share.xml:37(title)
+#: C/mateuser-share.xml:37(title)
 msgid "Feedback"
 msgstr "Återkoppling"
 
-#: C/gnome-user-share.xml:38(para)
-msgid "To report a bug or make a suggestion regarding the gnome-user-share application or this manual, follow the directions in the <ulink url=\"ghelp:user-guide?feedback-bugs\" type=\"help\">GNOME Feedback Page</ulink>."
-msgstr "För att rapportera ett fel eller föreslå någonting angående programmet gnome-user-share eller denna handbok, följ anvisningarna på <ulink url=\"ghelp:user-guide?feedback-bugs\" type=\"help\">GNOME:s återkopplingssida</ulink>."
+#: C/mateuser-share.xml:38(para)
+msgid "To report a bug or make a suggestion regarding the mateuser-share application or this manual, follow the directions in the <ulink url=\"ghelp:user-guide?feedback-bugs\" type=\"help\">GNOME Feedback Page</ulink>."
+msgstr "För att rapportera ett fel eller föreslå någonting angående programmet mateuser-share eller denna handbok, följ anvisningarna på <ulink url=\"ghelp:user-guide?feedback-bugs\" type=\"help\">GNOME:s återkopplingssida</ulink>."
 
-#: C/gnome-user-share.xml:41(para)
+#: C/mateuser-share.xml:41(para)
 #| msgid ""
-#| "<application>gnome-user-share</application> is a session service that "
+#| "<application>mateuser-share</application> is a session service that "
 #| "enables easy sharing of files between several computers."
-msgid "gnome-user-share is a session service that enables easy sharing of files between several computers."
-msgstr "gnome-user-share är en sessionstjänst som tillåter enkel utdelning av filer mellan flera datorer."
+msgid "mateuser-share is a session service that enables easy sharing of files between several computers."
+msgstr "mateuser-share är en sessionstjänst som tillåter enkel utdelning av filer mellan flera datorer."
 
-#: C/gnome-user-share.xml:45(primary)
-msgid "gnome-user-share"
-msgstr "gnome-user-share"
+#: C/mateuser-share.xml:45(primary)
+msgid "mateuser-share"
+msgstr "mateuser-share"
 
-#: C/gnome-user-share.xml:46(primary)
+#: C/mateuser-share.xml:46(primary)
 msgid "file sharing"
 msgstr "filutdelning"
 
-#: C/gnome-user-share.xml:47(primary)
+#: C/mateuser-share.xml:47(primary)
 msgid "sharing"
 msgstr "delning"
 
-#: C/gnome-user-share.xml:50(title)
+#: C/mateuser-share.xml:50(title)
 msgid "Introduction"
 msgstr "Introduktion"
 
-#: C/gnome-user-share.xml:51(para)
-msgid "gnome-user-share is a session service that exports the contents of the <filename>Public</filename> folder in your home directory, so that they can easily be accessed from other computers on the same local network. On the other computers, the shared folder will appear with a name like '<replaceable>user</replaceable>'s shared files' in the <application>nautilus</application> Network window, where <replaceable>user</replaceable> will be replaced by your user name."
-msgstr "gnome-user-share är en sessionstjänst som exporterar innehållet i mappen <filename>Publikt</filename> i din hemkatalog, så att den enkelt kan kommas åt från andra datorer på samma lokala nätverk. På andra datorer så kommer den utdelade mappen att visas med ett namn såsom \"<replaceable>användaren</replaceable>'s shared files\" i <application>nautilus</application> nätverksfönster, där <replaceable>användaren</replaceable> kommer att ersättas med ditt användarnamn."
+#: C/mateuser-share.xml:51(para)
+msgid "mateuser-share is a session service that exports the contents of the <filename>Public</filename> folder in your home directory, so that they can easily be accessed from other computers on the same local network. On the other computers, the shared folder will appear with a name like '<replaceable>user</replaceable>'s shared files' in the <application>caja</application> Network window, where <replaceable>user</replaceable> will be replaced by your user name."
+msgstr "mateuser-share är en sessionstjänst som exporterar innehållet i mappen <filename>Publikt</filename> i din hemkatalog, så att den enkelt kan kommas åt från andra datorer på samma lokala nätverk. På andra datorer så kommer den utdelade mappen att visas med ett namn såsom \"<replaceable>användaren</replaceable>'s shared files\" i <application>caja</application> nätverksfönster, där <replaceable>användaren</replaceable> kommer att ersättas med ditt användarnamn."
 
-#: C/gnome-user-share.xml:54(para)
-msgid "gnome-user-share uses a WebDAV server to share the <filename>Public</filename> folder, and advertises the share on the local network using mDNS."
-msgstr "gnome-user-share använder en WebDAV-server för att dela ut mappen <filename>Publikt</filename> och annonserar utdelningen på det lokala nätverket med hjälp av mDNS."
+#: C/mateuser-share.xml:54(para)
+msgid "mateuser-share uses a WebDAV server to share the <filename>Public</filename> folder, and advertises the share on the local network using mDNS."
+msgstr "mateuser-share använder en WebDAV-server för att dela ut mappen <filename>Publikt</filename> och annonserar utdelningen på det lokala nätverket med hjälp av mDNS."
 
-#: C/gnome-user-share.xml:57(para)
-msgid "Additionally, gnome-user-share can make the shared files available via ObexFTP over Bluetooth, and receive files that are sent to your computer via Bluetooth via ObexPush."
-msgstr "I tillägg kan gnome-user-share göra de utdelade filerna tillgängliga via ObexFTP över Bluetooth och ta emot filer som skickas till din dator via Bluetooth via ObexPush."
+#: C/mateuser-share.xml:57(para)
+msgid "Additionally, mateuser-share can make the shared files available via ObexFTP over Bluetooth, and receive files that are sent to your computer via Bluetooth via ObexPush."
+msgstr "I tillägg kan mateuser-share göra de utdelade filerna tillgängliga via ObexFTP över Bluetooth och ta emot filer som skickas till din dator via Bluetooth via ObexPush."
 
-#: C/gnome-user-share.xml:63(title)
+#: C/mateuser-share.xml:63(title)
 msgid "Getting started"
 msgstr "Komma igång"
 
-#: C/gnome-user-share.xml:66(title)
-#| msgid "gnome-user-share"
-msgid "Starting gnome-user-share"
-msgstr "Starta gnome-user-share"
+#: C/mateuser-share.xml:66(title)
+#| msgid "mateuser-share"
+msgid "Starting mateuser-share"
+msgstr "Starta mateuser-share"
 
-#: C/gnome-user-share.xml:68(para)
-msgid "The gnome-user-share service is normally started by <application>gnome-session</application> when you log in. You can change this by opening <menuchoice><guimenu>Preferences</guimenu><guimenu>Sessions</guimenu></menuchoice> in the <guimenu>System</guimenu> menu, and modifying the 'User Sharing' entry in the list of startup programs."
-msgstr "Tjänsten gnome-user-share startas vanligtvis av <application>gnome-session</application> när du loggar in. Du kan ändra detta genom att öppna <menuchoice><guimenu>Inställningar</guimenu><guimenu>Sessioner</guimenu></menuchoice> i menyn <guimenu>System</guimenu> och ändra inställningen \"Användarutdelning\" i listan över uppstartsprogram."
+#: C/mateuser-share.xml:68(para)
+msgid "The mateuser-share service is normally started by <application>matesession</application> when you log in. You can change this by opening <menuchoice><guimenu>Preferences</guimenu><guimenu>Sessions</guimenu></menuchoice> in the <guimenu>System</guimenu> menu, and modifying the 'User Sharing' entry in the list of startup programs."
+msgstr "Tjänsten mateuser-share startas vanligtvis av <application>matesession</application> när du loggar in. Du kan ändra detta genom att öppna <menuchoice><guimenu>Inställningar</guimenu><guimenu>Sessioner</guimenu></menuchoice> i menyn <guimenu>System</guimenu> och ändra inställningen \"Användarutdelning\" i listan över uppstartsprogram."
 
-#: C/gnome-user-share.xml:72(para)
+#: C/mateuser-share.xml:72(para)
 msgid "To configure various aspects of file sharing, use the File Sharing Preferences, which can be found in the <guimenu>System</guimenu> menu under <menuchoice><guimenu>Preferences</guimenu><guimenu>Personal File Sharing</guimenu></menuchoice>."
 msgstr "För att konfigurera olika aspekter för filutdelning, använd Inställningar för filutdelning, vilken kan hittas i menyn <guimenu>System</guimenu> under <menuchoice><guimenu>Inställningar</guimenu><guimenu>Utdelning av personliga filer</guimenu></menuchoice>."
 
-#: C/gnome-user-share.xml:77(title)
+#: C/mateuser-share.xml:77(title)
 msgid "File Sharing Preferences"
 msgstr "Inställningar för filutdelning"
 
-#: C/gnome-user-share.xml:89(title)
+#: C/mateuser-share.xml:89(title)
 msgid "Enabling file sharing over the network"
 msgstr "Aktivera utdelning av filer över nätverket"
 
-#: C/gnome-user-share.xml:90(para)
-#: C/gnome-user-share.xml:134(para)
-#: C/gnome-user-share.xml:159(para)
+#: C/mateuser-share.xml:90(para)
+#: C/mateuser-share.xml:134(para)
+#: C/mateuser-share.xml:159(para)
 msgid "Open the File Sharing Preferences using <menuchoice><guimenu>Preferences</guimenu><guimenu>Personal File Sharing</guimenu></menuchoice> in the <guimenu>System</guimenu> menu."
 msgstr "Öppna Inställningar för filutdelning med <menuchoice><guimenu>Inställningar</guimenu><guimenu>Utdelning av personliga filer</guimenu></menuchoice> i menyn <guimenu>System</guimenu>."
 
-#: C/gnome-user-share.xml:95(title)
+#: C/mateuser-share.xml:95(title)
 msgid "Share Files over the Network"
 msgstr "Dela ut filer över nätverket"
 
-#: C/gnome-user-share.xml:106(para)
+#: C/mateuser-share.xml:106(para)
 msgid "Some firewall configurations on the local machine might cause problems with the advertisment, as well as the access to the shared files. Consult your system administrator for more details."
 msgstr "Vissa brandväggskonfigurationer på den lokala datorn kan orsaka problem med annonseringen, såväl som åtkomsten till de utdelade filerna. Kontakta din systemadministratör för mer information."
 
-#: C/gnome-user-share.xml:109(para)
+#: C/mateuser-share.xml:109(para)
 msgid "Select <guilabel>Never</guilabel> to allow everybody to freely read or write files in the shared folder."
 msgstr "Välj <guilabel>Aldrig</guilabel> för att tillåta alla att helt fritt läsa eller skriva filer i den delade mappen."
 
-#: C/gnome-user-share.xml:115(para)
+#: C/mateuser-share.xml:115(para)
 msgid "Select <guilabel>Always</guilabel> to require the password to read or write files in the shared folder."
 msgstr "Välj <guilabel>Alltid</guilabel> för att kräva ett lösenord för att läsa eller skriva filer i den delade mappen."
 
-#: C/gnome-user-share.xml:121(para)
+#: C/mateuser-share.xml:121(para)
 msgid "Select <guilabel>When writing files</guilabel> to allow everybody to freely read files in the shared folder, but require the password when writing files."
 msgstr "Välj <guilabel>När filer skrivs</guilabel> för att tillåta alla att helt fritt läsa filer i den delade mappen, men kräver ett lösenord när filer skrivs."
 
-#: C/gnome-user-share.xml:128(para)
+#: C/mateuser-share.xml:128(para)
 msgid "When you set a password, you have to give the password to all users that you want to have access to the shared files. Therefore, you should use a password that is different from other passwords you use."
 msgstr "När du anger ett lösenord så måste du ge lösenordet till alla användare som du vill ska ha åtkomst till de utdelade filerna. Därför bör du använda ett lösenord som inte används på andra platser."
 
-#: C/gnome-user-share.xml:104(para)
+#: C/mateuser-share.xml:104(para)
 msgid "To enable file sharing via WebDAV, use the <guilabel>Share public files on network</guilabel> checkbox. When file sharing it enabled, the controls for password protection allow to set a password that needs to be specified before a user on another computer is granted access to the shared files. <placeholder-1/><placeholder-2/><placeholder-3/>"
 msgstr "För att aktivera filutdelning via WebDAV, använd kryssrutan <guilabel>Dela ut publika filer på nätverket</guilabel>. När filutdelning är aktiverat så tillåter kontrollerna för lösenordsskydd att ett lösenord kan ställas in för att användare på andra datorer måste anges innan de får åtkomst till de utdelade filerna. <placeholder-1/><placeholder-2/><placeholder-3/>"
 
-#: C/gnome-user-share.xml:133(title)
+#: C/mateuser-share.xml:133(title)
 #| msgid "Share Files over Bluetooth"
 msgid "Enabling file sharing over Bluetooth"
 msgstr "Aktivera utdelning av filer över Bluetooth"
 
-#: C/gnome-user-share.xml:139(title)
+#: C/mateuser-share.xml:139(title)
 msgid "Share Files over Bluetooth"
 msgstr "Dela ut filer över Bluetooth"
 
-#: C/gnome-user-share.xml:152(para)
+#: C/mateuser-share.xml:152(para)
 msgid "When you allow unbonded remote devices to access your shared files, anybody with a Bluetooth-enabled cell phone in the vicinity of your computer can access and perhaps even modify your shared files."
 msgstr "När du tillåter fjärrenheter som inte är ihopparade att komma åt dina utdelade filer så kan alla med en Bluetooth-aktiverad mobiltelefon inom räckhåll för din dator komma åt och kanske även ändra dina utdelade filer."
 
-#: C/gnome-user-share.xml:148(para)
+#: C/mateuser-share.xml:148(para)
 msgid "To enable file sharing via Bluetooth, use the <guilabel>Share public files over Bluetooth</guilabel> checkbox. To allow remote Bluetooth devices to delete files in your shared folder, use the <guilabel>Allow remote devices to delete files</guilabel> checkbox. To allow remote Bluetooth devices to access your shared files even when they are not bonded with your computer, use the <guilabel>Require remote devices to pair with this computer</guilabel> checkbox. <placeholder-1/>"
 msgstr "För att aktivera filutdelning via Bluetooth, använd kryssrutan <guilabel>Dela ut publika filer över Bluetooth</guilabel>. För att tillåta fjärrenheter via Bluetooth att ta bort filer i din utdelade mapp, använd kryssrutan <guilabel>Tillåt fjärrenheter att ta bort filer</guilabel>. För att tillåta fjärrenheter via Bluetooth att komma åt dina utdelade filer även om de inte är ihopparade med din dator, använd kryssrutan <guilabel>Kräv att fjärrenheter paras ihop med denna dator</guilabel>. <placeholder-1/>"
 
-#: C/gnome-user-share.xml:158(title)
+#: C/mateuser-share.xml:158(title)
 msgid "Receiving Files over Bluetooth"
 msgstr "Ta emot filer över Bluetooth"
 
-#: C/gnome-user-share.xml:164(title)
+#: C/mateuser-share.xml:164(title)
 msgid "Receive Files over Bluetooth"
 msgstr "Ta emot filer över Bluetooth"
 
-#: C/gnome-user-share.xml:177(para)
+#: C/mateuser-share.xml:177(para)
 msgid "Select <guilabel>Always</guilabel> to allow any remote device to send files."
 msgstr "Välj <guilabel>Alltid</guilabel> för att tillåta alla fjärrenheter att skicka filer."
 
-#: C/gnome-user-share.xml:184(para)
+#: C/mateuser-share.xml:184(para)
 msgid "Bonded devices are the ones that were connected to your computer, and had to enter a PIN code to connect to or from."
 msgstr "Ihopparade enheter är de som blev anslutna till din dator och en PIN-kod angavs för att ansluta till eller från dem."
 
-#: C/gnome-user-share.xml:182(para)
+#: C/mateuser-share.xml:182(para)
 msgid "Select <guilabel>Only for Bonded devices</guilabel> to accept files only from bonded devices. <placeholder-1/>"
 msgstr "Välj <guilabel>Endast för ihopparade enheter</guilabel> för att endast acceptera filer från ihopparade enheter. <placeholder-1/>"
 
-#: C/gnome-user-share.xml:191(para)
+#: C/mateuser-share.xml:191(para)
 msgid "Devices can be marked as trusted in the <application>bluetooth-properties</application>'s <guilabel>Known devices</guilabel> section."
 msgstr "Enheter kan markeras som pålitliga i sektionen <guilabel>Kända enheter</guilabel> i <application>bluetooth-properties</application>."
 
-#: C/gnome-user-share.xml:189(para)
+#: C/mateuser-share.xml:189(para)
 msgid "Select <guilabel>Only for Bonded and Trusted devices</guilabel> to accept files only from bonded devices. <placeholder-1/>"
 msgstr "Välj <guilabel>Endast för ihopparade och pålitliga enheter</guilabel> för att endast acceptera filer från ihopparade och pålitliga enheter. <placeholder-1/>"
 
-#: C/gnome-user-share.xml:173(para)
+#: C/mateuser-share.xml:173(para)
 msgid "To let remote Bluetooth devices send files to your computer, use the <guilabel>Receive files in Downloads folder over Bluetooth</guilabel> checkbox. Received files will be stored in the <filename>Downloads</filename> folder in your home directory. When receiving files is enabled, the <guilabel>Accept files</guilabel> selection allows you to determine which remote devices are allowed to send files. <placeholder-1/>"
 msgstr "För att låta fjärrenheter via Bluetooth skicka filer till din dator, använd kryssrutan <guilabel>Ta emot filer i mappen Hämtat över Bluetooth</guilabel>. Mottagna filer kommer att lagras i mappen <filename>Hämtat</filename> i din hemkatalog. När mottagning av filer är aktiverat kommer valet av <guilabel>Acceptera filer</guilabel> att låta dig bestämma om fjärrenheter som tillåts att skicka filer. <placeholder-1/>"
 
-#: C/gnome-user-share.xml:196(para)
+#: C/mateuser-share.xml:196(para)
 msgid "Use the <guilabel>Notify about received files</guilabel> checkbox to select whether you want to be notified whenever a file is received via Bluetooth."
 msgstr "Använd kryssrutan <guilabel>Notifiera om mottagna filer</guilabel> för att välja huruvida du vill bli notifierad när en fil tas emot via Bluetooth."
 
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: C/gnome-user-share.xml:0(None)
+#: C/mateuser-share.xml:0(None)
 msgid "translator-credits"
 msgstr "Daniel Nylander <[email protected]>, 2009"
 
diff --git a/help/zh_CN/zh_CN.po b/help/zh_CN/zh_CN.po
index 3b68d74..9e75b2d 100644
--- a/help/zh_CN/zh_CN.po
+++ b/help/zh_CN/zh_CN.po
@@ -1,11 +1,11 @@
-# Simplified Chinese translation of gnome-user-share help document.
+# Simplified Chinese translation of mateuser-share help document.
 # Copyright (C) 2009 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gnome-user-share package.
+# This file is distributed under the same license as the mateuser-share package.
 # TeliuTe <[email protected]>, 2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share-help.HEAD\n"
+"Project-Id-Version: mateuser-share-help.HEAD\n"
 "POT-Creation-Date: 2010-06-13 17:48+0000\n"
 "PO-Revision-Date: 2010-06-16 14:20+0800\n"
 "Last-Translator: TeliuTe <[email protected]>\n"
@@ -99,7 +99,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:81(None)
+#: C/mateuser-share.xml:81(None)
 msgid ""
 "@@image: 'figures/file-sharing-preferences.png'; "
 "md5=7ae616b8043b36be1f4943ba06d8a5ed"
@@ -109,7 +109,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:99(None)
+#: C/mateuser-share.xml:99(None)
 msgid ""
 "@@image: 'figures/sharing-over-the-network.png'; "
 "md5=ee8b44eb1290e4d1ae9b1e8fe8501860"
@@ -119,7 +119,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:143(None)
+#: C/mateuser-share.xml:143(None)
 msgid ""
 "@@image: 'figures/sharing-over-bluetooth.png'; "
 "md5=0a950502b42b1e7fdb9a57d5017e919c"
@@ -129,7 +129,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/gnome-user-share.xml:168(None)
+#: C/mateuser-share.xml:168(None)
 msgid ""
 "@@image: 'figures/receiving-over-bluetooth.png'; "
 "md5=f292daef06767f39e346b222d3c448be"
@@ -137,128 +137,128 @@ msgstr ""
 "@@image: 'figures/receiving-over-bluetooth.png'; "
 "md5=f292daef06767f39e346b222d3c448be"
 
-#: C/gnome-user-share.xml:10(title)
+#: C/mateuser-share.xml:10(title)
 msgid "Personal File Sharing Manual"
 msgstr "个人文件共享手册"
 
-#: C/gnome-user-share.xml:12(year) C/gnome-user-share.xml:29(date)
+#: C/mateuser-share.xml:12(year) C/mateuser-share.xml:29(date)
 msgid "2009"
 msgstr "2009"
 
-#: C/gnome-user-share.xml:13(holder)
+#: C/mateuser-share.xml:13(holder)
 msgid "Red Hat, Inc."
 msgstr "Red Hat, Inc."
 
-#: C/gnome-user-share.xml:19(firstname)
+#: C/mateuser-share.xml:19(firstname)
 msgid "Matthias"
 msgstr "Matthias"
 
-#: C/gnome-user-share.xml:20(surname)
+#: C/mateuser-share.xml:20(surname)
 msgid "Clasen"
 msgstr "Clasen"
 
-#: C/gnome-user-share.xml:28(revnumber)
+#: C/mateuser-share.xml:28(revnumber)
 msgid "1.0"
 msgstr "1.0"
 
-#: C/gnome-user-share.xml:31(para)
+#: C/mateuser-share.xml:31(para)
 msgid "Matthias Clasen <email>[email protected]</email>"
 msgstr "Matthias Clasen <email>[email protected]</email>"
 
-#: C/gnome-user-share.xml:35(releaseinfo)
-msgid "This manual describes version 2.26 of gnome-user-share."
+#: C/mateuser-share.xml:35(releaseinfo)
+msgid "This manual describes version 2.26 of mateuser-share."
 msgstr "本手册讲述的是用户共享手册 2.26 版。"
 
-#: C/gnome-user-share.xml:37(title)
+#: C/mateuser-share.xml:37(title)
 msgid "Feedback"
 msgstr "反馈"
 
-#: C/gnome-user-share.xml:38(para)
+#: C/mateuser-share.xml:38(para)
 msgid ""
-"To report a bug or make a suggestion regarding the gnome-user-share "
+"To report a bug or make a suggestion regarding the mateuser-share "
 "application or this manual, follow the directions in the <ulink url=\"ghelp:"
 "user-guide?feedback-bugs\" type=\"help\">GNOME Feedback Page</ulink>."
 msgstr ""
 "要报告关于用户共享或使用手册中的缺陷，或者提出建议，请参照 <ulink url="
-"\"ghelp:gnome-feedback\" type=\"help\">GNOME 反馈页</ulink> 上的指导。"
+"\"ghelp:matefeedback\" type=\"help\">GNOME 反馈页</ulink> 上的指导。"
 
-#: C/gnome-user-share.xml:41(para)
+#: C/mateuser-share.xml:41(para)
 msgid ""
-"gnome-user-share is a session service that enables easy sharing of files "
+"mateuser-share is a session service that enables easy sharing of files "
 "between several computers."
 msgstr "用户共享是一个会话服务，可以很方便地在不同计算机之间共享文件。"
 
-#: C/gnome-user-share.xml:45(primary)
-msgid "gnome-user-share"
+#: C/mateuser-share.xml:45(primary)
+msgid "mateuser-share"
 msgstr "GNOME 用户共享"
 
-#: C/gnome-user-share.xml:46(primary)
+#: C/mateuser-share.xml:46(primary)
 msgid "file sharing"
 msgstr "文件共享"
 
-#: C/gnome-user-share.xml:47(primary)
+#: C/mateuser-share.xml:47(primary)
 msgid "sharing"
 msgstr "共享"
 
-#: C/gnome-user-share.xml:50(title)
+#: C/mateuser-share.xml:50(title)
 msgid "Introduction"
 msgstr "介绍"
 
-#: C/gnome-user-share.xml:51(para)
+#: C/mateuser-share.xml:51(para)
 msgid ""
-"gnome-user-share is a session service that exports the contents of the "
+"mateuser-share is a session service that exports the contents of the "
 "<filename>Public</filename> folder in your home directory, so that they can "
 "easily be accessed from other computers on the same local network. On the "
 "other computers, the shared folder will appear with a name like "
 "'<replaceable>user</replaceable>'s shared files' in the "
-"<application>nautilus</application> Network window, where <replaceable>user</"
+"<application>caja</application> Network window, where <replaceable>user</"
 "replaceable> will be replaced by your user name."
 msgstr ""
 "用户共享是一个会话服务，用于输出您的主目录中的 <filename>公共</filename> 文件"
 "夹的内容，其他人可以通过局域网很方便地访问。在其他计算机上，共享的文件夹会出"
-"现在 <application>nautilus 文件管理器</application> 的网络窗口中，是一个"
+"现在 <application>caja 文件管理器</application> 的网络窗口中，是一个"
 "叫“<replaceable>user</replaceable> 的共享文件夹 ”，这儿的 <replaceable>user</"
 "replaceable>，将会是您的用户名。"
 
-#: C/gnome-user-share.xml:54(para)
+#: C/mateuser-share.xml:54(para)
 msgid ""
-"gnome-user-share uses a WebDAV server to share the <filename>Public</"
+"mateuser-share uses a WebDAV server to share the <filename>Public</"
 "filename> folder, and advertises the share on the local network using mDNS."
 msgstr ""
 "GNOME 用户共享使用一个 WebDAV 服务来共享 <filename>公共</filename> 文件夹，并"
 "且使用 mDNS 在局域网中通知共享。"
 
-#: C/gnome-user-share.xml:57(para)
+#: C/mateuser-share.xml:57(para)
 msgid ""
-"Additionally, gnome-user-share can make the shared files available via "
+"Additionally, mateuser-share can make the shared files available via "
 "ObexFTP over Bluetooth, and receive files that are sent to your computer via "
 "Bluetooth via ObexPush."
 msgstr ""
 "另外，GNOME 用户共享能使共享文件夹通过 ObexFTP 到蓝牙，并通过您计算机上的蓝"
 "牙 ObexPush 来接收文件。"
 
-#: C/gnome-user-share.xml:63(title)
+#: C/mateuser-share.xml:63(title)
 msgid "Getting started"
 msgstr "快速入门"
 
-#: C/gnome-user-share.xml:66(title)
-msgid "Starting gnome-user-share"
+#: C/mateuser-share.xml:66(title)
+msgid "Starting mateuser-share"
 msgstr "启动 GNOME 用户共享"
 
-#: C/gnome-user-share.xml:68(para)
+#: C/mateuser-share.xml:68(para)
 msgid ""
-"The gnome-user-share service is normally started by <application>gnome-"
+"The mateuser-share service is normally started by <application>mate"
 "session</application> when you log in. You can change this by opening "
 "<menuchoice><guimenu>Preferences</guimenu><guimenu>Startup Applications</"
 "guimenu></menuchoice> in the <guimenu>System</guimenu> menu, and modifying "
 "the 'User Sharing' entry in the list of startup programs."
 msgstr ""
-"GNOME 用户共享服务在您登录时，由 <application>gnome-session</application> 正"
+"GNOME 用户共享服务在您登录时，由 <application>matesession</application> 正"
 "常启动，可以通过 <guimenu>系统</guimenu> 菜单的 <menuchoice><guimenu>首选项</"
 "guimenu><guimenu>启动的应用程序</guimenu></menuchoice> 菜单来改变，点击“用户"
 "共享”条目来设置它。"
 
-#: C/gnome-user-share.xml:72(para)
+#: C/mateuser-share.xml:72(para)
 msgid ""
 "To configure various aspects of file sharing, use the File Sharing "
 "Preferences, which can be found in the <guimenu>System</guimenu> menu under "
@@ -269,16 +269,16 @@ msgstr ""
 "的  <menuchoice><guimenu>首选项</guimenu><guimenu>个人文件共享</guimenu></"
 "menuchoice>。"
 
-#: C/gnome-user-share.xml:77(title)
+#: C/mateuser-share.xml:77(title)
 msgid "File Sharing Preferences"
 msgstr "文件共享首选项"
 
-#: C/gnome-user-share.xml:89(title)
+#: C/mateuser-share.xml:89(title)
 msgid "Enabling file sharing over the network"
 msgstr "允许在网络上文件共享"
 
-#: C/gnome-user-share.xml:90(para) C/gnome-user-share.xml:134(para)
-#: C/gnome-user-share.xml:159(para)
+#: C/mateuser-share.xml:90(para) C/mateuser-share.xml:134(para)
+#: C/mateuser-share.xml:159(para)
 msgid ""
 "Open the File Sharing Preferences using <menuchoice><guimenu>Preferences</"
 "guimenu><guimenu>Personal File Sharing</guimenu></menuchoice> in the "
@@ -287,11 +287,11 @@ msgstr ""
 "打开文件共享首选项 <guimenu>系统</guimenu> 菜单的 <menuchoice><guimenu>首选项"
 "</guimenu><guimenu>个人文件共享</guimenu></menuchoice> 菜单。"
 
-#: C/gnome-user-share.xml:95(title)
+#: C/mateuser-share.xml:95(title)
 msgid "Share Files over the Network"
 msgstr "在网络上共享文件"
 
-#: C/gnome-user-share.xml:106(para)
+#: C/mateuser-share.xml:106(para)
 msgid ""
 "Some firewall configurations on the local machine might cause problems with "
 "the advertisment, as well as the access to the shared files. Consult your "
@@ -300,21 +300,21 @@ msgstr ""
 "在你访问共享文件夹的时候，本地机子上的防火墙的配置可能会导致错误提示。请联系"
 "您的系统管理员以获得更多信息。"
 
-#: C/gnome-user-share.xml:109(para)
+#: C/mateuser-share.xml:109(para)
 msgid ""
 "Select <guilabel>Never</guilabel> to allow everybody to freely read or write "
 "files in the shared folder."
 msgstr ""
 "选中 <guilabel>从不</guilabel> 允许任何人随意读和写共享文件夹里的文件。"
 
-#: C/gnome-user-share.xml:115(para)
+#: C/mateuser-share.xml:115(para)
 msgid ""
 "Select <guilabel>Always</guilabel> to require the password to read or write "
 "files in the shared folder."
 msgstr ""
 "选择 <guilabel>总是</guilabel> 需要密码验证才能读和写共享文件夹里的文件。"
 
-#: C/gnome-user-share.xml:121(para)
+#: C/mateuser-share.xml:121(para)
 msgid ""
 "Select <guilabel>When writing files</guilabel> to allow everybody to freely "
 "read files in the shared folder, but require the password when writing files."
@@ -322,7 +322,7 @@ msgstr ""
 "选择 <guilabel>当写入文件时</guilabel> 允许任何人读取文件，但写文件时需要密码"
 "验证。"
 
-#: C/gnome-user-share.xml:128(para)
+#: C/mateuser-share.xml:128(para)
 msgid ""
 "When you set a password, you have to give the password to all users that you "
 "want to have access to the shared files. Therefore, you should use a "
@@ -331,7 +331,7 @@ msgstr ""
 "如果您设定了一个密码，你就得把密码发给每一个您允许访问共享文件的用户。因此，"
 "这个密码应该跟您的用户登录密码不同。"
 
-#: C/gnome-user-share.xml:104(para)
+#: C/mateuser-share.xml:104(para)
 msgid ""
 "To enable file sharing via WebDAV, use the <guilabel>Share public files on "
 "network</guilabel> checkbox. When file sharing it enabled, the controls for "
@@ -343,15 +343,15 @@ msgstr ""
 "当文件共享启用时，密码保护控件允许您设置一个密码，当其他计算机想要访问共享文"
 "件是指定。<placeholder-1/><placeholder-2/><placeholder-3/>"
 
-#: C/gnome-user-share.xml:133(title)
+#: C/mateuser-share.xml:133(title)
 msgid "Enabling file sharing over Bluetooth"
 msgstr "允许通过蓝牙共享文件"
 
-#: C/gnome-user-share.xml:139(title)
+#: C/mateuser-share.xml:139(title)
 msgid "Share Files over Bluetooth"
 msgstr "通过蓝牙共享文件"
 
-#: C/gnome-user-share.xml:152(para)
+#: C/mateuser-share.xml:152(para)
 msgid ""
 "When you allow unbonded remote devices to access your shared files, anybody "
 "with a Bluetooth-enabled cell phone in the vicinity of your computer can "
@@ -360,7 +360,7 @@ msgstr ""
 "当您允许非配对的远程设备访问您的共享文件时，任何人可以通过蓝牙手机在您的计算"
 "机附件访问、甚至修改您的共享文件。"
 
-#: C/gnome-user-share.xml:148(para)
+#: C/mateuser-share.xml:148(para)
 msgid ""
 "To enable file sharing via Bluetooth, use the <guilabel>Share public files "
 "over Bluetooth</guilabel> checkbox. To allow remote Bluetooth devices to "
@@ -376,27 +376,27 @@ msgstr ""
 "算机配对，选中 <guilabel>需要远程设备与此计算机配对</guilabel> 复选框。 "
 "<placeholder-1/>"
 
-#: C/gnome-user-share.xml:158(title)
+#: C/mateuser-share.xml:158(title)
 msgid "Receiving Files over Bluetooth"
 msgstr "通过蓝牙接收文件"
 
-#: C/gnome-user-share.xml:164(title)
+#: C/mateuser-share.xml:164(title)
 msgid "Receive Files over Bluetooth"
 msgstr "通过蓝牙接收文件"
 
-#: C/gnome-user-share.xml:177(para)
+#: C/mateuser-share.xml:177(para)
 msgid ""
 "Select <guilabel>Always</guilabel> to allow any remote device to send files."
 msgstr "选择 <guilabel>总是</guilabel> 允许其他远程设备发送文件。"
 
-#: C/gnome-user-share.xml:184(para)
+#: C/mateuser-share.xml:184(para)
 msgid ""
 "Bonded devices are the ones that were connected to your computer, and had to "
 "enter a PIN code to connect to or from."
 msgstr ""
 "配对设备是一个正在连接到您计算机的设备，已经输入了一个 PIN 代码来连接的。"
 
-#: C/gnome-user-share.xml:182(para)
+#: C/mateuser-share.xml:182(para)
 msgid ""
 "Select <guilabel>Only for Bonded devices</guilabel> to accept files only "
 "from bonded devices. <placeholder-1/>"
@@ -404,7 +404,7 @@ msgstr ""
 "选择 <guilabel>仅配对的设备</guilabel> 只接收配对设备传输的文件。"
 "<placeholder-1/>"
 
-#: C/gnome-user-share.xml:191(para)
+#: C/mateuser-share.xml:191(para)
 msgid ""
 "Devices can be marked as trusted in the <application>bluetooth-properties</"
 "application>'s <guilabel>Known devices</guilabel> section."
@@ -412,7 +412,7 @@ msgstr ""
 "在 <application>蓝牙-属性</application> 的 <guilabel>已知设备</guilabel> 中，"
 "可以标记设备为信任。"
 
-#: C/gnome-user-share.xml:189(para)
+#: C/mateuser-share.xml:189(para)
 msgid ""
 "Select <guilabel>Only for Bonded and Trusted devices</guilabel> to accept "
 "files only from bonded devices. <placeholder-1/>"
@@ -420,7 +420,7 @@ msgstr ""
 "选择 <guilabel>仅配对的和信任的设备</guilabel> 只接收从配对的和信任的设备传输"
 "的文件。"
 
-#: C/gnome-user-share.xml:173(para)
+#: C/mateuser-share.xml:173(para)
 msgid ""
 "To let remote Bluetooth devices send files to your computer, use the "
 "<guilabel>Receive files in Downloads folder over Bluetooth</guilabel> "
@@ -434,7 +434,7 @@ msgstr ""
 "filename> 文件夹中。当启用接收文件，<guilabel>接收文件</guilabel> 面板允许您"
 "设定哪一个远程设备被允许发送文件。<placeholder-1/>"
 
-#: C/gnome-user-share.xml:196(para)
+#: C/mateuser-share.xml:196(para)
 msgid ""
 "Use the <guilabel>Notify about received files</guilabel> checkbox to select "
 "whether you want to be notified whenever a file is received via Bluetooth."
@@ -443,6 +443,6 @@ msgstr ""
 "否出现提示。"
 
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
-#: C/gnome-user-share.xml:0(None)
+#: C/mateuser-share.xml:0(None)
 msgid "translator-credits"
 msgstr "TeliuTe <[email protected]>, 2009, 2010"
diff --git a/po/ChangeLog b/po/ChangeLog
index a49664e..23d3000 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -16,11 +16,11 @@
 
 	* ar.po: Updated Arabic translation by Osama Khalid.
 
-2009-03-16  Ignacio Casal Quinteiro  <[email protected]>
+2009-03-16  Ignacio Casal Quinteiro  <icq@mateorg>
 
 	 * gl.po: Updated Galician translation by Suso Baleato.
 
-2009-03-16  Amitakhya Phukan <[email protected]>
+2009-03-16  Amitakhya Phukan <[email protected]>
 
 	* LINGUAS: Added as.
 	* as.po: Updated Assamese translations.
@@ -29,7 +29,7 @@
 
 	* cs.po: Updated Czech translation by Martin Picek.
 
-2009-03-15  Kostas Papadimas <[email protected]>
+2009-03-15  Kostas Papadimas <pkst@mateorg>
 
 	* el.po: Updated Greek Translation by Pierros Papadeas.
 
@@ -132,7 +132,7 @@
 
 	* ko.po: Updated Korean translation.
 
-2009-02-17  Gil Forcada  <[email protected]>
+2009-02-17  Gil Forcada  <gforcada@mateorg>
 
 	* ca.po: Updated Catalan translation.
 
@@ -150,11 +150,11 @@
 
 	* da.po: Updated Danish translation by Ask H. Larsen
 
-2009-02-14  Gabor Kelemen  <[email protected]>
+2009-02-14  Gabor Kelemen  <kelemeng@matehu>
 
 	* hu.po: Translation updated.
 
-2009-02-14  Wouter Bolsterlee  <[email protected]>
+2009-02-14  Wouter Bolsterlee  <[email protected]>
 
 	* nl.po: Updated Dutch translation by Wouter Bolsterlee.
 
@@ -167,7 +167,7 @@
 	* bg.po: Updated Bulgarian translation by
 	Alexander Shopov <[email protected]>
 
-2009-02-10  Kjartan Maraas  <[email protected]>
+2009-02-10  Kjartan Maraas  <kmaraas@mateorg>
 
 	* nb.po: Updated Norwegian bokmål translation.
 
@@ -193,7 +193,7 @@
 
 	* sv.po: Updated Swedish translation.
 
-2009-01-31  Jorge Gonzalez  <[email protected]>
+2009-01-31  Jorge Gonzalez  <[email protected]>
 
 	* es.po: Updated Spanish translation
 
@@ -207,11 +207,11 @@
 
 	* fr.po: Updated French translation.
 
-2009-01-29  Gil Forcada  <[email protected]>
+2009-01-29  Gil Forcada  <gforcada@mateorg>
 
 	* ca.po: Updated Catalan translation.
 
-2009-01-29  Kjartan Maraas  <[email protected]>
+2009-01-29  Kjartan Maraas  <kmaraas@mateorg>
 
 	* nb.po: Updated Norwegian bokmål translation.
 
@@ -219,7 +219,7 @@
 
 	* ko.po: Updated Korean translation.
 
-2009-01-28  Jorge Gonzalez  <[email protected]>
+2009-01-28  Jorge Gonzalez  <[email protected]>
 
 	* es.po: Updated Spanish translation
 
@@ -227,16 +227,16 @@
 
 	* zh_CN.po: Updated zh_CN translation.
 
-2009-01-28  Simos Xenitellis  <[email protected]>
+2009-01-28  Simos Xenitellis  <simos@mateorg>
 
-	* el.po: Fixed 569467 – wrong translations in gnome-user-share.
+	* el.po: Fixed 569467 – wrong translations in mateuser-share.
 
 2009-01-28  Runa Bhattacharjee  <[email protected]>
 
 	* bn_IN.po: Added Bengali India Translations
 	* LINGUAS: Added Entry for Bengali India to the list of languages
 
-2009-01-27  Jorge Gonzalez  <[email protected]>
+2009-01-27  Jorge Gonzalez  <[email protected]>
 
 	* es.po: Updated Spanish translation.
 
@@ -244,7 +244,7 @@
 
 	* fi.po: Updated Finnish translation.
 
-2009-01-26  Jonh Wendell  <[email protected]>
+2009-01-26  Jonh Wendell  <jwendell@mateorg>
 
 	* pt_BR.po: Brazilian Portuguese translation updated by Djavan Fagundes.
 
@@ -252,7 +252,7 @@
 
 	* de.po: Updated German translation.
 
-2009-01-23  Gil Forcada  <[email protected]>
+2009-01-23  Gil Forcada  <gforcada@mateorg>
 
 	* ca.po: Updated Catalan translation.
 
@@ -268,7 +268,7 @@
 
 	* sv.po: Updated Swedish translation.
 
-2009-01-19  Jorge Gonzalez  <[email protected]>
+2009-01-19  Jorge Gonzalez  <[email protected]>
 
 	* es.po: Updated Spanish translation.
 
@@ -276,7 +276,7 @@
 
 	* POTFILES.in: Remove Glade file, and GtkBuilder file
 
-2009-01-19  Kjartan Maraas  <[email protected]>
+2009-01-19  Kjartan Maraas  <kmaraas@mateorg>
 
 	* nb.po: Updated Norwegian bokmål translation.
 
@@ -292,7 +292,7 @@
 
 	* th.po, LINGUAS: Added Thai translation by Manatsawin.
 
-2009-01-14  Jorge Gonzalez  <[email protected]>
+2009-01-14  Jorge Gonzalez  <[email protected]>
 
 	* es.po: Updated Spanish translation.
 
@@ -304,11 +304,11 @@
 
 	* ja.po: Updated Japanese translation.
 
-2008-12-16  Gabor Kelemen  <[email protected]>
+2008-12-16  Gabor Kelemen  <kelemeng@matehu>
 
 	* hu.po: Translation updated.
 
-2008-12-16  Kjartan Maraas  <[email protected]>
+2008-12-16  Kjartan Maraas  <kmaraas@mateorg>
 
 	* nb.po: Updated Norwegian bokmål translation.
 
@@ -316,7 +316,7 @@
 
 	* he.po, LINGUAS: Added Hebrew translation.
 
-2008-12-06  Leonardo Ferreira Fontenelle  <[email protected]>
+2008-12-06  Leonardo Ferreira Fontenelle  <leonardof@mateorg>
 
 	* pt_BR.po: Updated Brazilian Portuguese translation. Contributed by
 	Fábio Nogueira.
@@ -329,7 +329,7 @@
 
 	* pl.po: Updated Polish translation
 
-2008-10-16  Jorge Gonzalez  <[email protected]>
+2008-10-16  Jorge Gonzalez  <[email protected]>
 
 	* es.po: Updated Spanish translation
 
@@ -349,7 +349,7 @@
 
 	* pl.po: Updated Polish translation
 
-2008-09-07  Leonardo Ferreira Fontenelle  <[email protected]>
+2008-09-07  Leonardo Ferreira Fontenelle  <leonardof@mateorg>
 
 	* pt_BR.po: Brazilian Portuguese translation updated by Djavan
 	Fagundes.
@@ -370,15 +370,15 @@
 
 	* sv.po: Updated Swedish translation.
 
-2008-07-20  Jorge Gonzalez  <[email protected]>
+2008-07-20  Jorge Gonzalez  <[email protected]>
 
 	* es.po: Updated Spanish translation
 
-2008-07-13  Kjartan Maraas  <[email protected]>
+2008-07-13  Kjartan Maraas  <kmaraas@mateorg>
 
 	* nb.po: Updated Norwegian bokmål translation.
 
-2008-07-09  Kjartan Maraas <[email protected]>
+2008-07-09  Kjartan Maraas <kmaraas@mateorg>
 
 	* POTFILES.in: Add missing file.
 	* nb.po: Updated Norwegian bokmål translation.
@@ -387,11 +387,11 @@
 
 	* oc.po: Updated Occitan translation.
 
-2008-06-20  Jonh Wendell  <[email protected]>
+2008-06-20  Jonh Wendell  <jwendell@mateorg>
 
 	* pt_BR.po: Updated Brazilian Portuguese translation by Fábio Nogueira.
 
-2008-04-27  Gabor Kelemen  <[email protected]>
+2008-04-27  Gabor Kelemen  <kelemeng@mateorg>
 
 	* hu.po: Translation updated.
 
@@ -403,15 +403,15 @@
 
 	* ja.po: Updated Japanese translation.
 
-2008-03-22  Kostas Papadimas <[email protected]>
+2008-03-22  Kostas Papadimas <pkst@mateorg>
 
 	* el.po: Updated  Greek translation by Giannis Katsampiris.
 
-2008-03-16  Jorge Gonzalez  <[email protected]>
+2008-03-16  Jorge Gonzalez  <[email protected]>
 
 	* es.po: Updated Spanish translation
 
-2008-03-11  Gil Forcada  <[email protected]>
+2008-03-11  Gil Forcada  <gforcada@mateorg>
 
 	* ca.po: Updated Catalan translation.
 
@@ -420,7 +420,7 @@
 	* LINGUAS: Added 'eu' (Basque) entry.
 	* eu.po: Add Basque translation.
 
-2008-03-09  Philip Withnall  <[email protected]>
+2008-03-09  Philip Withnall  <[email protected]>
 
 	* en_GB.po: Updated British English translation.
 
@@ -430,9 +430,9 @@
 
 2008-03-08  Jaap Haitsma  <[email protected]>
 
-	* POTFILES.skip: Add gnome-user-share-properties.ui
+	* POTFILES.skip: Add mateuser-share-properties.ui
 
-2008-03-01  Leonardo Ferreira Fontenelle  <[email protected]>
+2008-03-01  Leonardo Ferreira Fontenelle  <[email protected]>
 
 	* pt_BR.po: Updated Brazilian Portuguese translation.
 
@@ -461,11 +461,11 @@
 
 	* ne.po: Updated Nepali Translation.
 
-2008-02-07  Artur Flinta  <[email protected]>
+2008-02-07  Artur Flinta  <[email protected]>
 
 	* pl.po: Updated Polish translation by GNOME PL Team.
 
-2008-01-27  Jorge Gonzalez  <[email protected]>
+2008-01-27  Jorge Gonzalez  <[email protected]>
 
 	* es.po: Updated Spanish translation
 
@@ -473,7 +473,7 @@
 
 	* POTFILES.in: update for new files
 
-2008-01-21  Jorge Gonzalez  <[email protected]>
+2008-01-21  Jorge Gonzalez  <[email protected]>
 
 	* es.po: Updated Spanish translation.
 
@@ -499,7 +499,7 @@
 	* pt.po: Added Portuguese translation by André Neves
 	<[email protected]>.
 
-2007-10-21  Matej Urbančič  <[email protected]>
+2007-10-21  Matej Urbančič  <[email protected]>
 
 	* sl.po: Added Slovenian translation.
 
@@ -511,16 +511,16 @@
 
 	* fi.po: Updated Finnish translation.
 
-2007-06-29  Artur Flinta  <[email protected]>
+2007-06-29  Artur Flinta  <[email protected]>
 
 	* pl.po: Updated Polish translation by GNOME PL Team.
 
-2007-06-02  Leonardo Ferreira Fontenelle  <[email protected]>
+2007-06-02  Leonardo Ferreira Fontenelle  <[email protected]>
 
 	* pt_BR.po: Improvements in Brazilian Portuguese translation by Og
 	Maciel <[email protected]>. Closes bug #442764.
 
-2007-04-25  Hendrik Richter  <[email protected]>
+2007-04-25  Hendrik Richter  <hendrikr@mateorg>
 
 	* de.po: Updated German translation, fix #431689.
 
@@ -532,9 +532,9 @@
 
 	* ja.po: Updated Japanese translation.
 
-=== gnome-user-share 0.11 ===
+=== mateuser-share 0.11 ===
 
-2007-01-24  Kjartan Maraas  <[email protected]>
+2007-01-24  Kjartan Maraas  <kmaraas@mateorg>
 
 	* nb.po: Updated Norwegian bokmål translation.
 
@@ -551,7 +551,7 @@
 	* ar.po: Added Arabic Translation.
 	* LINGUAS: Added ar.
 
-2006-11-14  Guilherme de S. Pastore  <[email protected]>
+2006-11-14  Guilherme de S. Pastore  <gpastore@mateorg>
 
 	* pt_BR.po: updated Brazilian Portuguese translation.
 
@@ -563,7 +563,7 @@
 
 	* en_GB.po: British (English) translation updated.
 
-2006-09-06  Vincent van Adrighem  <[email protected]>
+2006-09-06  Vincent van Adrighem  <adrighem@mateorg>
 
 	* nl.po: Translation updated by Tino Meinen.
 
@@ -572,7 +572,7 @@
 	* fr.po: Updated French translation from
 	Damien Durand <[email protected]>.
 
-2006-08-16  Gabor Kelemen  <[email protected]>
+2006-08-16  Gabor Kelemen  <kelemeng@matehu>
 
 	* hu.po: Translation updated.
 
@@ -613,7 +613,7 @@
 
 	* gl.po: Updated Galician Translation.
 
-=== gnome-user-share 0.10 ===
+=== mateuser-share 0.10 ===
 
 2006-04-16  Daniel Nylander  <[email protected]>
 
@@ -623,7 +623,7 @@
 
 	* fi.po: Updated Finnish translation.
 
-2006-01-12  Vincent van Adrighem  <[email protected]>
+2006-01-12  Vincent van Adrighem  <adrighem@mateorg>
 
 	* nl.po: Translation updated by Tino Meinen.
 
@@ -635,11 +635,11 @@
 
 	* ca.po: Updated Catalan translation.
 
-2006-01-07  Gabor Kelemen  <[email protected]>
+2006-01-07  Gabor Kelemen  <kelemeng@matehu>
 
 	* hu.po: Hungarian translation updated.
 
-2006-01-06  Kjartan Maraas <[email protected]>
+2006-01-06  Kjartan Maraas <kmaraas@mateorg>
 
 	* nb.po: Add these.
 	* no.po:
@@ -662,17 +662,17 @@
 
 	* cs.po: Updated Czech translation.
 
-=== gnome-user-share 0.9 ===
+=== mateuser-share 0.9 ===
 
-2005-11-19  Takeshi AIHANA <[email protected]>
+2005-11-19  Takeshi AIHANA <[email protected]>
 
 	* ja.po: Updated Japanese translation.
 
-2005-11-17  Adam Weinberger  <[email protected]>
+2005-11-17  Adam Weinberger  <adamw@mateorg>
 
 	* en_CA.po: Updated Canadian English translation.
 
-2005-11-17  Francisco Javier F. Serrador  <[email protected]>
+2005-11-17  Francisco Javier F. Serrador  <[email protected]>
 
 	* es.po: Updated Spanish translation.
 
@@ -683,10 +683,10 @@
 2005-11-14  Alexander Larsson  <[email protected]>
 
 	* POTFILES.in:
-	Add gnome-user-share-properties.desktop.in
+	Add mateuser-share-properties.desktop.in
 
-=== gnome-user-share 0.7 ===
-=== gnome-user-share 0.6 ===
+=== mateuser-share 0.7 ===
+=== mateuser-share 0.6 ===
 
 2005-10-16  Funda Wang  <[email protected]>
 
@@ -737,11 +737,11 @@
 
 	* rw.po: Added Kinyarwanda translation.
 
-2005-03-18  Gabor Kelemen  <[email protected]>
+2005-03-18  Gabor Kelemen  <kelemeng@matehu>
 
 	* hu.po: Hungarian translation added.
 
-2005-03-16  Adam Weinberger  <[email protected]>
+2005-03-16  Adam Weinberger  <adamw@mateorg>
 
 	* en_CA.po: Updated Canadian English translation.
 
@@ -749,11 +749,11 @@
 
 	* ca.po: Added Catalan translation by Gil Forcada
 
-2005-02-17  Vincent van Adrighem  <[email protected]>
+2005-02-17  Vincent van Adrighem  <adrighem@mateorg>
 
 	* nl.po: Translation updated by Tino Meinen.
 
-2005-02-15  Takeshi AIHANA <[email protected]>
+2005-02-15  Takeshi AIHANA <[email protected]>
 
 	* ja.po: Updated Japanese translation.
 
@@ -761,7 +761,7 @@
 
 	* en_GB.po: Updated British translation.
 
-2005-02-10  Kostas Papadimas <[email protected]>
+2005-02-10  Kostas Papadimas <pkst@mateorg>
 
 	* el.po: Added the  Greek translation.
 
@@ -773,15 +773,15 @@
 
 	* cs.po: Updated Czech translation.
 
-2005-02-05  Frank Arnold  <[email protected]>
+2005-02-05  Frank Arnold  <[email protected]>
 
 	* de.po: Updated German translation.
 
-2005-02-05  Francisco Javier F. Serrador  <[email protected]>
+2005-02-05  Francisco Javier F. Serrador  <[email protected]>
 
 	* es.po: Updated Spanish translation.
 
-2005-02-04  Adam Weinberger  <[email protected]>
+2005-02-04  Adam Weinberger  <adamw@mateorg>
 
 	* en_CA.po: Updated Canadian English translation.
 
@@ -789,9 +789,9 @@
 
 	* lt.po: Updated Lithuanian translation.
 
-=== gnome-user-share 0.5 ===
+=== mateuser-share 0.5 ===
 
-2005-02-02  Francisco Javier F. Serrador  <[email protected]>
+2005-02-02  Francisco Javier F. Serrador  <[email protected]>
 
 	* es.po: Updated Spanish translation.
 
@@ -812,7 +812,7 @@
 
 	* ko.po: Added Korean translation by Young-Ho Cha.
 
-2005-01-19  Vincent van Adrighem  <[email protected]>
+2005-01-19  Vincent van Adrighem  <adrighem@mateorg>
 
 	* nl.po: Translation added by Tino Meinen.
 
@@ -821,15 +821,15 @@
 	* bg.po: Added Bulgarian translation by
 	Rostislav Raykov <[email protected]>
 
-2005-01-16  Takeshi AIHANA <[email protected]>
+2005-01-16  Takeshi AIHANA <[email protected]>
 
 	* ja.po: Added Japanese translation.
 
-2005-01-15  Frank Arnold  <[email protected]>
+2005-01-15  Frank Arnold  <[email protected]>
 
 	* de.po: Added German translation.
 
-2005-01-15  Raphael Higino  <[email protected]>
+2005-01-15  Raphael Higino  <[email protected]>
 
 	* pt_BR.po: Added Brazilian Portuguese translation.
 
@@ -841,7 +841,7 @@
 
 	* fi.po: Added Finnish translation.
 
-2005-01-12  Francisco Javier F. Serrador  <[email protected]>
+2005-01-12  Francisco Javier F. Serrador  <[email protected]>
 
 	* es.po: Added Spanish translation.
 
@@ -853,7 +853,7 @@
 
 	* lt.po: Added Lithuanian translation by Marius Karnauskas.
 
-2005-01-10  Adam Weinberger  <[email protected]>
+2005-01-10  Adam Weinberger  <adamw@mateorg>
 
 	* en_CA.po: Added Canadian English translation.
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c094fe0..32c02d6 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,10 +1,10 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-data/desktop_gnome_file_sharing.schemas.in
+data/desktop_mate_file_sharing.schemas.in
 [type: gettext/glade]data/file-share-properties.ui
-data/gnome-user-share-properties.desktop.in
-data/gnome-user-share.desktop.in.in
-src/nautilus-share-bar.c
+data/mate-user-share-properties.desktop.in
+data/mate-user-share.desktop.in.in
+src/caja-share-bar.c
 src/share-extension.c
 src/file-share-properties.c
 src/http.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index e97edb0..3b9469f 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,4 +1,4 @@
 # List of source files that should NOT be translated.
 # Please keep this file sorted alphabetically.
 data/file-share-properties.ui
-data/gnome-user-share.desktop.in
+data/mate-user-share.desktop.in
diff --git a/po/ar.po b/po/ar.po
index 9e08380..2d383e4 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -19,7 +19,7 @@ msgstr ""
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 "X-Generator: Virtaal 0.5.2\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -27,7 +27,7 @@ msgstr ""
 "إذا كان هذا صحيحا، سوف ترسل أجهزة البلوتوث الملفات إلى دليل تنزيلات المستخدم "
 "عند الولوج."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -35,7 +35,7 @@ msgstr ""
 "إذا كان هذا صحيحا، مجلد العام في دليل منزل المستخدمين سيشارك عبر البلوتوث "
 "عندما يلج المستخدم."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -43,19 +43,19 @@ msgstr ""
 "إذا كان هذا صحيحا، مجلد العام في دليل منزل المستخدمين سيشارك عبر الشبكة "
 "عندما يلج المستخدم."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "دليل المشاركة العام عبر البلوتوث"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "دليل المشاركة العام عبر الشبكة"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../data/desktop_matefile_sharing.schemas.in.h:6
 msgid "When to accept files sent over Bluetooth"
 msgstr "متى أقبل الملفات المرسلة عبر البلوتوث"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:7
+#: ../data/desktop_matefile_sharing.schemas.in.h:7
 msgid ""
 "When to accept files sent over Bluetooth. Possible values are \"always\", "
 "\"bonded\" and \"ask\"."
@@ -63,7 +63,7 @@ msgstr ""
 "متى تقبل الملفات المرسلة عبر البلوتوث. القيم الممكنة هي \"always\"، و\"bonded"
 "\"، و \"ask\"."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../data/desktop_matefile_sharing.schemas.in.h:8
 msgid ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
@@ -71,19 +71,19 @@ msgstr ""
 "متى يتم طلب كلمة السرز القيم الممكنة هي \"never\", \"on_write\", و \"always"
 "\"."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "متى يتم طلب كلمات السر"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../data/desktop_matefile_sharing.schemas.in.h:10
 msgid "Whether Bluetooth clients can send files using ObexPush."
 msgstr "فيما إذا كان عملاء البلوتوث يستطيعون إرسال الملفات باستخدام ObexPush."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:11
+#: ../data/desktop_matefile_sharing.schemas.in.h:11
 msgid "Whether Bluetooth clients need to pair with the computer to send files."
 msgstr "فيما إذا كان عملاء البلوتوث يحتاجون الارتباط بالحاسوب لإرسال الملفات."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:12
+#: ../data/desktop_matefile_sharing.schemas.in.h:12
 msgid ""
 "Whether to allow Bluetooth clients to write files, or share the files read-"
 "only."
@@ -91,11 +91,11 @@ msgstr ""
 "فيما إذا كان يسمح لعملاء البلوتوث بكتابة الملفات، أو مشاركة الملفات للقراءة "
 "فقط."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:13
+#: ../data/desktop_matefile_sharing.schemas.in.h:13
 msgid "Whether to allow Bluetooth clients to write files."
 msgstr "فيما إذا كان يسمح لعملاء البلوتوث بكتابة الملفات."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:14
+#: ../data/desktop_matefile_sharing.schemas.in.h:14
 msgid "Whether to notify about newly received files."
 msgstr "فيما إذا كان يشعر عن الملفات المتلقاة."
 
@@ -151,24 +151,24 @@ msgstr "ا_طلب كلمة السر:"
 msgid "_Share public files on network"
 msgstr "_شارك الملفات العامة على الشبكة"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "مشاركة الملفات الشخصية"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "تفضيلات مشاركة الملفات"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "شغل مشاركة الملفات الشخصية إذا كانت مفعلة"
 
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "تفضيلات التشغيل"
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 msgid "Launch Personal File Sharing Preferences"
 msgstr "شغّل تفضيلات مشاركة الملفات الشخصية"
 
diff --git a/po/as.po b/po/as.po
index ba7e3f9..c77ad40 100644
--- a/po/as.po
+++ b/po/as.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: as\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
-"cgi?product=gnome-user-share&component=general\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"
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Lokalize 0.2\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -25,7 +25,7 @@ msgstr ""
 "মান সত্য হলে, লগ-ইন কৰা হলে ব্লু-টুথ ডিভাইসৰ পৰা ব্যৱহাৰকাৰীদেৰ Downloads "
 "ডিৰেক্টৰিত নথিপত্ৰ স্থানান্তৰ কৰা যাবে ।"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -33,7 +33,7 @@ msgstr ""
 "মান সত্য হলে, ব্যৱহাৰকাৰী লগ-ইন কৰলে ব্যৱহাৰকাৰীৰ ব্যক্তিগত ডিৰেক্টৰিত উপস্থিত "
 "Public ডিৰেক্টৰিটি ব্লু-টুথ ডিভাইসেৰ মাধ্যমে যৌথ ব্যৱহাৰেৰৰ বাবে উপস্থিত কৰা যাবে ।"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -41,19 +41,19 @@ msgstr ""
 "মান সত্য হলে, ব্যৱহাৰকাৰী লগ-ইন কৰলে ব্যৱহাৰকাৰীৰ ব্যক্তিগত ডিৰেক্টৰিত উপস্থিত "
 "Public ডিৰেক্টৰিটি নেটৱৰ্কেৰ মাধ্যমে যৌথ ব্যৱহাৰেৰৰ বাবে উপস্থিত কৰা যাবে ।"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "যৌথ ব্যৱহাৰেৰ বাবে ব্লু-টুথেৰ মাধ্যমে Public ডিৰেক্টৰি উপলব্ধ কৰা হ'ব"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "যৌথ ব্যৱহাৰেৰ বাবে নেটৱৰ্কেৰ মাধ্যমে Public ডিৰেক্টৰি উপলব্ধ কৰা হ'ব"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../data/desktop_matefile_sharing.schemas.in.h:6
 msgid "When to accept files sent over Bluetooth"
 msgstr "ব্লু-টুথেৰ মাধ্যমে উপলব্ধ নথিপত্ৰ কখন গ্ৰহণ কৰা হ'ব"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:7
+#: ../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\"."
@@ -62,7 +62,7 @@ msgstr ""
 "(সদায়ে)"
 "\", \"যুক্ত\", \"bonded_যুক্ত আৰু বিশ্বস্ত\" আৰু \"ask (জিজ্ঞাসা)\" ।"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../data/desktop_matefile_sharing.schemas.in.h:8
 msgid ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
@@ -70,21 +70,21 @@ msgstr ""
 "গুপ্তশব্দ উল্লেখেৰ অনুৰোধ কখন কৰা হ'ব । সম্ভাব্য মান হল: \"never (কেতিয়াও না)\", "
 "\"on_write (লেখাৰ সময়)\", আৰু \"always (সদায়ে)\" ।"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "গুপ্তশব্দ কখন আবশ্যক হ'ব"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../data/desktop_matefile_sharing.schemas.in.h:10
 msgid "Whether Bluetooth clients can send files using ObexPush."
 msgstr "ObexPush-ৰ সাহায্যে ব্লু-টিথ ক্লায়েন্ট দ্বাৰা নথিপত্ৰ পাঠানো সম্ভব হ'ব নে নাই ।"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:11
+#: ../data/desktop_matefile_sharing.schemas.in.h:11
 msgid "Whether Bluetooth clients need to pair with the computer to send files."
 msgstr ""
 "নথিপত্ৰ পাঠানোৰ বাবে, ব্লু-টুথ ক্লায়েন্ট দ্বাৰা কখন একটি কম্পিউটাৰেৰ সাথে যুগ্মভাবে "
 "সঞ্চালন কৰা আবশ্যক ।"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:12
+#: ../data/desktop_matefile_sharing.schemas.in.h:12
 msgid ""
 "Whether to allow Bluetooth clients to write files, or share the files read-"
 "only."
@@ -93,11 +93,11 @@ msgstr ""
 "নথিপত্ৰৰ যৌথ "
 "ব্যৱহাৰ কৰা যাবে ।"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:13
+#: ../data/desktop_matefile_sharing.schemas.in.h:13
 msgid "Whether to allow Bluetooth clients to write files."
 msgstr "ব্লু-টুথ ক্লায়েন্টেৰ বাবে নথিপত্ৰে লেখাৰ অনুমতি উপস্থিত থাকিব নে নাই ।"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:14
+#: ../data/desktop_matefile_sharing.schemas.in.h:14
 msgid "Whether to notify about newly received files."
 msgstr "নতুন প্ৰাপ্ত নথিপত্ৰ সম্পৰ্কে সূচনা প্ৰদান কৰা হ'ব নে নাই ।"
 
@@ -154,17 +154,17 @@ msgstr "গুপ্তশব্দ আবশ্যক: (_R)"
 msgid "_Share public files on network"
 msgstr "যৌথ ব্যৱহাৰেৰ বাবে নেটৱৰ্কেৰ মাধ্যমে সাৰ্বজনীন নথিপত্ৰ উপলব্ধ কৰা হ'ব"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2
 msgid "Personal File Sharing"
 msgstr "ব্যক্তিগত নথিপত্ৰৰ যৌথ ব্যৱহাৰ"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 #| msgid "Preferences for sharing of personal files"
 msgid "Preferences for sharing of files"
 msgstr "ব্যক্তিগত নথিপত্ৰৰ যৌথ ব্যৱহাৰ সংক্ৰান্ত পছন্দৰ মান"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 #| msgid "Launch User Sharing if enabled"
 msgid "Launch Personal File Sharing if enabled"
 msgstr "সক্ৰিয় থাকিলে, User Sharing আৰম্ভ কৰা হ'ব"
diff --git a/po/ast.po b/po/ast.po
index 88d5eba..2f8545f 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -1,11 +1,11 @@
-# Asturian translation for gnome-user-share.
-# Copyright (C) 2010 gnome-user-share's COPYRIGHT HOLDER
-# This file is distributed under the same license as the gnome-user-share package.
+# Asturian 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.
 # Xandru Armesto <[email protected]>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"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-09 01:04+0000\n"
 "PO-Revision-Date: 2010-03-13 07:46+0200\n"
@@ -19,7 +19,7 @@ msgstr ""
 "X-Generator: Virtaal 0.5.2\n"
 "X-Poedit-Language: asturian\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -27,55 +27,55 @@ msgstr ""
 "Si esto ye «true», los preseos Bluetooth pueden unviar ficheros al "
 "direutoriu Descargues del usuariu cuando anicie la sesión."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:2
+#: ../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 esto ye cierto, el direutoriu «Públicu» nel direutoriu personal del usuariu compartiráse cuando l'usuariu anicie sesión."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:3
+#: ../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 esto ye cierto, el direutoriu «Públicu» nel direutoriu personal de los usuarios compartiráse cuando l'usuariu anicie sesión."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "Compartir el direutoriu «Públicu» por Bluetooth"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "Compartir el direutoriu «Públicu» por rede"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../data/desktop_matefile_sharing.schemas.in.h:6
 msgid "When to accept files sent over Bluetooth"
 msgstr "Cuándo aceutar ficheros unviaos por Bluetooth"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:7
+#: ../data/desktop_matefile_sharing.schemas.in.h:7
 msgid "When to accept files sent over Bluetooth. Possible values are \"always\", \"bonded\" and \"ask\"."
 msgstr "Cuándo aceutar ficheros unviaos por Bluetooth. Los valores dables son: «always» (siempres), «bonded» (vinculaos) y «ask» (entrugar)."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../data/desktop_matefile_sharing.schemas.in.h:8
 msgid "When to ask for passwords. Possible values are \"never\", \"on_write\", and \"always\"."
 msgstr "Cuándo pidir contraseñes. Les opciones dables son: \"never\" (enxamás), \"on_write\" (al escribir) y \"always\" (siempres)."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "Cuando requerir contraseñes"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../data/desktop_matefile_sharing.schemas.in.h:10
 msgid "Whether Bluetooth clients can send files using ObexPush."
 msgstr "Si los veceros Bluetooth pueden unviar ficheros usando ObexPush."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:11
+#: ../data/desktop_matefile_sharing.schemas.in.h:11
 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_gnome_file_sharing.schemas.in.h:12
+#: ../data/desktop_matefile_sharing.schemas.in.h:12
 msgid "Whether to allow Bluetooth clients to write files, or share the files read-only."
 msgstr "Indica si se permite a los veceros por Bluetooth escribir ficheros o namái compartir los ficheros de namái llectura."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:13
+#: ../data/desktop_matefile_sharing.schemas.in.h:13
 msgid "Whether to allow Bluetooth clients to write files."
 msgstr "Indica si se permite escribir ficheros a los veceros por Bluetooth"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:14
+#: ../data/desktop_matefile_sharing.schemas.in.h:14
 msgid "Whether to notify about newly received files."
 msgstr "Si hai de notificar tocante a los nuevos ficheros recibíos."
 
@@ -131,25 +131,25 @@ msgstr "_Requerir contraseña:"
 msgid "_Share public files on network"
 msgstr "C_ompartir ficheros públicos na rede"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2
-#: ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2
+#: ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "Compartición de ficheros personales"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Preferencies pa la compartición de ficheros"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Llanzar la compartición de ficheros personales si tán activaes"
 
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "Llanzar les preferencies"
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Llanzar les preferencies de compartición de ficheros personales"
 
diff --git a/po/bg.po b/po/bg.po
index f81f4a7..a077c57 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,13 +1,13 @@
-# Bulgarian translation of gnome-user-share po-file.
+# 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 gnome-user-share package.
+# This file is distributed under the same license as the mateuser-share package.
 # Rostislav Raykov <[email protected]>, 2005.
 # Alexander Shopov <[email protected]>, 2009, 2010.
 #
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share master\n"
+"Project-Id-Version: mateuser-share master\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"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -26,7 +26,7 @@ msgstr ""
 "Ако е истина, отдалечени устройства ще могат да пращат файлове по Bluetooth "
 "към папката на потребителя „Свалени“, когато той е влезнал в системата."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -34,7 +34,7 @@ msgstr ""
 "Ако е истина, публичната папка в домашната на потребителя ще бъде споделена "
 "по Bluetooth, когато той е влезнал в системата."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -42,19 +42,19 @@ msgstr ""
 "Ако е истина, публичната папка в домашната на потребителя ще бъде споделена "
 "по мрежата, когато той е влезнал в системата."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "Споделяне на публичната папка по Bluetooth"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "Споделяне на публичната папка по мрежата"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../data/desktop_matefile_sharing.schemas.in.h:6
 msgid "When to accept files sent over Bluetooth"
 msgstr "Дали да се приемат файлове по Bluetooth"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:7
+#: ../data/desktop_matefile_sharing.schemas.in.h:7
 msgid ""
 "When to accept files sent over Bluetooth. Possible values are \"always\", "
 "\"bonded\" and \"ask\"."
@@ -63,7 +63,7 @@ msgstr ""
 "„always“ (винаги), „bonded“ (от изрично свързани устройства) и „ask“ (питане "
 "всеки път)."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../data/desktop_matefile_sharing.schemas.in.h:8
 msgid ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
@@ -71,21 +71,21 @@ msgstr ""
 "Кога да се пита за пароли. Възможните опции са: „never“ (никога), "
 "„on_write“ (при запис), „always“ (винаги)."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "Кога да се изискват пароли?"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../data/desktop_matefile_sharing.schemas.in.h:10
 msgid "Whether Bluetooth clients can send files using ObexPush."
 msgstr "Дали клиентите по Bluetooth могат да изпращат файлове чрез ObexPush."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:11
+#: ../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_gnome_file_sharing.schemas.in.h:12
+#: ../data/desktop_matefile_sharing.schemas.in.h:12
 msgid ""
 "Whether to allow Bluetooth clients to write files, or share the files read-"
 "only."
@@ -93,11 +93,11 @@ msgstr ""
 "Дали клиентите по Bluetooth да могат да записват файлове или да се дадат "
 "права само за четене."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:13
+#: ../data/desktop_matefile_sharing.schemas.in.h:13
 msgid "Whether to allow Bluetooth clients to write files."
 msgstr "Дали клиентите по Bluetooth могат да записват файлове."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:14
+#: ../data/desktop_matefile_sharing.schemas.in.h:14
 msgid "Whether to notify about newly received files."
 msgstr "Дали да се известява при получаване на файл."
 
@@ -154,24 +154,24 @@ msgstr "_Изискване на парола:"
 msgid "_Share public files on network"
 msgstr "_Споделяне на публичните файлове по мрежата"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "Споделяне на файлове"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Настройки за споделянето на файлове"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Стартиране на споделянето на файлове, ако е позволено"
 
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "Настройки на споделянето"
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Настройки на споделянето на личните файлове"
 
diff --git a/po/bn.po b/po/bn.po
index a228e5e..d41fa8d 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -1,4 +1,4 @@
-# Bengali translation for gnome-user-share
+# Bengali translation for mateuser-share
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bn\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"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"
@@ -22,7 +22,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 # Translated by sadia
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -31,7 +31,7 @@ msgstr ""
 "ফাইল প্রেরণ করতে পারে।"
 
 # Translated by sadia
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -40,7 +40,7 @@ msgstr ""
 "উপস্থিত পাবলিক ডিরেক্টরিটি ব্লু-টুথের মাধ্যমে শেয়ার করা যাবে।"
 
 # Translated by sadia
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -49,22 +49,22 @@ msgstr ""
 "উপস্থিত পাবলিক ডিরেক্টরিটি নেটওয়ার্কের মাধ্যমে শেয়ার করা যাবে।"
 
 # Translated by sadia
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "পাবলিক ডিরেক্টরি ব্লু-টুথের মাধ্যমে শেয়ার করা হবে"
 
 # Translated by sadia
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "পাবলিক ডিরেক্টরি নেটওয়ার্কের মাধ্যমে শেয়ার করা হবে"
 
 # Translated by sadia
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../data/desktop_matefile_sharing.schemas.in.h:6
 msgid "When to accept files sent over Bluetooth"
 msgstr "ব্লু-টুথের মাধ্যমে প্রেরিত ফাইল কখন গ্রহণ করা হবে"
 
 # Translated by sadia
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:7
+#: ../data/desktop_matefile_sharing.schemas.in.h:7
 msgid ""
 "When to accept files sent over Bluetooth. Possible values are \"always\", "
 "\"bonded\" and \"ask\"."
@@ -73,7 +73,7 @@ msgstr ""
 "\"সংযুক্ত করা হবে\",  ও \"জিজ্ঞাসা করা হবে\"।"
 
 # Translated by sadia
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../data/desktop_matefile_sharing.schemas.in.h:8
 msgid ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
@@ -82,22 +82,22 @@ msgstr ""
 "\", ও \"সর্বদা\"।"
 
 # Translated by sadia
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "কখন পাসওয়ার্ড প্রয়োজন হবে"
 
 # Translated by sadia
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../data/desktop_matefile_sharing.schemas.in.h:10
 msgid "Whether Bluetooth clients can send files using ObexPush."
 msgstr "ObexPush এর সাহায্যে ব্লু-টুথ ক্লায়েন্টরা ফাইল পাঠাতে পারবেন কি না।"
 
 # Translated by sadia
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:11
+#: ../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_gnome_file_sharing.schemas.in.h:12
+#: ../data/desktop_matefile_sharing.schemas.in.h:12
 msgid ""
 "Whether to allow Bluetooth clients to write files, or share the files read-"
 "only."
@@ -106,12 +106,12 @@ msgstr ""
 "দেয়া হবে।"
 
 # Translated by sadia
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:13
+#: ../data/desktop_matefile_sharing.schemas.in.h:13
 msgid "Whether to allow Bluetooth clients to write files."
 msgstr "ব্লু-টুথ ক্লায়েন্টেদের ফাইলে লেখার অনুমতি দেয়া হবে কি না।"
 
 # Translated by sadia
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:14
+#: ../data/desktop_matefile_sharing.schemas.in.h:14
 msgid "Whether to notify about newly received files."
 msgstr "নতুন গৃহীত ফাইল সম্পর্কে ঘোষনা প্রদান করা হবে কি না।"
 
@@ -180,28 +180,28 @@ msgid "_Share public files on network"
 msgstr "নেটওয়ার্কে পাবলিক ফাইল শেয়ার করা হবে (_S)"
 
 # Translated by sadia
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "ব্যক্তিগত ফাইল শেয়ারকরণ"
 
 # Translated by sadia
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "ফাইল শেয়ারকরণের পছন্দসমূহ"
 
 # Translated by sadia
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "সক্রিয় করা থাকলে, ব্যক্তিগতভাবে শেয়ারকৃত ফাইল চালু করা হবে"
 
 # Translated by sadia
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "পছন্দসমূহ চালু করা হবে"
 
 # Translated by sadia
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 msgid "Launch Personal File Sharing Preferences"
 msgstr "ব্যক্তিগতভাবে শেয়ারকৃত ফাইলের পছন্দসমূহ চালু করা হবে"
 
diff --git a/po/bn_IN.po b/po/bn_IN.po
index 0af7884..ed46f31 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bn_IN\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-user-share&component=general\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"
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -25,7 +25,7 @@ msgstr ""
 "মান true (সত্য) হলে, লগ-ইন করা হলে ব্লু-টুথ ডিভাইস থেকে ব্যবহারকারীদের Downloads "
 "ডিরেক্টরির মধ্যে ফাইল স্থানান্তর করা যাবে।"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -34,7 +34,7 @@ msgstr ""
 "উপস্থিত Public ডিরেক্টরিটি ব্লু-টুথ ডিভাইসের মাধ্যমে যৌথ ব্যবহারেরর জন্য উপস্থিত করা "
 "যাবে।"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -42,19 +42,19 @@ msgstr ""
 "মান true (সত্য) হলে, ব্যবহারকারী লগ-ইন করলে ব্যবহারকারীর ব্যক্তিগত ডিরেক্টরির মধ্যে "
 "উপস্থিত Public ডিরেক্টরিটি নেটওয়ার্কের মাধ্যমে যৌথ ব্যবহারেরর জন্য উপস্থিত করা যাবে।"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "যৌথ ব্যবহারের জন্য ব্লু-টুথের মাধ্যমে Public ডিরেক্টরি উপলব্ধ করা হবে"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "যৌথ ব্যবহারের জন্য নেটওয়ার্কের মাধ্যমে Public ডিরেক্টরি উপলব্ধ করা হবে"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../data/desktop_matefile_sharing.schemas.in.h:6
 msgid "When to accept files sent over Bluetooth"
 msgstr "ব্লু-টুথের মাধ্যমে উপলব্ধ ফাইল কখন গ্রহণ করা হবে"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:7
+#: ../data/desktop_matefile_sharing.schemas.in.h:7
 msgid ""
 "When to accept files sent over Bluetooth. Possible values are \"always\", "
 "\"bonded\" and \"ask\"."
@@ -62,7 +62,7 @@ msgstr ""
 "ব্লু-টুথের মাধ্যমে উপলব্ধ ফাইল কখন গ্রহণ করা হবে। সম্ভাব্য মান হল: \"always (সর্বদা)"
 "\", \"bonded (যুক্ত)\", ও \"ask (জিজ্ঞাসা)\"।"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../data/desktop_matefile_sharing.schemas.in.h:8
 msgid ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
@@ -70,21 +70,21 @@ msgstr ""
 "পাসওয়ার্ড উল্লেখের অনুরোধ কখন করা হবে। সম্ভাব্য মান হল: \"never (কখনো না)\", "
 "\"on_write (লেখার সময়)\", ও \"always (সর্বদা)\"।"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "পাসওয়ার্ড কখন আবশ্যক হবে"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../data/desktop_matefile_sharing.schemas.in.h:10
 msgid "Whether Bluetooth clients can send files using ObexPush."
 msgstr "ObexPush-র সাহায্যে ব্লু-টিথ ক্লায়েন্ট দ্বারা ফাইল পাঠানো সম্ভব হবে কি না।"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:11
+#: ../data/desktop_matefile_sharing.schemas.in.h:11
 msgid "Whether Bluetooth clients need to pair with the computer to send files."
 msgstr ""
 "ফাইল পাঠানোর জন্য, ব্লু-টুথ ক্লায়েন্ট দ্বারা কখন একটি কম্পিউটারের সাথে যুগ্মভাবে "
 "সঞ্চালন করা আবশ্যক।"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:12
+#: ../data/desktop_matefile_sharing.schemas.in.h:12
 msgid ""
 "Whether to allow Bluetooth clients to write files, or share the files read-"
 "only."
@@ -92,11 +92,11 @@ msgstr ""
 "ব্লু-টুথ ক্লায়েন্ট দ্বারা ফাইল লেখা সম্ভব হবে না কি শুধুমাত্র পাঠযোগ্য অনুমতি সহ ফাইলের "
 "যৌথ ব্যবহার করা যাবে।"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:13
+#: ../data/desktop_matefile_sharing.schemas.in.h:13
 msgid "Whether to allow Bluetooth clients to write files."
 msgstr "ব্লু-টুথ ক্লায়েন্টের জন্য ফাইলে লেখার অনুমতি উপস্থিত থাকবে কি না।"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:14
+#: ../data/desktop_matefile_sharing.schemas.in.h:14
 msgid "Whether to notify about newly received files."
 msgstr "নতুন প্রাপ্ত ফাইল সম্পর্কে সূচনা প্রদান করা হবে কি না।"
 
@@ -152,24 +152,24 @@ msgstr "পাসওয়ার্ড আবশ্যক: (_R)"
 msgid "_Share public files on network"
 msgstr "যৌথ ব্যবহারের জন্য নেটওয়ার্কের মাধ্যমে সার্বজনীন ফাইল উপলব্ধ করা হবে"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "ব্যক্তিগত ফাইলের যৌথ ব্যবহার"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "ফাইলের যৌথ ব্যবহার সংক্রান্ত পছন্দসই মান"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "সক্রিয় থাকলে, ব্যক্তিগত ফাইলের যৌথ ব্যবহার আরম্ভ করা হবে"
 
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "পছন্দসই বৈশিষ্ট্য আরম্ভ করা হবে"
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 msgid "Launch Personal File Sharing Preferences"
 msgstr "ব্যক্তিগত ফাইলের যৌথ ব্যবহার সংক্রান্ত পছন্দের বৈশিষ্ট্য আরম্ভ করা হবে"
 
diff --git a/po/br.po b/po/br.po
index 359b493..057d226 100644
--- a/po/br.po
+++ b/po/br.po
@@ -1,13 +1,13 @@
-# Breton translation for gnome-user-share
+# Breton translation for mateuser-share
 # Copyright (c) 2010 The Gnome Project
-# This file is distributed under the same license as the gnome-user-share package.
+# This file is distributed under the same license as the mateuser-share package.
 #
 # Alan Monfort <[email protected]>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-user-share&component=general\n"
+"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"
@@ -16,59 +16,59 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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_gnome_file_sharing.schemas.in.h:2
+#: ../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_gnome_file_sharing.schemas.in.h:3
+#: ../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_gnome_file_sharing.schemas.in.h:4
+#: ../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_gnome_file_sharing.schemas.in.h:5
+#: ../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_gnome_file_sharing.schemas.in.h:6
+#: ../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_gnome_file_sharing.schemas.in.h:7
+#: ../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_gnome_file_sharing.schemas.in.h:8
+#: ../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_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "Pegoulz azgoulenn ar gerioù-tremen"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../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_gnome_file_sharing.schemas.in.h:11
+#: ../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_gnome_file_sharing.schemas.in.h:12
+#: ../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_gnome_file_sharing.schemas.in.h:13
+#: ../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_gnome_file_sharing.schemas.in.h:14
+#: ../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"
 
@@ -124,25 +124,25 @@ msgstr "_Azgoulenn ur ger-tremen :"
 msgid "_Share public files on network"
 msgstr "Rannañ restroù foran dre ar rouedad"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2
-#: ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2
+#: ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "Rannadur restroù foran"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Gwellvezioù a-fet rannañ restroù"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Loc'hañ ar rannadur restroù personel mar bez gweredekaet"
 
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "Gwellvezioù al loc'hañ"
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Loc'hañ ar gwellvezioù a-fet rannadur restroù personel"
 
diff --git a/po/ca.po b/po/ca.po
index f48d108..30a6ee5 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,13 +1,13 @@
-# Catalan translation of gnome-user-share.
-# Copyright (C) 2005, 2006 The gnome-user-share's copyright holder
+# 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
-#    gnome-user-share package.
+#    mateuser-share package.
 #
 # Gil Forcada <[email protected]>, 2005, 2006, 2008, 2009, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share\n"
+"Project-Id-Version: mateuser-share\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"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -25,7 +25,7 @@ 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_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -33,7 +33,7 @@ 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_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -41,19 +41,19 @@ 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_gnome_file_sharing.schemas.in.h:4
+#: ../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_gnome_file_sharing.schemas.in.h:5
+#: ../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_gnome_file_sharing.schemas.in.h:6
+#: ../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_gnome_file_sharing.schemas.in.h:7
+#: ../data/desktop_matefile_sharing.schemas.in.h:7
 msgid ""
 "When to accept files sent over Bluetooth. Possible values are \"always\", "
 "\"bonded\" and \"ask\"."
@@ -61,7 +61,7 @@ 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_gnome_file_sharing.schemas.in.h:8
+#: ../data/desktop_matefile_sharing.schemas.in.h:8
 msgid ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
@@ -69,21 +69,21 @@ msgstr ""
 "Quan s'ha de demanar contrasenya. Els possibles valors són «never» (mai), "
 "«on_write» (en escriure), i «always» (sempre)."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "Quan s'ha de demanar contrasenya"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../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_gnome_file_sharing.schemas.in.h:11
+#: ../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_gnome_file_sharing.schemas.in.h:12
+#: ../data/desktop_matefile_sharing.schemas.in.h:12
 msgid ""
 "Whether to allow Bluetooth clients to write files, or share the files read-"
 "only."
@@ -91,11 +91,11 @@ msgstr ""
 "Si es permet escriure fitxers als clients del Bluetooth, o si només es "
 "compartiran en mode lectura."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:13
+#: ../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_gnome_file_sharing.schemas.in.h:14
+#: ../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."
 
@@ -152,24 +152,24 @@ msgstr "_Requereix contrasenya:"
 msgid "_Share public files on network"
 msgstr "_Comparteix els fitxers públics a la xarxa"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "Compartició de fitxers personals"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Preferències per a compartir fitxers"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Executa la compartició de fitxers personals si està habilitat"
 
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "Inicia les preferències"
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Inicia les preferències de la compartició de fitxers personals"
 
diff --git a/po/[email protected] b/po/[email protected]
index 4456537..65100e5 100644
--- a/po/[email protected]
+++ b/po/[email protected]
@@ -1,13 +1,13 @@
-# Catalan translation of gnome-user-share.
-# Copyright (C) 2005, 2006 The gnome-user-share's copyright holder
+# 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
-#    gnome-user-share package.
+#    mateuser-share package.
 #
 # Gil Forcada <[email protected]>, 2005, 2006, 2008, 2009, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share\n"
+"Project-Id-Version: mateuser-share\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"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -26,7 +26,7 @@ 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_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -34,7 +34,7 @@ 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_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -42,19 +42,19 @@ 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_gnome_file_sharing.schemas.in.h:4
+#: ../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_gnome_file_sharing.schemas.in.h:5
+#: ../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_gnome_file_sharing.schemas.in.h:6
+#: ../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_gnome_file_sharing.schemas.in.h:7
+#: ../data/desktop_matefile_sharing.schemas.in.h:7
 msgid ""
 "When to accept files sent over Bluetooth. Possible values are \"always\", "
 "\"bonded\" and \"ask\"."
@@ -62,7 +62,7 @@ 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_gnome_file_sharing.schemas.in.h:8
+#: ../data/desktop_matefile_sharing.schemas.in.h:8
 msgid ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
@@ -70,21 +70,21 @@ msgstr ""
 "Quan s'ha de demanar contrasenya. Els possibles valors són «never» (mai), "
 "«on_write» (en escriure), i «always» (sempre)."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "Quan s'ha de demanar contrasenya"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../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_gnome_file_sharing.schemas.in.h:11
+#: ../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_gnome_file_sharing.schemas.in.h:12
+#: ../data/desktop_matefile_sharing.schemas.in.h:12
 msgid ""
 "Whether to allow Bluetooth clients to write files, or share the files read-"
 "only."
@@ -92,11 +92,11 @@ msgstr ""
 "Si es permet escriure fitxers als clients del Bluetooth, o si només es "
 "compartiran en mode lectura."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:13
+#: ../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_gnome_file_sharing.schemas.in.h:14
+#: ../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."
 
@@ -153,24 +153,24 @@ msgstr "_Requereix contrasenya:"
 msgid "_Share public files on network"
 msgstr "_Comparteix els fitxers públics a la xarxa"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "Compartició de fitxers personals"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Preferències per a compartir fitxers"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Executa la compartició de fitxers personals si està habilitat"
 
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "Inicia les preferències"
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Inicia les preferències de la compartició de fitxers personals"
 
diff --git a/po/cs.po b/po/cs.po
index 1d79546..a39c087 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,23 +1,23 @@
-# Czech translation of gnome-user-share.
-# Copyright (C) 2005, 2006, 2009 the author(s) of gnome-user-share.
+# 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 gnome-user-share package.
+# 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.
+# Martin Picek <[email protected]>, 2009.
 # Petr Kovar <[email protected]>, 2009.
 # Marek Černocký <[email protected]>, 2009, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share gnome-2-28\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"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 <[email protected]>\n"
+"Language-Team: Czech <matecs-list@mateorg>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,7 +25,7 @@ msgstr ""
 "X-Poedit-Language: Czech\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -33,7 +33,7 @@ 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_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -41,7 +41,7 @@ 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_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -49,19 +49,19 @@ 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_gnome_file_sharing.schemas.in.h:4
+#: ../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_gnome_file_sharing.schemas.in.h:5
+#: ../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_gnome_file_sharing.schemas.in.h:6
+#: ../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_gnome_file_sharing.schemas.in.h:7
+#: ../data/desktop_matefile_sharing.schemas.in.h:7
 msgid ""
 "When to accept files sent over Bluetooth. Possible values are \"always\", "
 "\"bonded\" and \"ask\"."
@@ -69,28 +69,28 @@ msgstr ""
 "Kdy přijímat soubory poslané přes Bluetooth. Možné hodnoty jsou: „always“, "
 "„bonded“ a „ask“."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../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_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "Kdy vyžadovat hesla"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../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_gnome_file_sharing.schemas.in.h:11
+#: ../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_gnome_file_sharing.schemas.in.h:12
+#: ../data/desktop_matefile_sharing.schemas.in.h:12
 msgid ""
 "Whether to allow Bluetooth clients to write files, or share the files read-"
 "only."
@@ -98,11 +98,11 @@ msgstr ""
 "Jestli povolit klientům Bluetooth zapisování do souborů, nebo sdílet soubory "
 "jen ke čtení."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:13
+#: ../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_gnome_file_sharing.schemas.in.h:14
+#: ../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."
 
@@ -158,24 +158,24 @@ msgstr "_Vyžadovat heslo:"
 msgid "_Share public files on network"
 msgstr "Sdílet veřejné soubory přes _síť"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "Sdílení osobních souborů"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Nastavení sdílení souborů"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Je-li povoleno, spustit Sdílení osobních souborů"
 
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "Předvolby spouštění"
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Předvolby spouštění Sdílení osobních souborů"
 
diff --git a/po/da.po b/po/da.po
index c9f3d3f..8318eae 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,12 +1,12 @@
 # Danish translation of Gnome User Share
 # Copyright (C) 2005, 2009,10 Red Hat, Inc.
-# This file is distributed under the same license as the gnome-user-share package.
+# This file is distributed under the same license as the mateuser-share package.
 #
 # Martin Willemoes Hansen <[email protected]>, 2005.
 # Ask Hjorth Larsen <[email protected]>, 2009-10.
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share\n"
+"Project-Id-Version: mateuser-share\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-03-30 22:22+0200\n"
 "PO-Revision-Date: 2010-03-30 22:18+0200\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -24,7 +24,7 @@ msgstr ""
 "Hvis denne er true, kan Bluetooth-enheder sende filer til brugerens "
 "downloadmappe når brugeren er logget ind."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -32,7 +32,7 @@ msgstr ""
 "Hvis denne er true, vil den offentlige mappe i brugerens hjemmemappe blive "
 "delt over Bluetooth, når brugeren er logget ind."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -40,19 +40,19 @@ msgstr ""
 "Hvis denne er true, vil den offentlige mappe i brugerens hjemmemappe blive "
 "delt, når brugeren er logget ind."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "Del offentlig mappe over Bluetooth"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "Del offentlig mappe på netværket"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../data/desktop_matefile_sharing.schemas.in.h:6
 msgid "When to accept files sent over Bluetooth"
 msgstr "Hvornår filer sendt over Bluetooth skal accepteres"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:7
+#: ../data/desktop_matefile_sharing.schemas.in.h:7
 msgid ""
 "When to accept files sent over Bluetooth. Possible values are \"always\", "
 "\"bonded\" and \"ask\"."
@@ -60,7 +60,7 @@ msgstr ""
 "Hvornår filer sendt over Bluetooth accepteres. Valgmuligheder: \"always\", "
 "\"bonded\", \"ask\"."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../data/desktop_matefile_sharing.schemas.in.h:8
 msgid ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
@@ -68,21 +68,21 @@ msgstr ""
 "Hvornår skal der spørges om adgangskode. Valgmuligheder: \"never\", "
 "\"on_write\", \"always\"."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "Hvornår der kræves adgangskode"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../data/desktop_matefile_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."
 
 # WTF
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:11
+#: ../data/desktop_matefile_sharing.schemas.in.h:11
 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_gnome_file_sharing.schemas.in.h:12
+#: ../data/desktop_matefile_sharing.schemas.in.h:12
 msgid ""
 "Whether to allow Bluetooth clients to write files, or share the files read-"
 "only."
@@ -90,11 +90,11 @@ msgstr ""
 "Hvorvidt Bluetooth-klienter har tilladelse til at skrive filer, eller dele "
 "filer skrivebeskyttet."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:13
+#: ../data/desktop_matefile_sharing.schemas.in.h:13
 msgid "Whether to allow Bluetooth clients to write files."
 msgstr "Hvorvidt Bluetooth-klienter har tilladelse til at skrive filer."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:14
+#: ../data/desktop_matefile_sharing.schemas.in.h:14
 msgid "Whether to notify about newly received files."
 msgstr "Hvorvidt der påmindes om nyligt modtagne filer."
 
@@ -151,26 +151,26 @@ msgstr "_Krav om adgangskode:"
 msgid "_Share public files on network"
 msgstr "_Del offentlige filer på netværket"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "Personlig fildeling"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Indstillinger for deling af filer"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Start personlig fildeling hvis aktiveret"
 
 # handling
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "Start indstillinger"
 
 # handling
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Start indstillinger for personlig fildeling"
 
diff --git a/po/de.po b/po/de.po
index 129c31f..2e525b7 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,20 +1,20 @@
-# German translation of gnome-user-share.
+# German translation of mateuser-share.
 # Copyright (C) 2005 Alexander Larsson <[email protected]>
-# This file is distributed under the same license as the gnome-user-share package.
+# This file is distributed under the same license as the mateuser-share package.
 # Frank Arnold <[email protected]>, 2005.
-# Hendrik Richter <[email protected]>, 2007.
-# Mario Blättermann <[email protected]>, 2009, 2010.
+# Hendrik Richter <hendrikr@mateorg>, 2007.
+# Mario Blättermann <mariobl@mateorg>, 2009, 2010.
 # Christian Kirbach <[email protected]>, 2009, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"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-16 02:15+0000\n"
 "PO-Revision-Date: 2010-02-19 21:43+0100\n"
 "Last-Translator: Christian Kirbach <[email protected]>\n"
-"Language-Team: Deutsch <[email protected]>\n"
+"Language-Team: Deutsch <matede@mateorg>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,7 +22,7 @@ msgstr ""
 "X-Poedit-Language: German\n"
 "X-Poedit-Country: GERMANY\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -30,7 +30,7 @@ msgstr ""
 "Wenn diese Option gesetzt ist, dürfen Bluetooth-Geräte Dateien in den "
 "Download-Ordner des Benutzer senden."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -38,7 +38,7 @@ msgstr ""
 "Wenn diese Option gesetzt ist, wird der öffentliche Ordner im persönlichen "
 "Ordner über Bluetooth freigegeben, sobald der Benutzer angemeldet ist."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -46,19 +46,19 @@ msgstr ""
 "Wenn diese Option gesetzt ist, wird der öffentliche Ordner im persönlichen "
 "Ordner im Netzwerk freigegeben, sobald der Benutzer angemeldet ist."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "Öffentlichen Ordner über Bluetooth freigeben"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "Öffentlichen Ordner im Netzwerk freigeben"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../data/desktop_matefile_sharing.schemas.in.h:6
 msgid "When to accept files sent over Bluetooth"
 msgstr "Wann über Bluetooth gesendete Dateien angenommen werden"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:7
+#: ../data/desktop_matefile_sharing.schemas.in.h:7
 msgid ""
 "When to accept files sent over Bluetooth. Possible values are \"always\", "
 "\"bonded\" and \"ask\"."
@@ -66,7 +66,7 @@ msgstr ""
 "Gibt an, wann über Bluetooth gesendete Dateien angenommen werden. Mögliche "
 "Werte sind »always« (immer), »bonded« (verbunden) und »ask« (nachfragen)."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../data/desktop_matefile_sharing.schemas.in.h:8
 msgid ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
@@ -74,32 +74,32 @@ msgstr ""
 "Wann nach Passwörtern gefragt wird. Mögliche Werte sind »never« (nie), "
 "»on_write« (beim Schreiben) und »always« (immer)."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "Wann Passwörter erforderlich sind"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../data/desktop_matefile_sharing.schemas.in.h:10
 msgid "Whether Bluetooth clients can send files using ObexPush."
 msgstr "Legt fest, ob Bluetooth-Clients Dateien mit ObexPush senden dürfen"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:11
+#: ../data/desktop_matefile_sharing.schemas.in.h:11
 msgid "Whether Bluetooth clients need to pair with the computer to send files."
 msgstr ""
 "Legt fest, ob sich Bluetooth-Clients an den Computer anbinden müssen, um "
 "Dateien zu senden."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:12
+#: ../data/desktop_matefile_sharing.schemas.in.h:12
 msgid ""
 "Whether to allow Bluetooth clients to write files, or share the files read-"
 "only."
 msgstr ""
 "Legt fest, ob Bluetooth-Clients Dateien schreiben oder nur lesen dürfen."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:13
+#: ../data/desktop_matefile_sharing.schemas.in.h:13
 msgid "Whether to allow Bluetooth clients to write files."
 msgstr "Legt fest, ob Bluetooth-Clients Dateien schreiben dürfen."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:14
+#: ../data/desktop_matefile_sharing.schemas.in.h:14
 msgid "Whether to notify about newly received files."
 msgstr "Legt fest, ob über neu empfangene Dateien informiert werden soll."
 
@@ -155,24 +155,24 @@ msgstr "_Benötigt Passwort:"
 msgid "_Share public files on network"
 msgstr "Öffentlichen Ordner im Netzwerk _freigeben"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "Persönliche Dateifreigabe"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Einstellungen zur Freigabe von Dateien"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Persönliche Dateifreigabe starten, wenn aktiv"
 
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "Einstellungen aufrufen"
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Einstellungen zur persönlichen Dateifreigabe aufrufen"
 
diff --git a/po/dz.po b/po/dz.po
index 7f9a043..a91f0fb 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share.HEAD.pot\n"
+"Project-Id-Version: mateuser-share.HEAD.pot\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"
@@ -19,19 +19,19 @@ msgstr ""
 "X-Poedit-Country: BHUTAN\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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 "འ་ནི་འདི་བདེན་པ་ཨིན་པ་ཅིན་ ལག་ལེན་པའི་ཁྱིམ་སྣོད་ཐོ་འདི་ནང་གི་ མི་མང་གི་སྣོད་ཐོ་འདི་ ལག་ལེན་པ་འདི་ནང་བསྐྱོད་འབད་ཡོད་པའི་སྐབས་ རུབ་སྤྱོད་འབད་འོང་།"
 
-#: ../desktop_gnome_file_sharing.schemas.in.h:2
+#: ../desktop_matefile_sharing.schemas.in.h:2
 msgid "Share Public directory"
 msgstr "མི་མང་གི་སྣོད་ཐོ་རུབ་སྤྱོད་འབད་"
 
-#: ../desktop_gnome_file_sharing.schemas.in.h:3
+#: ../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\" ཚུ་ཨིན།"
 
-#: ../desktop_gnome_file_sharing.schemas.in.h:4
+#: ../desktop_matefile_sharing.schemas.in.h:4
 msgid "When to require passwords"
 msgstr "ཆོག་ཡིག་ཚུ་ནམ་དགོཔ་ཨིན་ན་"
 
@@ -67,11 +67,11 @@ msgstr "ཆོག་ཡིག་:(_P)"
 msgid "_Require password:"
 msgstr "དགོས་མཁོ་ཡོད་པའི་ཆོག་ཡིག་: (_R)"
 
-#: ../gnome-user-share-properties.desktop.in.h:1
+#: ../mateuser-share-properties.desktop.in.h:1
 msgid "Personal File Sharing"
 msgstr "རང་དོན་གྱི་ཡིག་སྣོད་རུབ་སྤྱོད་འབད་ནི་"
 
-#: ../gnome-user-share-properties.desktop.in.h:2
+#: ../mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of personal files"
 msgstr "རང་དོན་གྱི་ཡིག་སྣོད་ཚུ་གི་རུབ་སྤྱོད་འབད་ནིའི་དོན་ལུ་ དགའ་གདམ་ཚུ་"
 
diff --git a/po/el.po b/po/el.po
index 2f6671e..fc852bf 100644
--- a/po/el.po
+++ b/po/el.po
@@ -1,7 +1,7 @@
 # translation of el.po to Greek
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
-# Kostas Papadimas <[email protected]>, 2005.
+# Kostas Papadimas <pkst@mateorg>, 2005.
 # Giannis Katsampirhs <[email protected]>, 2008.
 #
 # Pierros Papadeas <[email protected]>, 2009, 2010.
@@ -12,7 +12,7 @@ msgstr ""
 "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 <[email protected]>\n"
+"Language-Team: Greek <team@mategr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,7 +21,7 @@ msgstr ""
 "X-Poedit-Language: Greek\n"
 "X-Poedit-Country: GREECE\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -29,7 +29,7 @@ msgstr ""
 "Αν είναι αληθές, οι συσκευές bluetooth θα μπορούν να στέλνουν αρχεία στον "
 "κατάλογο Λήψεις του χρήστη, όποτε ο χρήστης είναι συνδεδεμένος."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -37,7 +37,7 @@ msgstr ""
 "Αν είναι αληθές, θα γίνεται κοινή χρήση του Δημόσιου καταλόγου του χρήστη "
 "μέσω bluetooth, όποτε ο χρήστης είναι συνδεδεμένος."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -45,19 +45,19 @@ msgstr ""
 "Αν είναι αληθές, θα γίνεται κοινή χρήση του Δημόσιου καταλόγου του χρήστη "
 "μέσω του δικτύου, όποτε ο χρήστης είναι συνδεδεμένος."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "Κοινή χρήση δημόσιου καταλόγου μέσω bluetooth"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "Κοινή χρήση δημόσιου καταλόγου μέσω του δικτύου"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../data/desktop_matefile_sharing.schemas.in.h:6
 msgid "When to accept files sent over Bluetooth"
 msgstr "Πότε θα γίνεται αποδοχή των αρχείων που στέλνονται μέσω bluetooth"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:7
+#: ../data/desktop_matefile_sharing.schemas.in.h:7
 msgid ""
 "When to accept files sent over Bluetooth. Possible values are \"always\", "
 "\"bonded\" and \"ask\"."
@@ -66,7 +66,7 @@ msgstr ""
 "πιθανές τιμές είναι \"always\" (πάντα), \"bonded\" (συζευγμένες συσκευές), "
 "\"bonded_trusted\" (συζευγμένες και έμπιστες) και \"ask\" (ερώτηση)."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../data/desktop_matefile_sharing.schemas.in.h:8
 msgid ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
@@ -74,23 +74,23 @@ msgstr ""
 "Ποτέ θα απαιτείται κωδικός. Οι πιθανές τιμές είναι \"never\" (ποτέ), "
 "\"on_write\" (για εγγραφή), και \"always\" (πάντα)."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "Πότε θα απαιτούνται κωδικοί"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../data/desktop_matefile_sharing.schemas.in.h:10
 msgid "Whether Bluetooth clients can send files using ObexPush."
 msgstr ""
 "Αν οι πελάτες bluetooth θα μπορούν να στέλνουν αρχεία χρησιμοποιώντας το "
 "obexPush."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:11
+#: ../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_gnome_file_sharing.schemas.in.h:12
+#: ../data/desktop_matefile_sharing.schemas.in.h:12
 msgid ""
 "Whether to allow Bluetooth clients to write files, or share the files read-"
 "only."
@@ -98,11 +98,11 @@ msgstr ""
 "Αν θα επιτρέπεται στους πελάτες bluetooth να εγγράφουν αρχεία, ή θα τους "
 "επιτρέπεται μόνο η ανάγνωση αρχείων."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:13
+#: ../data/desktop_matefile_sharing.schemas.in.h:13
 msgid "Whether to allow Bluetooth clients to write files."
 msgstr "Αν θα επιτρέπεται στους πελάτες bluetooth να εγγράφουν αρχεία."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:14
+#: ../data/desktop_matefile_sharing.schemas.in.h:14
 msgid "Whether to notify about newly received files."
 msgstr "Αν θα εμφανίζεται ειδοποίηση όποτε λαμβάνονται αρχεία."
 
@@ -158,24 +158,24 @@ msgstr "Α_παιτείται κωδικός:"
 msgid "_Share public files on network"
 msgstr "_Κοινή χρήση δημόσιων αρχείων μέσω δικτύου"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "Κοινή χρήση προσωπικών αρχείων"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Προτιμήσεις κοινής χρήσης αρχείων"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Εκκίνηση κοινής χρήσης προσωπικών αρχείων, αν είναι ενεργοποιημένη"
 
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "Εκκίνηση προτιμήσεων"
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Εκκίνηση προτιμήσεων κοινής χρήσης προσωπικών αρχείων"
 
diff --git a/po/[email protected] b/po/[email protected]
index e5b2447..943e141 100644
--- a/po/[email protected]
+++ b/po/[email protected]
@@ -1,21 +1,21 @@
-# Shavian translation for gnome-user-share.
+# Shavian translation for mateuser-share.
 # Copyright (C) 2009-2010 The Gnome Foundation.
-# Thomas Thurman <[email protected]>, 2010.
+# Thomas Thurman <tthurman@mateorg>, 2010.
 # Transliterate Bluetooth as ·𐑚𐑤𐑵𐑑𐑵𐑔
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-user-share&component=general\n"
+"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-05-18 11:11+0000\n"
 "PO-Revision-Date: 2010-05-18 10:04 -0400\n"
-"Last-Translator: Thomas Thurman <[email protected]>\n"
+"Last-Translator: Thomas Thurman <tthurman@mateorg>\n"
 "Language-Team: Shavian <[email protected]>\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_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -23,7 +23,7 @@ msgstr ""
 "𐑦𐑓 𐑞𐑦𐑕 𐑦𐑟 𐑑𐑮𐑵, ·𐑚𐑤𐑵𐑑𐑵𐑔 𐑛𐑦𐑝𐑲𐑕𐑩𐑟 𐑒𐑨𐑯 𐑕𐑧𐑯𐑛 𐑓𐑲𐑤𐑟 𐑑 𐑞 𐑿𐑟𐑼'𐑟 𐑛𐑬𐑯𐑤𐑴𐑛𐑟 𐑛𐑲𐑮𐑧𐑒𐑑𐑼𐑦 𐑢𐑧𐑯 "
 "𐑤𐑪𐑜𐑛 𐑦𐑯."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -31,7 +31,7 @@ msgstr ""
 "𐑦𐑓 𐑞𐑦𐑕 𐑦𐑟 𐑑𐑮𐑵, 𐑞 𐑐𐑳𐑚𐑤𐑦𐑒 𐑛𐑲𐑮𐑧𐑒𐑑𐑼𐑦 𐑦𐑯 𐑞 𐑿𐑟𐑼𐑟 𐑣𐑴𐑥 𐑛𐑲𐑮𐑧𐑒𐑑𐑼𐑦 𐑢𐑦𐑤 𐑚𐑰 𐑖𐑺𐑛 𐑴𐑝𐑼 "
 "·𐑚𐑤𐑵𐑑𐑵𐑔 𐑢𐑧𐑯 𐑞 𐑿𐑟𐑼 𐑦𐑟 𐑤𐑪𐑜𐑛 𐑦𐑯."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -39,19 +39,19 @@ msgstr ""
 "𐑦𐑓 𐑞𐑦𐑕 𐑦𐑟 𐑑𐑮𐑵, 𐑞 𐑐𐑳𐑚𐑤𐑦𐑒 𐑛𐑲𐑮𐑧𐑒𐑑𐑼𐑦 𐑦𐑯 𐑞 𐑿𐑟𐑼𐑟 𐑣𐑴𐑥 𐑛𐑲𐑮𐑧𐑒𐑑𐑼𐑦 𐑢𐑦𐑤 𐑚𐑰 𐑖𐑺𐑛 𐑴𐑝𐑼 𐑞 "
 "𐑯𐑧𐑑𐑢𐑻𐑒 𐑢𐑧𐑯 𐑞 𐑿𐑟𐑼 𐑦𐑟 𐑤𐑪𐑜𐑛 𐑦𐑯."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "𐑖𐑺 𐑐𐑳𐑚𐑤𐑦𐑒 𐑛𐑲𐑮𐑧𐑒𐑑𐑼𐑦 𐑴𐑝𐑼 ·𐑚𐑤𐑵𐑑𐑵𐑔"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "𐑖𐑺 𐑐𐑳𐑚𐑤𐑦𐑒 𐑛𐑲𐑮𐑧𐑒𐑑𐑼𐑦 𐑴𐑝𐑼 𐑞 𐑯𐑧𐑑𐑢𐑻𐑒"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../data/desktop_matefile_sharing.schemas.in.h:6
 msgid "When to accept files sent over Bluetooth"
 msgstr "𐑢𐑧𐑯 𐑑 𐑨𐑒𐑕𐑧𐑐𐑑 𐑓𐑲𐑤𐑟 𐑕𐑧𐑯𐑑 𐑴𐑝𐑼 ·𐑚𐑤𐑵𐑑𐑵𐑔"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:7
+#: ../data/desktop_matefile_sharing.schemas.in.h:7
 msgid ""
 "When to accept files sent over Bluetooth. Possible values are \"always\", "
 "\"bonded\" and \"ask\"."
@@ -59,37 +59,37 @@ msgstr ""
 "𐑢𐑧𐑯 𐑑 𐑨𐑒𐑕𐑧𐑐𐑑 𐑓𐑲𐑤𐑟 𐑕𐑧𐑯𐑑 𐑴𐑝𐑼 ·𐑚𐑤𐑵𐑑𐑵𐑔. 𐑐𐑪𐑕𐑩𐑚𐑩𐑤 𐑝𐑨𐑤𐑿𐑟 𐑸 \"always\", \"bonded\" 𐑯 "
 "\"ask\"."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../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_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "𐑢𐑧𐑯 𐑑 𐑮𐑦𐑒𐑢𐑲𐑼 𐑐𐑭𐑕𐑢𐑼𐑛𐑟"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../data/desktop_matefile_sharing.schemas.in.h:10
 msgid "Whether Bluetooth clients can send files using ObexPush."
 msgstr "𐑢𐑧𐑞𐑼 ·𐑚𐑤𐑵𐑑𐑵𐑔 𐑒𐑤𐑲𐑩𐑯𐑑𐑕 𐑒𐑨𐑯 𐑕𐑧𐑯𐑛 𐑓𐑲𐑤𐑟 𐑿𐑟𐑦𐑙 ·𐑴𐑚𐑧𐑒𐑕𐑐𐑫𐑖."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:11
+#: ../data/desktop_matefile_sharing.schemas.in.h:11
 msgid ""
 "Whether Bluetooth clients need to pair with the computer to send files."
 msgstr "𐑢𐑧𐑞𐑼 ·𐑚𐑤𐑵𐑑𐑵𐑔 𐑒𐑤𐑲𐑩𐑯𐑑𐑕 𐑯𐑰𐑛 𐑑 𐑐𐑺 𐑢𐑦𐑞 𐑞 𐑒𐑩𐑥𐑐𐑿𐑑𐑼 𐑑 𐑕𐑧𐑯𐑛 𐑓𐑲𐑤𐑟."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:12
+#: ../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_gnome_file_sharing.schemas.in.h:13
+#: ../data/desktop_matefile_sharing.schemas.in.h:13
 msgid "Whether to allow Bluetooth clients to write files."
 msgstr "𐑢𐑧𐑞𐑼 𐑑 𐑩𐑤𐑬 ·𐑚𐑤𐑵𐑑𐑵𐑔 𐑒𐑤𐑲𐑩𐑯𐑑𐑕 𐑑 𐑮𐑲𐑑 𐑓𐑲𐑤𐑟."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:14
+#: ../data/desktop_matefile_sharing.schemas.in.h:14
 msgid "Whether to notify about newly received files."
 msgstr "𐑢𐑧𐑞𐑼 𐑑 𐑯𐑴𐑑𐑦𐑓𐑲 𐑩𐑚𐑬𐑑 𐑯𐑿𐑤𐑦 𐑮𐑦𐑕𐑰𐑝𐑛 𐑓𐑲𐑤𐑟."
 
@@ -145,24 +145,24 @@ msgstr "_𐑮𐑦𐑒𐑢𐑲𐑼 𐑐𐑭𐑕𐑢𐑼𐑛:"
 msgid "_Share public files on network"
 msgstr "_𐑖𐑺 𐑐𐑳𐑚𐑤𐑦𐑒 𐑓𐑲𐑤𐑟 𐑪𐑯 𐑯𐑧𐑑𐑢𐑻𐑒"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "𐑐𐑻𐑕𐑩𐑯𐑩𐑤 𐑓𐑲𐑤 𐑖𐑺𐑦𐑙"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "𐑐𐑮𐑧𐑓𐑼𐑩𐑯𐑕𐑩𐑟 𐑓𐑹 𐑖𐑺𐑦𐑙 𐑝 𐑓𐑲𐑤𐑟"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "𐑤𐑷𐑯𐑗 𐑐𐑻𐑕𐑩𐑯𐑩𐑤 𐑓𐑲𐑤 𐑖𐑺𐑦𐑙 𐑦𐑓 𐑦𐑯𐑱𐑚𐑩𐑤𐑛"
 
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "𐑤𐑷𐑯𐑗 𐑐𐑮𐑧𐑓𐑼𐑩𐑯𐑕𐑩𐑟"
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 msgid "Launch Personal File Sharing Preferences"
 msgstr "𐑤𐑷𐑯𐑗 𐑐𐑻𐑕𐑩𐑯𐑩𐑤 𐑓𐑲𐑤 𐑖𐑺𐑦𐑙 𐑐𐑮𐑧𐑓𐑼𐑩𐑯𐑕𐑩𐑟"
 
diff --git a/po/en_CA.po b/po/en_CA.po
index 07cc9a7..02d2fbf 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -1,22 +1,22 @@
-# Canadian English translation for gnome-user-share
+# 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 gnome-user-share package.
-# Adam Weinberger <[email protected]>, 2005.
+# This file is distributed under the same licence as the mateuser-share package.
+# Adam Weinberger <adamw@mateorg>, 2005.
 #
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share\n"
+"Project-Id-Version: mateuser-share\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 <[email protected]>\n"
-"Language-Team: Canadian English <[email protected]>\n"
+"Last-Translator: Adam Weinberger <adamw@mateorg>\n"
+"Language-Team: Canadian English <adamw@mateorg>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: desktop_gnome_file_sharing.schemas.in.h:1
+#: 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."
@@ -24,11 +24,11 @@ msgstr ""
 "If this is true, the Public directory in the user's home directory will be "
 "shared when the user is logged in."
 
-#: desktop_gnome_file_sharing.schemas.in.h:2
+#: desktop_matefile_sharing.schemas.in.h:2
 msgid "Share Public directory"
 msgstr "Share Public directory"
 
-#: desktop_gnome_file_sharing.schemas.in.h:3
+#: desktop_matefile_sharing.schemas.in.h:3
 msgid ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
@@ -36,7 +36,7 @@ msgstr ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
 
-#: desktop_gnome_file_sharing.schemas.in.h:4
+#: desktop_matefile_sharing.schemas.in.h:4
 msgid "When to require passwords"
 msgstr "When to require passwords"
 
@@ -72,11 +72,11 @@ msgstr "_Password:"
 msgid "_Require password:"
 msgstr "_Require password:"
 
-#: gnome-user-share-properties.desktop.in.h:1
+#: mateuser-share-properties.desktop.in.h:1
 msgid "Personal File Sharing"
 msgstr "Personal File Sharing"
 
-#: gnome-user-share-properties.desktop.in.h:2
+#: mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of personal files"
 msgstr "Preferences for sharing of personal files"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index f61febe..f50ead7 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -1,12 +1,12 @@
-# English (British) translation for gnome-user-share
+# English (British) translation for mateuser-share
 # Copyright (C) 2005 The Gnome Foundation
-# This file is distributed under the same license as the gnome-user-share package.
+# This file is distributed under the same license as the mateuser-share package.
 # David Lodge <[email protected]>, 2005, 2009.
 # Philip Withnall <[email protected]>, 2009, 2010.
 # Bruce Cowan <[email protected]>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share\n"
+"Project-Id-Version: mateuser-share\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-04-25 21:52+0100\n"
 "PO-Revision-Date: 2010-02-24 14:06+0100\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Virtaal 0.5.2\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -27,7 +27,7 @@ msgstr ""
 "If this is true, Bluetooth devices can send files to the user's Downloads "
 "directory when the user is logged in."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -35,7 +35,7 @@ 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_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -43,19 +43,19 @@ 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_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "Share Public directory over Bluetooth"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "Share Public directory over the network"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../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_gnome_file_sharing.schemas.in.h:7
+#: ../data/desktop_matefile_sharing.schemas.in.h:7
 msgid ""
 "When to accept files sent over Bluetooth. Possible values are \"always\", "
 "\"bonded\" and \"ask\"."
@@ -63,7 +63,7 @@ msgstr ""
 "When to accept files sent over Bluetooth. Possible values are \"always\", "
 "\"bonded\" and \"ask\"."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../data/desktop_matefile_sharing.schemas.in.h:8
 msgid ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
@@ -71,20 +71,20 @@ msgstr ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "When to require passwords"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../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_gnome_file_sharing.schemas.in.h:11
+#: ../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_gnome_file_sharing.schemas.in.h:12
+#: ../data/desktop_matefile_sharing.schemas.in.h:12
 msgid ""
 "Whether to allow Bluetooth clients to write files, or share the files read-"
 "only."
@@ -92,11 +92,11 @@ msgstr ""
 "Whether to allow Bluetooth clients to write files, or share the files read-"
 "only."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:13
+#: ../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_gnome_file_sharing.schemas.in.h:14
+#: ../data/desktop_matefile_sharing.schemas.in.h:14
 msgid "Whether to notify about newly received files."
 msgstr "Whether to notify about newly received files."
 
@@ -152,24 +152,24 @@ msgstr "_Require password:"
 msgid "_Share public files on network"
 msgstr "_Share public files on network"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "Personal File Sharing"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Preferences for sharing of files"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Launch Personal File Sharing if enabled"
 
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "Launch Preferences"
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Launch Personal File Sharing Preferences"
 
diff --git a/po/eo.po b/po/eo.po
index e3bf6a4..30e8694 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -1,13 +1,13 @@
-# Esperanto translation for gnome-user-share
+# Esperanto translation for mateuser-share
 # Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the gnome-user-share package.
+# This file is distributed under the same license as the mateuser-share package.
 # Aisano <>, 2010.
 # Kristjan SCHMIDT <[email protected]>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"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"
@@ -20,7 +20,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -28,7 +28,7 @@ msgstr ""
 "Se tio estas vera, Bluetooth-aparatoj povas sendi dosierojn al la "
 "elŝutdosierujo de la uzanto, kiam tiu estas ensalutinta."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -36,7 +36,7 @@ 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_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -44,19 +44,19 @@ 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_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "Komunigi la dosierujon \"Publika\" tra Bluetooth"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../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_gnome_file_sharing.schemas.in.h:6
+#: ../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_gnome_file_sharing.schemas.in.h:7
+#: ../data/desktop_matefile_sharing.schemas.in.h:7
 msgid ""
 "When to accept files sent over Bluetooth. Possible values are \"always\", "
 "\"bonded\" and \"ask\"."
@@ -64,7 +64,7 @@ msgstr ""
 "Kiam akcepti dosierojn senditajn tra Bluetooth. Eblaj valoroj estas \"always"
 "\" (ĉiam), \"bonded\" (ligitajn) kaj \"ask\" (demandi)."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../data/desktop_matefile_sharing.schemas.in.h:8
 msgid ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
@@ -72,19 +72,19 @@ msgstr ""
 "Kiam peti pasvortojn. Eblaj valoroj estas \"never\" (neniam), \"on_write"
 "\" (\"por_skribi\") kaj \"always\" (ĉiam)."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "Kiam postuli pasvortojn."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../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_gnome_file_sharing.schemas.in.h:11
+#: ../data/desktop_matefile_sharing.schemas.in.h:11
 msgid "Whether Bluetooth clients need to pair with the computer to send files."
 msgstr ""
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:12
+#: ../data/desktop_matefile_sharing.schemas.in.h:12
 msgid ""
 "Whether to allow Bluetooth clients to write files, or share the files read-"
 "only."
@@ -92,11 +92,11 @@ msgstr ""
 "Ĉu permesi al Bluetooth-kliento skribi dosierojn aŭ legi komunigitajn "
 "dosierojn."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:13
+#: ../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_gnome_file_sharing.schemas.in.h:14
+#: ../data/desktop_matefile_sharing.schemas.in.h:14
 msgid "Whether to notify about newly received files."
 msgstr "Ĉu atentigi pri alvenantaj dosieroj."
 
@@ -152,24 +152,24 @@ msgstr "_Bezonata pasvorto:"
 msgid "_Share public files on network"
 msgstr ""
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr ""
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr ""
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr ""
 
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr ""
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 msgid "Launch Personal File Sharing Preferences"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index d9f1464..126c92e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,25 +1,25 @@
-# translation of gnome-user-share.HEAD.po to Español
+# translation of mateuser-share.HEAD.po to Español
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 #
-# Francisco Javier F. Serrador <[email protected]>, 2005, 2006.
-# Jorge González <[email protected]>, 200, 2009.
+# Francisco Javier F. Serrador <[email protected]>, 2005, 2006.
+# Jorge González <[email protected]>, 200, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share.HEAD\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"Project-Id-Version: mateuser-share.HEAD\n"
+"Report-Msgid-Bugs-To: http://bugzilla.mateorg/enter_bug.cgi?product=mate"
 "user-share&component=general\n"
 "POT-Creation-Date: 2009-10-21 13:34+0000\n"
 "PO-Revision-Date: 2009-10-27 21:45+0100\n"
-"Last-Translator: Jorge González <[email protected]>\n"
-"Language-Team: Español <[email protected]>\n"
+"Last-Translator: Jorge González <[email protected]>\n"
+"Language-Team: Español <matees-list@mateorg>\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_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -27,7 +27,7 @@ msgstr ""
 "Si esto es «true», los dispositivos Bluetooth pueden enviar archivos al "
 "directorio Descargas del usuario cuando haya iniciado la sesión."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -35,7 +35,7 @@ msgstr ""
 "Si esto es cierto, el directorio «Public» en el directorio personal del "
 "usuario se compartirá cuando el usuario inicie sesión."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -43,19 +43,19 @@ msgstr ""
 "Si esto es cierto, el directorio «Public» en el directorio personal de los "
 "usuarios se compartirá cuando el usuario inicie sesión."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "Compartir el directorio «Public» por Bluetooth"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "Compartir el directorio «Public» por red"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../data/desktop_matefile_sharing.schemas.in.h:6
 msgid "When to accept files sent over Bluetooth"
 msgstr "Cuándo aceptar archivos enviados por Bluetooth"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:7
+#: ../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\"."
@@ -66,7 +66,7 @@ msgstr ""
 "Cuándo aceptar archivos enviados por Bluetooth. Los valores posibles son: "
 "«always» (siempre), «bonded» (vinculados) y «ask» (preguntar)."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../data/desktop_matefile_sharing.schemas.in.h:8
 msgid ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
@@ -74,21 +74,21 @@ msgstr ""
 "Cuando pedir contraseñas. Las opciones posibles son: \"never\" (nunca), "
 "\"on_write\" (al escribir) y \"always\" (siempre)."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "Cuando requerir contraseñas"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../data/desktop_matefile_sharing.schemas.in.h:10
 msgid "Whether Bluetooth clients can send files using ObexPush."
 msgstr "Si los clientes Bluetooth pueden enviar archivos usando ObexPush."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:11
+#: ../data/desktop_matefile_sharing.schemas.in.h:11
 msgid "Whether Bluetooth clients need to pair with the computer to send files."
 msgstr ""
 "Si los clientes Bluetooth necesitan emparejarse con el equipo para enviar "
 "archivos."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:12
+#: ../data/desktop_matefile_sharing.schemas.in.h:12
 msgid ""
 "Whether to allow Bluetooth clients to write files, or share the files read-"
 "only."
@@ -96,11 +96,11 @@ msgstr ""
 "Indica si se permite a los clientes por Bluetooth escribir archivos o "
 "solamente compartir los archivos de sólo lectura."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:13
+#: ../data/desktop_matefile_sharing.schemas.in.h:13
 msgid "Whether to allow Bluetooth clients to write files."
 msgstr "Indica si se permite escribir archivos a los clientes por Bluetooth"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:14
+#: ../data/desktop_matefile_sharing.schemas.in.h:14
 msgid "Whether to notify about newly received files."
 msgstr "Si notificar acerca de los nuevos archivos recibidos."
 
@@ -156,24 +156,24 @@ msgstr "_Requerir contraseña:"
 msgid "_Share public files on network"
 msgstr "C_ompartir archivos públicos por red"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:167
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:167
 msgid "Personal File Sharing"
 msgstr "Compartición de archivos personales"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Preferencias para la compartición de archivos"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Lanzar la compartición de archivos personales si están activadas"
 
-#: ../src/nautilus-share-bar.c:179
+#: ../src/caja-share-bar.c:179
 msgid "Launch Preferences"
 msgstr "Lanzar las preferencias"
 
-#: ../src/nautilus-share-bar.c:193
+#: ../src/caja-share-bar.c:193
 #| msgid "Personal File Sharing Preferences"
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Lanzar las preferencias de compartición de archivos personales"
diff --git a/po/et.po b/po/et.po
index c9f3db9..8c7fd30 100644
--- a/po/et.po
+++ b/po/et.po
@@ -1,8 +1,8 @@
 # GNOME kasutaja failijagamise eesti keele tõlge.
-# Estonian translation of gnome-user-share.
+# Estonian translation of mateuser-share.
 #
 # Copyright (C) 2009 The GNOME Project.
-# This file is distributed under the same license as the gnome-user-share
+# This file is distributed under the same license as the mateuser-share
 # package.
 #
 # Ivar Smolin <okul linux ee>, 2009.
@@ -10,8 +10,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share MASTER\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"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-11-30 17:29+0000\n"
 "PO-Revision-Date: 2010-02-24 14:39+0300\n"
@@ -209,7 +209,7 @@ msgstr "Kasutaja %s avalikud failid hostil %s"
 msgid "You received \"%s\" via Bluetooth"
 msgstr "Sa võtsid faili \"%s\" Bluetoothi kaudu vastu"
 
-# Pealkiri: gnome-user-share
+# Pealkiri: mateuser-share
 # Sulle saadeti fail
 # Sa võtsid Bluetoothi kaudu vastu faili "Pilt001.jpg"
 # Nupud: Ava fail, Ava kataloog, Loobu, Olgu
diff --git a/po/eu.po b/po/eu.po
index dd9637f..b68b1a4 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -25,7 +25,7 @@ msgstr ""
 "'true' gisa (egia) ezartzen bada, Bluetooth gailuek fitxategiak bidal "
 "ditzakete erabiltzailearen 'Deskargak' direktoriora saioa hastean."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -34,7 +34,7 @@ msgstr ""
 "publikoa partekatu egingo da Bluetooth bidez erabiltzaileak saioa hasten "
 "duenean."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -43,19 +43,19 @@ msgstr ""
 "publikoa partekatu egingo da sarean zehar erabiltzaileak saioa hasten "
 "duenean."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "Partekatu direktorio publikoa Bluetooth bidez"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "Partekatu direktorio publikoa sarean zehar"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../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_gnome_file_sharing.schemas.in.h:7
+#: ../data/desktop_matefile_sharing.schemas.in.h:7
 msgid ""
 "When to accept files sent over Bluetooth. Possible values are \"always\", "
 "\"bonded\" and \"ask\"."
@@ -63,7 +63,7 @@ msgstr ""
 "Noiz onartu Bluetooth bidez bidalitako fitxategiak. Balio erabilgarriak: "
 "\"always\" (beti), \"bonded\" (lotuta), eta \"ask\" (galdetu)."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../data/desktop_matefile_sharing.schemas.in.h:8
 msgid ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
@@ -71,21 +71,21 @@ msgstr ""
 "Noiz eskatu pasahitza. Balio erabilgarriak: \"never\" (inoiz ere ez), "
 "\"on_write\" (idaztean), eta \"always\" (beti)."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "Noiz eskatu pasahitza"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../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_gnome_file_sharing.schemas.in.h:11
+#: ../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_gnome_file_sharing.schemas.in.h:12
+#: ../data/desktop_matefile_sharing.schemas.in.h:12
 msgid ""
 "Whether to allow Bluetooth clients to write files, or share the files read-"
 "only."
@@ -93,11 +93,11 @@ msgstr ""
 "Bluetooth bezeroei fitxategiak idaztea baimendu behar zaien, edo irakurtzeko "
 "soilik diren fitxategiak partekatzea."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:13
+#: ../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_gnome_file_sharing.schemas.in.h:14
+#: ../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."
 
@@ -153,24 +153,24 @@ msgstr "_Eskatu pasahitza:"
 msgid "_Share public files on network"
 msgstr "_Partekatu fitxategi publikoak sarean"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "Fitxategi pertsonalak partekatzea"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Fitxategiak partekatzeko hobespenak"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Abiarazi fitxategi pertsonalak partekatzea gaituta badago"
 
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "Abiarazi hobespenak"
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Fitxategi pertsonalak partekatzearen hobespenak abiarazi"
 
diff --git a/po/fi.po b/po/fi.po
index 2f0a6f8..fe6dd45 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,4 +1,4 @@
-# Finnish translations for gnome-user-share package.
+# 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.
@@ -6,18 +6,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share\n"
+"Project-Id-Version: mateuser-share\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"
+"Language-Team: Finnish <[email protected]>\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_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -25,7 +25,7 @@ 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_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -33,7 +33,7 @@ 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_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -41,19 +41,19 @@ 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_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "Jaa julkinen kansio bluetooth-verkossa"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "Jaa julkinen kansio verkossa"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../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_gnome_file_sharing.schemas.in.h:7
+#: ../data/desktop_matefile_sharing.schemas.in.h:7
 msgid ""
 "When to accept files sent over Bluetooth. Possible values are \"always\", "
 "\"bonded\" and \"ask\"."
@@ -61,7 +61,7 @@ msgstr ""
 "Milloin Bluetoothin yli lähetetyt tiedostot hyväksytään. Mahdolliset arvot "
 "ovat: ”always”, ”bonded” ja ”ask”."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../data/desktop_matefile_sharing.schemas.in.h:8
 msgid ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
@@ -69,21 +69,21 @@ msgstr ""
 "Milloin kysytään salasanoja. Mahdolliset arvot ovat: ”never” (ei koskaan), "
 "”on_write” (kirjoitettaessa) ja ”always” (aina)."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "Milloin vaaditaan salasanat"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../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_gnome_file_sharing.schemas.in.h:11
+#: ../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_gnome_file_sharing.schemas.in.h:12
+#: ../data/desktop_matefile_sharing.schemas.in.h:12
 msgid ""
 "Whether to allow Bluetooth clients to write files, or share the files read-"
 "only."
@@ -91,11 +91,11 @@ msgstr ""
 "Sallitaanko bluetooth-asiakkaiden kirjoittaa tiedostoja vai vain lukea "
 "jaettuja tiedostoja."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:13
+#: ../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_gnome_file_sharing.schemas.in.h:14
+#: ../data/desktop_matefile_sharing.schemas.in.h:14
 msgid "Whether to notify about newly received files."
 msgstr "Huomautetaanko vastaanotetuista tiedostoista."
 
@@ -151,24 +151,24 @@ msgstr "_Vaadi salasana:"
 msgid "_Share public files on network"
 msgstr "_Jaa julkiset tiedostot verkossa"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "Omien tiedostojen jako"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Asetukset tiedostojen jakamiselle"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Käynnistä henkilökohtaisten tiedoston jako, jos käytössä"
 
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "Käynnistysasetukset"
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Käynnistä henkilökohtaisten tiedostojen jaon asetukset"
 
diff --git a/po/fr.po b/po/fr.po
index 9e54a1b..46f68fd 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,6 +1,6 @@
-# French translation of gnome-user-share.
+# French translation of mateuser-share.
 # Copyright (C) 2005-2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gnome-user-share package.
+# This file is distributed under the same license as the mateuser-share package.
 #
 # Bieuzent Cyrille <[email protected]>, 2005
 # Damien Durand <[email protected]>, 2006
@@ -9,18 +9,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share HEAD\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"Project-Id-Version: mateuser-share HEAD\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-01-09 23:55+0100\n"
 "Last-Translator: Claude Paroz <[email protected]>\n"
-"Language-Team: GNOME French Team <[email protected]>\n"
+"Language-Team: GNOME French Team <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -28,7 +28,7 @@ msgstr ""
 "Si VRAI, les périphériques Bluetooth peuvent envoyer des fichiers dans le "
 "dossier Téléchargements de l'utilisateur lorsque celui-ci est connecté."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -36,7 +36,7 @@ msgstr ""
 "Si VRAI, le répertoire Public dans le dossier personnel des utilisateurs est "
 "partagé par Bluetooth lorsque l'utilisateur se connecte."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -44,19 +44,19 @@ msgstr ""
 "Si VRAI, le répertoire Public dans le dossier personnel des utilisateurs est "
 "partagé sur le réseau lorsque l'utilisateur se connecte."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "Partage le répertoire Public par Bluetooth"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "Partage le répertoire Public sur le réseau"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../data/desktop_matefile_sharing.schemas.in.h:6
 msgid "When to accept files sent over Bluetooth"
 msgstr "Quand accepter des fichiers par Bluetooth"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:7
+#: ../data/desktop_matefile_sharing.schemas.in.h:7
 msgid ""
 "When to accept files sent over Bluetooth. Possible values are \"always\", "
 "\"bonded\" and \"ask\"."
@@ -64,7 +64,7 @@ msgstr ""
 "Quand accepter les fichiers par Bluetooth. Les valeurs possibles sont : "
 "« always » (toujours), « bonded » (si lié) et « ask » (demander)."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../data/desktop_matefile_sharing.schemas.in.h:8
 msgid ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
@@ -72,23 +72,23 @@ msgstr ""
 "Quand demander des mots de passe. Les valeurs possibles sont : "
 "« never » (jamais), « on_write » (à l'écriture) et « always » (toujours)."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "Quand exiger les mots de passe"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../data/desktop_matefile_sharing.schemas.in.h:10
 msgid "Whether Bluetooth clients can send files using ObexPush."
 msgstr ""
 "Indique si les clients Bluetooth peuvent envoyer des fichiers en utilisant "
 "ObexPush."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:11
+#: ../data/desktop_matefile_sharing.schemas.in.h:11
 msgid "Whether Bluetooth clients need to pair with the computer to send files."
 msgstr ""
 "Indique si les clients Bluetooth doivent se lier à l'ordinateur pour envoyer "
 "des fichiers."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:12
+#: ../data/desktop_matefile_sharing.schemas.in.h:12
 msgid ""
 "Whether to allow Bluetooth clients to write files, or share the files read-"
 "only."
@@ -96,12 +96,12 @@ msgstr ""
 "Indique s'il faut autoriser les clients Bluetooth à écrire des fichiers ou "
 "s'il s'agit de partager les fichiers en lecture uniquement."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:13
+#: ../data/desktop_matefile_sharing.schemas.in.h:13
 msgid "Whether to allow Bluetooth clients to write files."
 msgstr ""
 "Indique s'il faut autoriser les clients Bluetooth à écrire des fichiers."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:14
+#: ../data/desktop_matefile_sharing.schemas.in.h:14
 msgid "Whether to notify about newly received files."
 msgstr "Indique s'il faut signaler les fichiers nouvellement reçus."
 
@@ -157,24 +157,24 @@ msgstr "_Exiger le mot de passe :"
 msgid "_Share public files on network"
 msgstr "_Partager les fichiers publics sur le réseau"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "Partage de fichiers personnels"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Préférences pour le partage de fichiers"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Lance le partage de fichiers personnels s'il est activé"
 
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "Ouvrir les préférences"
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Ouvre les préférences du partage de fichiers personnels"
 
diff --git a/po/ga.po b/po/ga.po
index 4377682..8d24a32 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -1,11 +1,11 @@
-# Irish translations for gnome-user-share package.
+# Irish translations for mateuser-share package.
 # Copyright (C) 2009 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gnome-user-share package.
+# This file is distributed under the same license as the mateuser-share package.
 # Seán de Búrca <[email protected]>, 2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share\n"
+"Project-Id-Version: mateuser-share\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"
@@ -17,7 +17,7 @@ msgstr ""
 "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_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -26,7 +26,7 @@ msgstr ""
 "dtí comhadlann \"Íosluchtuithe\" an úsáideora nuair atá an t-úsáideoir "
 "logáilte isteach."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -34,7 +34,7 @@ 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_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -42,19 +42,19 @@ 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_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "Comhroinn an chomhadlann \"Poiblí\" trí Bluetooth"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../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_gnome_file_sharing.schemas.in.h:6
+#: ../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_gnome_file_sharing.schemas.in.h:7
+#: ../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\"."
@@ -63,7 +63,7 @@ msgstr ""
 "d'fhéadfadh a bheith ann ná \"always\", \"bonded\", \"bonded_trusted\", agus "
 "\"ask\"."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../data/desktop_matefile_sharing.schemas.in.h:8
 msgid ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
@@ -71,23 +71,23 @@ 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_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "An t-am focail faire le héileamh"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../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_gnome_file_sharing.schemas.in.h:11
+#: ../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_gnome_file_sharing.schemas.in.h:12
+#: ../data/desktop_matefile_sharing.schemas.in.h:12
 msgid ""
 "Whether to allow Bluetooth clients to write files, or share the files read-"
 "only."
@@ -95,13 +95,13 @@ msgstr ""
 "Cé acu a cheadófar do chliaint Bluetooth comhaid a scríobh, nó na comhaid a "
 "chomhroinnt inléite-amháin."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:13
+#: ../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_gnome_file_sharing.schemas.in.h:14
+#: ../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 "
@@ -159,16 +159,16 @@ msgstr "Focal faire de _dhíth:"
 msgid "_Share public files on network"
 msgstr "_Comhroinn comhaid poiblí ar an líonra"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2
 msgid "Personal File Sharing"
 msgstr "Comhroinnt Chomhad Pearsanta"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Sainroghanna ar chomhroinnt chomhad"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Tosaigh Comhroinnt Chomhad Pearsanta má chumasaithe"
 
diff --git a/po/gl.po b/po/gl.po
index 4ff72f7..792cd37 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,5 +1,5 @@
-# translation of gnome-user-share.master.gl.po to Galician
-# Galician translation of gnome-utils.
+# translation of mateuser-share.master.gl.po to Galician
+# Galician translation of mateutils.
 # Copyright (C) 2000-2001 Jesús Bravo Álvarez.
 # Copyright (C) 1999 Ruben Lopez Gomez.
 #
@@ -9,10 +9,10 @@
 # First Version: 2000-04-09 18:45+0200
 #
 # Jesús Bravo Álvarez <[email protected]>, 2000-2001.
-# Ruben Lopez Gomez <[email protected]>, 1999. (logview from gnome-admin).
+# Ruben Lopez Gomez <[email protected]>, 1999. (logview from mateadmin).
 # Ignacio Casal Quinteiro <[email protected]>, 2004.
 # Ignacio Casal Quinteiro <[email protected]>, 2005, 2006.
-# Ignacio Casal Quinteiro <[email protected]>, 2007, 2008.
+# Ignacio Casal Quinteiro <[email protected]>, 2007, 2008.
 # Mancomún - Centro de Referencia e Servizos de Software Libre <[email protected]>, 2009.
 # Suso Baleato <[email protected]>, 2009.
 # Antón Méixome <[email protected]>, 2009.
@@ -20,12 +20,12 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share.master.gl\n"
+"Project-Id-Version: mateuser-share.master.gl\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-07-20 13:42+0200\n"
 "PO-Revision-Date: 2010-07-20 13:43+0200\n"
 "Last-Translator: Fran Diéguez <[email protected]>\n"
-"Language-Team: Galician <[email protected]>\n"
+"Language-Team: Galician <mategl-list@mateorg>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,7 +33,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -41,7 +41,7 @@ msgstr ""
 "Se está definido a «true», os dispositivos Bluetooth poden enviar ficheiros "
 "ao cartafol Descargas do usuario cando estea conectado."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -49,7 +49,7 @@ 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_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -57,19 +57,19 @@ 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_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "Compartir o cartafol público mediante o Bluetooth"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "Compartir o cartafol público na rede"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../data/desktop_matefile_sharing.schemas.in.h:6
 msgid "When to accept files sent over Bluetooth"
 msgstr "Cando aceptar os ficheiros enviados mediante Bluetooth"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:7
+#: ../data/desktop_matefile_sharing.schemas.in.h:7
 msgid ""
 "When to accept files sent over Bluetooth. Possible values are \"always\", "
 "\"bonded\" and \"ask\"."
@@ -77,7 +77,7 @@ msgstr ""
 "Cando aceptar os ficheiros enviados mediante Bluetooth. Os valores posíbeis "
 "son \"always\", \"bonded\", e \"ask\"."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../data/desktop_matefile_sharing.schemas.in.h:8
 msgid ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
@@ -85,21 +85,21 @@ msgstr ""
 "Cando hai que pedir os contrasinais. Os valores posíbeis son \"never\", "
 "\"on_write\", e \"always\"."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "Cando requirir os contrasinais"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../data/desktop_matefile_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_gnome_file_sharing.schemas.in.h:11
+#: ../data/desktop_matefile_sharing.schemas.in.h:11
 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_gnome_file_sharing.schemas.in.h:12
+#: ../data/desktop_matefile_sharing.schemas.in.h:12
 msgid ""
 "Whether to allow Bluetooth clients to write files, or share the files read-"
 "only."
@@ -107,11 +107,11 @@ msgstr ""
 "Se se lles permite aos clientes de Bluetooth escribir ficheiros ou compartir "
 "os ficheiros de só lectura."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:13
+#: ../data/desktop_matefile_sharing.schemas.in.h:13
 msgid "Whether to allow Bluetooth clients to write files."
 msgstr "Se se lles permite aos clientes Bluetooth escribir ficheiros."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:14
+#: ../data/desktop_matefile_sharing.schemas.in.h:14
 msgid "Whether to notify about newly received files."
 msgstr "Se hai que informar sobre os ficheiros recibidos recentemente."
 
@@ -167,24 +167,24 @@ msgstr "_Requirir un contrasinal:"
 msgid "_Share public files on network"
 msgstr "C_ompartir os ficheiros públicos na rede"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "Compartir ficheiros persoais"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Preferencias para compartir ficheiros"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Iniciar Compartir ficheiros persoais, se está activado"
 
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "Preferencias de inicio"
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Iniciar as Preferencias de compartir ficheiros persoais"
 
diff --git a/po/gu.po b/po/gu.po
index f9ee5b6..48b7226 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -1,4 +1,4 @@
-# translation of gnome-user-share.master.gu.po to Gujarati
+# translation of mateuser-share.master.gu.po to Gujarati
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 #
@@ -6,8 +6,8 @@
 # Sweta Kothari <[email protected]>, 2009, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share.master.gu\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-user-share&component=general\n"
+"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"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -27,7 +27,7 @@ msgstr ""
 "જો આ ખરું હોય, તો વપરાશકર્તાઓ ડાઉનલોડ ડિરેક્ટરીમાં બ્લુટુથ ઉપકરણો એ ફાઇલો ને મોકલી શકે "
 "છે જ્યારે વપરાશકર્તા પ્રવેશ કરે."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -35,7 +35,7 @@ msgstr ""
 "જો આ ખરું હોય, તો વપરાશકર્તાઓ ઘર ડિરેક્ટરીમાંની જાહેર ડિરેક્ટરી બ્લુટુથ પર વહેંચાશે જ્યારે "
 "વપરાશકર્તા પ્રવેશ કરે."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -43,19 +43,19 @@ msgstr ""
 "જો આ ખરું હોય, તો વપરાશકર્તાઓ ઘર ડિરેક્ટરીમાંની જાહેર ડિરેક્ટરી નેટવર્ક પર વહેંચાશે જ્યારે "
 "વપરાશકર્તા પ્રવેશ કરે."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "બ્લુટુથ પર જાહેર ડિરેક્ટરી વહેંચો"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "નેટવર્ક પર જાહેર ડિરેક્ટરીને વહેંચો"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../data/desktop_matefile_sharing.schemas.in.h:6
 msgid "When to accept files sent over Bluetooth"
 msgstr "ક્યારે બ્લુટુથ પર મોકલેલ ફાઇલોને સ્વીકારો છો"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:7
+#: ../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\"."
@@ -64,25 +64,25 @@ msgid ""
 "\"bonded\" and \"ask\"."
 msgstr "ક્યારે બ્લૂટુથ પર મોકલેલ ફાઇલોને સ્વીકારો છો. શક્ય કિંમતો \"always\", \"bonded\", અને \"ask\" છે."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../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_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "ક્યારે પાસવર્ડો જરૂરી છે"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../data/desktop_matefile_sharing.schemas.in.h:10
 msgid "Whether Bluetooth clients can send files using ObexPush."
 msgstr "ક્યાંતો ObexPush ની મદદથી બ્લુટુથ ક્લાઇન્ટો ફાઇલો ને મોકલી શકે છે."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:11
+#: ../data/desktop_matefile_sharing.schemas.in.h:11
 msgid "Whether Bluetooth clients need to pair with the computer to send files."
 msgstr "ક્યાંતો ફાઇલો ને મોકલવા માટે કૉમ્પયુટર સાથે બ્લુટુથ ક્લાઇન્ટોને જોડીની જરૂર છે."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:12
+#: ../data/desktop_matefile_sharing.schemas.in.h:12
 msgid ""
 "Whether to allow Bluetooth clients to write files, or share the files read-"
 "only."
@@ -90,11 +90,11 @@ msgstr ""
 "ક્યાંતો ફાઇલો ને લખવા માટે બ્લુટુથ ક્લાઇન્ટોને પરવાનગી આપો. અથવા ફક્ત વાંચી શકાય તેવી "
 "ફાઇલોને વહેંચો."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:13
+#: ../data/desktop_matefile_sharing.schemas.in.h:13
 msgid "Whether to allow Bluetooth clients to write files."
 msgstr "ક્યાંતો ફાઇલો ને લખવા માટે બ્લુટુથ ક્લાઇન્ટોને પરવાનગી આપો."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:14
+#: ../data/desktop_matefile_sharing.schemas.in.h:14
 msgid "Whether to notify about newly received files."
 msgstr "ક્યાંતો નવી મેળવેલ ફાઇલો વિશે સૂચિત કરો."
 
@@ -150,24 +150,24 @@ msgstr "જરૂરી પાસવર્ડ (_R):"
 msgid "_Share public files on network"
 msgstr "નેટવર્ક પર જાહેર ફાઈલો વહેંચો (_S)"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "ખાનગી ફાઈલ વહેંચણી"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "ફાઇલોની વહેંચણી માટે પસંદગીઓ"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "વ્યક્તિગત ફાઇલ વહેંચણીને પ્રકાશિત કરો જો સક્રિય હોય તો"
 
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "શરૂ કરવાની પસંદગીઓ"
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 #| msgid "Personal File Sharing Preferences"
 msgid "Launch Personal File Sharing Preferences"
 msgstr "વ્યક્તિગત ફાઈલ વહેંચણી પસંદગીઓને શરૂ કરો"
diff --git a/po/he.po b/po/he.po
index dc4ead7..09d8d38 100644
--- a/po/he.po
+++ b/po/he.po
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -22,7 +22,7 @@ msgstr ""
 "If this is true, Bluetooth devices can send files to the user's Downloads "
 "directory when logged in."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -30,7 +30,7 @@ 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_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -38,19 +38,19 @@ 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_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "Share Public directory over Bluetooth"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "Share Public directory over the network"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../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_gnome_file_sharing.schemas.in.h:7
+#: ../data/desktop_matefile_sharing.schemas.in.h:7
 msgid ""
 "When to accept files sent over Bluetooth. Possible values are \"always\", "
 "\"bonded\" and \"ask\"."
@@ -58,7 +58,7 @@ msgstr ""
 "When to accept files sent over Bluetooth. Possible values are \"always\", "
 "\"bonded\" and \"ask\"."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../data/desktop_matefile_sharing.schemas.in.h:8
 msgid ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
@@ -66,20 +66,20 @@ msgstr ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "When to require passwords"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../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_gnome_file_sharing.schemas.in.h:11
+#: ../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_gnome_file_sharing.schemas.in.h:12
+#: ../data/desktop_matefile_sharing.schemas.in.h:12
 msgid ""
 "Whether to allow Bluetooth clients to write files, or share the files read-"
 "only."
@@ -87,11 +87,11 @@ msgstr ""
 "Whether to allow Bluetooth clients to write files, or share the files read-"
 "only."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:13
+#: ../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_gnome_file_sharing.schemas.in.h:14
+#: ../data/desktop_matefile_sharing.schemas.in.h:14
 msgid "Whether to notify about newly received files."
 msgstr "Whether to notify about newly received files."
 
@@ -147,24 +147,24 @@ msgstr "_דרישת סיסמה:"
 msgid "_Share public files on network"
 msgstr "_שיתוף קבצים ציבוריים ברשת"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "שיתוף קבצים אישיים"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "העדפות לשיתוף קבצים"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "טעינת שיתוף קבצים אישיים אם פעיל"
 
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "העדפות הטעינה"
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 msgid "Launch Personal File Sharing Preferences"
 msgstr "טעינת העדפות שיתוף הקבצים האישיים"
 
diff --git a/po/hi.po b/po/hi.po
index 563e712..b121bb0 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -1,4 +1,4 @@
-# translation of gnome-user-share.master.po to Hindi
+# translation of mateuser-share.master.po to Hindi
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
@@ -6,8 +6,8 @@
 # Rajesh Ranjan <[email protected]>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share.master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-user-share&component=general\n"
+"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-06-26 10:10+0000\n"
 "PO-Revision-Date: 2009-09-16 12:41+0530\n"
 "Last-Translator: Rajesh Ranjan <[email protected]>\n"
@@ -19,13 +19,13 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n!=1);\n\n"
 "\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -33,7 +33,7 @@ msgstr ""
 "यदि यह सही है, उपयोक्ता घर निर्देशिका में सार्वजनिक निर्देशिका को ब्लूटूथ पर साझा करना है "
 "जब उपयोक्ता लॉगिन होता है."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -41,19 +41,19 @@ msgstr ""
 "यदि यह सही है, उपयोक्ता घर निर्देशिका में सार्वजनिक निर्देशिका को संजाल पर साझा करना है "
 "जब उपयोक्ता लॉगिन होता है."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "ब्लूटूथ पर सार्वजनिक निर्देशिका साझा करें"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "संजाल पर सार्वजनिक निर्देशिका साझा करें"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../data/desktop_matefile_sharing.schemas.in.h:6
 msgid "When to accept files sent over Bluetooth"
 msgstr "कब ब्लूटूथ पर भेजे फाइलों को स्वीकार करना है"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:7
+#: ../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\"."
@@ -61,35 +61,35 @@ msgstr ""
 "ब्लूटूथ पर भेजे फाइलों को कब स्वीकार करना है. संभावित मान हैं \"always\", \"bonded\", "
 "\"bonded_trusted\" और \"ask\"."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../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_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "कब कूटशब्द जरूरी है"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../data/desktop_matefile_sharing.schemas.in.h:10
 msgid "Whether Bluetooth clients can send files using ObexPush."
 msgstr "क्या ब्लूटूथ क्लाइंट को ObexPush के प्रयोग से फाइलें भेज सकता है."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:11
+#: ../data/desktop_matefile_sharing.schemas.in.h:11
 msgid "Whether Bluetooth clients need to pair with the computer to send files."
 msgstr "क्या ब्लूटूथ क्लाइंड कंप्यूटर के साथ फाइलें भेजने के लिए किसी जोड़े की जरूरत है."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:12
+#: ../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_gnome_file_sharing.schemas.in.h:13
+#: ../data/desktop_matefile_sharing.schemas.in.h:13
 msgid "Whether to allow Bluetooth clients to write files."
 msgstr "क्या ब्लूटूथ क्लाइंड को फाइल लिखने के लिए स्वीकृति देनी है."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:14
+#: ../data/desktop_matefile_sharing.schemas.in.h:14
 msgid "Whether to notify about newly received files."
 msgstr "क्या हाल में प्राप्त फाइलों के बारे में अधिसूचित करना है."
 
@@ -146,17 +146,17 @@ msgstr "कूटशब्द जरूरी (_R):"
 msgid "_Share public files on network"
 msgstr "संजाल पर सार्वजनिक फाइल साझा करें (_S)"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2
 msgid "Personal File Sharing"
 msgstr "निजी फ़ाइल साझा"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 #| msgid "Preferences for sharing of personal files"
 msgid "Preferences for sharing of files"
 msgstr "फाइलों के साझा के लिए वरीयता"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 #| msgid "Launch User Sharing if enabled"
 msgid "Launch Personal File Sharing if enabled"
 msgstr "निजी फ़ाइल साझा लॉन्च करें यदि सक्रिय किया गया है"
diff --git a/po/hu.po b/po/hu.po
index a3f51eb..9eca2ab 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,24 +1,24 @@
-# Hungarian translation of gnome-user-share
-# This file is distributed under the same license as the gnome-user-share package.
+# 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 gnome dot hu>, 2005, 2006, 2008, 2009, 2010.
+# Gabor Kelemen <kelemeng at matedot hu>, 2005, 2006, 2008, 2009, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share master\n"
+"Project-Id-Version: mateuser-share master\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 gnome dot hu>\n"
-"Language-Team: Hungarian <gnome at fsf dot hu>\n"
+"Last-Translator: Gabor Kelemen <kelemeng at matedot hu>\n"
+"Language-Team: Hungarian <mateat fsf dot 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_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -26,7 +26,7 @@ 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_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -35,7 +35,7 @@ msgstr ""
 "könyvtár Bluetooth-on keresztül megosztásra kerül, ha a felhasználó "
 "bejelentkezett."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -43,19 +43,19 @@ 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_gnome_file_sharing.schemas.in.h:4
+#: ../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_gnome_file_sharing.schemas.in.h:5
+#: ../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_gnome_file_sharing.schemas.in.h:6
+#: ../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_gnome_file_sharing.schemas.in.h:7
+#: ../data/desktop_matefile_sharing.schemas.in.h:7
 msgid ""
 "When to accept files sent over Bluetooth. Possible values are \"always\", "
 "\"bonded\" and \"ask\"."
@@ -63,7 +63,7 @@ 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_gnome_file_sharing.schemas.in.h:8
+#: ../data/desktop_matefile_sharing.schemas.in.h:8
 msgid ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
@@ -71,20 +71,20 @@ 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_gnome_file_sharing.schemas.in.h:9
+#: ../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_gnome_file_sharing.schemas.in.h:10
+#: ../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_gnome_file_sharing.schemas.in.h:11
+#: ../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_gnome_file_sharing.schemas.in.h:12
+#: ../data/desktop_matefile_sharing.schemas.in.h:12
 msgid ""
 "Whether to allow Bluetooth clients to write files, or share the files read-"
 "only."
@@ -92,11 +92,11 @@ msgstr ""
 "A Bluetooth klienseknek engedélyezett-e a fájlok írása, vagy a fájlok "
 "írásvédetten osztandók meg."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:13
+#: ../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_gnome_file_sharing.schemas.in.h:14
+#: ../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."
 
@@ -152,24 +152,24 @@ msgstr "Jelszó _kötelező:"
 msgid "_Share public files on network"
 msgstr "Nyilvános fájlok megosztása a _hálózaton"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "Személyes fájlmegosztás"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Fájlmegosztás beállításai"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Személyes fájlmegosztás indítása, ha engedélyezett"
 
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "Beállítások indítása"
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Személyes fájlmegosztás beállításainak indítása"
 
diff --git a/po/id.po b/po/id.po
index f206ee4..6729d91 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1,12 +1,12 @@
-# Indonesian translation for gnome-user-share.
-# Copyright (C) 2010 gnome-user-share's COPYRIGHT HOLDER
-# This file is distributed under the same license as the gnome-user-share package.
+# 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.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-user-share&component=general\n"
+"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"
@@ -17,59 +17,59 @@ msgstr ""
 "X-Poedit-Language: Indonesian\n"
 "X-Poedit-Country: Indonesia\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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_gnome_file_sharing.schemas.in.h:2
+#: ../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_gnome_file_sharing.schemas.in.h:3
+#: ../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_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "Berbagi direktori Publik melalui Bluetooth"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "Berbagi direktori Publik melalui jaringan"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../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_gnome_file_sharing.schemas.in.h:7
+#: ../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_gnome_file_sharing.schemas.in.h:8
+#: ../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_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "Kapan meminta kata kunci"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../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_gnome_file_sharing.schemas.in.h:11
+#: ../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_gnome_file_sharing.schemas.in.h:12
+#: ../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_gnome_file_sharing.schemas.in.h:13
+#: ../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_gnome_file_sharing.schemas.in.h:14
+#: ../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."
 
@@ -125,25 +125,25 @@ msgstr "_Memerlukan kata sandi:"
 msgid "_Share public files on network"
 msgstr "_Berbagi berkas publik pada jaringan "
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2
-#: ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2
+#: ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "Berbagi Berkas Pribadi"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Preferensi untuk berbagi berkas"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Luncurkan Berbagi Berkas Pribadi  jika diaktifkan "
 
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "Preferensi Peluncuran"
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Luncurkan Preferensi Berbagi Berkas Pribadi"
 
diff --git a/po/it.po b/po/it.po
index af994c7..9bee5c6 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,14 +1,14 @@
-# Italian translation of gnome-user-share
+# Italian translation of mateuser-share
 # Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation
-# This file is distributed under the same license as the gnome-user-share package.
+# This file is distributed under the same license as the mateuser-share package.
 # Tuo Ida Gasparretti <[email protected]>, 2005
 # Gianvito Cavasoli <[email protected]>, 2008, 2009, 2010.
 #
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share 2.28.x\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"Project-Id-Version: mateuser-share 2.28.x\n"
+"Report-Msgid-Bugs-To: http://bugzilla.mateorg/enter_bug.cgi?product=mate"
 "user-share&component=general\n"
 "POT-Creation-Date: 2010-03-07 15:44+0000\n"
 "PO-Revision-Date: 2010-02-24 10:46+0100\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -26,7 +26,7 @@ msgstr ""
 "Se impostata a vero, i dispositivi Bluetooth possono inviare file nella "
 "directory \"Scaricati\" quando connessi."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -34,7 +34,7 @@ msgstr ""
 "Se impostata a vero, la directory \"Pubblici\" nella home degli utenti è "
 "condivisa tramite Bluetooth quando l'utente esegue l'accesso."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -42,19 +42,19 @@ msgstr ""
 "Se impostata a vero, la directory \"Pubblici\" nella home degli utenti è "
 "condivisa tramite la rete all'accesso dell'utente."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "Condivide la directory \"Pubblici\" tramite Bluetooth"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "Condivide la directory \"Pubblici\" tramite la rete"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../data/desktop_matefile_sharing.schemas.in.h:6
 msgid "When to accept files sent over Bluetooth"
 msgstr "Quando accettare i file inviati tramite Bluetooth"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:7
+#: ../data/desktop_matefile_sharing.schemas.in.h:7
 msgid ""
 "When to accept files sent over Bluetooth. Possible values are \"always\", "
 "\"bonded\" and \"ask\"."
@@ -62,7 +62,7 @@ msgstr ""
 "Quando accettare i file inviati tramite Bluetooth. Le opzioni possibili sono "
 "\"always\", \"bonded\" e \"ask\"."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../data/desktop_matefile_sharing.schemas.in.h:8
 msgid ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
@@ -70,22 +70,22 @@ msgstr ""
 "Quando richiedere le password. Le opzioni possibili sono \"never\", "
 "\"on_write\", e \"always\"."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "Quando richiedere le password"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../data/desktop_matefile_sharing.schemas.in.h:10
 msgid "Whether Bluetooth clients can send files using ObexPush."
 msgstr ""
 "Indica se i client Bluetooth possono inviare file utilizzando ObexPush."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:11
+#: ../data/desktop_matefile_sharing.schemas.in.h:11
 msgid "Whether Bluetooth clients need to pair with the computer to send files."
 msgstr ""
 "Indica se i client Bluetooth necessitano di associarsi con il computer per "
 "inviare file."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:12
+#: ../data/desktop_matefile_sharing.schemas.in.h:12
 msgid ""
 "Whether to allow Bluetooth clients to write files, or share the files read-"
 "only."
@@ -93,11 +93,11 @@ msgstr ""
 "Indica se consentire ai client Bluetooth di scrivere file, oppure "
 "condividere i file solo in lettura."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:13
+#: ../data/desktop_matefile_sharing.schemas.in.h:13
 msgid "Whether to allow Bluetooth clients to write files."
 msgstr "Indica se consentire ai client Bluetooth di scrivere file."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:14
+#: ../data/desktop_matefile_sharing.schemas.in.h:14
 msgid "Whether to notify about newly received files."
 msgstr "Indica se notificare riguardo i file ricevuti recentemente."
 
@@ -153,24 +153,24 @@ msgstr "_Richiedere la password:"
 msgid "_Share public files on network"
 msgstr "C_ondividere i file pubblici sulla rete"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "Condivisione di file personali"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Preferenze per la condivisione dei file"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Avvia la condivisione di file personali se abilitata"
 
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "Preferenze di avvio"
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Avvia le preferenze di condivisione di file personali"
 
diff --git a/po/ja.po b/po/ja.po
index 2436b39..77b1e9b 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,24 +1,24 @@
-# gnome-user-share ja.po.
+# mateuser-share ja.po.
 # Copyright (C) 2005,2007-2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gnome-user-share package.
+# 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.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"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"
+"Language-Team: Japanese <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -26,7 +26,7 @@ msgstr ""
 "TRUE にすると、ユーザがログインした後に Bluetooth デバイスがユーザのダウン"
 "ロード・フォルダにファイルを送信できるようになります。"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -34,7 +34,7 @@ msgstr ""
 "TRUE にすると、ユーザがログインした後にユーザのホーム・フォルダにある Public "
 "フォルダが Bluetooth のデバイスによって共有されるようになります。"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -42,19 +42,19 @@ msgstr ""
 "TRUE にすると、ユーザがログインした後にユーザのホーム・フォルダにある Public "
 "フォルダがネットワークのデバイスによって共有されるようになります。"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "Public フォルダを Bluetooth デバイス上で共有するかどうか"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "Public フォルダをネットワーク上で共有するかどうか"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../data/desktop_matefile_sharing.schemas.in.h:6
 msgid "When to accept files sent over Bluetooth"
 msgstr "Bluetooth でファイルを送信できる時期"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:7
+#: ../data/desktop_matefile_sharing.schemas.in.h:7
 msgid ""
 "When to accept files sent over Bluetooth. Possible values are \"always\", "
 "\"bonded\" and \"ask\"."
@@ -62,7 +62,7 @@ msgstr ""
 "いつ Bluetooth 経由で送信されたファイルの受信を許可するか。設定可能な値: "
 "\"always\"、\"bonded\"、\"ask\"。"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../data/desktop_matefile_sharing.schemas.in.h:8
 msgid ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
@@ -70,22 +70,22 @@ msgstr ""
 "いつパスワードを問い合わせるか。設定可能な値: \"never\"、\"on_write\"、"
 "\"always\"。"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "パスワードを要求する時期"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../data/desktop_matefile_sharing.schemas.in.h:10
 msgid "Whether Bluetooth clients can send files using ObexPush."
 msgstr ""
 "Bluetooth のクライアントが ObexPush を使ってファイルを送信できるかどうか"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:11
+#: ../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_gnome_file_sharing.schemas.in.h:12
+#: ../data/desktop_matefile_sharing.schemas.in.h:12
 msgid ""
 "Whether to allow Bluetooth clients to write files, or share the files read-"
 "only."
@@ -93,11 +93,11 @@ msgstr ""
 "Bluetooth のクライアントでファイルを書き込んだり、読み込み専用のファイルを共"
 "有できるようにするかどうかです。"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:13
+#: ../data/desktop_matefile_sharing.schemas.in.h:13
 msgid "Whether to allow Bluetooth clients to write files."
 msgstr "Bluetooth のクライアントがファイルを作成できるかどうか"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:14
+#: ../data/desktop_matefile_sharing.schemas.in.h:14
 msgid "Whether to notify about newly received files."
 msgstr "新たに受信したファイルについて通知するかどうか"
 
@@ -153,24 +153,24 @@ msgstr "パスワード要求の時期(_R):"
 msgid "_Share public files on network"
 msgstr "ネットワーク越しにファイルを共有する(_S)"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "個人的なファイルの共有"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "個人的なファイルの共有機能を設定します"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "個人的なファイルの共有機能を起動します (可能な場合)"
 
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "設定を開く"
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 msgid "Launch Personal File Sharing Preferences"
 msgstr "個人的なファイルの共有を開く"
 
diff --git a/po/kn.po b/po/kn.po
index a80d6e7..801a4a0 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -1,11 +1,11 @@
-# translation of gnome-user-share.master.kn.po to Kannada
+# translation of mateuser-share.master.kn.po to Kannada
 # 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.
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share.master.kn\n"
+"Project-Id-Version: mateuser-share.master.kn\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"
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -25,7 +25,7 @@ msgstr ""
 "true ಆದಲ್ಲಿ, ಬಳಕೆದಾರರು ಪ್ರವೇಶಿಸಿದಾಗ ಬ್ಲೂಟೂತ್ ಸಾಧನಗಳು ಕಡತಗಳನ್ನು ಅವರ ಡೌನ್‌ಲೋಡ್‌ ಕೋಶಕ್ಕೆ "
 "ಕಳುಹಿಸುತ್ತದೆ."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -33,7 +33,7 @@ msgstr ""
 "ಇದು true ಆದಲ್ಲಿ, ಬಳಕೆದಾರರು ಒಳಗೆ ಪ್ರವೇಶಿಸಿದಾಗ ಬಳಕೆದಾರರ ನೆಲೆ ಕಡತಕೋಶದಲ್ಲಿನ "
 "ಸಾರ್ವಜನಿಕ ಕೋಶವನ್ನು ಬ್ಲೂಟೂತ್ ಮೂಲಕ ಹಂಚಲ್ಪಡುತ್ತದೆ."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -41,19 +41,19 @@ msgstr ""
 "ಇದು true ಆದಲ್ಲಿ, ಬಳಕೆದಾರರು ಒಳಗೆ ಪ್ರವೇಶಿಸಿದಾಗ ಬಳಕೆದಾರರ ನೆಲೆ ಕಡತಕೋಶದಲ್ಲಿನ "
 "ಸಾರ್ವಜನಿಕ ಕೋಶವನ್ನು ಜಾಲಬಂಧದ ಮೂಲಕ ಹಂಚಲ್ಪಡುತ್ತದೆ."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "ಬ್ಲೂಟೂತ್ ಮೂಲಕ ಸಾರ್ವಜನಿಕ ಕೋಶವನ್ನು ಹಂಚಿಕೊಳ್ಳಿ"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "ಜಾಲಬಂಧದ ಮೂಲಕ ಸಾರ್ವಜನಿಕ ಕೋಶವನ್ನು ಹಂಚಿಕೊಳ್ಳಿ"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../data/desktop_matefile_sharing.schemas.in.h:6
 msgid "When to accept files sent over Bluetooth"
 msgstr "ಬ್ಲೂಟೂತ್‌ನಲ್ಲಿ ಕಳುಹಿಸಲಾದ ಕಡತಗಳನ್ನು ಯಾವಾಗ ಅಂಗೀಕರಿಸಬೇಕು"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:7
+#: ../data/desktop_matefile_sharing.schemas.in.h:7
 msgid ""
 "When to accept files sent over Bluetooth. Possible values are \"always\", "
 "\"bonded\" and \"ask\"."
@@ -61,7 +61,7 @@ msgstr ""
 "ಬ್ಲೂಟೂತ್‌ನಲ್ಲಿ ಕಳುಹಿಸಲಾದ ಕಡತಗಳನ್ನು ಯಾವಾಗ ಅಂಗೀಕರಿಸಬೇಕು. ಸಾಧ್ಯವಿರುವ ಮೌಲ್ಯಗಳೆಂದರೆ "
 "\"always\", \"bonded\", ಹಾಗು \"ask\"."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../data/desktop_matefile_sharing.schemas.in.h:8
 msgid ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
@@ -69,19 +69,19 @@ msgstr ""
 "ಯಾವಾಗ ಗುಪ್ತಪದಗಳಿಗಾಗಿ ಕೇಳಬೇಕು. ಸಾಧ್ಯವಿರುವ ಮೌಲ್ಯಗಳೆಂದರೆ \"never\", \"on_write\", "
 "ಹಾಗು \"always\"."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "ಗುಪ್ತಪದಗಳ ಅಗತ್ಯವಿದ್ದಾಗ"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../data/desktop_matefile_sharing.schemas.in.h:10
 msgid "Whether Bluetooth clients can send files using ObexPush."
 msgstr "ಬ್ಲೂಟೂತ್ ಕ್ಲೈಂಟ್‌ಗಳು ObexPush ಅನ್ನು ಬಳಸಿಕೊಂಡು ಕಡತಗಳನ್ನು ಕಳುಹಿಸಬಹುದೆ."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:11
+#: ../data/desktop_matefile_sharing.schemas.in.h:11
 msgid "Whether Bluetooth clients need to pair with the computer to send files."
 msgstr "ಕಡತಗಳನ್ನು ಕಳುಹಿಸಲು ಬ್ಲೂಟೂತ್ ಕ್ಲೈಂಟ್‌ಗಳು ಗಣಕದೊಂದಿಗೆ ಜೋಡಿ ಮಾಡಲ್ಪಡಬೇಕೆ."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:12
+#: ../data/desktop_matefile_sharing.schemas.in.h:12
 msgid ""
 "Whether to allow Bluetooth clients to write files, or share the files read-"
 "only."
@@ -89,11 +89,11 @@ msgstr ""
 "ಬ್ಲೂಟೂತ್ ಕ್ಲೈಂಟ್‌ಗಳು ಕಡತಗಳಿಗೆ ಬರೆಯುವುದನ್ನು ಅನುಮತಿಸಬೇಕೆ ಅಥವ ಕೇವಲ ಓದಲು ಮಾತ್ರವಾದ "
 "ಸ್ಥಿತಿಯಲ್ಲಿ ಹಂಚಿಕೊಳ್ಳಬೇಕೆ."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:13
+#: ../data/desktop_matefile_sharing.schemas.in.h:13
 msgid "Whether to allow Bluetooth clients to write files."
 msgstr "ಬ್ಲೂಟೂತ್ ಕ್ಲೈಂಟ್‌ಗಳು ಕಡತಗಳಿಗೆ ಬರೆಯುವುದನ್ನು ಅನುಮತಿಸಬೇಕೆ."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:14
+#: ../data/desktop_matefile_sharing.schemas.in.h:14
 msgid "Whether to notify about newly received files."
 msgstr "ಹೊಸದಾಗಿ ಸ್ವೀಕರಿಸಲಾದ ಕಡತಗಳ ಬಗ್ಗೆ ಸೂಚನೆ ನೀಡಬೇಕೆ."
 
@@ -149,24 +149,24 @@ msgstr "ಗುಪ್ತಪದದ ಅಗತ್ಯವಿದೆ(_R):"
 msgid "_Share public files on network"
 msgstr "ಸಾರ್ವಜನಿಕೆ ಕಡತಗಳನ್ನು ಜಾಲಬಂಧದಲ್ಲಿ ಹಂಚಿಕೊ(_S)"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "ವೈಯಕ್ತಿಕ ಕಡತ ಹಂಚಿಕೆ"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "ಕಡತಗಳನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ಆದ್ಯತೆಗಳು"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "ಶಕ್ತಗೊಂಡಿದ್ದಲ್ಲಿ ವೈಯಕ್ತಿಕ ಕಡತ ಹಂಚಿಕೆಯನ್ನು ಆರಂಭಿಸು"
 
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "ಆದ್ಯತೆಗಳನ್ನು ಆರಂಭಿಸು"
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 msgid "Launch Personal File Sharing Preferences"
 msgstr "ವೈಯಕ್ತಿಕ ಕಡತ ಹಂಚಿಕೆಯ ಆದ್ಯತೆಗಳನ್ನು ಆರಂಭಿಸಿ"
 
diff --git a/po/ko.po b/po/ko.po
index 77eece7..4a1f048 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,5 +1,5 @@
-# gnome-user-share korean translation
-# This file is distributed under the same license as the gnome-user-share package.
+# mateuser-share korean translation
+# This file is distributed under the same license as the mateuser-share package.
 #
 # Young-Ho Cha <ganadist at mizi.com>, 2005, 2007.
 # Namhyung Kim <[email protected]>, 2007.
@@ -7,17 +7,17 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-user-share&component=general\n"
+"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-03-14 01:21+0900\n"
 "PO-Revision-Date: 2010-03-14 01:24+0900\n"
 "Last-Translator: Changwoo Ryu <[email protected]>\n"
-"Language-Team: GNOME Korea <[email protected]>\n"
+"Language-Team: GNOME Korea <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -25,7 +25,7 @@ msgstr ""
 "참이면, 사용자가 로그인하면 블루투스를 통해 \"다운로드\" 디렉터리로 파일을 보"
 "낼 수 있습니다."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -33,51 +33,51 @@ msgstr ""
 "참이면, 사용자가 로그인하면 홈 디렉토리의 \"공개\" 디렉터리를 블루투스를 통"
 "해 공유합니다."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:3
+#: ../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_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "\"공개\" 디렉터리를 블루투스를 통해 공유"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "\"공개\" 디렉터리를 네트워크를 통해 공유"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../data/desktop_matefile_sharing.schemas.in.h:6
 msgid "When to accept files sent over Bluetooth"
 msgstr "블루투스를 통해 보낸 파일 허용하는 방법"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:7
+#: ../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_gnome_file_sharing.schemas.in.h:8
+#: ../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_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "암호가 필요한 경우"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../data/desktop_matefile_sharing.schemas.in.h:10
 msgid "Whether Bluetooth clients can send files using ObexPush."
 msgstr "블루투스 클라이언트가 ObexPush를 사용해 파일을 보낼 수 있는 지 여부."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:11
+#: ../data/desktop_matefile_sharing.schemas.in.h:11
 msgid "Whether Bluetooth clients need to pair with the computer to send files."
 msgstr "블루투스 클라이언트가 파일을 보낼 때 컴퓨터에 연결해야 하는 지 여부."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:12
+#: ../data/desktop_matefile_sharing.schemas.in.h:12
 msgid ""
 "Whether to allow Bluetooth clients to write files, or share the files read-"
 "only."
@@ -85,11 +85,11 @@ msgstr ""
 "블루투스 클라이언트의 파일 쓰기를 허용할 지, 아니면 읽기 전용으로만 공유할 "
 "지 여부."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:13
+#: ../data/desktop_matefile_sharing.schemas.in.h:13
 msgid "Whether to allow Bluetooth clients to write files."
 msgstr "블루투스 클라이언트의 파일 쓰기를 허용할 지 여부."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:14
+#: ../data/desktop_matefile_sharing.schemas.in.h:14
 msgid "Whether to notify about newly received files."
 msgstr "새로 받은 파일을 알릴 지 여부."
 
@@ -145,24 +145,24 @@ msgstr "암호 필요(_R):"
 msgid "_Share public files on network"
 msgstr "네트워크를 통해 공개 디렉터리 공유(_S)"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "개인 파일 공유"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "파일 공유에 대한 기본 설정"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "사용자 공유를 (사용할 경우) 시작합니다"
 
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "기본 설정 실행"
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 msgid "Launch Personal File Sharing Preferences"
 msgstr "개인 파일 공유 기본 설정을 실행합니다"
 
diff --git a/po/lt.po b/po/lt.po
index 14989cc..6b1ff55 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -1,13 +1,13 @@
-# Lithuanian translation of gnome-user-share.
+# Lithuanian translation of mateuser-share.
 # Copyright (C) 2005 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gnome-user-share package.
+# This file is distributed under the same license as the mateuser-share package.
 # Marius Karnauskas <[email protected]>, 2005.
 # Vytautas Rėkus <[email protected]>, 2009.
 #
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share 1.0\n"
+"Project-Id-Version: mateuser-share 1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-03-03 12:11+0200\n"
 "PO-Revision-Date: 2010-03-03 12:11+0200\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -25,7 +25,7 @@ msgstr ""
 "Jei teisinga, Bluetooth įrenginiai gali siųsti failus į vartotojo "
 "parsisiuntimų katalogą, kai vartotojas bus prisijungęs."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -33,7 +33,7 @@ msgstr ""
 "Jei teisinga, vartotojo viešasis katalogas, esantis jo namų kataloge, bus "
 "bendrinamas Bluetooth ryšiu, kai vartotojas bus prisijungęs."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -41,19 +41,19 @@ msgstr ""
 "Jei teisinga, vartotojo viešasis katalogas, esantis jo namų kataloge, bus "
 "bendrinamas tinkle, kai vartotojas bus prisijungęs."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "Bendrinti viešąjį aplanką Bluetooth ryšiu"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "Bendrinti viešąjį aplanką tinkle"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../data/desktop_matefile_sharing.schemas.in.h:6
 msgid "When to accept files sent over Bluetooth"
 msgstr "Kada priimti failus, siųstus Bluetooth ryšiu"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:7
+#: ../data/desktop_matefile_sharing.schemas.in.h:7
 msgid ""
 "When to accept files sent over Bluetooth. Possible values are \"always\", "
 "\"bonded\" and \"ask\"."
@@ -61,26 +61,26 @@ msgstr ""
 "Kada priimti failus, siunčiamus Bluetooth ryšiu. Galimos reikšmės yra: "
 "„visada“, „susietiems“ ir „klausti“."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../data/desktop_matefile_sharing.schemas.in.h:8
 msgid ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
 msgstr ""
 "Kada prašoma slaptažodžių. Galimos reikšmės: „never“, „on_write“ ir „always“."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "Kada reikia slaptažodžių"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../data/desktop_matefile_sharing.schemas.in.h:10
 msgid "Whether Bluetooth clients can send files using ObexPush."
 msgstr "Ar Bluetooth klientai gali siųsti failus, naudodami ObexPush."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:11
+#: ../data/desktop_matefile_sharing.schemas.in.h:11
 msgid "Whether Bluetooth clients need to pair with the computer to send files."
 msgstr "Ar Bluetooth klientus reikia suporinti su kompiuteriu failų siuntimui."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:12
+#: ../data/desktop_matefile_sharing.schemas.in.h:12
 msgid ""
 "Whether to allow Bluetooth clients to write files, or share the files read-"
 "only."
@@ -88,11 +88,11 @@ msgstr ""
 "Ar Bluetooth klientams leisti įrašyti failus, ar bendrinti failus tik "
 "skaitymui."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:13
+#: ../data/desktop_matefile_sharing.schemas.in.h:13
 msgid "Whether to allow Bluetooth clients to write files."
 msgstr "Ar Bluetooth klientams leisti įrašyti failus."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:14
+#: ../data/desktop_matefile_sharing.schemas.in.h:14
 msgid "Whether to notify about newly received files."
 msgstr "Ar įspėti apie naujai gautus failus."
 
@@ -148,24 +148,24 @@ msgstr "_Reikia slaptažodžio:"
 msgid "_Share public files on network"
 msgstr "Bendrinti viešuo_sius failus tinkle"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "Asmeninių failų bendrinimas"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Failų viešinimo nustatymai"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Paleisti asmeninių failų viešinimą, jei įjungtas"
 
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "Paleisti nustatymus"
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Parodyti asmeninių failų viešinimo nustatymus"
 
diff --git a/po/lv.po b/po/lv.po
index a6f1a4b..f5d350a 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -1,13 +1,13 @@
-# Latvian translation for gnome-user-share.
-# Copyright (C) 2010 gnome-user-share's COPYRIGHT HOLDER
-# This file is distributed under the same license as the gnome-user-share package.
+# 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.
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
-"cgi?product=gnome-user-share&component=general\n"
+"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"
@@ -18,7 +18,7 @@ msgstr ""
 "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_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -26,7 +26,7 @@ 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_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -35,7 +35,7 @@ msgstr ""
 "koplietota "
 "izmantojot Bluetooth, kad lietotājs būs pieteicies."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -43,19 +43,19 @@ msgstr ""
 "Ja patiess, 'Publiskie' direktorija lietotāja mājasdirektorijā tiks koplietota "
 "izmantojot tīklu, kad lietotājs būs pieteicies."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "Koplietot 'Publiskie' direktoriju izmantojot Bluetooth"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "Koplietot 'Publiskie' direktoriju izmantojot tīklu"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../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_gnome_file_sharing.schemas.in.h:7
+#: ../data/desktop_matefile_sharing.schemas.in.h:7
 msgid ""
 "When to accept files sent over Bluetooth. Possible values are \"always\", "
 "\"bonded\" and \"ask\"."
@@ -63,7 +63,7 @@ msgstr ""
 "Kad akceptēt saņemtos failus izmantojot Bluetooth. Iespējamās vērtības ir "
 "\"always\", \"bonded\" un \"ask\"."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../data/desktop_matefile_sharing.schemas.in.h:8
 msgid ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
@@ -71,19 +71,19 @@ msgstr ""
 "Kad prasīt paroli. Iespējamās vērtības ir \"never\", \"on_write\" un "
 "\"always\"."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "Vai pieprasīt paroles"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../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_gnome_file_sharing.schemas.in.h:11
+#: ../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_gnome_file_sharing.schemas.in.h:12
+#: ../data/desktop_matefile_sharing.schemas.in.h:12
 msgid ""
 "Whether to allow Bluetooth clients to write files, or share the files read-"
 "only."
@@ -92,11 +92,11 @@ msgstr ""
 "lasīšanas "
 "režīmā."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:13
+#: ../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_gnome_file_sharing.schemas.in.h:14
+#: ../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."
 
@@ -152,24 +152,24 @@ msgstr "Piep_rasīt paroli:"
 msgid "_Share public files on network"
 msgstr "_Koplietot publiskos failus tīklā"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "Personiskā failu koplietošana"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Failu koplietošanas iestatījumi"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Palaist personiskās failu koplietošanu (ja tā ir ieslēgta)"
 
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "Atvērt iestatījumus"
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Atvērt personiskās failu koplietošanas iestatījumus"
 
diff --git a/po/mai.po b/po/mai.po
index 9d8b30a..b2e50b5 100644
--- a/po/mai.po
+++ b/po/mai.po
@@ -1,12 +1,12 @@
-# translation of gnome-user-share.master.po to Maithili
+# translation of mateuser-share.master.po to Maithili
 # 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.
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share.master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-user-share&component=general\n"
+"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"
@@ -17,71 +17,71 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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_gnome_file_sharing.schemas.in.h:2
+#: ../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_gnome_file_sharing.schemas.in.h:3
+#: ../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_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr ""
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr ""
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../data/desktop_matefile_sharing.schemas.in.h:6
 msgid "When to accept files sent over Bluetooth"
 msgstr ""
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:7
+#: ../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 ""
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../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_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr ""
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../data/desktop_matefile_sharing.schemas.in.h:10
 msgid "Whether Bluetooth clients can send files using ObexPush."
 msgstr ""
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:11
+#: ../data/desktop_matefile_sharing.schemas.in.h:11
 msgid "Whether Bluetooth clients need to pair with the computer to send files."
 msgstr ""
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:12
+#: ../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_gnome_file_sharing.schemas.in.h:13
+#: ../data/desktop_matefile_sharing.schemas.in.h:13
 msgid "Whether to allow Bluetooth clients to write files."
 msgstr ""
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:14
+#: ../data/desktop_matefile_sharing.schemas.in.h:14
 msgid "Whether to notify about newly received files."
 msgstr ""
 
@@ -137,16 +137,16 @@ msgstr ""
 msgid "_Share public files on network"
 msgstr ""
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2
 msgid "Personal File Sharing"
 msgstr ""
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr ""
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr ""
 
diff --git a/po/mk.po b/po/mk.po
index 3eb31b9..bc16c97 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10\n"
 
-#: ../desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -24,11 +24,11 @@ msgstr ""
 "Ако е точно, јавниот директориум во домашниот директориум на корисниците "
 "ќе биде споделен по најавата на корисникот."
 
-#: ../desktop_gnome_file_sharing.schemas.in.h:2
+#: ../desktop_matefile_sharing.schemas.in.h:2
 msgid "Share Public directory"
 msgstr "Сподели јавен директориум"
 
-#: ../desktop_gnome_file_sharing.schemas.in.h:3
+#: ../desktop_matefile_sharing.schemas.in.h:3
 msgid ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
@@ -36,7 +36,7 @@ msgstr ""
 "Кога да бара лозинки. Можни вредности се \"никогаш\", \"при запишување\" и "
 "\"секогаш\"."
 
-#: ../desktop_gnome_file_sharing.schemas.in.h:4
+#: ../desktop_matefile_sharing.schemas.in.h:4
 msgid "When to require passwords"
 msgstr "Кога да бара лозинки"
 
diff --git a/po/ml.po b/po/ml.po
index 3d67e2a..c559387 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -1,6 +1,6 @@
 # translation of ml.po to
-# translation of gnome-user-share.master.ml.po to
-# translation of gnome-user-share.HEAD.ml.po to
+# translation of mateuser-share.master.ml.po to
+# translation of mateuser-share.HEAD.ml.po to
 # 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
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ml\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-user-share&component=general\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"
@@ -20,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -28,7 +28,7 @@ msgstr ""
 "ഇതു് ട്രൂ ആണു് എങ്കില്‍, ലോഗിന്‍ ചെയ്യുമ്പോള്‍, ബ്ലൂടുത് ഡിവൈസുകള്‍ക്കു് ഉപയോക്താവിന്റെ ഡൌണ്‍ലോട് "
 "ഡയറക്ടറിയിലേക്കു് ഫയലുകള്‍ അയയ്ക്കാം."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -36,7 +36,7 @@ msgstr ""
 "ഇതു് true ആണെങ്കില്‍, ഉപയോക്താവ് ലോഗിന്‍ ചെയ്യുമ്പോള്‍, ഹോം ഡയറക്ടറിയിലുള്ള പബ്ലിക് ഡയറക്ടറി "
 "ബ്ലൂടൂത് വഴി പങ്കിടുന്നു."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -44,19 +44,19 @@ msgstr ""
 "ഇതു് true ആണെങ്കില്‍, ഉപയോക്താവ് ലോഗിന്‍ ചെയ്യുമ്പോള്‍, ഹോം ഡയറക്ടറിയിലുള്ള പബ്ലിക് ഡയറക്ടറി "
 "നെറ്റ്‌വര്‍ക്ക് വഴി പങ്കിടുന്നു."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "ബ്ലൂടൂതില്‍ പബ്ലിക് ഡയറക്ടറി പങ്കിടുക"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "നെറ്റ്‌വര്‍ക്കില്‍ പബ്ലിക് ഡയറക്ടറി പങ്കിടുക"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../data/desktop_matefile_sharing.schemas.in.h:6
 msgid "When to accept files sent over Bluetooth"
 msgstr "ബ്ലൂടൂത് വഴി എപ്പോഴാണു് ഫയലുകള്‍ സ്വീകരിക്കേണ്ടതു്. "
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:7
+#: ../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\"."
@@ -67,7 +67,7 @@ msgstr ""
 "ബ്ലൂടൂത് വഴി എപ്പോഴാണു് ഫയലുകള്‍ സ്വീകരിക്കേണ്ടതു്. സാധ്യമായ മൂല്ല്യങ്ങള്‍ \"always\", "
 "\"bonded\",  \"ask\"."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../data/desktop_matefile_sharing.schemas.in.h:8
 msgid ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
@@ -75,29 +75,29 @@ msgstr ""
 "പാസ്‌വേര്‍ഡുകള്‍ക്കായി ആവശ്യപ്പെടണമോ എന്നു്. സാധ്യമായ മൂല്ല്യങ്ങള്‍ \"never\", \"on_write\", "
 "\"always\"."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "പാസ്‌വേര്‍ഡുകള്‍ എപ്പോഴാണു് ആവശ്യപ്പടേണ്ടതു്"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../data/desktop_matefile_sharing.schemas.in.h:10
 msgid "Whether Bluetooth clients can send files using ObexPush."
 msgstr "ബ്ലൂട്ടുത് ക്ലൈന്റുകള്‍ക്കു് ObexPush ഉപയോഗിച്ചു് ഫയലുകള്‍ അയയ്ക്കുവാന്‍ സാധിക്കുമോ."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:11
+#: ../data/desktop_matefile_sharing.schemas.in.h:11
 msgid "Whether Bluetooth clients need to pair with the computer to send files."
 msgstr "ബ്ലൂട്ടുത് ക്ലൈന്റുകള്‍ക്കു് ഫയലുകള്‍ അയയ്ക്കുന്നതിനായി മറ്റൊരു കമ്പ്യൂട്ടറുമായി ഒത്തുപോകണമോ."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:12
+#: ../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_gnome_file_sharing.schemas.in.h:13
+#: ../data/desktop_matefile_sharing.schemas.in.h:13
 msgid "Whether to allow Bluetooth clients to write files."
 msgstr "ഫയലുകള്‍ എഴുതുന്നതിനായി ബ്ലൂടൂത് ക്ലൈന്റുകളെ അനുവദിക്കണമോ എന്നു്."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:14
+#: ../data/desktop_matefile_sharing.schemas.in.h:14
 msgid "Whether to notify about newly received files."
 msgstr "പുതുതായി ലഭ്യമാകുന്ന ഫയലുകളെപ്പറ്റി അറിയിക്കണമോ എന്നു്."
 
@@ -153,24 +153,24 @@ msgstr "പാസ്‌വേര്‍ഡ് _ആവശ്യമുണ്ടു�
 msgid "_Share public files on network"
 msgstr "പബ്ലിക് ഫയലുകള്‍ നെറ്റ്‌വര്‍ക്കില്‍ _പങ്കിടുക"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "സ്വകാര്യ ഫയല്‍ പങ്കിടല്‍"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "ഫയലുകള്‍ പങ്കിടുന്നതിനുള്ള മുന്‍ഗണനകള്‍"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "പ്രവര്‍ത്തന സജ്ജമെങ്കില്‍ സ്വകാര്യ ഫയല്‍ പങ്കിടല്‍ ലഭ്യമാക്കുക"
 
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "മുന്‍ഗണനകള്‍ ലഭ്യമാക്കുക"
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 #| msgid "Personal File Sharing Preferences"
 msgid "Launch Personal File Sharing Preferences"
 msgstr "സ്വകാര്യ ഫയല്‍ പങ്കിടുന്നതിനുള്ള മുന്‍ഗണനകള്‍ ലഭ്യമാക്കുക"
diff --git a/po/mr.po b/po/mr.po
index 03a8c60..9a6c3f6 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mr\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-user-share&component=general\n"
+"Report-Msgid-Bugs-To: http://bugzilla.mateorg/enter_bug.cgi?product=mateuser-share&component=general\n"
 "POT-Creation-Date: 2010-03-31 14:06+0000\n"
 "PO-Revision-Date: 2010-04-13 15:09+0530\n"
 "Last-Translator: Sandeep Shedmake <[email protected]>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -26,7 +26,7 @@ msgstr ""
 "खरे असल्यास, प्रवेश केल्यावर Bluetooth साधन वापरकर्त्याचे डाऊनलोड डिरेक्ट्री करीता फाइल "
 "पाठवू शकते."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -34,7 +34,7 @@ msgstr ""
 "खरे असल्यास, प्रवेश केल्यावर वापरकर्त्याची मुख्य डिरेक्ट्री अंतर्गत Public डिरेक्ट्री "
 "Bluetooth वर सहभागीय केले जाईल."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -42,19 +42,19 @@ msgstr ""
 "खरे असल्यास, प्रवेश केल्यावर वापरकर्त्याची मुख्य डिरेक्ट्री अंतर्गत Public डिरेक्ट्री जाळंवर "
 "सहभागीय केले जाईल."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "Bluetooth वरील Public डिरेक्ट्री सहभागीय करा"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "जाळं वरील Public डिरेक्ट्री सहभागीय करा"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../data/desktop_matefile_sharing.schemas.in.h:6
 msgid "When to accept files sent over Bluetooth"
 msgstr "Bluetooth वरील फाइलं कधी स्वीकारायचे"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:7
+#: ../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\"."
@@ -62,7 +62,7 @@ msgstr ""
 "Bluetooth वरील फाइलं कधी स्वीकारायचे. संभाव्य मूल्य खालिल नुरूप आहे \"always\", "
 "\"bonded\", \"bonded_trusted\" व \"ask\"."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../data/desktop_matefile_sharing.schemas.in.h:8
 msgid ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
@@ -70,19 +70,19 @@ msgstr ""
 "परवलीचा शब्द करीता कधी विचारायचे. संभाव्य मूल्य खालिल नुरूप आहे \"never\", \"on_write"
 "\", व\"always\"."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "परवलीचा शब्दाची आवश्यकता कधी पडते"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../data/desktop_matefile_sharing.schemas.in.h:10
 msgid "Whether Bluetooth clients can send files using ObexPush."
 msgstr "ObexPush चा वापर करून Bluetooth क्लाऐंट फाइल पाठवू शकतो का."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:11
+#: ../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_gnome_file_sharing.schemas.in.h:12
+#: ../data/desktop_matefile_sharing.schemas.in.h:12
 msgid ""
 "Whether to allow Bluetooth clients to write files, or share the files read-"
 "only."
@@ -90,11 +90,11 @@ msgstr ""
 "Bluetooth क्लाऐंटला फाइल लेखन, किंवा केवळ-वाचनीय या नुरूप सहभागीय करण्यास परवानगी "
 "द्यायची का."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:13
+#: ../data/desktop_matefile_sharing.schemas.in.h:13
 msgid "Whether to allow Bluetooth clients to write files."
 msgstr "Bluetooth क्लाऐंटला फाइल लेखन करीता परवानगी द्यायची का."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:14
+#: ../data/desktop_matefile_sharing.schemas.in.h:14
 msgid "Whether to notify about newly received files."
 msgstr "नवीन प्राप्य फाइल विषयी सूचीत करायचे का."
 
@@ -150,16 +150,16 @@ msgstr "परवलीचा शब्द आवश्यक आहे (_R):"
 msgid "_Share public files on network"
 msgstr "जाळं वरील public फाइल सहभागीय करा (_S)"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2
 msgid "Personal File Sharing"
 msgstr "वैयक्तिक फाइल सहभागीय करा"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "फाइल शेअर करण्यासाठी पसंती"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "कार्यक्षम असल्यास व्यक्तिगत फाइल शेअरींग प्रक्षेपीत करा"
 
diff --git a/po/nb.po b/po/nb.po
index 9f426f8..1721d82 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,22 +1,22 @@
-# Norwegian bokmål translation of gnome-user-share.
+# Norwegian bokmål translation of mateuser-share.
 # Copyright (C) YEAR, THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Kjartan Maraas <[email protected]>, 2007-2010.
+# Kjartan Maraas <kmaraas@mateorg>, 2007-2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share 2.31.x\n"
+"Project-Id-Version: mateuser-share 2.31.x\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-07-13 22:35+0200\n"
 "PO-Revision-Date: 2009-11-15 15:56+0100\n"
-"Last-Translator: Kjartan Maraas <[email protected]>\n"
+"Last-Translator: Kjartan Maraas <kmaraas@mateorg>\n"
 "Language-Team: Norwegian bokmål <[email protected]>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -24,7 +24,7 @@ msgstr ""
 "Hvis denne settes til «true» kan Bluetooth-enheter sende filer til katalogen "
 "Downloads i brukerens hjemmekatalog når brukeren er logget inn."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -32,7 +32,7 @@ msgstr ""
 "Hvis denne settes til «true» vil katalogen Public i brukerens hjemmekatalog "
 "bli delt via Bluetooth når brukeren logger inn."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -40,19 +40,19 @@ msgstr ""
 "Hvis denne settes til «true» vil katalogen Public i brukerens hjemmekatalog "
 "bli delt over nettverket når brukeren logger inn."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "Del Public-mappen over Bluetooth"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "Del Public-mappen på nettverket"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../data/desktop_matefile_sharing.schemas.in.h:6
 msgid "When to accept files sent over Bluetooth"
 msgstr "Når filer sendt over Bluetooth skal godtas"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:7
+#: ../data/desktop_matefile_sharing.schemas.in.h:7
 msgid ""
 "When to accept files sent over Bluetooth. Possible values are \"always\", "
 "\"bonded\" and \"ask\"."
@@ -60,38 +60,38 @@ msgstr ""
 "Når filer sendt over Bluetooth skal godtas. Mulige verdier er «always», "
 "«bonded» og «ask»."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../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 kreves. Mulige verdier er «never», «on_write» og «always»."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "Når passord skal kreves"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../data/desktop_matefile_sharing.schemas.in.h:10
 msgid "Whether Bluetooth clients can send files using ObexPush."
 msgstr "Om Bluetooth-klienter kan sende filer med ObexPush."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:11
+#: ../data/desktop_matefile_sharing.schemas.in.h:11
 msgid "Whether Bluetooth clients need to pair with the computer to send files."
 msgstr ""
 "Om Bluetooth-klienter må være bundet med datamaskinen for å sende filer."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:12
+#: ../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 Bluetooth-klienter kan skrive filer eller må dele dem skrivebeskyttet."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:13
+#: ../data/desktop_matefile_sharing.schemas.in.h:13
 msgid "Whether to allow Bluetooth clients to write files."
 msgstr "Om Bluetooth-klienter får skrive filer."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:14
+#: ../data/desktop_matefile_sharing.schemas.in.h:14
 msgid "Whether to notify about newly received files."
 msgstr "Om nylig mottatte filer skal varsles."
 
@@ -147,24 +147,24 @@ msgstr "K_rev passord:"
 msgid "_Share public files on network"
 msgstr "Del offentlige filer på nettverket"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "Deling av personlige filer"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Brukervalg for deling av filer"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Start brukerdeling hvis aktivert"
 
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "Start brukervalg"
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Start brukervalg for deling av personlige filer"
 
diff --git a/po/ne.po b/po/ne.po
index b1e3a70..e95e976 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -1,5 +1,5 @@
-# translation of gnome-user-share.HEAD.ne.po to Nepali
-# translation of gnome-user-share.HEAD.po to Nepali
+# translation of mateuser-share.HEAD.ne.po to Nepali
+# translation of mateuser-share.HEAD.po to Nepali
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 # Pawan Chitrakar <[email protected]>, 2005.
@@ -11,7 +11,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share.HEAD.ne\n"
+"Project-Id-Version: mateuser-share.HEAD.ne\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-01-02 03:12+0000\n"
 "PO-Revision-Date: 2006-09-05 11:14+0545\n"
@@ -23,7 +23,7 @@ msgstr ""
 "X-Generator: KBabel 1.10.2\n"
 "Plural-Forms: nplurals=2;plural=(n!=1)\n"
 
-#: ../desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -31,18 +31,18 @@ msgstr ""
 "यदि यो सहि हो भने, प्रयोगकर्ता लगइन हुँदा प्रयोगकर्ताहरूको गृह डाइरेक्टरीको सार्वजनिक "
 "डाइरेक्टरी साझेदारी हुँनेछ ।"
 
-#: ../desktop_gnome_file_sharing.schemas.in.h:2
+#: ../desktop_matefile_sharing.schemas.in.h:2
 msgid "Share Public directory"
 msgstr "सार्वजनिक डाइरेक्टरी साझेदारी गर्नुहोस्"
 
-#: ../desktop_gnome_file_sharing.schemas.in.h:3
+#: ../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\" छन् ।"
 
-#: ../desktop_gnome_file_sharing.schemas.in.h:4
+#: ../desktop_matefile_sharing.schemas.in.h:4
 msgid "When to require passwords"
 msgstr "पासवर्ड कति बेला आवश्यक पर्ला"
 
@@ -78,11 +78,11 @@ msgstr "पासवर्ड:"
 msgid "_Require password:"
 msgstr "पासवर्ड आवश्यक:"
 
-#: ../gnome-user-share-properties.desktop.in.h:1
+#: ../mateuser-share-properties.desktop.in.h:1
 msgid "Personal File Sharing"
 msgstr "व्यक्तिगत फाइल साझेदारी"
 
-#: ../gnome-user-share-properties.desktop.in.h:2
+#: ../mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of personal files"
 msgstr "व्यक्तिगत फाइलको साझेदारी प्राथमिकता"
 
diff --git a/po/nl.po b/po/nl.po
index 2ea6b94..2885708 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,17 +1,17 @@
-# Dutch translation of gnome-user-share.
+# Dutch translation of mateuser-share.
 #
-# This file is distributed under the same license as the gnome-user-share package.
+# This file is distributed under the same license as the mateuser-share package.
 #
 # Tino Meinen <[email protected]>, 2005–2006
-# Wouter Bolsterlee <[email protected]>, 2010.
+# Wouter Bolsterlee <wbolster@mateorg>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share\n"
+"Project-Id-Version: mateuser-share\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 <[email protected]>\n"
+"Last-Translator: Wouter Bolsterlee <wbolster@mateorg>\n"
 "Language-Team: Dutch <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +19,7 @@ msgstr ""
 
 # ingelogd/aangemeld
 # aangemeld bij wat, zou je je kunnen afvragen
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -29,7 +29,7 @@ msgstr ""
 
 # ingelogd/aangemeld
 # aangemeld bij wat, zou je je kunnen afvragen
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -39,7 +39,7 @@ msgstr ""
 
 # ingelogd/aangemeld
 # aangemeld bij wat, zou je je kunnen afvragen
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -47,19 +47,19 @@ msgstr ""
 "Indien ingeschakeld worden bestanden in de publieke gebruikersmap gedeeld "
 "via het netwerk wanneer de gebruiker aangemeld is."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "Publieke map delen via Bluetooth"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "Publieke bestanden delen op het netwerk"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../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_gnome_file_sharing.schemas.in.h:7
+#: ../data/desktop_matefile_sharing.schemas.in.h:7
 msgid ""
 "When to accept files sent over Bluetooth. Possible values are \"always\", "
 "\"bonded\" and \"ask\"."
@@ -67,7 +67,7 @@ msgstr ""
 "Wanneer via Bluetooth verzonden bestanden worden geaccepteerd. Mogelijke "
 "waarden zijn ‘always’, ‘bonded’ en ‘ask’."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../data/desktop_matefile_sharing.schemas.in.h:8
 msgid ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
@@ -75,21 +75,21 @@ msgstr ""
 "Wanneer er om wachtwoorden moet worden gevraagd, mogelijke opties: \"never"
 "\" (nooit), \"on_write\" (bij schrijven), \"always\" (altijd)"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "Wanneer wachtwoorden worden geeist"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../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_gnome_file_sharing.schemas.in.h:11
+#: ../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_gnome_file_sharing.schemas.in.h:12
+#: ../data/desktop_matefile_sharing.schemas.in.h:12
 msgid ""
 "Whether to allow Bluetooth clients to write files, or share the files read-"
 "only."
@@ -97,11 +97,11 @@ msgstr ""
 "Of Bluetooth-clients bestanden kunnen schrijven, of enkel bestanden als "
 "alleen-lezen kunnen delen."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:13
+#: ../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_gnome_file_sharing.schemas.in.h:14
+#: ../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."
@@ -159,24 +159,24 @@ msgid "_Share public files on network"
 msgstr "_Publieke bestanden delen op het netwerk"
 
 # persoonlijk/uw
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "Uw bestanden delen"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Voorkeuren voor het delen van uw bestanden"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "‘Persoonlijke bestanden delen’ opstarten indien ingeschakeld"
 
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "Voorkeuren opstarten"
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Voorkeuren voor persoonlijke bestanden delen openen"
 
diff --git a/po/nn.po b/po/nn.po
index 2a33b54..24317a3 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -1,12 +1,12 @@
-# Norwegian Nynorsk translation for gnome-user-share.
-# Copyright (C) 2010 gnome-user-share's COPYRIGHT HOLDER
-# This file is distributed under the same license as the gnome-user-share package.
+# 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.
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"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"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -25,7 +25,7 @@ msgstr ""
 "Om denne er sann så vil blåtanneiningar kunne senda filer til "
 "nedlastningsmappa til brukaren når han er logga på."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -33,7 +33,7 @@ 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_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -41,20 +41,20 @@ 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_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "Del den offentlege mappa over blåtann"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "Del den offentlege mappa over nettverket"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../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_gnome_file_sharing.schemas.in.h:7
+#: ../data/desktop_matefile_sharing.schemas.in.h:7
 msgid ""
 "When to accept files sent over Bluetooth. Possible values are \"always\", "
 "\"bonded\" and \"ask\"."
@@ -62,7 +62,7 @@ msgstr ""
 "Når filer sendt over blåtann skal godtakast. Moglege verdiar er "
 "«always» (alltid), «bonded» (bunde) og «ask» (spør)."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../data/desktop_matefile_sharing.schemas.in.h:8
 msgid ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
@@ -70,19 +70,19 @@ msgstr ""
 "Når passord skal spørjast etter. Moglege verdiar er «never» (aldri), "
 "«on_write» (under tilskriving) og «always» (alltid)."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "Når passord skal spørjast etter"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../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_gnome_file_sharing.schemas.in.h:11
+#: ../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_gnome_file_sharing.schemas.in.h:12
+#: ../data/desktop_matefile_sharing.schemas.in.h:12
 msgid ""
 "Whether to allow Bluetooth clients to write files, or share the files read-"
 "only."
@@ -90,11 +90,11 @@ msgstr ""
 "Om blåtannklientar kan skriva filer, eller berre dela filene med berre-"
 "lesbar-løyve."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:13
+#: ../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_gnome_file_sharing.schemas.in.h:14
+#: ../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."
 
@@ -150,24 +150,24 @@ msgstr "_Krev passord:"
 msgid "_Share public files on network"
 msgstr "_Del offentlege filer på nettverket"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "Personleg fildeling"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Innstillingar for deling av filer"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Køyr personleg fildeling om slått på"
 
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "Køyr innstillingar"
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Køyr personleg fildelingsinnstillingar"
 
diff --git a/po/oc.po b/po/oc.po
index f3db482..e9b0632 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -1,7 +1,7 @@
 # Translation of oc.po to Occitan
-# Occitan translation of gnome-user-share.
+# Occitan translation of mateuser-share.
 # Copyright (C) 2005-2006, 2007 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gnome-user-share package.
+# This file is distributed under the same license as the mateuser-share package.
 #
 # Yannig Marchegay (Kokoyaya) <[email protected]>, 2006-2008
 msgid ""
@@ -17,71 +17,71 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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_gnome_file_sharing.schemas.in.h:2
+#: ../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_gnome_file_sharing.schemas.in.h:3
+#: ../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_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr ""
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr ""
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../data/desktop_matefile_sharing.schemas.in.h:6
 msgid "When to accept files sent over Bluetooth"
 msgstr ""
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:7
+#: ../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 ""
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../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_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr ""
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../data/desktop_matefile_sharing.schemas.in.h:10
 msgid "Whether Bluetooth clients can send files using ObexPush."
 msgstr ""
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:11
+#: ../data/desktop_matefile_sharing.schemas.in.h:11
 msgid "Whether Bluetooth clients need to pair with the computer to send files."
 msgstr ""
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:12
+#: ../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_gnome_file_sharing.schemas.in.h:13
+#: ../data/desktop_matefile_sharing.schemas.in.h:13
 msgid "Whether to allow Bluetooth clients to write files."
 msgstr ""
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:14
+#: ../data/desktop_matefile_sharing.schemas.in.h:14
 msgid "Whether to notify about newly received files."
 msgstr ""
 
@@ -139,19 +139,19 @@ msgstr "Mot de _pas :"
 msgid "_Require password:"
 msgstr ""
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
+#: ../data/mateuser-share-properties.desktop.in.h:1
 msgid "Personal File Sharing"
 msgstr ""
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of personal files"
 msgstr ""
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch User Sharing if enabled"
 msgstr ""
 
-#: ../data/gnome-user-share.desktop.in.in.h:2
+#: ../data/mateuser-share.desktop.in.in.h:2
 msgid "User Sharing"
 msgstr ""
 
diff --git a/po/or.po b/po/or.po
index 03ac2b3..016f93b 100644
--- a/po/or.po
+++ b/po/or.po
@@ -1,12 +1,12 @@
-# translation of gnome-user-share.master.or.po to Oriya
+# translation of mateuser-share.master.or.po to Oriya
 # 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.
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share.master.or\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-user-share&component=general\n"
+"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"
@@ -20,7 +20,7 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -28,7 +28,7 @@ msgstr ""
 "ଯଦି ଏହା true, ଚାଳକ ମୂଖ୍ୟ ପଞ୍ଜିକାରେ ସାର୍ବଜନିକ ଡିରେକ୍ଟୋରୀ ଚାଳକ ଲଗଇନ ହେବାମାତ୍ରେ ଆହରଣ "
 "ଡିରେକ୍ଟୋରୀ ମାଧ୍ଯମରେ ସହଭାଗ ହୋଇଥାଏ।"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -36,7 +36,7 @@ msgstr ""
 "ଯଦି ଏହା true, ଚାଳକ ମୂଖ୍ୟ ପଞ୍ଜିକାରେ ସାର୍ବଜନିକ ଡିରେକ୍ଟୋରୀ ଚାଳକ ଲଗଇନ ହେବାମାତ୍ରେ ବ୍ଲୁଟୁଥ "
 "ମାଧ୍ଯମରେ ସହଭାଗ ହୋଇଥାଏ।"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -44,19 +44,19 @@ msgstr ""
 "ଯଦି ଏହା true, ଚାଳକ ମୂଖ୍ୟ ପଞ୍ଜିକାରେ ସାର୍ବଜନିକ ଡିରେକ୍ଟୋରୀ ନେଟୱର୍କରେ ଚାଳକ ଲଗଇନ ହେବାମାତ୍ରେ "
 "ସହଭାଗ ହୋଇଥାଏ।"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "ବ୍ଲୁଟୁଥ ଉପରେ ସାର୍ବଜନିକ ଡିରେକ୍ଟୋରୀକୁ ସହଭାଗ କରନ୍ତୁ"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "ନେଟୱର୍କ ଉପରେ ସାର୍ବଜନିକ ଡିରେକ୍ଟୋରୀକୁ ସହଭାଗ କରନ୍ତୁ"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../data/desktop_matefile_sharing.schemas.in.h:6
 msgid "When to accept files sent over Bluetooth"
 msgstr "ବ୍ଲୁଟୁଥ ଉପରେ ପଠାଯାଇଥିବା ଫାଇଲଗୁଡ଼ିକୁ କେତେବେଳେ ଗ୍ରହଣ କରିବା ଉଚିତ"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:7
+#: ../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\"."
@@ -64,7 +64,7 @@ msgstr ""
 "ବ୍ଲୁଟୁଥ ଉପରେ ପଠାଯାଇଥିବା ଫାଇଲଗୁଡ଼ିକୁ କେତେବେଳେ ଗ୍ରହଣ କରିବା ଉଚିତ। ସମ୍ଭାବ୍ୟ ମୂଲ୍ୟଗୁଡ଼ିକ ହେଉଛି "
 "\"always\", \"bonded\", \"bonded_trusted\" ଏବଂ \"ask\"।"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../data/desktop_matefile_sharing.schemas.in.h:8
 msgid ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
@@ -72,19 +72,19 @@ msgstr ""
 "ପ୍ରବେଶ ସଂକେତ ପାଇଁ କେତେବେଳେ ପଚାରିବା ଉଚିତ। ସମ୍ଭାବ୍ୟ ମୂଲ୍ୟଗୁଡ଼ିକ ହେଉଛି \"never\", \"on_write"
 "\", ଏବଂ\"always\"।"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "ପ୍ରବେଶ ସଂକେତ କେତେବେଳେ ଆବଶ୍ୟକ"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../data/desktop_matefile_sharing.schemas.in.h:10
 msgid "Whether Bluetooth clients can send files using ObexPush."
 msgstr "ObexPush ବ୍ୟବହାର କରି ବ୍ୱୁଟୁଥ ଗ୍ରାହକ ମାନେ ଫାଇଲଗୁଡ଼ିକୁ ପଠାଇବା ଉଚିତ କି।"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:11
+#: ../data/desktop_matefile_sharing.schemas.in.h:11
 msgid "Whether Bluetooth clients need to pair with the computer to send files."
 msgstr "ଫାଇଲ ପଠାଇବା ପାଇଁ ବ୍ୱୁଟୁଥ ଗ୍ରାହକମାନଙ୍କୁ କମ୍ପୁଟର ସହିତ ଯୋଡ଼ିହେବା ଉଚିତ କି।"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:12
+#: ../data/desktop_matefile_sharing.schemas.in.h:12
 msgid ""
 "Whether to allow Bluetooth clients to write files, or share the files read-"
 "only."
@@ -92,11 +92,11 @@ msgstr ""
 "ଫାଇଲ ଲେଖିବା ପାଇଁ ବ୍ୱୁଟୁଥ ଫାଇଲଗୁଡ଼ିକୁ ଅନୁମତି ଦେବା ଉଚିତ କି, କିମ୍ବା କେବଳ ପଠନୀୟ ଫାଇଲଗୁଡ଼ିକୁ ସହଭାଗ "
 "କରନ୍ତୁ।"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:13
+#: ../data/desktop_matefile_sharing.schemas.in.h:13
 msgid "Whether to allow Bluetooth clients to write files."
 msgstr "ବ୍ଲୁଟୁଥ ଗ୍ରାହକମାନଙ୍କୁ ଫାଇଲ ଲେଖିବା ପାଇଁ ଅନୁମତି ଦେବା ଉଚିତ କି।"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:14
+#: ../data/desktop_matefile_sharing.schemas.in.h:14
 msgid "Whether to notify about newly received files."
 msgstr "ନୂତନ ଭାବରେ ଗ୍ରହଣ କରାଯାଇଥିବା ଫାଇଲଗୁଡ଼ିକ ବିଷୟରେ ବିଜ୍ଞପ୍ତି ଦେବା ଉଚିତ କି।"
 
@@ -153,17 +153,17 @@ msgstr "ପ୍ରବେଶ ସଂକେତ ଆବଶ୍ୟକ (_R):"
 msgid "_Share public files on network"
 msgstr "ନେଟୱର୍କରେ ସାର୍ବଜନିକ ଫାଇଲଗୁଡ଼ିକୁ ସହଭାଗ କରନ୍ତୁ (_S)"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2
 msgid "Personal File Sharing"
 msgstr "ବ୍ୟକ୍ତିଗତ ଫାଇଲ ସହଭାଗ"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 #| msgid "Preferences for sharing of personal files"
 msgid "Preferences for sharing of files"
 msgstr "ଫାଇଲଗୁଡ଼ିକୁ ସହଭାଗ କରିବା ପାଇଁ ପସନ୍ଦ"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 #| msgid "Launch User Sharing if enabled"
 msgid "Launch Personal File Sharing if enabled"
 msgstr "ଯଦି ସକ୍ରିୟ ଥାଏ ତେବେ ବ୍ୟକ୍ତିଗତ ଫାଇଲ ସହଭାଗକୁ ଆରମ୍ଭ କରନ୍ତୁ"
diff --git a/po/pa.po b/po/pa.po
index 65b6de3..7de011a 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -1,4 +1,4 @@
-# translation of gnome-user-share.HEAD.po to Punjabi
+# translation of mateuser-share.HEAD.po to Punjabi
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 #
@@ -6,9 +6,9 @@
 # A S Alam <[email protected]>, 2009, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share.HEAD\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
-"cgi?product=gnome-user-share&component=general\n"
+"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"
@@ -19,7 +19,7 @@ msgstr ""
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -27,7 +27,7 @@ msgstr ""
 "ਜੇ ਸਹੀਂ ਹੈ ਤਾਂ ਬਲਿਊਟੁੱਥ ਜੰਤਰ ਯੂਜ਼ਰ ਦੇ ਲਾਗਇਨ ਹੋਣ ਨਾਲ ਉਸ ਦੇ ਡਾਊਨਲੋਡ ਡਾਇਰੈਕਟਰੀ ਵਿੱਚ ਫਾਇਲਾਂ ਭੇਜ "
 "ਸਕਦੇ ਹਨ।"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -35,7 +35,7 @@ msgstr ""
 "ਜੇ ਸਹੀਂ ਹੈ ਤਾਂ ਯੂਜ਼ਰ ਦੀ ਘਰ ਡਾਇਰੈਕਟਰੀ ਵਿੱਚ ਪਬਲਿਕ ਡਾਇਰੈਕਟਰੀ ਨੂੰ ਬਲਿਊਟੁੱਥ ਉੱਤੇ ਸਾਂਝੀ ਕੀਤਾ "
 "ਜਾਵੇਗਾ, ਜਦੋਂ ਵੀ ਯੂਜ਼ਰ ਲਾਗਇਨ ਹੋਵੇਗਾ।"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -43,19 +43,19 @@ msgstr ""
 "ਜੇ ਸਹੀਂ ਹੈ ਤਾਂ ਯੂਜ਼ਰ ਦੀ ਘਰ ਡਾਇਰੈਕਟਰੀ ਵਿੱਚ ਪਬਲਿਕ ਡਾਇਰੈਕਟਰੀ ਨੂੰ ਨੈੱਟਵਰਕ ਉੱਤੇ ਸਾਂਝੀ ਕੀਤਾ ਜਾਵੇਗਾ, "
 "ਜਦੋਂ ਵੀ ਯੂਜ਼ਰ ਲਾਗਇਨ ਹੋਵੇਗਾ।"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "ਬਲਿਊਟੁੱਥ ਉੱਤੇ ਸਾਂਝੀ ਪਬਲਿਕ ਡਾਇਰੈਕਟਰੀ"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "ਨੈੱਟਵਰਕ ਉੱਤੇ ਸਾਂਝੀ ਪਬਲਿਕ ਡਾਇਰੈਕਟਰੀ"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../data/desktop_matefile_sharing.schemas.in.h:6
 msgid "When to accept files sent over Bluetooth"
 msgstr "ਜਦੋਂ ਬਲਿਊਟੁੱਥ ਉੱਤੇ ਭੇਜੀਆਂ ਫਾਇਲਾਂ ਪ੍ਰਾਪਤ ਕਰਨੀਆਂ ਹੋਣ"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:7
+#: ../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\"."
@@ -66,35 +66,35 @@ msgstr ""
 "ਜਦੋਂ ਬਲਿਊਟੁੱਥ ਉੱਤੇ ਭੇਜੀਆਂ ਫਾਇਲਾਂ ਪ੍ਰਾਪਤ ਕਰਨੀਆਂ ਹੋਣ ਤਾਂ ਸੰਭਵ ਮੁੱਲ ਹਨ \"always\", \"bonded\", "
 "\"ask\""
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../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_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "ਜਦੋਂ ਪਾਸਵਰਪ ਲੋੜੀਦਾ ਹੋਵੇ"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../data/desktop_matefile_sharing.schemas.in.h:10
 msgid "Whether Bluetooth clients can send files using ObexPush."
 msgstr "ਕੀ ਬਲਿਊਟੁੱਥ ਕਲਾਇਟਾਂ ਨੂੰ ObexPush ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਫਾਇਲਾਂ ਭੇਜ ਸਕਦੇ ਹੋ।"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:11
+#: ../data/desktop_matefile_sharing.schemas.in.h:11
 msgid "Whether Bluetooth clients need to pair with the computer to send files."
 msgstr "ਕੀ ਬਲਿਊਟੁੱਥ ਕਲਾਇਟਾਂ ਨੂੰ ਫਾਇਲਾਂ ਭੇਜਣ ਲਈ ਕੰਪਿਊਟਰ ਨਾਲ ਪੇਅਰ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:12
+#: ../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_gnome_file_sharing.schemas.in.h:13
+#: ../data/desktop_matefile_sharing.schemas.in.h:13
 msgid "Whether to allow Bluetooth clients to write files."
 msgstr "ਕੀ ਬਲਿਊਟੁੱਥ ਕਲਾਇਟਾਂ ਨੂੰ ਫਾਇਲਾਂ ਲਿਖਣ ਦੇਣੀਆਂ ਹਨ।"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:14
+#: ../data/desktop_matefile_sharing.schemas.in.h:14
 msgid "Whether to notify about newly received files."
 msgstr "ਕੀ ਨਵੀਆਂ ਮਿਲੀਆਂ ਫਾਇਲਾਂ ਲਈ ਸੂਚਨਾ ਦੇਣੀ ਹੈ।"
 
@@ -150,24 +150,24 @@ msgstr "ਲੋੜੀਦਾ ਪਾਸਵਰਡ(_R):"
 msgid "_Share public files on network"
 msgstr "ਨੈੱਟਵਰਕ ਉੱਤੇ ਸਾਂਝੀਆਂ ਪਬਲਿਕ ਫਾਇਲਾਂ(_S)"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "ਨਿੱਜੀ ਫਾਇਲ ਸਾਂਝ"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "ਫਾਇਲਾਂ ਸਾਂਝੀਆਂ ਕਰਨ ਲਈ ਪਸੰਦ"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "ਜੇ ਚਾਲੂ ਹੋਵੇ ਤਾਂ ਨਿੱਜੀ ਫਾਇਲ ਸਾਂਝ ਚਲਾਓ"
 
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "ਪਸੰਦ ਚਲਾਓ"
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 #| msgid "Personal File Sharing Preferences"
 msgid "Launch Personal File Sharing Preferences"
 msgstr "ਨਿੱਜੀ ਫਾਇਲ ਸ਼ੇਅਰਿੰਗ ਪਸੰਦ ਚਲਾਓ"
diff --git a/po/pl.po b/po/pl.po
index 12b22d2..44dc5c0 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -2,16 +2,16 @@
 # 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]
+# [email protected]
 # -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share\n"
+"Project-Id-Version: mateuser-share\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"
+"Language-Team: Polish <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,7 +20,7 @@ msgstr ""
 "X-Poedit-Language: Polish\n"
 "X-Poedit-Country: Poland\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -28,7 +28,7 @@ msgstr ""
 "Jeśli ustawione na \"true\", urządzenia Bluetooth mogą wysyłać pliki do "
 "katalogu Pobrane użytkownika po zalogowaniu."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -37,7 +37,7 @@ msgstr ""
 "użytkownika będzie współdzielony przez Bluetooth, gdy ten użytkownik się "
 "zaloguje."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -45,19 +45,19 @@ 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_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "Współdzielenie katalogu Publiczny przez Bluetooth"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "Współdzielenie katalogu Publiczny przez sieć"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../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_gnome_file_sharing.schemas.in.h:7
+#: ../data/desktop_matefile_sharing.schemas.in.h:7
 msgid ""
 "When to accept files sent over Bluetooth. Possible values are \"always\", "
 "\"bonded\" and \"ask\"."
@@ -66,7 +66,7 @@ msgstr ""
 "\"always\" (zawsze), \"bonded\" (tylko od powiązanych) i \"ask\" (zawsze "
 "pytaj)."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../data/desktop_matefile_sharing.schemas.in.h:8
 msgid ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
@@ -74,22 +74,22 @@ msgstr ""
 "Kiedy pytać o hasła. Możliwe wartości to \"never\" (nigdy), \"on_write"
 "\" (podczas próby zapisu) i \"always\" (zawsze)."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "Kiedy wymagać haseł"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../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_gnome_file_sharing.schemas.in.h:11
+#: ../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_gnome_file_sharing.schemas.in.h:12
+#: ../data/desktop_matefile_sharing.schemas.in.h:12
 msgid ""
 "Whether to allow Bluetooth clients to write files, or share the files read-"
 "only."
@@ -97,11 +97,11 @@ msgstr ""
 "Określa, czy zdalne klienty Bluetooth mogą zapisywać pliki, czy współdzielić "
 "pliki tylko do odczytu."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:13
+#: ../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_gnome_file_sharing.schemas.in.h:14
+#: ../data/desktop_matefile_sharing.schemas.in.h:14
 msgid "Whether to notify about newly received files."
 msgstr "Określa, czy powiadamiać o pobieranych plikach."
 
@@ -157,24 +157,24 @@ msgstr "_Wymaganie hasła:"
 msgid "_Share public files on network"
 msgstr "Współdzielenie plików publicznych w _sieci"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "Współdzielenie osobistych plików"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Preferencje współdzielenia plików"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Uruchamia współdzielenie osobistych plików, jeśli włączone"
 
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "Uruchom preferencje"
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Uruchamia preferencje współdzielenia osobistych plików"
 
diff --git a/po/pt.po b/po/pt.po
index 71a478c..b33525c 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,6 +1,6 @@
-# gnome-user-share's Portuguese translation.
-# Copyright © 2007, 2009, 2010 gnome-user-share
-# This file is distributed under the same license as the gnome-user-share package.
+# mateuser-share's Portuguese translation.
+# Copyright © 2007, 2009, 2010 mateuser-share
+# This file is distributed under the same license as the mateuser-share package.
 # André Neves <[email protected]>, 2007.
 # Duarte Loreto <[email protected]>, 2009, 2010.
 #
@@ -11,12 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2010-03-09 01:15+0000\n"
 "PO-Revision-Date: 2010-03-09 01:20+0000\n"
 "Last-Translator: Duarte Loreto <[email protected]>\n"
-"Language-Team: Portuguese <[email protected]>\n"
+"Language-Team: Portuguese <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -24,7 +24,7 @@ msgstr ""
 "Se definido como verdadeiro, dispositivos Bluetooth podem enviar ficheiros "
 "para o directório de Downloads do utilizador estiver numa sessão."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -33,7 +33,7 @@ msgstr ""
 "utilizador será partilhado por Bluetooth quando o utilizador estiver numa "
 "sessão."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -41,19 +41,19 @@ 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_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "Partilhar o directório \"Public\" por Bluetooth"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "Partilhar o directório \"Public\" pela rede"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../data/desktop_matefile_sharing.schemas.in.h:6
 msgid "When to accept files sent over Bluetooth"
 msgstr "Quando aceitar ficheiros enviados por Bluetooth"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:7
+#: ../data/desktop_matefile_sharing.schemas.in.h:7
 msgid ""
 "When to accept files sent over Bluetooth. Possible values are \"always\", "
 "\"bonded\" and \"ask\"."
@@ -61,7 +61,7 @@ msgstr ""
 "Quando aceitar ficheiros enviados por Bluetooth. Valores possíveis são "
 "\"always\", \"bonded\" e \"ask\"."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../data/desktop_matefile_sharing.schemas.in.h:8
 msgid ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
@@ -69,22 +69,22 @@ msgstr ""
 "Quando perguntar por senhas. Valores possíveis são \"never\" (nunca), "
 "\"on_write\" (ao gravar), e \"always\" (sempre)."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "Quando exigir senhas"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../data/desktop_matefile_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_gnome_file_sharing.schemas.in.h:11
+#: ../data/desktop_matefile_sharing.schemas.in.h:11
 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_gnome_file_sharing.schemas.in.h:12
+#: ../data/desktop_matefile_sharing.schemas.in.h:12
 msgid ""
 "Whether to allow Bluetooth clients to write files, or share the files read-"
 "only."
@@ -92,12 +92,12 @@ 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_gnome_file_sharing.schemas.in.h:13
+#: ../data/desktop_matefile_sharing.schemas.in.h:13
 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_gnome_file_sharing.schemas.in.h:14
+#: ../data/desktop_matefile_sharing.schemas.in.h:14
 msgid "Whether to notify about newly received files."
 msgstr "Se notificar ou não de ficheiros recebidos."
 
@@ -155,24 +155,24 @@ msgstr "_Exigir senha:"
 msgid "_Share public files on network"
 msgstr "_Partilhar ficheiros da pasta \"Public\" pela rede"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "Partilha de Ficheiros Pessoais"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Preferências para a partilha de ficheiros"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Inicia a Partilha de Ficheiros Pessoais, se activa"
 
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "Preferências de Iniciação"
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Preferências de Iniciação da Partilha de Ficheiros Pessoais"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 3a981c4..fa83704 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -10,18 +10,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share\n"
+"Project-Id-Version: mateuser-share\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 <[email protected]>\n"
+"Language-Team: Brazilian Portuguese <matept_br-list@mateorg>\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_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -29,7 +29,7 @@ msgstr ""
 "Se isto for true, dispositivos Bluetooth podem enviar arquivos para o "
 "diretório de download do usuário quando estiver conectado."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -37,7 +37,7 @@ 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_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -45,19 +45,19 @@ 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_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "Compartilhar diretório público pelo Bluetooth"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../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_gnome_file_sharing.schemas.in.h:6
+#: ../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_gnome_file_sharing.schemas.in.h:7
+#: ../data/desktop_matefile_sharing.schemas.in.h:7
 msgid ""
 "When to accept files sent over Bluetooth. Possible values are \"always\", "
 "\"bonded\" and \"ask\"."
@@ -65,7 +65,7 @@ msgstr ""
 "Quando aceitar arquivos enviados pelo Bluetooth. Valores possíveis são "
 "\"always\", \"bonded\", \"bonded_trusted\" e \"ask\"."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../data/desktop_matefile_sharing.schemas.in.h:8
 msgid ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
@@ -73,19 +73,19 @@ msgstr ""
 "Quando perguntar por senhas. Valores possíveis são \"never\", \"on_write\", "
 "e \"always\"."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "Quando exigir senhas"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../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_gnome_file_sharing.schemas.in.h:11
+#: ../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_gnome_file_sharing.schemas.in.h:12
+#: ../data/desktop_matefile_sharing.schemas.in.h:12
 msgid ""
 "Whether to allow Bluetooth clients to write files, or share the files read-"
 "only."
@@ -93,11 +93,11 @@ msgstr ""
 "Permitir clientes Bluetooth gravar arquivos, ou compartilhar arquivos "
 "somente para leitura."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:13
+#: ../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_gnome_file_sharing.schemas.in.h:14
+#: ../data/desktop_matefile_sharing.schemas.in.h:14
 msgid "Whether to notify about newly received files."
 msgstr "Notificar sobre arquivos recebidos recentemente."
 
@@ -153,24 +153,24 @@ msgstr "_Exigir senha:"
 msgid "_Share public files on network"
 msgstr "_Compartilhar arquivos públicos na rede"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "Compartilhamento de arquivos pessoais"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Preferências para compartilhamento de arquivos"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Lança compartilhamento de arquivos pessoais se habilitado"
 
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "Lançar preferências"
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Lançar preferências de compartilhamento de arquivos pessoais"
 
diff --git a/po/ro.po b/po/ro.po
index 344cc6a..26e97dd 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,15 +1,15 @@
-# This file is distributed under the same license as the gnome-user-share package.
+# This file is distributed under the same license as the mateuser-share package.
 # Adi Roiban https://launchpad.net/~adiroiban, 2009
 # Lucian Adrian Grijincu <[email protected]>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"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"
+"Language-Team: Romanian Gnome Team <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,7 +18,7 @@ msgstr ""
 "20)) ? 1 : 2);;\n"
 "X-Generator: Virtaal 0.4.0\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -26,7 +26,7 @@ msgstr ""
 "La activare, dispozitivele Bluetooth pot trimite fișiere în dosarul "
 "„Descărcări” când utilizatorul este autentificat."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -34,7 +34,7 @@ msgstr ""
 "La activare, dosarul „Public” din dosarul personal al utilizatorului va fi "
 "partajat prin Bluetooth când utilizatorul este autentificat."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -42,19 +42,19 @@ msgstr ""
 "La activare, dosarul „Public” din dosarul personal al utilizatorului va fi "
 "partajat prin rețea când utilizatorul este autentificat."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "Partajează prin Bluetooth dosarul „Public”"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "Partajează în rețea dosarul „Public”"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../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_gnome_file_sharing.schemas.in.h:7
+#: ../data/desktop_matefile_sharing.schemas.in.h:7
 msgid ""
 "When to accept files sent over Bluetooth. Possible values are \"always\", "
 "\"bonded\" and \"ask\"."
@@ -62,7 +62,7 @@ msgstr ""
 "Când să fie acceptate fișierele trimise prin Bluetooth. Valorile posibile "
 "sunt „always”, „bonded” și „ask”."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../data/desktop_matefile_sharing.schemas.in.h:8
 msgid ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
@@ -70,22 +70,22 @@ msgstr ""
 "Când să se ceară parole. Valorile posibile sunt „never”, „on_write” și "
 "„always”."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "Când să se ceară parole"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../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_gnome_file_sharing.schemas.in.h:11
+#: ../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_gnome_file_sharing.schemas.in.h:12
+#: ../data/desktop_matefile_sharing.schemas.in.h:12
 msgid ""
 "Whether to allow Bluetooth clients to write files, or share the files read-"
 "only."
@@ -93,11 +93,11 @@ msgstr ""
 "Specifică dacă se permite scrierea de fișiere clienților Bluetooth sau "
 "dacăfișierele să fie partajate doar pentru citire."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:13
+#: ../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_gnome_file_sharing.schemas.in.h:14
+#: ../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."
 
@@ -153,24 +153,24 @@ msgstr "Necesită pa_rolă:"
 msgid "_Share public files on network"
 msgstr "Partajare de fișiere publice în _rețea"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "Partajare de fișiere personale"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Preferințe pentru partajarea fișierelor"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "La activare, pornește partajarea de fișiere personale"
 
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "Preferințe lansare"
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 msgid "Launch Personal File Sharing Preferences"
 msgstr ""
 "Lansează o fereastră de configurare a preferințelor partajării fișierelor "
diff --git a/po/ru.po b/po/ru.po
index 99a2158..3664f1a 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\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_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -25,7 +25,7 @@ msgstr ""
 "Если этот параметр установлен, устройства Bluetooth могут отправлять файлы в "
 "каталог Downloads пользователя после его входа в систему."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -33,7 +33,7 @@ msgstr ""
 "Если этот параметр установлен, файлы в каталоге Public пользователя станут "
 "доступны через Bluetooth, когда пользователь войдёт в систему."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -41,19 +41,19 @@ msgstr ""
 "Если этот параметр установлен, файлы в каталоге Public пользователя станут "
 "доступны по сети, когда он войдёт в систему."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "Сделать файлы в каталоге Public общими через для доступа через Bluetooth"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "Сделать файлы в каталоге Public общими через для доступа по сети"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../data/desktop_matefile_sharing.schemas.in.h:6
 msgid "When to accept files sent over Bluetooth"
 msgstr "Действие при приёме файлов, отправленных через Bluetooth"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:7
+#: ../data/desktop_matefile_sharing.schemas.in.h:7
 msgid ""
 "When to accept files sent over Bluetooth. Possible values are \"always\", "
 "\"bonded\" and \"ask\"."
@@ -61,25 +61,25 @@ msgstr ""
 "Действие при получении файлов по протоколу Bluetooth. Возможные значения: «always», "
 "«bonded», «bonded_trusted» и «ask»."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../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_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "Когда запрашивать пароли"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../data/desktop_matefile_sharing.schemas.in.h:10
 msgid "Whether Bluetooth clients can send files using ObexPush."
 msgstr "Разрешить клиентам Bluetooth посылать файлы с помощью ObexPush."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:11
+#: ../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_gnome_file_sharing.schemas.in.h:12
+#: ../data/desktop_matefile_sharing.schemas.in.h:12
 msgid ""
 "Whether to allow Bluetooth clients to write files, or share the files read-"
 "only."
@@ -87,11 +87,11 @@ msgstr ""
 "Будут ли клиенты Bluetooth записывать файлы или файлы будут доступны только "
 "для чтения."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:13
+#: ../data/desktop_matefile_sharing.schemas.in.h:13
 msgid "Whether to allow Bluetooth clients to write files."
 msgstr "Разрешить клиентам Bluetooth записывать файлы."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:14
+#: ../data/desktop_matefile_sharing.schemas.in.h:14
 msgid "Whether to notify about newly received files."
 msgstr "Сообщать о получаемых файлах"
 
@@ -147,24 +147,24 @@ msgstr "_Требовать пароль:"
 msgid "_Share public files on network"
 msgstr "От_крыть доступ к файлам по сети"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "Общий доступ к личным файлам"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Параметры общего доступа к файлам"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Открыть общий доступ к личным файлам, если включено"
 
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "Параметры запуска"
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Открыть параметры общего доступа к личным файлам"
 
diff --git a/po/rw.po b/po/rw.po
index 2412cc7..2de13c7 100644
--- a/po/rw.po
+++ b/po/rw.po
@@ -1,6 +1,6 @@
-# translation of gnome-user-share to Kinyarwanda.
+# translation of mateuser-share to Kinyarwanda.
 # Copyright (C) 2005 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gnome-user-share package.
+# This file is distributed under the same license as the mateuser-share package.
 # 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.
@@ -13,7 +13,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share HEAD\n"
+"Project-Id-Version: mateuser-share HEAD\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"
@@ -24,7 +24,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "ULL NAME <EMAIL@ADDRESS>\n"
 
-#: desktop_gnome_file_sharing.schemas.in.h:1
+#: desktop_matefile_sharing.schemas.in.h:1
 #, fuzzy
 msgid ""
 "If this is true, the Public directory in the users home directory will be "
@@ -33,19 +33,19 @@ msgstr ""
 "iyi ni NIBYO i bushyinguro in i Ku Ntangiriro bushyinguro Ryari: i Ukoresha: "
 "ni in"
 
-#: desktop_gnome_file_sharing.schemas.in.h:2
+#: desktop_matefile_sharing.schemas.in.h:2
 #, fuzzy
 msgid "Share Public directory"
 msgstr "bushyinguro"
 
-#: desktop_gnome_file_sharing.schemas.in.h:3
+#: 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_gnome_file_sharing.schemas.in.h:4
+#: desktop_matefile_sharing.schemas.in.h:4
 #, fuzzy
 msgid "When to require passwords"
 msgstr "Kuri Amagambo banga"
diff --git a/po/sk.po b/po/sk.po
index 6e69ad7..f953042 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,24 +1,24 @@
-# Slovak translation for gnome-user-share.
+# Slovak translation for mateuser-share.
 # Copyright (C) 2005, 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gnome-user-share package.
+# This file is distributed under the same license as the mateuser-share package.
 # Marcel Telka <[email protected]>, 2005.
 # Roman Mátyus <[email protected]>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"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-05-12 23:05+0000\n"
 "PO-Revision-Date: 2010-09-07 20:29+0200\n"
 "Last-Translator: Roman Mátyus <[email protected]>\n"
-"Language-Team: Slovak <[email protected]>\n"
+"Language-Team: Slovak <matesk-list@mateorg>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-# * https://bugzilla.gnome.org/show_bug.cgi?id=614280
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+# * https://bugzilla.mateorg/show_bug.cgi?id=614280
+#: ../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."
@@ -26,8 +26,8 @@ msgstr ""
 "Ak je toto true, zariadenia Bluetooth môžu posielať súbory do používateľovho "
 "adresára Stiahnuté, keď je prihlásený."
 
-# * https://bugzilla.gnome.org/show_bug.cgi?id=614280
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:2
+# * https://bugzilla.mateorg/show_bug.cgi?id=614280
+#: ../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."
@@ -35,8 +35,8 @@ msgstr ""
 "Ak je toto true, adresár Verejné v domovskom adresári používateľa bude "
 "zdieľaný cez Bluetooth, keď je používateľ prihlásený."
 
-# * https://bugzilla.gnome.org/show_bug.cgi?id=614280
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:3
+# * https://bugzilla.mateorg/show_bug.cgi?id=614280
+#: ../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."
@@ -44,21 +44,21 @@ msgstr ""
 "Ak je toto true, adresár Verejné v domovskom adresári používateľa bude "
 "zdieľaný cez sieť, keď je používateľ prihlásený."
 
-# * https://bugzilla.gnome.org/show_bug.cgi?id=614280
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:4
+# * https://bugzilla.mateorg/show_bug.cgi?id=614280
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "Zdieľať adresár Verejné cez Bluetooth"
 
-# * https://bugzilla.gnome.org/show_bug.cgi?id=614280
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+# * https://bugzilla.mateorg/show_bug.cgi?id=614280
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "Zdieľať adresár Verejné cez sieť"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../data/desktop_matefile_sharing.schemas.in.h:6
 msgid "When to accept files sent over Bluetooth"
 msgstr "Kedy akceptovať súbory poslané cez Bluetooth"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:7
+#: ../data/desktop_matefile_sharing.schemas.in.h:7
 msgid ""
 "When to accept files sent over Bluetooth. Possible values are \"always\", "
 "\"bonded\" and \"ask\"."
@@ -66,7 +66,7 @@ msgstr ""
 "Kedy akceptovať súbory poslané cez Bluetooth. Možné hodnoty sú \"always"
 "\" (vždy), \"bonded\" (po previazaní) a \"ask\" (opýtať sa)."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../data/desktop_matefile_sharing.schemas.in.h:8
 msgid ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
@@ -74,20 +74,20 @@ msgstr ""
 "Kedy pýtať heslá. Možné hodnoty sú \"never\" (nikdy), \"on_write\" (pri "
 "zápise), a \"always\" (vždy)."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "Kedy vyžadovať heslá"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../data/desktop_matefile_sharing.schemas.in.h:10
 msgid "Whether Bluetooth clients can send files using ObexPush."
 msgstr "Či Bluetooth klienti môžu posielať súbory použitím ObexPush."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:11
+#: ../data/desktop_matefile_sharing.schemas.in.h:11
 msgid "Whether Bluetooth clients need to pair with the computer to send files."
 msgstr ""
 "Či sa na posielanie súborov klienti Bluetooth potrebujú spárovať s počítačom."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:12
+#: ../data/desktop_matefile_sharing.schemas.in.h:12
 msgid ""
 "Whether to allow Bluetooth clients to write files, or share the files read-"
 "only."
@@ -95,11 +95,11 @@ msgstr ""
 "Či klientom Bluetooth povoliť zapisovať súbory alebo zdieľať súbory len na "
 "čítanie."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:13
+#: ../data/desktop_matefile_sharing.schemas.in.h:13
 msgid "Whether to allow Bluetooth clients to write files."
 msgstr "Či klientom Bluetooth povoliť zapisovať súbory."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:14
+#: ../data/desktop_matefile_sharing.schemas.in.h:14
 msgid "Whether to notify about newly received files."
 msgstr "Či informovať o prijatí nových súborov."
 
@@ -123,7 +123,7 @@ msgstr "P_ovoliť vzdialeným zariadeniam mazanie súborov"
 msgid "Personal File Sharing Preferences"
 msgstr "Predvoľby zdieľania osobných súborov"
 
-# * https://bugzilla.gnome.org/show_bug.cgi?id=614280
+# * https://bugzilla.mateorg/show_bug.cgi?id=614280
 #: ../data/file-share-properties.ui.h:6
 msgid "Receive files in _Downloads folder over Bluetooth"
 msgstr "Prijí_mať súbory poslané cez Bluetooth do priečinka Stiahnuté"
@@ -156,29 +156,29 @@ msgstr "Vyža_dovať heslo:"
 msgid "_Share public files on network"
 msgstr "_Zdieľať verejné súbory na sieti"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "Zdieľanie osobných súborov"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Predvoľby pre zdieľanie súborov"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Ak je povolené, spustiť Zdieľanie osobných súborov"
 
-# https://bugzilla.gnome.org/show_bug.cgi?id=618665
-#: ../src/nautilus-share-bar.c:174
+# https://bugzilla.mateorg/show_bug.cgi?id=618665
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "Spustiť Predvoľby"
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Spustiť Predvoľby zdieľania osobných súborov"
 
-# * https://bugzilla.gnome.org/show_bug.cgi?id=616428
+# * https://bugzilla.mateorg/show_bug.cgi?id=616428
 #: ../src/share-extension.c:82
 msgid "Unable to launch the Personal File Sharing preferences"
 msgstr "Nedá sa spustiť Predvoľby zdieľania osobných súborov"
diff --git a/po/sl.po b/po/sl.po
index 4c38e69..d4f8866 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,17 +1,17 @@
-# Slovenian translation of gnome-user-share.

+# Slovenian translation of mateuser-share.

 # Copyright (C) 2005-2006 Free Software Foundation, Inc.

-# This file is distributed under the same license as the gnome-user-share package.

+# This file is distributed under the same license as the mateuser-share package.

 #

-# Matej Urbančič <[email protected]>, 2007 - 2010.

+# Matej Urbančič <[email protected]>, 2007 - 2010.

 #

 msgid ""

 msgstr ""

-"Project-Id-Version: gnome-user-share master\n"

-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-user-share&component=general\n"

+"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-10-27 20:46+0000\n"

 "PO-Revision-Date: 2010-06-02 15:04+0100\n"

-"Last-Translator: Matej Urbančič <[email protected]>\n"

-"Language-Team: Slovenian GNOME Translation Team <[email protected]>\n"

+"Last-Translator: Matej Urbančič <[email protected]>\n"

+"Language-Team: Slovenian GNOME Translation Team <[email protected]>\n"

 "MIME-Version: 1.0\n"

 "Content-Type: text/plain; charset=UTF-8\n"

 "Content-Transfer-Encoding: 8bit\n"

@@ -20,59 +20,59 @@ msgstr ""
 "X-Poedit-Language: Slovenian\n"

 "X-Poedit-SourceCharset: utf-8\n"

 

-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1

+#: ../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 "Možnost omogoča, da Bluetooth naprave pošiljajo datoteke v uporabnikovo mapo prejetih datotek, ko je uporabnik prijavljen v sistem."

 

-#: ../data/desktop_gnome_file_sharing.schemas.in.h:2

+#: ../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 "Možnost omogoča, da je javna mapa v uporabnikovi domači mapi v souporabi preko Bluetooth, ko je uporabnik prijavljen v sistem."

 

-#: ../data/desktop_gnome_file_sharing.schemas.in.h:3

+#: ../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 "Možnost omogoča, da je javna mapa v uporabnikovi domači mapi v souporabi preko omrežja, ko je uporabnik prijavljen v sistem."

 

-#: ../data/desktop_gnome_file_sharing.schemas.in.h:4

+#: ../data/desktop_matefile_sharing.schemas.in.h:4

 msgid "Share Public directory over Bluetooth"

 msgstr "Souporaba javne mape preko Bluetooth povezave"

 

-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5

+#: ../data/desktop_matefile_sharing.schemas.in.h:5

 msgid "Share Public directory over the network"

 msgstr "Souporaba javne mape na omrežju"

 

-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6

+#: ../data/desktop_matefile_sharing.schemas.in.h:6

 msgid "When to accept files sent over Bluetooth"

 msgstr "Kdaj sprejeti datoteke poslane preko Bluetooth."

 

-#: ../data/desktop_gnome_file_sharing.schemas.in.h:7

+#: ../data/desktop_matefile_sharing.schemas.in.h:7

 msgid "When to accept files sent over Bluetooth. Possible values are \"always\", \"bonded\" and \"ask\"."

 msgstr "Kdaj naj bodo sprejete datoteke poslane preko bluetooth vmesnika? Mogoče vrednosti so \"always\" (vedno), \"bonded\" (ob povezavi) in \"ask\" (vprašaj)."

 

-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8

+#: ../data/desktop_matefile_sharing.schemas.in.h:8

 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\" (ob pisanju), in \"always\" (vedno)."

 

-#: ../data/desktop_gnome_file_sharing.schemas.in.h:9

+#: ../data/desktop_matefile_sharing.schemas.in.h:9

 msgid "When to require passwords"

 msgstr "Kdaj zahtevati geslo"

 

-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10

+#: ../data/desktop_matefile_sharing.schemas.in.h:10

 msgid "Whether Bluetooth clients can send files using ObexPush."

 msgstr "Možnost omogoča, da Bluetooth odjemalci pošiljajo datoteke preko ObexPush sistema."

 

-#: ../data/desktop_gnome_file_sharing.schemas.in.h:11

+#: ../data/desktop_matefile_sharing.schemas.in.h:11

 msgid "Whether Bluetooth clients need to pair with the computer to send files."

 msgstr "Možnost omogoča, da se morajo Bluetooth odjemalci najprej povezati z računalnikom za pošiljanje datotek."

 

-#: ../data/desktop_gnome_file_sharing.schemas.in.h:12

+#: ../data/desktop_matefile_sharing.schemas.in.h:12

 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 le za branje."

 

-#: ../data/desktop_gnome_file_sharing.schemas.in.h:13

+#: ../data/desktop_matefile_sharing.schemas.in.h:13

 msgid "Whether to allow Bluetooth clients to write files."

 msgstr "Možnost omogoča, da Bluetooth odjemalci zapisujejo datoteke."

 

-#: ../data/desktop_gnome_file_sharing.schemas.in.h:14

+#: ../data/desktop_matefile_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."

 

@@ -128,25 +128,25 @@ msgstr "_Zahtevano geslo:"
 msgid "_Share public files on network"

 msgstr "_Souporaba javnih datotek na omrežju"

 

-#: ../data/gnome-user-share-properties.desktop.in.h:1

-#: ../data/gnome-user-share.desktop.in.in.h:2

-#: ../src/nautilus-share-bar.c:162

+#: ../data/mateuser-share-properties.desktop.in.h:1

+#: ../data/mateuser-share.desktop.in.in.h:2

+#: ../src/caja-share-bar.c:162

 msgid "Personal File Sharing"

 msgstr "Osebna souporaba datotek"

 

-#: ../data/gnome-user-share-properties.desktop.in.h:2

+#: ../data/mateuser-share-properties.desktop.in.h:2

 msgid "Preferences for sharing of files"

 msgstr "Možnosti souporabe osebnih datotek"

 

-#: ../data/gnome-user-share.desktop.in.in.h:1

+#: ../data/mateuser-share.desktop.in.in.h:1

 msgid "Launch Personal File Sharing if enabled"

 msgstr "Zaženi osebno souporabo datotek, kadar je ta omogočena"

 

-#: ../src/nautilus-share-bar.c:174

+#: ../src/caja-share-bar.c:174

 msgid "Launch Preferences"

 msgstr "Možnosti zagona"

 

-#: ../src/nautilus-share-bar.c:187

+#: ../src/caja-share-bar.c:187

 msgid "Launch Personal File Sharing Preferences"

 msgstr "Zagon možnosti osebne souporabe datotek"

 

diff --git a/po/sq.po b/po/sq.po
index e86c239..0b1fc3c 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -1,21 +1,21 @@
-# Përkthimi i mesazheve të gnome-user-share në shqip
+# 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 gnome-user-share package.
+# This file is distributed under the same license as the mateuser-share package.
 # Elian Myftiu <[email protected]>, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share HEAD\n"
+"Project-Id-Version: mateuser-share HEAD\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"
+"Language-Team: Albanian <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -23,11 +23,11 @@ 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_gnome_file_sharing.schemas.in.h:2
+#: ../desktop_matefile_sharing.schemas.in.h:2
 msgid "Share Public directory"
 msgstr "Ndaj skedarin Public me të tjerë"
 
-#: ../desktop_gnome_file_sharing.schemas.in.h:3
+#: ../desktop_matefile_sharing.schemas.in.h:3
 msgid ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
@@ -35,7 +35,7 @@ msgstr ""
 "Kur duhet kërkuar fjalëkalimi. Vlerat e mundëshme janë \"never\", \"on_write\", "
 "dhe \"always\"."
 
-#: ../desktop_gnome_file_sharing.schemas.in.h:4
+#: ../desktop_matefile_sharing.schemas.in.h:4
 msgid "When to require passwords"
 msgstr "Kur kërkon fjalëkalime"
 
diff --git a/po/sr.po b/po/sr.po
index 1c01c51..d92bbae 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,7 +1,7 @@
-# Serbian translation of nautilus
+# Serbian translation of caja
 # Courtesy of Prevod.org team (http://prevod.org/) -- 2009.
 #
-# This file is distributed under the same license as the gnome-user-share package.
+# This file is distributed under the same license as the mateuser-share package.
 #
 # Maintainer: Горан Ракић <[email protected]>
 # Previous translators:
@@ -9,8 +9,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"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"
@@ -22,7 +22,7 @@ msgstr ""
 "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_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -30,7 +30,7 @@ msgstr ""
 "Блутут уређаји могу послати даотеке у корисничку фасциклу „Преузето“ када је "
 "корисник пријављен."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -38,7 +38,7 @@ msgstr ""
 "Фасцикла „Јавно“ у корисничкој фасцикли је дељена преко блутут везе када је "
 "корисник пријављен."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -46,19 +46,19 @@ msgstr ""
 "Фасцикла „Јавно“ у корисничкој фасцкили је дељена преко мреже када је "
 "корисник пријављен."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "Дели фасциклу „Јавно“ преко блутут везе"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "Дели фасциклу „Јавно“ преко мреже"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../data/desktop_matefile_sharing.schemas.in.h:6
 msgid "When to accept files sent over Bluetooth"
 msgstr "Дозвољено прихватање датотека са блутут везе"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:7
+#: ../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\"."
@@ -69,7 +69,7 @@ msgstr ""
 "Одређује када је дозвољено прихватање датотека са блутут везе. Могуће "
 "вредности су „always“ (увек), „bonded“ (упарени) и „ask“ (питај)."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../data/desktop_matefile_sharing.schemas.in.h:8
 msgid ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
@@ -77,19 +77,19 @@ msgstr ""
 "Одређује када је захтеван унос лозинке. Могуће вредности су "
 "„never“ (никада), „on_write“ (при упису) и „always“ (увек)."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "Захтеван унос лозинке"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../data/desktop_matefile_sharing.schemas.in.h:10
 msgid "Whether Bluetooth clients can send files using ObexPush."
 msgstr "Блутут клијенти могу послати датотеке кроз „ObexPush“"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:11
+#: ../data/desktop_matefile_sharing.schemas.in.h:11
 msgid "Whether Bluetooth clients need to pair with the computer to send files."
 msgstr "Блутут клијенти морају бити упарени са рачунаром за слање датотека."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:12
+#: ../data/desktop_matefile_sharing.schemas.in.h:12
 msgid ""
 "Whether to allow Bluetooth clients to write files, or share the files read-"
 "only."
@@ -97,11 +97,11 @@ msgstr ""
 "Одређује да ли блутут клијенти могу да уписују датотеке или се датотеке деле "
 "само као неуписиве."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:13
+#: ../data/desktop_matefile_sharing.schemas.in.h:13
 msgid "Whether to allow Bluetooth clients to write files."
 msgstr "Блутут клијенти могу да уписују датотеке."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:14
+#: ../data/desktop_matefile_sharing.schemas.in.h:14
 msgid "Whether to notify about newly received files."
 msgstr "Обавести о новим примљеним датотекама."
 
@@ -157,24 +157,24 @@ msgstr "_Неопходна лозинка:"
 msgid "_Share public files on network"
 msgstr "Дели јавне датотеке преко _мреже"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "Дељење личних датотека"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Поставке за дељење датотека"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Покреће дељење личних датотека ако је омогућено"
 
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "Покрени поставке"
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 #| msgid "Personal File Sharing Preferences"
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Покреће поставке за дељење личних датотека"
diff --git a/po/[email protected] b/po/[email protected]
index f66bc32..3937fbe 100644
--- a/po/[email protected]
+++ b/po/[email protected]
@@ -1,7 +1,7 @@
-# Serbian translation of nautilus
+# Serbian translation of caja
 # Courtesy of Prevod.org team (http://prevod.org/) -- 2009.
 #
-# This file is distributed under the same license as the gnome-user-share package.
+# This file is distributed under the same license as the mateuser-share package.
 #
 # Maintainer: Goran Rakić <[email protected]>
 # Previous translators:
@@ -9,8 +9,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"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"
@@ -22,7 +22,7 @@ msgstr ""
 "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_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -30,7 +30,7 @@ msgstr ""
 "Blutut uređaji mogu poslati daoteke u korisničku fasciklu „Preuzeto“ kada je "
 "korisnik prijavljen."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -38,7 +38,7 @@ msgstr ""
 "Fascikla „Javno“ u korisničkoj fascikli je deljena preko blutut veze kada je "
 "korisnik prijavljen."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -46,19 +46,19 @@ msgstr ""
 "Fascikla „Javno“ u korisničkoj fasckili je deljena preko mreže kada je "
 "korisnik prijavljen."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "Deli fasciklu „Javno“ preko blutut veze"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "Deli fasciklu „Javno“ preko mreže"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../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_gnome_file_sharing.schemas.in.h:7
+#: ../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\"."
@@ -69,7 +69,7 @@ msgstr ""
 "Određuje kada je dozvoljeno prihvatanje datoteka sa blutut veze. Moguće "
 "vrednosti su „always“ (uvek), „bonded“ (upareni) i „ask“ (pitaj)."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../data/desktop_matefile_sharing.schemas.in.h:8
 msgid ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
@@ -77,19 +77,19 @@ msgstr ""
 "Određuje kada je zahtevan unos lozinke. Moguće vrednosti su "
 "„never“ (nikada), „on_write“ (pri upisu) i „always“ (uvek)."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "Zahtevan unos lozinke"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../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_gnome_file_sharing.schemas.in.h:11
+#: ../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_gnome_file_sharing.schemas.in.h:12
+#: ../data/desktop_matefile_sharing.schemas.in.h:12
 msgid ""
 "Whether to allow Bluetooth clients to write files, or share the files read-"
 "only."
@@ -97,11 +97,11 @@ msgstr ""
 "Određuje da li blutut klijenti mogu da upisuju datoteke ili se datoteke dele "
 "samo kao neupisive."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:13
+#: ../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_gnome_file_sharing.schemas.in.h:14
+#: ../data/desktop_matefile_sharing.schemas.in.h:14
 msgid "Whether to notify about newly received files."
 msgstr "Obavesti o novim primljenim datotekama."
 
@@ -157,24 +157,24 @@ msgstr "_Neophodna lozinka:"
 msgid "_Share public files on network"
 msgstr "Deli javne datoteke preko _mreže"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "Deljenje ličnih datoteka"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Postavke za deljenje datoteka"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Pokreće deljenje ličnih datoteka ako je omogućeno"
 
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "Pokreni postavke"
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 #| msgid "Personal File Sharing Preferences"
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Pokreće postavke za deljenje ličnih datoteka"
diff --git a/po/sv.po b/po/sv.po
index de02fce..5f49657 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,11 +1,11 @@
-# Swedish messages for gnome-user-share.
+# 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.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share\n"
+"Project-Id-Version: mateuser-share\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"
@@ -15,59 +15,59 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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_gnome_file_sharing.schemas.in.h:2
+#: ../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_gnome_file_sharing.schemas.in.h:3
+#: ../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_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "Dela ut publik katalog över Bluetooth"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../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_gnome_file_sharing.schemas.in.h:6
+#: ../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_gnome_file_sharing.schemas.in.h:7
+#: ../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_gnome_file_sharing.schemas.in.h:8
+#: ../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_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "När lösenord ska krävas"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../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_gnome_file_sharing.schemas.in.h:11
+#: ../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_gnome_file_sharing.schemas.in.h:12
+#: ../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_gnome_file_sharing.schemas.in.h:13
+#: ../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_gnome_file_sharing.schemas.in.h:14
+#: ../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."
 
@@ -123,25 +123,25 @@ msgstr "_Kräv lösenord:"
 msgid "_Share public files on network"
 msgstr "_Dela ut publika filer på nätverket"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2
-#: ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2
+#: ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "Utdelning av personliga filer"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Inställningar för utdelning av filer"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Starta personlig filutdelning om aktiverat"
 
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "Starta inställningar"
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Starta Inställningar för personlig filutdelning"
 
@@ -196,7 +196,7 @@ 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.gnome.org/show_bug.cgi?id=163652
+# 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
@@ -214,7 +214,7 @@ 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.gnome.org/show_bug.cgi?id=163652
+# 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.
diff --git a/po/ta.po b/po/ta.po
index 96018c7..ff75b5b 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -1,5 +1,5 @@
-# translation of gnome-user-share.HEAD.po to Tamil
-# translation of gnome-user-share.HEAD.po to
+# translation of mateuser-share.HEAD.po to Tamil
+# translation of mateuser-share.HEAD.po to
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
@@ -7,7 +7,7 @@
 # Dr.T.Vasudevan <[email protected]>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share.HEAD\n"
+"Project-Id-Version: mateuser-share.HEAD\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"
@@ -19,7 +19,7 @@ msgstr ""
 "X-Generator: Lokalize 0.3\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -27,7 +27,7 @@ msgstr ""
 "இது உண்மை எனில் உள்நுழையும் போது ப்ளூடூத் சாதனங்கள்  பயனர்  தரவிறக்கங்கள் அடைவுக்கு "
 "கோப்புகளை அனுப்ப இயலும்"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -35,7 +35,7 @@ msgstr ""
 "இது உண்மை எனில் பயனர்  உள்நுழைந்துள்ள போது   பயனரின்  இல்ல அடைவில் உள்ள பொதுவான அடைவு "
 "ப்ளூடூத் சாதனங்கள்  மூலம் பகிரப்படும்"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -43,19 +43,19 @@ msgstr ""
 "இது உண்மை எனில் பயனர்  உள்நுழைந்துள்ள போது   பயனரின்  இல்ல அடைவில் உள்ள பொதுவான அடைவு "
 "வலைபின்னல்  மூலம் பகிரப்படும்"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "பொது அடைவை ப்ளூடூத் மூலம் பகிர்க"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "பொது அடைவை வலைப்பின்னல் மூலம் பகிர்க"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../data/desktop_matefile_sharing.schemas.in.h:6
 msgid "When to accept files sent over Bluetooth"
 msgstr "எப்போது கோப்புக்களை ப்ளூடூத் மூலம் பகிர்வது"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:7
+#: ../data/desktop_matefile_sharing.schemas.in.h:7
 msgid ""
 "When to accept files sent over Bluetooth. Possible values are \"always\", "
 "\"bonded\" and \"ask\"."
@@ -63,7 +63,7 @@ msgstr ""
 "எப்போது கோப்புக்களை ப்ளூடூத் மூலம் பகிர்வது. செல்லுபடியாகும் மதிப்புகள்  \"எப்போதும்\", "
 "\"பிணையப்பட்ட\", மற்றும் \"கேள்\"."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../data/desktop_matefile_sharing.schemas.in.h:8
 msgid ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
@@ -71,29 +71,29 @@ msgstr ""
 "எப்போது கடவுச்சொல் கேட்க வேண்டும். செல்லுபடியாகும் மதிப்புகள்   \"எப்போதுமில்லை\", "
 "\"எழுதும்போது\", மற்றும் \"எப்போதும்\"."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "எப்போது கடவுச்சொல் தேவை"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../data/desktop_matefile_sharing.schemas.in.h:10
 msgid "Whether Bluetooth clients can send files using ObexPush."
 msgstr "ப்ளூடூத் சார்ந்தோன்கள் கோப்புகளை ஒபெக்ஸ் புஷ் மூலம் அனுப்பலாமா"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:11
+#: ../data/desktop_matefile_sharing.schemas.in.h:11
 msgid "Whether Bluetooth clients need to pair with the computer to send files."
 msgstr "ப்ளூடூத் சார்ந்தோன்கள் கோப்புகளை அனுப்ப கணினியுடன் சேர வேண்டுமா"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:12
+#: ../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_gnome_file_sharing.schemas.in.h:13
+#: ../data/desktop_matefile_sharing.schemas.in.h:13
 msgid "Whether to allow Bluetooth clients to write files."
 msgstr "ப்ளூடூத் சார்ந்தோன்கள் கோப்புகளை எழுத அனுமதிக்கலாமா."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:14
+#: ../data/desktop_matefile_sharing.schemas.in.h:14
 msgid "Whether to notify about newly received files."
 msgstr "புதிதாக பெற்ற கோப்புக்களை பற்றி அறிவிக்கவா"
 
@@ -149,24 +149,24 @@ msgstr "(_R) கடவுச்சொல் தேவை:"
 msgid "_Share public files on network"
 msgstr "(_S) கோப்புகளை வலைப்பின்னல் மூலம் பகிர்க"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:167
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:167
 msgid "Personal File Sharing"
 msgstr "அந்தரங்க கோப்பு பகிர்தல்"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "கோப்புகள் பகிர்வதில் விருப்பங்கள் "
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "செயல் படுத்தி இருந்தால் அந்தரங்க கோப்பு பகிர்தலை  ஆரம்பி "
 
-#: ../src/nautilus-share-bar.c:179
+#: ../src/caja-share-bar.c:179
 msgid "Launch Preferences"
 msgstr "விருப்பங்களை ஆரம்பி"
 
-#: ../src/nautilus-share-bar.c:193
+#: ../src/caja-share-bar.c:193
 msgid "Launch Personal File Sharing Preferences"
 msgstr "தனிப்பட்ட கோப்பு பகிர்தல் விருப்பங்களை ஆரம்பி"
 
diff --git a/po/te.po b/po/te.po
index 06325e8..132ed20 100644
--- a/po/te.po
+++ b/po/te.po
@@ -1,12 +1,12 @@
-# translation of gnome-user-share.master.te.po to Telugu
+# translation of mateuser-share.master.te.po to Telugu
 # 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.
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share.master.te\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-user-share&component=general\n"
+"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"
@@ -19,13 +19,13 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -33,7 +33,7 @@ msgstr ""
 "నిజమైతే, వినియోగదారి లాగినైవున్నప్పుడు బ్లూటూత్ ద్వారా వినియోగదారి డైరెక్టరీనందలి పబ్లిక్ డైరెక్టరీ "
 "పంచుకొనబడుతుంది."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -41,19 +41,19 @@ msgstr ""
 "నిజమైతే, వినియోగదారి లాగినైవున్నప్పుడు నెట్వర్కు ద్వారా వినియోగదారి డైరెక్టరీనందలి పబ్లిక్ డైరెక్టరీ "
 "పంచుకొనబడుతుంది."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "బ్లూటూత్ ద్వారా పబ్లిక్ డైరెక్టరీను పంచుకొనుము"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "పబ్లిక్ డైరెక్టరీను నెట్వర్కునందు పంచుకొనుము"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../data/desktop_matefile_sharing.schemas.in.h:6
 msgid "When to accept files sent over Bluetooth"
 msgstr "బ్లూటూత్ ద్వారా పంపిన దస్త్రములను యెప్పుడు ఆమోదించాలి"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:7
+#: ../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\"."
@@ -61,7 +61,7 @@ msgstr ""
 "బ్లూటూత్ ద్వారా పంపిన దస్త్రములు యెప్పుడు ఆమోదించాలి. సాధ్యమగు విలువలు \"always\", \"bonded"
 "\", \"bonded_trusted\" మరియు \"ask\"."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../data/desktop_matefile_sharing.schemas.in.h:8
 msgid ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
@@ -69,19 +69,19 @@ msgstr ""
 "సంకేతపదముల కొరకు యెప్పుడు అడగాలి. సాధ్యమగు విలువలు \"never\", \"on_write\", మరియు "
 "\"always\"."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "సంకేతపదములు యెప్పుడు అవసరము"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../data/desktop_matefile_sharing.schemas.in.h:10
 msgid "Whether Bluetooth clients can send files using ObexPush."
 msgstr "బ్లూటూత్ కక్షిదారులు దస్త్రములను ObexPush వుపయోగించి పంపించగలగాలా."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:11
+#: ../data/desktop_matefile_sharing.schemas.in.h:11
 msgid "Whether Bluetooth clients need to pair with the computer to send files."
 msgstr "దస్త్రములను పంపుటకు బ్లూటూత్ కక్షిదారులు కంప్యూటర్‌తో జత ఏర్పరుచుకోవాలా."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:12
+#: ../data/desktop_matefile_sharing.schemas.in.h:12
 msgid ""
 "Whether to allow Bluetooth clients to write files, or share the files read-"
 "only."
@@ -89,11 +89,11 @@ msgstr ""
 "బ్లూటూత్ కక్షిదారులను దస్త్రములను వ్రాయుటకు అనుమతించాలా, లేక చదువుటకు-మాత్రమే దస్త్రములను "
 "పంచుకొనవలెనా."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:13
+#: ../data/desktop_matefile_sharing.schemas.in.h:13
 msgid "Whether to allow Bluetooth clients to write files."
 msgstr "బ్లూటూత్ కక్షిదారులను దస్త్రములను వ్రాయుటకు అనుమతించాలా."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:14
+#: ../data/desktop_matefile_sharing.schemas.in.h:14
 msgid "Whether to notify about newly received files."
 msgstr "కొత్తగా స్వీకరించిన దస్త్రముల గురించి తెలియజెప్పవలెనా."
 
@@ -150,17 +150,17 @@ msgstr "సంకేతపదము అవసరము (_R):"
 msgid "_Share public files on network"
 msgstr "నెట్వర్కునందు పబ్లిక్ దస్త్రములను పంచుకొనుము (_S)"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2
 msgid "Personal File Sharing"
 msgstr "వ్యక్తిగత దస్త్ర భాగస్వామ్యం"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 #| msgid "Preferences for sharing of personal files"
 msgid "Preferences for sharing of files"
 msgstr "ఫైళ్ళను భాగస్వామ్యపరచుటకు అభీష్టాలు"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 #| msgid "Launch User Sharing if enabled"
 msgid "Launch Personal File Sharing if enabled"
 msgstr "చేతనపరిస్తే వ్యక్తిగత ఫైళ్ళ భాగస్వామ్యమును ఆరంభిస్తుంది"
diff --git a/po/th.po b/po/th.po
index 19a0eba..f753b2f 100644
--- a/po/th.po
+++ b/po/th.po
@@ -1,12 +1,12 @@
-# Thai translation of gnome-user-share.
+# Thai translation of mateuser-share.
 # Copyright (C) 2009-2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gnome-user-share package.
+# This file is distributed under the same license as the mateuser-share package.
 # Manatsawin <[email protected]>, 2009.
 # Theppitak Karoonboonyanan <[email protected]>, 2009-2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"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"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -25,7 +25,7 @@ msgstr ""
 "หากเป็นจริง อุปกรณ์บลูทูทจะสามารถส่งแฟ้มไปยังไดเรกทอรี \"ดาวน์โหลด\" "
 "ของผู้ใช้ได้เมื่อเข้าสู่ระบบแล้ว"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -33,7 +33,7 @@ msgstr ""
 "หากเป็นจริง ไดเรกทอรี \"Public\" "
 "ในไดเรกทอรีบ้านของผู้ใช้จะถูกเปิดให้ใช้ร่วมทางบลูทูทเมื่อผู้ใช้เข้าสู่ระบบ"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -41,19 +41,19 @@ msgstr ""
 "หากเป็นจริง ไดเรกทอรี \"Public\" "
 "ในไดเรกทอรีบ้านของผู้ใช้จะถูกเปิดให้ใช้ร่วมในเครือข่ายเมื่อผู้ใช้เข้าสู่ระบบ"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "เปิดไดเรกทอรี \"Public\" ให้ใช้ร่วมทางบลูทูท"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "เปิดไดเรกทอรี \"Public\" ให้ใช้ร่วมในเครือข่าย"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../data/desktop_matefile_sharing.schemas.in.h:6
 msgid "When to accept files sent over Bluetooth"
 msgstr "จะรับแฟ้มที่ส่งทางบลูทูทเมื่อใด"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:7
+#: ../data/desktop_matefile_sharing.schemas.in.h:7
 msgid ""
 "When to accept files sent over Bluetooth. Possible values are \"always\", "
 "\"bonded\" and \"ask\"."
@@ -61,7 +61,7 @@ msgstr ""
 "จะรับแฟ้มที่ส่งทางบลูทูทเมื่อใด ค่าที่เป็นไปได้คือ \"always\" (รับเสมอ), \"bonded"
 "\" (เฉพาะจากอุปกรณ์ที่จับคู่ไว้) และ \"ask\" (ถามก่อนรับ)"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../data/desktop_matefile_sharing.schemas.in.h:8
 msgid ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
@@ -69,29 +69,29 @@ msgstr ""
 "จะถามรหัสผ่านเมื่อใด ค่าที่เป็นไปได้คือ \"never\" (ไม่ถาม), \"on_write\" (เมื่อจะเขียน) "
 "และ \"always\" (ถามเสมอ)"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "ถามรหัสผ่านเมื่อใด"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../data/desktop_matefile_sharing.schemas.in.h:10
 msgid "Whether Bluetooth clients can send files using ObexPush."
 msgstr "ลูกข่ายบลูทูทสามารถส่งแฟ้มโดยใช้ ObexPush ได้หรือไม่"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:11
+#: ../data/desktop_matefile_sharing.schemas.in.h:11
 msgid "Whether Bluetooth clients need to pair with the computer to send files."
 msgstr "ลูกข่ายบลูทูทต้องจับคู่กับคอมพิวเตอร์ก่อนจะส่งแฟ้มหรือไม่"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:12
+#: ../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_gnome_file_sharing.schemas.in.h:13
+#: ../data/desktop_matefile_sharing.schemas.in.h:13
 msgid "Whether to allow Bluetooth clients to write files."
 msgstr "อนุญาตให้ลูกข่ายบลูทูทเขียนแฟ้มหรือไม่"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:14
+#: ../data/desktop_matefile_sharing.schemas.in.h:14
 msgid "Whether to notify about newly received files."
 msgstr "ต้องการให้แจ้งเตือนเมื่อได้รับแฟ้มหรือไม่"
 
@@ -147,24 +147,24 @@ msgstr "_ต้องการรหัสผ่าน:"
 msgid "_Share public files on network"
 msgstr "แ_บ่งปันแฟ้มสาธารณะในเครือข่าย"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "แบ่งปันแฟ้มส่วนตัว"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "ปรับแต่งค่าการแบ่งปันแฟ้ม"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "เรียกใช้การแบ่งปันแฟ้มส่วนตัวหากถูกเปิดใช้"
 
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "เรียกเครื่องมือปรับแต่ง"
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 msgid "Launch Personal File Sharing Preferences"
 msgstr "เรียกเครื่องมือปรับแต่งการแบ่งปันแฟ้มส่วนตัว"
 
diff --git a/po/tr.po b/po/tr.po
index d70edc4..4dc2709 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,23 +1,23 @@
-# translation of gnome-user-share to Turkish
+# translation of mateuser-share to Turkish
 # Copyright (C) 2007
-# This file is distributed under the same license as the gnome-user-share package.
+# This file is distributed under the same license as the mateuser-share package.
 #
 # Baris Cicek <[email protected]>, 2007.
 # Baris Cicek <[email protected]>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share\n"
+"Project-Id-Version: mateuser-share\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 <[email protected]>\n"
+"Language-Team: Turkish <mateturk@mateorg>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=1; plural=0;\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -25,7 +25,7 @@ msgstr ""
 "Eğer bu true ise, Bluetooth aygıtları kullanıcının İndirilenler dizinine "
 "giriş yaptığında dosya gönderebilecekler."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -33,7 +33,7 @@ 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_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -41,19 +41,19 @@ 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_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "Bluetooth Üzerinden Genel Dizinini Paylaştır"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../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_gnome_file_sharing.schemas.in.h:6
+#: ../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_gnome_file_sharing.schemas.in.h:7
+#: ../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\"."
@@ -61,7 +61,7 @@ msgstr ""
 "Bluetooth üzerinden gönderilen dosyaların ne zaman kabul edileceği. Geçerli "
 "değerler \"always\" , \"bonded\", \"bonded_trusted\" ve \"ask\"."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../data/desktop_matefile_sharing.schemas.in.h:8
 msgid ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
@@ -69,21 +69,21 @@ msgstr ""
 "Parola sor seçildiğinde. Geçerli değerler \"never\" (asla), \"on_write"
 "\" (yazıldığında), ve \"always\" (her zaman)."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "Ne zaman parola gerektiği"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../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_gnome_file_sharing.schemas.in.h:11
+#: ../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_gnome_file_sharing.schemas.in.h:12
+#: ../data/desktop_matefile_sharing.schemas.in.h:12
 msgid ""
 "Whether to allow Bluetooth clients to write files, or share the files read-"
 "only."
@@ -91,11 +91,11 @@ msgstr ""
 "Bluetooth istemcilerinin dosyalara yazabilmeleri ya da dosyaları salt-okunur "
 "olarak paylaşmaları."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:13
+#: ../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_gnome_file_sharing.schemas.in.h:14
+#: ../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ı."
 
@@ -151,16 +151,16 @@ msgstr "_Parola gerektir:"
 msgid "_Share public files on network"
 msgstr "Genel dosyaları _ağ üzerinden paylaştır"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2
 msgid "Personal File Sharing"
 msgstr "Kişisel Dosya Paylaşımı"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Dosyaların paylaşımı için tercihler"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Eğer etkinse Kişisel Kullanıcı Paylaşımını başlat"
 
diff --git a/po/ug.po b/po/ug.po
index 819418b..5c463f5 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -1,12 +1,12 @@
-# Uighur translation for gnome-user-share
+# Uighur translation for mateuser-share
 # Copyright (C) 2005,2007-2009 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gnome-user-share package.
+# This file is distributed under the same license as the mateuser-share package.
 # Gheyret Kenji <[email protected]>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-user-share&component=general\n"
+"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"
@@ -15,73 +15,73 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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_gnome_file_sharing.schemas.in.h:2
+#: ../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_gnome_file_sharing.schemas.in.h:3
+#: ../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_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "Public مۇندەرىجىسىنى Bluetooth ئۈسكۈنىسى ئارقىلىق ھەمبەھىر قىلىش"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "Public مۇندەرىجىسىنى تور ئارقىلىق ھەمبەھىر قىلىش"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../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_gnome_file_sharing.schemas.in.h:7
+#: ../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_gnome_file_sharing.schemas.in.h:8
+#: ../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_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "ئىم تەلەپ قىلىدىغان ۋاقىت"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../data/desktop_matefile_sharing.schemas.in.h:10
 msgid "Whether Bluetooth clients can send files using ObexPush."
 msgstr "Bluetooth client پروگراممىلىرى ObexPush نى ئىشلىتىپ ھۆججەت ئەۋەتەلەمدۇ يوق."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:11
+#: ../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_gnome_file_sharing.schemas.in.h:12
+#: ../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_gnome_file_sharing.schemas.in.h:13
+#: ../data/desktop_matefile_sharing.schemas.in.h:13
 msgid "Whether to allow Bluetooth clients to write files."
 msgstr "Bluetooth client پروگراممىلىرى ھۆججەتكە يازالامدۇ يوق."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:14
+#: ../data/desktop_matefile_sharing.schemas.in.h:14
 msgid "Whether to notify about newly received files."
 msgstr "يېڭى ھۆججەت قوبۇل قىلغاندا ئۇقتۇرۇش قىلامدۇ يوق."
 
@@ -137,24 +137,24 @@ msgstr "ئىم تەلەپ قىلىش(_R):"
 msgid "_Share public files on network"
 msgstr "توردا ئاممىۋى ھۆججەتلەرنى ھەمبەھىر قىل(_S)"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "خۇسۇسىي ھۆججەت ھەمبەھىرى"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "خۇسۇسىي ھۆججەت ھەمبەھىرىنىڭ تەڭشىكى"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "خۇسۇسىي ھۆججەت ھەمبەھىرى ئىناۋەتلىك بولسا ئىجرا قىلىش"
 
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "تەڭشەكنى ئىجرا قىلىش"
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 msgid "Launch Personal File Sharing Preferences"
 msgstr "خۇسۇسىي ھۆججەت ھەمبەھىرىنىڭ تەڭشىكىنى ئىجرا قىلىش"
 
diff --git a/po/uk.po b/po/uk.po
index aeff55d..f57664a 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,12 +1,12 @@
-# Ukrainian translation of gnome-user-share 
+# Ukrainian translation of mateuser-share 
 # Copyright (C) 2005 Free Software Foundation 
-# This file is distributed under the same license as the gnome-sharing package. 
+# This file is distributed under the same license as the matesharing package. 
 # Maxim Dziumanenko <[email protected]>, 2005-2010
 #
 # wanderlust <[email protected]>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share\n"
+"Project-Id-Version: mateuser-share\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-01-05 12:58+0200\n"
 "PO-Revision-Date: 2010-01-05 10:29+0300\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -24,7 +24,7 @@ msgstr ""
 "Якщо відмічено, пристрої Bluetooth можуть надсилати файли у каталог "
 "Downloads користувача після його входу у систему."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -32,7 +32,7 @@ msgstr ""
 "Якщо встановлено, файли у каталозі Public користувача стануть доступні через "
 "Bluetooth, коли користувач увійде до системи."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -40,19 +40,19 @@ msgstr ""
 "Якщо відмічено, файли у каталозі Public користувача стануть доступні у "
 "мережі, коли він увійде у систему."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "Зробити файли у каталозі Public спільними для доступу через Bluetooth"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "Зробити файли у каталозі Public спільними для доступу з мережі"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../data/desktop_matefile_sharing.schemas.in.h:6
 msgid "When to accept files sent over Bluetooth"
 msgstr "Дії при отриманні файлів, надісланих через Bluetooth"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:7
+#: ../data/desktop_matefile_sharing.schemas.in.h:7
 msgid ""
 "When to accept files sent over Bluetooth. Possible values are \"always\", "
 "\"bonded\" and \"ask\"."
@@ -60,27 +60,27 @@ msgstr ""
 "Дії при отриманні файлів через Bluetooth. Можливі значення: «always», "
 "«bonded», та «ask»."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../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_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "Коли вимагати пароль"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../data/desktop_matefile_sharing.schemas.in.h:10
 msgid "Whether Bluetooth clients can send files using ObexPush."
 msgstr "Дозволити клієнтам Bluetooth надсилати файли за допомогою ObexPush."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:11
+#: ../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_gnome_file_sharing.schemas.in.h:12
+#: ../data/desktop_matefile_sharing.schemas.in.h:12
 msgid ""
 "Whether to allow Bluetooth clients to write files, or share the files read-"
 "only."
@@ -88,11 +88,11 @@ msgstr ""
 "Чи будуть клієнти Bluetooth записувати файли та файли будуть доступні лише "
 "для читання."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:13
+#: ../data/desktop_matefile_sharing.schemas.in.h:13
 msgid "Whether to allow Bluetooth clients to write files."
 msgstr "Дозволити клієнтам Bluetooth записувати файли."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:14
+#: ../data/desktop_matefile_sharing.schemas.in.h:14
 msgid "Whether to notify about newly received files."
 msgstr "Повідомляти про отримувані файли"
 
@@ -148,24 +148,24 @@ msgstr "П_отрібен пароль:"
 msgid "_Share public files on network"
 msgstr "Від_крити доступ до файлів з мережі"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "Спільний доступ до особистих файлів"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "Параметри спільного доступу до файлів"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "Увімкнути спільний доступ, якщо можливо"
 
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "Відкрити параметри"
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 msgid "Launch Personal File Sharing Preferences"
 msgstr "Параметри спільного доступу до особистих файлів"
 
diff --git a/po/vi.po b/po/vi.po
index f823bf6..af4330e 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share TRUNK\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"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"
@@ -17,7 +17,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.8\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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."
@@ -27,7 +27,7 @@ msgid ""
 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_gnome_file_sharing.schemas.in.h:2
+#: ../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."
@@ -38,7 +38,7 @@ 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_gnome_file_sharing.schemas.in.h:3
+#: ../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."
@@ -49,21 +49,21 @@ 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_gnome_file_sharing.schemas.in.h:4
+#: ../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_gnome_file_sharing.schemas.in.h:5
+#: ../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_gnome_file_sharing.schemas.in.h:6
+#: ../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_gnome_file_sharing.schemas.in.h:7
+#: ../data/desktop_matefile_sharing.schemas.in.h:7
 #| msgid ""
 #| "When to ask for passwords. Possible values are \"never\", \"on_write\", "
 #| "and \"always\"."
@@ -77,7 +77,7 @@ msgstr ""
 " • bonded trusted	được cam kết và tin cậy\n"
 " • ask		hỏi."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../data/desktop_matefile_sharing.schemas.in.h:8
 msgid ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
@@ -87,29 +87,29 @@ msgstr ""
 " • on_write	khi ghi\n"
 " • always		lúc nào cũng làm."
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:9
+#: ../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_gnome_file_sharing.schemas.in.h:10
+#: ../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_gnome_file_sharing.schemas.in.h:11
+#: ../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_gnome_file_sharing.schemas.in.h:12
+#: ../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_gnome_file_sharing.schemas.in.h:13
+#: ../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_gnome_file_sharing.schemas.in.h:14
+#: ../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."
 
@@ -173,19 +173,19 @@ msgstr "Chia _sẻ tập tin công trên mạng"
 msgid "gtk-help"
 msgstr "gtk-help"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
+#: ../data/mateuser-share-properties.desktop.in.h:1
 msgid "Personal File Sharing"
 msgstr "Chia sẻ Tập tin Cá nhân"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../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/gnome-user-share.desktop.in.in.h:1
+#: ../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"
 
-#: ../data/gnome-user-share.desktop.in.in.h:2
+#: ../data/mateuser-share.desktop.in.in.h:2
 #| msgid "Personal File Sharing"
 msgid "User Sharing"
 msgstr "Chia sẻ Người dùng"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 732ff7f..c49c50e 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,6 +1,6 @@
-# gnome-user-share的简体中文翻译.
+# mateuser-share的简体中文翻译.
 # Copyright (C) 2009 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gnome-user-share package.
+# 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.
@@ -8,7 +8,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share master\n"
+"Project-Id-Version: mateuser-share master\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"
@@ -18,37 +18,37 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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_gnome_file_sharing.schemas.in.h:2
+#: ../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_gnome_file_sharing.schemas.in.h:3
+#: ../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_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "在蓝牙中共享“公开“目录"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "在网络中共享“公开“目录"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../data/desktop_matefile_sharing.schemas.in.h:6
 msgid "When to accept files sent over Bluetooth"
 msgstr "何时接收通过蓝牙发送的文件"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:7
+#: ../data/desktop_matefile_sharing.schemas.in.h:7
 msgid ""
 "When to accept files sent over Bluetooth. Possible values are \"always\", "
 "\"bonded\" and \"ask\"."
@@ -56,35 +56,35 @@ msgstr ""
 "何时接受通过蓝牙发送的文件，可能的选项"
 "是“always”、“bonded”、“bonded_trusted”和“ask”。"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../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_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "何时请求密码"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../data/desktop_matefile_sharing.schemas.in.h:10
 msgid "Whether Bluetooth clients can send files using ObexPush."
 msgstr "蓝牙客户是否能使用 ObexPus 发送文件。"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:11
+#: ../data/desktop_matefile_sharing.schemas.in.h:11
 msgid "Whether Bluetooth clients need to pair with the computer to send files."
 msgstr "蓝牙客户要发送文件是否需要先和电脑配对。"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:12
+#: ../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_gnome_file_sharing.schemas.in.h:13
+#: ../data/desktop_matefile_sharing.schemas.in.h:13
 msgid "Whether to allow Bluetooth clients to write files."
 msgstr "是否允许蓝牙客户写入文件。"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:14
+#: ../data/desktop_matefile_sharing.schemas.in.h:14
 msgid "Whether to notify about newly received files."
 msgstr "是否通知关于新收到的文件。"
 
@@ -140,24 +140,24 @@ msgstr "要求密码(_R)"
 msgid "_Share public files on network"
 msgstr "在网络中共享公开文件(_S)"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "个人文件共享"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "文件共享选项"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "如果已启用则启动个人文件共享"
 
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "启动首选项"
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 msgid "Launch Personal File Sharing Preferences"
 msgstr "个人文件共享选项"
 
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 11760c1..27c6281 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -1,10 +1,10 @@
-# Chinese (Hong Kong) translation of gnome-user-share.HEAD
+# 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.
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share 2.28.0\n"
+"Project-Id-Version: mateuser-share 2.28.0\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"
@@ -17,73 +17,73 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Virtaal 0.4.0\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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_gnome_file_sharing.schemas.in.h:2
+#: ../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_gnome_file_sharing.schemas.in.h:3
+#: ../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_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "以藍牙分享公用目錄"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "以網絡分享公用目錄"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../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_gnome_file_sharing.schemas.in.h:7
+#: ../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_gnome_file_sharing.schemas.in.h:8
+#: ../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_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "何時需要密碼"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../data/desktop_matefile_sharing.schemas.in.h:10
 msgid "Whether Bluetooth clients can send files using ObexPush."
 msgstr "藍牙客戶端是否可以使用 ObexPush 傳送檔案。"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:11
+#: ../data/desktop_matefile_sharing.schemas.in.h:11
 msgid "Whether Bluetooth clients need to pair with the computer to send files."
 msgstr "藍牙客戶端是否需要與電腦配對才能傳送檔案。"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:12
+#: ../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_gnome_file_sharing.schemas.in.h:13
+#: ../data/desktop_matefile_sharing.schemas.in.h:13
 msgid "Whether to allow Bluetooth clients to write files."
 msgstr "是否允許藍牙客戶端寫入檔案。"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:14
+#: ../data/desktop_matefile_sharing.schemas.in.h:14
 msgid "Whether to notify about newly received files."
 msgstr "是否通知有最新接收到的檔案。"
 
@@ -139,24 +139,24 @@ msgstr "需要密碼(_R):"
 msgid "_Share public files on network"
 msgstr "以網絡分享公用檔案(_S)"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "個人檔案分享"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "用於分享個人檔案的偏好設定"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "若啟用則執行個人檔案分享"
 
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "執行偏好設定"
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 msgid "Launch Personal File Sharing Preferences"
 msgstr "執行個人檔案分享偏好設定"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index ae91d49..211a43e 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,10 +1,10 @@
-# Traditional Chinese translation of gnome-user-share.HEAD
+# 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.
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share 2.28.0\n"
+"Project-Id-Version: mateuser-share 2.28.0\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"
@@ -17,41 +17,41 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Virtaal 0.4.0\n"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:1
+#: ../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_gnome_file_sharing.schemas.in.h:2
+#: ../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_gnome_file_sharing.schemas.in.h:3
+#: ../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_gnome_file_sharing.schemas.in.h:4
+#: ../data/desktop_matefile_sharing.schemas.in.h:4
 msgid "Share Public directory over Bluetooth"
 msgstr "以藍牙分享公用目錄"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:5
+#: ../data/desktop_matefile_sharing.schemas.in.h:5
 msgid "Share Public directory over the network"
 msgstr "以網路分享公用目錄"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:6
+#: ../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_gnome_file_sharing.schemas.in.h:7
+#: ../data/desktop_matefile_sharing.schemas.in.h:7
 msgid ""
 "When to accept files sent over Bluetooth. Possible values are \"always\", "
 "\"bonded\" and \"ask\"."
@@ -60,7 +60,7 @@ msgstr ""
 "對)、「bonded_trusted」(已配對且信任)和「ask」(詢問)。"
 
 # (pofilter) gconf: do not translate gconf attribute: "never", "on_write", "always"
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:8
+#: ../data/desktop_matefile_sharing.schemas.in.h:8
 msgid ""
 "When to ask for passwords. Possible values are \"never\", \"on_write\", and "
 "\"always\"."
@@ -68,29 +68,29 @@ msgstr ""
 "何時會詢問密碼。可能的數值是「never」(永不)、「on_write」(寫入時)和「always」"
 "(永遠)。"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:9
+#: ../data/desktop_matefile_sharing.schemas.in.h:9
 msgid "When to require passwords"
 msgstr "何時需要密碼"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:10
+#: ../data/desktop_matefile_sharing.schemas.in.h:10
 msgid "Whether Bluetooth clients can send files using ObexPush."
 msgstr "藍牙客戶端是否可以使用 ObexPush 傳送檔案。"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:11
+#: ../data/desktop_matefile_sharing.schemas.in.h:11
 msgid "Whether Bluetooth clients need to pair with the computer to send files."
 msgstr "藍牙客戶端是否需要與電腦配對才能傳送檔案。"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:12
+#: ../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_gnome_file_sharing.schemas.in.h:13
+#: ../data/desktop_matefile_sharing.schemas.in.h:13
 msgid "Whether to allow Bluetooth clients to write files."
 msgstr "是否允許藍牙客戶端寫入檔案。"
 
-#: ../data/desktop_gnome_file_sharing.schemas.in.h:14
+#: ../data/desktop_matefile_sharing.schemas.in.h:14
 msgid "Whether to notify about newly received files."
 msgstr "是否通知有最新接收到的檔案。"
 
@@ -146,24 +146,24 @@ msgstr "需要密碼(_R):"
 msgid "_Share public files on network"
 msgstr "以網路分享公用檔案(_S)"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:2 ../src/nautilus-share-bar.c:162
+#: ../data/mateuser-share-properties.desktop.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:2 ../src/caja-share-bar.c:162
 msgid "Personal File Sharing"
 msgstr "個人檔案分享"
 
-#: ../data/gnome-user-share-properties.desktop.in.h:2
+#: ../data/mateuser-share-properties.desktop.in.h:2
 msgid "Preferences for sharing of files"
 msgstr "用於分享個人檔案的偏好設定"
 
-#: ../data/gnome-user-share.desktop.in.in.h:1
+#: ../data/mateuser-share.desktop.in.in.h:1
 msgid "Launch Personal File Sharing if enabled"
 msgstr "若啟用則執行個人檔案分享"
 
-#: ../src/nautilus-share-bar.c:174
+#: ../src/caja-share-bar.c:174
 msgid "Launch Preferences"
 msgstr "執行偏好設定"
 
-#: ../src/nautilus-share-bar.c:187
+#: ../src/caja-share-bar.c:187
 msgid "Launch Personal File Sharing Preferences"
 msgstr "執行個人檔案分享偏好設定"