From 5956b1358854f19f5b30d123e9edc8cf123f2238 Mon Sep 17 00:00:00 2001 From: Yaron Shahrabani Date: Thu, 10 Mar 2011 18:45:10 +0200 Subject: [PATCH 01/44] Updated Hebrew translation. --- po/he.po | 177 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 99 insertions(+), 78 deletions(-) diff --git a/po/he.po b/po/he.po index e5b3cc3a4..08a4d69fb 100644 --- a/po/he.po +++ b/po/he.po @@ -8,14 +8,17 @@ msgid "" msgstr "" "Project-Id-Version: gnome-shell master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-02 19:57+0200\n" -"PO-Revision-Date: 2011-03-02 19:58+0200\n" +"POT-Creation-Date: 2011-03-10 18:43+0200\n" +"PO-Revision-Date: 2011-03-10 18:45+0200\n" "Last-Translator: Yaron Shahrabani \n" -"Language-Team: Hebrew \n" +"Language-Team: Hebrew \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n>2||n==0) ? 1 :2;\n" +"X-Poedit-Language: Hebrew\n" +"X-Poedit-Country: ISRAEL\n" +"X-Poedit-SourceCharset: UTF-8\n" #: ../data/gnome-shell.desktop.in.in.h:1 msgid "GNOME Shell" @@ -188,27 +191,27 @@ msgid "Execution of '%s' failed:" msgstr "ההרצה של '%s' נכשלה:" #. Translators: Filter to display all applications -#: ../js/ui/appDisplay.js:195 +#: ../js/ui/appDisplay.js:226 msgid "All" msgstr "הכול" -#: ../js/ui/appDisplay.js:282 +#: ../js/ui/appDisplay.js:324 msgid "APPLICATIONS" msgstr "יישומים" -#: ../js/ui/appDisplay.js:312 +#: ../js/ui/appDisplay.js:350 msgid "SETTINGS" msgstr "הגדרות" -#: ../js/ui/appDisplay.js:572 +#: ../js/ui/appDisplay.js:612 msgid "New Window" msgstr "חלון חדש" -#: ../js/ui/appDisplay.js:575 +#: ../js/ui/appDisplay.js:615 msgid "Remove from Favorites" msgstr "הסרה מהמועדפים" -#: ../js/ui/appDisplay.js:576 +#: ../js/ui/appDisplay.js:616 msgid "Add to Favorites" msgstr "הוספה למועדפים" @@ -368,7 +371,7 @@ msgstr "השבוע" msgid "Next week" msgstr "בשבוע הבא" -#: ../js/ui/dash.js:174 +#: ../js/ui/dash.js:174 ../js/ui/messageTray.js:931 msgid "Remove" msgstr "הסרה" @@ -376,54 +379,54 @@ msgstr "הסרה" msgid "Date and Time Settings" msgstr "הגדרות תאריך ושעה" -#: ../js/ui/dateMenu.js:110 +#: ../js/ui/dateMenu.js:111 msgid "Open Calendar" msgstr "פתיחת היומן" #. Translators: This is the time format with date used #. in 24-hour mode. -#: ../js/ui/dateMenu.js:162 +#: ../js/ui/dateMenu.js:164 msgid "%a %b %e, %R:%S" msgstr "%a %b %e, %R:%S" -#: ../js/ui/dateMenu.js:163 +#: ../js/ui/dateMenu.js:165 msgid "%a %b %e, %R" msgstr "%a %b %e, %R" #. Translators: This is the time format without date used #. in 24-hour mode. -#: ../js/ui/dateMenu.js:167 +#: ../js/ui/dateMenu.js:169 msgid "%a %R:%S" msgstr "%a %R:%S" -#: ../js/ui/dateMenu.js:168 +#: ../js/ui/dateMenu.js:170 msgid "%a %R" msgstr "%a %R" #. Translators: This is a time format with date used #. for AM/PM. -#: ../js/ui/dateMenu.js:175 +#: ../js/ui/dateMenu.js:177 msgid "%a %b %e, %l:%M:%S %p" msgstr "%a %b %e, %l:%M:%S %p" -#: ../js/ui/dateMenu.js:176 +#: ../js/ui/dateMenu.js:178 msgid "%a %b %e, %l:%M %p" msgstr "%a %b %e, %l:%M %p" #. Translators: This is a time format without date used #. for AM/PM. -#: ../js/ui/dateMenu.js:180 +#: ../js/ui/dateMenu.js:182 msgid "%a %l:%M:%S %p" msgstr "%a %l:%M:%S %p" -#: ../js/ui/dateMenu.js:181 +#: ../js/ui/dateMenu.js:183 msgid "%a %l:%M %p" msgstr "%a %l:%M %p" #. Translators: This is the date format to use when the calendar popup is #. * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM"). #. -#: ../js/ui/dateMenu.js:207 +#: ../js/ui/dateMenu.js:209 msgid "%A %B %e, %Y" msgstr "%A ה־%e ב%B, %Y" @@ -500,37 +503,41 @@ msgstr "אישור" msgid "Cancel" msgstr "ביטול" -#: ../js/ui/lookingGlass.js:587 +#: ../js/ui/lookingGlass.js:588 msgid "No extensions installed" msgstr "לא מותקנות הרחבות" -#: ../js/ui/lookingGlass.js:624 +#: ../js/ui/lookingGlass.js:625 msgid "Enabled" msgstr "פעיל" #. translators: #. * The device has been disabled -#: ../js/ui/lookingGlass.js:626 ../src/gvc/gvc-mixer-control.c:1087 +#: ../js/ui/lookingGlass.js:627 ../src/gvc/gvc-mixer-control.c:1087 msgid "Disabled" msgstr "מנוטרל" -#: ../js/ui/lookingGlass.js:628 +#: ../js/ui/lookingGlass.js:629 msgid "Error" msgstr "שגיאה" -#: ../js/ui/lookingGlass.js:630 +#: ../js/ui/lookingGlass.js:631 msgid "Out of date" msgstr "לא בתוקף" -#: ../js/ui/lookingGlass.js:655 +#: ../js/ui/lookingGlass.js:656 msgid "View Source" msgstr "צפייה במקור" -#: ../js/ui/lookingGlass.js:661 +#: ../js/ui/lookingGlass.js:662 msgid "Web Page" msgstr "דף אינטרנט" -#: ../js/ui/messageTray.js:1902 +#: ../js/ui/messageTray.js:924 +msgid "Open" +msgstr "פתיחה" + +#: ../js/ui/messageTray.js:1961 msgid "System Information" msgstr "פרטי המערכת" @@ -546,18 +553,28 @@ msgstr "חלונות" msgid "Applications" msgstr "יישומים" +#. Translators: this is the name of the dock/favorites area on +#. the left of the overview +#: ../js/ui/overview.js:202 +msgid "Dash" +msgstr "חלונית" + #. TODO - _quit() doesn't really work on apps in state STARTING yet -#: ../js/ui/panel.js:529 +#: ../js/ui/panel.js:560 #, c-format msgid "Quit %s" msgstr "יציאה מ־%s" #. Button on the left side of the panel. #. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview". -#: ../js/ui/panel.js:897 +#: ../js/ui/panel.js:919 msgid "Activities" msgstr "פעילויות" +#: ../js/ui/panel.js:1020 +msgid "Panel" +msgstr "לוח" + #: ../js/ui/placeDisplay.js:122 #, c-format msgid "Failed to unmount '%s'" @@ -580,7 +597,7 @@ msgstr "מקומות והתקנים" #. "ON" and "OFF") or "toggle-switch-intl" (for toggle #. switches containing "◯" and "|"). Other values will #. simply result in invisible toggle switches. -#: ../js/ui/popupMenu.js:612 +#: ../js/ui/popupMenu.js:618 msgid "toggle-switch-us" msgstr "toggle-switch-intl" @@ -588,91 +605,91 @@ msgstr "toggle-switch-intl" msgid "Please enter a command:" msgstr "נא להזין פקודה:" -#: ../js/ui/searchDisplay.js:295 +#: ../js/ui/searchDisplay.js:283 msgid "Searching..." msgstr "בחיפוש..." -#: ../js/ui/searchDisplay.js:309 +#: ../js/ui/searchDisplay.js:297 msgid "No matching results." msgstr "אין תוצאות תואמות." -#: ../js/ui/statusMenu.js:102 ../js/ui/statusMenu.js:166 +#: ../js/ui/statusMenu.js:113 ../js/ui/statusMenu.js:177 msgid "Power Off..." msgstr "כיבוי..." -#: ../js/ui/statusMenu.js:104 ../js/ui/statusMenu.js:165 +#: ../js/ui/statusMenu.js:115 ../js/ui/statusMenu.js:176 msgid "Suspend" msgstr "השהיה" -#: ../js/ui/statusMenu.js:125 +#: ../js/ui/statusMenu.js:136 msgid "Available" msgstr "זמין" -#: ../js/ui/statusMenu.js:130 +#: ../js/ui/statusMenu.js:141 msgid "Busy" msgstr "עסוק" -#: ../js/ui/statusMenu.js:138 +#: ../js/ui/statusMenu.js:149 msgid "My Account" msgstr "החשבון שלי" -#: ../js/ui/statusMenu.js:142 +#: ../js/ui/statusMenu.js:153 msgid "System Settings" msgstr "הגדרות המערכת" -#: ../js/ui/statusMenu.js:149 +#: ../js/ui/statusMenu.js:160 msgid "Lock Screen" msgstr "נעילת המסך" -#: ../js/ui/statusMenu.js:153 +#: ../js/ui/statusMenu.js:164 msgid "Switch User" msgstr "החלפת משתמש" -#: ../js/ui/statusMenu.js:158 +#: ../js/ui/statusMenu.js:169 msgid "Log Out..." msgstr "ניתוק..." -#: ../js/ui/status/accessibility.js:81 +#: ../js/ui/status/accessibility.js:62 msgid "Zoom" msgstr "תקריב" -#: ../js/ui/status/accessibility.js:88 +#: ../js/ui/status/accessibility.js:69 msgid "Screen Reader" msgstr "מקריא מסך" -#: ../js/ui/status/accessibility.js:92 +#: ../js/ui/status/accessibility.js:73 msgid "Screen Keyboard" msgstr "מקלדת מסך" -#: ../js/ui/status/accessibility.js:96 +#: ../js/ui/status/accessibility.js:77 msgid "Visual Alerts" msgstr "התראות חזותיות" -#: ../js/ui/status/accessibility.js:99 +#: ../js/ui/status/accessibility.js:80 msgid "Sticky Keys" msgstr "מקשים דביקים" -#: ../js/ui/status/accessibility.js:102 +#: ../js/ui/status/accessibility.js:83 msgid "Slow Keys" msgstr "מקשים אטיים" -#: ../js/ui/status/accessibility.js:105 +#: ../js/ui/status/accessibility.js:86 msgid "Bounce Keys" msgstr "מקשים קופצים" -#: ../js/ui/status/accessibility.js:108 +#: ../js/ui/status/accessibility.js:89 msgid "Mouse Keys" msgstr "מקשי עכבר" -#: ../js/ui/status/accessibility.js:112 +#: ../js/ui/status/accessibility.js:93 msgid "Universal Access Settings" msgstr "הגדרות גישה אוניברסלית" -#: ../js/ui/status/accessibility.js:164 +#: ../js/ui/status/accessibility.js:145 msgid "High Contrast" msgstr "ניגודיות גבוהה" -#: ../js/ui/status/accessibility.js:209 +#: ../js/ui/status/accessibility.js:182 msgid "Large Text" msgstr "טקסט גדול" @@ -843,51 +860,51 @@ msgstr[0] "דקה אחת נותרה" msgstr[1] "%d דקות נותרו" msgstr[2] "שתי דקות נותרו" -#: ../js/ui/status/power.js:241 +#: ../js/ui/status/power.js:227 msgid "AC adapter" msgstr "מתאם חשמל" -#: ../js/ui/status/power.js:243 +#: ../js/ui/status/power.js:229 msgid "Laptop battery" msgstr "סוללת נייד" -#: ../js/ui/status/power.js:245 +#: ../js/ui/status/power.js:231 msgid "UPS" msgstr "אל־פסק" -#: ../js/ui/status/power.js:247 +#: ../js/ui/status/power.js:233 msgid "Monitor" msgstr "צג" -#: ../js/ui/status/power.js:249 +#: ../js/ui/status/power.js:235 msgid "Mouse" msgstr "עכבר" -#: ../js/ui/status/power.js:251 +#: ../js/ui/status/power.js:237 msgid "Keyboard" msgstr "מקלדת" -#: ../js/ui/status/power.js:253 +#: ../js/ui/status/power.js:239 msgid "PDA" msgstr "מחשב כף יד" -#: ../js/ui/status/power.js:255 +#: ../js/ui/status/power.js:241 msgid "Cell phone" msgstr "טלפון סלולרי" -#: ../js/ui/status/power.js:257 +#: ../js/ui/status/power.js:243 msgid "Media player" msgstr "נגן מדיה" -#: ../js/ui/status/power.js:259 +#: ../js/ui/status/power.js:245 msgid "Tablet" msgstr "טבלת שליטה" -#: ../js/ui/status/power.js:261 +#: ../js/ui/status/power.js:247 msgid "Computer" msgstr "מחשב" -#: ../js/ui/status/power.js:263 ../src/shell-app-system.c:1013 +#: ../js/ui/status/power.js:249 ../src/shell-app-system.c:1013 msgid "Unknown" msgstr "לא ידוע" @@ -922,7 +939,7 @@ msgstr "%s עסוק/ה." #. Translators: this is a time format string followed by a date. #. If applicable, replace %X with a strftime format valid for your #. locale, without seconds. -#: ../js/ui/telepathyClient.js:348 +#: ../js/ui/telepathyClient.js:357 #, no-c-format msgid "Sent at %X on %A" msgstr "נשלח ב־%X בשעה %A" @@ -931,16 +948,20 @@ msgstr "נשלח ב־%X בשעה %A" #. in the search entry when no search is #. active; it should not exceed ~30 #. characters. -#: ../js/ui/viewSelector.js:103 +#: ../js/ui/viewSelector.js:117 msgid "Type to search..." msgstr "יש להקליד כדי לחפש..." -#: ../js/ui/windowAttentionHandler.js:43 +#: ../js/ui/viewSelector.js:137 ../src/shell-util.c:250 +msgid "Search" +msgstr "חיפוש" + +#: ../js/ui/windowAttentionHandler.js:42 #, c-format msgid "%s has finished starting" msgstr "%s סיים את תהליך ההתחלה" -#: ../js/ui/windowAttentionHandler.js:45 +#: ../js/ui/windowAttentionHandler.js:44 #, c-format msgid "'%s' is ready" msgstr "'%s' מוכן" @@ -969,11 +990,15 @@ msgstr[2] "2 קלטים" msgid "System Sounds" msgstr "צלילי מערכת" -#: ../src/shell-global.c:1298 +#: ../src/main.c:395 +msgid "Print version" +msgstr "Print version" + +#: ../src/shell-global.c:1308 msgid "Less than a minute ago" msgstr "לפני פחות מדקה" -#: ../src/shell-global.c:1302 +#: ../src/shell-global.c:1312 #, c-format msgid "%d minute ago" msgid_plural "%d minutes ago" @@ -981,7 +1006,7 @@ msgstr[0] "לפני דקה" msgstr[1] "לפני %d דקות" msgstr[2] "לפני 2 דקות" -#: ../src/shell-global.c:1307 +#: ../src/shell-global.c:1317 #, c-format msgid "%d hour ago" msgid_plural "%d hours ago" @@ -989,7 +1014,7 @@ msgstr[0] "לפני שעה" msgstr[1] "לפני %d שעות" msgstr[2] "לפני שעתיים" -#: ../src/shell-global.c:1312 +#: ../src/shell-global.c:1322 #, c-format msgid "%d day ago" msgid_plural "%d days ago" @@ -997,7 +1022,7 @@ msgstr[0] "לפני יום" msgstr[1] "לפני %d ימים" msgstr[2] "לפני יומיים" -#: ../src/shell-global.c:1317 +#: ../src/shell-global.c:1327 #, c-format msgid "%d week ago" msgid_plural "%d weeks ago" @@ -1019,10 +1044,6 @@ msgstr "תיקיית הבית" msgid "File System" msgstr "מערכת הקבצים" -#: ../src/shell-util.c:250 -msgid "Search" -msgstr "חיפוש" - #. Translators: the first string is the name of a gvfs #. * method, and the second string is a path. For #. * example, "Trash: some-directory". It means that the From eda8a94d5b0ab8e27182325858c86ebcab2d31bd Mon Sep 17 00:00:00 2001 From: Daniel Mustieles Date: Thu, 10 Mar 2011 19:14:39 +0100 Subject: [PATCH 02/44] Updated Spanish translation --- po/es.po | 82 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/po/es.po b/po/es.po index 165fe87f3..742c329e5 100644 --- a/po/es.po +++ b/po/es.po @@ -2,6 +2,7 @@ # Copyright (C) 2009 gnome-shell's COPYRIGHT HOLDER # This file is distributed under the same license as the gnome-shell package. # Jorge González , 2009, 2010, 2011. +# Benjamín Valero Espinosa , 2011. # Daniel Mustieles , 2010, 2011. # msgid "" @@ -9,8 +10,8 @@ msgstr "" "Project-Id-Version: gnome-shell.master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "shell&component=general\n" -"POT-Creation-Date: 2011-03-09 18:36+0000\n" -"PO-Revision-Date: 2011-03-09 19:37+0100\n" +"POT-Creation-Date: 2011-03-09 21:00+0000\n" +"PO-Revision-Date: 2011-03-10 10:59+0100\n" "Last-Translator: Daniel Mustieles \n" "Language-Team: Español \n" "MIME-Version: 1.0\n" @@ -95,16 +96,16 @@ msgid "" "at the optimal thread count on the system." msgstr "" "Establece la tubería GStreamer usada para codificar grabaciones. Sigue la " -"sintaxis usada para gst-launch. La tubería debería tener un sumidero " -"(«sink») de ensamblaje/sesensamblaje donde el vídeo que se está grabando se " -"graba. Generalmente tendrá un origen de ensamblado/desensamblado; la salida " -"de ese punto se escibirá en el archivo de salida. No obstante la tubería " -"también puede tomar parte en su propia salida; esto se puede usar para " -"enviar la salida a un servidor «icecast» a través de shout2send o similar. " -"Cuando no está establecido o lo está a un valor vacío, se usará la tubería " -"predeterminada. Actualmente es «videorate ! vp8enc quality=10 speed=2 " -"threads=%T ! queue ! webmmux» y greba en WEBM usando el códec VP8. Se usa %T " -"como suposición para el número de hilos óptimos en el sistema." +"sintaxis usada para gst-launch. La tubería debería tener un sumidero («sink») " +"de ensamblaje/sesensamblaje donde el vídeo que se está grabando se graba. " +"Generalmente tendrá un origen de ensamblado/desensamblado; la salida de ese " +"punto se escibirá en el archivo de salida. No obstante la tubería también " +"puede tomar parte en su propia salida; esto se puede usar para enviar la " +"salida a un servidor «icecast» a través de shout2send o similar. Cuando no " +"está establecido o lo está a un valor vacío, se usará la tubería " +"predeterminada. Actualmente es «videorate ! vp8enc quality=10 speed=2 threads=" +"%T ! queue ! webmmux» y greba en WEBM usando el códec VP8. Se usa %T como " +"suposición para el número de hilos óptimos en el sistema." #: ../data/org.gnome.shell.gschema.xml.in.h:14 msgid "Show date in clock" @@ -373,7 +374,7 @@ msgstr "Esta semana" msgid "Next week" msgstr "La semana que viene" -#: ../js/ui/dash.js:174 ../js/ui/messageTray.js:933 +#: ../js/ui/dash.js:174 ../js/ui/messageTray.js:931 msgid "Remove" msgstr "Quitar" @@ -476,7 +477,7 @@ msgstr "Pulse «Apagar» para salir de esas aplicaciones y apagar el sistema." #: ../js/ui/endSessionDialog.js:76 #, c-format msgid "The system will shut down automatically in %d seconds." -msgstr "El sistema se apagará automáticamente en %d segundo." +msgstr "El sistema se apagará automáticamente en %d segundos." #: ../js/ui/endSessionDialog.js:77 msgid "Shutting down the system." @@ -538,11 +539,11 @@ msgstr "Ver fuente" msgid "Web Page" msgstr "Página web" -#: ../js/ui/messageTray.js:926 +#: ../js/ui/messageTray.js:924 msgid "Open" msgstr "Abrir" -#: ../js/ui/messageTray.js:1963 +#: ../js/ui/messageTray.js:1961 msgid "System Information" msgstr "Información del sistema" @@ -618,39 +619,39 @@ msgstr "Buscando…" msgid "No matching results." msgstr "No se encontró ningún resultado coincidente." -#: ../js/ui/statusMenu.js:102 ../js/ui/statusMenu.js:166 +#: ../js/ui/statusMenu.js:113 ../js/ui/statusMenu.js:177 msgid "Power Off..." msgstr "Apagar…" -#: ../js/ui/statusMenu.js:104 ../js/ui/statusMenu.js:165 +#: ../js/ui/statusMenu.js:115 ../js/ui/statusMenu.js:176 msgid "Suspend" msgstr "Suspender" -#: ../js/ui/statusMenu.js:125 +#: ../js/ui/statusMenu.js:136 msgid "Available" msgstr "Disponible" -#: ../js/ui/statusMenu.js:130 +#: ../js/ui/statusMenu.js:141 msgid "Busy" msgstr "Ocupado" -#: ../js/ui/statusMenu.js:138 +#: ../js/ui/statusMenu.js:149 msgid "My Account" msgstr "Mi cuenta" -#: ../js/ui/statusMenu.js:142 +#: ../js/ui/statusMenu.js:153 msgid "System Settings" msgstr "Configuración del sistema" -#: ../js/ui/statusMenu.js:149 +#: ../js/ui/statusMenu.js:160 msgid "Lock Screen" msgstr "Bloquear la pantalla" -#: ../js/ui/statusMenu.js:153 +#: ../js/ui/statusMenu.js:164 msgid "Switch User" msgstr "Cambiar de usuario" -#: ../js/ui/statusMenu.js:158 +#: ../js/ui/statusMenu.js:169 msgid "Log Out..." msgstr "Cerrar la sesión…" @@ -696,7 +697,7 @@ msgstr "Contraste alto" #: ../js/ui/status/accessibility.js:182 msgid "Large Text" -msgstr "Texto:" +msgstr "Texto grande" #: ../js/ui/status/bluetooth.js:42 ../js/ui/status/bluetooth.js:241 #: ../js/ui/status/bluetooth.js:337 ../js/ui/status/bluetooth.js:371 @@ -851,7 +852,7 @@ msgstr[1] "horas" #: ../js/ui/status/power.js:122 msgid "minute" msgid_plural "minutes" -msgstr[0] "miuto" +msgstr[0] "minuto" msgstr[1] "minutos" #: ../js/ui/status/power.js:125 @@ -940,7 +941,7 @@ msgstr "%s está ocupado/a." #. Translators: this is a time format string followed by a date. #. If applicable, replace %X with a strftime format valid for your #. locale, without seconds. -#: ../js/ui/telepathyClient.js:348 +#: ../js/ui/telepathyClient.js:357 #, no-c-format msgid "Sent at %X on %A" msgstr "Enviado a las %X el %A" @@ -1223,8 +1224,8 @@ msgstr "%1$s: %2$s" #~ "If true and format is either \"12-hour\" or \"24-hour\", display seconds " #~ "in time." #~ msgstr "" -#~ "Si es cierta y el formato es «12-horas» o «24-horas», muestra los " -#~ "segundos en la hora." +#~ "Si es cierta y el formato es «12-horas» o «24-horas», muestra los segundos " +#~ "en la hora." #~ msgid "" #~ "This key specifies the format used by the panel clock when the format key " @@ -1241,19 +1242,18 @@ msgstr "%1$s: %2$s" #~ msgid "" #~ "This key specifies the hour format used by the panel clock. Possible " #~ "values are \"12-hour\", \"24-hour\", \"unix\" and \"custom\". If set to " -#~ "\"unix\", the clock will display time in seconds since Epoch, i.e. " -#~ "1970-01-01. If set to \"custom\", the clock will display time according " -#~ "to the format specified in the custom_format key. Note that if set to " -#~ "either \"unix\" or \"custom\", the show_date and show_seconds keys are " -#~ "ignored." +#~ "\"unix\", the clock will display time in seconds since Epoch, i.e. 1970-" +#~ "01-01. If set to \"custom\", the clock will display time according to the " +#~ "format specified in the custom_format key. Note that if set to either " +#~ "\"unix\" or \"custom\", the show_date and show_seconds keys are ignored." #~ msgstr "" #~ "Esta clave especifica el formato de la hora especificado por el reloj del " -#~ "panel. Los valores posibles son «12-hour» (12 horas), «24-hour» (24 " -#~ "horas), «unix» y «custom» (personalizado).Si se establece a «unix» el " -#~ "reloj mostrará la hora en segundos desde la época (1 de enero de 1970). " -#~ "Si se establece a «custom» el reloj mostrará la hora según el formato " -#~ "especificado en la clave «custom_format». Note que si se establece a " -#~ "«unix» o «custom» se ignoran las claves «show_date» y «show_seconds»." +#~ "panel. Los valores posibles son «12-hour» (12 horas), «24-hour» (24 horas), " +#~ "«unix» y «custom» (personalizado).Si se establece a «unix» el reloj mostrará " +#~ "la hora en segundos desde la época (1 de enero de 1970). Si se establece " +#~ "a «custom» el reloj mostrará la hora según el formato especificado en la " +#~ "clave «custom_format». Note que si se establece a «unix» o «custom» se " +#~ "ignoran las claves «show_date» y «show_seconds»." #~ msgid "Clock Format" #~ msgstr "Formato del reloj" From 9f5584a1578498331578c5afd6657326b0519369 Mon Sep 17 00:00:00 2001 From: Daniel Korostil Date: Thu, 10 Mar 2011 20:19:44 +0200 Subject: [PATCH 03/44] Uploaded Ukranian --- po/uk.po | 172 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 95 insertions(+), 77 deletions(-) diff --git a/po/uk.po b/po/uk.po index f935beb1b..a32ca198c 100644 --- a/po/uk.po +++ b/po/uk.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: gnome-shell master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-02 17:36+0200\n" -"PO-Revision-Date: 2011-03-02 17:37+0300\n" +"POT-Creation-Date: 2011-03-10 18:48+0200\n" +"PO-Revision-Date: 2011-03-10 20:18+0300\n" "Last-Translator: Korostil Daniel \n" "Language-Team: translation@linux.org.ua\n" "Language: uk\n" @@ -193,27 +193,27 @@ msgid "Execution of '%s' failed:" msgstr "Не вдалось виконати «%s»:" #. Translators: Filter to display all applications -#: ../js/ui/appDisplay.js:195 +#: ../js/ui/appDisplay.js:226 msgid "All" msgstr "Всі" -#: ../js/ui/appDisplay.js:282 +#: ../js/ui/appDisplay.js:324 msgid "APPLICATIONS" msgstr "ПРОГРАМИ" -#: ../js/ui/appDisplay.js:312 +#: ../js/ui/appDisplay.js:350 msgid "SETTINGS" msgstr "ПАРАМЕТРИ" -#: ../js/ui/appDisplay.js:572 +#: ../js/ui/appDisplay.js:612 msgid "New Window" msgstr "Нове вікно" -#: ../js/ui/appDisplay.js:575 +#: ../js/ui/appDisplay.js:615 msgid "Remove from Favorites" msgstr "Вилучити з улюбленого" -#: ../js/ui/appDisplay.js:576 +#: ../js/ui/appDisplay.js:616 msgid "Add to Favorites" msgstr "Додати до улюбленого" @@ -373,7 +373,7 @@ msgstr "Цей тиждень" msgid "Next week" msgstr "Наступний тиждень" -#: ../js/ui/dash.js:174 +#: ../js/ui/dash.js:174 ../js/ui/messageTray.js:931 msgid "Remove" msgstr "Вилучити" @@ -381,54 +381,54 @@ msgstr "Вилучити" msgid "Date and Time Settings" msgstr "Параметри дати і часу" -#: ../js/ui/dateMenu.js:110 +#: ../js/ui/dateMenu.js:111 msgid "Open Calendar" msgstr "Відкрити календар" #. Translators: This is the time format with date used #. in 24-hour mode. -#: ../js/ui/dateMenu.js:162 +#: ../js/ui/dateMenu.js:164 msgid "%a %b %e, %R:%S" msgstr "%a %b %e, %R:%S" -#: ../js/ui/dateMenu.js:163 +#: ../js/ui/dateMenu.js:165 msgid "%a %b %e, %R" msgstr "%a %b %e, %R" #. Translators: This is the time format without date used #. in 24-hour mode. -#: ../js/ui/dateMenu.js:167 +#: ../js/ui/dateMenu.js:169 msgid "%a %R:%S" msgstr "%a %R:%S" -#: ../js/ui/dateMenu.js:168 +#: ../js/ui/dateMenu.js:170 msgid "%a %R" msgstr "%a %R" #. Translators: This is a time format with date used #. for AM/PM. -#: ../js/ui/dateMenu.js:175 +#: ../js/ui/dateMenu.js:177 msgid "%a %b %e, %l:%M:%S %p" msgstr "%a %b %e, %l:%M:%S %p" -#: ../js/ui/dateMenu.js:176 +#: ../js/ui/dateMenu.js:178 msgid "%a %b %e, %l:%M %p" msgstr "%a %b %e, %l:%M %p" #. Translators: This is a time format without date used #. for AM/PM. -#: ../js/ui/dateMenu.js:180 +#: ../js/ui/dateMenu.js:182 msgid "%a %l:%M:%S %p" msgstr "%a %l:%M:%S %p" -#: ../js/ui/dateMenu.js:181 +#: ../js/ui/dateMenu.js:183 msgid "%a %l:%M %p" msgstr "%a %l:%M %p" #. Translators: This is the date format to use when the calendar popup is #. * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM"). #. -#: ../js/ui/dateMenu.js:207 +#: ../js/ui/dateMenu.js:209 msgid "%A %B %e, %Y" msgstr "%A %B %e, %Y" @@ -506,37 +506,41 @@ msgstr "Підтвердити" msgid "Cancel" msgstr "Скасувати" -#: ../js/ui/lookingGlass.js:587 +#: ../js/ui/lookingGlass.js:588 msgid "No extensions installed" msgstr "Не встановлено розширення" -#: ../js/ui/lookingGlass.js:624 +#: ../js/ui/lookingGlass.js:625 msgid "Enabled" msgstr "Увімкнено" #. translators: #. * The device has been disabled -#: ../js/ui/lookingGlass.js:626 ../src/gvc/gvc-mixer-control.c:1087 +#: ../js/ui/lookingGlass.js:627 ../src/gvc/gvc-mixer-control.c:1087 msgid "Disabled" msgstr "Вимкнено" -#: ../js/ui/lookingGlass.js:628 +#: ../js/ui/lookingGlass.js:629 msgid "Error" msgstr "Помилка" -#: ../js/ui/lookingGlass.js:630 +#: ../js/ui/lookingGlass.js:631 msgid "Out of date" msgstr "Застаріло" -#: ../js/ui/lookingGlass.js:655 +#: ../js/ui/lookingGlass.js:656 msgid "View Source" msgstr "Переглянути джерело" -#: ../js/ui/lookingGlass.js:661 +#: ../js/ui/lookingGlass.js:662 msgid "Web Page" msgstr "Веб-сторінка" -#: ../js/ui/messageTray.js:1902 +#: ../js/ui/messageTray.js:924 +msgid "Open" +msgstr "Відкрити" + +#: ../js/ui/messageTray.js:1961 msgid "System Information" msgstr "Інформація про систему" @@ -552,18 +556,28 @@ msgstr "Вікна" msgid "Applications" msgstr "Програми" +#. Translators: this is the name of the dock/favorites area on +#. the left of the overview +#: ../js/ui/overview.js:202 +msgid "Dash" +msgstr "Риска" + #. TODO - _quit() doesn't really work on apps in state STARTING yet -#: ../js/ui/panel.js:529 +#: ../js/ui/panel.js:560 #, c-format msgid "Quit %s" msgstr "Вийти з %s" #. Button on the left side of the panel. #. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview". -#: ../js/ui/panel.js:897 +#: ../js/ui/panel.js:919 msgid "Activities" msgstr "Дії" +#: ../js/ui/panel.js:1020 +msgid "Panel" +msgstr "Панель" + #: ../js/ui/placeDisplay.js:122 #, c-format msgid "Failed to unmount '%s'" @@ -586,7 +600,7 @@ msgstr "МІСЦЯ ТА ПРИСТРОЇ" #. "ON" and "OFF") or "toggle-switch-intl" (for toggle #. switches containing "◯" and "|"). Other values will #. simply result in invisible toggle switches. -#: ../js/ui/popupMenu.js:612 +#: ../js/ui/popupMenu.js:618 msgid "toggle-switch-us" msgstr "toggle-switch-intl" @@ -594,91 +608,91 @@ msgstr "toggle-switch-intl" msgid "Please enter a command:" msgstr "Будь ласка, введіть команду:" -#: ../js/ui/searchDisplay.js:295 +#: ../js/ui/searchDisplay.js:283 msgid "Searching..." msgstr "Пошук…" -#: ../js/ui/searchDisplay.js:309 +#: ../js/ui/searchDisplay.js:297 msgid "No matching results." msgstr "Нема збігів." -#: ../js/ui/statusMenu.js:102 ../js/ui/statusMenu.js:166 +#: ../js/ui/statusMenu.js:113 ../js/ui/statusMenu.js:177 msgid "Power Off..." msgstr "Вимкнення живлення…" -#: ../js/ui/statusMenu.js:104 ../js/ui/statusMenu.js:165 +#: ../js/ui/statusMenu.js:115 ../js/ui/statusMenu.js:176 msgid "Suspend" msgstr "Призупинити" -#: ../js/ui/statusMenu.js:125 +#: ../js/ui/statusMenu.js:136 msgid "Available" msgstr "Доступний" -#: ../js/ui/statusMenu.js:130 +#: ../js/ui/statusMenu.js:141 msgid "Busy" msgstr "Зайнятий" -#: ../js/ui/statusMenu.js:138 +#: ../js/ui/statusMenu.js:149 msgid "My Account" msgstr "Мій обліковий запис" -#: ../js/ui/statusMenu.js:142 +#: ../js/ui/statusMenu.js:153 msgid "System Settings" msgstr "Системні параметри" -#: ../js/ui/statusMenu.js:149 +#: ../js/ui/statusMenu.js:160 msgid "Lock Screen" msgstr "Заблокувати екран" -#: ../js/ui/statusMenu.js:153 +#: ../js/ui/statusMenu.js:164 msgid "Switch User" msgstr "Змінити користувача" -#: ../js/ui/statusMenu.js:158 +#: ../js/ui/statusMenu.js:169 msgid "Log Out..." msgstr "Завершити сеанс…" -#: ../js/ui/status/accessibility.js:81 +#: ../js/ui/status/accessibility.js:62 msgid "Zoom" msgstr "Масштаб" -#: ../js/ui/status/accessibility.js:88 +#: ../js/ui/status/accessibility.js:69 msgid "Screen Reader" msgstr "Читання з екрану" -#: ../js/ui/status/accessibility.js:92 +#: ../js/ui/status/accessibility.js:73 msgid "Screen Keyboard" msgstr "Екранна клавіатура" -#: ../js/ui/status/accessibility.js:96 +#: ../js/ui/status/accessibility.js:77 msgid "Visual Alerts" msgstr "Візуальні тривоги" -#: ../js/ui/status/accessibility.js:99 +#: ../js/ui/status/accessibility.js:80 msgid "Sticky Keys" msgstr "Липкі клавіші" -#: ../js/ui/status/accessibility.js:102 +#: ../js/ui/status/accessibility.js:83 msgid "Slow Keys" msgstr "Повільні клавіші" -#: ../js/ui/status/accessibility.js:105 +#: ../js/ui/status/accessibility.js:86 msgid "Bounce Keys" msgstr "Пружні клавіші" -#: ../js/ui/status/accessibility.js:108 +#: ../js/ui/status/accessibility.js:89 msgid "Mouse Keys" msgstr "Клавіші миші" -#: ../js/ui/status/accessibility.js:112 +#: ../js/ui/status/accessibility.js:93 msgid "Universal Access Settings" msgstr "Параметри універсального доступу" -#: ../js/ui/status/accessibility.js:164 +#: ../js/ui/status/accessibility.js:145 msgid "High Contrast" msgstr "Висока контрастність" -#: ../js/ui/status/accessibility.js:209 +#: ../js/ui/status/accessibility.js:182 msgid "Large Text" msgstr "Більший текст" @@ -849,51 +863,51 @@ msgstr[0] "Залишилось %d хвилина" msgstr[1] "Залишилось %d хвилини" msgstr[2] "Залишилось %d хвилин" -#: ../js/ui/status/power.js:241 +#: ../js/ui/status/power.js:227 msgid "AC adapter" msgstr "Блок живлення" -#: ../js/ui/status/power.js:243 +#: ../js/ui/status/power.js:229 msgid "Laptop battery" msgstr "Батарея ноутбука" -#: ../js/ui/status/power.js:245 +#: ../js/ui/status/power.js:231 msgid "UPS" msgstr "UPS" -#: ../js/ui/status/power.js:247 +#: ../js/ui/status/power.js:233 msgid "Monitor" msgstr "Монітор" -#: ../js/ui/status/power.js:249 +#: ../js/ui/status/power.js:235 msgid "Mouse" msgstr "Миша" -#: ../js/ui/status/power.js:251 +#: ../js/ui/status/power.js:237 msgid "Keyboard" msgstr "Клавіатура" -#: ../js/ui/status/power.js:253 +#: ../js/ui/status/power.js:239 msgid "PDA" msgstr "КПК" -#: ../js/ui/status/power.js:255 +#: ../js/ui/status/power.js:241 msgid "Cell phone" msgstr "Мобільний телефон" -#: ../js/ui/status/power.js:257 +#: ../js/ui/status/power.js:243 msgid "Media player" msgstr "Програвач" -#: ../js/ui/status/power.js:259 +#: ../js/ui/status/power.js:245 msgid "Tablet" msgstr "Планшет" -#: ../js/ui/status/power.js:261 +#: ../js/ui/status/power.js:247 msgid "Computer" msgstr "Комп'ютер" -#: ../js/ui/status/power.js:263 ../src/shell-app-system.c:1013 +#: ../js/ui/status/power.js:249 ../src/shell-app-system.c:1013 msgid "Unknown" msgstr "Невідомо" @@ -928,7 +942,7 @@ msgstr "%s зайнятий." #. Translators: this is a time format string followed by a date. #. If applicable, replace %X with a strftime format valid for your #. locale, without seconds. -#: ../js/ui/telepathyClient.js:348 +#: ../js/ui/telepathyClient.js:357 #, no-c-format msgid "Sent at %X on %A" msgstr "Відправити на %X в %A" @@ -937,16 +951,20 @@ msgstr "Відправити на %X в %A" #. in the search entry when no search is #. active; it should not exceed ~30 #. characters. -#: ../js/ui/viewSelector.js:103 +#: ../js/ui/viewSelector.js:117 msgid "Type to search..." msgstr "Введіть для пошуку…" -#: ../js/ui/windowAttentionHandler.js:43 +#: ../js/ui/viewSelector.js:137 ../src/shell-util.c:250 +msgid "Search" +msgstr "Пошук" + +#: ../js/ui/windowAttentionHandler.js:42 #, c-format msgid "%s has finished starting" msgstr "%s завершив запуск" -#: ../js/ui/windowAttentionHandler.js:45 +#: ../js/ui/windowAttentionHandler.js:44 #, c-format msgid "'%s' is ready" msgstr "«%s» готовий" @@ -975,11 +993,15 @@ msgstr[2] "%u входів" msgid "System Sounds" msgstr "Системні звуки" -#: ../src/shell-global.c:1298 +#: ../src/main.c:395 +msgid "Print version" +msgstr "Показати версію" + +#: ../src/shell-global.c:1308 msgid "Less than a minute ago" msgstr "Менше хвилини тому" -#: ../src/shell-global.c:1302 +#: ../src/shell-global.c:1312 #, c-format msgid "%d minute ago" msgid_plural "%d minutes ago" @@ -987,7 +1009,7 @@ msgstr[0] "%d хвилина тому" msgstr[1] "%d хвилини тому" msgstr[2] "%d хвилин тому" -#: ../src/shell-global.c:1307 +#: ../src/shell-global.c:1317 #, c-format msgid "%d hour ago" msgid_plural "%d hours ago" @@ -995,7 +1017,7 @@ msgstr[0] "%d година тому" msgstr[1] "%d години тому" msgstr[2] "%d годин тому" -#: ../src/shell-global.c:1312 +#: ../src/shell-global.c:1322 #, c-format msgid "%d day ago" msgid_plural "%d days ago" @@ -1003,7 +1025,7 @@ msgstr[0] "%d день тому" msgstr[1] "%d дні тому" msgstr[2] "%d днів тому" -#: ../src/shell-global.c:1317 +#: ../src/shell-global.c:1327 #, c-format msgid "%d week ago" msgid_plural "%d weeks ago" @@ -1025,10 +1047,6 @@ msgstr "Домашня тека" msgid "File System" msgstr "Файлова система" -#: ../src/shell-util.c:250 -msgid "Search" -msgstr "Пошук" - #. Translators: the first string is the name of a gvfs #. * method, and the second string is a path. For #. * example, "Trash: some-directory". It means that the From 856f7ecee908697c3d662951c049ab3816ccdfc6 Mon Sep 17 00:00:00 2001 From: Luca Ferretti Date: Fri, 11 Mar 2011 01:56:49 +0100 Subject: [PATCH 04/44] Updated Italian translation --- po/it.po | 173 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 96 insertions(+), 77 deletions(-) diff --git a/po/it.po b/po/it.po index 7142aaf1c..c2190a90a 100644 --- a/po/it.po +++ b/po/it.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: gnome-shell\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-02 13:37+0100\n" -"PO-Revision-Date: 2011-03-02 13:37+0100\n" +"POT-Creation-Date: 2011-03-11 01:54+0100\n" +"PO-Revision-Date: 2011-03-11 01:56+0100\n" "Last-Translator: Luca Ferretti \n" "Language-Team: Italian \n" "Language: it\n" @@ -194,27 +194,27 @@ msgid "Execution of '%s' failed:" msgstr "Esecuzione di «%s» non riuscita:" #. Translators: Filter to display all applications -#: ../js/ui/appDisplay.js:195 +#: ../js/ui/appDisplay.js:226 msgid "All" msgstr "Tutte" -#: ../js/ui/appDisplay.js:282 +#: ../js/ui/appDisplay.js:324 msgid "APPLICATIONS" msgstr "APPLICAZIONI" -#: ../js/ui/appDisplay.js:312 +#: ../js/ui/appDisplay.js:350 msgid "SETTINGS" msgstr "IMPOSTAZIONI" -#: ../js/ui/appDisplay.js:572 +#: ../js/ui/appDisplay.js:612 msgid "New Window" msgstr "Nuova finestra" -#: ../js/ui/appDisplay.js:575 +#: ../js/ui/appDisplay.js:615 msgid "Remove from Favorites" msgstr "Rimuovi dai preferiti" -#: ../js/ui/appDisplay.js:576 +#: ../js/ui/appDisplay.js:616 msgid "Add to Favorites" msgstr "Aggiungi ai preferiti" @@ -376,7 +376,7 @@ msgstr "Questa settimana" msgid "Next week" msgstr "Prossima settimana" -#: ../js/ui/dash.js:174 +#: ../js/ui/dash.js:174 ../js/ui/messageTray.js:931 msgid "Remove" msgstr "Rimuovi" @@ -384,54 +384,54 @@ msgstr "Rimuovi" msgid "Date and Time Settings" msgstr "Impostazioni data e ora" -#: ../js/ui/dateMenu.js:110 +#: ../js/ui/dateMenu.js:111 msgid "Open Calendar" msgstr "Apri calendario" #. Translators: This is the time format with date used #. in 24-hour mode. -#: ../js/ui/dateMenu.js:162 +#: ../js/ui/dateMenu.js:164 msgid "%a %b %e, %R:%S" msgstr "%a %e %b, %k.%M.%S" -#: ../js/ui/dateMenu.js:163 +#: ../js/ui/dateMenu.js:165 msgid "%a %b %e, %R" msgstr "%a %e %b, %k.%M" #. Translators: This is the time format without date used #. in 24-hour mode. -#: ../js/ui/dateMenu.js:167 +#: ../js/ui/dateMenu.js:169 msgid "%a %R:%S" msgstr "%a %k.%M.%S" -#: ../js/ui/dateMenu.js:168 +#: ../js/ui/dateMenu.js:170 msgid "%a %R" msgstr "%a %k.%M" #. Translators: This is a time format with date used #. for AM/PM. -#: ../js/ui/dateMenu.js:175 +#: ../js/ui/dateMenu.js:177 msgid "%a %b %e, %l:%M:%S %p" msgstr "%a %e %b, %l.%M.%S %P" -#: ../js/ui/dateMenu.js:176 +#: ../js/ui/dateMenu.js:178 msgid "%a %b %e, %l:%M %p" msgstr "%a %e %b, %l.%M %P" #. Translators: This is a time format without date used #. for AM/PM. -#: ../js/ui/dateMenu.js:180 +#: ../js/ui/dateMenu.js:182 msgid "%a %l:%M:%S %p" msgstr "%a %l.%M.%S %P" -#: ../js/ui/dateMenu.js:181 +#: ../js/ui/dateMenu.js:183 msgid "%a %l:%M %p" msgstr "%a %l.%M %P" #. Translators: This is the date format to use when the calendar popup is #. * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM"). #. -#: ../js/ui/dateMenu.js:207 +#: ../js/ui/dateMenu.js:209 msgid "%A %B %e, %Y" msgstr "%a %e %B %Y" @@ -516,39 +516,43 @@ msgstr "Conferma" msgid "Cancel" msgstr "Annulla" -#: ../js/ui/lookingGlass.js:587 +#: ../js/ui/lookingGlass.js:588 msgid "No extensions installed" msgstr "Nessuna estensione installata" # (ndt) o abilitata? -#: ../js/ui/lookingGlass.js:624 +#: ../js/ui/lookingGlass.js:625 msgid "Enabled" msgstr "Abilitato" # (ndt) o disabilitata? #. translators: #. * The device has been disabled -#: ../js/ui/lookingGlass.js:626 ../src/gvc/gvc-mixer-control.c:1087 +#: ../js/ui/lookingGlass.js:627 ../src/gvc/gvc-mixer-control.c:1087 msgid "Disabled" msgstr "Disabilitato" -#: ../js/ui/lookingGlass.js:628 +#: ../js/ui/lookingGlass.js:629 msgid "Error" msgstr "Errore" -#: ../js/ui/lookingGlass.js:630 +#: ../js/ui/lookingGlass.js:631 msgid "Out of date" msgstr "Non aggiornato" -#: ../js/ui/lookingGlass.js:655 +#: ../js/ui/lookingGlass.js:656 msgid "View Source" msgstr "Visualizza sorgente" -#: ../js/ui/lookingGlass.js:661 +#: ../js/ui/lookingGlass.js:662 msgid "Web Page" msgstr "Pagina web" -#: ../js/ui/messageTray.js:1902 +#: ../js/ui/messageTray.js:924 +msgid "Open" +msgstr "Apri" + +#: ../js/ui/messageTray.js:1961 msgid "System Information" msgstr "Informazione di sistema" @@ -564,18 +568,29 @@ msgstr "Finestre" msgid "Applications" msgstr "Applicazioni" +# cruscotto?!?!?!?!?!?!? +#. Translators: this is the name of the dock/favorites area on +#. the left of the overview +#: ../js/ui/overview.js:202 +msgid "Dash" +msgstr "Dash" + #. TODO - _quit() doesn't really work on apps in state STARTING yet -#: ../js/ui/panel.js:529 +#: ../js/ui/panel.js:560 #, c-format msgid "Quit %s" msgstr "Chiudi %s" #. Button on the left side of the panel. #. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview". -#: ../js/ui/panel.js:897 +#: ../js/ui/panel.js:919 msgid "Activities" msgstr "Attività" +#: ../js/ui/panel.js:1020 +msgid "Panel" +msgstr "Pannello" + # (ndt) libera, ma unmount non si può proprio vedere... #: ../js/ui/placeDisplay.js:122 #, c-format @@ -599,7 +614,7 @@ msgstr "RISORSE E DISPOSITIVI" #. "ON" and "OFF") or "toggle-switch-intl" (for toggle #. switches containing "◯" and "|"). Other values will #. simply result in invisible toggle switches. -#: ../js/ui/popupMenu.js:612 +#: ../js/ui/popupMenu.js:618 msgid "toggle-switch-us" msgstr "toggle-switch-us" @@ -607,91 +622,91 @@ msgstr "toggle-switch-us" msgid "Please enter a command:" msgstr "Inserire un comando:" -#: ../js/ui/searchDisplay.js:295 +#: ../js/ui/searchDisplay.js:283 msgid "Searching..." msgstr "Ricerca..." -#: ../js/ui/searchDisplay.js:309 +#: ../js/ui/searchDisplay.js:297 msgid "No matching results." msgstr "Nessun risultato corrispondente." -#: ../js/ui/statusMenu.js:102 ../js/ui/statusMenu.js:166 +#: ../js/ui/statusMenu.js:113 ../js/ui/statusMenu.js:177 msgid "Power Off..." msgstr "Spegni..." -#: ../js/ui/statusMenu.js:104 ../js/ui/statusMenu.js:165 +#: ../js/ui/statusMenu.js:115 ../js/ui/statusMenu.js:176 msgid "Suspend" msgstr "Sospendi" -#: ../js/ui/statusMenu.js:125 +#: ../js/ui/statusMenu.js:136 msgid "Available" msgstr "Disponibile" -#: ../js/ui/statusMenu.js:130 +#: ../js/ui/statusMenu.js:141 msgid "Busy" msgstr "Non disponibile" -#: ../js/ui/statusMenu.js:138 +#: ../js/ui/statusMenu.js:149 msgid "My Account" msgstr "Account personale" -#: ../js/ui/statusMenu.js:142 +#: ../js/ui/statusMenu.js:153 msgid "System Settings" msgstr "Impostazioni di sistema" -#: ../js/ui/statusMenu.js:149 +#: ../js/ui/statusMenu.js:160 msgid "Lock Screen" msgstr "Blocca schermo" -#: ../js/ui/statusMenu.js:153 +#: ../js/ui/statusMenu.js:164 msgid "Switch User" msgstr "Cambia utente" -#: ../js/ui/statusMenu.js:158 +#: ../js/ui/statusMenu.js:169 msgid "Log Out..." msgstr "Termina sessione..." -#: ../js/ui/status/accessibility.js:81 +#: ../js/ui/status/accessibility.js:62 msgid "Zoom" msgstr "Ingrandimento" -#: ../js/ui/status/accessibility.js:88 +#: ../js/ui/status/accessibility.js:69 msgid "Screen Reader" msgstr "Lettore schermo" -#: ../js/ui/status/accessibility.js:92 +#: ../js/ui/status/accessibility.js:73 msgid "Screen Keyboard" msgstr "Tastiera a schermo" -#: ../js/ui/status/accessibility.js:96 +#: ../js/ui/status/accessibility.js:77 msgid "Visual Alerts" msgstr "Allerte visive" -#: ../js/ui/status/accessibility.js:99 +#: ../js/ui/status/accessibility.js:80 msgid "Sticky Keys" msgstr "Permanenza tasti" -#: ../js/ui/status/accessibility.js:102 +#: ../js/ui/status/accessibility.js:83 msgid "Slow Keys" msgstr "Rallentamento tasti" -#: ../js/ui/status/accessibility.js:105 +#: ../js/ui/status/accessibility.js:86 msgid "Bounce Keys" msgstr "Pressione ravvicinata tasti" -#: ../js/ui/status/accessibility.js:108 +#: ../js/ui/status/accessibility.js:89 msgid "Mouse Keys" msgstr "Mouse da tastiera" -#: ../js/ui/status/accessibility.js:112 +#: ../js/ui/status/accessibility.js:93 msgid "Universal Access Settings" msgstr "Impostazioni accesso universale" -#: ../js/ui/status/accessibility.js:164 +#: ../js/ui/status/accessibility.js:145 msgid "High Contrast" msgstr "Contrasto elevato" -#: ../js/ui/status/accessibility.js:209 +#: ../js/ui/status/accessibility.js:182 msgid "Large Text" msgstr "Caratteri grandi" @@ -861,52 +876,52 @@ msgid_plural "%d minutes remaining" msgstr[0] "%d minuto rimanente" msgstr[1] "%d minuti rimanenti" -#: ../js/ui/status/power.js:241 +#: ../js/ui/status/power.js:227 msgid "AC adapter" msgstr "Alimentatore di corrente" -#: ../js/ui/status/power.js:243 +#: ../js/ui/status/power.js:229 msgid "Laptop battery" msgstr "Batteria del portatile" -#: ../js/ui/status/power.js:245 +#: ../js/ui/status/power.js:231 msgid "UPS" msgstr "UPS" -#: ../js/ui/status/power.js:247 +#: ../js/ui/status/power.js:233 msgid "Monitor" msgstr "Monitor" -#: ../js/ui/status/power.js:249 +#: ../js/ui/status/power.js:235 msgid "Mouse" msgstr "Mouse" -#: ../js/ui/status/power.js:251 +#: ../js/ui/status/power.js:237 msgid "Keyboard" msgstr "Tastiera" -#: ../js/ui/status/power.js:253 +#: ../js/ui/status/power.js:239 msgid "PDA" msgstr "PDS" # c'era una discussione su tp... -#: ../js/ui/status/power.js:255 +#: ../js/ui/status/power.js:241 msgid "Cell phone" msgstr "Cellulare" -#: ../js/ui/status/power.js:257 +#: ../js/ui/status/power.js:243 msgid "Media player" msgstr "Lettore multimediale" -#: ../js/ui/status/power.js:259 +#: ../js/ui/status/power.js:245 msgid "Tablet" msgstr "Tablet" -#: ../js/ui/status/power.js:261 +#: ../js/ui/status/power.js:247 msgid "Computer" msgstr "Computer" -#: ../js/ui/status/power.js:263 ../src/shell-app-system.c:1013 +#: ../js/ui/status/power.js:249 ../src/shell-app-system.c:1013 msgid "Unknown" msgstr "Sconosciuto" @@ -941,7 +956,7 @@ msgstr "%s non è disponibile." #. Translators: this is a time format string followed by a date. #. If applicable, replace %X with a strftime format valid for your #. locale, without seconds. -#: ../js/ui/telepathyClient.js:348 +#: ../js/ui/telepathyClient.js:357 #, no-c-format msgid "Sent at %X on %A" msgstr "Inviato alle %-H.%M di %A" @@ -950,17 +965,21 @@ msgstr "Inviato alle %-H.%M di %A" #. in the search entry when no search is #. active; it should not exceed ~30 #. characters. -#: ../js/ui/viewSelector.js:103 +#: ../js/ui/viewSelector.js:117 msgid "Type to search..." msgstr "Digitare per cercare..." -#: ../js/ui/windowAttentionHandler.js:43 +#: ../js/ui/viewSelector.js:137 ../src/shell-util.c:250 +msgid "Search" +msgstr "Cerca" + +#: ../js/ui/windowAttentionHandler.js:42 #, c-format msgid "%s has finished starting" msgstr "Avvio di %s completato" # (ndt) dovrebbe essere il nome dell'applicazione -#: ../js/ui/windowAttentionHandler.js:45 +#: ../js/ui/windowAttentionHandler.js:44 #, c-format msgid "'%s' is ready" msgstr "«%s» è pronto" @@ -987,32 +1006,36 @@ msgstr[1] "%u ingressi" msgid "System Sounds" msgstr "Audio di sistema" -#: ../src/shell-global.c:1298 +#: ../src/main.c:395 +msgid "Print version" +msgstr "Stampa la versione" + +#: ../src/shell-global.c:1308 msgid "Less than a minute ago" msgstr "Meno di un minuto fa" -#: ../src/shell-global.c:1302 +#: ../src/shell-global.c:1312 #, c-format msgid "%d minute ago" msgid_plural "%d minutes ago" msgstr[0] "%d minuto fa" msgstr[1] "%d minuti fa" -#: ../src/shell-global.c:1307 +#: ../src/shell-global.c:1317 #, c-format msgid "%d hour ago" msgid_plural "%d hours ago" msgstr[0] "%d ora fa" msgstr[1] "%d ore fa" -#: ../src/shell-global.c:1312 +#: ../src/shell-global.c:1322 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "%d giorno fa" msgstr[1] "%d giorni fa" -#: ../src/shell-global.c:1317 +#: ../src/shell-global.c:1327 #, c-format msgid "%d week ago" msgid_plural "%d weeks ago" @@ -1035,10 +1058,6 @@ msgstr "Cartella home" msgid "File System" msgstr "File system" -#: ../src/shell-util.c:250 -msgid "Search" -msgstr "Cerca" - # (ndt) valutare... #. Translators: the first string is the name of a gvfs #. * method, and the second string is a path. For From 88958270cb85ee24c414d9cc6f55b115c1a02d0b Mon Sep 17 00:00:00 2001 From: Friedel Wolff Date: Fri, 11 Mar 2011 12:39:00 +0200 Subject: [PATCH 05/44] New translation for Afrikaans (af) --- po/LINGUAS | 1 + po/af.po | 1004 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1005 insertions(+) create mode 100644 po/af.po diff --git a/po/LINGUAS b/po/LINGUAS index cc31c52a4..a611eb6d8 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,3 +1,4 @@ +af ar bg ca diff --git a/po/af.po b/po/af.po new file mode 100644 index 000000000..eeae66ad5 --- /dev/null +++ b/po/af.po @@ -0,0 +1,1004 @@ +# Afrikaans translation for gnome-shell. +# Copyright (C) 2011 +# This file is distributed under the same license as the gnome-shell package. +# F Wolff , 2011. +msgid "" +msgstr "" +"Project-Id-Version: gnome-shell master\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" +"shell&component=general\n" +"POT-Creation-Date: 2011-03-05 08:44+0000\n" +"PO-Revision-Date: 2011-03-11 12:36+0200\n" +"Last-Translator: F Wolff \n" +"Language-Team: translate-discuss-af@lists.sourceforge.net\n" +"Language: af\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: Virtaal 0.7.0-beta4\n" + +#: ../data/gnome-shell.desktop.in.in.h:1 +msgid "GNOME Shell" +msgstr "" + +#: ../data/gnome-shell.desktop.in.in.h:2 +msgid "Window management and application launching" +msgstr "Vensterbestuur en toepassinglansering" + +#: ../data/org.gnome.shell.gschema.xml.in.h:1 +msgid "" +"Allows access to internal debugging and monitoring tools using the Alt-F2 " +"dialog." +msgstr "" + +#: ../data/org.gnome.shell.gschema.xml.in.h:2 +msgid "Enable internal tools useful for developers and testers from Alt-F2" +msgstr "" + +#: ../data/org.gnome.shell.gschema.xml.in.h:3 +msgid "File extension used for storing the screencast" +msgstr "" + +#: ../data/org.gnome.shell.gschema.xml.in.h:4 +msgid "Framerate used for recording screencasts." +msgstr "" + +#: ../data/org.gnome.shell.gschema.xml.in.h:5 +msgid "" +"GNOME Shell extensions have a uuid property; this key lists extensions which " +"should not be loaded." +msgstr "" + +#: ../data/org.gnome.shell.gschema.xml.in.h:6 +msgid "History for command (Alt-F2) dialog" +msgstr "" + +#: ../data/org.gnome.shell.gschema.xml.in.h:7 +msgid "History for the looking glass dialog" +msgstr "" + +#: ../data/org.gnome.shell.gschema.xml.in.h:8 +msgid "If true, display date in the clock, in addition to time." +msgstr "" + +#: ../data/org.gnome.shell.gschema.xml.in.h:9 +msgid "If true, display seconds in time." +msgstr "" + +#: ../data/org.gnome.shell.gschema.xml.in.h:10 +msgid "If true, display the ISO week date in the calendar." +msgstr "" + +#: ../data/org.gnome.shell.gschema.xml.in.h:11 +msgid "List of desktop file IDs for favorite applications" +msgstr "" + +#: ../data/org.gnome.shell.gschema.xml.in.h:13 +#, no-c-format +msgid "" +"Sets the GStreamer pipeline used to encode recordings. It follows the syntax " +"used for gst-launch. The pipeline should have an unconnected sink pad where " +"the recorded video is recorded. It will normally have a unconnected source " +"pad; output from that pad will be written into the output file. However the " +"pipeline can also take care of its own output - this might be used to send " +"the output to an icecast server via shout2send or similar. When unset or set " +"to an empty value, the default pipeline will be used. This is currently " +"'videorate ! vp8enc quality=10 speed=2 threads=%T ! queue ! webmmux' and " +"records to WEBM using the VP8 codec. %T is used as a placeholder for a guess " +"at the optimal thread count on the system." +msgstr "" + +#: ../data/org.gnome.shell.gschema.xml.in.h:14 +msgid "Show date in clock" +msgstr "Wys die datum in die horlosie" + +#: ../data/org.gnome.shell.gschema.xml.in.h:15 +msgid "Show the week date in the calendar" +msgstr "" + +#: ../data/org.gnome.shell.gschema.xml.in.h:16 +msgid "Show time with seconds" +msgstr "Wys die tyd met sekondes" + +#: ../data/org.gnome.shell.gschema.xml.in.h:17 +msgid "" +"The applications corresponding to these identifiers will be displayed in the " +"favorites area." +msgstr "" + +#: ../data/org.gnome.shell.gschema.xml.in.h:18 +msgid "" +"The filename for recorded screencasts will be a unique filename based on the " +"current date, and use this extension. It should be changed when recording to " +"a different container format." +msgstr "" + +#: ../data/org.gnome.shell.gschema.xml.in.h:19 +msgid "" +"The framerate of the resulting screencast recordered by GNOME Shell's " +"screencast recorder in frames-per-second." +msgstr "" + +#: ../data/org.gnome.shell.gschema.xml.in.h:20 +msgid "The gstreamer pipeline used to encode the screencast" +msgstr "" + +#: ../data/org.gnome.shell.gschema.xml.in.h:21 +msgid "" +"The shell normally monitors active applications in order to present the most " +"used ones (e.g. in launchers). While this data will be kept private, you may " +"want to disable this for privacy reasons. Please note that doing so won't " +"remove already saved data." +msgstr "" + +#: ../data/org.gnome.shell.gschema.xml.in.h:22 +msgid "Uuids of extensions to disable" +msgstr "" + +#: ../data/org.gnome.shell.gschema.xml.in.h:23 +msgid "Whether to collect stats about applications usage" +msgstr "" + +#: ../data/org.gnome.shell.gschema.xml.in.h:24 +msgid "disabled OpenSearch providers" +msgstr "" + +#: ../js/misc/util.js:86 +msgid "Command not found" +msgstr "Opdrag nie gevind nie" + +#. Replace "Error invoking GLib.shell_parse_argv: " with +#. something nicer +#: ../js/misc/util.js:113 +msgid "Could not parse command:" +msgstr "Kon nie opdrag ontleed nie:" + +#: ../js/misc/util.js:135 +msgid "No such application" +msgstr "Geen so 'n toepassing nie" + +#: ../js/misc/util.js:148 +#, c-format +msgid "Execution of '%s' failed:" +msgstr "Uitvoer van '%s' het misluk:" + +#. Translators: Filter to display all applications +#: ../js/ui/appDisplay.js:195 +msgid "All" +msgstr "Almal" + +#: ../js/ui/appDisplay.js:285 +msgid "APPLICATIONS" +msgstr "TOEPASSINGS" + +#: ../js/ui/appDisplay.js:311 +msgid "SETTINGS" +msgstr "INSTELLINGS" + +#: ../js/ui/appDisplay.js:565 +msgid "New Window" +msgstr "Nuwe venster" + +#: ../js/ui/appDisplay.js:568 +msgid "Remove from Favorites" +msgstr "Verwyder uit gunstelinge" + +#: ../js/ui/appDisplay.js:569 +msgid "Add to Favorites" +msgstr "Voeg by gunstelinge" + +#: ../js/ui/appFavorites.js:91 +#, c-format +msgid "%s has been added to your favorites." +msgstr "%s is by die gunstelinge gevoeg." + +#: ../js/ui/appFavorites.js:122 +#, c-format +msgid "%s has been removed from your favorites." +msgstr "%s uit die gunstelinge verwyder." + +#. Translators: Shown in calendar event list for all day events +#. * Keep it short, best if you can use less then 10 characters +#. +#: ../js/ui/calendar.js:66 +msgctxt "event list time" +msgid "All Day" +msgstr "Voldag" + +#. Translators: Shown in calendar event list, if 24h format +#: ../js/ui/calendar.js:71 +msgctxt "event list time" +msgid "%H:%M" +msgstr "%H:%M" + +#. Transators: Shown in calendar event list, if 12h format +#: ../js/ui/calendar.js:78 +msgctxt "event list time" +msgid "%l:%M %p" +msgstr "%l:%M %p" + +#. Translators: Calendar grid abbreviation for Sunday. +#. * +#. * NOTE: These grid abbreviations are always shown together +#. * and in order, e.g. "S M T W T F S". +#. +#: ../js/ui/calendar.js:118 +msgctxt "grid sunday" +msgid "S" +msgstr "S" + +#. Translators: Calendar grid abbreviation for Monday +#: ../js/ui/calendar.js:120 +msgctxt "grid monday" +msgid "M" +msgstr "M" + +#. Translators: Calendar grid abbreviation for Tuesday +#: ../js/ui/calendar.js:122 +msgctxt "grid tuesday" +msgid "T" +msgstr "D" + +#. Translators: Calendar grid abbreviation for Wednesday +#: ../js/ui/calendar.js:124 +msgctxt "grid wednesday" +msgid "W" +msgstr "W" + +#. Translators: Calendar grid abbreviation for Thursday +#: ../js/ui/calendar.js:126 +msgctxt "grid thursday" +msgid "T" +msgstr "D" + +#. Translators: Calendar grid abbreviation for Friday +#: ../js/ui/calendar.js:128 +msgctxt "grid friday" +msgid "F" +msgstr "V" + +#. Translators: Calendar grid abbreviation for Saturday +#: ../js/ui/calendar.js:130 +msgctxt "grid saturday" +msgid "S" +msgstr "S" + +#. Translators: Event list abbreviation for Sunday. +#. * +#. * NOTE: These list abbreviations are normally not shown together +#. * so they need to be unique (e.g. Tuesday and Thursday cannot +#. * both be 'T'). +#. +#: ../js/ui/calendar.js:143 +msgctxt "list sunday" +msgid "Su" +msgstr "So" + +#. Translators: Event list abbreviation for Monday +#: ../js/ui/calendar.js:145 +msgctxt "list monday" +msgid "M" +msgstr "M" + +#. Translators: Event list abbreviation for Tuesday +#: ../js/ui/calendar.js:147 +msgctxt "list tuesday" +msgid "T" +msgstr "Di" + +#. Translators: Event list abbreviation for Wednesday +#: ../js/ui/calendar.js:149 +msgctxt "list wednesday" +msgid "W" +msgstr "W" + +#. Translators: Event list abbreviation for Thursday +#: ../js/ui/calendar.js:151 +msgctxt "list thursday" +msgid "Th" +msgstr "Do" + +#. Translators: Event list abbreviation for Friday +#: ../js/ui/calendar.js:153 +msgctxt "list friday" +msgid "F" +msgstr "V" + +#. Translators: Event list abbreviation for Saturday +#: ../js/ui/calendar.js:155 +msgctxt "list saturday" +msgid "S" +msgstr "Sa" + +#. Translators: Text to show if there are no events +#: ../js/ui/calendar.js:704 +msgid "Nothing Scheduled" +msgstr "Niks geskeduleer nie" + +#. Translators: Shown on calendar heading when selected day occurs on current year +#: ../js/ui/calendar.js:720 +msgctxt "calendar heading" +msgid "%A, %B %d" +msgstr "%A %d %B" + +#. Translators: Shown on calendar heading when selected day occurs on different year +#: ../js/ui/calendar.js:723 +msgctxt "calendar heading" +msgid "%A, %B %d, %Y" +msgstr "%A %d %B %Y" + +#: ../js/ui/calendar.js:733 +msgid "Today" +msgstr "Vandag" + +#: ../js/ui/calendar.js:737 +msgid "Tomorrow" +msgstr "Môre" + +#: ../js/ui/calendar.js:746 +msgid "This week" +msgstr "Dié week" + +#: ../js/ui/calendar.js:754 +msgid "Next week" +msgstr "Volgende week" + +#: ../js/ui/dash.js:174 +msgid "Remove" +msgstr "Verwyder" + +#: ../js/ui/dateMenu.js:91 +msgid "Date and Time Settings" +msgstr "Instellings vir datum en tyd" + +#: ../js/ui/dateMenu.js:110 +msgid "Open Calendar" +msgstr "Open kalender" + +#. Translators: This is the time format with date used +#. in 24-hour mode. +#: ../js/ui/dateMenu.js:162 +msgid "%a %b %e, %R:%S" +msgstr "%a %e %b %R:%S" + +#: ../js/ui/dateMenu.js:163 +msgid "%a %b %e, %R" +msgstr "%a %e %b %R" + +#. Translators: This is the time format without date used +#. in 24-hour mode. +#: ../js/ui/dateMenu.js:167 +msgid "%a %R:%S" +msgstr "%a %R:%S" + +#: ../js/ui/dateMenu.js:168 +msgid "%a %R" +msgstr "%a %R" + +#. Translators: This is a time format with date used +#. for AM/PM. +#: ../js/ui/dateMenu.js:175 +msgid "%a %b %e, %l:%M:%S %p" +msgstr "%a %e %b %l:%M:%S %p" + +#: ../js/ui/dateMenu.js:176 +msgid "%a %b %e, %l:%M %p" +msgstr "%a %e %b %l:%M %p" + +#. Translators: This is a time format without date used +#. for AM/PM. +#: ../js/ui/dateMenu.js:180 +msgid "%a %l:%M:%S %p" +msgstr "%a %l:%M:%S %p" + +#: ../js/ui/dateMenu.js:181 +msgid "%a %l:%M %p" +msgstr "%a %l:%M %p" + +#. Translators: This is the date format to use when the calendar popup is +#. * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM"). +#. +#: ../js/ui/dateMenu.js:207 +msgid "%A %B %e, %Y" +msgstr "%A %e %B %Y" + +#: ../js/ui/docDisplay.js:19 +msgid "RECENT ITEMS" +msgstr "ONLANGSE ITEMS" + +#: ../js/ui/endSessionDialog.js:63 +#, c-format +msgid "Log Out %s" +msgstr "Meld af as %s" + +#: ../js/ui/endSessionDialog.js:64 ../js/ui/endSessionDialog.js:69 +msgid "Log Out" +msgstr "Meld af" + +#: ../js/ui/endSessionDialog.js:65 +msgid "Click Log Out to quit these applications and log out of the system." +msgstr "" +"Klik 'Meld af' om dié toepassings af te sluit en af te meld van die stelsel." + +#: ../js/ui/endSessionDialog.js:66 +#, c-format +msgid "%s will be logged out automatically in %d seconds." +msgstr "%s sal outomaties afgemeld word oor %d sekondes." + +#: ../js/ui/endSessionDialog.js:67 +#, c-format +msgid "You will be logged out automatically in %d seconds." +msgstr "U sal outomaties afgemeld word oor %d sekondes." + +#: ../js/ui/endSessionDialog.js:68 +msgid "Logging out of the system." +msgstr "U meld nou van die stelsel af." + +#: ../js/ui/endSessionDialog.js:74 ../js/ui/endSessionDialog.js:78 +msgid "Shut Down" +msgstr "Skakel af" + +#: ../js/ui/endSessionDialog.js:75 +msgid "Click Shut Down to quit these applications and shut down the system." +msgstr "" +"Klik 'Skakel af' om dié toepassings af te sluit en die stelsel af te skakel." + +#: ../js/ui/endSessionDialog.js:76 +#, c-format +msgid "The system will shut down automatically in %d seconds." +msgstr "Die stelsel sal outomaties afgeskakel word oor %d sekondes." + +#: ../js/ui/endSessionDialog.js:77 +msgid "Shutting down the system." +msgstr "Die stelsel word nou afgeskakel." + +#: ../js/ui/endSessionDialog.js:84 ../js/ui/endSessionDialog.js:88 +msgid "Restart" +msgstr "Herbegin" + +#: ../js/ui/endSessionDialog.js:85 +msgid "Click Restart to quit these applications and restart the system." +msgstr "" +"Klik 'Herbegin' om dié toepassings af te sluit en die stelsel weer te begin." + +#: ../js/ui/endSessionDialog.js:86 +#, c-format +msgid "The system will restart automatically in %d seconds." +msgstr "Die stelsel sal outomaties herbegin word oor %d sekondes." + +#: ../js/ui/endSessionDialog.js:87 +msgid "Restarting the system." +msgstr "Die stelsel word nou herbegin." + +#: ../js/ui/endSessionDialog.js:395 +msgid "Confirm" +msgstr "Bevestig" + +#: ../js/ui/endSessionDialog.js:400 ../js/ui/status/bluetooth.js:470 +msgid "Cancel" +msgstr "Kanselleer" + +#: ../js/ui/lookingGlass.js:588 +msgid "No extensions installed" +msgstr "Geen uitbreidings geïnstalleer nie" + +#: ../js/ui/lookingGlass.js:625 +msgid "Enabled" +msgstr "Geaktiveer" + +#. translators: +#. * The device has been disabled +#: ../js/ui/lookingGlass.js:627 ../src/gvc/gvc-mixer-control.c:1087 +msgid "Disabled" +msgstr "Gedeaktiveer" + +#: ../js/ui/lookingGlass.js:629 +msgid "Error" +msgstr "Fout" + +#: ../js/ui/lookingGlass.js:631 +msgid "Out of date" +msgstr "" + +#: ../js/ui/lookingGlass.js:656 +msgid "View Source" +msgstr "Bekyk bronkode" + +#: ../js/ui/lookingGlass.js:662 +msgid "Web Page" +msgstr "Webblad" + +#: ../js/ui/messageTray.js:1907 +msgid "System Information" +msgstr "Stelselinligting" + +#: ../js/ui/overview.js:88 +msgid "Undo" +msgstr "Ontdoen" + +#: ../js/ui/overview.js:183 +msgid "Windows" +msgstr "Vensters" + +#: ../js/ui/overview.js:186 +msgid "Applications" +msgstr "Toepassings" + +#. TODO - _quit() doesn't really work on apps in state STARTING yet +#: ../js/ui/panel.js:531 +#, c-format +msgid "Quit %s" +msgstr "Sluit %s af" + +#. Button on the left side of the panel. +#. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview". +#: ../js/ui/panel.js:899 +msgid "Activities" +msgstr "Aktiwiteite" + +#: ../js/ui/placeDisplay.js:122 +#, c-format +msgid "Failed to unmount '%s'" +msgstr "Kon nie '%s' ontheg nie" + +#: ../js/ui/placeDisplay.js:125 +msgid "Retry" +msgstr "Herprobeer" + +#: ../js/ui/placeDisplay.js:165 +msgid "Connect to..." +msgstr "Koppel aan..." + +#: ../js/ui/placeDisplay.js:409 +msgid "PLACES & DEVICES" +msgstr "PLEKKE EN TOESTELLE" + +#. Translators: this MUST be either "toggle-switch-us" +#. (for toggle switches containing the English words +#. "ON" and "OFF") or "toggle-switch-intl" (for toggle +#. switches containing "◯" and "|"). Other values will +#. simply result in invisible toggle switches. +#: ../js/ui/popupMenu.js:612 +msgid "toggle-switch-us" +msgstr "oggle-switch-intl" + +#: ../js/ui/runDialog.js:201 +msgid "Please enter a command:" +msgstr "Tik 'n opdrag:" + +#: ../js/ui/searchDisplay.js:283 +msgid "Searching..." +msgstr "Soek tans..." + +#: ../js/ui/searchDisplay.js:297 +msgid "No matching results." +msgstr "Geen passende resultate nie." + +#: ../js/ui/statusMenu.js:102 ../js/ui/statusMenu.js:166 +msgid "Power Off..." +msgstr "Skakel af..." + +#: ../js/ui/statusMenu.js:104 ../js/ui/statusMenu.js:165 +msgid "Suspend" +msgstr "Sluimer" + +#: ../js/ui/statusMenu.js:125 +msgid "Available" +msgstr "Beskikbaar" + +#: ../js/ui/statusMenu.js:130 +msgid "Busy" +msgstr "Besig" + +#: ../js/ui/statusMenu.js:138 +msgid "My Account" +msgstr "My rekening" + +#: ../js/ui/statusMenu.js:142 +msgid "System Settings" +msgstr "Stelselinstellings" + +#: ../js/ui/statusMenu.js:149 +msgid "Lock Screen" +msgstr "Sluit skerm" + +#: ../js/ui/statusMenu.js:153 +msgid "Switch User" +msgstr "Wissel gebruiker" + +#: ../js/ui/statusMenu.js:158 +msgid "Log Out..." +msgstr "Meld af..." + +#: ../js/ui/status/accessibility.js:62 +msgid "Zoom" +msgstr "Zoem" + +#: ../js/ui/status/accessibility.js:69 +msgid "Screen Reader" +msgstr "Skermleser" + +#: ../js/ui/status/accessibility.js:73 +msgid "Screen Keyboard" +msgstr "Skermsleutelbord" + +#: ../js/ui/status/accessibility.js:77 +msgid "Visual Alerts" +msgstr "Visuele waarskuwing" + +#: ../js/ui/status/accessibility.js:80 +msgid "Sticky Keys" +msgstr "Kleefsleutels" + +#: ../js/ui/status/accessibility.js:83 +msgid "Slow Keys" +msgstr "Stadige sleutels" + +#: ../js/ui/status/accessibility.js:86 +msgid "Bounce Keys" +msgstr "Bonssleutels" + +#: ../js/ui/status/accessibility.js:89 +msgid "Mouse Keys" +msgstr "Muissleutels" + +#: ../js/ui/status/accessibility.js:93 +msgid "Universal Access Settings" +msgstr "Instellings vir universele toegang" + +#: ../js/ui/status/accessibility.js:145 +msgid "High Contrast" +msgstr "Hoë kontras" + +#: ../js/ui/status/accessibility.js:182 +msgid "Large Text" +msgstr "Groot teks" + +#: ../js/ui/status/bluetooth.js:42 ../js/ui/status/bluetooth.js:241 +#: ../js/ui/status/bluetooth.js:337 ../js/ui/status/bluetooth.js:371 +#: ../js/ui/status/bluetooth.js:411 ../js/ui/status/bluetooth.js:444 +msgid "Bluetooth" +msgstr "Bluetooth" + +#: ../js/ui/status/bluetooth.js:55 +msgid "Visibility" +msgstr "Sigbaarheid" + +#: ../js/ui/status/bluetooth.js:69 +msgid "Send Files to Device..." +msgstr "Stuur lêers na toestel..." + +#: ../js/ui/status/bluetooth.js:70 +msgid "Setup a New Device..." +msgstr "Stel 'n nuwe toestel op..." + +#: ../js/ui/status/bluetooth.js:95 +msgid "Bluetooth Settings" +msgstr "Bluetooth-instellings" + +#: ../js/ui/status/bluetooth.js:192 +msgid "Connection" +msgstr "Verbinding" + +#: ../js/ui/status/bluetooth.js:228 +msgid "Send Files..." +msgstr "Stuur lêers..." + +#: ../js/ui/status/bluetooth.js:233 +msgid "Browse Files..." +msgstr "Blaai deur lêers..." + +#: ../js/ui/status/bluetooth.js:242 +msgid "Error browsing device" +msgstr "Fout met blaai deur toestel" + +#: ../js/ui/status/bluetooth.js:243 +#, c-format, +msgid "The requested device cannot be browsed, error is '%s'" +msgstr "" +"Die aangevraagde toestel kan nie deurgeblaai word nie. Die fout is '%s'." + +#: ../js/ui/status/bluetooth.js:251 +msgid "Keyboard Settings" +msgstr "Sleutelbordinstellings" + +#: ../js/ui/status/bluetooth.js:256 +msgid "Mouse Settings" +msgstr "Muisinstellings" + +#: ../js/ui/status/bluetooth.js:263 ../js/ui/status/volume.js:65 +msgid "Sound Settings" +msgstr "Klankinstellings" + +#: ../js/ui/status/bluetooth.js:372 +#, c-format +msgid "Authorization request from %s" +msgstr "" + +#: ../js/ui/status/bluetooth.js:378 +#, c-format +msgid "Device %s wants access to the service '%s'" +msgstr "Toestel %s wil toegang hê tot die '%s'-diens" + +#: ../js/ui/status/bluetooth.js:380 +msgid "Always grant access" +msgstr "Verleen altyd toegang" + +#: ../js/ui/status/bluetooth.js:381 +msgid "Grant this time only" +msgstr "Verleen slegs nou toegang" + +#: ../js/ui/status/bluetooth.js:382 +msgid "Reject" +msgstr "Weier" + +#: ../js/ui/status/bluetooth.js:412 +#, c-format +msgid "Pairing confirmation for %s" +msgstr "Bevestig oppaar vir %s" + +#: ../js/ui/status/bluetooth.js:418 ../js/ui/status/bluetooth.js:452 +#, c-format +msgid "Device %s wants to pair with this computer" +msgstr "Die toestel %s wil met hierdie rekenaar oppaar" + +#: ../js/ui/status/bluetooth.js:419 +#, c-format +msgid "Please confirm whether the PIN '%s' matches the one on the device." +msgstr "Bevestig of die PIN '%s' dieselfde is as die een op die toestel." + +#: ../js/ui/status/bluetooth.js:421 +msgid "Matches" +msgstr "Dit pas" + +#: ../js/ui/status/bluetooth.js:422 +msgid "Does not match" +msgstr "Dit pas nie" + +#: ../js/ui/status/bluetooth.js:445 +#, c-format +msgid "Pairing request for %s" +msgstr "Versoek om op te paar vanaf %s" + +#: ../js/ui/status/bluetooth.js:453 +msgid "Please enter the PIN mentioned on the device." +msgstr "Tik die PIN wat op die toestel gewys word." + +#: ../js/ui/status/bluetooth.js:469 +msgid "OK" +msgstr "Regso" + +#: ../js/ui/status/keyboard.js:73 +msgid "Show Keyboard Layout..." +msgstr "Wys sleutelborduitleg..." + +#: ../js/ui/status/keyboard.js:76 +msgid "Localization Settings" +msgstr "Lokaliseringsinstellings" + +#: ../js/ui/status/power.js:85 +msgid "Power Settings" +msgstr "Kraginstellings" + +#. 0 is reported when UPower does not have enough data +#. to estimate battery life +#: ../js/ui/status/power.js:110 +msgid "Estimating..." +msgstr "Skat tans..." + +#: ../js/ui/status/power.js:117 +#, c-format +msgid "%d hour remaining" +msgid_plural "%d hours remaining" +msgstr[0] "%d uur bly oor" +msgstr[1] "%d ure bly oor" + +#. TRANSLATORS: this is a time string, as in "%d hours %d minutes remaining" +#: ../js/ui/status/power.js:120 +#, c-format +msgid "%d %s %d %s remaining" +msgstr "%d %s en %d %s bly oor" + +#: ../js/ui/status/power.js:122 +msgid "hour" +msgid_plural "hours" +msgstr[0] "uur" +msgstr[1] "ure" + +#: ../js/ui/status/power.js:122 +msgid "minute" +msgid_plural "minutes" +msgstr[0] "minuut" +msgstr[1] "minute" + +#: ../js/ui/status/power.js:125 +#, c-format +msgid "%d minute remaining" +msgid_plural "%d minutes remaining" +msgstr[0] "%d minuut bly oor" +msgstr[1] "%d minute bly oor" + +#: ../js/ui/status/power.js:227 +msgid "AC adapter" +msgstr "Muurkrag" + +#: ../js/ui/status/power.js:229 +msgid "Laptop battery" +msgstr "Skootrekenaarbattery" + +#: ../js/ui/status/power.js:231 +msgid "UPS" +msgstr "UPS" + +#: ../js/ui/status/power.js:233 +msgid "Monitor" +msgstr "Monitor" + +#: ../js/ui/status/power.js:235 +msgid "Mouse" +msgstr "Muis" + +#: ../js/ui/status/power.js:237 +msgid "Keyboard" +msgstr "Sleutelbord" + +#: ../js/ui/status/power.js:239 +msgid "PDA" +msgstr "PDA" + +#: ../js/ui/status/power.js:241 +msgid "Cell phone" +msgstr "Selfoon" + +#: ../js/ui/status/power.js:243 +msgid "Media player" +msgstr "Mediaspeler" + +#: ../js/ui/status/power.js:245 +msgid "Tablet" +msgstr "Tablet" + +#: ../js/ui/status/power.js:247 +msgid "Computer" +msgstr "Rekenaar" + +#: ../js/ui/status/power.js:249 ../src/shell-app-system.c:1013 +msgid "Unknown" +msgstr "Onbekend" + +#: ../js/ui/status/volume.js:44 +msgid "Volume" +msgstr "Volume" + +#: ../js/ui/status/volume.js:57 +msgid "Microphone" +msgstr "Mikrofoon" + +#: ../js/ui/telepathyClient.js:239 +#, c-format +msgid "%s is online." +msgstr "%s is aanlyn." + +#: ../js/ui/telepathyClient.js:244 +#, c-format +msgid "%s is offline." +msgstr "%s is vanlyn." + +#: ../js/ui/telepathyClient.js:247 +#, c-format +msgid "%s is away." +msgstr "%s is weg." + +#: ../js/ui/telepathyClient.js:250 +#, c-format +msgid "%s is busy." +msgstr "%s is besig." + +#. Translators: this is a time format string followed by a date. +#. If applicable, replace %X with a strftime format valid for your +#. locale, without seconds. +#: ../js/ui/telepathyClient.js:348 +#, no-c-format +msgid "Sent at %X on %A" +msgstr "%A gestuur om %X" + +#. Translators: this is the text displayed +#. in the search entry when no search is +#. active; it should not exceed ~30 +#. characters. +#: ../js/ui/viewSelector.js:103 +msgid "Type to search..." +msgstr "Tik om te soek..." + +#: ../js/ui/windowAttentionHandler.js:42 +#, c-format +msgid "%s has finished starting" +msgstr "%s het sy aanvang geneem" + +#: ../js/ui/windowAttentionHandler.js:44 +#, c-format +msgid "'%s' is ready" +msgstr "'%s' is gereed" + +#. translators: +#. * The number of sound outputs on a particular device +#: ../src/gvc/gvc-mixer-control.c:1094 +#, c-format +msgid "%u Output" +msgid_plural "%u Outputs" +msgstr[0] "%u afvoer" +msgstr[1] "%u afvoere" + +#. translators: +#. * The number of sound inputs on a particular device +#: ../src/gvc/gvc-mixer-control.c:1104 +#, c-format +msgid "%u Input" +msgid_plural "%u Inputs" +msgstr[0] "%u toevoer" +msgstr[1] "%u toevoere" + +#: ../src/gvc/gvc-mixer-control.c:1402 +msgid "System Sounds" +msgstr "Stelselklanke" + +#: ../src/shell-global.c:1298 +msgid "Less than a minute ago" +msgstr "Minder as 'n minuut gelede" + +#: ../src/shell-global.c:1302 +#, c-format +msgid "%d minute ago" +msgid_plural "%d minutes ago" +msgstr[0] "%d minuut gelede" +msgstr[1] "%d minute gelede" + +#: ../src/shell-global.c:1307 +#, c-format +msgid "%d hour ago" +msgid_plural "%d hours ago" +msgstr[0] "%d uur gelede" +msgstr[1] "%d ure gelede" + +#: ../src/shell-global.c:1312 +#, c-format +msgid "%d day ago" +msgid_plural "%d days ago" +msgstr[0] "%d dag gelede" +msgstr[1] "%d dae gelede" + +#: ../src/shell-global.c:1317 +#, c-format +msgid "%d week ago" +msgid_plural "%d weeks ago" +msgstr[0] "%d week gelede" +msgstr[1] "%d weke gelede" + +#: ../src/shell-polkit-authentication-agent.c:334 +msgid "Authentication dialog was dismissed by the user" +msgstr "" + +#: ../src/shell-util.c:89 +msgid "Home Folder" +msgstr "Tuisgids" + +#. Translators: this is the same string as the one found in +#. * nautilus +#: ../src/shell-util.c:104 +msgid "File System" +msgstr "Lêerstelsel" + +#: ../src/shell-util.c:250 +msgid "Search" +msgstr "Soek" + +#. Translators: the first string is the name of a gvfs +#. * method, and the second string is a path. For +#. * example, "Trash: some-directory". It means that the +#. * directory called "some-directory" is in the trash. +#. +#: ../src/shell-util.c:300 +#, c-format +msgid "%1$s: %2$s" +msgstr "%1$s: %2$s" From 04473f607b8baf58160c6cbed11d5dc5ec88174c Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 10 Mar 2011 19:17:14 -0500 Subject: [PATCH 06/44] gnome-shell-jhbuild: exit 1 if gnome-shell-real failed We need to be propagating the failure exit code so that gnome-session knows something went wrong. --- src/gnome-shell-jhbuild.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/gnome-shell-jhbuild.in b/src/gnome-shell-jhbuild.in index 3774777ab..f10a576ff 100755 --- a/src/gnome-shell-jhbuild.in +++ b/src/gnome-shell-jhbuild.in @@ -548,3 +548,8 @@ try: finally: if options.replace and (options.perf or not normal_exit): restore_gnome() + +if normal_exit: + sys.exit(0) +else: + sys.exit(1) From 74314bacd78078ca5b1ce736f6db02a666cfca49 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 11 Mar 2011 10:29:27 -0500 Subject: [PATCH 07/44] Remove DYNAMIC_MOZJS_HACK bits Not used anymore now that gnome-shell is a real ELF binary with an rpath. --- configure.ac | 14 -------------- src/Makefile.am | 1 - 2 files changed, 15 deletions(-) diff --git a/configure.ac b/configure.ac index ebd585120..32bcc01fa 100644 --- a/configure.ac +++ b/configure.ac @@ -190,20 +190,6 @@ AC_ARG_ENABLE(jhbuild-wrapper-script, AS_HELP_STRING([--jhbuild-wrapper-script=yes],[Make "gnome-shell" script work for jhbuild]),,enable_jhbuild_wrapper_script=no) AM_CONDITIONAL(USE_JHBUILD_WRAPPER_SCRIPT, test "x$enable_jhbuild_wrapper_script" = xyes) -AC_MSG_CHECKING([for Ubuntu]) -if test -f /etc/ubuntu_version; then - enable_dynamic_mozjs_hack_default=yes - AC_MSG_RESULT([yes]) -else - enable_dynamic_mozjs_hack_default=no - AC_MSG_RESULT([no]) -fi - -AC_ARG_ENABLE(dynamic-mozjs-hack, - AS_HELP_STRING([--dynamic-mozjs-hack=no],[Look for libmozjs.so using pkg-config]),,enable_dynamic_mozjs_hack=$enable_dynamic_mozjs_hack_default) -ENABLE_DYNAMIC_MOZJS_HACK=$enable_dynamic_mozjs_hack -AC_SUBST(ENABLE_DYNAMIC_MOZJS_HACK) - AC_CONFIG_FILES([ Makefile data/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 1c3e1b68c..eb346e2ca 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -39,7 +39,6 @@ generated_script_substitutions = \ -e "s|@libexecdir[@]|$(libexecdir)|" \ -e "s|@libdir[@]|$(libdir)|" \ -e "s|@pkgdatadir[@]|$(pkgdatadir)|" \ - -e "s|@ENABLE_DYNAMIC_MOZJS_HACK[@]|$(ENABLE_DYNAMIC_MOZJS_HACK)|" \ -e "s|@PYTHON[@]|$(PYTHON)|" \ -e "s|@VERSION[@]|$(VERSION)|" \ -e "s|@sysconfdir[@]|$(sysconfdir)|" From f8cdaaae30b5a8fc8f80fd163d1380fef3c9d50d Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Fri, 11 Mar 2011 15:30:35 +0000 Subject: [PATCH 08/44] gvc: Update from gnome-control-center https://bugzilla.gnome.org/show_bug.cgi?id=644511 --- src/gvc/gvc-mixer-card.c | 4 +- src/gvc/gvc-mixer-control.c | 136 ++++++++++++++++++------------ src/gvc/gvc-mixer-control.h | 3 + src/gvc/gvc-mixer-event-role.c | 13 --- src/gvc/gvc-mixer-sink-input.c | 24 ------ src/gvc/gvc-mixer-sink.c | 24 ------ src/gvc/gvc-mixer-source-output.c | 13 --- src/gvc/gvc-mixer-source.c | 24 ------ src/gvc/gvc-mixer-stream.c | 11 ++- src/gvc/gvc-mixer-stream.h | 2 + 10 files changed, 98 insertions(+), 156 deletions(-) diff --git a/src/gvc/gvc-mixer-card.c b/src/gvc/gvc-mixer-card.c index f198f1b1c..56502e3e4 100644 --- a/src/gvc/gvc-mixer-card.c +++ b/src/gvc/gvc-mixer-card.c @@ -157,7 +157,7 @@ gvc_mixer_card_get_profile (GvcMixerCard *card) GList *l; g_return_val_if_fail (GVC_IS_MIXER_CARD (card), NULL); - g_return_val_if_fail (card->priv->profiles != NULL, FALSE); + g_return_val_if_fail (card->priv->profiles != NULL, NULL); for (l = card->priv->profiles; l != NULL; l = l->next) { GvcMixerCardProfile *p = l->data; @@ -266,7 +266,7 @@ gvc_mixer_card_change_profile (GvcMixerCard *card, const GList * gvc_mixer_card_get_profiles (GvcMixerCard *card) { - g_return_val_if_fail (GVC_IS_MIXER_CARD (card), FALSE); + g_return_val_if_fail (GVC_IS_MIXER_CARD (card), NULL); return card->priv->profiles; } diff --git a/src/gvc/gvc-mixer-control.c b/src/gvc/gvc-mixer-control.c index d8d80f6af..0e6416544 100644 --- a/src/gvc/gvc-mixer-control.c +++ b/src/gvc/gvc-mixer-control.c @@ -615,13 +615,13 @@ static void update_default_source_from_name (GvcMixerControl *control, const char *name) { - gboolean changed; + gboolean changed = FALSE; if ((control->priv->default_source_name == NULL && name != NULL) || (control->priv->default_source_name != NULL && name == NULL) - || strcmp (control->priv->default_source_name, name) != 0) { + || (name != NULL && strcmp (control->priv->default_source_name, name) != 0)) { changed = TRUE; } @@ -640,13 +640,13 @@ static void update_default_sink_from_name (GvcMixerControl *control, const char *name) { - gboolean changed; + gboolean changed = FALSE; if ((control->priv->default_sink_name == NULL && name != NULL) || (control->priv->default_sink_name != NULL && name == NULL) - || strcmp (control->priv->default_sink_name, name) != 0) { + || (name != NULL && strcmp (control->priv->default_sink_name, name) != 0)) { changed = TRUE; } @@ -710,6 +710,58 @@ add_stream (GvcMixerControl *control, gvc_mixer_stream_get_id (stream)); } +static void +set_icon_name_from_proplist (GvcMixerStream *stream, + pa_proplist *l, + const char *default_icon_name) +{ + const char *t; + + if ((t = pa_proplist_gets (l, PA_PROP_DEVICE_ICON_NAME))) { + goto finish; + } + + if ((t = pa_proplist_gets (l, PA_PROP_MEDIA_ICON_NAME))) { + goto finish; + } + + if ((t = pa_proplist_gets (l, PA_PROP_WINDOW_ICON_NAME))) { + goto finish; + } + + if ((t = pa_proplist_gets (l, PA_PROP_APPLICATION_ICON_NAME))) { + goto finish; + } + + if ((t = pa_proplist_gets (l, PA_PROP_MEDIA_ROLE))) { + + if (strcmp (t, "video") == 0 || + strcmp (t, "phone") == 0) { + goto finish; + } + + if (strcmp (t, "music") == 0) { + t = "audio"; + goto finish; + } + + if (strcmp (t, "game") == 0) { + t = "applications-games"; + goto finish; + } + + if (strcmp (t, "event") == 0) { + t = "dialog-information"; + goto finish; + } + } + + t = default_icon_name; + + finish: + gvc_mixer_stream_set_icon_name (stream, t); +} + static void update_sink (GvcMixerControl *control, const pa_sink_info *info) @@ -767,7 +819,7 @@ update_sink (GvcMixerControl *control, gvc_mixer_stream_set_name (stream, info->name); gvc_mixer_stream_set_card_index (stream, info->card); gvc_mixer_stream_set_description (stream, info->description); - gvc_mixer_stream_set_icon_name (stream, "audio-card"); + set_icon_name_from_proplist (stream, info->proplist, "audio-card"); gvc_mixer_stream_set_volume (stream, (guint)max_volume); gvc_mixer_stream_set_is_muted (stream, info->mute); gvc_mixer_stream_set_can_decibel (stream, !!(info->flags & PA_SINK_DECIBEL_VOLUME)); @@ -856,7 +908,7 @@ update_source (GvcMixerControl *control, gvc_mixer_stream_set_name (stream, info->name); gvc_mixer_stream_set_card_index (stream, info->card); gvc_mixer_stream_set_description (stream, info->description); - gvc_mixer_stream_set_icon_name (stream, "audio-input-microphone"); + set_icon_name_from_proplist (stream, info->proplist, "audio-input-microphone"); gvc_mixer_stream_set_volume (stream, (guint)max_volume); gvc_mixer_stream_set_is_muted (stream, info->mute); gvc_mixer_stream_set_can_decibel (stream, !!(info->flags & PA_SOURCE_DECIBEL_VOLUME)); @@ -880,54 +932,6 @@ update_source (GvcMixerControl *control, } } -static void -set_icon_name_from_proplist (GvcMixerStream *stream, - pa_proplist *l, - const char *default_icon_name) -{ - const char *t; - - if ((t = pa_proplist_gets (l, PA_PROP_MEDIA_ICON_NAME))) { - goto finish; - } - - if ((t = pa_proplist_gets (l, PA_PROP_WINDOW_ICON_NAME))) { - goto finish; - } - - if ((t = pa_proplist_gets (l, PA_PROP_APPLICATION_ICON_NAME))) { - goto finish; - } - - if ((t = pa_proplist_gets (l, PA_PROP_MEDIA_ROLE))) { - - if (strcmp (t, "video") == 0 || - strcmp (t, "phone") == 0) { - goto finish; - } - - if (strcmp (t, "music") == 0) { - t = "audio"; - goto finish; - } - - if (strcmp (t, "game") == 0) { - t = "applications-games"; - goto finish; - } - - if (strcmp (t, "event") == 0) { - t = "dialog-information"; - goto finish; - } - } - - t = default_icon_name; - - finish: - gvc_mixer_stream_set_icon_name (stream, t); -} - static void set_is_event_stream_from_proplist (GvcMixerStream *stream, pa_proplist *l) @@ -1121,7 +1125,7 @@ update_card (GvcMixerControl *control, const pa_card_info *info) { GvcMixerCard *card; - gboolean is_new; + gboolean is_new = FALSE; #if 1 guint i; const char *key; @@ -1989,6 +1993,11 @@ gvc_mixer_control_dispose (GObject *object) { GvcMixerControl *control = GVC_MIXER_CONTROL (object); + if (control->priv->reconnect_id != 0) { + g_source_remove (control->priv->reconnect_id); + control->priv->reconnect_id = 0; + } + if (control->priv->pa_context != NULL) { pa_context_unref (control->priv->pa_context); control->priv->pa_context = NULL; @@ -2230,3 +2239,20 @@ gvc_mixer_control_new (const char *name) NULL); return GVC_MIXER_CONTROL (control); } + +/* FIXME: Remove when PA 0.9.23 is used */ +#ifndef PA_VOLUME_UI_MAX +#define PA_VOLUME_UI_MAX pa_sw_volume_from_dB(+11.0) +#endif + +gdouble +gvc_mixer_control_get_vol_max_norm (GvcMixerControl *control) +{ + return (gdouble) PA_VOLUME_NORM; +} + +gdouble +gvc_mixer_control_get_vol_max_amplified (GvcMixerControl *control) +{ + return (gdouble) PA_VOLUME_UI_MAX; +} diff --git a/src/gvc/gvc-mixer-control.h b/src/gvc/gvc-mixer-control.h index d32b20493..3aa2c948e 100644 --- a/src/gvc/gvc-mixer-control.h +++ b/src/gvc/gvc-mixer-control.h @@ -91,6 +91,9 @@ gboolean gvc_mixer_control_set_default_sink (GvcMixerControl *con gboolean gvc_mixer_control_set_default_source (GvcMixerControl *control, GvcMixerStream *stream); +gdouble gvc_mixer_control_get_vol_max_norm (GvcMixerControl *control); +gdouble gvc_mixer_control_get_vol_max_amplified (GvcMixerControl *control); + G_END_DECLS #endif /* __GVC_MIXER_CONTROL_H */ diff --git a/src/gvc/gvc-mixer-event-role.c b/src/gvc/gvc-mixer-event-role.c index 071722e48..5a2876758 100644 --- a/src/gvc/gvc-mixer-event-role.c +++ b/src/gvc/gvc-mixer-event-role.c @@ -156,25 +156,12 @@ gvc_mixer_event_role_get_property (GObject *object, } } -static GObject * -gvc_mixer_event_role_constructor (GType type, - guint n_construct_properties, - GObjectConstructParam *construct_params) -{ - GObject *object; - - object = G_OBJECT_CLASS (gvc_mixer_event_role_parent_class)->constructor (type, n_construct_properties, construct_params); - - return object; -} - static void gvc_mixer_event_role_class_init (GvcMixerEventRoleClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); GvcMixerStreamClass *stream_class = GVC_MIXER_STREAM_CLASS (klass); - object_class->constructor = gvc_mixer_event_role_constructor; object_class->finalize = gvc_mixer_event_role_finalize; object_class->set_property = gvc_mixer_event_role_set_property; object_class->get_property = gvc_mixer_event_role_get_property; diff --git a/src/gvc/gvc-mixer-sink-input.c b/src/gvc/gvc-mixer-sink-input.c index 5cd665c9c..03ba3b2f2 100644 --- a/src/gvc/gvc-mixer-sink-input.c +++ b/src/gvc/gvc-mixer-sink-input.c @@ -43,7 +43,6 @@ struct GvcMixerSinkInputPrivate static void gvc_mixer_sink_input_class_init (GvcMixerSinkInputClass *klass); static void gvc_mixer_sink_input_init (GvcMixerSinkInput *mixer_sink_input); static void gvc_mixer_sink_input_finalize (GObject *object); -static void gvc_mixer_sink_input_dispose (GObject *object); G_DEFINE_TYPE (GvcMixerSinkInput, gvc_mixer_sink_input, GVC_TYPE_MIXER_STREAM) @@ -107,26 +106,12 @@ gvc_mixer_sink_input_change_is_muted (GvcMixerStream *stream, return TRUE; } -static GObject * -gvc_mixer_sink_input_constructor (GType type, - guint n_construct_properties, - GObjectConstructParam *construct_params) -{ - GObject *object; - - object = G_OBJECT_CLASS (gvc_mixer_sink_input_parent_class)->constructor (type, n_construct_properties, construct_params); - - return object; -} - static void gvc_mixer_sink_input_class_init (GvcMixerSinkInputClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); GvcMixerStreamClass *stream_class = GVC_MIXER_STREAM_CLASS (klass); - object_class->constructor = gvc_mixer_sink_input_constructor; - object_class->dispose = gvc_mixer_sink_input_dispose; object_class->finalize = gvc_mixer_sink_input_finalize; stream_class->push_volume = gvc_mixer_sink_input_push_volume; @@ -141,15 +126,6 @@ gvc_mixer_sink_input_init (GvcMixerSinkInput *sink_input) sink_input->priv = GVC_MIXER_SINK_INPUT_GET_PRIVATE (sink_input); } -static void -gvc_mixer_sink_input_dispose (GObject *object) -{ - g_return_if_fail (object != NULL); - g_return_if_fail (GVC_IS_MIXER_SINK_INPUT (object)); - - G_OBJECT_CLASS (gvc_mixer_sink_input_parent_class)->dispose (object); -} - static void gvc_mixer_sink_input_finalize (GObject *object) { diff --git a/src/gvc/gvc-mixer-sink.c b/src/gvc/gvc-mixer-sink.c index 5b74a5ec6..a6f14935f 100644 --- a/src/gvc/gvc-mixer-sink.c +++ b/src/gvc/gvc-mixer-sink.c @@ -43,7 +43,6 @@ struct GvcMixerSinkPrivate static void gvc_mixer_sink_class_init (GvcMixerSinkClass *klass); static void gvc_mixer_sink_init (GvcMixerSink *mixer_sink); static void gvc_mixer_sink_finalize (GObject *object); -static void gvc_mixer_sink_dispose (GObject *object); G_DEFINE_TYPE (GvcMixerSink, gvc_mixer_sink, GVC_TYPE_MIXER_STREAM) @@ -139,26 +138,12 @@ gvc_mixer_sink_change_port (GvcMixerStream *stream, #endif /* PA_MICRO > 15 */ } -static GObject * -gvc_mixer_sink_constructor (GType type, - guint n_construct_properties, - GObjectConstructParam *construct_params) -{ - GObject *object; - - object = G_OBJECT_CLASS (gvc_mixer_sink_parent_class)->constructor (type, n_construct_properties, construct_params); - - return object; -} - static void gvc_mixer_sink_class_init (GvcMixerSinkClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); GvcMixerStreamClass *stream_class = GVC_MIXER_STREAM_CLASS (klass); - object_class->constructor = gvc_mixer_sink_constructor; - object_class->dispose = gvc_mixer_sink_dispose; object_class->finalize = gvc_mixer_sink_finalize; stream_class->push_volume = gvc_mixer_sink_push_volume; @@ -174,15 +159,6 @@ gvc_mixer_sink_init (GvcMixerSink *sink) sink->priv = GVC_MIXER_SINK_GET_PRIVATE (sink); } -static void -gvc_mixer_sink_dispose (GObject *object) -{ - g_return_if_fail (object != NULL); - g_return_if_fail (GVC_IS_MIXER_SINK (object)); - - G_OBJECT_CLASS (gvc_mixer_sink_parent_class)->dispose (object); -} - static void gvc_mixer_sink_finalize (GObject *object) { diff --git a/src/gvc/gvc-mixer-source-output.c b/src/gvc/gvc-mixer-source-output.c index 8d76763bb..536487b70 100644 --- a/src/gvc/gvc-mixer-source-output.c +++ b/src/gvc/gvc-mixer-source-output.c @@ -60,25 +60,12 @@ gvc_mixer_source_output_change_is_muted (GvcMixerStream *stream, return TRUE; } -static GObject * -gvc_mixer_source_output_constructor (GType type, - guint n_construct_properties, - GObjectConstructParam *construct_params) -{ - GObject *object; - - object = G_OBJECT_CLASS (gvc_mixer_source_output_parent_class)->constructor (type, n_construct_properties, construct_params); - - return object; -} - static void gvc_mixer_source_output_class_init (GvcMixerSourceOutputClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); GvcMixerStreamClass *stream_class = GVC_MIXER_STREAM_CLASS (klass); - object_class->constructor = gvc_mixer_source_output_constructor; object_class->finalize = gvc_mixer_source_output_finalize; stream_class->push_volume = gvc_mixer_source_output_push_volume; diff --git a/src/gvc/gvc-mixer-source.c b/src/gvc/gvc-mixer-source.c index 6fed25e7b..ebb05a6a8 100644 --- a/src/gvc/gvc-mixer-source.c +++ b/src/gvc/gvc-mixer-source.c @@ -43,7 +43,6 @@ struct GvcMixerSourcePrivate static void gvc_mixer_source_class_init (GvcMixerSourceClass *klass); static void gvc_mixer_source_init (GvcMixerSource *mixer_source); static void gvc_mixer_source_finalize (GObject *object); -static void gvc_mixer_source_dispose (GObject *object); G_DEFINE_TYPE (GvcMixerSource, gvc_mixer_source, GVC_TYPE_MIXER_STREAM) @@ -139,26 +138,12 @@ gvc_mixer_source_change_port (GvcMixerStream *stream, #endif /* PA_MICRO > 15 */ } -static GObject * -gvc_mixer_source_constructor (GType type, - guint n_construct_properties, - GObjectConstructParam *construct_params) -{ - GObject *object; - - object = G_OBJECT_CLASS (gvc_mixer_source_parent_class)->constructor (type, n_construct_properties, construct_params); - - return object; -} - static void gvc_mixer_source_class_init (GvcMixerSourceClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); GvcMixerStreamClass *stream_class = GVC_MIXER_STREAM_CLASS (klass); - object_class->constructor = gvc_mixer_source_constructor; - object_class->dispose = gvc_mixer_source_dispose; object_class->finalize = gvc_mixer_source_finalize; stream_class->push_volume = gvc_mixer_source_push_volume; @@ -174,15 +159,6 @@ gvc_mixer_source_init (GvcMixerSource *source) source->priv = GVC_MIXER_SOURCE_GET_PRIVATE (source); } -static void -gvc_mixer_source_dispose (GObject *object) -{ - g_return_if_fail (object != NULL); - g_return_if_fail (GVC_IS_MIXER_SOURCE (object)); - - G_OBJECT_CLASS (gvc_mixer_source_parent_class)->dispose (object); -} - static void gvc_mixer_source_finalize (GObject *object) { diff --git a/src/gvc/gvc-mixer-stream.c b/src/gvc/gvc-mixer-stream.c index 3b4953aa0..3637bb4cc 100644 --- a/src/gvc/gvc-mixer-stream.c +++ b/src/gvc/gvc-mixer-stream.c @@ -390,6 +390,15 @@ gvc_mixer_stream_get_icon_name (GvcMixerStream *stream) return stream->priv->icon_name; } +GIcon * +gvc_mixer_stream_get_gicon (GvcMixerStream *stream) +{ + g_return_val_if_fail (GVC_IS_MIXER_STREAM (stream), NULL); + if (stream->priv->icon_name == NULL) + return NULL; + return g_themed_icon_new_with_default_fallbacks (stream->priv->icon_name); +} + gboolean gvc_mixer_stream_set_icon_name (GvcMixerStream *stream, const char *icon_name) @@ -496,7 +505,7 @@ gvc_mixer_stream_change_port (GvcMixerStream *stream, const GList * gvc_mixer_stream_get_ports (GvcMixerStream *stream) { - g_return_val_if_fail (GVC_IS_MIXER_STREAM (stream), FALSE); + g_return_val_if_fail (GVC_IS_MIXER_STREAM (stream), NULL); return stream->priv->ports; } diff --git a/src/gvc/gvc-mixer-stream.h b/src/gvc/gvc-mixer-stream.h index 53b7eb6d6..1c38e6b8d 100644 --- a/src/gvc/gvc-mixer-stream.h +++ b/src/gvc/gvc-mixer-stream.h @@ -24,6 +24,7 @@ #include #include "gvc-pulseaudio-fake.h" #include "gvc-channel-map.h" +#include G_BEGIN_DECLS @@ -84,6 +85,7 @@ gboolean gvc_mixer_stream_change_is_muted (GvcMixerStream *stream, gboolean gvc_mixer_stream_is_running (GvcMixerStream *stream); const char * gvc_mixer_stream_get_name (GvcMixerStream *stream); const char * gvc_mixer_stream_get_icon_name (GvcMixerStream *stream); +GIcon * gvc_mixer_stream_get_gicon (GvcMixerStream *stream); const char * gvc_mixer_stream_get_description (GvcMixerStream *stream); const char * gvc_mixer_stream_get_application_id (GvcMixerStream *stream); gboolean gvc_mixer_stream_is_event_stream (GvcMixerStream *stream); From cbb887681582368c7380377fe07a99db7ea71e27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Fri, 11 Mar 2011 16:24:24 +0000 Subject: [PATCH 09/44] gvc: Fix introspection building --- src/Makefile-gvc.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile-gvc.am b/src/Makefile-gvc.am index 67ddcdffc..bb8e5466f 100644 --- a/src/Makefile-gvc.am +++ b/src/Makefile-gvc.am @@ -44,7 +44,7 @@ libgvc_la_SOURCES = \ $(libgvc_la_private_sources) Gvc-1.0.gir: libgvc.la -Gvc_1_0_gir_INCLUDES = GObject-2.0 +Gvc_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0 Gvc_1_0_gir_CFLAGS = $(INCLUDES) -I$(srcdir)/gvc -DWITH_INTROSPECTION Gvc_1_0_gir_LIBS = libgvc.la Gvc_1_0_gir_FILES = $(addprefix $(srcdir)/,$(libgvc_la_gir_sources)) From bdd1f827775f490fc9c119091efb1dce69ce1208 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Fri, 11 Mar 2011 15:45:11 +0000 Subject: [PATCH 10/44] volume: Use constants from GVC Instead of defining our own. https://bugzilla.gnome.org/show_bug.cgi?id=644511 --- js/ui/status/volume.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/js/ui/status/volume.js b/js/ui/status/volume.js index dde673d1f..36aa65d12 100644 --- a/js/ui/status/volume.js +++ b/js/ui/status/volume.js @@ -16,7 +16,6 @@ const Util = imports.misc.util; const Gettext = imports.gettext.domain('gnome-shell'); const _ = Gettext.gettext; -const VOLUME_MAX = 65536.0; /* PA_VOLUME_NORM */ const VOLUME_ADJUSTMENT_STEP = 0.05; /* Volume adjustment step in % */ const VOLUME_NOTIFY_ID = 1; @@ -37,6 +36,8 @@ Indicator.prototype = { this._control.connect('default-source-changed', Lang.bind(this, this._readInput)); this._control.connect('stream-added', Lang.bind(this, this._maybeShowInput)); this._control.connect('stream-removed', Lang.bind(this, this._maybeShowInput)); + this._volumeMax = this._control.get_vol_max_norm(); + this._volumeMaxAmplified = this._control.get_vol_max_amplified(); this._output = null; this._outputVolumeId = 0; @@ -72,9 +73,9 @@ Indicator.prototype = { _getMaxVolume: function(property) { if (this[property].get_can_decibel()) - return (VOLUME_MAX * 1.5); + return this._volumeMaxAmplified; else - return VOLUME_MAX; + return this._volumeMax; }, _onScrollEvent: function(actor, event) { From 7c937c8704909c006502cf29b16acf125019d549 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Fri, 11 Mar 2011 17:50:49 +0000 Subject: [PATCH 11/44] gvc: Fix missing introspection It's all Bastien's fault --- src/gvc/gvc-mixer-stream.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/gvc/gvc-mixer-stream.c b/src/gvc/gvc-mixer-stream.c index 3637bb4cc..78de6b3e6 100644 --- a/src/gvc/gvc-mixer-stream.c +++ b/src/gvc/gvc-mixer-stream.c @@ -390,6 +390,12 @@ gvc_mixer_stream_get_icon_name (GvcMixerStream *stream) return stream->priv->icon_name; } +/** + * gvc_mixer_stream_get_gicon: + * @stream: a #GvcMixerStream + * + * Returns: (transfer full): a new #GIcon + */ GIcon * gvc_mixer_stream_get_gicon (GvcMixerStream *stream) { From 43a243b24ab3aa47716de6c98e25c01985ca3082 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Fri, 11 Mar 2011 21:12:24 +0100 Subject: [PATCH 12/44] CSS: Remove a left-over from an earlier relayout iteration --- data/theme/gnome-shell.css | 9 --------- 1 file changed, 9 deletions(-) diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css index 22670bdef..4fd303a95 100644 --- a/data/theme/gnome-shell.css +++ b/data/theme/gnome-shell.css @@ -464,15 +464,6 @@ StTooltip StLabel { height: 24px; } -.view-tab-boxpointer { - -arrow-border-radius: 9px; - -arrow-background-color: rgba(0,0,0,0.5); - -arrow-border-width: 2px; - -arrow-border-color: rgba(255,255,255,0.5); - -arrow-base: 30px; - -arrow-rise: 15px; -} - #searchResults { padding: 20px 10px 10px 10px; spacing: 18px; From 8a28022a6bafe6f19b16077f418185d3546e7220 Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Fri, 11 Mar 2011 18:37:40 -0500 Subject: [PATCH 13/44] Don't show the overview unless removing the workspace Don't enter the overview at startup, or when we we remove the last window on the first workspace, but only when we remove a workspace and there are windows on the other workspaces. https://bugzilla.gnome.org/show_bug.cgi?id=644541 --- js/ui/main.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/js/ui/main.js b/js/ui/main.js index a57ba2433..24dab3193 100644 --- a/js/ui/main.js +++ b/js/ui/main.js @@ -263,9 +263,13 @@ function _checkWorkspaces() { } let activeWorkspaceIndex = global.screen.get_active_workspace_index(); - let currentWorkspaceEmpty = emptyWorkspaces[activeWorkspaceIndex]; + let removingCurrentWorkspace = (emptyWorkspaces[activeWorkspaceIndex] && + activeWorkspaceIndex < emptyWorkspaces.length - 1); + // Don't enter the overview when removing multiple empty workspaces at startup + let showOverview = (removingCurrentWorkspace && + !emptyWorkspaces.every(function(x) { return x; })); - if (currentWorkspaceEmpty) { + if (removingCurrentWorkspace) { // "Merge" the empty workspace we are removing with the one at the end wm.blockAnimations(); } @@ -276,11 +280,11 @@ function _checkWorkspaces() { global.screen.remove_workspace(_workspaces[i], global.get_current_time()); } - if (currentWorkspaceEmpty) { + if (removingCurrentWorkspace) { global.screen.get_workspace_by_index(global.screen.n_workspaces - 1).activate(global.get_current_time()); wm.unblockAnimations(); - if (!overview.visible) + if (!overview.visible && showOverview) overview.show(); } From 1954a023524724ff3a9cf7887cef6aef2f6cb6af Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Tue, 8 Mar 2011 18:04:34 -0500 Subject: [PATCH 14/44] gnome-shell-jhbuild: Fix race condition when launching DConf manually We need to connect to the NameOwnerChanged signal before we execute the DConf binary. Refactor things so that we connect to the signal when we first get the bus object. Split the code for waiting for a D-Bus name into a wait_for_dbus_name() function for latter reuse. https://bugzilla.gnome.org/show_bug.cgi?id=644265 --- src/gnome-shell-jhbuild.in | 69 ++++++++++++++++++++++++++------------ 1 file changed, 48 insertions(+), 21 deletions(-) diff --git a/src/gnome-shell-jhbuild.in b/src/gnome-shell-jhbuild.in index f10a576ff..54dfed862 100755 --- a/src/gnome-shell-jhbuild.in +++ b/src/gnome-shell-jhbuild.in @@ -79,11 +79,56 @@ def get_running_session_environs(): result[key] = environs[key] return result +_bus = None +_bus_iface = None +_name_owner_changed_hook = None + +def on_name_owner_changed(name, prev_owner, new_owner): + if _name_owner_changed_hook: + _name_owner_changed_hook(name, prev_owner, new_owner) + +def get_bus(): + global _bus + if _bus is None: + dbus_loop = DBusGMainLoop() + _bus = dbus.SessionBus(mainloop=dbus_loop) + return _bus + +def get_bus_iface(): + global _bus_iface + if _bus_iface is None: + bus = get_bus() + bus_proxy = bus.get_object('org.freedesktop.DBus', '/org/freedesktop/DBus') + _bus_iface = dbus.Interface(bus_proxy, 'org.freedesktop.DBus') + _bus_iface.connect_to_signal('NameOwnerChanged', on_name_owner_changed) + return _bus_iface + +def wait_for_dbus_name(wait_name): + global _name_owner_changed_hook + + bus_iface = get_bus_iface() + loop = gobject.MainLoop() + + def on_name_owner_changed(name, prev_owner, new_owner): + if not (name == wait_name and new_owner != ''): + return + loop.quit() + return + _name_owner_changed_hook = on_name_owner_changed + + def on_timeout(): + print "\nFailed to start %s: timed out" % (wait_name,) + sys.exit(1) + gobject.timeout_add_seconds(7, on_timeout) + + loop.run() + _name_owner_changed_hook = None + def start_dconf_await_service(): DCONF_NAME = 'ca.desrt.dconf' - dbus_loop = DBusGMainLoop() - bus = dbus.SessionBus(mainloop=dbus_loop) + bus = get_bus() + get_bus_iface() # connect to NameOwnerChanged signal # See if the service is already running or normal D-Bus activation works need_manual_activate = False @@ -122,25 +167,7 @@ def start_dconf_await_service(): print "\nFailed to start %s: %s" % (dconf_path, e) sys.exit(1) - bus_proxy = bus.get_object('org.freedesktop.DBus', '/org/freedesktop/DBus') - bus_iface = dbus.Interface(bus_proxy, 'org.freedesktop.DBus') - - loop = gobject.MainLoop() - - def on_name_owner_changed(name, prev_owner, new_owner): - if not (name == DCONF_NAME and new_owner != ''): - return - print "started" - loop.quit() - return - bus_iface.connect_to_signal('NameOwnerChanged', on_name_owner_changed) - - def on_timeout(): - print "\nFailed to start %s: timed out" % (dconf_path,) - sys.exit(1) - gobject.timeout_add_seconds(7, on_timeout) - - loop.run() + wait_for_dbus_name (DCONF_NAME) def start_shell(perf_output=None): self_dir = os.path.dirname(os.path.abspath(sys.argv[0])) From c6a2814881d2857a46b4fd55cb90caa7776501cd Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Tue, 8 Mar 2011 18:17:53 -0500 Subject: [PATCH 15/44] gnome-shell-perf-helper: add server for creating test windows Add a small D-Bus server program that the performance tests can use to create well-specificed sets of windows. https://bugzilla.gnome.org/show_bug.cgi?id=644265 --- configure.ac | 2 + src/Makefile.am | 8 + src/shell-perf-helper.c | 346 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 356 insertions(+) create mode 100644 src/shell-perf-helper.c diff --git a/configure.ac b/configure.ac index 32bcc01fa..4da29428e 100644 --- a/configure.ac +++ b/configure.ac @@ -89,6 +89,8 @@ PKG_CHECK_MODULES(GNOME_SHELL, gio-2.0 >= $GIO_MIN_VERSION telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION polkit-agent-1 >= $POLKIT_MIN_VERSION) +PKG_CHECK_MODULES(SHELL_PERF_HELPER, gtk+-3.0 gio-2.0) + GJS_VERSION=`$PKG_CONFIG --modversion gjs-internals-1.0` AC_DEFINE_UNQUOTED([GJS_VERSION], ["$GJS_VERSION"], [The version of GJS we're linking to]) AC_SUBST([GJS_VERSION], ["$GJS_VERSION"]) diff --git a/src/Makefile.am b/src/Makefile.am index eb346e2ca..7c251de0a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -168,6 +168,14 @@ endif BUILD_RECORDER ######################################## +libexec_PROGRAMS += gnome-shell-perf-helper + +gnome_shell_perf_helper_SOURCES = shell-perf-helper.c +gnome_shell_perf_helper_CPPFLAGS = $(SHELL_PERF_HELPER_CFLAGS) +gnome_shell_perf_helper_LDADD = $(SHELL_PERF_HELPER_LIBS) + +######################################## + # In order to run the interactive tests for GUI components, we need to have # an executable that exports the St components. Libtool doesn't have a way # to include all the symbols from a convenience library into a executable diff --git a/src/shell-perf-helper.c b/src/shell-perf-helper.c new file mode 100644 index 000000000..92de68b0a --- /dev/null +++ b/src/shell-perf-helper.c @@ -0,0 +1,346 @@ +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ + +/* gnome-shell-perf-helper: a program to create windows for performance tests + * + * Running performance tests with whatever windows a user has open results + * in unreliable results, so instead we hide all other windows and talk + * to this program over D-Bus to create just the windows we want. + */ + +#include "config.h" + +#include +#include + +#define BUS_NAME "org.gnome.Shell.PerfHelper" + +static void destroy_windows (void); +static void finish_wait_windows (void); +static void check_finish_wait_windows (void); + +static const gchar introspection_xml[] = + "" + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + ""; + +typedef struct { + GtkWidget *window; + int width; + int height; + + guint alpha : 1; + guint maximized : 1; + guint mapped : 1; + guint exposed : 1; + guint pending : 1; +} WindowInfo; + +static int opt_idle_timeout = 30; + +static GOptionEntry opt_entries[] = + { + { "idle-timeout", 'r', 0, G_OPTION_ARG_INT, &opt_idle_timeout, "Exit after N seconds", "N" }, + { NULL } + }; + +static Display *xdisplay; +static Window xroot; +static Atom atom_wm_state; +static Atom atom__net_wm_name; +static Atom atom_utf8_string; + +static guint timeout_id; +static GList *our_windows; +static GList *wait_windows_invocations; + +static gboolean +on_timeout (gpointer data) +{ + timeout_id = 0; + + destroy_windows (); + gtk_main_quit (); + + return FALSE; +} + +static void +establish_timeout () +{ + if (timeout_id != 0) + g_source_remove (timeout_id); + + timeout_id = g_timeout_add (opt_idle_timeout * 1000, on_timeout, NULL); +} + +static void +destroy_windows (void) +{ + GList *l; + + for (l = our_windows; l; l = l->next) + { + WindowInfo *info = l->data; + gtk_widget_destroy (info->window); + g_free (info); + } + + g_list_free (our_windows); + our_windows = NULL; + + check_finish_wait_windows (); +} + +static gboolean +on_window_map_event (GtkWidget *window, + GdkEventAny *event, + WindowInfo *info) +{ + info->mapped = TRUE; + + return FALSE; +} + +static gboolean +on_window_draw (GtkWidget *window, + cairo_t *cr, + WindowInfo *info) +{ + cairo_rectangle_int_t allocation; + gtk_widget_get_allocation (window, &allocation); + + /* We draw an arbitrary pattern of red lines near the border of the + * window to make it more clear than empty windows if something + * is drastrically wrong. + */ + + cairo_save (cr); + cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); + + if (info->alpha) + cairo_set_source_rgba (cr, 1, 1, 1, 0.5); + else + cairo_set_source_rgb (cr, 1, 1, 1); + + cairo_paint (cr); + cairo_restore (cr); + + cairo_set_source_rgb (cr, 1, 0, 0); + cairo_set_line_width (cr, 10); + cairo_move_to (cr, 0, 40); + cairo_line_to (cr, allocation.width, 40); + cairo_move_to (cr, 0, allocation.height - 40); + cairo_line_to (cr, allocation.width, allocation.height - 40); + cairo_move_to (cr, 40, 0); + cairo_line_to (cr, 40, allocation.height); + cairo_move_to (cr, allocation.width - 40, 0); + cairo_line_to (cr, allocation.width - 40, allocation.height); + cairo_stroke (cr); + + info->exposed = TRUE; + + if (info->exposed && info->mapped && info->pending) + { + info->pending = FALSE; + check_finish_wait_windows (); + } + + return FALSE; +} + +static void +create_window (int width, + int height, + gboolean alpha, + gboolean maximized) +{ + WindowInfo *info; + + info = g_new0 (WindowInfo, 1); + info->width = width; + info->height = height; + info->alpha = alpha; + info->maximized = maximized; + info->window = gtk_window_new (GTK_WINDOW_TOPLEVEL); + if (alpha) + gtk_widget_set_visual (info->window, gdk_screen_get_rgba_visual (gdk_screen_get_default ())); + if (maximized) + gtk_window_maximize (GTK_WINDOW (info->window)); + info->pending = TRUE; + + gtk_widget_set_size_request (info->window, width, height); + gtk_widget_set_app_paintable (info->window, TRUE); + g_signal_connect (info->window, "map-event", G_CALLBACK (on_window_map_event), info); + g_signal_connect (info->window, "draw", G_CALLBACK (on_window_draw), info); + gtk_widget_show (info->window); + + our_windows = g_list_prepend (our_windows, info); +} + +static void +finish_wait_windows (void) +{ + GList *l; + + for (l = wait_windows_invocations; l; l = l->next) + g_dbus_method_invocation_return_value (l->data, NULL); + + g_list_free (wait_windows_invocations); + wait_windows_invocations = NULL; +} + +static void +check_finish_wait_windows (void) +{ + GList *l; + gboolean have_pending = FALSE; + + for (l = our_windows; l; l = l->next) + { + WindowInfo *info = l->data; + if (info->pending) + have_pending = TRUE; + } + + if (!have_pending) + finish_wait_windows (); +} + +static void +handle_method_call (GDBusConnection *connection, + const gchar *sender, + const gchar *object_path, + const gchar *interface_name, + const gchar *method_name, + GVariant *parameters, + GDBusMethodInvocation *invocation, + gpointer user_data) +{ + /* Push off the idle timeout */ + establish_timeout (); + + if (g_strcmp0 (method_name, "Exit") == 0) + { + destroy_windows (); + + g_dbus_method_invocation_return_value (invocation, NULL); + g_dbus_connection_flush_sync (connection, NULL, NULL); + + gtk_main_quit (); + } + else if (g_strcmp0 (method_name, "CreateWindow") == 0) + { + int width, height; + gboolean alpha, maximized; + + g_variant_get (parameters, "(iibb)", &width, &height, &alpha, &maximized); + + create_window (width, height, alpha, maximized); + g_dbus_method_invocation_return_value (invocation, NULL); + } + else if (g_strcmp0 (method_name, "WaitWindows") == 0) + { + wait_windows_invocations = g_list_prepend (wait_windows_invocations, invocation); + check_finish_wait_windows (); + } + else if (g_strcmp0 (method_name, "DestroyWindows") == 0) + { + destroy_windows (); + g_dbus_method_invocation_return_value (invocation, NULL); + } +} + +static const GDBusInterfaceVTable interface_vtable = +{ + handle_method_call, + NULL, + NULL +}; + +static void +on_bus_acquired (GDBusConnection *connection, + const gchar *name, + gpointer user_data) +{ + GDBusNodeInfo *introspection_data = g_dbus_node_info_new_for_xml (introspection_xml, NULL); + + g_dbus_connection_register_object (connection, + "/org/gnome/Shell/PerfHelper", + introspection_data->interfaces[0], + &interface_vtable, + NULL, /* user_data */ + NULL, /* user_data_free_func */ + NULL); /* GError** */ +} + +static void +on_name_acquired (GDBusConnection *connection, + const gchar *name, + gpointer user_data) +{ +} + +static void +on_name_lost (GDBusConnection *connection, + const gchar *name, + gpointer user_data) +{ + destroy_windows (); + gtk_main_quit (); +} + +int +main (int argc, char **argv) +{ + GdkDisplay *display; + GdkScreen *screen; + GOptionContext *context; + GError *error = NULL; + + /* Since we depend on this, avoid the possibility of lt-gnome-shell-perf-helper */ + g_set_prgname ("gnome-shell-perf-helper"); + + context = g_option_context_new (" - server to create windows for performance testing"); + g_option_context_add_main_entries (context, opt_entries, NULL); + g_option_context_add_group (context, gtk_get_option_group (TRUE)); + if (!g_option_context_parse (context, &argc, &argv, &error)) + { + g_print ("option parsing failed: %s\n", error->message); + return 1; + } + + display = gdk_display_get_default (); + screen = gdk_screen_get_default (); + + xdisplay = gdk_x11_display_get_xdisplay (display); + xroot = gdk_x11_window_get_xid (gdk_screen_get_root_window (screen)); + atom_wm_state = gdk_x11_get_xatom_by_name_for_display (display, "WM_STATE"); + atom__net_wm_name = gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_NAME"); + atom_utf8_string = gdk_x11_get_xatom_by_name_for_display (display, "UTF8_STRING"); + + g_bus_own_name (G_BUS_TYPE_SESSION, + BUS_NAME, + G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT | + G_BUS_NAME_OWNER_FLAGS_REPLACE, + on_bus_acquired, + on_name_acquired, + on_name_lost, + NULL, + NULL); + + establish_timeout (); + + gtk_main (); + + return 0; +} From 821583acae732ede6ee18e2128c49703e82fb47f Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Tue, 8 Mar 2011 18:48:07 -0500 Subject: [PATCH 16/44] Use gnome-shell-perf-helper to control windows during perf tests * Run gnome-shell-perf-helper during performance tests * Use MUTTER_WM_CLASS_FILTER to omit all other windows * Add new Scripting methods: createTestWindow, waitTestWindows, destroyTestWindows * Create a single 640x480 test window for testing overview animation performance. https://bugzilla.gnome.org/show_bug.cgi?id=644265 --- js/perf/core.js | 4 ++ js/ui/scripting.js | 99 ++++++++++++++++++++++++++++++++++++++ src/gnome-shell-jhbuild.in | 35 ++++++++++++++ 3 files changed, 138 insertions(+) diff --git a/js/perf/core.js b/js/perf/core.js index b7e64547e..1bbeab7ca 100644 --- a/js/perf/core.js +++ b/js/perf/core.js @@ -38,6 +38,10 @@ function run() { Scripting.scriptEvent('overviewShowDone'); }); + Scripting.destroyTestWindows(); + Scripting.createTestWindow(640, 480, false, false); + Scripting.waitTestWindows(); + yield Scripting.sleep(1000); yield Scripting.waitLeisure(); for (let i = 0; i < 2; i++) { diff --git a/js/ui/scripting.js b/js/ui/scripting.js index b2537f224..2e38d1087 100644 --- a/js/ui/scripting.js +++ b/js/ui/scripting.js @@ -1,5 +1,6 @@ /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */ +const DBus = imports.dbus; const Gio = imports.gi.Gio; const Mainloop = imports.mainloop; @@ -68,6 +69,104 @@ function waitLeisure() { }; } +const PerfHelperIface = { + name: 'org.gnome.Shell.PerfHelper', + methods: [{ name: 'CreateWindow', inSignature: 'iibb', outSignature: '' }, + { name: 'WaitWindows', inSignature: '', outSignature: '' }, + { name: 'DestroyWindows', inSignature: '', outSignature: ''}] +}; + +const PerfHelper = function () { + this._init(); +}; + +PerfHelper.prototype = { + _init: function() { + DBus.session.proxifyObject(this, 'org.gnome.Shell.PerfHelper', '/org/gnome/Shell/PerfHelper'); + } +}; + +DBus.proxifyPrototype(PerfHelper.prototype, PerfHelperIface); + +let _perfHelper = null; +function _getPerfHelper() { + if (_perfHelper == null) + _perfHelper = new PerfHelper(); + + return _perfHelper; +} + +/** + * createTestWindow: + * @width: width of window, in pixels + * @height: height of window, in pixels + * @alpha: whether the window should be alpha transparent + * @maximized: whethe the window should be created maximized + * + * Creates a window using gnome-shell-perf-helper for testing purposes. + * While this function can be used with yield in an automation + * script to pause until the D-Bus call to the helper process returns, + * because of the normal X asynchronous mapping process, to actually wait + * until the window has been mapped and exposed, use waitTestWindows(). + */ +function createTestWindow(width, height, alpha, maximized) { + let cb; + let perfHelper = _getPerfHelper(); + + perfHelper.CreateWindowRemote(width, height, alpha, maximized, + function(result, excp) { + if (cb) + cb(); + }); + + return function(callback) { + cb = callback; + }; +} + +/** + * waitTestWindows: + * + * Used within an automation script to pause until all windows previously + * created with createTestWindow have been mapped and exposed. + */ +function waitTestWindows() { + let cb; + let perfHelper = _getPerfHelper(); + + perfHelper.WaitWindowsRemote(function(result, excp) { + if (cb) + cb(); + }); + + return function(callback) { + cb = callback; + }; +} + +/** + * destroyTestWindows: + * + * Destroys all windows previously created with createTestWindow(). + * While this function can be used with yield in an automation + * script to pause until the D-Bus call to the helper process returns, + * this doesn't guarantee that Mutter has actually finished the destroy + * process because of normal X asynchronicity. + */ +function destroyTestWindows() { + let cb; + let perfHelper = _getPerfHelper(); + + perfHelper.DestroyWindowsRemote(function(result, excp) { + if (cb) + cb(); + }); + + return function(callback) { + cb = callback; + }; +} + /** * defineScriptEvent * @name: The event will be called script. diff --git a/src/gnome-shell-jhbuild.in b/src/gnome-shell-jhbuild.in index 54dfed862..1cc4ef4d3 100755 --- a/src/gnome-shell-jhbuild.in +++ b/src/gnome-shell-jhbuild.in @@ -169,6 +169,29 @@ def start_dconf_await_service(): wait_for_dbus_name (DCONF_NAME) +PERF_HELPER_NAME = "org.gnome.Shell.PerfHelper" +PERF_HELPER_IFACE = "org.gnome.Shell.PerfHelper" +PERF_HELPER_PATH = "/org/gnome/Shell/PerfHelper" + +def start_perf_helper(): + get_bus_iface() # connect to NameOwnerChanged signal + + self_dir = os.path.dirname(os.path.abspath(sys.argv[0])) + running_from_source_tree = os.path.exists(os.path.join(self_dir, 'gnome-shell-jhbuild.in')) + + if running_from_source_tree: + perf_helper_path = os.path.join(self_dir, "gnome-shell-perf-helper") + else: + perf_helper_path = "@libexecdir@/gnome-shell-perf-helper" + + subprocess.Popen([perf_helper_path]) + wait_for_dbus_name (PERF_HELPER_NAME) + +def stop_perf_helper(): + bus = get_bus() + proxy = bus.get_object(PERF_HELPER_NAME, PERF_HELPER_PATH) + proxy.Exit(dbus_interface=PERF_HELPER_IFACE) + def start_shell(perf_output=None): self_dir = os.path.dirname(os.path.abspath(sys.argv[0])) if os.path.exists(os.path.join(self_dir, 'gnome-shell-jhbuild.in')): @@ -212,6 +235,7 @@ def start_shell(perf_output=None): if options.perf is not None: env['SHELL_PERF_MODULE'] = options.perf + env['MUTTER_WM_CLASS_FILTER'] = 'Gnome-shell-perf-helper' if perf_output is not None: env['SHELL_PERF_OUTPUT'] = perf_output @@ -389,6 +413,8 @@ def run_performance_test(): logs = [] metric_summaries = {} + start_perf_helper() + for i in xrange(0, iters): # We create an empty temporary file that the shell will overwrite # with the contents. @@ -399,17 +425,24 @@ def run_performance_test(): normal_exit = False try: normal_exit = run_shell(perf_output=output_file) + except: + stop_perf_helper() + raise finally: if not normal_exit: os.remove(output_file) if not normal_exit: + stop_perf_helper() return False try: f = open(output_file) output = json.load(f) f.close() + except: + stop_perf_helper() + raise finally: os.remove(output_file) @@ -436,6 +469,8 @@ def run_performance_test(): logs.append(output['log']) + stop_perf_helper() + if options.perf_output or options.perf_upload: # Write a complete report, formatted as JSON. The Javascript/C code that # generates the individual reports we are summarizing here is very careful From 44a1bc539644b4e24d8cdb4fa355e71c36ce7247 Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Tue, 8 Mar 2011 18:51:15 -0500 Subject: [PATCH 17/44] scripting.js: small cleanups - Fix missing trailing semicolons - Catch when something results in metrics not being to avoid hard-to-debug JSON parse errors. https://bugzilla.gnome.org/show_bug.cgi?id=644265 --- js/ui/scripting.js | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/js/ui/scripting.js b/js/ui/scripting.js index 2e38d1087..1fc583ea7 100644 --- a/js/ui/scripting.js +++ b/js/ui/scripting.js @@ -246,8 +246,8 @@ function _collect(scriptModule, outputFile) { Shell.write_string_to_stream(out, '"events":\n'); Shell.PerfLog.get_default().dump_events(out); - let monitors = global.get_monitors() - let primary = global.get_primary_monitor() + let monitors = global.get_monitors(); + let primary = global.get_primary_monitor(); Shell.write_string_to_stream(out, ',\n"monitors":\n['); for (let i = 0; i < monitors.length; i++) { let monitor = monitors[i]; @@ -266,7 +266,21 @@ function _collect(scriptModule, outputFile) { Shell.write_string_to_stream(out, ',\n"metrics":\n[ '); let first = true; for (let name in scriptModule.METRICS) { - let metric = scriptModule.METRICS[name]; + let metric = scriptModule.METRICS[name]; + // Extra checks here because JSON.stringify generates + // invalid JSON for undefined values + if (metric.description == null) { + log("Error: No description found for metric " + name); + continue; + } + if (metric.units == null) { + log("Error: No units found for metric " + name); + continue; + } + if (metric.value == null) { + log("Error: No value found for metric " + name); + continue; + } if (!first) Shell.write_string_to_stream(out, ',\n '); From 239aa7b8d5765472d1c1582adca552331b5983b3 Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Tue, 8 Mar 2011 18:54:23 -0500 Subject: [PATCH 18/44] perf: Add metrics for different window configurations Add metrics: overviewFps5Windows overviewFps10Windows overviewFps5Maximzed overviewFps10Maximized overviewFps5Alpha overviewFps10Alpha To have more numbers to show how performance varies with different numbers of windows and different types of windows (maximized, with an alpha channel.) https://bugzilla.gnome.org/show_bug.cgi?id=644265 --- js/perf/core.js | 61 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 53 insertions(+), 8 deletions(-) diff --git a/js/perf/core.js b/js/perf/core.js index 1bbeab7ca..3ed7924f8 100644 --- a/js/perf/core.js +++ b/js/perf/core.js @@ -21,6 +21,24 @@ let METRICS = { overviewFpsSubsequent: { description: "Frames rate when going to the overview, second time", units: "frames / s" }, + overviewFps5Windows: + { description: "Frames rate when going to the overview, 5 windows open", + units: "frames / s" }, + overviewFps10Windows: + { description: "Frames rate when going to the overview, 10 windows open", + units: "frames / s" }, + overviewFps5Maximized: + { description: "Frames rate when going to the overview, 5 maximized windows open", + units: "frames / s" }, + overviewFps10Maximized: + { description: "Frames rate when going to the overview, 10 maximized windows open", + units: "frames / s" }, + overviewFps5Alpha: + { description: "Frames rate when going to the overview, 5 alpha-transparent windows open", + units: "frames / s" }, + overviewFps10Alpha: + { description: "Frames rate when going to the overview, 10 alpha-transparent windows open", + units: "frames / s" }, usedAfterOverview: { description: "Malloc'ed bytes after the overview is shown once", units: "B" }, @@ -29,6 +47,16 @@ let METRICS = { units: "B" } }; +let WINDOW_CONFIGS = [ + { width: 640, height: 480, alpha: false, maximized: false, count: 1, metric: 'overviewFpsSubsequent' }, + { width: 640, height: 480, alpha: false, maximized: false, count: 5, metric: 'overviewFps5Windows' }, + { width: 640, height: 480, alpha: false, maximized: false, count: 10, metric: 'overviewFps10Windows' }, + { width: 640, height: 480, alpha: false, maximized: true, count: 5, metric: 'overviewFps5Maximized' }, + { width: 640, height: 480, alpha: false, maximized: true, count: 10, metric: 'overviewFps10Maximized' }, + { width: 640, height: 480, alpha: true, maximized: false, count: 5, metric: 'overviewFps5Alpha' }, + { width: 640, height: 480, alpha: true, maximized: false, count: 10, metric: 'overviewFps10Alpha' } +]; + function run() { Scripting.defineScriptEvent("overviewShowStart", "Starting to show the overview"); Scripting.defineScriptEvent("overviewShowDone", "Overview finished showing"); @@ -38,13 +66,24 @@ function run() { Scripting.scriptEvent('overviewShowDone'); }); - Scripting.destroyTestWindows(); - Scripting.createTestWindow(640, 480, false, false); - Scripting.waitTestWindows(); - yield Scripting.sleep(1000); - yield Scripting.waitLeisure(); - for (let i = 0; i < 2; i++) { + + for (let i = 0; i < 2 * WINDOW_CONFIGS.length; i++) { + // We go to the overview twice for each configuration; the first time + // to calculate the mipmaps for the windows, the second time to get + // a clean set of numbers. + if ((i % 2) == 0) { + let config = WINDOW_CONFIGS[i / 2]; + yield Scripting.destroyTestWindows(); + + for (let k = 0; k < config.count; k++) + yield Scripting.createTestWindow(config.width, config.height, config.alpha, config.maximized); + + yield Scripting.waitTestWindows(); + yield Scripting.sleep(1000); + yield Scripting.waitLeisure(); + } + Scripting.scriptEvent('overviewShowStart'); Main.overview.show(); @@ -117,9 +156,15 @@ function _frameDone(time) { if (overviewShowCount == 1) { METRICS.overviewLatencyFirst.value = overviewLatency; METRICS.overviewFpsFirst.value = fps; - } else { + } else if (overviewShowCount == 2) { METRICS.overviewLatencySubsequent.value = overviewLatency; - METRICS.overviewFpsSubsequent.value = fps; + } + + // Other than overviewFpsFirst, we collect FPS metrics the second + // we show each window configuration. overviewShowCount is 1,2,3... + if (overviewShowCount % 2 == 0) { + let config = WINDOW_CONFIGS[(overviewShowCount / 2) - 1]; + METRICS[config.metric].value = fps; } } } From d16acc43d9816b03c01627b1e10ef26080001438 Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Tue, 8 Mar 2011 19:26:28 -0500 Subject: [PATCH 19/44] viewSelector: allow programmatically switching to tabs Add the idea of an 'id' for a tab, and add a public switchTab method so you can switch to 'applications' or 'windows'. This will be useful for performance tests that test tab switching performance. https://bugzilla.gnome.org/show_bug.cgi?id=644266 --- js/ui/overview.js | 4 ++-- js/ui/viewSelector.js | 20 +++++++++++++++----- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/js/ui/overview.js b/js/ui/overview.js index 2d672868f..b6c30d9bc 100644 --- a/js/ui/overview.js +++ b/js/ui/overview.js @@ -180,10 +180,10 @@ Overview.prototype = { this._group.add_actor(this.viewSelector.actor); this._workspacesDisplay = new WorkspacesView.WorkspacesDisplay(); - this.viewSelector.addViewTab(_("Windows"), this._workspacesDisplay.actor, 'text-x-generic'); + this.viewSelector.addViewTab('windows', _("Windows"), this._workspacesDisplay.actor, 'text-x-generic'); let appView = new AppDisplay.AllAppDisplay(); - this.viewSelector.addViewTab(_("Applications"), appView.actor, 'system-run'); + this.viewSelector.addViewTab('applications', _("Applications"), appView.actor, 'system-run'); // Default search providers this.viewSelector.addSearchProvider(new AppDisplay.AppSearchProvider()); diff --git a/js/ui/viewSelector.js b/js/ui/viewSelector.js index 5cad9cd52..6cb05961b 100644 --- a/js/ui/viewSelector.js +++ b/js/ui/viewSelector.js @@ -77,14 +77,16 @@ BaseTab.prototype = { Signals.addSignalMethods(BaseTab.prototype); -function ViewTab(label, pageActor, a11yIcon) { - this._init(label, pageActor, a11yIcon); +function ViewTab(id, label, pageActor, a11yIcon) { + this._init(id, label, pageActor, a11yIcon); } ViewTab.prototype = { __proto__: BaseTab.prototype, - _init: function(label, pageActor, a11yIcon) { + _init: function(id, label, pageActor, a11yIcon) { + this.id = id; + let titleActor = new St.Button({ label: label, style_class: 'view-tab-title' }); titleActor.connect('clicked', Lang.bind(this, this._activate)); @@ -383,8 +385,8 @@ ViewSelector.prototype = { })); }, - addViewTab: function(title, pageActor, a11yIcon) { - let viewTab = new ViewTab(title, pageActor, a11yIcon); + addViewTab: function(id, title, pageActor, a11yIcon) { + let viewTab = new ViewTab(id, title, pageActor, a11yIcon); this._tabs.push(viewTab); this._tabBox.add(viewTab.title); this._addTab(viewTab); @@ -433,6 +435,14 @@ ViewSelector.prototype = { } }, + switchTab: function(id) { + for (let i = 0; i < this._tabs.length; i++) + if (this._tabs[i].id == id) { + this._switchTab(this._tabs[i]); + break; + } + }, + _switchDefaultTab: function() { if (this._tabs.length > 0) this._switchTab(this._tabs[0]); From f6fc88cc2de85a5b0b496a8bb989f24bacbdb36c Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Tue, 8 Mar 2011 19:27:30 -0500 Subject: [PATCH 20/44] perf: Add metrics for switching to the applications view Measure how long it takes to switch from the workspaces view to the windows view the first time and the second time. https://bugzilla.gnome.org/show_bug.cgi?id=644266 --- js/perf/core.js | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/js/perf/core.js b/js/perf/core.js index 3ed7924f8..7d141a2d1 100644 --- a/js/perf/core.js +++ b/js/perf/core.js @@ -44,7 +44,13 @@ let METRICS = { units: "B" }, leakedAfterOverview: { description: "Additional malloc'ed bytes the second time the overview is shown", - units: "B" } + units: "B" }, + applicationsShowTimeFirst: + { description: "Time to switch to applications view, first time", + units: "us" }, + applicationsShowTimeSubsequent: + { description: "Time to switch to applications view, second time", + units: "us"} }; let WINDOW_CONFIGS = [ @@ -61,6 +67,8 @@ function run() { Scripting.defineScriptEvent("overviewShowStart", "Starting to show the overview"); Scripting.defineScriptEvent("overviewShowDone", "Overview finished showing"); Scripting.defineScriptEvent("afterShowHide", "After a show/hide cycle for the overview"); + Scripting.defineScriptEvent("applicationsShowStart", "Starting to switch to applications view"); + Scripting.defineScriptEvent("applicationsShowDone", "Done switching to applications view"); Main.overview.connect('shown', function() { Scripting.scriptEvent('overviewShowDone'); @@ -96,6 +104,21 @@ function run() { Scripting.collectStatistics(); Scripting.scriptEvent('afterShowHide'); } + + yield Scripting.destroyTestWindows(); + yield Scripting.sleep(1000); + + Main.overview.show(); + yield Scripting.waitLeisure(); + + for (let i = 0; i < 2; i++) { + Scripting.scriptEvent('applicationsShowStart'); + Main.overview.viewSelector.switchTab('applications'); + yield Scripting.waitLeisure(); + Scripting.scriptEvent('applicationsShowDone'); + Main.overview.viewSelector.switchTab('windows'); + yield Scripting.waitLeisure(); + } } let showingOverview = false; @@ -107,6 +130,8 @@ let mallocUsedSize = 0; let overviewShowCount = 0; let firstOverviewUsedSize; let haveSwapComplete = false; +let applicationsShowStart; +let applicationsShowCount = 0; function script_overviewShowStart(time) { showingOverview = true; @@ -122,6 +147,18 @@ function script_overviewShowDone(time) { finishedShowingOverview = true; } +function script_applicationsShowStart(time) { + applicationsShowStart = time; +} + +function script_applicationsShowDone(time) { + applicationsShowCount++; + if (applicationsShowCount == 1) + METRICS.applicationsShowTimeFirst.value = time - applicationsShowStart; + else + METRICS.applicationsShowTimeSubsequent.value = time - applicationsShowStart; +} + function script_afterShowHide(time) { if (overviewShowCount == 1) { METRICS.usedAfterOverview.value = mallocUsedSize; From 73274e201bd7f4617e0d40360b50b1bdc7104512 Mon Sep 17 00:00:00 2001 From: Giovanni Campagna Date: Sat, 12 Mar 2011 21:34:01 +0100 Subject: [PATCH 21/44] Status Menu: use Gnome Session DBus for shutdown and logout Around 2.91.90, gnome-session-save was renamed to gnome-session-quit. This commit restores compatibility with the older gnome-session, for those testing under GNOME 2.32 or below, by calling the DBus methods directly. https://bugzilla.gnome.org/show_bug.cgi?id=644591 --- js/misc/gnomeSession.js | 21 +++++++++++++++++++++ js/ui/statusMenu.js | 5 +++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/js/misc/gnomeSession.js b/js/misc/gnomeSession.js index ce4e7e9d3..1a52a6f4b 100644 --- a/js/misc/gnomeSession.js +++ b/js/misc/gnomeSession.js @@ -102,3 +102,24 @@ Inhibitor.prototype = { }; DBus.proxifyPrototype(Inhibitor.prototype, InhibitorIface); Signals.addSignalMethods(Inhibitor.prototype); + + +// Not the full interface, only the methods we use +const SessionManagerIface = { + name: 'org.gnome.SessionManager', + methods: [ + { name: 'Logout', inSignature: 'u', outSignature: '' }, + { name: 'Shutdown', inSignature: '', outSignature: '' } + ] +}; + +function SessionManager() { + this._init(); +} + +SessionManager.prototype = { + _init: function() { + DBus.session.proxifyObject(this, 'org.gnome.SessionManager', '/org/gnome/SessionManager'); + } +}; +DBus.proxifyPrototype(SessionManager.prototype, SessionManagerIface); \ No newline at end of file diff --git a/js/ui/statusMenu.js b/js/ui/statusMenu.js index 9c251b83c..2a04506db 100644 --- a/js/ui/statusMenu.js +++ b/js/ui/statusMenu.js @@ -50,6 +50,7 @@ StatusMenuButton.prototype = { this._user = this._gdm.get_user(GLib.get_user_name()); this._presence = new GnomeSession.Presence(); this._presenceItems = {}; + this._session = new GnomeSession.SessionManager(); this._account_mgr = Tp.AccountManager.dup() @@ -210,7 +211,7 @@ StatusMenuButton.prototype = { _onQuitSessionActivate: function() { Main.overview.hide(); - Util.spawn(['gnome-session-quit', '--logout']); + this._session.LogoutRemote(0); }, _onSuspendOrPowerOffActivate: function() { @@ -222,7 +223,7 @@ StatusMenuButton.prototype = { this._upClient.suspend_sync(null); })); } else { - Util.spawn(['gnome-session-quit', '--power-off']); + this._session.ShutdownRemote(); } }, From 02ed28d68d1bf9c32819d59a23883144794aa5ef Mon Sep 17 00:00:00 2001 From: Wouter Bolsterlee Date: Sat, 12 Mar 2011 23:52:51 +0100 Subject: [PATCH 22/44] Updated Dutch translation by Wouter Bolsterlee --- po/nl.po | 366 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 207 insertions(+), 159 deletions(-) diff --git a/po/nl.po b/po/nl.po index e04eb71ec..9c12280cd 100644 --- a/po/nl.po +++ b/po/nl.po @@ -8,10 +8,10 @@ # msgid "" msgstr "" -"Project-Id-Version: gnome-shell master\n" +"Project-Id-Version: gnome-shell\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-11 23:09+0100\n" -"PO-Revision-Date: 2011-02-11 23:09+0100\n" +"POT-Creation-Date: 2011-03-12 23:52+0100\n" +"PO-Revision-Date: 2011-03-12 23:52+0100\n" "Last-Translator: Wouter Bolsterlee \n" "Language-Team: Dutch \n" "Language: nl\n" @@ -60,26 +60,30 @@ msgstr "" #: ../data/org.gnome.shell.gschema.xml.in.h:6 msgid "History for command (Alt-F2) dialog" -msgstr "Geschiedenis voor het opdracht-dialoogvenster (Alt-F2)" +msgstr "Geschiedenis voor het opdrachtvenster (Alt-F2)" #: ../data/org.gnome.shell.gschema.xml.in.h:7 +msgid "History for the looking glass dialog" +msgstr "Geschiedenis voor het ‘looking glass’-venster" + +#: ../data/org.gnome.shell.gschema.xml.in.h:8 msgid "If true, display date in the clock, in addition to time." msgstr "" "Indien ingeschakeld wordt naast de tijd ook de datum in de klok getoond" -#: ../data/org.gnome.shell.gschema.xml.in.h:8 +#: ../data/org.gnome.shell.gschema.xml.in.h:9 msgid "If true, display seconds in time." msgstr "Indien ingeschakeld worden de secondes van de tijd getoond" -#: ../data/org.gnome.shell.gschema.xml.in.h:9 +#: ../data/org.gnome.shell.gschema.xml.in.h:10 msgid "If true, display the ISO week date in the calendar." msgstr "Indien ingeschakeld worden weeknummers in de kalender getoond." -#: ../data/org.gnome.shell.gschema.xml.in.h:10 +#: ../data/org.gnome.shell.gschema.xml.in.h:11 msgid "List of desktop file IDs for favorite applications" msgstr "Lijst van desktopbestand-id's voor favoriete toepassingen" -#: ../data/org.gnome.shell.gschema.xml.in.h:12 +#: ../data/org.gnome.shell.gschema.xml.in.h:13 #, no-c-format msgid "" "Sets the GStreamer pipeline used to encode recordings. It follows the syntax " @@ -105,19 +109,19 @@ msgstr "" "met de VP8-codec. %T wordt gebruikt voor een schatting van het optimaal " "aantal threads op dit systeem." -#: ../data/org.gnome.shell.gschema.xml.in.h:13 +#: ../data/org.gnome.shell.gschema.xml.in.h:14 msgid "Show date in clock" msgstr "Datum tonen in klok" -#: ../data/org.gnome.shell.gschema.xml.in.h:14 +#: ../data/org.gnome.shell.gschema.xml.in.h:15 msgid "Show the week date in the calendar" msgstr "Weeknummers tonen in kalender" -#: ../data/org.gnome.shell.gschema.xml.in.h:15 +#: ../data/org.gnome.shell.gschema.xml.in.h:16 msgid "Show time with seconds" msgstr "Tijd tonen inclusief seconden" -#: ../data/org.gnome.shell.gschema.xml.in.h:16 +#: ../data/org.gnome.shell.gschema.xml.in.h:17 msgid "" "The applications corresponding to these identifiers will be displayed in the " "favorites area." @@ -125,7 +129,7 @@ msgstr "" "De toepassingen die aan deze identifiers voldoen worden in het " "favorietengebied weergegeven" -#: ../data/org.gnome.shell.gschema.xml.in.h:17 +#: ../data/org.gnome.shell.gschema.xml.in.h:18 msgid "" "The filename for recorded screencasts will be a unique filename based on the " "current date, and use this extension. It should be changed when recording to " @@ -135,7 +139,7 @@ msgstr "" "de huidige datum en gebruikt deze extensie. Dit moet aangepast worden bij " "het gebruik van een ander containerformaat." -#: ../data/org.gnome.shell.gschema.xml.in.h:18 +#: ../data/org.gnome.shell.gschema.xml.in.h:19 msgid "" "The framerate of the resulting screencast recordered by GNOME Shell's " "screencast recorder in frames-per-second." @@ -143,11 +147,11 @@ msgstr "" "De framerate (in frames per seconde) voor de opnames die door de " "schermopname van Gnome Shell gemaakt worden." -#: ../data/org.gnome.shell.gschema.xml.in.h:19 +#: ../data/org.gnome.shell.gschema.xml.in.h:20 msgid "The gstreamer pipeline used to encode the screencast" msgstr "De gstreamer-pijplijn voor het coderen van de screencast" -#: ../data/org.gnome.shell.gschema.xml.in.h:20 +#: ../data/org.gnome.shell.gschema.xml.in.h:21 msgid "" "The shell normally monitors active applications in order to present the most " "used ones (e.g. in launchers). While this data will be kept private, you may " @@ -159,15 +163,15 @@ msgstr "" "deze gebruiker zijn, kan het wenselijk zijn dit om privacy-redenen uit te " "schakelen. Let er wel op dat dit historische gegevens niet verwijdert." -#: ../data/org.gnome.shell.gschema.xml.in.h:21 +#: ../data/org.gnome.shell.gschema.xml.in.h:22 msgid "Uuids of extensions to disable" msgstr "Uuid's van uit te schakelen uitbreidingen" -#: ../data/org.gnome.shell.gschema.xml.in.h:22 -msgid "Whether to collect stats about applications usage" -msgstr "Of statistieken worden bijgehouden over toepassingsgebruik" - #: ../data/org.gnome.shell.gschema.xml.in.h:23 +msgid "Whether to collect stats about applications usage" +msgstr "Of statistieken worden bijgehouden over gebruik van toepassingen" + +#: ../data/org.gnome.shell.gschema.xml.in.h:24 msgid "disabled OpenSearch providers" msgstr "uitgeschakelde OpenSearch-providers" @@ -191,27 +195,27 @@ msgid "Execution of '%s' failed:" msgstr "Uitvoeren van ‘%s’ mislukt:" #. Translators: Filter to display all applications -#: ../js/ui/appDisplay.js:174 +#: ../js/ui/appDisplay.js:226 msgid "All" msgstr "Alles" -#: ../js/ui/appDisplay.js:261 +#: ../js/ui/appDisplay.js:324 msgid "APPLICATIONS" msgstr "TOEPASSINGEN" -#: ../js/ui/appDisplay.js:291 -msgid "PREFERENCES" -msgstr "VOORKEUREN" +#: ../js/ui/appDisplay.js:350 +msgid "SETTINGS" +msgstr "INSTELLINGEN" -#: ../js/ui/appDisplay.js:592 +#: ../js/ui/appDisplay.js:612 msgid "New Window" msgstr "Nieuw venster" -#: ../js/ui/appDisplay.js:596 +#: ../js/ui/appDisplay.js:615 msgid "Remove from Favorites" msgstr "Uit favorieten verwijderen" -#: ../js/ui/appDisplay.js:597 +#: ../js/ui/appDisplay.js:616 msgid "Add to Favorites" msgstr "Aan favorieten toevoegen" @@ -228,19 +232,19 @@ msgstr "%s is verwijderd uit uw favorieten." #. Translators: Shown in calendar event list for all day events #. * Keep it short, best if you can use less then 10 characters #. -#: ../js/ui/calendar.js:65 +#: ../js/ui/calendar.js:66 msgctxt "event list time" msgid "All Day" msgstr "Gehele dag" #. Translators: Shown in calendar event list, if 24h format -#: ../js/ui/calendar.js:70 +#: ../js/ui/calendar.js:71 msgctxt "event list time" msgid "%H:%M" msgstr "%H:%M" #. Transators: Shown in calendar event list, if 12h format -#: ../js/ui/calendar.js:77 +#: ../js/ui/calendar.js:78 msgctxt "event list time" msgid "%l:%M %p" msgstr "%l:%M %p" @@ -250,43 +254,43 @@ msgstr "%l:%M %p" #. * NOTE: These grid abbreviations are always shown together #. * and in order, e.g. "S M T W T F S". #. -#: ../js/ui/calendar.js:117 +#: ../js/ui/calendar.js:118 msgctxt "grid sunday" msgid "S" msgstr "Z" #. Translators: Calendar grid abbreviation for Monday -#: ../js/ui/calendar.js:119 +#: ../js/ui/calendar.js:120 msgctxt "grid monday" msgid "M" msgstr "M" #. Translators: Calendar grid abbreviation for Tuesday -#: ../js/ui/calendar.js:121 +#: ../js/ui/calendar.js:122 msgctxt "grid tuesday" msgid "T" msgstr "D" #. Translators: Calendar grid abbreviation for Wednesday -#: ../js/ui/calendar.js:123 +#: ../js/ui/calendar.js:124 msgctxt "grid wednesday" msgid "W" msgstr "W" #. Translators: Calendar grid abbreviation for Thursday -#: ../js/ui/calendar.js:125 +#: ../js/ui/calendar.js:126 msgctxt "grid thursday" msgid "T" msgstr "D" #. Translators: Calendar grid abbreviation for Friday -#: ../js/ui/calendar.js:127 +#: ../js/ui/calendar.js:128 msgctxt "grid friday" msgid "F" msgstr "V" #. Translators: Calendar grid abbreviation for Saturday -#: ../js/ui/calendar.js:129 +#: ../js/ui/calendar.js:130 msgctxt "grid saturday" msgid "S" msgstr "Z" @@ -297,81 +301,81 @@ msgstr "Z" #. * so they need to be unique (e.g. Tuesday and Thursday cannot #. * both be 'T'). #. -#: ../js/ui/calendar.js:142 +#: ../js/ui/calendar.js:143 msgctxt "list sunday" msgid "Su" msgstr "Zo" #. Translators: Event list abbreviation for Monday -#: ../js/ui/calendar.js:144 +#: ../js/ui/calendar.js:145 msgctxt "list monday" msgid "M" msgstr "Ma" #. Translators: Event list abbreviation for Tuesday -#: ../js/ui/calendar.js:146 +#: ../js/ui/calendar.js:147 msgctxt "list tuesday" msgid "T" msgstr "Di" #. Translators: Event list abbreviation for Wednesday -#: ../js/ui/calendar.js:148 +#: ../js/ui/calendar.js:149 msgctxt "list wednesday" msgid "W" msgstr "Wo" #. Translators: Event list abbreviation for Thursday -#: ../js/ui/calendar.js:150 +#: ../js/ui/calendar.js:151 msgctxt "list thursday" msgid "Th" msgstr "Do" #. Translators: Event list abbreviation for Friday -#: ../js/ui/calendar.js:152 +#: ../js/ui/calendar.js:153 msgctxt "list friday" msgid "F" msgstr "Vr" #. Translators: Event list abbreviation for Saturday -#: ../js/ui/calendar.js:154 +#: ../js/ui/calendar.js:155 msgctxt "list saturday" msgid "S" msgstr "Za" #. Translators: Text to show if there are no events -#: ../js/ui/calendar.js:701 +#: ../js/ui/calendar.js:704 msgid "Nothing Scheduled" msgstr "Niets gepland" #. Translators: Shown on calendar heading when selected day occurs on current year -#: ../js/ui/calendar.js:717 +#: ../js/ui/calendar.js:720 msgctxt "calendar heading" msgid "%A, %B %d" msgstr "%a %d %B" #. Translators: Shown on calendar heading when selected day occurs on different year -#: ../js/ui/calendar.js:720 +#: ../js/ui/calendar.js:723 msgctxt "calendar heading" msgid "%A, %B %d, %Y" msgstr "%a %d %B %Y" -#: ../js/ui/calendar.js:730 +#: ../js/ui/calendar.js:733 msgid "Today" msgstr "Vandaag" -#: ../js/ui/calendar.js:734 +#: ../js/ui/calendar.js:737 msgid "Tomorrow" msgstr "Morgen" -#: ../js/ui/calendar.js:743 +#: ../js/ui/calendar.js:746 msgid "This week" msgstr "Deze week" -#: ../js/ui/calendar.js:751 +#: ../js/ui/calendar.js:754 msgid "Next week" msgstr "Volgende week" -#: ../js/ui/dash.js:174 +#: ../js/ui/dash.js:174 ../js/ui/messageTray.js:931 msgid "Remove" msgstr "Verwijderen" @@ -379,47 +383,47 @@ msgstr "Verwijderen" msgid "Date and Time Settings" msgstr "Datum- en tijdinstellingen" -#: ../js/ui/dateMenu.js:110 +#: ../js/ui/dateMenu.js:111 msgid "Open Calendar" msgstr "Agenda openen" #. Translators: This is the time format with date used #. in 24-hour mode. -#: ../js/ui/dateMenu.js:149 +#: ../js/ui/dateMenu.js:164 msgid "%a %b %e, %R:%S" msgstr "%a %e %b, %R:%S" -#: ../js/ui/dateMenu.js:150 +#: ../js/ui/dateMenu.js:165 msgid "%a %b %e, %R" msgstr "%a %e %b, %R" #. Translators: This is the time format without date used #. in 24-hour mode. -#: ../js/ui/dateMenu.js:154 +#: ../js/ui/dateMenu.js:169 msgid "%a %R:%S" msgstr "%a %R:%S" -#: ../js/ui/dateMenu.js:155 +#: ../js/ui/dateMenu.js:170 msgid "%a %R" msgstr "%a %R" #. Translators: This is a time format with date used #. for AM/PM. -#: ../js/ui/dateMenu.js:162 +#: ../js/ui/dateMenu.js:177 msgid "%a %b %e, %l:%M:%S %p" msgstr "%a %e %b, %l:%M:%S %p" -#: ../js/ui/dateMenu.js:163 +#: ../js/ui/dateMenu.js:178 msgid "%a %b %e, %l:%M %p" msgstr "%a %e %b, %l:%M %p" #. Translators: This is a time format without date used #. for AM/PM. -#: ../js/ui/dateMenu.js:167 +#: ../js/ui/dateMenu.js:182 msgid "%a %l:%M:%S %p" msgstr "%a %l:%M:%S %p" -#: ../js/ui/dateMenu.js:168 +#: ../js/ui/dateMenu.js:183 msgid "%a %l:%M %p" msgstr "%a %l:%M %p" @@ -427,7 +431,7 @@ msgstr "%a %l:%M %p" #. Translators: This is the date format to use when the calendar popup is #. * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM"). #. -#: ../js/ui/dateMenu.js:194 +#: ../js/ui/dateMenu.js:209 msgid "%A %B %e, %Y" msgstr "%a %e %B %Y" @@ -509,37 +513,41 @@ msgstr "Bevestigen" msgid "Cancel" msgstr "Annuleren" -#: ../js/ui/lookingGlass.js:584 +#: ../js/ui/lookingGlass.js:588 msgid "No extensions installed" msgstr "Geen uitbreidingen geïnstalleerd" -#: ../js/ui/lookingGlass.js:621 +#: ../js/ui/lookingGlass.js:625 msgid "Enabled" msgstr "Ingeschakeld" #. translators: #. * The device has been disabled -#: ../js/ui/lookingGlass.js:623 ../src/gvc/gvc-mixer-control.c:1087 +#: ../js/ui/lookingGlass.js:627 ../src/gvc/gvc-mixer-control.c:1091 msgid "Disabled" msgstr "Uitgeschakeld" -#: ../js/ui/lookingGlass.js:625 +#: ../js/ui/lookingGlass.js:629 msgid "Error" msgstr "Fout" -#: ../js/ui/lookingGlass.js:627 +#: ../js/ui/lookingGlass.js:631 msgid "Out of date" msgstr "Gedateerd" -#: ../js/ui/lookingGlass.js:652 +#: ../js/ui/lookingGlass.js:656 msgid "View Source" msgstr "Broncode weergeven" -#: ../js/ui/lookingGlass.js:658 +#: ../js/ui/lookingGlass.js:662 msgid "Web Page" msgstr "Webpagina" -#: ../js/ui/messageTray.js:1854 +#: ../js/ui/messageTray.js:924 +msgid "Open" +msgstr "Openen" + +#: ../js/ui/messageTray.js:1961 msgid "System Information" msgstr "Systeeminformatie" @@ -547,26 +555,37 @@ msgstr "Systeeminformatie" msgid "Undo" msgstr "Ongedaan maken" -#: ../js/ui/overview.js:159 +#: ../js/ui/overview.js:183 msgid "Windows" msgstr "Vensters" -#: ../js/ui/overview.js:162 +#: ../js/ui/overview.js:186 msgid "Applications" msgstr "Toepassingen" +# Betere vertaling is welkom (Wouter Bolsterlee) +#. Translators: this is the name of the dock/favorites area on +#. the left of the overview +#: ../js/ui/overview.js:202 +msgid "Dash" +msgstr "Zijbalk" + #. TODO - _quit() doesn't really work on apps in state STARTING yet -#: ../js/ui/panel.js:480 +#: ../js/ui/panel.js:560 #, c-format msgid "Quit %s" msgstr "%s afsluiten" #. Button on the left side of the panel. #. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview". -#: ../js/ui/panel.js:614 +#: ../js/ui/panel.js:919 msgid "Activities" msgstr "Activiteiten" +#: ../js/ui/panel.js:1020 +msgid "Panel" +msgstr "Paneel" + #: ../js/ui/placeDisplay.js:122 #, c-format msgid "Failed to unmount '%s'" @@ -589,101 +608,99 @@ msgstr "LOCATIES & APPARATEN" #. "ON" and "OFF") or "toggle-switch-intl" (for toggle #. switches containing "◯" and "|"). Other values will #. simply result in invisible toggle switches. -#: ../js/ui/popupMenu.js:512 +#: ../js/ui/popupMenu.js:618 msgid "toggle-switch-us" msgstr "toggle-switch-intl" -#: ../js/ui/runDialog.js:209 +#: ../js/ui/runDialog.js:201 msgid "Please enter a command:" msgstr "Voer een opdracht in:" -#: ../js/ui/searchDisplay.js:295 +#: ../js/ui/searchDisplay.js:283 msgid "Searching..." msgstr "Zoeken…" -#: ../js/ui/searchDisplay.js:309 +#: ../js/ui/searchDisplay.js:297 msgid "No matching results." msgstr "Geen overeenkomende resultaten." -#: ../js/ui/statusMenu.js:102 +#: ../js/ui/statusMenu.js:113 ../js/ui/statusMenu.js:177 +msgid "Power Off..." +msgstr "Uitschakelen…" + +#: ../js/ui/statusMenu.js:115 ../js/ui/statusMenu.js:176 +msgid "Suspend" +msgstr "Slaapstand" + +#: ../js/ui/statusMenu.js:136 msgid "Available" msgstr "Beschikbaar" -#: ../js/ui/statusMenu.js:107 +#: ../js/ui/statusMenu.js:141 msgid "Busy" msgstr "Bezig" -#: ../js/ui/statusMenu.js:115 +#: ../js/ui/statusMenu.js:149 msgid "My Account" msgstr "Mijn account" -#: ../js/ui/statusMenu.js:119 +#: ../js/ui/statusMenu.js:153 msgid "System Settings" msgstr "Systeeminstellingen" -#: ../js/ui/statusMenu.js:126 +#: ../js/ui/statusMenu.js:160 msgid "Lock Screen" msgstr "Scherm vergrendelen" -#: ../js/ui/statusMenu.js:130 +#: ../js/ui/statusMenu.js:164 msgid "Switch User" msgstr "Gebruiker wisselen" -#: ../js/ui/statusMenu.js:135 +#: ../js/ui/statusMenu.js:169 msgid "Log Out..." msgstr "Afmelden…" -#. This is temporarily removed, see -#. http://bugzilla.gnome.org/show_bug.cgi?id=636680 -#. for details. -#. item = new PopupMenu.PopupMenuItem(_("Suspend...")); -#. item.connect('activate', Lang.bind(this, this._onShutDownActivate)); -#. this.menu.addMenuItem(item); -#: ../js/ui/statusMenu.js:149 -msgid "Shut Down..." -msgstr "Afsluiten…" - -#: ../js/ui/status/accessibility.js:83 +#: ../js/ui/status/accessibility.js:62 msgid "Zoom" msgstr "Zoomen" -#: ../js/ui/status/accessibility.js:89 +#: ../js/ui/status/accessibility.js:69 msgid "Screen Reader" msgstr "Schermlezer" -#: ../js/ui/status/accessibility.js:92 +#: ../js/ui/status/accessibility.js:73 msgid "Screen Keyboard" msgstr "Schermtoetsenbord" -#: ../js/ui/status/accessibility.js:95 +#: ../js/ui/status/accessibility.js:77 msgid "Visual Alerts" -msgstr "Visuele attenderingen" +msgstr "Visuele alerteringen" -#: ../js/ui/status/accessibility.js:98 +#: ../js/ui/status/accessibility.js:80 msgid "Sticky Keys" -msgstr "PlakToetsen" +msgstr "Plaktoetsen" -#: ../js/ui/status/accessibility.js:101 +#: ../js/ui/status/accessibility.js:83 msgid "Slow Keys" msgstr "Trage Toetsen" -#: ../js/ui/status/accessibility.js:104 +#: ../js/ui/status/accessibility.js:86 msgid "Bounce Keys" msgstr "Springende toetsen" -#: ../js/ui/status/accessibility.js:107 +#: ../js/ui/status/accessibility.js:89 msgid "Mouse Keys" -msgstr "MuisToetsen" +msgstr "Muistoetsen" -#: ../js/ui/status/accessibility.js:111 +#: ../js/ui/status/accessibility.js:93 msgid "Universal Access Settings" -msgstr "Toegankelijkheidsinstellingen" +msgstr "Instellingen voor toegankelijkheid" -#: ../js/ui/status/accessibility.js:163 +#: ../js/ui/status/accessibility.js:145 msgid "High Contrast" msgstr "Hoog contrast" -#: ../js/ui/status/accessibility.js:205 +#: ../js/ui/status/accessibility.js:182 msgid "Large Text" msgstr "Grote tekst" @@ -738,7 +755,7 @@ msgstr "Toetsenbordvoorkeuren" msgid "Mouse Settings" msgstr "Muisvoorkeuren" -#: ../js/ui/status/bluetooth.js:263 ../js/ui/status/volume.js:63 +#: ../js/ui/status/bluetooth.js:263 ../js/ui/status/volume.js:66 msgid "Sound Settings" msgstr "Geluidsvoorkeuren" @@ -767,7 +784,7 @@ msgstr "Afwijzen" #: ../js/ui/status/bluetooth.js:412 #, c-format msgid "Pairing confirmation for %s" -msgstr "Koppelbevestiging van voor %s" +msgstr "Koppelbevestiging voor %s" #: ../js/ui/status/bluetooth.js:418 ../js/ui/status/bluetooth.js:452 #, c-format @@ -781,11 +798,11 @@ msgstr "Bevestig dat de PIN-code ‘%s’ hetzelfde is als die van het apparaat. #: ../js/ui/status/bluetooth.js:421 msgid "Matches" -msgstr "PIN is hetzelfde" +msgstr "Komt overeen" #: ../js/ui/status/bluetooth.js:422 msgid "Does not match" -msgstr "PIN is niet hezelfde" +msgstr "Komt niet overeen" #: ../js/ui/status/bluetooth.js:445 #, c-format @@ -794,13 +811,17 @@ msgstr "Verzoek tot koppelen met %s" #: ../js/ui/status/bluetooth.js:453 msgid "Please enter the PIN mentioned on the device." -msgstr "Geef de PIN-code die apparaat aangeef." +msgstr "Geef de op het apparaat aangegeven PIN-code." #: ../js/ui/status/bluetooth.js:469 msgid "OK" msgstr "OK" -#: ../js/ui/status/keyboard.js:72 +#: ../js/ui/status/keyboard.js:73 +msgid "Show Keyboard Layout..." +msgstr "Toetsenbordindeling tonen…" + +#: ../js/ui/status/keyboard.js:76 msgid "Localization Settings" msgstr "Regionale instellingen" @@ -808,7 +829,13 @@ msgstr "Regionale instellingen" msgid "Power Settings" msgstr "Energievoorkeuren" -#: ../js/ui/status/power.js:112 +#. 0 is reported when UPower does not have enough data +#. to estimate battery life +#: ../js/ui/status/power.js:110 +msgid "Estimating..." +msgstr "Schatten…" + +#: ../js/ui/status/power.js:117 #, c-format msgid "%d hour remaining" msgid_plural "%d hours remaining" @@ -816,102 +843,102 @@ msgstr[0] "%d uur resterend" msgstr[1] "%d uur resterend" #. TRANSLATORS: this is a time string, as in "%d hours %d minutes remaining" -#: ../js/ui/status/power.js:115 +#: ../js/ui/status/power.js:120 #, c-format msgid "%d %s %d %s remaining" msgstr "%d %s %d %s resterend" -#: ../js/ui/status/power.js:117 +#: ../js/ui/status/power.js:122 msgid "hour" msgid_plural "hours" msgstr[0] "uur" msgstr[1] "uur" -#: ../js/ui/status/power.js:117 +#: ../js/ui/status/power.js:122 msgid "minute" msgid_plural "minutes" msgstr[0] "minuut" msgstr[1] "minuten" -#: ../js/ui/status/power.js:120 +#: ../js/ui/status/power.js:125 #, c-format msgid "%d minute remaining" msgid_plural "%d minutes remaining" msgstr[0] "%d minuut resterend" msgstr[1] "%d minuten resterend" -#: ../js/ui/status/power.js:235 +#: ../js/ui/status/power.js:227 msgid "AC adapter" msgstr "Netstroom" -#: ../js/ui/status/power.js:237 +#: ../js/ui/status/power.js:229 msgid "Laptop battery" msgstr "Laptop-accu" -#: ../js/ui/status/power.js:239 +#: ../js/ui/status/power.js:231 msgid "UPS" msgstr "UPS" -#: ../js/ui/status/power.js:241 +#: ../js/ui/status/power.js:233 msgid "Monitor" msgstr "Monitor" -#: ../js/ui/status/power.js:243 +#: ../js/ui/status/power.js:235 msgid "Mouse" msgstr "Muis" -#: ../js/ui/status/power.js:245 +#: ../js/ui/status/power.js:237 msgid "Keyboard" msgstr "Toetsenbord" -#: ../js/ui/status/power.js:247 +#: ../js/ui/status/power.js:239 msgid "PDA" msgstr "PDA" -#: ../js/ui/status/power.js:249 +#: ../js/ui/status/power.js:241 msgid "Cell phone" msgstr "Mobiele telefoon" -#: ../js/ui/status/power.js:251 +#: ../js/ui/status/power.js:243 msgid "Media player" msgstr "Mediaspeler" -#: ../js/ui/status/power.js:253 +#: ../js/ui/status/power.js:245 msgid "Tablet" msgstr "Tablet" -#: ../js/ui/status/power.js:255 +#: ../js/ui/status/power.js:247 msgid "Computer" msgstr "Computer" -#: ../js/ui/status/power.js:257 ../src/shell-app-system.c:1013 +#: ../js/ui/status/power.js:249 ../src/shell-app-system.c:1013 msgid "Unknown" msgstr "Onbekend" -#: ../js/ui/status/volume.js:42 +#: ../js/ui/status/volume.js:45 msgid "Volume" msgstr "Volume" -#: ../js/ui/status/volume.js:55 +#: ../js/ui/status/volume.js:58 msgid "Microphone" msgstr "Microfoon" -#: ../js/ui/telepathyClient.js:563 +#: ../js/ui/telepathyClient.js:239 #, c-format msgid "%s is online." msgstr "%s is online." -#: ../js/ui/telepathyClient.js:568 +#: ../js/ui/telepathyClient.js:244 #, c-format msgid "%s is offline." msgstr "%s is offline." -#: ../js/ui/telepathyClient.js:571 +#: ../js/ui/telepathyClient.js:247 #, c-format msgid "%s is away." msgstr "%s is afwezig." -#: ../js/ui/telepathyClient.js:574 +#: ../js/ui/telepathyClient.js:250 #, c-format msgid "%s is busy." msgstr "%s is bezig." @@ -919,28 +946,36 @@ msgstr "%s is bezig." #. Translators: this is a time format string followed by a date. #. If applicable, replace %X with a strftime format valid for your #. locale, without seconds. -#: ../js/ui/telepathyClient.js:669 +#: ../js/ui/telepathyClient.js:357 #, no-c-format msgid "Sent at %X on %A" msgstr "Verzonden om %H:%M op %A %e %B %Y" -#: ../js/ui/viewSelector.js:26 -msgid "Search your computer" -msgstr "De computer doorzoeken" +#. Translators: this is the text displayed +#. in the search entry when no search is +#. active; it should not exceed ~30 +#. characters. +#: ../js/ui/viewSelector.js:119 +msgid "Type to search..." +msgstr "Typ om te zoeken…" -#: ../js/ui/windowAttentionHandler.js:43 +#: ../js/ui/viewSelector.js:139 ../src/shell-util.c:250 +msgid "Search" +msgstr "Zoeken" + +#: ../js/ui/windowAttentionHandler.js:42 #, c-format msgid "%s has finished starting" msgstr "%s is opgestart" -#: ../js/ui/windowAttentionHandler.js:45 +#: ../js/ui/windowAttentionHandler.js:44 #, c-format msgid "'%s' is ready" msgstr "‘%s’ is klaar" #. translators: #. * The number of sound outputs on a particular device -#: ../src/gvc/gvc-mixer-control.c:1094 +#: ../src/gvc/gvc-mixer-control.c:1098 #, c-format msgid "%u Output" msgid_plural "%u Outputs" @@ -949,49 +984,57 @@ msgstr[1] "%u uitvoerkanalen" #. translators: #. * The number of sound inputs on a particular device -#: ../src/gvc/gvc-mixer-control.c:1104 +#: ../src/gvc/gvc-mixer-control.c:1108 #, c-format msgid "%u Input" msgid_plural "%u Inputs" msgstr[0] "%u invoerkanaal" msgstr[1] "%u invoerkanalen" -#: ../src/gvc/gvc-mixer-control.c:1402 +#: ../src/gvc/gvc-mixer-control.c:1406 msgid "System Sounds" msgstr "Systeemgeluiden" -#: ../src/shell-global.c:1363 +#: ../src/main.c:395 +msgid "Print version" +msgstr "Versie weergeven" + +#: ../src/shell-global.c:1308 msgid "Less than a minute ago" msgstr "Minder dan een minuut geleden" -#: ../src/shell-global.c:1367 +#: ../src/shell-global.c:1312 #, c-format msgid "%d minute ago" msgid_plural "%d minutes ago" msgstr[0] "%d minuut geleden" msgstr[1] "%d minuten geleden" -#: ../src/shell-global.c:1372 +#: ../src/shell-global.c:1317 #, c-format msgid "%d hour ago" msgid_plural "%d hours ago" msgstr[0] "%d uur geleden" msgstr[1] "%d uur geleden" -#: ../src/shell-global.c:1377 +#: ../src/shell-global.c:1322 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "%d dag geleden" msgstr[1] "%d dagen geleden" -#: ../src/shell-global.c:1382 +#: ../src/shell-global.c:1327 #, c-format msgid "%d week ago" msgid_plural "%d weeks ago" msgstr[0] "%d week geleden" msgstr[1] "%d weken geleden" +#: ../src/shell-polkit-authentication-agent.c:334 +msgid "Authentication dialog was dismissed by the user" +msgstr "Authenticatievenster is door de gebruiker afgesloten" + #: ../src/shell-util.c:89 msgid "Home Folder" msgstr "Persoonlijke map" @@ -1002,10 +1045,6 @@ msgstr "Persoonlijke map" msgid "File System" msgstr "Bestandssysteem" -#: ../src/shell-util.c:250 -msgid "Search" -msgstr "Zoeken" - #. Translators: the first string is the name of a gvfs #. * method, and the second string is a path. For #. * example, "Trash: some-directory". It means that the @@ -1016,6 +1055,15 @@ msgstr "Zoeken" msgid "%1$s: %2$s" msgstr "%1$s: %2$s" +#~ msgid "PREFERENCES" +#~ msgstr "VOORKEUREN" + +#~ msgid "Shut Down..." +#~ msgstr "Afsluiten…" + +#~ msgid "Search your computer" +#~ msgstr "De computer doorzoeken" + #~ msgid "Clock" #~ msgstr "Klok" From 6e50e77709fc8d9600633c4da86abf3b6f44454a Mon Sep 17 00:00:00 2001 From: Lucian Adrian Grijincu Date: Sun, 13 Mar 2011 00:32:01 +0100 Subject: [PATCH 23/44] Updated Romanian translation --- po/ro.po | 1469 +++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 1022 insertions(+), 447 deletions(-) diff --git a/po/ro.po b/po/ro.po index d9f88d600..b23ed9fa8 100644 --- a/po/ro.po +++ b/po/ro.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: gnome-shell master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "shell&component=general\n" -"POT-Creation-Date: 2010-11-15 13:50+0000\n" +"POT-Creation-Date: 2011-03-08 05:43+0000\n" "PO-Revision-Date: 2010-11-15 22:34+0300\n" "Last-Translator: Lucian Adrian Grijincu \n" "Language-Team: Romanian Gnome Team \n" -"Language: ro\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: ro\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " "20)) ? 1 : 2);;\n" "X-Generator: Virtaal 0.6.1\n" @@ -27,14 +27,6 @@ msgstr "GNOME Shell" msgid "Window management and application launching" msgstr "Administrare de ferestre și lansare de aplicații" -#: ../data/gnome-shell-clock-preferences.desktop.in.in.h:1 -msgid "Clock" -msgstr "Ceas" - -#: ../data/gnome-shell-clock-preferences.desktop.in.in.h:2 -msgid "Customize the panel clock" -msgstr "Personalizați ceasul din panou" - #: ../data/org.gnome.shell.gschema.xml.in.h:1 msgid "" "Allows access to internal debugging and monitoring tools using the Alt-F2 " @@ -44,22 +36,19 @@ msgstr "" "monitorizare folosind dialogul Alt-F2." #: ../data/org.gnome.shell.gschema.xml.in.h:2 -msgid "Custom format of the clock" -msgstr "Format personalizat pentru ceas" +msgid "Enable internal tools useful for developers and testers from Alt-F2" +msgstr "" +"Activează utilitarele interne pentru dezvoltatori și testeri din Alt-F2" #: ../data/org.gnome.shell.gschema.xml.in.h:3 -msgid "Enable internal tools useful for developers and testers from Alt-F2" -msgstr "Activează utilitarele interne pentru dezvoltatori și testeri din Alt-F2" - -#: ../data/org.gnome.shell.gschema.xml.in.h:4 msgid "File extension used for storing the screencast" msgstr "Extensia de fișier utilizată pentru stocarea înregistrărilor de ecran" -#: ../data/org.gnome.shell.gschema.xml.in.h:5 +#: ../data/org.gnome.shell.gschema.xml.in.h:4 msgid "Framerate used for recording screencasts." msgstr "Frecvența de cadre utilizată pentru înregistrările de ecran." -#: ../data/org.gnome.shell.gschema.xml.in.h:6 +#: ../data/org.gnome.shell.gschema.xml.in.h:5 msgid "" "GNOME Shell extensions have a uuid property; this key lists extensions which " "should not be loaded." @@ -67,43 +56,52 @@ msgstr "" "Extensiile GNOME Shell au o proprietate uuid; această cheie listează " "extensiile care nu ar trebui încărcate." -#: ../data/org.gnome.shell.gschema.xml.in.h:7 +#: ../data/org.gnome.shell.gschema.xml.in.h:6 msgid "History for command (Alt-F2) dialog" msgstr "Istoricul dialogului de comenzi (Alt-F2)" -#: ../data/org.gnome.shell.gschema.xml.in.h:8 -msgid "Hour format" -msgstr "Format oră" +#: ../data/org.gnome.shell.gschema.xml.in.h:7 +#, fuzzy +#| msgid "History for command (Alt-F2) dialog" +msgid "History for the looking glass dialog" +msgstr "Istoricul dialogului de comenzi (Alt-F2)" -#: ../data/org.gnome.shell.gschema.xml.in.h:9 -msgid "" -"If true and format is either \"12-hour\" or \"24-hour\", display date in the " -"clock, in addition to time." +#: ../data/org.gnome.shell.gschema.xml.in.h:8 +#, fuzzy +#| msgid "" +#| "If true and format is either \"12-hour\" or \"24-hour\", display date in " +#| "the clock, in addition to time." +msgid "If true, display date in the clock, in addition to time." msgstr "" "Dacă este adevărat, și formatul este fie „12-hour” fie „24-hour”, pe lângă " "oră, în ceas se afișează și data." -#: ../data/org.gnome.shell.gschema.xml.in.h:10 -msgid "" -"If true and format is either \"12-hour\" or \"24-hour\", display seconds in " -"time." -msgstr "" -"Dacă este adevărat, și formatul este fie „12-hour” fie „24-hour”, pe lângă " -"oră, în ceas se afișează și secundele." +#: ../data/org.gnome.shell.gschema.xml.in.h:9 +#, fuzzy +#| msgid "If true, display the ISO week date in the calendar." +msgid "If true, display seconds in time." +msgstr "Dacă este adevărat, se afișează săptămâna ISO în calendar." -#: ../data/org.gnome.shell.gschema.xml.in.h:11 +#: ../data/org.gnome.shell.gschema.xml.in.h:10 msgid "If true, display the ISO week date in the calendar." msgstr "Dacă este adevărat, se afișează săptămâna ISO în calendar." -#: ../data/org.gnome.shell.gschema.xml.in.h:12 +#: ../data/org.gnome.shell.gschema.xml.in.h:11 msgid "List of desktop file IDs for favorite applications" msgstr "Listă de identificatori de fișiere desktop pentru aplicațiile favorite" #: ../data/org.gnome.shell.gschema.xml.in.h:13 -msgid "Overview workspace view mode" -msgstr "Modul de vizualizare a spațiilor de lucru în prezentarea generală" - -#: ../data/org.gnome.shell.gschema.xml.in.h:14 +#, fuzzy, no-c-format +#| msgid "" +#| "Sets the GStreamer pipeline used to encode recordings. It follows the " +#| "syntax used for gst-launch. The pipeline should have an unconnected sink " +#| "pad where the recorded video is recorded. It will normally have a " +#| "unconnected source pad; output from that pad will be written into the " +#| "output file. However the pipeline can also take care of its own output - " +#| "this might be used to send the output to an icecast server via shout2send " +#| "or similar. When unset or set to an empty value, the default pipeline " +#| "will be used. This is currently 'videorate ! theoraenc ! oggmux' and " +#| "records to Ogg Theora." msgid "" "Sets the GStreamer pipeline used to encode recordings. It follows the syntax " "used for gst-launch. The pipeline should have an unconnected sink pad where " @@ -112,7 +110,9 @@ msgid "" "pipeline can also take care of its own output - this might be used to send " "the output to an icecast server via shout2send or similar. When unset or set " "to an empty value, the default pipeline will be used. This is currently " -"'videorate ! theoraenc ! oggmux' and records to Ogg Theora." +"'videorate ! vp8enc quality=10 speed=2 threads=%T ! queue ! webmmux' and " +"records to WEBM using the VP8 codec. %T is used as a placeholder for a guess " +"at the optimal thread count on the system." msgstr "" "Definește linia de asamblare GStreamer utilizată pentru a codifica " "înregistrările. Folosiți aceeași sintaxă ca la gst-launch. Linia de " @@ -125,19 +125,19 @@ msgstr "" "asamblare implicită. Aceasta este acum definită ca „videorate ! theoraenc ! " "oggmux” și înregistrează în formatul Ogg Theora." -#: ../data/org.gnome.shell.gschema.xml.in.h:15 +#: ../data/org.gnome.shell.gschema.xml.in.h:14 msgid "Show date in clock" msgstr "Afișează data în ceas" -#: ../data/org.gnome.shell.gschema.xml.in.h:16 +#: ../data/org.gnome.shell.gschema.xml.in.h:15 msgid "Show the week date in the calendar" msgstr "Afișează săptămâna în calendar" -#: ../data/org.gnome.shell.gschema.xml.in.h:17 +#: ../data/org.gnome.shell.gschema.xml.in.h:16 msgid "Show time with seconds" msgstr "Afișează timpul cu secunde " -#: ../data/org.gnome.shell.gschema.xml.in.h:18 +#: ../data/org.gnome.shell.gschema.xml.in.h:17 msgid "" "The applications corresponding to these identifiers will be displayed in the " "favorites area." @@ -145,7 +145,7 @@ msgstr "" "Aplicațiile corespunzătoare acestor identificatori vor fi afișate în zona " "favoritelor." -#: ../data/org.gnome.shell.gschema.xml.in.h:19 +#: ../data/org.gnome.shell.gschema.xml.in.h:18 msgid "" "The filename for recorded screencasts will be a unique filename based on the " "current date, and use this extension. It should be changed when recording to " @@ -155,7 +155,7 @@ msgstr "" "curentă și vor folosi această extensie. Ar trebui să fie modificată când se " "înregistrează într-un format de container diferit." -#: ../data/org.gnome.shell.gschema.xml.in.h:20 +#: ../data/org.gnome.shell.gschema.xml.in.h:19 msgid "" "The framerate of the resulting screencast recordered by GNOME Shell's " "screencast recorder in frames-per-second." @@ -163,21 +163,13 @@ msgstr "" "Frecvența de cadre a înregistrărilor de ecran efectuare de Înregistratorul " "de ecran al GNOME Shell, în cadre pe secundă." -#: ../data/org.gnome.shell.gschema.xml.in.h:21 +#: ../data/org.gnome.shell.gschema.xml.in.h:20 msgid "The gstreamer pipeline used to encode the screencast" msgstr "" "Linia de asamblare gstreamer folosită pentru a codifica înregistrarea de " "ecran" -#: ../data/org.gnome.shell.gschema.xml.in.h:22 -msgid "" -"The selected workspace view mode in the overview. Supported values are " -"\"single\" and \"grid\"." -msgstr "" -"Modul de vizualizare a spațiilor de lucru în prezentarea generală. Valorile " -"suportate sunt „single” și „grid”." - -#: ../data/org.gnome.shell.gschema.xml.in.h:23 +#: ../data/org.gnome.shell.gschema.xml.in.h:21 msgid "" "The shell normally monitors active applications in order to present the most " "used ones (e.g. in launchers). While this data will be kept private, you may " @@ -190,503 +182,866 @@ msgstr "" "dezactivați această funcționalitate din motive de intimitate. Dezactivarea " "nu va șterge datele deja salvate." -#: ../data/org.gnome.shell.gschema.xml.in.h:24 -msgid "" -"This key specifies the format used by the panel clock when the format key is " -"set to \"custom\". You can use conversion specifiers understood by strftime" -"() to obtain a specific format. See the strftime() manual for more " -"information." -msgstr "" -"Această cheie specifică formatul utilizat în ceasul de panou când cheia de " -"format are valoarea „custom”. Puteți utiliza specificatorii de conversie " -"specifici strftime() pentru a obține un anumit format. Consultați manualul " -"strftime() pentru mai multe informații." - -#: ../data/org.gnome.shell.gschema.xml.in.h:25 -msgid "" -"This key specifies the hour format used by the panel clock. Possible values " -"are \"12-hour\", \"24-hour\", \"unix\" and \"custom\". If set to \"unix\", " -"the clock will display time in seconds since Epoch, i.e. 1970-01-01. If set " -"to \"custom\", the clock will display time according to the format specified " -"in the custom_format key. Note that if set to either \"unix\" or \"custom\", " -"the show_date and show_seconds keys are ignored." -msgstr "" -"Această cheie specifică formatul orei afișate de ceasul din panou. Valorile " -"posibile sunt „12-hour”, „24-hour”, „unix” și „custom”. Dacă valoarea este " -"„unix”, ceasul va afișa timpul în secunde de la începutul Epocii Unix (1 " -"ianuarie 1970). Dacă valoarea este „custom”, ceasul va afișa timpul conform " -"formatului din cheia custom_format. Dacă valoarea este fie „unix” fie " -"„custom” se ignoră valoarea cheilor show_date și show_seconds." - -#: ../data/org.gnome.shell.gschema.xml.in.h:26 +#: ../data/org.gnome.shell.gschema.xml.in.h:22 msgid "Uuids of extensions to disable" msgstr "Uuid-urile extensiilor de dezactivat" -#: ../data/org.gnome.shell.gschema.xml.in.h:27 +#: ../data/org.gnome.shell.gschema.xml.in.h:23 msgid "Whether to collect stats about applications usage" msgstr "Dacă să se colecteze statistici despre utilizarea aplicațiilor" -#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:1 -msgid "Clip the crosshairs at the center" -msgstr "Prinde reticulele în centru" - -#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:2 -msgid "Color of the crosshairs" -msgstr "Culoarea reticulelor" - -#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:3 -msgid "" -"Determines the length of the vertical and horizontal lines that make up the " -"crosshairs." +#: ../data/org.gnome.shell.gschema.xml.in.h:24 +msgid "disabled OpenSearch providers" msgstr "" -"Determină lungimea liniilor verticale și orizontale care alcătuiesc " -"reticulele." -#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:4 -msgid "" -"Determines the position of the magnified mouse image within the magnified " -"view and how it reacts to system mouse movement. The values are - none: no " -"mouse tracking; - centered: the mouse image is displayed at the center of " -"the zoom region (which also represents the point under the system mouse) and " -"the magnified contents are scrolled as the system mouse moves; - " -"proportional: the position of the magnified mouse in the zoom region is " -"proportionally the same as the position of the system mouse on screen; - " -"push: when the magnified mouse intersects a boundary of the zoom region, the " -"contents are scrolled into view." +#: ../js/misc/util.js:86 +msgid "Command not found" msgstr "" -"Determină poziția imaginii mărite a mausului în vizualizarea mărită și cum " -"reacționează la mișcarea mausului a sistemului. Valorile sunt - none: nu se " -"urmărește mausul; - centered: imaginea mausului este afișată în centrul " -"regiunii zoom (care reprezintă de asemenea punctul de sub mausul sistemului) " -"și proportional: poziția mausului mărit în regiunea zoom este proporțională " -"la fel ca poziția mausului sistemului de pe ecran; - push: când mausul " -"mărit intersectează o graniță a regiunii zoom, conținutul acesteia este " -"derulat în câmpul vizibil." -#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:5 -msgid "" -"Determines the transparency of the crosshairs, from fully opaque to fully " -"transparent." +#. Replace "Error invoking GLib.shell_parse_argv: " with +#. something nicer +#: ../js/misc/util.js:113 +#, fuzzy +#| msgid "Please enter a command:" +msgid "Could not parse command:" +msgstr "Introduceți o comandă:" + +#: ../js/misc/util.js:135 +#, fuzzy +#| msgid "Applications" +msgid "No such application" +msgstr "Aplicații" + +#: ../js/misc/util.js:148 +#, c-format +msgid "Execution of '%s' failed:" +msgstr "Execuția comenzii „%s” a eșuat:" + +#. Translators: Filter to display all applications +#: ../js/ui/appDisplay.js:226 +msgid "All" msgstr "" -"Determină transparența reticulelor, de la complet opac la deplin " -"transparente." -#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:6 -msgid "" -"Determines whether the crosshairs intersect the magnified mouse sprite, or " -"are clipped such that the ends of the horizontal and vertical lines surround " -"the mouse image." -msgstr "" -"Determină dacă reticulele intersectează umbra mausului mărit, sau sunt " -"prinse astfel încât capetele liniilor orizontale și verticale înconjoară " -"imaginea mausului." - -#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:7 -msgid "Enable lens mode" -msgstr "Activează modul cu lupă" - -#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:8 -msgid "" -"Enables/disables display of crosshairs centered on the magnified mouse " -"sprite." -msgstr "" -"Activează/dezactivează afișarea reticulelor centrate pe umbra mausului " -"mărit." - -#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:9 -msgid "" -"For centered mouse tracking, when the system pointer is at or near the edge " -"of the screen, the magnified contents continue to scroll such that the " -"screen edge moves into the magnified view." -msgstr "" -"Pentru urmărirea centrată a mausului, când indicatorul sistemului este pe " -"sau lângă marginea ecranului, conținutul mărit continuă să se deruleze " -"astfel încât marginile ecranului se mută în modul mărit." - -#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:10 -msgid "Length of the crosshairs" -msgstr "Lungimea reticulelor" - -#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:11 -msgid "Magnification factor" -msgstr "Factorul de mărire" - -#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:12 -msgid "Mouse Tracking Mode" -msgstr "Mod urmărire maus" - -#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:13 -msgid "Opacity of the crosshairs" -msgstr "Opacitatea reticulelor" - -#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:14 -msgid "Screen position" -msgstr "Poziția ecranului" - -#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:15 -msgid "Scroll magnified contents beyond the edges of the desktop" -msgstr "Derulează conținutul mărit în afara marginilor ecranului" - -#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:16 -msgid "Show or hide crosshairs" -msgstr "Arată sau ascunde reticulele" - -#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:17 -msgid "Show or hide the magnifier" -msgstr "Arată sau ascunde lupa" - -#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:18 -msgid "Show or hide the magnifier and all of its zoom regions." -msgstr "Arată sau ascunde lupa și toate regiunile ei de zoom." - -#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:19 -msgid "" -"The color of the the vertical and horizontal lines that make up the " -"crosshairs." -msgstr "Culoarea liniilor verticale și orizontale ce compun reticul." - -#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:20 -msgid "" -"The magnified view either fills the entire screen, or occupies the top-half, " -"bottom-half, left-half, or right-half of the screen." -msgstr "" -"Vizualizarea mărită fie se aplică întregului ecran, fie ocupă jumătatea de " -"sus, jumătatea de jos, jumătatea din stânga, sau jumătatea din dreapta a " -"ecranului." - -#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:21 -msgid "" -"The power of the magnification. A value of 1.0 means no magnification. A " -"value of 2.0 doubles the size." -msgstr "" -"Factor de mărire. Valoarea 1.0 înseamnă afișare fără mărire sau " -"micșorare. Valoarea 2.0 dublează mărimea." - -#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:22 -msgid "Thickness of the crosshairs" -msgstr "Grosimea reticulelor" - -#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:23 -msgid "" -"Whether the magnified view should be centered over the location of the " -"system mouse and move with it." -msgstr "" -"Dacă vizualizarea mărită ar trebui centrată asupra locației mausului " -"sistemului și dacă ar trebui să se miște odată cu el." - -#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:24 -msgid "Width of the vertical and horizontal lines that make up the crosshairs." -msgstr "Lățimea liniilor verticale și orizontale ce compun reticulele." - -#: ../data/clock-preferences.ui.h:1 -msgid "Clock Format" -msgstr "Format ceas" - -#: ../data/clock-preferences.ui.h:2 -msgid "Clock Preferences" -msgstr "Preferințe ceas" - -#: ../data/clock-preferences.ui.h:3 -msgid "Panel Display" -msgstr "Afișaj panou" - -#: ../data/clock-preferences.ui.h:4 -msgid "Show seco_nds" -msgstr "Afișează secu_nde" - -#: ../data/clock-preferences.ui.h:5 -msgid "Show the _date" -msgstr "Afișează _data" - -#: ../data/clock-preferences.ui.h:6 -msgid "_12 hour format" -msgstr "Format cu _12 ore" - -#: ../data/clock-preferences.ui.h:7 -msgid "_24 hour format" -msgstr "Format cu _24 de ore" - -#. **** Applications **** -#: ../js/ui/appDisplay.js:316 ../js/ui/dash.js:778 +#: ../js/ui/appDisplay.js:324 msgid "APPLICATIONS" msgstr "APPLICAȚII" -#: ../js/ui/appDisplay.js:348 -msgid "PREFERENCES" -msgstr "PREFERINȚE" +#: ../js/ui/appDisplay.js:350 +msgid "SETTINGS" +msgstr "" -#: ../js/ui/appDisplay.js:647 +#: ../js/ui/appDisplay.js:612 msgid "New Window" msgstr "Fereastră nouă" -#: ../js/ui/appDisplay.js:651 +#: ../js/ui/appDisplay.js:615 msgid "Remove from Favorites" msgstr "Elimină de la favorite" -#: ../js/ui/appDisplay.js:652 +#: ../js/ui/appDisplay.js:616 msgid "Add to Favorites" msgstr "Adaugă la favorite" -#: ../js/ui/appDisplay.js:829 -msgid "Drag here to add favorites" -msgstr "Trageți aici pentru a adăuga favorite" - -#: ../js/ui/appFavorites.js:88 +#: ../js/ui/appFavorites.js:91 #, c-format msgid "%s has been added to your favorites." msgstr "%s a fost adăugat la favorite." -#: ../js/ui/appFavorites.js:107 +#: ../js/ui/appFavorites.js:122 #, c-format msgid "%s has been removed from your favorites." msgstr "%s a fost eliminat de la favorite." -#: ../js/ui/dash.js:142 -msgid "Find" -msgstr "Caută" +#. Translators: Shown in calendar event list for all day events +#. * Keep it short, best if you can use less then 10 characters +#. +#: ../js/ui/calendar.js:66 +msgctxt "event list time" +msgid "All Day" +msgstr "" -#: ../js/ui/dash.js:473 -msgid "Searching..." -msgstr "Se caută..." +#. Translators: Shown in calendar event list, if 24h format +#: ../js/ui/calendar.js:71 +#, fuzzy +#| msgid "%H:%M" +msgctxt "event list time" +msgid "%H:%M" +msgstr "%H:%M" -#: ../js/ui/dash.js:487 -msgid "No matching results." -msgstr "Niciun rezultat care să se potrivească." +#. Transators: Shown in calendar event list, if 12h format +#: ../js/ui/calendar.js:78 +#, fuzzy +#| msgid "%a %l:%M %p" +msgctxt "event list time" +msgid "%l:%M %p" +msgstr "%a %l:%M %p" -#. **** Places **** -#. Translators: This is in the sense of locations for documents, -#. network locations, etc. -#: ../js/ui/dash.js:797 ../js/ui/placeDisplay.js:558 -msgid "PLACES & DEVICES" -msgstr "LOCAȚII & DISPOZITIVE" +#. Translators: Calendar grid abbreviation for Sunday. +#. * +#. * NOTE: These grid abbreviations are always shown together +#. * and in order, e.g. "S M T W T F S". +#. +#: ../js/ui/calendar.js:118 +msgctxt "grid sunday" +msgid "S" +msgstr "" -#. **** Documents **** -#: ../js/ui/dash.js:804 ../js/ui/docDisplay.js:494 -msgid "RECENT ITEMS" -msgstr "ELEMENTE RECENTE" +#. Translators: Calendar grid abbreviation for Monday +#: ../js/ui/calendar.js:120 +msgctxt "grid monday" +msgid "M" +msgstr "" -#: ../js/ui/lookingGlass.js:552 -msgid "No extensions installed" -msgstr "Nicio extensie instalată" +#. Translators: Calendar grid abbreviation for Tuesday +#: ../js/ui/calendar.js:122 +msgctxt "grid tuesday" +msgid "T" +msgstr "" -#: ../js/ui/lookingGlass.js:589 -msgid "Enabled" -msgstr "Activat" +#. Translators: Calendar grid abbreviation for Wednesday +#: ../js/ui/calendar.js:124 +msgctxt "grid wednesday" +msgid "W" +msgstr "" -#. translators: -#. * The device has been disabled -#: ../js/ui/lookingGlass.js:591 ../src/gvc/gvc-mixer-control.c:1087 -msgid "Disabled" -msgstr "Dezactivat" +#. Translators: Calendar grid abbreviation for Thursday +#: ../js/ui/calendar.js:126 +msgctxt "grid thursday" +msgid "T" +msgstr "" -#: ../js/ui/lookingGlass.js:593 -msgid "Error" -msgstr "Eroare" +#. Translators: Calendar grid abbreviation for Friday +#: ../js/ui/calendar.js:128 +msgctxt "grid friday" +msgid "F" +msgstr "" -#: ../js/ui/lookingGlass.js:595 -msgid "Out of date" -msgstr "Învechit" +#. Translators: Calendar grid abbreviation for Saturday +#: ../js/ui/calendar.js:130 +msgctxt "grid saturday" +msgid "S" +msgstr "" -#: ../js/ui/lookingGlass.js:620 -msgid "View Source" -msgstr "Vezi sursa" +#. Translators: Event list abbreviation for Sunday. +#. * +#. * NOTE: These list abbreviations are normally not shown together +#. * so they need to be unique (e.g. Tuesday and Thursday cannot +#. * both be 'T'). +#. +#: ../js/ui/calendar.js:143 +msgctxt "list sunday" +msgid "Su" +msgstr "" -#: ../js/ui/lookingGlass.js:626 -msgid "Web Page" -msgstr "Pagină web" +#. Translators: Event list abbreviation for Monday +#: ../js/ui/calendar.js:145 +msgctxt "list monday" +msgid "M" +msgstr "" -#: ../js/ui/overview.js:160 -msgid "Undo" -msgstr "Anulează" +#. Translators: Event list abbreviation for Tuesday +#: ../js/ui/calendar.js:147 +msgctxt "list tuesday" +msgid "T" +msgstr "" -#. TODO - _quit() doesn't really work on apps in state STARTING yet -#: ../js/ui/panel.js:469 -#, c-format -msgid "Quit %s" -msgstr "Închide %s" +#. Translators: Event list abbreviation for Wednesday +#: ../js/ui/calendar.js:149 +msgctxt "list wednesday" +msgid "W" +msgstr "" -#: ../js/ui/panel.js:494 -msgid "Preferences" -msgstr "Preferințe" +#. Translators: Event list abbreviation for Thursday +#: ../js/ui/calendar.js:151 +msgctxt "list thursday" +msgid "Th" +msgstr "" + +#. Translators: Event list abbreviation for Friday +#: ../js/ui/calendar.js:153 +msgctxt "list friday" +msgid "F" +msgstr "" + +#. Translators: Event list abbreviation for Saturday +#: ../js/ui/calendar.js:155 +msgctxt "list saturday" +msgid "S" +msgstr "" + +#. Translators: Text to show if there are no events +#: ../js/ui/calendar.js:704 +msgid "Nothing Scheduled" +msgstr "" + +#. Translators: Shown on calendar heading when selected day occurs on current year +#: ../js/ui/calendar.js:720 +msgctxt "calendar heading" +msgid "%A, %B %d" +msgstr "" + +#. Translators: Shown on calendar heading when selected day occurs on different year +#: ../js/ui/calendar.js:723 +#, fuzzy +#| msgid "%a %b %e, %R" +msgctxt "calendar heading" +msgid "%A, %B %d, %Y" +msgstr "%a %e %b, %R" + +#: ../js/ui/calendar.js:733 +msgid "Today" +msgstr "" + +#: ../js/ui/calendar.js:737 +msgid "Tomorrow" +msgstr "" + +#: ../js/ui/calendar.js:746 +msgid "This week" +msgstr "" + +#: ../js/ui/calendar.js:754 +msgid "Next week" +msgstr "" + +#: ../js/ui/dash.js:174 ../js/ui/messageTray.js:933 +msgid "Remove" +msgstr "" + +#: ../js/ui/dateMenu.js:91 +#, fuzzy +#| msgid "System Settings..." +msgid "Date and Time Settings" +msgstr "Configurări sistem..." + +#: ../js/ui/dateMenu.js:111 +msgid "Open Calendar" +msgstr "" #. Translators: This is the time format with date used #. in 24-hour mode. -#: ../js/ui/panel.js:580 +#: ../js/ui/dateMenu.js:164 msgid "%a %b %e, %R:%S" msgstr "%a %e %b, %R:%S" -#: ../js/ui/panel.js:581 +#: ../js/ui/dateMenu.js:165 msgid "%a %b %e, %R" msgstr "%a %e %b, %R" #. Translators: This is the time format without date used #. in 24-hour mode. -#: ../js/ui/panel.js:585 +#: ../js/ui/dateMenu.js:169 msgid "%a %R:%S" msgstr "%a %R:%S" -#: ../js/ui/panel.js:586 +#: ../js/ui/dateMenu.js:170 msgid "%a %R" msgstr "%a %R" #. Translators: This is a time format with date used #. for AM/PM. -#: ../js/ui/panel.js:593 +#: ../js/ui/dateMenu.js:177 msgid "%a %b %e, %l:%M:%S %p" msgstr "%a %e %b, %l:%M:%S %p" -#: ../js/ui/panel.js:594 +#: ../js/ui/dateMenu.js:178 msgid "%a %b %e, %l:%M %p" msgstr "%a %e %b, %l:%M %p" #. Translators: This is a time format without date used #. for AM/PM. -#: ../js/ui/panel.js:598 +#: ../js/ui/dateMenu.js:182 msgid "%a %l:%M:%S %p" msgstr "%a %l:%M:%S %p" -#: ../js/ui/panel.js:599 +#: ../js/ui/dateMenu.js:183 msgid "%a %l:%M %p" msgstr "%a %l:%M %p" +#. Translators: This is the date format to use when the calendar popup is +#. * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM"). +#. +#: ../js/ui/dateMenu.js:209 +#, fuzzy +#| msgid "%a %b %e, %R" +msgid "%A %B %e, %Y" +msgstr "%a %e %b, %R" + +#: ../js/ui/docDisplay.js:19 +msgid "RECENT ITEMS" +msgstr "ELEMENTE RECENTE" + +#: ../js/ui/endSessionDialog.js:63 +#, fuzzy, c-format +#| msgid "Log Out..." +msgid "Log Out %s" +msgstr "Ieși din sesiune..." + +#: ../js/ui/endSessionDialog.js:64 ../js/ui/endSessionDialog.js:69 +#, fuzzy +#| msgid "Log Out..." +msgid "Log Out" +msgstr "Ieși din sesiune..." + +#: ../js/ui/endSessionDialog.js:65 +msgid "Click Log Out to quit these applications and log out of the system." +msgstr "" + +#: ../js/ui/endSessionDialog.js:66 +#, c-format +msgid "%s will be logged out automatically in %d seconds." +msgstr "" + +#: ../js/ui/endSessionDialog.js:67 +#, c-format +msgid "You will be logged out automatically in %d seconds." +msgstr "" + +#: ../js/ui/endSessionDialog.js:68 +msgid "Logging out of the system." +msgstr "" + +#: ../js/ui/endSessionDialog.js:74 ../js/ui/endSessionDialog.js:78 +#, fuzzy +#| msgid "Shut Down..." +msgid "Shut Down" +msgstr "Oprește..." + +#: ../js/ui/endSessionDialog.js:75 +msgid "Click Shut Down to quit these applications and shut down the system." +msgstr "" + +#: ../js/ui/endSessionDialog.js:76 +#, c-format +msgid "The system will shut down automatically in %d seconds." +msgstr "" + +#: ../js/ui/endSessionDialog.js:77 +msgid "Shutting down the system." +msgstr "" + +#: ../js/ui/endSessionDialog.js:84 ../js/ui/endSessionDialog.js:88 +#, fuzzy +#| msgid "Retry" +msgid "Restart" +msgstr "Reîncearcă" + +#: ../js/ui/endSessionDialog.js:85 +msgid "Click Restart to quit these applications and restart the system." +msgstr "" + +#: ../js/ui/endSessionDialog.js:86 +#, c-format +msgid "The system will restart automatically in %d seconds." +msgstr "" + +#: ../js/ui/endSessionDialog.js:87 +msgid "Restarting the system." +msgstr "" + +#: ../js/ui/endSessionDialog.js:395 +msgid "Confirm" +msgstr "" + +#: ../js/ui/endSessionDialog.js:400 ../js/ui/status/bluetooth.js:470 +msgid "Cancel" +msgstr "" + +#: ../js/ui/lookingGlass.js:588 +msgid "No extensions installed" +msgstr "Nicio extensie instalată" + +#: ../js/ui/lookingGlass.js:625 +msgid "Enabled" +msgstr "Activat" + +#. translators: +#. * The device has been disabled +#: ../js/ui/lookingGlass.js:627 ../src/gvc/gvc-mixer-control.c:1087 +msgid "Disabled" +msgstr "Dezactivat" + +#: ../js/ui/lookingGlass.js:629 +msgid "Error" +msgstr "Eroare" + +#: ../js/ui/lookingGlass.js:631 +msgid "Out of date" +msgstr "Învechit" + +#: ../js/ui/lookingGlass.js:656 +msgid "View Source" +msgstr "Vezi sursa" + +#: ../js/ui/lookingGlass.js:662 +msgid "Web Page" +msgstr "Pagină web" + +#: ../js/ui/messageTray.js:926 +msgid "Open" +msgstr "" + +#: ../js/ui/messageTray.js:1963 +#, fuzzy +#| msgid "Account Information..." +msgid "System Information" +msgstr "Informații despre cont..." + +#: ../js/ui/overview.js:88 +msgid "Undo" +msgstr "Anulează" + +#: ../js/ui/overview.js:183 +#, fuzzy +#| msgid "New Window" +msgid "Windows" +msgstr "Fereastră nouă" + +#: ../js/ui/overview.js:186 +msgid "Applications" +msgstr "Aplicații" + +#. Translators: this is the name of the dock/favorites area on +#. the left of the overview +#: ../js/ui/overview.js:202 +msgid "Dash" +msgstr "" + +#. TODO - _quit() doesn't really work on apps in state STARTING yet +#: ../js/ui/panel.js:532 +#, c-format +msgid "Quit %s" +msgstr "Închide %s" + #. Button on the left side of the panel. #. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview". -#: ../js/ui/panel.js:744 +#: ../js/ui/panel.js:893 msgid "Activities" msgstr "Activități" -#: ../js/ui/placeDisplay.js:111 +#: ../js/ui/panel.js:994 +msgid "Panel" +msgstr "" + +#: ../js/ui/placeDisplay.js:122 #, c-format msgid "Failed to unmount '%s'" msgstr "Nu s-a putut demonta „%s”" -#: ../js/ui/placeDisplay.js:114 +#: ../js/ui/placeDisplay.js:125 msgid "Retry" msgstr "Reîncearcă" -#: ../js/ui/placeDisplay.js:159 +#: ../js/ui/placeDisplay.js:165 msgid "Connect to..." msgstr "Conectare la..." +#: ../js/ui/placeDisplay.js:409 +msgid "PLACES & DEVICES" +msgstr "LOCAȚII & DISPOZITIVE" + #. Translators: this MUST be either "toggle-switch-us" #. (for toggle switches containing the English words #. "ON" and "OFF") or "toggle-switch-intl" (for toggle #. switches containing "◯" and "|"). Other values will #. simply result in invisible toggle switches. -#: ../js/ui/popupMenu.js:33 +#: ../js/ui/popupMenu.js:618 msgid "toggle-switch-us" msgstr "toggle-switch-us" -#: ../js/ui/runDialog.js:233 +#: ../js/ui/runDialog.js:201 msgid "Please enter a command:" msgstr "Introduceți o comandă:" -#: ../js/ui/runDialog.js:378 -#, c-format -msgid "Execution of '%s' failed:" -msgstr "Execuția comenzii „%s” a eșuat:" +#: ../js/ui/searchDisplay.js:283 +msgid "Searching..." +msgstr "Se caută..." -#: ../js/ui/statusMenu.js:101 -msgid "Available" -msgstr "Disponibil" +#: ../js/ui/searchDisplay.js:297 +msgid "No matching results." +msgstr "Niciun rezultat care să se potrivească." -#: ../js/ui/statusMenu.js:106 -msgid "Busy" -msgstr "Ocupat" +#: ../js/ui/statusMenu.js:102 ../js/ui/statusMenu.js:166 +msgid "Power Off..." +msgstr "" -#: ../js/ui/statusMenu.js:114 -msgid "My Account..." -msgstr "Contul meu..." - -#: ../js/ui/statusMenu.js:118 -msgid "System Settings..." -msgstr "Configurări sistem..." - -#: ../js/ui/statusMenu.js:125 -msgid "Lock Screen" -msgstr "Blochează ecranul" - -#: ../js/ui/statusMenu.js:129 -msgid "Switch User" -msgstr "Schimbă utilizatorul" - -#: ../js/ui/statusMenu.js:134 -msgid "Log Out..." -msgstr "Ieși din sesiune..." - -#: ../js/ui/statusMenu.js:141 +#: ../js/ui/statusMenu.js:104 ../js/ui/statusMenu.js:165 msgid "Suspend" msgstr "Suspendă" -#: ../js/ui/statusMenu.js:145 -msgid "Shut Down..." -msgstr "Oprește..." +#: ../js/ui/statusMenu.js:125 +msgid "Available" +msgstr "Disponibil" -#: ../js/ui/status/accessibility.js:88 -msgid "Screen Reader" -msgstr "Cititor de ecran" +#: ../js/ui/statusMenu.js:130 +msgid "Busy" +msgstr "Ocupat" -#: ../js/ui/status/accessibility.js:91 -msgid "Screen Keyboard" -msgstr "Tastatură pe ecran" +#: ../js/ui/statusMenu.js:138 +#, fuzzy +#| msgid "My Account..." +msgid "My Account" +msgstr "Contul meu..." -#: ../js/ui/status/accessibility.js:94 -msgid "Visual Alerts" -msgstr "Alerte vizuale" +#: ../js/ui/statusMenu.js:142 +#, fuzzy +#| msgid "System Settings..." +msgid "System Settings" +msgstr "Configurări sistem..." -#: ../js/ui/status/accessibility.js:97 -msgid "Sticky Keys" -msgstr "Taste lipicioase" +#: ../js/ui/statusMenu.js:149 +msgid "Lock Screen" +msgstr "Blochează ecranul" -#: ../js/ui/status/accessibility.js:100 -msgid "Slow Keys" -msgstr "Taste încete" +#: ../js/ui/statusMenu.js:153 +msgid "Switch User" +msgstr "Schimbă utilizatorul" -#: ../js/ui/status/accessibility.js:103 -msgid "Bounce Keys" -msgstr "Taste fără repetiție" +#: ../js/ui/statusMenu.js:158 +msgid "Log Out..." +msgstr "Ieși din sesiune..." -#: ../js/ui/status/accessibility.js:106 -msgid "Mouse Keys" -msgstr "Taste maus" - -#: ../js/ui/status/accessibility.js:110 -msgid "Universal Access Settings" -msgstr "Configurări acces universal" - -#: ../js/ui/status/accessibility.js:163 -msgid "High Contrast" -msgstr "Contrast puternic" - -#: ../js/ui/status/accessibility.js:205 -msgid "Large Text" -msgstr "Text mare" - -#: ../js/ui/status/accessibility.js:224 +#: ../js/ui/status/accessibility.js:62 msgid "Zoom" msgstr "Zoom" -#: ../js/ui/windowAttentionHandler.js:43 +#: ../js/ui/status/accessibility.js:69 +msgid "Screen Reader" +msgstr "Cititor de ecran" + +#: ../js/ui/status/accessibility.js:73 +msgid "Screen Keyboard" +msgstr "Tastatură pe ecran" + +#: ../js/ui/status/accessibility.js:77 +msgid "Visual Alerts" +msgstr "Alerte vizuale" + +#: ../js/ui/status/accessibility.js:80 +msgid "Sticky Keys" +msgstr "Taste lipicioase" + +#: ../js/ui/status/accessibility.js:83 +msgid "Slow Keys" +msgstr "Taste încete" + +#: ../js/ui/status/accessibility.js:86 +msgid "Bounce Keys" +msgstr "Taste fără repetiție" + +#: ../js/ui/status/accessibility.js:89 +msgid "Mouse Keys" +msgstr "Taste maus" + +#: ../js/ui/status/accessibility.js:93 +msgid "Universal Access Settings" +msgstr "Configurări acces universal" + +#: ../js/ui/status/accessibility.js:145 +msgid "High Contrast" +msgstr "Contrast puternic" + +#: ../js/ui/status/accessibility.js:182 +msgid "Large Text" +msgstr "Text mare" + +#: ../js/ui/status/bluetooth.js:42 ../js/ui/status/bluetooth.js:241 +#: ../js/ui/status/bluetooth.js:337 ../js/ui/status/bluetooth.js:371 +#: ../js/ui/status/bluetooth.js:411 ../js/ui/status/bluetooth.js:444 +msgid "Bluetooth" +msgstr "" + +#: ../js/ui/status/bluetooth.js:55 +msgid "Visibility" +msgstr "" + +#: ../js/ui/status/bluetooth.js:69 +msgid "Send Files to Device..." +msgstr "" + +#: ../js/ui/status/bluetooth.js:70 +msgid "Setup a New Device..." +msgstr "" + +#: ../js/ui/status/bluetooth.js:95 +msgid "Bluetooth Settings" +msgstr "" + +#: ../js/ui/status/bluetooth.js:192 +#, fuzzy +#| msgid "Connect to..." +msgid "Connection" +msgstr "Conectare la..." + +#: ../js/ui/status/bluetooth.js:228 +msgid "Send Files..." +msgstr "" + +#: ../js/ui/status/bluetooth.js:233 +msgid "Browse Files..." +msgstr "" + +#: ../js/ui/status/bluetooth.js:242 +msgid "Error browsing device" +msgstr "" + +#: ../js/ui/status/bluetooth.js:243 +#, c-format +msgid "The requested device cannot be browsed, error is '%s'" +msgstr "" + +#: ../js/ui/status/bluetooth.js:251 +msgid "Keyboard Settings" +msgstr "" + +#: ../js/ui/status/bluetooth.js:256 +#, fuzzy +#| msgid "System Settings..." +msgid "Mouse Settings" +msgstr "Configurări sistem..." + +#: ../js/ui/status/bluetooth.js:263 ../js/ui/status/volume.js:65 +#, fuzzy +#| msgid "System Settings..." +msgid "Sound Settings" +msgstr "Configurări sistem..." + +#: ../js/ui/status/bluetooth.js:372 +#, c-format +msgid "Authorization request from %s" +msgstr "" + +#: ../js/ui/status/bluetooth.js:378 +#, c-format +msgid "Device %s wants access to the service '%s'" +msgstr "" + +#: ../js/ui/status/bluetooth.js:380 +msgid "Always grant access" +msgstr "" + +#: ../js/ui/status/bluetooth.js:381 +msgid "Grant this time only" +msgstr "" + +#: ../js/ui/status/bluetooth.js:382 +msgid "Reject" +msgstr "" + +#: ../js/ui/status/bluetooth.js:412 +#, c-format +msgid "Pairing confirmation for %s" +msgstr "" + +#: ../js/ui/status/bluetooth.js:418 ../js/ui/status/bluetooth.js:452 +#, c-format +msgid "Device %s wants to pair with this computer" +msgstr "" + +#: ../js/ui/status/bluetooth.js:419 +#, c-format +msgid "Please confirm whether the PIN '%s' matches the one on the device." +msgstr "" + +#: ../js/ui/status/bluetooth.js:421 +msgid "Matches" +msgstr "" + +#: ../js/ui/status/bluetooth.js:422 +msgid "Does not match" +msgstr "" + +#: ../js/ui/status/bluetooth.js:445 +#, c-format +msgid "Pairing request for %s" +msgstr "" + +#: ../js/ui/status/bluetooth.js:453 +msgid "Please enter the PIN mentioned on the device." +msgstr "" + +#: ../js/ui/status/bluetooth.js:469 +msgid "OK" +msgstr "" + +#: ../js/ui/status/keyboard.js:73 +msgid "Show Keyboard Layout..." +msgstr "" + +#: ../js/ui/status/keyboard.js:76 +msgid "Localization Settings" +msgstr "" + +#: ../js/ui/status/power.js:85 +#, fuzzy +#| msgid "System Settings..." +msgid "Power Settings" +msgstr "Configurări sistem..." + +#. 0 is reported when UPower does not have enough data +#. to estimate battery life +#: ../js/ui/status/power.js:110 +#, fuzzy +#| msgid "System Settings..." +msgid "Estimating..." +msgstr "Configurări sistem..." + +#: ../js/ui/status/power.js:117 +#, fuzzy, c-format +#| msgid "%d hour ago" +#| msgid_plural "%d hours ago" +msgid "%d hour remaining" +msgid_plural "%d hours remaining" +msgstr[0] "Acum o oră" +msgstr[1] "Acum %d ore" +msgstr[2] "Acum %d de ore" + +#. TRANSLATORS: this is a time string, as in "%d hours %d minutes remaining" +#: ../js/ui/status/power.js:120 +#, c-format +msgid "%d %s %d %s remaining" +msgstr "" + +#: ../js/ui/status/power.js:122 +msgid "hour" +msgid_plural "hours" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: ../js/ui/status/power.js:122 +#, fuzzy +#| msgid "%d minute ago" +#| msgid_plural "%d minutes ago" +msgid "minute" +msgid_plural "minutes" +msgstr[0] "Acum un minut" +msgstr[1] "Acum %d minute" +msgstr[2] "Acum %d de minute" + +#: ../js/ui/status/power.js:125 +#, fuzzy, c-format +#| msgid "%d minute ago" +#| msgid_plural "%d minutes ago" +msgid "%d minute remaining" +msgid_plural "%d minutes remaining" +msgstr[0] "Acum un minut" +msgstr[1] "Acum %d minute" +msgstr[2] "Acum %d de minute" + +#: ../js/ui/status/power.js:227 +msgid "AC adapter" +msgstr "" + +#: ../js/ui/status/power.js:229 +msgid "Laptop battery" +msgstr "" + +#: ../js/ui/status/power.js:231 +msgid "UPS" +msgstr "" + +#: ../js/ui/status/power.js:233 +msgid "Monitor" +msgstr "" + +#: ../js/ui/status/power.js:235 +#, fuzzy +#| msgid "Mouse Keys" +msgid "Mouse" +msgstr "Taste maus" + +#: ../js/ui/status/power.js:237 +#, fuzzy +#| msgid "Screen Keyboard" +msgid "Keyboard" +msgstr "Tastatură pe ecran" + +#: ../js/ui/status/power.js:239 +msgid "PDA" +msgstr "" + +#: ../js/ui/status/power.js:241 +msgid "Cell phone" +msgstr "" + +#: ../js/ui/status/power.js:243 +msgid "Media player" +msgstr "" + +#: ../js/ui/status/power.js:245 +#, fuzzy +#| msgid "Enabled" +msgid "Tablet" +msgstr "Activat" + +#: ../js/ui/status/power.js:247 +msgid "Computer" +msgstr "" + +#: ../js/ui/status/power.js:249 ../src/shell-app-system.c:1013 +msgid "Unknown" +msgstr "Necunoscut" + +#: ../js/ui/status/volume.js:44 +msgid "Volume" +msgstr "" + +#: ../js/ui/status/volume.js:57 +msgid "Microphone" +msgstr "" + +#: ../js/ui/telepathyClient.js:239 +#, c-format +msgid "%s is online." +msgstr "" + +#: ../js/ui/telepathyClient.js:244 +#, c-format +msgid "%s is offline." +msgstr "" + +#: ../js/ui/telepathyClient.js:247 +#, fuzzy, c-format +#| msgid "'%s' is ready" +msgid "%s is away." +msgstr "„%s” este gata" + +#: ../js/ui/telepathyClient.js:250 +#, c-format +msgid "%s is busy." +msgstr "" + +#. Translators: this is a time format string followed by a date. +#. If applicable, replace %X with a strftime format valid for your +#. locale, without seconds. +#: ../js/ui/telepathyClient.js:348 +#, no-c-format +msgid "Sent at %X on %A" +msgstr "" + +#. Translators: this is the text displayed +#. in the search entry when no search is +#. active; it should not exceed ~30 +#. characters. +#: ../js/ui/viewSelector.js:117 +msgid "Type to search..." +msgstr "" + +#: ../js/ui/viewSelector.js:137 ../src/shell-util.c:250 +msgid "Search" +msgstr "Caută" + +#: ../js/ui/windowAttentionHandler.js:42 #, c-format msgid "%s has finished starting" msgstr "Pornirea %s s-a finalizat" -#: ../js/ui/windowAttentionHandler.js:45 +#: ../js/ui/windowAttentionHandler.js:44 #, c-format msgid "'%s' is ready" msgstr "„%s” este gata" -#: ../js/ui/workspacesView.js:229 -msgid "" -"Can't add a new workspace because maximum workspaces limit has been reached." -msgstr "" -"Nu se poate adăuga un nou spațiu de lucru pentru că s-a atins limita maximă " -"a numărului de spații." - -#: ../js/ui/workspacesView.js:246 -msgid "Can't remove the first workspace." -msgstr "Nu se poate elimina primul spațiu de lucru." - #. translators: #. * The number of sound outputs on a particular device #: ../src/gvc/gvc-mixer-control.c:1094 @@ -711,11 +1066,15 @@ msgstr[2] "%u de intrări" msgid "System Sounds" msgstr "Sunetele sistemului" -#: ../src/shell-global.c:1219 +#: ../src/main.c:395 +msgid "Print version" +msgstr "" + +#: ../src/shell-global.c:1308 msgid "Less than a minute ago" msgstr "Cu mai puțin de un minut în urmă" -#: ../src/shell-global.c:1223 +#: ../src/shell-global.c:1312 #, c-format msgid "%d minute ago" msgid_plural "%d minutes ago" @@ -723,7 +1082,7 @@ msgstr[0] "Acum un minut" msgstr[1] "Acum %d minute" msgstr[2] "Acum %d de minute" -#: ../src/shell-global.c:1228 +#: ../src/shell-global.c:1317 #, c-format msgid "%d hour ago" msgid_plural "%d hours ago" @@ -731,7 +1090,7 @@ msgstr[0] "Acum o oră" msgstr[1] "Acum %d ore" msgstr[2] "Acum %d de ore" -#: ../src/shell-global.c:1233 +#: ../src/shell-global.c:1322 #, c-format msgid "%d day ago" msgid_plural "%d days ago" @@ -739,7 +1098,7 @@ msgstr[0] "Acum o zi" msgstr[1] "Acum %d zile" msgstr[2] "Acum %d de zile" -#: ../src/shell-global.c:1238 +#: ../src/shell-global.c:1327 #, c-format msgid "%d week ago" msgid_plural "%d weeks ago" @@ -747,30 +1106,258 @@ msgstr[0] "Acum o săptămână" msgstr[1] "Acum %d săptămâni" msgstr[2] "Acum %d de săptămâni" -#: ../src/shell-uri-util.c:89 +#: ../src/shell-polkit-authentication-agent.c:334 +msgid "Authentication dialog was dismissed by the user" +msgstr "" + +#: ../src/shell-util.c:89 msgid "Home Folder" msgstr "Dosar personal" #. Translators: this is the same string as the one found in #. * nautilus -#: ../src/shell-uri-util.c:104 +#: ../src/shell-util.c:104 msgid "File System" msgstr "Sistem de fișiere" -#: ../src/shell-uri-util.c:250 -msgid "Search" -msgstr "Caută" - #. Translators: the first string is the name of a gvfs #. * method, and the second string is a path. For #. * example, "Trash: some-directory". It means that the #. * directory called "some-directory" is in the trash. #. -#: ../src/shell-uri-util.c:300 +#: ../src/shell-util.c:300 #, c-format msgid "%1$s: %2$s" msgstr "%1$s: %2$s" +#~ msgid "Clock" +#~ msgstr "Ceas" + +#~ msgid "Customize the panel clock" +#~ msgstr "Personalizați ceasul din panou" + +#~ msgid "Custom format of the clock" +#~ msgstr "Format personalizat pentru ceas" + +#~ msgid "Hour format" +#~ msgstr "Format oră" + +#~ msgid "" +#~ "If true and format is either \"12-hour\" or \"24-hour\", display seconds " +#~ "in time." +#~ msgstr "" +#~ "Dacă este adevărat, și formatul este fie „12-hour” fie „24-hour”, pe " +#~ "lângă oră, în ceas se afișează și secundele." + +#~ msgid "Overview workspace view mode" +#~ msgstr "Modul de vizualizare a spațiilor de lucru în prezentarea generală" + +#~ msgid "" +#~ "The selected workspace view mode in the overview. Supported values are " +#~ "\"single\" and \"grid\"." +#~ msgstr "" +#~ "Modul de vizualizare a spațiilor de lucru în prezentarea generală. " +#~ "Valorile suportate sunt „single” și „grid”." + +#~ msgid "" +#~ "This key specifies the format used by the panel clock when the format key " +#~ "is set to \"custom\". You can use conversion specifiers understood by " +#~ "strftime() to obtain a specific format. See the strftime() manual for " +#~ "more information." +#~ msgstr "" +#~ "Această cheie specifică formatul utilizat în ceasul de panou când cheia " +#~ "de format are valoarea „custom”. Puteți utiliza specificatorii de " +#~ "conversie specifici strftime() pentru a obține un anumit format. " +#~ "Consultați manualul strftime() pentru mai multe informații." + +#~ msgid "" +#~ "This key specifies the hour format used by the panel clock. Possible " +#~ "values are \"12-hour\", \"24-hour\", \"unix\" and \"custom\". If set to " +#~ "\"unix\", the clock will display time in seconds since Epoch, i.e. 1970-" +#~ "01-01. If set to \"custom\", the clock will display time according to the " +#~ "format specified in the custom_format key. Note that if set to either " +#~ "\"unix\" or \"custom\", the show_date and show_seconds keys are ignored." +#~ msgstr "" +#~ "Această cheie specifică formatul orei afișate de ceasul din panou. " +#~ "Valorile posibile sunt „12-hour”, „24-hour”, „unix” și „custom”. Dacă " +#~ "valoarea este „unix”, ceasul va afișa timpul în secunde de la începutul " +#~ "Epocii Unix (1 ianuarie 1970). Dacă valoarea este „custom”, ceasul va " +#~ "afișa timpul conform formatului din cheia custom_format. Dacă valoarea " +#~ "este fie „unix” fie „custom” se ignoră valoarea cheilor show_date și " +#~ "show_seconds." + +#~ msgid "Clip the crosshairs at the center" +#~ msgstr "Prinde reticulele în centru" + +#~ msgid "Color of the crosshairs" +#~ msgstr "Culoarea reticulelor" + +#~ msgid "" +#~ "Determines the length of the vertical and horizontal lines that make up " +#~ "the crosshairs." +#~ msgstr "" +#~ "Determină lungimea liniilor verticale și orizontale care alcătuiesc " +#~ "reticulele." + +#~ msgid "" +#~ "Determines the position of the magnified mouse image within the magnified " +#~ "view and how it reacts to system mouse movement. The values are - none: " +#~ "no mouse tracking; - centered: the mouse image is displayed at the center " +#~ "of the zoom region (which also represents the point under the system " +#~ "mouse) and the magnified contents are scrolled as the system mouse moves; " +#~ "- proportional: the position of the magnified mouse in the zoom region is " +#~ "proportionally the same as the position of the system mouse on screen; - " +#~ "push: when the magnified mouse intersects a boundary of the zoom region, " +#~ "the contents are scrolled into view." +#~ msgstr "" +#~ "Determină poziția imaginii mărite a mausului în vizualizarea mărită și " +#~ "cum reacționează la mișcarea mausului a sistemului. Valorile sunt - none: " +#~ "nu se urmărește mausul; - centered: imaginea mausului este afișată în " +#~ "centrul regiunii zoom (care reprezintă de asemenea punctul de sub mausul " +#~ "sistemului) și proportional: poziția mausului mărit în regiunea zoom este " +#~ "proporțională la fel ca poziția mausului sistemului de pe ecran; - push: " +#~ "când mausul mărit intersectează o graniță a regiunii zoom, conținutul " +#~ "acesteia este derulat în câmpul vizibil." + +#~ msgid "" +#~ "Determines the transparency of the crosshairs, from fully opaque to fully " +#~ "transparent." +#~ msgstr "" +#~ "Determină transparența reticulelor, de la complet opac la deplin " +#~ "transparente." + +#~ msgid "" +#~ "Determines whether the crosshairs intersect the magnified mouse sprite, " +#~ "or are clipped such that the ends of the horizontal and vertical lines " +#~ "surround the mouse image." +#~ msgstr "" +#~ "Determină dacă reticulele intersectează umbra mausului mărit, sau sunt " +#~ "prinse astfel încât capetele liniilor orizontale și verticale înconjoară " +#~ "imaginea mausului." + +#~ msgid "Enable lens mode" +#~ msgstr "Activează modul cu lupă" + +#~ msgid "" +#~ "Enables/disables display of crosshairs centered on the magnified mouse " +#~ "sprite." +#~ msgstr "" +#~ "Activează/dezactivează afișarea reticulelor centrate pe umbra mausului " +#~ "mărit." + +#~ msgid "" +#~ "For centered mouse tracking, when the system pointer is at or near the " +#~ "edge of the screen, the magnified contents continue to scroll such that " +#~ "the screen edge moves into the magnified view." +#~ msgstr "" +#~ "Pentru urmărirea centrată a mausului, când indicatorul sistemului este pe " +#~ "sau lângă marginea ecranului, conținutul mărit continuă să se deruleze " +#~ "astfel încât marginile ecranului se mută în modul mărit." + +#~ msgid "Length of the crosshairs" +#~ msgstr "Lungimea reticulelor" + +#~ msgid "Magnification factor" +#~ msgstr "Factorul de mărire" + +#~ msgid "Mouse Tracking Mode" +#~ msgstr "Mod urmărire maus" + +#~ msgid "Opacity of the crosshairs" +#~ msgstr "Opacitatea reticulelor" + +#~ msgid "Screen position" +#~ msgstr "Poziția ecranului" + +#~ msgid "Scroll magnified contents beyond the edges of the desktop" +#~ msgstr "Derulează conținutul mărit în afara marginilor ecranului" + +#~ msgid "Show or hide crosshairs" +#~ msgstr "Arată sau ascunde reticulele" + +#~ msgid "Show or hide the magnifier" +#~ msgstr "Arată sau ascunde lupa" + +#~ msgid "Show or hide the magnifier and all of its zoom regions." +#~ msgstr "Arată sau ascunde lupa și toate regiunile ei de zoom." + +#~ msgid "" +#~ "The color of the the vertical and horizontal lines that make up the " +#~ "crosshairs." +#~ msgstr "Culoarea liniilor verticale și orizontale ce compun reticul." + +#~ msgid "" +#~ "The magnified view either fills the entire screen, or occupies the top-" +#~ "half, bottom-half, left-half, or right-half of the screen." +#~ msgstr "" +#~ "Vizualizarea mărită fie se aplică întregului ecran, fie ocupă jumătatea " +#~ "de sus, jumătatea de jos, jumătatea din stânga, sau jumătatea din dreapta " +#~ "a ecranului." + +#~ msgid "" +#~ "The power of the magnification. A value of 1.0 means no magnification. A " +#~ "value of 2.0 doubles the size." +#~ msgstr "" +#~ "Factor de mărire. Valoarea 1.0 înseamnă afișare fără mărire sau " +#~ "micșorare. Valoarea 2.0 dublează mărimea." + +#~ msgid "Thickness of the crosshairs" +#~ msgstr "Grosimea reticulelor" + +#~ msgid "" +#~ "Whether the magnified view should be centered over the location of the " +#~ "system mouse and move with it." +#~ msgstr "" +#~ "Dacă vizualizarea mărită ar trebui centrată asupra locației mausului " +#~ "sistemului și dacă ar trebui să se miște odată cu el." + +#~ msgid "" +#~ "Width of the vertical and horizontal lines that make up the crosshairs." +#~ msgstr "Lățimea liniilor verticale și orizontale ce compun reticulele." + +#~ msgid "Clock Format" +#~ msgstr "Format ceas" + +#~ msgid "Clock Preferences" +#~ msgstr "Preferințe ceas" + +#~ msgid "Panel Display" +#~ msgstr "Afișaj panou" + +#~ msgid "Show seco_nds" +#~ msgstr "Afișează secu_nde" + +#~ msgid "Show the _date" +#~ msgstr "Afișează _data" + +#~ msgid "_12 hour format" +#~ msgstr "Format cu _12 ore" + +#~ msgid "_24 hour format" +#~ msgstr "Format cu _24 de ore" + +#~ msgid "PREFERENCES" +#~ msgstr "PREFERINȚE" + +#~ msgid "Drag here to add favorites" +#~ msgstr "Trageți aici pentru a adăuga favorite" + +#~ msgid "Find" +#~ msgstr "Caută" + +#~ msgid "Preferences" +#~ msgstr "Preferințe" + +#~ msgid "" +#~ "Can't add a new workspace because maximum workspaces limit has been " +#~ "reached." +#~ msgstr "" +#~ "Nu se poate adăuga un nou spațiu de lucru pentru că s-a atins limita " +#~ "maximă a numărului de spații." + +#~ msgid "Can't remove the first workspace." +#~ msgstr "Nu se poate elimina primul spațiu de lucru." + #~ msgid "ON" #~ msgstr "Pornit" @@ -780,9 +1367,6 @@ msgstr "%1$s: %2$s" #~ msgid "Invisible" #~ msgstr "Invizibil" -#~ msgid "Account Information..." -#~ msgstr "Informații despre cont..." - #~ msgid "Frequent" #~ msgstr "Frecvent" @@ -798,18 +1382,9 @@ msgstr "%1$s: %2$s" #~ msgid "SEARCH RESULTS" #~ msgstr "REZULTATELE CĂUTĂRII" -#~ msgid "%H:%M" -#~ msgstr "%H:%M" - -#~ msgid "Applications" -#~ msgstr "Aplicații" - #~ msgid "Recent Documents" #~ msgstr "Documente recente" -#~ msgid "Unknown" -#~ msgstr "Necunoscut" - #~ msgid "Can't lock screen: %s" #~ msgstr "Nu s-a putut bloca ecranul: %s" From 44e2d886285533b63a596770069e0911451b13b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20=C8=98erb=C4=83nescu?= Date: Sun, 13 Mar 2011 01:19:11 +0100 Subject: [PATCH 24/44] Updated Romanian translation --- po/ro.po | 465 ++++++++++++++++++++++++------------------------------- 1 file changed, 206 insertions(+), 259 deletions(-) diff --git a/po/ro.po b/po/ro.po index b23ed9fa8..61a58c8c6 100644 --- a/po/ro.po +++ b/po/ro.po @@ -1,15 +1,16 @@ -# Romanian translation for gnome-shell. # This file is distributed under the same license as the gnome-shell package. # Lucian Adrian Grijincu , 2009, 2010. -# Daniel Șerbănescu , 2010. +# Daniel Șerbănescu , 2010, 2011. +# laurion , 2010. +# Ion Laurențiu Cristian , 2010. msgid "" msgstr "" "Project-Id-Version: gnome-shell master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" -"shell&component=general\n" -"POT-Creation-Date: 2011-03-08 05:43+0000\n" -"PO-Revision-Date: 2010-11-15 22:34+0300\n" -"Last-Translator: Lucian Adrian Grijincu \n" +"shell&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-03-12 22:48+0000\n" +"PO-Revision-Date: 2011-02-13 00:04+0200\n" +"Last-Translator: Daniel Șerbănescu \n" "Language-Team: Romanian Gnome Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,13 +33,13 @@ msgid "" "Allows access to internal debugging and monitoring tools using the Alt-F2 " "dialog." msgstr "" -"Permite accesul la informațiile interne utilitarelor de depanare și " -"monitorizare folosind dialogul Alt-F2." +"Permite accesul la uneltele interne de depanare și monitorizare folosind dialogul " +"Alt-F2." #: ../data/org.gnome.shell.gschema.xml.in.h:2 msgid "Enable internal tools useful for developers and testers from Alt-F2" msgstr "" -"Activează utilitarele interne pentru dezvoltatori și testeri din Alt-F2" +"Activează din Alt-F2 uneltele interne utile dezvoltatorilor și testerilor" #: ../data/org.gnome.shell.gschema.xml.in.h:3 msgid "File extension used for storing the screencast" @@ -67,20 +68,12 @@ msgid "History for the looking glass dialog" msgstr "Istoricul dialogului de comenzi (Alt-F2)" #: ../data/org.gnome.shell.gschema.xml.in.h:8 -#, fuzzy -#| msgid "" -#| "If true and format is either \"12-hour\" or \"24-hour\", display date in " -#| "the clock, in addition to time." msgid "If true, display date in the clock, in addition to time." -msgstr "" -"Dacă este adevărat, și formatul este fie „12-hour” fie „24-hour”, pe lângă " -"oră, în ceas se afișează și data." +msgstr "Dacă este adevărat, afișează data în ceas, lângă oră." #: ../data/org.gnome.shell.gschema.xml.in.h:9 -#, fuzzy -#| msgid "If true, display the ISO week date in the calendar." msgid "If true, display seconds in time." -msgstr "Dacă este adevărat, se afișează săptămâna ISO în calendar." +msgstr "Dacă este adevărat, afișează secundele lângă oră." #: ../data/org.gnome.shell.gschema.xml.in.h:10 msgid "If true, display the ISO week date in the calendar." @@ -92,16 +85,6 @@ msgstr "Listă de identificatori de fișiere desktop pentru aplicațiile favorit #: ../data/org.gnome.shell.gschema.xml.in.h:13 #, fuzzy, no-c-format -#| msgid "" -#| "Sets the GStreamer pipeline used to encode recordings. It follows the " -#| "syntax used for gst-launch. The pipeline should have an unconnected sink " -#| "pad where the recorded video is recorded. It will normally have a " -#| "unconnected source pad; output from that pad will be written into the " -#| "output file. However the pipeline can also take care of its own output - " -#| "this might be used to send the output to an icecast server via shout2send " -#| "or similar. When unset or set to an empty value, the default pipeline " -#| "will be used. This is currently 'videorate ! theoraenc ! oggmux' and " -#| "records to Ogg Theora." msgid "" "Sets the GStreamer pipeline used to encode recordings. It follows the syntax " "used for gst-launch. The pipeline should have an unconnected sink pad where " @@ -115,15 +98,17 @@ msgid "" "at the optimal thread count on the system." msgstr "" "Definește linia de asamblare GStreamer utilizată pentru a codifica " -"înregistrările. Folosiți aceeași sintaxă ca la gst-launch. Linia de " +"înregistrările. Folosește aceeași sintaxă ca la gst-launch. Linia de " "asamblare ar trebui să aibă o intrare neconectată unde va fi înregistrat " "ecranul. În mod normal va avea o intrare neconectată și o ieșire care va fi " "scrisă în fișierul de ieșire. Cu toate acestea, linia de asamblare poate să " "aibă grijă de ieșirea proprie - aceasta ar putea fi utilizată pentru a " "trimite ieșirea la un server icecast, shout2send sau un alt server similar. " "Când este dezactivată, sau are o valoare vidă, se utilizează linia de " -"asamblare implicită. Aceasta este acum definită ca „videorate ! theoraenc ! " -"oggmux” și înregistrează în formatul Ogg Theora." +"asamblare implicită. Aceasta este acum definită ca „videorate ! vp8enc " +"quality=10 speed=2 threads=%T ! queue ! webmmux” și înregistrează în WEBM " +"folosind codecul VP8. %T este folosit ca înlocuitor pentru o valoare " +"estimativă a numărului optim de fire de execuție pe acest sistem." #: ../data/org.gnome.shell.gschema.xml.in.h:14 msgid "Show date in clock" @@ -135,7 +120,7 @@ msgstr "Afișează săptămâna în calendar" #: ../data/org.gnome.shell.gschema.xml.in.h:16 msgid "Show time with seconds" -msgstr "Afișează timpul cu secunde " +msgstr "Afișează ora cu secunde" #: ../data/org.gnome.shell.gschema.xml.in.h:17 msgid "" @@ -192,25 +177,21 @@ msgstr "Dacă să se colecteze statistici despre utilizarea aplicațiilor" #: ../data/org.gnome.shell.gschema.xml.in.h:24 msgid "disabled OpenSearch providers" -msgstr "" +msgstr "furnizori OpenSearch dezactivați" #: ../js/misc/util.js:86 msgid "Command not found" -msgstr "" +msgstr "Comanda nu a fost găsită" #. Replace "Error invoking GLib.shell_parse_argv: " with #. something nicer #: ../js/misc/util.js:113 -#, fuzzy -#| msgid "Please enter a command:" msgid "Could not parse command:" -msgstr "Introduceți o comandă:" +msgstr "Nu s-a putut analiza comanda:" #: ../js/misc/util.js:135 -#, fuzzy -#| msgid "Applications" msgid "No such application" -msgstr "Aplicații" +msgstr "Nu există această aplicație" #: ../js/misc/util.js:148 #, c-format @@ -220,15 +201,15 @@ msgstr "Execuția comenzii „%s” a eșuat:" #. Translators: Filter to display all applications #: ../js/ui/appDisplay.js:226 msgid "All" -msgstr "" +msgstr "Toate" #: ../js/ui/appDisplay.js:324 msgid "APPLICATIONS" -msgstr "APPLICAȚII" +msgstr "APLICAȚII" #: ../js/ui/appDisplay.js:350 msgid "SETTINGS" -msgstr "" +msgstr "SETĂRI" #: ../js/ui/appDisplay.js:612 msgid "New Window" @@ -236,7 +217,7 @@ msgstr "Fereastră nouă" #: ../js/ui/appDisplay.js:615 msgid "Remove from Favorites" -msgstr "Elimină de la favorite" +msgstr "Elimină din favorite" #: ../js/ui/appDisplay.js:616 msgid "Add to Favorites" @@ -250,7 +231,7 @@ msgstr "%s a fost adăugat la favorite." #: ../js/ui/appFavorites.js:122 #, c-format msgid "%s has been removed from your favorites." -msgstr "%s a fost eliminat de la favorite." +msgstr "%s a fost eliminat din favorite." #. Translators: Shown in calendar event list for all day events #. * Keep it short, best if you can use less then 10 characters @@ -258,23 +239,19 @@ msgstr "%s a fost eliminat de la favorite." #: ../js/ui/calendar.js:66 msgctxt "event list time" msgid "All Day" -msgstr "" +msgstr "Toată ziua" #. Translators: Shown in calendar event list, if 24h format #: ../js/ui/calendar.js:71 -#, fuzzy -#| msgid "%H:%M" msgctxt "event list time" msgid "%H:%M" msgstr "%H:%M" #. Transators: Shown in calendar event list, if 12h format #: ../js/ui/calendar.js:78 -#, fuzzy -#| msgid "%a %l:%M %p" msgctxt "event list time" msgid "%l:%M %p" -msgstr "%a %l:%M %p" +msgstr "%l:%M %p" #. Translators: Calendar grid abbreviation for Sunday. #. * @@ -284,43 +261,43 @@ msgstr "%a %l:%M %p" #: ../js/ui/calendar.js:118 msgctxt "grid sunday" msgid "S" -msgstr "" +msgstr "D" #. Translators: Calendar grid abbreviation for Monday #: ../js/ui/calendar.js:120 msgctxt "grid monday" msgid "M" -msgstr "" +msgstr "L" #. Translators: Calendar grid abbreviation for Tuesday #: ../js/ui/calendar.js:122 msgctxt "grid tuesday" msgid "T" -msgstr "" +msgstr "M" #. Translators: Calendar grid abbreviation for Wednesday #: ../js/ui/calendar.js:124 msgctxt "grid wednesday" msgid "W" -msgstr "" +msgstr "M" #. Translators: Calendar grid abbreviation for Thursday #: ../js/ui/calendar.js:126 msgctxt "grid thursday" msgid "T" -msgstr "" +msgstr "J" #. Translators: Calendar grid abbreviation for Friday #: ../js/ui/calendar.js:128 msgctxt "grid friday" msgid "F" -msgstr "" +msgstr "V" #. Translators: Calendar grid abbreviation for Saturday #: ../js/ui/calendar.js:130 msgctxt "grid saturday" msgid "S" -msgstr "" +msgstr "S" #. Translators: Event list abbreviation for Sunday. #. * @@ -331,92 +308,88 @@ msgstr "" #: ../js/ui/calendar.js:143 msgctxt "list sunday" msgid "Su" -msgstr "" +msgstr "D" #. Translators: Event list abbreviation for Monday #: ../js/ui/calendar.js:145 msgctxt "list monday" msgid "M" -msgstr "" +msgstr "L" #. Translators: Event list abbreviation for Tuesday #: ../js/ui/calendar.js:147 msgctxt "list tuesday" msgid "T" -msgstr "" +msgstr "Ma" #. Translators: Event list abbreviation for Wednesday #: ../js/ui/calendar.js:149 msgctxt "list wednesday" msgid "W" -msgstr "" +msgstr "Mi" #. Translators: Event list abbreviation for Thursday #: ../js/ui/calendar.js:151 msgctxt "list thursday" msgid "Th" -msgstr "" +msgstr "J" #. Translators: Event list abbreviation for Friday #: ../js/ui/calendar.js:153 msgctxt "list friday" msgid "F" -msgstr "" +msgstr "V" #. Translators: Event list abbreviation for Saturday #: ../js/ui/calendar.js:155 msgctxt "list saturday" msgid "S" -msgstr "" +msgstr "S" #. Translators: Text to show if there are no events #: ../js/ui/calendar.js:704 msgid "Nothing Scheduled" -msgstr "" +msgstr "Nimic planificat" #. Translators: Shown on calendar heading when selected day occurs on current year #: ../js/ui/calendar.js:720 msgctxt "calendar heading" msgid "%A, %B %d" -msgstr "" +msgstr "%A, %d %B" #. Translators: Shown on calendar heading when selected day occurs on different year #: ../js/ui/calendar.js:723 -#, fuzzy -#| msgid "%a %b %e, %R" msgctxt "calendar heading" msgid "%A, %B %d, %Y" -msgstr "%a %e %b, %R" +msgstr "%A, %d %B %Y" #: ../js/ui/calendar.js:733 msgid "Today" -msgstr "" +msgstr "Astăzi" #: ../js/ui/calendar.js:737 msgid "Tomorrow" -msgstr "" +msgstr "Mâine" #: ../js/ui/calendar.js:746 msgid "This week" -msgstr "" +msgstr "Această săptămână" #: ../js/ui/calendar.js:754 msgid "Next week" -msgstr "" +msgstr "Săptămâna viitoare" -#: ../js/ui/dash.js:174 ../js/ui/messageTray.js:933 +#: ../js/ui/dash.js:174 ../js/ui/messageTray.js:931 msgid "Remove" -msgstr "" +msgstr "Elimină" #: ../js/ui/dateMenu.js:91 -#, fuzzy -#| msgid "System Settings..." msgid "Date and Time Settings" -msgstr "Configurări sistem..." +msgstr "Configurări pentru dată și oră" #: ../js/ui/dateMenu.js:111 msgid "Open Calendar" -msgstr "" +msgstr "Deschide calendarul" #. Translators: This is the time format with date used #. in 24-hour mode. @@ -463,89 +436,85 @@ msgstr "%a %l:%M %p" #. #: ../js/ui/dateMenu.js:209 #, fuzzy -#| msgid "%a %b %e, %R" msgid "%A %B %e, %Y" -msgstr "%a %e %b, %R" +msgstr "%A %e %B, %Y" #: ../js/ui/docDisplay.js:19 msgid "RECENT ITEMS" msgstr "ELEMENTE RECENTE" +# Lucian: %s aici e numele utilizatorului #: ../js/ui/endSessionDialog.js:63 -#, fuzzy, c-format -#| msgid "Log Out..." +#, c-format msgid "Log Out %s" -msgstr "Ieși din sesiune..." +msgstr "Ieșire din sesiune pentru %s" #: ../js/ui/endSessionDialog.js:64 ../js/ui/endSessionDialog.js:69 -#, fuzzy -#| msgid "Log Out..." msgid "Log Out" -msgstr "Ieși din sesiune..." +msgstr "Ieșire din sesiune" #: ../js/ui/endSessionDialog.js:65 msgid "Click Log Out to quit these applications and log out of the system." msgstr "" +"Apăsați „Ieșire din sesiune” pentru a închide aceste aplicații și a ieși din " +"sistem." #: ../js/ui/endSessionDialog.js:66 #, c-format msgid "%s will be logged out automatically in %d seconds." -msgstr "" +msgstr "%s va fi scos din sesiune automat în %d secunde." #: ../js/ui/endSessionDialog.js:67 #, c-format msgid "You will be logged out automatically in %d seconds." -msgstr "" +msgstr "Veți fi scos din sesiune automat în %d secunde." #: ../js/ui/endSessionDialog.js:68 msgid "Logging out of the system." -msgstr "" +msgstr "Ieșirea din sesiune a sistemului." #: ../js/ui/endSessionDialog.js:74 ../js/ui/endSessionDialog.js:78 -#, fuzzy -#| msgid "Shut Down..." msgid "Shut Down" -msgstr "Oprește..." +msgstr "Oprește" #: ../js/ui/endSessionDialog.js:75 msgid "Click Shut Down to quit these applications and shut down the system." -msgstr "" +msgstr "Apăsați „Oprește” pentru a închide aceste aplicații și a opri sistemul." #: ../js/ui/endSessionDialog.js:76 #, c-format msgid "The system will shut down automatically in %d seconds." -msgstr "" +msgstr "Sistemul va fi oprit automat în %d secunde." #: ../js/ui/endSessionDialog.js:77 msgid "Shutting down the system." -msgstr "" +msgstr "Oprirea sistemului." #: ../js/ui/endSessionDialog.js:84 ../js/ui/endSessionDialog.js:88 -#, fuzzy -#| msgid "Retry" msgid "Restart" -msgstr "Reîncearcă" +msgstr "Repornește" #: ../js/ui/endSessionDialog.js:85 msgid "Click Restart to quit these applications and restart the system." msgstr "" +"Apăsați „Repornește” pentru a închide aceste aplicații și a reporni sistemul." #: ../js/ui/endSessionDialog.js:86 #, c-format msgid "The system will restart automatically in %d seconds." -msgstr "" +msgstr "Sistemul se va reporni automat în %d secunde" #: ../js/ui/endSessionDialog.js:87 msgid "Restarting the system." -msgstr "" +msgstr "Repornirea sistemului." #: ../js/ui/endSessionDialog.js:395 msgid "Confirm" -msgstr "" +msgstr "Confirm" #: ../js/ui/endSessionDialog.js:400 ../js/ui/status/bluetooth.js:470 msgid "Cancel" -msgstr "" +msgstr "Anulează" #: ../js/ui/lookingGlass.js:588 msgid "No extensions installed" @@ -557,7 +526,7 @@ msgstr "Activat" #. translators: #. * The device has been disabled -#: ../js/ui/lookingGlass.js:627 ../src/gvc/gvc-mixer-control.c:1087 +#: ../js/ui/lookingGlass.js:627 ../src/gvc/gvc-mixer-control.c:1091 msgid "Disabled" msgstr "Dezactivat" @@ -577,25 +546,21 @@ msgstr "Vezi sursa" msgid "Web Page" msgstr "Pagină web" -#: ../js/ui/messageTray.js:926 +#: ../js/ui/messageTray.js:924 msgid "Open" msgstr "" -#: ../js/ui/messageTray.js:1963 -#, fuzzy -#| msgid "Account Information..." +#: ../js/ui/messageTray.js:1961 msgid "System Information" -msgstr "Informații despre cont..." +msgstr "Informații despre sistem" #: ../js/ui/overview.js:88 msgid "Undo" msgstr "Anulează" #: ../js/ui/overview.js:183 -#, fuzzy -#| msgid "New Window" msgid "Windows" -msgstr "Fereastră nouă" +msgstr "Ferestre" #: ../js/ui/overview.js:186 msgid "Applications" @@ -608,20 +573,22 @@ msgid "Dash" msgstr "" #. TODO - _quit() doesn't really work on apps in state STARTING yet -#: ../js/ui/panel.js:532 +#: ../js/ui/panel.js:560 #, c-format msgid "Quit %s" msgstr "Închide %s" #. Button on the left side of the panel. #. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview". -#: ../js/ui/panel.js:893 +#: ../js/ui/panel.js:919 msgid "Activities" msgstr "Activități" -#: ../js/ui/panel.js:994 +#: ../js/ui/panel.js:1020 +#, fuzzy +#| msgid "Cancel" msgid "Panel" -msgstr "" +msgstr "Anulează" #: ../js/ui/placeDisplay.js:122 #, c-format @@ -661,43 +628,41 @@ msgstr "Se caută..." msgid "No matching results." msgstr "Niciun rezultat care să se potrivească." -#: ../js/ui/statusMenu.js:102 ../js/ui/statusMenu.js:166 +#: ../js/ui/statusMenu.js:114 ../js/ui/statusMenu.js:178 msgid "Power Off..." msgstr "" -#: ../js/ui/statusMenu.js:104 ../js/ui/statusMenu.js:165 +#: ../js/ui/statusMenu.js:116 ../js/ui/statusMenu.js:177 +#, fuzzy +#| msgid "Suspend..." msgid "Suspend" -msgstr "Suspendă" +msgstr "Suspendă..." -#: ../js/ui/statusMenu.js:125 +#: ../js/ui/statusMenu.js:137 msgid "Available" msgstr "Disponibil" -#: ../js/ui/statusMenu.js:130 +#: ../js/ui/statusMenu.js:142 msgid "Busy" msgstr "Ocupat" -#: ../js/ui/statusMenu.js:138 -#, fuzzy -#| msgid "My Account..." +#: ../js/ui/statusMenu.js:150 msgid "My Account" -msgstr "Contul meu..." +msgstr "Contul meu" -#: ../js/ui/statusMenu.js:142 -#, fuzzy -#| msgid "System Settings..." +#: ../js/ui/statusMenu.js:154 msgid "System Settings" -msgstr "Configurări sistem..." +msgstr "Configurări de sistem" -#: ../js/ui/statusMenu.js:149 +#: ../js/ui/statusMenu.js:161 msgid "Lock Screen" msgstr "Blochează ecranul" -#: ../js/ui/statusMenu.js:153 +#: ../js/ui/statusMenu.js:165 msgid "Switch User" -msgstr "Schimbă utilizatorul" +msgstr "Comută utilizatorul" -#: ../js/ui/statusMenu.js:158 +#: ../js/ui/statusMenu.js:170 msgid "Log Out..." msgstr "Ieși din sesiune..." @@ -749,120 +714,114 @@ msgstr "Text mare" #: ../js/ui/status/bluetooth.js:337 ../js/ui/status/bluetooth.js:371 #: ../js/ui/status/bluetooth.js:411 ../js/ui/status/bluetooth.js:444 msgid "Bluetooth" -msgstr "" +msgstr "Bluetooth" #: ../js/ui/status/bluetooth.js:55 msgid "Visibility" -msgstr "" +msgstr "Vizibilitate" #: ../js/ui/status/bluetooth.js:69 msgid "Send Files to Device..." -msgstr "" +msgstr "Trimite fișiere către dispozitiv..." #: ../js/ui/status/bluetooth.js:70 msgid "Setup a New Device..." -msgstr "" +msgstr "Configurează un dispozitiv nou..." #: ../js/ui/status/bluetooth.js:95 msgid "Bluetooth Settings" -msgstr "" +msgstr "Configurări Bluetooth" #: ../js/ui/status/bluetooth.js:192 -#, fuzzy -#| msgid "Connect to..." msgid "Connection" -msgstr "Conectare la..." +msgstr "Conexiune" #: ../js/ui/status/bluetooth.js:228 msgid "Send Files..." -msgstr "" +msgstr "Trimite fișiere..." #: ../js/ui/status/bluetooth.js:233 msgid "Browse Files..." -msgstr "" +msgstr "Alege fișiere..." #: ../js/ui/status/bluetooth.js:242 msgid "Error browsing device" -msgstr "" +msgstr "Eroare la navigarea dispozitivului" #: ../js/ui/status/bluetooth.js:243 #, c-format msgid "The requested device cannot be browsed, error is '%s'" -msgstr "" +msgstr "Dispozitivul cerut nu poate fi navigat, eroarea este „%s”" #: ../js/ui/status/bluetooth.js:251 msgid "Keyboard Settings" -msgstr "" +msgstr "Configurări tastatură" #: ../js/ui/status/bluetooth.js:256 -#, fuzzy -#| msgid "System Settings..." msgid "Mouse Settings" -msgstr "Configurări sistem..." +msgstr "Configurări maus" -#: ../js/ui/status/bluetooth.js:263 ../js/ui/status/volume.js:65 -#, fuzzy -#| msgid "System Settings..." +#: ../js/ui/status/bluetooth.js:263 ../js/ui/status/volume.js:66 msgid "Sound Settings" -msgstr "Configurări sistem..." +msgstr "Configurări sunet" #: ../js/ui/status/bluetooth.js:372 #, c-format msgid "Authorization request from %s" -msgstr "" +msgstr "Cerere de autorizare de la %s" #: ../js/ui/status/bluetooth.js:378 #, c-format msgid "Device %s wants access to the service '%s'" -msgstr "" +msgstr "Dispozitivul %s dorește acces la serviciul „%s”" #: ../js/ui/status/bluetooth.js:380 msgid "Always grant access" -msgstr "" +msgstr "Acordă acces întotdeauna" #: ../js/ui/status/bluetooth.js:381 msgid "Grant this time only" -msgstr "" +msgstr "Acordă acces doar de data aceasta" #: ../js/ui/status/bluetooth.js:382 msgid "Reject" -msgstr "" +msgstr "Respinge" #: ../js/ui/status/bluetooth.js:412 #, c-format msgid "Pairing confirmation for %s" -msgstr "" +msgstr "Se asociază confirmarea pentru %s" #: ../js/ui/status/bluetooth.js:418 ../js/ui/status/bluetooth.js:452 #, c-format msgid "Device %s wants to pair with this computer" -msgstr "" +msgstr "Dispozitivul %s dorește să se asocieze cu acest computer" #: ../js/ui/status/bluetooth.js:419 #, c-format msgid "Please confirm whether the PIN '%s' matches the one on the device." -msgstr "" +msgstr "Confirmați dacă codul PIN „%s” se potrivește cu cel de pe dispozitiv." #: ../js/ui/status/bluetooth.js:421 msgid "Matches" -msgstr "" +msgstr "Se potrivește" #: ../js/ui/status/bluetooth.js:422 msgid "Does not match" -msgstr "" +msgstr "Nu se potrivește" #: ../js/ui/status/bluetooth.js:445 #, c-format msgid "Pairing request for %s" -msgstr "" +msgstr "Cerere de asociere de la %s" #: ../js/ui/status/bluetooth.js:453 msgid "Please enter the PIN mentioned on the device." -msgstr "" +msgstr "Introduceți codul PIN menționat pe dispozitiv." #: ../js/ui/status/bluetooth.js:469 msgid "OK" -msgstr "" +msgstr "OK" #: ../js/ui/status/keyboard.js:73 msgid "Show Keyboard Layout..." @@ -870,165 +829,147 @@ msgstr "" #: ../js/ui/status/keyboard.js:76 msgid "Localization Settings" -msgstr "" +msgstr "Configurări de localizare" #: ../js/ui/status/power.js:85 -#, fuzzy -#| msgid "System Settings..." msgid "Power Settings" -msgstr "Configurări sistem..." +msgstr "Configurări de alimentare" #. 0 is reported when UPower does not have enough data #. to estimate battery life #: ../js/ui/status/power.js:110 -#, fuzzy -#| msgid "System Settings..." msgid "Estimating..." -msgstr "Configurări sistem..." +msgstr "" #: ../js/ui/status/power.js:117 -#, fuzzy, c-format -#| msgid "%d hour ago" -#| msgid_plural "%d hours ago" +#, c-format msgid "%d hour remaining" msgid_plural "%d hours remaining" -msgstr[0] "Acum o oră" -msgstr[1] "Acum %d ore" -msgstr[2] "Acum %d de ore" +msgstr[0] "A mai rămas o oră" +msgstr[1] "Au mai rămas %d ore" +msgstr[2] "Au mai rămas %d de ore" #. TRANSLATORS: this is a time string, as in "%d hours %d minutes remaining" #: ../js/ui/status/power.js:120 #, c-format msgid "%d %s %d %s remaining" -msgstr "" +msgstr "Au mai rămas %d %s %d %s" #: ../js/ui/status/power.js:122 msgid "hour" msgid_plural "hours" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "oră" +msgstr[1] "ore" +msgstr[2] "de ore" #: ../js/ui/status/power.js:122 -#, fuzzy -#| msgid "%d minute ago" -#| msgid_plural "%d minutes ago" msgid "minute" msgid_plural "minutes" -msgstr[0] "Acum un minut" -msgstr[1] "Acum %d minute" -msgstr[2] "Acum %d de minute" +msgstr[0] "minut" +msgstr[1] "minute" +msgstr[2] "de minute" #: ../js/ui/status/power.js:125 -#, fuzzy, c-format -#| msgid "%d minute ago" -#| msgid_plural "%d minutes ago" +#, c-format msgid "%d minute remaining" msgid_plural "%d minutes remaining" -msgstr[0] "Acum un minut" -msgstr[1] "Acum %d minute" -msgstr[2] "Acum %d de minute" +msgstr[0] "A mai rămas un minut" +msgstr[1] "Au mai rămas %d minute" +msgstr[2] "Au mai rămas %d de minute" #: ../js/ui/status/power.js:227 msgid "AC adapter" -msgstr "" +msgstr "Adaptor conectat la rețeaua electrică" #: ../js/ui/status/power.js:229 msgid "Laptop battery" -msgstr "" +msgstr "Baterie laptop" #: ../js/ui/status/power.js:231 msgid "UPS" -msgstr "" +msgstr "UPS" #: ../js/ui/status/power.js:233 msgid "Monitor" -msgstr "" +msgstr "Monitor" #: ../js/ui/status/power.js:235 -#, fuzzy -#| msgid "Mouse Keys" msgid "Mouse" -msgstr "Taste maus" +msgstr "Maus" #: ../js/ui/status/power.js:237 -#, fuzzy -#| msgid "Screen Keyboard" msgid "Keyboard" -msgstr "Tastatură pe ecran" +msgstr "Tastatură" #: ../js/ui/status/power.js:239 msgid "PDA" -msgstr "" +msgstr "PDA" #: ../js/ui/status/power.js:241 msgid "Cell phone" -msgstr "" +msgstr "Telefon mobil" #: ../js/ui/status/power.js:243 msgid "Media player" -msgstr "" +msgstr "Media player" #: ../js/ui/status/power.js:245 -#, fuzzy -#| msgid "Enabled" msgid "Tablet" -msgstr "Activat" +msgstr "Tabletă" #: ../js/ui/status/power.js:247 msgid "Computer" -msgstr "" +msgstr "Calculator" #: ../js/ui/status/power.js:249 ../src/shell-app-system.c:1013 msgid "Unknown" msgstr "Necunoscut" -#: ../js/ui/status/volume.js:44 +#: ../js/ui/status/volume.js:45 msgid "Volume" -msgstr "" +msgstr "Volum" -#: ../js/ui/status/volume.js:57 +#: ../js/ui/status/volume.js:58 msgid "Microphone" -msgstr "" +msgstr "Microfon" #: ../js/ui/telepathyClient.js:239 #, c-format msgid "%s is online." -msgstr "" +msgstr "%s este conectat." #: ../js/ui/telepathyClient.js:244 #, c-format msgid "%s is offline." -msgstr "" +msgstr "%s este deconectat." #: ../js/ui/telepathyClient.js:247 -#, fuzzy, c-format -#| msgid "'%s' is ready" +#, c-format msgid "%s is away." -msgstr "„%s” este gata" +msgstr "%s este absent." #: ../js/ui/telepathyClient.js:250 #, c-format msgid "%s is busy." -msgstr "" +msgstr "%s este ocupat." #. Translators: this is a time format string followed by a date. #. If applicable, replace %X with a strftime format valid for your #. locale, without seconds. -#: ../js/ui/telepathyClient.js:348 +#: ../js/ui/telepathyClient.js:357 #, no-c-format msgid "Sent at %X on %A" -msgstr "" +msgstr "Trimis la %X pe data de %A" #. Translators: this is the text displayed #. in the search entry when no search is #. active; it should not exceed ~30 #. characters. -#: ../js/ui/viewSelector.js:117 +#: ../js/ui/viewSelector.js:119 msgid "Type to search..." msgstr "" -#: ../js/ui/viewSelector.js:137 ../src/shell-util.c:250 +#: ../js/ui/viewSelector.js:139 ../src/shell-util.c:250 msgid "Search" msgstr "Caută" @@ -1044,7 +985,7 @@ msgstr "„%s” este gata" #. translators: #. * The number of sound outputs on a particular device -#: ../src/gvc/gvc-mixer-control.c:1094 +#: ../src/gvc/gvc-mixer-control.c:1098 #, c-format msgid "%u Output" msgid_plural "%u Outputs" @@ -1054,7 +995,7 @@ msgstr[2] "%u de ieșiri" #. translators: #. * The number of sound inputs on a particular device -#: ../src/gvc/gvc-mixer-control.c:1104 +#: ../src/gvc/gvc-mixer-control.c:1108 #, c-format msgid "%u Input" msgid_plural "%u Inputs" @@ -1062,7 +1003,7 @@ msgstr[0] "o intrare" msgstr[1] "%u intrări" msgstr[2] "%u de intrări" -#: ../src/gvc/gvc-mixer-control.c:1402 +#: ../src/gvc/gvc-mixer-control.c:1406 msgid "System Sounds" msgstr "Sunetele sistemului" @@ -1130,11 +1071,20 @@ msgstr "Sistem de fișiere" msgid "%1$s: %2$s" msgstr "%1$s: %2$s" +#~ msgid "PREFERENCES" +#~ msgstr "PREFERINȚE" + +#~ msgid "Shut Down..." +#~ msgstr "Oprește..." + +#~ msgid "Search your computer" +#~ msgstr "Căutați în calculator" + #~ msgid "Clock" #~ msgstr "Ceas" #~ msgid "Customize the panel clock" -#~ msgstr "Personalizați ceasul din panou" +#~ msgstr "Personalizarea ceasului de panou" #~ msgid "Custom format of the clock" #~ msgstr "Format personalizat pentru ceas" @@ -1149,16 +1099,6 @@ msgstr "%1$s: %2$s" #~ "Dacă este adevărat, și formatul este fie „12-hour” fie „24-hour”, pe " #~ "lângă oră, în ceas se afișează și secundele." -#~ msgid "Overview workspace view mode" -#~ msgstr "Modul de vizualizare a spațiilor de lucru în prezentarea generală" - -#~ msgid "" -#~ "The selected workspace view mode in the overview. Supported values are " -#~ "\"single\" and \"grid\"." -#~ msgstr "" -#~ "Modul de vizualizare a spațiilor de lucru în prezentarea generală. " -#~ "Valorile suportate sunt „single” și „grid”." - #~ msgid "" #~ "This key specifies the format used by the panel clock when the format key " #~ "is set to \"custom\". You can use conversion specifiers understood by " @@ -1213,11 +1153,11 @@ msgstr "%1$s: %2$s" #~ "Determină poziția imaginii mărite a mausului în vizualizarea mărită și " #~ "cum reacționează la mișcarea mausului a sistemului. Valorile sunt - none: " #~ "nu se urmărește mausul; - centered: imaginea mausului este afișată în " -#~ "centrul regiunii zoom (care reprezintă de asemenea punctul de sub mausul " -#~ "sistemului) și proportional: poziția mausului mărit în regiunea zoom este " -#~ "proporțională la fel ca poziția mausului sistemului de pe ecran; - push: " -#~ "când mausul mărit intersectează o graniță a regiunii zoom, conținutul " -#~ "acesteia este derulat în câmpul vizibil." +#~ "centrul regiunii de scalare (care reprezintă de asemenea punctul de sub " +#~ "mausul sistemului) și proportional: poziția mausului mărit în regiunea de " +#~ "scalare este proporțională la fel ca poziția mausului sistemului de pe " +#~ "ecran; - push: când mausul mărit intersectează o graniță a regiunii de " +#~ "scalare, conținutul acesteia este derulat în câmpul vizibil." #~ msgid "" #~ "Determines the transparency of the crosshairs, from fully opaque to fully " @@ -1278,9 +1218,6 @@ msgstr "%1$s: %2$s" #~ msgid "Show or hide the magnifier" #~ msgstr "Arată sau ascunde lupa" -#~ msgid "Show or hide the magnifier and all of its zoom regions." -#~ msgstr "Arată sau ascunde lupa și toate regiunile ei de zoom." - #~ msgid "" #~ "The color of the the vertical and horizontal lines that make up the " #~ "crosshairs." @@ -1336,18 +1273,12 @@ msgstr "%1$s: %2$s" #~ msgid "_24 hour format" #~ msgstr "Format cu _24 de ore" -#~ msgid "PREFERENCES" -#~ msgstr "PREFERINȚE" - -#~ msgid "Drag here to add favorites" -#~ msgstr "Trageți aici pentru a adăuga favorite" - -#~ msgid "Find" -#~ msgstr "Caută" - #~ msgid "Preferences" #~ msgstr "Preferințe" +#~ msgid "Bluetooth Agent" +#~ msgstr "Agent bluetooth" + #~ msgid "" #~ "Can't add a new workspace because maximum workspaces limit has been " #~ "reached." @@ -1358,6 +1289,22 @@ msgstr "%1$s: %2$s" #~ msgid "Can't remove the first workspace." #~ msgstr "Nu se poate elimina primul spațiu de lucru." +#~ msgid "Overview workspace view mode" +#~ msgstr "Modul de vizualizare a spațiilor de lucru în prezentarea generală" + +#~ msgid "" +#~ "The selected workspace view mode in the overview. Supported values are " +#~ "\"single\" and \"grid\"." +#~ msgstr "" +#~ "Modul de vizualizare a spațiilor de lucru în prezentarea generală. " +#~ "Valorile suportate sunt „single” și „grid”." + +#~ msgid "Drag here to add favorites" +#~ msgstr "Trageți aici pentru a adăuga favorite" + +#~ msgid "Find" +#~ msgstr "Caută" + #~ msgid "ON" #~ msgstr "Pornit" From cfe719c962ac4d38d05ffa0cb4f50ea49fa533c5 Mon Sep 17 00:00:00 2001 From: Lucian Adrian Grijincu Date: Sun, 13 Mar 2011 01:25:15 +0100 Subject: [PATCH 25/44] Updated Romanian translation --- po/ro.po | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/po/ro.po b/po/ro.po index 61a58c8c6..83968d886 100644 --- a/po/ro.po +++ b/po/ro.po @@ -1,5 +1,5 @@ # This file is distributed under the same license as the gnome-shell package. -# Lucian Adrian Grijincu , 2009, 2010. +# Lucian Adrian Grijincu , 2009, 2010, 2011. # Daniel Șerbănescu , 2010, 2011. # laurion , 2010. # Ion Laurențiu Cristian , 2010. @@ -9,13 +9,13 @@ msgstr "" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "shell&keywords=I18N+L10N&component=general\n" "POT-Creation-Date: 2011-03-12 22:48+0000\n" -"PO-Revision-Date: 2011-02-13 00:04+0200\n" -"Last-Translator: Daniel Șerbănescu \n" +"PO-Revision-Date: 2011-03-13 01:25+0200\n" +"Last-Translator: Lucian Adrian Grijincu \n" "Language-Team: Romanian Gnome Team \n" +"Language: ro\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ro\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " "20)) ? 1 : 2);;\n" "X-Generator: Virtaal 0.6.1\n" @@ -62,10 +62,9 @@ msgid "History for command (Alt-F2) dialog" msgstr "Istoricul dialogului de comenzi (Alt-F2)" #: ../data/org.gnome.shell.gschema.xml.in.h:7 -#, fuzzy #| msgid "History for command (Alt-F2) dialog" msgid "History for the looking glass dialog" -msgstr "Istoricul dialogului de comenzi (Alt-F2)" +msgstr "Istoricul dialogului „looking glass”" #: ../data/org.gnome.shell.gschema.xml.in.h:8 msgid "If true, display date in the clock, in addition to time." @@ -84,7 +83,7 @@ msgid "List of desktop file IDs for favorite applications" msgstr "Listă de identificatori de fișiere desktop pentru aplicațiile favorite" #: ../data/org.gnome.shell.gschema.xml.in.h:13 -#, fuzzy, no-c-format +#, no-c-format msgid "" "Sets the GStreamer pipeline used to encode recordings. It follows the syntax " "used for gst-launch. The pipeline should have an unconnected sink pad where " @@ -435,7 +434,6 @@ msgstr "%a %l:%M %p" #. * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM"). #. #: ../js/ui/dateMenu.js:209 -#, fuzzy msgid "%A %B %e, %Y" msgstr "%A %e %B, %Y" @@ -548,7 +546,7 @@ msgstr "Pagină web" #: ../js/ui/messageTray.js:924 msgid "Open" -msgstr "" +msgstr "Deschide" #: ../js/ui/messageTray.js:1961 msgid "System Information" @@ -585,10 +583,9 @@ msgid "Activities" msgstr "Activități" #: ../js/ui/panel.js:1020 -#, fuzzy #| msgid "Cancel" msgid "Panel" -msgstr "Anulează" +msgstr "Panou" #: ../js/ui/placeDisplay.js:122 #, c-format @@ -633,10 +630,9 @@ msgid "Power Off..." msgstr "" #: ../js/ui/statusMenu.js:116 ../js/ui/statusMenu.js:177 -#, fuzzy #| msgid "Suspend..." msgid "Suspend" -msgstr "Suspendă..." +msgstr "Suspendă" #: ../js/ui/statusMenu.js:137 msgid "Available" @@ -825,7 +821,7 @@ msgstr "OK" #: ../js/ui/status/keyboard.js:73 msgid "Show Keyboard Layout..." -msgstr "" +msgstr "Arată aranjamentu tastaturii..." #: ../js/ui/status/keyboard.js:76 msgid "Localization Settings" @@ -839,7 +835,7 @@ msgstr "Configurări de alimentare" #. to estimate battery life #: ../js/ui/status/power.js:110 msgid "Estimating..." -msgstr "" +msgstr "Se estimează..." #: ../js/ui/status/power.js:117 #, c-format @@ -967,7 +963,7 @@ msgstr "Trimis la %X pe data de %A" #. characters. #: ../js/ui/viewSelector.js:119 msgid "Type to search..." -msgstr "" +msgstr "Tastați pentru a căuta ..." #: ../js/ui/viewSelector.js:139 ../src/shell-util.c:250 msgid "Search" @@ -1009,7 +1005,7 @@ msgstr "Sunetele sistemului" #: ../src/main.c:395 msgid "Print version" -msgstr "" +msgstr "Tipărește versiunea" #: ../src/shell-global.c:1308 msgid "Less than a minute ago" @@ -1049,7 +1045,7 @@ msgstr[2] "Acum %d de săptămâni" #: ../src/shell-polkit-authentication-agent.c:334 msgid "Authentication dialog was dismissed by the user" -msgstr "" +msgstr "Dialogul de autentificare a fost respins de utilizator" #: ../src/shell-util.c:89 msgid "Home Folder" From 438317c1e9d878c9c01961bcbdab06ca9b0de32b Mon Sep 17 00:00:00 2001 From: Lucian Adrian Grijincu Date: Sun, 13 Mar 2011 01:31:02 +0100 Subject: [PATCH 26/44] Updated Romanian translation --- po/ro.po | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/po/ro.po b/po/ro.po index 83968d886..89056c9c1 100644 --- a/po/ro.po +++ b/po/ro.po @@ -627,10 +627,9 @@ msgstr "Niciun rezultat care să se potrivească." #: ../js/ui/statusMenu.js:114 ../js/ui/statusMenu.js:178 msgid "Power Off..." -msgstr "" +msgstr "Oprește..." #: ../js/ui/statusMenu.js:116 ../js/ui/statusMenu.js:177 -#| msgid "Suspend..." msgid "Suspend" msgstr "Suspendă" @@ -1070,9 +1069,6 @@ msgstr "%1$s: %2$s" #~ msgid "PREFERENCES" #~ msgstr "PREFERINȚE" -#~ msgid "Shut Down..." -#~ msgstr "Oprește..." - #~ msgid "Search your computer" #~ msgstr "Căutați în calculator" From 7230452e231513ac3033324f80918b40861ae671 Mon Sep 17 00:00:00 2001 From: Lucian Adrian Grijincu Date: Sun, 13 Mar 2011 01:31:36 +0100 Subject: [PATCH 27/44] Updated Romanian translation --- po/ro.po | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/po/ro.po b/po/ro.po index 89056c9c1..da37b0fc3 100644 --- a/po/ro.po +++ b/po/ro.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: gnome-shell master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "shell&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-03-12 22:48+0000\n" +"POT-Creation-Date: 2011-03-13 00:31+0000\n" "PO-Revision-Date: 2011-03-13 01:25+0200\n" "Last-Translator: Lucian Adrian Grijincu \n" "Language-Team: Romanian Gnome Team \n" -"Language: ro\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: ro\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " "20)) ? 1 : 2);;\n" "X-Generator: Virtaal 0.6.1\n" @@ -33,8 +33,8 @@ msgid "" "Allows access to internal debugging and monitoring tools using the Alt-F2 " "dialog." msgstr "" -"Permite accesul la uneltele interne de depanare și monitorizare folosind dialogul " -"Alt-F2." +"Permite accesul la uneltele interne de depanare și monitorizare folosind " +"dialogul Alt-F2." #: ../data/org.gnome.shell.gschema.xml.in.h:2 msgid "Enable internal tools useful for developers and testers from Alt-F2" @@ -62,7 +62,6 @@ msgid "History for command (Alt-F2) dialog" msgstr "Istoricul dialogului de comenzi (Alt-F2)" #: ../data/org.gnome.shell.gschema.xml.in.h:7 -#| msgid "History for command (Alt-F2) dialog" msgid "History for the looking glass dialog" msgstr "Istoricul dialogului „looking glass”" @@ -477,7 +476,8 @@ msgstr "Oprește" #: ../js/ui/endSessionDialog.js:75 msgid "Click Shut Down to quit these applications and shut down the system." -msgstr "Apăsați „Oprește” pentru a închide aceste aplicații și a opri sistemul." +msgstr "" +"Apăsați „Oprește” pentru a închide aceste aplicații și a opri sistemul." #: ../js/ui/endSessionDialog.js:76 #, c-format @@ -583,7 +583,6 @@ msgid "Activities" msgstr "Activități" #: ../js/ui/panel.js:1020 -#| msgid "Cancel" msgid "Panel" msgstr "Panou" From 057348763b674c075f803122856c58ff338f67ff Mon Sep 17 00:00:00 2001 From: Giovanni Campagna Date: Sat, 12 Mar 2011 23:27:57 +0100 Subject: [PATCH 28/44] StTextureCache: generate icon names in the right order GThemedIcon expects the first name to be the most specific, and will thus prefer it to later ones. We thus need to order the names from the longer to the shorter. https://bugzilla.gnome.org/show_bug.cgi?id=621707 --- src/st/st-texture-cache.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/st/st-texture-cache.c b/src/st/st-texture-cache.c index 405cc177a..198ddf273 100644 --- a/src/st/st-texture-cache.c +++ b/src/st/st-texture-cache.c @@ -1398,10 +1398,11 @@ static char ** symbolic_names_for_icon (const char *name) { char **parts, **names; - int i; + int i, numnames; parts = g_strsplit (name, "-", -1); - names = g_new (char *, g_strv_length (parts) + 1); + numnames = g_strv_length (parts); + names = g_new (char *, numnames + 1); for (i = 0; parts[i]; i++) { if (i == 0) @@ -1418,6 +1419,15 @@ symbolic_names_for_icon (const char *name) names[i] = NULL; g_strfreev (parts); + + /* need to reverse here, because longest (most specific) + name has to come first */ + for (i = 0; i < (numnames / 2); i++) { + char *tmp = names[i]; + names[i] = names[numnames - i - 1]; + names[numnames - i - 1] = tmp; + } + return names; } From 43cf60f5636e7883bd5012e4c89ed5d57e28200c Mon Sep 17 00:00:00 2001 From: Adel Gadllah Date: Sun, 13 Mar 2011 12:52:30 +0100 Subject: [PATCH 29/44] StScrollViewFade: Fix GLSL shader to work on r300 hardware The number instructions in a shader is limited to 64 on r300 hardware, the fade shader in StScrollViewFade was ending up using 97 instructions which is way over the limit. So refactor the shader to use less instructions by precomputing as many values as possible outside of the conditionals. The resulting shader ends up using 34 instructions which is well within the hardware limits. https://bugzilla.gnome.org/show_bug.cgi?id=644589 --- src/st/st-scroll-view-fade.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/st/st-scroll-view-fade.c b/src/st/st-scroll-view-fade.c index 3d6639ae9..74e430de2 100644 --- a/src/st/st-scroll-view-fade.c +++ b/src/st/st-scroll-view-fade.c @@ -49,21 +49,23 @@ static const gchar *fade_glsl_shader = " vec4 color = cogl_color_in * texture2D (tex, vec2 (cogl_tex_coord_in[0].xy));\n" " float y = height * cogl_tex_coord_in[0].y;\n" " float x = width * cogl_tex_coord_in[0].x;\n" -" float ratio = 0.0;\n" +" float ratio = 1.0;\n" " float fade_bottom_start = height - offset_bottom;\n" -" \n" -" if (offset_top != 0.0 && y < offset_top && ((rtl && x > scrollbar_width) || (!rtl && x < (width - scrollbar_width)))) {\n" -" ratio = y / offset_top;\n" +" float ratio_top = y / offset_top;\n" +" float ratio_bottom = (height - y)/(height - fade_bottom_start);\n" +" bool in_scroll_area = ((rtl && x > scrollbar_width) || (!rtl && x < (width - scrollbar_width)));\n" +" bool fade_top = y < offset_top && in_scroll_area;\n" +" bool fade_bottom = y > fade_bottom_start && in_scroll_area;\n" +"\n" +" if (fade_top) {\n" +" ratio = ratio_top;\n" +" }\n" +" else if (fade_bottom) {\n" +" ratio = ratio_bottom;\n" +" }\n" +"\n" " cogl_color_out = color * ratio;\n" -" }\n" -" else if (offset_bottom != 0.0 && y > fade_bottom_start && ((rtl && x > scrollbar_width) || (!rtl && x < (width - scrollbar_width)))) {\n" -" ratio = (height - y)/(height - fade_bottom_start);\n" -" cogl_color_out = color * ratio;\n" -" }\n" -" else { \n" -" cogl_color_out = color;\n" -" }\n" -"}\n"; +"}"; struct _StScrollViewFade { From 25015c9c3a8f3b7450cd3de0fa6e9781adc5acbc Mon Sep 17 00:00:00 2001 From: Giovanni Campagna Date: Wed, 2 Mar 2011 17:27:24 +0100 Subject: [PATCH 30/44] BluetoothStatus: don't pass NaNs to native functions GJS complains when a NaN is passed in place of an integer, and parseInt returns that from non numeric string. Pass a sentinel that cancels the operation in that case. https://bugzilla.gnome.org/show_bug.cgi?id=642978 --- js/ui/status/bluetooth.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/js/ui/status/bluetooth.js b/js/ui/status/bluetooth.js index 2926f9739..78859075c 100644 --- a/js/ui/status/bluetooth.js +++ b/js/ui/status/bluetooth.js @@ -471,9 +471,15 @@ PinNotification.prototype = { this.connect('action-invoked', Lang.bind(this, function(self, action) { if (action == 'ok') { - if (this._numeric) - this._applet.agent_reply_passkey(this._devicePath, parseInt(this._entry.text)); - else + if (this._numeric) { + let num = parseInt(this._entry.text); + if (isNaN(num)) { + // user reply was empty, or was invalid + // cancel the operation + num = -1; + } + this._applet.agent_reply_passkey(this._devicePath, num); + } else this._applet.agent_reply_pincode(this._devicePath, this._entry.text); } else { if (this._numeric) From 034e147910a01dffd70e3905c0bee827b2e0ce9f Mon Sep 17 00:00:00 2001 From: Simos Xenitellis Date: Sun, 13 Mar 2011 19:14:00 +0200 Subject: [PATCH 31/44] l10n: Updated Greek translation --- po/el.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/el.po b/po/el.po index a5c82c33a..d1ca74a78 100644 --- a/po/el.po +++ b/po/el.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: gnome-shell.po.master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-08 14:59+0200\n" +"POT-Creation-Date: 2011-03-13 19:13+0200\n" "PO-Revision-Date: 2011-01-23 00:04+0200\n" "Last-Translator: Kostas Papadimas \n" "Language-Team: Greek \n" @@ -622,7 +622,7 @@ msgstr "ΤΟΠΟΘΕΣΙΕΣ $ ΣΥΣΚΕΥΕΣ" #. simply result in invisible toggle switches. #: ../js/ui/popupMenu.js:618 msgid "toggle-switch-us" -msgstr "toggle-switch-us" +msgstr "toggle-switch-intl" #: ../js/ui/runDialog.js:201 msgid "Please enter a command:" From c2d400846b4e678f2f926a313280f840072b1f57 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sun, 13 Mar 2011 14:11:33 -0400 Subject: [PATCH 32/44] test-theme: Pacify -Werror for clutter_init --- src/st/test-theme.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/st/test-theme.c b/src/st/test-theme.c index 43e14452d..aeb8adef3 100644 --- a/src/st/test-theme.c +++ b/src/st/test-theme.c @@ -426,7 +426,8 @@ main (int argc, char **argv) StTheme *theme; StThemeContext *context; - clutter_init (&argc, &argv); + if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS) + g_error ("failed to initialize clutter"); theme = st_theme_new ("st/test-theme.css", NULL, NULL); From bdebaa986b5eea44dcf20fb53a1e109ed7120a78 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sun, 13 Mar 2011 14:16:54 -0400 Subject: [PATCH 33/44] Silence -Werror for other clutter_init callers --- src/run-js-test.c | 3 ++- src/test-recorder.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/run-js-test.c b/src/run-js-test.c index 5be4eaddd..7ffa62c9d 100644 --- a/src/run-js-test.c +++ b/src/run-js-test.c @@ -77,7 +77,8 @@ main(int argc, char **argv) clutter_x11_set_display (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ())); clutter_x11_disable_event_retrieval (); - clutter_init (&argc, &argv); + if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS) + g_error ("failed to initialize Clutter"); gdk_window_add_filter (NULL, event_filter, NULL); diff --git a/src/test-recorder.c b/src/test-recorder.c index 9b3f7b5fd..2a684e15a 100644 --- a/src/test-recorder.c +++ b/src/test-recorder.c @@ -31,7 +31,8 @@ int main (int argc, char **argv) g_thread_init (NULL); gst_init (&argc, &argv); - clutter_init (&argc, &argv); + if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS) + g_error ("failed to initialize Clutter"); clutter_color_from_string (&red, "red"); clutter_color_from_string (&green, "green"); From d3703516d979ce98c95ae66979f4ded8606eb8f1 Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Sun, 13 Mar 2011 14:26:01 -0400 Subject: [PATCH 34/44] Fix handling of clutter_init() failures clutter_init() fails under normal circumstances like being unable to open a display connection, so it shouldn't be handled with g_error() producing a core dump. Clutter consistently produces an error message when clutter_init() fails, so we don't need to print out any error message. https://bugzilla.gnome.org/show_bug.cgi?id=643910 --- src/run-js-test.c | 2 +- src/st/test-theme.c | 2 +- src/test-recorder.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/run-js-test.c b/src/run-js-test.c index 7ffa62c9d..27cd40015 100644 --- a/src/run-js-test.c +++ b/src/run-js-test.c @@ -78,7 +78,7 @@ main(int argc, char **argv) clutter_x11_disable_event_retrieval (); if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS) - g_error ("failed to initialize Clutter"); + return 1; gdk_window_add_filter (NULL, event_filter, NULL); diff --git a/src/st/test-theme.c b/src/st/test-theme.c index aeb8adef3..db7f747ce 100644 --- a/src/st/test-theme.c +++ b/src/st/test-theme.c @@ -427,7 +427,7 @@ main (int argc, char **argv) StThemeContext *context; if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS) - g_error ("failed to initialize clutter"); + return 1; theme = st_theme_new ("st/test-theme.css", NULL, NULL); diff --git a/src/test-recorder.c b/src/test-recorder.c index 2a684e15a..655c887db 100644 --- a/src/test-recorder.c +++ b/src/test-recorder.c @@ -32,7 +32,7 @@ int main (int argc, char **argv) g_thread_init (NULL); gst_init (&argc, &argv); if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS) - g_error ("failed to initialize Clutter"); + return 1; clutter_color_from_string (&red, "red"); clutter_color_from_string (&green, "green"); From 3466829766d465336e352fe5020bb88573650fbb Mon Sep 17 00:00:00 2001 From: Adel Gadllah Date: Sat, 12 Mar 2011 23:49:03 +0100 Subject: [PATCH 35/44] popupMenu: Restyle the slider to use a color for the 'active' area In the mockups the slider does not have an uniform color but uses one color (shade of blue) to indicate the current value and one to indicate "the rest" (shade of grey). So adjust the slider to look like that to be closer to the look in the mockups and thus to the design. https://bugzilla.gnome.org/show_bug.cgi?id=644600 --- data/theme/gnome-shell.css | 2 ++ js/ui/popupMenu.js | 20 +++++++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css index 4fd303a95..289b59cbd 100644 --- a/data/theme/gnome-shell.css +++ b/data/theme/gnome-shell.css @@ -150,6 +150,8 @@ StTooltip StLabel { -slider-height: 0.3em; -slider-background-color: #333333; -slider-border-color: #5f5f5f; + -slider-active-background-color: #76b0ec; + -slider-active-border-color: #1f6dbc; -slider-border-width: 1px; -slider-handle-radius: 0.5em; } diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js index e16220c89..d6eaf8e93 100644 --- a/js/ui/popupMenu.js +++ b/js/ui/popupMenu.js @@ -485,12 +485,30 @@ PopupSliderMenuItem.prototype = { let sliderBorderColor = themeNode.get_color('-slider-border-color'); let sliderColor = themeNode.get_color('-slider-background-color'); + let sliderActiveBorderColor = themeNode.get_color('-slider-active-border-color'); + let sliderActiveColor = themeNode.get_color('-slider-active-background-color'); + + cr.setSourceRGBA ( + sliderActiveColor.red / 255, + sliderActiveColor.green / 255, + sliderActiveColor.blue / 255, + sliderActiveColor.alpha / 255); + cr.rectangle(handleRadius, (height - sliderHeight) / 2, sliderWidth * this._value, sliderHeight); + cr.fillPreserve(); + cr.setSourceRGBA ( + sliderActiveBorderColor.red / 255, + sliderActiveBorderColor.green / 255, + sliderActiveBorderColor.blue / 255, + sliderActiveBorderColor.alpha / 255); + cr.setLineWidth(sliderBorderWidth); + cr.stroke(); + cr.setSourceRGBA ( sliderColor.red / 255, sliderColor.green / 255, sliderColor.blue / 255, sliderColor.alpha / 255); - cr.rectangle(handleRadius, (height - sliderHeight) / 2, sliderWidth, sliderHeight); + cr.rectangle(handleRadius + sliderWidth * this._value, (height - sliderHeight) / 2, sliderWidth * (1 - this._value), sliderHeight); cr.fillPreserve(); cr.setSourceRGBA ( sliderBorderColor.red / 255, From 44d61e68575518d7f57d6c89c93f5b0f29bec5dd Mon Sep 17 00:00:00 2001 From: Giovanni Campagna Date: Sun, 13 Mar 2011 14:29:13 +0100 Subject: [PATCH 36/44] Remove use of G_CONST_RETURN macro. This is going to be deprecated. https://bugzilla.gnome.org/show_bug.cgi?id=644632 --- src/st/st-entry.c | 5 ++--- src/st/st-entry.h | 4 ++-- src/st/st-label.c | 2 +- src/st/st-label.h | 10 +++++----- src/st/st-tooltip.c | 4 ++-- src/st/st-tooltip.h | 12 ++++++------ src/st/st-widget.h | 6 +++--- 7 files changed, 21 insertions(+), 22 deletions(-) diff --git a/src/st/st-entry.c b/src/st/st-entry.c index ef25ab3a4..d70475d9d 100644 --- a/src/st/st-entry.c +++ b/src/st/st-entry.c @@ -735,7 +735,7 @@ st_entry_new (const gchar *text) * * Returns: the text for the entry. This must not be freed by the application */ -G_CONST_RETURN gchar * +const gchar * st_entry_get_text (StEntry *entry) { g_return_val_if_fail (ST_IS_ENTRY (entry), NULL); @@ -843,8 +843,7 @@ st_entry_set_hint_text (StEntry *entry, * Returns: the current value of the hint property. This string is owned by the * #StEntry and should not be freed or modified. */ -G_CONST_RETURN -gchar * +const gchar * st_entry_get_hint_text (StEntry *entry) { g_return_val_if_fail (ST_IS_ENTRY (entry), NULL); diff --git a/src/st/st-entry.h b/src/st/st-entry.h index 947705437..7febbb5ec 100644 --- a/src/st/st-entry.h +++ b/src/st/st-entry.h @@ -65,14 +65,14 @@ struct _StEntryClass GType st_entry_get_type (void) G_GNUC_CONST; StWidget * st_entry_new (const gchar *text); -G_CONST_RETURN gchar *st_entry_get_text (StEntry *entry); +const gchar * st_entry_get_text (StEntry *entry); void st_entry_set_text (StEntry *entry, const gchar *text); ClutterActor* st_entry_get_clutter_text (StEntry *entry); void st_entry_set_hint_text (StEntry *entry, const gchar *text); -G_CONST_RETURN gchar *st_entry_get_hint_text (StEntry *entry); +const gchar * st_entry_get_hint_text (StEntry *entry); void st_entry_set_primary_icon (StEntry *entry, ClutterActor *icon); diff --git a/src/st/st-label.c b/src/st/st-label.c index 124928e80..53fd844b3 100644 --- a/src/st/st-label.c +++ b/src/st/st-label.c @@ -355,7 +355,7 @@ st_label_new (const gchar *text) * * Returns: the text for the label. This must not be freed by the application */ -G_CONST_RETURN gchar * +const gchar * st_label_get_text (StLabel *label) { g_return_val_if_fail (ST_IS_LABEL (label), NULL); diff --git a/src/st/st-label.h b/src/st/st-label.h index abe32d9d8..65164ce29 100644 --- a/src/st/st-label.h +++ b/src/st/st-label.h @@ -60,11 +60,11 @@ struct _StLabelClass GType st_label_get_type (void) G_GNUC_CONST; -StWidget * st_label_new (const gchar *text); -G_CONST_RETURN gchar *st_label_get_text (StLabel *label); -void st_label_set_text (StLabel *label, - const gchar *text); -ClutterActor * st_label_get_clutter_text (StLabel *label); +StWidget * st_label_new (const gchar *text); +const gchar * st_label_get_text (StLabel *label); +void st_label_set_text (StLabel *label, + const gchar *text); +ClutterActor * st_label_get_clutter_text (StLabel *label); G_END_DECLS diff --git a/src/st/st-tooltip.c b/src/st/st-tooltip.c index c452e18c7..09e7aa765 100644 --- a/src/st/st-tooltip.c +++ b/src/st/st-tooltip.c @@ -377,7 +377,7 @@ st_tooltip_update_position (StTooltip *tooltip) * * Returns: the text for the tooltip. This must not be freed by the application */ -G_CONST_RETURN gchar * +const gchar * st_tooltip_get_label (StTooltip *tooltip) { g_return_val_if_fail (ST_IS_TOOLTIP (tooltip), NULL); @@ -489,7 +489,7 @@ st_tooltip_set_tip_area (StTooltip *tooltip, * Returns: the #ClutterGeometry, owned by the tooltip which must not be freed * by the application. */ -G_CONST_RETURN ClutterGeometry* +const ClutterGeometry* st_tooltip_get_tip_area (StTooltip *tooltip) { g_return_val_if_fail (ST_IS_TOOLTIP (tooltip), NULL); diff --git a/src/st/st-tooltip.h b/src/st/st-tooltip.h index 123f6c16d..5f6f02a6e 100644 --- a/src/st/st-tooltip.h +++ b/src/st/st-tooltip.h @@ -60,13 +60,13 @@ struct _StTooltipClass GType st_tooltip_get_type (void) G_GNUC_CONST; -G_CONST_RETURN gchar *st_tooltip_get_label (StTooltip *tooltip); -void st_tooltip_set_label (StTooltip *tooltip, - const gchar *text); +const gchar * st_tooltip_get_label (StTooltip *tooltip); +void st_tooltip_set_label (StTooltip *tooltip, + const gchar *text); -void st_tooltip_set_tip_area (StTooltip *tooltip, - const ClutterGeometry *area); -G_CONST_RETURN ClutterGeometry* st_tooltip_get_tip_area (StTooltip *tooltip); +void st_tooltip_set_tip_area (StTooltip *tooltip, + const ClutterGeometry *area); +const ClutterGeometry* st_tooltip_get_tip_area (StTooltip *tooltip); G_END_DECLS diff --git a/src/st/st-widget.h b/src/st/st-widget.h index 81c9928e1..7f5efec7a 100644 --- a/src/st/st-widget.h +++ b/src/st/st-widget.h @@ -96,7 +96,7 @@ void st_widget_add_style_pseudo_class (StWidget *acto const gchar *pseudo_class); void st_widget_remove_style_pseudo_class (StWidget *actor, const gchar *pseudo_class); -G_CONST_RETURN gchar *st_widget_get_style_pseudo_class (StWidget *actor); +const gchar * st_widget_get_style_pseudo_class (StWidget *actor); gboolean st_widget_has_style_pseudo_class (StWidget *actor, const gchar *pseudo_class); @@ -106,13 +106,13 @@ void st_widget_add_style_class_name (StWidget *acto const gchar *style_class); void st_widget_remove_style_class_name (StWidget *actor, const gchar *style_class); -G_CONST_RETURN gchar *st_widget_get_style_class_name (StWidget *actor); +const gchar * st_widget_get_style_class_name (StWidget *actor); gboolean st_widget_has_style_class_name (StWidget *actor, const gchar *style_class); void st_widget_set_style (StWidget *actor, const gchar *style); -G_CONST_RETURN gchar *st_widget_get_style (StWidget *actor); +const gchar * st_widget_get_style (StWidget *actor); void st_widget_set_theme (StWidget *actor, StTheme *theme); StTheme * st_widget_get_theme (StWidget *actor); From 30d2cfdf56815d79f37bbc2669f33ca7e8187a16 Mon Sep 17 00:00:00 2001 From: Changwoo Ryu Date: Mon, 14 Mar 2011 10:40:23 +0900 Subject: [PATCH 37/44] Updated Korean translation --- po/ko.po | 251 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 140 insertions(+), 111 deletions(-) diff --git a/po/ko.po b/po/ko.po index 41ed49863..7fbddfdd1 100644 --- a/po/ko.po +++ b/po/ko.po @@ -5,15 +5,16 @@ msgid "" msgstr "" "Project-Id-Version: gnome-shell\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&component=general\n" -"POT-Creation-Date: 2011-02-27 06:38+0900\n" -"PO-Revision-Date: 2011-02-27 06:40+0900\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" +"shell&component=general\n" +"POT-Creation-Date: 2011-03-08 05:43+0000\n" +"PO-Revision-Date: 2011-03-14 10:40+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: GNOME Korea \n" -"Language: Korean\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: Korean\n" "Plural-Forms: nplurals=1; plural=0;\n" #: ../data/gnome-shell.desktop.in.in.h:1 @@ -180,27 +181,27 @@ msgid "Execution of '%s' failed:" msgstr "'%s' 실행이 실패했습니다:" #. Translators: Filter to display all applications -#: ../js/ui/appDisplay.js:175 +#: ../js/ui/appDisplay.js:226 msgid "All" msgstr "모두" -#: ../js/ui/appDisplay.js:262 +#: ../js/ui/appDisplay.js:324 msgid "APPLICATIONS" msgstr "프로그램" -#: ../js/ui/appDisplay.js:292 -msgid "PREFERENCES" -msgstr "기본 설정" +#: ../js/ui/appDisplay.js:350 +msgid "SETTINGS" +msgstr "설정" -#: ../js/ui/appDisplay.js:552 +#: ../js/ui/appDisplay.js:612 msgid "New Window" msgstr "새 창" -#: ../js/ui/appDisplay.js:555 +#: ../js/ui/appDisplay.js:615 msgid "Remove from Favorites" msgstr "즐겨찾기에서 제거" -#: ../js/ui/appDisplay.js:556 +#: ../js/ui/appDisplay.js:616 msgid "Add to Favorites" msgstr "즐겨찾기에 추가" @@ -217,19 +218,19 @@ msgstr "%s 프로그램을 즐겨찾기에서 제거했습니다." #. Translators: Shown in calendar event list for all day events #. * Keep it short, best if you can use less then 10 characters #. -#: ../js/ui/calendar.js:65 +#: ../js/ui/calendar.js:66 msgctxt "event list time" msgid "All Day" msgstr "종일" #. Translators: Shown in calendar event list, if 24h format -#: ../js/ui/calendar.js:70 +#: ../js/ui/calendar.js:71 msgctxt "event list time" msgid "%H:%M" msgstr "%H:%M" #. Transators: Shown in calendar event list, if 12h format -#: ../js/ui/calendar.js:77 +#: ../js/ui/calendar.js:78 msgctxt "event list time" msgid "%l:%M %p" msgstr "%p %l:%M" @@ -239,43 +240,43 @@ msgstr "%p %l:%M" #. * NOTE: These grid abbreviations are always shown together #. * and in order, e.g. "S M T W T F S". #. -#: ../js/ui/calendar.js:117 +#: ../js/ui/calendar.js:118 msgctxt "grid sunday" msgid "S" msgstr "일" #. Translators: Calendar grid abbreviation for Monday -#: ../js/ui/calendar.js:119 +#: ../js/ui/calendar.js:120 msgctxt "grid monday" msgid "M" msgstr "월" #. Translators: Calendar grid abbreviation for Tuesday -#: ../js/ui/calendar.js:121 +#: ../js/ui/calendar.js:122 msgctxt "grid tuesday" msgid "T" msgstr "화" #. Translators: Calendar grid abbreviation for Wednesday -#: ../js/ui/calendar.js:123 +#: ../js/ui/calendar.js:124 msgctxt "grid wednesday" msgid "W" msgstr "수" #. Translators: Calendar grid abbreviation for Thursday -#: ../js/ui/calendar.js:125 +#: ../js/ui/calendar.js:126 msgctxt "grid thursday" msgid "T" msgstr "목" #. Translators: Calendar grid abbreviation for Friday -#: ../js/ui/calendar.js:127 +#: ../js/ui/calendar.js:128 msgctxt "grid friday" msgid "F" msgstr "금" #. Translators: Calendar grid abbreviation for Saturday -#: ../js/ui/calendar.js:129 +#: ../js/ui/calendar.js:130 msgctxt "grid saturday" msgid "S" msgstr "토" @@ -286,136 +287,136 @@ msgstr "토" #. * so they need to be unique (e.g. Tuesday and Thursday cannot #. * both be 'T'). #. -#: ../js/ui/calendar.js:142 +#: ../js/ui/calendar.js:143 msgctxt "list sunday" msgid "Su" msgstr "일" #. Translators: Event list abbreviation for Monday -#: ../js/ui/calendar.js:144 +#: ../js/ui/calendar.js:145 msgctxt "list monday" msgid "M" msgstr "월" #. Translators: Event list abbreviation for Tuesday -#: ../js/ui/calendar.js:146 +#: ../js/ui/calendar.js:147 msgctxt "list tuesday" msgid "T" msgstr "화" #. Translators: Event list abbreviation for Wednesday -#: ../js/ui/calendar.js:148 +#: ../js/ui/calendar.js:149 msgctxt "list wednesday" msgid "W" msgstr "수" #. Translators: Event list abbreviation for Thursday -#: ../js/ui/calendar.js:150 +#: ../js/ui/calendar.js:151 msgctxt "list thursday" msgid "Th" msgstr "목" #. Translators: Event list abbreviation for Friday -#: ../js/ui/calendar.js:152 +#: ../js/ui/calendar.js:153 msgctxt "list friday" msgid "F" msgstr "금" #. Translators: Event list abbreviation for Saturday -#: ../js/ui/calendar.js:154 +#: ../js/ui/calendar.js:155 msgctxt "list saturday" msgid "S" msgstr "토" #. Translators: Text to show if there are no events -#: ../js/ui/calendar.js:701 +#: ../js/ui/calendar.js:704 msgid "Nothing Scheduled" msgstr "일정이 없습니다" #. Translators: Shown on calendar heading when selected day occurs on current year -#: ../js/ui/calendar.js:717 +#: ../js/ui/calendar.js:720 msgctxt "calendar heading" msgid "%A, %B %d" msgstr "%B %d일 %A" #. Translators: Shown on calendar heading when selected day occurs on different year -#: ../js/ui/calendar.js:720 +#: ../js/ui/calendar.js:723 msgctxt "calendar heading" msgid "%A, %B %d, %Y" msgstr "%Y년 %B %d일 %A" -#: ../js/ui/calendar.js:730 +#: ../js/ui/calendar.js:733 msgid "Today" msgstr "오늘" -#: ../js/ui/calendar.js:734 +#: ../js/ui/calendar.js:737 msgid "Tomorrow" msgstr "내일" -#: ../js/ui/calendar.js:743 +#: ../js/ui/calendar.js:746 msgid "This week" msgstr "이번주" -#: ../js/ui/calendar.js:751 +#: ../js/ui/calendar.js:754 msgid "Next week" msgstr "다음주" -#: ../js/ui/dash.js:174 +#: ../js/ui/dash.js:174 ../js/ui/messageTray.js:933 msgid "Remove" msgstr "제거" -#: ../js/ui/dateMenu.js:93 +#: ../js/ui/dateMenu.js:91 msgid "Date and Time Settings" msgstr "날짜 및 시각 설정" -#: ../js/ui/dateMenu.js:112 +#: ../js/ui/dateMenu.js:111 msgid "Open Calendar" msgstr "달력 열기" #. Translators: This is the time format with date used #. in 24-hour mode. -#: ../js/ui/dateMenu.js:151 +#: ../js/ui/dateMenu.js:164 msgid "%a %b %e, %R:%S" msgstr "%b %e일 (%a), %R:%S" -#: ../js/ui/dateMenu.js:152 +#: ../js/ui/dateMenu.js:165 msgid "%a %b %e, %R" msgstr "%b %e일 (%a), %R" #. Translators: This is the time format without date used #. in 24-hour mode. -#: ../js/ui/dateMenu.js:156 +#: ../js/ui/dateMenu.js:169 msgid "%a %R:%S" msgstr "(%a) %R:%S" -#: ../js/ui/dateMenu.js:157 +#: ../js/ui/dateMenu.js:170 msgid "%a %R" msgstr "(%a) %R" #. Translators: This is a time format with date used #. for AM/PM. -#: ../js/ui/dateMenu.js:164 +#: ../js/ui/dateMenu.js:177 msgid "%a %b %e, %l:%M:%S %p" msgstr "%b %e일 (%a), %p %l:%M:%S" -#: ../js/ui/dateMenu.js:165 +#: ../js/ui/dateMenu.js:178 msgid "%a %b %e, %l:%M %p" msgstr "%b %e일 (%a), %p %l:%M" #. Translators: This is a time format without date used #. for AM/PM. -#: ../js/ui/dateMenu.js:169 +#: ../js/ui/dateMenu.js:182 msgid "%a %l:%M:%S %p" msgstr "(%a) %p %l:%M:%S" -#: ../js/ui/dateMenu.js:170 +#: ../js/ui/dateMenu.js:183 msgid "%a %l:%M %p" msgstr "(%a) %p %l:%M" #. Translators: This is the date format to use when the calendar popup is #. * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM"). #. -#: ../js/ui/dateMenu.js:196 +#: ../js/ui/dateMenu.js:209 msgid "%A %B %e, %Y" msgstr "%Y년 %B %e일 %A" @@ -492,37 +493,41 @@ msgstr "확인" msgid "Cancel" msgstr "취소" -#: ../js/ui/lookingGlass.js:587 +#: ../js/ui/lookingGlass.js:588 msgid "No extensions installed" msgstr "확장 기능을 설치하지 않았습니다" -#: ../js/ui/lookingGlass.js:624 +#: ../js/ui/lookingGlass.js:625 msgid "Enabled" msgstr "사용" #. translators: #. * The device has been disabled -#: ../js/ui/lookingGlass.js:626 ../src/gvc/gvc-mixer-control.c:1087 +#: ../js/ui/lookingGlass.js:627 ../src/gvc/gvc-mixer-control.c:1087 msgid "Disabled" msgstr "사용 않음" -#: ../js/ui/lookingGlass.js:628 +#: ../js/ui/lookingGlass.js:629 msgid "Error" msgstr "오류" -#: ../js/ui/lookingGlass.js:630 +#: ../js/ui/lookingGlass.js:631 msgid "Out of date" msgstr "오래 된 버전" -#: ../js/ui/lookingGlass.js:655 +#: ../js/ui/lookingGlass.js:656 msgid "View Source" msgstr "소스 보기" -#: ../js/ui/lookingGlass.js:661 +#: ../js/ui/lookingGlass.js:662 msgid "Web Page" msgstr "웹페이지" -#: ../js/ui/messageTray.js:1902 +#: ../js/ui/messageTray.js:926 +msgid "Open" +msgstr "열기" + +#: ../js/ui/messageTray.js:1963 msgid "System Information" msgstr "시스템 정보" @@ -538,17 +543,27 @@ msgstr "창" msgid "Applications" msgstr "프로그램" +#. Translators: this is the name of the dock/favorites area on +#. the left of the overview +#: ../js/ui/overview.js:202 +msgid "Dash" +msgstr "대시보드" + #. TODO - _quit() doesn't really work on apps in state STARTING yet -#: ../js/ui/panel.js:537 +#: ../js/ui/panel.js:532 #, c-format msgid "Quit %s" msgstr "%s 끝내기" #. Button on the left side of the panel. #. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview". -#: ../js/ui/panel.js:905 +#: ../js/ui/panel.js:893 msgid "Activities" -msgstr "요약" +msgstr "현재 활동" + +#: ../js/ui/panel.js:994 +msgid "Panel" +msgstr "패널" #: ../js/ui/placeDisplay.js:122 #, c-format @@ -572,7 +587,7 @@ msgstr "위치 및 장치" #. "ON" and "OFF") or "toggle-switch-intl" (for toggle #. switches containing "◯" and "|"). Other values will #. simply result in invisible toggle switches. -#: ../js/ui/popupMenu.js:612 +#: ../js/ui/popupMenu.js:618 msgid "toggle-switch-us" msgstr "toggle-switch-intl" @@ -580,91 +595,91 @@ msgstr "toggle-switch-intl" msgid "Please enter a command:" msgstr "명령을 입력하십시오:" -#: ../js/ui/searchDisplay.js:295 +#: ../js/ui/searchDisplay.js:283 msgid "Searching..." msgstr "검색하는 중..." -#: ../js/ui/searchDisplay.js:309 +#: ../js/ui/searchDisplay.js:297 msgid "No matching results." msgstr "일치하는 결과가 없습니다." -#: ../js/ui/statusMenu.js:99 ../js/ui/statusMenu.js:163 +#: ../js/ui/statusMenu.js:102 ../js/ui/statusMenu.js:166 msgid "Power Off..." msgstr "컴퓨터 끄기..." -#: ../js/ui/statusMenu.js:101 ../js/ui/statusMenu.js:162 +#: ../js/ui/statusMenu.js:104 ../js/ui/statusMenu.js:165 msgid "Suspend" msgstr "절전" -#: ../js/ui/statusMenu.js:122 +#: ../js/ui/statusMenu.js:125 msgid "Available" msgstr "대화 가능" -#: ../js/ui/statusMenu.js:127 +#: ../js/ui/statusMenu.js:130 msgid "Busy" msgstr "다른 용무 중" -#: ../js/ui/statusMenu.js:135 +#: ../js/ui/statusMenu.js:138 msgid "My Account" msgstr "내 계정" -#: ../js/ui/statusMenu.js:139 +#: ../js/ui/statusMenu.js:142 msgid "System Settings" msgstr "시스템 설정" -#: ../js/ui/statusMenu.js:146 +#: ../js/ui/statusMenu.js:149 msgid "Lock Screen" msgstr "화면 잠그기" -#: ../js/ui/statusMenu.js:150 +#: ../js/ui/statusMenu.js:153 msgid "Switch User" msgstr "사용자 바꾸기" -#: ../js/ui/statusMenu.js:155 +#: ../js/ui/statusMenu.js:158 msgid "Log Out..." msgstr "로그아웃..." -#: ../js/ui/status/accessibility.js:81 +#: ../js/ui/status/accessibility.js:62 msgid "Zoom" msgstr "크기 조정" -#: ../js/ui/status/accessibility.js:88 +#: ../js/ui/status/accessibility.js:69 msgid "Screen Reader" msgstr "화면 읽기" -#: ../js/ui/status/accessibility.js:92 +#: ../js/ui/status/accessibility.js:73 msgid "Screen Keyboard" msgstr "화면 키보드" -#: ../js/ui/status/accessibility.js:96 +#: ../js/ui/status/accessibility.js:77 msgid "Visual Alerts" msgstr "화면 알림" -#: ../js/ui/status/accessibility.js:99 +#: ../js/ui/status/accessibility.js:80 msgid "Sticky Keys" msgstr "고정 키" -#: ../js/ui/status/accessibility.js:102 +#: ../js/ui/status/accessibility.js:83 msgid "Slow Keys" msgstr "느린 키" -#: ../js/ui/status/accessibility.js:105 +#: ../js/ui/status/accessibility.js:86 msgid "Bounce Keys" msgstr "탄력 키" -#: ../js/ui/status/accessibility.js:108 +#: ../js/ui/status/accessibility.js:89 msgid "Mouse Keys" msgstr "마우스 키" -#: ../js/ui/status/accessibility.js:112 +#: ../js/ui/status/accessibility.js:93 msgid "Universal Access Settings" msgstr "보편적 접근성 설정" -#: ../js/ui/status/accessibility.js:164 +#: ../js/ui/status/accessibility.js:145 msgid "High Contrast" msgstr "고대비" -#: ../js/ui/status/accessibility.js:209 +#: ../js/ui/status/accessibility.js:182 msgid "Large Text" msgstr "큰 글자" @@ -793,79 +808,85 @@ msgstr "지역화 설정" msgid "Power Settings" msgstr "전원 설정" -#: ../js/ui/status/power.js:112 +#. 0 is reported when UPower does not have enough data +#. to estimate battery life +#: ../js/ui/status/power.js:110 +msgid "Estimating..." +msgstr "예상치 계산 중..." + +#: ../js/ui/status/power.js:117 #, c-format msgid "%d hour remaining" msgid_plural "%d hours remaining" msgstr[0] "%d시간 남음" #. TRANSLATORS: this is a time string, as in "%d hours %d minutes remaining" -#: ../js/ui/status/power.js:115 +#: ../js/ui/status/power.js:120 #, c-format msgid "%d %s %d %s remaining" msgstr "%d%s %d%s 남음" -#: ../js/ui/status/power.js:117 +#: ../js/ui/status/power.js:122 msgid "hour" msgid_plural "hours" msgstr[0] "시간" -#: ../js/ui/status/power.js:117 +#: ../js/ui/status/power.js:122 msgid "minute" msgid_plural "minutes" msgstr[0] "분" -#: ../js/ui/status/power.js:120 +#: ../js/ui/status/power.js:125 #, c-format msgid "%d minute remaining" msgid_plural "%d minutes remaining" msgstr[0] "%d분 남음" -#: ../js/ui/status/power.js:235 +#: ../js/ui/status/power.js:227 msgid "AC adapter" msgstr "AC 어댑터" -#: ../js/ui/status/power.js:237 +#: ../js/ui/status/power.js:229 msgid "Laptop battery" msgstr "노트북 배터리" -#: ../js/ui/status/power.js:239 +#: ../js/ui/status/power.js:231 msgid "UPS" msgstr "UPS" -#: ../js/ui/status/power.js:241 +#: ../js/ui/status/power.js:233 msgid "Monitor" msgstr "모니터" -#: ../js/ui/status/power.js:243 +#: ../js/ui/status/power.js:235 msgid "Mouse" msgstr "마우스" -#: ../js/ui/status/power.js:245 +#: ../js/ui/status/power.js:237 msgid "Keyboard" msgstr "키보드" -#: ../js/ui/status/power.js:247 +#: ../js/ui/status/power.js:239 msgid "PDA" msgstr "PDA" -#: ../js/ui/status/power.js:249 +#: ../js/ui/status/power.js:241 msgid "Cell phone" msgstr "휴대전화" -#: ../js/ui/status/power.js:251 +#: ../js/ui/status/power.js:243 msgid "Media player" msgstr "미디어 플레이어" -#: ../js/ui/status/power.js:253 +#: ../js/ui/status/power.js:245 msgid "Tablet" msgstr "태블릿" -#: ../js/ui/status/power.js:255 +#: ../js/ui/status/power.js:247 msgid "Computer" msgstr "컴퓨터" -#: ../js/ui/status/power.js:257 ../src/shell-app-system.c:1013 +#: ../js/ui/status/power.js:249 ../src/shell-app-system.c:1013 msgid "Unknown" msgstr "알 수 없음" @@ -910,16 +931,20 @@ msgstr "보낸 때: %A %H시 %M분" #. in the search entry when no search is #. active; it should not exceed ~30 #. characters. -#: ../js/ui/viewSelector.js:103 +#: ../js/ui/viewSelector.js:117 msgid "Type to search..." msgstr "검색하려면 입력하십시오..." -#: ../js/ui/windowAttentionHandler.js:43 +#: ../js/ui/viewSelector.js:137 ../src/shell-util.c:250 +msgid "Search" +msgstr "검색" + +#: ../js/ui/windowAttentionHandler.js:42 #, c-format msgid "%s has finished starting" msgstr "%s 프로그램이 시작했습니다" -#: ../js/ui/windowAttentionHandler.js:45 +#: ../js/ui/windowAttentionHandler.js:44 #, c-format msgid "'%s' is ready" msgstr "'%s' 프로그램이 준비되었습니다" @@ -944,29 +969,34 @@ msgstr[0] "%u개 입력" msgid "System Sounds" msgstr "시스템 소리" -#: ../src/shell-global.c:1363 +# 커맨드라인 옵션 설명 +#: ../src/main.c:395 +msgid "Print version" +msgstr "버전을 표시합니다" + +#: ../src/shell-global.c:1308 msgid "Less than a minute ago" msgstr "1분 이내" -#: ../src/shell-global.c:1367 +#: ../src/shell-global.c:1312 #, c-format msgid "%d minute ago" msgid_plural "%d minutes ago" msgstr[0] "%d분 전" -#: ../src/shell-global.c:1372 +#: ../src/shell-global.c:1317 #, c-format msgid "%d hour ago" msgid_plural "%d hours ago" msgstr[0] "%d시간 전" -#: ../src/shell-global.c:1377 +#: ../src/shell-global.c:1322 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "%d일 전" -#: ../src/shell-global.c:1382 +#: ../src/shell-global.c:1327 #, c-format msgid "%d week ago" msgid_plural "%d weeks ago" @@ -986,10 +1016,6 @@ msgstr "내 폴더" msgid "File System" msgstr "파일시스템" -#: ../src/shell-util.c:250 -msgid "Search" -msgstr "검색" - #. Translators: the first string is the name of a gvfs #. * method, and the second string is a path. For #. * example, "Trash: some-directory". It means that the @@ -999,3 +1025,6 @@ msgstr "검색" #, c-format msgid "%1$s: %2$s" msgstr "%s: %s" + +#~ msgid "PREFERENCES" +#~ msgstr "기본 설정" From e375e1789b5a3b59134743fc2a24b13da4942441 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Thu, 10 Mar 2011 11:59:50 -0500 Subject: [PATCH 38/44] popupMenu: don't include hidden items in the width computation https://bugzilla.gnome.org/show_bug.cgi?id=621707 --- js/ui/popupMenu.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js index d6eaf8e93..887fb41f2 100644 --- a/js/ui/popupMenu.js +++ b/js/ui/popupMenu.js @@ -824,6 +824,8 @@ PopupMenuBase.prototype = { let columnWidths = []; let items = this.box.get_children(); for (let i = 0; i < items.length; i++) { + if (!items[i].visible) + continue; if (items[i]._delegate instanceof PopupBaseMenuItem || items[i]._delegate instanceof PopupMenuBase) { let itemColumnWidths = items[i]._delegate.getColumnWidths(); for (let j = 0; j < itemColumnWidths.length; j++) { From f079501cff549b343f3e9d0228a8057681134fb1 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 10 Mar 2011 12:42:02 -0500 Subject: [PATCH 39/44] placeDisplay: Remove network places It hasn't existed in nautilus for a while now, and we don't have places at all. https://bugzilla.gnome.org/show_bug.cgi?id=644402 --- js/ui/placeDisplay.js | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/js/ui/placeDisplay.js b/js/ui/placeDisplay.js index 450a7ba2b..c50c2814d 100644 --- a/js/ui/placeDisplay.js +++ b/js/ui/placeDisplay.js @@ -176,37 +176,8 @@ PlacesManager.prototype = { Util.spawn(['nautilus-connect-server']); }); - let networkApp = null; - try { - networkApp = Shell.AppSystem.get_default().load_from_desktop_file('gnome-network-scheme.desktop'); - } catch(e) { - try { - networkApp = Shell.AppSystem.get_default().load_from_desktop_file('network-scheme.desktop'); - } catch(e) { - log('Cannot create "Network" item, .desktop file not found or corrupt.'); - } - } - - if (networkApp != null) { - this._network = new PlaceInfo('special:network', networkApp.get_name(), - function(size) { - return networkApp.create_icon_texture(size); - }, - function (params) { - params = Params.parse(params, { workspace: null, - timestamp: 0 }); - - networkApp.launch_full(params.timestamp, [], - params.workspace ? params.workspace.index() : -1); - }); - } - this._defaultPlaces.push(this._home); this._defaultPlaces.push(this._desktopMenu); - - if (this._network) - this._defaultPlaces.push(this._network); - this._defaultPlaces.push(this._connect); /* From 8b45211a8fd7d3187996a16a3fe18a3e6a85b591 Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Mon, 14 Mar 2011 13:54:25 -0400 Subject: [PATCH 40/44] gnome-shell.modules: patch libcanberra to not use gtk_quit_add() Add patch from the main GNOME 3 moduleset to make libcanberra work properly with GTK+ 3. --- tools/build/gnome-shell.modules | 4 +++- tools/build/libcanberra-quit-add.patch | 24 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 tools/build/libcanberra-quit-add.patch diff --git a/tools/build/gnome-shell.modules b/tools/build/gnome-shell.modules index 3f51fa2ac..6c8db0982 100644 --- a/tools/build/gnome-shell.modules +++ b/tools/build/gnome-shell.modules @@ -184,7 +184,9 @@ + md5sum="ee2c66ada7c851a4e7b6eb1682285a24" size="463209"> + + diff --git a/tools/build/libcanberra-quit-add.patch b/tools/build/libcanberra-quit-add.patch new file mode 100644 index 000000000..0094569ae --- /dev/null +++ b/tools/build/libcanberra-quit-add.patch @@ -0,0 +1,24 @@ +diff -up libcanberra-0.26/src/canberra-gtk-module.c.quit-add libcanberra-0.26/src/canberra-gtk-module.c +--- libcanberra-0.26/src/canberra-gtk-module.c.quit-add 2011-01-07 22:48:49.388992626 -0500 ++++ libcanberra-0.26/src/canberra-gtk-module.c 2011-01-07 22:49:02.339995153 -0500 +@@ -932,11 +932,6 @@ static void connect_settings(void) { + connected = TRUE; + } + +-static gboolean quit_handler(gpointer data) { +- dispatch_queue(); +- return FALSE; +-} +- + G_MODULE_EXPORT void gtk_module_init(gint *argc, gchar ***argv[]) { + + /* This is the same quark libgnomeui uses! */ +@@ -963,8 +958,6 @@ G_MODULE_EXPORT void gtk_module_init(gin + install_hook(GTK_TYPE_WIDGET, "drag-drop", &signal_id_widget_drag_drop); + install_hook(GTK_TYPE_WIDGET, "drag-failed", &signal_id_widget_drag_failed); + install_hook(GTK_TYPE_EXPANDER, "activate", &signal_id_expander_activate); +- +- gtk_quit_add(1, quit_handler, NULL); + } + + G_MODULE_EXPORT gchar* g_module_check_init(GModule *module); From 9b55de1c6b0bb0acb2738ec36ba83f7c7e3aeef6 Mon Sep 17 00:00:00 2001 From: David Zeuthen Date: Mon, 14 Mar 2011 13:18:03 -0300 Subject: [PATCH 41/44] polkit: Make dialogs look more like the mockups The mockups are here https://live.gnome.org/GnomeShell/Design/Whiteboards/AuthorizationDialog Detailed changes - Don't use an icon for root - For root, show Administrator in red - Nuke icons for info and error messages - Make error messages yellow - Use 10pt size for error and message labels, not 12px - Don't make the dialog change size when (single-line) error/info messages appear - Spacing fixes - Show "Sorry, that didn't work. Please try again" if authentication fails - Don't cancel the PolkitAgentSession if the session has already completed https://bugzilla.gnome.org/show_bug.cgi?id=644737 Signed-off-by: David Zeuthen --- data/theme/gnome-shell.css | 40 +++----- js/ui/polkitAuthenticationAgent.js | 155 +++++++++++++++++------------ 2 files changed, 109 insertions(+), 86 deletions(-) diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css index 289b59cbd..7d9f0110f 100644 --- a/data/theme/gnome-shell.css +++ b/data/theme/gnome-shell.css @@ -1477,12 +1477,12 @@ StTooltip StLabel { } .polkit-dialog-main-layout { - spacing: 10px; + spacing: 24px; padding: 10px; } .polkit-dialog-message-layout { - spacing: 10px; + spacing: 16px; } .polkit-dialog-headline { @@ -1506,6 +1506,10 @@ StTooltip StLabel { padding-right: 10px; } +.polkit-dialog-user-root-label { + color: #ff0000; +} + .polkit-dialog-password-label:ltr { padding-right: 0.5em; } @@ -1521,33 +1525,21 @@ StTooltip StLabel { } .polkit-dialog-error-label { - font-size: 12px; - color: white; -} - -.polkit-dialog-error-box { - padding-top: 15px; - spacing: 5px; -} - -.polkit-dialog-checking-label { - font-size: 12px; - color: white; -} - -.polkit-dialog-checking-box { - padding-top: 15px; - spacing: 5px; + font-size: 10pt; + color: #ffff00; + padding-bottom: 8px; } .polkit-dialog-info-label { - font-size: 12px; - color: white; + font-size: 10pt; + padding-bottom: 8px; } -.polkit-dialog-info-box { - padding-top: 15px; - spacing: 5px; +/* intentionally left transparent to avoid dialog changing size */ +.polkit-dialog-null-label { + font-size: 10pt; + color: rgba(0,0,0,0); + padding-bottom: 8px; } diff --git a/js/ui/polkitAuthenticationAgent.js b/js/ui/polkitAuthenticationAgent.js index 9002683a1..8834c0e43 100644 --- a/js/ui/polkitAuthenticationAgent.js +++ b/js/ui/polkitAuthenticationAgent.js @@ -49,6 +49,8 @@ AuthenticationDialog.prototype = { this.actionId = actionId; this.message = message; this.userNames = userNames; + this._wasDismissed = false; + this._completed = false; let mainContentBox = new St.BoxLayout({ style_class: 'polkit-dialog-main-layout', vertical: false }); @@ -100,32 +102,39 @@ AuthenticationDialog.prototype = { Lang.bind(this, this._onUserChanged)); // Special case 'root' - if (userName == 'root') + let userIsRoot = false; + if (userName == 'root') { + userIsRoot = true; userRealName = _('Administrator'); + } // Work around Gdm.UserManager returning an empty string for the real name if (userRealName.length == 0) userRealName = userName; - let userBox = new St.BoxLayout({ style_class: 'polkit-dialog-user-layout', - vertical: false }); - messageBox.add(userBox); - - this._userIcon = new St.Icon(); - this._userIcon.hide(); - userBox.add(this._userIcon, - { x_fill: true, - y_fill: false, - x_align: St.Align.END, - y_align: St.Align.START }); - - let userLabel = new St.Label(({ style_class: 'polkit-dialog-user-label', - text: userRealName })); - userBox.add(userLabel, - { x_fill: true, - y_fill: false, - x_align: St.Align.END, - y_align: St.Align.MIDDLE }); + if (userIsRoot) { + let userLabel = new St.Label(({ style_class: 'polkit-dialog-user-root-label', + text: userRealName })); + messageBox.add(userLabel); + } else { + let userBox = new St.BoxLayout({ style_class: 'polkit-dialog-user-layout', + vertical: false }); + messageBox.add(userBox); + this._userIcon = new St.Icon(); + this._userIcon.hide(); + userBox.add(this._userIcon, + { x_fill: true, + y_fill: false, + x_align: St.Align.END, + y_align: St.Align.START }); + let userLabel = new St.Label(({ style_class: 'polkit-dialog-user-label', + text: userRealName })); + userBox.add(userLabel, + { x_fill: true, + y_fill: false, + x_align: St.Align.END, + y_align: St.Align.MIDDLE }); + } this._onUserChanged(); @@ -141,32 +150,28 @@ AuthenticationDialog.prototype = { {expand: true }); this._passwordBox.hide(); - this._errorBox = new St.BoxLayout({ style_class: 'polkit-dialog-error-box' }); - messageBox.add(this._errorBox); - let errorIcon = new St.Icon({ icon_name: 'dialog-error', - icon_size: 24, - style_class: 'polkit-dialog-error-icon' }); - this._errorBox.add(errorIcon, { y_align: St.Align.MIDDLE }); - this._errorMessage = new St.Label({ style_class: 'polkit-dialog-error-label' }); - this._errorMessage.clutter_text.ellipsize = Pango.EllipsizeMode.NONE; - this._errorMessage.clutter_text.line_wrap = true; - this._errorBox.add(this._errorMessage, { expand: true, - y_align: St.Align.MIDDLE, - y_fill: true }); - this._errorBox.hide(); + this._errorMessageLabel = new St.Label({ style_class: 'polkit-dialog-error-label' }); + this._errorMessageLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE; + this._errorMessageLabel.clutter_text.line_wrap = true; + messageBox.add(this._errorMessageLabel); + this._errorMessageLabel.hide(); - this._infoBox = new St.BoxLayout({ style_class: 'polkit-dialog-info-box' }); - messageBox.add(this._infoBox); - let infoIcon = new St.Icon({ icon_name: 'dialog-information', - icon_size: 24, - style_class: 'polkit-dialog-info-icon' }); - this._infoBox.add(infoIcon, { y_align: St.Align.MIDDLE }); - this._infoMessage = new St.Label({ style_class: 'polkit-dialog-info-label'}); - this._infoMessage.clutter_text.line_wrap = true; - this._infoBox.add(this._infoMessage, { expand: true, - y_align: St.Align.MIDDLE, - y_fill: true }); - this._infoBox.hide(); + this._infoMessageLabel = new St.Label({ style_class: 'polkit-dialog-info-label' }); + this._infoMessageLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE; + this._infoMessageLabel.clutter_text.line_wrap = true; + messageBox.add(this._infoMessageLabel); + this._infoMessageLabel.hide(); + + /* text is intentionally non-blank otherwise the height is not the same as for + * infoMessage and errorMessageLabel - but it is still invisible because + * gnome-shell.css sets the color to be transparent + */ + this._nullMessageLabel = new St.Label({ style_class: 'polkit-dialog-null-label', + text: 'abc'}); + this._nullMessageLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE; + this._nullMessageLabel.clutter_text.line_wrap = true; + messageBox.add(this._nullMessageLabel); + this._nullMessageLabel.show(); this.setButtons([{ label: _('Cancel'), action: Lang.bind(this, this.cancel), @@ -234,8 +239,9 @@ AuthenticationDialog.prototype = { this._session.response(response); // When the user responds, dismiss already shown info and // error texts (if any) - this._errorBox.hide(); - this._infoBox.hide(); + this._errorMessageLabel.hide(); + this._infoMessageLabel.hide(); + this._nullMessageLabel.show(); }, _onAuthenticateButtonPressed: function() { @@ -243,7 +249,24 @@ AuthenticationDialog.prototype = { }, _onSessionCompleted: function(session, gainedAuthorization) { - this._passwordBox.hide(); + if (this._completed) + return; + + this._completed = true; + + if (!gainedAuthorization) { + /* Unless we are showing an existing error message from the PAM + * module (the PAM module could be reporting the authentication + * error providing authentication-method specific information), + * show "Sorry, that didn't work. Please try again." + */ + if (!this._errorMessageLabel.visible && !this._wasDismissed) { + this._errorMessageLabel.set_text(_('Sorry, that didn\'t work. Please try again.')); + this._errorMessageLabel.show(); + this._infoMessageLabel.hide(); + this._nullMessageLabel.hide(); + } + } this._emitDone(!gainedAuthorization, false); }, @@ -267,41 +290,49 @@ AuthenticationDialog.prototype = { _onSessionShowError: function(session, text) { this._passwordEntry.set_text(''); - this._errorMessage.set_text(text); - this._errorBox.show(); + this._errorMessageLabel.set_text(text); + this._errorMessageLabel.show(); + this._infoMessageLabel.hide(); + this._nullMessageLabel.hide(); this._ensureOpen(); }, _onSessionShowInfo: function(session, text) { this._passwordEntry.set_text(''); - this._infoMessage.set_text(text); - this._infoBox.show(); + this._infoMessageLabel.set_text(text); + this._infoMessageLabel.show(); + this._errorMessageLabel.hide(); + this._nullMessageLabel.hide(); this._ensureOpen(); }, destroySession: function() { if (this._session) { - this._session.cancel(); + if (!this._completed) + this._session.cancel(); this._session = null; } }, _onUserChanged: function() { if (this._user.is_loaded) { - let iconFileName = this._user.get_icon_file(); - let iconFile = Gio.file_new_for_path(iconFileName); - let icon; - if (iconFile.query_exists(null)) { - icon = new Gio.FileIcon({file: iconFile}); - } else { - icon = new Gio.ThemedIcon({name: 'avatar-default'}); + if (this._userIcon) { + let iconFileName = this._user.get_icon_file(); + let iconFile = Gio.file_new_for_path(iconFileName); + let icon; + if (iconFile.query_exists(null)) { + icon = new Gio.FileIcon({file: iconFile}); + } else { + icon = new Gio.ThemedIcon({name: 'avatar-default'}); + } + this._userIcon.set_gicon (icon); + this._userIcon.show(); } - this._userIcon.set_gicon (icon); - this._userIcon.show(); } }, cancel: function() { + this._wasDismissed = true; this.close(global.get_current_time()); this._emitDone(false, true); }, From 4b2d6f8a992e55027dcffba8f6c7aac2318522a8 Mon Sep 17 00:00:00 2001 From: David Zeuthen Date: Mon, 14 Mar 2011 10:32:15 -0400 Subject: [PATCH 42/44] clock: update every second If we don't update every second, we may show the wrong time for up to a minute on 1. resume; or 2. when changing the time; or 3. when changing the timezone. This is both annoying and and leads to people thinking that the tool for changing the time / timezone is broken. https://bugzilla.gnome.org/show_bug.cgi?id=635840 Signed-off-by: David Zeuthen --- js/ui/dateMenu.js | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/js/ui/dateMenu.js b/js/ui/dateMenu.js index ad2c112ef..8d35bbcef 100644 --- a/js/ui/dateMenu.js +++ b/js/ui/dateMenu.js @@ -185,21 +185,6 @@ DateMenuButton.prototype = { } let displayDate = new Date(); - let msecRemaining; - if (showSeconds) { - msecRemaining = 1000 - displayDate.getMilliseconds(); - if (msecRemaining < 50) { - displayDate.setSeconds(displayDate.getSeconds() + 1); - msecRemaining += 1000; - } - } else { - msecRemaining = 60000 - (1000 * displayDate.getSeconds() + - displayDate.getMilliseconds()); - if (msecRemaining < 500) { - displayDate.setMinutes(displayDate.getMinutes() + 1); - msecRemaining += 60000; - } - } this._clock.set_text(displayDate.toLocaleFormat(clockFormat)); @@ -209,7 +194,7 @@ DateMenuButton.prototype = { dateFormat = _("%A %B %e, %Y"); this._date.set_text(displayDate.toLocaleFormat(dateFormat)); - Mainloop.timeout_add(msecRemaining, Lang.bind(this, this._updateClockAndDate)); + Mainloop.timeout_add_seconds(1, Lang.bind(this, this._updateClockAndDate)); return false; }, From 7ad89dc46b5307ecb17c1eba133b410eb010aee1 Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Sat, 12 Mar 2011 19:41:23 -0500 Subject: [PATCH 43/44] Work around Spidermonkey problem with Unicode date formats Monkey-patch Date.prototype.toLocaleFormat() with a version that uses g_date_time_format() since the Spidermonkey built-in can't handle format strings with Unicode characters. https://bugzilla.gnome.org/show_bug.cgi?id=643350 --- js/ui/environment.js | 5 +++++ src/shell-util.c | 39 +++++++++++++++++++++++++++++++++++++++ src/shell-util.h | 3 +++ 3 files changed, 47 insertions(+) diff --git a/js/ui/environment.js b/js/ui/environment.js index e83226202..9061a7723 100644 --- a/js/ui/environment.js +++ b/js/ui/environment.js @@ -64,6 +64,11 @@ function init() { Tweener.init(); String.prototype.format = Format.format; + // Work around https://bugzilla.mozilla.org/show_bug.cgi?id=508783 + Date.prototype.toLocaleFormat = function(format) { + return Shell.util_format_date(format, this.getTime()); + }; + // Set the default direction for St widgets (this needs to be done before any use of St) if (Gettext_gtk30.gettext('default:LTR') == 'default:RTL') { St.Widget.set_default_direction(St.TextDirection.RTL); diff --git a/src/shell-util.c b/src/shell-util.c index 86cd3a49d..d5aec138b 100644 --- a/src/shell-util.c +++ b/src/shell-util.c @@ -439,3 +439,42 @@ shell_util_set_hidden_from_pick (ClutterActor *actor, g_object_set_data (G_OBJECT (actor), "shell-stop-pick", NULL); } } + +/** + * shell_util_format_date: + * @format: a strftime-style string format, as parsed by + * g_date_time_format() + * @time_ms: milliseconds since 1970-01-01 00:00:00 UTC; the + * value returned by Date.getTime() + * + * Formats a date for the current locale. This should be + * used instead of the Spidermonkey Date.toLocaleFormat() + * extension because Date.toLocaleFormat() is buggy for + * Unicode format strings: + * https://bugzilla.mozilla.org/show_bug.cgi?id=508783 + * + * Return value: the formatted date. If the date is + * outside of the range of a GDateTime (which contains + * any plausible dates we actually care about), will + * return an empty string. + */ +char * +shell_util_format_date (const char *format, + gint64 time_ms) +{ + GDateTime *datetime; + GTimeVal tv; + char *result; + + tv.tv_sec = time_ms / 1000; + tv.tv_usec = (time_ms % 1000) * 1000; + + datetime = g_date_time_new_from_timeval_local (&tv); + if (!datetime) /* time_ms is out of range of GDateTime */ + return g_strdup (""); + + result = g_date_time_format (datetime, format); + + g_date_time_unref (datetime); + return result; +} diff --git a/src/shell-util.h b/src/shell-util.h index e65590588..e4914c380 100644 --- a/src/shell-util.h +++ b/src/shell-util.h @@ -13,6 +13,9 @@ GIcon *shell_util_get_icon_for_uri (const char *text_uri); GIcon *shell_util_icon_from_string (const char *string, GError **error); void shell_util_set_hidden_from_pick (ClutterActor *actor, gboolean hidden); +char *shell_util_format_date (const char *format, + gint64 time_ms); + G_END_DECLS #endif /* __SHELL_UTIL_H__ */ From 29d473f2faa03d50537f87d419092840fe79057d Mon Sep 17 00:00:00 2001 From: Adel Gadllah Date: Sun, 13 Mar 2011 19:34:47 +0100 Subject: [PATCH 44/44] XDND: Fix dragMonitor leak in WorkspacesDisplay WorkspacesDisplay removes its dragMonitor in _dragEnd, but this was never called in when a xdnd drag ended causing dragMonitors to stack up and handling events multiple times. Fix that by making sure that _dragEnd is called when xdnd ends. https://bugzilla.gnome.org/show_bug.cgi?id=644642 --- js/ui/overview.js | 1 + js/ui/workspacesView.js | 3 +++ 2 files changed, 4 insertions(+) diff --git a/js/ui/overview.js b/js/ui/overview.js index b6c30d9bc..18f0c0f85 100644 --- a/js/ui/overview.js +++ b/js/ui/overview.js @@ -220,6 +220,7 @@ Overview.prototype = { this._resetWindowSwitchTimeout(); this._lastHoveredWindow = null; DND.removeMonitor(this._dragMonitor); + this.endItemDrag(); }, _resetWindowSwitchTimeout: function() { diff --git a/js/ui/workspacesView.js b/js/ui/workspacesView.js index c2502ef98..3f79ec8c3 100644 --- a/js/ui/workspacesView.js +++ b/js/ui/workspacesView.js @@ -320,6 +320,9 @@ WorkspacesView.prototype = { Main.overview.disconnect(this._overviewShownId); global.window_manager.disconnect(this._switchWorkspaceNotifyId); + if (this._inDrag) + this._dragEnd(); + if (this._timeoutId) { Mainloop.source_remove(this._timeoutId); this._timeoutId = 0;