i18n: Removed "sample.message.*" and reset languages

.settings/org.eclipse.core.resources.prefs

@@ -2,6 +2,7 @@ eclipse.preferences.version=1
 encoding//src/main/resources=UTF-8
 encoding//src/main/resources/content/language.properties=UTF-8
 encoding//src/main/resources/content/language_fa.properties=UTF-8
+encoding//src/main/resources/content/language_sl.properties=UTF-8
 encoding//src/main/webapp/WEB-INF/jsp/accession/data.jsp=UTF-8
 encoding//src/main/webapp/WEB-INF/jsp/descr/index.jsp=UTF-8
 encoding//src/main/webapp/WEB-INF/jsp/filter/index.jsp=UTF-8

src/main/resources/content/language.properties

@@ -13,65 +13,51 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #-------------------------------------------------------------------------------
-#Error messages
-sample.error.unavailable=Resource is unavailable
-sample.error.unexpected=Unexpected error
-sample.error.wrong.credentials=Please check you credentials
-sample.error.user.exist = User exist
-sample.error.organization.not.found=No organization found with ID = {0}
-sample.error.user.not.found=No user found with ID = {0}
-sample.error.user.group.not.found=No user group found with ID = {0}
-sample.error.network.not.found=No network found with ID = {0}
-#Validation error messages
-sample.error.not.null=Field {0} must be not null
-sample.error.not.empty=Field {0} must be not empty
-sample.error.wrong.email=Field {0} isn't valid email
-sample.error.not.unique.name=Name {0} must be unique
-sample.error.not.unique.email=Email {0} must be unique
-
-#Messages
-sample.message.index.title=Welcome
-sample.message.login.title=Login page
-sample.message.welcome=Welcome
-sample.message.change.locale=Change locale
-sample.message.locale.en=English
-sample.message.locale.ru=Russian
-sample.message.locale.fa=Persian
-sample.message.locale.sl=Sloven\u0161\u010Dina
-sample.message.current.locale = English
-sample.message.logout=Logout
-sample.message.username=Username
-sample.message.password=Password
-sample.message.id=ID
-sample.message.name=Name
-sample.message.description=Description
-sample.message.actions=Actions
+
+# Login
+login.username=Username
+login.password=Password
+login.invalid-credentials=Invalid credentials.
+login.remember-me=Remember me
+login.login-button=Login
+login.register-now=Create an account
+logout=Logout
+
+# Registration
+registration.page.title=Create a user account
+registration.title=Create your account
+registration.invalid-credentials=Invalid credentials.
+registration.user-exists=Username already taken.
+registration.email=E-mail
+registration.password=Password
+registration.confirm-password=Repeat password
+registration.full-name=Your full name
+registration.create-account=Create account
+captcha.text=Captcha text
+
+
+id=ID
+
+name=Name
+description=Description
+actions=Actions
 add=Add
 edit=Edit
 save=Save
 cancel=Cancel
 delete=Delete
 
-#JS messages
-sample.js.message.confirm.deleting=Do you really want to remove this item?
-sample.js.error.delete=Error while deleting item!
-sample.js.error.retrieve=Error while retrieving item!
-sample.js.error.update=Error while removing item!
-sample.message.confirm.password=Confirm Password
-registration.page.title=Create a user account
-registration.create-account=Create account
-captcha.text=Captcha text
-sample.message.email=E-mail
-sample.message.user.group=User Group
-sample.message.user.groups=User Groups
-sample.message.network=Network
-sample.message.networks=Networks
-sample.message.has.invites=Has invites
-sample.message.user.role=User Role
-sample.message.permissions = Permissions
-sample.message.organizations = Organizations
-sample.message.invite.organizations = Invite Organizations
-sample.message.invite.to.network = Invite to Network
+
+# Language
+locale.language.change=Change locale
+locale.language.current = English
+
+# Languages (Do not translate)
+locale.language.en=English
+locale.language.ru=Russian
+locale.language.fa=Persian
+locale.language.sl=Sloven\u0161\u010Dina
+
 
 data.error.404=The data you requested was not found in the system.
 page.rendertime=Processing this page took {0}ms.

