archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch '2.8'

Browse source
This commit is contained in:
plegall 2016-07-07 18:22:22 +02:00
commit ee737aeed7
10 changed files with 160 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
admin/themes/default/template/batch_manager_global.tpl
View file

@ -631,15 +631,13 @@ UL.thumbnails SPAN.wrap2 {ldelim}
<!-- author -->
<div id="action_author" class="bulkAction">
<label><input type="checkbox" name="remove_author"> {'remove author'|@translate}</label><br>
{assign var='authorDefaultValue' value='Type here the author name'|@translate}
<input type="text" class="large" name="author" value="{$authorDefaultValue}" onfocus="this.value=(this.value=='{$authorDefaultValue|@escape:javascript}') ? '' : this.value;" onblur="this.value=(this.value=='') ? '{$authorDefaultValue|@escape:javascript}' : this.value;">
<input type="text" class="large" name="author" placeholder="{'Type here the author name'|@translate}">
</div>
<!-- title -->
<div id="action_title" class="bulkAction">
<label><input type="checkbox" name="remove_title"> {'remove title'|@translate}</label><br>
{assign var='titleDefaultValue' value='Type here the title'|@translate}
<input type="text" class="large" name="title" value="{$titleDefaultValue}" onfocus="this.value=(this.value=='{$titleDefaultValue|@escape:javascript}') ? '' : this.value;" onblur="this.value=(this.value=='') ? '{$titleDefaultValue|@escape:javascript}' : this.value;">
<input type="text" class="large" name="title" placeholder="{'Type here the title'|@translate}">
</div>
<!-- date_creation -->

11
include/functions_html.inc.php
View file

@ -273,15 +273,16 @@ function tag_alpha_compare($a, $b)
*/
function access_denied()
{
global $user;
global $user, $conf;
$login_url =
get_root_url().'identification.php?redirect='
.urlencode(urlencode($_SERVER['REQUEST_URI']));
set_status_header(401);
if ( isset($user) and !is_a_guest() )
{
set_status_header(401);
echo '<meta http-equiv="Content-Type" content="text/html; charset=utf-8">';
echo '<div style="text-align:center;">'.l10n('You are not authorized to access the requested page').'<br>';
echo '<a href="'.get_root_url().'identification.php">'.l10n('Identification').'</a>&nbsp;';
@ -289,6 +290,10 @@ function access_denied()
echo str_repeat( ' ', 512); //IE6 doesn't error output if below a size
exit();
}
elseif (!$conf['guest_access'] and is_a_guest())
{
redirect_http($login_url);
}
else
{
redirect_html($login_url);
@ -648,4 +653,4 @@ function flush_page_messages()
}
}
?>
?>

54
language/br_FR/admin.lang.php
View file

