| # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. |
| # |
| # Copyright 1997-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]" |
| # |
| # Contributor(s): |
| # |
| # The Original Software is NetBeans. The Initial Developer of the Original |
| # Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun |
| # Microsystems, Inc. All Rights Reserved. |
| # |
| # 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. |
| |
| # mf-layer.xml |
| Services/MergeVisualizers=\u0412\u0438\u0437\u0443\u0430\u043b\u0438\u0437\u0430\u0442\u043e\u0440\u044b \u0441\u043b\u0438\u044f\u043d\u0438\u044f |
| |
| GraphicalMergeVisualizer.displayName=\u0413\u0440\u0430\u0444\u0438\u0447\u0435\u0441\u043a\u0438\u0439 \u0440\u0430\u0437\u0440\u0435\u0448\u0438\u0442\u0435\u043b\u044c \u043a\u043e\u043d\u0444\u043b\u0438\u043a\u0442\u043e\u0432 \u0441\u043b\u0438\u044f\u043d\u0438\u044f |
| |
| |
| # GraphicalMergeVisualizerBeanInfo |
| PROP_colorUnresolvedConflict=\u0426\u0432\u0435\u0442 \u0442\u0435\u043a\u0441\u0442\u0430 \u043d\u0435\u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u043d\u043e\u0433\u043e \u043a\u043e\u043d\u0444\u043b\u0438\u043a\u0442\u0430 |
| HINT_colorUnresolvedConflict=\u0426\u0432\u0435\u0442 \u0444\u043e\u043d\u0430 \u0442\u0435\u043a\u0441\u0442\u0430 \u043d\u0435\u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u043d\u043e\u0433\u043e \u043a\u043e\u043d\u0444\u043b\u0438\u043a\u0442\u0430. |
| PROP_colorResolvedConflict=\u0426\u0432\u0435\u0442 \u0442\u0435\u043a\u0441\u0442\u0430, \u0432\u043d\u0435\u0441\u0435\u043d\u043d\u043e\u0433\u043e \u0434\u043b\u044f \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u044f \u043a\u043e\u043d\u0444\u043b\u0438\u043a\u0442\u0430 |
| HINT_colorResolvedConflict=\u0426\u0432\u0435\u0442 \u0444\u043e\u043d\u0430 \u0442\u0435\u043a\u0441\u0442\u0430, \u0432\u043d\u0435\u0441\u0435\u043d\u043d\u043e\u0433\u043e \u0434\u043b\u044f \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u044f \u043a\u043e\u043d\u0444\u043b\u0438\u043a\u0442\u0430. |
| PROP_colorOtherConflict=\u0426\u0432\u0435\u0442 \u0442\u0435\u043a\u0441\u0442\u0430, \u043d\u0435 \u0432\u043d\u0435\u0441\u0435\u043d\u043d\u043e\u0433\u043e \u0434\u043b\u044f \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u044f \u043a\u043e\u043d\u0444\u043b\u0438\u043a\u0442\u0430 |
| HINT_colorOtherConflict=\u0426\u0432\u0435\u0442 \u0444\u043e\u043d\u0430 \u0442\u0435\u043a\u0441\u0442\u0430, \u043d\u0435 \u0432\u043d\u0435\u0441\u0435\u043d\u043d\u043e\u0433\u043e \u0434\u043b\u044f \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u044f \u043a\u043e\u043d\u0444\u043b\u0438\u043a\u0442\u0430 |
| |
| # MergeDialogComponent |
| MergeDialogComponent.title=\u0420\u0430\u0437\u0440\u0435\u0448\u0438\u0442\u0435\u043b\u044c \u043a\u043e\u043d\u0444\u043b\u0438\u043a\u0442\u043e\u0432 \u0441\u043b\u0438\u044f\u043d\u0438\u044f |
| ACSN_Merge_Dialog_Component=\u041a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u044f \u043a\u043e\u043d\u0444\u043b\u0438\u043a\u0442\u043e\u0432 |
| ACSD_Merge_Dialog_Component=\u0413\u0440\u0430\u0444\u0438\u0447\u0435\u0441\u043a\u0438\u0439 \u0440\u0430\u0437\u0440\u0435\u0448\u0438\u0442\u0435\u043b\u044c \u043a\u043e\u043d\u0444\u043b\u0438\u043a\u0442\u043e\u0432 \u0441\u043b\u0438\u044f\u043d\u0438\u044f. |
| ACSN_Merge_Tabbed_Pane=\u0424\u0430\u0439\u043b\u044b \u0441 \u043a\u043e\u043d\u0444\u043b\u0438\u043a\u0442\u0430\u043c\u0438 |
| ACSD_Merge_Tabbed_Pane=\u0412\u043a\u043b\u0430\u0434\u043a\u0430 \u0444\u0430\u0439\u043b\u043e\u0432 \u0441 \u043a\u043e\u043d\u0444\u043b\u0438\u043a\u0442\u0430\u043c\u0438. |
| |
| # MergePanel |
| MergePanel.nextButton.toolTipText=\u0421\u043b\u0435\u0434\u0443\u044e\u0449\u0435\u0435 \u0440\u0430\u0437\u043b\u0438\u0447\u0438\u0435 |
| MergePanel.prevButton.toolTipText=\u041f\u0440\u0435\u0434\u044b\u0434\u0443\u0449\u0435\u0435 \u0440\u0430\u0437\u043b\u0438\u0447\u0438\u0435 |
| # Status of conflicts resolving: |
| # {0} .. current conflict |
| # {1} .. total number of conflicts |
| # {2} .. number of unresolved conflicts |
| MergePanel.statusLine=\u041a\u043e\u043d\u0444\u043b\u0438\u043a\u0442: {0} \u0438\u0437 {1}, \u043d\u0435 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u043e: {2} |
| ACS_EditorPane1A11yName=\u041f\u0435\u0440\u0432\u044b\u0439 \u0444\u0430\u0439\u043b |
| ACS_EditorPane1A11yDescr=\u0421\u043e\u0434\u0435\u0440\u0436\u0438\u043c\u043e\u0435 \u043f\u0435\u0440\u0432\u043e\u0433\u043e \u0444\u0430\u0439\u043b\u0430. |
| ACS_EditorPane2A11yName=\u0412\u0442\u043e\u0440\u043e\u0439 \u0444\u0430\u0439\u043b |
| ACS_EditorPane2A11yDescr=\u0421\u043e\u0434\u0435\u0440\u0436\u0438\u043c\u043e\u0435 \u0432\u0442\u043e\u0440\u043e\u0433\u043e \u0444\u0430\u0439\u043b\u0430. |
| ACS_EditorPane3A11yName=\u0420\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442 \u0441\u043b\u0438\u044f\u043d\u0438\u044f |
| ACS_EditorPane3A11yDescr=\u0421\u043e\u0434\u0435\u0440\u0436\u0438\u043c\u043e\u0435 \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u0430 \u0441\u043b\u0438\u044f\u043d\u0438\u044f \u0438 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u043d\u044b\u0445 \u043a\u043e\u043d\u0444\u043b\u0438\u043a\u0442\u043e\u0432. |
| |
| |
| MergePanel.acceptLeftButton.text=\u041f\u0440\u0438\u043d\u044f\u0442\u044c |
| MergePanel.acceptAndNextLeftButton=\u041f\u0440\u0438\u043d\u044f\u0442\u044c \u0438 \u043f\u0435\u0440\u0435\u0439\u0442\u0438 \u0434\u0430\u043b\u0435\u0435 |
| MergePanel.acceptRightButton.text=\u041f\u0440\u0438\u043d\u044f\u0442\u044c |
| MergePanel.acceptAndNextRightButton=\u041f\u0440\u0438\u043d\u044f\u0442\u044c \u0438 \u043f\u0435\u0440\u0435\u0439\u0442\u0438 \u0434\u0430\u043b\u0435\u0435 |
| |
| ACS_MergePanel.acceptLeftButton.textA11yDesc=\u041f\u0440\u0438\u043d\u044f\u0442\u044c \u0432\u0430\u0440\u0438\u0430\u043d\u0442 \u0441\u043b\u0435\u0432\u0430. |
| ACS_MergePanel.acceptAndNextLeftButtonA11yDesc=\u041f\u0440\u0438\u043d\u044f\u0442\u044c \u0432\u0430\u0440\u0438\u0430\u043d\u0442 \u0441\u043b\u0435\u0432\u0430 \u0438 \u043f\u0435\u0440\u0435\u0439\u0442\u0438 \u043a \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0435\u043c\u0443 \u043a\u043e\u043d\u0444\u043b\u0438\u043a\u0442\u0443. |
| ACS_MergePanel.acceptRightButton.textA11yDesc=\u041f\u0440\u0438\u043d\u044f\u0442\u044c \u0432\u0430\u0440\u0438\u0430\u043d\u0442 \u0441\u043f\u0440\u0430\u0432\u0430. |
| ACS_MergePanel.acceptAndNextRightButtonA11yDesc=\u041f\u0440\u0438\u043d\u044f\u0442\u044c \u0432\u0430\u0440\u0438\u0430\u043d\u0442 \u0441\u043f\u0440\u0430\u0432\u0430 \u0438 \u043f\u0435\u0440\u0435\u0439\u0442\u0438 \u043a \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0435\u043c\u0443 \u043a\u043e\u043d\u0444\u043b\u0438\u043a\u0442\u0443. |
| |
| # {0} .. The name fo the file to be saved |
| SaveFileQuestion=\u0424\u0430\u0439\u043b {0} \u0438\u0437\u043c\u0435\u043d\u0435\u043d. \u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c? |
| # {0} .. The number of files to be saved |
| SaveFilesQuestion={0} \u0444\u0430\u0439\u043b\u043e\u0432 \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u043e. \u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u0438\u0445? |
| # Printed message, when the merge result saving fails. |
| # {0} .. the localized message reported by the IOException |
| MergeControl.failedToSave=\u041e\u0448\u0438\u0431\u043a\u0430 \u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u0438\u044f \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u0430 \u0441\u043b\u0438\u044f\u043d\u0438\u044f: {0} |
| BTN_OK=\u041e\u041a |
| ACS_BTN_OKA11yDesc=\u041f\u0440\u0438\u043d\u044f\u0442\u044c \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f \u0438 \u0437\u0430\u043a\u0440\u044b\u0442\u044c \u0434\u0438\u0430\u043b\u043e\u0433\u043e\u0432\u043e\u0435 \u043e\u043a\u043d\u043e. |
| BTN_Cancel=\u041e\u0442\u043c\u0435\u043d\u0430 |
| ACS_BTN_CancelA11yDesc=\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f \u0438 \u0437\u0430\u043a\u0440\u044b\u0442\u044c \u0434\u0438\u0430\u043b\u043e\u0433\u043e\u0432\u043e\u0435 \u043e\u043a\u043d\u043e. |
| BTN_Help=\u0421\u043f\u0440\u0430\u0432\u043a\u0430 |
| ACS_BTN_HelpA11yDesc=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c \u0441\u043f\u0440\u0430\u0432\u043a\u0443 \u0434\u043b\u044f \u0434\u0430\u043d\u043d\u043e\u0433\u043e \u0434\u0438\u0430\u043b\u043e\u0433\u043e\u0432\u043e\u0433\u043e \u043e\u043a\u043d\u0430. |
| |
| CloseAction=\u0417\u0430\u043a\u0440\u044b\u0442\u044c |
| |
| SaveFileWarningQuestion=\u0424\u0430\u0439\u043b {0} \u0438\u0437\u043c\u0435\u043d\u0435\u043d, \u0441\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c?\n\u041d\u0435 \u0432\u0441\u0435 \u043a\u043e\u043d\u0444\u043b\u0438\u043a\u0442\u044b \u0432\u043e \u0432\u0441\u0435\u0445 \u0444\u0430\u0439\u043b\u0430\u0445 \u0431\u044b\u043b\u0438 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u044b. |
| SaveFilesWarningQuestion={0} \u0444\u0430\u0439\u043b\u0430(\u043e\u0432) \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u043e, \u0441\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u0438\u0445?\n\u041d\u0435 \u0432\u0441\u0435 \u043a\u043e\u043d\u0444\u043b\u0438\u043a\u0442\u044b \u0432\u043e \u0432\u0441\u0435\u0445 \u0444\u0430\u0439\u043b\u0430\u0445 \u0431\u044b\u043b\u0438 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u044b. |
| WarningQuestion=\u041a\u043e\u043d\u0444\u043b\u0438\u043a\u0442\u044b \u043d\u0435 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u044b. \u0412\u0441\u0435 \u0440\u0430\u0432\u043d\u043e \u0437\u0430\u043a\u0440\u044b\u0442\u044c \u0432\u0438\u0437\u0443\u0430\u043b\u0438\u0437\u0430\u0442\u043e\u0440? |
| MergePanel.declineLeftButton.text=\u041e\u0442\u043a\u043b\u043e\u043d\u0438\u0442\u044c |
| MergePanel.declineLeftButton.TTtext=\u041e\u0442\u043a\u043b\u043e\u043d\u0438\u0442\u044c \u0432\u0430\u0440\u0438\u0430\u043d\u0442 \u0441\u043b\u0435\u0432\u0430. |
| MergePanel.declineRightButton.text=\u041e\u0442\u043a\u043b\u043e\u043d\u0438\u0442\u044c |
| MergePanel.declineRightButton.TTtext=\u041e\u0442\u043a\u043b\u043e\u043d\u0438\u0442\u044c \u0432\u0430\u0440\u0438\u0430\u043d\u0442 \u0441\u043f\u0440\u0430\u0432\u0430. |
| MergePanel.acceptLeftRightButton.text=\u041f\u0440\u0438\u043d\u044f\u0442\u044c \u043e\u0431\u0430 |
| MergePanel.acceptRightLeftButton.text=\u041f\u0440\u0438\u043d\u044f\u0442\u044c \u043e\u0431\u0430 |
| MergePanel.acceptLeftRightButton.TTtext=\u041f\u0440\u0438\u043d\u044f\u0442\u044c \u043f\u043e\u0441\u043b\u0435\u0434\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u044c \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u0439 \u0441\u043b\u0435\u0432\u0430 \u0438 \u0441\u043f\u0440\u0430\u0432\u0430 |
| MergePanel.acceptRightLeftButton.TTtext=\u041f\u0440\u0438\u043d\u044f\u0442\u044c \u043f\u043e\u0441\u043b\u0435\u0434\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u044c \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u0439 \u0441\u043f\u0440\u0430\u0432\u0430 \u0438 \u0441\u043b\u0435\u0432\u0430. |
| |
