aboutsummaryrefslogtreecommitdiffstats
path: root/language
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2016-01-11 09:17:53 +0100
committerplegall <plg@piwigo.org>2016-01-11 09:17:53 +0100
commit2bfd316e348919af0e5d22467abf9b79b040e476 (patch)
treed1e8034dfce06ac925647e59c21600be72353005 /language
parente756ba2d79f9ce25376fa70a6a203d06e704bb61 (diff)
parentac8c2bf47037f82da06263d4408ce8ebfe3d5ecb (diff)
Merge branch 'feature/398-refresh-user-list' (which should also include branch 'feature/397-edit-user-popin')
Diffstat (limited to 'language')
-rw-r--r--language/en_UK/admin.lang.php1
-rw-r--r--language/fr_FR/admin.lang.php1
2 files changed, 2 insertions, 0 deletions
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index 272d2bf63..3a55c1a1f 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -984,3 +984,4 @@ $lang['width & height'] = 'width & height';
$lang['Upload in progress'] = 'Upload in progress';
$lang['Orphans'] = 'Orphans';
$lang['Delete %d orphan photos'] = 'Delete %d orphan photos';
+$lang['Edit user'] = 'Edit user'; \ No newline at end of file
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index 7bd93f439..fe242f0f9 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -985,3 +985,4 @@ $lang['No and unlock sub-albums'] = 'Non, et déverrouiller les sous-albums';
$lang['Upload in progress'] = 'Transfert en cours...';
$lang['Orphans'] = 'Orphelines';
$lang['Delete %d orphan photos'] = 'Supprimer les %d photos orphelines';
+$lang['Edit user'] = 'Éditer l\'utilisateur';