diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2014-08-31 15:21:09 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2014-08-31 15:21:09 +0200 |
| commit | ae3425d2dadbac69e7dcb0ba577db20e63e7d91f (patch) | |
| tree | f483759739cd951c33ef1c61ade8694f9e1c95e3 /core/l10n/es_CO.php | |
| parent | 3329e0f2b22207a24ddb4953bbf11964b23682d9 (diff) | |
| parent | 73685892ed6f255a916512863cd5549914d071e1 (diff) | |
| download | nextcloud-server-ae3425d2dadbac69e7dcb0ba577db20e63e7d91f.tar.gz nextcloud-server-ae3425d2dadbac69e7dcb0ba577db20e63e7d91f.zip | |
Merge branch 'master' into securityutils
Conflicts:
lib/private/util.php
Diffstat (limited to 'core/l10n/es_CO.php')
| -rw-r--r-- | core/l10n/es_CO.php | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/core/l10n/es_CO.php b/core/l10n/es_CO.php index ffcdde48d47..aff098dff1f 100644 --- a/core/l10n/es_CO.php +++ b/core/l10n/es_CO.php @@ -1,9 +1,5 @@ <?php $TRANSLATIONS = array( -"_%n minute ago_::_%n minutes ago_" => array("",""), -"_%n hour ago_::_%n hours ago_" => array("",""), -"_%n day ago_::_%n days ago_" => array("",""), -"_%n month ago_::_%n months ago_" => array("",""), "_{count} file conflict_::_{count} file conflicts_" => array("","") ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; |