Skip to content

Commit

Permalink
Merge branch 'next' of https://github.com/retailcoder/Rubberduck
Browse files Browse the repository at this point in the history
  • Loading branch information
@retailcoder
retailcoder committed Jun 4, 2015
2 parents b6b4d5e + 5b00147 commit ba5f727
Show file tree
Hide file tree
Showing 11 changed files with 410 additions and 104 deletions.
126 changes: 126 additions & 0 deletions RetailCoder.VBE/UI/RubberduckUI.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

42 changes: 42 additions & 0 deletions RetailCoder.VBE/UI/RubberduckUI.fr.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -918,12 +918,36 @@ Do you want to continue?</value>
<data name="SourceControl_Changes" xml:space="preserve">
<value>z Changes</value>
</data>
<data name="SourceControl_Commit" xml:space="preserve">
<value>z Commit</value>
</data>
<data name="SourceControl_CommitButtonLabel" xml:space="preserve">
<value>z Go</value>
</data>
<data name="SourceControl_CommitMessageLabel" xml:space="preserve">
<value>z Commit message:</value>
</data>
<data name="SourceControl_CommitPush" xml:space="preserve">
<value>z Commit and Push</value>
</data>
<data name="SourceControl_CommitSync" xml:space="preserve">
<value>z Commit and Sync</value>
</data>
<data name="SourceControl_CreateNewBranch" xml:space="preserve">
<value>z Enter Branch Name</value>
</data>
<data name="SourceControl_CurrentBranchLabel" xml:space="preserve">
<value>z Branch:</value>
</data>
<data name="SourceControl_DefaultRepoLocationLabel" xml:space="preserve">
<value>z Default Repository Location</value>
</data>
<data name="SourceControl_EmailAddressLabel" xml:space="preserve">
<value>z Email Address</value>
</data>
<data name="SourceControl_ExcludedChanges" xml:space="preserve">
<value>z Excluded changes</value>
</data>
<data name="SourceControl_FetchCommitsLabel" xml:space="preserve">
<value>z Fetch</value>
</data>
Expand All @@ -933,18 +957,30 @@ Do you want to continue?</value>
<data name="SourceControl_IgnoreFile" xml:space="preserve">
<value>z Ignore File</value>
</data>
<data name="SourceControl_IncludedChanges" xml:space="preserve">
<value>z Included changes</value>
</data>
<data name="SourceControl_IncomingCommits" xml:space="preserve">
<value>z Incoming commits</value>
</data>
<data name="SourceControl_InitRepoButtonToolTip" xml:space="preserve">
<value>z Init New Repo from this Project</value>
</data>
<data name="SourceControl_MergeBranch" xml:space="preserve">
<value>z Merge</value>
</data>
<data name="SourceControl_NewBranch" xml:space="preserve">
<value>z New Branch</value>
</data>
<data name="SourceControl_OpenWorkingFolderToolTip" xml:space="preserve">
<value>z Open working folder</value>
</data>
<data name="SourceControl_OutgoingCommits" xml:space="preserve">
<value>z Outgoing commits</value>
</data>
<data name="SourceControl_PublishedBranchesLabel" xml:space="preserve">
<value>z Published Branches</value>
</data>
<data name="SourceControl_PullCommitsLabel" xml:space="preserve">
<value>z Pull</value>
</data>
Expand All @@ -963,9 +999,15 @@ Do you want to continue?</value>
<data name="SourceControl_SyncCommitsLabel" xml:space="preserve">
<value>z Sync</value>
</data>
<data name="SourceControl_UnpublishedBranchesLabel" xml:space="preserve">
<value>z Unpublished Branches</value>
</data>
<data name="SourceControl_UnsyncedCommits" xml:space="preserve">
<value>z Unsynced commits</value>
</data>
<data name="SourceControl_UntrackedFiles" xml:space="preserve">
<value>z Untracked files</value>
</data>
<data name="SourceControl_UpdateGlobalSettings" xml:space="preserve">
<value>z Update</value>
</data>
Expand Down
42 changes: 42 additions & 0 deletions RetailCoder.VBE/UI/RubberduckUI.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -951,15 +951,51 @@ Do you want to continue?</value>
<data name="SourceControl_Branches" xml:space="preserve">
<value>Branches</value>
</data>
<data name="SourceControl_Commit" xml:space="preserve">
<value>Commit</value>
</data>
<data name="SourceControl_CommitButtonLabel" xml:space="preserve">
<value>Go</value>
</data>
<data name="SourceControl_CommitMessageLabel" xml:space="preserve">
<value>Commit message:</value>
</data>
<data name="SourceControl_CommitPush" xml:space="preserve">
<value>Commit and Push</value>
</data>
<data name="SourceControl_CommitSync" xml:space="preserve">
<value>Commit and Sync</value>
</data>
<data name="SourceControl_CreateNewBranch" xml:space="preserve">
<value>Enter Branch Name</value>
</data>
<data name="SourceControl_CurrentBranchLabel" xml:space="preserve">
<value>Branch:</value>
</data>
<data name="SourceControl_ExcludedChanges" xml:space="preserve">
<value>Excluded changes</value>
</data>
<data name="SourceControl_FetchCommitsLabel" xml:space="preserve">
<value>Fetch</value>
</data>
<data name="SourceControl_IncludedChanges" xml:space="preserve">
<value>Included changes</value>
</data>
<data name="SourceControl_IncomingCommits" xml:space="preserve">
<value>Incoming commits</value>
</data>
<data name="SourceControl_MergeBranch" xml:space="preserve">
<value>Merge</value>
</data>
<data name="SourceControl_NewBranch" xml:space="preserve">
<value>New Branch</value>
</data>
<data name="SourceControl_OutgoingCommits" xml:space="preserve">
<value>Outgoing commits</value>
</data>
<data name="SourceControl_PublishedBranchesLabel" xml:space="preserve">
<value>Published Branches</value>
</data>
<data name="SourceControl_PullCommitsLabel" xml:space="preserve">
<value>Pull</value>
</data>
Expand All @@ -972,7 +1008,13 @@ Do you want to continue?</value>
<data name="SourceControl_SyncCommitsLabel" xml:space="preserve">
<value>Sync</value>
</data>
<data name="SourceControl_UnpublishedBranchesLabel" xml:space="preserve">
<value>Unpublished Branches</value>
</data>
<data name="SourceControl_UnsyncedCommits" xml:space="preserve">
<value>Unsynced commits</value>
</data>
<data name="SourceControl_UntrackedFiles" xml:space="preserve">
<value>Untracked files</value>
</data>
</root>

0 comments on commit ba5f727

Please sign in to comment.