Discussion:
[SCM] UNNAMED PROJECT branch, master, updated. 2b3f9c3cf55d291bc3542bf6d1c8959bafd4ebc5
Michal Cihar
2012-03-30 09:22:20 UTC
Permalink
The following commit has been merged in the master branch:
commit 2b3f9c3cf55d291bc3542bf6d1c8959bafd4ebc5
Author: Michal Čihař <***@cihar.com>
Date: Fri Mar 30 11:21:28 2012 +0200

Remove merging this should be done rather in Weblate

diff --git a/admin/locales-update b/admin/locales-update
index 5ef7918..b1b45d5 100755
--- a/admin/locales-update
+++ b/admin/locales-update
@@ -1,16 +1,4 @@
#!/bin/sh
# vim: expandtab sw=4 ts=4 sts=4:
-LOCS=`ls locale/*/LC_MESSAGES/django.po | sed '***@.*/\(.*\)/LC_MESSAGES/[^/]*@\1@'`
-
-for loc in $LOCS ; do
- echo merging language $loc
- ./admin/mergepo.py locale/$loc/LC_MESSAGES/django.po ../gammu/locale/$loc/manual.po
- ./admin/mergepo.py locale/$loc/LC_MESSAGES/django.po ../gammu/locale/$loc/docs.po
- ./admin/mergepo.py locale/$loc/LC_MESSAGES/django.po ../gammu/locale/$loc/gammu.po
- ./admin/mergepo.py locale/$loc/LC_MESSAGES/django.po ../gammu/locale/$loc/libgammu.po
- ./admin/mergepo.py locale/$loc/LC_MESSAGES/django.po ../wammu/locale/$loc/wammu.po
- ./admin/mergepo.py locale/$loc/LC_MESSAGES/django.po ../wammu/locale/$loc/docs.po
-done
-
./manage.py makemessages -a
--
UNNAMED PROJECT
Michal Cihar
2012-03-30 09:22:18 UTC
Permalink
The following commit has been merged in the master branch:
commit b935ee3641b853913e2a80307d161284c4c941a6
Author: Michal Čihař <***@cihar.com>
Date: Fri Mar 30 11:20:55 2012 +0200

Add Indonesian language

diff --git a/locale/sv/LC_MESSAGES/django.po b/locale/id/LC_MESSAGES/django.po
similarity index 97%
copy from locale/sv/LC_MESSAGES/django.po
copy to locale/id/LC_MESSAGES/django.po
index a85e821..f1da82a 100644
--- a/locale/sv/LC_MESSAGES/django.po
+++ b/locale/id/LC_MESSAGES/django.po
@@ -2,24 +2,25 @@
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <***@ADDRESS>, YEAR.
+#
+#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: Wammu website\n"
+"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-27 10:25+0200\n"
-"PO-Revision-Date: 2011-06-24 17:24+0200\n"
-"Last-Translator: <***@gmail.com>\n"
+"POT-Creation-Date: 2012-03-30 11:20+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <***@ADDRESS>\n"
"Language-Team: LANGUAGE <***@li.org>\n"
-"Language: sv\n"
+"Language: \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: Pootle 2.0.5\n"
+"Plural-Forms: nplurals=1; plural=0\n"

#: downloads/models.py:32
msgid "Source"
-msgstr "Källa"
+msgstr ""

#: downloads/models.py:33
msgid "Windows binary"
@@ -28,16 +29,16 @@ msgstr ""
#: downloads/models.py:176
#, python-format
msgid "%(program)s stable release %(version)s"
-msgstr "%(program)s stabil utgåva %(version)s"
+msgstr ""

#: downloads/models.py:181
#, python-format
msgid "%(program)s testing release %(version)s"
-msgstr "%(program)s test release %(version)s"
+msgstr ""

#: html/403.html:4 html/403.html.py:8
msgid "Permission Denied"
-msgstr "Åtkomst nekad"
+msgstr ""

