Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit 2244660

Browse files
StanleyGoldmanStanleyGoldman
committed
Merge branch 'master' into autocompletebox
2 parents f6f233a + 215ad5c commit 2244660

21 files changed

+209
-53
lines changed

‎src/GitHub.App/ViewModels/Dialog/Clone/RepositorySelectViewModel.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,13 +147,13 @@ async Task LoadItems(bool refresh)
147147

148148
var yourRepositories = results.Repositories
149149
.Where(r => r.Owner == results.Owner)
150-
.Select(x => new RepositoryItemViewModel(x, "Your repositories"));
150+
.Select(x => new RepositoryItemViewModel(x, Resources.RepositorySelectYourRepositories));
151151
var collaboratorRepositories = results.Repositories
152152
.Where(r => r.Owner != results.Owner)
153153
.OrderBy(r => r.Owner)
154-
.Select(x => new RepositoryItemViewModel(x, "Collaborator repositories"));
154+
.Select(x => new RepositoryItemViewModel(x, Resources.RepositorySelectCollaboratorRepositories));
155155
var repositoriesContributedTo = results.ContributedToRepositories
156-
.Select(x => new RepositoryItemViewModel(x, "Contributed to repositories"));
156+
.Select(x => new RepositoryItemViewModel(x, Resources.RepositorySelectContributedRepositories));
157157
var orgRepositories = results.Organizations
158158
.OrderBy(x => x.Key)
159159
.SelectMany(x => x.Value.Select(y => new RepositoryItemViewModel(y, GroupName(x, 100))));

‎src/GitHub.App/ViewModels/Dialog/RepositoryCreationViewModel.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,6 @@ public RepositoryCreationViewModel(
9090
return parsedReference != repoName ? String.Format(CultureInfo.CurrentCulture, Resources.SafeRepositoryNameWarning, parsedReference) : null;
9191
});
9292

93-
this.WhenAny(x => x.BaseRepositoryPathValidator.ValidationResult, x => x.Value)
94-
.Subscribe();
95-
9693
CreateRepository = InitializeCreateRepositoryCommand();
9794

9895
isCreating = CreateRepository.IsExecuting

‎src/GitHub.Resources/Resources.Designer.cs‎

Lines changed: 28 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/GitHub.Resources/Resources.cs-CZ.resx‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@
193193
<value>Změňte název úložiště nebo vyberte jiný účet a zkuste to znovu.</value>
194194
</data>
195195
<data name="RepositoryCreationFailedQuota" xml:space="preserve">
196-
<value>Došlo k překročení kvóty pro privátní úložiště.</value>
196+
<value>Překročila se kvóta pro privátní úložiště.</value>
197197
</data>
198198
<data name="RepositoryNameValidatorAlreadyExists" xml:space="preserve">
199199
<value>Úložiště se stejným názvem už v tomto umístění existuje.</value>
@@ -858,15 +858,24 @@ https://git-scm.com/download/win</value>
858858
<value>Znovu otevřít žádost o přijetí změn</value>
859859
</data>
860860
<data name="CommitCountFormat" xml:space="preserve">
861-
<value>{0} – potvrzení</value>
861+
<value>Počet zápisů: {0}</value>
862862
</data>
863863
<data name="AddedSomeCommits" xml:space="preserve">
864-
<value>přidala se nějaká potvrzení</value>
864+
<value>přidal(a) nějaké zápisy</value>
865865
</data>
866866
<data name="AndOthers" xml:space="preserve">
867867
<value>a další</value>
868868
</data>
869869
<data name="ThisConversationWasMarkedAsResolved" xml:space="preserve">
870-
<value>This conversation was marked as resolved</value>
870+
<value>Tato konverzace byla označena jako vyřešená.</value>
871+
</data>
872+
<data name="RepositorySelectYourRepositories" xml:space="preserve">
873+
<value>Your repositories</value>
874+
</data>
875+
<data name="RepositorySelectCollaboratorRepositories" xml:space="preserve">
876+
<value>Collaborator repositories</value>
877+
</data>
878+
<data name="RepositorySelectContributedRepositories" xml:space="preserve">
879+
<value>Contributed to repositories</value>
871880
</data>
872881
</root>