@ -683,7 +683,7 @@ $lang['Move'] = 'Dilec\'hiañ';
$lang['Move albums'] = 'Dilec\'hiañ ar rummadoù';
$lang['Move to album'] = 'Dilec\'hiañ d\'ar rummad';
$lang['Remove all filters'] = 'Tennañ an holl siloù';
$lang['remove author'] = 'tennañ an aozer';
$lang['remove author'] = 'tennañ an oberour';
$lang['remove tags'] = 'tennañ ar merkerioù';
$lang['remove this filter'] = 'tennañ ar sil-se';
$lang['remove title'] = 'tennañ an titl';
@ -791,8 +791,8 @@ $lang['Pages seen'] = 'Pajennoù gwelet';
$lang['Page end'] = 'Dibenn ar bajenn';
$lang['Overall'] = 'Gwel a-vras';
$lang['Page banner'] = 'Banniel ar bajenn';
$lang['top left corner'] = 'Korn al laez a gleiz';
$lang['top right corner'] = 'Korn an traoñ a-zehoù';
$lang['top left corner'] = 'Korn an uhelañ a gleiz';
$lang['top right corner'] = 'Korn an uhelañ a-zehoù';
$lang['user_status_generic'] = 'Generek';
$lang['The webmaster has subscribed you to receiving notifications by mail.'] = 'Ar mestr-gwiad en deus koumanantet ac\'hanoc\'h da kemennoù dre bosteloù.';
$lang['The webmaster has unsubscribed you from receiving notifications by mail.'] = 'Ar mestr-gwiad en deus digoumanantet ac\'hanoc\'h eus kemennoù dre bosteloù.';
@ -890,4 +890,50 @@ $lang['Send mail as'] = 'Kas ar bostel evel';
$lang['Quick Local Synchronization'] = 'Sinkroneladur lec\'hel prim';
$lang['even already synchronized photos'] = 'memes al luc\'hskeudennoù sinkronelaet';
$lang['synchronize files structure with database'] = 'Sinkronelaat framm ar restroù gant an diaz roadennoù';
$lang['Predefined filter'] = 'Sil raktermenet';
$lang['Predefined filter'] = 'Sil raktermenet';
$lang['custom'] = 'Personelaet';
$lang['Waiting'] = 'O c\'hortoz';
$lang['Time'] = 'Eur';
$lang['With no album'] = 'Hep rummad';
$lang['With no tag'] = 'Hep merker';
$lang['The %d following tags were deleted'] = 'An %d merkerioù-se a zo bet dilemet';
$lang['albums deleted in the database'] = 'rummad dilemet en diaz roadennoù';
$lang['delete album'] = 'dilemel ar rummad';
$lang['group "%s" deleted'] = 'dilemet strollad "%s"';
$lang['high'] = 'uhel';
$lang['leave'] = 'kuitaat';
$lang['middle'] = 'kreiz';
$lang['modified'] = 'cheñchet';
$lang['none'] = 'netra';
$lang['unknown'] = 'dianav';
$lang['pixels'] = 'pikselioù';
$lang['ranks'] = 'renkoù';
$lang['sub-albums'] = 'iz-rummadoù';
$lang['target'] = 'bukenn';
$lang['test'] = 'test';
$lang['the forum'] = 'ar forom';
$lang['the wiki'] = 'ar wiki';
$lang['total time'] = 'pad hollek';
$lang['Type here the author name'] = 'Lakait anv an oberour amañ';
$lang['Type here the name of the new group'] = 'Lakait anv ar strollad nevez amañ';
$lang['Type here the title'] = 'Lakait an titl amañ';
$lang['bottom left corner'] = 'Korn an izelañ a gleiz';
$lang['bottom right corner'] = 'Korn an izelañ a-zehoù';
$lang['Week starts on'] = 'Ar sizhun a krog d\'';
$lang['Who can see these photos?'] = 'Piv a c\'hell gwelet al luc\'hskeudennoù-mañ ?';
$lang['Who can see this photo?'] = 'Piv a c\'hell gwelet al luc\'hskeudenn-mañ ?';
$lang['X Repeat'] = 'Adober X';
$lang['Y Repeat'] = 'Adober Y';
$lang['Zoom'] = 'Zoum';
$lang['reduce to single existing albums'] = 'bihanaat da rummadoù a zo unan hepken anezho';
$lang['include child albums'] = 'endelc\'hel rummadoù-bugale';
$lang['create a new album'] = 'krouiñ ur rummad nevez';
$lang['Storage album'] = 'Rummad-klenkañ';
$lang['The Piwigo export plugin allows you to create albums and export photos.'] = 'Gant al lugant ezporzhiañ Piwigo e vo tu deoc\'h krouiñ rummadoù hag ezporzhiañ luc\'hskeudennoù.';
$lang['jump to album'] = 'Mont d\'ar rummad';
$lang['This album contains %d photos, added between %s and %s.'] = '%d luc\'hskeudenn ez eus er rummad-mañ, lakaet etre %s hag %s.';
$lang['Support'] = 'Skor';
$lang['Simulation'] = 'Darvanerezh';
$lang['Statistics'] = 'Stadegoù';
$lang['Repair and optimize database'] = 'Ratreañ ha gwellekaat an diaz roadennoù';
$lang['Ratio'] = 'Parenn an neuz';

4
language/da_DK/admin.lang.php
View file