#: html/403.html:11 html/404.html:11
msgid ""
@@ -131,9 +132,8 @@ msgid "Downloads"
msgstr ""

#: html/base.html:80 html/base.html.py:154 html/base.html.py:164
-#, fuzzy
msgid "Donate"
-msgstr "&Donera"
+msgstr ""

#: html/base.html:82
msgid "Support Gammu by <a href=\"/donate/\">donating</a>!"
@@ -164,34 +164,30 @@ msgid "Follow us on Identi.ca"
msgstr ""

#: html/base.html:114 html/index.html:19
-#, fuzzy
msgid "About"
-msgstr "&Om"
+msgstr ""

#: html/base.html:116 html/gammu.html:4 html/gammu.html.py:19
#: html/contribute/translate.html:59
msgid "Gammu"
-msgstr "Gammu"
+msgstr ""

-# msgid "&Wammu"
#: html/base.html:117 html/wammu.html:4 html/wammu.html.py:22
#: html/contribute/translate.html:58
msgid "Wammu"
-msgstr "Wammu"
+msgstr ""

#: html/base.html:118
msgid "python-gammu"
msgstr ""

#: html/base.html:119
-#, fuzzy
msgid "SMSD"
-msgstr "SMS"
+msgstr ""

#: html/base.html:123 wammu/context_processors.py:34
-#, fuzzy
msgid "Support"
-msgstr "&Support"
+msgstr ""

#: html/base.html:125
msgid "Mailing lists"
@@ -279,11 +275,9 @@ msgstr ""
msgid "Search for Gammu/Wammu related questions"
msgstr ""

-# msgid "Search:"
#: html/base.html:165 html/phonedb/index.html:8
-#, fuzzy
msgid "Search"
-msgstr "Sök: "
+msgstr ""

#: html/base.html:166
msgid "Gammu and Wammu authors"
@@ -479,9 +473,8 @@ msgstr ""

#: html/gammu.html:11 html/libgammu.html:7 html/python-gammu.html:13
#: html/smsd.html:13 html/wammu.html:11
-#, fuzzy
msgid "More information"
-msgstr "Telefoninformation"
+msgstr ""

#: html/gammu.html:22
msgid ""
@@ -658,7 +651,6 @@ msgid ""
msgstr ""

#: html/license.html:18
-#, fuzzy
msgid ""
"\n"
"This program is free software; you can redistribute it and/or\n"
@@ -666,11 +658,6 @@ msgid ""
"as published by the Free Software Foundation; version 2\n"
"of the License.\n"
msgstr ""
-"\n"
-"Det här programmet är fri programvara; du kan distribuera det och/eller "
-"ändra\n"
-"det under villkoren för GNU General Public License version 2 som\n"
-"publicerats av Free Software Foundation.\n"

#: html/license.html:27 html/license.html.py:64
msgid ""
@@ -680,11 +667,6 @@ msgid ""
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
"GNU General Public License for more details.\n"
msgstr ""
-"\n"
-"Det här programmet distribueras i hopp om att det ska vara användbart,\n"
-"men UTAN NÅGON GARANTI; även utan underförstådd garanti för\n"
-"SÄLJBARHET eller LÄMPLIGHET FÖR ETT SPECIFIKT ÄNDAMÅL. Se\n"
-"GNU General Public License för mer detaljer.\n"

#: html/license.html:36 html/license.html.py:73
msgid ""
@@ -995,9 +977,8 @@ msgid ""
msgstr ""

#: html/wammu_feedback.html:3
-#, fuzzy
msgid "Thank you for using Wammu"
-msgstr "Tack för att du använder Wammu"
+msgstr ""

#: html/wammu_feedback.html:5
msgid ""
@@ -1487,11 +1468,9 @@ msgid ""
"special skill for this, writing plain text is enough.\n"
msgstr ""

