aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/files/js/files.js2
-rw-r--r--apps/files/l10n/ast.php1
-rw-r--r--apps/files/l10n/el.php2
-rw-r--r--apps/files/l10n/tr.php2
-rw-r--r--apps/files/lib/helper.php2
-rw-r--r--apps/files/templates/index.php2
-rw-r--r--apps/files_external/l10n/cs_CZ.php7
-rw-r--r--apps/files_external/l10n/sl.php5
-rw-r--r--apps/files_sharing/css/public.css14
-rw-r--r--apps/files_trashbin/js/trash.js8
-rw-r--r--apps/files_trashbin/l10n/ast.php5
-rw-r--r--apps/files_versions/l10n/ast.php2
-rw-r--r--apps/user_ldap/l10n/ast.php36
13 files changed, 76 insertions, 12 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index ac10191618b..9f38263bef3 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -135,7 +135,7 @@ var Files = {
return;
}
if (initStatus === '1') { // encryption tried to init but failed
- OC.Notification.showHtml(t('files', 'Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files.'));
+ OC.Notification.show(t('files', 'Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files.'));
return;
}
if (encryptedFiles === '1') {
diff --git a/apps/files/l10n/ast.php b/apps/files/l10n/ast.php
index 93ae47b25c5..c0b32e8e0cb 100644
--- a/apps/files/l10n/ast.php
+++ b/apps/files/l10n/ast.php
@@ -22,6 +22,7 @@ $TRANSLATIONS = array(
"Upload" => "Xubir",
"Save" => "Guardar",
"New folder" => "Nueva carpeta",
+"Folder" => "Carpeta",
"Cancel upload" => "Encaboxar xuba",
"Download" => "Descargar",
"Delete" => "Desaniciar"
diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php
index 713072d3e0e..cf2022c2d7f 100644
--- a/apps/files/l10n/el.php
+++ b/apps/files/l10n/el.php
@@ -69,7 +69,7 @@ $TRANSLATIONS = array(
"Maximum upload size" => "Μέγιστο μέγεθος αποστολής",
"max. possible: " => "μέγιστο δυνατό:",
"Needed for multi-file and folder downloads." => "Απαραίτητο για κατέβασμα πολλαπλών αρχείων και φακέλων",
-"Enable ZIP-download" => "Ενεργοποίηση κατεβάσματος ZIP",
+"Enable ZIP-download" => "Επιτρέπεται η λήψη ZIP",
"0 is unlimited" => "0 για απεριόριστο",
"Maximum input size for ZIP files" => "Μέγιστο μέγεθος για αρχεία ZIP",
"Save" => "Αποθήκευση",
diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php
index 76fafc32650..1f69dca628d 100644
--- a/apps/files/l10n/tr.php
+++ b/apps/files/l10n/tr.php
@@ -1,6 +1,6 @@
<?php
$TRANSLATIONS = array(
-"Could not move %s - File with this name already exists" => "%s taşınamadı. Bu isimde dosya zaten var.",
+"Could not move %s - File with this name already exists" => "%s taşınamadı. Bu isimde dosya zaten mevcut",
"Could not move %s" => "%s taşınamadı",
"File name cannot be empty." => "Dosya adı boş olamaz.",
"\"%s\" is an invalid file name." => "'%s' geçersiz bir dosya adı.",
diff --git a/apps/files/lib/helper.php b/apps/files/lib/helper.php
index f9515d67157..2e3741cbdca 100644
--- a/apps/files/lib/helper.php
+++ b/apps/files/lib/helper.php
@@ -11,7 +11,7 @@ class Helper
$l = new \OC_L10N('files');
$maxUploadFilesize = \OCP\Util::maxUploadFilesize($dir, $storageInfo['free']);
$maxHumanFilesize = \OCP\Util::humanFileSize($maxUploadFilesize);
- $maxHumanFilesize = $l->t('Upload') . ' max. ' . $maxHumanFilesize;
+ $maxHumanFilesize = $l->t('Upload (max. %s)', array($maxHumanFilesize));
return array('uploadMaxFilesize' => $maxUploadFilesize,
'maxHumanFilesize' => $maxHumanFilesize,
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index 95edd625cb3..a8437835d95 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -19,7 +19,7 @@
</div>
<?php endif;?>
<div id="upload" class="button"
- title="<?php p($l->t('Upload') . ' max. '.$_['uploadMaxHumanFilesize']) ?>">
+ title="<?php p($l->t('Upload (max. %s)', array($_['uploadMaxHumanFilesize']))) ?>">
<?php if($_['uploadMaxFilesize'] >= 0):?>
<input type="hidden" id="max_upload" name="MAX_FILE_SIZE" value="<?php p($_['uploadMaxFilesize']) ?>">
<?php endif;?>
diff --git a/apps/files_external/l10n/cs_CZ.php b/apps/files_external/l10n/cs_CZ.php
index 6a4e09aa3ab..90d64529b1c 100644
--- a/apps/files_external/l10n/cs_CZ.php
+++ b/apps/files_external/l10n/cs_CZ.php
@@ -6,12 +6,19 @@ $TRANSLATIONS = array(
"Please provide a valid Dropbox app key and secret." => "Zadejte, prosím, platný klíč a bezpečnostní frázi aplikace Dropbox.",
"Error configuring Google Drive storage" => "Chyba při nastavení úložiště Google Drive",
"Saved" => "Uloženo",
+"<b>Note:</b> " => "<b>Poznámka:</b>",
+" and " => "a",
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Poznámka:</b> cURL podpora v PHP není povolena nebo nainstalována. Není možné připojení %s. Prosím požádejte svého správce systému ať ji nainstaluje.",
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Poznámka:</b> FTP podpora v PHP není povolena nebo nainstalována. Není možné připojení %s. Prosím požádejte svého správce systému ať ji nainstaluje.",
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Poznámka:</b> \"%s\" není instalováno. Není možné připojení %s. Prosím požádejte svého správce systému o instalaci.",
"External Storage" => "Externí úložiště",
"Folder name" => "Název složky",
"External storage" => "Externí úložiště",
"Configuration" => "Nastavení",
"Options" => "Možnosti",
+"Available for" => "Dostupné pro",
"Add storage" => "Přidat úložiště",
+"No user or group" => "Žádný uživatel nebo skupina.",
"All Users" => "Všichni uživatelé",
"Groups" => "Skupiny",
"Users" => "Uživatelé",
diff --git a/apps/files_external/l10n/sl.php b/apps/files_external/l10n/sl.php
index bb34494a5d7..baab272d1d2 100644
--- a/apps/files_external/l10n/sl.php
+++ b/apps/files_external/l10n/sl.php
@@ -6,6 +6,11 @@ $TRANSLATIONS = array(
"Please provide a valid Dropbox app key and secret." => "Vpisati je treba veljaven ključ programa in kodo za Dropbox",
"Error configuring Google Drive storage" => "Napaka nastavljanja shrambe Google Drive",
"Saved" => "Shranjeno",
+"<b>Note:</b> " => "<b>Opomba:</b> ",
+" and " => "in",
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Opomba:</b> Podpora za naslove cURL v PHP ni omogočena, ali pa ni ustrezno nameščenih programov. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika.",
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Opomba:</b> Podpora za protokol FTP v PHP ni omogočena, ali pa ni ustrezno nameščenih programov. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika.",
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Opomba:</b> Program \"%s\" ni nameščen. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika.",
"External Storage" => "Zunanja podatkovna shramba",
"Folder name" => "Ime mape",
"External storage" => "Zunanja shramba",
diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css
index 062444f496f..efd8d4950d8 100644
--- a/apps/files_sharing/css/public.css
+++ b/apps/files_sharing/css/public.css
@@ -70,13 +70,26 @@ thead {
margin: 0;
}
+
.directDownload,
.directLink {
margin-bottom: 20px;
}
+
+/* keep long file names in one line to not overflow download button on mobile */
+.directDownload #download {
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ max-width: 90%;
+ display: inline-block;
+ margin-left: auto;
+ margin-right: auto;
+}
.directDownload .button img {
vertical-align: text-bottom;
}
+
.directLink label {
font-weight: normal;
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
@@ -86,4 +99,5 @@ thead {
.directLink input {
margin-left: 5px;
width: 300px;
+ max-width: 90%;
}
diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js
index 5cd49e19aaa..f7724d07d2b 100644
--- a/apps/files_trashbin/js/trash.js
+++ b/apps/files_trashbin/js/trash.js
@@ -30,7 +30,7 @@ $(document).ready(function() {
function removeCallback(result) {
if (result.status !== 'success') {
- OC.dialogs.alert(result.data.message, t('core', 'Error'));
+ OC.dialogs.alert(result.data.message, t('files_trashbin', 'Error'));
}
var files = result.data.success;
@@ -59,7 +59,7 @@ $(document).ready(function() {
},
removeCallback
);
- });
+ }, t('files_trashbin', 'Restore'));
};
FileActions.register('all', 'Delete', OC.PERMISSION_READ, function() {
@@ -121,7 +121,7 @@ $(document).ready(function() {
function(result) {
if (allFiles) {
if (result.status !== 'success') {
- OC.dialogs.alert(result.data.message, t('core', 'Error'));
+ OC.dialogs.alert(result.data.message, t('files_trashbin', 'Error'));
}
FileList.hideMask();
// simply remove all files
@@ -170,7 +170,7 @@ $(document).ready(function() {
function(result) {
if (allFiles) {
if (result.status !== 'success') {
- OC.dialogs.alert(result.data.message, t('core', 'Error'));
+ OC.dialogs.alert(result.data.message, t('files_trashbin', 'Error'));
}
FileList.hideMask();
// simply remove all files
diff --git a/apps/files_trashbin/l10n/ast.php b/apps/files_trashbin/l10n/ast.php
index 91c122bd4d3..688e1ce3d8f 100644
--- a/apps/files_trashbin/l10n/ast.php
+++ b/apps/files_trashbin/l10n/ast.php
@@ -1,8 +1,13 @@
<?php
$TRANSLATIONS = array(
+"Couldn't delete %s permanently" => "Nun pudo desaniciase %s dafechu",
+"Couldn't restore %s" => "Nun pudo restaurase %s",
"Error" => "Fallu",
+"Deleted Files" => "Ficheros desaniciaos",
+"Nothing in here. Your trash bin is empty!" => "Nun hai un res equí. La papelera ta balera!",
"Name" => "Nome",
"Restore" => "Restaurar",
+"Deleted" => "Desaniciáu",
"Delete" => "Desaniciar"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/ast.php b/apps/files_versions/l10n/ast.php
index 4869d70b54d..31e6e72b2d7 100644
--- a/apps/files_versions/l10n/ast.php
+++ b/apps/files_versions/l10n/ast.php
@@ -1,6 +1,8 @@
<?php
$TRANSLATIONS = array(
+"Could not revert: %s" => "Nun pudo revertise: %s",
"Versions" => "Versiones",
+"Failed to revert {file} to revision {timestamp}." => "Fallu al revertir {file} a la revisión {timestamp}.",
"More versions..." => "Más versiones...",
"No other versions available" => "Nun hai otres versiones disponibles",
"Restore" => "Restaurar"
diff --git a/apps/user_ldap/l10n/ast.php b/apps/user_ldap/l10n/ast.php
index 2c022880019..032de8aedbc 100644
--- a/apps/user_ldap/l10n/ast.php
+++ b/apps/user_ldap/l10n/ast.php
@@ -1,11 +1,41 @@
<?php
$TRANSLATIONS = array(
+"The configuration is invalid. Please have a look at the logs for further details." => "La configuración nun ye válida. Por favor, écha-y un güeyu a los rexistros pa más detalles.",
+"No action specified" => "Nun s'especificó l'aición",
+"No configuration specified" => "Nun s'especificó la configuración",
+"No data specified" => "Nun s'especificaron los datos",
+" Could not set configuration %s" => "Nun pudo afitase la configuración %s",
"Deletion failed" => "Falló'l borráu",
+"Keep settings?" => "¿Caltener los axustes?",
+"Cannot add server configuration" => "Nun pue amestase la configuración del sirvidor",
+"Success" => "Con ésitu",
"Error" => "Fallu",
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("",""),
+"Configuration incorrect" => "Configuración incorreuta",
+"Configuration incomplete" => "Configuración incompleta",
+"Select groups" => "Esbillar grupos",
+"Select attributes" => "Esbillar atributos",
+"_%s group found_::_%s groups found_" => array("%s grupu alcontráu","%s grupos alcontraos"),
+"_%s user found_::_%s users found_" => array("%s usuariu alcontráu","%s usuarios alcontraos"),
+"Could not find the desired feature" => "Nun pudo alcontrase la carauterística deseyada",
"Save" => "Guardar",
+"groups found" => "grupos alcontraos",
+"Users login with this attribute:" => "Aniciu de sesión d'usuarios con esti atributu:",
+"LDAP Username:" => "Nome d'usuariu LDAP",
+"Other Attributes:" => "Otros atributos:",
+"Add Server Configuration" => "Amestar configuración del sirvidor",
+"Host" => "Equipu",
+"Port" => "Puertu",
"Password" => "Contraseña",
-"Continue" => "Continuar"
+"For anonymous access, leave DN and Password empty." => "Pa un accesu anónimu, dexar el DN y la contraseña baleros.",
+"users found" => "usuarios alcontraos",
+"Continue" => "Continuar",
+"Connection Settings" => "Axustes de conexón",
+"Configuration Active" => "Configuración activa",
+"When unchecked, this configuration will be skipped." => "Cuando nun tea conseñáu, saltaráse esta configuración.",
+"Disable Main Server" => "Deshabilitar sirvidor principal",
+"Turn off SSL certificate validation." => "Apagar la validación del certificáu SSL.",
+"Directory Settings" => "Axustes del direutoriu",
+"in bytes" => "en bytes",
+"Internal Username" => "Nome d'usuariu internu"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";