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

Commit 8c75908a authored by Brint E. Kriebel's avatar Brint E. Kriebel
Browse files

Merge branch 'cm-11.0' into stable/cm-11.0

parents 1bf5311a 08519b19
Loading
Loading
Loading
Loading
+95.9 KiB

File added.

No diff preview for this file type.

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@
     limitations under the License.
 -->

<EditText xmlns:android="http://schemas.android.com/apk/res/android"
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@android:id/text1"
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"
+4 −0
Original line number Diff line number Diff line
@@ -130,6 +130,10 @@
      android:id="@+id/mnu_actions_send"
      android:showAsAction="ifRoom"
      android:title="@string/actions_menu_send"/>
    <item
      android:id="@+id/mnu_actions_print"
      android:showAsAction="ifRoom"
      android:title="@string/actions_menu_print"/>
    <item
      android:id="@+id/mnu_actions_add_to_bookmarks"
      android:showAsAction="ifRoom"
+5 −0
Original line number Diff line number Diff line
@@ -243,6 +243,7 @@
  <string name="actions_menu_add_shortcut">Voeg kortpad</string>
  <string name="actions_menu_open_parent_folder">Maak vouer oop</string>
  <string name="actions_menu_compute_checksum">Bereken kontrolesom</string>
  <string name="actions_menu_print">Druk</string>
  <string name="actions_ask_undone_operation_msg">Hierdie aksie kan nie teruggestel word nie. Wil jy voortgaan?</string>
  <string name="input_name_dialog_label">Naam:</string>
  <string name="input_name_dialog_message_empty_name">Die naam kan nie leeg wees nie.</string>
@@ -362,6 +363,10 @@
  <string name="ash_keyword">Sleutelwoord</string>
  <string name="ash_quoted_string">Aangehaalde teks</string>
  <string name="ash_variable">Veranderlike</string>
  <string name="print_unsupported_document">Nie-ondersteunde dokument formaat</string>
  <string name="print_unsupported_image">Nie-ondersteunde foto-formaat</string>
  <string name="print_document_header">Dokument: <xliff:g id="document_name">%1$s</xliff:g></string>
  <string name="print_document_footer">Bladsy <xliff:g id="page_number">%1$s</xliff:g></string>
  <string name="security_warning_extract">Waarskuwing!\n\n
    Gebruik van \'n argiefvouer met \'n relatiewe of absolute pad kan lei tot skade aan die toestel deur die oorskryf van stelsel vouers.\n\n
    Wil jy voortgaan?</string>
+5 −0
Original line number Diff line number Diff line
@@ -228,6 +228,7 @@
  <string name="actions_menu_add_shortcut">Afegeix una drecera</string>
  <string name="actions_menu_open_parent_folder">Obre el pare</string>
  <string name="actions_menu_compute_checksum">Calcula el checksum</string>
  <string name="actions_menu_print">Imprimeix</string>
  <string name="actions_ask_undone_operation_msg">Aquesta acció no pot ser desfeta. Vols continuar?</string>
  <string name="input_name_dialog_label">Nom:</string>
  <string name="input_name_dialog_message_empty_name">El nom no pot estar buit.</string>
@@ -341,6 +342,10 @@
  <string name="ash_keyword">Paraula clau</string>
  <string name="ash_quoted_string">Cadena comentada</string>
  <string name="ash_variable">Variable</string>
  <string name="print_unsupported_document">Format de document no suportat</string>
  <string name="print_unsupported_image">Format d\'imatge no suportat</string>
  <string name="print_document_header">Document: <xliff:g id="document_name">%1$s</xliff:g></string>
  <string name="print_document_footer">Pàgina <xliff:g id="page_number">%1$s</xliff:g></string>
  <string name="security_warning_extract">Alerta!\n\n
      Extraient un arxiu comprimit amb rutes relatives o absolutes podria causar danys al teu dispositiu
      al sobreescriure arxius de sistema.\n\n
Loading