src/main/resources/content/language_en.properties

@@ -13,59 +13,3 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #-------------------------------------------------------------------------------
-#Error messages
-sample.error.unavailable=Resource is unavailable
-sample.error.unexpected=Unexpected error
-sample.error.wrong.credentials=Please check you credentials
-sample.error.organization.not.found=No organization found with ID = {0}
-sample.error.user.not.found=No user found with ID = {0}
-sample.error.user.group.not.found=No user group found with ID = {0}
-sample.error.network.not.found=No network found with ID = {0}
-#Validation error messages
-sample.error.not.null=Field {0} must be not null
-sample.error.not.empty=Field {0} must be not empty
-sample.error.wrong.email=Field {0} isn't valid email
-sample.error.not.unique.name=Name {0} must be unique
-sample.error.not.unique.email=Email {0} must be unique
-
-#Messages
-sample.message.index.title=Welcome to this service\!
-sample.message.login.title=Login page
-sample.message.welcome=Welcome to Genesys
-sample.message.change.locale=Change locale
-sample.message.locale.en=English
-sample.message.locale.ru=Russian
-sample.message.current.locale = English
-sample.message.logout=Logout
-sample.message.username=Username
-sample.message.password=Password
-sample.message.confirm.password=Confirm Password
-sample.message.id=ID
-sample.message.name=Name
-sample.message.description=Description
-sample.message.actions=Actions
-sample.message.add=Add
-sample.message.edit=Edit
-sample.message.save=Save
-sample.message.delete=Delete
-
-#JS messages
-sample.js.message.confirm.deleting=Do you really want to remove this item?
-sample.js.error.delete=Error while deleting item!
-sample.js.error.retrieve=Error while retrieving item!
-sample.js.error.update=Error while removing item!
-
-
-sample.message.registration = Registration
-sample.message.email = E-mail
-sample.error.user.exist=User exist
-sample.message.user.group=User Group
-sample.message.user.groups=User Groups
-sample.message.networks=Networks
-sample.message.network=Network
-sample.message.user.role=User Role
-sample.message.permissions=Permissions
-sample.message.organizations=Organizations
-sample.message.has.invites=Has invites
-sample.message.invite.organizations=Invite Organizations
-sample.message.invite.to.network = Invite to Network

src/main/resources/content/language_fa.properties

@@ -14,10 +14,10 @@
 # limitations under the License.
 #-------------------------------------------------------------------------------
 #Error messages
-# sample.error.unavailable=Resource is unavailable
+sample.error.unavailable=منابع موجود نیست
 # sample.error.unexpected=Unexpected error
 # sample.error.wrong.credentials=Please check you credentials
-# sample.error.user.exist = User exist
+sample.error.user.exist = کاربر وجود دارد
 # sample.error.organization.not.found=No organization found with ID \= {0}
 # sample.error.user.not.found=No user found with ID \= {0}
 # sample.error.user.group.not.found=No user group found with ID \= {0}
@@ -30,44 +30,48 @@
 # sample.error.not.unique.email=Email {0} must be unique
 
 #Messages
-# sample.message.index.title=Welcome
-# sample.message.login.title=Login page
-# sample.message.welcome=Welcome
-# sample.message.change.locale=Change locale
-# sample.message.locale.en=English
-# sample.message.locale.ru=Russian
+sample.message.index.title=خوش آمدید
+sample.message.login.title=صفحه ورود به سیستم
+sample.message.welcome=خوش آمدید
+# locale.language.change=Change locale
+#sample.message.locale.en=انگلیسی
+#sample.message.locale.ru=روسی
+locale.language.fa=فارسی
 # sample.message.locale.sl=Sloven\\u0161\\u010Dina
-# sample.message.current.locale = English
-# sample.message.logout=Logout
-# sample.message.username=Username
-# sample.message.password=Password
-# sample.message.id=ID
-# sample.message.name=Name
-# sample.message.description=Description
-# sample.message.actions=Actions
-# sample.message.add=Add
-# sample.message.edit=Edit
-# sample.message.save=Save
-# sample.message.delete=Delete
+locale.language.current = انگلیسی
+sample.message.logout=خروج از سیستم
+sample.message.username=نام کاربری
+sample.message.password=رمز عبور
+sample.message.id=کلمه عبور
+sample.message.name=نام
+sample.message.description=توضیحات
+sample.message.actions=فعالیت ها
+add=اضافه
+edit=ویرایش
+save=ذخیره
+cancel=لغو کردن
+delete=حذف کردن
 
 #JS messages
-# sample.js.message.confirm.deleting=Do you really want to remove this item?
-# sample.js.error.delete=Error while deleting item\!
-# sample.js.error.retrieve=Error while retrieving item\!
+sample.js.message.confirm.deleting=آیا مایل هستید آیتم انتخاب شده را پاک کنید؟
+sample.js.error.delete=مشکل در زمان پاک کردن آیتم
+sample.js.error.retrieve=مشکل در زمان دریافت آیتم
 # sample.js.error.update=Error while removing item\!
-# sample.message.confirm.password=Confirm Password
-# sample.message.registration=Registration
-# sample.message.email=E-mail
-# sample.message.user.group=User Group
-# sample.message.user.groups=User Groups
-# sample.message.network=Network
-# sample.message.networks=Networks
+sample.message.confirm.password=تایید رمز عبور
+registration.page.title=ساخت یک حساب کاربری
+registration.create-account=ساخت حساب کاربری
+captcha.text=نوشتار کپچا
+sample.message.email=آدرس الکترونیکی
+sample.message.user.group=گروه کاربری
+sample.message.user.groups=گروههای کاربری
+sample.message.network=شبکه
+sample.message.networks=شبکه ها
 # sample.message.has.invites=Has invites
-# sample.message.user.role=User Role
+sample.message.user.role=نقش کاربری
 # sample.message.permissions = Permissions
-# sample.message.organizations = Organizations
-# sample.message.invite.organizations = Invite Organizations
-# sample.message.invite.to.network = Invite to Network
+sample.message.organizations = سازمان ها
+sample.message.invite.organizations = دعوت سازمان ها
+sample.message.invite.to.network = دعوت به شبکه
 
 # data.error.404=The data you requested was not found in the system.
 # page.rendertime=Processing this page took {0}ms.
@@ -75,41 +79,41 @@
 # footer.copyright-statement=© 2013 Data Providers and GCDT
 
 menu.home=خانه
-# menu.browse=Browse
-# menu.datasets=C&E Data
+menu.browse=فهرست
+menu.datasets=اطلاعات C&E
 # menu.descriptors=Descriptors
-# menu.countries=Countries
-# menu.institutes=Institutes
-# menu.my-list=My List
+menu.countries=کشورها
+menu.institutes=موسسه ها
+menu.my-list=لیست من
 menu.about=درباره
-# menu.contact=Contact
+menu.contact=تماس
 # menu.disclaimer=Disclaimer
 # menu.feedback=Feedback
-# menu.help=Help
+menu.help=کمک
 # menu.terms=Terms and Conditions of Use
 # menu.copying=Copyright policy
 # menu.privacy=Privacy policy
 
 # page.home.title=Genesys Sandbox
 
-# user.pulldown.logout=Logout
-# user.pulldown.profile=View profile
-# user.create-new-account=Create an account
+user.pulldown.logout=خروج از سیستم
+user.pulldown.profile=مشاهده پروفایل
+user.create-new-account=ساخت حساب کاربری
 
-# crop.croplist=Crop list
+crop.croplist=لیست محصولات کشاورزی
 # crop.page.profile.title={0} profile
 # crop.taxonomy-rules=Taxonomic rules
 # crop.view-descriptors=View crop descriptors...
 
-# activity.recent-activity=Recent activity
+activity.recent-activity=آخرین فعالیت ها
 
 # country.page.profile.title=Country profile\: {0}
-# country.page.list.title=Country list
+country.page.list.title=لیست کشور
 # country.page.not-current=This is a historic entry.
 # country.page.faoInstitutes={0} institutes registered in WIEWS
 # country.stat.countByLocation={0} accessions at institutes in this country
 # country.stat.countByOrigin={0} accessions registered in Genesys come from this country.
-# country.statistics=Country statistics
+country.statistics=آمار کشوری
 # country.accessions.from=Accessions collected in {0}
 
 # faoInstitutes.page.list.title=WIEWS Institutes
@@ -122,7 +126,7 @@ menu.about=درباره
 # faoInstitutes.viewAll=View all registered institutes
 # faoInstitutes.viewActiveOnly=View institutes with accessions in Genesys
 # faoInstitute.no-accessions-registered=Please get in touch with us if you can facilitate in providing data from this institiute.
-# faoInstitute.country=Country
+faoInstitute.country=کشور
 # faoInstitute.code=WIEWS Code
 # faoInstitute.email=Contact email
 # faoInstitute.acronym=Acronym
@@ -133,19 +137,19 @@ menu.about=درباره
 # paged.totalElements={0} entries
 
 # accessions.number={0} accessions
-# accession.metadatas=C&E Data
+accession.metadatas=اطلاعات C&E
 # accession.methods=Characterization & Evaluation data
-# unit-of-measure=Unit of Measure
+unit-of-measure=واحد اندازه گیری
 
 # ce.trait=Trait
-# ce.methods=Methods
-# ce.method=Method
+ce.methods=روش ها
+ce.method=روش
 # method.fieldName=DB Field
 
 # accession.accessionName=Accession
-# accession.origin=Country of origin
+accession.origin=اصلیت
 # accession.holdingInstitute=Holding institute
-# accession.holdingCountry=Location
+accession.holdingCountry=محل
 # accession.taxonomy=Taxonomy
 # accession.crop=Crop
 # accession.otherNames=Also known as
@@ -218,19 +222,38 @@ page.login=ورود به سیستم
 
 # organization.page.list.title=Organizations
 # organization.page.profile.title=Organization {0}
-# filter.organization=Organization
+organization.slug=مخفف سازمان
+organization.title=نام کامل سازمان
+filter.organization=سازمان
 
 
-# menu.report-an-issue=Report an issue
+menu.report-an-issue=گزارش یک مشکل
 # menu.scm=Source code
 # menu.translate=Translate Genesys
 
+article.edit-article=ویرایش مقاله
+# article.slug=Article slug (URL)
+article.title=تیتر مقاله
+article.body=بدنه مقاله
 
-# activitypost.post-title=Post title
-# activitypost.post-body=Body
-# activitypost.add-post=Add post
+# activitypost=Activity post
+# activitypost.add-new-post=Add new post
+activitypost.post-title=تیتر پست
+activitypost.post-body=بدنه
 
 # blurp.admin-no-blurp-here=No blurp here.
 # blurp.blurp-title=Blurp title
 # blurp.blurp-body=Blurp contents
 # blurp.update-blurp=Save blurp
+
+
+# oauth2.confirm-request=Confirm access
+# oauth2.confirm-client=You, <b>{0}</b>, hereby authorize <b>{1}</b> to access your protected resources.
+# oauth2.button-approve=Yes, allow access
+# oauth2.button-deny=No, deny access
+
+# oauth2.authorization-code=Authorization code
+# oauth2.authorization-code-instructions=Copy this authorization code\:
+
+# oauth2.access-denied=Access denied
+# oauth2.access-denied-text=You have denied access to your resources.

src/main/resources/content/language_ru.properties

-#-------------------------------------------------------------------------------
-# Copyright 2013 Global Crop Diversity Trust
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#-------------------------------------------------------------------------------
-#Error messages
-sample.error.unavailable=Ресурс недоступен
-sample.error.unexpected=Непредвиденная ошибка
-sample.error.wrong.credentials=Пожалуйста, проверте ваши лог/пароль
-sample.error.organization.not.found=Не найден словарь с ID = {0}
-#Validation error messages
-sample.error.not.null=Поле {0} не должно быть пустым
-sample.error.not.empty=Поле {0} не должно быть незаполненным
-sample.error.wrong.email=Поле {0} не является правильным электронным адресом
-
-#Messages
-sample.message.index.title=Welcome
-sample.message.login.title=Страница аутентификации
-sample.message.welcome=Приветствую
-sample.message.change.locale=Сменить язык
-sample.message.locale.en=Английский
-sample.message.locale.ru=Русский
-sample.message.current.locale = Русский
-sample.message.logout=Выйти
-sample.message.username=Имя пользователя
-sample.message.password=Пароль
-sample.message.id=ID
-sample.message.name=Имя
-sample.message.description=Описание
-sample.message.actions=Действия
-sample.message.add=Добавить
-sample.message.edit=Изменить
-sample.message.save=Сохранить
-sample.message.delete=Удалить
-
-#JS messages
-sample.js.message.confirm.deleting=Вы действительно хотите удалить эту запись?
-sample.js.error.delete=Произошла ошибка во время удаления записи!
-sample.js.error.retrieve=Произошла ошибка во время получения записи!
-sample.js.error.update=Произошла ошибка во время обновления записи!
-sample.message.confirm.password=\u041F\u043E\u0432\u0442\u043E\u0440\u0438\u0442\u0435 \u043F\u0430\u0440\u043E\u043B\u044C
-sample.message.registration=\u0420\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u044F
-sample.message.email=\u0415\u043B\u0435\u043A\u0442\u0440\u043E\u043D\u043D\u0430\u044F \u043F\u043E\u0447\u0442\u0430
-sample.error.user.exist=\u041F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044C \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442
-sample.message.user.group=User Group
-sample.message.user.groups=User Groups
-sample.message.networks=Networks
-sample.message.network=Network
-sample.message.user.role=User Role
-sample.message.permissions=Permissions
-sample.message.organizations=Organizations
-sample.message.has.invites=Has invites
-sample.message.invite.organizations=Invite Organizations
-sample.message.invite.to.network = Invite to Network

src/main/resources/content/language_sl.properties

@@ -13,151 +13,3 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #-------------------------------------------------------------------------------
-#Error messages
-# sample.error.unavailable=Resource is unavailable
-# sample.error.unexpected=Unexpected error
-# sample.error.wrong.credentials=Please check you credentials
-# sample.error.user.exist = User exist
-# sample.error.organization.not.found=No organization found with ID \= {0}
-# sample.error.user.not.found=No user found with ID \= {0}
-# sample.error.user.group.not.found=No user group found with ID \= {0}
-# sample.error.network.not.found=No network found with ID \= {0}
-#Validation error messages
-# sample.error.not.null=Field {0} must be not null
-# sample.error.not.empty=Field {0} must be not empty
-# sample.error.wrong.email=Field {0} isn't valid email
-# sample.error.not.unique.name=Name {0} must be unique
-# sample.error.not.unique.email=Email {0} must be unique
-
-#Messages
-# sample.message.index.title=Welcome
-# sample.message.login.title=Login page
-sample.message.welcome=Dobrodošli
-sample.message.change.locale=Spremeni jezik
-# sample.message.locale.en=English
-# sample.message.locale.ru=Russian
-# sample.message.locale.sl=Sloven\\u0161\\u010Dina
-# sample.message.current.locale = English
-sample.message.logout=Odjava
-sample.message.username=Uporabnik
-sample.message.password=Geslo
-# sample.message.id=ID
-sample.message.name=Ime
-sample.message.description=Opis
-# sample.message.actions=Actions
-add=Dodaj
-edit=Uredi
-save=Shrani
-cancel=Prekli\u010Di
-sample.message.delete=Odstrani
-
-#JS messages
-# sample.js.message.confirm.deleting=Do you really want to remove this item?
-# sample.js.error.delete=Error while deleting item\!
-# sample.js.error.retrieve=Error while retrieving item\!
-# sample.js.error.update=Error while removing item\!
-sample.message.confirm.password=Potrdite geslo
-sample.message.registration=Registracija
-# sample.message.email=E-mail
-# sample.message.user.group=User Group
-# sample.message.user.groups=User Groups
-# sample.message.network=Network
-# sample.message.networks=Networks
-# sample.message.has.invites=Has invites
-sample.message.user.role=Uporabniška vloga
-sample.message.permissions = Dovoljenja
-sample.message.organizations = Organizacije
-# sample.message.invite.organizations = Invite Organizations
-# sample.message.invite.to.network = Invite to Network
-
-# data.error.404=The data you requested was not found in the system.
-# page.rendertime=Processing this page took {0}ms.
-
-# footer.copyright-statement=© 2013 Global Crop Diversity Trust
-
-menu.home=Domov
-menu.browse=Prebrskaj
-# menu.datasets=Datasets
-menu.countries=Države
-menu.institutes=Organizacije
-menu.my-list=Moj izbor
-menu.about=O projektu
-menu.contact=Kontakt
-# menu.disclaimer=Disclaimer
-# menu.feedback=Feedback
-menu.help=Pomoč
-# menu.terms=Terms and Conditions of Use
-# menu.copying=Copyright policy
-# menu.privacy=Privacy policy
-
-user.pulldown.logout=Odjava
-# user.pulldown.profile=View profile
-# user.create-new-account=Create an account
-
-# crop.croplist=Crop list
-# crop.page.profile.title={0} profile
-
-activity.recent-activity=Aktualno
-
-country.page.profile.title=Profil dr\u00C5\u00BEave\: {0}
-country.page.list.title=Seznam držav
-country.page.not-current=To je zgodovinski zapis.
-country.page.faoInstitutes={0} organizacij registriranih v WIEWS
-# country.stat.countByLocation={0} accessions at institutes in this country
-# country.stat.countByOrigin={0} accessions registered in Genesys come from this country.
-country.statistics=Statistika države
-# country.accessions.from=Accessions collected in {0}
-
-faoInstitutes.page.list.title=Organizacije v WIEWS
-# faoInstitutes.page.profile.title=WIEWS {0}
-# faoInstitutes.stat.accessionCount=Accessions in Genesys\: {0}.
-# faoInstitute.accessionCount={0} accessions in Genesys.
-faoInstitute.statistics=Statistike organizacije
-# faoInstitutes.page.data.title=Accessions in {0}
-# faoInstitute.accessions.at=Accessions at {0}
-# faoInstitutes.viewAll=View all registered institutes
-# faoInstitutes.viewActiveOnly=View institutes with accessions in Genesys
-# faoInstitute.no-accessions-registered=Please get in touch with us if you can facilitate in providing data from this institiute.
-
-# view.accessions=View accessions...
-paged.pageOfPages=Stran {0} od {1}
-paged.totalElements={0} zapisov
-
-# accessions.number={0} accessions
-# accession.metadatas=Datasets
-# accession.methods=Characterization & Evaluation data
-
-# accession.accessionName=Accession
-accession.origin=Država izvora
-# accession.holdingInstitute=Holding institute
-# accession.holdingCountry=Location
-accession.taxonomy=Taksonomija
-accession.otherNames=Druga imena
-# accession.inTrust=In Trust
-# accession.mlsStatus=MLS Status
-# accession.inSvalbard=Svalbardized
-# accession.inTrust.true=This accession is under Article 15 of the International Treaty on Plant Genetic Resources for Food and Agriculture.
-# accession.mlsStatus.true=This accession is in the Multilateral System of ITPGRFA.
-# accession.inSvalbard.true=Super-safety duplicated in Svalbard Seed Vault.
-
-
-# accession.page.profile.title=Accession profile\: {0}
-# accession.page.resolve.title=Multiple accessions found
-# accession.resolve=Multiple accessions with the name ''{0}'' found in Genesys. Select one from the list.
-# accession.page.data.title=Accession browser
-# accession.taxonomy-at-institute=View {0} at {1}
-
-# taxonomy.genus=Genus
-# taxonomy.species=Species
-# taxonomy.taxonName=Taxonomy
-
-selection.page.title=Izbor