‎src/GitHub.Resources/Resources.de-DE.resx‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -867,6 +867,15 @@ https://git-scm.com/download/win</value>
867867
<value>und weitere</value>
868868
</data>
869869
<data name="ThisConversationWasMarkedAsResolved" xml:space="preserve">
870-
<value>This conversation was marked as resolved</value>
870+
<value>Diese Konversation wurde als aufgelöst markiert.</value>
871+
</data>
872+
<data name="RepositorySelectYourRepositories" xml:space="preserve">
873+
<value>Your repositories</value>
874+
</data>
875+
<data name="RepositorySelectCollaboratorRepositories" xml:space="preserve">
876+
<value>Collaborator repositories</value>
877+
</data>
878+
<data name="RepositorySelectContributedRepositories" xml:space="preserve">
879+
<value>Contributed to repositories</value>
871880
</data>
872881
</root>

‎src/GitHub.Resources/Resources.es-ES.resx‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ https://git-scm.com/download/win</value>
556556
<value>Este repositorio no está en GitHub</value>
557557
</data>
558558
<data name="NotAGitRepository" xml:space="preserve">
559-
<value>No hay ningún repositorio</value>
559+
<value>No se encontró ningún repositorio.</value>
560560
</data>
561561
<data name="NotAGitRepositoryMessage" xml:space="preserve">
562562
<value>No se encontró ningún repositorio GIT aquí. Abra un proyecto GIT o haga clic en "Archivo -&gt; Agregar al control de código fuente" en un proyecto para empezar.</value>
@@ -867,6 +867,15 @@ https://git-scm.com/download/win</value>
867867
<value>y otros</value>
868868
</data>
869869
<data name="ThisConversationWasMarkedAsResolved" xml:space="preserve">
870-
<value>This conversation was marked as resolved</value>
870+
<value>Esta conversación se ha marcado como resuelta</value>
871+
</data>
872+
<data name="RepositorySelectYourRepositories" xml:space="preserve">
873+
<value>Your repositories</value>
874+
</data>
875+
<data name="RepositorySelectCollaboratorRepositories" xml:space="preserve">
876+
<value>Collaborator repositories</value>
877+
</data>
878+
<data name="RepositorySelectContributedRepositories" xml:space="preserve">
879+
<value>Contributed to repositories</value>
871880
</data>
872881
</root>

‎src/GitHub.Resources/Resources.fr-FR.resx‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -867,6 +867,15 @@ https://git-scm.com/download/win</value>
867867
<value>et autres</value>
868868
</data>
869869
<data name="ThisConversationWasMarkedAsResolved" xml:space="preserve">
870-
<value>This conversation was marked as resolved</value>
870+
<value>Cette conversation a été marquée comme résolue</value>
871+
</data>
872+
<data name="RepositorySelectYourRepositories" xml:space="preserve">
873+
<value>Your repositories</value>
874+
</data>
875+
<data name="RepositorySelectCollaboratorRepositories" xml:space="preserve">
876+
<value>Collaborator repositories</value>
877+
</data>
878+
<data name="RepositorySelectContributedRepositories" xml:space="preserve">
879+
<value>Contributed to repositories</value>
871880
</data>
872881
</root>

