[evolution-patches] Fixes for missing punctuation in schemas

[Kjartan Maraas <kmaraas broadpark no>]

Patch attached.

Cheers
Kjartan

Index: shell/apps_evolution_shell.schemas.in
===================================================================
--- shell/apps_evolution_shell.schemas.in	(revisjon 34811)
+++ shell/apps_evolution_shell.schemas.in	(arbeidskopi)
@@ -62,7 +62,7 @@
       <default>true</default>
       <locale name="C">
         <short>Whether crash recovery should be done or not</short>
-	<long>Decides whether the crash recovery should be run or not</long>
+	<long>Decides whether the crash recovery should be run or not.</long>
       </locale>
     </schema>
 
@@ -238,7 +238,7 @@
       <type>list</type>
       <list_type>string</list_type>
       <locale name="C">
-        <long>A string description of the current printer settings</long>
+        <long>A string description of the current printer settings.</long>
       </locale>
     </schema>
   </schemalist>  
Index: plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in
===================================================================
--- plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in	(revisjon 34811)
+++ plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in	(arbeidskopi)
@@ -8,7 +8,7 @@
       <default>true</default>
       <locale name="C">
         <short>Enable attachment reminder plugin</short>
-        <long>Enable attachment reminder plugin</long>
+        <long>Enable attachment reminder plugin.</long>
       </locale>
     </schema>
 
@@ -32,7 +32,7 @@
 	       in a message body</short>
          <long>
 	       List of clues for the attachment reminder plugin to look for
-	       in a message body
+	       in a message body.
          </long>
       </locale>
     </schema>
Index: mail/em-filter-i18n.h
===================================================================
--- mail/em-filter-i18n.h	(revisjon 34811)
+++ mail/em-filter-i18n.h	(arbeidskopi)
@@ -5,40 +5,29 @@
 char *s = N_("Attachments");
 char *s = N_("BCC");
 char *s = N_("Beep");
+<<<<<<< .mine
 char *s = N_("CC");
 char *s = N_("Completed On");
+=======
+char *s = N_("CC");
+char *s = N_("Completed On");
 char *s = N_("contains");
+>>>>>>> .r34811
 char *s = N_("Copy to Folder");
 char *s = N_("Date received");
 char *s = N_("Date sent");
 char *s = N_("Delete");
 char *s = N_("Deleted");
-char *s = N_("does not contain");
-char *s = N_("does not end with");
-char *s = N_("does not exist");
-char *s = N_("does not return");
-char *s = N_("does not sound like");
-char *s = N_("does not start with");
 char *s = N_("Do Not Exist");
 char *s = N_("Draft");
-char *s = N_("ends with");
 char *s = N_("Exist");
-char *s = N_("exists");
 char *s = N_("Expression");
 char *s = N_("Follow Up");
 char *s = N_("Important");
-char *s = N_("is");
-char *s = N_("is after");
-char *s = N_("is before");
-char *s = N_("is Flagged");
-char *s = N_("is greater than");
-char *s = N_("is less than");
-char *s = N_("is not");
-char *s = N_("is not Flagged");
+char *s = N_("Junk Test");
 char *s = N_("is not set");
 char *s = N_("is set");
 char *s = N_("Junk");
-char *s = N_("Junk Test");
 char *s = N_("Label");
 char *s = N_("Mailing list");
 char *s = N_("Match All");
@@ -53,20 +42,39 @@
 char *s = N_("Recipients");
 char *s = N_("Regex Match");
 char *s = N_("Replied to");
-char *s = N_("returns");
-char *s = N_("returns greater than");
-char *s = N_("returns less than");
 char *s = N_("Run Program");
 char *s = N_("Score");
 char *s = N_("Sender");
 char *s = N_("Set Label");
 char *s = N_("Set Status");
 char *s = N_("Size (kB)");
-char *s = N_("sounds like");
 char *s = N_("Source Account");
 char *s = N_("Specific header");
-char *s = N_("starts with");
 char *s = N_("Status");
 char *s = N_("Stop Processing");
 char *s = N_("Subject");
 char *s = N_("Unset Status");
+char *s = N_("contains");
+char *s = N_("does not contain");
+char *s = N_("does not end with");
+char *s = N_("does not exist");
+char *s = N_("does not return");
+char *s = N_("does not sound like");
+char *s = N_("does not start with");
+char *s = N_("ends with");
+char *s = N_("exists");
+char *s = N_("is Flagged");
+char *s = N_("is after");
+char *s = N_("is before");
+char *s = N_("is greater than");
+char *s = N_("is less than");
+char *s = N_("is not Flagged");
+char *s = N_("is not set");
+char *s = N_("is not");
+char *s = N_("is set");
+char *s = N_("is");
+char *s = N_("returns greater than");
+char *s = N_("returns less than");
+char *s = N_("returns");
+char *s = N_("sounds like");
+char *s = N_("starts with");
Index: mail/evolution-mail.schemas.in
===================================================================
--- mail/evolution-mail.schemas.in	(revisjon 34811)
+++ mail/evolution-mail.schemas.in	(arbeidskopi)
@@ -165,7 +165,7 @@
       <default>600</default>
       <locale name="C">
          <short>Composer Window default width</short>
-         <long>Default width of the Composer Window</long>
+         <long>Default width of the Composer Window.</long>
       </locale>
     </schema>
 
@@ -177,7 +177,7 @@
       <default>500</default>
       <locale name="C">
          <short>Composer Window default height</short>
