Merge Translations

notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_ar.properties

@@ -10,7 +10,7 @@ notes.menu.label.delete=حذف
 notes.menu.label.copyLink=نسخ الرابط
 notes.menu.label.movePage=نقل صفحة
 notes.menu.label.exportPdf=تصدير إلى PDF
-notes.menu.label.export=تصدير إلى PDF
+notes.menu.label.export=Export
 notes.menu.label.noteHistory=تاريخ الملاحظة
 notes.button.import=استيراد
 
@@ -24,9 +24,9 @@ notes.label.importRules1=استبدال جميع المعلومات
 notes.label.importRules2=تحديث الملاحضات الموجودة
 notes.label.importRules3=تكرار المعلومات الموجودة
 notes.label.importRules4=استبدال الملاحضات الحالية
-notes.label.importRulesMessage.title=قواعد إدارة التعارض
+notes.label.importRulesMessage.title=Replace existing notes
 notes.label.importRulesMessage.text=سوف يحدث تنازع في التحديث عندما يتم استيراد ملاحظة بنفس الاسم والأصل لملاحظة الخروج في شجرة الوجهة
-notes.label.importRulesAlert.text=Warning : the chosen rule applies for all conflicts of this import\n
+notes.label.importRulesAlert.text=Warning: the chosen rule applies for all conflicts of this import
 notes.label.button.continue=واصل
 notes.label.button.back=رجوع
 notes.label.importNotes.upload=تحميل
@@ -45,7 +45,7 @@ notes.button.updateAndPost=التحديث والنشر
 notes.button.ok=موافق
 notes.button.loadMore=تحميل المزيد
 notes.label.drop.draft=حذفها
-notes.composer.createNotes=كتابة ملاحظة لـ {0}
+notes.composer.createNotes=Create
 notes.edit.editNotes=تعديل الملاحظة
 notes.edit.editTextFor=تحرير مربع النص {0}
 
@@ -66,7 +66,7 @@ notes.label.breadcrumbTitle=شجرة المعلومات
 notes.label.filter=بحث حسب الاسم
 notes.label.includePageTitle=تضمين المعلومات
 notes.label.movePageTitle=نقل صفحة
-notes.label.exportNotesTitle=تصدير المعلومات
+notes.label.exportNotesTitle=Export Notes
 notes.label.export.selectAll=حدد الكل
 notes.label.export.deselectAll=إلغاء تحديد الكل
 notes.alert.success.label.exported=تم تصدير المعلومات
@@ -83,7 +83,7 @@ notes.confirmCancelExport.title=إلغاء التصدير ؟
 notes.confirmCancelExport=هل أنت متأكد من أنك تريد إلغاء عملية التصدير؟
 notes.button.yes=نعم
 notes.button.no=لا
-notes.alert.success.label.notes.imported=تم الاستيراد بنجاح. تم استبدال المعلومات
+notes.alert.success.label.notes.imported=Import succeeded. Your notes have been replaced
 notes.alert.warning.label.notification=المحررون والمسؤولين فقط هم من يمكنهم إضافة أو تحرير ملاحظة ، يرجى الاتصال بمسؤول الفضاء.
 notes.button.export=تصدير
 notes.label.movePageSpace=الفضاء:

notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_aro.properties

@@ -10,7 +10,7 @@ notes.menu.label.delete=حذف
 notes.menu.label.copyLink=نسخ الرابط
 notes.menu.label.movePage=نقل صفحة
 notes.menu.label.exportPdf=تصدير إلى PDF
-notes.menu.label.export=تصدير إلى PDF
+notes.menu.label.export=Export
 notes.menu.label.noteHistory=تاريخ الملاحظة
 notes.button.import=استيراد
 
@@ -24,9 +24,9 @@ notes.label.importRules1=استبدال جميع الملاحظات
 notes.label.importRules2=تحديث الملاحضات الموجودة
 notes.label.importRules3=تكرار الملاحظات الموجودة
 notes.label.importRules4=استبدال الملاحضات الحالية
-notes.label.importRulesMessage.title=قواعد إدارة التعارض
+notes.label.importRulesMessage.title=Replace existing notes
 notes.label.importRulesMessage.text=سوف يحدث تنازع في التحديث عندما يتم استيراد ملاحظة بنفس الاسم والأصل لملاحظة الخروج في شجرة الوجهة
