File 3_5_BRANCH.diff of Package kdesdk3

Overview Repositories Revisions Requests Users Attributes Meta

File 3_5_BRANCH.diff of Package kdesdk3 (Revision 1967cde9b264a653b4f111ce7c5957e2)

Currently displaying revision 1967cde9b264a653b4f111ce7c5957e2 , Show latest

--- kbabel/kbabeldict/kbabeldict.desktop
+++ kbabel/kbabeldict/kbabeldict.desktop
@@ -11,7 +11,7 @@
 Name[es]=Diccionario de KBabel
 Name[et]=Sõnaraamat
 Name[eu]=KBabel hiztegia
-Name[fa]=واژه‌نامه KBabel
+Name[fa]=واژه‌نامۀ KBabel
 Name[fi]=KBabel-sanakirja
 Name[fr]=Dictionnaire de KBabel
 Name[ga]=KBabel - Foclóir
@@ -50,7 +50,7 @@
 GenericName[es]=Diccionario de la herramienta de traducción
 GenericName[et]=KBabel'i sõnaraamat
 GenericName[eu]=Itzulpen tresnen hiztegia
-GenericName[fa]=واژه‌نامه ابزار ترجمه
+GenericName[fa]=واژه‌نامۀ ابزار ترجمه
 GenericName[fi]=Käännöstyökalun sanakirja
 GenericName[fr]=Dictionnaire d'un outil de traduction
 GenericName[ga]=Uirlis Aistriúcháin - Foclóir
--- kbabel/kbabeldict/kbabeldict_module.desktop
+++ kbabel/kbabeldict/kbabeldict_module.desktop
@@ -14,7 +14,7 @@
 Comment[es]=Módulo de diccionario para KBabelDict
 Comment[et]=KBabelDicti sõnaraamatumoodul
 Comment[eu]=Hiztegi modulua KBabelDict-entzat
-Comment[fa]=پیمانه واژه‌نامه برای KBabelDict
+Comment[fa]=پیمانۀ واژه‌نامه برای KBabelDict
 Comment[fi]=KBabelDict-ohjelman sanakirjamoduuli
 Comment[fr]=Module de dictionnaire pour KBabelDict
 Comment[ga]=Modúl foclóra le haghaidh KBabelDict
--- kbabel/kbabeldict/modules/pocompendium/pocompendium.desktop
+++ kbabel/kbabeldict/modules/pocompendium/pocompendium.desktop
@@ -12,7 +12,7 @@
 Name[es]=Módulo de compendio de PO para KBabelDict
 Name[et]=KBabelDicti PO kompendiumi moodul
 Name[eu]=PO laburpen modulua KBabelDict-entzat
-Name[fa]=پیمانه مختصر PO برای KBabelDict
+Name[fa]=پیمانۀ مختصر PO برای KBabelDict
 Name[fi]=KBabelDict-ohjelman PO-kokoelmatiedostomoduuli
 Name[fr]=Module de fichier de référence PO pour KBabelDict
 Name[hi]=के-बेबल-डिक्श के लिए पीओ कम्पेंडियम मॉड्यूल
--- kbabel/kbabeldict/modules/dbsearchengine2/dbsearchengine2.desktop
+++ kbabel/kbabeldict/modules/dbsearchengine2/dbsearchengine2.desktop
@@ -13,7 +13,7 @@
 Name[es]=Base de datos de traducciones v2 para KBabelDict
 Name[et]=KBabelDicti tõlgete andmebaas (versioon 2)
 Name[eu]=v2 itzulpen datu-basea KBabelDict-entzat
-Name[fa]=دادگان ترجمه نسخه ۲ برای KBabelDict
+Name[fa]=دادگان ترجمۀ نسخه ۲ برای KBabelDict
 Name[fi]=KBabelDict-ohjelman käännöstietokanta v2
 Name[fr]=Base de données des traductions v2 pour KBabelDict
 Name[ga]=Cuimhne Aistriúcháin (v2) le haghaidh KBabelDict
--- kbabel/kbabeldict/modules/poauxiliary/poauxiliary.desktop
+++ kbabel/kbabeldict/modules/poauxiliary/poauxiliary.desktop
@@ -12,7 +12,7 @@
 Name[es]=Módulo PO auxiliar para KBabelDict
 Name[et]=KBabelDicti PO liitlasfaili moodul
 Name[eu]=PO modulu laguntzailea KBabelDict-entzat
-Name[fa]=پیمانه کمکی PO برای KBabelDict
+Name[fa]=پیمانۀ کمکی PO برای KBabelDict
 Name[fi]=KBabelDict-ohjelman PO-apumoduuli
 Name[fr]=Module de PO auxiliaire pour KBabelDict
 Name[hi]=के-बेबल-डिक्श के लिए ऑक्जिलरी पीओ मॉड्यूल
--- kbabel/kbabeldict/modules/tmx/tmxcompendium.desktop
+++ kbabel/kbabeldict/modules/tmx/tmxcompendium.desktop
@@ -12,7 +12,7 @@
 Name[es]=Módulo de compendio TMX para KBabelDict
 Name[et]=KBabelDicti TMX kompendiumi moodul
 Name[eu]=TMX laburpen modulua KBabelDict-entzat
-Name[fa]=پیمانه مختصر TMX برای KBabelDict
+Name[fa]=پیمانۀ مختصر TMX برای KBabelDict
 Name[fi]=KBabelDict-ohjelman TMX-kokoelmatiedostomoduuli
 Name[fr]=Module de fichier de référence des TMX pour KBabelDict
 Name[hi]=के-बेबल-डिक्श के लिए टीएमएक्स कम्पेंडियम मॉड्यूल
--- kbabel/commonui/kbabel_validator.desktop
+++ kbabel/commonui/kbabel_validator.desktop
@@ -14,7 +14,7 @@
 Comment[es]=Herramienta de datos KDE para KBabel
 Comment[et]=KBabeli KDE andmete tööriist
 Comment[eu]=KBabel-erako KDE aatu tresna 
-Comment[fa]=ابزار داده برای KBabel
+Comment[fa]=ابزار داده KDE برای KBabel
 Comment[fi]=KBabelin KDE Data Tool
 Comment[fr]=Outil de données KDE pour KBabel
 Comment[hi]=के-बेबल के लिए केडीई डाटा औज़ार
--- kbabel/datatools/not-translated/kbabel_nottranslatedtool.desktop
+++ kbabel/datatools/not-translated/kbabel_nottranslatedtool.desktop
@@ -11,7 +11,7 @@
 Name[es]=Comprobar cadenas traducidas con contenido en inglés para KBabel
 Name[et]=KBabeli inglise keelt sisaldavate tõlgitud teadete kontrollija
 Name[eu]=Bilatu ingeles hitzak itzulitako kateen artean KBabel-entzat
-Name[fa]=بررسی برای رشته‌های ترجمه‌شده محتوی انگلیسی برای KBabel
+Name[fa]=بررسی برای رشته‌های ترجمه‌شده حاوی انگلیسی برای KBabel
 Name[fi]=Englantia sisältävien merkkijonojen tarkistus KBabelissa
 Name[fr]=Vérifie si les chaînes traduites contiennent de l'anglais pour KBabel
 Name[hu]=KBabel-eszköz angol nyelvű részek kereséséhez (a lefordított üzenetekben)
@@ -52,7 +52,7 @@
 Comment[es]=Traducciones con contenido en inglés
 Comment[et]=Inglise keelt sisaldavad tõlked
 Comment[eu]=Inglesa duten itzulpenak
-Comment[fa]=ترجمه‌های محتوی انگلیسی
+Comment[fa]=ترجمه‌های حاوی انگلیسی
 Comment[fi]=Käännös sisältää englantia
 Comment[fr]=Traductions contenant de l'anglais
 Comment[he]=תרגומים המכילים אנגלית
--- kbabel/datatools/setfuzzy/kbabel_setfuzzytool.desktop
+++ kbabel/datatools/setfuzzy/kbabel_setfuzzytool.desktop
@@ -11,7 +11,7 @@
 Name[es]=Herramienta de modificación de entradas dudosas para KBabel
 Name[et]=KBabeli kahtlaste teadete lülitamise tööriist
 Name[eu]=Zalantzazko sarreren aldaketa tresna KBabel-entzat
-Name[fa]=ابزار ضامن زدن مبهم برای KBabel
+Name[fa]=زدن ضامن ابزار مبهم برای KBabel
 Name[fi]=KBabel-työkalu sumean tilan vaihtamiseksi
 Name[fr]=Outil d'inversion de fuzzy pour KBabel
 Name[hu]=Ellenőrzési eszköz a KBabelhez
@@ -54,7 +54,7 @@
 Comment[es]=Cambiar todo a dudoso
 Comment[et]=Kõigi teadete määramine kahtlaseks
 Comment[eu]=Ezarri denak zalantzazko bezala
-Comment[fa]=تنظیم همه مبهمها
+Comment[fa]=تنظیم همۀ مبهمها
 Comment[fi]=Aseta kaikki sumeiksi
 Comment[fr]=Mettre tout en fuzzy
 Comment[hi]=सभी फजी नियत करें
--- kbabel/datatools/regexp/kbabel_regexptool.desktop
+++ kbabel/datatools/regexp/kbabel_regexptool.desktop
@@ -10,7 +10,7 @@
 Name[es]=Gramática catalana
 Name[et]=Katalaani grammatika
 Name[eu]=Katalanaren gramatika
-Name[fa]=دستورزبان کاتالان
+Name[fa]=دستور زبان کاتالان
 Name[fi]=Katalaanin kielioppi
 Name[fr]=Grammaire du catalan
 Name[ga]=Gramadach na Catalóinise
--- kbabel/datatools/whitespace/kbabel_whitespacetool.desktop
+++ kbabel/datatools/whitespace/kbabel_whitespacetool.desktop
@@ -11,7 +11,7 @@
 Name[es]=Validador de cadenas traducidas como espacios en blanco.para KBabel
 Name[et]=KBabeli tühimärgiks tõlgitud teadete kontrollija
 Name[eu]=Zurigune bezala itzulitako kateen balidatzailea KBabel-entzat
-Name[fa]=رشته ترجمه‌شده به عنوان اعتبارسنج فاصله سفید برای  KBabel
+Name[fa]=رشتۀ ترجمه‌شده به عنوان اعتبارسنج فاصلۀ سفید برای  KBabel
 Name[fi]=Tyhjeinä käännettyjen merkkijonojen tarkistaja KBabelissa
 Name[fr]=Validateur de chaînes traduites comme des espaces pour KBabel
 Name[hu]=Csak üres karaktereket tartalmazó fordítások kiszűrése a KBabelben