‎src/GitHub.Resources/Resources.it-IT.resx‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -259,10 +259,10 @@
259259
<value>Esegui checkout in {0}</value>
260260
</data>
261261
<data name="PullRequestDetailsPullToolTip" xml:space="preserve">
262-
<value>Esegui pull dal ramo {1} di {0}</value>
262+
<value>Eseguire pull dal ramo {1} di {0}</value>
263263
</data>
264264
<data name="PullRequestDetailsPushToolTip" xml:space="preserve">
265-
<value>Esegui push dal ramo {1} di {0}</value>
265+
<value>Eseguire push dal ramo {1} di {0}</value>
266266
</data>
267267
<data name="Remote" xml:space="preserve">
268268
<value>repository remoto</value>
@@ -556,7 +556,7 @@ https://git-scm.com/download/win</value>
556556
<value>Questo repository non è presente in GitHub</value>
557557
</data>
558558
<data name="NotAGitRepository" xml:space="preserve">
559-
<value>Non è presente alcun repository</value>
559+
<value>Non è stato trovato alcun repository</value>
560560
</data>
561561
<data name="NotAGitRepositoryMessage" xml:space="preserve">
562562
<value>Non è stato possibile trovare alcun repository GIT qui. Per iniziare, aprire un progetto git o fare clic su "File -&gt; Aggiungi al controllo del codice sorgente" in un progetto.</value>
@@ -867,6 +867,15 @@ https://git-scm.com/download/win</value>
867867
<value>e altri</value>
868868
</data>
869869
<data name="ThisConversationWasMarkedAsResolved" xml:space="preserve">
870-
<value>This conversation was marked as resolved</value>
870+
<value>Questa conversazione è stata contrassegnata come risolta</value>
871+
</data>
872+
<data name="RepositorySelectYourRepositories" xml:space="preserve">
873+
<value>Your repositories</value>
874+
</data>
875+
<data name="RepositorySelectCollaboratorRepositories" xml:space="preserve">
876+
<value>Collaborator repositories</value>
877+
</data>
878+
<data name="RepositorySelectContributedRepositories" xml:space="preserve">
879+
<value>Contributed to repositories</value>
871880
</data>
872881
</root>

‎src/GitHub.Resources/Resources.ja-JP.resx‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ https://git-scm.com/download/win</value>
556556
<value>このリポジトリは GitHub 上にありません</value>
557557
</data>
558558
<data name="NotAGitRepository" xml:space="preserve">
559-
<value>リポジトリではありません</value>
559+
<value>リポジトリが見つかりません</value>
560560
</data>
561561
<data name="NotAGitRepositoryMessage" xml:space="preserve">
562562
<value>この場所に Git リポジトリが見つかりませんでした。Git プロジェクトを開くか、プロジェクトで [ファイル] -&gt; [ソース管理に追加] をクリックして作業を開始してください。</value>
@@ -867,6 +867,15 @@ https://git-scm.com/download/win</value>
867867
<value>その他</value>
868868
</data>
869869
<data name="ThisConversationWasMarkedAsResolved" xml:space="preserve">
870-
<value>This conversation was marked as resolved</value>
870+
<value>この会話は解決済みとしてマークされました</value>
871+
</data>
872+
<data name="RepositorySelectYourRepositories" xml:space="preserve">
873+
<value>Your repositories</value>
874+
</data>
875+
<data name="RepositorySelectCollaboratorRepositories" xml:space="preserve">
876+
<value>Collaborator repositories</value>
877+
</data>
878+
<data name="RepositorySelectContributedRepositories" xml:space="preserve">
879+
<value>Contributed to repositories</value>
871880
</data>
872881
</root>

‎src/GitHub.Resources/Resources.ko-KR.resx‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -867,6 +867,15 @@ https://git-scm.com/download/win</value>
867867
<value>및 기타</value>
868868
</data>
869869
<data name="ThisConversationWasMarkedAsResolved" xml:space="preserve">
870-
<value>This conversation was marked as resolved</value>
870+
<value>이 대화는 확인된 것으로 표시되었습니다.</value>
871+
</data>
872+
<data name="RepositorySelectYourRepositories" xml:space="preserve">
873+
<value>Your repositories</value>
874+
</data>
875+
<data name="RepositorySelectCollaboratorRepositories" xml:space="preserve">
876+
<value>Collaborator repositories</value>
877+
</data>
878+
<data name="RepositorySelectContributedRepositories" xml:space="preserve">
879+
<value>Contributed to repositories</value>
871880
</data>
872881
</root>

0 commit comments

Comments
 (0)