-notes.label.importRulesAlert.text=Warning : the chosen rule applies for all conflicts of this import\n
+notes.label.importRulesAlert.text=Warning: the chosen rule applies for all conflicts of this import
 notes.label.button.continue=واصل
 notes.label.button.back=رجوع
 notes.label.importNotes.upload=تحميل
@@ -45,7 +45,7 @@ notes.button.updateAndPost=التحديث والنشر
 notes.button.ok=موافق
 notes.button.loadMore=تحميل المزيد
 notes.label.drop.draft=حذفها
-notes.composer.createNotes=كتابة ملاحظة لـ {0}
+notes.composer.createNotes=Create
 notes.edit.editNotes=تعديل الملاحظة
 notes.edit.editTextFor=تحرير مربع النص {0}
 
@@ -66,7 +66,7 @@ notes.label.breadcrumbTitle=شجرة الملاحظات
 notes.label.filter=بحث حسب الاسم
 notes.label.includePageTitle=تضمين الملاحظات
 notes.label.movePageTitle=نقل صفحة
-notes.label.exportNotesTitle=تصدير الملاحظات
+notes.label.exportNotesTitle=Export Notes
 notes.label.export.selectAll=حدد الكل
 notes.label.export.deselectAll=إلغاء تحديد الكل
 notes.alert.success.label.exported=تم تصدير الملاحظات الخاصة بك
@@ -83,7 +83,7 @@ notes.confirmCancelExport.title=إلغاء التصدير ؟
 notes.confirmCancelExport=هل أنت متأكد من أنك تريد إلغاء عملية التصدير؟
 notes.button.yes=نعم
 notes.button.no=لا
-notes.alert.success.label.notes.imported=تم الاستيراد بنجاح. تم استبدال ملاحظاتك
+notes.alert.success.label.notes.imported=Import succeeded. Your notes have been replaced
 notes.alert.warning.label.notification=المحررون والمضيفون فقط هم من يمكنهم إضافة أو تحرير ملاحظة ، يرجى الاتصال بمضيف الفضاء.
 notes.button.export=تصدير
 notes.label.movePageSpace=الفضاء:

notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_az.properties

@@ -24,9 +24,9 @@ notes.label.importRules1=Replace all notes
 notes.label.importRules2=Update existing notes
 notes.label.importRules3=Duplicate existing notes
 notes.label.importRules4=Replace existing notes
-notes.label.importRulesMessage.title=Conflict management rules
+notes.label.importRulesMessage.title=Replace existing notes
 notes.label.importRulesMessage.text=An update conflict will occur for an imported note with the same name and parent of an exiting note in the destination tree
-notes.label.importRulesAlert.text=Warning : the chosen rule applies for all conflicts of this import\n
+notes.label.importRulesAlert.text=Warning: the chosen rule applies for all conflicts of this import
 notes.label.button.continue=Continue
 notes.label.button.back=Back
 notes.label.importNotes.upload=Upload
@@ -45,7 +45,7 @@ notes.button.updateAndPost=Update and Post
 notes.button.ok=Ok
 notes.button.loadMore=Load more
 notes.label.drop.draft=Drop it
-notes.composer.createNotes=Write a note for {0}
+notes.composer.createNotes=Create
 notes.edit.editNotes=Edit note
 notes.edit.editTextFor=Edit text box {0}
 
@@ -66,7 +66,7 @@ notes.label.breadcrumbTitle=Notes Tree
 notes.label.filter=Filter by name
 notes.label.includePageTitle=Include Notes
 notes.label.movePageTitle=Move Page
-notes.label.exportNotesTitle=Export notes
+notes.label.exportNotesTitle=Export Notes
 notes.label.export.selectAll=Select all
 notes.label.export.deselectAll=Deselect all
 notes.alert.success.label.exported=Your notes have been exported
@@ -83,7 +83,7 @@ notes.confirmCancelExport.title=Cancel export?
 notes.confirmCancelExport=Are you sure you want to cancel the current export operation?
 notes.button.yes=Yes
 notes.button.no=No
