#59591 - Be able to localize "The files are different." VSS output sentence. BLD200506061800
authormentlicher@netbeans.org
Mon, 06 Jun 2005 14:53:07 +0000
changeset 61694da8812f3721
parent 6168 fc7a1defef25
child 6170 8e0d8971da98
#59591 - Be able to localize "The files are different." VSS output sentence.
vcs.profiles.vss/src/org/netbeans/modules/vcs/profiles/vss/config/BundleLocalizedVSS.properties
vcs.profiles.vss/src/org/netbeans/modules/vcs/profiles/vss/config/vss.xml
     1.1 --- a/vcs.profiles.vss/src/org/netbeans/modules/vcs/profiles/vss/config/BundleLocalizedVSS.properties	Mon Jun 06 12:17:42 2005 +0000
     1.2 +++ b/vcs.profiles.vss/src/org/netbeans/modules/vcs/profiles/vss/config/BundleLocalizedVSS.properties	Mon Jun 06 14:53:07 2005 +0000
     1.3 @@ -47,3 +47,6 @@
     1.4  HISTORY_LabelText=Label: \"
     1.5  HISTORY_LabelTextEnd=\"
     1.6  HISTORY_LabelComment=Label comment:\ 
     1.7 +
     1.8 +# Replace with the localized ouput from "ss.exe diff -B <your_modified_file>"
     1.9 +VSS_MSG_FILES_ARE_DIFFERENT=The files are different.
     2.1 --- a/vcs.profiles.vss/src/org/netbeans/modules/vcs/profiles/vss/config/vss.xml	Mon Jun 06 12:17:42 2005 +0000
     2.2 +++ b/vcs.profiles.vss/src/org/netbeans/modules/vcs/profiles/vss/config/vss.xml	Mon Jun 06 14:53:07 2005 +0000
     2.3 @@ -1498,7 +1498,7 @@
     2.4  	  <value>${RUN} diff -B ${QUOTE}${FILE}${QUOTE} ${OPTIONS} ${NUR}</value>
     2.5          </property>
     2.6  	<property name="data.regex">
     2.7 -	  <value>(^The files are different.$)</value>
     2.8 +	  <value>$[? LOCALIZED_PROFILE_COPY] [(^ResourceMsg1(VSS_MSG_FILES_ARE_DIFFERENT)$)] [(^The files are different.$)]</value>
     2.9  	</property>
    2.10  	<property name="ignoreFail">
    2.11  	  <value>true</value>