-rw-r--r-- | bin/kdepim/kaddressbook/germantranslation.txt | 6 | ||||
-rw-r--r-- | kaddressbook/kabcore.cpp | 24 |
2 files changed, 18 insertions, 12 deletions
diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt index d767757..75df50f 100644 --- a/bin/kdepim/kaddressbook/germantranslation.txt +++ b/bin/kdepim/kaddressbook/germantranslation.txt | |||
@@ -517,16 +517,22 @@ | |||
517 | { "Order:","Reihenfolge:" }, | 517 | { "Order:","Reihenfolge:" }, |
518 | { "Ascending","Aufsteigend" }, | 518 | { "Ascending","Aufsteigend" }, |
519 | { "Descending","Absteigend" }, | 519 | { "Descending","Absteigend" }, |
520 | { "Save file","Datei speichern" }, | 520 | { "Save file","Datei speichern" }, |
521 | { "Error","Fehler" }, | 521 | { "Error","Fehler" }, |
522 | { "Unable to export contacts.","Exportieren der Kontakte geht nicht." }, | 522 | { "Unable to export contacts.","Exportieren der Kontakte geht nicht." }, |
523 | { "\nNo unsaved changes detected!\nNothing will be saved!","\nKeine ungespeicherten\nÄnderungen erkannt!\nNichts wird gespeichert!" }, | 523 | { "\nNo unsaved changes detected!\nNothing will be saved!","\nKeine ungespeicherten\nÄnderungen erkannt!\nNichts wird gespeichert!" }, |
524 | { "Manage new categories...","Verwalte neue Kategorien..." }, | 524 | { "Manage new categories...","Verwalte neue Kategorien..." }, |
525 | { "&File","Datei" }, | ||
526 | { "&Edit","Bearbeite" }, | ||
527 | { "&View","Ansichten" }, | ||
528 | { "&Settings","Konfiguration" }, | ||
529 | { "&Change selected","Ändere Selekt." }, | ||
530 | { "&Help","Hilfe" }, | ||
525 | { "","" }, | 531 | { "","" }, |
526 | { "","" }, | 532 | { "","" }, |
527 | { "","" }, | 533 | { "","" }, |
528 | { "","" }, | 534 | { "","" }, |
529 | { "","" }, | 535 | { "","" }, |
530 | { "","" }, | 536 | { "","" }, |
531 | { "","" }, | 537 | { "","" }, |
532 | { "","" }, | 538 | { "","" }, |
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 9505a23..4445310 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -1984,43 +1984,43 @@ void KABCore::addActionsManually() | |||
1984 | 1984 | ||
1985 | #ifndef DESKTOP_VERSION | 1985 | #ifndef DESKTOP_VERSION |
1986 | if ( KABPrefs::instance()->mFullMenuBarVisible ) { | 1986 | if ( KABPrefs::instance()->mFullMenuBarVisible ) { |
1987 | #endif | 1987 | #endif |
1988 | QMenuBar* mb = mMainWindow->menuBar(); | 1988 | QMenuBar* mb = mMainWindow->menuBar(); |
1989 | 1989 | ||
1990 | //US setup menubar. | 1990 | //US setup menubar. |
1991 | //Disable the following block if you do not want to have a menubar. | 1991 | //Disable the following block if you do not want to have a menubar. |
1992 | mb->insertItem( "&File", fileMenu ); | 1992 | mb->insertItem( i18n("&File"), fileMenu ); |
1993 | mb->insertItem( "&Edit", editMenu ); | 1993 | mb->insertItem( i18n("&Edit"), editMenu ); |
1994 | mb->insertItem( "&View", viewMenu ); | 1994 | mb->insertItem( i18n("&View"), viewMenu ); |
1995 | mb->insertItem( "&Settings", settingsMenu ); | 1995 | mb->insertItem( i18n("&Settings"), settingsMenu ); |
1996 | mb->insertItem( i18n("Synchronize"), syncMenu ); | 1996 | mb->insertItem( i18n("Synchronize"), syncMenu ); |
1997 | mb->insertItem( "&Change selected", changeMenu ); | 1997 | mb->insertItem( i18n("&Change selected"), changeMenu ); |
1998 | mb->insertItem( "&Help", helpMenu ); | 1998 | mb->insertItem( i18n("&Help"), helpMenu ); |
1999 | mIncSearchWidget = new IncSearchWidget( tb ); | 1999 | mIncSearchWidget = new IncSearchWidget( tb ); |
2000 | // tb->insertWidget(-1, 0, mIncSearchWidget); | 2000 | // tb->insertWidget(-1, 0, mIncSearchWidget); |
2001 | #ifndef DESKTOP_VERSION | 2001 | #ifndef DESKTOP_VERSION |
2002 | } else { | 2002 | } else { |
2003 | //US setup toolbar | 2003 | //US setup toolbar |
2004 | QPEMenuBar *menuBarTB = new QPEMenuBar( tb ); | 2004 | QPEMenuBar *menuBarTB = new QPEMenuBar( tb ); |
2005 | QPopupMenu *popupBarTB = new QPopupMenu( this ); | 2005 | QPopupMenu *popupBarTB = new QPopupMenu( this ); |
2006 | menuBarTB->insertItem( "ME", popupBarTB); | 2006 | menuBarTB->insertItem( "ME", popupBarTB); |
2007 | tb->insertWidget(-1, 0, menuBarTB); | 2007 | tb->insertWidget(-1, 0, menuBarTB); |
2008 | mIncSearchWidget = new IncSearchWidget( tb ); | 2008 | mIncSearchWidget = new IncSearchWidget( tb ); |
2009 | 2009 | ||
2010 | tb->enableMoving(false); | 2010 | tb->enableMoving(false); |
2011 | popupBarTB->insertItem( "&File", fileMenu ); | 2011 | popupBarTB->insertItem( i18n("&File"), fileMenu ); |
2012 | popupBarTB->insertItem( "&Edit", editMenu ); | 2012 | popupBarTB->insertItem( i18n("&Edit"), editMenu ); |
2013 | popupBarTB->insertItem( "&View", viewMenu ); | 2013 | popupBarTB->insertItem( i18n("&View"), viewMenu ); |
2014 | popupBarTB->insertItem( "&Settings", settingsMenu ); | 2014 | popupBarTB->insertItem( i18n("&Settings"), settingsMenu ); |
2015 | popupBarTB->insertItem( i18n("Synchronize"), syncMenu ); | 2015 | popupBarTB->insertItem( i18n("Synchronize"), syncMenu ); |
2016 | mViewManager->getFilterAction()->plug ( popupBarTB); | 2016 | mViewManager->getFilterAction()->plug ( popupBarTB); |
2017 | popupBarTB->insertItem( "&Change selected", changeMenu ); | 2017 | popupBarTB->insertItem( i18n("&Change selected"), changeMenu ); |
2018 | popupBarTB->insertItem( "&Help", helpMenu ); | 2018 | popupBarTB->insertItem( i18n("&Help"), helpMenu ); |
2019 | if (QApplication::desktop()->width() > 320 ) { | 2019 | if (QApplication::desktop()->width() > 320 ) { |
2020 | // mViewManager->getFilterAction()->plug ( tb); | 2020 | // mViewManager->getFilterAction()->plug ( tb); |
2021 | } | 2021 | } |
2022 | } | 2022 | } |
2023 | #endif | 2023 | #endif |
2024 | // mActionQuit->plug ( mMainWindow->toolBar()); | 2024 | // mActionQuit->plug ( mMainWindow->toolBar()); |
2025 | 2025 | ||
2026 | 2026 | ||