Merge pull request #346 from MRACHINI/patch-1

MRACHINI

src/main/resources/i18n/ar.properties

@@ -0,0 +1,130 @@
+global.save=حفظ
+global.cancel=إلغاء
+global.delete=حذف
+global.required=مطلوب
+global.download=تحميل
+global.link=رابط
+global.bookmark=مرجعية
+global.close=أغلق
+
+tree.subscribe=اشترك
+tree.import=استورد
+tree.new_category=فئة جديدة
+tree.all=الكل
+tree.starred=المفضل
+
+subscribe.feed_url=رابط المغذي
+subscribe.feed_name=اسم المغذي
+subscribe.category=فئة
+
+import.google_reader_prefix=اسمح لي استيرا المغذيات الخاص بك
+import.google_reader_suffix=حساب.
+import.google_download=بدلا من ذلك، يمكنك تحميل ملف subscriptions.xml الخاص بك.
+import.google_download_link=تحميل من هنا.
+import.xml_file=ملف XML
+
+new_category.name=الإ سم
+new_category.parent=الأصل
+
+toolbar.unread=غير مقروء
+toolbar.all=الكل
+toolbar.previous_entry=الإدخال السابقة
+toolbar.next_entry=الإدخال التالي
+toolbar.refresh=إعادة انعاش
+toolbar.sort_by_asc_desc=الترتيب حسب التاريخ تصاعدي / تنازلي
+toolbar.titles_only=العناوين فقط
+toolbar.expanded_view=عرض موسع
+toolbar.mark_all_as_read=اعتبر الكل مقروء
+toolbar.mark_all_older_day=العناصر الأقدم من يوم
+toolbar.mark_all_older_week=العناصر الأقدم من أسبوع
+toolbar.mark_all_older_two_weeks=العناصر الأقدم من أسبوعين
+toolbar.settings=إعدادات
+toolbar.profile=الملف الشخصي
+toolbar.admin=المشرف
+toolbar.about=معلومات حول
+toolbar.logout=تسجيل الخروج
+toolbar.donate=تبرع
+
+view.error_while_loading_feed=خطأ أثناء تحميل هذه التغذية
+view.keep_unread=إبقائه غير مقروء
+view.no_unread_items=لا يحتوي عناصر غير مقروءة.
+
+feedsearch.hint=أدخل اشتراك ...
+feedsearch.help=استخدام مفتاح العودة للاختيار ومفاتيح الأسهم للتنقل.
+feedsearch.result_prefix=الاشتراكات الخاصة بك:
+
+settings.general=General
+settings.general.language=Language
+settings.general.language.contribute=Contribute with translations
+settings.general.show_unread=Show feeds and categories with no unread entries
+settings.general.social_buttons=Show social sharing buttons
+settings.general.scroll_marks=In expanded view, scrolling through entries mark them as read
+settings.appearance=Appearance
+settings.theme=Theme
+settings.submit_your_theme=Submit your theme
+settings.custom_css=Custom CSS
+
+details.feed_details=Feed details
+details.url=URL
+details.name=Name
+details.category=Category
+details.position=Position
+details.last_refresh=Last refresh
+details.next_refresh=Next refresh
+details.queued_for_refresh=Queued for refresh
+details.feed_url=Feed URL
+details.generate_api_key_first=Generate an API key in your profile first.
+details.unsubscribe=Unsubscribe
+details.category_details=Category details
+details.parent_category=Parent category
+
+profile.user_name=User name
+profile.email=E-mail
+profile.change_password=Change password
+profile.confirm_password=Confirm password
+profile.minimum_6_chars=Minimum 6 characters
+profile.passwords_do_not_match=Passwords do not match
+profile.api_key=API key
+profile.api_key_not_generated=Not generated yet
+profile.generate_new_api_key=Generate new API key
+profile.generate_new_api_key_info=Changing password will generate a new API key
+profile.opml_export=OPML export
+profile.delete_account=Delete account
+
+about.rest_api=REST API
+about.keyboard_shortcuts=Keyboard shortcuts
+about.line1_prefix=CommaFeed is an open-source project. Sources are hosted on 
+about.line1_suffix=.
+about.line2_prefix=If you encounter an issue, please report it on the issues page of the 
+about.line2_suffix=\ project.
+about.line3=If you like this project, please consider a donation to support the developer and help cover the costs of keeping this website online.
+about.line4=For those of you who prefer bitcoin, here is the address
+about.goodies=Goodies
+about.goodies.subscribe_url=Subscribe URL
+about.goodies.chrome_extension=Chrome extension
+about.goodies.firefox_extension=Firefox extension
+about.goodies.opera_extension=Opera extension
+about.goodies.subscribe_bookmarklet=Add subscription bookmarklet (click)
+about.goodies.next_unread_bookmarklet=Next unread item bookmarklet (drag to bookmark bar)
+about.translation=Translation
+about.translation.message=We need your help to translate CommaFeed.
+about.translation.link=See how to contribute with translations.
+about.announcements=Announcements
+about.rest_api.line1=CommaFeed is built on top of JAX-RS and AngularJS. As such, a REST API is available.
+about.rest_api.link_to_documentation=Link to the documentation.
+
+about.shortcuts.mouse_middleclick=mouse middleclick
+about.shortcuts.open_next_entry=open next entry
+about.shortcuts.open_previous_entry=open previous entry
+about.shortcuts.focus_next_entry=set focus on next entry without opening it
+about.shortcuts.focus_previous_entry=set focus on previous entry without opening it
+about.shortcuts.open_next_feed=open next feed or category
+about.shortcuts.open_previous_feed=open previous feed or category
+about.shortcuts.open_close_current_entry=open/close current entry
+about.shortcuts.open_current_entry_in_new_window=open current entry in a new window
+about.shortcuts.open_current_entry_in_new_window_background=open current entry in a new window in the background
+about.shortcuts.star_unstar=star/unstar current entry
+about.shortcuts.mark_current_entry=mark as read/unread current entry
+about.shortcuts.mark_all_as_read=mark all entries as read
+about.shortcuts.open_in_new_tab_mark_as_read=open entry in new tab and mark as read
+about.shortcuts.feed_search=navigate to a subscription by entering the subscription name

