author | cniehaus <cniehaus> | 2002-11-22 13:23:40 (UTC) |
---|---|---|
committer | cniehaus <cniehaus> | 2002-11-22 13:23:40 (UTC) |
commit | 2539ce3dc66bfc3702a0366af78f25f7afa23889 (patch) (unidiff) | |
tree | 8274d216c7920aadcbba8a0baf9fc6d845291aaa | |
parent | 8dafc6100114c30a1735de2e34e97ff30b138daa (diff) | |
download | opie-2539ce3dc66bfc3702a0366af78f25f7afa23889.zip opie-2539ce3dc66bfc3702a0366af78f25f7afa23889.tar.gz opie-2539ce3dc66bfc3702a0366af78f25f7afa23889.tar.bz2 |
More i18n-fixes
@@ -333,9 +333,7 @@ void AddressbookWindow::setDocument( con
switch( QMessageBox::information( this, tr ( "Right file type ?" ),
- tr( "The selected File" ) + ( "\n" ) +
- tr ("does not end with \".vcf\" ") + ( "\n" ) +
- tr ( "Do you really want to open it?" ),
+ tr( "The selected file \n does not end with \".vcf\" \n. Do you really want to open it?" ),
tr( "&Yes" ), tr( "&No" ), QString::null,
0, // Enter == button 0
2 ) ) { // Escape == button 2
@@ -809,7 +807,7 @@ void AddressbookWindow::slotWrapAround()
qWarning("Got wrap signal !");
// if ( doNotifyWrapAround )
// QMessageBox::information( this, tr( "End of list" ),
-// tr( "End of list. Wrap around now.. !" ) + "\n" );
+// tr( "End of list. Wrap around now...!" ) + "\n" );
}
@@ -24,10 +24,6 @@
</sizepolicy>
</property>
<property stdset="1">
- <name>caption</name>
- <string>MyDialog1</string>
- </property>
- <property stdset="1">
<name>sizeGripEnabled</name>
<bool>true</bool>
</property>
-rw-r--r-- | core/pim/addressbook/addressbook.cpp | 6 | ||||
-rw-r--r-- | core/pim/addressbook/configdlg_base.ui | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp index c506e98..58fbccf 100644 --- a/core/pim/addressbook/addressbook.cpp +++ b/core/pim/addressbook/addressbook.cpp | |||
@@ -324,27 +324,25 @@ void AddressbookWindow::importvCard() { | |||
324 | 324 | ||
325 | } | 325 | } |
326 | 326 | ||
327 | void AddressbookWindow::setDocument( const QString &filename ) | 327 | void AddressbookWindow::setDocument( const QString &filename ) |
328 | { | 328 | { |
329 | qWarning( "void AddressbookWindow::setDocument( %s )", filename.latin1() ); | 329 | qWarning( "void AddressbookWindow::setDocument( %s )", filename.latin1() ); |
330 | 330 | ||
331 | if ( filename.find(".vcf") != int(filename.length()) - 4 ){ | 331 | if ( filename.find(".vcf") != int(filename.length()) - 4 ){ |
332 | 332 | ||
333 | 333 | ||
334 | 334 | ||
335 | switch( QMessageBox::information( this, tr ( "Right file type ?" ), | 335 | switch( QMessageBox::information( this, tr ( "Right file type ?" ), |
336 | tr( "The selected File" ) + ( "\n" ) + | 336 | tr( "The selected file \n does not end with \".vcf\" \n. Do you really want to open it?" ), |
337 | tr ("does not end with \".vcf\" ") + ( "\n" ) + | ||
338 | tr ( "Do you really want to open it?" ), | ||
339 | tr( "&Yes" ), tr( "&No" ), QString::null, | 337 | tr( "&Yes" ), tr( "&No" ), QString::null, |
340 | 0, // Enter == button 0 | 338 | 0, // Enter == button 0 |
341 | 2 ) ) { // Escape == button 2 | 339 | 2 ) ) { // Escape == button 2 |
342 | case 0: | 340 | case 0: |
343 | qWarning("YES clicked"); | 341 | qWarning("YES clicked"); |
344 | break; | 342 | break; |
345 | case 1: | 343 | case 1: |
346 | qWarning("NO clicked"); | 344 | qWarning("NO clicked"); |
347 | return; | 345 | return; |
348 | break; | 346 | break; |
349 | } | 347 | } |
350 | } | 348 | } |
@@ -800,25 +798,25 @@ void AddressbookWindow::slotNotFound() | |||
800 | { | 798 | { |
801 | qWarning("Got notfound signal !"); | 799 | qWarning("Got notfound signal !"); |
802 | QMessageBox::information( this, tr( "Not Found" ), | 800 | QMessageBox::information( this, tr( "Not Found" ), |
803 | tr( "Unable to find a contact for this \n search pattern!" ) ); | 801 | tr( "Unable to find a contact for this \n search pattern!" ) ); |
804 | 802 | ||
805 | 803 | ||
806 | } | 804 | } |
807 | void AddressbookWindow::slotWrapAround() | 805 | void AddressbookWindow::slotWrapAround() |
808 | { | 806 | { |
809 | qWarning("Got wrap signal !"); | 807 | qWarning("Got wrap signal !"); |
810 | // if ( doNotifyWrapAround ) | 808 | // if ( doNotifyWrapAround ) |
811 | // QMessageBox::information( this, tr( "End of list" ), | 809 | // QMessageBox::information( this, tr( "End of list" ), |
812 | // tr( "End of list. Wrap around now.. !" ) + "\n" ); | 810 | // tr( "End of list. Wrap around now...!" ) + "\n" ); |
813 | 811 | ||
814 | } | 812 | } |
815 | 813 | ||
816 | void AddressbookWindow::slotSetCategory( int c ) | 814 | void AddressbookWindow::slotSetCategory( int c ) |
817 | { | 815 | { |
818 | qWarning( "void AddressbookWindow::slotSetCategory( %d ) from %d", c, catMenu->count() ); | 816 | qWarning( "void AddressbookWindow::slotSetCategory( %d ) from %d", c, catMenu->count() ); |
819 | 817 | ||
820 | QString cat, book; | 818 | QString cat, book; |
821 | AbView::Views view = AbView::TableView; | 819 | AbView::Views view = AbView::TableView; |
822 | 820 | ||
823 | if ( c <= 0 ) | 821 | if ( c <= 0 ) |
824 | return; | 822 | return; |
diff --git a/core/pim/addressbook/configdlg_base.ui b/core/pim/addressbook/configdlg_base.ui index 66414f5..408bfa6 100644 --- a/core/pim/addressbook/configdlg_base.ui +++ b/core/pim/addressbook/configdlg_base.ui | |||
@@ -15,28 +15,24 @@ | |||
15 | <width>276</width> | 15 | <width>276</width> |
16 | <height>327</height> | 16 | <height>327</height> |
17 | </rect> | 17 | </rect> |
18 | </property> | 18 | </property> |
19 | <property stdset="1"> | 19 | <property stdset="1"> |
20 | <name>sizePolicy</name> | 20 | <name>sizePolicy</name> |
21 | <sizepolicy> | 21 | <sizepolicy> |
22 | <hsizetype>5</hsizetype> | 22 | <hsizetype>5</hsizetype> |
23 | <vsizetype>5</vsizetype> | 23 | <vsizetype>5</vsizetype> |
24 | </sizepolicy> | 24 | </sizepolicy> |
25 | </property> | 25 | </property> |
26 | <property stdset="1"> | 26 | <property stdset="1"> |
27 | <name>caption</name> | ||
28 | <string>MyDialog1</string> | ||
29 | </property> | ||
30 | <property stdset="1"> | ||
31 | <name>sizeGripEnabled</name> | 27 | <name>sizeGripEnabled</name> |
32 | <bool>true</bool> | 28 | <bool>true</bool> |
33 | </property> | 29 | </property> |
34 | <property> | 30 | <property> |
35 | <name>layoutMargin</name> | 31 | <name>layoutMargin</name> |
36 | </property> | 32 | </property> |
37 | <vbox> | 33 | <vbox> |
38 | <property stdset="1"> | 34 | <property stdset="1"> |
39 | <name>margin</name> | 35 | <name>margin</name> |
40 | <number>1</number> | 36 | <number>1</number> |
41 | </property> | 37 | </property> |
42 | <property stdset="1"> | 38 | <property stdset="1"> |