From 83d4ad5bec4e7efd2250ad14c2d418020a5bb512 Mon Sep 17 00:00:00 2001 From: Veeven Date: Fri, 2 Jul 2010 03:44:24 +0000 Subject: [PATCH 01/23] l10n: Initial Telugu (te) translation New status: 16 messages complete with 0 fuzzies and 27 untranslated. Transmitted-via: Transifex (www.transifex.net). --- po/te.po | 217 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 217 insertions(+) create mode 100644 po/te.po diff --git a/po/te.po b/po/te.po new file mode 100644 index 00000000..db6725ac --- /dev/null +++ b/po/te.po @@ -0,0 +1,217 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Veeven , 2010. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-07-01 06:14+0000\n" +"PO-Revision-Date: 2010-07-02 09:13+0530\n" +"Last-Translator: Veeven \n" +"Language-Team: e-Telugu Localization Team\n" +"Language: te\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Virtaal 0.5.2\n" + +#: ../SparkleShare/SparkleDialog.cs:50 +msgid "Address of remote SparkleShare folder:" +msgstr "" + +#: ../SparkleShare/SparkleDialog.cs:81 +msgid "Add Folder" +msgstr "సంచయాన్ని చేర్చు" + +#: ../SparkleShare/SparkleDialog.cs:126 +#, csharp-format +msgid "Syncing folder ‘{0}’" +msgstr "" + +#: ../SparkleShare/SparkleDialog.cs:127 +msgid "SparkleShare will notify you when this is done." +msgstr "" + +#: ../SparkleShare/SparkleDialog.cs:129 +msgid "Dismiss" +msgstr "" + +#: ../SparkleShare/SparkleDialog.cs:157 +#, csharp-format +msgid "Something went wrong while syncing ‘{0}’" +msgstr "" + +#: ../SparkleShare/SparkleDialog.cs:167 +msgid "Try Again…" +msgstr "మళ్ళీ ప్రయత్నించండి…" + +#: ../SparkleShare/SparkleDialog.cs:197 +#, csharp-format +msgid "Successfully synced folder ‘{0}’" +msgstr "" + +#: ../SparkleShare/SparkleDialog.cs:198 +msgid "Now make great stuff happen!" +msgstr "ఇప్పుడు అద్భుతాలని సృష్టించండి!" + +#. Add a button to open the folder where the changed file is +#: ../SparkleShare/SparkleDialog.cs:200 ../SparkleShare/SparkleRepo.cs:319 +#: ../SparkleShare/SparkleWindow.cs:62 +msgid "Open Folder" +msgstr "సంచయాన్ని తెరువు" + +#: ../SparkleShare/SparkleHelpers.cs:159 +#, csharp-format +msgid "a second ago" +msgid_plural "{0} seconds ago" +msgstr[0] "ఒక క్షణం క్రితం" +msgstr[1] "{0} క్షణాల క్రితం" + +#: ../SparkleShare/SparkleHelpers.cs:165 +#, csharp-format +msgid "a minute ago" +msgid_plural "about {0} minutes ago" +msgstr[0] "ఒక నిమిషం క్రితం" +msgstr[1] "దాదాపు {0} నిమిషాల క్రితం" + +#: ../SparkleShare/SparkleHelpers.cs:171 +#, csharp-format +msgid "about an hour ago" +msgid_plural "about {0} hours ago" +msgstr[0] "దాదాపు ఒక గంట క్రితం" +msgstr[1] "దాదాపు {0} గంటల క్రితం" + +#: ../SparkleShare/SparkleHelpers.cs:177 +#, csharp-format +msgid "yesterday" +msgid_plural "{0} days ago" +msgstr[0] "నిన్న" +msgstr[1] "{0} రోజుల క్రితం" + +#: ../SparkleShare/SparkleHelpers.cs:183 +#, csharp-format +msgid "a month ago" +msgid_plural "{0} months ago" +msgstr[0] "ఒక నెల క్రితం" +msgstr[1] "{0} నెలల క్రితం" + +#: ../SparkleShare/SparkleHelpers.cs:188 +#, csharp-format +msgid "a year ago" +msgid_plural "{0} years ago" +msgstr[0] "ఒక సంవత్సరం క్రితం" +msgstr[1] "{0} సంవత్సరాల క్రితం" + +#: ../SparkleShare/SparkleHelpers.cs:197 +msgid "Hold your ponies!" +msgstr "" + +#: ../SparkleShare/SparkleHelpers.cs:198 +msgid "" +"SparkleShare is known to be insanely fast with \n" +"pictures of unicorns. Please make sure your internets\n" +"are upgraded to the latest version to avoid problems." +msgstr "" + +#: ../SparkleShare/SparkleShare.cs:50 +msgid "Git wasn't found." +msgstr "" + +#: ../SparkleShare/SparkleShare.cs:51 +msgid "You can get Git from http://git-scm.com/." +msgstr "" + +#: ../SparkleShare/SparkleShare.cs:58 +msgid "Sorry, you can't run SparkleShare with these permissions." +msgstr "" + +#: ../SparkleShare/SparkleShare.cs:59 +msgid "Things will go utterly wrong." +msgstr "" + +#: ../SparkleShare/SparkleShare.cs:87 +msgid "SparkleShare Copyright (C) 2010 Hylke Bons" +msgstr "స్పార్కిల్‌షేర్ కాహీహక్కులు (C) 2010 హైల్క్ బాన్స్" + +#: ../SparkleShare/SparkleShare.cs:89 +msgid "This program comes with ABSOLUTELY NO WARRANTY." +msgstr "" + +#: ../SparkleShare/SparkleShare.cs:90 +msgid "This is free software, and you are welcome to redistribute it " +msgstr "" + +#: ../SparkleShare/SparkleShare.cs:91 +msgid "under certain conditions. Please read the GNU GPLv3 for details." +msgstr "" + +#: ../SparkleShare/SparkleShare.cs:93 +msgid "SparkleShare syncs the ~/SparkleShare folder with remote repositories." +msgstr "" + +#: ../SparkleShare/SparkleShare.cs:95 +msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..." +msgstr "" + +#: ../SparkleShare/SparkleShare.cs:96 +msgid "Sync SparkleShare folder with remote repositories." +msgstr "" + +#: ../SparkleShare/SparkleShare.cs:98 +msgid "Arguments:" +msgstr "" + +#: ../SparkleShare/SparkleShare.cs:99 +msgid "\t -d, --disable-gui\tDon't show the notification icon." +msgstr "" + +#: ../SparkleShare/SparkleShare.cs:100 +msgid "\t -h, --help\t\tDisplay this help text." +msgstr "" + +#: ../SparkleShare/SparkleStatusIcon.cs:69 +msgid "Error syncing" +msgstr "" + +#: ../SparkleShare/SparkleStatusIcon.cs:72 +msgid "Everything is up to date" +msgstr "" + +#: ../SparkleShare/SparkleStatusIcon.cs:75 +msgid "Syncing…" +msgstr "" + +#: ../SparkleShare/SparkleStatusIcon.cs:116 +msgid "Add a Remote Folder…" +msgstr "" + +#: ../SparkleShare/SparkleStatusIcon.cs:124 +msgid "Show Notifications" +msgstr "" + +#: ../SparkleShare/SparkleStatusIcon.cs:142 +msgid "Visit Website" +msgstr "వెబ్‌సైటుని సందర్శించండి" + +#: ../SparkleShare/SparkleStatusIcon.cs:159 +msgid "Quit" +msgstr "చాలించు" + +#: ../SparkleShare/SparkleUI.cs:134 +msgid "Welcome to SparkleShare!" +msgstr "స్పార్కిల్‌షేర్‌కి స్వాగతం!" + +#: ../SparkleShare/SparkleUI.cs:135 +msgid "You don't have any folders set up yet." +msgstr "" + +#: ../SparkleShare/SparkleUI.cs:138 +msgid "Add a Folder…" +msgstr "ఒక సంచయాన్ని చేర్చండి…" + +#: ../SparkleShare/SparkleWindow.cs:50 +#, csharp-format +msgid "‘{0}’ on {1}" +msgstr "{1} పై ‘{0}’" From 81b03d820efe45c871fe41e90e501577a0a8b981 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=98=20=E9=9C=B2?= Date: Fri, 2 Jul 2010 04:46:48 +0000 Subject: [PATCH 02/23] l10n: new Chinese simplified translation New status: 35 messages complete with 0 fuzzies and 8 untranslated. Transmitted-via: Transifex (www.transifex.net). --- po/zh_CN.po | 214 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 214 insertions(+) create mode 100644 po/zh_CN.po diff --git a/po/zh_CN.po b/po/zh_CN.po new file mode 100644 index 00000000..41ea00ad --- /dev/null +++ b/po/zh_CN.po @@ -0,0 +1,214 @@ +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: sparkleshare 简体中文\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-07-01 06:14+0000\n" +"PO-Revision-Date: 2010-07-02 12:41+0700\n" +"Last-Translator: 甘露(Gan Lu) \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1 plural=0;\n" +"X-Poedit-Language: Chinese\n" +"X-Poedit-Country: CHINA\n" +"X-Poedit-SourceCharset: zh_CN\n" + +#: ../SparkleShare/SparkleDialog.cs:50 +msgid "Address of remote SparkleShare folder:" +msgstr "远端 SparkleShare 文件夹的地址：" + +#: ../SparkleShare/SparkleDialog.cs:81 +msgid "Add Folder" +msgstr "添加文件夹" + +#: ../SparkleShare/SparkleDialog.cs:126 +#, csharp-format +msgid "Syncing folder ‘{0}’" +msgstr "正在同步文件夹 ‘{0}’" + +#: ../SparkleShare/SparkleDialog.cs:127 +msgid "SparkleShare will notify you when this is done." +msgstr "完成时 SparkleShare 将通知您" + +#: ../SparkleShare/SparkleDialog.cs:129 +msgid "Dismiss" +msgstr "" + +#: ../SparkleShare/SparkleDialog.cs:157 +#, csharp-format +msgid "Something went wrong while syncing ‘{0}’" +msgstr "同步 ‘{0}’ 时发生错误" + +#: ../SparkleShare/SparkleDialog.cs:167 +msgid "Try Again…" +msgstr "重试..." + +#: ../SparkleShare/SparkleDialog.cs:197 +#, csharp-format +msgid "Successfully synced folder ‘{0}’" +msgstr "成功同步文件夹 ‘{0}’" + +#: ../SparkleShare/SparkleDialog.cs:198 +msgid "Now make great stuff happen!" +msgstr "就让伟大一刻现在发生吧！" + +#. Add a button to open the folder where the changed file is +#: ../SparkleShare/SparkleDialog.cs:200 +#: ../SparkleShare/SparkleRepo.cs:319 +#: ../SparkleShare/SparkleWindow.cs:62 +msgid "Open Folder" +msgstr "打开文件夹" + +#: ../SparkleShare/SparkleHelpers.cs:159 +#, csharp-format +msgid "a second ago" +msgid_plural "{0} seconds ago" +msgstr[0] "{0} 秒钟前" + +#: ../SparkleShare/SparkleHelpers.cs:165 +#, csharp-format +msgid "a minute ago" +msgid_plural "about {0} minutes ago" +msgstr[0] "{0} 分钟前" + +#: ../SparkleShare/SparkleHelpers.cs:171 +#, csharp-format +msgid "about an hour ago" +msgid_plural "about {0} hours ago" +msgstr[0] "约 {0} 小时前" + +#: ../SparkleShare/SparkleHelpers.cs:177 +#, csharp-format +msgid "yesterday" +msgid_plural "{0} days ago" +msgstr[0] "{0} 天前" + +#: ../SparkleShare/SparkleHelpers.cs:183 +#, csharp-format +msgid "a month ago" +msgid_plural "{0} months ago" +msgstr[0] "{0} 个月前" + +#: ../SparkleShare/SparkleHelpers.cs:188 +#, csharp-format +msgid "a year ago" +msgid_plural "{0} years ago" +msgstr[0] "{0} 年前" + +#: ../SparkleShare/SparkleHelpers.cs:197 +msgid "Hold your ponies!" +msgstr "" + +#: ../SparkleShare/SparkleHelpers.cs:198 +msgid "" +"SparkleShare is known to be insanely fast with \n" +"pictures of unicorns. Please make sure your internets\n" +"are upgraded to the latest version to avoid problems." +msgstr "" + +#: ../SparkleShare/SparkleShare.cs:50 +msgid "Git wasn't found." +msgstr "Git 没有找到" + +#: ../SparkleShare/SparkleShare.cs:51 +msgid "You can get Git from http://git-scm.com/." +msgstr "您可以从 http://git-scm.com/ 处获得 Git。" + +#: ../SparkleShare/SparkleShare.cs:58 +msgid "Sorry, you can't run SparkleShare with these permissions." +msgstr "对不起，您不能在这些许可下运行 SparkleShare。" + +#: ../SparkleShare/SparkleShare.cs:59 +msgid "Things will go utterly wrong." +msgstr "" + +#: ../SparkleShare/SparkleShare.cs:87 +msgid "SparkleShare Copyright (C) 2010 Hylke Bons" +msgstr "SparkleShare 版权所有 (C) 2010 Hylke Bons" + +#: ../SparkleShare/SparkleShare.cs:89 +msgid "This program comes with ABSOLUTELY NO WARRANTY." +msgstr "" + +#: ../SparkleShare/SparkleShare.cs:90 +msgid "This is free software, and you are welcome to redistribute it " +msgstr "这是自由软件，欢迎您再次分发。" + +#: ../SparkleShare/SparkleShare.cs:91 +msgid "under certain conditions. Please read the GNU GPLv3 for details." +msgstr "在某种条件下。详情请参见 GNU GPLv3。" + +#: ../SparkleShare/SparkleShare.cs:93 +msgid "SparkleShare syncs the ~/SparkleShare folder with remote repositories." +msgstr "" + +#: ../SparkleShare/SparkleShare.cs:95 +msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..." +msgstr "用法：sparkleshare [start|stop|restart] [OPTION]..." + +#: ../SparkleShare/SparkleShare.cs:96 +msgid "Sync SparkleShare folder with remote repositories." +msgstr "" + +#: ../SparkleShare/SparkleShare.cs:98 +msgid "Arguments:" +msgstr "参数：" + +#: ../SparkleShare/SparkleShare.cs:99 +msgid "\t -d, --disable-gui\tDon't show the notification icon." +msgstr "\t -d, --disable-gui\t 不显示通知图标。" + +#: ../SparkleShare/SparkleShare.cs:100 +msgid "\t -h, --help\t\tDisplay this help text." +msgstr "\t -h, --help\t\t 显示本帮助文本。" + +#: ../SparkleShare/SparkleStatusIcon.cs:69 +msgid "Error syncing" +msgstr "同步错误" + +#: ../SparkleShare/SparkleStatusIcon.cs:72 +msgid "Everything is up to date" +msgstr "全部已经为最新" + +#: ../SparkleShare/SparkleStatusIcon.cs:75 +msgid "Syncing…" +msgstr "同步中..." + +#: ../SparkleShare/SparkleStatusIcon.cs:116 +msgid "Add a Remote Folder…" +msgstr "添加远端文件夹..." + +#: ../SparkleShare/SparkleStatusIcon.cs:124 +msgid "Show Notifications" +msgstr "显示通知" + +#: ../SparkleShare/SparkleStatusIcon.cs:142 +msgid "Visit Website" +msgstr "访问网站" + +#: ../SparkleShare/SparkleStatusIcon.cs:159 +msgid "Quit" +msgstr "退出" + +#: ../SparkleShare/SparkleUI.cs:134 +msgid "Welcome to SparkleShare!" +msgstr "欢迎使用 SparkleShare！" + +#: ../SparkleShare/SparkleUI.cs:135 +msgid "You don't have any folders set up yet." +msgstr "您还没有设置文件夹。" + +#: ../SparkleShare/SparkleUI.cs:138 +msgid "Add a Folder…" +msgstr "添加文件夹..." + +#: ../SparkleShare/SparkleWindow.cs:50 +#, csharp-format +msgid "‘{0}’ on {1}" +msgstr "" + From 549ce2ffe804ef521280d58f6c16b3f777660ff3 Mon Sep 17 00:00:00 2001 From: Misha Shnurapet Date: Fri, 2 Jul 2010 06:18:17 +0000 Subject: [PATCH 03/23] l10n: Russian translation of the program UI. New status: 40 messages complete with 0 fuzzies and 3 untranslated. Transmitted-via: Transifex (www.transifex.net). --- po/ru.po | 228 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 228 insertions(+) create mode 100644 po/ru.po diff --git a/po/ru.po b/po/ru.po new file mode 100644 index 00000000..8be55ad5 --- /dev/null +++ b/po/ru.po @@ -0,0 +1,228 @@ +# Russian translation of SparkleShare. +# Copyright (C) Hylke Bons +# This file is distributed under the same license as the SparkleShare package. +# Misha Shnurapet , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: SparkleShare\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-07-01 06:14+0000\n" +"PO-Revision-Date: 2010-07-02 15:17+0800\n" +"Last-Translator: Misha Shnurapet \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Poedit-Language: Russian\n" + +#: ../SparkleShare/SparkleDialog.cs:50 +msgid "Address of remote SparkleShare folder:" +msgstr "Расположение удаленной папки SparkleShare:" + +#: ../SparkleShare/SparkleDialog.cs:81 +msgid "Add Folder" +msgstr "Добавить папку" + +#: ../SparkleShare/SparkleDialog.cs:126 +#, csharp-format +msgid "Syncing folder ‘{0}’" +msgstr "Синхронизация папки ‘{0}’" + +#: ../SparkleShare/SparkleDialog.cs:127 +msgid "SparkleShare will notify you when this is done." +msgstr "SparkleShare сообщит вам об окончании." + +#: ../SparkleShare/SparkleDialog.cs:129 +msgid "Dismiss" +msgstr "Принять" + +#: ../SparkleShare/SparkleDialog.cs:157 +#, csharp-format +msgid "Something went wrong while syncing ‘{0}’" +msgstr "При обновлении папки ‘{0}’ произошла ошибка" + +#: ../SparkleShare/SparkleDialog.cs:167 +msgid "Try Again…" +msgstr "Повторить…" + +#: ../SparkleShare/SparkleDialog.cs:197 +#, csharp-format +msgid "Successfully synced folder ‘{0}’" +msgstr "Папка ‘{0}’ обновлена" + +#: ../SparkleShare/SparkleDialog.cs:198 +msgid "Now make great stuff happen!" +msgstr "А теперь вперед, — к великому!" + +#. Add a button to open the folder where the changed file is +#: ../SparkleShare/SparkleDialog.cs:200 +#: ../SparkleShare/SparkleRepo.cs:319 +#: ../SparkleShare/SparkleWindow.cs:62 +msgid "Open Folder" +msgstr "Открыть папку" + +#: ../SparkleShare/SparkleHelpers.cs:159 +#, csharp-format +msgid "a second ago" +msgid_plural "{0} seconds ago" +msgstr[0] "секунду назад" +msgstr[1] "{0} секунды назад" +msgstr[2] "{0} секунд назад" + +#: ../SparkleShare/SparkleHelpers.cs:165 +#, csharp-format +msgid "a minute ago" +msgid_plural "about {0} minutes ago" +msgstr[0] "минуту назад" +msgstr[1] "около {0} минут назад" +msgstr[2] "около {0} минут назад" + +#: ../SparkleShare/SparkleHelpers.cs:171 +#, csharp-format +msgid "about an hour ago" +msgid_plural "about {0} hours ago" +msgstr[0] "около часа назад" +msgstr[1] "около {0} часов назад" +msgstr[2] "около {0} часов назад" + +#: ../SparkleShare/SparkleHelpers.cs:177 +#, csharp-format +msgid "yesterday" +msgid_plural "{0} days ago" +msgstr[0] "вчера" +msgstr[1] "{0} дня назад" +msgstr[2] "{0} дней назад" + +#: ../SparkleShare/SparkleHelpers.cs:183 +#, csharp-format +msgid "a month ago" +msgid_plural "{0} months ago" +msgstr[0] "месяц назад" +msgstr[1] "{0} месяца назад" +msgstr[2] "{0} месяцев назад" + +#: ../SparkleShare/SparkleHelpers.cs:188 +#, csharp-format +msgid "a year ago" +msgid_plural "{0} years ago" +msgstr[0] "год назад" +msgstr[1] "{0} года назад" +msgstr[2] "{0} лет назад" + +#: ../SparkleShare/SparkleHelpers.cs:197 +msgid "Hold your ponies!" +msgstr "Попридержите лошадок!" + +#: ../SparkleShare/SparkleHelpers.cs:198 +msgid "" +"SparkleShare is known to be insanely fast with \n" +"pictures of unicorns. Please make sure your internets\n" +"are upgraded to the latest version to avoid problems." +msgstr "" +"SparkleShare безумно быстр при работе \n" +"с изображениями единорогов. Пожалуйста, обновите\n" +"свои интернеты до упора, чтобы избежать проблем." + +#: ../SparkleShare/SparkleShare.cs:50 +msgid "Git wasn't found." +msgstr "Git не найден." + +#: ../SparkleShare/SparkleShare.cs:51 +msgid "You can get Git from http://git-scm.com/." +msgstr "Загрузить Git можно с http://git-scm.com/." + +#: ../SparkleShare/SparkleShare.cs:58 +msgid "Sorry, you can't run SparkleShare with these permissions." +msgstr "К сожалению, запускать SparkleShare с такими системными правами нельзя." + +#: ../SparkleShare/SparkleShare.cs:59 +msgid "Things will go utterly wrong." +msgstr "Все пойдет наперекосяк." + +#: ../SparkleShare/SparkleShare.cs:87 +msgid "SparkleShare Copyright (C) 2010 Hylke Bons" +msgstr "Авторское право SparkleShare © 2010 Hylke Bons" + +#: ../SparkleShare/SparkleShare.cs:89 +msgid "This program comes with ABSOLUTELY NO WARRANTY." +msgstr "" + +#: ../SparkleShare/SparkleShare.cs:90 +msgid "This is free software, and you are welcome to redistribute it " +msgstr "" + +#: ../SparkleShare/SparkleShare.cs:91 +msgid "under certain conditions. Please read the GNU GPLv3 for details." +msgstr "" + +#: ../SparkleShare/SparkleShare.cs:93 +msgid "SparkleShare syncs the ~/SparkleShare folder with remote repositories." +msgstr "SparkleShare синхронизирует папку ~/SparkleShare с удаленными источниками." + +#: ../SparkleShare/SparkleShare.cs:95 +msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..." +msgstr "Синтаксис: sparkleshare [start|stop|restart] [КЛЮЧ]..." + +#: ../SparkleShare/SparkleShare.cs:96 +msgid "Sync SparkleShare folder with remote repositories." +msgstr "Синхронизировать папку SparkleShare с удаленными источниками." + +#: ../SparkleShare/SparkleShare.cs:98 +msgid "Arguments:" +msgstr "Параметры:" + +#: ../SparkleShare/SparkleShare.cs:99 +msgid "\t -d, --disable-gui\tDon't show the notification icon." +msgstr "\t -d, --disable-gui\tОтключить значок в области уведомлений." + +#: ../SparkleShare/SparkleShare.cs:100 +msgid "\t -h, --help\t\tDisplay this help text." +msgstr "\t -h, --help\t\tПоказать эту справку." + +#: ../SparkleShare/SparkleStatusIcon.cs:69 +msgid "Error syncing" +msgstr "Ошибка при синхронизации" + +#: ../SparkleShare/SparkleStatusIcon.cs:72 +msgid "Everything is up to date" +msgstr "Все обновлено" + +#: ../SparkleShare/SparkleStatusIcon.cs:75 +msgid "Syncing…" +msgstr "Синхронизация…" + +#: ../SparkleShare/SparkleStatusIcon.cs:116 +msgid "Add a Remote Folder…" +msgstr "Добавить удаленную папку…" + +#: ../SparkleShare/SparkleStatusIcon.cs:124 +msgid "Show Notifications" +msgstr "Показывать уведомления" + +#: ../SparkleShare/SparkleStatusIcon.cs:142 +msgid "Visit Website" +msgstr "Посетить сайт" + +#: ../SparkleShare/SparkleStatusIcon.cs:159 +msgid "Quit" +msgstr "Выход" + +#: ../SparkleShare/SparkleUI.cs:134 +msgid "Welcome to SparkleShare!" +msgstr "Добро пожаловать в SparkleShare!" + +#: ../SparkleShare/SparkleUI.cs:135 +msgid "You don't have any folders set up yet." +msgstr "Пока ни одной папки не задано." + +#: ../SparkleShare/SparkleUI.cs:138 +msgid "Add a Folder…" +msgstr "Добавить папку…" + +#: ../SparkleShare/SparkleWindow.cs:50 +#, csharp-format +msgid "‘{0}’ on {1}" +msgstr "‘{0}’ у {1}" + From 62f6b0f5145026c8cb1f0e3a5a01c45f68870003 Mon Sep 17 00:00:00 2001 From: Misha Shnurapet Date: Fri, 2 Jul 2010 07:28:16 +0000 Subject: [PATCH 04/23] l10n: Updated Russian (ru) translation to 100% New status: 43 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (www.transifex.net). --- po/ru.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/ru.po b/po/ru.po index 8be55ad5..604c0abd 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: SparkleShare\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-07-01 06:14+0000\n" -"PO-Revision-Date: 2010-07-02 15:17+0800\n" +"PO-Revision-Date: 2010-07-02 16:27+0800\n" "Last-Translator: Misha Shnurapet \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -147,15 +147,15 @@ msgstr "Авторское право SparkleShare © 2010 Hylke Bons" #: ../SparkleShare/SparkleShare.cs:89 msgid "This program comes with ABSOLUTELY NO WARRANTY." -msgstr "" +msgstr "Эта программа поставляется БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ." #: ../SparkleShare/SparkleShare.cs:90 msgid "This is free software, and you are welcome to redistribute it " -msgstr "" +msgstr "Эта программа является свободной, ее распространение разрешено " #: ../SparkleShare/SparkleShare.cs:91 msgid "under certain conditions. Please read the GNU GPLv3 for details." -msgstr "" +msgstr "при соблюдении требований лицензии GNU GPLv3." #: ../SparkleShare/SparkleShare.cs:93 msgid "SparkleShare syncs the ~/SparkleShare folder with remote repositories." From ae751d617a7d4d9e60f93c799f0e55493da4fc78 Mon Sep 17 00:00:00 2001 From: jjmarin Date: Fri, 2 Jul 2010 07:42:43 +0000 Subject: [PATCH 05/23] l10n: Updated Spanish (Castilian) (es) translation to 13% New status: 6 messages complete with 4 fuzzies and 33 untranslated. Transmitted-via: Transifex (www.transifex.net). --- po/es.po | 862 ++++++++++++++----------------------------------------- 1 file changed, 211 insertions(+), 651 deletions(-) diff --git a/po/es.po b/po/es.po index 5de2b36a..e53b6e02 100644 --- a/po/es.po +++ b/po/es.po @@ -1,25 +1,13 @@ -# SPANISH TRANSLATION +# SPANISH TRANSLATION # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # Jorge Bianquetti , 2010 -# -#: SparkleShare/SparkleDialog.cs:39 SparkleShare/SparkleHelpers.cs:78 -#: SparkleShare/SparklePreferencesDialog.cs:36 SparkleShare/SparkleRepo.cs:202 -#: SparkleShare/SparkleRepo.cs:332 SparkleShare/SparkleRepo.cs:336 -#: SparkleShare/SparkleRepo.cs:345 SparkleShare/SparkleRepo.cs:349 -#: SparkleShare/SparkleRepo.cs:358 SparkleShare/SparkleRepo.cs:362 -#: SparkleShare/SparkleRepo.cs:371 SparkleShare/SparkleRepo.cs:376 -#: SparkleShare/SparkleRepo.cs:383 SparkleShare/SparkleRepo.cs:393 -#: SparkleShare/SparkleRepo.cs:398 SparkleShare/SparkleUI.cs:115 -#: SparkleShare/SparkleWindow.cs:37 SparkleShare/SparkleWindow.cs:119 -#: SparkleShare/SparkleWindow.cs:178 SparkleShare/SparkleWindow.cs:179 -#: SparkleShare/SparkleWindow.cs:180 -#, fuzzy +# msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-18 19:46+0100\n" +"POT-Creation-Date: 2010-07-02 06:01+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -27,744 +15,316 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: SparkleShare/SparkleDialog.cs:42 -#: SparkleShare/SparklePreferencesDialog.cs:39 SparkleShare/SparkleUI.cs:114 -#: SparkleShare/SparkleWindow.cs:50 -msgid "folder-sparkleshare" -msgstr "Carpeta-sparkleshare" +#: ../SparkleShare/SparkleDialog.cs:50 +#, fuzzy +msgid "Address of remote SparkleShare folder:" +msgstr "Dirección de la carpeta SparkleShare remoto:" -#: SparkleShare/SparkleDialog.cs:46 -msgid "Add a Folder" +#: ../SparkleShare/SparkleDialog.cs:81 +#, fuzzy +msgid "Add Folder" msgstr "Añade una Carpeta" -#: SparkleShare/SparkleDialog.cs:50 -msgid "Folder Name: " -msgstr "Nombre de Carpeta: " - -#: SparkleShare/SparkleDialog.cs:52 SparkleShare/SparkleDialog.cs:67 -msgid "Example: " -msgstr "Ejemplo: " - -#: SparkleShare/SparkleDialog.cs:53 -msgid "‘Project’." -msgstr "‘Proyecto’." - -#: SparkleShare/SparkleDialog.cs:58 -msgid "Remote address: " -msgstr "Dirección remota: " - -#: SparkleShare/SparkleDialog.cs:60 -msgid "ssh://git@github.com" -msgstr "" - -#: SparkleShare/SparkleDialog.cs:61 -msgid "ssh://git@git.gnome.org" -msgstr "" - -#: SparkleShare/SparkleDialog.cs:62 -msgid "ssh://git@fedorahosted.org" -msgstr "" - -#: SparkleShare/SparkleDialog.cs:63 -msgid "ssh://git@gitorious.org" -msgstr "" - -#: SparkleShare/SparkleDialog.cs:68 -msgid "‘ssh://git@github.com’." -msgstr "" - -#: SparkleShare/SparkleDialog.cs:118 -msgid "Downloading files,\n" -msgstr "Descargando archivos,\n" - -#: SparkleShare/SparkleDialog.cs:119 -msgid "this may take a while..." -msgstr "esto puede tardar un rato..." - -#: SparkleShare/SparkleDialog.cs:132 SparkleShare/SparkleRepo.cs:70 -#: SparkleShare/SparkleRepo.cs:77 SparkleShare/SparkleRepo.cs:83 -#: SparkleShare/SparkleRepo.cs:100 SparkleShare/SparkleRepo.cs:403 -#: SparkleShare/SparkleShare.cs:42 SparkleShare/SparkleWindow.cs:117 -#: SparkleShare/SparkleWindow.cs:203 -msgid "git" -msgstr "" - -#: SparkleShare/SparkleDialog.cs:137 SparkleShare/SparkleRepo.cs:182 -msgid "clone " -msgstr "" - -#: SparkleShare/SparkleDialog.cs:150 SparkleShare/SparkleDialog.cs:154 -#: SparkleShare/SparklePreferencesDialog.cs:61 -#: SparkleShare/SparklePreferencesDialog.cs:81 SparkleShare/SparkleRepo.cs:58 -#: SparkleShare/SparkleRepo.cs:62 SparkleShare/SparkleRepo.cs:287 -#: SparkleShare/SparkleUI.cs:77 -msgid ".git" -msgstr "" - -#: SparkleShare/SparkleDialog.cs:151 -#: SparkleShare/SparklePreferencesDialog.cs:61 SparkleShare/SparkleRepo.cs:59 -msgid "sparkleshare.notify" -msgstr "" - -#: SparkleShare/SparkleDialog.cs:155 -#: SparkleShare/SparklePreferencesDialog.cs:81 SparkleShare/SparkleRepo.cs:63 -msgid "sparkleshare.sync" -msgstr "" - -#: SparkleShare/SparkleHelpers.cs:32 -msgid "x" -msgstr "" - -#: SparkleShare/SparkleHelpers.cs:36 SparkleShare/SparkleUI.cs:42 -#: SparkleShare/SparkleUI.cs:144 SparkleShare/SparkleUI.cs:148 -msgid "[Config] Created '" -msgstr "[Config] Creado '" - -#: SparkleShare/SparkleHelpers.cs:36 SparkleShare/SparkleRepo.cs:136 -#: SparkleShare/SparkleUI.cs:42 SparkleShare/SparkleUI.cs:133 -#: SparkleShare/SparkleUI.cs:144 -msgid "'" -msgstr "" - -#: SparkleShare/SparkleHelpers.cs:47 -msgid "http://www.gravatar.com/avatar/" -msgstr "" - -#: SparkleShare/SparkleHelpers.cs:48 -msgid ".jpg?s=" -msgstr "" - -#: SparkleShare/SparkleHelpers.cs:48 -msgid "&d=404" -msgstr "" - -#: SparkleShare/SparkleHelpers.cs:67 -msgid "avatar-default" -msgstr "" - -#: SparkleShare/SparkleHelpers.cs:78 -msgid "-" -msgstr "" - -#: SparkleShare/SparkleHelpers.cs:84 SparkleShare/SparkleRepo.cs:262 -#: SparkleShare/SparkleShare.cs:86 SparkleShare/SparkleShare.cs:90 -#: SparkleShare/SparkleShare.cs:92 SparkleShare/SparkleShare.cs:95 -#: SparkleShare/SparkleShare.cs:99 SparkleShare/SparkleWindow.cs:164 -msgid " " -msgstr "" - -#: SparkleShare/SparkleHelpers.cs:100 -msgid "[a-z]+://(.)+" -msgstr "" - -#: SparkleShare/SparklePaths.cs:24 -msgid "/tmp/sparkleshare" -msgstr "" - -#: SparkleShare/SparklePaths.cs:27 -msgid "HOME" -msgstr "" - -#: SparkleShare/SparklePaths.cs:29 -msgid "SparkleShare" -msgstr "" - -#: SparkleShare/SparklePaths.cs:32 -msgid ".config" -msgstr "" - -#: SparkleShare/SparklePaths.cs:32 SparkleShare/SparklePaths.cs:35 -msgid "sparkleshare" -msgstr "" - -#: SparkleShare/SparklePaths.cs:35 -msgid "usr" -msgstr "" - -#: SparkleShare/SparklePaths.cs:35 -msgid "share" -msgstr "" - -#: SparkleShare/SparklePaths.cs:36 -msgid "icons" -msgstr "" - -#: SparkleShare/SparklePaths.cs:36 -msgid "hicolor" -msgstr "" - -#: SparkleShare/SparklePaths.cs:39 -msgid "avatars" -msgstr "" - -#: SparkleShare/SparklePaths.cs:41 -msgid "/usr/share/icons/hicolor" -msgstr "" - -#: SparkleShare/SparklePlatform.cs:24 SparkleShare/SparkleUI.cs:44 -#: SparkleShare/SparkleUI.cs:82 -msgid "GNOME" -msgstr "" - -#: SparkleShare/SparklePreferencesDialog.cs:42 -msgid "Preferences" -msgstr "Preferencias" - -#: SparkleShare/SparklePreferencesDialog.cs:48 -msgid "The folder " -msgstr "La carpeta" - -#: SparkleShare/SparklePreferencesDialog.cs:49 -#: SparkleShare/SparklePreferencesDialog.cs:51 -#: SparkleShare/SparkleWindow.cs:237 -msgid "" -msgstr "" - -#: SparkleShare/SparklePreferencesDialog.cs:49 -#: SparkleShare/SparklePreferencesDialog.cs:51 -msgid "" -msgstr "" - -#: SparkleShare/SparklePreferencesDialog.cs:50 -msgid "" -"\n" -"is linked to " -msgstr "" - -#: SparkleShare/SparklePreferencesDialog.cs:57 -msgid "Notify me when something changes" -msgstr "Notificarme los cambios" - -#: SparkleShare/SparklePreferencesDialog.cs:77 -msgid "Synchronize my changes" -msgstr "Sincronizar mis cambios" - -#: SparkleShare/SparkleRepo.cs:69 -msgid "Anonymous" -msgstr "Anónimo" - -#: SparkleShare/SparkleRepo.cs:71 -msgid "config --get user.name" -msgstr "" - -#: SparkleShare/SparkleRepo.cs:76 -msgid "not.set@git-scm.com" -msgstr "" - -#: SparkleShare/SparkleRepo.cs:78 -msgid "config --get user.email" -msgstr "" - -#: SparkleShare/SparkleRepo.cs:84 -msgid "config --get remote.origin.url" +#: ../SparkleShare/SparkleDialog.cs:126 +#, csharp-format +msgid "Syncing folder ‘{0}’" msgstr "" -#: SparkleShare/SparkleRepo.cs:93 -msgid "@" +#: ../SparkleShare/SparkleDialog.cs:127 +msgid "SparkleShare will notify you when this is done." msgstr "" -#: SparkleShare/SparkleRepo.cs:94 SparkleShare/SparkleRepo.cs:95 -msgid ":" +#: ../SparkleShare/SparkleDialog.cs:129 +msgid "Dismiss" msgstr "" -#: SparkleShare/SparkleRepo.cs:97 -msgid "/" +#: ../SparkleShare/SparkleDialog.cs:157 +#, csharp-format +msgid "Something went wrong while syncing ‘{0}’" msgstr "" -#: SparkleShare/SparkleRepo.cs:101 -msgid "rev-list --max-count=1 HEAD" +#: ../SparkleShare/SparkleDialog.cs:167 +msgid "Try Again…" msgstr "" -#: SparkleShare/SparkleRepo.cs:109 -msgid "*" +#: ../SparkleShare/SparkleDialog.cs:197 +#, csharp-format +msgid "Successfully synced folder ‘{0}’" msgstr "" -#: SparkleShare/SparkleRepo.cs:127 SparkleShare/SparkleRepo.cs:195 -#: SparkleShare/SparkleRepo.cs:199 SparkleShare/SparkleRepo.cs:214 -#: SparkleShare/SparkleRepo.cs:218 SparkleShare/SparkleRepo.cs:225 -#: SparkleShare/SparkleRepo.cs:229 SparkleShare/SparkleRepo.cs:238 -#: SparkleShare/SparkleRepo.cs:242 SparkleShare/SparkleRepo.cs:269 -#: SparkleShare/SparkleRepo.cs:275 SparkleShare/SparkleRepo.cs:279 -msgid "[Git][" +#: ../SparkleShare/SparkleDialog.cs:198 +msgid "Now make great stuff happen!" msgstr "" -#: SparkleShare/SparkleRepo.cs:127 -msgid "] Nothing going on..." -msgstr "] No sucede nada..." - -#: SparkleShare/SparkleRepo.cs:135 -msgid "[Event][" -msgstr "" - -#: SparkleShare/SparkleRepo.cs:135 SparkleShare/SparkleRepo.cs:213 -msgid "] " -msgstr "" - -#: SparkleShare/SparkleRepo.cs:136 SparkleShare/SparkleUI.cs:133 -msgid " '" -msgstr "" - -#: SparkleShare/SparkleRepo.cs:152 SparkleShare/SparkleRepo.cs:155 -#: SparkleShare/SparkleRepo.cs:167 SparkleShare/SparkleRepo.cs:173 -msgid "[Buffer][" -msgstr "" - -#: SparkleShare/SparkleRepo.cs:152 SparkleShare/SparkleRepo.cs:167 -msgid "] Done waiting." -msgstr "" - -#: SparkleShare/SparkleRepo.cs:155 SparkleShare/SparkleRepo.cs:173 -msgid "] Waiting for more changes..." -msgstr "] Esperando más cambios..." - -#: SparkleShare/SparkleRepo.cs:186 -msgid ".gitignore" -msgstr "" - -#: SparkleShare/SparkleRepo.cs:187 -msgid "*~" -msgstr "" - -#: SparkleShare/SparkleRepo.cs:188 -msgid ".*.sw?" -msgstr "" - -#: SparkleShare/SparkleRepo.cs:195 -msgid "] Staging changes..." -msgstr "" - -#: SparkleShare/SparkleRepo.cs:196 -msgid "add --all" -msgstr "" - -#: SparkleShare/SparkleRepo.cs:199 -msgid "] Changed staged." -msgstr "] Estado cambiado." - -#: SparkleShare/SparkleRepo.cs:213 -msgid "[Commit][" -msgstr "" - -#: SparkleShare/SparkleRepo.cs:214 -msgid "] Commiting changes..." -msgstr "] Aplicando los cambios..." - -#: SparkleShare/SparkleRepo.cs:215 -msgid "commit -m \"" -msgstr "" - -#: SparkleShare/SparkleRepo.cs:215 -msgid "\"" -msgstr "" - -#: SparkleShare/SparkleRepo.cs:218 -msgid "] Changes commited." -msgstr "] Cambios aplicados." - -#: SparkleShare/SparkleRepo.cs:225 -msgid "] Fetching changes... " -msgstr "] Recibiendo cambios..." - -#: SparkleShare/SparkleRepo.cs:226 -msgid "fetch -v" -msgstr "" - -#: SparkleShare/SparkleRepo.cs:229 -msgid "] Changes fetched." -msgstr "] Cambios recibidos." - -#: SparkleShare/SparkleRepo.cs:238 -msgid "] Merging fetched changes... " -msgstr "] Uniendo cambios recibidos..." - -#: SparkleShare/SparkleRepo.cs:239 -msgid "merge origin/master" -msgstr "" - -#: SparkleShare/SparkleRepo.cs:242 -msgid "] Changes merged." -msgstr "" - -#: SparkleShare/SparkleRepo.cs:245 -msgid "Already up-to-date." -msgstr "Ya se encuentra en la última versión" - -#: SparkleShare/SparkleRepo.cs:248 -msgid "log --format=\"%ae\" -1" -msgstr "" - -#: SparkleShare/SparkleRepo.cs:253 -msgid "log --format=\"%s\" -1" -msgstr "" - -#: SparkleShare/SparkleRepo.cs:258 -msgid "log --format=\"%an\" -1" -msgstr "" - -#: SparkleShare/SparkleRepo.cs:269 -msgid "] Nothing going on... " -msgstr "" - -#: SparkleShare/SparkleRepo.cs:275 -msgid "] Pushing changes..." -msgstr "" - -#: SparkleShare/SparkleRepo.cs:276 -msgid "push" -msgstr "" - -#: SparkleShare/SparkleRepo.cs:279 -msgid "] Changes pushed." -msgstr "" - -#: SparkleShare/SparkleRepo.cs:285 -msgid "." -msgstr "" - -#: SparkleShare/SparkleRepo.cs:286 -msgid ".lock" -msgstr "" - -#: SparkleShare/SparkleRepo.cs:288 -msgid "/." -msgstr "" - -#: SparkleShare/SparkleRepo.cs:292 -msgid ".swp" -msgstr "" - -#: SparkleShare/SparkleRepo.cs:309 -msgid "status" -msgstr "" - -#: SparkleShare/SparkleRepo.cs:313 SparkleShare/SparkleRepo.cs:324 -#: SparkleShare/SparkleWindow.cs:128 SparkleShare/SparkleWindow.cs:131 -#: SparkleShare/SparkleWindow.cs:132 SparkleShare/SparkleWindow.cs:210 -msgid "\n" -msgstr "" - -#: SparkleShare/SparkleRepo.cs:314 SparkleShare/SparkleRepo.cs:328 -msgid "new file:" -msgstr "nuevo archivo:" - -#: SparkleShare/SparkleRepo.cs:316 SparkleShare/SparkleRepo.cs:341 -msgid "modified:" -msgstr "modificado:" - -#: SparkleShare/SparkleRepo.cs:318 SparkleShare/SparkleRepo.cs:367 -msgid "renamed:" -msgstr "renombrado:" - -#: SparkleShare/SparkleRepo.cs:320 SparkleShare/SparkleRepo.cs:354 -msgid "deleted:" -msgstr "borrado:" - -#: SparkleShare/SparkleRepo.cs:331 SparkleShare/SparkleRepo.cs:335 -msgid "added ‘" -msgstr "añadido " - -#: SparkleShare/SparkleRepo.cs:332 SparkleShare/SparkleRepo.cs:336 -msgid "#\tnew file:" -msgstr "#\tnew file:" - -#: SparkleShare/SparkleRepo.cs:333 SparkleShare/SparkleRepo.cs:346 -#: SparkleShare/SparkleRepo.cs:359 SparkleShare/SparkleRepo.cs:372 -msgid "’ and " -msgstr "’ y " - -#: SparkleShare/SparkleRepo.cs:333 SparkleShare/SparkleRepo.cs:346 -#: SparkleShare/SparkleRepo.cs:359 SparkleShare/SparkleRepo.cs:373 -msgid " more." -msgstr " más." - -#: SparkleShare/SparkleRepo.cs:336 SparkleShare/SparkleRepo.cs:349 -#: SparkleShare/SparkleRepo.cs:362 SparkleShare/SparkleRepo.cs:377 -msgid "’." -msgstr "" - -#: SparkleShare/SparkleRepo.cs:344 SparkleShare/SparkleRepo.cs:348 -msgid "edited ‘" -msgstr "editado ‘" - -#: SparkleShare/SparkleRepo.cs:345 SparkleShare/SparkleRepo.cs:349 -msgid "#\tmodified:" -msgstr "#\tmodificado:" - -#: SparkleShare/SparkleRepo.cs:357 SparkleShare/SparkleRepo.cs:361 -msgid "deleted ‘" -msgstr "borrado ‘" - -#: SparkleShare/SparkleRepo.cs:358 SparkleShare/SparkleRepo.cs:362 -msgid "#\tdeleted:" -msgstr "#\tborrado:" - -#: SparkleShare/SparkleRepo.cs:370 SparkleShare/SparkleRepo.cs:375 -msgid "renamed ‘" -msgstr "renombrado ‘" - -#: SparkleShare/SparkleRepo.cs:371 SparkleShare/SparkleRepo.cs:376 -msgid "#\trenamed:" -msgstr "#\trenombrado:" - -#: SparkleShare/SparkleRepo.cs:372 SparkleShare/SparkleRepo.cs:377 -msgid " -> " -msgstr "" - -#: SparkleShare/SparkleRepo.cs:372 SparkleShare/SparkleRepo.cs:377 -msgid "’ to ‘" -msgstr "‘ a ‘" - -#: SparkleShare/SparkleRepo.cs:398 +#. Add a button to open the folder where the changed file is +#: ../SparkleShare/SparkleDialog.cs:200 ../SparkleShare/SparkleRepo.cs:319 +#: ../SparkleShare/SparkleWindow.cs:62 msgid "Open Folder" msgstr "Abrir Carpeta" -#: SparkleShare/SparkleRepo.cs:400 SparkleShare/SparkleStatusIcon.cs:41 -#: SparkleShare/SparkleStatusIcon.cs:71 SparkleShare/SparkleUI.cs:116 -msgid "xdg-open" +#: ../SparkleShare/SparkleHelpers.cs:159 +#, csharp-format +msgid "a second ago" +msgid_plural "{0} seconds ago" +msgstr[0] "" +msgstr[1] "" + +#: ../SparkleShare/SparkleHelpers.cs:165 +#, csharp-format +msgid "a minute ago" +msgid_plural "about {0} minutes ago" +msgstr[0] "" +msgstr[1] "" + +#: ../SparkleShare/SparkleHelpers.cs:171 +#, csharp-format +msgid "about an hour ago" +msgid_plural "about {0} hours ago" +msgstr[0] "" +msgstr[1] "" + +#: ../SparkleShare/SparkleHelpers.cs:177 +#, csharp-format +msgid "yesterday" +msgid_plural "{0} days ago" +msgstr[0] "" +msgstr[1] "" + +#: ../SparkleShare/SparkleHelpers.cs:183 +#, csharp-format +msgid "a month ago" +msgid_plural "{0} months ago" +msgstr[0] "" +msgstr[1] "" + +#: ../SparkleShare/SparkleHelpers.cs:188 +#, csharp-format +msgid "a year ago" +msgid_plural "{0} years ago" +msgstr[0] "" +msgstr[1] "" + +#: ../SparkleShare/SparkleHelpers.cs:197 +msgid "Hold your ponies!" msgstr "" -#: SparkleShare/SparkleShare.cs:38 -msgid "i18n" +#: ../SparkleShare/SparkleHelpers.cs:198 +msgid "" +"SparkleShare is known to be insanely fast with \n" +"pictures of unicorns. Please make sure your internets\n" +"are upgraded to the latest version to avoid problems." msgstr "" -#: SparkleShare/SparkleShare.cs:38 -msgid "locale" -msgstr "" - -#: SparkleShare/SparkleShare.cs:47 -msgid "version" -msgstr "" - -#: SparkleShare/SparkleShare.cs:48 +#: ../SparkleShare/SparkleShare.cs:50 msgid "Git wasn't found." msgstr "No se ha encontrado Git." -#: SparkleShare/SparkleShare.cs:49 +#: ../SparkleShare/SparkleShare.cs:51 msgid "You can get Git from http://git-scm.com/." msgstr "Puedes obtener Git en http://git-scm.com/." -#: SparkleShare/SparkleShare.cs:54 -msgid "whoami" -msgstr "" - -#: SparkleShare/SparkleShare.cs:56 -msgid "root" -msgstr "" - -#: SparkleShare/SparkleShare.cs:57 +#: ../SparkleShare/SparkleShare.cs:58 msgid "Sorry, you can't run SparkleShare with these permissions." msgstr "No se puede ejecutar SparkleShare con estos permisos." -#: SparkleShare/SparkleShare.cs:58 +#: ../SparkleShare/SparkleShare.cs:59 msgid "Things will go utterly wrong." msgstr "Algo va a ir mal." -#: SparkleShare/SparkleShare.cs:66 -msgid "--disable-gui" -msgstr "" - -#: SparkleShare/SparkleShare.cs:66 -msgid "-d" -msgstr "" - -#: SparkleShare/SparkleShare.cs:68 -msgid "--help" -msgstr "" - -#: SparkleShare/SparkleShare.cs:68 -msgid "-h" -msgstr "" - -#: SparkleShare/SparkleShare.cs:85 +#: ../SparkleShare/SparkleShare.cs:87 msgid "SparkleShare Copyright (C) 2010 Hylke Bons" msgstr "" -#: SparkleShare/SparkleShare.cs:87 +#: ../SparkleShare/SparkleShare.cs:89 msgid "This program comes with ABSOLUTELY NO WARRANTY." msgstr "" -#: SparkleShare/SparkleShare.cs:88 +#: ../SparkleShare/SparkleShare.cs:90 msgid "This is free software, and you are welcome to redistribute it " msgstr "" -#: SparkleShare/SparkleShare.cs:89 +#: ../SparkleShare/SparkleShare.cs:91 msgid "under certain conditions. Please read the GNU GPLv3 for details." msgstr "" -#: SparkleShare/SparkleShare.cs:91 +#: ../SparkleShare/SparkleShare.cs:93 msgid "SparkleShare syncs the ~/SparkleShare folder with remote repositories." msgstr "" -#: SparkleShare/SparkleShare.cs:93 +#: ../SparkleShare/SparkleShare.cs:95 msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..." msgstr "" -#: SparkleShare/SparkleShare.cs:94 +#: ../SparkleShare/SparkleShare.cs:96 msgid "Sync SparkleShare folder with remote repositories." msgstr "" -#: SparkleShare/SparkleShare.cs:96 +#: ../SparkleShare/SparkleShare.cs:98 msgid "Arguments:" msgstr "" -#: SparkleShare/SparkleShare.cs:97 +#: ../SparkleShare/SparkleShare.cs:99 msgid "\t -d, --disable-gui\tDon't show the notification icon." msgstr "" -#: SparkleShare/SparkleShare.cs:98 +#: ../SparkleShare/SparkleShare.cs:100 msgid "\t -h, --help\t\tDisplay this help text." msgstr "" -#: SparkleShare/SparkleSpinner.cs:40 -msgid "process-working" +#: ../SparkleShare/SparkleStatusIcon.cs:69 +msgid "Error syncing" msgstr "" -#: SparkleShare/SparkleStatusIcon.cs:38 -msgid "Open Sharing Folder" -msgstr "" - -#: SparkleShare/SparkleStatusIcon.cs:48 +#: ../SparkleShare/SparkleStatusIcon.cs:72 msgid "Everything is up to date" msgstr "" -#: SparkleShare/SparkleStatusIcon.cs:68 -msgid "About SparkleShare" +#: ../SparkleShare/SparkleStatusIcon.cs:75 +msgid "Syncing…" msgstr "" -#: SparkleShare/SparkleStatusIcon.cs:72 -msgid "http://www.sparkleshare.org/" +#: ../SparkleShare/SparkleStatusIcon.cs:116 +#, fuzzy +msgid "Add a Remote Folder…" +msgstr "Añade una Carpeta" + +#: ../SparkleShare/SparkleStatusIcon.cs:124 +msgid "Show Notifications" msgstr "" -#: SparkleShare/SparkleStatusIcon.cs:92 -msgid "folder-synced" +#: ../SparkleShare/SparkleStatusIcon.cs:142 +msgid "Visit Website" msgstr "" -#: SparkleShare/SparkleStatusIcon.cs:106 -msgid "sparkleshare.pid" +#: ../SparkleShare/SparkleStatusIcon.cs:159 +msgid "Quit" msgstr "" -#: SparkleShare/SparkleUI.cs:47 SparkleShare/SparkleUI.cs:83 -msgid "gvfs-set-attribute" -msgstr "" - -#: SparkleShare/SparkleUI.cs:49 -msgid "" -" metadata::custom-icon file:///usr/share/icons/hicolor/48x48/places/folder-" -"sparkleshare.png" -msgstr "" - -#: SparkleShare/SparkleUI.cs:57 -msgid ".gtk-bookmarks" -msgstr "" - -#: SparkleShare/SparkleUI.cs:60 -msgid "file://" -msgstr "" - -#: SparkleShare/SparkleUI.cs:60 -msgid " SparkleShare" -msgstr "" - -#: SparkleShare/SparkleUI.cs:84 -msgid " file://" -msgstr "" - -#: SparkleShare/SparkleUI.cs:85 -msgid " metadata::emblems [synced]" -msgstr "" - -#: SparkleShare/SparkleUI.cs:108 +#: ../SparkleShare/SparkleUI.cs:134 msgid "Welcome to SparkleShare!" msgstr "Bienvenido a SparkleShare!" -#: SparkleShare/SparkleUI.cs:109 -msgid "" -"You don't have any folders set up yet.\n" -"Please create some in the SparkleShare folder." +#: ../SparkleShare/SparkleUI.cs:135 +msgid "You don't have any folders set up yet." msgstr "" -#: SparkleShare/SparkleUI.cs:115 -msgid "Open SparkleShare Folder" +#: ../SparkleShare/SparkleUI.cs:138 +#, fuzzy +msgid "Add a Folder…" +msgstr "Añade una Carpeta" + +#: ../SparkleShare/SparkleWindow.cs:50 +#, csharp-format +msgid "‘{0}’ on {1}" msgstr "" -#: SparkleShare/SparkleUI.cs:132 -msgid "[Event][SparkleShare] " -msgstr "" +#~ msgid "folder-sparkleshare" +#~ msgstr "Carpeta-sparkleshare" -#: SparkleShare/SparkleUI.cs:148 -msgid "avatars'" -msgstr "" +#~ msgid "Folder Name: " +#~ msgstr "Nombre de Carpeta: " -#: SparkleShare/SparkleWindow.cs:49 -msgid "Happenings in ‘" -msgstr "" +#~ msgid "Example: " +#~ msgstr "Ejemplo: " -#: SparkleShare/SparkleWindow.cs:49 -msgid "’" -msgstr "" +#~ msgid "‘Project’." +#~ msgstr "‘Proyecto’." -#: SparkleShare/SparkleWindow.cs:124 -msgid "log --format=\"%at☃%an %s☃%cr\" -25" -msgstr "" +#~ msgid "Remote address: " +#~ msgstr "Dirección remota: " -#: SparkleShare/SparkleWindow.cs:144 SparkleShare/SparkleWindow.cs:223 -msgid "☃" -msgstr "" +#~ msgid "Downloading files,\n" +#~ msgstr "Descargando archivos,\n" -#: SparkleShare/SparkleWindow.cs:148 -msgid "document-edited" -msgstr "" +#~ msgid "this may take a while..." +#~ msgstr "esto puede tardar un rato..." -#: SparkleShare/SparkleWindow.cs:150 -msgid " added ‘" -msgstr "" +#~ msgid "[Config] Created '" +#~ msgstr "[Config] Creado '" -#: SparkleShare/SparkleWindow.cs:151 -msgid "document-added" -msgstr "" +#~ msgid "Preferences" +#~ msgstr "Preferencias" -#: SparkleShare/SparkleWindow.cs:153 -msgid " deleted ‘" -msgstr "" +#~ msgid "The folder " +#~ msgstr "La carpeta" -#: SparkleShare/SparkleWindow.cs:154 -msgid "document-removed" -msgstr "" +#~ msgid "Notify me when something changes" +#~ msgstr "Notificarme los cambios" -#: SparkleShare/SparkleWindow.cs:156 -msgid " moved ‘" -msgstr "" +#~ msgid "Synchronize my changes" +#~ msgstr "Sincronizar mis cambios" -#: SparkleShare/SparkleWindow.cs:157 -msgid " renamed ‘" -msgstr "" +#~ msgid "Anonymous" +#~ msgstr "Anónimo" -#: SparkleShare/SparkleWindow.cs:158 -msgid "document-moved" -msgstr "" +#~ msgid "] Nothing going on..." +#~ msgstr "] No sucede nada..." -#: SparkleShare/SparkleWindow.cs:178 -msgid "pixbuf" -msgstr "" +#~ msgid "] Waiting for more changes..." +#~ msgstr "] Esperando más cambios..." -#: SparkleShare/SparkleWindow.cs:179 SparkleShare/SparkleWindow.cs:180 -msgid "text" -msgstr "" +#~ msgid "] Changed staged." +#~ msgstr "] Estado cambiado." -#: SparkleShare/SparkleWindow.cs:204 -msgid "log --format=\"%an☃%ae\" -50" -msgstr "" +#~ msgid "] Commiting changes..." +#~ msgstr "] Aplicando los cambios..." -#: SparkleShare/SparkleWindow.cs:230 -msgid " (that’s you!)" -msgstr "" +#~ msgid "] Changes commited." +#~ msgstr "] Cambios aplicados." -#: SparkleShare/SparkleWindow.cs:237 -msgid "" -"\n" -"" -msgstr "" +#~ msgid "] Fetching changes... " +#~ msgstr "] Recibiendo cambios..." -#: SparkleShare/SparkleWindow.cs:239 -msgid "" -msgstr "" +#~ msgid "] Changes fetched." +#~ msgstr "] Cambios recibidos." + +#~ msgid "] Merging fetched changes... " +#~ msgstr "] Uniendo cambios recibidos..." + +#~ msgid "Already up-to-date." +#~ msgstr "Ya se encuentra en la última versión" + +#~ msgid "new file:" +#~ msgstr "nuevo archivo:" + +#~ msgid "modified:" +#~ msgstr "modificado:" + +#~ msgid "renamed:" +#~ msgstr "renombrado:" + +#~ msgid "deleted:" +#~ msgstr "borrado:" + +#~ msgid "added ‘" +#~ msgstr "añadido " + +#~ msgid "#\tnew file:" +#~ msgstr "#\tnew file:" + +#~ msgid "’ and " +#~ msgstr "’ y " + +#~ msgid " more." +#~ msgstr " más." + +#~ msgid "edited ‘" +#~ msgstr "editado ‘" + +#~ msgid "#\tmodified:" +#~ msgstr "#\tmodificado:" + +#~ msgid "deleted ‘" +#~ msgstr "borrado ‘" + +#~ msgid "#\tdeleted:" +#~ msgstr "#\tborrado:" + +#~ msgid "renamed ‘" +#~ msgstr "renombrado ‘" + +#~ msgid "#\trenamed:" +#~ msgstr "#\trenombrado:" + +#~ msgid "’ to ‘" +#~ msgstr "‘ a ‘" From c0d4968ad434b1ff1c55b4e1a5fe80cffeb304d9 Mon Sep 17 00:00:00 2001 From: jjmarin Date: Fri, 2 Jul 2010 07:43:38 +0000 Subject: [PATCH 06/23] l10n: Updated Spanish (Castilian) (es) translation to 16% New status: 7 messages complete with 3 fuzzies and 33 untranslated. Transmitted-via: Transifex (www.transifex.net). --- po/es.po | 1 - 1 file changed, 1 deletion(-) diff --git a/po/es.po b/po/es.po index e53b6e02..03bb9a19 100644 --- a/po/es.po +++ b/po/es.po @@ -16,7 +16,6 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: ../SparkleShare/SparkleDialog.cs:50 -#, fuzzy msgid "Address of remote SparkleShare folder:" msgstr "Dirección de la carpeta SparkleShare remoto:" From 1fae3a89d991e2c6cd4330b33bdb84740e4fcd1c Mon Sep 17 00:00:00 2001 From: andreklapper Date: Fri, 2 Jul 2010 08:15:42 +0000 Subject: [PATCH 07/23] l10n: Updated German (de) translation to 90% New status: 39 messages complete with 1 fuzzy and 3 untranslated. Transmitted-via: Transifex (www.transifex.net). --- po/de.po | 96 ++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 73 insertions(+), 23 deletions(-) diff --git a/po/de.po b/po/de.po index a8605e8d..39980bce 100644 --- a/po/de.po +++ b/po/de.po @@ -2,12 +2,12 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # Simon Haller , 2010 -# +# msgid "" msgstr "" "Project-Id-Version: SparkleShare 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-21 14:13+0000\n" +"POT-Creation-Date: 2010-07-02 06:01+0000\n" "PO-Revision-Date: 2010-06-21 16:26+0100\n" "Last-Translator: Martin Lettner \n" "Language-Team: \n" @@ -29,7 +29,7 @@ msgstr "Verzeichnis hinzufügen" #: ../SparkleShare/SparkleDialog.cs:126 #, csharp-format msgid "Syncing folder ‘{0}’" -msgstr "Verzeichnis »{0}« wird synchronisiert" +msgstr "Verzeichnis »{0}« wird abgeglichen" #: ../SparkleShare/SparkleDialog.cs:127 msgid "SparkleShare will notify you when this is done." @@ -42,7 +42,7 @@ msgstr "Schließen" #: ../SparkleShare/SparkleDialog.cs:157 #, csharp-format msgid "Something went wrong while syncing ‘{0}’" -msgstr "Bei der Synchronisierung von »{0}« ist ein Fehler aufgetreten" +msgstr "Beim Datenabgleich von »{0}« ist ein Fehler aufgetreten" #: ../SparkleShare/SparkleDialog.cs:167 msgid "Try Again…" @@ -51,15 +51,14 @@ msgstr "Erneut versuchen …" #: ../SparkleShare/SparkleDialog.cs:197 #, csharp-format msgid "Successfully synced folder ‘{0}’" -msgstr "Verzeichnis »{0}« erfolgreich synchronisiert" +msgstr "Verzeichnis »{0}« erfolgreich abgeglichen" #: ../SparkleShare/SparkleDialog.cs:198 msgid "Now make great stuff happen!" msgstr "" #. Add a button to open the folder where the changed file is -#: ../SparkleShare/SparkleDialog.cs:200 -#: ../SparkleShare/SparkleRepo.cs:319 +#: ../SparkleShare/SparkleDialog.cs:200 ../SparkleShare/SparkleRepo.cs:319 #: ../SparkleShare/SparkleWindow.cs:62 msgid "Open Folder" msgstr "Verzeichnis öffnen" @@ -79,9 +78,9 @@ msgstr[0] "vor einer Minute" msgstr[1] "vor {0} Minuten" #: ../SparkleShare/SparkleHelpers.cs:171 -#, csharp-format +#, fuzzy, csharp-format msgid "about an hour ago" -msgid_plural "about {0} minutes ago" +msgid_plural "about {0} hours ago" msgstr[0] "vor einer Stunde" msgstr[1] "vor {0} Stunden" @@ -93,25 +92,24 @@ msgstr[0] "gestern" msgstr[1] "vor {0} Tagen" #: ../SparkleShare/SparkleHelpers.cs:183 -#: ../SparkleShare/SparkleHelpers.cs:189 #, csharp-format msgid "a month ago" msgid_plural "{0} months ago" msgstr[0] "vor einem Monat" msgstr[1] "vor {0} Monaten" -#: ../SparkleShare/SparkleHelpers.cs:194 +#: ../SparkleShare/SparkleHelpers.cs:188 #, csharp-format msgid "a year ago" msgid_plural "{0} years ago" -msgstr[0] "vor einem Jahren" +msgstr[0] "vor einem Jahr" msgstr[1] "vor {0} Jahren" -#: ../SparkleShare/SparkleHelpers.cs:203 +#: ../SparkleShare/SparkleHelpers.cs:197 msgid "Hold your ponies!" msgstr "" -#: ../SparkleShare/SparkleHelpers.cs:204 +#: ../SparkleShare/SparkleHelpers.cs:198 msgid "" "SparkleShare is known to be insanely fast with \n" "pictures of unicorns. Please make sure your internets\n" @@ -148,11 +146,11 @@ msgstr "Dies ist freie Software. Sie können es weitergeben und/oder modifiziere #: ../SparkleShare/SparkleShare.cs:91 msgid "under certain conditions. Please read the GNU GPLv3 for details." -msgstr "unter bestimmten Bedingungen. Bitte lesen Sie dazu die GNU GPLv3 für weitere Details." +msgstr "unter bestimmten Bedingungen. Bitte lesen Sie dazu die GNU GPLv3 für weitere Details." #: ../SparkleShare/SparkleShare.cs:93 msgid "SparkleShare syncs the ~/SparkleShare folder with remote repositories." -msgstr "SparkleShare synchronisiert das Verzeichnis ~/SparkleShare mit entfernten Verzeichnissen" +msgstr "SparkleShare gleicht das Verzeichnis ~/SparkleShare mit entfernten Verzeichnissen ab" #: ../SparkleShare/SparkleShare.cs:95 msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..." @@ -160,7 +158,7 @@ msgstr "Verwendung: sparkleshare [start|stop|restart] [OPTION]..." #: ../SparkleShare/SparkleShare.cs:96 msgid "Sync SparkleShare folder with remote repositories." -msgstr "Synchronisiere SparkleShare Ordner mit entfernten Repositories." +msgstr "SparkleShare Ordner mit entfernten Repositories abgleichen." #: ../SparkleShare/SparkleShare.cs:98 msgid "Arguments:" @@ -176,19 +174,19 @@ msgstr "\t -h, --help\t\tDiesen Hilfe-Text nicht anzeigen." #: ../SparkleShare/SparkleStatusIcon.cs:69 msgid "Error syncing" -msgstr "Fehler bei der Synchronisierung" +msgstr "Fehler beim Datenabgleich" #: ../SparkleShare/SparkleStatusIcon.cs:72 msgid "Everything is up to date" -msgstr "Alles ist am aktuellsten Stand" +msgstr "Alles ist auf dem aktuellsten Stand" #: ../SparkleShare/SparkleStatusIcon.cs:75 msgid "Syncing…" -msgstr "Synchronisieren …" +msgstr "Abgleichen …" #: ../SparkleShare/SparkleStatusIcon.cs:116 msgid "Add a Remote Folder…" -msgstr "Ein entferntes Verzeichnis hinzufügen" +msgstr "Ein entferntes Verzeichnis hinzufügen …" #: ../SparkleShare/SparkleStatusIcon.cs:124 msgid "Show Notifications" @@ -217,118 +215,170 @@ msgstr "Ein Verzeichnis hinzufügen …" #: ../SparkleShare/SparkleWindow.cs:50 #, csharp-format msgid "‘{0}’ on {1}" -msgstr "»{0}« an {1}" +msgstr "»{0}« auf {1}" #~ msgid "folder-sparkleshare" #~ msgstr "ordner-sparkleshare" + #~ msgid "Folder Name: " #~ msgstr "Ordner Name: " + #~ msgid "Example: " #~ msgstr "Beispiel: " + #~ msgid "‘Project’." #~ msgstr "‘Projekt’." + #~ msgid "Remote address: " #~ msgstr "Remote-Adresse: " + #~ msgid "Downloading files,\n" #~ msgstr "Herunterladen von Dateien,\n" + #~ msgid "this may take a while..." #~ msgstr "Dies kann eine Weile dauern..." + #~ msgid "[Config] Created '" #~ msgstr "[Config] erstellt '" + #~ msgid "Preferences" #~ msgstr "Preferencias" + #~ msgid "The folder " #~ msgstr "Der Ordner " + #~ msgid "" #~ "\n" #~ "is linked to " #~ msgstr "" #~ "\n" #~ "ist verknüpft mit " + #~ msgid "Notify me when something changes" #~ msgstr "Benachrichtige mich, wenn sich etwas ändert" + #~ msgid "Synchronize my changes" #~ msgstr "Synchronisiere meine Änderungen" + #~ msgid "Anonymous" #~ msgstr "Anonym" + #~ msgid "] Nothing going on..." #~ msgstr "] Es passiert nichts..." + #~ msgid "] Done waiting." #~ msgstr "] warten beendet." + #~ msgid "] Waiting for more changes..." #~ msgstr "] Warten auf weitere Änderungen..." + #~ msgid "] Staging changes..." #~ msgstr "] Zustand ändert sich. " + #~ msgid "] Changed staged." #~ msgstr "] Zustand geändert." + #~ msgid "] Commiting changes..." #~ msgstr "] Änderungen einbringen..." + #~ msgid "] Changes commited." #~ msgstr "] Änderungen eingebracht." + #~ msgid "] Fetching changes... " #~ msgstr "] Hole Änderungen..." + #~ msgid "] Changes fetched." #~ msgstr "] Änderungen geholt." + #~ msgid "] Merging fetched changes... " #~ msgstr "] Geholte Änderungen zusammenführen..." + #~ msgid "] Changes merged." #~ msgstr "] Änderungen zusammengeführt." + #~ msgid "Already up-to-date." #~ msgstr "Schon am aktuellsten Stand." + #~ msgid "] Nothing going on... " #~ msgstr "] Nichts passiert... " + #~ msgid "] Pushing changes..." #~ msgstr "] übergebe Änderungen..." + #~ msgid "] Changes pushed." #~ msgstr "] Änderungen übergeben." + #~ msgid "new file:" #~ msgstr "neue Datei:" + #~ msgid "modified:" #~ msgstr "geändert:" + #~ msgid "renamed:" #~ msgstr "umbenannt:" + #~ msgid "deleted:" #~ msgstr "gelöscht:" + #~ msgid "added ‘" #~ msgstr "hinzugefügt " + #~ msgid "#\tnew file:" #~ msgstr "#\tneue Datei:" + #~ msgid "’ and " #~ msgstr "’ und " + #~ msgid " more." #~ msgstr " mehr." + #~ msgid "edited ‘" #~ msgstr "editiert ‘" + #~ msgid "#\tmodified:" #~ msgstr "#\tmodifiziert:" + #~ msgid "deleted ‘" #~ msgstr "gelöscht ‘" + #~ msgid "#\tdeleted:" #~ msgstr "#\tgelöscht:" + #~ msgid "renamed ‘" #~ msgstr "umbenannt ‘" + #~ msgid "#\trenamed:" #~ msgstr "#\tumbenannt:" + #~ msgid "’ to ‘" #~ msgstr "‘ zu ‘" + #~ msgid "Open Sharing Folder" #~ msgstr "Öffne gemeinsamen Ornder" + #~ msgid "Happenings in ‘" #~ msgstr "Ereignis in ‘" + #~ msgid "document-edited" #~ msgstr "Dokument editiert" + #~ msgid " added ‘" #~ msgstr " hinzugefügt ‘" + #~ msgid "document-added" #~ msgstr "Dokument hinzugefügt" + #~ msgid " deleted ‘" #~ msgstr " gelöscht ‘" + #~ msgid "document-removed" #~ msgstr "Dokument gelöscht" + #~ msgid " moved ‘" #~ msgstr " verschoben ‘" + #~ msgid " renamed ‘" #~ msgstr " umbenannt ‘" + #~ msgid "document-moved" #~ msgstr "Dokument verschoben" - From d9674346784791d1beffcdb2693a8ff888faeef9 Mon Sep 17 00:00:00 2001 From: Martin Lettner Date: Fri, 2 Jul 2010 10:50:43 +0000 Subject: [PATCH 08/23] l10n: Updated German (de) translation to 93% New status: 40 messages complete with 0 fuzzies and 3 untranslated. Transmitted-via: Transifex (www.transifex.net). --- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index 39980bce..5fdaa6c8 100644 --- a/po/de.po +++ b/po/de.po @@ -78,7 +78,7 @@ msgstr[0] "vor einer Minute" msgstr[1] "vor {0} Minuten" #: ../SparkleShare/SparkleHelpers.cs:171 -#, fuzzy, csharp-format +#, csharp-format msgid "about an hour ago" msgid_plural "about {0} hours ago" msgstr[0] "vor einer Stunde" From 3f8ff4d81d5ad66fb007788888c7abe72ef02a99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Jerna=C5=9B?= Date: Sat, 3 Jul 2010 09:39:28 +0200 Subject: [PATCH 09/23] Add SparkleDiff to the build system --- Makefile.am | 1 + SparkleDiff/Makefile.am | 10 ++++++++++ build/build.environment.mk | 4 ++++ configure.ac | 2 ++ 4 files changed, 17 insertions(+) create mode 100644 SparkleDiff/Makefile.am diff --git a/Makefile.am b/Makefile.am index a55ddf4d..4e58475b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,6 +2,7 @@ SUBDIRS = \ build \ notify-sharp \ SparkleShare \ + SparkleDiff \ data \ po diff --git a/SparkleDiff/Makefile.am b/SparkleDiff/Makefile.am new file mode 100644 index 00000000..0f90c96b --- /dev/null +++ b/SparkleDiff/Makefile.am @@ -0,0 +1,10 @@ +ASSEMBLY = SparkleDiff +TARGET = exe + +LINK = $(REF_SPARKLEDIFF) + +SOURCES = \ +$(top_srcdir)/SparkleShare/Defines.cs \ +SparkleDiff.cs + +include $(top_srcdir)/build/build.mk diff --git a/build/build.environment.mk b/build/build.environment.mk index 0c8fe3d8..b3c75395 100644 --- a/build/build.environment.mk +++ b/build/build.environment.mk @@ -34,6 +34,10 @@ REF_SPARKLESHARE = $(LINK_SYSTEM) $(LINK_GTK) $(LINK_DBUS) $(LINK_NOTIFY_SHARP_D LINK_SPARKLESHARE = -r:$(DIR_BIN)/SparkleShare.exe LINK_SPARKLESHARE_DEPS = $(REF_SPARKLESHARE) $(LINK_SPARKLESHARE) +REF_SPARKLEDIFF = $(LINK_SYSTEM) $(LINK_GTK) $(LINK_DBUS) $(LINK_MONO_POSIX) +LINK_SPARKLEDIFF = -r:$(DIR_BIN)/SparkleShare.exe +LINK_SPARKLEDIFF_DEPS = $(REF_SPARKLEDIFF) $(LINK_SPARKLEDIFF) + # Cute hack to replace a space with something colon:= : empty:= diff --git a/configure.ac b/configure.ac index 0e8f8f31..02d5bed3 100644 --- a/configure.ac +++ b/configure.ac @@ -89,6 +89,8 @@ build/m4/shave/shave-libtool data/Makefile data/icons/Makefile notify-sharp/Makefile +SparkleDiff/Makefile +SparkleDiff/Defines.cs SparkleShare/sparkleshare SparkleShare/Defines.cs SparkleShare/AssemblyInfo.cs From 59eeff6c4c7e9e6154fa88743e7b5a4e791c13ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Jerna=C5=9B?= Date: Sat, 3 Jul 2010 09:50:02 +0200 Subject: [PATCH 10/23] Fixup i18n of SparkleDiff --- SparkleDiff/SparkleDiff.cs | 7 +++++-- po/POTFILES.in | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/SparkleDiff/SparkleDiff.cs b/SparkleDiff/SparkleDiff.cs index 96ddde6d..878ee038 100644 --- a/SparkleDiff/SparkleDiff.cs +++ b/SparkleDiff/SparkleDiff.cs @@ -28,6 +28,7 @@ namespace SparkleShare { public static void Main (string [] args) { + Catalog.Init (Defines.GETTEXT_PACKAGE, Defines.LOCALE_DIR); if (args.Length > 0) { @@ -85,6 +86,7 @@ namespace SparkleShare { DeleteEvent += Quit; IconName = "image-x-generic"; + // TRANSLATORS: The parameter is a filename Title = String.Format(_("Comparing Revisions of ‘{0}’"), file_name); Revisions = GetRevisionsForFile (file_path); @@ -117,9 +119,10 @@ namespace SparkleShare { string author = parts [1]; if (i == 0) - revisions_info [i] = "Current Revision" + "\t" + author; + revisions_info [i] = _("Current Revision") + "\t" + author; else - revisions_info [i] = UnixTimestampToDateTime (timestamp).ToString ("d MMM\tH:mm") + + // TRANSLATORS: This is a format specifier according to System.Globalization.DateTimeFormatInfo + revisions_info [i] = UnixTimestampToDateTime (timestamp).ToString (_("d MMM\tH:mm")) + "\t" + author; i++; diff --git a/po/POTFILES.in b/po/POTFILES.in index ad84be9b..0a11dd8e 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -2,6 +2,7 @@ # Please keep this file in alphabetical order; run ./sort-potfiles # after adding files here. [encoding: UTF-8] +SparkleDiff/SparkleDiff.cs SparkleShare/SparkleBubble.cs SparkleShare/SparkleDialog.cs SparkleShare/SparkleHelpers.cs From 1b504fc26fd9641093c4a4c5b67d7a62a6330157 Mon Sep 17 00:00:00 2001 From: samuelt Date: Sat, 3 Jul 2010 09:20:28 +0000 Subject: [PATCH 11/23] l10n: Added Swedish translation New status: 43 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (www.transifex.net). --- po/sv.po | 220 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 220 insertions(+) create mode 100644 po/sv.po diff --git a/po/sv.po b/po/sv.po new file mode 100644 index 00000000..9c168419 --- /dev/null +++ b/po/sv.po @@ -0,0 +1,220 @@ +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-07-03 08:06+0000\n" +"PO-Revision-Date: \n" +"Last-Translator: Samuel Thollander \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: sb\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"|| n%100>=20) ? 1 : 2);\n" +"X-Poedit-Language: Swedish\n" + + +#: ../SparkleShare/SparkleDialog.cs:50 +msgid "Address of remote SparkleShare folder:" +msgstr "Adress till SparkleShare fjärrmapp" + +#: ../SparkleShare/SparkleDialog.cs:81 +msgid "Add Folder" +msgstr "Lägg till mapp" + +#: ../SparkleShare/SparkleDialog.cs:126 +#, csharp-format +msgid "Syncing folder ‘{0}’" +msgstr "Synkroniserar mappen ‘{0}’" + +#: ../SparkleShare/SparkleDialog.cs:127 +msgid "SparkleShare will notify you when this is done." +msgstr "SparkleShare kommer meddela dig när detta är färdigt." + +#: ../SparkleShare/SparkleDialog.cs:129 +msgid "Dismiss" +msgstr "Stäng" + +#: ../SparkleShare/SparkleDialog.cs:157 +#, csharp-format +msgid "Something went wrong while syncing ‘{0}’" +msgstr "Något blev fel med synkroniseringen av ‘{0}’" + +#: ../SparkleShare/SparkleDialog.cs:167 +msgid "Try Again…" +msgstr "Försök igen..." + +#: ../SparkleShare/SparkleDialog.cs:197 +#, csharp-format +msgid "Successfully synced folder ‘{0}’" +msgstr "Lyckad synkronisering av mappen ‘{0}’" + +#: ../SparkleShare/SparkleDialog.cs:198 +msgid "Now make great stuff happen!" +msgstr "Nu kommer häftiga saker att hända" + +#. Add a button to open the folder where the changed file is +#: ../SparkleShare/SparkleDialog.cs:200 +#: ../SparkleShare/SparkleRepo.cs:319 +#: ../SparkleShare/SparkleWindow.cs:62 +msgid "Open Folder" +msgstr "Öppna mapp" + +#: ../SparkleShare/SparkleHelpers.cs:159 +#, csharp-format +msgid "a second ago" +msgid_plural "{0} seconds ago" +msgstr[0] "en sekund sedan" +msgstr[1] "{0} sekunder sedan" + +#: ../SparkleShare/SparkleHelpers.cs:165 +#, csharp-format +msgid "a minute ago" +msgid_plural "about {0} minutes ago" +msgstr[0] "en minut sedan" +msgstr[1] "{0} minuter sedan" + +#: ../SparkleShare/SparkleHelpers.cs:171 +#, csharp-format +msgid "about an hour ago" +msgid_plural "about {0} hours ago" +msgstr[0] "ungefär en timme sedan" +msgstr[1] "ungefär {0} timmar sedan" + +#: ../SparkleShare/SparkleHelpers.cs:177 +#, csharp-format +msgid "yesterday" +msgid_plural "{0} days ago" +msgstr[0] "igår" +msgstr[1] "{0} dagar sedan" + +#: ../SparkleShare/SparkleHelpers.cs:183 +#, csharp-format +msgid "a month ago" +msgid_plural "{0} months ago" +msgstr[0] "en månad sedan" +msgstr[1] "{0} månader sedan" + +#: ../SparkleShare/SparkleHelpers.cs:188 +#, csharp-format +msgid "a year ago" +msgid_plural "{0} years ago" +msgstr[0] "ett år sedan" +msgstr[1] "{0} år sedan" + +#: ../SparkleShare/SparkleHelpers.cs:197 +msgid "Hold your ponies!" +msgstr "Håll in dina ponnyer!" + +#: ../SparkleShare/SparkleHelpers.cs:198 +msgid "" +"SparkleShare is known to be insanely fast with \n" +"pictures of unicorns. Please make sure your internets\n" +"are upgraded to the latest version to avoid problems." +msgstr "" +"SparkleShare är känt för att vara snabbt med \n" +"bilder på enhörningar. Vänligen säkerställ att dina internet\n" +"är uppgraderade till den senaste versionen för att slippa problem." + +#: ../SparkleShare/SparkleShare.cs:50 +msgid "Git wasn't found." +msgstr "Git hittades inte." + +#: ../SparkleShare/SparkleShare.cs:51 +msgid "You can get Git from http://git-scm.com/." +msgstr "Du kan skaffa Git från http://git-scm.com/." + +#: ../SparkleShare/SparkleShare.cs:58 +msgid "Sorry, you can't run SparkleShare with these permissions." +msgstr "Ledsen, men du kan inte köra SparkleShare med dessa rättigheter." + +#: ../SparkleShare/SparkleShare.cs:59 +msgid "Things will go utterly wrong." +msgstr "Saker och ting kommer gå åt skogen." + +#: ../SparkleShare/SparkleShare.cs:87 +msgid "SparkleShare Copyright (C) 2010 Hylke Bons" +msgstr "SparkleShare Copyright (C) 2010 Hylke Bons" + +#: ../SparkleShare/SparkleShare.cs:89 +msgid "This program comes with ABSOLUTELY NO WARRANTY." +msgstr "Detta program kommer utan några som helst garantier." + +#: ../SparkleShare/SparkleShare.cs:90 +msgid "This is free software, and you are welcome to redistribute it " +msgstr "Detta är fri programvara och du är välkommen att distribuera det " + +#: ../SparkleShare/SparkleShare.cs:91 +msgid "under certain conditions. Please read the GNU GPLv3 for details." +msgstr "under vissa förhållanden. Vänligen läs GNU GPL v3 för detaljer." + +#: ../SparkleShare/SparkleShare.cs:93 +msgid "SparkleShare syncs the ~/SparkleShare folder with remote repositories." +msgstr "SparkleShare synkroniserar ~/SparkleShare mappen med fjärrmappar." + +#: ../SparkleShare/SparkleShare.cs:95 +msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..." +msgstr "Användning: sparkleshare [start|stop|restart] [INSTÄLLNING]" + +#: ../SparkleShare/SparkleShare.cs:96 +msgid "Sync SparkleShare folder with remote repositories." +msgstr "Synkronisera SparkleShare mappen med fjärrmappar." + +#: ../SparkleShare/SparkleShare.cs:98 +msgid "Arguments:" +msgstr "Argument:" + +#: ../SparkleShare/SparkleShare.cs:99 +msgid "\t -d, --disable-gui\tDon't show the notification icon." +msgstr "\t -d, --disable-gui\tVisa inte meddelandeikonen." + +#: ../SparkleShare/SparkleShare.cs:100 +msgid "\t -h, --help\t\tDisplay this help text." +msgstr "\t -h, --help\t\tVisa denna hjälptext." + +#: ../SparkleShare/SparkleStatusIcon.cs:69 +msgid "Error syncing" +msgstr "Synkroniseringsfel" + +#: ../SparkleShare/SparkleStatusIcon.cs:72 +msgid "Everything is up to date" +msgstr "Allt är av senaste versionen" + +#: ../SparkleShare/SparkleStatusIcon.cs:75 +msgid "Syncing…" +msgstr "Synkroniserar…" + +#: ../SparkleShare/SparkleStatusIcon.cs:116 +msgid "Add a Remote Folder…" +msgstr "Lägg till en fjärrmapp…" + +#: ../SparkleShare/SparkleStatusIcon.cs:124 +msgid "Show Notifications" +msgstr "Visa meddelanderutor" + +#: ../SparkleShare/SparkleStatusIcon.cs:142 +msgid "Visit Website" +msgstr "Besök hemsidan" + +#: ../SparkleShare/SparkleStatusIcon.cs:159 +msgid "Quit" +msgstr "Avsluta" + +#: ../SparkleShare/SparkleUI.cs:134 +msgid "Welcome to SparkleShare!" +msgstr "Välkommen till SparkleShare" + +#: ../SparkleShare/SparkleUI.cs:135 +msgid "You don't have any folders set up yet." +msgstr "Du har inga mappar inställda ännu." + +#: ../SparkleShare/SparkleUI.cs:138 +msgid "Add a Folder…" +msgstr "Lägg till en mapp…" + +#: ../SparkleShare/SparkleWindow.cs:50 +#, csharp-format +msgid "‘{0}’ on {1}" +msgstr "{0}’ på {1}" + From 51c6c4ec7c0055d04d47e131ae4b16b55d3f7957 Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Sat, 3 Jul 2010 16:15:47 +0100 Subject: [PATCH 12/23] Add wrapper script for SparkleDiff --- SparkleDiff/sparklediff.in | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 SparkleDiff/sparklediff.in diff --git a/SparkleDiff/sparklediff.in b/SparkleDiff/sparklediff.in new file mode 100644 index 00000000..dba1946b --- /dev/null +++ b/SparkleDiff/sparklediff.in @@ -0,0 +1,13 @@ +#!/bin/bash + +case $1 in + + --help | help) + mono "@expanded_libdir@/@PACKAGE@/SparkleDiff.exe" --help + ;; + + *) + mono "@expanded_libdir@/@PACKAGE@/SparkleDiff.exe" $1 + ;; + +esac From 94226ed88c7692cc1a73bdb9bdc0028e7d96fc2f Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Sat, 3 Jul 2010 19:33:42 +0100 Subject: [PATCH 13/23] Add help for sparklediff command and make it consistent with that of sparkleshare --- SparkleDiff/SparkleDiff.cs | 59 +++++++++++++++++++++++++++++++++--- SparkleShare/SparkleShare.cs | 6 ++-- 2 files changed, 58 insertions(+), 7 deletions(-) diff --git a/SparkleDiff/SparkleDiff.cs b/SparkleDiff/SparkleDiff.cs index 878ee038..cef68eb7 100644 --- a/SparkleDiff/SparkleDiff.cs +++ b/SparkleDiff/SparkleDiff.cs @@ -26,11 +26,43 @@ namespace SparkleShare { public class SparkleDiff { + // Short alias for the translations + public static string _ (string s) + { + return Catalog.GetString (s); + } + public static void Main (string [] args) { + Catalog.Init (Defines.GETTEXT_PACKAGE, Defines.LOCALE_DIR); + // Check whether git is installed + Process Process = new Process (); + Process.StartInfo.FileName = "git"; + Process.StartInfo.RedirectStandardOutput = true; + Process.StartInfo.UseShellExecute = false; + Process.Start (); + + if (Process.StandardOutput.ReadToEnd ().IndexOf ("version") == -1) { + Console.WriteLine (_("Git wasn't found.")); + Console.WriteLine (_("You can get Git from http://git-scm.com/.")); + Environment.Exit (0); + } + + // Don't allow running as root + UnixUserInfo UnixUserInfo = new UnixUserInfo (UnixEnvironment.UserName); + if (UnixUserInfo.UserId == 0) { + Console.WriteLine (_("Sorry, you can't run SparkleShare with these permissions.")); + Console.WriteLine (_("Things would go utterly wrong.")); + Environment.Exit (0); + } + if (args.Length > 0) { + if (args [0].Equals ("--help") || args [0].Equals ("-h")) { + ShowHelp (); + Environment.Exit (0); + } string file_path = args [0]; @@ -56,6 +88,25 @@ namespace SparkleShare { } + // Prints the help output + public static void ShowHelp () + { + Console.WriteLine (_("SparkleDiff Copyright (C) 2010 Hylke Bons")); + Console.WriteLine (" "); + Console.WriteLine (_("This program comes with ABSOLUTELY NO WARRANTY.")); + Console.WriteLine (_("This is free software, and you are welcome to redistribute it ")); + Console.WriteLine (_("under certain conditions. Please read the GNU GPLv3 for details.")); + Console.WriteLine (" "); + Console.WriteLine (_("SparkleDiff let's you compare revisions of an image file side by side.")); + Console.WriteLine (" "); + Console.WriteLine (_("Usage: sparklediff [FILE]")); + Console.WriteLine (_("Open an image file to show its revisions")); + Console.WriteLine (" "); + Console.WriteLine (_("Arguments:")); + Console.WriteLine (_("\t -h, --help\t\tDisplay this help text.")); + Console.WriteLine (" "); + } + } @@ -223,7 +274,7 @@ namespace SparkleShare { private void SyncViewsVertically (object o, EventArgs args) { Adjustment source_adjustment = (Adjustment) o; - + if (source_adjustment == ViewLeft.ScrolledWindow.Vadjustment) ViewRight.ScrolledWindow.Vadjustment = source_adjustment; else @@ -315,7 +366,7 @@ namespace SparkleShare { public Button ButtonPrevious; public Button ButtonNext; - private int ValueCount; +// private int ValueCount; private Image Image; public RevisionView (string [] revisions) : base (false, 6) @@ -335,7 +386,7 @@ namespace SparkleShare { ButtonPrevious = new Button (image_previous); ButtonPrevious.Clicked += PreviousInComboBox; - ValueCount = 0; +// ValueCount = 0; ComboBox = ComboBox.NewText (); @@ -345,7 +396,7 @@ namespace SparkleShare { ComboBox.Active = 0; - ValueCount = revisions.Length; +// ValueCount = revisions.Length; Image image_next = new Image (); image_next.IconName = "go-next"; diff --git a/SparkleShare/SparkleShare.cs b/SparkleShare/SparkleShare.cs index c4f09b05..350f0bc6 100644 --- a/SparkleShare/SparkleShare.cs +++ b/SparkleShare/SparkleShare.cs @@ -39,7 +39,7 @@ namespace SparkleShare { // Use translations Catalog.Init (Defines.GETTEXT_PACKAGE, Defines.LOCALE_DIR); - // Check if git is installed + // Check whether git is installed Process Process = new Process (); Process.StartInfo.FileName = "git"; Process.StartInfo.RedirectStandardOutput = true; @@ -56,7 +56,7 @@ namespace SparkleShare { UnixUserInfo UnixUserInfo = new UnixUserInfo (UnixEnvironment.UserName); if (UnixUserInfo.UserId == 0) { Console.WriteLine (_("Sorry, you can't run SparkleShare with these permissions.")); - Console.WriteLine (_("Things will go utterly wrong.")); + Console.WriteLine (_("Things would go utterly wrong.")); Environment.Exit (0); } @@ -68,6 +68,7 @@ namespace SparkleShare { HideUI = true; if (Argument.Equals ("--help") || Argument.Equals ("-h")) { ShowHelp (); + Environment.Exit (0); } } } @@ -99,7 +100,6 @@ namespace SparkleShare { Console.WriteLine (_("\t -d, --disable-gui\tDon't show the notification icon.")); Console.WriteLine (_("\t -h, --help\t\tDisplay this help text.")); Console.WriteLine (" "); - Environment.Exit (0); } } From b6e8ce315c4fc1662ef37bdd7e0025759bffb35c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Jerna=C5=9B?= Date: Sat, 3 Jul 2010 19:42:33 +0000 Subject: [PATCH 14/23] l10n: Updated Polish (pl) translation to 95% New status: 44 messages complete with 0 fuzzies and 2 untranslated. Transmitted-via: Transifex (www.transifex.net). --- po/pl.po | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/po/pl.po b/po/pl.po index 08f40b51..8e71f442 100644 --- a/po/pl.po +++ b/po/pl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-01 06:14+0000\n" +"POT-Creation-Date: 2010-07-03 19:41+0000\n" "PO-Revision-Date: 2010-06-11 21:59+0200\n" "Last-Translator: Łukasz Jernaś \n" "Language-Team: Polish \n" @@ -23,6 +23,22 @@ msgstr "" "X-Poedit-Country: Poland\n" "X-Generator: Virtaal 0.5.2\n" +#. TRANSLATORS: The parameter is a filename +#: ../SparkleDiff/SparkleDiff.cs:90 +#, csharp-format +msgid "Comparing Revisions of ‘{0}’" +msgstr "" + +#: ../SparkleDiff/SparkleDiff.cs:122 +msgid "Current Revision" +msgstr "Bieżąca rewizja" + +#. TRANSLATORS: This is a format specifier according to +#. System.Globalization.DateTimeFormatInfo +#: ../SparkleDiff/SparkleDiff.cs:125 +msgid "d MMM\tH:mm" +msgstr "" + #: ../SparkleShare/SparkleDialog.cs:50 msgid "Address of remote SparkleShare folder:" msgstr "Adres zdalnego katalogu SparkleShare:" From 0c9b02bea8522530ee354ecbdd61e11509af45d7 Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Sat, 3 Jul 2010 23:12:02 +0100 Subject: [PATCH 15/23] Use arrow buttons for browsing in sparklediff --- SparkleDiff/SparkleDiff.cs | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/SparkleDiff/SparkleDiff.cs b/SparkleDiff/SparkleDiff.cs index cef68eb7..b5a3ca16 100644 --- a/SparkleDiff/SparkleDiff.cs +++ b/SparkleDiff/SparkleDiff.cs @@ -380,11 +380,12 @@ namespace SparkleShare { HBox controls = new HBox (false, 6); controls.BorderWidth = 0; - - Image image_previous = new Image (); - image_previous.IconName = "go-previous"; - ButtonPrevious = new Button (image_previous); + + Arrow arrow_left = new Arrow (ArrowType.Left, ShadowType.None); + ButtonPrevious = new Button (); + ButtonPrevious.Add (arrow_left); ButtonPrevious.Clicked += PreviousInComboBox; + ButtonPrevious.ExposeEvent += EqualizeSizes; // ValueCount = 0; @@ -397,22 +398,32 @@ namespace SparkleShare { ComboBox.Active = 0; // ValueCount = revisions.Length; - - Image image_next = new Image (); - image_next.IconName = "go-next"; - ButtonNext = new Button (image_next); +// TODO Widget width from heigh + Arrow arrow_right = new Arrow (ArrowType.Right, ShadowType.None); + ButtonNext = new Button (); + ButtonNext.Add (arrow_right); ButtonNext.Clicked += NextInComboBox; + ButtonNext.ExposeEvent += EqualizeSizes; -// controls.PackStart (ButtonPrevious, false, false, 0); + controls.PackStart (new Label (""), true, false, 0); + controls.PackStart (ButtonPrevious, false, false, 0); controls.PackStart (ComboBox, false, false, 0); -// controls.PackStart (ButtonNext, false, false, 0); + controls.PackStart (ButtonNext, false, false, 0); + controls.PackStart (new Label (""), true, false, 0); PackStart (controls, false, false, 0); UpdateControls (); } + + // Equalizes the height and width of a button when it's exposed + private void EqualizeSizes (object o, ExposeEventArgs args) { + Button button = (Button) o; + button.WidthRequest = button.Allocation.Height; + } + public void NextInComboBox (object o, EventArgs args) { From 245b746ac0673cdd3e42430c0ea3ee59c8a647ec Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Sat, 3 Jul 2010 23:32:04 +0100 Subject: [PATCH 16/23] sparklediff: Move scrollbars to the top and outside edges of the window --- SparkleDiff/SparkleDiff.cs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/SparkleDiff/SparkleDiff.cs b/SparkleDiff/SparkleDiff.cs index b5a3ca16..7de1867e 100644 --- a/SparkleDiff/SparkleDiff.cs +++ b/SparkleDiff/SparkleDiff.cs @@ -137,6 +137,7 @@ namespace SparkleShare { DeleteEvent += Quit; IconName = "image-x-generic"; + // TRANSLATORS: The parameter is a filename Title = String.Format(_("Comparing Revisions of ‘{0}’"), file_name); @@ -151,7 +152,6 @@ namespace SparkleShare { process.StartInfo.RedirectStandardOutput = true; process.StartInfo.UseShellExecute = false; - // TODO: Nice commit summary and "Current Revision" process.StartInfo.WorkingDirectory = System.IO.Path.GetDirectoryName (file_path); process.StartInfo.FileName = "git"; process.StartInfo.Arguments = "log --format=\"%ct\t%an\" " + file_name; @@ -172,10 +172,11 @@ namespace SparkleShare { if (i == 0) revisions_info [i] = _("Current Revision") + "\t" + author; else + // TRANSLATORS: This is a format specifier according to System.Globalization.DateTimeFormatInfo revisions_info [i] = UnixTimestampToDateTime (timestamp).ToString (_("d MMM\tH:mm")) + - "\t" + author; - + "\t" + author; + i++; } @@ -185,6 +186,9 @@ namespace SparkleShare { ViewLeft.ComboBox.Active = 1; ViewRight.ComboBox.Active = 0; + + ViewLeft.ScrolledWindow.Placement = CornerType.BottomRight; + ViewRight.ScrolledWindow.Placement = CornerType.BottomLeft; RevisionImage revision_image_left = new RevisionImage (file_path, Revisions [1]); RevisionImage revision_image_right = new RevisionImage (file_path, Revisions [0]); @@ -398,7 +402,7 @@ namespace SparkleShare { ComboBox.Active = 0; // ValueCount = revisions.Length; -// TODO Widget width from heigh + Arrow arrow_right = new Arrow (ArrowType.Right, ShadowType.None); ButtonNext = new Button (); ButtonNext.Add (arrow_right); From 4596916adf441bc85528082fa0bc423518d88575 Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Sun, 4 Jul 2010 01:24:03 +0100 Subject: [PATCH 17/23] revamp sparklediff --- SparkleDiff/SparkleDiff.cs | 123 ++++++++++++++++++++++--------------- 1 file changed, 74 insertions(+), 49 deletions(-) diff --git a/SparkleDiff/SparkleDiff.cs b/SparkleDiff/SparkleDiff.cs index 7de1867e..f809807f 100644 --- a/SparkleDiff/SparkleDiff.cs +++ b/SparkleDiff/SparkleDiff.cs @@ -141,7 +141,7 @@ namespace SparkleShare { // TRANSLATORS: The parameter is a filename Title = String.Format(_("Comparing Revisions of ‘{0}’"), file_name); - Revisions = GetRevisionsForFile (file_path); + Revisions = GetRevisionsForFilePath (file_path); VBox layout_vertical = new VBox (false, 12); @@ -158,7 +158,6 @@ namespace SparkleShare { process.Start (); string output = process.StandardOutput.ReadToEnd (); - string [] revisions_info = Regex.Split (output.Trim (), "\n"); int i = 0; @@ -181,20 +180,11 @@ namespace SparkleShare { } - ViewLeft = new RevisionView (revisions_info); - ViewRight = new RevisionView (revisions_info); - - ViewLeft.ComboBox.Active = 1; - ViewRight.ComboBox.Active = 0; - - ViewLeft.ScrolledWindow.Placement = CornerType.BottomRight; - ViewRight.ScrolledWindow.Placement = CornerType.BottomLeft; + ViewLeft = new LeftRevisionView (revisions_info); + ViewRight = new RightRevisionView (revisions_info); - RevisionImage revision_image_left = new RevisionImage (file_path, Revisions [1]); - RevisionImage revision_image_right = new RevisionImage (file_path, Revisions [0]); - - ViewLeft.SetImage (revision_image_left); - ViewRight.SetImage (revision_image_right); + ViewLeft.SetImage (new RevisionImage (file_path, Revisions [1])); + ViewRight.SetImage (new RevisionImage (file_path, Revisions [0])); ViewLeft.ComboBox.Changed += delegate { @@ -226,9 +216,15 @@ namespace SparkleShare { }; + layout_horizontal.PackStart (ViewLeft); layout_horizontal.PackStart (ViewRight); + // Order time view according to the user's reading direction + if (Direction == Gtk.TextDirection.Rtl) // See Deejay1? I can do i18n too! :P + layout_horizontal.ReorderChild (ViewLeft, 1); + + HookUpViews (); HButtonBox dialog_buttons = new HButtonBox (); @@ -250,7 +246,7 @@ namespace SparkleShare { } - // Hooks up two views so they will be kept in sync + // Hooks up two views so their scrollbars will be kept in sync private void HookUpViews () { ViewLeft.ScrolledWindow.Hadjustment.ValueChanged += SyncViewsHorizontally; @@ -288,7 +284,7 @@ namespace SparkleShare { // Gets a list of all earlier revisions of this file - private string [] GetRevisionsForFile (string file_path) + private string [] GetRevisionsForFilePath (string file_path) { string file_name = System.IO.Path.GetFileName (file_path); @@ -305,8 +301,9 @@ namespace SparkleShare { process.Start (); string output = process.StandardOutput.ReadToEnd (); + string [] revisions = Regex.Split (output.Trim (), "\n"); - return Regex.Split (output.Trim (), "\n"); + return revisions; } @@ -370,7 +367,7 @@ namespace SparkleShare { public Button ButtonPrevious; public Button ButtonNext; -// private int ValueCount; + private int ValueCount; private Image Image; public RevisionView (string [] revisions) : base (false, 6) @@ -379,10 +376,10 @@ namespace SparkleShare { Image = new Image (); ScrolledWindow = new ScrolledWindow (); - ScrolledWindow.AddWithViewport (Image); - PackStart (ScrolledWindow, true, true, 0); - HBox controls = new HBox (false, 6); + ScrolledWindow.AddWithViewport (Image); + + HBox controls = new HBox (false, 3); controls.BorderWidth = 0; Arrow arrow_left = new Arrow (ArrowType.Left, ShadowType.None); @@ -391,7 +388,7 @@ namespace SparkleShare { ButtonPrevious.Clicked += PreviousInComboBox; ButtonPrevious.ExposeEvent += EqualizeSizes; -// ValueCount = 0; + ValueCount = 0; ComboBox = ComboBox.NewText (); @@ -401,7 +398,7 @@ namespace SparkleShare { ComboBox.Active = 0; -// ValueCount = revisions.Length; + ValueCount = revisions.Length; Arrow arrow_right = new Arrow (ArrowType.Right, ShadowType.None); ButtonNext = new Button (); @@ -411,41 +408,55 @@ namespace SparkleShare { controls.PackStart (new Label (""), true, false, 0); controls.PackStart (ButtonPrevious, false, false, 0); - controls.PackStart (ComboBox, false, false, 0); controls.PackStart (ButtonNext, false, false, 0); + controls.PackStart (ComboBox, false, false, 9); controls.PackStart (new Label (""), true, false, 0); PackStart (controls, false, false, 0); + PackStart (ScrolledWindow, true, true, 0); UpdateControls (); } - - // Equalizes the height and width of a button when it's exposed + + // Equalizes the height and width of a button when exposed private void EqualizeSizes (object o, ExposeEventArgs args) { + Button button = (Button) o; button.WidthRequest = button.Allocation.Height; + } public void NextInComboBox (object o, EventArgs args) { -/* if (ComboBox.Active > 0) + if (ComboBox.Active - 1 >= 0) ComboBox.Active--; UpdateControls (); -*/ + } public void PreviousInComboBox (object o, EventArgs args) { -/* if (ComboBox.Active + 1 < ValueCount) + if (ComboBox.Active + 1 < ValueCount) ComboBox.Active++; UpdateControls (); -*/ + + } + + + // Updates the buttons to be disabled or enabled when needed + public void UpdateControls () { + + ButtonPrevious.State = StateType.Normal; + ButtonNext.State = StateType.Normal; + + // TODO: Disable Next or Previous buttons when at the first or last value of the combobox + } @@ -457,28 +468,42 @@ namespace SparkleShare { ScrolledWindow = new ScrolledWindow (); ScrolledWindow.AddWithViewport (Image); Add (ScrolledWindow); - ReorderChild (ScrolledWindow, 0); ShowAll (); } - - // Updates the buttons to be disabled or enabled when needed - public void UpdateControls () { - - // TODO: Doesn't work yet. Sleepy -.- -/* ButtonPrevious.State = StateType.Normal; - ButtonNext.State = StateType.Normal; - - if (ComboBox.Active == 0) - ButtonNext.State = StateType.Insensitive; - - if (ComboBox.Active + 1 == ValueCount) - ButtonPrevious.State = StateType.Insensitive; -*/ - - } - + } + + + public class LeftRevisionView : RevisionView { + + public LeftRevisionView (string [] revisions) : base (revisions) { + + ComboBox.Active = 1; + + if (Direction == Gtk.TextDirection.Ltr) + ScrolledWindow.Placement = CornerType.TopRight; + else + ScrolledWindow.Placement = CornerType.TopLeft; + + } + + } + + + public class RightRevisionView : RevisionView { + + public RightRevisionView (string [] revisions) : base (revisions) { + + ComboBox.Active = 0; + + if (Direction == Gtk.TextDirection.Ltr) + ScrolledWindow.Placement = CornerType.TopLeft; + else + ScrolledWindow.Placement = CornerType.TopRight; + + } + } } From eec07affc844b562a78dcb223d20291d9e76540a Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Sun, 4 Jul 2010 02:00:16 +0100 Subject: [PATCH 18/23] sparklediff: update controls when shown --- SparkleDiff/SparkleDiff.cs | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/SparkleDiff/SparkleDiff.cs b/SparkleDiff/SparkleDiff.cs index f809807f..c650149c 100644 --- a/SparkleDiff/SparkleDiff.cs +++ b/SparkleDiff/SparkleDiff.cs @@ -415,7 +415,9 @@ namespace SparkleShare { PackStart (controls, false, false, 0); PackStart (ScrolledWindow, true, true, 0); - UpdateControls (); + Shown += delegate { + UpdateControls (); + }; } @@ -434,7 +436,7 @@ namespace SparkleShare { if (ComboBox.Active - 1 >= 0) ComboBox.Active--; - UpdateControls (); +// UpdateControls (); } @@ -444,7 +446,7 @@ namespace SparkleShare { if (ComboBox.Active + 1 < ValueCount) ComboBox.Active++; - UpdateControls (); +// UpdateControls (); } @@ -456,6 +458,19 @@ namespace SparkleShare { ButtonNext.State = StateType.Normal; // TODO: Disable Next or Previous buttons when at the first or last value of the combobox + // I can't get this to work! >:( + + if (ComboBox.Active == ValueCount - 1) { + ButtonPrevious.State = StateType.Insensitive; + Console.WriteLine ("BEGINNING REACHED"); + } + + // FAULT IS HERE + if (ComboBox.Active == 0) { + Console.WriteLine ("END REACHED"); + ButtonNext.State = StateType.Insensitive; + } + } From c4ec2f4a11b7b798b6e5511f9bbddeffada0f94c Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Sun, 4 Jul 2010 11:39:16 +0100 Subject: [PATCH 19/23] Split SparkleDiff over several smaller files --- SparkleDiff/LeftRevisionView.cs | 36 +++ SparkleDiff/Makefile.am | 7 +- SparkleDiff/RevisionImage.cs | 51 ++++ SparkleDiff/RevisionView.cs | 151 +++++++++++ SparkleDiff/RightRevisionView.cs | 36 +++ SparkleDiff/SparkleDiff.cs | 413 ------------------------------- SparkleDiff/SparkleDiffWindow.cs | 241 ++++++++++++++++++ configure.ac | 1 - 8 files changed, 521 insertions(+), 415 deletions(-) create mode 100644 SparkleDiff/LeftRevisionView.cs create mode 100644 SparkleDiff/RevisionImage.cs create mode 100644 SparkleDiff/RevisionView.cs create mode 100644 SparkleDiff/RightRevisionView.cs create mode 100644 SparkleDiff/SparkleDiffWindow.cs diff --git a/SparkleDiff/LeftRevisionView.cs b/SparkleDiff/LeftRevisionView.cs new file mode 100644 index 00000000..402112be --- /dev/null +++ b/SparkleDiff/LeftRevisionView.cs @@ -0,0 +1,36 @@ +// SparkleShare, an instant update workflow to Git. +// Copyright (C) 2010 Hylke Bons +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +using Gtk; + +namespace SparkleShare { + + public class LeftRevisionView : RevisionView { + + public LeftRevisionView (string [] revisions) : base (revisions) { + + ComboBox.Active = 1; + + if (Direction == Gtk.TextDirection.Ltr) + ScrolledWindow.Placement = CornerType.TopRight; + else + ScrolledWindow.Placement = CornerType.TopLeft; + + } + + } + +} diff --git a/SparkleDiff/Makefile.am b/SparkleDiff/Makefile.am index 0f90c96b..74949719 100644 --- a/SparkleDiff/Makefile.am +++ b/SparkleDiff/Makefile.am @@ -5,6 +5,11 @@ LINK = $(REF_SPARKLEDIFF) SOURCES = \ $(top_srcdir)/SparkleShare/Defines.cs \ -SparkleDiff.cs +SparkleDiff.cs \ +SparkleDiffWindow.cs \ +RevisionView.cs \ +RevisionImage.cs \ +LeftRevisionView.cs \ +RightRevisionView.cs include $(top_srcdir)/build/build.mk diff --git a/SparkleDiff/RevisionImage.cs b/SparkleDiff/RevisionImage.cs new file mode 100644 index 00000000..a96385f9 --- /dev/null +++ b/SparkleDiff/RevisionImage.cs @@ -0,0 +1,51 @@ +// SparkleShare, an instant update workflow to Git. +// Copyright (C) 2010 Hylke Bons +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +using Gtk; +using System.Diagnostics; + +namespace SparkleShare { + + // An image grabbed from a stream generated by Git + public class RevisionImage : Image + { + + public string Revision; + public string FilePath; + + public RevisionImage (string file_path, string revision) : base () + { + + Revision = revision; + FilePath = file_path; + + Process process = new Process (); + process.EnableRaisingEvents = true; + process.StartInfo.RedirectStandardOutput = true; + process.StartInfo.UseShellExecute = false; + + process.StartInfo.WorkingDirectory = System.IO.Path.GetDirectoryName (FilePath); + process.StartInfo.FileName = "git"; + process.StartInfo.Arguments = "show " + Revision + ":" + System.IO.Path.GetFileName (FilePath); + process.Start (); + + Pixbuf = new Gdk.Pixbuf ((System.IO.Stream) process.StandardOutput.BaseStream); + + } + + } + +} diff --git a/SparkleDiff/RevisionView.cs b/SparkleDiff/RevisionView.cs new file mode 100644 index 00000000..1c900ba4 --- /dev/null +++ b/SparkleDiff/RevisionView.cs @@ -0,0 +1,151 @@ +// SparkleShare, an instant update workflow to Git. +// Copyright (C) 2010 Hylke Bons +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +using Gtk; +using System; + +namespace SparkleShare { + + // A custom widget containing an image view, + // previous/next buttons and a combobox + public class RevisionView : VBox + { + + public ScrolledWindow ScrolledWindow; + public ComboBox ComboBox; + public Button ButtonPrevious; + public Button ButtonNext; + + private int ValueCount; + private Image Image; + + public RevisionView (string [] revisions) : base (false, 6) + { + + Image = new Image (); + + ScrolledWindow = new ScrolledWindow (); + + ScrolledWindow.AddWithViewport (Image); + + HBox controls = new HBox (false, 3); + controls.BorderWidth = 0; + + Arrow arrow_left = new Arrow (ArrowType.Left, ShadowType.None); + ButtonPrevious = new Button (); + ButtonPrevious.Add (arrow_left); + ButtonPrevious.Clicked += PreviousInComboBox; + ButtonPrevious.ExposeEvent += EqualizeSizes; + + ValueCount = 0; + + ComboBox = ComboBox.NewText (); + + foreach (string revision in revisions) { + ComboBox.AppendText (revision); + } + + ComboBox.Active = 0; + + ValueCount = revisions.Length; + + Arrow arrow_right = new Arrow (ArrowType.Right, ShadowType.None); + ButtonNext = new Button (); + ButtonNext.Add (arrow_right); + ButtonNext.Clicked += NextInComboBox; + ButtonNext.ExposeEvent += EqualizeSizes; + + controls.PackStart (new Label (""), true, false, 0); + controls.PackStart (ButtonPrevious, false, false, 0); + controls.PackStart (ButtonNext, false, false, 0); + controls.PackStart (ComboBox, false, false, 9); + controls.PackStart (new Label (""), true, false, 0); + + PackStart (controls, false, false, 0); + PackStart (ScrolledWindow, true, true, 0); + + Shown += delegate { + UpdateControls (); + }; + + } + + + // Equalizes the height and width of a button when exposed + private void EqualizeSizes (object o, ExposeEventArgs args) { + + Button button = (Button) o; + button.WidthRequest = button.Allocation.Height; + + } + + + public void NextInComboBox (object o, EventArgs args) { + + if (ComboBox.Active - 1 >= 0) + ComboBox.Active--; + +// UpdateControls (); + + } + + + public void PreviousInComboBox (object o, EventArgs args) { + + if (ComboBox.Active + 1 < ValueCount) + ComboBox.Active++; + +// UpdateControls (); + + } + + + // Updates the buttons to be disabled or enabled when needed + public void UpdateControls () { + + ButtonPrevious.State = StateType.Normal; + ButtonNext.State = StateType.Normal; + + // TODO: Disable Next or Previous buttons when at the first or last value of the combobox + // I can't get this to work! >:( + + if (ComboBox.Active == ValueCount - 1) { + ButtonPrevious.State = StateType.Insensitive; + } + + if (ComboBox.Active == 0) { + ButtonNext.State = StateType.Insensitive; + } + + + } + + + // Changes the image that is viewed + public void SetImage (Image image) { + + Image = image; + Remove (ScrolledWindow); + ScrolledWindow = new ScrolledWindow (); + ScrolledWindow.AddWithViewport (Image); + Add (ScrolledWindow); + ShowAll (); + + } + + } + +} diff --git a/SparkleDiff/RightRevisionView.cs b/SparkleDiff/RightRevisionView.cs new file mode 100644 index 00000000..637dcca9 --- /dev/null +++ b/SparkleDiff/RightRevisionView.cs @@ -0,0 +1,36 @@ +// SparkleShare, an instant update workflow to Git. +// Copyright (C) 2010 Hylke Bons +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +using Gtk; + +namespace SparkleShare { + + public class RightRevisionView : RevisionView { + + public RightRevisionView (string [] revisions) : base (revisions) { + + ComboBox.Active = 0; + + if (Direction == Gtk.TextDirection.Ltr) + ScrolledWindow.Placement = CornerType.TopLeft; + else + ScrolledWindow.Placement = CornerType.TopRight; + + } + + } + +} diff --git a/SparkleDiff/SparkleDiff.cs b/SparkleDiff/SparkleDiff.cs index c650149c..8bc2aca4 100644 --- a/SparkleDiff/SparkleDiff.cs +++ b/SparkleDiff/SparkleDiff.cs @@ -19,7 +19,6 @@ using Mono.Unix; using System; using System.Diagnostics; using System.IO; -using System.Text.RegularExpressions; namespace SparkleShare { @@ -109,416 +108,4 @@ namespace SparkleShare { } - - public class SparkleDiffWindow : Window - { - - // Short alias for the translations - public static string _ (string s) - { - return Catalog.GetString (s); - } - - private RevisionView ViewLeft; - private RevisionView ViewRight; - - private string [] Revisions; - - public SparkleDiffWindow (string file_path) : base ("") - { - - string file_name = System.IO.Path.GetFileName (file_path); - - SetSizeRequest (800, 540); - SetPosition (WindowPosition.Center); - - BorderWidth = 12; - - DeleteEvent += Quit; - - IconName = "image-x-generic"; - - // TRANSLATORS: The parameter is a filename - Title = String.Format(_("Comparing Revisions of ‘{0}’"), file_name); - - Revisions = GetRevisionsForFilePath (file_path); - - VBox layout_vertical = new VBox (false, 12); - - HBox layout_horizontal = new HBox (false, 12); - - Process process = new Process (); - process.EnableRaisingEvents = true; - process.StartInfo.RedirectStandardOutput = true; - process.StartInfo.UseShellExecute = false; - - process.StartInfo.WorkingDirectory = System.IO.Path.GetDirectoryName (file_path); - process.StartInfo.FileName = "git"; - process.StartInfo.Arguments = "log --format=\"%ct\t%an\" " + file_name; - process.Start (); - - string output = process.StandardOutput.ReadToEnd (); - string [] revisions_info = Regex.Split (output.Trim (), "\n"); - - int i = 0; - foreach (string revision_info in revisions_info) { - - string [] parts = Regex.Split (revision_info.Trim (), "\t"); - - int timestamp = int.Parse (parts [0]); - string author = parts [1]; - - if (i == 0) - revisions_info [i] = _("Current Revision") + "\t" + author; - else - - // TRANSLATORS: This is a format specifier according to System.Globalization.DateTimeFormatInfo - revisions_info [i] = UnixTimestampToDateTime (timestamp).ToString (_("d MMM\tH:mm")) + - "\t" + author; - - i++; - - } - - ViewLeft = new LeftRevisionView (revisions_info); - ViewRight = new RightRevisionView (revisions_info); - - ViewLeft.SetImage (new RevisionImage (file_path, Revisions [1])); - ViewRight.SetImage (new RevisionImage (file_path, Revisions [0])); - - ViewLeft.ComboBox.Changed += delegate { - - RevisionImage revision_image; - revision_image = new RevisionImage (file_path, Revisions [ViewLeft.ComboBox.Active]); - ViewLeft.SetImage (revision_image); - - HookUpViews (); - - ViewLeft.ScrolledWindow.Hadjustment = ViewRight.ScrolledWindow.Hadjustment; - ViewLeft.ScrolledWindow.Vadjustment = ViewRight.ScrolledWindow.Vadjustment; - - ViewLeft.UpdateControls (); - - }; - - ViewRight.ComboBox.Changed += delegate { - - RevisionImage revision_image; - revision_image = new RevisionImage (file_path, Revisions [ViewRight.ComboBox.Active]); - ViewRight.SetImage (revision_image); - - HookUpViews (); - - ViewRight.ScrolledWindow.Hadjustment = ViewLeft.ScrolledWindow.Hadjustment; - ViewRight.ScrolledWindow.Vadjustment = ViewLeft.ScrolledWindow.Vadjustment; - - ViewRight.UpdateControls (); - - }; - - - layout_horizontal.PackStart (ViewLeft); - layout_horizontal.PackStart (ViewRight); - - // Order time view according to the user's reading direction - if (Direction == Gtk.TextDirection.Rtl) // See Deejay1? I can do i18n too! :P - layout_horizontal.ReorderChild (ViewLeft, 1); - - - HookUpViews (); - - HButtonBox dialog_buttons = new HButtonBox (); - dialog_buttons.Layout = ButtonBoxStyle.End; - dialog_buttons.BorderWidth = 0; - - Button CloseButton = new Button (Stock.Close); - CloseButton.Clicked += delegate (object o, EventArgs args) { - Environment.Exit (0); - }; - - dialog_buttons.Add (CloseButton); - - layout_vertical.PackStart (layout_horizontal, true, true, 0); - layout_vertical.PackStart (dialog_buttons, false, false, 0); - - Add (layout_vertical); - - } - - - // Hooks up two views so their scrollbars will be kept in sync - private void HookUpViews () { - - ViewLeft.ScrolledWindow.Hadjustment.ValueChanged += SyncViewsHorizontally; - ViewLeft.ScrolledWindow.Vadjustment.ValueChanged += SyncViewsVertically; - ViewRight.ScrolledWindow.Hadjustment.ValueChanged += SyncViewsHorizontally; - ViewRight.ScrolledWindow.Vadjustment.ValueChanged += SyncViewsVertically; - - } - - - // Keeps the two image views in sync horizontally - private void SyncViewsHorizontally (object o, EventArgs args) { - - Adjustment source_adjustment = (Adjustment) o; - - if (source_adjustment == ViewLeft.ScrolledWindow.Hadjustment) - ViewRight.ScrolledWindow.Hadjustment = source_adjustment; - else - ViewLeft.ScrolledWindow.Hadjustment = source_adjustment; - - } - - - // Keeps the two image views in sync vertically - private void SyncViewsVertically (object o, EventArgs args) { - - Adjustment source_adjustment = (Adjustment) o; - - if (source_adjustment == ViewLeft.ScrolledWindow.Vadjustment) - ViewRight.ScrolledWindow.Vadjustment = source_adjustment; - else - ViewLeft.ScrolledWindow.Vadjustment = source_adjustment; - - } - - - // Gets a list of all earlier revisions of this file - private string [] GetRevisionsForFilePath (string file_path) - { - - string file_name = System.IO.Path.GetFileName (file_path); - - Process process = new Process (); - process.EnableRaisingEvents = true; - process.StartInfo.RedirectStandardOutput = true; - process.StartInfo.UseShellExecute = false; - - // TODO: Nice commit summary and "Current Revision" - process.StartInfo.WorkingDirectory = System.IO.Path.GetDirectoryName (file_path); - process.StartInfo.FileName = "git"; - process.StartInfo.Arguments = "log --format=\"%H\" " + file_name; - process.Start (); - - string output = process.StandardOutput.ReadToEnd (); - string [] revisions = Regex.Split (output.Trim (), "\n"); - - return revisions; - - } - - - // Converts a UNIX timestamp to a more usable time object - public DateTime UnixTimestampToDateTime (int timestamp) - { - DateTime unix_epoch = new DateTime (1970, 1, 1, 0, 0, 0, 0); - return unix_epoch.AddSeconds (timestamp); - } - - - // Quits the program - private void Quit (object o, EventArgs args) { - - Environment.Exit (0); - - } - - - } - - - // An image grabbed from a stream generated by Git - public class RevisionImage : Image - { - - public string Revision; - public string FilePath; - - public RevisionImage (string file_path, string revision) : base () - { - - Revision = revision; - FilePath = file_path; - - Process process = new Process (); - process.EnableRaisingEvents = true; - process.StartInfo.RedirectStandardOutput = true; - process.StartInfo.UseShellExecute = false; - - process.StartInfo.WorkingDirectory = System.IO.Path.GetDirectoryName (FilePath); - process.StartInfo.FileName = "git"; - process.StartInfo.Arguments = "show " + revision + ":" + System.IO.Path.GetFileName (FilePath); - process.Start (); - - Pixbuf = new Gdk.Pixbuf ((System.IO.Stream) process.StandardOutput.BaseStream); - - } - - } - - - // A custom widget containing an image view, - // previous/next buttons and a combobox - public class RevisionView : VBox - { - - public ScrolledWindow ScrolledWindow; - public ComboBox ComboBox; - public Button ButtonPrevious; - public Button ButtonNext; - - private int ValueCount; - private Image Image; - - public RevisionView (string [] revisions) : base (false, 6) - { - - Image = new Image (); - - ScrolledWindow = new ScrolledWindow (); - - ScrolledWindow.AddWithViewport (Image); - - HBox controls = new HBox (false, 3); - controls.BorderWidth = 0; - - Arrow arrow_left = new Arrow (ArrowType.Left, ShadowType.None); - ButtonPrevious = new Button (); - ButtonPrevious.Add (arrow_left); - ButtonPrevious.Clicked += PreviousInComboBox; - ButtonPrevious.ExposeEvent += EqualizeSizes; - - ValueCount = 0; - - ComboBox = ComboBox.NewText (); - - foreach (string revision in revisions) { - ComboBox.AppendText (revision); - } - - ComboBox.Active = 0; - - ValueCount = revisions.Length; - - Arrow arrow_right = new Arrow (ArrowType.Right, ShadowType.None); - ButtonNext = new Button (); - ButtonNext.Add (arrow_right); - ButtonNext.Clicked += NextInComboBox; - ButtonNext.ExposeEvent += EqualizeSizes; - - controls.PackStart (new Label (""), true, false, 0); - controls.PackStart (ButtonPrevious, false, false, 0); - controls.PackStart (ButtonNext, false, false, 0); - controls.PackStart (ComboBox, false, false, 9); - controls.PackStart (new Label (""), true, false, 0); - - PackStart (controls, false, false, 0); - PackStart (ScrolledWindow, true, true, 0); - - Shown += delegate { - UpdateControls (); - }; - - } - - - // Equalizes the height and width of a button when exposed - private void EqualizeSizes (object o, ExposeEventArgs args) { - - Button button = (Button) o; - button.WidthRequest = button.Allocation.Height; - - } - - - public void NextInComboBox (object o, EventArgs args) { - - if (ComboBox.Active - 1 >= 0) - ComboBox.Active--; - -// UpdateControls (); - - } - - - public void PreviousInComboBox (object o, EventArgs args) { - - if (ComboBox.Active + 1 < ValueCount) - ComboBox.Active++; - -// UpdateControls (); - - } - - - // Updates the buttons to be disabled or enabled when needed - public void UpdateControls () { - - ButtonPrevious.State = StateType.Normal; - ButtonNext.State = StateType.Normal; - - // TODO: Disable Next or Previous buttons when at the first or last value of the combobox - // I can't get this to work! >:( - - if (ComboBox.Active == ValueCount - 1) { - ButtonPrevious.State = StateType.Insensitive; - Console.WriteLine ("BEGINNING REACHED"); - } - - // FAULT IS HERE - if (ComboBox.Active == 0) { - Console.WriteLine ("END REACHED"); - ButtonNext.State = StateType.Insensitive; - } - - - } - - - // Changes the image that is viewed - public void SetImage (Image image) { - - Image = image; - Remove (ScrolledWindow); - ScrolledWindow = new ScrolledWindow (); - ScrolledWindow.AddWithViewport (Image); - Add (ScrolledWindow); - ShowAll (); - - } - - } - - - public class LeftRevisionView : RevisionView { - - public LeftRevisionView (string [] revisions) : base (revisions) { - - ComboBox.Active = 1; - - if (Direction == Gtk.TextDirection.Ltr) - ScrolledWindow.Placement = CornerType.TopRight; - else - ScrolledWindow.Placement = CornerType.TopLeft; - - } - - } - - - public class RightRevisionView : RevisionView { - - public RightRevisionView (string [] revisions) : base (revisions) { - - ComboBox.Active = 0; - - if (Direction == Gtk.TextDirection.Ltr) - ScrolledWindow.Placement = CornerType.TopLeft; - else - ScrolledWindow.Placement = CornerType.TopRight; - - } - - } - } diff --git a/SparkleDiff/SparkleDiffWindow.cs b/SparkleDiff/SparkleDiffWindow.cs new file mode 100644 index 00000000..51c08227 --- /dev/null +++ b/SparkleDiff/SparkleDiffWindow.cs @@ -0,0 +1,241 @@ +// SparkleShare, an instant update workflow to Git. +// Copyright (C) 2010 Hylke Bons +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +using Gtk; +using Mono.Unix; +using System; +using System.Diagnostics; +using System.Text.RegularExpressions; + +namespace SparkleShare { + + // The main window of SparkleDiff + public class SparkleDiffWindow : Window + { + + // Short alias for the translations + public static string _ (string s) + { + return Catalog.GetString (s); + } + + private RevisionView ViewLeft; + private RevisionView ViewRight; + + private string [] Revisions; + + public SparkleDiffWindow (string file_path) : base ("") + { + + string file_name = System.IO.Path.GetFileName (file_path); + + SetSizeRequest (800, 540); + SetPosition (WindowPosition.Center); + + BorderWidth = 12; + + DeleteEvent += Quit; + + IconName = "image-x-generic"; + + // TRANSLATORS: The parameter is a filename + Title = String.Format(_("Comparing Revisions of ‘{0}’"), file_name); + + Revisions = GetRevisionsForFilePath (file_path); + + VBox layout_vertical = new VBox (false, 12); + + HBox layout_horizontal = new HBox (false, 12); + + Process process = new Process (); + process.EnableRaisingEvents = true; + process.StartInfo.RedirectStandardOutput = true; + process.StartInfo.UseShellExecute = false; + + process.StartInfo.WorkingDirectory = System.IO.Path.GetDirectoryName (file_path); + process.StartInfo.FileName = "git"; + process.StartInfo.Arguments = "log --format=\"%ct\t%an\" " + file_name; + process.Start (); + + string output = process.StandardOutput.ReadToEnd (); + string [] revisions_info = Regex.Split (output.Trim (), "\n"); + + int i = 0; + foreach (string revision_info in revisions_info) { + + string [] parts = Regex.Split (revision_info.Trim (), "\t"); + + int timestamp = int.Parse (parts [0]); + string author = parts [1]; + + if (i == 0) + revisions_info [i] = _("Current Revision") + "\t" + author; + else + + // TRANSLATORS: This is a format specifier according to System.Globalization.DateTimeFormatInfo + revisions_info [i] = UnixTimestampToDateTime (timestamp).ToString (_("d MMM\tH:mm")) + + "\t" + author; + + i++; + + } + + ViewLeft = new LeftRevisionView (revisions_info); + ViewRight = new RightRevisionView (revisions_info); + + ViewLeft.SetImage (new RevisionImage (file_path, Revisions [1])); + ViewRight.SetImage (new RevisionImage (file_path, Revisions [0])); + + ViewLeft.ComboBox.Changed += delegate { + + RevisionImage revision_image; + revision_image = new RevisionImage (file_path, Revisions [ViewLeft.ComboBox.Active]); + ViewLeft.SetImage (revision_image); + + HookUpViews (); + + ViewLeft.ScrolledWindow.Hadjustment = ViewRight.ScrolledWindow.Hadjustment; + ViewLeft.ScrolledWindow.Vadjustment = ViewRight.ScrolledWindow.Vadjustment; + + ViewLeft.UpdateControls (); + + }; + + ViewRight.ComboBox.Changed += delegate { + + RevisionImage revision_image; + revision_image = new RevisionImage (file_path, Revisions [ViewRight.ComboBox.Active]); + ViewRight.SetImage (revision_image); + + HookUpViews (); + + ViewRight.ScrolledWindow.Hadjustment = ViewLeft.ScrolledWindow.Hadjustment; + ViewRight.ScrolledWindow.Vadjustment = ViewLeft.ScrolledWindow.Vadjustment; + + ViewRight.UpdateControls (); + + }; + + + layout_horizontal.PackStart (ViewLeft); + layout_horizontal.PackStart (ViewRight); + + // Order time view according to the user's reading direction + if (Direction == Gtk.TextDirection.Rtl) // See Deejay1? I can do i18n too! :P + layout_horizontal.ReorderChild (ViewLeft, 1); + + + HookUpViews (); + + HButtonBox dialog_buttons = new HButtonBox (); + dialog_buttons.Layout = ButtonBoxStyle.End; + dialog_buttons.BorderWidth = 0; + + Button CloseButton = new Button (Stock.Close); + CloseButton.Clicked += delegate (object o, EventArgs args) { + Environment.Exit (0); + }; + + dialog_buttons.Add (CloseButton); + + layout_vertical.PackStart (layout_horizontal, true, true, 0); + layout_vertical.PackStart (dialog_buttons, false, false, 0); + + Add (layout_vertical); + + } + + + // Hooks up two views so their scrollbars will be kept in sync + private void HookUpViews () { + + ViewLeft.ScrolledWindow.Hadjustment.ValueChanged += SyncViewsHorizontally; + ViewLeft.ScrolledWindow.Vadjustment.ValueChanged += SyncViewsVertically; + ViewRight.ScrolledWindow.Hadjustment.ValueChanged += SyncViewsHorizontally; + ViewRight.ScrolledWindow.Vadjustment.ValueChanged += SyncViewsVertically; + + } + + + // Keeps the two image views in sync horizontally + private void SyncViewsHorizontally (object o, EventArgs args) { + + Adjustment source_adjustment = (Adjustment) o; + + if (source_adjustment == ViewLeft.ScrolledWindow.Hadjustment) + ViewRight.ScrolledWindow.Hadjustment = source_adjustment; + else + ViewLeft.ScrolledWindow.Hadjustment = source_adjustment; + + } + + + // Keeps the two image views in sync vertically + private void SyncViewsVertically (object o, EventArgs args) { + + Adjustment source_adjustment = (Adjustment) o; + + if (source_adjustment == ViewLeft.ScrolledWindow.Vadjustment) + ViewRight.ScrolledWindow.Vadjustment = source_adjustment; + else + ViewLeft.ScrolledWindow.Vadjustment = source_adjustment; + + } + + + // Gets a list of all earlier revisions of this file + private string [] GetRevisionsForFilePath (string file_path) + { + + string file_name = System.IO.Path.GetFileName (file_path); + + Process process = new Process (); + process.EnableRaisingEvents = true; + process.StartInfo.RedirectStandardOutput = true; + process.StartInfo.UseShellExecute = false; + + // TODO: Nice commit summary and "Current Revision" + process.StartInfo.WorkingDirectory = System.IO.Path.GetDirectoryName (file_path); + process.StartInfo.FileName = "git"; + process.StartInfo.Arguments = "log --format=\"%H\" " + file_name; + process.Start (); + + string output = process.StandardOutput.ReadToEnd (); + string [] revisions = Regex.Split (output.Trim (), "\n"); + + return revisions; + + } + + + // Converts a UNIX timestamp to a more usable time object + public DateTime UnixTimestampToDateTime (int timestamp) + { + DateTime unix_epoch = new DateTime (1970, 1, 1, 0, 0, 0, 0); + return unix_epoch.AddSeconds (timestamp); + } + + + // Quits the program + private void Quit (object o, EventArgs args) { + + Environment.Exit (0); + + } + + } + +} diff --git a/configure.ac b/configure.ac index 02d5bed3..97548661 100644 --- a/configure.ac +++ b/configure.ac @@ -90,7 +90,6 @@ data/Makefile data/icons/Makefile notify-sharp/Makefile SparkleDiff/Makefile -SparkleDiff/Defines.cs SparkleShare/sparkleshare SparkleShare/Defines.cs SparkleShare/AssemblyInfo.cs From 6b27503edc7b2edf6bd8e0cf01c666c40135970b Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Sun, 4 Jul 2010 12:00:59 +0100 Subject: [PATCH 20/23] rename notify-sharp to NotifySharp, just looks nicer --- Makefile.am | 2 +- {notify-sharp => NotifySharp}/Global.cs | 0 {notify-sharp => NotifySharp}/Makefile.am | 0 {notify-sharp => NotifySharp}/Notification.cs | 0 .../notify-sharp.csproj => NotifySharp/NotifySharp.csproj | 0 SparkleShare.sln | 2 +- configure.ac | 2 +- 7 files changed, 3 insertions(+), 3 deletions(-) rename {notify-sharp => NotifySharp}/Global.cs (100%) rename {notify-sharp => NotifySharp}/Makefile.am (100%) rename {notify-sharp => NotifySharp}/Notification.cs (100%) rename notify-sharp/notify-sharp.csproj => NotifySharp/NotifySharp.csproj (100%) diff --git a/Makefile.am b/Makefile.am index 4e58475b..2f67e799 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = \ build \ - notify-sharp \ + NotifySharp \ SparkleShare \ SparkleDiff \ data \ diff --git a/notify-sharp/Global.cs b/NotifySharp/Global.cs similarity index 100% rename from notify-sharp/Global.cs rename to NotifySharp/Global.cs diff --git a/notify-sharp/Makefile.am b/NotifySharp/Makefile.am similarity index 100% rename from notify-sharp/Makefile.am rename to NotifySharp/Makefile.am diff --git a/notify-sharp/Notification.cs b/NotifySharp/Notification.cs similarity index 100% rename from notify-sharp/Notification.cs rename to NotifySharp/Notification.cs diff --git a/notify-sharp/notify-sharp.csproj b/NotifySharp/NotifySharp.csproj similarity index 100% rename from notify-sharp/notify-sharp.csproj rename to NotifySharp/NotifySharp.csproj diff --git a/SparkleShare.sln b/SparkleShare.sln index 903866f0..e1d2563c 100644 --- a/SparkleShare.sln +++ b/SparkleShare.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleShare", "SparkleShare\SparkleShare.csproj", "{728483AA-E34B-4441-BF2C-C8BC2901E4E0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "notify-sharp", "notify-sharp\notify-sharp.csproj", "{005CCA8E-DFBF-464A-B6DA-452C62D4589C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NotifySharp", "NotifySharp\NotifySharp.csproj", "{005CCA8E-DFBF-464A-B6DA-452C62D4589C}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/configure.ac b/configure.ac index 97548661..21b2da33 100644 --- a/configure.ac +++ b/configure.ac @@ -88,7 +88,7 @@ build/m4/shave/shave build/m4/shave/shave-libtool data/Makefile data/icons/Makefile -notify-sharp/Makefile +NotifySharp/Makefile SparkleDiff/Makefile SparkleShare/sparkleshare SparkleShare/Defines.cs From 8255f5d69cb4dfae0fb16e3062591fcb27701585 Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Sun, 4 Jul 2010 12:16:26 +0100 Subject: [PATCH 21/23] Don't need the doap file anymore --- sparkleshare.doap | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 sparkleshare.doap diff --git a/sparkleshare.doap b/sparkleshare.doap deleted file mode 100644 index ed8dddc4..00000000 --- a/sparkleshare.doap +++ /dev/null @@ -1,16 +0,0 @@ - - - SparkleShare - An instant update collaboration workflow for Git - - - - Hylke Bons - hbons - - - From 06f6fd56838858d565a0d92105407ce945bfa3bb Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Sun, 4 Jul 2010 12:24:45 +0100 Subject: [PATCH 22/23] Remove unneeded icons and separate artwork license --- ARTWORK | 4 ---- data/icons/Makefile.am | 18 +----------------- data/icons/emblem-sync-error-22.png | Bin 1176 -> 0 bytes data/icons/emblem-sync-error-24.png | Bin 1197 -> 0 bytes data/icons/emblem-synced-22.png | Bin 1135 -> 0 bytes data/icons/emblem-synced-24.png | Bin 1182 -> 0 bytes data/icons/emblem-syncing-22.png | Bin 1287 -> 0 bytes data/icons/emblem-syncing-24.png | Bin 1311 -> 0 bytes data/icons/fedorahosted-16.png | Bin 747 -> 0 bytes data/icons/folder-sync-error-22.png | Bin 1195 -> 0 bytes data/icons/folder-sync-error-24.png | Bin 1235 -> 0 bytes data/icons/folder-synced-22.png | Bin 1126 -> 0 bytes data/icons/folder-synced-24.png | Bin 1156 -> 0 bytes data/icons/folder-syncing-22.png | Bin 1210 -> 0 bytes data/icons/folder-syncing-24.png | Bin 1259 -> 0 bytes data/icons/github-16.png | Bin 440 -> 0 bytes data/icons/gitorious-16.png | Bin 387 -> 0 bytes data/icons/gnome-16.png | Bin 650 -> 0 bytes 18 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 ARTWORK delete mode 100644 data/icons/emblem-sync-error-22.png delete mode 100644 data/icons/emblem-sync-error-24.png delete mode 100644 data/icons/emblem-synced-22.png delete mode 100644 data/icons/emblem-synced-24.png delete mode 100644 data/icons/emblem-syncing-22.png delete mode 100644 data/icons/emblem-syncing-24.png delete mode 100644 data/icons/fedorahosted-16.png delete mode 100644 data/icons/folder-sync-error-22.png delete mode 100644 data/icons/folder-sync-error-24.png delete mode 100644 data/icons/folder-synced-22.png delete mode 100644 data/icons/folder-synced-24.png delete mode 100644 data/icons/folder-syncing-22.png delete mode 100644 data/icons/folder-syncing-24.png delete mode 100644 data/icons/github-16.png delete mode 100644 data/icons/gitorious-16.png delete mode 100644 data/icons/gnome-16.png diff --git a/ARTWORK b/ARTWORK deleted file mode 100644 index 64d387c8..00000000 --- a/ARTWORK +++ /dev/null @@ -1,4 +0,0 @@ -The icons and artwork in this project fall under the -Creative Commons Attribution ShareAlike 3.0 License, -except for the logo icons from hosting projects, -these belong to their respective owners. diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index 49ba7a25..4011dc98 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -5,13 +5,6 @@ hicolordir = $(DESTDIR)$(datadir)/icons/hicolor theme_icons = \ animations,process-syncing-sparkleshare-24.png \ animations,process-working-48.png \ - emblems,emblem-synced-22.png \ - emblems,emblem-synced-24.png \ - emblems,emblem-sync-error-22.png \ - emblems,emblem-sync-error-24.png \ - emblems,emblem-syncing-22.png \ - emblems,emblem-syncing-24.png \ - places,fedorahosted-16.png \ places,folder-16.png \ places,folder-22.png \ places,folder-24.png \ @@ -24,9 +17,6 @@ theme_icons = \ places,folder-sparkleshare-256.png \ places,folder-sparkleshare-32.png \ places,folder-sparkleshare-48.png \ - places,github-16.png \ - places,gitorious-16.png \ - places,gnome-16.png \ status,avatar-default-16.png \ status,avatar-default-22.png \ status,avatar-default-24.png \ @@ -35,13 +25,7 @@ theme_icons = \ status,document-added-16.png \ status,document-edited-16.png \ status,document-moved-16.png \ - status,document-removed-16.png \ - status,folder-synced-22.png \ - status,folder-synced-24.png \ - status,folder-sync-error-22.png \ - status,folder-sync-error-24.png \ - status,folder-syncing-22.png \ - status,folder-syncing-24.png + status,document-removed-16.png install_icon_exec = $(top_srcdir)/build/icon-theme-installer \ -t "$(theme)" \ diff --git a/data/icons/emblem-sync-error-22.png b/data/icons/emblem-sync-error-22.png deleted file mode 100644 index 8f76f4498eef7fe25febb544bbb245f728852179..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1176 zcmV;J1ZVq+P)=0000NbVXQnL3MO! zZ*l-kVQ_CCLt$)TZDDR?a%E}Xks2xh001j=MObu1WpiV4X>fFDZ*BlWVRL0 z6w4ANu~xriA-r>NqI9WZ5utBY7DDF;{-oGj(ESkeB+p?rG>Gn5iu0iZK;LvIr4-INthLw>up!{02)$`jb$zGmjT>=kT3s7! za3NIxrRP43HJIQr!DHiymA$>J`RF*wQ%_dya~gMcvikVP+<&MKSC>}p&YH!<&RDGX zSntv6A0fZ}2~?8sK<~TccI>G7(vHon?dwD5a^&0F(QS`aeb(4oViCbwQ{C3s&=tPh zy$f$LbdvDkd+(F)+CkdU!MdX#pmTYGb6k3LFC&8k6`c3j1sTWlrLdS#Xd&>d<48l=W>Ym^zYw?8XTk{S6{&?g?4vj4Af+7LtsUm5)BP;aqmk6 z=g>(~Aq|24o^IU00F7y`24l<;8CQsFk6J?)ty`Rb@p)RFd6v=h=g7x#)fa2c*th4okQpYf{7OMqiJxhu__rEF%)(;|oA_6xGM zPPOjN*B@9FN4qpMa2MhgrRy$y@o91TSW)C}B_b%L?ga{UkgQLV6$vcsZL%PLT003i qpd=!tIpPS2SaAIAQUc&aB>WG=KZyTA&^T8B0000=0000NbVXQnL3MO! zZ*l-kVQ_CCLt$)TZDDR?a%E}Xks2xh001j=MObu1WpiV4X>fFDZ*BlWVRL0@NZWLr5y-?2aMe$U@7UiX{t)&>(iaNu{&dCvL%zUMrgM|khKn-XSULWskw3oj&L z@Ro7@aqwb!rGyWq_&Ig%osO~b^K;%?47%2?+`B4YINH|InqObH5#;jfd+Qh-9^%Je z2PP+{CtvRPcj8KK_E=ZBvzU2gxUv;%In z=-8v8#`%>G-?wHB#`^p}kJN+d=9P`kTqhKvEN$}QEJh&fm@gn)8wvs0V(k#LNsA8a< zV?`Jf3=Gh>?0`K|$ zjn}w#?i)%MiWCp-$6HHSTg#4w|+?UOJCKHe`Qm2D3wRH*eDO;`7u!^DM(X-Q>bBi-l4$ z@@)^jsbcK%FGQshQV0+NzvwOU9+jpTJGV>Z#1vP%yNRVl+v*(?Ao#o3M<65?fyILm zxHMhZqPGYAjDYLY=?q#hw~xF9{DM6+tKNfgZf*|=n4T#kU~s_<%FZ7zr{x)C4F-Ql zni@@6&6KCSKQdc4dvG??h=x76+Cyu@V7G)kcOX_Ue$BWqJ}pfhFM0o06@U=pUZ79| zQGFDxh+tW7rUw6q))RmM#=ZCB^8o@NVBXce195=y-n%M*yCwet@{)`JnfWvo00000 LNkvXXu0mjfDQ6*m diff --git a/data/icons/emblem-synced-22.png b/data/icons/emblem-synced-22.png deleted file mode 100644 index cc6b71247eb1ce6d09eb1e09b99bdebddcfa1ee3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1135 zcmV-#1d#iQP)=0000NbVXQnL3MO! zZ*l-kVQ_CCLt$)TZDDR?a%E}Xks2xh001j=MObu1WpiV4X>fFDZ*BlWVRL0W9@&f#a1FhN5}fgzmkj3#Nx3R zy^pR_D9Vu_#A3mqvHs|Z<0BsdC=p>>*V>*;rs>FC8}6xUtZyz03LqkkPmS{Z52u#q z7v`V%=J>@g6rkGn-8A*kjz=1TxMzN81`#O>9H1JkU=Q#D<$-b{X_`Nm0b^pzc zu^>oQC)12f{Q{H+%`0N|(gcl}wYbQ)0K_9FN>zd}250S6K=bmE;A{kl0*JF*qj4JR z$^+kV%Vrj{bNn`TmOw>VrweC!un5LjtaVomZC%&K&MnoC9gl5(j@Fh30B}*n=ij~$z@|If+0*_~9vWsj)Vq&?^FNYlP7_optaIp+ zj6E1_n44bUlP{04@%F7W)HTz-=}DZk%wC$H^TAgN(4M!u7&zZYT~jqdOyR6UsQ_b4 zVG9c5ri~_16=!mKlml-(PVeE5X{c-F;Vt_MRpi1fFTd4E|4<*bnItNps4vFo!hQvi zA2+Q-yhNmGD;b*{ru+3>%*;)!f-dpG(Y>5GcbZg90s<-Nfz}}_7KmpJ(59?lM&CY7#4DZyD+Vy#P>myg1_%X3_nj`PRl1)e?fD4E(u z`Um?+)+CTXivC+sK8jV%i^Y|QgHY>|%}XR>j8Ba)HaX0i>IwvpwY~(p0#<}8Eh9K_ z?7}q2d>H2Nk;hqEu=kF{8c0+rgsAAO*beU^beID;0}zOaxX`~FMN!Tl~5yS)KE}u>68tlUBE`zprt3y0)S-h^ZU?^{)RT=VWMp#(wzo*VCVh$VDY0 zD5YwE6cD=_=qg!YQA8G3z`-)KyjQeT0z@L>{{~!IFzZp0>a_p>002ovPDHLkV1lnV B2Alu@ diff --git a/data/icons/emblem-synced-24.png b/data/icons/emblem-synced-24.png deleted file mode 100644 index 114efbea70f971b2037250bc7589c41b77c04943..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1182 zcmV;P1Y!G$P)=0000NbVXQnL3MO! zZ*l-kVQ_CCLt$)TZDDR?a%E}Xks2xh001j=MObu1WpiV4X>fFDZ*BlWVRL0KoAlZ zrO0GjIbC~yspHtrxnHk7%yV|mHm4K%!vzo5bMyakUDtg*j}j4PtLd4QOXei6qVkHk zeD}dQJv*;*fUR5Cl>U>Lcs>@7y%K`I0n{Q9LM#?_8ygNCJ#yi*Ie?9AE81)8mLI&Q z@xJoD|o?K4@iE1@!W#|#u}_!9N^Ad*E2CS&Yyj!h@yaX#TRJ?AOT|x z*1BspZ(P;PmZm*er}^ls{q&D_W2~7U0AP*5T_a%a>Wyr9a1RPa2!a0IAuicTQpp7X z+UR@*N~tT}qT}H@DMr ze;d}?qPTliGut=qL!rp%DGqcz%jvV7)GV(+#TCY8uT+7ct-)Bw6YF23arHw0IPdxT zr;h>|xJa+ZY)i zC@`PoeE5Son>p7cTmWa_mbb-FX9+p;=AOx%pbIfx9g{H7a5x~*I=Z8fkoy}$lKH#j) zM+lCxrBGI`5PZ?Q!tl-!d_e0Az{w(jh=|LE554yp=N#UJq6k3{WKO;?ob}U7>iv|? zgpPbwxzE9pN_E?s2kN(1rb=3)n7V1+9$ZDv$=URX{q*-AhQAb%i$wsXR27f}V%K9{ wAPY>0$i!?wblH5dfBV@Iz>7#I0{mb44;m;u>*3w*uK)l507*qoM6N<$f~(^j9smFU diff --git a/data/icons/emblem-syncing-22.png b/data/icons/emblem-syncing-22.png deleted file mode 100644 index 0a001960364a90f60406a1d590772d77fa2ed4c0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1287 zcmV+i1^D`jP)=0000NbVXQnL3MO! zZ*l-kVQ_CCLt$)TZDDR?a%E}Xks2xh001j=MObu1WpiV4X>fFDZ*BlWVRL0BH>I&S(Yte7bPX^E?0Z{Gan&B_b$=iZ9)@AzE*} z>}ao(+lXk?8t`2I^+JAhpPYHsH34Evcdwn6Zrro+$=-P9{4|E4ZV4&^=LfE3-tYTm z`^8JD0ob8Lgw~aNPdu}JS#L*2n$dz!7|Jbym4Z}*MSi@%j@|v)@gvXAFabO-=*rAa zk-cW)2enW$qL|+nr`|GfypZgeW^BT{34TR;WYTez(9*o*t)vMcpjnlz~W4RAxCryFOZbgrQ&7&u z<*NnW{o)TU433j-ZeabR3s^L_m1#)}LqbI0(8=s1c2$Y-2*^Td$nKyd$PW!8KJ9dHX^l3%h9tqQ~9<`gS9I&^q(9i zd(FnSr$khNJ+$@^5w<)zJZ_rDD9Y z=NP%`n$2sw+5C9zG(CL$5?gnEi|s)qESXj`sPwTC5#q~t6=$`jV%iH3fn2VLghF#m zoQa}FiLhqH98!%@95>+S->-1)?{N}|C=p{yWh`nkI5g(gdC}=gL`W>(bs`au_L^n{ zKL~F!NdVsqDm@x86h_3T*%L7oVJPJDIy-Uvh0@pzbbfbUc+;{X4UroXs-ryqgHQ;< zpk~bpLVQ24C79SJf~eB3DRx)=-Op`MiS~`ku;%_J`TrsehQi|Icbszv4vHT6a}unQ xK$5C1xy|r_f{5hGU;~IyHAZhU1n@;9{0AA25>fHZYAOH#002ovPDHLkV1lz(SU>;( diff --git a/data/icons/emblem-syncing-24.png b/data/icons/emblem-syncing-24.png deleted file mode 100644 index 20926709b53f78efd4d06fd94528b9a0d206674f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1311 zcmV+)1>pLLP)=0000NbVXQnL3MO! zZ*l-kVQ_CCLt$)TZDDR?a%E}Xks2xh001j=MObu1WpiV4X>fFDZ*BlWVRL0R= zc6QgX)|YK`6>ZzaTwBFRurMQ#pb*Kxz{riTz)$rl`d}XvBnZVcKWIcn^kNb8MzV#O zX(FZeVu~)d?vAqV&N#Dk?{nWyAI7~qcUA)h&!>BNp6C3|IsbExCL-KPi;jP28d_q> zj`gv6<5f#J9k=5w7Bl)C+kLZCyt+qDzix*B@g+OgOwCN$wc+WWM8~`gx~|=la}hY# zKa&0Mz;9bGT+|wXZ2;PMiCR|dKK9(Yr9JKK8LpOGeE-%;r)iLGFenyEY}?tFD;#=p zx(E_v;5c4qc2=6)h>7ckokt@Y^I8+s8#Mza@6v#9+uRhvF%_s1uh(Gn+>sH+60D(@`i zQr-F!8OZphN(7JIKMl+F*u4EGdX~<^Fe1U#O=}m@J-3nE@EFaF^)x2yf_IkXK$V15 zB@#@_K`EEkmN@l>&i*e>Gb5Y9_XVZg;HFbHX>D$;hy+}^QVPy3%S8x|s1_MZIhe}f z3!1E8#&8v_8$>-CRDBXoAoLL?md zxOFee2H!?hXU&Q%eJ6&@qK@+e1>V?ul+0b}kn;_z7tqr&jUy+A7#g*R#iE#&ev>w3 zLIV--e4%VPeDv)ZHa^wGuOB?afxZizxtM24gTWKavve=W&_8&M-Ywsw8FeV-QZ_@Q z74D+4X$OFB4)-%P9p|-ON624O^secm_sQ@UKX~*ao45af=|IG(rAUgqq-1(L}a5q%=+cr41m;HX{a z#HNiL?=1v?B+2?C4A3b?vF* z&Z6+PVMH1tH4m$8e1JS(@O&?HW_doY>zU$>?GdRID#$?7;`h|w`@(uH*|tH`jX5_Z z{Ga*WpkKc9o^^KLeo@1J*8sE>kfNruZo^!lBqI4*fDS~cS>d-~0=OdLhX8lV{sYtO VAGOMC8A1R6002ovPDHLkV1l2|W(xoS diff --git a/data/icons/fedorahosted-16.png b/data/icons/fedorahosted-16.png deleted file mode 100644 index 84287bbb1f13ba5097807865434cc88bec3bea59..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 747 zcmVizbV;y-bm-DkllFA8o+SWSN_f15i+Ter~N{ z*13y!E&2@r0pV%@DFwTGs&sd`J=A%9?Ecs+J_sFlW^l?8)VCaG_+k%z!Djr8Zd|71 z)sx#yCo{a9N~3jw_0)pH>~sLG+CyHBgw7#^fixumHPRrL|Lvfl+5VnlbNMs5?3M#a zmVV*zv2FnDxwqV(Dhggdy92=B@ZD-1f)+D|bFMvD&(21=oK9_xL@8Z888C#NECKR6 zSq^v_Fl5oxnbQIMjcyjdt^K7s<9=6cqSV5M{gI}wUam*4(9`arue*i3Dlqo^O_f~I zrc_Y?$H8)T)h3;sCfwmA9B3w=0000NbVXQnL3MO! zZ*l-kVQ_CCLt$)TZDDR?a%E}Xks2xh001j=MObu1WpiV4X>fFDZ*BlWVRL0PBm-tl01aG9J zTnZ9w#L{rvUY2$@J2N|T&ga7}mkJBP#D8+~on*fA%m4e%Wt52Uf5-ti-ltv{%YIK# z(VH^FP^oi9ZQ1=K?mh%LVVZb?<0qcp$>Z24$ASnavX-l zZ1K=z2X0EJX;@C{%Ffv2A7@66_E}XhQdEk!9~_ju3&940xhZsTi#1ad)HK|q+PgX( zF_nrcQA`LrBq#;-=PwrC0TzO_2yQNmE-hq+A><06FHPRDbOrIzKDE2&3wi6hV=WY> zFC+f-L?cjiVad9U#54DT7(ft_@>~RvaukF13rrk5@Fq|OAALb>ZHVFIX7URhSWXRX z-49XUScg9Oc?Dcu(XOX4psrQ$`}6A3swbb##1=JH98}zhM&{08&JQznA>h!EO?K+` zaDW=yKII3d-zkNXiKo)&u`h4kJKN&W4-PAqcC&fY8kB8Ug_=-v_T-8C504%B%n3B0 z1QogYZd_G1o9BtgR#F%pMO=5mw;S)Rip6MKy_%no4c})429zbJXte482!a5wkjLrm zCDGrHufWqGCEFr7FhI@v^>~FmrJ#Ift18sz-X(}c zXnB7(iwAZxzN`&53@KGAasmTl0k>%dfbY3@I%MR-56E<{rDMYe;$MGDq^XHBKMpbS z@kcybzX;zegRMY=vbm#U&nr7#6RqXD{ue3E&Jby8qA-=^o9)|JTbH0@4Bl0+D61F* zJ}TaTiX~9-`trOkjY=#=C7a7&*TvT%A@JO%`-nHDap$g(XliEb-hCJaz7Fv!t+2FG z)5Y8@L{kt=qv~2wi#ky0E>!b6RLkQF94~w2Rhl<$X8fmv?0L9{v%mgA%a*5T-M#}~ z>uZkfN0vypoxk!xOMS$Wd>(UU7Bh1Rlbyg^9>-ib#qiKH$=Vnt&t)!^B0D+B_iwyL zhX}uYwIAy0m^g8aaQsh=0000NbVXQnL3MO! zZ*l-kVQ_CCLt$)TZDDR?a%E}Xks2xh001j=MObu1WpiV4X>fFDZ*BlWVRL04H1!GWtX*I>(0#1+_^q%x80@PCK~%sZtls=J?DSE?#UIcHA@L&Nv#7`K^W?h z{UYWejfCgj(!sbU*w@joKmE4^Qb^JHJ?2#F!%xI4LqXs};DPcX@Npf7-v-ZRedTp- z>DNE~rwEiHVrmC9d}7|EirPC_yP-L9{g=_fp*`iYs#digxeKp=W? zj~wp!Sid}vz*m|~`X<_)QwTI~narM&Acb^-+@FCD@LB4|!kkI@$RzNa2%|kmjkQus&w(Z&T+XszAA~bAl z<=Y?6Z-kjq;RPUuM#AB;3&8VoIGJgz&Q7X(dvOI^<&!fFVtsv7Y~PNPnI`AYwW0yw z2Ovg1f^rMMbsSu!_`SK270*4-%7cgSLLpYab(j@>`?#{M0o(Vj zux(uB;{#8)`75-?949$5^}fSzM(`2rM8xHmOby51j4Zwynh! zN}vC%4A^!SPx*|FT;}En?{oT%*J(0MKI?jt`(JsD2@(JwhT-yRQEpIKw2X*BFU$-(DR$+5fG+x~$Wnh>{sEt&$tBk|fdT*k002ovPDHLkV1l%VKEeP1 diff --git a/data/icons/folder-synced-22.png b/data/icons/folder-synced-22.png deleted file mode 100644 index 0fa84b001ccaea604e9f99079ce63564b8cd5582..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1126 zcmV-s1eyDZP)=0000NbVXQnL3MO! zZ*l-kVQ_CCLt$)TZDDR?a%E}Xks2xh001j=MObu1WpiV4X>fFDZ*BlWVRL0wFb zO&U!6=tm^cwt>{B(MlEjU@U&LFCwK{qczeO!G|IW;)5@KQ0zld5JX5L0fUGT#CH+= z3Tdrr+J>f$CTTQHldPMMo!Pl_@9|-`mXNG#1rHp~4D-Lg`JXfQjuH|6k8lBoI@K%U z#EuFoxk@26BiO@jJ@UnkfR%_a*cn^c_UO~=UB`fp!01A?5qUr0w^IYT$mj>|?vbGz zavVjZViI76`&S9#>CN1FM^kF@{DqUJJDn03$tlH~J9^}Um0$}xdljSCSaWrpczUC{ zy`{+&TkNP<#YSKvbf~MQ{#besSP3>F_?a0@xRMz~kXZsVJz2JO1>Vn{>ixD)<<;ws zjj%L(1<79*T7jGo4ecFx^^G7F5JaSKEdofPipAuY82_gK2v7i@KB%5ar*JcKiz^&B zZk*fhx`(RT3e4FPMR4gzwmgLe^>+t9J*%egd~APxs=Bu5py);nlAXX#4RT@GaD29s zv0V8*@4D_e6NX)G7)iZXvjH>QxAyE}4#(#_>RWcQySWv|iIs#}YdC-L%=Up(KX$v? z07_7a)o0^cj4fMsZffSzuB86%nt+KZFRK;Oi0D+%FhkDKIXg|oF`=6t(qLIKafL(1t9N-^D0pRC- zLcRI~wKngf%15D(jXBi2XKmSQ^os9d_PA+x``(qdVvSq_R{04F~Gkm2!fsjl(RTH^-=aBSZe*%)QA_cpAL$7FF4`{z7%ZW=o?j=gdb`};Y1 zCl>HhDV(@vuy55wY-=Sv8wA|IsPy47x(Y21h;x02><{907*qoM6N<$f*&vdmH+?% diff --git a/data/icons/folder-synced-24.png b/data/icons/folder-synced-24.png deleted file mode 100644 index 111f4508f17d81c9802fbc165fe2ecc44c9be58a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1156 zcmV-~1bh35P)=0000NbVXQnL3MO! zZ*l-kVQ_CCLt$)TZDDR?a%E}Xks2xh001j=MObu1WpiV4X>fFDZ*BlWVRL0990y@e|L6vmmLrm zXaK)jF<_u1R8(qBHTFTYsjV-jF&G3ZrY~wt8l#Ev!52Sc9~w%+2J7j}!9aFUaIGV?#@fB$Fh$sJ*gVLi=S*Xn?s z3nu!+vqD7PFo^gnl+lX@y}x77eDYrjM6N|+y^+6K@85fkZ7I+pXbCC=9g^{Vejguo zLnZIJZP5JqzZ57%B4T{hS~bC}GP1Z}|eprNx1r@j%424gUod<-VL8jZ>t|^>!+2%2CG;XNz9N;%yJ3K@_Mm#xUAroom_ET~}6_TrQH^ zmBL(_L(hN5$+Y6og$icewFlF-?VnW;^p6akJ!S(0p{YwGlc>oLizbMO#i5i#ecLv6 zG`C|}k&?x=R!sf!)8^6dj|~8=He^o_0z_=}jOA=5t=YD*nO{#&5`=z9T+A+`abq*z zjDFPu%iln15SBs2OA~;Pl#;Y}x#(LV1ow4zb9!MKKjY?~TL7U3VPzGRasWT$Ap=>| zyE=P#;LgX`P~M22@$v+D1;!F^l@e(z65}t(!X8y?q~XyBrxvYAPD&+w~%T#^Z(8_EAwK@cb1DjIdl8_)gTR0uyF= z#R}&Xo|mQ}*~EkQJkH%6dl>rcAP?R91WuxY=U;ge6<VIB7#aJRug5;8Z|~E1zRTe7L2Bw8fj4^~#ap_MVO9-m#oGS%|AZo|BkV)Pnt&b00iq#OtW*|Ij66Gn@E_{WvGUbgOk6@LR+ W7PDC{8#?Cz0000=0000NbVXQnL3MO! zZ*l-kVQ_CCLt$)TZDDR?a%E}Xks2xh001j=MObu1WpiV4X>fFDZ*BlWVRL0q{IMt_K z7R%l%sN@WVn6zMCTs^tI7{J-Pz-*FN>m>QCjh z+m5y1jbBH?+d?DY=b@>4BW~k8AO;Xbq*#jpQp{q|p~uMg2VVt>;1j)STdD#leKR-B zf#oDdV+_re*!m~W`_(mS+YAtqi zo<f?nDw{bQlW{Jc;-ytB43CAF(xj#;9TK)h#*Zn)rq~WkvG)FE zKK^X5-H8k+OHj$V!In~lks&O^l$TjNv!RK$CKmud)O>gP7Mr^kvU~qU!q5T0i47=A z&Fff1$mIe&FJSA&RuHhvYdkL?TTyJ46B!T-mzO>si{?#NVDr zL-*^%+EC>tdGv`MGRYEHl;uZJ=qB70NDRsXtm4;{D(zt+6X1Cvg9AGNK`BN5o*#H{ z(`HsKucxiKny-$GFp(&lakNt7e)`tp1*uvPgG#vIxR9s>r?^CfiL6h~E8qtODl5u3 zbo4hCRw>qWw9wzv$;k`X8SnxUR`IWKu4eS%)87vEu3Oh`E2fX>R824Gi9B9Dq7Z4` z-uE?c?%cv-50?XQ>&WB+E{}&aG`C?n4#|YgrQvZDa5vBi)XxQWyZ659R@JnWCliPfPzo^` z9T!kaVLM4CFStS>CLcuS9bg>DGS94=0000NbVXQnL3MO! zZ*l-kVQ_CCLt$)TZDDR?a%E}Xks2xh001j=MObu1WpiV4X>fFDZ*BlWVRL0iK~zYIwU%3KR8+^plfBmd*Z=RcSGE!nZYQkUx;x;E zOnNq|=asVG5L9AZl$asGJhQM{_S`Cg8nNi;20K4@)svGPOM{8QM4)3ZF<}sJ?$}{J z*3q&>-SW%-QlK?STLScnz2k!1%w05hWRrcTem~Z;VIo(>SBlr>cgwD-1d)bl_zF6z zlH1>ln`u?E=4Bl*BMQr-m>6_SREp9UE_yqF>I7PZ;!r=jG zWusMTB-e+zaD+qsck;r?_4N5^Y^yo}C?ajJZ0B4tiZ>O1*!rylP>Q87naQ9}d{RBl zws_^tI##S%$vTm*bghC;}^8%h;*~*ND1l!;FlE3-}*!0A5)-LNH ziZz}WkWXH-a8!X<3T{RqQ1C(uUckQn$JzGdDK7anw6!+!z|CWFL) zRq^b)Pau~M@Vt|QI(QA#-cB}=6!;Xp5`IvkE?L9A?|x%iy<%}k3temHaQw_=y1f9`k}(Pr z7jt_5iLVZIE?wGgE5=^`(K($A<%)QIL@Cm|zUvEK-SP+zKUlW)z>z=LyloHZrgoIk zqXY^_w@+b3*F1JMrI V&f(44`l$c_002ovPDHLkV1l9iKyUy6 diff --git a/data/icons/github-16.png b/data/icons/github-16.png deleted file mode 100644 index 88a932f1dd780fffd6b4d5a05ee305c1cd4b3c8d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 440 zcmV;p0Z0CcP))1jTC$=VbG2X$LCB!+7wKhFC#0|P|rRSGe z_D$T=i=4LnhHX@#pgYI42xkC-A(X*nCG9KTWzv6YAU;%B|(0}Xvih_ND zl;)4}2Uh!$j%^y9I8zCs`|ee99(_K6jat=rr#aAEt&(iF`|8gmR{cH5x<*F2G)oE^ zz=$iiSIx}(Q`l8q{b4GvB{9K|00RIL`H2~CnPl()0000K{Mv`9@+Cn?2ID2Q*MgM;`0E`m?s z;0rieaP$o_IXF6q(9qa+NW}~({Ae(ZC^+b3+LS~a@k|Hqz2|9sIj8wsGASJ^FX#wPFs!izoXO$~s9m2HaYd}v=}!0X35`cv2U zQJNeNHd+A!)9v}&x-Wyz4Ex#XnZP-LfO=E&v4?eTXue;YTjXS8e-O~o4H}6YHF*`I zt<$j|e?*=tc!(uIrtf$NA=oQz(O-B2;Qra-^!5^f z;wdb z{t5^R{TC7z`G4ljnL3zyCUgUsSXkC5D=Y676cprVWoKt_a&nSqVPy?uWoKt%WoKuI zi;H70Ha6aeVY9THLZG~|YOtiN{93=jp#NL8ZL>+w%6{_c)2Av)S@}jOS^582xq1J; zef!pmtd9l8U}j|t5f>K^EX>cfP*ji?*tlie)sLUP#)^#A|=rwj}XoD2*M3}3!|XGloPe50+US&!jm7~{;b z!#DW_1?|)Gil#HMuqH6GvT-uAvN0fGk>J39N}L8TFfcI8U$!#qF9V|}6Du17I<~X5 zWrzq3K8bDs3o?h1h0Oq60UIkTLuy>qzm(XhMotcnnRpFgU}n9|z`$Sx<7#WDGBlMJ zUC>rnP1CS(yN9kB!wdgeSmyp`VP*Kw!pgwT&CM{kzjNuVWosPO?L1ffXJUR6mR_(B zuK~9X@7&GF%`@*m6Dz~_-~Soh;<8?CKXfAEKNG9ce4$uQ~t!{~s=%8t(tEEG^ETk&$r=UIQ2y7#RNl|IfT-|Ixf_cOPVNva_q`Yp7he kGc~AWWMtfkO+7^b02Skx#B+*xzW@LL07*qoM6N<$g3pyB_W%F@ From 159a32393266d8c71280738b9010ed564a43e03a Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Sun, 4 Jul 2010 12:28:19 +0100 Subject: [PATCH 23/23] Remove duplicate icon-theme-installer script --- icon-theme-installer | 179 ------------------------------------------- 1 file changed, 179 deletions(-) delete mode 100755 icon-theme-installer diff --git a/icon-theme-installer b/icon-theme-installer deleted file mode 100755 index 328cf736..00000000 --- a/icon-theme-installer +++ /dev/null @@ -1,179 +0,0 @@ -#!/bin/bash - -# icon-theme-installer -# Copyright (C) 2006 Novell, Inc. -# Written by Aaron Bockover -# Licensed under the MIT/X11 license -# -# This script is meant to be invoked from within a Makefile/Makefile.am -# in the install-data-local and uninstall-data sections. It handles the -# task of properly installing icons into the icon theme. It requires a -# few arguments to set up its environment, and a list of files to be -# installed. The format of the file list is critical: -# -# , -# -# apps,music-player-banshee.svg -# apps,music-player-banshee-16.png -# apps,music-player-banshee-22.png -# -# is the icon theme category, for instance, apps, devices, -# actions, emblems... -# -# must have a basename in the form of: -# -# proper-theme-name[-]. -# -# Where should be either nothing, which will default to scalable -# or \-[0-9]{2}, which will expand to x. For example: -# -# music-player-banshee-16.png -# -# The here is -16 and will expand to 16x16 per the icon theme spec -# -# What follows is an example Makefile.am for icon theme installation: -# -# --------------- -# theme=hicolor -# themedir=$(datadir)/icons/$(theme) -# theme_icons = \ -# apps,music-player-banshee.svg \ -# apps,music-player-banshee-16.png \ -# apps,music-player-banshee-22.png \ -# apps,music-player-banshee-24.png \ -# apps,music-player-banshee-32.png -# -# install_icon_exec = $(top_srcdir)/build/icon-theme-installer -t $(theme) -s $(srcdir) -d "x$(DESTDIR)" -b $(themedir) -m "$(mkinstalldirs)" -x "$(INSTALL_DATA)" -# install-data-local: -# $(install_icon_exec) -i $(theme_icons) -# -# uninstall-hook: -# $(install_icon_exec) -u $(theme_icons) -# -# MAINTAINERCLEANFILES = Makefile.in -# EXTRA_DIST = $(wildcard *.svg *.png) -# --------------- -# -# Arguments to this program: -# -# -i : Install -# -u : Uninstall -# -t : Theme name (hicolor) -# -b : Theme installation dest directory [x$(DESTDIR)] - Always prefix -# this argument with x; it will be stripped but will act as a -# placeholder for zero $DESTDIRs (only set by packagers) -# -d : Theme installation directory [$(hicolordir)] -# -s : Source directory [$(srcdir)] -# -m : Command to exec for directory creation [$(mkinstalldirs)] -# -x : Command to exec for single file installation [$(INSTALL_DATA)] -# : All remainging should be category,filename pairs - -while getopts "iut:b:d:s:m:x:" flag; do - case "$flag" in - i) INSTALL=yes ;; - u) UNINSTALL=yes ;; - t) THEME_NAME=$OPTARG ;; - d) INSTALL_DEST_DIR=${OPTARG##x} ;; - b) INSTALL_BASE_DIR=$OPTARG ;; - s) SRC_DIR=$OPTARG ;; - m) MKINSTALLDIRS_EXEC=$OPTARG ;; - x) INSTALL_DATA_EXEC=$OPTARG ;; - esac -done - -shift $(($OPTIND - 1)) - -if test "x$INSTALL" = "xyes" -a "x$UNINSTALL" = "xyes"; then - echo "Cannot pass both -i and -u" - exit 1 -elif test "x$INSTALL" = "x" -a "x$UNINSTALL" = "x"; then - echo "Must path either -i or -u" - exit 1 -fi - -if test -z "$THEME_NAME"; then - echo "Theme name required (-t hicolor)" - exit 1 -fi - -if test -z "$INSTALL_BASE_DIR"; then - echo "Base theme directory required [-d \$(hicolordir)]" - exit 1 -fi - -if test ! -x $(echo "$MKINSTALLDIRS_EXEC" | cut -f1 -d' '); then - echo "Cannot find '$MKINSTALLDIRS_EXEC'; You probably want to pass -m \$(mkinstalldirs)" - exit 1 -fi - -if test ! -x $(echo "$INSTALL_DATA_EXEC" | cut -f1 -d' '); then - echo "Cannot find '$INSTALL_DATA_EXEC'; You probably want to pass -x \$(INSTALL_DATA)" - exit 1 -fi - -if test -z "$SRC_DIR"; then - SRC_DIR=. -fi - -for icon in $@; do - size=$(echo $icon | sed s/[^0-9]*//g) - category=$(echo $icon | cut -d, -f1) - build_name=$(echo $icon | cut -d, -f2) - install_name=$(echo $build_name | sed "s/[0-9]//g; s/-\././") - install_name=$(basename $install_name) - - if test -z $size; then - size=scalable; - else - size=${size}x${size}; - fi - - install_dir=${INSTALL_DEST_DIR}${INSTALL_BASE_DIR}/$size/$category - install_path=$install_dir/$install_name - - if test "x$INSTALL" = "xyes"; then - echo "Installing $size $install_name into $THEME_NAME icon theme" - - $($MKINSTALLDIRS_EXEC $install_dir) || { - echo "Failed to create directory $install_dir" - exit 1 - } - - $($INSTALL_DATA_EXEC $SRC_DIR/$build_name $install_path) || { - echo "Failed to install $SRC_DIR/$build_name into $install_path" - exit 1 - } - - if test ! -e $install_path; then - echo "Failed to install $SRC_DIR/$build_name into $install_path" - exit 1 - fi - else - if test -e $install_path; then - echo "Removing $size $install_name from $THEME_NAME icon theme" - - rm $install_path || { - echo "Failed to remove $install_path" - exit 1 - } - fi - fi -done - -if test "x$INSTALL" = "xyes"; then - gtk_update_icon_cache_bin="$((which gtk-update-icon-cache || echo /opt/gnome/bin/gtk-update-icon-cache)2>/dev/null)" - gtk_update_icon_cache="$gtk_update_icon_cache_bin -f -t $INSTALL_BASE_DIR" - - if test -z "$INSTALL_DEST_DIR"; then - if test -x $gtk_update_icon_cache_bin; then - echo "Updating GTK icon cache" - $gtk_update_icon_cache - else - echo "*** Icon cache not updated. Could not execute $gtk_update_icon_cache_bin" - fi - else - echo "*** Icon cache not updated. After install, run this:" - echo "*** $gtk_update_icon_cache" - fi -fi -