diff --git a/src/configs/Config.php b/src/configs/Config.php index 5b8c0f1f0..45689a393 100755 --- a/src/configs/Config.php +++ b/src/configs/Config.php @@ -1179,6 +1179,11 @@ nsdefine('PERSONAL_GROUP_PREFIX', 'Personal$'); * CLIPBOARD_PAGE_NAME is used to indicate how that page should be named. */ nsdefine('CLIPBOARD_PAGE_NAME', 'Clipboard'); +/** + * Maximum number of thread items that can be held in the clipboard for + * discussion groups the user is an owner of of. + */ +nsdefine('MAX_THREAD_CLIPBOARD_ITEMS', 200); /** * Group registration type that only allows people to join a group by * invitation diff --git a/src/controllers/components/SocialComponent.php b/src/controllers/components/SocialComponent.php index eb476fad7..e62c1ab27 100644 --- a/src/controllers/components/SocialComponent.php +++ b/src/controllers/components/SocialComponent.php @@ -550,8 +550,11 @@ class SocialComponent extends Component implements CrawlConstants $group_id, C\INVITED_STATUS)) { $group_model->updateStatusUserGroup($user_id, $group_id, C\ACTIVE_STATUS); + unset($_REQUEST['route']); + $_REQUEST['c'] = "group"; return $parent->redirectWithMessage( - tl('social_component_joined'), ['arg']); + tl('social_component_joined'), + ['arg']); } return $parent->redirectWithMessage( tl('social_component_no_join'), @@ -1349,10 +1352,11 @@ class SocialComponent extends Component implements CrawlConstants $data['USER_MESSAGES_ID'] = $user_messages_id; $data['CONTACTS'] = array_diff($group_model->getGroupUserIds( $user_messages_id), [$user_id]); - $possible_arguments = ["addcomment", "addcontact", "addgroup", - "copypost", "cutpost", "deletepost", "downvote", "newthread", - "status", "updatepost", "upvote", "flagpost", "approveflagged", - "deleteflagged"]; + $possible_arguments = ["addcomment", "addcontact","approveflagged", + "addgroup", "copypost", "cutpost", "deleteflagged", + "deleteclip", "deletepost", "downvote", + "emptyclip", "flagpost", "newthread", "pasteall", "pastepost", + "status", "updatepost", "upvote", ]; } if (isset($_REQUEST['arg']) && in_array($_REQUEST['arg'], $possible_arguments)) { @@ -1505,11 +1509,18 @@ class SocialComponent extends Component implements CrawlConstants return $parent->redirectWithMessage( tl('social_component_clipboard_unavailable')); } + if ($group_model->getThreadPostCount($clipboard_id) + >= C\MAX_THREAD_CLIPBOARD_ITEMS) { + return $parent->redirectWithMessage( + tl('social_component_clipboard_full')); + } $clip_group_id = $group_model->getPersonalGroupId($user_id); - $group_model->addGroupItem($clipboard_id, $clip_group_id, - $post['USER_ID'], $post['TITLE'], $post['DESCRIPTION'], - $post['TYPE'], $post['PUBDATE'], "", $post['UPS'], - $post['DOWNS'], $post['FLAG']); + $clipped_item_id = $group_model->addGroupItem($clipboard_id, + $clip_group_id, $post['USER_ID'], $post['TITLE'], + $post['DESCRIPTION'], $post['TYPE'], $post['PUBDATE'], + "", $post['UPS'], $post['DOWNS'], $post['FLAG']); + $group_model->copyThreadResources($post["GROUP_ID"], + $post_id, $clip_group_id, $clipped_item_id); if ($arg == 'copypost') { return $parent->redirectWithMessage( tl('social_component_message_clipcopied')); @@ -1569,6 +1580,115 @@ class SocialComponent extends Component implements CrawlConstants } } break; + case "deleteclip": + $clipboard_id = $group_model->getFeedClipboardId($user_id); + $clip_group_id = $group_model->getPersonalGroupId($user_id); + $post_id = $parent->clean($_REQUEST['post_id'], "int"); + $group_item = $group_model->getGroupItem($post_id); + if (empty($group_item)) { + return $parent->redirectWithMessage( + tl('social_component_invalid_message_id')); + } + if ($group_item) { + // this method checks if user can delete post + $success = + $group_model->deleteGroupItem($post_id, $user_id); + } + if ($success) { + $group_model->deleteResources($clip_group_id, + "post" . $post_id); + return $parent->redirectWithMessage( + tl('social_component_clip_item_deleted')); + } + return $parent->redirectWithMessage( + tl('social_component_not_clip_item_deleted')); + break; + case "emptyclip": + $clipboard_id = $group_model->getFeedClipboardId($user_id); + $clip_group_id = $group_model->getPersonalGroupId($user_id); + $clip_search_array = [ + ["parent_id", "=", $clipboard_id, ""]]; + $clip_items = $group_model->getGroupItems(0, + C\MAX_THREAD_CLIPBOARD_ITEMS, $clip_search_array, + $user_id, -2); + foreach ($clip_items as $clip_item) { + if ($clip_item['DESCRIPTION'] == 'start_feed_clip') { + continue; + } + $success = $group_model->deleteGroupItem( + $clip_item['ID'], $user_id); + if ($success) { + $group_model->deleteResources($clip_group_id, + "post" . $clip_item['ID']); + } + } + return $parent->redirectWithMessage( + tl('social_component_clipboard_emptied')); + break; + case "pasteall": + $clipboard_id = $group_model->getFeedClipboardId($user_id); + $clip_group_id = $group_model->getPersonalGroupId($user_id); + if (empty($just_thread)) { + return $parent->redirectWithMessage( + tl('social_component_no_target_thread')); + } + $thread_item = $group_model->getGroupItem($just_thread); + if (!$thread_item) { + return $parent->redirectWithMessage( + tl('social_component_no_thread_access')); + } + $paste_group_id = $thread_item['GROUP_ID']; + $clip_search_array = [ + ["parent_id", "=", $clipboard_id, ""]]; + $clip_items = $group_model->getGroupItems(0, + C\MAX_THREAD_CLIPBOARD_ITEMS, $clip_search_array, + $user_id, -2); + foreach ($clip_items as $clip_item) { + if ($clip_item['DESCRIPTION'] == 'start_feed_clip') { + continue; + } + $pasted_id = $group_model->addGroupItem($just_thread, + $paste_group_id , $clip_item['USER_ID'], + $clip_item['TITLE'], $clip_item['DESCRIPTION'], + $clip_item['TYPE'], $clip_item['PUBDATE'], "", + $clip_item['UPS'], $clip_item['DOWNS'], + $clip_item['FLAG']); + $group_model->copyThreadResources( $clip_group_id, + $clipped_item['ID'], $paste_group_id, $pasted_id); + } + return $parent->redirectWithMessage( + tl('social_component_clipboard_pasted')); + break; + case "pastepost": + $clipboard_id = $group_model->getFeedClipboardId($user_id); + $clip_group_id = $group_model->getPersonalGroupId($user_id); + $post_id = $parent->clean($_REQUEST['post_id'], "int"); + $post = $group_model->getGroupItem($post_id); + if (empty($post)) { + return $parent->redirectWithMessage( + tl('social_component_invalid_message_id')); + } + if (empty($just_thread)) { + return $parent->redirectWithMessage( + tl('social_component_no_target_thread')); + } + $thread_item = $group_model->getGroupItem($just_thread); + if (!$thread_item) { + return $parent->redirectWithMessage( + tl('social_component_no_thread_access')); + } + $paste_group_id = $thread_item['GROUP_ID']; + $pasted_id = $group_model->addGroupItem($just_thread, + $paste_group_id , $post['USER_ID'], + $post['TITLE'], $post['DESCRIPTION'], + $post['TYPE'], $post['PUBDATE'], "", + $post['UPS'], $post['DOWNS'], + $post['FLAG']); + $group_model->copyThreadResources($clip_group_id, + $post_id, $paste_group_id, $pasted_id); + return $parent->redirectWithMessage( + tl('social_component_clipboard_pasted')); + break; case "flagpost": if (!isset($_REQUEST['post_id'])) { return $parent->redirectWithMessage( @@ -1946,20 +2066,41 @@ class SocialComponent extends Component implements CrawlConstants C\THREAD_IMPRESSION); $parent->model("impression")->add($user_id, $group_id, C\GROUP_IMPRESSION); + $parser = new WikiParser("", [], true); + $math = false; if (!empty($group) && $user_id == $group["OWNER_ID"]) { $clipboard_id = $group_model->getFeedClipboardId($user_id); + $clip_group_id = $group_model->getPersonalGroupId($user_id); $clip_search_array = [ ["parent_id", "=", $clipboard_id, ""]]; $clip_items = $group_model->getGroupItems(0, - 10, $clip_search_array, $user_id, -2); + 1000, $clip_search_array, $user_id, -2); $data['CLIP_ITEMS'] = []; + $csrf_token = C\CSRF_TOKEN . "=" . + $this->parent->generateCSRFToken($user_id); foreach ($clip_items as $clip_item) { if ($clip_item['DESCRIPTION'] == 'start_feed_clip') { continue; } + $clip_item["DESCRIPTION"] = + $group_model->insertResourcesParsePage( + $clip_group_id, + "post" . $clip_item['ID'], L\getLocaleTag(), + $clip_item["DESCRIPTION"]); + $clip_item["DESCRIPTION"] = preg_replace( + '/\[{rtoken}\]/', $csrf_token, + $clip_item["DESCRIPTION"]); $clip_item['USER_ICON'] = $user_model->getUserIconUrl( $clip_item['USER_ID']); $data['CLIP_ITEMS'][] = $clip_item; + if (!$math && strpos( + $clip_item["DESCRIPTION"], "`") !== false) { + $math = true; + if (!isset($data["INCLUDE_SCRIPTS"])) { + $data["INCLUDE_SCRIPTS"] = []; + } + $data["INCLUDE_SCRIPTS"][] = "math"; + } } } } diff --git a/src/locale/ar/configure.ini b/src/locale/ar/configure.ini index d1641a01b..831f17690 100755 --- a/src/locale/ar/configure.ini +++ b/src/locale/ar/configure.ini @@ -254,9 +254,22 @@ social_component_notify_body = "كنا نظن أنك قد تكون مهتمة ف social_component_notify_salutation = "عزيزي %s," social_component_comment_added = "تم إضافة التعليق!" social_component_public_cant_add = "العامة لا يمكن المستخدم من إضافة مجموعة!" +social_component_invalid_message_id = "" +social_component_invalid_access = "" +social_component_clipboard_unavailable = "" +social_component_clipboard_full = "" +social_component_message_clipcopied = "" social_component_delete_error = "خطأ في حذف البند" +social_component_item_clipcut = "" social_component_item_deleted = "البند حذف!" +social_component_item_cut_nodelete = "" social_component_no_item_deleted = "لا يوجد بند حذف!" +social_component_clip_item_deleted = "" +social_component_not_clip_item_deleted = "" +social_component_clipboard_emptied = "الحافظة أفرغت!" +social_component_no_target_thread = "" +social_component_no_thread_access = "" +social_component_clipboard_pasted = "" social_component_flag_error = "" social_component_already_flagged = "" social_component_item_flagged = "" @@ -318,7 +331,6 @@ social_component_page_created = "%s صفحة ويكي خلق!" social_component_page_discuss_here = "مناقشة صفحة في هذا الموضوع!" social_component_page_not_saved = "الصفحة غير محفوظة !" social_component_page_saved = "الصفحة المحفوظة!" -social_component_clipboard_emptied = "الحافظة أفرغت!" social_component_clipboard_not_emptied = "فشل الحافظة الفارغة !" social_component_paste_all_success = "لصق كل النجاح!" social_component_paste_all_failed = "لصق كل فشل!" @@ -1522,7 +1534,8 @@ groupfeed_element_clipboard = "" groupfeed_element_paste_all = "" groupfeed_element_empty_clipboard = "" groupfeed_element_no_clipboard_items = "" -groupfeed_element_paste = "" +groupfeed_element_pastepost = "" +groupfeed_element_delete = "حذف" groupfeed_element_thread_no_exist = "موضوع لا وجود له! ربما تم حذفها ؟ " groupfeed_element_flagged = "" groupfeed_element_cleared = "" @@ -1531,16 +1544,17 @@ groupfeed_element_up_vote = "التصويت حتى" groupfeed_element_down_vote = "التصويت أسفل" groupfeed_element_comment = "التعليق" groupfeed_element_edit = "تحرير" +groupfeed_element_copypost = "" +groupfeed_element_cutpost = "" groupfeed_element_confirm_delete = "هل متأكد من أنك تريد حذف هذا البند?" -groupfeed_element_delete = "حذف" groupfeed_element_confirm_flag = "" +groupfeed_element_num_posts = "%s المشاركات" +groupfeed_element_num_views = "%s وجهات النظر" +groupfeed_element_edited = "تحرير: %s" groupfeed_element_usericon = "رمز المستخدم" groupfeed_public_posts = "الوظائف العامة" groupfeed_messages = "الرسائل" groupfeed_connect = "الاتصال" -groupfeed_element_num_posts = "%s المشاركات" -groupfeed_element_num_views = "%s وجهات النظر" -groupfeed_element_edited = "تحرير: %s" groupfeed_element_start_thread = "بدء موضوع جديد" groupfeed_element_subject = "الموضوع" groupfeed_element_post = "بعد" diff --git a/src/locale/bn/configure.ini b/src/locale/bn/configure.ini index 0d79eafba..d8ec34be2 100755 --- a/src/locale/bn/configure.ini +++ b/src/locale/bn/configure.ini @@ -254,9 +254,22 @@ social_component_notify_body = "আমরা ভাবি, আপনি আগ social_component_notify_salutation = "প্রিয় %s," social_component_comment_added = "মন্তব্য যোগ করা হয়েছে!" social_component_public_cant_add = "পাবলিক ব্যবহারকারী যোগ করতে ব্যর্থ গ্রুপ!" +social_component_invalid_message_id = "" +social_component_invalid_access = "" +social_component_clipboard_unavailable = "" +social_component_clipboard_full = "" +social_component_message_clipcopied = "" social_component_delete_error = "ত্রুটি মুছে ফেলা আইটেম" +social_component_item_clipcut = "" social_component_item_deleted = "আইটেম মুছে ফেলা!" +social_component_item_cut_nodelete = "" social_component_no_item_deleted = "কোন আইটেম মুছে ফেলা!" +social_component_clip_item_deleted = "" +social_component_not_clip_item_deleted = "" +social_component_clipboard_emptied = "ক্লিপবোর্ড খালি!" +social_component_no_target_thread = "" +social_component_no_thread_access = "" +social_component_clipboard_pasted = "" social_component_flag_error = "" social_component_already_flagged = "" social_component_item_flagged = "" @@ -318,7 +331,6 @@ social_component_page_created = "%s উইকি পাতা তৈরী ক social_component_page_discuss_here = "আলোচনা পাতা এই থ্রেড!" social_component_page_not_saved = "পাতা সংরক্ষণ করা হয়নি!" social_component_page_saved = "পৃষ্ঠা সংরক্ষণ!" -social_component_clipboard_emptied = "ক্লিপবোর্ড খালি!" social_component_clipboard_not_emptied = "ক্লিপবোর্ড ফাঁকা করতে ব্যর্থ!" social_component_paste_all_success = "সব সাফল্য পেস্ট!" social_component_paste_all_failed = "মান প্রতিলেপন করতে ব্যর্থ!" @@ -1522,7 +1534,8 @@ groupfeed_element_clipboard = "" groupfeed_element_paste_all = "" groupfeed_element_empty_clipboard = "" groupfeed_element_no_clipboard_items = "" -groupfeed_element_paste = "" +groupfeed_element_pastepost = "" +groupfeed_element_delete = "মুছে দিন" groupfeed_element_thread_no_exist = "থ্রেড অস্তিত্ব নেই! হয়তো এটি মোছা হয়েছে?" groupfeed_element_flagged = "" groupfeed_element_cleared = "" @@ -1531,16 +1544,17 @@ groupfeed_element_up_vote = "ভোট আপ" groupfeed_element_down_vote = "ভোট নিচে" groupfeed_element_comment = "মন্তব্য" groupfeed_element_edit = "সম্পাদনা" +groupfeed_element_copypost = "" +groupfeed_element_cutpost = "" groupfeed_element_confirm_delete = "এখানে আপনার নিশ্চিত, আপনি মুছে ফেলতে চান এই আইটেমটি?" -groupfeed_element_delete = "মুছে দিন" groupfeed_element_confirm_flag = "" +groupfeed_element_num_posts = "%s পোস্ট" +groupfeed_element_num_views = "%s দেখেছে" +groupfeed_element_edited = "সম্পাদিত: %s" groupfeed_element_usericon = "ব্যবহারকারী আইকন" groupfeed_public_posts = "পাবলিক পোস্ট" groupfeed_messages = "বার্তা" groupfeed_connect = "সংযোগ করা" -groupfeed_element_num_posts = "%s পোস্ট" -groupfeed_element_num_views = "%s দেখেছে" -groupfeed_element_edited = "সম্পাদিত: %s" groupfeed_element_start_thread = "নতুন থ্রেড শুরু" groupfeed_element_subject = "বিষয়" groupfeed_element_post = "পোস্ট" diff --git a/src/locale/de/configure.ini b/src/locale/de/configure.ini index a6c005a61..45c154981 100755 --- a/src/locale/de/configure.ini +++ b/src/locale/de/configure.ini @@ -254,9 +254,22 @@ social_component_notify_body = "Wir dachten, Sie wären daran interessiert, social_component_notify_salutation = "Sehr geehrte %s," social_component_comment_added = "Kommentar Hinzugefügt!" social_component_public_cant_add = "Öffentliche Benutzer können eine Gruppe hinzufügen!" +social_component_invalid_message_id = "" +social_component_invalid_access = "" +social_component_clipboard_unavailable = "" +social_component_clipboard_full = "" +social_component_message_clipcopied = "" social_component_delete_error = "Fehler Beim Löschen Der Artikel" +social_component_item_clipcut = "" social_component_item_deleted = "Item Gelöscht!" +social_component_item_cut_nodelete = "" social_component_no_item_deleted = "Kein Element Gelöscht!" +social_component_clip_item_deleted = "" +social_component_not_clip_item_deleted = "" +social_component_clipboard_emptied = "Zwischenablage Geleert!" +social_component_no_target_thread = "" +social_component_no_thread_access = "" +social_component_clipboard_pasted = "" social_component_flag_error = "" social_component_already_flagged = "" social_component_item_flagged = "" @@ -318,7 +331,6 @@ social_component_page_created = "%s Wiki-Seite Erstellt!" social_component_page_discuss_here = "Diskutieren Sie die Seite in diesem thread!" social_component_page_not_saved = "Seite nicht gespeichert!" social_component_page_saved = "Die Seite Gespeichert!" -social_component_clipboard_emptied = "Zwischenablage Geleert!" social_component_clipboard_not_emptied = "Leere Zwischenablage fehlgeschlagen!" social_component_paste_all_success = "Fügen Sie alle Erfolge!" social_component_paste_all_failed = "Fügen Sie alle fehlgeschlagen!" @@ -1522,7 +1534,8 @@ groupfeed_element_clipboard = "" groupfeed_element_paste_all = "" groupfeed_element_empty_clipboard = "" groupfeed_element_no_clipboard_items = "" -groupfeed_element_paste = "" +groupfeed_element_pastepost = "" +groupfeed_element_delete = "Löschen" groupfeed_element_thread_no_exist = "Thread existiert nicht!!! Vielleicht wurde es gelöscht?" groupfeed_element_flagged = "" groupfeed_element_cleared = "" @@ -1531,16 +1544,17 @@ groupfeed_element_up_vote = "Vote Up" groupfeed_element_down_vote = "Niederstimmen" groupfeed_element_comment = "Kommentar" groupfeed_element_edit = "Bearbeiten" +groupfeed_element_copypost = "" +groupfeed_element_cutpost = "" groupfeed_element_confirm_delete = "Seid Ihr sicher, dass Sie dieses Element löschen möchten?" -groupfeed_element_delete = "Löschen" groupfeed_element_confirm_flag = "" +groupfeed_element_num_posts = "%s Beiträge" +groupfeed_element_num_views = "%s Ansichten" +groupfeed_element_edited = "Bearbeitet: %s" groupfeed_element_usericon = "User Icon" groupfeed_public_posts = "Öffentliche Beiträge" groupfeed_messages = "Mails" groupfeed_connect = "Verbinden" -groupfeed_element_num_posts = "%s Beiträge" -groupfeed_element_num_views = "%s Ansichten" -groupfeed_element_edited = "Bearbeitet: %s" groupfeed_element_start_thread = "Starten Sie Einen Neuen Thread" groupfeed_element_subject = "Thema" groupfeed_element_post = "Post" diff --git a/src/locale/el_GR/configure.ini b/src/locale/el_GR/configure.ini index 45d9e7271..7252b3cb2 100644 --- a/src/locale/el_GR/configure.ini +++ b/src/locale/el_GR/configure.ini @@ -254,9 +254,22 @@ social_component_notify_body = "Πιστεύαμε ότι θα σας ενδιέ social_component_notify_salutation = "Αγαπητέ/ή %s," social_component_comment_added = "Το σχόλιο προστέθηκε!" social_component_public_cant_add = "Ο δημόσιος χρήστης δεν μπορεί να προσθέσει ομάδα!" +social_component_invalid_message_id = "" +social_component_invalid_access = "" +social_component_clipboard_unavailable = "" +social_component_clipboard_full = "" +social_component_message_clipcopied = "" social_component_delete_error = "Σφάλμα κατά τη διαγραφή στοιχείου" +social_component_item_clipcut = "" social_component_item_deleted = "Το στοιχείο διαγράφηκε!" +social_component_item_cut_nodelete = "" social_component_no_item_deleted = "Κανένα στοιχείο δεν διαγράφηκε!" +social_component_clip_item_deleted = "" +social_component_not_clip_item_deleted = "" +social_component_clipboard_emptied = "Το πρόχειρο άδειασε!" +social_component_no_target_thread = "" +social_component_no_thread_access = "" +social_component_clipboard_pasted = "" social_component_flag_error = "" social_component_already_flagged = "" social_component_item_flagged = "" @@ -318,7 +331,6 @@ social_component_page_created = "Δημιουργήθηκε η σελίδα Wiki social_component_page_discuss_here = "Συζητήστε τη σελίδα σε αυτό το νήμα!" social_component_page_not_saved = "Η σελίδα δεν έχει αποθηκευτεί!" social_component_page_saved = "Η σελίδα αποθηκεύτηκε!" -social_component_clipboard_emptied = "Το πρόχειρο άδειασε!" social_component_clipboard_not_emptied = "Το άδειασμα του προχείρου απέτυχε!" social_component_paste_all_success = "Επικολλήστε όλη την επιτυχία!" social_component_paste_all_failed = "Η επικόλληση όλων απέτυχε!" @@ -1522,7 +1534,8 @@ groupfeed_element_clipboard = "" groupfeed_element_paste_all = "" groupfeed_element_empty_clipboard = "" groupfeed_element_no_clipboard_items = "" -groupfeed_element_paste = "" +groupfeed_element_pastepost = "" +groupfeed_element_delete = "Διαγραφή" groupfeed_element_thread_no_exist = "Το νήμα δεν υπάρχει! Ίσως διαγράφηκε;" groupfeed_element_flagged = "" groupfeed_element_cleared = "" @@ -1531,16 +1544,17 @@ groupfeed_element_up_vote = "Υπερψήφισε" groupfeed_element_down_vote = "Καταψήφισε" groupfeed_element_comment = "Σχόλιο" groupfeed_element_edit = "Επεξεργασία" +groupfeed_element_copypost = "" +groupfeed_element_cutpost = "" groupfeed_element_confirm_delete = "Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτό το στοιχείο;" -groupfeed_element_delete = "Διαγραφή" groupfeed_element_confirm_flag = "" +groupfeed_element_num_posts = "%s αναρτήσεις" +groupfeed_element_num_views = "%s εμφανίσεις" +groupfeed_element_edited = "Επεξεργασία: %s" groupfeed_element_usericon = "Εικόνα χρήστη" groupfeed_public_posts = "Δημόσιες Θέσεις" groupfeed_messages = "Μήνυμα" groupfeed_connect = "Σύνδεση" -groupfeed_element_num_posts = "%s αναρτήσεις" -groupfeed_element_num_views = "%s εμφανίσεις" -groupfeed_element_edited = "Επεξεργασία: %s" groupfeed_element_start_thread = "Ξεκινήστε νέο νήμα" groupfeed_element_subject = "Θέμα" groupfeed_element_post = "Ανάρτηση" diff --git a/src/locale/en_US/configure.ini b/src/locale/en_US/configure.ini index a65026580..e6971e1e0 100644 --- a/src/locale/en_US/configure.ini +++ b/src/locale/en_US/configure.ini @@ -254,9 +254,22 @@ social_component_notify_body = "We thought you would be interested in a new post social_component_notify_salutation = "Dear %s," social_component_comment_added = "Comment Added!" social_component_public_cant_add = "Public user cannot add group!" +social_component_invalid_message_id = "Invalid Message ID!" +social_component_invalid_access = "Invalid Access!" +social_component_clipboard_unavailable = "Clipboard Unavailable!" +social_component_clipboard_full = "Clipboard Full!" +social_component_message_clipcopied = "Copied to Clipboard!" social_component_delete_error = "Error Deleting Item" +social_component_item_clipcut = "Cut to Clipboard!" social_component_item_deleted = "Item Deleted!" +social_component_item_cut_nodelete = "Item Copied but not Cut to Clipboard!" social_component_no_item_deleted = "No Item Deleted!" +social_component_clip_item_deleted = "Clip Item Deleted" +social_component_not_clip_item_deleted = "Clip Item Not Deleted" +social_component_clipboard_emptied = "Clipboard Emptied!" +social_component_no_target_thread = "No Target Thread" +social_component_no_thread_access = "No Thread Access" +social_component_clipboard_pasted = "Clipboard Pasted" social_component_flag_error = "Flag Error!" social_component_already_flagged = "Already Flagged!" social_component_item_flagged = "Item Flagged!" @@ -318,7 +331,6 @@ social_component_page_created = "%s Wiki Page Created!" social_component_page_discuss_here = "Discuss the page in this thread!" social_component_page_not_saved = "Page not saved!" social_component_page_saved = "Page Saved!" -social_component_clipboard_emptied = "Clipboard Emptied!" social_component_clipboard_not_emptied = "Empty Clipboard Failed!" social_component_paste_all_success = "Paste all success!" social_component_paste_all_failed = "Paste all failed!" @@ -1522,7 +1534,8 @@ groupfeed_element_clipboard = "Clipboard" groupfeed_element_paste_all = "Paste All" groupfeed_element_empty_clipboard = "Empty Clipboard" groupfeed_element_no_clipboard_items = "The clipboard is currently empty." -groupfeed_element_paste = "Paste %s" +groupfeed_element_pastepost = "Paste" +groupfeed_element_delete = "Delete" groupfeed_element_thread_no_exist = "Thread does not exist! Maybe it was deleted?" groupfeed_element_flagged = "[FLAGGED]" groupfeed_element_cleared = "[CLEARED]" @@ -1531,16 +1544,17 @@ groupfeed_element_up_vote = "Vote Up" groupfeed_element_down_vote = "Vote Down" groupfeed_element_comment = "Comment" groupfeed_element_edit = "Edit" +groupfeed_element_copypost = "Copy" +groupfeed_element_cutpost = "Cut" groupfeed_element_confirm_delete = "Are your sure you want to delete this item?" -groupfeed_element_delete = "Delete" groupfeed_element_confirm_flag = "Confirm Flag" +groupfeed_element_num_posts = "%s posts" +groupfeed_element_num_views = "%s views" +groupfeed_element_edited = "Edited: %s" groupfeed_element_usericon = "User Icon" groupfeed_public_posts = "Public Posts" groupfeed_messages = "Messages" groupfeed_connect = "Connect" -groupfeed_element_num_posts = "%s posts" -groupfeed_element_num_views = "%s views" -groupfeed_element_edited = "Edited: %s" groupfeed_element_start_thread = "Start New Thread" groupfeed_element_subject = "Subject" groupfeed_element_post = "Post" diff --git a/src/locale/es/configure.ini b/src/locale/es/configure.ini index 58ab4fc86..0ea16b41c 100755 --- a/src/locale/es/configure.ini +++ b/src/locale/es/configure.ini @@ -254,9 +254,22 @@ social_component_notify_body = "Pensamos que usted podría estar interesad social_component_notify_salutation = "Queridos %s," social_component_comment_added = "Comentario Añadido!" social_component_public_cant_add = "Público usuario no puede agregar grupo!" +social_component_invalid_message_id = "" +social_component_invalid_access = "" +social_component_clipboard_unavailable = "" +social_component_clipboard_full = "" +social_component_message_clipcopied = "" social_component_delete_error = "Error Al Eliminar Un Elemento De" +social_component_item_clipcut = "" social_component_item_deleted = "Elemento Que Se Elimina!" +social_component_item_cut_nodelete = "" social_component_no_item_deleted = "No Hay Ningún Elemento Eliminado!" +social_component_clip_item_deleted = "" +social_component_not_clip_item_deleted = "" +social_component_clipboard_emptied = "Portapapeles vaciado !" +social_component_no_target_thread = "" +social_component_no_thread_access = "" +social_component_clipboard_pasted = "" social_component_flag_error = "" social_component_already_flagged = "" social_component_item_flagged = "" @@ -318,7 +331,6 @@ social_component_page_created = "%s Página De La Wiki Creado!" social_component_page_discuss_here = "Hablar de la página en este hilo!" social_component_page_not_saved = "Página no guardada!" social_component_page_saved = "Página Guarda!" -social_component_clipboard_emptied = "Portapapeles vaciado !" social_component_clipboard_not_emptied = "El portapapeles vacío falló !" social_component_paste_all_success = "Pegar todo el éxito !" social_component_paste_all_failed = "Pegar todo falló !" @@ -1522,7 +1534,8 @@ groupfeed_element_clipboard = "" groupfeed_element_paste_all = "" groupfeed_element_empty_clipboard = "" groupfeed_element_no_clipboard_items = "" -groupfeed_element_paste = "" +groupfeed_element_pastepost = "" +groupfeed_element_delete = "Eliminar" groupfeed_element_thread_no_exist = "Hilo no existe! Tal vez fue eliminado?" groupfeed_element_flagged = "" groupfeed_element_cleared = "" @@ -1531,16 +1544,17 @@ groupfeed_element_up_vote = "Voto A Favor" groupfeed_element_down_vote = "Voto Abajo" groupfeed_element_comment = "Comentario" groupfeed_element_edit = "Editar" +groupfeed_element_copypost = "" +groupfeed_element_cutpost = "" groupfeed_element_confirm_delete = "Son su seguro de que desea eliminar este elemento?" -groupfeed_element_delete = "Eliminar" groupfeed_element_confirm_flag = "" +groupfeed_element_num_posts = "%s puestos" +groupfeed_element_num_views = "%s opiniones" +groupfeed_element_edited = "Editado: %s" groupfeed_element_usericon = "Icono De Usuario" groupfeed_public_posts = "Cargos Públicos" groupfeed_messages = "Mensaje" groupfeed_connect = "Conectar" -groupfeed_element_num_posts = "%s puestos" -groupfeed_element_num_views = "%s opiniones" -groupfeed_element_edited = "Editado: %s" groupfeed_element_start_thread = "Inicio Nuevo Hilo" groupfeed_element_subject = "Tema" groupfeed_element_post = "Post" diff --git a/src/locale/fa/configure.ini b/src/locale/fa/configure.ini index 7b893e6f8..2175527e2 100755 --- a/src/locale/fa/configure.ini +++ b/src/locale/fa/configure.ini @@ -254,9 +254,22 @@ social_component_notify_body = "ما به فکر شما خواهد بود علا social_component_notify_salutation = "عزیز %s," social_component_comment_added = "نظر اضافه شده!" social_component_public_cant_add = "عمومی کاربر می تواند اضافه کردن گروه!" +social_component_invalid_message_id = "" +social_component_invalid_access = "" +social_component_clipboard_unavailable = "" +social_component_clipboard_full = "" +social_component_message_clipcopied = "" social_component_delete_error = "خطا حذف آیتم" +social_component_item_clipcut = "" social_component_item_deleted = "آیتم حذف شده!" +social_component_item_cut_nodelete = "" social_component_no_item_deleted = "هیچ آیتم حذف شده!" +social_component_clip_item_deleted = "" +social_component_not_clip_item_deleted = "" +social_component_clipboard_emptied = "تخته یادداشت خالی!" +social_component_no_target_thread = "" +social_component_no_thread_access = "" +social_component_clipboard_pasted = "" social_component_flag_error = "" social_component_already_flagged = "" social_component_item_flagged = "" @@ -318,7 +331,6 @@ social_component_page_created = "%s صفحه ویکی ایجاد شده!" social_component_page_discuss_here = "بحث در مورد این صفحه در این موضوع!" social_component_page_not_saved = "صفحه ذخیره نشده!" social_component_page_saved = "صفحه ذخیره شده!" -social_component_clipboard_emptied = "تخته یادداشت خالی!" social_component_clipboard_not_emptied = "خرابی در تخته یادداشت خالی) [2][1] (" social_component_paste_all_success = "چسباندن تمام موفقیت!" social_component_paste_all_failed = "چسباندن همه شکست خورده!" @@ -1522,7 +1534,8 @@ groupfeed_element_clipboard = "" groupfeed_element_paste_all = "" groupfeed_element_empty_clipboard = "" groupfeed_element_no_clipboard_items = "" -groupfeed_element_paste = "" +groupfeed_element_pastepost = "" +groupfeed_element_delete = "حذف" groupfeed_element_thread_no_exist = "موضوع وجود ندارد! شاید آن ها هم پاک میشه ؟ " groupfeed_element_flagged = "" groupfeed_element_cleared = "" @@ -1531,16 +1544,17 @@ groupfeed_element_up_vote = "رای گیری تا" groupfeed_element_down_vote = "رای پایین" groupfeed_element_comment = "نظر" groupfeed_element_edit = "ویرایش" +groupfeed_element_copypost = "" +groupfeed_element_cutpost = "" groupfeed_element_confirm_delete = "شما مطمئن هستید که می خواهید این آیتم را حذف کنید?" -groupfeed_element_delete = "حذف" groupfeed_element_confirm_flag = "" +groupfeed_element_num_posts = "%s پست" +groupfeed_element_num_views = "%s views" +groupfeed_element_edited = "ویرایش: %s" groupfeed_element_usericon = "نماد کاربر" groupfeed_public_posts = "پست های عمومی" groupfeed_messages = "پیام ها" groupfeed_connect = "اتصال" -groupfeed_element_num_posts = "%s پست" -groupfeed_element_num_views = "%s views" -groupfeed_element_edited = "ویرایش: %s" groupfeed_element_start_thread = "شروع موضوع جدید" groupfeed_element_subject = "موضوع" groupfeed_element_post = "پست" diff --git a/src/locale/fr_FR/configure.ini b/src/locale/fr_FR/configure.ini index a4dec2db1..37f8ff129 100755 --- a/src/locale/fr_FR/configure.ini +++ b/src/locale/fr_FR/configure.ini @@ -254,9 +254,22 @@ social_component_notify_body = "Nous avons pensé que vous seriez int&eacu social_component_notify_salutation = "Chers %s," social_component_comment_added = "Commentaire ajouté!" social_component_public_cant_add = "Public utilisateur ne peut pas ajouter un groupe!" +social_component_invalid_message_id = "" +social_component_invalid_access = "" +social_component_clipboard_unavailable = "" +social_component_clipboard_full = "" +social_component_message_clipcopied = "" social_component_delete_error = "Erreur lors de la suppression de l'élément" +social_component_item_clipcut = "" social_component_item_deleted = "Suppression d'un élément!" +social_component_item_cut_nodelete = "" social_component_no_item_deleted = "Pas de suppression d'un élément!" +social_component_clip_item_deleted = "" +social_component_not_clip_item_deleted = "" +social_component_clipboard_emptied = "Presse-papiers Vidé!" +social_component_no_target_thread = "" +social_component_no_thread_access = "" +social_component_clipboard_pasted = "" social_component_flag_error = "" social_component_already_flagged = "" social_component_item_flagged = "" @@ -318,7 +331,6 @@ social_component_page_created = "%s page wiki créé!" social_component_page_discuss_here = "Discuter de la page dans ce thread!" social_component_page_not_saved = "Page non enregistrée!" social_component_page_saved = "Page sauvé!" -social_component_clipboard_emptied = "Presse-papiers Vidé!" social_component_clipboard_not_emptied = "Le presse-papiers vide a échoué!" social_component_paste_all_success = "Coller tout le succès!" social_component_paste_all_failed = "Coller tout a échoué!" @@ -1522,7 +1534,8 @@ groupfeed_element_clipboard = "" groupfeed_element_paste_all = "" groupfeed_element_empty_clipboard = "" groupfeed_element_no_clipboard_items = "" -groupfeed_element_paste = "" +groupfeed_element_pastepost = "" +groupfeed_element_delete = "Supprimer" groupfeed_element_thread_no_exist = "Thread n'existe pas! Peut-être qu'il a été supprimé?" groupfeed_element_flagged = "" groupfeed_element_cleared = "" @@ -1531,16 +1544,17 @@ groupfeed_element_up_vote = "Voter" groupfeed_element_down_vote = "Voter Contre" groupfeed_element_comment = "Commentaire" groupfeed_element_edit = "Modifier" +groupfeed_element_copypost = "" +groupfeed_element_cutpost = "" groupfeed_element_confirm_delete = "Êtes-vous sûrs que vous souhaitez supprimer cet élément?" -groupfeed_element_delete = "Supprimer" groupfeed_element_confirm_flag = "" +groupfeed_element_num_posts = "%s messages" +groupfeed_element_num_views = "%s vues" +groupfeed_element_edited = "Modifié: %s" groupfeed_element_usericon = "Icône d'utilisateur" groupfeed_public_posts = "Postes Publics" groupfeed_messages = "Message" groupfeed_connect = "Connecter" -groupfeed_element_num_posts = "%s messages" -groupfeed_element_num_views = "%s vues" -groupfeed_element_edited = "Modifié: %s" groupfeed_element_start_thread = "Commencer à Nouveau Thread" groupfeed_element_subject = "Sujet" groupfeed_element_post = "Post" diff --git a/src/locale/he/configure.ini b/src/locale/he/configure.ini index ecd892d5a..173e71abe 100755 --- a/src/locale/he/configure.ini +++ b/src/locale/he/configure.ini @@ -254,9 +254,22 @@ social_component_notify_body = "חשבנו שיהיה מעוניין הודעה social_component_notify_salutation = "יקירתי %s," social_component_comment_added = "אחד נוסף!" social_component_public_cant_add = "הציבור משתמש יכול להוסיף קבוצה!" +social_component_invalid_message_id = "" +social_component_invalid_access = "" +social_component_clipboard_unavailable = "" +social_component_clipboard_full = "" +social_component_message_clipcopied = "" social_component_delete_error = "שגיאה בעת מחיקת הפריט." +social_component_item_clipcut = "" social_component_item_deleted = "הפריט נמחק!" +social_component_item_cut_nodelete = "" social_component_no_item_deleted = "לא הפריט נמחק!" +social_component_clip_item_deleted = "" +social_component_not_clip_item_deleted = "" +social_component_clipboard_emptied = "לוח העריכה התרוקן !" +social_component_no_target_thread = "" +social_component_no_thread_access = "" +social_component_clipboard_pasted = "" social_component_flag_error = "" social_component_already_flagged = "" social_component_item_flagged = "" @@ -318,7 +331,6 @@ social_component_page_created = "%s בוויקי דף שנוצר!" social_component_page_discuss_here = "לדון בדף זה חוט!" social_component_page_not_saved = "הדף לא נשמר !" social_component_page_saved = "דף הציל!" -social_component_clipboard_emptied = "לוח העריכה התרוקן !" social_component_clipboard_not_emptied = "לוח העריכה הריק נכשל !" social_component_paste_all_success = "הדבק את כל ההצלחה !" social_component_paste_all_failed = "הדבק הכל נכשל !" @@ -1522,7 +1534,8 @@ groupfeed_element_clipboard = "" groupfeed_element_paste_all = "" groupfeed_element_empty_clipboard = "" groupfeed_element_no_clipboard_items = "" -groupfeed_element_paste = "" +groupfeed_element_pastepost = "" +groupfeed_element_delete = "למחוק" groupfeed_element_thread_no_exist = "חוט לא קיים! אולי זה נמחק?" groupfeed_element_flagged = "" groupfeed_element_cleared = "" @@ -1531,16 +1544,17 @@ groupfeed_element_up_vote = "להצביע" groupfeed_element_down_vote = "הצביעו" groupfeed_element_comment = "תגובה" groupfeed_element_edit = "עריכה" +groupfeed_element_copypost = "" +groupfeed_element_cutpost = "" groupfeed_element_confirm_delete = "אתה בטוח שאתה רוצה למחוק פריט זה?" -groupfeed_element_delete = "למחוק" groupfeed_element_confirm_flag = "" +groupfeed_element_num_posts = "%s הודעות" +groupfeed_element_num_views = "%s צפיות" +groupfeed_element_edited = "נערך: %s" groupfeed_element_usericon = "סמל משתמש" groupfeed_public_posts = "פוסטים ציבוריים" groupfeed_messages = "הודעות" groupfeed_connect = "להתחבר" -groupfeed_element_num_posts = "%s הודעות" -groupfeed_element_num_views = "%s צפיות" -groupfeed_element_edited = "נערך: %s" groupfeed_element_start_thread = "התחל שרשור חדש" groupfeed_element_subject = "הנושא" groupfeed_element_post = "פוסט" diff --git a/src/locale/hi/configure.ini b/src/locale/hi/configure.ini index 583994f9c..c17a59611 100755 --- a/src/locale/hi/configure.ini +++ b/src/locale/hi/configure.ini @@ -254,9 +254,22 @@ social_component_notify_body = "हमने सोचा कि आप मे social_component_notify_salutation = "प्रिय %s," social_component_comment_added = "टिप्पणी जोड़ा गया!" social_component_public_cant_add = "सार्वजनिक उपयोगकर्ता जोड़ें समूह!" +social_component_invalid_message_id = "" +social_component_invalid_access = "" +social_component_clipboard_unavailable = "" +social_component_clipboard_full = "" +social_component_message_clipcopied = "" social_component_delete_error = "त्रुटि को हटाने के आइटम" +social_component_item_clipcut = "" social_component_item_deleted = "आइटम नष्ट कर दिया!" +social_component_item_cut_nodelete = "" social_component_no_item_deleted = "कोई आइटम हटाए गए!" +social_component_clip_item_deleted = "" +social_component_not_clip_item_deleted = "" +social_component_clipboard_emptied = "क्लिपबोर्ड खाली कर दिया!" +social_component_no_target_thread = "" +social_component_no_thread_access = "" +social_component_clipboard_pasted = "" social_component_flag_error = "" social_component_already_flagged = "" social_component_item_flagged = "" @@ -318,7 +331,6 @@ social_component_page_created = "%s विकी पेज बनाया ह social_component_page_discuss_here = "चर्चा पृष्ठ में इस धागे!" social_component_page_not_saved = "पृष्ठ सहेजा नहीं गया!" social_component_page_saved = "पृष्ठ बचाया!" -social_component_clipboard_emptied = "क्लिपबोर्ड खाली कर दिया!" social_component_clipboard_not_emptied = "खाली क्लिपबोर्ड विफल !" social_component_paste_all_success = "सभी सफलता चिपकाएँ !" social_component_paste_all_failed = "पेस्ट सभी विफल!" @@ -1522,7 +1534,8 @@ groupfeed_element_clipboard = "" groupfeed_element_paste_all = "" groupfeed_element_empty_clipboard = "" groupfeed_element_no_clipboard_items = "" -groupfeed_element_paste = "" +groupfeed_element_pastepost = "" +groupfeed_element_delete = "हटाना" groupfeed_element_thread_no_exist = "धागा मौजूद नहीं है! हो सकता है कि यह हटा दिया गया था?" groupfeed_element_flagged = "" groupfeed_element_cleared = "" @@ -1531,16 +1544,17 @@ groupfeed_element_up_vote = "वोट" groupfeed_element_down_vote = "नीचे वोट" groupfeed_element_comment = "टिप्पणी" groupfeed_element_edit = "संपादित करें" +groupfeed_element_copypost = "" +groupfeed_element_cutpost = "" groupfeed_element_confirm_delete = "कर रहे हैं आपके यकीन है कि आप चाहते हैं को नष्ट करने के लिए इस मद?" -groupfeed_element_delete = "हटाना" groupfeed_element_confirm_flag = "" +groupfeed_element_num_posts = "%s पद" +groupfeed_element_num_views = "%s दर्शनों की संख्या" +groupfeed_element_edited = "संपादित: %s" groupfeed_element_usericon = "उपयोगकर्ता आइकन" groupfeed_public_posts = "सार्वजनिक पोस्ट" groupfeed_messages = "संदेश" groupfeed_connect = "कनेक्ट करें" -groupfeed_element_num_posts = "%s पद" -groupfeed_element_num_views = "%s दर्शनों की संख्या" -groupfeed_element_edited = "संपादित: %s" groupfeed_element_start_thread = "नया धागा शुरू" groupfeed_element_subject = "विषय" groupfeed_element_post = "पोस्ट" diff --git a/src/locale/id/configure.ini b/src/locale/id/configure.ini index c5415d7cc..a83462c02 100755 --- a/src/locale/id/configure.ini +++ b/src/locale/id/configure.ini @@ -254,9 +254,22 @@ social_component_notify_body = "Kami pikir anda akan tertarik dalam posting baru social_component_notify_salutation = "Sayang %s," social_component_comment_added = "Komentar Ditambahkan!" social_component_public_cant_add = "Semua pengguna tidak dapat menambahkan grup!" +social_component_invalid_message_id = "" +social_component_invalid_access = "" +social_component_clipboard_unavailable = "" +social_component_clipboard_full = "" +social_component_message_clipcopied = "" social_component_delete_error = "Kesalahan Menghapus Item" +social_component_item_clipcut = "" social_component_item_deleted = "Item Dihapus!" +social_component_item_cut_nodelete = "" social_component_no_item_deleted = "Tidak Ada Item Yang Dihapus!" +social_component_clip_item_deleted = "" +social_component_not_clip_item_deleted = "" +social_component_clipboard_emptied = "Papan Klip!" +social_component_no_target_thread = "" +social_component_no_thread_access = "" +social_component_clipboard_pasted = "" social_component_flag_error = "" social_component_already_flagged = "" social_component_item_flagged = "" @@ -318,7 +331,6 @@ social_component_page_created = "%s Halaman Wiki Yang Dibuat!" social_component_page_discuss_here = "Membahas halaman di thread ini!" social_component_page_not_saved = "Halaman tidak disimpan !" social_component_page_saved = "Halaman Diselamatkan!" -social_component_clipboard_emptied = "Papan Klip!" social_component_clipboard_not_emptied = "Clipboard Kosong Gagal !" social_component_paste_all_success = "Tempel semua Sukses !" social_component_paste_all_failed = "Tempel semua gagal !" @@ -1522,7 +1534,8 @@ groupfeed_element_clipboard = "" groupfeed_element_paste_all = "" groupfeed_element_empty_clipboard = "" groupfeed_element_no_clipboard_items = "" -groupfeed_element_paste = "" +groupfeed_element_pastepost = "" +groupfeed_element_delete = "Menghapus" groupfeed_element_thread_no_exist = "Thread tidak ada! Mungkin itu dihapus?" groupfeed_element_flagged = "" groupfeed_element_cleared = "" @@ -1531,16 +1544,17 @@ groupfeed_element_up_vote = "Vote Up" groupfeed_element_down_vote = "Memilih Turun" groupfeed_element_comment = "Komentar" groupfeed_element_edit = "Edit" +groupfeed_element_copypost = "" +groupfeed_element_cutpost = "" groupfeed_element_confirm_delete = "Apakah anda yakin anda ingin menghapus item ini?" -groupfeed_element_delete = "Menghapus" groupfeed_element_confirm_flag = "" +groupfeed_element_num_posts = "%s posting" +groupfeed_element_num_views = "%s views" +groupfeed_element_edited = "Edited: %s" groupfeed_element_usericon = "Pengguna Ikon" groupfeed_public_posts = "Pos Publik" groupfeed_messages = "Pesan" groupfeed_connect = "Menghubungkan" -groupfeed_element_num_posts = "%s posting" -groupfeed_element_num_views = "%s views" -groupfeed_element_edited = "Edited: %s" groupfeed_element_start_thread = "Mulai Thread Baru" groupfeed_element_subject = "Subjek" groupfeed_element_post = "Post" diff --git a/src/locale/it/configure.ini b/src/locale/it/configure.ini index 43e56d040..fa642c920 100755 --- a/src/locale/it/configure.ini +++ b/src/locale/it/configure.ini @@ -254,9 +254,22 @@ social_component_notify_body = "Abbiamo pensato che potrebbe essere interessato social_component_notify_salutation = "Cari %s," social_component_comment_added = "Commento Aggiunto!" social_component_public_cant_add = "Pubblico utente non può aggiungere del gruppo!" +social_component_invalid_message_id = "" +social_component_invalid_access = "" +social_component_clipboard_unavailable = "" +social_component_clipboard_full = "" +social_component_message_clipcopied = "" social_component_delete_error = "Errore Durante L'Eliminazione Della Voce" +social_component_item_clipcut = "" social_component_item_deleted = "Elemento Eliminato!" +social_component_item_cut_nodelete = "" social_component_no_item_deleted = "Nessun Elemento Eliminato!" +social_component_clip_item_deleted = "" +social_component_not_clip_item_deleted = "" +social_component_clipboard_emptied = "Appunti svuotati!" +social_component_no_target_thread = "" +social_component_no_thread_access = "" +social_component_clipboard_pasted = "" social_component_flag_error = "" social_component_already_flagged = "" social_component_item_flagged = "" @@ -318,7 +331,6 @@ social_component_page_created = "%s Pagina Wiki Creato!" social_component_page_discuss_here = "Discutere la pagina in questo thread!" social_component_page_not_saved = "Pagina non salvata!" social_component_page_saved = "Pagina Salvata!" -social_component_clipboard_emptied = "Appunti svuotati!" social_component_clipboard_not_emptied = "Appunti vuoti non riusciti!" social_component_paste_all_success = "Incolla tutto successo!" social_component_paste_all_failed = "Incolla tutto non riuscito!" @@ -1522,7 +1534,8 @@ groupfeed_element_clipboard = "" groupfeed_element_paste_all = "" groupfeed_element_empty_clipboard = "" groupfeed_element_no_clipboard_items = "" -groupfeed_element_paste = "" +groupfeed_element_pastepost = "" +groupfeed_element_delete = "Eliminare" groupfeed_element_thread_no_exist = "Il Thread non esiste! Forse è stato eliminato?" groupfeed_element_flagged = "" groupfeed_element_cleared = "" @@ -1531,16 +1544,17 @@ groupfeed_element_up_vote = "Voto Up" groupfeed_element_down_vote = "Voto Basso" groupfeed_element_comment = "Commento" groupfeed_element_edit = "Modifica" +groupfeed_element_copypost = "" +groupfeed_element_cutpost = "" groupfeed_element_confirm_delete = "Sono proprio sicuri di voler eliminare questo elemento?" -groupfeed_element_delete = "Eliminare" groupfeed_element_confirm_flag = "" +groupfeed_element_num_posts = "%s posti" +groupfeed_element_num_views = "%s visualizzazioni" +groupfeed_element_edited = "A cura: %s" groupfeed_element_usericon = "Icona Utente" groupfeed_public_posts = "Posti pubblici" groupfeed_messages = "Messaggio" groupfeed_connect = "Collegare" -groupfeed_element_num_posts = "%s posti" -groupfeed_element_num_views = "%s visualizzazioni" -groupfeed_element_edited = "A cura: %s" groupfeed_element_start_thread = "Avviare Una Nuova Discussione" groupfeed_element_subject = "Soggetto" groupfeed_element_post = "Post" diff --git a/src/locale/ja/configure.ini b/src/locale/ja/configure.ini index 00414aa9f..e277759ff 100755 --- a/src/locale/ja/configure.ini +++ b/src/locale/ja/configure.ini @@ -254,9 +254,22 @@ social_component_notify_body = "と考えます興味がありの新しいスレ social_component_notify_salutation = "愛%s," social_component_comment_added = "コメント追加！" social_component_public_cant_add = "公共ユーザーの追加グループ!" +social_component_invalid_message_id = "" +social_component_invalid_access = "" +social_component_clipboard_unavailable = "" +social_component_clipboard_full = "" +social_component_message_clipcopied = "" social_component_delete_error = "エラー削除する項目" +social_component_item_clipcut = "" social_component_item_deleted = "項目を削除!" +social_component_item_cut_nodelete = "" social_component_no_item_deleted = "No項目を削除!" +social_component_clip_item_deleted = "" +social_component_not_clip_item_deleted = "" +social_component_clipboard_emptied = "クリップボードを空にしました!" +social_component_no_target_thread = "" +social_component_no_thread_access = "" +social_component_clipboard_pasted = "" social_component_flag_error = "" social_component_already_flagged = "" social_component_item_flagged = "" @@ -318,7 +331,6 @@ social_component_page_created = "%sWikiページにしてみました。" social_component_page_discuss_here = "議論のページをこのスレッド!" social_component_page_not_saved = "ページが保存されていません!" social_component_page_saved = "ページ！" -social_component_clipboard_emptied = "クリップボードを空にしました!" social_component_clipboard_not_emptied = "空のクリップボードが失敗しました!" social_component_paste_all_success = "すべての成功を貼り付けます!" social_component_paste_all_failed = "すべての貼り付けに失敗しました!" @@ -1522,7 +1534,8 @@ groupfeed_element_clipboard = "" groupfeed_element_paste_all = "" groupfeed_element_empty_clipboard = "" groupfeed_element_no_clipboard_items = "" -groupfeed_element_paste = "" +groupfeed_element_pastepost = "" +groupfeed_element_delete = "削除" groupfeed_element_thread_no_exist = "スレッドが存在しない! のものですごく喜んでくれた。" groupfeed_element_flagged = "" groupfeed_element_cleared = "" @@ -1531,16 +1544,17 @@ groupfeed_element_up_vote = "投票まで" groupfeed_element_down_vote = "投票下" groupfeed_element_comment = "コメント" groupfeed_element_edit = "編集" +groupfeed_element_copypost = "" +groupfeed_element_cutpost = "" groupfeed_element_confirm_delete = "ご確認削除したい項目[3][F])" -groupfeed_element_delete = "削除" groupfeed_element_confirm_flag = "" +groupfeed_element_num_posts = "ポス%s" +groupfeed_element_num_views = "%sの景色" +groupfeed_element_edited = "編集:%s" groupfeed_element_usericon = "ユーザーのアイコン" groupfeed_public_posts = "公開投稿" groupfeed_messages = "メッセージ" groupfeed_connect = "接続" -groupfeed_element_num_posts = "ポス%s" -groupfeed_element_num_views = "%sの景色" -groupfeed_element_edited = "編集:%s" groupfeed_element_start_thread = "新規スレッド" groupfeed_element_subject = "対象" groupfeed_element_post = "ポスト" diff --git a/src/locale/kn/configure.ini b/src/locale/kn/configure.ini index 4e363ccab..a1b13d3d9 100755 --- a/src/locale/kn/configure.ini +++ b/src/locale/kn/configure.ini @@ -254,9 +254,22 @@ social_component_notify_body = "ನಾವು ಭಾವಿಸಲಾಗಿದೆ social_component_notify_salutation = "ಆತ್ಮೀಯ %s," social_component_comment_added = "ಕಾಮೆಂಟ್ ಸೇರಿಸಲಾಗಿದೆ!" social_component_public_cant_add = "ಸಾರ್ವಜನಿಕ ಬಳಕೆದಾರ ಸೇರಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ ಗುಂಪು!" +social_component_invalid_message_id = "" +social_component_invalid_access = "" +social_component_clipboard_unavailable = "" +social_component_clipboard_full = "" +social_component_message_clipcopied = "" social_component_delete_error = "ದೋಷ ಅಳಿಸುವುದು ಐಟಂ" +social_component_item_clipcut = "" social_component_item_deleted = "ಐಟಂ ಅಳಿಸಲಾಗಿದೆ!" +social_component_item_cut_nodelete = "" social_component_no_item_deleted = "ಯಾವುದೇ ಐಟಂ ಅಳಿಸಲಾಗಿದೆ!" +social_component_clip_item_deleted = "" +social_component_not_clip_item_deleted = "" +social_component_clipboard_emptied = "ಕ್ಲಿಪ್ಬೋರ್ಡ್ಗೆ ಖಾಲಿಯಾದ!" +social_component_no_target_thread = "" +social_component_no_thread_access = "" +social_component_clipboard_pasted = "" social_component_flag_error = "" social_component_already_flagged = "" social_component_item_flagged = "" @@ -318,7 +331,6 @@ social_component_page_created = "%s ವಿಕಿ ಪುಟ ದಾಖಲಿಸಿ social_component_page_discuss_here = "ಚರ್ಚಿಸಲು ಪುಟ ಈ ಥ್ರೆಡ್!" social_component_page_not_saved = "ಪುಟ ಉಳಿಸಲಾಗಿಲ್ಲ!" social_component_page_saved = "ಪುಟ ಉಳಿಸಿದ!" -social_component_clipboard_emptied = "ಕ್ಲಿಪ್ಬೋರ್ಡ್ಗೆ ಖಾಲಿಯಾದ!" social_component_clipboard_not_emptied = "ಖಾಲಿ ಕ್ಲಿಪ್ಬೋರ್ಡ್ಗೆ ವಿಫಲವಾಗಿದೆ!" social_component_paste_all_success = "ಪೇಸ್ಟ್ ಎಲ್ಲಾ ಯಶಸ್ಸು!" social_component_paste_all_failed = "ಪೇಸ್ಟ್ ಎಲ್ಲಾ ವಿಫಲವಾಗಿದೆ!" @@ -1522,7 +1534,8 @@ groupfeed_element_clipboard = "" groupfeed_element_paste_all = "" groupfeed_element_empty_clipboard = "" groupfeed_element_no_clipboard_items = "" -groupfeed_element_paste = "" +groupfeed_element_pastepost = "" +groupfeed_element_delete = "ಅಳಿಸಿ" groupfeed_element_thread_no_exist = "ಥ್ರೆಡ್ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ! ಬಹುಶಃ ಇದು ಅಳಿಸಲಾಗಿದೆ?" groupfeed_element_flagged = "" groupfeed_element_cleared = "" @@ -1531,16 +1544,17 @@ groupfeed_element_up_vote = "ಮತ ಅಪ್" groupfeed_element_down_vote = "ಮತ ಕೆಳಗೆ" groupfeed_element_comment = "ಕಾಮೆಂಟ್" groupfeed_element_edit = "ಸಂಪಾದಿಸಿ" +groupfeed_element_copypost = "" +groupfeed_element_cutpost = "" groupfeed_element_confirm_delete = "ನಿಮ್ಮ sure you want to delete ಈ ಐಟಂ?" -groupfeed_element_delete = "ಅಳಿಸಿ" groupfeed_element_confirm_flag = "" +groupfeed_element_num_posts = "%s ಪೋಸ್ಟ್ಗಳು" +groupfeed_element_num_views = "%s ವೀಕ್ಷಣೆಗಳು" +groupfeed_element_edited = "ಸಂಪಾದನೆ: %s" groupfeed_element_usericon = "ಬಳಕೆದಾರ ಐಕಾನ್" groupfeed_public_posts = "ಸಾರ್ವಜನಿಕ ಪೋಸ್ಟ್ಗಳು" groupfeed_messages = "ಸಂದೇಶಗಳು" groupfeed_connect = "ಸಂಪರ್ಕಿಸು" -groupfeed_element_num_posts = "%s ಪೋಸ್ಟ್ಗಳು" -groupfeed_element_num_views = "%s ವೀಕ್ಷಣೆಗಳು" -groupfeed_element_edited = "ಸಂಪಾದನೆ: %s" groupfeed_element_start_thread = "ಹೊಸ ಥ್ರೆಡ್ ಆರಂಭಿಸಲು" groupfeed_element_subject = "ವಿಷಯ" groupfeed_element_post = "ಪೋಸ್ಟ್" diff --git a/src/locale/ko/configure.ini b/src/locale/ko/configure.ini index 9c9ae1d73..47874fdf7 100755 --- a/src/locale/ko/configure.ini +++ b/src/locale/ko/configure.ini @@ -254,9 +254,22 @@ social_component_notify_body = "우리가 생각하는 것에 관심이 있는 social_component_notify_salutation = "친애하는 %s," social_component_comment_added = "댓글 추가!" social_component_public_cant_add = "공용 사용자를 추가할 수 없습 그룹!" +social_component_invalid_message_id = "" +social_component_invalid_access = "" +social_component_clipboard_unavailable = "" +social_component_clipboard_full = "" +social_component_message_clipcopied = "" social_component_delete_error = "오류를 삭제하는 항목" +social_component_item_clipcut = "" social_component_item_deleted = "항목을 삭제됩니다!" +social_component_item_cut_nodelete = "" social_component_no_item_deleted = "없음 항목을 삭제됩니다!" +social_component_clip_item_deleted = "" +social_component_not_clip_item_deleted = "" +social_component_clipboard_emptied = "클립 보드가 비워졌습니다!" +social_component_no_target_thread = "" +social_component_no_thread_access = "" +social_component_clipboard_pasted = "" social_component_flag_error = "" social_component_already_flagged = "" social_component_item_flagged = "" @@ -318,7 +331,6 @@ social_component_page_created = "%sWiki 페이지 생성됩니다!" social_component_page_discuss_here = "토론 페이지에서 이 실!" social_component_page_not_saved = "페이지가 저장되지 않음!" social_component_page_saved = "페이지 저장됩니다!" -social_component_clipboard_emptied = "클립 보드가 비워졌습니다!" social_component_clipboard_not_emptied = "빈 클립 보드에 실패했습니다!" social_component_paste_all_success = "모든 성공 붙여 넣기!" social_component_paste_all_failed = "모두 붙여 넣기가 실패했습니다!" @@ -1522,7 +1534,8 @@ groupfeed_element_clipboard = "" groupfeed_element_paste_all = "" groupfeed_element_empty_clipboard = "" groupfeed_element_no_clipboard_items = "" -groupfeed_element_paste = "" +groupfeed_element_pastepost = "" +groupfeed_element_delete = "삭제" groupfeed_element_thread_no_exist = "스레드가 존재하지 않습니다! 어쩌면 그것은 삭제됩니까?" groupfeed_element_flagged = "" groupfeed_element_cleared = "" @@ -1531,16 +1544,17 @@ groupfeed_element_up_vote = "투표" groupfeed_element_down_vote = "투표로" groupfeed_element_comment = "Comment" groupfeed_element_edit = "편집" +groupfeed_element_copypost = "" +groupfeed_element_cutpost = "" groupfeed_element_confirm_delete = "는 귀하의 확인을 삭제하려는 이 항목?" -groupfeed_element_delete = "삭제" groupfeed_element_confirm_flag = "" +groupfeed_element_num_posts = "%s 게시물" +groupfeed_element_num_views = "%s 보기" +groupfeed_element_edited = "편집:%s" groupfeed_element_usericon = "사용자 아이콘" groupfeed_public_posts = "공개 게시물" groupfeed_messages = "메시지" groupfeed_connect = "연결" -groupfeed_element_num_posts = "%s 게시물" -groupfeed_element_num_views = "%s 보기" -groupfeed_element_edited = "편집:%s" groupfeed_element_start_thread = "시작하는 새로운 실" groupfeed_element_subject = "주제" groupfeed_element_post = "게시" diff --git a/src/locale/nl/configure.ini b/src/locale/nl/configure.ini index 5984763b8..0fe8cc1ac 100644 --- a/src/locale/nl/configure.ini +++ b/src/locale/nl/configure.ini @@ -254,9 +254,22 @@ social_component_notify_body = "We dachten dat je geïnteresseerd bent in ee social_component_notify_salutation = "Beste %s," social_component_comment_added = "Reactie toegevoegd!" social_component_public_cant_add = "Openbaar gebruiker kan toevoegen group!" +social_component_invalid_message_id = "" +social_component_invalid_access = "" +social_component_clipboard_unavailable = "" +social_component_clipboard_full = "" +social_component_message_clipcopied = "" social_component_delete_error = "Fout bij het verwijderen Item" +social_component_item_clipcut = "" social_component_item_deleted = "Item Deleted!" +social_component_item_cut_nodelete = "" social_component_no_item_deleted = "Nee Item Deleted!" +social_component_clip_item_deleted = "" +social_component_not_clip_item_deleted = "" +social_component_clipboard_emptied = "Leeg Klembord !" +social_component_no_target_thread = "" +social_component_no_thread_access = "" +social_component_clipboard_pasted = "" social_component_flag_error = "" social_component_already_flagged = "" social_component_item_flagged = "" @@ -318,7 +331,6 @@ social_component_page_created = " %s Wiki pagina gemaakt!" social_component_page_discuss_here = "Bespreek de pagina in deze thread!" social_component_page_not_saved = "Pagina niet opgeslagen !" social_component_page_saved = "Opgeslagen!" -social_component_clipboard_emptied = "Leeg Klembord !" social_component_clipboard_not_emptied = "Leeg Klembord Mislukt !" social_component_paste_all_success = "Alle succes plakken !" social_component_paste_all_failed = "Alles plakken is mislukt !" @@ -1522,7 +1534,8 @@ groupfeed_element_clipboard = "" groupfeed_element_paste_all = "" groupfeed_element_empty_clipboard = "" groupfeed_element_no_clipboard_items = "" -groupfeed_element_paste = "" +groupfeed_element_pastepost = "" +groupfeed_element_delete = "verwijderen" groupfeed_element_thread_no_exist = "Draad bestaat niet! Misschien was verwijderd?" groupfeed_element_flagged = "" groupfeed_element_cleared = "" @@ -1531,16 +1544,17 @@ groupfeed_element_up_vote = "Stem Omhoog" groupfeed_element_down_vote = "Stem Omlaag" groupfeed_element_comment = "commentaar" groupfeed_element_edit = "uitgeven" +groupfeed_element_copypost = "" +groupfeed_element_cutpost = "" groupfeed_element_confirm_delete = "Zijn je zeker dat je dit item wilt verwijderen?" -groupfeed_element_delete = "verwijderen" groupfeed_element_confirm_flag = "" +groupfeed_element_num_posts = " %s berichten" +groupfeed_element_num_views = "uitzicht %s" +groupfeed_element_edited = "Bewerkt: %s" groupfeed_element_usericon = "Pictogram Gebruiker" groupfeed_public_posts = "Openbare Posten" groupfeed_messages = "Bericht" groupfeed_connect = "Verbinding" -groupfeed_element_num_posts = " %s berichten" -groupfeed_element_num_views = "uitzicht %s" -groupfeed_element_edited = "Bewerkt: %s" groupfeed_element_start_thread = "Start nieuw onderwerp" groupfeed_element_subject = "onderwerp" groupfeed_element_post = "post" diff --git a/src/locale/pl/configure.ini b/src/locale/pl/configure.ini index 7b7dcb373..42b89be43 100755 --- a/src/locale/pl/configure.ini +++ b/src/locale/pl/configure.ini @@ -254,9 +254,22 @@ social_component_notify_body = "Myśleliśmy, że byłby pan zainteresowany w no social_component_notify_salutation = "Szanowny %s," social_component_comment_added = "Komentarz Dodany!" social_component_public_cant_add = "Publiczne użytkownik nie może dodać grupę!" +social_component_invalid_message_id = "" +social_component_invalid_access = "" +social_component_clipboard_unavailable = "" +social_component_clipboard_full = "" +social_component_message_clipcopied = "" social_component_delete_error = "Usuwanie Elementu Błąd " +social_component_item_clipcut = "" social_component_item_deleted = "Element Usunięty!" +social_component_item_cut_nodelete = "" social_component_no_item_deleted = "Nie Ma Opcji Usuń!" +social_component_clip_item_deleted = "" +social_component_not_clip_item_deleted = "" +social_component_clipboard_emptied = "Schowek Opróżniony!" +social_component_no_target_thread = "" +social_component_no_thread_access = "" +social_component_clipboard_pasted = "" social_component_flag_error = "" social_component_already_flagged = "" social_component_item_flagged = "" @@ -318,7 +331,6 @@ social_component_page_created = "%s Stronę Wiki Stworzony!" social_component_page_discuss_here = "Omówić strony w tym temacie!" social_component_page_not_saved = "Strona nie zapisana !" social_component_page_saved = "Strony Uratował!" -social_component_clipboard_emptied = "Schowek Opróżniony!" social_component_clipboard_not_emptied = "Błąd Pustego Schowka!" social_component_paste_all_success = "Wklej wszystkie sukcesy!" social_component_paste_all_failed = "Wklej wszystkie nie powiodło się!" @@ -1522,7 +1534,8 @@ groupfeed_element_clipboard = "" groupfeed_element_paste_all = "" groupfeed_element_empty_clipboard = "" groupfeed_element_no_clipboard_items = "" -groupfeed_element_paste = "" +groupfeed_element_pastepost = "" +groupfeed_element_delete = "Usunąć" groupfeed_element_thread_no_exist = "Wątek nie istnieje! Możliwe, że został usunięty?" groupfeed_element_flagged = "" groupfeed_element_cleared = "" @@ -1531,16 +1544,17 @@ groupfeed_element_up_vote = "Głosować" groupfeed_element_down_vote = "Głosowanie" groupfeed_element_comment = "Komentarz" groupfeed_element_edit = "Edytuj" +groupfeed_element_copypost = "" +groupfeed_element_cutpost = "" groupfeed_element_confirm_delete = "Twoje pewien, że chcesz usunąć ten element?" -groupfeed_element_delete = "Usunąć" groupfeed_element_confirm_flag = "" +groupfeed_element_num_posts = "%s wiadomości" +groupfeed_element_num_views = "%s wyświetleń" +groupfeed_element_edited = "Ostatnia zmiana: %s" groupfeed_element_usericon = "Ikona Użytkownika " groupfeed_public_posts = "Posty Publiczne" groupfeed_messages = "Wiadomości" groupfeed_connect = "Połącz" -groupfeed_element_num_posts = "%s wiadomości" -groupfeed_element_num_views = "%s wyświetleń" -groupfeed_element_edited = "Ostatnia zmiana: %s" groupfeed_element_start_thread = "Rozpocząć Nowy Temat" groupfeed_element_subject = "Temat" groupfeed_element_post = "Post" diff --git a/src/locale/pt/configure.ini b/src/locale/pt/configure.ini index d7820a14b..c7c2ffe84 100755 --- a/src/locale/pt/configure.ini +++ b/src/locale/pt/configure.ini @@ -254,9 +254,22 @@ social_component_notify_body = "Nós pensamos que você poderia estar social_component_notify_salutation = "Querido %s," social_component_comment_added = "Comentário Adicionado!" social_component_public_cant_add = "Público usuário não pode adicionar grupo!" +social_component_invalid_message_id = "" +social_component_invalid_access = "" +social_component_clipboard_unavailable = "" +social_component_clipboard_full = "" +social_component_message_clipcopied = "" social_component_delete_error = "Erro Ao Excluir Item" +social_component_item_clipcut = "" social_component_item_deleted = "Item Excluído!" +social_component_item_cut_nodelete = "" social_component_no_item_deleted = "Nenhum Item Excluído!" +social_component_clip_item_deleted = "" +social_component_not_clip_item_deleted = "" +social_component_clipboard_emptied = "Área De Transferência Esvaziada !" +social_component_no_target_thread = "" +social_component_no_thread_access = "" +social_component_clipboard_pasted = "" social_component_flag_error = "" social_component_already_flagged = "" social_component_item_flagged = "" @@ -318,7 +331,6 @@ social_component_page_created = "%s Página Do Wiki Criado!" social_component_page_discuss_here = "Discutir a página neste segmento!" social_component_page_not_saved = "Página não guardada!" social_component_page_saved = "Página Salva!" -social_component_clipboard_emptied = "Área De Transferência Esvaziada !" social_component_clipboard_not_emptied = "A Área De Transferência Vazia Falhou !" social_component_paste_all_success = "Colar todo o sucesso !" social_component_paste_all_failed = "Colar tudo mal-sucedido !" @@ -1522,7 +1534,8 @@ groupfeed_element_clipboard = "" groupfeed_element_paste_all = "" groupfeed_element_empty_clipboard = "" groupfeed_element_no_clipboard_items = "" -groupfeed_element_paste = "" +groupfeed_element_pastepost = "" +groupfeed_element_delete = "Apagar" groupfeed_element_thread_no_exist = "Thread não existe! Talvez por isso, foi excluído?" groupfeed_element_flagged = "" groupfeed_element_cleared = "" @@ -1531,16 +1544,17 @@ groupfeed_element_up_vote = "Votação Até" groupfeed_element_down_vote = "Voto Para Baixo" groupfeed_element_comment = "Comentário" groupfeed_element_edit = "Editar" +groupfeed_element_copypost = "" +groupfeed_element_cutpost = "" groupfeed_element_confirm_delete = "São a sua certeza de que deseja excluir este item?" -groupfeed_element_delete = "Apagar" groupfeed_element_confirm_flag = "" +groupfeed_element_num_posts = "%s posts" +groupfeed_element_num_views = "%s pontos de vista" +groupfeed_element_edited = "Editado: %s" groupfeed_element_usericon = "Ícone De Usuário" groupfeed_public_posts = "Publicações Públicas" groupfeed_messages = "Mensagem" groupfeed_connect = "Conectar" -groupfeed_element_num_posts = "%s posts" -groupfeed_element_num_views = "%s pontos de vista" -groupfeed_element_edited = "Editado: %s" groupfeed_element_start_thread = "Iniciar Novo Segmento" groupfeed_element_subject = "Assunto" groupfeed_element_post = "Post" diff --git a/src/locale/ru/configure.ini b/src/locale/ru/configure.ini index db36504d1..0e9194f52 100755 --- a/src/locale/ru/configure.ini +++ b/src/locale/ru/configure.ini @@ -254,9 +254,22 @@ social_component_notify_body = "Мы думали, что вы были бы з social_component_notify_salutation = "Уважаемый %s," social_component_comment_added = "Комментарий Добавлен!" social_component_public_cant_add = "Общественные пользователь не может добавить группу!" +social_component_invalid_message_id = "" +social_component_invalid_access = "" +social_component_clipboard_unavailable = "" +social_component_clipboard_full = "" +social_component_message_clipcopied = "" social_component_delete_error = "Удаление Элемента Ошибка " +social_component_item_clipcut = "" social_component_item_deleted = "Элемент Удален!" +social_component_item_cut_nodelete = "" social_component_no_item_deleted = "Нет Пункта Удалить!" +social_component_clip_item_deleted = "" +social_component_not_clip_item_deleted = "" +social_component_clipboard_emptied = "Буфер обмена опустел!" +social_component_no_target_thread = "" +social_component_no_thread_access = "" +social_component_clipboard_pasted = "" social_component_flag_error = "" social_component_already_flagged = "" social_component_item_flagged = "" @@ -318,7 +331,6 @@ social_component_page_created = "%s Страницу Вики Создан!" social_component_page_discuss_here = "Обсудить страницы в этой теме!" social_component_page_not_saved = "Страница не сохранена!" social_component_page_saved = "Страницы Спас!" -social_component_clipboard_emptied = "Буфер обмена опустел!" social_component_clipboard_not_emptied = "Ошибка с пустым буфером обмена!" social_component_paste_all_success = "Вставьте все успехи!" social_component_paste_all_failed = "Вставить все не удалось!" @@ -1522,7 +1534,8 @@ groupfeed_element_clipboard = "" groupfeed_element_paste_all = "" groupfeed_element_empty_clipboard = "" groupfeed_element_no_clipboard_items = "" -groupfeed_element_paste = "" +groupfeed_element_pastepost = "" +groupfeed_element_delete = "Удалить" groupfeed_element_thread_no_exist = "Поток не существует! Возможно, он был удален?" groupfeed_element_flagged = "" groupfeed_element_cleared = "" @@ -1531,16 +1544,17 @@ groupfeed_element_up_vote = "Голосовать" groupfeed_element_down_vote = "Голосование" groupfeed_element_comment = "Комментарий" groupfeed_element_edit = "Редактировать" +groupfeed_element_copypost = "" +groupfeed_element_cutpost = "" groupfeed_element_confirm_delete = "Ваши уверены что хотите удалить этот пункт?" -groupfeed_element_delete = "Удалить" groupfeed_element_confirm_flag = "" +groupfeed_element_num_posts = "%s сообщений" +groupfeed_element_num_views = "%s просмотров" +groupfeed_element_edited = "Отредактировано: %s" groupfeed_element_usericon = "Значок Пользователя " groupfeed_public_posts = "Публичные должности" groupfeed_messages = "Сообщения" groupfeed_connect = "Подключить" -groupfeed_element_num_posts = "%s сообщений" -groupfeed_element_num_views = "%s просмотров" -groupfeed_element_edited = "Отредактировано: %s" groupfeed_element_start_thread = "Начать Новую Тему" groupfeed_element_subject = "Тема" groupfeed_element_post = "Пост" diff --git a/src/locale/te/configure.ini b/src/locale/te/configure.ini index 997c96bf8..a8b3f5648 100644 --- a/src/locale/te/configure.ini +++ b/src/locale/te/configure.ini @@ -254,9 +254,22 @@ social_component_notify_body = "We thought you would be interested in a new post social_component_notify_salutation = "డియర్ %s, " social_component_comment_added = "కామెంట్ ఆడ్ చేయడమైనది!" social_component_public_cant_add = "పబ్లిక్ వినియోగదారు cannot add గ్రూప్!" +social_component_invalid_message_id = "" +social_component_invalid_access = "" +social_component_clipboard_unavailable = "" +social_component_clipboard_full = "" +social_component_message_clipcopied = "" social_component_delete_error = "ఐటెం తొలగించడం లో పొరపాటు వచ్చినది" +social_component_item_clipcut = "" social_component_item_deleted = "ఐటెం డిలీట్ చేయబడినది!" +social_component_item_cut_nodelete = "" social_component_no_item_deleted = "ఐటెం ఎదీ డిలీట్ చేయబడలేదు!" +social_component_clip_item_deleted = "" +social_component_not_clip_item_deleted = "" +social_component_clipboard_emptied = "క్లిప్బోర్డ్కు ఖాళీ!" +social_component_no_target_thread = "" +social_component_no_thread_access = "" +social_component_clipboard_pasted = "" social_component_flag_error = "" social_component_already_flagged = "" social_component_item_flagged = "" @@ -318,7 +331,6 @@ social_component_page_created = "%s వికీ పేజ్ సృష్టి social_component_page_discuss_here = "ఈ థ్రెడ్ లో పేజీ గురించి చర్చించండి!" social_component_page_not_saved = "పేజీ సేవ్ చెయ్యలేదు!" social_component_page_saved = "పేజ్ సేవ్ చేయబడినది!" -social_component_clipboard_emptied = "క్లిప్బోర్డ్కు ఖాళీ!" social_component_clipboard_not_emptied = "ఖాళీ క్లిప్బోర్డ్కు విఫలమైంది!" social_component_paste_all_success = "అన్ని విజయం అతికించు!" social_component_paste_all_failed = "అన్ని విఫలమైంది అతికించు!" @@ -1522,7 +1534,8 @@ groupfeed_element_clipboard = "" groupfeed_element_paste_all = "" groupfeed_element_empty_clipboard = "" groupfeed_element_no_clipboard_items = "" -groupfeed_element_paste = "" +groupfeed_element_pastepost = "" +groupfeed_element_delete = "డిలీట్" groupfeed_element_thread_no_exist = "థ్రెడ్ ఉనికిలో లేదు! ఇది తొలగించబడి ఉండవచ్చు?" groupfeed_element_flagged = "" groupfeed_element_cleared = "" @@ -1531,16 +1544,17 @@ groupfeed_element_up_vote = "ఓటు అప్" groupfeed_element_down_vote = "ఓటు డౌన్" groupfeed_element_comment = "వ్యాఖ్య" groupfeed_element_edit = "ఎడిట్" +groupfeed_element_copypost = "" +groupfeed_element_cutpost = "" groupfeed_element_confirm_delete = "మీ sure you want to delete this item?" -groupfeed_element_delete = "డిలీట్" groupfeed_element_confirm_flag = "" +groupfeed_element_num_posts = "%s పోస్ట్లు" +groupfeed_element_num_views = "%s వ్యూస్" +groupfeed_element_edited = "భాషలు: %s" groupfeed_element_usericon = "యూజర్ చిహ్నం" groupfeed_public_posts = "పబ్లిక్ పోస్ట్లు" groupfeed_messages = "సందేశాలు" groupfeed_connect = "అనుసంధానించు" -groupfeed_element_num_posts = "%s పోస్ట్లు" -groupfeed_element_num_views = "%s వ్యూస్" -groupfeed_element_edited = "భాషలు: %s" groupfeed_element_start_thread = "క్రొత్త థ్రెడ్ మొదలుపెట్టండి" groupfeed_element_subject = "విషయం" groupfeed_element_post = "పోస్ట్" diff --git a/src/locale/th/configure.ini b/src/locale/th/configure.ini index af0776168..3710e51c1 100755 --- a/src/locale/th/configure.ini +++ b/src/locale/th/configure.ini @@ -254,9 +254,22 @@ social_component_notify_body = "เราคิดว่าคุณคงจะ social_component_notify_salutation = "ที่รัก %s," social_component_comment_added = "ความเห็นเพิ่ม!" social_component_public_cant_add = "สาธารณะของผู้ใช้ไม่สามารถเพิ่มกลุ่ม!" +social_component_invalid_message_id = "" +social_component_invalid_access = "" +social_component_clipboard_unavailable = "" +social_component_clipboard_full = "" +social_component_message_clipcopied = "" social_component_delete_error = "เกิดข้อผิดพลาดระหว่างการลบรายการ" +social_component_item_clipcut = "" social_component_item_deleted = "รายการกลบออกไป!" +social_component_item_cut_nodelete = "" social_component_no_item_deleted = "ไม่มีรายการกลบออกไป!" +social_component_clip_item_deleted = "" +social_component_not_clip_item_deleted = "" +social_component_clipboard_emptied = "ยังคลิปบอร์ดลิ้น!" +social_component_no_target_thread = "" +social_component_no_thread_access = "" +social_component_clipboard_pasted = "" social_component_flag_error = "" social_component_already_flagged = "" social_component_item_flagged = "" @@ -318,7 +331,6 @@ social_component_page_created = "ทั้งหมด %s Wiki หน้าส social_component_page_discuss_here = "คุยเรื่องหน้าในด้า!" social_component_page_not_saved = "ไม่ได้บันทึกหน้า!" social_component_page_saved = "หน้าช่วย!" -social_component_clipboard_emptied = "ยังคลิปบอร์ดลิ้น!" social_component_clipboard_not_emptied = "ว่างเปล่ายังคลิปบอร์ดล้มเหลว!" social_component_paste_all_success = "วางความสำเร็จทั้งหมด!" social_component_paste_all_failed = "วางทุกอนล้มเหลว!" @@ -1522,7 +1534,8 @@ groupfeed_element_clipboard = "" groupfeed_element_paste_all = "" groupfeed_element_empty_clipboard = "" groupfeed_element_no_clipboard_items = "" -groupfeed_element_paste = "" +groupfeed_element_pastepost = "" +groupfeed_element_delete = "ลบ" groupfeed_element_thread_no_exist = "เธรดยังไม่มีอยู่! บางทีมันอาจจะถูกลบออก?" groupfeed_element_flagged = "" groupfeed_element_cleared = "" @@ -1531,16 +1544,17 @@ groupfeed_element_up_vote = "โหวตนขึ้น" groupfeed_element_down_vote = "โหวตล" groupfeed_element_comment = "ความคิดเห็น" groupfeed_element_edit = "แก้ไข" +groupfeed_element_copypost = "" +groupfeed_element_cutpost = "" groupfeed_element_confirm_delete = "คุณแน่ใจหรือว่าต้องการจะลบรายการนี้?" -groupfeed_element_delete = "ลบ" groupfeed_element_confirm_flag = "" +groupfeed_element_num_posts = "ทั้งหมด %s กัปตัน..เสาทางนี้" +groupfeed_element_num_views = "มุมมองทั้งหมด %s" +groupfeed_element_edited = "แก้ไข:ทั้งหมด %s" groupfeed_element_usericon = "ของผู้ใช้ภาพไอคอน" groupfeed_public_posts = "โพสต์สาธารณะ" groupfeed_messages = "ข้อความ" groupfeed_connect = "เชื่อมต่อ" -groupfeed_element_num_posts = "ทั้งหมด %s กัปตัน..เสาทางนี้" -groupfeed_element_num_views = "มุมมองทั้งหมด %s" -groupfeed_element_edited = "แก้ไข:ทั้งหมด %s" groupfeed_element_start_thread = "เริ่มต้นใหม่เธรด" groupfeed_element_subject = "เรื่อง" groupfeed_element_post = "โพสต์" diff --git a/src/locale/tl/configure.ini b/src/locale/tl/configure.ini index e43460272..193411b82 100644 --- a/src/locale/tl/configure.ini +++ b/src/locale/tl/configure.ini @@ -254,9 +254,22 @@ social_component_notify_body = "Naisip namin na gusto mong maging interesado sa social_component_notify_salutation = "Mahal %s," social_component_comment_added = "Komento Idinagdag!" social_component_public_cant_add = "Pampublikong mga gumagamit ay hindi maaaring magdagdag ng mga grupo!" +social_component_invalid_message_id = "" +social_component_invalid_access = "" +social_component_clipboard_unavailable = "" +social_component_clipboard_full = "" +social_component_message_clipcopied = "" social_component_delete_error = "Error Sa Pagtanggal Ng Mga Item" +social_component_item_clipcut = "" social_component_item_deleted = "Mga Item Na Tinanggal Na!" +social_component_item_cut_nodelete = "" social_component_no_item_deleted = "Walang Mga Item Na Tinanggal Na!" +social_component_clip_item_deleted = "" +social_component_not_clip_item_deleted = "" +social_component_clipboard_emptied = "Walang Laman Ang Clipboard !" +social_component_no_target_thread = "" +social_component_no_thread_access = "" +social_component_clipboard_pasted = "" social_component_flag_error = "" social_component_already_flagged = "" social_component_item_flagged = "" @@ -318,7 +331,6 @@ social_component_page_created = "%s Wiki Pahina Na Nilikha!" social_component_page_discuss_here = "Talakayin ang mga pahina sa thread na ito!" social_component_page_not_saved = "Hindi nai-save ang pahina !" social_component_page_saved = "Pahina-Save!" -social_component_clipboard_emptied = "Walang Laman Ang Clipboard !" social_component_clipboard_not_emptied = "Nabigo Ang Walang Laman Na Clipboard!" social_component_paste_all_success = "I-Paste ang lahat ng tagumpay!" social_component_paste_all_failed = "I-Paste ang lahat ng nabigo!" @@ -1522,7 +1534,8 @@ groupfeed_element_clipboard = "" groupfeed_element_paste_all = "" groupfeed_element_empty_clipboard = "" groupfeed_element_no_clipboard_items = "" -groupfeed_element_paste = "" +groupfeed_element_pastepost = "" +groupfeed_element_delete = "Tanggalin ang" groupfeed_element_thread_no_exist = "Thread na ito ay hindi umiiral! Siguro ito ay tinanggal?" groupfeed_element_flagged = "" groupfeed_element_cleared = "" @@ -1531,16 +1544,17 @@ groupfeed_element_up_vote = "Bumoto Up" groupfeed_element_down_vote = "Bumoto Down Na" groupfeed_element_comment = "Komento" groupfeed_element_edit = "I-Edit" +groupfeed_element_copypost = "" +groupfeed_element_cutpost = "" groupfeed_element_confirm_delete = "Ay iyong bang gusto mong tanggalin ang item na ito?" -groupfeed_element_delete = "Tanggalin ang" groupfeed_element_confirm_flag = "" +groupfeed_element_num_posts = "%s post" +groupfeed_element_num_views = "%s mga tanawin" +groupfeed_element_edited = "Edit: %s" groupfeed_element_usericon = "Gumagamit Ng Mga Icon" groupfeed_public_posts = "Mga Pampublikong Post" groupfeed_messages = "Mga mensahe" groupfeed_connect = "Kumonekta" -groupfeed_element_num_posts = "%s post" -groupfeed_element_num_views = "%s mga tanawin" -groupfeed_element_edited = "Edit: %s" groupfeed_element_start_thread = "Magsimula Ng Bagong Thread" groupfeed_element_subject = "Paksa" groupfeed_element_post = "Post" diff --git a/src/locale/tr/configure.ini b/src/locale/tr/configure.ini index ece83672e..962ba9cd7 100755 --- a/src/locale/tr/configure.ini +++ b/src/locale/tr/configure.ini @@ -254,9 +254,22 @@ social_component_notify_body = "Bu konuya yeni bir yazı ilginizi çeker d social_component_notify_salutation = "%s sevgili," social_component_comment_added = "Yorum Eklendi!" social_component_public_cant_add = "Genel kullanıcı 1([2] []) grup eklenemiyor " +social_component_invalid_message_id = "" +social_component_invalid_access = "" +social_component_clipboard_unavailable = "" +social_component_clipboard_full = "" +social_component_message_clipcopied = "" social_component_delete_error = "Hata Silme Madde" +social_component_item_clipcut = "" social_component_item_deleted = "Öğe Silinmiş!" +social_component_item_cut_nodelete = "" social_component_no_item_deleted = "Hiçbir Öğe Silinmiş!" +social_component_clip_item_deleted = "" +social_component_not_clip_item_deleted = "" +social_component_clipboard_emptied = "Pano Boşaltıldı!" +social_component_no_target_thread = "" +social_component_no_thread_access = "" +social_component_clipboard_pasted = "" social_component_flag_error = "" social_component_already_flagged = "" social_component_item_flagged = "" @@ -318,7 +331,6 @@ social_component_page_created = "%s Wiki Sayfasını Oluşturdu." social_component_page_discuss_here = "Bu konuyu sayfa tartışın!" social_component_page_not_saved = "Sayfa kaydedilmedi !" social_component_page_saved = "Sayfa Kurtardı!" -social_component_clipboard_emptied = "Pano Boşaltıldı!" social_component_clipboard_not_emptied = "Boş Pano Başarısız Oldu!" social_component_paste_all_success = "Tüm başarıyı yapıştır!" social_component_paste_all_failed = "Tümünü yapıştır başarısız oldu!" @@ -1522,7 +1534,8 @@ groupfeed_element_clipboard = "" groupfeed_element_paste_all = "" groupfeed_element_empty_clipboard = "" groupfeed_element_no_clipboard_items = "" -groupfeed_element_paste = "" +groupfeed_element_pastepost = "" +groupfeed_element_delete = "Sil" groupfeed_element_thread_no_exist = "İş parçacığı yok. Belki de silindi mi?" groupfeed_element_flagged = "" groupfeed_element_cleared = "" @@ -1531,16 +1544,17 @@ groupfeed_element_up_vote = "Oy" groupfeed_element_down_vote = "Oy" groupfeed_element_comment = "Yorum" groupfeed_element_edit = "Edit" +groupfeed_element_copypost = "" +groupfeed_element_cutpost = "" groupfeed_element_confirm_delete = "Senin[F]) ([3] bu öğeyi silmek istediğinizden emin misiniz " -groupfeed_element_delete = "Sil" groupfeed_element_confirm_flag = "" +groupfeed_element_num_posts = "%s mesaj" +groupfeed_element_num_views = "%s manzaralı" +groupfeed_element_edited = "Düzenlenmiştir: %s" groupfeed_element_usericon = "Kullanıcı Simgesi" groupfeed_public_posts = "Herkese Açık Yayınlar" groupfeed_messages = "İletiler" groupfeed_connect = "Bağlan" -groupfeed_element_num_posts = "%s mesaj" -groupfeed_element_num_views = "%s manzaralı" -groupfeed_element_edited = "Düzenlenmiştir: %s" groupfeed_element_start_thread = "Yeni Bir Konu Başlatmak" groupfeed_element_subject = "Konu" groupfeed_element_post = "Post" diff --git a/src/locale/vi_VN/configure.ini b/src/locale/vi_VN/configure.ini index e788aab69..dd79e9450 100755 --- a/src/locale/vi_VN/configure.ini +++ b/src/locale/vi_VN/configure.ini @@ -254,9 +254,22 @@ social_component_notify_body = "Chúng tôi nghĩ ông sẽ quan social_component_notify_salutation = "Thưa %s," social_component_comment_added = "Bình Luận Thêm!" social_component_public_cant_add = "Người dùng công cộng không thể thêm nhóm!" +social_component_invalid_message_id = "" +social_component_invalid_access = "" +social_component_clipboard_unavailable = "" +social_component_clipboard_full = "" +social_component_message_clipcopied = "" social_component_delete_error = "Lỗi Xóa Mục" +social_component_item_clipcut = "" social_component_item_deleted = "Mục Xóa!" +social_component_item_cut_nodelete = "" social_component_no_item_deleted = "Không Có Mục Xóa!" +social_component_clip_item_deleted = "" +social_component_not_clip_item_deleted = "" +social_component_clipboard_emptied = "Tạm Dọn Sạch!" +social_component_no_target_thread = "" +social_component_no_thread_access = "" +social_component_clipboard_pasted = "" social_component_flag_error = "" social_component_already_flagged = "" social_component_item_flagged = "" @@ -318,7 +331,6 @@ social_component_page_created = "%s Wiki Trang Tạo Ra!" social_component_page_discuss_here = "Thảo luận về các trang trong chủ đề này!" social_component_page_not_saved = "Trang không lưu!" social_component_page_saved = "Trang Cứu!" -social_component_clipboard_emptied = "Tạm Dọn Sạch!" social_component_clipboard_not_emptied = "Trống Rỗng Tạm Thất Bại!" social_component_paste_all_success = "Dán tất cả thành công!" social_component_paste_all_failed = "Dán tất cả thất bại!" @@ -1522,7 +1534,8 @@ groupfeed_element_clipboard = "" groupfeed_element_paste_all = "" groupfeed_element_empty_clipboard = "" groupfeed_element_no_clipboard_items = "" -groupfeed_element_paste = "" +groupfeed_element_pastepost = "" +groupfeed_element_delete = "Xóa" groupfeed_element_thread_no_exist = "Chủ đề không tồn tại! Có thể nó đã bị xóa?" groupfeed_element_flagged = "" groupfeed_element_cleared = "" @@ -1531,16 +1544,17 @@ groupfeed_element_up_vote = "Bỏ Phiếu Lên" groupfeed_element_down_vote = "Bỏ Phiếu Xuống" groupfeed_element_comment = "Bình luận" groupfeed_element_edit = "Chỉnh sửa" +groupfeed_element_copypost = "" +groupfeed_element_cutpost = "" groupfeed_element_confirm_delete = "Là của bạn chắc chắn muốn xóa mục này?" -groupfeed_element_delete = "Xóa" groupfeed_element_confirm_flag = "" +groupfeed_element_num_posts = "%s bài" +groupfeed_element_num_views = "%s xem" +groupfeed_element_edited = "Chỉnh sửa: %s" groupfeed_element_usericon = "Sử Dụng Biểu Tượng" groupfeed_public_posts = "Làm Bài" groupfeed_messages = "Tin nhắn" groupfeed_connect = "Kết nối" -groupfeed_element_num_posts = "%s bài" -groupfeed_element_num_views = "%s xem" -groupfeed_element_edited = "Chỉnh sửa: %s" groupfeed_element_start_thread = "Bắt Đầu Mới Chủ Đề" groupfeed_element_subject = "Chủ đề" groupfeed_element_post = "Bài" diff --git a/src/locale/zh_CN/configure.ini b/src/locale/zh_CN/configure.ini index be985339d..c7280fc4b 100755 --- a/src/locale/zh_CN/configure.ini +++ b/src/locale/zh_CN/configure.ini @@ -254,9 +254,22 @@ social_component_notify_body = "我们还以为你会感兴趣的一个新员额 social_component_notify_salutation = "亲爱的%s," social_component_comment_added = "评论。" social_component_public_cant_add = "公共用户不能添加的组!" +social_component_invalid_message_id = "" +social_component_invalid_access = "" +social_component_clipboard_unavailable = "" +social_component_clipboard_full = "" +social_component_message_clipcopied = "" social_component_delete_error = "错误删除项目" +social_component_item_clipcut = "" social_component_item_deleted = "项目删除！" +social_component_item_cut_nodelete = "" social_component_no_item_deleted = "没有一项删除！" +social_component_clip_item_deleted = "" +social_component_not_clip_item_deleted = "" +social_component_clipboard_emptied = "剪贴板清空!" +social_component_no_target_thread = "" +social_component_no_thread_access = "" +social_component_clipboard_pasted = "" social_component_flag_error = "" social_component_already_flagged = "" social_component_item_flagged = "" @@ -318,7 +331,6 @@ social_component_page_created = "%sWiki网页创建了！" social_component_page_discuss_here = "讨论的一页，在这个线！" social_component_page_not_saved = "未保存页面!" social_component_page_saved = "页面，保存！" -social_component_clipboard_emptied = "剪贴板清空!" social_component_clipboard_not_emptied = "清空剪贴板失败!" social_component_paste_all_success = "粘贴所有成功!" social_component_paste_all_failed = "粘贴全部失败!" @@ -1522,7 +1534,8 @@ groupfeed_element_clipboard = "" groupfeed_element_paste_all = "" groupfeed_element_empty_clipboard = "" groupfeed_element_no_clipboard_items = "" -groupfeed_element_paste = "" +groupfeed_element_pastepost = "" +groupfeed_element_delete = "删除" groupfeed_element_thread_no_exist = "线不存在！ 也许这是删除?" groupfeed_element_flagged = "" groupfeed_element_cleared = "" @@ -1531,16 +1544,17 @@ groupfeed_element_up_vote = "投票了" groupfeed_element_down_vote = "表决下" groupfeed_element_comment = "评论" groupfeed_element_edit = "编辑" +groupfeed_element_copypost = "" +groupfeed_element_cutpost = "" groupfeed_element_confirm_delete = "你确定要删除这个项目?" -groupfeed_element_delete = "删除" groupfeed_element_confirm_flag = "" +groupfeed_element_num_posts = "%s个员额" +groupfeed_element_num_views = "%s景" +groupfeed_element_edited = "编辑：%s" groupfeed_element_usericon = "用户的图标" groupfeed_public_posts = "公共职位" groupfeed_messages = "信息" groupfeed_connect = "连接" -groupfeed_element_num_posts = "%s个员额" -groupfeed_element_num_views = "%s景" -groupfeed_element_edited = "编辑：%s" groupfeed_element_start_thread = "开始新的螺纹" groupfeed_element_subject = "受" groupfeed_element_post = "后" diff --git a/src/models/GroupModel.php b/src/models/GroupModel.php index 87452341f..486338092 100644 --- a/src/models/GroupModel.php +++ b/src/models/GroupModel.php @@ -2347,7 +2347,7 @@ class GroupModel extends Model implements MediaConstants $group_page_folder = L\crawlHash( "group" . $group_id . $page_id . C\AUTH_KEY); $old_thumb_page_folder = L\crawlHash( - "thumb" . $group_id. $page_id . C\AUTH_KEY); + "thumb" . $group_id . $page_id . C\AUTH_KEY); $group_prefix = substr($group_page_folder, 0, 3); $old_thumb_prefix = substr($old_thumb_page_folder, 0, 3); $resource_path = C\APP_DIR . "/resources"; @@ -3910,10 +3910,17 @@ EOD; } } /** - * @param string $link_group_id - * @param string $link_store_id - * @param string $target_group_id - * @param string $target_store_id + * Creates a symlink between two resource folders (and their associate + * thumb folders) + * + * @param string $link_group_id group with page that is going to get the + * symlink + * @param string $link_store_id page_id of page that is going to get the + * symlink + * @param string $target_group_id group whose page resources will be + * linked to + * @param string $target_store_id page whose page resources will be + * linked to */ public function linkResourceFolders($link_group_id, $link_store_id, $target_group_id, $target_store_id) @@ -4332,6 +4339,29 @@ EOD; return [$file_path, $thumb_folder, $clip_path, $clip_thumb_folder, $base_folder]; } + /** + * Copies resources associated with a thread post in one group to + * the resource folders associated with a different group and thread id + * + * @param int $from_group_id group resources are coming from + * @param int $from_thread_id thread post to get resources from + * @param int $to_group_id group that we are copying to + * @param int $to_thread_id resource folder of this thread post will be + * copied to + */ + public function copyThreadResources($from_group_id, $from_thread_id, + $to_group_id, $to_thread_id) + { + $from_folders = $this->getGroupPageResourcesFolders($from_group_id, + "post" . $from_thread_id); + list($from_folder, $from_thumb_folder, $from_base_folder, ) = + $from_folders; + $to_folders = $this->getGroupPageResourcesFolders($to_group_id, + "post" . $to_thread_id, "", true); + list($to_folder, $to_thumb_folder, $to_base_folder, ) = $to_folders; + $this->db->copyRecursive($from_folder, $to_folder); + $this->db->copyRecursive($from_thumb_folder, $to_thumb_folder); + } /** * Gets all the urls of resources belonging to a particular groups wiki * page. diff --git a/src/views/elements/GroupfeedElement.php b/src/views/elements/GroupfeedElement.php index 8af5f0ec2..a94684b9e 100644 --- a/src/views/elements/GroupfeedElement.php +++ b/src/views/elements/GroupfeedElement.php @@ -163,7 +163,7 @@ class GroupfeedElement extends Element implements CrawlConstants * a list of threads for a particular group or a a thread start * followed by comments for a particular thread * - * @param bool $logged_in where or not the session is of a logged in user + * @param bool $logged_in whether or not the session is of a logged in user * @param string $base_query url that serves as the stem for all links * drawn in view * @param string $paging_query base_query concatenated with limit and num @@ -204,7 +204,7 @@ class GroupfeedElement extends Element implements CrawlConstants $is_thread = !empty($data['JUST_THREAD']); $is_group = !empty($data['JUST_GROUP_ID']); $is_user = !empty($data['JUST_USER_ID']); - $has_clipboard = ($is_thread || $is_group) && ( + $has_clipboard = ($is_thread) && ( !empty($data['PAGES'][0]['OWNER_ID']) && !empty($_SESSION['USER_ID']) && $_SESSION['USER_ID'] == $data['PAGES'][0]['OWNER_ID']); @@ -238,10 +238,10 @@ class GroupfeedElement extends Element implements CrawlConstants <div id="feed-clipboard" class="none"> <h3><?=tl('groupfeed_element_clipboard') ?></h3> <div> - [<a href="<?=$paging_query . '&arg=paste_all' + [<a href="<?=$paging_query . '&arg=pasteall' ?>"><?=tl('groupfeed_element_paste_all')?></a>] [<a onclick='return emptyConfirm();' - href="<?=$paging_query . '&arg=empty_clip' + href="<?=$paging_query . '&arg=emptyclip' ?>"><?=tl('groupfeed_element_empty_clipboard')?></a>] </div> <hr ><?php @@ -254,8 +254,23 @@ class GroupfeedElement extends Element implements CrawlConstants $clip_cnt = 0; foreach ($data['CLIP_ITEMS'] as $clip_item) {?> <div class='small-group-result'> - <div class="float-opposite button-container"> - <a href="">📤</a> <a href="">🗑</a> + <div class="float-opposite"> + <div class="button-container"> + <a href="<?= $paging_query .'&arg=pastepost&'. + "post_id=" . $clip_item['ID'] + ?>"><span role="img" aria-label="<?= + tl('groupfeed_element_pastepost') + ?>" >📤<span class="none"><?= + tl('groupfeed_element_pastepost') + ?></span></span></a> + </div> <div class="button-container"> + <a href="<?= $paging_query .'&arg=deleteclip&'. + "post_id=" . $clip_item['ID'] + ?>"><span role="img" aria-label="<?= + tl('groupfeed_element_delete') + ?>" >🗑<span class="none"><?= + tl('groupfeed_element_delete') + ?></span></span></a></div> </div> <div id='clip-<?= $clip_item['ID'] ?>' > <?= $this->renderIconContainer($clip_item, @@ -382,38 +397,39 @@ class GroupfeedElement extends Element implements CrawlConstants && $_SESSION['USER_ID'] == $page['OWNER_ID'])) && isset($page['TYPE']) && $page['TYPE'] != C\WIKI_GROUP_ITEM) { ?> - <div class="float-opposite button-container"><?php + <div class="float-opposite"><?php if ($has_voting) { $up_vote = $paging_query . "&post_id=".$page['ID'] . "&arg=upvote&group_id=".$page['GROUP_ID']; $down_vote = $paging_query ."&post_id=".$page['ID']. "&arg=downvote&group_id=".$page['GROUP_ID']; - if ($has_up_down_voting) { - e(" <span class='gray bigger-font'>(". - "<a class='vote-button'". - "href='$up_vote'><span role='img' aria-label='". - tl('groupfeed_element_up_vote') . - "'>+</span><span class='none'>" . - tl('groupfeed_element_up_vote') . - "</span></a>{$page['UPS']}/<a ". - "class='vote-button' href='$down_vote'><span ". - "role='img' aria-label='" . - tl('groupfeed_element_down_vote') ."'>-</span>". - "<span class='none'>" . - tl('groupfeed_element_down_vote') . "</span></a>". - "{$page['DOWNS']})</span>"); - } else if ($has_up_voting) { - e(" <span class='gray bigger-font'>(". - "<a class='vote-button' ". - "href='$up_vote'><span role='img' aria-label='". - tl('groupfeed_element_up_vote') . - "'>+</span><span class='none'>" . - tl('groupfeed_element_up_vote') . - "</span></a>{$page['UPS']})</span>"); + if ($has_up_down_voting) { ?> + <span class='gray bigger-font'><?= + e("(")?><a class='vote-button' href='<?= + $up_vote?>'><span role='img' aria-label='<?= + tl('groupfeed_element_up_vote') + ?>'>+</span><span class='none'><?= + tl('groupfeed_element_up_vote') + ?></span></a><?=$page['UPS'] + ?>/<a class='vote-button' href='<?= + $down_vote?>'><span role='img' aria-label='<?= + tl('groupfeed_element_down_vote') + ?>'>-</span><span class='none'><?= + tl('groupfeed_element_down_vote') ?></span></a><?= + $page['DOWNS']?></span>) <?php + } else if ($has_up_voting) { ?> + <span class='gray bigger-font'><?= + e("(") ?><a class='vote-button' href='<?= + $up_vote?>'><span role='img' aria-label='<?= + tl('groupfeed_element_up_vote') + ?>'>+</span><span class='none'><?= + tl('groupfeed_element_up_vote') + ?></span></a><?=$page['UPS']?></span>) <?php } } if ($is_all_feed && in_array($page["MEMBER_ACCESS"], - $can_comment)) { ?> + $can_comment)) { + ?><div class="button-container inline"> <script> document.write("<a "+ "href='javascript:commentForm(" + '<?= @@ -422,9 +438,11 @@ class GroupfeedElement extends Element implements CrawlConstants '><span role="img" aria-label="<?= tl('groupfeed_element_comment') ?>">💬' + '</span></a>'); - </script><?php + </script> + </div> <?php } if (!isset($page['NO_EDIT'])) { + ?><div class="button-container inline"><?php if ($is_api || $is_status) { ?> <a class="action-button-link" href="javascript:updatePostForm(<?= @@ -439,26 +457,32 @@ class GroupfeedElement extends Element implements CrawlConstants tl('groupfeed_element_edit') ?>"> ✏️</a>'); </script><?php - } + }?> + </div><?php } $delete_url = (empty($data['WIKI_FEED_BASE'])) ? $paging_query : $data['WIKI_FEED_BASE']; if ($has_clipboard) { ?> + <div class="button-container inline"> <a href="<?= $paging_query .'&arg=copypost&'. "post_id=" . $page['ID'] ?>"><span role="img" aria-label="<?= tl('groupfeed_element_copypost') - ?>" >📷<span class="none"><?= - tl('groupfeed_element_copy') ?></span></span></a> - <a href="<?= $paging_query .'&arg=cutpost&'. + ?>" >📷<span class="none "><?= + tl('groupfeed_element_copypost') ?></span></span></a> + </div> + <div class="button-container inline"> + <a class="inline" href="<?= $paging_query .'&arg=cutpost&'. "post_id=" . $page['ID'] ?>"><span role="img" aria-label="<?= tl('groupfeed_element_cutpost') ?>" >✂️<span class="none"><?= - tl('groupfeed_element_cut') ?></span></span></a> + tl('groupfeed_element_cutpost') ?></span></span></a> + </div> <?php } ?> + <div class="button-container inline"> <a onclick="return confirm('<?= tl('groupfeed_element_confirm_delete') ?>');" href="<?= $delete_url .'&arg=deletepost&'. @@ -466,6 +490,7 @@ class GroupfeedElement extends Element implements CrawlConstants ?>"><span role="img" aria-label="<?= tl('groupfeed_element_delete') ?>" >🗑<span class="none"><?= tl('groupfeed_element_delete') ?></span></span></a> + </div> </div><?php } else if (in_array($member_access, $can_comment) && $is_thread) {?> <div class="float-opposite button-container"><?php @@ -491,7 +516,7 @@ class GroupfeedElement extends Element implements CrawlConstants <div id='result-<?= $page['ID'] ?>' > <?= $this->renderIconContainer($page, $data['CONTROLLER'], $item_cnt, $logged_in, $token, ($data['USERNAME'] ?? ""), - ($data['CONTACTS'] ?? [])); ?> + ($data['CONTACTS'] ?? []), $paging_query); ?> <div class="<?=$feed_item_body ?>" <?=$feed_item_body_first?> ><?php if ($moderated_item) { ?> <h2><a href="<?= @@ -600,11 +625,25 @@ class GroupfeedElement extends Element implements CrawlConstants } } /** + * Used to draw the icon of a user with a user name dropdown + * contianing links about that user below it for a thread or comment item. * + * @param array $page thread item which is currently being rendered and on + * which the Icon container will appear + * @param string $controller the name of the controller that will handle + * requests related to the view that is being drawn + * @param int $item_cnt the number of thread items previously drawn + 1 + * @param bool $logged_in whether the used is logged in + * @param string $token string with CSRF token to prevent cross site attacks + * @param string $user_name name of current user or public if not logged in + * @param array $contacts list of contacts of current user + * @param string $uid_prefix prefix to use on id attributes of tags that + * need to be unique to this particular thread item + * @param string $paging_query base url to use for the add contact link */ private function renderIconContainer($page, $controller, $item_cnt, $logged_in, $token, $user_name = "", $contacts = [], - $uid_prefix = 'uid-') + $uid_prefix = 'uid-', $paging_query = "") {?> <div class="float-same center feed-icon-container"> <img class="small-feed-user-icon" src="<?=$page['USER_ICON'] ?>" @@ -625,7 +664,7 @@ class GroupfeedElement extends Element implements CrawlConstants tl("groupfeed_messages"); } else if ($logged_in) { $user_dropdown[ - $this->formatHref($paging_query. "&arg=addcontact" . + $this->formatHref($paging_query . "&arg=addcontact" . "&contact_id=" . $page['USER_ID'])] = tl("groupfeed_connect"); } diff --git a/src/views/helpers/GrouplistHelper.php b/src/views/helpers/GrouplistHelper.php index ceca610c7..3b3fd8096 100644 --- a/src/views/helpers/GrouplistHelper.php +++ b/src/views/helpers/GrouplistHelper.php @@ -152,6 +152,12 @@ class GrouplistHelper extends Helper $unsubscribe_url . "group_id={$group['GROUP_ID']}&". "user_id=" . $user_id, "leave_group", "", false, "float-opposite medium-font"); + } else if ($group['MEMBER_STATUS'] == C\INVITED_STATUS) { + $icon_helper->renderLink( + $join_url . "name={$group['GROUP_NAME']}&". + "user_id=" . $user_id, + "join_invited_group", "", false, + "float-opposite medium-font"); } else { $icon_helper->renderLink( $unsubscribe_url . "group_id={$group['GROUP_ID']}&".