]> git.pld-linux.org Git - packages/kde4-kdepimlibs.git/blame - kde4-kdepimlibs-branch.diff
- 4.4.4
[packages/kde4-kdepimlibs.git] / kde4-kdepimlibs-branch.diff
CommitLineData
5c7cd749 1Index: cmake/modules/FindLibical.cmake
dcf45b0e 2===================================================================
5c7cd749
AM
3--- cmake/modules/FindLibical.cmake (.../tags/KDE/4.4.1/kdepimlibs) (wersja 1104125)
4+++ cmake/modules/FindLibical.cmake (.../branches/KDE/4.4/kdepimlibs) (wersja 1104125)
5@@ -4,8 +4,10 @@
6 # LIBICAL_INCLUDE_DIRS - the Libical include directories
7 # LIBICAL_LIBRARIES - The libraries needed to use Libical
8 # LIBICAL_VERSION = The value of ICAL_VERSION defined in ical.h
9+# LIBICAL_MAJOR_VERSION = The library major version number
10+# LIBICAL_MINOR_VERSION = The library minor version number
11
12-# Copyright (c) 2008, Allen Winter <winter@kde.org>
13+# Copyright (c) 2008,2010 Allen Winter <winter@kde.org>
14 #
15 # Redistribution and use is allowed according to the terms of the BSD license.
16 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
17@@ -72,6 +74,10 @@
18 message(FATAL_ERROR "Unable to compile or run the libical version detection program.")
19 endif(COMPILE_RESULT AND RUN_RESULT EQUAL 1)
20
21+ #compute the major and minor version numbers
22+ string(REGEX REPLACE "\\..*$" "" LIBICAL_MAJOR_VERSION ${LIBICAL_VERSION})
23+ string(REGEX REPLACE "^.*\\." "" LIBICAL_MINOR_VERSION ${LIBICAL_VERSION})
dcf45b0e 24+
5c7cd749 25 endif(LIBICAL_INCLUDE_DIRS AND LIBICAL_LIBRARIES)
dcf45b0e 26
5c7cd749
AM
27 include(FindPackageHandleStandardArgs)
28Index: kcal/dndfactory.cpp
dcf45b0e 29===================================================================
5c7cd749
AM
30--- kcal/dndfactory.cpp (.../tags/KDE/4.4.1/kdepimlibs) (wersja 1104125)
31+++ kcal/dndfactory.cpp (.../branches/KDE/4.4/kdepimlibs) (wersja 1104125)
32@@ -250,18 +250,17 @@
33 kDebug() << "Can't parse clipboard";
34 return 0;
35 }
36- Incidence *ret = 0;
dcf45b0e 37
5c7cd749
AM
38 Incidence::List incList = cal->incidences();
39- Incidence *inc = incList.first();
40+ Incidence *inc = incList.isEmpty() ? 0 : incList.first();
dcf45b0e 41
5c7cd749
AM
42- if ( !incList.isEmpty() && inc ) {
43+ if ( inc ) {
44 inc = inc->clone();
45-
46 inc->recreate();
47+ }
dcf45b0e 48
5c7cd749
AM
49+ if ( inc && newDate.isValid() ) {
50 if ( inc->type() == "Event" ) {
51-
52 Event *anEvent = static_cast<Event*>( inc );
53 // Calculate length of event
54 int daysOffset = anEvent->dtStart().date().daysTo(
55@@ -302,9 +301,7 @@
56 } else {
57 kDebug() << "Trying to paste unknown incidence of type" << inc->type();
58 }
59-
60- ret = inc;
61 }
62 delete cal;
63- return ret;
64+ return inc;
dcf45b0e 65 }
5c7cd749
AM
66Index: kcal/todo.cpp
67===================================================================
68--- kcal/todo.cpp (.../tags/KDE/4.4.1/kdepimlibs) (wersja 1104125)
69+++ kcal/todo.cpp (.../branches/KDE/4.4/kdepimlibs) (wersja 1104125)
70@@ -296,7 +296,9 @@
71 return KDateTime();
72 }
73 if ( recurs() && !first ) {
74- return d->mDtRecurrence.addDays( dtDue( true ).daysTo( IncidenceBase::dtStart() ) );
75+ KDateTime dt = d->mDtRecurrence.addDays( dtDue( true ).daysTo( IncidenceBase::dtStart() ) );
76+ dt.setTime( IncidenceBase::dtStart().time() );
77+ return dt;
78 } else {
79 return IncidenceBase::dtStart();
80 }
81Index: kioslave/sieve/sieve.protocol
82===================================================================
83--- kioslave/sieve/sieve.protocol (.../tags/KDE/4.4.1/kdepimlibs) (wersja 1104125)
84+++ kioslave/sieve/sieve.protocol (.../branches/KDE/4.4/kdepimlibs) (wersja 1104125)
85@@ -30,6 +30,7 @@
86 Description[it]=Un IOSlave per il protocollo di filtraggio della posta Sieve
87 Description[ja]=Sieve メールフィルタリングプロトコルのための ioslave
88 Description[km]=ioslave សម្រាប់​ពិធីការ​តម្រង​សំបុត្រ​របស់ Sieve
89+Description[lt]=Sieve pašto filtravimo protokolo palaikymas
90 Description[lv]=IO apstrādātājs Sieve pasta filtrēšanas protokolam
91 Description[nb]=En ioslave for Sieve e-postfiltrering
92 Description[nds]=In-/Utgaavmoduul för't Nettpostfilter-Protokoll Sieve
93Index: kontactinterface/kontactplugin.desktop
94===================================================================
95--- kontactinterface/kontactplugin.desktop (.../tags/KDE/4.4.1/kdepimlibs) (wersja 1104125)
96+++ kontactinterface/kontactplugin.desktop (.../branches/KDE/4.4/kdepimlibs) (wersja 1104125)
97@@ -14,13 +14,16 @@
98 Name[fr]=Module externe pour Kontact
99 Name[ga]=Breiseán Kontact
100 Name[gl]=Engadido de Kontact
101+Name[hu]=Kontact-modul
102 Name[it]=Plugin di Kontact
103 Name[ja]=Kontact プラグイン
104 Name[km]=កម្មវិធី​ជំនួយ Kontact
105+Name[lt]=Kontact priedas
106 Name[lv]=Kontact spraudnis
107 Name[nb]=Kontact-programtillegg
108 Name[nds]=Kontact-Moduul
109 Name[nl]=Kontact-plugin
110+Name[nn]=Kontakt-tillegg
111 Name[pa]=ਕੇਸੰਪਰਕ ਪਲੱਗਇਨ
112 Name[pt]='Plugin' do Kontact
113 Name[pt_BR]=Plug-in do Kontact
114Index: mailtransport/smtpconfigwidget.cpp
115===================================================================
116--- mailtransport/smtpconfigwidget.cpp (.../tags/KDE/4.4.1/kdepimlibs) (wersja 1104125)
117+++ mailtransport/smtpconfigwidget.cpp (.../branches/KDE/4.4/kdepimlibs) (wersja 1104125)
118@@ -109,9 +109,11 @@
119 ui.noAuthPossible->setVisible( true );
120 ui.kcfg_requiresAuthentication->setChecked( false );
121 ui.kcfg_requiresAuthentication->setEnabled( false );
122+ ui.kcfg_requiresAuthentication->setVisible( false );
123 } else {
124 ui.noAuthPossible->setVisible( false );
125 ui.kcfg_requiresAuthentication->setEnabled( true );
126+ ui.kcfg_requiresAuthentication->setVisible( true );
127 }
128 }
129 };
130Index: mailtransport/smtpsettings.ui
dcf45b0e 131===================================================================
5c7cd749
AM
132--- mailtransport/smtpsettings.ui (.../tags/KDE/4.4.1/kdepimlibs) (wersja 1104125)
133+++ mailtransport/smtpsettings.ui (.../branches/KDE/4.4/kdepimlibs) (wersja 1104125)
134@@ -133,14 +133,29 @@
135 <string comment="advanced smtp settings">Advanced</string>
136 </attribute>
137 <layout class="QGridLayout" name="gridLayout">
138- <item row="0" column="0" colspan="3">
139- <widget class="QCheckBox" name="kcfg_requiresAuthentication">
140+ <item row="1" column="0" colspan="3">
141+ <widget class="QLabel" name="noAuthPossible">
142+ <property name="visible">
143+ <bool>false</bool>
144+ </property>
145+ <property name="frameShape">
146+ <enum>QFrame::Box</enum>
147+ </property>
148+ <property name="frameShadow">
149+ <enum>QFrame::Plain</enum>
150+ </property>
151+ <property name="lineWidth">
152+ <number>0</number>
153+ </property>
154 <property name="text">
155- <string>Server &amp;requires authentication</string>
156+ <string>This server does not support authentication</string>
157 </property>
158+ <property name="alignment">
159+ <set>Qt::AlignCenter</set>
160+ </property>
161 </widget>
162 </item>
163- <item row="1" column="0">
164+ <item row="2" column="0">
165 <widget class="QLabel" name="usernameLabel">
166 <property name="enabled">
167 <bool>false</bool>
168@@ -156,14 +171,14 @@
169 </property>
170 </widget>
171 </item>
172- <item row="1" column="1" colspan="2">
173+ <item row="2" column="1" colspan="2">
174 <widget class="KLineEdit" name="kcfg_userName">
175 <property name="enabled">
176 <bool>false</bool>
177 </property>
178 </widget>
179 </item>
180- <item row="2" column="0">
181+ <item row="3" column="0">
182 <widget class="QLabel" name="passwordLabel">
183 <property name="enabled">
184 <bool>false</bool>
185@@ -179,7 +194,7 @@
186 </property>
187 </widget>
188 </item>
189- <item row="2" column="1" colspan="2">
190+ <item row="3" column="1" colspan="2">
191 <widget class="KLineEdit" name="password">
192 <property name="enabled">
193 <bool>false</bool>
194@@ -192,7 +207,7 @@
195 </property>
196 </widget>
197 </item>
198- <item row="3" column="1" colspan="2">
199+ <item row="4" column="1" colspan="2">
200 <widget class="QCheckBox" name="kcfg_storePassword">
201 <property name="enabled">
202 <bool>false</bool>
203@@ -202,7 +217,7 @@
204 </property>
205 </widget>
206 </item>
207- <item row="4" column="0" colspan="3">
208+ <item row="5" column="0" colspan="3">
209 <widget class="KButtonGroup" name="kcfg_authenticationType">
210 <property name="enabled">
211 <bool>false</bool>
212@@ -260,17 +275,17 @@
213 </layout>
214 </widget>
215 </item>
216- <item row="5" column="0" colspan="3">
217+ <item row="6" column="0" colspan="3">
218 <widget class="KSeparator" name="kseparator_3"/>
219 </item>
220- <item row="6" column="0" colspan="3">
221+ <item row="7" column="0" colspan="3">
222 <widget class="QCheckBox" name="kcfg_specifyHostname">
223 <property name="text">
224 <string>Sen&amp;d custom hostname to server</string>
225 </property>
226 </widget>
227 </item>
228- <item row="7" column="0" colspan="2">
229+ <item row="8" column="0" colspan="2">
230 <widget class="QLabel" name="hostnameLabel">
231 <property name="enabled">
232 <bool>false</bool>
233@@ -286,17 +301,17 @@
234 </property>
235 </widget>
236 </item>
237- <item row="7" column="2">
238+ <item row="8" column="2">
239 <widget class="KLineEdit" name="kcfg_localHostname">
240 <property name="enabled">
241 <bool>false</bool>
242 </property>
243 </widget>
244 </item>
245- <item row="8" column="0" colspan="3">
246+ <item row="9" column="0" colspan="3">
247 <widget class="KSeparator" name="kseparator_2"/>
248 </item>
249- <item row="9" column="0" colspan="2">
250+ <item row="10" column="0" colspan="2">
251 <widget class="QLabel" name="precommandLabel">
252 <property name="text">
253 <string>Precommand:</string>
254@@ -306,35 +321,17 @@
255 </property>
256 </widget>
257 </item>
258- <item row="9" column="2">
259+ <item row="10" column="2">
260 <widget class="KLineEdit" name="kcfg_precommand"/>
261 </item>
262+ <item row="0" column="0" colspan="3">
263+ <widget class="QCheckBox" name="kcfg_requiresAuthentication">
264+ <property name="text">
265+ <string>Server &amp;requires authentication</string>
266+ </property>
267+ </widget>
268+ </item>
269 </layout>
270- <widget class="QLabel" name="noAuthPossible">
271- <property name="geometry">
272- <rect>
273- <x>0</x>
274- <y>0</y>
275- <width>100</width>
276- <height>30</height>
277- </rect>
278- </property>
279- <property name="visible">
280- <bool>false</bool>
281- </property>
282- <property name="frameShape">
283- <enum>QFrame::Box</enum>
284- </property>
285- <property name="frameShadow">
286- <enum>QFrame::Raised</enum>
287- </property>
288- <property name="text">
289- <string>This server does not support authentication</string>
290- </property>
291- <property name="alignment">
292- <set>Qt::AlignCenter</set>
293- </property>
294- </widget>
295 </widget>
296 </widget>
297 </item>
298Index: kabc/plugins/file/file.desktop
299===================================================================
300--- kabc/plugins/file/file.desktop (.../tags/KDE/4.4.1/kdepimlibs) (wersja 1104125)
301+++ kabc/plugins/file/file.desktop (.../branches/KDE/4.4/kdepimlibs) (wersja 1104125)
302@@ -61,10 +61,11 @@
303 Comment[fr]=Fourni l'accès aux contacts stockés dans un seul fichier local. Le format VCard et d'autres formats sont pris en charge en fonction des modules externes disponibles.
304 Comment[ga]=Soláthraíonn sé seo rochtain ar theagmhálacha, stóráilte i gcomhad aonair. Tacaítear le comhaid v-Chárta agus formáidí eile, ag brath ar na breiseáin atá ar fáil.
305 Comment[gl]=Dá acceso a contactos gardados nun único ficheiro local. Admite ficheiros vCard estándar e outros formatos en función das extensións dispoñíbeis.
306-Comment[hu]=Névjegyek elérését biztosítja. Minden névjegy egy közös helyi fájlban található. Támogatja a standard vCard formátumot, és bővítmények segítségével más formátumok is kezelhetők.
307+Comment[hu]=A névjegyek elérését biztosítja. Minden névjegy egy közös helyi fájlban található. Támogatja a standard vCard formátumot, és bővítmények segítségével más formátumok is kezelhetők.
308 Comment[it]=Fornisce accesso a contatti memorizzati in un singolo file locale. Gestisce file in standard VCard e altri formati in base ai plugin disponibili.
309 Comment[ja]=単一のローカルファイルに保存されている連絡先へのアクセスを提供します。標準の VCard ファイルと、利用可能なプラグインに応じたフォーマットをサポートします。
310 Comment[km]=ផ្ដល់​កា​រចូលដំណើរការ​ទៅ​ទំនាក់ទំនង​​នៅ​ក្នុង​ឯកសារ​មូលដ្ឋាន​តែ​មួយ ។ គាំទ្រ​ឯកសារ VCard ស្តង់ដារ និង​ទ្រង់ទ្រាយ​ផ្សេងៗ​ ដោយ​អាស្រ័យ​លើ​កម្មវិធី​ជំនួយ​ដែល​មាន ។
311+Comment[lt]=Suteikia prieigą prie kontaktų, saugomų viename vietiniame faile. Palaiko standartinius VCard failus ir kitus formatus, jei yra įdiegti atitinkami įskiepiai.
312 Comment[lv]=Nodrošina piekļuvi kontaktiem, kas glabājas vienā lokālā failā. Atbalsta standarta VCard failus un citus formātus, atkarībā no pieejamajiem spraudņiem.
313 Comment[nb]=Gir tilgang til kontakter, lagret i en enkelt lokal fil. Støtter standard vCard og andre formater avhengig av tilgjengelige programtillegg.
314 Comment[nds]=Stellt Togriep op Kontakten praat, de in een enkel lokaal Datei wohrt warrt. Ünnerstütt VCard-Dateien un anner Formaten na de 'verföögboren Modulen.
315Index: kabc/plugins/ldapkio/ldapkio.desktop
316===================================================================
317--- kabc/plugins/ldapkio/ldapkio.desktop (.../tags/KDE/4.4.1/kdepimlibs) (wersja 1104125)
318+++ kabc/plugins/ldapkio/ldapkio.desktop (.../branches/KDE/4.4/kdepimlibs) (wersja 1104125)
319@@ -65,6 +65,7 @@
320 Comment[it]=Fornisce accesso a contatti memorizzati su un server LDAP
321 Comment[ja]=LDAP ディレクトリサーバに保存されている連絡先へのアクセスを提供します。
322 Comment[km]=ផ្ដល់​ការ​ចូលដំណើរការ​ទៅ​ទំនាក់ទំនង​ដែល​បានផ្ទុក​នៅ​លើ​ម៉ាស៊ីន​បម្រើ​ថត LDAP
323+Comment[lt]=Suteikia prieigą prie kontaktų, saugomų LDAP serveryje
324 Comment[lv]=Nodrošina piekļuvi kontaktiem, kas glabājas LDAP direktorija serverī
325 Comment[nb]=Gir tilgang til kontakter lagret på en LDAP-katalogtjener
326 Comment[nds]=Stellt Togriep op Kontakten praat, de op en LDAP-Vertelenserver wohrt warrt
327Index: kabc/plugins/net/net.desktop
328===================================================================
329--- kabc/plugins/net/net.desktop (.../tags/KDE/4.4.1/kdepimlibs) (wersja 1104125)
330+++ kabc/plugins/net/net.desktop (.../branches/KDE/4.4/kdepimlibs) (wersja 1104125)
331@@ -65,6 +65,7 @@
332 Comment[it]=Fornisce accesso a contatti su file remoti usando KIO, l'infrastruttura di rete di KDE. Gestisce file in standard VCard e altri formati in base ai plugin disponibili.
333 Comment[ja]=KDE のネットワークフレームワーク KIO を使って、リモートファイルに保存されている連絡先へのアクセスを提供します。標準の VCard ファイルと、利用可能なプラグインに応じたフォーマットをサポートします。
334 Comment[km]=ផ្ដល់​កា​រចូលដំណើរការ​ទៅកាន់​ទំនាក់ទំនង​ក្នុង​​ឯកសារ​ពី​ចម្ងាយ ដោយ​ប្រើ KIO ​គ្រោងការណ៍​បណ្ដាញ​របស់ KDE ។ គាំទ្រ​ឯកសារ VCard ស្តង់ដារ និង​ទ្រង់ទ្រាយ​ផ្សេងៗ​ទៀត ដោយ​អាស្រ័យ​លើ​កម្មវិធី​ជំនួយ​ដែល​មាន ។
335+Comment[lt]=Suteikia prieigą prie kontaktų, esančių nutolusiuose failuose, naudojant KDE tinklo infrastruktūrą KIO. Palaiko standartinius VCard failus ir kitus failų formatus, jei įdiegti juos palaikantys įskiepiai.
336 Comment[lv]=Nodrošina piekļuvi kontaktiem attālinātos failus, izmantojot KDE tīklošanas ietvaru KIO. Atbalsta standarta VCard failus un citus formātus, atkarībā no pieejamajiem spraudņiem.
337 Comment[nb]=Gir tilgang til kontakter i nettverksfiler, ved bruk av KDEs rammeverk KIO for nettverk. Støtter standard vCard og andre formater avhengig av tilgjengelige programtillegg.
338 Comment[nds]=Stellt Togriep op Kontakten binnen feern Dateien praat, bruukt KDE sien Nettwark-Rahmenwark KIO. Ünnerstütt VCard-Dateien un anner Formaten na de verföögboren Modulen.
339Index: kabc/plugins/dir/dir.desktop
340===================================================================
341--- kabc/plugins/dir/dir.desktop (.../tags/KDE/4.4.1/kdepimlibs) (wersja 1104125)
342+++ kabc/plugins/dir/dir.desktop (.../branches/KDE/4.4/kdepimlibs) (wersja 1104125)
343@@ -18,6 +18,7 @@
344 Name[it]=Cartella
345 Name[ja]=フォルダ
346 Name[km]=ថត
347+Name[lt]=Aplankas
348 Name[lv]=Mape
349 Name[nb]=Mappe
350 Name[nds]=Orner
351@@ -53,10 +54,11 @@
352 Comment[fr]=Fourni l'accès aux contacts stockés chacun dans un fichier dans le dossier indiqué. Le format VCard et d'autres formats sont pris en charge en fonction des modules externes disponibles
353 Comment[ga]=Soláthraíonn sé seo rochtain ar theagmhálacha, gach ceann stóráilte i gcomhad aonair, i bhfillteán sonraithe. Tacaítear le comhaid v-Chárta agus le formáidí eile, ag brath ar na breiseáin atá ar fáil.
354 Comment[gl]=Dá acceso aos contactos, cada un gardado nun ficheiro nun cartafol dado. Admite ficheiros vCard estándar e outros formatos, en función da dispoñibilidade de extensións.
355-Comment[hu]=Névjegyek elérését biztosítja. Minden névjegy külön fájlban található, egy adott mappában. Támogatja a standard vCard formátumot, és bővítmények segítségével más formátumok is kezelhetők.
356+Comment[hu]=A névjegyek elérését biztosítja. Minden névjegy külön fájlban található, egy adott mappában. Támogatja a standard vCard formátumot, és bővítmények segítségével más formátumok is kezelhetők.
357 Comment[it]=Fornisce accesso a contatti, ciascuno dei quali memorizzato in un singolo file in una cartella data. Gestisce file in standard VCard e altri formati in base ai plugin disponibili.
358 Comment[ja]=それぞれが単一のファイルに保存されている任意のフォルダ内の連絡先へのアクセスを提供します。標準の VCard ファイルと、利用可能なプラグインに応じたフォーマットをサポートします。
359 Comment[km]=ផ្ដល់​ការ​ចូលដំណើរការ​ទៅ​កាន់​ទំនាក់ទំនង ដែល​ទំនាក់ទំនង​នីមួយៗ​ត្រូវ​បានផ្ទុកនៅ​ក្នុង​ឯកសារ​តែ​មួយ នៅ​ក្នុង​ថត​ដែល​បានផ្ដល់​ឲ្យ ។ គាំទ្រ​ឯកសារ VCard និង​ទ្រង់ទ្រាយ​ផ្សេងៗ​ ដោយ​អាស្រ័យ​លើ​កម្មវិធី​ជំនួយ​ដែល​មាន ។
360+Comment[lt]=Suteikia prieigą prie kontaktų, kurių kiekvienas saugomas atskirame faile konkrečiame aplanke. Palaiko standartinius VCard failus ir kitus formatus, priklausomai nuo įdiegtų įskiepių.
361 Comment[lv]=Nodrošina pieeju kontaktiem, kas katrs saglabāts individuālā failā norādītajā mapē. Atbalsta standarta VCard failus un citus formātus, atkarībā no pieejamajiem spraudņiem.
362 Comment[nb]=Gir tilgang til kontakter, lagret hver for seg i en enkelt fil, i en gitt mappe. Støtter standard vCard og andre formater avhengig av tilgjengelige programtillegg.
363 Comment[nds]=Stellt Togriep op Kontakten praat, elkeen binnen een Datei binnen en angeven Orner. Ünnerstütt VCard-Dateien un anner Formaten na de verföögboren Modulen.
364Index: kabc/kabc_manager.desktop
365===================================================================
366--- kabc/kabc_manager.desktop (.../tags/KDE/4.4.1/kdepimlibs) (wersja 1104125)
367+++ kabc/kabc_manager.desktop (.../branches/KDE/4.4/kdepimlibs) (wersja 1104125)
368@@ -17,7 +17,7 @@
369 Name[ga]=Teagmhálacha
370 Name[gl]=Contactos
371 Name[hne]=सम्पर्क
372-Name[hu]=Partnerek
373+Name[hu]=Névjegyek
374 Name[it]=Contatti
375 Name[ja]=連絡先
376 Name[km]=ទំនាក់ទំនង​
377Index: kabc/vcardparser/vcardparser.cpp
378===================================================================
379--- kabc/vcardparser/vcardparser.cpp (.../tags/KDE/4.4.1/kdepimlibs) (wersja 1104125)
380+++ kabc/vcardparser/vcardparser.cpp (.../branches/KDE/4.4/kdepimlibs) (wersja 1104125)
381@@ -133,16 +133,14 @@
382 bool wasBase64Encoded = false;
dcf45b0e 383
5c7cd749
AM
384 if ( vCardLine.parameterList().contains( QLatin1String( "encoding" ) ) ) {
385+ const QString encoding = vCardLine.parameter( QLatin1String( "encoding" ) ).toLower();
dcf45b0e 386+
5c7cd749
AM
387 // have to decode the data
388- if ( vCardLine.parameter( QLatin1String( "encoding" ) ).toLower() ==
389- QLatin1String( "b" ) ||
390- vCardLine.parameter( QLatin1String( "encoding" ) ).toLower() ==
391- QLatin1String( "base64" ) ) {
392+ if ( encoding == QLatin1String( "b" ) || encoding == QLatin1String( "base64" ) ) {
393 output = QByteArray::fromBase64( value );
394 wasBase64Encoded = true;
395 }
396- else if ( vCardLine.parameter( QLatin1String( "encoding" ) ).toLower() ==
397- QLatin1String( "quoted-printable" ) ) {
398+ else if ( encoding == QLatin1String( "quoted-printable" ) ) {
399 // join any qp-folded lines
400 while ( value.endsWith( '=' ) && it != linesEnd ) {
401 value.chop( 1 ); // remove the '='
402@@ -150,6 +148,8 @@
403 ++it;
404 }
405 KCodecs::quotedPrintableDecode( value, output );
406+ } else if ( encoding == QLatin1String( "8bit" ) ) {
407+ output = value;
408 } else {
409 qDebug( "Unknown vcard encoding type!" );
410 }
411Index: akonadi/contact/kcm/akonadicontact_actions.desktop
dcf45b0e 412===================================================================
5c7cd749
AM
413--- akonadi/contact/kcm/akonadicontact_actions.desktop (.../tags/KDE/4.4.1/kdepimlibs) (wersja 1104125)
414+++ akonadi/contact/kcm/akonadicontact_actions.desktop (.../branches/KDE/4.4/kdepimlibs) (wersja 1104125)
415@@ -21,13 +21,16 @@
416 Name[fi]=Yhteystietotoiminnot
417 Name[fr]=Actions sur les contacts
418 Name[gl]=Accións de contacto
419+Name[hu]=Névjegyműveletek
420 Name[it]=Azioni per i contatti
421 Name[ja]=連絡先アクション
422 Name[km]=អំពើ​ទំនាក់​ទំនង
423+Name[lt]=Kontaktų veiksmai
424 Name[lv]=Kontaktu darbības
425 Name[nb]=Kontakthandlinger
426 Name[nds]=Kontakt-Akschonen
427 Name[nl]=Contactpersoon-acties
428+Name[nn]=Kontakthandlingar
429 Name[pa]=ਸੰਪਰਕ ਐਕਸ਼ਨ
430 Name[pt]=Acções do Contacto
431 Name[pt_BR]=Ações do contatos
432@@ -53,13 +56,16 @@
433 Comment[fi]=Yhteystietotoimintojen asetukset
434 Comment[fr]=Configurer les actions sur les contacts
435 Comment[gl]=Configurar as accións de contacto
436+Comment[hu]=A névjegyműveletek beállítása
437 Comment[it]=Configua le azioni per i contatti
438 Comment[ja]=連絡先アクションの設定
439 Comment[km]=កំណត់​រចនាសម្ព័ន្ធ​អំពើ​ទំនាក់​ទំនង
440+Comment[lt]=Konfigūruoti kontaktų veiksmus
441 Comment[lv]=Konfigurēt kontaktu darbības
442 Comment[nb]=Sett opp kontakthandlinger
443 Comment[nds]=Kontakt-Akschonen instellen
444 Comment[nl]=De contactpersoon-actie configureren
445+Comment[nn]=Set opp kontakthandlingar
446 Comment[pa]=ਸੰਪਰਕ ਐਕਸ਼ਨ ਸੰਰਚਨਾ
447 Comment[pt]=Configurar as Acções do Contacto
448 Comment[pt_BR]=Configura as ações do contato
This page took 0.151926 seconds and 4 git commands to generate.