Changeset 129 for trunk

Timestamp:

Apr 9, 2022, 11:52:13 AM (3 years ago)

Author:

chronos

Message:

• Added: TVCard as TComponent descendant.
• Modified: TContactsFile renamed to TVCardFile and moved into separate file.

Location:

trunk

Files:

• Forms/UFormCompare.pas (modified) (3 diffs)
• Forms/UFormContact.pas (modified) (1 diff)
• Forms/UFormContacts.pas (modified) (9 diffs)
• Forms/UFormFind.pas (modified) (1 diff)
• Forms/UFormFindDuplicity.pas (modified) (6 diffs)
• Forms/UFormGenerate.pas (modified) (1 diff)
• Forms/UFormMain.pas (modified) (2 diffs)
• Forms/UFormProperties.pas (modified) (1 diff)
• Forms/UFormProperty.pas (modified) (1 diff)
• Forms/UFormSource.pas (modified) (1 diff)
• Forms/UFormTest.pas (modified) (1 diff)
• Languages/vCardStudio.cs.po (modified) (2 diffs)
• Languages/vCardStudio.pot (modified) (2 diffs)
• Languages/vCardStudio.sv.po (modified) (2 diffs)
• UContactImage.pas (modified) (1 diff)
• UCore.pas (modified) (13 diffs)
• UTest.pas (modified) (4 diffs)
• UTestCases.pas (modified) (1 diff)
• UVCard.pas (moved) (moved from trunk/UContact.pas ) (28 diffs)
• UVCardFile.pas (added)
• vCardStudio.lpi (modified) (3 diffs)
• vCardStudio.lpr (modified) (1 diff)

trunk/Forms/UFormCompare.pas

@@ -5 +5 @@
 uses
   Classes, SysUtils, Forms, Controls, Graphics, Dialogs, ExtCtrls, StdCtrls,
-  UContact, Diff, LCLType, LCLIntf, ComCtrls, Buttons, Menus, ActnList, SynEdit,
+  UVCard, Diff, LCLType, LCLIntf, ComCtrls, Buttons, Menus, ActnList, SynEdit,
   SynEditMiscClasses, SynHighlighterPosition, SynEditHighlighter, UCommon,
   USynEditEx;
@@ -83 +83 @@
 
 uses
-  UCore;
+  UCore, UVCardFile;
 
 { TFormCompare }
@@ -334 +334 @@
   Ext := ExtractFileExt(AFileName);
   if Ext = VCardFileExt then begin
-    with TContactsFile.Create do
+    with TVCardFile.Create do
     try
       LoadFromFile(AFileName);
-      Result := AsString;
+      Result := VCard.AsString;
     finally
       Free;

trunk/Forms/UFormContact.pas

@@ -5 +5 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  ComCtrls, ActnList, Menus, ExtCtrls, ExtDlgs, Buttons, UContact, LCLIntf,
+  ComCtrls, ActnList, Menus, ExtCtrls, ExtDlgs, Buttons, UVCard, LCLIntf,
   UFormProperties, DateUtils, {$IFDEF LCLGTK2}Gtk2Globals, {$ENDIF}UContactImage,
   ubarcodes;

trunk/Forms/UFormContacts.pas

@@ -5 +5 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls,
-  Menus, ActnList, UContact, UListViewSort, LazUTF8, Clipbrd,
+  Menus, ActnList, UVCard, UListViewSort, LazUTF8, Clipbrd,
   Generics.Collections;
 
@@ -102 +102 @@
 
 uses
-  UFormContact, UCore;
+  UFormContact, UCore, UVCardFile;
 
 resourcestring
@@ -304 +304 @@
       ListView1.Columns.Delete(ListView1.Columns.Count - 1);
     for I := 0 to ListView1.Columns.Count - 1 do begin
-      if Assigned(Contacts) and Assigned(Contacts.ContactsFile) then begin
+      if Assigned(Contacts) and Assigned(Contacts.ParentVCard) then begin
         Field := TContact.GetFields.GetByIndex(ListViewColumns[I]);
         if Assigned(Field) then
@@ -334 +334 @@
     Contact := TContact.Create;
     try
-      Contact.ContactsFile := Contacts.ContactsFile;
+      Contact.ParentVCard := Contacts.ParentVCard;
       FormContact.Contact := Contact;
       FormContact.OnGetPrevious := GetPreviousContact;
@@ -364 +364 @@
     Contact := TContact.Create;
     try
-      Contact.ContactsFile := Contacts.ContactsFile;
+      Contact.ParentVCard := Contacts.ParentVCard;
       Contact.Assign(TContact(ListView1.Selected.Data));
       FormContact.Contact := Contact;
@@ -436 +436 @@
 procedure TFormContacts.ALoadFromFileExecute(Sender: TObject);
 var
-  TempFile: TContactsFile;
+  TempFile: TVCardFile;
 begin
   if Assigned(ListView1.Selected) then begin
-    TempFile := TContactsFile.Create;
+    TempFile := TVCardFile.Create;
     try
       OpenDialog1.Filter := TempFile.GetFileFilter;
@@ -465 +465 @@
     Contact := TContact.Create;
     try
-      Contact.ContactsFile := Contacts.ContactsFile;
+      Contact.ParentVCard := Contacts.ParentVCard;
       Contact.Assign(TContact(ListView1.Selected.Data));
       FormContact.Contact := Contact;
@@ -486 +486 @@
 procedure TFormContacts.APasteExecute(Sender: TObject);
 var
-  PasteContacts: TContactsFile;
+  PasteContacts: TVCardFile;
   Lines: TStringList;
 begin
-  PasteContacts := TContactsFile.Create;
+  PasteContacts := TVCardFile.Create;
   Lines := TStringList.Create;
   try
     Lines.Text := Clipboard.AsText;
-    PasteContacts.LoadFromStrings(Lines);
-    if PasteContacts.Contacts.Count > 0 then begin
+    PasteContacts.VCard.LoadFromStrings(Lines);
+    if PasteContacts.VCard.Contacts.Count > 0 then begin
       if Assigned(ListView1.Selected) then begin
         Contacts.InsertContacts(Contacts.IndexOf(ListView1.Selected.Data),
-          PasteContacts.Contacts);
-      end else Contacts.AddContacts(PasteContacts.Contacts);
+          PasteContacts.VCard.Contacts);
+      end else Contacts.AddContacts(PasteContacts.VCard.Contacts);
       Core.DataFile.Modified := True;
       ReloadList;
@@ -528 +528 @@
 procedure TFormContacts.ASaveToFileExecute(Sender: TObject);
 var
-  TempFile: TContactsFile;
+  TempFile: TVCardFile;
 begin
   if Assigned(ListView1.Selected) then begin
-    TempFile := TContactsFile.Create;
+    TempFile := TVCardFile.Create;
     try
       SaveDialog1.Filter := TempFile.GetFileFilter;

trunk/Forms/UFormFind.pas

@@ -5 +5 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls,
-  ExtCtrls, StdCtrls, ActnList, Menus, UContact, UFormContacts;
+  ExtCtrls, StdCtrls, ActnList, Menus, UVCard, UFormContacts;
 
 type

trunk/Forms/UFormFindDuplicity.pas

@@ -5 +5 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls,
-  ExtCtrls, StdCtrls, ActnList, Menus, UContact, Generics.Collections,
+  ExtCtrls, StdCtrls, ActnList, Menus, UVCard, Generics.Collections,
   Generics.Defaults;
 
@@ -65 +65 @@
 
 uses
-  UCore, UFormContacts;
+  UCore, UFormContacts, UVCardFile;
 
 { TFoundItems }
@@ -191 +191 @@
     Form := TFormContacts.Create(nil);
     Form.Contacts := TContacts.Create(False);
-    Form.Contacts.ContactsFile := Contacts.ContactsFile;
+    Form.Contacts.ParentVCard := Contacts.ParentVCard;
     with TFoundItem(ListView1.Selected.Data) do
       for I := 0 to Contacts.Count - 1 do
@@ -202 +202 @@
           Form.Contacts.Remove(Contacts[I]);
           Self.Contacts.Remove(Contacts[I]);
-          Self.Contacts.ContactsFile.Modified := True;
+          Self.Contacts.ParentVCard.Modified := True;
         end;
 
@@ -210 +210 @@
           Form.Contacts.Add(Form.Contacts[I]);
           Self.Contacts.Add(Form.Contacts[I]);
-          Self.Contacts.ContactsFile.Modified := True;
+          Self.Contacts.ParentVCard.Modified := True;
         end;
     end;
@@ -221 +221 @@
 procedure TFormFindDuplicity.ButtonMergeClick(Sender: TObject);
 var
-  TempContacts: TContactsFile;
-  I: Integer;
-begin
-  TempContacts := TContactsFile.Create;
+  TempContacts: TVCardFile;
+  I: Integer;
+begin
+  TempContacts := TVCardFile.Create;
   try
     for I := 0 to Contacts.Count - 1 do
-      TempContacts.Contacts.Merge(Contacts[I], TContactField(ComboBoxField.Items.Objects[ComboBoxField.ItemIndex]).Index);
-    Contacts.Assign(TempContacts.Contacts);
+      TempContacts.VCard.Contacts.Merge(Contacts[I], TContactField(ComboBoxField.Items.Objects[ComboBoxField.ItemIndex]).Index);
+    Contacts.Assign(TempContacts.VCard.Contacts);
     Find;
   finally

trunk/Forms/UFormGenerate.pas

@@ -5 +5 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  Spin, UContact;
+  Spin, UVCard;
 
 type

trunk/Forms/UFormMain.pas

@@ -76 +76 @@
 
 uses
-  UCore, UFormContacts, UContact;
+  UCore, UFormContacts, UVCard, UVCardFile;
 
 resourcestring
@@ -121 +121 @@
     CoolBar1.AutosizeBands;
 
-    FormContacts.Contacts := TContactsFile(Core.DataFile).Contacts;
+    FormContacts.Contacts := TVCardFile(Core.DataFile).VCard.Contacts;
     FormContacts.ManualDock(Self, nil, alClient);
     FormContacts.Align := alClient;

trunk/Forms/UFormProperties.pas

@@ -5 +5 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls,
-  Menus, ActnList, UContact, UDataFile, UListViewSort, LazUTF8,
+  Menus, ActnList, UVCard, UDataFile, UListViewSort, LazUTF8,
   Generics.Collections;
 

trunk/Forms/UFormProperty.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls, UContact;
+  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls, UVCard;
 
 type

trunk/Forms/UFormSource.pas

@@ -51 +51 @@
 
 uses
-  UCore, UTheme, UContact;
+  UCore, UTheme, UVCard;
 
 { TFormSource }

trunk/Forms/UFormTest.pas

@@ -49 +49 @@
 
 uses
-  UCore, UFormTestCase, UContact;
+  UCore, UFormTestCase, UVCard;
 
 { TFormTest }

trunk/Languages/vCardStudio.cs.po

@@ -1081 +1081 @@
 msgstr "Testový případ"
 
-#: ucontact.saim
-msgid "AIM"
-msgstr "AIM"
-
-#: ucontact.sanniversary
-msgid "Anniversary"
-msgstr "Výročí"
-
-#: ucontact.scategories
-msgid "Categories"
-msgstr "Kategorie"
-
-#: ucontact.scontacthasnoparent
-msgid "Contact has no parent"
-msgstr "Kontakt nemá rodiče"
-
-#: ucontact.sdayofbirth
-msgid "Day of birth"
-msgstr "Datum narození"
-
-#: ucontact.sdepartement
-msgid "Departement"
-msgstr "Oddělení"
-
-#: ucontact.semail
-msgid "E-mail"
-msgstr "E-mail"
-
-#: ucontact.sexpectedproperty
-msgid "Expected contact property"
-msgstr "Očekávána vlastnost kontaktu"
-
-#: ucontact.sexpectedvcardbegin
-msgid "Expected vCard begin"
-msgstr "Očekáván začátek vCard"
-
-#: ucontact.sfacebook
-msgid "Facebook"
-msgstr "Facebook"
-
-#: ucontact.sfax
-msgid "Fax"
-msgstr "Fax"
-
-#: ucontact.sfieldindexnotdefined
-msgid "Field index not defined"
-msgstr "Index pole nenalezen"
-
-#: ucontact.sfieldindexredefined
-#, object-pascal-format
-msgid "Field index %d redefined"
-msgstr "Index pole %d předefinován"
-
-#: ucontact.sfirstname
-msgid "First Name"
-msgstr "První Jméno"
-
-#: ucontact.sfullname
-msgctxt "ucontact.sfullname"
-msgid "Full Name"
-msgstr "Celé jméno"
-
-#: ucontact.sgadugadu
-msgid "GaduGadu"
-msgstr "GaduGadu"
-
-#: ucontact.sgender
-msgid "Gender"
-msgstr "Pohlaví"
-
-#: ucontact.sgoogletalk
-msgid "Google Talk"
-msgstr "Google Talk"
-
-#: ucontact.sgroupwise
-msgid "GroupWise"
-msgstr "GroupWise"
-
-#: ucontact.shomeaddresscity
-msgid "Home address city"
-msgstr "Domácí adresa město"
-
-#: ucontact.shomeaddresscountry
-msgid "Home address country"
-msgstr "Domácí adresa země"
-
-#: ucontact.shomeaddresspostalcode
-msgid "Home address postal code"
-msgstr "Domácí adresa PSČ"
-
-#: ucontact.shomeaddresspostofficebox
-msgid "Home address post office box"
-msgstr "Domácí adresa číslo schránky"
-
-#: ucontact.shomeaddressregion
-msgid "Home address region"
-msgstr "Domácí adresa kraj"
-
-#: ucontact.shomeaddressstreet
-msgid "Home address street"
-msgstr "Domácí adresa ulice"
-
-#: ucontact.shomeaddressstreetextended
-msgid "Home address extended street"
-msgstr "Domácí adresa rozšířená ulice"
-
-#: ucontact.shomeemail
-msgid "Home E-mail"
-msgstr "Domov E-mail"
-
-#: ucontact.shomefax
-msgid "Home fax"
-msgstr "Domov fax"
-
-#: ucontact.shomemobile
-msgid "Home mobile"
-msgstr "Domov mobil"
-
-#: ucontact.shomepager
-msgid "Home pager"
-msgstr "Domov pager"
-
-#: ucontact.shomephone
-msgctxt "ucontact.shomephone"
-msgid "Home phone"
-msgstr "Domov telefon"
-
-#: ucontact.shomephone2
-msgid "Home phone 2"
-msgstr "Domov telefon 2"
-
-#: ucontact.sicq
-msgid "ICQ"
-msgstr "ICQ"
-
-#: ucontact.sinstagram
-msgid "Instagram"
-msgstr "Instagram"
-
-#: ucontact.sinternetemail
-msgid "Internet E-mail"
-msgstr "Internetový E-mail"
-
-#: ucontact.sirc
-msgid "IRC"
-msgstr "IRC"
-
-#: ucontact.sjabber
-msgid "Jabber"
-msgstr "Jabber"
-
-#: ucontact.slastname
-msgctxt "ucontact.slastname"
-msgid "Last Name"
-msgstr "Poslední Jméno"
-
-#: ucontact.slasttimecontacted
-msgid "Last Time Contacted"
-msgstr "Naposledy kontaktováno"
-
-#: ucontact.slinkedin
-msgid "LinkedIn"
-msgstr "LinkedIn"
-
-#: ucontact.slogo
-msgid "Logo"
-msgstr "Logo"
-
-#: ucontact.smainphone
-msgid "Main phone"
-msgstr "Hlavní telefon"
-
-#: ucontact.smastodon
-msgid "Mastodon"
-msgstr "Mastodon"
-
-#: ucontact.smatrix
-msgid "Matrix"
-msgstr "Matrix"
-
-#: ucontact.smiddlename
-msgid "Middle Name"
-msgstr "Prostřední jméno"
-
-#: ucontact.smobilephone
-msgid "Mobile phone"
-msgstr "Mobil"
-
-#: ucontact.smsn
-msgid "MSN"
-msgstr "MSN"
-
-#: ucontact.smyspace
-msgid "MySpace"
-msgstr "MySpace"
-
-#: ucontact.snickname
-msgid "Nick name"
-msgstr "Přezdívka"
-
-#: ucontact.snote
-msgid "Note"
-msgstr "Poznámky"
-
-#: ucontact.sorganization
-msgid "Organization"
-msgstr "Organizace"
-
-#: ucontact.spager
-msgid "Pager"
-msgstr "Pager"
-
-#: ucontact.speertube
-msgid "PeerTube"
-msgstr "PeerTube"
-
-#: ucontact.sphoto
-msgctxt "ucontact.sphoto"
-msgid "Photo"
-msgstr "Fotka"
-
-#: ucontact.sqq
-msgid "QQ"
-msgstr "QQ"
-
-#: ucontact.sreddit
-msgid "Reddit"
-msgstr "Reddit"
-
-#: ucontact.srevision
-msgid "Revision"
-msgstr "Revize"
-
-#: ucontact.srole
-msgid "Role"
-msgstr "Role"
-
-#: ucontact.sskype
-msgid "Skype"
-msgstr "Skype"
-
-#: ucontact.ssnapchat
-msgid "Snapchat"
-msgstr "Snapchat"
-
-#: ucontact.stelephone
-msgid "Telephone"
-msgstr "Telefon"
-
-#: ucontact.stimescontacted
-msgid "Times Contacted"
-msgstr "Počet kontaktování"
-
-#: ucontact.stitle
-msgid "Title"
-msgstr "Titul"
-
-#: ucontact.stitleafter
-msgid "Title After"
-msgstr "Titul za"
-
-#: ucontact.stitlebefore
-msgid "Title Before"
-msgstr "Titul před"
-
-#: ucontact.stwitter
-msgid "Twitter"
-msgstr "Twitter"
-
-#: ucontact.suniqueidentifier
-msgid "Unique identifier"
-msgstr "Unikátní identifikátor"
-
-#: ucontact.svcardfile
-msgctxt "ucontact.svcardfile"
-msgid "vCard file"
-msgstr "Soubor vCard"
-
-#: ucontact.sversion
-msgid "Version"
-msgstr "Verze"
-
-#: ucontact.svoipphone
-msgid "VoIP phone"
-msgstr "VoIP telefon"
-
-#: ucontact.swebaddress
-msgid "Web address"
-msgstr "Webová adresa"
-
-#: ucontact.swebaddresshome
-msgid "Web address home"
-msgstr "Webová adresa domácí"
-
-#: ucontact.swebaddresswork
-msgid "Web address work"
-msgstr "Webová adresa pracovní"
-
-#: ucontact.swindowslive
-msgid "Windows Live"
-msgstr "Windows Live"
-
-#: ucontact.sworkaddresscity
-msgid "Work address city"
-msgstr "Pracovní adresa město"
-
-#: ucontact.sworkaddresscountry
-msgid "Work address country"
-msgstr "Pracovní adresa země"
-
-#: ucontact.sworkaddresspostalcode
-msgid "Work address postal code"
-msgstr "Pracovní adresa PSČ"
-
-#: ucontact.sworkaddresspostofficebox
-msgid "Work address post office box"
-msgstr "Pracovní adresa číslo schránky"
-
-#: ucontact.sworkaddressregion
-msgid "Work address region"
-msgstr "Pracovní adresa kraj"
-
-#: ucontact.sworkaddressstreet
-msgid "Work address street"
-msgstr "Pracovní adresa ulice"
-
-#: ucontact.sworkaddressstreetextended
-msgid "Work address extended street"
-msgstr "Pracovní adresa rozšířená ulice"
-
-#: ucontact.sworkemail
-msgid "Work E-mail"
-msgstr "Práce E-mail"
-
-#: ucontact.sworkfax
-msgid "Work fax"
-msgstr "Práce fax"
-
-#: ucontact.sworkmobile
-msgid "Work mobile"
-msgstr "Práce mobil"
-
-#: ucontact.sworkpager
-msgid "Work pager"
-msgstr "Práce pager"
-
-#: ucontact.sworkphone
-msgctxt "ucontact.sworkphone"
-msgid "Work phone"
-msgstr "Pracovní telefon"
-
-#: ucontact.syahoo
-msgid "Yahoo!"
-msgstr "Yahoo!"
-
-#: ucontact.syoutube
-msgid "YouTube"
-msgstr "YouTube"
-
 #: ucore.sappexit
 msgid "Application exit"
@@ -1598 +1239 @@
 msgstr "Prošlo"
 
