Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class CloneRepositoryAction(context: Context) : ActionItem {
const val ID = "ide.main.cloneRepository"
}

override var label: String = context.getString(R.string.download_git_project)
override var label: String = context.getString(R.string.clone_git_project)
override var visible: Boolean = true
override var enabled: Boolean = true
override var icon: Drawable? = ContextCompat.getDrawable(context, R.drawable.ic_clone_repo)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ class CloneRepositoryFragment : BaseFragment() {
setIconResource(if (isForRetry) R.drawable.ic_refresh else 0)

text = context.getString(
if (isForRetry) R.string.retry else R.string.download_project
if (isForRetry) R.string.retry else R.string.clone_project
)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import kotlinx.parcelize.Parcelize
@Parcelize
class GitPreferencesScreen(
override val key: String = "idepref_git",
override val title: Int = R.string.idepref_git_title,
override val title: Int = R.string.git_title,
override val summary: Int? = R.string.idepref_git_summary,
override val children: List<IPreference> = mutableListOf()
) : IPreferenceScreen() {
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/fragment_clone_repository.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
android:id="@+id/tv_download_project"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/download_git_project"
android:text="@string/clone_git_project"
android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
android:transitionName="title"
app:layout_constraintStart_toStartOf="parent"
Expand Down Expand Up @@ -126,7 +126,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:enabled="false"
android:text="@string/download_project"
android:text="@string/clone_project"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/passwordLayout"
app:layout_goneMarginTop="16dp" />
Expand Down
9 changes: 4 additions & 5 deletions resources/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@
<string name="msg_create_new_project">Create new project</string>
<string name="msg_open_existing_project">Open a saved project</string>
<string name="msg_delete_existing_project">Delete a saved project</string>
<string name="download_git_project">Download a Git project</string>
<string name="clone_git_project">Clone a Git project</string>
<string name="msg_delete_existing_project_failed">Failed to delete existing project.</string>
<string name="title_confirm_project_close">Close project</string>
<string name="cancel_project_text">Cancel</string>
Expand Down Expand Up @@ -1189,7 +1189,7 @@
<string name="use_authentication">Use Authentication</string>
<string name="username">Username</string>
<string name="personal_access_token">Personal access token</string>
<string name="download_project">Download project</string>
<string name="clone_project">Clone project</string>
<string name="destination_directory_not_empty">Destination directory is not empty</string>
<string name="clone_successful">Clone successful!</string>
<string name="clone_failed">Clone failed: %1$s</string>
Expand Down Expand Up @@ -1221,8 +1221,7 @@
<string name="cancelling_clone">Cancelling clone…</string>

<!-- Git Preferences -->
<string name="idepref_git_title">Git</string>
<string name="idepref_git_summary">Set and update git configuration</string>
<string name="idepref_git_summary">Set and update Git configuration</string>
<string name="idepref_git_author_title">Author Identity</string>
<string name="idepref_git_author_summary">Set the name and email used for commits</string>
<string name="idepref_git_user_name_title">User Name</string>
Expand All @@ -1232,7 +1231,7 @@
<string name="idepref_git_author_missing_warning">Configure Git author in Preferences to enable commits.\nClick on the avatar for more info.</string>
<string name="git_committing_as">Committing as %1$s</string>
<string name="git_committing_email">Email - %1$s</string>
<string name="git_update_config_in_preferences">You can update your git configuration in Preferences.</string>
<string name="git_update_config_in_preferences">You can update your Git configuration in Preferences.</string>
<string name="author_not_set">Not set</string>
<string name="not_a_git_repo">This project is not a Git repository</string>
</resources>
Loading