diff options
| author | kondou <kondou@ts.unde.re> | 2013-08-21 19:20:25 +0200 |
|---|---|---|
| committer | kondou <kondou@ts.unde.re> | 2013-08-21 19:20:25 +0200 |
| commit | 0ce35af02acb2fa9fe0ef401dc75345b5114e3d6 (patch) | |
| tree | 5ff19a7cc1bce5901cfeec7e11179ed2682b9e78 /core/l10n/oc.php | |
| parent | 7c296a6cf915da6630422ceb8e253ebf9f004964 (diff) | |
| parent | a89199cc7bd19f6ba3e76fcd510219b2bd930ae6 (diff) | |
| download | nextcloud-server-0ce35af02acb2fa9fe0ef401dc75345b5114e3d6.tar.gz nextcloud-server-0ce35af02acb2fa9fe0ef401dc75345b5114e3d6.zip | |
Merge branch 'master' into improve_app-management
Conflicts:
settings/js/apps.js
Diffstat (limited to 'core/l10n/oc.php')
| -rw-r--r-- | core/l10n/oc.php | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/core/l10n/oc.php b/core/l10n/oc.php index f47776fb991..68bf2f89a2a 100644 --- a/core/l10n/oc.php +++ b/core/l10n/oc.php @@ -34,7 +34,6 @@ $TRANSLATIONS = array( "last year" => "an passat", "years ago" => "ans a", "Choose" => "Causís", -"Cancel" => "Annula", "Yes" => "Òc", "No" => "Non", "Ok" => "D'accòrdi", @@ -94,8 +93,6 @@ $TRANSLATIONS = array( "Log out" => "Sortida", "Lost your password?" => "L'as perdut lo senhal ?", "remember" => "bremba-te", -"Log in" => "Dintrada", -"prev" => "dariièr", -"next" => "venent" +"Log in" => "Dintrada" ); $PLURAL_FORMS = "nplurals=2; plural=(n > 1);"; |