Commits

Patrick Mézard committed 3429d86 Merge

Merge with r503

Comments (0)

Files changed (5)

csharp/PhoneNumbers/Properties/AssemblyInfo.cs

 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("4.10.0.54")]
-[assembly: AssemblyVersion("4.10.0.54")]
-[assembly: AssemblyFileVersion("4.10.0.54")]
+// [assembly: AssemblyVersion("4.10.0.55")]
+[assembly: AssemblyVersion("4.10.0.55")]
+[assembly: AssemblyFileVersion("4.10.0.55")]

csharp/PhoneNumbers/res/prod_353_en

-# Copyright (C) 2012 The Libphonenumber Authors
-
-# 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.
-
-# Originally sourced from:
-# http://www.comreg.ie/gtna/index.html 
-# "Charleville" and "Newcastle West" are chosen over "Rathluirc" and
-# "Newcastlewest" as being the names in common everyday usage, for example the
-# Wikipedia entries for both towns use the former names throughout.
-# http://en.wikipedia.org/wiki/Charleville,_County_Cork,
-# http://en.wikipedia.org/wiki/Newcastle_West 
-
-3531|Dublin
-35321|Cork/Kinsale/Coachford
-35322|Mallow
-35323|Bandon
-35324|Youghal
-35325|Fermoy
-35326|Macroom
-35327|Bantry
-35328|Skibbereen
-35329|Kanturk
-353402|Arklow
-353404|Wicklow
-35341|Drogheda/Ardee
-35342|Dundalk/Carrickmacross/Castleblaney
-35343|Longford/Granard
-35344|Mullingar/Castlepollard/Tyrrellspass
-35345|Naas/Kildare/Curragh
-35346|Navan/Kells/Trim/Edenderry/Enfield
-35347|Monaghan/Clones
-35349|Cavan/Cootehill/Oldcastle/Belturbet
-353504|Thurles
-353505|Roscrea
-35351|Waterford/Carrick-on-Suir/New Ross/Kilmacthomas
-35352|Clonmel/Cahir/Killenaule
-35353|Wexford/Enniscorthy/Ferns/Gorey
-35356|Kilkenny/Castlecomer/Freshford
-35357|Portlaoise/Abbeyleix/Tullamore/Birr
-35358|Dungarvan
-35359|Carlow/Muine Bheag/Athy/Baltinglass
-35361|Limerick/Scariff
-35362|Tipperary/Cashel
-35363|Charleville
-35364|Killarney/Rathmore
-35365|Ennis/Ennistymon/Kilrush
-35366|Tralee/Dingle/Killorglin/Cahersiveen
-35367|Nenagh
-35368|Listowel
-35369|Newcastle West
-35371|Sligo/Manorhamilton/Carrick-on-Shannon
-35374|Letterkenny/Donegal/Dungloe/Buncrana
-35390|Athlone/Ballinasloe/Portumna/Roscommon
-35391|Galway/Gort/Loughrea
-35393|Tuam
-35394|Castlebar/Claremorris/Castlerea/Ballinrobe
-35395|Clifden
-35396|Ballina
-35397|Belmullet
-35398|Westport
-35399|Kilronan
+# Copyright (C) 2012 The Libphonenumber Authors
+
+# 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.
+
+# Originally sourced from:
+# http://www.comreg.ie/gtna/index.html 
+# "Charleville" and "Newcastle West" are chosen over "Rathluirc" and
+# "Newcastlewest" as being the names in common everyday usage, for example the
+# Wikipedia entries for both towns use the former names throughout.
+# http://en.wikipedia.org/wiki/Charleville,_County_Cork,
+# http://en.wikipedia.org/wiki/Newcastle_West 
+
+3531|Dublin
+35321|Cork/Kinsale/Coachford
+35322|Mallow
+35323|Bandon
+35324|Youghal
+35325|Fermoy
+35326|Macroom
+35327|Bantry
+35328|Skibbereen
+35329|Kanturk
+353402|Arklow
+353404|Wicklow
+35341|Drogheda/Ardee
+35342|Dundalk/Carrickmacross/Castleblaney
+35343|Longford/Granard
+35344|Mullingar/Castlepollard/Tyrrellspass
+35345|Naas/Kildare/Curragh
+35346|Navan/Kells/Trim/Edenderry/Enfield
+35347|Monaghan/Clones
+35349|Cavan/Cootehill/Oldcastle/Belturbet
+353504|Thurles
+353505|Roscrea
+35351|Waterford/Carrick-on-Suir/New Ross/Kilmacthomas
+35352|Clonmel/Cahir/Killenaule
+35353|Wexford/Enniscorthy/Ferns/Gorey
+35356|Kilkenny/Castlecomer/Freshford
+35357|Portlaoise/Abbeyleix/Tullamore/Birr
+35358|Dungarvan
+35359|Carlow/Muine Bheag/Athy/Baltinglass
+35361|Limerick/Scariff
+35362|Tipperary/Cashel
+35363|Charleville
+35364|Killarney/Rathmore
+35365|Ennis/Ennistymon/Kilrush
+35366|Tralee/Dingle/Killorglin/Cahersiveen
+35367|Nenagh
+35368|Listowel
+35369|Newcastle West
+35371|Sligo/Manorhamilton/Carrick-on-Shannon
+35374|Letterkenny/Donegal/Dungloe/Buncrana
+35390|Athlone/Ballinasloe/Portumna/Roscommon
+35391|Galway/Gort/Loughrea
+35393|Tuam
+35394|Castlebar/Claremorris/Castlerea/Ballinrobe
+35395|Clifden
+35396|Ballina
+35397|Belmullet
+35398|Westport
+35399|Kilronan

