Fixed some resource files issues, namely 1) invalid text and duplicate keys resulting from bad merge and 2) trailing spaces which can potentially cause UI issues.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
Reviewed-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>

client/WEB-INF/classes/resources/messages.properties

@@ -16,9 +16,7 @@
 # under the License.
 label.port=Port
 label.remove.ldap=Remove LDAP
-message.remove.ldap=Are you sure you want to delete the LDAP configuration?
 label.configure.ldap=Configure LDAP
-message.configure.ldap=Please confirm you would like to configure LDAP.
 label.ldap.configuration=LDAP Configuration
 label.ldap.port=LDAP port
 label.create.nfs.secondary.staging.store=Create NFS secondary staging store
@@ -1320,15 +1318,6 @@ label.add.ucs.manager=Add UCS Manager
 label.ovm.traffic.label=OVM traffic label
 label.lxc.traffic.label=LXC Traffic Label
 label.hyperv.traffic.label=HyperV Traffic Label
-label.port=Port
-label.remove.ldap=Remove LDAP
-label.configure.ldap=Configure LDAP
-label.ldap.configuration=LDAP Configuration
-label.ldap.port=LDAP port
-label.create.nfs.secondary.staging.store=Create NFS secondary staging store
-label.volatile=Volatile
-label.planner.mode=Planner mode
-label.deployment.planner=Deployment planner
 managed.state=Managed State
 message.acquire.new.ip.vpc=Please confirm that you would like to acquire a new IP for this VPC.
 message.acquire.new.ip=Please confirm that you would like to acquire a new IP for this network.

client/WEB-INF/classes/resources/messages_es.properties

@@ -22,7 +22,6 @@ error.session.expired=Su sesi\u00c3\u00b3n ha caducado.
 error.unresolved.internet.name=El nombre de Internet no se puede resolver.
 extractable=extra\u00c3\u00adble
 force.delete.domain.warning=Advertencia\: Si elige esta opci\u00c3\u00b3n, la supresi\u00c3\u00b3n de todos los dominios secundarios y todas las cuentas asociadas y sus recursos.
-<<<<<<< HEAD
 force.delete=Fuerza Borrar
 force.remove=Fuerza Retire
 force.remove.host.warning=Advertencia\: Si elige esta opci\u00c3\u00b3n, CloudStack para detener la fuerza todas las m\u00c3\u00a1quinas virtuales en ejecuci\u00c3\u00b3n antes de retirar este host del cl\u00c3\u00baster.
@@ -32,7 +31,6 @@ ICMP.code=ICMP C\u00c3\u00b3digo
 ICMP.type=Tipo ICMP
 image.directory=Directorio de la imagen
 inline=en l\u00c3\u00adnea
-=======
 force.delete=Forzar el borrado
 force.remove=Forzar el retiro
 force.remove.host.warning=Advertencia\: Si elige esta opci\u00f3n, CloudStack para detener la fuerza todas las m\u00e1quinas virtuales en ejecuci\u00f3n antes de retirar este host del cl\u00faster.
@@ -44,7 +42,6 @@ image.directory=Directorio de im\u00e1genes
 inline=alineado
 label.about=Acerca de
 label.about.app=Acerca de CloudStack
