This commit is contained in:
Christian Paminger
2007-03-21 17:25:37 +00:00
parent eabe715210
commit 8b01694f09
2 changed files with 1 additions and 9 deletions
-8
View File
@@ -19,18 +19,10 @@
<!ENTITY menu-edit:label "Bearbeiten">
<!ENTITY menu-edit:accesskey "B">
<<<<<<< .mine
<!ENTITY menu-edit-undo:key "">
<!ENTITY menu-edit-undo:label "Undo">
<!ENTITY menu-edit-undo:accesskey "">
=======
<!ENTITY menu-edit-undo:key "">
<!ENTITY menu-edit-undo:label "Undo">
<!ENTITY menu-edit-undo:accesskey "">
>>>>>>> .r298
<!ENTITY menu-prefs:label "Einstellungen">
<!ENTITY menu-prefs:accesskey "E">
+1 -1
View File
@@ -1,5 +1,5 @@
<!ENTITY window.title "Tempus">
<!ENTITY window.version "2.0alpha vom 8.Januar 2007">
<!ENTITY window.version "2.0 vom 12.Feb.2007">
<!ENTITY menu-file:label "Datei">