mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2024-11-08 12:12:48 +01:00
Resolve conflicts
This commit is contained in:
vagrant
commit
3e912db1cb
@ -1674,6 +1674,317 @@ $LANG = array(
|
||||
'country_Yemen' => 'Yemen',
|
||||
'country_Zambi' => 'Zambi',
|
||||
|
||||
// Frequencies
|
||||
'freq_weekly' => 'Weekly',
|
||||
'freq_two_weeks' => 'Two weeks',
|
||||
'freq_four_weeks' => 'Four weeks',
|
||||
'freq_monthly' => 'Monthly',
|
||||
'freq_three_months' => 'Three months',
|
||||
'freq_six_months' => 'Six months',
|
||||
'freq_annually' => 'Annually',
|
||||
|
||||
// Payment types
|
||||
'payment_type_Apply Credit' => 'Apply Credit',
|
||||
'payment_type_Bank Transfer' => 'Bank Transfer',
|
||||
'payment_type_Cash' => 'Cash',
|
||||
'payment_type_Debit' => 'Debit',
|
||||
'payment_type_ACH' => 'ACH',
|
||||
'payment_type_Visa Card' => 'Visa Card',
|
||||
'payment_type_MasterCard' => 'MasterCard',
|
||||
'payment_type_American Express' => 'American Express',
|
||||
'payment_type_Discover Card' => 'Discover Card',
|
||||
'payment_type_Diners Card' => 'Diners Card',
|
||||
'payment_type_EuroCard' => 'EuroCard',
|
||||
'payment_type_Nova' => 'Nova',
|
||||
'payment_type_Credit Card Other' => 'Credit Card Other',
|
||||
'payment_type_PayPal' => 'PayPal',
|
||||
'payment_type_Google Wallet' => 'Google Wallet',
|
||||
'payment_type_Check' => 'Check',
|
||||
|
||||
// Industries
|
||||
'industry_Accounting & Legal' => 'Accounting & Legal',
|
||||
'industry_Advertising' => 'Advertising',
|
||||
'industry_Aerospace' => 'Aerospace',
|
||||
'industry_Agriculture' => 'Agriculture',
|
||||
'industry_Automotive' => 'Automotive',
|
||||
'industry_Banking & Finance' => 'Banking & Finance',
|
||||
'industry_Biotechnology' => 'Biotechnology',
|
||||
'industry_Broadcasting' => 'Broadcasting',
|
||||
'industry_Business Services' => 'Business Services',
|
||||
'industry_Commodities & Chemicals' => 'Commodities & Chemicals',
|
||||
'industry_Communications' => 'Communications',
|
||||
'industry_Computers & Hightech' => 'Computers & Hightech',
|
||||
'industry_Defense' => 'Defense',
|
||||
'industry_Energy' => 'Energy',
|
||||
'industry_Entertainment' => 'Entertainment',
|
||||
'industry_Government' => 'Government',
|
||||
'industry_Healthcare & Life Sciences' => 'Healthcare & Life Sciences',
|
||||
'industry_Insurance' => 'Insurance',
|
||||
'industry_Manufacturing' => 'Manufacturing',
|
||||
'industry_Marketing' => 'Marketing',
|
||||
'industry_Media' => 'Media',
|
||||
'industry_Nonprofit & Higher Ed' => 'Nonprofit & Higher Ed',
|
||||
'industry_Pharmaceuticals' => 'Pharmaceuticals',
|
||||
'industry_Professional Services & Consulting' => 'Professional Services & Consulting',
|
||||
'industry_Real Estate' => 'Real Estate',
|
||||
'industry_Retail & Wholesale' => 'Retail & Wholesale',
|
||||
'industry_Sports' => 'Sports',
|
||||
'industry_Transportation' => 'Transportation',
|
||||
'industry_Travel & Luxury' => 'Travel & Luxury',
|
||||
'industry_Other' => 'Other',
|
||||
'industry_Photography' =>'Photography',
|
||||
|
||||
// Countries
|
||||
'country_Afghanistan' => 'Afghanistan',
|
||||
'country_Albania' => 'Albania',
|
||||
'country_Antarctica' => 'Antarctica',
|
||||
'country_Algeria' => 'Algeria',
|
||||
'country_American Samoa' => 'American Samoa',
|
||||
'country_Andorra' => 'Andorra',
|
||||
'country_Angola' => 'Angola',
|
||||
'country_Antigua and Barbuda' => 'Antigua and Barbuda',
|
||||
'country_Azerbaijan' => 'Azerbaijan',
|
||||
'country_Argentina' => 'Argentina',
|
||||
'country_Australia' => 'Australia',
|
||||
'country_Austria' => 'Austria',
|
||||
'country_Bahamas' => 'Bahamas',
|
||||
'country_Bahrain' => 'Bahrain',
|
||||
'country_Bangladesh' => 'Bangladesh',
|
||||
'country_Armenia' => 'Armenia',
|
||||
'country_Barbados' => 'Barbados',
|
||||
'country_Belgium' => 'Belgium',
|
||||
'country_Bermuda' => 'Bermuda',
|
||||
'country_Bhutan' => 'Bhutan',
|
||||
'country_Bolivia, Plurinational State of' => 'Bolivia, Plurinational State of',
|
||||
'country_Bosnia and Herzegovina' => 'Bosnia and Herzegovina',
|
||||
'country_Botswana' => 'Botswana',
|
||||
'country_Bouvet Island' => 'Bouvet Island',
|
||||
'country_Brazil' => 'Brazil',
|
||||
'country_Belize' => 'Belize',
|
||||
'country_British Indian Ocean Territory' => 'British Indian Ocean Territory',
|
||||
'country_Solomon Islands' => 'Solomon Islands',
|
||||
'country_Virgin Islands, British' => 'Virgin Islands, British',
|
||||
'country_Brunei Darussalam' => 'Brunei Darussalam',
|
||||
'country_Bulgaria' => 'Bulgaria',
|
||||
'country_Myanmar' => 'Myanmar',
|
||||
'country_Burundi' => 'Burundi',
|
||||
'country_Belarus' => 'Belarus',
|
||||
'country_Cambodia' => 'Cambodia',
|
||||
'country_Cameroon' => 'Cameroon',
|
||||
'country_Canada' => 'Canada',
|
||||
'country_Cape Verde' => 'Cape Verde',
|
||||
'country_Cayman Islands' => 'Cayman Islands',
|
||||
'country_Central African Republic' => 'Central African Republic',
|
||||
'country_Sri Lanka' => 'Sri Lanka',
|
||||
'country_Chad' => 'Chad',
|
||||
'country_Chile' => 'Chile',
|
||||
'country_China' => 'China',
|
||||
'country_Taiwan, Province of China' => 'Taiwan, Province of China',
|
||||
'country_Christmas Island' => 'Christmas Island',
|
||||
'country_Cocos (Keeling) Islands' => 'Cocos (Keeling) Islands',
|
||||
'country_Colombia' => 'Colombia',
|
||||
'country_Comoros' => 'Comoros',
|
||||
'country_Mayotte' => 'Mayotte',
|
||||
'country_Congo' => 'Congo',
|
||||
'country_Congo, the Democratic Republic of the' => 'Congo, the Democratic Republic of the',
|
||||
'country_Cook Islands' => 'Cook Islands',
|
||||
'country_Costa Rica' => 'Costa Rica',
|
||||
'country_Croatia' => 'Croatia',
|
||||
'country_Cuba' => 'Cuba',
|
||||
'country_Cyprus' => 'Cyprus',
|
||||
'country_Czech Republic' => 'Czech Republic',
|
||||
'country_Benin' => 'Benin',
|
||||
'country_Denmark' => 'Denmark',
|
||||
'country_Dominica' => 'Dominica',
|
||||
'country_Dominican Republic' => 'Dominican Republic',
|
||||
'country_Ecuador' => 'Ecuador',
|
||||
'country_El Salvador' => 'El Salvador',
|
||||
'country_Equatorial Guinea' => 'Equatorial Guinea',
|
||||
'country_Ethiopia' => 'Ethiopia',
|
||||
'country_Eritrea' => 'Eritrea',
|
||||
'country_Estonia' => 'Estonia',
|
||||
'country_Faroe Islands' => 'Faroe Islands',
|
||||
'country_Falkland Islands (Malvinas)' => 'Falkland Islands (Malvinas)',
|
||||
'country_South Georgia and the South Sandwich Islands' => 'South Georgia and the South Sandwich Islands',
|
||||
'country_Fiji' => 'Fiji',
|
||||
'country_Finland' => 'Finland',
|
||||
'country_Åland Islands' => 'Åland Islands',
|
||||
'country_France' => 'France',
|
||||
'country_French Guiana' => 'French Guiana',
|
||||
'country_French Polynesia' => 'French Polynesia',
|
||||
'country_French Southern Territories' => 'French Southern Territories',
|
||||
'country_Djibouti' => 'Djibouti',
|
||||
'country_Gabon' => 'Gabon',
|
||||
'country_Georgia' => 'Georgia',
|
||||
'country_Gambia' => 'Gambia',
|
||||
'country_Palestinian Territory, Occupied' => 'Palestinian Territory, Occupied',
|
||||
'country_Germany' => 'Germany',
|
||||
'country_Ghana' => 'Ghana',
|
||||
'country_Gibraltar' => 'Gibraltar',
|
||||
'country_Kiribati' => 'Kiribati',
|
||||
'country_Greece' => 'Greece',
|
||||
'country_Greenland' => 'Greenland',
|
||||
'country_Grenada' => 'Grenada',
|
||||
'country_Guadeloupe' => 'Guadeloupe',
|
||||
'country_Guam' => 'Guam',
|
||||
'country_Guatemala' => 'Guatemala',
|
||||
'country_Guinea' => 'Guinea',
|
||||
'country_Guyana' => 'Guyana',
|
||||
'country_Haiti' => 'Haiti',
|
||||
'country_Heard Island and McDonald Islands' => 'Heard Island and McDonald Islands',
|
||||
'country_Holy See (Vatican City State)' => 'Holy See (Vatican City State)',
|
||||
'country_Honduras' => 'Honduras',
|
||||
'country_Hong Kong' => 'Hong Kong',
|
||||
'country_Hungary' => 'Hungary',
|
||||
'country_Iceland' => 'Iceland',
|
||||
'country_India' => 'India',
|
||||
'country_Indonesia' => 'Indonesia',
|
||||
'country_Iran, Islamic Republic of' => 'Iran, Islamic Republic of',
|
||||
'country_Iraq' => 'Iraq',
|
||||
'country_Ireland' => 'Ireland',
|
||||
'country_Israel' => 'Israel',
|
||||
'country_Italy' => 'Italy',
|
||||
'country_Côte d\'Ivoire' => 'Côte d\'Ivoire',
|
||||
'country_Jamaica' => 'Jamaica',
|
||||
'country_Japan' => 'Japan',
|
||||
'country_Kazakhstan' => 'Kazakhstan',
|
||||
'country_Jordan' => 'Jordan',
|
||||
'country_Kenya' => 'Kenya',
|
||||
'country_Korea, Democratic People\'s Republic of' => 'Korea, Democratic People\'s Republic of',
|
||||
'country_Korea, Republic of' => 'Korea, Republic of',
|
||||
'country_Kuwait' => 'Kuwait',
|
||||
'country_Kyrgyzstan' => 'Kyrgyzstan',
|
||||
'country_Lao People\'s Democratic Republic' => 'Lao People\'s Democratic Republic',
|
||||
'country_Lebanon' => 'Lebanon',
|
||||
'country_Lesotho' => 'Lesotho',
|
||||
'country_Latvia' => 'Latvia',
|
||||
'country_Liberia' => 'Liberia',
|
||||
'country_Libya' => 'Libya',
|
||||
'country_Liechtenstein' => 'Liechtenstein',
|
||||
'country_Lithuania' => 'Lithuania',
|
||||
'country_Luxembourg' => 'Luxembourg',
|
||||
'country_Macao' => 'Macao',
|
||||
'country_Madagascar' => 'Madagascar',
|
||||
'country_Malawi' => 'Malawi',
|
||||
'country_Malaysia' => 'Malaysia',
|
||||
'country_Maldives' => 'Maldives',
|
||||
'country_Mali' => 'Mali',
|
||||
'country_Malta' => 'Malta',
|
||||
'country_Martinique' => 'Martinique',
|
||||
'country_Mauritania' => 'Mauritania',
|
||||
'country_Mauritius' => 'Mauritius',
|
||||
'country_Mexico' => 'Mexico',
|
||||
'country_Monaco' => 'Monaco',
|
||||
'country_Mongolia' => 'Mongolia',
|
||||
'country_Moldova, Republic of' => 'Moldova, Republic of',
|
||||
'country_Montenegro' => 'Montenegro',
|
||||
'country_Montserrat' => 'Montserrat',
|
||||
'country_Morocco' => 'Morocco',
|
||||
'country_Mozambique' => 'Mozambique',
|
||||
'country_Oman' => 'Oman',
|
||||
'country_Namibia' => 'Namibia',
|
||||
'country_Nauru' => 'Nauru',
|
||||
'country_Nepal' => 'Nepal',
|
||||
'country_Netherlands' => 'Netherlands',
|
||||
'country_Curaçao' => 'Curaçao',
|
||||
'country_Aruba' => 'Aruba',
|
||||
'country_Sint Maarten (Dutch part)' => 'Sint Maarten (Dutch part)',
|
||||
'country_Bonaire, Sint Eustatius and Saba' => 'Bonaire, Sint Eustatius and Saba',
|
||||
'country_New Caledonia' => 'New Caledonia',
|
||||
'country_Vanuatu' => 'Vanuatu',
|
||||
'country_New Zealand' => 'New Zealand',
|
||||
'country_Nicaragua' => 'Nicaragua',
|
||||
'country_Niger' => 'Niger',
|
||||
'country_Nigeria' => 'Nigeria',
|
||||
'country_Niue' => 'Niue',
|
||||
'country_Norfolk Island' => 'Norfolk Island',
|
||||
'country_Norway' => 'Norway',
|
||||
'country_Northern Mariana Islands' => 'Northern Mariana Islands',
|
||||
'country_United States Minor Outlying Islands' => 'United States Minor Outlying Islands',
|
||||
'country_Micronesia, Federated States of' => 'Micronesia, Federated States of',
|
||||
'country_Marshall Islands' => 'Marshall Islands',
|
||||
'country_Palau' => 'Palau',
|
||||
'country_Pakistan' => 'Pakistan',
|
||||
'country_Panama' => 'Panama',
|
||||
'country_Papua New Guinea' => 'Papua New Guinea',
|
||||
'country_Paraguay' => 'Paraguay',
|
||||
'country_Peru' => 'Peru',
|
||||
'country_Philippines' => 'Philippines',
|
||||
'country_Pitcairn' => 'Pitcairn',
|
||||
'country_Poland' => 'Poland',
|
||||
'country_Portugal' => 'Portugal',
|
||||
'country_Guinea-Bissau' => 'Guinea-Bissau',
|
||||
'country_Timor-Leste' => 'Timor-Leste',
|
||||
'country_Puerto Rico' => 'Puerto Rico',
|
||||
'country_Qatar' => 'Qatar',
|
||||
'country_Réunion' => 'Réunion',
|
||||
'country_Romania' => 'Romania',
|
||||
'country_Russian Federation' => 'Russian Federation',
|
||||
'country_Rwanda' => 'Rwanda',
|
||||
'country_Saint Barthélemy' => 'Saint Barthélemy',
|
||||
'country_Saint Helena, Ascension and Tristan da Cunha' => 'Saint Helena, Ascension and Tristan da Cunha',
|
||||
'country_Saint Kitts and Nevis' => 'Saint Kitts and Nevis',
|
||||
'country_Anguilla' => 'Anguilla',
|
||||
'country_Saint Lucia' => 'Saint Lucia',
|
||||
'country_Saint Martin (French part)' => 'Saint Martin (French part)',
|
||||
'country_Saint Pierre and Miquelon' => 'Saint Pierre and Miquelon',
|
||||
'country_Saint Vincent and the Grenadines' => 'Saint Vincent and the Grenadines',
|
||||
'country_San Marino' => 'San Marino',
|
||||
'country_Sao Tome and Principe' => 'Sao Tome and Principe',
|
||||
'country_Saudi Arabia' => 'Saudi Arabia',
|
||||
'country_Senegal' => 'Senegal',
|
||||
'country_Serbia' => 'Serbia',
|
||||
'country_Seychelles' => 'Seychelles',
|
||||
'country_Sierra Leone' => 'Sierra Leone',
|
||||
'country_Singapore' => 'Singapore',
|
||||
'country_Slovakia' => 'Slovakia',
|
||||
'country_Viet Nam' => 'Viet Nam',
|
||||
'country_Slovenia' => 'Slovenia',
|
||||
'country_Somalia' => 'Somalia',
|
||||
'country_South Africa' => 'South Africa',
|
||||
'country_Zimbabwe' => 'Zimbabwe',
|
||||
'country_Spain' => 'Spain',
|
||||
'country_South Sudan' => 'South Sudan',
|
||||
'country_Sudan' => 'Sudan',
|
||||
'country_Western Sahara' => 'Western Sahara',
|
||||
'country_Suriname' => 'Suriname',
|
||||
'country_Svalbard and Jan Mayen' => 'Svalbard and Jan Mayen',
|
||||
'country_Swaziland' => 'Swaziland',
|
||||
'country_Sweden' => 'Sweden',
|
||||
'country_Switzerland' => 'Switzerland',
|
||||
'country_Syrian Arab Republic' => 'Syrian Arab Republic',
|
||||
'country_Tajikistan' => 'Tajikistan',
|
||||
'country_Thailand' => 'Thailand',
|
||||
'country_Togo' => 'Togo',
|
||||
'country_Tokelau' => 'Tokelau',
|
||||
'country_Tonga' => 'Tonga',
|
||||
'country_Trinidad and Tobago' => 'Trinidad and Tobago',
|
||||
'country_United Arab Emirates' => 'United Arab Emirates',
|
||||
'country_Tunisia' => 'Tunisia',
|
||||
'country_Turkey' => 'Turkey',
|
||||
'country_Turkmenistan' => 'Turkmenistan',
|
||||
'country_Turks and Caicos Islands' => 'Turks and Caicos Islands',
|
||||
'country_Tuvalu' => 'Tuvalu',
|
||||
'country_Uganda' => 'Uganda',
|
||||
'country_Ukraine' => 'Ukraine',
|
||||
'country_Macedonia, the former Yugoslav Republic of' => 'Macedonia, the former Yugoslav Republic of',
|
||||
'country_Egypt' => 'Egypt',
|
||||
'country_United Kingdom' => 'United Kingdom',
|
||||
'country_Guernsey' => 'Guernsey',
|
||||
'country_Jersey' => 'Jersey',
|
||||
'country_Isle of Man' => 'Isle of Man',
|
||||
'country_Tanzania, United Republic of' => 'Tanzania, United Republic of',
|
||||
'country_United States' => 'United States',
|
||||
'country_Virgin Islands, U.S.' => 'Virgin Islands, U.S.',
|
||||
'country_Burkina Faso' => 'Burkina Faso',
|
||||
'country_Uruguay' => 'Uruguay',
|
||||
'country_Uzbekistan' => 'Uzbekistan',
|
||||
'country_Venezuela, Bolivarian Republic of' => 'Venezuela, Bolivarian Republic of',
|
||||
'country_Wallis and Futuna' => 'Wallis and Futuna',
|
||||
'country_Samoa' => 'Samoa',
|
||||
'country_Yemen' => 'Yemen',
|
||||
'country_Zambi' => 'Zambi',
|
||||
|
||||
);
|
||||
|
||||
return $LANG;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user