diff options
| author | Lars Op den Kamp <lars@opdenkamp.eu> | 2011-01-10 19:35:18 +0100 |
|---|---|---|
| committer | Lars Op den Kamp <lars@opdenkamp.eu> | 2011-01-10 19:35:18 +0100 |
| commit | 84d889efa1a6d41c2c3c48569a83d846e3fcf014 (patch) | |
| tree | 213636827ea5ee0f065d5d378437125246321ef7 /language/English | |
| parent | 7222d40f99bac414147c880be2f0aa3f0c9d7249 (diff) | |
| parent | 4476b2df112bfa69abe6e142346c574016371b58 (diff) | |
Merge remote branch 'upstream/master'
Conflicts:
.gitignore
Diffstat (limited to 'language/English')
| -rw-r--r-- | language/English/strings.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/language/English/strings.xml b/language/English/strings.xml index 0c8694af3b..e6930af9fd 100644 --- a/language/English/strings.xml +++ b/language/English/strings.xml @@ -193,7 +193,7 @@ <string id="221">Network is not connected</string> <string id="222">Cancel</string> <string id="224">Speed</string> - + <string id="225">Vertical Shift</string> <string id="226">Test patterns...</string> <string id="227">Lookup audio CD track names from freedb.org</string> <string id="228">Shuffle playlist on load</string> @@ -213,7 +213,7 @@ <string id="242">Windowed</string> <string id="243">Refresh Rate</string> <string id="244">Full screen</string> - <string id="245">Sizing: (%i,%i)->(%i,%i) (Zoom x%2.2f) AR:%2.2f:1 (Pixels: %2.2f:1)</string> + <string id="245">Sizing: (%i,%i)->(%i,%i) (Zoom x%2.2f) AR:%2.2f:1 (Pixels: %2.2f:1) (VShift: %2.2f)</string> <string id="247">Scripts</string> <string id="248">Language</string> |