[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/kdepim/enterprise4/kdepim
From: Thomas McGuire <Thomas.McGuire () gmx ! net>
Date: 2008-07-19 19:02:18
Message-ID: 1216494138.890206.22707.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 834959 by tmcguire:
Merged revisions 826902 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/trunk/KDE/kdepim
........
r826902 | aacid | 2008-07-01 21:30:40 +0200 (Tue, 01 Jul 2008) | 2 lines
There was one change too many
........
_M . (directory)
M +4 -3 korganizer/koagenda.cpp
** branches/kdepim/enterprise4/kdepim #property svnmerge-integrated
- /branches/kdepim/enterprise/kdepim:1-708704,708706,708741,708749,708854,709032-70 \
9084,709092-709144,709146-709321,709323-709402,709404,709406-709411,709413-709431,7094 \
33-709472,709474-709478,709480-709487,709489-709850,709852-710546,710548-710562,710564 \
,710566-710623,710625-710634,710636-710641,710643,710645-711039,711041-711164,711166-7 \
11600,711602-711780,711782-712273,712275-712278,712280-713446,713448,713450-713461,713 \
463-714100,714102-714449,714451-715217,715219-715232,715234-716226,716228-716777,71677 \
9-717213,717215-717251,717253,717255-717263,717265-717284,717287-717291,717294,717296- \
717303,717305-717312,717314-717317,717319-718340,718342-718505,718507-721121,721123-72 \
1424,721426-724381,724383-724384,724386-724443,724445-724768,724770-727625,727627-7280 \
89,728091-728450,728452-728580,728582-728814,728816-729283,729285-729580,729583-731333 \
,731335-731361,731363-731669,731671-731719,731721-731867,731869-731870,731872-732022,732024-733047,733049-733088,733090-733148,733
150-733463,733465-733468,733470-734534,734536,734538-734580,734582,734586-734591,734 \
593-735174,735176-735204,735206-735246,735248-735281,735283-735300,735302-736232,73623 \
5-736242,736244-736314,736316-736376,736378,736380-736390,736392-737483,737485-737489, \
737492-737495,737497-740441,740443-740446,740448-740459,740461-740471,740473-743887,74 \
3889-744692,744694-744707,744709-746844,746846-746873,746875-746931,746933-747591,7475 \
93-748424,748426-750561,750563-750647,750649-750878,750880-750920,750922-757104,757106 \
-757110,757112-758210,758212-758786,758788,758790-758794,758796-759131,759133-759152,7 \
59154-759271,759273-759274,759276,759278-759285,759287-760352,760354-761115,761117-761 \
118,761120-761123,761125-761127,761131,761134,761137,761139-761140,761144-761145,76114 \
7,761149-761230,761232-761240,761242-761244,761246-761330,761332-761334,761336-761337, \
761339-761374,761376-761533,761535,761537,761539-761546,761548-761550,761552-761553,761555-761556,761558-761559,761561,761563-76156
4,761566-761570,761572,761574-761580,761582-761601,761603-761620,761622-761895,76189 \
7-761900,761902-762898,762900-762904,762906-762907,762910-762921,762923-762988,762990- \
763015,763017-763023,763025-763037,763040-763520,763522-764287,764289-764582,764584-76 \
4597,764599,764602-764604,764606-764610,764612-764617,764619-764627,764629,764631-7646 \
70,764672-764679,764681-764682,764684-764745,764747-764821,764823-764849,764851-764875 \
,764877-764886,764888-764893,764895-765070,765072,765076-765079,765081-765082,765084-7 \
65085,765087-765096,765098-765103,765105-765131,765133-765138,765140,765143,765145-765 \
155,765157-765161,765163-765223,765225,765228-765229,765231-765233,765235,765237-76531 \
0,765312-765319,765321-765322,765324-765329,765331-765334,765336-765337,765339-765341, \
765347,765351,765354-765357,765360-765362,765371,765373-765379,765381,765383,765385-76 \
5577,765579-765693,765695-765736,765738-765739,765742-765745,765747-765749,765751-765753,765757-765760,765762,765764-765765,765767,
765769,765773-765774,765777-765778,765780-765781,765783-765784,765789-765790,765792- \
765803,765805-765852,765854-765856,765858-765874,765876,765878-766054,766056,766058-76 \
6085,766087-766088,766091-766093,766096-766111,766113-766120,766122-766139,766141-7662 \
17,766219-766232,766234-766246,766248-766266,766268-766278,766280-766287,766289-766344 \
,766346-766356,766358-766366,766368-766370,766372-766373,766375-766388,766390-766420,7 \
66422-766538,766540-766734,766736-766749,766751-766768,766770-766774,766776-766780,766 \
782,766784-766789,766791-766831,766833-766834,766836,766838-766898,766900-767026,76702 \
8-767029,767031-767040,767042-767046,767048-767232,767234-767551,767553-767554,767556, \
767558-767805,767807-767946,767948-767951,767953-768069,768071-768089,768091-768401,76 \
8403-768538,768540-768683,768685-768794,768899-768929,769041-769139,769141,769463,7694 \
76,770915,771310-771345,771705,772039,775026,779854,780251,780286-780298,781595,782029,782647-782963,782965-782968,783303,784129-78
4380,784383-784427,784547,789925,791184,791200,791414,791430,792202-792950,792957-79 \
3296,795745,797348-797722,805191,805430,805701-805702,807761,817088,820074,821814,8238 \
65,824289-825075,825077-825083,825085-825805,825807-826354,826356-827490,827492-827891 \
,827893-827903,827905-827944,827946-827949,827951-828972,828974-830099,830101-830132,8 \
30134-830442,830444-830477,830479-830549,830551-830875,830877-830932,830934-834241 \
/trunk/KDE/kdepim:1-810191,810193-810196,810198-822578,822624,822775,822833,822861,822 \
903,822960,822969-822985,822987-823362,823364-823365,823367-823368,823370,823372-82347 \
7,823480,823482-823486,823488-823500,823502-823622,823624-823629,823631-823665,823667, \
823669-823979,823981-823987,823989-824216,824218-824242,824244-824289,824291-824293,82 \
4295-824298,824300-824303,824305-824344,824346-824406,824408-824417,824419-824422,8244 \
24-824442,824444-824456,824459-824472,824474-824565,824567-824569,824571-824572,824574-824636,824639,824641-824653,824655-824691,82492
1,824954,824958,825240,825665,825668,826044,826150,826190,826525,826535,826909,82744 \
7,827706-827707,827711,827714,827754,828222,828925,829137,829150,829152,829162-829163, \
829242,830104,830740,830745,830758,831068,831092,831134,831154,831369,831388,831410,83 \
2553,832812,832937,832949,832951,833243,833251,833404,833417,833848,834052,834075,834078,834335
+ /branches/kdepim/enterprise/kdepim:1-708704,708706,708741,708749,708854,709032-709 \
084,709092-709144,709146-709321,709323-709402,709404,709406-709411,709413-709431,70943 \
3-709472,709474-709478,709480-709487,709489-709850,709852-710546,710548-710562,710564, \
710566-710623,710625-710634,710636-710641,710643,710645-711039,711041-711164,711166-71 \
1600,711602-711780,711782-712273,712275-712278,712280-713446,713448,713450-713461,7134 \
63-714100,714102-714449,714451-715217,715219-715232,715234-716226,716228-716777,716779 \
-717213,717215-717251,717253,717255-717263,717265-717284,717287-717291,717294,717296-7 \
17303,717305-717312,717314-717317,717319-718340,718342-718505,718507-721121,721123-721 \
424,721426-724381,724383-724384,724386-724443,724445-724768,724770-727625,727627-72808 \
9,728091-728450,728452-728580,728582-728814,728816-729283,729285-729580,729583-731333, \
731335-731361,731363-731669,731671-731719,731721-731867,731869-731870,731872-732022,732024-733047,733049-733088,733090-733148,733
150-733463,733465-733468,733470-734534,734536,734538-734580,734582,734586-734591,734 \
593-735174,735176-735204,735206-735246,735248-735281,735283-735300,735302-736232,73623 \
5-736242,736244-736314,736316-736376,736378,736380-736390,736392-737483,737485-737489, \
737492-737495,737497-740441,740443-740446,740448-740459,740461-740471,740473-743887,74 \
3889-744692,744694-744707,744709-746844,746846-746873,746875-746931,746933-747591,7475 \
93-748424,748426-750561,750563-750647,750649-750878,750880-750920,750922-757104,757106 \
-757110,757112-758210,758212-758786,758788,758790-758794,758796-759131,759133-759152,7 \
59154-759271,759273-759274,759276,759278-759285,759287-760352,760354-761115,761117-761 \
118,761120-761123,761125-761127,761131,761134,761137,761139-761140,761144-761145,76114 \
7,761149-761230,761232-761240,761242-761244,761246-761330,761332-761334,761336-761337, \
761339-761374,761376-761533,761535,761537,761539-761546,761548-761550,761552-761553,761555-761556,761558-761559,761561,761563-76156
4,761566-761570,761572,761574-761580,761582-761601,761603-761620,761622-761895,76189 \
7-761900,761902-762898,762900-762904,762906-762907,762910-762921,762923-762988,762990- \
763015,763017-763023,763025-763037,763040-763520,763522-764287,764289-764582,764584-76 \
4597,764599,764602-764604,764606-764610,764612-764617,764619-764627,764629,764631-7646 \
70,764672-764679,764681-764682,764684-764745,764747-764821,764823-764849,764851-764875 \
,764877-764886,764888-764893,764895-765070,765072,765076-765079,765081-765082,765084-7 \
65085,765087-765096,765098-765103,765105-765131,765133-765138,765140,765143,765145-765 \
155,765157-765161,765163-765223,765225,765228-765229,765231-765233,765235,765237-76531 \
0,765312-765319,765321-765322,765324-765329,765331-765334,765336-765337,765339-765341, \
765347,765351,765354-765357,765360-765362,765371,765373-765379,765381,765383,765385-76 \
5577,765579-765693,765695-765736,765738-765739,765742-765745,765747-765749,765751-765753,765757-765760,765762,765764-765765,765767,
765769,765773-765774,765777-765778,765780-765781,765783-765784,765789-765790,765792- \
765803,765805-765852,765854-765856,765858-765874,765876,765878-766054,766056,766058-76 \
6085,766087-766088,766091-766093,766096-766111,766113-766120,766122-766139,766141-7662 \
17,766219-766232,766234-766246,766248-766266,766268-766278,766280-766287,766289-766344 \
,766346-766356,766358-766366,766368-766370,766372-766373,766375-766388,766390-766420,7 \
66422-766538,766540-766734,766736-766749,766751-766768,766770-766774,766776-766780,766 \
782,766784-766789,766791-766831,766833-766834,766836,766838-766898,766900-767026,76702 \
8-767029,767031-767040,767042-767046,767048-767232,767234-767551,767553-767554,767556, \
767558-767805,767807-767946,767948-767951,767953-768069,768071-768089,768091-768401,76 \
8403-768538,768540-768683,768685-768794,768899-768929,769041-769139,769141,769463,7694 \
76,770915,771310-771345,771705,772039,775026,779854,780251,780286-780298,781595,782029,782647-782963,782965-782968,783303,784129-78
4380,784383-784427,784547,789925,791184,791200,791414,791430,792202-792950,792957-79 \
3296,795745,797348-797722,805191,805430,805701-805702,807761,817088,820074,821814,8238 \
65,824289-825075,825077-825083,825085-825805,825807-826354,826356-827490,827492-827891 \
,827893-827903,827905-827944,827946-827949,827951-828972,828974-830099,830101-830132,8 \
30134-830442,830444-830477,830479-830549,830551-830875,830877-830932,830934-834241 \
/trunk/KDE/kdepim:1-810191,810193-810196,810198-822578,822624,822775,822833,822861,822 \
903,822960,822969-822985,822987-823362,823364-823365,823367-823368,823370,823372-82347 \
7,823480,823482-823486,823488-823500,823502-823622,823624-823629,823631-823665,823667, \
823669-823979,823981-823987,823989-824216,824218-824242,824244-824289,824291-824293,82 \
4295-824298,824300-824303,824305-824344,824346-824406,824408-824417,824419-824422,8244 \
24-824442,824444-824456,824459-824472,824474-824565,824567-824569,824571-824572,824574-824636,824639,824641-824653,824655-824691,82492
1,824954,824958,825240,825665,825668,826044,826150,826190,826525,826535,826902,82690 \
9,827447,827706-827707,827711,827714,827754,828222,828925,829137,829150,829152,829162- \
829163,829242,830104,830740,830745,830758,831068,831092,831134,831154,831369,831388,83 \
1410,832553,832812,832937,832949,832951,833243,833251,833404,833417,833848,834052,834075,834078,834335
--- branches/kdepim/enterprise4/kdepim/korganizer/koagenda.cpp #834958:834959
@@ -936,9 +936,10 @@
if ( mEndCell != gpos ) {
if ( !mItemMoved ) {
if ( !mChanger || !mChanger->beginChange( mActionItem->incidence() ) ) {
- KMessageBox::information( this, i18n("Unable to lock item for "
- "modification. You cannot change make any changes."),
- i18n("Locking Failed"), "AgendaLockingFailed" );
+ KMessageBox::information( this,
+ i18n( "Unable to lock item for modification "
+ "You cannot make any changes." ),
+ i18n( "Locking Failed" ), "AgendaLockingFailed" );
mScrollUpTimer.stop();
mScrollDownTimer.stop();
mActionItem->resetMove();
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic