diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-01-31 10:55:59 +0100 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-01-31 10:55:59 +0100 |
| commit | 54eeb8b8fcff13d29ae363e7ca5e6da707fdd6b7 (patch) | |
| tree | 48c2eb0ad04a4bd921f223258e41beba2e2c6539 /apps/files/l10n/oc.php | |
| parent | 9c83b307f6d49f30c4cc6db7258d7e3851bac0b7 (diff) | |
| parent | 00a30e665128352e9b20268ea65400a968903c74 (diff) | |
| download | nextcloud-server-54eeb8b8fcff13d29ae363e7ca5e6da707fdd6b7.tar.gz nextcloud-server-54eeb8b8fcff13d29ae363e7ca5e6da707fdd6b7.zip | |
fix merge conflict
Diffstat (limited to 'apps/files/l10n/oc.php')
| -rw-r--r-- | apps/files/l10n/oc.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/apps/files/l10n/oc.php b/apps/files/l10n/oc.php index 76c8d6b655a..78045b299ed 100644 --- a/apps/files/l10n/oc.php +++ b/apps/files/l10n/oc.php @@ -19,7 +19,6 @@ "1 file uploading" => "1 fichièr al amontcargar", "Upload cancelled." => "Amontcargar anullat.", "File upload is in progress. Leaving the page now will cancel the upload." => "Un amontcargar es a se far. Daissar aquesta pagina ara tamparà lo cargament. ", -"error while scanning" => "error pendant l'exploracion", "Name" => "Nom", "Size" => "Talha", "Modified" => "Modificat", |