Merge lp:~dobey/ubuntuone-client/update-4-2 into lp:ubuntuone-client/stable-4-2

[dobey]

[Rodney Dawes]

    Change the notifications language to not use "publish" but share instead.
    Put the version in a file named VERSION to make it easier to read for win/mac.

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'Makefile.am'
--- Makefile.am	2013-02-13 23:15:26 +0000
+++ Makefile.am	2013-03-21 18:31:22 +0000
@@ -138,6 +138,7 @@
 	LICENSE		\
 	LICENSE.OpenSSL	\
 	HACKING		\
+	VERSION	\
 	bin		\
 	contrib		\
 	tests		\
 
=== added file 'VERSION'
--- VERSION	1970-01-01 00:00:00 +0000
+++ VERSION	2013-03-21 18:31:22 +0000
@@ -0,0 +1,1 @@
+4.1.91
 
=== modified file 'configure.ac'
--- configure.ac	2013-02-21 00:01:04 +0000
+++ configure.ac	2013-03-21 18:31:22 +0000
@@ -1,7 +1,8 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.53)
 
-AC_INIT([ubuntuone-client], [4.1.91])
+# We need to omit the trailing newline when catting the VERSION file
+AC_INIT([ubuntuone-client], m4_esyscmd([cat VERSION | tr -d '\012']))
 AC_CONFIG_SRCDIR([config.h.in])
 
 AM_INIT_AUTOMAKE([1.10 foreign tar-ustar])
 
=== modified file 'ubuntuone/status/aggregator.py'
--- ubuntuone/status/aggregator.py	2012-11-15 13:23:43 +0000
+++ ubuntuone/status/aggregator.py	2013-03-21 18:31:22 +0000
@@ -190,7 +190,7 @@
 class FilePublishingStatus(StatusEvent):
     """Files that are made public with a url."""
 
-    MESSAGE_ONE = Q_("A file was just made public at %(new_public_url)s")
+    MESSAGE_ONE = Q_("A share link was just created at %(new_public_url)s")
 
     WEIGHT = 50
 
@@ -203,15 +203,15 @@
         no_of_files = len(events)
         gettext.dngettext(
             GETTEXT_PACKAGE,
-            "%(event_count)d file was just made public.",
-            "%(event_count)d files were just made public.",
+            "%(event_count)d file was just shared.",
+            "%(event_count)d files were just shared.",
             no_of_files) % {'event_count': no_of_files}
 
 
 class FileUnpublishingStatus(StatusEvent):
     """Files that have stopped being published."""
 
-    MESSAGE_ONE = Q_("A file is no longer published")
+    MESSAGE_ONE = Q_("A share link is no longer available")
     WEIGHT = 51
 
     def many(self, events):
@@ -219,8 +219,8 @@
         no_of_files = len(events)
         gettext.dngettext(
             GETTEXT_PACKAGE,
-            "%(event_count)d file is no longer published.",
-            "%(event_count)d files are no longer published.",
+            "%(event_count)d file is no longer shared.",
+            "%(event_count)d files are no longer shared.",
             no_of_files) % {'event_count': no_of_files}