@ -863,7 +863,7 @@ $lang['Multiple Size'] = 'Flere størrelser';
$lang['%u users have automatic permission because they belong to a granted group.'] = '%u brugere har automatisk tilladelse, fordi de tilhører en gruppe med tilladelser.';
$lang['<em>Piwigo for Android</em> application empowers you to connect your Android phone or table to your Piwigo gallery, create some albums and upload several photos at once.'] = 'App\'en <em>Piwigo for Android</em> giver dig mulighed for at forbinde en Android-mobiltelelfon eller -tablet med dit Piwigo-galleri, oprette albummer og uploade flere fotografier på én gang.';
$lang['Adobe Photoshop Lightroom is a photography software designed to manage large quantities of digital images and doing post production work.'] = 'Adobe Photoshop Lightroom er et fotografiprogram beregnet til at håndtere store mængder digitale billeder og foretage efterbehandling.';
$lang['Aperture is a powerful tool to refine images and manage massive libraries on Mac.'] = 'Aperture er et ydedygtigt værktøj til at forfine billeder og administrere store biblioteker på Mac.';
$lang['Aperture is a powerful tool to refine images and manage massive libraries on Mac.'] = 'Aperture er et ydedygtigt værktøj til at forfine billeder og administrere store biblioteker på en Mac.';
$lang['Aperture is designed for professional photographers with iPhoto simplicity.'] = 'Aperture er udviklet til professionelle fotografer med iPhoto-enkelhed.';
$lang['By default, the center of interest is placed in the middle of the photo.'] = 'Som standard er fokusområdet placeret i midten af fotografiet';
$lang['Center of interest'] = 'Fokusområde';
@ -986,7 +986,7 @@ $lang['width & height'] = 'bredde og højde';
$lang['No and unlock sub-albums'] = 'Nej, og lås underalbummer op';
$lang['Upload in progress'] = 'Upload i gang';
$lang['Delete %d orphan photos'] = 'Slettede %d forældreløse fotografier';
$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Hver afsendt mail indeholder sign egen automatiske autentifikationsnøgle i links, gyldige i %s.';
$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Hver afsendt mail indeholder sin egen automatiske autentifikationsnøgle i links, gyldig i %s.';
$lang['Edit user'] = 'Rediger bruger';
$lang['For security reason, authentication keys do not work for administrators.'] = 'Af sikkerhedsgrunde fungerer autentifikationsnøgler ikke for administratorer.';
$lang['No recipient selected'] = 'Ingen modtager valgt';

2
language/fr_FR/admin.lang.php
View file

@ -185,7 +185,7 @@ $lang['Lock albums'] = 'Verrouiller les albums';
$lang['Private'] = 'Album privé';
$lang['Public'] = 'Album public';
$lang['Find a new representant by random'] = "Trouver un nouveau représentant au hasard";
$lang['Public / Private'] = "Publique / Privée";
$lang['Public / Private'] = 'Public / Privé';
$lang['Manage authorizations for selected albums'] = 'Gérer le type d\'accès pour les albums sélectionnés';
$lang['Virtual album added'] = 'Album virtuel ajouté';
$lang['Virtual album deleted'] = 'Album virtuel supprimé';

13
language/id_ID/common.lang.php
View file

@ -416,4 +416,15 @@ $lang['About'] = 'Tentang';
$lang['About Piwigo'] = 'Tentang Piwigo';
$lang['Accelerate diaporama speed'] = 'Tingkatkan kecepatan guliran gambar ';
$lang['Add a comment'] = 'Tambahkan sebuah komentar';
?>
$lang['%d photos per page'] = '%d foto per halaman';
$lang['Album name, A &rarr; Z'] = 'Nama album, A &arr; Z';
$lang['Album name, Z &rarr; A'] = 'Nama album, Z &arr; A';
$lang['Apply on properties'] = 'Terapkan ke properti';
$lang['Link: %s'] = 'Tautan: %s';
$lang['No results for'] = 'Tidak ada hasil untuk';
$lang['Password confirmation is missing. Please confirm the chosen password.'] = 'Konfirmasi kata sandi terlewatkan. Harap konfirmasi kata sandi yang dipilih.';
$lang['Password is missing. Please enter the password.'] = 'Kata sandi terlewat. Harap masukkan kata sandi.';
$lang['Photo description'] = 'Deskripsi Foto';
$lang['Photo title'] = 'Judul foto';
$lang['Theme'] = 'Tema';
$lang['Your authentication key is no longer valid.'] = 'Kunci otentikasi tidak lagi berlaku.';

49
language/id_ID/install.lang.php Executable file
View file

