From 4f1e69be68d7112a26c68a77bf096cca705d8ca6 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Fri, 9 Sep 2016 00:35:34 +0200
Subject: [PATCH] Extracted translation resources
---
app/src/main/AndroidManifest.xml | 34 ++--
.../quasseldroid_ng/QuasselDroidNG.java | 2 +-
.../quasseldroid_ng/ui/chat/MainActivity.java | 6 +-
.../chatlist/ChatListEditActivity.java | 12 +-
.../identity/IdentityEditActivity.java | 12 +-
.../coresettings/network/AllNetworksItem.java | 2 +-
.../network/NetworkEditActivity.java | 12 +-
.../ui/setup/slides/AccountSelectSlide.java | 4 +-
.../setup/slides/AccountSetupCoreSlide.java | 4 +-
.../setup/slides/AccountSetupNameSlide.java | 4 +-
.../setup/slides/AccountSetupUserSlide.java | 4 +-
.../setup/slides/CoreBackendSelectSlide.java | 4 +-
.../setup/slides/CoreBackendSetupSlide.java | 4 +-
.../quasseldroid_ng/ui/theme/ThemeUtil.java | 5 +-
.../main/res/layout-sw600dp-land/slide.xml | 4 +-
app/src/main/res/layout-sw600dp/slide.xml | 4 +-
.../res/layout/activity_channel_detail.xml | 6 +-
.../res/layout/activity_chatlist_edit.xml | 18 +-
.../res/layout/activity_identity_edit.xml | 28 +--
.../main/res/layout/activity_network_edit.xml | 40 +++--
.../layout/activity_networkserver_edit.xml | 20 +--
app/src/main/res/layout/dialog_login.xml | 4 +-
app/src/main/res/layout/slide.xml | 4 +-
.../main/res/layout/slide_account_core.xml | 4 +-
.../main/res/layout/slide_account_name.xml | 2 +-
.../main/res/layout/slide_account_user.xml | 4 +-
.../res/layout/widget_core_account_add.xml | 2 +-
app/src/main/res/layout/widget_editor.xml | 2 +-
app/src/main/res/layout/widget_slider.xml | 2 +-
app/src/main/res/menu/chat.xml | 16 +-
app/src/main/res/menu/chatlist.xml | 6 +-
app/src/main/res/menu/confirm.xml | 2 +-
app/src/main/res/menu/confirm_delete.xml | 4 +-
.../main/res/menu/context_buffer_network.xml | 16 +-
app/src/main/res/menu/formatting.xml | 70 ++++----
app/src/main/res/values/preferences.xml | 16 +-
app/src/main/res/values/strings.xml | 162 +++---------------
app/src/main/res/values/strings_actions.xml | 51 ++++++
.../main/res/values/strings_coresettings.xml | 75 ++++++++
app/src/main/res/values/strings_format.xml | 34 ++--
app/src/main/res/values/strings_setup.xml | 41 +++++
app/src/main/res/values/strings_titles.xml | 45 +++++
42 files changed, 449 insertions(+), 342 deletions(-)
create mode 100644 app/src/main/res/values/strings_actions.xml
create mode 100644 app/src/main/res/values/strings_coresettings.xml
create mode 100644 app/src/main/res/values/strings_setup.xml
create mode 100644 app/src/main/res/values/strings_titles.xml
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ca22a6ef3..411f4d3c0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -55,119 +55,119 @@
<activity
android:name=".ui.chat.ChannelDetailActivity"
- android:label="@string/channeldetails"
+ android:label="@string/titleChannelDetails"
android:launchMode="singleTask"
android:parentActivityName=".ui.chat.MainActivity"
android:theme="@style/AppTheme.Light"/>
<activity
android:name=".ui.coresettings.chatlist.ChatListListActivity"
- android:label="@string/editchatlists"
+ android:label="@string/titleEditChatLists"
android:launchMode="singleTask"
android:parentActivityName=".ui.chat.MainActivity"
android:theme="@style/AppTheme.Light"/>
<activity
android:name=".ui.coresettings.chatlist.ChatListEditActivity"
- android:label="@string/editchatlist"
+ android:label="@string/titleEditChatList"
android:launchMode="singleTask"
android:parentActivityName=".ui.coresettings.chatlist.ChatListListActivity"
android:theme="@style/AppTheme.Light"/>
<activity
android:name=".ui.coresettings.chatlist.ChatListCreateActivity"
- android:label="@string/createchatlist"
+ android:label="@string/titleCreateChatList"
android:launchMode="singleTask"
android:parentActivityName=".ui.coresettings.chatlist.ChatListListActivity"
android:theme="@style/AppTheme.Light"/>
<activity
android:name=".ui.coresettings.network.NetworkListActivity"
- android:label="@string/editnetworks"
+ android:label="@string/titleEditNetworks"
android:launchMode="singleTask"
android:parentActivityName=".ui.chat.MainActivity"
android:theme="@style/AppTheme.Light"/>
<activity
android:name=".ui.coresettings.network.NetworkEditActivity"
- android:label="@string/editnetwork"
+ android:label="@string/titleEditNetwork"
android:launchMode="singleTask"
android:parentActivityName=".ui.coresettings.network.NetworkListActivity"
android:theme="@style/AppTheme.Light"/>
<activity
android:name=".ui.coresettings.network.NetworkCreateActivity"
- android:label="@string/createnetwork"
+ android:label="@string/titleCreateNetwork"
android:launchMode="singleTask"
android:parentActivityName=".ui.coresettings.network.NetworkListActivity"
android:theme="@style/AppTheme.Light"/>
<activity
android:name=".ui.coresettings.network.server.NetworkServerListActivity"
- android:label="@string/editnetworkservers"
+ android:label="@string/titleEditNetworkServers"
android:launchMode="singleTask"
android:parentActivityName=".ui.coresettings.network.NetworkEditActivity"
android:theme="@style/AppTheme.Light"/>
<activity
android:name=".ui.coresettings.identity.IdentityListActivity"
- android:label="@string/editidentities"
+ android:label="@string/titleEditIdentities"
android:launchMode="singleTask"
android:parentActivityName=".ui.chat.MainActivity"
android:theme="@style/AppTheme.Light"/>
<activity
android:name=".ui.coresettings.identity.IdentityEditActivity"
- android:label="@string/editidentity"
+ android:label="@string/titleEditIdentity"
android:launchMode="singleTask"
android:parentActivityName=".ui.coresettings.identity.IdentityListActivity"
android:theme="@style/AppTheme.Light"/>
<activity
android:name=".ui.coresettings.identity.IdentityCreateActivity"
- android:label="@string/createidentity"
+ android:label="@string/titleCreateIdentity"
android:launchMode="singleTask"
android:parentActivityName=".ui.coresettings.identity.IdentityListActivity"
android:theme="@style/AppTheme.Light"/>
<activity
android:name=".ui.coresettings.identity.nick.IdentityNickListActivity"
- android:label="@string/editnicks"
+ android:label="@string/titleEditNicks"
android:launchMode="singleTask"
android:parentActivityName=".ui.coresettings.identity.IdentityEditActivity"
android:theme="@style/AppTheme.Light"/>
<activity
android:name=".ui.coresettings.network.server.NetworkServerEditActivity"
- android:label="@string/editnetworkserver"
+ android:label="@string/titleEditNetworkServer"
android:launchMode="singleTask"
android:parentActivityName=".ui.coresettings.network.server.NetworkServerListActivity"
android:theme="@style/AppTheme.Light"/>
<activity
android:name=".ui.setup.AccountSetupActivity"
- android:label="@string/accountsetup"
+ android:label="@string/titleAccountSetup"
android:launchMode="singleTask"
android:parentActivityName=".ui.setup.AccountSelectActivity"
android:theme="@style/SetupTheme"/>
<activity
android:name=".ui.setup.AccountSelectActivity"
- android:label="@string/accountselection"
+ android:label="@string/titleAccountSelection"
android:launchMode="singleTask"
android:parentActivityName=".ui.LoginActivity"
android:theme="@style/SetupTheme"/>
<activity
android:name=".ui.setup.CoreSetupActivity"
- android:label="@string/coresetup"
+ android:label="@string/titleCoreSetup"
android:launchMode="singleTask"
android:parentActivityName=".ui.chat.MainActivity"
android:theme="@style/SetupTheme"/>
<activity
android:name=".ui.settings.SettingsActivity"
- android:label="@string/settings"
+ android:label="@string/titleSettings"
android:launchMode="singleTask"
android:parentActivityName=".ui.chat.MainActivity"
android:theme="@style/AppTheme.Light"/>
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/QuasselDroidNG.java b/app/src/main/java/de/kuschku/quasseldroid_ng/QuasselDroidNG.java
index 846928d1b..ca9b37584 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/QuasselDroidNG.java
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/QuasselDroidNG.java
@@ -50,7 +50,7 @@ import de.kuschku.libquassel.localtypes.orm.ConnectedDatabase;
ReportField.STACK_TRACE
},
mode = ReportingInteractionMode.TOAST,
- resToastText = R.string.notification_report_crash
+ resToastText = R.string.notificationReportCrash
)
public class QuasselDroidNG extends Application {
private static Context applicationContext;
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/MainActivity.java b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/MainActivity.java
index 376f7b640..7bc08f800 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/MainActivity.java
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/MainActivity.java
@@ -561,7 +561,7 @@ public class MainActivity extends BoundActivity {
public void onEventMainThread(LoginRequireEvent event) {
if (event.failedLast) {
new MaterialDialog.Builder(this)
- .title(R.string.labelLogin)
+ .title(R.string.titleLogin)
.customView(R.layout.dialog_login, false)
.onPositive((dialog1, which) -> {
View parent = dialog1.getCustomView();
@@ -576,8 +576,8 @@ public class MainActivity extends BoundActivity {
})
.cancelListener(dialog1 -> finish())
.negativeColor(context.themeUtil().res.colorForeground)
- .positiveText(R.string.labelLogin)
- .negativeText(R.string.labelCancel)
+ .positiveText(R.string.actionLogin)
+ .negativeText(R.string.actionCancel)
.backgroundColor(context.themeUtil().res.colorBackgroundCard)
.contentColor(context.themeUtil().res.colorForeground)
.build().show();
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/chatlist/ChatListEditActivity.java b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/chatlist/ChatListEditActivity.java
index af795c0a6..013ea3760 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/chatlist/ChatListEditActivity.java
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/chatlist/ChatListEditActivity.java
@@ -115,9 +115,9 @@ public class ChatListEditActivity extends BoundActivity {
public void onBackPressed() {
if (hasChanged()) {
new MaterialDialog.Builder(this)
- .content(R.string.youhavemadechangesdoyouwishtosavethem)
- .positiveText(R.string.yes)
- .negativeText(R.string.no)
+ .content(R.string.confirmationUnsavedChanges)
+ .positiveText(R.string.actionYes)
+ .negativeText(R.string.actionNo)
.positiveColor(context.themeUtil().res.colorAccent)
.negativeColor(context.themeUtil().res.colorForeground)
.onPositive((dialog, which) -> {
@@ -136,9 +136,9 @@ public class ChatListEditActivity extends BoundActivity {
switch (item.getItemId()) {
case R.id.action_delete: {
new MaterialDialog.Builder(this)
- .content(getString(R.string.areyousureyouwanttodelete, config.bufferViewName()))
- .positiveText(R.string.yes)
- .negativeText(R.string.no)
+ .content(getString(R.string.confirmationDelete, config.bufferViewName()))
+ .positiveText(R.string.actionYes)
+ .negativeText(R.string.actionNo)
.positiveColor(context.themeUtil().res.colorAccent)
.negativeColor(context.themeUtil().res.colorForeground)
.onPositive((dialog, which) -> {
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/identity/IdentityEditActivity.java b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/identity/IdentityEditActivity.java
index 698c6a668..9a4630d14 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/identity/IdentityEditActivity.java
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/identity/IdentityEditActivity.java
@@ -149,9 +149,9 @@ public class IdentityEditActivity extends BoundActivity {
public void onBackPressed() {
if (hasChanged(build())) {
new MaterialDialog.Builder(this)
- .content(R.string.youhavemadechangesdoyouwishtosavethem)
- .positiveText(R.string.yes)
- .negativeText(R.string.no)
+ .content(R.string.confirmationUnsavedChanges)
+ .positiveText(R.string.actionYes)
+ .negativeText(R.string.actionNo)
.positiveColor(context.themeUtil().res.colorAccent)
.negativeColor(context.themeUtil().res.colorForeground)
.onPositive((dialog, which) -> {
@@ -170,9 +170,9 @@ public class IdentityEditActivity extends BoundActivity {
switch (item.getItemId()) {
case R.id.action_delete: {
new MaterialDialog.Builder(this)
- .content(getString(R.string.areyousureyouwanttodelete, identity.identityName()))
- .positiveText(R.string.yes)
- .negativeText(R.string.no)
+ .content(getString(R.string.confirmationDelete, identity.identityName()))
+ .positiveText(R.string.actionYes)
+ .negativeText(R.string.actionNo)
.positiveColor(context.themeUtil().res.colorAccent)
.negativeColor(context.themeUtil().res.colorForeground)
.onPositive((dialog, which) -> {
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/network/AllNetworksItem.java b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/network/AllNetworksItem.java
index 25c7f587f..9e8c374dd 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/network/AllNetworksItem.java
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/network/AllNetworksItem.java
@@ -118,7 +118,7 @@ class AllNetworksItem implements QNetwork {
@Override
public String networkName() {
- return context.getString(R.string.all_networks);
+ return context.getString(R.string.labelAllNetworks);
}
@Override
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/network/NetworkEditActivity.java b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/network/NetworkEditActivity.java
index 2c55f80a0..0de4a867a 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/network/NetworkEditActivity.java
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/coresettings/network/NetworkEditActivity.java
@@ -224,9 +224,9 @@ public class NetworkEditActivity extends BoundActivity {
public void onBackPressed() {
if (hasChanged(build())) {
new MaterialDialog.Builder(this)
- .content(R.string.youhavemadechangesdoyouwishtosavethem)
- .positiveText(R.string.yes)
- .negativeText(R.string.no)
+ .content(R.string.confirmationUnsavedChanges)
+ .positiveText(R.string.actionYes)
+ .negativeText(R.string.actionNo)
.positiveColor(context.themeUtil().res.colorAccent)
.negativeColor(context.themeUtil().res.colorForeground)
.onPositive((dialog, which) -> {
@@ -245,9 +245,9 @@ public class NetworkEditActivity extends BoundActivity {
switch (item.getItemId()) {
case R.id.action_delete: {
new MaterialDialog.Builder(this)
- .content(getString(R.string.areyousureyouwanttodelete, network.networkName()))
- .positiveText(R.string.yes)
- .negativeText(R.string.no)
+ .content(getString(R.string.confirmationDelete, network.networkName()))
+ .positiveText(R.string.actionYes)
+ .negativeText(R.string.actionNo)
.positiveColor(context.themeUtil().res.colorAccent)
.negativeColor(context.themeUtil().res.colorForeground)
.onPositive((dialog, which) -> {
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/slides/AccountSelectSlide.java b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/slides/AccountSelectSlide.java
index 2fb2e12dc..c5be22b95 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/slides/AccountSelectSlide.java
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/slides/AccountSelectSlide.java
@@ -140,12 +140,12 @@ public class AccountSelectSlide extends SlideFragment implements AccountItem.OnD
@Override
protected int getTitle() {
- return R.string.slideAccountselectTitle;
+ return R.string.slideAccountSelectTitle;
}
@Override
protected int getDescription() {
- return R.string.slideAccountselectDescription;
+ return R.string.slideAccountSelectDescription;
}
@Override
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/slides/AccountSetupCoreSlide.java b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/slides/AccountSetupCoreSlide.java
index 4be29e2cf..16e6d7b98 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/slides/AccountSetupCoreSlide.java
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/slides/AccountSetupCoreSlide.java
@@ -84,13 +84,13 @@ public class AccountSetupCoreSlide extends SlideFragment {
@Override
@StringRes
public int getTitle() {
- return R.string.slideAccountcoreTitle;
+ return R.string.slideAccountCoreTitle;
}
@Override
@StringRes
public int getDescription() {
- return R.string.slideAccountcoreDescription;
+ return R.string.slideAccountCoreDescription;
}
private boolean validPort() {
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/slides/AccountSetupNameSlide.java b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/slides/AccountSetupNameSlide.java
index 617df7a87..729f64c62 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/slides/AccountSetupNameSlide.java
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/slides/AccountSetupNameSlide.java
@@ -80,13 +80,13 @@ public class AccountSetupNameSlide extends SlideFragment {
@Override
@StringRes
public int getTitle() {
- return R.string.slideAccountnameTitle;
+ return R.string.slideAccountNameTitle;
}
@Override
@StringRes
public int getDescription() {
- return R.string.slideAccountnameDescription;
+ return R.string.slideAccountNameDescription;
}
private boolean validName() {
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/slides/AccountSetupUserSlide.java b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/slides/AccountSetupUserSlide.java
index b84884bba..39b544b13 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/slides/AccountSetupUserSlide.java
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/slides/AccountSetupUserSlide.java
@@ -84,13 +84,13 @@ public class AccountSetupUserSlide extends SlideFragment {
@Override
@StringRes
public int getTitle() {
- return R.string.slideAccountuserTitle;
+ return R.string.slideAccountUserTitle;
}
@Override
@StringRes
public int getDescription() {
- return R.string.slideAccountuserDescription;
+ return R.string.slideAccountUserDescription;
}
private boolean validUser() {
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/slides/CoreBackendSelectSlide.java b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/slides/CoreBackendSelectSlide.java
index 5bc4a47d9..c3e51069b 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/slides/CoreBackendSelectSlide.java
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/slides/CoreBackendSelectSlide.java
@@ -92,12 +92,12 @@ public class CoreBackendSelectSlide extends SlideFragment {
@Override
protected int getTitle() {
- return R.string.slideAccountselectTitle;
+ return R.string.slideCoreBackendSelectTitle;
}
@Override
protected int getDescription() {
- return R.string.slideAccountselectDescription;
+ return R.string.slideCoreBackendSelectDescription;
}
}
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/slides/CoreBackendSetupSlide.java b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/slides/CoreBackendSetupSlide.java
index 907f64207..9ed2e7d71 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/slides/CoreBackendSetupSlide.java
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/slides/CoreBackendSetupSlide.java
@@ -146,13 +146,13 @@ public class CoreBackendSetupSlide extends SlideFragment {
@Override
@StringRes
public int getTitle() {
- return R.string.slideAccountcoreTitle;
+ return R.string.slideCoreBackendSetupTitle;
}
@Override
@StringRes
public int getDescription() {
- return R.string.slideAccountcoreDescription;
+ return R.string.slideCoreBackendSetupDescription;
}
@SuppressWarnings("unchecked")
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/theme/ThemeUtil.java b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/theme/ThemeUtil.java
index 1ae3d86c4..3f812902b 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/theme/ThemeUtil.java
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/theme/ThemeUtil.java
@@ -604,10 +604,7 @@ public class ThemeUtil {
@AutoString(R.string.messageTopic)
public String messageTopic;
- @AutoString(R.string.labelStatusBuffer)
- public String titleStatusBuffer;
-
- @AutoString(R.string.warningCertificate)
+ @AutoString(R.string.confirmationCertficate)
public String warningCertificate;
@AutoString(R.string.statusConnecting)
diff --git a/app/src/main/res/layout-sw600dp-land/slide.xml b/app/src/main/res/layout-sw600dp-land/slide.xml
index 917c81a2a..7cb27ef90 100644
--- a/app/src/main/res/layout-sw600dp-land/slide.xml
+++ b/app/src/main/res/layout-sw600dp-land/slide.xml
@@ -35,7 +35,7 @@
android:gravity="end"
android:paddingEnd="64dp"
android:paddingRight="64dp"
- android:text="@string/slideAccountcoreTitle"
+ android:text="@string/slideAccountCoreTitle"
android:textColor="@android:color/white"
android:textSize="28sp"
android:textStyle="bold"/>
@@ -58,7 +58,7 @@
android:gravity="end"
android:paddingEnd="64dp"
android:paddingRight="64dp"
- android:text="@string/slideAccountcoreDescription"
+ android:text="@string/slideAccountCoreDescription"
android:textColor="@android:color/white"
android:textSize="16sp"/>
diff --git a/app/src/main/res/layout-sw600dp/slide.xml b/app/src/main/res/layout-sw600dp/slide.xml
index d68fea055..4a83a278c 100644
--- a/app/src/main/res/layout-sw600dp/slide.xml
+++ b/app/src/main/res/layout-sw600dp/slide.xml
@@ -46,7 +46,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="32dp"
- android:text="@string/slideAccountcoreTitle"
+ android:text="@string/slideAccountCoreTitle"
android:textColor="@android:color/white"
android:textSize="28sp"
android:textStyle="bold"/>
@@ -56,7 +56,7 @@
android:id="@+id/description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/slideAccountcoreDescription"
+ android:text="@string/slideAccountCoreDescription"
android:textColor="@android:color/white"
android:textSize="16sp"/>
diff --git a/app/src/main/res/layout/activity_channel_detail.xml b/app/src/main/res/layout/activity_channel_detail.xml
index 6f456c8a7..d25e1eaa8 100644
--- a/app/src/main/res/layout/activity_channel_detail.xml
+++ b/app/src/main/res/layout/activity_channel_detail.xml
@@ -53,7 +53,7 @@
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:gravity="fill_vertical"
- android:text="@string/topic"
+ android:text="@string/titleTopic"
android:textColor="?attr/colorAccent"/>
<TextView
@@ -73,7 +73,7 @@
android:layout_gravity="end"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
- android:text="@string/edit_topic"/>
+ android:text="@string/actionEditTopic"/>
<View
android:layout_width="match_parent"
@@ -88,7 +88,7 @@
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:gravity="fill_vertical"
- android:text="@string/channel_modes"
+ android:text="@string/titleChannelModes"
android:textColor="?attr/colorAccent"/>
<LinearLayout
diff --git a/app/src/main/res/layout/activity_chatlist_edit.xml b/app/src/main/res/layout/activity_chatlist_edit.xml
index 177edc335..ffc25b0bd 100644
--- a/app/src/main/res/layout/activity_chatlist_edit.xml
+++ b/app/src/main/res/layout/activity_chatlist_edit.xml
@@ -59,7 +59,7 @@
android:id="@+id/name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/name"/>
+ android:hint="@string/labelChatlistName"/>
</android.support.design.widget.TextInputLayout>
@@ -76,7 +76,7 @@
android:paddingBottom="8dp"
android:paddingLeft="3dp"
android:paddingRight="3dp"
- android:text="@string/network"
+ android:text="@string/labelChatlistNetwork"
android:textSize="12sp"/>
<android.support.v7.widget.AppCompatSpinner
@@ -94,37 +94,37 @@
android:id="@+id/showChannels"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/show_channels"/>
+ android:text="@string/labelChatlistShowChannels"/>
<android.support.v7.widget.AppCompatCheckBox
android:id="@+id/showQueries"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/show_queries"/>
+ android:text="@string/labelChatlistShowQueries"/>
<android.support.v7.widget.AppCompatCheckBox
android:id="@+id/hideInactiveChats"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/hide_inactive_chats"/>
+ android:text="@string/labelChatlistHideInactiveChats"/>
<android.support.v7.widget.AppCompatCheckBox
android:id="@+id/hideInactiveNetworks"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/hide_inactive_networks"/>
+ android:text="@string/labelChatlistHideInactiveNetworks"/>
<android.support.v7.widget.AppCompatCheckBox
android:id="@+id/addAutomatically"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/add_new_chats_automatically"/>
+ android:text="@string/labelChatlistAddNewChatsAutomatically"/>
<android.support.v7.widget.AppCompatCheckBox
android:id="@+id/sortAlphabetically"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/sort_alphabetically"/>
+ android:text="@string/labelChatlistSortAlphabetically"/>
<LinearLayout
android:layout_width="match_parent"
@@ -139,7 +139,7 @@
android:paddingBottom="8dp"
android:paddingLeft="3dp"
android:paddingRight="3dp"
- android:text="@string/minimum_activity"
+ android:text="@string/labelChatlistMinimumActivity"
android:textSize="12sp"/>
<android.support.v7.widget.AppCompatSpinner
diff --git a/app/src/main/res/layout/activity_identity_edit.xml b/app/src/main/res/layout/activity_identity_edit.xml
index d98656b63..5151fcf25 100644
--- a/app/src/main/res/layout/activity_identity_edit.xml
+++ b/app/src/main/res/layout/activity_identity_edit.xml
@@ -58,7 +58,7 @@
android:id="@+id/identityName"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/identityname"/>
+ android:hint="@string/labelIdentityName"/>
</android.support.design.widget.TextInputLayout>
@@ -70,7 +70,7 @@
android:id="@+id/realName"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/realname"/>
+ android:hint="@string/labelIdentityRealName"/>
</android.support.design.widget.TextInputLayout>
@@ -82,7 +82,7 @@
android:id="@+id/ident"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/ident"/>
+ android:hint="@string/labelIdentityIdent"/>
</android.support.design.widget.TextInputLayout>
@@ -92,9 +92,13 @@
<android.support.v7.widget.AppCompatButton
android:id="@+id/nicks"
+ style="@style/Widget.AppCompat.Button.Colored"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/edit_nicks"/>
+ android:layout_gravity="end"
+ android:layout_marginLeft="16dp"
+ android:layout_marginRight="16dp"
+ android:text="@string/actionEditNicks"/>
</android.support.v7.widget.ButtonBarLayout>
@@ -102,7 +106,7 @@
android:layout_width="match_parent"
android:layout_height="48dp"
android:gravity="center_vertical"
- android:text="@string/messages"
+ android:text="@string/labelIdentityMessages"
android:textColor="?attr/colorAccent"
android:textSize="14sp"/>
@@ -114,7 +118,7 @@
android:id="@+id/kickReason"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/kickreason"/>
+ android:hint="@string/labelIdentityKickReason"/>
</android.support.design.widget.TextInputLayout>
@@ -126,7 +130,7 @@
android:id="@+id/partReason"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/partreason"/>
+ android:hint="@string/labelIdentityPartReason"/>
</android.support.design.widget.TextInputLayout>
@@ -138,7 +142,7 @@
android:id="@+id/quitReason"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/quitreason"/>
+ android:hint="@string/labelIdentityQuitReason"/>
</android.support.design.widget.TextInputLayout>
@@ -146,7 +150,7 @@
android:layout_width="match_parent"
android:layout_height="48dp"
android:gravity="center_vertical"
- android:text="@string/away"
+ android:text="@string/labelIdentityAway"
android:textColor="?attr/colorAccent"
android:textSize="14sp"/>
@@ -158,7 +162,7 @@
android:id="@+id/awayReason"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/awayreason"/>
+ android:hint="@string/labelIdentityAwayReason"/>
</android.support.design.widget.TextInputLayout>
@@ -168,7 +172,7 @@
android:layout_width="match_parent"
android:layout_height="48dp"
android:gravity="center_vertical"
- android:text="@string/away_on_detach"
+ android:text="@string/labelIdentityDetachAway"
android:textColor="?attr/colorAccent"
android:textSize="14sp"/>
@@ -186,7 +190,7 @@
android:id="@+id/awayOnDetachReason"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/awayondetachreason"/>
+ android:hint="@string/labelIdentityDetachAwayReason"/>
</android.support.design.widget.TextInputLayout>
diff --git a/app/src/main/res/layout/activity_network_edit.xml b/app/src/main/res/layout/activity_network_edit.xml
index 4ca553564..41a8a5bc2 100644
--- a/app/src/main/res/layout/activity_network_edit.xml
+++ b/app/src/main/res/layout/activity_network_edit.xml
@@ -59,7 +59,7 @@
android:id="@+id/networkName"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/networkname"/>
+ android:hint="@string/labelNetworkName"/>
</android.support.design.widget.TextInputLayout>
@@ -76,7 +76,7 @@
android:layout_marginBottom="8dp"
android:paddingLeft="3dp"
android:paddingRight="3dp"
- android:text="@string/identity"
+ android:text="@string/labelNetworkIdentity"
android:textSize="12sp"/>
<android.support.v7.widget.AppCompatSpinner
@@ -94,7 +94,7 @@
android:id="@+id/rejoinChannels"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/rejoinchannels"/>
+ android:text="@string/labelNetworkRejoinChannels"/>
<android.support.v7.widget.ButtonBarLayout
android:layout_width="match_parent"
@@ -102,9 +102,13 @@
<android.support.v7.widget.AppCompatButton
android:id="@+id/servers"
+ style="@style/Widget.AppCompat.Button.Colored"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/edit_servers"/>
+ android:layout_gravity="end"
+ android:layout_marginLeft="16dp"
+ android:layout_marginRight="16dp"
+ android:text="@string/actionEditServers"/>
</android.support.v7.widget.ButtonBarLayout>
@@ -114,7 +118,7 @@
android:layout_width="match_parent"
android:layout_height="48dp"
android:gravity="center_vertical"
- android:text="@string/custom_codecs"
+ android:text="@string/labelNetworkCustomCodecs"
android:textColor="?attr/colorAccent"
android:textSize="14sp"/>
@@ -133,7 +137,7 @@
android:id="@+id/codecForServer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/codecforserver"/>
+ android:hint="@string/labelNetworkCodecForServer"/>
</android.support.design.widget.TextInputLayout>
@@ -145,7 +149,7 @@
android:id="@+id/codecForEncoding"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/codecforencoding"/>
+ android:hint="@string/labelNetworkCodecForEncoding"/>
</android.support.design.widget.TextInputLayout>
@@ -157,7 +161,7 @@
android:id="@+id/codecForDecoding"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/codecfordecoding"/>
+ android:hint="@string/labelNetworkCodecForDecoding"/>
</android.support.design.widget.TextInputLayout>
@@ -169,7 +173,7 @@
android:layout_width="match_parent"
android:layout_height="48dp"
android:gravity="center_vertical"
- android:text="@string/auto_identify"
+ android:text="@string/labelNetworkAutoIdentify"
android:textColor="?attr/colorAccent"
android:textSize="14sp"/>
@@ -188,7 +192,7 @@
android:id="@+id/autoIdentifyService"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/autoidentifyservice"/>
+ android:hint="@string/labelNetworkAutoIdentifyService"/>
</android.support.design.widget.TextInputLayout>
@@ -200,7 +204,7 @@
android:id="@+id/autoIdentifyPassword"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/autoidentifypassword"/>
+ android:hint="@string/labelNetworkAutoIdentifyPassword"/>
</android.support.design.widget.TextInputLayout>
@@ -212,7 +216,7 @@
android:layout_width="match_parent"
android:layout_height="48dp"
android:gravity="center_vertical"
- android:text="@string/sasl"
+ android:text="@string/labelNetworkSasl"
android:textColor="?attr/colorAccent"
android:textSize="14sp"/>
@@ -230,7 +234,7 @@
android:id="@+id/saslAccount"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/saslaccount"/>
+ android:hint="@string/labelNetworkSaslAccount"/>
</android.support.design.widget.TextInputLayout>
@@ -242,7 +246,7 @@
android:id="@+id/saslPassword"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/saslpassword"/>
+ android:hint="@string/labelNetworkSaslPassword"/>
</android.support.design.widget.TextInputLayout>
</LinearLayout>
@@ -253,7 +257,7 @@
android:layout_width="match_parent"
android:layout_height="48dp"
android:gravity="center_vertical"
- android:text="@string/auto_reconnect"
+ android:text="@string/labelNetworkAutoReconnect"
android:textColor="?attr/colorAccent"
android:textSize="14sp"/>
@@ -271,7 +275,7 @@
android:id="@+id/autoReconnectInterval"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/autoreconnectinterval"
+ android:hint="@string/labelNetworkAutoReconnectInterval"
android:inputType="number"/>
</android.support.design.widget.TextInputLayout>
@@ -280,7 +284,7 @@
android:id="@+id/unlimitedAutoReconnectRetries"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/unlimitedautoreconnectretries"/>
+ android:text="@string/labelNetworkAutoReconnectRetriesUnlimited"/>
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
@@ -290,7 +294,7 @@
android:id="@+id/autoReconnectRetries"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/autoreconnectretries"
+ android:hint="@string/labelNetworkAutoReconnectRetries"
android:inputType="number"/>
</android.support.design.widget.TextInputLayout>
diff --git a/app/src/main/res/layout/activity_networkserver_edit.xml b/app/src/main/res/layout/activity_networkserver_edit.xml
index f77fb0cab..aa3a00bb3 100644
--- a/app/src/main/res/layout/activity_networkserver_edit.xml
+++ b/app/src/main/res/layout/activity_networkserver_edit.xml
@@ -59,7 +59,7 @@
android:id="@+id/host"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/host"/>
+ android:hint="@string/labelNetworkServerHost"/>
</android.support.design.widget.TextInputLayout>
@@ -71,7 +71,7 @@
android:id="@+id/port"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/port"
+ android:hint="@string/labelNetworkServerPort"
android:inputType="number"
android:maxLength="5"/>
@@ -81,7 +81,7 @@
android:id="@+id/useSSL"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/usessl"/>
+ android:text="@string/labelNetworkServerUseSSL"/>
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
@@ -91,7 +91,7 @@
android:id="@+id/password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/password"/>
+ android:hint="@string/labelNetworkServerPassword"/>
</android.support.design.widget.TextInputLayout>
@@ -101,7 +101,7 @@
android:layout_width="match_parent"
android:layout_height="48dp"
android:gravity="center_vertical"
- android:text="@string/proxy"
+ android:text="@string/labelNetworkServerProxy"
android:textColor="?attr/colorAccent"
android:textSize="14sp"/>
@@ -120,7 +120,7 @@
android:id="@+id/proxyHost"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/proxyhost"/>
+ android:hint="@string/labelNetworkServerProxyHost"/>
</android.support.design.widget.TextInputLayout>
@@ -132,7 +132,7 @@
android:id="@+id/proxyPort"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/proxyport"
+ android:hint="@string/labelNetworkServerProxyPort"
android:inputType="number"
android:maxLength="5"/>
@@ -151,7 +151,7 @@
android:layout_marginBottom="8dp"
android:paddingLeft="3dp"
android:paddingRight="3dp"
- android:text="@string/proxytype"
+ android:text="@string/labelNetworkServerProxyType"
android:textSize="12sp"/>
<android.support.v7.widget.AppCompatSpinner
@@ -173,7 +173,7 @@
android:id="@+id/proxyUser"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/proxyuser"/>
+ android:hint="@string/labelNetworkServerProxyUser"/>
</android.support.design.widget.TextInputLayout>
@@ -185,7 +185,7 @@
android:id="@+id/proxyPassword"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/proxypassword"/>
+ android:hint="@string/labelNetworkServerProxyPassword"/>
</android.support.design.widget.TextInputLayout>
diff --git a/app/src/main/res/layout/dialog_login.xml b/app/src/main/res/layout/dialog_login.xml
index 0812a1426..accd9e9f1 100644
--- a/app/src/main/res/layout/dialog_login.xml
+++ b/app/src/main/res/layout/dialog_login.xml
@@ -38,7 +38,7 @@
android:id="@+id/username"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/labelUsername"
+ android:hint="@string/labelLoginUsername"
android:inputType="text"/>
</android.support.design.widget.TextInputLayout>
@@ -50,7 +50,7 @@
android:id="@+id/password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/labelPassword"
+ android:hint="@string/labelLoginPassword"
android:inputType="textPassword"/>
</android.support.design.widget.TextInputLayout>
</LinearLayout>
diff --git a/app/src/main/res/layout/slide.xml b/app/src/main/res/layout/slide.xml
index 37f850a7c..3c4792fe1 100644
--- a/app/src/main/res/layout/slide.xml
+++ b/app/src/main/res/layout/slide.xml
@@ -43,7 +43,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="32dp"
- android:text="@string/slideAccountcoreTitle"
+ android:text="@string/slideAccountCoreTitle"
android:textColor="@android:color/white"
android:textSize="28sp"
android:textStyle="bold"/>
@@ -52,7 +52,7 @@
android:id="@+id/description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/slideAccountcoreDescription"
+ android:text="@string/slideAccountCoreDescription"
android:textColor="@android:color/white"
android:textSize="16sp"/>
diff --git a/app/src/main/res/layout/slide_account_core.xml b/app/src/main/res/layout/slide_account_core.xml
index 0f0dc4dc3..ad1e12330 100644
--- a/app/src/main/res/layout/slide_account_core.xml
+++ b/app/src/main/res/layout/slide_account_core.xml
@@ -30,7 +30,7 @@
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/labelHostname">
+ android:hint="@string/labelCoreHostname">
<android.support.design.widget.TextInputEditText
android:id="@+id/host"
@@ -42,7 +42,7 @@
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/labelPort">
+ android:hint="@string/labelCorePort">
<android.support.design.widget.TextInputEditText
android:id="@+id/port"
diff --git a/app/src/main/res/layout/slide_account_name.xml b/app/src/main/res/layout/slide_account_name.xml
index f1a174113..d1b9105df 100644
--- a/app/src/main/res/layout/slide_account_name.xml
+++ b/app/src/main/res/layout/slide_account_name.xml
@@ -30,7 +30,7 @@
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/account_name">
+ android:hint="@string/labelAccountName">
<android.support.design.widget.TextInputEditText
android:id="@+id/name"
diff --git a/app/src/main/res/layout/slide_account_user.xml b/app/src/main/res/layout/slide_account_user.xml
index 506fa70b2..4ccebf313 100644
--- a/app/src/main/res/layout/slide_account_user.xml
+++ b/app/src/main/res/layout/slide_account_user.xml
@@ -30,7 +30,7 @@
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/username">
+ android:hint="@string/labelAccountUsername">
<android.support.design.widget.TextInputEditText
android:id="@+id/user"
@@ -42,7 +42,7 @@
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/password">
+ android:hint="@string/labelAccountPassword">
<android.support.design.widget.TextInputEditText
android:id="@+id/pass"
diff --git a/app/src/main/res/layout/widget_core_account_add.xml b/app/src/main/res/layout/widget_core_account_add.xml
index a4597f2f4..f82cef8a6 100644
--- a/app/src/main/res/layout/widget_core_account_add.xml
+++ b/app/src/main/res/layout/widget_core_account_add.xml
@@ -70,7 +70,7 @@
android:paddingEnd="@dimen/material_drawer_item_primary_icon_padding_right"
android:paddingRight="@dimen/material_drawer_item_primary_icon_padding_right"
android:singleLine="true"
- android:text="@string/add_account"
+ android:text="@string/actionAddAccount"
android:textSize="@dimen/material_drawer_item_profile_text"/>
</LinearLayout>
</LinearLayout>
diff --git a/app/src/main/res/layout/widget_editor.xml b/app/src/main/res/layout/widget_editor.xml
index 173b13ba1..a50f4a37a 100644
--- a/app/src/main/res/layout/widget_editor.xml
+++ b/app/src/main/res/layout/widget_editor.xml
@@ -44,7 +44,7 @@
android:layout_height="?attr/actionBarSize"
android:background="@android:color/transparent"
android:gravity="top"
- android:hint="@string/placeholder"
+ android:hint="@string/labelPlaceholder"
android:inputType="textCapSentences|textShortMessage|textAutoCorrect"
android:paddingBottom="17dp"
android:paddingLeft="20dp"
diff --git a/app/src/main/res/layout/widget_slider.xml b/app/src/main/res/layout/widget_slider.xml
index d1ebbc810..1a8f0246a 100644
--- a/app/src/main/res/layout/widget_slider.xml
+++ b/app/src/main/res/layout/widget_slider.xml
@@ -66,7 +66,7 @@
android:gravity="center_vertical"
android:paddingLeft="16.0dip"
android:paddingRight="16.0dip"
- android:text="@string/labelHistory"
+ android:text="@string/titleHistory"
android:textAppearance="@style/TextAppearance.AppCompat.Body2"
android:textColor="?attr/colorForegroundSecondary"/>
diff --git a/app/src/main/res/menu/chat.xml b/app/src/main/res/menu/chat.xml
index d0550b3a5..2c9941432 100644
--- a/app/src/main/res/menu/chat.xml
+++ b/app/src/main/res/menu/chat.xml
@@ -24,27 +24,31 @@
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_search"
- android:title="@string/label_search"
+ android:title="@string/actionSearch"
app:actionViewClass="android.support.v7.widget.SearchView"
app:showAsAction="never|collapseActionView"/>
<item
android:id="@+id/action_hide_events"
- android:title="@string/labelHideEvents"
+ android:title="@string/actionHideEvents"
app:showAsAction="never"/>
<item
android:id="@+id/action_settings"
- android:title="@string/label_settings"
+ android:title="@string/actionSettings"
app:showAsAction="never"/>
<item
android:id="@+id/action_networks"
- android:title="@string/networks"
+ android:title="@string/actionNetworks"
app:showAsAction="never"/>
<item
android:id="@+id/action_identities"
- android:title="@string/identities"
+ android:title="@string/actionIdentities"
+ app:showAsAction="never"/>
+ <item
+ android:id="@+id/action_ignorelist"
+ android:title="@string/actionIgnore"
app:showAsAction="never"/>
<item
android:id="@+id/action_reauth"
- android:title="@string/label_disconnect"
+ android:title="@string/actionDisconnect"
app:showAsAction="never"/>
</menu>
diff --git a/app/src/main/res/menu/chatlist.xml b/app/src/main/res/menu/chatlist.xml
index b78f2cb6c..15df77cfa 100644
--- a/app/src/main/res/menu/chatlist.xml
+++ b/app/src/main/res/menu/chatlist.xml
@@ -24,15 +24,15 @@
<item
android:id="@+id/action_join_channel"
android:icon="@drawable/ic_add"
- android:title="@string/action_join_channel"
+ android:title="@string/actionJoinChannel"
app:showAsAction="ifRoom"/>
<item
android:id="@+id/action_show_all"
android:checkable="true"
- android:title="@string/action_show_hidden"
+ android:title="@string/actionShowHidden"
app:showAsAction="never"/>
<item
android:id="@+id/action_manage_chat_lists"
- android:title="@string/action_manage_chat_lists"
+ android:title="@string/actionManageChatLists"
app:showAsAction="never"/>
</menu>
diff --git a/app/src/main/res/menu/confirm.xml b/app/src/main/res/menu/confirm.xml
index c952bf45a..59afd08b1 100644
--- a/app/src/main/res/menu/confirm.xml
+++ b/app/src/main/res/menu/confirm.xml
@@ -25,6 +25,6 @@
<item
android:id="@+id/action_confirm"
android:icon="@drawable/ic_check"
- android:title="@string/save"
+ android:title="@string/actionSave"
app:showAsAction="always"/>
</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/confirm_delete.xml b/app/src/main/res/menu/confirm_delete.xml
index c42fbdd84..5735b5b21 100644
--- a/app/src/main/res/menu/confirm_delete.xml
+++ b/app/src/main/res/menu/confirm_delete.xml
@@ -25,11 +25,11 @@
<item
android:id="@+id/action_delete"
android:icon="@drawable/ic_delete"
- android:title="@string/delete"
+ android:title="@string/actionDelete"
app:showAsAction="always"/>
<item
android:id="@+id/action_confirm"
android:icon="@drawable/ic_check"
- android:title="@string/save"
+ android:title="@string/actionSave"
app:showAsAction="always"/>
</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/context_buffer_network.xml b/app/src/main/res/menu/context_buffer_network.xml
index 5f46ee365..f3b4c4845 100644
--- a/app/src/main/res/menu/context_buffer_network.xml
+++ b/app/src/main/res/menu/context_buffer_network.xml
@@ -25,30 +25,30 @@
android:id="@+id/context_group_network">
<item
android:id="@+id/context_menu_connect"
- android:title="@string/action_connect"/>
+ android:title="@string/actionConnect"/>
<item
android:id="@+id/context_menu_disconnect"
- android:title="@string/action_disconnect"/>
+ android:title="@string/actionDisconnect"/>
</group>
<group
android:id="@+id/context_group_buffer">
<item
android:id="@+id/context_menu_join"
- android:title="@string/action_join"/>
+ android:title="@string/actionJoin"/>
<item
android:id="@+id/context_menu_part"
- android:title="@string/action_part"/>
+ android:title="@string/actionPart"/>
<item
android:id="@+id/context_menu_delete"
- android:title="@string/action_delete"/>
+ android:title="@string/actionDelete"/>
<item
android:id="@+id/context_menu_unhide"
- android:title="@string/action_unhide"/>
+ android:title="@string/actionUnhide"/>
<item
android:id="@+id/context_menu_hide_temp"
- android:title="@string/action_hide_temp"/>
+ android:title="@string/actionHideTemp"/>
<item
android:id="@+id/context_menu_hide_perm"
- android:title="@string/action_hide_perm"/>
+ android:title="@string/actionHidePerm"/>
</group>
</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/formatting.xml b/app/src/main/res/menu/formatting.xml
index 828d8d48d..7fe406abb 100644
--- a/app/src/main/res/menu/formatting.xml
+++ b/app/src/main/res/menu/formatting.xml
@@ -45,71 +45,71 @@
<menu>
<item
android:id="@+id/paint_clear"
- android:title="@string/colorname_clear"/>
+ android:title="@string/colornameClear"/>
<item
android:id="@+id/paint_mircColor0"
android:icon="?attr/mircColor0"
- android:title="@string/colorname_mircColor0"/>
+ android:title="@string/colornameMircColor0"/>
<item
android:id="@+id/paint_mircColor1"
android:icon="?attr/mircColor1"
- android:title="@string/colorname_mircColor1"/>
+ android:title="@string/colornameMircColor1"/>
<item
android:id="@+id/paint_mircColor2"
android:icon="?attr/mircColor2"
- android:title="@string/colorname_mircColor2"/>
+ android:title="@string/colornameMircColor2"/>
<item
android:id="@+id/paint_mircColor3"
android:icon="?attr/mircColor3"
- android:title="@string/colorname_mircColor3"/>
+ android:title="@string/colornameMircColor3"/>
<item
android:id="@+id/paint_mircColor4"
android:icon="?attr/mircColor4"
- android:title="@string/colorname_mircColor4"/>
+ android:title="@string/colornameMircColor4"/>
<item
android:id="@+id/paint_mircColor5"
android:icon="?attr/mircColor5"
- android:title="@string/colorname_mircColor5"/>
+ android:title="@string/colornameMircColor5"/>
<item
android:id="@+id/paint_mircColor6"
android:icon="?attr/mircColor6"
- android:title="@string/colorname_mircColor6"/>
+ android:title="@string/colornameMircColor6"/>
<item
android:id="@+id/paint_mircColor7"
android:icon="?attr/mircColor7"
- android:title="@string/colorname_mircColor7"/>
+ android:title="@string/colornameMircColor7"/>
<item
android:id="@+id/paint_mircColor8"
android:icon="?attr/mircColor8"
- android:title="@string/colorname_mircColor8"/>
+ android:title="@string/colornameMircColor8"/>
<item
android:id="@+id/paint_mircColor9"
android:icon="?attr/mircColor9"
- android:title="@string/colorname_mircColor9"/>
+ android:title="@string/colornameMircColor9"/>
<item
android:id="@+id/paint_mircColorA"
android:icon="?attr/mircColorA"
- android:title="@string/colorname_mircColorA"/>
+ android:title="@string/colornameMircColorA"/>
<item
android:id="@+id/paint_mircColorB"
android:icon="?attr/mircColorB"
- android:title="@string/colorname_mircColorB"/>
+ android:title="@string/colornameMircColorB"/>
<item
android:id="@+id/paint_mircColorC"
android:icon="?attr/mircColorC"
- android:title="@string/colorname_mircColorC"/>
+ android:title="@string/colornameMircColorC"/>
<item
android:id="@+id/paint_mircColorD"
android:icon="?attr/mircColorD"
- android:title="@string/colorname_mircColorD"/>
+ android:title="@string/colornameMircColorD"/>
<item
android:id="@+id/paint_mircColorE"
android:icon="?attr/mircColorE"
- android:title="@string/colorname_mircColorE"/>
+ android:title="@string/colornameMircColorE"/>
<item
android:id="@+id/paint_mircColorF"
android:icon="?attr/mircColorF"
- android:title="@string/colorname_mircColorF"/>
+ android:title="@string/colornameMircColorF"/>
</menu>
</item>
<item
@@ -120,76 +120,76 @@
<menu>
<item
android:id="@+id/fill_clear"
- android:title="@string/colorname_clear"/>
+ android:title="@string/colornameClear"/>
<item
android:id="@+id/fill_mircColor0"
android:icon="?attr/mircColor0"
- android:title="@string/colorname_mircColor0"/>
+ android:title="@string/colornameMircColor0"/>
<item
android:id="@+id/fill_mircColor1"
android:icon="?attr/mircColor1"
- android:title="@string/colorname_mircColor1"/>
+ android:title="@string/colornameMircColor1"/>
<item
android:id="@+id/fill_mircColor2"
android:icon="?attr/mircColor2"
- android:title="@string/colorname_mircColor2"/>
+ android:title="@string/colornameMircColor2"/>
<item
android:id="@+id/fill_mircColor3"
android:icon="?attr/mircColor3"
- android:title="@string/colorname_mircColor3"/>
+ android:title="@string/colornameMircColor3"/>
<item
android:id="@+id/fill_mircColor4"
android:icon="?attr/mircColor4"
- android:title="@string/colorname_mircColor4"/>
+ android:title="@string/colornameMircColor4"/>
<item
android:id="@+id/fill_mircColor5"
android:icon="?attr/mircColor5"
- android:title="@string/colorname_mircColor5"/>
+ android:title="@string/colornameMircColor5"/>
<item
android:id="@+id/fill_mircColor6"
android:icon="?attr/mircColor6"
- android:title="@string/colorname_mircColor6"/>
+ android:title="@string/colornameMircColor6"/>
<item
android:id="@+id/fill_mircColor7"
android:icon="?attr/mircColor7"
- android:title="@string/colorname_mircColor7"/>
+ android:title="@string/colornameMircColor7"/>
<item
android:id="@+id/fill_mircColor8"
android:icon="?attr/mircColor8"
- android:title="@string/colorname_mircColor8"/>
+ android:title="@string/colornameMircColor8"/>
<item
android:id="@+id/fill_mircColor9"
android:icon="?attr/mircColor9"
- android:title="@string/colorname_mircColor9"/>
+ android:title="@string/colornameMircColor9"/>
<item
android:id="@+id/fill_mircColorA"
android:icon="?attr/mircColorA"
- android:title="@string/colorname_mircColorA"/>
+ android:title="@string/colornameMircColorA"/>
<item
android:id="@+id/fill_mircColorB"
android:icon="?attr/mircColorB"
- android:title="@string/colorname_mircColorB"/>
+ android:title="@string/colornameMircColorB"/>
<item
android:id="@+id/fill_mircColorC"
android:icon="?attr/mircColorC"
- android:title="@string/colorname_mircColorC"/>
+ android:title="@string/colornameMircColorC"/>
<item
android:id="@+id/fill_mircColorD"
android:icon="?attr/mircColorD"
- android:title="@string/colorname_mircColorD"/>
+ android:title="@string/colornameMircColorD"/>
<item
android:id="@+id/fill_mircColorE"
android:icon="?attr/mircColorE"
- android:title="@string/colorname_mircColorE"/>
+ android:title="@string/colornameMircColorE"/>
<item
android:id="@+id/fill_mircColorF"
android:icon="?attr/mircColorF"
- android:title="@string/colorname_mircColorF"/>
+ android:title="@string/colornameMircColorF"/>
</menu>
</item>
<item
android:id="@+id/action_history"
android:icon="@drawable/ic_history"
- android:title="@string/labelHistory"
+ android:title="@string/actionHistory"
app:showAsAction="always"/>
</menu>
diff --git a/app/src/main/res/values/preferences.xml b/app/src/main/res/values/preferences.xml
index 6fb036b3a..6a1eb490c 100644
--- a/app/src/main/res/values/preferences.xml
+++ b/app/src/main/res/values/preferences.xml
@@ -30,23 +30,23 @@
<string name="preference_colors" translatable="false">preference_colors</string>
<string name="preference_colors_title">Use mIRC Colors</string>
- <string name="preference_colors_summary_on">preference_colors_summary_on</string>
- <string name="preference_colors_summary_off">preference_colors_summary_off</string>
+ <string name="preference_colors_summary_on">Strip mIRC colors from messages</string>
+ <string name="preference_colors_summary_off">Show mIRC colors in messages</string>
<string name="preference_hostmask" translatable="false">preference_hostname</string>
<string name="preference_hostmask_title">Show Hostmask in Messages</string>
- <string name="preference_hostmask_summary_on">preference_hostmask_summary_on</string>
- <string name="preference_hostmask_summary_off">preference_hostmask_summary_off</string>
+ <string name="preference_hostmask_summary_on">Show the full hostmask in server actions (Join, Part, Quit, etc)</string>
+ <string name="preference_hostmask_summary_off">Show only the username in server actions (Join, Part, Quit, etc)</string>
<string name="preference_lag" translatable="false">preference_lag</string>
<string name="preference_lag_title">Show Connection Lag</string>
- <string name="preference_lag_summary_on">preference_lag_summary_on</string>
- <string name="preference_lag_summary_off">preference_lag_summary_off</string>
+ <string name="preference_lag_summary_on">Show the latency between core and client in the action bar</string>
+ <string name="preference_lag_summary_off">Don’t show the latency between core and client</string>
<string name="preference_brackets" translatable="false">preference_brackets</string>
<string name="preference_brackets_title">Classical Nick Style</string>
- <string name="preference_brackets_summary_on">preference_brackets_summary_on</string>
- <string name="preference_brackets_summary_off">preference_brackets_summary_off</string>
+ <string name="preference_brackets_summary_on">Show nicks between brackes in chat</string>
+ <string name="preference_brackets_summary_off">Show plain nicks in chat</string>
<string-array name="preference_theme_entries">
<item>Quassel™ (Light)</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 27bc27d9c..6b5d0c2a6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -23,158 +23,44 @@
<string name="appName">QuasselDroid</string>
<string name="appDescription">An Android-based client for the decentralized Quassel IRC client.</string>
<string name="appDescriptionLong">Quassel is a distributed, decentralized IRC client, written using C++ and Qt. QuasselDroid is a pure-java client for the Quassel core, allowing you to connect to your Quassel core using your Android™ phone.</string>
+ <string name="appLinkCommunityTitle">Google+</string>
+ <string name="appLinkCommunityUrl" translatable="false">https://plus.google.com/communities/104094956084217666662</string>
<string name="appLinkGithubTitle">GitHub</string>
<string name="appLinkGithubUrl" translatable="false">https://github.com/sandsmark/QuasselDroid</string>
- <string name="appLinkCommunityTitle">Community</string>
- <string name="appLinkCommunityUrl" translatable="false">https://plus.google.com/communities/104094956084217666662</string>
- <!-- Editor UI -->
- <string name="placeholder">Write a message…</string>
-
- <string name="formatBold">Bold</string>
- <string name="formatItalic">Italic</string>
- <string name="formatUnderline">Underline</string>
- <string name="formatColor">Text Color</string>
- <string name="formatFill">Background Color</string>
+ <string name="notificationReportCrash">Reporting Crashes</string>
- <!-- Actions, Labels and Messages -->
- <string name="labelLogin">Login</string>
- <string name="labelCancel">Cancel</string>
- <string name="labelStatusBuffer">Status Buffer</string>
- <string name="labelHistory">Input History</string>
- <string name="labelHostname">Hostname</string>
- <string name="labelPort">Port</string>
- <string name="labelPassword">Password</string>
- <string name="labelUsername">Username</string>
- <string name="labelHideEvents">Hide events</string>
+ <string name="defaultPort" translatable="false">4242</string>
+ <string name="labelAllNetworks">All Networks</string>
<string name="labelNoTopic">No Topic Set</string>
+ <string name="labelPlaceholder">Write a message…</string>
<string name="labelUserOnHost">%1$s on %2$s</string>
- <string name="warningCertificate">Do you trust this certificate?</string>
-
- <!-- Defaults -->
- <string name="defaultPort" translatable="false">4242</string>
- <!-- Slides -->
+ <string name="confirmationCertficate">Do you trust this certificate?</string>
+ <string name="confirmationDelete">Are you sure you want to delete "%1$s"?</string>
+ <string name="confirmationUnsavedChanges">There are unsaved changes on the current configuration page. Would you like to apply your changes now?</string>
- <string name="slideAccountcoreTitle">The Core</string>
- <string name="slideAccountcoreDescription">First, please choose which server your core is hosted on – if you don’t know what a core is, click [here]</string>
-
- <string name="slideAccountuserTitle">Your Account</string>
- <string name="slideAccountuserDescription">Now, please enter the username and password for your account on the core. If you just created that core, we’ll set up this account for you</string>
+ <string name="formatBold">Bold</string>
+ <string name="formatColor">Text Color</string>
+ <string name="formatFill">Background Color</string>
+ <string name="formatItalic">Italic</string>
+ <string name="formatUnderline">Underline</string>
- <string name="slideAccountselectTitle">Select Account</string>
- <string name="slideAccountselectDescription">Please select an account from the list or add one</string>
+ <string name="labelAccountName">Account Name</string>
+ <string name="labelAccountPassword">Password</string>
+ <string name="labelAccountUsername">Username</string>
- <string name="slideAccountnameTitle">Customize Account</string>
- <string name="slideAccountnameDescription">Give this account a name and icon</string>
+ <string name="labelCoreHostname">Hostname</string>
+ <string name="labelCorePort">Port</string>
- <!-- Status -->
+ <string name="labelLoginPassword">Password</string>
+ <string name="labelLoginUsername">Username</string>
+ <string name="statusBacklog">Loading Chat History</string>
+ <string name="statusConnected">Connected</string>
<string name="statusConnecting">Connecting</string>
+ <string name="statusDisconnected">Connection lost</string>
<string name="statusHandshake">Logging in</string>
<string name="statusInitData">Loading Networks and Channels</string>
- <string name="statusBacklog">Loading Chat History</string>
- <string name="statusConnected">Connected</string>
<string name="statusWelcome">Welcome!</string>
- <string name="statusDisconnected">Connection lost</string>
- <string name="notification_report_crash">Reporting Crashes</string>
- <string name="label_settings">Settings</string>
- <string name="label_search">Find in Buffer</string>
- <string name="label_disconnect">Disconnect</string>
- <string name="action_manage_chat_lists">Manage Chat Lists</string>
- <string name="action_show_hidden">Show Hidden</string>
- <string name="action_join_channel">Join Channel</string>
-
- <string name="action_connect">Connect</string>
- <string name="action_disconnect">Disconnect</string>
-
- <string name="action_join">Join</string>
- <string name="action_part">Part</string>
- <string name="action_delete">Delete</string>
-
- <string name="action_unhide">Make Visible</string>
- <string name="action_hide_temp">Hide Temporarily</string>
- <string name="action_hide_perm">Hide Permanently</string>
-
- <string name="all_networks">All Networks</string>
- <string name="channeldetails">Channel Details</string>
- <string name="editchatlists">Edit Chat Lists</string>
- <string name="editchatlist">Edit Chat List</string>
- <string name="createchatlist">Create Chat List</string>
- <string name="editnetworks">Edit Networks</string>
- <string name="editnetwork">Edit Network</string>
- <string name="createnetwork">Create Network</string>
- <string name="editnetworkservers">Edit NetworkServers</string>
- <string name="editidentities">Edit Identities</string>
- <string name="editidentity">Edit Identity</string>
- <string name="createidentity">Create Identity</string>
- <string name="editnicks">Edit Nicks</string>
- <string name="editnetworkserver">Edit NetworkServer</string>
- <string name="accountsetup">Account Setup</string>
- <string name="accountselection">Account Selection</string>
- <string name="coresetup">Core Setup</string>
- <string name="settings">Settings</string>
- <string name="areyousureyouwanttodelete">Are you sure you want to delete "%1$s"?</string>
- <string name="yes">Yes</string>
- <string name="no">No</string>
- <string name="youhavemadechangesdoyouwishtosavethem">You have made changes, do you wish to save them?</string>
- <string name="name">Name</string>
- <string name="network">Network</string>
- <string name="show_channels">Show channels</string>
- <string name="show_queries">Show Queries</string>
- <string name="hide_inactive_chats">Hide inactive chats</string>
- <string name="hide_inactive_networks">Hide inactive networks</string>
- <string name="add_new_chats_automatically">Add new chats automatically</string>
- <string name="sort_alphabetically">Sort alphabetically</string>
- <string name="minimum_activity">Minimum Activity</string>
- <string name="identityname">identityName</string>
- <string name="realname">realName</string>
- <string name="ident">ident</string>
- <string name="edit_nicks">Edit Nicks</string>
- <string name="messages">Messages</string>
- <string name="kickreason">kickReason</string>
- <string name="partreason">partReason</string>
- <string name="quitreason">quitReason</string>
- <string name="away">Away</string>
- <string name="awayreason">awayReason</string>
- <string name="away_on_detach">Away on Detach</string>
- <string name="awayondetachreason">awayOnDetachReason</string>
- <string name="networkname">networkName</string>
- <string name="identity">identity</string>
- <string name="rejoinchannels">rejoinChannels</string>
- <string name="edit_servers">Edit Servers</string>
- <string name="custom_codecs">Custom Codecs</string>
- <string name="codecforserver">codecForServer</string>
- <string name="codecforencoding">codecForEncoding</string>
- <string name="codecfordecoding">codecForDecoding</string>
- <string name="auto_identify">Auto Identify</string>
- <string name="autoidentifyservice">autoIdentifyService</string>
- <string name="autoidentifypassword">autoIdentifyPassword</string>
- <string name="sasl">SASL</string>
- <string name="saslaccount">saslAccount</string>
- <string name="saslpassword">saslPassword</string>
- <string name="auto_reconnect">Auto Reconnect</string>
- <string name="autoreconnectinterval">autoReconnectInterval</string>
- <string name="unlimitedautoreconnectretries">unlimitedAutoReconnectRetries</string>
- <string name="autoreconnectretries">autoReconnectRetries</string>
- <string name="host">host</string>
- <string name="port">port</string>
- <string name="usessl">useSSL</string>
- <string name="password">password</string>
- <string name="proxy">Proxy</string>
- <string name="proxyhost">proxyHost</string>
- <string name="proxyport">proxyPort</string>
- <string name="proxytype">proxyType</string>
- <string name="proxyuser">proxyUser</string>
- <string name="proxypassword">proxyPassword</string>
- <string name="networks">Networks</string>
- <string name="identities">Identities</string>
- <string name="save">Save</string>
- <string name="delete">Delete</string>
- <string name="topic">Topic</string>
- <string name="edit_topic">Edit Topic</string>
- <string name="channel_modes">Channel Modes</string>
- <string name="account_name">Account Name</string>
- <string name="username">Username</string>
- <string name="add_account">Add Account</string>
</resources>
diff --git a/app/src/main/res/values/strings_actions.xml b/app/src/main/res/values/strings_actions.xml
new file mode 100644
index 000000000..b22f8452b
--- /dev/null
+++ b/app/src/main/res/values/strings_actions.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ QuasselDroid - Quassel client for Android
+ ~ Copyright (C) 2016 Janne Koschinski
+ ~ Copyright (C) 2016 Ken Børge Viktil
+ ~ Copyright (C) 2016 Magnus Fjell
+ ~ Copyright (C) 2016 Martin Sandsmark <martin.sandsmark@kde.org>
+ ~
+ ~ This program is free software: you can redistribute it and/or modify it
+ ~ under the terms of the GNU General Public License as published by the Free
+ ~ Software Foundation, either version 3 of the License, or (at your option)
+ ~ any later version.
+ ~
+ ~ This program is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ ~ GNU General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU General Public License along
+ ~ with this program. If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+<resources>
+ <string name="actionAddAccount">Add Account</string>
+ <string name="actionCancel">Cancel</string>
+ <string name="actionConnect">Connect</string>
+ <string name="actionDelete">Delete</string>
+ <string name="actionDisconnect">Disconnect</string>
+ <string name="actionEditNicks">Edit Nicks</string>
+ <string name="actionEditServers">Edit Servers</string>
+ <string name="actionEditTopic">Edit Topic</string>
+ <string name="actionHideEvents">Hide Events</string>
+ <string name="actionHidePerm">Hide Permanently</string>
+ <string name="actionHideTemp">Hide Temporarily</string>
+ <string name="actionHistory">Input History</string>
+ <string name="actionIdentities">Identities</string>
+ <string name="actionIgnore">Ignore</string>
+ <string name="actionJoin">Join</string>
+ <string name="actionJoinChannel">Join Channel</string>
+ <string name="actionLogin">Login</string>
+ <string name="actionManageChatLists">Manage Chat Lists</string>
+ <string name="actionNetworks">Networks</string>
+ <string name="actionNo">No</string>
+ <string name="actionPart">Part</string>
+ <string name="actionSave">Save</string>
+ <string name="actionSearch">Find in Buffer</string>
+ <string name="actionSettings">Settings</string>
+ <string name="actionShowHidden">Show Hidden</string>
+ <string name="actionUnhide">Make Visible</string>
+ <string name="actionYes">Yes</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings_coresettings.xml b/app/src/main/res/values/strings_coresettings.xml
new file mode 100644
index 000000000..617883996
--- /dev/null
+++ b/app/src/main/res/values/strings_coresettings.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ QuasselDroid - Quassel client for Android
+ ~ Copyright (C) 2016 Janne Koschinski
+ ~ Copyright (C) 2016 Ken Børge Viktil
+ ~ Copyright (C) 2016 Magnus Fjell
+ ~ Copyright (C) 2016 Martin Sandsmark <martin.sandsmark@kde.org>
+ ~
+ ~ This program is free software: you can redistribute it and/or modify it
+ ~ under the terms of the GNU General Public License as published by the Free
+ ~ Software Foundation, either version 3 of the License, or (at your option)
+ ~ any later version.
+ ~
+ ~ This program is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ ~ GNU General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU General Public License along
+ ~ with this program. If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+<resources>
+
+ <string name="labelChatlistAddNewChatsAutomatically">Add new chats automatically</string>
+ <string name="labelChatlistHideInactiveChats">Hide inactive chats</string>
+ <string name="labelChatlistHideInactiveNetworks">Hide inactive networks</string>
+ <string name="labelChatlistMinimumActivity">Minimum Activity</string>
+ <string name="labelChatlistName">Name</string>
+ <string name="labelChatlistNetwork">Network</string>
+ <string name="labelChatlistShowChannels">Show channels</string>
+ <string name="labelChatlistShowQueries">Show queries</string>
+ <string name="labelChatlistSortAlphabetically">Sort alphabetically</string>
+
+ <string name="labelIdentityAway">Away</string>
+ <string name="labelIdentityAwayReason">Reason</string>
+ <string name="labelIdentityDetachAway">Away on Detach</string>
+ <string name="labelIdentityDetachAwayReason">Reason</string>
+ <string name="labelIdentityIdent">Ident</string>
+ <string name="labelIdentityKickReason">Kick Reason</string>
+ <string name="labelIdentityMessages">Messages</string>
+ <string name="labelIdentityName">Identity Name</string>
+ <string name="labelIdentityPartReason">Part Reason</string>
+ <string name="labelIdentityQuitReason">Quit Reason</string>
+ <string name="labelIdentityRealName">Real Name</string>
+
+ <string name="labelNetworkAutoIdentify">Auto Identify</string>
+ <string name="labelNetworkAutoIdentifyPassword">Password</string>
+ <string name="labelNetworkAutoIdentifyService">Service</string>
+ <string name="labelNetworkAutoReconnect">Auto Reconnect</string>
+ <string name="labelNetworkAutoReconnectInterval">Interval</string>
+ <string name="labelNetworkAutoReconnectRetries">Retries</string>
+ <string name="labelNetworkAutoReconnectRetriesUnlimited">Unlimited Retries</string>
+ <string name="labelNetworkCodecForDecoding">Decoding</string>
+ <string name="labelNetworkCodecForEncoding">Encoding</string>
+ <string name="labelNetworkCodecForServer">Server</string>
+ <string name="labelNetworkCustomCodecs">Custom Codecs</string>
+ <string name="labelNetworkIdentity">Identity</string>
+ <string name="labelNetworkName">Network Name</string>
+ <string name="labelNetworkRejoinChannels">Rejoin Channels</string>
+ <string name="labelNetworkSasl">SASL</string>
+ <string name="labelNetworkSaslAccount">Account</string>
+ <string name="labelNetworkSaslPassword">Password</string>
+
+ <string name="labelNetworkServerHost">Host</string>
+ <string name="labelNetworkServerPassword">Password</string>
+ <string name="labelNetworkServerPort">Port</string>
+ <string name="labelNetworkServerProxy">Proxy</string>
+ <string name="labelNetworkServerProxyHost">Host</string>
+ <string name="labelNetworkServerProxyPassword">Password</string>
+ <string name="labelNetworkServerProxyPort">Port</string>
+ <string name="labelNetworkServerProxyType">Type</string>
+ <string name="labelNetworkServerProxyUser">User</string>
+ <string name="labelNetworkServerUseSSL">SSL</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings_format.xml b/app/src/main/res/values/strings_format.xml
index 407a081a0..057b043ed 100644
--- a/app/src/main/res/values/strings_format.xml
+++ b/app/src/main/res/values/strings_format.xml
@@ -51,21 +51,21 @@
<string name="messageTopic">%1$s has changed topic for %2$s to: "%3$s"</string>
- <string name="colorname_clear">clear</string>
- <string name="colorname_mircColor0">mircColor0</string>
- <string name="colorname_mircColor1">mircColor1</string>
- <string name="colorname_mircColor2">mircColor2</string>
- <string name="colorname_mircColor3">mircColor3</string>
- <string name="colorname_mircColor4">mircColor4</string>
- <string name="colorname_mircColor5">mircColor5</string>
- <string name="colorname_mircColor6">mircColor6</string>
- <string name="colorname_mircColor7">mircColor7</string>
- <string name="colorname_mircColor8">mircColor8</string>
- <string name="colorname_mircColor9">mircColor9</string>
- <string name="colorname_mircColorA">mircColorA</string>
- <string name="colorname_mircColorB">mircColorB</string>
- <string name="colorname_mircColorC">mircColorC</string>
- <string name="colorname_mircColorD">mircColorD</string>
- <string name="colorname_mircColorE">mircColorE</string>
- <string name="colorname_mircColorF">mircColorF</string>
+ <string name="colornameClear">Zurücksetzen</string>
+ <string name="colornameMircColor0">White</string>
+ <string name="colornameMircColor1">Black</string>
+ <string name="colornameMircColor2">Blue</string>
+ <string name="colornameMircColor3">Green</string>
+ <string name="colornameMircColor4">Light Red</string>
+ <string name="colornameMircColor5">Brown</string>
+ <string name="colornameMircColor6">Purple</string>
+ <string name="colornameMircColor7">Orange</string>
+ <string name="colornameMircColor8">Yellow</string>
+ <string name="colornameMircColor9">Light Green</string>
+ <string name="colornameMircColorA">Cyan</string>
+ <string name="colornameMircColorB">Light Cyan</string>
+ <string name="colornameMircColorC">Light Blue</string>
+ <string name="colornameMircColorD">Pink</string>
+ <string name="colornameMircColorE">Grey</string>
+ <string name="colornameMircColorF">Light Grey</string>
</resources>
diff --git a/app/src/main/res/values/strings_setup.xml b/app/src/main/res/values/strings_setup.xml
new file mode 100644
index 000000000..7012cca26
--- /dev/null
+++ b/app/src/main/res/values/strings_setup.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ QuasselDroid - Quassel client for Android
+ ~ Copyright (C) 2016 Janne Koschinski
+ ~ Copyright (C) 2016 Ken Børge Viktil
+ ~ Copyright (C) 2016 Magnus Fjell
+ ~ Copyright (C) 2016 Martin Sandsmark <martin.sandsmark@kde.org>
+ ~
+ ~ This program is free software: you can redistribute it and/or modify it
+ ~ under the terms of the GNU General Public License as published by the Free
+ ~ Software Foundation, either version 3 of the License, or (at your option)
+ ~ any later version.
+ ~
+ ~ This program is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ ~ GNU General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU General Public License along
+ ~ with this program. If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+<resources>
+ <string name="slideAccountSelectTitle">Select Account</string>
+ <string name="slideAccountSelectDescription">Please select an account from the list or add one</string>
+
+ <string name="slideAccountCoreTitle">The Core</string>
+ <string name="slideAccountCoreDescription">First, please choose which server your core is hosted on.</string>
+
+ <string name="slideAccountUserTitle">Your Account</string>
+ <string name="slideAccountUserDescription">Now, please enter the username and password for your account on the core. If you just created that core, we’ll set up this account for you</string>
+
+ <string name="slideAccountNameTitle">Customize Account</string>
+ <string name="slideAccountNameDescription">Give this account a name and icon</string>
+
+ <string name="slideCoreBackendSelectTitle">Select Storage Backend</string>
+ <string name="slideCoreBackendSelectDescription">Please select a database backend for the Quassel Core storage to store the backlog and other data in.</string>
+
+ <string name="slideCoreBackendSetupTitle">Configure Storage Backend</string>
+ <string name="slideCoreBackendSetupDescription">Please configure the selected database backend.</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings_titles.xml b/app/src/main/res/values/strings_titles.xml
new file mode 100644
index 000000000..141b26294
--- /dev/null
+++ b/app/src/main/res/values/strings_titles.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ QuasselDroid - Quassel client for Android
+ ~ Copyright (C) 2016 Janne Koschinski
+ ~ Copyright (C) 2016 Ken Børge Viktil
+ ~ Copyright (C) 2016 Magnus Fjell
+ ~ Copyright (C) 2016 Martin Sandsmark <martin.sandsmark@kde.org>
+ ~
+ ~ This program is free software: you can redistribute it and/or modify it
+ ~ under the terms of the GNU General Public License as published by the Free
+ ~ Software Foundation, either version 3 of the License, or (at your option)
+ ~ any later version.
+ ~
+ ~ This program is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ ~ GNU General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU General Public License along
+ ~ with this program. If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+<resources>
+ <string name="titleAccountSelection">Account Selection</string>
+ <string name="titleAccountSetup">Account Setup</string>
+ <string name="titleChannelDetails">Channel Details</string>
+ <string name="titleChannelModes">Channel Modes</string>
+ <string name="titleCoreSetup">Core Setup</string>
+ <string name="titleCreateChatList">Create Chat List</string>
+ <string name="titleCreateIdentity">Create Identity</string>
+ <string name="titleCreateNetwork">Create Network</string>
+ <string name="titleEditChatList">Edit Chat List</string>
+ <string name="titleEditChatLists">Edit Chat Lists</string>
+ <string name="titleEditIdentities">Edit Identities</string>
+ <string name="titleEditIdentity">Edit Identity</string>
+ <string name="titleEditNetwork">Edit Network</string>
+ <string name="titleEditNetworkServer">Edit NetworkServer</string>
+ <string name="titleEditNetworkServers">Edit NetworkServers</string>
+ <string name="titleEditNetworks">Edit Networks</string>
+ <string name="titleEditNicks">Edit Nicks</string>
+ <string name="titleHistory">Input History</string>
+ <string name="titleLogin">Login</string>
+ <string name="titleSettings">Settings</string>
+ <string name="titleTopic">Topic</string>
+</resources>
\ No newline at end of file
--
GitLab