-notes.alert.success.label.notes.imported=Import succeeded. Your notes has been replaced
+notes.alert.success.label.notes.imported=Import succeeded. Your notes have been replaced
 notes.alert.warning.label.notification=Only redactors and hosts can Add or Edit a Note, please contact the space host.
 notes.button.export=Xaric edin
 notes.label.movePageSpace=Space:

notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_ca.properties

@@ -24,9 +24,9 @@ notes.label.importRules1=Replace all notes
 notes.label.importRules2=Update existing notes
 notes.label.importRules3=Duplicate existing notes
 notes.label.importRules4=Replace existing notes
-notes.label.importRulesMessage.title=Conflict management rules
+notes.label.importRulesMessage.title=Replace existing notes
 notes.label.importRulesMessage.text=An update conflict will occur for an imported note with the same name and parent of an exiting note in the destination tree
-notes.label.importRulesAlert.text=Warning : the chosen rule applies for all conflicts of this import\n
+notes.label.importRulesAlert.text=Warning: the chosen rule applies for all conflicts of this import
 notes.label.button.continue=Continua
 notes.label.button.back=Enrere
 notes.label.importNotes.upload=Puja
@@ -45,7 +45,7 @@ notes.button.updateAndPost=Update and Post
 notes.button.ok=Ok
 notes.button.loadMore=Load more
 notes.label.drop.draft=Drop it
-notes.composer.createNotes=Write a note for {0}
+notes.composer.createNotes=Create
 notes.edit.editNotes=Edit note
 notes.edit.editTextFor=Edit text box {0}
 
@@ -66,7 +66,7 @@ notes.label.breadcrumbTitle=Notes Tree
 notes.label.filter=Filter by name
 notes.label.includePageTitle=Include Notes
 notes.label.movePageTitle=Desplaça la pàgina
-notes.label.exportNotesTitle=Export notes
+notes.label.exportNotesTitle=Export Notes
 notes.label.export.selectAll=Select all
 notes.label.export.deselectAll=Deselect all
 notes.alert.success.label.exported=Your notes have been exported
@@ -83,7 +83,7 @@ notes.confirmCancelExport.title=Cancel export?
 notes.confirmCancelExport=Are you sure you want to cancel the current export operation?
 notes.button.yes=Sí
 notes.button.no=No
-notes.alert.success.label.notes.imported=Import succeeded. Your notes has been replaced
+notes.alert.success.label.notes.imported=Import succeeded. Your notes have been replaced
 notes.alert.warning.label.notification=Only redactors and hosts can Add or Edit a Note, please contact the space host.
 notes.button.export=Exportació
 notes.label.movePageSpace=Space:

notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_ceb.properties

@@ -24,9 +24,9 @@ notes.label.importRules1=Replace all notes
 notes.label.importRules2=Update existing notes
 notes.label.importRules3=Duplicate existing notes
 notes.label.importRules4=Replace existing notes
-notes.label.importRulesMessage.title=Conflict management rules
+notes.label.importRulesMessage.title=Replace existing notes
 notes.label.importRulesMessage.text=An update conflict will occur for an imported note with the same name and parent of an exiting note in the destination tree
-notes.label.importRulesAlert.text=Warning : the chosen rule applies for all conflicts of this import\n
+notes.label.importRulesAlert.text=Warning: the chosen rule applies for all conflicts of this import
 notes.label.button.continue=Continue
 notes.label.button.back=Back
 notes.label.importNotes.upload=Upload
@@ -45,7 +45,7 @@ notes.button.updateAndPost=Update and Post
 notes.button.ok=Ok
 notes.button.loadMore=Load more
 notes.label.drop.draft=Drop it
-notes.composer.createNotes=Write a note for {0}
+notes.composer.createNotes=Create
 notes.edit.editNotes=Edit note
 notes.edit.editTextFor=Edit text box {0}
 
@@ -66,7 +66,7 @@ notes.label.breadcrumbTitle=Notes Tree
 notes.label.filter=Filter by name
 notes.label.includePageTitle=Include Notes
 notes.label.movePageTitle=Ibalhin ang Panid
-notes.label.exportNotesTitle=Export notes
+notes.label.exportNotesTitle=Export Notes
 notes.label.export.selectAll=Select all
 notes.label.export.deselectAll=Deselect all
 notes.alert.success.label.exported=Your notes have been exported
