From e8897c2b7e3a392f193e3e53dbbeb8178f5c2078 Mon Sep 17 00:00:00 2001
From: Thomas Mueller
Date: Wed, 12 Dec 2012 12:55:29 +0100
Subject: [PATCH 01/58] prevent keyboardshortcuts from catching events outside
the main doc - e.g. the share popup
---
apps/files/js/keyboardshortcuts.js | 3 +++
1 file changed, 3 insertions(+)
diff --git a/apps/files/js/keyboardshortcuts.js b/apps/files/js/keyboardshortcuts.js
index 562755f55b..cc2b5d4213 100644
--- a/apps/files/js/keyboardshortcuts.js
+++ b/apps/files/js/keyboardshortcuts.js
@@ -127,6 +127,9 @@ var Files = Files || {};
}
Files.bindKeyboardShortcuts = function(document, $) {
$(document).keydown(function(event) { //check for modifier keys
+ if(!$(event.target).is('body')) {
+ return;
+ }
var preventDefault = false;
if ($.inArray(event.keyCode, keys) === -1) keys.push(event.keyCode);
if (
From 4265419bbd1bae1fb62e7f07b6ef46cd60d1325f Mon Sep 17 00:00:00 2001
From: Frank Karlitschek
Date: Wed, 12 Dec 2012 16:27:37 +0100
Subject: [PATCH 02/58] Try to fix #836
https://github.com/owncloud/core/issues/836
---
lib/MDB2/Driver/sqlite3.php | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/lib/MDB2/Driver/sqlite3.php b/lib/MDB2/Driver/sqlite3.php
index fa4c91c126..9839dafbce 100644
--- a/lib/MDB2/Driver/sqlite3.php
+++ b/lib/MDB2/Driver/sqlite3.php
@@ -98,8 +98,7 @@ class MDB2_Driver_sqlite3 extends MDB2_Driver_Common
if ($this->connection) {
$native_code = $this->connection->lastErrorCode();
}
- $native_msg = $this->_lasterror
- ? html_entity_decode($this->_lasterror) : $this->connection->lastErrorMsg();
+ $native_msg = html_entity_decode($this->_lasterror);
// PHP 5.2+ prepends the function name to $php_errormsg, so we need
// this hack to work around it, per bug #9599.
From f85106b6b5d2e37ebf4cb850a076c4bb67f2a735 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek
Date: Wed, 12 Dec 2012 22:41:12 +0100
Subject: [PATCH 03/58] first version of the new documentation system
integration.
---
core/docu/admin/index.php | 1 +
core/docu/user/index.php | 3 ++
settings/help.php | 22 +++++++------
settings/templates/help.php | 62 +++++++++++++++++--------------------
4 files changed, 46 insertions(+), 42 deletions(-)
create mode 100644 core/docu/admin/index.php
create mode 100644 core/docu/user/index.php
diff --git a/core/docu/admin/index.php b/core/docu/admin/index.php
new file mode 100644
index 0000000000..3f75499808
--- /dev/null
+++ b/core/docu/admin/index.php
@@ -0,0 +1 @@
+here goes the admin documentation
diff --git a/core/docu/user/index.php b/core/docu/user/index.php
new file mode 100644
index 0000000000..dc167c01bd
--- /dev/null
+++ b/core/docu/user/index.php
@@ -0,0 +1,3 @@
+here goes the user documentation
+
+
diff --git a/settings/help.php b/settings/help.php
index 69a5ec9c14..6f99596b2b 100644
--- a/settings/help.php
+++ b/settings/help.php
@@ -12,15 +12,19 @@ OC_App::loadApps();
OC_Util::addStyle( "settings", "settings" );
OC_App::setActiveNavigationEntry( "help" );
-$pagesize=7;
-if(isset($_GET['page'])) $page=$_GET['page']; else $page=0;
-$kbe=OC_OCSClient::getKnownledgebaseEntries($page, $pagesize);
-$totalitems=$kbe['totalitems'];
-unset($kbe['totalitems']);
-$pagecount=ceil($totalitems/$pagesize);
+
+if(isset($_GET['mode']) and $_GET['mode']=='admin') {
+ $url=OC_Helper::linkToAbsolute( 'core', 'docu/admin' );
+}else{
+ $url=OC_Helper::linkToAbsolute( 'core', 'docu/user' );
+}
+
+$url1=OC_Helper::linkToRoute( "settings_help" ).'?mode=user';
+$url2=OC_Helper::linkToRoute( "settings_help" ).'?mode=admin';
$tmpl = new OC_Template( "settings", "help", "user" );
-$tmpl->assign( "kbe", $kbe );
-$tmpl->assign( "pagecount", $pagecount );
-$tmpl->assign( "page", $page );
+$tmpl->assign( "admin", OC_Group::inGroup(OC_User::getUser(), 'admin') );
+$tmpl->assign( "url", $url );
+$tmpl->assign( "url1", $url1 );
+$tmpl->assign( "url2", $url2 );
$tmpl->printPage();
diff --git a/settings/templates/help.php b/settings/templates/help.php
index 75201a86a9..5ed99420cf 100644
--- a/settings/templates/help.php
+++ b/settings/templates/help.php
@@ -1,34 +1,30 @@
-
-
-
-
-
-
-
- "") echo('
'); ?>
- '') echo('
'.$kb["name"].'
');?>
-
- '') echo('
'.$l->t('Answer').':
'.$kb['answer'].'
');?>
-
-
+ t( 'User Documentation' ); ?>
+ t( 'Administrator Documentation' ); ?>
+ t( 'Online Documentation' ); ?>
+ t( 'Forum' ); ?>
+ t( 'Bugtracker' ); ?>
+
+
+
+
+
+
From 89bbabd77bac2d21739b232e6315f2f09b9c9b56 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek
Date: Thu, 13 Dec 2012 09:26:25 +0100
Subject: [PATCH 04/58] a bit more polish. We are getting there.
---
settings/css/settings.css | 3 +++
settings/help.php | 6 ++++++
settings/templates/help.php | 5 +++--
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 560862fa12..3645748191 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -68,3 +68,6 @@ span.securitywarning {color:#C33; font-weight:bold; }
span.connectionwarning {color:#933; font-weight:bold; }
input[type=radio] { width:1em; }
table.shareAPI td { padding-bottom: 0.8em; }
+
+/* HELP */
+.pressed {background-color:#DDD;}
diff --git a/settings/help.php b/settings/help.php
index 6f99596b2b..cdf0c549e4 100644
--- a/settings/help.php
+++ b/settings/help.php
@@ -15,8 +15,12 @@ OC_App::setActiveNavigationEntry( "help" );
if(isset($_GET['mode']) and $_GET['mode']=='admin') {
$url=OC_Helper::linkToAbsolute( 'core', 'docu/admin' );
+ $style1='';
+ $style2=' pressed';
}else{
$url=OC_Helper::linkToAbsolute( 'core', 'docu/user' );
+ $style1=' pressed';
+ $style2='';
}
$url1=OC_Helper::linkToRoute( "settings_help" ).'?mode=user';
@@ -27,4 +31,6 @@ $tmpl->assign( "admin", OC_Group::inGroup(OC_User::getUser(), 'admin') );
$tmpl->assign( "url", $url );
$tmpl->assign( "url1", $url1 );
$tmpl->assign( "url2", $url2 );
+$tmpl->assign( "style1", $style1 );
+$tmpl->assign( "style2", $style2 );
$tmpl->printPage();
diff --git a/settings/templates/help.php b/settings/templates/help.php
index 5ed99420cf..06f53746c2 100644
--- a/settings/templates/help.php
+++ b/settings/templates/help.php
@@ -1,9 +1,10 @@
From 2330d6bcc7a178d15b74eb8352f86e778afd717d Mon Sep 17 00:00:00 2001
From: Frank Karlitschek
Date: Thu, 13 Dec 2012 11:08:12 +0100
Subject: [PATCH 05/58] =?UTF-8?q?show=20the=20link=20to=20the=20issue=20tr?=
=?UTF-8?q?acker=20only=20for=20Admins=20as=20discussed=20with=20Bj=C3=B6r?=
=?UTF-8?q?n=20and=20Jan.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
settings/templates/help.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/settings/templates/help.php b/settings/templates/help.php
index 06f53746c2..473219024b 100644
--- a/settings/templates/help.php
+++ b/settings/templates/help.php
@@ -3,7 +3,7 @@
t( 'Administrator Documentation' ); ?>
t( 'Online Documentation' ); ?>
t( 'Forum' ); ?>
- t( 'Bugtracker' ); ?>
+ t( 'Bugtracker' ); ?>
t( 'Commercial Support' ); ?>
From 316a29f7ac09d71cfedc4bea5be892b56e27433f Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt
Date: Thu, 13 Dec 2012 19:04:27 +0100
Subject: [PATCH 06/58] fix new button popup looking blurry
---
apps/files/css/files.css | 8 ++++----
apps/files/templates/index.php | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index afc72916e0..59aa4dbf0f 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -12,16 +12,16 @@
#new.active { border-bottom-left-radius:0; border-bottom-right-radius:0; border-bottom:none; }
#new>a { padding:.5em 1.2em .3em; }
#new>ul {
- display:none; position:fixed; min-width:7em; z-index:-1;
- padding:.5em; margin-top:0.075em; margin-left:-.5em;
+ display:none; position:fixed; min-width:7em; z-index:10;
+ padding:.5em; padding-bottom:0; margin-top:.075em; margin-left:-.5em;
text-align:left;
- background:#f8f8f8; border:1px solid #ddd;
+ background:#f8f8f8; border:1px solid #ddd; border-radius:10px; border-top-left-radius:0;
+ box-shadow:0 2px 7px rgba(170,170,170,.4);
}
#new>ul>li { height:20px; margin:.3em; padding-left:2em; padding-bottom:0.1em;
background-repeat:no-repeat; cursor:pointer; }
#new>ul>li>p { cursor:pointer; }
#new>ul>li>input { padding:0.3em; margin:-0.3em; }
-#new .popup { border-top-left-radius:0; z-index:10; }
#upload {
height:27px; padding:0; margin-left:0.2em; overflow:hidden;
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index bd34c9a76d..edf048c7e1 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -5,7 +5,7 @@
-
+
-
- WebDAV
+
+ t('Use this address to connect to your ownCloud in your file manager');?>
+
-
+
From 03f4250ce6f8981dd576cadd68365a360234d879 Mon Sep 17 00:00:00 2001
From: Thomas Mueller
Date: Sat, 15 Dec 2012 21:03:32 +0100
Subject: [PATCH 19/58] Migration of build files from Jenkins
---
build/README.TXT | 28 ++++++++
build/build.xml | 179 +++++++++++++++++++++++++++++++++++++++++++++++
build/phpcs.xml | 80 +++++++++++++++++++++
build/phpmd.xml | 9 +++
4 files changed, 296 insertions(+)
create mode 100644 build/README.TXT
create mode 100644 build/build.xml
create mode 100644 build/phpcs.xml
create mode 100644 build/phpmd.xml
diff --git a/build/README.TXT b/build/README.TXT
new file mode 100644
index 0000000000..128571058d
--- /dev/null
+++ b/build/README.TXT
@@ -0,0 +1,28 @@
+How to setup build.xml on your local machine?
+
+1.) Install ant
+ e.g. apt-get install ant
+
+2.) Install jslint
+ Get the latest distribution from http://code.google.com/p/jslint4java/ and
+ place jslint4java-*.jar in your home under .ant/lib/
+
+3.) Install PHP qa tools
+ Run as root:
+ pear config-set auto_discover 1
+ pear install pear.phpqatools.org/phpqatools pear.netpirates.net/phpDox
+
+ Alternative:
+ pear install pear.phpunit.de/phploc
+ pear install pear.phpunit.de/phpcpd
+ pear install pear.phpmd.org/PHP_PMD
+ pear install pear.pdepend.org/PHP_Depend
+ pear install pear.php.org/PHP_CodeSniffer
+ pear install PHP_CodeSniffer
+ pear install pear.phpqatools.org/PHP_CodeBrowser
+
+
+How to call this ant script?
+ ant -f build/build.xml -Dbasedir=.
+
+
diff --git a/build/build.xml b/build/build.xml
new file mode 100644
index 0000000000..3df77ad024
--- /dev/null
+++ b/build/build.xml
@@ -0,0 +1,179 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+jQuery,$$,OC,$,oc_webroot,oc_appswebroots,oc_current_user,t,Files,FileList,FileActions,localStorage,OCCategories,EventSource,OCdialog,SVGSupport,dragOptions,dragOptions,folderDropOptions,formatDate,humanFileSize,procesSelection,relative_modified_date,scanFiles,simpleFileSize,simpleSize
+
+
+
+
+
+
+
+
+
+
+jQuery,$$,OC,$,oc_webroot,oc_appswebroots,oc_current_user,t,Files,FileList,FileActions,localStorage,OCCategories,EventSource,OCdialog,SVGSupport,dragOptions,dragOptions,folderDropOptions,formatDate,humanFileSize,procesSelection,relative_modified_date,scanFiles,simpleFileSize,simpleSize
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/build/phpcs.xml b/build/phpcs.xml
new file mode 100644
index 0000000000..1e10be1a11
--- /dev/null
+++ b/build/phpcs.xml
@@ -0,0 +1,80 @@
+
+
+ The coding standard for PHP_CodeSniffer itself.
+ */Tests/*
+ */lib/MDB2/*
+ */3rdparty/*
+ *.min.*
+ */l10n/*
+ */files_texteditor/js/aceeditor/*
+ */files_pdfviewer/js/pdfjs/*
+ */files_odfviewer/src/*
+ */files_svgedit/svg-edit/*
+ *jquery-ui-1.8.16.custom.css
+ php
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/build/phpmd.xml b/build/phpmd.xml
new file mode 100644
index 0000000000..3935a5b74b
--- /dev/null
+++ b/build/phpmd.xml
@@ -0,0 +1,9 @@
+
+
+ My custom rule set that checks my code...
+
+
+
+
+
+
From 0c87f666ad24492ec45e6d3c05f729132ae1a926 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud
Date: Sun, 16 Dec 2012 00:12:10 +0100
Subject: [PATCH 20/58] [tx-robot] updated from transifex
---
apps/files_external/l10n/de.php | 2 ++
apps/files_external/l10n/sl.php | 2 ++
apps/user_ldap/l10n/cs_CZ.php | 2 ++
apps/user_ldap/l10n/de.php | 1 +
apps/user_ldap/l10n/it.php | 2 ++
apps/user_ldap/l10n/ja_JP.php | 2 ++
apps/user_ldap/l10n/ru.php | 2 ++
apps/user_ldap/l10n/sl.php | 2 ++
core/l10n/sl.php | 8 +++++
l10n/cs_CZ/user_ldap.po | 10 +++---
l10n/de/files_external.po | 9 ++---
l10n/de/user_ldap.po | 7 ++--
l10n/it/user_ldap.po | 10 +++---
l10n/ja_JP/user_ldap.po | 11 +++---
l10n/ru/user_ldap.po | 11 +++---
l10n/sl/core.po | 54 ++++++++++++++---------------
l10n/sl/files_external.po | 10 +++---
l10n/sl/user_ldap.po | 10 +++---
l10n/templates/core.pot | 2 +-
l10n/templates/files.pot | 2 +-
l10n/templates/files_encryption.pot | 2 +-
l10n/templates/files_external.pot | 2 +-
l10n/templates/files_sharing.pot | 2 +-
l10n/templates/files_versions.pot | 2 +-
l10n/templates/lib.pot | 2 +-
l10n/templates/settings.pot | 2 +-
l10n/templates/user_ldap.pot | 2 +-
l10n/templates/user_webdavauth.pot | 2 +-
28 files changed, 101 insertions(+), 74 deletions(-)
diff --git a/apps/files_external/l10n/de.php b/apps/files_external/l10n/de.php
index 5d57e5e459..196b3af203 100644
--- a/apps/files_external/l10n/de.php
+++ b/apps/files_external/l10n/de.php
@@ -5,6 +5,8 @@
"Fill out all required fields" => "Bitte alle notwendigen Felder füllen",
"Please provide a valid Dropbox app key and secret." => "Bitte trage einen gültigen Dropbox-App-Key mit Secret ein.",
"Error configuring Google Drive storage" => "Fehler beim Einrichten von Google Drive",
+"Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "Warnung: \"smbclient\" ist nicht installiert. Das Einhängen von CIFS/SMB-Freigaben ist nicht möglich. Bitte Deinen System-Verwalter dies zu installieren.",
+"Warning: The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "Warnung: \"smbclient\" ist nicht aktiv oder nicht installiert. Das Einhängen von FTP-Freigaben ist nicht möglich. Bitte Deinen System-Verwalter dies zu installieren.",
"External Storage" => "Externer Speicher",
"Mount point" => "Mount-Point",
"Backend" => "Backend",
diff --git a/apps/files_external/l10n/sl.php b/apps/files_external/l10n/sl.php
index 713e89578e..f0db66ded9 100644
--- a/apps/files_external/l10n/sl.php
+++ b/apps/files_external/l10n/sl.php
@@ -5,6 +5,8 @@
"Fill out all required fields" => "Zapolni vsa zahtevana polja",
"Please provide a valid Dropbox app key and secret." => "Vpišite veljaven ključ programa in kodo za Dropbox",
"Error configuring Google Drive storage" => "Napaka nastavljanja shrambe Google Drive",
+"Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "Opozorilo: \"smbclient\" ni nameščen. Priklapljanje CIFS/SMB pogonov ni mogoče. Prosimo, prosite vašega skrbnika, če ga namesti.",
+"Warning: The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "Opozorilo: FTP podpora v PHP ni omogočena ali nameščena. Priklapljanje FTP pogonov ni mogoče. Prosimo, prosite vašega skrbnika, če jo namesti ali omogoči.",
"External Storage" => "Zunanja podatkovna shramba",
"Mount point" => "Priklopna točka",
"Backend" => "Zaledje",
diff --git a/apps/user_ldap/l10n/cs_CZ.php b/apps/user_ldap/l10n/cs_CZ.php
index c90dc9ed56..0c14ebb9d1 100644
--- a/apps/user_ldap/l10n/cs_CZ.php
+++ b/apps/user_ldap/l10n/cs_CZ.php
@@ -1,4 +1,6 @@
Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "Varování: Aplikace user_ldap a user_webdavauth nejsou kompatibilní. Může nastávat neočekávané chování. Požádejte, prosím, správce systému aby jednu z nich zakázal.",
+"Warning: The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "Varování: není nainstalován LDAP modul pro PHP, podpůrná vrstva nebude fungovat. Požádejte, prosím, správce systému aby jej nainstaloval.",
"Host" => "Počítač",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Můžete vynechat protokol, vyjma pokud požadujete SSL. Tehdy začněte s ldaps://",
"Base DN" => "Základní DN",
diff --git a/apps/user_ldap/l10n/de.php b/apps/user_ldap/l10n/de.php
index 97debcbab6..ed9fb6f812 100644
--- a/apps/user_ldap/l10n/de.php
+++ b/apps/user_ldap/l10n/de.php
@@ -1,4 +1,5 @@
Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "Warnung: Die Apps user_ldap und user_webdavauth sind nicht kompatible. Unerwartetes Verhalten kann auftreten. Bitte Deinen System-Verwalter eine von beiden zu de-aktivieren.",
"Host" => "Host",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Du kannst das Protokoll auslassen, außer wenn Du SSL benötigst. Beginne dann mit ldaps://",
"Base DN" => "Basis-DN",
diff --git a/apps/user_ldap/l10n/it.php b/apps/user_ldap/l10n/it.php
index f07f0aa5a4..915ce3af5b 100644
--- a/apps/user_ldap/l10n/it.php
+++ b/apps/user_ldap/l10n/it.php
@@ -1,4 +1,6 @@
Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "Avviso: le applicazioni user_ldap e user_webdavauth sono incompatibili. Potresti riscontrare un comportamento inatteso. Chiedi al tuo amministratore di sistema di disabilitarne uno.",
+"Warning: The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "Avviso: il modulo PHP LDAP richiesto non è installato, il motore non funzionerà. Chiedi al tuo amministratore di sistema di installarlo.",
"Host" => "Host",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "È possibile omettere il protocollo, ad eccezione se è necessario SSL. Quindi inizia con ldaps://",
"Base DN" => "DN base",
diff --git a/apps/user_ldap/l10n/ja_JP.php b/apps/user_ldap/l10n/ja_JP.php
index ffaae4e9bd..c7b2a0f91b 100644
--- a/apps/user_ldap/l10n/ja_JP.php
+++ b/apps/user_ldap/l10n/ja_JP.php
@@ -1,4 +1,6 @@
Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "警告: user_ldap と user_webdavauth のアプリには互換性がありません。予期せぬ動作をする可能姓があります。システム管理者にどちらかを無効にするよう問い合わせてください。",
+"Warning: The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "警告: PHP LDAP モジュールがインストールされていません。バックエンドが正しくどうさしません。システム管理者にインストールするよう問い合わせてください。",
"Host" => "ホスト",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "SSL通信しない場合には、プロトコル名を省略することができます。そうでない場合には、ldaps:// から始めてください。",
"Base DN" => "ベースDN",
diff --git a/apps/user_ldap/l10n/ru.php b/apps/user_ldap/l10n/ru.php
index 92982d868b..f41a0b0583 100644
--- a/apps/user_ldap/l10n/ru.php
+++ b/apps/user_ldap/l10n/ru.php
@@ -1,4 +1,6 @@
Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "Внимание:Приложения user_ldap и user_webdavauth несовместимы. Вы можете столкнуться с неожиданным поведением. Пожалуйста, обратитесь к системному администратору, чтобы отключить одно из них.",
+"Warning: The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "Внимание: Необходимый PHP LDAP модуль не установлен, внутренний интерфейс не будет работать. Пожалуйста, обратитесь к системному администратору, чтобы установить его.",
"Host" => "Сервер",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Можно опустить протокол, за исключением того, когда вам требуется SSL. Тогда начните с ldaps :/ /",
"Base DN" => "Базовый DN",
diff --git a/apps/user_ldap/l10n/sl.php b/apps/user_ldap/l10n/sl.php
index 098224bb31..1d1fc33a83 100644
--- a/apps/user_ldap/l10n/sl.php
+++ b/apps/user_ldap/l10n/sl.php
@@ -1,4 +1,6 @@
Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "Opozorilo: Aplikaciji user_ldap in user_webdavauth nista združljivi. Morda boste opazili nepričakovano obnašanje sistema. Prosimo, prosite vašega skrbnika, da eno od aplikacij onemogoči.",
+"Warning: The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "Opozorilo: PHP LDAP modul mora biti nameščen, sicer ta vmesnik ne bo deloval. Prosimo, prosite vašega skrbnika, če ga namesti.",
"Host" => "Gostitelj",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Protokol je lahko izpuščen, če ni posebej zahtevan SSL. V tem primeru se mora naslov začeti z ldaps://",
"Base DN" => "Osnovni DN",
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index 2aa4193263..0ee2eb03b3 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -1,4 +1,8 @@
"Uporanik %s je dal datoteko v souporabo z vami",
+"User %s shared a folder with you" => "Uporanik %s je dal mapo v souporabo z vami",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Uporanik %s je dal datoteko \"%s\" v souporabo z vami. Prenesete jo lahko tukaj: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Uporanik %s je dal mapo \"%s\" v souporabo z vami. Prenesete je lahko tukaj: %s",
"Category type not provided." => "Vrsta kategorije ni podana.",
"No category to add?" => "Ni kategorije za dodajanje?",
"This category already exists: " => "Ta kategorija že obstaja:",
@@ -39,6 +43,8 @@
"Share with link" => "Omogoči souporabo s povezavo",
"Password protect" => "Zaščiti z geslom",
"Password" => "Geslo",
+"Email link to person" => "Posreduj povezavo po e-pošti",
+"Send" => "Pošlji",
"Set expiration date" => "Nastavi datum preteka",
"Expiration date" => "Datum preteka",
"Share via email:" => "Souporaba preko elektronske pošte:",
@@ -55,6 +61,8 @@
"Password protected" => "Zaščiteno z geslom",
"Error unsetting expiration date" => "Napaka brisanja datuma preteka",
"Error setting expiration date" => "Napaka med nastavljanjem datuma preteka",
+"Sending ..." => "Pošiljam ...",
+"Email sent" => "E-pošta je bila poslana",
"ownCloud password reset" => "Ponastavitev gesla ownCloud",
"Use the following link to reset your password: {link}" => "Uporabite naslednjo povezavo za ponastavitev gesla: {link}",
"You will receive a link to reset your password via Email." => "Na elektronski naslov boste prejeli povezavo za ponovno nastavitev gesla.",
diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po
index ccae79fe8d..89d650bf77 100644
--- a/l10n/cs_CZ/user_ldap.po
+++ b/l10n/cs_CZ/user_ldap.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
-"Last-Translator: I Robot \n"
+"POT-Creation-Date: 2012-12-16 00:11+0100\n"
+"PO-Revision-Date: 2012-12-15 15:30+0000\n"
+"Last-Translator: Tomáš Chvátal \n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,13 +24,13 @@ msgid ""
"Warning: Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
-msgstr ""
+msgstr "Varování: Aplikace user_ldap a user_webdavauth nejsou kompatibilní. Může nastávat neočekávané chování. Požádejte, prosím, správce systému aby jednu z nich zakázal."
#: templates/settings.php:11
msgid ""
"Warning: The PHP LDAP module needs is not installed, the backend will"
" not work. Please ask your system administrator to install it."
-msgstr ""
+msgstr "Varování: není nainstalován LDAP modul pro PHP, podpůrná vrstva nebude fungovat. Požádejte, prosím, správce systému aby jej nainstaloval."
#: templates/settings.php:15
msgid "Host"
diff --git a/l10n/de/files_external.po b/l10n/de/files_external.po
index 1d52174a22..42d733228c 100644
--- a/l10n/de/files_external.po
+++ b/l10n/de/files_external.po
@@ -4,6 +4,7 @@
#
# Translators:
# , 2012.
+# I Robot , 2012.
# I Robot , 2012.
# , 2012.
# , 2012.
@@ -11,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
+"POT-Creation-Date: 2012-12-16 00:11+0100\n"
+"PO-Revision-Date: 2012-12-15 19:35+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
@@ -49,14 +50,14 @@ msgstr "Fehler beim Einrichten von Google Drive"
msgid ""
"Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "Warnung: \"smbclient\" ist nicht installiert. Das Einhängen von CIFS/SMB-Freigaben ist nicht möglich. Bitte Deinen System-Verwalter dies zu installieren."
#: lib/config.php:435
msgid ""
"Warning: The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
-msgstr ""
+msgstr "Warnung: \"smbclient\" ist nicht aktiv oder nicht installiert. Das Einhängen von FTP-Freigaben ist nicht möglich. Bitte Deinen System-Verwalter dies zu installieren."
#: templates/settings.php:3
msgid "External Storage"
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index cea509ce04..f002345257 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/user_ldap.po
@@ -4,6 +4,7 @@
#
# Translators:
# , 2012.
+# I Robot , 2012.
# I Robot , 2012.
# Maurice Preuß <>, 2012.
# , 2012.
@@ -13,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2012-12-16 00:11+0100\n"
+"PO-Revision-Date: 2012-12-15 19:41+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
@@ -28,7 +29,7 @@ msgid ""
"Warning: Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
-msgstr ""
+msgstr "Warnung: Die Apps user_ldap und user_webdavauth sind nicht kompatible. Unerwartetes Verhalten kann auftreten. Bitte Deinen System-Verwalter eine von beiden zu de-aktivieren."
#: templates/settings.php:11
msgid ""
diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po
index 43fae95bfb..9dc0007050 100644
--- a/l10n/it/user_ldap.po
+++ b/l10n/it/user_ldap.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
-"Last-Translator: I Robot \n"
+"POT-Creation-Date: 2012-12-16 00:11+0100\n"
+"PO-Revision-Date: 2012-12-15 10:28+0000\n"
+"Last-Translator: Vincenzo Reale \n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,13 +24,13 @@ msgid ""
"Warning: Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
-msgstr ""
+msgstr "Avviso: le applicazioni user_ldap e user_webdavauth sono incompatibili. Potresti riscontrare un comportamento inatteso. Chiedi al tuo amministratore di sistema di disabilitarne uno."
#: templates/settings.php:11
msgid ""
"Warning: The PHP LDAP module needs is not installed, the backend will"
" not work. Please ask your system administrator to install it."
-msgstr ""
+msgstr "Avviso: il modulo PHP LDAP richiesto non è installato, il motore non funzionerà. Chiedi al tuo amministratore di sistema di installarlo."
#: templates/settings.php:15
msgid "Host"
diff --git a/l10n/ja_JP/user_ldap.po b/l10n/ja_JP/user_ldap.po
index 2a88e6fa06..39aa1002f7 100644
--- a/l10n/ja_JP/user_ldap.po
+++ b/l10n/ja_JP/user_ldap.po
@@ -4,14 +4,15 @@
#
# Translators:
# Daisuke Deguchi , 2012.
+# Daisuke Deguchi , 2012.
# , 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
-"Last-Translator: I Robot \n"
+"POT-Creation-Date: 2012-12-16 00:11+0100\n"
+"PO-Revision-Date: 2012-12-15 06:21+0000\n"
+"Last-Translator: Daisuke Deguchi \n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,13 +25,13 @@ msgid ""
"Warning: Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
-msgstr ""
+msgstr "警告: user_ldap と user_webdavauth のアプリには互換性がありません。予期せぬ動作をする可能姓があります。システム管理者にどちらかを無効にするよう問い合わせてください。"
#: templates/settings.php:11
msgid ""
"Warning: The PHP LDAP module needs is not installed, the backend will"
" not work. Please ask your system administrator to install it."
-msgstr ""
+msgstr "警告: PHP LDAP モジュールがインストールされていません。バックエンドが正しくどうさしません。システム管理者にインストールするよう問い合わせてください。"
#: templates/settings.php:15
msgid "Host"
diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po
index 4f3fec369e..5ab21a67d5 100644
--- a/l10n/ru/user_ldap.po
+++ b/l10n/ru/user_ldap.po
@@ -5,13 +5,14 @@
# Translators:
# <4671992@gmail.com>, 2012.
# Denis , 2012.
+# , 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
-"Last-Translator: I Robot \n"
+"POT-Creation-Date: 2012-12-16 00:11+0100\n"
+"PO-Revision-Date: 2012-12-15 01:57+0000\n"
+"Last-Translator: sam002 \n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,13 +25,13 @@ msgid ""
"Warning: Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
-msgstr ""
+msgstr "Внимание:Приложения user_ldap и user_webdavauth несовместимы. Вы можете столкнуться с неожиданным поведением. Пожалуйста, обратитесь к системному администратору, чтобы отключить одно из них."
#: templates/settings.php:11
msgid ""
"Warning: The PHP LDAP module needs is not installed, the backend will"
" not work. Please ask your system administrator to install it."
-msgstr ""
+msgstr "Внимание: Необходимый PHP LDAP модуль не установлен, внутренний интерфейс не будет работать. Пожалуйста, обратитесь к системному администратору, чтобы установить его."
#: templates/settings.php:15
msgid "Host"
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index c792cfeb4b..679277649a 100644
--- a/l10n/sl/core.po
+++ b/l10n/sl/core.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 23:17+0000\n"
-"Last-Translator: I Robot \n"
+"POT-Creation-Date: 2012-12-16 00:11+0100\n"
+"PO-Revision-Date: 2012-12-15 16:29+0000\n"
+"Last-Translator: Peter Peroša \n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,26 +24,26 @@ msgstr ""
#: ajax/share.php:84
#, php-format
msgid "User %s shared a file with you"
-msgstr ""
+msgstr "Uporanik %s je dal datoteko v souporabo z vami"
#: ajax/share.php:86
#, php-format
msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "Uporanik %s je dal mapo v souporabo z vami"
#: ajax/share.php:88
#, php-format
msgid ""
"User %s shared the file \"%s\" with you. It is available for download here: "
"%s"
-msgstr ""
+msgstr "Uporanik %s je dal datoteko \"%s\" v souporabo z vami. Prenesete jo lahko tukaj: %s"
#: ajax/share.php:90
#, php-format
msgid ""
"User %s shared the folder \"%s\" with you. It is available for download "
"here: %s"
-msgstr ""
+msgstr "Uporanik %s je dal mapo \"%s\" v souporabo z vami. Prenesete je lahko tukaj: %s"
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -210,18 +210,18 @@ msgstr "Omogoči souporabo s povezavo"
msgid "Password protect"
msgstr "Zaščiti z geslom"
-#: js/share.js:168 templates/installation.php:42 templates/login.php:24
+#: js/share.js:168 templates/installation.php:44 templates/login.php:26
#: templates/verify.php:13
msgid "Password"
msgstr "Geslo"
#: js/share.js:172
msgid "Email link to person"
-msgstr ""
+msgstr "Posreduj povezavo po e-pošti"
#: js/share.js:173
msgid "Send"
-msgstr ""
+msgstr "Pošlji"
#: js/share.js:177
msgid "Set expiration date"
@@ -289,11 +289,11 @@ msgstr "Napaka med nastavljanjem datuma preteka"
#: js/share.js:568
msgid "Sending ..."
-msgstr ""
+msgstr "Pošiljam ..."
#: js/share.js:579
msgid "Email sent"
-msgstr ""
+msgstr "E-pošta je bila poslana"
#: lostpassword/controller.php:47
msgid "ownCloud password reset"
@@ -315,8 +315,8 @@ msgstr "E-pošta za ponastavitev je bila poslana."
msgid "Request failed!"
msgstr "Zahtevek je spodletel!"
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
-#: templates/login.php:20
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: templates/login.php:21
msgid "Username"
msgstr "Uporabniško Ime"
@@ -405,44 +405,44 @@ msgstr "Trenutno je dostop do podatkovne mape in datotek najverjetneje omogočen
msgid "Create an admin account"
msgstr "Ustvari skrbniški račun"
-#: templates/installation.php:48
+#: templates/installation.php:50
msgid "Advanced"
msgstr "Napredne možnosti"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Data folder"
msgstr "Mapa s podatki"
-#: templates/installation.php:57
+#: templates/installation.php:59
msgid "Configure the database"
msgstr "Nastavi podatkovno zbirko"
-#: templates/installation.php:62 templates/installation.php:73
-#: templates/installation.php:83 templates/installation.php:93
+#: templates/installation.php:64 templates/installation.php:75
+#: templates/installation.php:85 templates/installation.php:95
msgid "will be used"
msgstr "bo uporabljen"
-#: templates/installation.php:105
+#: templates/installation.php:107
msgid "Database user"
msgstr "Uporabnik zbirke"
-#: templates/installation.php:109
+#: templates/installation.php:111
msgid "Database password"
msgstr "Geslo podatkovne zbirke"
-#: templates/installation.php:113
+#: templates/installation.php:115
msgid "Database name"
msgstr "Ime podatkovne zbirke"
-#: templates/installation.php:121
+#: templates/installation.php:123
msgid "Database tablespace"
msgstr "Razpredelnica podatkovne zbirke"
-#: templates/installation.php:127
+#: templates/installation.php:129
msgid "Database host"
msgstr "Gostitelj podatkovne zbirke"
-#: templates/installation.php:132
+#: templates/installation.php:134
msgid "Finish setup"
msgstr "Dokončaj namestitev"
@@ -548,11 +548,11 @@ msgstr "Spremenite geslo za izboljšanje zaščite računa."
msgid "Lost your password?"
msgstr "Ali ste pozabili geslo?"
-#: templates/login.php:27
+#: templates/login.php:29
msgid "remember"
msgstr "Zapomni si me"
-#: templates/login.php:28
+#: templates/login.php:30
msgid "Log in"
msgstr "Prijava"
diff --git a/l10n/sl/files_external.po b/l10n/sl/files_external.po
index 850dcb0542..f20fb0bad2 100644
--- a/l10n/sl/files_external.po
+++ b/l10n/sl/files_external.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
-"Last-Translator: I Robot \n"
+"POT-Creation-Date: 2012-12-16 00:11+0100\n"
+"PO-Revision-Date: 2012-12-15 16:43+0000\n"
+"Last-Translator: Peter Peroša \n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -47,14 +47,14 @@ msgstr "Napaka nastavljanja shrambe Google Drive"
msgid ""
"Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "Opozorilo: \"smbclient\" ni nameščen. Priklapljanje CIFS/SMB pogonov ni mogoče. Prosimo, prosite vašega skrbnika, če ga namesti."
#: lib/config.php:435
msgid ""
"Warning: The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
-msgstr ""
+msgstr "Opozorilo: FTP podpora v PHP ni omogočena ali nameščena. Priklapljanje FTP pogonov ni mogoče. Prosimo, prosite vašega skrbnika, če jo namesti ali omogoči."
#: templates/settings.php:3
msgid "External Storage"
diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po
index 9a2bc5da37..d34b56f8c0 100644
--- a/l10n/sl/user_ldap.po
+++ b/l10n/sl/user_ldap.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
-"Last-Translator: I Robot \n"
+"POT-Creation-Date: 2012-12-16 00:11+0100\n"
+"PO-Revision-Date: 2012-12-15 16:46+0000\n"
+"Last-Translator: Peter Peroša \n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,13 +24,13 @@ msgid ""
"Warning: Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
-msgstr ""
+msgstr "Opozorilo: Aplikaciji user_ldap in user_webdavauth nista združljivi. Morda boste opazili nepričakovano obnašanje sistema. Prosimo, prosite vašega skrbnika, da eno od aplikacij onemogoči."
#: templates/settings.php:11
msgid ""
"Warning: The PHP LDAP module needs is not installed, the backend will"
" not work. Please ask your system administrator to install it."
-msgstr ""
+msgstr "Opozorilo: PHP LDAP modul mora biti nameščen, sicer ta vmesnik ne bo deloval. Prosimo, prosite vašega skrbnika, če ga namesti."
#: templates/settings.php:15
msgid "Host"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 630e392653..8a902bb207 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"POT-Creation-Date: 2012-12-16 00:11+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 775839bdf0..5f4d3943ad 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"POT-Creation-Date: 2012-12-16 00:11+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index ccb8c5a32f..120ffd9f0f 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"POT-Creation-Date: 2012-12-16 00:11+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 522a78047c..bde40e687e 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"POT-Creation-Date: 2012-12-16 00:11+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index c037b0ebf5..f7a9827d6e 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"POT-Creation-Date: 2012-12-16 00:11+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 39fd04b563..f4e6662218 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"POT-Creation-Date: 2012-12-16 00:11+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index a134890e46..5789dadae3 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"POT-Creation-Date: 2012-12-16 00:11+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 003b49846d..81cbf6bb55 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"POT-Creation-Date: 2012-12-16 00:11+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 8ca63857cb..60a4f5340f 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"POT-Creation-Date: 2012-12-16 00:11+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index a552795d14..47d3ac6d72 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"POT-Creation-Date: 2012-12-16 00:11+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
From 4301cd7f61f0cf07458f49430c098aac04882fbc Mon Sep 17 00:00:00 2001
From: Robin Appelman
Date: Sun, 16 Dec 2012 20:29:36 +0100
Subject: [PATCH 21/58] wrap hooks into a try, catch to prevent a faulty app
from crashing the request
---
lib/hook.php | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/lib/hook.php b/lib/hook.php
index 26a5369374..4da331bb5d 100644
--- a/lib/hook.php
+++ b/lib/hook.php
@@ -59,7 +59,11 @@ class OC_Hook{
// Call all slots
foreach( self::$registered[$signalclass][$signalname] as $i ) {
- call_user_func( array( $i["class"], $i["name"] ), $params );
+ try {
+ call_user_func( array( $i["class"], $i["name"] ), $params );
+ } catch (Exception $e){
+ OC_Log::write('hook', 'error while running hook (' . $i["class"] . '::' . $i["name"] . '): '.$e->getMessage(), OC_Log::ERROR);
+ }
}
// return true
From 63a2271c78a489d10c15ab2ecb97d62c96d2e0ac Mon Sep 17 00:00:00 2001
From: Michael Gapczynski
Date: Sun, 16 Dec 2012 15:08:18 -0500
Subject: [PATCH 22/58] Change post_write hook to write to prevent creating a
duplicate of the original file on upload
---
apps/files_versions/appinfo/app.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php
index 599d302e6e..afc0a67edb 100644
--- a/apps/files_versions/appinfo/app.php
+++ b/apps/files_versions/appinfo/app.php
@@ -10,7 +10,7 @@ OCP\App::registerPersonal('files_versions', 'settings-personal');
OCP\Util::addscript('files_versions', 'versions');
// Listen to write signals
-OCP\Util::connectHook('OC_Filesystem', 'post_write', "OCA_Versions\Hooks", "write_hook");
+OCP\Util::connectHook('OC_Filesystem', 'write', "OCA_Versions\Hooks", "write_hook");
// Listen to delete and rename signals
OCP\Util::connectHook('OC_Filesystem', 'delete', "OCA_Versions\Hooks", "remove_hook");
OCP\Util::connectHook('OC_Filesystem', 'rename', "OCA_Versions\Hooks", "rename_hook");
\ No newline at end of file
From 2607c565b01e83c9dcd68f4f905f94687841ae77 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski
Date: Sun, 16 Dec 2012 16:19:51 -0500
Subject: [PATCH 23/58] Trigger the last action before continuing with a file
upload, fixes issue #918
---
apps/files/js/files.js | 3 +++
1 file changed, 3 insertions(+)
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 33c775fc8e..2719e9ade5 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -203,6 +203,9 @@ $(document).ready(function() {
var files = data.files;
var totalSize=0;
if(files){
+ if (FileList.lastAction) {
+ FileList.lastAction();
+ }
for(var i=0;i
Date: Sun, 16 Dec 2012 16:25:08 -0500
Subject: [PATCH 24/58] Trigger last action before continuing with creating a
new file/folder/from link
---
apps/files/js/files.js | 3 +++
1 file changed, 3 insertions(+)
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 2719e9ade5..d924dab3d6 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -516,6 +516,9 @@ $(document).ready(function() {
$('#notification').fadeIn();
return;
}
+ if (FileList.lastAction) {
+ FileList.lastAction();
+ }
var name = getUniqueName($(this).val());
if (name != $(this).val()) {
FileList.checkName(name, $(this).val(), true);
From dd5e39ca71d80c97e1b62427642ba1a08f75624d Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud
Date: Mon, 17 Dec 2012 00:10:49 +0100
Subject: [PATCH 25/58] [tx-robot] updated from transifex
---
apps/user_ldap/l10n/ca.php | 2 ++
l10n/ca/user_ldap.po | 10 +++++-----
l10n/templates/core.pot | 2 +-
l10n/templates/files.pot | 2 +-
l10n/templates/files_encryption.pot | 2 +-
l10n/templates/files_external.pot | 2 +-
l10n/templates/files_sharing.pot | 2 +-
l10n/templates/files_versions.pot | 2 +-
l10n/templates/lib.pot | 2 +-
l10n/templates/settings.pot | 2 +-
l10n/templates/user_ldap.pot | 2 +-
l10n/templates/user_webdavauth.pot | 2 +-
12 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/apps/user_ldap/l10n/ca.php b/apps/user_ldap/l10n/ca.php
index be72912040..d801ddff63 100644
--- a/apps/user_ldap/l10n/ca.php
+++ b/apps/user_ldap/l10n/ca.php
@@ -1,4 +1,6 @@
Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "Avís: Les aplicacions user_ldap i user_webdavauth són incompatibles. Podeu experimentar comportaments no desitjats. Demaneu a l'administrador del sistema que en desactivi una.",
+"Warning: The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "Avís: El mòdul PHP LDAP necessari no està instal·lat, el dorsal no funcionarà. Demaneu a l'administrador del sistema que l'instal·li.",
"Host" => "Màquina",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Podeu ometre el protocol, excepte si requeriu SSL. Llavors comenceu amb ldaps://",
"Base DN" => "DN Base",
diff --git a/l10n/ca/user_ldap.po b/l10n/ca/user_ldap.po
index 9aea1eefd7..10b45cc321 100644
--- a/l10n/ca/user_ldap.po
+++ b/l10n/ca/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
-"Last-Translator: I Robot \n"
+"POT-Creation-Date: 2012-12-17 00:09+0100\n"
+"PO-Revision-Date: 2012-12-16 09:56+0000\n"
+"Last-Translator: rogerc \n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -23,13 +23,13 @@ msgid ""
"Warning: Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
-msgstr ""
+msgstr "Avís: Les aplicacions user_ldap i user_webdavauth són incompatibles. Podeu experimentar comportaments no desitjats. Demaneu a l'administrador del sistema que en desactivi una."
#: templates/settings.php:11
msgid ""
"Warning: The PHP LDAP module needs is not installed, the backend will"
" not work. Please ask your system administrator to install it."
-msgstr ""
+msgstr "Avís: El mòdul PHP LDAP necessari no està instal·lat, el dorsal no funcionarà. Demaneu a l'administrador del sistema que l'instal·li."
#: templates/settings.php:15
msgid "Host"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 8a902bb207..613dd56147 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-16 00:11+0100\n"
+"POT-Creation-Date: 2012-12-17 00:09+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 5f4d3943ad..76eabc2af0 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-16 00:11+0100\n"
+"POT-Creation-Date: 2012-12-17 00:09+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 120ffd9f0f..58ea8851ad 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-16 00:11+0100\n"
+"POT-Creation-Date: 2012-12-17 00:09+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index bde40e687e..847da25458 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-16 00:11+0100\n"
+"POT-Creation-Date: 2012-12-17 00:09+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index f7a9827d6e..bdd7e9541b 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-16 00:11+0100\n"
+"POT-Creation-Date: 2012-12-17 00:09+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index f4e6662218..7812d7e24f 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-16 00:11+0100\n"
+"POT-Creation-Date: 2012-12-17 00:09+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 5789dadae3..41bbcb03c4 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-16 00:11+0100\n"
+"POT-Creation-Date: 2012-12-17 00:09+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 81cbf6bb55..05f78285e0 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-16 00:11+0100\n"
+"POT-Creation-Date: 2012-12-17 00:09+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 60a4f5340f..9b7639b72d 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-16 00:11+0100\n"
+"POT-Creation-Date: 2012-12-17 00:09+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 47d3ac6d72..48295fa214 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-16 00:11+0100\n"
+"POT-Creation-Date: 2012-12-17 00:09+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
From 39eebebd9994f38641070da4a79bc5110472ba12 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski
Date: Sun, 16 Dec 2012 19:43:32 -0500
Subject: [PATCH 26/58] Fall back to default log file if logfile config file
not found, suppress writing errors, fixes issue #826
---
lib/log/owncloud.php | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/lib/log/owncloud.php b/lib/log/owncloud.php
index ec43208d83..e53dd5fefc 100644
--- a/lib/log/owncloud.php
+++ b/lib/log/owncloud.php
@@ -33,8 +33,11 @@ class OC_Log_Owncloud {
* Init class data
*/
public static function init() {
- $datadir=OC_Config::getValue( "datadirectory", OC::$SERVERROOT.'/data' );
- self::$logFile=OC_Config::getValue( "logfile", $datadir.'/owncloud.log' );
+ $defaultLogFile = OC_Config::getValue("datadirectory", OC::$SERVERROOT.'/data').'/owncloud.log';
+ self::$logFile = OC_Config::getValue("logfile", $defaultLogFile);
+ if (!file_exists(self::$logFile)) {
+ self::$logFile = $defaultLogFile;
+ }
}
/**
@@ -47,9 +50,11 @@ class OC_Log_Owncloud {
$minLevel=min(OC_Config::getValue( "loglevel", OC_Log::WARN ), OC_Log::ERROR);
if($level>=$minLevel) {
$entry=array('app'=>$app, 'message'=>$message, 'level'=>$level, 'time'=>time());
- $fh=fopen(self::$logFile, 'a');
- fwrite($fh, json_encode($entry)."\n");
- fclose($fh);
+ $handle = @fopen(self::$logFile, 'a');
+ if ($handle) {
+ fwrite($handle, json_encode($entry)."\n");
+ fclose($handle);
+ }
}
}
From c4ecbad0099c31611155e4712f2cac2b9ced26a4 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek
Date: Mon, 17 Dec 2012 14:46:57 +0100
Subject: [PATCH 27/58] check if admin
---
apps/files_encryption/settings.php | 4 +++-
apps/files_external/settings.php | 2 ++
apps/user_ldap/settings.php | 3 +++
apps/user_webdavauth/settings.php | 2 ++
4 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/apps/files_encryption/settings.php b/apps/files_encryption/settings.php
index 6b2b03211e..94ff5ab94b 100644
--- a/apps/files_encryption/settings.php
+++ b/apps/files_encryption/settings.php
@@ -6,6 +6,8 @@
* See the COPYING-README file.
*/
+OC_Util::checkAdminUser();
+
$tmpl = new OCP\Template( 'files_encryption', 'settings');
$blackList=explode(',', OCP\Config::getAppValue('files_encryption',
'type_blacklist',
@@ -17,4 +19,4 @@ $tmpl->assign('encryption_enabled', $enabled);
OCP\Util::addscript('files_encryption', 'settings');
OCP\Util::addscript('core', 'multiselect');
-return $tmpl->fetchPage();
\ No newline at end of file
+return $tmpl->fetchPage();
diff --git a/apps/files_external/settings.php b/apps/files_external/settings.php
index 2f239f7cb9..cd0bfa9958 100644
--- a/apps/files_external/settings.php
+++ b/apps/files_external/settings.php
@@ -20,6 +20,8 @@
* License along with this library. If not, see .
*/
+OC_Util::checkAdminUser();
+
OCP\Util::addScript('files_external', 'settings');
OCP\Util::addscript('3rdparty', 'chosen/chosen.jquery.min');
OCP\Util::addStyle('files_external', 'settings');
diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php
index 2ee936d29a..58ec8e7f7a 100644
--- a/apps/user_ldap/settings.php
+++ b/apps/user_ldap/settings.php
@@ -20,6 +20,9 @@
* License along with this library. If not, see .
*
*/
+
+OC_Util::checkAdminUser();
+
$params = array('ldap_host', 'ldap_port', 'ldap_dn', 'ldap_agent_password', 'ldap_base', 'ldap_base_users', 'ldap_base_groups', 'ldap_userlist_filter', 'ldap_login_filter', 'ldap_group_filter', 'ldap_display_name', 'ldap_group_display_name', 'ldap_tls', 'ldap_turn_off_cert_check', 'ldap_nocase', 'ldap_quota_def', 'ldap_quota_attr', 'ldap_email_attr', 'ldap_group_member_assoc_attribute', 'ldap_cache_ttl', 'home_folder_naming_rule');
OCP\Util::addscript('user_ldap', 'settings');
diff --git a/apps/user_webdavauth/settings.php b/apps/user_webdavauth/settings.php
index 910073c784..41d7fa51cd 100755
--- a/apps/user_webdavauth/settings.php
+++ b/apps/user_webdavauth/settings.php
@@ -21,6 +21,8 @@
*
*/
+OC_Util::checkAdminUser();
+
if($_POST) {
if(isset($_POST['webdav_url'])) {
From b6eb95349e6e339c90f8165bcd0471bd6268f8c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?=
Date: Mon, 17 Dec 2012 16:23:12 +0100
Subject: [PATCH 28/58] fix utf8 filenames in ie download response header
according to rfc5987, see
http://stackoverflow.com/questions/93551/how-to-encode-the-filename-parameter-of-content-disposition-header-in-http
---
apps/files/download.php | 7 ++++++-
lib/files.php | 7 ++++++-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/apps/files/download.php b/apps/files/download.php
index 6475afb56e..e2149cd413 100644
--- a/apps/files/download.php
+++ b/apps/files/download.php
@@ -40,7 +40,12 @@ if(!OC_Filesystem::file_exists($filename)) {
$ftype=OC_Filesystem::getMimeType( $filename );
header('Content-Type:'.$ftype);
-header('Content-Disposition: attachment; filename="'.basename($filename).'"');
+if ( preg_match( "/MSIE/", $_SERVER["HTTP_USER_AGENT"] ) ) {
+ header( 'Content-Disposition: attachment; filename="' . rawurlencode( basename($filename) ) . '"' );
+} else {
+ header( 'Content-Disposition: attachment; filename*=UTF-8\'\'' . rawurlencode( basename($filename) )
+ . '; filename="' . rawurlencode( basename($filename) ) . '"' );
+}
OCP\Response::disableCaching();
header('Content-Length: '.OC_Filesystem::filesize($filename));
diff --git a/lib/files.php b/lib/files.php
index 152ed8f34a..f8bae778ed 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -197,7 +197,12 @@ class OC_Files {
}
OC_Util::obEnd();
if($zip or OC_Filesystem::is_readable($filename)) {
- header('Content-Disposition: attachment; filename="'.basename($filename).'"');
+ if ( preg_match( "/MSIE/", $_SERVER["HTTP_USER_AGENT"] ) ) {
+ header( 'Content-Disposition: attachment; filename="' . rawurlencode( basename($filename) ) . '"' );
+ } else {
+ header( 'Content-Disposition: attachment; filename*=UTF-8\'\'' . rawurlencode( basename($filename) )
+ . '; filename="' . rawurlencode( basename($filename) ) . '"' );
+ }
header('Content-Transfer-Encoding: binary');
OC_Response::disableCaching();
if($zip) {
From a4b0df419eeeda428645d07c867532208937b2b9 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud
Date: Tue, 18 Dec 2012 00:14:58 +0100
Subject: [PATCH 29/58] [tx-robot] updated from transifex
---
apps/files/l10n/mk.php | 24 ++++
apps/files_encryption/l10n/mk.php | 6 +
apps/files_external/l10n/mk.php | 1 +
apps/files_external/l10n/pt_PT.php | 2 +
apps/files_sharing/l10n/mk.php | 9 ++
apps/files_versions/l10n/mk.php | 8 ++
apps/user_ldap/l10n/mk.php | 3 +
apps/user_ldap/l10n/pt_PT.php | 2 +
apps/user_ldap/l10n/sv.php | 2 +
core/l10n/he.php | 8 ++
core/l10n/mk.php | 68 ++++++++++-
core/l10n/pl.php | 4 +
core/l10n/pt_PT.php | 8 ++
l10n/he/core.po | 54 ++++-----
l10n/mk/core.po | 170 ++++++++++++++--------------
l10n/mk/files.po | 134 +++++++++++-----------
l10n/mk/files_encryption.po | 19 ++--
l10n/mk/files_external.po | 6 +-
l10n/mk/files_sharing.po | 33 +++---
l10n/mk/files_versions.po | 19 ++--
l10n/mk/lib.po | 81 ++++++-------
l10n/mk/settings.po | 39 +++----
l10n/mk/user_ldap.po | 6 +-
l10n/pl/core.po | 46 ++++----
l10n/pt_PT/core.po | 54 ++++-----
l10n/pt_PT/files_external.po | 11 +-
l10n/pt_PT/user_ldap.po | 10 +-
l10n/sv/user_ldap.po | 10 +-
l10n/templates/core.pot | 2 +-
l10n/templates/files.pot | 2 +-
l10n/templates/files_encryption.pot | 2 +-
l10n/templates/files_external.pot | 2 +-
l10n/templates/files_sharing.pot | 2 +-
l10n/templates/files_versions.pot | 2 +-
l10n/templates/lib.pot | 10 +-
l10n/templates/settings.pot | 2 +-
l10n/templates/user_ldap.pot | 2 +-
l10n/templates/user_webdavauth.pot | 2 +-
lib/l10n/mk.php | 28 ++++-
settings/l10n/mk.php | 16 +++
40 files changed, 550 insertions(+), 359 deletions(-)
create mode 100644 apps/files_encryption/l10n/mk.php
create mode 100644 apps/files_sharing/l10n/mk.php
create mode 100644 apps/files_versions/l10n/mk.php
create mode 100644 apps/user_ldap/l10n/mk.php
diff --git a/apps/files/l10n/mk.php b/apps/files/l10n/mk.php
index c47fdbdbf4..1d22746156 100644
--- a/apps/files/l10n/mk.php
+++ b/apps/files/l10n/mk.php
@@ -1,21 +1,44 @@
"Нема грешка, датотеката беше подигната успешно",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Подигнатата датотека ја надминува upload_max_filesize директивата во php.ini:",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Подигнатата датотеката ја надминува MAX_FILE_SIZE директивата која беше поставена во HTML формата",
"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}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Неправилно име. , '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не се дозволени.",
"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} датотеки се подигаат",
"Upload cancelled." => "Преземањето е прекинато.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Подигање на датотека е во тек. Напуштење на страницата ќе го прекине.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Неправилно име на папка. Користењето на „Shared“ е резервирано за Owncloud",
+"{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: " => "макс. можно:",
@@ -27,6 +50,7 @@
"New" => "Ново",
"Text file" => "Текстуална датотека",
"Folder" => "Папка",
+"From link" => "Од врска",
"Upload" => "Подигни",
"Cancel upload" => "Откажи прикачување",
"Nothing in here. Upload something!" => "Тука нема ништо. Снимете нешто!",
diff --git a/apps/files_encryption/l10n/mk.php b/apps/files_encryption/l10n/mk.php
new file mode 100644
index 0000000000..dfcaed9f37
--- /dev/null
+++ b/apps/files_encryption/l10n/mk.php
@@ -0,0 +1,6 @@
+ "Енкрипција",
+"Exclude the following file types from encryption" => "Исклучи ги следните типови на датотеки од енкрипција",
+"None" => "Ништо",
+"Enable Encryption" => "Овозможи енкрипција"
+);
diff --git a/apps/files_external/l10n/mk.php b/apps/files_external/l10n/mk.php
index 8fde4fcde0..597623323b 100644
--- a/apps/files_external/l10n/mk.php
+++ b/apps/files_external/l10n/mk.php
@@ -1,4 +1,5 @@
"Админ",
"Groups" => "Групи",
"Users" => "Корисници",
"Delete" => "Избриши"
diff --git a/apps/files_external/l10n/pt_PT.php b/apps/files_external/l10n/pt_PT.php
index 4795a51a6b..06dbc0cf6b 100644
--- a/apps/files_external/l10n/pt_PT.php
+++ b/apps/files_external/l10n/pt_PT.php
@@ -5,6 +5,8 @@
"Fill out all required fields" => "Preencha todos os campos obrigatórios",
"Please provide a valid Dropbox app key and secret." => "Por favor forneça uma \"app key\" e \"secret\" do Dropbox válidas.",
"Error configuring Google Drive storage" => "Erro ao configurar o armazenamento do Google Drive",
+"Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "Aviso: O cliente \"smbclient\" não está instalado. Não é possível montar as partilhas CIFS/SMB . Peça ao seu administrador para instalar.",
+"Warning: The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "Aviso: O suporte FTP no PHP não está activate ou instalado. Não é possível montar as partilhas FTP. Peça ao seu administrador para instalar.",
"External Storage" => "Armazenamento Externo",
"Mount point" => "Ponto de montagem",
"Backend" => "Backend",
diff --git a/apps/files_sharing/l10n/mk.php b/apps/files_sharing/l10n/mk.php
new file mode 100644
index 0000000000..16c7ee0eb0
--- /dev/null
+++ b/apps/files_sharing/l10n/mk.php
@@ -0,0 +1,9 @@
+ "Лозинка",
+"Submit" => "Прати",
+"%s shared the folder %s with you" => "%s ја сподели папката %s со Вас",
+"%s shared the file %s with you" => "%s ја сподели датотеката %s со Вас",
+"Download" => "Преземи",
+"No preview available for" => "Нема достапно преглед за",
+"web services under your control" => "веб сервиси под Ваша контрола"
+);
diff --git a/apps/files_versions/l10n/mk.php b/apps/files_versions/l10n/mk.php
new file mode 100644
index 0000000000..60a06ad338
--- /dev/null
+++ b/apps/files_versions/l10n/mk.php
@@ -0,0 +1,8 @@
+ "Истечи ги сите верзии",
+"History" => "Историја",
+"Versions" => "Версии",
+"This will delete all existing backup versions of your files" => "Ова ќе ги избрише сите постоечки резервни копии од вашите датотеки",
+"Files Versioning" => "Верзии на датотеки",
+"Enable" => "Овозможи"
+);
diff --git a/apps/user_ldap/l10n/mk.php b/apps/user_ldap/l10n/mk.php
new file mode 100644
index 0000000000..f0a348b742
--- /dev/null
+++ b/apps/user_ldap/l10n/mk.php
@@ -0,0 +1,3 @@
+ "Лозинка"
+);
diff --git a/apps/user_ldap/l10n/pt_PT.php b/apps/user_ldap/l10n/pt_PT.php
index a17e1a9592..1b21b899a2 100644
--- a/apps/user_ldap/l10n/pt_PT.php
+++ b/apps/user_ldap/l10n/pt_PT.php
@@ -1,4 +1,6 @@
Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "Aviso: A aplicação user_ldap e user_webdavauth são incompativeis. A aplicação pode tornar-se instável. Por favor, peça ao seu administrador para desactivar uma das aplicações.",
+"Warning: The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "Aviso: O módulo PHP LDAP necessário não está instalado, o backend não irá funcionar. Peça ao seu administrador para o instalar.",
"Host" => "Anfitrião",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Pode omitir o protocolo, excepto se necessitar de SSL. Neste caso, comece com ldaps://",
"Base DN" => "DN base",
diff --git a/apps/user_ldap/l10n/sv.php b/apps/user_ldap/l10n/sv.php
index 2a0abb9296..e8e14af7ac 100644
--- a/apps/user_ldap/l10n/sv.php
+++ b/apps/user_ldap/l10n/sv.php
@@ -1,4 +1,6 @@
Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "Varning: Apps user_ldap och user_webdavauth är inkompatibla. Oväntade problem kan uppstå. Be din systemadministratör att inaktivera en av dom.",
+"Warning: The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "Varning: PHP LDAP-modulen måste vara installerad, serversidan kommer inte att fungera. Be din systemadministratör att installera den.",
"Host" => "Server",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Du behöver inte ange protokoll förutom om du använder SSL. Starta då med ldaps://",
"Base DN" => "Start DN",
diff --git a/core/l10n/he.php b/core/l10n/he.php
index d4ec0ab84c..50addbd527 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -1,4 +1,8 @@
"המשתמש %s שיתף אתך קובץ",
+"User %s shared a folder with you" => "המשתמש %s שיתף אתך תיקייה",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "המשתמש %s שיתף אתך את הקובץ „%s“. ניתן להוריד את הקובץ מכאן: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "המשתמש %s שיתף אתך את התיקייה „%s“. ניתן להוריד את התיקייה מכאן: %s",
"Category type not provided." => "סוג הקטגוריה לא סופק.",
"No category to add?" => "אין קטגוריה להוספה?",
"This category already exists: " => "קטגוריה זאת כבר קיימת: ",
@@ -39,6 +43,8 @@
"Share with link" => "שיתוף עם קישור",
"Password protect" => "הגנה בססמה",
"Password" => "ססמה",
+"Email link to person" => "שליחת קישור בדוא״ל למשתמש",
+"Send" => "שליחה",
"Set expiration date" => "הגדרת תאריך תפוגה",
"Expiration date" => "תאריך התפוגה",
"Share via email:" => "שיתוף באמצעות דוא״ל:",
@@ -55,6 +61,8 @@
"Password protected" => "מוגן בססמה",
"Error unsetting expiration date" => "אירעה שגיאה בביטול תאריך התפוגה",
"Error setting expiration date" => "אירעה שגיאה בעת הגדרת תאריך התפוגה",
+"Sending ..." => "מתבצעת שליחה ...",
+"Email sent" => "הודעת הדוא״ל נשלחה",
"ownCloud password reset" => "איפוס הססמה של ownCloud",
"Use the following link to reset your password: {link}" => "יש להשתמש בקישור הבא כדי לאפס את הססמה שלך: {link}",
"You will receive a link to reset your password via Email." => "יישלח לתיבת הדוא״ל שלך קישור לאיפוס הססמה.",
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index 251abb015f..401baf6efa 100644
--- a/core/l10n/mk.php
+++ b/core/l10n/mk.php
@@ -1,18 +1,73 @@
"Корисникот %s сподели датотека со Вас",
+"User %s shared a folder with you" => "Корисникот %s сподели папка со Вас",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Корисникот %s ја сподели датотека „%s“ со Вас. Достапна е за преземање тука: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Корисникот %s ја сподели папката „%s“ со Вас. Достапна е за преземање тука: %s",
+"Category type not provided." => "Не беше доставен тип на категорија.",
"No category to add?" => "Нема категорија да се додаде?",
"This category already exists: " => "Оваа категорија веќе постои:",
+"Object type not provided." => "Не беше доставен тип на објект.",
+"%s ID not provided." => "%s ID не беше доставено.",
+"Error adding %s to favorites." => "Грешка при додавање %s во омилени.",
"No categories selected for deletion." => "Не е одбрана категорија за бришење.",
+"Error removing %s from favorites." => "Грешка при бришење на %s од омилени.",
"Settings" => "Поставки",
+"seconds ago" => "пред секунди",
+"1 minute ago" => "пред 1 минута",
+"{minutes} minutes ago" => "пред {minutes} минути",
+"1 hour ago" => "пред 1 час",
+"{hours} hours ago" => "пред {hours} часови",
+"today" => "денеска",
+"yesterday" => "вчера",
+"{days} days ago" => "пред {days} денови",
+"last month" => "минатиот месец",
+"{months} months ago" => "пред {months} месеци",
+"months ago" => "пред месеци",
+"last year" => "минатата година",
+"years ago" => "пред години",
+"Choose" => "Избери",
"Cancel" => "Откажи",
"No" => "Не",
"Yes" => "Да",
"Ok" => "Во ред",
+"The object type is not specified." => "Не е специфициран типот на објект.",
"Error" => "Грешка",
+"The app name is not specified." => "Името на апликацијата не е специфицирано.",
+"The required file {file} is not installed!" => "Задолжителната датотека {file} не е инсталирана!",
+"Error while sharing" => "Грешка при споделување",
+"Error while unsharing" => "Грешка при прекин на споделување",
+"Error while changing permissions" => "Грешка при промена на привилегии",
+"Shared with you and the group {group} by {owner}" => "Споделено со Вас и групата {group} од {owner}",
+"Shared with you by {owner}" => "Споделено со Вас од {owner}",
+"Share with" => "Сподели со",
+"Share with link" => "Сподели со врска",
+"Password protect" => "Заштити со лозинка",
"Password" => "Лозинка",
+"Email link to person" => "Прати врска по е-пошта на личност",
+"Send" => "Прати",
+"Set expiration date" => "Постави рок на траење",
+"Expiration date" => "Рок на траење",
+"Share via email:" => "Сподели по е-пошта:",
+"No people found" => "Не се најдени луѓе",
+"Resharing is not allowed" => "Повторно споделување не е дозволено",
+"Shared in {item} with {user}" => "Споделено во {item} со {user}",
+"Unshare" => "Не споделувај",
+"can edit" => "може да се измени",
+"access control" => "контрола на пристап",
"create" => "креирај",
+"update" => "ажурирај",
+"delete" => "избриши",
+"share" => "сподели",
+"Password protected" => "Заштитено со лозинка",
+"Error unsetting expiration date" => "Грешка при тргање на рокот на траење",
+"Error setting expiration date" => "Грешка при поставување на рок на траење",
+"Sending ..." => "Праќање...",
+"Email sent" => "Е-порака пратена",
"ownCloud password reset" => "ресетирање на лозинка за ownCloud",
"Use the following link to reset your password: {link}" => "Користете ја следната врска да ја ресетирате Вашата лозинка: {link}",
"You will receive a link to reset your password via Email." => "Ќе добиете врска по е-пошта за да може да ја ресетирате Вашата лозинка.",
+"Reset email send." => "Порката за ресетирање на лозинка пратена.",
+"Request failed!" => "Барањето не успеа!",
"Username" => "Корисничко име",
"Request reset" => "Побарајте ресетирање",
"Your password was reset" => "Вашата лозинка беше ресетирана",
@@ -28,6 +83,10 @@
"Cloud not found" => "Облакот не е најден",
"Edit categories" => "Уреди категории",
"Add" => "Додади",
+"Security Warning" => "Безбедносно предупредување",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Не е достапен безбеден генератор на случајни броеви, Ве молам озвоможете го OpenSSL PHP додатокот.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Без сигурен генератор на случајни броеви напаѓач може да ги предвиди жетоните за ресетирање на лозинка и да преземе контрола врз Вашата сметка. ",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Вашата папка со податоци и датотеките е најверојатно достапна од интернет. .htaccess датотеката што ја овозможува ownCloud не фунционира. Силно препорачуваме да го исконфигурирате вашиот сервер за вашата папка со податоци не е достапна преку интернетт или преместете ја надвор од коренот на веб серверот.",
"Create an admin account" => "Направете администраторска сметка",
"Advanced" => "Напредно",
"Data folder" => "Фолдер со податоци",
@@ -36,6 +95,7 @@
"Database user" => "Корисник на база",
"Database password" => "Лозинка на база",
"Database name" => "Име на база",
+"Database tablespace" => "Табела во базата на податоци",
"Database host" => "Сервер со база",
"Finish setup" => "Заврши го подесувањето",
"Sunday" => "Недела",
@@ -59,10 +119,16 @@
"December" => "Декември",
"web services under your control" => "веб сервиси под Ваша контрола",
"Log out" => "Одјава",
+"Automatic logon rejected!" => "Одбиена автоматска најава!",
+"If you did not change your password recently, your account may be compromised!" => "Ако не сте ја промениле лозинката во скоро време, вашата сметка може да е компромитирана",
+"Please change your password to secure your account again." => "Ве молам сменете ја лозинката да ја обезбедите вашата сметка повторно.",
"Lost your password?" => "Ја заборавивте лозинката?",
"remember" => "запамти",
"Log in" => "Најава",
"You are logged out." => "Одјавени сте.",
"prev" => "претходно",
-"next" => "следно"
+"next" => "следно",
+"Security Warning!" => "Безбедносно предупредување.",
+"Please verify your password.
For security reasons you may be occasionally asked to enter your password again." => "Ве молам потврдете ја вашата лозинка.
Од безбедносни причини од време на време може да биде побарано да ја внесете вашата лозинка повторно.",
+"Verify" => "Потврди"
);
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index b780e54619..1208aec5a5 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -1,4 +1,8 @@
"Użytkownik %s współdzieli plik z tobą",
+"User %s shared a folder with you" => "Uzytkownik %s wspóldzieli folder z toba",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Użytkownik %s współdzieli plik \"%s\" z tobą. Jest dostępny tutaj: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Uzytkownik %s wspóldzieli folder \"%s\" z toba. Jest dostepny tutaj: %s",
"Category type not provided." => "Typ kategorii nie podany.",
"No category to add?" => "Brak kategorii",
"This category already exists: " => "Ta kategoria już istnieje",
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index 24017d3981..a2bfcf4f88 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -1,4 +1,8 @@
"O utilizador %s partilhou um ficheiro consigo.",
+"User %s shared a folder with you" => "O utilizador %s partilhou uma pasta consigo.",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "O utilizador %s partilhou o ficheiro \"%s\" consigo. Está disponível para download aqui: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "O utilizador %s partilhou a pasta \"%s\" consigo. Está disponível para download aqui: %s",
"Category type not provided." => "Tipo de categoria não fornecido",
"No category to add?" => "Nenhuma categoria para adicionar?",
"This category already exists: " => "Esta categoria já existe:",
@@ -39,6 +43,8 @@
"Share with link" => "Partilhar com link",
"Password protect" => "Proteger com palavra-passe",
"Password" => "Palavra chave",
+"Email link to person" => "Enviar o link por e-mail",
+"Send" => "Enviar",
"Set expiration date" => "Especificar data de expiração",
"Expiration date" => "Data de expiração",
"Share via email:" => "Partilhar via email:",
@@ -55,6 +61,8 @@
"Password protected" => "Protegido com palavra-passe",
"Error unsetting expiration date" => "Erro ao retirar a data de expiração",
"Error setting expiration date" => "Erro ao aplicar a data de expiração",
+"Sending ..." => "A Enviar...",
+"Email sent" => "E-mail enviado com sucesso!",
"ownCloud password reset" => "Reposição da password ownCloud",
"Use the following link to reset your password: {link}" => "Use o seguinte endereço para repor a sua password: {link}",
"You will receive a link to reset your password via Email." => "Vai receber um endereço para repor a sua password",
diff --git a/l10n/he/core.po b/l10n/he/core.po
index 376b0ebf7f..131ac2897e 100644
--- a/l10n/he/core.po
+++ b/l10n/he/core.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 23:17+0000\n"
-"Last-Translator: I Robot \n"
+"POT-Creation-Date: 2012-12-18 00:13+0100\n"
+"PO-Revision-Date: 2012-12-17 07:42+0000\n"
+"Last-Translator: Yaron Shahrabani \n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,26 +24,26 @@ msgstr ""
#: ajax/share.php:84
#, php-format
msgid "User %s shared a file with you"
-msgstr ""
+msgstr "המשתמש %s שיתף אתך קובץ"
#: ajax/share.php:86
#, php-format
msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "המשתמש %s שיתף אתך תיקייה"
#: ajax/share.php:88
#, php-format
msgid ""
"User %s shared the file \"%s\" with you. It is available for download here: "
"%s"
-msgstr ""
+msgstr "המשתמש %s שיתף אתך את הקובץ „%s“. ניתן להוריד את הקובץ מכאן: %s"
#: ajax/share.php:90
#, php-format
msgid ""
"User %s shared the folder \"%s\" with you. It is available for download "
"here: %s"
-msgstr ""
+msgstr "המשתמש %s שיתף אתך את התיקייה „%s“. ניתן להוריד את התיקייה מכאן: %s"
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -210,18 +210,18 @@ msgstr "שיתוף עם קישור"
msgid "Password protect"
msgstr "הגנה בססמה"
-#: js/share.js:168 templates/installation.php:42 templates/login.php:24
+#: js/share.js:168 templates/installation.php:44 templates/login.php:26
#: templates/verify.php:13
msgid "Password"
msgstr "ססמה"
#: js/share.js:172
msgid "Email link to person"
-msgstr ""
+msgstr "שליחת קישור בדוא״ל למשתמש"
#: js/share.js:173
msgid "Send"
-msgstr ""
+msgstr "שליחה"
#: js/share.js:177
msgid "Set expiration date"
@@ -289,11 +289,11 @@ msgstr "אירעה שגיאה בעת הגדרת תאריך התפוגה"
#: js/share.js:568
msgid "Sending ..."
-msgstr ""
+msgstr "מתבצעת שליחה ..."
#: js/share.js:579
msgid "Email sent"
-msgstr ""
+msgstr "הודעת הדוא״ל נשלחה"
#: lostpassword/controller.php:47
msgid "ownCloud password reset"
@@ -315,8 +315,8 @@ msgstr "איפוס שליחת דוא״ל."
msgid "Request failed!"
msgstr "הבקשה נכשלה!"
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
-#: templates/login.php:20
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: templates/login.php:21
msgid "Username"
msgstr "שם משתמש"
@@ -405,44 +405,44 @@ msgstr "יתכן שתיקיית הנתונים והקבצים שלך נגישי
msgid "Create an admin account"
msgstr "יצירת חשבון מנהל"
-#: templates/installation.php:48
+#: templates/installation.php:50
msgid "Advanced"
msgstr "מתקדם"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Data folder"
msgstr "תיקיית נתונים"
-#: templates/installation.php:57
+#: templates/installation.php:59
msgid "Configure the database"
msgstr "הגדרת מסד הנתונים"
-#: templates/installation.php:62 templates/installation.php:73
-#: templates/installation.php:83 templates/installation.php:93
+#: templates/installation.php:64 templates/installation.php:75
+#: templates/installation.php:85 templates/installation.php:95
msgid "will be used"
msgstr "ינוצלו"
-#: templates/installation.php:105
+#: templates/installation.php:107
msgid "Database user"
msgstr "שם משתמש במסד הנתונים"
-#: templates/installation.php:109
+#: templates/installation.php:111
msgid "Database password"
msgstr "ססמת מסד הנתונים"
-#: templates/installation.php:113
+#: templates/installation.php:115
msgid "Database name"
msgstr "שם מסד הנתונים"
-#: templates/installation.php:121
+#: templates/installation.php:123
msgid "Database tablespace"
msgstr "מרחב הכתובות של מסד הנתונים"
-#: templates/installation.php:127
+#: templates/installation.php:129
msgid "Database host"
msgstr "שרת בסיס נתונים"
-#: templates/installation.php:132
+#: templates/installation.php:134
msgid "Finish setup"
msgstr "סיום התקנה"
@@ -548,11 +548,11 @@ msgstr "נא לשנות את הססמה שלך כדי לאבטח את חשבונ
msgid "Lost your password?"
msgstr "שכחת את ססמתך?"
-#: templates/login.php:27
+#: templates/login.php:29
msgid "remember"
msgstr "שמירת הססמה"
-#: templates/login.php:28
+#: templates/login.php:30
msgid "Log in"
msgstr "כניסה"
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index e758197590..6fd1d14dd6 100644
--- a/l10n/mk/core.po
+++ b/l10n/mk/core.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 23:17+0000\n"
-"Last-Translator: I Robot \n"
+"POT-Creation-Date: 2012-12-18 00:13+0100\n"
+"PO-Revision-Date: 2012-12-17 12:49+0000\n"
+"Last-Translator: Georgi Stanojevski \n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -23,30 +23,30 @@ msgstr ""
#: ajax/share.php:84
#, php-format
msgid "User %s shared a file with you"
-msgstr ""
+msgstr "Корисникот %s сподели датотека со Вас"
#: ajax/share.php:86
#, php-format
msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "Корисникот %s сподели папка со Вас"
#: ajax/share.php:88
#, php-format
msgid ""
"User %s shared the file \"%s\" with you. It is available for download here: "
"%s"
-msgstr ""
+msgstr "Корисникот %s ја сподели датотека „%s“ со Вас. Достапна е за преземање тука: %s"
#: ajax/share.php:90
#, php-format
msgid ""
"User %s shared the folder \"%s\" with you. It is available for download "
"here: %s"
-msgstr ""
+msgstr "Корисникот %s ја сподели папката „%s“ со Вас. Достапна е за преземање тука: %s"
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
-msgstr ""
+msgstr "Не беше доставен тип на категорија."
#: ajax/vcategories/add.php:30
msgid "No category to add?"
@@ -60,18 +60,18 @@ msgstr "Оваа категорија веќе постои:"
#: ajax/vcategories/favorites.php:24
#: ajax/vcategories/removeFromFavorites.php:26
msgid "Object type not provided."
-msgstr ""
+msgstr "Не беше доставен тип на објект."
#: ajax/vcategories/addToFavorites.php:30
#: ajax/vcategories/removeFromFavorites.php:30
#, php-format
msgid "%s ID not provided."
-msgstr ""
+msgstr "%s ID не беше доставено."
#: ajax/vcategories/addToFavorites.php:35
#, php-format
msgid "Error adding %s to favorites."
-msgstr ""
+msgstr "Грешка при додавање %s во омилени."
#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
msgid "No categories selected for deletion."
@@ -80,7 +80,7 @@ msgstr "Не е одбрана категорија за бришење."
#: ajax/vcategories/removeFromFavorites.php:35
#, php-format
msgid "Error removing %s from favorites."
-msgstr ""
+msgstr "Грешка при бришење на %s од омилени."
#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
msgid "Settings"
@@ -88,59 +88,59 @@ msgstr "Поставки"
#: js/js.js:704
msgid "seconds ago"
-msgstr ""
+msgstr "пред секунди"
#: js/js.js:705
msgid "1 minute ago"
-msgstr ""
+msgstr "пред 1 минута"
#: js/js.js:706
msgid "{minutes} minutes ago"
-msgstr ""
+msgstr "пред {minutes} минути"
#: js/js.js:707
msgid "1 hour ago"
-msgstr ""
+msgstr "пред 1 час"
#: js/js.js:708
msgid "{hours} hours ago"
-msgstr ""
+msgstr "пред {hours} часови"
#: js/js.js:709
msgid "today"
-msgstr ""
+msgstr "денеска"
#: js/js.js:710
msgid "yesterday"
-msgstr ""
+msgstr "вчера"
#: js/js.js:711
msgid "{days} days ago"
-msgstr ""
+msgstr "пред {days} денови"
#: js/js.js:712
msgid "last month"
-msgstr ""
+msgstr "минатиот месец"
#: js/js.js:713
msgid "{months} months ago"
-msgstr ""
+msgstr "пред {months} месеци"
#: js/js.js:714
msgid "months ago"
-msgstr ""
+msgstr "пред месеци"
#: js/js.js:715
msgid "last year"
-msgstr ""
+msgstr "минатата година"
#: js/js.js:716
msgid "years ago"
-msgstr ""
+msgstr "пред години"
#: js/oc-dialogs.js:126
msgid "Choose"
-msgstr ""
+msgstr "Избери"
#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
msgid "Cancel"
@@ -161,7 +161,7 @@ msgstr "Во ред"
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
-msgstr ""
+msgstr "Не е специфициран типот на објект."
#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
@@ -171,92 +171,92 @@ msgstr "Грешка"
#: js/oc-vcategories.js:179
msgid "The app name is not specified."
-msgstr ""
+msgstr "Името на апликацијата не е специфицирано."
#: js/oc-vcategories.js:194
msgid "The required file {file} is not installed!"
-msgstr ""
+msgstr "Задолжителната датотека {file} не е инсталирана!"
#: js/share.js:124 js/share.js:581
msgid "Error while sharing"
-msgstr ""
+msgstr "Грешка при споделување"
#: js/share.js:135
msgid "Error while unsharing"
-msgstr ""
+msgstr "Грешка при прекин на споделување"
#: js/share.js:142
msgid "Error while changing permissions"
-msgstr ""
+msgstr "Грешка при промена на привилегии"
#: js/share.js:151
msgid "Shared with you and the group {group} by {owner}"
-msgstr ""
+msgstr "Споделено со Вас и групата {group} од {owner}"
#: js/share.js:153
msgid "Shared with you by {owner}"
-msgstr ""
+msgstr "Споделено со Вас од {owner}"
#: js/share.js:158
msgid "Share with"
-msgstr ""
+msgstr "Сподели со"
#: js/share.js:163
msgid "Share with link"
-msgstr ""
+msgstr "Сподели со врска"
#: js/share.js:164
msgid "Password protect"
-msgstr ""
+msgstr "Заштити со лозинка"
-#: js/share.js:168 templates/installation.php:42 templates/login.php:24
+#: js/share.js:168 templates/installation.php:44 templates/login.php:26
#: templates/verify.php:13
msgid "Password"
msgstr "Лозинка"
#: js/share.js:172
msgid "Email link to person"
-msgstr ""
+msgstr "Прати врска по е-пошта на личност"
#: js/share.js:173
msgid "Send"
-msgstr ""
+msgstr "Прати"
#: js/share.js:177
msgid "Set expiration date"
-msgstr ""
+msgstr "Постави рок на траење"
#: js/share.js:178
msgid "Expiration date"
-msgstr ""
+msgstr "Рок на траење"
#: js/share.js:210
msgid "Share via email:"
-msgstr ""
+msgstr "Сподели по е-пошта:"
#: js/share.js:212
msgid "No people found"
-msgstr ""
+msgstr "Не се најдени луѓе"
#: js/share.js:239
msgid "Resharing is not allowed"
-msgstr ""
+msgstr "Повторно споделување не е дозволено"
#: js/share.js:275
msgid "Shared in {item} with {user}"
-msgstr ""
+msgstr "Споделено во {item} со {user}"
#: js/share.js:296
msgid "Unshare"
-msgstr ""
+msgstr "Не споделувај"
#: js/share.js:308
msgid "can edit"
-msgstr ""
+msgstr "може да се измени"
#: js/share.js:310
msgid "access control"
-msgstr ""
+msgstr "контрола на пристап"
#: js/share.js:313
msgid "create"
@@ -264,35 +264,35 @@ msgstr "креирај"
#: js/share.js:316
msgid "update"
-msgstr ""
+msgstr "ажурирај"
#: js/share.js:319
msgid "delete"
-msgstr ""
+msgstr "избриши"
#: js/share.js:322
msgid "share"
-msgstr ""
+msgstr "сподели"
#: js/share.js:353 js/share.js:528 js/share.js:530
msgid "Password protected"
-msgstr ""
+msgstr "Заштитено со лозинка"
#: js/share.js:541
msgid "Error unsetting expiration date"
-msgstr ""
+msgstr "Грешка при тргање на рокот на траење"
#: js/share.js:553
msgid "Error setting expiration date"
-msgstr ""
+msgstr "Грешка при поставување на рок на траење"
#: js/share.js:568
msgid "Sending ..."
-msgstr ""
+msgstr "Праќање..."
#: js/share.js:579
msgid "Email sent"
-msgstr ""
+msgstr "Е-порака пратена"
#: lostpassword/controller.php:47
msgid "ownCloud password reset"
@@ -308,14 +308,14 @@ msgstr "Ќе добиете врска по е-пошта за да може д
#: lostpassword/templates/lostpassword.php:5
msgid "Reset email send."
-msgstr ""
+msgstr "Порката за ресетирање на лозинка пратена."
#: lostpassword/templates/lostpassword.php:8
msgid "Request failed!"
-msgstr ""
+msgstr "Барањето не успеа!"
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
-#: templates/login.php:20
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: templates/login.php:21
msgid "Username"
msgstr "Корисничко име"
@@ -377,19 +377,19 @@ msgstr "Додади"
#: templates/installation.php:23 templates/installation.php:31
msgid "Security Warning"
-msgstr ""
+msgstr "Безбедносно предупредување"
#: templates/installation.php:24
msgid ""
"No secure random number generator is available, please enable the PHP "
"OpenSSL extension."
-msgstr ""
+msgstr "Не е достапен безбеден генератор на случајни броеви, Ве молам озвоможете го OpenSSL PHP додатокот."
#: templates/installation.php:26
msgid ""
"Without a secure random number generator an attacker may be able to predict "
"password reset tokens and take over your account."
-msgstr ""
+msgstr "Без сигурен генератор на случајни броеви напаѓач може да ги предвиди жетоните за ресетирање на лозинка и да преземе контрола врз Вашата сметка. "
#: templates/installation.php:32
msgid ""
@@ -398,50 +398,50 @@ msgid ""
"strongly suggest that you configure your webserver in a way that the data "
"directory is no longer accessible or you move the data directory outside the"
" webserver document root."
-msgstr ""
+msgstr "Вашата папка со податоци и датотеките е најверојатно достапна од интернет. .htaccess датотеката што ја овозможува ownCloud не фунционира. Силно препорачуваме да го исконфигурирате вашиот сервер за вашата папка со податоци не е достапна преку интернетт или преместете ја надвор од коренот на веб серверот."
#: templates/installation.php:36
msgid "Create an admin account"
msgstr "Направете администраторска сметка"
-#: templates/installation.php:48
+#: templates/installation.php:50
msgid "Advanced"
msgstr "Напредно"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Data folder"
msgstr "Фолдер со податоци"
-#: templates/installation.php:57
+#: templates/installation.php:59
msgid "Configure the database"
msgstr "Конфигурирај ја базата"
-#: templates/installation.php:62 templates/installation.php:73
-#: templates/installation.php:83 templates/installation.php:93
+#: templates/installation.php:64 templates/installation.php:75
+#: templates/installation.php:85 templates/installation.php:95
msgid "will be used"
msgstr "ќе биде користено"
-#: templates/installation.php:105
+#: templates/installation.php:107
msgid "Database user"
msgstr "Корисник на база"
-#: templates/installation.php:109
+#: templates/installation.php:111
msgid "Database password"
msgstr "Лозинка на база"
-#: templates/installation.php:113
+#: templates/installation.php:115
msgid "Database name"
msgstr "Име на база"
-#: templates/installation.php:121
+#: templates/installation.php:123
msgid "Database tablespace"
-msgstr ""
+msgstr "Табела во базата на податоци"
-#: templates/installation.php:127
+#: templates/installation.php:129
msgid "Database host"
msgstr "Сервер со база"
-#: templates/installation.php:132
+#: templates/installation.php:134
msgid "Finish setup"
msgstr "Заврши го подесувањето"
@@ -531,27 +531,27 @@ msgstr "Одјава"
#: templates/login.php:8
msgid "Automatic logon rejected!"
-msgstr ""
+msgstr "Одбиена автоматска најава!"
#: templates/login.php:9
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
-msgstr ""
+msgstr "Ако не сте ја промениле лозинката во скоро време, вашата сметка може да е компромитирана"
#: templates/login.php:10
msgid "Please change your password to secure your account again."
-msgstr ""
+msgstr "Ве молам сменете ја лозинката да ја обезбедите вашата сметка повторно."
#: templates/login.php:15
msgid "Lost your password?"
msgstr "Ја заборавивте лозинката?"
-#: templates/login.php:27
+#: templates/login.php:29
msgid "remember"
msgstr "запамти"
-#: templates/login.php:28
+#: templates/login.php:30
msgid "Log in"
msgstr "Најава"
@@ -569,14 +569,14 @@ msgstr "следно"
#: templates/verify.php:5
msgid "Security Warning!"
-msgstr ""
+msgstr "Безбедносно предупредување."
#: templates/verify.php:6
msgid ""
"Please verify your password.
For security reasons you may be "
"occasionally asked to enter your password again."
-msgstr ""
+msgstr "Ве молам потврдете ја вашата лозинка.
Од безбедносни причини од време на време може да биде побарано да ја внесете вашата лозинка повторно."
#: templates/verify.php:16
msgid "Verify"
-msgstr ""
+msgstr "Потврди"
diff --git a/l10n/mk/files.po b/l10n/mk/files.po
index 6ff0299222..778f65fd74 100644
--- a/l10n/mk/files.po
+++ b/l10n/mk/files.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-01 00:01+0100\n"
-"PO-Revision-Date: 2012-11-30 23:02+0000\n"
-"Last-Translator: I Robot \n"
+"POT-Creation-Date: 2012-12-18 00:13+0100\n"
+"PO-Revision-Date: 2012-12-17 12:18+0000\n"
+"Last-Translator: Georgi Stanojevski \n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -27,7 +27,7 @@ msgstr "Нема грешка, датотеката беше подигната
#: ajax/upload.php:21
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr ""
+msgstr "Подигнатата датотека ја надминува upload_max_filesize директивата во php.ini:"
#: ajax/upload.php:23
msgid ""
@@ -55,136 +55,136 @@ msgstr "Неуспеав да запишам на диск"
msgid "Files"
msgstr "Датотеки"
-#: js/fileactions.js:117 templates/index.php:83 templates/index.php:84
+#: js/fileactions.js:117 templates/index.php:84 templates/index.php:85
msgid "Unshare"
-msgstr ""
+msgstr "Не споделувај"
-#: js/fileactions.js:119 templates/index.php:89 templates/index.php:90
+#: js/fileactions.js:119 templates/index.php:90 templates/index.php:91
msgid "Delete"
msgstr "Избриши"
#: js/fileactions.js:181
msgid "Rename"
-msgstr ""
+msgstr "Преименувај"
-#: js/filelist.js:201 js/filelist.js:203
+#: js/filelist.js:199 js/filelist.js:201
msgid "{new_name} already exists"
-msgstr ""
+msgstr "{new_name} веќе постои"
-#: js/filelist.js:201 js/filelist.js:203
+#: js/filelist.js:199 js/filelist.js:201
msgid "replace"
-msgstr ""
+msgstr "замени"
-#: js/filelist.js:201
+#: js/filelist.js:199
msgid "suggest name"
-msgstr ""
+msgstr "предложи име"
-#: js/filelist.js:201 js/filelist.js:203
+#: js/filelist.js:199 js/filelist.js:201
msgid "cancel"
-msgstr ""
+msgstr "откажи"
+
+#: js/filelist.js:248
+msgid "replaced {new_name}"
+msgstr "земенета {new_name}"
+
+#: js/filelist.js:248 js/filelist.js:250 js/filelist.js:282 js/filelist.js:284
+msgid "undo"
+msgstr "врати"
#: js/filelist.js:250
-msgid "replaced {new_name}"
-msgstr ""
-
-#: js/filelist.js:250 js/filelist.js:252 js/filelist.js:284 js/filelist.js:286
-msgid "undo"
-msgstr ""
-
-#: js/filelist.js:252
msgid "replaced {new_name} with {old_name}"
-msgstr ""
+msgstr "заменета {new_name} со {old_name}"
+
+#: js/filelist.js:282
+msgid "unshared {files}"
+msgstr "без споделување {files}"
#: js/filelist.js:284
-msgid "unshared {files}"
-msgstr ""
-
-#: js/filelist.js:286
msgid "deleted {files}"
-msgstr ""
+msgstr "избришани {files}"
#: js/files.js:33
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
-msgstr ""
+msgstr "Неправилно име. , '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не се дозволени."
-#: js/files.js:183
+#: js/files.js:174
msgid "generating ZIP-file, it may take some time."
msgstr "Се генерира ZIP фајлот, ќе треба извесно време."
-#: js/files.js:218
+#: js/files.js:209
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Не може да се преземе вашата датотека бидејќи фолдерот во кој се наоѓа фајлот има големина од 0 бајти"
-#: js/files.js:218
+#: js/files.js:209
msgid "Upload Error"
msgstr "Грешка при преземање"
-#: js/files.js:235
+#: js/files.js:226
msgid "Close"
msgstr "Затвои"
-#: js/files.js:254 js/files.js:368 js/files.js:398
+#: js/files.js:245 js/files.js:359 js/files.js:389
msgid "Pending"
msgstr "Чека"
-#: js/files.js:274
+#: js/files.js:265
msgid "1 file uploading"
-msgstr ""
+msgstr "1 датотека се подига"
-#: js/files.js:277 js/files.js:331 js/files.js:346
+#: js/files.js:268 js/files.js:322 js/files.js:337
msgid "{count} files uploading"
-msgstr ""
+msgstr "{count} датотеки се подигаат"
-#: js/files.js:349 js/files.js:382
+#: js/files.js:340 js/files.js:373
msgid "Upload cancelled."
msgstr "Преземањето е прекинато."
-#: js/files.js:451
+#: js/files.js:442
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "Подигање на датотека е во тек. Напуштење на страницата ќе го прекине."
-#: js/files.js:523
+#: js/files.js:512
msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud"
-msgstr ""
+msgstr "Неправилно име на папка. Користењето на „Shared“ е резервирано за Owncloud"
-#: js/files.js:704
+#: js/files.js:693
msgid "{count} files scanned"
-msgstr ""
+msgstr "{count} датотеки скенирани"
-#: js/files.js:712
+#: js/files.js:701
msgid "error while scanning"
-msgstr ""
+msgstr "грешка при скенирање"
-#: js/files.js:785 templates/index.php:65
+#: js/files.js:774 templates/index.php:66
msgid "Name"
msgstr "Име"
-#: js/files.js:786 templates/index.php:76
+#: js/files.js:775 templates/index.php:77
msgid "Size"
msgstr "Големина"
-#: js/files.js:787 templates/index.php:78
+#: js/files.js:776 templates/index.php:79
msgid "Modified"
msgstr "Променето"
-#: js/files.js:814
+#: js/files.js:803
msgid "1 folder"
-msgstr ""
+msgstr "1 папка"
-#: js/files.js:816
+#: js/files.js:805
msgid "{count} folders"
-msgstr ""
+msgstr "{count} папки"
-#: js/files.js:824
+#: js/files.js:813
msgid "1 file"
-msgstr ""
+msgstr "1 датотека"
-#: js/files.js:826
+#: js/files.js:815
msgid "{count} files"
-msgstr ""
+msgstr "{count} датотеки"
#: templates/admin.php:5
msgid "File handling"
@@ -232,7 +232,7 @@ msgstr "Папка"
#: templates/index.php:14
msgid "From link"
-msgstr ""
+msgstr "Од врска"
#: templates/index.php:35
msgid "Upload"
@@ -242,28 +242,28 @@ msgstr "Подигни"
msgid "Cancel upload"
msgstr "Откажи прикачување"
-#: templates/index.php:57
+#: templates/index.php:58
msgid "Nothing in here. Upload something!"
msgstr "Тука нема ништо. Снимете нешто!"
-#: templates/index.php:71
+#: templates/index.php:72
msgid "Download"
msgstr "Преземи"
-#: templates/index.php:103
+#: templates/index.php:104
msgid "Upload too large"
msgstr "Датотеката е премногу голема"
-#: templates/index.php:105
+#: templates/index.php:106
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Датотеките кои се обидувате да ги подигнете ја надминуваат максималната големина за подигнување датотеки на овој сервер."
-#: templates/index.php:110
+#: templates/index.php:111
msgid "Files are being scanned, please wait."
msgstr "Се скенираат датотеки, ве молам почекајте."
-#: templates/index.php:113
+#: templates/index.php:114
msgid "Current scanning"
msgstr "Моментално скенирам"
diff --git a/l10n/mk/files_encryption.po b/l10n/mk/files_encryption.po
index 7a40ba3a3b..2b4f5dfb57 100644
--- a/l10n/mk/files_encryption.po
+++ b/l10n/mk/files_encryption.po
@@ -3,32 +3,33 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Georgi Stanojevski , 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME \n"
+"POT-Creation-Date: 2012-12-18 00:13+0100\n"
+"PO-Revision-Date: 2012-12-17 13:14+0000\n"
+"Last-Translator: Georgi Stanojevski \n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: mk\n"
-"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
#: templates/settings.php:3
msgid "Encryption"
-msgstr ""
+msgstr "Енкрипција"
#: templates/settings.php:4
msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "Исклучи ги следните типови на датотеки од енкрипција"
#: templates/settings.php:5
msgid "None"
-msgstr ""
+msgstr "Ништо"
-#: templates/settings.php:10
+#: templates/settings.php:12
msgid "Enable Encryption"
-msgstr ""
+msgstr "Овозможи енкрипција"
diff --git a/l10n/mk/files_external.po b/l10n/mk/files_external.po
index 0505c9e2d8..6fcaf65d89 100644
--- a/l10n/mk/files_external.po
+++ b/l10n/mk/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
+"POT-Creation-Date: 2012-12-18 00:13+0100\n"
+"PO-Revision-Date: 2012-12-17 13:00+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -64,7 +64,7 @@ msgstr ""
#: templates/settings.php:9
msgid "Backend"
-msgstr ""
+msgstr "Админ"
#: templates/settings.php:10
msgid "Configuration"
diff --git a/l10n/mk/files_sharing.po b/l10n/mk/files_sharing.po
index 99f5454f5a..51205c77b2 100644
--- a/l10n/mk/files_sharing.po
+++ b/l10n/mk/files_sharing.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Georgi Stanojevski , 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot \n"
+"POT-Creation-Date: 2012-12-18 00:13+0100\n"
+"PO-Revision-Date: 2012-12-17 13:31+0000\n"
+"Last-Translator: Georgi Stanojevski \n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,30 +20,30 @@ msgstr ""
#: templates/authenticate.php:4
msgid "Password"
-msgstr ""
+msgstr "Лозинка"
#: templates/authenticate.php:6
msgid "Submit"
-msgstr ""
+msgstr "Прати"
-#: templates/public.php:9
+#: templates/public.php:17
#, php-format
msgid "%s shared the folder %s with you"
-msgstr ""
+msgstr "%s ја сподели папката %s со Вас"
-#: templates/public.php:11
+#: templates/public.php:19
#, php-format
msgid "%s shared the file %s with you"
-msgstr ""
+msgstr "%s ја сподели датотеката %s со Вас"
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:22 templates/public.php:38
msgid "Download"
-msgstr ""
-
-#: templates/public.php:29
-msgid "No preview available for"
-msgstr ""
+msgstr "Преземи"
#: templates/public.php:37
+msgid "No preview available for"
+msgstr "Нема достапно преглед за"
+
+#: templates/public.php:43
msgid "web services under your control"
-msgstr ""
+msgstr "веб сервиси под Ваша контрола"
diff --git a/l10n/mk/files_versions.po b/l10n/mk/files_versions.po
index c611ab40b1..bbe751713a 100644
--- a/l10n/mk/files_versions.po
+++ b/l10n/mk/files_versions.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Georgi Stanojevski , 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot \n"
+"POT-Creation-Date: 2012-12-18 00:13+0100\n"
+"PO-Revision-Date: 2012-12-17 13:19+0000\n"
+"Last-Translator: Georgi Stanojevski \n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,24 +20,24 @@ msgstr ""
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
-msgstr ""
+msgstr "Истечи ги сите верзии"
#: js/versions.js:16
msgid "History"
-msgstr ""
+msgstr "Историја"
#: templates/settings-personal.php:4
msgid "Versions"
-msgstr ""
+msgstr "Версии"
#: templates/settings-personal.php:7
msgid "This will delete all existing backup versions of your files"
-msgstr ""
+msgstr "Ова ќе ги избрише сите постоечки резервни копии од вашите датотеки"
#: templates/settings.php:3
msgid "Files Versioning"
-msgstr ""
+msgstr "Верзии на датотеки"
#: templates/settings.php:4
msgid "Enable"
-msgstr ""
+msgstr "Овозможи"
diff --git a/l10n/mk/lib.po b/l10n/mk/lib.po
index 4be426c9be..a315a725a9 100644
--- a/l10n/mk/lib.po
+++ b/l10n/mk/lib.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Georgi Stanojevski , 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
-"Last-Translator: I Robot \n"
+"POT-Creation-Date: 2012-12-18 00:13+0100\n"
+"PO-Revision-Date: 2012-12-17 13:04+0000\n"
+"Last-Translator: Georgi Stanojevski \n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,57 +18,57 @@ msgstr ""
"Language: mk\n"
"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
-#: app.php:285
+#: app.php:287
msgid "Help"
msgstr "Помош"
-#: app.php:292
+#: app.php:294
msgid "Personal"
msgstr "Лично"
-#: app.php:297
+#: app.php:299
msgid "Settings"
msgstr "Параметри"
-#: app.php:302
+#: app.php:304
msgid "Users"
msgstr "Корисници"
-#: app.php:309
-msgid "Apps"
-msgstr ""
-
#: app.php:311
+msgid "Apps"
+msgstr "Аппликации"
+
+#: app.php:313
msgid "Admin"
-msgstr ""
+msgstr "Админ"
-#: files.php:332
+#: files.php:366
msgid "ZIP download is turned off."
-msgstr ""
+msgstr "Преземање во ZIP е исклучено"
-#: files.php:333
+#: files.php:367
msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "Датотеките треба да се симнат една по една."
-#: files.php:333 files.php:358
+#: files.php:367 files.php:392
msgid "Back to Files"
-msgstr ""
+msgstr "Назад кон датотеки"
-#: files.php:357
+#: files.php:391
msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "Избраните датотеки се преголеми за да се генерира zip."
#: json.php:28
msgid "Application is not enabled"
-msgstr ""
+msgstr "Апликацијата не е овозможена"
#: json.php:39 json.php:64 json.php:77 json.php:89
msgid "Authentication error"
-msgstr ""
+msgstr "Грешка во автентикација"
#: json.php:51
msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "Жетонот е истечен. Ве молам превчитајте ја страницата."
#: search/provider/file.php:17 search/provider/file.php:35
msgid "Files"
@@ -79,74 +80,74 @@ msgstr "Текст"
#: search/provider/file.php:29
msgid "Images"
-msgstr ""
+msgstr "Слики"
#: template.php:103
msgid "seconds ago"
-msgstr ""
+msgstr "пред секунди"
#: template.php:104
msgid "1 minute ago"
-msgstr ""
+msgstr "пред 1 минута"
#: template.php:105
#, php-format
msgid "%d minutes ago"
-msgstr ""
+msgstr "пред %d минути"
#: template.php:106
msgid "1 hour ago"
-msgstr ""
+msgstr "пред 1 час"
#: template.php:107
#, php-format
msgid "%d hours ago"
-msgstr ""
+msgstr "пред %d часови"
#: template.php:108
msgid "today"
-msgstr ""
+msgstr "денеска"
#: template.php:109
msgid "yesterday"
-msgstr ""
+msgstr "вчера"
#: template.php:110
#, php-format
msgid "%d days ago"
-msgstr ""
+msgstr "пред %d денови"
#: template.php:111
msgid "last month"
-msgstr ""
+msgstr "минатиот месец"
#: template.php:112
#, php-format
msgid "%d months ago"
-msgstr ""
+msgstr "пред %d месеци"
#: template.php:113
msgid "last year"
-msgstr ""
+msgstr "минатата година"
#: template.php:114
msgid "years ago"
-msgstr ""
+msgstr "пред години"
#: updater.php:75
#, php-format
msgid "%s is available. Get more information"
-msgstr ""
+msgstr "%s е достапно. Земи повеќе информации"
#: updater.php:77
msgid "up to date"
-msgstr ""
+msgstr "ажурно"
#: updater.php:80
msgid "updates check is disabled"
-msgstr ""
+msgstr "проверката за ажурирања е оневозможена"
#: vcategories.php:188 vcategories.php:249
#, php-format
msgid "Could not find category \"%s\""
-msgstr ""
+msgstr "Не можам да најдам категорија „%s“"
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index b295cb7b66..996f3f8392 100644
--- a/l10n/mk/settings.po
+++ b/l10n/mk/settings.po
@@ -3,15 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Georgi Stanojevski , 2012.
# Miroslav Jovanovic , 2012.
# Miroslav Jovanovic , 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
-"Last-Translator: I Robot \n"
+"POT-Creation-Date: 2012-12-18 00:14+0100\n"
+"PO-Revision-Date: 2012-12-17 12:13+0000\n"
+"Last-Translator: Georgi Stanojevski \n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,19 +22,19 @@ msgstr ""
#: ajax/apps/ocs.php:20
msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Неможам да вчитам листа од App Store"
#: ajax/creategroup.php:10
msgid "Group already exists"
-msgstr ""
+msgstr "Групата веќе постои"
#: ajax/creategroup.php:19
msgid "Unable to add group"
-msgstr ""
+msgstr "Неможе да додадам група"
#: ajax/enableapp.php:12
msgid "Could not enable app. "
-msgstr ""
+msgstr "Неможе да овозможам апликација."
#: ajax/lostpassword.php:12
msgid "Email saved"
@@ -53,15 +54,15 @@ msgstr "неправилно барање"
#: ajax/removegroup.php:13
msgid "Unable to delete group"
-msgstr ""
+msgstr "Неможе да избришам група"
#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
msgid "Authentication error"
-msgstr ""
+msgstr "Грешка во автентикација"
#: ajax/removeuser.php:24
msgid "Unable to delete user"
-msgstr ""
+msgstr "Неможам да избришам корисник"
#: ajax/setlanguage.php:15
msgid "Language changed"
@@ -69,17 +70,17 @@ msgstr "Јазикот е сменет"
#: ajax/togglegroups.php:12
msgid "Admins can't remove themself from the admin group"
-msgstr ""
+msgstr "Администраторите неможе да се избришат себеси од админ групата"
#: ajax/togglegroups.php:28
#, php-format
msgid "Unable to add user to group %s"
-msgstr ""
+msgstr "Неможе да додадам корисник во група %s"
#: ajax/togglegroups.php:34
#, php-format
msgid "Unable to remove user from group %s"
-msgstr ""
+msgstr "Неможе да избришам корисник од група %s"
#: js/apps.js:28 js/apps.js:67
msgid "Disable"
@@ -103,7 +104,7 @@ msgstr "Додадете ја Вашата апликација"
#: templates/apps.php:11
msgid "More Apps"
-msgstr ""
+msgstr "Повеќе аппликации"
#: templates/apps.php:27
msgid "Select an App"
@@ -115,7 +116,7 @@ msgstr "Види ја страницата со апликации на apps.own
#: templates/apps.php:32
msgid "-licensed by "
-msgstr ""
+msgstr "-лиценцирано од "
#: templates/help.php:9
msgid "Documentation"
@@ -144,7 +145,7 @@ msgstr "Одговор"
#: templates/personal.php:8
#, php-format
msgid "You have used %s of the available %s"
-msgstr ""
+msgstr "Имате искористено %s од достапните %s"
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -156,7 +157,7 @@ msgstr "Преземање"
#: templates/personal.php:19
msgid "Your password was changed"
-msgstr ""
+msgstr "Вашата лозинка беше променета."
#: templates/personal.php:20
msgid "Unable to change your password"
@@ -210,7 +211,7 @@ msgid ""
"licensed under the AGPL."
-msgstr ""
+msgstr "Развој од ownCloud заедницата, изворниот код е лиценциран соAGPL."
#: templates/users.php:21 templates/users.php:76
msgid "Name"
@@ -238,7 +239,7 @@ msgstr "Останато"
#: templates/users.php:80 templates/users.php:112
msgid "Group Admin"
-msgstr ""
+msgstr "Администратор на група"
#: templates/users.php:82
msgid "Quota"
diff --git a/l10n/mk/user_ldap.po b/l10n/mk/user_ldap.po
index d1eddd1fb0..206aa2878d 100644
--- a/l10n/mk/user_ldap.po
+++ b/l10n/mk/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2012-12-18 00:13+0100\n"
+"PO-Revision-Date: 2012-12-17 13:32+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -60,7 +60,7 @@ msgstr ""
#: templates/settings.php:18
msgid "Password"
-msgstr ""
+msgstr "Лозинка"
#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index bfca95f397..494afd0475 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -17,9 +17,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-14 00:16+0100\n"
-"PO-Revision-Date: 2012-12-13 07:16+0000\n"
-"Last-Translator: Cyryl Sochacki \n"
+"POT-Creation-Date: 2012-12-18 00:13+0100\n"
+"PO-Revision-Date: 2012-12-17 09:39+0000\n"
+"Last-Translator: emc \n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -30,26 +30,26 @@ msgstr ""
#: ajax/share.php:84
#, php-format
msgid "User %s shared a file with you"
-msgstr ""
+msgstr "Użytkownik %s współdzieli plik z tobą"
#: ajax/share.php:86
#, php-format
msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "Uzytkownik %s wspóldzieli folder z toba"
#: ajax/share.php:88
#, php-format
msgid ""
"User %s shared the file \"%s\" with you. It is available for download here: "
"%s"
-msgstr ""
+msgstr "Użytkownik %s współdzieli plik \"%s\" z tobą. Jest dostępny tutaj: %s"
#: ajax/share.php:90
#, php-format
msgid ""
"User %s shared the folder \"%s\" with you. It is available for download "
"here: %s"
-msgstr ""
+msgstr "Uzytkownik %s wspóldzieli folder \"%s\" z toba. Jest dostepny tutaj: %s"
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -216,7 +216,7 @@ msgstr "Współdziel z link"
msgid "Password protect"
msgstr "Zabezpieczone hasłem"
-#: js/share.js:168 templates/installation.php:42 templates/login.php:24
+#: js/share.js:168 templates/installation.php:44 templates/login.php:26
#: templates/verify.php:13
msgid "Password"
msgstr "Hasło"
@@ -321,8 +321,8 @@ msgstr "Wyślij zresetowany email."
msgid "Request failed!"
msgstr "Próba nieudana!"
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
-#: templates/login.php:20
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: templates/login.php:21
msgid "Username"
msgstr "Nazwa użytkownika"
@@ -411,44 +411,44 @@ msgstr "Katalog danych (data) i pliki są prawdopodobnie dostępnego z Internetu
msgid "Create an admin account"
msgstr "Tworzenie konta administratora"
-#: templates/installation.php:48
+#: templates/installation.php:50
msgid "Advanced"
msgstr "Zaawansowane"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Data folder"
msgstr "Katalog danych"
-#: templates/installation.php:57
+#: templates/installation.php:59
msgid "Configure the database"
msgstr "Konfiguracja bazy danych"
-#: templates/installation.php:62 templates/installation.php:73
-#: templates/installation.php:83 templates/installation.php:93
+#: templates/installation.php:64 templates/installation.php:75
+#: templates/installation.php:85 templates/installation.php:95
msgid "will be used"
msgstr "zostanie użyte"
-#: templates/installation.php:105
+#: templates/installation.php:107
msgid "Database user"
msgstr "Użytkownik bazy danych"
-#: templates/installation.php:109
+#: templates/installation.php:111
msgid "Database password"
msgstr "Hasło do bazy danych"
-#: templates/installation.php:113
+#: templates/installation.php:115
msgid "Database name"
msgstr "Nazwa bazy danych"
-#: templates/installation.php:121
+#: templates/installation.php:123
msgid "Database tablespace"
msgstr "Obszar tabel bazy danych"
-#: templates/installation.php:127
+#: templates/installation.php:129
msgid "Database host"
msgstr "Komputer bazy danych"
-#: templates/installation.php:132
+#: templates/installation.php:134
msgid "Finish setup"
msgstr "Zakończ konfigurowanie"
@@ -554,11 +554,11 @@ msgstr "Proszę zmienić swoje hasło, aby zabezpieczyć swoje konto ponownie."
msgid "Lost your password?"
msgstr "Nie pamiętasz hasła?"
-#: templates/login.php:27
+#: templates/login.php:29
msgid "remember"
msgstr "Zapamiętanie"
-#: templates/login.php:28
+#: templates/login.php:30
msgid "Log in"
msgstr "Zaloguj"
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index 2a05167e0d..92daefee09 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/core.po
@@ -13,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 23:17+0000\n"
-"Last-Translator: I Robot \n"
+"POT-Creation-Date: 2012-12-18 00:13+0100\n"
+"PO-Revision-Date: 2012-12-17 01:27+0000\n"
+"Last-Translator: Mouxy \n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -26,26 +26,26 @@ msgstr ""
#: ajax/share.php:84
#, php-format
msgid "User %s shared a file with you"
-msgstr ""
+msgstr "O utilizador %s partilhou um ficheiro consigo."
#: ajax/share.php:86
#, php-format
msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "O utilizador %s partilhou uma pasta consigo."
#: ajax/share.php:88
#, php-format
msgid ""
"User %s shared the file \"%s\" with you. It is available for download here: "
"%s"
-msgstr ""
+msgstr "O utilizador %s partilhou o ficheiro \"%s\" consigo. Está disponível para download aqui: %s"
#: ajax/share.php:90
#, php-format
msgid ""
"User %s shared the folder \"%s\" with you. It is available for download "
"here: %s"
-msgstr ""
+msgstr "O utilizador %s partilhou a pasta \"%s\" consigo. Está disponível para download aqui: %s"
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -212,18 +212,18 @@ msgstr "Partilhar com link"
msgid "Password protect"
msgstr "Proteger com palavra-passe"
-#: js/share.js:168 templates/installation.php:42 templates/login.php:24
+#: js/share.js:168 templates/installation.php:44 templates/login.php:26
#: templates/verify.php:13
msgid "Password"
msgstr "Palavra chave"
#: js/share.js:172
msgid "Email link to person"
-msgstr ""
+msgstr "Enviar o link por e-mail"
#: js/share.js:173
msgid "Send"
-msgstr ""
+msgstr "Enviar"
#: js/share.js:177
msgid "Set expiration date"
@@ -291,11 +291,11 @@ msgstr "Erro ao aplicar a data de expiração"
#: js/share.js:568
msgid "Sending ..."
-msgstr ""
+msgstr "A Enviar..."
#: js/share.js:579
msgid "Email sent"
-msgstr ""
+msgstr "E-mail enviado com sucesso!"
#: lostpassword/controller.php:47
msgid "ownCloud password reset"
@@ -317,8 +317,8 @@ msgstr "E-mail de reinicialização enviado."
msgid "Request failed!"
msgstr "O pedido falhou!"
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
-#: templates/login.php:20
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: templates/login.php:21
msgid "Username"
msgstr "Utilizador"
@@ -407,44 +407,44 @@ msgstr "A sua pasta com os dados e os seus ficheiros estão provavelmente acess
msgid "Create an admin account"
msgstr "Criar uma conta administrativa"
-#: templates/installation.php:48
+#: templates/installation.php:50
msgid "Advanced"
msgstr "Avançado"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Data folder"
msgstr "Pasta de dados"
-#: templates/installation.php:57
+#: templates/installation.php:59
msgid "Configure the database"
msgstr "Configure a base de dados"
-#: templates/installation.php:62 templates/installation.php:73
-#: templates/installation.php:83 templates/installation.php:93
+#: templates/installation.php:64 templates/installation.php:75
+#: templates/installation.php:85 templates/installation.php:95
msgid "will be used"
msgstr "vai ser usada"
-#: templates/installation.php:105
+#: templates/installation.php:107
msgid "Database user"
msgstr "Utilizador da base de dados"
-#: templates/installation.php:109
+#: templates/installation.php:111
msgid "Database password"
msgstr "Password da base de dados"
-#: templates/installation.php:113
+#: templates/installation.php:115
msgid "Database name"
msgstr "Nome da base de dados"
-#: templates/installation.php:121
+#: templates/installation.php:123
msgid "Database tablespace"
msgstr "Tablespace da base de dados"
-#: templates/installation.php:127
+#: templates/installation.php:129
msgid "Database host"
msgstr "Host da base de dados"
-#: templates/installation.php:132
+#: templates/installation.php:134
msgid "Finish setup"
msgstr "Acabar instalação"
@@ -550,11 +550,11 @@ msgstr "Por favor mude a sua palavra-passe para assegurar a sua conta de novo."
msgid "Lost your password?"
msgstr "Esqueceu a sua password?"
-#: templates/login.php:27
+#: templates/login.php:29
msgid "remember"
msgstr "lembrar"
-#: templates/login.php:28
+#: templates/login.php:30
msgid "Log in"
msgstr "Entrar"
diff --git a/l10n/pt_PT/files_external.po b/l10n/pt_PT/files_external.po
index 1f14f0cbdf..6319794b21 100644
--- a/l10n/pt_PT/files_external.po
+++ b/l10n/pt_PT/files_external.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# , 2012.
# Duarte Velez Grilo , 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
-"Last-Translator: I Robot \n"
+"POT-Creation-Date: 2012-12-18 00:13+0100\n"
+"PO-Revision-Date: 2012-12-17 01:29+0000\n"
+"Last-Translator: Mouxy \n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -46,14 +47,14 @@ msgstr "Erro ao configurar o armazenamento do Google Drive"
msgid ""
"Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "Aviso: O cliente \"smbclient\" não está instalado. Não é possível montar as partilhas CIFS/SMB . Peça ao seu administrador para instalar."
#: lib/config.php:435
msgid ""
"Warning: The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
-msgstr ""
+msgstr "Aviso: O suporte FTP no PHP não está activate ou instalado. Não é possível montar as partilhas FTP. Peça ao seu administrador para instalar."
#: templates/settings.php:3
msgid "External Storage"
diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po
index 075000a100..2ecb6bd375 100644
--- a/l10n/pt_PT/user_ldap.po
+++ b/l10n/pt_PT/user_ldap.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
-"Last-Translator: I Robot \n"
+"POT-Creation-Date: 2012-12-18 00:13+0100\n"
+"PO-Revision-Date: 2012-12-17 01:25+0000\n"
+"Last-Translator: Mouxy \n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -26,13 +26,13 @@ msgid ""
"Warning: Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
-msgstr ""
+msgstr "Aviso: A aplicação user_ldap e user_webdavauth são incompativeis. A aplicação pode tornar-se instável. Por favor, peça ao seu administrador para desactivar uma das aplicações."
#: templates/settings.php:11
msgid ""
"Warning: The PHP LDAP module needs is not installed, the backend will"
" not work. Please ask your system administrator to install it."
-msgstr ""
+msgstr "Aviso: O módulo PHP LDAP necessário não está instalado, o backend não irá funcionar. Peça ao seu administrador para o instalar."
#: templates/settings.php:15
msgid "Host"
diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po
index d35d99ea4e..76ca9c7622 100644
--- a/l10n/sv/user_ldap.po
+++ b/l10n/sv/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
-"Last-Translator: I Robot \n"
+"POT-Creation-Date: 2012-12-18 00:13+0100\n"
+"PO-Revision-Date: 2012-12-17 19:54+0000\n"
+"Last-Translator: Magnus Höglund \n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -23,13 +23,13 @@ msgid ""
"Warning: Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
-msgstr ""
+msgstr "Varning: Apps user_ldap och user_webdavauth är inkompatibla. Oväntade problem kan uppstå. Be din systemadministratör att inaktivera en av dom."
#: templates/settings.php:11
msgid ""
"Warning: The PHP LDAP module needs is not installed, the backend will"
" not work. Please ask your system administrator to install it."
-msgstr ""
+msgstr "Varning: PHP LDAP-modulen måste vara installerad, serversidan kommer inte att fungera. Be din systemadministratör att installera den."
#: templates/settings.php:15
msgid "Host"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 613dd56147..a1174adf32 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-17 00:09+0100\n"
+"POT-Creation-Date: 2012-12-18 00:13+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 76eabc2af0..da55f79012 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-17 00:09+0100\n"
+"POT-Creation-Date: 2012-12-18 00:13+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 58ea8851ad..0afa6f1543 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-17 00:09+0100\n"
+"POT-Creation-Date: 2012-12-18 00:13+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 847da25458..41f9c47aed 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-17 00:09+0100\n"
+"POT-Creation-Date: 2012-12-18 00:13+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index bdd7e9541b..71ef135e0e 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-17 00:09+0100\n"
+"POT-Creation-Date: 2012-12-18 00:13+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 7812d7e24f..874d5f4d2d 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-17 00:09+0100\n"
+"POT-Creation-Date: 2012-12-18 00:13+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 41bbcb03c4..f94e9daa7d 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-17 00:09+0100\n"
+"POT-Creation-Date: 2012-12-18 00:13+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -41,19 +41,19 @@ msgstr ""
msgid "Admin"
msgstr ""
-#: files.php:361
+#: files.php:366
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:362
+#: files.php:367
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:362 files.php:387
+#: files.php:367 files.php:392
msgid "Back to Files"
msgstr ""
-#: files.php:386
+#: files.php:391
msgid "Selected files too large to generate zip file."
msgstr ""
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 05f78285e0..e2d2e5ce96 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-17 00:09+0100\n"
+"POT-Creation-Date: 2012-12-18 00:14+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 9b7639b72d..1cb45878f2 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-17 00:09+0100\n"
+"POT-Creation-Date: 2012-12-18 00:13+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 48295fa214..7ae5590e11 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-17 00:09+0100\n"
+"POT-Creation-Date: 2012-12-18 00:13+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
diff --git a/lib/l10n/mk.php b/lib/l10n/mk.php
index a06073e808..5b3efffb22 100644
--- a/lib/l10n/mk.php
+++ b/lib/l10n/mk.php
@@ -3,6 +3,32 @@
"Personal" => "Лично",
"Settings" => "Параметри",
"Users" => "Корисници",
+"Apps" => "Аппликации",
+"Admin" => "Админ",
+"ZIP download is turned off." => "Преземање во ZIP е исклучено",
+"Files need to be downloaded one by one." => "Датотеките треба да се симнат една по една.",
+"Back to Files" => "Назад кон датотеки",
+"Selected files too large to generate zip file." => "Избраните датотеки се преголеми за да се генерира zip.",
+"Application is not enabled" => "Апликацијата не е овозможена",
+"Authentication error" => "Грешка во автентикација",
+"Token expired. Please reload page." => "Жетонот е истечен. Ве молам превчитајте ја страницата.",
"Files" => "Датотеки",
-"Text" => "Текст"
+"Text" => "Текст",
+"Images" => "Слики",
+"seconds ago" => "пред секунди",
+"1 minute ago" => "пред 1 минута",
+"%d minutes ago" => "пред %d минути",
+"1 hour ago" => "пред 1 час",
+"%d hours ago" => "пред %d часови",
+"today" => "денеска",
+"yesterday" => "вчера",
+"%d days ago" => "пред %d денови",
+"last month" => "минатиот месец",
+"%d months ago" => "пред %d месеци",
+"last year" => "минатата година",
+"years ago" => "пред години",
+"%s is available. Get more information" => "%s е достапно. Земи повеќе информации",
+"up to date" => "ажурно",
+"updates check is disabled" => "проверката за ажурирања е оневозможена",
+"Could not find category \"%s\"" => "Не можам да најдам категорија „%s“"
);
diff --git a/settings/l10n/mk.php b/settings/l10n/mk.php
index 8594825fdd..98465cbf1c 100644
--- a/settings/l10n/mk.php
+++ b/settings/l10n/mk.php
@@ -1,24 +1,38 @@
"Неможам да вчитам листа од App Store",
+"Group already exists" => "Групата веќе постои",
+"Unable to add group" => "Неможе да додадам група",
+"Could not enable app. " => "Неможе да овозможам апликација.",
"Email saved" => "Електронската пошта е снимена",
"Invalid email" => "Неисправна електронска пошта",
"OpenID Changed" => "OpenID сменето",
"Invalid request" => "неправилно барање",
+"Unable to delete group" => "Неможе да избришам група",
+"Authentication error" => "Грешка во автентикација",
+"Unable to delete user" => "Неможам да избришам корисник",
"Language changed" => "Јазикот е сменет",
+"Admins can't remove themself from the admin group" => "Администраторите неможе да се избришат себеси од админ групата",
+"Unable to add user to group %s" => "Неможе да додадам корисник во група %s",
+"Unable to remove user from group %s" => "Неможе да избришам корисник од група %s",
"Disable" => "Оневозможи",
"Enable" => "Овозможи",
"Saving..." => "Снимам...",
"__language_name__" => "__language_name__",
"Add your App" => "Додадете ја Вашата апликација",
+"More Apps" => "Повеќе аппликации",
"Select an App" => "Избери аппликација",
"See application page at apps.owncloud.com" => "Види ја страницата со апликации на apps.owncloud.com",
+"-licensed by " => "-лиценцирано од ",
"Documentation" => "Документација",
"Managing Big Files" => "Управување со големи датотеки",
"Ask a question" => "Постави прашање",
"Problems connecting to help database." => "Проблем при поврзување со базата за помош",
"Go there manually." => "Оди таму рачно.",
"Answer" => "Одговор",
+"You have used %s of the available %s" => "Имате искористено %s од достапните %s",
"Desktop and Mobile Syncing Clients" => "Десктоп и мобилник клиенти за синхронизирање",
"Download" => "Преземање",
+"Your password was changed" => "Вашата лозинка беше променета.",
"Unable to change your password" => "Вашата лозинка неможе да се смени",
"Current password" => "Моментална лозинка",
"New password" => "Нова лозинка",
@@ -30,12 +44,14 @@
"Language" => "Јазик",
"Help translate" => "Помогни во преводот",
"use this address to connect to your ownCloud in your file manager" => "користете ја оваа адреса во менаџерот за датотеки да се поврзете со Вашиот ownCloud",
+"Developed by the ownCloud community, the source code is licensed under the AGPL." => "Развој од ownCloud заедницата, изворниот код е лиценциран соAGPL.",
"Name" => "Име",
"Password" => "Лозинка",
"Groups" => "Групи",
"Create" => "Создај",
"Default Quota" => "Предефинирана квота",
"Other" => "Останато",
+"Group Admin" => "Администратор на група",
"Quota" => "Квота",
"Delete" => "Избриши"
);
From 1dd79cc8e16f2972b8a8fea03f4e8ecfc1db5ac9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?=
Date: Tue, 4 Dec 2012 14:06:44 +0100
Subject: [PATCH 30/58] set password for shared links when the user press enter
and when he leaves the password field
---
core/js/share.js | 26 ++++++++++++++++++--------
1 file changed, 18 insertions(+), 8 deletions(-)
diff --git a/core/js/share.js b/core/js/share.js
index df5ebf008b..984fce047b 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -520,16 +520,26 @@ $(document).ready(function() {
$('#linkPass').toggle('blind');
});
- $('#linkPassText').live('focusout', function(event) {
- var itemType = $('#dropdown').data('item-type');
- var itemSource = $('#dropdown').data('item-source');
- OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $(this).val(), OC.PERMISSION_READ, function() {
- $('#linkPassText').val('');
- $('#linkPassText').attr('placeholder', t('core', 'Password protected'));
- });
- $('#linkPassText').attr('placeholder', t('core', 'Password protected'));
+ $('#linkPassText').live('focusout keyup', function(event) {
+ if ( event.type == 'focusout' || event.keyCode == 13 ) {
+ var itemType = $('#dropdown').data('item-type');
+ var itemSource = $('#dropdown').data('item-source');
+ if ( $('#linkPassText').attr('passwordChanged') == 'true' ) {
+ OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $(this).val(), OC.PERMISSION_READ, function() {
+ $('#linkPassText').val('');
+ $('#linkPassText').attr('placeholder', t('core', 'Password protected'));
+ $('#linkPassText').attr('passwordChanged', 'false');
+ });
+ }
+ }
});
+ $('#linkPassText').live('focusout keyup', function(event) {
+ if ( event.keyCode != 13 ) {
+ $('#linkPassText').attr('passwordChanged', 'true');
+ }
+ });
+
$('#expirationCheckbox').live('click', function() {
if (this.checked) {
OC.Share.showExpirationDate('');
From c457e15b201632bec5f0ad0030f7e0259485b0e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?=
Date: Wed, 5 Dec 2012 14:17:21 +0100
Subject: [PATCH 31/58] some more usability improvements:
merged pull request https://github.com/owncloud/core/pull/121 into this patch with fixes for all issues mentioned in 121
---
core/js/share.js | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/core/js/share.js b/core/js/share.js
index 984fce047b..c218c2c123 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -161,9 +161,9 @@ OC.Share={
if (link) {
html += '