Mastodon
/
Twidere-App-Android-Twitter-Mastodon
mirror of https://github.com/TwidereProject/Twidere-Android
1
0
Fork 0
Code Issues Releases Wiki Activity

updated strings

This commit is contained in:
Mariotaku Lee 2016-12-27 00:26:09 +08:00
parent 57cc550795
commit df7abdb7fa
59 changed files with 210 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
twidere/src/main/AndroidManifest.xml
View File

@ -292,7 +292,7 @@
</activity>
<activity
android:name=".activity.ColorPickerDialogActivity"
android:label="@string/set_color"
android:label="@string/action_set_color"
android:theme="@style/Theme.Twidere.NoDisplay"/>
<activity
android:name=".activity.LinkHandlerActivity"

2
twidere/src/main/java/org/mariotaku/twidere/fragment/DataExportImportTypeSelectorDialogFragment.java
View File

@ -91,7 +91,7 @@ public final class DataExportImportTypeSelectorDialogFragment extends BaseDialog
mAdapter.add(new Type(R.string.user_colors, DataImportExportUtils.FLAG_USER_COLORS));
mAdapter.add(new Type(R.string.custom_host_mapping, DataImportExportUtils.FLAG_HOST_MAPPING));
mAdapter.add(new Type(R.string.keyboard_shortcuts, DataImportExportUtils.FLAG_KEYBOARD_SHORTCUTS));
mAdapter.add(new Type(R.string.filters, DataImportExportUtils.FLAG_FILTERS));
mAdapter.add(new Type(R.string.title_filters, DataImportExportUtils.FLAG_FILTERS));
mAdapter.add(new Type(R.string.tabs, DataImportExportUtils.FLAG_TABS));
mListView.setAdapter(mAdapter);
mListView.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);

4
twidere/src/main/java/org/mariotaku/twidere/model/tab/impl/FavoriteTimelineTabConfiguration.java
View File