+#: uvcard.saim
+msgctxt "uvcard.saim"
+msgid "AIM"
+msgstr "AIM"
+
+#: uvcard.sanniversary
+msgctxt "uvcard.sanniversary"
+msgid "Anniversary"
+msgstr "Výročí"
+
+#: uvcard.scategories
+msgctxt "uvcard.scategories"
+msgid "Categories"
+msgstr "Kategorie"
+
+#: uvcard.scontacthasnoparent
+msgctxt "uvcard.scontacthasnoparent"
+msgid "Contact has no parent"
+msgstr "Kontakt nemá rodiče"
+
+#: uvcard.sdayofbirth
+msgctxt "uvcard.sdayofbirth"
+msgid "Day of birth"
+msgstr "Datum narození"
+
+#: uvcard.sdepartement
+msgctxt "uvcard.sdepartement"
+msgid "Departement"
+msgstr "Oddělení"
+
+#: uvcard.semail
+msgctxt "uvcard.semail"
+msgid "E-mail"
+msgstr "E-mail"
+
+#: uvcard.sexpectedproperty
+msgctxt "uvcard.sexpectedproperty"
+msgid "Expected contact property"
+msgstr "Očekávána vlastnost kontaktu"
+
+#: uvcard.sexpectedvcardbegin
+msgctxt "uvcard.sexpectedvcardbegin"
+msgid "Expected vCard begin"
+msgstr "Očekáván začátek vCard"
+
+#: uvcard.sfacebook
+msgctxt "uvcard.sfacebook"
+msgid "Facebook"
+msgstr "Facebook"
+
+#: uvcard.sfax
+msgctxt "uvcard.sfax"
+msgid "Fax"
+msgstr "Fax"
+
+#: uvcard.sfieldindexnotdefined
+msgctxt "uvcard.sfieldindexnotdefined"
+msgid "Field index not defined"
+msgstr "Index pole nenalezen"
+
+#: uvcard.sfieldindexredefined
+#, object-pascal-format
+msgctxt "uvcard.sfieldindexredefined"
+msgid "Field index %d redefined"
+msgstr "Index pole %d předefinován"
+
+#: uvcard.sfirstname
+msgctxt "uvcard.sfirstname"
+msgid "First Name"
+msgstr "První Jméno"
+
+#: uvcard.sfullname
+msgctxt "uvcard.sfullname"
+msgid "Full Name"
+msgstr "Celé jméno"
+
+#: uvcard.sgadugadu
+msgctxt "uvcard.sgadugadu"
+msgid "GaduGadu"
+msgstr "GaduGadu"
+
+#: uvcard.sgender
+msgctxt "uvcard.sgender"
+msgid "Gender"
+msgstr "Pohlaví"
+
+#: uvcard.sgoogletalk
+msgctxt "uvcard.sgoogletalk"
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: uvcard.sgroupwise
+msgctxt "uvcard.sgroupwise"
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: uvcard.shomeaddresscity
+msgctxt "uvcard.shomeaddresscity"
+msgid "Home address city"
+msgstr "Domácí adresa město"
+
+#: uvcard.shomeaddresscountry
+msgctxt "uvcard.shomeaddresscountry"
+msgid "Home address country"
+msgstr "Domácí adresa země"
+
+#: uvcard.shomeaddresspostalcode
+msgctxt "uvcard.shomeaddresspostalcode"
+msgid "Home address postal code"
+msgstr "Domácí adresa PSČ"
+
+#: uvcard.shomeaddresspostofficebox
+msgctxt "uvcard.shomeaddresspostofficebox"
+msgid "Home address post office box"
+msgstr "Domácí adresa číslo schránky"
+
+#: uvcard.shomeaddressregion
+msgctxt "uvcard.shomeaddressregion"
+msgid "Home address region"
+msgstr "Domácí adresa kraj"
+
+#: uvcard.shomeaddressstreet
+msgctxt "uvcard.shomeaddressstreet"
+msgid "Home address street"
+msgstr "Domácí adresa ulice"
+
+#: uvcard.shomeaddressstreetextended
+msgctxt "uvcard.shomeaddressstreetextended"
+msgid "Home address extended street"
+msgstr "Domácí adresa rozšířená ulice"
+
+#: uvcard.shomeemail
+msgctxt "uvcard.shomeemail"
+msgid "Home E-mail"
+msgstr "Domov E-mail"
+
+#: uvcard.shomefax
+msgctxt "uvcard.shomefax"
+msgid "Home fax"
+msgstr "Domov fax"
+
+#: uvcard.shomemobile
+msgctxt "uvcard.shomemobile"
+msgid "Home mobile"
+msgstr "Domov mobil"
+
+#: uvcard.shomepager
+msgctxt "uvcard.shomepager"
+msgid "Home pager"
+msgstr "Domov pager"
+
+#: uvcard.shomephone
+msgctxt "uvcard.shomephone"
+msgid "Home phone"
+msgstr "Domácí telefon"
+
+#: uvcard.shomephone2
+msgctxt "uvcard.shomephone2"
+msgid "Home phone 2"
+msgstr "Domov telefon 2"
+
+#: uvcard.sicq
+msgctxt "uvcard.sicq"
+msgid "ICQ"
+msgstr "ICQ"
+
+#: uvcard.sinstagram
+msgctxt "uvcard.sinstagram"
+msgid "Instagram"
+msgstr "Instagram"
+
+#: uvcard.sinternetemail
+msgctxt "uvcard.sinternetemail"
+msgid "Internet E-mail"
+msgstr "Internetový E-mail"
+
+#: uvcard.sirc
+msgctxt "uvcard.sirc"
+msgid "IRC"
+msgstr "IRC"
+
+#: uvcard.sjabber
+msgctxt "uvcard.sjabber"
+msgid "Jabber"
+msgstr "Jabber"
+
+#: uvcard.slastname
+msgctxt "uvcard.slastname"
+msgid "Last Name"
+msgstr "Poslední jméno"
+
+#: uvcard.slasttimecontacted
+msgctxt "uvcard.slasttimecontacted"
+msgid "Last Time Contacted"
+msgstr "Naposledy kontaktováno"
+
+#: uvcard.slinkedin
+msgctxt "uvcard.slinkedin"
+msgid "LinkedIn"
+msgstr "LinkedIn"
+
+#: uvcard.slogo
+msgctxt "uvcard.slogo"
+msgid "Logo"
+msgstr "Logo"
+
+#: uvcard.smainphone
+msgctxt "uvcard.smainphone"
+msgid "Main phone"
+msgstr "Hlavní telefon"
+
+#: uvcard.smastodon
+msgctxt "uvcard.smastodon"
+msgid "Mastodon"
+msgstr "Mastodon"
+
+#: uvcard.smatrix
+msgctxt "uvcard.smatrix"
+msgid "Matrix"
+msgstr "Matrix"
+
+#: uvcard.smiddlename
+msgctxt "uvcard.smiddlename"
+msgid "Middle Name"
+msgstr "Prostřední jméno"
+
+#: uvcard.smobilephone
+msgctxt "uvcard.smobilephone"
+msgid "Mobile phone"
+msgstr "Mobil"
+
+#: uvcard.smsn
+msgctxt "uvcard.smsn"
+msgid "MSN"
+msgstr "MSN"
+
+#: uvcard.smyspace
+msgctxt "uvcard.smyspace"
+msgid "MySpace"
+msgstr "MySpace"
+
+#: uvcard.snickname
+msgctxt "uvcard.snickname"
+msgid "Nick name"
+msgstr "Přezdívka"
+
+#: uvcard.snote
+msgctxt "uvcard.snote"
+msgid "Note"
+msgstr "Poznámky"
+
+#: uvcard.sorganization
+msgctxt "uvcard.sorganization"
+msgid "Organization"
+msgstr "Organizace"
+
+#: uvcard.spager
+msgctxt "uvcard.spager"
+msgid "Pager"
+msgstr "Pager"
+
+#: uvcard.speertube
+msgctxt "uvcard.speertube"
+msgid "PeerTube"
+msgstr "PeerTube"
+
+#: uvcard.sphoto
+msgctxt "uvcard.sphoto"
+msgid "Photo"
+msgstr "Fotka"
+
+#: uvcard.sqq
+msgctxt "uvcard.sqq"
+msgid "QQ"
+msgstr "QQ"
+
+#: uvcard.sreddit
+msgctxt "uvcard.sreddit"
+msgid "Reddit"
+msgstr "Reddit"
+
+#: uvcard.srevision
+msgctxt "uvcard.srevision"
+msgid "Revision"
+msgstr "Revize"
+
+#: uvcard.srole
+msgctxt "uvcard.srole"
+msgid "Role"
+msgstr "Role"
+
+#: uvcard.sskype
+msgctxt "uvcard.sskype"
+msgid "Skype"
+msgstr "Skype"
+
+#: uvcard.ssnapchat
+msgctxt "uvcard.ssnapchat"
+msgid "Snapchat"
+msgstr "Snapchat"
+
+#: uvcard.stelephone
+msgctxt "uvcard.stelephone"
+msgid "Telephone"
+msgstr "Telefon"
+
+#: uvcard.stimescontacted
+msgctxt "uvcard.stimescontacted"
+msgid "Times Contacted"
+msgstr "Počet kontaktování"
+
+#: uvcard.stitle
+msgctxt "uvcard.stitle"
+msgid "Title"
+msgstr "Titul"
+
+#: uvcard.stitleafter
+msgctxt "uvcard.stitleafter"
+msgid "Title After"
+msgstr "Titul za"
+
+#: uvcard.stitlebefore
+msgctxt "uvcard.stitlebefore"
+msgid "Title Before"
+msgstr "Titul před"
+
+#: uvcard.stwitter
+msgctxt "uvcard.stwitter"
+msgid "Twitter"
+msgstr "Twitter"
+
+#: uvcard.suniqueidentifier
+msgctxt "uvcard.suniqueidentifier"
+msgid "Unique identifier"
+msgstr "Unikátní identifikátor"
+
+#: uvcard.sversion
+msgctxt "uvcard.sversion"
+msgid "Version"
+msgstr "Verze"
+
+#: uvcard.svoipphone
+msgctxt "uvcard.svoipphone"
+msgid "VoIP phone"
+msgstr "VoIP telefon"
+
+#: uvcard.swebaddress
+msgctxt "uvcard.swebaddress"
+msgid "Web address"
+msgstr "Webová adresa"
+
+#: uvcard.swebaddresshome
+msgctxt "uvcard.swebaddresshome"
+msgid "Web address home"
+msgstr "Webová adresa domácí"
+
+#: uvcard.swebaddresswork
+msgctxt "uvcard.swebaddresswork"
+msgid "Web address work"
+msgstr "Webová adresa pracovní"
+
+#: uvcard.swindowslive
+msgctxt "uvcard.swindowslive"
+msgid "Windows Live"
+msgstr "Windows Live"
+
+#: uvcard.sworkaddresscity
+msgctxt "uvcard.sworkaddresscity"
+msgid "Work address city"
+msgstr "Pracovní adresa město"
+
+#: uvcard.sworkaddresscountry
+msgctxt "uvcard.sworkaddresscountry"
+msgid "Work address country"
+msgstr "Pracovní adresa země"
+
+#: uvcard.sworkaddresspostalcode
+msgctxt "uvcard.sworkaddresspostalcode"
+msgid "Work address postal code"
+msgstr "Pracovní adresa PSČ"
+
+#: uvcard.sworkaddresspostofficebox
+msgctxt "uvcard.sworkaddresspostofficebox"
+msgid "Work address post office box"
+msgstr "Pracovní adresa číslo schránky"
+
+#: uvcard.sworkaddressregion
+msgctxt "uvcard.sworkaddressregion"
+msgid "Work address region"
+msgstr "Pracovní adresa kraj"
+
+#: uvcard.sworkaddressstreet
+msgctxt "uvcard.sworkaddressstreet"
+msgid "Work address street"
+msgstr "Pracovní adresa ulice"
+
+#: uvcard.sworkaddressstreetextended
+msgctxt "uvcard.sworkaddressstreetextended"
+msgid "Work address extended street"
+msgstr "Pracovní adresa rozšířená ulice"
+
+#: uvcard.sworkemail
+msgctxt "uvcard.sworkemail"
+msgid "Work E-mail"
+msgstr "Práce E-mail"
+
+#: uvcard.sworkfax
+msgctxt "uvcard.sworkfax"
+msgid "Work fax"
+msgstr "Práce fax"
+
+#: uvcard.sworkmobile
+msgctxt "uvcard.sworkmobile"
+msgid "Work mobile"
+msgstr "Práce mobil"
+
+#: uvcard.sworkpager
+msgctxt "uvcard.sworkpager"
+msgid "Work pager"
+msgstr "Práce pager"
+
+#: uvcard.sworkphone
+msgctxt "uvcard.sworkphone"
+msgid "Work phone"
+msgstr "Pracovní telefon"
+
+#: uvcard.syahoo
+msgctxt "uvcard.syahoo"
+msgid "Yahoo!"
+msgstr "Yahoo!"
+
+#: uvcard.syoutube
+msgctxt "uvcard.syoutube"
+msgid "YouTube"
+msgstr "YouTube"
+
+#: uvcardfile.svcardfile
+msgctxt "uvcardfile.svcardfile"
+msgid "vCard file"
+msgstr "Soubor vCard"

trunk/Languages/vCardStudio.pot

@@ -1055 +1055 @@
 msgstr ""
 
-#: ucontact.saim
-msgid "AIM"
-msgstr ""
-
-#: ucontact.sanniversary
-msgid "Anniversary"
-msgstr ""
-
-#: ucontact.scategories
-msgid "Categories"
-msgstr ""
-
-#: ucontact.scontacthasnoparent
-msgid "Contact has no parent"
-msgstr ""
-
-#: ucontact.sdayofbirth
-msgid "Day of birth"
-msgstr ""
-
-#: ucontact.sdepartement
-msgid "Departement"
-msgstr ""
-
-#: ucontact.semail
-msgid "E-mail"
-msgstr ""
-
-#: ucontact.sexpectedproperty
-msgid "Expected contact property"
-msgstr ""
-
-#: ucontact.sexpectedvcardbegin
-msgid "Expected vCard begin"
-msgstr ""
-
-#: ucontact.sfacebook
-msgid "Facebook"
-msgstr ""
-
-#: ucontact.sfax
-msgid "Fax"
-msgstr ""
-
-#: ucontact.sfieldindexnotdefined
-msgid "Field index not defined"
-msgstr ""
-
-#: ucontact.sfieldindexredefined
-#, object-pascal-format
-msgid "Field index %d redefined"
-msgstr ""
-
-#: ucontact.sfirstname
-msgid "First Name"
-msgstr ""
-
-#: ucontact.sfullname
-msgctxt "ucontact.sfullname"
-msgid "Full Name"
-msgstr ""
-
-#: ucontact.sgadugadu
-msgid "GaduGadu"
-msgstr ""
-
-#: ucontact.sgender
-msgid "Gender"
-msgstr ""
-
-#: ucontact.sgoogletalk
-msgid "Google Talk"
-msgstr ""
-
-#: ucontact.sgroupwise
-msgid "GroupWise"
-msgstr ""
-
-#: ucontact.shomeaddresscity
-msgid "Home address city"
-msgstr ""
-
-#: ucontact.shomeaddresscountry
-msgid "Home address country"
-msgstr ""
-
-#: ucontact.shomeaddresspostalcode
-msgid "Home address postal code"
-msgstr ""
-
-#: ucontact.shomeaddresspostofficebox
-msgid "Home address post office box"
-msgstr ""
-
-#: ucontact.shomeaddressregion
-msgid "Home address region"
-msgstr ""
-
-#: ucontact.shomeaddressstreet
-msgid "Home address street"
-msgstr ""
-
-#: ucontact.shomeaddressstreetextended
-msgid "Home address extended street"
-msgstr ""
-
-#: ucontact.shomeemail
-msgid "Home E-mail"
-msgstr ""
-
-#: ucontact.shomefax
-msgid "Home fax"
-msgstr ""
-
-#: ucontact.shomemobile
-msgid "Home mobile"
-msgstr ""
-
-#: ucontact.shomepager
-msgid "Home pager"
-msgstr ""
-
-#: ucontact.shomephone
-msgctxt "ucontact.shomephone"
-msgid "Home phone"
-msgstr ""
-
-#: ucontact.shomephone2
-msgid "Home phone 2"
-msgstr ""
-
-#: ucontact.sicq
-msgid "ICQ"
-msgstr ""
-
-#: ucontact.sinstagram
-msgid "Instagram"
-msgstr ""
-
-#: ucontact.sinternetemail
-msgid "Internet E-mail"
-msgstr ""
-
-#: ucontact.sirc
-msgid "IRC"
-msgstr ""
-
-#: ucontact.sjabber
-msgid "Jabber"
-msgstr ""
-
-#: ucontact.slastname
-msgctxt "ucontact.slastname"
-msgid "Last Name"
-msgstr ""
-
-#: ucontact.slasttimecontacted
-msgid "Last Time Contacted"
-msgstr ""
-
-#: ucontact.slinkedin
-msgid "LinkedIn"
-msgstr ""
-
-#: ucontact.slogo
-msgid "Logo"
-msgstr ""
-
-#: ucontact.smainphone
-msgid "Main phone"
-msgstr ""
-
-#: ucontact.smastodon
-msgid "Mastodon"
-msgstr ""
-
-#: ucontact.smatrix
-msgid "Matrix"
-msgstr ""
-
-#: ucontact.smiddlename
-msgid "Middle Name"
-msgstr ""
-
-#: ucontact.smobilephone
-msgid "Mobile phone"
-msgstr ""
-
-#: ucontact.smsn
-msgid "MSN"
-msgstr ""
-
-#: ucontact.smyspace
-msgid "MySpace"
-msgstr ""
-
-#: ucontact.snickname
-msgid "Nick name"
-msgstr ""
-
-#: ucontact.snote
-msgid "Note"
-msgstr ""
-
-#: ucontact.sorganization
-msgid "Organization"
-msgstr ""
-
-#: ucontact.spager
-msgid "Pager"
-msgstr ""
-
-#: ucontact.speertube
-msgid "PeerTube"
-msgstr ""
-
-#: ucontact.sphoto
-msgctxt "ucontact.sphoto"
-msgid "Photo"
-msgstr ""
-
-#: ucontact.sqq
-msgid "QQ"
-msgstr ""
-
-#: ucontact.sreddit
-msgid "Reddit"
-msgstr ""
-
-#: ucontact.srevision
-msgid "Revision"
-msgstr ""
-
-#: ucontact.srole
-msgid "Role"
-msgstr ""
-
-#: ucontact.sskype
-msgid "Skype"
-msgstr ""
-
-#: ucontact.ssnapchat
-msgid "Snapchat"
-msgstr ""
-
-#: ucontact.stelephone
-msgid "Telephone"
-msgstr ""
-
-#: ucontact.stimescontacted
-msgid "Times Contacted"
-msgstr ""
-
-#: ucontact.stitle
-msgid "Title"
-msgstr ""
-
-#: ucontact.stitleafter
-msgid "Title After"
-msgstr ""
-
-#: ucontact.stitlebefore
-msgid "Title Before"
-msgstr ""
-
-#: ucontact.stwitter
-msgid "Twitter"
-msgstr ""
-
-#: ucontact.suniqueidentifier
-msgid "Unique identifier"
-msgstr ""
-
-#: ucontact.svcardfile
-msgid "vCard file"
-msgstr ""
-
-#: ucontact.sversion
-msgid "Version"
-msgstr ""
-
-#: ucontact.svoipphone
-msgid "VoIP phone"
-msgstr ""
-
-#: ucontact.swebaddress
-msgid "Web address"
-msgstr ""
-
-#: ucontact.swebaddresshome
-msgid "Web address home"
-msgstr ""
-
-#: ucontact.swebaddresswork
-msgid "Web address work"
-msgstr ""
-
-#: ucontact.swindowslive
-msgid "Windows Live"
-msgstr ""
-
-#: ucontact.sworkaddresscity
-msgid "Work address city"
-msgstr ""
-
-#: ucontact.sworkaddresscountry
-msgid "Work address country"
-msgstr ""
-
-#: ucontact.sworkaddresspostalcode
-msgid "Work address postal code"
-msgstr ""
-
-#: ucontact.sworkaddresspostofficebox
-msgid "Work address post office box"
-msgstr ""
-
-#: ucontact.sworkaddressregion
-msgid "Work address region"
-msgstr ""
-
-#: ucontact.sworkaddressstreet
-msgid "Work address street"
-msgstr ""
-
-#: ucontact.sworkaddressstreetextended
-msgid "Work address extended street"
-msgstr ""
-
-#: ucontact.sworkemail
-msgid "Work E-mail"
-msgstr ""
-
-#: ucontact.sworkfax
-msgid "Work fax"
-msgstr ""
-
-#: ucontact.sworkmobile
-msgid "Work mobile"
-msgstr ""
-
-#: ucontact.sworkpager
-msgid "Work pager"
-msgstr ""
-
-#: ucontact.sworkphone
-msgctxt "ucontact.sworkphone"
-msgid "Work phone"
-msgstr ""
-
-#: ucontact.syahoo
-msgid "Yahoo!"
-msgstr ""
-
-#: ucontact.syoutube
-msgid "YouTube"
-msgstr ""
-
 #: ucore.sappexit
 msgid "Application exit"
