This commit is contained in:
Christian Paminger
2007-03-21 17:24:13 +00:00
parent 2a16a57287
commit eabe715210
+10 -3
View File
@@ -1,6 +1,5 @@
<!ENTITY window.title "Tempus"> <!ENTITY window.title "FASo">
<!ENTITY window.version "2.0alpha vom 8.Januar 2007"> <!ENTITY window.version "0.5 vom 21.Maerz 2007">
<!ENTITY menu-file:label "Datei"> <!ENTITY menu-file:label "Datei">
<!ENTITY menu-file:accesskey "D"> <!ENTITY menu-file:accesskey "D">
@@ -20,10 +19,18 @@
<!ENTITY menu-edit:label "Bearbeiten"> <!ENTITY menu-edit:label "Bearbeiten">
<!ENTITY menu-edit:accesskey "B"> <!ENTITY menu-edit:accesskey "B">
<<<<<<< .mine
<!ENTITY menu-edit-undo:key ""> <!ENTITY menu-edit-undo:key "">
<!ENTITY menu-edit-undo:label "Undo"> <!ENTITY menu-edit-undo:label "Undo">
<!ENTITY menu-edit-undo:accesskey ""> <!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:label "Einstellungen">
<!ENTITY menu-prefs:accesskey "E"> <!ENTITY menu-prefs:accesskey "E">