The Humpolec project

Merge lp:~humpolec-team/humpolec/UbuntuInstaller_lp1264034_1 into lp:humpolec

  1. UbuntuInstaller_lp1264034_1
  2. Merge into UbuntuInstaller
Proposed by Yuan-Chen Cheng
Status: Merged
Merge reported by: Yuan-Chen Cheng
Merged at revision: not available
Proposed branch: lp:~humpolec-team/humpolec/UbuntuInstaller_lp1264034_1
Merge into: lp:humpolec
Diff against target: 30 lines (+4/-4)
2 files modified
res/values/strings.xml (+2/-2)
src/com/canonical/ubuntu/installer/InstallActivity.java (+2/-2)
To merge this branch: bzr merge lp:~humpolec-team/humpolec/UbuntuInstaller_lp1264034_1
Reviewer Review Type Date Requested Status
Ethan Chang (community) Approve
Rex Tsai Approve
Review via email: mp+200768@code.launchpad.net

Description of the change

refine message (to get rid of misunderstanding)

To post a comment you must log in.
Revision history for this message
Rex Tsai (chihchun) wrote :

LGTM

review: Approve
Revision history for this message
Ethan Chang (ethan.chang) wrote :

Looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'res/values/strings.xml'
2--- res/values/strings.xml 2014-01-03 06:42:51 +0000
3+++ res/values/strings.xml 2014-01-08 06:02:08 +0000
4@@ -34,8 +34,8 @@
5 <string name="fail_fetching_versions">Fail to fetch available versions</string>
6 <string name="uninstall_dialog_message">This will remove all Ubuntu system files and Ubuntu swap file</string>
7 <string name="terminal_is_empty">Terminal is emtpy.</string>
8- <string name="terminal_dump_succ">Dump Terminal to file success</string>
9- <string name="terminal_dump_fail">Dump Terminal to file fail</string>
10+ <string name="terminal_dump_succ">Dump Terminal successfully to file on sdcard</string>
11+ <string name="terminal_dump_fail">Dump Terminal failed to file on sdcard</string>
12 <string name="external_storage_unavailable">External Storage is not available</string>
13
14 <string name="not_supported_title">Not supported</string>
15
16=== modified file 'src/com/canonical/ubuntu/installer/InstallActivity.java'
17--- src/com/canonical/ubuntu/installer/InstallActivity.java 2014-01-03 06:42:51 +0000
18+++ src/com/canonical/ubuntu/installer/InstallActivity.java 2014-01-08 06:02:08 +0000
19@@ -179,9 +179,9 @@
20
21 dumpFileWriter.write(terminalText.toString());
22 dumpFileWriter.close();
23- Utils.showToast(this.getApplicationContext(), getResources().getString(R.string.terminal_dump_succ) + ": " + dumpFile.getPath());
24+ Utils.showToast(this.getApplicationContext(), getResources().getString(R.string.terminal_dump_succ) + ": " + filename);
25 } catch (Exception e) {
26- Utils.showToast(this.getApplicationContext(), getResources().getString(R.string.terminal_dump_fail) + ": " + dumpFile.getPath());
27+ Utils.showToast(this.getApplicationContext(), getResources().getString(R.string.terminal_dump_fail) + ": " + filename);
28 }
29 break;
30 }

Subscribers

People subscribed via source and target branches

to all changes: