summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--bin/kdepim/korganizer/germantranslation.txt40
-rw-r--r--korganizer/koeventviewer.cpp2
-rw-r--r--korganizer/mainwindow.cpp34
3 files changed, 30 insertions, 46 deletions
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 9dde910..d7954c6 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -130,9 +130,9 @@
{ "Delete Current","Aktuellen löschen" },
{ "Delete Event...","Lösche Termin..." },
{ "Delete Event","Lösche Termin" },
-{ "&Delete...","Löschen..." },
-{ "Delete...","Löschen..." },
-{ "Delete","Löschen" },
+{ "&Delete...","Lösche..." },
+{ "Delete...","Lösche..." },
+{ "Delete","Lösche" },
{ "Delete Todo...","Lösche Todo..." },
{ "Delete To-Do","Lösche Todo" },
{ "Deleting item %d ...","Lösche Eintrag %d..." },
@@ -239,7 +239,7 @@
{ "month(s)","Monat(e)" },
{ "Month view:","Monatsansicht:" },
{ "Month view uses category colors","Monatsansicht zeigt Kategorie Farben" },
-{ "Todo view uses category colors","To-Do Ansicht zeigt Kategorie Farben" },
+{ "Todo view uses category colors","Todo Ansicht zeigt Kategorie Farben" },
{ "Move &Down","Nach unten verschieben" },
{ "Move &Up","Nach oben verschieben" },
{ "Name:","Name:" },
@@ -351,16 +351,16 @@
{ "Shopping","Einkaufen" },
{ "Show Dates","Zeige Daten" },
{ "Show events that recur daily in date nav.","Zeige tägl.wiederh.Term.in Datums Nav." },
-{ "Show Event...","Zeige Termin..." },
+{ "Show Event","Termin anzeigen" },
{ "Show ev. that recur weekly in date nav.","Zeige wöch.wiederh.Term.in Datums Nav." },
{ "Show Marcus Bains line","Zeige Marcus Bains Linie" },
{ "Show summary after syncing","Zeige Zusammenfassung nach Sync." },
{ "Show time as:","Zeige Zeit als" },
-{ "Show Todo...","Zeige To-Do" },
+{ "Show Todo","Todo anzeigen" },
{ "Vertical screen layout(Needs restart)","Vertikaler Bildschirm-Layout (Neustart!)" },
-{ "&Show","Zeige" },
-{ "Show...","Zeige..." },
-{ "Show","Zeige" },
+{ "&Show","Anzeigen" },
+{ "Show...","Anzeigen..." },
+{ "Show","Anzeigen" },
{ "Small","Klein" },
{ "Sorry","Tut mir leid" },
{"Sorry, the copy command failed!\nCommand was:\n","Der Kopierbefehl schlug fehl!\nBefehl war:\n"},
@@ -381,7 +381,7 @@
{ "Take local entry on conflict","Nimm lokalen Eintrag beim Konflikt" },
{ "Take newest entry on conflict","Nimm neuesten Eintrag beim Konflikt" },
{ "Take remote entry on conflict","Nimm fernen Eintrag beim Konflikt" },
-{ "Template '%1' does not contain a valid Todo.","Template '%1' enthält kein gültiges To-Do" },
+{ "Template '%1' does not contain a valid Todo.","Template '%1' enthält kein gültiges Todo" },
{ "Template does not contain a valid Event.","Template '%1' enthält keinen gültigen Termin" },
{ "Template...","Vorlage..." },
{ "This day","Dieser Tag" },
@@ -401,11 +401,11 @@
{ "To: ","Bis: " },
{ "To:","Bis:" },
{ "Today: ","Heute: " },
-{ "Todo due today color:","Heute fällige To-Do's" },
+{ "Todo due today color:","Heute fällige Todos" },
{ "To-do items:","To-Do items:" },
-{ "Todo overdue color:","Überfällige To-Do's" },
+{ "Todo overdue color:","Überfällige Todos" },
{ "Todo","Todo" },
-{ "To-do view shows completed Todos","To-do Ansicht zeigt erledigte To-dos" },
+{ "To-do view shows completed Todos","Todo Ansicht zeigt erledigte Todos" },
{ "ToDoView:","Todo Ansicht:" },
{ "Toggle Alarm","Wechsle Alarm" },
{ "Toggle Allday","Umschalten Ganztag" },
@@ -479,7 +479,7 @@
{ "&Move...","Bewege..." },
{ "&Beam...","Sende via IR..." },
{ "Show Completed","Zeige erledigte Todos" },
-{ "Show Quick Todo","Zeige Quick Todo" },
+{ "Show Quick Todo","Zeige Quick-Todo" },
{ "Unparent Todo","Un-sub Todo" },
{ "Save selected to file...","Speichere Selektierte..." },
{ "Add Categ. to selected...","Füge zu Selekt. Kateg. hinzu..." },
@@ -554,7 +554,7 @@
{ "day","Tag" },
{ "French","Französich" },
{ "Time","Zeit" },
-{ "Event Viewer","Termin Ansicht" },
+{ "Event Viewer","Termin Anzeige" },
{ "Cancel Sync","Sync Abbrechen" },
{ "Remote","Fern" },
{ "Local","Lokal" },
@@ -671,7 +671,7 @@
{ "Day color even months","Tagesfarbe gerade Monate" },
{ "Color for Sundays + category \"Holiday\"","Farbe für Sonntag + Kateg.\" Feiertag\"" },
{ "To-do view shows complete as 'xx %'","Zeige Prozent erledigt als 'xx %'" },
-{ "Small To-do view uses smaller font","Kleine To-do Ansicht nutzt kleineren Font" },
+{ "Small To-do view uses smaller font","Kleine Todo Ansicht nutzt kleineren Font" },
{ "Colors are applied to text","Farben werden auf Text angewendet" },
{ "Use internal alarm notification","Nutze interne Alarm Benachrichtigung" },
{ "Note: KO/Pi must be running to notify you about an alarm. Recommended for use on Zaurus: Disable this option and install KO/Pi alarm applet.\n","Achtung: KO/Pi muß ausgeführt werden damit die Benachrichtigung funktioniert. Empfehlung für Zaurus: Diese Option nicht wählen und KO/Pi Alarm Applet installieren.\n" },
@@ -859,7 +859,7 @@
{ "FAQ...","FAQ..." },
{ "Licence...","Licence..." },
{ "What's This?","What's This?" },
-{ "&Edit...","&Editiere..." },
+{ "&Edit...","Bearbeite..." },
{ "Oktober","Oktober" },
{ "Title","Titel" },
{ "%1 %","%1 %" },
@@ -1040,7 +1040,7 @@
{ "Hide not Running","Verstecke nicht Laufende" },
{ "ME","ME" },
{ "Toolbar","Toolbar" },
-{ "Undo Delete...","Undo Löschen..." },
+{ "Undo Delete...","UNDO Löschen..." },
{ "Undo Delete","Löschen rückgängig machen" },
{ "KDE Sync HowTo...","KDE Sync HowTo..." },
{ "Multi Sync HowTo...","Multi Sync HowTo..." },
@@ -1392,7 +1392,7 @@
{ "Todo: %1","Todo: %1" },
{ ": (Prio ",": (Prio " },
{ "Todos","Todos" },
-{ "Todo Viewer","Todo Viewer" },
+{ "Todo Viewer","Todo Anzeige" },
{ "Todo ","Todo " },
{ " Calendar \n Resource "," Kalender \n Resource " },
{ " Color "," Farbe " },
@@ -1489,7 +1489,7 @@
{ "\nThe file\n%1\non disk has changed!\nFile size: %2 bytes.\nLast modified: %3\nDo you want to:\n\n - Save and overwrite file?\n - Sync with file, then save?\n - Cancel without saving? \n","\nDie Datei\n%1\nwurde verändert!\nDatei Grösse: %2 Bytes.\nZuletzt geändert: %3\nMöchten Sie:\n\n - Speichern und die Datei überschreiben?\n - Mit Datei Synchronisieren, dann speichern?\n - Abbrechen ohne zu speichern? \n" },
{ "Edit","Edit" },
{ "Last Modified","Zuletzt geändert" },
-{ "","" },
+{ "Journal viewer","Journal Anzeige" },
{ "","" },
{ "","" },
{ "","" },
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index d3b2ccf..f6c252b 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -701,7 +701,7 @@ void KOEventViewer::appendJournal(Journal *jour, int mode )
addTag("h3",i18n( "Remote: " ) + text_d );
}
}
- topLevelWidget()->setCaption("Journal Viewer");
+ topLevelWidget()->setCaption(i18n("Journal viewer"));
mText.append(i18n("<h3> %1 </h3> ").arg(jour->dtStartDateStr(KOPrefs::instance()->mShortDateInViewer)));
formatReadOnly(jour);
addTag("p","<b>"+i18n( "Last modified: " ) + "</b>"+KGlobal::locale()->formatDateTime(jour->lastModified(),shortDate ) );
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 5d26d35..88dbd4f 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -798,7 +798,7 @@ void MainWindow::initActions()
configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 );
//actionMenu->insertItem ( i18n("Selected Item"), mCurrentItemMenu);
- mShowAction = new QAction( "show_incidence", i18n("Show..."), 0, this );
+ mShowAction = new QAction( "show_incidence", i18n("Show"), 0, this );
mShowAction->addTo( mCurrentItemMenu );
connect( mShowAction, SIGNAL( activated() ),
mView, SLOT( showIncidence() ) );
@@ -822,10 +822,12 @@ void MainWindow::initActions()
mMoveAction->addTo( mCurrentItemMenu );
connect( mMoveAction, SIGNAL( activated() ),
mView, SLOT( moveIncidence() ) );
+#ifndef DESKTOP_VERSION
mBeamAction = new QAction( "Beam_incidence", i18n("Beam..."), 0, this );
mBeamAction->addTo(mCurrentItemMenu );
connect( mBeamAction, SIGNAL( activated() ),
mView, SLOT( beamIncidence() ) );
+#endif
mCancelAction = new QAction( "Cancel_incidence", i18n("Toggle Cancel"), 0, this );
mCancelAction->addTo( mCurrentItemMenu );
connect( mCancelAction, SIGNAL( activated() ),
@@ -1647,35 +1649,27 @@ void MainWindow::updateWeekNum(const DateList &selectedDates)
}
void MainWindow::processIncidenceSelection( Incidence *incidence )
{
-
if ( !incidence ) {
+ mShowAction->setMenuText( i18n("Show") );
enableIncidenceActions( false );
-
mNewSubTodoAction->setEnabled( false );
setCaptionToDates();
return;
-
}
-
- //KGlobal::locale()->formatDateTime(nextA, true);
QString startString = "";
if ( incidence->typeID() != todoID ) {
if ( incidence->dtStart().date() < incidence->dtEnd().date() ) {
if ( incidence->doesFloat() ) {
startString += ": "+incidence->dtStartDateStr( true );
startString += " --- "+((Event*)incidence)->dtEndDateStr( true );
-
} else {
startString = ": "+incidence->dtStartStr(true);
startString += " --- "+((Event*)incidence)->dtEndStr(true);
-
}
-
} else {
if ( incidence->dtStart().time() != incidence->dtEnd().time() )
startString = ": "+KGlobal::locale()->formatTime(incidence->dtStart().time())+
"-"+KGlobal::locale()->formatTime(incidence->dtEnd().time());
-
if ( incidence->isBirthday() || incidence->isAnniversary() ) {
bool ok;
QDateTime noc = incidence->getNextOccurence( mView->startDate().addDays(-1), &ok );
@@ -1687,33 +1681,21 @@ void MainWindow::processIncidenceSelection( Incidence *incidence )
else
startString +=" "+KGlobal::locale()->formatDate( incidence->dtStart().date(), true);
}
-
}
else
startString = i18n(": (Prio ") +QString::number( (( KCal::Todo*)incidence)->priority() ) +") "+QString::number( (( KCal::Todo*)incidence)->percentComplete() ) +i18n("\% completed");
if ( !incidence->location().isEmpty() )
startString += " (" +incidence->location()+")";
setCaption( incidence->summary()+startString);
-
enableIncidenceActions( true );
-
if ( incidence->typeID() == eventID ) {
- mShowAction->setText( i18n("Show Event...") );
- mEditAction->setText( i18n("Edit Event...") );
- mDeleteAction->setText( i18n("Delete Event...") );
-
+ mShowAction->setMenuText( i18n("Show Event") );
mNewSubTodoAction->setEnabled( false );
} else if ( incidence->typeID() == todoID ) {
- mShowAction->setText( i18n("Show Todo...") );
- mEditAction->setText( i18n("Edit Todo...") );
- mDeleteAction->setText( i18n("Delete Todo...") );
-
+ mShowAction->setMenuText( i18n("Show Todo") );
mNewSubTodoAction->setEnabled( true );
} else {
- mShowAction->setText( i18n("Show...") );
- mShowAction->setText( i18n("Edit...") );
- mShowAction->setText( i18n("Delete...") );
-
+ mShowAction->setMenuText( i18n("Show") );
mNewSubTodoAction->setEnabled( false );
}
}
@@ -1726,7 +1708,9 @@ void MainWindow::enableIncidenceActions( bool enabled )
mCloneAction->setEnabled( enabled );
mMoveAction->setEnabled( enabled );
+#ifndef DESKTOP_VERSION
mBeamAction->setEnabled( enabled );
+#endif
mCancelAction->setEnabled( enabled );
}