-
-
Notifications
You must be signed in to change notification settings - Fork 184
chore: add English strings and restore CFBundleLocalizations #280
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
6a15f41
Add en.lproj strings and restore CFBundleLocalizations for Weblate in…
vegca a527a2c
Add CFBundleLocalizations to Info.plist.tmpl
vegca 5bf80fb
Move Localizable.strings from Base.lproj to en.lproj to avoid Weblate…
vegca 35ea6ee
Remove Base.lproj/Localizable.strings (moved to en.lproj)
vegca File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
|
|
||
| /* Class = "NSTextFieldCell"; title = "appNameLabel"; ObjectID = "69s-3K-WtF"; */ | ||
| "69s-3K-WtF.title" = "appNameLabel"; | ||
|
|
||
| /* Class = "NSButtonCell"; title = "Check for updates"; ObjectID = "Eed-GH-Oia"; */ | ||
| "Eed-GH-Oia.title" = "Check for updates"; | ||
|
|
||
| /* Class = "NSWindow"; title = "About Syncthing"; ObjectID = "QvC-M9-y7g"; */ | ||
| "QvC-M9-y7g.title" = "About Syncthing"; | ||
|
|
||
| /* Class = "NSTextFieldCell"; title = "Project page"; ObjectID = "c8c-o9-dcj"; */ | ||
| "c8c-o9-dcj.title" = "Project page"; | ||
|
|
||
| /* Class = "NSTextFieldCell"; title = "appVersionLabel"; ObjectID = "sEI-CG-StK"; */ | ||
| "sEI-CG-StK.title" = "appVersionLabel"; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
|
|
||
| /* Class = "NSMenuItem"; title = "Delete"; ObjectID = "09B-Fd-kIg"; */ | ||
| "09B-Fd-kIg.title" = "Delete"; | ||
|
|
||
| /* Class = "NSMenu"; title = "Folders"; ObjectID = "0Tt-4w-4MD"; */ | ||
| "0Tt-4w-4MD.title" = "Folders"; | ||
|
|
||
| /* Class = "NSMenuItem"; title = "Quit Syncthing"; ObjectID = "1wN-cb-7w4"; */ | ||
| "1wN-cb-7w4.title" = "Quit Syncthing"; | ||
|
|
||
| /* Class = "NSMenuItem"; title = "Restart"; ObjectID = "24n-vt-eof"; */ | ||
| "24n-vt-eof.title" = "Restart"; | ||
|
|
||
| /* Class = "NSMenuItem"; title = "Quit application"; ObjectID = "42h-qg-75M"; */ | ||
| "42h-qg-75M.title" = "Quit application"; | ||
|
|
||
| /* Class = "NSMenuItem"; title = "None"; ObjectID = "8nY-KP-Cjq"; */ | ||
| "8nY-KP-Cjq.title" = "None"; | ||
|
|
||
| /* Class = "NSMenu"; title = "Edit"; ObjectID = "BIk-A1-DsB"; */ | ||
| "BIk-A1-DsB.title" = "Edit"; | ||
|
|
||
| /* Class = "NSMenuItem"; title = "Folders"; ObjectID = "Gbh-kn-bEe"; */ | ||
| "Gbh-kn-bEe.title" = "Folders"; | ||
|
|
||
| /* Class = "NSMenuItem"; title = "API"; ObjectID = "Gzh-BA-qbg"; */ | ||
| "Gzh-BA-qbg.title" = "API"; | ||
|
|
||
| /* Class = "NSMenuItem"; title = "Paste"; ObjectID = "HRl-Yj-JKY"; */ | ||
| "HRl-Yj-JKY.title" = "Paste"; | ||
|
|
||
| /* Class = "NSMenuItem"; title = "Edit"; ObjectID = "HiV-0K-6gI"; */ | ||
| "HiV-0K-6gI.title" = "Edit"; | ||
|
|
||
| /* Class = "NSMenuItem"; title = "Menu"; ObjectID = "I8M-Pf-BKw"; */ | ||
| "I8M-Pf-BKw.title" = "Menu"; | ||
|
|
||
| /* Class = "NSMenuItem"; title = "Cut"; ObjectID = "Kac-nG-ccL"; */ | ||
| "Kac-nG-ccL.title" = "Cut"; | ||
|
|
||
| /* Class = "NSMenu"; title = "Main Menu"; ObjectID = "LRK-4Q-J2a"; */ | ||
| "LRK-4Q-J2a.title" = "Main Menu"; | ||
|
|
||
| /* Class = "NSMenuItem"; title = "Syncthing Service"; ObjectID = "MAH-El-s0y"; */ | ||
| "MAH-El-s0y.title" = "Syncthing Service"; | ||
|
|
||
| /* Class = "NSMenu"; title = "Syncthing"; ObjectID = "O1r-v6-dVJ"; */ | ||
| "O1r-v6-dVJ.title" = "Syncthing"; | ||
|
|
||
| /* Class = "NSMenuItem"; title = "Status"; ObjectID = "PGw-J9-KII"; */ | ||
| "PGw-J9-KII.title" = "Status"; | ||
|
|
||
| /* Class = "NSMenuItem"; title = "Syncthing"; ObjectID = "ViC-de-Xi1"; */ | ||
| "ViC-de-Xi1.title" = "Syncthing"; | ||
|
|
||
| /* Class = "NSMenuItem"; title = "Item"; ObjectID = "Y9X-vm-pic"; */ | ||
| "Y9X-vm-pic.title" = "Item"; | ||
|
|
||
| /* Class = "NSMenu"; title = "Syncthing Service"; ObjectID = "YYN-1k-umQ"; */ | ||
| "YYN-1k-umQ.title" = "Syncthing Service"; | ||
|
|
||
| /* Class = "NSMenuItem"; title = "Redo"; ObjectID = "aOH-1O-Idh"; */ | ||
| "aOH-1O-Idh.title" = "Redo"; | ||
|
|
||
| /* Class = "NSMenuItem"; title = "Undo"; ObjectID = "aRj-ou-O6a"; */ | ||
| "aRj-ou-O6a.title" = "Undo"; | ||
|
|
||
| /* Class = "NSMenuItem"; title = "Rescan All"; ObjectID = "boL-Lr-rxV"; */ | ||
| "boL-Lr-rxV.title" = "Rescan All"; | ||
|
|
||
| /* Class = "NSMenuItem"; title = "About"; ObjectID = "dst-j8-d2d"; */ | ||
| "dst-j8-d2d.title" = "About"; | ||
|
|
||
| /* Class = "NSMenuItem"; ibShadowedToolTip = "Open Syncthing Web GUI"; ObjectID = "euz-4I-RQa"; */ | ||
| "euz-4I-RQa.ibShadowedToolTip" = "Open Syncthing Web GUI"; | ||
|
|
||
| /* Class = "NSMenuItem"; title = "Open"; ObjectID = "euz-4I-RQa"; */ | ||
| "euz-4I-RQa.title" = "Open"; | ||
|
|
||
| /* Class = "NSMenuItem"; title = "Close window"; ObjectID = "htF-y1-dkl"; */ | ||
| "htF-y1-dkl.title" = "Close window"; | ||
|
|
||
| /* Class = "NSMenuItem"; title = "Pause All Devices"; ObjectID = "kBF-aK-W8P"; */ | ||
| "kBF-aK-W8P.title" = "Pause All Devices"; | ||
|
|
||
| /* Class = "NSMenuItem"; title = "Preferences..."; ObjectID = "lgT-yX-bGZ"; */ | ||
| "lgT-yX-bGZ.title" = "Preferences..."; | ||
|
|
||
| /* Class = "NSMenu"; title = "Status"; ObjectID = "qS5-d4-4WD"; */ | ||
| "qS5-d4-4WD.title" = "Status"; | ||
|
|
||
| /* Class = "NSMenu"; title = "Menu"; ObjectID = "rlz-0G-Jeh"; */ | ||
| "rlz-0G-Jeh.title" = "Menu"; | ||
|
|
||
| /* Class = "NSMenuItem"; title = "Start"; ObjectID = "s51-hi-aSO"; */ | ||
| "s51-hi-aSO.title" = "Start"; | ||
|
|
||
| /* Class = "NSMenuItem"; title = "Select All"; ObjectID = "uO2-Lw-6R3"; */ | ||
| "uO2-Lw-6R3.title" = "Select All"; | ||
|
|
||
| /* Class = "NSMenuItem"; title = "Stop"; ObjectID = "v6W-XD-Nuf"; */ | ||
| "v6W-XD-Nuf.title" = "Stop"; | ||
|
|
||
| /* Class = "NSMenuItem"; title = "Copy"; ObjectID = "ygR-tH-H8e"; */ | ||
| "ygR-tH-H8e.title" = "Copy"; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
|
|
||
| /* Class = "NSToolbarItem"; label = "General"; ObjectID = "1ij-UG-c1I"; */ | ||
| "1ij-UG-c1I.label" = "General"; | ||
|
|
||
| /* Class = "NSToolbarItem"; paletteLabel = "General"; ObjectID = "1ij-UG-c1I"; */ | ||
| "1ij-UG-c1I.paletteLabel" = "General"; | ||
|
|
||
| /* Class = "NSToolbarItem"; label = "Info"; ObjectID = "86s-00-8YI"; */ | ||
| "86s-00-8YI.label" = "Info"; | ||
|
|
||
| /* Class = "NSToolbarItem"; paletteLabel = "Info"; ObjectID = "86s-00-8YI"; */ | ||
| "86s-00-8YI.paletteLabel" = "Info"; | ||
|
|
||
| /* Class = "NSWindow"; title = "Syncthing Preferences"; ObjectID = "QvC-M9-y7g"; */ | ||
| "QvC-M9-y7g.title" = "Syncthing Preferences"; | ||
|
|
||
| /* Class = "NSToolbarItem"; label = "Advanced"; ObjectID = "S5T-mV-7Wv"; */ | ||
| "S5T-mV-7Wv.label" = "Advanced"; | ||
|
|
||
| /* Class = "NSToolbarItem"; paletteLabel = "Advanced"; ObjectID = "S5T-mV-7Wv"; */ | ||
| "S5T-mV-7Wv.paletteLabel" = "Advanced"; | ||
|
|
||
| /* Class = "NSToolbarItem"; label = "Folders"; ObjectID = "X60-Ql-i8O"; */ | ||
| "X60-Ql-i8O.label" = "Folders"; | ||
|
|
||
| /* Class = "NSToolbarItem"; paletteLabel = "Folders"; ObjectID = "X60-Ql-i8O"; */ | ||
| "X60-Ql-i8O.paletteLabel" = "Folders"; | ||
|
|
||
| /* Class = "NSToolbarItem"; label = "Devices"; ObjectID = "poY-nn-e76"; */ | ||
| "poY-nn-e76.label" = "Devices"; | ||
|
|
||
| /* Class = "NSToolbarItem"; paletteLabel = "Devices"; ObjectID = "poY-nn-e76"; */ | ||
| "poY-nn-e76.paletteLabel" = "Devices"; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
|
|
||
| /* Class = "NSTextFieldCell"; placeholderString = "aNVUG3mSx4PVyZW8LXWGoybFRSXS9c5a"; ObjectID = "2yS-fe-acc"; */ | ||
| "2yS-fe-acc.placeholderString" = "aNVUG3mSx4PVyZW8LXWGoybFRSXS9c5a"; | ||
|
|
||
| /* Class = "NSButtonCell"; title = "Test"; ObjectID = "DIH-Pb-tr4"; */ | ||
| "DIH-Pb-tr4.title" = "Test"; | ||
|
|
||
| /* Class = "NSButtonCell"; title = "Quit Syncthing"; ObjectID = "KYS-0x-TeQ"; */ | ||
| "KYS-0x-TeQ.title" = "Quit Syncthing"; | ||
|
|
||
| /* Class = "NSButtonCell"; title = "Open Syncthing Web Interface"; ObjectID = "MM0-EG-ljE"; */ | ||
| "MM0-EG-ljE.title" = "Open Syncthing Web Interface"; | ||
|
|
||
| /* Class = "NSButtonCell"; title = "Start at login"; ObjectID = "bnF-et-LAz"; */ | ||
| "bnF-et-LAz.title" = "Start at login"; | ||
|
|
||
| /* Class = "NSTextFieldCell"; title = "URI"; ObjectID = "geO-tg-eJG"; */ | ||
| "geO-tg-eJG.title" = "URI"; | ||
|
|
||
| /* Class = "NSTextFieldCell"; placeholderString = "http://localhost:8384"; ObjectID = "hwI-eW-JrI"; */ | ||
| "hwI-eW-JrI.placeholderString" = "http://localhost:8384"; | ||
|
|
||
| /* Class = "NSTextFieldCell"; title = "API key"; ObjectID = "jak-D0-chd"; */ | ||
| "jak-D0-chd.title" = "API key"; | ||
|
|
||
| /* Class = "NSButtonCell"; title = "Show in menu bar"; ObjectID = "nB8-OA-X1F"; */ | ||
| "nB8-OA-X1F.title" = "Show in menu bar"; |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The Info.plist is not the actual file. You need to update the Info.plist.tmpl, which is used as input for injecting the Syncthing version via cmd/update-release/update-release.py. Maybe that is why it was broken :-). But you could not know the release management helper script.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, I wasn't aware of that template workflow.
Anyway, just to clarify: CFBundleLocalizations isn't/wasn't technically broken since that's optional (macOS auto-detects localizations from the .lproj directories in the bundle). Everything is working as intended, but explicitly declaring it is a good practice, and adding it to the template ensures it persists across releases.
I'll update Info.plist.tmpl to include the CFBundleLocalizations key as well.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This PR is more in preparation for a future Weblate integration since we need a base language.