@@ -83,7 +83,7 @@ notes.confirmCancelExport.title=Cancel export?
 notes.confirmCancelExport=Are you sure you want to cancel the current export operation?
 notes.button.yes=Yes
 notes.button.no=No
-notes.alert.success.label.notes.imported=Import succeeded. Your notes has been replaced
+notes.alert.success.label.notes.imported=Import succeeded. Your notes have been replaced
 notes.alert.warning.label.notification=Only redactors and hosts can Add or Edit a Note, please contact the space host.
 notes.button.export=I-export
 notes.label.movePageSpace=Space:

notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_co.properties

@@ -24,9 +24,9 @@ notes.label.importRules1=Replace all notes
 notes.label.importRules2=Update existing notes
 notes.label.importRules3=Duplicate existing notes
 notes.label.importRules4=Replace existing notes
-notes.label.importRulesMessage.title=Conflict management rules
+notes.label.importRulesMessage.title=Replace existing notes
 notes.label.importRulesMessage.text=An update conflict will occur for an imported note with the same name and parent of an exiting note in the destination tree
-notes.label.importRulesAlert.text=Warning : the chosen rule applies for all conflicts of this import\n
+notes.label.importRulesAlert.text=Warning: the chosen rule applies for all conflicts of this import
 notes.label.button.continue=Continue
 notes.label.button.back=Back
 notes.label.importNotes.upload=Upload
@@ -45,7 +45,7 @@ notes.button.updateAndPost=Update and Post
 notes.button.ok=Ok
 notes.button.loadMore=Load more
 notes.label.drop.draft=Drop it
-notes.composer.createNotes=Write a note for {0}
+notes.composer.createNotes=Create
 notes.edit.editNotes=Edit note
 notes.edit.editTextFor=Edit text box {0}
 
@@ -66,7 +66,7 @@ notes.label.breadcrumbTitle=Notes Tree
 notes.label.filter=Filter by name
 notes.label.includePageTitle=Include Notes
 notes.label.movePageTitle=Move Page
-notes.label.exportNotesTitle=Export notes
+notes.label.exportNotesTitle=Export Notes
 notes.label.export.selectAll=Select all
 notes.label.export.deselectAll=Deselect all
 notes.alert.success.label.exported=Your notes have been exported
@@ -83,7 +83,7 @@ notes.confirmCancelExport.title=Cancel export?
 notes.confirmCancelExport=Are you sure you want to cancel the current export operation?
 notes.button.yes=Yes
 notes.button.no=No
-notes.alert.success.label.notes.imported=Import succeeded. Your notes has been replaced
+notes.alert.success.label.notes.imported=Import succeeded. Your notes have been replaced
 notes.alert.warning.label.notification=Only redactors and hosts can Add or Edit a Note, please contact the space host.
 notes.button.export=Export
 notes.label.movePageSpace=Space:

notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_cs.properties

@@ -24,9 +24,9 @@ notes.label.importRules1=Replace all notes
 notes.label.importRules2=Update existing notes
 notes.label.importRules3=Duplicate existing notes
 notes.label.importRules4=Replace existing notes
-notes.label.importRulesMessage.title=Conflict management rules
+notes.label.importRulesMessage.title=Replace existing notes
 notes.label.importRulesMessage.text=An update conflict will occur for an imported note with the same name and parent of an exiting note in the destination tree
-notes.label.importRulesAlert.text=Warning : the chosen rule applies for all conflicts of this import\n
+notes.label.importRulesAlert.text=Warning: the chosen rule applies for all conflicts of this import
 notes.label.button.continue=Pokračovat
 notes.label.button.back=Zpět
 notes.label.importNotes.upload=Nahrát
@@ -45,7 +45,7 @@ notes.button.updateAndPost=Update and Post
 notes.button.ok=Ok
 notes.button.loadMore=Load more
 notes.label.drop.draft=Drop it
-notes.composer.createNotes=Write a note for {0}
+notes.composer.createNotes=Create
 notes.edit.editNotes=Edit note
 notes.edit.editTextFor=Edit text box {0}
 
@@ -66,7 +66,7 @@ notes.label.breadcrumbTitle=Notes Tree
 notes.label.filter=Filter by name
 notes.label.includePageTitle=Include Notes
 notes.label.movePageTitle=Přesunout stránku