@ -0,0 +1,49 @@
<?php
// +-----------------------------------------------------------------------+
// | Piwigo - a PHP based photo gallery |
// +-----------------------------------------------------------------------+
// | Copyright(C) 2008-2015 Piwigo Team http://piwigo.org |
// | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net |
// | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick |
// +-----------------------------------------------------------------------+
// | This program is free software; you can redistribute it and/or modify |
// | it under the terms of the GNU General Public License as published by |
// | the Free Software Foundation |
// | |
// | This program is distributed in the hope that it will be useful, but |
// | WITHOUT ANY WARRANTY; without even the implied warranty of |
// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
// | General Public License for more details. |
// | |
// | You should have received a copy of the GNU General Public License |
// | along with this program; if not, write to the Free Software |
// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
// | USA. |
// +-----------------------------------------------------------------------+
$lang['verification'] = 'Verifikasi';
$lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = 'Butuh bantuan? Ajukan pertannyaan anda ke <a href="%s">Piwigo message board</a>.';
$lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Catat bahwa anda dapat mengubah pengaturan anda sendiri kemudian mulai ulang Piwigo.';
$lang['PHP 5 is required'] = 'PHP 5.2 diperlukan';
$lang['Password ']['confirm'] = 'Kata sandi [konfirmasi]';
$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo mungkin akan mencoba mengganti pengaturan anda ke PHP 5.2 dengan membuat atau mengubah sebuah berkan .httaccess';
$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo tidak dapat mengatur PHP 5.2';
$lang['Sorry!'] = 'Maaf!';
$lang['Start Install'] = 'Mulai pemasangan';
$lang['Try to configure PHP 5'] = 'Cobalah untuk mengatur PHP 5.2';
$lang['User'] = 'Pengguna';
$lang['Visitors will be able to contact site administrator with this mail'] = 'Pengunjung akan dapat menggunakan email ini untuk menghubungi administrator situs';
$lang['Welcome to my photo gallery'] = 'Selamat datang ke foto galeriku';
$lang['Welcome to your new installation of Piwigo!'] = 'Selamat datang ke instalasi baru dari Piwigo!';
$lang['Admin configuration'] = 'Pengaturan administrasi';
$lang['Basic configuration'] = 'Pengaturan dasar';
$lang['Can\'t connect to server'] = 'Tidak dapat terhubung ke server';
$lang['Congratulations, Piwigo installation is completed'] = 'Selamat, Instalasi piwigo telah selesai';
$lang['Connection to server succeed, but it was impossible to connect to database'] = 'Koneksi ke server berhasil, tetapi koneksi ke database tidak memungkinkan.';
$lang['Creation of config file local/config/database.inc.php failed.'] = 'Pembuatan berkas pengaturan local/config.database.inc.php gagal.';
$lang['Database configuration'] = 'Pengaturan database';
$lang['Database name'] = 'Nama database';
$lang['Database table prefix'] = 'Prefiks tabel database';
$lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Jangan ragu untuk berkosultasi ke forum kami untuk bantuan apapun: %s';
$lang['Download the config file'] = 'Unduh berkas pengaturan';
$lang['Hope to see you back soon.'] = 'Berharap akan bertemu anda kembali.';
$lang['Installation'] = 'Pemasangan';

4
language/ro_RO/admin.lang.php
View file

@ -992,4 +992,6 @@ $lang['No recipient selected'] = 'Nu a fost selectat nici un destinatar';
$lang['For security reason, authentication keys do not work for administrators.'] = 'Din motive de securitate, cheile de autentificare nu funcţionează pentru administratori';
$lang['Recipients'] = 'Destinatari';
$lang['Edit user'] = 'Editează utilizatorul';
$lang['Y Repeat'] = 'Y Repetare';
$lang['Y Repeat'] = 'Y Repetare';
$lang['Delete %d orphan photos'] = 'Sterge %d fotografii orfane';
$lang['Orphans'] = 'Orfane';

12
themes/smartpocket/template/identification.tpl
View file

@ -28,14 +28,14 @@
</form>
<div data-role="fieldcontain">
{if isset($U_REGISTER)}
<a href="{$U_REGISTER}" data-role="button">{'Register'|@translate}</a>
{/if}
{*
<div data-role="fieldcontain" style="margin-top:2em">
{if isset($U_LOST_PASSWORD)}
<a href="{$U_LOST_PASSWORD}" data-role="button">{'Forgot your password?'|@translate}</a>
{/if}
*}
{if isset($U_REGISTER)}
<a href="{$U_REGISTER}" data-role="button">{'Register'|@translate}</a>
{/if}
</div>
</div>

27
themes/smartpocket/template/password.tpl Executable file
View file

@ -0,0 +1,27 @@
{include file='infos_errors.tpl'}
<div data-role="content">
<h3>{'Forgot your password?'|translate}</h3>
{if $action ne 'none'}
<form id="lostPassword" action="{$form_action}?action={$action}{if isset($key)}&amp;key={$key}{/if}" method="post">
<input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
{if $action eq 'lost'}
<div data-role="fieldcontain">
<label for="username">{'Username or email'|@translate}</label>
<input type="text" id="username_or_email" name="username_or_email" size="40" maxlength="40"{if isset($username_or_email)} value="{$username_or_email}"{/if}>
<input type="submit" name="submit" value="{'Change my password'|@translate}">
</div>
{elseif $action eq 'reset'}
<div data-role="fieldcontain">
<label for="password">{'New password'|@translate}</label>
<input type="password" name="use_new_pwd" id="use_new_pwd" value="">
<label for="passwordConf">{'Confirm Password'|@translate}</label>
<input type="password" name="passwordConf" id="passwordConf" value="">
<input type="submit" name="submit" value="{'Submit'|@translate}">
</div>
{/if}
</form>
{/if} {* $action ne 'none' *}
</div>