diff options
author | Frank Karlitschek <frank@owncloud.org> | 2013-01-30 14:36:17 +0100 |
---|---|---|
committer | Frank Karlitschek <frank@owncloud.org> | 2013-01-30 14:36:17 +0100 |
commit | 66cab77b6d83980d260cd35556d2759089d2971b (patch) | |
tree | ccf3767afba89f90ea82bd0805f23eb189956b53 /settings/l10n/ia.php | |
parent | 389c4e84153893a04310876ef70943cad53ee3e7 (diff) | |
parent | 5761bd771f4142394a00083712b63e77f8976946 (diff) | |
download | nextcloud-server-66cab77b6d83980d260cd35556d2759089d2971b.tar.gz nextcloud-server-66cab77b6d83980d260cd35556d2759089d2971b.zip |
merge master
Merge branch 'master' into improved_appsmanagement
Conflicts:
settings/apps.php
settings/templates/apps.php
Diffstat (limited to 'settings/l10n/ia.php')
-rw-r--r-- | settings/l10n/ia.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/settings/l10n/ia.php b/settings/l10n/ia.php index 18428709098..121a1175e79 100644 --- a/settings/l10n/ia.php +++ b/settings/l10n/ia.php @@ -15,7 +15,6 @@ "Your email address" => "Tu adresse de e-posta", "Language" => "Linguage", "Help translate" => "Adjuta a traducer", -"Name" => "Nomine", "Groups" => "Gruppos", "Create" => "Crear", "Other" => "Altere", |