| # 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. |
| |
| CTL_MenuItem_Merge=\u041e\u0431\u044a\u0435\u0434\u0438\u043d\u0438\u0442\u044c \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f |
| ##MergeAction.java |
| MSG_MERGE_PROGRESS = \u0421\u043b\u0438\u044f\u043d\u0438\u0435... |
| MSG_MERGE_TITLE = \u0421\u043b\u0438\u044f\u043d\u0438\u0435 Mercurial |
| |
| # Capitalized letters used intentionally to emphasize the words in an output window, should be translated |
| MSG_MERGE_NOT_SUPPORTED_INVIEW_INFO = \u0421\u0412\u0415\u0414\u0415\u041d\u0418\u042f. \u0421\u043b\u0438\u044f\u043d\u0438\u0435 \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044f \u0432 \u044d\u0442\u043e\u043c \u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u0438 |
| MSG_MERGE_NOT_SUPPORTED_INVIEW_TITLE = \u0421\u043b\u0438\u044f\u043d\u0438\u0435 Mercurial |
| MSG_MERGE_NOT_SUPPORTED_INVIEW = \u0421\u043b\u0438\u044f\u043d\u0438\u0435 \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044f \u0432 \u044d\u0442\u043e\u043c \u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u0438 |
| |
| MSG_NOTHING_TO_MERGE = \u0414\u043b\u044f \u044d\u0442\u043e\u0433\u043e \u043f\u0440\u043e\u0435\u043a\u0442\u0430 \u043e\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u044e\u0442 \u0434\u0430\u043d\u043d\u044b\u0435 \u0434\u043b\u044f \u043e\u0431\u044a\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u044f. |
| |
| # Capitalized letters used intentionally to emphasize the words in an output window, should be translated |
| MSG_MERGE_INFO = \n\u0421\u0412\u0415\u0414\u0415\u041d\u0418\u042f \u041e \u0421\u041b\u0418\u042f\u041d\u0418\u0418. \u0421\u043f\u043e\u0441\u043e\u0431 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u043a\u0438 \u0444\u0443\u043d\u043a\u0446\u0438\u0438 \u0441\u043b\u0438\u044f\u043d\u0438\u044f |
| |
| MSG_MERGE_UNCOMMITTED = \u041e\u0431\u043d\u0430\u0440\u0443\u0436\u0435\u043d\u044b \u043d\u0435\u0437\u0430\u0444\u0438\u043a\u0441\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0435 \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f.\n\n\u0417\u0430\u0444\u0438\u043a\u0441\u0438\u0440\u0443\u0439\u0442\u0435 \u0438\u0445 \u0434\u043e \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0435\u0433\u043e \u0441\u043b\u0438\u044f\u043d\u0438\u044f. |
| MSG_MERGE_UNAVAILABLE = \u0421\u043b\u0438\u044f\u043d\u0438\u0435 \u043d\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043d\u043e \u0432 \u0441\u0438\u0441\u0442\u0435\u043c\u0435.\n\n \u0421\u0441\u044b\u043b\u043a\u0430 \u043d\u0430 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u043a\u0443 \u0441\u043b\u0438\u044f\u043d\u0438\u044f \u043f\u0440\u0438\u0432\u0435\u0434\u0435\u043d\u0430 \u0432 \u0434\u0438\u0430\u043b\u043e\u0433\u043e\u0432\u043e\u043c \u043e\u043a\u043d\u0435 \u0432\u044b\u0432\u043e\u0434\u0430. |
| # Capitalized letters used intentionally to emphasize the words in an output window, should be translated |
| MSG_MERGE_CONFLICT = INFO MERGE: CONFLICT - {0} |
| # Capitalized letters used intentionally to emphasize the words in an output window, should be translated |
| MSG_MERGE_DONE = \u0421\u0412\u0415\u0414\u0415\u041d\u0418\u042f \u041e \u0421\u041b\u0418\u042f\u041d\u0418\u0418. \u0421\u043b\u0438\u044f\u043d\u0438\u0435 \u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043d\u043e |
| # Capitalized letters used intentionally to emphasize the words in an output window, should be translated |
| MSG_MERGE_DONE_CONFLICTS = \u0421\u0412\u0415\u0414\u0415\u041d\u0418\u042f \u041e \u0421\u041b\u0418\u042f\u041d\u0418\u0418. \u041e\u0431\u043d\u0430\u0440\u0443\u0436\u0435\u043d\u044b \u041a\u041e\u041d\u0424\u041b\u0418\u041a\u0422\u042b, \u0440\u0435\u0448\u0438\u0442\u0435 \u0432\u0440\u0443\u0447\u043d\u0443\u044e \u0438\u043b\u0438 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u044f \u043a\u043e\u043c\u0430\u043d\u0434\u0443 \u043c\u0435\u043d\u044e "\u0420\u0430\u0437\u0440\u0435\u0448\u0438\u0442\u044c \u043a\u043e\u043d\u0444\u043b\u0438\u043a\u0442\u044b" |
| MSG_Merge.ConflictsCreated = \u0412\u043e \u0432\u0440\u0435\u043c\u044f \u0441\u043b\u0438\u044f\u043d\u0438\u044f \u043e\u0431\u043d\u0430\u0440\u0443\u0436\u0435\u043d\u044b \u043a\u043e\u043d\u0444\u043b\u0438\u043a\u0442\u044b. \u0420\u0435\u0448\u0438\u0442\u0435 \u0432\u0440\u0443\u0447\u043d\u0443\u044e \u0438\u043b\u0438 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u044f \u043a\u043e\u043c\u0430\u043d\u0434\u0443 \u043c\u0435\u043d\u044e "\u0420\u0430\u0437\u0440\u0435\u0448\u0438\u0442\u044c \u043a\u043e\u043d\u0444\u043b\u0438\u043a\u0442\u044b" |
| # Capitalized letters used intentionally to emphasize the words in an output window, should be translated |
| MSG_MERGE_WARN_MULTIPLE_HEADS = \u041f\u0420\u0415\u0414\u0423\u041f\u0420\u0415\u0416\u0414\u0415\u041d\u0418\u0415 \u041e \u0421\u041b\u0418\u042f\u041d\u0418\u0418: \u0432 \u0440\u0435\u043f\u043e\u0437\u0438\u0442\u043e\u0440\u0438\u0438 \u043d\u0430\u0445\u043e\u0434\u0438\u0442\u0441\u044f {0} \u043e\u0441\u043d\u043e\u0432\u043d\u044b\u0445 \u0440\u0435\u0434\u0430\u043a\u0446\u0438\u0439: \u0440\u0435\u0434. {1} |
| # Capitalized letters used intentionally to emphasize the words in an output window, should be translated. Do not translate "REV" |
| MSG_MERGE_DONE_MULTIPLE_HEADS = \u0421\u0412\u0415\u0414\u0415\u041d\u0418\u042f \u041e \u0421\u041b\u0418\u042f\u041d\u0418\u0418. \u0412\u044b\u043f\u043e\u043b\u043d\u0438\u0442\u0435 \u0441\u043b\u0438\u044f\u043d\u0438\u0435 \u0441 \u0443\u043a\u0430\u0437\u0430\u043d\u043d\u043e\u0439 \u0440\u0435\u0434\u0430\u043a\u0446\u0438\u0435\u0439, \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u044f \u043a\u043e\u043c\u0430\u043d\u0434\u0443 hg merge [REV] |
| # Capitalized letters used intentionally to emphasize the words in an output window, should be translated |
| MSG_MERGE_FAILED = \u041f\u0420\u0415\u0414\u0423\u041f\u0420\u0415\u0416\u0414\u0415\u041d\u0418\u0415 \u041e \u0421\u041b\u0418\u042f\u041d\u0418\u0418: \u0441\u0431\u043e\u0439 \u043f\u0440\u0438 \u0441\u043b\u0438\u044f\u043d\u0438\u0438 |
| |
| # Capitalized letters used intentionally to emphasize the words in an output window, should be translated |
| MSG_MERGE_WARN_NEEDED = \u041f\u0420\u0415\u0414\u0423\u041f\u0420\u0415\u0416\u0414\u0415\u041d\u0418\u0415 \u041e \u0421\u041b\u0418\u042f\u041d\u0418\u0418: \u0432 \u0440\u0435\u043f\u043e\u0437\u0438\u0442\u043e\u0440\u0438\u0438 \u043d\u0430\u0445\u043e\u0434\u044f\u0442\u0441\u044f 2 \u043e\u0441\u043d\u043e\u0432\u043d\u044b\u0445 \u0440\u0435\u0434\u0430\u043a\u0446\u0438\u0438: \u0440\u0435\u0434. {0} |
| # Capitalized letters used intentionally to emphasize the words in an output window, should be translated |
| MSG_MERGE_DO_NEEDED = \u0421\u0412\u0415\u0414\u0415\u041d\u0418\u042f \u041e \u0421\u041b\u0418\u042f\u041d\u0418\u0418. \u0414\u043b\u044f \u0441\u043b\u0438\u044f\u043d\u0438\u044f \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 \u043a\u043e\u043c\u0430\u043d\u0434\u0443 \u043c\u0435\u043d\u044e "\u0421\u043b\u0438\u044f\u043d\u0438\u0435" |
| MSG_MERGE_WARN_TITLE = \u0422\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0441\u043b\u0438\u044f\u043d\u0438\u0435 |
| MSG_MERGE_WARN_TEXT = \u0412 \u0440\u0435\u043f\u043e\u0437\u0438\u0442\u043e\u0440\u0438\u0438 \u043d\u0430\u0445\u043e\u0434\u0438\u0442\u0441\u044f \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u043e \u043e\u0441\u043d\u043e\u0432\u043d\u044b\u0445 \u0440\u0435\u0434\u0430\u043a\u0446\u0438\u0439, \u0438 \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u043e \u0432\u044b\u043f\u043e\u043b\u043d\u0438\u0442\u044c \u0441\u043b\u0438\u044f\u043d\u0438\u0435\n\u0414\u043b\u044f \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f \u0441\u043b\u0438\u044f\u043d\u0438\u044f \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 \u043a\u043e\u043c\u0430\u043d\u0434\u0443 "\u0421\u043b\u0438\u044f\u043d\u0438\u0435" |
| MSG_MERGE_CHOOSE_REVISION = \u0412\u044b\u0431\u0440\u0430\u0442\u044c \u0438\u0437 \u0440\u0435\u0434\u0430\u043a\u0446\u0438\u0439: |
| |
| MSG_MERGE_REFRESHING_HEAD_VERSIONS = \u041e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435 \u043e\u0441\u043d\u043e\u0432\u043d\u044b\u0445 \u0432\u0435\u0440\u0441\u0438\u0439 |
| MSG_MERGE_HEAD_REVISION_DEFAULT = <\u0440\u0435\u0434\u0430\u043a\u0446\u0438\u044f \u043e\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u0435\u0442> |
| |
| MSG_MERGE_NEEDED_BRANCHES = \u0412 \u0440\u0435\u043f\u043e\u0437\u0438\u0442\u043e\u0440\u0438\u0438 \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u0442\u0441\u044f \u0432\u0435\u0442\u0432\u0438 \u0441 \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u0438\u043c\u0438 \u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043a\u0430\u043c\u0438.\n\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0435\u0442\u044c \u0438\u0445? |
| TITLE_MERGE_NEEDED_BRANCHES = \u0422\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0441\u043b\u0438\u044f\u043d\u0438\u0435 |
| # Capitalized letters used intentionally to emphasize the words in an output window, should be translated |
| MSG_MERGE_WARN_NEEDED_BRANCHES = WARNING MERGE: \u0412 \u043d\u0435\u043a\u043e\u0442\u043e\u0440\u044b\u0445 \u0432\u0435\u0442\u0432\u044f\u0445 \u0440\u0435\u043f\u043e\u0437\u0438\u0442\u043e\u0440\u0438\u044f \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u043e \u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043a\u043e\u0432 |
| # Capitalized letters used intentionally to emphasize the words in an output window, should be translated |
| MSG_MERGE_DO_NEEDED_BRANCHES = INFO MERGE: \u0414\u043b\u044f \u0441\u043b\u0438\u044f\u043d\u0438\u044f \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u043e \u043f\u0435\u0440\u0435\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043d\u0430 \u0432\u0435\u0442\u0432\u044c \u0438 \u0432\u044b\u043f\u043e\u043b\u043d\u0438\u0442\u044c \u0441\u043b\u0438\u044f\u043d\u0438\u0435 \u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043a\u043e\u0432. |
| MSG_MERGE_WARN_NEEDED_IN_BRANCH = \u0412 \u0432\u0435\u0442\u0432\u0438 {0} \u043f\u0440\u0438\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u044e\u0442 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u0435 \u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043a\u0438: |
| |
| ASCD_MERGE_DIALOG=\u041e\u0431\u044a\u0435\u0434\u0438\u043d\u0438\u0442\u044c \u0441 \u0440\u0435\u0434\u0430\u043a\u0446\u0438\u0435\u0439 |
| |
| CTL_MergeForm_Action_Merge=\u0421\u043b\u0438\u044f\u043d\u0438\u0435 |
| ACSD_MergeForm_Action_Merge=\u0421\u043b\u0438\u044f\u043d\u0438\u0435 |
| CTL_MergeForm_Action_Cancel=\u041e\u0442\u043c\u0435\u043d\u0430 |
| ACSD_MergeForm_Action_Cancel=\u041e\u0442\u043c\u0435\u043d\u0430 |
| infoLabel.text = \u041e\u0431\u044a\u0435\u0434\u0438\u043d\u0438\u0442\u044c \u0441\u043e\u0434\u0435\u0440\u0436\u0438\u043c\u043e\u0435 \u0440\u0430\u0431\u043e\u0447\u0435\u0433\u043e \u043a\u0430\u0442\u0430\u043b\u043e\u0433\u0430 \u0441 \u0432\u044b\u0431\u0440\u0430\u043d\u043d\u043e\u0439 \u0440\u0435\u0434\u0430\u043a\u0446\u0438\u0435\u0439 |
| infoLabel2.text = (\u041f\u043e\u0441\u043b\u0435 \u0441\u043b\u0438\u044f\u043d\u0438\u044f \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u043e \u0432\u044b\u043f\u043e\u043b\u043d\u0438\u0442\u044c \u0444\u0438\u043a\u0441\u0430\u0446\u0438\u044e) |
| |