Skip to content

🐛 [fix] Fix a bug of not-localized Packages-menu and View-menu #303

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.

Sign up for GitHub

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

Open
juggernautjp wants to merge 2 commits into
base: main
Choose a base branch
from
Open

🐛 [fix] Fix a bug of not-localized Packages-menu and View-menu #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f53d1a
:bug: [fix] Fix a bug of not-localized Packages Menu
juggernautjp Mar 29, 2021
c2f7a9e
:bug: [fix] Fix a bug of CI and npm validatation error for Menu local…
juggernautjp Mar 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions def/ar/about.cson
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
About:
tabTitle: "عن"
releaseNotes: "ملاحظات الإصدار"
newUpdate: "تحديث جديد"
upToDate: "اتوم محدث لآخر إصدار!"
checkingForUpdates: "يجري التحقق من التحديثات..."
checkUpdatesNow: "تحقق الآن"
automaticDownloadUpdates: "تنزيل التحديثات آليا"
restartInstall: "أعد التشغيل وثبت"
license: "الرخصة"
termsOfUse: "شروط الإستخدام"
with: " بـ"
by: " من قبل "
andTheAwesome: "والرائع "
atomCommunity: "مجتمع أتوم"
About:
tabTitle: "عن"

@liuderchi liuderchi Apr 17, 2021

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like there are some whitespace changes, please help remove these, thanks!

@juggernautjp juggernautjp Jul 7, 2021

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am sorry to reply so late. I do not understand the situation, because I have never pushed def/ar/about.cson yet.
And def/ar/about.cson in my local repository is the just the same as that of atom-i18n version 0.25.0, with WinMerge tools.
I noticed that some source code (*.js) and json files used LF as the line separator, and now, use CRLF as it.
So, the files that I pushed as Pull Request use CRLF. Should I push def/ar/about.cson with CRLF?

@liuderchi liuderchi Jul 8, 2021 •
edited
Loading

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@juggernautjp You may just merge the latest main branch and push, to update this PR and resolve conflict.

# update your local main branch
git checkout main
git pull

# update your local PR branch (merge with main)
git checkout add/localize-welcome-views
git merge main --no-edit

# push PR branch
git push