-# msgid "Not supported id: %s"
#: html/contribute/wanted.html:52
-#, fuzzy
msgid "Community supporter"
-msgstr "Stöds inte"
+msgstr ""

#: html/contribute/wanted.html:55
msgid ""
@@ -1896,9 +1875,8 @@ msgid "Third Party Applications using Gammu"
msgstr ""

#: html/links/index.html:22
-#, fuzzy
msgid "Website:"
-msgstr "&Webbplats"
+msgstr ""

#: html/news/contrib_index.html:4 html/news/contrib_index.html.py:6
msgid "Third Party News"
@@ -1935,7 +1913,7 @@ msgstr ""

#: html/news/index.html:14 html/screenshots/index.html:7
msgid "Categories"
-msgstr "Kategorier"
+msgstr ""

#: html/news/index.html:16
msgid "All news"
@@ -1953,9 +1931,8 @@ msgid "Wammu News"
msgstr ""

#: html/phonedb/body.html:3
-#, fuzzy
msgid "Supported Features"
-msgstr "Funktioner som stöds"
+msgstr ""

#: html/phonedb/body.html:13
msgid "No features reported as working!"
@@ -1979,9 +1956,8 @@ msgstr ""
#: html/phonedb/index.html:5 html/phonedb/index.html.py:39
#: html/phonedb/new.html:5 html/phonedb/phone.html:6
#: html/phonedb/search.html:5 html/phonedb/vendor.html:6
-#, fuzzy
msgid "Gammu Phone Database "
-msgstr "&Gammus telefondatabas"
+msgstr ""

#: html/phonedb/index.html:11 html/phonedb/index.html.py:24
#: html/phonedb/new.html:50 html/phonedb/search.html:22
@@ -2043,9 +2019,8 @@ msgid ""
msgstr ""

#: html/phonedb/index.html:74
-#, fuzzy
msgid "Manufacturers"
-msgstr "Tillverkare"
+msgstr ""

#: html/phonedb/index.html:83
msgid "Recently Added Phones"
@@ -2065,20 +2040,19 @@ msgstr ""

#: html/phonedb/list.html:5
msgid "Name"
-msgstr "Namn"
+msgstr ""

#: html/phonedb/list.html:5
msgid "Connection"
-msgstr "Anslutning"
+msgstr ""

#: html/phonedb/list.html:5
msgid "Supported features"
-msgstr "Funktioner som stöds"
+msgstr ""

-# msgid "Not supported id: %s"
#: html/phonedb/list.html:22
msgid "Not supported"
-msgstr "Stöds inte"
+msgstr ""

#: html/phonedb/new.html:5 html/phonedb/new.html.py:16
msgid "Create New Record"
@@ -2116,7 +2090,7 @@ msgstr ""

#: html/phonedb/phone.html:15
msgid "Edit"
-msgstr "Redigera"
+msgstr ""

#: html/phonedb/phone.html:17
msgid "Delete"
@@ -2214,9 +2188,8 @@ msgid ""
msgstr ""

#: html/phonedb/vendor.html:21
-#, fuzzy
msgid "Website"
-msgstr "&Webbplats"
+msgstr ""

#: html/phonedb/vendor.html:26
#, python-format
@@ -2740,7 +2713,7 @@ msgstr ""
#: html/tools/pdudecode.html:37 html/tools/pdudecode.html.py:39
#: tools/forms.py:13
msgid "Text"
-msgstr "Text"
+msgstr ""

#: html/tools/pdudecode.html:42
msgid "UDH type"
@@ -2756,7 +2729,7 @@ msgstr ""

#: html/tools/pdudecode.html:46
msgid "SMSC"
-msgstr "SMSC"
+msgstr ""

#: html/tools/pdudecode.html:47
msgid "Validity"
@@ -2764,7 +2737,7 @@ msgstr ""

#: html/tools/pdudecode.html:48
msgid "Type"
-msgstr "Typ"
+msgstr ""

#: html/tools/pdudecode.html:49
msgid "Message Reference"
@@ -2784,7 +2757,7 @@ msgstr ""

#: html/tools/pdudecode.html:68
msgid "Sender"
-msgstr "Avsändare"
+msgstr ""

#: html/tools/pdudecode.html:69
msgid "Address"
@@ -2823,9 +2796,8 @@ msgid "PDU decoder"
msgstr ""

#: html/tools/sidebar.html:6
-#, fuzzy
msgid "Countries"
-msgstr "Kategorier"
+msgstr ""

#: html/tools/sidebar.html:7
msgid "Networks"
@@ -2836,9 +2808,8 @@ msgid "Updates about Wammu and Gammu programs."
msgstr ""

#: phonedb/feeds.py:9
-#, fuzzy
msgid "Gammu Phone Database"
-msgstr "&Gammus telefondatabas"
+msgstr ""

#: phonedb/feeds.py:11
msgid "Gammu phone database updates."
@@ -2868,19 +2839,19 @@ msgstr ""

#: phonedb/models.py:20
msgid "Use [at] and [dot]"
-msgstr "Använd [at] och [dot]"
+msgstr ""

#: phonedb/models.py:21
msgid "Display it normally"
-msgstr "Visa den normalt"
+msgstr ""

#: phonedb/models.py:22
msgid "Don't show email at all"
-msgstr "Visa inte e-postadressen alls"
+msgstr ""

#: phonedb/models.py:23
msgid "Insert NOSPAM text at random position"
-msgstr "Infoga NOSPAM på slumpmässig position"
+msgstr ""

#: phonedb/models.py:27
msgid "Draft"
@@ -2896,15 +2867,15 @@ msgstr ""

#: phonedb/models.py:33
msgid "Phone information"
-msgstr "Telefoninformation"
+msgstr ""

#: phonedb/models.py:34
msgid "Sending and saving SMS"
-msgstr "Skicka och spara SMS"
+msgstr ""

#: phonedb/models.py:35
msgid "Multimedia messaging"
-msgstr "MMS"
+msgstr ""

#: phonedb/models.py:36
msgid "Basic phonebook functions (name and phone number)"
@@ -2916,27 +2887,27 @@ msgstr ""

#: phonedb/models.py:38
msgid "Calendar entries"
-msgstr "Kalenderposter"
+msgstr ""

#: phonedb/models.py:39
msgid "Todos"
-msgstr "AttGöra"
+msgstr ""

#: phonedb/models.py:40
msgid "Filesystem manipulation"
-msgstr "Manipulering av filsystem"
+msgstr ""

#: phonedb/models.py:41
msgid "Reading and making calls"
-msgstr "Läser och ringer samtal"
+msgstr ""

#: phonedb/models.py:42
msgid "Logos"
-msgstr "Logotyper"
+msgstr ""

#: phonedb/models.py:43
msgid "Ringtones"
-msgstr "Ringsignaler"
+msgstr ""

#: phonedb/models.py:84
#, python-format
@@ -2999,7 +2970,7 @@ msgstr ""

#: tools/forms.py:15
msgid "Unicode"
-msgstr "Unicode"
+msgstr ""

#: tools/forms.py:16
msgid "Recipient"
@@ -3007,7 +2978,7 @@ msgstr ""

#: tools/forms.py:17
msgid "SMSC number"
-msgstr "SMSC-nummer"
+msgstr ""

#: wammu/context_processors.py:57
msgid "Gammu and Wammu News Feed (RSS)"
@@ -3016,12 +2987,3 @@ msgstr ""
#: wammu/context_processors.py:58
msgid "Gammu and Wammu News Feed (Atom)"
msgstr ""
-
-#~ msgid "Manual"
-#~ msgstr "Manuell"
-
-#~ msgid "Phones Support"
-#~ msgstr "&Support"
-
-#~ msgid "Is my phone supported?"
-#~ msgstr "Stöds inte"
--
UNNAMED PROJECT
Loading...