javascript/i18n/phonenumbers/metadata.js

 ,,[,,"1(?:[578]|12)","\\d{2,3}",,,"112"]
 ,[,,"NA","NA"]
 ]
-,"GA":[,[,,"[12]\\d{6}|0\\d{7}","\\d{6,8}"]
-,[,,"(?:1(?:4[4-8]|7\\d)|2(?:4[02]|5[04-689]|6[024-79]|8[236]|9[02368]))\\d{4}","\\d{6,7}",,,"1441234"]
-,[,,"0(?:5(?:0[89]|3[0-4]|8[0-26]|9[238])|6(?:0[3-7]|1[01]|2[0-7]|6[0-589]|71|83|9[57])|7(?:1[2-5]|2[89]|3[35-9]|4[01]|5[0-47-9]|[67]\\d|8[457-9]|9[0146]))\\d{4}","\\d{8}",,,"06031234"]
-,[,,"NA","NA"]
-,[,,"NA","NA"]
-,[,,"NA","NA"]
-,[,,"NA","NA"]
-,[,,"NA","NA"]
-,"GA",241,"00","0",,,"0",,,,[[,"(\\d)(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[12]"]
-,"0$1","",0]
-,[,"(0\\d)(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["0"]
-,"","",0]
-]
-,,[,,"NA","NA"]
-,,,[,,"NA","NA"]
-,[,,"NA","NA"]
-,1,[,,"1730|18|13\\d{2}","\\d{2,4}",,,"1730"]
+,"GA":[,[,,"[1-7]\\d{6}","\\d{7}"]
+,[,,"1\\d{6}","\\d{7}",,,"1441234"]
+,[,,"[2-7]\\d{6}","\\d{7}",,,"6031234"]
+,[,,"NA","NA"]
+,[,,"NA","NA"]
+,[,,"NA","NA"]
+,[,,"NA","NA"]
+,[,,"NA","NA"]
+,"GA",241,"00","0",,,"0",,,,[[,"(\\d)(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",,"0$1","",0]
+]
+,,[,,"NA","NA"]
+,,,[,,"NA","NA"]
+,[,,"NA","NA"]
+,,[,,"1730|18|13\\d{2}","\\d{2,4}",,,"1730"]
 ,[,,"NA","NA"]
 ]
 ,"GB":[,[,,"\\d{7,10}","\\d{4,10}"]
 ,[,,"NA","NA"]
 ]
 ,"IL":[,[,,"[17]\\d{6,9}|[2-589]\\d{3}(?:\\d{3,6})?|6\\d{3}","\\d{4,10}"]
-,[,,"(?:[2-489]|7[2-46-8])\\d{7}","\\d{7,9}",,,"21234567"]
-,[,,"5(?:[02346-9]\\d{2}|5(?:22|33|44|5[58]|66|77|88))\\d{5}","\\d{9}",,,"501234567"]
+,[,,"[2-489]\\d{7}","\\d{7,8}",,,"21234567"]
+,[,,"5(?:[02347-9]\\d{2}|5(?:2[23]|3[34]|4[45]|5[5689]|6[67]|7[78]|8[89])|6[2-9]\\d)\\d{5}","\\d{9}",,,"501234567"]
 ,[,,"1(?:80[019]\\d{3}|255)\\d{3}","\\d{7,10}",,,"1800123456"]
-,[,,"1(?:212|(?:919|200)\\d{2})\\d{4}","\\d{8,10}",,,"1919123456"]
+,[,,"1(?:212|(?:9(?:0[01]|19)|200)\\d{2})\\d{4}","\\d{8,10}",,,"1919123456"]
 ,[,,"1700\\d{6}","\\d{10}",,,"1700123456"]
 ,[,,"NA","NA"]
-,[,,"77\\d{7}","\\d{9}",,,"771234567"]
-,"IL",972,"0(?:0|1[2-48])","0",,,"0",,,,[[,"([2-489])(\\d{3})(\\d{4})","$1-$2-$3",["[2-489]"]
+,[,,"7(?:2[23]\\d|3[237]\\d|47\\d|6(?:5\\d|88)|7\\d{2}|8(?:33|55|77|81))\\d{5}","\\d{9}",,,"771234567"]
+,"IL",972,"0(?:0|1[2-9])","0",,,"0",,,,[[,"([2-489])(\\d{3})(\\d{4})","$1-$2-$3",["[2-489]"]
 ,"0$1","",0]
 ,[,"([57]\\d)(\\d{3})(\\d{4})","$1-$2-$3",["[57]"]
 ,"0$1","",0]

javascript/i18n/phonenumbers/metadatalite.js

 ,,[,,"1(?:[578]|12)","\\d{2,3}"]
 ,[,,"NA","NA"]
 ]
-,"GA":[,[,,"[12]\\d{6}|0\\d{7}","\\d{6,8}"]
-,[,,"(?:1(?:4[4-8]|7\\d)|2(?:4[02]|5[04-689]|6[024-79]|8[236]|9[02368]))\\d{4}","\\d{6,7}"]
-,[,,"0(?:5(?:0[89]|3[0-4]|8[0-26]|9[238])|6(?:0[3-7]|1[01]|2[0-7]|6[0-589]|71|83|9[57])|7(?:1[2-5]|2[89]|3[35-9]|4[01]|5[0-47-9]|[67]\\d|8[457-9]|9[0146]))\\d{4}","\\d{8}"]
-,[,,"NA","NA"]
-,[,,"NA","NA"]
-,[,,"NA","NA"]
-,[,,"NA","NA"]
-,[,,"NA","NA"]
-,"GA",241,"00","0",,,"0",,,,[[,"(\\d)(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[12]"]
-,"0$1","",0]
-,[,"(0\\d)(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["0"]
-,"","",0]
-]
-,,[,,"NA","NA"]
-,,,[,,"NA","NA"]
-,[,,"NA","NA"]
-,1,[,,"1730|18|13\\d{2}","\\d{2,4}"]
+,"GA":[,[,,"[1-7]\\d{6}","\\d{7}"]
+,[,,"1\\d{6}","\\d{7}"]
+,[,,"[2-7]\\d{6}","\\d{7}"]
+,[,,"NA","NA"]
+,[,,"NA","NA"]
+,[,,"NA","NA"]
+,[,,"NA","NA"]
+,[,,"NA","NA"]
+,"GA",241,"00","0",,,"0",,,,[[,"(\\d)(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",,"0$1","",0]
+]
+,,[,,"NA","NA"]
+,,,[,,"NA","NA"]
+,[,,"NA","NA"]
+,,[,,"1730|18|13\\d{2}","\\d{2,4}"]
 ,[,,"NA","NA"]
 ]
 ,"GB":[,[,,"\\d{7,10}","\\d{4,10}"]
 ,[,,"NA","NA"]
 ]
 ,"IL":[,[,,"[17]\\d{6,9}|[2-589]\\d{3}(?:\\d{3,6})?|6\\d{3}","\\d{4,10}"]
-,[,,"(?:[2-489]|7[2-46-8])\\d{7}","\\d{7,9}"]
-,[,,"5(?:[02346-9]\\d{2}|5(?:22|33|44|5[58]|66|77|88))\\d{5}","\\d{9}"]
+,[,,"[2-489]\\d{7}","\\d{7,8}"]
+,[,,"5(?:[02347-9]\\d{2}|5(?:2[23]|3[34]|4[45]|5[5689]|6[67]|7[78]|8[89])|6[2-9]\\d)\\d{5}","\\d{9}"]
 ,[,,"1(?:80[019]\\d{3}|255)\\d{3}","\\d{7,10}"]
-,[,,"1(?:212|(?:919|200)\\d{2})\\d{4}","\\d{8,10}"]
+,[,,"1(?:212|(?:9(?:0[01]|19)|200)\\d{2})\\d{4}","\\d{8,10}"]
 ,[,,"1700\\d{6}","\\d{10}"]
 ,[,,"NA","NA"]
-,[,,"77\\d{7}","\\d{9}"]
-,"IL",972,"0(?:0|1[2-48])","0",,,"0",,,,[[,"([2-489])(\\d{3})(\\d{4})","$1-$2-$3",["[2-489]"]
+,[,,"7(?:2[23]\\d|3[237]\\d|47\\d|6(?:5\\d|88)|7\\d{2}|8(?:33|55|77|81))\\d{5}","\\d{9}"]
+,"IL",972,"0(?:0|1[2-9])","0",,,"0",,,,[[,"([2-489])(\\d{3})(\\d{4})","$1-$2-$3",["[2-489]"]
 ,"0$1","",0]
 ,[,"([57]\\d)(\\d{3})(\\d{4})","$1-$2-$3",["[57]"]
 ,"0$1","",0]

resources/geocoding/en/353.txt

-# Copyright (C) 2012 The Libphonenumber Authors
-
-# 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.
-
-# Originally sourced from:
-# http://www.comreg.ie/gtna/index.html 
-# "Charleville" and "Newcastle West" are chosen over "Rathluirc" and
-# "Newcastlewest" as being the names in common everyday usage, for example the
-# Wikipedia entries for both towns use the former names throughout.
-# http://en.wikipedia.org/wiki/Charleville,_County_Cork,
-# http://en.wikipedia.org/wiki/Newcastle_West 
-
-3531|Dublin
-35321|Cork/Kinsale/Coachford
-35322|Mallow
-35323|Bandon
-35324|Youghal
-35325|Fermoy
-35326|Macroom
-35327|Bantry
-35328|Skibbereen
-35329|Kanturk
-353402|Arklow
-353404|Wicklow
-35341|Drogheda/Ardee
-35342|Dundalk/Carrickmacross/Castleblaney
-35343|Longford/Granard
-35344|Mullingar/Castlepollard/Tyrrellspass
-35345|Naas/Kildare/Curragh
-35346|Navan/Kells/Trim/Edenderry/Enfield
-35347|Monaghan/Clones
-35349|Cavan/Cootehill/Oldcastle/Belturbet
-353504|Thurles
-353505|Roscrea
-35351|Waterford/Carrick-on-Suir/New Ross/Kilmacthomas
-35352|Clonmel/Cahir/Killenaule
-35353|Wexford/Enniscorthy/Ferns/Gorey
-35356|Kilkenny/Castlecomer/Freshford
-35357|Portlaoise/Abbeyleix/Tullamore/Birr
-35358|Dungarvan
-35359|Carlow/Muine Bheag/Athy/Baltinglass
-35361|Limerick/Scariff
-35362|Tipperary/Cashel
-35363|Charleville
-35364|Killarney/Rathmore
-35365|Ennis/Ennistymon/Kilrush
-35366|Tralee/Dingle/Killorglin/Cahersiveen
-35367|Nenagh
-35368|Listowel
-35369|Newcastle West
-35371|Sligo/Manorhamilton/Carrick-on-Shannon
-35374|Letterkenny/Donegal/Dungloe/Buncrana
-35390|Athlone/Ballinasloe/Portumna/Roscommon
-35391|Galway/Gort/Loughrea
-35393|Tuam
-35394|Castlebar/Claremorris/Castlerea/Ballinrobe
-35395|Clifden
-35396|Ballina
-35397|Belmullet
-35398|Westport
-35399|Kilronan
+# Copyright (C) 2012 The Libphonenumber Authors
+
+# 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.
+
+# Originally sourced from:
+# http://www.comreg.ie/gtna/index.html 
+# "Charleville" and "Newcastle West" are chosen over "Rathluirc" and
+# "Newcastlewest" as being the names in common everyday usage, for example the
+# Wikipedia entries for both towns use the former names throughout.
+# http://en.wikipedia.org/wiki/Charleville,_County_Cork,
+# http://en.wikipedia.org/wiki/Newcastle_West 
+
+3531|Dublin
+35321|Cork/Kinsale/Coachford
+35322|Mallow
+35323|Bandon
+35324|Youghal
+35325|Fermoy
+35326|Macroom
+35327|Bantry
+35328|Skibbereen
+35329|Kanturk
+353402|Arklow
+353404|Wicklow
+35341|Drogheda/Ardee
+35342|Dundalk/Carrickmacross/Castleblaney
+35343|Longford/Granard
+35344|Mullingar/Castlepollard/Tyrrellspass
+35345|Naas/Kildare/Curragh
+35346|Navan/Kells/Trim/Edenderry/Enfield
+35347|Monaghan/Clones
+35349|Cavan/Cootehill/Oldcastle/Belturbet
+353504|Thurles
+353505|Roscrea
+35351|Waterford/Carrick-on-Suir/New Ross/Kilmacthomas
+35352|Clonmel/Cahir/Killenaule
+35353|Wexford/Enniscorthy/Ferns/Gorey
+35356|Kilkenny/Castlecomer/Freshford
+35357|Portlaoise/Abbeyleix/Tullamore/Birr
+35358|Dungarvan
+35359|Carlow/Muine Bheag/Athy/Baltinglass
+35361|Limerick/Scariff
+35362|Tipperary/Cashel
+35363|Charleville
+35364|Killarney/Rathmore
+35365|Ennis/Ennistymon/Kilrush
+35366|Tralee/Dingle/Killorglin/Cahersiveen
+35367|Nenagh
+35368|Listowel
+35369|Newcastle West
+35371|Sligo/Manorhamilton/Carrick-on-Shannon
+35374|Letterkenny/Donegal/Dungloe/Buncrana
+35390|Athlone/Ballinasloe/Portumna/Roscommon
+35391|Galway/Gort/Loughrea
+35393|Tuam
+35394|Castlebar/Claremorris/Castlerea/Ballinrobe
+35395|Clifden
+35396|Ballina
+35397|Belmullet
+35398|Westport
+35399|Kilronan