[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/kdepim/enterprise4/kdepim
From:       Thomas McGuire <mcguire () kde ! org>
Date:       2008-10-02 17:01:55
Message-ID: 1222966915.651336.5894.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 867020 by tmcguire:

Merged revisions 863197 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.1/kdepim

........
  r863197 | mlaurent | 2008-09-21 14:04:31 +0200 (Sun, 21 Sep 2008) | 3 lines
  
  Backport:
  Fix translator
........


 _M            . (directory)  
 M  +1 -2      kaddressbook/main.cpp  


** branches/kdepim/enterprise4/kdepim #property svnmerge-integrated
   - /branches/KDE/4.1/kdepim:1-835448,835459-835907,835909-836091,836093-836399,83640 \
1-837908,838076,838632,838637,838639,838644,838790,838809,838811,838979,839014-839015, \
839021,839049,839094,839116,839128,839149,839462-839464,839466,839487,839491,839493,83 \
9528,839555,839605,839607,839633-839634,839666,839683-839684,839697,840219,840356-8408 \
63,840865-841077,841083,841235,841238,841240,841598,841609,841704,841811-842273,842275 \
-843367,843369-846139,846141-847247,847249-848138,848140-848555,848557-849181,849940,8 \
50011,850178,850555-850558,850564,850567,850569,850663,850676,851002,851207-851209,851 \
211,851215-851216,851218,851221,851233,852545,852562,852752,852763,852799,853021,85312 \
3,853128,853314-855230,855232-855273,855863,855970,855979,856012,856015,856396,856468, \
856885,857064,857104,857894,857916,858152,858206,858265-858267,858690-858827,860088,860260-860261,860276,860950,861352,862567 \
/branches/kdepim/enterprise/kdepim:1-709144,709146-709321,709323-709402,709404,709406-7094
  11,709413-709431,709433-709472,709474-709478,709480-709487,709489-709850,709852-7105 \
62,710564,710566-710634,710636-710641,710643,710645-711039,711041-711164,711166-711600 \
,711602-711780,711782-712273,712275-712278,712280-713446,713448,713450-713461,713463-7 \
14100,714102-714449,714451-715217,715219-715232,715234-716226,716228-717292,717294,717 \
296-718340,718342-721121,721123-724381,724383-724384,724386-724443,724445-728089,72809 \
1-728450,728452-728580,728582-729580,729583-731333,731335-731669,731671-731719,731721- \
731867,731869-731870,731872-732022,732024-733047,733049-733088,733090-733463,733465-73 \
3468,733470-734534,734536,734538-734580,734582,734586-734591,734593-735174,735176-7352 \
04,735206-735246,735248-735281,735283-735300,735302-736232,736235-736242,736244-736314 \
,736316-736376,736378-737483,737485-737489,737492-737495,737497-740441,740443-740446,7 \
40448-740459,740461-740471,740473-743887,743889-744692,744694-744707,744709-746931,746933-747591,747593-757104,757106-757110,757112
                
 -758210,758212-758786,758788,758790-758794,758796-759131,759133-759152,759154-759271, \
759273-759274,759276,759278-759285,759287-760352,760354-761115,761117-761118,761120-76 \
1123,761125-761127,761131,761134,761137,761139-761140,761144-761145,761147,761149-7612 \
30,761232-761240,761242-761244,761246-761330,761332-761334,761336-761337,761339-761374 \
,761376-761533,761535,761537,761539-761546,761548-761550,761552-761553,761555-761556,7 \
61558-761559,761561,761563-761564,761566-761570,761572,761574-761580,761582-761601,761 \
603-761620,761622-761895,761897-761900,761902-762898,762900-762904,762906-762907,76291 \
0-762921,762923-762988,762990-763015,763017-763037,763040-763520,763522-764287,764289- \
764582,764584-764597,764599,764602-764604,764606-764610,764612-764617,764619-764627,76 \
4629,764631-764670,764672-764679,764681-764682,764684-764745,764747-764821,764823-7648 \
49,764851-764875,764877-764886,764888-764893,764895-765070,765072,765076-765079,765081-765082,765084-765085,765087-765096,765098-7
  65103,765105-765131,765133-765138,765140,765143,765145-765155,765157-765161,765163-7 \
65223,765225,765228-765229,765231-765233,765235,765237-765310,765312-765319,765321-765 \
322,765324-765329,765331-765334,765336-765337,765339-765341,765347,765351,765354-76535 \
7,765360-765362,765371,765373-765379,765381,765383,765385-765577,765579-765739,765742- \
765745,765747-765749,765751-765754,765757-765760,765762,765764-765765,765767,765769,76 \
5773-765774,765777-765778,765780-765781,765783-765784,765789-765790,765792-765803,7658 \
05-765852,765854-765856,765858-765874,765876,765878-766054,766056,766058-766085,766087 \
-766088,766091-766093,766096-766111,766113-766120,766122-766139,766141-766217,766219-7 \
66232,766234-766246,766248-766266,766268-766278,766280-766287,766289-766344,766346-766 \
356,766358-766366,766368-766370,766372-766373,766375-766388,766390-766420,766422-76653 \
8,766540-766734,766736-766780,766782,766784-766789,766791-766831,766833-766834,766836,766838-766898,766900-767026,767028-767029,767
  031-767040,767042-767046,767048-767232,767234-767551,767553-767554,767556,767558-767 \
946,767948-767951,767953-768089,768091-768683,768685-769139,769141-769318,769320-76932 \
2,769324-769354,769356-769705,769707-769924,769926-771105,771107-771207,771209-771251, \
771253-772302,772304-772305,772307-772311,772313-772316,772318-773732,773734-774161,77 \
4163-775014,775017-775035,775037-775040,775042-775194,775196-775202,775204,775207-7752 \
11,775213-778001,778003-778004,778007,778010-778011,778013-778029,778031-778727,778729 \
-779448,779450-779482,779484-779505,779507-779852,779854-780175,780177-780210,780212-7 \
80452,780454-780495,780497,780499-780529,780531-783127,783129-783243,783245,783248-783 \
477,783479-784380,784383-784691,784693-785053,785055-785478,785480-785562,785564-78556 \
9,785571-787387,787389-788242,788245-788633,788635-791440,791443-793304,793306-793471, \
793473-793538,793540-795763,795765,795767-798444,798447-798448,798450-798495,798497-800070,800072-800167,800169-800440,800442-80061
  4,800616-802138,802140-802148,802150-802151,802153-803256,803258-803259,803261-80329 \
9,803301-803308,803310-803338,803340-803380,803383-803397,803399-804108,804110-804615, \
804617-805460,805701-805702,807761,816314,816323,817071-821370,821372-821378,821380-82 \
1648,821650,821652-825075,825077-825083,825085-826354,826356-827891,827893-827903,8279 \
05-827944,827946-827949,827951-828972,828974-830132,830134-830477,830479-830549,830551 \
-830875,830877-830932,830934-834241,837624,837626,838287,840224-840684,842115-842659,8 \
43189,843750,850513,850540,851016,851045,851328,853423-853426,853428-853431,853433-853494,856690,859561-860036,860309,861999,866381,866675
  + /branches/KDE/4.1/kdepim:1-835448,835459-835907,835909-836091,836093-836399,836401 \
-837908,838076,838632,838637,838639,838644,838790,838809,838811,838979,839014-839015,8 \
39021,839049,839094,839116,839128,839149,839462-839464,839466,839487,839491,839493,839 \
528,839555,839605,839607,839633-839634,839666,839683-839684,839697,840219,840356-84086 \
3,840865-841077,841083,841235,841238,841240,841598,841609,841704,841811-842273,842275- \
843367,843369-846139,846141-847247,847249-848138,848140-848555,848557-849181,849940,85 \
0011,850178,850555-850558,850564,850567,850569,850663,850676,851002,851207-851209,8512 \
11,851215-851216,851218,851221,851233,852545,852562,852752,852763,852799,853021,853123 \
,853128,853314-855230,855232-855273,855863,855970,855979,856012,856015,856396,856468,8 \
56885,857064,857104,857894,857916,858152,858206,858265-858267,858690-858827,860088,860260-860261,860276,860950,861352,862567,863197 \
/branches/kdepim/enterprise/kdepim:1-709144,709146-709321,709323-709402,709404,7094  \
06-709411,709413-709431,709433-709472,709474-709478,709480-709487,709489-709850,709852 \
-710562,710564,710566-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-717292,71729 \
4,717296-718340,718342-721121,721123-724381,724383-724384,724386-724443,724445-728089, \
728091-728450,728452-728580,728582-729580,729583-731333,731335-731669,731671-731719,73 \
1721-731867,731869-731870,731872-732022,732024-733047,733049-733088,733090-733463,7334 \
65-733468,733470-734534,734536,734538-734580,734582,734586-734591,734593-735174,735176 \
-735204,735206-735246,735248-735281,735283-735300,735302-736232,736235-736242,736244-7 \
36314,736316-736376,736378-737483,737485-737489,737492-737495,737497-740441,740443-740 \
446,740448-740459,740461-740471,740473-743887,743889-744692,744694-744707,744709-746931,746933-747591,747593-757104,757106-757110
  ,757112-758210,758212-758786,758788,758790-758794,758796-759131,759133-759152,759154 \
-759271,759273-759274,759276,759278-759285,759287-760352,760354-761115,761117-761118,7 \
61120-761123,761125-761127,761131,761134,761137,761139-761140,761144-761145,761147,761 \
149-761230,761232-761240,761242-761244,761246-761330,761332-761334,761336-761337,76133 \
9-761374,761376-761533,761535,761537,761539-761546,761548-761550,761552-761553,761555- \
761556,761558-761559,761561,761563-761564,761566-761570,761572,761574-761580,761582-76 \
1601,761603-761620,761622-761895,761897-761900,761902-762898,762900-762904,762906-7629 \
07,762910-762921,762923-762988,762990-763015,763017-763037,763040-763520,763522-764287 \
,764289-764582,764584-764597,764599,764602-764604,764606-764610,764612-764617,764619-7 \
64627,764629,764631-764670,764672-764679,764681-764682,764684-764745,764747-764821,764 \
823-764849,764851-764875,764877-764886,764888-764893,764895-765070,765072,765076-765079,765081-765082,765084-765085,765087-765096,7
  65098-765103,765105-765131,765133-765138,765140,765143,765145-765155,765157-765161,7 \
65163-765223,765225,765228-765229,765231-765233,765235,765237-765310,765312-765319,765 \
321-765322,765324-765329,765331-765334,765336-765337,765339-765341,765347,765351,76535 \
4-765357,765360-765362,765371,765373-765379,765381,765383,765385-765577,765579-765739, \
765742-765745,765747-765749,765751-765754,765757-765760,765762,765764-765765,765767,76 \
5769,765773-765774,765777-765778,765780-765781,765783-765784,765789-765790,765792-7658 \
03,765805-765852,765854-765856,765858-765874,765876,765878-766054,766056,766058-766085 \
,766087-766088,766091-766093,766096-766111,766113-766120,766122-766139,766141-766217,7 \
66219-766232,766234-766246,766248-766266,766268-766278,766280-766287,766289-766344,766 \
346-766356,766358-766366,766368-766370,766372-766373,766375-766388,766390-766420,76642 \
2-766538,766540-766734,766736-766780,766782,766784-766789,766791-766831,766833-766834,766836,766838-766898,766900-767026,767028-767
  029,767031-767040,767042-767046,767048-767232,767234-767551,767553-767554,767556,767 \
558-767946,767948-767951,767953-768089,768091-768683,768685-769139,769141-769318,76932 \
0-769322,769324-769354,769356-769705,769707-769924,769926-771105,771107-771207,771209- \
771251,771253-772302,772304-772305,772307-772311,772313-772316,772318-773732,773734-77 \
4161,774163-775014,775017-775035,775037-775040,775042-775194,775196-775202,775204,7752 \
07-775211,775213-778001,778003-778004,778007,778010-778011,778013-778029,778031-778727 \
,778729-779448,779450-779482,779484-779505,779507-779852,779854-780175,780177-780210,7 \
80212-780452,780454-780495,780497,780499-780529,780531-783127,783129-783243,783245,783 \
248-783477,783479-784380,784383-784691,784693-785053,785055-785478,785480-785562,78556 \
4-785569,785571-787387,787389-788242,788245-788633,788635-791440,791443-793304,793306- \
793471,793473-793538,793540-795763,795765,795767-798444,798447-798448,798450-798495,798497-800070,800072-800167,800169-800440,80044
  2-800614,800616-802138,802140-802148,802150-802151,802153-803256,803258-803259,80326 \
1-803299,803301-803308,803310-803338,803340-803380,803383-803397,803399-804108,804110- \
804615,804617-805460,805701-805702,807761,816314,816323,817071-821370,821372-821378,82 \
1380-821648,821650,821652-825075,825077-825083,825085-826354,826356-827891,827893-8279 \
03,827905-827944,827946-827949,827951-828972,828974-830132,830134-830477,830479-830549 \
,830551-830875,830877-830932,830934-834241,837624,837626,838287,840224-840684,842115-8 \
42659,843189,843750,850513,850540,851016,851045,851328,853423-853426,853428-853431,853433-853494,856690,859561-860036,860309,861999,866381,866675
                
--- branches/kdepim/enterprise4/kdepim/kaddressbook/main.cpp #867019:867020
@@ -108,8 +108,6 @@
 
 int main( int argc, char *argv[] )
 {
-  KLocale::setMainCatalog( "kaddressbook" );
-
   KAboutData about = KABCore::createAboutData();
   KCmdLineArgs::init( argc, argv, &about );
   KCmdLineArgs::addCmdLineOptions( kaddressbook_options() );
@@ -120,6 +118,7 @@
 
   KAddressBookApp app;
   KGlobal::locale()->insertCatalog( "libkdepim" );
+  KGlobal::locale()->insertCatalog( "kabc" );
 
   bool ret = app.exec();
   qDeleteAll( KMainWindow::memberList() );


[prev in list] [next in list] [prev in thread] [next in thread]