aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Megert2011-11-21 05:40:22 (EST)
committerDaniel Megert2011-11-21 05:40:51 (EST)
commitbbdb70d347cf85bc92a26ea37d4619788af6bfcb (patch)
treec5a8eed0908bdb4b54d53da6547f0a4418683592
parent42779d8bacda0a7d1079f6eb7a095001f28be8cf (diff)
downloadegit-bbdb70d347cf85bc92a26ea37d4619788af6bfcb.zip
egit-bbdb70d347cf85bc92a26ea37d4619788af6bfcb.tar.gz
egit-bbdb70d347cf85bc92a26ea37d4619788af6bfcb.tar.bz2
Escape single quotes where needed.refs/changes/35/4635/2
Single quotes must be escaped if the string contains a variable. Bug 363804 Change-Id: I213aa40cae2f830bbd86656ba7c526d1bdb23a66 Signed-off-by: Daniel Megert <daniel_megert@ch.ibm.com>
-rw-r--r--org.eclipse.egit.core/src/org/eclipse/egit/core/coretext.properties11
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties15
2 files changed, 16 insertions, 10 deletions
diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/coretext.properties b/org.eclipse.egit.core/src/org/eclipse/egit/core/coretext.properties
index 53266cb..54c3b88 100644
--- a/org.eclipse.egit.core/src/org/eclipse/egit/core/coretext.properties
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/coretext.properties
@@ -1,10 +1,13 @@
###############################################################################
-# Copyright (c) 2006, 2009 Shawn Pearce and others.
+# Copyright (c) 2006, 2011 Shawn Pearce and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
#
+# Contributors:
+# Shawn Pearce - initial implementation
+# Daniel Megert <daniel_megert@ch.ibm.com> - Escaped single quotes where needed
###############################################################################
CherryPickOperation_cherryPicking=Running cherry-pick on commit {0}
@@ -53,7 +56,7 @@ GitProjectData_missing=Git team provider configuration has gone missing.
GitProjectData_saveFailed=Saving Git team provider data to {0} failed.
RepositoryFinder_finding=Searching for associated repositories.
-ResetOperation_cantUpdate=Can't update {0}
+ResetOperation_cantUpdate=Can''t update {0}
ResetOperation_lookingUpCommit=looking up commit {0}
ResetOperation_lookingUpRef=looking up ref {0}
ResetOperation_mappingTreeForCommit=mapping tree for commit
@@ -76,7 +79,7 @@ The resource cannot be moved, renamed or deleted due to an internal error.
Error_CanonicalFile=Unable to determine a canonical file path.
ProjectReference_InvalidTokensCount={0} tokens expected in project reference but {1} had been found: {2}
-GitProjectSetCapability_CloneToExistingDirectory=Destination directory {0} exists. Don't clone {1} from {2} to prevent data loss.
+GitProjectSetCapability_CloneToExistingDirectory=Destination directory {0} exists. Don''t clone {1} from {2} to prevent data loss.
GitProjectSetCapability_ExportCouldNotGetBranch=Could not get current branch from repository of project {0}.
GitProjectSetCapability_ExportNoRemote=No remote URL configured for current branch in repository of project {0}.
@@ -140,6 +143,6 @@ GitProjectData_repositoryChangedTaskName=Git repository changed
GitResourceVariantTreeSubscriber_fetchTaskName=Fetching data from git repositories
-GitSyncObjectCache_noData=Cache doesn't contain data for key: {0}
+GitSyncObjectCache_noData=Cache doesn''t contain data for key: {0}
GitRemoteFolder_fetchingMembers=Fetching members of {0}
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
index b068511..3e1e43e 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
@@ -5,6 +5,9 @@
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
#
+# Contributors:
+# Shawn Pearce - initial implementation
+# Daniel Megert <daniel_megert@ch.ibm.com> - Escaped single quotes where needed
###############################################################################
AbortRebaseCommand_CancelDialogMessage=The abort operation was canceled
AbortRebaseCommand_JobName=Aborting Rebase
@@ -153,7 +156,7 @@ GitHistoryPage_errorSettingStartPoints=Cannot set start points for repository {0
GitHistoryPage_fileNotFound=File not Found
GitHistoryPage_notContainedInCommits=File {0} is not contained in the commits: {1}
GitHistoryPage_FileNotInCommit={0} not in {1}
-GitHistoryPage_FileOrFolderPartOfGitDirMessage=File or folder {0} is part of the repository's Git directory
+GitHistoryPage_FileOrFolderPartOfGitDirMessage=File or folder {0} is part of the repository''s Git directory
GitHistoryPage_FileType=File
GitHistoryPage_FindMenuLabel=Find &Toolbar
GitHistoryPage_FindTooltip=Show Find Toolbar
@@ -572,7 +575,7 @@ PushAction_wrongURITitle=Corrupted Configuration
PushOperationUI_MultiRepositoriesDestinationString={0} repositories
PushOperationUI_PushJobName=Push to {0}
-PushWizard_cantConnectToAny=Can't connect to any repository: {0}
+PushWizard_cantConnectToAny=Can''t connect to any repository: {0}
PushWizard_cantPrepareUpdatesMessage=Can't resolve ref specifications locally (local refs changed?) or create tracking ref update.
PushWizard_cantPrepareUpdatesTitle=Preparing Ref Updates Error
PushWizard_cantSaveMessage=Couldn't save specified specifications in configuration file.
@@ -664,9 +667,9 @@ CompareWithPreviousActionHandler_TaskGeneratingInput=Generating comparison with
CompareWithPreviousActionHandler_TitleRevisionNotFound=Previous revision not found
ConfirmationPage_cantConnectToAnyTitle=Can't Connect
-ConfirmationPage_cantConnectToAny=Can't connect to any URI: {0}
+ConfirmationPage_cantConnectToAny=Can''t connect to any URI: {0}
ConfirmationPage_description=Confirm following expected push result.
-ConfirmationPage_errorCantResolveSpecs=Can't resolve ref specifications locally or create tracking ref update: {0}
+ConfirmationPage_errorCantResolveSpecs=Can''t resolve ref specifications locally or create tracking ref update: {0}
ConfirmationPage_errorInterrupted=Operation was interrupted.
ConfirmationPage_errorRefsChangedNoMatch=Local refs changed, ref specifications don't match any source ref.
ConfirmationPage_errorUnexpected=Unexpected error occurred: {0}
@@ -720,7 +723,7 @@ PushResultTable_columnMode=Mode
PushResultTable_MesasgeText=Message Details
PushResultTable_statusUnexpected=Unexpected update status: {0}
PushResultTable_statusConnectionFailed=[connection failed]
-PushResultTable_statusDetailChanged=remote ref object changed,\nnow it's\: {0},\nnot expected\: {1}
+PushResultTable_statusDetailChanged=remote ref object changed,\nnow it''s\: {0},\nnot expected\: {1}
PushResultTable_refNonExisting=(non existing)
PushResultTable_repository=Repository
PushResultTable_statusDetailDeleted=old value: {0}
@@ -803,7 +806,7 @@ FetchWizard_cantSaveMessage=Couldn't save specified specifications in configurat
FetchWizard_cantSaveTitle=Configuration Storage Warning
FetchWizard_windowTitleDefault=Fetch from Another Repository
FetchWizard_windowTitleWithSource=Fetch from: {0}
-FileDiffContentProvider_errorGettingDifference=Can't get file difference of {0}.
+FileDiffContentProvider_errorGettingDifference=Can''t get file difference of {0}.
FileRevisionEditorInput_NameAndRevisionTitle={0} {1}
FileTreeContentProvider_NonWorkspaceResourcesNode=Non-workspace files
FindToolbar_NextTooltip=Go to next commit matching the search criteria