merged w/ en_US and compiled.

35 files changed, 239 insertions, 114 deletions

diff --git a/site/app/locale/af/LC_MESSAGES/messages.po b/site/app/locale/af/LC_MESSAGES/messages.po
index caa4c7c..18047ff 100644
--- a/site/app/locale/af/LC_MESSAGES/messages.po
+++ b/site/app/locale/af/LC_MESSAGES/messages.po
@@ -6154,6 +6154,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "SeaMonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 #, fuzzy
 msgid "main_prettyname_sunbird"
@@ -7749,17 +7753,14 @@ msgstr "New User Registration"
 #~ msgstr "Share on FriendFeed"
 
 #, fuzzy
-<<<<<<< HEAD:site/app/locale/af/LC_MESSAGES/messages.po
 #~ msgid "addons_share_label_myspace"
 #~ msgstr "Post to MySpace"
-=======
+
 #~ msgid "recaptcha_hardtoread"
 #~ msgstr ""
 #~ "If this is hard to read, you can <a href=\"%1$s\">try different words</a> "
 #~ "or <a href=\"%2$s\">listen to numbers</a> instead."
 
-
 # : config/bootstrap.php:279
 msgid "main_prettyname_sugar"
 msgstr "Sugar"
->>>>>>> Add main_prettyname_sugar to the .pos:site/app/locale/af/LC_MESSAGES/messages.po
diff --git a/site/app/locale/ar/LC_MESSAGES/messages.po b/site/app/locale/ar/LC_MESSAGES/messages.po
index 13c09e2..9c45f31 100644
--- a/site/app/locale/ar/LC_MESSAGES/messages.po
+++ b/site/app/locale/ar/LC_MESSAGES/messages.po
@@ -5484,6 +5484,10 @@ msgstr "فَيَرفُكس"
 msgid "main_prettyname_seamonkey"
 msgstr "سِيمانكي"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "صَنْبٍرد"
@@ -6805,7 +6809,6 @@ msgstr "إعادة تعيين كلمة سر المستخدم"
 msgid "users_register_pagetitle"
 msgstr "تسجيل المستخدم الجديد"
 
-<<<<<<< HEAD:site/app/locale/ar/LC_MESSAGES/messages.po
 #~ msgid "addon_versions_getlatesttext"
 #~ msgstr "أحدث إصدارة متوافقة مع"
 
@@ -6832,8 +6835,7 @@ msgstr "تسجيل المستخدم الجديد"
 #, fuzzy
 #~ msgid "addons_share_label_myspace"
 #~ msgstr "Post to MySpace"
-=======
+
 # : config/bootstrap.php:279
 msgid "main_prettyname_sugar"
 msgstr "Sugar"
->>>>>>> Add main_prettyname_sugar to the .pos:site/app/locale/ar/LC_MESSAGES/messages.po
diff --git a/site/app/locale/ca/LC_MESSAGES/messages.po b/site/app/locale/ca/LC_MESSAGES/messages.po
index 02bf73d..36cf1c2 100644
--- a/site/app/locale/ca/LC_MESSAGES/messages.po
+++ b/site/app/locale/ca/LC_MESSAGES/messages.po
@@ -5542,6 +5542,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "SeaMonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -6937,7 +6941,3 @@ msgstr "Registre d'un nou usuari"
 #~ msgstr ""
 #~ "Si us és difícil de llegir, podeu <a href=\"%1$s\">provar diverses "
 #~ "paraules</a> o bé en comptes d'això <a href=\"%2$s\">escoltar números</a>."
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/cy/LC_MESSAGES/messages.po b/site/app/locale/cy/LC_MESSAGES/messages.po
index e3ef8f3..9fd6dc9 100644
--- a/site/app/locale/cy/LC_MESSAGES/messages.po
+++ b/site/app/locale/cy/LC_MESSAGES/messages.po
@@ -5633,6 +5633,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "SeaMonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -7069,7 +7073,3 @@ msgstr "Cofrestru defnyddiwr Newydd"
 
 #~ msgid "search_form_submit"
 #~ msgstr "Chwilio"
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/da/LC_MESSAGES/messages.po b/site/app/locale/da/LC_MESSAGES/messages.po
index f59bd1d..1729a23 100644
--- a/site/app/locale/da/LC_MESSAGES/messages.po
+++ b/site/app/locale/da/LC_MESSAGES/messages.po
@@ -3927,6 +3927,11 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "SeaMonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
+#: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
 
@@ -4954,7 +4959,3 @@ msgstr "Nulstilling af adgangskode"
 
 msgid "users_register_pagetitle"
 msgstr "Registrering af ny bruger"
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/de/LC_MESSAGES/messages.po b/site/app/locale/de/LC_MESSAGES/messages.po
index a97ec7a..5255af8 100644
--- a/site/app/locale/de/LC_MESSAGES/messages.po
+++ b/site/app/locale/de/LC_MESSAGES/messages.po
@@ -5532,6 +5532,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "SeaMonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -6938,7 +6942,3 @@ msgstr "Benutzerkonto anlegen"
 #~ "Falls dies schwer zu lesen ist, können Sie sich <a href=\"%1$s\">andere "
 #~ "Wörter anzeigen lassen</a> oder sich stattdessen <a href=\"%2$s\">Zahlen "
 #~ "ansagen lassen</a>."
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/el/LC_MESSAGES/messages.po b/site/app/locale/el/LC_MESSAGES/messages.po
index 65c06be..448393c 100644
--- a/site/app/locale/el/LC_MESSAGES/messages.po
+++ b/site/app/locale/el/LC_MESSAGES/messages.po
@@ -608,8 +608,8 @@ msgstr ""
 "<ol><li>κάντε δεξί κλικ παρακάτω και επιλέξτε «Αποθήκευση δεσμού ως...» για "
 "να αποθηκεύσετε το αρχείο στο δίσκο σας.</li><li>Στον Mozilla Thunderbird, "
 "ανοίξτε τα «Πρόσθετα» μέσα από το μενού «Εργαλεία».</li><li>Κάντε κλικ στο "
-"κουμπί «Εγκατάσταση» και αφού εντοπίσετε/επιλέξετε το αρχείο που "
-"αποθηκεύσατε κάντε κλικ στο «OK».</li></ol>"
+"κουμπί «Εγκατάσταση» και αφού εντοπίσετε/επιλέξετε το αρχείο που αποθηκεύσατε "
+"κάντε κλικ στο «OK».</li></ol>"
 
 #: views/elements/install.thtml:101
 msgid "addons_install_in_thunderbird_title"
@@ -4985,6 +4985,14 @@ msgstr "Αφαίρεση σημείωσης - Διατήρηση αξιολόγ�
 msgid "editors_reviews_action_skip"
 msgstr "Παράβλεψη"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
+#: config/bootstrap.php:276
+msgid "main_prettyname_sunbird"
+msgstr "Sunbird"
+
 #: views/editors/reviews_queue.thtml:100
 msgid "editors_reviews_header_action"
 msgstr "Ενέργεια"
@@ -5620,11 +5628,23 @@ msgstr "Sunbird"
 msgid "main_prettyname_thunderbird"
 msgstr "Thunderbird"
 
+<<<<<<< HEAD:site/app/locale/el/LC_MESSAGES/messages.po
 #: views/elements/addon_categories.thtml:53
 #: views/elements/addon_categories.thtml:54 controllers/components/amo.php:680
 #: controllers/components/amo.php:682
 msgid "nav_category_dicts_langpacks"
 msgstr "Λεξικά & πακέτα γλωσσών"
+=======
+# %1 is the link to the "resend confirmation code" page
+#: views/users/activatefirst.thtml:51
+#, php-format
+msgid "user_register_resend_confirmation_link"
+msgstr ""
+"Αν δε λάβατε το μήνυμα επιβεβαίωσης, σιγουρευτείτε πως η υπηρεσία ηλ. "
+"ταχυδρομείου που χρησιμοποιείτε δεν το σημείωσε ως «ανεπιθύμητο» ή «spam». Αν "
+"χρειάζεται, μπορούμε να κάνουμε  %1$s στη διεύθυνση ηλ. ταχυδρομείου που "
+"αναφέρθηκε παραπάνω."
+>>>>>>> merged w/ en_US and compiled.:site/app/locale/el/LC_MESSAGES/messages.po
 
 #: controllers/components/amo.php:715 controllers/components/amo.php:717
 msgid "nav_category_plugins"
@@ -7047,7 +7067,3 @@ msgstr "Εγγραφή νέου χρήστη"
 
 #~ msgid "sidebar_navlink_tools"
 #~ msgstr "Tools"
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/es_ES/LC_MESSAGES/messages.po b/site/app/locale/es_ES/LC_MESSAGES/messages.po
index e4218ff..8b71853 100644
--- a/site/app/locale/es_ES/LC_MESSAGES/messages.po
+++ b/site/app/locale/es_ES/LC_MESSAGES/messages.po
@@ -5551,6 +5551,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "SeaMonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -6945,7 +6949,3 @@ msgstr "Registro de nuevo usuario"
 #~ msgstr ""
 #~ "Por favor, introduce los <strong>números</strong> que estás escuchando a "
 #~ "continuación."
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/eu/LC_MESSAGES/messages.po b/site/app/locale/eu/LC_MESSAGES/messages.po
index 031e661..6ad410d 100644
--- a/site/app/locale/eu/LC_MESSAGES/messages.po
+++ b/site/app/locale/eu/LC_MESSAGES/messages.po
@@ -5036,6 +5036,25 @@ msgstr ""
 "Notify me the next time this add-on is updated. (Subsequent updates will not "
 "generate an email)"
 
+msgid "main_prettyname_fennec"
+msgstr "Fennec"
+
+#: config/bootstrap.php:274
+msgid "main_prettyname_firefox"
+msgstr "Firefox"
+
+#: config/bootstrap.php:277
+msgid "main_prettyname_seamonkey"
+msgstr "Seamonkey"
+
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
+#: config/bootstrap.php:276
+msgid "main_prettyname_sunbird"
+msgstr "Sunbird"
+
 #: controllers/editors_controller.php:422
 msgid "editors_reviewed_successfully"
 msgstr "Berrikuspena arrakastaz prozesatu da."
@@ -7157,7 +7176,3 @@ msgstr "Erabiltzaile berriaren harpidetza"
 
 #~ msgid "sidebar_navlink_tools"
 #~ msgstr "Tresnak"
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/fa/LC_MESSAGES/messages.po b/site/app/locale/fa/LC_MESSAGES/messages.po
index e8fc6cd..db89cb8 100644
--- a/site/app/locale/fa/LC_MESSAGES/messages.po
+++ b/site/app/locale/fa/LC_MESSAGES/messages.po
@@ -5488,6 +5488,10 @@ msgstr "فایرفاکس"
 msgid "main_prettyname_seamonkey"
 msgstr "سی‌مانکی"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "سان‌برد"
@@ -5697,8 +5701,8 @@ msgstr ""
 "<p>این ترفندها را در ذهن داشته باشید:</p><ul><li>طوری بنویسید که انگار تجربهٔ "
 "خود از این افزودنی را برای یک دوست تعریف می‌کنید. نکات ریز و جزئیات مفید "
 "مانند ویژگی‌هایی که دوست داشتید یا دوست نداشتید، آسانی استفاده از آن، و "
-"معابیش را بیان کنید.  از کلی‌گویی و «عالی» یا «بد» خواندن افزودنی بپرهیزید "
-"مگر آن که دلایل نظر خود را نیز بیان کنید.</li><li>لطفاً گزارش مشکلات را در "
+"معابیش را بیان کنید.  از کلی‌گویی و «عالی» یا «بد» خواندن افزودنی بپرهیزید مگر "
+"آن که دلایل نظر خود را نیز بیان کنید.</li><li>لطفاً گزارش مشکلات را در "
 "بررسی‌ها ارسال نکنید. ما نشانی پست الکترونیکی شما را در اختیار توسعه‌دهندگان "
 "افزودنی قرار نمی‌دهیم و ممکن است آنها نیاز داشته باشند با شما تماس بگیرند تا "
 "به رفع مشکلتان کمک کنند. از <a href=\"%1$s\">بخش پشتیبانی </a> برای کمک "
@@ -6364,8 +6368,8 @@ msgstr "در صورتی که سؤال دیگری دارید، با %1$s تماس
 #: views/users/delete.thtml:74
 msgid "user_del_error_checkbox"
 msgstr ""
-"برای آن که بتوانیم حساب کاربری شما را حذف کنیم، باید گزینهٔ «متوجه هستم "
-"که...» را فعال کنید."
+"برای آن که بتوانیم حساب کاربری شما را حذف کنیم، باید گزینهٔ «متوجه هستم که...» "
+"را فعال کنید."
 
 #: views/users/delete.thtml:78
 msgid "user_del_error_password"
@@ -6849,7 +6853,3 @@ msgstr "ثبت نام کاربر جدید"
 
 #~ msgid "search_form_submit"
 #~ msgstr "جستجو"
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/fi/LC_MESSAGES/messages.po b/site/app/locale/fi/LC_MESSAGES/messages.po
index a392238..0d861c5 100644
--- a/site/app/locale/fi/LC_MESSAGES/messages.po
+++ b/site/app/locale/fi/LC_MESSAGES/messages.po
@@ -5036,6 +5036,14 @@ msgstr "Ohita"
 msgid "editors_reviews_header_action"
 msgstr "Toiminto"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
+#: config/bootstrap.php:276
+msgid "main_prettyname_sunbird"
+msgstr "Sunbird"
+
 #: views/editors/reviews_queue.thtml:67
 msgid "editors_reviews_in_reply_to"
 msgstr "Vastauksena kysymykseen:"
@@ -7104,7 +7112,3 @@ msgstr "Uuden käyttäjän rekisteröityminen"
 
 #~ msgid "sidebar_navlink_tools"
 #~ msgstr "Tools"
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/fr/LC_MESSAGES/messages.po b/site/app/locale/fr/LC_MESSAGES/messages.po
index 9785745..3b0dcad 100644
--- a/site/app/locale/fr/LC_MESSAGES/messages.po
+++ b/site/app/locale/fr/LC_MESSAGES/messages.po
@@ -4935,6 +4935,14 @@ msgstr "Suprimer le marquage, garder la critique"
 msgid "editors_reviews_action_skip"
 msgstr "Passer"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
+#: config/bootstrap.php:276
+msgid "main_prettyname_sunbird"
+msgstr "Sunbird"
+
 #: views/editors/reviews_queue.thtml:100
 msgid "editors_reviews_header_action"
 msgstr "Action"
@@ -6967,8 +6975,11 @@ msgstr "Inscription d'un nouvel utilisateur"
 #~ "Mot de passe : %3$s\n"
 #~ "Merci de participer à Mozilla Addons\n"
 #~ "-- L'équipe de Mozilla Add-ons"
+<<<<<<< HEAD:site/app/locale/fr/LC_MESSAGES/messages.po
 
 # : config/bootstrap.php:279
 msgid "main_prettyname_sugar"
 msgstr "Sugar"
 
+=======
+>>>>>>> merged w/ en_US and compiled.:site/app/locale/fr/LC_MESSAGES/messages.po
diff --git a/site/app/locale/fy_NL/LC_MESSAGES/messages.po b/site/app/locale/fy_NL/LC_MESSAGES/messages.po
index cb187d0..fcaef13 100644
--- a/site/app/locale/fy_NL/LC_MESSAGES/messages.po
+++ b/site/app/locale/fy_NL/LC_MESSAGES/messages.po
@@ -6222,6 +6222,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "SeaMonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 #, fuzzy
 msgid "main_prettyname_sunbird"
@@ -7875,7 +7879,3 @@ msgstr "New User Registration"
 #~ msgstr ""
 #~ "If this is hard to read, you can <a href=\"%1$s\">try different words</a> "
 #~ "or <a href=\"%2$s\">listen to numbers</a> instead."
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/ga_IE/LC_MESSAGES/messages.po b/site/app/locale/ga_IE/LC_MESSAGES/messages.po
index f8c7e4e..e9dee07 100644
--- a/site/app/locale/ga_IE/LC_MESSAGES/messages.po
+++ b/site/app/locale/ga_IE/LC_MESSAGES/messages.po
@@ -5629,6 +5629,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "SeaMonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -7027,7 +7031,3 @@ msgstr "Clárú Úsáideora Nua"
 
 #~ msgid "search_form_submit"
 #~ msgstr "Search"
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/he/LC_MESSAGES/messages.po b/site/app/locale/he/LC_MESSAGES/messages.po
index 64693af..b12f37e 100644
--- a/site/app/locale/he/LC_MESSAGES/messages.po
+++ b/site/app/locale/he/LC_MESSAGES/messages.po
@@ -5549,6 +5549,10 @@ msgstr "פיירפוקס"
 msgid "main_prettyname_seamonkey"
 msgstr "סימונקי"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "סאנבירד"
@@ -6953,7 +6957,3 @@ msgstr "הרשמת משתמש חדש"
 #~ msgstr ""
 #~ "אם זה קשה לקרוא, אתה יכול <a href=\"%1$s\">לנסות מילים שונות</a> או <a "
 #~ "href=\"%2$s\">לשמוע מספרים</a>במקום."
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/hu/LC_MESSAGES/messages.po b/site/app/locale/hu/LC_MESSAGES/messages.po
index 98bea09..5de72c2 100644
--- a/site/app/locale/hu/LC_MESSAGES/messages.po
+++ b/site/app/locale/hu/LC_MESSAGES/messages.po
@@ -5590,6 +5590,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "SeaMonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
diff --git a/site/app/locale/id/LC_MESSAGES/messages.po b/site/app/locale/id/LC_MESSAGES/messages.po
index 4b61fd2..359dc36 100644
--- a/site/app/locale/id/LC_MESSAGES/messages.po
+++ b/site/app/locale/id/LC_MESSAGES/messages.po
@@ -4842,6 +4842,14 @@ msgstr "Tidak ada pratinjau ditemukan."
 msgid "editors_review_previous_link"
 msgstr "&laquo; sebelumnya"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
+#: config/bootstrap.php:276
+msgid "main_prettyname_sunbird"
+msgstr "Sunbird"
+
 #: controllers/editors_controller.php:149
 #: controllers/editors_controller.php:151
 msgid "editors_review_queue_pagetitle"
@@ -6896,8 +6904,11 @@ msgstr "Pendaftaran Pengguna Baru"
 
 #~ msgid "sidebar_navlink_tools"
 #~ msgstr "Perangkat"
+<<<<<<< HEAD:site/app/locale/id/LC_MESSAGES/messages.po
 
 # : config/bootstrap.php:279
 msgid "main_prettyname_sugar"
 msgstr "Sugar"
 
+=======
+>>>>>>> merged w/ en_US and compiled.:site/app/locale/id/LC_MESSAGES/messages.po
diff --git a/site/app/locale/it/LC_MESSAGES/messages.po b/site/app/locale/it/LC_MESSAGES/messages.po
index 93be936..87c1020 100644
--- a/site/app/locale/it/LC_MESSAGES/messages.po
+++ b/site/app/locale/it/LC_MESSAGES/messages.po
@@ -5259,6 +5259,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "SeaMonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -6589,7 +6593,3 @@ msgstr "Registrazione nuovo utente"
 
 #~ msgid "recaptcha_enter_numbers"
 #~ msgstr "Inserisci di seguito i <strong>numeri</strong> che hai ascoltato."
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/ja/LC_MESSAGES/messages.po b/site/app/locale/ja/LC_MESSAGES/messages.po
index 1c1c3f1..26967a1 100644
--- a/site/app/locale/ja/LC_MESSAGES/messages.po
+++ b/site/app/locale/ja/LC_MESSAGES/messages.po
@@ -5204,6 +5204,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "SeaMonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -6562,4 +6566,3 @@ msgstr "ユーザ登録"
 # : config/bootstrap.php:279
 msgid "main_prettyname_sugar"
 msgstr "Sugar"
-
diff --git a/site/app/locale/ko/LC_MESSAGES/messages.po b/site/app/locale/ko/LC_MESSAGES/messages.po
index 94f1293..835f95f 100644
--- a/site/app/locale/ko/LC_MESSAGES/messages.po
+++ b/site/app/locale/ko/LC_MESSAGES/messages.po
@@ -4986,6 +4986,13 @@ msgid "editors_reviews_action_delete_review"
 msgstr "Delete review"
 
 #: views/editors/reviews_queue.thtml:104
+
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
+#: config/bootstrap.php:276
+
 #, fuzzy
 msgid "editors_reviews_action_keep"
 msgstr "Remove flags; keep review"
@@ -7044,7 +7051,3 @@ msgstr "새 사용자 등록"
 
 #~ msgid "sidebar_navlink_tools"
 #~ msgstr "Tools"
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/mn/LC_MESSAGES/messages.po b/site/app/locale/mn/LC_MESSAGES/messages.po
index ad51281..95e76a4 100644
--- a/site/app/locale/mn/LC_MESSAGES/messages.po
+++ b/site/app/locale/mn/LC_MESSAGES/messages.po
@@ -4996,6 +4996,14 @@ msgstr "Алгас"
 msgid "editors_reviews_header_action"
 msgstr "Үйлдэл"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
+#: config/bootstrap.php:276
+msgid "main_prettyname_sunbird"
+msgstr "Sunbird"
+
 #: views/editors/reviews_queue.thtml:67
 msgid "editors_reviews_in_reply_to"
 msgstr "Хариу:"
@@ -7043,7 +7051,3 @@ msgstr "Шинэ хэрэглэгчийн бүртгэл"
 
 #~ msgid "sidebar_navlink_tools"
 #~ msgstr "Хэрэгслүүд"
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/nl/LC_MESSAGES/messages.po b/site/app/locale/nl/LC_MESSAGES/messages.po
index 2010841..ebf31b1 100644
--- a/site/app/locale/nl/LC_MESSAGES/messages.po
+++ b/site/app/locale/nl/LC_MESSAGES/messages.po
@@ -5518,6 +5518,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "SeaMonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -6911,7 +6915,3 @@ msgstr "Nieuwe gebruikersregistratie"
 #~ msgstr ""
 #~ "Indien dit moeilijk te lezen is, kunt u <a href=\"%1$s\">andere woorden "
 #~ "proberen</a> of <a href=\"%2$s\">naar getallen luisteren</a>."
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/pl/LC_MESSAGES/messages.po b/site/app/locale/pl/LC_MESSAGES/messages.po
index 6202748..34df2af 100644
--- a/site/app/locale/pl/LC_MESSAGES/messages.po
+++ b/site/app/locale/pl/LC_MESSAGES/messages.po
@@ -5551,6 +5551,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "SeaMonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -6924,5 +6928,4 @@ msgstr "Rejestracja nowego użytkownika"
 
 # : config/bootstrap.php:279
 msgid "main_prettyname_sugar"
-msgstr "Sugar"
-
+msgstr "Sugar"
\ No newline at end of file
diff --git a/site/app/locale/pt_BR/LC_MESSAGES/messages.po b/site/app/locale/pt_BR/LC_MESSAGES/messages.po
index fc76133..cc2621a 100644
--- a/site/app/locale/pt_BR/LC_MESSAGES/messages.po
+++ b/site/app/locale/pt_BR/LC_MESSAGES/messages.po
@@ -4990,6 +4990,14 @@ msgstr "Pular"
 msgid "editors_reviews_header_action"
 msgstr "Ação"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
+#: config/bootstrap.php:276
+msgid "main_prettyname_sunbird"
+msgstr "Sunbird"
+
 #: views/editors/reviews_queue.thtml:67
 msgid "editors_reviews_in_reply_to"
 msgstr "Em resposta a:"
@@ -7029,7 +7037,3 @@ msgstr "Registro de novo usuário"
 
 #~ msgid "sidebar_navlink_tools"
 #~ msgstr "Ferramentas"
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/pt_PT/LC_MESSAGES/messages.po b/site/app/locale/pt_PT/LC_MESSAGES/messages.po
index b21fc6a..b2cadcc 100644
--- a/site/app/locale/pt_PT/LC_MESSAGES/messages.po
+++ b/site/app/locale/pt_PT/LC_MESSAGES/messages.po
@@ -5253,6 +5253,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "SeaMonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -6586,7 +6590,3 @@ msgstr "Registo de Novo Utilizador"
 
 #~ msgid "search_form_submit"
 #~ msgstr "Pesquisar"
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/ro/LC_MESSAGES/messages.po b/site/app/locale/ro/LC_MESSAGES/messages.po
index e0523fe..47e1cef 100644
--- a/site/app/locale/ro/LC_MESSAGES/messages.po
+++ b/site/app/locale/ro/LC_MESSAGES/messages.po
@@ -5054,6 +5054,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "Seamonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -6793,7 +6797,3 @@ msgstr "Înregistrare utilizator nou"
 #, fuzzy
 #~ msgid "search_form_submit"
 #~ msgstr "Search"
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/ru/LC_MESSAGES/messages.po b/site/app/locale/ru/LC_MESSAGES/messages.po
index cbe72af..c02b085 100644
--- a/site/app/locale/ru/LC_MESSAGES/messages.po
+++ b/site/app/locale/ru/LC_MESSAGES/messages.po
@@ -5015,6 +5015,14 @@ msgstr "Для определённого сайта"
 msgid "editors_submissiontype_new"
 msgstr "Новое"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
+#: config/bootstrap.php:276
+msgid "main_prettyname_sunbird"
+msgstr "Sunbird"
+
 #: controllers/editors_controller.php:232
 msgid "editors_submissiontype_updated"
 msgstr "Обновлено"
@@ -5679,9 +5687,21 @@ msgstr "Политика дополнений"
 msgid "page_title_privacy"
 msgstr "Политика приватности Mozilla"
 
+<<<<<<< HEAD:site/app/locale/ru/LC_MESSAGES/messages.po
 #: controllers/pages_controller.php:105
 msgid "page_title_review_guide"
 msgstr "Чем следует руководствоваться при составлении рецензии"
+=======
+# %1 is the link to the sandbox/policy explanation page
+# This message is for a specific add-on not found
+#: views/users/login.thtml:53
+#, php-format
+msgid "users_login_sandbox_display_warning"
+msgstr ""
+"Дополнение, которое вы ищете, находится в данный момент в «песочнице». Если у "
+"вас уже есть учётная запись на Mozilla Add-ons, пожалуйста войдите в систему "
+"или <a href=\"%1$s\">почитайте больше о «песочнице»</a>."
+>>>>>>> merged w/ en_US and compiled.:site/app/locale/ru/LC_MESSAGES/messages.po
 
 #: controllers/pages_controller.php:107
 msgid "page_title_sandbox"
@@ -5889,9 +5909,16 @@ msgstr "поиск дополнений"
 msgid "search_form_submit_tooltip"
 msgstr "Поиск дополнений"
 
+<<<<<<< HEAD:site/app/locale/ru/LC_MESSAGES/messages.po
 #: views/elements/search.thtml:182
 msgid "search_form_tooltip"
 msgstr "Щёлкните, чтобы ввести запрос на поиск"
+=======
+#~ msgid "addons_display_sandbox_pref_warning"
+#~ msgstr ""
+#~ "Дополнение, которое вы ищете, находится в «песочнице», которая не включена "
+#~ "в ваших настройках."
+>>>>>>> merged w/ en_US and compiled.:site/app/locale/ru/LC_MESSAGES/messages.po
 
 #: views/elements/search.thtml:184
 msgid "search_form_within"
@@ -7036,7 +7063,3 @@ msgstr "Регистрация нового пользователя"
 
 #~ msgid "this page"
 #~ msgstr "эта страница"
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/sk/LC_MESSAGES/messages.po b/site/app/locale/sk/LC_MESSAGES/messages.po
index 0c7c7e1..f2c8e36 100644
--- a/site/app/locale/sk/LC_MESSAGES/messages.po
+++ b/site/app/locale/sk/LC_MESSAGES/messages.po
@@ -5191,6 +5191,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "SeaMonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -6547,7 +6551,3 @@ msgstr "Registrácia nového používateľa"
 
 #~ msgid "recaptcha_enter_numbers"
 #~ msgstr "Zadajte <strong>čísla</strong>, ktoré počujete."
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/sq/LC_MESSAGES/messages.po b/site/app/locale/sq/LC_MESSAGES/messages.po
index a95f9a7..fcc66fd 100644
--- a/site/app/locale/sq/LC_MESSAGES/messages.po
+++ b/site/app/locale/sq/LC_MESSAGES/messages.po
@@ -5510,6 +5510,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "SeaMonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -6882,9 +6886,8 @@ msgstr "Regjistrim Përdoruesi të Ri"
 #~ msgstr "Post to MySpace"
 
 #~ msgid "recaptcha_enter_numbers"
-#~ msgstr "Ju lutem jepni më poshtë <strong>numrat</strong> që po dëgjoni."
+#~ msgstr "Ju lutem jepni më poshtë <strong>numrat</strong> që po dëgjoni."K
 
 # : config/bootstrap.php:279
 msgid "main_prettyname_sugar"
 msgstr "Sugar"
-
diff --git a/site/app/locale/sv_SE/LC_MESSAGES/messages.po b/site/app/locale/sv_SE/LC_MESSAGES/messages.po
index 5141501..8ef7340 100644
--- a/site/app/locale/sv_SE/LC_MESSAGES/messages.po
+++ b/site/app/locale/sv_SE/LC_MESSAGES/messages.po
@@ -5567,6 +5567,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "SeaMonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -6985,4 +6989,3 @@ msgstr "Registrering av ny användare"
 # : config/bootstrap.php:279
 msgid "main_prettyname_sugar"
 msgstr "Sugar"
-
diff --git a/site/app/locale/tr/LC_MESSAGES/messages.po b/site/app/locale/tr/LC_MESSAGES/messages.po
index ba7e620..c0b6d4c 100644
--- a/site/app/locale/tr/LC_MESSAGES/messages.po
+++ b/site/app/locale/tr/LC_MESSAGES/messages.po
@@ -5224,6 +5224,15 @@ msgstr "Remove flags; keep review"
 msgid "editors_reviews_action_skip"
 msgstr "Skip"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
+#: config/bootstrap.php:276
+#, fuzzy
+msgid "main_prettyname_sunbird"
+msgstr "Sunbird"
+
 #: views/editors/reviews_queue.thtml:100
 msgid "editors_reviews_header_action"
 msgstr "Action"
@@ -7504,7 +7513,3 @@ msgstr "Yeni Kullanıcı Kaydı"
 #~ "Şifre: %3$s\n"
 #~ "Mozilla Eklentilerine katıldığınız için teşekkürler\n"
 #~ "-- Mozilla Eklentileri Yönetimi"
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/uk/LC_MESSAGES/messages.po b/site/app/locale/uk/LC_MESSAGES/messages.po
index f9d5259..cb021b2 100644
--- a/site/app/locale/uk/LC_MESSAGES/messages.po
+++ b/site/app/locale/uk/LC_MESSAGES/messages.po
@@ -5562,6 +5562,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "SeaMonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -6979,7 +6983,3 @@ msgstr "Реєстрація нового користувача"
 
 #~ msgid "search_form_submit"
 #~ msgstr "Шукати"
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/vi/LC_MESSAGES/messages.po b/site/app/locale/vi/LC_MESSAGES/messages.po
index 58fe361..3fed948 100644
--- a/site/app/locale/vi/LC_MESSAGES/messages.po
+++ b/site/app/locale/vi/LC_MESSAGES/messages.po
@@ -5504,6 +5504,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "SeaMonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -6869,4 +6873,3 @@ msgstr "Đăng kí Người dùng Mới"
 # : config/bootstrap.php:279
 msgid "main_prettyname_sugar"
 msgstr "Sugar"
-
diff --git a/site/app/locale/zh_CN/LC_MESSAGES/messages.po b/site/app/locale/zh_CN/LC_MESSAGES/messages.po
index 63f8a23..bc9629e 100644
--- a/site/app/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/site/app/locale/zh_CN/LC_MESSAGES/messages.po
@@ -5530,6 +5530,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "SeaMonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -6895,4 +6899,3 @@ msgstr "新用户注册"
 # : config/bootstrap.php:279
 msgid "main_prettyname_sugar"
 msgstr "Sugar"
-
diff --git a/site/app/locale/zh_TW/LC_MESSAGES/messages.po b/site/app/locale/zh_TW/LC_MESSAGES/messages.po
index 48c2d05..dbbb4ca 100644
--- a/site/app/locale/zh_TW/LC_MESSAGES/messages.po
+++ b/site/app/locale/zh_TW/LC_MESSAGES/messages.po
@@ -5503,6 +5503,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "SeaMonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -6865,4 +6869,3 @@ msgstr "新使用者註冊"
 # : config/bootstrap.php:279
 msgid "main_prettyname_sugar"
 msgstr "Sugar"
-