releaseNotes: "ملاحظات الإصدار"
newUpdate: "تحديث جديد"
upToDate: "اتوم محدث لآخر إصدار!"
checkingForUpdates: "يجري التحقق من التحديثات..."
checkUpdatesNow: "تحقق الآن"
automaticDownloadUpdates: "تنزيل التحديثات آليا"
restartInstall: "أعد التشغيل وثبت"
license: "الرخصة"
termsOfUse: "شروط الإستخدام"
with: " بـ"
by: " من قبل "
andTheAwesome: "والرائع "
atomCommunity: "مجتمع أتوم"
240 changes: 120 additions & 120 deletions def/ar/context.cson
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,120 +1,120 @@
Context:
"atom-workspace":
"application:inspect": "تفحص العنصر"
"atom-text-editor":
"color-picker:open": "منتقي الألوان"
"minimap:toggle": "بدل الخريطة المصغرة"
"atom-text-editor, .overlayer":
"core:undo": "تراجع"
"core:redo": "أعد"
"core:cut": "قص"
"core:copy": "انسخ"
"core:paste": "ألصق"
"core:delete": "احذف"
"core:select-all": "حدد الكل"
"pane:split-up-and-copy-active-item": "اقسم للأعلى"
"pane:split-down-and-copy-active-item": "اقسم للأسفل"
"pane:split-left-and-copy-active-item": "اقسم يسارا"
"pane:split-right-and-copy-active-item": "اقسم يمينا"
"pane:close": "أغلق الجانب"
"atom-pane":
"pane:split-up-and-copy-active-item": "اقسم للأعلى"
"pane:split-down-and-copy-active-item": "اقسم للأسفل"
"pane:split-left-and-copy-active-item": "اقسم يسارا"
"pane:split-right-and-copy-active-item": "اقسم يمينا"
"pane:close": "أغلق الجانب"
"atom-text-editor:not([mini])":
"encoding-selector:show": "غير الترميز"
"spell-check:correct-misspelling": "صحح الهجاء"
"symbols-view:go-to-declaration": "اذهب إلى الإعلان"
".overlayer":
"grammar-selector:show": "غير النحو"
".image-view":
"image-view:reload": "أعد تحميل الصورة"
".tab":
"tabs:close-tab": "أغلق اللسان"
"tabs:close-other-tabs": "أغلق الألسنة الأخرى"
"tabs:close-tabs-to-right": "أغلق الألسنة السابقة"
"tabs:close-tabs-to-left": "أغلق الألسنة التالية"
"tabs:close-saved-tabs": "أغلق الألسنة المحفوظة"
"tabs:close-all-tabs": "أغلق الألسنة جميعا"
"tabs:split-up": "اقسم للأعلى"
"tabs:split-down": "اقسم للأسفل"
"tabs:split-left": "اقسم يمينا"
"tabs:split-right": "اقسم يسارا"
".tab.texteditor":
"tabs:open-in-new-window": "افتح في نافذة جديدة"
".tab.pending-tab":
"tabs:keep-pending-tab": "احتفظ باللسان الجاري"
".tab-bar":
"pane:reopen-closed-item": "أعد فتح اللسان المغلق"
".tree-view .full-menu":
"tree-view:add-file": "ملف جديد"
"tree-view:add-folder": "مجلد جديد"
"tree-view:move": "أعد التسمية"
"tree-view:duplicate": "ضاعف"
"tree-view:remove": "احذف"
"tree-view:copy": "انسخ"
"tree-view:cut": "قص"
"tree-view:paste": "ألصق"
"tree-view:open-selected-entry-up": "اقسم للأعلى"
"tree-view:open-selected-entry-down": "اقسم للأسفل"
"tree-view:open-selected-entry-left": "اقسم يسارا"
"tree-view:open-selected-entry-right": "اقسم يمينا"
"application:add-project-folder": "أضف مجلد مشروع"
"tree-view:copy-full-path": "انسخ كامل المسار"
"tree-view:copy-project-path": "انسخ مسار المشروع"
"tree-view:open-in-new-window": "افتح في نافذة جديدة"
'.tree-view .full-menu [is="tree-view-file"]':
"tree-view:open-selected-entry-up": "اقسم للأعلى"
"tree-view:open-selected-entry-down": "اقسم للأسفل"
"tree-view:open-selected-entry-left": "اقسم يسارا"
"tree-view:open-selected-entry-right": "اقسم يمينا"
".tree-view .full-menu .project-root > .header":
"tree-view:add-file": "ملف جديد"
"tree-view:add-folder": "مجلد جديد"
"tree-view:move": "أعد التسمية"
"tree-view:duplicate": "ضاعف"
"tree-view:remove": "احذف"
"tree-view:copy": "انسخ"
"tree-view:cut": "قص"
"tree-view:paste": "ألصق"
"tree-view:open-selected-entry-up": "اقسم للأعلى"
"tree-view:open-selected-entry-down": "لقسم للأسفل"
"tree-view:open-selected-entry-left": "لقسم يسارا"
"tree-view:open-selected-entry-right": "لقسم يمينا"
"application:add-project-folder": "إضافة مجلد مشروع"
"tree-view:remove-project-folder": "حذف مجلد مشروع"
"tree-view:copy-full-path": "انسخ كامل المسار"
"tree-view:copy-project-path": "انسخ مسار المشروع"
"tree-view:open-in-new-window": "افتح في نافذة جديدة"
".platform-darwin .tree-view .full-menu":
"tree-view:show-in-file-manager": "اعرض في الموجد"
".platform-win32 .tree-view .full-menu":
"tree-view:show-in-file-manager": "اعرض في المستكشف"
".platform-linux .tree-view .full-menu":
"tree-view:show-in-file-manager": "اعرض في مدير الملفات"
".tree-view li.directory":
"project-find:show-in-current-directory": "ابحث في الدليل"
".tree-view .multi-select":
"tree-view:remove": "احذف"
"tree-view:copy": "انسخ"
"tree-view:cut": "قص"
"tree-view:paste": "ألصق"
"atom-pane[data-active-item-path] .item-views":
"tree-view:reveal-active-file": "اكشف في العرض الشجري"
"atom-pane[data-active-item-path] .tab.active":
"tree-view:rename": "أعد التسمية"
"tree-view:reveal-active-file": "اكشف في العرض الشجري"
".platform-darwin atom-pane[data-active-item-path] .tab.active":
"tree-view:show-current-file-in-file-manager": "اعرض في الموجد"
".platform-win32 atom-pane[data-active-item-path] .tab.active":
"tree-view:show-current-file-in-file-manager": "اعرض في المستكشف"
".platform-linux atom-pane[data-active-item-path] .tab.active":
"tree-view:show-current-file-in-file-manager": "اعرض في مدير الملفات"
".platform-darwin atom-text-editor:not([mini])":
"tree-view:show-current-file-in-file-manager": "اعرض في الموجد"
".platform-win32 atom-text-editor:not([mini])":
"tree-view:show-current-file-in-file-manager": "اعرض في المستكشف"
".platform-linux atom-text-editor:not([mini])":
"tree-view:show-current-file-in-file-manager": "اعرض في مدير الملفات"
Context:
"atom-workspace":
"application:inspect": "تفحص العنصر"
"atom-text-editor":
"color-picker:open": "منتقي الألوان"
"minimap:toggle": "بدل الخريطة المصغرة"
"atom-text-editor, .overlayer":
"core:undo": "تراجع"
"core:redo": "أعد"
"core:cut": "قص"
"core:copy": "انسخ"
"core:paste": "ألصق"
"core:delete": "احذف"
"core:select-all": "حدد الكل"
"pane:split-up-and-copy-active-item": "اقسم للأعلى"
"pane:split-down-and-copy-active-item": "اقسم للأسفل"
"pane:split-left-and-copy-active-item": "اقسم يسارا"
"pane:split-right-and-copy-active-item": "اقسم يمينا"
"pane:close": "أغلق الجانب"
"atom-pane":
"pane:split-up-and-copy-active-item": "اقسم للأعلى"
"pane:split-down-and-copy-active-item": "اقسم للأسفل"
"pane:split-left-and-copy-active-item": "اقسم يسارا"
"pane:split-right-and-copy-active-item": "اقسم يمينا"
"pane:close": "أغلق الجانب"
"atom-text-editor:not([mini])":
"encoding-selector:show": "غير الترميز"
"spell-check:correct-misspelling": "صحح الهجاء"
"symbols-view:go-to-declaration": "اذهب إلى الإعلان"
".overlayer":
"grammar-selector:show": "غير النحو"
".image-view":
"image-view:reload": "أعد تحميل الصورة"
".tab":
"tabs:close-tab": "أغلق اللسان"
"tabs:close-other-tabs": "أغلق الألسنة الأخرى"
"tabs:close-tabs-to-right": "أغلق الألسنة السابقة"
"tabs:close-tabs-to-left": "أغلق الألسنة التالية"
"tabs:close-saved-tabs": "أغلق الألسنة المحفوظة"
"tabs:close-all-tabs": "أغلق الألسنة جميعا"
"tabs:split-up": "اقسم للأعلى"
"tabs:split-down": "اقسم للأسفل"
"tabs:split-left": "اقسم يمينا"
"tabs:split-right": "اقسم يسارا"
".tab.texteditor":
"tabs:open-in-new-window": "افتح في نافذة جديدة"
".tab.pending-tab":
"tabs:keep-pending-tab": "احتفظ باللسان الجاري"
".tab-bar":
"pane:reopen-closed-item": "أعد فتح اللسان المغلق"
".tree-view .full-menu":
"tree-view:add-file": "ملف جديد"
"tree-view:add-folder": "مجلد جديد"
"tree-view:move": "أعد التسمية"
"tree-view:duplicate": "ضاعف"
"tree-view:remove": "احذف"
"tree-view:copy": "انسخ"
"tree-view:cut": "قص"
"tree-view:paste": "ألصق"
"tree-view:open-selected-entry-up": "اقسم للأعلى"
"tree-view:open-selected-entry-down": "اقسم للأسفل"
"tree-view:open-selected-entry-left": "اقسم يسارا"
"tree-view:open-selected-entry-right": "اقسم يمينا"
"application:add-project-folder": "أضف مجلد مشروع"
"tree-view:copy-full-path": "انسخ كامل المسار"
"tree-view:copy-project-path": "انسخ مسار المشروع"
"tree-view:open-in-new-window": "افتح في نافذة جديدة"
'.tree-view .full-menu [is="tree-view-file"]':
"tree-view:open-selected-entry-up": "اقسم للأعلى"
"tree-view:open-selected-entry-down": "اقسم للأسفل"
"tree-view:open-selected-entry-left": "اقسم يسارا"
"tree-view:open-selected-entry-right": "اقسم يمينا"
".tree-view .full-menu .project-root > .header":
"tree-view:add-file": "ملف جديد"
"tree-view:add-folder": "مجلد جديد"
"tree-view:move": "أعد التسمية"
"tree-view:duplicate": "ضاعف"
"tree-view:remove": "احذف"
"tree-view:copy": "انسخ"
"tree-view:cut": "قص"
"tree-view:paste": "ألصق"
"tree-view:open-selected-entry-up": "اقسم للأعلى"
"tree-view:open-selected-entry-down": "لقسم للأسفل"
"tree-view:open-selected-entry-left": "لقسم يسارا"
"tree-view:open-selected-entry-right": "لقسم يمينا"
"application:add-project-folder": "إضافة مجلد مشروع"
"tree-view:remove-project-folder": "حذف مجلد مشروع"
"tree-view:copy-full-path": "انسخ كامل المسار"
"tree-view:copy-project-path": "انسخ مسار المشروع"
"tree-view:open-in-new-window": "افتح في نافذة جديدة"
".platform-darwin .tree-view .full-menu":
"tree-view:show-in-file-manager": "اعرض في الموجد"
".platform-win32 .tree-view .full-menu":
"tree-view:show-in-file-manager": "اعرض في المستكشف"
".platform-linux .tree-view .full-menu":
"tree-view:show-in-file-manager": "اعرض في مدير الملفات"
".tree-view li.directory":
"project-find:show-in-current-directory": "ابحث في الدليل"
".tree-view .multi-select":
"tree-view:remove": "احذف"
"tree-view:copy": "انسخ"
"tree-view:cut": "قص"
"tree-view:paste": "ألصق"
"atom-pane[data-active-item-path] .item-views":
"tree-view:reveal-active-file": "اكشف في العرض الشجري"
"atom-pane[data-active-item-path] .tab.active":
"tree-view:rename": "أعد التسمية"
"tree-view:reveal-active-file": "اكشف في العرض الشجري"
".platform-darwin atom-pane[data-active-item-path] .tab.active":
"tree-view:show-current-file-in-file-manager": "اعرض في الموجد"
".platform-win32 atom-pane[data-active-item-path] .tab.active":
"tree-view:show-current-file-in-file-manager": "اعرض في المستكشف"
".platform-linux atom-pane[data-active-item-path] .tab.active":
"tree-view:show-current-file-in-file-manager": "اعرض في مدير الملفات"
".platform-darwin atom-text-editor:not([mini])":
"tree-view:show-current-file-in-file-manager": "اعرض في الموجد"
".platform-win32 atom-text-editor:not([mini])":
"tree-view:show-current-file-in-file-manager": "اعرض في المستكشف"
".platform-linux atom-text-editor:not([mini])":
"tree-view:show-current-file-in-file-manager": "اعرض في مدير الملفات"
Loading