diff options
| author | steckbrief <steckbrief@chefmail.de> | 2015-12-17 21:10:14 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2015-12-17 21:10:14 +0100 |
| commit | eb1cad39a64ca4b38c155985f9faf8b1057a8d65 (patch) | |
| tree | dac7706ab34c84bef0ae081635269f112d95f31b /src/main | |
| parent | 4f0061293e1d8e90d2828deeb6b72d8a2c8bd509 (diff) | |
| parent | 2fb31bcc3f9e4920891765ab8e0cf2e33227ea3e (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/LogCatOutputActivity.java | 2 | ||||
| -rw-r--r-- | src/main/res/values-de/strings.xml | 1 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/LogCatOutputActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/LogCatOutputActivity.java index 733da0cc..14872cb3 100644 --- a/src/main/java/de/thedevstack/conversationsplus/ui/LogCatOutputActivity.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/LogCatOutputActivity.java @@ -24,6 +24,6 @@ public class LogCatOutputActivity extends Activity { lv.setAdapter(logCatOutputAdapter); new ReadLogCatAsyncTask(logCatOutputAdapter).execute(); Button copyButton = (Button) findViewById(R.id.actLogOutputCopyButton); - copyButton.setOnClickListener(new LogCatOutputCopyOnClickListener(this, logCatOutputAdapter, R.string.cplus_copied_to_clipboard)); + copyButton.setOnClickListener(new LogCatOutputCopyOnClickListener(this, logCatOutputAdapter, R.string.cplus_copied_to_clipboard, R.string.cplus_not_copied_to_clipboard_empty)); } } diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index e6f6273e..617aedd3 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -510,4 +510,5 @@ <string name="pref_img_file_transfer">Ordnername, um eingehende Bilder zu speichern</string> <string name="pref_img_file_transfer_summary">Unterordner des globalen Bilderordners, um eingehende Bilder zu speichern.</string> <string name="pref_file_transfer_category">Dateiübertragung</string> + <string name="cplus_not_copied_to_clipboard_empty">Nichts zu kopieren.</string> </resources> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index c8a50a25..c3444a82 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -543,4 +543,5 @@ <string name="pref_img_file_transfer">Folder to save incoming pictures</string> <string name="pref_img_file_transfer_summary">This is the subdirectory in the pictures directory for incoming files.</string> <string name="pref_file_transfer_category">File Transfer</string> + <string name="cplus_not_copied_to_clipboard_empty">Nothing to copy.</string> </resources> |