summaryrefslogtreecommitdiff
path: root/langpacks/english/=CORE=.txt
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2013-10-04 17:33:10 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2013-10-04 17:33:10 +0000
commit9b5be51e0aa2e7db77884c327ebb73e1ea1dca3f (patch)
treec52970e414850698279399f2609007ef9d68cc58 /langpacks/english/=CORE=.txt
parent879c98ab781c72933ee98b6a65d1a8c56a0aef69 (diff)
Langpack_english.txt eliminated, langpacks/english: updated
git-svn-id: http://svn.miranda-ng.org/main/trunk@6327 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'langpacks/english/=CORE=.txt')
-rw-r--r--langpacks/english/=CORE=.txt19
1 files changed, 10 insertions, 9 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 8ab7bca439..559463d33b 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -220,9 +220,9 @@
[Choose events you wish to ignore:]
[Font Effect]
[Effect:]
-[Base colour:]
+[Base color:]
[opacity:]
-[Secondary colour:]
+[Secondary color:]
[Select the extra icons to be shown in the contact list:]
[* only the first %d icons will be shown]
[You can group/ungroup icons by selecting them (CTRL+left click) and using the popup menu (right click)]
@@ -308,8 +308,8 @@
[Add new rooms to group:]
[Userlist row distance (pixels):]
[Use same style as in the message log]
-[Use default colours]
-[Use custom colours]
+[Use default colors]
+[Use custom colors]
[Popups for the Chat plugin]
[Timeout (s)]
[Text]
@@ -407,8 +407,8 @@
[Gamma correction]
[Grey out entire list when:]
[Contact List Background]
-[Background colour]
-[Selection colour]
+[Background color]
+[Selection color]
[Use background image]
[Stretch to width]
[Stretch to height]
@@ -416,7 +416,7 @@
[Tile vertically]
[Scroll with text]
[Stretch proportionally]
-[Use Windows colours]
+[Use Windows colors]
[Status Bar]
[Show status bar]
[Show icons]
@@ -655,7 +655,7 @@
[Join chat]
[Open chat window]
;file \src\core\stdchat\src\colorchooser.cpp
-[Text colour]
+[Text color]
;file \src\core\stdchat\src\log.cpp
[%s has joined]
[You have joined %s]
@@ -714,7 +714,7 @@
[Display contact status icon before user role icon]
[Prefix all events with a timestamp]
[Only prefix with timestamp if it has changed]
-[Timestamp has same colour as the event]
+[Timestamp has same color as the event]
[Indent the second line of a message]
[Limit user names in the message log to 20 characters]
[Add ':' to auto-completed user names]
@@ -1075,6 +1075,7 @@
[LastName]
[Username]
[FirstName LastName]
+[LastName FirstName]
['(Unknown Contact)' (not moveable)]
['(Unknown Contact)']
[Contact names]