Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef3ba02a authored by cketti's avatar cketti
Browse files

Merge pull request #400 from zjw/change_line_endings 

Fix problems related to the saving and retrieval of drafts
parents fecf77bc a0709f22

res/layout/message_compose.xml

+8 −4
Original line number Diff line number Diff line
@@ -216,7 +216,8 @@ 


            <!-- We have to use "wrap_content" (not "0dip") for "layout_height", otherwise the

                 EditText won't properly grow in height while the user is typing the message -->

            <EditText

            <view

                class="com.fsck.k9.activity.MessageCompose$EolConvertingEditText"

                android:id="@+id/message_content"

                android:layout_width="fill_parent"

                android:layout_height="wrap_content"
@@ -228,7 +229,8 @@ 
                android:minLines="3"

                android:textAppearance="?android:attr/textAppearanceMedium" />



            <EditText

            <view

                class="com.fsck.k9.activity.MessageCompose$EolConvertingEditText"

                android:id="@+id/upper_signature"

                android:layout_width="fill_parent"

                android:layout_height="wrap_content"
@@ -256,7 +258,8 @@ 
                android:layout_width="fill_parent"

                android:layout_height="wrap_content">



                <EditText

                <view

                    class="com.fsck.k9.activity.MessageCompose$EolConvertingEditText"

                    android:id="@+id/quoted_text"

                    android:layout_width="fill_parent"

                    android:layout_height="wrap_content"
@@ -298,7 +301,8 @@ 


            </RelativeLayout>



            <EditText

            <view

                class="com.fsck.k9.activity.MessageCompose$EolConvertingEditText"

                android:id="@+id/lower_signature"

                android:layout_width="fill_parent"

                android:layout_height="wrap_content"

res/values-ca/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ Si us plau, envia\'ns els errors, contribueix a millorar-lo a 
    <string name="message_compose_quote_header_from">De:</string>

    <string name="message_compose_quote_header_to">A:</string>

    <string name="message_compose_quote_header_cc">A/c:</string>

    <string name="message_compose_reply_header_fmt"><xliff:g id="sender">%s</xliff:g> ha escrit:\n</string>

    <string name="message_compose_reply_header_fmt"><xliff:g id="sender">%s</xliff:g> ha escrit:</string>

    <string name="message_compose_error_no_recipients">Has d\'afegir-hi, com a mínim, un destinatari.</string>

    <string name="error_contact_address_not_found">No s\'ha trobat cap adreça de correu.</string>

    <string name="message_compose_attachments_skipped_toast">Alguns adjunts no es poden reenviar perquè no s\'han carregat.</string>

res/values-cs/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ Posílejte prosím chybová hlášení, přispívejte novými funkcemi a ptejte 
    <string name="message_compose_quote_header_from">Odesílatel:</string>

    <string name="message_compose_quote_header_to">Komu:</string>

    <string name="message_compose_quote_header_cc">Kopie:</string>

    <string name="message_compose_reply_header_fmt"><xliff:g id="sender">%s</xliff:g> napsal(a):\n</string>

    <string name="message_compose_reply_header_fmt"><xliff:g id="sender">%s</xliff:g> napsal(a):</string>

    <string name="message_compose_error_no_recipients">Musíte přidat alespoň jednoho příjemce.</string>

    <string name="error_contact_address_not_found">Nemohla být nalezena adresa.</string>

    <string name="message_compose_attachments_skipped_toast">Některé přílohy nelze přeposlat, protože ještě nebyly staženy.</string>

res/values-da/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ Vær venlig at sende fejlrapporter, anmodning om nye funktioner, og spørgsmål 
    <string name="message_compose_quote_header_from">Fra:</string>

    <string name="message_compose_quote_header_to">Til:</string>

    <string name="message_compose_quote_header_cc">Cc:</string>

    <string name="message_compose_reply_header_fmt"><xliff:g id="sender">%s</xliff:g> skrev:\n</string>

    <string name="message_compose_reply_header_fmt"><xliff:g id="sender">%s</xliff:g> skrev:</string>

    <string name="message_compose_error_no_recipients">Du skal angive mindst én modtager.</string>

    <string name="error_contact_address_not_found">Mail addresse ikke fundet.</string>

    <string name="message_compose_attachments_skipped_toast">Nogle vedhæftninger kunne ikke videresendes fordi de ikke er blevet hentet fra server.</string>

res/values-de/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ Um Fehler zu melden, neue Funktionen vorzuschlagen oder Fragen zu stellen, besuc 
    <string name="message_compose_quote_header_from">Von:</string>

    <string name="message_compose_quote_header_to">An:</string>

    <string name="message_compose_quote_header_cc">CC:</string>

    <string name="message_compose_reply_header_fmt">\n\n<xliff:g id="sender">%s</xliff:g> schrieb:\n</string>

    <string name="message_compose_reply_header_fmt"><xliff:g id="sender">%s</xliff:g> schrieb:</string>

    <string name="message_compose_error_no_recipients">Sie müssen mindestens einen Empfänger wählen.</string>

    <string name="error_contact_address_not_found">Es wurde keine E-Mail-Adresse für diesen Kontakt gefunden.</string>

    <string name="message_compose_attachments_skipped_toast">Einige Anhänge können nicht weitergeleitet werden, da diese nicht heruntergeladen wurden.</string>