Commit e7ba6d57 authored by Ole Aamot's avatar Ole Aamot

Merge branch 'master' of http://gitlab.gnome.org/ole/gingerblue

parents 9468f600 f5d9a789
......@@ -5,6 +5,11 @@ Version 0.3.0
Gingerblue
* src/gingerblue-main.c: Display Recording File Entry
* po/nb.po: Norwegian bokmål translation (Ole Aamot)
* src/gingerblue-app.c: Markup i18n strings
* src/gingerblue-config.c: Markup i18n strings
* src/gingerblue-file.c: Markup i18n strings
* src/gingerblue-main.c: Markup i18n strings
=============
Version 0.2.0
......
......@@ -31,10 +31,12 @@ It supports audio.
%setup -q
%build
%configure --with-recording --disable-silent-rules --disable-schemas
%configure
%make_build
%install
%make_install
%find_lang %{name} --with-man
%check
appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/%{name}.appdata.xml
......@@ -45,12 +47,15 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
%license COPYING
%{_bindir}/%{name}
%{_bindir}/gingerblue
%{_datadir}/%{name}/
%{_metainfodir}/%{name}.appdata.xml
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_includedir}/gingerblue
%{_metainfodir}/%{name}.appdata.xml
%changelog
* Wed Aug 12 2020 Ole Aamot <ole@gnome.org> - 0.2.1-0
- Add i18n
* Tue Jul 14 2020 Ole Aamot <ole@gnome.org> - 0.1.8-0
- Fix Fedora Core 32 build
......
nb
\ No newline at end of file
......@@ -3,4 +3,14 @@
[encoding: UTF-8]
data/gingerblue.appdata.xml.in
data/gingerblue.desktop.in.in
src/gingerblue-app.c
src/gingerblue.c
src/gingerblue-config.c
src/gingerblue-file.c
src/gingerblue-knob.c
src/gingerblue-line.c
src/gingerblue-main.c
src/gingerblue-main-loop.c
src/gingerblue-record.c
src/gingerblue-song.c
src/gingerblue-studio-config.c
# Norwegian bokml translation for gingerblue
# Copyright (C) 2020 Ole Aamot Software
# This file is distributed under the same license as the gingerblue package.
# Ole Aamot <ole@gnome.org>, 2020.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: gingerblue 0.2.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-08-12 17:31+0200\n"
"PO-Revision-Date: 2020-08-12 17:32+0200\n"
"Last-Translator: Ole Aamot <ole@src.gnome.org>\n"
"Language-Team: Norwegian bokml <gnome-no@gnome.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: ../data/gingerblue.desktop.in.in.h:1
msgid "Gingerblue"
msgstr "Gingerblue"
#: ../data/gingerblue.desktop.in.in.h:2
msgid "Music Software for GNOME"
msgstr "Musikkprogram for GNOME"
#. Extra keywords that can be used to search for gingerblue in GNOME Shell and Unity
#: ../data/gingerblue.desktop.in.in.h:4
msgid "Live;Music;Program;"
msgstr "Direkte;Musikk;Program;"
#: ../src/gingerblue-config.c:30
msgid "Gingerblue Music Studio"
msgstr "Gingerblue musikkstudio"
#: ../src/gingerblue-config.c:31
msgid "Add Studio"
msgstr "Legg til studio"
#: ../src/gingerblue-config.c:32
msgid "New Studio"
msgstr "Nytt studio"
#: ../src/gingerblue-file.c:66
#, c-format
msgid "Empty document\n"
msgstr "Tomt dokument\n"
#: ../src/gingerblue-file.c:71
#, c-format
msgid "Document of wrong type, root node != gingerblue\n"
msgstr "Dokumentet er av feil type, rotnode != gingerblue\n"
#: ../src/gingerblue-file.c:76
#, c-format
msgid "Valid GNOME Gingerblue %s XML document %s\n"
msgstr "Gyldig GNOME Gingerblue %s XML-dokument %s\n"
#: ../src/gingerblue-file.c:79
#, c-format
msgid "Parsing GNOME Gingerblue %s XML document %s\n"
msgstr "Tolker GNOME Gingerblue %s XML-dokument %s\n"
#: ../src/gingerblue-file.c:81
#, c-format
msgid "Found Line\n"
msgstr "Fant linje\n"
#: ../src/gingerblue-file.c:93
#, c-format
msgid "Found Musician\n"
msgstr "Fant musiker\n"
#. mem_volume = head
#. volumes = g_list_append (gingerblue_volumes, (GingerblueData *)mem_volume);
#: ../src/gingerblue-file.c:102
#, c-format
msgid "Done with parsing Musician\n"
msgstr "Ferdig med tolkning av musiker\n"
#: ../src/gingerblue-file.c:105
#, c-format
msgid "Found Musical Instrument\n"
msgstr "Fant musikkinstrument\n"
#. mem_volume = head
#. volumes = g_list_append (gingerblue_volumes, (GingerblueData *)mem_volume);
#: ../src/gingerblue-file.c:114
#, c-format
msgid "Done with parsing Musical Instrument\n"
msgstr "Ferdig med tolkning av musikkinstrument\n"
#: ../src/gingerblue-file.c:117
#, c-format
msgid "Found Volume\n"
msgstr "Fant volum\n"
#. mem_volume = head
#. volumes = g_list_append (gingerblue_volumes, (GingerblueData *)mem_volume);
#: ../src/gingerblue-file.c:126
#, c-format
msgid "Done with parsing Volume\n"
msgstr "Ferdig med tolkning av volum\n"
#: ../src/gingerblue-file.c:130
#, c-format
msgid "Finished parsing XML document\n"
msgstr "Fullførte tolkning av XML-dokument\n"
#: ../src/gingerblue-main.c:176
msgid "Gingerblue Setup"
msgstr "Oppsett av Gingerblue"
#: ../src/gingerblue-main.c:177
msgid "Musician"
msgstr "Musiker"
#: ../src/gingerblue-main.c:178
msgid "Song"
msgstr "Sang"
#: ../src/gingerblue-main.c:179
msgid "Instrument"
msgstr "Instrument"
#: ../src/gingerblue-main.c:180
msgid "Input Line"
msgstr "Linje inn"
#: ../src/gingerblue-main.c:181
msgid "Label"
msgstr "Plateselskap"
#: ../src/gingerblue-main.c:182 ../src/gingerblue-main.c:233
#: ../src/gingerblue-main.c:241
msgid "Record"
msgstr "Opptak"
#: ../src/gingerblue-main.c:192
msgid ""
"Welcome to GNOME Gingerblue!\n"
"\n"
"Click Next to setup a music recording session!"
msgstr ""
"Velkommen til GNOME Gingerblue!\n"
"\n"
"Klikk Neste for å starte musikkopptaket!"
#: ../src/gingerblue-main.c:194
msgid "Musician:"
msgstr "Musiker:"
#: ../src/gingerblue-main.c:202
msgid "Song:"
msgstr "Sang:"
#: ../src/gingerblue-main.c:204
msgid "Song - "
msgstr "Sang - "
#: ../src/gingerblue-main.c:210
msgid "Instrument:"
msgstr "Instrument:"
#: ../src/gingerblue-main.c:212
msgid "Guitar"
msgstr "Gitar"
#: ../src/gingerblue-main.c:218
msgid "Line Input:"
msgstr "Linje inn:"
#: ../src/gingerblue-main.c:220
msgid "Mic"
msgstr "Mikrofon"
#: ../src/gingerblue-main.c:226
msgid "Label:"
msgstr "Plateselskap:"
#: ../src/gingerblue-main.c:228
msgid "GNOME"
msgstr "GNOME"
......@@ -8,6 +8,7 @@
*/
#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include <gst/gst.h>
#include "gingerblue.h"
......
......@@ -8,6 +8,7 @@
*/
#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include <gtk/gtkbox.h>
#include <gtk/gtkbutton.h>
......@@ -26,9 +27,9 @@ GtkWidget *main_config (gchar *location_data) {
GtkContainer *Container;
GtkWindow *gingerblue;
gingerblue = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_set_title (GTK_WINDOW (gingerblue), "Gingerblue Music Studio");
AddStudioButton = gtk_button_new_with_label("Add Studio");
NewStudioButton = gtk_button_new_with_label("New Studio");
gtk_window_set_title (GTK_WINDOW (gingerblue), _("Gingerblue Music Studio"));
AddStudioButton = gtk_button_new_with_label(_("Add Studio"));
NewStudioButton = gtk_button_new_with_label(_("New Studio"));
Studio = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
Location = gtk_list_box_new ();
gtk_container_add (GTK_CONTAINER (gingerblue), GTK_WIDGET (Studio));
......
......@@ -63,22 +63,22 @@ gb_file_config_load (GingerblueData *head, gchar *filename) {
}
cur = xmlDocGetRootElement (doc);
if (cur == NULL) {
fprintf (stderr, "Empty document\n");
fprintf (stderr, _("Empty document\n"));
xmlFreeDoc (doc);
return NULL;
}
if (xmlStrcmp(cur->name, (const xmlChar *) "gingerblue")) {
fprintf(stderr, "Document of wrong type, root node != gingerblue\n");
fprintf(stderr, _("Document of wrong type, root node != gingerblue\n"));
xmlFreeDoc (doc);
return NULL;
}
version = (gchar *) xmlGetProp (cur, (const xmlChar *)"version");
g_print ("Valid GNOME Gingerblue %s XML document %s\n", version, filename);
g_print (_("Valid GNOME Gingerblue %s XML document %s\n"), version, filename);
cur = cur->xmlChildrenNode;
while (cur != NULL) {
g_print ("Parsing GNOME Gingerblue %s XML document %s\n", version, filename);
g_print (_("Parsing GNOME Gingerblue %s XML document %s\n"), version, filename);
if ((!xmlStrcmp(cur->name, (const xmlChar *) "line"))) {
g_print ("Found Line\n");
g_print (_("Found Line\n"));
curr = g_new0(GingerblueData, 1);
curr->line = (gchar *) xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
g_print ("%s\n", curr->line);
......@@ -90,7 +90,7 @@ gb_file_config_load (GingerblueData *head, gchar *filename) {
g_print ("Done with parsing Line\n");
}
if ((!xmlStrcmp(cur->name, (const xmlChar *) "musician"))) {
g_print ("Found Musician\n");
g_print (_("Found Musician\n"));
curr = g_new0(GingerblueData, 1);
curr->musician = (gchar *) xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
g_print ("%s\n", curr->musician);
......@@ -99,10 +99,10 @@ gb_file_config_load (GingerblueData *head, gchar *filename) {
head = curr;
/* mem_volume = head */
/* volumes = g_list_append (gingerblue_volumes, (GingerblueData *)mem_volume); */
g_print ("Done with parsing Musician\n");
g_print (_("Done with parsing Musician\n"));
}
if ((!xmlStrcmp(cur->name, (const xmlChar *) "musical_instrument"))) {
g_print ("Found Musical Instrument\n");
g_print (_("Found Musical Instrument\n"));
curr = g_new0(GingerblueData, 1);
curr->musical_instrument = (gchar *) xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
g_print ("%s\n", curr->musical_instrument);
......@@ -111,10 +111,10 @@ gb_file_config_load (GingerblueData *head, gchar *filename) {
head = curr;
/* mem_volume = head */
/* volumes = g_list_append (gingerblue_volumes, (GingerblueData *)mem_volume); */
g_print ("Done with parsing Musical Instrument\n");
g_print (_("Done with parsing Musical Instrument\n"));
}
if ((!xmlStrcmp(cur->name, (const xmlChar *) "volume"))) {
g_print ("Found Volume\n");
g_print (_("Found Volume\n"));
curr = g_new0(GingerblueData, 1);
curr->volume = (gchar *) xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
g_print ("%s\n", curr->volume);
......@@ -123,11 +123,11 @@ gb_file_config_load (GingerblueData *head, gchar *filename) {
head = curr;
/* mem_volume = head */
/* volumes = g_list_append (gingerblue_volumes, (GingerblueData *)mem_volume); */
g_print ("Done with parsing Volume\n");
g_print (_("Done with parsing Volume\n"));
}
cur = cur->next;
}
g_print ("Finished parsing XML document\n");
g_print (_("Finished parsing XML document\n"));
xmlFreeDoc (doc);
return curr;
}
......
......@@ -10,6 +10,7 @@
#include <config.h>
#include <stdlib.h>
#include <glib/gi18n.h>
#include <gst/gst.h>
#include <gst/player/player.h>
#include <gtk/gtk.h>
......@@ -188,11 +189,9 @@ int main(int argc, char **argv)
gtk_window_set_title(GTK_WINDOW(introduction), "GNOME Gingerblue");
g_signal_connect(G_OBJECT(introduction), "destroy",
G_CALLBACK(gtk_main_quit), NULL);
page[0].widget =
gtk_label_new
("Welcome to GNOME Gingerblue!\n\nClick Next to setup a music recording session!");
page[0].widget = gtk_label_new(_("Welcome to GNOME Gingerblue!\n\nClick Next to setup a music recording session!"));
page[1].widget = gtk_box_new(FALSE, 5);
musician_label = gtk_label_new("Musician:");
musician_label = gtk_label_new(_("Musician:"));
musician_entry = gtk_entry_new();
gtk_entry_set_text(GTK_ENTRY(musician_entry), g_get_real_name());
gtk_box_pack_start(GTK_BOX(page[1].widget), GTK_WIDGET(musician_label),
......@@ -200,33 +199,33 @@ int main(int argc, char **argv)
gtk_box_pack_start(GTK_BOX(page[1].widget), GTK_WIDGET(musician_entry),
FALSE, FALSE, 5);
page[2].widget = gtk_box_new(FALSE, 5);
song_label = gtk_label_new("Song:");
song_label = gtk_label_new(_("Song:"));
song_entry = gtk_entry_new();
gtk_entry_set_text(GTK_ENTRY(song_entry), g_strconcat ("Song - ", g_date_time_format_iso8601 (datestamp), NULL));
gtk_entry_set_text(GTK_ENTRY(song_entry), g_strconcat (_("Song - "), g_date_time_format_iso8601 (datestamp), NULL));
gtk_box_pack_start(GTK_BOX(page[2].widget), GTK_WIDGET(song_label),
FALSE, FALSE, 5);
gtk_box_pack_start(GTK_BOX(page[2].widget), GTK_WIDGET(song_entry),
FALSE, FALSE, 5);
page[3].widget = gtk_box_new(FALSE, 5);
instrument_label = gtk_label_new("Instrument:");
instrument_label = gtk_label_new(_("Instrument:"));
instrument_entry = gtk_entry_new();
gtk_entry_set_text(GTK_ENTRY(instrument_entry), "Guitar");
gtk_entry_set_text(GTK_ENTRY(instrument_entry), _("Guitar"));
gtk_box_pack_start(GTK_BOX(page[3].widget),
GTK_WIDGET(instrument_label), FALSE, FALSE, 5);
gtk_box_pack_start(GTK_BOX(page[3].widget),
GTK_WIDGET(instrument_entry), FALSE, FALSE, 5);
page[4].widget = gtk_box_new(FALSE, 5);
line_label = gtk_label_new("Line Input:");
line_label = gtk_label_new(_("Line Input:"));
line_entry = gtk_entry_new();
gtk_entry_set_text(GTK_ENTRY(line_entry), "Mic");
gtk_entry_set_text(GTK_ENTRY(line_entry), _("Mic"));
gtk_box_pack_start(GTK_BOX(page[4].widget), GTK_WIDGET(line_label),
FALSE, FALSE, 5);
gtk_box_pack_start(GTK_BOX(page[4].widget), GTK_WIDGET(line_entry),
FALSE, FALSE, 5);
page[5].widget = gtk_box_new(FALSE, 5);
label_label = gtk_label_new("Label:");
label_label = gtk_label_new(_("Label:"));
label_entry = gtk_entry_new();
gtk_entry_set_text(GTK_ENTRY(label_entry), "GNOME");
gtk_entry_set_text(GTK_ENTRY(label_entry), _("GNOME"));
gtk_box_pack_start(GTK_BOX(page[5].widget), GTK_WIDGET(label_label),
FALSE, FALSE, 5);
gtk_box_pack_start(GTK_BOX(page[5].widget), GTK_WIDGET(label_entry),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment