Merge jv
authorMerge Script
Thu, 21 Apr 2016 06:44:46 +0200
branchjv
changeset 16304 1685d6f9384e
parent 16301 5b709afd8d92 (current diff)
parent 16303 70cbae547a41 (diff)
child 16308 7c050515edb6
Merge
Tools__NavigationHistory.st
resources/de.rs
--- a/Tools__NavigationHistory.st	Wed Apr 20 20:23:45 2016 +0100
+++ b/Tools__NavigationHistory.st	Thu Apr 21 06:44:46 2016 +0200
@@ -152,10 +152,10 @@
     "Created: / 03-07-2011 / 13:34:14 / cg"
 !
 
-detect:aBlock ifNone:exeptionalValue
+detect:aBlock ifNone:exceptionalValue
     "backward compatible list protocol"
 
-    ^ items detect:aBlock ifNone:exeptionalValue
+    ^ items detect:aBlock ifNone:exceptionalValue
 
     "Created: / 03-07-2011 / 13:25:37 / cg"
 !
@@ -380,11 +380,11 @@
 !NavigationHistory class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__NavigationHistory.st,v 1.17 2014-03-17 14:03:20 cg Exp $'
+    ^ '$Header$'
 !
 
 version_CVS_jvrany
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__NavigationHistory.st,v 1.17 2014-03-17 14:03:20 cg Exp $'
+    ^ '$Header$'
 !
 
 version_HG
@@ -393,6 +393,6 @@
 !
 
 version_SVN
-    ^ '$Id: Tools__NavigationHistory.st,v 1.17 2014-03-17 14:03:20 cg Exp $'
+    ^ '$Id$'
 ! !
 
--- a/resources/de.rs	Wed Apr 20 20:23:45 2016 +0100
+++ b/resources/de.rs	Thu Apr 21 06:44:46 2016 +0200
@@ -831,6 +831,7 @@
 'Decompile'                                                                                             'Bytecode anzeigen'
 'Default (Current) Directory'                                                                           'Aktuelles Verzeichnis (current directory)'
 'Default Directory'                                                                                     'Startverzeichnis'
+'Default Repository Type'                                                                               'Standard-Repository-Typ'
 'Define Anweisungen'                                                                                    '''define'' Anweisungen'
 'Define Missing Method'                                                                                 'Fehlende Methode definieren'
 'Define additional attributes.'                                                                         'Definieren Sie weitere Attribute.'
@@ -1074,6 +1075,7 @@
 'Fileout && Delete all Changes for Class'                                                               'Klasse in Datei sichern (fileOut) und alle Änderungen dazu entfernen'
 'Fileout && Delete all for Class'                                                                       'Klasse in Datei sichern (fileOut) und alle Änderungen dazu entfernen'
 'Files for Deployment'                                                                                  'Dateien zur Auslieferung'
+'Fill Cache now'                                                                                        'Cache jetzt befüllen'
 'Filter Pattern'                                                                                        'Suchmuster'
 'Filter Text'                                                                                           'Text filtern'
 'Find Class'                                                                                            'Klasse suchen'