Login | Register
My pages Projects Community openCollabNet

Discussions > commits > svn commit: r336 - trunk/src/org/argouml/i18n/action_de.properties

argouml-de
Discussion topic

Back to topic list

svn commit: r336 - trunk/src/org/argouml/i18n/action_de.properties

Author braunharald
Full name Harald Braun
Date 2010-02-21 01:56:40 PST
Message Author: BraunHarald
Date: 2010-02-21 01:56:39-0800
New Revision: 336

Modified:
   trunk/src/org/argoum​l/i18n/action_de.pro​perties (contents, props changed)

Log:
Changes for Version 0.30

Modified: trunk/src/org/argoum​l/i18n/action_de.pro​perties
Url: http://argouml-de.ti​gris.org/source/brow​se/argouml-de/trunk/​src/org/argouml/i18n​/action_de.propertie​s?view=diff&path​rev=336&r1=335​&r2=336
====================​====================​====================​==================
--- trunk/src/org/argoum​l/i18n/action_de.pro​perties (original)
+++ trunk/src/org/argoum​l/i18n/action_de.pro​perties 2010-02-21 01:56:39-0800
@@ -1,5 +1,18 @@
 # $Id$
-# Copyright (c) 2003 The Regents of the University of California. All
+#******************​********************​********************​********************​
+# Copyright (c) 2009 Contributors - see below
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.o​rg/legal/epl-v10.htm​l
+#
+# Contributors:
+# thn
+#******************​********************​********************​********************​
+#
+# Some portions of this file was previously release using the BSD License:
+#
+# Copyright (c) 2003-2007 The Regents of the University of California. All
 # Rights Reserved. Permission to use, copy, modify, and distribute this
 # software and its documentation without fee, and without a written
 # agreement is hereby granted, provided that the above copyright notice
@@ -66,7 +79,11 @@
 action.cut = Ausschneiden
 action.delete-concurrent-region = L\u00F6sche nebenl\u00E4ufigen Bereich
 action.delete-from-model = Aus Modell entfernen
+<<<<<<< .mine
+action.deploy-profile = Profil Verteilung
+=======
 action.deploy-profile = Profil nutzbar machen
+>>>>>>> .r332
 action.deployment-diagram = Verteilungsdiagramm
 action.design-goals = Designziele...
 action.design-issues = Design-Wichtungen...

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

svn commit: r336 - trunk/src/org/argouml/i18n/action_de.properties braunharald Harald Braun 2010-02-21 01:56:40 PST
Messages per page: