Skip to content

Commit 6de6580

Browse files
authored
Merge pull request #1099 from ychin/macvim-localized-menus
Macvim add localized menus
2 parents 6dc1510 + 44a5ba7 commit 6de6580

File tree

101 files changed

+2745
-218
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+2745
-218
lines changed

runtime/doc/gui_mac.txt

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,7 @@ desired.
9393

9494
*macvim-default-menu*
9595
The default menu in MacVim has been changed to conform better with the Apple
96-
Human Interface Guidelines (HIG). At the moment this breaks the localized
97-
menus, so only English menus are supported.
96+
Human Interface Guidelines (HIG).
9897

9998
Note: The menus are a work in progress. If you know something about the HIG
10099
and want to contribute to MacVim you could do so by making the menus better.
@@ -758,7 +757,7 @@ As another example, here is how to switch buffers by swiping left/right: >
758757
See the section on |key-mapping| for more help on how to map keys.
759758

760759
==============================================================================
761-
14. International *macvim-international*
760+
14. International *macvim-international* *macvim-multilang*
762761

763762
Typing text ~
764763

@@ -782,10 +781,11 @@ to use in normal mode and type ":set imd" followed by ":set noimd".
782781

783782
Translations ~
784783

785-
MacVim uses localized Vim messages (see |multilang-messages|), but there are
786-
MacVim-specific messages that are not currently localized. Please file an
787-
issue if you would like to see certain messages localized. Menus
788-
(|multilang-menus|) are currently not localized in MacVim.
784+
MacVim uses localized Vim messages (see |multilang-messages|) and menus (see
785+
|multilang-menus|). However, some of the user interface in MacVim (e.g.
786+
Preference pane) are not yet localized. There are also some MacVim-specific
787+
messages/menus in Vim that are not currently localized. Please file an issue
788+
if you would like to see certain messages localized.
789789

790790
==============================================================================
791791
15. Known bugs/missing features *macvim-todo*
@@ -800,9 +800,8 @@ prominent bugs/missing features.
800800
- |modifyOtherKeys| support. This feature allows for more granular key
801801
mapping (e.g. differentiating <C-I> and <Tab>) and isn't supported by the
802802
MacVim GUI yet.
803-
- Localized menus are not supported. Choosing anything but "English" in the
804-
"International" pane of "System Prefences" may break the menus (and
805-
toolbar).
803+
- Some parts of MacVim GUI and MacVim-specific messages in Vim are not
804+
localized yet.
806805
- Sometimes multibyte characters look "too wide", i.e. they overlap the
807806
following character. It might help to change 'ambiwidth', or override the
808807
automatic font substitution by setting 'guifontwide' manually.
@@ -863,11 +862,6 @@ You do not want MacVim to set up any key mappings.
863862
Solution: ~
864863
See |cmd-movement|.
865864

866-
Scenario: ~
867-
Enabling localized menus breaks the toolbar and the menus as well.
868-
Solution: ~
869-
This is a known problem, see |macvim-todo|.
870-
871865
Scenario: ~
872866
When you click the (green) full screen button you want the window to maximize
873867
instead of going full screen. You would also like it to maximize both

runtime/doc/tags

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7798,6 +7798,7 @@ macvim-hints gui_mac.txt /*macvim-hints*
77987798
macvim-international gui_mac.txt /*macvim-international*
77997799
macvim-login-shell gui_mac.txt /*macvim-login-shell*
78007800
macvim-menus gui_mac.txt /*macvim-menus*
7801+
macvim-multilang gui_mac.txt /*macvim-multilang*
78017802
macvim-options gui_mac.txt /*macvim-options*
78027803
macvim-preferences gui_mac.txt /*macvim-preferences*
78037804
macvim-prefs gui_mac.txt /*macvim-prefs*

runtime/lang/macvim_menu/README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
This folder contains MacVim-specific menu translations. While Vim already has menu translations, MacVim has some unique menu items and some Vim menu items are renamed to fit Apple's HIG better. As such, they need to be translated as well. Note that not 100% of the menu items in all locales are all translated right now, but the majority of them should be covered.
2+
3+
Each locale has up to two translation files that will be sourced into the main menu translation file for that locale:
4+
5+
* <locale>.apple.vim: This contains official Apple translations for common menu items such as "New Window" and "Font". They were auto-generated by using a script (`src/MacVim/scripts/extract-specific-localised-strings.swift`) to extracts official translations from Apple Developer's glossaries (https://developer.apple.com/download/more/?=glossaries).
6+
* <locale>.custom.vim: This contains custom translations that don't have easy official translations to look up and have to be manually translated.
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
" This file was generated from Apple localization glossaries (Catalan).
2+
" Do not modify this file directly!
3+
4+
menutrans New\ Window Nova\ finestra
5+
menutrans New\ Tab Nova\ pestanya
6+
menutrans Open… Obrir…
7+
menutrans Open\ Recent Obrir\ recents
8+
menutrans Close\ Window<Tab>:qa Tancar\ finestra
9+
menutrans Close<Tab>:q Tancar
10+
menutrans Save\ As…<Tab>:sav Desar\ com\ a
11+
menutrans Save\ All Desar-ho\ tot
12+
menutrans Find Buscar
13+
menutrans Find… Buscar…
14+
menutrans Find\ Next Buscar\ el\ següent
15+
menutrans Find\ Previous Buscar\ l’anterior
16+
menutrans Use\ Selection\ for\ Find Utilitzar\ la\ selecció\ per\ buscar
17+
menutrans Font Tipus\ de\ lletra
18+
menutrans Show\ Fonts Mostrar\ els\ tipus\ de\ lletra
19+
menutrans Bigger Més\ gran
20+
menutrans Smaller Més\ petita
21+
menutrans Minimize Minimitzar
22+
menutrans Minimize\ All Minimitzar-ho\ tot
23+
menutrans Zoom Zoom
24+
menutrans Zoom\ All Fer\ zoom\ a\ tot
25+
menutrans Show\ Next\ Tab Mostrar\ la\ pestanya\ següent
26+
menutrans Show\ Previous\ Tab Mostrar\ la\ pestanya\ anterior
27+
menutrans Bring\ All\ to\ Front Portar-ho\ tot\ a\ primer\ pla
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
menutrans MacVim\ Help Ajuda\ MacVim
2+
menutrans MacVim\ Website Lloc\ web\ de\ MacVim
3+
menutrans Vim\ Tutor Tutor\ del\ Vim
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
" This file was generated from Apple localization glossaries (Czech).
2+
" Do not modify this file directly!
3+
4+
menutrans New\ Window Nové\ okno
5+
menutrans New\ Tab Nový\ panel
6+
menutrans Open… Otevřít
7+
menutrans Open\ Recent Otevřít\ poslední\ položku
8+
menutrans Close\ Window<Tab>:qa Zavřít\ okno
9+
menutrans Close<Tab>:q Zavřít
10+
menutrans Save\ As…<Tab>:sav Uložit\ jako…
11+
menutrans Save\ All Uložit\ vše
12+
menutrans Find Hledání
13+
menutrans Find… Hledat…
14+
menutrans Find\ Next Hledat\ další
15+
menutrans Find\ Previous Hledat\ předchozí
16+
menutrans Use\ Selection\ for\ Find Hledat\ výběr
17+
menutrans Font Písmo
18+
menutrans Show\ Fonts Zobrazit\ písma
19+
menutrans Bigger Zvětšit
20+
menutrans Smaller Zmenšit
21+
menutrans Minimize Minimalizovat
22+
menutrans Minimize\ All Minimalizovat\ vše
23+
menutrans Zoom Přepnout\ velikost
24+
menutrans Zoom\ All Přepnout\ velikost\ všech
25+
menutrans Show\ Next\ Tab Zobrazit\ další\ panel
26+
menutrans Show\ Previous\ Tab Zobrazit\ předchozí\ panel
27+
menutrans Bring\ All\ to\ Front Převést\ vše\ do\ popředí
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
menutrans MacVim\ Help Nápověda\ pro\ MacVim
2+
menutrans MacVim\ Website Webové\ stránky\ MacVim
3+
menutrans Vim\ Tutor Vim\ Tutor
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
" This file was generated from Apple localization glossaries (Danish).
2+
" Do not modify this file directly!
3+
4+
menutrans New\ Window Nyt\ vindue
5+
menutrans New\ Tab Ny\ fane
6+
menutrans Open… Åbn
7+
menutrans Open\ Recent Åbn\ seneste
8+
menutrans Close\ Window<Tab>:qa Luk\ vindue
9+
menutrans Close<Tab>:q Luk
10+
menutrans Save\ As…<Tab>:sav Gem\ som…
11+
menutrans Save\ All Gem\ alle
12+
menutrans Find Find
13+
menutrans Find… Find…
14+
menutrans Find\ Next Find\ næste
15+
menutrans Find\ Previous Find\ forrige
16+
menutrans Use\ Selection\ for\ Find Søg\ med\ det\ valgte
17+
menutrans Font Skrift
18+
menutrans Show\ Fonts Vis\ skrifter
19+
menutrans Bigger Større
20+
menutrans Smaller Mindre
21+
menutrans Minimize Minimer
22+
menutrans Minimize\ All Minimer\ alle
23+
menutrans Zoom Zoom
24+
menutrans Zoom\ All Zoom\ alle
25+
menutrans Show\ Next\ Tab Vis\ næste\ fane
26+
menutrans Show\ Previous\ Tab Vis\ forrige\ fane
27+
menutrans Bring\ All\ to\ Front Anbring\ alle\ forrest
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
menutrans MacVim\ Help Hjælp\ til\ MacVim
2+
menutrans MacVim\ Website MacVim-websted
3+
menutrans Vim\ Tutor Vim-vejledningen
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
" This file was generated from Apple localization glossaries (German).
2+
" Do not modify this file directly!
3+
4+
menutrans New\ Window Neues\ Fenster
5+
menutrans New\ Tab Neuer\ Tab
6+
menutrans Open… Öffnen\
7+
menutrans Open\ Recent Benutzte\ Dokumente
8+
menutrans Close\ Window<Tab>:qa Fenster\ schließen
9+
menutrans Close<Tab>:q Schließen
10+
menutrans Save\ As…<Tab>:sav Sichern\ unter\
11+
menutrans Save\ All Alles\ sichern
12+
menutrans Find Suchen
13+
menutrans Find… Suchen\
14+
menutrans Find\ Next Weitersuchen\ (vorwärts)
15+
menutrans Find\ Previous Weitersuchen\ (rückwärts)
16+
menutrans Use\ Selection\ for\ Find Auswahl\ für\ Suche\ übernehmen
17+
menutrans Font Schrift
18+
menutrans Show\ Fonts Schriften\ einblenden
19+
menutrans Bigger Größer
20+
menutrans Smaller Kleiner
21+
menutrans Minimize Im\ Dock\ ablegen
22+
menutrans Minimize\ All Alle\ im\ Dock\ ablegen
23+
menutrans Zoom Zoomen
24+
menutrans Zoom\ All Alle\ zoomen
25+
menutrans Show\ Next\ Tab Nächsten\ Tab\ anzeigen
26+
menutrans Show\ Previous\ Tab Vorherigen\ Tab\ anzeigen
27+
menutrans Bring\ All\ to\ Front Alle\ nach\ vorne\ bringen

0 commit comments

Comments
 (0)