Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 9b84efdc

Von Sven Schöling vor mehr als 14 Jahren hinzugefügt

  • ID 9b84efdcd08d22fcf7cc0c39cc9b175736b2fb62
  • Vorgänger dfee9199
  • Nachfolger dbd0ae11

' innerhalb von Strings escapen

Conflicts:

templates/webpages/acctranscorrections/assistant_for_wrong_taxkeys_master.html
templates/webpages/admin/create_standard_group_ask_master.html
templates/webpages/admin/restore_dataset_master.html
templates/webpages/admin/restore_dataset_start_footer_master.html
templates/webpages/admin/restore_dataset_start_header_master.html
templates/webpages/am/edit_warehouse_master.html
templates/webpages/amcvar/display_cvar_config_form_master.html
templates/webpages/common/search_history_master.html
templates/webpages/dbupgrade/buchungsgruppen_header_master.html
templates/webpages/dbupgrade/units_parts_master.html
templates/webpages/dbupgrade/units_services_master.html
templates/webpages/login/auth_db_unreachable_master.html
templates/webpages/sepa/bank_transfer_add_master.html
templates/webpages/sepa/bank_transfer_mark_as_closed_step1_master.html

Unterschiede anzeigen:

templates/webpages/acctranscorrections/assistant_for_wrong_taxkeys_master.html
33 33

  
34 34
  [% 'You can correct this transaction by chosing the correct taxkeys from the drop down boxes and hitting the button "Fix transaction" afterwards.' | $T8 %]
35 35

  
36
  [% 'It is possible that even after such a correction there is something wrong with this transaction (e.g. taxes that don't match the selected taxkey). Therefore you should re-run the general ledger analysis.' | $T8 %]
36
  [%- 'It is possible that even after such a correction there is something wrong with this transaction (e.g. taxes that don\'t match the selected taxkey). Therefore you should re-run the general ledger analysis.' | $T8 %]
37 37
 </p>
38 38

  
39 39
 <p>
templates/webpages/admin/create_standard_group_ask_master.html
9 9

  
10 10
   [% 'Lx-Office has been switched to group-based access restrictions.' | $T8 %]
