diff options
| author | Michael Keppler | 2018-11-20 07:20:15 +0000 |
|---|---|---|
| committer | Michael Keppler | 2018-11-20 07:20:15 +0000 |
| commit | 5c6431802356e43f0e9269721a17a34196e3cbc4 (patch) | |
| tree | 4cdfac46047395f22db07b0bf7b7c7cdc92d9b7e | |
| parent | 33cc25fcead0ed86bd61c0f87625aac1dcaf6b90 (diff) | |
| download | egit-5c6431802356e43f0e9269721a17a34196e3cbc4.tar.gz egit-5c6431802356e43f0e9269721a17a34196e3cbc4.tar.xz egit-5c6431802356e43f0e9269721a17a34196e3cbc4.zip | |
Unify writing of SSH/ssh
Use SSH, except when referring to protocol part of a URL.
Bug: 541288
Change-Id: Ie2908b263a8603245a131c654f5bdd982ea7452f
Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
| -rw-r--r-- | org.eclipse.egit.core/src/org/eclipse/egit/core/internal/coretext.properties | 8 | ||||
| -rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/coretext.properties b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/coretext.properties index d0d42240ad..f20cfc4c28 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/coretext.properties +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/coretext.properties @@ -48,8 +48,8 @@ Activator_AutoSharingFailed=Auto sharing project with git failed Activator_ignoreResourceFailed=Ignoring {0} failed Activator_noBuiltinLfsSupportDetected=Builtin LFS support not present/detected Activator_ReconfigureWindowCacheError=Exception when reconfiguring window cache from configuration, default configuration will be used -Activator_SshClientNoJsch=JSch configured as ssh library, but JSch service cannot be found. Using Apache sshd library instead. -Activator_SshClientUnknown=Unknown ssh library ''{0}'' configured; valid values are "jsch" or "apache". Using JSch. +Activator_SshClientNoJsch=JSch configured as SSH library, but JSch service cannot be found. Using Apache sshd library instead. +Activator_SshClientUnknown=Unknown SSH library ''{0}'' configured; valid values are "jsch" or "apache". Using JSch. Activator_SshClientUsingApache=Using Apache MINA sshd as ssh client. AssumeUnchangedOperation_adding=Marking resources unchanged @@ -210,5 +210,5 @@ ReportingTypedConfigGetter_invalidConfigIgnored=Ignored invalid git config value ReportingTypedConfigGetter_invalidConfigWithLocation=Git config ''{0}'': value ''{1}'' is invalid; using default value ''{2}'' ReportingTypedConfigGetter_invalidConfigWithLocationIgnored=Git config ''{0}'': ignored invalid value ''{1}'' -SshPreferencesMirror_invalidDirectory=Invalid ssh home directory configured: {0} -SshPreferencesMirror_invalidKeyFile=Invalid ssh key file configured: {0} +SshPreferencesMirror_invalidDirectory=Invalid SSH home directory configured: {0} +SshPreferencesMirror_invalidKeyFile=Invalid SSH key file configured: {0} diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties index 1ac2769702..17d4a72d96 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties @@ -1758,7 +1758,7 @@ NotesEditorPage_Title=Notes GitPreferenceRoot_MaxPullThreadsCount=&Maximum number of parallel pulls: GitPreferenceRoot_MaxPullThreadsCountTooltip=1 disables parallel pulls -RemoteConnectionPreferencePage_SshClientLabel=&Ssh client: +RemoteConnectionPreferencePage_SshClientLabel=&SSH client: RemoteConnectionPreferencePage_TimeoutLabel=&Connection timeout (seconds): RemoteConnectionPreferencePage_ZeroValueTooltip=0 is equivalent to no timeout RemoveCommand_ConfirmDeleteBareRepositoryMessage=This will permanently delete repository ''{0}''.\n\nDo you want to continue? |