rename nx-rc to bashstyle-rc, rename bs-ng textdomain to bashstyle [NOTE:...

rename nx-rc to bashstyle-rc, rename bs-ng textdomain to bashstyle [NOTE: re-enabling BashStyle-NG after this commit is required because of nx-rc --> bashstyle-rc transistion
parent 4b808ff2
......@@ -9,7 +9,7 @@
# #
#########################################################
IN_FILES=( rc/nx-rc data/bashstyle data/bashstyle-ng.pc )
IN_FILES=( rc/bashstyle-rc data/bashstyle data/bashstyle-ng.pc )
copy_in_files () {
......
......@@ -39,7 +39,7 @@ make_remove () {
}
CLEAN_FILES=( data/bashstyle data/bashstyle-ng.pc ui/bashstyle.ui.h
data/bashstyle.sh rc/nx-rc i18n/??/*.mo i18n/*.pot
data/bashstyle.sh rc/bashstyle-rc i18n/??/*.mo i18n/*.pot
.configure/results .make/build_done ui/#bashstyle.ui#
ui/bashstyle.ui~ doc/bashstyle.info doc/*.gz )
......
......@@ -39,34 +39,34 @@ do_gzip_man () {
generate_pot () {
echo -e "\t${WHITE}+ ${MAGENTA} translation templates"
echo -e "\t${WHITE} *${YELLOW} bs-ng.pot"
echo -e "\t${WHITE} *${YELLOW} bashstyle.pot"
intltool-extract --type=gettext/glade ui/bashstyle.ui >/dev/null
xgettext -L python --keyword=_ --keyword=N_ --output=i18n/bs-ng.pot \
xgettext -L python --keyword=_ --keyword=N_ --output=i18n/bashstyle.pot \
ui/*.py ui/bashstyle.ui.h >/dev/null
echo -e "\t${WHITE} *${YELLOW} nx-rc.pot"
xgettext -o i18n/nx-rc.pot -L shell rc/nx-rc rc/settings/*-rc 2>/dev/null
echo -e "\t${WHITE} *${YELLOW} bashstyle-rc.pot"
xgettext -o i18n/bashstyle-rc.pot -L shell rc/bashstyle-rc rc/settings/*-rc 2>/dev/null
}
update_po () {
if [[ ! -f i18n/bs-ng.pot || ! -f i18n/nx-rc.pot ]]; then
if [[ ! -f i18n/bashstyle.pot || ! -f i18n/bashstyle-rc.pot ]]; then
echo -e "\n${RED}You need to run './make pot' first!\n"
exit 1
else
echo -e "\t${WHITE}+ ${MAGENTA} gui translations"
for lang in ${APP_LANGUAGES}; do
echo -e "\t${WHITE} *${SMOOTHBLUE} ${lang}"
msgmerge -q -o i18n/"${lang}"/bs-ng.po \
i18n/"${lang}"/bs-ng.po i18n/bs-ng.pot >/dev/null
msgmerge -q -o i18n/"${lang}"/bashstyle.po \
i18n/"${lang}"/bashstyle.po i18n/bs-ng.pot >/dev/null
done
echo -e "\t${WHITE}+ ${MAGENTA} nx-rc translations"
echo -e "\t${WHITE}+ ${MAGENTA} bashstyle-rc translations"
for lang in ${APP_LANGUAGES}; do
echo -e "\t${WHITE} *${SMOOTHBLUE} ${lang}"
msgmerge -q -o i18n/"${lang}"/nx-rc.po \
i18n/"${lang}"/nx-rc.po i18n/nx-rc.pot >/dev/null
msgmerge -q -o i18n/"${lang}"/bashstyle-rc.po \
i18n/"${lang}"/bashstyle-rc.po i18n/bashstyle-rc.pot >/dev/null
done
fi
......@@ -77,15 +77,15 @@ generate_mo () {
echo -e "\t${WHITE}+ ${MAGENTA} gui translations"
for lang in ${APP_LANGUAGES}; do
echo -e "\t${WHITE} *${SMOOTHBLUE} ${lang}"
msgfmt --output-file=i18n/"${lang}"/bs-ng.mo \
i18n/"${lang}"/bs-ng.po
msgfmt --output-file=i18n/"${lang}"/bashstyle.mo \
i18n/"${lang}"/bashstyle.po
done
echo -e "\t${WHITE}+ ${MAGENTA} nx-rc translations"
echo -e "\t${WHITE}+ ${MAGENTA} bashstyle-rc translations"
for lang in ${APP_LANGUAGES}; do
echo -e "\t${WHITE} *${SMOOTHBLUE} ${lang}"
msgfmt --output-file=i18n/"${lang}"/nx-rc.mo \
i18n/"${lang}"/nx-rc.po
msgfmt --output-file=i18n/"${lang}"/bashstyle-rc.mo \
i18n/"${lang}"/bashstyle-rc.po
done
}
......@@ -10,7 +10,7 @@
#########################################################
DATA_FILES=( ui/*.{py,ui}:${DATADIR}/ui
rc/nx-rc:${DATADIR}/rc
rc/bashstyle-rc:${DATADIR}/rc
rc/internal/*:${DATADIR}/rc/internal
rc/settings/*:${DATADIR}/rc/settings
rc/styles/*:${DATADIR}/rc/styles
......@@ -23,7 +23,7 @@ DOC_FILES=( doc/html/*.html:${DOCDIR} )
MAN_FILES=( doc/bashstyle.1:${MANDIR} )
for lang in ${APP_LANGUAGES}; do
LOCALE_REMOVE=( ${LOCALE_REMOVE[@]} ${LOCALEDIR}/${lang}/{bs-ng,nx-rc}.mo)
LOCALE_REMOVE=( ${LOCALE_REMOVE[@]} ${LOCALEDIR}/${lang}/{bashstyle,bashstyle-rc}.mo)
LOCALE_FILES=( i18n/${lang}/*.mo:${LOCALEDIR}/${lang}/LC_MESSAGES )
done
......
......@@ -8,6 +8,6 @@
# #
#########################################################
if [ ! $(grep "nx-rc" ${HOME}/.bashrc) >/dev/null 2>&1 ]; then
echo -e "\nsource @DATADIR@/bashstyle-ng/rc/nx-rc" >> ${HOME}/.bashrc
if [ ! $(grep "bashstyle-rc" ${HOME}/.bashrc) >/dev/null 2>&1 ]; then
echo -e "\nsource @DATADIR@/bashstyle-ng/rc/bashstyle-rc" >> ${HOME}/.bashrc
fi
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: BashStyle-NG\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-26 09:25+0100\n"
"POT-Creation-Date: 2016-03-30 09:23+0200\n"
"PO-Revision-Date: 2016-03-23 22:00+0100\n"
"Last-Translator: Christopher Roy Bratusek <nano@jpberlin.de>\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/bs-ng/"
......@@ -20,92 +20,94 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.8.7.1\n"
#: rc/nx-rc:38
#: rc/bashstyle-rc:38
msgid "BashStyle-NG Starting"
msgstr "BashStyle-NG Starte"
#: rc/nx-rc:39
#: rc/bashstyle-rc:39
msgid "BashStyle-NG Bash Major Version:"
msgstr "BashStyle-NG Bash Major Version:"
#: rc/nx-rc:40
#: rc/bashstyle-rc:40
msgid "BashStyle-NG Bash Minor Version:"
msgstr "BashStyle-NG Bash Minor Version:"
#: rc/nx-rc:41
#: rc/bashstyle-rc:41
msgid "BashStyle-NG Bash Patch Level:"
msgstr "BashStyle-NG Bash Patch Level:"
#: rc/nx-rc:42
#: rc/bashstyle-rc:42
msgid "BashStyle-NG Version:"
msgstr "BashStyle-NG Version:"
#: rc/nx-rc:43
#: rc/bashstyle-rc:43
msgid "BashStyle-NG Prefix:"
msgstr "BashStyle-NG Präfix:"
#: rc/nx-rc:44
#: rc/bashstyle-rc:44
msgid "BashStyle-NG Logfile:"
msgstr "BashStyle-NG Logdatei:"
#: rc/nx-rc:49 rc/nx-rc:85 rc/nx-rc:101 rc/nx-rc:105 rc/nx-rc:108 rc/nx-rc:111
#: rc/nx-rc:115 rc/nx-rc:133 rc/nx-rc:142 rc/nx-rc:145 rc/nx-rc:148
#: rc/nx-rc:293 rc/settings/alias-rc:13 rc/settings/alias-rc:16
#: rc/settings/alias-rc:21 rc/settings/alias-rc:26 rc/settings/alias-rc:31
#: rc/settings/alias-rc:36 rc/settings/alias-rc:41 rc/settings/alias-rc:46
#: rc/settings/alias-rc:51 rc/settings/alias-rc:56 rc/settings/alias-rc:61
#: rc/settings/color-rc:12 rc/settings/color-rc:13 rc/settings/git-rc:12
#: rc/settings/git-rc:15 rc/settings/git-rc:20 rc/settings/git-rc:25
#: rc/settings/git-rc:32 rc/settings/git-rc:37 rc/settings/git-rc:44
#: rc/settings/git-rc:49 rc/settings/git-rc:60 rc/settings/ls-rc:12
#: rc/settings/options-rc:13 rc/settings/options-rc:16
#: rc/settings/options-rc:19 rc/settings/options-rc:22
#: rc/settings/options-rc:25 rc/settings/options-rc:29
#: rc/settings/options-rc:33 rc/settings/options-rc:36
#: rc/settings/options-rc:41 rc/settings/options-rc:46
#: rc/settings/options-rc:49 rc/settings/options-rc:59
#: rc/settings/options-rc:68 rc/settings/options-rc:85 rc/settings/shopt-rc:13
#: rc/settings/shopt-rc:15 rc/settings/shopt-rc:20 rc/settings/shopt-rc:22
#: rc/settings/shopt-rc:27 rc/settings/shopt-rc:29 rc/settings/shopt-rc:34
#: rc/settings/shopt-rc:36 rc/settings/shopt-rc:41 rc/settings/shopt-rc:43
#: rc/settings/shopt-rc:48 rc/settings/shopt-rc:50 rc/settings/shopt-rc:55
#: rc/settings/shopt-rc:57 rc/settings/shopt-rc:62 rc/settings/shopt-rc:64
#: rc/settings/shopt-rc:69 rc/settings/shopt-rc:71 rc/settings/shopt-rc:76
#: rc/settings/shopt-rc:78 rc/settings/shopt-rc:83 rc/settings/shopt-rc:85
#: rc/settings/shopt-rc:90 rc/settings/shopt-rc:92 rc/settings/shopt-rc:100
#: rc/settings/shopt-rc:102 rc/settings/shopt-rc:107 rc/settings/shopt-rc:109
#: rc/settings/shopt-rc:114 rc/settings/shopt-rc:116 rc/settings/shopt-rc:121
#: rc/settings/shopt-rc:123 rc/settings/shopt-rc:131 rc/settings/shopt-rc:133
#: rc/settings/shopt-rc:138 rc/settings/shopt-rc:140
#: rc/bashstyle-rc:49 rc/bashstyle-rc:85 rc/bashstyle-rc:101
#: rc/bashstyle-rc:105 rc/bashstyle-rc:108 rc/bashstyle-rc:111
#: rc/bashstyle-rc:115 rc/bashstyle-rc:133 rc/bashstyle-rc:142
#: rc/bashstyle-rc:145 rc/bashstyle-rc:148 rc/bashstyle-rc:285
#: rc/settings/alias-rc:13 rc/settings/alias-rc:16 rc/settings/alias-rc:21
#: rc/settings/alias-rc:26 rc/settings/alias-rc:31 rc/settings/alias-rc:36
#: rc/settings/alias-rc:41 rc/settings/alias-rc:46 rc/settings/alias-rc:51
#: rc/settings/alias-rc:56 rc/settings/alias-rc:61 rc/settings/color-rc:12
#: rc/settings/color-rc:13 rc/settings/git-rc:12 rc/settings/git-rc:15
#: rc/settings/git-rc:20 rc/settings/git-rc:25 rc/settings/git-rc:32
#: rc/settings/git-rc:37 rc/settings/git-rc:44 rc/settings/git-rc:49
#: rc/settings/git-rc:60 rc/settings/ls-rc:12 rc/settings/options-rc:13
#: rc/settings/options-rc:16 rc/settings/options-rc:19
#: rc/settings/options-rc:22 rc/settings/options-rc:25
#: rc/settings/options-rc:29 rc/settings/options-rc:33
#: rc/settings/options-rc:36 rc/settings/options-rc:41
#: rc/settings/options-rc:46 rc/settings/options-rc:49
#: rc/settings/options-rc:59 rc/settings/options-rc:68
#: rc/settings/options-rc:85 rc/settings/shopt-rc:13 rc/settings/shopt-rc:15
#: rc/settings/shopt-rc:20 rc/settings/shopt-rc:22 rc/settings/shopt-rc:27
#: rc/settings/shopt-rc:29 rc/settings/shopt-rc:34 rc/settings/shopt-rc:36
#: rc/settings/shopt-rc:41 rc/settings/shopt-rc:43 rc/settings/shopt-rc:48
#: rc/settings/shopt-rc:50 rc/settings/shopt-rc:55 rc/settings/shopt-rc:57
#: rc/settings/shopt-rc:62 rc/settings/shopt-rc:64 rc/settings/shopt-rc:69
#: rc/settings/shopt-rc:71 rc/settings/shopt-rc:76 rc/settings/shopt-rc:78
#: rc/settings/shopt-rc:83 rc/settings/shopt-rc:85 rc/settings/shopt-rc:90
#: rc/settings/shopt-rc:92 rc/settings/shopt-rc:100 rc/settings/shopt-rc:102
#: rc/settings/shopt-rc:107 rc/settings/shopt-rc:109 rc/settings/shopt-rc:114
#: rc/settings/shopt-rc:116 rc/settings/shopt-rc:121 rc/settings/shopt-rc:123
#: rc/settings/shopt-rc:131 rc/settings/shopt-rc:133 rc/settings/shopt-rc:138
#: rc/settings/shopt-rc:140
msgid "BashStyle-NG Setting:"
msgstr "BashStyle-NG Setze:"
#: rc/nx-rc:91 rc/nx-rc:97 rc/settings/keybindings-rc:12 rc/settings/nano-rc:18
#: rc/settings/readline-rc:18 rc/settings/vim-rc:18
#: rc/bashstyle-rc:91 rc/bashstyle-rc:97 rc/settings/keybindings-rc:12
#: rc/settings/nano-rc:18 rc/settings/readline-rc:18 rc/settings/vim-rc:18
msgid "BashStyle-NG Loading:"
msgstr "BashStyle-NG Lade:"
#: rc/nx-rc:91
#: rc/bashstyle-rc:91
msgid "Custom Settings"
msgstr "Eigene Einstellungen"
#: rc/nx-rc:115
#: rc/bashstyle-rc:115
msgid "Random Prompt"
msgstr "Zufälliger Prompt"
#: rc/nx-rc:133
#: rc/bashstyle-rc:133
msgid "randomly chosen"
msgstr "zufällig ausgewählt"
#: rc/nx-rc:142
#: rc/bashstyle-rc:142
msgid "Custom"
msgstr "Benutzerdefiniert"
#: rc/nx-rc:148
#: rc/bashstyle-rc:148
msgid "Fallback"
msgstr "Ausfall"
#: rc/nx-rc:293
#: rc/bashstyle-rc:285
msgid "Welcome Message"
msgstr "Willkommensgruß"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: BashStyle-NG\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-26 09:25+0100\n"
"POT-Creation-Date: 2016-03-30 09:23+0200\n"
"PO-Revision-Date: 2016-03-26 09:26+0100\n"
"Last-Translator: Christopher Roy Bratusek <nano@jpberlin.de>\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/bs-ng/"
......@@ -20,9 +20,9 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.8.7.1\n"
#: ui/args.py:23 ui/bs-ng.py:39 ui/config.py:23 ui/iconbook.py:34
#: ui/keybindings.py:38 ui/lockfile.py:23 ui/promptbuilder.py:28
#: ui/widgethandler.py:28
#: ui/args.py:23 ui/bs-ng.py:39 ui/config.py:23 ui/configui.py:34
#: ui/iconbook.py:33 ui/keybindings.py:38 ui/lockfile.py:23
#: ui/promptbuilder.py:28 ui/widgethandler.py:28
#, python-format
msgid "The following modules failed to import: %s"
msgstr "Folgende Module konnten nicht geladen werden: %s"
......@@ -185,6 +185,40 @@ msgstr ""
"VendorConfigExists: Distributions-Konfiguration kann aufgrund von Fehlern "
"nicht geladen werden."
#: ui/configui.py:26 ui/iconbook.py:25 ui/keybindings.py:25
#: ui/promptbuilder.py:25 ui/widgethandler.py:25
msgid "Gtk (from gi.repository)"
msgstr "Gtk (aus gi.repository)"
#: ui/configui.py:31 ui/iconbook.py:30 ui/keybindings.py:35
msgid "GdkPixbuf (from gi.repository)"
msgstr "GdkPixbuf (aus gi.repository)"
#: ui/configui.py:69
msgid "RestoreConfig: relaunching BashStyle-NG"
msgstr "RestoreConfig: Neu-Start von BashStyle-NG"
#: ui/configui.py:76
msgid "ResetConfig: relaunching BashStyle-NG"
msgstr "ResetConfig: Neu-Start von BashStyle-NG"
#: ui/configui.py:85
#, python-format
msgid "BackupConfig: deleting user backup %s"
msgstr "BackupConfig: entferne Sicherung %s"
#: ui/configui.py:127 ui/configui.py:131 ui/iconbook.py:57
msgid "Choose a Category:"
msgstr "Kategorie auswählen:"
#: ui/configui.py:141 ui/iconbook.py:78
msgid "Category: "
msgstr "Kategorie: "
#: ui/configui.py:141 ui/dicts.py:299
msgid "BashStyle-NG StartUp"
msgstr "BashStyle-NG StartUp"
#: ui/dicts.py:266 ui/dicts.py:286
msgid "General Style"
msgstr "Stil Optionen"
......@@ -237,7 +271,7 @@ msgstr "Tastenkürzel"
msgid "Configuration"
msgstr "Konfiguration"
#: ui/dicts.py:279 ui/dicts.py:301 ui/iconbook.py:73
#: ui/dicts.py:279 ui/dicts.py:301 ui/iconbook.py:69
msgid "Documentation"
msgstr "Dokumentation"
......@@ -245,44 +279,10 @@ msgstr "Dokumentation"
msgid "Manpage Colors"
msgstr "Hilfeseiten Farben"
#: ui/dicts.py:281 ui/dicts.py:302 ui/iconbook.py:76
#: ui/dicts.py:281 ui/dicts.py:302 ui/iconbook.py:72
msgid "Start Terminal"
msgstr "Terminal starten"
#: ui/dicts.py:299 ui/iconbook.py:169
msgid "BashStyle-NG StartUp"
msgstr "BashStyle-NG StartUp"
#: ui/iconbook.py:26 ui/keybindings.py:25 ui/promptbuilder.py:25
#: ui/widgethandler.py:25
msgid "Gtk (from gi.repository)"
msgstr "Gtk (aus gi.repository)"
#: ui/iconbook.py:31 ui/keybindings.py:35
msgid "GdkPixbuf (from gi.repository)"
msgstr "GdkPixbuf (aus gi.repository)"
#: ui/iconbook.py:61 ui/iconbook.py:159 ui/iconbook.py:163
msgid "Choose a Category:"
msgstr "Kategorie auswählen:"
#: ui/iconbook.py:82 ui/iconbook.py:169
msgid "Category: "
msgstr "Kategorie: "
#: ui/iconbook.py:104
msgid "RestoreConfig: relaunching BashStyle-NG"
msgstr "RestoreConfig: Neu-Start von BashStyle-NG"
#: ui/iconbook.py:111
msgid "ResetConfig: relaunching BashStyle-NG"
msgstr "ResetConfig: Neu-Start von BashStyle-NG"
#: ui/iconbook.py:120
#, python-format
msgid "BackupConfig: deleting user backup %s"
msgstr "BackupConfig: entferne Sicherung %s"
#: ui/keybindings.py:30
msgid "GObject (from gi.repository)"
msgstr "GObject (aus gi.repository)"
......@@ -1939,7 +1939,7 @@ msgid "About"
msgstr "Über"
#: ui/bashstyle.ui.h:413
#, python-brace-format
#, fuzzy, python-brace-format
msgid ""
"BashStyle-NG is not loaded upon Shell start.\n"
"\n"
......@@ -1953,7 +1953,7 @@ msgid ""
"\n"
"You can add the entry manually like:\n"
"\n"
" source /usr/share/bashstyle-ng/rc/nx-rc\n"
" source /usr/share/bashstyle-ng/rc/bashstyle-rc\n"
"\n"
"assuming /usr was the chosen install prefix. "
msgstr ""
......
......@@ -10,7 +10,7 @@
#########################################################
. gettext.sh
TEXTDOMAIN="nx-rc"
TEXTDOMAIN="bashstyle-rc"
export BSNG_PREFIX=@PREFIX@
export BSNG_DATADIR=@DATADIR@
......
......@@ -7847,7 +7847,7 @@ your ${HOME}/.bashrc
You can add the entry manually like:
source /usr/share/bashstyle-ng/rc/nx-rc
source /usr/share/bashstyle-ng/rc/bashstyle-rc
assuming /usr was the chosen install prefix. </property>
</object>
......
......@@ -10,7 +10,7 @@
#########################################################
import gettext, os
lang = gettext.translation('bs-ng', fallback=True)
lang = gettext.translation('bashstyle', fallback=True)
lang.install(names=['_'])
import args
......
......@@ -29,7 +29,7 @@ USER_DEFAULTS_NEW = (os.getenv('HOME') + '/.bs-ng.ini.new')
USER_DEFAULTS_SAVE = (os.getenv('HOME') + '/.bs-ng.ini.save')
FACTORY_DEFAULTS = (DATADIR + '/bashstyle-ng/bs-ng.ini')
VENDOR_DEFAULTS = ('/etc/bs-ng_vendor.ini')
NXRC = (DATADIR + "/bashstyle-ng/rc/nx-rc")
NXRC = (DATADIR + "/bashstyle-ng/rc/bashstyle-rc")
app_ini_version = 29
......@@ -218,7 +218,7 @@ class Config(object):
rc_new = open(os.path.expanduser("~/.bashrc.new"), "w")
content = rc.readlines()
for line in content:
if line.find("bashstyle-ng/rc/nx-rc") == -1:
if line.find("bashstyle-ng/rc/bashstyle-rc") == -1:
rc_new.write(line)
rc.close
if OnOff == True:
......
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