@@ -1570 +1212 @@
 msgstr ""
 
+#: uvcard.saim
+msgctxt "uvcard.saim"
+msgid "AIM"
+msgstr ""
+
+#: uvcard.sanniversary
+msgctxt "uvcard.sanniversary"
+msgid "Anniversary"
+msgstr ""
+
+#: uvcard.scategories
+msgctxt "uvcard.scategories"
+msgid "Categories"
+msgstr ""
+
+#: uvcard.scontacthasnoparent
+msgctxt "uvcard.scontacthasnoparent"
+msgid "Contact has no parent"
+msgstr ""
+
+#: uvcard.sdayofbirth
+msgctxt "uvcard.sdayofbirth"
+msgid "Day of birth"
+msgstr ""
+
+#: uvcard.sdepartement
+msgctxt "uvcard.sdepartement"
+msgid "Departement"
+msgstr ""
+
+#: uvcard.semail
+msgctxt "uvcard.semail"
+msgid "E-mail"
+msgstr ""
+
+#: uvcard.sexpectedproperty
+msgctxt "uvcard.sexpectedproperty"
+msgid "Expected contact property"
+msgstr ""
+
+#: uvcard.sexpectedvcardbegin
+msgctxt "uvcard.sexpectedvcardbegin"
+msgid "Expected vCard begin"
+msgstr ""
+
+#: uvcard.sfacebook
+msgctxt "uvcard.sfacebook"
+msgid "Facebook"
+msgstr ""
+
+#: uvcard.sfax
+msgctxt "uvcard.sfax"
+msgid "Fax"
+msgstr ""
+
+#: uvcard.sfieldindexnotdefined
+msgctxt "uvcard.sfieldindexnotdefined"
+msgid "Field index not defined"
+msgstr ""
+
+#: uvcard.sfieldindexredefined
+#, object-pascal-format
+msgctxt "uvcard.sfieldindexredefined"
+msgid "Field index %d redefined"
+msgstr ""
+
+#: uvcard.sfirstname
+msgctxt "uvcard.sfirstname"
+msgid "First Name"
+msgstr ""
+
+#: uvcard.sfullname
+msgctxt "uvcard.sfullname"
+msgid "Full Name"
+msgstr ""
+
+#: uvcard.sgadugadu
+msgctxt "uvcard.sgadugadu"
+msgid "GaduGadu"
+msgstr ""
+
+#: uvcard.sgender
+msgctxt "uvcard.sgender"
+msgid "Gender"
+msgstr ""
+
+#: uvcard.sgoogletalk
+msgctxt "uvcard.sgoogletalk"
+msgid "Google Talk"
+msgstr ""
+
+#: uvcard.sgroupwise
+msgctxt "uvcard.sgroupwise"
+msgid "GroupWise"
+msgstr ""
+
+#: uvcard.shomeaddresscity
+msgctxt "uvcard.shomeaddresscity"
+msgid "Home address city"
+msgstr ""
+
+#: uvcard.shomeaddresscountry
+msgctxt "uvcard.shomeaddresscountry"
+msgid "Home address country"
+msgstr ""
+
+#: uvcard.shomeaddresspostalcode
+msgctxt "uvcard.shomeaddresspostalcode"
+msgid "Home address postal code"
+msgstr ""
+
+#: uvcard.shomeaddresspostofficebox
+msgctxt "uvcard.shomeaddresspostofficebox"
+msgid "Home address post office box"
+msgstr ""
+
+#: uvcard.shomeaddressregion
+msgctxt "uvcard.shomeaddressregion"
+msgid "Home address region"
+msgstr ""
+
+#: uvcard.shomeaddressstreet
+msgctxt "uvcard.shomeaddressstreet"
+msgid "Home address street"
+msgstr ""
+
+#: uvcard.shomeaddressstreetextended
+msgctxt "uvcard.shomeaddressstreetextended"
+msgid "Home address extended street"
+msgstr ""
+
+#: uvcard.shomeemail
+msgctxt "uvcard.shomeemail"
+msgid "Home E-mail"
+msgstr ""
+
+#: uvcard.shomefax
+msgctxt "uvcard.shomefax"
+msgid "Home fax"
+msgstr ""
+
+#: uvcard.shomemobile
+msgctxt "uvcard.shomemobile"
+msgid "Home mobile"
+msgstr ""
+
+#: uvcard.shomepager
+msgctxt "uvcard.shomepager"
+msgid "Home pager"
+msgstr ""
+
+#: uvcard.shomephone
+msgctxt "uvcard.shomephone"
+msgid "Home phone"
+msgstr ""
+
+#: uvcard.shomephone2
+msgctxt "uvcard.shomephone2"
+msgid "Home phone 2"
+msgstr ""
+
+#: uvcard.sicq
+msgctxt "uvcard.sicq"
+msgid "ICQ"
+msgstr ""
+
+#: uvcard.sinstagram
+msgctxt "uvcard.sinstagram"
+msgid "Instagram"
+msgstr ""
+
+#: uvcard.sinternetemail
+msgctxt "uvcard.sinternetemail"
+msgid "Internet E-mail"
+msgstr ""
+
+#: uvcard.sirc
+msgctxt "uvcard.sirc"
+msgid "IRC"
+msgstr ""
+
+#: uvcard.sjabber
+msgctxt "uvcard.sjabber"
+msgid "Jabber"
+msgstr ""
+
+#: uvcard.slastname
+msgctxt "uvcard.slastname"
+msgid "Last Name"
+msgstr ""
+
+#: uvcard.slasttimecontacted
+msgctxt "uvcard.slasttimecontacted"
+msgid "Last Time Contacted"
+msgstr ""
+
+#: uvcard.slinkedin
+msgctxt "uvcard.slinkedin"
+msgid "LinkedIn"
+msgstr ""
+
+#: uvcard.slogo
+msgctxt "uvcard.slogo"
+msgid "Logo"
+msgstr ""
+
+#: uvcard.smainphone
+msgctxt "uvcard.smainphone"
+msgid "Main phone"
+msgstr ""
+
+#: uvcard.smastodon
+msgctxt "uvcard.smastodon"
+msgid "Mastodon"
+msgstr ""
+
+#: uvcard.smatrix
+msgctxt "uvcard.smatrix"
+msgid "Matrix"
+msgstr ""
+
+#: uvcard.smiddlename
+msgctxt "uvcard.smiddlename"
+msgid "Middle Name"
+msgstr ""
+
+#: uvcard.smobilephone
+msgctxt "uvcard.smobilephone"
+msgid "Mobile phone"
+msgstr ""
+
+#: uvcard.smsn
+msgctxt "uvcard.smsn"
+msgid "MSN"
+msgstr ""
+
+#: uvcard.smyspace
+msgctxt "uvcard.smyspace"
+msgid "MySpace"
+msgstr ""
+
+#: uvcard.snickname
+msgctxt "uvcard.snickname"
+msgid "Nick name"
+msgstr ""
+
+#: uvcard.snote
+msgctxt "uvcard.snote"
+msgid "Note"
+msgstr ""
+
+#: uvcard.sorganization
+msgctxt "uvcard.sorganization"
+msgid "Organization"
+msgstr ""
+
+#: uvcard.spager
+msgctxt "uvcard.spager"
+msgid "Pager"
+msgstr ""
+
+#: uvcard.speertube
+msgctxt "uvcard.speertube"
+msgid "PeerTube"
+msgstr ""
+
+#: uvcard.sphoto
+msgctxt "uvcard.sphoto"
+msgid "Photo"
+msgstr ""
+
+#: uvcard.sqq
+msgctxt "uvcard.sqq"
+msgid "QQ"
+msgstr ""
+
+#: uvcard.sreddit
+msgctxt "uvcard.sreddit"
+msgid "Reddit"
+msgstr ""
+
+#: uvcard.srevision
+msgctxt "uvcard.srevision"
+msgid "Revision"
+msgstr ""
+
+#: uvcard.srole
+msgctxt "uvcard.srole"
+msgid "Role"
+msgstr ""
+
+#: uvcard.sskype
+msgctxt "uvcard.sskype"
+msgid "Skype"
+msgstr ""
+
+#: uvcard.ssnapchat
+msgctxt "uvcard.ssnapchat"
+msgid "Snapchat"
+msgstr ""
+
+#: uvcard.stelephone
+msgctxt "uvcard.stelephone"
+msgid "Telephone"
+msgstr ""
+
+#: uvcard.stimescontacted
+msgctxt "uvcard.stimescontacted"
+msgid "Times Contacted"
+msgstr ""
+
+#: uvcard.stitle
+msgctxt "uvcard.stitle"
+msgid "Title"
+msgstr ""
+
+#: uvcard.stitleafter
+msgctxt "uvcard.stitleafter"
+msgid "Title After"
+msgstr ""
+
+#: uvcard.stitlebefore
+msgctxt "uvcard.stitlebefore"
+msgid "Title Before"
+msgstr ""
+
+#: uvcard.stwitter
+msgctxt "uvcard.stwitter"
+msgid "Twitter"
+msgstr ""
+
+#: uvcard.suniqueidentifier
+msgctxt "uvcard.suniqueidentifier"
+msgid "Unique identifier"
+msgstr ""
+
+#: uvcard.sversion
+msgctxt "uvcard.sversion"
+msgid "Version"
+msgstr ""
+
+#: uvcard.svoipphone
+msgctxt "uvcard.svoipphone"
+msgid "VoIP phone"
+msgstr ""
+
+#: uvcard.swebaddress
+msgctxt "uvcard.swebaddress"
+msgid "Web address"
+msgstr ""
+
+#: uvcard.swebaddresshome
+msgctxt "uvcard.swebaddresshome"
+msgid "Web address home"
+msgstr ""
+
+#: uvcard.swebaddresswork
+msgctxt "uvcard.swebaddresswork"
+msgid "Web address work"
+msgstr ""
+
+#: uvcard.swindowslive
+msgctxt "uvcard.swindowslive"
+msgid "Windows Live"
+msgstr ""
+
+#: uvcard.sworkaddresscity
+msgctxt "uvcard.sworkaddresscity"
+msgid "Work address city"
+msgstr ""
+
+#: uvcard.sworkaddresscountry
+msgctxt "uvcard.sworkaddresscountry"
+msgid "Work address country"
+msgstr ""
+
+#: uvcard.sworkaddresspostalcode
+msgctxt "uvcard.sworkaddresspostalcode"
+msgid "Work address postal code"
+msgstr ""
+
+#: uvcard.sworkaddresspostofficebox
+msgctxt "uvcard.sworkaddresspostofficebox"
+msgid "Work address post office box"
+msgstr ""
+
+#: uvcard.sworkaddressregion
+msgctxt "uvcard.sworkaddressregion"
+msgid "Work address region"
+msgstr ""
+
+#: uvcard.sworkaddressstreet
+msgctxt "uvcard.sworkaddressstreet"
+msgid "Work address street"
+msgstr ""
+
+#: uvcard.sworkaddressstreetextended
+msgctxt "uvcard.sworkaddressstreetextended"
+msgid "Work address extended street"
+msgstr ""
+
+#: uvcard.sworkemail
+msgctxt "uvcard.sworkemail"
+msgid "Work E-mail"
+msgstr ""
+
+#: uvcard.sworkfax
+msgctxt "uvcard.sworkfax"
+msgid "Work fax"
+msgstr ""
+
+#: uvcard.sworkmobile
+msgctxt "uvcard.sworkmobile"
+msgid "Work mobile"
+msgstr ""
+
+#: uvcard.sworkpager
+msgctxt "uvcard.sworkpager"
+msgid "Work pager"
+msgstr ""
+
+#: uvcard.sworkphone
+msgctxt "uvcard.sworkphone"
+msgid "Work phone"
+msgstr ""
+
+#: uvcard.syahoo
+msgctxt "uvcard.syahoo"
+msgid "Yahoo!"
+msgstr ""
+
+#: uvcard.syoutube
+msgctxt "uvcard.syoutube"
+msgid "YouTube"
+msgstr ""
+
+#: uvcardfile.svcardfile
+msgctxt "uvcardfile.svcardfile"
+msgid "vCard file"
+msgstr ""
+

