merge master into filesystem

remotes/origin/stable5
Robin Appelman 13 years ago
commit bf2ac9f113
  1. 9
      .htaccess
  2. 14
      apps/files/index.php
  3. 19
      apps/files/js/filelist.js
  4. 7
      apps/files/js/files.js
  5. 1
      apps/files/l10n/ar.php
  6. 1
      apps/files/l10n/ca.php
  7. 1
      apps/files/l10n/cs_CZ.php
  8. 1
      apps/files/l10n/da.php
  9. 1
      apps/files/l10n/de.php
  10. 1
      apps/files/l10n/de_DE.php
  11. 2
      apps/files/l10n/el.php
  12. 1
      apps/files/l10n/eo.php
  13. 1
      apps/files/l10n/es.php
  14. 2
      apps/files/l10n/es_AR.php
  15. 1
      apps/files/l10n/et_EE.php
  16. 1
      apps/files/l10n/eu.php
  17. 1
      apps/files/l10n/fa.php
  18. 1
      apps/files/l10n/fi_FI.php
  19. 1
      apps/files/l10n/fr.php
  20. 1
      apps/files/l10n/gl.php
  21. 1
      apps/files/l10n/he.php
  22. 1
      apps/files/l10n/hr.php
  23. 1
      apps/files/l10n/hu_HU.php
  24. 1
      apps/files/l10n/ia.php
  25. 1
      apps/files/l10n/id.php
  26. 1
      apps/files/l10n/it.php
  27. 2
      apps/files/l10n/ja_JP.php
  28. 1
      apps/files/l10n/ka_GE.php
  29. 1
      apps/files/l10n/ko.php
  30. 1
      apps/files/l10n/ku_IQ.php
  31. 1
      apps/files/l10n/lb.php
  32. 1
      apps/files/l10n/lt_LT.php
  33. 1
      apps/files/l10n/mk.php
  34. 1
      apps/files/l10n/ms_MY.php
  35. 1
      apps/files/l10n/nb_NO.php
  36. 4
      apps/files/l10n/nl.php
  37. 1
      apps/files/l10n/nn_NO.php
  38. 1
      apps/files/l10n/pl.php
  39. 1
      apps/files/l10n/pt_BR.php
  40. 1
      apps/files/l10n/pt_PT.php
  41. 1
      apps/files/l10n/ro.php
  42. 2
      apps/files/l10n/ru.php
  43. 1
      apps/files/l10n/ru_RU.php
  44. 16
      apps/files/l10n/si_LK.php
  45. 1
      apps/files/l10n/sk_SK.php
  46. 1
      apps/files/l10n/sl.php
  47. 41
      apps/files/l10n/sr.php
  48. 1
      apps/files/l10n/sr@latin.php
  49. 1
      apps/files/l10n/sv.php
  50. 1
      apps/files/l10n/ta_LK.php
  51. 1
      apps/files/l10n/th_TH.php
  52. 1
      apps/files/l10n/tr.php
  53. 1
      apps/files/l10n/uk.php
  54. 2
      apps/files/l10n/vi.php
  55. 13
      apps/files/l10n/zh_CN.GB2312.php
  56. 1
      apps/files/l10n/zh_CN.php
  57. 1
      apps/files/l10n/zh_TW.php
  58. 2
      apps/files/templates/index.php
  59. 6
      apps/files_encryption/l10n/ar.php
  60. 1
      apps/files_encryption/l10n/fa.php
  61. 1
      apps/files_external/l10n/vi.php
  62. 4
      apps/files_external/lib/ftp.php
  63. 4
      apps/files_external/lib/swift.php
  64. 4
      apps/files_external/lib/webdav.php
  65. 6
      apps/files_sharing/appinfo/update.php
  66. 6
      apps/files_sharing/lib/share/file.php
  67. 2
      apps/files_sharing/lib/share/folder.php
  68. 8
      apps/files_sharing/lib/sharedstorage.php
  69. 2
      apps/files_sharing/public.php
  70. 37
      apps/user_ldap/l10n/nl.php
  71. 24
      apps/user_ldap/l10n/vi.php
  72. 36
      apps/user_ldap/lib/access.php
  73. 0
      apps/user_webdavauth/l10n/.gitkeep
  74. 3
      apps/user_webdavauth/l10n/ar.php
  75. 3
      apps/user_webdavauth/l10n/ca.php
  76. 3
      apps/user_webdavauth/l10n/cs_CZ.php
  77. 3
      apps/user_webdavauth/l10n/de.php
  78. 3
      apps/user_webdavauth/l10n/de_DE.php
  79. 3
      apps/user_webdavauth/l10n/el.php
  80. 3
      apps/user_webdavauth/l10n/es.php
  81. 3
      apps/user_webdavauth/l10n/es_AR.php
  82. 3
      apps/user_webdavauth/l10n/fi_FI.php
  83. 3
      apps/user_webdavauth/l10n/it.php
  84. 3
      apps/user_webdavauth/l10n/ja_JP.php
  85. 3
      apps/user_webdavauth/l10n/nl.php
  86. 3
      apps/user_webdavauth/l10n/pl.php
  87. 3
      apps/user_webdavauth/l10n/pt_BR.php
  88. 3
      apps/user_webdavauth/l10n/pt_PT.php
  89. 3
      apps/user_webdavauth/l10n/ru.php
  90. 3
      apps/user_webdavauth/l10n/ru_RU.php
  91. 3
      apps/user_webdavauth/l10n/si_LK.php
  92. 3
      apps/user_webdavauth/l10n/sv.php
  93. 3
      apps/user_webdavauth/l10n/vi.php
  94. 20
      core/ajax/vcategories/add.php
  95. 38
      core/ajax/vcategories/addToFavorites.php
  96. 25
      core/ajax/vcategories/delete.php
  97. 14
      core/ajax/vcategories/edit.php
  98. 30
      core/ajax/vcategories/favorites.php
  99. 38
      core/ajax/vcategories/removeFromFavorites.php
  100. 13
      core/js/js.js
  101. Some files were not shown because too many files have changed in this diff Show More

@ -1,3 +1,11 @@
<IfModule mod_fcgid.c>
<IfModule mod_setenvif.c>
<IfModule mod_headers.c>
SetEnvIfNoCase ^Authorization$ "(.+)" XAUTHORIZATION=$1
RequestHeader set XAuthorization %{XAUTHORIZATION}e env=XAUTHORIZATION
</IfModule>
</IfModule>
</IfModule>
ErrorDocument 403 /core/templates/403.php
ErrorDocument 404 /core/templates/404.php
<IfModule mod_php5.c>
@ -12,6 +20,7 @@ php_value memory_limit 512M
RewriteEngine on
RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
RewriteRule ^.well-known/host-meta /public.php?service=host-meta [QSA,L]
RewriteRule ^.well-known/host-meta.json /public.php?service=host-meta-json [QSA,L]
RewriteRule ^.well-known/carddav /remote.php/carddav/ [R]
RewriteRule ^.well-known/caldav /remote.php/caldav/ [R]
RewriteRule ^apps/calendar/caldav.php remote.php/caldav/ [QSA,L]

@ -99,15 +99,15 @@ $freeSpace=\OC\Files\Filesystem::free_space($dir);
$freeSpace=max($freeSpace,0);
$maxUploadFilesize = min($maxUploadFilesize, $freeSpace);
$permissions = OCP\Share::PERMISSION_READ;
if (\OC\Files\Filesystem::isUpdatable($dir.'/')) {
$permissions |= OCP\Share::PERMISSION_UPDATE;
$permissions = OCP\PERMISSION_READ;
if (OC_Filesystem::isUpdatable($dir.'/')) {
$permissions |= OCP\PERMISSION_UPDATE;
}
if (\OC\Files\Filesystem::isDeletable($dir.'/')) {
$permissions |= OCP\Share::PERMISSION_DELETE;
if (OC_Filesystem::isDeletable($dir.'/')) {
$permissions |= OCP\PERMISSION_DELETE;
}
if (\OC\Files\Filesystem::isSharable($dir.'/')) {
$permissions |= OCP\Share::PERMISSION_SHARE;
if (OC_Filesystem::isSharable($dir.'/')) {
$permissions |= OCP\PERMISSION_SHARE;
}
$tmpl = new OCP\Template( 'files', 'index', 'user' );

@ -32,14 +32,16 @@ var FileList={
html+='<td class="date"><span class="modified" title="'+formatDate(lastModified)+'" style="color:rgb('+modifiedColor+','+modifiedColor+','+modifiedColor+')">'+relative_modified_date(lastModified.getTime() / 1000)+'</span></td>';
html+='</tr>';
FileList.insertElement(name,'file',$(html).attr('data-file',name));
var row = $('tr').filterAttr('data-file',name);
if(loading){
$('tr').filterAttr('data-file',name).data('loading',true);
row.data('loading',true);
}else{
$('tr').filterAttr('data-file',name).find('td.filename').draggable(dragOptions);
row.find('td.filename').draggable(dragOptions);
}
if (hidden) {
$('tr').filterAttr('data-file', name).hide();
row.hide();
}
FileActions.display(row.find('td.filename'));
},
addDir:function(name,size,lastModified,hidden){
var html, td, link_elem, sizeColor, lastModifiedTime, modifiedColor;
@ -66,11 +68,13 @@ var FileList={
td.append($('<span></span>').attr({ "class": "modified", "title": formatDate(lastModified), "style": 'color:rgb('+modifiedColor+','+modifiedColor+','+modifiedColor+')' }).text( relative_modified_date(lastModified.getTime() / 1000) ));
html.append(td);
FileList.insertElement(name,'dir',html);
$('tr').filterAttr('data-file',name).find('td.filename').draggable(dragOptions);
$('tr').filterAttr('data-file',name).find('td.filename').droppable(folderDropOptions);
var row = $('tr').filterAttr('data-file',name);
row.find('td.filename').draggable(dragOptions);
row.find('td.filename').droppable(folderDropOptions);
if (hidden) {
$('tr').filterAttr('data-file', name).hide();
row.hide();
}
FileActions.display(row.find('td.filename'));
},
refresh:function(data) {
var result = jQuery.parseJSON(data.responseText);
@ -375,4 +379,7 @@ $(document).ready(function(){
FileList.lastAction();
}
});
$(window).unload(function (){
$(window).trigger('beforeunload');
});
});

@ -219,8 +219,11 @@ $(document).ready(function() {
$( '#uploadsize-message' ).dialog({
modal: true,
buttons: {
Close: function() {
$( this ).dialog( 'close' );
Close: {
text:t('files', 'Close'),
click:function() {
$( this ).dialog( 'close' );
}
}
}
});

@ -7,6 +7,7 @@
"Missing a temporary folder" => "المجلد المؤقت غير موجود",
"Files" => "الملفات",
"Delete" => "محذوف",
"Close" => "إغلق",
"Name" => "الاسم",
"Size" => "حجم",
"Modified" => "معدل",

@ -22,6 +22,7 @@
"generating ZIP-file, it may take some time." => "s'estan generant fitxers ZIP, pot trigar una estona.",
"Unable to upload your file as it is a directory or has 0 bytes" => "No es pot pujar el fitxer perquè és una carpeta o té 0 bytes",
"Upload Error" => "Error en la pujada",
"Close" => "Tanca",
"Pending" => "Pendents",
"1 file uploading" => "1 fitxer pujant",
"{count} files uploading" => "{count} fitxers en pujada",

@ -22,6 +22,7 @@
"generating ZIP-file, it may take some time." => "generuji ZIP soubor, může to nějakou dobu trvat.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Nelze odeslat Váš soubor, protože je to adresář nebo má velikost 0 bajtů",
"Upload Error" => "Chyba odesílání",
"Close" => "Zavřít",
"Pending" => "Čekající",
"1 file uploading" => "odesílá se 1 soubor",
"{count} files uploading" => "odesílám {count} souborů",

@ -22,6 +22,7 @@
"generating ZIP-file, it may take some time." => "genererer ZIP-fil, det kan tage lidt tid.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Kunne ikke uploade din fil, da det enten er en mappe eller er tom",
"Upload Error" => "Fejl ved upload",
"Close" => "Luk",
"Pending" => "Afventer",
"1 file uploading" => "1 fil uploades",
"{count} files uploading" => "{count} filer uploades",

@ -22,6 +22,7 @@
"generating ZIP-file, it may take some time." => "Erstelle ZIP-Datei. Dies kann eine Weile dauern.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Deine Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist.",
"Upload Error" => "Fehler beim Upload",
"Close" => "Schließen",
"Pending" => "Ausstehend",
"1 file uploading" => "Eine Datei wird hoch geladen",
"{count} files uploading" => "{count} Dateien werden hochgeladen",

@ -22,6 +22,7 @@
"generating ZIP-file, it may take some time." => "Erstelle ZIP-Datei. Dies kann eine Weile dauern.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Ihre Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist.",
"Upload Error" => "Fehler beim Upload",
"Close" => "Schließen",
"Pending" => "Ausstehend",
"1 file uploading" => "1 Datei wird hochgeladen",
"{count} files uploading" => "{count} Dateien wurden hochgeladen",

@ -22,6 +22,7 @@
"generating ZIP-file, it may take some time." => "παραγωγή αρχείου ZIP, ίσως διαρκέσει αρκετά.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Αδυναμία στην αποστολή του αρχείου σας αφού είναι φάκελος ή έχει 0 bytes",
"Upload Error" => "Σφάλμα Αποστολής",
"Close" => "Κλείσιμο",
"Pending" => "Εκκρεμεί",
"1 file uploading" => "1 αρχείο ανεβαίνει",
"{count} files uploading" => "{count} αρχεία ανεβαίνουν",
@ -48,6 +49,7 @@
"New" => "Νέο",
"Text file" => "Αρχείο κειμένου",
"Folder" => "Φάκελος",
"From link" => "Από σύνδεσμο",
"Upload" => "Αποστολή",
"Cancel upload" => "Ακύρωση αποστολής",
"Nothing in here. Upload something!" => "Δεν υπάρχει τίποτα εδώ. Ανέβασε κάτι!",

@ -17,6 +17,7 @@
"generating ZIP-file, it may take some time." => "generanta ZIP-dosiero, ĝi povas daŭri iom da tempo",
"Unable to upload your file as it is a directory or has 0 bytes" => "Ne eblis alŝuti vian dosieron ĉar ĝi estas dosierujo aŭ havas 0 duumokojn",
"Upload Error" => "Alŝuta eraro",
"Close" => "Fermi",
"Pending" => "Traktotaj",
"1 file uploading" => "1 dosiero estas alŝutata",
"Upload cancelled." => "La alŝuto nuliĝis.",

@ -22,6 +22,7 @@
"generating ZIP-file, it may take some time." => "generando un fichero ZIP, puede llevar un tiempo.",
"Unable to upload your file as it is a directory or has 0 bytes" => "No ha sido posible subir tu archivo porque es un directorio o tiene 0 bytes",
"Upload Error" => "Error al subir el archivo",
"Close" => "cerrrar",
"Pending" => "Pendiente",
"1 file uploading" => "subiendo 1 archivo",
"{count} files uploading" => "Subiendo {count} archivos",

@ -22,6 +22,7 @@
"generating ZIP-file, it may take some time." => "generando un archivo ZIP, puede llevar un tiempo.",
"Unable to upload your file as it is a directory or has 0 bytes" => "No fue posible subir el archivo porque es un directorio o porque su tamaño es 0 bytes",
"Upload Error" => "Error al subir el archivo",
"Close" => "Cerrar",
"Pending" => "Pendiente",
"1 file uploading" => "Subiendo 1 archivo",
"{count} files uploading" => "Subiendo {count} archivos",
@ -48,6 +49,7 @@
"New" => "Nuevo",
"Text file" => "Archivo de texto",
"Folder" => "Carpeta",
"From link" => "Desde enlace",
"Upload" => "Subir",
"Cancel upload" => "Cancelar subida",
"Nothing in here. Upload something!" => "No hay nada. ¡Subí contenido!",

@ -22,6 +22,7 @@
"generating ZIP-file, it may take some time." => "ZIP-faili loomine, see võib veidi aega võtta.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Sinu faili üleslaadimine ebaõnnestus, kuna see on kaust või selle suurus on 0 baiti",
"Upload Error" => "Üleslaadimise viga",
"Close" => "Sulge",
"Pending" => "Ootel",
"1 file uploading" => "1 faili üleslaadimisel",
"{count} files uploading" => "{count} faili üleslaadimist",

@ -17,6 +17,7 @@
"generating ZIP-file, it may take some time." => "ZIP-fitxategia sortzen ari da, denbora har dezake",
"Unable to upload your file as it is a directory or has 0 bytes" => "Ezin da zure fitxategia igo, karpeta bat da edo 0 byt ditu",
"Upload Error" => "Igotzean errore bat suertatu da",
"Close" => "Itxi",
"Pending" => "Zain",
"1 file uploading" => "fitxategi 1 igotzen",
"Upload cancelled." => "Igoera ezeztatuta",

@ -15,6 +15,7 @@
"generating ZIP-file, it may take some time." => "در حال ساخت فایل فشرده ممکن است زمان زیادی به طول بیانجامد",
"Unable to upload your file as it is a directory or has 0 bytes" => "ناتوان در بارگذاری یا فایل یک پوشه است یا 0بایت دارد",
"Upload Error" => "خطا در بار گذاری",
"Close" => "بستن",
"Pending" => "در انتظار",
"Upload cancelled." => "بار گذاری لغو شد",
"Invalid name, '/' is not allowed." => "نام نامناسب '/' غیرفعال است",

@ -18,6 +18,7 @@
"generating ZIP-file, it may take some time." => "luodaan ZIP-tiedostoa, tämä saattaa kestää hetken.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Tiedoston lähetys epäonnistui, koska sen koko on 0 tavua tai kyseessä on kansio",
"Upload Error" => "Lähetysvirhe.",
"Close" => "Sulje",
"Pending" => "Odottaa",
"Upload cancelled." => "Lähetys peruttu.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen.",

@ -22,6 +22,7 @@
"generating ZIP-file, it may take some time." => "Fichier ZIP en cours d'assemblage ; cela peut prendre du temps.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Impossible de charger vos fichiers car il s'agit d'un dossier ou le fichier fait 0 octet.",
"Upload Error" => "Erreur de chargement",
"Close" => "Fermer",
"Pending" => "En cours",
"1 file uploading" => "1 fichier en cours de téléchargement",
"{count} files uploading" => "{count} fichiers téléversés",

@ -16,6 +16,7 @@
"generating ZIP-file, it may take some time." => "xerando ficheiro ZIP, pode levar un anaco.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Non se puido subir o ficheiro pois ou é un directorio ou ten 0 bytes",
"Upload Error" => "Erro na subida",
"Close" => "Pechar",
"Pending" => "Pendentes",
"Upload cancelled." => "Subida cancelada.",
"File upload is in progress. Leaving the page now will cancel the upload." => "A subida do ficheiro está en curso. Saír agora da páxina cancelará a subida.",

@ -12,6 +12,7 @@
"generating ZIP-file, it may take some time." => "יוצר קובץ ZIP, אנא המתן.",
"Unable to upload your file as it is a directory or has 0 bytes" => "לא יכול להעלות את הקובץ מכיוון שזו תקיה או שמשקל הקובץ 0 בתים",
"Upload Error" => "שגיאת העלאה",
"Close" => "סגירה",
"Pending" => "ממתין",
"Upload cancelled." => "ההעלאה בוטלה.",
"Invalid name, '/' is not allowed." => "שם לא חוקי, '/' אסור לשימוש.",

@ -17,6 +17,7 @@
"generating ZIP-file, it may take some time." => "generiranje ZIP datoteke, ovo može potrajati.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Nemoguće poslati datoteku jer je prazna ili je direktorij",
"Upload Error" => "Pogreška pri slanju",
"Close" => "Zatvori",
"Pending" => "U tijeku",
"1 file uploading" => "1 datoteka se učitava",
"Upload cancelled." => "Slanje poništeno.",

@ -15,6 +15,7 @@
"generating ZIP-file, it may take some time." => "ZIP-fájl generálása, ez eltarthat egy ideig.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Nem tölthető fel, mert mappa volt, vagy 0 byte méretű",
"Upload Error" => "Feltöltési hiba",
"Close" => "Bezár",
"Pending" => "Folyamatban",
"Upload cancelled." => "Feltöltés megszakítva",
"Invalid name, '/' is not allowed." => "Érvénytelen név, a '/' nem megengedett",

@ -4,6 +4,7 @@
"Missing a temporary folder" => "Manca un dossier temporari",
"Files" => "Files",
"Delete" => "Deler",
"Close" => "Clauder",
"Name" => "Nomine",
"Size" => "Dimension",
"Modified" => "Modificate",

@ -15,6 +15,7 @@
"generating ZIP-file, it may take some time." => "membuat berkas ZIP, ini mungkin memakan waktu.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Gagal mengunggah berkas anda karena berupa direktori atau mempunyai ukuran 0 byte",
"Upload Error" => "Terjadi Galat Pengunggahan",
"Close" => "tutup",
"Pending" => "Menunggu",
"Upload cancelled." => "Pengunggahan dibatalkan.",
"Invalid name, '/' is not allowed." => "Kesalahan nama, '/' tidak diijinkan.",

@ -22,6 +22,7 @@
"generating ZIP-file, it may take some time." => "creazione file ZIP, potrebbe richiedere del tempo.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Impossibile inviare il file poiché è una cartella o ha dimensione 0 byte",
"Upload Error" => "Errore di invio",
"Close" => "Chiudi",
"Pending" => "In corso",
"1 file uploading" => "1 file in fase di caricamento",
"{count} files uploading" => "{count} file in fase di caricamentoe",

@ -22,6 +22,7 @@
"generating ZIP-file, it may take some time." => "ZIPファイルを生成中です、しばらくお待ちください。",
"Unable to upload your file as it is a directory or has 0 bytes" => "アップロード使用としているファイルがディレクトリ、もしくはサイズが0バイトのため、アップロードできません。",
"Upload Error" => "アップロードエラー",
"Close" => "閉じる",
"Pending" => "保留",
"1 file uploading" => "ファイルを1つアップロード中",
"{count} files uploading" => "{count} ファイルをアップロード中",
@ -48,6 +49,7 @@
"New" => "新規",
"Text file" => "テキストファイル",
"Folder" => "フォルダ",
"From link" => "リンク",
"Upload" => "アップロード",
"Cancel upload" => "アップロードをキャンセル",
"Nothing in here. Upload something!" => "ここには何もありません。何かアップロードしてください。",

@ -22,6 +22,7 @@
"generating ZIP-file, it may take some time." => "ZIP-ფაილის გენერირება, ამას ჭირდება გარკვეული დრო.",
"Unable to upload your file as it is a directory or has 0 bytes" => "თქვენი ფაილის ატვირთვა ვერ მოხერხდა. ის არის საქაღალდე და შეიცავს 0 ბაიტს",
"Upload Error" => "შეცდომა ატვირთვისას",
"Close" => "დახურვა",
"Pending" => "მოცდის რეჟიმში",
"1 file uploading" => "1 ფაილის ატვირთვა",
"{count} files uploading" => "{count} ფაილი იტვირთება",

@ -14,6 +14,7 @@
"generating ZIP-file, it may take some time." => "ZIP파일 생성에 시간이 걸릴 수 있습니다.",
"Unable to upload your file as it is a directory or has 0 bytes" => "이 파일은 디렉토리이거나 0 바이트이기 때문에 업로드 할 수 없습니다.",
"Upload Error" => "업로드 에러",
"Close" => "닫기",
"Pending" => "보류 중",
"Upload cancelled." => "업로드 취소.",
"Invalid name, '/' is not allowed." => "잘못된 이름, '/' 은 허용이 되지 않습니다.",

@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
"Close" => "داخستن",
"Name" => "ناو",
"Save" => "پاشکهوتکردن",
"Folder" => "بوخچه",

@ -14,6 +14,7 @@
"generating ZIP-file, it may take some time." => "Et gëtt eng ZIP-File generéiert, dëst ka bëssen daueren.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Kann deng Datei net eroplueden well et en Dossier ass oder 0 byte grouss ass.",
"Upload Error" => "Fehler beim eroplueden",
"Close" => "Zoumaachen",
"Upload cancelled." => "Upload ofgebrach.",
"File upload is in progress. Leaving the page now will cancel the upload." => "File Upload am gaang. Wann's de des Säit verléiss gëtt den Upload ofgebrach.",
"Invalid name, '/' is not allowed." => "Ongültege Numm, '/' net erlaabt.",

@ -22,6 +22,7 @@
"generating ZIP-file, it may take some time." => "kuriamas ZIP archyvas, tai gali užtrukti šiek tiek laiko.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Neįmanoma įkelti failo - jo dydis gali būti 0 bitų arba tai katalogas",
"Upload Error" => "Įkėlimo klaida",
"Close" => "Užverti",
"Pending" => "Laukiantis",
"1 file uploading" => "įkeliamas 1 failas",
"{count} files uploading" => "{count} įkeliami failai",

@ -11,6 +11,7 @@
"generating ZIP-file, it may take some time." => "Се генерира ZIP фајлот, ќе треба извесно време.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Не може да се преземе вашата датотека бидејќи фолдерот во кој се наоѓа фајлот има големина од 0 бајти",
"Upload Error" => "Грешка при преземање",
"Close" => "Затвои",
"Pending" => "Чека",
"Upload cancelled." => "Преземањето е прекинато.",
"Invalid name, '/' is not allowed." => "неисправно име, '/' не е дозволено.",

@ -13,6 +13,7 @@
"generating ZIP-file, it may take some time." => "sedang menghasilkan fail ZIP, mungkin mengambil sedikit masa.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Tidak boleh memuatnaik fail anda kerana mungkin ianya direktori atau saiz fail 0 bytes",
"Upload Error" => "Muat naik ralat",
"Close" => "Tutup",
"Pending" => "Dalam proses",
"Upload cancelled." => "Muatnaik dibatalkan.",
"Invalid name, '/' is not allowed." => "penggunaa nama tidak sah, '/' tidak dibenarkan.",

@ -21,6 +21,7 @@
"generating ZIP-file, it may take some time." => "opprettet ZIP-fil, dette kan ta litt tid",
"Unable to upload your file as it is a directory or has 0 bytes" => "Kan ikke laste opp filen din siden det er en mappe eller den har 0 bytes",
"Upload Error" => "Opplasting feilet",
"Close" => "Lukk",
"Pending" => "Ventende",
"1 file uploading" => "1 fil lastes opp",
"{count} files uploading" => "{count} filer laster opp",

@ -22,11 +22,12 @@
"generating ZIP-file, it may take some time." => "aanmaken ZIP-file, dit kan enige tijd duren.",
"Unable to upload your file as it is a directory or has 0 bytes" => "uploaden van de file mislukt, het is of een directory of de bestandsgrootte is 0 bytes",
"Upload Error" => "Upload Fout",
"Close" => "Sluit",
"Pending" => "Wachten",
"1 file uploading" => "1 bestand wordt ge-upload",
"{count} files uploading" => "{count} bestanden aan het uploaden",
"Upload cancelled." => "Uploaden geannuleerd.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Bestands upload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload.",
"Invalid name, '/' is not allowed." => "Ongeldige naam, '/' is niet toegestaan.",
"{count} files scanned" => "{count} bestanden gescanned",
"error while scanning" => "Fout tijdens het scannen",
@ -48,6 +49,7 @@
"New" => "Nieuw",
"Text file" => "Tekstbestand",
"Folder" => "Map",
"From link" => "Vanaf link",
"Upload" => "Upload",
"Cancel upload" => "Upload afbreken",
"Nothing in here. Upload something!" => "Er bevindt zich hier niets. Upload een bestand!",

@ -7,6 +7,7 @@
"Missing a temporary folder" => "Manglar ei mellombels mappe",
"Files" => "Filer",
"Delete" => "Slett",
"Close" => "Lukk",
"Name" => "Namn",
"Size" => "Storleik",
"Modified" => "Endra",

@ -22,6 +22,7 @@
"generating ZIP-file, it may take some time." => "Generowanie pliku ZIP, może potrwać pewien czas.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Nie można wczytać pliku jeśli jest katalogiem lub ma 0 bajtów",
"Upload Error" => "Błąd wczytywania",
"Close" => "Zamknij",
"Pending" => "Oczekujące",
"1 file uploading" => "1 plik wczytany",
"{count} files uploading" => "{count} przesyłanie plików",

@ -22,6 +22,7 @@
"generating ZIP-file, it may take some time." => "gerando arquivo ZIP, isso pode levar um tempo.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Impossível enviar seus arquivo como diretório ou ele tem 0 bytes.",
"Upload Error" => "Erro de envio",
"Close" => "Fechar",
"Pending" => "Pendente",
"1 file uploading" => "enviando 1 arquivo",
"{count} files uploading" => "Enviando {count} arquivos",

@ -22,6 +22,7 @@
"generating ZIP-file, it may take some time." => "a gerar o ficheiro ZIP, poderá demorar algum tempo.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Não é possível fazer o envio do ficheiro devido a ser uma pasta ou ter 0 bytes",
"Upload Error" => "Erro no envio",
"Close" => "Fechar",
"Pending" => "Pendente",
"1 file uploading" => "A enviar 1 ficheiro",
"{count} files uploading" => "A carregar {count} ficheiros",

@ -17,6 +17,7 @@
"generating ZIP-file, it may take some time." => "se generază fișierul ZIP, va dura ceva timp.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Nu s-a putut încărca fișierul tău deoarece pare să fie un director sau are 0 bytes.",
"Upload Error" => "Eroare la încărcare",
"Close" => "Închide",
"Pending" => "În așteptare",
"1 file uploading" => "un fișier se încarcă",
"Upload cancelled." => "Încărcare anulată.",

@ -22,6 +22,7 @@
"generating ZIP-file, it may take some time." => "создание ZIP-файла, это может занять некоторое время.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Не удается загрузить файл размером 0 байт в каталог",
"Upload Error" => "Ошибка загрузки",
"Close" => "Закрыть",
"Pending" => "Ожидание",
"1 file uploading" => "загружается 1 файл",
"{count} files uploading" => "{count} файлов загружается",
@ -48,6 +49,7 @@
"New" => "Новый",
"Text file" => "Текстовый файл",
"Folder" => "Папка",
"From link" => "Из ссылки",
"Upload" => "Загрузить",
"Cancel upload" => "Отмена загрузки",
"Nothing in here. Upload something!" => "Здесь ничего нет. Загрузите что-нибудь!",

@ -22,6 +22,7 @@
"generating ZIP-file, it may take some time." => "Создание ZIP-файла, это может занять некоторое время.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Невозможно загрузить файл,\n так как он имеет нулевой размер или является директорией",
"Upload Error" => "Ошибка загрузки",
"Close" => "Закрыть",
"Pending" => "Ожидающий решения",
"1 file uploading" => "загрузка 1 файла",
"{count} files uploading" => "{количество} загружено файлов",

@ -1,6 +1,7 @@
<?php $TRANSLATIONS = array(
"There is no error, the file uploaded with success" => "නරද ව ගව උඩගත ක",
"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "php.ini හ upload_max_filesize නයමයට වඩ උඩගත කළ ගව වලය",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "උඩගත කළ ගලතවය HTML පරමයයම කළ ඇත MAX_FILE_SIZE වලතවයට වඩය",
"The uploaded file was only partially uploaded" => "උඩගත කළ ගටසක පමණක උඩගත වය",
"No file was uploaded" => "කනවක උඩගත න",
"Missing a temporary folder" => "තවකක ෆඩරයකගත නක",
@ -13,25 +14,38 @@
"suggest name" => "නමකජන කරනන",
"cancel" => "අත හරන",
"undo" => "නරභ කරනන",
"generating ZIP-file, it may take some time." => "ගවක පවත. කවක ගත වය හක",
"Upload Error" => "උඩගත කශයක",
"Close" => "වසනන",
"1 file uploading" => "1 ගවක උඩගත ක",
"Upload cancelled." => "උඩගත කම අත හරන ලද",
"File upload is in progress. Leaving the page now will cancel the upload." => "උඩගතකමක. පව හර ය එය නවත ඇත",
"Invalid name, '/' is not allowed." => "අවල නමක. '/' ට අවසර නත",
"error while scanning" => "පරෂයක",
"Name" => "නම",
"Size" => "පරමණය",
"Modified" => "වනස කළ",
"1 folder" => "1 ෆඩරයක",
"1 file" => "1 ගවක",
"File handling" => "ග පරහරණය",
"Maximum upload size" => "උඩගත කමක උපරම පරමණය",
"max. possible: " => "හ උපරමය:",
"Needed for multi-file and folder downloads." => "බහ-ගඩර බගත කමට අවශයය",
"Enable ZIP-download" => "ZIP-බගත ක සකය කරනන",
"0 is unlimited" => "0 යනවක බවය",
"Maximum input size for ZIP files" => "ZIP ග සඳහය හ උපරම වලතවය",
"Save" => "සරකන",
"New" => "නව",
"Text file" => "පළ ගව",
"Folder" => "ෆඩරය",
"From link" => "ය",
"Upload" => "උඩගත කම",
"Cancel upload" => "උඩගත කම අත හරන",
"Nothing in here. Upload something!" => "මවකත. යමක උඩගත කරනන",
"Share" => "බහදගනන",
"Download" => "බගත කම",
"Upload too large" => "උඩගත කම වල වය",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "ඔබ උඩගත කමට ත කරන ගම සයකය උඩගත කමට ඉඩද ඇත උපරම ගලතවයට වඩය"
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "ඔබ උඩගත කමට ත කරන ගම සයකය උඩගත කමට ඉඩද ඇත උපරම ගලතවයට වඩය",
"Files are being scanned, please wait." => "ග පර. මඳකන",
"Current scanning" => "වරතමන පරව"
);

@ -22,6 +22,7 @@
"generating ZIP-file, it may take some time." => "generujem ZIP-súbor, môže to chvíľu trvať.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Nemôžem nahrať súbor lebo je to priečinok alebo má 0 bajtov.",
"Upload Error" => "Chyba odosielania",
"Close" => "Zavrieť",
"Pending" => "Čaká sa",
"1 file uploading" => "1 súbor sa posiela ",
"{count} files uploading" => "{count} súborov odosielaných",

@ -20,6 +20,7 @@
"generating ZIP-file, it may take some time." => "Ustvarjanje datoteke ZIP. To lahko traja nekaj časa.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Pošiljanje ni mogoče, saj gre za mapo, ali pa je datoteka velikosti 0 bajtov.",
"Upload Error" => "Napaka med nalaganjem",
"Close" => "Zapri",
"Pending" => "V čakanju ...",
"1 file uploading" => "Pošiljanje 1 datoteke",
"Upload cancelled." => "Pošiljanje je preklicano.",

@ -5,19 +5,58 @@
"The uploaded file was only partially uploaded" => "Послати фајл је само делимично отпремљен!",
"No file was uploaded" => "Ниједан фајл није послат",
"Missing a temporary folder" => "Недостаје привремена фасцикла",
"Failed to write to disk" => "Није успело записивање на диск",
"Files" => "Фајлови",
"Unshare" => "Укини дељење",
"Delete" => "Обриши",
"Rename" => "Преименуј",
"{new_name} already exists" => "{new_name} већ постоји",
"replace" => "замени",
"suggest name" => "предложи назив",
"cancel" => "поништи",
"replaced {new_name}" => "замењена са {new_name}",
"undo" => "врати",
"replaced {new_name} with {old_name}" => "замењено {new_name} са {old_name}",
"unshared {files}" => "укинуто дељење над {files}",
"deleted {files}" => "обриши {files}",
"generating ZIP-file, it may take some time." => "генерисање ЗИП датотеке, потрајаће неко време.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Није могуће послати датотеку или зато што је директоријуму или јој је величина 0 бајта",
"Upload Error" => "Грешка у слању",
"Close" => "Затвори",
"Pending" => "На чекању",
"1 file uploading" => "1 датотека се шаље",
"{count} files uploading" => "Шаље се {count} датотека",
"Upload cancelled." => "Слање је прекинуто.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Слање датотеке је у току. Ако сада напустите страну слање ће бити прекинуто.",
"Invalid name, '/' is not allowed." => "Грешка у имену, '/' није дозвољено.",
"{count} files scanned" => "{count} датотека се скенира",
"error while scanning" => "грешка у скенирању",
"Name" => "Име",
"Size" => "Величина",
"Modified" => "Задња измена",
"1 folder" => "1 директоријум",
"{count} folders" => "{count} директоријума",
"1 file" => "1 датотека",
"{count} files" => "{count} датотека",
"File handling" => "Рад са датотекама",
"Maximum upload size" => "Максимална величина пошиљке",
"max. possible: " => "макс. величина:",
"Needed for multi-file and folder downloads." => "Неопходно за вишеструко преузимања датотека и директоријума.",
"Enable ZIP-download" => "Укључи преузимање у ЗИП-у",
"0 is unlimited" => "0 је неограничено",
"Maximum input size for ZIP files" => "Максимална величина ЗИП датотека",
"Save" => "Сними",
"New" => "Нови",
"Text file" => "текстуални фајл",
"Folder" => "фасцикла",
"From link" => "Са линка",
"Upload" => "Пошаљи",
"Cancel upload" => "Прекини слање",
"Nothing in here. Upload something!" => "Овде нема ничег. Пошаљите нешто!",
"Share" => "Дељење",
"Download" => "Преузми",
"Upload too large" => "Пошиљка је превелика",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Фајлови које желите да пошаљете превазилазе ограничење максималне величине пошиљке на овом серверу."
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Фајлови које желите да пошаљете превазилазе ограничење максималне величине пошиљке на овом серверу.",
"Files are being scanned, please wait." => "Скенирање датотека у току, молим вас сачекајте.",
"Current scanning" => "Тренутно се скенира"
);

@ -7,6 +7,7 @@
"Missing a temporary folder" => "Nedostaje privremena fascikla",
"Files" => "Fajlovi",
"Delete" => "Obriši",
"Close" => "Zatvori",
"Name" => "Ime",
"Size" => "Veličina",
"Modified" => "Zadnja izmena",

@ -22,6 +22,7 @@
"generating ZIP-file, it may take some time." => "genererar ZIP-fil, det kan ta lite tid.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Kunde inte ladda upp dina filer eftersom det antingen är en mapp eller har 0 bytes.",
"Upload Error" => "Uppladdningsfel",
"Close" => "Stäng",
"Pending" => "Väntar",
"1 file uploading" => "1 filuppladdning",
"{count} files uploading" => "{count} filer laddas upp",

@ -22,6 +22,7 @@
"generating ZIP-file, it may take some time." => " ZIP க உரகபபடிறத, இதில நரம ஆகல.",
"Unable to upload your file as it is a directory or has 0 bytes" => "அட அலலத 0 bytes ஐ களத உஙகளய க பதிற மியவி",
"Upload Error" => "பதிறல வழ",
"Close" => "மக",
"Pending" => "நிிள",
"1 file uploading" => "1 க பதிறபபடிறத",
"{count} files uploading" => "{எணி} ககள பதிறபபடிறத",

@ -22,6 +22,7 @@
"generating ZIP-file, it may take some time." => "กำลงสรางไฟลบอด ZIP อาจใชเวลาสกคร",
"Unable to upload your file as it is a directory or has 0 bytes" => "ไมสามารถอพโหลดไฟลของคณได เนองจากไฟลงกลาวเปนไดเรกทอรหรอมขนาด 0 ไบต",
"Upload Error" => "เกดขอผดพลาดในการอพโหลด",
"Close" => "ปด",
"Pending" => "อยระหวางดำเนนการ",
"1 file uploading" => "กำลงอพโหลดไฟล 1 ไฟล",
"{count} files uploading" => "กำลงอพโหลด {count} ไฟล",

@ -16,6 +16,7 @@
"generating ZIP-file, it may take some time." => "ZIP dosyası oluşturuluyor, biraz sürebilir.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Dosyanızın boyutu 0 byte olduğundan veya bir dizin olduğundan yüklenemedi",
"Upload Error" => "Yükleme hatası",
"Close" => "Kapat",
"Pending" => "Bekliyor",
"Upload cancelled." => "Yükleme iptal edildi.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Dosya yükleme işlemi sürüyor. Şimdi sayfadan ayrılırsanız işleminiz iptal olur.",

@ -12,6 +12,7 @@
"generating ZIP-file, it may take some time." => "Створення ZIP-файлу, це може зайняти певний час.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Неможливо завантажити ваш файл тому, що він тека або файл розміром 0 байт",
"Upload Error" => "Помилка завантаження",
"Close" => "Закрити",
"Pending" => "Очікування",
"Upload cancelled." => "Завантаження перервано.",
"Invalid name, '/' is not allowed." => "Некоректне ім'я, '/' не дозволено.",

@ -22,6 +22,7 @@
"generating ZIP-file, it may take some time." => "Tạo tập tinh ZIP, điều này có thể mất một ít thời gian",
"Unable to upload your file as it is a directory or has 0 bytes" => "Không thể tải lên tập tin này do nó là một thư mục hoặc kích thước tập tin bằng 0 byte",
"Upload Error" => "Tải lên lỗi",
"Close" => "Đóng",
"Pending" => "Chờ",
"1 file uploading" => "1 tệp tin đang được tải lên",
"{count} files uploading" => "{count} tập tin đang tải lên",
@ -48,6 +49,7 @@
"New" => "Mới",
"Text file" => "Tập tin văn bản",
"Folder" => "Folder",
"From link" => "Từ liên kết",
"Upload" => "Tải lên",
"Cancel upload" => "Hủy upload",
"Nothing in here. Upload something!" => "Không có gì ở đây .Hãy tải lên một cái gì đó !",

@ -10,22 +10,34 @@
"Unshare" => "取消共享",
"Delete" => "删除",
"Rename" => "重命名",
"{new_name} already exists" => "{new_name} 已存在",
"replace" => "替换",
"suggest name" => "推荐名称",
"cancel" => "取消",
"replaced {new_name}" => "已替换 {new_name}",
"undo" => "撤销",
"replaced {new_name} with {old_name}" => "已用 {old_name} 替换 {new_name}",
"unshared {files}" => "未分享的 {files}",
"deleted {files}" => "已删除的 {files}",
"generating ZIP-file, it may take some time." => "正在生成ZIP文件,这可能需要点时间",
"Unable to upload your file as it is a directory or has 0 bytes" => "不能上传你指定的文件,可能因为它是个文件夹或者大小为0",
"Upload Error" => "上传错误",
"Close" => "关闭",
"Pending" => "Pending",
"1 file uploading" => "1 个文件正在上传",
"{count} files uploading" => "{count} 个文件正在上传",
"Upload cancelled." => "上传取消了",
"File upload is in progress. Leaving the page now will cancel the upload." => "文件正在上传。关闭页面会取消上传。",
"Invalid name, '/' is not allowed." => "非法文件名,\"/\"是不被许可的",
"{count} files scanned" => "{count} 个文件已扫描",
"error while scanning" => "扫描出错",
"Name" => "名字",
"Size" => "大小",
"Modified" => "修改日期",
"1 folder" => "1 个文件夹",
"{count} folders" => "{count} 个文件夹",
"1 file" => "1 个文件",
"{count} files" => "{count} 个文件",
"File handling" => "文件处理中",
"Maximum upload size" => "最大上传大小",
"max. possible: " => "最大可能",
@ -37,6 +49,7 @@
"New" => "新建",
"Text file" => "文本文档",
"Folder" => "文件夹",
"From link" => "来自链接",
"Upload" => "上传",
"Cancel upload" => "取消上传",
"Nothing in here. Upload something!" => "这里没有东西.上传点什么!",

@ -22,6 +22,7 @@
"generating ZIP-file, it may take some time." => "正在生成 ZIP 文件,可能需要一些时间",
"Unable to upload your file as it is a directory or has 0 bytes" => "无法上传文件,因为它是一个目录或者大小为 0 字节",
"Upload Error" => "上传错误",
"Close" => "关闭",
"Pending" => "操作等待中",
"1 file uploading" => "1个文件上传中",
"{count} files uploading" => "{count} 个文件上传中",

@ -15,6 +15,7 @@
"generating ZIP-file, it may take some time." => "產生壓縮檔, 它可能需要一段時間.",
"Unable to upload your file as it is a directory or has 0 bytes" => "無法上傳您的檔案因為它可能是一個目錄或檔案大小為0",
"Upload Error" => "上傳發生錯誤",
"Close" => "關閉",
"Upload cancelled." => "上傳取消",
"File upload is in progress. Leaving the page now will cancel the upload." => "檔案上傳中. 離開此頁面將會取消上傳.",
"Invalid name, '/' is not allowed." => "無效的名稱, '/'是不被允許的",

@ -58,7 +58,7 @@
<th id="headerSize"><?php echo $l->t( 'Size' ); ?></th>
<th id="headerDate">
<span id="modified"><?php echo $l->t( 'Modified' ); ?></span>
<?php if ($_['permissions'] & OCP\Share::PERMISSION_DELETE): ?>
<?php if ($_['permissions'] & OCP\PERMISSION_DELETE): ?>
<!-- NOTE: Temporary fix to allow unsharing of files in root of Shared folder -->
<?php if ($_['dir'] == '/Shared'): ?>
<span class="selectedActions"><a href="" class="delete"><?php echo $l->t('Unshare')?> <img class="svg" alt="<?php echo $l->t('Unshare')?>" src="<?php echo OCP\image_path("core", "actions/delete.svg"); ?>" /></a></span>

@ -0,0 +1,6 @@
<?php $TRANSLATIONS = array(
"Encryption" => "التشفير",
"Exclude the following file types from encryption" => "استبعد أنواع الملفات التالية من التشفير",
"None" => "لا شيء",
"Enable Encryption" => "تفعيل التشفير"
);

@ -1,5 +1,6 @@
<?php $TRANSLATIONS = array(
"Encryption" => "رمزگذاری",
"Exclude the following file types from encryption" => "نادیده گرفتن فایل های زیر برای رمز گذاری",
"None" => "هیچکدام",
"Enable Encryption" => "فعال کردن رمزگذاری"
);

@ -3,6 +3,7 @@
"Error configuring Dropbox storage" => "Lỗi cấu hình lưu trữ Dropbox ",
"Grant access" => "Cấp quyền truy cập",
"Fill out all required fields" => "Điền vào tất cả các trường bắt buộc",
"Please provide a valid Dropbox app key and secret." => "Xin vui lòng cung cấp một ứng dụng Dropbox hợp lệ và mã bí mật.",
"Error configuring Google Drive storage" => "Lỗi cấu hình lưu trữ Google Drive",
"External Storage" => "Lưu trữ ngoài",
"Mount point" => "Điểm gắn",

@ -21,8 +21,8 @@ class FTP extends \OC\Files\Storage\StreamWrapper{
$this->host=$params['host'];
$this->user=$params['user'];
$this->password=$params['password'];
if(isset($params['secure'])){
if(is_string($params['secure'])){
if(isset($params['secure'])) {
if(is_string($params['secure'])) {
$this->secure = ($params['secure'] === 'true');
}else{
$this->secure = (bool)$params['secure'];

@ -274,8 +274,8 @@ class SWIFT extends \OC\Files\Storage\Common{
$this->host=$params['host'];
$this->user=$params['user'];
$this->root=isset($params['root'])?$params['root']:'/';
if(isset($params['secure'])){
if(is_string($params['secure'])){
if(isset($params['secure'])) {
if(is_string($params['secure'])) {
$this->secure = ($params['secure'] === 'true');
}else{
$this->secure = (bool)$params['secure'];

@ -30,8 +30,8 @@ class DAV extends \OC\Files\Storage\Common{
$this->host=$host;
$this->user=$params['user'];
$this->password=$params['password'];
if(isset($params['secure'])){
if(is_string($params['secure'])){
if(isset($params['secure'])) {
if(is_string($params['secure'])) {
$this->secure = ($params['secure'] === 'true');
}else{
$this->secure = (bool)$params['secure'];

@ -21,11 +21,11 @@ if (version_compare($installedVersion, '0.3', '<')) {
$itemType = 'file';
}
if ($row['permissions'] == 0) {
$permissions = OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_SHARE;
$permissions = OCP\PERMISSION_READ | OCP\PERMISSION_SHARE;
} else {
$permissions = OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE | OCP\Share::PERMISSION_SHARE;
$permissions = OCP\PERMISSION_READ | OCP\PERMISSION_UPDATE | OCP\PERMISSION_SHARE;
if ($itemType == 'folder') {
$permissions |= OCP\Share::PERMISSION_CREATE;
$permissions |= OCP\PERMISSION_CREATE;
}
}
$pos = strrpos($row['uid_shared_with'], '@');

@ -97,10 +97,10 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
$file['permissions'] = $item['permissions'];
if ($file['type'] == 'file') {
// Remove Create permission if type is file
$file['permissions'] &= ~OCP\Share::PERMISSION_CREATE;
$file['permissions'] &= ~OCP\PERMISSION_CREATE;
}
// NOTE: Temporary fix to allow unsharing of files in root of Shared directory
$file['permissions'] |= OCP\Share::PERMISSION_DELETE;
$file['permissions'] |= OCP\PERMISSION_DELETE;
$files[] = $file;
}
return $files;
@ -113,7 +113,7 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
}
$size += $item['size'];
}
return array(0 => array('id' => -1, 'name' => 'Shared', 'mtime' => $mtime, 'mimetype' => 'httpd/unix-directory', 'size' => $size, 'writable' => false, 'type' => 'dir', 'directory' => '', 'permissions' => OCP\Share::PERMISSION_READ));
return array(0 => array('id' => -1, 'name' => 'Shared', 'mtime' => $mtime, 'mimetype' => 'httpd/unix-directory', 'size' => $size, 'writable' => false, 'type' => 'dir', 'directory' => '', 'permissions' => OCP\PERMISSION_READ));
} else if ($format == self::FORMAT_OPENDIR) {
$files = array();
foreach ($items as $item) {

@ -41,7 +41,7 @@ class OC_Share_Backend_Folder extends OC_Share_Backend_File implements OCP\Share
$file['permissions'] = $folder['permissions'];
if ($file['type'] == 'file') {
// Remove Create permission if type is file
$file['permissions'] &= ~OCP\Share::PERMISSION_CREATE;
$file['permissions'] &= ~OCP\PERMISSION_CREATE;
}
}
return $files;

@ -191,7 +191,7 @@ class Shared extends \OC\Files\Storage\Common {
if ($path == '') {
return false;
}
return ($this->getPermissions($path) & \OCP\Share::PERMISSION_CREATE);
return ($this->getPermissions($path) & OCP\PERMISSION_CREATE);
}
public function isReadable($path) {
@ -202,21 +202,21 @@ class Shared extends \OC\Files\Storage\Common {
if ($path == '') {
return false;
}
return ($this->getPermissions($path) & \OCP\Share::PERMISSION_UPDATE);
return ($this->getPermissions($path) & OCP\PERMISSION_UPDATE);
}
public function isDeletable($path) {
if ($path == '') {
return true;
}
return ($this->getPermissions($path) & \OCP\Share::PERMISSION_DELETE);
return ($this->getPermissions($path) & OCP\PERMISSION_DELETE);
}
public function isSharable($path) {
if ($path == '') {
return false;
}
return ($this->getPermissions($path) & \OCP\Share::PERMISSION_SHARE);
return ($this->getPermissions($path) & OCP\PERMISSION_SHARE);
}
public function file_exists($path) {

@ -150,7 +150,7 @@ if (isset($_GET['file']) || isset($_GET['dir'])) {
if ($i['directory'] == '/') {
$i['directory'] = '';
}
$i['permissions'] = OCP\Share::PERMISSION_READ;
$i['permissions'] = OCP\PERMISSION_READ;
$files[] = $i;
}
// Make breadcrumb

@ -0,0 +1,37 @@
<?php $TRANSLATIONS = array(
"Host" => "Host",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Je kunt het protocol weglaten, tenzij je SSL vereist. Start in dat geval met ldaps://",
"Base DN" => "Basis DN",
"You can specify Base DN for users and groups in the Advanced tab" => "Je kunt het standaard DN voor gebruikers en groepen specificeren in het tab Geavanceerd.",
"User DN" => "Gebruikers DN",
"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "De DN van de client gebruiker waarmee de verbinding zal worden gemaakt, bijv. uid=agent,dc=example,dc=com. Voor anonieme toegang laat je het DN en het wachtwoord leeg.",
"Password" => "Wachtwoord",
"For anonymous access, leave DN and Password empty." => "Voor anonieme toegang, laat de DN en het wachtwoord leeg.",
"User Login Filter" => "Gebruikers Login Filter",
"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Definiëerd de toe te passen filter indien er geprobeerd wordt in te loggen. %%uid vervangt de gebruikersnaam in de login actie.",
"use %%uid placeholder, e.g. \"uid=%%uid\"" => "gebruik %%uid placeholder, bijv. \"uid=%%uid\"",
"User List Filter" => "Gebruikers Lijst Filter",
"Defines the filter to apply, when retrieving users." => "Definiëerd de toe te passen filter voor het ophalen van gebruikers.",
"without any placeholder, e.g. \"objectClass=person\"." => "zonder een placeholder, bijv. \"objectClass=person\"",
"Group Filter" => "Groep Filter",
"Defines the filter to apply, when retrieving groups." => "Definiëerd de toe te passen filter voor het ophalen van groepen.",
"without any placeholder, e.g. \"objectClass=posixGroup\"." => "zonder een placeholder, bijv. \"objectClass=posixGroup\"",
"Port" => "Poort",
"Base User Tree" => "Basis Gebruikers Structuur",
"Base Group Tree" => "Basis Groupen Structuur",
"Group-Member association" => "Groepslid associatie",
"Use TLS" => "Gebruik TLS",
"Do not use it for SSL connections, it will fail." => "Gebruik niet voor SSL connecties, deze mislukken.",
"Case insensitve LDAP server (Windows)" => "Niet-hoofdlettergevoelige LDAP server (Windows)",
"Turn off SSL certificate validation." => "Schakel SSL certificaat validatie uit.",
"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Als de connectie alleen werkt met deze optie, importeer dan het LDAP server SSL certificaat naar je ownCloud server.",
"Not recommended, use for testing only." => "Niet aangeraden, gebruik alleen voor test doeleinden.",
"User Display Name Field" => "Gebruikers Schermnaam Veld",
"The LDAP attribute to use to generate the user`s ownCloud name." => "Het te gebruiken LDAP attribuut voor het genereren van de ownCloud naam voor de gebruikers.",
"Group Display Name Field" => "Groep Schermnaam Veld",
"The LDAP attribute to use to generate the groups`s ownCloud name." => "Het te gebruiken LDAP attribuut voor het genereren van de ownCloud naam voor de groepen.",
"in bytes" => "in bytes",
"in seconds. A change empties the cache." => "in seconden. Een verandering maakt de cache leeg.",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Laat leeg voor de gebruikersnaam (standaard). Of, specificeer een LDAP/AD attribuut.",
"Help" => "Help"
);

@ -1,13 +1,37 @@
<?php $TRANSLATIONS = array(
"Host" => "Máy chủ",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Bạn có thể bỏ qua các giao thức, ngoại trừ SSL. Sau đó bắt đầu với ldaps://",
"Base DN" => "DN cơ bản",
"You can specify Base DN for users and groups in the Advanced tab" => "Bạn có thể chỉ định DN cơ bản cho người dùng và các nhóm trong tab Advanced",
"User DN" => "Người dùng DN",
"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "Các DN của người sử dụng đã được thực hiện, ví dụ như uid =agent , dc = example, dc = com. Để truy cập nặc danh ,DN và mật khẩu trống.",
"Password" => "Mật khẩu",
"For anonymous access, leave DN and Password empty." => "Cho phép truy cập nặc danh , DN và mật khẩu trống.",
"User Login Filter" => "Lọc người dùng đăng nhập",
"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Xác định các bộ lọc để áp dụng, khi đăng nhập . uid%% thay thế tên người dùng trong các lần đăng nhập.",
"use %%uid placeholder, e.g. \"uid=%%uid\"" => "use %%uid placeholder, e.g. \"uid=%%uid\"",
"User List Filter" => "Lọc danh sách thành viên",
"Defines the filter to apply, when retrieving users." => "Xác định các bộ lọc để áp dụng, khi người dụng sử dụng.",
"without any placeholder, e.g. \"objectClass=person\"." => "mà không giữ chỗ nào, ví dụ như \"objectClass = person\".",
"Group Filter" => "Bộ lọc nhóm",
"Defines the filter to apply, when retrieving groups." => "Xác định các bộ lọc để áp dụng, khi nhóm sử dụng.",
"without any placeholder, e.g. \"objectClass=posixGroup\"." => "mà không giữ chỗ nào, ví dụ như \"objectClass = osixGroup\".",
"Port" => "Cổng",
"Base User Tree" => "Cây người dùng cơ bản",
"Base Group Tree" => "Cây nhóm cơ bản",
"Group-Member association" => "Nhóm thành viên Cộng đồng",
"Use TLS" => "Sử dụng TLS",
"Do not use it for SSL connections, it will fail." => "Kết nối SSL bị lỗi. ",
"Case insensitve LDAP server (Windows)" => "Trường hợp insensitve LDAP máy chủ (Windows)",
"Turn off SSL certificate validation." => "Tắt xác thực chứng nhận SSL",
"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Nếu kết nối chỉ hoạt động với tùy chọn này, vui lòng import LDAP certificate SSL trong máy chủ ownCloud của bạn.",
"Not recommended, use for testing only." => "Không khuyến khích, Chỉ sử dụng để thử nghiệm.",
"User Display Name Field" => "Hiển thị tên người sử dụng",
"The LDAP attribute to use to generate the user`s ownCloud name." => "Các thuộc tính LDAP sử dụng để tạo tên người dùng ownCloud.",
"Group Display Name Field" => "Hiển thị tên nhóm",
"The LDAP attribute to use to generate the groups`s ownCloud name." => "Các thuộc tính LDAP sử dụng để tạo các nhóm ownCloud.",
"in bytes" => "Theo Byte",
"in seconds. A change empties the cache." => "trong vài giây. Một sự thay đổi bộ nhớ cache.",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Để trống tên người dùng (mặc định). Nếu không chỉ định thuộc tính LDAP/AD",
"Help" => "Giúp đỡ"
);

@ -79,7 +79,13 @@ abstract class Access {
if(isset($result[$attr]) && $result[$attr]['count'] > 0) {
$values = array();
for($i=0;$i<$result[$attr]['count'];$i++) {
$values[] = $this->resemblesDN($attr) ? $this->sanitizeDN($result[$attr][$i]) : $result[$attr][$i];
if($this->resemblesDN($attr)) {
$values[] = $this->sanitizeDN($result[$attr][$i]);
} elseif(strtolower($attr) == 'objectguid') {
$values[] = $this->convertObjectGUID2Str($result[$attr][$i]);
} else {
$values[] = $result[$attr][$i];
}
}
return $values;
}
@ -729,6 +735,34 @@ abstract class Access {
return $uuid;
}
/**
* @brief converts a binary ObjectGUID into a string representation
* @param $oguid the ObjectGUID in it's binary form as retrieved from AD
* @returns String
*
* converts a binary ObjectGUID into a string representation
* http://www.php.net/manual/en/function.ldap-get-values-len.php#73198
*/
private function convertObjectGUID2Str($oguid) {
$hex_guid = bin2hex($oguid);
$hex_guid_to_guid_str = '';
for($k = 1; $k <= 4; ++$k) {
$hex_guid_to_guid_str .= substr($hex_guid, 8 - 2 * $k, 2);
}
$hex_guid_to_guid_str .= '-';
for($k = 1; $k <= 2; ++$k) {
$hex_guid_to_guid_str .= substr($hex_guid, 12 - 2 * $k, 2);
}
$hex_guid_to_guid_str .= '-';
for($k = 1; $k <= 2; ++$k) {
$hex_guid_to_guid_str .= substr($hex_guid, 16 - 2 * $k, 2);
}
$hex_guid_to_guid_str .= '-' . substr($hex_guid, 16, 4);
$hex_guid_to_guid_str .= '-' . substr($hex_guid, 20);
return strtoupper($hex_guid_to_guid_str);
}
/**
* @brief get a cookie for the next LDAP paged search
* @param $filter the search filter to identify the correct search

@ -0,0 +1,3 @@
<?php $TRANSLATIONS = array(
"WebDAV URL: http://" => "WebDAV URL: http://"
);

@ -0,0 +1,3 @@
<?php $TRANSLATIONS = array(
"WebDAV URL: http://" => "Adreça WebDAV: http://"
);

@ -0,0 +1,3 @@
<?php $TRANSLATIONS = array(
"WebDAV URL: http://" => "URL WebDAV: http://"
);

@ -0,0 +1,3 @@
<?php $TRANSLATIONS = array(
"WebDAV URL: http://" => "WebDAV URL: http://"
);

@ -0,0 +1,3 @@
<?php $TRANSLATIONS = array(
"WebDAV URL: http://" => "WebDAV URL: http://"
);

@ -0,0 +1,3 @@
<?php $TRANSLATIONS = array(
"WebDAV URL: http://" => "WebDAV URL: http://"
);

@ -0,0 +1,3 @@
<?php $TRANSLATIONS = array(
"WebDAV URL: http://" => "WebDAV URL: http://"
);

@ -0,0 +1,3 @@
<?php $TRANSLATIONS = array(
"WebDAV URL: http://" => "URL de WebDAV: http://"
);

@ -0,0 +1,3 @@
<?php $TRANSLATIONS = array(
"WebDAV URL: http://" => "WebDAV-osoite: http://"
);

@ -0,0 +1,3 @@
<?php $TRANSLATIONS = array(
"WebDAV URL: http://" => "URL WebDAV: http://"
);

@ -0,0 +1,3 @@
<?php $TRANSLATIONS = array(
"WebDAV URL: http://" => "WebDAV URL: http://"
);

@ -0,0 +1,3 @@
<?php $TRANSLATIONS = array(
"WebDAV URL: http://" => "WebDAV URL: http://"
);

@ -0,0 +1,3 @@
<?php $TRANSLATIONS = array(
"WebDAV URL: http://" => "WebDAV URL: http://"
);

@ -0,0 +1,3 @@
<?php $TRANSLATIONS = array(
"WebDAV URL: http://" => "URL do WebDAV: http://"
);

@ -0,0 +1,3 @@
<?php $TRANSLATIONS = array(
"WebDAV URL: http://" => "Endereço WebDAV: http://"
);

@ -0,0 +1,3 @@
<?php $TRANSLATIONS = array(
"WebDAV URL: http://" => "WebDAV URL: http://"
);

@ -0,0 +1,3 @@
<?php $TRANSLATIONS = array(
"WebDAV URL: http://" => "WebDAV URL: http://"
);

@ -0,0 +1,3 @@
<?php $TRANSLATIONS = array(
"WebDAV URL: http://" => "WebDAV යව: http://"
);

@ -0,0 +1,3 @@
<?php $TRANSLATIONS = array(
"WebDAV URL: http://" => "WebDAV URL: http://"
);

@ -0,0 +1,3 @@
<?php $TRANSLATIONS = array(
"WebDAV URL: http://" => "WebDAV URL: http://"
);

@ -14,23 +14,25 @@ function debug($msg) {
OC_Log::write('core', 'ajax/vcategories/add.php: '.$msg, OC_Log::DEBUG);
}
OC_JSON::checkLoggedIn();
$category = isset($_GET['category'])?strip_tags($_GET['category']):null;
$app = isset($_GET['app'])?$_GET['app']:null;
OCP\JSON::checkLoggedIn();
OCP\JSON::callCheck();
if(is_null($app)) {
bailOut(OC_Contacts_App::$l10n->t('Application name not provided.'));
}
$l = OC_L10N::get('core');
$category = isset($_POST['category']) ? strip_tags($_POST['category']) : null;
$type = isset($_POST['type']) ? $_POST['type'] : null;
OC_JSON::checkAppEnabled($app);
if(is_null($type)) {
bailOut($l->t('Category type not provided.'));
}
if(is_null($category)) {
bailOut(OC_Contacts_App::$l10n->t('No category to add?'));
bailOut($l->t('No category to add?'));
}
debug(print_r($category, true));
$categories = new OC_VCategories($app);
$categories = new OC_VCategories($type);
if($categories->hasCategory($category)) {
bailOut(OC_Contacts_App::$l10n->t('This category already exists: '.$category));
} else {

@ -0,0 +1,38 @@
<?php
/**
* Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net>
* This file is licensed under the Affero General Public License version 3 or
* later.
* See the COPYING-README file.
*/
function bailOut($msg) {
OC_JSON::error(array('data' => array('message' => $msg)));
OC_Log::write('core', 'ajax/vcategories/addToFavorites.php: '.$msg, OC_Log::DEBUG);
exit();
}
function debug($msg) {
OC_Log::write('core', 'ajax/vcategories/addToFavorites.php: '.$msg, OC_Log::DEBUG);
}
OCP\JSON::checkLoggedIn();
OCP\JSON::callCheck();
$l = OC_L10N::get('core');
$id = isset($_POST['id']) ? strip_tags($_POST['id']) : null;
$type = isset($_POST['type']) ? $_POST['type'] : null;
if(is_null($type)) {
bailOut($l->t('Object type not provided.'));
}
if(is_null($id)) {
bailOut($l->t('%s ID not provided.', $type));
}
$categories = new OC_VCategories($type);
if(!$categories->addToFavorites($id, $type)) {
bailOut($l->t('Error adding %s to favorites.', $id));
}
OC_JSON::success();

@ -15,21 +15,26 @@ function debug($msg) {
OC_Log::write('core', 'ajax/vcategories/delete.php: '.$msg, OC_Log::DEBUG);
}
OC_JSON::checkLoggedIn();
$app = isset($_POST['app'])?$_POST['app']:null;
$categories = isset($_POST['categories'])?$_POST['categories']:null;
if(is_null($app)) {
bailOut(OC_Contacts_App::$l10n->t('Application name not provided.'));
}
OCP\JSON::checkLoggedIn();
OCP\JSON::callCheck();
$l = OC_L10N::get('core');
OC_JSON::checkAppEnabled($app);
$type = isset($_POST['type']) ? $_POST['type'] : null;
$categories = isset($_POST['categories']) ? $_POST['categories'] : null;
if(is_null($type)) {
bailOut($l->t('Object type not provided.'));
}
debug('The application "'.$app.'" uses the default file. OC_VObjects will not be updated.');
debug('The application using category type "'
. $type
. '" uses the default file for deletion. OC_VObjects will not be updated.');
if(is_null($categories)) {
bailOut('No categories selected for deletion.');
bailOut($l->t('No categories selected for deletion.'));
}
$vcategories = new OC_VCategories($app);
$vcategories = new OC_VCategories($type);
$vcategories->delete($categories);
OC_JSON::success(array('data' => array('categories'=>$vcategories->categories())));

@ -16,16 +16,18 @@ function debug($msg) {
}
OC_JSON::checkLoggedIn();
$app = isset($_GET['app'])?$_GET['app']:null;
if(is_null($app)) {
bailOut('Application name not provided.');
$l = OC_L10N::get('core');
$type = isset($_GET['type']) ? $_GET['type'] : null;
if(is_null($type)) {
bailOut($l->t('Category type not provided.'));
}
OC_JSON::checkAppEnabled($app);
$tmpl = new OC_TEMPLATE("core", "edit_categories_dialog");
$tmpl = new OCP\Template("core", "edit_categories_dialog");
$vcategories = new OC_VCategories($app);
$vcategories = new OC_VCategories($type);
$categories = $vcategories->categories();
debug(print_r($categories, true));
$tmpl->assign('categories', $categories);

@ -0,0 +1,30 @@
<?php
/**
* Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net>
* This file is licensed under the Affero General Public License version 3 or
* later.
* See the COPYING-README file.
*/
function bailOut($msg) {
OC_JSON::error(array('data' => array('message' => $msg)));
OC_Log::write('core', 'ajax/vcategories/addToFavorites.php: '.$msg, OC_Log::DEBUG);
exit();
}
function debug($msg) {
OC_Log::write('core', 'ajax/vcategories/addToFavorites.php: '.$msg, OC_Log::DEBUG);
}
OCP\JSON::checkLoggedIn();
OCP\JSON::callCheck();
$type = isset($_GET['type']) ? $_GET['type'] : null;
if(is_null($type)) {
$l = OC_L10N::get('core');
bailOut($l->t('Object type not provided.'));
}
$categories = new OC_VCategories($type);
$ids = $categories->getFavorites($type);
OC_JSON::success(array('ids' => $ids));

@ -0,0 +1,38 @@
<?php
/**
* Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net>
* This file is licensed under the Affero General Public License version 3 or
* later.
* See the COPYING-README file.
*/
function bailOut($msg) {
OC_JSON::error(array('data' => array('message' => $msg)));
OC_Log::write('core', 'ajax/vcategories/removeFromFavorites.php: '.$msg, OC_Log::DEBUG);
exit();
}
function debug($msg) {
OC_Log::write('core', 'ajax/vcategories/removeFromFavorites.php: '.$msg, OC_Log::DEBUG);
}
OCP\JSON::checkLoggedIn();
OCP\JSON::callCheck();
$l = OC_L10N::get('core');
$id = isset($_POST['id']) ? strip_tags($_POST['id']) : null;
$type = isset($_POST['type']) ? $_POST['type'] : null;
if(is_null($type)) {
bailOut($l->t('Object type not provided.'));
}
if(is_null($id)) {
bailOut($l->t('%s ID not provided.', $type));
}
$categories = new OC_VCategories($type);
if(!$categories->removeFromFavorites($id, $type)) {
bailOut($l->t('Error removing %s from favorites.', $id));
}
OC_JSON::success();

@ -641,7 +641,7 @@ if (!Array.prototype.map){
/**
* Filter Jquery selector by attribute value
**/
*/
$.fn.filterAttr = function(attr_name, attr_value) {
return this.filter(function() { return $(this).attr(attr_name) === attr_value; });
};
@ -675,7 +675,8 @@ function formatDate(date){
return $.datepicker.formatDate(datepickerFormatDate, date)+' '+date.getHours()+':'+((date.getMinutes()<10)?'0':'')+date.getMinutes();
}
/* takes an absolute timestamp and return a string with a human-friendly relative date
/**
* takes an absolute timestamp and return a string with a human-friendly relative date
* @param int a Unix timestamp
*/
function relative_modified_date(timestamp) {
@ -687,14 +688,14 @@ function relative_modified_date(timestamp) {
if(timediff < 60) { return t('core','seconds ago'); }
else if(timediff < 120) { return t('core','1 minute ago'); }
else if(timediff < 3600) { return t('core','{minutes} minutes ago',{minutes: diffminutes}); }
//else if($timediff < 7200) { return '1 hour ago'; }
//else if($timediff < 86400) { return $diffhours.' hours ago'; }
else if(timediff < 7200) { return t('core','1 hour ago'); }
else if(timediff < 86400) { return t('core','{hours} hours ago',{hours: diffhours}); }
else if(timediff < 86400) { return t('core','today'); }
else if(timediff < 172800) { return t('core','yesterday'); }
else if(timediff < 2678400) { return t('core','{days} days ago',{days: diffdays}); }
else if(timediff < 5184000) { return t('core','last month'); }
//else if($timediff < 31556926) { return $diffmonths.' months ago'; }
else if(timediff < 31556926) { return t('core','months ago'); }
else if(timediff < 31556926) { return t('core','{months} months ago',{months: diffmonths}); }
//else if(timediff < 31556926) { return t('core','months ago'); }
else if(timediff < 63113852) { return t('core','last year'); }
else { return t('core','years ago'); }
}

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save