Skip to content

Commit 025c596

Browse files
committed
[trunk] - language - update en_UK - English - Thanks to mixedbredie - step 1 - feature:2320
git-svn-id: http://piwigo.org/svn/trunk@12161 68402e56-0260-453c-a942-63ccdbb3a9ee
1 parent 0c9c851 commit 025c596

2 files changed

Lines changed: 20 additions & 60 deletions

File tree

Lines changed: 20 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,20 @@
11
<h2>Configuration</h2>
22

3-
<p>This screen let the administrator do basic configuration. Indeed, this
4-
screen only shows simple configuration parameters that should be enough for
5-
the vast majority of administrators. If you want to see other numerous (and
6-
advanced) configuration parameters, read file <span
3+
<p>This screen let the administrator do basic gallery configuration. Indeed, this screen only shows simple configuration parameters that should be enough for the vast majority of administrators. If you want to see other numerous (and advanced) configuration parameters, read the default configuration file <span
74
class="filename">include/config_default.inc.php</span>.</p>
85

9-
<p>This screen is divided in several sections, regrouping configuration
10-
parameters by theme.</p>
6+
<p>The screen is divided into different sections, grouping configuration parameters by theme.</p>
117

128

139
<h3>Main</h3>
1410
<ul>
15-
<li><strong>Gallery title</strong>: used in RSS feed and notifications by
16-
email.</li>
11+
<li><strong>Gallery title</strong>: used in RSS feed and notifications by email.</li>
1712

18-
<li><strong>Page banner</strong>: displayed on top of each public
19-
page.</li>
13+
<li><strong>Page banner</strong>: displayed on top of each public page.</li>
2014

2115
<li><strong>Gallery URL</strong>: used for the RSS feed.</li>
2216

23-
<li><strong>Lock gallery</strong>: Lock the entire gallery for
24-
maintenance. Only administrator users will be able to reach the
25-
gallery.</li>
17+
<li><strong>Lock gallery</strong>: Lock the entire gallery for maintenance. Only administrator users will be able to reach the gallery.</li>
2618

2719
<li><strong>Rating</strong>: Photo rating feature is enabled.</li>
2820

@@ -42,11 +34,9 @@ <h3>History</h3>
4234

4335
<p>Visits on pages <span
4436
class="pwgScreen">category.php</span> and <span
45-
class="pwgScreen">picture.php</span> will be saved in the
46-
<code>history</code> table.</p>
37+
class="pwgScreen">picture.php</span> will be saved in the <code>history</code> table.</p>
4738

48-
<p>Visits will be shown in <span
49-
class="pwgScreen">Administration &raquo; Tools &raquo; History</span>.</p>
39+
<p>Visits will be shown in <span class="pwgScreen">Administration &raquo; Tools &raquo; History</span>.</p>
5040

5141
<ul>
5242
<li><strong>Save page visits by guests</strong>: page visits by guests will be recorded.</li>
@@ -60,75 +50,52 @@ <h3>History</h3>
6050
<h3>Comments</h3>
6151
<ul>
6252

63-
<li><strong>Comments for all</strong>: Even unregistered guest can post
64-
comments.</li>
53+
<li><strong>Comments for all</strong>: Even unregistered guest can post comments.</li>
6554

6655
<li><strong>Number of comments per page</strong>.</li>
6756

6857
<li><strong>Validation</strong>: an administrator must validate users comments before they become visible on the site. User comments validation
6958
takes place in screen <span class="pwgScreen">Administration &raquo; Tools &raquo; Pending Comments</span>.</li>
7059

71-
<li><strong>Email admins when a valid comment is entered</strong>:
72-
Sends an email to the administrators when a user enters a comment and this comment is validated.</li>
60+
<li><strong>Email admins when a valid comment is entered</strong>: Sends an email to the administrators when a user enters a comment and this comment is validated.</li>
7361

7462
<li><strong>Email admins when a comment requires validation</strong>:
7563
Sends an email to the administrators when a user enters a comment that requires validation by the admin.
76-
User comments validation takes place in the screen <span class="pwgScreen">Administration, Photos, Comments</span>.</li>
64+
User comments validation takes place in the screen <span class="pwgScreen">Administration &raquo; Tools &raquo; Pending Comments</span>.</li>
7765

7866
</ul>
7967

80-
<h3>Upload</h3>
81-
<ul>
82-
<li><strong>Show upload link every time</strong>: If uploadable albums exist, an upload link will be shown for each album.</li>
83-
<li><strong>User access level for uploading</strong>: Restricts upload to some albums of users</li>
84-
<li><strong>Email admins when a photo is uploaded</strong>: Administrators will be notified by mail each time a photo is uploaded by a user.</li>
85-
</ul>
86-
8768
<h3>Default display</h3>
8869

89-
<p>Here you can change display options used by guest, the default user that is not
90-
connected. Once connected, these options are overridden by the user own options
70+
<p>Here you can change display options used by guest, the default user that is not connected. Once connected, these options are overridden by the user's own options
9171
(modifiable in <span class="pwgScreen">profile</span>).</p>
9272

93-
<p>It is possible to change the display options for all existing users, on the <span class="pwgScreen">Administration &raquo;
94-
Users &raquo; Manage</span> screen, where you can select a list of
95-
users.</p>
73+
<p>It is possible to change the display options for all existing users on the <span class="pwgScreen">Administration &raquo;
74+
Users &raquo; Manage</span> screen where you can select a list of users.</p>
9675

9776
<ul>
9877

99-
<li><strong>Language</strong>: apply to Piwigo
100-
labels only. Album names, photo names and all descriptions fields are not
101-
localized.</li>
78+
<li><strong>Language</strong>: Apply to Piwigo labels only. Album names, photo names and all descriptions fields are not localized.</li>
10279

10380
<li><strong>Number of photos per row</strong></li>
10481

10582
<li><strong>Number of rows per page</strong></li>
10683

10784
<li><strong>Interface theme</strong></li>
10885

109-
<li><strong>Recent period</strong>: By days. Period during which a photo is
110-
shown as new. Must be greater than 1 day.</li>
86+
<li><strong>Recent period</strong>: By days. Period during which a photo is shown as new. Must be greater than 1 day.</li>
11187

11288
<li><strong>Expand all albums</strong>: Expand all albums by
113-
default in the menu <em>Warning</em>: this option is resources consuming
114-
and may generate a huge menu if your album tree contains many
115-
albums.</li>
89+
default in the menu <em>Warning</em>: this option is resources intensive and may generate a huge menu if your album tree contains many albums.</li>
11690

117-
<li><strong>Show number of comments</strong>: show the number of comments
118-
for each photo on the thumbnails page. Resources consuming.</li>
91+
<li><strong>Show number of comments</strong>: Show the number of comments for each photo on the thumbnails page. Resource intensive.</li>
11992

120-
<li><strong>Show hits count</strong>: display hits observed on photo
121-
just under its thumbnail on the thumbnails page.
122-
Only when advanced configuration parameter is: <br>
93+
<li><strong>Show hits count</strong>: Display hits observed on photo just under its thumbnail on the thumbnails page. Only when advanced configuration parameter is: <br>
12394
$conf['show_nb_hits'] = true; <br>
12495
Notice: false by default.</li>
12596

126-
<li><strong>Maximum width of the photos</strong>: maximum displayed
127-
width. photos larger than this setting will be resized on
128-
display. Rather than choosing this option, you might consider
129-
modifying the width of your photos; that would be a better practice.</li>
97+
<li><strong>Maximum width of the photos</strong>: maximum displayed width. Photos larger than this setting will be resized on display. Rather than choosing this option, you might consider modifying the width of your photos; that would be a better practice.</li>
13098

131-
<li><strong>Maximum height of the photos</strong>: same remarks as for
132-
the maximum width setting.</li>
99+
<li><strong>Maximum height of the photos</strong>: Same as for the maximum width setting.</li>
133100

134101
</ul>

‎language/fr_FR/help/configuration.html‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,6 @@ <h3>Commentaires</h3>
7878

7979
</ul>
8080

81-
<h3>Ajout de photos</h3>
82-
<ul>
83-
<li><strong>Afficher le lien d'ajout de photo tout le temps</strong>: S'il existe des albums permettant l'ajout de photo, le lien correspondant sera affiché quelque soit l'album.</li>
84-
<li><strong>Niveau d'accès utilisateur pour ajouter des photos</strong>: Permet de restreindre l'ajout à certains utilisateurs</li>
85-
<li><strong>Notifier les administrateurs quand une photo est ajoutée</strong>: Les administrateurs recevront un courriel à chaque photo ajoutée par un utilisateur.</li>
86-
</ul>
87-
8881
<h3>Affichage par défaut</h3>
8982
<p>Modifier les options d'affichage par défaut: pour les visiteurs non
9083
connectés. Une fois connecté, ces options sont surchargées par celles de

0 commit comments

Comments
 (0)