trunk/Languages/vCardStudio.sv.po

@@ -1091 +1091 @@
 msgstr "Testfall"
 
-#: ucontact.saim
-msgid "AIM"
-msgstr "AIM"
-
-#: ucontact.sanniversary
-msgid "Anniversary"
-msgstr "Årsdag"
-
-#: ucontact.scategories
-msgid "Categories"
-msgstr "Kategori"
-
-#: ucontact.scontacthasnoparent
-msgid "Contact has no parent"
-msgstr "Kontakten har ingen förälder"
-
-#: ucontact.sdayofbirth
-msgid "Day of birth"
-msgstr "Födelsedag"
-
-#: ucontact.sdepartement
-msgid "Departement"
-msgstr "Avdelning"
-
-#: ucontact.semail
-msgid "E-mail"
-msgstr "E-mail"
-
-#: ucontact.sexpectedproperty
-msgid "Expected contact property"
-msgstr "Förväntade kontakters egenskaper"
-
-#: ucontact.sexpectedvcardbegin
-msgid "Expected vCard begin"
-msgstr "Förväntat början vCard"
-
-#: ucontact.sfacebook
-msgid "Facebook"
-msgstr "Facebook"
-
-#: ucontact.sfax
-msgid "Fax"
-msgstr "Fax"
-
-#: ucontact.sfieldindexnotdefined
-msgid "Field index not defined"
-msgstr "Fältindex hittades inte"
-
-#: ucontact.sfieldindexredefined
-#, object-pascal-format
-msgid "Field index %d redefined"
-msgstr "Fältindex %d omdefinieras"
-
-#: ucontact.sfirstname
-msgid "First Name"
-msgstr "Förnamn"
-
-#: ucontact.sfullname
-msgctxt "ucontact.sfullname"
-msgid "Full Name"
-msgstr "Fullständigt namn"
-
-#: ucontact.sgadugadu
-msgid "GaduGadu"
-msgstr "GaduGadu"
-
-#: ucontact.sgender
-msgid "Gender"
-msgstr "Kön"
-
-#: ucontact.sgoogletalk
-msgid "Google Talk"
-msgstr "Google Talk"
-
-#: ucontact.sgroupwise
-msgid "GroupWise"
-msgstr "GroupWise"
-
-#: ucontact.shomeaddresscity
-msgid "Home address city"
-msgstr "Hemadress ort/stad"
-
-#: ucontact.shomeaddresscountry
-msgid "Home address country"
-msgstr "Hemadress land"
-
-#: ucontact.shomeaddresspostalcode
-msgid "Home address postal code"
-msgstr "Hemadress postkod"
-
-#: ucontact.shomeaddresspostofficebox
-msgid "Home address post office box"
-msgstr "Hemadress postbox"
-
-#: ucontact.shomeaddressregion
-msgid "Home address region"
-msgstr "Hemadress region"
-
-#: ucontact.shomeaddressstreet
-msgid "Home address street"
-msgstr "Hemadress gata"
-
-#: ucontact.shomeaddressstreetextended
-msgid "Home address extended street"
-msgstr "Hemadress utökad gata"
-
-#: ucontact.shomeemail
-msgid "Home E-mail"
-msgstr "Hem E-mail"
-
-#: ucontact.shomefax
-msgid "Home fax"
-msgstr "Hem fax"
-
-#: ucontact.shomemobile
-msgid "Home mobile"
-msgstr "Hem mobil"
-
-#: ucontact.shomepager
-msgid "Home pager"
-msgstr "Hem pager"
-
-#: ucontact.shomephone
-msgctxt "ucontact.shomephone"
-msgid "Home phone"
-msgstr "Hem telefon"
-
-#: ucontact.shomephone2
-msgid "Home phone 2"
-msgstr "Hem telefon 2"
-
-#: ucontact.sicq
-msgid "ICQ"
-msgstr "ICQ"
-
-#: ucontact.sinstagram
-msgid "Instagram"
-msgstr "Instagram"
-
-#: ucontact.sinternetemail
-msgid "Internet E-mail"
-msgstr "Internet E-mail"
-
-#: ucontact.sirc
-msgid "IRC"
-msgstr "IRC"
-
-#: ucontact.sjabber
-msgid "Jabber"
-msgstr "Jabber"
-
-#: ucontact.slastname
-msgctxt "ucontact.slastname"
-msgid "Last Name"
-msgstr "Efternamn"
-
-#: ucontact.slasttimecontacted
-msgid "Last Time Contacted"
-msgstr "Senaste kontaktad"
-
-#: ucontact.slinkedin
-msgid "LinkedIn"
-msgstr "LinkedIn"
-
-#: ucontact.slogo
-msgid "Logo"
-msgstr "Logo"
-
-#: ucontact.smainphone
-msgid "Main phone"
-msgstr "Huvud telefon"
-
-#: ucontact.smastodon
-msgid "Mastodon"
-msgstr "Mastodon"
-
-#: ucontact.smatrix
-msgid "Matrix"
-msgstr "Matrix"
-
-#: ucontact.smiddlename
-msgid "Middle Name"
-msgstr "Mellannamn"
-
-#: ucontact.smobilephone
-msgid "Mobile phone"
-msgstr "Mobil"
-
-#: ucontact.smsn
-msgid "MSN"
-msgstr "MSN"
-
-#: ucontact.smyspace
-msgid "MySpace"
-msgstr "MySpace"
-
-#: ucontact.snickname
-msgid "Nick name"
-msgstr "Smeknamn"
-
-#: ucontact.snote
-msgid "Note"
-msgstr "Noter"
-
-#: ucontact.sorganization
-msgid "Organization"
-msgstr "Organisation"
-
-#: ucontact.spager
-msgid "Pager"
-msgstr "Pager"
-
-#: ucontact.speertube
-msgid "PeerTube"
-msgstr "PeerTube"
-
-#: ucontact.sphoto
-msgctxt "ucontact.sphoto"
-msgid "Photo"
-msgstr "Foto"
-
-#: ucontact.sqq
-msgid "QQ"
-msgstr "QQ"
-
-#: ucontact.sreddit
-msgid "Reddit"
-msgstr "Reddit"
-
-#: ucontact.srevision
-msgid "Revision"
-msgstr "Revision"
-
-#: ucontact.srole
-msgid "Role"
-msgstr "Roll"
-
-#: ucontact.sskype
-msgid "Skype"
-msgstr "Skype"
-
-#: ucontact.ssnapchat
-msgid "Snapchat"
-msgstr "Snapchat"
-
-#: ucontact.stelephone
-msgid "Telephone"
-msgstr "Telefon"
-
-#: ucontact.stimescontacted
-msgid "Times Contacted"
-msgstr "Antal kontaktad"
-
-#: ucontact.stitle
-msgid "Title"
-msgstr "Titel"
-
-#: ucontact.stitleafter
-msgid "Title After"
-msgstr "Titel efter"
-
-#: ucontact.stitlebefore
-msgid "Title Before"
-msgstr "Titel före"
-
-#: ucontact.stwitter
-msgid "Twitter"
-msgstr "Twitter"
-
-#: ucontact.suniqueidentifier
-msgid "Unique identifier"
-msgstr "Unik Identifierare"
-
-#: ucontact.svcardfile
-msgctxt "ucontact.svcardfile"
-msgid "vCard file"
-msgstr "vCard fil"
-
-#: ucontact.sversion
-msgid "Version"
-msgstr "Version"
-
-#: ucontact.svoipphone
-msgid "VoIP phone"
-msgstr "VoIP telefon"
-
-#: ucontact.swebaddress
-msgid "Web address"
-msgstr "Webbadress"
-
-#: ucontact.swebaddresshome
-msgid "Web address home"
-msgstr "Webbadress hem"
-
-#: ucontact.swebaddresswork
-msgid "Web address work"
-msgstr "Webbadress jobb"
-
-#: ucontact.swindowslive
-msgid "Windows Live"
-msgstr "Windows Live"
-
-#: ucontact.sworkaddresscity
-msgid "Work address city"
-msgstr "Jobbadress ort/stad"
-
-#: ucontact.sworkaddresscountry
-msgid "Work address country"
-msgstr "Jobbadress land"
-
-#: ucontact.sworkaddresspostalcode
-msgid "Work address postal code"
-msgstr "Jobbadress postkod"
-
-#: ucontact.sworkaddresspostofficebox
-msgid "Work address post office box"
-msgstr "Jobbadress postbox"
-
-#: ucontact.sworkaddressregion
-msgid "Work address region"
-msgstr "Jobbadress region"
-
-#: ucontact.sworkaddressstreet
-msgid "Work address street"
-msgstr "Jobbadress gata"
-
-#: ucontact.sworkaddressstreetextended
-msgid "Work address extended street"
-msgstr "Jobbadress utökad gata"
-
-#: ucontact.sworkemail
-msgid "Work E-mail"
-msgstr "Jobb E-mail"
-
-#: ucontact.sworkfax
-msgid "Work fax"
-msgstr "Jobb fax"
-
-#: ucontact.sworkmobile
-msgid "Work mobile"
-msgstr "Jobb mobil"
-
-#: ucontact.sworkpager
-msgid "Work pager"
-msgstr "Jobb pager"
-
-#: ucontact.sworkphone
-msgctxt "ucontact.sworkphone"
-msgid "Work phone"
-msgstr "Jobb telefon"
-
-#: ucontact.syahoo
-msgid "Yahoo!"
-msgstr "Yahoo!"
-
-#: ucontact.syoutube
-msgid "YouTube"
-msgstr "YouTube"
-
 #: ucore.sappexit
 msgid "Application exit"
@@ -1608 +1249 @@
 msgstr ""
 