->>>>>>> 4e449ff... Add Dutch (Netherlands, Polish languages in Web UI Change Japanese code (ja -> ja_JP) Update transifex sync config
 label.account=Cuenta
 label.account.id=ID de la cuenta
 label.account.name=Nombre de cuenta

client/WEB-INF/classes/resources/messages_ja_JP.properties

@@ -16,9 +16,7 @@
 # under the License.
 label.port=\u30dd\u30fc\u30c8
 label.remove.ldap=LDAP \u306e\u524a\u9664
-message.remove.ldap=LDAP \u69cb\u6210\u3092\u524a\u9664\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b?
 label.configure.ldap=LDAP \u306e\u69cb\u6210
-message.configure.ldap=LDAP \u3092\u69cb\u6210\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b?
 label.ldap.configuration=LDAP \u69cb\u6210
 label.ldap.port=LDAP \u30dd\u30fc\u30c8
 label.create.nfs.secondary.staging.store=NFS \u30bb\u30ab\u30f3\u30c0\u30ea \u30b9\u30c6\u30fc\u30b8\u30f3\u30b0 \u30b9\u30c8\u30a2\u3092\u4f5c\u6210\u3059\u308b
@@ -1319,15 +1317,6 @@ label.add.ucs.manager=UCS Manager \u306e\u8ffd\u52a0
 label.ovm.traffic.label=OVM \u306e\u30c8\u30e9\u30d5\u30a3\u30c3\u30af \u30e9\u30d9\u30eb
 label.lxc.traffic.label=LXC \u306e\u30c8\u30e9\u30d5\u30a3\u30c3\u30af \u30e9\u30d9\u30eb
 label.hyperv.traffic.label=Hyper-V \u306e\u30c8\u30e9\u30d5\u30a3\u30c3\u30af \u30e9\u30d9\u30eb
-label.port=\u30dd\u30fc\u30c8
-label.remove.ldap=LDAP \u306e\u524a\u9664
-label.configure.ldap=LDAP \u306e\u69cb\u6210
-label.ldap.configuration=LDAP \u69cb\u6210
-label.ldap.port=LDAP \u30dd\u30fc\u30c8
-label.create.nfs.secondary.staging.store=NFS \u30bb\u30ab\u30f3\u30c0\u30ea \u30b9\u30c6\u30fc\u30b8\u30f3\u30b0 \u30b9\u30c8\u30a2\u3092\u4f5c\u6210\u3059\u308b
-label.volatile=\u63ee\u767a\u6027
-label.planner.mode=\u30d7\u30e9\u30f3\u30ca\u30fc \u30e2\u30fc\u30c9
-label.deployment.planner=\u5c55\u958b\u30d7\u30e9\u30f3\u30ca\u30fc
 managed.state=\u7ba1\u7406\u5bfe\u8c61\u72b6\u614b
 message.acquire.new.ip.vpc=\u3053\u306e VPC \u306e\u65b0\u3057\u3044 IP \u30a2\u30c9\u30ec\u30b9\u3092\u53d6\u5f97\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b?
 message.acquire.new.ip=\u3053\u306e\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306e\u65b0\u3057\u3044 IP \u30a2\u30c9\u30ec\u30b9\u3092\u53d6\u5f97\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b?

client/WEB-INF/classes/resources/messages_pt_BR.properties

@@ -837,15 +837,12 @@ label.public.zone=Zona P\u00fablica
 label.purpose=Prop\u00f3sito
 label.Pxe.server.type=Tipo de Servidor PXE
 label.quickview=Visualiza\u00e7\u00e3o r\u00e1pida
-<<<<<<< HEAD
-=======
 label.quiesce.vm=Quiesce VM
 label.rbd.id=Usu\u00e1rio Ceph
 label.rbd.monitor=Monitor Ceph
 label.rbd.pool=Pool Ceph
 label.rbd=RDB
 label.rbd.secret=Cephx secret
->>>>>>> 4e449ff... Add Dutch (Netherlands, Polish languages in Web UI Change Japanese code (ja -> ja_JP) Update transifex sync config
 label.reboot=Reiniciar
 label.recent.errors=Erros Recentes
 label.redundant.router.capability=Recurso de roteador redundante
@@ -1101,12 +1098,9 @@ label.vm.state=Estado da VM
 label.vm.stop=Parar
 label.vms=VMs
 label.vmware.traffic.label=Etiqueta de tr\u00e1fego VMware
-<<<<<<< HEAD
-=======
 label.vnet.id=VLAN ID
 label.vnet=VLAN
 label.volatile=Vol\u00e1til
->>>>>>> 4e449ff... Add Dutch (Netherlands, Polish languages in Web UI Change Japanese code (ja -> ja_JP) Update transifex sync config
 label.volgroup=Grupo de Volume
 label.volume=Disco
 label.volume.limits=Limites de Disco
@@ -1383,14 +1377,11 @@ message.please.select.a.different.public.and.management.network.before.removing=
 message.please.select.networks=Por favor selecione as redes para sua m\u00e1quina virtual.
 message.please.wait.while.zone.is.being.created=Por favor, espere enquanto sua zona est\u00e1 sendo criada; isto pode demorar um pouco...
 message.project.invite.sent=Convite enviado para o usu\u00e1rio; Eles ser\u00e3o adicionados ao projeto ap\u00f3s aceitarem o convite
-<<<<<<< HEAD
-=======
 message.public.traffic.in.advanced.zone=O tr\u00e1fego p\u00fablico \u00e9 gerado quando as VMs na nuvem acessam a internet. Os IPs acess\u00edveis ao p\u00fablico devem ser alocados para essa finalidade. Os usu\u00e1rios finais podem usar a interface do usu\u00e1rio CloudStack para adquirir esses IPs afim de implementar NAT entre a sua rede de guests e sua rede p\u00fablica. <br/><br/> Forne\u00e7a pelo menos um intervalo de endere\u00e7os IP para o tr\u00e1fego de internet.
 message.public.traffic.in.basic.zone=O tr\u00e1fego p\u00fablico \u00e9 gerado quando as VMs na nuvem acessam a Internet ou prestam servi\u00e7os aos clientes atrav\u00e9s da Internet. Os IPs acess\u00edveis ao p\u00fablico devem ser alocados para essa finalidade. Quando uma inst\u00e2ncia \u00e9 criada, um IP a partir deste conjunto de IPs p\u00fablicos ser\u00e3o destinados \u00e0 inst\u00e2ncia, al\u00e9m do endere\u00e7o IP guest. Um NAT est\u00e1tico 1-1  ser\u00e1 criada automaticamente entre o IP p\u00fablico e IP guest. Os usu\u00e1rios finais tamb\u00e9m podem usar a interface de usu\u00e1rio CloudStack para adquirir IPs adicionais afim de se implementar NAT est\u00e1tico entre suas inst\u00e2ncias e o IP p\u00fablico.
 message.redirecting.region=Redirecionando para regi\u00e3o...
 message.remove.ldap=Voc\u00ea tem certeza que deseja deletar a configura\u00e7\u00e3o LDAP?
 message.remove.region=Voc\u00ea tem certeza que deseja remover esta regi\u00e3o deste servidor de gerenciamento?
->>>>>>> 4e449ff... Add Dutch (Netherlands, Polish languages in Web UI Change Japanese code (ja -> ja_JP) Update transifex sync config
 message.remove.vpc=Favor confirmar que voc\u00ea deseja remover a VPC
 message.remove.vpn.access=Confirme se voc\u00ea deseja remover acesso VPN do seguinte Usu\u00e1rio.
 message.reset.password.warning.notPasswordEnabled=O template desta inst\u00e2ncia foi criado sem senha habilitada

client/WEB-INF/classes/resources/messages_zh_CN.properties

@@ -16,9 +16,7 @@
 # under the License.
 label.port=\u7aef\u53e3
 label.remove.ldap=\u5220\u9664 LDAP
-message.remove.ldap=\u662f\u5426\u786e\u5b9e\u8981\u5220\u9664 LDAP \u914d\u7f6e?
 label.configure.ldap=\u914d\u7f6e LDAP
-message.configure.ldap=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u914d\u7f6e LDAP\u3002
 label.ldap.configuration=LDAP \u914d\u7f6e
 label.ldap.port=LDAP \u7aef\u53e3
 label.create.nfs.secondary.staging.store=\u521b\u5efa NFS \u8f85\u52a9\u6682\u5b58\u5b58\u50a8
@@ -1319,15 +1317,6 @@ label.add.ucs.manager=\u6dfb\u52a0 UCS \u7ba1\u7406\u5668
 label.ovm.traffic.label=OVM \u901a\u4fe1\u6807\u7b7e
 label.lxc.traffic.label=LXC \u901a\u4fe1\u6807\u7b7e
 label.hyperv.traffic.label=HyperV \u901a\u4fe1\u6807\u7b7e
-label.port=\u7aef\u53e3
-label.remove.ldap=\u5220\u9664 LDAP
-label.configure.ldap=\u914d\u7f6e LDAP
-label.ldap.configuration=LDAP \u914d\u7f6e
-label.ldap.port=LDAP \u7aef\u53e3
-label.create.nfs.secondary.staging.store=\u521b\u5efa NFS \u8f85\u52a9\u6682\u5b58\u5b58\u50a8
-label.volatile=\u53ef\u53d8
-label.planner.mode=\u89c4\u5212\u5668\u6a21\u5f0f
-label.deployment.planner=\u90e8\u7f72\u89c4\u5212\u5668
 managed.state=\u6258\u7ba1\u72b6\u6001
 message.acquire.new.ip.vpc=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u4e3a\u6b64 VPC \u83b7\u53d6\u4e00\u4e2a\u65b0 IP\u3002
 message.acquire.new.ip=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u4e3a\u6b64\u7f51\u7edc\u83b7\u53d6\u4e00\u4e2a\u65b0 IP\u3002