Ubuntu One Android Files

Merge lp:~karni/ubuntuone-android-files/i18n-cleanup into lp:ubuntuone-android-files

  1. i18n-cleanup
  2. Merge into trunk-2011
Proposed by Michał Karnicki
Status: Merged
Merged at revision: 465
Proposed branch: lp:~karni/ubuntuone-android-files/i18n-cleanup
Merge into: lp:ubuntuone-android-files
Diff against target: 2025 lines (+498/-583)
28 files modified
AndroidManifest.xml (+8/-8)
res/layout-land/fragment_sign_in_or_up.xml (+2/-2)
res/layout-ldpi/fragment_pager.xml (+1/-1)
res/layout/activity_list.xml (+1/-1)
res/layout/fragment_autoupload_customize.xml (+1/-1)
res/layout/fragment_autoupload_setup.xml (+8/-8)
res/layout/fragment_pager.xml (+1/-1)
res/layout/fragment_sign_in.xml (+4/-4)
res/layout/fragment_sign_in_or_up.xml (+2/-2)
res/layout/fragment_sign_up.xml (+13/-13)
res/layout/fragment_validate.xml (+2/-2)
res/menu/options_menu_dashboard.xml (+1/-1)
res/menu/options_menu_pick_auto_upload.xml (+2/-2)
res/values/strings.xml (+335/-408)
res/xml/authenticator.xml (+1/-1)
res/xml/preferences.xml (+47/-49)
src/com/ubuntuone/android/files/activity/FilesActivity.java (+44/-49)
src/com/ubuntuone/android/files/activity/GalleryActivity.java (+1/-1)
src/com/ubuntuone/android/files/activity/LoginActivity.java (+1/-1)
src/com/ubuntuone/android/files/activity/PreferencesActivity.java (+8/-12)
src/com/ubuntuone/android/files/activity/StoreActivity.java (+4/-5)
src/com/ubuntuone/android/files/fragment/GalleryFragment.java (+1/-1)
src/com/ubuntuone/android/files/fragment/SignInFragment.java (+2/-2)
src/com/ubuntuone/android/files/fragment/ValidateFragment.java (+2/-2)
src/com/ubuntuone/android/files/util/AuthenticateUserTask.java (+1/-1)
src/com/ubuntuone/android/files/util/ChangeLogUtils.java (+1/-1)
src/com/ubuntuone/android/files/util/DateUtilities.java (+3/-3)
src/com/ubuntuone/android/files/util/ValidateAccountTask.java (+1/-1)
To merge this branch: bzr merge lp:~karni/ubuntuone-android-files/i18n-cleanup
Reviewer Review Type Date Requested Status
Ubuntu One Client Engineering team Pending
Review via email: mp+150121@code.launchpad.net

Commit message

Strings clean-up.

Description of the change

