Merge pull request #3 from camellan/master

Edit translation and add Russian language
This commit is contained in:
Artem Anufrij 2017-08-01 21:11:01 +02:00 committed by GitHub
commit ed05ddbd7c
8 changed files with 193 additions and 33 deletions

View file

@ -30,6 +30,10 @@ include(ValaVersion)
ensure_vala_version("0.26.0" MINIMUM)
add_subdirectory (src)
# Translation files
set (GETTEXT_PACKAGE "${CMAKE_PROJECT_NAME}")
add_definitions (-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
add_subdirectory (po)
add_subdirectory (data)
add_subdirectory (schemas)

View file

@ -1,6 +1,6 @@
include (Translations)
add_translations_directory ("webby")
add_translations_catalog ("webby"
../src
add_translations_directory(${GETTEXT_PACKAGE})
add_translations_catalog(${GETTEXT_PACKAGE}
../src/
../data
)

View file

@ -0,0 +1,110 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-08-01 21:31+0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
#: ../src/Dialogs/InfoDialog.vala:44
msgid "Accept"
msgstr ""
#: ../src/MainWindow.vala:56
msgid "Applications"
msgstr ""
#: ../src/MainWindow.vala:62
msgid "Add a new Web App"
msgstr ""
#: ../src/MainWindow.vala:65
msgid "No Web Apps Availible"
msgstr ""
#: ../src/MainWindow.vala:65
msgid "Create a new Webpin Web App."
msgstr ""
#: ../src/MainWindow.vala:66
msgid "Create App"
msgstr ""
#: ../src/MainWindow.vala:66
msgid "Create a new Webpin web app."
msgstr ""
#: ../src/Widgets/Assistant.vala:73
msgid "Create a new web app with webpin"
msgstr ""
#: ../src/Widgets/Assistant.vala:81
msgid "Application name"
msgstr ""
#: ../src/Widgets/Assistant.vala:84
msgid "http://myapp.domain"
msgstr ""
#: ../src/Widgets/Assistant.vala:94
msgid "theme icon name"
msgstr ""
#: ../src/Widgets/Assistant.vala:96
msgid "or"
msgstr ""
#: ../src/Widgets/Assistant.vala:97
msgid "Set from file..."
msgstr ""
#: ../src/Widgets/Assistant.vala:113
msgid "Save cookies"
msgstr ""
#: ../src/Widgets/Assistant.vala:115
msgid "Save login information"
msgstr ""
#: ../src/Widgets/Assistant.vala:138
msgid "Save app"
msgstr ""
#: ../src/Widgets/Assistant.vala:160
msgid "url must start with http:// or https://"
msgstr ""
#: ../src/Widgets/Assistant.vala:173
msgid "App already exist"
msgstr ""
#: ../src/Widgets/Assistant.vala:226
msgid "Images"
msgstr ""
#: ../src/Widgets/Assistant.vala:238
msgid "Cancel"
msgstr ""
#: ../src/Widgets/Assistant.vala:239
msgid "Open"
msgstr ""
#: ../src/Widgets/ApplicationIcon.vala:142
msgid "Delete Webapp"
msgstr ""
#: ../src/Widgets/ApplicationIcon.vala:147
msgid "Edit Webapp Properties"
msgstr ""

View file

@ -2,74 +2,120 @@
# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
# This file is distributed under the same license as the webby-browser package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
# Андрей Культяпов <camellan@yandex.ru>, 2017.
#
msgid ""
msgstr ""
"Project-Id-Version: webby-browser\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2015-02-26 23:57-0300\n"
"PO-Revision-Date: 2015-02-27 20:39+0000\n"
"Last-Translator: Artem Anufrij <Unknown>\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-08-01 21:46+0400\n"
"PO-Revision-Date: 2017-08-01 21:47+0400\n"
"Last-Translator: Андрей Культяпов <camellan@yandex.ru>\n"
"Language-Team: Russian <ru@li.org>\n"
"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2015-03-24 00:16+0000\n"
"X-Generator: Launchpad (build 17413)\n"
msgid "Remove Application"
msgstr "Удалить приложение"
"X-Generator: Poedit 2.0\n"
#: ../src/Dialogs/InfoDialog.vala:44
msgid "Accept"
msgstr ""
msgstr "Согласен"
msgid "Create a new web app with webby"
msgstr ""
#: ../src/MainWindow.vala:56
msgid "Applications"
msgstr "Приложения"
#: ../src/MainWindow.vala:62
msgid "Add a new Web App"
msgstr "Добавить новое веб-приложение"
#: ../src/MainWindow.vala:65
msgid "No Web Apps Availible"
msgstr "Нет доступных веб-приложений"
#: ../src/MainWindow.vala:65
msgid "Create a new Webpin Web App."
msgstr "Создать новое веб-приложение в Webpin."
#: ../src/MainWindow.vala:66
msgid "Create App"
msgstr "Создать приложение"
#: ../src/MainWindow.vala:66
msgid "Create a new Webpin web app."
msgstr "Создать новое веб-приложение в Webpin."
#: ../src/Widgets/Assistant.vala:73
msgid "Create a new web app with webpin"
msgstr "Создайте новое веб-приложение с помощью Webpin"
#: ../src/Widgets/Assistant.vala:81
msgid "Application name"
msgstr "Имя приложения"
#: ../src/Widgets/Assistant.vala:84
msgid "http://myapp.domain"
msgstr "http://myapp.domain"
#: ../src/Widgets/Assistant.vala:94
msgid "theme icon name"
msgstr ""
msgstr "theme icon name"
#: ../src/Widgets/Assistant.vala:96
msgid "or"
msgstr "или"
#: ../src/Widgets/Assistant.vala:97
msgid "Set from file..."
msgstr ""
msgstr "Установить из файла..."
#: ../src/Widgets/Assistant.vala:113
msgid "Save cookies"
msgstr ""
msgstr "Сохранить cookies"
#: ../src/Widgets/Assistant.vala:115
msgid "Save login information"
msgstr ""
msgstr "Сохранить данные авторизации"
msgid "Create app"
msgstr ""
#: ../src/Widgets/Assistant.vala:138
msgid "Save app"
msgstr "Сохранить приложение"
#: ../src/Widgets/Assistant.vala:160
msgid "url must start with http:// or https://"
msgstr ""
msgstr "адрес должен начинаться с http:// или https://"
#: ../src/Widgets/Assistant.vala:173
msgid "App already exist"
msgstr ""
msgstr "Это приложение уже существует"
#: ../src/Widgets/Assistant.vala:226
msgid "Images"
msgstr ""
msgstr "Изображения"
#: ../src/Widgets/Assistant.vala:238
msgid "Cancel"
msgstr "Отменить"
#: ../src/Widgets/Assistant.vala:239
msgid "Open"
msgstr "Открыть"
msgid "App created"
msgstr ""
#: ../src/Widgets/ApplicationIcon.vala:142
msgid "Delete Webapp"
msgstr "Удалить веб-приложение"
msgid "The application shortcut was successfully created"
msgstr ""
#: ../src/Widgets/ApplicationIcon.vala:147
msgid "Edit Webapp Properties"
msgstr "Редактировать веб-приложение"
msgid "Applications"
msgstr "Приложения"
#~ msgid "Remove Application"
#~ msgstr "Удалить приложение"
#~ msgid "App created"
#~ msgstr "Приложение создано"
#~ msgid "The application shortcut was successfully created"
#~ msgstr "Ярлык приложения успешно создан"

View file

@ -127,7 +127,7 @@ namespace Webpin {
return true;
}
public static Gee.HashMap<string, GLib.DesktopAppInfo> get_webby_applications () {
public static Gee.HashMap<string, GLib.DesktopAppInfo> get_webpin_applications () {
var list = new Gee.HashMap<string, GLib.DesktopAppInfo>();

View file

@ -70,7 +70,7 @@ namespace Webpin {
}
public void load_applications () {
applications = DesktopFile.get_webby_applications();
applications = DesktopFile.get_webpin_applications();
foreach (GLib.DesktopAppInfo app in applications.values) {
this.add_button (app);

View file

@ -70,7 +70,7 @@ namespace Webpin {
}
//welcome message
message = new Gtk.Label (_("Create a new web app with webby"));
message = new Gtk.Label (_("Create a new web app with webpin"));
message.get_style_context ().add_class ("h2");
//app information
icon_button = new Gtk.Button ();

View file

@ -50,7 +50,7 @@ namespace Webpin {
cookie_manager = WebKit.WebContext.get_default ().get_cookie_manager ();
cookie_manager.set_accept_policy (WebKit.CookieAcceptPolicy.ALWAYS);
string cookie_db = Environment.get_user_cache_dir () + "/webby/cookies/";
string cookie_db = Environment.get_user_cache_dir () + "/webpin/cookies/";
var dir = GLib.File.new_for_path (cookie_db);