Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-23 01:53:02 +01:00
Code Issues Projects Releases Wiki Activity

manually fix merge conflicts

Browse Source
This commit is contained in:
Jfreegman 2015-06-29 03:11:21 -04:00
commit 374b78c763
No known key found for this signature in database
GPG Key ID: 3627F3144076AE63
6 changed files with 35 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/groupchat.c
View File

@ -142,7 +142,7 @@ int init_groupchat_win(ToxWindow *prompt, Tox *m, int groupnum, uint8_t type)
|| groupchats[i].peer_name_lengths == NULL || groupchats[i].oldpeer_name_lengths == NULL) || groupchats[i].peer_name_lengths == NULL || groupchats[i].oldpeer_name_lengths == NULL)
exit_toxic_err(gettext("failed in init_groupchat_win"), FATALERR_MEMORY); exit_toxic_err(gettext("failed in init_groupchat_win"), FATALERR_MEMORY);
memcpy(&groupchats[i].oldpeer_names[0], UNKNOWN_NAME, sizeof(UNKNOWN_NAME)); memcpy(&groupchats[i].oldpeer_names[0], UNKNOWN_NAME, strlen(UNKNOWN_NAME));
groupchats[i].oldpeer_name_lengths[0] = (uint16_t) strlen(UNKNOWN_NAME); groupchats[i].oldpeer_name_lengths[0] = (uint16_t) strlen(UNKNOWN_NAME);
#ifdef AUDIO #ifdef AUDIO

25
translations/en.po
View File

@ -1,10 +1,14 @@
# English translations for Toxic package.
# Copyright (C) 2015 Toxic Team
# This file is distributed under the same license as the Toxic package.
# Automatically generated, 2015.
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Toxic 0.6.0\n" "Project-Id-Version: Toxic 0.6.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: JFreegman@tox.im\n"
"POT-Creation-Date: 2015-05-28 15:47+0200\n" "POT-Creation-Date: 2015-05-30 11:30+0200\n"
"PO-Revision-Date: 2015-05-26 11:37+0200\n" "PO-Revision-Date: 2015-05-30 11:30+0200\n"
"Last-Translator: Automatically generated\n" "Last-Translator: Automatically generated\n"
"Language-Team: none\n" "Language-Team: none\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -695,14 +699,9 @@ msgid "No pending friend request with that ID."
msgstr "No pending friend request with that ID." msgstr "No pending friend request with that ID."
#: ../src/global_commands.c:75 #: ../src/global_commands.c:75
#, fuzzy, c-format #, c-format
#| msgid ""
#| "Failed to add friend (error %d\n"
#| ")"
msgid "Failed to add friend (error %d)\n" msgid "Failed to add friend (error %d)\n"
msgstr "" msgstr "Failed to add friend (error %d)\n"
"Failed to add friend (error %d\n"
")"
#: ../src/global_commands.c:78 #: ../src/global_commands.c:78
msgid "Friend request accepted." msgid "Friend request accepted."
@ -1585,13 +1584,11 @@ msgstr "WARNING: Failed to save to data file"
#: ../src/toxic.h:43 #: ../src/toxic.h:43
msgid "Anonymous" msgid "Anonymous"
msgstr "" msgstr "Anonymous"
#: ../src/toxic.h:44 #: ../src/toxic.h:44
#, fuzzy
#| msgid "Toxic User"
msgid "Tox User" msgid "Tox User"
msgstr "Toxic User" msgstr "Tox User"
#: ../src/windows.c:368 #: ../src/windows.c:368
msgid "failed in set_next_window" msgid "failed in set_next_window"

7
translations/it.po
View File

@ -1,7 +1,12 @@
# Italian translations for Toxic package.
# Copyright (C) 2015 Toxic Team
# This file is distributed under the same license as the Toxic package.
# Automatically generated, 2015.
#
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Toxic 0.6.0\n" "Project-Id-Version: Toxic 0.6.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: JFreegman@tox.chat\n"
"POT-Creation-Date: 2015-05-28 15:47+0200\n" "POT-Creation-Date: 2015-05-28 15:47+0200\n"
"PO-Revision-Date: 2015-05-26 11:37+0200\n" "PO-Revision-Date: 2015-05-26 11:37+0200\n"
"Last-Translator: Automatically generated\n" "Last-Translator: Automatically generated\n"

7
translations/tools/create_po.sh
View File

@ -15,8 +15,9 @@ if [ -e "$loc.po" ]; then
echo "The translation file must not exist" echo "The translation file must not exist"
exit 1 exit 1
else else
msginit --no-translator -l $loc -o $loc.po -i toxic.pot
v=$(grep TOXIC_VERSION ../cfg/global_vars.mk | head -1 | cut -d "=" -f 2 | tr -d " ") v=$(grep TOXIC_VERSION ../cfg/global_vars.mk | head -1 | cut -d "=" -f 2 | tr -d " ")
sed -e '1,5{/^#/d;}' $loc.po > $loc.po.tmp && mv $loc.po.tmp $loc.po echo "PACKAGE_NAME=Toxic" > configure
sed -e 's/.*Project-Id-Version:.*/"Project-Id-Version: Toxic '"$v"'\\n"/' $loc.po > $loc.po.tmp && mv $loc.po.tmp $loc.po echo "PACKAGE_VERSION=$v" >> configure
msginit --no-translator -l $loc -o $loc.po -i toxic.pot
rm -f configure
fi fi

10
translations/tools/update_pot.sh
View File

@ -1,4 +1,12 @@
#!/bin/bash #!/bin/bash
cd $(dirname $0)/.. cd $(dirname $0)/..
xgettext -d toxic -o toxic.pot ../src/* v=$(grep TOXIC_VERSION ../cfg/global_vars.mk | head -1 | cut -d "=" -f 2 | tr -d " ")
xgettext --default-domain="toxic" \
--from-code="UTF-8" \
--copyright-holder="Toxic Team" \
--msgid-bugs-address="JFreegman@tox.chat" \
--package-name="Toxic" \
--package-version="$v" \
--output="toxic.pot" \
../src/*

8
translations/toxic.pot
View File

@ -1,14 +1,14 @@
# SOME DESCRIPTIVE TITLE. # SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # Copyright (C) 2015 Toxic Team
# This file is distributed under the same license as the PACKAGE package. # This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
# #
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: Toxic 0.6.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: JFreegman@tox.chat\n"
"POT-Creation-Date: 2015-05-28 15:47+0200\n" "POT-Creation-Date: 2015-05-30 11:30+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"