Mastodon/Twidere-App-Android-Twitter-Mastodon
1
0
Fork 0
mirror of https://github.com/TwidereProject/Twidere-Android synced 2025-02-12 09:40:50 +01:00
Code Issues Releases Wiki Activity

updated strings

Browse Source
This commit is contained in:
Mariotaku Lee 2016-12-27 00:46:37 +08:00
parent df7abdb7fa
commit 6401776c77
20 changed files with 51 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -192,12 +192,12 @@
<activity
android:name=".activity.ComposeActivity"
android:excludeFromRecents="true"
android:label="@string/compose"
android:label="@string/title_compose"
android:launchMode="singleTop"
android:parentActivityName=".activity.HomeActivity"
android:theme="@style/Theme.Twidere.Compose"
android:windowSoftInputMode="adjustResize">
<intent-filter android:label="@string/compose">
<intent-filter android:label="@string/title_compose">
<action android:name="android.intent.action.MAIN"/>
<action android:name="org.mariotaku.twidere.COMPOSE"/>
<action android:name="org.mariotaku.twidere.COMPOSE_TAKE_PHOTO"/>
@ -361,7 +361,7 @@
</activity>
<activity
android:name=".activity.CreateComposeShortcutActivity"
android:label="@string/compose"
android:label="@string/title_compose"
android:theme="@style/Theme.Twidere.NoDisplay">
<intent-filter>
<action android:name="android.intent.action.CREATE_SHORTCUT"/>

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

@ -40,7 +40,7 @@ public class KeyboardShortcutsHandler implements KeyboardShortcutConstants {
private static final SparseArrayCompat<String> sMetaNameMap = new SparseArrayCompat<>();
static {
sActionLabelMap.put(ACTION_COMPOSE, R.string.compose);
sActionLabelMap.put(ACTION_COMPOSE, R.string.action_compose);
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);

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

@ -35,7 +35,7 @@ class CreateComposeShortcutActivity : Activity() {
val icon = Intent.ShortcutIconResource.fromContext(this, R.mipmap.ic_launcher)
intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, launch_intent)
intent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, icon)
intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, getString(R.string.compose))
intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, getString(R.string.action_compose))
setResult(Activity.RESULT_OK, intent)
finish()
}

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

@ -870,7 +870,7 @@ class HomeActivity : BaseActivity(), OnClickListener, OnPageChangeListener, Supp
title = android.R.string.search_go
} else {
icon = R.drawable.ic_action_status_compose
title = R.string.compose
title = R.string.action_compose
}
actionsButton.setImageResource(icon)
actionsButton.contentDescription = getString(title)

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

@ -284,13 +284,13 @@ class LinkHandlerActivity : BaseActivity(), SystemWindowsInsetsCallback, IContro
setSubtitle(null)
when (linkId) {
LINK_ID_STATUS -> {
setTitle(R.string.status)
setTitle(R.string.title_status)
}
LINK_ID_USER -> {
setTitle(R.string.title_user)
}
LINK_ID_USER_TIMELINE -> {
setTitle(R.string.statuses)
setTitle(R.string.title_statuses)
}
LINK_ID_USER_FAVORITES -> {
if (preferences.getBoolean(SharedPreferenceConstants.KEY_I_WANT_MY_STARS_BACK)) {

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

@ -117,7 +117,7 @@ class SettingsActivity : BaseActivity(), OnItemClickListener, OnPreferenceStartF
R.xml.preferences_notifications)
entriesAdapter.addPreference("network", R.drawable.ic_action_web, getString(R.string.network),
R.xml.preferences_network)
entriesAdapter.addPreference("compose", R.drawable.ic_action_status_compose, getString(R.string.compose),
entriesAdapter.addPreference("compose", R.drawable.ic_action_status_compose, getString(R.string.action_compose),
R.xml.preferences_compose)
entriesAdapter.addPreference("content", R.drawable.ic_action_twidere_square, getString(R.string.content),
R.xml.preferences_content)

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

@ -30,7 +30,7 @@ class GroupFragment : AbsToolbarTabPagesFragment(), LoaderCallbacks<SingleRespon
override fun addTabs(adapter: SupportTabsAdapter) {
val args = arguments
adapter.addTab(cls = GroupTimelineFragment::class.java, args = args, name = getString(R.string.statuses), tag = "statuses")
adapter.addTab(cls = GroupTimelineFragment::class.java, args = args, name = getString(R.string.title_statuses), tag = "statuses")
adapter.addTab(cls = GroupMembersFragment::class.java, args = args, name = getString(R.string.members), tag = "members")
}

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

@ -1343,7 +1343,7 @@ class UserFragment : BaseSupportFragment(), OnClickListener, OnLinkClickListener
tabArgs.putParcelable(EXTRA_USER_KEY, args.getParcelable<Parcelable>(EXTRA_USER_KEY))
tabArgs.putString(EXTRA_SCREEN_NAME, args.getString(EXTRA_SCREEN_NAME))
}
pagerAdapter.addTab(cls = UserTimelineFragment::class.java, args = tabArgs, name = getString(R.string.statuses),
pagerAdapter.addTab(cls = UserTimelineFragment::class.java, args = tabArgs, name = getString(R.string.title_statuses),
icon = DrawableHolder.resource(R.drawable.ic_action_quote), type = TAB_TYPE_STATUSES, position = TAB_POSITION_STATUSES)
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)

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

@ -150,7 +150,7 @@ class UserListFragment : AbsToolbarTabPagesFragment(), OnClickListener, LoaderCa
tabArgs.putString(EXTRA_LIST_ID, args.getString(EXTRA_LIST_ID))
tabArgs.putString(EXTRA_LIST_NAME, args.getString(EXTRA_LIST_NAME))
}
adapter.addTab(cls = UserListTimelineFragment::class.java, args = tabArgs, name = getString(R.string.statuses))
adapter.addTab(cls = UserListTimelineFragment::class.java, args = tabArgs, name = getString(R.string.title_statuses))
adapter.addTab(cls = UserListMembersFragment::class.java, args = tabArgs, name = getString(R.string.members))
adapter.addTab(cls = UserListSubscribersFragment::class.java, args = tabArgs, name = getString(R.string.subscribers))
}

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

@ -31,7 +31,7 @@
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_margin="@dimen/element_spacing_normal"
android:contentDescription="@string/compose"
android:contentDescription="@string/action_compose"
android:scaleType="centerInside" />
</merge>

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

@ -31,7 +31,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="@dimen/element_spacing_normal"
android:contentDescription="@string/compose"
android:contentDescription="@string/action_compose"
android:scaleType="centerInside"/>
</FrameLayout>

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

@ -63,6 +63,6 @@
android:layout_alignTop="@+id/name"
android:checked="true"
android:maxLines="1"
android:text="@string/is_public"/>
android:text="@string/user_list_details_is_public"/>
</RelativeLayout>

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

@ -24,7 +24,7 @@
<item
android:id="@id/compose"
android:icon="@drawable/ic_action_status_compose"
android:title="@string/compose"
android:title="@string/action_compose"
app:showAsAction="always"
tools:ignore="AlwaysShowAction"/>

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

@ -4,6 +4,6 @@
<item
android:id="@id/compose"
android:icon="@drawable/ic_action_status_compose"
android:title="@string/compose"
android:title="@string/action_compose"
app:showAsAction="always"/>
</menu>

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

@ -6,7 +6,7 @@
android:id="@id/compose"
android:icon="@drawable/ic_action_status_compose"
app:showAsAction="always"
android:title="@string/compose"/>
android:title="@string/action_compose"/>
<item
android:id="@id/save"
android:icon="@drawable/ic_action_save"

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

@ -58,7 +58,7 @@
<item>@string/custom_host_mapping</item>
</string-array>
<string-array name="entries_compose_now_action">
<item>@string/compose</item>
<item>@string/action_compose</item>
<item>@string/take_photo</item>
<item>@string/add_image</item>
</string-array>

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

@ -4,7 +4,8 @@
<!-- App name, normally you don't need to translate this. -->
<string name="app_name">Twidere</string>
<string name="app_description">Your own Twitter app</string>
<string name="compose">Compose</string>
<string name="action_compose">Compose</string>
<string name="title_compose">Compose</string>
<string name="add_account">Add account</string>
<string name="settings">Settings</string>
<string name="send">Send</string>
@ -62,7 +63,7 @@
<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="title_statuses">Tweets</string>
<string name="followers">Followers</string>
<string name="following">Following</string>
@ -122,6 +123,7 @@
<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_list_details_is_public">Public</string>
<string name="user_profile_description">Description</string>
<string name="user_profile_location">Location</string>
<string name="user_profile_url">URL</string>
@ -202,10 +204,8 @@
<string name="account">Account</string>
<string name="mention_this_user">Mention this user</string>
<string name="mention_user_name">Mention <xliff:g id="name">%1$s</xliff:g></string>
<string name="connectivity">Connectivity</string>
<string name="add_member">Add member</string>
<string name="new_user_list">New list</string>
<string name="is_public">Public</string>
<string name="send_direct_message">Send DM</string>
<string name="extensions">Extensions</string>
<string name="uninstall">Uninstall</string>
@ -300,7 +300,7 @@
<string name="incoming_friendships">Pending follow requests</string>
<string name="send_follow_request">Send follow request</string>
<string name="follow_request_sent">Follow request sent</string>
<string name="status">Tweet</string>
<string name="title_status">Tweet</string>
<string name="preview">Preview</string>
<string name="connection_timeout">Connection timeout</string>
<string name="both">Both</string>

4
twidere/src/main/res/xml/compose_shortcuts.xml
View File

@ -7,8 +7,8 @@
android:enabled="true"
android:icon="@drawable/ic_app_shortcut_compose"
android:shortcutId="compose"
android:shortcutLongLabel="@string/compose"
android:shortcutShortLabel="@string/compose">
android:shortcutLongLabel="@string/action_compose"
android:shortcutShortLabel="@string/action_compose">
<intent
android:action="org.mariotaku.twidere.COMPOSE"
android:targetClass="org.mariotaku.twidere.activity.ComposeActivity"

51
twidere/src/main/res/xml/preferences_advanced_network.xml
View File

@ -4,38 +4,33 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/advanced">
<PreferenceCategory
android:key="category_connectivity"
android:title="@string/connectivity">
<SwitchPreferenceCompat
android:defaultValue="false"
android:key="builtin_dns_resolver"
android:title="@string/builtin_dns_resolver"/>
<SwitchPreferenceCompat
android:defaultValue="false"
android:key="builtin_dns_resolver"
android:title="@string/builtin_dns_resolver"/>
<SwitchPreferenceCompat
android:defaultValue="false"
android:dependency="builtin_dns_resolver"
android:key="tcp_dns_query"
android:summary="@string/tcp_dns_query_summary"
android:title="@string/tcp_dns_query"/>
<SwitchPreferenceCompat
android:defaultValue="false"
android:dependency="builtin_dns_resolver"
android:key="tcp_dns_query"
android:summary="@string/tcp_dns_query_summary"
android:title="@string/tcp_dns_query"/>
<org.mariotaku.twidere.preference.ThemedEditTextPreference
android:dependency="builtin_dns_resolver"
android:dialogTitle="@string/dns_server"
android:inputType="textVisiblePassword"
android:key="dns_server"
android:singleLine="true"
android:summary="@string/dns_server_summary"
android:title="@string/dns_server"/>
<org.mariotaku.twidere.preference.ThemedEditTextPreference
android:dependency="builtin_dns_resolver"
android:dialogTitle="@string/dns_server"
android:inputType="textVisiblePassword"
android:key="dns_server"
android:singleLine="true"
android:summary="@string/dns_server_summary"
android:title="@string/dns_server"/>
<Preference
android:fragment="org.mariotaku.twidere.fragment.HostMappingsListFragment"
android:key="custom_host_mapping"
android:summary="@string/custom_host_mapping_summary"
android:title="@string/custom_host_mapping"/>
<Preference
android:fragment="org.mariotaku.twidere.fragment.HostMappingsListFragment"
android:key="custom_host_mapping"
android:summary="@string/custom_host_mapping_summary"
android:title="@string/custom_host_mapping"/>
</PreferenceCategory>
<PreferenceCategory
android:key="category_proxy"
android:title="@string/proxy">

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

@ -8,7 +8,7 @@
android:title="@string/general">
<org.mariotaku.twidere.preference.KeyboardShortcutPreference
android:action="compose"
android:title="@string/compose"/>
android:title="@string/action_compose"/>
<org.mariotaku.twidere.preference.KeyboardShortcutPreference
android:action="search"
android:title="@string/search"/>
@ -69,7 +69,7 @@
<PreferenceCategory
android:key="cat_statuses"
android:title="@string/statuses">
android:title="@string/title_statuses">
<org.mariotaku.twidere.preference.KeyboardShortcutPreference
android:action="status.reply"
android:tag="status"