+#: uvcard.saim
+#, fuzzy
+msgctxt "uvcard.saim"
+msgid "AIM"
+msgstr "AIM"
+
+#: uvcard.sanniversary
+#, fuzzy
+msgctxt "uvcard.sanniversary"
+msgid "Anniversary"
+msgstr "Årsdag"
+
+#: uvcard.scategories
+#, fuzzy
+msgctxt "uvcard.scategories"
+msgid "Categories"
+msgstr "Kategori"
+
+#: uvcard.scontacthasnoparent
+#, fuzzy
+msgctxt "uvcard.scontacthasnoparent"
+msgid "Contact has no parent"
+msgstr "Kontakten har ingen förälder"
+
+#: uvcard.sdayofbirth
+#, fuzzy
+msgctxt "uvcard.sdayofbirth"
+msgid "Day of birth"
+msgstr "Födelsedag"
+
+#: uvcard.sdepartement
+#, fuzzy
+msgctxt "uvcard.sdepartement"
+msgid "Departement"
+msgstr "Avdelning"
+
+#: uvcard.semail
+#, fuzzy
+msgctxt "uvcard.semail"
+msgid "E-mail"
+msgstr "E-mail"
+
+#: uvcard.sexpectedproperty
+#, fuzzy
+msgctxt "uvcard.sexpectedproperty"
+msgid "Expected contact property"
+msgstr "Förväntade kontakters egenskaper"
+
+#: uvcard.sexpectedvcardbegin
+#, fuzzy
+msgctxt "uvcard.sexpectedvcardbegin"
+msgid "Expected vCard begin"
+msgstr "Förväntat början vCard"
+
+#: uvcard.sfacebook
+#, fuzzy
+msgctxt "uvcard.sfacebook"
+msgid "Facebook"
+msgstr "Facebook"
+
+#: uvcard.sfax
+#, fuzzy
+msgctxt "uvcard.sfax"
+msgid "Fax"
+msgstr "Fax"
+
+#: uvcard.sfieldindexnotdefined
+#, fuzzy
+msgctxt "uvcard.sfieldindexnotdefined"
+msgid "Field index not defined"
+msgstr "Fältindex hittades inte"
+
+#: uvcard.sfieldindexredefined
+#, object-pascal-format, fuzzy
+msgctxt "uvcard.sfieldindexredefined"
+msgid "Field index %d redefined"
+msgstr "Fältindex %d omdefinieras"
+
+#: uvcard.sfirstname
+#, fuzzy
+msgctxt "uvcard.sfirstname"
+msgid "First Name"
+msgstr "Förnamn"
+
+#: uvcard.sfullname
+#, fuzzy
+msgctxt "uvcard.sfullname"
+msgid "Full Name"
+msgstr "Hela namnet"
+
+#: uvcard.sgadugadu
+#, fuzzy
+msgctxt "uvcard.sgadugadu"
+msgid "GaduGadu"
+msgstr "GaduGadu"
+
+#: uvcard.sgender
+#, fuzzy
+msgctxt "uvcard.sgender"
+msgid "Gender"
+msgstr "Kön"
+
+#: uvcard.sgoogletalk
+#, fuzzy
+msgctxt "uvcard.sgoogletalk"
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: uvcard.sgroupwise
+#, fuzzy
+msgctxt "uvcard.sgroupwise"
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: uvcard.shomeaddresscity
+#, fuzzy
+msgctxt "uvcard.shomeaddresscity"
+msgid "Home address city"
+msgstr "Hemadress ort/stad"
+
+#: uvcard.shomeaddresscountry
+#, fuzzy
+msgctxt "uvcard.shomeaddresscountry"
+msgid "Home address country"
+msgstr "Hemadress land"
+
+#: uvcard.shomeaddresspostalcode
+#, fuzzy
+msgctxt "uvcard.shomeaddresspostalcode"
+msgid "Home address postal code"
+msgstr "Hemadress postkod"
+
+#: uvcard.shomeaddresspostofficebox
+#, fuzzy
+msgctxt "uvcard.shomeaddresspostofficebox"
+msgid "Home address post office box"
+msgstr "Hemadress postbox"
+
+#: uvcard.shomeaddressregion
+#, fuzzy
+msgctxt "uvcard.shomeaddressregion"
+msgid "Home address region"
+msgstr "Hemadress region"
+
+#: uvcard.shomeaddressstreet
+#, fuzzy
+msgctxt "uvcard.shomeaddressstreet"
+msgid "Home address street"
+msgstr "Hemadress gata"
+
+#: uvcard.shomeaddressstreetextended
+#, fuzzy
+msgctxt "uvcard.shomeaddressstreetextended"
+msgid "Home address extended street"
+msgstr "Hemadress utökad gata"
+
+#: uvcard.shomeemail
+#, fuzzy
+msgctxt "uvcard.shomeemail"
+msgid "Home E-mail"
+msgstr "Hem E-mail"
+
+#: uvcard.shomefax
+#, fuzzy
+msgctxt "uvcard.shomefax"
+msgid "Home fax"
+msgstr "Hem fax"
+
+#: uvcard.shomemobile
+#, fuzzy
+msgctxt "uvcard.shomemobile"
+msgid "Home mobile"
+msgstr "Hem mobil"
+
+#: uvcard.shomepager
+#, fuzzy
+msgctxt "uvcard.shomepager"
+msgid "Home pager"
+msgstr "Hem pager"
+
+#: uvcard.shomephone
+#, fuzzy
+msgctxt "uvcard.shomephone"
+msgid "Home phone"
+msgstr "Hem telefon"
+
+#: uvcard.shomephone2
+#, fuzzy
+msgctxt "uvcard.shomephone2"
+msgid "Home phone 2"
+msgstr "Hem telefon 2"
+
+#: uvcard.sicq
+#, fuzzy
+msgctxt "uvcard.sicq"
+msgid "ICQ"
+msgstr "ICQ"
+
+#: uvcard.sinstagram
+#, fuzzy
+msgctxt "uvcard.sinstagram"
+msgid "Instagram"
+msgstr "Instagram"
+
+#: uvcard.sinternetemail
+#, fuzzy
+msgctxt "uvcard.sinternetemail"
+msgid "Internet E-mail"
+msgstr "Internet E-mail"
+
+#: uvcard.sirc
+#, fuzzy
+msgctxt "uvcard.sirc"
+msgid "IRC"
+msgstr "IRC"
+
+#: uvcard.sjabber
+#, fuzzy
+msgctxt "uvcard.sjabber"
+msgid "Jabber"
+msgstr "Jabber"
+
+#: uvcard.slastname
+#, fuzzy
+msgctxt "uvcard.slastname"
+msgid "Last Name"
+msgstr "Efternamn"
+
+#: uvcard.slasttimecontacted
+#, fuzzy
+msgctxt "uvcard.slasttimecontacted"
+msgid "Last Time Contacted"
+msgstr "Senaste kontaktad"
+
+#: uvcard.slinkedin
+#, fuzzy
+msgctxt "uvcard.slinkedin"
+msgid "LinkedIn"
+msgstr "LinkedIn"
+
+#: uvcard.slogo
+#, fuzzy
+msgctxt "uvcard.slogo"
+msgid "Logo"
+msgstr "Logo"
+
+#: uvcard.smainphone
+#, fuzzy
+msgctxt "uvcard.smainphone"
+msgid "Main phone"
+msgstr "Huvud telefon"
+
+#: uvcard.smastodon
+#, fuzzy
+msgctxt "uvcard.smastodon"
+msgid "Mastodon"
+msgstr "Mastodon"
+
+#: uvcard.smatrix
+#, fuzzy
+msgctxt "uvcard.smatrix"
+msgid "Matrix"
+msgstr "Matrix"
+
+#: uvcard.smiddlename
+#, fuzzy
+msgctxt "uvcard.smiddlename"
+msgid "Middle Name"
+msgstr "Mellannamn"
+
+#: uvcard.smobilephone
+#, fuzzy
+msgctxt "uvcard.smobilephone"
+msgid "Mobile phone"
+msgstr "Mobil"
+
+#: uvcard.smsn
+#, fuzzy
+msgctxt "uvcard.smsn"
+msgid "MSN"
+msgstr "MSN"
+
+#: uvcard.smyspace
+#, fuzzy
+msgctxt "uvcard.smyspace"
+msgid "MySpace"
+msgstr "MySpace"
+
+#: uvcard.snickname
+#, fuzzy
+msgctxt "uvcard.snickname"
+msgid "Nick name"
+msgstr "Smeknamn"
+
+#: uvcard.snote
+#, fuzzy
+msgctxt "uvcard.snote"
+msgid "Note"
+msgstr "Noter"
+
+#: uvcard.sorganization
+#, fuzzy
+msgctxt "uvcard.sorganization"
+msgid "Organization"
+msgstr "Organisation"
+
+#: uvcard.spager
+#, fuzzy
+msgctxt "uvcard.spager"
+msgid "Pager"
+msgstr "Pager"
+
+#: uvcard.speertube
+#, fuzzy
+msgctxt "uvcard.speertube"
+msgid "PeerTube"
+msgstr "PeerTube"
+
+#: uvcard.sphoto
+#, fuzzy
+msgctxt "uvcard.sphoto"
+msgid "Photo"
+msgstr "Foto"
+
+#: uvcard.sqq
+#, fuzzy
+msgctxt "uvcard.sqq"
+msgid "QQ"
+msgstr "QQ"
+
+#: uvcard.sreddit
+#, fuzzy
+msgctxt "uvcard.sreddit"
+msgid "Reddit"
+msgstr "Reddit"
+
+#: uvcard.srevision
+#, fuzzy
+msgctxt "uvcard.srevision"
+msgid "Revision"
+msgstr "Revision"
+
+#: uvcard.srole
+#, fuzzy
+msgctxt "uvcard.srole"
+msgid "Role"
+msgstr "Roll"
+
+#: uvcard.sskype
+#, fuzzy
+msgctxt "uvcard.sskype"
+msgid "Skype"
+msgstr "Skype"
+
+#: uvcard.ssnapchat
+#, fuzzy
+msgctxt "uvcard.ssnapchat"
+msgid "Snapchat"
+msgstr "Snapchat"
+
+#: uvcard.stelephone
+#, fuzzy
+msgctxt "uvcard.stelephone"
+msgid "Telephone"
+msgstr "Telefon"
+
+#: uvcard.stimescontacted
+#, fuzzy
+msgctxt "uvcard.stimescontacted"
+msgid "Times Contacted"
+msgstr "Antal kontaktad"
+
+#: uvcard.stitle
+#, fuzzy
+msgctxt "uvcard.stitle"
+msgid "Title"
+msgstr "Titel"
+
+#: uvcard.stitleafter
+#, fuzzy
+msgctxt "uvcard.stitleafter"
+msgid "Title After"
+msgstr "Titel efter"
+
+#: uvcard.stitlebefore
+#, fuzzy
+msgctxt "uvcard.stitlebefore"
+msgid "Title Before"
+msgstr "Titel före"
+
+#: uvcard.stwitter
+#, fuzzy
+msgctxt "uvcard.stwitter"
+msgid "Twitter"
+msgstr "Twitter"
+
+#: uvcard.suniqueidentifier
+#, fuzzy
+msgctxt "uvcard.suniqueidentifier"
+msgid "Unique identifier"
+msgstr "Unik Identifierare"
+
+#: uvcard.sversion
+#, fuzzy
+msgctxt "uvcard.sversion"
+msgid "Version"
+msgstr "Version"
+
+#: uvcard.svoipphone
+#, fuzzy
+msgctxt "uvcard.svoipphone"
+msgid "VoIP phone"
+msgstr "VoIP telefon"
+
+#: uvcard.swebaddress
+#, fuzzy
+msgctxt "uvcard.swebaddress"
+msgid "Web address"
+msgstr "Webbadress"
+
+#: uvcard.swebaddresshome
+#, fuzzy
+msgctxt "uvcard.swebaddresshome"
+msgid "Web address home"
+msgstr "Webbadress hem"
+
+#: uvcard.swebaddresswork
+#, fuzzy
+msgctxt "uvcard.swebaddresswork"
+msgid "Web address work"
+msgstr "Webbadress jobb"
+
+#: uvcard.swindowslive
+#, fuzzy
+msgctxt "uvcard.swindowslive"
+msgid "Windows Live"
+msgstr "Windows Live"
+
+#: uvcard.sworkaddresscity
+#, fuzzy
+msgctxt "uvcard.sworkaddresscity"
+msgid "Work address city"
+msgstr "Jobbadress ort/stad"
+
+#: uvcard.sworkaddresscountry
+#, fuzzy
+msgctxt "uvcard.sworkaddresscountry"
+msgid "Work address country"
+msgstr "Jobbadress land"
+
+#: uvcard.sworkaddresspostalcode
+#, fuzzy
+msgctxt "uvcard.sworkaddresspostalcode"
+msgid "Work address postal code"
+msgstr "Jobbadress postkod"
+
+#: uvcard.sworkaddresspostofficebox
+#, fuzzy
+msgctxt "uvcard.sworkaddresspostofficebox"
+msgid "Work address post office box"
+msgstr "Jobbadress postbox"
+
+#: uvcard.sworkaddressregion
+#, fuzzy
+msgctxt "uvcard.sworkaddressregion"
+msgid "Work address region"
+msgstr "Jobbadress region"
+
+#: uvcard.sworkaddressstreet
+#, fuzzy
+msgctxt "uvcard.sworkaddressstreet"
+msgid "Work address street"
+msgstr "Jobbadress gata"
+
+#: uvcard.sworkaddressstreetextended
+#, fuzzy
+msgctxt "uvcard.sworkaddressstreetextended"
+msgid "Work address extended street"
+msgstr "Jobbadress utökad gata"
+
+#: uvcard.sworkemail
+#, fuzzy
+msgctxt "uvcard.sworkemail"
+msgid "Work E-mail"
+msgstr "Jobb E-mail"
+
+#: uvcard.sworkfax
+#, fuzzy
+msgctxt "uvcard.sworkfax"
+msgid "Work fax"
+msgstr "Jobb fax"
+
+#: uvcard.sworkmobile
+#, fuzzy
+msgctxt "uvcard.sworkmobile"
+msgid "Work mobile"
+msgstr "Jobb mobil"
+
+#: uvcard.sworkpager
+#, fuzzy
+msgctxt "uvcard.sworkpager"
+msgid "Work pager"
+msgstr "Jobb pager"
+
+#: uvcard.sworkphone
+#, fuzzy
+msgctxt "uvcard.sworkphone"
+msgid "Work phone"
+msgstr "Jobb telefon"
+
+#: uvcard.syahoo
+#, fuzzy
+msgctxt "uvcard.syahoo"
+msgid "Yahoo!"
+msgstr "Yahoo!"
+
+#: uvcard.syoutube
+#, fuzzy
+msgctxt "uvcard.syoutube"
+msgid "YouTube"
+msgstr "YouTube"
+
+#: uvcardfile.svcardfile
+#, fuzzy
+msgctxt "uvcardfile.svcardfile"
+msgid "vCard file"
+msgstr "vCard fil"
+

trunk/UContactImage.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, Graphics, UContact, ExtCtrls;
+  Classes, SysUtils, Graphics, UVCard, ExtCtrls;
 
 type

trunk/UCore.pas

@@ -114 +114 @@
 
 uses
-  UFormMain, UFormSettings, UContact, UFormContacts, UFormFindDuplicity, UTest,
+  UFormMain, UFormSettings, UVCard, UFormContacts, UFormFindDuplicity, UTest,
   UFormGenerate, UFormError, UFormFind, UFormTest, UFormSource, UFormCompare,