-notes.label.exportNotesTitle=Export notes
+notes.label.exportNotesTitle=Export Notes
 notes.label.export.selectAll=Select all
 notes.label.export.deselectAll=Deselect all
 notes.alert.success.label.exported=Your notes have been exported
@@ -83,7 +83,7 @@ notes.confirmCancelExport.title=Cancel export?
 notes.confirmCancelExport=Are you sure you want to cancel the current export operation?
 notes.button.yes=Ano
 notes.button.no=Ne
-notes.alert.success.label.notes.imported=Import succeeded. Your notes has been replaced
+notes.alert.success.label.notes.imported=Import succeeded. Your notes have been replaced
 notes.alert.warning.label.notification=Only redactors and hosts can Add or Edit a Note, please contact the space host.
 notes.button.export=Exportovat
 notes.label.movePageSpace=Space:

notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_de.properties

@@ -10,7 +10,7 @@ notes.menu.label.delete=Löschen
 notes.menu.label.copyLink=Link kopieren
 notes.menu.label.movePage=Seite verschieben
 notes.menu.label.exportPdf=Als PDF drucken
-notes.menu.label.export=exportieren
+notes.menu.label.export=Export
 notes.menu.label.noteHistory=Notizhistorie
 notes.button.import=Importieren
 
@@ -24,9 +24,9 @@ notes.label.importRules1=Alle Notizen ersetzen
 notes.label.importRules2=Vorhandene Notizen aktualisieren
 notes.label.importRules3=Bestehende Notizen kopieren.
 notes.label.importRules4=Existierende Notizen ersetzen
-notes.label.importRulesMessage.title=Regeln zur Konfliktbewältigung
+notes.label.importRulesMessage.title=Replace existing notes
 notes.label.importRulesMessage.text=Ein Aktualisierungskonflikt tritt auf, wenn eine importierte Notiz mit dem gleichen Namen und dem selben "Elternteil" einer ausgehenden Notiz im Zielbaum auftritt
-notes.label.importRulesAlert.text=Warnung: Die gewählte Regel gilt für alle Konflikte dieses Imports\n
+notes.label.importRulesAlert.text=Warning: the chosen rule applies for all conflicts of this import
 notes.label.button.continue=Fortsetzen
 notes.label.button.back=Zurück
 notes.label.importNotes.upload=Hochladen
@@ -42,10 +42,10 @@ notes.button.publish=Speichern
 notes.button.publishAndPost=Speichern und veröffentlichen
 notes.button.update=Aktualisieren
 notes.button.updateAndPost=Aktualisieren und im Stream veröffentlichen
-notes.button.ok=OK
+notes.button.ok=Ok
 notes.button.loadMore=Mehr laden
 notes.label.drop.draft=Ablegen
-notes.composer.createNotes=Schreiben Sie eine Notiz für {0}
+notes.composer.createNotes=Create
 notes.edit.editNotes=Notiz bearbeiten
 notes.edit.editTextFor=Text für {0} bearbeiten
 
@@ -66,7 +66,7 @@ notes.label.breadcrumbTitle=Notizbaum
 notes.label.filter=Nach Namen filtern
 notes.label.includePageTitle=Notizen einbeziehen
 notes.label.movePageTitle=Seite verschieben
-notes.label.exportNotesTitle=Notizen exportieren
+notes.label.exportNotesTitle=Export Notes
 notes.label.export.selectAll=Alle auswählen
 notes.label.export.deselectAll=Auswahl aufheben
 notes.alert.success.label.exported=Ihre Notizen wurden exportiert
@@ -83,7 +83,7 @@ notes.confirmCancelExport.title=Export abbrechen?
 notes.confirmCancelExport=Sind Sie sicher, dass Sie den aktuellen Exportvorgang abbrechen möchten?
 notes.button.yes=Ja
 notes.button.no=Nein
-notes.alert.success.label.notes.imported=Import erfolgreich. Ihre Notizen wurden ersetzt
+notes.alert.success.label.notes.imported=Import succeeded. Your notes have been replaced
 notes.alert.warning.label.notification=Nur Redakteure und Gastgeber können Notizen hinzufügen oder bearbeiten. Bitte kontaktieren Sie den Projektraumgastgeber.
 notes.button.export=Exportieren
 notes.label.movePageSpace=Projektraum