Multiple catalogs is a major pain. Gettext will not cooperate. Merge.

This commit is contained in:
Jon Lund Steffensen
2010-02-10 21:48:25 +01:00
parent 75857f38a7
commit 411548a37f
6 changed files with 65 additions and 108 deletions
+23 -14
View File
@@ -3,19 +3,24 @@
# This file is distributed under the same license as the redshift package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: redshift\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-02-02 00:50+0100\n"
"PO-Revision-Date: 2010-02-09 20:35+0000\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/redshift\n"
"POT-Creation-Date: 2010-02-10 21:19+0100\n"
"PO-Revision-Date: 2010-02-02 11:34+0000\n"
"Last-Translator: Jon Lund Steffensen <Unknown>\n"
"Language-Team: Danish <da@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"#-#-#-#-# da.po (redshift) #-#-#-#-#\n"
"X-Launchpad-Export-Date: 2010-02-10 04:50+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"#-#-#-#-# da.po (redshift) #-#-#-#-#\n"
"X-Launchpad-Export-Date: 2010-02-03 04:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: src/redshift.c:172
#, c-format
@@ -178,17 +183,6 @@ msgstr "Farvetemperatur: %uK\n"
msgid "Temperature adjustment failed.\n"
msgstr "Fejl ved justering af temperatur.\n"
#: src/vidmode.c:42 src/vidmode.c:54 src/vidmode.c:64 src/vidmode.c:94
#: src/vidmode.c:125 src/vidmode.c:154
#, c-format
msgid "X request failed: %s\n"
msgstr "Fejl ved X forespørgsel: %s\n"
#: src/vidmode.c:71 src/randr.c:157
#, c-format
msgid "Gamma ramp size too small: %i\n"
msgstr "Størrelsen på gammarampen er for lille: %i\n"
#: src/randr.c:57 src/randr.c:104 src/randr.c:144 src/randr.c:172
#: src/randr.c:231 src/randr.c:283
#, c-format
@@ -205,7 +199,22 @@ msgstr "Ikke-understøttet RANDR version (%u.%u)\n"
msgid "Screen %i could not be found.\n"
msgstr "Skærm %i kunne ikke findes.\n"
#: src/randr.c:157 src/vidmode.c:71
#, c-format
msgid "Gamma ramp size too small: %i\n"
msgstr "Størrelsen på gammarampen er for lille: %i\n"
#: src/randr.c:233
#, c-format
msgid "Unable to restore CRTC %i\n"
msgstr "Kan ikke genskabe CRTC %i\n"
#: src/vidmode.c:42 src/vidmode.c:54 src/vidmode.c:64 src/vidmode.c:94
#: src/vidmode.c:125 src/vidmode.c:154
#, c-format
msgid "X request failed: %s\n"
msgstr "Fejl ved X forespørgsel: %s\n"
#: src/gtk-redshift/gtk-redshift.py:59
msgid "Toggle"
msgstr "Slå til/fra"
-22
View File
@@ -1,22 +0,0 @@
# Danish translation for redshift
# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
# This file is distributed under the same license as the redshift package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: redshift\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-02-01 22:16+0100\n"
"PO-Revision-Date: 2010-02-02 11:34+0000\n"
"Last-Translator: Jon Lund Steffensen <Unknown>\n"
"Language-Team: Danish <da@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-02-03 04:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: src/gtk-redshift/gtk-redshift:59
msgid "Toggle"
msgstr "Slå til/fra"
-21
View File
@@ -1,21 +0,0 @@
# 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: 2010-02-01 22:16+0100\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
#: src/gtk-redshift/gtk-redshift:59
msgid "Toggle"
msgstr ""
-22
View File
@@ -1,22 +0,0 @@
# Russian translation for redshift
# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
# This file is distributed under the same license as the redshift package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: redshift\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-02-01 22:16+0100\n"
"PO-Revision-Date: 2010-02-02 09:20+0000\n"
"Last-Translator: Gregory Petrosyan <gregory.petrosyan@gmail.com>\n"
"Language-Team: Russian <ru@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-02-03 04:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: src/gtk-redshift/gtk-redshift:59
msgid "Toggle"
msgstr "Включить / Выключить"
+19 -15
View File
@@ -1,14 +1,14 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# Copyright (C) YEAR Jon Lund Steffensen
# 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: 2010-02-02 00:50+0100\n"
"Project-Id-Version: redshift 1.1\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/redshift\n"
"POT-Creation-Date: 2010-02-10 21:19+0100\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"
@@ -167,17 +167,6 @@ msgstr ""
msgid "Temperature adjustment failed.\n"
msgstr ""
#: src/vidmode.c:42 src/vidmode.c:54 src/vidmode.c:64 src/vidmode.c:94
#: src/vidmode.c:125 src/vidmode.c:154
#, c-format
msgid "X request failed: %s\n"
msgstr ""
#: src/vidmode.c:71 src/randr.c:157
#, c-format
msgid "Gamma ramp size too small: %i\n"
msgstr ""
#: src/randr.c:57 src/randr.c:104 src/randr.c:144 src/randr.c:172
#: src/randr.c:231 src/randr.c:283
#, c-format
@@ -194,7 +183,22 @@ msgstr ""
msgid "Screen %i could not be found.\n"
msgstr ""
#: src/randr.c:157 src/vidmode.c:71
#, c-format
msgid "Gamma ramp size too small: %i\n"
msgstr ""
#: src/randr.c:233
#, c-format
msgid "Unable to restore CRTC %i\n"
msgstr ""
#: src/vidmode.c:42 src/vidmode.c:54 src/vidmode.c:64 src/vidmode.c:94
#: src/vidmode.c:125 src/vidmode.c:154
#, c-format
msgid "X request failed: %s\n"
msgstr ""
#: src/gtk-redshift/gtk-redshift.py:59
msgid "Toggle"
msgstr ""
+23 -14
View File
@@ -3,19 +3,24 @@
# This file is distributed under the same license as the redshift package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: redshift\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-02-02 00:50+0100\n"
"PO-Revision-Date: 2010-02-02 21:12+0000\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/redshift\n"
"POT-Creation-Date: 2010-02-10 21:19+0100\n"
"PO-Revision-Date: 2010-02-02 09:20+0000\n"
"Last-Translator: Gregory Petrosyan <gregory.petrosyan@gmail.com>\n"
"Language-Team: Russian <ru@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"#-#-#-#-# ru.po (redshift) #-#-#-#-#\n"
"X-Launchpad-Export-Date: 2010-02-03 04:52+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"#-#-#-#-# ru.po (redshift) #-#-#-#-#\n"
"X-Launchpad-Export-Date: 2010-02-03 04:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: src/redshift.c:172
#, c-format
@@ -177,17 +182,6 @@ msgstr "Цветовая температура: %uK\n"
msgid "Temperature adjustment failed.\n"
msgstr "Корректировка цветовой температуры не удалась.\n"
#: src/vidmode.c:42 src/vidmode.c:54 src/vidmode.c:64 src/vidmode.c:94
#: src/vidmode.c:125 src/vidmode.c:154
#, c-format
msgid "X request failed: %s\n"
msgstr "Запрос X не удался: %s\n"
#: src/vidmode.c:71 src/randr.c:157
#, c-format
msgid "Gamma ramp size too small: %i\n"
msgstr "Размер кривой гаммы слишком мал: %i\n"
#: src/randr.c:57 src/randr.c:104 src/randr.c:144 src/randr.c:172
#: src/randr.c:231 src/randr.c:283
#, c-format
@@ -204,7 +198,22 @@ msgstr "Неподдерживаемая версия RANDR (%u.%u)\n"
msgid "Screen %i could not be found.\n"
msgstr "Экран %i не может быть найден.\n"
#: src/randr.c:157 src/vidmode.c:71
#, c-format
msgid "Gamma ramp size too small: %i\n"
msgstr "Размер кривой гаммы слишком мал: %i\n"
#: src/randr.c:233
#, c-format
msgid "Unable to restore CRTC %i\n"
msgstr "Не удается восстановить CRTC %i\n"
#: src/vidmode.c:42 src/vidmode.c:54 src/vidmode.c:64 src/vidmode.c:94
#: src/vidmode.c:125 src/vidmode.c:154
#, c-format
msgid "X request failed: %s\n"
msgstr "Запрос X не удался: %s\n"
#: src/gtk-redshift/gtk-redshift.py:59
msgid "Toggle"
msgstr "Включить / Выключить"