src/main/resources/i18n/languages.properties

@@ -1,3 +1,4 @@
+ar=العربية
 en=English
 es=Español
 de=Deutsch
@@ -21,4 +22,4 @@ tr=Türkçe
 cy=Cymraeg
 sk=Slovenčina
 da=Danish
-cs=Čeština
+cs=Čeština

src/main/webapp/js/controllers.js

@@ -1176,7 +1176,7 @@ function($scope, $location, SettingsService, AnalyticsService, ServerService) {
 	
 	$scope.ServerService = ServerService.get();
 	
-	$scope.themes = ['default'];
+	$scope.themes = ['default','MRACHINI'];
 	
 	$scope.settingsService = SettingsService;
 	$scope.$watch('settingsService.settings', function(value) {

src/main/webapp/sass/app.scss

@@ -9,4 +9,5 @@
 
 @import "mobile/mobile";
 
-@import "themes/test";
+@import "themes/test";
+@import "themes/MRACHINI";

src/main/webapp/sass/themes/_MRACHINI.scss

@@ -0,0 +1,34 @@
+#theme-MRACHINI {
+/*transitional hightlighting*/
+.entry-title > a.ng-binding:link, .entry-body-content > div.ng-binding a:link{
+	-moz-transition: background-color 1s ease-in 0s;
+	-webkit-transition: background-color 1s ease-in 0s;
+	-o-transition: background-color 1s ease-in 0s;
+}
+.entry-title > a.ng-binding:hover, .entry-body-content > div.ng-binding a:hover{
+	background-color: lime;
+	-moz-transition: background-color 1s ease-out 0s;
+	-webkit-transition: background-color 1s ease-out 0s;
+	-o-transition: background-color 1s ease-out 0s;
+}
+.entry-title > a.ng-binding:active, .entry-body-content > div.ng-binding a:active{
+	background-color: lime;
+	-moz-transition: none;
+	-webkit-transition: none;
+	-o-transition: none;
+}
+
+/*hovered item*/
+.entry-heading:hover{box-shadow: inset 0 0 40px 0px lime !important;}
+/*hovered tree item*/
+/*.css-treeview li .tree-item:hover{box-shadow: inset 0 0 20px 0px hsla(7,63%,52%,1) !important;}*/
+.css-treeview li .tree-item:hover{box-shadow: inset 0 0 20px 0px lime !important;}
+/*highlight current selected tree item*/
+.css-treeview li .tree-item .selected{box-shadow: inset 0 0 20px 0px lime !important;}
+
+.css-treeview .indent1{padding-left:10px}
+.css-treeview .indent2{padding-left:20px}
+.css-treeview .indent3{padding-left:30px}
+.css-treeview .indent4{padding-left:40px}
+.css-treeview .indent5{padding-left:50px}
+}