@@ -53,7 +53,7 @@
 Comment[es]=Traducciones de espacios en blanco
 Comment[et]=Tühimärkidest koosnevad tõlked
 Comment[eu]=Zurigune itzulpenak
-Comment[fa]=ترجمه‌های فاصله سفید
+Comment[fa]=ترجمۀ فاصله‌های سفید
 Comment[fi]=Tyhjeiden käännökset
 Comment[fr]=Traductions en espaces
 Comment[he]=תרגומים של תווים נקיים
--- kbabel/filters/gettext/kbabel_gettext_import.desktop
+++ kbabel/filters/gettext/kbabel_gettext_import.desktop
@@ -13,7 +13,7 @@
 Name[es]=Filtro de importación KBabel GNU Gettext
 Name[et]=KBabeli GNU Gettexti impordifilter
 Name[eu]=KBabel GNU gettext inportazio iragazkia
-Name[fa]=پالایه واردات KBabel GNU Gettext
+Name[fa]=پالایۀ واردات KBabel GNU Gettext
 Name[fi]=KBabel GNU Gettext -tuontisuodatin
 Name[fr]=Filtre d'importation GNU Gettext pour KBabel
 Name[ga]=Scagaire Iompórtála Gettext GNU le haghaidh KBabel
--- kbabel/filters/gettext/kbabel_gettext_export.desktop
+++ kbabel/filters/gettext/kbabel_gettext_export.desktop
@@ -13,7 +13,7 @@
 Name[es]=Filtro de exportación KBabel GNU Gettext
 Name[et]=KBabeli GNU Gettexti ekspordifilter
 Name[eu]=KBabel GNU gettext esportazio iragazkia
-Name[fa]=پالایه صادرات KBabel GNU Gettext
+Name[fa]=پالایۀ صادرات KBabel GNU Gettext
 Name[fi]=KBabel GNU Gettext -vientisuodatin
 Name[fr]=filtre d'exportation GNU Gettext pour KBabel
 Name[ga]=Scagaire Easpórtála Gettext GNU le haghaidh KBabel
--- kbabel/filters/xliff/kbabel_xliff_export.desktop
+++ kbabel/filters/xliff/kbabel_xliff_export.desktop
@@ -11,7 +11,7 @@
 Name[es]=Filtro de exportación XLIFF de KBabel
 Name[et]=KBabeli XLIFF ekspordifilter
 Name[eu]=KBabel XLIFF esportazio iragazkia
-Name[fa]=پالایه صادرات XLIFF KBabel 
+Name[fa]=پالایۀ صادرات XLIFF KBabel 
 Name[fi]=KBabel XLIFF -vientisuodatin
 Name[fr]=Filtre d'exportation XLIFF pour KBabel
 Name[ga]=Scagaire Easpórtála XLIFF le haghaidh KBabel
--- kbabel/filters/xliff/kbabel_xliff_import.desktop
+++ kbabel/filters/xliff/kbabel_xliff_import.desktop
@@ -11,7 +11,7 @@
 Name[es]=Filtro de importación de XLIFF de KBabel
 Name[et]=KBabeli XLIFF impordifilter
 Name[eu]=KBabel XLIFF inportazio iragazkia
-Name[fa]=پالایه واردات XLIFF KBabel
+Name[fa]=پالایۀ واردات XLIFF KBabel
 Name[fi]=KBabel XLIFF -tuontisuodatin
 Name[fr]=Filtre d'importation XLIFF pour KBabel
 Name[ga]=Scagaire Iompórtála XLIFF le haghaidh KBabel
--- kbabel/filters/linguist/kbabel_linguist_import.desktop
+++ kbabel/filters/linguist/kbabel_linguist_import.desktop
@@ -13,7 +13,7 @@
 Name[es]=Filtro de importación de lengua KBabel
 Name[et]=KBabeli Linguisti impordifilter
 Name[eu]=KBabel Linguist esportazio iragazkia
-Name[fa]=پالایه واردات زبان شناس KBabel
+Name[fa]=پالایۀ واردات زبان‌شناس KBabel
 Name[fi]=KBabel Linguist -tuontisuodatin
 Name[fr]=Filtre d'importation Linguist pour KBabel
 Name[ga]=Scagaire Iompórtála Linguist le haghaidh KBabel
--- kbabel/filters/linguist/kbabel_linguist_export.desktop
+++ kbabel/filters/linguist/kbabel_linguist_export.desktop
@@ -13,6 +13,7 @@
 Name[es]=Filtro de exportación lingüístico de KBabel
 Name[et]=KBabeli Linguisti ekspordifilter
 Name[eu]=KBabel Linguist esportazio iragazkia
+Name[fa]=پالایۀ صادرات زبان‌شناس KBabel
 Name[fi]=KBabel Linguist -vientisuodatin
 Name[fr]=Filtre d'exportation Linguist pour KBabel
 Name[ga]=Scagaire Easpórtála Linguist le haghaidh KBabel
--- kbabel/addons/preview/pothumbnail.desktop
+++ kbabel/addons/preview/pothumbnail.desktop
@@ -3,7 +3,6 @@
 Type=Service
 Name=Message Catalogs
 Name[af]=Boodskap Katalogusse
-Name[ar]=كتيبات ترجمة التطبيقات
 Name[az]=İsmarış Kataloqu
 Name[bg]=Каталог от съобщения
 Name[br]=Katalogoù c'hemennadoù
--- umbrello/umbrello/umlcanvasobject.cpp
+++ umbrello/umbrello/umlcanvasobject.cpp
@@ -85,7 +85,7 @@
 int UMLCanvasObject::removeAssociation(UMLAssociation * assoc) {
     if(!hasAssociation(assoc) || !m_List.remove(assoc)) {
         kdWarning() << "UMLCanvasObject::removeAssociation: "
-            << "can't find assoc given in list" << endl;
+            << "can't find given assoc in list" << endl;
         return -1;
     }
     emit modified();
@@ -95,17 +95,19 @@
 
 void UMLCanvasObject::removeAllAssociations() {
     UMLObject *o;
-    for (UMLObjectListIt oit(m_List); (o = oit.current()) != NULL; ++oit) {
-        if (o->getBaseType() != Uml::ot_Association)
+    for (UMLObjectListIt oit(m_List); (o = oit.current()) != NULL; ) {
+        if (o->getBaseType() != Uml::ot_Association) {
+            ++oit;
             continue;
+        }
         UMLAssociation *assoc = static_cast<UMLAssociation*>(o);
         //umldoc->slotRemoveUMLObject(assoc);
         UMLObject* objA = assoc->getObject(Uml::A);
         UMLObject* objB = assoc->getObject(Uml::B);
         UMLCanvasObject *roleAObj = dynamic_cast<UMLCanvasObject*>(objA);
-        if (roleAObj)
+        if (roleAObj) {
             roleAObj->removeAssociation(assoc);
-        else if (objA)
+        } else if (objA)
             kdDebug() << "UMLCanvasObject::removeAllAssociations(" << m_Name
                 << "): objA " << objA->getName() << " is not a UMLCanvasObject"
                 << endl;
@@ -113,19 +115,27 @@
             kdDebug() << "UMLCanvasObject::removeAllAssociations(" << m_Name
                 << "): objA is NULL" << endl;
         UMLCanvasObject *roleBObj = dynamic_cast<UMLCanvasObject*>(objB);
-        if (roleBObj)
+        if (roleBObj) {
             roleBObj->removeAssociation(assoc);
-        else if (objB)
+        } else if (objB)
             kdDebug() << "UMLCanvasObject::removeAllAssociations(" << m_Name
                 << "): objB " << objB->getName() << " is not a UMLCanvasObject"
                 << endl;
         else
             kdDebug() << "UMLCanvasObject::removeAllAssociations(" << m_Name
                 << "): objB is NULL" << endl;
-        //delete assoc;  should not do this here, we are only a CLIENT of the assoc
+        m_List.remove(assoc);
+        //delete assoc;  //CHECK: Apparently we crash if doing this. WHY?
     }
 }
 
+void UMLCanvasObject::removeAllChildObjects() {
+    removeAllAssociations();
+    m_List.setAutoDelete(true);
+    m_List.clear();
+    m_List.setAutoDelete(false);
+}
+
 QString UMLCanvasObject::uniqChildName( const Uml::Object_Type type,
                                         bool seekStereo /* = false */ ) {
     QString currentName;
@@ -289,8 +299,10 @@
     bool overallSuccess = UMLObject::resolveRef();
     for (UMLObjectListIt ait(m_List); ait.current(); ++ait) {
         UMLObject *obj = ait.current();
-        if (! obj->resolveRef())
+        if (! obj->resolveRef()) {
+            m_List.remove(obj);
             overallSuccess = false;
+        }
     }
     return overallSuccess;
 }
--- umbrello/umbrello/uniqueid.cpp
+++ umbrello/umbrello/uniqueid.cpp
@@ -1,3 +1,13 @@
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   copyright (C) 2006                                                    *
+ *   Umbrello UML Modeller Authors <uml-devel@ uml.sf.net>                 *
+ ***************************************************************************/
 
 #include "uniqueid.h"
 
--- umbrello/umbrello/classifier.cpp
+++ umbrello/umbrello/classifier.cpp
@@ -572,7 +572,7 @@
     }
     emit attributeRemoved(a);
     emit modified();
-    // If we are deleteing the object, then we don't need to disconnect..this is done auto-magically
+    // If we are deleting the object, then we don't need to disconnect..this is done auto-magically
     // for us by QObject. -b.t.
     // disconnect(a,SIGNAL(modified()),this,SIGNAL(modified()));
     delete a;
--- umbrello/umbrello/object_factory.cpp
+++ umbrello/umbrello/object_factory.cpp
@@ -244,7 +244,7 @@
         if (!stereoID.isEmpty()) {
             UMLDoc *doc = UMLApp::app()->getDocument();
             UMLObject *stereo = doc->findStereotypeById(STR2ID(stereoID));
-            if (stereo->getName() == "folder")
+            if (stereo && stereo->getName() == "folder")
                 pObject = new UMLFolder();
         }
         if (pObject == NULL)
--- umbrello/umbrello/operation.h
+++ umbrello/umbrello/operation.h
@@ -160,7 +160,7 @@
     /**
      * Display the properties configuration dialog for the template.
      */
-    bool showPropertiesDialogue(QWidget* parent);
+    bool showPropertiesDialog(QWidget* parent);
 
     /**
      * Returns whether this operation is a constructor.
--- umbrello/umbrello/enumliteral.cpp
+++ umbrello/umbrello/enumliteral.cpp
@@ -62,7 +62,7 @@
     return true;
 }
 
-bool UMLEnumLiteral::showPropertiesDialogue(QWidget* parent) {
+bool UMLEnumLiteral::showPropertiesDialog(QWidget* parent) {
     bool ok;
     QString name = KInputDialog::getText(i18n("Name"), i18n("Enter name:"), getName(), &ok, parent);
     if ( ok && !name.isEmpty() )  {
--- umbrello/umbrello/umlviewimageexporterall.h
+++ umbrello/umbrello/umlviewimageexporterall.h
@@ -40,7 +40,7 @@
      * bar shows an information message until the export finishes.
      *
      * If something went wrong while exporting, an error dialog is shown to the
-     * user with the error messages explaining the problems occured.
+     * user with the error messages explaining the problems occurred.
      */
     void exportAllViews();

Eigenschaftsänderungen: umbrello/umbrello/refactoring
___________________________________________________________________
Name: svn:ignore
   - *.moc
.libs
Makefile
Makefile.in

+ .deps
librefactoring.la
.libs
Makefile
Makefile.in
*.moc

--- umbrello/umbrello/uml.cpp
+++ umbrello/umbrello/uml.cpp
@@ -36,9 +36,7 @@
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
 #include <ktip.h>
-#if KDE_IS_VERSION(3,1,90)
 #include <ktabwidget.h>
-#endif
 #include <ktoolbarbutton.h>
 #include <kpopupmenu.h>
 
@@ -175,13 +173,8 @@
     editCut = KStdAction::cut(this, SLOT(slotEditCut()), actionCollection());
     editCopy = KStdAction::copy(this, SLOT(slotEditCopy()), actionCollection());
     editPaste = KStdAction::paste(this, SLOT(slotEditPaste()), actionCollection());
-#if KDE_IS_VERSION(3,1,90)
     createStandardStatusBarAction();
     setStandardToolBarMenuEnabled(true);
-#else
-    viewToolBar = KStdAction::showToolbar(this, SLOT(slotViewToolBar()), actionCollection());
-    viewStatusBar = KStdAction::showStatusbar(this, SLOT(slotViewStatusBar()), actionCollection());
-#endif
     selectAll = KStdAction::selectAll(this,  SLOT( slotSelectAll() ), actionCollection());
     fileExportDocbook = new KAction(i18n("&Export model to DocBook"), 0, 
                                     this, SLOT( slotFileExportDocbook() ), 
@@ -218,10 +211,6 @@
     editCut->setToolTip(i18n("Cuts the selected section and puts it to the clipboard"));
     editCopy->setToolTip(i18n("Copies the selected section to the clipboard"));
     editPaste->setToolTip(i18n("Pastes the contents of the clipboard"));
-#if !KDE_IS_VERSION(3,1,90)
-    viewToolBar->setToolTip(i18n("Enables/disables the toolbar"));
-    viewStatusBar->setToolTip(i18n("Enables/disables the statusbar"));
-#endif
     preferences->setToolTip( i18n( "Set the default program preferences") );
 
     deleteSelectedWidget = new KAction( i18n("Delete &Selected"),
@@ -410,7 +399,6 @@
     addToolBar(m_alignToolBar, Qt::DockTop, false);
 
     m_mainDock = createDockWidget("maindock", 0L, 0L, "main dock");
-#if KDE_IS_VERSION(3,1,90)
     m_newSessionButton = NULL;
     m_diagramMenu = NULL;
     m_closeDiagramButton = NULL;
@@ -457,7 +445,6 @@
         m_mainDock->setWidget(m_tabWidget);
     }
     else
-#endif
     {
         m_tabWidget = NULL;
         m_viewStack = new QWidgetStack(m_mainDock, "viewstack");
@@ -531,11 +518,7 @@
     if( m_doc->URL().fileName() == i18n( "Untitled" ) ) {
         m_config -> writeEntry( "lastFile", "" );
     } else {
-#if KDE_IS_VERSION(3,1,3)
         m_config -> writePathEntry( "lastFile", m_doc -> URL().prettyURL() );
-#else
-        m_config -> writeEntry( "lastFile", m_doc -> URL().prettyURL() );
-#endif
     }
     m_config->writeEntry( "imageMimeType", getImageMimeType() );
 
@@ -609,11 +592,7 @@
 
     } else {
         KURL url=m_doc->URL();
-#if KDE_IS_VERSION(3,1,3)
         _config->writePathEntry("filename", url.url());
-#else
-        _config->writeEntry("filename", url.url());
-#endif
         _config->writeEntry("modified", m_doc->isModified());
         QString tempname = kapp->tempSaveName(url.url());
         QString tempurl= KURL::encode_string(tempname);
@@ -1015,11 +994,11 @@
     // changes the clipboard. Work is in progress to make this work with other toolkits
     // as well. (pfeiffer)
     // m_clipTimer = new QTimer(this, "timer");
-    // m_clipTimer->start(1000, FALSE);
+    // m_clipTimer->start(1000, false);
     // connect(m_clipTimer, SIGNAL(timeout()), this, SLOT(slotClipDataChanged()));
 
     m_copyTimer = new QTimer(this, "copytimer");
-    m_copyTimer->start(500, FALSE);
+    m_copyTimer->start(500, false);
     connect(m_copyTimer, SIGNAL(timeout()), this, SLOT(slotCopyChanged()));
 }
 
@@ -1607,11 +1586,9 @@
 }
 
 QWidget* UMLApp::getMainViewWidget() {
-#if KDE_IS_VERSION(3,1,90)
     Settings::OptionState& optionState = Settings::getOptionState();
     if (optionState.generalState.tabdiagrams)
         return m_tabWidget;
-#endif
     return m_viewStack;
 }
 
@@ -1623,6 +1600,9 @@
     kapp->processEvents();
     if (view) {
         slotStatusMsg(view->getName());
+        UMLListViewItem* lvitem = m_listView->findView(view);
+        if (lvitem)
+            m_listView->setCurrentItem(lvitem);
     }
 }
 
@@ -1655,15 +1635,37 @@
 }
 
 void UMLApp::slotChangeTabLeft() {
-#if KDE_IS_VERSION(3,1,90)
-    m_tabWidget->setCurrentPage( m_tabWidget->currentPageIndex() - 1 );
-#endif
+    if (m_tabWidget) {
+        m_tabWidget->setCurrentPage( m_tabWidget->currentPageIndex() - 1 );
+        return;
+    }
+    UMLViewList views = m_doc->getViewIterator();
+    UMLView *currView = m_view;
+    if (views.find(currView) < 0) {
+        kdError() << "UMLApp::slotChangeTabLeft(): currView not found in viewlist" << endl;
+        return;
+    }
+    if ((currView = views.prev()) != NULL)
+        setCurrentView(currView);
+    else
+        setCurrentView(views.last());
 }
 
 void UMLApp::slotChangeTabRight() {
-#if KDE_IS_VERSION(3,1,90)
-    m_tabWidget->setCurrentPage( m_tabWidget->currentPageIndex() + 1 );
-#endif
+    if (m_tabWidget) {
+        m_tabWidget->setCurrentPage( m_tabWidget->currentPageIndex() + 1 );
+        return;
+    }
+    UMLViewList views = m_doc->getViewIterator();
+    UMLView *currView = m_view;
+    if (views.find(currView) < 0) {
+        kdError() << "UMLApp::slotChangeTabRight(): currView not found in viewlist" << endl;
+        return;
+    }
+    if ((currView = views.next()) != NULL)
+        setCurrentView(currView);
+    else
+        setCurrentView(views.first());
 }
 
 void UMLApp::slotMoveTabLeft() {
--- umbrello/umbrello/umlviewimageexportermodel.h
+++ umbrello/umbrello/umlviewimageexportermodel.h
@@ -97,8 +97,8 @@
      * @param directory The url of the directory where the images will be saved.
      * @param useFolders If the tree structure of the views in the document must be created
      *                   in the target directory.
-     * @return A QStringList with all the error messages occured when exporting. If the list
-     *         is empty, all the views were exported successfully.
+     * @return A QStringList with all the error messages that occurred during export.
+     *         If the list is empty, all the views were exported successfully.
      */
     QStringList exportAllViews(const QString &imageType, const KURL &directory, bool useFolders) const;
 
@@ -114,7 +114,7 @@
      * @param view The view to export.
      * @param imageType The type of the image the view will be exported to.
      * @param url The url where the image will be saved.
-     * @return The message error if some problem occured when exporting, or
+     * @return The message error if some problem occurred when exporting, or
      *         QString::null if all went fine.
      */
     QString exportView(UMLView* view, const QString &imageType, const KURL &url) const;
@@ -156,7 +156,7 @@
      * @param imageType The type of the image the view will be exported to.
      * @param fileName The name of the file where the image will be saved.
      * @return True if the operation was successful,
-     *         false if a problem occured while exporting.
+     *         false if a problem occurred while exporting.
      */
     bool exportViewTo(UMLView* view, const QString &imageType, const QString &fileName) const;
 
@@ -168,7 +168,7 @@
      * @param isEPS The file is an eps file and needs adjusting
      *              of the eps bounding box values.
      * @return True if the operation was successful,
-     *         false if a problem occured while exporting.
+     *         false if a problem occurred while exporting.
      */
     bool exportViewToEps(UMLView* view, const QString &fileName, bool isEPS) const;
 
@@ -178,7 +178,7 @@
      * Corrects the bounding box.
      *
      * @return True if the operation was successful,
-     *         false if a problem occured while exporting.
+     *         false if a problem occurred while exporting.
      */
     bool fixEPS(const QString &fileName, QRect rect) const;
 
@@ -188,7 +188,7 @@
      * @param view The view to export.
      * @param fileName The name of the file where the image will be saved.
      * @return True if the operation was successful,
-     *         false if a problem occured while exporting.
+     *         false if a problem occurred while exporting.
      */
     bool exportViewToSvg(UMLView* view, const QString &fileName) const;
 
@@ -200,7 +200,7 @@
      * @param imageType The type of the image the view will be exported to.
      * @param fileName The name of the file where the image will be saved.
      * @return True if the operation was successful,
-     *         false if a problem occured while exporting.
+     *         false if a problem occurred while exporting.
      */
     bool exportViewToPixmap(UMLView* view, const QString &imageType, const QString &fileName) const;
 
--- umbrello/umbrello/umlcanvasobject.h
+++ umbrello/umbrello/umlcanvasobject.h
@@ -188,6 +188,8 @@
     virtual QString uniqChildName(const Uml::Object_Type type,
                                   bool seekStereo = false);
 
+    virtual void removeAllChildObjects();
+
     /**
      * Return the list of subordinate items.
      */
--- umbrello/umbrello/attribute.h
+++ umbrello/umbrello/attribute.h
@@ -104,7 +104,7 @@
     /**
      * Display the properties configuration dialog for the attribute.
      */
-    virtual bool showPropertiesDialogue(QWidget* parent);
+    virtual bool showPropertiesDialog(QWidget* parent);
 
     void setParmKind (Uml::Parameter_Direction pk);
     Uml::Parameter_Direction getParmKind () const;
--- umbrello/umbrello/umldoc.cpp
+++ umbrello/umbrello/umldoc.cpp
@@ -114,10 +114,10 @@
         i18n("Entity Relationship Model")
     };
     for (int i = 0; i < Uml::N_MODELTYPES; i++) {
-        m_root[i] = new UMLFolder(nativeRootName[i]);
+        m_root[i] = new UMLFolder(nativeRootName[i], STR2ID(nativeRootName[i]));
         m_root[i]->setLocalName(localizedRootName[i]);
     }
-    m_datatypeRoot = new UMLFolder("Datatypes");
+    m_datatypeRoot = new UMLFolder("Datatypes", "Datatypes");
     m_datatypeRoot->setLocalName(i18n("Datatypes"));
     m_datatypeRoot->setUMLPackage(m_root[Uml::mt_Logical]);
     m_root[Uml::mt_Logical]->addObject(m_datatypeRoot);
@@ -302,7 +302,7 @@
         for (int i = 0; i < Uml::N_MODELTYPES; i++)
             m_root[i]->removeAllObjects();
         // Restore the datatype folder, it has been deleted above.
-        m_datatypeRoot = new UMLFolder("Datatypes");
+        m_datatypeRoot = new UMLFolder("Datatypes", "Datatypes");
         m_datatypeRoot->setLocalName(i18n("Datatypes"));
         m_datatypeRoot->setUMLPackage(m_root[Uml::mt_Logical]);
         m_root[Uml::mt_Logical]->addObject(m_datatypeRoot);
@@ -852,7 +852,8 @@
 }
 
 UMLStereotype* UMLDoc::findStereotype(const QString &name) {
-    for (UMLStereotype *s = m_stereoList.first(); s; s = m_stereoList.next() ) {
+    UMLStereotype *s;
+    for (UMLStereotypeListIt it(m_stereoList); (s = it.current()) != NULL; ++it) {
         if (s->getName() == name)
             return s;
     }
@@ -1804,7 +1805,10 @@
         }
         if (ot == ot_Stereotype) {
             UMLStereotype *s = static_cast<UMLStereotype*>(pObject);
-            addStereotype(s);
+            if (findStereotype(s->getName()) != NULL)
+                delete s;
+            else
+                addStereotype(s);
             continue;
         }
         pkg->addObject(pObject);
--- umbrello/umbrello/petaltree2uml.cpp
+++ umbrello/umbrello/petaltree2uml.cpp
@@ -86,7 +86,7 @@
  */
 void transferVisibility(const PetalNode *from, UMLObject *to) {
     QString vis = from->findAttribute("exportControl").string;
-    if (vis != QString::null) {
+    if (!vis.isEmpty()) {
         Uml::Visibility v = Uml::Visibility::fromString(clean(vis.lower()));
         to->setVisibility(v);
     }

Eigenschaftsänderungen: umbrello/umbrello/autolayout
___________________________________________________________________
Name: svn:ignore
   - *.moc
.libs
Makefile
Makefile.in

+ .deps
libautolayout.la
.libs
Makefile
Makefile.in
*.moc
newautolayoutdialog.cpp
newautolayoutdialog.h

--- umbrello/umbrello/enumliteral.h
+++ umbrello/umbrello/enumliteral.h
@@ -74,7 +74,7 @@
     /**
      * Display the properties configuration dialog for the enum literal.
      */
-    bool showPropertiesDialogue(QWidget* parent);
+    bool showPropertiesDialog(QWidget* parent);
 
 protected:
     /**
--- umbrello/umbrello/import_rose.cpp
+++ umbrello/umbrello/import_rose.cpp
@@ -167,7 +167,7 @@
     QString result;
     QString line;
     methodName("collectVerbatimText");
-    while ((line = stream.readLine()) != QString::null) {
+    while (!(line = stream.readLine()).isNull()) {
         linum++;
         line = line.stripWhiteSpace();
         if (line.isEmpty() || line.startsWith(")"))
@@ -179,7 +179,7 @@
             result += line.mid(1) + "\n";
         }
     }
-    if (line == QString::null) {
+    if (line.isNull()) {
         kdError() << loc() << "premature EOF" << endl;
         return QString::null;
     }
@@ -276,7 +276,7 @@
         return node;
     PetalNode::NameValueList attrs;
     QString line;
-    while ((line = stream.readLine()) != QString::null) {
+    while (!(line = stream.readLine()).isNull()) {
         linum++;
         line = line.stripWhiteSpace();
         if (line.isEmpty())
@@ -358,13 +358,13 @@
     QString line;
     PetalNode *root = NULL;
     linum = 0;
-    while ((line = stream.readLine()) != QString::null) {
+    while (!(line = stream.readLine()).isNull()) {
         linum++;
         if (line.contains( QRegExp("^\\s*\\(object Petal") )) {
-            while ((line = stream.readLine()) != QString::null && !line.contains(')')) {
+            while (!(line = stream.readLine()).isNull() && !line.contains(')')) {
                 linum++; // CHECK: do we need petal version info?
             }
-            if (line == QString::null)
+            if (line.isNull())
                 break;
         } else {
             QRegExp objectRx("^\\s*\\(object ");
--- umbrello/umbrello/attribute.cpp
+++ umbrello/umbrello/attribute.cpp
@@ -238,7 +238,7 @@
     return true;
 }
 
-bool UMLAttribute::showPropertiesDialogue(QWidget* parent) {
+bool UMLAttribute::showPropertiesDialog(QWidget* parent) {
     UMLAttributeDialog dialog(parent, this);
     return dialog.exec();
 }
--- umbrello/umbrello/classifierlistitem.h
+++ umbrello/umbrello/classifierlistitem.h
@@ -108,7 +108,7 @@
      * @param parent    The parent widget.
      * @return  True for success of this operation.
      */
-    virtual bool showPropertiesDialogue(QWidget* parent) = 0;
+    virtual bool showPropertiesDialog(QWidget* parent) = 0;
 
     /**
      * Copy the internal presentation of this object into the new

Eigenschaftsänderungen: umbrello/umbrello/clipboard
___________________________________________________________________
Name: svn:ignore
   - *.moc
.libs
Makefile
Makefile.in

+ .deps
libclipboard.la
.libs
Makefile
Makefile.in
*.moc

--- umbrello/umbrello/codegenerators/javaantcodedocument.cpp
+++ umbrello/umbrello/codegenerators/javaantcodedocument.cpp
@@ -172,7 +172,7 @@
                                                     loadCheckForChildrenOK= true;
                                             }
                 /*
-                                                // only needed for extreme debuging conditions (E.g. making new codeclassdocument loader)
+                                                // only needed for extreme debugging conditions (E.g. making new codeclassdocument loader)
                                                 else
                                                         kdDebug()<<" LoadFromXMI: Got strange tag in text block stack:"<<name<<", ignorning"<<endl;
                 */
--- umbrello/umbrello/codegenerators/cppwriter.cpp
+++ umbrello/umbrello/codegenerators/cppwriter.cpp
@@ -552,8 +552,6 @@
 
     }
 
-    return;
-
 }
 
 void CppWriter::writeHeaderAttributeAccessorMethods (Uml::Visibility visibility, bool writeStatic, QTextStream &stream )
@@ -585,9 +583,16 @@
         break;
     }
 
+    // switch to public
+    if (visibility != Uml::Visibility::Public)
+        stream << "public:" << m_endl << m_endl;
+
     // write accessor methods for attribs we found
     writeAttributeMethods(list, visibility, true, false, INLINE_ATTRIBUTE_METHODS, stream);
 
+    // switch back to previous vis.
+    if (visibility != Uml::Visibility::Public)
+        stream << visibility.toString() << ":" << m_endl << m_endl;
 }
 
 // this is for writing *source* or *header* file attribute methods
--- umbrello/umbrello/codegenerators/cppsourcecodedocument.cpp
+++ umbrello/umbrello/codegenerators/cppsourcecodedocument.cpp
@@ -160,7 +160,7 @@
     methodsBlock->addCodeClassFieldMethods(aggregationClassFields);
     methodsBlock->addCodeClassFieldMethods(compositionClassFields);
 
-    // constuctors and other operations are handled by the "addCodeOperation" method above.
+    // constructors and other operations are handled by the "addCodeOperation" method above.
 
 }
 
--- umbrello/umbrello/codegenerators/tclwriter.cpp
+++ umbrello/umbrello/codegenerators/tclwriter.cpp
@@ -370,7 +370,7 @@
 void
 TclWriter::writeComm(QString text)
 {
-    QStringList     lines = QStringList::split("\n", text, TRUE);
+    QStringList     lines = QStringList::split("\n", text, true);
     for (uint i = 0; i < lines.count(); i++) {
         *mStream << getIndent() << "# " << lines[i] << m_endl;
     }
@@ -379,7 +379,7 @@
 void
 TclWriter::writeDocu(QString text)
 {
-    QStringList     lines = QStringList::split("\n", text, TRUE);
+    QStringList     lines = QStringList::split("\n", text, true);
     for (uint i = 0; i < lines.count(); i++) {
         *mStream << getIndent() << "## " << lines[i] << m_endl;
     }
@@ -613,7 +613,7 @@
     } else {
         QString         fieldVarName = roleName.lower();
 
-        // record unique occurances for later when we want to check
+        // record unique occurrences for later when we want to check
         // for initialization of this vector
         if (VectorFieldVariables.findIndex(fieldVarName) == -1)
             VectorFieldVariables.append(fieldVarName);
--- umbrello/umbrello/codegenerators/cppheadercodeoperation.cpp
+++ umbrello/umbrello/codegenerators/cppheadercodeoperation.cpp
@@ -80,8 +80,8 @@
     QString comment = o->getDoc();
     if(comment.isEmpty() && getContentType() == CodeBlock::AutoGenerated)
     {
-        UMLAttributeList* paramaters = o->getParmList();
-        for(UMLAttributeListIt iterator(*paramaters); iterator.current(); ++iterator) {
+        UMLAttributeList* parameters = o->getParmList();
+        for(UMLAttributeListIt iterator(*parameters); iterator.current(); ++iterator) {
             comment += endLine + "@param " + iterator.current()->getName() + " ";
             comment += iterator.current()->getDoc();
         }

Eigenschaftsänderungen: umbrello/umbrello/codegenerators
___________________________________________________________________
Name: svn:ignore
   - *.moc
.libs
Makefile
Makefile.in

+ cppcodegenerationformbase.cpp
cppcodegenerationformbase.h
.deps
javacodegenerationformbase.cpp
javacodegenerationformbase.h
libcodegenerator.la
.libs
Makefile
Makefile.in
*.moc
rubycodegenerationformbase.cpp
rubycodegenerationformbase.h

--- umbrello/umbrello/configurable.cpp
+++ umbrello/umbrello/configurable.cpp
@@ -31,7 +31,7 @@
 Configurable::Configurable() :
         _plugins()
 {
-    _plugins.setAutoDelete(FALSE);
+    _plugins.setAutoDelete(false);
 }
 
 Configurable::~Configurable()
--- umbrello/umbrello/entityattribute.cpp
+++ umbrello/umbrello/entityattribute.cpp
@@ -168,7 +168,7 @@
     return true;
 }
 
-bool UMLEntityAttribute::showPropertiesDialogue(QWidget* parent) {
+bool UMLEntityAttribute::showPropertiesDialog(QWidget* parent) {
     UMLEntityAttributeDialog dialog(parent, this);
     return dialog.exec();
 }
--- umbrello/umbrello/dialogs/exportallviewsdialog.h
+++ umbrello/umbrello/dialogs/exportallviewsdialog.h
@@ -41,7 +41,7 @@
      *
      * @see QDialog::QDialog
      */
-    ExportAllViewsDialog(QWidget* parent = 0, const char* name = 0, bool modal = FALSE,
+    ExportAllViewsDialog(QWidget* parent = 0, const char* name = 0, bool modal = false,
                          WFlags fl = 0, QString defaultMimeType = "image/png");
 
     /**
--- umbrello/umbrello/dialogs/codeeditor.cpp
+++ umbrello/umbrello/dialogs/codeeditor.cpp
@@ -777,9 +777,9 @@
     m_parentDlg = parentDlg;
     m_parentDoc = parentDoc;
 
-    setUndoRedoEnabled( FALSE );
+    setUndoRedoEnabled( false );
     setCursor( QCursor( 0 ) );
-    setMouseTracking( TRUE );
+    setMouseTracking( true );
     setReadOnly (true);
     m_isHighlighted = getState().blocksAreHighlighted;
     m_showHiddenBlocks = getState().showHiddenBlocks;
--- umbrello/umbrello/dialogs/classifierlistpage.cpp
+++ umbrello/umbrello/dialogs/classifierlistpage.cpp
@@ -499,7 +499,7 @@
         return;
     }
 
-    if( listItem->showPropertiesDialogue(this) ) {
+    if( listItem->showPropertiesDialog(this) ) {
         m_pItemListLB->changeItem( listItem->getName(), m_pItemListLB->index(item) );
     }
 }
--- umbrello/umbrello/dialogs/codeviewerdialog.h
+++ umbrello/umbrello/dialogs/codeviewerdialog.h
@@ -45,7 +45,7 @@
 public:
 
     CodeViewerDialog ( QWidget* parent, CodeDocument * doc, Settings::CodeViewerState state,
-                       const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+                       const char* name = 0, bool modal = false, WFlags fl = 0 );
     ~CodeViewerDialog ();
 
     /** return the code viewer state */

Eigenschaftsänderungen: umbrello/umbrello/dialogs
___________________________________________________________________
Name: svn:ignore
   - *.moc
.libs
Makefile
Makefile.in
codegenerationoptionsbase.cpp
codegenerationoptionsbase.h
codegenerationwizardbase.cpp
codegenerationwizardbase.h
configgeneratorsbase.cpp
configgeneratorsbase.h
sellanguagesbase.cpp
sellanguagesbase.h

+ codegenerationoptionsbase.cpp
codegenerationoptionsbase.h
codegenerationpolicybase.cpp
codegenerationpolicybase.h
codegenerationwizardbase.cpp
codegenerationwizardbase.h
codeviewerdialogbase.cpp
codeviewerdialogbase.h
codevieweroptionsbase.cpp
codevieweroptionsbase.h
configgeneratorsbase.cpp
configgeneratorsbase.h
.deps
diagrampropertiespage.cpp
diagrampropertiespage.h
exportallviewsdialogbase.cpp
exportallviewsdialogbase.h
libdialogs.la
.libs
Makefile
Makefile.in
*.moc
sellanguagesbase.cpp
sellanguagesbase.h
umlrolepropertiesbase.cpp
umlrolepropertiesbase.h

--- umbrello/umbrello/stereotype.h
+++ umbrello/umbrello/stereotype.h
@@ -85,7 +85,7 @@
      * Display the properties configuration dialog for the stereotype
      * (just a line edit).
      */
-    bool showPropertiesDialogue(QWidget* parent);
+    bool showPropertiesDialog(QWidget* parent);
 
 protected:
     /**
--- umbrello/umbrello/folder.cpp
+++ umbrello/umbrello/folder.cpp
@@ -338,8 +338,11 @@
             //CHECK: Umbrello currently assumes that nested elements
             // are ownedElements anyway.
             // Therefore these tags are not further interpreted.
-            if (! load(tempElement))
-                return false;
+            if (! load(tempElement)) {
+                kdDebug() << "An error happened while loading the " << type
+                    << " of the " << m_Name << endl;
+                totalSuccess = false;
+            }
             continue;
         } else if (type == "XMI.extension") {
             for (QDomNode xtnode = node.firstChild(); !xtnode.isNull();
--- umbrello/umbrello/template.h
+++ umbrello/umbrello/template.h
@@ -92,7 +92,7 @@
      *
      * @return  Success status.
      */
-    bool showPropertiesDialogue(QWidget* parent);
+    bool showPropertiesDialog(QWidget* parent);
 
     /**
      * Writes the <UML:TemplateParameter> XMI element.
--- umbrello/umbrello/stereotype.cpp
+++ umbrello/umbrello/stereotype.cpp
@@ -63,7 +63,7 @@
     qElement.appendChild( stereotypeElement );
 }
 
-bool UMLStereotype::showPropertiesDialogue(QWidget* parent) {
+bool UMLStereotype::showPropertiesDialog(QWidget* parent) {
     bool ok;
     QString name = KInputDialog::getText(i18n("Stereotype"), i18n("Enter name:"), getName(),&ok, parent);
     if (ok) {
--- umbrello/umbrello/template.cpp
+++ umbrello/umbrello/template.cpp
@@ -91,7 +91,7 @@
     return true;
 }
 
-bool UMLTemplate::showPropertiesDialogue(QWidget* parent) {
+bool UMLTemplate::showPropertiesDialog(QWidget* parent) {
     UMLTemplateDialog dialog(parent, this);
     return dialog.exec();
 }
--- umbrello/umbrello/umlviewimageexporter.h
+++ umbrello/umbrello/umlviewimageexporter.h
@@ -45,7 +45,7 @@
      * The status bar shows an information message until the export finishes.
      *
      * If something went wrong while exporting, an error dialog is shown to the
-     * user with the error message explaining the problem occured.
+     * user with the error message explaining the problem that happened.
      */
     void exportView();
 
--- umbrello/umbrello/umllistview.h
+++ umbrello/umbrello/umllistview.h
@@ -183,6 +183,13 @@
     UMLListViewItem * findUMLObject(const UMLObject *p) const;
 
     /**
+     * Searches through the tree for the item which represents the diagram given
+     * @param the diagram to search for
+     * @return the item which represents the diagram
+     */
+    UMLListViewItem * findView(UMLView *v);
+
+    /**
      * Searches through the tree for the item with the given ID.
      *
      * @param id                The ID to search for.
@@ -325,13 +332,6 @@
     UMLListViewItem * findUMLObjectInFolder(UMLListViewItem *item, UMLObject *o);
 
     /**
-     * Searches through the tree for the item which represents the diagram given
-     * @param the diagram to search for
-     * @return the item which represents the diagram
-     */
-    UMLListViewItem * findView(UMLView *v);
-
-    /**
      * Return true if the given list view type can be expanded/collapsed.
      */
     static bool isExpandable(Uml::ListView_Type lvt);
--- umbrello/umbrello/package.h
+++ umbrello/umbrello/package.h
@@ -69,6 +69,7 @@
 
     /**
      * Removes an object from this package.
+     * Does not physically delete the object.
      *
      * @param pObject   Pointer to the UMLObject to be removed.
      */
--- umbrello/umbrello/package.cpp
+++ umbrello/umbrello/package.cpp
@@ -76,17 +76,23 @@
 }
 
 void UMLPackage::removeObject(const UMLObject *pObject) {
-    m_objects.remove( pObject );
+    if (pObject->getBaseType() == Uml::ot_Association) {
+        UMLObject *o = const_cast<UMLObject*>(pObject);
+        UMLAssociation *assoc = static_cast<UMLAssociation*>(o);
+        UMLCanvasObject::removeAssociation(assoc);
+    } else {
+        m_objects.remove(pObject);
+    }
 }
 
 void UMLPackage::removeAllObjects() {
-    UMLCanvasObject::removeAllAssociations();
+    UMLCanvasObject::removeAllChildObjects();
     UMLObject *o;
     for (UMLObjectListIt oit(m_objects); (o = oit.current()) != NULL; ++oit) {
         UMLPackage *pkg = dynamic_cast<UMLPackage*>(o);
         if (pkg)
             pkg->removeAllObjects();
-        //delete o;
+        delete o;
     }
     m_objects.clear();
 }
@@ -184,8 +190,10 @@
     bool overallSuccess = UMLCanvasObject::resolveRef();
     for (UMLObjectListIt oit(m_objects); oit.current(); ++oit) {
         UMLObject *obj = oit.current();
-        if (! obj->resolveRef())
+        if (! obj->resolveRef()) {
+            m_objects.remove(obj);
             overallSuccess = false;
+        }
     }
     return overallSuccess;
 }
--- umbrello/umbrello/enum.cpp
+++ umbrello/umbrello/enum.cpp
@@ -62,7 +62,7 @@
     bool goodName = false;
 
     while (ok && !goodName) {
-        ok = newEnumLiteral->showPropertiesDialogue( UMLApp::app() );
+        ok = newEnumLiteral->showPropertiesDialog( UMLApp::app() );
         QString name = newEnumLiteral->getName();
 
         if(name.length() == 0) {
--- umbrello/umbrello/classifier.h
+++ umbrello/umbrello/classifier.h
@@ -191,7 +191,7 @@
 
     /**
      * Checks whether an operation is valid based on its signature -
-     * An operation is "valid" if the operation's name and paramter list
+     * An operation is "valid" if the operation's name and parameter list
      * are unique in the classifier.
      *
      * @param name              Name of the operation to check.
--- umbrello/umbrello/entityattribute.h
+++ umbrello/umbrello/entityattribute.h
@@ -152,9 +152,9 @@
     void saveToXMI(QDomDocument& qDoc, QDomElement& qElement);
 
     /**
-     * Display the properties configuration dialogue for the entityattribute.
+     * Display the properties configuration dialog for the entityattribute.
      */
-    bool showPropertiesDialogue(QWidget* parent);
+    bool showPropertiesDialog(QWidget* parent);
 
 protected:
     /**
--- umbrello/umbrello/x-umbrello.desktop
+++ umbrello/umbrello/x-umbrello.desktop
@@ -17,7 +17,7 @@
 Comment[es]=Archivo del modeladore UML Umbrello
 Comment[et]=Umbrello UML-fail
 Comment[eu]=Umbrello UML modelatzaile fitxategia
-Comment[fa]=پرونده مدل‌ساز Umbrello UML
+Comment[fa]=پروندۀ مدل‌ساز Umbrello UML
 Comment[fi]=Umbrello UML -mallinnustiedosto
 Comment[fr]=Fichier du modeleur UML Umbrello
 Comment[ga]=Comhad le haghaidh an Mhúnlóra UML Umbrello
--- umbrello/umbrello/umllistview.cpp
+++ umbrello/umbrello/umllistview.cpp
@@ -106,7 +106,7 @@
     setItemsRenameable( true );
     setSelectionModeExt(FileManager);
     setFocusPolicy(QWidget::StrongFocus);
-    setDragEnabled(TRUE);
+    setDragEnabled(true);
     setColumnWidthMode( 0, Manual );
     setDefaultRenameAction( Accept );
     setResizeMode( LastColumn );
@@ -129,6 +129,7 @@
     m_rv = NULL;
     for (int i = 0; i < Uml::N_MODELTYPES; i++)
         m_lv[i] = NULL;
+    m_datatypeFolder = NULL;
     //setup slots/signals
     connect(this, SIGNAL(dropped(QDropEvent *, QListViewItem *, QListViewItem *)),
             this, SLOT(slotDropped(QDropEvent *, QListViewItem *, QListViewItem *)));
@@ -850,11 +851,11 @@
 QDragObject* UMLListView::dragObject() {
     UMLListViewItemList selecteditems;
     getSelectedItems(selecteditems);
-    selecteditems.setAutoDelete( FALSE );
+    selecteditems.setAutoDelete( false );
     UMLListViewItemListIt it(selecteditems);
     UMLListViewItem * item = 0;
     UMLListViewItemList  list;
-    list.setAutoDelete( FALSE );
+    list.setAutoDelete( false );
     while((item=it.current()) != 0) {
         ++it;
         Uml::ListView_Type type = item->getType();
@@ -1481,7 +1482,7 @@
 }
 
 int UMLListView::getSelectedItems(UMLListViewItemList &ItemList) {
-    ItemList.setAutoDelete( FALSE );
+    ItemList.setAutoDelete( false );
     QListViewItemIterator it(this);
     // iterate through all items of the list view
     for ( ; it.current(); ++it ) {
@@ -1496,7 +1497,7 @@
 }
 
 int UMLListView::getSelectedItemsRoot(UMLListViewItemList &ItemList) {
-    ItemList.setAutoDelete( FALSE );
+    ItemList.setAutoDelete( false );
     QListViewItemIterator it(this);
 
     // iterate through all items of the list view
@@ -1802,13 +1803,10 @@
 }
 
 void UMLListView::addNewItem(UMLListViewItem *parentItem, Uml::ListView_Type type) {
-    QString name;
+     if (type == Uml::lvt_Datatype) {
+         parentItem = m_datatypeFolder;
+     }
 
-    //// CHECK: Why?
-    // if (type == Uml::lvt_Datatype) {
-    //     parentItem = m_datatypeFolder;
-    // }
-
     UMLPackage *parentPkg = dynamic_cast<UMLPackage*>(parentItem->getUMLObject());
     if (parentPkg == NULL)
         kdError() << "UMLListView::addNewItem(type " << type
@@ -1818,6 +1816,7 @@
 
     Uml::Icon_Type icon = Model_Utils::convert_LVT_IT(type);
 
+    QString name;
     if (Model_Utils::typeIsDiagram(type)) {
         Uml::Diagram_Type dt = Model_Utils::convert_LVT_DT(type);
         name = getUniqueDiagramName(dt);
@@ -2346,6 +2345,7 @@
                 if (parentPkg == NULL) {
                     kdError() << pfx << "umlParent(" << umlParent << ") is not a UMLPackage"
                         << endl;
+                    domElement = node.toElement();
                     continue;
                 }
                 UMLFolder *f = new UMLFolder(label, nID);
@@ -2426,10 +2426,12 @@
                 // one of the default predefined folders, but the actual
                 // listview item might be located in a user created folder.
                 // Thanks to Achim Spangler for spotting the problem.
+                UMLListViewItem *itmParent = dynamic_cast<UMLListViewItem*>(item->parent());
+                kdDebug() << pfx << parent->getText() << " (" << parent << ") != "
+                    << itmParent->getText() << " (" << itmParent << ")" << endl;
                 UMLListViewItem *newItem = moveObject(nID, lvType, parent);
                 item = newItem;
                 if (item) {
-                    UMLListViewItem *itmParent = dynamic_cast<UMLListViewItem*>(item->parent());
                     kdDebug() << pfx << "Attempted reparenting of " << item->getText()
                         << "(current parent: " << (itmParent ? itmParent->getText() : "NULL")
                         << ", new parent: " << parent->getText() << ")" << endl;
@@ -2576,7 +2578,8 @@
     if ( !parent ) {
         return;
     }
-
+    if (parent == m_lv[Uml::mt_Logical])
+        m_datatypeFolder = NULL;
     while ( parent->firstChild() ) {
         delete parent->firstChild();
     }
--- umbrello/umbrello/main.cpp
+++ umbrello/umbrello/main.cpp
@@ -77,7 +77,7 @@
 
 /**
  * Export all the views in the document using the command line args set by the user.
- * The errors occured while exporting, if any, are shown using kdError().
+ * Errors that occurred while exporting, if any, are shown using kdError().
  *
  * @param args The command line arguments given.
  * @param exportOpt A list containing all the "export" arguments given.
--- umbrello/umbrello/operation.cpp
+++ umbrello/umbrello/operation.cpp
@@ -276,7 +276,7 @@
     return m_bConst;
 }
 
-bool UMLOperation::showPropertiesDialogue(QWidget* parent) {
+bool UMLOperation::showPropertiesDialog(QWidget* parent) {
     UMLOperationDialog dialog(parent, this);
     return dialog.exec();
 }

Eigenschaftsänderungen: umbrello/umbrello/docgenerators
___________________________________________________________________
Name: svn:ignore
   + .deps
libdocgenerators.la
.libs
Makefile
Makefile.in
*.moc
umbodoc

--- umbrello/umbrello/codeimport/javaimport.cpp
+++ umbrello/umbrello/codeimport/javaimport.cpp
@@ -82,7 +82,7 @@
 }
 
 
-///Spawn off an import of the specifed file
+///Spawn off an import of the specified file
 void JavaImport::spawnImport( QString file ) {
     // if the file is being parsed, don't bother
     //
@@ -212,7 +212,7 @@
     s_parseDepth--;
     if ( s_parseDepth <= 0 ) {
         // if the user decides to clear things out and reparse, we need
-        // to honour the request, so reset things for next time.
+        // to honor the request, so reset things for next time.
         s_filesAlreadyParsed.clear();
         s_parseDepth = 0;
     }
--- umbrello/umbrello/codeimport/pythonimport.cpp
+++ umbrello/umbrello/codeimport/pythonimport.cpp
@@ -118,7 +118,7 @@
         skipStmt("{");
     int braceNesting = 0;
     QString token;
-    while ((token = advance()) != QString::null) {
+    while (!(token = advance()).isNull()) {
         if (token == "}") {
             if (braceNesting <= 0)
                 break;
--- umbrello/umbrello/codeimport/adaimport.cpp
+++ umbrello/umbrello/codeimport/adaimport.cpp
@@ -189,7 +189,7 @@
         return true;
     }
     if (keyword == "type") {
-        const QString& name = advance();
+        QString name = advance();
         if (advance() == "(") {
             kdDebug() << "AdaImport::parseFile(" << name << "): "
                 << "discriminant handling is not yet implemented" << endl;
@@ -266,10 +266,11 @@
             const bool isExtension = (advance() == "with");
             Uml::Object_Type t = (isExtension || m_isAbstract ? Uml::ot_Class
                                                               : Uml::ot_Datatype);
+            if (t == Uml::ot_Datatype)
+                name.remove("Standard.", false);
             UMLObject *ns = Import_Utils::createUMLObject(t, base, NULL);
             UMLClassifier *parent = static_cast<UMLClassifier*>(ns);
-            ns = Import_Utils::createUMLObject(Uml::ot_Class, name,
-                                               m_scope[m_scopeIndex], m_comment);
+            ns = Import_Utils::createUMLObject(t, name, m_scope[m_scopeIndex], m_comment);
             if (isExtension) {
                 QString nextLexeme = advance();
                 if (nextLexeme == "null" || nextLexeme == "record") {
@@ -365,10 +366,11 @@
             } else {
                 typeName = direction;  // In Ada, the default direction is "in"
             }
+            typeName.remove("Standard.", false);
             if (op == NULL) {
                 // In Ada, the first parameter indicates the class.
                 UMLDoc *umldoc = UMLApp::app()->getDocument();
-                UMLObject *type = umldoc->findUMLObject(typeName, Uml::ot_Class, m_scope[m_scopeIndex]);
+                UMLObject *type = umldoc->findUMLObject(typeName, Uml::ot_UMLObject, m_scope[m_scopeIndex]);
                 if (type == NULL) {
                     kdError() << "importAda: cannot find UML object for " << typeName << endl;
                     skipStmt();
@@ -413,6 +415,7 @@
                 return false;
             }
             returnType = advance();
+            returnType.remove("Standard.", false);
         }
         bool isAbstract = false;
         if (advance() == "is" && advance() == "abstract")
--- umbrello/umbrello/codeimport/kdevcppparser/driver.cpp
+++ umbrello/umbrello/codeimport/kdevcppparser/driver.cpp
@@ -57,7 +57,7 @@
 
 
 Driver::Driver()
-    : depresolv( FALSE ), lexer( 0 )
+    : depresolv( false ), lexer( 0 )
 {
     m_sourceProvider = new DefaultSourceProvider();
 }

Eigenschaftsänderungen: umbrello/umbrello/codeimport/kdevcppparser
___________________________________________________________________
Name: svn:ignore
   - .libs
Makefile
Makefile.in
tokenizer.cc

+ .deps
libkdevcppparser.la
.libs
Makefile
Makefile.in
tokenizer.cc

--- umbrello/umbrello/codeimport/import_utils.cpp
+++ umbrello/umbrello/codeimport/import_utils.cpp
@@ -182,8 +182,9 @@
             Uml::Object_Type t = type;
             if (type == Uml::ot_UMLObject || isAdorned)
                 t = Uml::ot_Class;
-            origType = Object_Factory::createUMLObject(t, typeName, parentPkg);
+            origType = Object_Factory::createUMLObject(t, typeName, parentPkg, false);
             bNewUMLObjectWasCreated = true;
+            bPutAtGlobalScope = false;
         }
         if (isConst || isAdorned) {
             // Create the full given type (including adornments.)
@@ -245,7 +246,7 @@
         << owner->getName() << " (object type " << ot << ")" << endl;
         return NULL;
     }
-    UMLObject *o = owner->findChildObject(name);
+    UMLObject *o = owner->findChildObject(name, Uml::ot_Attribute);
     if (o) {
         return o;
     }

Eigenschaftsänderungen: umbrello/umbrello/codeimport
___________________________________________________________________
Name: svn:ignore
   + .deps
libcodeimport.la
.libs
Makefile
Makefile.in

--- umbrello/umbrello/umlview.cpp
+++ umbrello/umbrello/umlview.cpp
@@ -159,8 +159,8 @@
     canvas() -> setUpdatePeriod( -1 );
     resizeContents(defaultCanvasSize, defaultCanvasSize);
     canvas() -> resize(defaultCanvasSize, defaultCanvasSize);
-    setAcceptDrops(TRUE);
-    viewport() -> setAcceptDrops(TRUE);
+    setAcceptDrops(true);
+    viewport() -> setAcceptDrops(true);
     setDragAutoScroll(false);
 
     viewport() -> setMouseTracking(false);
--- umbrello/make-umbrello-release.sh
+++ umbrello/make-umbrello-release.sh
@@ -1,40 +1,66 @@
-#!/bin/bash
-export CVSROOT=:ext:jriddell@cvs.kde.org:/home/kde
-export KDETAG=KDE_3_4_0_ALPHA_1
-export UMBRELLO_VERSION=1.4.0alpha1
-cvs export -l -r $KDETAG kdesdk
-cvs export -l -r $KDETAG kdesdk/doc
-cvs export -r $KDETAG kdesdk/doc/umbrello 
-cvs export -r $KDETAG kdesdk/umbrello 
-
-mv kdesdk umbrello-${UMBRELLO_VERSION}
-cd umbrello-${UMBRELLO_VERSION}
-cp -r ~/devel/kdesdk/admin .
+#!/bin/sh
+#
+# Make a release from the current branches/KDE/3.5/kdesdk/umbrello
+#
+# Run this script as follows:
+#   ./make-umbrello-release.sh VERSION KDEUSER [BRANCH_VERSION]
+# VERSION is the version to release.
+# KDEUSER is your KDE SVN user name.
+# BRANCH_VERSION defaults to 3.5.
+# @todo Create release from trunk if BRANCH_VERSION not given.
+#       Note: trunk uses the cmake based build process.
+#
+# The script creates a directory, /tmp/kdesdk, which is used
+# as the work area for building the release.
+# The release tarfile will be placed in the current working dir.
+# 
+if [ $# -lt 2 ]; then
+  echo "usage:"
+  echo "  ./make-umbrello-release.sh VERSION KDEUSER [BRANCH_VERSION]"
+  exit 1
+fi
+version=$1
+user=$2
+branchver=3.5
+if [ $# -gt 2 ]; then
+  branchver=$3
+fi
+origdir=`pwd`
+udir=umbrello-$version
+svnroot=svn+ssh://${user}@svn.kde.org:/home/kde/branches/KDE/$branchver
+cd /tmp
+svn co -N $svnroot/kdesdk
+cd kdesdk
+svn co $svnroot/kdesdk/scripts
+svn co $svnroot/kdesdk/umbrello $udir
+svn co $svnroot/kde-common/admin $udir/admin
+svn co -N $svnroot/kdesdk/doc $udir/doc
+svn co    $svnroot/kdesdk/doc/umbrello $udir/doc/umbrello
+cp -p Makefile.cvs $udir/
+cd $udir
+mv configure.in.in configure.in.in.orig
+echo '#MIN_CONFIG'                  > configure.in.in
+echo 'KDE_ENABLE_HIDDEN_VISIBILITY' >> configure.in.in
+echo 'CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"' >> configure.in.in
+echo ''                                           >> configure.in.in
+cat configure.in.in.orig                          >> configure.in.in
+rm configure.in.in.orig
+perl -p -e 's@umbrello/VERSION@VERSION@g' -i `find umbrello -name Makefile.am`
+cd /tmp
+kdesdk/scripts/svn2dist kdesdk $udir -n umbrello --admin-dir kdesdk/$udir/admin -o
+mv umbrello/po kdesdk/$udir/
+rm -rf umbrello
+cd kdesdk/$udir
 make -f Makefile.cvs
-
-cp umbrello/README .
-cp umbrello/AUTHORS .
-cp umbrello/INSTALL .
-cp umbrello/TODO .
-#KDE 3.4 cp umbrello/THANKS .
-rm kdesdk.lsm
-cp umbrello/uml.lsm .
-cp umbrello/ChangeLog .
-
 cd ..
-tar cfvj umbrello-${UMBRELLO_VERSION}.tar.bz2 umbrello-${UMBRELLO_VERSION}
+tarfile=${udir}.tar.bz2
+tar cfvj $tarfile --exclude=.svn $udir
+mv $tarfile $origdir/
+cd $origdir
+# rm -rf /tmp/kdesdk
 
-#test
-rm -rf umbrello-${UMBRELLO_VERSION}
-tar xfvj umbrello-${UMBRELLO_VERSION}.tar.bz2
-cd umbrello-${UMBRELLO_VERSION}
-./configure --prefix=/usr
-make
-cd umbrello/umbrello
-./umbrello
-
-cd ../../..
-echo upload to upload.sf.net
-echo wput umbrello-${UMBRELLO_VERSION}.tar.bz2 ftp://upload.sf.net/incoming/
+echo upload $tarfile to upload.sf.net
+echo wput $tarfile ftp://upload.sf.net/incoming/
 echo update uml.sf.net including uploading ChangeLog
 echo advertise on freshmeat and kde-apps
+
--- umbrello/VERSION
+++ umbrello/VERSION
@@ -1 +1 @@
-1.5.5
+1.5.52
--- umbrello/ChangeLog
+++ umbrello/ChangeLog
@@ -1,3 +1,13 @@
+Version 1.5.52
+
+* Bugs/wishes from http://bugs.kde.org:
+* Shift + Left and Shift+Right causes SIGSEGV (136288)
+
+Version 1.5.51
+
+* This is an interim release that fixes a serious regression in version 1.5.5
+  which is detailed at http://bugs.kde.org/135749 (Crash when opening a document)
+
 Version 1.5.5
 
 * PHP5 generator creates stub methods for all interfaces a class implements (C. Brunsdon)
--- scripts/svn2dist
+++ scripts/svn2dist
@@ -17,8 +17,8 @@
 
 returndir=`pwd`
 override="README ChangeLog INSTALL AUTHORS AUTHOR COPYING COPYING.LIB TODO COPYING-DOCS"
-remove="config.cache config.log config.status Makefile configure inst-apps CVS acinclude.m4 aclocal.m4 config.h config.h.bot config.h.in configure.files libtool stamp-h stamp-h.in stamp-h1 subdirs *.moc *.la .libs .deps .svn .cvsignore autom4te.cache {arch} .arch-ids *.lo *.o *.bbg *.da *.bb"
-toplevelremove="configure.in.bot"
+remove="config.cache config.log config.status Makefile configure inst-apps CVS acinclude.m4 aclocal.m4  libtool subdirs *.moc *.la .libs .deps .svn .cvsignore autom4te.cache {arch} .arch-ids *.lo *.o *.bbg *.da *.bb"
+toplevelremove="configure.in.bot config.h config.h.bot config.h.in config.status config.log stamp-h stamp-h.in stamp-h1 subdirs configure.files "
 # whitespace seperated list of languages to never include.
 always_skip_languages="xx"
 
--- kompare/kompare.desktop
+++ kompare/kompare.desktop
@@ -26,7 +26,7 @@
 GenericName[es]=Interfaz Diff/Patch
 GenericName[et]=Diff/patch kasutajaliides
 GenericName[eu]=Desberdintasun/Adabaki interfazea
-GenericName[fa]=پایانه Diff/کژنه
+GenericName[fa]=پایانۀ Diff/کژنه
 GenericName[fi]=Diff/Patch-käyttöliittymä
 GenericName[fr]=Interface graphique pour Diff et Patch
 GenericName[ga]=Comhéadan Diff/Patch
--- scheck/scheck.themerc
+++ scheck/scheck.themerc
@@ -15,7 +15,7 @@
 Comment[es]=Estilo de desarrollo para buscar conflictos de accesos rápidos y guías de estilo
 Comment[et]=Arendusstiil kiirklahvi- ja stiilijuhendi konfliktide leidmiseks
 Comment[eu]=Bizkortzaile eta estilo-gida gatazken bilaketarako garapen estiloa
-Comment[fa]=سبک پیشرفته برای جستجوی شتاب ده و ناسازگاریهای راهنمای سبک
+Comment[fa]=سبک پیشرفته برای جستجوی شتاب‌ده و ناسازگاریهای راهنمای سبک
 Comment[fi]=Kehitystyyli pikanäppäinten ja tyylioppaan ristiriitojen etsimiseen
 Comment[fr]=Style de développement pour la recherche de conflits d'accélérateurs et guide de style
 Comment[hi]=त्वरक खोज तथा स्टाइल गाइड कान्फ्लिक्ट्स के लिए डेवलपमेंट शैली
--- kcachegrind/kcachegrind/kcachegrind.desktop
+++ kcachegrind/kcachegrind/kcachegrind.desktop
@@ -22,7 +22,7 @@
 GenericName[es]=Interfaz de Profiler
 GenericName[et]=Profileerimisrakendus
 GenericName[eu]=Profilatzailearen interfazea
-GenericName[fa]=پایانه گزارش‌گیر
+GenericName[fa]=پایانۀ گزارش‌گیر
 GenericName[fi]=Profiloijan käyttöliittymä
 GenericName[fr]=Interface de profilage
 GenericName[ga]=Comhéadan ar Phróifíleoir
--- kcachegrind/kcachegrind/x-kcachegrind.desktop
+++ kcachegrind/kcachegrind/x-kcachegrind.desktop
@@ -10,7 +10,7 @@
 Comment[es]=Resultado de análisis de Cachegrind/Callgring
 Comment[et]=Cachegrind/Callgrind profileerimistõmmis
 Comment[eu]=Cachegrind/Callgrind profil iraulketa
-Comment[fa]=تخلیه Profile Cachegrind/Callgrind
+Comment[fa]=تخلیۀ Profile Cachegrind/Callgrind
 Comment[fi]=Cachegrind/Callgrind-profiilivedos
 Comment[fr]=Dépôt de profil Cachegrind / Callgrind
 Comment[hi]=केश-ग्रिंड/काल-ग्रिंड प्रोफ़ाइल डम्प
--- cervisia/cervisia.desktop
+++ cervisia/cervisia.desktop
@@ -14,7 +14,7 @@
 GenericName[es]=Interfaz CVS
 GenericName[et]=CVSi kasutajaliides
 GenericName[eu]=CVS interfazea
-GenericName[fa]=پایانه CVS
+GenericName[fa]=پایانۀ CVS
 GenericName[fi]=Käyttöliittymä CVS:lle
 GenericName[fr]=Interface graphique pour CVS
 GenericName[ga]=Comhéadan ar CVS
--- kfile-plugins/ts/kfile_ts.desktop
+++ kfile-plugins/ts/kfile_ts.desktop
@@ -13,7 +13,7 @@
 Name[es]=Información de archivo de Qt Linguist
 Name[et]=Qt Linguisti faili info
 Name[eu]=Qt Linguist fitxategi informazioa
-Name[fa]=اطلاعات پرونده زبان‌شناس Qt
+Name[fa]=اطلاعات پروندۀ زبان‌شناس Qt
 Name[fi]=Qt Linquist -tiedoston tiedot
 Name[fr]=Fichier d'informations Qt Linguist
 Name[ga]=Eolas faoi Chomhad Qt Linguist
--- kuiviewer/kuiviewer.desktop
+++ kuiviewer/kuiviewer.desktop
@@ -21,7 +21,7 @@
 GenericName[es]=Visor de archivos UI de Qt Designer
 GenericName[et]=Qt Designeri UI-failide näitaja
 GenericName[eu]=Qt Designer UI fitxartegi ikusgailua
-GenericName[fa]=مشاهده‌گر پرونده واسط نگاره‌ای طراح Qt
+GenericName[fa]=مشاهده‌گر پروندۀ واسط نگاره‌ای طراح Qt
 GenericName[fi]=Qt Designerin UI-tiedostojen katselin
 GenericName[fr]=Afficheur de fichiers UI de QT Designer
 GenericName[hu]=Qt Designer UI-fájlnézegető
--- kbugbuster/kresources/bugzilla.desktop
+++ kbugbuster/kresources/bugzilla.desktop
@@ -9,7 +9,7 @@
 Name[es]=Listado de tareas pendientes de BugZilla
 Name[et]=Bugzilla ülesannete nimekiri
 Name[eu]=Bugzilla-ren egiteke zerrenda
-Name[fa]=فهرست انجام کار Bugzilla
+Name[fa]=فهرست کار انجامی Bugzilla
 Name[fi]=Bugzilla-tehtäväluettelo
 Name[fr]=Liste de tâches de Bugzilla
 Name[ga]=Tascliosta Bugzilla
--- kioslave/svn/ksvnd/ksvnd.desktop
+++ kioslave/svn/ksvnd/ksvnd.desktop
@@ -11,7 +11,7 @@
 Name[es]=Módulo de Subversion de KDED
 Name[et]=KDED Subversioni moodul
 Name[eu]=KDED Subversion modulua
-Name[fa]=پیمانه زیرنشخه KDED
+Name[fa]=پیمانۀ زیرنسخۀ KDED
 Name[fi]=KDED Subversion -moduuli
 Name[fr]=Module KDED Subversion
 Name[ga]=Modúl Subversion KDED
--- kioslave/svn/svnhelper/subversion.desktop
+++ kioslave/svn/svnhelper/subversion.desktop
@@ -224,7 +224,7 @@
 Comment[es]=Renombrar un archivo localmente y en el repositorio. Use esto en lugar de añadir y eliminar para renombrar un archivo.
 Comment[et]=Faili ümbernimetamine nii kohalikult kui hoidlas. See on eelistatud viis faili ümbernimetamisel lisamise ja kustutamise asemel.
 Comment[eu]=Berrizendatu fitxategi bat lokalki eta biltegian. Erabili hau fitxategia ezabatu eta berriro gehitu ordez.
-Comment[fa]=تغییرنام یک پرونده محلی و در انبار.  به جای افزودن و حذف  برای تغییرنام یک پرونده از این استفاده کنید.
+Comment[fa]=تغییرنام یک پروندۀ محلی و در انبار.  به جای افزودن و حذف  برای تغییرنام یک پرونده از این استفاده کنید.
 Comment[fi]=Nimeä uudelleen paikallinen ja versionhallinnassa oleva tiedosto.  Nimeä tiedosto uudelleen mieluummin näin kuin lisäämällä ja poistamalla.
 Comment[fr]=Renommer un fichier localement et dans le référentiel. Utilisez cette option pour renommer un fichier, au lieu de le supprimer puis l'ajouter sous le nouveau nom.
 Comment[hu]=Fájl átnevezése helyben és az adattárban. Ezt érdemes használni hozzáadás és törlés helyett.
@@ -300,7 +300,7 @@
 Comment[es]=Situar la carpeta en un repositorio existente para ponerla bajo control de revisión.
 Comment[et]=Kataloogi lisamine olemasolevasse versioonikontrolli süsteemi hoidlasse.
 Comment[eu]=Jarri karpeta biltegi batean errebisio kontrolpean edukitzeko.
-Comment[fa]=گذاشتن پوشه در یک انبار موجود جهت قراردادن آن تحت کنترل بازبینی
+Comment[fa]=گذاشتن پوشه در یک انبار موجود جهت قراردادن آن .تحت کنترل بازبینی
 Comment[fi]=Laita kansio versionhallintaan viemällä se olemassa olevaan versionhallintavarastoon.
 Comment[fr]=Place le dossier dans un référentiel existant afin de le mettre sous contrôle de version.
 Comment[hu]=Könyvtár felvétele a verziókövető rendszer felügyelete alá.
@@ -450,7 +450,7 @@
 Comment[es]=Cambiar una determinada copia de trabajo a otra rama
 Comment[et]=Antud töökoopia lülitamine teise harru
 Comment[eu]=aldatu laneko kopia bat beste adar batekin
-Comment[fa]=سودهی رونوشت کار داده‌شده به شاخه دیگر
+Comment[fa]=سودهی رونوشت کار داده‌شده به شاخۀ دیگر
 Comment[fi]=Vaihda annettu työkopio toiseen haaraan
 Comment[fr]=Basculer la copie de travail vers une autre branche
 Comment[hu]=A munkamásolat átváltása másik ágra
@@ -564,7 +564,7 @@
 Name[es]=Responsabilizar...
 Name[et]=Autorsus...
 Name[eu]=Erruduna...
-Name[fa]=سرزنش کردن
+Name[fa]=...سرزنش کردن
 Name[fr]=Blâmer...
 Name[he]=האשם...
 Name[hu]=Ki tette ezt...
--- kioslave/svn/svnhelper/apply_patch.desktop
+++ kioslave/svn/svnhelper/apply_patch.desktop
@@ -55,7 +55,7 @@
 Comment[es]=Aplicar el parche a otra carpeta o archivo
 Comment[et]=Paiga rakendamine teisele kataloogile/failile
 Comment[eu]=Aplikatu adabakia beste karpeta/fitxategi bati
-Comment[fa]=اعمال کژنه به پوشه/پرونده دیگر
+Comment[fa]=اعمال کژنه به پوشه/پروندۀ دیگر
 Comment[fi]=Toteuta korjaus toiseen kansioon/tiedostoon
 Comment[fr]=Appliquer le correctif sur un autre dossier / fichier
 Comment[ga]=Cuir an paiste i bhfeidhm ar fhillteán/chomhad eile

Eigenschaftsänderungen: .
___________________________________________________________________
Name: svn:externals
   + admin https://svn.kde.org/home/kde/branches/KDE/3.5/kde-common/admin

Places

File 3_5_BRANCH.diff of Package kdesdk3 (Revision 1967cde9b264a653b4f111ce7c5957e2)

Places