src/ru/ide/git/git/org/netbeans/modules/git/ui/merge/Bundle_ru.properties - netbeans-l10n - Git at Google

 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 #
 # Copyright 2010 Oracle and/or its affiliates. All rights reserved.
 #
 # Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 # Other names may be trademarks of their respective owners.
 #
 # The contents of this file are subject to the terms of either the GNU
 # General Public License Version 2 only ("GPL") or the Common
 # Development and Distribution License("CDDL") (collectively, the
 # "License"). You may not use this file except in compliance with the
 # License. You can obtain a copy of the License at
 # http://www.netbeans.org/cddl-gplv2.html
 # or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 # specific language governing permissions and limitations under the
 # License.  When distributing the software, include this License Header
 # Notice in each file and include the License file at
 # nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 # particular file as subject to the "Classpath" exception as provided
 # by Oracle in the GPL Version 2 section of the License file that
 # accompanied this code. If applicable, add the following below the
 # License Header, with the fields enclosed by brackets [] replaced by
 # your own identifying information:
 # "Portions Copyrighted [year] [name of copyright owner]"
 #
 # If you wish your version of this file to be governed by only the CDDL
 # or only the GPL Version 2, indicate your decision by adding
 # "[Contributor] elects to include this software in this distribution
 # under the [CDDL or GPL Version 2] license." If you do not indicate a
 # single choice of license, a recipient has the option to distribute
 # your version of this file under either the CDDL, the GPL Version 2 or
 # to extend the choice of license to its licensees as provided above.
 # However, if you add GPL Version 2 code and therefore, elected the GPL
 # Version 2 license, then the option applies only if the new code is
 # made subject to such option by the copyright holder.
 #
 # Contributor(s):
 #
 # Portions Copyrighted 2010 Sun Microsystems, Inc.

 LBL_Merge.failed.title=\u0421\u043b\u0438\u044f\u043d\u0438\u0435 \u043d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e
 LBL_MergeRevisionAction_Name=\u0421\u043b\u0438\u0442\u044c \u0440\u0435\u0434\u0430\u043a\u0446\u0438\u044e...
 LBL_MergeRevisionAction_PopupName=\u0421\u043b\u0438\u044f\u043d\u0438\u0435 \u0440\u0435\u0434\u0430\u043a\u0446\u0438\u0438...
 LBL_MergeRevisionAction.progressName=\u0421\u043b\u0438\u044f\u043d\u0438\u0435 \u0441 HEAD
 MSG_Merge.failed.aborted.text=\u0422\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0444\u0438\u043a\u0441\u0430\u0446\u0438\u044f \u0441\u043b\u0438\u044f\u043d\u0438\u044f. \u042d\u0442\u043e \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u0441\u043b\u0438\u044f\u043d\u0438\u0435 \u0441 \u043f\u0435\u0440\u0435\u043c\u043e\u0442\u043a\u043e\u0439 \u0432\u043f\u0435\u0440\u0435\u0434.\n\n\u041f\u0435\u0440\u0435\u0437\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u044c \u0441\u043b\u0438\u044f\u043d\u0438\u0435 \u0438 \u0440\u0430\u0437\u0440\u0435\u0448\u0438\u0442\u044c \u0444\u0438\u043a\u0441\u0430\u0446\u0438\u0438 \u0441\u043b\u0438\u044f\u043d\u0438\u0439 (\u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440 --ff).
 MSG_MergeRevisionAction.result=\u0420\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442 \u0441\u043b\u0438\u044f\u043d\u0438\u044f: {0}\n
 MSG_MergeRevisionAction.result.alreadyUpToDate=HEAD \u0443\u0436\u0435 \u0441\u043e\u0434\u0435\u0440\u0436\u0438\u0442 \u0440\u0435\u0434\u0430\u043a\u0446\u0438\u044e {0}
 MSG_MergeRevisionAction.result.fastForward=\u0421\u043b\u0438\u044f\u043d\u0438\u0435 HEAD \u0441 {0}:\n
 MSG_MergeRevisionAction.result.merged=\u0421\u043b\u0438\u044f\u043d\u0438\u0435 HEAD \u0441 {0}:\n
 MSG_MergeRevisionAction.result.conflict=\u041f\u0440\u0438 \u0441\u043b\u0438\u044f\u043d\u0438\u0438 HEAD \u0441 {0} \u0432\u043e\u0437\u043d\u0438\u043a\u043b\u0438 \u043a\u043e\u043d\u0444\u043b\u0438\u043a\u0442\u044b \u0432:\n
 MSG_MergeRevisionAction.result.failed=\u0421\u043b\u0438\u044f\u043d\u0438\u0435 HEAD \u0441 {0}: \u043d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c. \u0414\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0435 \u0441\u0432\u0435\u0434\u0435\u043d\u0438\u044f \u043f\u0440\u0438\u0432\u0435\u0434\u0435\u043d\u044b \u0432 \u0432\u044b\u0445\u043e\u0434\u043d\u044b\u0445 \u0434\u0430\u043d\u043d\u044b\u0445.
 MSG_MergeRevisionAction.result.failedFiles=\u0421\u043b\u0438\u044f\u043d\u0438\u0435 HEAD \u0441 {0} \u043d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0438\u0437-\u0437\u0430 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u0445 \u0444\u0430\u0439\u043b\u043e\u0432:\n
 MSG_MergeRevisionAction.result.aborted=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0441\u043b\u0438\u0442\u044c HEAD \u0441 {0}, \u0442\u0430\u043a \u043a\u0430\u043a \u0442\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0444\u0438\u043a\u0441\u0430\u0446\u0438\u044f \u0441\u043b\u0438\u044f\u043d\u0438\u044f, \u0430 \u0431\u044b\u043b\u0438 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u044b \u0442\u043e\u043b\u044c\u043a\u043e \u0441\u043b\u0438\u044f\u043d\u0438\u044f \u0441 \u043f\u0435\u0440\u0435\u043c\u043e\u0442\u043a\u043e\u0439 \u0432\u043f\u0435\u0440\u0435\u0434.
 MSG_MergeRevisionAction.result.unsupported=\u0421\u043b\u0438\u044f\u043d\u0438\u0435 \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044f.
 LBL_MergeRevision.OKButton.text=\u041e\u0431\u044a\u0435\u0434\u0438\u043d\u0438\u0442\u044c
 LBL_MergeRevision.title=\u0421\u043b\u0438\u044f\u043d\u0438\u0435 \u0440\u0435\u0434\u0430\u043a\u0446\u0438\u0438
 MergeRevisionPanel.jLabel1.text=\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0440\u0435\u0434\u0430\u043a\u0446\u0438\u044e \u0434\u043b\u044f \u0441\u043b\u0438\u044f\u043d\u0438\u044f \u0441 HEAD
 MergeRevision.ffoption.ff=\u041f\u0435\u0440\u0435\u043c\u043e\u0442\u0430\u0442\u044c \u0432\u043f\u0435\u0440\u0435\u0434, \u0435\u0441\u043b\u0438 \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e (--ff)
 MergeRevision.ffoption.ff.tt=\u0413\u0434\u0435 \u044d\u0442\u043e \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e, \u043f\u0440\u0438 \u0441\u043b\u0438\u044f\u043d\u0438\u0438 \u043d\u0435 \u0431\u0443\u0434\u0443\u0442 \u0441\u043e\u0437\u0434\u0430\u0432\u0430\u0442\u044c\u0441\u044f \u043d\u043e\u0432\u044b\u0435 \u0444\u0438\u043a\u0441\u0430\u0446\u0438\u0438, \u0430 \u0432\u0435\u0442\u0432\u044c \u0431\u0443\u0434\u0435\u0442 \u043f\u0435\u0440\u0435\u043c\u0435\u0449\u0430\u0442\u044c\u0441\u044f \u0432 \u043e\u0431\u044a\u0435\u0434\u0438\u043d\u0435\u043d\u043d\u0443\u044e \u0444\u0438\u043a\u0441\u0430\u0446\u0438\u044e.
 MergeRevision.ffoption.ffonly=\u0422\u043e\u043b\u044c\u043a\u043e \u043f\u0435\u0440\u0435\u043c\u043e\u0442\u0430\u0442\u044c \u0432\u043f\u0435\u0440\u0435\u0434 (--ff-only)
 MergeRevision.ffoption.ffonly.tt=\u0421\u043b\u0438\u044f\u043d\u0438\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0438\u0442\u044c \u043d\u0435 \u0443\u0434\u0430\u0441\u0442\u0441\u044f, \u0435\u0441\u043b\u0438 \u0442\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0444\u0438\u043a\u0441\u0430\u0446\u0438\u044f \u0441\u043b\u0438\u044f\u043d\u0438\u044f (\u0443 \u043e\u0431\u0435\u0438\u0445 \u0432\u0435\u0442\u0432\u0435\u0439 \u0435\u0441\u0442\u044c \u0441\u043e\u0431\u0441\u0442\u0432\u0435\u043d\u043d\u044b\u0435 \u0444\u0438\u043a\u0441\u0430\u0446\u0438\u0438)
 MergeRevision.ffoption.noff=\u0412\u0441\u0435\u0433\u0434\u0430 \u0441\u043e\u0437\u0434\u0430\u0432\u0430\u0442\u044c \u0444\u0438\u043a\u0441\u0430\u0446\u0438\u044e (--no-ff)
 MergeRevision.ffoption.noff.tt=\u041f\u0440\u0438 \u0441\u043b\u0438\u044f\u043d\u0438\u0438 \u0432\u0441\u0435\u0433\u0434\u0430 \u0431\u0443\u0434\u0435\u0442 \u0441\u043e\u0437\u0434\u0430\u0432\u0430\u0442\u044c\u0441\u044f \u0444\u0438\u043a\u0441\u0430\u0446\u0438\u044f \u0441\u043b\u0438\u044f\u043d\u0438\u044f, \u043f\u043e\u043b\u0435\u0437\u043d\u043e \u0434\u043b\u044f \u0441\u043b\u0438\u044f\u043d\u0438\u044f \u0432\u0435\u0442\u0432\u0435\u0439 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u043e\u0432.
 MergeRevisionPanel.ffModePanel.text=\u0412\u044b\u0431\u0440\u0430\u0442\u044c \u0440\u0435\u0436\u0438\u043c \u043f\u0435\u0440\u0435\u043c\u043e\u0442\u043a\u0438 \u0432\u043f\u0435\u0440\u0435\u0434
	# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
	#
	# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
	#
	# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
	# Other names may be trademarks of their respective owners.
	#
	# The contents of this file are subject to the terms of either the GNU
	# General Public License Version 2 only ("GPL") or the Common
	# Development and Distribution License("CDDL") (collectively, the
	# "License"). You may not use this file except in compliance with the
	# License. You can obtain a copy of the License at
	# http://www.netbeans.org/cddl-gplv2.html
	# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
	# specific language governing permissions and limitations under the
	# License. When distributing the software, include this License Header
	# Notice in each file and include the License file at
	# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
	# particular file as subject to the "Classpath" exception as provided
	# by Oracle in the GPL Version 2 section of the License file that
	# accompanied this code. If applicable, add the following below the
	# License Header, with the fields enclosed by brackets [] replaced by
	# your own identifying information:
	# "Portions Copyrighted [year] [name of copyright owner]"
	#
	# If you wish your version of this file to be governed by only the CDDL
	# or only the GPL Version 2, indicate your decision by adding
	# "[Contributor] elects to include this software in this distribution
	# under the [CDDL or GPL Version 2] license." If you do not indicate a
	# single choice of license, a recipient has the option to distribute
	# your version of this file under either the CDDL, the GPL Version 2 or
	# to extend the choice of license to its licensees as provided above.
	# However, if you add GPL Version 2 code and therefore, elected the GPL
	# Version 2 license, then the option applies only if the new code is
	# made subject to such option by the copyright holder.
	#
	# Contributor(s):
	#
	# Portions Copyrighted 2010 Sun Microsystems, Inc.

	LBL_Merge.failed.title=\u0421\u043b\u0438\u044f\u043d\u0438\u0435 \u043d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e
	LBL_MergeRevisionAction_Name=\u0421\u043b\u0438\u0442\u044c \u0440\u0435\u0434\u0430\u043a\u0446\u0438\u044e...
	LBL_MergeRevisionAction_PopupName=\u0421\u043b\u0438\u044f\u043d\u0438\u0435 \u0440\u0435\u0434\u0430\u043a\u0446\u0438\u0438...
	LBL_MergeRevisionAction.progressName=\u0421\u043b\u0438\u044f\u043d\u0438\u0435 \u0441 HEAD
	MSG_Merge.failed.aborted.text=\u0422\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0444\u0438\u043a\u0441\u0430\u0446\u0438\u044f \u0441\u043b\u0438\u044f\u043d\u0438\u044f. \u042d\u0442\u043e \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u0441\u043b\u0438\u044f\u043d\u0438\u0435 \u0441 \u043f\u0435\u0440\u0435\u043c\u043e\u0442\u043a\u043e\u0439 \u0432\u043f\u0435\u0440\u0435\u0434.\n\n\u041f\u0435\u0440\u0435\u0437\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u044c \u0441\u043b\u0438\u044f\u043d\u0438\u0435 \u0438 \u0440\u0430\u0437\u0440\u0435\u0448\u0438\u0442\u044c \u0444\u0438\u043a\u0441\u0430\u0446\u0438\u0438 \u0441\u043b\u0438\u044f\u043d\u0438\u0439 (\u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440 --ff).
	MSG_MergeRevisionAction.result=\u0420\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442 \u0441\u043b\u0438\u044f\u043d\u0438\u044f: {0}\n
	MSG_MergeRevisionAction.result.alreadyUpToDate=HEAD \u0443\u0436\u0435 \u0441\u043e\u0434\u0435\u0440\u0436\u0438\u0442 \u0440\u0435\u0434\u0430\u043a\u0446\u0438\u044e {0}
	MSG_MergeRevisionAction.result.fastForward=\u0421\u043b\u0438\u044f\u043d\u0438\u0435 HEAD \u0441 {0}:\n
	MSG_MergeRevisionAction.result.merged=\u0421\u043b\u0438\u044f\u043d\u0438\u0435 HEAD \u0441 {0}:\n
	MSG_MergeRevisionAction.result.conflict=\u041f\u0440\u0438 \u0441\u043b\u0438\u044f\u043d\u0438\u0438 HEAD \u0441 {0} \u0432\u043e\u0437\u043d\u0438\u043a\u043b\u0438 \u043a\u043e\u043d\u0444\u043b\u0438\u043a\u0442\u044b \u0432:\n
	MSG_MergeRevisionAction.result.failed=\u0421\u043b\u0438\u044f\u043d\u0438\u0435 HEAD \u0441 {0}: \u043d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c. \u0414\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0435 \u0441\u0432\u0435\u0434\u0435\u043d\u0438\u044f \u043f\u0440\u0438\u0432\u0435\u0434\u0435\u043d\u044b \u0432 \u0432\u044b\u0445\u043e\u0434\u043d\u044b\u0445 \u0434\u0430\u043d\u043d\u044b\u0445.
	MSG_MergeRevisionAction.result.failedFiles=\u0421\u043b\u0438\u044f\u043d\u0438\u0435 HEAD \u0441 {0} \u043d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0438\u0437-\u0437\u0430 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u0445 \u0444\u0430\u0439\u043b\u043e\u0432:\n
	MSG_MergeRevisionAction.result.aborted=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0441\u043b\u0438\u0442\u044c HEAD \u0441 {0}, \u0442\u0430\u043a \u043a\u0430\u043a \u0442\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0444\u0438\u043a\u0441\u0430\u0446\u0438\u044f \u0441\u043b\u0438\u044f\u043d\u0438\u044f, \u0430 \u0431\u044b\u043b\u0438 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u044b \u0442\u043e\u043b\u044c\u043a\u043e \u0441\u043b\u0438\u044f\u043d\u0438\u044f \u0441 \u043f\u0435\u0440\u0435\u043c\u043e\u0442\u043a\u043e\u0439 \u0432\u043f\u0435\u0440\u0435\u0434.
	MSG_MergeRevisionAction.result.unsupported=\u0421\u043b\u0438\u044f\u043d\u0438\u0435 \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044f.
	LBL_MergeRevision.OKButton.text=\u041e\u0431\u044a\u0435\u0434\u0438\u043d\u0438\u0442\u044c
	LBL_MergeRevision.title=\u0421\u043b\u0438\u044f\u043d\u0438\u0435 \u0440\u0435\u0434\u0430\u043a\u0446\u0438\u0438
	MergeRevisionPanel.jLabel1.text=\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0440\u0435\u0434\u0430\u043a\u0446\u0438\u044e \u0434\u043b\u044f \u0441\u043b\u0438\u044f\u043d\u0438\u044f \u0441 HEAD
	MergeRevision.ffoption.ff=\u041f\u0435\u0440\u0435\u043c\u043e\u0442\u0430\u0442\u044c \u0432\u043f\u0435\u0440\u0435\u0434, \u0435\u0441\u043b\u0438 \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e (--ff)
	MergeRevision.ffoption.ff.tt=\u0413\u0434\u0435 \u044d\u0442\u043e \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e, \u043f\u0440\u0438 \u0441\u043b\u0438\u044f\u043d\u0438\u0438 \u043d\u0435 \u0431\u0443\u0434\u0443\u0442 \u0441\u043e\u0437\u0434\u0430\u0432\u0430\u0442\u044c\u0441\u044f \u043d\u043e\u0432\u044b\u0435 \u0444\u0438\u043a\u0441\u0430\u0446\u0438\u0438, \u0430 \u0432\u0435\u0442\u0432\u044c \u0431\u0443\u0434\u0435\u0442 \u043f\u0435\u0440\u0435\u043c\u0435\u0449\u0430\u0442\u044c\u0441\u044f \u0432 \u043e\u0431\u044a\u0435\u0434\u0438\u043d\u0435\u043d\u043d\u0443\u044e \u0444\u0438\u043a\u0441\u0430\u0446\u0438\u044e.
	MergeRevision.ffoption.ffonly=\u0422\u043e\u043b\u044c\u043a\u043e \u043f\u0435\u0440\u0435\u043c\u043e\u0442\u0430\u0442\u044c \u0432\u043f\u0435\u0440\u0435\u0434 (--ff-only)
	MergeRevision.ffoption.ffonly.tt=\u0421\u043b\u0438\u044f\u043d\u0438\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0438\u0442\u044c \u043d\u0435 \u0443\u0434\u0430\u0441\u0442\u0441\u044f, \u0435\u0441\u043b\u0438 \u0442\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0444\u0438\u043a\u0441\u0430\u0446\u0438\u044f \u0441\u043b\u0438\u044f\u043d\u0438\u044f (\u0443 \u043e\u0431\u0435\u0438\u0445 \u0432\u0435\u0442\u0432\u0435\u0439 \u0435\u0441\u0442\u044c \u0441\u043e\u0431\u0441\u0442\u0432\u0435\u043d\u043d\u044b\u0435 \u0444\u0438\u043a\u0441\u0430\u0446\u0438\u0438)
	MergeRevision.ffoption.noff=\u0412\u0441\u0435\u0433\u0434\u0430 \u0441\u043e\u0437\u0434\u0430\u0432\u0430\u0442\u044c \u0444\u0438\u043a\u0441\u0430\u0446\u0438\u044e (--no-ff)
	MergeRevision.ffoption.noff.tt=\u041f\u0440\u0438 \u0441\u043b\u0438\u044f\u043d\u0438\u0438 \u0432\u0441\u0435\u0433\u0434\u0430 \u0431\u0443\u0434\u0435\u0442 \u0441\u043e\u0437\u0434\u0430\u0432\u0430\u0442\u044c\u0441\u044f \u0444\u0438\u043a\u0441\u0430\u0446\u0438\u044f \u0441\u043b\u0438\u044f\u043d\u0438\u044f, \u043f\u043e\u043b\u0435\u0437\u043d\u043e \u0434\u043b\u044f \u0441\u043b\u0438\u044f\u043d\u0438\u044f \u0432\u0435\u0442\u0432\u0435\u0439 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u043e\u0432.
	MergeRevisionPanel.ffModePanel.text=\u0412\u044b\u0431\u0440\u0430\u0442\u044c \u0440\u0435\u0436\u0438\u043c \u043f\u0435\u0440\u0435\u043c\u043e\u0442\u043a\u0438 \u0432\u043f\u0435\u0440\u0435\u0434