@ -25,7 +25,7 @@ public class FavoriteTimelineTabConfiguration extends TabConfiguration {
@NonNull
@Override
public StringHolder getName() {
return StringHolder.resource(R.string.favorites);
return StringHolder.resource(R.string.title_favorites);
}
@NonNull
@ -44,7 +44,7 @@ public class FavoriteTimelineTabConfiguration extends TabConfiguration {
@Override
public ExtraConfiguration[] getExtraConfigurations(Context context) {
return new ExtraConfiguration[]{
new UserExtraConfiguration(EXTRA_USER).title(R.string.user).headerTitle(R.string.user)
new UserExtraConfiguration(EXTRA_USER).title(R.string.title_user).headerTitle(R.string.title_user)
};
}

2
twidere/src/main/java/org/mariotaku/twidere/model/tab/impl/UserTimelineTabConfiguration.java
View File

@ -44,7 +44,7 @@ public class UserTimelineTabConfiguration extends TabConfiguration {
@Override
public ExtraConfiguration[] getExtraConfigurations(Context context) {
return new ExtraConfiguration[]{
new UserExtraConfiguration(EXTRA_USER).title(R.string.user).headerTitle(R.string.user)
new UserExtraConfiguration(EXTRA_USER).title(R.string.title_user).headerTitle(R.string.title_user)
};
}

2
twidere/src/main/java/org/mariotaku/twidere/preference/KeyboardShortcutPreference.java
View File

@ -142,7 +142,7 @@ public class KeyboardShortcutPreference extends DialogPreference implements IDia
protected void onPrepareDialogBuilder(AlertDialog.Builder builder) {
builder.setPositiveButton(android.R.string.ok, this);
builder.setNegativeButton(android.R.string.cancel, this);
builder.setNeutralButton(R.string.clear, this);
builder.setNeutralButton(R.string.action_clear, this);
builder.setOnKeyListener(this);
}

4
twidere/src/main/java/org/mariotaku/twidere/util/AsyncTwitterWrapper.java
View File

@ -815,7 +815,7 @@ public class AsyncTwitterWrapper extends TwitterWrapper {
@Override
protected void onPostExecute(final SingleResponse<SavedSearch> result) {
if (result.hasData()) {
final String message = context.getString(R.string.search_name_saved, result.getData().getQuery());
final String message = context.getString(R.string.message_search_name_saved, result.getData().getQuery());
Utils.showOkMessage(context, message, false);
} else if (result.hasException()) {
final Exception exception = result.getException();
@ -1231,7 +1231,7 @@ public class AsyncTwitterWrapper extends TwitterWrapper {
@Override
protected void onPostExecute(final SingleResponse<SavedSearch> result) {
if (result.hasData()) {
final String message = context.getString(R.string.search_name_deleted, result.getData().getQuery());
final String message = context.getString(R.string.message_search_name_deleted, result.getData().getQuery());
Utils.showOkMessage(context, message, false);
getBus().post(new SavedSearchDestroyedEvent(mAccountKey, mSearchId));
} else {

6
twidere/src/main/java/org/mariotaku/twidere/util/KeyboardShortcutsHandler.java
View File

@ -44,9 +44,9 @@ public class KeyboardShortcutsHandler implements KeyboardShortcutConstants {
sActionLabelMap.put(ACTION_SEARCH, R.string.search);
sActionLabelMap.put(ACTION_MESSAGE, R.string.new_direct_message);
sActionLabelMap.put(ACTION_HOME_ACCOUNTS_DASHBOARD, R.string.open_accounts_dashboard);
sActionLabelMap.put(ACTION_STATUS_REPLY, R.string.reply);
sActionLabelMap.put(ACTION_STATUS_RETWEET, R.string.retweet);
sActionLabelMap.put(ACTION_STATUS_FAVORITE, R.string.like);
sActionLabelMap.put(ACTION_STATUS_REPLY, R.string.action_reply);
sActionLabelMap.put(ACTION_STATUS_RETWEET, R.string.action_retweet);
sActionLabelMap.put(ACTION_STATUS_FAVORITE, R.string.action_like);
sActionLabelMap.put(ACTION_NAVIGATION_PREVIOUS, R.string.previous_item);
sActionLabelMap.put(ACTION_NAVIGATION_NEXT, R.string.next_item);
sActionLabelMap.put(ACTION_NAVIGATION_PAGE_DOWN, R.string.page_down);

2
twidere/src/main/java/org/mariotaku/twidere/util/Utils.java
View File

@ -1181,7 +1181,7 @@ public final class Utils implements Constants {
intent.putExtra(Intent.EXTRA_SUBJECT, subject);
intent.putExtra(Intent.EXTRA_TEXT, status.text_plain);
intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
context.startActivity(Intent.createChooser(intent, context.getString(R.string.share)));
context.startActivity(Intent.createChooser(intent, context.getString(R.string.action_share)));
}
public static void stopListView(final AbsListView list) {

2
twidere/src/main/kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt
View File

@ -1793,7 +1793,7 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener
(activity as ComposeActivity).setMediaAltText(arguments.getInt(EXTRA_POSITION),
ParseUtils.parseString(editText.text))
}
builder.setNeutralButton(R.string.clear) { dialogInterface, i ->
builder.setNeutralButton(R.string.action_clear) { dialogInterface, i ->
(activity as ComposeActivity).setMediaAltText(arguments.getInt(EXTRA_POSITION), null)
}
val dialog = builder.create()

12
twidere/src/main/kotlin/org/mariotaku/twidere/activity/LinkHandlerActivity.kt
View File

@ -287,16 +287,16 @@ class LinkHandlerActivity : BaseActivity(), SystemWindowsInsetsCallback, IContro
setTitle(R.string.status)
}
LINK_ID_USER -> {
setTitle(R.string.user)
setTitle(R.string.title_user)
}
LINK_ID_USER_TIMELINE -> {
setTitle(R.string.statuses)
}
LINK_ID_USER_FAVORITES -> {
if (preferences.getBoolean(SharedPreferenceConstants.KEY_I_WANT_MY_STARS_BACK)) {
setTitle(R.string.favorites)
setTitle(R.string.title_favorites)
} else {
setTitle(R.string.likes)
setTitle(R.string.title_likes)
}
}
LINK_ID_USER_FOLLOWERS -> {
@ -366,16 +366,16 @@ class LinkHandlerActivity : BaseActivity(), SystemWindowsInsetsCallback, IContro
setTitle(R.string.accounts)
}
LINK_ID_DRAFTS -> {
setTitle(R.string.drafts)
setTitle(R.string.title_drafts)
}
LINK_ID_FILTERS -> {
setTitle(R.string.filters)
setTitle(R.string.title_filters)
}
LINK_ID_MAP -> {
setTitle(R.string.view_map)
}
LINK_ID_PROFILE_EDITOR -> {
setTitle(R.string.edit_profile)
setTitle(R.string.title_edit_profile)
}
LINK_ID_SCHEDULED_STATUSES -> {
title = getString(R.string.scheduled_statuses)

4
twidere/src/main/kotlin/org/mariotaku/twidere/activity/MediaViewerActivity.kt
View File

@ -152,7 +152,7 @@ class MediaViewerActivity : BaseActivity(), IExtendedActivity, IMediaViewerActiv
val intent = Intent(Intent.ACTION_SEND)
intent.type = "text/plain"
intent.putExtra(Intent.EXTRA_TEXT, media.url)
startActivity(Intent.createChooser(intent, getString(R.string.share)))
startActivity(Intent.createChooser(intent, getString(R.string.action_share)))
}
return true
}
@ -373,7 +373,7 @@ class MediaViewerActivity : BaseActivity(), IExtendedActivity, IMediaViewerActiv
intent.addFlags(Intent.FLAG_GRANT_PREFIX_URI_PERMISSION)
}
activity.processShareIntent(intent)
startActivityForResult(Intent.createChooser(intent, activity.getString(R.string.share)),
startActivityForResult(Intent.createChooser(intent, activity.getString(R.string.action_share)),
REQUEST_SHARE_MEDIA)
}

4
twidere/src/main/kotlin/org/mariotaku/twidere/extension/DraftExtensions.kt
View File

@ -108,10 +108,10 @@ fun Draft.getActionName(context: Context): String? {
return context.getString(R.string.update_status)
}
Draft.Action.REPLY -> {
return context.getString(R.string.reply)
return context.getString(R.string.action_reply)
}
Draft.Action.QUOTE -> {
return context.getString(R.string.quote)
return context.getString(R.string.action_quote)
}
Draft.Action.SEND_DIRECT_MESSAGE, Draft.Action.SEND_DIRECT_MESSAGE_COMPAT -> {
return context.getString(R.string.send_direct_message)

7
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsUserMuteBlockDialogFragment.kt
View File

@ -48,7 +48,7 @@ abstract class AbsUserMuteBlockDialogFragment : BaseDialogFragment(), DialogInte
val builder = AlertDialog.Builder(context)
builder.setTitle(getTitle(user))
builder.setView(R.layout.dialog_block_mute_filter_user_confirm)
builder.setPositiveButton(android.R.string.ok, this)
builder.setPositiveButton(getPositiveButtonTitle(user), this)
builder.setNegativeButton(android.R.string.cancel, null)
val dialog = builder.create()
dialog.setOnShowListener {
@ -65,6 +65,7 @@ abstract class AbsUserMuteBlockDialogFragment : BaseDialogFragment(), DialogInte
abstract fun performUserAction(user: ParcelableUser, filterEverywhere: Boolean)
abstract fun getTitle(user: ParcelableUser): String
abstract fun getMessage(user: ParcelableUser): String
protected abstract fun getTitle(user: ParcelableUser): String
protected abstract fun getMessage(user: ParcelableUser): String
protected open fun getPositiveButtonTitle(user: ParcelableUser): String = getString(android.R.string.ok)
}

4
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AccountsDashboardFragment.kt
View File

@ -282,9 +282,9 @@ class AccountsDashboardFragment : BaseSupportFragment(), LoaderCallbacks<Account
updateDefaultAccountState()
if (data.draftsCount > 0) {
navigationView.menu.findItem(R.id.drafts).title = "${getString(R.string.drafts)} (${data.draftsCount})"
navigationView.menu.findItem(R.id.drafts).title = "${getString(R.string.title_drafts)} (${data.draftsCount})"
} else {
navigationView.menu.findItem(R.id.drafts).title = getString(R.string.drafts)
navigationView.menu.findItem(R.id.drafts).title = getString(R.string.title_drafts)
}
}

2
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ColorPickerDialogFragment.kt
View File

@ -70,7 +70,7 @@ class ColorPickerDialogFragment : BaseDialogFragment(), DialogInterface.OnClickL
builder.setView(me.uucky.colorpicker.R.layout.cp__dialog_color_picker)
builder.setPositiveButton(android.R.string.ok, this)
if (args.getBoolean(EXTRA_CLEAR_BUTTON, false)) {
builder.setNeutralButton(R.string.clear, this)
builder.setNeutralButton(R.string.action_clear, this)
}
builder.setNegativeButton(android.R.string.cancel, this)
val dialog = builder.create()

4
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CreateUserBlockDialogFragment.kt
View File

@ -37,6 +37,10 @@ class CreateUserBlockDialogFragment : AbsUserMuteBlockDialogFragment() {
return getString(R.string.block_user, displayName)
}
override fun getPositiveButtonTitle(user: ParcelableUser): String {
return getString(R.string.action_block)
}
override fun performUserAction(user: ParcelableUser, filterEverywhere: Boolean) {
twitterWrapper.createBlockAsync(user.account_key, user.key, filterEverywhere)
}

4
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CreateUserMuteDialogFragment.kt
View File

@ -38,6 +38,10 @@ class CreateUserMuteDialogFragment : AbsUserMuteBlockDialogFragment() {
return getString(R.string.mute_user, displayName)
}
override fun getPositiveButtonTitle(user: ParcelableUser): String {
return getString(R.string.action_mute)
}
override fun performUserAction(user: ParcelableUser, filterEverywhere: Boolean) {
twitterWrapper.createMuteAsync(user.account_key, user.key, filterEverywhere)
}

2
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CustomTabsFragment.kt
View File

@ -389,7 +389,7 @@ class CustomTabsFragment : BaseSupportFragment(), LoaderCallbacks<Cursor?>, Mult
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
val builder = AlertDialog.Builder(context)
builder.setView(R.layout.dialog_custom_tab_editor)
builder.setPositiveButton(R.string.save, null)
builder.setPositiveButton(R.string.action_save, null)
builder.setNegativeButton(android.R.string.cancel, null)
val dialog = builder.create()
dialog.setOnShowListener(this)

8
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/RetweetQuoteDialogFragment.kt
View File

@ -67,9 +67,9 @@ class RetweetQuoteDialogFragment : BaseDialogFragment() {
builder.setView(R.layout.dialog_status_quote_retweet)
builder.setTitle(R.string.retweet_quote_confirm_title)
builder.setPositiveButton(R.string.retweet, null)
builder.setPositiveButton(R.string.action_retweet, null)
builder.setNegativeButton(android.R.string.cancel, null)
builder.setNeutralButton(R.string.quote) { dialog, which ->
builder.setNeutralButton(R.string.action_quote) { dialog, which ->
val intent = Intent(INTENT_ACTION_QUOTE)
val menu = popupMenu!!.menu
val quoteOriginalStatus = menu.findItem(R.id.quote_original_status)
@ -181,10 +181,10 @@ class RetweetQuoteDialogFragment : BaseDialogFragment() {
positiveButton.setText(R.string.cancel_retweet)
positiveButton.isEnabled = true
} else if (useQuote(false, credentials)) {
positiveButton.setText(R.string.retweet)
positiveButton.setText(R.string.action_retweet)
positiveButton.isEnabled = true
} else {
positiveButton.setText(R.string.retweet)
positiveButton.setText(R.string.action_retweet)
positiveButton.isEnabled = !status.user_is_protected
}
val textCountView = (dialog.findViewById(R.id.comment_text_count) as StatusTextCountView?)!!

4
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/SearchFragment.kt
View File

@ -116,9 +116,9 @@ class SearchFragment : AbsToolbarTabPagesFragment(), RefreshScrollTopInterface,
override fun addTabs(adapter: SupportTabsAdapter) {
adapter.addTab(cls = StatusesSearchFragment::class.java, args = arguments,
name = getString(R.string.statuses), icon = DrawableHolder.resource(R.drawable.ic_action_twitter))
name = getString(R.string.search_type_statuses), icon = DrawableHolder.resource(R.drawable.ic_action_twitter))
adapter.addTab(cls = SearchUsersFragment::class.java, args = arguments,
name = getString(R.string.users), icon = DrawableHolder.resource(R.drawable.ic_action_user))
name = getString(R.string.search_type_users), icon = DrawableHolder.resource(R.drawable.ic_action_user))
}

4
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/SetUserNicknameDialogFragment.kt
View File

@ -59,10 +59,10 @@ class SetUserNicknameDialogFragment : BaseDialogFragment(), OnClickListener {
val nick: String? = args.getString(EXTRA_NAME)
val context = activity
val builder = AlertDialog.Builder(context)
builder.setTitle(R.string.set_nickname)
builder.setTitle(R.string.title_set_nickname)
builder.setPositiveButton(android.R.string.ok, this)
if (!TextUtils.isEmpty(nick)) {
builder.setNeutralButton(R.string.clear, this)
builder.setNeutralButton(R.string.action_clear, this)
}
builder.setNegativeButton(android.R.string.cancel, null)
builder.setView(R.layout.dialog_edit_user_nickname)

4
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/StatusFragment.kt
View File

@ -1350,10 +1350,10 @@ class StatusFragment : BaseSupportFragment(), LoaderCallbacks<SingleResponse<Par
label = adapter.context.getString(R.string.replies)
}
KEY_RETWEET_COUNT -> {
label = adapter.context.getString(R.string.retweets)
label = adapter.context.getString(R.string.count_label_retweets)
}
KEY_FAVORITE_COUNT -> {
label = adapter.context.getString(R.string.favorites)
label = adapter.context.getString(R.string.title_favorites)
}
else -> {
throw UnsupportedOperationException("Unsupported type " + count.type)

14
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt
View File

@ -271,7 +271,7 @@ class UserFragment : BaseSupportFragment(), OnClickListener, OnLinkClickListener
return
}
if (user.account_key.maybeEquals(user.key)) {
followContainer.follow.setText(R.string.edit)
followContainer.follow.setText(R.string.action_edit)
followContainer.follow.visibility = View.VISIBLE
relationship = userRelationship
return
@ -298,15 +298,15 @@ class UserFragment : BaseSupportFragment(), OnClickListener, OnLinkClickListener
pagesContent.visibility = View.VISIBLE
}
if (userRelationship.blocking) {
followContainer.follow.setText(R.string.unblock)
followContainer.follow.setText(R.string.action_unblock)
} else if (userRelationship.blocked_by) {
followContainer.follow.setText(R.string.action_block)
} else if (userRelationship.following) {
followContainer.follow.setText(R.string.unfollow)
followContainer.follow.setText(R.string.action_unfollow)
} else if (user.is_follow_request_sent) {
followContainer.follow.setText(R.string.requested)
} else {
followContainer.follow.setText(R.string.follow)
followContainer.follow.setText(R.string.action_follow)
}
followContainer.follow.compoundDrawablePadding = Math.round(followContainer.follow.textSize * 0.25f)
followingYouIndicator.visibility = if (userRelationship.followed_by) View.VISIBLE else View.GONE
@ -806,7 +806,7 @@ class UserFragment : BaseSupportFragment(), OnClickListener, OnLinkClickListener
val blockItem = menu.findItem(R.id.block)
if (blockItem != null) {
ActionIconDrawable.setMenuHighlight(blockItem, TwidereMenuInfo(userRelationship.blocking))
blockItem.setTitle(if (userRelationship.blocking) R.string.unblock else R.string.block)
blockItem.setTitle(if (userRelationship.blocking) R.string.action_unblock else R.string.action_block)
}
val muteItem = menu.findItem(R.id.mute_user)
if (muteItem != null) {
@ -1348,10 +1348,10 @@ class UserFragment : BaseSupportFragment(), OnClickListener, OnLinkClickListener
pagerAdapter.addTab(cls = UserMediaTimelineFragment::class.java, args = tabArgs, name = getString(R.string.media),
icon = DrawableHolder.resource(R.drawable.ic_action_gallery), type = TAB_TYPE_MEDIA, position = TAB_POSITION_MEDIA)
if (preferences.getBoolean(KEY_I_WANT_MY_STARS_BACK)) {
pagerAdapter.addTab(cls = UserFavoritesFragment::class.java, args = tabArgs, name = getString(R.string.favorites),
pagerAdapter.addTab(cls = UserFavoritesFragment::class.java, args = tabArgs, name = getString(R.string.title_favorites),
icon = DrawableHolder.resource(R.drawable.ic_action_star), type = TAB_TYPE_FAVORITES, position = TAB_POSITION_FAVORITES)
} else {
pagerAdapter.addTab(cls = UserFavoritesFragment::class.java, args = tabArgs, name = getString(R.string.likes),
pagerAdapter.addTab(cls = UserFavoritesFragment::class.java, args = tabArgs, name = getString(R.string.title_likes),
icon = DrawableHolder.resource(R.drawable.ic_action_heart), type = TAB_TYPE_FAVORITES, position = TAB_POSITION_FAVORITES)
}
}

8
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserProfileEditorFragment.kt
View File

@ -284,10 +284,12 @@ class UserProfileEditorFragment : BaseSupportFragment(), OnSizeChangedListener,
mediaLoader.displayImage(profileBackground, user.profile_background_url)
linkColor.color = user.link_color
backgroundColor.color = user.background_color
if (USER_TYPE_FANFOU_COM == user.key.host) {
editProfileBanner.visibility = View.GONE
} else {
if (USER_TYPE_TWITTER_COM == user.key.host) {
editProfileBanner.visibility = View.VISIBLE
editProfileBackground.visibility = View.GONE
} else {
editProfileBanner.visibility = View.GONE
editProfileBackground.visibility = View.VISIBLE
}
} else {
progressContainer.visibility = View.GONE

11
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/FiltersFragment.kt
View File

@ -22,8 +22,7 @@ package org.mariotaku.twidere.fragment.filter
import android.os.Bundle
import org.mariotaku.twidere.R
import org.mariotaku.twidere.adapter.SupportTabsAdapter
import org.mariotaku.twidere.fragment.*
import org.mariotaku.twidere.fragment.filter.BaseFiltersFragment.*
import org.mariotaku.twidere.fragment.AbsToolbarTabPagesFragment
class FiltersFragment : AbsToolbarTabPagesFragment() {
@ -33,10 +32,10 @@ class FiltersFragment : AbsToolbarTabPagesFragment() {
}
override fun addTabs(adapter: SupportTabsAdapter) {
adapter.addTab(cls = FilteredUsersFragment::class.java, name = getString(R.string.users))
adapter.addTab(cls = FilteredKeywordsFragment::class.java, name = getString(R.string.keywords))
adapter.addTab(cls = FilteredSourcesFragment::class.java, name = getString(R.string.sources))
adapter.addTab(cls = FilteredLinksFragment::class.java, name = getString(R.string.links))
adapter.addTab(cls = FilteredUsersFragment::class.java, name = getString(R.string.filter_type_users))
adapter.addTab(cls = FilteredKeywordsFragment::class.java, name = getString(R.string.filter_type_keywords))
adapter.addTab(cls = FilteredSourcesFragment::class.java, name = getString(R.string.filter_type_sources))
adapter.addTab(cls = FilteredLinksFragment::class.java, name = getString(R.string.filter_type_links))
adapter.addTab(cls = FilterSettingsFragment::class.java, name = getString(R.string.settings))
}

6
twidere/src/main/kotlin/org/mariotaku/twidere/util/MenuUtils.kt
View File

@ -150,7 +150,7 @@ object MenuUtils {
val retweet = menu.findItem(R.id.retweet)
if (retweet != null) {
ActionIconDrawable.setMenuHighlight(retweet, TwidereMenuInfo(isMyRetweet, retweetHighlight))
retweet.setTitle(if (isMyRetweet) R.string.cancel_retweet else R.string.retweet)
retweet.setTitle(if (isMyRetweet) R.string.cancel_retweet else R.string.action_retweet)
}
val favorite = menu.findItem(R.id.favorite)
if (favorite != null) {
@ -181,9 +181,9 @@ object MenuUtils {
}
}
if (useStar) {
favorite.setTitle(if (isFavorite) R.string.unfavorite else R.string.favorite)
favorite.setTitle(if (isFavorite) R.string.action_unfavorite else R.string.action_favorite)
} else {
favorite.setTitle(if (isFavorite) R.string.undo_like else R.string.like)
favorite.setTitle(if (isFavorite) R.string.action_undo_like else R.string.action_like)
}
}
val translate = menu.findItem(R.id.translate)

10
twidere/src/main/kotlin/org/mariotaku/twidere/util/theme/TwidereAppearanceCreator.kt
View File

@ -5,9 +5,11 @@ import android.support.annotation.ColorInt
import android.util.AttributeSet
import android.view.View
import com.pnikosis.materialishprogress.ProgressWheel
import com.rengwuxian.materialedittext.MaterialEditText
import org.mariotaku.chameleon.Chameleon
import org.mariotaku.chameleon.ChameleonView
import org.mariotaku.chameleon.view.ChameleonSwitchCompat
import org.mariotaku.chameleon.view.ChameleonTextView
import org.mariotaku.multivalueswitch.library.MultiValueSwitch
object TwidereAppearanceCreator : Chameleon.AppearanceCreator {
@ -19,6 +21,9 @@ object TwidereAppearanceCreator : Chameleon.AppearanceCreator {
is MultiValueSwitch -> {
return ChameleonSwitchCompat.Appearance.create(theme)
}
is MaterialEditText -> {
return ChameleonTextView.Appearance.create(view, context, attributeSet, theme)
}
}
return null
}
@ -33,6 +38,11 @@ object TwidereAppearanceCreator : Chameleon.AppearanceCreator {
appearance as ChameleonSwitchCompat.Appearance
setMultiValueSwitchTint(view, appearance.accentColor, appearance.isDark)
}
is MaterialEditText -> {
appearance as ChameleonTextView.Appearance
ChameleonTextView.Appearance.apply(view, appearance)
view.setPrimaryColor(appearance.tintColor)
}
}
}

2
twidere/src/main/res/layout/activity_keyboard_shortcut_input.xml
View File

@ -81,7 +81,7 @@
android:layout_weight="1"
android:maxLines="2"
android:minHeight="@dimen/element_size_normal"
android:text="@string/clear"
android:text="@string/action_clear"
android:textSize="14sp"/>
<Button

2
twidere/src/main/res/layout/activity_user_list_selector.xml
View File

@ -76,7 +76,7 @@
style="?android:listSeparatorTextViewStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/user"/>
android:text="@string/title_user"/>
<LinearLayout
android:layout_width="match_parent"

2
twidere/src/main/res/layout/dialog_custom_tab_editor.xml
View File

@ -27,7 +27,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/element_spacing_normal"
android:hint="@string/name"
android:hint="@string/tab_editor_hint_name"
android:maxLines="1"
android:textAppearance="?android:attr/textAppearanceMedium"
app:met_baseColor="?android:colorForeground"

16
twidere/src/main/res/layout/dialog_user_list_detail_editor.xml
View File

@ -30,14 +30,14 @@
android:layout_height="wrap_content"
android:layout_toLeftOf="@+id/is_public"
android:layout_toStartOf="@+id/is_public"
android:hint="@string/name"
android:hint="@string/user_list_details_name"
android:inputType="text"
android:maxLength="20"
android:maxLines="1"
app:met_baseColor="?android:textColorPrimary"
app:met_floatingLabel="normal"
app:met_floatingLabelText="@string/name"
app:met_maxCharacters="25"
android:maxLines="1"/>
app:met_floatingLabelText="@string/user_list_details_name"
app:met_maxCharacters="25"/>
<com.rengwuxian.materialedittext.MaterialEditText
android:id="@+id/description"
@ -45,12 +45,12 @@
android:layout_height="wrap_content"
android:layout_below="@+id/name"
android:gravity="top"
android:hint="@string/description"
android:hint="@string/user_list_details_description"
android:inputType="textMultiLine"
android:minLines="3"
app:met_baseColor="?android:textColorPrimary"
app:met_floatingLabel="normal"
app:met_floatingLabelText="@string/description"
app:met_floatingLabelText="@string/user_list_details_description"
app:met_maxCharacters="100"/>
<CheckBox
@ -62,7 +62,7 @@
android:layout_alignParentRight="true"
android:layout_alignTop="@+id/name"
android:checked="true"
android:text="@string/is_public"
android:maxLines="1"/>
android:maxLines="1"
android:text="@string/is_public"/>
</RelativeLayout>

9
twidere/src/main/res/layout/fragment_user_profile_editor.xml
View File

@ -159,7 +159,7 @@
android:maxLines="1"
app:met_baseColor="?android:textColorPrimary"
app:met_floatingLabel="normal"
app:met_floatingLabelText="@string/name"
app:met_floatingLabelText="@string/user_profile_name"
app:met_maxCharacters="20"
app:met_primaryColor="?colorAccent"
tools:text="TwidereProject"/>
@ -168,11 +168,12 @@
android:id="@+id/editDescription"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="top"
android:inputType="textMultiLine"
android:minLines="4"
app:met_baseColor="?android:textColorPrimary"
app:met_floatingLabel="normal"
app:met_floatingLabelText="@string/description"
app:met_floatingLabelText="@string/user_profile_description"
app:met_maxCharacters="160"
app:met_primaryColor="?colorAccent"
tools:text="@string/sample_status_text"/>
@ -185,7 +186,7 @@
android:maxLines="1"
app:met_baseColor="?android:textColorPrimary"
app:met_floatingLabel="normal"
app:met_floatingLabelText="@string/location"
app:met_floatingLabelText="@string/user_profile_location"
app:met_maxCharacters="30"
app:met_primaryColor="?colorAccent"
tools:text="Earth"/>
@ -198,7 +199,7 @@
android:maxLines="1"
app:met_baseColor="?android:textColorPrimary"
app:met_floatingLabel="normal"
app:met_floatingLabelText="@string/url"
app:met_floatingLabelText="@string/user_profile_url"
app:met_maxCharacters="100"
app:met_primaryColor="?colorAccent"
tools:text="https://github.com/TwidereProject/"/>

4
twidere/src/main/res/layout/grid_item_media_editor.xml
View File

@ -68,7 +68,7 @@
android:layout_marginRight="@dimen/element_spacing_minus_mlarge"
android:background="?selectableItemBackgroundBorderless"
android:clickable="true"
android:contentDescription="@string/edit"
android:contentDescription="@string/action_edit"
app:touchHeight="@dimen/element_size_normal"
app:touchWidth="@dimen/element_size_normal">
@ -76,7 +76,7 @@
android:layout_width="@dimen/element_size_small"
android:layout_height="@dimen/element_size_small"
android:layout_gravity="center"
android:contentDescription="@string/edit"
android:contentDescription="@string/action_edit"
android:scaleType="center"
android:src="@drawable/ic_btn_grid_item_edit"/>
</com.lnikkila.extendedtouchview.ExtendedTouchView>

2
twidere/src/main/res/layout/header_status_common.xml
View File

@ -136,7 +136,7 @@
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/follow"/>
android:text="@string/action_follow"/>
<ProgressBar
android:id="@+id/followInfoProgress"

2
twidere/src/main/res/layout/header_user.xml
View File

@ -70,7 +70,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:visibility="gone"
tools:text="@string/follow"
tools:text="@string/action_follow"
tools:visibility="visible"/>
<ProgressBar

2
twidere/src/main/res/layout/layout_action_item_favorite.xml
View File

@ -15,7 +15,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:contentDescription="@string/like"
android:contentDescription="@string/action_like"
android:scaleType="centerInside"
android:src="@drawable/ic_action_heart"/>
</FrameLayout>

2
twidere/src/main/res/layout/layout_media_viewer_texture_video_view.xml
View File

@ -105,7 +105,7 @@
android:layout_alignParentRight="true"
android:background="?selectableItemBackgroundBorderless"
android:clickable="true"
android:contentDescription="@string/mute"
android:contentDescription="@string/action_mute"
android:minWidth="@dimen/element_size_normal"
android:src="@drawable/ic_action_speaker_max"/>

2
twidere/src/main/res/layout/list_item_draft.xml
View File

@ -81,7 +81,7 @@
style="?android:borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/delete"/>
android:text="@string/action_delete"/>
<Button
style="?android:borderlessButtonStyle"

6
twidere/src/main/res/layout/list_item_status.xml
View File

@ -367,7 +367,7 @@
android:id="@+id/replyIcon"
android:layout_width="@dimen/button_size_content_card_action"
android:layout_height="@dimen/button_size_content_card_action"
android:contentDescription="@string/reply"
android:contentDescription="@string/action_reply"
android:focusable="false"
android:gravity="center"
android:padding="@dimen/element_spacing_small"
@ -407,7 +407,7 @@
android:id="@+id/retweetIcon"
android:layout_width="@dimen/button_size_content_card_action"
android:layout_height="@dimen/button_size_content_card_action"
android:contentDescription="@string/retweet"
android:contentDescription="@string/action_retweet"
android:focusable="false"
android:gravity="center"
android:padding="@dimen/element_spacing_small"
@ -448,7 +448,7 @@
android:id="@+id/favoriteIcon"
android:layout_width="@dimen/button_size_content_card_action"
android:layout_height="@dimen/button_size_content_card_action"
android:contentDescription="@string/like"
android:contentDescription="@string/action_like"
android:focusable="false"
android:gravity="center"
android:padding="@dimen/element_spacing_small"

4
twidere/src/main/res/layout/list_item_user.xml
View File

@ -111,7 +111,7 @@
style="?buttonStyleSmall"
android:layout_width="@dimen/button_size_content_card"
android:layout_height="@dimen/button_size_content_card"
android:contentDescription="@string/follow"
android:contentDescription="@string/action_follow"
android:src="@drawable/ic_action_visibility_off"
app:backgroundTint="@color/material_grey"
app:iabColor="@android:color/transparent"/>
@ -121,7 +121,7 @@
style="?buttonStyleSmall"
android:layout_width="@dimen/button_size_content_card"
android:layout_height="@dimen/button_size_content_card"
android:contentDescription="@string/follow"
android:contentDescription="@string/action_follow"
android:src="@drawable/ic_action_add"
app:backgroundTint="@color/color_stateful_follow"
app:iabColor="@android:color/transparent"/>

2
twidere/src/main/res/menu/action_direct_message.xml
View File

@ -8,6 +8,6 @@
<item
android:id="@id/delete"
android:icon="@drawable/ic_action_delete"
android:title="@string/delete"/>
android:title="@string/action_delete"/>
</menu>

4
twidere/src/main/res/menu/action_manager_account.xml
View File

@ -3,9 +3,9 @@
<item
android:id="@id/set_color"
android:icon="@drawable/ic_action_color_palette"
android:title="@string/set_color"/>
android:title="@string/action_set_color"/>
<item
android:id="@id/delete"
android:icon="@drawable/ic_action_delete"
android:title="@string/delete"/>
android:title="@string/action_delete"/>
</menu>

6
twidere/src/main/res/menu/action_multi_select_contents.xml
View File

@ -12,7 +12,7 @@
android:id="@id/reply"
android:icon="@drawable/ic_action_reply"
app:showAsAction="always"
android:title="@string/reply"/>
android:title="@string/action_reply"/>
<item
android:id="@+id/mute_submenu"
android:icon="@drawable/ic_action_speaker_muted"
@ -32,12 +32,12 @@
android:id="@+id/block_submenu"
android:icon="@drawable/ic_action_block"
app:showAsAction="ifRoom"
android:title="@string/block">
android:title="@string/action_block">
<menu>
<item
android:id="@id/block"
android:icon="@drawable/ic_action_block"
android:title="@string/block"/>
android:title="@string/action_block"/>
<item
android:icon="@drawable/ic_action_cancel"
android:title="@android:string/cancel"/>

4
twidere/src/main/res/menu/action_multi_select_drafts.xml
View File

@ -5,7 +5,7 @@
<item
android:id="@id/delete"
android:icon="@drawable/ic_action_delete"
android:title="@string/delete"
android:title="@string/action_delete"
app:showAsAction="ifRoom|withText"/>
<item
android:id="@id/send"
@ -16,6 +16,6 @@
android:id="@id/save"
android:enabled="@bool/debug"
android:icon="@drawable/ic_action_save"
android:title="@string/save"
android:title="@string/action_save"
android:visible="@bool/debug"/>
</menu>

2
twidere/src/main/res/menu/action_multi_select_items.xml
View File

@ -6,6 +6,6 @@
android:id="@id/delete"
android:icon="@drawable/ic_action_delete"
app:showAsAction="ifRoom|withText"
android:title="@string/delete" />
android:title="@string/action_delete" />
</menu>

4
twidere/src/main/res/menu/action_status.xml
View File

@ -4,7 +4,7 @@
<item
android:id="@id/share"
android:icon="@drawable/ic_action_share"
android:title="@string/share"/>
android:title="@string/action_share"/>
<item
android:id="@id/copy"
android:icon="@drawable/ic_action_copy"
@ -20,7 +20,7 @@
<item
android:id="@id/delete"
android:icon="@drawable/ic_action_delete"
android:title="@string/delete"
android:title="@string/action_delete"
android:visible="false"/>
</menu>

2
twidere/src/main/res/menu/action_user_list.xml
View File

@ -8,6 +8,6 @@
<item
android:id="@id/delete"
android:icon="@drawable/ic_action_delete"
android:title="@string/delete"/>
android:title="@string/action_delete"/>
</menu>

2
twidere/src/main/res/menu/action_user_list_member.xml
View File

@ -4,6 +4,6 @@
<item
android:id="@id/delete_from_list"
android:icon="@drawable/ic_action_delete"
android:title="@string/delete"/>
android:title="@string/action_delete"/>
</menu>

8
twidere/src/main/res/menu/menu_account_dashboard.xml
View File

@ -19,12 +19,12 @@
android:id="@id/favorites"
android:enabled="false"
android:icon="@drawable/ic_action_star"
android:title="@string/favorites"
android:title="@string/title_favorites"
android:visible="false"/>
<item
android:id="@id/likes"
android:icon="@drawable/ic_action_heart"
android:title="@string/likes"/>
android:title="@string/title_likes"/>
<item
android:id="@id/lists"
android:icon="@drawable/ic_action_list"
@ -48,11 +48,11 @@
<item
android:id="@id/drafts"
android:icon="@drawable/ic_action_draft"
android:title="@string/drafts"/>
android:title="@string/title_drafts"/>
<item
android:id="@id/filters"
android:icon="@drawable/ic_action_speaker_muted"
android:title="@string/filters"/>
android:title="@string/title_filters"/>
<item
android:id="@id/premium_features"
android:enabled="@bool/is_debug"

2
twidere/src/main/res/menu/menu_compose.xml
View File

@ -37,7 +37,7 @@
<item
android:id="@id/drafts"
android:icon="@drawable/ic_action_draft"
android:title="@string/drafts"
android:title="@string/title_drafts"
app:showAsAction="always"
tools:ignore="AlwaysShowAction"/>
<item

14
twidere/src/main/res/menu/menu_detail_status.xml
View File

@ -7,23 +7,23 @@
<item
android:id="@id/reply"
android:icon="@drawable/ic_action_reply"
android:title="@string/reply"
android:title="@string/action_reply"
app:showAsAction="always"/>
<item
android:id="@id/retweet"
android:icon="@drawable/ic_action_retweet"
android:title="@string/retweet"
android:title="@string/action_retweet"
app:showAsAction="always"/>
<item
android:id="@id/favorite"
android:icon="@drawable/ic_action_heart"
android:title="@string/like"
android:title="@string/action_like"
app:actionProviderClass="org.mariotaku.twidere.menu.FavoriteItemProvider"
app:showAsAction="always"/>
<item
android:id="@id/share"
android:icon="@drawable/ic_action_share"
android:title="@string/share"
android:title="@string/action_share"
app:showAsAction="always"/>
<item
android:id="@id/copy"
@ -36,15 +36,15 @@
<item
android:id="@id/set_color"
android:icon="@drawable/ic_action_color_palette"
android:title="@string/set_color"/>
android:title="@string/action_set_color"/>
<item
android:id="@id/set_nickname"
android:icon="@drawable/ic_action_edit"
android:title="@string/set_nickname"/>
android:title="@string/action_set_nickname"/>
<item
android:id="@id/delete"
android:icon="@drawable/ic_action_delete"
android:title="@string/delete"
android:title="@string/action_delete"
android:visible="false"/>
<item
android:id="@id/open_in_browser"

2
twidere/src/main/res/menu/menu_media_viewer.xml
View File

@ -27,7 +27,7 @@
<item
android:id="@id/share"
android:icon="@drawable/ic_action_share"
android:title="@string/share"
android:title="@string/action_share"
app:showAsAction="ifRoom" />
<item
android:id="@id/save"

2
twidere/src/main/res/menu/menu_profile_editor.xml
View File

@ -23,6 +23,6 @@
<item
android:id="@id/save"
app:showAsAction="always"
android:title="@string/save"
android:title="@string/action_save"
android:icon="@drawable/ic_action_confirm"/>
</menu>

2
twidere/src/main/res/menu/menu_search.xml
View File

@ -11,6 +11,6 @@
android:id="@id/save"
android:icon="@drawable/ic_action_save"
app:showAsAction="ifRoom"
android:title="@string/save"/>
android:title="@string/action_save"/>
</menu>

4
twidere/src/main/res/menu/menu_user_list.xml
View File

@ -17,7 +17,7 @@
<item
android:id="@id/edit"
android:icon="@drawable/ic_action_edit"
android:title="@string/edit_details"
android:title="@string/title_edit_details"
android:visible="false" />
<item
android:id="@id/add"
@ -26,7 +26,7 @@
<item
android:id="@id/delete"
android:icon="@drawable/ic_action_delete"
android:title="@string/delete" />
android:title="@string/action_delete" />
<item
android:id="@id/open_with_account"
android:icon="@drawable/ic_action_accounts"

4
twidere/src/main/res/menu/menu_user_profile.xml
View File

@ -19,11 +19,11 @@
<item
android:id="@id/set_color"
android:icon="@drawable/ic_action_color_palette"
android:title="@string/set_color"/>
android:title="@string/action_set_color"/>
<item
android:id="@id/set_nickname"
android:icon="@drawable/ic_action_edit"
android:title="@string/set_nickname"/>
android:title="@string/action_set_nickname"/>
<item
android:id="@+id/incoming_friendships"
android:icon="@drawable/ic_action_profile"

4
twidere/src/main/res/values/arrays.xml
View File

@ -49,10 +49,10 @@
</string-array>
<string-array name="entries_settings_export">
<item>@string/accounts</item>
<item>@string/drafts</item>
<item>@string/title_drafts</item>
<item>@string/settings</item>
<item>@string/tabs</item>
<item>@string/filters</item>
<item>@string/title_filters</item>
<item>@string/nicknames</item>
<item>@string/user_colors</item>
<item>@string/custom_host_mapping</item>

116
twidere/src/main/res/values/strings.xml
View File

@ -21,8 +21,10 @@
<string name="basic">Basic</string>
<string name="twip_o">twip O Mode</string>
<string name="advanced">Advanced</string>
<string name="save">Save</string>
<string name="edit">Edit</string>
<!-- [verb] Save settings/files etc. -->
<string name="action_save">Save</string>
<!-- [verb] Edit image/settings etc. -->
<string name="action_edit">Edit</string>
<string name="edit_api">Edit API</string>
<string name="home">Home</string>
<string name="mentions">Mentions</string>
@ -42,19 +44,26 @@
<string name="label_streaming_service">Streaming service</string>
<string name="label_background_operation_service">Background operation service</string>
<string name="open_in_browser">Open in browser</string>
<string name="delete">Delete</string>
<string name="retweet">Retweet</string>
<string name="retweets">Retweets</string>
<!-- [verb] Action for deleting a file or a twitter object like tweet-->
<string name="action_delete">Delete</string>
<!-- [verb] Action for performing retweet -->
<string name="action_retweet">Retweet</string>
<!-- [noun] Accessibility label for retweet icon -->
<string name="status_type_retweet">Retweet</string>
<!-- [noun] Count label for retweets, e.g. (N retweets)-->
<string name="count_label_retweets">Retweets</string>
<!-- [verb] Action for cancelling (deleting) a retweet-->
<string name="cancel_retweet">Cancel retweet</string>
<string name="favorite">Favorite</string>
<string name="unfavorite">Unfavorite</string>
<!-- v. e.g. An action label on a tweet to like this tweet. Formerly Twitter favorite. -->
<string name="like">Like</string>
<string name="undo_like">Undo like</string>
<string name="reply">Reply</string>
<string name="share">Share</string>
<string name="action_favorite">Favorite</string>
<string name="action_unfavorite">Unfavorite</string>
<!-- [verb] e.g. An action label on a tweet to like this tweet. Formerly Twitter favorite. -->
<string name="action_like">Like</string>
<string name="action_undo_like">Undo like</string>
<string name="action_reply">Reply</string>
<string name="action_share">Share</string>
<string name="view_map">Map</string>
<string name="statuses">Tweets</string>
<string name="followers">Followers</string>
<string name="following">Following</string>
<string name="about">About</string>
@ -85,36 +94,44 @@
<string name="quote_user">Quote <xliff:g id="user_name">%s</xliff:g></string>
<string name="time_source"><xliff:g id="time">%1$s</xliff:g> · <xliff:g id="source">%2$s</xliff:g></string>
<string name="source"><xliff:g id="source">%s</xliff:g></string>
<string name="filters">Filters</string>
<string name="users">Users</string>
<string name="user">User</string>
<string name="keywords">Keywords</string>
<string name="sources">Sources</string>
<string name="title_filters">Filters</string>
<string name="search_type_statuses">Tweets</string>
<string name="search_type_users">Users</string>
<string name="title_user">User</string>
<string name="filter_type_users">Users</string>
<string name="filter_type_keywords">Keywords</string>
<string name="filter_type_sources">Sources</string>
<string name="filter_type_links">Links</string>
<string name="content">Content</string>
<string name="customize">Customize</string>
<string name="set_nickname">Set nickname</string>
<string name="set_color">Set color</string>
<string name="clear">Clear</string>
<string name="pick_color">Pick color</string>
<string name="follow">Follow</string>
<string name="unfollow">Unfollow</string>
<string name="title_set_nickname">Set nickname</string>
<string name="action_set_nickname">Set nickname</string>
<string name="action_set_color">Set color</string>
<string name="action_clear">Clear</string>
<string name="action_pick_color">Pick color</string>
<string name="action_follow">Follow</string>
<string name="action_unfollow">Unfollow</string>
<string name="leftside_compose_button">Left side compose button</string>
<string name="leftside_compose_button_summary">Put the compose button on the left.</string>
<string name="load_item_limit">Load item limit</string>
<string name="load_item_limit_summary">Set items limit per load.</string>
<string name="quote">Quote</string>
<string name="action_quote">Quote</string>
<string name="add_rule">Add rule</string>
<string name="text_size">Text size</string>
<string name="text_size_summary">Text size of tweets.</string>
<string name="cannot_get_location">Can\'t get your location.</string>
<string name="drafts">Drafts</string>
<string name="description">Description</string>
<string name="location">Location</string>
<string name="url">URL</string>
<string name="favorites">Favorites</string>
<!-- n. formerly Twitter's favorite, in the plural -->
<string name="likes">Likes</string>
<string name="name">Name</string>
<string name="title_drafts">Drafts</string>
<string name="user_list_details_name">Name</string>
<string name="user_list_details_description">Description</string>
<string name="user_profile_description">Description</string>
<string name="user_profile_location">Location</string>
<string name="user_profile_url">URL</string>
<string name="user_profile_name">Name</string>
<!-- [noun] Twitter's favorite, in the plural -->
<string name="title_favorites">Favorites</string>
<!-- [noun] Like, Formerly Twitter's favorite, in the plural -->
<string name="title_likes">Likes</string>
<string name="tab_editor_hint_name">Name</string>
<string name="refresh">Refresh</string>
<string name="settings_refresh">Refresh</string>
<string name="retry">Retry</string>
@ -141,8 +158,10 @@
<string name="proxy_port">Proxy port</string>
<string name="proxy_username">Proxy username</string>
<string name="proxy_password">Proxy password</string>
<string name="block">Block</string>
<string name="unblock">Unblock</string>
<!-- [verb] Action for blocking user -->
<string name="action_block">Block</string>
<!-- [verb] Action for unblocking user -->
<string name="action_unblock">Unblock</string>
<string name="report_for_spam">Report spam</string>
<string name="action_report_spam">Report spam</string>
<string name="twitter_mute_user">Mute user</string>
@ -331,9 +350,9 @@
<string name="status_is_duplicate">Your tweet is a duplicate.</string>
<string name="text_copied">Text copied to clipboard.</string>
<string name="hashtag">Hashtag</string>
<string name="links">Links</string>
<string name="edit_profile">Edit profile</string>
<string name="edit_details">Edit details</string>
<string name="title_edit_profile">Edit profile</string>
<string name="title_edit_details">Edit details</string>
<string name="display_sensitive_contents">Display sensitive contents</string>
<string name="display_sensitive_contents_summary">Display sensitive contents without notice in timeline</string>
<string name="sensitive_content_warning">This tweet may have sensitive content, continue?</string>
@ -387,10 +406,10 @@
<string name="retweet_cancelled">Retweet cancelled.</string>
<string name="direct_message_sent">Direct message sent.</string>
<string name="direct_message_deleted">Direct message deleted.</string>
<string name="search_saved">Search saved.</string>
<string name="search_name_saved">Search \"<xliff:g id="name">%s</xliff:g>\" saved.</string>
<string name="search_deleted">Search deleted.</string>
<string name="search_name_deleted">Search \"<xliff:g id="name">%s</xliff:g>\" deleted.</string>
<string name="message_search_saved">Search saved.</string>
<string name="message_search_name_saved">Search \"<xliff:g id="name">%s</xliff:g>\" saved.</string>
<string name="message_search_deleted">Search deleted.</string>
<string name="message_search_name_deleted">Search \"<xliff:g id="name">%s</xliff:g>\" deleted.</string>
<string name="import_from">Import from…</string>
<string name="link_to_quoted_status">Link to quoted tweet</string>
<string name="quote_original_status">Quote original tweet</string>
@ -475,7 +494,6 @@
<string name="report_user">Report <xliff:g id="name">%s</xliff:g></string>
<string name="report_user_confirm_message">Report <xliff:g id="name">%s</xliff:g> for spam? You\'ll also block this user.</string>
<string name="twidere_test">Twidere test</string>
<string name="staggered_home_timeline">Staggered Home Timeline</string>
<string name="unread_count">Unread count</string>
<string name="developed_by">Developed by</string>
<string name="project_account">Project account</string>
@ -535,8 +553,6 @@
<string name="hidden_settings">Hidden settings</string>
<string name="hidden_settings_warning_title">WARNING: These settings may harm!</string>
<string name="hidden_settings_warning_message">NEVER change these settings if you don\'t know what it is, or it\'ll:\n * Kill your cat\n * Launch nuclear weapons in North Korea\n * Turn ALL Mahou Shoujo into Majo\n * Destroy the universe</string>
<string name="force_using_private_apis">Force using private APIs</string>
<string name="status_text_limit">Tweet text limit</string>
<string name="load_more_from_top">Load more from top</string>
<string name="load_more_from_top_summary">Useful if you prefer to read from bottom to top</string>
<string name="compose_now">Compose Now</string>
@ -569,8 +585,8 @@
<string name="muted_user">Muted <xliff:g id="name">%s</xliff:g></string>
<string name="unmute_user">Unmute <xliff:g id="name">%s</xliff:g></string>
<string name="unmuted_user">Unmuted <xliff:g id="name">%s</xliff:g></string>
<string name="mute">Mute</string>
<string name="unmute">Unmute</string>
<string name="action_mute">Mute</string>
<string name="action_unmute">Unmute</string>
<string name="action_muting">muting</string>
<string name="action_unmuting">unmuting</string>
<string name="mute_user_confirm_message">Mute <xliff:g id="name">%s</xliff:g>? You will no longer see tweets from this user while keep following this user.</string>
@ -808,7 +824,7 @@
<string name="filter_everywhere">Filter everywhere</string>
<string name="filter_everywhere_description">These will be filtered in Twidere:\n &#xb7;User\'s tweets\n &#xb7;Tweets mentioning this user\n &#xb7;Retweets/Quotes of this user</string>
<string name="message_toast_added_to_filter">Added to filter.</string>
<!-- Verb. Used for skip some settings -->
<!-- [verb] Used for skip some settings -->
<string name="action_skip">Skip</string>
<!-- Used for decide something later, like permission request -->
<string name="action_later">Later</string>
@ -824,7 +840,7 @@
<string name="error_info_oauth_timestamp_error">Please check your system date &amp; time settings.</string>
<string name="fab_visible">Floating Action Button</string>
<string name="fab_visible_summary">Show the Floating Action Button</string>
<string name="action_block">Block</string>
<string name="status_format_time_source"><xliff:g example="0:00, Jan 1 2017" id="time">%1$s</xliff:g> · <xliff:g example="Twidere for Android" id="source">%2$s</xliff:g></string>
<string name="status_format_source"><xliff:g example="Twidere for Android" id="source">%s</xliff:g></string>
<string name="preference_filter_unavailable_quote_statuses">Filter unavailable quotes</string>
@ -832,7 +848,7 @@
<string name="action_filter_import_from_muted_users">Import from muted users</string>
<string name="title_select_users">Select users</string>
<string name="action_purchase">Purchase</string>
<!-- Action title used for restore purchase -->
<!-- [verb] Restore purchase -->
<string name="action_restore_purchase">Restore</string>
<!-- Enhanced (paid) features description -->
<string name="extra_features_description">Support Twidere and get enhanced features</string>

6
twidere/src/main/res/xml/preferences_keyboard_shortcuts.xml
View File

@ -73,14 +73,14 @@
<org.mariotaku.twidere.preference.KeyboardShortcutPreference
android:action="status.reply"
android:tag="status"
android:title="@string/reply"/>
android:title="@string/action_reply"/>
<org.mariotaku.twidere.preference.KeyboardShortcutPreference
android:action="status.retweet"
android:tag="status"
android:title="@string/retweet"/>
android:title="@string/action_retweet"/>
<org.mariotaku.twidere.preference.KeyboardShortcutPreference
android:action="status.favorite"
android:tag="status"
android:title="@string/favorite"/>
android:title="@string/action_favorite"/>
</PreferenceCategory>
</PreferenceScreen>