-         <long>Default height of the Composer Window</long>
+         <long>Default height of the Composer Window.</long>
       </locale>
     </schema>
 
@@ -276,9 +276,9 @@
          <short>Load images for HTML messages over http</short>
          <long>
           Load images for HTML messages over http(s). Possible values are:
-          0 - Never load images off the net
-          1 - Load images in messages from contacts
-          2 - Always load images off the net
+          0 - Never load images off the net.
+          1 - Load images in messages from contacts.
+          2 - Always load images off the net.
          </long>
       </locale>
     </schema>
@@ -380,7 +380,7 @@
       <locale name="C">
          <short>Show the sender email in the messages column in the message list</short>
          <long>
-          Show the email of the sender in the messages composite column in the message list
+          Show the email of the sender in the messages composite column in the message list.
          </long>
       </locale>
     </schema>
@@ -392,9 +392,9 @@
       <type>int</type>
       <default>1500</default>
       <locale name="C">
-         <short>Timeout for marking message as Seen</short>
+         <short>Timeout for marking message as seen</short>
          <long>
-          Timeout for marking message as Seen.
+          Timeout for marking message as seen.
          </long>
       </locale>
     </schema>
@@ -434,9 +434,9 @@
       <type>bool</type>
       <default>true</default>
       <locale name="C">
-         <short>Enable Search Folders</short>
+         <short>Enable search folders</short>
          <long>
-          Enable Search Folders on startup.
+          Enable search folders on startup.
          </long>
       </locale>
     </schema>
@@ -507,7 +507,7 @@
       <locale name="C">
          <short>Variable width font</short>
          <long>
-	 The variable width font for mail display 
+	 The variable width font for mail display.
          </long>
       </locale>
     </schema>
@@ -521,7 +521,7 @@
       <locale name="C">
          <short>Terminal font</short>
          <long>
-	 The terminal font for mail display 
+	 The terminal font for mail display.
          </long>
       </locale>
     </schema>
@@ -535,7 +535,7 @@
       <locale name="C">
          <short>Use custom fonts</short>
          <long>
-	 Use custom fonts for displaying mail
+	 Use custom fonts for displaying mail.
          </long>
       </locale>
     </schema>
@@ -549,7 +549,7 @@
       <locale name="C">
          <short>Thread the message-list</short>
          <long>
-          Thread the message list.
+         Thread the message list.
          </long>
       </locale>
     </schema>
@@ -578,7 +578,7 @@
       <locale name="C">
          <short>Allows evolution to display text part of limited size</short>
          <long>
-		 Enable to render message text part of limited size.
+	 Enable to render message text part of limited size.
          </long>
       </locale>
     </schema>
@@ -592,9 +592,9 @@
       <locale name="C">
          <short>Text message part limit</short>
          <long>
-		 This decides the max size of the text part that can be formatted under
-		 evolution. The default is 4MB / 4096 KB and is specified interms of KB.
-		 </long>
+	 This decides the max size of the text part that can be formatted under
+	 evolution. The default is 4MB / 4096 KB and is specified interms of KB.
+	 </long>
       </locale>
     </schema>
 
@@ -638,7 +638,7 @@
          <short>Default value for thread expand state</short>
          <long>
 	  This setting specifies whether the threads should be in expanded
-	  or collapsed state by default. Evolution requires a restart
+	  or collapsed state by default. Evolution requires a restart.
          </long>
       </locale>
     </schema>
@@ -669,7 +669,7 @@
       <default>600</default>
       <locale name="C">
          <short>Message Window default width</short>
-         <long>Default width of the Message Window</long>
+         <long>Default width of the message window.</long>
       </locale>
     </schema>
 
@@ -681,7 +681,7 @@
       <default>400</default>
       <locale name="C">
          <short>Message Window default height</short>
-         <long>Default height of the Message Window</long>
+         <long>Default height of the message window.</long>
       </locale>
     </schema>
 
@@ -695,7 +695,7 @@
       <default>600</default>
       <locale name="C">
          <short>Subscribe dialog default width</short>
-         <long>Default width of the Subscribe dialog</long>
+         <long>Default width of the subscribe dialog.</long>
       </locale>
     </schema>
 
@@ -707,7 +707,7 @@
       <default>400</default>
       <locale name="C">
          <short>Subscribe dialog default height</short>
-         <long>Default height of the Subscribe dialog</long>
+         <long>Default height of the subscribe dialog.</long>
       </locale>
     </schema>
 
@@ -1007,7 +1007,7 @@
       <locale name="C">
          <short>Check incoming mail being junk</short>
          <long>
-          Run junk test on incoming mail
+          Run junk test on incoming mail.
          </long>
       </locale>
     </schema>
@@ -1093,7 +1093,7 @@
       <locale name="C">
          <short>Use SpamAssassin daemon and client</short>
          <long>
-          Use SpamAssassin daemon and client (spamc/spamd)
+          Use SpamAssassin daemon and client (spamc/spamd).
          </long>
       </locale>
     </schema>
@@ -1153,7 +1153,7 @@
       <locale name="C">
          <short>Save directory</short>
          <long>
-           Directory for saving mail component files
+           Directory for saving mail component files.
          </long>
       </locale>
     </schema>
@@ -1166,7 +1166,7 @@
       <locale name="C">
          <short>Composer load/attach directory</short>
          <long>
-           Directory for loading/attaching files to composer
+           Directory for loading/attaching files to composer.
          </long>
       </locale>
     </schema>