Mercurial Mercurial > repos > isabelle / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
src/Tools/jEdit/patches/props
author wenzelm
Wed, 06 Dec 2023 21:28:40 +0100
changeset 79159 05cdedece5a9
parent 73653 d9823224fcfe
child 81297 07f64697408e
permissions -rw-r--r--
merged
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
73653
d9823224fcfe build auxiliary jEdit component in Isabelle/Scala;
wenzelm
parents: 72247
diff changeset 
     1
 
diff -ru jedit5.6.0/jEdit/org/jedit/localization/jedit_en.props jedit5.6.0-patched/jEdit/org/jedit/localization/jedit_en.props
d9823224fcfe build auxiliary jEdit component in Isabelle/Scala;
wenzelm
parents: 72247
diff changeset 
     2
 
--- jedit5.6.0/jEdit/org/jedit/localization/jedit_en.props	2020-09-03 05:31:10.000000000 +0200
d9823224fcfe build auxiliary jEdit component in Isabelle/Scala;
wenzelm
parents: 72247
diff changeset 
     3
 
+++ jedit5.6.0-patched/jEdit/org/jedit/localization/jedit_en.props	2021-05-10 11:02:05.788257753 +0200
71932
65fd0f032a75 updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents: 69838
diff changeset 
     4
 
@@ -1277,8 +1277,7 @@
65329
4f3da52cec02 updated to jedit-5.4.0;
wenzelm
parents:
diff changeset 
     5
 
 	The most likely reason is that the JAR file is corrupt; try\n\
4f3da52cec02 updated to jedit-5.4.0;
wenzelm
parents:
diff changeset 
     6
 
 	reinstalling it. See Utilities->Troubleshooting->Activity Log\n\
4f3da52cec02 updated to jedit-5.4.0;
wenzelm
parents:
diff changeset 
     7
 
 	for a full stack trace.
4f3da52cec02 updated to jedit-5.4.0;
wenzelm
parents:
diff changeset 
     8
 
-plugin-error.start-error=Cannot start: {0}\n\
4f3da52cec02 updated to jedit-5.4.0;
wenzelm
parents:
diff changeset 
     9
 
-	Try updating to a newer version of the plugin.
4f3da52cec02 updated to jedit-5.4.0;
wenzelm
parents:
diff changeset 
    10
 
+plugin-error.start-error=Cannot start: {0}
4f3da52cec02 updated to jedit-5.4.0;
wenzelm
parents:
diff changeset 
    11
 
 plugin-error.already-loaded=Two copies installed. Please remove one of the \
4f3da52cec02 updated to jedit-5.4.0;
wenzelm
parents:
diff changeset 
    12
 
 	two copies.
4f3da52cec02 updated to jedit-5.4.0;
wenzelm
parents:
diff changeset 
    13
 
 plugin-error.dep-jdk=Requires Java {0} or later, but you only have version {1}.
73653
d9823224fcfe build auxiliary jEdit component in Isabelle/Scala;
wenzelm
parents: 72247
diff changeset 
    14
 
Binary files jedit5.6.0/jedit.jar and jedit5.6.0-patched/jedit.jar differ
isabelle