Skip to content

Commit

Permalink
Update help file.
Browse files Browse the repository at this point in the history
  • Loading branch information
@yunosh
yunosh committed Nov 5, 2013
1 parent 0654001 commit a155547
Show file tree
Hide file tree
Showing 8 changed files with 876 additions and 176 deletions.
121 changes: 115 additions & 6 deletions ingo/locale/ca/help.xml
View file
Expand Up @@ -88,7 +88,7 @@ El missatge s'emmagatzemarà en la carpeta indicada.
El missatge original s'eliminarà i s'enviarà un missatge nou al remitent amb el text que indiqui.
</para>
</entry>
<entry id="rule-combine" md5="29484c1ebdd7ce71edc34fc8100ef69c" state="uptodate">
<entry id="rule-combine" md5="29484c1ebdd7ce71edc34fc8100ef69c" state="changed">
<title>Regla de filtrat: Combinar opcions</title>
<para>
Pot definir diverses condicions en una mateixa regla. Pot agrupar-les de forma lógica mitjançant "I"/"O", no pot crear filtres complexos que continguin ambdós tipus de condicions.
Expand All @@ -101,7 +101,19 @@ El missatge s'emmagatzemarà en la carpeta indicada.
<para>
Si selecciona O, les accions indicades s'executaran si es compleix almenys una de les condicions.
</para>
</entry>
<!-- English entry (2013-11-05):
<entry id="rule-combine">
<title>Filter Rule: Combine Options</title>
<para>You may define multiple conditions within a single rule. You may
group them together logically using "and"/"or". You may not create complex
filters containing both types of conditions.</para>
<heading>And</heading>
<para>If you select AND, an incoming message must match every condition
that you specify in order for the actions to be executed.</para>
<heading>Or</heading>
<para>If you select OR, the specified actions will be executed if at least
one of the conditions is met.</para>
</entry>--></entry>
<entry id="rule-mark" md5="0cbcc4ad4857b8538cd4e3915fbe9d73" state="changed">
<title>Regla de filtratge: assenyalar missatge</title>
<para>
Expand All @@ -120,6 +132,12 @@ El missatge s'emmagatzemarà en la carpeta indicada.
of the actions in a rule. The possible values are Seen, Flagged For Followup,
Answered, and Deleted.</para>
</entry>--><!-- English entry:
<entry id="rule-mark">
<title>Filter Rule: Mark Message</title>
<para>You may specify marking a message with one or more IMAP flags as one
of the actions in a rule. The possible values are Seen, Flagged For Followup,
Answered, and Deleted.</para>
</entry>--><!-- English entry (2013-11-05):
<entry id="rule-mark">
<title>Filter Rule: Mark Message</title>
<para>You may specify marking a message with one or more IMAP flags as one
Expand Down Expand Up @@ -281,6 +299,82 @@ Aquesta és una prova relacional que compara numéricament el valor indicat i el
<warn>The Sieve specification doesn't support comparions with negative
numbers. If you enter a negative value in one of the relational tests,
your rule won't work correctly.</warn>
</entry>--><!-- English entry (2013-11-05):
<entry id="rule-matches">
<title>Filter Rule: Matches</title>
<para>There are 3 components to each condition in a rule. The first is the
field to examine. The second is the type of comparison to perform. The
third is the value to which the field should be compared. There are a few
different types of comparisons that can be performed. The comparisons
available for any given field will depend on both the type of the field and
what the underlying filtering software can handle. Thus, all potential
matching options listed below may not appear for a given field.</para>
<heading>Contains</heading>
<para>Will be considered to be true if the specified string is found
anywhere on the line. Example: user@example would match
joe_user@example.com</para>
<heading>Doesn't Contain</heading>
<para>Will be considered to be true if the specified string is not found
anywhere on the line. Example: user@example would not match
joe_user@example.com</para>
<heading>Is</heading>
<para>Will be considered to be true if the specified string matches the
line exactly. Example: user@example.com is user@example.com</para>
<heading>Isn't</heading>
<para>Will be considered to be true if the specified string does not match
the line exactly. Example: user@example is not user@example.com</para>
<heading>Begins with</heading>
<para>Will be considered to be true if the specified string matches the
beginning of the line. Example: user@example will match
user@example.com</para>
<heading>Doesn't begin with</heading>
<para>Will be considered to be true if the specified string does not match
the beginning of the line. Example: user@example.com will not match
user@example</para>
<heading>Ends with</heading>
<para>Will be considered to be true if the specified string matches the end
of the line. Example: example.com will match user@example.com</para>
<heading>Doesn't end with</heading>
<para>Will be considered to be true if the specified string does not match
the end of the line. Example: horde.org will not match
user@example.com</para>
<heading>Exists</heading>
<para>Will be considered to be true if the specified header exists in the
message, regardless of what its value is.</para>
<heading>Doesn't Exist</heading>
<para>Will be considered to be true if the specified header does not exist
in the message.</para>
<heading>Regex</heading>
<para>Regex allows you to use complex POSIX compatible regular expressions
to compare against message headers.</para>
<heading>Matches</heading>
<para>Matches is similar to contains, with the exception that you may use *
and ? as wildcards. An * will match any number of characters, and a ? will
match exactly one charater. Example: "*user?@example.com" will match both
"user1@example.com" and "otheruser2@example.com"</para>
<heading>Doesn't match</heading>
<para>Doesn't match is the same as matches except that it will evaluate to
false if the specified value matches the string in the message
header.</para>
<heading>Less than</heading>
<para>This is a relational test which will compare the value you specify
and the value in the message header numerically.</para>
<heading>Less than or equal to</heading>
<para>This is a relational test which will compare the value you specify
and the value in the message header numerically.</para>
<heading>Equal to</heading>
<para>This is a relational test which will compare the value you specify
and the value in the message header numerically.</para>
<heading>Greater than or equal to</heading>
<para>This is a relational test which will compare the value you specify
and the value in the message header numerically.</para>
<heading>Greater than</heading>
<para>This is a relational test which will compare the value you specify
and the value in the message header numerically.</para>
<heading>Limitation with Sieve filtering</heading>
<warn>The Sieve specification doesn't support comparions with negative
numbers. If you enter a negative value in one of the relational tests,
your rule won't work correctly.</warn>
</entry>--></entry>
<entry id="rule-name" md5="8faaf71e4bf2f91d943d77f803f9a2d5" state="uptodate">
<title>Regla de filtrat: Nom</title>
Expand Down Expand Up @@ -328,12 +422,23 @@ Si té més d'una adreça de correu assignades a aquesta bústia, indiqueu-les a
No enviar la notificació d'absència a aquests destinataris. Cada adreça ha d'estar en una línia diferent.
</para>
</entry>
<entry id="vacation-reason" md5="d4da2f3a0d357e00950ec57d984cbcee" state="uptodate">
<entry id="vacation-reason" md5="d4da2f3a0d357e00950ec57d984cbcee" state="changed">
<title>Absència: Motiu de l'absència</title>
<para>
És el text que s'enviarà en les seves notificacions d'absència.
</para>
</entry>
<!-- English entry (2013-11-05):
<entry id="vacation-reason">
<title>Vacation: Vacation Reason</title>
<para>This is the text that will be sent in your vacation responses.</para>
<para>You can use placeholders to dynamically generate the response message
contents from your identity information or other sources:</para>
<para>%NAME%: The full name from your standard identity</para>
<para>%EMAIL%: The email address from your standard identity</para>
<para>%SIGNATURE%: The signature from your standard identity</para>
<para>%STARTDATE%: The start date of your vacation</para>
<para>%ENDDATE%: The end date of your vacation</para>
</entry>--></entry>
<entry id="vacation-subject" md5="ce16c7c6a08993821208cfbee0b188a0" state="uptodate">
<title>Absència: Assumpte de l'absència</title>
<para>
Expand All @@ -347,12 +452,16 @@ No enviar la notificació d'absència a aquests destinataris. Cada adreça ha d'
La llista blanca és un llistat d'adreces (legítimes) de les quals sempre desitja poder veure els missatges en la safata d'Entrada. Cada adreça ha d'incloure's en una línia distinta.
</para>
</entry>
<entry id="whitelist-addresses" md5="8fe054c1b55e6adc81d1d8525c131637" state="uptodate">
<entry id="whitelist-addresses" md5="8fe054c1b55e6adc81d1d8525c131637" state="changed">
<title>Llista blanca: Adreces</title>
<para>
PENDENT. Cada adreça ha d'incloure's en una línia distinta.
</para>
</entry>
<!-- English entry (2013-11-05):
<entry id="whitelist-addresses">
<title>Whitelist: Addresses</title>
<para>Each address should be entered on a separate line.</para>
</entry>--></entry>
<entry id="spam-level" state="new">
<title>Spam Filtering: Spam Level</title>
<para>The system will consider messages with a likely spam score greater
Expand Down
13 changes: 5 additions & 8 deletions ingo/locale/de/help.xml
View file
Expand Up @@ -110,7 +110,7 @@
<para>Die Nachricht wird gelöscht, und der Absender dieser Nachricht
erhält eine Antwort mit dem Text, den Sie hier angeben.</para>
</entry>
<entry id="rule-combine" md5="29484c1ebdd7ce71edc34fc8100ef69c" state="uptodate">
<entry id="rule-combine" md5="6f620f276913196331ce6cfe2ce64d73" state="uptodate">
<title>Filterregel: Bedingungen kombinieren</title>
<para>Sie können mehrere Bedingungen in einer Regel angeben und diese
logisch mit "und" und "oder" verknüpfen. Komplexe Bedingungen mit
Expand All @@ -131,7 +131,7 @@
einer oder mehreren IMAP-Markierungen versehen wird. Die möglichen
Markierungen sind Gelesen, Markiert zur Wiedervorlage, Beantwortet und Gelöscht.</para>
</entry>
<entry id="rule-matches" md5="d30d522bc0e6b34ab656e658dc5ecc9e" state="uptodate">
<entry id="rule-matches" md5="17d89f2ab49a35536d23045f9e8d57c3" state="uptodate">
<title>Filterregel: Bedingungen</title>
<para>Jede Bedingung einer Filterregel besteht aus drei Komponenten. Die
erste bestimmt das Feld der Nachricht, das überprüft werden soll.
Expand Down Expand Up @@ -180,10 +180,7 @@
existiert.</para>
<heading>Regulärer Ausdruck</heading>
<para>Erlaubt die Verwendung komplexer, POSIX kompatibler, regulärer
Ausdrücke, um die Nachrichtenfelder zu überprüfen. Beispiel:
"Received from [*\.*\.*\.*] by (hosta|hostb).beispiel.de*" würde auf
"Received from [172.16.100.1] by hosta.beispiel.de on Tuesday"
zutreffen.</para>
Ausdrücke, um die Nachrichtenfelder zu überprüfen.</para>
<heading>Entpricht (mit Platzhaltern)</heading>
<para>"Entspricht" ist ähnlich zu "Enthält", erlaubt aber die
Verwendung von * und ? als Platzhalter. Ein * entspricht einer beliebigen
Expand Down Expand Up @@ -261,7 +258,7 @@
<para>An die angebenen Emailadressen werden keine Abwesenheitsnachrichten
verschickt. Jede Adresse muss in einer eigenen Zeile stehen.</para>
</entry>
<entry id="vacation-reason" md5="d4da2f3a0d357e00950ec57d984cbcee" state="changed">
<entry id="vacation-reason" md5="926968164f429e9f9ff5fa73242eae46" state="uptodate">
<title>Abwesenheit: Grund</title>
<para>Dieser Text wird in Ihren Abwesenheitsnachrichten verwendet.</para>
<para>Sie können Platzhalter verwenden, um die Abwesenheitsnachricht
Expand All @@ -284,7 +281,7 @@
Nachrichten Sie immer in Ihrem Postfach haben möchten. Jede Adresse
muss in einer eigenen Zeile stehen.</para>
</entry>
<entry id="whitelist-addresses" md5="8fe054c1b55e6adc81d1d8525c131637" state="uptodate">
<entry id="whitelist-addresses" md5="9ad6cb56e8bc5762112fa95382424608" state="uptodate">
<title>Positivliste: Adressen</title>
<para>Jede Adresse muss in einer eigenen Zeile stehen.</para>
</entry>
Expand Down
96 changes: 92 additions & 4 deletions ingo/locale/es/help.xml
View file
Expand Up @@ -95,7 +95,7 @@
El mensaje original se eliminará y se enviará un mensaje nuevo al remitente con el texto que indique.
</para>
</entry>
<entry id="rule-combine" md5="29484c1ebdd7ce71edc34fc8100ef69c" state="uptodate">
<entry id="rule-combine" md5="29484c1ebdd7ce71edc34fc8100ef69c" state="changed">
<title>Regla de filtrado: Combinar opciones</title>
<para>
Puede definir varias condiciones en una misma regla. Puede agruparlas de forma lógica mediante "Y"/"O", No puede crear filtros complejos que contengan ambos tipos de condiciones.
Expand All @@ -108,14 +108,26 @@
<para>
Si seleccion O, las acciones indicadas se ejecutarán si se cumple al menso una de las condiciones.
</para>
</entry>
<!-- English entry (2013-11-05):
<entry id="rule-combine">
<title>Filter Rule: Combine Options</title>
<para>You may define multiple conditions within a single rule. You may
group them together logically using "and"/"or". You may not create complex
filters containing both types of conditions.</para>
<heading>And</heading>
<para>If you select AND, an incoming message must match every condition
that you specify in order for the actions to be executed.</para>
<heading>Or</heading>
<para>If you select OR, the specified actions will be executed if at least
one of the conditions is met.</para>
</entry>--></entry>
<entry id="rule-mark" md5="e8bdb30d1c1c1cdc5ec1e5e4804f9300" state="uptodate">
<title>Regla de filtrado: Señalar mensaje</title>
<para>
Como una de las acciones de una regla, puede indicar que se señale un mensaje con uno o más de los marcadores IMAP. Los valores posibles son Continuación, Respondido y Eliminado.
</para>
</entry>
<entry id="rule-matches" md5="d30d522bc0e6b34ab656e658dc5ecc9e" state="uptodate">
<entry id="rule-matches" md5="d30d522bc0e6b34ab656e658dc5ecc9e" state="changed">
<title>Regla de filtrado: Coincidencia</title>
<para>
En cada condición de una regla hay tres componentes. El primero en el campo que hay que examinar. El segundo es el tipo de comparación a realizar. El tercero es el valor con el que hay que comparar el campo.
Expand Down Expand Up @@ -207,7 +219,83 @@
<para>
La especificación Sieve no permite comparaciones de números negativos. Si introduce un número negativo en una de las pruebas relacionales la regla no funcionará correctamente.
</para>
</entry>
<!-- English entry (2013-11-05):
<entry id="rule-matches">
<title>Filter Rule: Matches</title>
<para>There are 3 components to each condition in a rule. The first is the
field to examine. The second is the type of comparison to perform. The
third is the value to which the field should be compared. There are a few
different types of comparisons that can be performed. The comparisons
available for any given field will depend on both the type of the field and
what the underlying filtering software can handle. Thus, all potential
matching options listed below may not appear for a given field.</para>
<heading>Contains</heading>
<para>Will be considered to be true if the specified string is found
anywhere on the line. Example: user@example would match
joe_user@example.com</para>
<heading>Doesn't Contain</heading>
<para>Will be considered to be true if the specified string is not found
anywhere on the line. Example: user@example would not match
joe_user@example.com</para>
<heading>Is</heading>
<para>Will be considered to be true if the specified string matches the
line exactly. Example: user@example.com is user@example.com</para>
<heading>Isn't</heading>
<para>Will be considered to be true if the specified string does not match
the line exactly. Example: user@example is not user@example.com</para>
<heading>Begins with</heading>
<para>Will be considered to be true if the specified string matches the
beginning of the line. Example: user@example will match
user@example.com</para>
<heading>Doesn't begin with</heading>
<para>Will be considered to be true if the specified string does not match
the beginning of the line. Example: user@example.com will not match
user@example</para>
<heading>Ends with</heading>
<para>Will be considered to be true if the specified string matches the end
of the line. Example: example.com will match user@example.com</para>
<heading>Doesn't end with</heading>
<para>Will be considered to be true if the specified string does not match
the end of the line. Example: horde.org will not match
user@example.com</para>
<heading>Exists</heading>
<para>Will be considered to be true if the specified header exists in the
message, regardless of what its value is.</para>
<heading>Doesn't Exist</heading>
<para>Will be considered to be true if the specified header does not exist
in the message.</para>
<heading>Regex</heading>
<para>Regex allows you to use complex POSIX compatible regular expressions
to compare against message headers.</para>
<heading>Matches</heading>
<para>Matches is similar to contains, with the exception that you may use *
and ? as wildcards. An * will match any number of characters, and a ? will
match exactly one charater. Example: "*user?@example.com" will match both
"user1@example.com" and "otheruser2@example.com"</para>
<heading>Doesn't match</heading>
<para>Doesn't match is the same as matches except that it will evaluate to
false if the specified value matches the string in the message
header.</para>
<heading>Less than</heading>
<para>This is a relational test which will compare the value you specify
and the value in the message header numerically.</para>
<heading>Less than or equal to</heading>
<para>This is a relational test which will compare the value you specify
and the value in the message header numerically.</para>
<heading>Equal to</heading>
<para>This is a relational test which will compare the value you specify
and the value in the message header numerically.</para>
<heading>Greater than or equal to</heading>
<para>This is a relational test which will compare the value you specify
and the value in the message header numerically.</para>
<heading>Greater than</heading>
<para>This is a relational test which will compare the value you specify
and the value in the message header numerically.</para>
<heading>Limitation with Sieve filtering</heading>
<warn>The Sieve specification doesn't support comparions with negative
numbers. If you enter a negative value in one of the relational tests,
your rule won't work correctly.</warn>
</entry>--></entry>
<entry id="rule-name" md5="8faaf71e4bf2f91d943d77f803f9a2d5" state="uptodate">
<title>Regla de filtrado: Nombre</title>
<para>
Expand Down

0 comments on commit a155547

Please sign in to comment.