summaryrefslogtreecommitdiff
path: root/po/ca.po
diff options
context:
space:
mode:
authorMikael Magnusson <mikachu@comhem.se>2008-01-29 14:04:31 +0100
committerMikael Magnusson <mikachu@comhem.se>2008-01-29 14:06:35 +0100
commit2570d8f25fcbfbae344b33cd63774a37c952d6eb (patch)
treea8dd4f12a46b30d09f1d48c43523bcefe25af318 /po/ca.po
parent1d0bcd8a68276012189090a52718d7bf892c27e7 (diff)
Mark translations without the new desktop number mismatch message as 3.4.5.
Update swedish translation with them. [ I mistakenly originally made this commit on 3.4-working (commit 7f514044f7fb8f5c2948d9b3da837a9b46717ee5) so the changes got lost on a subsequent merge from backport when we usually overwrite po/. ]
Diffstat (limited to 'po/ca.po')
-rw-r--r--po/ca.po17
1 files changed, 12 insertions, 5 deletions
diff --git a/po/ca.po b/po/ca.po
index 4c556c77..25f9f331 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Openbox 3.4.2\n"
"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2008-01-17 22:13+0100\n"
+"POT-Creation-Date: 2008-01-25 03:51+0100\n"
"PO-Revision-Date: 2007-05-28 15:54+0200\n"
"Last-Translator: David Majà Martínez <davidmaja@gmail.com>\n"
"Language-Team: catalan\n"
@@ -25,7 +25,7 @@ msgstr "L'acció sollicitada '%s' no és vàlida. Aquesta acció no existeix."
msgid "Failed to convert the path '%s' from utf8"
msgstr "No s'ha pogut convertir el camí '%s' des de utf8"
-#: openbox/actions/execute.c:97 openbox/actions/execute.c:115
+#: openbox/actions/execute.c:97 openbox/actions/execute.c:116
#, c-format
msgid "Failed to execute '%s': %s"
msgstr "No s'ha pogut executar '%s': %s"
@@ -296,7 +296,7 @@ msgstr ""
"\n"
"Informeu dels errors a %s\n"
-#: openbox/openbox.c:604
+#: openbox/openbox.c:602
#, c-format
msgid "Invalid command line argument '%s'\n"
msgstr "Opció '%s' no vàlida a la línia d'ordres\n"
@@ -317,7 +317,14 @@ msgstr ""
msgid "The WM on screen %d is not exiting"
msgstr "El gestor de finestres de la pantalla %d no està sortint"
-#: openbox/screen.c:1162
+#: openbox/screen.c:407
+#, c-format
+msgid ""
+"Openbox is configured for %d desktops, but the current session has %d. "
+"Overriding the Openbox configuration."
+msgstr ""
+
+#: openbox/screen.c:1168
#, c-format
msgid "desktop %i"
msgstr "escriptori %i"
@@ -337,7 +344,7 @@ msgstr "No s'ha pogut desar la sessió a '%s': %s"
msgid "Error while saving the session to '%s': %s"
msgstr "S'ha produït un error mentre es desava la sessió a '%s': %s"
-#: openbox/startupnotify.c:237
+#: openbox/startupnotify.c:241
#, c-format
msgid "Running %s\n"
msgstr "Executant %s\n"