Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-15 04:18:53 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '342-organise-strings-xml-to-make-life-easier-for-translators' into 'master'

Browse Source 
Group strings and remove unused resources

Before I grouped the strings, I removed unused resources as well to not group things that are not being used anymore.

The grouping tries to follow a normal usage lifecycle of the app where the user works their way down the navigation drawer and explores all features in one area.

Closes #342

See merge request !277
This commit is contained in:
Torsten Grote
2016-08-11 14:28:19 +00:00
parent cb9a85eb88 72906acaee
commit 9defb099dd
52 changed files with 230 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-android/src/org/briarproject/android/blogs/BlogFragment.java
View File

@@ -283,7 +283,7 @@ public class BlogFragment extends BaseFragment implements BlogPostListener {
builder.setTitle(getString(R.string.blogs_remove_blog));
builder.setMessage(
getString(R.string.blogs_remove_blog_dialog_message));
builder.setPositiveButton(R.string.cancel_button, null);
builder.setPositiveButton(R.string.cancel, null);
builder.setNegativeButton(R.string.blogs_remove_blog_ok, okListener);
builder.show();
}

2
briar-android/src/org/briarproject/android/blogs/RssFeedImportActivity.java
View File

@@ -160,7 +160,7 @@ public class RssFeedImportActivity extends BriarActivity {
new AlertDialog.Builder(RssFeedImportActivity.this,
R.style.BriarDialogTheme);
builder.setMessage(R.string.blogs_rss_feeds_import_error);
builder.setNegativeButton(R.string.cancel_button, null);
builder.setNegativeButton(R.string.cancel, null);
builder.setPositiveButton(R.string.try_again_button,
new DialogInterface.OnClickListener() {
@Override