attempting to merge and push

crittermike · May 9, 2010 · b14dab3 · b14dab3
2 parents dcbefb4 + fcdda14
commit b14dab3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -49,6 +49,7 @@ Installation
 
 Credits
 -------
+
 - [Sergey Chikuyonok](http://chikuyonok.ru/) - the creator of Zen Coding
 - [Franck Marcia](http://github.com/fmarcia) - the author of this Gedit plugin
 - [Mike Crittenden](http://mikethecoder.com) - the maintainer of this Gedit plugin
diff --git a/zencoding.gedit-plugin b/zencoding.gedit-plugin
@@ -3,9 +3,10 @@ Loader=python
 Module=zencoding
 IAge=2
 Name=Zen Coding
-Description=Expand expressions similar to CSS selectors into HTML, CSS or XSLT code
-Description[fr]=Développe des expressions similaires à des sélecteurs CSS en code HTML, CSS ou XSLT
-Authors=Franck Marcia <franck.marcia@gmail.com>
-Copyright=Franck Marcia <franck.marcia@gmail.com>
-Website=http://github.com/fmarcia/zen-coding-gedit
-
+Name[ru]=Дзэн-разработка
+Description=Enables Zen Coding's CSS and HTML shorthand tools for Gedit.
+Description[fr]=Des sélecteurs CSS pour écrire du code HTML.
+Description[ru]=Упрощает набор HTML и CSS с помощью механизма сокращений Zen Coding.
+Authors=Mike Crittenden <mike@mikethecoder.com>, Zen Coding team\nFranck Marcia <franck.marcia@gmail.com>
+Copyright=Mike Crittenden <mike@mikethecoder.com>\nFranck Marcia <franck.marcia@gmail.com>
+Website=http://github.com/mikecrittenden/zen-coding-gedit