-  UTestCases;
+  UTestCases, UVCardFile;
 
 resourcestring
@@ -156 +156 @@
     for I := 0 to OpenDialog1.Files.Count - 1 do begin
       if FileExists(OpenDialog1.Files[I]) then begin
-        TempFile := TContactsFile.Create;
+        TempFile := TVCardFile.Create;
         try
           TempFile.LoadFromFile(OpenDialog1.Files[I]);
-          TContactsFile(DataFile).Contacts.AddContacts(TContactsFile(TempFile).Contacts);
+          TVCardFile(DataFile).VCard.Contacts.AddContacts(TVCardFile(TempFile).VCard.Contacts);
           Inc(LoadedFiles);
         finally
@@ -166 +166 @@
       end;
     end;
-    if LoadedFiles > 0 then TContactsFile(DataFile).Modified := True;
+    if LoadedFiles > 0 then TVCardFile(DataFile).Modified := True;
     ShowMessage(Format(SCombinedContacts, [LoadedFiles]));
     UpdateFile;
@@ -193 +193 @@
         DirectorySeparator + 'Compare' + VCardFileExt;
       ForceDirectories(ExtractFileDir(TempFileName));
-      TContactsFile(DataFile).SaveToFile(TempFileName);
+      TVCardFile(DataFile).SaveToFile(TempFileName);
       LoadFileLeft(TempFileName);
       LoadFileRight(OpenDialog1.FileName);
@@ -226 +226 @@
   if SelectDirectoryDialog1.Execute then begin
     LastSplitDir := SelectDirectoryDialog1.FileName;
-    with TContactsFile(DataFile).Contacts do
+    with TVCardFile(DataFile).VCard.Contacts do
     for I := 0 to Count - 1 do begin
       if Items[I].Fields[cfFullName] <> '' then begin
@@ -253 +253 @@
   with TFormFindDuplicity.Create(nil) do
   try
-    Contacts := TContactsFile(DataFile).Contacts;
+    Contacts := TVCardFile(DataFile).VCard.Contacts;
     ShowModal;
     FormContacts.ReloadList;
@@ -266 +266 @@
   with TFormFind.Create(nil) do
   try
-    Contacts := TContactsFile(DataFile).Contacts;
+    Contacts := TVCardFile(DataFile).VCard.Contacts;
     ShowModal;
     FormContacts.ReloadList;
@@ -279 +279 @@
   with TFormGenerate.Create(nil) do
   try
-    Contacts := TContactsFile(DataFile).Contacts;
+    Contacts := TVCardFile(DataFile).VCard.Contacts;
     if ShowModal = mrOk then begin
       FormContacts.ReloadList;
@@ -298 +298 @@
 procedure TCore.ARemoveExactDuplicatesExecute(Sender: TObject);
 begin
-  TContactsFile(DataFile).Contacts.RemoveExactDuplicates;
+  TVCardFile(DataFile).VCard.Contacts.RemoveExactDuplicates;
   UpdateFile;
 end;
@@ -336 +336 @@
   with TFormSource.Create(nil) do
   try
-    Source := TContactsFile(DataFile).AsString;
+    Source := TVCardFile(DataFile).VCard.AsString;
     if ShowModal = mrOk then begin
-      TContactsFile(DataFile).AsString := Source;
+      TVCardFile(DataFile).VCard.AsString := Source;
       UpdateFile;
     end;
@@ -423 +423 @@
 
   DataFile := nil;
-  DefaultDataFileClass := TContactsFile;
+  DefaultDataFileClass := TVCardFile;
   FileClosed := True;
   RecentFileRegistryContext := TRegistryContext.Create(ApplicationInfo1.RegistryRoot,
@@ -504 +504 @@
     DataFile := DefaultDataFileClass.Create;
     DataFile.OnModify := FileModified;
-    TContactsFile(DataFile).OnError := DoError;
+    TVCardFile(DataFile).VCard.OnError := DoError;
   end;
 end;
@@ -514 +514 @@
   if Assigned(FormContacts) then begin
     if Assigned(DataFile) then
-      FormContacts.Contacts := TContactsFile(DataFile).Contacts
+      FormContacts.Contacts := TVCardFile(DataFile).VCard.Contacts
       else FormContacts.Contacts := nil;
     FormContacts.ReloadList;

trunk/UTest.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, Generics.Collections, UContact;
+  Classes, SysUtils, Generics.Collections, UVCard;
 
 type
@@ -64 +64 @@
 implementation
 
+uses
+  UVCardFile;
+
 resourcestring
   SExpected = 'Expected:';
@@ -84 +87 @@
   Lines := TStringList.Create;
   try
-    with TContactsFile.Create do
+    with TVCardFile.Create do
     try
       Lines.Text := Input;
-      LoadFromStrings(Lines);
-      if ContactIndex < Contacts.Count then begin
-        PropertyValue := Contacts[ContactIndex].Fields[Index];
+      VCard.LoadFromStrings(Lines);
+      if ContactIndex < VCard.Contacts.Count then begin
+        PropertyValue := VCard.Contacts[ContactIndex].Fields[Index];
         Evaluate(PropertyValue = Value);
       end else Fail;
@@ -112 +115 @@
   Lines := TStringList.Create;
   try
-    with TContactsFile.Create do
+    with TVCardFile.Create do
     try
       Lines.Text := Input;
-      LoadFromStrings(Lines);
+      VCard.LoadFromStrings(Lines);
 
       if Action = akRemoveExactDuplicates then
-        Contacts.RemoveExactDuplicates;
+        VCard.Contacts.RemoveExactDuplicates;
 
       Lines.Text := '';
-      SaveToStrings(Lines);
+      VCard.SaveToStrings(Lines);
       Evaluate(Lines.Text = Output);
       Log := SExpected + LineEnding +

trunk/UTestCases.pas

@@ -12 +12 @@
 
 uses
-  UContact;
+  UVCard;
 
 const

trunk/UVCard.pas

@@ -1 @@
-unit UContact;
+unit UVCard;
 
 interface
 
 uses
-  Classes, SysUtils, fgl, Dialogs, UDataFile, LazUTF8, Base64, Graphics;
+  Classes, SysUtils, Dialogs, LazUTF8, Base64, Graphics, UListViewSort,
+  Generics.Collections, Generics.Defaults;
 
 type
@@ -36 +37 @@
     function GetCombined: string;
   end;
-
-  TContactsFile = class;
 
   TErrorEvent = procedure (Text: string; Line: Integer) of object;
@@ -62 +61 @@
     cfPeerTube, cfLinkedIn, cfMastodon, cfMySpace, cfReddit);
 
-  TContactFieldIndexes = TFPGList<TContactFieldIndex>;
+  TContactFieldIndexes = TList<TContactFieldIndex>;
 
   TContactFilterItem = class
@@ -71 +70 @@
   { TContactFilterItems }
 
-  TContactFilterItems = class(TFPGObjectList<TContactFilterItem>)
+  TContactFilterItems = class(TObjectList<TContactFilterItem>)
     function AddNew(FieldIndex: TContactFieldIndex; Value: string): TContactFilterItem;
   end;
@@ -98 +97 @@
   { TContactFields }
 
-  TContactFields = class(TFPGObjectList<TContactField>)
+  TContactFields = class(TObjectList<TContactField>)
   private
     Indexes: array[TContactFieldIndex] of TContactField;
@@ -143 +142 @@
   { TContactProperties }
 
-  TContactProperties = class(TFPGObjectList<TContactProperty>)
+  TContactProperties = class(TObjectList<TContactProperty>)
     function AddNew(Name, Value: string): TContactProperty;
     procedure Assign(Source: TContactProperties);
-    procedure AssignToList(List: TFPGObjectList<TObject>);
+    procedure AssignToList(List: TObjects);
     function GetByName(Name: string): TContactProperty;
     function GetByNameGroups(Name: string; Groups: TStringArray;
@@ -153 +152 @@
       NoGroups: TStringArray): TContactProperties;
   end;
+
+  TVCard = class;
 
   { TContact }
@@ -170 +171 @@
   public
     Properties: TContactProperties;
-    ContactsFile: TContactsFile;
+    ParentVCard: TVCard;
     class function GetFields: TContactFields; static;
     function HasField(FieldIndex: TContactFieldIndex): Boolean;
@@ -197 +198 @@
   { TContacts }
 
-  TContacts = class(TFPGObjectList<TContact>)
-    ContactsFile: TContactsFile;
+  TContacts = class(TObjectList<TContact>)
+    ParentVCard: TVCard;
     procedure Assign(Source: TContacts);
+    procedure AssignToList(List: TObjects);
     procedure AddContacts(Contacts: TContacts);
     procedure InsertContacts(Index: Integer; Contacts: TContacts);
-    procedure AssignToList(List: TFPGObjectList<TObject>);
     function AddNew: TContact;
     function Search(Text: string; FieldIndex: TContactFieldIndex): TContact;
@@ -209 +210 @@
     function ToString: ansistring; override;
     procedure RemoveExactDuplicates;
-  end;
-
-  { TContactsFile }
-
-  TContactsFile = class(TDataFile)
+    procedure Sort;
+  end;
+
+  { TVCard }
+
+  TVCard = class(TComponent)
   private
     FMaxLineLength: Integer;
+    FModified: Boolean;
+    FOnModify: TNotifyEvent;
     FOnError: TErrorEvent;
+    function GetString: string;
+    procedure SetModified(AValue: Boolean);
+    procedure SetString(AValue: string);
     procedure Error(Text: string; Line: Integer);
-    function GetString: string;
-    function NewItem(Key, Value: string): string;
-    procedure SetString(AValue: string);
+    procedure DoOnModify;
   public
     Contacts: TContacts;
-    function GetFileName: string; override;
-    function GetFileExt: string; override;
-    function GetFileFilter: string; override;
+    procedure Assign(Source: TPersistent); override;
     procedure SaveToStrings(Output: TStrings);
     procedure LoadFromStrings(Lines: TStrings);
-    procedure SaveToFile(FileName: string); override;
-    procedure LoadFromFile(FileName: string); override;
-    procedure Sort;
-    procedure Assign(Source: TContactsFile);
-    constructor Create; override;
+    procedure SaveToFile(FileName: string);
+    procedure LoadFromFile(FileName: string);
+    constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
     property AsString: string read GetString write SetString;
+    property Modified: Boolean read FModified write SetModified;
   published
+    property MaxLineLength: Integer read FMaxLineLength write FMaxLineLength;
+    property OnModify: TNotifyEvent read FOnModify write FOnModify;
     property OnError: TErrorEvent read FOnError write FOnError;
-    property MaxLineLength: Integer read FMaxLineLength write FMaxLineLength;
   end;
 
@@ -261 +264 @@
 
 resourcestring
-  SVCardFile = 'vCard file';
   SFieldIndexRedefined = 'Field index %d redefined';
   SExpectedVCardBegin = 'Expected vCard begin';
@@ -518 +520 @@
 end;
 
+{ TVCard }
+
+function TVCard.GetString: string;
+var
+  I: Integer;
+begin
+  Result := '';
+  for I := 0 to Contacts.Count - 1 do
+    Result := Result + Contacts[I].AsString;
+end;
+
+procedure TVCard.SetModified(AValue: Boolean);
+begin
+  if FModified = AValue then Exit;
+  FModified := AValue;
+  DoOnModify;
+end;
+
+procedure TVCard.SetString(AValue: string);
+var
+  Lines: TStringList;
+begin
+  Lines := TStringList.Create;
+  try
+    Lines.Text := AValue;
+    LoadFromStrings(Lines);
+    Modified := True;
+  finally
+    Lines.Free;
+  end;
+end;
+
+procedure TVCard.DoOnModify;
+begin
+  if Assigned(FOnModify) then FOnModify(Self);
+end;
+
+procedure TVCard.Error(Text: string; Line: Integer);
+begin
+  if Assigned(FOnError) then FOnError(Text, Line);
+end;
+
+procedure TVCard.Assign(Source: TPersistent);
+begin
+  inherited;
+  if Source is TVCard then Contacts.Assign((Source as TVCard).Contacts);
+end;
+
+procedure TVCard.SaveToStrings(Output: TStrings);
+var
+  I: Integer;
+begin
+  for I := 0 to Contacts.Count - 1 do
+    Contacts[I].SaveToStrings(Output);
+end;
+
+procedure TVCard.LoadFromStrings(Lines: TStrings);
+var
+  Contact: TContact;
+  I: Integer;
+begin
+  Contacts.Clear;
+  //MaxLineLength := 10;
+
+  I := 0;
+  while I < Lines.Count do begin
+    Contact := TContact.Create;
+    Contact.ParentVCard := Self;
+    if Contact.LoadFromStrings(Lines, I) then begin
+      Contacts.Add(Contact);
+    end else begin
+      FreeAndNil(Contact);
+      Inc(I);
+    end;
+  end;
+end;
+
+procedure TVCard.SaveToFile(FileName: string);
+var
+  Lines: TStringList;
+begin
+  Lines := TStringList.Create;
+  try
+    SaveToStrings(Lines);
+    Lines.SaveToFile(FileName);
+  finally
+    Lines.Free;
+  end
+end;
+
+procedure TVCard.LoadFromFile(FileName: string);
+var
+  Lines: TStringList;
+begin
+  Lines := TStringList.Create;
+  Lines.LoadFromFile(FileName);
+  {$IF FPC_FULLVERSION>=30200}
+  if (Length(Lines.Text) > 0) and (Pos(VCardBegin, Lines.Text) = 0) then begin
+    Lines.LoadFromFile(FileName, TEncoding.Unicode);
+    if (Length(Lines.Text) > 0) and (Pos(VCardBegin, Lines.Text) = 0) then begin
+      Lines.LoadFromFile(FileName, TEncoding.BigEndianUnicode);
+    end;
+  end;
+  {$ENDIF}
+  try
+    LoadFromStrings(Lines);
+  finally
+    Lines.Free;
+  end;
+end;
+
+constructor TVCard.Create(AOwner: TComponent);
+begin
+  inherited;
+  FMaxLineLength := DefaultMaxLineLength;
+  Contacts := TContacts.Create;
+  Contacts.ParentVCard := Self;
+end;
+
+destructor TVCard.Destroy;
+begin
+  FreeAndNil(Contacts);
+  inherited;
+end;
+
 function TNameDetails.GetAsNameParts: TNameParts;
 var
@@ -846 +973 @@
   I: Integer;
 begin
-  while Count < Source.Count do
-    Add(TContactProperty.Create);
-  while Count > Source.Count do
-    Delete(Count - 1);
-  for I := 0 to Count - 1 do
-    Items[I].Assign(Source.Items[I]);
-end;
-
-procedure TContactProperties.AssignToList(List: TFPGObjectList<TObject>);
+  while Count > Source.Count do Delete(Count - 1);
+  while Count < Source.Count do Add(TContactProperty.Create);
+  for I := 0 to Count - 1 do Items[I].Assign(Source.Items[I]);
+end;
+
+procedure TContactProperties.AssignToList(List: TObjects);
 var
   I: Integer;
 begin
   while List.Count > Count do List.Delete(List.Count - 1);
-  while List.Count < Count do List.Add(nil);
-  for I := 0 to Count - 1 do
-    List[I] := Items[I];
+  for I := 0 to List.Count - 1 do List[I] := Items[I];
+  while List.Count < Count do List.Add(Items[List.Count]);
 end;
 
@@ -1085 +1208 @@
   I: Integer;
 begin
-  while Count < Source.Count do
-    Add(TContact.Create);
-  while Count > Source.Count do
-    Delete(Count - 1);
+  while Count > Source.Count do Delete(Count - 1);
+  while Count < Source.Count do Add(TContact.Create);
   for I := 0 to Count - 1 do begin
     Items[I].Assign(Source.Items[I]);
-    Items[I].ContactsFile := ContactsFile;
+    Items[I].ParentVCard := ParentVCard;
   end;
 end;
@@ -1108 +1229 @@
     NewContact := TContact.Create;
     NewContact.Assign(Contacts[I]);
-    NewContact.ContactsFile := ContactsFile;
+    NewContact.ParentVCard := ParentVCard;
     Insert(Index, NewContact);
     Inc(Index);
@@ -1126 +1247 @@
 end;
 
-procedure TContacts.AssignToList(List: TFPGObjectList<TObject>);
+function ComparePropertyName(constref Item1, Item2: TContactProperty): Integer;
+begin
+  Result := CompareStr(Item1.Name + ';' + Item1.Attributes.Text,
+    Item2.Name + ';' + Item2.Attributes.Text);
+end;
+
+function CompareContactFullName(constref Item1, Item2: TContact): Integer;
+begin
+  Result := CompareStr(Item1.Fields[cfFullName], Item2.Fields[cfFullName]);
+end;
+
+procedure TContacts.Sort;
+var
+  I: Integer;
+begin
+  inherited Sort(TComparer<TContact>.Construct(CompareContactFullName));
+  for I := 0 to Count - 1 do
+    Items[I].Properties.Sort(TComparer<TContactProperty>.Construct(ComparePropertyName));
+end;
+
+procedure TContacts.AssignToList(List: TObjects);
 var
   I: Integer;
 begin
   while List.Count > Count do List.Delete(List.Count - 1);
-  while List.Count < Count do List.Add(nil);
-  for I := 0 to Count - 1 do
-    List[I] := Items[I];
+  for I := 0 to List.Count - 1 do List[I] := Items[I];
+  while List.Count < Count do List.Add(Items[List.Count]);
 end;
 
@@ -1139 +1279 @@
 begin
   Result := TContact.Create;
-  Result.ContactsFile := ContactsFile;
+  Result.ParentVCard := ParentVCard;
   Add(Result);
 end;
@@ -1175 +1315 @@
     NewContact := TContact.Create;
     NewContact.Assign(Contact);
-    NewContact.ContactsFile := ContactsFile;
+    NewContact.ParentVCard := ParentVCard;
     Add(NewContact);
   end;
@@ -1400 +1540 @@
   Field: TContactField;
 begin
-  if not Assigned(ContactsFile) then
+  if not Assigned(ParentVCard) then
     raise Exception.Create(SContactHasNoParent);
   Field := GetFields.GetByIndex(Index);
@@ -1435 +1575 @@
   I: Integer;
 begin
-  if not Assigned(ContactsFile) then
+  if not Assigned(ParentVCard) then
     raise Exception.Create(SContactHasNoParent);
   Field := GetFields.GetByIndex(Index);
@@ -1486 +1626 @@
       Dec(LineLength);
   end;
-  if LineLength > ContactsFile.MaxLineLength then
-    ContactsFile.MaxLineLength := LineLength;
+  if LineLength > ParentVCard.MaxLineLength then
+    ParentVCard.MaxLineLength := LineLength;
 end;
 
@@ -1509 +1649 @@
   Field: TContactField;
 begin
-  if not Assigned(ContactsFile) then raise Exception.Create(SContactHasNoParent);
+  if not Assigned(ParentVCard) then raise Exception.Create(SContactHasNoParent);
   Field := GetFields.GetByIndex(FieldIndex);
   if Assigned(Field) then begin
@@ -1545 +1685 @@
   Field: TContactField;
 begin
-  if not Assigned(ContactsFile) then raise Exception.Create(SContactHasNoParent);
+  if not Assigned(ParentVCard) then raise Exception.Create(SContactHasNoParent);
   Field := GetFields.GetByIndex(FieldIndex);
   if Assigned(Field) then begin
@@ -1562 +1702 @@
   I: Integer;
 begin
-  if not Assigned(ContactsFile) then raise Exception.Create(SContactHasNoParent);
+  if not Assigned(ParentVCard) then raise Exception.Create(SContactHasNoParent);
   Result := False;
   for I := 0 to GetFields.Count - 1 do begin
@@ -1637 +1777 @@
         LinePrefix := '';
         while True do begin
-          if UTF8Length(OutText) > ContactsFile.MaxLineLength then begin
-            CutLength := ContactsFile.MaxLineLength;
+          if UTF8Length(OutText) > ParentVCard.MaxLineLength then begin
+            CutLength := ParentVCard.MaxLineLength;
             if Encoding = veQuotedPrintable then begin
               Dec(CutLength); // There will be softline break at the end
@@ -1696 +1836 @@
         ParseState := psInside;
       end else begin
-        ContactsFile.Error(SExpectedVCardBegin, I + 1);
+        ParentVCard.Error(SExpectedVCardBegin, I + 1);
         Break;
       end;
@@ -1742 +1882 @@
         NewProperty.EvaluateAttributes;
       end else begin
-        ContactsFile.Error(SExpectedProperty, I + 1);
+        ParentVCard.Error(SExpectedProperty, I + 1);
         Break;
       end;
@@ -1787 +1927 @@
 end;
 
-{ TContactsFile }
-
-procedure TContactsFile.Error(Text: string; Line: Integer);
-begin
-  if Assigned(FOnError) then FOnError(Text, Line);
-end;
-
-function TContactsFile.GetString: string;
-var
-  I: Integer;
-begin
-  Result := '';
-  for I := 0 to Contacts.Count - 1 do
-    Result := Result + Contacts[I].AsString;
-end;
-
-function TContactsFile.GetFileName: string;
-begin
-  Result := SVCardFile;
-end;
-
-function TContactsFile.GetFileExt: string;
-begin
-  Result := VCardFileExt;
-end;
-
-function TContactsFile.GetFileFilter: string;
-begin
-  Result := GetFileName + ' (' + GetFileExt + ')|*' + GetFileExt + '|' + inherited;
-end;
-
-procedure TContactsFile.SaveToStrings(Output: TStrings);
-var
-  I: Integer;
-begin
-  for I := 0 to Contacts.Count - 1 do
-    Contacts[I].SaveToStrings(Output);
-end;
-
-procedure TContactsFile.LoadFromStrings(Lines: TStrings);
-var
-  Contact: TContact;
-  I: Integer;
-begin
-  Contacts.Clear;
-  //MaxLineLength := 10;
-
-  I := 0;
-  while I < Lines.Count do begin
-    Contact := TContact.Create;
-    Contact.ContactsFile := Self;
-    if Contact.LoadFromStrings(Lines, I) then begin
-      Contacts.Add(Contact);
-    end else begin
-      FreeAndNil(Contact);
-      Inc(I);
-    end;
-  end;
-end;
-
-function TContactsFile.NewItem(Key, Value: string): string;
-var
-  Charset: string;
-begin
-  if not IsAsciiString(Value) then Charset := ';CHARSET=UTF-8'
-    else Charset := '';
-  Result := Key + Charset + ':' + Value;
-end;
-
-procedure TContactsFile.SetString(AValue: string);
-var
-  Lines: TStringList;
-begin
-  Lines := TStringList.Create;
-  try
-    Lines.Text := AValue;
-    LoadFromStrings(Lines);
-    Modified := True;
-  finally
-    Lines.Free;
-  end;
-end;
-
-procedure TContactsFile.SaveToFile(FileName: string);
-var
-  Lines: TStringList;
-begin
-  inherited;
-  Lines := TStringList.Create;
-  try
-    SaveToStrings(Lines);
-    Lines.SaveToFile(FileName);
-  finally
-    Lines.Free;
-  end
-end;
-
-procedure TContactsFile.LoadFromFile(FileName: string);
-var
-  Lines: TStringList;
-begin
-  inherited;
-  Lines := TStringList.Create;
-  Lines.LoadFromFile(FileName);
-  {$IF FPC_FULLVERSION>=30200}
-  if (Length(Lines.Text) > 0) and (Pos(VCardBegin, Lines.Text) = 0) then begin
-    Lines.LoadFromFile(FileName, TEncoding.Unicode);
-    if (Length(Lines.Text) > 0) and (Pos(VCardBegin, Lines.Text) = 0) then begin
-      Lines.LoadFromFile(FileName, TEncoding.BigEndianUnicode);
-    end;
-  end;
-  {$ENDIF}
-  try
-    LoadFromStrings(Lines);
-  finally
-    Lines.Free;
-  end;
-end;
-
-function CompareContactFullName(const Item1, Item2: TContact): Integer;
-begin
-  Result := CompareStr(Item1.Fields[cfFullName], Item2.Fields[cfFullName]);
-end;
-
-function ComparePropertyName(const Item1, Item2: TContactProperty): Integer;
-begin
-  Result := CompareStr(Item1.Name + ';' + Item1.Attributes.Text,
-    Item2.Name + ';' + Item2.Attributes.Text);
-end;
-
-procedure TContactsFile.Sort;
-var
-  I: Integer;
-begin
-  Contacts.Sort(CompareContactFullName);
-  for I := 0 to Contacts.Count - 1 do
-    Contacts[I].Properties.Sort(ComparePropertyName);
-end;
-
-procedure TContactsFile.Assign(Source: TContactsFile);
-begin
-  inherited Assign(Source);
-  Contacts.Assign(Source.Contacts);
-end;
-
-constructor TContactsFile.Create;
-begin
-  inherited;
-  Contacts := TContacts.Create;
-  Contacts.ContactsFile := Self;
-  MaxLineLength := DefaultMaxLineLength;
-end;
-
-destructor TContactsFile.Destroy;
-begin
-  FreeAndNil(Contacts);
-  inherited;
-end;
-
 end.
 

trunk/vCardStudio.lpi

@@ -119 +119 @@
       </Item6>
     </RequiredPackages>
-    <Units Count="26">
+    <Units Count="27">
       <Unit0>
         <Filename Value="vCardStudio.lpr"/>
@@ -150 +150 @@
       </Unit4>
       <Unit5>
-        <Filename Value="UContact.pas"/>
+        <Filename Value="UVCard.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit5>
@@ -275 +275 @@
         <IsPartOfProject Value="True"/>
       </Unit25>
+      <Unit26>
+        <Filename Value="UVCardFile.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit26>
     </Units>
   </ProjectOptions>

trunk/vCardStudio.lpr

@@ -6 +6 @@
   {$ENDIF}
   Interfaces, // this includes the LCL widgetset
-  Forms, UFormMain, UCore, Diff, Common, SysUtils, UFormCompare, UTestCases;
+  Forms, UFormMain, UCore, Diff, Common, SysUtils, UFormCompare, UTestCases,
+  UVCardFile;
 
 {$R *.res}