Skip to content
Merged
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
11 changes: 11 additions & 0 deletions src/Resources/Locales/es_ES.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,10 @@
<x:String x:Key="Text.CommitCM.CompareWithHead" xml:space="preserve">Comparar con HEAD</x:String>
<x:String x:Key="Text.CommitCM.CompareWithWorktree" xml:space="preserve">Comparar con Worktree</x:String>
<x:String x:Key="Text.CommitCM.CopyAuthor" xml:space="preserve">Autor</x:String>
<x:String x:Key="Text.CommitCM.CopyAuthorTime" xml:space="preserve">Fecha/Hora del Autor</x:String>
<x:String x:Key="Text.CommitCM.CopyCommitMessage" xml:space="preserve">Mensaje</x:String>
<x:String x:Key="Text.CommitCM.CopyCommitter" xml:space="preserve">Committer</x:String>
<x:String x:Key="Text.CommitCM.CopyCommitterTime" xml:space="preserve">Fecha/Hora del Committer</x:String>
<x:String x:Key="Text.CommitCM.CopySHA" xml:space="preserve">SHA</x:String>
<x:String x:Key="Text.CommitCM.CopySubject" xml:space="preserve">Asunto</x:String>
<x:String x:Key="Text.CommitCM.CustomAction" xml:space="preserve">Acción personalizada</x:String>
Expand Down Expand Up @@ -572,6 +574,10 @@
<x:String x:Key="Text.Merge.Into" xml:space="preserve">En:</x:String>
<x:String x:Key="Text.Merge.Mode" xml:space="preserve">Opción de Merge:</x:String>
<x:String x:Key="Text.Merge.Source" xml:space="preserve">Rama Fuente:</x:String>
<x:String x:Key="Text.Merge.Test" xml:space="preserve">Pruebas para hacer merge...</x:String>
<x:String x:Key="Text.Merge.Test.NoConflicts" xml:space="preserve">El merge se puede realizar sin conflictos</x:String>
<x:String x:Key="Text.Merge.Test.UnknownError" xml:space="preserve">Error desconocido ocurrido al probar el merge</x:String>
<x:String x:Key="Text.Merge.Test.WillCauseConflicts" xml:space="preserve">Hacer merge causará conflictos</x:String>
<x:String x:Key="Text.MergeConflictEditor.AcceptBoth.MineFirst" xml:space="preserve">Primero Míos, después Suyos</x:String>
<x:String x:Key="Text.MergeConflictEditor.AcceptBoth.TheirsFirst" xml:space="preserve">Primero Suyos, después Míos</x:String>
<x:String x:Key="Text.MergeConflictEditor.UseBoth" xml:space="preserve">USAR AMBOS</x:String>
Expand Down Expand Up @@ -673,6 +679,7 @@
<x:String x:Key="Text.Preferences.General.ShowTagsInGraph" xml:space="preserve">Mostrar etiquetas en el gráfico de commit</x:String>
<x:String x:Key="Text.Preferences.General.SubjectGuideLength" xml:space="preserve">Longitud de la guía del asunto</x:String>
<x:String x:Key="Text.Preferences.General.Use24Hours" xml:space="preserve">24-Horas</x:String>
<x:String x:Key="Text.Preferences.General.UseCompactBranchNames" xml:space="preserve">Utilizar nombres de ramas compactos en el gráfico de commits</x:String>
<x:String x:Key="Text.Preferences.General.UseGitHubStyleAvatar" xml:space="preserve">Generar avatar con estilo por defecto de Github</x:String>
<x:String x:Key="Text.Preferences.Git" xml:space="preserve">GIT</x:String>
<x:String x:Key="Text.Preferences.Git.CRLF" xml:space="preserve">Habilitar Auto CRLF</x:String>
Expand Down Expand Up @@ -737,6 +744,10 @@
<x:String x:Key="Text.Rebase.AutoStash" xml:space="preserve">Stash y volver a aplicar cambios locales</x:String>
<x:String x:Key="Text.Rebase.NoVerify" xml:space="preserve">Saltar el hook de pre-rebase</x:String>
<x:String x:Key="Text.Rebase.On" xml:space="preserve">En:</x:String>
<x:String x:Key="Text.Rebase.Test" xml:space="preserve">Pruebas para hacer rebase ...</x:String>
<x:String x:Key="Text.Rebase.Test.OK" xml:space="preserve">El rebase se puede realizar sin conflictos</x:String>
<x:String x:Key="Text.Rebase.Test.UnknownError" xml:space="preserve">Error desconocido ocurrido al probar el rebase</x:String>
<x:String x:Key="Text.Rebase.Test.WillCauseConflicts" xml:space="preserve">Hacer rebase causará conflictos</x:String>
<x:String x:Key="Text.Remote.AddTitle" xml:space="preserve">Añadir Remoto</x:String>
<x:String x:Key="Text.Remote.EditTitle" xml:space="preserve">Editar Remoto</x:String>
<x:String x:Key="Text.Remote.Name" xml:space="preserve">Nombre:</x:String>
Expand Down
Loading