1
0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-11-29 11:24:11 +01:00

Merge branch 'master' of https://github.com/owncloud/contacts into ldap

Conflicts:
	lib/backend/abstractbackend.php
	lib/backend/ldap.php
This commit is contained in:
babelouest 2014-02-27 13:51:21 -05:00
commit a13e1bd28c
31 changed files with 752 additions and 641 deletions

View File

@ -61,8 +61,8 @@ if(\OCP\User::isLoggedIn()) {
$app = new App($api->getUserId());
$addressBooks = $app->getAddressBooksForUser();
foreach($addressBooks as $addressBook) {
//if($addressBook->getBackend()->name === 'local') {
if($addressBook->isActive()) {
\OCP\Contacts::registerAddressBook(new AddressbookProvider($addressBook));
//}
}
}
}

View File

@ -233,36 +233,25 @@ span.ui-icon { margin: 1px 3px 10px 0px; }
margin: 0; padding: .2em;
}
.action, .icon {
[class^="icon-"], [class*=" icon-"], .action, .icon {
display: inline-block;
cursor: pointer;
background-repeat: no-repeat;
}
.action:not(.text), .icon:not(.text) {
.action:not(.text), .icon:not(.text), [class^="icon-"]:not(.text), [class*=" icon-"]:not(.text) {
width: 16px; height: 16px;
padding: 0; margin: 0;
background-position: center;
background-size:contain;
}
.action:not(.add):not(.sort).text, .icon:not(.add):not(.sort).text {
.action:not(.add):not(.sort).text, .icon:not(.add):not(.sort).text, [class^="icon-"]:not(.add):not(.sort).text, [class*=" icon-"]:not(.add):not(.sort).text {
background-position: left;
text-indent: 18px;
}
/* TODO: Use @import url('../css/[no-]svg.css); instead. */
/*.no-svg .add { background-image:url('%webroot%/core/img/actions/add.png'); }*/
.no-svg .delete { background-image:url('%webroot%/core/img/actions/delete.png'); }
.no-svg .edit { background-image:url('%webroot%/core/img/actions/rename.png'); }
.no-svg .share { background-image:url('%webroot%/core/img/actions/share.png'); }
/*.no-svg .groups { background-image:url('%webroot%/core/img/actions/shared.png'); }*/
.no-svg .mail { background-image:url('%webroot%/core/img/actions/mail.png'); }
.no-svg .import, .no-svg .upload { background-image:url('%webroot%/core/img/actions/upload.png'); }
.no-svg .export, .no-svg .download { background-image:url('%webroot%/core/img/actions/download.png'); }
.no-svg .export, .no-svg .shared { background-image:url('%webroot%/core/img/actions/shared.png'); }
.no-svg .globe { background-image:url('%webroot%/core/img/actions/public.png'); }
.no-svg .settings { background-image:url('%webroot%/core/img/actions/settings.svg'); }
.no-svg .starred { background-image:url('../img/starred.png'); background-size: contain; }
.no-svg .checked { background-image:url('../img/checkmark-green.png'); }
.no-svg .checked.disabled { background-image:url('../img/checkmark-gray.png'); cursor: default; }
@ -273,17 +262,6 @@ span.ui-icon { margin: 1px 3px 10px 0px; }
background-repeat: no-repeat;
width: auto; height: auto;
}
/*.svg .add { background-image:url('%webroot%/core/img/actions/add.svg'); }*/
.svg .delete { background-image:url('%webroot%/core/img/actions/delete.svg'); }
.svg .edit { background-image:url('%webroot%/core/img/actions/rename.svg'); }
.svg .share { background-image:url('%webroot%/core/img/actions/share.svg'); }
/*.svg .groups { background-image:url('%webroot%/core/img/actions/shared.svg'); }*/
.svg .mail { background-image:url('%webroot%/core/img/actions/mail.svg'); }
.svg .import,.svg .upload { background-image:url('%webroot%/core/img/actions/upload.svg'); }
.svg .export,.svg .download { background-image:url('%webroot%/core/img/actions/download.svg'); }
.svg .export,.svg .shared { background-image:url('%webroot%/core/img/actions/shared.svg'); }
.svg .globe { background-image:url('%webroot%/core/img/actions/public.svg'); }
.svg .settings { background-image:url('%webroot%/core/img/actions/settings.svg'); }
.svg .starred { background-image:url('../img/starred.svg'); background-size: contain; }
.svg .checked { background-image:url('../img/checkmark-green.svg'); }
.svg .checked.disabled { background-image:url('../img/checkmark-gray.svg'); cursor: default; }
@ -292,8 +270,6 @@ span.ui-icon { margin: 1px 3px 10px 0px; }
.float { float: left; display: inline-block; width: auto; }
.float.right { float: right; }
.break { clear: both; }
.loading { background: url('%webroot%/core/img/loading.gif') no-repeat center !important; cursor: wait; }
.wait { opacity: cursor: wait; }
.control {
border: 1px solid #DDDDDD;
border-radius: 0.3em;
@ -506,11 +482,11 @@ dt[data-element="org"] { margin-top: 4px; }
/* Single elements */
#file_upload_form, #file_upload_target, #import_upload_target, #crop_target { display:none; }
#import_upload_start, .import-upload-button {
width: 30px; height: 30px;
width: 30px !important; height: 30px !important;
display:block;
position: absolute;
right: 0; top: 0;
margin: 5px;
margin: 5px !important;
cursor: pointer;
}
#import_upload_start {
@ -518,7 +494,6 @@ dt[data-element="org"] { margin-top: 4px; }
z-index: 1001;
}
.import-upload-button {
background-image: url("%webroot%/core/img/actions/upload.svg");
background-position: center center;
background-repeat: no-repeat;
cursor: pointer;
@ -568,10 +543,24 @@ input[type=checkbox].propertytype { width: 10px; }
right: -6px; top: -6px;
width: 25px; height: 25px;
}
#photowrapper.wait { opacity: 0.6; filter:alpha(opacity=0.6); z-index:1000; background-image: url('%webroot%/core/img/loading.gif'); cursor: wait; }
#phototools { position:absolute; margin: 5px 0 0 10px; width:auto; height:20px; padding:2px; background-color:#fff; list-style-type:none; border-radius: 0.3em; -moz-box-shadow: 0 1px 3px #777; -webkit-box-shadow: 0 1px 3px #777; box-shadow: 0 1px 3px #777; }
#phototools li { display: inline; }
#phototools li a { float:left; opacity: 0.6; }
#photowrapper.wait { opacity: 0.6; filter:alpha(opacity=0.6); z-index:1000; cursor: wait; }
#phototools {
position:absolute;
bottom: 10px;
margin: 0;
width:auto; height: auto;
background-color:#fff;
list-style-type:none; border-radius: 3px;
-moz-box-shadow: 0 1px 3px #777; -webkit-box-shadow: 0 1px 3px #777; box-shadow: 0 1px 3px #777;
}
#phototools li { display: inline-block; }
#phototools li a {
float:left;
opacity: 0.6;
width: 40px; height: 40px;
background-position: center;
background-size: 90%;
}
#phototools li a:hover { opacity: 0.8; }
#contactphoto_fileupload, #import_upload_start { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; z-index:1001; }
@ -812,9 +801,8 @@ tbody tr.contact.active, tbody tr.contact:hover {
cursor:pointer;
width:16px; height:16px;
margin: 18px 0 2px 5px; z-index: 200;
opacity: 0.6; background-image:url('%webroot%/core/img/actions/mail.svg');
display: none; opacity: 0.8;
}
#contactlist tbody > tr > td a.mailto:hover { opacity: 0.8; }
#contactlist tbody > tr > td > a.delete {
position: absolute;
@ -855,8 +843,6 @@ tbody tr.contact.active, tbody tr.contact:hover {
-ms-transform: rotate(270deg); transform: rotate(270deg);
}
#contact figure img { -moz-border-radius:.3em; -webkit-border-radius:.3em; border-radius:.3em; border: thin solid #bbb; margin: 0.3em; background-image: url('%webroot%/core/img/loading.gif'); -moz-box-shadow: 0 1px 3px #777; -webkit-box-shadow: 0 1px 3px #777; box-shadow: 0 1px 3px #777; opacity: 1; }
#contact span.adr {
float: left;
width: 300px;

36
css/font-awesome.css vendored
View File

@ -1,36 +0,0 @@
/* Alter the FontAwesome style sheet to not change the font for normal text.
* Enable you to do eg. <button class="icon-fubar">Text</button> without the
* need for an extra <i /> element.
*
* This requires the 3rdparty_minimizer_path branch:
*@import url('%3rdpartyroot%/fontawesome/css/font-awesome.min.css');*/
[class^="icon-"],
[class*=" icon-"] {
font-family: "Lucida Grande", Arial, Verdana, sans-serif;
}
[class^="icon-"]:before,
[class*=" icon-"]:before {
font-family: FontAwesome;
font-weight: normal;
font-style: normal;
text-decoration: inherit;
-webkit-font-smoothing: antialiased;
}
input[type="submit"][class^="icon-"].text, input[type="submit"][class*=" icon-"].text,
input[type="button"][class^="icon-"].text, input[type="button"][class*=" icon-"].text,
button[class^="icon-"].text, button[class*=" icon-"].text,
.button[class^="icon-"].text, .button[class*=" icon-"].text,
select[class^="icon-"].text, select[class*=" icon-"].text {
font-weight: bold;
}
input[type="submit"][class^="icon-"].text:before, input[type="submit"][class*=" icon-"].text:before,
input[type="button"][class^="icon-"].text:before, input[type="button"][class*=" icon-"].text:before,
button[class^="icon-"].text:before, button[class*=" icon-"].text:before,
.button[class^="icon-"].text:before, .button[class*=" icon-"].text:before,
select[class^="icon-"].text:before, select[class*=" icon-"].text:before {
padding-right: 3px;
}

View File

@ -588,6 +588,7 @@ OC.Contacts = OC.Contacts || {};
self.data.FN = [{name:'FN', value:'', parameters:[]}];
}
self.data.FN[0]['value'] = value;
self.displayNames.fn = value;
var nempty = true;
if(!self.data.N) {
// TODO: Maybe add a method for constructing new elements?
@ -611,6 +612,10 @@ OC.Contacts = OC.Contacts || {};
self.saveProperty({name:'N', value:self.data.N[0].value.join(';')});
}, 500);
}
// If contacts doesn't have a photo load new avatar
if(!self.hasPhoto() && self.sortOrder === 'fn') {
self.loadAvatar();
}
break;
case 'N':
if(!utils.isArray(value)) {
@ -621,6 +626,9 @@ OC.Contacts = OC.Contacts || {};
self.$fullelem.find('#n_' + idx).val(val).get(0).defaultValue = val;
});
}
self.displayNames.fl = value.slice(0, 2).reverse().join(' ');
self.displayNames.lf = value.slice(0, 2).join(', ').trim();
var $fullname = self.$fullelem.find('.fullname'), fullname = '';
var update_fn = false;
if(!self.data.FN) {
@ -649,6 +657,9 @@ OC.Contacts = OC.Contacts || {};
self.saveProperty({name:'FN', value:self.data.FN[0]['value']});
}, 1000);
}
if(!self.hasPhoto() && self.sortOrder !== 'fn') {
self.loadAvatar();
}
case 'NICKNAME':
case 'ORG':
// Auto-fill FN if empty
@ -1308,7 +1319,7 @@ OC.Contacts = OC.Contacts || {};
state: !state
});
});
this.loadPhoto();
this.loadAvatar();
if(!this.data) {
// A new contact
this.setEnabled(true);
@ -1630,12 +1641,11 @@ OC.Contacts = OC.Contacts || {};
/**
* Render the PHOTO property.
*/
Contact.prototype.loadPhoto = function() {
Contact.prototype.loadAvatar = function() {
var self = this;
var id = this.id || 'new',
backend = this.metadata.backend,
parent = this.metadata.parent,
src;
parent = this.metadata.parent;
var $phototools = this.$fullelem.find('#phototools');
var $photowrapper = this.$fullelem.find('#photowrapper');
@ -1643,33 +1653,35 @@ OC.Contacts = OC.Contacts || {};
var finishLoad = function(image) {
console.log('finishLoad', self.getDisplayName(), image.width, image.height);
$(image).addClass('contactphoto');
$photowrapper.removeClass('loading wait');
$photowrapper.removeClass('loading');
$photowrapper.css({width: image.width + 10, height: image.height + 10});
$(image).insertAfter($phototools).fadeIn();
};
$photowrapper.addClass('loading').addClass('wait');
console.log('hasPhoto', this.hasPhoto());
var addAvatar = function() {
console.log('adding avatar for', self.getDisplayName());
$photowrapper.find('.contactphoto').remove();
var name = String(self.getDisplayName()).replace(' ', '').replace(',', '');
$('<div />').appendTo($photowrapper)
.css({width: $photowrapper.width()-10, height: $photowrapper.height()-10})
.addClass('contactphoto')
.imageplaceholder(name || '#');
};
$photowrapper.addClass('loading');
if(!this.hasPhoto()) {
$.when(this.storage.getDefaultPhoto())
.then(function(image) {
$('img.contactphoto').detach();
finishLoad(image);
});
$photowrapper.removeClass('loading');
addAvatar();
} else {
$.when(this.storage.getContactPhoto(backend, parent, id))
.then(function(image) {
$('img.contactphoto').remove();
$photowrapper.find('.contactphoto').remove();
finishLoad(image);
})
.fail(function() {
console.log('Error getting photo, trying default image');
$('img.contactphoto').remove();
$.when(self.storage.getDefaultPhoto())
.then(function(image) {
$('img.contactphoto').detach();
finishLoad(image);
});
console.log('Error getting photo.');
$photowrapper.find('.contactphoto').remove();
addAvatar();
});
}
@ -1718,7 +1730,7 @@ OC.Contacts = OC.Contacts || {};
self.data.thumbnail = null;
self.data.photo = false;
}
self.loadPhoto(true);
self.loadAvatar(true);
self.setThumbnail(null, true);
});
}

View File

@ -688,7 +688,7 @@ OC.Contacts = OC.Contacts || {};
$elem.data('obj', self);
$elem.data('rawname', t('contacts', 'Favorites'));
if(!$elem.find('.starred').length) {
$elem.data('contacts', contacts).find('.numcontacts').before('<span class="starred action" />');
$elem.data('contacts', contacts).find('.numcontacts').before('<span class="icon icon-starred starred action" />');
}
$elem.droppable({
drop: self.contactDropped,

View File

@ -377,32 +377,6 @@ OC.Contacts = OC.Contacts || {};
return defer.promise();
};
/**
* Get Image instance for default profile picture
*
* This method loads the default picture only once and caches it.
*
* @return Image
*/
Storage.prototype.getDefaultPhoto = function() {
console.log('Storage.getDefaultPhoto');
if(!this.defaultPhoto) {
var defer = $.Deferred();
var url = OC.imagePath('contacts', 'person_large.png');
this.defaultPhoto = new Image();
var self = this;
$(this.defaultPhoto)
.load(function() {
defer.resolve(this);
}).error(function(event) {
defer.reject();
}).attr('src', url)
return defer.promise();
} else {
return this.defaultPhoto;
}
};
/**
* Update a contact.
*

View File

@ -16,9 +16,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
"POT-Creation-Date: 2014-02-16 01:13-0500\n"
"PO-Revision-Date: 2014-02-15 11:30+0000\n"
"Last-Translator: I Robot\n"
"POT-Creation-Date: 2014-02-27 00:49-0500\n"
"PO-Revision-Date: 2014-02-26 15:50+0000\n"
"Last-Translator: pstast <petr@stastny.eu>\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"
@ -78,129 +78,129 @@ msgstr "Neodstranitelná chyba při načítání adresářů kontaktů: {msg}"
msgid "Error."
msgstr "Chyba."
#: js/app.js:323 js/app.js:337
#: js/app.js:321 js/app.js:335
msgid "Add to..."
msgstr "Přidat do..."
#: js/app.js:327 js/app.js:339
#: js/app.js:325 js/app.js:337
msgid "Remove from..."
msgstr "Odebrat z..."
#: js/app.js:344
#: js/app.js:342
msgid "Add group..."
msgstr "Přidat skupinu..."
#: js/app.js:472
#: js/app.js:470
msgid "Invalid URL: \"{url}\""
msgstr "Neplatná URL: \"{url}\""
#: js/app.js:483
#: js/app.js:481
msgid "There was an error opening a mail composer."
msgstr "Nastala chyba při otevírání editoru e-malů."
#: js/app.js:488
#: js/app.js:486
msgid "Invalid email: \"{url}\""
msgstr "Neplatný e-mail: \"{url}\""
#: js/app.js:571
#: js/app.js:569
msgid "Merge failed. Cannot find contact: {id}"
msgstr "Sloučení selhalo. Nelze nalézt kontakt: {id}"
#: js/app.js:584
#: js/app.js:582
msgid "Merge failed."
msgstr "Sloučení selhalo."
#: js/app.js:591
#: js/app.js:589
msgid "Merge failed. Error saving contact."
msgstr "Sloučení selhalo. Chyba při ukládání kontaktu."
#: js/app.js:611
#: js/app.js:609
msgid "Select photo"
msgstr "Vybrat fotku"
#: js/app.js:691 js/app.js:1633
#: js/app.js:689 js/app.js:1631
msgid "Network or server error. Please inform administrator."
msgstr "Chyba sítě či serveru. Kontaktujte prosím správce."
#: js/app.js:913
#: js/app.js:911
msgid "Error adding to group."
msgstr "Chyba při přidávání do skupiny"
#: js/app.js:936
#: js/app.js:934
msgid "Error removing from group."
msgstr "Chyba při odebírání ze skupiny"
#: js/app.js:1112
#: js/app.js:1110
msgid ""
"You have selected over 300 contacts.\n"
"This will most likely fail! Click here to try anyway."
msgstr "Je označeno více než 300 kontaktů.\nToto pravděpodobně selže. Klikněte zde, pokud chcete přesto pokračovat."
#: js/app.js:1150
#: js/app.js:1148
msgid "Error setting {name} as favorite."
msgstr "Chyba při nastavování {name} jako oblíbený."
#: js/app.js:1289 js/app.js:1293 templates/contacts.php:171
#: js/app.js:1287 js/app.js:1291 templates/contacts.php:171
msgid "Merge contacts"
msgstr "Sloučit kontakty"
#: js/app.js:1315 js/app.js:1368 js/settings.js:120 templates/settings.php:62
#: js/app.js:1313 js/app.js:1366 js/settings.js:120 templates/settings.php:62
msgid "Cancel"
msgstr "Zrušit"
#: js/app.js:1342 templates/contacts.php:152
#: js/app.js:1340 templates/contacts.php:152
msgid "Add group"
msgstr "Přidat skupinu"
#: js/app.js:1346
#: js/app.js:1344
msgid "OK"
msgstr "OK"
#: js/app.js:1457
#: js/app.js:1455
msgid "Could not find contact: {id}"
msgstr "Nelze nalézt kontakt: {id}"
#: js/app.js:1480
#: js/app.js:1478
msgid "No files selected for upload."
msgstr "Žádné soubory nebyly vybrány k nahrání."
#: js/app.js:1490
#: js/app.js:1488
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Soubor, který se pokoušíte odeslat, přesahuje maximální velikost povolenou na serveru."
#: js/app.js:1591
#: js/app.js:1589
msgid "Edit profile picture"
msgstr "Upravit obrázek profilu"
#: js/app.js:1595
#: js/app.js:1593
msgid "Crop photo"
msgstr "Oříznout fotku"
#: js/contacts.js:878
#: js/contacts.js:889
msgid "Error parsing date: {date}"
msgstr "Chyba při parsování data: {date}"
#: js/contacts.js:1082
#: js/contacts.js:1093
msgid "# groups"
msgstr "počet skupin"
#: js/contacts.js:1156
#: js/contacts.js:1167
msgid "Error parsing birthday {bday}"
msgstr "Chyba parsování narozenin {bday}"
#: js/contacts.js:2228
#: js/contacts.js:2240
msgid ""
"Some contacts are marked for deletion, but not deleted yet. Please wait for "
"them to be deleted."
msgstr "Některé kontakty jsou označeny ke smazání, ale ještě smazány nejsou. Počkejte, prosím, na dokončení operace."
#: js/contacts.js:2239
#: js/contacts.js:2251
msgid "Click to undo deletion of {num} contacts"
msgstr "Klikněte pro navrácení smazání {num} kontaktů"
#: js/contacts.js:2248
#: js/contacts.js:2260
msgid "Cancelled deletion of {num} contacts"
msgstr "Smazání {num} kontaktů zrušeno"
@ -671,7 +671,7 @@ msgstr "Nebyla zadána hodnota."
msgid "Could not set preference: "
msgstr "Nelze nastavit předvolby:"
#: lib/searchprovider.php:32
#: lib/searchprovider.php:37
msgid "Contact"
msgstr "Kontakt"

View File

@ -33,8 +33,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
"POT-Creation-Date: 2014-02-16 01:13-0500\n"
"PO-Revision-Date: 2014-02-15 11:30+0000\n"
"POT-Creation-Date: 2014-02-25 00:49-0500\n"
"PO-Revision-Date: 2014-02-24 23:30+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@ -95,103 +95,103 @@ msgstr "Ανεπανόρθωτο σφάλμα κατά τη φόρτωση τω
msgid "Error."
msgstr "Σφάλμα."
#: js/app.js:323 js/app.js:337
#: js/app.js:321 js/app.js:335
msgid "Add to..."
msgstr "Προσθήκη στο..."
#: js/app.js:327 js/app.js:339
#: js/app.js:325 js/app.js:337
msgid "Remove from..."
msgstr "Αφαίρεση από το..."
#: js/app.js:344
#: js/app.js:342
msgid "Add group..."
msgstr "Προσθήκη ομάδας..."
#: js/app.js:472
#: js/app.js:470
msgid "Invalid URL: \"{url}\""
msgstr "Μη έγκυρη URL: \"{url}\""
#: js/app.js:483
#: js/app.js:481
msgid "There was an error opening a mail composer."
msgstr "Υπήρχε ένα σφάλμα στο άνοιγμα του επεξεργαστή μηνυμάτων."
#: js/app.js:488
#: js/app.js:486
msgid "Invalid email: \"{url}\""
msgstr "Μη έγκυρο email: \"{url}\""
#: js/app.js:571
#: js/app.js:569
msgid "Merge failed. Cannot find contact: {id}"
msgstr "Αποτυχία συγχώνευσης. Αδυναμία εύρεσης επαφής: {id}"
#: js/app.js:584
#: js/app.js:582
msgid "Merge failed."
msgstr "Η συγχώνευση απέτυχε. "
#: js/app.js:591
#: js/app.js:589
msgid "Merge failed. Error saving contact."
msgstr "Αποτυχία συγχώνευσης. Σφάλμα αποθήκευσης επαφής."
#: js/app.js:611
#: js/app.js:609
msgid "Select photo"
msgstr "Επέλεξε φωτογραφία"
#: js/app.js:691 js/app.js:1633
#: js/app.js:689 js/app.js:1631
msgid "Network or server error. Please inform administrator."
msgstr "Σφάλμα δικτύου ή διακομιστή. Παρακαλώ ενημερώστε το διαχειριστή."
#: js/app.js:913
#: js/app.js:911
msgid "Error adding to group."
msgstr "Σφάλμα κατά την προσθήκη σε ομάδα."
#: js/app.js:936
#: js/app.js:934
msgid "Error removing from group."
msgstr "Σφάλμα κατά την αφαίρεση από ομάδα."
#: js/app.js:1112
#: js/app.js:1110
msgid ""
"You have selected over 300 contacts.\n"
"This will most likely fail! Click here to try anyway."
msgstr "Έχετε επιλέξει πάνω από 300 επαφές.\nΑυτό μάλλον θα αποτύχει! Κλικάρετε εδώ για να δοκιμάσετε ούτως ή άλλως."
#: js/app.js:1150
#: js/app.js:1148
msgid "Error setting {name} as favorite."
msgstr "Σφάλμα κατά τον ορισμό του {name} σαν αγαπημένο."
#: js/app.js:1289 js/app.js:1293 templates/contacts.php:171
#: js/app.js:1287 js/app.js:1291 templates/contacts.php:171
msgid "Merge contacts"
msgstr "Συγχώνευση επαφών"
#: js/app.js:1315 js/app.js:1368 js/settings.js:120 templates/settings.php:62
#: js/app.js:1313 js/app.js:1366 js/settings.js:120 templates/settings.php:62
msgid "Cancel"
msgstr "Άκυρο"
#: js/app.js:1342 templates/contacts.php:152
#: js/app.js:1340 templates/contacts.php:152
msgid "Add group"
msgstr "Προσθήκη ομάδας"
#: js/app.js:1346
#: js/app.js:1344
msgid "OK"
msgstr "ΟΚ"
#: js/app.js:1457
#: js/app.js:1455
msgid "Could not find contact: {id}"
msgstr "Αδυναμία εύρεσης επαφής: {id}"
#: js/app.js:1480
#: js/app.js:1478
msgid "No files selected for upload."
msgstr "Δεν επιλέχτηκαν αρχεία για μεταφόρτωση."
#: js/app.js:1490
#: js/app.js:1488
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Το αρχείο που προσπαθείτε να μεταφορτώσετε υπερβαίνει το μέγιστο μέγεθος μεταφόρτωσης αρχείων σε αυτόν το διακομιστή."
#: js/app.js:1591
#: js/app.js:1589
msgid "Edit profile picture"
msgstr "Επεξεργασία εικόνας προφίλ"
#: js/app.js:1595
#: js/app.js:1593
msgid "Crop photo"
msgstr "Περικοπή φωτογραφίας"

View File

@ -184,6 +184,7 @@
"First- Lastname" => "Izena, Abizena",
"Last-, Firstname" => "Abizena, Izena",
"Groups" => "Taldeak",
"Merge" => "Elkartu",
"Email" => "E-posta",
"Phone" => "Telefonoa",
"Address" => "Helbidea",

View File

@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
"POT-Creation-Date: 2014-02-16 01:13-0500\n"
"PO-Revision-Date: 2014-02-15 11:30+0000\n"
"Last-Translator: I Robot\n"
"POT-Creation-Date: 2014-02-27 00:49-0500\n"
"PO-Revision-Date: 2014-02-26 18:40+0000\n"
"Last-Translator: asieriko <asieriko@gmail.com>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -74,129 +74,129 @@ msgstr "Errorea izan da helbide-liburua kargatzerakoan : {msg}"
msgid "Error."
msgstr "Akatsa."
#: js/app.js:323 js/app.js:337
#: js/app.js:321 js/app.js:335
msgid "Add to..."
msgstr "Gehitu hemen..."
#: js/app.js:327 js/app.js:339
#: js/app.js:325 js/app.js:337
msgid "Remove from..."
msgstr "Ezabatu hemendik..."
#: js/app.js:344
#: js/app.js:342
msgid "Add group..."
msgstr "Gehitu taldea..."
#: js/app.js:472
#: js/app.js:470
msgid "Invalid URL: \"{url}\""
msgstr "URL ez-egokia: \"{url}\""
#: js/app.js:483
#: js/app.js:481
msgid "There was an error opening a mail composer."
msgstr "Errore bat izan da posta editorea abiaraztean."
#: js/app.js:488
#: js/app.js:486
msgid "Invalid email: \"{url}\""
msgstr "e-posta ez egokia: \"{url}\""
#: js/app.js:571
#: js/app.js:569
msgid "Merge failed. Cannot find contact: {id}"
msgstr "Bateratzeak huts egin du. Ezin izan da kontaktua aurkitu: {id}"
#: js/app.js:584
#: js/app.js:582
msgid "Merge failed."
msgstr "Bateratzeak huts egin du."
#: js/app.js:591
#: js/app.js:589
msgid "Merge failed. Error saving contact."
msgstr "Bateratzeak huts egin du. Errorea kontaktua gordetzerakoan."
#: js/app.js:611
#: js/app.js:609
msgid "Select photo"
msgstr "Hautatu argazkia"
#: js/app.js:691 js/app.js:1633
#: js/app.js:689 js/app.js:1631
msgid "Network or server error. Please inform administrator."
msgstr "Errore bat izan da sare edo zerbitzarian. Mesedez abisatu administradorea."
#: js/app.js:913
#: js/app.js:911
msgid "Error adding to group."
msgstr "Errore bat izan da taldera gehitzean."
#: js/app.js:936
#: js/app.js:934
msgid "Error removing from group."
msgstr "Errore bat izan da taldetik kentzean."
#: js/app.js:1112
#: js/app.js:1110
msgid ""
"You have selected over 300 contacts.\n"
"This will most likely fail! Click here to try anyway."
msgstr "300 kontaktu baino gehiago hautatu dituzu.\nHonek ziurasko huts egingo du! Sakatu hemen hala ere jarraitzeko."
#: js/app.js:1150
#: js/app.js:1148
msgid "Error setting {name} as favorite."
msgstr "Errorea {name} gogokoetara gehitzerakoan."
#: js/app.js:1289 js/app.js:1293 templates/contacts.php:171
#: js/app.js:1287 js/app.js:1291 templates/contacts.php:171
msgid "Merge contacts"
msgstr "Kontaktuak batu"
#: js/app.js:1315 js/app.js:1368 js/settings.js:120 templates/settings.php:62
#: js/app.js:1313 js/app.js:1366 js/settings.js:120 templates/settings.php:62
msgid "Cancel"
msgstr "Ezeztatu"
#: js/app.js:1342 templates/contacts.php:152
#: js/app.js:1340 templates/contacts.php:152
msgid "Add group"
msgstr "Gehitu taldea"
#: js/app.js:1346
#: js/app.js:1344
msgid "OK"
msgstr "Ados"
#: js/app.js:1457
#: js/app.js:1455
msgid "Could not find contact: {id}"
msgstr "Ezin izan dugu kontaktua topatu: {id}"
#: js/app.js:1480
#: js/app.js:1478
msgid "No files selected for upload."
msgstr "Ez duzu igotzeko fitxategirik hautatu."
#: js/app.js:1490
#: js/app.js:1488
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Igo nahi duzun fitxategia zerbitzariak onartzen duen tamaina baino handiagoa da."
#: js/app.js:1591
#: js/app.js:1589
msgid "Edit profile picture"
msgstr "Editatu profilaren argazkia"
#: js/app.js:1595
#: js/app.js:1593
msgid "Crop photo"
msgstr "Moztu argazkia"
#: js/contacts.js:878
#: js/contacts.js:889
msgid "Error parsing date: {date}"
msgstr "Errorea data aztertzerakoan: {date}"
#: js/contacts.js:1082
#: js/contacts.js:1093
msgid "# groups"
msgstr "# taldeak"
#: js/contacts.js:1156
#: js/contacts.js:1167
msgid "Error parsing birthday {bday}"
msgstr ""
#: js/contacts.js:2228
#: js/contacts.js:2240
msgid ""
"Some contacts are marked for deletion, but not deleted yet. Please wait for "
"them to be deleted."
msgstr "Kontaktu batzuk ezabatzeko markatuta daude, baina oraindik ez dira ezabatu. Mesedez itxoin ezabatu arte."
#: js/contacts.js:2239
#: js/contacts.js:2251
msgid "Click to undo deletion of {num} contacts"
msgstr "Klikatu {num} kontaktuen ezabaketa desegiteko"
#: js/contacts.js:2248
#: js/contacts.js:2260
msgid "Cancelled deletion of {num} contacts"
msgstr "{num} kontaktuen ezabaketa ezeztatuta"
@ -667,7 +667,7 @@ msgstr "Ez da baliorik eman."
msgid "Could not set preference: "
msgstr "Ezin izan da lehentasuna ezarri:"
#: lib/searchprovider.php:32
#: lib/searchprovider.php:37
msgid "Contact"
msgstr "Kontaktua"
@ -837,7 +837,7 @@ msgstr "Taldeak"
#: templates/contacts.php:67
msgid "Merge"
msgstr ""
msgstr "Elkartu"
#: templates/contacts.php:70 templates/contacts.php:347
msgid "Email"

View File

@ -2,6 +2,17 @@
"Contacts" => "ارتباط‌ها",
"Save" => "ذخیره",
"Uploading..." => "درحال بارگذاری...",
"Importing..." => "در حال وارد کردن...",
"Imported {count} of {total} contacts" => "{count} از {total} کاربر وارد شد",
"Imported {imported} contacts. {failed} failed." => "{imported} کاربر وارد شد. {failed} ناموفق بود.",
"An address book called {name} already exists" => "دفتر تلفن با نام {name} در حال حاضر وجود دارد",
"Failed adding address book: {error}" => "خطا در خصوص اضافه نمودن دفتر تلفن: {error}",
"Failed loading address books: {error}" => "خطا در خصوص فراخوانی دفتر تلفن: {error}",
"Indexing contacts" => "ایندکس کردن کانتکت ها",
"Error." => "خطا.",
"Add to..." => "اضافه کردن به...",
"Remove from..." => "حذف از...",
"Add group..." => "اضافه کردن گروه...",
"Select photo" => "تصویر را انتخاب کنید",
"Cancel" => "منصرف شدن",
"OK" => "باشه",
@ -39,6 +50,7 @@
"Failed to write to disk" => "نوشتن بر روی دیسک سخت ناموفق بود",
"Not enough storage available" => "فضای کافی در دسترس نیست",
"Error uploading contacts to storage." => "خطا در هنگام بارگذاری و ذخیره سازی",
"Could not set preference: " => "نمی‌توان تنظیمات را ثبت نمود:",
"Contact" => "اشخاص",
"Other" => "دیگر",
"Work" => "کار",

View File

@ -7,13 +7,14 @@
# Amir Reza Asadi <amirreza.asadi@live.com>, 2013
# Hossein Rayeshman <rayeshman@gmail.com>, 2012
# miki_mika1362 <miki_mika1362@yahoo.com>, 2013
# S. Wasim Tayyeb, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
"POT-Creation-Date: 2014-02-16 01:13-0500\n"
"PO-Revision-Date: 2014-02-15 11:30+0000\n"
"Last-Translator: I Robot\n"
"POT-Creation-Date: 2014-02-26 00:49-0500\n"
"PO-Revision-Date: 2014-02-25 22:00+0000\n"
"Last-Translator: S. Wasim Tayyeb\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -35,7 +36,7 @@ msgstr "درحال بارگذاری..."
#: js/addressbooks.js:301 js/loader.js:68
msgid "Importing..."
msgstr ""
msgstr "در حال وارد کردن..."
#: js/addressbooks.js:324
msgid "Preparing..."
@ -43,27 +44,27 @@ msgstr ""
#: js/addressbooks.js:372
msgid "Imported {count} of {total} contacts"
msgstr ""
msgstr "{count} از {total} کاربر وارد شد"
#: js/addressbooks.js:394
msgid "Imported {imported} contacts. {failed} failed."
msgstr ""
msgstr "{imported} کاربر وارد شد. {failed} ناموفق بود."
#: js/addressbooks.js:550
msgid "An address book called {name} already exists"
msgstr ""
msgstr "دفتر تلفن با نام {name} در حال حاضر وجود دارد"
#: js/addressbooks.js:584
msgid "Failed adding address book: {error}"
msgstr ""
msgstr "خطا در خصوص اضافه نمودن دفتر تلفن: {error}"
#: js/addressbooks.js:626
msgid "Failed loading address books: {error}"
msgstr ""
msgstr "خطا در خصوص فراخوانی دفتر تلفن: {error}"
#: js/app.js:215
msgid "Indexing contacts"
msgstr ""
msgstr "ایندکس کردن کانتکت ها"
#: js/app.js:225
msgid "Unrecoverable error loading address books: {msg}"
@ -71,105 +72,105 @@ msgstr ""
#: js/app.js:226
msgid "Error."
msgstr ""
msgstr "خطا."
#: js/app.js:323 js/app.js:337
#: js/app.js:321 js/app.js:335
msgid "Add to..."
msgstr ""
msgstr "اضافه کردن به..."
#: js/app.js:327 js/app.js:339
#: js/app.js:325 js/app.js:337
msgid "Remove from..."
msgstr ""
msgstr "حذف از..."
#: js/app.js:344
#: js/app.js:342
msgid "Add group..."
msgstr ""
msgstr "اضافه کردن گروه..."
#: js/app.js:472
#: js/app.js:470
msgid "Invalid URL: \"{url}\""
msgstr ""
#: js/app.js:483
#: js/app.js:481
msgid "There was an error opening a mail composer."
msgstr ""
#: js/app.js:488
#: js/app.js:486
msgid "Invalid email: \"{url}\""
msgstr ""
#: js/app.js:571
#: js/app.js:569
msgid "Merge failed. Cannot find contact: {id}"
msgstr ""
#: js/app.js:584
#: js/app.js:582
msgid "Merge failed."
msgstr ""
#: js/app.js:591
#: js/app.js:589
msgid "Merge failed. Error saving contact."
msgstr ""
#: js/app.js:611
#: js/app.js:609
msgid "Select photo"
msgstr "تصویر را انتخاب کنید"
#: js/app.js:691 js/app.js:1633
#: js/app.js:689 js/app.js:1631
msgid "Network or server error. Please inform administrator."
msgstr ""
#: js/app.js:913
#: js/app.js:911
msgid "Error adding to group."
msgstr ""
#: js/app.js:936
#: js/app.js:934
msgid "Error removing from group."
msgstr ""
#: js/app.js:1112
#: js/app.js:1110
msgid ""
"You have selected over 300 contacts.\n"
"This will most likely fail! Click here to try anyway."
msgstr ""
#: js/app.js:1150
#: js/app.js:1148
msgid "Error setting {name} as favorite."
msgstr ""
#: js/app.js:1289 js/app.js:1293 templates/contacts.php:171
#: js/app.js:1287 js/app.js:1291 templates/contacts.php:171
msgid "Merge contacts"
msgstr ""
#: js/app.js:1315 js/app.js:1368 js/settings.js:120 templates/settings.php:62
#: js/app.js:1313 js/app.js:1366 js/settings.js:120 templates/settings.php:62
msgid "Cancel"
msgstr "منصرف شدن"
#: js/app.js:1342 templates/contacts.php:152
#: js/app.js:1340 templates/contacts.php:152
msgid "Add group"
msgstr ""
#: js/app.js:1346
#: js/app.js:1344
msgid "OK"
msgstr "باشه"
#: js/app.js:1457
#: js/app.js:1455
msgid "Could not find contact: {id}"
msgstr ""
#: js/app.js:1480
#: js/app.js:1478
msgid "No files selected for upload."
msgstr "هیچ فایلی برای آپلود انتخاب نشده است"
#: js/app.js:1490
#: js/app.js:1488
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "حجم فایل بسیار بیشتر از حجم تنظیم شده در تنظیمات سرور است"
#: js/app.js:1591
#: js/app.js:1589
msgid "Edit profile picture"
msgstr ""
#: js/app.js:1595
#: js/app.js:1593
msgid "Crop photo"
msgstr ""
@ -664,7 +665,7 @@ msgstr ""
#: lib/controller/settingscontroller.php:51
msgid "Could not set preference: "
msgstr ""
msgstr "نمی‌توان تنظیمات را ثبت نمود:"
#: lib/searchprovider.php:32
msgid "Contact"

View File

@ -1,3 +1,28 @@
<?php $TRANSLATIONS = array(
"Delete" => "លុប"
"Save" => "រក្សាទុក",
"Uploading..." => "កំពុងដាក់បញ្ចូល...",
"Cancel" => "លើកលែង",
"Add" => "បញ្ចូល",
"Import" => "នាំយកចូល",
"Close" => "បិទ",
"Error" => "កំហុស",
"Download" => "ទាញយក",
"Edit" => "កែ",
"Delete" => "លុប",
"Unknown error" => "មិន​ស្គាល់​កំហុស",
"Other" => "ផ្សេងៗ",
"Work" => "ធ្វើការ",
"Text" => "អត្ថបទ",
"Groups" => "ក្រុ",
"Email" => "អ៊ីមែល",
"Address" => "អាសយដ្ឋាន",
"Name" => "ឈ្មោះ",
"Title" => "ចំណងជើង",
"Birthday" => "ថ្ងៃ​កំណើត",
"Share" => "ចែក​រំលែក",
"Export" => "នាំចេញ",
"more info" => "ព័ត៌មាន​បន្ថែម",
"Primary address (Kontact et al)" => "អាសយដ្ឋាន​ចម្បង",
"iOS/OS X" => "iOS/OS X",
"Description" => "ការ​អធិប្បាយ"
);

View File

@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
"POT-Creation-Date: 2014-02-15 06:12-0500\n"
"PO-Revision-Date: 2014-02-15 11:12+0000\n"
"POT-Creation-Date: 2014-02-27 00:49-0500\n"
"PO-Revision-Date: 2014-02-26 13:00+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
"MIME-Version: 1.0\n"
@ -23,11 +23,11 @@ msgstr ""
#: js/addressbooks.js:83 js/groups.js:519 templates/settings.php:61
msgid "Save"
msgstr ""
msgstr "រក្សាទុក"
#: js/addressbooks.js:298
msgid "Uploading..."
msgstr ""
msgstr "កំពុងដាក់បញ្ចូល..."
#: js/addressbooks.js:301 js/loader.js:68
msgid "Importing..."
@ -69,135 +69,135 @@ msgstr ""
msgid "Error."
msgstr ""
#: js/app.js:323 js/app.js:337
#: js/app.js:321 js/app.js:335
msgid "Add to..."
msgstr ""
#: js/app.js:327 js/app.js:339
#: js/app.js:325 js/app.js:337
msgid "Remove from..."
msgstr ""
#: js/app.js:344
#: js/app.js:342
msgid "Add group..."
msgstr ""
#: js/app.js:472
#: js/app.js:470
msgid "Invalid URL: \"{url}\""
msgstr ""
#: js/app.js:483
#: js/app.js:481
msgid "There was an error opening a mail composer."
msgstr ""
#: js/app.js:488
#: js/app.js:486
msgid "Invalid email: \"{url}\""
msgstr ""
#: js/app.js:571
#: js/app.js:569
msgid "Merge failed. Cannot find contact: {id}"
msgstr ""
#: js/app.js:584
#: js/app.js:582
msgid "Merge failed."
msgstr ""
#: js/app.js:591
#: js/app.js:589
msgid "Merge failed. Error saving contact."
msgstr ""
#: js/app.js:611
#: js/app.js:609
msgid "Select photo"
msgstr ""
#: js/app.js:691 js/app.js:1633
#: js/app.js:689 js/app.js:1631
msgid "Network or server error. Please inform administrator."
msgstr ""
#: js/app.js:913
#: js/app.js:911
msgid "Error adding to group."
msgstr ""
#: js/app.js:936
#: js/app.js:934
msgid "Error removing from group."
msgstr ""
#: js/app.js:1112
#: js/app.js:1110
msgid ""
"You have selected over 300 contacts.\n"
"This will most likely fail! Click here to try anyway."
msgstr ""
#: js/app.js:1150
#: js/app.js:1148
msgid "Error setting {name} as favorite."
msgstr ""
#: js/app.js:1289 js/app.js:1293 templates/contacts.php:171
#: js/app.js:1287 js/app.js:1291 templates/contacts.php:171
msgid "Merge contacts"
msgstr ""
#: js/app.js:1315 js/app.js:1368 js/settings.js:120 templates/settings.php:62
#: js/app.js:1313 js/app.js:1366 js/settings.js:120 templates/settings.php:62
msgid "Cancel"
msgstr ""
msgstr "លើកលែង"
#: js/app.js:1342 templates/contacts.php:152
#: js/app.js:1340 templates/contacts.php:152
msgid "Add group"
msgstr ""
#: js/app.js:1346
#: js/app.js:1344
msgid "OK"
msgstr ""
#: js/app.js:1457
#: js/app.js:1455
msgid "Could not find contact: {id}"
msgstr ""
#: js/app.js:1480
#: js/app.js:1478
msgid "No files selected for upload."
msgstr ""
#: js/app.js:1490
#: js/app.js:1488
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
#: js/app.js:1591
#: js/app.js:1589
msgid "Edit profile picture"
msgstr ""
#: js/app.js:1595
#: js/app.js:1593
msgid "Crop photo"
msgstr ""
#: js/contacts.js:878
#: js/contacts.js:889
msgid "Error parsing date: {date}"
msgstr ""
#: js/contacts.js:1082
#: js/contacts.js:1093
msgid "# groups"
msgstr ""
#: js/contacts.js:1156
#: js/contacts.js:1167
msgid "Error parsing birthday {bday}"
msgstr ""
#: js/contacts.js:2228
#: js/contacts.js:2240
msgid ""
"Some contacts are marked for deletion, but not deleted yet. Please wait for "
"them to be deleted."
msgstr ""
#: js/contacts.js:2239
#: js/contacts.js:2251
msgid "Click to undo deletion of {num} contacts"
msgstr ""
#: js/contacts.js:2248
#: js/contacts.js:2260
msgid "Cancelled deletion of {num} contacts"
msgstr ""
#: js/groups.js:53
msgid "Add"
msgstr ""
msgstr "បញ្ចូល"
#: js/groups.js:264
msgid "Contact is already in this group."
@ -275,7 +275,7 @@ msgstr ""
#: js/loader.js:61 templates/contacts.php:25
msgid "Import"
msgstr ""
msgstr "នាំយកចូល"
#: js/loader.js:92
msgid "Import done"
@ -284,11 +284,11 @@ msgstr ""
#: js/loader.js:95 templates/contacts.php:80 templates/contacts.php:354
#: templates/contacts.php:355
msgid "Close"
msgstr ""
msgstr "បិទ"
#: js/settings.js:25 js/settings.js:45 js/settings.js:75 js/settings.js:112
msgid "Error"
msgstr ""
msgstr "កំហុស"
#: js/settings.js:75
msgid "Displayname cannot be empty."
@ -305,11 +305,11 @@ msgstr ""
#: js/settings.js:99 templates/contacts.php:66 templates/contacts.php:358
#: templates/contacts.php:359 templates/settings.php:40
msgid "Download"
msgstr ""
msgstr "ទាញយក"
#: js/settings.js:101 templates/contacts.php:492 templates/settings.php:45
msgid "Edit"
msgstr ""
msgstr "កែ"
#: js/settings.js:102 templates/contacts.php:60 templates/contacts.php:61
#: templates/contacts.php:215 templates/contacts.php:216
@ -363,7 +363,7 @@ msgstr ""
#: lib/addressbook.php:290
msgid "Unknown error"
msgstr ""
msgstr "មិន​ស្គាល់​កំហុស"
#: lib/addressbook.php:332
msgid "The backend for this address book does not support updating"
@ -662,7 +662,7 @@ msgstr ""
msgid "Could not set preference: "
msgstr ""
#: lib/searchprovider.php:32
#: lib/searchprovider.php:37
msgid "Contact"
msgstr ""
@ -670,7 +670,7 @@ msgstr ""
#: lib/utils/properties.php:178 lib/utils/properties.php:185
#: lib/utils/properties.php:200
msgid "Other"
msgstr ""
msgstr "ផ្សេងៗ"
#: lib/utils/jsonserializer.php:114
msgid "HomePage"
@ -735,7 +735,7 @@ msgstr ""
#: lib/utils/properties.php:163 lib/utils/properties.php:171
#: lib/utils/properties.php:182 lib/utils/properties.php:199
msgid "Work"
msgstr ""
msgstr "ធ្វើការ"
#: lib/utils/properties.php:164 lib/utils/properties.php:169
#: lib/utils/properties.php:183
@ -748,7 +748,7 @@ msgstr ""
#: lib/utils/properties.php:172
msgid "Text"
msgstr ""
msgstr "អត្ថបទ"
#: lib/utils/properties.php:173
msgid "Voice"
@ -828,7 +828,7 @@ msgstr ""
#: templates/contacts.php:64 templates/contacts.php:255
msgid "Groups"
msgstr ""
msgstr "ក្រុ"
#: templates/contacts.php:67
msgid "Merge"
@ -836,7 +836,7 @@ msgstr ""
#: templates/contacts.php:70 templates/contacts.php:347
msgid "Email"
msgstr ""
msgstr "អ៊ីមែល"
#: templates/contacts.php:71 templates/contacts.php:346
msgid "Phone"
@ -844,7 +844,7 @@ msgstr ""
#: templates/contacts.php:72 templates/contacts.php:349
msgid "Address"
msgstr ""
msgstr "អាសយដ្ឋាន"
#: templates/contacts.php:73
msgid "Group"
@ -940,7 +940,7 @@ msgstr ""
#: templates/contacts.php:231 templates/contacts.php:233
#: templates/settings.php:59
msgid "Name"
msgstr ""
msgstr "ឈ្មោះ"
#: templates/contacts.php:239
msgid "First name"
@ -960,7 +960,7 @@ msgstr ""
#: templates/contacts.php:277 templates/contacts.php:343
msgid "Title"
msgstr ""
msgstr "ចំណងជើង"
#: templates/contacts.php:287 templates/contacts.php:342
msgid "Organization"
@ -968,7 +968,7 @@ msgstr ""
#: templates/contacts.php:297 templates/contacts.php:345
msgid "Birthday"
msgstr ""
msgstr "ថ្ងៃ​កំណើត"
#: templates/contacts.php:334
msgid "Notes go here..."
@ -1054,11 +1054,11 @@ msgstr ""
#: templates/contacts.php:489 templates/settings.php:36
msgid "Share"
msgstr ""
msgstr "ចែក​រំលែក"
#: templates/contacts.php:490
msgid "Export"
msgstr ""
msgstr "នាំចេញ"
#: templates/contacts.php:491
msgid "CardDAV link"
@ -1070,15 +1070,15 @@ msgstr ""
#: templates/settings.php:3
msgid "more info"
msgstr ""
msgstr "ព័ត៌មាន​បន្ថែម"
#: templates/settings.php:5
msgid "Primary address (Kontact et al)"
msgstr ""
msgstr "អាសយដ្ឋាន​ចម្បង"
#: templates/settings.php:7
msgid "iOS/OS X"
msgstr ""
msgstr "iOS/OS X"
#: templates/settings.php:11
msgid "Addressbooks"
@ -1090,4 +1090,4 @@ msgstr ""
#: templates/settings.php:60
msgid "Description"
msgstr ""
msgstr "ការ​អធិប្បាយ"

View File

@ -24,6 +24,7 @@
"Network or server error. Please inform administrator." => "Tinklo arba serverio klaida. Prašome informuoti administratorių.",
"Error adding to group." => "Klaida pridedant į grupę.",
"Error removing from group." => "Klaida pašalinant iš grupės.",
"You have selected over 300 contacts.\nThis will most likely fail! Click here to try anyway." => "Jūs pažymėjote daugiau nei 300 kontaktų.\nTai greičiausiai nepavyks! Spauskite, kad vis tiek bandyti.",
"Error setting {name} as favorite." => "Klaida nustatant {name} mėgstamu.",
"Merge contacts" => "Sulieti kontaktus",
"Cancel" => "Atšaukti",
@ -36,6 +37,7 @@
"Crop photo" => "Apkirpti nuotrauką",
"Error parsing date: {date}" => "Klaida apdorojant datą: {date}",
"# groups" => "# grupės",
"Error parsing birthday {bday}" => "Klaida apdorojant gimtadienį {bday}",
"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Keletas kontaktų buvo pažymėti ištrinimui, bet dar neištrinti. Prašome palaukti kol jie bus ištrinti.",
"Click to undo deletion of {num} contacts" => "Spauskite, kad atstatyti trynimą {num} kontaktų",
"Cancelled deletion of {num} contacts" => "Atšauktas {num} kontaktų trynimas",
@ -45,6 +47,7 @@
"Couldn't get contact list." => "Nepavyko gauti kontaktų sąrašo.",
"Contact is not in this group." => "Kontaktas nėra šioje grupėje.",
"Contacts are not in this group." => "KontaktaI nėra šioje grupėje.",
"A group named \"{group}\" already exists" => "Grupė pavadinimu „{group}“ jau egzistuoja",
"Failed renaming group: {error}" => "Nepavyko pervadinti grupės: {error}",
"You can drag groups to\narrange them as you like." => "Galite tempti grupes, kad\nišrikiuoti jas kaip Jums reikia.",
"Failed adding group: {error}" => "Nepavyko pridėti grupės: {error}",
@ -95,10 +98,14 @@
"Error saving contact." => "Klaida išsaugant kontaktą.",
"Error removing contact from other address book." => "Klaida paralinant kontaktą iš kitos adresų knygutės.",
"Couldn't find contact." => "Nepavyko rasti kontakto.",
"No contact data in request." => "Nėra kontakto duomenų užklausoje.",
"Error merging into contact." => "Klaida suliejant į kontaktą.",
"Error saving contact to backend." => "Klaida išsaugant kontaktą sistemoje.",
"Property name is not set." => "Nenustatytas savybės pavadinimas.",
"Property checksum is not set." => "Nenustatyta savybės kontrolinė suma.",
"Information about vCard is incorrect. Please reload the page." => "Informacija apie vCard yra neteisinga. ",
"Error updating contact" => "Klaida atnaujinant kontaktą",
"Error saving contact to backend" => "Klaida išsaugant kontaktą į sistemą.",
"Error getting user photo" => "Klaida gaunant naudotojo nuotrauką",
"No file was uploaded. Unknown error" => "Failai nebuvo įkelti dėl nežinomos priežasties",
"There is no error, the file uploaded with success" => "Failas įkeltas sėkmingai, be klaidų",
@ -119,7 +126,12 @@
"Error getting PHOTO property." => "Klaida gaunant nuotraukos savybes.",
"No group name given." => "Nepateiktas grupės pavadinimas.",
"Error adding group." => "Klaida pridedant grupę.",
"No group name to rename from given." => "Nėra grupės pavadinimo, kad pervadinti iš pateikto.",
"No group name to rename to given." => "Nėra grupės pavadinimo, kad pervadinti į pateiktą.",
"Error renaming group." => "Klaida pervadinant grupę.",
"Group ID missing from request." => "Užklausoje trūksta grupės ID.",
"Group name missing from request." => "Užklausoje trūksta grupės pavadinimo.",
"Contact ID missing from request." => "Užklausoje trūksta kontakto ID.",
"Failed to write to disk" => "Nepavyko įrašyti į diską",
"Not enough storage available" => "Nepakanka vietos serveryje",
"Attempt to upload blacklisted file:" => "Bandymas įkelti draudžiamą failą:",
@ -127,6 +139,7 @@
"Error moving file to imports folder." => "Klaida perkeliant failą į importavimų aplanką.",
"You do not have permissions to import into this address book." => "Jūs neturite leidimo importuoti į šią adresų knygutę.",
"File name missing from request." => "Užklausoje trūksta failo pavadinimo.",
"Progress key missing from request." => "Užklausoje trūksta eigos rakto.",
"Attempt to access blacklisted file:" => "bandymas pasiekti draudžiamą failą:",
"No contacts found in: " => "Kontaktų nerasta:",
"No key is given." => "Nepateiktas raktas.",
@ -160,7 +173,9 @@
"Internet" => "Internetas",
"Friends" => "Draugai",
"Family" => "Šeima",
"New contact" => "Naujas kontaktas",
"Group name" => "Grupės pavadinimas",
"New group" => "Nauja grupė",
"Address books" => "Adresų knygos",
"Display name" => "Rodyti vardą",
"Add Address Book" => "Pridėti adresų knygą",
@ -170,6 +185,7 @@
"First- Lastname" => "Vardas- Pavardė",
"Last-, Firstname" => "Pavardė-, Vardas",
"Groups" => "Grupės",
"Merge" => "Sulieti",
"Email" => "El. Paštas",
"Phone" => "Telefonas",
"Address" => "Adresas",
@ -188,6 +204,8 @@
"Delete current contact" => "Ištrinti šį kontaktą",
"<h3>You have no contacts in your address book or your address book is disabled.</h3><p>Add a new contact or import existing contacts from a VCF file.</p>" => "<h3>Jūs neturite kontaktų savo adresų knygoje, arba adresų knyga yra išjungta.</h3><p>Pridėkite naują kontaktą, arba importuokite turimus kontaktus iš VCF failo.</p>",
"Add contact" => "Pridėti kontaktą",
"Which contact should the data be merged into?" => "Į kurį kontaktą sulieti duomenis?",
"Delete the other(s) after successful merge?" => "Ištrinti kitą(-us) sėkmingai suliejus?",
"Compose mail" => "Sukurti el. laišką",
"Delete current photo" => "Ištrinti šią nuotrauką",
"Edit current photo" => "Redaguoti šią nuotrauką",

View File

@ -6,7 +6,7 @@
# Dr. ROX <to.dr.rox@gmail.com>, 2011-2012
# Dr. ROX <to.dr.rox@gmail.com>, 2011, 2012
# fizikiukas <fizikiukas@gmail.com>, 2013
# Liudas Ališauskas <liudas.alisauskas@gmail.com>, 2013
# Liudas Ališauskas <liudas.alisauskas@gmail.com>, 2013-2014
# Liudas <liudas@aksioma.lt>, 2013
# mambuta <vspyshkin@gmail.com>, 2013
# mambuta <vspyshkin@gmail.com>, 2013
@ -15,9 +15,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
"POT-Creation-Date: 2014-02-16 01:13-0500\n"
"PO-Revision-Date: 2014-02-15 11:30+0000\n"
"Last-Translator: I Robot\n"
"POT-Creation-Date: 2014-02-27 00:49-0500\n"
"PO-Revision-Date: 2014-02-26 12:00+0000\n"
"Last-Translator: Liudas Ališauskas <liudas.alisauskas@gmail.com>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -77,129 +77,129 @@ msgstr ""
msgid "Error."
msgstr "Klaida."
#: js/app.js:323 js/app.js:337
#: js/app.js:321 js/app.js:335
msgid "Add to..."
msgstr "Pridėti į..."
#: js/app.js:327 js/app.js:339
#: js/app.js:325 js/app.js:337
msgid "Remove from..."
msgstr "Pašalinti iš..."
#: js/app.js:344
#: js/app.js:342
msgid "Add group..."
msgstr "Pridėti grupę..."
#: js/app.js:472
#: js/app.js:470
msgid "Invalid URL: \"{url}\""
msgstr "Netinkamas URL\" „{url}“"
#: js/app.js:483
#: js/app.js:481
msgid "There was an error opening a mail composer."
msgstr "Buvo klaida atveriant el. laiško redaktorių."
#: js/app.js:488
#: js/app.js:486
msgid "Invalid email: \"{url}\""
msgstr "Netinkamas el. paštas"
#: js/app.js:571
#: js/app.js:569
msgid "Merge failed. Cannot find contact: {id}"
msgstr "Suliejimas nepavyko. Nepavyksta rasti kontakto: {id}"
#: js/app.js:584
#: js/app.js:582
msgid "Merge failed."
msgstr "Sulieti nepavyko."
#: js/app.js:591
#: js/app.js:589
msgid "Merge failed. Error saving contact."
msgstr "Suliejimas nepavyko. Klaida saugant kontaktą."
#: js/app.js:611
#: js/app.js:609
msgid "Select photo"
msgstr "Nurodykite nuotrauką"
#: js/app.js:691 js/app.js:1633
#: js/app.js:689 js/app.js:1631
msgid "Network or server error. Please inform administrator."
msgstr "Tinklo arba serverio klaida. Prašome informuoti administratorių."
#: js/app.js:913
#: js/app.js:911
msgid "Error adding to group."
msgstr "Klaida pridedant į grupę."
#: js/app.js:936
#: js/app.js:934
msgid "Error removing from group."
msgstr "Klaida pašalinant iš grupės."
#: js/app.js:1112
#: js/app.js:1110
msgid ""
"You have selected over 300 contacts.\n"
"This will most likely fail! Click here to try anyway."
msgstr ""
msgstr "Jūs pažymėjote daugiau nei 300 kontaktų.\nTai greičiausiai nepavyks! Spauskite, kad vis tiek bandyti."
#: js/app.js:1150
#: js/app.js:1148
msgid "Error setting {name} as favorite."
msgstr "Klaida nustatant {name} mėgstamu."
#: js/app.js:1289 js/app.js:1293 templates/contacts.php:171
#: js/app.js:1287 js/app.js:1291 templates/contacts.php:171
msgid "Merge contacts"
msgstr "Sulieti kontaktus"
#: js/app.js:1315 js/app.js:1368 js/settings.js:120 templates/settings.php:62
#: js/app.js:1313 js/app.js:1366 js/settings.js:120 templates/settings.php:62
msgid "Cancel"
msgstr "Atšaukti"
#: js/app.js:1342 templates/contacts.php:152
#: js/app.js:1340 templates/contacts.php:152
msgid "Add group"
msgstr "Pridėti grupę"
#: js/app.js:1346
#: js/app.js:1344
msgid "OK"
msgstr "Gerai"
#: js/app.js:1457
#: js/app.js:1455
msgid "Could not find contact: {id}"
msgstr "Nepavyko rasti kontakto: {id}"
#: js/app.js:1480
#: js/app.js:1478
msgid "No files selected for upload."
msgstr "Nepažymėta jokių failų įkėlimui."
#: js/app.js:1490
#: js/app.js:1488
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Įkeliamo failo dydis viršijo šio serverio maksimalų leistiną dydį."
#: js/app.js:1591
#: js/app.js:1589
msgid "Edit profile picture"
msgstr "Redaguoti profilio paveikslėlį"
#: js/app.js:1595
#: js/app.js:1593
msgid "Crop photo"
msgstr "Apkirpti nuotrauką"
#: js/contacts.js:878
#: js/contacts.js:889
msgid "Error parsing date: {date}"
msgstr "Klaida apdorojant datą: {date}"
#: js/contacts.js:1082
#: js/contacts.js:1093
msgid "# groups"
msgstr "# grupės"
#: js/contacts.js:1156
#: js/contacts.js:1167
msgid "Error parsing birthday {bday}"
msgstr ""
msgstr "Klaida apdorojant gimtadienį {bday}"
#: js/contacts.js:2228
#: js/contacts.js:2240
msgid ""
"Some contacts are marked for deletion, but not deleted yet. Please wait for "
"them to be deleted."
msgstr "Keletas kontaktų buvo pažymėti ištrinimui, bet dar neištrinti. Prašome palaukti kol jie bus ištrinti."
#: js/contacts.js:2239
#: js/contacts.js:2251
msgid "Click to undo deletion of {num} contacts"
msgstr "Spauskite, kad atstatyti trynimą {num} kontaktų"
#: js/contacts.js:2248
#: js/contacts.js:2260
msgid "Cancelled deletion of {num} contacts"
msgstr "Atšauktas {num} kontaktų trynimas"
@ -229,7 +229,7 @@ msgstr "KontaktaI nėra šioje grupėje."
#: js/groups.js:525 js/groups.js:605
msgid "A group named \"{group}\" already exists"
msgstr ""
msgstr "Grupė pavadinimu „{group}“ jau egzistuoja"
#: js/groups.js:574
msgid "Failed renaming group: {error}"
@ -470,15 +470,15 @@ msgstr "Nepavyko rasti kontakto."
#: lib/controller/contactcontroller.php:60
msgid "No contact data in request."
msgstr ""
msgstr "Nėra kontakto duomenų užklausoje."
#: lib/controller/contactcontroller.php:68
msgid "Error merging into contact."
msgstr ""
msgstr "Klaida suliejant į kontaktą."
#: lib/controller/contactcontroller.php:71
msgid "Error saving contact to backend."
msgstr ""
msgstr "Klaida išsaugant kontaktą sistemoje."
#: lib/controller/contactcontroller.php:102
msgid "Property name is not set."
@ -498,7 +498,7 @@ msgstr "Klaida atnaujinant kontaktą"
#: lib/controller/contactcontroller.php:140
msgid "Error saving contact to backend"
msgstr ""
msgstr "Klaida išsaugant kontaktą į sistemą."
#: lib/controller/contactphotocontroller.php:69
msgid "Error getting user photo"
@ -593,11 +593,11 @@ msgstr "Klaida pridedant grupę."
#: lib/controller/groupcontroller.php:130
msgid "No group name to rename from given."
msgstr ""
msgstr "Nėra grupės pavadinimo, kad pervadinti iš pateikto."
#: lib/controller/groupcontroller.php:134
msgid "No group name to rename to given."
msgstr ""
msgstr "Nėra grupės pavadinimo, kad pervadinti į pateiktą."
#: lib/controller/groupcontroller.php:140
msgid "Error renaming group."
@ -606,16 +606,16 @@ msgstr "Klaida pervadinant grupę."
#: lib/controller/groupcontroller.php:178
#: lib/controller/groupcontroller.php:224
msgid "Group ID missing from request."
msgstr ""
msgstr "Užklausoje trūksta grupės ID."
#: lib/controller/groupcontroller.php:183
msgid "Group name missing from request."
msgstr ""
msgstr "Užklausoje trūksta grupės pavadinimo."
#: lib/controller/groupcontroller.php:188
#: lib/controller/groupcontroller.php:229
msgid "Contact ID missing from request."
msgstr ""
msgstr "Užklausoje trūksta kontakto ID."
#: lib/controller/importcontroller.php:54
msgid "Failed to write to disk"
@ -648,7 +648,7 @@ msgstr "Užklausoje trūksta failo pavadinimo."
#: lib/controller/importcontroller.php:170
#: lib/controller/importcontroller.php:293
msgid "Progress key missing from request."
msgstr ""
msgstr "Užklausoje trūksta eigos rakto."
#: lib/controller/importcontroller.php:176
msgid "Attempt to access blacklisted file:"
@ -670,7 +670,7 @@ msgstr "Nepateikta vertė."
msgid "Could not set preference: "
msgstr "Nepavyko nustatyti:"
#: lib/searchprovider.php:32
#: lib/searchprovider.php:37
msgid "Contact"
msgstr "Kontaktas"
@ -792,7 +792,7 @@ msgstr "Šeima"
#: templates/contacts.php:6
msgid "New contact"
msgstr ""
msgstr "Naujas kontaktas"
#: templates/contacts.php:10
msgid "Group name"
@ -800,7 +800,7 @@ msgstr "Grupės pavadinimas"
#: templates/contacts.php:10
msgid "New group"
msgstr ""
msgstr "Nauja grupė"
#: templates/contacts.php:19
msgid "Address books"
@ -840,7 +840,7 @@ msgstr "Grupės"
#: templates/contacts.php:67
msgid "Merge"
msgstr ""
msgstr "Sulieti"
#: templates/contacts.php:70 templates/contacts.php:347
msgid "Email"
@ -919,11 +919,11 @@ msgstr "Pridėti kontaktą"
#: templates/contacts.php:172
msgid "Which contact should the data be merged into?"
msgstr ""
msgstr "Į kurį kontaktą sulieti duomenis?"
#: templates/contacts.php:180
msgid "Delete the other(s) after successful merge?"
msgstr ""
msgstr "Ištrinti kitą(-us) sėkmingai suliejus?"
#: templates/contacts.php:195
msgid "Compose mail"

View File

@ -3,18 +3,30 @@
"Save" => "Lagre",
"Uploading..." => "Laster opp...",
"Importing..." => "Importerer...",
"Preparing..." => "Forbereder...",
"Imported {count} of {total} contacts" => "Importerte {count} av {total} kontakter",
"Imported {imported} contacts. {failed} failed." => "Importerte {imported} kontakter. {failed} feilet.",
"An address book called {name} already exists" => "En adressebok med navn {name} finnes allerede",
"Failed adding address book: {error}" => "Klarte ikke å legge til adressebok: {error}",
"Failed loading address books: {error}" => "Klarte ikke å laste adressebøker: {error}",
"Indexing contacts" => "Indekserer kontakter",
"Unrecoverable error loading address books: {msg}" => "Ugjenopprettelig feil ved lasting av adressebøker: {msg}",
"Error." => "Feil.",
"Add to..." => "Legg til...",
"Remove from..." => "Fjern fra...",
"Add group..." => "Legg til gruppe...",
"Invalid URL: \"{url}\"" => "Ugyldig URL: \"{url}\"",
"There was an error opening a mail composer." => "Det skjedde en feil ved åpning av epost-verktøyet.",
"Invalid email: \"{url}\"" => "Ugyldig e-post: \"{url}\"",
"Merge failed. Cannot find contact: {id}" => "Fletting feilet. Kan ikke finne kontakt: {id}",
"Merge failed." => "Fletting feilet.",
"Merge failed. Error saving contact." => "Fletting feilet. Feil ved lagring av kontakt.",
"Select photo" => "Velg bilde",
"Network or server error. Please inform administrator." => "Nettverks- eller serverfeil. Vennligs informer administratoren.",
"Error adding to group." => "Feil ved innlegging i gruppe.",
"Error removing from group." => "Feil ved fjerning fra gruppe.",
"You have selected over 300 contacts.\nThis will most likely fail! Click here to try anyway." => "Du har valgt over 300 kontakter.\nDette vil sannsynligvis feile! Klikk her for å prøve uansett.",
"Error setting {name} as favorite." => "Feil ved setting av {name} som favoritt.",
"Merge contacts" => "Flett kontakter",
"Cancel" => "Avbryt",
"Add group" => "Legg til gruppe",
@ -23,26 +35,85 @@
"No files selected for upload." => "Ingen filer valgt for opplasting.",
"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Filen du prøver å laste opp er for stor.",
"Edit profile picture" => "Rediger profilbilde",
"Crop photo" => "Beskjær bilde",
"Error parsing date: {date}" => "Tyding av dato feilet: {date}",
"# groups" => "Ant. grupper",
"Error parsing birthday {bday}" => "Klarer ikke å tyde fødselsdag {bday}",
"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Noen kontakter er markert for sletting men ikke slettet ennå. Vent mens de slettes.",
"Click to undo deletion of {num} contacts" => "Klikk for å angre sletting av {num} kontakter",
"Cancelled deletion of {num} contacts" => "Avbrøt sletting av {num} kontakter",
"Add" => "Legg til",
"Contact is already in this group." => "Kontakten er med i denne gruppen fra før.",
"Contacts are already in this group." => "Kontaktene er med i denne gruppen fra før.",
"Couldn't get contact list." => "Klarte ikke å hente kontaktliste.",
"Contact is not in this group." => "Kontakten er ikke med i denne gruppen.",
"Contacts are not in this group." => "Kontaktene er ikke med i denne gruppen.",
"A group named \"{group}\" already exists" => "Det finnes allerede en gruppe med navnet \"{group}\"",
"Failed renaming group: {error}" => "Omdøping av gruppe feilet: {error}",
"You can drag groups to\narrange them as you like." => "Du kan dra og slippe grupper for\nordne dem slik du ønsker.",
"Failed adding group: {error}" => "Innlegging av gruppe feilet: {error}",
"All" => "Alle",
"Favorites" => "Favoritter",
"Shared by {owner}" => "Delt av {owner}",
"Not grouped" => "Ikke gruppert",
"Failed loading groups: {error}" => "Feil ved lasting av grupper: {error}",
"Please choose the addressbook" => "Vennligst velg adressebok",
"Import into..." => "Importer til...",
"Error loading import template" => "Feil ved lasting av importmal",
"Import contacts" => "Importer kontakter",
"Import" => "Importer",
"Import done" => "Import utført",
"Close" => "Lukk",
"Error" => "Feil",
"Displayname cannot be empty." => "Visningsnavn kan ikke være tomt.",
"Show CardDav link" => "Vis CardDav-lenke",
"Show read-only VCF link" => "Vis VCF-lenke for kun lesing",
"Download" => "Last ned",
"Edit" => "Endre",
"Delete" => "Slett",
"More..." => "Mer...",
"Less..." => "Mindre...",
"Server error! Please inform system administator" => "Serverfeil! Vennligst informer systemadministratoren",
"Failed loading photo: {error}" => "Lasting av bilde feilet: {error}",
"You do not have permissions to see this contacts" => "Du har ikke adgang til å se denne kontakten",
"Contact not found" => "Fant ikke kontakt",
"You do not have permissions to see these contacts" => "Du har ikke adgang til å se disse kontaktene",
"You do not have permissions add contacts to the address book" => "Du har ikke adgang til å legge inn kontakter i adresseboken",
"The backend for this address book does not support adding contacts" => "Server-komponenten for denne adresseboken støtter ikke innlegging av kontakter",
"You do not have permissions to delete this contact" => "Du har ikke adgang til å slette denne kontakten",
"The backend for this address book does not support deleting contacts" => "Server-komponenten for denne adresseboken støtter ikke sletting av kontakter",
"Unknown error" => "Ukjent feil",
"The backend for this address book does not support updating" => "Server-komponenten for denne adresseboken støtter ikke oppdatering",
"You don't have permissions to update the address book." => "Du har ikke adgang til å oppdatere adresseboken.",
"You don't have permissions to delete the address book." => "Du har ikke adgang til å slette adresseboken.",
"Address book not found" => "Fant ikke adressebok",
"You do not have permissions to see this contact" => "Du har ikke adgang til å se denne kontakten",
"You do not have permissions to update this contact" => "Du har ikke adgang til å oppdatere denne kontakten",
"The backend for this contact does not support updating it" => "Server-komponenten for denne kontakten støtter ikke oppdatering av den",
"This backend not support adding contacts" => "Server-komponenten støtter ikke innlegging av kontakter",
"Property not found" => "Fant ikke egenskap",
" Missing IM parameter for: " => "IM-parameter mangler for:",
"Unknown IM: " => "Ukjent IM: ",
"{name}'s Birthday" => "{name}s bursdag",
"Error creating address book" => "Oppretting av adressebok feilet",
"Error updating address book" => "Oppdatering av adressebok feilet",
"You do not have permissions to delete the \"%s\" address book" => "Du har ikke adgang til å slette adresseboken \"%s\"",
"Error deleting address book" => "Sletting av adressebok feilet",
"Error creating contact." => "Oppretting av kontakt feilet.",
"Error deleting contact." => "Sletting av kontakt feilet.",
"Error retrieving contact." => "Henting av kontakt feilet.",
"Error saving contact." => "Klarte ikke å lagre kontakt.",
"Error removing contact from other address book." => "Feil ved fjerning av kontakt fra annen adressebok.",
"Couldn't find contact." => "Kunne ikke finne kontakt.",
"No contact data in request." => "Ingen kontaktdata i anmodningen.",
"Error merging into contact." => "Fletting inn i kontakt feilet.",
"Error saving contact to backend." => "Lagring av kontakt til server feilet.",
"Property name is not set." => "Egenskapsnavn er ikke satt.",
"Property checksum is not set." => "Egenskaps-sjekksum er ikke satt.",
"Information about vCard is incorrect. Please reload the page." => "Informasjonen om vCard-filen er ikke riktig. Last inn siden på nytt.",
"Error updating contact" => "Feil ved oppdatering av kontakt",
"Error saving contact to backend" => "Lagring av kontakt til server feilet",
"Error getting user photo" => "Feil ved henting av brukerbilde",
"No file was uploaded. Unknown error" => "Ingen filer ble lastet opp. Ukjent feil.",
"There is no error, the file uploaded with success" => "Pust ut, ingen feil. Filen ble lastet opp problemfritt",
"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Filen du prøvde å laste opp var større enn grensen upload_max_filesize i php.ini",
@ -55,17 +126,37 @@
"No photo path was submitted." => "Ingen filsti ble lagt inn.",
"File doesn't exist:" => "Filen eksisterer ikke:",
"Error loading image." => "Klarte ikke å laste bilde.",
"Image has been removed from cache" => "Bildet er fjernet fra mellomlageret",
"Error creating temporary image" => "Klarte ikke å lage et midlertidig bilde",
"Error cropping image" => "Klarte ikke å beskjære bildet",
"Error resizing image" => "Klarte ikke å endre størrelse på bildet",
"Error getting PHOTO property." => "Feil ved henting av fotoverdi.",
"No group name given." => "Gruppenavn ikke oppgitt.",
"Error adding group." => "Feil ved innsetting av gruppe.",
"No group name to rename from given." => "Navn på gruppe som skal gis nytt navn er ikke oppgitt.",
"No group name to rename to given." => "Nytt gruppenavn er ikke oppgitt.",
"Error renaming group." => "Omdøping av gruppe feilet.",
"Group ID missing from request." => "Gruppe-ID mangler i anmodningen.",
"Group name missing from request." => "Gruppenavn mangler i anmodningen.",
"Contact ID missing from request." => "Kontakt-ID mangler i anmodningen.",
"Failed to write to disk" => "Klarte ikke å skrive til disk",
"Not enough storage available" => "Ikke nok lagringsplass",
"Attempt to upload blacklisted file:" => "Forsøk på å laste opp svartelistet fil:",
"Error uploading contacts to storage." => "Klarte ikke å laste opp kontakter til lagringsplassen",
"Error moving file to imports folder." => "Feil ved flytting av fil til importmappen.",
"You do not have permissions to import into this address book." => "Du har ikke adgang til å importere til denne adresseboken.",
"File name missing from request." => "Filnavn mangler i anmodningen.",
"Progress key missing from request." => "Framdriftsnøkkel mangler i anmodningen.",
"Attempt to access blacklisted file:" => "Forsøk på å aksessere svartelistet fil:",
"No contacts found in: " => "Fant ingen kontakter i:",
"No key is given." => "Nøkkel er ikke oppgitt.",
"No value is given." => "Verdi er ikke oppgitt.",
"Could not set preference: " => "Kunne ikke sette preferanse:",
"Contact" => "Kontakt",
"Other" => "Annet",
"HomePage" => "Hjemmeside",
"Jabber" => "Jabber",
"Internet call" => "Internettsamtale",
"AIM" => "AIM",
"MSN" => "MSN",
"Twitter" => "Twitter",
@ -87,10 +178,19 @@
"Internet" => "Internett",
"Friends" => "Venner",
"Family" => "Familie",
"New contact" => "Ny kontakt",
"Group name" => "Gruppenavn",
"New group" => "Ny gruppe",
"Address books" => "Adressebøker",
"Display name" => "Visningsnavn",
"Add Address Book" => "Ny adressebok",
"Select file..." => "Velg fil",
"(De-)select all" => "(Av-)marker alle",
"Sort order" => "Rekkefølge",
"First- Lastname" => "For- Etternavn",
"Last-, Firstname" => "Etter-, Fornavn",
"Groups" => "Grupper",
"Merge" => "Flett",
"Email" => "Epost",
"Phone" => "Telefon",
"Address" => "Adresse",
@ -107,7 +207,11 @@
"Add new contact" => "Legg til ny kontakt",
"Add new addressbook" => "Legg til ny adressebok",
"Delete current contact" => "Slett kontakten",
"<h3>You have no contacts in your address book or your address book is disabled.</h3><p>Add a new contact or import existing contacts from a VCF file.</p>" => "<h3>Du har ingen kontakter eller adresseboken din er ikke aktivert.</h3><p>Legg inn en ny kontakt eller importer eksisterende kontakter fra en VCF-fil.</p>",
"Add contact" => "Ny kontakt",
"Which contact should the data be merged into?" => "Hvilken kontakt skal dataene flettes inn i?",
"Delete the other(s) after successful merge?" => "Slett den/de andre etter vellykket fletting?",
"Compose mail" => "Skriv epost",
"Delete current photo" => "Fjern nåværende bilde",
"Edit current photo" => "Rediger nåværende bilde",
"Upload new photo" => "Last opp nytt bilde",
@ -120,6 +224,9 @@
"Title" => "Tittel",
"Organization" => "Organisasjon",
"Birthday" => "Bursdag",
"Notes go here..." => "Notater her...",
"Add field..." => "Legg til felt...",
"Instant Messaging" => "Lynmelding",
"Note" => "Notat",
"Web site" => "Hjemmeside",
"Preferred" => "Foretrukket",
@ -127,12 +234,18 @@
"Mail to address" => "Send e-post til adresse",
"Delete email address" => "Fjern e-postadresse",
"Enter phone number" => "Skriv inn telefonnummer",
"Go to web site" => "Gå til webside",
"View on map" => "Se på kart",
"Street address" => "Gateadresse",
"Postal code" => "Postnummer",
"City" => "By",
"State or province" => "Stat eller fylke",
"Country" => "Land",
"Instant Messenger" => "Lynmelding",
"Active" => "Aktiv",
"Share" => "Del",
"Export" => "Eksporter",
"CardDAV link" => "CardDAV-lenke",
"CardDAV syncing addresses" => "Synkroniseringsadresse for CardDAV",
"more info" => "mer info",
"Primary address (Kontact et al)" => "Primær adresse (kontakt osv)",

View File

@ -12,15 +12,16 @@
# hdalgrav <hdalgrav@gmail.com>, 2012
# Jukselapp <ingemundskalnes@gmail.com>, 2014
# owncloud <itssmail@yahoo.no>, 2012
# vidaren <news@vidartysse.net>, 2014
# TheLugal <thelugal@gmail.com>, 2013
# Stein-Aksel Basma <stabasm@hotmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
"POT-Creation-Date: 2014-02-16 01:13-0500\n"
"PO-Revision-Date: 2014-02-15 11:30+0000\n"
"Last-Translator: I Robot\n"
"POT-Creation-Date: 2014-02-27 00:49-0500\n"
"PO-Revision-Date: 2014-02-26 21:10+0000\n"
"Last-Translator: vidaren <news@vidartysse.net>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -46,7 +47,7 @@ msgstr "Importerer..."
#: js/addressbooks.js:324
msgid "Preparing..."
msgstr ""
msgstr "Forbereder..."
#: js/addressbooks.js:372
msgid "Imported {count} of {total} contacts"
@ -54,7 +55,7 @@ msgstr "Importerte {count} av {total} kontakter"
#: js/addressbooks.js:394
msgid "Imported {imported} contacts. {failed} failed."
msgstr ""
msgstr "Importerte {imported} kontakter. {failed} feilet."
#: js/addressbooks.js:550
msgid "An address book called {name} already exists"
@ -62,11 +63,11 @@ msgstr "En adressebok med navn {name} finnes allerede"
#: js/addressbooks.js:584
msgid "Failed adding address book: {error}"
msgstr ""
msgstr "Klarte ikke å legge til adressebok: {error}"
#: js/addressbooks.js:626
msgid "Failed loading address books: {error}"
msgstr ""
msgstr "Klarte ikke å laste adressebøker: {error}"
#: js/app.js:215
msgid "Indexing contacts"
@ -74,137 +75,137 @@ msgstr "Indekserer kontakter"
#: js/app.js:225
msgid "Unrecoverable error loading address books: {msg}"
msgstr ""
msgstr "Ugjenopprettelig feil ved lasting av adressebøker: {msg}"
#: js/app.js:226
msgid "Error."
msgstr "Feil."
#: js/app.js:323 js/app.js:337
#: js/app.js:321 js/app.js:335
msgid "Add to..."
msgstr "Legg til..."
#: js/app.js:327 js/app.js:339
#: js/app.js:325 js/app.js:337
msgid "Remove from..."
msgstr "Fjern fra..."
#: js/app.js:344
#: js/app.js:342
msgid "Add group..."
msgstr "Legg til gruppe..."
#: js/app.js:472
#: js/app.js:470
msgid "Invalid URL: \"{url}\""
msgstr "Ugyldig URL: \"{url}\""
#: js/app.js:483
#: js/app.js:481
msgid "There was an error opening a mail composer."
msgstr ""
msgstr "Det skjedde en feil ved åpning av epost-verktøyet."
#: js/app.js:488
#: js/app.js:486
msgid "Invalid email: \"{url}\""
msgstr "Ugyldig e-post: \"{url}\""
#: js/app.js:571
#: js/app.js:569
msgid "Merge failed. Cannot find contact: {id}"
msgstr "Fletting feilet. Kan ikke finne kontakt: {id}"
#: js/app.js:584
#: js/app.js:582
msgid "Merge failed."
msgstr "Fletting feilet."
#: js/app.js:591
#: js/app.js:589
msgid "Merge failed. Error saving contact."
msgstr ""
msgstr "Fletting feilet. Feil ved lagring av kontakt."
#: js/app.js:611
#: js/app.js:609
msgid "Select photo"
msgstr "Velg bilde"
#: js/app.js:691 js/app.js:1633
#: js/app.js:689 js/app.js:1631
msgid "Network or server error. Please inform administrator."
msgstr ""
msgstr "Nettverks- eller serverfeil. Vennligs informer administratoren."
#: js/app.js:913
#: js/app.js:911
msgid "Error adding to group."
msgstr ""
msgstr "Feil ved innlegging i gruppe."
#: js/app.js:936
#: js/app.js:934
msgid "Error removing from group."
msgstr ""
msgstr "Feil ved fjerning fra gruppe."
#: js/app.js:1112
#: js/app.js:1110
msgid ""
"You have selected over 300 contacts.\n"
"This will most likely fail! Click here to try anyway."
msgstr ""
msgstr "Du har valgt over 300 kontakter.\nDette vil sannsynligvis feile! Klikk her for å prøve uansett."
#: js/app.js:1150
#: js/app.js:1148
msgid "Error setting {name} as favorite."
msgstr ""
msgstr "Feil ved setting av {name} som favoritt."
#: js/app.js:1289 js/app.js:1293 templates/contacts.php:171
#: js/app.js:1287 js/app.js:1291 templates/contacts.php:171
msgid "Merge contacts"
msgstr "Flett kontakter"
#: js/app.js:1315 js/app.js:1368 js/settings.js:120 templates/settings.php:62
#: js/app.js:1313 js/app.js:1366 js/settings.js:120 templates/settings.php:62
msgid "Cancel"
msgstr "Avbryt"
#: js/app.js:1342 templates/contacts.php:152
#: js/app.js:1340 templates/contacts.php:152
msgid "Add group"
msgstr "Legg til gruppe"
#: js/app.js:1346
#: js/app.js:1344
msgid "OK"
msgstr "OK"
#: js/app.js:1457
#: js/app.js:1455
msgid "Could not find contact: {id}"
msgstr "Fant ikke kontakt: {id}"
#: js/app.js:1480
#: js/app.js:1478
msgid "No files selected for upload."
msgstr "Ingen filer valgt for opplasting."
#: js/app.js:1490
#: js/app.js:1488
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Filen du prøver å laste opp er for stor."
#: js/app.js:1591
#: js/app.js:1589
msgid "Edit profile picture"
msgstr "Rediger profilbilde"
#: js/app.js:1595
#: js/app.js:1593
msgid "Crop photo"
msgstr ""
msgstr "Beskjær bilde"
#: js/contacts.js:878
#: js/contacts.js:889
msgid "Error parsing date: {date}"
msgstr ""
msgstr "Tyding av dato feilet: {date}"
#: js/contacts.js:1082
#: js/contacts.js:1093
msgid "# groups"
msgstr "Ant. grupper"
#: js/contacts.js:1156
#: js/contacts.js:1167
msgid "Error parsing birthday {bday}"
msgstr ""
msgstr "Klarer ikke å tyde fødselsdag {bday}"
#: js/contacts.js:2228
#: js/contacts.js:2240
msgid ""
"Some contacts are marked for deletion, but not deleted yet. Please wait for "
"them to be deleted."
msgstr ""
msgstr "Noen kontakter er markert for sletting men ikke slettet ennå. Vent mens de slettes."
#: js/contacts.js:2239
#: js/contacts.js:2251
msgid "Click to undo deletion of {num} contacts"
msgstr ""
msgstr "Klikk for å angre sletting av {num} kontakter"
#: js/contacts.js:2248
#: js/contacts.js:2260
msgid "Cancelled deletion of {num} contacts"
msgstr ""
msgstr "Avbrøt sletting av {num} kontakter"
#: js/groups.js:53
msgid "Add"
@ -212,41 +213,41 @@ msgstr "Legg til"
#: js/groups.js:264
msgid "Contact is already in this group."
msgstr ""
msgstr "Kontakten er med i denne gruppen fra før."
#: js/groups.js:277
msgid "Contacts are already in this group."
msgstr ""
msgstr "Kontaktene er med i denne gruppen fra før."
#: js/groups.js:343
msgid "Couldn't get contact list."
msgstr ""
msgstr "Klarte ikke å hente kontaktliste."
#: js/groups.js:354
msgid "Contact is not in this group."
msgstr ""
msgstr "Kontakten er ikke med i denne gruppen."
#: js/groups.js:368
msgid "Contacts are not in this group."
msgstr ""
msgstr "Kontaktene er ikke med i denne gruppen."
#: js/groups.js:525 js/groups.js:605
msgid "A group named \"{group}\" already exists"
msgstr ""
msgstr "Det finnes allerede en gruppe med navnet \"{group}\""
#: js/groups.js:574
msgid "Failed renaming group: {error}"
msgstr ""
msgstr "Omdøping av gruppe feilet: {error}"
#: js/groups.js:646
msgid ""
"You can drag groups to\n"
"arrange them as you like."
msgstr ""
msgstr "Du kan dra og slippe grupper for\nordne dem slik du ønsker."
#: js/groups.js:659
msgid "Failed adding group: {error}"
msgstr ""
msgstr "Innlegging av gruppe feilet: {error}"
#: js/groups.js:671
msgid "All"
@ -262,7 +263,7 @@ msgstr "Delt av {owner}"
#: js/groups.js:765
msgid "Not grouped"
msgstr ""
msgstr "Ikke gruppert"
#: js/groups.js:794
msgid "Failed loading groups: {error}"
@ -274,15 +275,15 @@ msgstr "Vennligst velg adressebok"
#: js/loader.js:22 templates/contacts.php:29
msgid "Import into..."
msgstr ""
msgstr "Importer til..."
#: js/loader.js:31
msgid "Error loading import template"
msgstr ""
msgstr "Feil ved lasting av importmal"
#: js/loader.js:48
msgid "Import contacts"
msgstr ""
msgstr "Importer kontakter"
#: js/loader.js:61 templates/contacts.php:25
msgid "Import"
@ -290,7 +291,7 @@ msgstr "Importer"
#: js/loader.js:92
msgid "Import done"
msgstr ""
msgstr "Import utført"
#: js/loader.js:95 templates/contacts.php:80 templates/contacts.php:354
#: templates/contacts.php:355
@ -303,15 +304,15 @@ msgstr "Feil"
#: js/settings.js:75
msgid "Displayname cannot be empty."
msgstr ""
msgstr "Visningsnavn kan ikke være tomt."
#: js/settings.js:97 templates/settings.php:26
msgid "Show CardDav link"
msgstr ""
msgstr "Vis CardDav-lenke"
#: js/settings.js:98 templates/settings.php:29
msgid "Show read-only VCF link"
msgstr ""
msgstr "Vis VCF-lenke for kun lesing"
#: js/settings.js:99 templates/contacts.php:66 templates/contacts.php:358
#: templates/contacts.php:359 templates/settings.php:40
@ -338,39 +339,39 @@ msgstr "Mindre..."
#: js/storage.js:30
msgid "Server error! Please inform system administator"
msgstr ""
msgstr "Serverfeil! Vennligst informer systemadministratoren"
#: js/storage.js:335 js/storage.js:374
msgid "Failed loading photo: {error}"
msgstr ""
msgstr "Lasting av bilde feilet: {error}"
#: lib/addressbook.php:152
msgid "You do not have permissions to see this contacts"
msgstr ""
msgstr "Du har ikke adgang til å se denne kontakten"
#: lib/addressbook.php:159
msgid "Contact not found"
msgstr ""
msgstr "Fant ikke kontakt"
#: lib/addressbook.php:186
msgid "You do not have permissions to see these contacts"
msgstr ""
msgstr "Du har ikke adgang til å se disse kontaktene"
#: lib/addressbook.php:213
msgid "You do not have permissions add contacts to the address book"
msgstr ""
msgstr "Du har ikke adgang til å legge inn kontakter i adresseboken"
#: lib/addressbook.php:216
msgid "The backend for this address book does not support adding contacts"
msgstr ""
msgstr "Server-komponenten for denne adresseboken støtter ikke innlegging av kontakter"
#: lib/addressbook.php:240 lib/addressbook.php:266 lib/contact.php:248
msgid "You do not have permissions to delete this contact"
msgstr ""
msgstr "Du har ikke adgang til å slette denne kontakten"
#: lib/addressbook.php:243 lib/addressbook.php:269
msgid "The backend for this address book does not support deleting contacts"
msgstr ""
msgstr "Server-komponenten for denne adresseboken støtter ikke sletting av kontakter"
#: lib/addressbook.php:290
msgid "Unknown error"
@ -378,47 +379,47 @@ msgstr "Ukjent feil"
#: lib/addressbook.php:332
msgid "The backend for this address book does not support updating"
msgstr ""
msgstr "Server-komponenten for denne adresseboken støtter ikke oppdatering"
#: lib/addressbook.php:358
msgid "You don't have permissions to update the address book."
msgstr ""
msgstr "Du har ikke adgang til å oppdatere adresseboken."
#: lib/addressbook.php:369
msgid "You don't have permissions to delete the address book."
msgstr ""
msgstr "Du har ikke adgang til å slette adresseboken."
#: lib/app.php:146
msgid "Address book not found"
msgstr ""
msgstr "Fant ikke adressebok"
#: lib/contact.php:114 lib/contact.php:161
msgid "You do not have permissions to see this contact"
msgstr ""
msgstr "Du har ikke adgang til å se denne kontakten"
#: lib/contact.php:263
msgid "You do not have permissions to update this contact"
msgstr ""
msgstr "Du har ikke adgang til å oppdatere denne kontakten"
#: lib/contact.php:274
msgid "The backend for this contact does not support updating it"
msgstr ""
msgstr "Server-komponenten for denne kontakten støtter ikke oppdatering av den"
#: lib/contact.php:292
msgid "This backend not support adding contacts"
msgstr ""
msgstr "Server-komponenten støtter ikke innlegging av kontakter"
#: lib/contact.php:402 lib/contact.php:419
msgid "Property not found"
msgstr ""
msgstr "Fant ikke egenskap"
#: lib/contact.php:467
msgid " Missing IM parameter for: "
msgstr ""
msgstr "IM-parameter mangler for:"
#: lib/contact.php:475
msgid "Unknown IM: "
msgstr ""
msgstr "Ukjent IM: "
#: lib/contact.php:752
msgid "{name}'s Birthday"
@ -426,32 +427,32 @@ msgstr "{name}s bursdag"
#: lib/controller/addressbookcontroller.php:135
msgid "Error creating address book"
msgstr ""
msgstr "Oppretting av adressebok feilet"
#: lib/controller/addressbookcontroller.php:152
msgid "Error updating address book"
msgstr ""
msgstr "Oppdatering av adressebok feilet"
#: lib/controller/addressbookcontroller.php:180
#, php-format
msgid "You do not have permissions to delete the \"%s\" address book"
msgstr ""
msgstr "Du har ikke adgang til å slette adresseboken \"%s\""
#: lib/controller/addressbookcontroller.php:186
msgid "Error deleting address book"
msgstr ""
msgstr "Sletting av adressebok feilet"
#: lib/controller/addressbookcontroller.php:224
msgid "Error creating contact."
msgstr ""
msgstr "Oppretting av kontakt feilet."
#: lib/controller/addressbookcontroller.php:260
msgid "Error deleting contact."
msgstr ""
msgstr "Sletting av kontakt feilet."
#: lib/controller/addressbookcontroller.php:300
msgid "Error retrieving contact."
msgstr ""
msgstr "Henting av kontakt feilet."
#: lib/controller/addressbookcontroller.php:310
#: lib/controller/contactphotocontroller.php:332
@ -460,7 +461,7 @@ msgstr "Klarte ikke å lagre kontakt."
#: lib/controller/addressbookcontroller.php:314
msgid "Error removing contact from other address book."
msgstr ""
msgstr "Feil ved fjerning av kontakt fra annen adressebok."
#: lib/controller/contactcontroller.php:37
#: lib/controller/contactcontroller.php:64
@ -473,23 +474,23 @@ msgstr "Kunne ikke finne kontakt."
#: lib/controller/contactcontroller.php:60
msgid "No contact data in request."
msgstr ""
msgstr "Ingen kontaktdata i anmodningen."
#: lib/controller/contactcontroller.php:68
msgid "Error merging into contact."
msgstr ""
msgstr "Fletting inn i kontakt feilet."
#: lib/controller/contactcontroller.php:71
msgid "Error saving contact to backend."
msgstr ""
msgstr "Lagring av kontakt til server feilet."
#: lib/controller/contactcontroller.php:102
msgid "Property name is not set."
msgstr ""
msgstr "Egenskapsnavn er ikke satt."
#: lib/controller/contactcontroller.php:107
msgid "Property checksum is not set."
msgstr ""
msgstr "Egenskaps-sjekksum er ikke satt."
#: lib/controller/contactcontroller.php:126
msgid "Information about vCard is incorrect. Please reload the page."
@ -497,15 +498,15 @@ msgstr "Informasjonen om vCard-filen er ikke riktig. Last inn siden på nytt."
#: lib/controller/contactcontroller.php:135
msgid "Error updating contact"
msgstr ""
msgstr "Feil ved oppdatering av kontakt"
#: lib/controller/contactcontroller.php:140
msgid "Error saving contact to backend"
msgstr ""
msgstr "Lagring av kontakt til server feilet"
#: lib/controller/contactphotocontroller.php:69
msgid "Error getting user photo"
msgstr ""
msgstr "Feil ved henting av brukerbilde"
#: lib/controller/contactphotocontroller.php:87
#: lib/controller/importcontroller.php:38
@ -568,7 +569,7 @@ msgstr "Klarte ikke å laste bilde."
#: lib/controller/contactphotocontroller.php:279
msgid "Image has been removed from cache"
msgstr ""
msgstr "Bildet er fjernet fra mellomlageret"
#: lib/controller/contactphotocontroller.php:285
msgid "Error creating temporary image"
@ -588,37 +589,37 @@ msgstr "Feil ved henting av fotoverdi."
#: lib/controller/groupcontroller.php:58 lib/controller/groupcontroller.php:80
msgid "No group name given."
msgstr ""
msgstr "Gruppenavn ikke oppgitt."
#: lib/controller/groupcontroller.php:65
msgid "Error adding group."
msgstr ""
msgstr "Feil ved innsetting av gruppe."
#: lib/controller/groupcontroller.php:130
msgid "No group name to rename from given."
msgstr ""
msgstr "Navn på gruppe som skal gis nytt navn er ikke oppgitt."
#: lib/controller/groupcontroller.php:134
msgid "No group name to rename to given."
msgstr ""
msgstr "Nytt gruppenavn er ikke oppgitt."
#: lib/controller/groupcontroller.php:140
msgid "Error renaming group."
msgstr ""
msgstr "Omdøping av gruppe feilet."
#: lib/controller/groupcontroller.php:178
#: lib/controller/groupcontroller.php:224
msgid "Group ID missing from request."
msgstr ""
msgstr "Gruppe-ID mangler i anmodningen."
#: lib/controller/groupcontroller.php:183
msgid "Group name missing from request."
msgstr ""
msgstr "Gruppenavn mangler i anmodningen."
#: lib/controller/groupcontroller.php:188
#: lib/controller/groupcontroller.php:229
msgid "Contact ID missing from request."
msgstr ""
msgstr "Kontakt-ID mangler i anmodningen."
#: lib/controller/importcontroller.php:54
msgid "Failed to write to disk"
@ -630,7 +631,7 @@ msgstr "Ikke nok lagringsplass"
#: lib/controller/importcontroller.php:73
msgid "Attempt to upload blacklisted file:"
msgstr ""
msgstr "Forsøk på å laste opp svartelistet fil:"
#: lib/controller/importcontroller.php:95
msgid "Error uploading contacts to storage."
@ -638,42 +639,42 @@ msgstr "Klarte ikke å laste opp kontakter til lagringsplassen"
#: lib/controller/importcontroller.php:140
msgid "Error moving file to imports folder."
msgstr ""
msgstr "Feil ved flytting av fil til importmappen."
#: lib/controller/importcontroller.php:157
msgid "You do not have permissions to import into this address book."
msgstr ""
msgstr "Du har ikke adgang til å importere til denne adresseboken."
#: lib/controller/importcontroller.php:165
msgid "File name missing from request."
msgstr ""
msgstr "Filnavn mangler i anmodningen."
#: lib/controller/importcontroller.php:170
#: lib/controller/importcontroller.php:293
msgid "Progress key missing from request."
msgstr ""
msgstr "Framdriftsnøkkel mangler i anmodningen."
#: lib/controller/importcontroller.php:176
msgid "Attempt to access blacklisted file:"
msgstr ""
msgstr "Forsøk på å aksessere svartelistet fil:"
#: lib/controller/importcontroller.php:218
msgid "No contacts found in: "
msgstr ""
msgstr "Fant ingen kontakter i:"
#: lib/controller/settingscontroller.php:36
msgid "No key is given."
msgstr ""
msgstr "Nøkkel er ikke oppgitt."
#: lib/controller/settingscontroller.php:40
msgid "No value is given."
msgstr ""
msgstr "Verdi er ikke oppgitt."
#: lib/controller/settingscontroller.php:51
msgid "Could not set preference: "
msgstr "Kunne ikke sette preferanse:"
#: lib/searchprovider.php:32
#: lib/searchprovider.php:37
msgid "Contact"
msgstr "Kontakt"
@ -685,7 +686,7 @@ msgstr "Annet"
#: lib/utils/jsonserializer.php:114
msgid "HomePage"
msgstr ""
msgstr "Hjemmeside"
#: lib/utils/properties.php:71
msgid "Jabber"
@ -693,7 +694,7 @@ msgstr "Jabber"
#: lib/utils/properties.php:76
msgid "Internet call"
msgstr ""
msgstr "Internettsamtale"
#: lib/utils/properties.php:81
msgid "AIM"
@ -795,7 +796,7 @@ msgstr "Familie"
#: templates/contacts.php:6
msgid "New contact"
msgstr ""
msgstr "Ny kontakt"
#: templates/contacts.php:10
msgid "Group name"
@ -803,7 +804,7 @@ msgstr "Gruppenavn"
#: templates/contacts.php:10
msgid "New group"
msgstr ""
msgstr "Ny gruppe"
#: templates/contacts.php:19
msgid "Address books"
@ -811,11 +812,11 @@ msgstr "Adressebøker"
#: templates/contacts.php:22 templates/contacts.php:52
msgid "Display name"
msgstr ""
msgstr "Visningsnavn"
#: templates/contacts.php:22
msgid "Add Address Book"
msgstr ""
msgstr "Ny adressebok"
#: templates/contacts.php:31 templates/contacts.php:32
msgid "Select file..."
@ -823,19 +824,19 @@ msgstr "Velg fil"
#: templates/contacts.php:49
msgid "(De-)select all"
msgstr ""
msgstr "(Av-)marker alle"
#: templates/contacts.php:51
msgid "Sort order"
msgstr ""
msgstr "Rekkefølge"
#: templates/contacts.php:53
msgid "First- Lastname"
msgstr ""
msgstr "For- Etternavn"
#: templates/contacts.php:54
msgid "Last-, Firstname"
msgstr ""
msgstr "Etter-, Fornavn"
#: templates/contacts.php:64 templates/contacts.php:255
msgid "Groups"
@ -843,7 +844,7 @@ msgstr "Grupper"
#: templates/contacts.php:67
msgid "Merge"
msgstr ""
msgstr "Flett"
#: templates/contacts.php:70 templates/contacts.php:347
msgid "Email"
@ -914,7 +915,7 @@ msgid ""
"<h3>You have no contacts in your address book or your address book is "
"disabled.</h3><p>Add a new contact or import existing contacts from a VCF "
"file.</p>"
msgstr ""
msgstr "<h3>Du har ingen kontakter eller adresseboken din er ikke aktivert.</h3><p>Legg inn en ny kontakt eller importer eksisterende kontakter fra en VCF-fil.</p>"
#: templates/contacts.php:116
msgid "Add contact"
@ -922,15 +923,15 @@ msgstr "Ny kontakt"
#: templates/contacts.php:172
msgid "Which contact should the data be merged into?"
msgstr ""
msgstr "Hvilken kontakt skal dataene flettes inn i?"
#: templates/contacts.php:180
msgid "Delete the other(s) after successful merge?"
msgstr ""
msgstr "Slett den/de andre etter vellykket fletting?"
#: templates/contacts.php:195
msgid "Compose mail"
msgstr ""
msgstr "Skriv epost"
#: templates/contacts.php:223
msgid "Delete current photo"
@ -983,15 +984,15 @@ msgstr "Bursdag"
#: templates/contacts.php:334
msgid "Notes go here..."
msgstr ""
msgstr "Notater her..."
#: templates/contacts.php:341
msgid "Add field..."
msgstr ""
msgstr "Legg til felt..."
#: templates/contacts.php:348
msgid "Instant Messaging"
msgstr ""
msgstr "Lynmelding"
#: templates/contacts.php:350
msgid "Note"
@ -1029,7 +1030,7 @@ msgstr "Skriv inn telefonnummer"
#: templates/contacts.php:407
msgid "Go to web site"
msgstr ""
msgstr "Gå til webside"
#: templates/contacts.php:424
msgid "View on map"
@ -1037,11 +1038,11 @@ msgstr "Se på kart"
#: templates/contacts.php:432
msgid "Street address"
msgstr ""
msgstr "Gateadresse"
#: templates/contacts.php:436
msgid "Postal code"
msgstr ""
msgstr "Postnummer"
#: templates/contacts.php:438
msgid "City"
@ -1049,7 +1050,7 @@ msgstr "By"
#: templates/contacts.php:442
msgid "State or province"
msgstr ""
msgstr "Stat eller fylke"
#: templates/contacts.php:446
msgid "Country"
@ -1057,7 +1058,7 @@ msgstr "Land"
#: templates/contacts.php:473
msgid "Instant Messenger"
msgstr ""
msgstr "Lynmelding"
#: templates/contacts.php:486
msgid "Active"
@ -1073,7 +1074,7 @@ msgstr "Eksporter"
#: templates/contacts.php:491
msgid "CardDAV link"
msgstr ""
msgstr "CardDAV-lenke"
#: templates/settings.php:3
msgid "CardDAV syncing addresses"

View File

@ -20,8 +20,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
"POT-Creation-Date: 2014-02-16 01:13-0500\n"
"PO-Revision-Date: 2014-02-15 11:30+0000\n"
"POT-Creation-Date: 2014-02-27 00:49-0500\n"
"PO-Revision-Date: 2014-02-26 21:30+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
@ -82,129 +82,129 @@ msgstr "Onherstelbare fout bij het laden van adresboeken: {msg}"
msgid "Error."
msgstr "Fout."
#: js/app.js:323 js/app.js:337
#: js/app.js:321 js/app.js:335
msgid "Add to..."
msgstr "Toevoegen aan..."
#: js/app.js:327 js/app.js:339
#: js/app.js:325 js/app.js:337
msgid "Remove from..."
msgstr "Verwijderen uit..."
#: js/app.js:344
#: js/app.js:342
msgid "Add group..."
msgstr "Nieuwe groep..."
#: js/app.js:472
#: js/app.js:470
msgid "Invalid URL: \"{url}\""
msgstr "Ongeldige URL: \"{url}\""
#: js/app.js:483
#: js/app.js:481
msgid "There was an error opening a mail composer."
msgstr "Er is iets misgegaan tijdens het openen van een email programma."
#: js/app.js:488
#: js/app.js:486
msgid "Invalid email: \"{url}\""
msgstr "Ongeldige e-mail: \"{url}\""
#: js/app.js:571
#: js/app.js:569
msgid "Merge failed. Cannot find contact: {id}"
msgstr "Samenvoegen mislukt. Kan contactpersoon {id} niet vinden "
#: js/app.js:584
#: js/app.js:582
msgid "Merge failed."
msgstr "Samenvoeging mislukt."
#: js/app.js:591
#: js/app.js:589
msgid "Merge failed. Error saving contact."
msgstr "Samenvoegen mislukt. Fout bij opslaan contactpersoon."
#: js/app.js:611
#: js/app.js:609
msgid "Select photo"
msgstr "Selecteer een foto"
#: js/app.js:691 js/app.js:1633
#: js/app.js:689 js/app.js:1631
msgid "Network or server error. Please inform administrator."
msgstr "Netwerk- of serverfout. Neem contact op met de beheerder."
#: js/app.js:913
#: js/app.js:911
msgid "Error adding to group."
msgstr "Fout bij het toevoegen aan de groep."
#: js/app.js:936
#: js/app.js:934
msgid "Error removing from group."
msgstr "Fout bij het verwijderen uit de groep."
#: js/app.js:1112
#: js/app.js:1110
msgid ""
"You have selected over 300 contacts.\n"
"This will most likely fail! Click here to try anyway."
msgstr "U hebt meer dan300 contactpersonen geselecteerd.\nDat gaat waarschijnlijk niet lukken! Klik hier om het toch te proberen."
#: js/app.js:1150
#: js/app.js:1148
msgid "Error setting {name} as favorite."
msgstr "Fout bij instellen {name} als favoriet"
#: js/app.js:1289 js/app.js:1293 templates/contacts.php:171
#: js/app.js:1287 js/app.js:1291 templates/contacts.php:171
msgid "Merge contacts"
msgstr "Samenvoegen contactgegevens"
#: js/app.js:1315 js/app.js:1368 js/settings.js:120 templates/settings.php:62
#: js/app.js:1313 js/app.js:1366 js/settings.js:120 templates/settings.php:62
msgid "Cancel"
msgstr "Annuleer"
#: js/app.js:1342 templates/contacts.php:152
#: js/app.js:1340 templates/contacts.php:152
msgid "Add group"
msgstr "Toevoegen groep"
#: js/app.js:1346
#: js/app.js:1344
msgid "OK"
msgstr "OK"
#: js/app.js:1457
#: js/app.js:1455
msgid "Could not find contact: {id}"
msgstr "Kon contactpersoon niet vinden: {id}"
#: js/app.js:1480
#: js/app.js:1478
msgid "No files selected for upload."
msgstr "Geen bestanden geselecteerd voor upload."
#: js/app.js:1490
#: js/app.js:1488
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Het bestand dat u probeert te uploaden overschrijdt de maximale bestand grootte voor bestand uploads voor deze server."
#: js/app.js:1591
#: js/app.js:1589
msgid "Edit profile picture"
msgstr "Bewerk profielafbeelding"
#: js/app.js:1595
#: js/app.js:1593
msgid "Crop photo"
msgstr "Bijsnijden foto"
#: js/contacts.js:878
#: js/contacts.js:889
msgid "Error parsing date: {date}"
msgstr "Fout bij lezen datum: {date}"
#: js/contacts.js:1082
#: js/contacts.js:1093
msgid "# groups"
msgstr "# groepen"
#: js/contacts.js:1156
#: js/contacts.js:1167
msgid "Error parsing birthday {bday}"
msgstr "Error bij interpreteren geboortedatum {bday}"
#: js/contacts.js:2228
#: js/contacts.js:2240
msgid ""
"Some contacts are marked for deletion, but not deleted yet. Please wait for "
"them to be deleted."
msgstr "Enkele contacten zijn gemarkeerd om verwijderd te worden, maar zijn nog niet verwijderd. Wacht totdat ze zijn verwijderd."
#: js/contacts.js:2239
#: js/contacts.js:2251
msgid "Click to undo deletion of {num} contacts"
msgstr "Klik om het verwijderen van {num} contactpersonen ongedaan te maken."
#: js/contacts.js:2248
#: js/contacts.js:2260
msgid "Cancelled deletion of {num} contacts"
msgstr "Verwijderen van {num} contacten geannuleerd"
@ -675,7 +675,7 @@ msgstr "Geen waarde opgegeven."
msgid "Could not set preference: "
msgstr "Kan voorkeur niet opslaan:"
#: lib/searchprovider.php:32
#: lib/searchprovider.php:37
msgid "Contact"
msgstr "Contact"

View File

@ -168,6 +168,7 @@
"Skype" => "Skype",
"QQ" => "QQ",
"GaduGadu" => "GaduGadu",
"ownCloud handle" => "Gerenciamento ownCloud",
"Work" => "Emprego",
"Home" => "Casa",
"Mobile" => "Telemóvel",

View File

@ -22,9 +22,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
"POT-Creation-Date: 2014-02-16 01:13-0500\n"
"PO-Revision-Date: 2014-02-15 11:30+0000\n"
"Last-Translator: I Robot\n"
"POT-Creation-Date: 2014-02-26 00:49-0500\n"
"PO-Revision-Date: 2014-02-25 12:11+0000\n"
"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\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"
@ -84,103 +84,103 @@ msgstr "Erro irrecuperável enquanto tentava carregar os livros de endereço: {m
msgid "Error."
msgstr "Erro."
#: js/app.js:323 js/app.js:337
#: js/app.js:321 js/app.js:335
msgid "Add to..."
msgstr "Adicionar a..."
#: js/app.js:327 js/app.js:339
#: js/app.js:325 js/app.js:337
msgid "Remove from..."
msgstr "Remover de..."
#: js/app.js:344
#: js/app.js:342
msgid "Add group..."
msgstr "Adicionar grupo..."
#: js/app.js:472
#: js/app.js:470
msgid "Invalid URL: \"{url}\""
msgstr "URL inválido: \"{url}\""
#: js/app.js:483
#: js/app.js:481
msgid "There was an error opening a mail composer."
msgstr "Houve um erro a abrir o editor de e-mail."
#: js/app.js:488
#: js/app.js:486
msgid "Invalid email: \"{url}\""
msgstr "Correio eletrónico inválido: \"{url}\""
#: js/app.js:571
#: js/app.js:569
msgid "Merge failed. Cannot find contact: {id}"
msgstr "Falhou a junção. Não se encontrou o contacto: {id}"
#: js/app.js:584
#: js/app.js:582
msgid "Merge failed."
msgstr "Junção falhou."
#: js/app.js:591
#: js/app.js:589
msgid "Merge failed. Error saving contact."
msgstr "Junção falhou. Erro ao guardar contacto."
#: js/app.js:611
#: js/app.js:609
msgid "Select photo"
msgstr "Selecione uma fotografia"
#: js/app.js:691 js/app.js:1633
#: js/app.js:689 js/app.js:1631
msgid "Network or server error. Please inform administrator."
msgstr "Erro de rede ou do servidor. Por favor, informe o administrador."
#: js/app.js:913
#: js/app.js:911
msgid "Error adding to group."
msgstr "Erro a adicionar ao grupo."
#: js/app.js:936
#: js/app.js:934
msgid "Error removing from group."
msgstr "Erro a remover do grupo."
#: js/app.js:1112
#: js/app.js:1110
msgid ""
"You have selected over 300 contacts.\n"
"This will most likely fail! Click here to try anyway."
msgstr "Você selecionou mais de 300 contactos.\nIsto irá falhar de certeza! Clique aqui para tentar na mesma."
#: js/app.js:1150
#: js/app.js:1148
msgid "Error setting {name} as favorite."
msgstr "Erro ao marcar {name} como favorito."
#: js/app.js:1289 js/app.js:1293 templates/contacts.php:171
#: js/app.js:1287 js/app.js:1291 templates/contacts.php:171
msgid "Merge contacts"
msgstr "Juntar contactos"
#: js/app.js:1315 js/app.js:1368 js/settings.js:120 templates/settings.php:62
#: js/app.js:1313 js/app.js:1366 js/settings.js:120 templates/settings.php:62
msgid "Cancel"
msgstr "Cancelar"
#: js/app.js:1342 templates/contacts.php:152
#: js/app.js:1340 templates/contacts.php:152
msgid "Add group"
msgstr "Adicionar grupo"
#: js/app.js:1346
#: js/app.js:1344
msgid "OK"
msgstr "OK"
#: js/app.js:1457
#: js/app.js:1455
msgid "Could not find contact: {id}"
msgstr "Não foi possível encontrar o contacto: {id}"
#: js/app.js:1480
#: js/app.js:1478
msgid "No files selected for upload."
msgstr "Nenhum ficheiro selecionado para enviar."
#: js/app.js:1490
#: js/app.js:1488
msgid ""
"The file you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "O tamanho do ficheiro que está a tentar carregar ultrapassa o limite máximo definido para ficheiros no servidor."
#: js/app.js:1591
#: js/app.js:1589
msgid "Edit profile picture"
msgstr "Editar a fotografia de perfil."
#: js/app.js:1595
#: js/app.js:1593
msgid "Crop photo"
msgstr "Cortar foto"
@ -745,7 +745,7 @@ msgstr "GaduGadu"
#: lib/utils/properties.php:136
msgid "ownCloud handle"
msgstr ""
msgstr "Gerenciamento ownCloud"
#: lib/utils/properties.php:163 lib/utils/properties.php:171
#: lib/utils/properties.php:182 lib/utils/properties.php:199

View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud contacts 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
"POT-Creation-Date: 2014-02-23 00:49-0500\n"
"POT-Creation-Date: 2014-02-27 00:49-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -169,29 +169,29 @@ msgstr ""
msgid "Crop photo"
msgstr ""
#: js/contacts.js:878
#: js/contacts.js:889
msgid "Error parsing date: {date}"
msgstr ""
#: js/contacts.js:1082
#: js/contacts.js:1093
msgid "# groups"
msgstr ""
#: js/contacts.js:1156
#: js/contacts.js:1167
msgid "Error parsing birthday {bday}"
msgstr ""
#: js/contacts.js:2228
#: js/contacts.js:2240
msgid ""
"Some contacts are marked for deletion, but not deleted yet. Please wait for "
"them to be deleted."
msgstr ""
#: js/contacts.js:2239
#: js/contacts.js:2251
msgid "Click to undo deletion of {num} contacts"
msgstr ""
#: js/contacts.js:2248
#: js/contacts.js:2260
msgid "Cancelled deletion of {num} contacts"
msgstr ""
@ -662,7 +662,7 @@ msgstr ""
msgid "Could not set preference: "
msgstr ""
#: lib/searchprovider.php:32
#: lib/searchprovider.php:37
msgid "Contact"
msgstr ""

View File

@ -158,7 +158,7 @@ class AddressbookProvider implements \OCP\IAddressBook {
. self::PROPERTY_TABLE . '`.`contactid` = `' . self::CONTACT_TABLE . '`.`id` AND `'
. self::PROPERTY_TABLE . '`.`contactid` IN (' . join(',', array_fill(0, count($ids), '?')) . ')';
\OCP\Util::writeLog('contacts', __METHOD__ . 'DB query: ' . $query, \OCP\Util::DEBUG);
//\OCP\Util::writeLog('contacts', __METHOD__ . 'DB query: ' . $query, \OCP\Util::DEBUG);
$stmt = \OCP\DB::prepare($query);
$result = $stmt->execute($ids);
}

View File

@ -496,7 +496,6 @@ class Database extends AbstractBackend {
* @return string|bool The identifier for the new contact or false on error.
*/
public function createContact($addressbookid, $contact, array $options = array()) {
error_log("db create power ! $addressbookid - " . $contact->serialize());
$qname = 'createcontact';
$uri = isset($options['uri']) ? $options['uri'] : null;
@ -571,7 +570,6 @@ class Database extends AbstractBackend {
* @return bool
*/
public function updateContact($addressbookid, $id, $contact, array $options = array()) {
error_log("db update power ! $addressbookid, $id - " . $contact->serialize());
$noCollection = isset($options['noCollection']) ? $options['noCollection'] : false;
$isBatch = isset($options['isBatch']) ? $options['isBatch'] : false;
$qname = 'updatecontact';

View File

@ -294,7 +294,7 @@ class Ldap extends AbstractBackend {
$current['owner'] = $this->userid;
$current['uri'] = (string)$preferences['uri'];
$current['permissions'] = \OCP\PERMISSION_ALL;
$current['lastmodified'] = self::lastModifiedAddressBook($addressbookid);
$current['lastmodified'] = self::lastModifiedAddressBook($addressbookid);
return $current;
} else {
return array();

View File

@ -189,6 +189,7 @@ class Backend extends \Sabre_CardDAV_Backend_Abstract {
'etag' => '"' . md5($contact['carddata']) . '"',
'uri' => urlencode($contact['uri']),
'lastmodified' => $contact['lastmodified'] );
error_log("backend.getCards(".urlencode($contact['uri'])."): ".md5($contact['carddata'])." - ".$contact['carddata']);
}
return $cards;
@ -212,6 +213,7 @@ class Backend extends \Sabre_CardDAV_Backend_Abstract {
}
if(is_array($contact) ) {
$contact['etag'] = '"' . md5($contact['carddata']) . '"';
error_log("backend.getCard($carduri): ".$contact['etag']." - ".$contact['carddata']);
return $contact;
}
//throw new \Sabre_DAV_Exception('Error retrieving the card');

View File

@ -75,7 +75,7 @@ class AddressBookController extends Controller {
$response->setETag($etag);
}
//$response->debug('comparing: "' . $etag . '" to ' . $this->request->getHeader('If-None-Match'));
error_log('comparing: "' . $etag . '" to ' . $this->request->getHeader('If-None-Match'));
if(!is_null($etag)
&& $this->request->getHeader('If-None-Match') === '"'.$etag.'"')
{

View File

@ -28,7 +28,6 @@ class ContactPhotoController extends Controller {
// TODO: Cache resized photo
$params = $this->request->urlParams;
$etag = null;
//$maxSize = isset($this->request['maxSize']) ? $this->request['maxSize'] : 170;
$addressBook = $this->app->getAddressBook($params['backend'], $params['addressBookId']);
$contact = $addressBook->getChild($params['contactId']);
@ -80,6 +79,7 @@ class ContactPhotoController extends Controller {
*/
public function uploadPhoto() {
$params = $this->request->urlParams;
$maxSize = isset($this->request->post['maxSize']) ? $this->request->post['maxSize'] : 400;
$response = new JSONResponse();
@ -120,6 +120,14 @@ class ContactPhotoController extends Controller {
$response->debug('Couldn\'t save correct image orientation: '.$tmpkey);
}
if($image->valid()) {
if($image->height() > $maxSize || $image->width() > $maxSize) {
$image->resize($maxSize);
}
} else {
$response->bailOut(App::$l10n->t('Uploaded image is invalid'));
}
if(!$this->server->getCache()->set($tmpkey, $image->data(), 600)) {
$response->bailOut(App::$l10n->t('Couldn\'t save temporary image: ').$tmpkey);
return $response;
@ -150,7 +158,9 @@ class ContactPhotoController extends Controller {
public function cacheCurrentPhoto() {
$params = $this->request->urlParams;
$response = new JSONResponse();
$photoResponse = $this->getPhoto($maxSize = 400);
$maxSize = isset($this->request->get['maxSize']) ? $this->request->get['maxSize'] : 400;
$photoResponse = $this->getPhoto($maxSize);
if(!$photoResponse instanceof ImageResponse) {
return $photoResponse;
@ -185,6 +195,7 @@ class ContactPhotoController extends Controller {
*/
public function cacheFileSystemPhoto() {
$params = $this->request->urlParams;
$maxSize = isset($this->request->get['maxSize']) ? $this->request->get['maxSize'] : 400;
$response = new JSONResponse();
if(!isset($this->request->get['path'])) {
@ -205,8 +216,8 @@ class ContactPhotoController extends Controller {
if(!$image->loadFromFile($localpath)) {
return $response->bailOut(App::$l10n->t('Error loading image.'));
}
if($image->width() > 400 || $image->height() > 400) {
$image->resize(400); // Prettier resizing than with browser and saves bandwidth.
if($image->width() > $maxSize || $image->height() > $maxSize) {
$image->resize($maxSize); // Prettier resizing than with browser and saves bandwidth.
}
if(!$image->fixOrientation()) { // No fatal error so we don't bail out.
$response->debug('Couldn\'t save correct image orientation: '.$localpath);
@ -234,14 +245,10 @@ class ContactPhotoController extends Controller {
public function getTempPhoto() {
$params = $this->request->urlParams;
$tmpkey = $params['key'];
$maxSize = isset($this->request->get['maxSize']) ? $this->request->get['maxSize'] : 400;
$image = new \OCP\Image();
$image->loadFromData($this->server->getCache()->get($tmpkey));
if($image->valid()) {
if($image->height() > $maxSize || $image->width() > $maxSize) {
$image->resize($maxSize);
}
$response = new ImageResponse($image);
return $response;
} else {
@ -262,7 +269,6 @@ class ContactPhotoController extends Controller {
$w = (isset($this->request->post['w']) && $this->request->post['w']) ? $this->request->post['w'] : -1;
$h = (isset($this->request->post['h']) && $this->request->post['h']) ? $this->request->post['h'] : -1;
$tmpkey = $params['key'];
$maxSize = isset($this->request->post['maxSize']) ? $this->request->post['maxSize'] : 200;
$app = new App($this->api->getUserId());
$addressBook = $app->getAddressBook($params['backend'], $params['addressBookId']);
@ -292,12 +298,6 @@ class ContactPhotoController extends Controller {
return $response->bailOut(App::$l10n->t('Error cropping image'));
}
if($image->width() < $maxSize || $image->height() < $maxSize) {
if(!$image->resize(200)) {
return $response->bailOut(App::$l10n->t('Error resizing image'));
}
}
// For vCard 3.0 the type must be e.g. JPEG or PNG
// For version 4.0 the full mimetype should be used.
// https://tools.ietf.org/html/rfc2426#section-3.1.4

View File

@ -52,8 +52,6 @@ class PageController extends Controller {
\OCP\Util::addScript('contacts', 'jquery.ocaddnew');
\OCP\Util::addScript('files', 'jquery.fileupload');
\OCP\Util::addScript('3rdparty/Jcrop', 'jquery.Jcrop');
\OCP\Util::addStyle('3rdparty/fontawesome', 'font-awesome');
\OCP\Util::addStyle('contacts', 'font-awesome');
\OCP\Util::addStyle('', 'jquery.multiselect');
\OCP\Util::addStyle('contacts', 'jquery.combobox');
\OCP\Util::addStyle('contacts', 'jquery.ocaddnew');

View File

@ -16,20 +16,25 @@ class SearchProvider extends \OC_Search_Provider{
return strtr($value, array('\,' => ',', '\;' => ';'));
};
$app = new App();
$searchresults = array( );
$searchresults = array();
$results = \OCP\Contacts::search($query, array('N', 'FN', 'EMAIL', 'NICKNAME', 'ORG'));
$l = new \OC_l10n('contacts');
foreach($results as $result) {
$link = \OCP\Util::linkToRoute('contacts_index').'#' . $result['id'];
$props = array();
$display = (isset($result['FN']) && $result['FN']) ? $result['FN'] : null;
foreach(array('EMAIL', 'NICKNAME', 'ORG') as $searchvar) {
if(isset($result[$searchvar]) && count($result[$searchvar]) > 0 && strlen($result[$searchvar][0]) > 3) {
$props = array_merge($props, $result[$searchvar]);
if(isset($result[$searchvar]) && $result[$searchvar]) {
if(is_array($result[$searchvar])) {
$result[$searchvar] = array_filter($result[$searchvar]);
}
$prop = is_array($result[$searchvar]) ? implode(',', $result[$searchvar]) : $result[$searchvar];
$props[] = $prop;
$display = $display ?: $result[$searchvar];
}
}
$props = array_map($unescape, $props);
$searchresults[]=new \OC_Search_Result($result['FN'], implode(', ', $props), $link, (string)$l->t('Contact'));//$name,$text,$link,$type
$searchresults[]=new \OC_Search_Result($display, implode(', ', $props), $link, (string)$l->t('Contact'), null);//$name,$text,$link,$type
}
return $searchresults;
}

View File

@ -28,7 +28,7 @@
<select id="import_into">
<option value="-1"><?php p($l->t('Import into...')); ?></option>
</select>
<button class="svg tooltipped rightwards import-upload-button" title="<?php p($l->t('Select file...')); ?>"></button>
<button class="icon icon-upload svg tooltipped rightwards import-upload-button" title="<?php p($l->t('Select file...')); ?>"></button>
<input id="import_upload_start" class="tooltipped rightwards" title="<?php p($l->t('Select file...')); ?>" type="file" accept="text/vcard,text/x-vcard,text/directory" name="file" disabled />
</li>
<li class="import-status">
@ -56,15 +56,15 @@
</span>
<span class="actions">
<a class="delete svg action text permanent">
<a class="icon icon-delete delete svg action text permanent">
<?php p($l->t('Delete')); ?>
<img class="svg" alt="<?php p($l->t('Delete'))?>" src="<?php print_unescaped(OCP\image_path("core", "actions/delete.svg")); ?>" />
</a>
<select class="groups svg action text permanent shared" name="groups">
<option value="-1" disabled="disabled" selected="selected"><?php p($l->t('Groups')); ?></option>
</select>
<a class="download svg action text permanent"><?php p($l->t('Download')); ?></a>
<a class="action svg text permanent merge edit"><?php p($l->t('Merge')); ?></a>
<a class="icon icon-download download svg action text permanent"><?php p($l->t('Download')); ?></a>
<a class="icon icon-rename action svg text permanent merge edit"><?php p($l->t('Merge')); ?></a>
</span>
</td>
<td class="info email"><?php p($l->t('Email')); ?></td>
@ -160,8 +160,8 @@
<li class="group" data-type="{type}" data-id="{id}">
<a class="name" role="button">{name}</a>
<span class="utils">
<a class="action delete tooltipped rightwards"></a>
<a class="action edit tooltipped rightwards"></a>
<a class="icon icon-delete action delete tooltipped rightwards"></a>
<a class="icon icon-rename action edit tooltipped rightwards"></a>
<span class="action numcontacts">{num}</span>
</span>
</li>
@ -192,7 +192,7 @@
</td>
<td class="email">
<a href="mailto:{email}">{email}</a>
<a class="svg mailto hidden" title="<?php p($l->t('Compose mail')); ?>"></a>
<a class="icon icon-mail svg mailto hidden" title="<?php p($l->t('Compose mail')); ?>"></a>
</td>
<td class="tel">{tel}</td>
<td class="adr">{adr}</td>
@ -220,10 +220,10 @@
<li>
<div id="photowrapper" class="propertycontainer" data-element="photo">
<ul id="phototools" class="transparent hidden">
<li><a class="action delete" title="<?php echo $l->t('Delete current photo'); ?>"></a></li>
<li><a class="action edit" title="<?php echo $l->t('Edit current photo'); ?>"></a></li>
<li><a class="action upload" title="<?php echo $l->t('Upload new photo'); ?>"></a></li>
<li><a class="action cloud icon-cloud" title="<?php echo $l->t('Select photo from ownCloud'); ?>"></a></li>
<li><a class="icon icon-delete action delete" title="<?php echo $l->t('Delete current photo'); ?>"></a></li>
<li><a class="icon icon-rename action edit" title="<?php echo $l->t('Edit current photo'); ?>"></a></li>
<li><a class="icon icon-upload action upload" title="<?php echo $l->t('Upload new photo'); ?>"></a></li>
<li><a class="icon icon-folder action cloud icon-cloud" title="<?php echo $l->t('Select photo from Files'); ?>"></a></li>
</ul>
<a class="favorite {favorite}"></a>
</div>
@ -268,7 +268,7 @@
<label class="propertyname"></label>
<input class="value rightwards onfocus" type="text" name="value" value="{nickname}" required />
<span class="listactions">
<a role="button" class="action delete"></a>
<a role="button" class="icon icon-delete action delete"></a>
</span>
</dd>
</div>
@ -278,7 +278,7 @@
<label class="propertyname"></label>
<input class="value rightwards onfocus" type="text" name="value" value="{title}" required />
<span class="listactions">
<a role="button" class="action delete"></a>
<a role="button" class="icon icon-delete action delete"></a>
</span>
</dd>
</div>
@ -288,7 +288,7 @@
<label class="propertyname"></label>
<input class="value rightwards onfocus" type="text" name="value" value="{org}" required />
<span class="listactions">
<a role="button" class="action delete"></a>
<a role="button" class="icon icon-delete action delete"></a>
</span>
</dd>
</div>
@ -298,7 +298,7 @@
<label class="propertyname"></label>
<input class="value rightwards onfocus" type="text" name="value" value="{bday}" required />
<span class="listactions">
<a role="button" class="action delete"></a>
<a role="button" class="icon icon-delete action delete"></a>
</span>
</dd>
</d>
@ -375,8 +375,8 @@
</span>
<input type="email" class="nonempty value" name="value" value="{value}" x-moz-errormessage="<?php p($l->t('Please specify a valid email address.')); ?>" placeholder="<?php p($l->t('someone@example.com')); ?>" required />
<span class="listactions">
<a class="action mail tooltipped leftwards" title="<?php p($l->t('Mail to address')); ?>"></a>
<a role="button" class="action delete tooltipped leftwards" title="<?php p($l->t('Delete email address')); ?>"></a>
<a class="icon icon-mail action mail tooltipped leftwards" title="<?php p($l->t('Mail to address')); ?>"></a>
<a role="button" class="icon icon-delete action delete tooltipped leftwards" title="<?php p($l->t('Delete email address')); ?>"></a>
</span>
</li>
</div>
@ -390,7 +390,7 @@
</span>
<input type="text" class="nonempty value" name="value" value="{value}" placeholder="<?php p($l->t('Enter phone number')); ?>" required />
<span class="listactions">
<a role="button" class="action delete tooltipped leftwards"></a>
<a role="button" class="icon icon-delete action delete tooltipped leftwards"></a>
</span>
</li>
</div>
@ -404,8 +404,8 @@
</span>
<input type="url" class="nonempty value" name="value" value="{value}" placeholder="http://www.example.com/" required />
<span class="listactions">
<a role="button" class="action globe tooltipped leftwards" title="<?php p($l->t('Go to web site')); ?>">
<a role="button" class="action delete tooltipped leftwards"></a>
<a role="button" class="icon icon-public action globe tooltipped leftwards" title="<?php p($l->t('Go to web site')); ?>">
<a role="button" class="icon icon-delete action delete tooltipped leftwards"></a>
</span>
</li>
</div>
@ -421,8 +421,8 @@
<span class="adr">{value}</span>
</span>
<span class="listactions">
<a class="action globe tooltipped leftwards" title="<?php p($l->t('View on map')); ?>"></a>
<a class="action delete tooltipped leftwards"></a>
<a class="icon icon-public action globe tooltipped leftwards" title="<?php p($l->t('View on map')); ?>"></a>
<a class="icon icon-delete action delete tooltipped leftwards"></a>
</span>
<fieldset class="adr hidden editor">
<ul>
@ -472,7 +472,7 @@
<input type="text" class="nonempty value" name="value" value="{value}"
placeholder="<?php p($l->t('Instant Messenger')); ?>" required />
<span class="listactions">
<a role="button" class="action delete tooltipped leftwards"></a>
<a role="button" class="icon icon-delete action delete tooltipped leftwards"></a>
</span>
</li>
</div>
@ -486,11 +486,11 @@
<input type="checkbox" name="active" checked="checked" title="<?php p($l->t('Active')); ?>" />
<label>{displayname}</label>
<span class="actions">
<a title="<?php p($l->t('Share')); ?>" class="share action" data-possible-permissions="{permissions}" data-item="{id}" data-item-type="addressbook"></a>
<a title="<?php p($l->t('Export')); ?>" class="download action"></a>
<a title="<?php p($l->t('CardDAV link')); ?>" class="globe action"></a>
<a title="<?php p($l->t('Edit')); ?>" class="edit action"></a>
<a title="<?php p($l->t('Delete')); ?>" class="delete action"></a>
<a title="<?php p($l->t('Share')); ?>" class="icon icon-share share action" data-possible-permissions="{permissions}" data-item="{id}" data-item-type="addressbook"></a>
<a title="<?php p($l->t('Export')); ?>" class="icon icon-download download action"></a>
<a title="<?php p($l->t('CardDAV link')); ?>" class="icon icon-public globe action"></a>
<a title="<?php p($l->t('Edit')); ?>" class="icon icon-rename edit action"></a>
<a title="<?php p($l->t('Delete')); ?>" class="icon icon-delete delete action"></a>
</span>
</li>
</script>