Strings clean-up for upcoming translations by contributors.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'AndroidManifest.xml'
2--- AndroidManifest.xml 2013-02-06 00:42:29 +0000
3+++ AndroidManifest.xml 2013-02-22 17:53:26 +0000
4@@ -120,7 +120,7 @@
5 android:name=".activity.LoginActivity"
6 android:configChanges="orientation|keyboardHidden"
7 android:windowSoftInputMode="stateHidden"
8- android:label="@string/title_text"
9+ android:label="@string/login_activity_label"
10 android:launchMode="singleTop"
11 android:exported="true" >
12
13@@ -135,13 +135,13 @@
14 <activity
15 android:name=".activity.TutorialActivity"
16 android:configChanges="orientation|keyboardHidden"
17- android:label="@string/title_text">
18+ android:label="@string/tutorial_activity_label">
19 </activity>
20
21 <activity
22 android:name=".activity.FilesActivity"
23 android:configChanges="orientation|keyboardHidden"
24- android:label="@string/title_text"
25+ android:label="@string/files_activity_label"
26 android:launchMode="singleTop"
27 android:theme="@style/Theme.Splash" >
28
29@@ -177,33 +177,33 @@
30 <activity
31 android:name=".activity.GalleryActivity"
32 android:configChanges="orientation|keyboardHidden"
33- android:label="@string/title_text">
34+ android:label="@string/gallery_activity_label">
35 </activity>
36
37 <activity
38 android:name=".activity.AutoUploadSetupActivity"
39 android:configChanges="orientation|keyboardHidden"
40- android:label="@string/autoupload_setup_activity.title"
41+ android:label="@string/autoupload_setup_label"
42 android:launchMode="singleTop" >
43 </activity>
44
45 <activity
46 android:name=".activity.AutoUploadCustomizeActivity"
47 android:configChanges="orientation|keyboardHidden"
48- android:label="@string/autoupload_customize_activity.title"
49+ android:label="@string/autoupload_customize_label"
50 android:launchMode="singleTop" >
51 </activity>
52
53 <activity
54 android:name=".activity.StoreActivity"
55 android:configChanges="orientation|keyboardHidden"
56- android:label="@string/store_activity.title" >
57+ android:label="@string/store_activity_label" >
58 </activity>
59
60 <activity
61 android:name=".activity.PreferencesActivity"
62 android:configChanges="orientation|keyboardHidden"
63- android:label="@string/preferences_activity.title"
64+ android:label="@string/preferences_activity_label"
65 android:theme="@style/Theme.U1F" >
66 </activity>
67
68
69=== modified file 'res/layout-land/fragment_sign_in_or_up.xml'
70--- res/layout-land/fragment_sign_in_or_up.xml 2012-01-10 12:27:46 +0000
71+++ res/layout-land/fragment_sign_in_or_up.xml 2013-02-22 17:53:26 +0000
72@@ -83,7 +83,7 @@
73
74 android:textColor="@color/text_dark_grey"
75 android:textSize="@dimen/text_size_medium"
76- android:text="@string/intro_activity.new_account" />
77+ android:text="@string/new_account" />
78
79 <Button
80 android:id="@+id/sign_in"
81@@ -102,6 +102,6 @@
82
83 android:textColor="@color/text_dark_grey"
84 android:textSize="@dimen/text_size_medium"
85- android:text="@string/intro_activity.sign_in" />
86+ android:text="@string/sign_in" />
87
88 </RelativeLayout>
89
90=== modified file 'res/layout-ldpi/fragment_pager.xml'
91--- res/layout-ldpi/fragment_pager.xml 2012-01-09 15:20:54 +0000
92+++ res/layout-ldpi/fragment_pager.xml 2013-02-22 17:53:26 +0000
93@@ -40,6 +40,6 @@
94
95 android:textColor="@color/text_dark_grey"
96 android:textSize="@dimen/text_size_medium"
97- android:text="@string/introduction.sign_up_now" />
98+ android:text="@string/sign_up_now" />
99
100 </LinearLayout>
101
102=== modified file 'res/layout/activity_list.xml'
103--- res/layout/activity_list.xml 2012-04-24 02:18:57 +0000
104+++ res/layout/activity_list.xml 2013-02-22 17:53:26 +0000
105@@ -55,7 +55,7 @@
106 android:layout_width="fill_parent"
107 android:layout_height="fill_parent"
108 android:gravity="center"
109- android:text="@string/files_activity.no_files"
110+ android:text="@string/no_files"
111 android:textSize="@dimen/text_size_medium"
112 android:textColor="@color/text_red" />
113
114
115=== modified file 'res/layout/fragment_autoupload_customize.xml'
116--- res/layout/fragment_autoupload_customize.xml 2012-04-24 02:18:57 +0000
117+++ res/layout/fragment_autoupload_customize.xml 2013-02-22 17:53:26 +0000
118@@ -16,7 +16,7 @@
119 android:textColor="@android:color/primary_text_light"
120 android:textSize="@dimen/text_size_medium"
121 u1f:customFont="Ubuntu-B.ttf"
122- android:text="@string/autoupload_customize_activity.select_auto_upload_folders" />
123+ android:text="@string/autoupload_select_folders" />
124
125 <ListView
126 android:id="@+id/folder_list"
127
128=== modified file 'res/layout/fragment_autoupload_setup.xml'
129--- res/layout/fragment_autoupload_setup.xml 2013-01-15 23:02:38 +0000
130+++ res/layout/fragment_autoupload_setup.xml 2013-02-22 17:53:26 +0000
131@@ -26,7 +26,7 @@
132 android:layout_marginBottom="0dp"
133 android:layout_marginLeft="10dp"
134 android:layout_marginTop="12dp"
135- android:text="@string/autoupload_setup_activity.auto_upload_photos"
136+ android:text="@string/autoupload_description_line1"
137 android:textColor="@android:color/primary_text_light"
138 android:textSize="@dimen/text_size_medium"
139 u1f:customFont="Ubuntu-B.ttf" />
140@@ -35,7 +35,7 @@
141 android:layout_width="fill_parent"
142 android:layout_height="wrap_content"
143 android:layout_margin="10dp"
144- android:text="@string/autoupload_setup_activity.auto_upload_description"
145+ android:text="@string/autoupload_description_line2"
146 android:textColor="@android:color/primary_text_light"
147 android:textSize="@dimen/text_size_small"
148 u1f:customFont="Ubuntu-R.ttf" />
149@@ -50,7 +50,7 @@
150 android:id="@+id/auto_upload_on_both"
151 android:layout_width="fill_parent"
152 android:layout_height="wrap_content"
153- android:text="@string/autoupload_setup_activity.wifi_or_mobile"
154+ android:text="@string/network_wifi_or_mobile"
155 android:textColor="@android:color/primary_text_light" />
156
157 <RadioButton
158@@ -58,7 +58,7 @@
159 android:layout_width="fill_parent"
160 android:layout_height="wrap_content"
161 android:checked="true"
162- android:text="@string/autoupload_setup_activity.wifi_only"
163+ android:text="@string/network_wifi_only"
164 android:textColor="@android:color/primary_text_light" />
165 </RadioGroup>
166
167@@ -66,7 +66,7 @@
168 android:layout_width="fill_parent"
169 android:layout_height="wrap_content"
170 android:layout_margin="10dp"
171- android:text="@string/autoupload_setup_activity.auto_upload_settings_notice"
172+ android:text="@string/autoupload_settings_notice"
173 android:textColor="@android:color/primary_text_light"
174 android:textSize="@dimen/text_size_small"
175 u1f:customFont="Ubuntu-R.ttf" />
176@@ -76,7 +76,7 @@
177 android:layout_width="fill_parent"
178 android:layout_height="wrap_content"
179 android:layout_margin="10dp"
180- android:text="@string/autoupload_setup_activity.auto_upload_mobile_conn_notice"
181+ android:text="@string/autoupload_mobile_network_notice"
182 android:textColor="@android:color/primary_text_light"
183 android:textSize="@dimen/text_size_small"
184 android:visibility="invisible"
185@@ -98,7 +98,7 @@
186 android:layout_weight="1"
187 android:minHeight="46dp"
188 android:padding="3sp"
189- android:text="@string/autoupload_setup_activity.skip"
190+ android:text="@string/autoupload_skip"
191 android:textColor="@android:color/primary_text_light"
192 android:textSize="@dimen/text_size_medium"
193 u1f:customFont="Ubuntu-B.ttf" />
194@@ -110,7 +110,7 @@
195 android:layout_weight="1"
196 android:minHeight="46dp"
197 android:padding="3sp"
198- android:text="@string/autoupload_setup_activity.enable"
199+ android:text="@string/autoupload_enable"
200 android:textColor="@android:color/primary_text_light"
201 android:textSize="@dimen/text_size_medium"
202 u1f:customFont="Ubuntu-B.ttf" />
203
204=== modified file 'res/layout/fragment_pager.xml'
205--- res/layout/fragment_pager.xml 2012-01-09 15:20:54 +0000
206+++ res/layout/fragment_pager.xml 2013-02-22 17:53:26 +0000
207@@ -40,6 +40,6 @@
208
209 android:textColor="@color/text_dark_grey"
210 android:textSize="@dimen/text_size_medium"
211- android:text="@string/introduction.sign_up_now" />
212+ android:text="@string/sign_up_now" />
213
214 </LinearLayout>
215
216=== modified file 'res/layout/fragment_sign_in.xml'
217--- res/layout/fragment_sign_in.xml 2012-01-09 15:20:54 +0000
218+++ res/layout/fragment_sign_in.xml 2013-02-22 17:53:26 +0000
219@@ -46,7 +46,7 @@
220 android:textColor="@color/text_dark_grey"
221 android:textSize="@dimen/text_size_medium"
222 u1f:customFont="Ubuntu-B.ttf"
223- android:text="@string/authentication.sign_in" />
224+ android:text="@string/sign_in" />
225
226 <include layout="@layout/horizontal_separator" />
227
228@@ -63,7 +63,7 @@
229 android:textColor="@color/text_dark_grey"
230 android:textSize="@dimen/text_size_smaller"
231 u1f:customFont="Ubuntu-B.ttf"
232- android:text="@string/registration.email" />
233+ android:text="@string/email" />
234
235 <include
236 android:id="@+id/email_error"
237@@ -97,7 +97,7 @@
238 android:textColor="@color/text_dark_grey"
239 android:textSize="@dimen/text_size_smaller"
240 u1f:customFont="Ubuntu-B.ttf"
241- android:text="@string/registration.password" />
242+ android:text="@string/password" />
243
244 <include
245 android:id="@+id/password_error"
246@@ -138,7 +138,7 @@
247 android:textColor="@android:color/white"
248 android:textSize="@dimen/text_size_medium"
249 u1f:customFont="Ubuntu-B.ttf"
250- android:text="@string/authentication.sign_in" />
251+ android:text="@string/sign_in" />
252 </LinearLayout>
253
254 </ScrollView>
255
256=== modified file 'res/layout/fragment_sign_in_or_up.xml'
257--- res/layout/fragment_sign_in_or_up.xml 2012-01-09 15:20:54 +0000
258+++ res/layout/fragment_sign_in_or_up.xml 2013-02-22 17:53:26 +0000
259@@ -66,7 +66,7 @@
260
261 android:textColor="@color/text_dark_grey"
262 android:textSize="@dimen/text_size_medium"
263- android:text="@string/intro_activity.new_account" />
264+ android:text="@string/new_account" />
265
266 <Button
267 android:id="@+id/sign_in"
268@@ -84,6 +84,6 @@
269
270 android:textColor="@color/text_dark_grey"
271 android:textSize="@dimen/text_size_medium"
272- android:text="@string/intro_activity.sign_in" />
273+ android:text="@string/sign_in" />
274
275 </RelativeLayout>
276
277=== modified file 'res/layout/fragment_sign_up.xml'
278--- res/layout/fragment_sign_up.xml 2012-01-10 12:27:46 +0000
279+++ res/layout/fragment_sign_up.xml 2013-02-22 17:53:26 +0000
280@@ -46,7 +46,7 @@
281 android:textColor="@color/text_dark_grey"
282 android:textSize="@dimen/text_size_medium"
283 u1f:customFont="Ubuntu-B.ttf"
284- android:text="@string/registration.sign_up" />
285+ android:text="@string/sign_up" />
286
287 <com.ubuntuone.android.files.widget.TextViewPlus
288 android:layout_width="fill_parent"
289@@ -60,7 +60,7 @@
290 android:textColor="@color/text_dark_grey"
291 android:textSize="@dimen/text_size_smaller"
292 u1f:customFont="Ubuntu-R.ttf"
293- android:text="@string/registration.sign_up_desc" />
294+ android:text="@string/sign_up_desc" />
295
296 <include layout="@layout/horizontal_separator" />
297
298@@ -77,7 +77,7 @@
299 android:textColor="@color/text_dark_grey"
300 android:textSize="@dimen/text_size_smaller"
301 u1f:customFont="Ubuntu-B.ttf"
302- android:text="@string/registration.full_name" />
303+ android:text="@string/full_name" />
304
305 <com.ubuntuone.android.files.widget.EditTextPlus
306 android:id="@+id/sso.fullname"
307@@ -108,7 +108,7 @@
308 android:textColor="@color/text_dark_grey"
309 android:textSize="@dimen/text_size_smaller"
310 u1f:customFont="Ubuntu-B.ttf"
311- android:text="@string/registration.email" />
312+ android:text="@string/email" />
313
314 <include
315 android:id="@+id/email_error"
316@@ -143,7 +143,7 @@
317 android:textColor="@color/text_dark_grey"
318 android:textSize="@dimen/text_size_smaller"
319 u1f:customFont="Ubuntu-B.ttf"
320- android:text="@string/registration.password" />
321+ android:text="@string/password" />
322
323 <com.ubuntuone.android.files.widget.TextViewPlus
324 android:id="@+id/password_error"
325@@ -159,7 +159,7 @@
326 android:textColor="@color/text_dark_grey"
327 android:textSize="@dimen/text_size_smaller"
328 u1f:customFont="Ubuntu-R.ttf"
329- android:text="@string/registration.password_desc" />
330+ android:text="@string/password_desc" />
331
332 <com.ubuntuone.android.files.widget.EditTextPlus
333 android:id="@+id/sso.password"
334@@ -191,7 +191,7 @@
335 android:textColor="@color/text_dark_grey"
336 android:textSize="@dimen/text_size_smaller"
337 u1f:customFont="Ubuntu-R.ttf"
338- android:text="@string/registration.show_password"
339+ android:text="@string/show_password"
340
341 android:button="@drawable/checkbox"
342
343@@ -218,7 +218,7 @@
344 android:textColor="@color/text_dark_grey"
345 android:textSize="@dimen/text_size_smaller"
346 u1f:customFont="Ubuntu-B.ttf"
347- android:text="@string/registration.security" />
348+ android:text="@string/security" />
349
350 <com.ubuntuone.android.files.widget.TextViewPlus
351 android:layout_width="fill_parent"
352@@ -229,7 +229,7 @@
353 android:textColor="@color/text_dark_grey"
354 android:textSize="@dimen/text_size_smaller"
355 u1f:customFont="Ubuntu-R.ttf"
356- android:text="@string/registration.cant_read" />
357+ android:text="@string/captcha_unreadable" />
358
359 </LinearLayout>
360
361@@ -257,7 +257,7 @@
362 android:textSize="@dimen/text_size_smaller"
363 android:textColor="@color/text_grey"
364 u1f:customFont="Ubuntu-R.ttf"
365- android:text="@string/registration.loading_captcha" />
366+ android:text="@string/loading_captcha" />
367
368 </LinearLayout>
369
370@@ -273,7 +273,7 @@
371 android:textSize="@dimen/text_size_smaller"
372 android:textColor="@color/text_grey"
373 u1f:customFont="Ubuntu-R.ttf"
374- android:text="@string/registration.loading_captcha_failed" />
375+ android:text="@string/loading_captcha_failed" />
376
377 <LinearLayout
378 android:id="@+id/sso.captcha_ready"
379@@ -308,7 +308,7 @@
380 android:textColor="@color/text_dark_grey"
381 android:textSize="@dimen/text_size_smaller"
382 u1f:customFont="Ubuntu-R.ttf"
383- android:text="@string/registration.solution" />
384+ android:text="@string/captcha_solution" />
385
386 <include
387 android:id="@+id/captcha_error"
388@@ -364,7 +364,7 @@
389 android:textColor="@android:color/white"
390 android:textSize="@dimen/text_size_medium"
391 u1f:customFont="Ubuntu-B.ttf"
392- android:text="@string/registration.sign_up" />
393+ android:text="@string/sign_up" />
394
395 </LinearLayout>
396
397
398=== modified file 'res/layout/fragment_validate.xml'
399--- res/layout/fragment_validate.xml 2012-01-10 12:27:46 +0000
400+++ res/layout/fragment_validate.xml 2013-02-22 17:53:26 +0000
401@@ -44,7 +44,7 @@
402 u1f:customFont="Ubuntu-B.ttf"
403 android:textColor="@android:color/black"
404 android:textSize="@dimen/text_size_large"
405- android:text="@string/registration.congratulations" />
406+ android:text="@string/congratulations" />
407
408 <com.ubuntuone.android.files.widget.TextViewPlus
409 android:id="@+id/validation_message"
410@@ -60,7 +60,7 @@
411 u1f:customFont="Ubuntu-R.ttf"
412 android:textColor="@android:color/black"
413 android:textSize="@dimen/text_size_smaller"
414- android:text="@string/registration.check_mail" />
415+ android:text="@string/check_your_email" />
416 </LinearLayout>
417
418 </LinearLayout>
419
420=== modified file 'res/menu/options_menu_dashboard.xml'
421--- res/menu/options_menu_dashboard.xml 2013-02-05 15:34:16 +0000
422+++ res/menu/options_menu_dashboard.xml 2013-02-22 17:53:26 +0000
423@@ -3,7 +3,7 @@
424
425 <item
426 android:id="@+id/option_preferences"
427- android:title="@string/options_menu.preferences"
428+ android:title="@string/preferences"
429 android:icon="@drawable/ic_menu_preferences" />
430
431 </menu>
432
433=== modified file 'res/menu/options_menu_pick_auto_upload.xml'
434--- res/menu/options_menu_pick_auto_upload.xml 2012-09-24 21:08:26 +0000
435+++ res/menu/options_menu_pick_auto_upload.xml 2013-02-22 17:53:26 +0000
436@@ -2,10 +2,10 @@
437 <menu xmlns:android="http://schemas.android.com/apk/res/android">
438 <item
439 android:id="@+id/option_upload_here"
440- android:title="@string/options_menu.upload_here"
441+ android:title="@string/upload_here"
442 android:icon="@drawable/ic_menu_upload" />
443 <item
444 android:id="@+id/option_cancel"
445- android:title="@string/options_menu.cancel"
446+ android:title="@string/cancel"
447 android:icon="@drawable/ic_menu_revert" />
448 </menu>
449
450=== modified file 'res/values/strings.xml'
451--- res/values/strings.xml 2013-01-30 16:47:23 +0000
452+++ res/values/strings.xml 2013-02-22 17:53:26 +0000
453@@ -1,172 +1,135 @@
454 <?xml version="1.0" encoding="utf-8"?>
455 <!--
456
457-=== Style guide ===
458+ Style guide
459
460- * "Ubuntu One Files", without "for Android"
461+ * Full app name is "Ubuntu One Files"
462 * "SD card", "Wi-Fi", "E-mail"
463- * Toasts include ending punctuation. Not ellipses.
464- * Join ellipses to nearest text.
465+ * Toasts include ending punctuation. Not ellipsis.
466+ * Join ellipsis to nearest text.
467 * Use verbs in buttons.
468 * Sign in or signing in, verb.
469 * Back up or backing up, verb. Backup, noun or adjective.
470 * Hyphens - are not emdash —. Avoid dash if possible.
471- * 'directory' is technical and used in code. In UI use 'folder', instead.
472+ * 'directory' is technical and used in code. In UI use 'folder' instead.
473+ * Auto Upload, not AutoUpload nor Auto-upload
474+
475+ * DNT - do not translate
476
477 -->
478 <resources>
479- <string name="app_name">Ubuntu One Files</string>
480- <string name="app_version">Version</string>
481- <string name="title_text">Ubuntu One Files</string>
482- <string name="please_wait">Please wait&#8230;</string>
483-
484-
485- <string name="yes">Yes</string>
486- <string name="ok">OK</string>
487- <string name="no">No</string>
488- <string name="cancel">Cancel</string>
489- <string name="create">Create</string>
490- <string name="canceled">Canceled</string>
491- <string name="refreshing">Refreshing</string>
492- <string name="sign_out">Sign out</string>
493- <string name="error_fmt">Error: %s</string>
494- <string name="oops_title">Oops!</string>
495- <string name="oops_message">Something went wrong. We kindly ask you to report the problem.</string>
496- <string name="unknown_error">unknown error</string>
497- <string name="report">Report</string>
498- <string name="ignore">Ignore</string>
499- <string name="no_network">No network.</string>
500-
501- <string name="hint">Hint</string>
502- <string name="empty"></string>
503-
504-
505- <string name="toast.no_network">No network.</string>
506- <string name="toast.working_offline">Working off-line.</string>
507- <string name="toast.cant_rename_to_nothing">Can\'t rename to nothing.</string>
508- <string name="toast.name_cant_be_nothing">Name can\'t be empty.</string>
509- <string name="toast.photos_will_auto_upload_to_fmt">Photos will auto upload to\n%s</string>
510- <string name="toast.cancelled_selecting_auto_upload_directory">Cancelled selecting auto upload directory.</string>
511- <string name="toast.file_link_copied">Link copied to clipboard.</string>
512- <string name="toast.already_downloading">Already downloading.</string>
513- <string name="toast.no_change">No change.</string>
514- <string name="toast.cant_handle_file_type">Can\'t handle that file type yet, sorry!</string>
515- <string name="toast.download_to_share">You have to download the file to share it.</string>
516- <string name="toast.no_suitable_activity">No suitable activity found</string>
517- <string name="toast.file_not_cached_anymore">File not cached anymore.</string>
518- <string name="toast.file_name_cant_contain">Name can\'t contain %c.</string>
519- <string name="toast.downloading_x">Downloading %s.</string>
520- <string name="toast.uploaded_x">Uploaded %s.</string>
521- <string name="toast.downloaded_x">Downloaded %s.</string>
522- <string name="toast.storage_is_not_accessible">Can\'t access SD card.</string>
523- <string name="toast.uploading_all_photos">Uploading all photos.</string>
524- <string name="toast.already_uploading">Already uploading&#8230;</string>
525- <string name="toast.no_photos_to_upload">No photos to upload.</string>
526- <string name="toast.started_bg_service">Started background service.</string>
527- <string name="toast.stopped_bg_service">Stopped background service.</string>
528- <string name="toast.failed_to_start_bg_service">Failed to start background service.</string>
529- <string name="toast.retrying_transfers_now">Retrying now&#8230;</string>
530- <string name="toast.retrying_transfers_failed">Retrying failed.</string>
531- <string name="toast.canceled_failed_transfers">Canceled failed transfers</string>
532- <string name="toast.cancel_failed_none">No transfers to cancel.</string>
533- <string name="toast.not_on_wifi">Not on Wi-Fi.</string>
534- <string name="toast.cache_cleared">Cache cleared.</string>
535-
536-
537- <string name="progress.signing_in">Signing in&#8230;</string>
538- <string name="progress.signing_in_to_u1">Signing in to Ubuntu One&#8230;</string>
539- <string name="progress.updating_please_wait">Updating, please wait&#8230;</string>
540-
541-
542- <string name="dialog.no_network_title">No network</string>
543- <string name="dialog.no_network_message">You need Wi-Fi or Mobile network to use Ubuntu One Files.</string>
544-
545- <string name="dialog.pick_image_title">Pick image with</string>
546- <string name="dialog.pick_video_title">Pick video with</string>
547- <string name="dialog.pick_audio_title">Pick audio with</string>
548- <string name="dialog.pick_file_title">Pick file with</string>
549- <string name="dialog.open_with_title">Open with</string>
550-
551- <string name="dialog.checking_size_message">Checking size&#8230;</string>
552- <string name="dialog.nothing_to_download">This folder contains no files. In case of any subfolders, you can download them manually.</string>
553-
554- <string name="dialog.creating_link">Creating link&#8230;</string>
555-
556- <string name="dialog.no_space_title">No space</string>
557- <string name="dialog.no_space_message_fmt">Needs %1$s of free space, you have only %2$s left.</string>
558-
559- <string name="dialog.downloading_dir_title">Downloading folder</string>
560- <string name="dialog.downloading_dir_is_x_large">This folder is %s in size.</string>
561- <string name="dialog.downloading_dir_on_mobile">Also, you are using Mobile connection.</string>
562- <string name="dialog.downloading_dir_are_you_sure">Are you sure you want to download it?</string>
563-
564- <string name="dialog.share_link_title">Share link</string>
565- <string name="shared_from_u1">Shared from Ubuntu One</string>
566-
567- <string name="dialog.rename_directory_title">Rename folder</string>
568-
569- <string name="dialog.create_directory_title">Create folder</string>
570-
571- <string name="dialog.delete_item_message">Are you sure you want to delete this item?</string>
572-
573-
574- <string name="dialog.pick_upload_directory_title">Select upload directory</string>
575- <string name="dialog.pick_upload_directory_message">Use the <b>Menu</b> button to confirm or cancel.</string>
576-
577- <string name="dialog.auth_failed_title">Login failed</string>
578- <string name="dialog.auth_failed_message">Authentication failed. Please try again.</string>
579-
580- <string name="dialog.time_check_failed_title">Temporary problem</string>
581- <string name="dialog.time_check_failed_message">At the moment we can\'t verify if your device\'s time is correct. Please try again later soon!</string>
582-
583- <string name="dialog.sign_out_title">Sign out from U1?</string>
584- <string name="dialog.sign_out_message">Please note, your files will not be removed either from phone nor from Ubuntu One.</string>
585-
586-
587- <string name="intro_activity.sign_in">Sign in</string>
588- <string name="intro_activity.new_account">I don\'t have an account</string>
589-
590+ <string name="app_name">Ubuntu One Files</string> <!-- DNT -->
591+
592+ <!-- Tutorial activity -->
593+ <string name="tutorial_activity_label">Tutorial</string>
594+
595+ <string name="sign_up_now">Sign up now</string>
596+
597 <string name="intro_header.1">Your cloud</string>
598 <string name="intro_header.2">Your photos</string>
599 <string name="intro_header.3"></string>
600 <string name="intro_header.4">Getting started</string>
601-
602+
603 <string name="intro_text.1">Store your files, photos and music safely in Ubuntu One and access them from any of your devices, wherever you are. Get 5GB of cloud storage for FREE.</string>
604 <string name="intro_text.2">Snap a photo and it will instantly appear online and on all your devices. Easily share your shots with friends, family, colleagues or on social networks.</string>
605 <string name="intro_text.3">Add more cloud storage when you need it or stream your music online or on your mobile. Music Streaming has 20GB of extra cloud storage built in - try it free for 30 days.</string>
606 <string name="intro_text.4">Go to one.ubuntu.com/download and follow our simple guide to installing Ubuntu One on all your devices. Ubuntu One works on Windows, Android, iOS, Ubuntu, and via the Web.</string>
607-
608-
609- <string name="autoupload_setup_activity.title">Enable photo Auto Upload</string>
610- <string name="autoupload_setup_activity.enable_auto_upload">Enable Auto Upload</string>
611- <string name="autoupload_setup_activity.auto_upload_photos">Automatically upload your photos</string>
612- <string name="autoupload_setup_activity.auto_upload_description">Never lose a photo from your phone again.</string>
613- <string name="autoupload_setup_activity.wifi_or_mobile">Use both Wi-Fi and mobile network</string>
614- <string name="autoupload_setup_activity.wifi_only">Only use Wi-Fi</string>
615- <string name="autoupload_setup_activity.disable">Don\'t upload my photos</string>
616- <string name="autoupload_setup_activity.auto_upload_settings_notice">You can change which folders are uploaded in Settings.</string>
617- <string name="autoupload_setup_activity.auto_upload_mobile_conn_notice">Uploading over a mobile network will use your data connection and may cost you money. You can turn this off at any time in Settings.</string>
618- <string name="autoupload_setup_activity.skip">Skip for now</string>
619- <string name="autoupload_setup_activity.enable">Enable</string>
620-
621-
622- <string name="autoupload_customize_activity.title">Customize Auto Upload</string>
623- <string name="autoupload_customize_activity.select_auto_upload_folders">Select folders to Auto Upload</string>
624- <string name="autoupload_customize_activity.rescan">Look for other photo folders…</string>
625-
626-
627- <string name="action_bar.add_image">Add image</string>
628- <string name="action_bar.add_video">Add video</string>
629- <string name="action_bar.add_audio">Add audio</string>
630- <string name="action_bar.add_file">Add file</string>
631- <string name="action_bar.new_directory">New folder</string>
632-
633- <string name="files_activity.directory_is_empty">This folder is empty.</string>
634- <string name="files_activity.loading_files">Loading files&#8230;</string>
635- <string name="files_activity.no_files">No files.</string>
636- <string name="files_activity.no_file_selected">No file selected.</string>
637-
638-
639+
640+ <!-- Login activity -->
641+ <string name="login_activity_label">Sign in</string>
642+ <string name="new_account">I don\'t have an account</string>
643+ <string name="sign_in">Sign in</string>
644+ <string name="signing_in">Signing in&#8230;</string>
645+ <string name="signing_in_to_u1">Signing in to Ubuntu One&#8230;</string>
646+
647+ <!-- Sign up -->
648+ <string name="sign_up">Sign up</string>
649+ <string name="sign_up_desc">Please provide a few details below to register for your Ubuntu One account.</string>
650+ <string name="full_name">Full name</string>
651+ <string name="email">Email</string>
652+ <string name="password">Password</string>
653+ <string name="password_desc">Must be at least 8 characters long and must contain at least one number and an upper case letter.</string>
654+ <string name="show_password">Show password</string>
655+ <string name="security">Security</string>
656+ <string name="loading_captcha">Loading captcha, please wait&#8230;</string>
657+ <string name="loading_captcha_failed">Oops! Touch here for new image.</string>
658+ <string name="captcha_unreadable">(Can\'t read? Touch the image.)</string>
659+ <string name="captcha_solution">Type the two words:</string>
660+
661+ <string name="getting_captcha">Getting captcha&#8230;</string>
662+ <string name="getting_captcha_failed">Failed to get captcha!</string>
663+ <string name="tap_to_change_captcha">Tap here to change captcha.</string>
664+ <string name="solution">Captcha solution</string>
665+ <string name="solution_cannot_be_empty">You must fill in the captcha solution.</string>
666+
667+ <string name="signup_footer_tos"><![CDATA[
668+ By creating an account you agree to the <br />
669+ Ubuntu Account <a href="http://ubuntu.com/legal">Terms of Service</a>.
670+ ]]>
671+ </string>
672+
673+ <string name="signing_up_header">Signing up&#8230;</string>
674+
675+ <string name="congratulations">Congratulations</string>
676+ <string name="check_your_email">A confirmation email has been sent to the address you provided.\nSimply follow the link in the email to activate your Ubuntu One account.</string>
677+ <string name="almost_there">Almost there!</string>
678+
679+ <string name="fullname_invalid">Name can\'t be empty.</string>
680+ <string name="username_invalid">Invalid username (email).</string>
681+ <string name="password_invalid">Password must be at least 8 characters long, contain one upper case letter and one digit.</string>
682+ <string name="one_account_only">Currently only one Ubuntu One account is supported. If you wish to sign in as a different user, please remove the old account first.</string>
683+ <string name="authentication_error">Authentication failed. Probably credentials you have provided are incorrect.</string>
684+ <string name="connectivity_error">Connection is down or service is unavailable. Please try again later.</string>
685+
686+ <!-- Files activity -->
687+ <string name="files_activity_label">Ubuntu One Files</string> <!-- DNT -->
688+
689+ <string name="no_network">No network</string>
690+ <string name="network_required">You need Wi-Fi or Mobile network to use the app.</string>
691+
692+ <string name="loading_files">Loading files&#8230;</string>
693+ <string name="no_files">No files.</string>
694+ <string name="folder_is_empty">This folder is empty.</string>
695+
696+ <string name="purchased_music_display_name">Purchased Music</string>
697+
698+ <!-- Node state description -->
699+ <string name="downloading">Downloading&#8230;</string>
700+ <string name="uploading">Uploading&#8230;</string>
701+ <string name="deleting">Deleting&#8230;</string>
702+ <string name="download_failed_tap_resume">Download failed, tap to resume.</string>
703+ <string name="upload_failed_tap_retry">Upload failed, tap to retry.</string>
704+
705+ <!-- Last modified fuzzy time -->
706+ <string name="last_modified_fmt">last modified %1$s</string>
707+ <plurals name="last_modified_minutes">
708+ <item quantity="one">%d minute ago</item>
709+ <item quantity="other">%d minutes ago</item>
710+ </plurals>
711+ <plurals name="last_modified_hours">
712+ <item quantity="one">%d hour ago</item>
713+ <item quantity="other">%d hours ago</item>
714+ </plurals>
715+ <plurals name="last_modified_days">
716+ <item quantity="one">%d day ago</item>
717+ <item quantity="other">%d days ago</item>
718+ </plurals>
719+
720+ <!-- Action bar -->
721+ <string name="add_image">Add image</string>
722+ <string name="add_video">Add video</string>
723+ <string name="add_audio">Add audio</string>
724+ <string name="add_file">Add file</string>
725+ <string name="new_folder">New folder</string>
726+
727+ <!-- Dialog titles -->
728+ <string name="pick_image">Pick image with</string>
729+ <string name="pick_video">Pick video with</string>
730+ <string name="pick_audio">Pick audio with</string>
731+ <string name="pick_file">Pick file with</string>
732+ <string name="open_with">Open with</string>
733+
734+ <!-- Context menus -->
735 <string name="context_download">Download</string>
736 <string name="context_cancel_download">Cancel download</string>
737 <string name="context_create_link">Share link</string>
738@@ -175,174 +138,251 @@
739 <string name="context_rename">Rename</string>
740 <string name="context_delete">Delete</string>
741 <string name="context_delete_from_device">Delete from device</string>
742-
743-
744- <string name="options_menu.refresh">Refresh</string>
745- <string name="options_menu.preferences">Settings</string>
746- <string name="options_menu.upload_here">Upload here</string>
747- <string name="options_menu.cancel">Cancel</string>
748-
749-
750- <string name="node.is_cloud_folder">Cloud folder</string>
751- <string name="node_is_purchased_music">Purchased Music</string>
752-
753- <string name="node.last_modified">last modified %1$s</string>
754- <string name="node.is_downloading">Downloading&#8230;</string>
755- <string name="node.is_uploading">Uploading&#8230;</string>
756- <string name="node_is_deleting">Deleting&#8230;</string>
757- <string name="node_download_has_failed">Download failed, tap to resume.</string>
758- <string name="node_upload_has_failed">Upload failed, tap to retry.</string>
759-
760- <plurals name="node_last_modified_minutes">
761- <item quantity="one">%d minute ago</item>
762- <item quantity="other">%d minutes ago</item>
763- </plurals>
764- <plurals name="node_last_modified_hours">
765- <item quantity="one">%d hour ago</item>
766- <item quantity="other">%d hours ago</item>
767- </plurals>
768- <plurals name="node_last_modified_days">
769- <item quantity="one">%d day ago</item>
770- <item quantity="other">%d days ago</item>
771- </plurals>
772-
773-
774- <string name="store_activity.title">Store</string>
775- <string name="store_activity.could_not_start_storage_purchase_try_again_later">Could not start storage purchase. Please try again later.</string>
776- <string name="store_activity.no_network_to_purchase_storage">No network connection available. Please make sure you are connected and try again.</string>
777-
778-
779- <string name="preferences_activity.title">Ubuntu One Files Settings</string>
780- <string name="preferences_activity.unknown_value">unknown</string>
781- <string name="preferences_activity.tap_to_refresh">(tap to refresh)</string>
782-
783-
784- <string name="preferences_activity.category_account">Account</string>
785-
786- <string name="preferences_activity.username_title">User name</string>
787- <string name="preferences_activity.plan_title">Current plan</string>
788- <string name="preferences_activity.bytes_used_summary_fmt">" — used %1$s out of %2$s (%3$.0f%%)"</string>
789- <string name="preferences_activity.please_wait_updating_user_info">Please wait while Ubuntu One updates your user information.</string>
790- <string name="preferences_activity.invite_friend_title">Invite a friend!</string>
791- <string name="preferences_activity.invite_friend_summary">Get additional 500MB of storage</string>
792- <string name="preferences_activity.purchase_storage_title">Upgrade storage</string>
793- <string name="preferences_activity.purchase_storage_summary">Still not enough? Get more 20GB packs!</string>
794- <string name="preferences_activity.upgrade_plan_title">Tell me more</string>
795- <string name="preferences_activity.upgrade_plan_summary">Ubuntu One services details</string>
796-
797+
798+ <!-- Options menu -->
799+ <string name="preferences">Settings</string>
800+ <string name="upload_here">Upload here</string>
801+
802+ <!-- Sharing link -->
803+ <string name="creating_link">Creating link&#8230;</string>
804+ <string name="dialog.share_link_title">Share link</string>
805+ <string name="shared_from_u1">Shared from Ubuntu One</string>
806+
807+ <!-- Insufficient space dialog -->
808+ <string name="no_space">No space</string>
809+ <string name="no_space_message_fmt">Needs %1$s of free space, you have only %2$s left.</string>
810+
811+ <!-- Folder operations -->
812+ <string name="create_folder">Create folder</string>
813+ <string name="rename_folder">Rename folder</string>
814+ <string name="download_folder">Download folder</string>
815+ <string name="checking_size">Checking size&#8230;</string>
816+ <string name="nothing_to_download">This folder contains no files. In case of any subfolders, you can download them manually.</string>
817+
818+ <!-- The three strings below may be concatenated, depending on current connection type. -->
819+ <string name="folder_size_fmt">This folder is %s in size.</string>
820+ <string name="folder_download_on_mobile">Also, you are using Mobile connection.</string>
821+ <string name="folder_download_prompt">Are you sure you want to download it?</string>
822+
823+ <string name="delete_item_prompt">Are you sure you want to delete this item?</string>
824+
825+ <!-- Selecting upload directory -->
826+ <string name="select_upload_directory">Select upload directory</string>
827+ <string name="select_upload_directory_message">Use the <b>Menu</b> button to confirm or cancel.</string>
828+
829+ <!-- Gallery activity -->
830+ <string name="gallery_activity_label">Gallery</string>
831+
832+ <!-- Store activity -->
833+ <string name="store_activity_label">Store</string>
834+ <string name="purchase_init_failed">Could not start storage purchase. Please try again later.</string>
835+ <string name="purchase_no_network">No network connection available. Please make sure you are connected and try again.</string>
836+ <string name="updating_please_wait">Updating, please wait&#8230;</string>
837+
838+ <!-- Auto Upload setup activity -->
839+ <string name="autoupload_setup_label">Enable photo Auto Upload</string>
840+ <string name="autoupload_description_line1">Automatically upload your photos</string>
841+ <string name="autoupload_description_line2">Never lose a photo from your phone again.</string>
842+ <string name="network_wifi_or_mobile">Use both Wi-Fi and mobile network</string>
843+ <string name="network_wifi_only">Only use Wi-Fi</string>
844+
845+ <string name="autoupload_settings_notice">You can change which folders are uploaded in Settings.</string>
846+ <string name="autoupload_mobile_network_notice">Uploading over a mobile network will use your data connection and may cost you money. You can turn this off at any time in Settings.</string>
847+ <string name="autoupload_skip">Skip for now</string>
848+ <string name="autoupload_enable">Enable</string>
849+
850+ <!-- Auto Upload customize activity -->
851+ <string name="autoupload_customize_label">Customize Auto Upload</string>
852+ <string name="autoupload_select_folders">Select folders to Auto Upload</string>
853+
854+ <!-- Preferences activity -->
855+ <string name="preferences_activity_label">Settings</string>
856+
857+ <!-- Account category -->
858+ <string name="category_account">Account</string>
859+ <string name="username">User name</string>
860+ <string name="current_plan">Current plan</string>
861+ <string name="current_plan_fmt"> — used %1$s out of %2$s (%3$.0f%%)</string>
862+
863+ <string name="tap_to_refresh">(tap to refresh)</string>
864+ <string name="please_wait_updating_user_info">Please wait while Ubuntu One updates your user information.</string>
865+
866+ <string name="invite_friend">Invite a friend!</string>
867+ <string name="invite_friend_summary">Get additional 500MB of storage</string>
868+
869 <string name="invite_friend.subject">Try Ubuntu One!</string>
870 <!-- <string name="invite_friend.body_fmt">Hi!\n\nI\'m using Ubuntu One to keep my files safe and share them easily, all for free. I thought you might want to give it a try!\n\nUse this link to get additional 500MB to your initial 5GB after you sign up!\n\n%s</string> -->
871 <string name="invite_friend.body_fmt">Hi!\n\nI wanted to let you know that I use Ubuntu One to share and access all my files and photos from multiple devices.\nAn Ubuntu One account gives you 5GB of free cloud storage, if you use this link\n\n%s\n\nyou will get an extra 500MB of free cloud storage when you sign up!\n\nI also want to say thank you, as when you sign up via that link I will also get 500MB of extra free cloud storage!\nIt\'s easy, once you\'re set up you can also take advantage of the Ubuntu One referrals program to earn yourself up to 20GB of free cloud storage by inviting your family and friends.\n\nEnjoy!\n\nTo learn more about Ubuntu One visit https://one.ubuntu.com/\nFor more information about the Ubuntu One referral program see the FAQ https://one.ubuntu.com/help/faq/#account_referrals\n\n</string>
872 <string name="invite_friend.twitter_body_fmt">I\'m using Ubuntu One to store and share my files! Want 5.5GB free cloud storage? Sign up %s</string>
873-
874-
875- <string name="preferences_activity.category_uploads">Uploads</string>
876-
877-
878- <string name="preferences_activity.category_photo_auto_upload">Photo Auto Upload</string>
879-
880- <string name="preferences_activity.auto_upload_settings_title">Auto Upload settings</string>
881-
882- <string name="preferences_activity.auto_upload_directory_title">Upload directory</string>
883-
884- <string name="preferences_activity.category_photos">Photos</string>
885- <string name="preferences_activity.photo_auto_upload_title">Auto Upload photos</string>
886-
887- <string name="preferences_activity.only_on_wifi_title">Only on Wi-Fi</string>
888- <string name="preferences_activity.only_when_charging_title">Only when charging</string>
889- <string name="preferences_activity.also_when_roaming">Also when roaming</string>
890- <string name="preferences_activity.show_auto_upload_notifications">Show notifications</string>
891- <string name="preferences_activity.photo_auto_upload_directory_title">Upload photos to</string>
892-
893- <string name="preferences_activity.photo_auto_upload_sources_title">Select folders to upload</string>
894-
895- <string name="preferences_activity.upload_all_photos_title">Upload all photos now</string>
896- <string name="preferences_activity.upload_all_photos_message">This will upload all photos from your list of selected folders, which can take some time. Wi-Fi connection is recommended. Continue?</string>
897- <string name="preferences_activity.cancel_all_uploads">Cancel all</string>
898-
899-
900- <string name="preferences_activity.retry_failed_uploads_title">Retry now</string>
901- <string name="preferences_activity.retry_failed_uploads_summary_pending">You have pending uploads</string>
902- <string name="preferences_activity.retry_failed_uploads_summary_none">No pending uploads</string>
903-
904- <string name="preferences_activity.cancel_failed_uploads_title">Cancel failed</string>
905-
906- <string name="preferences_activity.auto_retry_title">"Auto-retry failed"</string>
907-
908- <string name="preferences_activity.clear_cache_title">Clear cache</string>
909- <string name="preferences_activity.clear_cache_summary">Clears cached previews and thumbs</string>
910-
911- <string name="preferences_activity.sign_out_title">@string/sign_out</string>
912- <string name="preferences_activity.sign_out_summary">Unlinks this device from U1</string>
913-
914-
915- <string name="preferences_activity.category_manage">Manage</string>
916- <string name="preferences_activity.visit_online_title">Visit account online</string>
917-
918-
919- <string name="preferences_activity.category_support">Support</string>
920-
921- <string name="preferences_activity.send_feedback_title">Send feedback</string>
922- <string name="preferences_activity.report_problem_title">Report problem</string>
923- <string name="preferences_activity.faq">Ubuntu One FAQ</string>
924-
925-
926- <string name="preferences_activity.category_about">About</string>
927- <string name="preferences_activity.version_title">Version</string>
928- <string name="preferences_activity.changelog_title">Recent changes</string>
929- <string name="preferences_activity.license_title">License</string>
930- <string name="preferences_activity.license_summary">This is open source software.</string>
931- <string name="preferences_activity.website_title">Project website</string>
932-
933-
934- <string name="preferences_activity.collect_logs_title">Collect logs</string>
935- <string name="preferences_activity.collect_logs_summary">Collect developer-friendly information</string>
936-
937- <string name="preferences_activity.review_logs_title">Review logs</string>
938- <string name="preferences_activity.review_logs_summary">You can review collected logs.</string>
939-
940- <string name="preferences_activity.send_logs_title">Send collected logs</string>
941- <string name="preferences_activity.send_logs_summary">Send logs to developers.</string>
942-
943- <string name="changelog.new_version_fmt">New version %1$s</string>
944-
945-
946- <!-- TODO karni: Cleanup! Place new strings above. -->
947-
948- <string name="cant_create_log">can\'t create log file</string>
949- <string name="cant_write_log">can\'t write to log file</string>
950+
951+ <string name="upgrade_storage">Upgrade storage</string>
952+ <string name="upgrade_storage_summary">Still not enough? Get more 20GB packs!</string>
953+
954+ <string name="sign_out">@string/sign_out</string>
955+ <string name="sign_out_summary">Unlinks this device from U1</string>
956+
957+ <string name="sign_out_from_u1">Sign out from U1?</string>
958+ <string name="sign_out_prompt">Please note, your files will not be removed either from phone nor from Ubuntu One.</string>
959+
960+ <!-- Uploads category -->
961+ <string name="category_uploads">Uploads</string>
962+
963+ <string name="auto_retry_failed">Auto-retry failed</string>
964+
965+ <string name="retry_failed_uploads_now">Retry now</string>
966+ <string name="pending_uploads">You have pending uploads</string>
967+ <string name="no_pending_uploads">No pending uploads</string>
968+
969+ <string name="cancel_all">Cancel all</string>
970+ <string name="cancel_failed">Cancel failed</string>
971+
972+ <!-- Photo Auto Upload category -->
973+ <string name="category_photo_auto_upload">Photo Auto Upload</string>
974+
975+ <string name="auto_upload_photos">Auto Upload photos</string>
976+
977+ <string name="upload_all_photos_now">Upload all photos now</string>
978+ <string name="upload_all_photos_prompt">This will upload all photos from your list of selected folders, which can take some time. Wi-Fi connection is recommended. Continue?</string>
979+
980+ <string name="only_on_wifi">Only on Wi-Fi</string>
981+ <string name="only_when_charging">Only when charging</string>
982+ <string name="also_when_roaming">Also when roaming</string>
983+ <string name="show_notifications">Show notifications</string>
984+ <string name="upload_photos_to">Upload photos to</string>
985+ <string name="select_folders_to_upload">Select folders to upload</string>
986+
987+ <!-- Manage category -->
988+ <string name="category_manage">Manage</string>
989+
990+ <string name="clear_cache">Clear cache</string>
991+ <string name="clear_cache_summary">Clears cached previews and thumbs</string>
992+
993+ <string name="visit_account_online">Visit account online</string>
994+
995+ <!-- Support category -->
996+ <string name="category_support">Support</string>
997+
998+ <string name="send_feedback">Send feedback</string>
999+ <string name="report_problem">Report problem</string>
1000+ <string name="faq">Ubuntu One FAQ</string>
1001+ <string name="tell_me_more">Tell me more</string>
1002+ <string name="tell_me_more_summary">Ubuntu One services details</string>
1003+
1004+ <!-- Report problem preference -->
1005+ <string name="cant_create_log">Can\'t create log file.</string>
1006+ <string name="cant_write_log">Can\'t write to log file.</string>
1007 <string name="need_to_mount_storage">You need to mount the SD card first.</string>
1008 <string name="no_text_viewer">You have no text viewer installed.</string>
1009- <string name="logs_ready">Logs ready to be sent!</string>
1010- <string name="send_logs_using">Send logs using:</string>
1011-
1012- <!-- Shortcuts -->
1013+
1014+ <string name="collect_logs">Collect logs</string>
1015+ <string name="collect_logs_summary">Collect developer-friendly information</string>
1016+
1017+ <string name="review_logs">Review logs</string>
1018+ <string name="review_logs_summary">You can review collected logs.</string>
1019+
1020+ <string name="send_logs">Send collected logs</string>
1021+ <string name="send_logs_summary">Send logs to developers.</string>
1022+
1023+ <!-- About category -->
1024+ <string name="category_about">About</string>
1025+
1026+ <string name="version">Version</string>
1027+ <string name="recent_changes">Recent changes</string>
1028+ <string name="project_website">Project website</string>
1029+ <string name="license">License</string>
1030+ <string name="license_summary">This is open source software.</string>
1031+
1032+ <string name="new_version_fmt">New version %1$s</string>
1033+
1034+ <!-- Notifications -->
1035+ <string name="uploading_file_n_of_n">Uploading file %1$d of %2$d</string>
1036+ <string name="downloading_file_n_of_n">Downloading file %1$d of %2$d</string>
1037+ <plurals name="uploaded_n_files">
1038+ <item quantity="one">Uploaded %d file.</item>
1039+ <item quantity="other">Uploaded %d files.</item>
1040+ </plurals>
1041+ <plurals name="downloaded_n_files">
1042+ <item quantity="one">Downloaded %d file.</item>
1043+ <item quantity="other">Downloaded %d files.</item>
1044+ </plurals>
1045+ <plurals name="failed_to_upload_n_files">
1046+ <item quantity="one">%d upload failed.</item>
1047+ <item quantity="other">%d uploads failed.</item>
1048+ </plurals>
1049+ <plurals name="failed_to_download_n_files">
1050+ <item quantity="one">%d download failed.</item>
1051+ <item quantity="other">%d downloads failed.</item>
1052+ </plurals>
1053+
1054+ <!-- Account Authenticator -->
1055+ <string name="ubuntuone">Ubuntu One</string>
1056+ <!-- Overrides token name with custom descriptive string -->
1057+ <string name="ubuntuone_token_label">Access your files</string>
1058+ <!-- If 3rd party app name is not provided -->
1059+ <string name="undefined">undefined</string>
1060+
1061+ <!-- Toasts -->
1062+ <string name="toast.no_network">No network.</string>
1063+ <string name="toast.working_offline">Working off-line.</string>
1064+ <string name="toast.cant_rename_to_nothing">Can\'t rename to nothing.</string>
1065+ <string name="toast.name_cant_be_nothing">Name can\'t be empty.</string>
1066+ <string name="toast.photos_will_auto_upload_to_fmt">Photos will auto upload to\n%s</string>
1067+ <string name="toast.file_link_copied">Link copied to clipboard.</string>
1068+ <string name="toast.no_change">No change.</string>
1069+ <string name="toast.no_suitable_activity">No suitable activity found.</string>
1070+ <string name="toast.file_not_cached_anymore">File not cached anymore.</string>
1071+ <string name="toast.file_name_cant_contain">Name can\'t contain %c.</string>
1072+ <string name="toast.failed_to_start_bg_service">Failed to start background service.</string>
1073+ <string name="toast.retrying_transfers_now">Retrying now&#8230;</string>
1074+ <string name="toast.retrying_transfers_failed">Retrying failed.</string>
1075+ <string name="toast.cache_cleared">Cache cleared.</string>
1076+
1077+ <!-- Others -->
1078+ <string name="yes">Yes</string>
1079+ <string name="no">No</string>
1080+ <string name="ok">OK</string>
1081+ <string name="cancel">Cancel</string>
1082+ <string name="canceled">Canceled</string>
1083+ <string name="create">Create</string>
1084+ <string name="please_wait">Please wait&#8230;</string>
1085+ <string name="error_fmt">Error: %s</string>
1086+
1087+ <!-- DO NOT TRANSLATE FROM THIS POINT ON, SCRATCH AREA -->
1088+
1089+ <!-- AuthProxy activity -->
1090+ <string name="authproxy.authorize_access">Authorize access</string>
1091+ <string name="authproxy.description">The following application is requesting permission to access your Ubuntu One account:</string>
1092+ <string name="authproxy.learn_more">By allowing this application to access your Ubuntu One account, you give it permission to retrieve your basic information, such as name and email, and to make changes to the data you store in Ubuntu One.</string>
1093+ <string name="authproxy.question">Only allow access if you trust this application.</string>
1094+ <string name="authproxy.allow">Allow access</string>
1095+ <string name="authproxy.deny">Don\'t allow</string>
1096+
1097+ <!-- Shortcuts activity, to be removed -->
1098 <string name="shortcut_type">Shortcut type</string>
1099 <string name="shortcut_upload_media">Upload media</string>
1100 <string name="shortcut_start">Start</string>
1101-
1102+
1103 <!-- Storage management -->
1104- <!-- TODO karni: cleanup this section once implementation done -->
1105 <string name="explain_configure_new_storage">Ah, a new SD card! This app can upload photos as soon as you take them, and you can also upload all existing photos. What would you like to upload? (You can change in preferences later.)</string>
1106 <string name="btn_act_upload_all">Existing and future</string>
1107 <string name="btn_act_upload_new_only">Future photos only</string>
1108 <string name="btn_act_upload_none">None</string>
1109
1110 <string name="storage_management_title">Storage management</string>
1111-
1112+
1113 <string name="files_count_fmt">%1$d file(s)</string>
1114 <string name="files_count_and_size_fmt">%1$d file(s), %2$s total</string>
1115-
1116+
1117 <string name="device_storage_info_header">Device storage info</string>
1118 <string name="storage_available_title">Storage available</string>
1119 <string name="free_out_of_fmt">"%1$s free out of %2$s"</string>
1120 <string name="storage_used_title">Storage used by Ubuntu One</string>
1121-
1122+
1123 <string name="files_info_header">Files info</string>
1124 <string name="files_in_cloud_title">Files in cloud</string>
1125 <string name="synced_files_title">Synced files</string>
1126 <string name="cached_files_title">Cached files</string>
1127-
1128+
1129 <string name="manage_storage_header">Manage</string>
1130 <string name="refresh_stats_title">Refresh stats</string>
1131 <string name="refresh_stats_summary">Tap here to refresh</string>
1132@@ -354,132 +394,19 @@
1133 <string name="limit_storage_summary">Choose how much space can be used</string>
1134 <string name="unselect_synced_title">Unselect synced</string>
1135 <string name="unselect_synced_summary">Selectively stop file sync</string>
1136-
1137+
1138 <string name="refreshing_dialog_text">Refreshing&#8230;</string>
1139 <string name="refreshing_canceled_toast_text">Refresh canceled.</string>
1140-
1141+
1142 <string name="checking_dialog_text">Checking&#8230;</string>
1143 <string name="missing_files_count_fmt">%1$d files were missing</string>
1144-
1145+
1146 <string name="removing_dialog_text">Removing&#8230;</string>
1147-
1148+
1149 <string name="limit_storage_dialog_title">Limit storage</string>
1150 <string name="limit_storage_dialog_text">Choose how much space can Ubuntu One Files use.</string>
1151 <string name="limit_set_to_toast_fmt">Limit set to %1$s.</string>
1152
1153 <string name="storage_device_not_available">SD card is not available. Functionality is dimished.</string>
1154 <string name="storage_is_not_accessible_not_setting_preference">Can\'t write to SD card, so not saving preference.</string>
1155-
1156- <!-- UpDown service -->
1157-
1158- <!-- Notifications -->
1159-
1160- <string name="uploading_file_n_of_n">Uploading file %1$d of %2$d</string>
1161- <string name="downloading_file_n_of_n">Downloading file %1$d of %2$d</string>
1162- <plurals name="uploaded_n_files">
1163- <item quantity="one">Uploaded %d file.</item>
1164- <item quantity="other">Uploaded %d files.</item>
1165- </plurals>
1166- <plurals name="downloaded_n_files">
1167- <item quantity="one">Downloaded %d file.</item>
1168- <item quantity="other">Downloaded %d files.</item>
1169- </plurals>
1170- <plurals name="failed_to_upload_n_files">
1171- <item quantity="one">%d upload failed.</item>
1172- <item quantity="other">%d uploads failed.</item>
1173- </plurals>
1174- <plurals name="failed_to_download_n_files">
1175- <item quantity="one">%d download failed.</item>
1176- <item quantity="other">%d downloads failed.</item>
1177- </plurals>
1178-
1179- <string name="authproxy.authorize_access">Authorize access</string>
1180- <string name="authproxy.description">The following application is requesting permission to access your Ubuntu One account:</string>
1181- <string name="authproxy.learn_more">By allowing this application to access your Ubuntu One account, you give it permission to retrieve your basic information, such as name and email, and to make changes to the data you store in Ubuntu One.</string>
1182- <string name="authproxy.question">Only allow access if you trust this application.</string>
1183- <string name="authproxy.allow">Allow access</string>
1184- <string name="authproxy.deny">Don\'t allow</string>
1185-
1186- <!-- Single Sign On -->
1187- <string name="ubuntu_single_sign_on">Ubuntu Single Sign On</string>
1188- <string name="label">Ubuntu One</string>
1189-
1190- <string name="ubuntuone_token_label">Access your files</string>
1191- <string name="undefined">undefined</string>
1192-
1193- <string name="cancelled">Cancelled</string>
1194- <string name="back">Back</string>
1195- <string name="next">Next</string>
1196- <string name="sign_in">Sign in</string>
1197-
1198- <string name="sign_in_or_up.have_an_account">I already have an Ubuntu Account</string>
1199- <string name="sign_in_or_up.crate_account">I am new to Ubuntu One</string>
1200-
1201- <string name="introduction.sign_up_now">Sign up now</string>
1202-
1203- <string name="registration.sign_up">Sign up</string>
1204- <string name="registration.sign_up_desc">Please provide a few details below to register for your Ubuntu One account.</string>
1205- <string name="registration.full_name">Full name</string>
1206- <string name="registration.email">Email</string>
1207- <string name="registration.password">Password</string>
1208- <string name="registration.password_desc">Must be at least 8 characters long and must contain at least one number and an upper case letter.</string>
1209- <string name="registration.show_password">Show password</string>
1210- <string name="registration.security">Security</string>
1211- <string name="registration.loading_captcha">Loading captcha, please wait&#8230;</string>
1212- <string name="registration.loading_captcha_failed">Oops! Touch here for new image.</string>
1213- <string name="registration.cant_read">(Can\'t read? Touch the image.)</string>
1214- <string name="registration.solution">Type the two words:</string>
1215-
1216- <string name="registration.congratulations">Congratulations</string>
1217- <string name="registration.check_mail">A confirmation email has been sent to the address you provided.\nSimply follow the link in the email to activate your Ubuntu One account.</string>
1218- <string name="registration.almost_there">Almost there!</string>
1219- <string name="registration.please_wait">Please wait…</string>
1220-
1221- <string name="authentication.email">@string/registration.email</string>
1222- <string name="authentication.password">@string/registration.password</string>
1223- <string name="authentication.sign_in">Sign in</string>
1224-
1225- <string name="sso.fullname_invalid">Name can\'t be empty.</string>
1226- <string name="sso.username_invalid">Invalid username (email).</string>
1227- <string name="sso.password_invalid">Password must be at least 8 characters long, contain one upper case letter and one digit.</string>
1228- <string name="sso.only_one_supported">Currently only one Ubuntu One account is supported. If you wish to sign in as a different user, please remove the old account first.</string>
1229-
1230- <string name="add_ubuntu_account">Add Ubuntu Account</string>
1231-
1232- <string name="opening_browser_to_sign_up">Opening browser to sign up&#8230;</string>
1233- <string name="signup_header">Sign up:</string>
1234- <string name="signup_footer_tos">"By creating an account you agree to the&lt;br />Ubuntu Account &lt;a href=&quot;http://ubuntu.com/legal&quot;&gt;Terms of Service&lt;/a&gt;."</string>
1235-
1236- <string name="getting_captcha">Getting captcha&#8230;</string>
1237- <string name="getting_captcha_failed">Failed to get captcha!</string>
1238- <string name="tap_to_change_captcha">Tap here to change captcha.</string>
1239- <string name="solution">Captcha solution</string>
1240- <string name="solution_cannot_be_empty">You must fill in the captcha solution.</string>
1241-
1242- <string name="signing_up_header">Signing up&#8230;</string>
1243-
1244- <string name="check_email_message">Please check your email and paste the token below. You can use your Home button to leave this screen.</string>
1245- <string name="paste_token_hint">Paste email token here</string>
1246- <string name="please_paste_the_token">Please paste the token sent to your email.</string>
1247- <string name="completing_registration">Completing registration&#8230;</string>
1248-
1249- <string name="oops_header">Oops</string>
1250-
1251- <string name="cancelled_signing_up">Cancelled creating account!</string>
1252- <string name="failed_to_create_account">Failed to create account. Please try again.</string>
1253-
1254- <string name="login_header">Log in:</string>
1255- <string name="login_subheader">Please note that if you\'ve registered with Launchpad you can use your existing Launchpad credentials to log in.</string>
1256- <string name="login_footer_tos">By signing in, you agree to the&lt;br />Ubuntu Account &lt;a href=\"http://ubuntu.com/legal\">Terms of Service&lt;/a>.</string>
1257-
1258- <string name="logging_in_header">Logging in&#8230;</string>
1259-
1260- <string name="logged_in_header">Logged in</string>
1261- <string name="logged_in_message">You have successfully logged in! Press OK to close this wizard.</string>
1262- <string name="cancelled_logging_in">Cancelled logging in!</string>
1263- <string name="failed_to_log_in">Failed to log in. Please try again.</string>
1264-
1265- <!-- exceptions -->
1266- <string name="authentication_error">Authentication failed. Probably credentials you have provided are incorrect.</string>
1267- <string name="connectivity_error">Connection is down or service is unavailable. Please try again later.</string>
1268 </resources>
1269
1270=== modified file 'res/xml/authenticator.xml'
1271--- res/xml/authenticator.xml 2011-11-08 23:23:29 +0000
1272+++ res/xml/authenticator.xml 2013-02-22 17:53:26 +0000
1273@@ -3,5 +3,5 @@
1274 android:accountType="com.ubuntu"
1275 android:icon="@drawable/sso_logo_small"
1276 android:smallIcon="@drawable/sso_logo_small"
1277- android:label="@string/label"
1278+ android:label="@string/ubuntuone"
1279 />
1280
1281=== modified file 'res/xml/preferences.xml'
1282--- res/xml/preferences.xml 2013-01-15 23:02:20 +0000
1283+++ res/xml/preferences.xml 2013-02-22 17:53:26 +0000
1284@@ -1,163 +1,161 @@
1285 <?xml version="1.0" encoding="utf-8"?>
1286 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
1287- android:title="@string/preferences_activity.title" >
1288+ android:title="@string/preferences_activity_label" >
1289
1290 <PreferenceCategory
1291 android:key="account"
1292- android:title="@string/preferences_activity.category_account" >
1293+ android:title="@string/category_account" >
1294 <Preference
1295 android:enabled="false"
1296 android:key="username"
1297 android:persistent="true"
1298- android:summary="@string/preferences_activity.unknown_value"
1299- android:title="@string/preferences_activity.username_title" />
1300+ android:title="@string/username" />
1301 <Preference
1302 android:enabled="false"
1303 android:key="plan"
1304 android:persistent="true"
1305- android:summary="@string/preferences_activity.unknown_value"
1306- android:title="@string/preferences_activity.plan_title" />
1307+ android:title="@string/current_plan" />
1308 <Preference
1309 android:key="invite_friend"
1310- android:summary="@string/preferences_activity.invite_friend_summary"
1311- android:title="@string/preferences_activity.invite_friend_title" />
1312+ android:summary="@string/invite_friend_summary"
1313+ android:title="@string/invite_friend" />
1314 <Preference
1315 android:key="purchase_storage"
1316- android:summary="@string/preferences_activity.purchase_storage_summary"
1317- android:title="@string/preferences_activity.purchase_storage_title" />
1318+ android:summary="@string/upgrade_storage_summary"
1319+ android:title="@string/upgrade_storage" />
1320 <Preference
1321 android:key="sign_out"
1322- android:summary="@string/preferences_activity.sign_out_summary"
1323- android:title="@string/preferences_activity.sign_out_title" />
1324+ android:summary="@string/sign_out_summary"
1325+ android:title="@string/sign_out" />
1326 </PreferenceCategory>
1327 <PreferenceCategory
1328 android:key="uploads"
1329- android:title="@string/preferences_activity.category_uploads" >
1330+ android:title="@string/category_uploads" >
1331 <CheckBoxPreference
1332 android:defaultValue="true"
1333 android:key="auto_retry_failed"
1334 android:persistent="true"
1335- android:title="@string/preferences_activity.auto_retry_title" />
1336+ android:title="@string/auto_retry_failed" />
1337
1338 <Preference
1339 android:enabled="false"
1340 android:key="retry_failed"
1341- android:summary="@string/preferences_activity.retry_failed_uploads_summary_none"
1342- android:title="@string/preferences_activity.retry_failed_uploads_title" />
1343+ android:summary="@string/no_pending_uploads"
1344+ android:title="@string/retry_failed_uploads_now" />
1345 <Preference
1346 android:key="cancel_all_uploads"
1347- android:title="@string/preferences_activity.cancel_all_uploads" />
1348+ android:title="@string/cancel_all" />
1349 <Preference
1350 android:enabled="false"
1351 android:key="cancel_failed"
1352- android:title="@string/preferences_activity.cancel_failed_uploads_title" />
1353+ android:title="@string/cancel_failed" />
1354 </PreferenceCategory>
1355 <PreferenceCategory
1356 android:key="photo_auto_upload"
1357- android:title="@string/preferences_activity.category_photo_auto_upload" >
1358+ android:title="@string/category_photo_auto_upload" >
1359 <CheckBoxPreference
1360 android:defaultValue="false"
1361 android:key="upload_photos"
1362 android:persistent="true"
1363- android:title="@string/preferences_activity.photo_auto_upload_title" />
1364+ android:title="@string/auto_upload_photos" />
1365
1366 <Preference
1367 android:dependency="upload_photos"
1368 android:key="upload_photos_now"
1369- android:title="@string/preferences_activity.upload_all_photos_title" />
1370+ android:title="@string/upload_all_photos_now" />
1371 <CheckBoxPreference
1372 android:defaultValue="true"
1373 android:key="use_wifi_only"
1374 android:persistent="true"
1375- android:title="@string/preferences_activity.only_on_wifi_title" />
1376+ android:title="@string/only_on_wifi" />
1377 <CheckBoxPreference
1378 android:defaultValue="false"
1379 android:key="only_when_charging"
1380 android:persistent="true"
1381- android:title="@string/preferences_activity.only_when_charging_title" />
1382+ android:title="@string/only_when_charging" />
1383 <CheckBoxPreference
1384 android:defaultValue="false"
1385 android:key="also_when_roaming"
1386 android:persistent="true"
1387 android:summary="Roaming uploads may cost you money."
1388- android:title="@string/preferences_activity.also_when_roaming" />
1389+ android:title="@string/also_when_roaming" />
1390 <CheckBoxPreference
1391 android:defaultValue="false"
1392 android:key="show_auto_upload_notifications"
1393 android:persistent="true"
1394- android:title="@string/preferences_activity.show_auto_upload_notifications" />
1395+ android:title="@string/show_notifications" />
1396
1397 <Preference
1398 android:key="upload_photos_dir"
1399 android:persistent="true"
1400- android:title="@string/preferences_activity.photo_auto_upload_directory_title" />
1401+ android:title="@string/upload_photos_to" />
1402 <Preference
1403 android:key="upload_photos_src"
1404- android:title="@string/preferences_activity.photo_auto_upload_sources_title" />
1405+ android:title="@string/select_folders_to_upload" />
1406 </PreferenceCategory>
1407 <PreferenceCategory
1408 android:key="manage"
1409- android:title="@string/preferences_activity.category_manage" >
1410+ android:title="@string/category_manage" >
1411 <Preference
1412 android:key="clear_cache"
1413- android:summary="@string/preferences_activity.clear_cache_summary"
1414- android:title="@string/preferences_activity.clear_cache_title" />
1415+ android:summary="@string/clear_cache_summary"
1416+ android:title="@string/clear_cache" />
1417 <Preference
1418 android:key="visit_online"
1419- android:title="@string/preferences_activity.visit_online_title" />
1420+ android:title="@string/visit_account_online" />
1421 </PreferenceCategory>
1422 <PreferenceCategory
1423 android:key="support"
1424- android:title="@string/preferences_activity.category_support" >
1425+ android:title="@string/category_support" >
1426 <Preference
1427 android:key="feedback"
1428- android:title="@string/preferences_activity.send_feedback_title" />
1429+ android:title="@string/send_feedback" />
1430
1431 <PreferenceScreen
1432 android:enabled="true"
1433 android:key="report_problem"
1434- android:title="@string/preferences_activity.report_problem_title" >
1435+ android:title="@string/report_problem" >
1436 <CheckBoxPreference
1437 android:key="collect_logs"
1438- android:summary="@string/preferences_activity.collect_logs_summary"
1439- android:title="@string/preferences_activity.collect_logs_title" />
1440+ android:summary="@string/collect_logs_summary"
1441+ android:title="@string/collect_logs" />
1442
1443 <Preference
1444 android:dependency="collect_logs"
1445 android:key="review_logs"
1446- android:summary="@string/preferences_activity.review_logs_summary"
1447- android:title="@string/preferences_activity.review_logs_title" />
1448+ android:summary="@string/review_logs_summary"
1449+ android:title="@string/review_logs" />
1450 <Preference
1451 android:dependency="collect_logs"
1452 android:key="send_logs"
1453- android:summary="@string/preferences_activity.send_logs_summary"
1454- android:title="@string/preferences_activity.send_logs_title" />
1455+ android:summary="@string/send_logs_summary"
1456+ android:title="@string/send_logs" />
1457 </PreferenceScreen>
1458
1459 <Preference
1460 android:key="faq"
1461- android:title="@string/preferences_activity.faq" />
1462+ android:title="@string/faq" />
1463 <Preference
1464 android:key="upgrade_plan"
1465- android:summary="@string/preferences_activity.upgrade_plan_summary"
1466- android:title="@string/preferences_activity.upgrade_plan_title" />
1467+ android:summary="@string/tell_me_more_summary"
1468+ android:title="@string/tell_me_more" />
1469 </PreferenceCategory>
1470 <PreferenceCategory
1471 android:key="About"
1472- android:title="@string/preferences_activity.category_about" >
1473+ android:title="@string/category_about" >
1474 <Preference
1475 android:key="version"
1476- android:title="@string/preferences_activity.version_title" />
1477+ android:title="@string/version" />
1478 <Preference
1479 android:key="changelog"
1480- android:title="@string/preferences_activity.changelog_title" />
1481+ android:title="@string/recent_changes" />
1482 <Preference
1483 android:key="website"
1484- android:title="@string/preferences_activity.website_title" />
1485+ android:title="@string/project_website" />
1486 <Preference
1487 android:key="license"
1488- android:summary="@string/preferences_activity.license_summary"
1489- android:title="@string/preferences_activity.license_title" />
1490+ android:summary="@string/license_summary"
1491+ android:title="@string/license" />
1492 <Preference
1493 android:key="greendroid"
1494 android:summary="Open source library we used"
1495
1496=== modified file 'src/com/ubuntuone/android/files/activity/FilesActivity.java'
1497--- src/com/ubuntuone/android/files/activity/FilesActivity.java 2013-02-06 23:07:30 +0000
1498+++ src/com/ubuntuone/android/files/activity/FilesActivity.java 2013-02-22 17:53:26 +0000
1499@@ -302,20 +302,15 @@
1500 private void onCreateUploadQuickActionGrid() {
1501 mUploadGrid = new QuickActionGrid(this);
1502 mUploadGrid.addQuickAction(new BlackQuickAction(this,
1503- R.drawable.ic_act_upload_photo,
1504- R.string.action_bar_add_image));
1505- mUploadGrid.addQuickAction(new BlackQuickAction(this,
1506- R.drawable.ic_act_upload_video,
1507- R.string.action_bar_add_video));
1508- mUploadGrid.addQuickAction(new BlackQuickAction(this,
1509- R.drawable.ic_act_upload_audio,
1510- R.string.action_bar_add_audio));
1511- mUploadGrid.addQuickAction(new BlackQuickAction(this,
1512- R.drawable.ic_act_upload_file,
1513- R.string.action_bar_add_file));
1514- mUploadGrid.addQuickAction(new BlackQuickAction(this,
1515- R.drawable.ic_act_new_folder,
1516- R.string.action_bar_new_directory));
1517+ R.drawable.ic_act_upload_photo, R.string.add_image));
1518+ mUploadGrid.addQuickAction(new BlackQuickAction(this,
1519+ R.drawable.ic_act_upload_video, R.string.add_video));
1520+ mUploadGrid.addQuickAction(new BlackQuickAction(this,
1521+ R.drawable.ic_act_upload_audio, R.string.add_audio));
1522+ mUploadGrid.addQuickAction(new BlackQuickAction(this,
1523+ R.drawable.ic_act_upload_file, R.string.add_file));
1524+ mUploadGrid.addQuickAction(new BlackQuickAction(this,
1525+ R.drawable.ic_act_new_folder, R.string.new_folder));
1526 mUploadGrid.setOnQuickActionClickListener(mUploadQuickActionListener);
1527 }
1528
1529@@ -489,8 +484,8 @@
1530 private Dialog buildNoNetworkDialog() {
1531 final AlertDialog dialog = new AlertDialog.Builder(this)
1532 .setIcon(android.R.drawable.ic_dialog_alert)
1533- .setTitle(R.string.dialog_no_network_title)
1534- .setMessage(R.string.dialog_no_network_message)
1535+ .setTitle(R.string.no_network)
1536+ .setMessage(R.string.network_required)
1537 .setPositiveButton(R.string.ok, onClickDismiss)
1538 .create();
1539 return dialog;
1540@@ -498,12 +493,12 @@
1541
1542 private Dialog buildInsufficientSpaceDialog(long needed, long free) {
1543 final String message = String.format(
1544- getString(R.string.dialog_no_space_message_fmt),
1545+ getString(R.string.no_space_message_fmt),
1546 FileUtilities.getHumanReadableSize(needed),
1547 FileUtilities.getHumanReadableSize(free));
1548 final AlertDialog dialog = new AlertDialog.Builder(this)
1549 .setIcon(android.R.drawable.ic_dialog_alert)
1550- .setTitle(R.string.dialog_no_space_title)
1551+ .setTitle(R.string.no_space)
1552 .setMessage(message)
1553 .setPositiveButton(R.string.ok, new OnClickListener() {
1554 public void onClick(DialogInterface dialog, int which) {
1555@@ -520,7 +515,7 @@
1556 final AlertDialog dialog = new AlertDialog.Builder(this)
1557 .setIcon(android.R.drawable.ic_dialog_info)
1558 .setTitle(title)
1559- .setMessage(R.string.dialog_nothing_to_download)
1560+ .setMessage(R.string.nothing_to_download)
1561 .setPositiveButton(R.string.ok, new OnClickListener() {
1562 public void onClick(DialogInterface dialog, int which) {
1563 dialog.dismiss();
1564@@ -533,7 +528,7 @@
1565
1566 private Dialog buildCheckDirectorySizeDialog(final Bundle extras) {
1567 final ProgressDialog dialog = new ProgressDialog(this);
1568- dialog.setMessage(getString(R.string.dialog_checking_size_message));
1569+ dialog.setMessage(getString(R.string.checking_size));
1570 dialog.setIndeterminate(true);
1571 dialog.setCancelable(true);
1572 return dialog;
1573@@ -558,16 +553,16 @@
1574
1575 final StringBuilder msgBuilder = new StringBuilder(32);
1576 msgBuilder.append(String.format(
1577- getString(R.string.dialog_downloading_dir_is_x_large), sizeText));
1578+ getString(R.string.folder_size_fmt), sizeText));
1579 int network = NetworkUtil.getAvailableNetworkType(this);
1580 if (network == -1) {
1581 return buildNoNetworkDialog();
1582 } else if (network == ConnectivityManager.TYPE_MOBILE) {
1583 msgBuilder.append(" ");
1584- msgBuilder.append(getString(R.string.dialog_downloading_dir_on_mobile));
1585+ msgBuilder.append(getString(R.string.folder_download_on_mobile));
1586 }
1587 msgBuilder.append(" ");
1588- msgBuilder.append(getString(R.string.dialog_downloading_dir_are_you_sure));
1589+ msgBuilder.append(getString(R.string.folder_download_prompt));
1590
1591 final OnClickListener onClick = new OnClickListener() {
1592
1593@@ -594,7 +589,7 @@
1594
1595 final AlertDialog dialog = new AlertDialog.Builder(this)
1596 .setIcon(android.R.drawable.ic_dialog_info)
1597- .setTitle(R.string.dialog_downloading_dir_title)
1598+ .setTitle(R.string.download_folder)
1599 .setMessage(msgBuilder.toString())
1600 .setPositiveButton(R.string.yes, onClick)
1601 .setNegativeButton(R.string.no, onClick)
1602@@ -604,7 +599,7 @@
1603
1604 private Dialog buildCreatePublicLinkDialog() {
1605 final ProgressDialog dialog = new ProgressDialog(this);
1606- dialog.setMessage(getString(R.string.dialog_creating_link));
1607+ dialog.setMessage(getString(R.string.creating_link));
1608 dialog.setIndeterminate(true);
1609 dialog.setCancelable(false);
1610 return dialog;
1611@@ -684,7 +679,7 @@
1612 final AlertDialog dialog = new AlertDialog.Builder(this)
1613 .setView(dialogView)
1614 .setIcon(android.R.drawable.ic_dialog_info)
1615- .setTitle(R.string.dialog_rename_directory_title)
1616+ .setTitle(R.string.rename_folder)
1617 .setPositiveButton(R.string.context_rename, onClick)
1618 .setNegativeButton(R.string.cancel, onClick)
1619 .create();
1620@@ -720,7 +715,7 @@
1621 final AlertDialog dialog = new AlertDialog.Builder(this)
1622 .setIcon(android.R.drawable.ic_dialog_alert)
1623 .setTitle(name)
1624- .setMessage(R.string.dialog_delete_item_message)
1625+ .setMessage(R.string.delete_item_prompt)
1626 .setPositiveButton(R.string.yes, onClick)
1627 .setNegativeButton(R.string.no, onClick)
1628 .create();
1629@@ -786,12 +781,12 @@
1630 (ViewGroup) findViewById(R.id.dialog_root));
1631 final TextView textView =
1632 (TextView) dialogView.findViewById(R.id.dialog_text);
1633- textView.setText(R.string.dialog_create_directory_title);
1634+ textView.setText(R.string.create_folder);
1635
1636 final AlertDialog dialog = new AlertDialog.Builder(this)
1637 .setView(dialogView)
1638 .setIcon(android.R.drawable.ic_dialog_info)
1639- .setTitle(R.string.dialog_create_directory_title)
1640+ .setTitle(R.string.create_folder)
1641 .setPositiveButton(R.string.create, onClick)
1642 .setNegativeButton(R.string.cancel, onClick)
1643 .create();
1644@@ -807,8 +802,8 @@
1645
1646 final AlertDialog dialog = new AlertDialog.Builder(this)
1647 .setIcon(android.R.drawable.ic_dialog_info)
1648- .setTitle(R.string.dialog_pick_upload_directory_title)
1649- .setMessage(getText(R.string.dialog_pick_upload_directory_message))
1650+ .setTitle(R.string.select_upload_directory)
1651+ .setMessage(getText(R.string.select_upload_directory_message))
1652 .setPositiveButton(R.string.ok, onClick)
1653 .create();
1654 return dialog;
1655@@ -1136,19 +1131,19 @@
1656 };
1657
1658 private void onUploadImageClicked() {
1659- onUpload("image/*", R.string.dialog_pick_image_title, false);
1660+ onUpload("image/*", R.string.pick_image, false);
1661 }
1662
1663 private void onUploadVideoClicked() {
1664- onUpload("video/*", R.string.dialog_pick_video_title, false);
1665+ onUpload("video/*", R.string.pick_video, false);
1666 }
1667
1668 private void onUploadAudioClicked() {
1669- onUpload("audio/*", R.string.dialog_pick_audio_title, false);
1670+ onUpload("audio/*", R.string.pick_audio, false);
1671 }
1672
1673 private void onUploadFileClicked() {
1674- onUpload("*/*", R.string.dialog_pick_file_title, true);
1675+ onUpload("*/*", R.string.pick_file, true);
1676 }
1677
1678 private void onNewFolderClicked() {
1679@@ -1200,7 +1195,7 @@
1680 UpDownServiceHelper.upload(this, uri, parentResourcePath, false);
1681 } else {
1682 Log.i(TAG, "no file selected");
1683- UIUtil.showToast(this, R.string.files_activity_no_files);
1684+ UIUtil.showToast(this, R.string.no_files);
1685 }
1686 break;
1687 }
1688@@ -1462,7 +1457,7 @@
1689 }
1690
1691 private void awaitWithListEmptyTextView() {
1692- String loadingFiles = getString(R.string.files_activity_loading_files);
1693+ String loadingFiles = getString(R.string.loading_files);
1694 if (mEmptyTextView != null &&
1695 mEmptyTextView.getText().equals(loadingFiles)) {
1696 return;
1697@@ -1470,7 +1465,7 @@
1698 mHandler.post(new Runnable() {
1699 public void run() {
1700 if (mEmptyTextView != null) {
1701- mEmptyTextView.setText(R.string.files_activity_loading_files);
1702+ mEmptyTextView.setText(R.string.loading_files);
1703 }
1704 if (!NetworkUtil.isConnected(FilesActivity.this)) {
1705 mEmptyTextView.setText(R.string.no_network);
1706@@ -1485,7 +1480,7 @@
1707 return;
1708 }
1709
1710- String directoryEmpty = getString(R.string.files_activity_directory_is_empty);
1711+ String directoryEmpty = getString(R.string.folder_is_empty);
1712 if (mEmptyTextView != null &&
1713 mEmptyTextView.getText().equals(directoryEmpty)) {
1714 return;
1715@@ -1495,7 +1490,7 @@
1716 String node = mPathTracker.getCurrentNode();
1717 if (resourcePath == null || node == null ||
1718 resourcePath.equals(node)) {
1719- mEmptyTextView.setText(R.string.files_activity_directory_is_empty);
1720+ mEmptyTextView.setText(R.string.folder_is_empty);
1721 }
1722 }
1723 });
1724@@ -1542,7 +1537,7 @@
1725 final Intent chooser = new Intent(Intent.ACTION_VIEW);
1726 chooser.putExtra(Intent.EXTRA_INTENT, intent);
1727 chooser.putExtra(Intent.EXTRA_TITLE,
1728- getText(R.string.dialog_open_with_title));
1729+ getText(R.string.open_with));
1730 try {
1731 startActivity(intent);
1732 } catch (ActivityNotFoundException e) {
1733@@ -1570,7 +1565,7 @@
1734 Intent chooser = new Intent(Intent.ACTION_VIEW);
1735 chooser.putExtra(Intent.EXTRA_INTENT, intent);
1736 chooser.putExtra(Intent.EXTRA_TITLE,
1737- getText(R.string.dialog_open_with_title));
1738+ getText(R.string.open_with));
1739 try {
1740 startActivity(intent);
1741 } catch (ActivityNotFoundException e) {
1742@@ -1680,7 +1675,7 @@
1743 private final static String PURCHASED_FROM_U1 =
1744 "Purchased from Ubuntu One";
1745 private final String PURCHASED_MUSIC =
1746- getString(R.string.node_is_purchased_music);
1747+ getString(R.string.purchased_music_display_name);
1748
1749 public FilesAdapter(Context context, Cursor c, boolean autoRequery) {
1750 super(context, c, autoRequery);
1751@@ -1835,22 +1830,22 @@
1752 holder.itemTimestamp.setText("");
1753 } else {
1754 final String modifiedText = String.format(
1755- getString(R.string.node_last_modified),
1756+ getString(R.string.last_modified_fmt),
1757 DateUtilities.getFriendlyDate(context, modified));
1758 holder.itemTimestamp.setText(modifiedText);
1759 }
1760 } else {
1761 // Provide state feedback.
1762 if (ResourceState.STATE_GETTING.equals(state)) {
1763- holder.itemTimestamp.setText(R.string.node_is_downloading);
1764+ holder.itemTimestamp.setText(R.string.downloading);
1765 } else if (ResourceState.STATE_POSTING.equals(state)) {
1766- holder.itemTimestamp.setText(R.string.node_is_uploading);
1767+ holder.itemTimestamp.setText(R.string.uploading);
1768 } else if (ResourceState.STATE_DELETING.equals(state)) {
1769- holder.itemTimestamp.setText(R.string.node_is_deleting);
1770+ holder.itemTimestamp.setText(R.string.deleting);
1771 } else if (ResourceState.STATE_GETTING_FAILED.equals(state)) {
1772- holder.itemTimestamp.setText(R.string.node_download_has_failed);
1773+ holder.itemTimestamp.setText(R.string.download_failed_tap_resume);
1774 } else if (ResourceState.STATE_POSTING_FAILED.equals(state)) {
1775- holder.itemTimestamp.setText(R.string.node_upload_has_failed);
1776+ holder.itemTimestamp.setText(R.string.upload_failed_tap_retry);
1777 }
1778 }
1779 }
1780
1781=== modified file 'src/com/ubuntuone/android/files/activity/GalleryActivity.java'
1782--- src/com/ubuntuone/android/files/activity/GalleryActivity.java 2012-08-06 20:03:41 +0000
1783+++ src/com/ubuntuone/android/files/activity/GalleryActivity.java 2013-02-22 17:53:26 +0000
1784@@ -153,7 +153,7 @@
1785
1786 private Dialog buildCreatePublicLinkDialog() {
1787 final ProgressDialog dialog = new ProgressDialog(this);
1788- dialog.setMessage(getString(R.string.dialog_creating_link));
1789+ dialog.setMessage(getString(R.string.creating_link));
1790 dialog.setIndeterminate(true);
1791 dialog.setCancelable(false);
1792 return dialog;
1793
1794=== modified file 'src/com/ubuntuone/android/files/activity/LoginActivity.java'
1795--- src/com/ubuntuone/android/files/activity/LoginActivity.java 2013-01-15 02:28:24 +0000
1796+++ src/com/ubuntuone/android/files/activity/LoginActivity.java 2013-02-22 17:53:26 +0000
1797@@ -117,7 +117,7 @@
1798 if (oauthData == null && hint != null) {
1799 fragmentToShow = FRAGMENT_VALIDATE;
1800 } else if (oauthData != null && mAccountAuthenticatorResponse != null) {
1801- UIUtil.showToast(this, R.string.sso_only_one_supported, true);
1802+ UIUtil.showToast(this, R.string.one_account_only, true);
1803 finish();
1804 return;
1805 }
1806
1807=== modified file 'src/com/ubuntuone/android/files/activity/PreferencesActivity.java'
1808--- src/com/ubuntuone/android/files/activity/PreferencesActivity.java 2013-02-02 12:42:30 +0000
1809+++ src/com/ubuntuone/android/files/activity/PreferencesActivity.java 2013-02-22 17:53:26 +0000
1810@@ -285,7 +285,7 @@
1811 final double usedPercentage = 100 * usedBytes / (double) maxBytes;
1812
1813 final String spaceDetails = getString(
1814- R.string.preferences_activity_bytes_used_summary_fmt,
1815+ R.string.current_plan_fmt,
1816 FileUtilities.getHumanReadableSize(usedBytes),
1817 FileUtilities.getHumanReadableSize(maxBytes),
1818 usedPercentage);
1819@@ -379,9 +379,7 @@
1820 long userId = Preferences.getLong(Preferences.USER_ID_KEY, -1);
1821 if (userId == -1) {
1822 UIUtil.showToast(
1823- mContext,
1824- R.string.preferences_activity_please_wait_updating_user_info,
1825- true);
1826+ mContext, R.string.please_wait_updating_user_info, true);
1827 MetaServiceHelper.getUserInfo(this, null);
1828 return;
1829 }
1830@@ -459,8 +457,8 @@
1831
1832 final AlertDialog dialog =
1833 new AlertDialog.Builder(PreferencesActivity.this)
1834- .setTitle(R.string.preferences_activity_upload_all_photos_title)
1835- .setMessage(R.string.preferences_activity_upload_all_photos_message)
1836+ .setTitle(R.string.upload_all_photos_now)
1837+ .setMessage(R.string.upload_all_photos_prompt)
1838 .setPositiveButton(R.string.yes, onClickListener)
1839 .setNegativeButton(R.string.no, onClickListener)
1840 .create();
1841@@ -536,14 +534,12 @@
1842 getContentResolver());
1843 if (failedUploads > 0) {
1844 mRetryFailed.setEnabled(true);
1845- mRetryFailed.setSummary(
1846- R.string.preferences_activity_retry_failed_uploads_summary_pending);
1847+ mRetryFailed.setSummary(R.string.pending_uploads);
1848 mCancelFailed.setEnabled(true);
1849 return true;
1850 } else {
1851 mRetryFailed.setEnabled(false);
1852- mRetryFailed.setSummary(
1853- R.string.preferences_activity_retry_failed_uploads_summary_none);
1854+ mRetryFailed.setSummary(R.string.no_pending_uploads);
1855 mCancelFailed.setEnabled(false);
1856 return false;
1857 }
1858@@ -608,8 +604,8 @@
1859
1860 final AlertDialog dialog =
1861 new AlertDialog.Builder(mContext)
1862- .setTitle(R.string.dialog_sign_out_title)
1863- .setMessage(R.string.dialog_sign_out_message)
1864+ .setTitle(R.string.sign_out_from_u1)
1865+ .setMessage(R.string.sign_out_prompt)
1866 .setPositiveButton(R.string.sign_out, onClick)
1867 .setNegativeButton(R.string.cancel, onClick)
1868 .create();
1869
1870=== modified file 'src/com/ubuntuone/android/files/activity/StoreActivity.java'
1871--- src/com/ubuntuone/android/files/activity/StoreActivity.java 2012-07-11 21:22:50 +0000
1872+++ src/com/ubuntuone/android/files/activity/StoreActivity.java 2013-02-22 17:53:26 +0000
1873@@ -226,8 +226,7 @@
1874 */
1875 private Dialog buildLoggingInDialog() {
1876 final ProgressDialog dialog =
1877- buildSimpleProgressDialog(
1878- R.string.progress_signing_in);
1879+ buildSimpleProgressDialog(R.string.signing_in);
1880 dialog.setOnCancelListener(new OnCancelListener() {
1881 public void onCancel(DialogInterface dialog) {
1882 if (mLoginTask != null) {
1883@@ -247,7 +246,7 @@
1884 */
1885 private Dialog buildUpdatingAccountInfoDialog() {
1886 final ProgressDialog dialog =
1887- buildSimpleProgressDialog(R.string.progress_updating_please_wait);
1888+ buildSimpleProgressDialog(R.string.updating_please_wait);
1889 dialog.setCancelable(false);
1890 return dialog;
1891 }
1892@@ -262,7 +261,7 @@
1893 final AlertDialog dialog =
1894 new AlertDialog.Builder(StoreActivity.this)
1895 .setIcon(android.R.drawable.ic_dialog_alert)
1896- .setMessage(R.string.store_activity_no_network_to_purchase_storage)
1897+ .setMessage(R.string.purchase_no_network)
1898 .setCancelable(false)
1899 .setPositiveButton(R.string.ok, new OnClickListener() {
1900 public void onClick(DialogInterface dialog, int which) {
1901@@ -372,7 +371,7 @@
1902 webView.loadUrl(PURCHASE_STORAGE_URL);
1903 } else {
1904 exception = new Exception(getString(R.string
1905- .store_activity_could_not_start_storage_purchase_try_again_later));
1906+ .purchase_init_failed));
1907 }
1908 } catch (AuthorizerException e) {
1909 // TODO karni: Consider invalidating oauth token in AccountManager
1910
1911=== modified file 'src/com/ubuntuone/android/files/fragment/GalleryFragment.java'
1912--- src/com/ubuntuone/android/files/fragment/GalleryFragment.java 2012-08-13 21:23:04 +0000
1913+++ src/com/ubuntuone/android/files/fragment/GalleryFragment.java 2013-02-22 17:53:26 +0000
1914@@ -282,7 +282,7 @@
1915 @Override
1916 public void run() {
1917 if (holder.errorTextView != null) {
1918- holder.errorTextView.setText(R.string.node_is_downloading);
1919+ holder.errorTextView.setText(R.string.downloading);
1920 holder.errorTextView.setVisibility(View.VISIBLE);
1921 holder.errorTextView.startAnimation(quickFadeIn);
1922 }
1923
1924=== modified file 'src/com/ubuntuone/android/files/fragment/SignInFragment.java'
1925--- src/com/ubuntuone/android/files/fragment/SignInFragment.java 2013-02-06 20:07:13 +0000
1926+++ src/com/ubuntuone/android/files/fragment/SignInFragment.java 2013-02-22 17:53:26 +0000
1927@@ -149,7 +149,7 @@
1928 if (account != null && !account.name.toLowerCase()
1929 .equals(username.toLowerCase())) {
1930 final AlertDialogFragment f = AlertDialogFragment.newInstance(
1931- -1, R.string.sso_only_one_supported,
1932+ -1, R.string.one_account_only,
1933 new DialogInterface.OnClickListener() {
1934 @Override
1935 public void onClick(DialogInterface dialog, int which) {
1936@@ -258,7 +258,7 @@
1937
1938 @Override
1939 public void onCancel() {
1940- UIUtil.showToast(getActivity(), R.string.cancelled);
1941+ UIUtil.showToast(getActivity(), R.string.canceled);
1942 Preferences.updateSerializedOAuthToken(null);
1943 }
1944
1945
1946=== modified file 'src/com/ubuntuone/android/files/fragment/ValidateFragment.java'
1947--- src/com/ubuntuone/android/files/fragment/ValidateFragment.java 2012-04-24 02:18:57 +0000
1948+++ src/com/ubuntuone/android/files/fragment/ValidateFragment.java 2013-02-22 17:53:26 +0000
1949@@ -101,8 +101,8 @@
1950
1951 final Bundle args = getArguments();
1952 if (args != null && args.containsKey(EXTRA_POST_VALIDATION)) {
1953- validationHeader.setText(R.string.registration_almost_there);
1954- validationMessage.setText(R.string.registration_please_wait);
1955+ validationHeader.setText(R.string.almost_there);
1956+ validationMessage.setText(R.string.please_wait);
1957 }
1958 return content;
1959 }
1960
1961=== modified file 'src/com/ubuntuone/android/files/util/AuthenticateUserTask.java'
1962--- src/com/ubuntuone/android/files/util/AuthenticateUserTask.java 2013-02-02 12:48:16 +0000
1963+++ src/com/ubuntuone/android/files/util/AuthenticateUserTask.java 2013-02-22 17:53:26 +0000
1964@@ -70,7 +70,7 @@
1965 handler = new Handler();
1966
1967 dialogFragment = ProgressDialogFragment
1968- .newInstance(-1, R.string.progress_signing_in);
1969+ .newInstance(-1, R.string.signing_in);
1970
1971 if (activity.get() != null) {
1972 final FragmentManager fragmentManager = activity
1973
1974=== modified file 'src/com/ubuntuone/android/files/util/ChangeLogUtils.java'
1975--- src/com/ubuntuone/android/files/util/ChangeLogUtils.java 2012-09-26 18:00:01 +0000
1976+++ src/com/ubuntuone/android/files/util/ChangeLogUtils.java 2013-02-22 17:53:26 +0000
1977@@ -84,7 +84,7 @@
1978
1979 private static AlertDialog buildChangelogDialog(Context context, String version) {
1980 final Spanned changelog = readChangelog(context);
1981- final String versionFormat = context.getString(R.string.changelog_new_version_fmt);
1982+ final String versionFormat = context.getString(R.string.new_version_fmt);
1983
1984 final AlertDialog dialog = new AlertDialog.Builder(context)
1985 .setTitle(String.format(versionFormat, version))
1986
1987=== modified file 'src/com/ubuntuone/android/files/util/DateUtilities.java'
1988--- src/com/ubuntuone/android/files/util/DateUtilities.java 2012-01-03 16:32:04 +0000
1989+++ src/com/ubuntuone/android/files/util/DateUtilities.java 2013-02-22 17:53:26 +0000
1990@@ -80,19 +80,19 @@
1991 if (diff < MILLIS_IN_HOUR) {
1992 int minutes = (int) (diff / (double) MILLIS_IN_MINUTE);
1993 final String fmt = sResources.getQuantityString(
1994- R.plurals.node_last_modified_minutes, minutes, minutes);
1995+ R.plurals.last_modified_minutes, minutes, minutes);
1996 return String.format(fmt, minutes);
1997 }
1998 if (diff < MILLIS_IN_DAY) {
1999 int hours = (int) (diff / (double) MILLIS_IN_HOUR);
2000 final String fmt = sResources.getQuantityString(
2001- R.plurals.node_last_modified_hours, hours, hours);
2002+ R.plurals.last_modified_hours, hours, hours);
2003 return String.format(fmt, hours);
2004 }
2005 if (diff < MILLIS_IN_MONTH) {
2006 int days = (int) (diff / (double) MILLIS_IN_DAY);
2007 final String fmt = sResources.getQuantityString(
2008- R.plurals.node_last_modified_days, days, days);
2009+ R.plurals.last_modified_days, days, days);
2010 return String.format(fmt, days);
2011 }
2012 return sDateFormatter.format(new Date(timestamp));
2013
2014=== modified file 'src/com/ubuntuone/android/files/util/ValidateAccountTask.java'
2015--- src/com/ubuntuone/android/files/util/ValidateAccountTask.java 2013-02-02 12:48:16 +0000
2016+++ src/com/ubuntuone/android/files/util/ValidateAccountTask.java 2013-02-22 17:53:26 +0000
2017@@ -68,7 +68,7 @@
2018
2019 if (withDialog) {
2020 dialogFragment = ProgressDialogFragment.newInstance(
2021- -1, R.string.progress_signing_in_to_u1);
2022+ -1, R.string.signing_in_to_u1);
2023
2024 if (activity.get() != null) {
2025 final FragmentManager fragmentManager = activity

Subscribers

People subscribed via source and target branches

to status/vote changes: