Skip to content

Commit 700c10c

Browse files
committed
Merge remote-tracking branch 'origin/develop' into feature/recent-pins
2 parents 2668978 + 3c0aea1 commit 700c10c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+4066
-1547
lines changed

LICENSE.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
GNU AFFERO GENERAL PUBLIC LICENSE
22
Version 3, 19 November 2007
33

4-
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
4+
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
55
Everyone is permitted to copy and distribute verbatim copies
66
of this license document, but changing it is not allowed.
77

@@ -643,7 +643,7 @@ the "copyright" line and a pointer to where the full notice is found.
643643
GNU Affero General Public License for more details.
644644

645645
You should have received a copy of the GNU Affero General Public License
646-
along with this program. If not, see <http://www.gnu.org/licenses/>.
646+
along with this program. If not, see <https://www.gnu.org/licenses/>.
647647

648648
Also add information on how to contact you by electronic and paper mail.
649649

@@ -658,4 +658,4 @@ specific requirements.
658658
You should also get your employer (if you work as a programmer) or school,
659659
if any, to sign a "copyright disclaimer" for the program, if necessary.
660660
For more information on this, and how to apply and follow the GNU AGPL, see
661-
<http://www.gnu.org/licenses/>.
661+
<https://www.gnu.org/licenses/>.

common/loginpage/locale/ar-SA.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ l10n.ar_SA = {
6666
licPanelDescr: 'تم إرسال مفتاح المنتج الخاص بك لبريدك الإلكتروني المُدخل أثناء عملية الشراء',
6767
checkUpdates: 'التحقق من التحديثات',
6868
strVersion: 'نسخة',
69+
strVersionCommunity: 'النسخة المجتمعية (“Community”)',
70+
strVersionCommercial: 'النسخة التجارية',
6971
emptySlide1Title: 'نشر وتعاون',
7072
emptySlide1Text: 'اختر بين تحرير مشترك سريع أو تحرير مشترك بالوفت الفعلي، تحدّث في المستند، أضف التعليقات أو انشرها ليتم مراجعتها.',
7173
emptySlide2Title: 'اعرض أو استرجع النسخ السابقة',

common/loginpage/locale/be.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ l10n.be = {
6464
licPanelDescr: 'Ваш ключ прадукту быў адпраўлены на адрас электроннай пошты, пазначаны падчас куплі.',
6565
checkUpdates: 'Праверыць на наяўнасць абнаўленняў',
6666
strVersion: 'версія',
67+
strVersionCommunity: 'Версія Community',
68+
strVersionCommercial: 'Камерцыйная версія',
6769
emptySlide1Title: 'Адкрыццё доступу і сумесная праца',
6870
emptySlide1Text: 'Выкарыстоўвайце хуткі або строгі рэжым сумеснага рэдагавання, карыстайцеся чатам, дадавайце каментары або адпраўляйце дакументы на перагляд.',
6971
emptySlide2Title: 'Прагляд або аднаўленне папярэдніх версій',

common/loginpage/locale/bg.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ l10n.bg = {
6464
licPanelDescr: 'Вашият продуктов ключ е изпратен на имейл адреса, посочен при покупката.',
6565
checkUpdates: 'Провери за актуализации',
6666
strVersion: 'версия',
67+
strVersionCommunity: 'Версия Community',
68+
strVersionCommercial: 'Търговска версия',
6769
emptySlide1Title: 'Спеделяй и си сътрудничи',
6870
emptySlide1Text: 'Изберете между бързо или стриктно съвместно редактиране в реално време, чатете в своя документ, добавете коментари или го споделете за преглед.',
6971
emptySlide2Title: 'Преглед или възстановяване на предишни версии',

common/loginpage/locale/ca.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ l10n.ca = {
6464
licPanelDescr: 'La vostra clau de producte s\'ha enviat a l\'adreça de correu electrònic especificada durant la compra.',
6565
checkUpdates: 'Cercar actualitzacions',
6666
strVersion: 'versió',
67+
strVersionCommunity: 'Versió comunitària',
68+
strVersionCommercial: 'Versió comercial',
6769
emptySlide1Title: 'Compartir i col·laborar',
6870
emptySlide1Text: 'Trieu entre una coedició ràpida o estricta en temps real, xatejar al document, afegir comentaris o compartir per a la seva revisió.',
6971
emptySlide2Title: 'Veure o restaurar les versions anteriors',

common/loginpage/locale/cs.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ l10n.cs = {
6464
licPanelDescr: 'Produktový klíč byl odeslán na e-mailovou adresu zadanou při nákupu.',
6565
checkUpdates: 'Kontrola aktualizací',
6666
strVersion: 'verze',
67+
strVersionCommunity: 'Komunitní verze',
68+
strVersionCommercial: 'Komerční verze',
6769
emptySlide1Title: 'Sdílejte a spolupracujte',
6870
emptySlide1Text: 'Vyberte si mezi rychlou nebo podrobnou spolu-úpravou v reálném čase, chatujte přímo v dokumentu, přidávejte či sdílejte dokumenty pro kontrolu.',
6971
emptySlide2Title: 'Zobrazte si nebo obnovte předchozí verze',

common/loginpage/locale/da.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ l10n.da = {
6464
licPanelDescr: 'Din produktnøgle blev sendt til emailaddressen specificeret under købet.',
6565
checkUpdates: 'Tjek for opdateringer',
6666
strVersion: 'version',
67+
strVersionCommunity: 'Fællesskabsversion',
68+
strVersionCommercial: 'Kommerciel version',
6769
emptySlide1Title: 'Del & kollaborer',
6870
emptySlide1Text: 'Vælg mellem Hurtig eller Streng co-redigering i realtid, chat i din doc, tilføj kommentarer eller del det for bedømmelse.',
6971
emptySlide2Title: 'Se eller gendan tidligere versioner',

common/loginpage/locale/de.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ l10n.de = {
6666
licPanelDescr: 'Ihr Produktschlüssel wurde an die E-Mail-Adresse zugeschickt, die Sie beim Kauf angegeben haben.',
6767
checkUpdates: 'Nach Updates suchen',
6868
strVersion: 'Version',
69+
strVersionCommunity: 'Community-Version',
70+
strVersionCommercial: 'Kommerzielle Version',
6971
emptySlide1Title: 'Freigabe & Zusammenarbeit',
7072
emptySlide1Text: 'Wählen Sie zwischen zwei Modis (Formal / Halbformal) für die Bearbeitung in Echtzeit, chatten und kommentieren Sie direkt im Dokument oder teilen Sie Ihre Dokumente zur Überprüfung.',
7173
emptySlide2Title: 'Anzeigen oder Wiederherstellen der früheren Versionen',

common/loginpage/locale/el.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ l10n.el = {
6464
licPanelDescr: 'Ο κωδικός προϊόντος σας στάλθηκε στη διεύθυνση email που καθορίστηκε κατά την αγορά.',
6565
checkUpdates: 'Έλεγχος για ενημερώσεις',
6666
strVersion: 'έκδοση',
67+
strVersionCommunity: 'Κοινοτική Έκδοση',
68+
strVersionCommercial: 'Εμπορική Έκδοση',
6769
emptySlide1Title: 'Κοινοποίηση & Συνεργασία',
6870
emptySlide1Text: 'Επιλέξτε μεταξύ γρήγορης ή αυστηρής συνεπεξεργασίας σε πραγματικό χρόνο, συνομιλήστε στο έγγραφό σας, προσθέστε σχόλια ή μοιραστείτε το για έλεγχο.',
6971
emptySlide2Title: 'Προβολή ή επαναφορά προηγούμενων εκδόσεων',

common/loginpage/locale/en-GB.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ l10n.en_GB = {
6767
licPanelDescr: 'Your product key was sent to the email address specified during the purchase.',
6868
checkUpdates: 'Check for updates',
6969
strVersion: 'version',
70+
strVersionCommunity: 'Community version',
71+
strVersionCommercial: 'Commercial version',
7072
emptySlide1Title: 'Share & collaborate',
7173
emptySlide1Text: 'Choose between Fast or Strict real-time co-editing, chat in your doc, add comments or share it for review.',
7274
emptySlide2Title: 'View or restore previous versions',

0 commit comments

Comments
 (0)