Ubuntu One Client

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

  1. update-4-2
  2. Merge into stable-4-2
Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 1364
Merged at revision: 1364
Proposed branch: lp:~dobey/ubuntuone-client/update-4-2
Merge into: lp:ubuntuone-client/stable-4-2
Diff against target: 72 lines (+10/-7)
4 files modified
Makefile.am (+1/-0)
VERSION (+1/-0)
configure.ac (+2/-1)
ubuntuone/status/aggregator.py (+6/-6)
To merge this branch: bzr merge lp:~dobey/ubuntuone-client/update-4-2
Reviewer Review Type Date Requested Status
Roberto Alsina (community) Approve
Review via email: mp+154785@code.launchpad.net

Commit message

[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.

To post a comment you must log in.
Revision history for this message
Roberto Alsina (ralsina) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile.am'
2--- Makefile.am 2013-02-13 23:15:26 +0000
3+++ Makefile.am 2013-03-21 18:31:22 +0000
4@@ -138,6 +138,7 @@
5 LICENSE \
6 LICENSE.OpenSSL \
7 HACKING \
8+ VERSION \
9 bin \
10 contrib \
11 tests \
12
13=== added file 'VERSION'
14--- VERSION 1970-01-01 00:00:00 +0000
15+++ VERSION 2013-03-21 18:31:22 +0000
16@@ -0,0 +1,1 @@
17+4.1.91
18
19=== modified file 'configure.ac'
20--- configure.ac 2013-02-21 00:01:04 +0000
21+++ configure.ac 2013-03-21 18:31:22 +0000
22@@ -1,7 +1,8 @@
23 dnl Process this file with autoconf to produce a configure script.
24 AC_PREREQ(2.53)
25
26-AC_INIT([ubuntuone-client], [4.1.91])
27+# We need to omit the trailing newline when catting the VERSION file
28+AC_INIT([ubuntuone-client], m4_esyscmd([cat VERSION | tr -d '\012']))
29 AC_CONFIG_SRCDIR([config.h.in])
30
31 AM_INIT_AUTOMAKE([1.10 foreign tar-ustar])
32
33=== modified file 'ubuntuone/status/aggregator.py'
34--- ubuntuone/status/aggregator.py 2012-11-15 13:23:43 +0000
35+++ ubuntuone/status/aggregator.py 2013-03-21 18:31:22 +0000
36@@ -190,7 +190,7 @@
37 class FilePublishingStatus(StatusEvent):
38 """Files that are made public with a url."""
39
40- MESSAGE_ONE = Q_("A file was just made public at %(new_public_url)s")
41+ MESSAGE_ONE = Q_("A share link was just created at %(new_public_url)s")
42
43 WEIGHT = 50
44
45@@ -203,15 +203,15 @@
46 no_of_files = len(events)
47 gettext.dngettext(
48 GETTEXT_PACKAGE,
49- "%(event_count)d file was just made public.",
50- "%(event_count)d files were just made public.",
51+ "%(event_count)d file was just shared.",
52+ "%(event_count)d files were just shared.",
53 no_of_files) % {'event_count': no_of_files}
54
55
56 class FileUnpublishingStatus(StatusEvent):
57 """Files that have stopped being published."""
58
59- MESSAGE_ONE = Q_("A file is no longer published")
60+ MESSAGE_ONE = Q_("A share link is no longer available")
61 WEIGHT = 51
62
63 def many(self, events):
64@@ -219,8 +219,8 @@
65 no_of_files = len(events)
66 gettext.dngettext(
67 GETTEXT_PACKAGE,
68- "%(event_count)d file is no longer published.",
69- "%(event_count)d files are no longer published.",
70+ "%(event_count)d file is no longer shared.",
71+ "%(event_count)d files are no longer shared.",
72 no_of_files) % {'event_count': no_of_files}
73
74

Subscribers

People subscribed via source and target branches

to status/vote changes: