All Downloads are FREE. Search and download functionalities are using the official Maven repository.

org.netbeans.libs.git.Bundle.properties Maven / Gradle / Ivy

The newest version!
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements.  See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership.  The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License.  You may obtain a copy of the License at
#
#   http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied.  See the License for the
# specific language governing permissions and limitations
# under the License.

## libs/svnclientadapter/manifest.mf
OpenIDE-Module-Name=Git Client Library
OpenIDE-Module-Display-Category=Libraries
OpenIDE-Module-Short-Description=Git client API

#GitRepositoryState
LBL_RepositoryInfo_Bare = Bare
LBL_RepositoryInfo_Safe = Safe
LBL_RepositoryInfo_Merging = Merging
LBL_RepositoryInfo_Merged = Merged
LBL_RepositoryInfo_Rebasing = Rebasing
LBL_RepositoryInfo_Apply = Apply
LBL_RepositoryInfo_Bisecting = Bisecting
LBL_RepositoryInfo_CherryPicking=Cherry-picking
LBL_RepositoryInfo_CherryPickingResolved=Cherry-picked

#GitException
MSG_Exception_ObjectDoesNotExist = {0} [{1}] does not exist
MSG_Exception_CheckoutConflicts = Conflicts during checkout

#GitConflictDescriptor
MSG_GitConflictDescriptor_BOTH_DELETED.desc = The file was deleted in both branches
MSG_GitConflictDescriptor_ADDED_BY_US.desc = The file was added in the current branch
MSG_GitConflictDescriptor_DELETED_BY_THEM.desc = The file was deleted in the other branch
MSG_GitConflictDescriptor_ADDED_BY_THEM.desc = The file was added in the other branch
MSG_GitConflictDescriptor_DELETED_BY_US.desc = The file was deleted in the current branch
MSG_GitConflictDescriptor_BOTH_ADDED.desc = The file was added in both branches
MSG_GitConflictDescriptor_BOTH_MODIFIED.desc = The file was modified in both branches




© 2015 - 2025 Weber Informatics LLC | Privacy Policy