11 11

  
12
   [% 'You have to create at least one group, grant it access to Lx-Office's functions and assign users to it.' | $T8 %]
12
   [%- 'You have to create at least one group, grant it access to Lx-Office\'s functions and assign users to it.' | $T8 %]
13 13

  
14 14
   [% 'Otherwise all users will only have access to their own settings.' | $T8 %]
15 15

  
......
17 17

  
18 18
  <p>
19 19

  
20
   [% 'During this user migration Lx-Office can create such a group for you and grant all users access to all of Lx-Office's functions.' | $T8 %]
20
   [%- 'During this user migration Lx-Office can create such a group for you and grant all users access to all of Lx-Office\'s functions.' | $T8 %]
21 21

  
22
   [% 'This corresponds to Lx-Office's behavior prior to version 2.4.4.' | $T8 %]
22
   [%- 'This corresponds to Lx-Office\'s behavior prior to version 2.4.4.' | $T8 %]
23 23

  
24 24
  </p>
25 25

  
templates/webpages/admin/restore_dataset_master.html
18 18
  </p>
19 19

  
20 20
  <p>
21
   [% 'The backup you upload here has to be a file created with &quot;pg_dump -o -Ft&quot;.' | $T8 %]
22
   [% 'It may optionally be compressed with &quot;gzip&quot;.' | $T8 %]
23
   [% 'Files created by Lx-Office's &quot;Backup Dataset&quot; function are such files.' | $T8 %]
21
   [%- 'The backup you upload here has to be a file created with &quot;pg_dump -o -Ft&quot;.' | $T8 %]
22
   [%- 'It may optionally be compressed with &quot;gzip&quot;.' | $T8 %]
23
   [%- 'Files created by Lx-Office\'s &quot;Backup Dataset&quot; function are such files.' | $T8 %]
24 24
  </p>
25 25

  
26 26
  <table>
templates/webpages/admin/restore_dataset_start_footer_master.html
5 5
 <hr>
6 6

  
7 7
 <p>
8
  [% 'The restoration process is complete. Please review &quot;pg_restore&quot;'s output to find out if the restoration was successful.' | $T8 %]
9
  [% LxERP.t8("The programs exit code was #1 (&quot;0&quot; usually means that everything went OK).", retval) | html %]
8
  [%- 'The restoration process is complete. Please review &quot;pg_restore&quot;\'s output to find out if the restoration was successful.' | $T8 %]
9
  [%- 'The program\'s exit code was [% HTML.escape(retval) %] (&quot;0&quot; usually means that everything went OK).' | $T8 %]
10 10
 </p>
11 11

  
12 12
 <form method="post" action="admin.pl">
templates/webpages/admin/restore_dataset_start_header_master.html
3 3

  
4 4
 <h2>[% title %]</h2>
5 5

  
6
 <p>[% 'The restoration process has started. Here's the output of the &quot;pg_restore&quot; command:' | $T8 %]</p>
6
 <p>[%- 'The restoration process has started. Here\'s the output of the &quot;pg_restore&quot; command:' | $T8 %]</p>
7 7

  
8 8
 <hr>
9 9

  
templates/webpages/am/edit_warehouse_master.html
60 60
 [% ELSE %]
61 61

  
62 62
 <p>
63
  [% 'Bins that have been used in the past cannot be deleted anymore. For these bins there's no checkbox in the &quot;Delete&quot; column.' | $T8 %]
63
  [%- 'Bins that have been used in the past cannot be deleted anymore. For these bins there\'s no checkbox in the &quot;Delete&quot; column.' | $T8 %]
64 64
 </p>
65 65

  
66 66
 <form method="post" action="am.pl">
templates/webpages/amcvar/display_cvar_config_form_master.html
115 115
   (3) [% 'The default value depends on the variable type:' | $T8 %]
116 116
   <br>
117 117
   <ul>
118
    <li>[% 'Text, text field and number variables: The default value will be used as-is.' | $T8 %]</li>
119
    <li>[% 'Boolean variables: If the default value is non-empty then the checkbox will be checked by default and unchecked otherwise.' | $T8 %]</li>
120
    <li>[% 'Date and timestamp variables: If the default value equals 'NOW' then the current date/current timestamp will be used. Otherwise the default value is copied as-is.' | $T8 %]</li>
118
    <li>[%- 'Text, text field and number variables: The default value will be used as-is.' | $T8 %]</li>
119
    <li>[%- 'Boolean variables: If the default value is non-empty then the checkbox will be checked by default and unchecked otherwise.' | $T8 %]</li>
120
    <li>[%- 'Date and timestamp variables: If the default value equals \'NOW\' then the current date/current timestamp will be used. Otherwise the default value is copied as-is.' | $T8 %]</li>
121 121
   </ul>
122 122
  </p>
123 123

  
......
125 125
   (4) [% 'The available options depend on the varibale type:' | $T8 %]
126 126
   <br>
127 127
   <ul>
128
    <li>[% 'Text variables: 'MAXLENGTH=n' sets the maximum entry length to 'n'.' | $T8 %]</li>
129
    <li>[% 'Text field variables: 'WIDTH=w HEIGHT=h' sets the width and height of the text field. They default to 30 and 5 respectively.' | $T8 %]</li>
130
    <li>[% 'Number variables: 'PRECISION=n' forces numbers to be shown with exactly n decimal places.' | $T8 %]</li>
131
    <li>[% 'Selection fields: The option field must contain the available options for the selection. Options are separated by '##', for example 'Early##Normal##Late'.' | $T8 %]</li>
128
    <li>[%- 'Text variables: \'MAXLENGTH=n\' sets the maximum entry length to \'n\'.' | $T8 %]</li>
129
    <li>[%- 'Text field variables: \'WIDTH=w HEIGHT=h\' sets the width and height of the text field. They default to 30 and 5 respectively.' | $T8 %]</li>
130
    <li>[%- 'Number variables: \'PRECISION=n\' forces numbers to be shown with exactly n decimal places.' | $T8 %]</li>
131
    <li>[%- 'Selection fields: The option field must contain the available options for the selection. Options are separated by \'##\', for example \'Early##Normal##Late\'.' | $T8 %]</li>
132 132
   </ul>
133 133
   <br>
134 134
   [% 'Other values are ignored.' | $T8 %]
......
138 138
  <p>
139 139
   (5)
140 140

  
141
   [% 'A variable marked as 'editable' can be changed in each quotation, order, invoice etc.' | $T8 %]
141
   [%- 'A variable marked as \'editable\' can be changed in each quotation, order, invoice etc.' | $T8 %]
142 142

  
143 143
   [% 'Otherwise the variable is only available for printing.' | $T8 %]
144 144
  </p>
templates/webpages/common/search_history_master.html
95 95
            }
96 96
            else {
97 97
              defaults.splice(remove,1);
98
              document.getElementById('inputText').innerHTML += ((document.getElementById('inputText').innerHTML == "") ? ("<b>[% 'You've already chosen the following limitations:' | $T8 %]</b><br>") : ("<br>")) + translated[last];
98
              document.getElementById('inputText').innerHTML += ((document.getElementById('inputText').innerHTML == "") ? ("<b>[%- 'You\'ve already chosen the following limitations:' | $T8 %]</b><br>") : ("<br>")) + translated[last];
99 99
              if(defaults.length > 0) {
100 100
                document.getElementById('einschraenkungen').value += ((document.getElementById('einschraenkungen').value == "") ? ("") : (",")) + last;
101 101
                tempString = "<select id='selectForm'><option></option>";
templates/webpages/dbupgrade/buchungsgruppen_header_master.html
4 4
<div class="listtop">[% 'Introduction of Buchungsgruppen' | $T8 %]</div>
5 5

  
6 6
<p>
7
 [% 'Prior to Lx-Office v2.4.0 the user had to chose the accounts for each part and service.' | $T8 %]
8
 [% 'Lx-Office 2.4.0 introduces two new concepts: tax zones and Buchungsgruppen.' | $T8 %]
9
 [% 'There are four tax zones.' | $T8 %]
10
 [% 'A Buchungsgruppe consists of a descriptive name and the account numbers for the income and expense accounts for those four tax zones as well as the inventory account number.' | $T8 %]
11
 [% 'Now the user must select a single Buchungsgruppe for each part instead of three distinct accounts.' | $T8 %]
12
 [% 'Therefore there's no need to create the same article more than once if it is sold or bought in/from another tax zone.' | $T8 %]
7
 [%- 'Prior to Lx-Office v2.4.0 the user had to chose the accounts for each part and service.' | $T8 %]
8
 [%- 'Lx-Office 2.4.0 introduces two new concepts: tax zones and Buchungsgruppen.' | $T8 %]
9
 [%- 'There are four tax zones.' | $T8 %]
10
 [%- 'A Buchungsgruppe consists of a descriptive name and the account numbers for the income and expense accounts for those four tax zones as well as the inventory account number.' | $T8 %]
11
 [%- 'Now the user must select a single Buchungsgruppe for each part instead of three distinct accounts.' | $T8 %]
12
 [%- 'Therefore there\'s no need to create the same article more than once if it is sold or bought in/from another tax zone.' | $T8 %]
13 13
</p>
14 14

  
15 15
<p>
templates/webpages/dbupgrade/units_parts_master.html
14 14
 <div class="subsubheading">[% 'Add unit' | $T8 %]</div>
15 15

  
16 16
 <p>
17
  [% 'For each unit there's either no or exactly one base unit. If you chose a base unit then you also have to chose a factor. That way the new unit will be defined as a multiple of the base unit. The base unit must be the &quot;smaller&quot; one. A factor may not be less than 1. Therefore you may define &quot;kg&quot; with the base unit &quot;g&quot; and a factor of &quot;1&quot;, but not the other way round.' | $T8 %]
17
  [%- 'For each unit there\'s either no or exactly one base unit. If you chose a base unit then you also have to chose a factor. That way the new unit will be defined as a multiple of the base unit. The base unit must be the &quot;smaller&quot; one. A factor may not be less than 1. Therefore you may define &quot;kg&quot; with the base unit &quot;g&quot; and a factor of &quot;1&quot;, but not the other way round.' | $T8 %]
18 18
 </p>
19 19

  
20 20
 <p>
templates/webpages/dbupgrade/units_services_master.html
14 14
 <div class="subsubheading">[% 'Add unit' | $T8 %]</div>
15 15

  
16 16
 <p>
17
  [% 'For each unit there's either no or exactly one base unit. If you chose a base unit then you also have to chose a factor. That way the new unit will be defined as a multiple of the base unit. The base unit must be the &quot;smaller&quot; one. A factor may not be less than 1. Therefore you may define &quot;kg&quot; with the base unit &quot;g&quot; and a factor of &quot;1&quot;, but not the other way round.' | $T8 %]
17
  [%- 'For each unit there\'s either no or exactly one base unit. If you chose a base unit then you also have to chose a factor. That way the new unit will be defined as a multiple of the base unit. The base unit must be the &quot;smaller&quot; one. A factor may not be less than 1. Therefore you may define &quot;kg&quot; with the base unit &quot;g&quot; and a factor of &quot;1&quot;, but not the other way round.' | $T8 %]
18 18
 </p>
19 19

  
20 20
 <p>
templates/webpages/login/auth_db_unreachable_master.html
3 3

  
4 4
 <p><b>[% 'Error!' | $T8 %]</b></p>
5 5

  
6
 <p>[% 'The authentication database is not reachable at the moment. Either it hasn't been set up yet or the database server might be down. Please contact your administrator.' | $T8 %]</p>
6
 <p>[%- 'The authentication database is not reachable at the moment. Either it hasn\'t been set up yet or the database server might be down. Please contact your administrator.' | $T8 %]</p>
7 7

  
8 8
 <p>[% 'If you want to set up the authentication database yourself then log in to the administration panel. Lx-Office will then create the database and tables for you.' | $T8 %]</p>
9 9

  
templates/webpages/sepa/bank_transfer_add_master.html
69 69

  
70 70
  [%- IF show_vendor_bank_info_footnote %]
71 71
   <p>
72
    <sup>(1)</sup> [% 'No bank information has been entered in this vendor's master data entry. You cannot create bank transfers unless you enter bank information.' | $T8 %]
72
    <sup>(1)</sup> [%- 'No bank information has been entered in this vendor\'s master data entry. You cannot create bank transfers unless you enter bank information.' | $T8 %]
73 73
   </p>
74 74
  [%- END %]
75 75

  
templates/webpages/sepa/bank_transfer_mark_as_closed_step1_master.html
6 6

  
7 7
 <form action="sepa.pl" method="post">
8 8
  <p>
9
   [% 'Do you really want to close the following SEPA exports? No payment will be recorded for bank transfers that haven't been marked as executed yet.' | $T8 %]
9
   [%- 'Do you really want to close the following SEPA exports? No payment will be recorded for bank transfers that haven\'t been marked as executed yet.' | $T8 %]
10 10
  </p>
11 11

  
12 12
  <p>

Auch abrufbar als: Unified diff